From 9997c23708a831f1d9ec4ac63468cdb60b8873c1 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Fri, 16 Oct 2020 14:25:40 +0200
Subject: [PATCH 0001/1815] resources#relativePath does not honour path casing
 strategy

---
 src/vs/base/common/resources.ts               | 20 ++++++++++++++-----
 src/vs/base/test/common/resources.test.ts     |  2 ++
 src/vs/platform/workspace/common/workspace.ts | 10 ++++++----
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/vs/base/common/resources.ts b/src/vs/base/common/resources.ts
index 621c97368c75..88cbade64115 100644
--- a/src/vs/base/common/resources.ts
+++ b/src/vs/base/common/resources.ts
@@ -8,7 +8,7 @@ import * as paths from 'vs/base/common/path';
 import { URI, uriToFsPath } from 'vs/base/common/uri';
 import { equalsIgnoreCase, compare as strCompare } from 'vs/base/common/strings';
 import { Schemas } from 'vs/base/common/network';
-import { isWindows, isLinux } from 'vs/base/common/platform';
+import { isLinux } from 'vs/base/common/platform';
 import { CharCode } from 'vs/base/common/charCode';
 import { ParsedExpression, IExpression, parse } from 'vs/base/common/glob';
 import { TernarySearchTree } from 'vs/base/common/map';
@@ -229,11 +229,10 @@ export class ExtUri implements IExtUri {
 		if (from.scheme !== to.scheme || !isEqualAuthority(from.authority, to.authority)) {
 			return undefined;
 		}
-		if (from.scheme === Schemas.file) {
-			const relativePath = paths.relative(originalFSPath(from), originalFSPath(to));
-			return isWindows ? extpath.toSlashes(relativePath) : relativePath;
-		}
 		let fromPath = from.path || '/', toPath = to.path || '/';
+		if (getWindowsDriveLetter(fromPath) !== getWindowsDriveLetter(toPath)) {
+			return undefined; // no relative path possible if the drive letter doesn't match
+		}
 		if (this._ignorePathCasing(from)) {
 			// make casing of fromPath match toPath
 			let i = 0;
@@ -393,6 +392,17 @@ export function distinctParents<T>(items: T[], resourceAccessor: (item: T) => UR
 	return distinctParents;
 }
 
+/**
+ * Given a URI path (not a fs path!), tests if the path looks like a Window path with drive letter and returns the lowercase variant of that drive letter.
+ * @param path returns the drive letter (lower case) or undefined if the path does not look like a windows path
+ */
+function getWindowsDriveLetter(path: string): string | undefined {
+	if (/^\/[a-zA-Z]:(\/|$)/.test(path)) {
+		return path.charAt(1).toLowerCase();
+	}
+	return undefined;
+}
+
 /**
  * Data URI related helpers.
  */
diff --git a/src/vs/base/test/common/resources.test.ts b/src/vs/base/test/common/resources.test.ts
index 8026e240bba4..c608e113a3d8 100644
--- a/src/vs/base/test/common/resources.test.ts
+++ b/src/vs/base/test/common/resources.test.ts
@@ -273,6 +273,8 @@ suite('Resources', () => {
 		assertRelativePath(URI.parse('foo://a/foo'), URI.parse('foo://A/FOO/BAR/GOO'), 'BAR/GOO', false, true);
 		assertRelativePath(URI.parse('foo://a/foo/xoo'), URI.parse('foo://A/FOO/BAR/GOO'), '../BAR/GOO', false, true);
 		assertRelativePath(URI.parse('foo:///c:/a/foo'), URI.parse('foo:///C:/a/foo/xoo/'), 'xoo', false, true);
+		assertRelativePath(URI.parse('foo:///c:/a/foo'), URI.parse('foo:///D:/a/foo/xoo/'), undefined, false, true);
+		assertRelativePath(URI.parse('file:///c:/a/foo'), URI.parse('file:///D:/a/foo/xoo/'), undefined, false, true);
 
 		if (isWindows) {
 			assertRelativePath(URI.file('c:\\foo\\bar'), URI.file('c:\\foo\\bar'), '');
diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index c0c34d74f572..3e7183ea6d4c 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -236,12 +236,14 @@ export function toWorkspaceFolders(configuredFolders: IStoredWorkspaceFolder[],
 	let result: WorkspaceFolder[] = [];
 	let seen: Set<string> = new Set();
 
-	const relativeTo = resources.dirname(workspaceConfigFile);
+	const extUri = resources.extUriBiasedIgnorePathCase;
+
+	const relativeTo = extUri.dirname(workspaceConfigFile);
 	for (let configuredFolder of configuredFolders) {
 		let uri: URI | null = null;
 		if (isRawFileWorkspaceFolder(configuredFolder)) {
 			if (configuredFolder.path) {
-				uri = resources.resolvePath(relativeTo, configuredFolder.path);
+				uri = extUri.resolvePath(relativeTo, configuredFolder.path);
 			}
 		} else if (isRawUriWorkspaceFolder(configuredFolder)) {
 			try {
@@ -257,11 +259,11 @@ export function toWorkspaceFolders(configuredFolders: IStoredWorkspaceFolder[],
 		}
 		if (uri) {
 			// remove duplicates
-			let comparisonKey = resources.getComparisonKey(uri);
+			let comparisonKey = extUri.getComparisonKey(uri);
 			if (!seen.has(comparisonKey)) {
 				seen.add(comparisonKey);
 
-				const name = configuredFolder.name || resources.basenameOrAuthority(uri);
+				const name = configuredFolder.name || extUri.basenameOrAuthority(uri);
 				result.push(new WorkspaceFolder({ uri, name, index: result.length }, configuredFolder));
 			}
 		}

From da712f4071300472ce9dcac45ab6da524ecfade4 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Fri, 16 Oct 2020 16:30:41 +0200
Subject: [PATCH 0002/1815] more changes

---
 src/vs/platform/workspace/common/workspace.ts   |  2 +-
 src/vs/platform/workspaces/common/workspaces.ts | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index 3e7183ea6d4c..d79c047f066b 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -236,7 +236,7 @@ export function toWorkspaceFolders(configuredFolders: IStoredWorkspaceFolder[],
 	let result: WorkspaceFolder[] = [];
 	let seen: Set<string> = new Set();
 
-	const extUri = resources.extUriBiasedIgnorePathCase;
+	const extUri = resources.extUriBiasedIgnorePathCase; // To be replaced by the UriIdentityService as parameter: #108793
 
 	const relativeTo = extUri.dirname(workspaceConfigFile);
 	for (let configuredFolder of configuredFolders) {
diff --git a/src/vs/platform/workspaces/common/workspaces.ts b/src/vs/platform/workspaces/common/workspaces.ts
index d6643801ab6c..a4837165c061 100644
--- a/src/vs/platform/workspaces/common/workspaces.ts
+++ b/src/vs/platform/workspaces/common/workspaces.ts
@@ -9,7 +9,7 @@ import { IWorkspaceFolder, IWorkspace } from 'vs/platform/workspace/common/works
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
 import { extname, isAbsolute } from 'vs/base/common/path';
-import { dirname, resolvePath, isEqualAuthority, relativePath, extname as resourceExtname, extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
+import { isEqualAuthority, extname as resourceExtname, extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
 import * as jsonEdit from 'vs/base/common/jsonEdit';
 import * as json from 'vs/base/common/json';
 import { Schemas } from 'vs/base/common/network';
@@ -217,7 +217,9 @@ export function getStoredWorkspaceFolder(folderURI: URI, forceAbsolute: boolean,
 		return { name: folderName, uri: folderURI.toString(true) };
 	}
 
-	let folderPath = !forceAbsolute ? relativePath(targetConfigFolderURI, folderURI) : undefined;
+	const extUri = extUriBiasedIgnorePathCase; // To be replaced by the UriIdentityService as parameter: #108793
+
+	let folderPath = !forceAbsolute ? extUri.relativePath(targetConfigFolderURI, folderURI) : undefined;
 	if (folderPath !== undefined) {
 		if (folderPath.length === 0) {
 			folderPath = '.';
@@ -258,14 +260,16 @@ export function getStoredWorkspaceFolder(folderURI: URI, forceAbsolute: boolean,
 export function rewriteWorkspaceFileForNewLocation(rawWorkspaceContents: string, configPathURI: URI, isFromUntitledWorkspace: boolean, targetConfigPathURI: URI) {
 	let storedWorkspace = doParseStoredWorkspace(configPathURI, rawWorkspaceContents);
 
-	const sourceConfigFolder = dirname(configPathURI);
-	const targetConfigFolder = dirname(targetConfigPathURI);
+	const extUri = extUriBiasedIgnorePathCase; // To be replaced by the UriIdentityService as parameter: #108793
+
+	const sourceConfigFolder = extUri.dirname(configPathURI);
+	const targetConfigFolder = extUri.dirname(targetConfigPathURI);
 
 	const rewrittenFolders: IStoredWorkspaceFolder[] = [];
 	const slashForPath = useSlashForPath(storedWorkspace.folders);
 
 	for (const folder of storedWorkspace.folders) {
-		const folderURI = isRawFileWorkspaceFolder(folder) ? resolvePath(sourceConfigFolder, folder.path) : URI.parse(folder.uri);
+		const folderURI = isRawFileWorkspaceFolder(folder) ? extUri.resolvePath(sourceConfigFolder, folder.path) : URI.parse(folder.uri);
 		let absolute;
 		if (isFromUntitledWorkspace) {
 			// if it was an untitled workspace, try to make paths relative

From 8308a6dc10eb29477dc23b8b8e9d8c5074903cc0 Mon Sep 17 00:00:00 2001
From: Orta <git@orta.io>
Date: Fri, 16 Apr 2021 22:27:19 +0100
Subject: [PATCH 0003/1815] Adds the ability to resolve @types and JSDoc
 imports in inline <scripts>

---
 .../server/src/modes/javascriptMode.ts        | 128 +++++++++++++-----
 .../server/src/test/completions.test.ts       |  24 +++-
 .../src/test/jsdocImportFixtures/index.html   |   1 +
 .../src/test/jsdocImportFixtures/index.js     |   4 +
 .../test/jsdocImportFixtures/jsDocTypes.ts    |   9 ++
 5 files changed, 125 insertions(+), 41 deletions(-)
 create mode 100644 extensions/html-language-features/server/src/test/jsdocImportFixtures/index.html
 create mode 100644 extensions/html-language-features/server/src/test/jsdocImportFixtures/index.js
 create mode 100644 extensions/html-language-features/server/src/test/jsdocImportFixtures/jsDocTypes.ts

diff --git a/extensions/html-language-features/server/src/modes/javascriptMode.ts b/extensions/html-language-features/server/src/modes/javascriptMode.ts
index 01e0b381d112..ea51fa0e4b21 100644
--- a/extensions/html-language-features/server/src/modes/javascriptMode.ts
+++ b/extensions/html-language-features/server/src/modes/javascriptMode.ts
@@ -12,20 +12,34 @@ import {
 } from './languageModes';
 import { getWordAtText, isWhitespaceOnly, repeat } from '../utils/strings';
 import { HTMLDocumentRegions } from './embeddedSupport';
+import { normalize, sep } from 'path';
 
 import * as ts from 'typescript';
 import { getSemanticTokens, getSemanticTokenLegend } from './javascriptSemanticTokens';
 
 const JS_WORD_REGEX = /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g;
 
+/** TypeScript does not handle schemes on file references, so normalize and remove the schemes when communicating with tsserver */
+function deschemeURI(uri: string) {
+	if (!uri.startsWith('file://')) { 
+		return uri ;
+	}
+	// This is replicating the logic in TypeScriptServiceClient.normalizedPath
+	const newPath = normalize(uri.replace('file://', ''));
+
+	// Both \ and / must be escaped in regular expressions
+	return newPath.replace(new RegExp('\\' + sep, 'g'), '/');
+}
+
 function getLanguageServiceHost(scriptKind: ts.ScriptKind) {
 	const compilerOptions: ts.CompilerOptions = { allowNonTsExtensions: true, allowJs: true, lib: ['lib.es6.d.ts'], target: ts.ScriptTarget.Latest, moduleResolution: ts.ModuleResolutionKind.Classic, experimentalDecorators: false };
 
 	let currentTextDocument = TextDocument.create('init', 'javascript', 1, '');
+	let currentWorkspace: Workspace = undefined!;
 	const jsLanguageService = import(/* webpackChunkName: "javascriptLibs" */ './javascriptLibs').then(libs => {
 		const host: ts.LanguageServiceHost = {
 			getCompilationSettings: () => compilerOptions,
-			getScriptFileNames: () => [currentTextDocument.uri, 'jquery'],
+			getScriptFileNames: () => [deschemeURI(currentTextDocument.uri), 'jquery'],
 			getScriptKind: (fileName) => {
 				if (fileName === currentTextDocument.uri) {
 					return scriptKind;
@@ -33,15 +47,17 @@ function getLanguageServiceHost(scriptKind: ts.ScriptKind) {
 				return fileName.substr(fileName.length - 2) === 'ts' ? ts.ScriptKind.TS : ts.ScriptKind.JS;
 			},
 			getScriptVersion: (fileName: string) => {
-				if (fileName === currentTextDocument.uri) {
+				if (fileName === deschemeURI(currentTextDocument.uri)) {
 					return String(currentTextDocument.version);
 				}
 				return '1'; // default lib an jquery.d.ts are static
 			},
 			getScriptSnapshot: (fileName: string) => {
 				let text = '';
-				if (fileName === currentTextDocument.uri) {
+				if (fileName === deschemeURI(currentTextDocument.uri)) {
 					text = currentTextDocument.getText();
+				} else if (ts.sys.fileExists(fileName)) {
+					text = ts.sys.readFile(fileName, 'utf8')!;
 				} else {
 					text = libs.loadLibrary(fileName);
 				}
@@ -51,14 +67,24 @@ function getLanguageServiceHost(scriptKind: ts.ScriptKind) {
 					getChangeRange: () => undefined
 				};
 			},
-			getCurrentDirectory: () => '',
-			getDefaultLibFileName: (_options: ts.CompilerOptions) => 'es6'
+			getCurrentDirectory:  () => {
+				const workspace = currentWorkspace && currentWorkspace.folders.find(ws => deschemeURI(currentTextDocument.uri).startsWith(deschemeURI(ws.uri)));
+				return workspace ? deschemeURI(workspace.uri) : '';
+			},
+			getDefaultLibFileName: (_options: ts.CompilerOptions) => 'es6',
+			fileExists: ts.sys.fileExists,
+			readFile: ts.sys.readFile,
+			readDirectory:  ts.sys.readDirectory,
+			directoryExists: ts.sys.directoryExists,
+			getDirectories: ts.sys.getDirectories,
 		};
+
 		return ts.createLanguageService(host);
 	});
 	return {
-		async getLanguageService(jsDocument: TextDocument): Promise<ts.LanguageService> {
+		async getLanguageService(jsDocument: TextDocument, workspace: Workspace): Promise<ts.LanguageService> {
 			currentTextDocument = jsDocument;
+			currentWorkspace = workspace;
 			return jsLanguageService;
 		},
 		getCompilationSettings() {
@@ -84,9 +110,11 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 		async doValidation(document: TextDocument, settings = workspace.settings): Promise<Diagnostic[]> {
 			host.getCompilationSettings()['experimentalDecorators'] = settings && settings.javascript && settings.javascript.implicitProjectConfig.experimentalDecorators;
 			const jsDocument = jsDocuments.get(document);
-			const languageService = await host.getLanguageService(jsDocument);
-			const syntaxDiagnostics: ts.Diagnostic[] = languageService.getSyntacticDiagnostics(jsDocument.uri);
-			const semanticDiagnostics = languageService.getSemanticDiagnostics(jsDocument.uri);
+			const languageService = await host.getLanguageService(jsDocument, workspace);
+			const filePath = deschemeURI(jsDocument.uri);
+
+			const syntaxDiagnostics: ts.Diagnostic[] = languageService.getSyntacticDiagnostics(filePath);
+			const semanticDiagnostics = languageService.getSemanticDiagnostics(filePath);
 			return syntaxDiagnostics.concat(semanticDiagnostics).map((diag: ts.Diagnostic): Diagnostic => {
 				return {
 					range: convertRange(jsDocument, diag),
@@ -98,9 +126,12 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 		},
 		async doComplete(document: TextDocument, position: Position, _documentContext: DocumentContext): Promise<CompletionList> {
 			const jsDocument = jsDocuments.get(document);
-			const jsLanguageService = await host.getLanguageService(jsDocument);
+			const jsLanguageService = await host.getLanguageService(jsDocument, workspace);
+			const filePath = deschemeURI(jsDocument.uri);
+
 			let offset = jsDocument.offsetAt(position);
-			let completions = jsLanguageService.getCompletionsAtPosition(jsDocument.uri, offset, { includeExternalModuleExports: false, includeInsertTextCompletions: false });
+			let completions = jsLanguageService.getCompletionsAtPosition(filePath, offset, { includeExternalModuleExports: false, includeInsertTextCompletions: false });
+
 			if (!completions) {
 				return { isIncomplete: false, items: [] };
 			}
@@ -126,9 +157,11 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 		},
 		async doResolve(document: TextDocument, item: CompletionItem): Promise<CompletionItem> {
 			const jsDocument = jsDocuments.get(document);
-			const jsLanguageService = await host.getLanguageService(jsDocument);
+			const jsLanguageService = await host.getLanguageService(jsDocument, workspace);
+			const filePath = deschemeURI(jsDocument.uri);
+
 			// @ts-expect-error until 4.3 protocol update
-			let details = jsLanguageService.getCompletionEntryDetails(jsDocument.uri, item.data.offset, item.label, undefined, undefined, undefined, undefined);
+			let details = jsLanguageService.getCompletionEntryDetails(filePath, item.data.offset, item.label, undefined, undefined, undefined, undefined);
 			if (details) {
 				item.detail = ts.displayPartsToString(details.displayParts);
 				item.documentation = ts.displayPartsToString(details.documentation);
@@ -138,8 +171,10 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 		},
 		async doHover(document: TextDocument, position: Position): Promise<Hover | null> {
 			const jsDocument = jsDocuments.get(document);
-			const jsLanguageService = await host.getLanguageService(jsDocument);
-			let info = jsLanguageService.getQuickInfoAtPosition(jsDocument.uri, jsDocument.offsetAt(position));
+			const jsLanguageService = await host.getLanguageService(jsDocument, workspace);
+			const filePath = deschemeURI(jsDocument.uri);
+
+			let info = jsLanguageService.getQuickInfoAtPosition(filePath, jsDocument.offsetAt(position));
 			if (info) {
 				const contents = ts.displayPartsToString(info.displayParts);
 				return {
@@ -151,8 +186,10 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 		},
 		async doSignatureHelp(document: TextDocument, position: Position): Promise<SignatureHelp | null> {
 			const jsDocument = jsDocuments.get(document);
-			const jsLanguageService = await host.getLanguageService(jsDocument);
-			let signHelp = jsLanguageService.getSignatureHelpItems(jsDocument.uri, jsDocument.offsetAt(position), undefined);
+			const jsLanguageService = await host.getLanguageService(jsDocument, workspace);
+			const filePath = deschemeURI(jsDocument.uri);
+
+			let signHelp = jsLanguageService.getSignatureHelpItems(filePath, jsDocument.offsetAt(position), undefined);
 			if (signHelp) {
 				let ret: SignatureHelp = {
 					activeSignature: signHelp.selectedItemIndex,
@@ -189,13 +226,15 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 		},
 		async doRename(document: TextDocument, position: Position, newName: string) {
 			const jsDocument = jsDocuments.get(document);
-			const jsLanguageService = await host.getLanguageService(jsDocument);
+			const jsLanguageService = await host.getLanguageService(jsDocument, workspace);
 			const jsDocumentPosition = jsDocument.offsetAt(position);
-			const { canRename } = jsLanguageService.getRenameInfo(jsDocument.uri, jsDocumentPosition);
+			const filePath = deschemeURI(jsDocument.uri);
+
+			const { canRename } = jsLanguageService.getRenameInfo(filePath, jsDocumentPosition);
 			if (!canRename) {
 				return null;
 			}
-			const renameInfos = jsLanguageService.findRenameLocations(jsDocument.uri, jsDocumentPosition, false, false);
+			const renameInfos = jsLanguageService.findRenameLocations(filePath, jsDocumentPosition, false, false);
 
 			const edits: TextEdit[] = [];
 			renameInfos?.map(renameInfo => {
@@ -211,8 +250,10 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 		},
 		async findDocumentHighlight(document: TextDocument, position: Position): Promise<DocumentHighlight[]> {
 			const jsDocument = jsDocuments.get(document);
-			const jsLanguageService = await host.getLanguageService(jsDocument);
-			const highlights = jsLanguageService.getDocumentHighlights(jsDocument.uri, jsDocument.offsetAt(position), [jsDocument.uri]);
+			const jsLanguageService = await host.getLanguageService(jsDocument, workspace);
+			const filePath = deschemeURI(jsDocument.uri);
+
+			const highlights = jsLanguageService.getDocumentHighlights(filePath, jsDocument.offsetAt(position), [filePath]);
 			const out: DocumentHighlight[] = [];
 			for (const entry of highlights || []) {
 				for (const highlight of entry.highlightSpans) {
@@ -226,8 +267,10 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 		},
 		async findDocumentSymbols(document: TextDocument): Promise<SymbolInformation[]> {
 			const jsDocument = jsDocuments.get(document);
-			const jsLanguageService = await host.getLanguageService(jsDocument);
-			let items = jsLanguageService.getNavigationBarItems(jsDocument.uri);
+			const jsLanguageService = await host.getLanguageService(jsDocument, workspace);
+			const filePath = deschemeURI(jsDocument.uri);
+
+			let items = jsLanguageService.getNavigationBarItems(filePath);
 			if (items) {
 				let result: SymbolInformation[] = [];
 				let existing = Object.create(null);
@@ -263,8 +306,10 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 		},
 		async findDefinition(document: TextDocument, position: Position): Promise<Definition | null> {
 			const jsDocument = jsDocuments.get(document);
-			const jsLanguageService = await host.getLanguageService(jsDocument);
-			let definition = jsLanguageService.getDefinitionAtPosition(jsDocument.uri, jsDocument.offsetAt(position));
+			const jsLanguageService = await host.getLanguageService(jsDocument, workspace);
+			const filePath = deschemeURI(jsDocument.uri);
+
+			let definition = jsLanguageService.getDefinitionAtPosition(filePath, jsDocument.offsetAt(position));
 			if (definition) {
 				return definition.filter(d => d.fileName === jsDocument.uri).map(d => {
 					return {
@@ -277,10 +322,12 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 		},
 		async findReferences(document: TextDocument, position: Position): Promise<Location[]> {
 			const jsDocument = jsDocuments.get(document);
-			const jsLanguageService = await host.getLanguageService(jsDocument);
-			let references = jsLanguageService.getReferencesAtPosition(jsDocument.uri, jsDocument.offsetAt(position));
+			const jsLanguageService = await host.getLanguageService(jsDocument, workspace);
+			const filePath = deschemeURI(jsDocument.uri);
+
+			let references = jsLanguageService.getReferencesAtPosition(filePath, jsDocument.offsetAt(position));
 			if (references) {
-				return references.filter(d => d.fileName === jsDocument.uri).map(d => {
+				return references.filter(d => d.fileName === filePath).map(d => {
 					return {
 						uri: document.uri,
 						range: convertRange(jsDocument, d.textSpan)
@@ -291,17 +338,20 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 		},
 		async getSelectionRange(document: TextDocument, position: Position): Promise<SelectionRange> {
 			const jsDocument = jsDocuments.get(document);
-			const jsLanguageService = await host.getLanguageService(jsDocument);
+			const jsLanguageService = await host.getLanguageService(jsDocument, workspace);
+			const filePath = deschemeURI(jsDocument.uri);
+
 			function convertSelectionRange(selectionRange: ts.SelectionRange): SelectionRange {
 				const parent = selectionRange.parent ? convertSelectionRange(selectionRange.parent) : undefined;
 				return SelectionRange.create(convertRange(jsDocument, selectionRange.textSpan), parent);
 			}
-			const range = jsLanguageService.getSmartSelectionRange(jsDocument.uri, jsDocument.offsetAt(position));
+			const range = jsLanguageService.getSmartSelectionRange(filePath, jsDocument.offsetAt(position));
 			return convertSelectionRange(range);
 		},
 		async format(document: TextDocument, range: Range, formatParams: FormattingOptions, settings: Settings = globalSettings): Promise<TextEdit[]> {
 			const jsDocument = documentRegions.get(document).getEmbeddedDocument('javascript', true);
-			const jsLanguageService = await host.getLanguageService(jsDocument);
+			const jsLanguageService = await host.getLanguageService(jsDocument, workspace);
+			const filePath = deschemeURI(jsDocument.uri);
 
 			let formatterSettings = settings && settings.javascript && settings.javascript.format;
 
@@ -314,7 +364,7 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 				end -= range.end.character;
 				lastLineRange = Range.create(Position.create(range.end.line, 0), range.end);
 			}
-			let edits = jsLanguageService.getFormattingEditsForRange(jsDocument.uri, start, end, formatSettings);
+			let edits = jsLanguageService.getFormattingEditsForRange(filePath, start, end, formatSettings);
 			if (edits) {
 				let result = [];
 				for (let edit of edits) {
@@ -337,8 +387,10 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 		},
 		async getFoldingRanges(document: TextDocument): Promise<FoldingRange[]> {
 			const jsDocument = jsDocuments.get(document);
-			const jsLanguageService = await host.getLanguageService(jsDocument);
-			let spans = jsLanguageService.getOutliningSpans(jsDocument.uri);
+			const jsLanguageService = await host.getLanguageService(jsDocument, workspace);
+			const filePath = deschemeURI(jsDocument.uri);
+
+			let spans = jsLanguageService.getOutliningSpans(filePath);
 			let ranges: FoldingRange[] = [];
 			for (let span of spans) {
 				let curr = convertRange(jsDocument, span.textSpan);
@@ -360,8 +412,10 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
 		},
 		async getSemanticTokens(document: TextDocument): Promise<SemanticTokenData[]> {
 			const jsDocument = jsDocuments.get(document);
-			const jsLanguageService = await host.getLanguageService(jsDocument);
-			return getSemanticTokens(jsLanguageService, jsDocument, jsDocument.uri);
+			const jsLanguageService = await host.getLanguageService(jsDocument, workspace);
+			const filePath = deschemeURI(jsDocument.uri);
+
+			return getSemanticTokens(jsLanguageService, jsDocument, filePath);
 		},
 		getSemanticTokenLegend(): { types: string[], modifiers: string[] } {
 			return getSemanticTokenLegend();
diff --git a/extensions/html-language-features/server/src/test/completions.test.ts b/extensions/html-language-features/server/src/test/completions.test.ts
index 0371a2f74cd0..f0d18af2df70 100644
--- a/extensions/html-language-features/server/src/test/completions.test.ts
+++ b/extensions/html-language-features/server/src/test/completions.test.ts
@@ -94,11 +94,27 @@ suite('HTML Completion', () => {
 	});
 });
 
+const triggerSuggestCommand = {
+	title: 'Suggest',
+	command: 'editor.action.triggerSuggest'
+};
+
+suite('JSDoc Imports', () => {
+	const fixtureRoot = path.resolve(__dirname, '../../src/test/jsdocImportFixtures');
+	const fixtureWorkspace = { name: 'fixture', uri: URI.file(fixtureRoot).toString() };
+	const indexHtmlUri = URI.file(path.resolve(fixtureRoot, 'index.html')).toString();
+
+	test('Imports across files', async () => {
+		await testCompletionFor('<html><script>/** @type {import("./jsDocTypes").SomeType } */\nconst a = {}; \n a.| \n</script><html>', {
+			items: [
+				{ label: 'other',  },
+				{ label: 'property', },
+			]
+		}, indexHtmlUri, [fixtureWorkspace] );
+	});
+});
+
 suite('HTML Path Completion', () => {
-	const triggerSuggestCommand = {
-		title: 'Suggest',
-		command: 'editor.action.triggerSuggest'
-	};
 
 	const fixtureRoot = path.resolve(__dirname, '../../src/test/pathCompletionFixtures');
 	const fixtureWorkspace = { name: 'fixture', uri: URI.file(fixtureRoot).toString() };
diff --git a/extensions/html-language-features/server/src/test/jsdocImportFixtures/index.html b/extensions/html-language-features/server/src/test/jsdocImportFixtures/index.html
new file mode 100644
index 000000000000..c5bd93d63657
--- /dev/null
+++ b/extensions/html-language-features/server/src/test/jsdocImportFixtures/index.html
@@ -0,0 +1 @@
+<html><script>/** @type {import("./
diff --git a/extensions/html-language-features/server/src/test/jsdocImportFixtures/index.js b/extensions/html-language-features/server/src/test/jsdocImportFixtures/index.js
new file mode 100644
index 000000000000..a4a092d83492
--- /dev/null
+++ b/extensions/html-language-features/server/src/test/jsdocImportFixtures/index.js
@@ -0,0 +1,4 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
diff --git a/extensions/html-language-features/server/src/test/jsdocImportFixtures/jsDocTypes.ts b/extensions/html-language-features/server/src/test/jsdocImportFixtures/jsDocTypes.ts
new file mode 100644
index 000000000000..938dd5d7b2d5
--- /dev/null
+++ b/extensions/html-language-features/server/src/test/jsdocImportFixtures/jsDocTypes.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 type SomeType = {
+	property: string
+	other: number
+};

From 872ff8d67f5571e14c36366a0275ccf47da1467e Mon Sep 17 00:00:00 2001
From: Orta <git@orta.io>
Date: Fri, 16 Apr 2021 22:50:52 +0100
Subject: [PATCH 0004/1815] Improve tests

---
 .../server/src/test/completions.test.ts                  | 9 ++++-----
 .../server/src/test/jsdocImportFixtures/index.html       | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/extensions/html-language-features/server/src/test/completions.test.ts b/extensions/html-language-features/server/src/test/completions.test.ts
index f0d18af2df70..b462efa5a64b 100644
--- a/extensions/html-language-features/server/src/test/completions.test.ts
+++ b/extensions/html-language-features/server/src/test/completions.test.ts
@@ -94,11 +94,6 @@ suite('HTML Completion', () => {
 	});
 });
 
-const triggerSuggestCommand = {
-	title: 'Suggest',
-	command: 'editor.action.triggerSuggest'
-};
-
 suite('JSDoc Imports', () => {
 	const fixtureRoot = path.resolve(__dirname, '../../src/test/jsdocImportFixtures');
 	const fixtureWorkspace = { name: 'fixture', uri: URI.file(fixtureRoot).toString() };
@@ -115,6 +110,10 @@ suite('JSDoc Imports', () => {
 });
 
 suite('HTML Path Completion', () => {
+	const triggerSuggestCommand = {
+		title: 'Suggest',
+		command: 'editor.action.triggerSuggest'
+	};
 
 	const fixtureRoot = path.resolve(__dirname, '../../src/test/pathCompletionFixtures');
 	const fixtureWorkspace = { name: 'fixture', uri: URI.file(fixtureRoot).toString() };
diff --git a/extensions/html-language-features/server/src/test/jsdocImportFixtures/index.html b/extensions/html-language-features/server/src/test/jsdocImportFixtures/index.html
index c5bd93d63657..8b137891791f 100644
--- a/extensions/html-language-features/server/src/test/jsdocImportFixtures/index.html
+++ b/extensions/html-language-features/server/src/test/jsdocImportFixtures/index.html
@@ -1 +1 @@
-<html><script>/** @type {import("./
+

From 511d8170f230c1ed56c4fd9159a17d48f3eb8e2f Mon Sep 17 00:00:00 2001
From: Orta <git@orta.io>
Date: Fri, 16 Apr 2021 23:31:36 +0100
Subject: [PATCH 0005/1815] Re-format JS mode

---
 .../server/src/modes/javascriptMode.ts                    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/html-language-features/server/src/modes/javascriptMode.ts b/extensions/html-language-features/server/src/modes/javascriptMode.ts
index ea51fa0e4b21..c5e7b64dd501 100644
--- a/extensions/html-language-features/server/src/modes/javascriptMode.ts
+++ b/extensions/html-language-features/server/src/modes/javascriptMode.ts
@@ -21,8 +21,8 @@ const JS_WORD_REGEX = /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\
 
 /** TypeScript does not handle schemes on file references, so normalize and remove the schemes when communicating with tsserver */
 function deschemeURI(uri: string) {
-	if (!uri.startsWith('file://')) { 
-		return uri ;
+	if (!uri.startsWith('file://')) {
+		return uri;
 	}
 	// This is replicating the logic in TypeScriptServiceClient.normalizedPath
 	const newPath = normalize(uri.replace('file://', ''));
@@ -67,14 +67,14 @@ function getLanguageServiceHost(scriptKind: ts.ScriptKind) {
 					getChangeRange: () => undefined
 				};
 			},
-			getCurrentDirectory:  () => {
+			getCurrentDirectory: () => {
 				const workspace = currentWorkspace && currentWorkspace.folders.find(ws => deschemeURI(currentTextDocument.uri).startsWith(deschemeURI(ws.uri)));
 				return workspace ? deschemeURI(workspace.uri) : '';
 			},
 			getDefaultLibFileName: (_options: ts.CompilerOptions) => 'es6',
 			fileExists: ts.sys.fileExists,
 			readFile: ts.sys.readFile,
-			readDirectory:  ts.sys.readDirectory,
+			readDirectory: ts.sys.readDirectory,
 			directoryExists: ts.sys.directoryExists,
 			getDirectories: ts.sys.getDirectories,
 		};

From a9856e5b7f90b096c573bfebd1a66b48293dbf0c Mon Sep 17 00:00:00 2001
From: Orta <git@orta.io>
Date: Sat, 24 Apr 2021 19:23:13 +0100
Subject: [PATCH 0006/1815] Use mtime to figure out what the version of a
 TypeScript import file is

---
 .../server/src/modes/javascriptMode.ts               | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/extensions/html-language-features/server/src/modes/javascriptMode.ts b/extensions/html-language-features/server/src/modes/javascriptMode.ts
index c5e7b64dd501..b805d294ae11 100644
--- a/extensions/html-language-features/server/src/modes/javascriptMode.ts
+++ b/extensions/html-language-features/server/src/modes/javascriptMode.ts
@@ -16,6 +16,7 @@ import { normalize, sep } from 'path';
 
 import * as ts from 'typescript';
 import { getSemanticTokens, getSemanticTokenLegend } from './javascriptSemanticTokens';
+import { statSync } from 'fs';
 
 const JS_WORD_REGEX = /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g;
 
@@ -47,10 +48,19 @@ function getLanguageServiceHost(scriptKind: ts.ScriptKind) {
 				return fileName.substr(fileName.length - 2) === 'ts' ? ts.ScriptKind.TS : ts.ScriptKind.JS;
 			},
 			getScriptVersion: (fileName: string) => {
+				// Let the outer TextDocument give the version
 				if (fileName === deschemeURI(currentTextDocument.uri)) {
 					return String(currentTextDocument.version);
 				}
-				return '1'; // default lib an jquery.d.ts are static
+				// Default libs and jquery.d.ts are static.
+				// Include node_modules as a perf win
+				if (fileName.startsWith('lib.') || fileName === 'jquery' || fileName.includes('node_modules')) {
+					return '1'; 
+				}
+				// Unsure how this could occur, but better to not raise with statSync
+				if (!ts.sys.fileExists(fileName)) { return '1'; }
+				// Use mtime from the fs
+				return String(statSync(fileName).mtimeMs);
 			},
 			getScriptSnapshot: (fileName: string) => {
 				let text = '';

From 71dc1e95b5a3127300158d177f9eb8793e371bbe Mon Sep 17 00:00:00 2001
From: Joyce Er <joyce.er@microsoft.com>
Date: Wed, 31 Aug 2022 10:14:46 -0700
Subject: [PATCH 0007/1815] Use the custom modal dialog in edit sessions to
 avoid stealing window focus

---
 .../browser/editSessions.contribution.ts      | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts b/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
index a7691595c972..55be0483424d 100644
--- a/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
+++ b/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
@@ -23,7 +23,7 @@ import { EditSessionsWorkbenchService } from 'vs/workbench/contrib/editSessions/
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { UserDataSyncErrorCode, UserDataSyncStoreError } from 'vs/platform/userDataSync/common/userDataSync';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { INotificationService } from 'vs/platform/notification/common/notification';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { IDialogService, IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
@@ -397,12 +397,18 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 
 			if (hasLocalUncommittedChanges) {
 				// TODO@joyceerhl Provide the option to diff files which would be overwritten by edit session contents
-				const result = await this.dialogService.confirm({
-					message: localize('resume edit session warning', 'Resuming your edit session may overwrite your existing uncommitted changes. Do you want to proceed?'),
-					type: 'warning',
-					title: EDIT_SESSION_SYNC_CATEGORY.value
-				});
-				if (!result.confirmed) {
+				const yes = localize('resume edit session yes', 'Yes');
+				const cancel = localize('resume edit session cancel', 'Cancel');
+
+				const result = await this.dialogService.show(
+					Severity.Warning,
+					localize('resume edit session warning', 'Resuming your edit session may overwrite your existing uncommitted changes. Do you want to proceed?'),
+					[cancel, yes],
+					{
+						custom: true,
+						cancelId: 0
+					});
+				if (result.choice === 0) {
 					return;
 				}
 			}

From 1838f9aa38e113b6a6330da0e8677fd725906fc9 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Fri, 21 Oct 2022 17:34:12 +0200
Subject: [PATCH 0008/1815] Fix #164052

---
 src/vs/workbench/api/browser/mainThreadConfiguration.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadConfiguration.ts b/src/vs/workbench/api/browser/mainThreadConfiguration.ts
index de0630df1a18..f83af92fe3d6 100644
--- a/src/vs/workbench/api/browser/mainThreadConfiguration.ts
+++ b/src/vs/workbench/api/browser/mainThreadConfiguration.ts
@@ -12,6 +12,7 @@ import { MainThreadConfigurationShape, MainContext, ExtHostContext, IConfigurati
 import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
 import { ConfigurationTarget, IConfigurationService, IConfigurationOverrides } from 'vs/platform/configuration/common/configuration';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { ErrorNoTelemetry } from 'vs/base/common/errors';
 
 @extHostNamedCustomer(MainContext.MainThreadConfiguration)
 export class MainThreadConfiguration implements MainThreadConfigurationShape {
@@ -72,12 +73,16 @@ export class MainThreadConfiguration implements MainThreadConfigurationShape {
 		}
 	}
 
-	private _updateValue(key: string, value: any, configurationTarget: ConfigurationTarget, overriddenValue: any | undefined, overrides: IConfigurationOverrides, scopeToLanguage: boolean | undefined): Promise<void> {
+	private async _updateValue(key: string, value: any, configurationTarget: ConfigurationTarget, overriddenValue: any | undefined, overrides: IConfigurationOverrides, scopeToLanguage: boolean | undefined): Promise<void> {
 		overrides = scopeToLanguage === true ? overrides
 			: scopeToLanguage === false ? { resource: overrides.resource }
 				: overrides.overrideIdentifier && overriddenValue !== undefined ? overrides
 					: { resource: overrides.resource };
-		return this.configurationService.updateValue(key, value, overrides, configurationTarget, true);
+		try {
+			return await this.configurationService.updateValue(key, value, overrides, configurationTarget, true);
+		} catch (error) {
+			throw ErrorNoTelemetry.fromError(error);
+		}
 	}
 
 	private deriveConfigurationTarget(key: string, overrides: IConfigurationOverrides): ConfigurationTarget {

From f9e13151b5322a178378d20b481c23e2b988e553 Mon Sep 17 00:00:00 2001
From: David Dossett <ddossett@microsoft.com>
Date: Thu, 15 Dec 2022 16:31:40 -0800
Subject: [PATCH 0009/1815] Try 2px outline

---
 src/vs/base/browser/ui/selectBox/selectBoxCustom.ts          | 2 +-
 src/vs/editor/contrib/find/browser/findWidget.css            | 2 +-
 src/vs/workbench/browser/media/style.css                     | 2 +-
 src/vs/workbench/contrib/scm/browser/media/scm.css           | 2 +-
 src/vs/workbench/contrib/search/browser/media/searchview.css | 4 ++++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
index cfdaca03d755..22ae08dfca4b 100644
--- a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
+++ b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
@@ -147,7 +147,7 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 	// IDelegate - List renderer
 
 	getHeight(): number {
-		return 18;
+		return 22;
 	}
 
 	getTemplateId(): string {
diff --git a/src/vs/editor/contrib/find/browser/findWidget.css b/src/vs/editor/contrib/find/browser/findWidget.css
index 767b0659fdb5..c2afe9f6d3a5 100644
--- a/src/vs/editor/contrib/find/browser/findWidget.css
+++ b/src/vs/editor/contrib/find/browser/findWidget.css
@@ -40,7 +40,7 @@
 }
 
 .monaco-editor .find-widget .monaco-inputbox.synthetic-focus {
-	outline: 1px solid -webkit-focus-ring-color;
+	outline: 2px solid -webkit-focus-ring-color;
 	outline-offset: -1px;
 }
 
diff --git a/src/vs/workbench/browser/media/style.css b/src/vs/workbench/browser/media/style.css
index 9eb68309dc3f..621d8790fe51 100644
--- a/src/vs/workbench/browser/media/style.css
+++ b/src/vs/workbench/browser/media/style.css
@@ -182,7 +182,7 @@ body.web {
 .monaco-workbench input[type="text"]:focus,
 .monaco-workbench textarea:focus,
 .monaco-workbench input[type="checkbox"]:focus {
-	outline-width: 1px;
+	outline-width: 2px;
 	outline-style: solid;
 	outline-offset: -1px;
 	opacity: 1;
diff --git a/src/vs/workbench/contrib/scm/browser/media/scm.css b/src/vs/workbench/contrib/scm/browser/media/scm.css
index 35a1a3a13c78..fb9174f0161c 100644
--- a/src/vs/workbench/contrib/scm/browser/media/scm.css
+++ b/src/vs/workbench/contrib/scm/browser/media/scm.css
@@ -302,7 +302,7 @@
 }
 
 .scm-view .scm-editor-container.synthetic-focus {
-	outline: 1px solid var(--vscode-focusBorder);
+	outline: 2px solid var(--vscode-focusBorder);
 }
 
 .scm-view .scm-editor-container.validation-info {
diff --git a/src/vs/workbench/contrib/search/browser/media/searchview.css b/src/vs/workbench/contrib/search/browser/media/searchview.css
index 9d4855e32513..12d84e308e5e 100644
--- a/src/vs/workbench/contrib/search/browser/media/searchview.css
+++ b/src/vs/workbench/contrib/search/browser/media/searchview.css
@@ -56,6 +56,10 @@
 	height: 26px; /* set initial height before measure */
 }
 
+.search-view .search-widget .monaco-findInput .monaco-scrollable-element {
+	overflow: unset !important;
+}
+
 .search-view .search-widget .monaco-findInput .monaco-scrollable-element .scrollbar {
 	opacity: 0;
 }

From 2fa9cbc79f6c9b1b7eaf0672faecffa2c4bec044 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Fri, 21 Apr 2023 03:43:32 +0200
Subject: [PATCH 0010/1815] random

---
 src/vs/workbench/contrib/preferences/common/preferences.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/preferences/common/preferences.ts b/src/vs/workbench/contrib/preferences/common/preferences.ts
index bfaa124d6179..b4c53668db06 100644
--- a/src/vs/workbench/contrib/preferences/common/preferences.ts
+++ b/src/vs/workbench/contrib/preferences/common/preferences.ts
@@ -52,6 +52,7 @@ export const CONTEXT_SETTINGS_ROW_FOCUS = new RawContextKey<boolean>('settingRow
 export const CONTEXT_KEYBINDINGS_EDITOR = new RawContextKey<boolean>('inKeybindings', false);
 export const CONTEXT_KEYBINDINGS_SEARCH_FOCUS = new RawContextKey<boolean>('inKeybindingsSearch', false);
 export const CONTEXT_KEYBINDING_FOCUS = new RawContextKey<boolean>('keybindingFocus', false);
+export const CONTEXT_KEYBINDING_FOCU = new RawContextKey<boolean>('keybindingFocus', false);
 export const CONTEXT_WHEN_FOCUS = new RawContextKey<boolean>('whenFocus', false);
 export const CONTEXT_SETTINGS_EDITOR_IN_USER_TAB = new RawContextKey<boolean>('inSettingsEditorUserTab', false);
 

From 0deafe7e0a3efbbf023bcbd38911ad875640a8f8 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Thu, 7 Sep 2023 15:20:00 +0200
Subject: [PATCH 0011/1815] Refactors diff algorithm

---
 .../algorithms/myersDiffAlgorithm.ts          | 29 ++++++++++++-------
 ...dget2.test.ts => diffEditorWidget.test.ts} |  0
 ...st.ts => defaultLinesDiffComputer.test.ts} | 20 +++++++++----
 ...iffingFixture.test.ts => fixtures.test.ts} |  2 +-
 4 files changed, 34 insertions(+), 17 deletions(-)
 rename src/vs/editor/test/browser/widget/{diffEditorWidget2.test.ts => diffEditorWidget.test.ts} (100%)
 rename src/vs/editor/test/node/diffing/{advancedLinesDiffComputer.test.ts => defaultLinesDiffComputer.test.ts} (81%)
 rename src/vs/editor/test/node/diffing/{diffingFixture.test.ts => fixtures.test.ts} (99%)

diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm.ts
index 0f3b64004cd8..c0843188927f 100644
--- a/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm.ts
@@ -17,8 +17,11 @@ export class MyersDiffAlgorithm implements IDiffAlgorithm {
 			return DiffAlgorithmResult.trivial(seq1, seq2);
 		}
 
+		const seqX = seq1; // Text on the x axis
+		const seqY = seq2; // Text on the y axis
+
 		function getXAfterSnake(x: number, y: number): number {
-			while (x < seq1.length && y < seq2.length && seq1.getElement(x) === seq2.getElement(y)) {
+			while (x < seqX.length && y < seqY.length && seqX.getElement(x) === seqY.getElement(y)) {
 				x++;
 				y++;
 			}
@@ -29,6 +32,7 @@ export class MyersDiffAlgorithm implements IDiffAlgorithm {
 		// V[k]: X value of longest d-line that ends in diagonal k.
 		// d-line: path from (0,0) to (x,y) that uses exactly d non-diagonals.
 		// diagonal k: Set of points (x,y) with x-y = k.
+		// k=1 -> (1,0),(2,1)
 		const V = new FastInt32Array();
 		V.set(0, getXAfterSnake(0, 0));
 
@@ -40,18 +44,21 @@ export class MyersDiffAlgorithm implements IDiffAlgorithm {
 		loop: while (true) {
 			d++;
 			if (!timeout.isValid()) {
-				return DiffAlgorithmResult.trivialTimedOut(seq1, seq2);
+				return DiffAlgorithmResult.trivialTimedOut(seqX, seqY);
 			}
 			// The paper has `for (k = -d; k <= d; k += 2)`, but we can ignore diagonals that cannot influence the result.
-			const lowerBound = -Math.min(d, seq2.length + (d % 2));
-			const upperBound = Math.min(d, seq1.length + (d % 2));
+			const lowerBound = -Math.min(d, seqY.length + (d % 2));
+			const upperBound = Math.min(d, seqX.length + (d % 2));
 			for (k = lowerBound; k <= upperBound; k += 2) {
+				let step = 0;
 				// We can use the X values of (d-1)-lines to compute X value of the longest d-lines.
-				const maxXofDLineTop = k === upperBound ? -1 : V.get(k + 1); // We take a vertical non-diagonal (add a symbol in seq1)
-				const maxXofDLineLeft = k === lowerBound ? -1 : V.get(k - 1) + 1; // We take a horizontal non-diagonal (+1 x) (delete a symbol in seq1)
-				const x = Math.min(Math.max(maxXofDLineTop, maxXofDLineLeft), seq1.length);
+				const maxXofDLineTop = k === upperBound ? -1 : V.get(k + 1); // We take a vertical non-diagonal (add a symbol in seqX)
+				const maxXofDLineLeft = k === lowerBound ? -1 : V.get(k - 1) + 1; // We take a horizontal non-diagonal (+1 x) (delete a symbol in seqX)
+				step++;
+				const x = Math.min(Math.max(maxXofDLineTop, maxXofDLineLeft), seqX.length);
 				const y = x - k;
-				if (x > seq1.length || y > seq2.length) {
+				step++;
+				if (x > seqX.length || y > seqY.length) {
 					// This diagonal is irrelevant for the result.
 					// TODO: Don't pay the cost for this in the next iteration.
 					continue;
@@ -61,7 +68,7 @@ export class MyersDiffAlgorithm implements IDiffAlgorithm {
 				const lastPath = x === maxXofDLineTop ? paths.get(k + 1) : paths.get(k - 1);
 				paths.set(k, newMaxX !== x ? new SnakePath(lastPath, x, y, newMaxX - x) : lastPath);
 
-				if (V.get(k) === seq1.length && V.get(k) - k === seq2.length) {
+				if (V.get(k) === seqX.length && V.get(k) - k === seqY.length) {
 					break loop;
 				}
 			}
@@ -69,8 +76,8 @@ export class MyersDiffAlgorithm implements IDiffAlgorithm {
 
 		let path = paths.get(k);
 		const result: SequenceDiff[] = [];
-		let lastAligningPosS1: number = seq1.length;
-		let lastAligningPosS2: number = seq2.length;
+		let lastAligningPosS1: number = seqX.length;
+		let lastAligningPosS2: number = seqY.length;
 
 		while (true) {
 			const endX = path ? path.x + path.length : 0;
diff --git a/src/vs/editor/test/browser/widget/diffEditorWidget2.test.ts b/src/vs/editor/test/browser/widget/diffEditorWidget.test.ts
similarity index 100%
rename from src/vs/editor/test/browser/widget/diffEditorWidget2.test.ts
rename to src/vs/editor/test/browser/widget/diffEditorWidget.test.ts
diff --git a/src/vs/editor/test/node/diffing/advancedLinesDiffComputer.test.ts b/src/vs/editor/test/node/diffing/defaultLinesDiffComputer.test.ts
similarity index 81%
rename from src/vs/editor/test/node/diffing/advancedLinesDiffComputer.test.ts
rename to src/vs/editor/test/node/diffing/defaultLinesDiffComputer.test.ts
index 31fa3e3086ee..664ef33cf4f3 100644
--- a/src/vs/editor/test/node/diffing/advancedLinesDiffComputer.test.ts
+++ b/src/vs/editor/test/node/diffing/defaultLinesDiffComputer.test.ts
@@ -6,12 +6,24 @@
 import * as assert from 'assert';
 import { Range } from 'vs/editor/common/core/range';
 import { RangeMapping } from 'vs/editor/common/diff/rangeMapping';
-import { getLineRangeMapping } from 'vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer';
 import { OffsetRange } from 'vs/editor/common/core/offsetRange';
+import { getLineRangeMapping } from 'vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer';
 import { LinesSliceCharSequence } from 'vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence';
+import { MyersDiffAlgorithm } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/myersDiffAlgorithm';
+import { DynamicProgrammingDiffing } from 'vs/editor/common/diff/defaultLinesDiffComputer/algorithms/dynamicProgrammingDiffing';
 
-suite('lineRangeMapping', () => {
+suite('myers', () => {
 	test('1', () => {
+		const s1 = new LinesSliceCharSequence(['hello world'], new OffsetRange(0, 1), true);
+		const s2 = new LinesSliceCharSequence(['hallo welt'], new OffsetRange(0, 1), true);
+
+		const a = true ? new MyersDiffAlgorithm() : new DynamicProgrammingDiffing();
+		a.compute(s1, s2);
+	});
+});
+
+suite('lineRangeMapping', () => {
+	test('Simple', () => {
 		assert.deepStrictEqual(
 			getLineRangeMapping(
 				new RangeMapping(
@@ -32,7 +44,7 @@ suite('lineRangeMapping', () => {
 		);
 	});
 
-	test('2', () => {
+	test('Empty Lines', () => {
 		assert.deepStrictEqual(
 			getLineRangeMapping(
 				new RangeMapping(
@@ -56,8 +68,6 @@ suite('lineRangeMapping', () => {
 });
 
 suite('LinesSliceCharSequence', () => {
-	// Create tests for translateOffset
-
 	const sequence = new LinesSliceCharSequence(
 		[
 			'line1: foo',
diff --git a/src/vs/editor/test/node/diffing/diffingFixture.test.ts b/src/vs/editor/test/node/diffing/fixtures.test.ts
similarity index 99%
rename from src/vs/editor/test/node/diffing/diffingFixture.test.ts
rename to src/vs/editor/test/node/diffing/fixtures.test.ts
index bb42c69d62cc..a7ff5dbe5a11 100644
--- a/src/vs/editor/test/node/diffing/diffingFixture.test.ts
+++ b/src/vs/editor/test/node/diffing/fixtures.test.ts
@@ -12,7 +12,7 @@ import { DetailedLineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { LegacyLinesDiffComputer } from 'vs/editor/common/diff/legacyLinesDiffComputer';
 import { DefaultLinesDiffComputer } from 'vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer';
 
-suite('diff fixtures', () => {
+suite('diffing fixtures', () => {
 	setup(() => {
 		setUnexpectedErrorHandler(e => {
 			throw e;

From b9464d1764809373c5f286d58d932662f68a0f3b Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Thu, 7 Sep 2023 15:38:03 +0200
Subject: [PATCH 0012/1815] Splits up computeUnchangedMoves

---
 .../diff/defaultLinesDiffComputer/computeMovedLines.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/computeMovedLines.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/computeMovedLines.ts
index 6436ad0d9e09..0056565b23fe 100644
--- a/src/vs/editor/common/diff/defaultLinesDiffComputer/computeMovedLines.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/computeMovedLines.ts
@@ -173,6 +173,12 @@ function computeUnchangedMoves(
 		}
 	}
 
+	extendMoves(moves, changes, modifiedSet, originalSet, originalLines, modifiedLines, timeout);
+
+	return moves;
+}
+
+function extendMoves(moves: LineRangeMapping[], changes: DetailedLineRangeMapping[], modifiedSet: LineRangeSet, originalSet: LineRangeSet, originalLines: string[], modifiedLines: string[], timeout: ITimeout) {
 	moves.sort(compareBy(m => m.original.startLineNumber, numberComparator));
 
 	const monotonousChanges = new MonotonousArray(changes);
@@ -229,12 +235,10 @@ function computeUnchangedMoves(
 		if (extendToTop > 0 || extendToBottom > 0) {
 			moves[i] = new LineRangeMapping(
 				new LineRange(move.original.startLineNumber - extendToTop, move.original.endLineNumberExclusive + extendToBottom),
-				new LineRange(move.modified.startLineNumber - extendToTop, move.modified.endLineNumberExclusive + extendToBottom),
+				new LineRange(move.modified.startLineNumber - extendToTop, move.modified.endLineNumberExclusive + extendToBottom)
 			);
 		}
 	}
-
-	return moves;
 }
 
 function areLinesSimilar(line1: string, line2: string, timeout: ITimeout): boolean {

From dc7891db87d22412861a58feb19996a2e0a446d9 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Thu, 15 Jun 2023 15:22:20 -0700
Subject: [PATCH 0013/1815] Use vscode watches for tsserver

---
 .../src/tsServer/protocol/protocol.const.ts   |  3 ++
 .../src/tsServer/spawner.ts                   |  1 +
 .../src/typescriptService.ts                  |  1 +
 .../src/typescriptServiceClient.ts            | 41 +++++++++++++++++++
 4 files changed, 46 insertions(+)

diff --git a/extensions/typescript-language-features/src/tsServer/protocol/protocol.const.ts b/extensions/typescript-language-features/src/tsServer/protocol/protocol.const.ts
index deb3357e6ae3..4f02ed29427e 100644
--- a/extensions/typescript-language-features/src/tsServer/protocol/protocol.const.ts
+++ b/extensions/typescript-language-features/src/tsServer/protocol/protocol.const.ts
@@ -88,6 +88,9 @@ export enum EventName {
 	surveyReady = 'surveyReady',
 	projectLoadingStart = 'projectLoadingStart',
 	projectLoadingFinish = 'projectLoadingFinish',
+	createFileWatcher = 'createFileWatcher',
+	createDirectoryWatcher = 'createDirectoryWatcher',
+	closeFileWatcher = 'closeFileWatcher',
 }
 
 export enum OrganizeImportsMode {
diff --git a/extensions/typescript-language-features/src/tsServer/spawner.ts b/extensions/typescript-language-features/src/tsServer/spawner.ts
index 52dcf5baa193..fed9c1ec0f91 100644
--- a/extensions/typescript-language-features/src/tsServer/spawner.ts
+++ b/extensions/typescript-language-features/src/tsServer/spawner.ts
@@ -270,6 +270,7 @@ export class TypeScriptServerSpawner {
 		args.push('--locale', TypeScriptServerSpawner.getTsLocale(configuration));
 
 		args.push('--noGetErrOnBackgroundUpdate');
+		args.push('--canUseWatchEvents'); // TODO check ts version
 
 		args.push('--validateDefaultNpmLocation');
 
diff --git a/extensions/typescript-language-features/src/typescriptService.ts b/extensions/typescript-language-features/src/typescriptService.ts
index 6eb30e209863..a35df36570f2 100644
--- a/extensions/typescript-language-features/src/typescriptService.ts
+++ b/extensions/typescript-language-features/src/typescriptService.ts
@@ -85,6 +85,7 @@ interface NoResponseTsServerRequests {
 	'compilerOptionsForInferredProjects': [Proto.SetCompilerOptionsForInferredProjectsArgs, null];
 	'reloadProjects': [null, null];
 	'configurePlugin': [Proto.ConfigurePluginRequest, Proto.ConfigurePluginResponse];
+	'watchChange': [Proto.Request, null];
 }
 
 interface AsyncTsServerRequests {
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index 7553be7ed499..9fa0c08144bf 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -128,6 +128,8 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 	private readonly versionProvider: ITypeScriptVersionProvider;
 	private readonly processFactory: TsServerProcessFactory;
 
+	private readonly watches = new Map<number, vscode.FileSystemWatcher>();
+
 	constructor(
 		private readonly context: vscode.ExtensionContext,
 		onCaseInsenitiveFileSystem: boolean,
@@ -973,6 +975,45 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 			case EventName.projectLoadingFinish:
 				this.loadingIndicator.finishedLoadingProject((event as Proto.ProjectLoadingFinishEvent).body.projectName);
 				break;
+
+			case EventName.createDirectoryWatcher:
+				this.createFileSystemWatcher(event.body.id, new vscode.RelativePattern(vscode.Uri.file(event.body.path), event.body.recursive ? '**' : '*'));
+				break;
+
+			case EventName.createFileWatcher:
+				this.createFileSystemWatcher(event.body.id, event.body.path);
+				break;
+
+			case EventName.closeFileWatcher:
+				this.closeFileSystemWatcher(event.body.id);
+				break;
+		}
+	}
+
+	private createFileSystemWatcher(
+		id: number,
+		pattern: vscode.GlobPattern,
+	) {
+		const watcher = vscode.workspace.createFileSystemWatcher(pattern);
+		watcher.onDidChange(changeFile =>
+			this.executeWithoutWaitingForResponse('watchChange', { id, path: changeFile.fsPath, eventType: 'update' })
+		);
+		watcher.onDidCreate(createFile =>
+			this.executeWithoutWaitingForResponse('watchChange', { id, path: createFile.fsPath, eventType: 'create' })
+		);
+		watcher.onDidDelete(deletedFile =>
+			this.executeWithoutWaitingForResponse('watchChange', { id, path: deletedFile.fsPath, eventType: 'delete' })
+		);
+		this.watches.set(id, watcher);
+	}
+
+	private closeFileSystemWatcher(
+		id: number,
+	) {
+		const existing = this.watches.get(id);
+		if (existing) {
+			existing.dispose();
+			this.watches.delete(id);
 		}
 	}
 

From a936df41b768663d19f39f1f6a09544e1c598f96 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 12 Oct 2023 06:13:12 +0200
Subject: [PATCH 0014/1815] towards using new proposed watch API

---
 extensions/typescript-language-features/package.json       | 3 ++-
 .../src/typescriptServiceClient.ts                         | 7 ++++---
 extensions/typescript-language-features/tsconfig.json      | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 607bb3aabe0d..55f685869ac6 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -8,7 +8,8 @@
   "license": "MIT",
   "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
   "enabledApiProposals": [
-    "workspaceTrust"
+    "workspaceTrust",
+    "createFileSystemWatcher"
   ],
   "capabilities": {
     "virtualWorkspaces": {
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index 1557f4ac0a81..dc791e81cdbb 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -977,11 +977,11 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 				break;
 
 			case EventName.createDirectoryWatcher:
-				this.createFileSystemWatcher(event.body.id, new vscode.RelativePattern(vscode.Uri.file(event.body.path), event.body.recursive ? '**' : '*'));
+				this.createFileSystemWatcher(event.body.id, new vscode.RelativePattern(vscode.Uri.file(event.body.path), event.body.recursive ? '**' : '*'), [ /* TODO need to fill in excludes list */]);
 				break;
 
 			case EventName.createFileWatcher:
-				this.createFileSystemWatcher(event.body.id, event.body.path);
+				this.createFileSystemWatcher(event.body.id, event.body.path, []);
 				break;
 
 			case EventName.closeFileWatcher:
@@ -993,8 +993,9 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 	private createFileSystemWatcher(
 		id: number,
 		pattern: vscode.GlobPattern,
+		excludes: string[]
 	) {
-		const watcher = vscode.workspace.createFileSystemWatcher(pattern);
+		const watcher = typeof pattern === 'string' ? vscode.workspace.createFileSystemWatcher(pattern) : vscode.workspace.createFileSystemWatcher(pattern, { excludes });
 		watcher.onDidChange(changeFile =>
 			this.executeWithoutWaitingForResponse('watchChange', { id, path: changeFile.fsPath, eventType: 'update' })
 		);
diff --git a/extensions/typescript-language-features/tsconfig.json b/extensions/typescript-language-features/tsconfig.json
index 73957dde9321..5ac0797334b2 100644
--- a/extensions/typescript-language-features/tsconfig.json
+++ b/extensions/typescript-language-features/tsconfig.json
@@ -11,6 +11,7 @@
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.workspaceTrust.d.ts"
+		"../../src/vscode-dts/vscode.proposed.workspaceTrust.d.ts",
+		"../../src/vscode-dts/vscode.proposed.createFileSystemWatcher.d.ts"
 	]
 }

From 53b6057b6c6754ebc9d11479d4117aa41f461b50 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Fri, 13 Oct 2023 15:21:18 +0200
Subject: [PATCH 0015/1815] unifiy markdown renderers for chats

---
 .../contrib/chat/browser/chatListRenderer.ts  | 372 +---------------
 .../chat/browser/chatMarkdownRenderer.ts      | 412 ++++++++++++++++++
 .../contrib/chat/browser/resourcePool.ts      |  39 ++
 3 files changed, 461 insertions(+), 362 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.ts
 create mode 100644 src/vs/workbench/contrib/chat/browser/resourcePool.ts

diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index 84b9278cbc73..1c6203d2974d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -27,22 +27,8 @@ import { marked } from 'vs/base/common/marked/marked';
 import { FileAccess } from 'vs/base/common/network';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { URI } from 'vs/base/common/uri';
-import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
-import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
-import { EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
-import { ILanguageService } from 'vs/editor/common/languages/language';
-import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
-import { EndOfLinePreference, ITextModel } from 'vs/editor/common/model';
-import { IModelService } from 'vs/editor/common/services/model';
-import { BracketMatchingController } from 'vs/editor/contrib/bracketMatching/browser/bracketMatching';
-import { ContextMenuController } from 'vs/editor/contrib/contextmenu/browser/contextmenu';
-import { IMarkdownRenderResult, MarkdownRenderer } from 'vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
-import { ViewportSemanticTokensContribution } from 'vs/editor/contrib/semanticTokens/browser/viewportSemanticTokens';
-import { SmartSelectController } from 'vs/editor/contrib/smartSelect/browser/smartSelect';
-import { WordHighlighterContribution } from 'vs/editor/contrib/wordHighlighter/browser/wordHighlighter';
+import { IMarkdownRenderResult } from 'vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
 import { localize } from 'vs/nls';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { IMenuEntryActionViewItemOptions, MenuEntryActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
 import { MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
@@ -61,19 +47,17 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IResourceLabel, ResourceLabels } from 'vs/workbench/browser/labels';
 import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { IAccessibleViewService } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
-import { IChatCodeBlockActionContext } from 'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions';
 import { ChatTreeItem, IChatCodeBlockInfo, IChatFileTreeInfo } from 'vs/workbench/contrib/chat/browser/chat';
 import { ChatFollowups } from 'vs/workbench/contrib/chat/browser/chatFollowups';
 import { convertParsedRequestToMarkdown, reduceInlineContentReferences, walkTreeAndAnnotateReferenceLinks } from 'vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer';
+import { ChatMarkdownRenderer } from 'vs/workbench/contrib/chat/browser/chatMarkdownRenderer';
 import { ChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatOptions';
+import { ResourcePool } from 'vs/workbench/contrib/chat/browser/resourcePool';
 import { CONTEXT_REQUEST, CONTEXT_RESPONSE, CONTEXT_RESPONSE_FILTERED, CONTEXT_RESPONSE_HAS_PROVIDER_ID, CONTEXT_RESPONSE_VOTE } from 'vs/workbench/contrib/chat/common/chatContextKeys';
 import { IPlaceholderMarkdownString } from 'vs/workbench/contrib/chat/common/chatModel';
 import { IChatContentReference, IChatReplyFollowup, IChatResponseProgressFileTreeData, IChatService, ISlashCommand, InteractiveSessionVoteDirection } from 'vs/workbench/contrib/chat/common/chatService';
 import { IChatResponseMarkdownRenderData, IChatResponseRenderData, IChatResponseViewModel, IChatWelcomeMessageViewModel, isRequestVM, isResponseVM, isWelcomeVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
 import { IWordCountResult, getNWords } from 'vs/workbench/contrib/chat/common/chatWordCounter';
-import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
-import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
-import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { createFileIconThemableTreeContainerScope } from 'vs/workbench/contrib/files/browser/views/explorerView';
 import { IFilesConfiguration } from 'vs/workbench/contrib/files/common/files';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -116,7 +100,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 	private readonly fileTreesByResponseId = new Map<string, IChatFileTreeInfo[]>();
 	private readonly focusedFileTreesByResponseId = new Map<string, number>();
 
-	private readonly renderer: MarkdownRenderer;
+	private readonly renderer: ChatMarkdownRenderer;
 
 	protected readonly _onDidClickFollowup = this._register(new Emitter<IChatReplyFollowup>());
 	readonly onDidClickFollowup: Event<IChatReplyFollowup> = this._onDidClickFollowup.event;
@@ -124,7 +108,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 	protected readonly _onDidChangeItemHeight = this._register(new Emitter<IItemHeightChangeParams>());
 	readonly onDidChangeItemHeight: Event<IItemHeightChangeParams> = this._onDidChangeItemHeight.event;
 
-	private readonly _editorPool: EditorPool;
 	private readonly _treePool: TreePool;
 	private readonly _contentReferencesListPool: ContentReferencesListPool;
 
@@ -135,7 +118,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 	private _usedReferencesEnabled = false;
 
 	constructor(
-		private readonly editorOptions: ChatEditorOptions,
+		editorOptions: ChatEditorOptions,
 		private readonly rendererOptions: IChatListItemRendererOptions,
 		private readonly delegate: IChatRendererDelegate,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -149,8 +132,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		@IProductService productService: IProductService,
 	) {
 		super();
-		this.renderer = this.instantiationService.createInstance(MarkdownRenderer, {});
-		this._editorPool = this._register(this.instantiationService.createInstance(EditorPool, this.editorOptions));
+		this.renderer = this.instantiationService.createInstance(ChatMarkdownRenderer, editorOptions);
 		this._treePool = this._register(this.instantiationService.createInstance(TreePool, this._onDidChangeVisibility.event));
 		this._contentReferencesListPool = this._register(this.instantiationService.createInstance(ContentReferencesListPool, this._onDidChangeVisibility.event));
 
@@ -220,9 +202,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 	layout(width: number): void {
 		this._currentLayoutWidth = width - 40; // TODO Padding
-		this._editorPool.inUse.forEach(editor => {
-			editor.layout(this._currentLayoutWidth);
-		});
+		this.renderer.layout(this._currentLayoutWidth);
 	}
 
 	renderTemplate(container: HTMLElement): IChatListItemTemplate {
@@ -670,7 +650,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		codicon.classList.add('interactive-response-placeholder-codicon');
 		const result = dom.append(templateData.value, codicon);
 
-		const content = this.renderer.render(markdown);
+		const content = this.renderer.renderSimple(markdown);
 		content.element.className = 'interactive-response-placeholder-content';
 		result.appendChild(content.element);
 
@@ -679,7 +659,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 	private renderMarkdown(markdown: IMarkdownString, element: ChatTreeItem, templateData: IChatListItemTemplate, fillInIncompleteTokens = false): IMarkdownRenderResult {
 		const disposables = new DisposableStore();
-		let codeBlockIndex = 0;
 
 		// TODO if the slash commands stay completely dynamic, this isn't quite right
 		const slashCommands = this.delegate.getSlashCommands();
@@ -692,41 +671,10 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			}
 		});
 
-		// We release editors in order so that it's more likely that the same editor will be assigned if this element is re-rendered right away, like it often is during progressive rendering
-		const orderedDisposablesList: IDisposable[] = [];
-		const codeblocks: IChatCodeBlockInfo[] = [];
-		const result = this.renderer.render(markdown, {
-			fillInIncompleteTokens,
-			codeBlockRendererSync: (languageId, text) => {
-				const data = { languageId, text, codeBlockIndex: codeBlockIndex++, element, parentContextKeyService: templateData.contextKeyService };
-				const ref = this.renderCodeBlock(data, disposables);
-
-				// Attach this after updating text/layout of the editor, so it should only be fired when the size updates later (horizontal scrollbar, wrapping)
-				// not during a renderElement OR a progressive render (when we will be firing this event anyway at the end of the render)
-				disposables.add(ref.object.onDidChangeContentHeight(() => {
-					ref.object.layout(this._currentLayoutWidth);
-					this._onDidChangeItemHeight.fire({ element, height: templateData.rowContainer.offsetHeight });
-				}));
-
-				if (isResponseVM(element)) {
-					const info: IChatCodeBlockInfo = {
-						codeBlockIndex: data.codeBlockIndex,
-						element,
-						focus() {
-							ref.object.focus();
-						}
-					};
-					codeblocks.push(info);
-					this.codeBlocksByEditorUri.set(ref.object.textModel.uri, info);
-					disposables.add(toDisposable(() => this.codeBlocksByEditorUri.delete(ref.object.textModel.uri)));
-				}
-				orderedDisposablesList.push(ref);
-				return ref.object.element;
-			}
-		});
+		const result = this.renderer.render(markdown, element, templateData.contextKeyService, fillInIncompleteTokens);
 
 		if (isResponseVM(element)) {
-			this.codeBlocksByResponseId.set(element.id, codeblocks);
+			this.codeBlocksByResponseId.set(element.id, result.codeblocks);
 			disposables.add(toDisposable(() => this.codeBlocksByResponseId.delete(element.id)));
 		}
 
@@ -741,7 +689,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			}
 		}
 
-		orderedDisposablesList.reverse().forEach(d => disposables.add(d));
 		return {
 			element: result.element,
 			dispose() {
@@ -751,14 +698,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		};
 	}
 
-	private renderCodeBlock(data: IChatResultCodeBlockData, disposables: DisposableStore): IDisposableReference<IChatResultCodeBlockPart> {
-		const ref = this._editorPool.get();
-		const editorInfo = ref.object;
-		editorInfo.render(data, this._currentLayoutWidth);
-
-		return ref;
-	}
-
 	private getDataForProgressiveRender(element: IChatResponseViewModel, data: IMarkdownString, renderData: Pick<IChatResponseMarkdownRenderData, 'lastRenderTime' | 'renderedWordCount'>): IWordCountResult | undefined {
 		const rate = this.getProgressiveRenderRate(element);
 		const numWordsToRender = renderData.lastRenderTime === 0 ?
@@ -889,270 +828,10 @@ export class ChatAccessibilityProvider implements IListAccessibilityProvider<Cha
 	}
 }
 
-interface IChatResultCodeBlockData {
-	text: string;
-	languageId: string;
-	codeBlockIndex: number;
-	element: ChatTreeItem;
-	parentContextKeyService: IContextKeyService;
-}
-
-interface IChatResultCodeBlockPart {
-	readonly onDidChangeContentHeight: Event<number>;
-	readonly element: HTMLElement;
-	readonly textModel: ITextModel;
-	layout(width: number): void;
-	render(data: IChatResultCodeBlockData, width: number): void;
-	focus(): void;
-	dispose(): void;
-}
-
-const defaultCodeblockPadding = 10;
-
-class CodeBlockPart extends Disposable implements IChatResultCodeBlockPart {
-	private readonly _onDidChangeContentHeight = this._register(new Emitter<number>());
-	public readonly onDidChangeContentHeight = this._onDidChangeContentHeight.event;
-
-	private readonly editor: CodeEditorWidget;
-	private readonly toolbar: MenuWorkbenchToolBar;
-	private readonly contextKeyService: IContextKeyService;
-
-	public readonly textModel: ITextModel;
-	public readonly element: HTMLElement;
-
-	private currentScrollWidth = 0;
-
-	constructor(
-		private readonly options: ChatEditorOptions,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@ILanguageService private readonly languageService: ILanguageService,
-		@IModelService private readonly modelService: IModelService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IAccessibilityService private readonly accessibilityService: IAccessibilityService
-	) {
-		super();
-		this.element = $('.interactive-result-editor-wrapper');
-		this.contextKeyService = this._register(contextKeyService.createScoped(this.element));
-		const scopedInstantiationService = instantiationService.createChild(new ServiceCollection([IContextKeyService, this.contextKeyService]));
-		this.toolbar = this._register(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, this.element, MenuId.ChatCodeBlock, {
-			menuOptions: {
-				shouldForwardArgs: true
-			}
-		}));
-
-		this._configureForScreenReader();
-		this._register(this.accessibilityService.onDidChangeScreenReaderOptimized(() => this._configureForScreenReader()));
-		this._register(this.configurationService.onDidChangeConfiguration((e) => {
-			if (e.affectedKeys.has(AccessibilityVerbositySettingId.Chat)) {
-				this._configureForScreenReader();
-			}
-		}));
-		const editorElement = dom.append(this.element, $('.interactive-result-editor'));
-		this.editor = this._register(scopedInstantiationService.createInstance(CodeEditorWidget, editorElement, {
-			...getSimpleEditorOptions(this.configurationService),
-			readOnly: true,
-			lineNumbers: 'off',
-			selectOnLineNumbers: true,
-			scrollBeyondLastLine: false,
-			lineDecorationsWidth: 8,
-			dragAndDrop: false,
-			padding: { top: defaultCodeblockPadding, bottom: defaultCodeblockPadding },
-			mouseWheelZoom: false,
-			scrollbar: {
-				alwaysConsumeMouseWheel: false
-			},
-			ariaLabel: localize('chat.codeBlockHelp', 'Code block'),
-			...this.getEditorOptionsFromConfig()
-		}, {
-			isSimpleWidget: true,
-			contributions: EditorExtensionsRegistry.getSomeEditorContributions([
-				MenuPreventer.ID,
-				SelectionClipboardContributionID,
-				ContextMenuController.ID,
-
-				WordHighlighterContribution.ID,
-				ViewportSemanticTokensContribution.ID,
-				BracketMatchingController.ID,
-				SmartSelectController.ID,
-			])
-		}));
-
-		this._register(this.options.onDidChange(() => {
-			this.editor.updateOptions(this.getEditorOptionsFromConfig());
-		}));
-
-		this._register(this.editor.onDidScrollChange(e => {
-			this.currentScrollWidth = e.scrollWidth;
-		}));
-		this._register(this.editor.onDidContentSizeChange(e => {
-			if (e.contentHeightChanged) {
-				this._onDidChangeContentHeight.fire(e.contentHeight);
-			}
-		}));
-		this._register(this.editor.onDidBlurEditorWidget(() => {
-			this.element.classList.remove('focused');
-			WordHighlighterContribution.get(this.editor)?.stopHighlighting();
-		}));
-		this._register(this.editor.onDidFocusEditorWidget(() => {
-			this.element.classList.add('focused');
-			WordHighlighterContribution.get(this.editor)?.restoreViewState(true);
-		}));
-
-		this.textModel = this._register(this.modelService.createModel('', null, undefined));
-		this.editor.setModel(this.textModel);
-	}
-
-	focus(): void {
-		this.editor.focus();
-	}
-
-	private updatePaddingForLayout() {
-		// scrollWidth = "the width of the content that needs to be scrolled"
-		// contentWidth = "the width of the area where content is displayed"
-		const horizontalScrollbarVisible = this.currentScrollWidth > this.editor.getLayoutInfo().contentWidth;
-		const scrollbarHeight = this.editor.getLayoutInfo().horizontalScrollbarHeight;
-		const bottomPadding = horizontalScrollbarVisible ?
-			Math.max(defaultCodeblockPadding - scrollbarHeight, 2) :
-			defaultCodeblockPadding;
-		this.editor.updateOptions({ padding: { top: defaultCodeblockPadding, bottom: bottomPadding } });
-	}
-
-	private _configureForScreenReader(): void {
-		const toolbarElt = this.toolbar.getElement();
-		if (this.accessibilityService.isScreenReaderOptimized()) {
-			toolbarElt.style.display = 'block';
-			toolbarElt.ariaLabel = this.configurationService.getValue(AccessibilityVerbositySettingId.Chat) ? localize('chat.codeBlock.toolbarVerbose', 'Toolbar for code block which can be reached via tab') : localize('chat.codeBlock.toolbar', 'Code block toolbar');
-		} else {
-			toolbarElt.style.display = '';
-		}
-
-	}
-
-	private getEditorOptionsFromConfig(): IEditorOptions {
-		return {
-			wordWrap: this.options.configuration.resultEditor.wordWrap,
-			fontLigatures: this.options.configuration.resultEditor.fontLigatures,
-			bracketPairColorization: this.options.configuration.resultEditor.bracketPairColorization,
-			fontFamily: this.options.configuration.resultEditor.fontFamily === 'default' ?
-				EDITOR_FONT_DEFAULTS.fontFamily :
-				this.options.configuration.resultEditor.fontFamily,
-			fontSize: this.options.configuration.resultEditor.fontSize,
-			fontWeight: this.options.configuration.resultEditor.fontWeight,
-			lineHeight: this.options.configuration.resultEditor.lineHeight,
-		};
-	}
-
-	layout(width: number): void {
-		const realContentHeight = this.editor.getContentHeight();
-		const editorBorder = 2;
-		this.editor.layout({ width: width - editorBorder, height: realContentHeight });
-		this.updatePaddingForLayout();
-	}
-
-	render(data: IChatResultCodeBlockData, width: number): void {
-		this.contextKeyService.updateParent(data.parentContextKeyService);
-
-		if (this.options.configuration.resultEditor.wordWrap === 'on') {
-			// Intialize the editor with the new proper width so that getContentHeight
-			// will be computed correctly in the next call to layout()
-			this.layout(width);
-		}
-
-		const text = this.fixCodeText(data.text, data.languageId);
-		this.setText(text);
-
-		const vscodeLanguageId = this.languageService.getLanguageIdByLanguageName(data.languageId) ?? undefined;
-		this.setLanguage(vscodeLanguageId);
-
-		this.layout(width);
-		this.editor.updateOptions({ ariaLabel: localize('chat.codeBlockLabel', "Code block {0}", data.codeBlockIndex + 1) });
-		this.toolbar.context = <IChatCodeBlockActionContext>{
-			code: data.text,
-			codeBlockIndex: data.codeBlockIndex,
-			element: data.element,
-			languageId: vscodeLanguageId
-		};
-
-		if (isResponseVM(data.element) && data.element.errorDetails?.responseIsFiltered) {
-			dom.hide(this.toolbar.getElement());
-		} else {
-			dom.show(this.toolbar.getElement());
-		}
-	}
-
-	private fixCodeText(text: string, languageId: string): string {
-		if (languageId === 'php') {
-			if (!text.trim().startsWith('<')) {
-				return `<?php\n${text}\n?>`;
-			}
-		}
-
-		return text;
-	}
-
-	private setText(newText: string): void {
-		const currentText = this.textModel.getValue(EndOfLinePreference.LF);
-		if (newText === currentText) {
-			return;
-		}
-
-		if (newText.startsWith(currentText)) {
-			const text = newText.slice(currentText.length);
-			const lastLine = this.textModel.getLineCount();
-			const lastCol = this.textModel.getLineMaxColumn(lastLine);
-			this.textModel.applyEdits([{ range: new Range(lastLine, lastCol, lastLine, lastCol), text }]);
-		} else {
-			// console.log(`Failed to optimize setText`);
-			this.textModel.setValue(newText);
-		}
-	}
-
-	private setLanguage(vscodeLanguageId: string | undefined): void {
-		this.textModel.setLanguage(vscodeLanguageId ?? PLAINTEXT_LANGUAGE_ID);
-	}
-}
-
 interface IDisposableReference<T> extends IDisposable {
 	object: T;
 	isStale: () => boolean;
 }
-
-class EditorPool extends Disposable {
-	private _pool: ResourcePool<IChatResultCodeBlockPart>;
-
-	public get inUse(): ReadonlySet<IChatResultCodeBlockPart> {
-		return this._pool.inUse;
-	}
-
-	constructor(
-		private readonly options: ChatEditorOptions,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-	) {
-		super();
-		this._pool = this._register(new ResourcePool(() => this.editorFactory()));
-
-		// TODO listen to changes on options
-	}
-
-	private editorFactory(): IChatResultCodeBlockPart {
-		return this.instantiationService.createInstance(CodeBlockPart, this.options);
-	}
-
-	get(): IDisposableReference<IChatResultCodeBlockPart> {
-		const object = this._pool.get();
-		let stale = false;
-		return {
-			object,
-			isStale: () => stale,
-			dispose: () => {
-				stale = true;
-				this._pool.release(object);
-			}
-		};
-	}
-}
-
 class TreePool extends Disposable {
 	private _pool: ResourcePool<WorkbenchCompressibleAsyncDataTree<IChatResponseProgressFileTreeData, IChatResponseProgressFileTreeData, void>>;
 
@@ -1302,37 +981,6 @@ class ContentReferencesListRenderer implements IListRenderer<IChatContentReferen
 	}
 }
 
-class ResourcePool<T extends IDisposable> extends Disposable {
-	private readonly pool: T[] = [];
-
-	private _inUse = new Set<T>;
-	public get inUse(): ReadonlySet<T> {
-		return this._inUse;
-	}
-
-	constructor(
-		private readonly _itemFactory: () => T,
-	) {
-		super();
-	}
-
-	get(): T {
-		if (this.pool.length > 0) {
-			const item = this.pool.pop()!;
-			this._inUse.add(item);
-			return item;
-		}
-
-		const item = this._register(this._itemFactory());
-		this._inUse.add(item);
-		return item;
-	}
-
-	release(item: T): void {
-		this._inUse.delete(item);
-		this.pool.push(item);
-	}
-}
 
 class ChatVoteButton extends MenuEntryActionViewItem {
 	override render(container: HTMLElement): void {
diff --git a/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.ts
new file mode 100644
index 000000000000..298a6f512894
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.ts
@@ -0,0 +1,412 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as dom from 'vs/base/browser/dom';
+import { Emitter, Event } from 'vs/base/common/event';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
+import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
+import { ILanguageService } from 'vs/editor/common/languages/language';
+import { EndOfLinePreference, ITextModel } from 'vs/editor/common/model';
+import { IModelService } from 'vs/editor/common/services/model';
+import { IMarkdownRenderResult, MarkdownRenderer } from 'vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
+import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
+import { MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
+import { MenuId } from 'vs/platform/actions/common/actions';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { ChatTreeItem, IChatCodeBlockInfo } from 'vs/workbench/contrib/chat/browser/chat';
+import { ChatEditorOptions } from 'vs/workbench/contrib/chat/browser/chatOptions';
+import { ResourcePool } from 'vs/workbench/contrib/chat/browser/resourcePool';
+import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
+import { localize } from 'vs/nls';
+import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
+import { IEditorOptions, EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
+import { PLAINTEXT_LANGUAGE_ID } from 'vs/editor/common/languages/modesRegistry';
+import { BracketMatchingController } from 'vs/editor/contrib/bracketMatching/browser/bracketMatching';
+import { ContextMenuController } from 'vs/editor/contrib/contextmenu/browser/contextmenu';
+import { ViewportSemanticTokensContribution } from 'vs/editor/contrib/semanticTokens/browser/viewportSemanticTokens';
+import { SmartSelectController } from 'vs/editor/contrib/smartSelect/browser/smartSelect';
+import { WordHighlighterContribution } from 'vs/editor/contrib/wordHighlighter/browser/wordHighlighter';
+import { IChatCodeBlockActionContext } from 'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions';
+import { isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
+import { MenuPreventer } from 'vs/workbench/contrib/codeEditor/browser/menuPreventer';
+import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
+import { Range } from 'vs/editor/common/core/range';
+import { IMarkdownString } from 'vs/base/common/htmlContent';
+import { ResourceMap } from 'vs/base/common/map';
+import { URI } from 'vs/base/common/uri';
+
+const $ = dom.$;
+
+export interface IItemHeightChangeParams {
+	element: ChatTreeItem;
+}
+
+export class ChatMarkdownRenderer {
+
+	private readonly _renderer: MarkdownRenderer;
+	private readonly _editorPool: EditorPool;
+	private readonly _store = new DisposableStore();
+	private _currentLayoutWidth: number = 0;
+
+	private readonly _codeBlocksByEditorUri = new ResourceMap<IChatCodeBlockInfo>();
+
+	protected readonly _onDidChangeItemHeight = this._store.add(new Emitter<IItemHeightChangeParams>());
+	readonly onDidChangeItemHeight: Event<IItemHeightChangeParams> = this._onDidChangeItemHeight.event;
+
+	constructor(
+		private readonly editorOptions: ChatEditorOptions,
+		@IInstantiationService _instaService: IInstantiationService
+	) {
+		this._renderer = _instaService.createInstance(MarkdownRenderer, {});
+		this._editorPool = this._store.add(_instaService.createInstance(EditorPool, this.editorOptions));
+
+	}
+
+	getCodeBlockInfoForEditor(uri: URI): IChatCodeBlockInfo | undefined {
+		return this._codeBlocksByEditorUri.get(uri);
+	}
+
+	layout(width: number): void {
+		this._currentLayoutWidth = width - 40; // TODO Padding
+		this._editorPool.inUse.forEach(editor => {
+			editor.layout(this._currentLayoutWidth);
+		});
+	}
+
+	public renderSimple(markdown: IMarkdownString): IMarkdownRenderResult {
+		return this._renderer.render(markdown);
+	}
+
+	public render(markdown: IMarkdownString, element: ChatTreeItem, parentContextKeyService: IContextKeyService, fillInIncompleteTokens = false) {
+		let codeBlockIndex = 0;
+		const disposables = new DisposableStore();
+
+		// We release editors in order so that it's more likely that the same editor will be assigned if this element is re-rendered right away, like it often is during progressive rendering
+		const orderedDisposablesList: IDisposable[] = [];
+
+		const codeblocks: IChatCodeBlockInfo[] = [];
+
+		const result = this._renderer.render(markdown, {
+			fillInIncompleteTokens,
+			codeBlockRendererSync: (languageId, text) => {
+				const data = { languageId, text, codeBlockIndex: codeBlockIndex++, element, parentContextKeyService };
+				const ref = this.renderCodeBlock(data, disposables);
+
+				// Attach this after updating text/layout of the editor, so it should only be fired when the size updates later (horizontal scrollbar, wrapping)
+				// not during a renderElement OR a progressive render (when we will be firing this event anyway at the end of the render)
+				disposables.add(ref.object.onDidChangeContentHeight(() => {
+					ref.object.layout(this._currentLayoutWidth);
+					this._onDidChangeItemHeight.fire({ element });
+				}));
+
+				if (isResponseVM(element)) {
+					const info: IChatCodeBlockInfo = {
+						codeBlockIndex: data.codeBlockIndex,
+						element,
+						focus() {
+							ref.object.focus();
+						}
+					};
+					codeblocks.push(info);
+					this._codeBlocksByEditorUri.set(ref.object.textModel.uri, info);
+					disposables.add(toDisposable(() => this._codeBlocksByEditorUri.delete(ref.object.textModel.uri)));
+				}
+				orderedDisposablesList.push(ref);
+				return ref.object.element;
+			}
+		});
+
+		return {
+			element: result.element,
+			codeblocks,
+			dispose() {
+				result.dispose();
+				disposables.dispose();
+			}
+		};
+	}
+
+	private renderCodeBlock(data: IChatResultCodeBlockData, disposables: DisposableStore): IDisposableReference<IChatResultCodeBlockPart> {
+		const ref = this._editorPool.get();
+		const editorInfo = ref.object;
+		editorInfo.render(data, this._currentLayoutWidth);
+
+		return ref;
+	}
+
+	dispose(): void {
+		this._store.dispose();
+	}
+}
+
+export interface IDisposableReference<T> extends IDisposable {
+	object: T;
+	isStale: () => boolean;
+}
+
+export interface IChatResultCodeBlockData {
+	text: string;
+	languageId: string;
+	codeBlockIndex: number;
+	element: ChatTreeItem;
+	parentContextKeyService: IContextKeyService;
+}
+
+export interface IChatResultCodeBlockPart {
+	readonly onDidChangeContentHeight: Event<number>;
+	readonly element: HTMLElement;
+	readonly textModel: ITextModel;
+	layout(width: number): void;
+	render(data: IChatResultCodeBlockData, width: number): void;
+	focus(): void;
+	dispose(): void;
+}
+
+const defaultCodeblockPadding = 10;
+
+class CodeBlockPart extends Disposable implements IChatResultCodeBlockPart {
+	private readonly _onDidChangeContentHeight = this._register(new Emitter<number>());
+	public readonly onDidChangeContentHeight = this._onDidChangeContentHeight.event;
+
+	private readonly editor: CodeEditorWidget;
+	private readonly toolbar: MenuWorkbenchToolBar;
+	private readonly contextKeyService: IContextKeyService;
+
+	public readonly textModel: ITextModel;
+	public readonly element: HTMLElement;
+
+	private currentScrollWidth = 0;
+
+	constructor(
+		private readonly options: ChatEditorOptions,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@ILanguageService private readonly languageService: ILanguageService,
+		@IModelService private readonly modelService: IModelService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IAccessibilityService private readonly accessibilityService: IAccessibilityService
+	) {
+		super();
+		this.element = $('.interactive-result-editor-wrapper');
+		this.contextKeyService = this._register(contextKeyService.createScoped(this.element));
+		const scopedInstantiationService = instantiationService.createChild(new ServiceCollection([IContextKeyService, this.contextKeyService]));
+		this.toolbar = this._register(scopedInstantiationService.createInstance(MenuWorkbenchToolBar, this.element, MenuId.ChatCodeBlock, {
+			menuOptions: {
+				shouldForwardArgs: true
+			}
+		}));
+
+		this._configureForScreenReader();
+		this._register(this.accessibilityService.onDidChangeScreenReaderOptimized(() => this._configureForScreenReader()));
+		this._register(this.configurationService.onDidChangeConfiguration((e) => {
+			if (e.affectedKeys.has(AccessibilityVerbositySettingId.Chat)) {
+				this._configureForScreenReader();
+			}
+		}));
+		const editorElement = dom.append(this.element, $('.interactive-result-editor'));
+		this.editor = this._register(scopedInstantiationService.createInstance(CodeEditorWidget, editorElement, {
+			...getSimpleEditorOptions(this.configurationService),
+			readOnly: true,
+			lineNumbers: 'off',
+			selectOnLineNumbers: true,
+			scrollBeyondLastLine: false,
+			lineDecorationsWidth: 8,
+			dragAndDrop: false,
+			padding: { top: defaultCodeblockPadding, bottom: defaultCodeblockPadding },
+			mouseWheelZoom: false,
+			scrollbar: {
+				alwaysConsumeMouseWheel: false
+			},
+			ariaLabel: localize('chat.codeBlockHelp', 'Code block'),
+			...this.getEditorOptionsFromConfig()
+		}, {
+			isSimpleWidget: true,
+			contributions: EditorExtensionsRegistry.getSomeEditorContributions([
+				MenuPreventer.ID,
+				SelectionClipboardContributionID,
+				ContextMenuController.ID,
+
+				WordHighlighterContribution.ID,
+				ViewportSemanticTokensContribution.ID,
+				BracketMatchingController.ID,
+				SmartSelectController.ID,
+			])
+		}));
+
+		this._register(this.options.onDidChange(() => {
+			this.editor.updateOptions(this.getEditorOptionsFromConfig());
+		}));
+
+		this._register(this.editor.onDidScrollChange(e => {
+			this.currentScrollWidth = e.scrollWidth;
+		}));
+		this._register(this.editor.onDidContentSizeChange(e => {
+			if (e.contentHeightChanged) {
+				this._onDidChangeContentHeight.fire(e.contentHeight);
+			}
+		}));
+		this._register(this.editor.onDidBlurEditorWidget(() => {
+			this.element.classList.remove('focused');
+			WordHighlighterContribution.get(this.editor)?.stopHighlighting();
+		}));
+		this._register(this.editor.onDidFocusEditorWidget(() => {
+			this.element.classList.add('focused');
+			WordHighlighterContribution.get(this.editor)?.restoreViewState(true);
+		}));
+
+		this.textModel = this._register(this.modelService.createModel('', null, undefined));
+		this.editor.setModel(this.textModel);
+	}
+
+	focus(): void {
+		this.editor.focus();
+	}
+
+	private updatePaddingForLayout() {
+		// scrollWidth = "the width of the content that needs to be scrolled"
+		// contentWidth = "the width of the area where content is displayed"
+		const horizontalScrollbarVisible = this.currentScrollWidth > this.editor.getLayoutInfo().contentWidth;
+		const scrollbarHeight = this.editor.getLayoutInfo().horizontalScrollbarHeight;
+		const bottomPadding = horizontalScrollbarVisible ?
+			Math.max(defaultCodeblockPadding - scrollbarHeight, 2) :
+			defaultCodeblockPadding;
+		this.editor.updateOptions({ padding: { top: defaultCodeblockPadding, bottom: bottomPadding } });
+	}
+
+	private _configureForScreenReader(): void {
+		const toolbarElt = this.toolbar.getElement();
+		if (this.accessibilityService.isScreenReaderOptimized()) {
+			toolbarElt.style.display = 'block';
+			toolbarElt.ariaLabel = this.configurationService.getValue(AccessibilityVerbositySettingId.Chat) ? localize('chat.codeBlock.toolbarVerbose', 'Toolbar for code block which can be reached via tab') : localize('chat.codeBlock.toolbar', 'Code block toolbar');
+		} else {
+			toolbarElt.style.display = '';
+		}
+
+	}
+
+	private getEditorOptionsFromConfig(): IEditorOptions {
+		return {
+			wordWrap: this.options.configuration.resultEditor.wordWrap,
+			fontLigatures: this.options.configuration.resultEditor.fontLigatures,
+			bracketPairColorization: this.options.configuration.resultEditor.bracketPairColorization,
+			fontFamily: this.options.configuration.resultEditor.fontFamily === 'default' ?
+				EDITOR_FONT_DEFAULTS.fontFamily :
+				this.options.configuration.resultEditor.fontFamily,
+			fontSize: this.options.configuration.resultEditor.fontSize,
+			fontWeight: this.options.configuration.resultEditor.fontWeight,
+			lineHeight: this.options.configuration.resultEditor.lineHeight,
+		};
+	}
+
+	layout(width: number): void {
+		const realContentHeight = this.editor.getContentHeight();
+		const editorBorder = 2;
+		this.editor.layout({ width: width - editorBorder, height: realContentHeight });
+		this.updatePaddingForLayout();
+	}
+
+	render(data: IChatResultCodeBlockData, width: number): void {
+		this.contextKeyService.updateParent(data.parentContextKeyService);
+
+		if (this.options.configuration.resultEditor.wordWrap === 'on') {
+			// Intialize the editor with the new proper width so that getContentHeight
+			// will be computed correctly in the next call to layout()
+			this.layout(width);
+		}
+
+		const text = this.fixCodeText(data.text, data.languageId);
+		this.setText(text);
+
+		const vscodeLanguageId = this.languageService.getLanguageIdByLanguageName(data.languageId) ?? undefined;
+		this.setLanguage(vscodeLanguageId);
+
+		this.layout(width);
+		this.editor.updateOptions({ ariaLabel: localize('chat.codeBlockLabel', "Code block {0}", data.codeBlockIndex + 1) });
+		this.toolbar.context = <IChatCodeBlockActionContext>{
+			code: data.text,
+			codeBlockIndex: data.codeBlockIndex,
+			element: data.element,
+			languageId: vscodeLanguageId
+		};
+
+		if (isResponseVM(data.element) && data.element.errorDetails?.responseIsFiltered) {
+			dom.hide(this.toolbar.getElement());
+		} else {
+			dom.show(this.toolbar.getElement());
+		}
+	}
+
+	private fixCodeText(text: string, languageId: string): string {
+		if (languageId === 'php') {
+			if (!text.trim().startsWith('<')) {
+				return `<?php\n${text}\n?>`;
+			}
+		}
+
+		return text;
+	}
+
+	private setText(newText: string): void {
+		const currentText = this.textModel.getValue(EndOfLinePreference.LF);
+		if (newText === currentText) {
+			return;
+		}
+
+		if (newText.startsWith(currentText)) {
+			const text = newText.slice(currentText.length);
+			const lastLine = this.textModel.getLineCount();
+			const lastCol = this.textModel.getLineMaxColumn(lastLine);
+			this.textModel.applyEdits([{ range: new Range(lastLine, lastCol, lastLine, lastCol), text }]);
+		} else {
+			// console.log(`Failed to optimize setText`);
+			this.textModel.setValue(newText);
+		}
+	}
+
+	private setLanguage(vscodeLanguageId: string | undefined): void {
+		this.textModel.setLanguage(vscodeLanguageId ?? PLAINTEXT_LANGUAGE_ID);
+	}
+}
+
+
+
+class EditorPool extends Disposable {
+	private _pool: ResourcePool<IChatResultCodeBlockPart>;
+
+	public get inUse(): ReadonlySet<IChatResultCodeBlockPart> {
+		return this._pool.inUse;
+	}
+
+	constructor(
+		private readonly options: ChatEditorOptions,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super();
+		this._pool = this._register(new ResourcePool(() => this.editorFactory()));
+
+		// TODO listen to changes on options
+	}
+
+	private editorFactory(): IChatResultCodeBlockPart {
+		return this.instantiationService.createInstance(CodeBlockPart, this.options);
+	}
+
+	get(): IDisposableReference<IChatResultCodeBlockPart> {
+		const object = this._pool.get();
+		let stale = false;
+		return {
+			object,
+			isStale: () => stale,
+			dispose: () => {
+				stale = true;
+				this._pool.release(object);
+			}
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/resourcePool.ts b/src/vs/workbench/contrib/chat/browser/resourcePool.ts
new file mode 100644
index 000000000000..4ee1949d7d31
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/resourcePool.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, IDisposable } from 'vs/base/common/lifecycle';
+
+
+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);
+	}
+}

From bf56b37fd6f6a379dd18b33249ccdd9851802c89 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Wed, 18 Oct 2023 10:13:07 -0700
Subject: [PATCH 0016/1815] Add setting and make sure to clear watchers

---
 extensions/typescript-language-features/package.json |  5 +++++
 .../typescript-language-features/package.nls.json    |  1 +
 .../src/configuration/configuration.ts               |  8 +++++++-
 .../src/tsServer/spawner.ts                          |  5 ++++-
 .../src/typescriptServiceClient.ts                   | 12 +++++++++++-
 .../src/utils/dispose.ts                             |  7 +++----
 6 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 55f685869ac6..19a7ab3fc0bc 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -1193,6 +1193,11 @@
             "experimental"
           ]
         },
+        "typescript.tsserver.experimental.useVsCodeWatcher": {
+          "type": "boolean",
+          "description": "%configuration.tsserver.useVsCodeWatcher%",
+          "default": true
+        },
         "typescript.tsserver.watchOptions": {
           "type": "object",
           "description": "%configuration.tsserver.watchOptions%",
diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
index f31c5fa3be4f..c1e66855c78f 100644
--- a/extensions/typescript-language-features/package.nls.json
+++ b/extensions/typescript-language-features/package.nls.json
@@ -171,6 +171,7 @@
 	"typescript.suggest.enabled": "Enabled/disable autocomplete suggestions.",
 	"configuration.surveys.enabled": "Enabled/disable occasional surveys that help us improve VS Code's JavaScript and TypeScript support.",
 	"configuration.suggest.completeJSDocs": "Enable/disable suggestion to complete JSDoc comments.",
+	"configuration.tsserver.useVsCodeWatcher": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.3+ in the workspace.",
 	"configuration.tsserver.watchOptions": "Configure which watching strategies should be used to keep track of files and directories.",
 	"configuration.tsserver.watchOptions.watchFile": "Strategy for how individual files are watched.",
 	"configuration.tsserver.watchOptions.watchFile.fixedChunkSizePolling": "Polls files in chunks at regular interval.",
diff --git a/extensions/typescript-language-features/src/configuration/configuration.ts b/extensions/typescript-language-features/src/configuration/configuration.ts
index 5fce20d1d1f2..484c180609ba 100644
--- a/extensions/typescript-language-features/src/configuration/configuration.ts
+++ b/extensions/typescript-language-features/src/configuration/configuration.ts
@@ -117,6 +117,7 @@ export interface TypeScriptServiceConfiguration {
 	readonly enableProjectDiagnostics: boolean;
 	readonly maxTsServerMemory: number;
 	readonly enablePromptUseWorkspaceTsdk: boolean;
+	readonly useVsCodeWatcher: boolean;
 	readonly watchOptions: Proto.WatchOptions | undefined;
 	readonly includePackageJsonAutoImports: 'auto' | 'on' | 'off' | undefined;
 	readonly enableTsServerTracing: boolean;
@@ -154,6 +155,7 @@ export abstract class BaseServiceConfigurationProvider implements ServiceConfigu
 			enableProjectDiagnostics: this.readEnableProjectDiagnostics(configuration),
 			maxTsServerMemory: this.readMaxTsServerMemory(configuration),
 			enablePromptUseWorkspaceTsdk: this.readEnablePromptUseWorkspaceTsdk(configuration),
+			useVsCodeWatcher: this.readUseVsCodeWatcher(configuration),
 			watchOptions: this.readWatchOptions(configuration),
 			includePackageJsonAutoImports: this.readIncludePackageJsonAutoImports(configuration),
 			enableTsServerTracing: this.readEnableTsServerTracing(configuration),
@@ -222,7 +224,11 @@ export abstract class BaseServiceConfigurationProvider implements ServiceConfigu
 		return configuration.get<boolean>('typescript.tsserver.experimental.enableProjectDiagnostics', false);
 	}
 
-	protected readWatchOptions(configuration: vscode.WorkspaceConfiguration): Proto.WatchOptions | undefined {
+	private readUseVsCodeWatcher(configuration: vscode.WorkspaceConfiguration): boolean {
+		return configuration.get<boolean>('typescript.tsserver.experimental.useVsCodeWatcher', true);
+	}
+
+	private readWatchOptions(configuration: vscode.WorkspaceConfiguration): Proto.WatchOptions | undefined {
 		const watchOptions = configuration.get<Proto.WatchOptions>('typescript.tsserver.watchOptions');
 		// Returned value may be a proxy. Clone it into a normal object
 		return { ...(watchOptions ?? {}) };
diff --git a/extensions/typescript-language-features/src/tsServer/spawner.ts b/extensions/typescript-language-features/src/tsServer/spawner.ts
index fed9c1ec0f91..bbe5b1d1d12e 100644
--- a/extensions/typescript-language-features/src/tsServer/spawner.ts
+++ b/extensions/typescript-language-features/src/tsServer/spawner.ts
@@ -270,7 +270,10 @@ export class TypeScriptServerSpawner {
 		args.push('--locale', TypeScriptServerSpawner.getTsLocale(configuration));
 
 		args.push('--noGetErrOnBackgroundUpdate');
-		args.push('--canUseWatchEvents'); // TODO check ts version
+
+		if (apiVersion.gte(API.v350) && configuration.useVsCodeWatcher) {
+			args.push('--canUseWatchEvents');
+		}
 
 		args.push('--validateDefaultNpmLocation');
 
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index dc791e81cdbb..4ed897074b1c 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -21,7 +21,7 @@ import { TypeScriptVersionManager } from './tsServer/versionManager';
 import { ITypeScriptVersionProvider, TypeScriptVersion } from './tsServer/versionProvider';
 import { ClientCapabilities, ClientCapability, ExecConfig, ITypeScriptServiceClient, ServerResponse, TypeScriptRequests } from './typescriptService';
 import { ServiceConfigurationProvider, SyntaxServerConfiguration, TsServerLogLevel, TypeScriptServiceConfiguration, areServiceConfigurationsEqual } from './configuration/configuration';
-import { Disposable } from './utils/dispose';
+import { Disposable, disposeAll } from './utils/dispose';
 import * as fileSchemes from './configuration/fileSchemes';
 import { Logger } from './logging/logger';
 import { isWeb, isWebAndHasSharedArrayBuffers } from './utils/platform';
@@ -300,6 +300,8 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 		}
 
 		this.loadingIndicator.reset();
+
+		this.resetWatchers();
 	}
 
 	public restartTsServer(fromUserAction = false): void {
@@ -403,6 +405,8 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 			this.info(`Using Node installation from ${nodePath} to run TS Server`);
 		}
 
+		this.resetWatchers();
+
 		const apiVersion = version.apiVersion || API.defaultVersion;
 		const mytoken = ++this.token;
 		const handle = this.typescriptServerSpawner.spawn(version, this.capabilities, this.configuration, this.pluginManager, this.cancellerFactory, {
@@ -495,6 +499,11 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 		return this.serverState;
 	}
 
+	private resetWatchers() {
+		disposeAll(this.watches.values());
+		this.watches.clear();
+	}
+
 	public async showVersionPicker(): Promise<void> {
 		this._versionManager.promptUserForVersion();
 	}
@@ -596,6 +605,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 	}
 
 	private serviceExited(restart: boolean): void {
+		this.resetWatchers();
 		this.loadingIndicator.reset();
 
 		const previousState = this.serverState;
diff --git a/extensions/typescript-language-features/src/utils/dispose.ts b/extensions/typescript-language-features/src/utils/dispose.ts
index 7b6627204d5e..a1eb92b9dd7f 100644
--- a/extensions/typescript-language-features/src/utils/dispose.ts
+++ b/extensions/typescript-language-features/src/utils/dispose.ts
@@ -5,10 +5,9 @@
 
 import * as vscode from 'vscode';
 
-export function disposeAll(disposables: vscode.Disposable[]) {
-	while (disposables.length) {
-		const item = disposables.pop();
-		item?.dispose();
+export function disposeAll(disposables: Iterable<vscode.Disposable>) {
+	for (const disposable of disposables) {
+		disposable.dispose();
 	}
 }
 

From ba91a6a9b1bf6714424ac2274a999cf3c0543b84 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Wed, 18 Oct 2023 21:31:37 +0200
Subject: [PATCH 0017/1815] Basic functionality is working. More work to do.

---
 .../contrib/scm/browser/scmViewPane.ts        | 262 +++++++++++++-----
 1 file changed, 185 insertions(+), 77 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index 46151c7881d5..43a76e400708 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -24,22 +24,22 @@ import { IAction, ActionRunner, Action, Separator } from 'vs/base/common/actions
 import { ActionBar, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IThemeService, IFileIconTheme } from 'vs/platform/theme/common/themeService';
 import { isSCMResource, isSCMResourceGroup, connectPrimaryMenuToInlineActionBar, isSCMRepository, isSCMInput, collectContextMenuActions, getActionViewItemProvider, isSCMActionButton } from './util';
-import { WorkbenchCompressibleObjectTree, IOpenEvent } from 'vs/platform/list/browser/listService';
+import { WorkbenchCompressibleAsyncDataTree, IOpenEvent } from 'vs/platform/list/browser/listService';
 import { IConfigurationService, ConfigurationTarget, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { disposableTimeout, ThrottledDelayer } from 'vs/base/common/async';
-import { ITreeNode, ITreeFilter, ITreeSorter, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeDragOverReaction } from 'vs/base/browser/ui/tree/tree';
+import { ITreeNode, ITreeFilter, ITreeSorter, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeDragOverReaction, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree';
 import { ResourceTree, IResourceNode } from 'vs/base/common/resourceTree';
 import { ISplice } from 'vs/base/common/sequence';
 import { ICompressibleTreeRenderer, ICompressibleKeyboardNavigationLabelProvider } from 'vs/base/browser/ui/tree/objectTree';
 import { Iterable } from 'vs/base/common/iterator';
-import { ICompressedTreeNode, ICompressedTreeElement } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
+import { ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
 import { URI } from 'vs/base/common/uri';
 import { FileKind } from 'vs/platform/files/common/files';
 import { compareFileNames, comparePaths } from 'vs/base/common/comparers';
 import { FuzzyScore, createMatches, IMatch } from 'vs/base/common/filters';
 import { IViewDescriptorService, ViewContainerLocation } from 'vs/workbench/common/views';
 import { localize } from 'vs/nls';
-import { coalesce, flatten } from 'vs/base/common/arrays';
+import { flatten } from 'vs/base/common/arrays';
 import { memoize } from 'vs/base/common/decorators';
 import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from 'vs/platform/storage/common/storage';
 import { EditorResourceAccessor, SideBySideEditor } from 'vs/workbench/common/editor';
@@ -96,6 +96,7 @@ import { fillEditorsDragData } from 'vs/workbench/browser/dnd';
 import { ElementsDragAndDropData } from 'vs/base/browser/ui/list/listView';
 import { CodeDataTransfers } from 'vs/platform/dnd/browser/dnd';
 import { FormatOnType } from 'vs/editor/contrib/format/browser/formatActions';
+import { ITreeCompressionDelegate } from 'vs/base/browser/ui/tree/asyncDataTree';
 
 type TreeElement = ISCMRepository | ISCMInput | ISCMActionButton | ISCMResourceGroup | IResourceNode<ISCMResource, ISCMResourceGroup> | ISCMResource;
 
@@ -503,7 +504,7 @@ class ResourceRenderer implements ICompressibleTreeRenderer<ISCMResource | IReso
 		const resourceOrFolder = node.element;
 		const iconResource = ResourceTree.isResourceNode(resourceOrFolder) ? resourceOrFolder.element : resourceOrFolder;
 		const uri = ResourceTree.isResourceNode(resourceOrFolder) ? resourceOrFolder.uri : resourceOrFolder.sourceUri;
-		const fileKind = ResourceTree.isResourceNode(resourceOrFolder) ? FileKind.FOLDER : FileKind.FILE;
+		const fileKind = ResourceTree.isResourceNode(resourceOrFolder) && resourceOrFolder.childrenCount > 0 ? FileKind.FOLDER : FileKind.FILE;
 		const viewModel = this.viewModelProvider();
 		const tooltip = !ResourceTree.isResourceNode(resourceOrFolder) && resourceOrFolder.decorations.tooltip || '';
 
@@ -728,6 +729,18 @@ class ListDelegate implements IListVirtualDelegate<TreeElement> {
 	}
 }
 
+class SCMTreeCompressionDelegate implements ITreeCompressionDelegate<TreeElement> {
+
+	isIncompressible(element: TreeElement): boolean {
+		if (ResourceTree.isResourceNode(element)) {
+			return element.childrenCount === 0 || !element.parent || !element.parent.parent;
+		}
+
+		return true;
+	}
+
+}
+
 class SCMTreeFilter implements ITreeFilter<TreeElement> {
 
 	filter(element: TreeElement): boolean {
@@ -960,18 +973,18 @@ function isRepositoryItem(item: IRepositoryItem | IGroupItem): item is IReposito
 	return Array.isArray((item as IRepositoryItem).groupItems);
 }
 
-function asTreeElement(node: IResourceNode<ISCMResource, ISCMResourceGroup>, forceIncompressible: boolean, viewState?: ITreeViewState): ICompressedTreeElement<TreeElement> {
-	const element = (node.childrenCount === 0 && node.element) ? node.element : node;
-	const collapsed = viewState ? viewState.collapsed.indexOf(getSCMResourceId(element)) > -1 : false;
+// function asTreeElement(node: IResourceNode<ISCMResource, ISCMResourceGroup>, forceIncompressible: boolean, viewState?: ITreeViewState): ICompressedTreeElement<TreeElement> {
+// 	const element = (node.childrenCount === 0 && node.element) ? node.element : node;
+// 	const collapsed = viewState ? viewState.collapsed.indexOf(getSCMResourceId(element)) > -1 : false;
 
-	return {
-		element,
-		children: Iterable.map(node.children, node => asTreeElement(node, false, viewState)),
-		incompressible: !!node.element || forceIncompressible,
-		collapsed,
-		collapsible: node.childrenCount > 0
-	};
-}
+// 	return {
+// 		element,
+// 		children: Iterable.map(node.children, node => asTreeElement(node, false, viewState)),
+// 		incompressible: !!node.element || forceIncompressible,
+// 		collapsed,
+// 		collapsible: node.childrenCount > 0
+// 	};
+// }
 
 const enum ViewModelMode {
 	List = 'list',
@@ -1142,17 +1155,17 @@ class ViewModel {
 
 		this._mode = mode;
 
-		for (const [, item] of this.items) {
-			for (const groupItem of item.groupItems) {
-				groupItem.tree.clear();
+		// for (const [, item] of this.items) {
+		// 	for (const groupItem of item.groupItems) {
+		// 		groupItem.tree.clear();
 
-				if (mode === ViewModelMode.Tree) {
-					for (const resource of groupItem.resources) {
-						groupItem.tree.add(resource.sourceUri, resource);
-					}
-				}
-			}
-		}
+		// 		if (mode === ViewModelMode.Tree) {
+		// 			for (const resource of groupItem.resources) {
+		// 				groupItem.tree.add(resource.sourceUri, resource);
+		// 			}
+		// 		}
+		// 	}
+		// }
 
 		// Update sort key based on view mode
 		this.sortKey = this.getViewModelSortKey();
@@ -1191,11 +1204,13 @@ class ViewModel {
 		return this._treeViewState;
 	}
 
+	private _showActionButton = false;
+	get showActionButton(): boolean { return this._showActionButton; }
+
 	private items = new Map<ISCMRepository, IRepositoryItem>();
 	private readonly visibilityDisposables = new DisposableStore();
 	private scrollTop: number | undefined;
 	private alwaysShowRepositories = false;
-	private showActionButton = false;
 	private firstVisible = true;
 	private readonly disposables = new DisposableStore();
 
@@ -1212,7 +1227,7 @@ class ViewModel {
 	private _treeViewState: ITreeViewState | undefined;
 
 	constructor(
-		private tree: WorkbenchCompressibleObjectTree<TreeElement, FuzzyScore>,
+		private tree: WorkbenchCompressibleAsyncDataTree<TreeElement, TreeElement, FuzzyScore>,
 		private inputRenderer: InputRenderer,
 		@IInstantiationService protected instantiationService: IInstantiationService,
 		@IEditorService protected editorService: IEditorService,
@@ -1276,7 +1291,7 @@ class ViewModel {
 	private onDidChangeConfiguration(e?: IConfigurationChangeEvent): void {
 		if (!e || e.affectsConfiguration('scm.alwaysShowRepositories') || e.affectsConfiguration('scm.showActionButton')) {
 			this.alwaysShowRepositories = this.configurationService.getValue<boolean>('scm.alwaysShowRepositories');
-			this.showActionButton = this.configurationService.getValue<boolean>('scm.showActionButton');
+			this._showActionButton = this.configurationService.getValue<boolean>('scm.showActionButton');
 			this.refresh();
 		}
 	}
@@ -1285,10 +1300,10 @@ class ViewModel {
 		for (const repository of added) {
 			const disposable = combinedDisposable(
 				repository.provider.groups.onDidSplice(splice => this._onDidSpliceGroups(item, splice)),
-				repository.input.onDidChangeVisibility(() => this.refresh(item)),
+				repository.input.onDidChangeVisibility(() => this.refresh(item.element)),
 				repository.provider.onDidChange(() => {
 					if (this.showActionButton) {
-						this.refresh(item);
+						this.refresh(item.element);
 					}
 				})
 			);
@@ -1360,7 +1375,7 @@ class ViewModel {
 		if (before !== after && (before === 0 || after === 0)) {
 			this.refresh();
 		} else {
-			this.refresh(item);
+			this.refresh(item.element);
 		}
 	}
 
@@ -1388,7 +1403,7 @@ class ViewModel {
 		this.updateRepositoryCollapseAllContextKeys();
 	}
 
-	private refresh(item?: IRepositoryItem | IGroupItem): void {
+	private async refresh(item?: ISCMRepository | ISCMResourceGroup): Promise<void> {
 		if (!this.alwaysShowRepositories && this.items.size === 1) {
 			const provider = Iterable.first(this.items.values())!.element.provider;
 			this.scmProviderContextKey.set(provider.contextValue);
@@ -1402,16 +1417,30 @@ class ViewModel {
 
 		const focusedInput = this.inputRenderer.getFocusedInput();
 
-		if (!this.alwaysShowRepositories && (this.items.size === 1 && (!item || isRepositoryItem(item)))) {
-			const item = Iterable.first(this.items.values())!;
-			this.tree.setChildren(null, this.render(item, this.treeViewState).children);
+		if (!this.alwaysShowRepositories && (this.items.size === 1 && (!item || isSCMRepository(item)))) {
+			// Single repository and not always show repositories
+			await this.tree.setInput(Iterable.first(this.items.keys())!);
 		} else if (item) {
-			this.tree.setChildren(item.element, this.render(item, this.treeViewState).children);
+			// Particular repository or resource group
+			await this.tree.updateChildren(item);
 		} else {
-			const items = coalesce(this.scmViewService.visibleRepositories.map(r => this.items.get(r)));
-			this.tree.setChildren(null, items.map(item => this.render(item, this.treeViewState)));
+			// Expand repository nodes
+			// const expanded = Array.from(this.items.keys())
+			// 	.map(repository => `repo:${repository.provider.id}`);
+
+			// await this.tree.setInput([...this.items.keys()], { expanded });
 		}
 
+		// if (!this.alwaysShowRepositories && (this.items.size === 1 && (!item || isRepositoryItem(item)))) {
+		// 	const item = Iterable.first(this.items.values())!;
+		// 	this.tree.setChildren(null, this.render(item, this.treeViewState).children);
+		// } else if (item) {
+		// 	this.tree.setChildren(item.element, this.render(item, this.treeViewState).children);
+		// } else {
+		// 	const items = coalesce(this.scmViewService.visibleRepositories.map(r => this.items.get(r)));
+		// 	this.tree.setChildren(null, items.map(item => this.render(item, this.treeViewState)));
+		// }
+
 		if (focusedInput) {
 			this.inputRenderer.getRenderedInputWidget(focusedInput)?.focus();
 		}
@@ -1419,45 +1448,45 @@ class ViewModel {
 		this.updateRepositoryCollapseAllContextKeys();
 	}
 
-	private render(item: IRepositoryItem | IGroupItem, treeViewState?: ITreeViewState): ICompressedTreeElement<TreeElement> {
-		if (isRepositoryItem(item)) {
-			const children: ICompressedTreeElement<TreeElement>[] = [];
-			const hasSomeChanges = item.groupItems.some(item => item.element.elements.length > 0);
+	// private render(item: IRepositoryItem | IGroupItem, treeViewState?: ITreeViewState): ICompressedTreeElement<TreeElement> {
+	// 	if (isRepositoryItem(item)) {
+	// 		const children: ICompressedTreeElement<TreeElement>[] = [];
+	// 		const hasSomeChanges = item.groupItems.some(item => item.element.elements.length > 0);
 
-			if (item.element.input.visible) {
-				children.push({ element: item.element.input, incompressible: true, collapsible: false });
-			}
+	// 		if (item.element.input.visible) {
+	// 			children.push({ element: item.element.input, incompressible: true, collapsible: false });
+	// 		}
 
-			if (hasSomeChanges || (this.items.size === 1 && (!this.showActionButton || !item.element.provider.actionButton))) {
-				children.push(...item.groupItems.map(i => this.render(i, treeViewState)));
-			}
+	// 		if (hasSomeChanges || (this.items.size === 1 && (!this.showActionButton || !item.element.provider.actionButton))) {
+	// 			children.push(...item.groupItems.map(i => this.render(i, treeViewState)));
+	// 		}
 
-			if (this.showActionButton && item.element.provider.actionButton) {
-				const button: ICompressedTreeElement<ISCMActionButton> = {
-					element: {
-						type: 'actionButton',
-						repository: item.element,
-						button: item.element.provider.actionButton,
-					},
-					incompressible: true,
-					collapsible: false
-				};
-				children.push(button);
-			}
+	// 		if (this.showActionButton && item.element.provider.actionButton) {
+	// 			const button: ICompressedTreeElement<ISCMActionButton> = {
+	// 				element: {
+	// 					type: 'actionButton',
+	// 					repository: item.element,
+	// 					button: item.element.provider.actionButton,
+	// 				},
+	// 				incompressible: true,
+	// 				collapsible: false
+	// 			};
+	// 			children.push(button);
+	// 		}
 
-			const collapsed = treeViewState ? treeViewState.collapsed.indexOf(getSCMResourceId(item.element)) > -1 : false;
+	// 		const collapsed = treeViewState ? treeViewState.collapsed.indexOf(getSCMResourceId(item.element)) > -1 : false;
 
-			return { element: item.element, children, incompressible: true, collapsed, collapsible: true };
-		} else {
-			const children = this.mode === ViewModelMode.List
-				? Iterable.map(item.resources, element => ({ element, incompressible: true }))
-				: Iterable.map(item.tree.root.children, node => asTreeElement(node, true, treeViewState));
+	// 		return { element: item.element, children, incompressible: true, collapsed, collapsible: true };
+	// 	} else {
+	// 		const children = this.mode === ViewModelMode.List
+	// 			? Iterable.map(item.resources, element => ({ element, incompressible: true }))
+	// 			: Iterable.map(item.tree.root.children, node => asTreeElement(node, true, treeViewState));
 
-			const collapsed = treeViewState ? treeViewState.collapsed.indexOf(getSCMResourceId(item.element)) > -1 : false;
+	// 		const collapsed = treeViewState ? treeViewState.collapsed.indexOf(getSCMResourceId(item.element)) > -1 : false;
 
-			return { element: item.element, children, incompressible: true, collapsed, collapsible: true };
-		}
-	}
+	// 		return { element: item.element, children, incompressible: true, collapsed, collapsible: true };
+	// 	}
+	// }
 
 	private updateViewState(): void {
 		const collapsed: string[] = [];
@@ -1539,8 +1568,8 @@ class ViewModel {
 			return;
 		}
 
-		this.isAnyRepositoryCollapsibleContextKey.set(this.scmViewService.visibleRepositories.some(r => this.tree.hasElement(r) && this.tree.isCollapsible(r)));
-		this.areAllRepositoriesCollapsedContextKey.set(this.scmViewService.visibleRepositories.every(r => this.tree.hasElement(r) && (!this.tree.isCollapsible(r) || this.tree.isCollapsed(r))));
+		// this.isAnyRepositoryCollapsibleContextKey.set(this.scmViewService.visibleRepositories.some(r => this.tree.hasElement(r) && this.tree.isCollapsible(r)));
+		// this.areAllRepositoriesCollapsedContextKey.set(this.scmViewService.visibleRepositories.every(r => this.tree.hasElement(r) && (!this.tree.isCollapsible(r) || this.tree.isCollapsed(r))));
 	}
 
 	collapseAllRepositories(): void {
@@ -2302,7 +2331,7 @@ export class SCMViewPane extends ViewPane {
 	private layoutCache: ISCMLayout;
 
 	private listContainer!: HTMLElement;
-	private tree!: WorkbenchCompressibleObjectTree<TreeElement, FuzzyScore>;
+	private tree!: WorkbenchCompressibleAsyncDataTree<TreeElement, TreeElement, FuzzyScore>;
 	private _viewModel!: ViewModel;
 	get viewModel(): ViewModel { return this._viewModel; }
 	private listLabels!: ResourceLabels;
@@ -2361,7 +2390,7 @@ export class SCMViewPane extends ViewPane {
 		this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.providerCountBadge'), this.disposables)(updateProviderCountVisibility));
 		updateProviderCountVisibility();
 
-		this.inputRenderer = this.instantiationService.createInstance(InputRenderer, this.layoutCache, overflowWidgetsDomNode, (input, height) => this.tree.updateElementHeight(input, height), getActionViewItemProvider(this.instantiationService));
+		this.inputRenderer = this.instantiationService.createInstance(InputRenderer, this.layoutCache, overflowWidgetsDomNode, (input, height) => { console.log('update element height'); /*this.tree.updateElementHeight(input, height)*/ }, getActionViewItemProvider(this.instantiationService));
 		const delegate = new ListDelegate(this.inputRenderer);
 
 		this.actionButtonRenderer = this.instantiationService.createInstance(ActionButtonRenderer);
@@ -2388,11 +2417,13 @@ export class SCMViewPane extends ViewPane {
 		const dnd = new SCMTreeDragAndDrop(this.instantiationService);
 
 		this.tree = this.instantiationService.createInstance(
-			WorkbenchCompressibleObjectTree,
+			WorkbenchCompressibleAsyncDataTree,
 			'SCM Tree Repo',
 			this.listContainer,
 			delegate,
+			new SCMTreeCompressionDelegate(),
 			renderers,
+			this.instantiationService.createInstance(SCMTreeDataSource, () => this._viewModel),
 			{
 				transformOptimization: false,
 				identityProvider,
@@ -2405,8 +2436,9 @@ export class SCMViewPane extends ViewPane {
 				overrideStyles: {
 					listBackground: this.viewDescriptorService.getViewLocationById(this.id) === ViewContainerLocation.Panel ? PANEL_BACKGROUND : SIDE_BAR_BACKGROUND
 				},
+				collapseByDefault: () => false,
 				accessibilityProvider: this.instantiationService.createInstance(SCMAccessibilityProvider)
-			}) as WorkbenchCompressibleObjectTree<TreeElement, FuzzyScore>;
+			}) as WorkbenchCompressibleAsyncDataTree<TreeElement, TreeElement, FuzzyScore>;
 
 		this._register(this.tree.onDidOpen(this.open, this));
 
@@ -2614,6 +2646,82 @@ export class SCMViewPane extends ViewPane {
 	}
 }
 
+class SCMTreeDataSource implements IAsyncDataSource<TreeElement, TreeElement> {
+
+	constructor(
+		private readonly viewModel: () => ViewModel,
+		@ISCMViewService private readonly scmViewService: ISCMViewService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService) { }
+
+	hasChildren(element: TreeElement): boolean {
+		if (isSCMRepository(element)) {
+			return true;
+		} else if (isSCMInput(element)) {
+			return false;
+		} else if (isSCMActionButton(element)) {
+			return false;
+		} else if (isSCMResourceGroup(element)) {
+			return element.elements.length > 0;
+		} else if (isSCMResource(element)) {
+			return false;
+		} else if (ResourceTree.isResourceNode(element)) {
+			return element.childrenCount > 0;
+		} else {
+			throw new Error('hasChildren not implemented.');
+		}
+	}
+
+	getChildren(element: TreeElement): Iterable<TreeElement> | Promise<Iterable<TreeElement>> {
+		const children: TreeElement[] = [];
+
+		if (isSCMRepository(element)) {
+			const provider = element.provider;
+			const showActionButton = this.viewModel().showActionButton;
+			const repositoryCount = this.scmViewService.visibleRepositories.length;
+
+			// SCM Input
+			if (element.input.visible) {
+				children.push(element.input);
+			}
+
+			// Action Button
+			if (showActionButton && provider.actionButton) {
+				children.push({
+					type: 'actionButton',
+					repository: element,
+					button: provider.actionButton
+				} as ISCMActionButton);
+			}
+
+			// ResourceGroups
+			const hasSomeChanges = provider.groups.elements.some(item => item.elements.length > 0);
+			if (hasSomeChanges || (repositoryCount === 1 && (!showActionButton || !provider.actionButton))) {
+				children.push(...provider.groups.elements);
+			}
+		} else if (isSCMResourceGroup(element)) {
+			if (this.viewModel().mode === ViewModelMode.List) {
+				// Resources (List)
+				children.push(...element.elements);
+			} else if (this.viewModel().mode === ViewModelMode.Tree) {
+				// Resources (Tree)
+				const rootUri = element.provider.rootUri ?? URI.file('/');
+				const tree = new ResourceTree<ISCMResource, ISCMResourceGroup>(element, rootUri, this.uriIdentityService.extUri);
+				for (const resource of element.elements) {
+					tree.add(resource.sourceUri, resource);
+				}
+
+				children.push(...tree.root.children);
+			}
+		} else if (ResourceTree.isResourceNode(element)) {
+			// Resources (Tree)
+			children.push(...element.children);
+		}
+
+		return children;
+	}
+
+}
+
 export class SCMActionButton implements IDisposable {
 	private button: Button | ButtonWithDescription | ButtonWithDropdown | undefined;
 	private readonly disposables = new MutableDisposable<DisposableStore>();

From adc17815d0356c7933e23ad004793093e089b110 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 19 Oct 2023 21:49:51 +0200
Subject: [PATCH 0018/1815] Saving my work. More cleanup to do.

---
 src/vs/base/browser/ui/tree/asyncDataTree.ts  |   9 +
 src/vs/base/common/lifecycle.ts               |   4 +
 src/vs/workbench/api/browser/mainThreadSCM.ts |  61 ++-
 .../browser/editSessions.contribution.ts      |   4 +-
 .../workbench/contrib/scm/browser/activity.ts |   6 +-
 src/vs/workbench/contrib/scm/browser/menus.ts |  21 +-
 .../contrib/scm/browser/scmViewPane.ts        | 469 +++++++-----------
 src/vs/workbench/contrib/scm/browser/util.ts  |   8 +-
 src/vs/workbench/contrib/scm/common/scm.ts    |  18 +-
 9 files changed, 257 insertions(+), 343 deletions(-)

diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts
index 5ba79157f2d0..be95156a79b0 100644
--- a/src/vs/base/browser/ui/tree/asyncDataTree.ts
+++ b/src/vs/base/browser/ui/tree/asyncDataTree.ts
@@ -559,6 +559,10 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 		this.tree.resort(this.getDataNode(element), recursive);
 	}
 
+	hasElement(element: TInput | T): boolean {
+		return this.tree.hasElement(this.getDataNode(element));
+	}
+
 	hasNode(element: TInput | T): boolean {
 		return element === this.root.element || this.nodes.has(element as T);
 	}
@@ -575,6 +579,11 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 		this.tree.rerender(node);
 	}
 
+	updateElementHeight(element: T, height: number | undefined): void {
+		const node = this.getDataNode(element);
+		this.tree.updateElementHeight(node, height);
+	}
+
 	updateWidth(element: T): void {
 		const node = this.getDataNode(element);
 		this.tree.updateWidth(node);
diff --git a/src/vs/base/common/lifecycle.ts b/src/vs/base/common/lifecycle.ts
index 4b6215299461..fedbb85a6cf3 100644
--- a/src/vs/base/common/lifecycle.ts
+++ b/src/vs/base/common/lifecycle.ts
@@ -748,6 +748,10 @@ export class DisposableMap<K, V extends IDisposable = IDisposable> implements ID
 		this._store.delete(key);
 	}
 
+	keys(): IterableIterator<K> {
+		return this._store.keys();
+	}
+
 	[Symbol.iterator](): IterableIterator<[K, V]> {
 		return this._store[Symbol.iterator]();
 	}
diff --git a/src/vs/workbench/api/browser/mainThreadSCM.ts b/src/vs/workbench/api/browser/mainThreadSCM.ts
index 5ddf13e573e2..4675fd247c6b 100644
--- a/src/vs/workbench/api/browser/mainThreadSCM.ts
+++ b/src/vs/workbench/api/browser/mainThreadSCM.ts
@@ -10,13 +10,14 @@ import { ISCMService, ISCMRepository, ISCMProvider, ISCMResource, ISCMResourceGr
 import { ExtHostContext, MainThreadSCMShape, ExtHostSCMShape, SCMProviderFeatures, SCMRawResourceSplices, SCMGroupFeatures, MainContext, SCMHistoryItemDto, SCMActionButtonDto, SCMHistoryItemGroupDto } from '../common/extHost.protocol';
 import { Command } from 'vs/editor/common/languages';
 import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers';
-import { ISplice, Sequence } from 'vs/base/common/sequence';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { MarshalledId } from 'vs/base/common/marshallingIds';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { IMarkdownString } from 'vs/base/common/htmlContent';
 import { IQuickDiffService, QuickDiffProvider } from 'vs/workbench/contrib/scm/common/quickDiff';
 import { ISCMHistoryItem, ISCMHistoryItemChange, ISCMHistoryItemGroup, ISCMHistoryOptions, ISCMHistoryProvider } from 'vs/workbench/contrib/scm/common/history';
+import { ResourceTree } from 'vs/base/common/resourceTree';
+import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 
 function getSCMHistoryItemIcon(historyItem: SCMHistoryItemDto): URI | { light: URI; dark: URI } | ThemeIcon | undefined {
 	if (!historyItem.icon) {
@@ -33,23 +34,37 @@ function getSCMHistoryItemIcon(historyItem: SCMHistoryItemDto): URI | { light: U
 
 class MainThreadSCMResourceGroup implements ISCMResourceGroup {
 
-	readonly elements: ISCMResource[] = [];
+	readonly resources: ISCMResource[] = [];
 
-	private readonly _onDidSplice = new Emitter<ISplice<ISCMResource>>();
-	readonly onDidSplice = this._onDidSplice.event;
+	private _resourceTree: ResourceTree<ISCMResource, ISCMResourceGroup> | undefined;
+	get resourceTree(): ResourceTree<ISCMResource, ISCMResourceGroup> {
+		if (!this._resourceTree) {
+			const rootUri = this.provider.rootUri ?? URI.file('/');
+			this._resourceTree = new ResourceTree<ISCMResource, ISCMResourceGroup>(this, rootUri, this._uriIdentService.extUri);
+			for (const resource of this.resources) {
+				this._resourceTree.add(resource.sourceUri, resource);
+			}
+		}
 
-	get hideWhenEmpty(): boolean { return !!this.features.hideWhenEmpty; }
+		return this._resourceTree;
+	}
 
 	private readonly _onDidChange = new Emitter<void>();
 	readonly onDidChange: Event<void> = this._onDidChange.event;
 
+	private readonly _onDidChangeResources = new Emitter<void>();
+	readonly onDidChangeResources = this._onDidChangeResources.event;
+
+	get hideWhenEmpty(): boolean { return !!this.features.hideWhenEmpty; }
+
 	constructor(
 		private readonly sourceControlHandle: number,
 		private readonly handle: number,
 		public provider: ISCMProvider,
 		public features: SCMGroupFeatures,
 		public label: string,
-		public id: string
+		public id: string,
+		private readonly _uriIdentService: IUriIdentityService
 	) { }
 
 	toJSON(): any {
@@ -61,8 +76,10 @@ class MainThreadSCMResourceGroup implements ISCMResourceGroup {
 	}
 
 	splice(start: number, deleteCount: number, toInsert: ISCMResource[]) {
-		this.elements.splice(start, deleteCount, ...toInsert);
-		this._onDidSplice.fire({ start, deleteCount, toInsert });
+		this.resources.splice(start, deleteCount, ...toInsert);
+		this._resourceTree = undefined;
+
+		this._onDidChangeResources.fire();
 	}
 
 	$updateGroup(features: SCMGroupFeatures): void {
@@ -159,7 +176,13 @@ class MainThreadSCMProvider implements ISCMProvider, QuickDiffProvider {
 	private _id = `scm${MainThreadSCMProvider.ID_HANDLE++}`;
 	get id(): string { return this._id; }
 
-	readonly groups = new Sequence<MainThreadSCMResourceGroup>();
+	readonly groups: MainThreadSCMResourceGroup[] = [];
+	private readonly _onDidChangeResourceGroups = new Emitter<void>();
+	readonly onDidChangeResourceGroups = this._onDidChangeResourceGroups.event;
+
+	private readonly _onDidChangeResources = new Emitter<void>();
+	readonly onDidChangeResources = this._onDidChangeResources.event;
+
 	private readonly _groupsByHandle: { [handle: number]: MainThreadSCMResourceGroup } = Object.create(null);
 
 	// get groups(): ISequence<ISCMResourceGroup> {
@@ -172,8 +195,6 @@ class MainThreadSCMProvider implements ISCMProvider, QuickDiffProvider {
 	// 	// 	.filter(g => g.resources.elements.length > 0 || !g.features.hideWhenEmpty);
 	// }
 
-	private readonly _onDidChangeResources = new Emitter<void>();
-	readonly onDidChangeResources: Event<void> = this._onDidChangeResources.event;
 
 	private features: SCMProviderFeatures = {};
 
@@ -214,7 +235,8 @@ class MainThreadSCMProvider implements ISCMProvider, QuickDiffProvider {
 		private readonly _label: string,
 		private readonly _rootUri: URI | undefined,
 		private readonly _inputBoxDocumentUri: URI,
-		private readonly _quickDiffService: IQuickDiffService
+		private readonly _quickDiffService: IQuickDiffService,
+		private readonly _uriIdentService: IUriIdentityService
 	) { }
 
 	$updateSourceControl(features: SCMProviderFeatures): void {
@@ -258,14 +280,16 @@ class MainThreadSCMProvider implements ISCMProvider, QuickDiffProvider {
 				this,
 				features,
 				label,
-				id
+				id,
+				this._uriIdentService
 			);
 
 			this._groupsByHandle[handle] = group;
 			return group;
 		});
 
-		this.groups.splice(this.groups.elements.length, 0, groups);
+		this.groups.splice(this.groups.length, 0, ...groups);
+		this._onDidChangeResourceGroups.fire();
 	}
 
 	$updateGroup(handle: number, features: SCMGroupFeatures): void {
@@ -344,8 +368,8 @@ class MainThreadSCMProvider implements ISCMProvider, QuickDiffProvider {
 		}
 
 		delete this._groupsByHandle[handle];
-		this.groups.splice(this.groups.elements.indexOf(group), 1);
-		this._onDidChangeResources.fire();
+		this.groups.splice(this.groups.indexOf(group), 1);
+		this._onDidChangeResourceGroups.fire();
 	}
 
 	async getOriginalResource(uri: URI): Promise<URI | null> {
@@ -397,7 +421,8 @@ export class MainThreadSCM implements MainThreadSCMShape {
 		extHostContext: IExtHostContext,
 		@ISCMService private readonly scmService: ISCMService,
 		@ISCMViewService private readonly scmViewService: ISCMViewService,
-		@IQuickDiffService private readonly quickDiffService: IQuickDiffService
+		@IQuickDiffService private readonly quickDiffService: IQuickDiffService,
+		@IUriIdentityService private readonly _uriIdentService: IUriIdentityService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostSCM);
 	}
@@ -413,7 +438,7 @@ export class MainThreadSCM implements MainThreadSCMShape {
 	}
 
 	$registerSourceControl(handle: number, id: string, label: string, rootUri: UriComponents | undefined, inputBoxDocumentUri: UriComponents): void {
-		const provider = new MainThreadSCMProvider(this._proxy, handle, id, label, rootUri ? URI.revive(rootUri) : undefined, URI.revive(inputBoxDocumentUri), this.quickDiffService);
+		const provider = new MainThreadSCMProvider(this._proxy, handle, id, label, rootUri ? URI.revive(rootUri) : undefined, URI.revive(inputBoxDocumentUri), this.quickDiffService, this._uriIdentService);
 		const repository = this.scmService.registerSCMProvider(provider);
 		this._repositories.set(handle, repository);
 
diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts b/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
index bac592ba3a62..7ba7a0095403 100644
--- a/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
+++ b/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
@@ -788,8 +788,8 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 	}
 
 	private getChangedResources(repository: ISCMRepository) {
-		return repository.provider.groups.elements.reduce((resources, resourceGroups) => {
-			resourceGroups.elements.forEach((resource) => resources.add(resource.sourceUri));
+		return repository.provider.groups.reduce((resources, resourceGroups) => {
+			resourceGroups.resources.forEach((resource) => resources.add(resource.sourceUri));
 			return resources;
 		}, new Set<URI>()); // A URI might appear in more than one resource group
 	}
diff --git a/src/vs/workbench/contrib/scm/browser/activity.ts b/src/vs/workbench/contrib/scm/browser/activity.ts
index b4edaa7f64e3..68a280a56bca 100644
--- a/src/vs/workbench/contrib/scm/browser/activity.ts
+++ b/src/vs/workbench/contrib/scm/browser/activity.ts
@@ -23,7 +23,7 @@ function getCount(repository: ISCMRepository): number {
 	if (typeof repository.provider.count === 'number') {
 		return repository.provider.count;
 	} else {
-		return repository.provider.groups.elements.reduce<number>((r, g) => r + g.elements.length, 0);
+		return repository.provider.groups.reduce<number>((r, g) => r + g.resources.length, 0);
 	}
 }
 
@@ -264,8 +264,8 @@ export class SCMActiveResourceContextKeyController implements IWorkbenchContribu
 
 			this.activeResourceRepositoryContextKey.set(activeResourceRepository?.id);
 
-			for (const resourceGroup of activeResourceRepository?.provider.groups.elements ?? []) {
-				if (resourceGroup.elements
+			for (const resourceGroup of activeResourceRepository?.provider.groups ?? []) {
+				if (resourceGroup.resources
 					.some(scmResource =>
 						this.uriIdentityService.extUri.isEqual(activeResource, scmResource.sourceUri))) {
 					this.activeResourceHasChangesContextKey.set(true);
diff --git a/src/vs/workbench/contrib/scm/browser/menus.ts b/src/vs/workbench/contrib/scm/browser/menus.ts
index d1bde83d780b..86887f8d6458 100644
--- a/src/vs/workbench/contrib/scm/browser/menus.ts
+++ b/src/vs/workbench/contrib/scm/browser/menus.ts
@@ -12,7 +12,6 @@ import { IAction } from 'vs/base/common/actions';
 import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { ISCMResource, ISCMResourceGroup, ISCMProvider, ISCMRepository, ISCMService, ISCMMenus, ISCMRepositoryMenus } from 'vs/workbench/contrib/scm/common/scm';
 import { equals } from 'vs/base/common/arrays';
-import { ISplice } from 'vs/base/common/sequence';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { localize } from 'vs/nls';
@@ -148,7 +147,6 @@ export class SCMRepositoryMenus implements ISCMRepositoryMenus, IDisposable {
 	private contextKeyService: IContextKeyService;
 
 	readonly titleMenu: SCMTitleMenu;
-	private readonly resourceGroups: ISCMResourceGroup[] = [];
 	private readonly resourceGroupMenusItems = new Map<ISCMResourceGroup, SCMMenusItem>();
 
 	private _repositoryMenu: IMenu | undefined;
@@ -174,7 +172,7 @@ export class SCMRepositoryMenus implements ISCMRepositoryMenus, IDisposable {
 	private readonly disposables = new DisposableStore();
 
 	constructor(
-		provider: ISCMProvider,
+		private readonly provider: ISCMProvider,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IMenuService private readonly menuService: IMenuService
@@ -189,8 +187,8 @@ export class SCMRepositoryMenus implements ISCMRepositoryMenus, IDisposable {
 		instantiationService = instantiationService.createChild(serviceCollection);
 		this.titleMenu = instantiationService.createInstance(SCMTitleMenu);
 
-		provider.groups.onDidSplice(this.onDidSpliceGroups, this, this.disposables);
-		this.onDidSpliceGroups({ start: 0, deleteCount: 0, toInsert: provider.groups.elements });
+		provider.onDidChangeResourceGroups(this.onDidChangeResourceGroups, this, this.disposables);
+		this.onDidChangeResourceGroups();
 	}
 
 	getResourceGroupMenu(group: ISCMResourceGroup): IMenu {
@@ -220,13 +218,12 @@ export class SCMRepositoryMenus implements ISCMRepositoryMenus, IDisposable {
 		return result;
 	}
 
-	private onDidSpliceGroups({ start, deleteCount, toInsert }: ISplice<ISCMResourceGroup>): void {
-		const deleted = this.resourceGroups.splice(start, deleteCount, ...toInsert);
-
-		for (const group of deleted) {
-			const item = this.resourceGroupMenusItems.get(group);
-			item?.dispose();
-			this.resourceGroupMenusItems.delete(group);
+	private onDidChangeResourceGroups(): void {
+		for (const resourceGroup of this.resourceGroupMenusItems.keys()) {
+			if (!this.provider.groups.includes(resourceGroup)) {
+				this.resourceGroupMenusItems.get(resourceGroup)?.dispose();
+				this.resourceGroupMenusItems.delete(resourceGroup);
+			}
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index 43a76e400708..d2bec46002c6 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -6,7 +6,7 @@
 import 'vs/css!./media/scm';
 import { Event, Emitter } from 'vs/base/common/event';
 import { basename, dirname } from 'vs/base/common/resources';
-import { IDisposable, Disposable, DisposableStore, combinedDisposable, dispose, toDisposable, MutableDisposable, IReference } from 'vs/base/common/lifecycle';
+import { IDisposable, Disposable, DisposableStore, combinedDisposable, dispose, toDisposable, MutableDisposable, IReference, DisposableMap } from 'vs/base/common/lifecycle';
 import { ViewPane, IViewPaneOptions, ViewAction } from 'vs/workbench/browser/parts/views/viewPane';
 import { append, $, Dimension, asCSSUrl, trackFocus, clearNode } from 'vs/base/browser/dom';
 import { IListVirtualDelegate, IIdentityProvider } from 'vs/base/browser/ui/list/list';
@@ -23,13 +23,12 @@ import { MenuItemAction, IMenuService, registerAction2, MenuId, IAction2Options,
 import { IAction, ActionRunner, Action, Separator } from 'vs/base/common/actions';
 import { ActionBar, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IThemeService, IFileIconTheme } from 'vs/platform/theme/common/themeService';
-import { isSCMResource, isSCMResourceGroup, connectPrimaryMenuToInlineActionBar, isSCMRepository, isSCMInput, collectContextMenuActions, getActionViewItemProvider, isSCMActionButton } from './util';
+import { isSCMResource, isSCMResourceGroup, connectPrimaryMenuToInlineActionBar, isSCMRepository, isSCMInput, collectContextMenuActions, getActionViewItemProvider, isSCMActionButton, isSCMViewService } from './util';
 import { WorkbenchCompressibleAsyncDataTree, IOpenEvent } from 'vs/platform/list/browser/listService';
 import { IConfigurationService, ConfigurationTarget, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { disposableTimeout, ThrottledDelayer } from 'vs/base/common/async';
 import { ITreeNode, ITreeFilter, ITreeSorter, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeDragOverReaction, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree';
 import { ResourceTree, IResourceNode } from 'vs/base/common/resourceTree';
-import { ISplice } from 'vs/base/common/sequence';
 import { ICompressibleTreeRenderer, ICompressibleKeyboardNavigationLabelProvider } from 'vs/base/browser/ui/tree/objectTree';
 import { Iterable } from 'vs/base/common/iterator';
 import { ICompressedTreeNode } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
@@ -73,7 +72,6 @@ import { ThemeIcon } from 'vs/base/common/themables';
 import { AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
 import { RepositoryRenderer } from 'vs/workbench/contrib/scm/browser/scmRepositoryRenderer';
 import { ColorScheme } from 'vs/platform/theme/common/theme';
-import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { LabelFuzzyScore } from 'vs/base/browser/ui/tree/abstractTree';
 import { Selection } from 'vs/editor/common/core/selection';
 import { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
@@ -96,7 +94,8 @@ import { fillEditorsDragData } from 'vs/workbench/browser/dnd';
 import { ElementsDragAndDropData } from 'vs/base/browser/ui/list/listView';
 import { CodeDataTransfers } from 'vs/platform/dnd/browser/dnd';
 import { FormatOnType } from 'vs/editor/contrib/format/browser/formatActions';
-import { ITreeCompressionDelegate } from 'vs/base/browser/ui/tree/asyncDataTree';
+import { IAsyncDataTreeViewState, ITreeCompressionDelegate } from 'vs/base/browser/ui/tree/asyncDataTree';
+import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 
 type TreeElement = ISCMRepository | ISCMInput | ISCMActionButton | ISCMResourceGroup | IResourceNode<ISCMResource, ISCMResourceGroup> | ISCMResource;
 
@@ -405,7 +404,7 @@ class ResourceGroupRenderer implements ICompressibleTreeRenderer<ISCMResourceGro
 		template.name.textContent = group.label;
 		template.actionBar.clear();
 		template.actionBar.context = group;
-		template.count.setCount(group.elements.length);
+		template.count.setCount(group.resources.length);
 
 		const menus = this.scmViewService.menus.getRepositoryMenus(group.provider);
 		template.elementDisposables.add(connectPrimaryMenuToInlineActionBar(menus.getResourceGroupMenu(group), template.actionBar));
@@ -747,7 +746,7 @@ class SCMTreeFilter implements ITreeFilter<TreeElement> {
 		if (ResourceTree.isResourceNode(element)) {
 			return true;
 		} else if (isSCMResourceGroup(element)) {
-			return element.elements.length > 0 || !element.hideWhenEmpty;
+			return element.resources.length > 0 || !element.hideWhenEmpty;
 		} else {
 			return true;
 		}
@@ -952,40 +951,6 @@ export class SCMAccessibilityProvider implements IListAccessibilityProvider<Tree
 	}
 }
 
-interface IGroupItem {
-	readonly element: ISCMResourceGroup;
-	readonly resources: ISCMResource[];
-	readonly tree: ResourceTree<ISCMResource, ISCMResourceGroup>;
-	dispose(): void;
-}
-
-interface IRepositoryItem {
-	readonly element: ISCMRepository;
-	readonly groupItems: IGroupItem[];
-	dispose(): void;
-}
-
-interface ITreeViewState {
-	readonly collapsed: string[];
-}
-
-function isRepositoryItem(item: IRepositoryItem | IGroupItem): item is IRepositoryItem {
-	return Array.isArray((item as IRepositoryItem).groupItems);
-}
-
-// function asTreeElement(node: IResourceNode<ISCMResource, ISCMResourceGroup>, forceIncompressible: boolean, viewState?: ITreeViewState): ICompressedTreeElement<TreeElement> {
-// 	const element = (node.childrenCount === 0 && node.element) ? node.element : node;
-// 	const collapsed = viewState ? viewState.collapsed.indexOf(getSCMResourceId(element)) > -1 : false;
-
-// 	return {
-// 		element,
-// 		children: Iterable.map(node.children, node => asTreeElement(node, false, viewState)),
-// 		incompressible: !!node.element || forceIncompressible,
-// 		collapsed,
-// 		collapsible: node.childrenCount > 0
-// 	};
-// }
-
 const enum ViewModelMode {
 	List = 'list',
 	Tree = 'tree'
@@ -1155,22 +1120,10 @@ class ViewModel {
 
 		this._mode = mode;
 
-		// for (const [, item] of this.items) {
-		// 	for (const groupItem of item.groupItems) {
-		// 		groupItem.tree.clear();
-
-		// 		if (mode === ViewModelMode.Tree) {
-		// 			for (const resource of groupItem.resources) {
-		// 				groupItem.tree.add(resource.sourceUri, resource);
-		// 			}
-		// 		}
-		// 	}
-		// }
-
 		// Update sort key based on view mode
 		this.sortKey = this.getViewModelSortKey();
 
-		this.refresh();
+		this.tree.updateChildren();
 		this._onDidChangeMode.fire(mode);
 		this.modeContextKey.set(mode);
 
@@ -1185,7 +1138,7 @@ class ViewModel {
 
 		this._sortKey = sortKey;
 
-		this.refresh();
+		this.tree.updateChildren();
 		this._onDidChangeSortKey.fire(sortKey);
 		this.sortKeyContextKey.set(sortKey);
 
@@ -1194,23 +1147,15 @@ class ViewModel {
 		}
 	}
 
-	private _treeViewStateIsStale = false;
-	get treeViewState(): ITreeViewState | undefined {
-		if (this.visible && this._treeViewStateIsStale) {
-			this.updateViewState();
-			this._treeViewStateIsStale = false;
-		}
-
-		return this._treeViewState;
-	}
-
 	private _showActionButton = false;
 	get showActionButton(): boolean { return this._showActionButton; }
 
-	private items = new Map<ISCMRepository, IRepositoryItem>();
+	private _alwaysShowRepositories = false;
+	get alwaysShowRepositories(): boolean { return this._alwaysShowRepositories; }
+
+	private items = new DisposableMap<ISCMRepository, IDisposable>();
 	private readonly visibilityDisposables = new DisposableStore();
 	private scrollTop: number | undefined;
-	private alwaysShowRepositories = false;
 	private firstVisible = true;
 	private readonly disposables = new DisposableStore();
 
@@ -1224,10 +1169,9 @@ class ViewModel {
 
 	private _mode: ViewModelMode;
 	private _sortKey: ViewModelSortKey;
-	private _treeViewState: ITreeViewState | undefined;
 
 	constructor(
-		private tree: WorkbenchCompressibleAsyncDataTree<TreeElement, TreeElement, FuzzyScore>,
+		private tree: WorkbenchCompressibleAsyncDataTree<ISCMViewService, TreeElement, FuzzyScore>,
 		private inputRenderer: InputRenderer,
 		@IInstantiationService protected instantiationService: IInstantiationService,
 		@IEditorService protected editorService: IEditorService,
@@ -1241,14 +1185,6 @@ class ViewModel {
 		this._mode = this.getViewModelMode();
 		this._sortKey = this.getViewModelSortKey();
 
-		// TreeView state
-		const storageViewState = this.storageService.get(`scm.viewState`, StorageScope.WORKSPACE);
-		if (storageViewState) {
-			try {
-				this._treeViewState = JSON.parse(storageViewState);
-			} catch {/* noop */ }
-		}
-
 		this.modeContextKey = ContextKeys.ViewModelMode.bindTo(contextKeyService);
 		this.modeContextKey.set(this._mode);
 		this.sortKeyContextKey = ContextKeys.ViewModelSortKey.bindTo(contextKeyService);
@@ -1265,13 +1201,7 @@ class ViewModel {
 		Event.filter(this.tree.onDidChangeCollapseState, e => isSCMRepository(e.node.element), this.disposables)
 			(this.updateRepositoryCollapseAllContextKeys, this, this.disposables);
 
-		this.disposables.add(this.tree.onDidChangeCollapseState(() => this._treeViewStateIsStale = true));
-
 		this.disposables.add(this.storageService.onWillSaveState(e => {
-			if (e.reason === WillSaveStateReason.SHUTDOWN) {
-				this.storageService.store(`scm.viewState`, JSON.stringify(this.treeViewState), StorageScope.WORKSPACE, StorageTarget.MACHINE);
-			}
-
 			this.mode = this.getViewModelMode();
 			this.sortKey = this.getViewModelSortKey();
 		}));
@@ -1290,93 +1220,55 @@ class ViewModel {
 
 	private onDidChangeConfiguration(e?: IConfigurationChangeEvent): void {
 		if (!e || e.affectsConfiguration('scm.alwaysShowRepositories') || e.affectsConfiguration('scm.showActionButton')) {
-			this.alwaysShowRepositories = this.configurationService.getValue<boolean>('scm.alwaysShowRepositories');
+			this._alwaysShowRepositories = this.configurationService.getValue<boolean>('scm.alwaysShowRepositories');
 			this._showActionButton = this.configurationService.getValue<boolean>('scm.showActionButton');
-			this.refresh();
+
+			this.tree.updateChildren();
+			this.updateRepositoryContextKeys();
 		}
 	}
 
 	private _onDidChangeVisibleRepositories({ added, removed }: ISCMViewVisibleRepositoryChangeEvent): void {
 		for (const repository of added) {
-			const disposable = combinedDisposable(
-				repository.provider.groups.onDidSplice(splice => this._onDidSpliceGroups(item, splice)),
-				repository.input.onDidChangeVisibility(() => this.refresh(item.element)),
-				repository.provider.onDidChange(() => {
-					if (this.showActionButton) {
-						this.refresh(item.element);
-					}
-				})
-			);
-			const groupItems = repository.provider.groups.elements.map(group => this.createGroupItem(group));
-			const item: IRepositoryItem = {
-				element: repository, groupItems, dispose() {
-					dispose(this.groupItems);
-					disposable.dispose();
-				}
-			};
+			const repositoryDisposables = new DisposableStore();
 
-			this.items.set(repository, item);
-		}
+			repositoryDisposables.add(repository.provider.onDidChange(() => this.tree.updateChildren(repository, true, true)));
+			repositoryDisposables.add(repository.provider.onDidChangeResourceGroups(() => this.tree.updateChildren(repository, true)));
+			repositoryDisposables.add(repository.input.onDidChangeVisibility(() => this.tree.updateChildren(repository)));
 
-		for (const repository of removed) {
-			const item = this.items.get(repository)!;
-			item.dispose();
-			this.items.delete(repository);
-		}
-
-		this.refresh();
-	}
+			const resourceGroupDisposables = repositoryDisposables.add(new DisposableMap<ISCMResourceGroup, IDisposable>());
 
-	private _onDidSpliceGroups(item: IRepositoryItem, { start, deleteCount, toInsert }: ISplice<ISCMResourceGroup>): void {
-		const itemsToInsert: IGroupItem[] = toInsert.map(group => this.createGroupItem(group));
-		const itemsToDispose = item.groupItems.splice(start, deleteCount, ...itemsToInsert);
-
-		for (const item of itemsToDispose) {
-			item.dispose();
-		}
+			const onDidChangeResourceGroups = () => {
+				for (const [resourceGroup] of resourceGroupDisposables) {
+					if (!repository.provider.groups.includes(resourceGroup)) {
+						resourceGroupDisposables.deleteAndDispose(resourceGroup);
+					}
+				}
 
-		this.refresh();
-	}
+				for (const resourceGroup of repository.provider.groups) {
+					if (!resourceGroupDisposables.has(resourceGroup)) {
+						const disposableStore = new DisposableStore();
 
-	private createGroupItem(group: ISCMResourceGroup): IGroupItem {
-		const tree = new ResourceTree<ISCMResource, ISCMResourceGroup>(group, group.provider.rootUri || URI.file('/'), this.uriIdentityService.extUri);
-		const resources: ISCMResource[] = [...group.elements];
-		const disposable = combinedDisposable(
-			group.onDidChange(() => this.tree.refilter()),
-			group.onDidSplice(splice => this._onDidSpliceGroup(item, splice))
-		);
+						disposableStore.add(resourceGroup.onDidChange(() => this.tree.updateChildren(repository)));
+						disposableStore.add(resourceGroup.onDidChangeResources(() => this.tree.updateChildren(resourceGroup)));
+						resourceGroupDisposables.set(resourceGroup, disposableStore);
+					}
+				}
+			};
 
-		const item: IGroupItem = { element: group, resources, tree, dispose() { disposable.dispose(); } };
+			repositoryDisposables.add(repository.provider.onDidChangeResourceGroups(onDidChangeResourceGroups));
+			onDidChangeResourceGroups();
 
-		if (this._mode === ViewModelMode.Tree) {
-			for (const resource of resources) {
-				item.tree.add(resource.sourceUri, resource);
-			}
+			this.items.set(repository, repositoryDisposables);
 		}
 
-		return item;
-	}
-
-	private _onDidSpliceGroup(item: IGroupItem, { start, deleteCount, toInsert }: ISplice<ISCMResource>): void {
-		const before = item.resources.length;
-		const deleted = item.resources.splice(start, deleteCount, ...toInsert);
-		const after = item.resources.length;
-
-		if (this._mode === ViewModelMode.Tree) {
-			for (const resource of deleted) {
-				item.tree.delete(resource.sourceUri);
-			}
-
-			for (const resource of toInsert) {
-				item.tree.add(resource.sourceUri, resource);
-			}
+		for (const repository of removed) {
+			this.items.deleteAndDispose(repository);
 		}
 
-		if (before !== after && (before === 0 || after === 0)) {
-			this.refresh();
-		} else {
-			this.refresh(item.element);
-		}
+		this.tree.updateChildren();
+		this.updateRepositoryContextKeys();
+		this.updateRepositoryCollapseAllContextKeys();
 	}
 
 	setVisible(visible: boolean): void {
@@ -1392,118 +1284,60 @@ class ViewModel {
 			this.editorService.onDidActiveEditorChange(this.onDidActiveEditorChange, this, this.visibilityDisposables);
 			this.onDidActiveEditorChange();
 		} else {
-			this.updateViewState();
-
 			this.visibilityDisposables.clear();
 			this._onDidChangeVisibleRepositories({ added: Iterable.empty(), removed: [...this.items.keys()] });
 			this.scrollTop = this.tree.scrollTop;
 		}
 
 		this.visible = visible;
+		this.updateRepositoryContextKeys();
 		this.updateRepositoryCollapseAllContextKeys();
 	}
 
-	private async refresh(item?: ISCMRepository | ISCMResourceGroup): Promise<void> {
-		if (!this.alwaysShowRepositories && this.items.size === 1) {
-			const provider = Iterable.first(this.items.values())!.element.provider;
-			this.scmProviderContextKey.set(provider.contextValue);
-			this.scmProviderRootUriContextKey.set(provider.rootUri?.toString());
-			this.scmProviderHasRootUriContextKey.set(!!provider.rootUri);
-		} else {
-			this.scmProviderContextKey.set(undefined);
-			this.scmProviderRootUriContextKey.set(undefined);
-			this.scmProviderHasRootUriContextKey.set(false);
-		}
-
-		const focusedInput = this.inputRenderer.getFocusedInput();
-
-		if (!this.alwaysShowRepositories && (this.items.size === 1 && (!item || isSCMRepository(item)))) {
-			// Single repository and not always show repositories
-			await this.tree.setInput(Iterable.first(this.items.keys())!);
-		} else if (item) {
-			// Particular repository or resource group
-			await this.tree.updateChildren(item);
-		} else {
-			// Expand repository nodes
-			// const expanded = Array.from(this.items.keys())
-			// 	.map(repository => `repo:${repository.provider.id}`);
-
-			// await this.tree.setInput([...this.items.keys()], { expanded });
-		}
-
-		// if (!this.alwaysShowRepositories && (this.items.size === 1 && (!item || isRepositoryItem(item)))) {
-		// 	const item = Iterable.first(this.items.values())!;
-		// 	this.tree.setChildren(null, this.render(item, this.treeViewState).children);
-		// } else if (item) {
-		// 	this.tree.setChildren(item.element, this.render(item, this.treeViewState).children);
-		// } else {
-		// 	const items = coalesce(this.scmViewService.visibleRepositories.map(r => this.items.get(r)));
-		// 	this.tree.setChildren(null, items.map(item => this.render(item, this.treeViewState)));
-		// }
-
-		if (focusedInput) {
-			this.inputRenderer.getRenderedInputWidget(focusedInput)?.focus();
-		}
-
-		this.updateRepositoryCollapseAllContextKeys();
-	}
-
-	// private render(item: IRepositoryItem | IGroupItem, treeViewState?: ITreeViewState): ICompressedTreeElement<TreeElement> {
-	// 	if (isRepositoryItem(item)) {
-	// 		const children: ICompressedTreeElement<TreeElement>[] = [];
-	// 		const hasSomeChanges = item.groupItems.some(item => item.element.elements.length > 0);
-
-	// 		if (item.element.input.visible) {
-	// 			children.push({ element: item.element.input, incompressible: true, collapsible: false });
-	// 		}
-
-	// 		if (hasSomeChanges || (this.items.size === 1 && (!this.showActionButton || !item.element.provider.actionButton))) {
-	// 			children.push(...item.groupItems.map(i => this.render(i, treeViewState)));
-	// 		}
-
-	// 		if (this.showActionButton && item.element.provider.actionButton) {
-	// 			const button: ICompressedTreeElement<ISCMActionButton> = {
-	// 				element: {
-	// 					type: 'actionButton',
-	// 					repository: item.element,
-	// 					button: item.element.provider.actionButton,
-	// 				},
-	// 				incompressible: true,
-	// 				collapsible: false
-	// 			};
-	// 			children.push(button);
-	// 		}
+	// private async refresh(item?: ISCMRepository | ISCMResourceGroup): Promise<void> {
+	// 	if (!this.alwaysShowRepositories && this.items.size === 1) {
+	// 		const provider = Iterable.first(this.items.keys())!.provider;
+	// 		this.scmProviderContextKey.set(provider.contextValue);
+	// 		this.scmProviderRootUriContextKey.set(provider.rootUri?.toString());
+	// 		this.scmProviderHasRootUriContextKey.set(!!provider.rootUri);
+	// 	} else {
+	// 		this.scmProviderContextKey.set(undefined);
+	// 		this.scmProviderRootUriContextKey.set(undefined);
+	// 		this.scmProviderHasRootUriContextKey.set(false);
+	// 	}
 
-	// 		const collapsed = treeViewState ? treeViewState.collapsed.indexOf(getSCMResourceId(item.element)) > -1 : false;
+	// 	const focusedInput = this.inputRenderer.getFocusedInput();
 
-	// 		return { element: item.element, children, incompressible: true, collapsed, collapsible: true };
+	// 	if (!this.alwaysShowRepositories && (this.items.size === 1 && (!item || isSCMRepository(item)))) {
+	// 		// Single repository and not always show repositories
+	// 		await this.tree.setInput(Iterable.first(this.items.keys())!);
+	// 	} else if (item) {
+	// 		// Particular repository or resource group
+	// 		await this.tree.updateChildren(item);
 	// 	} else {
-	// 		const children = this.mode === ViewModelMode.List
-	// 			? Iterable.map(item.resources, element => ({ element, incompressible: true }))
-	// 			: Iterable.map(item.tree.root.children, node => asTreeElement(node, true, treeViewState));
-
-	// 		const collapsed = treeViewState ? treeViewState.collapsed.indexOf(getSCMResourceId(item.element)) > -1 : false;
+	// 		// Expand repository nodes
+	// 		// const expanded = Array.from(this.items.keys())
+	// 		// 	.map(repository => `repo:${repository.provider.id}`);
 
-	// 		return { element: item.element, children, incompressible: true, collapsed, collapsible: true };
+	// 		// await this.tree.setInput([...this.items.keys()], { expanded });
 	// 	}
-	// }
-
-	private updateViewState(): void {
-		const collapsed: string[] = [];
-		const visit = (node: ITreeNode<TreeElement | null, FuzzyScore>) => {
-			if (node.element && node.collapsible && node.collapsed) {
-				collapsed.push(getSCMResourceId(node.element));
-			}
-
-			for (const child of node.children) {
-				visit(child);
-			}
-		};
 
-		visit(this.tree.getNode());
+	// 	// if (!this.alwaysShowRepositories && (this.items.size === 1 && (!item || isRepositoryItem(item)))) {
+	// 	// 	const item = Iterable.first(this.items.values())!;
+	// 	// 	this.tree.setChildren(null, this.render(item, this.treeViewState).children);
+	// 	// } else if (item) {
+	// 	// 	this.tree.setChildren(item.element, this.render(item, this.treeViewState).children);
+	// 	// } else {
+	// 	// 	const items = coalesce(this.scmViewService.visibleRepositories.map(r => this.items.get(r)));
+	// 	// 	this.tree.setChildren(null, items.map(item => this.render(item, this.treeViewState)));
+	// 	// }
+
+	// 	if (focusedInput) {
+	// 		this.inputRenderer.getRenderedInputWidget(focusedInput)?.focus();
+	// 	}
 
-		this._treeViewState = { collapsed };
-	}
+	// 	this.updateRepositoryCollapseAllContextKeys();
+	// }
 
 	private onDidActiveEditorChange(): void {
 		if (!this.configurationService.getValue<boolean>('scm.autoReveal')) {
@@ -1530,10 +1364,10 @@ class ViewModel {
 			}
 
 			// go backwards from last group
-			for (let j = item.groupItems.length - 1; j >= 0; j--) {
-				const groupItem = item.groupItems[j];
+			for (let j = repository.provider.groups.length - 1; j >= 0; j--) {
+				const groupItem = repository.provider.groups[j];
 				const resource = this.mode === ViewModelMode.Tree
-					? groupItem.tree.getNode(uri)?.element
+					? groupItem.resourceTree.getNode(uri)?.element
 					: groupItem.resources.find(r => this.uriIdentityService.extUri.isEqual(r.sourceUri, uri));
 
 				if (resource) {
@@ -1561,6 +1395,19 @@ class ViewModel {
 		this.tree.domFocus();
 	}
 
+	private updateRepositoryContextKeys(): void {
+		if (!this.alwaysShowRepositories && this.items.size === 1) {
+			const provider = Iterable.first(this.items.keys())!.provider;
+			this.scmProviderContextKey.set(provider.contextValue);
+			this.scmProviderRootUriContextKey.set(provider.rootUri?.toString());
+			this.scmProviderHasRootUriContextKey.set(!!provider.rootUri);
+		} else {
+			this.scmProviderContextKey.set(undefined);
+			this.scmProviderRootUriContextKey.set(undefined);
+			this.scmProviderHasRootUriContextKey.set(false);
+		}
+	}
+
 	private updateRepositoryCollapseAllContextKeys(): void {
 		if (!this.visible || this.scmViewService.visibleRepositories.length === 1) {
 			this.isAnyRepositoryCollapsibleContextKey.set(false);
@@ -1568,8 +1415,8 @@ class ViewModel {
 			return;
 		}
 
-		// this.isAnyRepositoryCollapsibleContextKey.set(this.scmViewService.visibleRepositories.some(r => this.tree.hasElement(r) && this.tree.isCollapsible(r)));
-		// this.areAllRepositoriesCollapsedContextKey.set(this.scmViewService.visibleRepositories.every(r => this.tree.hasElement(r) && (!this.tree.isCollapsible(r) || this.tree.isCollapsed(r))));
+		this.isAnyRepositoryCollapsibleContextKey.set(this.scmViewService.visibleRepositories.some(r => this.tree.hasElement(r) && this.tree.isCollapsible(r)));
+		this.areAllRepositoriesCollapsedContextKey.set(this.scmViewService.visibleRepositories.every(r => this.tree.hasElement(r) && (!this.tree.isCollapsible(r) || this.tree.isCollapsed(r))));
 	}
 
 	collapseAllRepositories(): void {
@@ -1630,8 +1477,7 @@ class ViewModel {
 	dispose(): void {
 		this.visibilityDisposables.dispose();
 		this.disposables.dispose();
-		dispose(this.items.values());
-		this.items.clear();
+		this.items.dispose();
 	}
 }
 
@@ -2331,7 +2177,7 @@ export class SCMViewPane extends ViewPane {
 	private layoutCache: ISCMLayout;
 
 	private listContainer!: HTMLElement;
-	private tree!: WorkbenchCompressibleAsyncDataTree<TreeElement, TreeElement, FuzzyScore>;
+	private tree!: WorkbenchCompressibleAsyncDataTree<ISCMViewService, TreeElement, FuzzyScore>;
 	private _viewModel!: ViewModel;
 	get viewModel(): ViewModel { return this._viewModel; }
 	private listLabels!: ResourceLabels;
@@ -2354,6 +2200,7 @@ export class SCMViewPane extends ViewPane {
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IMenuService private menuService: IMenuService,
 		@IOpenerService openerService: IOpenerService,
+		@IStorageService private storageService: IStorageService,
 		@ITelemetryService telemetryService: ITelemetryService,
 	) {
 		super({ ...options, titleMenuId: MenuId.SCMTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
@@ -2366,8 +2213,13 @@ export class SCMViewPane extends ViewPane {
 		};
 
 		this._register(this.instantiationService.createInstance(ScmInputContentProvider));
-
 		this._register(Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository)(() => this._onDidChangeViewWelcomeState.fire()));
+
+		this._register(this.storageService.onWillSaveState(e => {
+			if (e.reason === WillSaveStateReason.SHUTDOWN) {
+				this.storeTreeViewState();
+			}
+		}));
 	}
 
 	protected override renderBody(container: HTMLElement): void {
@@ -2390,7 +2242,7 @@ export class SCMViewPane extends ViewPane {
 		this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.providerCountBadge'), this.disposables)(updateProviderCountVisibility));
 		updateProviderCountVisibility();
 
-		this.inputRenderer = this.instantiationService.createInstance(InputRenderer, this.layoutCache, overflowWidgetsDomNode, (input, height) => { console.log('update element height'); /*this.tree.updateElementHeight(input, height)*/ }, getActionViewItemProvider(this.instantiationService));
+		this.inputRenderer = this.instantiationService.createInstance(InputRenderer, this.layoutCache, overflowWidgetsDomNode, (input, height) => { this.tree.updateElementHeight(input, height); }, getActionViewItemProvider(this.instantiationService));
 		const delegate = new ListDelegate(this.inputRenderer);
 
 		this.actionButtonRenderer = this.instantiationService.createInstance(ActionButtonRenderer);
@@ -2436,9 +2288,9 @@ export class SCMViewPane extends ViewPane {
 				overrideStyles: {
 					listBackground: this.viewDescriptorService.getViewLocationById(this.id) === ViewContainerLocation.Panel ? PANEL_BACKGROUND : SIDE_BAR_BACKGROUND
 				},
-				collapseByDefault: () => false,
+				collapseByDefault: (e) => false,
 				accessibilityProvider: this.instantiationService.createInstance(SCMAccessibilityProvider)
-			}) as WorkbenchCompressibleAsyncDataTree<TreeElement, TreeElement, FuzzyScore>;
+			}) as WorkbenchCompressibleAsyncDataTree<ISCMViewService, TreeElement, FuzzyScore>;
 
 		this._register(this.tree.onDidOpen(this.open, this));
 
@@ -2447,14 +2299,14 @@ export class SCMViewPane extends ViewPane {
 		this._register(this.tree);
 
 		append(this.listContainer, overflowWidgetsDomNode);
+		this.listContainer.classList.add('file-icon-themable-tree');
+		this.listContainer.classList.add('show-file-icons');
 
 		this._register(this.instantiationService.createInstance(RepositoryVisibilityActionController));
 
-		this._viewModel = this.instantiationService.createInstance(ViewModel, this.tree, this.inputRenderer);
-		this._register(this._viewModel);
-
-		this.listContainer.classList.add('file-icon-themable-tree');
-		this.listContainer.classList.add('show-file-icons');
+		// TODO - @lszomoru
+		this._viewModel = this._register(this.instantiationService.createInstance(ViewModel, this.tree, this.inputRenderer));
+		this.tree.setInput(this.scmViewService, this.loadTreeViewState());
 
 		this.updateIndentStyles(this.themeService.getFileIconTheme());
 		this._register(this.themeService.onDidFileIconThemeChange(this.updateIndentStyles, this));
@@ -2632,6 +2484,24 @@ export class SCMViewPane extends ViewPane {
 			.filter(r => !!r && !isSCMResourceGroup(r))! as any;
 	}
 
+	private loadTreeViewState(): IAsyncDataTreeViewState | undefined {
+		const storageViewState = this.storageService.get(`scm.viewState`, StorageScope.WORKSPACE);
+		if (!storageViewState) {
+			return undefined;
+		}
+
+		try {
+			const treeViewState = JSON.parse(storageViewState);
+			return treeViewState;
+		} catch {
+			return undefined;
+		}
+	}
+
+	private storeTreeViewState() {
+		this.storageService.store(`scm.viewState`, JSON.stringify(this.tree.getViewState()), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+	}
+
 	override shouldShowWelcome(): boolean {
 		return this.scmService.repositoryCount === 0;
 	}
@@ -2646,78 +2516,79 @@ export class SCMViewPane extends ViewPane {
 	}
 }
 
-class SCMTreeDataSource implements IAsyncDataSource<TreeElement, TreeElement> {
+class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement> {
 
 	constructor(
 		private readonly viewModel: () => ViewModel,
-		@ISCMViewService private readonly scmViewService: ISCMViewService,
-		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService) { }
+		@ISCMViewService private readonly scmViewService: ISCMViewService) { }
 
-	hasChildren(element: TreeElement): boolean {
-		if (isSCMRepository(element)) {
+	hasChildren(inputOrElement: ISCMViewService | TreeElement): boolean {
+		if (isSCMViewService(inputOrElement)) {
+			return this.scmViewService.visibleRepositories.length !== 0;
+		} else if (isSCMRepository(inputOrElement)) {
 			return true;
-		} else if (isSCMInput(element)) {
+		} else if (isSCMInput(inputOrElement)) {
 			return false;
-		} else if (isSCMActionButton(element)) {
+		} else if (isSCMActionButton(inputOrElement)) {
 			return false;
-		} else if (isSCMResourceGroup(element)) {
-			return element.elements.length > 0;
-		} else if (isSCMResource(element)) {
+		} else if (isSCMResourceGroup(inputOrElement)) {
+			return inputOrElement.resources.length > 0;
+		} else if (isSCMResource(inputOrElement)) {
 			return false;
-		} else if (ResourceTree.isResourceNode(element)) {
-			return element.childrenCount > 0;
+		} else if (ResourceTree.isResourceNode(inputOrElement)) {
+			return inputOrElement.childrenCount > 0;
 		} else {
 			throw new Error('hasChildren not implemented.');
 		}
 	}
 
-	getChildren(element: TreeElement): Iterable<TreeElement> | Promise<Iterable<TreeElement>> {
-		const children: TreeElement[] = [];
+	getChildren(inputOrElement: ISCMViewService | TreeElement): Iterable<TreeElement> | Promise<Iterable<TreeElement>> {
+		if (isSCMViewService(inputOrElement)) {
+			return this.scmViewService.visibleRepositories;
+		}
 
-		if (isSCMRepository(element)) {
-			const provider = element.provider;
+		if (isSCMRepository(inputOrElement)) {
+			const children: TreeElement[] = [];
+
+			const provider = inputOrElement.provider;
 			const showActionButton = this.viewModel().showActionButton;
 			const repositoryCount = this.scmViewService.visibleRepositories.length;
 
 			// SCM Input
-			if (element.input.visible) {
-				children.push(element.input);
+			if (inputOrElement.input.visible) {
+				children.push(inputOrElement.input);
 			}
 
 			// Action Button
 			if (showActionButton && provider.actionButton) {
 				children.push({
 					type: 'actionButton',
-					repository: element,
+					repository: inputOrElement,
 					button: provider.actionButton
 				} as ISCMActionButton);
 			}
 
 			// ResourceGroups
-			const hasSomeChanges = provider.groups.elements.some(item => item.elements.length > 0);
+			const hasSomeChanges = provider.groups.some(item => item.resources.length > 0);
 			if (hasSomeChanges || (repositoryCount === 1 && (!showActionButton || !provider.actionButton))) {
-				children.push(...provider.groups.elements);
+				children.push(...provider.groups);
 			}
-		} else if (isSCMResourceGroup(element)) {
+
+			return children;
+		} else if (isSCMResourceGroup(inputOrElement)) {
 			if (this.viewModel().mode === ViewModelMode.List) {
 				// Resources (List)
-				children.push(...element.elements);
+				return inputOrElement.resources;
 			} else if (this.viewModel().mode === ViewModelMode.Tree) {
 				// Resources (Tree)
-				const rootUri = element.provider.rootUri ?? URI.file('/');
-				const tree = new ResourceTree<ISCMResource, ISCMResourceGroup>(element, rootUri, this.uriIdentityService.extUri);
-				for (const resource of element.elements) {
-					tree.add(resource.sourceUri, resource);
-				}
-
-				children.push(...tree.root.children);
+				return inputOrElement.resourceTree.root.children;
 			}
-		} else if (ResourceTree.isResourceNode(element)) {
+		} else if (ResourceTree.isResourceNode(inputOrElement)) {
 			// Resources (Tree)
-			children.push(...element.children);
+			return inputOrElement.children;
 		}
 
-		return children;
+		return [];
 	}
 
 }
diff --git a/src/vs/workbench/contrib/scm/browser/util.ts b/src/vs/workbench/contrib/scm/browser/util.ts
index 34b7170c71e0..ad83f6369bbe 100644
--- a/src/vs/workbench/contrib/scm/browser/util.ts
+++ b/src/vs/workbench/contrib/scm/browser/util.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ISCMResource, ISCMRepository, ISCMResourceGroup, ISCMInput, ISCMActionButton } from 'vs/workbench/contrib/scm/common/scm';
+import { ISCMResource, ISCMRepository, ISCMResourceGroup, ISCMInput, ISCMActionButton, ISCMViewService } from 'vs/workbench/contrib/scm/common/scm';
 import { IMenu } from 'vs/platform/actions/common/actions';
 import { ActionBar, IActionViewItemProvider } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IDisposable } from 'vs/base/common/lifecycle';
@@ -21,6 +21,10 @@ export function isSCMRepositoryArray(element: any): element is ISCMRepository[]
 	return Array.isArray(element) && element.every(r => isSCMRepository(r));
 }
 
+export function isSCMViewService(element: any): element is ISCMViewService {
+	return Array.isArray((element as ISCMViewService).repositories) && Array.isArray((element as ISCMViewService).visibleRepositories);
+}
+
 export function isSCMRepository(element: any): element is ISCMRepository {
 	return !!(element as ISCMRepository).provider && !!(element as ISCMRepository).input;
 }
@@ -34,7 +38,7 @@ export function isSCMActionButton(element: any): element is ISCMActionButton {
 }
 
 export function isSCMResourceGroup(element: any): element is ISCMResourceGroup {
-	return !!(element as ISCMResourceGroup).provider && !!(element as ISCMResourceGroup).elements;
+	return !!(element as ISCMResourceGroup).provider && !!(element as ISCMResourceGroup).resources;
 }
 
 export function isSCMResource(element: any): element is ISCMResource {
diff --git a/src/vs/workbench/contrib/scm/common/scm.ts b/src/vs/workbench/contrib/scm/common/scm.ts
index af7852084c7e..7a85d7e3746a 100644
--- a/src/vs/workbench/contrib/scm/common/scm.ts
+++ b/src/vs/workbench/contrib/scm/common/scm.ts
@@ -8,11 +8,11 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Command } from 'vs/editor/common/languages';
-import { ISequence } from 'vs/base/common/sequence';
 import { IAction } from 'vs/base/common/actions';
 import { IMenu } from 'vs/platform/actions/common/actions';
 import { ThemeIcon } from 'vs/base/common/themables';
 import { IMarkdownString } from 'vs/base/common/htmlContent';
+import { ResourceTree } from 'vs/base/common/resourceTree';
 import { ISCMHistoryProvider } from 'vs/workbench/contrib/scm/common/history';
 
 export const VIEWLET_ID = 'workbench.view.scm';
@@ -43,22 +43,26 @@ export interface ISCMResource {
 	open(preserveFocus: boolean): Promise<void>;
 }
 
-export interface ISCMResourceGroup extends ISequence<ISCMResource> {
+export interface ISCMResourceGroup {
+	readonly id: string;
 	readonly provider: ISCMProvider;
+
+	readonly resources: readonly ISCMResource[];
+	readonly resourceTree: ResourceTree<ISCMResource, ISCMResourceGroup>;
+	readonly onDidChangeResources: Event<void>;
+
 	readonly label: string;
-	readonly id: string;
 	readonly hideWhenEmpty: boolean;
 	readonly onDidChange: Event<void>;
 }
 
 export interface ISCMProvider extends IDisposable {
-	readonly label: string;
 	readonly id: string;
+	readonly label: string;
 	readonly contextValue: string;
 
-	readonly groups: ISequence<ISCMResourceGroup>;
-
-	// TODO@Joao: remove
+	readonly groups: readonly ISCMResourceGroup[];
+	readonly onDidChangeResourceGroups: Event<void>;
 	readonly onDidChangeResources: Event<void>;
 
 	readonly rootUri?: URI;

From fd9d0972d7a322349ec4d383596b4b226f3cb1bd Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 20 Oct 2023 10:23:56 +0200
Subject: [PATCH 0019/1815] Saving my changes

---
 .../contrib/scm/browser/scmViewPane.ts        | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index d2bec46002c6..1ee5618c1ec3 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -2299,23 +2299,25 @@ export class SCMViewPane extends ViewPane {
 		this._register(this.tree);
 
 		append(this.listContainer, overflowWidgetsDomNode);
-		this.listContainer.classList.add('file-icon-themable-tree');
-		this.listContainer.classList.add('show-file-icons');
 
 		this._register(this.instantiationService.createInstance(RepositoryVisibilityActionController));
 
-		// TODO - @lszomoru
-		this._viewModel = this._register(this.instantiationService.createInstance(ViewModel, this.tree, this.inputRenderer));
-		this.tree.setInput(this.scmViewService, this.loadTreeViewState());
+		this.tree.setInput(this.scmViewService, this.loadTreeViewState()).then(() => {
+			this._viewModel = this._register(this.instantiationService.createInstance(ViewModel, this.tree, this.inputRenderer));
 
-		this.updateIndentStyles(this.themeService.getFileIconTheme());
-		this._register(this.themeService.onDidFileIconThemeChange(this.updateIndentStyles, this));
-		this._register(this._viewModel.onDidChangeMode(this.onDidChangeMode, this));
+			this.listContainer.classList.add('file-icon-themable-tree');
+			this.listContainer.classList.add('show-file-icons');
+
+			this.updateIndentStyles(this.themeService.getFileIconTheme());
+			this._register(this.themeService.onDidFileIconThemeChange(this.updateIndentStyles, this));
+			this._register(this._viewModel.onDidChangeMode(this.onDidChangeMode, this));
 
-		this._register(this.onDidChangeBodyVisibility(this._viewModel.setVisible, this._viewModel));
+			this._register(this.onDidChangeBodyVisibility(this._viewModel.setVisible, this._viewModel));
+			this._viewModel.setVisible(this.isBodyVisible());
 
-		this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.alwaysShowRepositories'), this.disposables)(this.updateActions, this));
-		this.updateActions();
+			this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.alwaysShowRepositories'), this.disposables)(this.updateActions, this));
+			this.updateActions();
+		});
 	}
 
 	private updateIndentStyles(theme: IFileIconTheme): void {

From 56b4d0a3083cf79e6191061ef3f1143e12b9a9d0 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 20 Oct 2023 23:08:05 +0200
Subject: [PATCH 0020/1815] Adopt the Sequencer

---
 .../contrib/scm/browser/scmViewPane.ts        | 83 ++++++-------------
 1 file changed, 26 insertions(+), 57 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index 1ee5618c1ec3..6ec611c622a3 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -26,7 +26,7 @@ import { IThemeService, IFileIconTheme } from 'vs/platform/theme/common/themeSer
 import { isSCMResource, isSCMResourceGroup, connectPrimaryMenuToInlineActionBar, isSCMRepository, isSCMInput, collectContextMenuActions, getActionViewItemProvider, isSCMActionButton, isSCMViewService } from './util';
 import { WorkbenchCompressibleAsyncDataTree, IOpenEvent } from 'vs/platform/list/browser/listService';
 import { IConfigurationService, ConfigurationTarget, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
-import { disposableTimeout, ThrottledDelayer } from 'vs/base/common/async';
+import { disposableTimeout, ThrottledDelayer, Sequencer } from 'vs/base/common/async';
 import { ITreeNode, ITreeFilter, ITreeSorter, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeDragOverReaction, IAsyncDataSource } from 'vs/base/browser/ui/tree/tree';
 import { ResourceTree, IResourceNode } from 'vs/base/common/resourceTree';
 import { ICompressibleTreeRenderer, ICompressibleKeyboardNavigationLabelProvider } from 'vs/base/browser/ui/tree/objectTree';
@@ -1123,7 +1123,7 @@ class ViewModel {
 		// Update sort key based on view mode
 		this.sortKey = this.getViewModelSortKey();
 
-		this.tree.updateChildren();
+		this._updateChildren();
 		this._onDidChangeMode.fire(mode);
 		this.modeContextKey.set(mode);
 
@@ -1138,7 +1138,7 @@ class ViewModel {
 
 		this._sortKey = sortKey;
 
-		this.tree.updateChildren();
+		this._updateChildren();
 		this._onDidChangeSortKey.fire(sortKey);
 		this.sortKeyContextKey.set(sortKey);
 
@@ -1157,6 +1157,7 @@ class ViewModel {
 	private readonly visibilityDisposables = new DisposableStore();
 	private scrollTop: number | undefined;
 	private firstVisible = true;
+	private readonly updateChildrenSequencer = new Sequencer();
 	private readonly disposables = new DisposableStore();
 
 	private modeContextKey: IContextKey<ViewModelMode>;
@@ -1223,18 +1224,20 @@ class ViewModel {
 			this._alwaysShowRepositories = this.configurationService.getValue<boolean>('scm.alwaysShowRepositories');
 			this._showActionButton = this.configurationService.getValue<boolean>('scm.showActionButton');
 
-			this.tree.updateChildren();
+			this._updateChildren();
 			this.updateRepositoryContextKeys();
 		}
 	}
 
 	private _onDidChangeVisibleRepositories({ added, removed }: ISCMViewVisibleRepositoryChangeEvent): void {
+		this._updateChildren();
+
 		for (const repository of added) {
 			const repositoryDisposables = new DisposableStore();
 
-			repositoryDisposables.add(repository.provider.onDidChange(() => this.tree.updateChildren(repository, true, true)));
-			repositoryDisposables.add(repository.provider.onDidChangeResourceGroups(() => this.tree.updateChildren(repository, true)));
-			repositoryDisposables.add(repository.input.onDidChangeVisibility(() => this.tree.updateChildren(repository)));
+			repositoryDisposables.add(repository.provider.onDidChange(() => this._updateChildren(repository, true, true)));
+			repositoryDisposables.add(repository.provider.onDidChangeResourceGroups(() => this._updateChildren(repository, true)));
+			repositoryDisposables.add(repository.input.onDidChangeVisibility(() => this._updateChildren(repository)));
 
 			const resourceGroupDisposables = repositoryDisposables.add(new DisposableMap<ISCMResourceGroup, IDisposable>());
 
@@ -1249,8 +1252,8 @@ class ViewModel {
 					if (!resourceGroupDisposables.has(resourceGroup)) {
 						const disposableStore = new DisposableStore();
 
-						disposableStore.add(resourceGroup.onDidChange(() => this.tree.updateChildren(repository)));
-						disposableStore.add(resourceGroup.onDidChangeResources(() => this.tree.updateChildren(resourceGroup)));
+						disposableStore.add(resourceGroup.onDidChange(() => this._updateChildren(repository)));
+						disposableStore.add(resourceGroup.onDidChangeResources(() => this._updateChildren(repository)));
 						resourceGroupDisposables.set(resourceGroup, disposableStore);
 					}
 				}
@@ -1265,10 +1268,6 @@ class ViewModel {
 		for (const repository of removed) {
 			this.items.deleteAndDispose(repository);
 		}
-
-		this.tree.updateChildren();
-		this.updateRepositoryContextKeys();
-		this.updateRepositoryCollapseAllContextKeys();
 	}
 
 	setVisible(visible: boolean): void {
@@ -1294,50 +1293,20 @@ class ViewModel {
 		this.updateRepositoryCollapseAllContextKeys();
 	}
 
-	// private async refresh(item?: ISCMRepository | ISCMResourceGroup): Promise<void> {
-	// 	if (!this.alwaysShowRepositories && this.items.size === 1) {
-	// 		const provider = Iterable.first(this.items.keys())!.provider;
-	// 		this.scmProviderContextKey.set(provider.contextValue);
-	// 		this.scmProviderRootUriContextKey.set(provider.rootUri?.toString());
-	// 		this.scmProviderHasRootUriContextKey.set(!!provider.rootUri);
-	// 	} else {
-	// 		this.scmProviderContextKey.set(undefined);
-	// 		this.scmProviderRootUriContextKey.set(undefined);
-	// 		this.scmProviderHasRootUriContextKey.set(false);
-	// 	}
-
-	// 	const focusedInput = this.inputRenderer.getFocusedInput();
-
-	// 	if (!this.alwaysShowRepositories && (this.items.size === 1 && (!item || isSCMRepository(item)))) {
-	// 		// Single repository and not always show repositories
-	// 		await this.tree.setInput(Iterable.first(this.items.keys())!);
-	// 	} else if (item) {
-	// 		// Particular repository or resource group
-	// 		await this.tree.updateChildren(item);
-	// 	} else {
-	// 		// Expand repository nodes
-	// 		// const expanded = Array.from(this.items.keys())
-	// 		// 	.map(repository => `repo:${repository.provider.id}`);
-
-	// 		// await this.tree.setInput([...this.items.keys()], { expanded });
-	// 	}
-
-	// 	// if (!this.alwaysShowRepositories && (this.items.size === 1 && (!item || isRepositoryItem(item)))) {
-	// 	// 	const item = Iterable.first(this.items.values())!;
-	// 	// 	this.tree.setChildren(null, this.render(item, this.treeViewState).children);
-	// 	// } else if (item) {
-	// 	// 	this.tree.setChildren(item.element, this.render(item, this.treeViewState).children);
-	// 	// } else {
-	// 	// 	const items = coalesce(this.scmViewService.visibleRepositories.map(r => this.items.get(r)));
-	// 	// 	this.tree.setChildren(null, items.map(item => this.render(item, this.treeViewState)));
-	// 	// }
-
-	// 	if (focusedInput) {
-	// 		this.inputRenderer.getRenderedInputWidget(focusedInput)?.focus();
-	// 	}
-
-	// 	this.updateRepositoryCollapseAllContextKeys();
-	// }
+	private _updateChildren(element?: ISCMRepository | ISCMResourceGroup, recursive?: boolean, rerender?: boolean) {
+		this.updateChildrenSequencer.queue(async () => {
+			this.updateRepositoryContextKeys();
+			const focusedInput = this.inputRenderer.getFocusedInput();
+
+			await this.tree.updateChildren(element, recursive, rerender);
+
+			if (focusedInput) {
+				this.inputRenderer.getRenderedInputWidget(focusedInput)?.focus();
+			}
+
+			this.updateRepositoryCollapseAllContextKeys();
+		});
+	}
 
 	private onDidActiveEditorChange(): void {
 		if (!this.configurationService.getValue<boolean>('scm.autoReveal')) {

From 046d44eb8da2160b41221f2551bc3ce927b9e25e Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Sat, 21 Oct 2023 14:52:53 +0200
Subject: [PATCH 0021/1815] Honour always show repositories setting

---
 .../contrib/scm/browser/scmViewPane.ts        | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index 6ec611c622a3..d23dd6d51904 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -2456,7 +2456,7 @@ export class SCMViewPane extends ViewPane {
 	}
 
 	private loadTreeViewState(): IAsyncDataTreeViewState | undefined {
-		const storageViewState = this.storageService.get(`scm.viewState`, StorageScope.WORKSPACE);
+		const storageViewState = this.storageService.get('scm.viewState2', StorageScope.WORKSPACE);
 		if (!storageViewState) {
 			return undefined;
 		}
@@ -2470,7 +2470,7 @@ export class SCMViewPane extends ViewPane {
 	}
 
 	private storeTreeViewState() {
-		this.storageService.store(`scm.viewState`, JSON.stringify(this.tree.getViewState()), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+		this.storageService.store('scm.viewState2', JSON.stringify(this.tree.getViewState()), StorageScope.WORKSPACE, StorageTarget.MACHINE);
 	}
 
 	override shouldShowWelcome(): boolean {
@@ -2514,35 +2514,35 @@ class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement
 	}
 
 	getChildren(inputOrElement: ISCMViewService | TreeElement): Iterable<TreeElement> | Promise<Iterable<TreeElement>> {
-		if (isSCMViewService(inputOrElement)) {
+		if (isSCMViewService(inputOrElement) && (this.viewModel().alwaysShowRepositories || this.scmViewService.visibleRepositories.length > 1)) {
 			return this.scmViewService.visibleRepositories;
-		}
-
-		if (isSCMRepository(inputOrElement)) {
+		} else if (isSCMViewService(inputOrElement) || isSCMRepository(inputOrElement)) {
 			const children: TreeElement[] = [];
 
-			const provider = inputOrElement.provider;
+			const repository = isSCMViewService(inputOrElement) ?
+				inputOrElement.visibleRepositories[0] : inputOrElement;
+
 			const showActionButton = this.viewModel().showActionButton;
 			const repositoryCount = this.scmViewService.visibleRepositories.length;
 
 			// SCM Input
-			if (inputOrElement.input.visible) {
-				children.push(inputOrElement.input);
+			if (repository.input.visible) {
+				children.push(repository.input);
 			}
 
 			// Action Button
-			if (showActionButton && provider.actionButton) {
+			if (showActionButton && repository.provider.actionButton) {
 				children.push({
 					type: 'actionButton',
-					repository: inputOrElement,
-					button: provider.actionButton
+					repository: repository,
+					button: repository.provider.actionButton
 				} as ISCMActionButton);
 			}
 
 			// ResourceGroups
-			const hasSomeChanges = provider.groups.some(item => item.resources.length > 0);
-			if (hasSomeChanges || (repositoryCount === 1 && (!showActionButton || !provider.actionButton))) {
-				children.push(...provider.groups);
+			const hasSomeChanges = repository.provider.groups.some(item => item.resources.length > 0);
+			if (hasSomeChanges || (repositoryCount === 1 && (!showActionButton || !repository.provider.actionButton))) {
+				children.push(...repository.provider.groups);
 			}
 
 			return children;

From c1bed04922c89cc4b2b7968feda46047f9459b83 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Tue, 24 Oct 2023 20:37:49 +0200
Subject: [PATCH 0022/1815] Revert changes related to alwaysShowRepositories

---
 .../contrib/scm/browser/scmViewPane.ts        | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index d23dd6d51904..ca6292f42268 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -2514,35 +2514,33 @@ class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement
 	}
 
 	getChildren(inputOrElement: ISCMViewService | TreeElement): Iterable<TreeElement> | Promise<Iterable<TreeElement>> {
-		if (isSCMViewService(inputOrElement) && (this.viewModel().alwaysShowRepositories || this.scmViewService.visibleRepositories.length > 1)) {
+		if (isSCMViewService(inputOrElement)) {
 			return this.scmViewService.visibleRepositories;
-		} else if (isSCMViewService(inputOrElement) || isSCMRepository(inputOrElement)) {
+		} else if (isSCMRepository(inputOrElement)) {
 			const children: TreeElement[] = [];
 
-			const repository = isSCMViewService(inputOrElement) ?
-				inputOrElement.visibleRepositories[0] : inputOrElement;
-
+			const provider = inputOrElement.provider;
 			const showActionButton = this.viewModel().showActionButton;
 			const repositoryCount = this.scmViewService.visibleRepositories.length;
 
 			// SCM Input
-			if (repository.input.visible) {
-				children.push(repository.input);
+			if (inputOrElement.input.visible) {
+				children.push(inputOrElement.input);
 			}
 
 			// Action Button
-			if (showActionButton && repository.provider.actionButton) {
+			if (showActionButton && provider.actionButton) {
 				children.push({
 					type: 'actionButton',
-					repository: repository,
-					button: repository.provider.actionButton
+					repository: inputOrElement,
+					button: provider.actionButton
 				} as ISCMActionButton);
 			}
 
 			// ResourceGroups
-			const hasSomeChanges = repository.provider.groups.some(item => item.resources.length > 0);
-			if (hasSomeChanges || (repositoryCount === 1 && (!showActionButton || !repository.provider.actionButton))) {
-				children.push(...repository.provider.groups);
+			const hasSomeChanges = provider.groups.some(item => item.resources.length > 0);
+			if (hasSomeChanges || (repositoryCount === 1 && (!showActionButton || !provider.actionButton))) {
+				children.push(...provider.groups);
 			}
 
 			return children;

From 3815c8288cfde3d081ccd6327ff432629fcf7edb Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Wed, 25 Oct 2023 09:27:37 +0200
Subject: [PATCH 0023/1815] Ad a tactical check for the viewModel existence

---
 .../contrib/scm/browser/scmViewPane.ts        | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index ca6292f42268..a6b793e699b8 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -1235,9 +1235,9 @@ class ViewModel {
 		for (const repository of added) {
 			const repositoryDisposables = new DisposableStore();
 
-			repositoryDisposables.add(repository.provider.onDidChange(() => this._updateChildren(repository, true, true)));
-			repositoryDisposables.add(repository.provider.onDidChangeResourceGroups(() => this._updateChildren(repository, true)));
-			repositoryDisposables.add(repository.input.onDidChangeVisibility(() => this._updateChildren(repository)));
+			repositoryDisposables.add(repository.provider.onDidChange(() => this._updateChildren()));
+			repositoryDisposables.add(repository.provider.onDidChangeResourceGroups(() => this._updateChildren()));
+			repositoryDisposables.add(repository.input.onDidChangeVisibility(() => this._updateChildren()));
 
 			const resourceGroupDisposables = repositoryDisposables.add(new DisposableMap<ISCMResourceGroup, IDisposable>());
 
@@ -1252,8 +1252,8 @@ class ViewModel {
 					if (!resourceGroupDisposables.has(resourceGroup)) {
 						const disposableStore = new DisposableStore();
 
-						disposableStore.add(resourceGroup.onDidChange(() => this._updateChildren(repository)));
-						disposableStore.add(resourceGroup.onDidChangeResources(() => this._updateChildren(repository)));
+						disposableStore.add(resourceGroup.onDidChange(() => this._updateChildren()));
+						disposableStore.add(resourceGroup.onDidChangeResources(() => this._updateChildren()));
 						resourceGroupDisposables.set(resourceGroup, disposableStore);
 					}
 				}
@@ -2196,6 +2196,8 @@ export class SCMViewPane extends ViewPane {
 
 		// List
 		this.listContainer = append(container, $('.scm-view.show-file-icons'));
+		this.listContainer.classList.add('file-icon-themable-tree');
+		this.listContainer.classList.add('show-file-icons');
 
 		const overflowWidgetsDomNode = $('.scm-overflow-widgets-container.monaco-editor');
 
@@ -2274,9 +2276,6 @@ export class SCMViewPane extends ViewPane {
 		this.tree.setInput(this.scmViewService, this.loadTreeViewState()).then(() => {
 			this._viewModel = this._register(this.instantiationService.createInstance(ViewModel, this.tree, this.inputRenderer));
 
-			this.listContainer.classList.add('file-icon-themable-tree');
-			this.listContainer.classList.add('show-file-icons');
-
 			this.updateIndentStyles(this.themeService.getFileIconTheme());
 			this._register(this.themeService.onDidFileIconThemeChange(this.updateIndentStyles, this));
 			this._register(this._viewModel.onDidChangeMode(this.onDidChangeMode, this));
@@ -2490,7 +2489,7 @@ export class SCMViewPane extends ViewPane {
 class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement> {
 
 	constructor(
-		private readonly viewModel: () => ViewModel,
+		private readonly viewModel: () => ViewModel | undefined,
 		@ISCMViewService private readonly scmViewService: ISCMViewService) { }
 
 	hasChildren(inputOrElement: ISCMViewService | TreeElement): boolean {
@@ -2514,13 +2513,17 @@ class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement
 	}
 
 	getChildren(inputOrElement: ISCMViewService | TreeElement): Iterable<TreeElement> | Promise<Iterable<TreeElement>> {
+		if (this.viewModel() === undefined) {
+			return [];
+		}
+
 		if (isSCMViewService(inputOrElement)) {
 			return this.scmViewService.visibleRepositories;
 		} else if (isSCMRepository(inputOrElement)) {
 			const children: TreeElement[] = [];
 
 			const provider = inputOrElement.provider;
-			const showActionButton = this.viewModel().showActionButton;
+			const showActionButton = this.viewModel()!.showActionButton;
 			const repositoryCount = this.scmViewService.visibleRepositories.length;
 
 			// SCM Input
@@ -2545,10 +2548,10 @@ class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement
 
 			return children;
 		} else if (isSCMResourceGroup(inputOrElement)) {
-			if (this.viewModel().mode === ViewModelMode.List) {
+			if (this.viewModel()!.mode === ViewModelMode.List) {
 				// Resources (List)
 				return inputOrElement.resources;
-			} else if (this.viewModel().mode === ViewModelMode.Tree) {
+			} else if (this.viewModel()!.mode === ViewModelMode.Tree) {
 				// Resources (Tree)
 				return inputOrElement.resourceTree.root.children;
 			}

From 40083f4abadf7ec2ef8418435183cb58b54951df Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Wed, 1 Nov 2023 13:34:58 +0100
Subject: [PATCH 0024/1815] Honour the scm.alwaysShowRepositories setting

---
 .../contrib/scm/browser/scmViewPane.ts        | 117 +++++++++---------
 1 file changed, 60 insertions(+), 57 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index a6b793e699b8..71df0fe17d78 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -1196,9 +1196,6 @@ class ViewModel {
 		this.scmProviderRootUriContextKey = ContextKeys.SCMProviderRootUri.bindTo(contextKeyService);
 		this.scmProviderHasRootUriContextKey = ContextKeys.SCMProviderHasRootUri.bindTo(contextKeyService);
 
-		configurationService.onDidChangeConfiguration(this.onDidChangeConfiguration, this, this.disposables);
-		this.onDidChangeConfiguration();
-
 		Event.filter(this.tree.onDidChangeCollapseState, e => isSCMRepository(e.node.element), this.disposables)
 			(this.updateRepositoryCollapseAllContextKeys, this, this.disposables);
 
@@ -1217,6 +1214,17 @@ class ViewModel {
 					break;
 			}
 		}));
+
+		this.disposables.add(this.storageService.onWillSaveState(e => {
+			if (e.reason === WillSaveStateReason.SHUTDOWN) {
+				this.storeTreeViewState();
+			}
+		}));
+
+		this.tree.setInput(this.scmViewService, this.loadTreeViewState()).then(() => {
+			configurationService.onDidChangeConfiguration(this.onDidChangeConfiguration, this, this.disposables);
+			this.onDidChangeConfiguration();
+		});
 	}
 
 	private onDidChangeConfiguration(e?: IConfigurationChangeEvent): void {
@@ -1225,13 +1233,11 @@ class ViewModel {
 			this._showActionButton = this.configurationService.getValue<boolean>('scm.showActionButton');
 
 			this._updateChildren();
-			this.updateRepositoryContextKeys();
 		}
 	}
 
 	private _onDidChangeVisibleRepositories({ added, removed }: ISCMViewVisibleRepositoryChangeEvent): void {
-		this._updateChildren();
-
+		// Added repositories
 		for (const repository of added) {
 			const repositoryDisposables = new DisposableStore();
 
@@ -1265,9 +1271,12 @@ class ViewModel {
 			this.items.set(repository, repositoryDisposables);
 		}
 
+		// Removed repositories
 		for (const repository of removed) {
 			this.items.deleteAndDispose(repository);
 		}
+
+		this._updateChildren();
 	}
 
 	setVisible(visible: boolean): void {
@@ -1294,6 +1303,10 @@ class ViewModel {
 	}
 
 	private _updateChildren(element?: ISCMRepository | ISCMResourceGroup, recursive?: boolean, rerender?: boolean) {
+		if (!this.tree.getInput()) {
+			return;
+		}
+
 		this.updateChildrenSequencer.queue(async () => {
 			this.updateRepositoryContextKeys();
 			const focusedInput = this.inputRenderer.getFocusedInput();
@@ -1443,6 +1456,24 @@ class ViewModel {
 		return viewSortKey;
 	}
 
+	private loadTreeViewState(): IAsyncDataTreeViewState | undefined {
+		const storageViewState = this.storageService.get('scm.viewState2', StorageScope.WORKSPACE);
+		if (!storageViewState) {
+			return undefined;
+		}
+
+		try {
+			const treeViewState = JSON.parse(storageViewState);
+			return treeViewState;
+		} catch {
+			return undefined;
+		}
+	}
+
+	private storeTreeViewState() {
+		this.storageService.store('scm.viewState2', JSON.stringify(this.tree.getViewState()), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+	}
+
 	dispose(): void {
 		this.visibilityDisposables.dispose();
 		this.disposables.dispose();
@@ -2169,7 +2200,6 @@ export class SCMViewPane extends ViewPane {
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IMenuService private menuService: IMenuService,
 		@IOpenerService openerService: IOpenerService,
-		@IStorageService private storageService: IStorageService,
 		@ITelemetryService telemetryService: ITelemetryService,
 	) {
 		super({ ...options, titleMenuId: MenuId.SCMTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
@@ -2183,12 +2213,6 @@ export class SCMViewPane extends ViewPane {
 
 		this._register(this.instantiationService.createInstance(ScmInputContentProvider));
 		this._register(Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository)(() => this._onDidChangeViewWelcomeState.fire()));
-
-		this._register(this.storageService.onWillSaveState(e => {
-			if (e.reason === WillSaveStateReason.SHUTDOWN) {
-				this.storeTreeViewState();
-			}
-		}));
 	}
 
 	protected override renderBody(container: HTMLElement): void {
@@ -2273,19 +2297,16 @@ export class SCMViewPane extends ViewPane {
 
 		this._register(this.instantiationService.createInstance(RepositoryVisibilityActionController));
 
-		this.tree.setInput(this.scmViewService, this.loadTreeViewState()).then(() => {
-			this._viewModel = this._register(this.instantiationService.createInstance(ViewModel, this.tree, this.inputRenderer));
+		this._viewModel = this._register(this.instantiationService.createInstance(ViewModel, this.tree, this.inputRenderer));
 
-			this.updateIndentStyles(this.themeService.getFileIconTheme());
-			this._register(this.themeService.onDidFileIconThemeChange(this.updateIndentStyles, this));
-			this._register(this._viewModel.onDidChangeMode(this.onDidChangeMode, this));
+		this.updateIndentStyles(this.themeService.getFileIconTheme());
+		this._register(this.themeService.onDidFileIconThemeChange(this.updateIndentStyles, this));
+		this._register(this._viewModel.onDidChangeMode(this.onDidChangeMode, this));
 
-			this._register(this.onDidChangeBodyVisibility(this._viewModel.setVisible, this._viewModel));
-			this._viewModel.setVisible(this.isBodyVisible());
+		this._register(this.onDidChangeBodyVisibility(this._viewModel.setVisible, this._viewModel));
 
-			this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.alwaysShowRepositories'), this.disposables)(this.updateActions, this));
-			this.updateActions();
-		});
+		this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.alwaysShowRepositories'), this.disposables)(this.updateActions, this));
+		this.updateActions();
 	}
 
 	private updateIndentStyles(theme: IFileIconTheme): void {
@@ -2454,24 +2475,6 @@ export class SCMViewPane extends ViewPane {
 			.filter(r => !!r && !isSCMResourceGroup(r))! as any;
 	}
 
-	private loadTreeViewState(): IAsyncDataTreeViewState | undefined {
-		const storageViewState = this.storageService.get('scm.viewState2', StorageScope.WORKSPACE);
-		if (!storageViewState) {
-			return undefined;
-		}
-
-		try {
-			const treeViewState = JSON.parse(storageViewState);
-			return treeViewState;
-		} catch {
-			return undefined;
-		}
-	}
-
-	private storeTreeViewState() {
-		this.storageService.store('scm.viewState2', JSON.stringify(this.tree.getViewState()), StorageScope.WORKSPACE, StorageTarget.MACHINE);
-	}
-
 	override shouldShowWelcome(): boolean {
 		return this.scmService.repositoryCount === 0;
 	}
@@ -2489,7 +2492,7 @@ export class SCMViewPane extends ViewPane {
 class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement> {
 
 	constructor(
-		private readonly viewModel: () => ViewModel | undefined,
+		private readonly viewModelProvider: () => ViewModel,
 		@ISCMViewService private readonly scmViewService: ISCMViewService) { }
 
 	hasChildren(inputOrElement: ISCMViewService | TreeElement): boolean {
@@ -2513,18 +2516,18 @@ class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement
 	}
 
 	getChildren(inputOrElement: ISCMViewService | TreeElement): Iterable<TreeElement> | Promise<Iterable<TreeElement>> {
-		if (this.viewModel() === undefined) {
-			return [];
-		}
+		const repositoryCount = this.scmViewService.visibleRepositories.length;
+		const alwaysShowRepositories = this.viewModelProvider().alwaysShowRepositories;
 
-		if (isSCMViewService(inputOrElement)) {
+		if (isSCMViewService(inputOrElement) && (repositoryCount > 1 || alwaysShowRepositories)) {
 			return this.scmViewService.visibleRepositories;
-		} else if (isSCMRepository(inputOrElement)) {
+		} else if ((isSCMViewService(inputOrElement) && repositoryCount === 1 && !alwaysShowRepositories) || isSCMRepository(inputOrElement)) {
 			const children: TreeElement[] = [];
 
-			const provider = inputOrElement.provider;
-			const showActionButton = this.viewModel()!.showActionButton;
-			const repositoryCount = this.scmViewService.visibleRepositories.length;
+			inputOrElement = isSCMRepository(inputOrElement) ? inputOrElement : this.scmViewService.visibleRepositories[0];
+			const actionButton = inputOrElement.provider.actionButton;
+			const resourceGroups = inputOrElement.provider.groups;
+			const showActionButton = this.viewModelProvider().showActionButton;
 
 			// SCM Input
 			if (inputOrElement.input.visible) {
@@ -2532,26 +2535,26 @@ class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement
 			}
 
 			// Action Button
-			if (showActionButton && provider.actionButton) {
+			if (showActionButton && actionButton) {
 				children.push({
 					type: 'actionButton',
 					repository: inputOrElement,
-					button: provider.actionButton
+					button: actionButton
 				} as ISCMActionButton);
 			}
 
 			// ResourceGroups
-			const hasSomeChanges = provider.groups.some(item => item.resources.length > 0);
-			if (hasSomeChanges || (repositoryCount === 1 && (!showActionButton || !provider.actionButton))) {
-				children.push(...provider.groups);
+			const hasSomeChanges = resourceGroups.some(group => group.resources.length > 0);
+			if (hasSomeChanges || (repositoryCount === 1 && (!showActionButton || !actionButton))) {
+				children.push(...resourceGroups);
 			}
 
 			return children;
 		} else if (isSCMResourceGroup(inputOrElement)) {
-			if (this.viewModel()!.mode === ViewModelMode.List) {
+			if (this.viewModelProvider().mode === ViewModelMode.List) {
 				// Resources (List)
 				return inputOrElement.resources;
-			} else if (this.viewModel()!.mode === ViewModelMode.Tree) {
+			} else if (this.viewModelProvider().mode === ViewModelMode.Tree) {
 				// Resources (Tree)
 				return inputOrElement.resourceTree.root.children;
 			}

From 07e375283d9e08e7f810b828fcfec454ba531a5d Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Wed, 1 Nov 2023 15:36:01 +0100
Subject: [PATCH 0025/1815] Fix issues related to autoReveal

---
 .../contrib/scm/browser/scmViewPane.ts        | 67 ++++++++++---------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index 71df0fe17d78..a4c83280debe 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -1124,6 +1124,7 @@ class ViewModel {
 		this.sortKey = this.getViewModelSortKey();
 
 		this._updateChildren();
+		this._onDidActiveEditorChange();
 		this._onDidChangeMode.fire(mode);
 		this.modeContextKey.set(mode);
 
@@ -1156,8 +1157,7 @@ class ViewModel {
 	private items = new DisposableMap<ISCMRepository, IDisposable>();
 	private readonly visibilityDisposables = new DisposableStore();
 	private scrollTop: number | undefined;
-	private firstVisible = true;
-	private readonly updateChildrenSequencer = new Sequencer();
+	private readonly asyncOperationSequencer = new Sequencer();
 	private readonly disposables = new DisposableStore();
 
 	private modeContextKey: IContextKey<ViewModelMode>;
@@ -1242,8 +1242,11 @@ class ViewModel {
 			const repositoryDisposables = new DisposableStore();
 
 			repositoryDisposables.add(repository.provider.onDidChange(() => this._updateChildren()));
-			repositoryDisposables.add(repository.provider.onDidChangeResourceGroups(() => this._updateChildren()));
 			repositoryDisposables.add(repository.input.onDidChangeVisibility(() => this._updateChildren()));
+			repositoryDisposables.add(repository.provider.onDidChangeResourceGroups(() => {
+				this._updateChildren();
+				this._onDidActiveEditorChange();
+			}));
 
 			const resourceGroupDisposables = repositoryDisposables.add(new DisposableMap<ISCMResourceGroup, IDisposable>());
 
@@ -1259,7 +1262,10 @@ class ViewModel {
 						const disposableStore = new DisposableStore();
 
 						disposableStore.add(resourceGroup.onDidChange(() => this._updateChildren()));
-						disposableStore.add(resourceGroup.onDidChangeResources(() => this._updateChildren()));
+						disposableStore.add(resourceGroup.onDidChangeResources(() => {
+							this._updateChildren();
+							this._onDidActiveEditorChange();
+						}));
 						resourceGroupDisposables.set(resourceGroup, disposableStore);
 					}
 				}
@@ -1277,6 +1283,7 @@ class ViewModel {
 		}
 
 		this._updateChildren();
+		this._onDidActiveEditorChange();
 	}
 
 	setVisible(visible: boolean): void {
@@ -1289,8 +1296,8 @@ class ViewModel {
 				this.scrollTop = undefined;
 			}
 
-			this.editorService.onDidActiveEditorChange(this.onDidActiveEditorChange, this, this.visibilityDisposables);
-			this.onDidActiveEditorChange();
+			this.editorService.onDidActiveEditorChange(this._onDidActiveEditorChange, this, this.visibilityDisposables);
+			this._onDidActiveEditorChange();
 		} else {
 			this.visibilityDisposables.clear();
 			this._onDidChangeVisibleRepositories({ added: Iterable.empty(), removed: [...this.items.keys()] });
@@ -1307,7 +1314,7 @@ class ViewModel {
 			return;
 		}
 
-		this.updateChildrenSequencer.queue(async () => {
+		this.asyncOperationSequencer.queue(async () => {
 			this.updateRepositoryContextKeys();
 			const focusedInput = this.inputRenderer.getFocusedInput();
 
@@ -1321,45 +1328,41 @@ class ViewModel {
 		});
 	}
 
-	private onDidActiveEditorChange(): void {
+	private _onDidActiveEditorChange(): void {
 		if (!this.configurationService.getValue<boolean>('scm.autoReveal')) {
 			return;
 		}
 
-		if (this.firstVisible) {
-			this.firstVisible = false;
-			this.visibilityDisposables.add(disposableTimeout(() => this.onDidActiveEditorChange(), 250));
-			return;
-		}
-
 		const uri = EditorResourceAccessor.getOriginalUri(this.editorService.activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY });
 
 		if (!uri) {
 			return;
 		}
 
-		for (const repository of this.scmViewService.visibleRepositories) {
-			const item = this.items.get(repository);
+		this.asyncOperationSequencer.queue(async () => {
+			for (const repository of this.scmViewService.visibleRepositories) {
+				const item = this.items.get(repository);
 
-			if (!item) {
-				continue;
-			}
+				if (!item) {
+					continue;
+				}
 
-			// go backwards from last group
-			for (let j = repository.provider.groups.length - 1; j >= 0; j--) {
-				const groupItem = repository.provider.groups[j];
-				const resource = this.mode === ViewModelMode.Tree
-					? groupItem.resourceTree.getNode(uri)?.element
-					: groupItem.resources.find(r => this.uriIdentityService.extUri.isEqual(r.sourceUri, uri));
-
-				if (resource) {
-					this.tree.reveal(resource);
-					this.tree.setSelection([resource]);
-					this.tree.setFocus([resource]);
-					return;
+				// go backwards from last group
+				for (let j = repository.provider.groups.length - 1; j >= 0; j--) {
+					const groupItem = repository.provider.groups[j];
+					const resource = this.mode === ViewModelMode.Tree
+						? groupItem.resourceTree.getNode(uri)
+						: groupItem.resources.find(r => this.uriIdentityService.extUri.isEqual(r.sourceUri, uri));
+
+					if (resource) {
+						this.tree.reveal(resource);
+						this.tree.setSelection([resource]);
+						this.tree.setFocus([resource]);
+						return;
+					}
 				}
 			}
-		}
+		});
 	}
 
 	focus() {

From 03164cd0987568b900cf33e412505fe73c27ab0c Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Wed, 1 Nov 2023 17:23:51 +0100
Subject: [PATCH 0026/1815] Refactor resource rendering and tree data source

---
 .../contrib/scm/browser/scmViewPane.ts         | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index a4c83280debe..54b624235c6a 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -503,7 +503,7 @@ class ResourceRenderer implements ICompressibleTreeRenderer<ISCMResource | IReso
 		const resourceOrFolder = node.element;
 		const iconResource = ResourceTree.isResourceNode(resourceOrFolder) ? resourceOrFolder.element : resourceOrFolder;
 		const uri = ResourceTree.isResourceNode(resourceOrFolder) ? resourceOrFolder.uri : resourceOrFolder.sourceUri;
-		const fileKind = ResourceTree.isResourceNode(resourceOrFolder) && resourceOrFolder.childrenCount > 0 ? FileKind.FOLDER : FileKind.FILE;
+		const fileKind = ResourceTree.isResourceNode(resourceOrFolder) ? FileKind.FOLDER : FileKind.FILE;
 		const viewModel = this.viewModelProvider();
 		const tooltip = !ResourceTree.isResourceNode(resourceOrFolder) && resourceOrFolder.decorations.tooltip || '';
 
@@ -1351,7 +1351,7 @@ class ViewModel {
 				for (let j = repository.provider.groups.length - 1; j >= 0; j--) {
 					const groupItem = repository.provider.groups[j];
 					const resource = this.mode === ViewModelMode.Tree
-						? groupItem.resourceTree.getNode(uri)
+						? groupItem.resourceTree.getNode(uri)?.element
 						: groupItem.resources.find(r => this.uriIdentityService.extUri.isEqual(r.sourceUri, uri));
 
 					if (resource) {
@@ -2559,11 +2559,21 @@ class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement
 				return inputOrElement.resources;
 			} else if (this.viewModelProvider().mode === ViewModelMode.Tree) {
 				// Resources (Tree)
-				return inputOrElement.resourceTree.root.children;
+				const children: TreeElement[] = [];
+				for (const node of inputOrElement.resourceTree.root.children) {
+					children.push(node.childrenCount === 0 ? node.element ?? node : node);
+				}
+
+				return children;
 			}
 		} else if (ResourceTree.isResourceNode(inputOrElement)) {
 			// Resources (Tree)
-			return inputOrElement.children;
+			const children: TreeElement[] = [];
+			for (const node of inputOrElement.children) {
+				children.push(node.childrenCount === 0 ? node.element ?? node : node);
+			}
+
+			return children;
 		}
 
 		return [];

From f3fdc858d229eaa56461920ab2bca3f7bd55c440 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Wed, 1 Nov 2023 17:36:58 +0100
Subject: [PATCH 0027/1815] Temporary fix for timing issues

---
 src/vs/workbench/contrib/scm/browser/scmViewPane.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index 54b624235c6a..28470afd8eca 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -1221,10 +1221,8 @@ class ViewModel {
 			}
 		}));
 
-		this.tree.setInput(this.scmViewService, this.loadTreeViewState()).then(() => {
-			configurationService.onDidChangeConfiguration(this.onDidChangeConfiguration, this, this.disposables);
-			this.onDidChangeConfiguration();
-		});
+		configurationService.onDidChangeConfiguration(this.onDidChangeConfiguration, this, this.disposables);
+		this.onDidChangeConfiguration();
 	}
 
 	private onDidChangeConfiguration(e?: IConfigurationChangeEvent): void {
@@ -1286,6 +1284,10 @@ class ViewModel {
 		this._onDidActiveEditorChange();
 	}
 
+	setInput(): void {
+		this.tree.setInput(this.scmViewService, this.loadTreeViewState());
+	}
+
 	setVisible(visible: boolean): void {
 		if (visible) {
 			this.scmViewService.onDidChangeVisibleRepositories(this._onDidChangeVisibleRepositories, this, this.visibilityDisposables);
@@ -2301,6 +2303,7 @@ export class SCMViewPane extends ViewPane {
 		this._register(this.instantiationService.createInstance(RepositoryVisibilityActionController));
 
 		this._viewModel = this._register(this.instantiationService.createInstance(ViewModel, this.tree, this.inputRenderer));
+		this._viewModel.setInput();
 
 		this.updateIndentStyles(this.themeService.getFileIconTheme());
 		this._register(this.themeService.onDidFileIconThemeChange(this.updateIndentStyles, this));

From c1f92cd5fcfbe11efe418963f6b867708876e092 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Mon, 29 Jan 2024 22:48:17 -0300
Subject: [PATCH 0028/1815] use collection

---
 .../browser/contrib/chatInputEditorContrib.ts | 262 +++++++++---------
 .../contrib/chat/browser/media/chat.css       |   4 +
 2 files changed, 139 insertions(+), 127 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts
index c83c4e211d8f..99f61cab7fbb 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts
@@ -10,9 +10,9 @@ import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService
 import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { IWordAtPosition, getWordAtText } from 'vs/editor/common/core/wordHelper';
-import { IDecorationOptions } from 'vs/editor/common/editorCommon';
+import { IDecorationOptions, IEditorDecorationsCollection } from 'vs/editor/common/editorCommon';
 import { CompletionContext, CompletionItem, CompletionItemKind, CompletionList } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
+import { IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { localize } from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -54,6 +54,8 @@ class InputEditorDecorations extends Disposable {
 
 	private readonly viewModelDisposables = this._register(new MutableDisposable());
 
+	private readonly placeholderDecorations: IEditorDecorationsCollection;
+
 	constructor(
 		private readonly widget: IChatWidget,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -65,6 +67,7 @@ class InputEditorDecorations extends Disposable {
 		super();
 
 		this.codeEditorService.registerDecorationType(decorationDescription, placeholderDecorationType, {});
+		this.placeholderDecorations = this.widget.inputEditor.createDecorationsCollection();
 
 		this._register(this.themeService.onDidColorThemeChange(() => this.updateRegisteredDecorationTypes()));
 		this.updateRegisteredDecorationTypes();
@@ -132,134 +135,139 @@ class InputEditorDecorations extends Disposable {
 			return;
 		}
 
-		if (!inputValue) {
-			const viewModelPlaceholder = this.widget.viewModel?.inputPlaceholder;
-			const placeholder = viewModelPlaceholder ?? '';
-			const decoration: IDecorationOptions[] = [
-				{
-					range: {
-						startLineNumber: 1,
-						endLineNumber: 1,
-						startColumn: 1,
-						endColumn: 1000
+		// if (!inputValue) {
+		const viewModelPlaceholder = this.widget.viewModel?.inputPlaceholder;
+		const placeholder = viewModelPlaceholder ?? '';
+		const decoration: IModelDeltaDecoration[] = [
+			{
+				range: {
+					startLineNumber: 1,
+					endLineNumber: 1,
+					startColumn: 1,
+					endColumn: 1000
+				},
+				options: {
+					description: decorationDescription,
+					after: {
+						content: placeholder,
+						inlineClassName: 'chat-input-placeholder'
 					},
-					renderOptions: {
-						after: {
-							contentText: placeholder,
-							color: this.getPlaceholderColor()
-						}
-					}
 				}
-			];
-			this.widget.inputEditor.setDecorationsByType(decorationDescription, placeholderDecorationType, decoration);
-			return;
-		}
-
-		const parsedRequest = (await this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(viewModel.sessionId, inputValue)).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 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 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
-			if (agentPart.agent.metadata.description && exactlyOneSpaceAfterPart(agentPart)) {
-				placeholderDecoration = [{
-					range: {
-						startLineNumber: agentPart.editorRange.startLineNumber,
-						endLineNumber: agentPart.editorRange.endLineNumber,
-						startColumn: agentPart.editorRange.endColumn + 1,
-						endColumn: 1000
-					},
-					renderOptions: {
-						after: {
-							contentText: agentPart.agent.metadata.description,
-							color: this.getPlaceholderColor(),
-						}
-					}
-				}];
-			}
-		}
-
-		const onlyAgentCommandAndWhitespace = agentPart && agentSubcommandPart && parsedRequest.every(p => p instanceof ChatRequestTextPart && !p.text.trim().length || p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart);
-		if (onlyAgentCommandAndWhitespace) {
-			// Agent reference and subcommand with no other text - show the placeholder
-			const isFollowupSlashCommand = this.previouslyUsedAgents.has(agentAndCommandToKey(agentPart.agent.id, agentSubcommandPart.command.name));
-			const shouldRenderFollowupPlaceholder = isFollowupSlashCommand && agentSubcommandPart.command.followupPlaceholder;
-			if (agentSubcommandPart?.command.description && exactlyOneSpaceAfterPart(agentSubcommandPart)) {
-				placeholderDecoration = [{
-					range: {
-						startLineNumber: agentSubcommandPart.editorRange.startLineNumber,
-						endLineNumber: agentSubcommandPart.editorRange.endLineNumber,
-						startColumn: agentSubcommandPart.editorRange.endColumn + 1,
-						endColumn: 1000
-					},
-					renderOptions: {
-						after: {
-							contentText: shouldRenderFollowupPlaceholder ? agentSubcommandPart.command.followupPlaceholder : agentSubcommandPart.command.description,
-							color: this.getPlaceholderColor(),
-						}
-					}
-				}];
 			}
-		}
-
-		const onlySlashCommandAndWhitespace = slashCommandPart && parsedRequest.every(p => p instanceof ChatRequestTextPart && !p.text.trim().length || p instanceof ChatRequestSlashCommandPart);
-		if (onlySlashCommandAndWhitespace) {
-			// Command reference with no other text - show the placeholder
-			if (slashCommandPart.slashCommand.detail && exactlyOneSpaceAfterPart(slashCommandPart)) {
-				placeholderDecoration = [{
-					range: {
-						startLineNumber: slashCommandPart.editorRange.startLineNumber,
-						endLineNumber: slashCommandPart.editorRange.endLineNumber,
-						startColumn: slashCommandPart.editorRange.endColumn + 1,
-						endColumn: 1000
-					},
-					renderOptions: {
-						after: {
-							contentText: slashCommandPart.slashCommand.detail,
-							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 });
-			}
-		}
-
-		if (slashCommandPart) {
-			textDecorations.push({ range: slashCommandPart.editorRange });
-		}
-
-		this.widget.inputEditor.setDecorationsByType(decorationDescription, slashCommandTextDecorationType, textDecorations);
-
-		const varDecorations: IDecorationOptions[] = [];
-		const variableParts = parsedRequest.filter((p): p is ChatRequestVariablePart => p instanceof ChatRequestVariablePart);
-		for (const variable of variableParts) {
-			varDecorations.push({ range: variable.editorRange });
-		}
-
-		this.widget.inputEditor.setDecorationsByType(decorationDescription, variableTextDecorationType, varDecorations);
+		];
+		this.placeholderDecorations.set(decoration);
+		return;
+		// }
+
+		// const parsedRequest = (await this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(viewModel.sessionId, inputValue)).parts;
+
+		// let placeholderDecoration: IModelDeltaDecoration[] | 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 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 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
+		// 	if (agentPart.agent.metadata.description && exactlyOneSpaceAfterPart(agentPart)) {
+		// 		placeholderDecoration = [{
+		// 			range: {
+		// 				startLineNumber: agentPart.editorRange.startLineNumber,
+		// 				endLineNumber: agentPart.editorRange.endLineNumber,
+		// 				startColumn: agentPart.editorRange.endColumn + 1,
+		// 				endColumn: 1000
+		// 			},
+		// 			options: {
+		// 				description: decorationDescription,
+		// 				after: {
+		// 					content: agentPart.agent.metadata.description,
+		// 					inlineClassName: 'chat-input-placeholder'
+		// 				}
+		// 			}
+		// 		}];
+		// 	}
+		// }
+
+		// const onlyAgentCommandAndWhitespace = agentPart && agentSubcommandPart && parsedRequest.every(p => p instanceof ChatRequestTextPart && !p.text.trim().length || p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart);
+		// if (onlyAgentCommandAndWhitespace) {
+		// 	// Agent reference and subcommand with no other text - show the placeholder
+		// 	const isFollowupSlashCommand = this.previouslyUsedAgents.has(agentAndCommandToKey(agentPart.agent.id, agentSubcommandPart.command.name));
+		// 	const shouldRenderFollowupPlaceholder = isFollowupSlashCommand && agentSubcommandPart.command.followupPlaceholder;
+		// 	if (agentSubcommandPart?.command.description && exactlyOneSpaceAfterPart(agentSubcommandPart)) {
+		// 		placeholderDecoration = [{
+		// 			range: {
+		// 				startLineNumber: agentSubcommandPart.editorRange.startLineNumber,
+		// 				endLineNumber: agentSubcommandPart.editorRange.endLineNumber,
+		// 				startColumn: agentSubcommandPart.editorRange.endColumn + 1,
+		// 				endColumn: 1000
+		// 			},
+		// 			options: {
+		// 				description: decorationDescription,
+		// 				after: {
+		// 					content: (shouldRenderFollowupPlaceholder ? agentSubcommandPart.command.followupPlaceholder : agentSubcommandPart.command.description) ?? '',
+		// 					inlineClassName: 'chat-input-placeholder'
+		// 				}
+		// 			}
+		// 		}];
+		// 	}
+		// }
+
+		// const onlySlashCommandAndWhitespace = slashCommandPart && parsedRequest.every(p => p instanceof ChatRequestTextPart && !p.text.trim().length || p instanceof ChatRequestSlashCommandPart);
+		// if (onlySlashCommandAndWhitespace) {
+		// 	// Command reference with no other text - show the placeholder
+		// 	if (slashCommandPart.slashCommand.detail && exactlyOneSpaceAfterPart(slashCommandPart)) {
+		// 		placeholderDecoration = [{
+		// 			range: {
+		// 				startLineNumber: slashCommandPart.editorRange.startLineNumber,
+		// 				endLineNumber: slashCommandPart.editorRange.endLineNumber,
+		// 				startColumn: slashCommandPart.editorRange.endColumn + 1,
+		// 				endColumn: 1000
+		// 			},
+		// 			options: {
+		// 				description: decorationDescription,
+		// 				after: {
+		// 					content: slashCommandPart.slashCommand.detail,
+		// 					inlineClassName: 'chat-input-placeholder'
+		// 				}
+		// 			}
+		// 		}];
+		// 	}
+		// }
+
+		// // this.widget.inputEditor.setDecorationsByType(decorationDescription, placeholderDecorationType, placeholderDecoration ?? []);
+		// // this.placeholderDecorations.set(placeholderDecoration ?? []);
+
+		// const textDecorations: IDecorationOptions[] | undefined = [];
+		// if (agentPart) {
+		// 	textDecorations.push({ range: agentPart.editorRange });
+		// 	if (agentSubcommandPart) {
+		// 		textDecorations.push({ range: agentSubcommandPart.editorRange });
+		// 	}
+		// }
+
+		// if (slashCommandPart) {
+		// 	textDecorations.push({ range: slashCommandPart.editorRange });
+		// }
+
+		// // this.widget.inputEditor.setDecorationsByType(decorationDescription, slashCommandTextDecorationType, textDecorations);
+
+		// const varDecorations: IDecorationOptions[] = [];
+		// const variableParts = parsedRequest.filter((p): p is ChatRequestVariablePart => p instanceof ChatRequestVariablePart);
+		// for (const variable of variableParts) {
+		// 	varDecorations.push({ range: variable.editorRange });
+		// }
+
+		// this.widget.inputEditor.setDecorationsByType(decorationDescription, variableTextDecorationType, varDecorations);
 	}
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 7b8c230b92fb..ae308ceedef5 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -13,6 +13,10 @@
 	display: none !important;
 }
 
+.interactive-session .interactive-input-part .chat-input-placeholder {
+	color: var(--vscode-input-placeholderForeground, red);
+}
+
 .interactive-item-container {
 	padding: 16px 20px;
 	display: flex;

From 77d693d93e059a5451c29242726514bfd3ef1597 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 27 Feb 2024 10:47:45 +0100
Subject: [PATCH 0029/1815] fix bad merge

---
 extensions/typescript-language-features/package.json  | 2 +-
 extensions/typescript-language-features/tsconfig.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index ce38b6d7307c..f4a08a83ba4f 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -9,7 +9,7 @@
   "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
   "enabledApiProposals": [
     "workspaceTrust",
-    "createFileSystemWatcher"
+    "createFileSystemWatcher",
     "multiDocumentHighlightProvider",
     "mappedEditsProvider",
     "codeActionAI",
diff --git a/extensions/typescript-language-features/tsconfig.json b/extensions/typescript-language-features/tsconfig.json
index ec24654f1479..adf7b9d40261 100644
--- a/extensions/typescript-language-features/tsconfig.json
+++ b/extensions/typescript-language-features/tsconfig.json
@@ -12,7 +12,7 @@
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
 		"../../src/vscode-dts/vscode.proposed.workspaceTrust.d.ts",
-		"../../src/vscode-dts/vscode.proposed.createFileSystemWatcher.d.ts"
+		"../../src/vscode-dts/vscode.proposed.createFileSystemWatcher.d.ts",
 		"../../src/vscode-dts/vscode.proposed.codeActionAI.d.ts",
 		"../../src/vscode-dts/vscode.proposed.codeActionRanges.d.ts",
 		"../../src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts",

From 6ffc5341cab445a19c7c85df4ee1048162064780 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 27 Feb 2024 10:48:27 +0100
Subject: [PATCH 0030/1815] fix bad merge

---
 extensions/typescript-language-features/tsconfig.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extensions/typescript-language-features/tsconfig.json b/extensions/typescript-language-features/tsconfig.json
index adf7b9d40261..1da85cd17cd4 100644
--- a/extensions/typescript-language-features/tsconfig.json
+++ b/extensions/typescript-language-features/tsconfig.json
@@ -11,7 +11,6 @@
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.workspaceTrust.d.ts",
 		"../../src/vscode-dts/vscode.proposed.createFileSystemWatcher.d.ts",
 		"../../src/vscode-dts/vscode.proposed.codeActionAI.d.ts",
 		"../../src/vscode-dts/vscode.proposed.codeActionRanges.d.ts",

From 5b070e443b91e5b0b286fd675f42e72ba8090463 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 27 Feb 2024 10:58:55 +0100
Subject: [PATCH 0031/1815] more disposables work

---
 .../src/typescriptServiceClient.ts            | 23 +++++++++++--------
 .../src/utils/dispose.ts                      |  9 ++++++++
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index 611d97679c10..4949b34d224e 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -21,7 +21,7 @@ import { TypeScriptVersionManager } from './tsServer/versionManager';
 import { ITypeScriptVersionProvider, TypeScriptVersion } from './tsServer/versionProvider';
 import { ClientCapabilities, ClientCapability, ExecConfig, ITypeScriptServiceClient, ServerResponse, TypeScriptRequests } from './typescriptService';
 import { ServiceConfigurationProvider, SyntaxServerConfiguration, TsServerLogLevel, TypeScriptServiceConfiguration, areServiceConfigurationsEqual } from './configuration/configuration';
-import { Disposable, disposeAll } from './utils/dispose';
+import { Disposable, DisposableStore, disposeAll } from './utils/dispose';
 import * as fileSchemes from './configuration/fileSchemes';
 import { Logger } from './logging/logger';
 import { isWeb, isWebAndHasSharedArrayBuffers } from './utils/platform';
@@ -128,7 +128,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 	private readonly versionProvider: ITypeScriptVersionProvider;
 	private readonly processFactory: TsServerProcessFactory;
 
-	private readonly watches = new Map<number, vscode.FileSystemWatcher>();
+	private readonly watches = new Map<number, Disposable>();
 
 	constructor(
 		private readonly context: vscode.ExtensionContext,
@@ -1005,17 +1005,20 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 		pattern: vscode.GlobPattern,
 		excludes: string[]
 	) {
-		const watcher = typeof pattern === 'string' ? vscode.workspace.createFileSystemWatcher(pattern) : vscode.workspace.createFileSystemWatcher(pattern, { excludes });
-		watcher.onDidChange(changeFile =>
+		const disposable = new DisposableStore();
+		const watcher = typeof pattern === 'string' ?
+			disposable.add(vscode.workspace.createFileSystemWatcher(pattern)) :
+			disposable.add(vscode.workspace.createFileSystemWatcher(pattern, { excludes }));
+		disposable.add(watcher.onDidChange(changeFile =>
 			this.executeWithoutWaitingForResponse('watchChange', { id, path: changeFile.fsPath, eventType: 'update' })
-		);
-		watcher.onDidCreate(createFile =>
+		));
+		disposable.add(watcher.onDidCreate(createFile =>
 			this.executeWithoutWaitingForResponse('watchChange', { id, path: createFile.fsPath, eventType: 'create' })
-		);
-		watcher.onDidDelete(deletedFile =>
+		));
+		disposable.add(watcher.onDidDelete(deletedFile =>
 			this.executeWithoutWaitingForResponse('watchChange', { id, path: deletedFile.fsPath, eventType: 'delete' })
-		);
-		this.watches.set(id, watcher);
+		));
+		this.watches.set(id, disposable);
 	}
 
 	private closeFileSystemWatcher(
diff --git a/extensions/typescript-language-features/src/utils/dispose.ts b/extensions/typescript-language-features/src/utils/dispose.ts
index a1eb92b9dd7f..effe8b726fc3 100644
--- a/extensions/typescript-language-features/src/utils/dispose.ts
+++ b/extensions/typescript-language-features/src/utils/dispose.ts
@@ -41,3 +41,12 @@ export abstract class Disposable {
 		return this._isDisposed;
 	}
 }
+
+export class DisposableStore extends Disposable {
+
+	public add<T extends IDisposable>(disposable: T): T {
+		this._register(disposable);
+
+		return disposable;
+	}
+}

From c2d1bbd57afc6d5f788ef4f54d9d70388e3d6bba Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 27 Feb 2024 12:03:31 +0100
Subject: [PATCH 0032/1815] use relative pattern everywhere

---
 .../src/typescriptServiceClient.ts            | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index 4949b34d224e..56b9be15d16a 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -987,11 +987,23 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 				break;
 
 			case EventName.createDirectoryWatcher:
-				this.createFileSystemWatcher(event.body.id, new vscode.RelativePattern(vscode.Uri.file(event.body.path), event.body.recursive ? '**' : '*'), [ /* TODO need to fill in excludes list */]);
+				this.createFileSystemWatcher(
+					(event.body as Proto.CreateDirectoryWatcherEventBody).id,
+					new vscode.RelativePattern(
+						vscode.Uri.file((event.body as Proto.CreateDirectoryWatcherEventBody).path),
+						(event.body as Proto.CreateDirectoryWatcherEventBody).recursive ? '**' : '*'
+					)
+				);
 				break;
 
 			case EventName.createFileWatcher:
-				this.createFileSystemWatcher(event.body.id, event.body.path, []);
+				this.createFileSystemWatcher(
+					(event.body as Proto.CreateFileWatcherEventBody).id,
+					new vscode.RelativePattern(
+						vscode.Uri.file((event.body as Proto.CreateFileWatcherEventBody).path),
+						'*'
+					)
+				);
 				break;
 
 			case EventName.closeFileWatcher:
@@ -1002,22 +1014,25 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 
 	private createFileSystemWatcher(
 		id: number,
-		pattern: vscode.GlobPattern,
-		excludes: string[]
+		pattern: vscode.RelativePattern
 	) {
 		const disposable = new DisposableStore();
-		const watcher = typeof pattern === 'string' ?
-			disposable.add(vscode.workspace.createFileSystemWatcher(pattern)) :
-			disposable.add(vscode.workspace.createFileSystemWatcher(pattern, { excludes }));
+
+		const watcher = disposable.add(vscode.workspace.createFileSystemWatcher(pattern, { excludes: [] /* TODO need to fill in excludes list */ }));
+
 		disposable.add(watcher.onDidChange(changeFile =>
-			this.executeWithoutWaitingForResponse('watchChange', { id, path: changeFile.fsPath, eventType: 'update' })
+			this.executeWithoutWaitingForResponse('watchChange', { id, path: changeFile.fsPath, eventType: 'update' } satisfies Proto.WatchChangeRequestArgs)
 		));
 		disposable.add(watcher.onDidCreate(createFile =>
-			this.executeWithoutWaitingForResponse('watchChange', { id, path: createFile.fsPath, eventType: 'create' })
+			this.executeWithoutWaitingForResponse('watchChange', { id, path: createFile.fsPath, eventType: 'create' } satisfies Proto.WatchChangeRequestArgs)
 		));
 		disposable.add(watcher.onDidDelete(deletedFile =>
-			this.executeWithoutWaitingForResponse('watchChange', { id, path: deletedFile.fsPath, eventType: 'delete' })
+			this.executeWithoutWaitingForResponse('watchChange', { id, path: deletedFile.fsPath, eventType: 'delete' } satisfies Proto.WatchChangeRequestArgs)
 		));
+
+		if (this.watches.has(id)) {
+			this.closeFileSystemWatcher(id);
+		}
 		this.watches.set(id, disposable);
 	}
 

From a37cfa427f721d8cd6965b8eb85f4156f17509cb Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Tue, 26 Mar 2024 16:24:04 -0700
Subject: [PATCH 0033/1815] Add ignoreUpdate

---
 .../src/typescriptServiceClient.ts                        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index 4ab9ed0a23d8..1e9dacc25ba3 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -992,7 +992,8 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 					new vscode.RelativePattern(
 						vscode.Uri.file((event.body as Proto.CreateDirectoryWatcherEventBody).path),
 						(event.body as Proto.CreateDirectoryWatcherEventBody).recursive ? '**' : '*'
-					)
+					),
+					event.body.ignoreUpdate // TODO when typescript.d.ts gets updated update the type info
 				);
 				break;
 
@@ -1014,11 +1015,12 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 
 	private createFileSystemWatcher(
 		id: number,
-		pattern: vscode.RelativePattern
+		pattern: vscode.RelativePattern,
+		ignoreChangeEvents?: boolean,
 	) {
 		const disposable = new DisposableStore();
 
-		const watcher = disposable.add(vscode.workspace.createFileSystemWatcher(pattern, { excludes: [] /* TODO need to fill in excludes list */ }));
+		const watcher = disposable.add(vscode.workspace.createFileSystemWatcher(pattern, { excludes: [] /* TODO need to fill in excludes list */, ignoreChangeEvents }));
 
 		disposable.add(watcher.onDidChange(changeFile =>
 			this.executeWithoutWaitingForResponse('watchChange', { id, path: changeFile.fsPath, eventType: 'update' } satisfies Proto.WatchChangeRequestArgs)

From 24679a7291d63f88e61364e210208289a451e21a Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 27 Mar 2024 11:51:36 -0700
Subject: [PATCH 0034/1815] Protocol changes for tsserver to batch the
 notifications

---
 .../src/typescriptServiceClient.ts                       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index 1e9dacc25ba3..ce0b163f424e 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -1020,16 +1020,19 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 	) {
 		const disposable = new DisposableStore();
 
+		// TODO:: not sure whwere we check typescript version but this has to be 5.4+ or 5.5 depeneding on which version of typescript the protocol changes go into
+
 		const watcher = disposable.add(vscode.workspace.createFileSystemWatcher(pattern, { excludes: [] /* TODO need to fill in excludes list */, ignoreChangeEvents }));
 
+		// TODO:: Batch these together
 		disposable.add(watcher.onDidChange(changeFile =>
-			this.executeWithoutWaitingForResponse('watchChange', { id, path: changeFile.fsPath, eventType: 'update' } satisfies Proto.WatchChangeRequestArgs)
+			this.executeWithoutWaitingForResponse('watchChange', { id, updated: [changeFile.fsPath] })
 		));
 		disposable.add(watcher.onDidCreate(createFile =>
-			this.executeWithoutWaitingForResponse('watchChange', { id, path: createFile.fsPath, eventType: 'create' } satisfies Proto.WatchChangeRequestArgs)
+			this.executeWithoutWaitingForResponse('watchChange', { id, created: [createFile.fsPath] })
 		));
 		disposable.add(watcher.onDidDelete(deletedFile =>
-			this.executeWithoutWaitingForResponse('watchChange', { id, path: deletedFile.fsPath, eventType: 'delete' } satisfies Proto.WatchChangeRequestArgs)
+			this.executeWithoutWaitingForResponse('watchChange', { id, deleted: [deletedFile.fsPath] }) // TODO:: add satifies for all of these when we publish
 		));
 
 		if (this.watches.has(id)) {

From 04bb6f6e864087c01a8d4575b9e67462d1b43190 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 28 Mar 2024 12:41:57 +0100
Subject: [PATCH 0035/1815] add event aggregation

---
 .../src/typescriptServiceClient.ts            | 56 ++++++++++++++-----
 1 file changed, 42 insertions(+), 14 deletions(-)

diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index ce0b163f424e..0bc5400066e9 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -1020,20 +1020,48 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 	) {
 		const disposable = new DisposableStore();
 
-		// TODO:: not sure whwere we check typescript version but this has to be 5.4+ or 5.5 depeneding on which version of typescript the protocol changes go into
-
-		const watcher = disposable.add(vscode.workspace.createFileSystemWatcher(pattern, { excludes: [] /* TODO need to fill in excludes list */, ignoreChangeEvents }));
-
-		// TODO:: Batch these together
-		disposable.add(watcher.onDidChange(changeFile =>
-			this.executeWithoutWaitingForResponse('watchChange', { id, updated: [changeFile.fsPath] })
-		));
-		disposable.add(watcher.onDidCreate(createFile =>
-			this.executeWithoutWaitingForResponse('watchChange', { id, created: [createFile.fsPath] })
-		));
-		disposable.add(watcher.onDidDelete(deletedFile =>
-			this.executeWithoutWaitingForResponse('watchChange', { id, deleted: [deletedFile.fsPath] }) // TODO:: add satifies for all of these when we publish
-		));
+		const events = { updated: new Set<string>(), created: new Set<string>(), deleted: new Set<string>() };
+
+		let timeout: NodeJS.Timeout | undefined;
+		disposable.add({ dispose: () => clearTimeout(timeout) });
+
+		const executeWatchChangeRequest = () => {
+			try {
+				// TODO:: not sure whwere we check typescript version but this has to be 5.4+ or 5.5 depeneding on which version of typescript the protocol changes go into
+				this.executeWithoutWaitingForResponse('watchChange', {
+					id,
+					updated: events.updated.size > 0 ? Array.from(events.updated) : undefined,
+					created: events.created.size > 0 ? Array.from(events.created) : undefined,
+					deleted: events.deleted.size > 0 ? Array.from(events.deleted) : undefined
+				});
+			} finally {
+				events.updated.clear();
+				events.created.clear();
+				events.deleted.clear();
+
+				timeout = undefined;
+			}
+		};
+
+		const scheduleExecuteWatchChangeRequest = () => {
+			if (!timeout) {
+				timeout = setTimeout(() => executeWatchChangeRequest(), 100 /* aggregate events over 100ms to reduce client<->server IPC overhead */);
+			}
+		};
+
+		const watcher = disposable.add(vscode.workspace.createFileSystemWatcher(pattern, { excludes: [] /* TODO:: need to fill in excludes list */, ignoreChangeEvents }));
+		disposable.add(watcher.onDidChange(changeFile => {
+			events.updated.add(changeFile.fsPath);
+			scheduleExecuteWatchChangeRequest();
+		}));
+		disposable.add(watcher.onDidCreate(createFile => {
+			events.created.add(createFile.fsPath);
+			scheduleExecuteWatchChangeRequest();
+		}));
+		disposable.add(watcher.onDidDelete(deletedFile => {
+			events.deleted.add(deletedFile.fsPath);
+			scheduleExecuteWatchChangeRequest();
+		}));
 
 		if (this.watches.has(id)) {
 			this.closeFileSystemWatcher(id);

From 5ffe26407be9284accff0e0c4c1932b97130aa2f Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 28 Mar 2024 12:06:48 -0700
Subject: [PATCH 0036/1815] Update version numbers

---
 extensions/typescript-language-features/package.json         | 5 ++++-
 extensions/typescript-language-features/package.nls.json     | 2 +-
 extensions/typescript-language-features/src/tsServer/api.ts  | 1 +
 .../typescript-language-features/src/tsServer/spawner.ts     | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index f4a08a83ba4f..ba80a44d4a0b 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -1172,7 +1172,10 @@
         "typescript.tsserver.experimental.useVsCodeWatcher": {
           "type": "boolean",
           "description": "%configuration.tsserver.useVsCodeWatcher%",
-          "default": true
+          "default": true,
+          "tags": [
+            "experimental"
+          ]
         },
         "typescript.tsserver.watchOptions": {
           "type": "object",
diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
index f1962cd4f7ee..e60451eaeb4a 100644
--- a/extensions/typescript-language-features/package.nls.json
+++ b/extensions/typescript-language-features/package.nls.json
@@ -164,7 +164,7 @@
 	"typescript.suggest.enabled": "Enabled/disable autocomplete suggestions.",
 	"configuration.surveys.enabled": "Enabled/disable occasional surveys that help us improve VS Code's JavaScript and TypeScript support.",
 	"configuration.suggest.completeJSDocs": "Enable/disable suggestion to complete JSDoc comments.",
-	"configuration.tsserver.useVsCodeWatcher": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.3+ in the workspace.",
+	"configuration.tsserver.useVsCodeWatcher": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
 	"configuration.tsserver.watchOptions": "Configure which watching strategies should be used to keep track of files and directories.",
 	"configuration.tsserver.watchOptions.watchFile": "Strategy for how individual files are watched.",
 	"configuration.tsserver.watchOptions.watchFile.fixedChunkSizePolling": "Polls files in chunks at regular interval.",
diff --git a/extensions/typescript-language-features/src/tsServer/api.ts b/extensions/typescript-language-features/src/tsServer/api.ts
index 92e4503ec85a..4a35ada0f24b 100644
--- a/extensions/typescript-language-features/src/tsServer/api.ts
+++ b/extensions/typescript-language-features/src/tsServer/api.ts
@@ -35,6 +35,7 @@ export class API {
 	public static readonly v500 = API.fromSimpleString('5.0.0');
 	public static readonly v510 = API.fromSimpleString('5.1.0');
 	public static readonly v520 = API.fromSimpleString('5.2.0');
+	public static readonly v544 = API.fromSimpleString('5.4.4');
 	public static readonly v540 = API.fromSimpleString('5.4.0');
 
 	public static fromVersionString(versionString: string): API {
diff --git a/extensions/typescript-language-features/src/tsServer/spawner.ts b/extensions/typescript-language-features/src/tsServer/spawner.ts
index bbe5b1d1d12e..b88251a70336 100644
--- a/extensions/typescript-language-features/src/tsServer/spawner.ts
+++ b/extensions/typescript-language-features/src/tsServer/spawner.ts
@@ -271,7 +271,7 @@ export class TypeScriptServerSpawner {
 
 		args.push('--noGetErrOnBackgroundUpdate');
 
-		if (apiVersion.gte(API.v350) && configuration.useVsCodeWatcher) {
+		if (apiVersion.gte(API.v544) && configuration.useVsCodeWatcher) {
 			args.push('--canUseWatchEvents');
 		}
 

From 8028356281a4702a727a3b8d36ced6637bc8b170 Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Fri, 7 Jun 2024 08:41:27 +0200
Subject: [PATCH 0037/1815] add function to query fonts

---
 src/vs/base/browser/fonts.ts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/vs/base/browser/fonts.ts b/src/vs/base/browser/fonts.ts
index a5e78d00bef5..a957576d24f9 100644
--- a/src/vs/base/browser/fonts.ts
+++ b/src/vs/base/browser/fonts.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { mainWindow } from 'vs/base/browser/window';
 import { isMacintosh, isWindows } from 'vs/base/common/platform';
 
 /**
@@ -14,3 +15,19 @@ import { isMacintosh, isWindows } from 'vs/base/common/platform';
  * Note: this currently does not adjust for different locales.
  */
 export const DEFAULT_FONT_FAMILY = isWindows ? '"Segoe WPC", "Segoe UI", sans-serif' : isMacintosh ? '-apple-system, BlinkMacSystemFont, sans-serif' : 'system-ui, "Ubuntu", "Droid Sans", sans-serif';
+
+interface FontData {
+	readonly family: string;
+}
+
+export const getFonts = async (): Promise<readonly string[]> => {
+	try {
+		// @ts-ignore
+		const fonts = mainWindow.queryLocalFonts() as FontData[];
+		const families = fonts.map(font => font.family);
+		return families;
+	} catch (error) {
+		console.error(`Failed to query fonts: ${error}`);
+		return [];
+	}
+};

From b5e2be8269aca0ae3e471562f91676489dc499f8 Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Fri, 7 Jun 2024 08:46:22 +0200
Subject: [PATCH 0038/1815] make function sync

---
 src/vs/base/browser/fonts.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/base/browser/fonts.ts b/src/vs/base/browser/fonts.ts
index a957576d24f9..cef576ba7718 100644
--- a/src/vs/base/browser/fonts.ts
+++ b/src/vs/base/browser/fonts.ts
@@ -20,7 +20,7 @@ interface FontData {
 	readonly family: string;
 }
 
-export const getFonts = async (): Promise<readonly string[]> => {
+export const getFonts = (): readonly string[] => {
 	try {
 		// @ts-ignore
 		const fonts = mainWindow.queryLocalFonts() as FontData[];

From e124185a5c6af98fe5af63215cba589cfd6c2d18 Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Fri, 7 Jun 2024 08:51:11 +0200
Subject: [PATCH 0039/1815] register font

---
 src/vs/base/browser/fonts.ts                                | 2 +-
 .../contrib/terminal/common/terminalConfiguration.ts        | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/browser/fonts.ts b/src/vs/base/browser/fonts.ts
index cef576ba7718..69615616d307 100644
--- a/src/vs/base/browser/fonts.ts
+++ b/src/vs/base/browser/fonts.ts
@@ -20,7 +20,7 @@ interface FontData {
 	readonly family: string;
 }
 
-export const getFonts = (): readonly string[] => {
+export const getFonts = (): string[] => {
 	try {
 		// @ts-ignore
 		const fonts = mainWindow.queryLocalFonts() as FontData[];
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index 7704e726c08a..fddeedbd1690 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -21,6 +21,7 @@ import { terminalTypeAheadConfiguration } from 'vs/workbench/contrib/terminalCon
 import { terminalZoomConfiguration } from 'vs/workbench/contrib/terminalContrib/zoom/common/terminal.zoom'; // eslint-disable-line local/code-import-patterns
 import { terminalSuggestConfiguration } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration'; // eslint-disable-line local/code-import-patterns
 import { terminalInitialHintConfiguration } from 'vs/workbench/contrib/terminalContrib/chat/common/terminalInitialHintConfiguration';  // eslint-disable-line local/code-import-patterns
+import { getFonts } from 'vs/base/browser/fonts';
 
 const terminalDescriptors = '\n- ' + [
 	'`\${cwd}`: ' + localize("cwd", "the terminal's current working directory"),
@@ -176,7 +177,10 @@ const terminalConfiguration: IConfigurationNode = {
 		},
 		[TerminalSettingId.FontFamily]: {
 			markdownDescription: localize('terminal.integrated.fontFamily', "Controls the font family of the terminal. Defaults to {0}'s value.", '`#editor.fontFamily#`'),
-			type: 'string'
+			type: 'string',
+			get enum() {
+				return getFonts();
+			}
 		},
 		// TODO: Support font ligatures
 		// 'terminal.integrated.fontLigatures': {

From 084bb4ba6edd38a3d294534f62cad6ae08b5b9b0 Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Fri, 7 Jun 2024 08:53:26 +0200
Subject: [PATCH 0040/1815] use fonts array

---
 src/vs/base/browser/fonts.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/base/browser/fonts.ts b/src/vs/base/browser/fonts.ts
index 69615616d307..e59788b107b6 100644
--- a/src/vs/base/browser/fonts.ts
+++ b/src/vs/base/browser/fonts.ts
@@ -24,7 +24,8 @@ export const getFonts = (): string[] => {
 	try {
 		// @ts-ignore
 		const fonts = mainWindow.queryLocalFonts() as FontData[];
-		const families = fonts.map(font => font.family);
+		const fontsArray = [...fonts];
+		const families = fontsArray.map(font => font.family);
 		return families;
 	} catch (error) {
 		console.error(`Failed to query fonts: ${error}`);

From 68578692828fc190b407296b59e6374bd6bda05c Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Fri, 7 Jun 2024 09:00:23 +0200
Subject: [PATCH 0041/1815] fonts async

---
 src/vs/base/browser/fonts.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/browser/fonts.ts b/src/vs/base/browser/fonts.ts
index e59788b107b6..9f2253ada5fc 100644
--- a/src/vs/base/browser/fonts.ts
+++ b/src/vs/base/browser/fonts.ts
@@ -20,10 +20,10 @@ interface FontData {
 	readonly family: string;
 }
 
-export const getFonts = (): string[] => {
+export const getFonts = async (): Promise<string[]> => {
 	try {
 		// @ts-ignore
-		const fonts = mainWindow.queryLocalFonts() as FontData[];
+		const fonts = await mainWindow.queryLocalFonts() as FontData[];
 		const fontsArray = [...fonts];
 		const families = fontsArray.map(font => font.family);
 		return families;

From 2cf5382e8898705ff9ab5ed9ccee17877a7ac045 Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Fri, 7 Jun 2024 09:02:17 +0200
Subject: [PATCH 0042/1815] register

---
 .../contrib/terminal/common/terminalConfiguration.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index fddeedbd1690..fc039aeaea46 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -178,9 +178,6 @@ const terminalConfiguration: IConfigurationNode = {
 		[TerminalSettingId.FontFamily]: {
 			markdownDescription: localize('terminal.integrated.fontFamily', "Controls the font family of the terminal. Defaults to {0}'s value.", '`#editor.fontFamily#`'),
 			type: 'string',
-			get enum() {
-				return getFonts();
-			}
 		},
 		// TODO: Support font ligatures
 		// 'terminal.integrated.fontLigatures': {
@@ -635,9 +632,16 @@ const terminalConfiguration: IConfigurationNode = {
 	}
 };
 
-export function registerTerminalConfiguration() {
+export async function registerTerminalConfiguration() {
 	const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
 	configurationRegistry.registerConfiguration(terminalConfiguration);
+	// TODO load fonts on startup finished
+	const fonts = await getFonts();
+	if (terminalConfiguration.properties) {
+
+		terminalConfiguration.properties[TerminalSettingId.FontFamily].enum = fonts;
+	}
+
 }
 
 Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMigration)

From a3f35a126434cc99e29b00ed250871a69344eaeb Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Fri, 7 Jun 2024 09:26:07 +0200
Subject: [PATCH 0043/1815] set enum async

---
 .../workbench/contrib/terminal/common/terminalConfiguration.ts   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index fc039aeaea46..eefac0673036 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -638,7 +638,6 @@ export async function registerTerminalConfiguration() {
 	// TODO load fonts on startup finished
 	const fonts = await getFonts();
 	if (terminalConfiguration.properties) {
-
 		terminalConfiguration.properties[TerminalSettingId.FontFamily].enum = fonts;
 	}
 

From d211b7e4e7c10629aae9ac35b63c24da8019fb3b Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Fri, 7 Jun 2024 09:30:16 +0200
Subject: [PATCH 0044/1815] try to allow font access

---
 src/vs/code/electron-main/app.ts                             | 5 +++--
 .../contrib/terminal/common/terminalConfiguration.ts         | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 9d84281819d3..59fe0e3c8e1e 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -171,12 +171,13 @@ export class CodeApplication extends Disposable {
 			'clipboard-sanitized-write',
 		]);
 
+		const allowedPermissionsDefault = new Set(['font-access']);
+
 		session.defaultSession.setPermissionRequestHandler((_webContents, permission, callback, details) => {
 			if (isUrlFromWebview(details.requestingUrl)) {
 				return callback(allowedPermissionsInWebview.has(permission));
 			}
-
-			return callback(false);
+			return callback(allowedPermissionsDefault.has(permission));
 		});
 
 		session.defaultSession.setPermissionCheckHandler((_webContents, permission, _origin, details) => {
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index eefac0673036..ab4ed0467774 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -637,6 +637,7 @@ export async function registerTerminalConfiguration() {
 	configurationRegistry.registerConfiguration(terminalConfiguration);
 	// TODO load fonts on startup finished
 	const fonts = await getFonts();
+	console.log({ fonts });
 	if (terminalConfiguration.properties) {
 		terminalConfiguration.properties[TerminalSettingId.FontFamily].enum = fonts;
 	}

From 10b193986dc049d05f20095fa7af73b85e8b906a Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Fri, 7 Jun 2024 09:31:08 +0200
Subject: [PATCH 0045/1815] try to allow font access

---
 src/vs/code/electron-main/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 59fe0e3c8e1e..7c5112acc4bd 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -185,7 +185,7 @@ export class CodeApplication extends Disposable {
 				return allowedPermissionsInWebview.has(permission);
 			}
 
-			return false;
+			return allowedPermissionsDefault.has(permission);
 		});
 
 		//#endregion

From 65b9aef2b79a0a4672e6b7b149c944e70923bab7 Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Fri, 7 Jun 2024 09:45:27 +0200
Subject: [PATCH 0046/1815] fix right permission

---
 src/vs/code/electron-main/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 7c5112acc4bd..5cd869bc657b 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -171,7 +171,7 @@ export class CodeApplication extends Disposable {
 			'clipboard-sanitized-write',
 		]);
 
-		const allowedPermissionsDefault = new Set(['font-access']);
+		const allowedPermissionsDefault = new Set(['font-access', 'local-fonts']);
 
 		session.defaultSession.setPermissionRequestHandler((_webContents, permission, callback, details) => {
 			if (isUrlFromWebview(details.requestingUrl)) {

From 3843fd721230435d9a974df1e467cbc0da885e2b Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Fri, 7 Jun 2024 09:52:06 +0200
Subject: [PATCH 0047/1815] feature: use default snippets instead of enum

---
 .../terminal/browser/terminal.contribution.ts        |  3 ++-
 .../contrib/terminal/common/terminalConfiguration.ts | 12 ++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
index 96657abf2ac1..c28eb3b241f0 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { getFonts } from 'vs/base/browser/fonts';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { Schemas } from 'vs/base/common/network';
 import { isIOS, isWindows } from 'vs/base/common/platform';
@@ -92,7 +93,7 @@ registerWorkbenchContribution2(TerminalWslRecommendationContribution.ID, Termina
 
 // Register configurations
 registerTerminalPlatformConfiguration();
-registerTerminalConfiguration();
+registerTerminalConfiguration(getFonts);
 
 // Register editor/dnd contributions
 Registry.as<IEditorFactoryRegistry>(EditorExtensions.EditorFactory).registerEditorSerializer(TerminalEditorInput.ID, TerminalInputSerializer);
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index ab4ed0467774..63360334d8cd 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -21,7 +21,7 @@ import { terminalTypeAheadConfiguration } from 'vs/workbench/contrib/terminalCon
 import { terminalZoomConfiguration } from 'vs/workbench/contrib/terminalContrib/zoom/common/terminal.zoom'; // eslint-disable-line local/code-import-patterns
 import { terminalSuggestConfiguration } from 'vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration'; // eslint-disable-line local/code-import-patterns
 import { terminalInitialHintConfiguration } from 'vs/workbench/contrib/terminalContrib/chat/common/terminalInitialHintConfiguration';  // eslint-disable-line local/code-import-patterns
-import { getFonts } from 'vs/base/browser/fonts';
+import type { IJSONSchemaSnippet } from 'vs/base/common/jsonSchema';
 
 const terminalDescriptors = '\n- ' + [
 	'`\${cwd}`: ' + localize("cwd", "the terminal's current working directory"),
@@ -632,14 +632,18 @@ const terminalConfiguration: IConfigurationNode = {
 	}
 };
 
-export async function registerTerminalConfiguration() {
+export async function registerTerminalConfiguration(getFonts: () => Promise<string[]>) {
 	const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
 	configurationRegistry.registerConfiguration(terminalConfiguration);
 	// TODO load fonts on startup finished
 	const fonts = await getFonts();
-	console.log({ fonts });
 	if (terminalConfiguration.properties) {
-		terminalConfiguration.properties[TerminalSettingId.FontFamily].enum = fonts;
+		const snippets: IJSONSchemaSnippet[] = fonts.map(font => {
+			return {
+				body: `${font}`
+			};
+		});
+		terminalConfiguration.properties[TerminalSettingId.FontFamily].defaultSnippets = snippets;
 	}
 
 }

From cec4301944ba634fb0147154eb1dbf5a703c9dea Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Fri, 7 Jun 2024 10:26:26 +0200
Subject: [PATCH 0048/1815] add defaultsnippetsAsync property

---
 src/vs/base/common/jsonSchema.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/base/common/jsonSchema.ts b/src/vs/base/common/jsonSchema.ts
index 4216b0e5c0d8..94a38f75c9e7 100644
--- a/src/vs/base/common/jsonSchema.ts
+++ b/src/vs/base/common/jsonSchema.ts
@@ -76,6 +76,7 @@ export interface IJSONSchema {
 	// VSCode extensions
 
 	defaultSnippets?: IJSONSchemaSnippet[];
+	defaultSnippetsAsync?: () => Promise<IJSONSchemaSnippet[]>;
 	errorMessage?: string;
 	patternErrorMessage?: string;
 	deprecationMessage?: string;

From 0f1773ee9be1781f8942b12d91b6372852fc6427 Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Fri, 7 Jun 2024 10:35:42 +0200
Subject: [PATCH 0049/1815] remove unused code

---
 src/vs/base/common/jsonSchema.ts                             | 1 -
 .../contrib/terminal/common/terminalConfiguration.ts         | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/common/jsonSchema.ts b/src/vs/base/common/jsonSchema.ts
index 94a38f75c9e7..4216b0e5c0d8 100644
--- a/src/vs/base/common/jsonSchema.ts
+++ b/src/vs/base/common/jsonSchema.ts
@@ -76,7 +76,6 @@ export interface IJSONSchema {
 	// VSCode extensions
 
 	defaultSnippets?: IJSONSchemaSnippet[];
-	defaultSnippetsAsync?: () => Promise<IJSONSchemaSnippet[]>;
 	errorMessage?: string;
 	patternErrorMessage?: string;
 	deprecationMessage?: string;
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index 63360334d8cd..9e650bb1364f 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -7,7 +7,7 @@ import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationRegis
 import { localize } from 'vs/nls';
 import { DEFAULT_LETTER_SPACING, DEFAULT_LINE_HEIGHT, DEFAULT_COMMANDS_TO_SKIP_SHELL, SUGGESTIONS_FONT_WEIGHT, MINIMUM_FONT_WEIGHT, MAXIMUM_FONT_WEIGHT } from 'vs/workbench/contrib/terminal/common/terminal';
 import { TerminalLocationString, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { isMacintosh, isWindows } from 'vs/base/common/platform';
+import { isElectron, isMacintosh, isWindows } from 'vs/base/common/platform';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Codicon } from 'vs/base/common/codicons';
 import { terminalColorSchema, terminalIconSchema } from 'vs/platform/terminal/common/terminalPlatformConfiguration';
@@ -635,6 +635,9 @@ const terminalConfiguration: IConfigurationNode = {
 export async function registerTerminalConfiguration(getFonts: () => Promise<string[]>) {
 	const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
 	configurationRegistry.registerConfiguration(terminalConfiguration);
+	if (!isElectron) {
+		return;
+	}
 	// TODO load fonts on startup finished
 	const fonts = await getFonts();
 	if (terminalConfiguration.properties) {

From b9e6b0205bdabc188c5c9bc98c6483958d876792 Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Fri, 7 Jun 2024 10:37:45 +0200
Subject: [PATCH 0050/1815] remove todo

---
 .../workbench/contrib/terminal/common/terminalConfiguration.ts   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index 9e650bb1364f..2e184602538f 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -638,7 +638,6 @@ export async function registerTerminalConfiguration(getFonts: () => Promise<stri
 	if (!isElectron) {
 		return;
 	}
-	// TODO load fonts on startup finished
 	const fonts = await getFonts();
 	if (terminalConfiguration.properties) {
 		const snippets: IJSONSchemaSnippet[] = fonts.map(font => {

From 9f6e395fe6d893283b1f391b7f74898fa2417066 Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Fri, 7 Jun 2024 10:57:39 +0200
Subject: [PATCH 0051/1815] add snippets for editor font

---
 src/vs/base/browser/fonts.ts                    | 17 ++++++++++++++++-
 .../common/config/editorConfigurationSchema.ts  | 13 +++++++++++++
 .../browser/parts/editor/editor.contribution.ts |  5 +++++
 .../terminal/browser/terminal.contribution.ts   |  4 ++--
 .../terminal/common/terminalConfiguration.ts    | 17 ++++-------------
 5 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/src/vs/base/browser/fonts.ts b/src/vs/base/browser/fonts.ts
index 9f2253ada5fc..2ebc6eea68eb 100644
--- a/src/vs/base/browser/fonts.ts
+++ b/src/vs/base/browser/fonts.ts
@@ -4,7 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { mainWindow } from 'vs/base/browser/window';
-import { isMacintosh, isWindows } from 'vs/base/common/platform';
+import type { IJSONSchemaSnippet } from 'vs/base/common/jsonSchema.js';
+import { isElectron, isMacintosh, isWindows } from 'vs/base/common/platform';
 
 /**
  * The best font-family to be used in CSS based on the platform:
@@ -32,3 +33,17 @@ export const getFonts = async (): Promise<string[]> => {
 		return [];
 	}
 };
+
+
+export const getFontSnippets = async (): Promise<IJSONSchemaSnippet[]> => {
+	if (!isElectron) {
+		return [];
+	}
+	const fonts = await getFonts();
+	const snippets: IJSONSchemaSnippet[] = fonts.map(font => {
+		return {
+			body: `${font}`
+		};
+	});
+	return snippets;
+};
diff --git a/src/vs/editor/common/config/editorConfigurationSchema.ts b/src/vs/editor/common/config/editorConfigurationSchema.ts
index ab2b8cc70c62..42681b2653c6 100644
--- a/src/vs/editor/common/config/editorConfigurationSchema.ts
+++ b/src/vs/editor/common/config/editorConfigurationSchema.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import type { IJSONSchemaSnippet } from 'vs/base/common/jsonSchema';
 import { diffEditorDefaultOptions } from 'vs/editor/common/config/diffEditor';
 import { editorOptionsRegistry } from 'vs/editor/common/config/editorOptions';
 import { EDITOR_MODEL_DEFAULTS } from 'vs/editor/common/core/textModelDefaults';
@@ -295,3 +296,15 @@ export function isDiffEditorConfigurationKey(key: string): boolean {
 
 const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
 configurationRegistry.registerConfiguration(editorConfiguration);
+
+export async function registerEditorFontConfigurations(getFontSnippets: () => Promise<IJSONSchemaSnippet[]>) {
+	const editorKeysWithFont = ['editor.fontFamily'];
+	const fontSnippets = await getFontSnippets();
+	for (const key of editorKeysWithFont) {
+		if (
+			editorConfiguration.properties && editorConfiguration.properties[key]
+		) {
+			editorConfiguration.properties[key].defaultSnippets = fontSnippets;
+		}
+	}
+}
diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
index dfb20dc68fb6..3181aa0034c4 100644
--- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
@@ -72,6 +72,8 @@ import { DynamicEditorConfigurations } from 'vs/workbench/browser/parts/editor/e
 import { EditorActionsDefaultAction, EditorActionsTitleBarAction, HideEditorActionsAction, HideEditorTabsAction, ShowMultipleEditorTabsAction, ShowSingleEditorTabAction, ZenHideEditorTabsAction, ZenShowMultipleEditorTabsAction, ZenShowSingleEditorTabAction } from 'vs/workbench/browser/actions/layoutActions';
 import { ICommandAction } from 'vs/platform/action/common/action';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
+import { getFontSnippets } from 'vs/base/browser/fonts';
+import { registerEditorFontConfigurations } from 'vs/editor/common/config/editorConfigurationSchema';
 
 //#region Editor Registrations
 
@@ -1099,3 +1101,6 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
 });
 
 //#endregion
+
+
+registerEditorFontConfigurations(getFontSnippets);
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
index 1ac6d6eca291..6da9fc7e3c22 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getFonts } from 'vs/base/browser/fonts';
+import { getFontSnippets } from 'vs/base/browser/fonts';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { Schemas } from 'vs/base/common/network';
 import { isIOS, isWindows } from 'vs/base/common/platform';
@@ -93,7 +93,7 @@ registerWorkbenchContribution2(TerminalWslRecommendationContribution.ID, Termina
 
 // Register configurations
 registerTerminalPlatformConfiguration();
-registerTerminalConfiguration(getFonts);
+registerTerminalConfiguration(getFontSnippets);
 
 // Register editor/dnd contributions
 Registry.as<IEditorFactoryRegistry>(EditorExtensions.EditorFactory).registerEditorSerializer(TerminalEditorInput.ID, TerminalInputSerializer);
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index 2e184602538f..4b423b2d02f6 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -7,7 +7,7 @@ import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationRegis
 import { localize } from 'vs/nls';
 import { DEFAULT_LETTER_SPACING, DEFAULT_LINE_HEIGHT, DEFAULT_COMMANDS_TO_SKIP_SHELL, SUGGESTIONS_FONT_WEIGHT, MINIMUM_FONT_WEIGHT, MAXIMUM_FONT_WEIGHT } from 'vs/workbench/contrib/terminal/common/terminal';
 import { TerminalLocationString, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
-import { isElectron, isMacintosh, isWindows } from 'vs/base/common/platform';
+import { isMacintosh, isWindows } from 'vs/base/common/platform';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Codicon } from 'vs/base/common/codicons';
 import { terminalColorSchema, terminalIconSchema } from 'vs/platform/terminal/common/terminalPlatformConfiguration';
@@ -632,22 +632,13 @@ const terminalConfiguration: IConfigurationNode = {
 	}
 };
 
-export async function registerTerminalConfiguration(getFonts: () => Promise<string[]>) {
+export async function registerTerminalConfiguration(getFontSnippets: () => Promise<IJSONSchemaSnippet[]>) {
 	const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
 	configurationRegistry.registerConfiguration(terminalConfiguration);
-	if (!isElectron) {
-		return;
-	}
-	const fonts = await getFonts();
+	const fontsSnippets = await getFontSnippets();
 	if (terminalConfiguration.properties) {
-		const snippets: IJSONSchemaSnippet[] = fonts.map(font => {
-			return {
-				body: `${font}`
-			};
-		});
-		terminalConfiguration.properties[TerminalSettingId.FontFamily].defaultSnippets = snippets;
+		terminalConfiguration.properties[TerminalSettingId.FontFamily].defaultSnippets = fontsSnippets;
 	}
-
 }
 
 Registry.as<IConfigurationMigrationRegistry>(WorkbenchExtensions.ConfigurationMigration)

From 51ba6b63faae2985da3ae11740d491a30eb868f1 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Mon, 24 Jun 2024 18:29:31 +0200
Subject: [PATCH 0052/1815] WIP, better logic when removing an in-between
 request

---
 .../browser/inlineChatController.ts           | 45 +++++++++++++---
 .../inlineChat/browser/inlineChatSession.ts   | 52 ++++++++++---------
 .../browser/inlineChatSessionServiceImpl.ts   |  6 +--
 3 files changed, 69 insertions(+), 34 deletions(-)

diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
index 8fdf2669f596..a94926f17491 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
@@ -423,12 +423,42 @@ export class InlineChatController implements IEditorContribution {
 			}
 		}));
 
+		let ignoreRemoveEvents = false;
 		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);
+			if (e.kind === 'removeRequest' && !ignoreRemoveEvents) {
+				assertType(this._session);
+				assertType(this._strategy);
+
+				// when truely removing a request, we also remove all following requests
+				if (e.reason === ChatRequestRemovalReason.Removal) {
+					try {
+						ignoreRemoveEvents = true;
+						const requests = this._session.chatModel.getRequests().slice();
+						const idx = requests.findIndex(candidate => candidate.id === e.requestId);
+						for (let i = idx + 1; i < requests.length; i++) {
+							await this._chatService.removeRequest(this._session.chatModel.sessionId, requests[i].id);
+						}
+					} finally {
+						ignoreRemoveEvents = false;
+					}
+				}
+
+				await this._session.undoChangesUntil(e.requestId);
+
+				// recompute hunks!
+				const requests = this._session.chatModel.getRequests();
+				let editState: IChatTextEditGroupState | undefined;
+				for (let i = requests.length - 1; i >= 0; i--) {
+					const edits = <IChatTextEditGroup | undefined>requests[i].response?.response.value.find(item => item.kind === 'textEditGroup' && isEqual(item.uri, this._session?.textModelN.uri));
+					if (edits?.state) {
+						editState = edits.state;
+						break;
+					}
+				}
+				if (editState) {
+					this._session.hunkData.recompute(editState);
+					await this._strategy.renderChanges();
+				}
 			}
 		}));
 
@@ -741,8 +771,11 @@ export class InlineChatController implements IEditorContribution {
 		assertType(this._session);
 		assertType(this._strategy);
 
-		const { response } = this._session.lastExchange!;
+		if (!this._session.lastExchange) {
+			return State.WAIT_FOR_INPUT;
+		}
 
+		const { response } = this._session.lastExchange;
 
 		let newPosition: Position | undefined;
 
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts
index 4d18fe88fce6..3f8c1479fc5e 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts
@@ -201,7 +201,7 @@ export class Session {
 	}
 
 	async undoChangesUntil(requestId: string): Promise<boolean> {
-		const idx = this._exchanges.findIndex(candidate => candidate.prompt.request.id === requestId);
+		const idx = this._exchanges.findIndex(candidate => candidate.response.chatResponse.requestId === requestId);
 		if (idx < 0) {
 			return false;
 		}
@@ -215,10 +215,8 @@ export class Session {
 		} finally {
 			this.hunkData.ignoreTextModelNChanges = false;
 		}
-		// TODO@jrieken cannot do this yet because some parts still rely on
-		// exchanges being around...
-		// // remove this and following exchanges
-		// this._exchanges.length = idx;
+		// remove this and following exchanges
+		this._exchanges.length = idx;
 		return true;
 	}
 
@@ -302,6 +300,9 @@ export class SessionExchange {
 
 export class EmptyResponse {
 
+	constructor(
+		readonly chatResponse: IChatResponseModel
+	) { }
 }
 
 export class ErrorResponse {
@@ -310,6 +311,7 @@ export class ErrorResponse {
 	readonly isCancellation: boolean;
 
 	constructor(
+		readonly chatResponse: IChatResponseModel,
 		readonly error: any
 	) {
 		this.message = toErrorMessage(error, false);
@@ -569,28 +571,28 @@ export class HunkData {
 
 		diff ??= await this._editorWorkerService.computeDiff(this._textModel0.uri, this._textModelN.uri, { ignoreTrimWhitespace: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, computeMoves: false }, 'advanced');
 
-		if (!diff || diff.changes.length === 0) {
-			// return new HunkData([], session);
-			return;
-		}
-
-		// merge changes neighboring changes
-		const mergedChanges = [diff.changes[0]];
-		for (let i = 1; i < diff.changes.length; i++) {
-			const lastChange = mergedChanges[mergedChanges.length - 1];
-			const thisChange = diff.changes[i];
-			if (thisChange.modified.startLineNumber - lastChange.modified.endLineNumberExclusive <= HunkData._HUNK_THRESHOLD) {
-				mergedChanges[mergedChanges.length - 1] = new DetailedLineRangeMapping(
-					lastChange.original.join(thisChange.original),
-					lastChange.modified.join(thisChange.modified),
-					(lastChange.innerChanges ?? []).concat(thisChange.innerChanges ?? [])
-				);
-			} else {
-				mergedChanges.push(thisChange);
+		let hunks: RawHunk[] = [];
+
+		if (diff && diff.changes.length > 0) {
+
+			// merge changes neighboring changes
+			const mergedChanges = [diff.changes[0]];
+			for (let i = 1; i < diff.changes.length; i++) {
+				const lastChange = mergedChanges[mergedChanges.length - 1];
+				const thisChange = diff.changes[i];
+				if (thisChange.modified.startLineNumber - lastChange.modified.endLineNumberExclusive <= HunkData._HUNK_THRESHOLD) {
+					mergedChanges[mergedChanges.length - 1] = new DetailedLineRangeMapping(
+						lastChange.original.join(thisChange.original),
+						lastChange.modified.join(thisChange.modified),
+						(lastChange.innerChanges ?? []).concat(thisChange.innerChanges ?? [])
+					);
+				} else {
+					mergedChanges.push(thisChange);
+				}
 			}
-		}
 
-		const hunks = mergedChanges.map(change => new RawHunk(change.original, change.modified, change.innerChanges ?? []));
+			hunks = mergedChanges.map(change => new RawHunk(change.original, change.modified, change.innerChanges ?? []));
+		}
 
 		this._textModelN.changeDecorations(accessorN => {
 
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
index e77461a562ca..1b61efbfdd24 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
@@ -180,13 +180,13 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 				// make an response from the ChatResponseModel
 				if (response.isCanceled) {
 					// error: cancelled
-					inlineResponse = new ErrorResponse(new CancellationError());
+					inlineResponse = new ErrorResponse(response, new CancellationError());
 				} else if (response.result?.errorDetails) {
 					// error: "real" error
-					inlineResponse = new ErrorResponse(new Error(response.result.errorDetails.message));
+					inlineResponse = new ErrorResponse(response, new Error(response.result.errorDetails.message));
 				} else if (response.response.value.length === 0) {
 					// epmty response
-					inlineResponse = new EmptyResponse();
+					inlineResponse = new EmptyResponse(response);
 				} else {
 					inlineResponse = this._instaService.createInstance(
 						ReplyResponse,

From 7328dcfd8b4db6d276af6569387f9e22eef5ef57 Mon Sep 17 00:00:00 2001
From: andreamah <andrea_mah22@hotmail.com>
Date: Wed, 21 Aug 2024 18:00:43 -0700
Subject: [PATCH 0053/1815] testing for ci

---
 src/vs/workbench/api/browser/mainThreadWorkspace.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/api/browser/mainThreadWorkspace.ts b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
index 12441286ddcf..bb5299fc6585 100644
--- a/src/vs/workbench/api/browser/mainThreadWorkspace.ts
+++ b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
@@ -160,6 +160,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 	}
 
 	$startTextSearch(pattern: IPatternInfo, _folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
+		console.log(JSON.stringify(options));
 		const folder = URI.revive(_folder);
 		const workspace = this._contextService.getWorkspace();
 		const folders = folder ? [folder] : workspace.folders.map(folder => folder.uri);

From a9487bfe9757d75bdc39f77222626c1167b47a92 Mon Sep 17 00:00:00 2001
From: andreamah <andrea_mah22@hotmail.com>
Date: Wed, 21 Aug 2024 18:08:20 -0700
Subject: [PATCH 0054/1815] more logging

---
 src/vs/workbench/api/common/extHostWorkspace.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/api/common/extHostWorkspace.ts b/src/vs/workbench/api/common/extHostWorkspace.ts
index a5d37f22d114..d7f9ce3edd8d 100644
--- a/src/vs/workbench/api/common/extHostWorkspace.ts
+++ b/src/vs/workbench/api/common/extHostWorkspace.ts
@@ -642,12 +642,15 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 		}
 
 		try {
-			const result = await Promise.all(queryOptions?.map(option => this._proxy.$startTextSearch(
-				query,
-				option.folder ?? null,
-				option.options,
-				requestId,
-				token) || {}
+			const result = await Promise.all(queryOptions?.map(option => {
+				console.log(JSON.stringify(option));
+				return this._proxy.$startTextSearch(
+					query,
+					option.folder ?? null,
+					option.options,
+					requestId,
+					token) || {};
+			}
 			) ?? []);
 			delete this._activeSearchCallbacks[requestId];
 			return result.reduce((acc, val) => {

From e7becb2ccd0d9766c93fba0787800e6d457e3c8b Mon Sep 17 00:00:00 2001
From: andreamah <andrea_mah22@hotmail.com>
Date: Wed, 21 Aug 2024 18:18:04 -0700
Subject: [PATCH 0055/1815] more logs

---
 src/vs/workbench/api/browser/mainThreadWorkspace.ts | 1 -
 src/vs/workbench/api/common/extHostWorkspace.ts     | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadWorkspace.ts b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
index bb5299fc6585..12441286ddcf 100644
--- a/src/vs/workbench/api/browser/mainThreadWorkspace.ts
+++ b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
@@ -160,7 +160,6 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 	}
 
 	$startTextSearch(pattern: IPatternInfo, _folder: UriComponents | null, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<ITextSearchComplete | null> {
-		console.log(JSON.stringify(options));
 		const folder = URI.revive(_folder);
 		const workspace = this._contextService.getWorkspace();
 		const folders = folder ? [folder] : workspace.folders.map(folder => folder.uri);
diff --git a/src/vs/workbench/api/common/extHostWorkspace.ts b/src/vs/workbench/api/common/extHostWorkspace.ts
index d7f9ce3edd8d..383917a12f8c 100644
--- a/src/vs/workbench/api/common/extHostWorkspace.ts
+++ b/src/vs/workbench/api/common/extHostWorkspace.ts
@@ -517,6 +517,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 			fileQueries.filePattern = parseInclude?.pattern;
 		}
 
+		console.log(JSON.stringify(fileQueries));
 		return this._proxy.$startFileSearch(
 			folderToUse ?? null,
 			fileQueries,
@@ -642,15 +643,13 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 		}
 
 		try {
-			const result = await Promise.all(queryOptions?.map(option => {
-				console.log(JSON.stringify(option));
-				return this._proxy.$startTextSearch(
+			const result = await Promise.all(queryOptions?.map(option =>
+				this._proxy.$startTextSearch(
 					query,
 					option.folder ?? null,
 					option.options,
 					requestId,
-					token) || {};
-			}
+					token) || {}
 			) ?? []);
 			delete this._activeSearchCallbacks[requestId];
 			return result.reduce((acc, val) => {

From cd62e1d080ba260a7564c0add0e8b01258e1023f Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Mon, 26 Aug 2024 16:34:44 +0200
Subject: [PATCH 0056/1815] avoid flicker when autodect is on and mode has
 changed

---
 .../themes/browser/themes.contribution.ts     | 134 +-----------------
 .../themes/browser/workbenchThemeService.ts   |  12 +-
 .../themes/common/workbenchThemeService.ts    |   1 -
 3 files changed, 6 insertions(+), 141 deletions(-)

diff --git a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
index a22f71d0de84..a0ca67e152b5 100644
--- a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
+++ b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
@@ -33,17 +33,11 @@ import { Emitter } from 'vs/base/common/event';
 import { IExtensionResourceLoaderService } from 'vs/platform/extensionResourceLoader/common/extensionResourceLoader';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { FileIconThemeData } from 'vs/workbench/services/themes/browser/fileIconThemeData';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions } from 'vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { INotificationService, IPromptChoice, Severity } from 'vs/platform/notification/common/notification';
-import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
-import { isWeb } from 'vs/base/common/platform';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IHostService } from 'vs/workbench/services/host/browser/host';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { mainWindow } from 'vs/base/browser/window';
 import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
 import { Toggle } from 'vs/base/browser/ui/toggle/toggle';
@@ -853,127 +847,3 @@ MenuRegistry.appendMenuItem(ThemesSubMenu, {
 	},
 	order: 3
 });
-
-type DefaultThemeUpdatedNotificationReaction = 'keepNew' | 'keepOld' | 'tryNew' | 'cancel' | 'browse';
-
-class DefaultThemeUpdatedNotificationContribution implements IWorkbenchContribution {
-
-	static STORAGE_KEY = 'themeUpdatedNotificationShown';
-
-	constructor(
-		@INotificationService private readonly _notificationService: INotificationService,
-		@IWorkbenchThemeService private readonly _workbenchThemeService: IWorkbenchThemeService,
-		@IStorageService private readonly _storageService: IStorageService,
-		@ICommandService private readonly _commandService: ICommandService,
-		@ITelemetryService private readonly _telemetryService: ITelemetryService,
-		@IHostService private readonly _hostService: IHostService,
-	) {
-		if (_storageService.getBoolean(DefaultThemeUpdatedNotificationContribution.STORAGE_KEY, StorageScope.APPLICATION)) {
-			return;
-		}
-		setTimeout(async () => {
-			if (_storageService.getBoolean(DefaultThemeUpdatedNotificationContribution.STORAGE_KEY, StorageScope.APPLICATION)) {
-				return;
-			}
-			if (await this._hostService.hadLastFocus()) {
-				this._storageService.store(DefaultThemeUpdatedNotificationContribution.STORAGE_KEY, true, StorageScope.APPLICATION, StorageTarget.USER);
-				if (this._workbenchThemeService.hasUpdatedDefaultThemes()) {
-					this._showYouGotMigratedNotification();
-				} else {
-					const currentTheme = this._workbenchThemeService.getColorTheme().settingsId;
-					if (currentTheme === ThemeSettingDefaults.COLOR_THEME_LIGHT_OLD || currentTheme === ThemeSettingDefaults.COLOR_THEME_DARK_OLD) {
-						this._tryNewThemeNotification();
-					}
-				}
-			}
-		}, 3000);
-	}
-
-	private async _showYouGotMigratedNotification(): Promise<void> {
-		const usingLight = this._workbenchThemeService.getColorTheme().type === ColorScheme.LIGHT;
-		const newThemeSettingsId = usingLight ? ThemeSettingDefaults.COLOR_THEME_LIGHT : ThemeSettingDefaults.COLOR_THEME_DARK;
-		const newTheme = (await this._workbenchThemeService.getColorThemes()).find(theme => theme.settingsId === newThemeSettingsId);
-		if (newTheme) {
-			const choices = [
-				{
-					label: localize('button.keep', "Keep New Theme"),
-					run: () => {
-						this._writeTelemetry('keepNew');
-					}
-				},
-				{
-					label: localize('button.browse', "Browse Themes"),
-					run: () => {
-						this._writeTelemetry('browse');
-						this._commandService.executeCommand(SelectColorThemeCommandId);
-					}
-				},
-				{
-					label: localize('button.revert', "Revert"),
-					run: async () => {
-						this._writeTelemetry('keepOld');
-						const oldSettingsId = usingLight ? ThemeSettingDefaults.COLOR_THEME_LIGHT_OLD : ThemeSettingDefaults.COLOR_THEME_DARK_OLD;
-						const oldTheme = (await this._workbenchThemeService.getColorThemes()).find(theme => theme.settingsId === oldSettingsId);
-						if (oldTheme) {
-							this._workbenchThemeService.setColorTheme(oldTheme, 'auto');
-						}
-					}
-				}
-			];
-			await this._notificationService.prompt(
-				Severity.Info,
-				localize({ key: 'themeUpdatedNotification', comment: ['{0} is the name of the new default theme'] }, "Visual Studio Code now ships with a new default theme '{0}'. If you prefer, you can switch back to the old theme or try one of the many other color themes available.", newTheme.label),
-				choices,
-				{
-					onCancel: () => this._writeTelemetry('cancel')
-				}
-			);
-		}
-	}
-
-	private async _tryNewThemeNotification(): Promise<void> {
-		const newThemeSettingsId = this._workbenchThemeService.getColorTheme().type === ColorScheme.LIGHT ? ThemeSettingDefaults.COLOR_THEME_LIGHT : ThemeSettingDefaults.COLOR_THEME_DARK;
-		const theme = (await this._workbenchThemeService.getColorThemes()).find(theme => theme.settingsId === newThemeSettingsId);
-		if (theme) {
-			const choices: IPromptChoice[] = [{
-				label: localize('button.tryTheme', "Try New Theme"),
-				run: () => {
-					this._writeTelemetry('tryNew');
-					this._workbenchThemeService.setColorTheme(theme, 'auto');
-				}
-			},
-			{
-				label: localize('button.cancel', "Cancel"),
-				run: () => {
-					this._writeTelemetry('cancel');
-				}
-			}];
-			await this._notificationService.prompt(
-				Severity.Info,
-				localize({ key: 'newThemeNotification', comment: ['{0} is the name of the new default theme'] }, "Visual Studio Code now ships with a new default theme '{0}'. Do you want to give it a try?", theme.label),
-				choices,
-				{ onCancel: () => this._writeTelemetry('cancel') }
-			);
-		}
-	}
-
-	private _writeTelemetry(outcome: DefaultThemeUpdatedNotificationReaction): void {
-		type ThemeUpdatedNoticationClassification = {
-			owner: 'aeschli';
-			comment: 'Reaction to the notification that theme has updated to a new default theme';
-			web: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Whether this is running on web' };
-			reaction: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Outcome of the notification' };
-		};
-		type ThemeUpdatedNoticationEvent = {
-			web: boolean;
-			reaction: DefaultThemeUpdatedNotificationReaction;
-		};
-
-		this._telemetryService.publicLog2<ThemeUpdatedNoticationEvent, ThemeUpdatedNoticationClassification>('themeUpdatedNotication', {
-			web: isWeb,
-			reaction: outcome
-		});
-	}
-}
-const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench);
-workbenchRegistry.registerWorkbenchContribution(DefaultThemeUpdatedNotificationContribution, LifecyclePhase.Eventually);
diff --git a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
index 327b1d9133ad..c99944fa9af8 100644
--- a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
@@ -143,10 +143,10 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 		// a color theme document with good defaults until the theme is loaded
 		let themeData: ColorThemeData | undefined = ColorThemeData.fromStorageData(this.storageService);
 		const colorThemeSetting = this.settings.colorTheme;
-		if (themeData && colorThemeSetting !== themeData.settingsId && this.settings.isDefaultColorTheme()) {
-			this.hasDefaultUpdated = themeData.settingsId === ThemeSettingDefaults.COLOR_THEME_DARK_OLD || themeData.settingsId === ThemeSettingDefaults.COLOR_THEME_LIGHT_OLD;
-
-			// the web has different defaults than the desktop, therefore do not restore when the setting is the default theme and the storage doesn't match that.
+		if (themeData && colorThemeSetting !== themeData.settingsId) {
+			// reasons for a settings change
+			// the web has different defaults than the desktop
+			// os has changed mode and we have autodect on
 			themeData = undefined;
 		}
 
@@ -367,10 +367,6 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 		}));
 	}
 
-	public hasUpdatedDefaultThemes(): boolean {
-		return this.hasDefaultUpdated;
-	}
-
 	public getColorTheme(): IWorkbenchColorTheme {
 		return this.currentColorTheme;
 	}
diff --git a/src/vs/workbench/services/themes/common/workbenchThemeService.ts b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
index aac853941a76..ab57f51f8afb 100644
--- a/src/vs/workbench/services/themes/common/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
@@ -147,7 +147,6 @@ export interface IWorkbenchThemeService extends IThemeService {
 	getMarketplaceColorThemes(publisher: string, name: string, version: string): Promise<IWorkbenchColorTheme[]>;
 	onDidColorThemeChange: Event<IWorkbenchColorTheme>;
 
-	hasUpdatedDefaultThemes(): boolean;
 	getPreferredColorScheme(): ColorScheme | undefined;
 
 	setFileIconTheme(iconThemeId: string | undefined | IWorkbenchFileIconTheme, settingsTarget: ThemeSettingTarget): Promise<IWorkbenchFileIconTheme>;

From 5c5830025cc6e73ef0cf1961662f7e85205f79b4 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 24 Sep 2024 07:36:55 +0200
Subject: [PATCH 0057/1815] update mode block tracing

---
 build/gulpfile.compile.js                     |  6 +-
 src/vs/code/electron-main/app.ts              | 87 ++++++++++++++++++-
 .../common/update.config.contribution.ts      |  3 +-
 .../electron-main/abstractUpdateService.ts    |  2 +-
 4 files changed, 91 insertions(+), 7 deletions(-)

diff --git a/build/gulpfile.compile.js b/build/gulpfile.compile.js
index a8d8fb094b2d..12642498712c 100644
--- a/build/gulpfile.compile.js
+++ b/build/gulpfile.compile.js
@@ -17,16 +17,16 @@ const optimize = require('./lib/optimize');
 const isAMDBuild = typeof process.env.VSCODE_BUILD_AMD === 'string' && process.env.VSCODE_BUILD_AMD.toLowerCase() === 'true';
 
 /**
- * @param {boolean} disableMangle
+ * @param {boolean} _disableMangle
  */
-function makeCompileBuildTask(disableMangle) {
+function makeCompileBuildTask(_disableMangle) {
 	return task.series(
 		util.rimraf('out-build'),
 		util.buildWebNodePaths('out-build'),
 		date.writeISODate('out-build'),
 		amd.setAMD(isAMDBuild),
 		compilation.compileApiProposalNamesTask,
-		compilation.compileTask(isAMDBuild ? 'src2' : 'src', 'out-build', true, { disableMangle }),
+		compilation.compileTask(isAMDBuild ? 'src2' : 'src', 'out-build', true, { disableMangle: true }),
 		optimize.optimizeLoaderTask('out-build', 'out-build', true)
 	);
 }
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 294295164966..d41fd1093593 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { app, BrowserWindow, protocol, session, Session, systemPreferences, WebFrameMain } from 'electron';
+import { app, BrowserWindow, protocol, session, Session, systemPreferences, WebFrameMain, Notification } from 'electron';
 import { addUNCHostToAllowlist, disableUNCAccessRestrictions } from '../../base/node/unc.js';
 import { validatedIpcMain } from '../../base/parts/ipc/electron-main/ipcMain.js';
 import { hostname, release } from 'os';
@@ -72,7 +72,7 @@ import { ITelemetryService, TelemetryLevel } from '../../platform/telemetry/comm
 import { TelemetryAppenderClient } from '../../platform/telemetry/common/telemetryIpc.js';
 import { ITelemetryServiceConfig, TelemetryService } from '../../platform/telemetry/common/telemetryService.js';
 import { getPiiPathsFromEnvironment, getTelemetryLevel, isInternalTelemetry, NullTelemetryService, supportsTelemetry } from '../../platform/telemetry/common/telemetryUtils.js';
-import { IUpdateService } from '../../platform/update/common/update.js';
+import { IUpdateService, StateType } from '../../platform/update/common/update.js';
 import { UpdateChannel } from '../../platform/update/common/updateIpc.js';
 import { DarwinUpdateService } from '../../platform/update/electron-main/updateService.darwin.js';
 import { LinuxUpdateService } from '../../platform/update/electron-main/updateService.linux.js';
@@ -585,6 +585,89 @@ export class CodeApplication extends Disposable {
 		// Services
 		const appInstantiationService = await this.initServices(machineId, sqmId, devDeviceId, sharedProcessReady);
 
+		// Update mode: block
+		if (this.configurationService.getValue('update.mode') === 'block') {
+			await appInstantiationService.invokeFunction(async accessor => {
+				const updateService = accessor.get(IUpdateService);
+
+				setInterval(() => {
+					switch (updateService.state.type) {
+						case StateType.Uninitialized:
+							this.logService.info('Update mode blocker: Uninitialized');
+							break;
+						case StateType.Idle:
+							this.logService.info('Update mode blocker: Idle');
+							break;
+						case StateType.Disabled:
+							this.logService.info('Update mode blocker: Disabled');
+							break;
+						case StateType.CheckingForUpdates:
+							this.logService.info('Update mode blocker: CheckingForUpdates');
+							break;
+						case StateType.AvailableForDownload:
+							this.logService.info('Update mode blocker: AvailableForDownload');
+							break;
+						case StateType.Downloading:
+							this.logService.info('Update mode blocker: Downloading');
+							break;
+						case StateType.Downloaded:
+							this.logService.info('Update mode blocker: Downloaded');
+							break;
+						case StateType.Updating:
+							this.logService.info('Update mode blocker: Updating');
+							break;
+						case StateType.Ready:
+							this.logService.info('Update mode blocker: Ready');
+							break;
+					}
+				}, 1000);
+
+				let notification = new Notification({
+					title: 'Checking for updates...',
+					timeoutType: 'never'
+				});
+				notification.show();
+
+				this.logService.info('Before checkForUpdates()');
+				await updateService.checkForUpdates(true);
+				this.logService.info('After checkForUpdates()');
+				notification.close();
+
+				if (updateService.state.type === StateType.AvailableForDownload) {
+					this.logService.info('Before downloadUpdate()');
+					notification = new Notification({
+						title: 'Downloading update...',
+						timeoutType: 'never'
+					});
+					notification.show();
+					await updateService.downloadUpdate();
+					this.logService.info('After downloadUpdate()');
+
+					notification.close();
+					notification = new Notification({
+						title: 'Applying update...',
+						timeoutType: 'never'
+					});
+					notification.show();
+					this.logService.info('Before applyUpdate()');
+					await updateService.applyUpdate();
+					this.logService.info('After applyUpdate()');
+
+					notification.close();
+					notification = new Notification({
+						title: 'Restarting...',
+						timeoutType: 'never'
+					});
+					notification.show();
+					this.logService.info('Before quitAndInstall()');
+					await updateService.quitAndInstall();
+					this.logService.info('After quitAndInstall()');
+
+					return;
+				}
+			});
+		}
+
 		// Auth Handler
 		appInstantiationService.invokeFunction(accessor => accessor.get(IProxyAuthService));
 
diff --git a/src/vs/platform/update/common/update.config.contribution.ts b/src/vs/platform/update/common/update.config.contribution.ts
index d96926b5578a..ee290e42780d 100644
--- a/src/vs/platform/update/common/update.config.contribution.ts
+++ b/src/vs/platform/update/common/update.config.contribution.ts
@@ -17,7 +17,7 @@ configurationRegistry.registerConfiguration({
 	properties: {
 		'update.mode': {
 			type: 'string',
-			enum: ['none', 'manual', 'start', 'default'],
+			enum: ['none', 'manual', 'start', 'block', 'default'],
 			default: 'default',
 			scope: ConfigurationScope.APPLICATION,
 			description: localize('updateMode', "Configure whether you receive automatic updates. Requires a restart after change. The updates are fetched from a Microsoft online service."),
@@ -26,6 +26,7 @@ configurationRegistry.registerConfiguration({
 				localize('none', "Disable updates."),
 				localize('manual', "Disable automatic background update checks. Updates will be available if you manually check for updates."),
 				localize('start', "Check for updates only on startup. Disable automatic background update checks."),
+				localize('block', "Check for updates on startup and install if available before attempting to open any windows."),
 				localize('default', "Enable automatic update checks. Code will check for updates automatically and periodically.")
 			],
 			policy: {
diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index 48638aa12f73..8e94e8d43f34 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -205,7 +205,7 @@ export abstract class AbstractUpdateService implements IUpdateService {
 			return undefined;
 		}
 
-		const mode = this.configurationService.getValue<'none' | 'manual' | 'start' | 'default'>('update.mode');
+		const mode = this.configurationService.getValue<'none' | 'manual' | 'start' | 'default' | 'block'>('update.mode');
 
 		if (mode === 'none') {
 			return false;

From 5bc513bbbc284eda142094cc0b9dc3ecfd3d326e Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 24 Sep 2024 07:39:56 +0200
Subject: [PATCH 0058/1815] faster logging

---
 src/vs/code/electron-main/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index d41fd1093593..8a7719365c22 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -620,7 +620,7 @@ export class CodeApplication extends Disposable {
 							this.logService.info('Update mode blocker: Ready');
 							break;
 					}
-				}, 1000);
+				}, 100);
 
 				let notification = new Notification({
 					title: 'Checking for updates...',

From a523f78c1f08a9894c583f4b842459254507ec2b Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 24 Sep 2024 09:23:09 +0200
Subject: [PATCH 0059/1815] wait for init

---
 src/vs/code/electron-main/app.ts              | 36 +++++++++++++++++++
 src/vs/platform/update/common/update.ts       |  2 ++
 src/vs/platform/update/common/updateIpc.ts    |  5 +++
 .../electron-main/abstractUpdateService.ts    |  4 +--
 .../electron-main/updateService.darwin.ts     |  2 +-
 .../electron-main/updateService.snap.ts       |  2 ++
 .../electron-main/updateService.win32.ts      |  2 +-
 .../services/update/browser/updateService.ts  |  2 ++
 8 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 8a7719365c22..d71c2da9a436 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -590,6 +590,42 @@ export class CodeApplication extends Disposable {
 			await appInstantiationService.invokeFunction(async accessor => {
 				const updateService = accessor.get(IUpdateService);
 
+				const logUpdate = () => {
+					switch (updateService.state.type) {
+						case StateType.Uninitialized:
+							this.logService.info('Update mode blocker: Uninitialized');
+							break;
+						case StateType.Idle:
+							this.logService.info('Update mode blocker: Idle');
+							break;
+						case StateType.Disabled:
+							this.logService.info('Update mode blocker: Disabled');
+							break;
+						case StateType.CheckingForUpdates:
+							this.logService.info('Update mode blocker: CheckingForUpdates');
+							break;
+						case StateType.AvailableForDownload:
+							this.logService.info('Update mode blocker: AvailableForDownload');
+							break;
+						case StateType.Downloading:
+							this.logService.info('Update mode blocker: Downloading');
+							break;
+						case StateType.Downloaded:
+							this.logService.info('Update mode blocker: Downloaded');
+							break;
+						case StateType.Updating:
+							this.logService.info('Update mode blocker: Updating');
+							break;
+						case StateType.Ready:
+							this.logService.info('Update mode blocker: Ready');
+							break;
+					}
+				};
+
+				logUpdate();
+				await updateService.initialize();
+				logUpdate();
+
 				setInterval(() => {
 					switch (updateService.state.type) {
 						case StateType.Uninitialized:
diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts
index 2b0253285aa8..0e5881e3f3c5 100644
--- a/src/vs/platform/update/common/update.ts
+++ b/src/vs/platform/update/common/update.ts
@@ -99,6 +99,8 @@ export interface IUpdateService {
 	readonly onStateChange: Event<State>;
 	readonly state: State;
 
+	initialize(): Promise<void>;
+
 	checkForUpdates(explicit: boolean): Promise<void>;
 	downloadUpdate(): Promise<void>;
 	applyUpdate(): Promise<void>;
diff --git a/src/vs/platform/update/common/updateIpc.ts b/src/vs/platform/update/common/updateIpc.ts
index 1c9490312fef..6dcde9ac30a8 100644
--- a/src/vs/platform/update/common/updateIpc.ts
+++ b/src/vs/platform/update/common/updateIpc.ts
@@ -21,6 +21,7 @@ export class UpdateChannel implements IServerChannel {
 
 	call(_: unknown, command: string, arg?: any): Promise<any> {
 		switch (command) {
+			case 'initialize': return this.service.initialize();
 			case 'checkForUpdates': return this.service.checkForUpdates(arg);
 			case 'downloadUpdate': return this.service.downloadUpdate();
 			case 'applyUpdate': return this.service.applyUpdate();
@@ -53,6 +54,10 @@ export class UpdateChannelClient implements IUpdateService {
 		this.channel.call<State>('_getInitialState').then(state => this.state = state);
 	}
 
+	initialize(): Promise<void> {
+		return this.channel.call('initialize');
+	}
+
 	checkForUpdates(explicit: boolean): Promise<void> {
 		return this.channel.call('checkForUpdates', explicit);
 	}
diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index 8e94e8d43f34..929827da27d5 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -68,7 +68,7 @@ export abstract class AbstractUpdateService implements IUpdateService {
 	 * optimization, to avoid using extra CPU cycles before first window open.
 	 * https://github.com/microsoft/vscode/issues/89784
 	 */
-	protected async initialize(): Promise<void> {
+	async initialize(): Promise<void> {
 		if (!this.environmentMainService.isBuilt) {
 			this.setState(State.Disabled(DisablementReason.NotBuilt));
 			return; // updates are never enabled when running out of sources
@@ -86,7 +86,7 @@ export abstract class AbstractUpdateService implements IUpdateService {
 			return;
 		}
 
-		const updateMode = this.configurationService.getValue<'none' | 'manual' | 'start' | 'default'>('update.mode');
+		const updateMode = this.configurationService.getValue<'none' | 'manual' | 'start' | 'default' | 'block'>('update.mode');
 		const quality = this.getProductQuality(updateMode);
 
 		if (!quality) {
diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
index d3f27d3711e5..ef613b341d40 100644
--- a/src/vs/platform/update/electron-main/updateService.darwin.ts
+++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -56,7 +56,7 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
 		return true;
 	}
 
-	protected override async initialize(): Promise<void> {
+	override async initialize(): Promise<void> {
 		await super.initialize();
 		this.onRawError(this.onError, this, this.disposables);
 		this.onRawUpdateAvailable(this.onUpdateAvailable, this, this.disposables);
diff --git a/src/vs/platform/update/electron-main/updateService.snap.ts b/src/vs/platform/update/electron-main/updateService.snap.ts
index 78bcf9d7a456..584948cfa710 100644
--- a/src/vs/platform/update/electron-main/updateService.snap.ts
+++ b/src/vs/platform/update/electron-main/updateService.snap.ts
@@ -50,6 +50,8 @@ abstract class AbstractUpdateService implements IUpdateService {
 		this.scheduleCheckForUpdates(30 * 1000).then(undefined, err => this.logService.error(err));
 	}
 
+	async initialize(): Promise<void> { }
+
 	private scheduleCheckForUpdates(delay = 60 * 60 * 1000): Promise<void> {
 		return timeout(delay)
 			.then(() => this.checkForUpdates(false))
diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
index 61109e547417..cbd0834b0083 100644
--- a/src/vs/platform/update/electron-main/updateService.win32.ts
+++ b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -89,7 +89,7 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 		return true;
 	}
 
-	protected override async initialize(): Promise<void> {
+	override async initialize(): Promise<void> {
 		if (this.productService.target === 'user' && await this.nativeHostMainService.isAdmin(undefined)) {
 			this.setState(State.Disabled(DisablementReason.RunningAsAdmin));
 			this.logService.info('update#ctor - updates are disabled due to running as Admin in user setup');
diff --git a/src/vs/workbench/services/update/browser/updateService.ts b/src/vs/workbench/services/update/browser/updateService.ts
index 65016e9067b6..f9741062c44b 100644
--- a/src/vs/workbench/services/update/browser/updateService.ts
+++ b/src/vs/workbench/services/update/browser/updateService.ts
@@ -47,6 +47,8 @@ export class BrowserUpdateService extends Disposable implements IUpdateService {
 		this.checkForUpdates(false);
 	}
 
+	async initialize(): Promise<void> { }
+
 	async isLatestVersion(): Promise<boolean | undefined> {
 		const update = await this.doCheckForUpdates(false);
 		if (update === undefined) {

From 0e8ca99b08e1c7437b6c3f3b086bf430bd9e2d26 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 24 Sep 2024 11:21:48 +0200
Subject: [PATCH 0060/1815] .

---
 src/vs/code/electron-main/app.ts | 108 ++++++++++++-------------------
 1 file changed, 43 insertions(+), 65 deletions(-)

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index d71c2da9a436..3dd955fe8544 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -593,31 +593,31 @@ export class CodeApplication extends Disposable {
 				const logUpdate = () => {
 					switch (updateService.state.type) {
 						case StateType.Uninitialized:
-							this.logService.info('Update mode blocker: Uninitialized');
+							this.logService.info('Update State: Uninitialized');
 							break;
 						case StateType.Idle:
-							this.logService.info('Update mode blocker: Idle');
+							this.logService.info('Update State: Idle');
 							break;
 						case StateType.Disabled:
-							this.logService.info('Update mode blocker: Disabled');
+							this.logService.info('Update State: Disabled');
 							break;
 						case StateType.CheckingForUpdates:
-							this.logService.info('Update mode blocker: CheckingForUpdates');
+							this.logService.info('Update State: CheckingForUpdates');
 							break;
 						case StateType.AvailableForDownload:
-							this.logService.info('Update mode blocker: AvailableForDownload');
+							this.logService.info('Update State: AvailableForDownload');
 							break;
 						case StateType.Downloading:
-							this.logService.info('Update mode blocker: Downloading');
+							this.logService.info('Update State: Downloading');
 							break;
 						case StateType.Downloaded:
-							this.logService.info('Update mode blocker: Downloaded');
+							this.logService.info('Update State: Downloaded');
 							break;
 						case StateType.Updating:
-							this.logService.info('Update mode blocker: Updating');
+							this.logService.info('Update State: Updating');
 							break;
 						case StateType.Ready:
-							this.logService.info('Update mode blocker: Ready');
+							this.logService.info('Update State: Ready');
 							break;
 					}
 				};
@@ -626,37 +626,7 @@ export class CodeApplication extends Disposable {
 				await updateService.initialize();
 				logUpdate();
 
-				setInterval(() => {
-					switch (updateService.state.type) {
-						case StateType.Uninitialized:
-							this.logService.info('Update mode blocker: Uninitialized');
-							break;
-						case StateType.Idle:
-							this.logService.info('Update mode blocker: Idle');
-							break;
-						case StateType.Disabled:
-							this.logService.info('Update mode blocker: Disabled');
-							break;
-						case StateType.CheckingForUpdates:
-							this.logService.info('Update mode blocker: CheckingForUpdates');
-							break;
-						case StateType.AvailableForDownload:
-							this.logService.info('Update mode blocker: AvailableForDownload');
-							break;
-						case StateType.Downloading:
-							this.logService.info('Update mode blocker: Downloading');
-							break;
-						case StateType.Downloaded:
-							this.logService.info('Update mode blocker: Downloaded');
-							break;
-						case StateType.Updating:
-							this.logService.info('Update mode blocker: Updating');
-							break;
-						case StateType.Ready:
-							this.logService.info('Update mode blocker: Ready');
-							break;
-					}
-				}, 100);
+				setInterval(() => logUpdate(), 100);
 
 				let notification = new Notification({
 					title: 'Checking for updates...',
@@ -664,40 +634,37 @@ export class CodeApplication extends Disposable {
 				});
 				notification.show();
 
-				this.logService.info('Before checkForUpdates()');
 				await updateService.checkForUpdates(true);
-				this.logService.info('After checkForUpdates()');
+				await this.awaitUpdateState(updateService, StateType.Ready, StateType.Idle);
 				notification.close();
 
-				if (updateService.state.type === StateType.AvailableForDownload) {
-					this.logService.info('Before downloadUpdate()');
-					notification = new Notification({
-						title: 'Downloading update...',
-						timeoutType: 'never'
-					});
-					notification.show();
-					await updateService.downloadUpdate();
-					this.logService.info('After downloadUpdate()');
-
-					notification.close();
-					notification = new Notification({
-						title: 'Applying update...',
-						timeoutType: 'never'
-					});
-					notification.show();
-					this.logService.info('Before applyUpdate()');
-					await updateService.applyUpdate();
-					this.logService.info('After applyUpdate()');
-
-					notification.close();
+				if (updateService.state.type === StateType.Ready) {
+					// this.logService.info('Before downloadUpdate()');
+					// notification = new Notification({
+					// 	title: 'Downloading update...',
+					// 	timeoutType: 'never'
+					// });
+					// notification.show();
+					// await updateService.downloadUpdate();
+					// this.logService.info('After downloadUpdate()');
+
+					// notification.close();
+					// notification = new Notification({
+					// 	title: 'Applying update...',
+					// 	timeoutType: 'never'
+					// });
+					// notification.show();
+					// this.logService.info('Before applyUpdate()');
+					// await updateService.applyUpdate();
+					// this.logService.info('After applyUpdate()');
+
+					// notification.close();
 					notification = new Notification({
 						title: 'Restarting...',
 						timeoutType: 'never'
 					});
 					notification.show();
-					this.logService.info('Before quitAndInstall()');
 					await updateService.quitAndInstall();
-					this.logService.info('After quitAndInstall()');
 
 					return;
 				}
@@ -738,6 +705,17 @@ export class CodeApplication extends Disposable {
 		eventuallyPhaseScheduler.schedule();
 	}
 
+	private awaitUpdateState(updateService: IUpdateService, ...types: StateType[]): Promise<void> {
+		return new Promise<void>(resolve => {
+			const disposable = this._register(updateService.onStateChange(e => {
+				if (types.includes(e.type)) {
+					disposable.dispose();
+					resolve();
+				}
+			}));
+		});
+	}
+
 	private async setupProtocolUrlHandlers(accessor: ServicesAccessor, mainProcessElectronServer: ElectronIPCServer): Promise<IInitialProtocolUrls | undefined> {
 		const windowsMainService = this.windowsMainService = accessor.get(IWindowsMainService);
 		const urlService = accessor.get(IURLService);

From 1b78149efe7e48acfb68c68fb65ac1264a5c2f7c Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 24 Sep 2024 13:02:02 +0200
Subject: [PATCH 0061/1815] .

---
 .../update/electron-main/abstractUpdateService.ts         | 8 ++++----
 .../platform/update/electron-main/updateService.darwin.ts | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index 929827da27d5..742730bf83ea 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -179,21 +179,21 @@ export abstract class AbstractUpdateService implements IUpdateService {
 	}
 
 	quitAndInstall(): Promise<void> {
-		this.logService.trace('update#quitAndInstall, state = ', this.state.type);
+		this.logService.info('update#quitAndInstall, state = ', this.state.type);
 
 		if (this.state.type !== StateType.Ready) {
 			return Promise.resolve(undefined);
 		}
 
-		this.logService.trace('update#quitAndInstall(): before lifecycle quit()');
+		this.logService.info('update#quitAndInstall(): before lifecycle quit()');
 
 		this.lifecycleMainService.quit(true /* will restart */).then(vetod => {
-			this.logService.trace(`update#quitAndInstall(): after lifecycle quit() with veto: ${vetod}`);
+			this.logService.info(`update#quitAndInstall(): after lifecycle quit() with veto: ${vetod}`);
 			if (vetod) {
 				return;
 			}
 
-			this.logService.trace('update#quitAndInstall(): running raw#quitAndInstall()');
+			this.logService.info('update#quitAndInstall(): running raw#quitAndInstall()');
 			this.doQuitAndInstall();
 		});
 
diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
index ef613b341d40..b71b86564986 100644
--- a/src/vs/platform/update/electron-main/updateService.darwin.ts
+++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -131,7 +131,7 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
 	}
 
 	protected override doQuitAndInstall(): void {
-		this.logService.trace('update#quitAndInstall(): running raw#quitAndInstall()');
+		this.logService.info('update#quitAndInstall(): running raw#quitAndInstall()');
 		electron.autoUpdater.quitAndInstall();
 	}
 

From aab90b92482a208285a877a941939e65c28bc533 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 24 Sep 2024 15:24:32 +0200
Subject: [PATCH 0062/1815] .

---
 src/vs/code/electron-main/app.ts                          | 2 +-
 src/vs/platform/update/common/update.ts                   | 2 +-
 .../update/electron-main/abstractUpdateService.ts         | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 3dd955fe8544..6d84333b37c1 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -664,7 +664,7 @@ export class CodeApplication extends Disposable {
 						timeoutType: 'never'
 					});
 					notification.show();
-					await updateService.quitAndInstall();
+					await updateService.quitAndInstall(true);
 
 					return;
 				}
diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts
index 0e5881e3f3c5..3a242c436851 100644
--- a/src/vs/platform/update/common/update.ts
+++ b/src/vs/platform/update/common/update.ts
@@ -104,7 +104,7 @@ export interface IUpdateService {
 	checkForUpdates(explicit: boolean): Promise<void>;
 	downloadUpdate(): Promise<void>;
 	applyUpdate(): Promise<void>;
-	quitAndInstall(): Promise<void>;
+	quitAndInstall(force?: boolean): Promise<void>;
 
 	isLatestVersion(): Promise<boolean | undefined>;
 	_applySpecificUpdate(packagePath: string): Promise<void>;
diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index 742730bf83ea..b15bd641d373 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -178,13 +178,19 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		// noop
 	}
 
-	quitAndInstall(): Promise<void> {
+	quitAndInstall(force?: boolean): Promise<void> {
 		this.logService.info('update#quitAndInstall, state = ', this.state.type);
 
 		if (this.state.type !== StateType.Ready) {
 			return Promise.resolve(undefined);
 		}
 
+		if (force) {
+			this.logService.info('update#quitAndInstall(): running raw#quitAndInstall()');
+			this.doQuitAndInstall();
+			return Promise.resolve(undefined);
+		}
+
 		this.logService.info('update#quitAndInstall(): before lifecycle quit()');
 
 		this.lifecycleMainService.quit(true /* will restart */).then(vetod => {

From eddb7134cd2f9cf3bfc09e67608bdc3f41c08bcd Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 24 Sep 2024 15:27:27 +0200
Subject: [PATCH 0063/1815] .

---
 src/vs/code/electron-main/app.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 6d84333b37c1..677155967653 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -634,6 +634,8 @@ export class CodeApplication extends Disposable {
 				});
 				notification.show();
 
+				app.setBadgeCount();
+
 				await updateService.checkForUpdates(true);
 				await this.awaitUpdateState(updateService, StateType.Ready, StateType.Idle);
 				notification.close();

From a0d3259950ac273cad974fb47db46885243a55ea Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 26 Sep 2024 09:26:52 +0200
Subject: [PATCH 0064/1815] Git - remove extra argument

---
 extensions/git/src/test/smoke.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/git/src/test/smoke.test.ts b/extensions/git/src/test/smoke.test.ts
index 1b2c8c259baf..03496769c312 100644
--- a/extensions/git/src/test/smoke.test.ts
+++ b/extensions/git/src/test/smoke.test.ts
@@ -122,7 +122,7 @@ suite('git smoke test', function () {
 		repository.state.workingTreeChanges.some(r => r.uri.path === newfile.path && r.status === Status.UNTRACKED);
 		assert.strictEqual(repository.state.indexChanges.length, 0);
 
-		await commands.executeCommand('git.stageAll', appjs);
+		await commands.executeCommand('git.stageAll');
 		await repository.commit('third commit');
 		assert.strictEqual(repository.state.workingTreeChanges.length, 0);
 		assert.strictEqual(repository.state.indexChanges.length, 0);

From 4ed08a7b6bf3768a35ba422be9b5f89e1b5e39ca Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Thu, 26 Sep 2024 15:56:15 +0200
Subject: [PATCH 0065/1815] improving slightly the IME input position

---
 .../editContext/native/nativeEditContext.ts   | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
index 67cdd3b0bb07..3abb7770096d 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
@@ -13,9 +13,9 @@ import { IClipboardService } from '../../../../../platform/clipboard/common/clip
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { EndOfLinePreference, IModelDeltaDecoration } from '../../../../common/model.js';
-import { ViewConfigurationChangedEvent, ViewCursorStateChangedEvent } from '../../../../common/viewEvents.js';
+import { ViewConfigurationChangedEvent, ViewCursorStateChangedEvent, ViewScrollChangedEvent } from '../../../../common/viewEvents.js';
 import { ViewContext } from '../../../../common/viewModel/viewContext.js';
-import { RestrictedRenderingContext, RenderingContext } from '../../../view/renderingContext.js';
+import { RestrictedRenderingContext, RenderingContext, HorizontalPosition } from '../../../view/renderingContext.js';
 import { ViewController } from '../../../view/viewController.js';
 import { ClipboardStoredMetadata, getDataToCopy, InMemoryClipboardMetadataManager } from '../clipboardUtils.js';
 import { AbstractEditContext } from '../editContextUtils.js';
@@ -26,6 +26,7 @@ import { Selection } from '../../../../common/core/selection.js';
 import { Position } from '../../../../common/core/position.js';
 import { IVisibleRangeProvider } from '../textArea/textAreaEditContext.js';
 import { PositionOffsetTransformer } from '../../../../common/core/positionToOffset.js';
+import { DebugEditContext } from './debugEditContext.js';
 
 // Corresponds to classes in nativeEditContext.css
 enum CompositionClassName {
@@ -64,7 +65,7 @@ export class NativeEditContext extends AbstractEditContext {
 
 		this._focusTracker = this._register(new FocusTracker(this.domNode.domNode, (newFocusValue: boolean) => this._context.viewModel.setHasFocus(newFocusValue)));
 
-		this._editContext = new EditContext();
+		this._editContext = new DebugEditContext();
 		this.domNode.domNode.editContext = this._editContext;
 
 		this._screenReaderSupport = instantiationService.createInstance(ScreenReaderSupport, this.domNode, context);
@@ -154,6 +155,12 @@ export class NativeEditContext extends AbstractEditContext {
 		return true;
 	}
 
+	public override onScrollChanged(e: ViewScrollChangedEvent): boolean {
+		const visibleRangeForPosition = (position: Position) => this._visibleRangeProvider.visibleRangeForPosition(position);
+		this._updateSelectionAndControlBounds({ visibleRangeForPosition });
+		return true;
+	}
+
 	public override onConfigurationChanged(e: ViewConfigurationChangedEvent): boolean {
 		this._screenReaderSupport.onConfigurationChanged(e);
 		this._updateDomAttributes();
@@ -285,7 +292,9 @@ export class NativeEditContext extends AbstractEditContext {
 		this._decorations = this._context.viewModel.model.deltaDecorations(this._decorations, decorations);
 	}
 
-	private _updateSelectionAndControlBounds(ctx: RenderingContext) {
+	private _updateSelectionAndControlBounds(ctx: {
+		visibleRangeForPosition(position: Position): HorizontalPosition | null;
+	}) {
 		if (!this._parent) {
 			return;
 		}
@@ -315,8 +324,21 @@ export class NativeEditContext extends AbstractEditContext {
 		}
 
 		const selectionBounds = new DOMRect(left, top, width, height);
-		this._editContext.updateSelectionBounds(selectionBounds);
-		this._editContext.updateControlBounds(selectionBounds);
+		let adjustedTop: number = selectionBounds.top;
+		if (selectionBounds.top < parentBounds.top) {
+			adjustedTop = parentBounds.top;
+		} else if (selectionBounds.top > parentBounds.top + parentBounds.height) {
+			adjustedTop = parentBounds.top + parentBounds.height - selectionBounds.height;
+		}
+		let adjustedLeft: number = selectionBounds.left;
+		if (selectionBounds.left < parentBounds.left) {
+			adjustedLeft = parentBounds.left;
+		} else if (selectionBounds.left > parentBounds.left + parentBounds.width) {
+			adjustedLeft = parentBounds.left + parentBounds.width - selectionBounds.width;
+		}
+		const adjustedSelectionBounds = new DOMRect(adjustedLeft, adjustedTop, selectionBounds.width, selectionBounds.height);
+		this._editContext.updateSelectionBounds(adjustedSelectionBounds);
+		this._editContext.updateControlBounds(adjustedSelectionBounds);
 	}
 
 	private _updateCharacterBounds(e: CharacterBoundsUpdateEvent): void {

From 99443c079e5efea16be14c1773f5ac70c5c0c565 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Tue, 1 Oct 2024 12:33:57 +1000
Subject: [PATCH 0066/1815] Pure JSON stringify

---
 extensions/ipynb/.vscode/launch.json          | 43 ++++++++-
 extensions/ipynb/src/notebookSerializer.ts    |  5 +-
 .../ipynb/src/notebookSerializerWorker.ts     |  5 +-
 extensions/ipynb/src/serializers.ts           | 89 +++++++++++++++++++
 extensions/ipynb/src/test/serializers.test.ts | 74 ++++++++++++++-
 5 files changed, 208 insertions(+), 8 deletions(-)

diff --git a/extensions/ipynb/.vscode/launch.json b/extensions/ipynb/.vscode/launch.json
index 30130a429d58..eaf7cac3cbd6 100644
--- a/extensions/ipynb/.vscode/launch.json
+++ b/extensions/ipynb/.vscode/launch.json
@@ -14,6 +14,47 @@
             ],
             "request": "launch",
             "type": "extensionHost"
-        }
+        },
+		{
+            // Run this first: https://github.com/microsoft/vscode-jupyter/blob/main/src/test/datascience/setupTestEnvs.cmd
+            // Then specify either a grep below or mark a test as 'test.only' to run the test that's failing.
+            "name": "Tests",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/out/test/index.node.js"
+            ],
+            "env": {
+                "VSC_JUPYTER_FORCE_LOGGING": "1",
+                "VSC_JUPYTER_CI_TEST_GREP": "", // Leave as `VSCode Notebook` to run only Notebook tests.
+                "VSC_JUPYTER_CI_TEST_INVERT_GREP": "", // Initialize this to invert the grep (exclude tests with value defined in grep).
+                "CI_PYTHON_PATH": "", // Update with path to real python interpereter used for testing.
+                "VSC_JUPYTER_CI_RUN_NON_PYTHON_NB_TEST": "", // Initialize this to run tests again Julia & other kernels.
+                // "TF_BUILD": "", // Set to anything to force full logging
+                "TEST_FILES_SUFFIX": "*.vscode.test,*.vscode.common.test",
+                "VSC_JUPYTER_REMOTE_NATIVE_TEST": "false", // Change to `true` to run the Native Notebook tests with remote jupyter connections.
+                "VSC_JUPYTER_NON_RAW_NATIVE_TEST": "false", // Change to `true` to run the Native Notebook tests with non-raw kernels (i.e. local jupyter server).
+                "XVSC_JUPYTER_INSTRUMENT_CODE_FOR_COVERAGE": "1",
+                "XVSC_JUPYTER_INSTRUMENT_CODE_FOR_COVERAGE_HTML": "1", //Enable to get full coverage repor (in coverage folder).
+                "VSC_JUPYTER_EXPOSE_SVC": "1"
+                // "VSC_JUPYTER_CI_IS_CONDA": "true" // Enable to run conda tests
+            },
+            "sourceMaps": true,
+            "outFiles": [
+                "${workspaceFolder}/out/**/*.js",
+                "!${workspaceFolder}/**/node_modules**/*"
+            ],
+            "preLaunchTask": "Compile",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "presentation": {
+                "group": "2_tests",
+                "order": 6
+            }
+        },
+
     ]
 }
\ No newline at end of file
diff --git a/extensions/ipynb/src/notebookSerializer.ts b/extensions/ipynb/src/notebookSerializer.ts
index 898b4ff93628..bb788ef9ea81 100644
--- a/extensions/ipynb/src/notebookSerializer.ts
+++ b/extensions/ipynb/src/notebookSerializer.ts
@@ -8,7 +8,7 @@ import * as detectIndent from 'detect-indent';
 import * as vscode from 'vscode';
 import { getPreferredLanguage, jupyterNotebookModelToNotebookData } from './deserializers';
 import * as fnv from '@enonic/fnv-plus';
-import { serializeNotebookToString } from './serializers';
+import { serializeNotebookToBytes } from './serializers';
 
 export abstract class NotebookSerializerBase extends vscode.Disposable implements vscode.NotebookSerializer {
 	protected disposed: boolean = false;
@@ -81,8 +81,7 @@ export abstract class NotebookSerializerBase extends vscode.Disposable implement
 			return new Uint8Array(0);
 		}
 
-		const serialized = serializeNotebookToString(data);
-		return new TextEncoder().encode(serialized);
+		return serializeNotebookToBytes(data);
 	}
 
 }
diff --git a/extensions/ipynb/src/notebookSerializerWorker.ts b/extensions/ipynb/src/notebookSerializerWorker.ts
index 594af6da7916..6470132d1a7f 100644
--- a/extensions/ipynb/src/notebookSerializerWorker.ts
+++ b/extensions/ipynb/src/notebookSerializerWorker.ts
@@ -4,15 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { parentPort } from 'worker_threads';
-import { serializeNotebookToString } from './serializers';
+import { serializeNotebookToBytes } from './serializers';
 import type { NotebookData } from 'vscode';
 
 
 if (parentPort) {
 	parentPort.on('message', ({ id, data }: { id: string; data: NotebookData }) => {
 		if (parentPort) {
-			const json = serializeNotebookToString(data);
-			const bytes = new TextEncoder().encode(json);
+			const bytes = serializeNotebookToBytes(data);
 			parentPort.postMessage({ id, data: bytes });
 		}
 	});
diff --git a/extensions/ipynb/src/serializers.ts b/extensions/ipynb/src/serializers.ts
index 33de79f41a64..bbfd50e45f31 100644
--- a/extensions/ipynb/src/serializers.ts
+++ b/extensions/ipynb/src/serializers.ts
@@ -462,6 +462,95 @@ export function serializeNotebookToString(data: NotebookData): string {
 
 	return serializeNotebookToJSON(notebookContent, indentAmount);
 }
+
+export function serializeNotebookToBytes(data: NotebookData): Uint8Array {
+	const notebookContent = getNotebookMetadata(data);
+	// use the preferred language from document metadata or the first cell language as the notebook preferred cell language
+	const preferredCellLanguage = notebookContent.metadata?.language_info?.name ?? data.cells.find(cell => cell.kind === 2)?.languageId;
+
+	notebookContent.cells = data.cells
+		.map(cell => createJupyterCellFromNotebookCell(cell, preferredCellLanguage))
+		.map(pruneCell);
+
+	const indentAmount = data.metadata && 'indentAmount' in data.metadata && typeof data.metadata.indentAmount === 'string' ?
+		data.metadata.indentAmount :
+		' ';
+
+	return serializeNotebookToJSONBytes(notebookContent, indentAmount);
+}
+
+
+function serializeNotebookToJSONBytes(notebookContent: Partial<nbformat.INotebookContent>, indentAmount: string): Uint8Array {
+	// const sorted = sortObjectPropertiesRecursively(notebookContent);
+
+	// Using JSON.stringify can fail, if the entire size of the resulting JSON string exceeds the maximum size of a single string in JS.
+	// Hence build the JSON bytes in chunks.
+	return jsonToBytes(notebookContent, indentAmount);
+}
+
+function jsonToBytes(jsonObject: any, indentAmount: string = ' '): Uint8Array {
+	const encoder = new TextEncoder();
+	const arrays: Uint8Array[] = [];
+
+	function encodeValue(value: any, indent: string): void {
+		if (typeof value === 'object' && value !== null) {
+			if (Array.isArray(value)) {
+				arrays.push(encoder.encode('['));
+				if (value.length > 0) {
+					for (let i = 0; i < value.length; i++) {
+						if (i > 0) {
+							arrays.push(encoder.encode(','));
+						}
+						arrays.push(encoder.encode('\n' + indent + indentAmount));
+						encodeValue(value[i], indent + indentAmount);
+					}
+					arrays.push(encoder.encode('\n' + indent + ']'));
+				} else {
+					arrays.push(encoder.encode(']'));
+				}
+			} else {
+				arrays.push(encoder.encode('{'));
+				// // ipynb always sorts keys in alphabetical order.
+				const keys = Object.keys(value).sort();
+				if (keys.length > 0) {
+					for (let i = 0; i < keys.length; i++) {
+						if (i > 0) {
+							arrays.push(encoder.encode(','));
+						}
+						arrays.push(encoder.encode('\n' + indent + indentAmount + `"${keys[i]}": `));
+						encodeValue(value[keys[i]], indent + indentAmount);
+					}
+					arrays.push(encoder.encode('\n' + indent + '}'));
+				} else {
+					arrays.push(encoder.encode('}'));
+				}
+			}
+		} else if (typeof value === 'string') {
+			arrays.push(encoder.encode(`"${value}"`));
+		} else {
+			arrays.push(encoder.encode(String(value)));
+		}
+	}
+
+	encodeValue(jsonObject, '');
+	// ipynb always ends with a trailing new line (we add this so that SCMs do not show unnecessary changes, resulting from a missing trailing new line).
+	arrays.push(encoder.encode('\n'));
+
+	return concatenateUint8Arrays(arrays);
+}
+
+function concatenateUint8Arrays(arrays: Uint8Array[]): Uint8Array {
+	const totalLength = arrays.reduce((acc, arr) => acc + arr.length, 0);
+	const result = new Uint8Array(totalLength);
+	let offset = 0;
+	arrays.forEach(arr => {
+		result.set(arr, offset);
+		offset += arr.length;
+	});
+	return result;
+}
+
+
 function serializeNotebookToJSON(notebookContent: Partial<nbformat.INotebookContent>, indentAmount: string): string {
 	// ipynb always ends with a trailing new line (we add this so that SCMs do not show unnecessary changes, resulting from a missing trailing new line).
 	const sorted = sortObjectPropertiesRecursively(notebookContent);
diff --git a/extensions/ipynb/src/test/serializers.test.ts b/extensions/ipynb/src/test/serializers.test.ts
index cb461539c5d0..43737801fc5d 100644
--- a/extensions/ipynb/src/test/serializers.test.ts
+++ b/extensions/ipynb/src/test/serializers.test.ts
@@ -8,7 +8,7 @@ import type * as nbformat from '@jupyterlab/nbformat';
 import * as assert from 'assert';
 import * as vscode from 'vscode';
 import { jupyterCellOutputToCellOutput, jupyterNotebookModelToNotebookData } from '../deserializers';
-import { createMarkdownCellFromNotebookCell, getCellMetadata } from '../serializers';
+import { createMarkdownCellFromNotebookCell, getCellMetadata, serializeNotebookToBytes, serializeNotebookToString } from '../serializers';
 
 function deepStripProperties(obj: any, props: string[]) {
 	for (const prop in obj) {
@@ -124,6 +124,77 @@ suite(`ipynb serializer`, () => {
 		});
 	});
 
+
+	test.only('JSON serialization (empty notebook)', () => {
+		const cells: nbformat.ICell[] = [
+		];
+		const notebook = jupyterNotebookModelToNotebookData({ cells }, 'python');
+		assert.ok(notebook);
+
+		const jsonStr = serializeNotebookToString(notebook);
+		const bytes = serializeNotebookToBytes(notebook);
+
+		assert.strictEqual(jsonStr, new TextDecoder().decode(bytes));
+	});
+
+	test.only('JSON serialization (empty metadata with cells)', () => {
+		const cells: nbformat.ICell[] = [
+			{
+				cell_type: 'code',
+				execution_count: 10,
+				outputs: [],
+				source: 'print(1)',
+				metadata: {}
+			},
+			{
+				cell_type: 'markdown',
+				source: '# HEAD',
+				metadata: {}
+			}
+		];
+		const notebook = jupyterNotebookModelToNotebookData({ cells }, 'python');
+		assert.ok(notebook);
+
+		const jsonStr = serializeNotebookToString(notebook);
+		const bytes = serializeNotebookToBytes(notebook);
+
+		assert.strictEqual(jsonStr, new TextDecoder().decode(bytes));
+	});
+
+	test.only('JSON serialization (with metadata containing functions & cells)', () => {
+		const cells: nbformat.ICell[] = [
+			{
+				cell_type: 'code',
+				execution_count: 10,
+				outputs: [],
+				source: 'print(1)',
+				metadata: {
+					jupyter: {
+						outputs_hidden: true,
+						scrolled: false
+					},
+					custom: {
+						test: function () {
+							return 'Hello';
+						}
+					} as any
+				}
+			},
+			{
+				cell_type: 'markdown',
+				source: '# HEAD',
+				metadata: {}
+			}
+		];
+		const notebook = jupyterNotebookModelToNotebookData({ cells, metadata: { kernelspec: { display_name: 'foo', name: 'bar' }, language_info: { name: 'python', mimetype: 'xyz', file_extension: '.py' }, orig_nbformat: 4 } }, 'python');
+		assert.ok(notebook);
+
+		const jsonStr = serializeNotebookToString(notebook);
+		const bytes = serializeNotebookToBytes(notebook);
+
+		assert.strictEqual(jsonStr, new TextDecoder().decode(bytes));
+	});
+
 	suite('Outputs', () => {
 		function validateCellOutputTranslation(
 			outputs: nbformat.IOutput[],
@@ -706,4 +777,5 @@ suite(`ipynb serializer`, () => {
 			});
 		});
 	});
+
 });

From 33a4303081c447e8a23ce5487191dd7e396fe427 Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Tue, 1 Oct 2024 19:27:39 +0200
Subject: [PATCH 0067/1815] import

---
 .../workbench/contrib/terminal/common/terminalConfiguration.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index 364223839731..c952d182d8a2 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Codicon } from '../../../../base/common/codicons.js';
+import { IJSONSchemaSnippet } from '../../../../base/common/jsonSchema.js';
 import { isMacintosh, isWindows } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.js';
 import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
@@ -13,7 +14,6 @@ import { terminalColorSchema, terminalIconSchema } from '../../../../platform/te
 import { ConfigurationKeyValuePairs, IConfigurationMigrationRegistry, Extensions as WorkbenchExtensions } from '../../../common/configuration.js';
 import { terminalContribConfiguration } from '../terminalContribExports.js';
 import { DEFAULT_COMMANDS_TO_SKIP_SHELL, DEFAULT_LETTER_SPACING, DEFAULT_LINE_HEIGHT, MAXIMUM_FONT_WEIGHT, MINIMUM_FONT_WEIGHT, SUGGESTIONS_FONT_WEIGHT } from './terminal.js';
-import type { IJSONSchemaSnippet } from 'vs/base/common/jsonSchema';
 
 const terminalDescriptors = '\n- ' + [
 	'`\${cwd}`: ' + localize("cwd", "the terminal's current working directory"),

From cb1c6e5cf914963a41d1255578e9cfc11aa9f25b Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Tue, 1 Oct 2024 19:29:47 +0200
Subject: [PATCH 0068/1815] fix import

---
 src/vs/workbench/browser/parts/editor/editor.contribution.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
index ed56c364950d..093b62cf6ecc 100644
--- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts
+++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts
@@ -72,8 +72,8 @@ import { DynamicEditorConfigurations } from './editorConfiguration.js';
 import { ConfigureEditorAction, ConfigureEditorTabsAction, EditorActionsDefaultAction, EditorActionsTitleBarAction, HideEditorActionsAction, HideEditorTabsAction, ShowMultipleEditorTabsAction, ShowSingleEditorTabAction, ZenHideEditorTabsAction, ZenShowMultipleEditorTabsAction, ZenShowSingleEditorTabAction } from '../../actions/layoutActions.js';
 import { ICommandAction } from '../../../../platform/action/common/action.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
-import { getFontSnippets } from 'vs/base/browser/fonts';
-import { registerEditorFontConfigurations } from 'vs/editor/common/config/editorConfigurationSchema';
+import { getFontSnippets } from '../../../../base/browser/fonts.js';
+import { registerEditorFontConfigurations } from '../../../../editor/common/config/editorConfigurationSchema.js';
 
 //#region Editor Registrations
 

From 4ece47b15ff6eec9c805eb464efb529fc4db61ab Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Tue, 1 Oct 2024 21:27:37 +0200
Subject: [PATCH 0069/1815] fix

---
 .../workbench/contrib/terminal/browser/terminal.contribution.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
index 9fff11fea70b..11de3b334756 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getFontSnippets } from 'vs/base/browser/fonts';
+import { getFontSnippets } from '../../../../base/browser/fonts.js';
 import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { isIOS, isWindows } from '../../../../base/common/platform.js';

From 7d38ea63ee2d9c8f38ff5bf0127e243bcf20ac00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Wed, 6 Nov 2024 17:30:50 +0100
Subject: [PATCH 0070/1815] try hoisting up credentials

---
 build/azure-pipelines/common/publish.ts | 48 ++++++++++++++-----------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/build/azure-pipelines/common/publish.ts b/build/azure-pipelines/common/publish.ts
index 9774759cdbae..c76c60db6657 100644
--- a/build/azure-pipelines/common/publish.ts
+++ b/build/azure-pipelines/common/publish.ts
@@ -15,7 +15,7 @@ import { CosmosClient } from '@azure/cosmos';
 import { ClientSecretCredential, ClientAssertionCredential } from '@azure/identity';
 import * as cp from 'child_process';
 import * as os from 'os';
-import { Worker, isMainThread, workerData } from 'node:worker_threads';
+import { Worker, isMainThread, parentPort, workerData } from 'node:worker_threads';
 
 function e(name: string): string {
 	const result = process.env[name];
@@ -27,6 +27,9 @@ function e(name: string): string {
 	return result;
 }
 
+const quality = e('VSCODE_QUALITY');
+const commit = e('BUILD_SOURCEVERSION');
+
 class Temp {
 	private _files: string[] = [];
 
@@ -636,7 +639,7 @@ function getRealType(type: string) {
 	}
 }
 
-async function processArtifact(artifact: Artifact, artifactFilePath: string): Promise<void> {
+async function processArtifact(artifact: Artifact, artifactFilePath: string): Promise<Asset> {
 	const log = (...args: any[]) => console.log(`[${artifact.name}]`, ...args);
 	const match = /^vscode_(?<product>[^_]+)_(?<os>[^_]+)(?:_legacy)?_(?<arch>[^_]+)_(?<unprocessedType>[^_]+)$/.exec(artifact.name);
 
@@ -645,8 +648,6 @@ async function processArtifact(artifact: Artifact, artifactFilePath: string): Pr
 	}
 
 	// getPlatform needs the unprocessedType
-	const quality = e('VSCODE_QUALITY');
-	const commit = e('BUILD_SOURCEVERSION');
 	const { product, os, arch, unprocessedType } = match.groups!;
 	const isLegacy = artifact.name.includes('_legacy');
 	const platform = getPlatform(product, os, arch, unprocessedType, isLegacy);
@@ -669,18 +670,7 @@ async function processArtifact(artifact: Artifact, artifactFilePath: string): Pr
 		artifactFilePath
 	);
 
-	const asset: Asset = { platform, type, url, hash, sha256hash, size, supportsFastUpdate: true };
-	log('Creating asset...', JSON.stringify(asset, undefined, 2));
-
-	await retry(async (attempt) => {
-		log(`Creating asset in Cosmos DB (attempt ${attempt})...`);
-		const aadCredentials = new ClientAssertionCredential(process.env['AZURE_TENANT_ID']!, process.env['AZURE_CLIENT_ID']!, () => Promise.resolve(process.env['AZURE_ID_TOKEN']!));
-		const client = new CosmosClient({ endpoint: e('AZURE_DOCUMENTDB_ENDPOINT'), aadCredentials });
-		const scripts = client.database('builds').container(quality).scripts;
-		await scripts.storedProcedure('createAsset').execute('', [commit, asset, true]);
-	});
-
-	log('Asset successfully created');
+	return { platform, type, url, hash, sha256hash, size, supportsFastUpdate: true };
 }
 
 // It is VERY important that we don't download artifacts too much too fast from AZDO.
@@ -692,7 +682,8 @@ async function processArtifact(artifact: Artifact, artifactFilePath: string): Pr
 async function main() {
 	if (!isMainThread) {
 		const { artifact, artifactFilePath } = workerData;
-		await processArtifact(artifact, artifactFilePath);
+		const asset = await processArtifact(artifact, artifactFilePath);
+		parentPort!.postMessage(asset);
 		return;
 	}
 
@@ -713,6 +704,8 @@ async function main() {
 
 	let resultPromise = Promise.resolve<PromiseSettledResult<void>[]>([]);
 	const operations: { name: string; operation: Promise<void> }[] = [];
+	const aadCredentials = new ClientAssertionCredential(process.env['AZURE_TENANT_ID']!, process.env['AZURE_CLIENT_ID']!, () => Promise.resolve(process.env['AZURE_ID_TOKEN']!));
+	const client = new CosmosClient({ endpoint: e('AZURE_DOCUMENTDB_ENDPOINT'), aadCredentials });
 
 	while (true) {
 		const [timeline, artifacts] = await Promise.all([retry(() => getPipelineTimeline()), retry(() => getPipelineArtifacts())]);
@@ -754,12 +747,27 @@ async function main() {
 
 			processing.add(artifact.name);
 			const promise = new Promise<void>((resolve, reject) => {
+				const log = (...args: any[]) => console.log(`[${artifact.name}]`, ...args);
 				const worker = new Worker(__filename, { workerData: { artifact, artifactFilePath } });
 				worker.on('error', reject);
-				worker.on('exit', code => {
-					if (code === 0) {
+				worker.once('message', async (asset: Asset) => {
+					try {
+						log('Creating asset...', JSON.stringify(asset, undefined, 2));
+
+						await retry(async (attempt) => {
+							log(`Creating asset in Cosmos DB (attempt ${attempt})...`);
+							const scripts = client.database('builds').container(quality).scripts;
+							await scripts.storedProcedure('createAsset').execute('', [commit, asset, true]);
+						});
+
+						log('Asset successfully created');
 						resolve();
-					} else {
+					} catch (err) {
+						reject(err);
+					}
+				});
+				worker.on('exit', code => {
+					if (code !== 0) {
 						reject(new Error(`[${artifact.name}] Worker stopped with exit code ${code}`));
 					}
 				});

From b5aca3563d29871755a3174bd98a6f6aad947893 Mon Sep 17 00:00:00 2001
From: Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com>
Date: Fri, 15 Nov 2024 09:16:18 -0800
Subject: [PATCH 0071/1815] Include .js/.ts in module specifiers in the VS Code
 workspace

Fixes https://github.com/microsoft/TypeScript/issues/60451
---
 .vscode/settings.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 29f501a1de83..3e87335673f0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -76,6 +76,7 @@
 	"npm.exclude": "**/extensions/**",
 	"emmet.excludeLanguages": [],
 	"typescript.preferences.importModuleSpecifier": "relative",
+	"typescript.preferences.importModuleSpecifierEnding": "js",
 	"typescript.preferences.quoteStyle": "single",
 	"json.schemas": [
 		{

From 82f65a4e45439b45b8f72b669b69ed1a7c6aba20 Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Thu, 28 Nov 2024 18:49:02 +0100
Subject: [PATCH 0072/1815] fix merge

---
 src/vs/code/electron-main/app.ts | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 654f78b80e98..cc7d8dbe4d93 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -169,42 +169,25 @@ export class CodeApplication extends Disposable {
 			'clipboard-sanitized-write',
 		]);
 
-<<<<<<< HEAD
-		const allowedPermissionsDefault = new Set(['font-access', 'local-fonts']);
-=======
 		const allowedPermissionsInCore = new Set([
 			'media',
+			'font-access',
 			'local-fonts',
 		]);
->>>>>>> origin/main
 
 		session.defaultSession.setPermissionRequestHandler((_webContents, permission, callback, details) => {
 			if (isUrlFromWebview(details.requestingUrl)) {
 				return callback(allowedPermissionsInWebview.has(permission));
 			}
-<<<<<<< HEAD
-			return callback(allowedPermissionsDefault.has(permission));
-=======
-			if (isUrlFromWindow(details.requestingUrl)) {
-				return callback(allowedPermissionsInCore.has(permission));
-			}
-			return callback(false);
->>>>>>> origin/main
+			return callback(allowedPermissionsInCore.has(permission));
 		});
 
 		session.defaultSession.setPermissionCheckHandler((_webContents, permission, _origin, details) => {
 			if (isUrlFromWebview(details.requestingUrl)) {
 				return allowedPermissionsInWebview.has(permission);
 			}
-<<<<<<< HEAD
 
-			return allowedPermissionsDefault.has(permission);
-=======
-			if (isUrlFromWindow(details.requestingUrl)) {
-				return allowedPermissionsInCore.has(permission);
-			}
-			return false;
->>>>>>> origin/main
+			return allowedPermissionsInCore.has(permission);
 		});
 
 		//#endregion

From 33f54f7a5589a2337233b852a5d53d63c046c6b6 Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Thu, 28 Nov 2024 18:52:13 +0100
Subject: [PATCH 0073/1815] undo change

---
 src/vs/code/electron-main/app.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index cc7d8dbe4d93..e5e04509abf5 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -179,7 +179,10 @@ export class CodeApplication extends Disposable {
 			if (isUrlFromWebview(details.requestingUrl)) {
 				return callback(allowedPermissionsInWebview.has(permission));
 			}
-			return callback(allowedPermissionsInCore.has(permission));
+			if (isUrlFromWindow(details.requestingUrl)) {
+				return callback(allowedPermissionsInCore.has(permission));
+			}
+			return callback(false);
 		});
 
 		session.defaultSession.setPermissionCheckHandler((_webContents, permission, _origin, details) => {
@@ -187,7 +190,10 @@ export class CodeApplication extends Disposable {
 				return allowedPermissionsInWebview.has(permission);
 			}
 
-			return allowedPermissionsInCore.has(permission);
+			if (isUrlFromWindow(details.requestingUrl)) {
+				return allowedPermissionsInCore.has(permission);
+			}
+			return false;
 		});
 
 		//#endregion

From cef3c934a4ab42a17726215448cb94730f7773c1 Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Thu, 28 Nov 2024 18:54:57 +0100
Subject: [PATCH 0074/1815] whitespace

---
 src/vs/code/electron-main/app.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index e5e04509abf5..d377b43f2a21 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -189,7 +189,6 @@ export class CodeApplication extends Disposable {
 			if (isUrlFromWebview(details.requestingUrl)) {
 				return allowedPermissionsInWebview.has(permission);
 			}
-
 			if (isUrlFromWindow(details.requestingUrl)) {
 				return allowedPermissionsInCore.has(permission);
 			}

From 3ea02e359408dfa3982a09dc970f19f440f79773 Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Thu, 28 Nov 2024 20:26:41 +0100
Subject: [PATCH 0075/1815] fix imports

---
 src/vs/base/browser/fonts.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/browser/fonts.ts b/src/vs/base/browser/fonts.ts
index 1926a9b50841..33f6a7af7b3b 100644
--- a/src/vs/base/browser/fonts.ts
+++ b/src/vs/base/browser/fonts.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { mainWindow } from 'vs/base/browser/window';
-import type { IJSONSchemaSnippet } from 'vs/base/common/jsonSchema.js';
+import { mainWindow } from './window.js';
+import type { IJSONSchemaSnippet } from '../common/jsonSchema.js';
 import { isElectron, isMacintosh, isWindows } from '../common/platform.js';
 
 /**

From d76d5b994d63596cc67295eb8630950ee0f66333 Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Thu, 28 Nov 2024 22:43:51 +0100
Subject: [PATCH 0076/1815] fix import

---
 src/vs/editor/common/config/editorConfigurationSchema.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/common/config/editorConfigurationSchema.ts b/src/vs/editor/common/config/editorConfigurationSchema.ts
index 6242cf038919..b24a9ded749e 100644
--- a/src/vs/editor/common/config/editorConfigurationSchema.ts
+++ b/src/vs/editor/common/config/editorConfigurationSchema.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { IJSONSchemaSnippet } from 'vs/base/common/jsonSchema';
+import type { IJSONSchemaSnippet } from '../../../base/common/jsonSchema.js';
 import { diffEditorDefaultOptions } from './diffEditor.js';
 import { editorOptionsRegistry } from './editorOptions.js';
 import { EDITOR_MODEL_DEFAULTS } from '../core/textModelDefaults.js';

From 904da3e973fb63dca6482c28a8f2ed91dfa15c13 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Tue, 10 Dec 2024 15:55:20 +0100
Subject: [PATCH 0077/1815] transitioning to a more modern color format

---
 src/vs/base/common/color.ts                   | 14 ++++-------
 .../defaultDocumentColorsComputer.ts          | 24 +++++++------------
 .../browser/defaultDocumentColorProvider.ts   |  2 +-
 3 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/src/vs/base/common/color.ts b/src/vs/base/common/color.ts
index 8b1a68294a50..4d199ae782ec 100644
--- a/src/vs/base/common/color.ts
+++ b/src/vs/base/common/color.ts
@@ -585,15 +585,11 @@ export namespace Color {
 		export namespace CSS {
 
 			export function formatRGB(color: Color): string {
-				if (color.rgba.a === 1) {
-					return `rgb(${color.rgba.r}, ${color.rgba.g}, ${color.rgba.b})`;
+				const alpha = color.rgba.a;
+				if (alpha === 1) {
+					return `rgb(${color.rgba.r} ${color.rgba.g} ${color.rgba.b})`;
 				}
-
-				return Color.Format.CSS.formatRGBA(color);
-			}
-
-			export function formatRGBA(color: Color): string {
-				return `rgba(${color.rgba.r}, ${color.rgba.g}, ${color.rgba.b}, ${+(color.rgba.a).toFixed(2)})`;
+				return `rgb(${color.rgba.r} ${color.rgba.g} ${color.rgba.b} / ${+(alpha).toFixed(2)})`;
 			}
 
 			export function formatHSL(color: Color): string {
@@ -640,7 +636,7 @@ export namespace Color {
 					return Color.Format.CSS.formatHex(color);
 				}
 
-				return Color.Format.CSS.formatRGBA(color);
+				return Color.Format.CSS.formatRGB(color);
 			}
 
 			/**
diff --git a/src/vs/editor/common/languages/defaultDocumentColorsComputer.ts b/src/vs/editor/common/languages/defaultDocumentColorsComputer.ts
index 74bb07579052..a2d59d587261 100644
--- a/src/vs/editor/common/languages/defaultDocumentColorsComputer.ts
+++ b/src/vs/editor/common/languages/defaultDocumentColorsComputer.ts
@@ -63,7 +63,7 @@ function _findHexColorInformation(range: IRange | undefined, hexValue: string) {
 	};
 }
 
-function _findRGBColorInformation(range: IRange | undefined, matches: RegExpMatchArray[], isAlpha: boolean) {
+function _findRGBColorInformation(range: IRange | undefined, matches: RegExpMatchArray[]) {
 	if (!range || matches.length !== 1) {
 		return;
 	}
@@ -72,18 +72,18 @@ function _findRGBColorInformation(range: IRange | undefined, matches: RegExpMatc
 	const parsedRegex = _parseCaptureGroups(captureGroups);
 	return {
 		range: range,
-		color: _toIColor(parsedRegex[0], parsedRegex[1], parsedRegex[2], isAlpha ? parsedRegex[3] : 1)
+		color: _toIColor(parsedRegex[0], parsedRegex[1], parsedRegex[2], parsedRegex[3] !== undefined ? parsedRegex[3] : 1)
 	};
 }
 
-function _findHSLColorInformation(range: IRange | undefined, matches: RegExpMatchArray[], isAlpha: boolean) {
+function _findHSLColorInformation(range: IRange | undefined, matches: RegExpMatchArray[]) {
 	if (!range || matches.length !== 1) {
 		return;
 	}
 	const match = matches[0]!;
 	const captureGroups = match.values();
 	const parsedRegex = _parseCaptureGroups(captureGroups);
-	const colorEquivalent = new Color(new HSLA(parsedRegex[0], parsedRegex[1] / 100, parsedRegex[2] / 100, isAlpha ? parsedRegex[3] : 1));
+	const colorEquivalent = new Color(new HSLA(parsedRegex[0], parsedRegex[1] / 100, parsedRegex[2] / 100, parsedRegex[3] !== undefined ? parsedRegex[3] : 1));
 	return {
 		range: range,
 		color: _toIColor(colorEquivalent.rgba.r, colorEquivalent.rgba.g, colorEquivalent.rgba.b, colorEquivalent.rgba.a)
@@ -101,7 +101,7 @@ 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,.\%]*\))|\s+(#)([A-Fa-f0-9]{6})\b|\s+(#)([A-Fa-f0-9]{8})\b|^(#)([A-Fa-f0-9]{6})\b|^(#)([A-Fa-f0-9]{8})\b/gm;
+	const initialValidationRegex = /\b(rgb|hsl)(\([0-9\s.\/\%]*\))|\s+(#)([A-Fa-f0-9]{6})\b|\s+(#)([A-Fa-f0-9]{8})\b|^(#)([A-Fa-f0-9]{6})\b|^(#)([A-Fa-f0-9]{8})\b/gm;
 	const initialValidationMatches = _findMatches(model, initialValidationRegex);
 
 	// Potential colors have been found, validate the parameters
@@ -115,17 +115,11 @@ 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;
-				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;
-				colorInformation = _findRGBColorInformation(_findRange(model, initialMatch), _findMatches(colorParameters, regexParameters), true);
+				const regexParameters = /^\(\s*(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])\s+(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])\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;
+				colorInformation = _findRGBColorInformation(_findRange(model, initialMatch), _findMatches(colorParameters, regexParameters));
 			} else if (colorScheme === 'hsl') {
-				const regexParameters = /^\(\s*(36[0]|3[0-5][0-9]|[12][0-9][0-9]|[1-9]?[0-9])\s*,\s*(100|\d{1,2}[.]\d*|\d{1,2})%\s*,\s*(100|\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*(36[0]|3[0-5][0-9]|[12][0-9][0-9]|[1-9]?[0-9])\s*,\s*(100|\d{1,2}[.]\d*|\d{1,2})%\s*,\s*(100|\d{1,2}[.]\d*|\d{1,2})%\s*,\s*(0[.][0-9]+|[.][0-9]+|[01][.]|[01])\s*\)$/gm;
-				colorInformation = _findHSLColorInformation(_findRange(model, initialMatch), _findMatches(colorParameters, regexParameters), true);
+				const regexParameters = /^\(\s*(36[0]|3[0-5][0-9]|[12][0-9][0-9]|[1-9]?[0-9])\s+(100|\d{1,2}[.]\d*|\d{1,2})%\s+(100|\d{1,2}[.]\d*|\d{1,2})%\s+(\s*\/\s*0[.][0-9]+|[.][0-9]+|[01][.]|[01])?\s*\)$/gm;
+				colorInformation = _findHSLColorInformation(_findRange(model, initialMatch), _findMatches(colorParameters, regexParameters));
 			} else if (colorScheme === '#') {
 				colorInformation = _findHexColorInformation(_findRange(model, initialMatch), colorScheme + colorParameters);
 			}
diff --git a/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.ts b/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.ts
index 63a231f23ea8..34fc72162b24 100644
--- a/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.ts
@@ -27,7 +27,7 @@ export class DefaultDocumentColorProvider implements DocumentColorProvider {
 		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 rgb = alpha ? Color.Format.CSS.formatRGB(color) : Color.Format.CSS.formatRGBA(color);
+		const rgb = Color.Format.CSS.formatRGB(color);
 		const hsl = alpha ? Color.Format.CSS.formatHSL(color) : Color.Format.CSS.formatHSLA(color);
 		const hex = alpha ? Color.Format.CSS.formatHex(color) : Color.Format.CSS.formatHexA(color);
 

From a966862396caee13e2ba8033ba5f8a8ac00e54de Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Fri, 13 Dec 2024 12:54:18 +0100
Subject: [PATCH 0078/1815] fixing incorrect hover

---
 .../hover/browser/contentHoverWidget.ts       | 45 ++++++++++++++-----
 src/vs/editor/contrib/hover/browser/hover.css |  4 +-
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts b/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
index 063e4d108fec..a23516299259 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
@@ -110,16 +110,19 @@ export class ContentHoverWidget extends ResizableContentWidget {
 
 	private _setContentsDomNodeDimensions(width: number | string, height: number | string): void {
 		const contentsDomNode = this._hover.contentsDomNode;
+		console.log('contentsDomNode : ', contentsDomNode);
 		return ContentHoverWidget._applyDimensions(contentsDomNode, width, height);
 	}
 
 	private _setContainerDomNodeDimensions(width: number | string, height: number | string): void {
 		const containerDomNode = this._hover.containerDomNode;
+		console.log('containerDomNode : ', containerDomNode);
 		return ContentHoverWidget._applyDimensions(containerDomNode, width, height);
 	}
 
 	private _setScrollableElementDimensions(width: number | string, height: number | string): void {
 		const scrollbarDomElement = this._hover.scrollbar.getDomNode();
+		console.log('scrollbarDomElement : ', scrollbarDomElement);
 		return ContentHoverWidget._applyDimensions(scrollbarDomElement, width, height);
 	}
 
@@ -139,16 +142,14 @@ export class ContentHoverWidget extends ResizableContentWidget {
 
 	private _setHoverWidgetMaxDimensions(width: number | string, height: number | string): void {
 		ContentHoverWidget._applyMaxDimensions(this._hover.contentsDomNode, width, height);
+		ContentHoverWidget._applyMaxDimensions(this._hover.scrollbar.getDomNode(), width, height);
 		ContentHoverWidget._applyMaxDimensions(this._hover.containerDomNode, width, height);
-		this._hover.containerDomNode.style.setProperty('--vscode-hover-maxWidth', typeof width === 'number' ? `${width}px` : width);
 		this._layoutContentWidget();
 	}
 
 	private _setAdjustedHoverWidgetDimensions(size: dom.Dimension): void {
 		this._setHoverWidgetMaxDimensions('none', 'none');
-		const width = size.width;
-		const height = size.height;
-		this._setHoverWidgetDimensions(width, height);
+		this._setHoverWidgetDimensions(size.width, size.height);
 	}
 
 	private _updateResizableNodeMaxDimensions(): void {
@@ -285,9 +286,7 @@ export class ContentHoverWidget extends ResizableContentWidget {
 
 	private _updateContent(node: DocumentFragment): void {
 		const contentsDomNode = this._hover.contentsDomNode;
-		contentsDomNode.style.paddingBottom = '';
-		contentsDomNode.textContent = '';
-		contentsDomNode.appendChild(node);
+		contentsDomNode.replaceChildren(node);
 	}
 
 	private _layoutContentWidget(): void {
@@ -305,7 +304,6 @@ export class ContentHoverWidget extends ResizableContentWidget {
 		this._setRenderedHover(renderedHover);
 		this._updateFont();
 		this._updateContent(renderedHover.domNode);
-		this._updateMaxDimensions();
 		this.onContentsChanged();
 		// Simply force a synchronous render on the editor
 		// such that the widget does not really render with left = '0px'
@@ -368,10 +366,19 @@ export class ContentHoverWidget extends ResizableContentWidget {
 	}
 
 	private _removeConstraintsRenderNormally(): void {
+		console.log('_removeConstraintsRenderNormally');
 		// Added because otherwise the initial size of the hover content is smaller than should be
 		const layoutInfo = this._editor.getLayoutInfo();
 		this._resizableNode.layout(layoutInfo.height, layoutInfo.width);
 		this._setHoverWidgetDimensions('auto', 'auto');
+
+		console.log('ContentHoverWidget._lastDimensions : ', ContentHoverWidget._lastDimensions);
+		const height = Math.max(this._editor.getLayoutInfo().height / 4, 250, ContentHoverWidget._lastDimensions.height);
+		const width = Math.max(this._editor.getLayoutInfo().width * 0.66, 750, ContentHoverWidget._lastDimensions.width);
+		console.log('max width : ', width);
+		console.log('max height : ', height);
+		this._resizableNode.maxSize = new dom.Dimension(width, height);
+		this._setHoverWidgetMaxDimensions(width, height);
 	}
 
 	public setMinimumDimensions(dimensions: dom.Dimension): void {
@@ -394,20 +401,36 @@ export class ContentHoverWidget extends ResizableContentWidget {
 	}
 
 	public onContentsChanged(opts: IContentsChangeOptions = { allowPositionPreferenceRecomputation: true }): void {
-		this._removeConstraintsRenderNormally();
+		console.log('onContentsChanged');
+
 		const contentsDomNode = this._hover.contentsDomNode;
 
 		let height = dom.getTotalHeight(contentsDomNode);
-		let width = dom.getTotalWidth(contentsDomNode) + 2;
+		let width = dom.getTotalWidth(contentsDomNode);
+		console.log('height : ', height);
+		console.log('width : ', width);
+
+		this._removeConstraintsRenderNormally();
+
+		height = dom.getTotalHeight(contentsDomNode);
+		width = dom.getTotalWidth(contentsDomNode);
+		console.log('height : ', height);
+		console.log('width : ', width);
+
 		this._resizableNode.layout(height, width);
 
 		this._setHoverWidgetDimensions(width, height);
 
 		height = dom.getTotalHeight(contentsDomNode);
 		width = dom.getTotalWidth(contentsDomNode);
+		console.log('height : ', height);
+		console.log('width : ', width);
+
 		this._contentWidth = width;
-		this._updateMinimumWidth();
 		this._resizableNode.layout(height, width);
+		this._setHoverWidgetDimensions(width, height);
+
+		this._updateMinimumWidth();
 		this._updateResizableNodeMaxDimensions();
 
 		if (opts.allowPositionPreferenceRecomputation && this._renderedHover?.showAtPosition) {
diff --git a/src/vs/editor/contrib/hover/browser/hover.css b/src/vs/editor/contrib/hover/browser/hover.css
index b9da587c9184..b1346f9764f3 100644
--- a/src/vs/editor/contrib/hover/browser/hover.css
+++ b/src/vs/editor/contrib/hover/browser/hover.css
@@ -31,7 +31,7 @@
 }
 
 .monaco-editor .monaco-hover .hover-row .hover-row-contents {
-	min-width:0;
+	min-width: 0;
 	display: flex;
 	flex-direction: column;
 }
@@ -65,5 +65,3 @@
 .monaco-editor .monaco-hover code {
 	background-color: var(--vscode-textCodeBlock-background);
 }
-
-

From 86ac7d1154717865aec7b87d86c22fce047e6b1a Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Wed, 18 Dec 2024 12:01:58 +0100
Subject: [PATCH 0079/1815] Test commit

---
 src/vs/workbench/browser/parts/views/treeView.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts
index 3384ee711fa1..9734a53c4366 100644
--- a/src/vs/workbench/browser/parts/views/treeView.ts
+++ b/src/vs/workbench/browser/parts/views/treeView.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+
 import { DataTransfers, IDragAndDropData } from '../../../../base/browser/dnd.js';
 import * as DOM from '../../../../base/browser/dom.js';
 import * as cssJs from '../../../../base/browser/cssValue.js';

From eb3b58cbdf14015a19c2b53516dffb50f06a2e00 Mon Sep 17 00:00:00 2001
From: BeniBenj <besimmonds@microsoft.com>
Date: Thu, 19 Dec 2024 17:45:44 +0100
Subject: [PATCH 0080/1815] closes #232780

---
 .../browser/actions/layoutActions.ts          | 17 +-------
 .../browser/parts/titlebar/titlebarActions.ts | 41 ++++++++++++++++++-
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/src/vs/workbench/browser/actions/layoutActions.ts b/src/vs/workbench/browser/actions/layoutActions.ts
index 75253e235de8..cdd04eab0358 100644
--- a/src/vs/workbench/browser/actions/layoutActions.ts
+++ b/src/vs/workbench/browser/actions/layoutActions.ts
@@ -22,7 +22,7 @@ import { IPaneCompositePartService } from '../../services/panecomposite/browser/
 import { ToggleAuxiliaryBarAction } from '../parts/auxiliarybar/auxiliaryBarActions.js';
 import { TogglePanelAction } from '../parts/panel/panelActions.js';
 import { ICommandService } from '../../../platform/commands/common/commands.js';
-import { AuxiliaryBarVisibleContext, PanelAlignmentContext, PanelVisibleContext, SideBarVisibleContext, FocusedViewContext, InEditorZenModeContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, IsMainWindowFullscreenContext, PanelPositionContext, IsAuxiliaryWindowFocusedContext, TitleBarStyleContext } from '../../common/contextkeys.js';
+import { AuxiliaryBarVisibleContext, PanelAlignmentContext, PanelVisibleContext, SideBarVisibleContext, FocusedViewContext, InEditorZenModeContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, IsMainWindowFullscreenContext, PanelPositionContext, IsAuxiliaryWindowFocusedContext } from '../../common/contextkeys.js';
 import { Codicon } from '../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import { DisposableStore } from '../../../base/common/lifecycle.js';
@@ -30,7 +30,6 @@ import { registerIcon } from '../../../platform/theme/common/iconRegistry.js';
 import { ICommandActionTitle } from '../../../platform/action/common/action.js';
 import { mainWindow } from '../../../base/browser/window.js';
 import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
-import { TitlebarStyle } from '../../../platform/window/common/window.js';
 import { IPreferencesService } from '../../services/preferences/common/preferences.js';
 
 // Register Icons
@@ -798,20 +797,6 @@ if (isWindows || isLinux || isWeb) {
 			return accessor.get(IWorkbenchLayoutService).toggleMenuBar();
 		}
 	});
-
-	// Add separately to title bar context menu so we can use a different title
-	for (const menuId of [MenuId.TitleBarContext, MenuId.TitleBarTitleContext]) {
-		MenuRegistry.appendMenuItem(menuId, {
-			command: {
-				id: 'workbench.action.toggleMenuBar',
-				title: localize('miMenuBarNoMnemonic', "Menu Bar"),
-				toggled: ContextKeyExpr.and(IsMacNativeContext.toNegated(), ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'hidden'), ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'toggle'), ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'compact'))
-			},
-			when: ContextKeyExpr.and(IsAuxiliaryWindowFocusedContext.toNegated(), ContextKeyExpr.notEquals(TitleBarStyleContext.key, TitlebarStyle.NATIVE), IsMainWindowFullscreenContext.negate()),
-			group: '2_config',
-			order: 0
-		});
-	}
 }
 
 // --- Reset View Locations
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts b/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
index f84bf3f06b73..7eba94561f09 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
@@ -8,13 +8,15 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { LayoutSettings } from '../../../services/layout/browser/layoutService.js';
-import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { ACCOUNTS_ACTIVITY_ID, GLOBAL_ACTIVITY_ID } from '../../../common/activity.js';
 import { IAction } from '../../../../base/common/actions.js';
 import { IsAuxiliaryWindowFocusedContext, IsMainWindowFullscreenContext, TitleBarStyleContext, TitleBarVisibleContext } from '../../../common/contextkeys.js';
 import { CustomTitleBarVisibility, TitleBarSetting, TitlebarStyle } from '../../../../platform/window/common/window.js';
 import { isLinux, isNative } from '../../../../base/common/platform.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { IsMacNativeContext } from '../../../../platform/contextkey/common/contextkeys.js';
 
 // --- Context Menu Actions --- //
 
@@ -279,6 +281,43 @@ if (isLinux && isNative) {
 	});
 }
 
+for (const menuId of [MenuId.TitleBarContext, MenuId.TitleBarTitleContext]) {
+	MenuRegistry.appendMenuItem(menuId, {
+		command: {
+			id: 'workbench.action.toggleMenuBar',
+			title: localize('miMenuBarNoMnemonic', "Menu Bar"),
+			toggled: ContextKeyExpr.and(IsMacNativeContext.toNegated(), ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'hidden'), ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'toggle'), ContextKeyExpr.notEquals('config.window.menuBarVisibility', 'compact'))
+		},
+		when: ContextKeyExpr.and(IsAuxiliaryWindowFocusedContext.toNegated(), ContextKeyExpr.notEquals(TitleBarStyleContext.key, TitlebarStyle.NATIVE), IsMainWindowFullscreenContext.negate()),
+		group: '2_config',
+		order: 0
+	});
+}
+
+registerAction2(class extends Action2 {
+
+	constructor() {
+		super({
+			id: 'workbench.action.toggleMenuBarInFullScreen',
+			title: localize2('menuBar', "Menu Bar"),
+			category: Categories.View,
+			toggled: ContextKeyExpr.equals('config.window.menuBarVisibility', 'visible'),
+			menu: [{
+				id: MenuId.TitleBarContext,
+				group: '2_config',
+				order: 0,
+				when: ContextKeyExpr.and(IsAuxiliaryWindowFocusedContext.toNegated(), ContextKeyExpr.notEquals(TitleBarStyleContext.key, TitlebarStyle.NATIVE), IsMainWindowFullscreenContext, IsMacNativeContext.negate()),
+			}]
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const configurationService = accessor.get(IConfigurationService);
+		const isVisible = configurationService.getValue('window.menuBarVisibility') === 'visible';
+		configurationService.updateValue('window.menuBarVisibility', isVisible ? 'classic' : 'visible');
+	}
+});
+
 // --- Toolbar actions --- //
 
 export const ACCOUNTS_ACTIVITY_TILE_ACTION: IAction = {

From d8f1111c6c69e8345061e783f93dd24df9a57a08 Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Wed, 15 Jan 2025 12:23:11 -0500
Subject: [PATCH 0081/1815] expose env for zsh + test

---
 .../terminal.shellIntegration.test.ts         | 19 +++++++++++++++++--
 .../common/scripts/shellIntegration-rc.zsh    | 15 +++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
index 8f094091f962..e644b0cf8824 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
@@ -30,7 +30,7 @@ import { assertNoRpc } from '../utils';
 		disposables.length = 0;
 	});
 
-	function createTerminalAndWaitForShellIntegration(): Promise<{ terminal: Terminal; shellIntegration: TerminalShellIntegration }> {
+	function createTerminalAndWaitForShellIntegration(shellPath?: string): Promise<{ terminal: Terminal; shellIntegration: TerminalShellIntegration }> {
 		return new Promise<{ terminal: Terminal; shellIntegration: TerminalShellIntegration }>(resolve => {
 			disposables.push(window.onDidChangeTerminalShellIntegration(e => {
 				if (e.terminal === terminal) {
@@ -42,7 +42,7 @@ import { assertNoRpc } from '../utils';
 			}));
 			const terminal = platform() === 'win32'
 				? window.createTerminal()
-				: window.createTerminal({ shellPath: '/bin/bash' });
+				: window.createTerminal({ shellPath: shellPath ?? '/bin/bash' });
 			terminal.show();
 		});
 	}
@@ -102,8 +102,23 @@ import { assertNoRpc } from '../utils';
 			ok(shellIntegration.env.PATH);
 			ok(shellIntegration.env.PATH.length > 0, 'env.PATH should have a length greater than 0');
 		});
+
+		test.skip('Test if zsh env is set', async () => {
+			const { shellIntegration } = await createTerminalAndWaitForShellIntegration('/bin/zsh');
+			await new Promise<void>(r => {
+				disposables.push(window.onDidChangeTerminalShellIntegration(e => {
+					if (e.shellIntegration.env) {
+						r();
+					}
+				}));
+			});
+			ok(shellIntegration.env);
+			ok(shellIntegration.env.PATH);
+			ok(shellIntegration.env.PATH.length > 0, 'env.PATH should have a length greater than 0');
+		});
 	}
 
+
 	test('execution events should fire in order when a command runs', async () => {
 		const { terminal, shellIntegration } = await createTerminalAndWaitForShellIntegration();
 		const events: string[] = [];
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 54a13d575f16..9e85f892b28c 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
@@ -111,6 +111,17 @@ __vsc_update_cwd() {
 	builtin printf '\e]633;P;Cwd=%s\a' "$(__vsc_escape_value "${PWD}")"
 }
 
+__vsc_update_env() {
+	builtin printf '\e]633;EnvStart;%s;\a' $__vsc_nonce
+	for var in ${(k)parameters}; do
+		if printenv "$var" >/dev/null 2>&1; then
+			value=$(builtin printf '%s' "${(P)var}")
+			builtin printf '\e]633;EnvEntry;%s;%s;%s\a' "$var" "$(__vsc_escape_value "$value")" $__vsc_nonce
+		fi
+	done
+	builtin printf '\e]633;EnvEnd;%s;\a' $__vsc_nonce
+}
+
 __vsc_command_output_start() {
 	builtin printf '\e]633;E;%s;%s\a' "$(__vsc_escape_value "${__vsc_current_command}")" $__vsc_nonce
 	builtin printf '\e]633;C\a'
@@ -139,6 +150,8 @@ __vsc_command_complete() {
 		builtin printf '\e]633;D;%s\a' "$__vsc_status"
 	fi
 	__vsc_update_cwd
+	# Is there stable/insider flag in zsh?
+	__vsc_update_env
 }
 
 if [[ -o NOUNSET ]]; then
@@ -173,6 +186,8 @@ __vsc_precmd() {
 		# non null
 		__vsc_update_prompt
 	fi
+	# TODO: Is there stable/insider flag in zsh?
+	__vsc_update_env
 }
 
 __vsc_preexec() {

From 2dff698dfbb5d747c086848a366a3bf629d2e5f1 Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Thu, 16 Jan 2025 10:37:02 -0500
Subject: [PATCH 0082/1815] pass in shellPath for when platform() is win32 too

---
 .../src/singlefolder-tests/terminal.shellIntegration.test.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
index e644b0cf8824..86fc52cf6653 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
@@ -41,7 +41,7 @@ import { assertNoRpc } from '../utils';
 				}
 			}));
 			const terminal = platform() === 'win32'
-				? window.createTerminal()
+				? window.createTerminal({ shellPath })
 				: window.createTerminal({ shellPath: shellPath ?? '/bin/bash' });
 			terminal.show();
 		});

From 81880711959321280ed8c228cf07e50ca46fa48c Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Thu, 16 Jan 2025 10:47:20 -0500
Subject: [PATCH 0083/1815] get $__vsc_stable flag from terminalEnvironment.ts

---
 .../terminal/node/terminalEnvironment.ts         |  1 +
 .../common/scripts/shellIntegration-rc.zsh       | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/vs/platform/terminal/node/terminalEnvironment.ts b/src/vs/platform/terminal/node/terminalEnvironment.ts
index 3688900dc2bc..71398d253731 100644
--- a/src/vs/platform/terminal/node/terminalEnvironment.ts
+++ b/src/vs/platform/terminal/node/terminalEnvironment.ts
@@ -224,6 +224,7 @@ export function getShellIntegrationInjection(
 				source: path.join(appRoot, 'out/vs/workbench/contrib/terminal/common/scripts/shellIntegration-login.zsh'),
 				dest: path.join(zdotdir, '.zlogin')
 			});
+			envMixin['VSCODE_STABLE'] = productService.quality === 'stable' ? '1' : '0';
 			return { newArgs, envMixin, filesToCopy };
 		}
 	}
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 9e85f892b28c..31885e517952 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
@@ -99,6 +99,10 @@ __vsc_current_command=""
 __vsc_nonce="$VSCODE_NONCE"
 unset VSCODE_NONCE
 
+# Some features should only work in Insiders
+__vsc_stable="$VSCODE_STABLE"
+unset VSCODE_STABLE
+
 __vsc_prompt_start() {
 	builtin printf '\e]633;A\a'
 }
@@ -150,8 +154,10 @@ __vsc_command_complete() {
 		builtin printf '\e]633;D;%s\a' "$__vsc_status"
 	fi
 	__vsc_update_cwd
-	# Is there stable/insider flag in zsh?
-	__vsc_update_env
+
+	if [[ "$__vsc_stable" == "0" ]]; then
+		__vsc_update_env
+	fi
 }
 
 if [[ -o NOUNSET ]]; then
@@ -186,8 +192,10 @@ __vsc_precmd() {
 		# non null
 		__vsc_update_prompt
 	fi
-	# TODO: Is there stable/insider flag in zsh?
-	__vsc_update_env
+
+	if [[ "$__vsc_stable" == "0" ]]; then
+		__vsc_update_env
+	fi
 }
 
 __vsc_preexec() {

From 2718b079efb4aa5754e413d6a777dab33f176e2a Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Thu, 16 Jan 2025 12:50:00 -0500
Subject: [PATCH 0084/1815] try not using stable flag just in zsh. Leave it in
 for .ts

---
 .../terminal/common/scripts/shellIntegration-rc.zsh  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 31885e517952..131e8afecb22 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
@@ -155,9 +155,9 @@ __vsc_command_complete() {
 	fi
 	__vsc_update_cwd
 
-	if [[ "$__vsc_stable" == "0" ]]; then
-		__vsc_update_env
-	fi
+	# if [[ "$__vsc_stable" == "0" ]]; then
+	__vsc_update_env
+	# fi
 }
 
 if [[ -o NOUNSET ]]; then
@@ -193,9 +193,9 @@ __vsc_precmd() {
 		__vsc_update_prompt
 	fi
 
-	if [[ "$__vsc_stable" == "0" ]]; then
-		__vsc_update_env
-	fi
+	# if [[ "$__vsc_stable" == "0" ]]; then
+	__vsc_update_env
+	# fi
 }
 
 __vsc_preexec() {

From 0a8a8b416b6f5acdd6442b75d7eb24529bd7e15d Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Thu, 16 Jan 2025 13:19:47 -0500
Subject: [PATCH 0085/1815] comment out envMixin VSCODE_STABLE

---
 src/vs/platform/terminal/node/terminalEnvironment.ts          | 2 +-
 .../contrib/terminal/common/scripts/shellIntegration-rc.zsh   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/platform/terminal/node/terminalEnvironment.ts b/src/vs/platform/terminal/node/terminalEnvironment.ts
index 71398d253731..d89d8c9277d2 100644
--- a/src/vs/platform/terminal/node/terminalEnvironment.ts
+++ b/src/vs/platform/terminal/node/terminalEnvironment.ts
@@ -224,7 +224,7 @@ export function getShellIntegrationInjection(
 				source: path.join(appRoot, 'out/vs/workbench/contrib/terminal/common/scripts/shellIntegration-login.zsh'),
 				dest: path.join(zdotdir, '.zlogin')
 			});
-			envMixin['VSCODE_STABLE'] = productService.quality === 'stable' ? '1' : '0';
+			// envMixin['VSCODE_STABLE'] = productService.quality === 'stable' ? '1' : '0';
 			return { newArgs, envMixin, filesToCopy };
 		}
 	}
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 131e8afecb22..51f3a45d9622 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
@@ -100,8 +100,8 @@ __vsc_nonce="$VSCODE_NONCE"
 unset VSCODE_NONCE
 
 # Some features should only work in Insiders
-__vsc_stable="$VSCODE_STABLE"
-unset VSCODE_STABLE
+# __vsc_stable="$VSCODE_STABLE"
+# unset VSCODE_STABLE
 
 __vsc_prompt_start() {
 	builtin printf '\e]633;A\a'

From 7b8757404e1227b55d2f902d7a1c0ae7258bd201 Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Thu, 16 Jan 2025 14:04:10 -0500
Subject: [PATCH 0086/1815] at least uncomment ts side

---
 src/vs/platform/terminal/node/terminalEnvironment.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/platform/terminal/node/terminalEnvironment.ts b/src/vs/platform/terminal/node/terminalEnvironment.ts
index d89d8c9277d2..71398d253731 100644
--- a/src/vs/platform/terminal/node/terminalEnvironment.ts
+++ b/src/vs/platform/terminal/node/terminalEnvironment.ts
@@ -224,7 +224,7 @@ export function getShellIntegrationInjection(
 				source: path.join(appRoot, 'out/vs/workbench/contrib/terminal/common/scripts/shellIntegration-login.zsh'),
 				dest: path.join(zdotdir, '.zlogin')
 			});
-			// envMixin['VSCODE_STABLE'] = productService.quality === 'stable' ? '1' : '0';
+			envMixin['VSCODE_STABLE'] = productService.quality === 'stable' ? '1' : '0';
 			return { newArgs, envMixin, filesToCopy };
 		}
 	}

From cb34f37e6032a7a542a2f54b46675ddbe1b17de8 Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Thu, 16 Jan 2025 15:46:03 -0500
Subject: [PATCH 0087/1815] is this real?

---
 src/vs/platform/terminal/test/node/terminalEnvironment.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts b/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
index 6248f83003d4..28c2072f0a15 100644
--- a/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
+++ b/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
@@ -132,7 +132,7 @@ suite('platform - terminalEnvironment', () => {
 						/.+\/out\/vs\/workbench\/contrib\/terminal\/common\/scripts\/shellIntegration-login.zsh/
 					];
 					function assertIsEnabled(result: IShellIntegrationConfigInjection, globalZdotdir = homedir()) {
-						strictEqual(Object.keys(result.envMixin!).length, 3);
+						strictEqual(Object.keys(result.envMixin!).length, 4);
 						ok(result.envMixin!['ZDOTDIR']?.match(expectedDir));
 						strictEqual(result.envMixin!['USER_ZDOTDIR'], globalZdotdir);
 						ok(result.envMixin!['VSCODE_INJECTION']?.match('1'));

From 30b45136b08164d88436cd58f395d34b787efc19 Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Thu, 16 Jan 2025 16:04:34 -0500
Subject: [PATCH 0088/1815] re-enable __vsc_stable

---
 .../test/node/terminalEnvironment.test.ts        |  1 -
 .../common/scripts/shellIntegration-rc.zsh       | 16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts b/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
index 28c2072f0a15..0829f838db63 100644
--- a/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
+++ b/src/vs/platform/terminal/test/node/terminalEnvironment.test.ts
@@ -132,7 +132,6 @@ suite('platform - terminalEnvironment', () => {
 						/.+\/out\/vs\/workbench\/contrib\/terminal\/common\/scripts\/shellIntegration-login.zsh/
 					];
 					function assertIsEnabled(result: IShellIntegrationConfigInjection, globalZdotdir = homedir()) {
-						strictEqual(Object.keys(result.envMixin!).length, 4);
 						ok(result.envMixin!['ZDOTDIR']?.match(expectedDir));
 						strictEqual(result.envMixin!['USER_ZDOTDIR'], globalZdotdir);
 						ok(result.envMixin!['VSCODE_INJECTION']?.match('1'));
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 51f3a45d9622..31885e517952 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
@@ -100,8 +100,8 @@ __vsc_nonce="$VSCODE_NONCE"
 unset VSCODE_NONCE
 
 # Some features should only work in Insiders
-# __vsc_stable="$VSCODE_STABLE"
-# unset VSCODE_STABLE
+__vsc_stable="$VSCODE_STABLE"
+unset VSCODE_STABLE
 
 __vsc_prompt_start() {
 	builtin printf '\e]633;A\a'
@@ -155,9 +155,9 @@ __vsc_command_complete() {
 	fi
 	__vsc_update_cwd
 
-	# if [[ "$__vsc_stable" == "0" ]]; then
-	__vsc_update_env
-	# fi
+	if [[ "$__vsc_stable" == "0" ]]; then
+		__vsc_update_env
+	fi
 }
 
 if [[ -o NOUNSET ]]; then
@@ -193,9 +193,9 @@ __vsc_precmd() {
 		__vsc_update_prompt
 	fi
 
-	# if [[ "$__vsc_stable" == "0" ]]; then
-	__vsc_update_env
-	# fi
+	if [[ "$__vsc_stable" == "0" ]]; then
+		__vsc_update_env
+	fi
 }
 
 __vsc_preexec() {

From e3c12a8c2bf2d53ac51fe3a61031c1e1b3d4313e Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Fri, 17 Jan 2025 01:24:25 -0500
Subject: [PATCH 0089/1815] handle edge case, from more rigorous testing

---
 .../terminal/common/scripts/shellIntegration-rc.zsh   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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 31885e517952..089474c2849c 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
@@ -116,14 +116,19 @@ __vsc_update_cwd() {
 }
 
 __vsc_update_env() {
-	builtin printf '\e]633;EnvStart;%s;\a' $__vsc_nonce
+	builtin printf '\e]633;EnvSingleStart;%s;\a' $__vsc_nonce
 	for var in ${(k)parameters}; do
 		if printenv "$var" >/dev/null 2>&1; then
 			value=$(builtin printf '%s' "${(P)var}")
-			builtin printf '\e]633;EnvEntry;%s;%s;%s\a' "$var" "$(__vsc_escape_value "$value")" $__vsc_nonce
+			# Skip variables with values that start with a hypen
+			# Things like -q can lead to __vsc_escape_value bad option
+			if [[ "$value" == -* ]]; then
+				continue
+			fi
+			builtin printf '\e]633;EnvSingleEntry;%s;%s;%s\a' "$var" "$(__vsc_escape_value "$value")" $__vsc_nonce
 		fi
 	done
-	builtin printf '\e]633;EnvEnd;%s;\a' $__vsc_nonce
+	builtin printf '\e]633;EnvSingleEnd;%s;\a' $__vsc_nonce
 }
 
 __vsc_command_output_start() {

From 6a6cfadea2c2cc7c2e960b13139eea0dc409fbfc Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Fri, 17 Jan 2025 01:29:03 -0500
Subject: [PATCH 0090/1815] also skip when variable starts with hypen

---
 .../contrib/terminal/common/scripts/shellIntegration-rc.zsh     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 089474c2849c..013aef5dedf1 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
@@ -122,7 +122,7 @@ __vsc_update_env() {
 			value=$(builtin printf '%s' "${(P)var}")
 			# Skip variables with values that start with a hypen
 			# Things like -q can lead to __vsc_escape_value bad option
-			if [[ "$value" == -* ]]; then
+			if [[ "$value" == -* || "$var" == -* ]]; then
 				continue
 			fi
 			builtin printf '\e]633;EnvSingleEntry;%s;%s;%s\a' "$var" "$(__vsc_escape_value "$value")" $__vsc_nonce

From 9013dde56de0ded5e8b6387a0a0e63615efce2d6 Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Fri, 17 Jan 2025 01:31:21 -0500
Subject: [PATCH 0091/1815] handle edge case better with hypens

---
 .../contrib/terminal/common/scripts/shellIntegration-rc.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 013aef5dedf1..737eca2804a7 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
@@ -120,9 +120,9 @@ __vsc_update_env() {
 	for var in ${(k)parameters}; do
 		if printenv "$var" >/dev/null 2>&1; then
 			value=$(builtin printf '%s' "${(P)var}")
-			# Skip variables with values that start with a hypen
-			# Things like -q can lead to __vsc_escape_value bad option
-			if [[ "$value" == -* || "$var" == -* ]]; then
+			# It is not valid to have hypen in variable name
+			# It is not valid to have hypen to start variable value
+			if [[ "$value" == -* || "$var" == *-*  ]]; then
 				continue
 			fi
 			builtin printf '\e]633;EnvSingleEntry;%s;%s;%s\a' "$var" "$(__vsc_escape_value "$value")" $__vsc_nonce

From ab0a511b34b571096c0753e1fa3c9bfe4cc3ae83 Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Fri, 17 Jan 2025 01:48:38 -0500
Subject: [PATCH 0092/1815] remove extra line

---
 .../src/singlefolder-tests/terminal.shellIntegration.test.ts     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
index 86fc52cf6653..291d3d354b5d 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
@@ -118,7 +118,6 @@ import { assertNoRpc } from '../utils';
 		});
 	}
 
-
 	test('execution events should fire in order when a command runs', async () => {
 		const { terminal, shellIntegration } = await createTerminalAndWaitForShellIntegration();
 		const events: string[] = [];

From a97fcaa5b1b45b909544aea9e70b613450f31518 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Fri, 17 Jan 2025 16:26:59 +0100
Subject: [PATCH 0093/1815] removing code so that accessibility support is not
 taken into account

---
 src/vs/editor/browser/view.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/editor/browser/view.ts b/src/vs/editor/browser/view.ts
index 1e883bfcd2b2..d2c80d112c68 100644
--- a/src/vs/editor/browser/view.ts
+++ b/src/vs/editor/browser/view.ts
@@ -280,9 +280,11 @@ export class View extends ViewEventHandler {
 	private _instantiateEditContext(experimentalEditContextEnabled: boolean, accessibilitySupport: AccessibilitySupport): AbstractEditContext {
 		const domNode = dom.getWindow(this._overflowGuardContainer.domNode);
 		const isEditContextSupported = EditContext.supported(domNode);
-		if (experimentalEditContextEnabled && isEditContextSupported && accessibilitySupport !== AccessibilitySupport.Enabled) {
+		if (experimentalEditContextEnabled && isEditContextSupported) {
+			console.log('creating native edit context');
 			return this._instantiationService.createInstance(NativeEditContext, this._ownerID, this._context, this._overflowGuardContainer, this._viewController, this._createTextAreaHandlerHelper());
 		} else {
+			console.log('creating text area edit context');
 			return this._instantiationService.createInstance(TextAreaEditContext, this._context, this._overflowGuardContainer, this._viewController, this._createTextAreaHandlerHelper());
 		}
 	}

From c919ff1f2cefaefe148acfaf4b657dd3602ac39c Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Fri, 17 Jan 2025 16:34:48 -0500
Subject: [PATCH 0094/1815] aim to better handle - in vsc_escape_value in hex,
 similar to other escapes

---
 .../terminal/common/scripts/shellIntegration-rc.zsh      | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

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 737eca2804a7..75ab0ceb44d5 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
@@ -75,13 +75,15 @@ __vsc_escape_value() {
 	for (( i = 0; i < ${#str}; ++i )); do
 		byte="${str:$i:1}"
 
-		# Escape backslashes, semi-colons and newlines
+		# Escape backslashes, semi-colons, newlines, and hyphens.
 		if [ "$byte" = "\\" ]; then
 			token="\\\\"
 		elif [ "$byte" = ";" ]; then
 			token="\\x3b"
 		elif [ "$byte" = $'\n' ]; then
 			token="\x0a"
+		elif [ "$byte" = "-" ]; then
+			token="\\x2d"
 		else
 			token="$byte"
 		fi
@@ -120,11 +122,6 @@ __vsc_update_env() {
 	for var in ${(k)parameters}; do
 		if printenv "$var" >/dev/null 2>&1; then
 			value=$(builtin printf '%s' "${(P)var}")
-			# It is not valid to have hypen in variable name
-			# It is not valid to have hypen to start variable value
-			if [[ "$value" == -* || "$var" == *-*  ]]; then
-				continue
-			fi
 			builtin printf '\e]633;EnvSingleEntry;%s;%s;%s\a' "$var" "$(__vsc_escape_value "$value")" $__vsc_nonce
 		fi
 	done

From 8e093a90dce147a3a06823e646e1f2b3ea1de6a4 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Tue, 21 Jan 2025 12:27:55 -0600
Subject: [PATCH 0095/1815] fix #237976

---
 .../terminalContrib/suggest/browser/terminalCompletionService.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
index be3976432613..f18aa963cd1e 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
@@ -317,6 +317,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 					label,
 					provider,
 					kind,
+					detail: getFriendlyFolderPath(stat.resource, resourceRequestConfig.pathSeparator),
 					isDirectory,
 					isFile: kind === TerminalCompletionItemKind.File,
 					replacementIndex: cursorPosition - lastWord.length,

From 2a611d3ffa9de4d2cb7f690ab82735cd9588bae1 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Tue, 21 Jan 2025 13:02:07 -0600
Subject: [PATCH 0096/1815] For files, don't add end path sep

---
 .../suggest/browser/terminalCompletionService.ts            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
index f18aa963cd1e..4022d1612c41 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
@@ -317,7 +317,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 					label,
 					provider,
 					kind,
-					detail: getFriendlyFolderPath(stat.resource, resourceRequestConfig.pathSeparator),
+					detail: getFriendlyFolderPath(stat.resource, resourceRequestConfig.pathSeparator, kind === TerminalCompletionItemKind.File),
 					isDirectory,
 					isFile: kind === TerminalCompletionItemKind.File,
 					replacementIndex: cursorPosition - lastWord.length,
@@ -352,10 +352,10 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 	}
 }
 
-function getFriendlyFolderPath(uri: URI, pathSeparator: string): string {
+function getFriendlyFolderPath(uri: URI, pathSeparator: string, isFile?: boolean): string {
 	let path = uri.fsPath;
 	// Ensure folders end with the path separator to differentiate presentation from files
-	if (!path.endsWith(pathSeparator)) {
+	if (!isFile && !path.endsWith(pathSeparator)) {
 		path += pathSeparator;
 	}
 	// Ensure drive is capitalized on Windows

From d2c2cd9111bce3b753ea5307db4cacda89554482 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Tue, 21 Jan 2025 13:37:14 -0600
Subject: [PATCH 0097/1815] rename, pass in kind

---
 .../suggest/browser/terminalCompletionService.ts       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
index 4022d1612c41..08c0da1c90bb 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
@@ -262,7 +262,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 				kind: TerminalCompletionItemKind.Folder,
 				isDirectory: true,
 				isFile: false,
-				detail: getFriendlyFolderPath(cwd, resourceRequestConfig.pathSeparator),
+				detail: getFriendlyPath(cwd, resourceRequestConfig.pathSeparator),
 				replacementIndex: cursorPosition - lastWord.length,
 				replacementLength: lastWord.length
 			});
@@ -317,7 +317,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 					label,
 					provider,
 					kind,
-					detail: getFriendlyFolderPath(stat.resource, resourceRequestConfig.pathSeparator, kind === TerminalCompletionItemKind.File),
+					detail: getFriendlyPath(stat.resource, resourceRequestConfig.pathSeparator, TerminalCompletionItemKind.File),
 					isDirectory,
 					isFile: kind === TerminalCompletionItemKind.File,
 					replacementIndex: cursorPosition - lastWord.length,
@@ -340,7 +340,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 				label: lastWordFolder + '..' + resourceRequestConfig.pathSeparator,
 				provider,
 				kind: TerminalCompletionItemKind.Folder,
-				detail: getFriendlyFolderPath(parentDir, resourceRequestConfig.pathSeparator),
+				detail: getFriendlyPath(parentDir, resourceRequestConfig.pathSeparator),
 				isDirectory: true,
 				isFile: false,
 				replacementIndex: cursorPosition - lastWord.length,
@@ -352,10 +352,10 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 	}
 }
 
-function getFriendlyFolderPath(uri: URI, pathSeparator: string, isFile?: boolean): string {
+function getFriendlyPath(uri: URI, pathSeparator: string, kind?: TerminalCompletionItemKind): string {
 	let path = uri.fsPath;
 	// Ensure folders end with the path separator to differentiate presentation from files
-	if (!isFile && !path.endsWith(pathSeparator)) {
+	if (kind !== TerminalCompletionItemKind.File && !path.endsWith(pathSeparator)) {
 		path += pathSeparator;
 	}
 	// Ensure drive is capitalized on Windows

From 6446430c4e458427120f57eed8e6e431826a41a6 Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Tue, 21 Jan 2025 14:52:18 -0500
Subject: [PATCH 0098/1815] use -- and remove special case for hypen

---
 .../contrib/terminal/common/scripts/shellIntegration-rc.zsh   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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 75ab0ceb44d5..efcf6ca86068 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
@@ -82,8 +82,6 @@ __vsc_escape_value() {
 			token="\\x3b"
 		elif [ "$byte" = $'\n' ]; then
 			token="\x0a"
-		elif [ "$byte" = "-" ]; then
-			token="\\x2d"
 		else
 			token="$byte"
 		fi
@@ -91,7 +89,7 @@ __vsc_escape_value() {
 		out+="$token"
 	done
 
-	builtin print -r "$out"
+	builtin print -r -- "$out"
 }
 
 __vsc_in_command_execution="1"

From 258261710a279b8e11548d88127e8e92c96b7bbf Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Tue, 21 Jan 2025 15:00:27 -0500
Subject: [PATCH 0099/1815] revert my comment on hypens

---
 .../contrib/terminal/common/scripts/shellIntegration-rc.zsh     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 efcf6ca86068..e9db9f42183c 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
@@ -75,7 +75,7 @@ __vsc_escape_value() {
 	for (( i = 0; i < ${#str}; ++i )); do
 		byte="${str:$i:1}"
 
-		# Escape backslashes, semi-colons, newlines, and hyphens.
+		# Escape backslashes, semi-colons, newlines
 		if [ "$byte" = "\\" ]; then
 			token="\\\\"
 		elif [ "$byte" = ";" ]; then

From c30c5259c099c41d85a0d216ab07a5f12511fdde Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Tue, 21 Jan 2025 15:10:40 -0500
Subject: [PATCH 0100/1815] leave og

---
 .../contrib/terminal/common/scripts/shellIntegration-rc.zsh     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 e9db9f42183c..6482665b969f 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
@@ -75,7 +75,7 @@ __vsc_escape_value() {
 	for (( i = 0; i < ${#str}; ++i )); do
 		byte="${str:$i:1}"
 
-		# Escape backslashes, semi-colons, newlines
+		# Escape backslashes, semi-colons and newlines
 		if [ "$byte" = "\\" ]; then
 			token="\\\\"
 		elif [ "$byte" = ";" ]; then

From dc9707e723a5bc9c72d97f915c9e3f8f8135e9e9 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Tue, 21 Jan 2025 14:16:23 -0600
Subject: [PATCH 0101/1815] update all test expectations

---
 .../browser/terminalCompletionService.test.ts | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

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 174e1ea1e5e2..bda41f033703 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
@@ -111,7 +111,7 @@ suite('TerminalCompletionService', () => {
 
 			assertCompletions(result, [
 				{ label: '.', detail: '/test/' },
-				{ label: './folder1/' },
+				{ label: './folder1/', detail: '/test/folder1/' },
 				{ label: '../', detail: '/' },
 			], { replacementIndex: 1, replacementLength: 0 });
 		});
@@ -127,7 +127,7 @@ suite('TerminalCompletionService', () => {
 
 			assertCompletions(result, [
 				{ label: './', detail: '/test/' },
-				{ label: './folder1/' },
+				{ label: './folder1/', detail: '/test/folder1/' },
 				{ label: './../', detail: '/' },
 			], { replacementIndex: 1, replacementLength: 2 });
 		});
@@ -143,7 +143,7 @@ suite('TerminalCompletionService', () => {
 
 			assertCompletions(result, [
 				{ label: './', detail: '/test/' },
-				{ label: './folder1/' },
+				{ label: './folder1/', detail: '/test/folder1/' },
 				{ label: './../', detail: '/' },
 			], { replacementIndex: 3, replacementLength: 2 });
 		});
@@ -158,7 +158,7 @@ suite('TerminalCompletionService', () => {
 
 			assertCompletions(result, [
 				{ label: './', detail: '/test/' },
-				{ label: './folder1/' },
+				{ label: './folder1/', detail: '/test/folder1/' },
 				{ label: './../', detail: '/' },
 			], { replacementIndex: 3, replacementLength: 3 });
 		});
@@ -187,10 +187,10 @@ suite('TerminalCompletionService', () => {
 
 			assertCompletions(result, [
 				{ label: './', detail: '/test/' },
-				{ label: './.hiddenFile', kind: TerminalCompletionItemKind.File },
-				{ label: './.hiddenFolder/' },
-				{ label: './folder1/' },
-				{ label: './file1.txt', kind: TerminalCompletionItemKind.File },
+				{ label: './.hiddenFile', detail: '/test/.hiddenFile', kind: TerminalCompletionItemKind.File },
+				{ label: './.hiddenFolder/', detail: '/test/.hiddenFolder/' },
+				{ label: './folder1/', detail: '/test/folder1/' },
+				{ label: './file1.txt', detail: '/test/file1.txt', kind: TerminalCompletionItemKind.File },
 				{ label: './../', detail: '/' },
 			], { replacementIndex: 0, replacementLength: 2 });
 		});
@@ -207,10 +207,10 @@ suite('TerminalCompletionService', () => {
 
 			assertCompletions(result, [
 				{ label: './', detail: '/test/' },
-				{ label: './.hiddenFile', kind: TerminalCompletionItemKind.File },
-				{ label: './.hiddenFolder/' },
-				{ label: './folder1/' },
-				{ label: './file1.txt', kind: TerminalCompletionItemKind.File },
+				{ label: './.hiddenFile', detail: '/test/.hiddenFile', kind: TerminalCompletionItemKind.File },
+				{ label: './.hiddenFolder/', detail: '/test/.hiddenFolder/' },
+				{ label: './folder1/', detail: '/test/folder1/' },
+				{ label: './file1.txt', detail: '/test/file1.txt', kind: TerminalCompletionItemKind.File },
 				{ label: './../', detail: '/' },
 			], { replacementIndex: 0, replacementLength: 3 });
 		});
@@ -280,8 +280,8 @@ suite('TerminalCompletionService', () => {
 
 				assertCompletions(result, [
 					{ label: './', detail: '/test/' },
-					{ label: './FolderA/' },
-					{ label: './foldera/' },
+					{ label: './FolderA/', detail: '/test/FolderA/' },
+					{ label: './foldera/', detail: '/test/foldera/' },
 					{ label: './../', detail: '/' }
 				], { replacementIndex: 0, replacementLength: 8 });
 			});
@@ -303,8 +303,8 @@ suite('TerminalCompletionService', () => {
 
 			assertCompletions(result, [
 				{ label: '.', detail: '/test/' },
-				{ label: './folder1/' },
-				{ label: './folder2/' },
+				{ label: './folder1/', detail: '/test/folder1/' },
+				{ label: './folder2/', detail: '/test/folder2/' },
 				{ label: '../', detail: '/' }
 			], { replacementIndex: 0, replacementLength: 0 });
 		});
@@ -346,8 +346,8 @@ suite('TerminalCompletionService', () => {
 
 			assertCompletions(result, [
 				{ label: './', detail: '/test/' },
-				{ label: './folder1/' },
-				{ label: './folder2/' },
+				{ label: './folder1/', detail: '/test/folder1/' },
+				{ label: './folder2/', detail: '/test/folder2/' },
 				{ label: './../', detail: '/' }
 			], { replacementIndex: 1, replacementLength: 9 });
 		});

From 5c4b473fbed4296327f3c6a7be4bbed7e4ac7fb4 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Tue, 21 Jan 2025 14:33:55 -0600
Subject: [PATCH 0102/1815] fix #237818

---
 .../services/suggest/browser/simpleSuggestWidgetDetails.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetDetails.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetDetails.ts
index 028169745497..ca905d16adab 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetDetails.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetDetails.ts
@@ -177,7 +177,7 @@ export class SimpleSuggestDetailsWidget {
 
 		this._body.scrollTop = 0;
 
-		this.layout(this._size.width, this._type.clientHeight + this._docs.clientHeight);
+		this.layout(this._size.width, this._type.clientHeight + this._docs.clientHeight + 20);
 		this._onDidChangeContents.fire(this);
 	}
 

From b9781cc3a8a3a60111b184ec3c68aeff4ede2ae6 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Tue, 21 Jan 2025 14:34:51 -0600
Subject: [PATCH 0103/1815] fix another test

---
 .../suggest/test/browser/terminalCompletionService.test.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 bda41f033703..679710de5fc2 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
@@ -257,8 +257,8 @@ suite('TerminalCompletionService', () => {
 
 				assertCompletions(result, [
 					{ label: '.\\', detail: 'C:\\test\\' },
-					{ label: '.\\FolderA\\' },
-					{ label: '.\\anotherFolder\\' },
+					{ label: '.\\FolderA\\', detail: 'C:\\test\\FolderA\\' },
+					{ label: '.\\anotherFolder\\', detail: 'C:\\test\\anotherFolder\\' },
 					{ label: '.\\..\\', detail: 'C:\\' },
 				], { replacementIndex: 0, replacementLength: 8 });
 			});

From 4ff9a0ec074b98780cf79538bc52955af862e6cb Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Tue, 21 Jan 2025 16:02:57 -0600
Subject: [PATCH 0104/1815] show spec info w priority over path

---
 extensions/terminal-suggest/src/terminalSuggestMain.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 6072cd048f4c..8ba754efab23 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -136,7 +136,6 @@ export async function activate(context: vscode.ExtensionContext) {
 
 			const result = await getCompletionItemsFromSpecs(availableSpecs, terminalContext, commands, prefix, terminal.shellIntegration?.cwd, token);
 			if (result.cwd && (result.filesRequested || result.foldersRequested)) {
-				// const cwd = resolveCwdFromPrefix(prefix, terminal.shellIntegration?.cwd) ?? terminal.shellIntegration?.cwd;
 				return new vscode.TerminalCompletionList(result.items, { filesRequested: result.filesRequested, foldersRequested: result.foldersRequested, cwd: result.cwd, pathSeparator: isWindows ? '\\' : '/' });
 			}
 			return result.items;
@@ -345,7 +344,7 @@ export async function getCompletionItemsFromSpecs(
 				|| !!firstCommand && specLabel.startsWith(firstCommand)
 			) {
 				// push it to the completion items
-				items.push(createCompletionItem(terminalContext.cursorPosition, prefix, { label: specLabel }, availableCommand.detail, getDescription(spec)));
+				items.push(createCompletionItem(terminalContext.cursorPosition, prefix, { label: specLabel }, getDescription(spec), availableCommand.detail));
 			}
 
 			if (!terminalContext.commandLine.startsWith(specLabel)) {

From 7e63e808c98af6078a7f3f78e38503174f71c076 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Wed, 5 Feb 2025 13:02:09 +0100
Subject: [PATCH 0105/1815] Fix some disposable leak warnings

---
 src/vs/workbench/browser/parts/titlebar/menubarControl.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
index 50e683186508..48de66e71071 100644
--- a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
+++ b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
@@ -646,7 +646,7 @@ export class CustomMenubarControl extends MenubarControl {
 							title = menuItem.item.toggled.mnemonicTitle ?? menuItem.item.toggled.title ?? title;
 						}
 
-						const newAction = new Action(menuItem.id, mnemonicMenuLabel(title), menuItem.class, menuItem.enabled, () => this.commandService.executeCommand(menuItem.id));
+						const newAction = this._register(new Action(menuItem.id, mnemonicMenuLabel(title), menuItem.class, menuItem.enabled, () => this.commandService.executeCommand(menuItem.id)));
 						newAction.tooltip = menuItem.tooltip;
 						newAction.checked = menuItem.checked;
 						target.push(newAction);

From 746caa340a352ba8e03ea2666f5ecda9bd2bed57 Mon Sep 17 00:00:00 2001
From: Gabriela Araujo Britto <gabrielaa@microsoft.com>
Date: Fri, 7 Feb 2025 12:58:24 -0800
Subject: [PATCH 0106/1815] Revert "[typescript-language-features] Expandable
 hover (#228255)"

This reverts commit 0f9abf3c3567e53df749299dafcc988831a3b4e7.
---
 .../typescript-language-features/package.json | 30 +++++--------
 .../package.nls.json                          |  3 +-
 .../src/languageFeatures/hover.ts             | 44 +++----------------
 .../src/tsServer/api.ts                       |  1 -
 .../tsconfig.json                             |  1 -
 5 files changed, 18 insertions(+), 61 deletions(-)

diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 5a1f52a9b257..f8863a010fdb 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -11,8 +11,7 @@
     "workspaceTrust",
     "multiDocumentHighlightProvider",
     "codeActionAI",
-    "codeActionRanges",
-    "editorHoverVerbosityLevel"
+    "codeActionRanges"
   ],
   "capabilities": {
     "virtualWorkspaces": {
@@ -824,16 +823,16 @@
           ],
           "enumDescriptions": [
             "%typescript.locale.auto%",
-            "Deutsch",
-            "español",
+						"Deutsch",
+						"español",
             "English",
-            "français",
-            "italiano",
-            "日本語",
-            "한국어",
-            "русский",
-            "中文(简体)",
-            "中文(繁體)"
+						"français",
+						"italiano",
+						"日本語",
+						"한국어",
+						"русский",
+						"中文(简体)",
+						"中文(繁體)"
           ],
           "markdownDescription": "%typescript.locale%",
           "scope": "window"
@@ -1515,15 +1514,6 @@
           "type": "boolean",
           "default": true,
           "markdownDescription": "%configuration.updateImportsOnPaste%"
-        },
-        "typescript.experimental.expandableHover": {
-          "type": "boolean",
-          "default": false,
-          "description": "%configuration.expandableHover%",
-          "scope": "window",
-          "tags": [
-            "experimental"
-          ]
         }
       }
     },
diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
index 6a7dc26a24d6..f88b9c729696 100644
--- a/extensions/typescript-language-features/package.nls.json
+++ b/extensions/typescript-language-features/package.nls.json
@@ -224,8 +224,7 @@
 	"configuration.tsserver.web.projectWideIntellisense.suppressSemanticErrors": "Suppresses semantic errors on web even when project wide IntelliSense is enabled. This is always on when project wide IntelliSense is not enabled or available. See `#typescript.tsserver.web.projectWideIntellisense.enabled#`",
 	"configuration.tsserver.web.typeAcquisition.enabled": "Enable/disable package acquisition on the web. This enables IntelliSense for imported packages. Requires `#typescript.tsserver.web.projectWideIntellisense.enabled#`. Currently not supported for Safari.",
 	"configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VS Code to detect a Node installation.",
-	"configuration.updateImportsOnPaste": "Enable updating imports when pasting code. Requires TypeScript 5.7+.\n\nBy default this shows a option to update imports after pasting. You can use the `#editor.pasteAs.preferences#` setting to update imports automatically when pasting: `\"editor.pasteAs.preferences\": [ \"text.updateImports.jsts\" ]`.",
-	"configuration.expandableHover": "Enable expanding/contracting the hover to reveal more/less information from the TS server.",
+	"configuration.updateImportsOnPaste": "Automatically update imports when pasting code. Requires TypeScript 5.6+.",
 	"walkthroughs.nodejsWelcome.title": "Get started with JavaScript and Node.js",
 	"walkthroughs.nodejsWelcome.description": "Make the most of Visual Studio Code's first-class JavaScript experience.",
 	"walkthroughs.nodejsWelcome.downloadNode.forMacOrWindows.title": "Install Node.js",
diff --git a/extensions/typescript-language-features/src/languageFeatures/hover.ts b/extensions/typescript-language-features/src/languageFeatures/hover.ts
index edb08d029faa..3012658036f8 100644
--- a/extensions/typescript-language-features/src/languageFeatures/hover.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/hover.ts
@@ -11,11 +11,10 @@ import { DocumentSelector } from '../configuration/documentSelector';
 import { documentationToMarkdown } from './util/textRendering';
 import * as typeConverters from '../typeConverters';
 import FileConfigurationManager from './fileConfigurationManager';
-import { API } from '../tsServer/api';
+
 
 
 class TypeScriptHoverProvider implements vscode.HoverProvider {
-	private lastHoverAndLevel: [vscode.Hover, number] | undefined;
 
 	public constructor(
 		private readonly client: ITypeScriptServiceClient,
@@ -25,24 +24,17 @@ class TypeScriptHoverProvider implements vscode.HoverProvider {
 	public async provideHover(
 		document: vscode.TextDocument,
 		position: vscode.Position,
-		token: vscode.CancellationToken,
-		context?: vscode.HoverContext,
-	): Promise<vscode.VerboseHover | undefined> {
+		token: vscode.CancellationToken
+	): Promise<vscode.Hover | undefined> {
 		const filepath = this.client.toOpenTsFilePath(document);
 		if (!filepath) {
 			return undefined;
 		}
 
-		const enableExpandableHover = vscode.workspace.getConfiguration('typescript').get('experimental.expandableHover');
-		let verbosityLevel: number | undefined;
-		if (enableExpandableHover && this.client.apiVersion.gte(API.v570)) {
-			verbosityLevel = Math.max(0, this.getPreviousLevel(context?.previousHover) + (context?.verbosityDelta ?? 0));
-		}
-		const args = { ...typeConverters.Position.toFileLocationRequestArgs(filepath, position), verbosityLevel };
-
 		const response = await this.client.interruptGetErr(async () => {
 			await this.fileConfigurationManager.ensureConfigurationForDocument(document, token);
 
+			const args = typeConverters.Position.toFileLocationRequestArgs(filepath, position);
 			return this.client.execute('quickinfo', args, token);
 		});
 
@@ -50,24 +42,9 @@ class TypeScriptHoverProvider implements vscode.HoverProvider {
 			return undefined;
 		}
 
-		const contents = this.getContents(document.uri, response.body, response._serverType);
-		const range = typeConverters.Range.fromTextSpan(response.body);
-		const hover = verbosityLevel !== undefined ?
-			new vscode.VerboseHover(
-				contents,
-				range,
-				// @ts-expect-error
-				/*canIncreaseVerbosity*/ response.body.canIncreaseVerbosityLevel,
-				/*canDecreaseVerbosity*/ verbosityLevel !== 0
-			) : new vscode.Hover(
-				contents,
-				range
-			);
-
-		if (verbosityLevel !== undefined) {
-			this.lastHoverAndLevel = [hover, verbosityLevel];
-		}
-		return hover;
+		return new vscode.Hover(
+			this.getContents(document.uri, response.body, response._serverType),
+			typeConverters.Range.fromTextSpan(response.body));
 	}
 
 	private getContents(
@@ -95,13 +72,6 @@ class TypeScriptHoverProvider implements vscode.HoverProvider {
 		parts.push(md);
 		return parts;
 	}
-
-	private getPreviousLevel(previousHover: vscode.Hover | undefined): number {
-		if (previousHover && this.lastHoverAndLevel && this.lastHoverAndLevel[0] === previousHover) {
-			return this.lastHoverAndLevel[1];
-		}
-		return 0;
-	}
 }
 
 export function register(
diff --git a/extensions/typescript-language-features/src/tsServer/api.ts b/extensions/typescript-language-features/src/tsServer/api.ts
index 4ddc29944f0a..2925403eebd0 100644
--- a/extensions/typescript-language-features/src/tsServer/api.ts
+++ b/extensions/typescript-language-features/src/tsServer/api.ts
@@ -29,7 +29,6 @@ export class API {
 	public static readonly v544 = API.fromSimpleString('5.4.4');
 	public static readonly v540 = API.fromSimpleString('5.4.0');
 	public static readonly v560 = API.fromSimpleString('5.6.0');
-	public static readonly v570 = API.fromSimpleString('5.7.0');
 
 	public static fromVersionString(versionString: string): API {
 		let version = semver.valid(versionString);
diff --git a/extensions/typescript-language-features/tsconfig.json b/extensions/typescript-language-features/tsconfig.json
index 8ac3a8735b1f..1f94b9f1ce2c 100644
--- a/extensions/typescript-language-features/tsconfig.json
+++ b/extensions/typescript-language-features/tsconfig.json
@@ -16,6 +16,5 @@
 		"../../src/vscode-dts/vscode.proposed.multiDocumentHighlightProvider.d.ts",
 		"../../src/vscode-dts/vscode.proposed.workspaceTrust.d.ts",
 		"../../src/vscode-dts/vscode.proposed.documentPaste.d.ts",
-		"../../src/vscode-dts/vscode.proposed.editorHoverVerbosityLevel.d.ts",
 	]
 }

From 2db415abf05fa8fc8b22224e55862599aa4e4d66 Mon Sep 17 00:00:00 2001
From: Gabriela Araujo Britto <gabrielaa@microsoft.com>
Date: Fri, 7 Feb 2025 13:44:45 -0800
Subject: [PATCH 0107/1815] add back 5.7 version

---
 extensions/typescript-language-features/src/tsServer/api.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extensions/typescript-language-features/src/tsServer/api.ts b/extensions/typescript-language-features/src/tsServer/api.ts
index 2925403eebd0..4ddc29944f0a 100644
--- a/extensions/typescript-language-features/src/tsServer/api.ts
+++ b/extensions/typescript-language-features/src/tsServer/api.ts
@@ -29,6 +29,7 @@ export class API {
 	public static readonly v544 = API.fromSimpleString('5.4.4');
 	public static readonly v540 = API.fromSimpleString('5.4.0');
 	public static readonly v560 = API.fromSimpleString('5.6.0');
+	public static readonly v570 = API.fromSimpleString('5.7.0');
 
 	public static fromVersionString(versionString: string): API {
 		let version = semver.valid(versionString);

From 03bfa56b291372bde74f61de45f32f3ad1bf2d81 Mon Sep 17 00:00:00 2001
From: Gabriela Araujo Britto <gabrielaa@microsoft.com>
Date: Fri, 7 Feb 2025 15:11:54 -0800
Subject: [PATCH 0108/1815] fix indentation

---
 .../typescript-language-features/package.json  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index f8863a010fdb..322bab13b1cf 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -823,16 +823,16 @@
           ],
           "enumDescriptions": [
             "%typescript.locale.auto%",
-						"Deutsch",
-						"español",
+            "Deutsch",
+            "español",
             "English",
-						"français",
-						"italiano",
-						"日本語",
-						"한국어",
-						"русский",
-						"中文(简体)",
-						"中文(繁體)"
+            "français",
+            "italiano",
+            "日本語",
+            "한국어",
+            "русский",
+            "中文(简体)",
+            "中文(繁體)"
           ],
           "markdownDescription": "%typescript.locale%",
           "scope": "window"

From 9e2aaee200f77a67d3a7a92f88bbc54f484c8111 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Wed, 12 Feb 2025 21:10:56 +0100
Subject: [PATCH 0109/1815] Engineering - try new agent pool

---
 build/azure-pipelines/product-build.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index ee7dcb99eeab..00ce0f6ed386 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -273,8 +273,7 @@ extends:
             - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
               - job: CLIMacOSX64
                 pool:
-                  name: Azure Pipelines
-                  image: macOS-13
+                  name: AcesShared
                   os: macOS
                 steps:
                   - template: build/azure-pipelines/darwin/cli-build-darwin.yml@self
@@ -286,8 +285,7 @@ extends:
             - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}:
               - job: CLIMacOSARM64
                 pool:
-                  name: Azure Pipelines
-                  image: macOS-13
+                  name: AcesShared
                   os: macOS
                 steps:
                   - template: build/azure-pipelines/darwin/cli-build-darwin.yml@self
@@ -618,8 +616,7 @@ extends:
             - ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
               - CompileCLI
           pool:
-            name: Azure Pipelines
-            image: macOS-13
+            name: AcesShared
             os: macOS
           variables:
             BUILDSECMON_OPT_IN: true

From 58312778a652fa5787651f621b28a03d4b8b81ab Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Wed, 12 Feb 2025 21:18:29 +0100
Subject: [PATCH 0110/1815] Revert CLI to use the hosted agents

---
 build/azure-pipelines/product-build.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 00ce0f6ed386..08c5da4b87b6 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -273,7 +273,8 @@ extends:
             - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
               - job: CLIMacOSX64
                 pool:
-                  name: AcesShared
+                  name: Azure Pipelines
+                  image: macOS-13
                   os: macOS
                 steps:
                   - template: build/azure-pipelines/darwin/cli-build-darwin.yml@self
@@ -285,7 +286,8 @@ extends:
             - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}:
               - job: CLIMacOSARM64
                 pool:
-                  name: AcesShared
+                  name: Azure Pipelines
+                  image: macOS-13
                   os: macOS
                 steps:
                   - template: build/azure-pipelines/darwin/cli-build-darwin.yml@self

From faab95eca047811960020d95d0cfc5282107945a Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 13 Feb 2025 00:27:37 +0100
Subject: [PATCH 0111/1815] Comment out the container stuff

---
 build/azure-pipelines/product-build.yml | 70 +++++++++++++------------
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 08c5da4b87b6..ac959cb66fda 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -194,15 +194,15 @@ extends:
         exclusionsFilePath: $(Build.SourcesDirectory)/.eslint-ignore
       sourceAnalysisPool: 1es-windows-2022-x64
       createAdoIssuesForJustificationsForDisablement: false
-    containers:
-      snapcraft:
-        image: vscodehub.azurecr.io/vscode-linux-build-agent:snapcraft-x64
-      ubuntu-2004-arm64:
-        image: onebranch.azurecr.io/linux/ubuntu-2004-arm64:latest
-    authenticatedContainerRegistries:
-      - registry: onebranch.azurecr.io
-        tenant: AME
-        identity: 1ESPipelineIdentity
+    # containers:
+    #   snapcraft:
+    #     image: vscodehub.azurecr.io/vscode-linux-build-agent:snapcraft-x64
+    #   ubuntu-2004-arm64:
+    #     image: onebranch.azurecr.io/linux/ubuntu-2004-arm64:latest
+    # authenticatedContainerRegistries:
+    #   - registry: onebranch.azurecr.io
+    #     tenant: AME
+    #     identity: 1ESPipelineIdentity
     stages:
       - stage: Compile
         jobs:
@@ -257,24 +257,25 @@ extends:
                       VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
                       VSCODE_BUILD_ALPINE: ${{ parameters.VSCODE_BUILD_ALPINE }}
 
-            - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true)) }}:
-              - job: CLIAlpineARM64
-                pool:
-                  name: 1es-mariner-2.0-arm64
-                  os: linux
-                  hostArchitecture: arm64
-                container: ubuntu-2004-arm64
-                steps:
-                  - template: build/azure-pipelines/alpine/cli-build-alpine.yml@self
-                    parameters:
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_BUILD_ALPINE_ARM64: ${{ parameters.VSCODE_BUILD_ALPINE_ARM64 }}
+            # - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true)) }}:
+            #   - job: CLIAlpineARM64
+            #     pool:
+            #       name: 1es-mariner-2.0-arm64
+            #       os: linux
+            #       hostArchitecture: arm64
+            #     container: ubuntu-2004-arm64
+            #     steps:
+            #       - template: build/azure-pipelines/alpine/cli-build-alpine.yml@self
+            #         parameters:
+            #           VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+            #           VSCODE_BUILD_ALPINE_ARM64: ${{ parameters.VSCODE_BUILD_ALPINE_ARM64 }}
 
             - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
               - job: CLIMacOSX64
                 pool:
-                  name: Azure Pipelines
-                  image: macOS-13
+                  name: AcesShared
+                  # name: Azure Pipelines
+                  # image: macOS-13
                   os: macOS
                 steps:
                   - template: build/azure-pipelines/darwin/cli-build-darwin.yml@self
@@ -286,8 +287,9 @@ extends:
             - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}:
               - job: CLIMacOSARM64
                 pool:
-                  name: Azure Pipelines
-                  image: macOS-13
+                  name: AcesShared
+                  # name: Azure Pipelines
+                  # image: macOS-13
                   os: macOS
                 steps:
                   - template: build/azure-pipelines/darwin/cli-build-darwin.yml@self
@@ -499,15 +501,15 @@ extends:
                       VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
                       VSCODE_RUN_SMOKE_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
 
-            - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX, true)) }}:
-              - job: LinuxSnap
-                dependsOn:
-                  - Linuxx64
-                container: snapcraft
-                variables:
-                  VSCODE_ARCH: x64
-                steps:
-                  - template: build/azure-pipelines/linux/snap-build-linux.yml@self
+            # - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX, true)) }}:
+            #   - job: LinuxSnap
+            #     dependsOn:
+            #       - Linuxx64
+            #     container: snapcraft
+            #     variables:
+            #       VSCODE_ARCH: x64
+            #     steps:
+            #       - template: build/azure-pipelines/linux/snap-build-linux.yml@self
 
             - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true)) }}:
               - job: LinuxArmhf

From e83a65169969f4c176de4c949a99172a57b6cf8d Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 13 Feb 2025 07:06:57 +0100
Subject: [PATCH 0112/1815] Update test arch

---
 build/azure-pipelines/product-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index ac959cb66fda..85ca10c9bab2 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -684,7 +684,7 @@ extends:
                 - job: macOSTest
                   timeoutInMinutes: 90
                   variables:
-                    VSCODE_ARCH: x64
+                    VSCODE_ARCH: arm64
                   steps:
                     - template: build/azure-pipelines/darwin/product-build-darwin.yml@self
                       parameters:

From e0fd265b6c23b48b94ae935079419972468f9b19 Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Wed, 12 Feb 2025 22:20:44 -0800
Subject: [PATCH 0113/1815] shellKind instead of shellType?

---
 .../common/extensionsApiProposals.ts          |  3 ++
 .../vscode.proposed.terminalShellKind.d.ts    | 36 +++++++++++++++++++
 .../vscode.proposed.terminalShellType.d.ts    |  5 ++-
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 src/vscode-dts/vscode.proposed.terminalShellKind.d.ts

diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index 5608a6295398..4e4d843975a3 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -352,6 +352,9 @@ const _allApiProposals = {
 	terminalShellEnv: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts',
 	},
+	terminalShellKind: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellKind.d.ts',
+	},
 	terminalShellType: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellType.d.ts',
 	},
diff --git a/src/vscode-dts/vscode.proposed.terminalShellKind.d.ts b/src/vscode-dts/vscode.proposed.terminalShellKind.d.ts
new file mode 100644
index 000000000000..06933676df00
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.terminalShellKind.d.ts
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	// https://github.com/microsoft/vscode/issues/230165
+
+	/**
+	 * Standardize on shell binary with list of possibilities.
+	 * For example, 'bash' for bash, 'pwsh' for powershell, 'zsh' for zsh, etc..
+	 */
+	export type TerminalShellKind = string;
+
+
+	// Part of TerminalState since the shellKind can change multiple times and this comes with an event.
+	// Should remain on state since it is one of those things about terminal that could change, like isinteracted with
+
+	// Discuss reason why string would be better than enum with numbers:
+	// 1. String is better for future asks, could never "remove a enum shell with number once added (breaking change)"
+	// 2. Its more obvious on extension side (extensions wont have to decode what the enum numbers are equivalent to)
+	// 3. Not as messy to maintenance (we already have huge list of enum shell types), for string we don't need to save anything? (But would we have to keep a list of all the possiblities with the binary?)
+	export interface TerminalState {
+		/**
+		 * The current detected shell type of the terminal. New shell types may be added in the
+		 * future in which case they will be returned as a number that is not part of
+		 * {@link TerminalShellKind}.
+		 * Includes number type to prevent the breaking change when new enum members are added?
+		 */
+		readonly shellKind?: TerminalShellKind | undefined;
+
+		// TODO: update terminal suggest, python env ext.
+	}
+
+}
diff --git a/src/vscode-dts/vscode.proposed.terminalShellType.d.ts b/src/vscode-dts/vscode.proposed.terminalShellType.d.ts
index e76defc65683..c7273f9e7ecf 100644
--- a/src/vscode-dts/vscode.proposed.terminalShellType.d.ts
+++ b/src/vscode-dts/vscode.proposed.terminalShellType.d.ts
@@ -26,6 +26,7 @@ declare module 'vscode' {
 		Node = 13
 	}
 
+
 	// Part of TerminalState since the shellType can change multiple times and this comes with an event.
 	export interface TerminalState {
 		/**
@@ -35,6 +36,8 @@ declare module 'vscode' {
 		 * Includes number type to prevent the breaking change when new enum members are added?
 		 */
 		readonly shellType?: TerminalShellType | number | undefined;
+		// readonly shellType?: string | undefined; better for future ask, not as messy to maintenance (we already have huge list of enum shell types)
+		// if change, update terminal suggest, python env ext.
 	}
-
+	// state: things about terminal that could change, like isinteracted with
 }

From 80871e3e88554fe08e057aec5382bf3bff06f019 Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Wed, 12 Feb 2025 22:27:58 -0800
Subject: [PATCH 0114/1815] remove unwanted

---
 src/vscode-dts/vscode.proposed.terminalShellType.d.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/vscode-dts/vscode.proposed.terminalShellType.d.ts b/src/vscode-dts/vscode.proposed.terminalShellType.d.ts
index c7273f9e7ecf..8e17aacdee92 100644
--- a/src/vscode-dts/vscode.proposed.terminalShellType.d.ts
+++ b/src/vscode-dts/vscode.proposed.terminalShellType.d.ts
@@ -27,7 +27,6 @@ declare module 'vscode' {
 	}
 
 
-	// Part of TerminalState since the shellType can change multiple times and this comes with an event.
 	export interface TerminalState {
 		/**
 		 * The current detected shell type of the terminal. New shell types may be added in the
@@ -36,8 +35,5 @@ declare module 'vscode' {
 		 * Includes number type to prevent the breaking change when new enum members are added?
 		 */
 		readonly shellType?: TerminalShellType | number | undefined;
-		// readonly shellType?: string | undefined; better for future ask, not as messy to maintenance (we already have huge list of enum shell types)
-		// if change, update terminal suggest, python env ext.
 	}
-	// state: things about terminal that could change, like isinteracted with
 }

From 2b7df9d5bb377054f055f2551e653eafaa06df8a Mon Sep 17 00:00:00 2001
From: Anthony Kim <anthonykim@microsoft.com>
Date: Wed, 12 Feb 2025 22:28:35 -0800
Subject: [PATCH 0115/1815] bring original

---
 src/vscode-dts/vscode.proposed.terminalShellType.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vscode-dts/vscode.proposed.terminalShellType.d.ts b/src/vscode-dts/vscode.proposed.terminalShellType.d.ts
index 8e17aacdee92..e76defc65683 100644
--- a/src/vscode-dts/vscode.proposed.terminalShellType.d.ts
+++ b/src/vscode-dts/vscode.proposed.terminalShellType.d.ts
@@ -26,7 +26,7 @@ declare module 'vscode' {
 		Node = 13
 	}
 
-
+	// Part of TerminalState since the shellType can change multiple times and this comes with an event.
 	export interface TerminalState {
 		/**
 		 * The current detected shell type of the terminal. New shell types may be added in the
@@ -36,4 +36,5 @@ declare module 'vscode' {
 		 */
 		readonly shellType?: TerminalShellType | number | undefined;
 	}
+
 }

From 0edef02bd274fcc4f45de1948a36cd43f69bd33a Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Thu, 13 Feb 2025 19:11:53 +0900
Subject: [PATCH 0116/1815] build: remove broken @vscode/node-addon-api

---
 build/.moduleignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/.moduleignore b/build/.moduleignore
index 01541e8c40a0..8d46e3ab8b42 100644
--- a/build/.moduleignore
+++ b/build/.moduleignore
@@ -130,6 +130,7 @@ vsda/**
 !@vscode/windows-ca-certs/package.json
 !@vscode/windows-ca-certs/**/*.node
 
+@vscode/node-addon-api/**/*
 node-addon-api/**/*
 prebuild-install/**/*
 

From f9d622f4fad86b767d8c5bc8df44234a3c42a532 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 13 Feb 2025 13:27:46 +0100
Subject: [PATCH 0117/1815] Compile on macOS ARM64

---
 build/azure-pipelines/product-build.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 85ca10c9bab2..211995a9146c 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -209,10 +209,13 @@ extends:
           - job: Compile
             timeoutInMinutes: 90
             pool:
-              name: 1es-ubuntu-22.04-x64
-              os: linux
+              name: AcesShared
+              os: macOS
+              # name: 1es-ubuntu-22.04-x64
+              # os: linux
             variables:
-              VSCODE_ARCH: x64
+              # VSCODE_ARCH: x64
+              VSCODE_ARCH: arm64
             steps:
               - template: build/azure-pipelines/product-compile.yml@self
                 parameters:

From bcc49ab8bffe996a98aa5952cd934ea2a61cab2c Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 13 Feb 2025 14:30:57 +0100
Subject: [PATCH 0118/1815] Update compile task

---
 build/azure-pipelines/product-compile.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index ea71c18ff7d9..dab972f74117 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -108,7 +108,8 @@ steps:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Compile & Hygiene (OSS)
   - ${{ else }}:
-    - script: npm exec -- npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check
+    # - script: npm exec -- npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check
+    - script: npm exec -- npm-run-all -lp core-ci extensions-ci
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Compile & Hygiene (non-OSS)

From 998962451c62e6e18b36f358a6084190aab2d3eb Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 13 Feb 2025 14:39:15 +0100
Subject: [PATCH 0119/1815] Update compile cache key

---
 build/azure-pipelines/product-compile.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index dab972f74117..7e4eee6d757b 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -23,7 +23,7 @@ steps:
     condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Registry
 
-  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js compile > .build/packagelockhash
+  - script: mkdir -p .build && node build/azure-pipelines/common/computeNodeModulesCacheKey.js compile $VSCODE_ARCH > .build/packagelockhash
     displayName: Prepare node_modules cache key
 
   - task: Cache@2
@@ -108,8 +108,7 @@ steps:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Compile & Hygiene (OSS)
   - ${{ else }}:
-    # - script: npm exec -- npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check
-    - script: npm exec -- npm-run-all -lp core-ci extensions-ci
+    - script: npm exec -- npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Compile & Hygiene (non-OSS)

From 79478ce1335aa954e593b5fa15e8294806750acb Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 13 Feb 2025 14:44:02 +0100
Subject: [PATCH 0120/1815] Disable build tools installation

---
 build/azure-pipelines/product-compile.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index 7e4eee6d757b..0f01f6e067a1 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -53,9 +53,9 @@ steps:
     condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none'))
     displayName: Setup NPM Authentication
 
-  - script: sudo apt update -y && sudo apt install -y build-essential pkg-config libx11-dev libx11-xcb-dev libxkbfile-dev libnotify-bin libkrb5-dev
-    displayName: Install build tools
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+  # - script: sudo apt update -y && sudo apt install -y build-essential pkg-config libx11-dev libx11-xcb-dev libxkbfile-dev libnotify-bin libkrb5-dev
+  #   displayName: Install build tools
+  #   condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
 
   - script: |
       set -e

From f630bea748afbdae705e0ef79fa29f2cbba1ff84 Mon Sep 17 00:00:00 2001
From: Kexy Biscuit <kexybiscuit@outlook.com>
Date: Sat, 8 Feb 2025 14:15:54 +0800
Subject: [PATCH 0121/1815] Detect the powershell-preview snap.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The powershell-preview snap provides `powershell-preview` command, make
the regular expression detects that too.

```shell
kexybiscuit@ProArtB550-CREATOR:~$ snap info powershell-preview
name:      powershell-preview
summary:   PowerShell for every system!
publisher: Microsoft PowerShell✓
store-url: https://snapcraft.io/powershell-preview
contact:   https://github.com/powershell/powershell
license:   unset
description: |
  PowerShell is an automation and configuration management platform.
  It consists of a cross-platform (Windows, Linux, and macOS)
  command-line shell and associated scripting language.

  See https://docs.microsoft.com/powershell/scripting/powershell-support-lifecycle for support
  details.
commands:
  - powershell-preview
snap-id:      D0A7ph8R6LBXQ8rgs2ad06s8tjyeowsd
tracking:     latest/stable
refresh-date: today at 14:12 CST
channels:
  latest/stable:    7.6.0-preview.2 2025-01-27 (165) 77MB classic
  latest/candidate: ↑
  latest/beta:      ↑
  latest/edge:      7.4.0-preview.3 2023-05-03 (142) 72MB classic
installed:          7.6.0-preview.2            (165) 77MB classic
kexybiscuit@ProArtB550-CREATOR:~$ sudo snap install powershell-preview --classic
2025-02-08T14:12:33+08:00 INFO Waiting for automatic snapd restart...
powershell-preview 7.6.0-preview.2 from Microsoft PowerShell✓ installed
kexybiscuit@ProArtB550-CREATOR:~$ command -v powershell-preview
/snap/bin/powershell-preview
```

Co-authored-by: Garfield Lee <Garfield550@users.noreply.github.com>
Signed-off-by: Kexy Biscuit <kexybiscuit@outlook.com>
---
 src/vs/platform/shell/node/shellEnv.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/platform/shell/node/shellEnv.ts b/src/vs/platform/shell/node/shellEnv.ts
index 0fde4b76e6e2..8f4fbf6c4950 100644
--- a/src/vs/platform/shell/node/shellEnv.ts
+++ b/src/vs/platform/shell/node/shellEnv.ts
@@ -129,7 +129,7 @@ async function doResolveUnixShellEnv(logService: ILogService, token: Cancellatio
 		const name = basename(systemShellUnix);
 		let command: string, shellArgs: Array<string>;
 		const extraArgs = '';
-		if (/^(?:pwsh(?:-preview)?|powershell)$/.test(name)) {
+		if (/^(?:pwsh|powershell)(?:-preview)?$/.test(name)) {
 			// Older versions of PowerShell removes double quotes sometimes so we use "double single quotes" which is how
 			// you escape single quotes inside of a single quoted string.
 			command = `& '${process.execPath}' ${extraArgs} -p '''${mark}'' + JSON.stringify(process.env) + ''${mark}'''`;

From ea42bc665f01f4872cac73c6fa8e91a9c612d8c3 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Mon, 3 Feb 2025 09:36:28 -0800
Subject: [PATCH 0122/1815] chore: test EnableDefenderForLinux feature flag

---
 build/azure-pipelines/product-build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 7e680884b45d..b375e8b39aab 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -200,6 +200,8 @@ extends:
         image: vscodehub.azurecr.io/vscode-linux-build-agent:snapcraft-x64
       ubuntu-2004-arm64:
         image: onebranch.azurecr.io/linux/ubuntu-2004-arm64:latest
+    featureFlags:
+      EnableDefenderForLinux: true
     stages:
       - stage: Compile
         jobs:

From 690caf2e14af731dc99afe717d8554808b192b6e Mon Sep 17 00:00:00 2001
From: Seong Min Park <psm03120@gmail.com>
Date: Wed, 19 Feb 2025 22:36:54 +0900
Subject: [PATCH 0123/1815] logger

---
 .../markdown-language-features/package.json   | 21 ------
 .../markdown-language-features/src/logging.ts | 73 ++-----------------
 2 files changed, 6 insertions(+), 88 deletions(-)

diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 326287ac7a64..7d03b4d634b6 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -442,27 +442,6 @@
             "%configuration.markdown.suggest.paths.includeWorkspaceHeaderCompletions.onSingleOrDoubleHash%"
           ]
         },
-        "markdown.trace.extension": {
-          "type": "string",
-          "enum": [
-            "off",
-            "verbose"
-          ],
-          "default": "off",
-          "description": "%markdown.trace.extension.desc%",
-          "scope": "window"
-        },
-        "markdown.trace.server": {
-          "type": "string",
-          "scope": "window",
-          "enum": [
-            "off",
-            "messages",
-            "verbose"
-          ],
-          "default": "off",
-          "description": "%markdown.trace.server.desc%"
-        },
         "markdown.server.log": {
           "type": "string",
           "scope": "window",
diff --git a/extensions/markdown-language-features/src/logging.ts b/extensions/markdown-language-features/src/logging.ts
index 6c114ae40e57..7bdd0c243417 100644
--- a/extensions/markdown-language-features/src/logging.ts
+++ b/extensions/markdown-language-features/src/logging.ts
@@ -6,87 +6,26 @@
 import * as vscode from 'vscode';
 import { Disposable } from './util/dispose';
 
-enum Trace {
-	Off,
-	Verbose
-}
-
-namespace Trace {
-	export function fromString(value: string): Trace {
-		value = value.toLowerCase();
-		switch (value) {
-			case 'off':
-				return Trace.Off;
-			case 'verbose':
-				return Trace.Verbose;
-			default:
-				return Trace.Off;
-		}
-	}
-}
 
 export interface ILogger {
-	verbose(title: string, message: string, data?: any): void;
+	verbose(message: string, ...args: any[]): void;
 }
 
 export class VsCodeOutputLogger extends Disposable implements ILogger {
-	private _trace?: Trace;
-
-	private _outputChannelValue?: vscode.OutputChannel;
+	private _outputChannelValue?: vscode.LogOutputChannel;
 
 	private get _outputChannel() {
-		this._outputChannelValue ??= this._register(vscode.window.createOutputChannel('Markdown'));
+		this._outputChannelValue ??= vscode.window.createOutputChannel('TypeScript', { log: true });
 		return this._outputChannelValue;
 	}
 
 	constructor() {
 		super();
-
-		this._register(vscode.workspace.onDidChangeConfiguration(() => {
-			this._updateConfiguration();
-		}));
-
-		this._updateConfiguration();
-	}
-
-	public verbose(title: string, message: string, data?: any): void {
-		if (this._trace === Trace.Verbose) {
-			this._appendLine(`[Verbose ${this._now()}] ${title}: ${message}`);
-			if (data) {
-				this._appendLine(VsCodeOutputLogger._data2String(data));
-			}
-		}
-	}
-
-	private _now(): string {
-		const now = new Date();
-		return String(now.getUTCHours()).padStart(2, '0')
-			+ ':' + String(now.getMinutes()).padStart(2, '0')
-			+ ':' + String(now.getUTCSeconds()).padStart(2, '0') + '.' + String(now.getMilliseconds()).padStart(3, '0');
-	}
-
-	private _updateConfiguration(): void {
-		this._trace = this._readTrace();
 	}
 
-	private _appendLine(value: string): void {
-		this._outputChannel.appendLine(value);
-	}
-
-	private _readTrace(): Trace {
-		return Trace.fromString(vscode.workspace.getConfiguration().get<string>('markdown.trace.extension', 'off'));
-	}
-
-	private static _data2String(data: any): string {
-		if (data instanceof Error) {
-			if (typeof data.stack === 'string') {
-				return data.stack;
-			}
-			return data.message;
-		}
-		if (typeof data === 'string') {
-			return data;
+	public verbose(message: string, ...args: any[]): void {
+		if (this._outputChannel.logLevel === vscode.LogLevel.Trace) {
+			this._outputChannel.trace(message, ...args);
 		}
-		return JSON.stringify(data, undefined, 2);
 	}
 }

From 1112d5ffa6bd430ab53935bf026b39c8874e0d3a Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 19 Feb 2025 11:25:54 -0800
Subject: [PATCH 0124/1815] Use pacdoc to convert man to markdown

---
 .../scripts/pullZshBuiltins.ts                | 101 ++---
 .../src/shell/zshBuiltinsCache.json           | 357 +++++++++++-------
 2 files changed, 273 insertions(+), 185 deletions(-)

diff --git a/extensions/terminal-suggest/scripts/pullZshBuiltins.ts b/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
index 9f60c302fc7e..c52a7c78ce90 100644
--- a/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
+++ b/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
@@ -113,63 +113,74 @@ async function createCommandDescriptionsCache(): Promise<void> {
 	let output = '';
 
 	try {
-		output = await execAsync('man zshbuiltins').then(r => r.stdout);
+		output = await execAsync('pandoc --from man --to markdown --wrap=none < $(man -w zshbuiltins)').then(r => r.stdout);
 	} catch {
 	}
 
+	const commands: Map<string, string[]> = new Map();
 	if (output) {
-		// Strip all backspaces from the output
-		output = output.replace(/.\x08/g, '');
+		console.log('!');
 		const lines = output.split('\n');
-
 		let currentCommand: string | undefined;
-		let currentDescription: string[] = [];
-		let currentArgs: string | undefined;
-		let commandSectionStarted = false; // Flag to ensure we ignore unrelated lines at the start
-
-		for (let i = 0; i < lines.length; i++) {
-			const line = lines[i];
-
-			// Detect command names (lines starting with exactly 7 spaces)
-			const cmdMatch = line.match(/^\s{7}(\S+)(?:\s+(.*))?/);
-			if (cmdMatch?.length && cmdMatch.length > 1) {
-				commandSectionStarted = true; // Now we know we're in the right section
-
-				// Store the previous command before moving on to the new one
-				if (currentCommand && currentDescription.join(' ').trim().length) {
-					const shortDescription = shortDescriptions.get(currentCommand);
-					const description = currentDescription.join(' ').trim();
-					const args = `${currentCommand} ${currentArgs}`;
-					if (shortDescription) {
-						cachedCommandDescriptions.set(currentCommand, {
-							shortDescription,
-							description,
-							args
-						});
-					} else {
-						cachedCommandDescriptions.set(currentCommand, {
-							description,
-							args
-						});
+		let currentCommandStart = 0;
+		let seenOutput = false;
+		let i = 0;
+		for (; i < lines.length; i++) {
+			if (!currentCommand || seenOutput) {
+				const match = lines[i].match(/^\*\*(?<command>[a-z]+)\*\*(?:\s\*.+\*)?$/);
+				if (match?.groups?.command) {
+					if (currentCommand) {
+						commands.set(currentCommand, lines.slice(currentCommandStart, i));
 					}
+					currentCommand = match.groups.command;
+					currentCommandStart = i;
+					seenOutput = false;
 				}
-
-				// Start a new command entry
-				currentCommand = cmdMatch[1];
-				currentArgs = cmdMatch[2];
-				currentDescription = []; // Reset description for the new command
 			}
-			// Capture description lines (14 spaces indentation) only if we have detected a command section
-			else if (commandSectionStarted && currentCommand && line.match(/^\s{14}/)) {
-				currentDescription.push(line.trim());
+			if (!currentCommand) {
+				continue;
+			}
+			// There may be several examples of usage
+			if (!seenOutput) {
+				seenOutput = lines[i].length > 0 && !lines[i].match(/^\*\*(?<command>[a-z]+)\*\*(?:\s\*.+\*)?$/);
 			}
 		}
+		if (currentCommand) {
+			commands.set(currentCommand, lines.slice(currentCommandStart, i - 1));
+		}
+	}
+
+	if (commands.size === 0) {
+		console.error('\x1b[31mFailed to parse command descriptions\x1b[30m');
+		process.exit(1);
+	}
 
-		// Store the last command in the loop
-		if (currentCommand && currentDescription.join(' ').trim().length) {
-			cachedCommandDescriptions.set(currentCommand, {
-				description: currentDescription.join(' ').trim(),
-				args: currentArgs ? `${currentCommand} ${currentArgs}` : undefined
+	for (const [command, lines] of commands) {
+		const shortDescription = shortDescriptions.get(command);
+		let argsEnd = 0;
+		try {
+			while (true) {
+				const line = lines[++argsEnd];
+				if (line.trim().length > 0 && !line.match(/^\*\*(?<command>[a-z]+)\*\*(?:\s\*.+\*)?$/)) {
+					break;
+				}
+			}
+		} catch (e) {
+			console.log(e);
+		}
+		const formattedArgs = lines.slice(0, argsEnd - 1).join('\n');
+		const args = (await execAsync(`pandoc --from markdown --to plain <<< "${formattedArgs}"`)).stdout.trim();
+		const description = lines.slice(argsEnd).join('\n').trim();
+		if (shortDescription) {
+			cachedCommandDescriptions.set(command, {
+				shortDescription,
+				description,
+				args
+			});
+		} else {
+			cachedCommandDescriptions.set(command, {
+				description,
+				args
 			});
 		}
 	}
diff --git a/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json b/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json
index 8bb679a13618..f2d8b6082e0f 100644
--- a/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json
+++ b/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json
@@ -1,422 +1,499 @@
 {
-  "-": {
-    "description": "See the section `Precommand Modifiers' in zshmisc(1).",
-    "args": "- simple command"
-  },
-  ".": {
-    "shortDescription": "Source a file",
-    "description": "Read commands from file and execute them in the current shell environment. If file does not contain a slash, or if PATH_DIRS is set, the shell looks in the components of $path to find the directory containing file.  Files in the current directory are not read unless `.' appears somewhere in $path.  If a file named `file.zwc' is found, is newer than file, and is the compiled form (created with the zcompile builtin) of file, then commands are read from that file instead of file. If any arguments arg are given, they become the positional parameters; the old positional parameters are restored when the file is done executing.  However, if no arguments are given, the positional parameters remain those of the calling context, and no restoring is done. If file was not found the return status is 127; if file was found but contained a syntax error the return status is 126; else the return status is the exit status of the last command executed.",
-    "args": ". file [ arg ... ]"
-  },
-  ":": {
-    "shortDescription": "No effect",
-    "description": "This command does nothing, although normal argument expansions is performed which may have effects on shell parameters.  A zero exit status is returned.",
-    "args": ": [ arg ... ]"
-  },
-  "alias": {
-    "shortDescription": "Define or view aliases",
-    "description": "For each name with a corresponding value, define an alias with that value.  A trailing space in value causes the next word to be checked for alias expansion.  If the -g flag is present, define a global alias; global aliases are expanded even if they do not occur in command position: % perldoc --help 2>&1 | grep 'built-in functions' -f   Search Perl built-in functions % alias -g HG='--help 2>&1 | grep' % perldoc HG 'built-in functions' -f   Search Perl built-in functions If the -s flag is present, define a suffix alias: if the command word on a command line is in the form `text.name', where text is any non-empty string, it is replaced by the text `value text.name'.  Note that name is treated as a literal string, not a pattern.  A trailing space in value is not special in this case.  For example, alias -s ps='gv --' will cause the command `*.ps' to be expanded to `gv -- *.ps'. As alias expansion is carried out earlier than globbing, the `*.ps' will then be expanded.  Suffix aliases constitute a different name space from other aliases (so in the above example it is still possible to create an alias for the command ps) and the two sets are never listed together. For each name with no value, print the value of name, if any. With no arguments, print all currently defined aliases other than suffix aliases.  If the -m flag is given the arguments are taken as patterns (they should be quoted to preserve them from being interpreted as glob patterns), and the aliases matching these patterns are printed.  When printing aliases and one of the -g, -r or -s flags is present, restrict the printing to global, regular or suffix aliases, respectively; a regular alias is one which is neither a global nor a suffix alias.   Using `+' instead of `-', or ending the option list with a single `+', prevents the values of the aliases from being printed. If the -L flag is present, then print each alias in a manner suitable for putting in a startup script.  The exit status is nonzero if a name (with no value) is given for which no alias has been defined. For more on aliases, include common problems, see the section ALIASING in zshmisc(1).",
-    "args": "alias [ {+|-}gmrsL ] [ name[=value] ... ]"
-  },
-  "autoload": {
-    "shortDescription": "Autoload a function",
-    "description": "See the section `Autoloading Functions' in zshmisc(1) for full details.  The fpath parameter will be searched to find the function definition when the function is first referenced. If name consists of an absolute path, the function is defined to load from the file given (searching as usual for dump files in the given location).  The name of the function is the basename (non-directory part) of the file.  It is normally an error if the function is not found in the given location; however, if the option -d is given, searching for the function defaults to $fpath.  If a function is loaded by absolute path, any functions loaded from it that are marked for autoload without an absolute path have the load path of the parent function temporarily prepended to $fpath. If the option -r or -R is given, the function is searched for immediately and the location is recorded internally for use when the function is executed; a relative path is expanded using the value of $PWD.  This protects against a change to $fpath after the call to autoload.  With -r, if the function is not found, it is silently left unresolved until execution; with -R, an error message is printed and command processing aborted immediately the search fails, i.e. at the autoload command rather than at function execution.. The flag -X may be used only inside a shell function.  It causes the calling function to be marked for autoloading and then immediately loaded and executed, with the current array of positional parameters as arguments.  This replaces the previous definition of the function.  If no function definition is found, an error is printed and the function remains undefined and marked for autoloading.  If an argument is given, it is used as a directory (i.e. it does not include the name of the function) in which the function is to be found; this may be combined with the -d option to allow the function search to default to $fpath if it is not in the given location. The flag +X attempts to load each name as an autoloaded function, but does not execute it.  The exit status is zero (success) if the function was not previously defined and a definition for it was found.  This does not replace any existing definition of the function.  The exit status is nonzero (failure) if the function was already defined or when no definition was found.  In the latter case the function remains undefined and marked for autoloading.  If ksh-style autoloading is enabled, the function created will contain the contents of the file plus a call to the function itself appended to it, thus giving normal ksh autoloading behaviour on the first call to the function.  If the -m flag is also given each name is treated as a pattern and all functions already marked for autoload that match the pattern are loaded. With the -t flag, turn on execution tracing; with -T, turn on execution tracing only for the current function, turning it off on entry to any called functions that do not also have tracing enabled. With the -U flag, alias expansion is suppressed when the function is loaded. With the -w flag, the names are taken as names of files compiled with the zcompile builtin, and all functions defined in them are marked for autoloading. The flags -z and -k mark the function to be autoloaded using the zsh or ksh style, as if the option KSH_AUTOLOAD were unset or were set, respectively.  The flags override the setting of the option at the time the function is loaded. Note that the autoload command makes no attempt to ensure the shell options set during the loading or execution of the file have any particular value.  For this, the emulate command can be used: emulate zsh -c 'autoload -Uz func' arranges that when func is loaded the shell is in native zsh emulation, and this emulation is also applied when func is run. Some of the functions of autoload are also provided by functions -u or functions -U, but autoload is a more comprehensive interface.",
-    "args": "autoload [ {+|-}RTUXdkmrtWz ] [ -w ] [ name ... ]"
-  },
-  "job": {
-    "description": "Bring each specified job in turn to the foreground.  If no job is specified, resume the current job.",
-    "args": "job ..."
+  "bg": {
+    "shortDescription": "Put a job in the background",
+    "description": "*job \\...* **&** Put each specified *job in the background,* or the current job if none is specified.\n",
+    "args": "bg [ job ... ]"
   },
   "bindkey": {
     "shortDescription": "Manipulate keymap names",
-    "description": "See the section `Zle Builtins' in zshzle(1).",
-    "args": "bindkey undefined"
+    "description": ":   See the section \\`Zle Builtins\\' in *zshzle(1).*\n",
+    "args": "bindkey"
   },
   "break": {
     "shortDescription": "Exit from a loop",
-    "description": "Exit from an enclosing for, while, until, select or repeat loop. If an arithmetic expression n is specified, then break n levels instead of just one.",
+    "description": ":   Exit from an enclosing **for***,* **while***,* **until***,* **select** *or* **repeat** *loop. If an arithmetic expression n* is specified, then break *n levels instead of just one.*\n",
     "args": "break [ n ]"
   },
   "builtin": {
     "shortDescription": "Executes a builtin",
-    "description": "Executes the builtin name, with the given args.",
+    "description": ":   Executes the builtin *name, with the given args.*\n",
     "args": "builtin name [ args ... ]"
   },
+  "bye": {
+    "shortDescription": "Exit the shell",
+    "description": ":   Same as **exit***.*\n",
+    "args": "bye"
+  },
+  "cap": {
+    "description": ":   See the section \\`The zsh/cap Module\\' in *zshmodules(1).*\n",
+    "args": "cap"
+  },
   "cd": {
-    "description": "Change the current directory.  In the first form, change the current directory to arg, or to the value of $HOME if arg is not specified.  If arg is `-', change to the previous directory. Otherwise, if arg begins with a slash, attempt to change to the directory given by arg. If arg does not begin with a slash, the behaviour depends on whether the current directory `.' occurs in the list of directories contained in the shell parameter cdpath.  If it does not, first attempt to change to the directory arg under the current directory, and if that fails but cdpath is set and contains at least one element attempt to change to the directory arg under each component of cdpath in turn until successful.  If `.' occurs in cdpath, then cdpath is searched strictly in order so that `.' is only tried at the appropriate point. The order of testing cdpath is modified if the option POSIX_CD is set, as described in the documentation for the option. If no directory is found, the option CDABLE_VARS is set, and a parameter named arg exists whose value begins with a slash, treat its value as the directory.  In that case, the parameter is added to the named directory hash table. The second form of cd substitutes the string new for the string old in the name of the current directory, and tries to change to this new directory. The third form of cd extracts an entry from the directory stack, and changes to that directory.  An argument of the form `+n' identifies a stack entry by counting from the left of the list shown by the dirs command, starting with zero.  An argument of the form `-n' counts from the right.  If the PUSHD_MINUS option is set, the meanings of `+' and `-' in this context are swapped. If the POSIX_CD option is set, this form of cd is not recognised and will be interpreted as the first form. If the -q (quiet) option is specified, the hook function chpwd and the functions in the array chpwd_functions are not called. This is useful for calls to cd that do not change the environment seen by an interactive user. If the -s option is specified, cd refuses to change the current directory if the given pathname contains symlinks.  If the -P option is given or the CHASE_LINKS option is set, symbolic links are resolved to their true values.  If the -L option is given symbolic links are retained in the directory (and not resolved) regardless of the state of the CHASE_LINKS option.",
-    "args": "cd [ -qsLP ] {+|-}n"
+    "description": "**cd** *\\[* **-qsLP** *\\] {***+***\\|***-***}n* Change the current directory. In the first form, change the current directory to *arg, or to the value of* **\\$HOME** *if* *arg is not specified. If arg is \\`***-***\\', change to the* previous directory.\n\n> Otherwise, if *arg begins with a slash, attempt to change to the* directory given by *arg.*\n>\n> If *arg does not begin with a slash, the behaviour depends on whether* the current directory \\`**.***\\' occurs in the list of directories contained* in the shell parameter **cdpath***. If it does not, first attempt to change* to the directory *arg under the current directory, and if that fails* but **cdpath** *is set and contains at least one element attempt to change* to the directory *arg under each component of* **cdpath** *in turn until* successful. If \\`**.***\\' occurs in* **cdpath***, then* **cdpath** *is searched* strictly in order so that \\`**.***\\' is only tried at the appropriate point.*\n>\n> The order of testing **cdpath** *is modified if the option* **POSIX_CD** is set, as described in the documentation for the option.\n>\n> If no directory is found, the option **CDABLE_VARS** *is set, and a* parameter named *arg exists whose value begins with a slash, treat its* value as the directory. In that case, the parameter is added to the named directory hash table.\n>\n> The second form of **cd** *substitutes the string new* for the string *old in the name of the current directory,* and tries to change to this new directory.\n>\n> The third form of **cd** *extracts an entry from the directory* stack, and changes to that directory. An argument of the form \\`**+***n\\' identifies a stack entry by counting from the left* of the list shown by the **dirs** *command, starting with zero.* An argument of the form \\`**-***n\\' counts from the right.* If the **PUSHD_MINUS** *option is set, the meanings of \\`***+***\\'* and \\`**-***\\' in this context are swapped.* If the **POSIX_CD** *option is set, this form of* **cd** *is not recognised* and will be interpreted as the first form.\n>\n> If the **-q** *(quiet) option is specified, the hook function* **chpwd** and the functions in the array **chpwd_functions** *are not called.* This is useful for calls to **cd** *that do not change the environment* seen by an interactive user.\n>\n> If the **-s** *option is specified,* **cd** *refuses to change the current* directory if the given pathname contains symlinks. If the **-P** *option* is given or the **CHASE_LINKS** *option is set, symbolic links are resolved* to their true values. If the **-L** *option is given symbolic links are* retained in the directory (and not resolved) regardless of the state of the **CHASE_LINKS** *option.*\n",
+    "args": "cd [ -qsLP ] [ arg ]\n\ncd [ -qsLP ] old new"
+  },
+  "chdir": {
+    "shortDescription": "Change the current directory",
+    "description": ":   Same as **cd***.*\n",
+    "args": "chdir"
+  },
+  "clone": {
+    "description": ":   See the section \\`The zsh/clone Module\\' in *zshmodules(1).*\n",
+    "args": "clone"
   },
   "command": {
-    "description": "The simple command argument is taken as an external command instead of a function or builtin and is executed. If the POSIX_BUILTINS option is set, builtins will also be executed but certain special properties of them are suppressed. The -p flag causes a default path to be searched instead of that in $path. With the -v flag, command is similar to whence and with -V, it is equivalent to whence -v. See also the section `Precommand Modifiers' in zshmisc(1).",
+    "description": ":   The simple command argument is taken as an external command instead of a function or builtin and is executed. If the **POSIX_BUILTINS** *option* is set, builtins will also be executed but certain special properties of them are suppressed. The **-p** *flag causes a default path to be* searched instead of that in **\\$path***. With the* **-v** *flag,* **command** is similar to **whence** *and with* **-V***, it is equivalent to* **whence** -v*.*\n\n    See also the section \\`Precommand Modifiers\\' in *zshmisc(1).*\n",
     "args": "command [ -pvV ] simple command"
   },
   "comparguments": {
     "shortDescription": "Complete arguments",
-    "description": "See the section `The zsh/computil Module' in zshmodules(1).",
-    "args": "comparguments undefined"
+    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*\n",
+    "args": "comparguments"
   },
   "compcall": {
     "shortDescription": "Complete call",
-    "description": "See the section `The zsh/compctl Module' in zshmodules(1).",
-    "args": "compcall undefined"
+    "description": ":   See the section \\`The zsh/compctl Module\\' in *zshmodules(1).*\n",
+    "args": "compcall"
   },
   "compctl": {
     "shortDescription": "Complete control",
-    "description": "See the section `The zsh/compctl Module' in zshmodules(1).",
-    "args": "compctl undefined"
+    "description": ":   See the section \\`The zsh/compctl Module\\' in *zshmodules(1).*\n",
+    "args": "compctl"
   },
   "compdescribe": {
     "shortDescription": "Complete describe",
-    "description": "See the section `The zsh/computil Module' in zshmodules(1).",
-    "args": "compdescribe undefined"
+    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*\n",
+    "args": "compdescribe"
   },
   "compfiles": {
     "shortDescription": "Complete files",
-    "description": "See the section `The zsh/computil Module' in zshmodules(1).",
-    "args": "compfiles undefined"
+    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*\n",
+    "args": "compfiles"
   },
   "compgroups": {
     "shortDescription": "Complete groups",
-    "description": "See the section `The zsh/computil Module' in zshmodules(1).",
-    "args": "compgroups undefined"
+    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*\n",
+    "args": "compgroups"
   },
   "compquote": {
     "shortDescription": "Complete quote",
-    "description": "See the section `The zsh/computil Module' in zshmodules(1).",
-    "args": "compquote undefined"
+    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*\n",
+    "args": "compquote"
   },
   "comptags": {
     "shortDescription": "Complete tags",
-    "description": "See the section `The zsh/computil Module' in zshmodules(1).",
-    "args": "comptags undefined"
+    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*\n",
+    "args": "comptags"
   },
   "comptry": {
     "shortDescription": "Complete try",
-    "description": "See the section `The zsh/computil Module' in zshmodules(1).",
-    "args": "comptry undefined"
+    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*\n",
+    "args": "comptry"
   },
   "compvalues": {
     "shortDescription": "Complete values",
-    "description": "See the section `The zsh/computil Module' in zshmodules(1).",
-    "args": "compvalues undefined"
+    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*\n",
+    "args": "compvalues"
   },
   "continue": {
     "shortDescription": "Resume the next loop iteration",
-    "description": "Resume the next iteration of the enclosing for, while, until, select or repeat loop. If an arithmetic expression n is specified, break out of n-1 loops and resume at the nth enclosing loop.",
+    "description": ":   Resume the next iteration of the enclosing **for***,* **while***,* **until***,* **select** *or* **repeat** *loop. If an arithmetic expression n is specified, break out of* *n-1 loops and resume at the nth enclosing loop.*\n",
     "args": "continue [ n ]"
   },
   "declare": {
     "shortDescription": "Set or display parameter attributes/values",
-    "description": "Same as typeset.",
-    "args": "declare undefined"
+    "description": ":   Same as **typeset***.*\n",
+    "args": "declare"
   },
   "dirs": {
     "shortDescription": "Interact with directory stack",
-    "description": "With no arguments, print the contents of the directory stack. Directories are added to this stack with the pushd command, and removed with the cd or popd commands.  If arguments are specified, load them onto the directory stack, replacing anything that was there, and push the current directory onto the stack. -c     clear the directory stack. -l     print directory names in full instead of using of using ~ expressions (see Dynamic and Static named directories in zshexpn(1)). -p     print directory entries one per line. -v     number the directories in the stack when printing.",
-    "args": "dirs [ -lpv ]"
+    "description": "**dirs** *\\[* **-lpv** *\\]* With no arguments, print the contents of the directory stack. Directories are added to this stack with the **pushd** *command,* and removed with the **cd** *or* **popd** *commands.* If arguments are specified, load them onto the directory stack, replacing anything that was there, and push the current directory onto the stack.\n\n> **-c** clear the directory stack.\n>\n> **-l**\n>\n> :   print directory names in full instead of using of using **\\~** *expressions (see Dynamic and Static named directories in zshexpn(1)).*\n>\n> **-p**\n>\n> :   print directory entries one per line.\n>\n> **-v**\n>\n> :   number the directories in the stack when printing.\n",
+    "args": "dirs [ -c ] [ arg ... ]"
   },
   "disable": {
     "shortDescription": "Disable shell features",
-    "description": "Temporarily disable the named hash table elements or patterns. The default is to disable builtin commands.  This allows you to use an external command with the same name as a builtin command. The -a option causes disable to act on regular or global aliases.  The -s option causes disable to act on suffix aliases. The -f option causes disable to act on shell functions.  The -r options causes disable to act on reserved words.  Without arguments all disabled hash table elements from the corresponding hash table are printed.  With the -m flag the arguments are taken as patterns (which should be quoted to prevent them from undergoing filename expansion), and all hash table elements from the corresponding hash table matching these patterns are disabled.  Disabled objects can be enabled with the enable command. With the option -p, name ... refer to elements of the shell's pattern syntax as described in the section `Filename Generation'.  Certain elements can be disabled separately, as given below. Note that patterns not allowed by the current settings for the options EXTENDED_GLOB, KSH_GLOB and SH_GLOB are never enabled, regardless of the setting here.  For example, if EXTENDED_GLOB is not active, the pattern ^ is ineffective even if `disable -p \"^\"' has not been issued.  The list below indicates any option settings that restrict the use of the pattern.  It should be noted that setting SH_GLOB has a wider effect than merely disabling patterns as certain expressions, in particular those involving parentheses, are parsed differently. The following patterns may be disabled; all the strings need quoting on the command line to prevent them from being interpreted immediately as patterns and the patterns are shown below in single quotes as a reminder. '?'    The pattern character ? wherever it occurs, including when preceding a parenthesis with KSH_GLOB. '*'    The pattern character * wherever it occurs, including recursive globbing and when preceding a parenthesis with KSH_GLOB. '['    Character classes. '<' (NO_SH_GLOB) Numeric ranges. '|' (NO_SH_GLOB) Alternation in grouped patterns, case statements, or KSH_GLOB parenthesised expressions. '(' (NO_SH_GLOB) Grouping using single parentheses.  Disabling this does not disable the use of parentheses for KSH_GLOB where they are introduced by a special character, nor for glob qualifiers (use `setopt NO_BARE_GLOB_QUAL' to disable glob qualifiers that use parentheses only). '~' (EXTENDED_GLOB) Exclusion in the form A~B. '^' (EXTENDED_GLOB) Exclusion in the form A^B. '#' (EXTENDED_GLOB) The pattern character # wherever it occurs, both for repetition of a previous pattern and for indicating globbing flags. '?(' (KSH_GLOB) The grouping form ?(...).  Note this is also disabled if '?' is disabled. '*(' (KSH_GLOB) The grouping form *(...).  Note this is also disabled if '*' is disabled. '+(' (KSH_GLOB) The grouping form +(...). '!(' (KSH_GLOB) The grouping form !(...). '@(' (KSH_GLOB) The grouping form @(...).",
+    "description": ":   Temporarily disable the *named hash table elements or patterns. The default* is to disable builtin commands. This allows you to use an external command with the same name as a builtin command. The **-a** *option* causes **disable** *to act on regular or global aliases. The* **-s** option causes **disable** *to act on suffix aliases. The* **-f** *option causes* **disable** *to act on shell functions. The* **-r** *options causes* **disable** *to act on reserved words. Without arguments all disabled* hash table elements from the corresponding hash table are printed. With the **-m** *flag the arguments are taken as patterns (which should be* quoted to prevent them from undergoing filename expansion), and all hash table elements from the corresponding hash table matching these patterns are disabled. Disabled objects can be enabled with the **enable** command.\n\n    With the option **-p***, name \\... refer to elements of the* shell\\'s pattern syntax as described in the section \\`Filename Generation\\'. Certain elements can be disabled separately, as given below.\n\n    Note that patterns not allowed by the current settings for the options **EXTENDED_GLOB***,* **KSH_GLOB** *and* **SH_GLOB** *are never enabled, regardless of the* setting here. For example, if **EXTENDED_GLOB** *is not active,* the pattern **\\^** *is ineffective even if \\`***disable -p \\\"\\^\\\"***\\' has* not been issued. The list below indicates any option settings that restrict the use of the pattern. It should be noted that setting **SH_GLOB** *has a wider effect than merely disabling patterns* as certain expressions, in particular those involving parentheses, are parsed differently.\n\n    The following patterns may be disabled; all the strings need quoting on the command line to prevent them from being interpreted immediately as patterns and the patterns are shown below in single quotes as a reminder.\n\n    **\\'?\\'** The pattern character **?** *wherever it occurs, including when preceding* a parenthesis with **KSH_GLOB***.*\n\n    **\\'\\*\\'**\n\n    :   The pattern character **\\*** *wherever it occurs, including recursive* globbing and when preceding a parenthesis with **KSH_GLOB***.*\n\n    **\\'\\[\\'**\n\n    :   Character classes.\n\n    **\\'\\<\\'** *(***NO_SH_GLOB***)*\n\n    :   Numeric ranges.\n\n    **\\'\\|\\'** *(***NO_SH_GLOB***)*\n\n    :   Alternation in grouped patterns, case statements, or KSH_GLOB parenthesised expressions.\n\n    **\\'(\\'** *(***NO_SH_GLOB***)*\n\n    :   Grouping using single parentheses. Disabling this does not disable the use of parentheses for **KSH_GLOB** *where they are introduced by a* special character, nor for glob qualifiers (use \\`**setopt** NO_BARE_GLOB_QUAL*\\' to disable glob qualifiers that use parentheses* only).\n\n    **\\'\\~\\'** *(***EXTENDED_GLOB***)*\n\n    :   Exclusion in the form *A***\\~***B.*\n\n    **\\'\\^\\'** *(***EXTENDED_GLOB***)*\n\n    :   Exclusion in the form *A***\\^***B.*\n\n    **\\'#\\'** *(***EXTENDED_GLOB***)*\n\n    :   The pattern character **\\#** *wherever it occurs, both for* repetition of a previous pattern and for indicating globbing flags.\n\n    **\\'?(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **?(***\\...***)***. Note this is also* disabled if **\\'?\\'** *is disabled.*\n\n    **\\'\\*(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **\\*(***\\...***)***. Note this is also* disabled if **\\'\\*\\'** *is disabled.*\n\n    **\\'+(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **+(***\\...***)***.*\n\n    **\\'!(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **!(***\\...***)***.*\n\n    **\\'@(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **@(***\\...***)***.*\n",
     "args": "disable [ -afmprs ] name ..."
   },
+  "disown": {
+    "shortDescription": "Remove job from job table",
+    "description": "*job \\...* **&\\|**\n\n*job \\...* **&!** Remove the specified *jobs from the job table; the shell will* no longer report their status, and will not complain if you try to exit an interactive shell with them running or stopped. If no *job is specified, disown the current job.*\n\n> If the *jobs are currently stopped and the* **AUTO_CONTINUE** *option* is not set, a warning is printed containing information about how to make them running after they have been disowned. If one of the latter two forms is used, the *jobs will automatically be made running,* independent of the setting of the **AUTO_CONTINUE** *option.*\n",
+    "args": "disown [ job ... ]"
+  },
   "echo": {
     "shortDescription": "Write on standard output",
-    "description": "Write each arg on the standard output, with a space separating each one.  If the -n flag is not present, print a newline at the end.  echo recognizes the following escape sequences: \\a     bell character \\b     backspace \\c     suppress subsequent characters and final newline \\e     escape \\f     form feed \\n     linefeed (newline) \\r     carriage return \\t     horizontal tab \\v     vertical tab \\\\     backslash \\0NNN  character code in octal \\xNN   character code in hexadecimal \\uNNNN unicode character code in hexadecimal \\UNNNNNNNN unicode character code in hexadecimal The -E flag, or the BSD_ECHO option, can be used to disable these escape sequences.  In the latter case, -e flag can be used to enable them. Note that for standards compliance a double dash does not terminate option processing; instead, it is printed directly. However, a single dash does terminate option processing, so the first dash, possibly following options, is not printed, but everything following it is printed as an argument.  The single dash behaviour is different from other shells.  For a more portable way of printing text, see printf, and for a more controllable way of printing text within zsh, see print.",
+    "description": ":   Write each *arg on the standard output, with a space separating* each one. If the **-n** *flag is not present, print a newline at the end.* **echo** *recognizes the following escape sequences:*\n\n    **\\\\a**\n\n    :   bell character\n\n    **\\\\b**\n\n    :   backspace\n\n    **\\\\c**\n\n    :   suppress subsequent characters and final newline\n\n    **\\\\e**\n\n    :   escape\n\n    **\\\\f**\n\n    :   form feed\n\n    **\\\\n**\n\n    :   linefeed (newline)\n\n    **\\\\r**\n\n    :   carriage return\n\n    **\\\\t**\n\n    :   horizontal tab\n\n    **\\\\v**\n\n    :   vertical tab\n\n    **\\\\\\\\**\n\n    :   backslash\n\n    **\\\\0***NNN*\n\n    :   character code in octal\n\n    **\\\\x***NN*\n\n    :   character code in hexadecimal\n\n    **\\\\u***NNNN*\n\n    :   unicode character code in hexadecimal\n\n    **\\\\U***NNNNNNNN*\n\n    :   unicode character code in hexadecimal\n\n    The **-E** *flag, or the* **BSD_ECHO** *option, can be used to disable* these escape sequences. In the latter case, **-e** *flag can be used to* enable them.\n\n    Note that for standards compliance a double dash does not terminate option processing; instead, it is printed directly. However, a single dash does terminate option processing, so the first dash, possibly following options, is not printed, but everything following it is printed as an argument. The single dash behaviour is different from other shells. For a more portable way of printing text, see **printf***, and for a more controllable way of printing text within zsh,* see **print***.*\n",
     "args": "echo [ -neE ] [ arg ... ]"
   },
+  "echotc": {
+    "shortDescription": "Echo terminal capabilities",
+    "description": ":   See the section \\`The zsh/termcap Module\\' in *zshmodules(1).*\n",
+    "args": "echotc"
+  },
+  "echoti": {
+    "description": ":   See the section \\`The zsh/terminfo Module\\' in *zshmodules(1).*\n",
+    "args": "echoti"
+  },
   "emulate": {
-    "description": "Without any argument print current emulation mode. With single argument set up zsh options to emulate the specified shell as much as possible.  csh will never be fully emulated. If the argument is not one of the shells listed above, zsh will be used as a default; more precisely, the tests performed on the argument are the same as those used to determine the emulation at startup based on the shell name, see the section COMPATIBILITY in zsh(1) .  In addition to setting shell options, the command also restores the pristine state of pattern enables, as if all patterns had been enabled using enable -p. If the emulate command occurs inside a function that has been marked for execution tracing with functions -t then the xtrace option will be turned on regardless of emulation mode or other options.  Note that code executed inside the function by the ., source, or eval commands is not considered to be running directly from the function, hence does not provoke this behaviour. If the -R switch is given, all settable options are reset to their default value corresponding to the specified emulation mode, except for certain options describing the interactive environment; otherwise, only those options likely to cause portability problems in scripts and functions are altered.  If the -L switch is given, the options LOCAL_OPTIONS, LOCAL_PATTERNS and LOCAL_TRAPS will be set as well, causing the effects of the emulate command and any setopt, disable -p or enable -p, and trap commands to be local to the immediately surrounding shell function, if any; normally these options are turned off in all emulation modes except ksh. The -L switch is mutually exclusive with the use of -c in flags. If there is a single argument and the -l switch is given, the options that would be set or unset (the latter indicated with the prefix `no') are listed.  -l can be combined with -L or -R and the list will be modified in the appropriate way.  Note the list does not depend on the current setting of options, i.e. it includes all options that may in principle change, not just those that would actually change. The flags may be any of the invocation-time flags described in the section INVOCATION in zsh(1), except that `-o EMACS' and `-o VI' may not be used.  Flags such as `+r'/`+o RESTRICTED' may be prohibited in some circumstances. If -c arg appears in flags, arg is evaluated while the requested emulation is temporarily in effect.  In this case the emulation mode and all options are restored to their previous values before emulate returns.  The -R switch may precede the name of the shell to emulate; note this has a meaning distinct from including -R in flags. Use of -c enables `sticky' emulation mode for functions defined within the evaluated expression:  the emulation mode is associated thereafter with the function so that whenever the function is executed the emulation (respecting the -R switch, if present) and all options are set (and pattern disables cleared) before entry to the function, and the state is restored after exit.  If the function is called when the sticky emulation is already in effect, either within an `emulate shell -c' expression or within another function with the same sticky emulation, entry and exit from the function do not cause options to be altered (except due to standard processing such as the LOCAL_OPTIONS option).  This also applies to functions marked for autoload within the sticky emulation; the appropriate set of options will be applied at the point the function is loaded as well as when it is run. For example: emulate sh -c 'fni() { setopt cshnullglob; } fno() { fni; }' fno The two functions fni and fno are defined with sticky sh emulation.  fno is then executed, causing options associated with emulations to be set to their values in sh.  fno then calls fni; because fni is also marked for sticky sh emulation, no option changes take place on entry to or exit from it.  Hence the option cshnullglob, turned off by sh emulation, will be turned on within fni and remain on return to fno.  On exit from fno, the emulation mode and all options will be restored to the state they were in before entry to the temporary emulation. The documentation above is typically sufficient for the intended purpose of executing code designed for other shells in a suitable environment.  More detailed rules follow. 1.     The sticky emulation environment provided by `emulate shell -c' is identical to that provided by entry to a function marked for sticky emulation as a consequence of being defined in such an environment.  Hence, for example, the sticky emulation is inherited by subfunctions defined within functions with sticky emulation. 2.     No change of options takes place on entry to or exit from functions that are not marked for sticky emulation, other than those that would normally take place, even if those functions are called within sticky emulation. 3.     No special handling is provided for functions marked for autoload nor for functions present in wordcode created by the zcompile command. 4.     The presence or absence of the -R switch to emulate corresponds to different sticky emulation modes, so for example `emulate sh -c', `emulate -R sh -c' and `emulate csh -c' are treated as three distinct sticky emulations. 5.     Difference in shell options supplied in addition to the basic emulation also mean the sticky emulations are different, so for example `emulate zsh -c' and `emulate zsh -o cbases -c' are treated as distinct sticky emulations.",
+    "description": ":   Without any argument print current emulation mode.\n\n    With single argument set up zsh options to emulate the specified shell as much as possible. **csh** *will never be fully emulated.* If the argument is not one of the shells listed above, **zsh** will be used as a default; more precisely, the tests performed on the argument are the same as those used to determine the emulation at startup based on the shell name, see the section COMPATIBILITY in *zsh(1)* . In addition to setting shell options, the command also restores the pristine state of pattern enables, as if all patterns had been enabled using **enable -p***.*\n\n    If the **emulate** *command occurs inside a function that has been* marked for execution tracing with **functions -t** *then the* **xtrace** option will be turned on regardless of emulation mode or other options. Note that code executed inside the function by the **.***,* **source***, or* **eval** *commands is not considered to be running directly from the* function, hence does not provoke this behaviour.\n\n    If the **-R** *switch is given, all settable options* are reset to their default value corresponding to the specified emulation mode, except for certain options describing the interactive environment; otherwise, only those options likely to cause portability problems in scripts and functions are altered. If the **-L** *switch is given,* the options **LOCAL_OPTIONS***,* **LOCAL_PATTERNS** *and* **LOCAL_TRAPS** will be set as well, causing the effects of the **emulate** *command and any* **setopt***,* **disable -p** *or* **enable -p***, and* **trap** *commands to be local to* the immediately surrounding shell function, if any; normally these options are turned off in all emulation modes except **ksh***. The* **-L** *switch is mutually exclusive with the* use of **-c** *in flags.*\n\n    If there is a single argument and the **-l** *switch is given, the* options that would be set or unset (the latter indicated with the prefix \\`**no***\\') are listed.* **-l** *can be combined with* **-L** *or* **-R** *and* the list will be modified in the appropriate way. Note the list does not depend on the current setting of options, i.e. it includes all options that may in principle change, not just those that would actually change.\n\n    The *flags may be any of the invocation-time flags described in* the section INVOCATION in *zsh(1),* except that \\`**-o EMACS***\\' and \\`***-o VI***\\' may not be used. Flags such* as \\`**+r***\\'/\\`***+o RESTRICTED***\\' may be prohibited in some circumstances.*\n\n    If **-c** *arg appears in flags, arg is evaluated while the* requested emulation is temporarily in effect. In this case the emulation mode and all options are restored to their previous values before **emulate** *returns. The* **-R** *switch may precede the name of the shell* to emulate; note this has a meaning distinct from including **-R** *in* *flags.*\n\n    Use of **-c** *enables \\`sticky\\' emulation mode for functions defined* within the evaluated expression: the emulation mode is associated thereafter with the function so that whenever the function is executed the emulation (respecting the **-R** *switch, if present) and all* options are set (and pattern disables cleared) before entry to the function, and the state is restored after exit. If the function is called when the sticky emulation is already in effect, either within an \\`**emulate** *shell* **-c***\\' expression or* within another function with the same sticky emulation, entry and exit from the function do not cause options to be altered (except due to standard processing such as the **LOCAL_OPTIONS** *option). This also* applies to functions marked for autoload within the sticky emulation; the appropriate set of options will be applied at the point the function is loaded as well as when it is run.\n\n    For example:\n\n    > emulate sh -c 'fni() { setopt cshnullglob; }\n    >     fno() { fni; }'\n    >     fno\n\n    The two functions **fni** *and* **fno** *are defined with sticky* **sh** emulation. **fno** *is then executed, causing options associated* with emulations to be set to their values in **sh***.* **fno** *then* calls **fni***; because* **fni** *is also marked for sticky* **sh** emulation, no option changes take place on entry to or exit from it. Hence the option **cshnullglob***, turned off by* **sh** *emulation, will* be turned on within **fni** *and remain on return to* **fno***. On exit* from **fno***, the emulation mode and all options will be restored to the* state they were in before entry to the temporary emulation.\n\n    The documentation above is typically sufficient for the intended purpose of executing code designed for other shells in a suitable environment. More detailed rules follow.\n\n    1\\.\n\n    :   The sticky emulation environment provided by \\`**emulate** *shell* **-c***\\' is identical to that provided by entry to* a function marked for sticky emulation as a consequence of being defined in such an environment. Hence, for example, the sticky emulation is inherited by subfunctions defined within functions with sticky emulation.\n\n    2\\.\n\n    :   No change of options takes place on entry to or exit from functions that are not marked for sticky emulation, other than those that would normally take place, even if those functions are called within sticky emulation.\n\n    3\\.\n\n    :   No special handling is provided for functions marked for **autoload** *nor for functions present in wordcode created by* the **zcompile** *command.*\n\n    4\\.\n\n    :   The presence or absence of the **-R** *switch to* **emulate** corresponds to different sticky emulation modes, so for example \\`**emulate sh -c***\\', \\`***emulate -R sh -c***\\' and \\`***emulate csh -c***\\'* are treated as three distinct sticky emulations.\n\n    5\\.\n\n    :   Difference in shell options supplied in addition to the basic emulation also mean the sticky emulations are different, so for example \\`**emulate zsh -c***\\' and \\`***emulate zsh -o cbases -c***\\' are* treated as distinct sticky emulations.\n",
     "args": "emulate [ -lLR ] [ {zsh|sh|ksh|csh} [ flags ... ] ]"
   },
   "enable": {
     "shortDescription": "Enable shell features",
-    "description": "Enable the named hash table elements, presumably disabled earlier with disable.  The default is to enable builtin commands.  The -a option causes enable to act on regular or global aliases.  The -s option causes enable to act on suffix aliases.  The -f option causes enable to act on shell functions. The -r option causes enable to act on reserved words.  Without arguments all enabled hash table elements from the corresponding hash table are printed.  With the -m flag the arguments are taken as patterns (should be quoted) and all hash table elements from the corresponding hash table matching these patterns are enabled.  Enabled objects can be disabled with the disable builtin command. enable -p reenables patterns disabled with disable -p.  Note that it does not override globbing options; for example, `enable -p \"~\"' does not cause the pattern character ~ to be active unless the EXTENDED_GLOB option is also set.  To enable all possible patterns (so that they may be individually disabled with disable -p), use `setopt EXTENDED_GLOB KSH_GLOB NO_SH_GLOB'.",
+    "description": ":   Enable the *named hash table elements, presumably disabled* earlier with **disable***. The default is to enable builtin commands.* The **-a** *option causes* **enable** *to act on regular or global aliases.* The **-s** *option causes* **enable** *to act on suffix aliases.* The **-f** *option causes* **enable** *to act on shell functions. The* **-r** option causes **enable** *to act on reserved words. Without arguments* all enabled hash table elements from the corresponding hash table are printed. With the **-m** *flag the arguments are taken as patterns* (should be quoted) and all hash table elements from the corresponding hash table matching these patterns are enabled. Enabled objects can be disabled with the **disable** *builtin command.*\n\n    **enable -p** *reenables patterns disabled with* **disable -p***. Note* that it does not override globbing options; for example, \\`**enable -p** \\\"\\~\\\"*\\' does not cause the pattern character* **\\~** *to be active unless* the **EXTENDED_GLOB** *option is also set. To enable all possible* patterns (so that they may be individually disabled with **disable -p***),* use \\`**setopt EXTENDED_GLOB KSH_GLOB NO_SH_GLOB***\\'.*\n",
     "args": "enable [ -afmprs ] name ..."
   },
   "eval": {
     "shortDescription": "Execute arguments in shell",
-    "description": "Read the arguments as input to the shell and execute the resulting command(s) in the current shell process.  The return status is the same as if the commands had been executed directly by the shell; if there are no args or they contain no commands (i.e. are an empty string or whitespace) the return status is zero.",
+    "description": ":   Read the arguments as input to the shell and execute the resulting command(s) in the current shell process. The return status is the same as if the commands had been executed directly by the shell; if there are no *args or they contain no commands (i.e. are* an empty string or whitespace) the return status is zero.\n",
     "args": "eval [ arg ... ]"
   },
   "exec": {
     "shortDescription": "Replace shell with command",
-    "description": "Replace the current shell with command rather than forking.  If command is a shell builtin command or a shell function, the shell executes it, and exits when the command is complete. With -c clear the environment; with -l prepend - to the argv[0] string of the command executed (to simulate a login shell); with -a argv0 set the argv[0] string of the command executed.  See the section `Precommand Modifiers' in zshmisc(1). If the option POSIX_BUILTINS is set, command is never interpreted as a shell builtin command or shell function.  This means further precommand modifiers such as builtin and noglob are also not interpreted within the shell.  Hence command is always found by searching the command path. If command is omitted but any redirections are specified, then the redirections will take effect in the current shell.",
+    "description": ":   Replace the current shell with *command rather than forking.* If *command is a shell builtin command or a shell function,* the shell executes it, and exits when the command is complete.\n\n    With **-c** *clear the environment; with* **-l** *prepend* **-** *to the* **argv\\[0\\]** *string of the command executed (to simulate a login shell);* with **-a** *argv0 set the* **argv\\[0\\]** *string of the command* executed. See the section \\`Precommand Modifiers\\' in *zshmisc(1).*\n\n    If the option **POSIX_BUILTINS** *is set, command is never* interpreted as a shell builtin command or shell function. This means further precommand modifiers such as **builtin** *and* **noglob** *are also not interpreted within the shell. Hence* *command is always found by searching the command path.*\n\n    If *command is omitted but any redirections are specified,* then the redirections will take effect in the current shell.\n",
     "args": "exec [ -cl ] [ -a argv0 ] [ command [ arg ... ] ]"
   },
   "exit": {
     "shortDescription": "Exit the shell",
-    "description": "Exit the shell with the exit status specified by an arithmetic expression n; if none is specified, use the exit status from the last command executed.  An EOF condition will also cause the shell to exit, unless the IGNORE_EOF option is set. See notes at the end of the section JOBS in zshmisc(1) for some possibly unexpected interactions of the exit command with jobs.",
+    "description": ":   Exit the shell with the exit status specified by an arithmetic expression *n; if none* is specified, use the exit status from the last command executed. An EOF condition will also cause the shell to exit, unless the **IGNORE_EOF** *option is set.*\n\n    See notes at the end of the section JOBS in *zshmisc(1) for some possibly unexpected interactions* of the **exit** *command with jobs.*\n",
     "args": "exit [ n ]"
   },
   "export": {
     "shortDescription": "Export to environment",
-    "description": "The specified names are marked for automatic export to the environment of subsequently executed commands.  Equivalent to typeset -gx.  If a parameter specified does not already exist, it is created in the global scope.",
+    "description": ":   The specified *names are marked for automatic export* to the environment of subsequently executed commands. Equivalent to **typeset -gx***.* If a parameter specified does not already exist, it is created in the global scope.\n",
     "args": "export [ name[=value] ... ]"
   },
   "false": {
     "shortDescription": "Return exit status of 1",
-    "description": "Do nothing and return an exit status of 1.",
+    "description": ":   Do nothing and return an exit status of 1.\n",
     "args": "false [ arg ... ]"
   },
   "fc": {
     "shortDescription": "Fix command",
-    "description": "The fc command controls the interactive history mechanism.  Note that reading and writing of history options is only performed if the shell is interactive.  Usually this is detected automatically, but it can be forced by setting the interactive option when starting the shell. The first two forms of this command select a range of events from first to last from the history list.  The arguments first and last may be specified as a number or as a string.  A negative number is used as an offset to the current history event number.  A string specifies the most recent event beginning with the given string.  All substitutions old=new, if any, are then performed on the text of the events. The range of events selected by numbers can be narrowed further by the following flags. -I     restricts to only internal events (not from $HISTFILE) -L     restricts to only local events (not from other shells, see SHARE_HISTORY in zshoptions(1) -- note that $HISTFILE is considered local when read at startup) -m     takes the first argument as a pattern (which should be quoted) and only the history events matching this pattern are considered If first is not specified, it will be set to -1 (the most recent event), or to -16 if the -l flag is given.  If last is not specified, it will be set to first, or to -1 if the -l flag is given.  However, if the current event has added entries to the history with `print -s' or `fc -R', then the default last for -l includes all new history entries since the current event began. When the -l flag is given, the resulting events are listed on standard output.  Otherwise the editor program specified by -e ename is invoked on a file containing these history events.  If -e is not given, the value of the parameter FCEDIT is used; if that is not set the value of the parameter EDITOR is used; if that is not set a builtin default, usually `vi' is used.  If ename is `-', no editor is invoked.  When editing is complete, the edited command is executed. The flag `-s' is equivalent to `-e -'.  The flag -r reverses the order of the events and the flag -n suppresses event numbers when listing. Also when listing, -d     prints timestamps for each event -f     prints full time-date stamps in the US `MM/DD/YY hh:mm' format -E     prints full time-date stamps in the European `dd.mm.yyyy hh:mm' format -i     prints full time-date stamps in ISO8601 `yyyy-mm-dd hh:mm' format -t fmt prints time and date stamps in the given format; fmt is formatted with the strftime function with the zsh extensions described for the %D{string} prompt format in the section EXPANSION OF PROMPT SEQUENCES in zshmisc(1). The resulting formatted string must be no more than 256 characters or will not be printed -D     prints elapsed times; may be combined with one of the options above `fc -p' pushes the current history list onto a stack and switches to a new history list.  If the -a option is also specified, this history list will be automatically popped when the current function scope is exited, which is a much better solution than creating a trap function to call `fc -P' manually. If no arguments are specified, the history list is left empty, $HISTFILE is unset, and $HISTSIZE & $SAVEHIST are set to their default values.  If one argument is given, $HISTFILE is set to that filename, $HISTSIZE & $SAVEHIST are left unchanged, and the history file is read in (if it exists) to initialize the new list.  If a second argument is specified, $HISTSIZE & $SAVEHIST are instead set to the single specified numeric value.  Finally, if a third argument is specified, $SAVEHIST is set to a separate value from $HISTSIZE.  You are free to change these environment values for the new history list however you desire in order to manipulate the new history list. `fc -P' pops the history list back to an older list saved by `fc -p'.  The current list is saved to its $HISTFILE before it is destroyed (assuming that $HISTFILE and $SAVEHIST are set appropriately, of course).  The values of $HISTFILE, $HISTSIZE, and $SAVEHIST are restored to the values they had when `fc -p' was called.  Note that this restoration can conflict with making these variables \"local\", so your best bet is to avoid local declarations for these variables in functions that use `fc -p'. The one other guaranteed-safe combination is declaring these variables to be local at the top of your function and using the automatic option (-a) with `fc -p'.  Finally, note that it is legal to manually pop a push marked for automatic popping if you need to do so before the function exits. `fc -R' reads the history from the given file, `fc -W' writes the history out to the given file, and `fc -A' appends the history out to the given file.  If no filename is specified, the $HISTFILE is assumed.  If the -I option is added to -R, only those events that are not already contained within the internal history list are added.  If the -I option is added to -A or -W, only those events that are new since last incremental append/write to the history file are appended/written.  In any case, the created file will have no more than $SAVEHIST entries.",
-    "args": "fc -ARWI [ filename ]"
+    "description": "**fc** **-ARWI** *\\[ filename \\]* The **fc** *command controls the interactive history mechanism. Note* that reading and writing of history options is only performed if the shell is interactive. Usually this is detected automatically, but it can be forced by setting the **interactive** *option when starting the* shell.\n\n> The first two forms of this command select a range of events from *first to last from the history list. The arguments first* and *last may be specified as a number or as a string. A negative* number is used as an offset to the current history event number. A string specifies the most recent event beginning with the given string. All substitutions *old***=***new, if any, are then performed on the* text of the events.\n>\n> The range of events selected by numbers can be narrowed further by the following flags.\n>\n> **-I**\n>\n> :   restricts to only internal events (not from **\\$HISTFILE***)*\n>\n> **-L**\n>\n> :   restricts to only local events (not from other shells, see **SHARE_HISTORY** *in zshoptions(1) \\-- note that* **\\$HISTFILE** *is* considered local when read at startup)\n>\n> **-m**\n>\n> :   takes the first argument as a pattern (which should be quoted) and only the history events matching this pattern are considered\n>\n> If *first is not specified, it will be set to -1 (the most recent* event), or to -16 if the **-l** *flag is given.* If *last is not specified, it will be set to first,* or to -1 if the **-l** *flag is given.* However, if the current event has added entries to the history with \\`**print -s***\\' or \\`***fc -R***\\', then the default last for* **-l** includes all new history entries since the current event began.\n>\n> When the **-l** *flag is given, the resulting events are listed on* standard output. Otherwise the editor program specified by **-e** *ename* is invoked on a file containing these history events. If **-e** *is not given, the* value of the parameter **FCEDIT** *is used; if that is not set the value of* the parameter **EDITOR** *is used; if that is not set a builtin default,* usually \\`**vi***\\' is used. If ename is \\`***-***\\', no editor is invoked.* When editing is complete, the edited command is executed.\n>\n> The flag \\`**-s***\\' is equivalent to \\`***-e -***\\'.* The flag **-r** *reverses the order of the events and the* flag **-n** *suppresses event numbers when listing.*\n>\n> Also when listing,\n>\n> **-d**\n>\n> :   prints timestamps for each event\n>\n> **-f**\n>\n> :   prints full time-date stamps in the US \\`*MM***/***DD***/***YY hh***:***mm\\' format*\n>\n> **-E**\n>\n> :   prints full time-date stamps in the European \\`*dd***.***mm***.***yyyy hh***:***mm\\' format*\n>\n> **-i**\n>\n> :   prints full time-date stamps in ISO8601 \\`*yyyy***-***mm***-***dd hh***:***mm\\' format*\n>\n> **-t** *fmt*\n>\n> :   prints time and date stamps in the given format; *fmt is formatted with the strftime function with the zsh extensions* described for the **%D{***string***}** *prompt format in* the section EXPANSION OF PROMPT SEQUENCES in *zshmisc(1). The resulting formatted string must be* no more than 256 characters or will not be printed\n>\n> <!-- -->\n>\n> **-D**\n>\n> :   prints elapsed times; may be combined with one of the options above\n>\n> \\`**fc -p***\\' pushes the current history list onto a stack and switches to a* new history list. If the **-a** *option is also specified, this history list* will be automatically popped when the current function scope is exited, which is a much better solution than creating a trap function to call \\`**fc -P***\\'* manually. If no arguments are specified, the history list is left empty, **\\$HISTFILE** *is unset, and* **\\$HISTSIZE** *&* **\\$SAVEHIST** *are set to their* default values. If one argument is given, **\\$HISTFILE** *is set to that* filename, **\\$HISTSIZE** *&* **\\$SAVEHIST** *are left unchanged, and the history* file is read in (if it exists) to initialize the new list. If a second argument is specified, **\\$HISTSIZE** *&* **\\$SAVEHIST** *are instead set to the* single specified numeric value. Finally, if a third argument is specified, **\\$SAVEHIST** *is set to a separate value from* **\\$HISTSIZE***. You are free to* change these environment values for the new history list however you desire in order to manipulate the new history list.\n>\n> \\`**fc -P***\\' pops the history list back to an older list saved by \\`***fc -p***\\'.* The current list is saved to its **\\$HISTFILE** *before it is destroyed* (assuming that **\\$HISTFILE** *and* **\\$SAVEHIST** *are set appropriately, of* course). The values of **\\$HISTFILE***,* **\\$HISTSIZE***, and* **\\$SAVEHIST** *are* restored to the values they had when \\`**fc -p***\\' was called. Note that this* restoration can conflict with making these variables \\\"local\\\", so your best bet is to avoid local declarations for these variables in functions that use \\`**fc -p***\\'. The one other guaranteed-safe combination is declaring these* variables to be local at the top of your function and using the automatic option (**-a***) with \\`***fc -p***\\'. Finally, note that it is legal to manually* pop a push marked for automatic popping if you need to do so before the function exits.\n>\n> \\`**fc -R***\\' reads the history from the given file,* \\`**fc -W***\\' writes the history out to the given file,* and \\`**fc -A***\\' appends the history out to the given file.* If no filename is specified, the **\\$HISTFILE** *is assumed.* If the **-I** *option is added to* **-R***, only those events that are* not already contained within the internal history list are added. If the **-I** *option is added to* **-A** *or* **-W***, only those* events that are new since last incremental append/write to the history file are appended/written. In any case, the created file will have no more than **\\$SAVEHIST** entries.\n",
+    "args": "fc -P"
+  },
+  "fg": {
+    "shortDescription": "Put a job in the foreground",
+    "description": "*job \\...* Bring each specified *job in turn to the foreground.* If no *job is specified, resume the current job.*\n",
+    "args": "fg [ job ... ]"
   },
   "float": {
     "shortDescription": "Floating point arithmetic",
-    "description": "Equivalent to typeset -E, except that options irrelevant to floating point numbers are not permitted.",
+    "description": ":   Equivalent to **typeset -E***, except that options irrelevant to floating* point numbers are not permitted.\n",
     "args": "float [ {+|-}Hghlprtux ] [ {+|-}EFLRZ [ n ] ] [ name[=value] ... ]"
   },
   "functions": {
     "shortDescription": "List functions",
-    "description": "Equivalent to typeset -f, with the exception of the -c, -x, -M and -W options.  For functions -u and functions -U, see autoload, which provides additional options.  For functions -t and functions -T, see typeset -f. The -x option indicates that any functions output will have each leading tab for indentation, added by the shell to show syntactic structure, expanded to the given number num of spaces. num can also be 0 to suppress all indentation. The -W option turns on the option WARN_NESTED_VAR for the named function or functions only.  The option is turned off at the start of nested functions (apart from anonoymous functions) unless the called function also has the -W attribute. The -c option causes oldfn to be copied to newfn.  The copy is efficiently handled internally by reference counting.  If oldfn was marked for autoload it is first loaded and if this fails the copy fails.  Either function may subsequently be redefined without affecting the other.  A typical idiom is that oldfn is the name of a library shell function which is then redefined to call newfn, thereby installing a modified version of the function. The -M and +M flags Use of the -M option may not be combined with any of the options handled by typeset -f. functions -M mathfn defines mathfn as the name of a mathematical function recognised in all forms of arithmetical expressions; see the section `Arithmetic Evaluation' in zshmisc(1).  By default mathfn may take any number of comma-separated arguments. If min is given, it must have exactly min args; if min and max are both given, it must have at least min and at most max args. max may be -1 to indicate that there is no upper limit. By default the function is implemented by a shell function of the same name; if shellfn is specified it gives the name of the corresponding shell function while mathfn remains the name used in arithmetical expressions.  The name of the function in $0 is mathfn (not shellfn as would usually be the case), provided the option FUNCTION_ARGZERO is in effect.  The positional parameters in the shell function correspond to the arguments of the mathematical function call. The result of the last arithmetical expression evaluated inside the shell function gives the result of the mathematical function.  This is not limited to arithmetic substitutions of the form $((...)), but also includes arithmetical expressions evaluated in any other way, including by the let builtin, by ((...)) statements, and even by the return builtin and by array subscripts.  Therefore, care must be taken not to use syntactical constructs that perform arithmetic evaluation after evaluating what is to be the result of the function.  For example: # WRONG zmath_cube() { (( $1 * $1 * $1 )) return 0 } functions -M cube 1 1 zmath_cube print $(( cube(3) )) This will print `0' because of the return. Commenting the return out would lead to a different problem: the ((...)) statement would become the last statement in the function, so the return status ($?) of the function would be non-zero (indicating failure) whenever the arithmetic result of the function would happen to be zero (numerically): # WRONG zmath_cube() { (( $1 * $1 * $1 )) } functions -M cube 1 1 zmath_cube print $(( cube(0) )) Instead, the true builtin can be used: # RIGHT zmath_cube() { (( $1 * $1 * $1 )) true } functions -M cube 1 1 zmath_cube print $(( cube(3) )) If the additional option -s is given to functions -M, the argument to the function is a single string: anything between the opening and matching closing parenthesis is passed to the function as a single argument, even if it includes commas or white space.  The minimum and maximum argument specifiers must therefore be 1 if given.  An empty argument list is passed as a zero-length string.  Thus, the following string function takes a single argument, including the commas, and prints 11: stringfn() { (( $#1 )); true } functions -Ms stringfn print $(( stringfn(foo,bar,rod) )) functions -M with no arguments lists all such user-defined functions in the same form as a definition.  With the additional option -m and a list of arguments, all functions whose mathfn matches one of the pattern arguments are listed. function +M removes the list of mathematical functions; with the additional option -m the arguments are treated as patterns and all functions whose mathfn matches the pattern are removed. Note that the shell function implementing the behaviour is not removed (regardless of whether its name coincides with mathfn).",
-    "args": "functions +M [ -m ] mathfn ..."
+    "description": "**functions -c** *oldfn newfn*\n\n**functions -M** *\\[***-s***\\] mathfn \\[ min \\[ max \\[ shellfn \\] \\] \\]*\n\n**functions -M** *\\[* **-m** *pattern \\... \\]*\n\n**functions +M** *\\[* **-m** *\\] mathfn \\...* Equivalent to **typeset -f***, with the exception of the* **-c***,* **-x***,* **-M** *and* **-W** *options. For* **functions -u** *and* **functions -U***,* see **autoload***, which provides additional options. For* **functions -t** and **functions -T***, see* **typeset -f***.*\n\n> The **-x** *option indicates that any functions output will have* each leading tab for indentation, added by the shell to show syntactic structure, expanded to the given number *num of spaces. num* can also be 0 to suppress all indentation.\n>\n> The **-W** *option turns on the option* **WARN_NESTED_VAR** *for the named* function or functions only. The option is turned off at the start of nested functions (apart from anonoymous functions) unless the called function also has the **-W** *attribute.*\n>\n> The **-c** *option causes oldfn to be copied to newfn. The* copy is efficiently handled internally by reference counting. If *oldfn was marked for autoload it is first loaded and if this* fails the copy fails. Either function may subsequently be redefined without affecting the other. A typical idiom is that *oldfn is the* name of a library shell function which is then redefined to call **newfn***, thereby installing a modified version of the function.*\n>\n> *The* **-M** *and* **+M** *flags*\n>\n> Use of the **-M** *option may not be combined with any of the options* handled by **typeset -f***.*\n>\n> **functions -M** *mathfn defines mathfn as the name of* a mathematical function recognised in all forms of arithmetical expressions; see the section \\`Arithmetic Evaluation\\' in *zshmisc(1). By default mathfn may take* any number of comma-separated arguments. If *min is given,* it must have exactly *min args; if min and max are* both given, it must have at least *min and at most max* args. *max may be -1 to indicate that there is no upper limit.*\n>\n> By default the function is implemented by a shell function of the same name; if *shellfn is specified it gives the name of the corresponding* shell function while *mathfn remains the name used in arithmetical* expressions. The name of the function in **\\$0** *is mathfn (not* *shellfn as would usually be the case), provided the option* **FUNCTION_ARGZERO** *is in effect. The positional parameters in the shell* function correspond to the arguments of the mathematical function call.\n>\n> The result of the last arithmetical expression evaluated inside the shell function gives the result of the mathematical function. This is not limited to arithmetic substitutions of the form **\\$((***\\...***))***,* but also includes arithmetical expressions evaluated in any other way, including by the **let** *builtin,* by **((***\\...***))** *statements,* and even by the **return** *builtin* and by array subscripts. Therefore, care must be taken not to use syntactical constructs that perform arithmetic evaluation after evaluating what is to be the result of the function. For example:\n>\n> > # WRONG\n> >     zmath_cube() {\n> >       (( $1 * $1 * $1 ))\n> >       return 0\n> >     }\n> >     functions -M cube 1 1 zmath_cube\n> >     print $(( cube(3) ))\n>\n> This will print \\`**0***\\' because of the* **return***.*\n>\n> Commenting the **return** *out would lead to a different problem: the* **((***\\...***))** *statement would become* the last statement in the function, so the *return status (***\\$?***) of the* function would be non-zero (indicating failure) whenever the *arithmetic* result *of the function would happen to be zero (numerically):*\n>\n> > # WRONG\n> >     zmath_cube() {\n> >       (( $1 * $1 * $1 ))\n> >     }\n> >     functions -M cube 1 1 zmath_cube\n> >     print $(( cube(0) ))\n>\n> Instead, the **true** *builtin can be used:*\n>\n> > # RIGHT\n> >     zmath_cube() {\n> >       (( $1 * $1 * $1 ))\n> >       true\n> >     }\n> >     functions -M cube 1 1 zmath_cube\n> >     print $(( cube(3) ))\n>\n> If the additional option **-s** *is given to* **functions -M***, the* argument to the function is a single string: anything between the opening and matching closing parenthesis is passed to the function as a single argument, even if it includes commas or white space. The minimum and maximum argument specifiers must therefore be 1 if given. An empty argument list is passed as a zero-length string. Thus, the following string function takes a single argument, including the commas, and prints 11:\n>\n> > stringfn() { (( $#1 )); true }\n> >     functions -Ms stringfn\n> >     print $(( stringfn(foo,bar,rod) ))\n>\n> **functions -M** *with no arguments lists all such user-defined functions in* the same form as a definition. With the additional option **-m** *and* a list of arguments, all functions whose *mathfn matches one of* the pattern arguments are listed.\n>\n> **function +M** *removes the list of mathematical functions; with the* additional option **-m** *the arguments are treated as patterns and* all functions whose *mathfn matches the pattern are removed. Note* that the shell function implementing the behaviour is not removed (regardless of whether its name coincides with *mathfn).*\n",
+    "args": "functions [ {+|-}UkmtTuWz ] [ -x num ] [ name ... ]"
+  },
+  "getcap": {
+    "shortDescription": "Get capabilities",
+    "description": ":   See the section \\`The zsh/cap Module\\' in *zshmodules(1).*\n",
+    "args": "getcap"
   },
   "getln": {
-    "description": "Read the top value from the buffer stack and put it in the shell parameter name.  Equivalent to read -zr.",
+    "description": ":   Read the top value from the buffer stack and put it in the shell parameter *name. Equivalent to* **read -zr***.*\n",
     "args": "getln [ -AclneE ] name ..."
   },
   "getopts": {
     "shortDescription": "Parse positional parameters",
-    "description": "Checks the args for legal options.  If the args are omitted, use the positional parameters.  A valid option argument begins with a `+' or a `-'.  An argument not beginning with a `+' or a `-', or the argument `--', ends the options.  Note that a single `-' is not considered a valid option argument.  optstring contains the letters that getopts recognizes.  If a letter is followed by a `:', that option requires an argument.  The options can be separated from the argument by blanks. Each time it is invoked, getopts places the option letter it finds in the shell parameter name, prepended with a `+' when arg begins with a `+'.  The index of the next arg is stored in OPTIND.  The option argument, if any, is stored in OPTARG. The first option to be examined may be changed by explicitly assigning to OPTIND.  OPTIND has an initial value of 1, and is normally set to 1 upon entry to a shell function and restored upon exit.  (The POSIX_BUILTINS option disables this, and also changes the way the value is calculated to match other shells.) OPTARG is not reset and retains its value from the most recent call to getopts.  If either of OPTIND or OPTARG is explicitly unset, it remains unset, and the index or option argument is not stored.  The option itself is still stored in name in this case. A leading `:' in optstring causes getopts to store the letter of any invalid option in OPTARG, and to set name to `?' for an unknown option and to `:' when a required argument is missing. Otherwise, getopts sets name to `?' and prints an error message when an option is invalid.  The exit status is nonzero when there are no more options.",
+    "description": ":   Checks the *args for legal options. If the args are omitted,* use the positional parameters. A valid option argument begins with a \\`**+***\\' or a \\`***-***\\'. An argument not beginning with* a \\`**+***\\' or a \\`***-***\\', or the argument \\`***--***\\', ends the options.* Note that a single \\`**-***\\' is not considered a valid option argument.* *optstring contains the letters that* **getopts** recognizes. If a letter is followed by a \\`**:***\\', that option* requires an argument. The options can be separated from the argument by blanks.\n\n    Each time it is invoked, **getopts** *places the option letter it finds* in the shell parameter *name, prepended with a \\`***+***\\' when* *arg begins with a \\`***+***\\'. The index of the next arg* is stored in **OPTIND***. The option argument, if any,* is stored in **OPTARG***.*\n\n    The first option to be examined may be changed by explicitly assigning to **OPTIND***.* **OPTIND** *has an initial value of* **1***, and is* normally set to **1** *upon entry to a shell function and restored* upon exit. (The **POSIX_BUILTINS** *option disables this, and also changes* the way the value is calculated to match other shells.) **OPTARG** is not reset and retains its value from the most recent call to **getopts***. If either of* **OPTIND** *or* **OPTARG** *is explicitly* unset, it remains unset, and the index or option argument is not stored. The option itself is still stored in *name in this case.*\n\n    A leading \\`**:***\\' in optstring causes* **getopts** *to store the* letter of any invalid option in **OPTARG***, and to set name to* \\`**?***\\' for an unknown option and to \\`***:***\\' when a required argument is* missing. Otherwise, **getopts** *sets name to \\`***?***\\' and prints* an error message when an option is invalid. The exit status is nonzero when there are no more options.\n",
     "args": "getopts optstring name [ arg ... ]"
   },
   "hash": {
     "shortDescription": "Remember command locations",
-    "description": "hash can be used to directly modify the contents of the command hash table, and the named directory hash table.  Normally one would modify these tables by modifying one's PATH (for the command hash table) or by creating appropriate shell parameters (for the named directory hash table).  The choice of hash table to work on is determined by the -d option; without the option the command hash table is used, and with the option the named directory hash table is used. A command name starting with a / is never hashed, whether by explicit use of the hash command or otherwise.  Such a command is always found by direct look up in the file system. Given no arguments, and neither the -r or -f options, the selected hash table will be listed in full. The -r option causes the selected hash table to be emptied.  It will be subsequently rebuilt in the normal fashion.  The -f option causes the selected hash table to be fully rebuilt immediately.  For the command hash table this hashes all the absolute directories in the PATH, and for the named directory hash table this adds all users' home directories.  These two options cannot be used with any arguments. The -m option causes the arguments to be taken as patterns (which should be quoted) and the elements of the hash table matching those patterns are printed.  This is the only way to display a limited selection of hash table elements. For each name with a corresponding value, put `name' in the selected hash table, associating it with the pathname `value'. In the command hash table, this means that whenever `name' is used as a command argument, the shell will try to execute the file given by `value'.  In the named directory hash table, this means that `value' may be referred to as `~name'. For each name with no corresponding value, attempt to add name to the hash table, checking what the appropriate value is in the normal manner for that hash table.  If an appropriate value can't be found, then the hash table will be unchanged. The -v option causes hash table entries to be listed as they are added by explicit specification.  If has no effect if used with -f. If the -L flag is present, then each hash table entry is printed in the form of a call to hash.",
+    "description": ":   **hash** *can be used to directly modify the contents of the command* hash table, and the named directory hash table. Normally one would modify these tables by modifying one\\'s **PATH** (for the command hash table) or by creating appropriate shell parameters (for the named directory hash table). The choice of hash table to work on is determined by the **-d** *option;* without the option the command hash table is used, and with the option the named directory hash table is used.\n\n    A command *name starting with a* **/** *is never hashed, whether by* explicit use of the **hash** *command or otherwise. Such a command* is always found by direct look up in the file system.\n\n    Given no arguments, and neither the **-r** *or* **-f** *options,* the selected hash table will be listed in full.\n\n    The **-r** *option causes the selected hash table to be emptied.* It will be subsequently rebuilt in the normal fashion. The **-f** *option causes the selected hash table to be fully* rebuilt immediately. For the command hash table this hashes all the absolute directories in the **PATH***,* and for the named directory hash table this adds all users\\' home directories. These two options cannot be used with any arguments.\n\n    The **-m** *option causes the arguments to be taken as patterns* (which should be quoted) and the elements of the hash table matching those patterns are printed. This is the only way to display a limited selection of hash table elements.\n\n    For each *name with a corresponding value, put \\`name\\' in* the selected hash table, associating it with the pathname \\`*value\\'.* In the command hash table, this means that whenever \\`*name\\' is used as a command argument, the shell will try* to execute the file given by \\`*value\\'.* In the named directory hash table, this means that \\`*value\\' may be referred to as \\`***\\~***name\\'.*\n\n    For each *name with no* corresponding *value, attempt to add name to the hash table,* checking what the appropriate **value** *is in the normal manner for* that hash table. If an appropriate **value** *can\\'t be found, then* the hash table will be unchanged.\n\n    The **-v** *option causes hash table entries to be listed as they are* added by explicit specification. If has no effect if used with **-f***.*\n\n    If the **-L** *flag is present, then each hash table entry is printed in* the form of a call to hash.\n",
     "args": "hash [ -Ldfmrv ] [ name[=value] ] ..."
   },
   "history": {
     "shortDescription": "Command history",
-    "description": "Same as fc -l.",
-    "args": "history undefined"
+    "description": ":   Same as **fc -l***.*\n",
+    "args": "history"
   },
   "integer": {
     "shortDescription": "Integer arithmetic",
-    "description": "Equivalent to typeset -i, except that options irrelevant to integers are not permitted.",
+    "description": ":   Equivalent to **typeset -i***, except that options irrelevant to* integers are not permitted.\n",
     "args": "integer [ {+|-}Hghlprtux ] [ {+|-}LRZi [ n ] ] [ name[=value] ... ]"
   },
   "jobs": {
     "shortDescription": "List active jobs",
-    "description": "Lists information about each given job, or all jobs if job is omitted.  The -l flag lists process IDs, and the -p flag lists process groups.  If the -r flag is specified only running jobs will be listed and if the -s flag is given only stopped jobs are shown.  If the -d flag is given, the directory from which the job was started (which may not be the current directory of the job) will also be shown. The -Z option replaces the shell's argument and environment space with the given string, truncated if necessary to fit. This will normally be visible in ps (ps(1)) listings.  This feature is typically used by daemons, to indicate their state. Full job control is only available in the top-level interactive shell, not in commands run in the left hand side of pipelines or within the (...) construct.  However, a snapshot of the job state at that point is taken, so it is still possible to use the jobs builtin, or any parameter providing job information.  This gives information about the state of jobs at the point the subshell was created.  If background processes are created within the subshell, then instead information about those processes is provided. For example, sleep 10 &    # Job in background (             # Shell forks jobs          # Shows information about \"sleep 10 &\" sleep 5 &     # Process in background (no job control) jobs          # Shows information about \"sleep 5 &\" )",
-    "args": "jobs -Z string"
+    "description": "**jobs -Z** *string* Lists information about each given job, or all jobs if *job is omitted. The* **-l** *flag lists process* IDs, and the **-p** *flag lists process groups.* If the **-r** *flag is specified only running jobs will be listed* and if the **-s** *flag is given only stopped jobs are shown.* If the **-d** *flag is given, the directory from which the job was* started (which may not be the current directory of the job) will also be shown.\n\n> The **-Z** *option replaces the shell\\'s argument and environment space with* the given string, truncated if necessary to fit. This will normally be visible in **ps** *(ps(1)) listings. This feature is typically* used by daemons, to indicate their state.\n>\n> Full job control is only available in the top-level interactive shell, not in commands run in the left hand side of pipelines or within the **(***\\...***)** *construct. However, a snapshot* of the job state at that point is taken, so it is still possible to use the **jobs** *builtin, or any parameter providing job information.* This gives information about the state of jobs at the point the subshell was created. If background processes are created within the subshell, then instead information about those processes is provided.\n>\n> For example,\n>\n> > sleep 10 &    # Job in background\n> >     (             # Shell forks\n> >     jobs          # Shows information about \"sleep 10 &\"\n> >     sleep 5 &     # Process in background (no job control)\n> >     jobs          # Shows information about \"sleep 5 &\"\n> >     )\n",
+    "args": "jobs [ -dlprs ] [ job ... ]"
   },
   "kill": {
     "shortDescription": "Send a signal to a process",
-    "description": "Sends either SIGTERM or the specified signal to the given jobs or processes.  Signals are given by number or by names, with or without the `SIG' prefix.  If the signal being sent is not `KILL' or `CONT', then the job will be sent a `CONT' signal if it is stopped.  The argument job can be the process ID of a job not in the job list.  In the second form, kill -l, if sig is not specified the signal names are listed.  Otherwise, for each sig that is a name, the corresponding signal number is listed.  For each sig that is a signal number or a number representing the exit status of a process which was terminated or stopped by a signal the name of the signal is printed. On some systems, alternative signal names are allowed for a few signals.  Typical examples are SIGCHLD and SIGCLD or SIGPOLL and SIGIO, assuming they correspond to the same signal number.  kill -l will only list the preferred form, however kill -l alt will show if the alternative form corresponds to a signal number. For example, under Linux kill -l IO and kill -l POLL both output 29, hence kill -IO and kill -POLL have the same effect. Many systems will allow process IDs to be negative to kill a process group or zero to kill the current process group.",
-    "args": "kill -l [ sig ... ]"
+    "description": "**kill** **-l** *\\[ sig \\... \\]* Sends either **SIGTERM** *or the specified signal to the given* jobs or processes. Signals are given by number or by names, with or without the \\`**SIG***\\'* prefix. If the signal being sent is not \\`**KILL***\\' or \\`***CONT***\\', then the job* will be sent a \\`**CONT***\\' signal if it is stopped.* The argument *job can be the process ID of a job* not in the job list. In the second form, **kill -l***, if sig is not* specified the signal names are listed. Otherwise, for each *sig that is a name, the corresponding signal number is* listed. For each *sig that is a signal number or a number* representing the exit status of a process which was terminated or stopped by a signal the name of the signal is printed.\n\n> On some systems, alternative signal names are allowed for a few signals. Typical examples are **SIGCHLD** *and* **SIGCLD** *or* **SIGPOLL** *and* **SIGIO***, assuming they correspond to the same signal number.* **kill** -l *will only list the preferred form, however* **kill -l** *alt will* show if the alternative form corresponds to a signal number. For example, under Linux **kill -l IO** *and* **kill -l POLL** *both output 29, hence* **kill -IO** *and* **kill -POLL** *have the same effect.*\n>\n> Many systems will allow process IDs to be negative to kill a process group or zero to kill the current process group.\n",
+    "args": "kill [ -s signal_name | -n signal_number | -sig ] job ..."
   },
   "let": {
     "shortDescription": "Evaluate arithmetic expression",
-    "description": "Evaluate each arg as an arithmetic expression.  See the section `Arithmetic Evaluation' in zshmisc(1) for a description of arithmetic expressions.  The exit status is 0 if the value of the last expression is nonzero, 1 if it is zero, and 2 if an error occurred.",
+    "description": ":   Evaluate each *arg as an arithmetic expression.* See the section \\`Arithmetic Evaluation\\' in *zshmisc(1)* for a description of arithmetic expressions. The exit status is 0 if the value of the last expression is nonzero, 1 if it is zero, and 2 if an error occurred.\n",
     "args": "let arg ..."
   },
   "limit": {
     "shortDescription": "Set or display resource limits",
-    "description": "Set or display resource limits.  Unless the -s flag is given, the limit applies only the children of the shell.  If -s is given without other arguments, the resource limits of the current shell is set to the previously set resource limits of the children. If limit is not specified, print the current limit placed on resource, otherwise set the limit to the specified value.  If the -h flag is given, use hard limits instead of soft limits. If no resource is given, print all limits. When looping over multiple resources, the shell will abort immediately if it detects a badly formed argument.  However, if it fails to set a limit for some other reason it will continue trying to set the remaining limits. resource can be one of: addressspace Maximum amount of address space used. aiomemorylocked Maximum amount of memory locked in RAM for AIO operations. aiooperations Maximum number of AIO operations. cachedthreads Maximum number of cached threads. coredumpsize Maximum size of a core dump. cputime Maximum CPU seconds per process. datasize Maximum data size (including stack) for each process. descriptors Maximum value for a file descriptor. filesize Largest single file allowed. kqueues Maximum number of kqueues allocated. maxproc Maximum number of processes. maxpthreads Maximum number of threads per process. memorylocked Maximum amount of memory locked in RAM. memoryuse Maximum resident set size. msgqueue Maximum number of bytes in POSIX message queues. posixlocks Maximum number of POSIX locks per user. pseudoterminals Maximum number of pseudo-terminals. resident Maximum resident set size. sigpending Maximum number of pending signals. sockbufsize Maximum size of all socket buffers. stacksize Maximum stack size for each process. swapsize Maximum amount of swap used. vmemorysize Maximum amount of virtual memory. Which of these resource limits are available depends on the system.  resource can be abbreviated to any unambiguous prefix. It can also be an integer, which corresponds to the integer defined for the resource by the operating system. If argument corresponds to a number which is out of the range of the resources configured into the shell, the shell will try to read or write the limit anyway, and will report an error if this fails.  As the shell does not store such resources internally, an attempt to set the limit will fail unless the -s option is present. limit is a number, with an optional scaling factor, as follows: nh     hours nk     kilobytes (default) nm     megabytes or minutes ng     gigabytes [mm:]ss minutes and seconds The limit command is not made available by default when the shell starts in a mode emulating another shell.  It can be made available with the command `zmodload -F zsh/rlimits b:limit'.",
+    "description": ":   Set or display resource limits. Unless the **-s** *flag is given,* the limit applies only the children of the shell. If **-s** *is* given without other arguments, the resource limits of the current shell is set to the previously set resource limits of the children.\n\n    If *limit is not specified, print the current limit placed* on *resource, otherwise* set the limit to the specified value. If the **-h** *flag* is given, use hard limits instead of soft limits. If no *resource is given, print all limits.*\n\n    When looping over multiple resources, the shell will abort immediately if it detects a badly formed argument. However, if it fails to set a limit for some other reason it will continue trying to set the remaining limits.\n\n    *resource can be one of:*\n\n    **addressspace**\n\n    :   Maximum amount of address space used.\n\n    **aiomemorylocked**\n\n    :   Maximum amount of memory locked in RAM for AIO operations.\n\n    **aiooperations**\n\n    :   Maximum number of AIO operations.\n\n    **cachedthreads**\n\n    :   Maximum number of cached threads.\n\n    **coredumpsize**\n\n    :   Maximum size of a core dump.\n\n    **cputime**\n\n    :   Maximum CPU seconds per process.\n\n    **datasize**\n\n    :   Maximum data size (including stack) for each process.\n\n    **descriptors**\n\n    :   Maximum value for a file descriptor.\n\n    **filesize**\n\n    :   Largest single file allowed.\n\n    **kqueues**\n\n    :   Maximum number of kqueues allocated.\n\n    **maxproc**\n\n    :   Maximum number of processes.\n\n    **maxpthreads**\n\n    :   Maximum number of threads per process.\n\n    **memorylocked**\n\n    :   Maximum amount of memory locked in RAM.\n\n    **memoryuse**\n\n    :   Maximum resident set size.\n\n    **msgqueue**\n\n    :   Maximum number of bytes in POSIX message queues.\n\n    **posixlocks**\n\n    :   Maximum number of POSIX locks per user.\n\n    **pseudoterminals**\n\n    :   Maximum number of pseudo-terminals.\n\n    **resident**\n\n    :   Maximum resident set size.\n\n    **sigpending**\n\n    :   Maximum number of pending signals.\n\n    **sockbufsize**\n\n    :   Maximum size of all socket buffers.\n\n    **stacksize**\n\n    :   Maximum stack size for each process.\n\n    **swapsize**\n\n    :   Maximum amount of swap used.\n\n    **vmemorysize**\n\n    :   Maximum amount of virtual memory.\n\n    Which of these resource limits are available depends on the system. *resource can be abbreviated to any unambiguous prefix. It* can also be an integer, which corresponds to the integer defined for the resource by the operating system.\n\n    If argument corresponds to a number which is out of the range of the resources configured into the shell, the shell will try to read or write the limit anyway, and will report an error if this fails. As the shell does not store such resources internally, an attempt to set the limit will fail unless the **-s** *option is present.*\n\n    *limit is a number, with an optional scaling factor, as follows:*\n\n    *n***h**\n\n    :   hours\n\n    *n***k**\n\n    :   kilobytes (default)\n\n    *n***m**\n\n    :   megabytes or minutes\n\n    *n***g**\n\n    :   gigabytes\n\n    \\[*mm***:***\\]ss*\n\n    :   minutes and seconds\n\n    The **limit** *command is not made available by default when the* shell starts in a mode emulating another shell. It can be made available with the command \\`**zmodload -F zsh/rlimits b:limit***\\'.*\n",
     "args": "limit [ -hs ] [ resource [ limit ] ] ..."
   },
   "local": {
     "shortDescription": "Create a local variable",
-    "description": "Same as typeset, except that the options -g, and -f are not permitted.  In this case the -x option does not force the use of -g, i.e. exported variables will be local to functions.",
+    "description": ":   Same as **typeset***, except that the options* **-g***, and* **-f** *are not permitted. In this case the* **-x** *option does not force* the use of **-g***, i.e. exported variables will be local to functions.*\n",
     "args": "local [ {+|-}AHUahlprtux ] [ {+|-}EFLRZi [ n ] ] [ name[=value] ... ]"
   },
   "logout": {
     "shortDescription": "Exit the shell",
-    "description": "Same as exit, except that it only works in a login shell.",
+    "description": ":   Same as **exit***, except that it only works in a login shell.*\n",
     "args": "logout [ n ]"
   },
   "noglob": {
     "shortDescription": "Disable filename expansion",
-    "description": "See the section `Precommand Modifiers' in zshmisc(1).",
+    "description": ":   See the section \\`Precommand Modifiers\\' in *zshmisc(1).*\n",
     "args": "noglob simple command"
   },
   "popd": {
     "shortDescription": "Remove directory from stack",
-    "description": "Remove an entry from the directory stack, and perform a cd to the new top directory.  With no argument, the current top entry is removed.  An argument of the form `+n' identifies a stack entry by counting from the left of the list shown by the dirs command, starting with zero.  An argument of the form -n counts from the right.  If the PUSHD_MINUS option is set, the meanings of `+' and `-' in this context are swapped. If the -q (quiet) option is specified, the hook function chpwd and the functions in the array $chpwd_functions are not called, and the new directory stack is not printed.  This is useful for calls to popd that do not change the environment seen by an interactive user.",
+    "description": ":   Remove an entry from the directory stack, and perform a **cd** *to* the new top directory. With no argument, the current top entry is removed. An argument of the form \\`**+***n\\' identifies a stack* entry by counting from the left of the list shown by the **dirs** *command,* starting with zero. An argument of the form **-***n counts from the right.* If the **PUSHD_MINUS** *option is set, the meanings of \\`***+***\\' and* \\`**-***\\' in this context are swapped.*\n\n    If the **-q** *(quiet) option is specified, the hook function* **chpwd** and the functions in the array **\\$chpwd_functions** *are not called,* and the new directory stack is not printed. This is useful for calls to **popd** *that do not change the environment seen by an interactive user.*\n",
     "args": "popd [ -q ] [ {+|-}n ]"
   },
   "print": {
     "shortDescription": "Print arguments",
-    "description": "With the `-f' option the arguments are printed as described by printf.  With no flags or with the flag `-', the arguments are printed on the standard output as described by echo, with the following differences: the escape sequence `\\M-x' (or `\\Mx') metafies the character x (sets the highest bit), `\\C-x' (or `\\Cx') produces a control character (`\\C-@' and `\\C-?' give the characters NULL and delete), a character code in octal is represented by `\\NNN' (instead of `\\0NNN'), and `\\E' is a synonym for `\\e'.  Finally, if not in an escape sequence, `\\' escapes the following character and is not printed. -a     Print arguments with the column incrementing first.  Only useful with the -c and -C options. -b     Recognize all the escape sequences defined for the bindkey command, see the section `Zle Builtins' in zshzle(1). -c     Print the arguments in columns.  Unless -a is also given, arguments are printed with the row incrementing first. -C cols Print the arguments in cols columns.  Unless -a is also given, arguments are printed with the row incrementing first. -D     Treat the arguments as paths, replacing directory prefixes with ~ expressions corresponding to directory names, as appropriate. -i     If given together with -o or -O, sorting is performed case-independently. -l     Print the arguments separated by newlines instead of spaces.  Note: if the list of arguments is empty, print -l will still output one empty line. To print a possibly-empty list of arguments one per line, use print -C1, as in `print -rC1 -- \"$list[@]\"'. -m     Take the first argument as a pattern (should be quoted), and remove it from the argument list together with subsequent arguments that do not match this pattern. -n     Do not add a newline to the output. -N     Print the arguments separated and terminated by nulls. Again, print -rNC1 -- \"$list[@]\" is a canonical way to print an arbitrary list as null-delimited records. -o     Print the arguments sorted in ascending order. -O     Print the arguments sorted in descending order. -p     Print the arguments to the input of the coprocess. -P     Perform prompt expansion (see EXPANSION OF PROMPT SEQUENCES in zshmisc(1)).  In combination with `-f', prompt escape sequences are parsed only within interpolated arguments, not within the format string. -r     Ignore the escape conventions of echo. -R     Emulate the BSD echo command, which does not process escape sequences unless the -e flag is given.  The -n flag suppresses the trailing newline.  Only the -e and -n flags are recognized after -R; all other arguments and options are printed. -s     Place the results in the history list instead of on the standard output.  Each argument to the print command is treated as a single word in the history, regardless of its content. -S     Place the results in the history list instead of on the standard output.  In this case only a single argument is allowed; it will be split into words as if it were a full shell command line.  The effect is similar to reading the line from a history file with the HIST_LEX_WORDS option active. -u n   Print the arguments to file descriptor n. -v name Store the printed arguments as the value of the parameter name. -x tab-stop Expand leading tabs on each line of output in the printed string assuming a tab stop every tab-stop characters. This is appropriate for formatting code that may be indented with tabs.  Note that leading tabs of any argument to print, not just the first, are expanded, even if print is using spaces to separate arguments (the column count is maintained across arguments but may be incorrect on output owing to previous unexpanded tabs). The start of the output of each print command is assumed to be aligned with a tab stop.  Widths of multibyte characters are handled if the option MULTIBYTE is in effect.  This option is ignored if other formatting options are in effect, namely column alignment or printf style, or if output is to a special location such as shell history or the command line editor. -X tab-stop This is similar to -x, except that all tabs in the printed string are expanded.  This is appropriate if tabs in the arguments are being used to produce a table format. -z     Push the arguments onto the editing buffer stack, separated by spaces. If any of `-m', `-o' or `-O' are used in combination with `-f' and there are no arguments (after the removal process in the case of `-m') then nothing is printed.",
+    "description": "*\\[* **-v** *name \\] \\[* **-xX** *tabstop \\] \\[* **-R** *\\[* **-en** *\\]\\] \\[ arg \\... \\]* With the \\`**-f***\\' option the arguments are printed as described by* **printf***.* With no flags or with the flag \\`**-***\\', the arguments are printed on* the standard output as described by **echo***, with the following differences:* the escape sequence \\`**\\\\M-***x\\' (or \\`***\\\\M***x\\') metafies the character* *x (sets the highest bit),* \\`**\\\\C-***x\\' (or \\`***\\\\C***x\\') produces a control character* (\\`**\\\\C-@***\\' and \\`***\\\\C-?***\\' give the characters NULL and delete),* a character code in octal is represented by \\`**\\\\***NNN\\'* (instead of \\`**\\\\0***NNN\\'),* and \\`**\\\\E***\\' is a synonym for \\`***\\\\e***\\'.* Finally, if not in an escape sequence, \\`**\\\\***\\' escapes the following character and is not printed.*\n\n> **-a** Print arguments with the column incrementing first. Only useful with the **-c** *and* **-C** *options.*\n>\n> **-b**\n>\n> :   Recognize all the escape sequences defined for the **bindkey** *command,* see the section \\`Zle Builtins\\' in *zshzle(1).*\n>\n> **-c**\n>\n> :   Print the arguments in columns. Unless **-a** *is also given, arguments are* printed with the row incrementing first.\n>\n> **-C** *cols*\n>\n> :   Print the arguments in *cols columns. Unless* **-a** *is also given,* arguments are printed with the row incrementing first.\n>\n> **-D**\n>\n> :   Treat the arguments as paths, replacing directory prefixes with **\\~** expressions corresponding to directory names, as appropriate.\n>\n> **-i**\n>\n> :   If given together with **-o** *or* **-O***, sorting is performed* case-independently.\n>\n> **-l**\n>\n> :   Print the arguments separated by newlines instead of spaces. Note: if the list of arguments is empty, **print -l** *will still output one empty* line. To print a possibly-empty list of arguments one per line, use **print -C1***, as in \\`***print -rC1 \\-- \\\"\\$list\\[@\\]\\\"***\\'.*\n>\n> **-m**\n>\n> :   Take the first argument as a pattern (should be quoted), and remove it from the argument list together with subsequent arguments that do not match this pattern.\n>\n> **-n**\n>\n> :   Do not add a newline to the output.\n>\n> **-N**\n>\n> :   Print the arguments separated and terminated by nulls. Again, **print -rNC1 \\-- \\\"\\$list\\[@\\]\\\"** *is a canonical way to print an* arbitrary list as null-delimited records.\n>\n> **-o**\n>\n> :   Print the arguments sorted in ascending order.\n>\n> **-O**\n>\n> :   Print the arguments sorted in descending order.\n>\n> **-p**\n>\n> :   Print the arguments to the input of the coprocess.\n>\n> **-P**\n>\n> :   Perform prompt expansion (see EXPANSION OF PROMPT SEQUENCES in *zshmisc(1)).* In combination with \\`**-f***\\',* prompt escape sequences are parsed only within interpolated arguments, not within the format string.\n>\n> **-r**\n>\n> :   Ignore the escape conventions of **echo***.*\n>\n> **-R**\n>\n> :   Emulate the BSD **echo** *command, which does not process escape sequences* unless the **-e** *flag is given. The* **-n** *flag suppresses the trailing* newline. Only the **-e** *and* **-n** *flags are recognized after* **-R***; all other arguments and options are printed.*\n>\n> **-s**\n>\n> :   Place the results in the history list instead of on the standard output. Each argument to the **print** *command is treated as a single word in the* history, regardless of its content.\n>\n> **-S**\n>\n> :   Place the results in the history list instead of on the standard output. In this case only a single argument is allowed; it will be split into words as if it were a full shell command line. The effect is similar to reading the line from a history file with the **HIST_LEX_WORDS** *option active.*\n>\n> **-u** *n*\n>\n> :   Print the arguments to file descriptor *n.*\n>\n> **-v** *name*\n>\n> :   Store the printed arguments as the value of the parameter *name.*\n>\n> **-x** *tab-stop*\n>\n> :   Expand leading tabs on each line of output in the printed string assuming a tab stop every *tab-stop characters. This is appropriate* for formatting code that may be indented with tabs. Note that leading tabs of any argument to print, not just the first, are expanded, even if **print** *is using spaces to separate arguments (the column count* is maintained across arguments but may be incorrect on output owing to previous unexpanded tabs).\n>\n>     The start of the output of each print command is assumed to be aligned with a tab stop. Widths of multibyte characters are handled if the option **MULTIBYTE** *is in effect. This option is ignored if other* formatting options are in effect, namely column alignment or **printf** *style, or if output is to a special location such as shell* history or the command line editor.\n>\n> **-X** *tab-stop*\n>\n> :   This is similar to **-x***, except that all tabs in the printed string* are expanded. This is appropriate if tabs in the arguments are being used to produce a table format.\n>\n> **-z**\n>\n> :   Push the arguments onto the editing buffer stack, separated by spaces.\n>\n> If any of \\`**-m***\\', \\`***-o***\\' or \\`***-O***\\' are used in combination with* \\`**-f***\\' and there are no arguments (after the removal process in the* case of \\`**-m***\\') then nothing is printed.*\n",
     "args": "print [ -abcDilmnNoOpPrsSz ] [ -u n ] [ -f format ] [ -C cols ]"
   },
   "printf": {
     "shortDescription": "Format and print data",
-    "description": "Print the arguments according to the format specification. Formatting rules are the same as used in C. The same escape sequences as for echo are recognised in the format. All C conversion specifications ending in one of csdiouxXeEfgGn are handled. In addition to this, `%b' can be used instead of `%s' to cause escape sequences in the argument to be recognised and `%q' can be used to quote the argument in such a way that allows it to be reused as shell input. With the numeric format specifiers, if the corresponding argument starts with a quote character, the numeric value of the following character is used as the number to print; otherwise the argument is evaluated as an arithmetic expression. See the section `Arithmetic Evaluation' in zshmisc(1) for a description of arithmetic expressions. With `%n', the corresponding argument is taken as an identifier which is created as an integer parameter. Normally, conversion specifications are applied to each argument in order but they can explicitly specify the nth argument is to be used by replacing `%' by `%n$' and `*' by `*n$'.  It is recommended that you do not mix references of this explicit style with the normal style and the handling of such mixed styles may be subject to future change. If arguments remain unused after formatting, the format string is reused until all arguments have been consumed. With the print builtin, this can be suppressed by using the -r option. If more arguments are required by the format than have been specified, the behaviour is as if zero or an empty string had been specified as the argument. The -v option causes the output to be stored as the value of the parameter name, instead of printed. If name is an array and the format string is reused when consuming arguments then one array element will be used for each use of the format string.",
+    "description": ":   Print the arguments according to the format specification. Formatting rules are the same as used in C. The same escape sequences as for **echo** are recognised in the format. All C conversion specifications ending in one of **csdiouxXeEfgGn** *are handled. In addition to this, \\`***%b***\\' can be* used instead of \\`**%s***\\' to cause escape sequences in the argument to be* recognised and \\`**%q***\\' can be used to quote the argument in such a way* that allows it to be reused as shell input. With the numeric format specifiers, if the corresponding argument starts with a quote character, the numeric value of the following character is used as the number to print; otherwise the argument is evaluated as an arithmetic expression. See the section \\`Arithmetic Evaluation\\' in *zshmisc(1)* for a description of arithmetic expressions. With \\`**%n***\\', the corresponding argument is taken as an* identifier which is created as an integer parameter.\n\n    Normally, conversion specifications are applied to each argument in order but they can explicitly specify the *nth argument is to be used by* replacing \\`**%***\\' by \\`***%***n***\\$***\\' and \\`***\\****\\' by \\`***\\****n***\\$***\\'.* It is recommended that you do not mix references of this explicit style with the normal style and the handling of such mixed styles may be subject to future change.\n\n    If arguments remain unused after formatting, the format string is reused until all arguments have been consumed. With the **print** *builtin, this* can be suppressed by using the **-r** *option. If more arguments are* required by the format than have been specified, the behaviour is as if zero or an empty string had been specified as the argument.\n\n    The **-v** *option causes the output to be stored as the value of the* parameter *name, instead of printed. If name is an array and* the format string is reused when consuming arguments then one array element will be used for each use of the format string.\n",
     "args": "printf [ -v name ] format [ arg ... ]"
   },
   "pushd": {
     "shortDescription": "Add directory to stack",
-    "description": "Change the current directory, and push the old current directory onto the directory stack.  In the first form, change the current directory to arg.  If arg is not specified, change to the second directory on the stack (that is, exchange the top two entries), or change to $HOME if the PUSHD_TO_HOME option is set or if there is only one entry on the stack.  Otherwise, arg is interpreted as it would be by cd.  The meaning of old and new in the second form is also the same as for cd. The third form of pushd changes directory by rotating the directory list.  An argument of the form `+n' identifies a stack entry by counting from the left of the list shown by the dirs command, starting with zero.  An argument of the form `-n' counts from the right.  If the PUSHD_MINUS option is set, the meanings of `+' and `-' in this context are swapped. If the -q (quiet) option is specified, the hook function chpwd and the functions in the array $chpwd_functions are not called, and the new directory stack is not printed.  This is useful for calls to pushd that do not change the environment seen by an interactive user. If the option -q is not specified and the shell option PUSHD_SILENT is not set, the directory stack will be printed after a pushd is performed. The options -s, -L and -P have the same meanings as for the cd builtin.",
-    "args": "pushd [ -qsLP ] {+|-}n"
+    "description": "> The third form of **pushd** *changes directory by rotating the* directory list. An argument of the form \\`**+***n\\' identifies a stack* entry by counting from the left of the list shown by the **dirs** command, starting with zero. An argument of the form \\`**-***n\\' counts* from the right. If the **PUSHD_MINUS** *option is set, the meanings* of \\`**+***\\' and \\`***-***\\' in this context are swapped.*\n>\n> If the **-q** *(quiet) option is specified, the hook function* **chpwd** and the functions in the array **\\$chpwd_functions** *are not called,* and the new directory stack is not printed. This is useful for calls to **pushd** *that do not change the environment seen by an interactive user.*\n>\n> If the option **-q** *is not specified and the shell option* **PUSHD_SILENT** is not set, the directory stack will be printed after a **pushd** *is* performed.\n>\n> The options **-s***,* **-L** *and* **-P** *have the same meanings as for the* **cd** *builtin.*\n",
+    "args": "pushd [ -qsLP ] [ arg ]\n\npushd [ -qsLP ] old new\n\npushd [ -qsLP ] {+|-}n Change the current directory, and push the old\ncurrent directory onto the directory stack. In the first form, change\nthe current directory to arg. If arg is not specified, change to the\nsecond directory on the stack (that is, exchange the top two entries),\nor change to $HOME if the PUSHD_TO_HOME option is set or if there is\nonly one entry on the stack. Otherwise, arg is interpreted as it would\nbe by cd. The meaning of old and new in the second form is also the same\nas for cd."
   },
   "pushln": {
     "shortDescription": "Push arguments onto the buffer",
-    "description": "Equivalent to print -nz.",
+    "description": ":   Equivalent to **print -nz***.*\n",
     "args": "pushln [ arg ... ]"
   },
   "pwd": {
     "shortDescription": "Print working directory",
-    "description": "Print the absolute pathname of the current working directory. If the -r or the -P flag is specified, or the CHASE_LINKS option is set and the -L flag is not given, the printed path will not contain symbolic links.",
+    "description": ":   Print the absolute pathname of the current working directory. If the **-r** *or the* **-P** *flag is specified, or the* **CHASE_LINKS** option is set and the **-L** *flag is not given, the printed path will not* contain symbolic links.\n",
     "args": "pwd [ -rLP ]"
   },
+  "r": {
+    "shortDescription": "Re-execute command",
+    "description": ":   Same as **fc -e -***.*\n",
+    "args": "r"
+  },
   "read": {
-    "description": "Read one line and break it into fields using the characters in $IFS as separators, except as noted below.  The first field is assigned to the first name, the second field to the second name, etc., with leftover fields assigned to the last name.  If name is omitted then REPLY is used for scalars and reply for arrays. -r     Raw mode: a `\\' at the end of a line does not signify line continuation and backslashes in the line don't quote the following character and are not removed. -s     Don't echo back characters if reading from the terminal. -q     Read only one character from the terminal and set name to `y' if this character was `y' or `Y' and to `n' otherwise.  With this flag set the return status is zero only if the character was `y' or `Y'.  This option may be used with a timeout (see -t); if the read times out, or encounters end of file, status 2 is returned.  Input is read from the terminal unless one of -u or -p is present. This option may also be used within zle widgets. -k [ num ] Read only one (or num) characters.  All are assigned to the first name, without word splitting.  This flag is ignored when -q is present.  Input is read from the terminal unless one of -u or -p is present.  This option may also be used within zle widgets. Note that despite the mnemonic `key' this option does read full characters, which may consist of multiple bytes if the option MULTIBYTE is set. -z     Read one entry from the editor buffer stack and assign it to the first name, without word splitting.  Text is pushed onto the stack with `print -z' or with push-line from the line editor (see zshzle(1)).  This flag is ignored when the -k or -q flags are present. -e -E     The input read is printed (echoed) to the standard output.  If the -e flag is used, no input is assigned to the parameters. -A     The first name is taken as the name of an array and all words are assigned to it. -c -l     These flags are allowed only if called inside a function used for completion (specified with the -K flag to compctl).  If the -c flag is given, the words of the current command are read. If the -l flag is given, the whole line is assigned as a scalar.  If both flags are present, -l is used and -c is ignored. -n     Together with -c, the number of the word the cursor is on is read.  With -l, the index of the character the cursor is on is read.  Note that the command name is word number 1, not word 0, and that when the cursor is at the end of the line, its character index is the length of the line plus one. -u n   Input is read from file descriptor n. -p     Input is read from the coprocess. -d delim Input is terminated by the first character of delim instead of by newline. -t [ num ] Test if input is available before attempting to read.  If num is present, it must begin with a digit and will be evaluated to give a number of seconds, which may be a floating point number; in this case the read times out if input is not available within this time.  If num is not present, it is taken to be zero, so that read returns immediately if no input is available.  If no input is available, return status 1 and do not set any variables. This option is not available when reading from the editor buffer with -z, when called from within completion with -c or -l, with -q which clears the input queue before reading, or within zle where other mechanisms should be used to test for input. Note that read does not attempt to alter the input processing mode.  The default mode is canonical input, in which an entire line is read at a time, so usually `read -t' will not read anything until an entire line has been typed.  However, when reading from the terminal with -k input is processed one key at a time; in this case, only availability of the first character is tested, so that e.g. `read -t -k 2' can still block on the second character.  Use two instances of `read -t -k' if this is not what is wanted. If the first argument contains a `?', the remainder of this word is used as a prompt on standard error when the shell is interactive. The value (exit status) of read is 1 when an end-of-file is encountered, or when -c or -l is present and the command is not called from a compctl function, or as described for -q. Otherwise the value is 0. The behavior of some combinations of the -k, -p, -q, -u and -z flags is undefined.  Presently -q cancels all the others, -p cancels -u, -k cancels -z, and otherwise -z cancels both -p and -u. The -c or -l flags cancel any and all of -kpquz.",
+    "description": "*\\[* **-u** *n \\] \\[ \\[name\\]\\[***?***prompt\\] \\] \\[ name \\... \\]* Read one line and break it into fields using the characters in **\\$IFS** *as separators, except as noted below.* The first field is assigned to the first *name, the second field* to the second *name, etc., with leftover* fields assigned to the last *name.* If *name is omitted then* **REPLY** *is used for scalars and* **reply** *for arrays.*\n\n> **-r** Raw mode: a \\`**\\\\***\\' at the end of a line does not signify line* continuation and backslashes in the line don\\'t quote the following character and are not removed.\n>\n> **-s**\n>\n> :   Don\\'t echo back characters if reading from the terminal.\n>\n> **-q**\n>\n> :   Read only one character from the terminal and set *name to* \\`**y***\\' if this character was \\`***y***\\' or \\`***Y***\\' and to \\`***n***\\' otherwise.* With this flag set the return status is zero only if the character was \\`**y***\\' or \\`***Y***\\'. This option may be used with a timeout (see* **-t***); if* the read times out, or encounters end of file, status 2 is returned. Input is read from the terminal unless one of **-u** *or* **-p** *is present. This option* may also be used within zle widgets.\n>\n> **-k** *\\[ num \\]*\n>\n> :   Read only one (or *num) characters. All are assigned to the first* *name, without word splitting. This flag is ignored when* **-q** *is* present. Input is read from the terminal unless one of **-u** *or* **-p** is present. This option may also be used within zle widgets.\n>\n>     Note that despite the mnemonic \\`key\\' this option does read full characters, which may consist of multiple bytes if the option **MULTIBYTE** *is set.*\n>\n> **-z**\n>\n> :   Read one entry from the editor buffer stack and assign it to the first *name, without word splitting. Text is pushed onto the stack with* \\`**print -z***\\' or with* **push-line** *from the line editor (see* *zshzle(1)). This flag is ignored when the* **-k** *or* **-q** *flags are present.*\n>\n> **-e**\n>\n> **-E** The input read is printed (echoed) to the standard output. If the **-e** flag is used, no input is assigned to the parameters.\n>\n> **-A**\n>\n> :   The first *name is taken as the name of an array and all words are* assigned to it.\n>\n> **-c**\n>\n> **-l** These flags are allowed only if called inside a function used for completion (specified with the **-K** *flag to* **compctl***). If the* **-c** *flag is given, the words of the* current command are read. If the **-l** *flag is given, the whole* line is assigned as a scalar. If both flags are present, **-l** is used and **-c** *is ignored.*\n>\n> **-n**\n>\n> :   Together with **-c***, the number of the word the cursor is on is* read. With **-l***, the index of the character the cursor is on is* read. Note that the command name is word number 1, not word 0, and that when the cursor is at the end of the line, its character index is the length of the line plus one.\n>\n> **-u** *n*\n>\n> :   Input is read from file descriptor *n.*\n>\n> **-p**\n>\n> :   Input is read from the coprocess.\n>\n> **-d** *delim*\n>\n> :   Input is terminated by the first character of *delim instead of* by newline.\n>\n> **-t** *\\[ num \\]*\n>\n> :   Test if input is available before attempting to read. If *num* is present, it must begin with a digit and will be evaluated to give a number of seconds, which may be a floating point number; in this case the read times out if input is not available within this time. If *num is not present, it is taken to be zero, so that* **read** *returns immediately if no input is available.* If no input is available, return status 1 and do not set any variables. This option is not available when reading from the editor buffer with **-z***, when called from within completion with* **-c** *or* **-l***, with* **-q** *which clears the input queue before reading, or within zle where* other mechanisms should be used to test for input. Note that read does not attempt to alter the input processing mode. The default mode is canonical input, in which an entire line is read at a time, so usually \\`**read -t***\\' will not read anything until an entire line has* been typed. However, when reading from the terminal with **-k** input is processed one key at a time; in this case, only availability of the first character is tested, so that e.g. \\`**read -t -k 2***\\' can still* block on the second character. Use two instances of \\`**read -t -k***\\' if* this is not what is wanted.\n>\n> If the first argument contains a \\`**?***\\', the remainder of this* word is used as a *prompt on standard error when the shell* is interactive.\n>\n> The value (exit status) of **read** *is 1 when an end-of-file is* encountered, or when **-c** *or* **-l** *is present and the command is* not called from a **compctl** *function, or as described for* **-q***.* Otherwise the value is 0.\n>\n> The behavior of some combinations of the **-k***,* **-p***,* **-q***,* **-u** and **-z** *flags is undefined. Presently* **-q** *cancels all the others,* **-p** *cancels* **-u***,* **-k** *cancels* **-z***, and otherwise* **-z** cancels both **-p** *and* **-u***.*\n>\n> The **-c** *or* **-l** *flags cancel any and all of* **-kpquz***.*\n",
     "args": "read [ -rszpqAclneE ] [ -t [ num ] ] [ -k [ num ] ] [ -d delim ]"
   },
   "readonly": {
     "shortDescription": "Mark variables as read-only",
-    "description": "Same as typeset -r.  With the POSIX_BUILTINS option set, same as typeset -gr.",
-    "args": "readonly undefined"
+    "description": ":   Same as **typeset -r***. With the* **POSIX_BUILTINS** *option set, same* as **typeset -gr***.*\n",
+    "args": "readonly"
+  },
+  "rehash": {
+    "shortDescription": "Recompute command hash table",
+    "description": ":   Same as **hash -r***.*\n",
+    "args": "rehash"
   },
   "return": {
-    "description": "Causes a shell function or `.' script to return to the invoking script with the return status specified by an arithmetic expression n.  For example, the following prints `42': () { integer foo=40; return \"foo + 2\" } echo $? If n is omitted, the return status is that of the last command executed. If return was executed from a trap in a TRAPNAL function, the effect is different for zero and non-zero return status.  With zero status (or after an implicit return at the end of the trap), the shell will return to whatever it was previously processing; with a non-zero status, the shell will behave as interrupted except that the return status of the trap is retained.  Note that the numeric value of the signal which caused the trap is passed as the first argument, so the statement `return \"128+$1\"' will return the same status as if the signal had not been trapped.",
+    "description": ":   Causes a shell function or \\`**.***\\' script to return to* the invoking script with the return status specified by an arithmetic expression *n.* For example, the following prints \\`**42***\\':*\n\n    > () { integer foo=40; return \"foo + 2\" }\n    >     echo $?\n\n    If *n* is omitted, the return status is that of the last command executed.\n\n    If **return** *was executed from a trap in a* **TRAP***NAL function,* the effect is different for zero and non-zero return status. With zero status (or after an implicit return at the end of the trap), the shell will return to whatever it was previously processing; with a non-zero status, the shell will behave as interrupted except that the return status of the trap is retained. Note that the numeric value of the signal which caused the trap is passed as the first argument, so the statement \\`**return \\\"128+\\$1\\\"***\\' will return the same status as if the signal* had not been trapped.\n",
     "args": "return [ n ]"
   },
+  "sched": {
+    "shortDescription": "Schedule commands",
+    "description": ":   See the section \\`The zsh/sched Module\\' in *zshmodules(1).*\n",
+    "args": "sched"
+  },
   "set": {
-    "description": "Set the options for the shell and/or set the positional parameters, or declare and set an array.  If the -s option is given, it causes the specified arguments to be sorted before assigning them to the positional parameters (or to the array name if -A is used).  With +s sort arguments in descending order.  For the meaning of the other flags, see zshoptions(1). Flags may be specified by name using the -o option. If no option name is supplied with -o, the current option states are printed: see the description of setopt below for more information on the format.  With +o they are printed in a form that can be used as input to the shell. If the -A flag is specified, name is set to an array containing the given args; if no name is specified, all arrays are printed together with their values. If +A is used and name is an array, the given arguments will replace the initial elements of that array; if no name is specified, all arrays are printed without their values. The behaviour of arguments after -A name or +A name depends on whether the option KSH_ARRAYS is set.  If it is not set, all arguments following name are treated as values for the array, regardless of their form.  If the option is set, normal option processing continues at that point; only regular arguments are treated as values for the array.  This means that set -A array -x -- foo sets array to `-x -- foo' if KSH_ARRAYS is not set, but sets the array to foo and turns on the option `-x' if it is set. If the -A flag is not present, but there are arguments beyond the options, the positional parameters are set.  If the option list (if any) is terminated by `--', and there are no further arguments, the positional parameters will be unset. If no arguments and no `--' are given, then the names and values of all parameters are printed on the standard output.  If the only argument is `+', the names of all parameters are printed. For historical reasons, `set -' is treated as `set +xv' and `set - args' as `set +xv -- args' when in any other emulation mode than zsh's native mode.",
+    "description": "*\\[ arg \\... \\]* Set the options for the shell and/or set the positional parameters, or declare and set an array. If the **-s** *option is given, it causes the* specified arguments to be sorted before assigning them to the positional parameters (or to the array *name if* **-A** *is used). With* **+s** sort arguments in descending order. For the meaning of the other flags, see *zshoptions(1). Flags may be specified by name using the* **-o** *option. If no option* name is supplied with **-o***, the current option states are printed: see* the description of **setopt** *below for more information on the format.* With **+o** *they are printed in a form that can be used as input* to the shell.\n\n> If the **-A** *flag is specified, name is set to an array containing* the given *args; if no name is specified, all arrays are printed* together with their values.\n>\n> If **+A** *is used and name is an array, the* given arguments will replace the initial elements of that array; if no *name is specified, all arrays are printed without their values.*\n>\n> The behaviour of arguments after **-A** *name or* **+A** *name* depends on whether the option **KSH_ARRAYS** *is set. If it is not set, all* arguments following *name are treated as values for the array,* regardless of their form. If the option is set, normal option processing continues at that point; only regular arguments are treated as values for the array. This means that\n>\n> > set -A array -x -- foo\n>\n> sets **array** *to \\`***-x -- foo***\\' if* **KSH_ARRAYS** *is not set, but sets* the array to **foo** *and turns on the option \\`***-x***\\' if it is set.*\n>\n> If the **-A** *flag is not present, but there are arguments beyond the* options, the positional parameters are set. If the option list (if any) is terminated by \\`**--***\\', and there are no further arguments, the* positional parameters will be unset.\n>\n> If no arguments and no \\`**--***\\' are given, then the names and values of* all parameters are printed on the standard output. If the only argument is \\`**+***\\', the names of all parameters are printed.*\n>\n> For historical reasons, \\`**set -***\\' is treated as \\`***set +xv***\\'* and \\`**set -** *args\\' as \\`***set +xv \\--** *args\\' when in* any other emulation mode than zsh\\'s native mode.\n",
     "args": "set [ {+|-}options | {+|-}o [ option_name ] ] ... [ {+|-}A [ name ] ]"
   },
+  "setcap": {
+    "shortDescription": "Set capabilities",
+    "description": ":   See the section \\`The zsh/cap Module\\' in *zshmodules(1).*\n",
+    "args": "setcap"
+  },
   "setopt": {
-    "description": "Set the options for the shell.  All options specified either with flags or by name are set. If no arguments are supplied, the names of all options currently set are printed.  The form is chosen so as to minimize the differences from the default options for the current emulation (the default emulation being native zsh, shown as <Z> in zshoptions(1)).  Options that are on by default for the emulation are shown with the prefix no only if they are off, while other options are shown without the prefix no and only if they are on.  In addition to options changed from the default state by the user, any options activated automatically by the shell (for example, SHIN_STDIN or INTERACTIVE) will be shown in the list.  The format is further modified by the option KSH_OPTION_PRINT, however the rationale for choosing options with or without the no prefix remains the same in this case. If the -m flag is given the arguments are taken as patterns (which should be quoted to protect them from filename expansion), and all options with names matching these patterns are set. Note that a bad option name does not cause execution of subsequent shell code to be aborted; this is behaviour is different from that of `set -o'.  This is because set is regarded as a special builtin by the POSIX standard, but setopt is not.",
+    "description": ":   Set the options for the shell. All options specified either with flags or by name are set.\n\n    If no arguments are supplied, the names of all options currently set are printed. The form is chosen so as to minimize the differences from the default options for the current emulation (the default emulation being native **zsh***, shown as* **\\<Z\\>** *in* *zshoptions(1)).* Options that are on by default for the emulation are shown with the prefix **no** *only if they are off, while other options are* shown without the prefix **no** *and only if they are on. In addition to* options changed from the default state by the user, any options activated automatically by the shell (for example, **SHIN_STDIN** *or* **INTERACTIVE***)* will be shown in the list. The format is further modified by the option **KSH_OPTION_PRINT***, however the rationale for choosing options with* or without the **no** *prefix remains the same in this case.*\n\n    If the **-m** *flag is given the arguments are taken as patterns* (which should be quoted to protect them from filename expansion), and all options with names matching these patterns are set.\n\n    Note that a bad option name does not cause execution of subsequent shell code to be aborted; this is behaviour is different from that of \\`**set** -o*\\'. This is because* **set** *is regarded as a special builtin by the* POSIX standard, but **setopt** *is not.*\n",
     "args": "setopt [ {+|-}options | {+|-}o option_name ] [ -m ] [ name ... ]"
   },
   "shift": {
     "shortDescription": "Shift positional parameters",
-    "description": "The positional parameters ${n+1} ... are renamed to $1 ..., where n is an arithmetic expression that defaults to 1.  If any names are given then the arrays with these names are shifted instead of the positional parameters. If the option -p is given arguments are instead removed (popped) from the end rather than the start of the array.",
+    "description": ":   The positional parameters **\\${***n+1***}** *\\... are renamed* to **\\$1** *\\..., where n is an arithmetic expression that* defaults to 1. If any *names are given then the arrays with these names are* shifted instead of the positional parameters.\n\n    If the option **-p** *is given arguments are instead removed (popped)* from the end rather than the start of the array.\n",
     "args": "shift [ -p ] [ n ] [ name ... ]"
   },
   "source": {
     "shortDescription": "Source a file",
-    "description": "Same as `.', except that the current directory is always searched and is always searched first, before directories in $path.",
+    "description": ":   Same as \\`**.***\\', except that the current directory is always searched and* is always searched first, before directories in **\\$path***.*\n",
     "args": "source file [ arg ... ]"
   },
+  "stat": {
+    "shortDescription": "Display file status",
+    "description": ":   See the section \\`The zsh/stat Module\\' in *zshmodules(1).*\n",
+    "args": "stat"
+  },
   "suspend": {
-    "description": "Suspend the execution of the shell (send it a SIGTSTP) until it receives a SIGCONT.  Unless the -f option is given, this will refuse to suspend a login shell.",
+    "description": ":   Suspend the execution of the shell (send it a **SIGTSTP***)* until it receives a **SIGCONT***.* Unless the **-f** *option is given, this will refuse to suspend a login shell.*\n",
     "args": "suspend [ -f ]"
   },
-  "[": {
-    "description": "Like the system version of test.  Added for compatibility; use conditional expressions instead (see the section `Conditional Expressions').  The main differences between the conditional expression syntax and the test and [ builtins are:  these commands are not handled syntactically, so for example an empty variable expansion may cause an argument to be omitted; syntax errors cause status 2 to be returned instead of a shell error; and arithmetic operators expect integer arguments rather than arithmetic expressions. The command attempts to implement POSIX and its extensions where these are specified.  Unfortunately there are intrinsic ambiguities in the syntax; in particular there is no distinction between test operators and strings that resemble them.  The standard attempts to resolve these for small numbers of arguments (up to four); for five or more arguments compatibility cannot be relied on.  Users are urged wherever possible to use the `[[' test syntax which does not have these ambiguities.",
-    "args": "[ [ arg ... ] ]"
+  "test": {
+    "shortDescription": "Evaluate a conditional expression",
+    "description": "**\\[** *\\[ arg \\... \\]* **\\]** Like the system version of **test***. Added for compatibility;* use conditional expressions instead (see the section \\`Conditional Expressions\\'). The main differences between the conditional expression syntax and the **test** *and* **\\[** *builtins are: these commands are not handled* syntactically, so for example an empty variable expansion may cause an argument to be omitted; syntax errors cause status 2 to be returned instead of a shell error; and arithmetic operators expect integer arguments rather than arithmetic expressions.\n\n> The command attempts to implement POSIX and its extensions where these are specified. Unfortunately there are intrinsic ambiguities in the syntax; in particular there is no distinction between test operators and strings that resemble them. The standard attempts to resolve these for small numbers of arguments (up to four); for five or more arguments compatibility cannot be relied on. Users are urged wherever possible to use the \\`**\\[\\[***\\' test syntax which does not have these ambiguities.*\n",
+    "args": "test [ arg ... ]"
   },
   "times": {
     "shortDescription": "Display shell times",
-    "description": "for processes run from the shell.",
-    "args": "times Print the accumulated user and system times for the shell and"
+    "description": ":   Print the accumulated user and system times for the shell and for processes run from the shell.\n",
+    "args": "times"
   },
   "trap": {
     "shortDescription": "Set signal handlers",
-    "description": "arg is a series of commands (usually quoted to protect it from immediate evaluation by the shell) to be read and executed when the shell receives any of the signals specified by one or more sig args.  Each sig can be given as a number, or as the name of a signal either with or without the string SIG in front (e.g. 1, HUP, and SIGHUP are all the same signal). If arg is `-', then the specified signals are reset to their defaults, or, if no sig args are present, all traps are reset. If arg is an empty string, then the specified signals are ignored by the shell (and by the commands it invokes). If arg is omitted but one or more sig args are provided (i.e. the first argument is a valid signal number or name), the effect is the same as if arg had been specified as `-'. The trap command with no arguments prints a list of commands associated with each signal. If sig is ZERR then arg will be executed after each command with a nonzero exit status.  ERR is an alias for ZERR on systems that have no SIGERR signal (this is the usual case). If sig is DEBUG then arg will be executed before each command if the option DEBUG_BEFORE_CMD is set (as it is by default), else after each command.  Here, a `command' is what is described as a `sublist' in the shell grammar, see the section SIMPLE COMMANDS & PIPELINES in zshmisc(1).  If DEBUG_BEFORE_CMD is set various additional features are available.  First, it is possible to skip the next command by setting the option ERR_EXIT; see the description of the ERR_EXIT option in zshoptions(1).  Also, the shell parameter ZSH_DEBUG_CMD is set to the string corresponding to the command to be executed following the trap.  Note that this string is reconstructed from the internal format and may not be formatted the same way as the original text.  The parameter is unset after the trap is executed. If sig is 0 or EXIT and the trap statement is executed inside the body of a function, then the command arg is executed after the function completes.  The value of $? at the start of execution is the exit status of the shell or the return status of the function exiting.  If sig is 0 or EXIT and the trap statement is not executed inside the body of a function, then the command arg is executed when the shell terminates; the trap runs before any zshexit hook functions. ZERR, DEBUG, and EXIT traps are not executed inside other traps. ZERR and DEBUG traps are kept within subshells, while other traps are reset. Note that traps defined with the trap builtin are slightly different from those defined as `TRAPNAL () { ... }', as the latter have their own function environment (line numbers, local variables, etc.) while the former use the environment of the command in which they were called.  For example, trap 'print $LINENO' DEBUG will print the line number of a command executed after it has run, while TRAPDEBUG() { print $LINENO; } will always print the number zero. Alternative signal names are allowed as described under kill above.  Defining a trap under either name causes any trap under an alternative name to be removed.  However, it is recommended that for consistency users stick exclusively to one name or another.",
+    "description": ":   *arg is a series of commands (usually quoted to protect it from* immediate evaluation by the shell) to be read and executed when the shell receives any of the signals specified by one or more *sig args.* Each *sig can be given as a number,* or as the name of a signal either with or without the string **SIG** in front (e.g. 1, HUP, and SIGHUP are all the same signal).\n\n    If *arg is \\`***-***\\', then the specified signals are reset to their* defaults, or, if no *sig args are present, all traps are reset.*\n\n    If *arg is an empty string, then the specified signals* are ignored by the shell (and by the commands it invokes).\n\n    If *arg is omitted but one or more sig args are provided (i.e.* the first argument is a valid signal number or name), the effect is the same as if *arg had been specified as \\`***-***\\'.*\n\n    The **trap** *command with no arguments prints a list of commands* associated with each signal.\n\n    If *sig is* **ZERR** *then arg will be executed* after each command with a nonzero exit status. **ERR** *is an alias* for **ZERR** *on systems that have no* **SIGERR** *signal (this is the* usual case).\n\n    If *sig is* **DEBUG** *then arg will be executed* before each command if the option **DEBUG_BEFORE_CMD** *is set* (as it is by default), else after each command. Here, a \\`command\\' is what is described as a \\`sublist\\' in the shell grammar, see the section SIMPLE COMMANDS & PIPELINES in *zshmisc(1).* If **DEBUG_BEFORE_CMD** *is set various additional features are available.* First, it is possible to skip the next command by setting the option **ERR_EXIT***; see the description of the* **ERR_EXIT** *option in* *zshoptions(1). Also, the shell parameter* **ZSH_DEBUG_CMD** *is set to the string corresponding to the command* to be executed following the trap. Note that this string is reconstructed from the internal format and may not be formatted the same way as the original text. The parameter is unset after the trap is executed.\n\n    If *sig is* **0** *or* **EXIT** and the **trap** *statement is executed inside the body of a function,* then the command *arg is executed after the function completes.* The value of **\\$?** *at the start of execution is the exit status of the* shell or the return status of the function exiting. If *sig is* **0** *or* **EXIT** and the **trap** *statement is not executed inside the body of a function,* then the command *arg is executed when the shell terminates; the* trap runs before any **zshexit** *hook functions.*\n\n    **ZERR***,* **DEBUG***, and* **EXIT** *traps are not executed inside other* traps. **ZERR** *and* **DEBUG** *traps are kept within subshells, while* other traps are reset.\n\n    Note that traps defined with the **trap** *builtin are slightly different* from those defined as \\`**TRAP***NAL () { \\... }\\', as the latter have* their own function environment (line numbers, local variables, etc.) while the former use the environment of the command in which they were called. For example,\n\n    > trap 'print $LINENO' DEBUG\n\n    will print the line number of a command executed after it has run, while\n\n    > TRAPDEBUG() { print $LINENO; }\n\n    will always print the number zero.\n\n    Alternative signal names are allowed as described under **kill** *above.* Defining a trap under either name causes any trap under an alternative name to be removed. However, it is recommended that for consistency users stick exclusively to one name or another.\n",
     "args": "trap [ arg ] [ sig ... ]"
   },
   "true": {
     "shortDescription": "Return exit status of 0",
-    "description": "Do nothing and return an exit status of 0.",
+    "description": ":   Do nothing and return an exit status of 0.\n",
     "args": "true [ arg ... ]"
   },
   "ttyctl": {
     "shortDescription": "Control terminal attributes",
-    "description": "The -f option freezes the tty (i.e. terminal or terminal emulator), and -u unfreezes it.  When the tty is frozen, no changes made to the tty settings by external programs will be honored by the shell, except for changes in the size of the screen; the shell will simply reset the settings to their previous values as soon as each command exits or is suspended. Thus, stty and similar programs have no effect when the tty is frozen.  Freezing the tty does not cause the current state to be remembered: instead, it causes future changes to the state to be blocked. Without options it reports whether the terminal is frozen or not. Note that, regardless of whether the tty is frozen or not, the shell needs to change the settings when the line editor starts, so unfreezing the tty does not guarantee settings made on the command line are preserved.  Strings of commands run between editing the command line will see a consistent tty state.  See also the shell variable STTY for a means of initialising the tty before running external commands and/or freezing the tty around a single command.",
+    "description": ":   The **-f** *option freezes the tty (i.e. terminal or terminal emulator), and* **-u** *unfreezes it.* When the tty is frozen, no changes made to the tty settings by external programs will be honored by the shell, except for changes in the size of the screen; the shell will simply reset the settings to their previous values as soon as each command exits or is suspended. Thus, **stty** *and similar programs have* no effect when the tty is frozen. Freezing the tty does not cause the current state to be remembered: instead, it causes future changes to the state to be blocked.\n\n    Without options it reports whether the terminal is frozen or not.\n\n    Note that, regardless of whether the tty is frozen or not, the shell needs to change the settings when the line editor starts, so unfreezing the tty does not guarantee settings made on the command line are preserved. Strings of commands run between editing the command line will see a consistent tty state. See also the shell variable **STTY** *for a means of initialising* the tty before running external commands and/or freezing the tty around a single command.\n",
     "args": "ttyctl [ -fu ]"
   },
   "type": {
     "shortDescription": "Describe a command",
-    "description": "Equivalent to whence -v.",
+    "description": ":   Equivalent to **whence -v***.*\n",
     "args": "type [ -wfpamsS ] name ..."
   },
   "typeset": {
     "shortDescription": "Set or display parameter attributes/values",
-    "description": "Set or display attributes and values for shell parameters. Except as noted below for control flags that change the behavior, a parameter is created for each name that does not already refer to one.  When inside a function, a new parameter is created for every name (even those that already exist), and is unset again when the function completes.  See `Local Parameters' in zshparam(1).  The same rules apply to special shell parameters, which retain their special attributes when made local. For each name=value assignment, the parameter name is set to value.  If the assignment is omitted and name does not refer to an existing parameter, a new parameter is intialized to empty string, zero, or empty array (as appropriate), unless the shell option TYPESET_TO_UNSET is set.  When that option is set, the parameter attributes are recorded but the parameter remains unset. If the shell option TYPESET_SILENT is not set, for each remaining name that refers to a parameter that is already set, the name and value of the parameter are printed in the form of an assignment.  Nothing is printed for newly-created parameters, or when any attribute flags listed below are given along with the name.  Using `+' instead of minus to introduce an attribute turns it off. If no name is present, the names and values of all parameters are printed.  In this case the attribute flags restrict the display to only those parameters that have the specified attributes, and using `+' rather than `-' to introduce the flag suppresses printing of the values of parameters when there is no parameter name. All forms of the command handle scalar assignment.  Array assignment is possible if any of the reserved words declare, export, float, integer, local, readonly or typeset is matched when the line is parsed (N.B. not when it is executed).  In this case the arguments are parsed as assignments, except that the `+=' syntax and the GLOB_ASSIGN option are not supported, and scalar values after = are not split further into words, even if expanded (regardless of the setting of the KSH_TYPESET option; this option is obsolete). Examples of the differences between command and reserved word parsing: # Reserved word parsing typeset svar=$(echo one word) avar=(several words) The above creates a scalar parameter svar and an array parameter avar as if the assignments had been svar=\"one word\" avar=(several words) On the other hand: # Normal builtin interface builtin typeset svar=$(echo two words) The builtin keyword causes the above to use the standard builtin interface to typeset in which argument parsing is performed in the same way as for other commands.  This example creates a scalar svar containing the value two and another scalar parameter words with no value.  An array value in this case would either cause an error or be treated as an obscure set of glob qualifiers. Arbitrary arguments are allowed if they take the form of assignments after command line expansion; however, these only perform scalar assignment: var='svar=val' typeset $var The above sets the scalar parameter svar to the value val. Parentheses around the value within var would not cause array assignment as they will be treated as ordinary characters when $var is substituted.  Any non-trivial expansion in the name part of the assignment causes the argument to be treated in this fashion: typeset {var1,var2,var3}=name The above syntax is valid, and has the expected effect of setting the three parameters to the same value, but the command line is parsed as a set of three normal command line arguments to typeset after expansion.  Hence it is not possible to assign to multiple arrays by this means. Note that each interface to any of the commands may be disabled separately.  For example, `disable -r typeset' disables the reserved word interface to typeset, exposing the builtin interface, while `disable typeset' disables the builtin.  Note that disabling the reserved word interface for typeset may cause problems with the output of `typeset -p', which assumes the reserved word interface is available in order to restore array and associative array values. Unlike parameter assignment statements, typeset's exit status on an assignment that involves a command substitution does not reflect the exit status of the command substitution.  Therefore, to test for an error in a command substitution, separate the declaration of the parameter from its initialization: # WRONG typeset var1=$(exit 1) || echo \"Trouble with var1\" # RIGHT typeset var1 && var1=$(exit 1) || echo \"Trouble with var1\" To initialize a parameter param to a command output and mark it readonly, use typeset -r param or readonly param after the parameter assignment statement. If no attribute flags are given, and either no name arguments are present or the flag +m is used, then each parameter name printed is preceded by a list of the attributes of that parameter (array, association, exported, float, integer, readonly, or undefined for autoloaded parameters not yet loaded).  If +m is used with attribute flags, and all those flags are introduced with +, the matching parameter names are printed but their values are not. The following control flags change the behavior of typeset: +      If `+' appears by itself in a separate word as the last option, then the names of all parameters (functions with -f) are printed, but the values (function bodies) are not.  No name arguments may appear, and it is an error for any other options to follow `+'.  The effect of `+' is as if all attribute flags which precede it were given with a `+' prefix.  For example, `typeset -U +' is equivalent to `typeset +U' and displays the names of all arrays having the uniqueness attribute, whereas `typeset -f -U +' displays the names of all autoloadable functions.  If + is the only option, then type information (array, readonly, etc.) is also printed for each parameter, in the same manner as `typeset +m \"*\"'. -g     The -g (global) means that any resulting parameter will not be restricted to local scope.  Note that this does not necessarily mean that the parameter will be global, as the flag will apply to any existing parameter (even if unset) from an enclosing function.  This flag does not affect the parameter after creation, hence it has no effect when listing existing parameters, nor does the flag +g have any effect except in combination with -m (see below). -m     If the -m flag is given the name arguments are taken as patterns (use quoting to prevent these from being interpreted as file patterns).  With no attribute flags, all parameters (or functions with the -f flag) with matching names are printed (the shell option TYPESET_SILENT is not used in this case). If the +g flag is combined with -m, a new local parameter is created for every matching parameter that is not already local.  Otherwise -m applies all other flags or assignments to the existing parameters. Except when assignments are made with name=value, using +m forces the matching parameters and their attributes to be printed, even inside a function.  Note that -m is ignored if no patterns are given, so `typeset -m' displays attributes but `typeset -a +m' does not. -p [ n ] If the -p option is given, parameters and values are printed in the form of a typeset command with an assignment, regardless of other flags and options.  Note that the -H flag on parameters is respected; no value will be shown for these parameters. -p may be followed by an optional integer argument. Currently only the value 1 is supported.  In this case arrays and associative arrays are printed with newlines between indented elements for readability. -T [ scalar[=value] array[=(value ...)] [ sep ] ] This flag has a different meaning when used with -f; see below.  Otherwise the -T option requires zero, two, or three arguments to be present.  With no arguments, the list of parameters created in this fashion is shown. With two or three arguments, the first two are the name of a scalar and of an array parameter (in that order) that will be tied together in the manner of $PATH and $path.  The optional third argument is a single-character separator which will be used to join the elements of the array to form the scalar; if absent, a colon is used, as with $PATH.  Only the first character of the separator is significant; any remaining characters are ignored. Multibyte characters are not yet supported. Only one of the scalar and array parameters may be assigned an initial value (the restrictions on assignment forms described above also apply). Both the scalar and the array may be manipulated as normal.  If one is unset, the other will automatically be unset too.  There is no way of untying the variables without unsetting them, nor of converting the type of one of them with another typeset command; +T does not work, assigning an array to scalar is an error, and assigning a scalar to array sets it to be a single-element array. Note that both `typeset -xT ...'  and `export -T ...' work, but only the scalar will be marked for export. Setting the value using the scalar version causes a split on all separators (which cannot be quoted).  It is possible to apply -T to two previously tied variables but with a different separator character, in which case the variables remain joined as before but the separator is changed. When an existing scalar is tied to a new array, the value of the scalar is preserved but no attribute other than export will be preserved. Attribute flags that transform the final value (-L, -R, -Z, -l, -u) are only applied to the expanded value at the point of a parameter expansion expression using `$'.  They are not applied when a parameter is retrieved internally by the shell for any purpose. The following attribute flags may be specified: -A     The names refer to associative array parameters; see `Array Parameters' in zshparam(1). -L [ n ] Left justify and remove leading blanks from the value when the parameter is expanded.  If n is nonzero, it defines the width of the field.  If n is zero, the width is determined by the width of the value of the first assignment.  In the case of numeric parameters, the length of the complete value assigned to the parameter is used to determine the width, not the value that would be output. The width is the count of characters, which may be multibyte characters if the MULTIBYTE option is in effect.  Note that the screen width of the character is not taken into account; if this is required, use padding with parameter expansion flags ${(ml...)...} as described in `Parameter Expansion Flags' in zshexpn(1). When the parameter is expanded, it is filled on the right with blanks or truncated if necessary to fit the field. Note truncation can lead to unexpected results with numeric parameters.  Leading zeros are removed if the -Z flag is also set. -R [ n ] Similar to -L, except that right justification is used; when the parameter is expanded, the field is left filled with blanks or truncated from the end.  May not be combined with the -Z flag. -U     For arrays (but not for associative arrays), keep only the first occurrence of each duplicated value.  This may also be set for tied parameters (see -T) or colon-separated special parameters like PATH or FIGNORE, etc.  Note the flag takes effect on assignment, and the type of the variable being assigned to is determinative; for variables with shared values it is therefore recommended to set the flag for all interfaces, e.g. `typeset -U PATH path'. This flag has a different meaning when used with -f; see below. -Z [ n ] Specially handled if set along with the -L flag. Otherwise, similar to -R, except that leading zeros are used for padding instead of blanks if the first non-blank character is a digit.  Numeric parameters are specially handled: they are always eligible for padding with zeroes, and the zeroes are inserted at an appropriate place in the output. -a     The names refer to array parameters.  An array parameter may be created this way, but it may be assigned to in the typeset statement only if the reserved word form of typeset is enabled (as it is by default).  When displaying, both normal and associative arrays are shown. -f     The names refer to functions rather than parameters.  No assignments can be made, and the only other valid flags are -t, -T, -k, -u, -U and -z.  The flag -t turns on execution tracing for this function; the flag -T does the same, but turns off tracing for any named (not anonymous) function called from the present one, unless that function also has the -t or -T flag.  The -u and -U flags cause the function to be marked for autoloading; -U also causes alias expansion to be suppressed when the function is loaded.  See the description of the `autoload' builtin for details. Note that the builtin functions provides the same basic capabilities as typeset -f but gives access to a few extra options; autoload gives further additional options for the case typeset -fu and typeset -fU. -h     Hide: only useful for special parameters (those marked `<S>' in the table in zshparam(1)), and for local parameters with the same name as a special parameter, though harmless for others.  A special parameter with this attribute will not retain its special effect when made local.  Thus after `typeset -h PATH', a function containing `typeset PATH' will create an ordinary local parameter without the usual behaviour of PATH. Alternatively, the local parameter may itself be given this attribute; hence inside a function `typeset -h PATH' creates an ordinary local parameter and the special PATH parameter is not altered in any way.  It is also possible to create a local parameter using `typeset +h special', where the local copy of special will retain its special properties regardless of having the -h attribute.  Global special parameters loaded from shell modules (currently those in zsh/mapfile and zsh/parameter) are automatically given the -h attribute to avoid name clashes. -H     Hide value: specifies that typeset will not display the value of the parameter when listing parameters; the display for such parameters is always as if the `+' flag had been given.  Use of the parameter is in other respects normal, and the option does not apply if the parameter is specified by name, or by pattern with the -m option.  This is on by default for the parameters in the zsh/parameter and zsh/mapfile modules.  Note, however, that unlike the -h flag this is also useful for non-special parameters. -i [ n ] Use an internal integer representation.  If n is nonzero it defines the output arithmetic base, otherwise it is determined by the first assignment.  Bases from 2 to 36 inclusive are allowed. -E [ n ] Use an internal double-precision floating point representation.  On output the variable will be converted to scientific notation.  If n is nonzero it defines the number of significant figures to display; the default is ten. -F [ n ] Use an internal double-precision floating point representation.  On output the variable will be converted to fixed-point decimal notation.  If n is nonzero it defines the number of digits to display after the decimal point; the default is ten. -l     Convert the result to lower case whenever the parameter is expanded.  The value is not converted when assigned. -r     The given names are marked readonly.  Note that if name is a special parameter, the readonly attribute can be turned on, but cannot then be turned off. If the POSIX_BUILTINS option is set, the readonly attribute is more restrictive: unset variables can be marked readonly and cannot then be set; furthermore, the readonly attribute cannot be removed from any variable. It is still possible to change other attributes of the variable though, some of which like -U or -Z would affect the value. More generally, the readonly attribute should not be relied on as a security mechanism. Note that in zsh (like in pdksh but unlike most other shells) it is still possible to create a local variable of the same name as this is considered a different variable (though this variable, too, can be marked readonly). Special variables that have been made readonly retain their value and readonly attribute when made local. -t     Tags the named parameters.  Tags have no special meaning to the shell.  This flag has a different meaning when used with -f; see above. -u     Convert the result to upper case whenever the parameter is expanded.  The value is not converted when assigned. This flag has a different meaning when used with -f; see above. -x     Mark for automatic export to the environment of subsequently executed commands.  If the option GLOBAL_EXPORT is set, this implies the option -g, unless +g is also explicitly given; in other words the parameter is not made local to the enclosing function.  This is for compatibility with previous versions of zsh.",
-    "args": "typeset -f [ {+|-}TUkmtuz ] [ + ] [ name ... ]"
+    "description": "*\\[* **+** *\\| SCALAR\\[***=***value\\] array\\[***=(***value \\...***)***\\] \\[ sep \\] \\]*\n\n**typeset** **-f** *\\[ {***+***\\|***-***}***TUkmtuz** *\\] \\[* **+** *\\] \\[ name \\... \\]* Set or display attributes and values for shell parameters.\n\n> Except as noted below for control flags that change the behavior, a parameter is created for each *name that does not already refer* to one. When inside a function, a new parameter is created for every *name (even those that already exist), and is unset again when the* function completes. See \\`Local Parameters\\' in *zshparam(1). The same rules apply to special shell parameters, which* retain their special attributes when made local.\n>\n> For each *name***=***value assignment, the parameter* *name is set to value. If the assignment is omitted and name* does *not refer to an existing parameter, a new parameter is intialized* to empty string, zero, or empty array (as appropriate), *unless the* shell option **TYPESET_TO_UNSET** *is set. When that option is set,* the parameter attributes are recorded but the parameter remains unset.\n>\n> If the shell option **TYPESET_SILENT** *is not set, for each remaining* *name that refers to a parameter that is already set, the name and* value of the parameter are printed in the form of an assignment. Nothing is printed for newly-created parameters, or when any attribute flags listed below are given along with the *name. Using* \\`**+***\\' instead of minus to introduce an attribute turns it off.*\n>\n> If no *name is present, the names and values of all parameters are* printed. In this case the attribute flags restrict the display to only those parameters that have the specified attributes, and using \\`**+***\\'* rather than \\`**-***\\' to introduce the flag suppresses printing of the values* of parameters when there is no parameter name.\n>\n> All forms of the command handle scalar assignment. Array assignment is possible if any of the reserved words **declare***,* **export***,* **float***,* **integer***,* **local***,* **readonly** *or* **typeset** *is matched when the* line is parsed (N.B. not when it is executed). In this case the arguments are parsed as assignments, except that the \\`**+=***\\' syntax and the* **GLOB_ASSIGN** *option are not supported, and scalar values after* **=** are *not split further into words, even if expanded (regardless of the* setting of the **KSH_TYPESET** *option; this option is obsolete).*\n>\n> Examples of the differences between command and reserved word parsing:\n>\n> > # Reserved word parsing\n> >     typeset svar=$(echo one word) avar=(several words)\n>\n> The above creates a scalar parameter **svar** *and an array* parameter **avar** *as if the assignments had been*\n>\n> > svar=\"one word\"\n> >     avar=(several words)\n>\n> On the other hand:\n>\n> > # Normal builtin interface\n> >     builtin typeset svar=$(echo two words)\n>\n> The **builtin** *keyword causes the above to use the standard builtin* interface to **typeset** *in which argument parsing is performed in the same* way as for other commands. This example creates a scalar **svar** containing the value **two** *and another scalar parameter* **words** *with* no value. An array value in this case would either cause an error or be treated as an obscure set of glob qualifiers.\n>\n> Arbitrary arguments are allowed if they take the form of assignments after command line expansion; however, these only perform scalar assignment:\n>\n> > var='svar=val'\n> >     typeset $var\n>\n> The above sets the scalar parameter **svar** *to the value* **val***.* Parentheses around the value within **var** *would not cause array* assignment as they will be treated as ordinary characters when **\\$var** is substituted. Any non-trivial expansion in the name part of the assignment causes the argument to be treated in this fashion:\n>\n> > typeset {var1,var2,var3}=name\n>\n> The above syntax is valid, and has the expected effect of setting the three parameters to the same value, but the command line is parsed as a set of three normal command line arguments to **typeset** *after* expansion. Hence it is not possible to assign to multiple arrays by this means.\n>\n> Note that each interface to any of the commands may be disabled separately. For example, \\`**disable -r typeset***\\' disables the reserved* word interface to **typeset***, exposing the builtin interface, while* \\`**disable typeset***\\' disables the builtin. Note that disabling the* reserved word interface for **typeset** *may cause problems with the* output of \\`**typeset -p***\\', which assumes the reserved word interface is* available in order to restore array and associative array values.\n>\n> Unlike parameter assignment statements, **typeset***\\'s exit status on an* assignment that involves a command substitution does not reflect the exit status of the command substitution. Therefore, to test for an error in a command substitution, separate the declaration of the parameter from its initialization:\n>\n> > # WRONG\n> >     typeset var1=$(exit 1) || echo \"Trouble with var1\"\n> >\n> >     # RIGHT\n> >     typeset var1 && var1=$(exit 1) || echo \"Trouble with var1\"\n>\n> To initialize a parameter *param to a command output and mark it readonly,* use **typeset -r** *param or* **readonly** *param after the parameter* assignment statement.\n>\n> If no attribute flags are given, and either no *name arguments are* present or the flag **+m** *is used, then each parameter name printed is* preceded by a list of the attributes of that parameter (**array***,* **association***,* **exported***,* **float***,* **integer***,* **readonly***,* or **undefined** *for autoloaded parameters not yet loaded). If* **+m** *is* used with attribute flags, and all those flags are introduced with **+***, the matching parameter names are printed but their values* are not.\n>\n> The following control flags change the behavior of **typeset***:*\n>\n> **+** If \\`**+***\\' appears by itself in a separate word as the last option,* then the names of all parameters (functions with **-f***) are printed, but* the values (function bodies) are not. No *name arguments may appear,* and it is an error for any other options to follow \\`**+***\\'. The* effect of \\`**+***\\' is as if all attribute flags which precede it were* given with a \\`**+***\\' prefix. For example, \\`***typeset -U +***\\' is* equivalent to \\`**typeset +U***\\' and displays the names of all arrays having* the uniqueness attribute, whereas \\`**typeset -f -U +***\\' displays the* names of all autoloadable functions. If **+** *is the only option,* then type information (array, readonly, etc.) is also printed for each parameter, in the same manner as \\`**typeset +m \\\"\\*\\\"***\\'.*\n>\n> **-g**\n>\n> :   The **-g** *(global) means that any resulting parameter will not be* restricted to local scope. Note that this does not necessarily mean that the parameter will be global, as the flag will apply to any existing parameter (even if unset) from an enclosing function. This flag does not affect the parameter after creation, hence it has no effect when listing existing parameters, nor does the flag **+g** *have any effect except in* combination with **-m** *(see below).*\n>\n> **-m**\n>\n> :   If the **-m** *flag is given the name arguments are taken as patterns* (use quoting to prevent these from being interpreted as file patterns). With no attribute flags, all parameters (or functions with the **-f** flag) with matching names are printed (the shell option **TYPESET_SILENT** is not used in this case).\n>\n>     If the **+g** *flag is combined with* **-m***, a new local parameter is* created for every matching parameter that is not already local. Otherwise **-m** *applies all other flags or assignments to the existing parameters.*\n>\n>     Except when assignments are made with *name***=***value, using* **+m** *forces the matching parameters and their attributes to be printed,* even inside a function. Note that **-m** *is ignored if no patterns are* given, so \\`**typeset -m***\\' displays attributes but \\`***typeset -a +m***\\'* does not.\n>\n> **-p** *\\[ n \\]*\n>\n> :   If the **-p** *option is given, parameters and values are printed in the* form of a typeset command with an assignment, regardless of other flags and options. Note that the **-H** *flag on parameters is respected; no* value will be shown for these parameters.\n>\n>     **-p** *may be followed by an optional integer argument. Currently* only the value **1** *is supported. In this case arrays and associative* arrays are printed with newlines between indented elements for readability.\n>\n> **-T** *\\[ scalar\\[***=***value\\] array\\[***=(***value \\...***)***\\] \\[ sep \\] \\]*\n>\n> :   This flag has a different meaning when used with **-f***; see below.* Otherwise the **-T** *option requires zero, two, or three arguments to be* present. With no arguments, the list of parameters created in this fashion is shown. With two or three arguments, the first two are the name of a scalar and of an array parameter (in that order) that will be tied together in the manner of **\\$PATH** *and* **\\$path***. The optional third* argument is a single-character separator which will be used to join the elements of the array to form the scalar; if absent, a colon is used, as with **\\$PATH***. Only the first character of the separator is significant;* any remaining characters are ignored. Multibyte characters are not yet supported.\n>\n>     Only one of the scalar and array parameters may be assigned an initial value (the restrictions on assignment forms described above also apply).\n>\n>     Both the scalar and the array may be manipulated as normal. If one is unset, the other will automatically be unset too. There is no way of untying the variables without unsetting them, nor of converting the type of one of them with another **typeset** *command;* **+T** *does not work,* assigning an array to *scalar is an error, and assigning a scalar to* *array sets it to be a single-element array.*\n>\n>     Note that both \\`**typeset -xT \\...***\\' and \\`***export -T \\...***\\' work, but* only the scalar will be marked for export. Setting the value using the scalar version causes a split on all separators (which cannot be quoted). It is possible to apply **-T** *to two previously tied variables but with a* different separator character, in which case the variables remain joined as before but the separator is changed.\n>\n>     When an existing scalar is tied to a new array, the value of the scalar is preserved but no attribute other than export will be preserved.\n>\n> Attribute flags that transform the final value (**-L***,* **-R***,* **-Z***,* **-l***,* **-u***) are only applied to the expanded value at the point* of a parameter expansion expression using \\`**\\$***\\'. They are not applied* when a parameter is retrieved internally by the shell for any purpose.\n>\n> The following attribute flags may be specified:\n>\n> **-A** The names refer to associative array parameters; see \\`Array Parameters\\' in *zshparam(1).*\n>\n> **-L** *\\[ n \\]*\n>\n> :   Left justify and remove leading blanks from the value when the parameter is expanded. If *n is nonzero, it defines the width of the field.* If *n is zero, the width is determined by the width of the value of* the first assignment. In the case of numeric parameters, the length of the complete value assigned to the parameter is used to determine the width, not the value that would be output.\n>\n>     The width is the count of characters, which may be multibyte characters if the **MULTIBYTE** *option is in effect. Note that the screen* width of the character is not taken into account; if this is required, use padding with parameter expansion flags **\\${(ml***\\...***)***\\...***}** *as described in* \\`Parameter Expansion Flags\\' in *zshexpn(1).*\n>\n>     When the parameter is expanded, it is filled on the right with blanks or truncated if necessary to fit the field. Note truncation can lead to unexpected results with numeric parameters. Leading zeros are removed if the **-Z** *flag is also set.*\n>\n> **-R** *\\[ n \\]*\n>\n> :   Similar to **-L***, except that right justification is used;* when the parameter is expanded, the field is left filled with blanks or truncated from the end. May not be combined with the **-Z** flag.\n>\n> **-U**\n>\n> :   For arrays (but not for associative arrays), keep only the first occurrence of each duplicated value. This may also be set for tied parameters (see **-T***) or colon-separated special parameters like* **PATH** *or* **FIGNORE***, etc. Note the flag takes effect on assignment,* and the type of the variable being assigned to is determinative; for variables with shared values it is therefore recommended to set the flag for all interfaces, e.g. \\`**typeset -U PATH path***\\'.*\n>\n>     This flag has a different meaning when used with **-f***; see below.*\n>\n> **-Z** *\\[ n \\]*\n>\n> :   Specially handled if set along with the **-L** *flag.* Otherwise, similar to **-R***, except that leading zeros are used for* padding instead of blanks if the first non-blank character is a digit. Numeric parameters are specially handled: they are always eligible for padding with zeroes, and the zeroes are inserted at an appropriate place in the output.\n>\n> **-a**\n>\n> :   The names refer to array parameters. An array parameter may be created this way, but it may be assigned to in the **typeset** statement only if the reserved word form of **typeset** *is enabled* (as it is by default). When displaying, both normal and associative arrays are shown.\n>\n> **-f**\n>\n> :   The names refer to functions rather than parameters. No assignments can be made, and the only other valid flags are **-t***,* **-T***,* **-k***,* **-u***,* **-U** *and* **-z***. The flag* **-t** *turns on execution tracing* for this function; the flag **-T** *does the same, but turns off tracing* for any named (not anonymous) function called from the present one, unless that function also has the **-t** *or* **-T** *flag. The* **-u** *and* **-U** *flags cause the* function to be marked for autoloading; **-U** *also causes alias* expansion to be suppressed when the function is loaded. See the description of the \\`**autoload***\\' builtin for details.*\n>\n>     Note that the builtin **functions** *provides the same basic capabilities* as **typeset -f** *but gives access to a few extra options;* **autoload** gives further additional options for the case **typeset -fu** *and* **typeset -fU***.*\n>\n> **-h**\n>\n> :   Hide: only useful for special parameters (those marked \\`\\<S\\>\\' in the table in *zshparam(1)), and for local parameters with the same name as a special parameter,* though harmless for others. A special parameter with this attribute will not retain its special effect when made local. Thus after \\`**typeset -h** PATH*\\', a function containing \\`***typeset PATH***\\' will create an ordinary* local parameter without the usual behaviour of **PATH***. Alternatively,* the local parameter may itself be given this attribute; hence inside a function \\`**typeset -h PATH***\\' creates an ordinary local parameter and the* special **PATH** *parameter is not altered in any way. It is also possible* to create a local parameter using \\`**typeset +h** *special\\', where the* local copy of *special will retain its special properties regardless of* having the **-h** *attribute. Global special parameters loaded from shell* modules (currently those in **zsh/mapfile** *and* **zsh/parameter***) are* automatically given the **-h** *attribute to avoid name clashes.*\n>\n> **-H**\n>\n> :   Hide value: specifies that **typeset** *will not display the value of the* parameter when listing parameters; the display for such parameters is always as if the \\`**+***\\' flag had been given. Use of the parameter is* in other respects normal, and the option does not apply if the parameter is specified by name, or by pattern with the **-m** *option. This is on by* default for the parameters in the **zsh/parameter** *and* **zsh/mapfile** modules. Note, however, that unlike the **-h** *flag this is also useful* for non-special parameters.\n>\n> **-i** *\\[ n \\]*\n>\n> :   Use an internal integer representation. If *n is nonzero it* defines the output arithmetic base, otherwise it is determined by the first assignment. Bases from 2 to 36 inclusive are allowed.\n>\n> **-E** *\\[ n \\]*\n>\n> :   Use an internal double-precision floating point representation. On output the variable will be converted to scientific notation. If *n is* nonzero it defines the number of significant figures to display; the default is ten.\n>\n> **-F** *\\[ n \\]*\n>\n> :   Use an internal double-precision floating point representation. On output the variable will be converted to fixed-point decimal notation. If *n* is nonzero it defines the number of digits to display after the decimal point; the default is ten.\n>\n> **-l**\n>\n> :   Convert the result to lower case whenever the parameter is expanded. The value is *not converted when assigned.*\n>\n> **-r**\n>\n> :   The given *names are marked readonly. Note that if name is a* special parameter, the readonly attribute can be turned on, but cannot then be turned off.\n>\n>     If the **POSIX_BUILTINS** *option is set, the readonly attribute is* more restrictive: unset variables can be marked readonly and cannot then be set; furthermore, the readonly attribute cannot be removed from any variable.\n>\n>     It is still possible to change other attributes of the variable though, some of which like **-U** *or* **-Z** *would affect the value. More generally,* the readonly attribute should not be relied on as a security mechanism.\n>\n>     Note that in zsh (like in pdksh but unlike most other shells) it is still possible to create a local variable of the same name as this is considered a different variable (though this variable, too, can be marked readonly). Special variables that have been made readonly retain their value and readonly attribute when made local.\n>\n> **-t**\n>\n> :   Tags the named parameters. Tags have no special meaning to the shell. This flag has a different meaning when used with **-f***; see above.*\n>\n> **-u**\n>\n> :   Convert the result to upper case whenever the parameter is expanded. The value is *not converted when assigned.* This flag has a different meaning when used with **-f***; see above.*\n>\n> **-x**\n>\n> :   Mark for automatic export to the environment of subsequently executed commands. If the option **GLOBAL_EXPORT** *is set, this implies* the option **-g***, unless* **+g** *is also explicitly given; in other words* the parameter is not made local to the enclosing function. This is for compatibility with previous versions of zsh.\n",
+    "args": "typeset -T [ {+|-}Uglrux ] [ {+|-}LRZp [ n ] ]"
   },
   "ulimit": {
     "shortDescription": "Set or display resource limits",
-    "description": "Set or display resource limits of the shell and the processes started by the shell.  The value of limit can be a number in the unit specified below or one of the values `unlimited', which removes the limit on the resource, or `hard', which uses the current value of the hard limit on the resource. By default, only soft limits are manipulated. If the -H flag is given use hard limits instead of soft limits.  If the -S flag is given together with the -H flag set both hard and soft limits. If no options are used, the file size limit (-f) is assumed. If limit is omitted the current value of the specified resources are printed.  When more than one resource value is printed, the limit name and unit is printed before each value. When looping over multiple resources, the shell will abort immediately if it detects a badly formed argument.  However, if it fails to set a limit for some other reason it will continue trying to set the remaining limits. Not all the following resources are supported on all systems. Running ulimit -a will show which are supported. -a     Lists all of the current resource limits. -b     Socket buffer size in bytes (N.B. not kilobytes) -c     512-byte blocks on the size of core dumps. -d     Kilobytes on the size of the data segment. -f     512-byte blocks on the size of files written. -i     The number of pending signals. -k     The number of kqueues allocated. -l     Kilobytes on the size of locked-in memory. -m     Kilobytes on the size of physical memory. -n     open file descriptors. -p     The number of pseudo-terminals. -q     Bytes in POSIX message queues. -r     Maximum real time priority.  On some systems where this is not available, such as NetBSD, this has the same effect as -T for compatibility with sh. -s     Kilobytes on the size of the stack. -T     The number of simultaneous threads available to the user. -t     CPU seconds to be used. -u     The number of processes available to the user. -v     Kilobytes on the size of virtual memory.  On some systems this refers to the limit called `address space'. -w     Kilobytes on the size of swapped out memory. -x     The number of locks on files. A resource may also be specified by integer in the form `-N resource', where resource corresponds to the integer defined for the resource by the operating system.  This may be used to set the limits for resources known to the shell which do not correspond to option letters.  Such limits will be shown by number in the output of `ulimit -a'. The number may alternatively be out of the range of limits compiled into the shell.  The shell will try to read or write the limit anyway, and will report an error if this fails.",
+    "description": ":   Set or display resource limits of the shell and the processes started by the shell. The value of *limit can be a number in the unit specified* below or one of the values \\`**unlimited***\\', which removes the limit on the* resource, or \\`**hard***\\', which uses the current value of the hard limit on* the resource.\n\n    By default, only soft limits are manipulated. If the **-H** *flag* is given use hard limits instead of soft limits. If the **-S** *flag is given* together with the **-H** *flag set both hard and soft limits.*\n\n    If no options are used, the file size limit (**-f***) is assumed.*\n\n    If *limit is omitted the current value of the specified resources are* printed. When more than one resource value is printed, the limit name and unit is printed before each value.\n\n    When looping over multiple resources, the shell will abort immediately if it detects a badly formed argument. However, if it fails to set a limit for some other reason it will continue trying to set the remaining limits.\n\n    Not all the following resources are supported on all systems. Running **ulimit -a** *will show which are supported.*\n\n    **-a**\n\n    :   Lists all of the current resource limits.\n\n    **-b**\n\n    :   Socket buffer size in bytes (N.B. not kilobytes)\n\n    **-c**\n\n    :   512-byte blocks on the size of core dumps.\n\n    **-d**\n\n    :   Kilobytes on the size of the data segment.\n\n    **-f**\n\n    :   512-byte blocks on the size of files written.\n\n    **-i**\n\n    :   The number of pending signals.\n\n    **-k**\n\n    :   The number of kqueues allocated.\n\n    **-l**\n\n    :   Kilobytes on the size of locked-in memory.\n\n    **-m**\n\n    :   Kilobytes on the size of physical memory.\n\n    **-n**\n\n    :   open file descriptors.\n\n    **-p**\n\n    :   The number of pseudo-terminals.\n\n    **-q**\n\n    :   Bytes in POSIX message queues.\n\n    **-r**\n\n    :   Maximum real time priority. On some systems where this is not available, such as NetBSD, this has the same effect as **-T** for compatibility with **sh***.*\n\n    **-s**\n\n    :   Kilobytes on the size of the stack.\n\n    **-T**\n\n    :   The number of simultaneous threads available to the user.\n\n    **-t**\n\n    :   CPU seconds to be used.\n\n    **-u**\n\n    :   The number of processes available to the user.\n\n    **-v**\n\n    :   Kilobytes on the size of virtual memory. On some systems this refers to the limit called \\`address space\\'.\n\n    **-w**\n\n    :   Kilobytes on the size of swapped out memory.\n\n    **-x**\n\n    :   The number of locks on files.\n\n    A resource may also be specified by integer in the form \\`**-N** *resource\\', where resource corresponds to the integer defined for* the resource by the operating system. This may be used to set the limits for resources known to the shell which do not correspond to option letters. Such limits will be shown by number in the output of \\`**ulimit -a***\\'.*\n\n    The number may alternatively be out of the range of limits compiled into the shell. The shell will try to read or write the limit anyway, and will report an error if this fails.\n",
     "args": "ulimit [ -HSa ] [ { -bcdfiklmnpqrsTtvwx | -N resource } [ limit ] ... ]"
   },
   "umask": {
     "shortDescription": "Set file creation mask",
-    "description": "The umask is set to mask.  mask can be either an octal number or a symbolic value as described in the chmod(1) man page.  If mask is omitted, the current value is printed.  The -S option causes the mask to be printed as a symbolic value.  Otherwise, the mask is printed as an octal number.  Note that in the symbolic form the permissions you specify are those which are to be allowed (not denied) to the users specified.",
+    "description": ":   The umask is set to *mask. mask can be either* an octal number or a symbolic value as described in the *chmod(1) man page.* If *mask is omitted, the current value is printed. The* **-S** option causes the mask to be printed as a symbolic value. Otherwise, the mask is printed as an octal number. Note that in the symbolic form the permissions you specify are those which are to be allowed (not denied) to the users specified.\n",
     "args": "umask [ -S ] [ mask ]"
   },
   "unalias": {
     "shortDescription": "Removes aliases",
-    "description": "Removes aliases.  This command works the same as unhash -a, except that the -a option removes all regular or global aliases, or with -s all suffix aliases: in this case no name arguments may appear.  The options -m (remove by pattern) and -s without -a (remove listed suffix aliases) behave as for unhash -a.  Note that the meaning of -a is different between unalias and unhash.",
+    "description": ":   Removes aliases. This command works the same as **unhash -a***, except that* the **-a** *option removes all regular or global aliases, or with* **-s** all suffix aliases: in this case no *name arguments may appear. The* options **-m** *(remove by pattern) and* **-s** *without* **-a** *(remove* listed suffix aliases) behave as for **unhash -a***. Note that* the meaning of **-a** *is different between* **unalias** *and* **unhash***.*\n",
     "args": "unalias [ -ams ] name ..."
   },
   "unfunction": {
     "shortDescription": "Remove function definition",
-    "description": "Same as unhash -f.",
-    "args": "unfunction undefined"
+    "description": ":   Same as **unhash -f***.*\n",
+    "args": "unfunction"
   },
   "unhash": {
     "shortDescription": "Remove command from hash table",
-    "description": "Remove the element named name from an internal hash table.  The default is remove elements from the command hash table.  The -a option causes unhash to remove regular or global aliases; note when removing a global aliases that the argument must be quoted to prevent it from being expanded before being passed to the command.  The -s option causes unhash to remove suffix aliases. The -f option causes unhash to remove shell functions.  The -d options causes unhash to remove named directories.  If the -m flag is given the arguments are taken as patterns (should be quoted) and all elements of the corresponding hash table with matching names will be removed.",
+    "description": ":   Remove the element named *name from an internal hash table. The* default is remove elements from the command hash table. The **-a** option causes **unhash** *to remove regular or global aliases; note* when removing a global aliases that the argument must be quoted to prevent it from being expanded before being passed to the command. The **-s** *option causes* **unhash** *to remove suffix aliases.* The **-f** *option causes* **unhash** *to remove shell functions. The* **-d** *options causes* **unhash** *to remove named directories. If the* **-m** *flag is given* the arguments are taken as patterns (should be quoted) and all elements of the corresponding hash table with matching names will be removed.\n",
     "args": "unhash [ -adfms ] name ..."
   },
   "unlimit": {
     "shortDescription": "Remove resource limits",
-    "description": "The resource limit for each resource is set to the hard limit. If the -h flag is given and the shell has appropriate privileges, the hard resource limit for each resource is removed.  The resources of the shell process are only changed if the -s flag is given. The unlimit command is not made available by default when the shell starts in a mode emulating another shell.  It can be made available with the command `zmodload -F zsh/rlimits b:unlimit'.",
+    "description": ":   The resource limit for each *resource is set to the hard limit.* If the **-h** *flag is given and the shell has appropriate privileges,* the hard resource limit for each *resource is removed.* The resources of the shell process are only changed if the **-s** flag is given.\n\n    The **unlimit** *command is not made available by default when the* shell starts in a mode emulating another shell. It can be made available with the command \\`**zmodload -F zsh/rlimits b:unlimit***\\'.*\n",
     "args": "unlimit [ -hs ] resource ..."
   },
   "unset": {
     "shortDescription": "Unset values and attributes of variables",
-    "description": "Each named parameter is unset.  Local parameters remain local even if unset; they appear unset within scope, but the previous value will still reappear when the scope ends. Individual elements of associative array parameters may be unset by using subscript syntax on name, which should be quoted (or the entire command prefixed with noglob) to protect the subscript from filename generation. If the -m flag is specified the arguments are taken as patterns (should be quoted) and all parameters with matching names are unset.  Note that this cannot be used when unsetting associative array elements, as the subscript will be treated as part of the pattern. The -v flag specifies that name refers to parameters. This is the default behaviour. unset -f is equivalent to unfunction.",
+    "description": ":   Each named parameter is unset. Local parameters remain local even if unset; they appear unset within scope, but the previous value will still reappear when the scope ends.\n\n    Individual elements of associative array parameters may be unset by using subscript syntax on *name, which should be quoted (or the entire command* prefixed with **noglob***) to protect the subscript from filename generation.*\n\n    If the **-m** *flag is specified the arguments are taken as patterns (should* be quoted) and all parameters with matching names are unset. Note that this cannot be used when unsetting associative array elements, as the subscript will be treated as part of the pattern.\n\n    The **-v** *flag specifies that name refers to parameters. This is the* default behaviour.\n\n    **unset -f** *is equivalent to* **unfunction***.*\n",
     "args": "unset [ -fmv ] name ..."
   },
   "unsetopt": {
     "shortDescription": "Unset shell options",
-    "description": "Unset the options for the shell.  All options specified either with flags or by name are unset.  If no arguments are supplied, the names of all options currently unset are printed.  If the -m flag is given the arguments are taken as patterns (which should be quoted to preserve them from being interpreted as glob patterns), and all options with names matching these patterns are unset.",
+    "description": ":   Unset the options for the shell. All options specified either with flags or by name are unset. If no arguments are supplied, the names of all options currently unset are printed. If the **-m** *flag is given the arguments are taken as patterns* (which should be quoted to preserve them from being interpreted as glob patterns), and all options with names matching these patterns are unset.\n",
     "args": "unsetopt [ {+|-}options | {+|-}o option_name ] [ name ... ]"
   },
+  "vared": {
+    "shortDescription": "Edit shell variables",
+    "description": ":   See the section \\`Zle Builtins\\' in *zshzle(1).*\n",
+    "args": "vared"
+  },
   "wait": {
-    "description": "Wait for the specified jobs or processes.  If job is not given then all currently active child processes are waited for.  Each job can be either a job specification or the process ID of a job in the job table.  The exit status from this command is that of the job waited for.  If job represents an unknown job or process ID, a warning is printed (unless the POSIX_BUILTINS option is set) and the exit status is 127. It is possible to wait for recent processes (specified by process ID, not by job) that were running in the background even if the process has exited.  Typically the process ID will be recorded by capturing the value of the variable $! immediately after the process has been started.  There is a limit on the number of process IDs remembered by the shell; this is given by the value of the system configuration parameter CHILD_MAX.  When this limit is reached, older process IDs are discarded, least recently started processes first. Note there is no protection against the process ID wrapping, i.e. if the wait is not executed soon enough there is a chance the process waited for is the wrong one.  A conflict implies both process IDs have been generated by the shell, as other processes are not recorded, and that the user is potentially interested in both, so this problem is intrinsic to process IDs.",
+    "description": ":   Wait for the specified jobs or processes. If *job is not given* then all currently active child processes are waited for. Each *job can be either a job specification or the process ID* of a job in the job table. The exit status from this command is that of the job waited for. If *job represents an unknown job or process ID, a warning is printed* (unless the **POSIX_BUILTINS** *option is set) and the exit status is 127.*\n\n    It is possible to wait for recent processes (specified by process ID, not by job) that were running in the background even if the process has exited. Typically the process ID will be recorded by capturing the value of the variable **\\$!** *immediately after the process has been* started. There is a limit on the number of process IDs remembered by the shell; this is given by the value of the system configuration parameter **CHILD_MAX***. When this limit is reached, older process IDs* are discarded, least recently started processes first.\n\n    Note there is no protection against the process ID wrapping, i.e. if the wait is not executed soon enough there is a chance the process waited for is the wrong one. A conflict implies both process IDs have been generated by the shell, as other processes are not recorded, and that the user is potentially interested in both, so this problem is intrinsic to process IDs.\n",
     "args": "wait [ job ... ]"
   },
   "whence": {
     "shortDescription": "Locate a command",
-    "description": "For each name, indicate how it would be interpreted if used as a command name. If name is not an alias, built-in command, external command, shell function, hashed command, or a reserved word, the exit status shall be non-zero, and -- if -v, -c, or -w was passed -- a message will be written to standard output.  (This is different from other shells that write that message to standard error.) whence is most useful when name is only the last path component of a command, i.e. does not include a `/'; in particular, pattern matching only succeeds if just the non-directory component of the command is passed. -v     Produce a more verbose report. -c     Print the results in a csh-like format.  This takes precedence over -v. -w     For each name, print `name: word' where word is one of alias, builtin, command, function, hashed, reserved or none, according as name corresponds to an alias, a built-in command, an external command, a shell function, a command defined with the hash builtin, a reserved word, or is not recognised.  This takes precedence over -v and -c. -f     Causes the contents of a shell function to be displayed, which would otherwise not happen unless the -c flag were used. -p     Do a path search for name even if it is an alias, reserved word, shell function or builtin. -a     Do a search for all occurrences of name throughout the command path.  Normally only the first occurrence is printed. -m     The arguments are taken as patterns (pattern characters should be quoted), and the information is displayed for each command matching one of these patterns. -s     If a pathname contains symlinks, print the symlink-free pathname as well. -S     As -s, but if the pathname had to be resolved by following multiple symlinks, the intermediate steps are printed, too.  The symlink resolved at each step might be anywhere in the path. -x num Expand tabs when outputting shell functions using the -c option.  This has the same effect as the -x option to the functions builtin.",
+    "description": ":   For each *name, indicate how it would be interpreted if used as a* command name.\n\n    If *name is not an alias, built-in command, external command, shell* function, hashed command, or a reserved word, the exit status shall be non-zero, and \\-- if **-v***,* **-c***, or* **-w** *was passed \\-- a message* will be written to standard output. (This is different from other shells that write that message to standard error.)\n\n    **whence** *is most useful when name is only the last path component* of a command, i.e. does not include a \\`**/***\\'; in particular, pattern* matching only succeeds if just the non-directory component of the command is passed.\n\n    **-v** Produce a more verbose report.\n\n    **-c**\n\n    :   Print the results in a **csh***-like format.* This takes precedence over **-v***.*\n\n    **-w**\n\n    :   For each *name, print \\`name***:** *word\\' where word* is one of **alias***,* **builtin***,* **command***,* **function***,* **hashed***,* **reserved** *or* **none***, according as name* corresponds to an alias, a built-in command, an external command, a shell function, a command defined with the **hash** *builtin, a* reserved word, or is not recognised. This takes precedence over **-v** *and* **-c***.*\n\n    **-f**\n\n    :   Causes the contents of a shell function to be displayed, which would otherwise not happen unless the **-c** flag were used.\n\n    **-p**\n\n    :   Do a path search for *name* even if it is an alias, reserved word, shell function or builtin.\n\n    **-a**\n\n    :   Do a search for all occurrences of *name* throughout the command path. Normally only the first occurrence is printed.\n\n    **-m**\n\n    :   The arguments are taken as patterns (pattern characters should be quoted), and the information is displayed for each command matching one of these patterns.\n\n    **-s**\n\n    :   If a pathname contains symlinks, print the symlink-free pathname as well.\n\n    **-S**\n\n    :   As **-s***, but if the pathname had to be resolved by following* multiple symlinks, the intermediate steps are printed, too. The symlink resolved at each step might be anywhere in the path.\n\n    **-x** *num*\n\n    :   Expand tabs when outputting shell functions using the **-c** *option.* This has the same effect as the **-x** *option to the* **functions** builtin.\n",
     "args": "whence [ -vcwfpamsS ] [ -x num ] name ..."
   },
   "where": {
     "shortDescription": "Locate a command",
-    "description": "Equivalent to whence -ca.",
+    "description": ":   Equivalent to **whence -ca***.*\n",
     "args": "where [ -wpmsS ] [ -x num ] name ..."
   },
   "which": {
     "shortDescription": "Locate a command",
-    "description": "Equivalent to whence -c.",
+    "description": ":   Equivalent to **whence -c***.*\n",
     "args": "which [ -wpamsS ] [ -x num ] name ..."
   },
   "zcompile": {
     "shortDescription": "Compile functions",
-    "description": "This builtin command can be used to compile functions or scripts, storing the compiled form in a file, and to examine files containing the compiled form.  This allows faster autoloading of functions and sourcing of scripts by avoiding parsing of the text when the files are read. The first form (without the -c, -a or -t options) creates a compiled file.  If only the file argument is given, the output file has the name `file.zwc' and will be placed in the same directory as the file.  The shell will load the compiled file instead of the normal function file when the function is autoloaded; see the section `Autoloading Functions' in zshmisc(1) for a description of how autoloaded functions are searched.  The extension .zwc stands for `zsh word code'. If there is at least one name argument, all the named files are compiled into the output file given as the first argument.  If file does not end in .zwc, this extension is automatically appended.  Files containing multiple compiled functions are called `digest' files, and are intended to be used as elements of the FPATH/fpath special array. The second form, with the -c or -a options, writes the compiled definitions for all the named functions into file.  For -c, the names must be functions currently defined in the shell, not those marked for autoloading.  Undefined functions that are marked for autoloading may be written by using the -a option, in which case the fpath is searched and the contents of the definition files for those functions, if found, are compiled into file.  If both -c and -a are given, names of both defined functions and functions marked for autoloading may be given.  In either case, the functions in files written with the -c or -a option will be autoloaded as if the KSH_AUTOLOAD option were unset. The reason for handling loaded and not-yet-loaded functions with different options is that some definition files for autoloading define multiple functions, including the function with the same name as the file, and, at the end, call that function.  In such cases the output of `zcompile -c' does not include the additional functions defined in the file, and any other initialization code in the file is lost.  Using `zcompile -a' captures all this extra information. If the -m option is combined with -c or -a, the names are used as patterns and all functions whose names match one of these patterns will be written. If no name is given, the definitions of all functions currently defined or marked as autoloaded will be written. Note the second form cannot be used for compiling functions that include redirections as part of the definition rather than within the body of the function; for example fn1() { { ... } >~/logfile } can be compiled but fn1() { ... } >~/logfile cannot.  It is possible to use the first form of zcompile to compile autoloadable functions that include the full function definition instead of just the body of the function. The third form, with the -t option, examines an existing compiled file.  Without further arguments, the names of the original files compiled into it are listed.  The first line of output shows the version of the shell which compiled the file and how the file will be used (i.e. by reading it directly or by mapping it into memory).  With arguments, nothing is output and the return status is set to zero if definitions for all names were found in the compiled file, and non-zero if the definition for at least one name was not found. Other options: -U     Aliases are not expanded when compiling the named files. -R     When the compiled file is read, its contents are copied into the shell's memory, rather than memory-mapped (see -M).  This happens automatically on systems that do not support memory mapping. When compiling scripts instead of autoloadable functions, it is often desirable to use this option; otherwise the whole file, including the code to define functions which have already been defined, will remain mapped, consequently wasting memory. -M     The compiled file is mapped into the shell's memory when read. This is done in such a way that multiple instances of the shell running on the same host will share this mapped file.  If neither -R nor -M is given, the zcompile builtin decides what to do based on the size of the compiled file. -k -z     These options are used when the compiled file contains functions which are to be autoloaded. If -z is given, the function will be autoloaded as if the KSH_AUTOLOAD option is not set, even if it is set at the time the compiled file is read, while if the -k is given, the function will be loaded as if KSH_AUTOLOAD is set.  These options also take precedence over any -k or -z options specified to the autoload builtin. If neither of these options is given, the function will be loaded as determined by the setting of the KSH_AUTOLOAD option at the time the compiled file is read. These options may also appear as many times as necessary between the listed names to specify the loading style of all following functions, up to the next -k or -z. The created file always contains two versions of the compiled format, one for big-endian machines and one for small-endian machines.  The upshot of this is that the compiled file is machine independent and if it is read or mapped, only one half of the file is actually used (and mapped).",
-    "args": "zcompile -t file [ name ... ]"
+    "description": "**zcompile -t** *file \\[ name \\... \\]* This builtin command can be used to compile functions or scripts, storing the compiled form in a file, and to examine files containing the compiled form. This allows faster autoloading of functions and sourcing of scripts by avoiding parsing of the text when the files are read.\n\n> The first form (without the **-c***,* **-a** *or* **-t** *options) creates a* compiled file. If only the *file argument is given, the* output file has the name \\`*file***.zwc***\\' and will be placed in* the same directory as the *file. The shell will load the compiled* file instead of the normal function file when the function is autoloaded; see the section \\`Autoloading Functions\\' in *zshmisc(1)* for a description of how autoloaded functions are searched. The extension **.zwc** *stands for \\`zsh word code\\'.*\n>\n> If there is at least one *name argument, all the named files* are compiled into the output *file given as the first argument. If* *file does not end in* **.zwc***, this extension is automatically* appended. Files containing multiple compiled functions are called \\`digest\\' files, and are intended to be used as elements of the **FPATH***/***fpath** special array.\n>\n> The second form, with the **-c** *or* **-a** *options, writes the compiled* definitions for all the named functions into *file. For* **-c***, the* names must be functions currently defined in the shell, not those marked for autoloading. Undefined functions that are marked for autoloading may be written by using the **-a** *option, in which case the* **fpath** is searched and the contents of the definition files for those functions, if found, are compiled into *file. If both* **-c** *and* **-a** *are given, names of both defined functions and functions marked* for autoloading may be given. In either case, the functions in files written with the **-c** *or* **-a** *option will be autoloaded as if the* **KSH_AUTOLOAD** *option were unset.*\n>\n> The reason for handling loaded and not-yet-loaded functions with different options is that some definition files for autoloading define multiple functions, including the function with the same name as the file, and, at the end, call that function. In such cases the output of \\`**zcompile -c***\\' does not include the additional functions defined in* the file, and any other initialization code in the file is lost. Using \\`**zcompile -a***\\' captures all this extra information.*\n>\n> If the **-m** *option is combined with* **-c** *or* **-a***,* the *names are used as patterns and all functions whose names* match one of these patterns will be written. If no *name is given,* the definitions of all functions currently defined or marked as autoloaded will be written.\n>\n> Note the second form cannot be used for compiling functions that include redirections as part of the definition rather than within the body of the function; for example\n>\n> > fn1() { { ... } >~/logfile }\n>\n> can be compiled but\n>\n> > fn1() { ... } >~/logfile\n>\n> cannot. It is possible to use the first form of **zcompile** *to compile* autoloadable functions that include the full function definition instead of just the body of the function.\n>\n> The third form, with the **-t** *option, examines an existing* compiled file. Without further arguments, the names of the original files compiled into it are listed. The first line of output shows the version of the shell which compiled the file and how the file will be used (i.e. by reading it directly or by mapping it into memory). With arguments, nothing is output and the return status is set to zero if definitions for *all names were found in the compiled* file, and non-zero if the definition for at least one *name was not* found.\n>\n> Other options:\n>\n> **-U** Aliases are not expanded when compiling the *named files.*\n>\n> **-R**\n>\n> :   When the compiled file is read, its contents are copied into the shell\\'s memory, rather than memory-mapped (see **-M***). This* happens automatically on systems that do not support memory mapping.\n>\n>     When compiling scripts instead of autoloadable functions, it is often desirable to use this option; otherwise the whole file, including the code to define functions which have already been defined, will remain mapped, consequently wasting memory.\n>\n> **-M**\n>\n> :   The compiled file is mapped into the shell\\'s memory when read. This is done in such a way that multiple instances of the shell running on the same host will share this mapped file. If neither **-R** *nor* **-M** *is given, the* **zcompile** *builtin decides what to do based* on the size of the compiled file.\n>\n> **-k**\n>\n> **-z** These options are used when the compiled file contains functions which are to be autoloaded. If **-z** *is given, the* function will be autoloaded as if the **KSH_AUTOLOAD** *option is* *not set, even if it is set at the time the compiled file is* read, while if the **-k** *is given, the function will be loaded as if* **KSH_AUTOLOAD** *is set. These options also take precedence over* any **-k** *or* **-z** *options specified to the* **autoload** *builtin. If* neither of these options is given, the function will be loaded as determined by the setting of the **KSH_AUTOLOAD** *option at the time* the compiled file is read. These options may also appear as many times as necessary between the listed *names to specify the loading style of all following functions, up to* the next **-k** *or* **-z***.*\n>\n> The created file always contains two versions of the compiled format, one for big-endian machines and one for small-endian machines. The upshot of this is that the compiled file is machine independent and if it is read or mapped, only one half of the file is actually used (and mapped).\n",
+    "args": "zcompile [ -U ] [ -z | -k ] [ -R | -M ] file [ name ... ]\n\nzcompile -ca [ -m ] [ -R | -M ] file [ name ... ]"
   },
   "zformat": {
     "shortDescription": "Format strings",
-    "description": "See the section `The zsh/zutil Module' in zshmodules(1).",
-    "args": "zformat undefined"
+    "description": ":   See the section \\`The zsh/zutil Module\\' in *zshmodules(1).*\n",
+    "args": "zformat"
+  },
+  "zftp": {
+    "shortDescription": "Zsh FTP client",
+    "description": ":   See the section \\`The zsh/zftp Module\\' in *zshmodules(1).*\n",
+    "args": "zftp"
+  },
+  "zle": {
+    "description": ":   See the section \\`Zle Builtins\\' in *zshzle(1).*\n",
+    "args": "zle"
   },
   "zmodload": {
-    "description": "Performs operations relating to zsh's loadable modules.  Loading of modules while the shell is running (`dynamical loading') is not available on all operating systems, or on all installations on a particular operating system, although the zmodload command itself is always available and can be used to manipulate modules built into versions of the shell executable without dynamical loading. Without arguments the names of all currently loaded binary modules are printed.  The -L option causes this list to be in the form of a series of zmodload commands.  Forms with arguments are: zmodload [ -is ] name ... zmodload -u [ -i ] name ... In the simplest case, zmodload loads a binary module. The module must be in a file with a name consisting of the specified name followed by a standard suffix, usually `.so' (`.sl' on HPUX).  If the module to be loaded is already loaded the duplicate module is ignored.  If zmodload detects an inconsistency, such as an invalid module name or circular dependency list, the current code block is aborted.  If it is available, the module is loaded if necessary, while if it is not available, non-zero status is silently returned.  The option -i is accepted for compatibility but has no effect. The named module is searched for in the same way a command is, using $module_path instead of $path. However, the path search is performed even when the module name contains a `/', which it usually does.  There is no way to prevent the path search. If the module supports features (see below), zmodload tries to enable all features when loading a module.  If the module was successfully loaded but not all features could be enabled, zmodload returns status 2. If the option -s is given, no error is printed if the module was not available (though other errors indicating a problem with the module are printed).  The return status indicates if the module was loaded.  This is appropriate if the caller considers the module optional. With -u, zmodload unloads modules.  The same name must be given that was given when the module was loaded, but it is not necessary for the module to exist in the file system.  The -i option suppresses the error if the module is already unloaded (or was never loaded). Each module has a boot and a cleanup function.  The module will not be loaded if its boot function fails. Similarly a module can only be unloaded if its cleanup function runs successfully. zmodload -F [ -almLe -P param ] module [ [+-]feature ... ] zmodload -F allows more selective control over the features provided by modules.  With no options apart from -F, the module named module is loaded, if it was not already loaded, and the list of features is set to the required state.  If no features are specified, the module is loaded, if it was not already loaded, but the state of features is unchanged.  Each feature may be preceded by a + to turn the feature on, or - to turn it off; the + is assumed if neither character is present.  Any feature not explicitly mentioned is left in its current state; if the module was not previously loaded this means any such features will remain disabled.  The return status is zero if all features were set, 1 if the module failed to load, and 2 if some features could not be set (for example, a parameter couldn't be added because there was a different parameter of the same name) but the module was loaded. The standard features are builtins, conditions, parameters and math functions; these are indicated by the prefix `b:', `c:' (`C:' for an infix condition), `p:' and `f:', respectively, followed by the name that the corresponding feature would have in the shell.  For example, `b:strftime' indicates a builtin named strftime and p:EPOCHSECONDS indicates a parameter named EPOCHSECONDS.  The module may provide other (`abstract') features of its own as indicated by its documentation; these have no prefix. With -l or -L, features provided by the module are listed.  With -l alone, a list of features together with their states is shown, one feature per line.  With -L alone, a zmodload -F command that would cause enabled features of the module to be turned on is shown.  With -lL, a zmodload -F command that would cause all the features to be set to their current state is shown.  If one of these combinations is given with the option -P param then the parameter param is set to an array of features, either features together with their state or (if -L alone is given) enabled features. With the option -L the module name may be omitted; then a list of all enabled features for all modules providing features is printed in the form of zmodload -F commands. If -l is also given, the state of both enabled and disabled features is output in that form. A set of features may be provided together with -l or -L and a module name; in that case only the state of those features is considered.  Each feature may be preceded by + or - but the character has no effect.  If no set of features is provided, all features are considered. With -e, the command first tests that the module is loaded; if it is not, status 1 is returned.  If the module is loaded, the list of features given as an argument is examined.  Any feature given with no prefix is simply tested to see if the module provides it; any feature given with a prefix + or - is tested to see if is provided and in the given state.  If the tests on all features in the list succeed, status 0 is returned, else status 1. With -m, each entry in the given list of features is taken as a pattern to be matched against the list of features provided by the module.  An initial + or - must be given explicitly.  This may not be combined with the -a option as autoloads must be specified explicitly. With -a, the given list of features is marked for autoload from the specified module, which may not yet be loaded.  An optional + may appear before the feature name.  If the feature is prefixed with -, any existing autoload is removed.  The options -l and -L may be used to list autoloads.  Autoloading is specific to individual features; when the module is loaded only the requested feature is enabled.  Autoload requests are preserved if the module is subsequently unloaded until an explicit `zmodload -Fa module -feature' is issued.  It is not an error to request an autoload for a feature of a module that is already loaded. When the module is loaded each autoload is checked against the features actually provided by the module; if the feature is not provided the autoload request is deleted.  A warning message is output; if the module is being loaded to provide a different feature, and that autoload is successful, there is no effect on the status of the current command.  If the module is already loaded at the time when zmodload -Fa is run, an error message is printed and status 1 returned. zmodload -Fa can be used with the -l, -L, -e and -P options for listing and testing the existence of autoloadable features.  In this case -l is ignored if -L is specified.  zmodload -FaL with no module name lists autoloads for all modules. Note that only standard features as described above can be autoloaded; other features require the module to be loaded before enabling. zmodload -d [ -L ] [ name ] zmodload -d name dep ... zmodload -ud name [ dep ... ] The -d option can be used to specify module dependencies. The modules named in the second and subsequent arguments will be loaded before the module named in the first argument. With -d and one argument, all dependencies for that module are listed.  With -d and no arguments, all module dependencies are listed.  This listing is by default in a Makefile-like format.  The -L option changes this format to a list of zmodload -d commands. If -d and -u are both used, dependencies are removed.  If only one argument is given, all dependencies for that module are removed. zmodload -ab [ -L ] zmodload -ab [ -i ] name [ builtin ... ] zmodload -ub [ -i ] builtin ... The -ab option defines autoloaded builtins.  It defines the specified builtins.  When any of those builtins is called, the module specified in the first argument is loaded and all its features are enabled (for selective control of features use `zmodload -F -a' as described above).  If only the name is given, one builtin is defined, with the same name as the module.  -i suppresses the error if the builtin is already defined or autoloaded, but not if another builtin of the same name is already defined. With -ab and no arguments, all autoloaded builtins are listed, with the module name (if different) shown in parentheses after the builtin name.  The -L option changes this format to a list of zmodload -a commands. If -b is used together with the -u option, it removes builtins previously defined with -ab.  This is only possible if the builtin is not yet loaded.  -i suppresses the error if the builtin is already removed (or never existed). Autoload requests are retained if the module is subsequently unloaded until an explicit `zmodload -ub builtin' is issued. zmodload -ac [ -IL ] zmodload -ac [ -iI ] name [ cond ... ] zmodload -uc [ -iI ] cond ... The -ac option is used to define autoloaded condition codes. The cond strings give the names of the conditions defined by the module. The optional -I option is used to define infix condition names. Without this option prefix condition names are defined. If given no condition names, all defined names are listed (as a series of zmodload commands if the -L option is given). The -uc option removes definitions for autoloaded conditions. zmodload -ap [ -L ] zmodload -ap [ -i ] name [ parameter ... ] zmodload -up [ -i ] parameter ... The -p option is like the -b and -c options, but makes zmodload work on autoloaded parameters instead. zmodload -af [ -L ] zmodload -af [ -i ] name [ function ... ] zmodload -uf [ -i ] function ... The -f option is like the -b, -p, and -c options, but makes zmodload work on autoloaded math functions instead. zmodload -a [ -L ] zmodload -a [ -i ] name [ builtin ... ] zmodload -ua [ -i ] builtin ... Equivalent to -ab and -ub. zmodload -e [ -A ] [ string ... ] The -e option without arguments lists all loaded modules; if the -A option is also given, module aliases corresponding to loaded modules are also shown.  If arguments are provided, nothing is printed; the return status is set to zero if all strings given as arguments are names of loaded modules and to one if at least on string is not the name of a loaded module.  This can be used to test for the availability of things implemented by modules.  In this case, any aliases are automatically resolved and the -A flag is not used. zmodload -A [ -L ] [ modalias[=module] ... ] For each argument, if both modalias and module are given, define modalias to be an alias for the module module.  If the module modalias is ever subsequently requested, either via a call to zmodload or implicitly, the shell will attempt to load module instead.  If module is not given, show the definition of modalias.  If no arguments are given, list all defined module aliases.  When listing, if the -L flag was also given, list the definition as a zmodload command to recreate the alias. The existence of aliases for modules is completely independent of whether the name resolved is actually loaded as a module: while the alias exists, loading and unloading the module under any alias has exactly the same effect as using the resolved name, and does not affect the connection between the alias and the resolved name which can be removed either by zmodload -R or by redefining the alias.  Chains of aliases (i.e. where the first resolved name is itself an alias) are valid so long as these are not circular.  As the aliases take the same format as module names, they may include path separators: in this case, there is no requirement for any part of the path named to exist as the alias will be resolved first. For example, `any/old/alias' is always a valid alias. Dependencies added to aliased modules are actually added to the resolved module; these remain if the alias is removed.  It is valid to create an alias whose name is one of the standard shell modules and which resolves to a different module.  However, if a module has dependencies, it will not be possible to use the module name as an alias as the module will already be marked as a loadable module in its own right. Apart from the above, aliases can be used in the zmodload command anywhere module names are required.  However, aliases will not be shown in lists of loaded modules with a bare `zmodload'. zmodload -R modalias ... For each modalias argument that was previously defined as a module alias via zmodload -A, delete the alias.  If any was not defined, an error is caused and the remainder of the line is ignored. Note that zsh makes no distinction between modules that were linked into the shell and modules that are loaded dynamically. In both cases this builtin command has to be used to make available the builtins and other things defined by modules (unless the module is autoloaded on these definitions). This is true even for systems that don't support dynamic loading of modules.",
-    "args": "zmodload -R modalias ..."
+    "description": "**zmodload** **-R** *modalias \\...* Performs operations relating to zsh\\'s loadable modules. Loading of modules while the shell is running (\\`dynamical loading\\') is not available on all operating systems, or on all installations on a particular operating system, although the **zmodload** *command itself is always* available and can be used to manipulate modules built into versions of the shell executable without dynamical loading.\n\n> Without arguments the names of all currently loaded binary modules are printed. The **-L** *option causes this list to be in the form of a* series of **zmodload** *commands. Forms with arguments are:*\n>\n> **zmodload** *\\[* **-is** *\\] name \\...*\n>\n> **zmodload** **-u** *\\[* **-i** *\\] name \\...* In the simplest case, **zmodload** *loads a binary module. The module must* be in a file with a name consisting of the specified *name followed by* a standard suffix, usually \\`**.so***\\' (\\`***.sl***\\' on HPUX).* If the module to be loaded is already loaded the duplicate module is ignored. If **zmodload** *detects an inconsistency, such as an* invalid module name or circular dependency list, the current code block is aborted. If it is available, the module is loaded if necessary, while if it is not available, non-zero status is silently returned. The option **-i** *is accepted for compatibility but has no effect.*\n>\n> > The *named module is searched for in the same way a command is, using* **\\$module_path** *instead of* **\\$path***. However, the path search is* performed even when the module name contains a \\`**/***\\', which it usually does.* There is no way to prevent the path search.\n> >\n> > If the module supports features (see below), **zmodload** *tries to* enable all features when loading a module. If the module was successfully loaded but not all features could be enabled, **zmodload** *returns status 2.*\n> >\n> > If the option **-s** *is given, no error is printed if the module was not* available (though other errors indicating a problem with the module are printed). The return status indicates if the module was loaded. This is appropriate if the caller considers the module optional.\n> >\n> > With **-u***,* **zmodload** *unloads modules. The same name* must be given that was given when the module was loaded, but it is not necessary for the module to exist in the file system. The **-i** *option suppresses the error if the module is already* unloaded (or was never loaded).\n> >\n> > Each module has a boot and a cleanup function. The module will not be loaded if its boot function fails. Similarly a module can only be unloaded if its cleanup function runs successfully.\n>\n> **zmodload -F** *\\[* **-almLe**  **-P** *param \\] module \\[ \\[***+-***\\]feature \\... \\]*\n>\n> :   **zmodload -F** *allows more selective control over the features provided* by modules. With no options apart from **-F***, the module named* *module is loaded, if it was not already loaded, and the list of* *features is set to the required state. If no* *features are specified, the module is loaded, if it was not already* loaded, but the state of features is unchanged. Each feature may be preceded by a **+** *to turn the feature on, or* **-** *to turn it* off; the **+** *is assumed if neither character is present.* Any feature not explicitly mentioned is left in its current state; if the module was not previously loaded this means any such features will remain disabled. The return status is zero if all features were set, 1 if the module failed to load, and 2 if some features could not be set (for example, a parameter couldn\\'t be added because there was a different parameter of the same name) but the module was loaded.\n>\n>     The standard features are builtins, conditions, parameters and math functions; these are indicated by the prefix \\`**b:***\\', \\`***c:***\\'* (\\`**C:***\\' for an infix condition), \\`***p:***\\' and \\`***f:***\\', respectively,* followed by the name that the corresponding feature would have in the shell. For example, \\`**b:strftime***\\' indicates a builtin named* **strftime** *and* **p:EPOCHSECONDS** *indicates a parameter named* **EPOCHSECONDS***. The module may provide other (\\`abstract\\') features of* its own as indicated by its documentation; these have no prefix.\n>\n>     With **-l** *or* **-L***, features provided by the module are listed. With* **-l** *alone, a list of features together with their states is shown, one* feature per line. With **-L** *alone, a* **zmodload -F** *command that would* cause enabled features of the module to be turned on is shown. With **-lL***, a* **zmodload -F** *command that would cause all the features to be* set to their current state is shown. If one of these combinations is given with the option **-P** *param then the parameter param is set to an* array of features, either features together with their state or (if **-L** *alone is given) enabled features.*\n>\n>     With the option **-L** *the module name may be omitted; then a list* of all enabled features for all modules providing features is printed in the form of **zmodload -F** *commands. If* **-l** *is also given,* the state of both enabled and disabled features is output in that form.\n>\n>     A set of features may be provided together with **-l** *or* **-L** *and a* module name; in that case only the state of those features is considered. Each feature may be preceded by **+** *or* **-** *but the* character has no effect. If no set of features is provided, all features are considered.\n>\n>     With **-e***, the command first tests that the module is loaded;* if it is not, status 1 is returned. If the module is loaded, the list of features given as an argument is examined. Any feature given with no prefix is simply tested to see if the module provides it; any feature given with a prefix **+** *or* **-** *is tested to* see if is provided and in the given state. If the tests on all features in the list succeed, status 0 is returned, else status 1.\n>\n>     With **-m***, each entry in the given list of features is taken* as a pattern to be matched against the list of features provided by the module. An initial **+** *or* **-** *must be given explicitly.* This may not be combined with the **-a** *option as autoloads must* be specified explicitly.\n>\n>     With **-a***, the given list of features is marked for autoload from* the specified module, which may not yet be loaded. An optional **+** may appear before the feature name. If the feature is prefixed with **-***, any existing autoload is removed. The options* **-l** *and* **-L** may be used to list autoloads. Autoloading is specific to individual features; when the module is loaded only the requested feature is enabled. Autoload requests are preserved if the module is subsequently unloaded until an explicit \\`**zmodload -Fa** *module* **-***feature\\' is issued. It is not an error to request an autoload* for a feature of a module that is already loaded.\n>\n>     When the module is loaded each autoload is checked against the features actually provided by the module; if the feature is not provided the autoload request is deleted. A warning message is output; if the module is being loaded to provide a different feature, and that autoload is successful, there is no effect on the status of the current command. If the module is already loaded at the time when **zmodload -Fa** *is* run, an error message is printed and status 1 returned.\n>\n>     **zmodload -Fa** *can be used with the* **-l***,* **-L***,* **-e** *and* **-P** *options for listing and testing the existence of autoloadable* features. In this case **-l** *is ignored if* **-L** *is specified.* **zmodload -FaL** *with no module name lists autoloads for all modules.*\n>\n>     Note that only standard features as described above can be autoloaded; other features require the module to be loaded before enabling.\n>\n> **zmodload** **-d** *\\[* **-L** *\\] \\[ name \\]*\n>\n> **zmodload** **-d** *name dep \\...*\n>\n> **zmodload** **-ud** *name \\[ dep \\... \\]* The **-d** *option can be used to specify module dependencies. The modules* named in the second and subsequent arguments will be loaded before the module named in the first argument.\n>\n> > With **-d** *and one argument, all dependencies for that module are listed.* With **-d** *and no arguments, all module dependencies are listed. This* listing is by default in a Makefile-like format. The **-L** *option* changes this format to a list of **zmodload -d** *commands.*\n> >\n> > If **-d** *and* **-u** *are both used, dependencies are removed. If only one* argument is given, all dependencies for that module are removed.\n>\n> **zmodload** **-ab** *\\[* **-L** *\\]*\n>\n> **zmodload** **-ab** *\\[* **-i** *\\] name \\[ builtin \\... \\]*\n>\n> **zmodload** **-ub** *\\[* **-i** *\\] builtin \\...* The **-ab** *option defines autoloaded builtins. It defines the specified* *builtins. When any of those builtins is called, the module specified* in the first argument is loaded and all its features are enabled (for selective control of features use \\`**zmodload -F -a***\\' as described* above). If only the *name is given, one builtin is defined, with* the same name as the module. **-i** *suppresses the error if the builtin* is already defined or autoloaded, but not if another builtin of the same name is already defined.\n>\n> > With **-ab** *and no arguments, all autoloaded builtins are listed, with the* module name (if different) shown in parentheses after the builtin name. The **-L** *option changes this format to a list of* **zmodload -a** commands.\n> >\n> > If **-b** *is used together with the* **-u** *option, it removes builtins* previously defined with **-ab***. This is only possible if the builtin is* not yet loaded. **-i** *suppresses the error if the builtin is already* removed (or never existed).\n> >\n> > Autoload requests are retained if the module is subsequently unloaded until an explicit \\`**zmodload -ub** *builtin\\' is issued.*\n>\n> **zmodload** **-ac** *\\[* **-IL** *\\]*\n>\n> **zmodload** **-ac** *\\[* **-iI** *\\] name \\[ cond \\... \\]*\n>\n> **zmodload** **-uc** *\\[* **-iI** *\\] cond \\...* The **-ac** *option is used to define autoloaded condition codes. The* *cond strings give the names of the conditions defined by the* module. The optional **-I** *option is used to define infix condition* names. Without this option prefix condition names are defined.\n>\n> > If given no condition names, all defined names are listed (as a series of **zmodload** *commands if the* **-L** *option is given).*\n> >\n> > The **-uc** *option removes definitions for autoloaded conditions.*\n>\n> **zmodload** **-ap** *\\[* **-L** *\\]*\n>\n> **zmodload** **-ap** *\\[* **-i** *\\] name \\[ parameter \\... \\]*\n>\n> **zmodload** **-up** *\\[* **-i** *\\] parameter \\...* The **-p** *option is like the* **-b** *and* **-c** *options, but makes* **zmodload** *work on autoloaded parameters instead.*\n>\n> **zmodload** **-af** *\\[* **-L** *\\]*\n>\n> **zmodload** **-af** *\\[* **-i** *\\] name \\[ function \\... \\]*\n>\n> **zmodload** **-uf** *\\[* **-i** *\\] function \\...* The **-f** *option is like the* **-b***,* **-p***, and* **-c** *options, but* makes **zmodload** *work on autoloaded math functions instead.*\n>\n> **zmodload** **-a** *\\[* **-L** *\\]*\n>\n> **zmodload** **-a** *\\[* **-i** *\\] name \\[ builtin \\... \\]*\n>\n> **zmodload** **-ua** *\\[* **-i** *\\] builtin \\...* Equivalent to **-ab** *and* **-ub***.*\n>\n> **zmodload -e** *\\[* **-A** *\\] \\[ string \\... \\]*\n>\n> :   The **-e** *option without arguments lists all loaded modules; if the* **-A** option is also given, module aliases corresponding to loaded modules are also shown. If arguments are provided, nothing is printed; the return status is set to zero if all *strings given as arguments* are names of loaded modules and to one if at least on *string is not* the name of a loaded module. This can be used to test for the availability of things implemented by modules. In this case, any aliases are automatically resolved and the **-A** *flag is not used.*\n>\n> **zmodload**  **-A** *\\[* **-L** *\\] \\[ modalias\\[***=***module\\] \\... \\]*\n>\n> :   For each argument, if both *modalias and module are given,* define *modalias to be an alias for the module module.* If the module *modalias is ever subsequently requested, either via a* call to **zmodload** *or implicitly, the shell will attempt to load* *module instead. If module is not given, show the definition of* *modalias. If no arguments are given, list all defined module aliases.* When listing, if the **-L** *flag was also given, list the definition as a* **zmodload** *command to recreate the alias.*\n>\n>     The existence of aliases for modules is completely independent of whether the name resolved is actually loaded as a module: while the alias exists, loading and unloading the module under any alias has exactly the same effect as using the resolved name, and does not affect the connection between the alias and the resolved name which can be removed either by **zmodload -R** *or by redefining the alias. Chains of aliases (i.e. where* the first resolved name is itself an alias) are valid so long as these are not circular. As the aliases take the same format as module names, they may include path separators: in this case, there is no requirement for any part of the path named to exist as the alias will be resolved first. For example, \\`**any/old/alias***\\' is always a valid alias.*\n>\n>     Dependencies added to aliased modules are actually added to the resolved module; these remain if the alias is removed. It is valid to create an alias whose name is one of the standard shell modules and which resolves to a different module. However, if a module has dependencies, it will not be possible to use the module name as an alias as the module will already be marked as a loadable module in its own right.\n>\n>     Apart from the above, aliases can be used in the **zmodload** *command* anywhere module names are required. However, aliases will not be shown in lists of loaded modules with a bare \\`**zmodload***\\'.*\n>\n> **zmodload**  **-R** *modalias \\...* \n>\n> :   For each *modalias argument that was previously defined as a module* alias via **zmodload -A***, delete the alias. If any was not defined, an* error is caused and the remainder of the line is ignored.\n>\n> Note that **zsh** *makes no distinction between modules that were linked* into the shell and modules that are loaded dynamically. In both cases this builtin command has to be used to make available the builtins and other things defined by modules (unless the module is autoloaded on these definitions). This is true even for systems that don\\'t support dynamic loading of modules.\n",
+    "args": "zmodload [ -a [ -bcpf [ -I ] ] ] [ -iL ] ...\n\nzmodload -u [ -abcdpf [ -I ] ] [ -iL ] ...\n\nzmodload -A [ -L ] [ modalias[=module] ... ]"
   },
   "zparseopts": {
     "shortDescription": "Parse options",
-    "description": "See the section `The zsh/zutil Module' in zshmodules(1).",
-    "args": "zparseopts undefined"
+    "description": ":   See the section \\`The zsh/zutil Module\\' in *zshmodules(1).*\n",
+    "args": "zparseopts"
+  },
+  "zprof": {
+    "shortDescription": "Zsh profiler",
+    "description": ":   See the section \\`The zsh/zprof Module\\' in *zshmodules(1).*\n",
+    "args": "zprof"
+  },
+  "zpty": {
+    "description": ":   See the section \\`The zsh/zpty Module\\' in *zshmodules(1).*\n",
+    "args": "zpty"
   },
   "zregexparse": {
-    "description": "See the section `The zsh/zutil Module' in zshmodules(1).",
-    "args": "zregexparse undefined"
+    "description": ":   See the section \\`The zsh/zutil Module\\' in *zshmodules(1).*\n",
+    "args": "zregexparse"
   },
   "zsocket": {
     "shortDescription": "Zsh socket interface",
-    "description": "See the section `The zsh/net/socket Module' in zshmodules(1).",
-    "args": "zsocket undefined"
+    "description": ":   See the section \\`The zsh/net/socket Module\\' in *zshmodules(1).*\n",
+    "args": "zsocket"
+  },
+  "zstyle": {
+    "shortDescription": "Define styles",
+    "description": ":   See the section \\`The zsh/zutil Module\\' in *zshmodules(1).*\n",
+    "args": "zstyle"
+  },
+  "ztcp": {
+    "description": ":   See the section \\`The zsh/net/tcp Module\\' in *zshmodules(1).*",
+    "args": "ztcp"
   }
 }
\ No newline at end of file

From bf9d6458306d67ee5d47b9541feee5c53df6f4c7 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 19 Feb 2025 11:38:49 -0800
Subject: [PATCH 0125/1815] Regen and remove log

---
 .../scripts/pullZshBuiltins.ts                |   1 -
 .../src/shell/zshBuiltinsCache.json           | 204 +++++++++---------
 2 files changed, 102 insertions(+), 103 deletions(-)

diff --git a/extensions/terminal-suggest/scripts/pullZshBuiltins.ts b/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
index c52a7c78ce90..4ff123e68b15 100644
--- a/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
+++ b/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
@@ -119,7 +119,6 @@ async function createCommandDescriptionsCache(): Promise<void> {
 
 	const commands: Map<string, string[]> = new Map();
 	if (output) {
-		console.log('!');
 		const lines = output.split('\n');
 		let currentCommand: string | undefined;
 		let currentCommandStart = 0;
diff --git a/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json b/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json
index f2d8b6082e0f..3f72fc631b88 100644
--- a/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json
+++ b/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json
@@ -1,495 +1,495 @@
 {
   "bg": {
     "shortDescription": "Put a job in the background",
-    "description": "*job \\...* **&** Put each specified *job in the background,* or the current job if none is specified.\n",
+    "description": "*job \\...* **&** Put each specified *job in the background,* or the current job if none is specified.",
     "args": "bg [ job ... ]"
   },
   "bindkey": {
     "shortDescription": "Manipulate keymap names",
-    "description": ":   See the section \\`Zle Builtins\\' in *zshzle(1).*\n",
+    "description": ":   See the section \\`Zle Builtins\\' in *zshzle(1).*",
     "args": "bindkey"
   },
   "break": {
     "shortDescription": "Exit from a loop",
-    "description": ":   Exit from an enclosing **for***,* **while***,* **until***,* **select** *or* **repeat** *loop. If an arithmetic expression n* is specified, then break *n levels instead of just one.*\n",
+    "description": ":   Exit from an enclosing **for***,* **while***,* **until***,* **select** *or* **repeat** *loop. If an arithmetic expression n* is specified, then break *n levels instead of just one.*",
     "args": "break [ n ]"
   },
   "builtin": {
     "shortDescription": "Executes a builtin",
-    "description": ":   Executes the builtin *name, with the given args.*\n",
+    "description": ":   Executes the builtin *name, with the given args.*",
     "args": "builtin name [ args ... ]"
   },
   "bye": {
     "shortDescription": "Exit the shell",
-    "description": ":   Same as **exit***.*\n",
+    "description": ":   Same as **exit***.*",
     "args": "bye"
   },
   "cap": {
-    "description": ":   See the section \\`The zsh/cap Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/cap Module\\' in *zshmodules(1).*",
     "args": "cap"
   },
   "cd": {
-    "description": "**cd** *\\[* **-qsLP** *\\] {***+***\\|***-***}n* Change the current directory. In the first form, change the current directory to *arg, or to the value of* **\\$HOME** *if* *arg is not specified. If arg is \\`***-***\\', change to the* previous directory.\n\n> Otherwise, if *arg begins with a slash, attempt to change to the* directory given by *arg.*\n>\n> If *arg does not begin with a slash, the behaviour depends on whether* the current directory \\`**.***\\' occurs in the list of directories contained* in the shell parameter **cdpath***. If it does not, first attempt to change* to the directory *arg under the current directory, and if that fails* but **cdpath** *is set and contains at least one element attempt to change* to the directory *arg under each component of* **cdpath** *in turn until* successful. If \\`**.***\\' occurs in* **cdpath***, then* **cdpath** *is searched* strictly in order so that \\`**.***\\' is only tried at the appropriate point.*\n>\n> The order of testing **cdpath** *is modified if the option* **POSIX_CD** is set, as described in the documentation for the option.\n>\n> If no directory is found, the option **CDABLE_VARS** *is set, and a* parameter named *arg exists whose value begins with a slash, treat its* value as the directory. In that case, the parameter is added to the named directory hash table.\n>\n> The second form of **cd** *substitutes the string new* for the string *old in the name of the current directory,* and tries to change to this new directory.\n>\n> The third form of **cd** *extracts an entry from the directory* stack, and changes to that directory. An argument of the form \\`**+***n\\' identifies a stack entry by counting from the left* of the list shown by the **dirs** *command, starting with zero.* An argument of the form \\`**-***n\\' counts from the right.* If the **PUSHD_MINUS** *option is set, the meanings of \\`***+***\\'* and \\`**-***\\' in this context are swapped.* If the **POSIX_CD** *option is set, this form of* **cd** *is not recognised* and will be interpreted as the first form.\n>\n> If the **-q** *(quiet) option is specified, the hook function* **chpwd** and the functions in the array **chpwd_functions** *are not called.* This is useful for calls to **cd** *that do not change the environment* seen by an interactive user.\n>\n> If the **-s** *option is specified,* **cd** *refuses to change the current* directory if the given pathname contains symlinks. If the **-P** *option* is given or the **CHASE_LINKS** *option is set, symbolic links are resolved* to their true values. If the **-L** *option is given symbolic links are* retained in the directory (and not resolved) regardless of the state of the **CHASE_LINKS** *option.*\n",
+    "description": "**cd** *\\[* **-qsLP** *\\] {***+***\\|***-***}n* Change the current directory. In the first form, change the current directory to *arg, or to the value of* **\\$HOME** *if* *arg is not specified. If arg is \\`***-***\\', change to the* previous directory.\n\n> Otherwise, if *arg begins with a slash, attempt to change to the* directory given by *arg.*\n>\n> If *arg does not begin with a slash, the behaviour depends on whether* the current directory \\`**.***\\' occurs in the list of directories contained* in the shell parameter **cdpath***. If it does not, first attempt to change* to the directory *arg under the current directory, and if that fails* but **cdpath** *is set and contains at least one element attempt to change* to the directory *arg under each component of* **cdpath** *in turn until* successful. If \\`**.***\\' occurs in* **cdpath***, then* **cdpath** *is searched* strictly in order so that \\`**.***\\' is only tried at the appropriate point.*\n>\n> The order of testing **cdpath** *is modified if the option* **POSIX_CD** is set, as described in the documentation for the option.\n>\n> If no directory is found, the option **CDABLE_VARS** *is set, and a* parameter named *arg exists whose value begins with a slash, treat its* value as the directory. In that case, the parameter is added to the named directory hash table.\n>\n> The second form of **cd** *substitutes the string new* for the string *old in the name of the current directory,* and tries to change to this new directory.\n>\n> The third form of **cd** *extracts an entry from the directory* stack, and changes to that directory. An argument of the form \\`**+***n\\' identifies a stack entry by counting from the left* of the list shown by the **dirs** *command, starting with zero.* An argument of the form \\`**-***n\\' counts from the right.* If the **PUSHD_MINUS** *option is set, the meanings of \\`***+***\\'* and \\`**-***\\' in this context are swapped.* If the **POSIX_CD** *option is set, this form of* **cd** *is not recognised* and will be interpreted as the first form.\n>\n> If the **-q** *(quiet) option is specified, the hook function* **chpwd** and the functions in the array **chpwd_functions** *are not called.* This is useful for calls to **cd** *that do not change the environment* seen by an interactive user.\n>\n> If the **-s** *option is specified,* **cd** *refuses to change the current* directory if the given pathname contains symlinks. If the **-P** *option* is given or the **CHASE_LINKS** *option is set, symbolic links are resolved* to their true values. If the **-L** *option is given symbolic links are* retained in the directory (and not resolved) regardless of the state of the **CHASE_LINKS** *option.*",
     "args": "cd [ -qsLP ] [ arg ]\n\ncd [ -qsLP ] old new"
   },
   "chdir": {
     "shortDescription": "Change the current directory",
-    "description": ":   Same as **cd***.*\n",
+    "description": ":   Same as **cd***.*",
     "args": "chdir"
   },
   "clone": {
-    "description": ":   See the section \\`The zsh/clone Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/clone Module\\' in *zshmodules(1).*",
     "args": "clone"
   },
   "command": {
-    "description": ":   The simple command argument is taken as an external command instead of a function or builtin and is executed. If the **POSIX_BUILTINS** *option* is set, builtins will also be executed but certain special properties of them are suppressed. The **-p** *flag causes a default path to be* searched instead of that in **\\$path***. With the* **-v** *flag,* **command** is similar to **whence** *and with* **-V***, it is equivalent to* **whence** -v*.*\n\n    See also the section \\`Precommand Modifiers\\' in *zshmisc(1).*\n",
+    "description": ":   The simple command argument is taken as an external command instead of a function or builtin and is executed. If the **POSIX_BUILTINS** *option* is set, builtins will also be executed but certain special properties of them are suppressed. The **-p** *flag causes a default path to be* searched instead of that in **\\$path***. With the* **-v** *flag,* **command** is similar to **whence** *and with* **-V***, it is equivalent to* **whence** -v*.*\n\n    See also the section \\`Precommand Modifiers\\' in *zshmisc(1).*",
     "args": "command [ -pvV ] simple command"
   },
   "comparguments": {
     "shortDescription": "Complete arguments",
-    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*",
     "args": "comparguments"
   },
   "compcall": {
     "shortDescription": "Complete call",
-    "description": ":   See the section \\`The zsh/compctl Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/compctl Module\\' in *zshmodules(1).*",
     "args": "compcall"
   },
   "compctl": {
     "shortDescription": "Complete control",
-    "description": ":   See the section \\`The zsh/compctl Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/compctl Module\\' in *zshmodules(1).*",
     "args": "compctl"
   },
   "compdescribe": {
     "shortDescription": "Complete describe",
-    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*",
     "args": "compdescribe"
   },
   "compfiles": {
     "shortDescription": "Complete files",
-    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*",
     "args": "compfiles"
   },
   "compgroups": {
     "shortDescription": "Complete groups",
-    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*",
     "args": "compgroups"
   },
   "compquote": {
     "shortDescription": "Complete quote",
-    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*",
     "args": "compquote"
   },
   "comptags": {
     "shortDescription": "Complete tags",
-    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*",
     "args": "comptags"
   },
   "comptry": {
     "shortDescription": "Complete try",
-    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*",
     "args": "comptry"
   },
   "compvalues": {
     "shortDescription": "Complete values",
-    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*",
     "args": "compvalues"
   },
   "continue": {
     "shortDescription": "Resume the next loop iteration",
-    "description": ":   Resume the next iteration of the enclosing **for***,* **while***,* **until***,* **select** *or* **repeat** *loop. If an arithmetic expression n is specified, break out of* *n-1 loops and resume at the nth enclosing loop.*\n",
+    "description": ":   Resume the next iteration of the enclosing **for***,* **while***,* **until***,* **select** *or* **repeat** *loop. If an arithmetic expression n is specified, break out of* *n-1 loops and resume at the nth enclosing loop.*",
     "args": "continue [ n ]"
   },
   "declare": {
     "shortDescription": "Set or display parameter attributes/values",
-    "description": ":   Same as **typeset***.*\n",
+    "description": ":   Same as **typeset***.*",
     "args": "declare"
   },
   "dirs": {
     "shortDescription": "Interact with directory stack",
-    "description": "**dirs** *\\[* **-lpv** *\\]* With no arguments, print the contents of the directory stack. Directories are added to this stack with the **pushd** *command,* and removed with the **cd** *or* **popd** *commands.* If arguments are specified, load them onto the directory stack, replacing anything that was there, and push the current directory onto the stack.\n\n> **-c** clear the directory stack.\n>\n> **-l**\n>\n> :   print directory names in full instead of using of using **\\~** *expressions (see Dynamic and Static named directories in zshexpn(1)).*\n>\n> **-p**\n>\n> :   print directory entries one per line.\n>\n> **-v**\n>\n> :   number the directories in the stack when printing.\n",
+    "description": "**dirs** *\\[* **-lpv** *\\]* With no arguments, print the contents of the directory stack. Directories are added to this stack with the **pushd** *command,* and removed with the **cd** *or* **popd** *commands.* If arguments are specified, load them onto the directory stack, replacing anything that was there, and push the current directory onto the stack.\n\n> **-c** clear the directory stack.\n>\n> **-l**\n>\n> :   print directory names in full instead of using of using **\\~** *expressions (see Dynamic and Static named directories in zshexpn(1)).*\n>\n> **-p**\n>\n> :   print directory entries one per line.\n>\n> **-v**\n>\n> :   number the directories in the stack when printing.",
     "args": "dirs [ -c ] [ arg ... ]"
   },
   "disable": {
     "shortDescription": "Disable shell features",
-    "description": ":   Temporarily disable the *named hash table elements or patterns. The default* is to disable builtin commands. This allows you to use an external command with the same name as a builtin command. The **-a** *option* causes **disable** *to act on regular or global aliases. The* **-s** option causes **disable** *to act on suffix aliases. The* **-f** *option causes* **disable** *to act on shell functions. The* **-r** *options causes* **disable** *to act on reserved words. Without arguments all disabled* hash table elements from the corresponding hash table are printed. With the **-m** *flag the arguments are taken as patterns (which should be* quoted to prevent them from undergoing filename expansion), and all hash table elements from the corresponding hash table matching these patterns are disabled. Disabled objects can be enabled with the **enable** command.\n\n    With the option **-p***, name \\... refer to elements of the* shell\\'s pattern syntax as described in the section \\`Filename Generation\\'. Certain elements can be disabled separately, as given below.\n\n    Note that patterns not allowed by the current settings for the options **EXTENDED_GLOB***,* **KSH_GLOB** *and* **SH_GLOB** *are never enabled, regardless of the* setting here. For example, if **EXTENDED_GLOB** *is not active,* the pattern **\\^** *is ineffective even if \\`***disable -p \\\"\\^\\\"***\\' has* not been issued. The list below indicates any option settings that restrict the use of the pattern. It should be noted that setting **SH_GLOB** *has a wider effect than merely disabling patterns* as certain expressions, in particular those involving parentheses, are parsed differently.\n\n    The following patterns may be disabled; all the strings need quoting on the command line to prevent them from being interpreted immediately as patterns and the patterns are shown below in single quotes as a reminder.\n\n    **\\'?\\'** The pattern character **?** *wherever it occurs, including when preceding* a parenthesis with **KSH_GLOB***.*\n\n    **\\'\\*\\'**\n\n    :   The pattern character **\\*** *wherever it occurs, including recursive* globbing and when preceding a parenthesis with **KSH_GLOB***.*\n\n    **\\'\\[\\'**\n\n    :   Character classes.\n\n    **\\'\\<\\'** *(***NO_SH_GLOB***)*\n\n    :   Numeric ranges.\n\n    **\\'\\|\\'** *(***NO_SH_GLOB***)*\n\n    :   Alternation in grouped patterns, case statements, or KSH_GLOB parenthesised expressions.\n\n    **\\'(\\'** *(***NO_SH_GLOB***)*\n\n    :   Grouping using single parentheses. Disabling this does not disable the use of parentheses for **KSH_GLOB** *where they are introduced by a* special character, nor for glob qualifiers (use \\`**setopt** NO_BARE_GLOB_QUAL*\\' to disable glob qualifiers that use parentheses* only).\n\n    **\\'\\~\\'** *(***EXTENDED_GLOB***)*\n\n    :   Exclusion in the form *A***\\~***B.*\n\n    **\\'\\^\\'** *(***EXTENDED_GLOB***)*\n\n    :   Exclusion in the form *A***\\^***B.*\n\n    **\\'#\\'** *(***EXTENDED_GLOB***)*\n\n    :   The pattern character **\\#** *wherever it occurs, both for* repetition of a previous pattern and for indicating globbing flags.\n\n    **\\'?(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **?(***\\...***)***. Note this is also* disabled if **\\'?\\'** *is disabled.*\n\n    **\\'\\*(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **\\*(***\\...***)***. Note this is also* disabled if **\\'\\*\\'** *is disabled.*\n\n    **\\'+(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **+(***\\...***)***.*\n\n    **\\'!(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **!(***\\...***)***.*\n\n    **\\'@(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **@(***\\...***)***.*\n",
+    "description": ":   Temporarily disable the *named hash table elements or patterns. The default* is to disable builtin commands. This allows you to use an external command with the same name as a builtin command. The **-a** *option* causes **disable** *to act on regular or global aliases. The* **-s** option causes **disable** *to act on suffix aliases. The* **-f** *option causes* **disable** *to act on shell functions. The* **-r** *options causes* **disable** *to act on reserved words. Without arguments all disabled* hash table elements from the corresponding hash table are printed. With the **-m** *flag the arguments are taken as patterns (which should be* quoted to prevent them from undergoing filename expansion), and all hash table elements from the corresponding hash table matching these patterns are disabled. Disabled objects can be enabled with the **enable** command.\n\n    With the option **-p***, name \\... refer to elements of the* shell\\'s pattern syntax as described in the section \\`Filename Generation\\'. Certain elements can be disabled separately, as given below.\n\n    Note that patterns not allowed by the current settings for the options **EXTENDED_GLOB***,* **KSH_GLOB** *and* **SH_GLOB** *are never enabled, regardless of the* setting here. For example, if **EXTENDED_GLOB** *is not active,* the pattern **\\^** *is ineffective even if \\`***disable -p \\\"\\^\\\"***\\' has* not been issued. The list below indicates any option settings that restrict the use of the pattern. It should be noted that setting **SH_GLOB** *has a wider effect than merely disabling patterns* as certain expressions, in particular those involving parentheses, are parsed differently.\n\n    The following patterns may be disabled; all the strings need quoting on the command line to prevent them from being interpreted immediately as patterns and the patterns are shown below in single quotes as a reminder.\n\n    **\\'?\\'** The pattern character **?** *wherever it occurs, including when preceding* a parenthesis with **KSH_GLOB***.*\n\n    **\\'\\*\\'**\n\n    :   The pattern character **\\*** *wherever it occurs, including recursive* globbing and when preceding a parenthesis with **KSH_GLOB***.*\n\n    **\\'\\[\\'**\n\n    :   Character classes.\n\n    **\\'\\<\\'** *(***NO_SH_GLOB***)*\n\n    :   Numeric ranges.\n\n    **\\'\\|\\'** *(***NO_SH_GLOB***)*\n\n    :   Alternation in grouped patterns, case statements, or KSH_GLOB parenthesised expressions.\n\n    **\\'(\\'** *(***NO_SH_GLOB***)*\n\n    :   Grouping using single parentheses. Disabling this does not disable the use of parentheses for **KSH_GLOB** *where they are introduced by a* special character, nor for glob qualifiers (use \\`**setopt** NO_BARE_GLOB_QUAL*\\' to disable glob qualifiers that use parentheses* only).\n\n    **\\'\\~\\'** *(***EXTENDED_GLOB***)*\n\n    :   Exclusion in the form *A***\\~***B.*\n\n    **\\'\\^\\'** *(***EXTENDED_GLOB***)*\n\n    :   Exclusion in the form *A***\\^***B.*\n\n    **\\'#\\'** *(***EXTENDED_GLOB***)*\n\n    :   The pattern character **\\#** *wherever it occurs, both for* repetition of a previous pattern and for indicating globbing flags.\n\n    **\\'?(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **?(***\\...***)***. Note this is also* disabled if **\\'?\\'** *is disabled.*\n\n    **\\'\\*(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **\\*(***\\...***)***. Note this is also* disabled if **\\'\\*\\'** *is disabled.*\n\n    **\\'+(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **+(***\\...***)***.*\n\n    **\\'!(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **!(***\\...***)***.*\n\n    **\\'@(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **@(***\\...***)***.*",
     "args": "disable [ -afmprs ] name ..."
   },
   "disown": {
     "shortDescription": "Remove job from job table",
-    "description": "*job \\...* **&\\|**\n\n*job \\...* **&!** Remove the specified *jobs from the job table; the shell will* no longer report their status, and will not complain if you try to exit an interactive shell with them running or stopped. If no *job is specified, disown the current job.*\n\n> If the *jobs are currently stopped and the* **AUTO_CONTINUE** *option* is not set, a warning is printed containing information about how to make them running after they have been disowned. If one of the latter two forms is used, the *jobs will automatically be made running,* independent of the setting of the **AUTO_CONTINUE** *option.*\n",
+    "description": "*job \\...* **&\\|**\n\n*job \\...* **&!** Remove the specified *jobs from the job table; the shell will* no longer report their status, and will not complain if you try to exit an interactive shell with them running or stopped. If no *job is specified, disown the current job.*\n\n> If the *jobs are currently stopped and the* **AUTO_CONTINUE** *option* is not set, a warning is printed containing information about how to make them running after they have been disowned. If one of the latter two forms is used, the *jobs will automatically be made running,* independent of the setting of the **AUTO_CONTINUE** *option.*",
     "args": "disown [ job ... ]"
   },
   "echo": {
     "shortDescription": "Write on standard output",
-    "description": ":   Write each *arg on the standard output, with a space separating* each one. If the **-n** *flag is not present, print a newline at the end.* **echo** *recognizes the following escape sequences:*\n\n    **\\\\a**\n\n    :   bell character\n\n    **\\\\b**\n\n    :   backspace\n\n    **\\\\c**\n\n    :   suppress subsequent characters and final newline\n\n    **\\\\e**\n\n    :   escape\n\n    **\\\\f**\n\n    :   form feed\n\n    **\\\\n**\n\n    :   linefeed (newline)\n\n    **\\\\r**\n\n    :   carriage return\n\n    **\\\\t**\n\n    :   horizontal tab\n\n    **\\\\v**\n\n    :   vertical tab\n\n    **\\\\\\\\**\n\n    :   backslash\n\n    **\\\\0***NNN*\n\n    :   character code in octal\n\n    **\\\\x***NN*\n\n    :   character code in hexadecimal\n\n    **\\\\u***NNNN*\n\n    :   unicode character code in hexadecimal\n\n    **\\\\U***NNNNNNNN*\n\n    :   unicode character code in hexadecimal\n\n    The **-E** *flag, or the* **BSD_ECHO** *option, can be used to disable* these escape sequences. In the latter case, **-e** *flag can be used to* enable them.\n\n    Note that for standards compliance a double dash does not terminate option processing; instead, it is printed directly. However, a single dash does terminate option processing, so the first dash, possibly following options, is not printed, but everything following it is printed as an argument. The single dash behaviour is different from other shells. For a more portable way of printing text, see **printf***, and for a more controllable way of printing text within zsh,* see **print***.*\n",
+    "description": ":   Write each *arg on the standard output, with a space separating* each one. If the **-n** *flag is not present, print a newline at the end.* **echo** *recognizes the following escape sequences:*\n\n    **\\\\a**\n\n    :   bell character\n\n    **\\\\b**\n\n    :   backspace\n\n    **\\\\c**\n\n    :   suppress subsequent characters and final newline\n\n    **\\\\e**\n\n    :   escape\n\n    **\\\\f**\n\n    :   form feed\n\n    **\\\\n**\n\n    :   linefeed (newline)\n\n    **\\\\r**\n\n    :   carriage return\n\n    **\\\\t**\n\n    :   horizontal tab\n\n    **\\\\v**\n\n    :   vertical tab\n\n    **\\\\\\\\**\n\n    :   backslash\n\n    **\\\\0***NNN*\n\n    :   character code in octal\n\n    **\\\\x***NN*\n\n    :   character code in hexadecimal\n\n    **\\\\u***NNNN*\n\n    :   unicode character code in hexadecimal\n\n    **\\\\U***NNNNNNNN*\n\n    :   unicode character code in hexadecimal\n\n    The **-E** *flag, or the* **BSD_ECHO** *option, can be used to disable* these escape sequences. In the latter case, **-e** *flag can be used to* enable them.\n\n    Note that for standards compliance a double dash does not terminate option processing; instead, it is printed directly. However, a single dash does terminate option processing, so the first dash, possibly following options, is not printed, but everything following it is printed as an argument. The single dash behaviour is different from other shells. For a more portable way of printing text, see **printf***, and for a more controllable way of printing text within zsh,* see **print***.*",
     "args": "echo [ -neE ] [ arg ... ]"
   },
   "echotc": {
     "shortDescription": "Echo terminal capabilities",
-    "description": ":   See the section \\`The zsh/termcap Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/termcap Module\\' in *zshmodules(1).*",
     "args": "echotc"
   },
   "echoti": {
-    "description": ":   See the section \\`The zsh/terminfo Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/terminfo Module\\' in *zshmodules(1).*",
     "args": "echoti"
   },
   "emulate": {
-    "description": ":   Without any argument print current emulation mode.\n\n    With single argument set up zsh options to emulate the specified shell as much as possible. **csh** *will never be fully emulated.* If the argument is not one of the shells listed above, **zsh** will be used as a default; more precisely, the tests performed on the argument are the same as those used to determine the emulation at startup based on the shell name, see the section COMPATIBILITY in *zsh(1)* . In addition to setting shell options, the command also restores the pristine state of pattern enables, as if all patterns had been enabled using **enable -p***.*\n\n    If the **emulate** *command occurs inside a function that has been* marked for execution tracing with **functions -t** *then the* **xtrace** option will be turned on regardless of emulation mode or other options. Note that code executed inside the function by the **.***,* **source***, or* **eval** *commands is not considered to be running directly from the* function, hence does not provoke this behaviour.\n\n    If the **-R** *switch is given, all settable options* are reset to their default value corresponding to the specified emulation mode, except for certain options describing the interactive environment; otherwise, only those options likely to cause portability problems in scripts and functions are altered. If the **-L** *switch is given,* the options **LOCAL_OPTIONS***,* **LOCAL_PATTERNS** *and* **LOCAL_TRAPS** will be set as well, causing the effects of the **emulate** *command and any* **setopt***,* **disable -p** *or* **enable -p***, and* **trap** *commands to be local to* the immediately surrounding shell function, if any; normally these options are turned off in all emulation modes except **ksh***. The* **-L** *switch is mutually exclusive with the* use of **-c** *in flags.*\n\n    If there is a single argument and the **-l** *switch is given, the* options that would be set or unset (the latter indicated with the prefix \\`**no***\\') are listed.* **-l** *can be combined with* **-L** *or* **-R** *and* the list will be modified in the appropriate way. Note the list does not depend on the current setting of options, i.e. it includes all options that may in principle change, not just those that would actually change.\n\n    The *flags may be any of the invocation-time flags described in* the section INVOCATION in *zsh(1),* except that \\`**-o EMACS***\\' and \\`***-o VI***\\' may not be used. Flags such* as \\`**+r***\\'/\\`***+o RESTRICTED***\\' may be prohibited in some circumstances.*\n\n    If **-c** *arg appears in flags, arg is evaluated while the* requested emulation is temporarily in effect. In this case the emulation mode and all options are restored to their previous values before **emulate** *returns. The* **-R** *switch may precede the name of the shell* to emulate; note this has a meaning distinct from including **-R** *in* *flags.*\n\n    Use of **-c** *enables \\`sticky\\' emulation mode for functions defined* within the evaluated expression: the emulation mode is associated thereafter with the function so that whenever the function is executed the emulation (respecting the **-R** *switch, if present) and all* options are set (and pattern disables cleared) before entry to the function, and the state is restored after exit. If the function is called when the sticky emulation is already in effect, either within an \\`**emulate** *shell* **-c***\\' expression or* within another function with the same sticky emulation, entry and exit from the function do not cause options to be altered (except due to standard processing such as the **LOCAL_OPTIONS** *option). This also* applies to functions marked for autoload within the sticky emulation; the appropriate set of options will be applied at the point the function is loaded as well as when it is run.\n\n    For example:\n\n    > emulate sh -c 'fni() { setopt cshnullglob; }\n    >     fno() { fni; }'\n    >     fno\n\n    The two functions **fni** *and* **fno** *are defined with sticky* **sh** emulation. **fno** *is then executed, causing options associated* with emulations to be set to their values in **sh***.* **fno** *then* calls **fni***; because* **fni** *is also marked for sticky* **sh** emulation, no option changes take place on entry to or exit from it. Hence the option **cshnullglob***, turned off by* **sh** *emulation, will* be turned on within **fni** *and remain on return to* **fno***. On exit* from **fno***, the emulation mode and all options will be restored to the* state they were in before entry to the temporary emulation.\n\n    The documentation above is typically sufficient for the intended purpose of executing code designed for other shells in a suitable environment. More detailed rules follow.\n\n    1\\.\n\n    :   The sticky emulation environment provided by \\`**emulate** *shell* **-c***\\' is identical to that provided by entry to* a function marked for sticky emulation as a consequence of being defined in such an environment. Hence, for example, the sticky emulation is inherited by subfunctions defined within functions with sticky emulation.\n\n    2\\.\n\n    :   No change of options takes place on entry to or exit from functions that are not marked for sticky emulation, other than those that would normally take place, even if those functions are called within sticky emulation.\n\n    3\\.\n\n    :   No special handling is provided for functions marked for **autoload** *nor for functions present in wordcode created by* the **zcompile** *command.*\n\n    4\\.\n\n    :   The presence or absence of the **-R** *switch to* **emulate** corresponds to different sticky emulation modes, so for example \\`**emulate sh -c***\\', \\`***emulate -R sh -c***\\' and \\`***emulate csh -c***\\'* are treated as three distinct sticky emulations.\n\n    5\\.\n\n    :   Difference in shell options supplied in addition to the basic emulation also mean the sticky emulations are different, so for example \\`**emulate zsh -c***\\' and \\`***emulate zsh -o cbases -c***\\' are* treated as distinct sticky emulations.\n",
+    "description": ":   Without any argument print current emulation mode.\n\n    With single argument set up zsh options to emulate the specified shell as much as possible. **csh** *will never be fully emulated.* If the argument is not one of the shells listed above, **zsh** will be used as a default; more precisely, the tests performed on the argument are the same as those used to determine the emulation at startup based on the shell name, see the section COMPATIBILITY in *zsh(1)* . In addition to setting shell options, the command also restores the pristine state of pattern enables, as if all patterns had been enabled using **enable -p***.*\n\n    If the **emulate** *command occurs inside a function that has been* marked for execution tracing with **functions -t** *then the* **xtrace** option will be turned on regardless of emulation mode or other options. Note that code executed inside the function by the **.***,* **source***, or* **eval** *commands is not considered to be running directly from the* function, hence does not provoke this behaviour.\n\n    If the **-R** *switch is given, all settable options* are reset to their default value corresponding to the specified emulation mode, except for certain options describing the interactive environment; otherwise, only those options likely to cause portability problems in scripts and functions are altered. If the **-L** *switch is given,* the options **LOCAL_OPTIONS***,* **LOCAL_PATTERNS** *and* **LOCAL_TRAPS** will be set as well, causing the effects of the **emulate** *command and any* **setopt***,* **disable -p** *or* **enable -p***, and* **trap** *commands to be local to* the immediately surrounding shell function, if any; normally these options are turned off in all emulation modes except **ksh***. The* **-L** *switch is mutually exclusive with the* use of **-c** *in flags.*\n\n    If there is a single argument and the **-l** *switch is given, the* options that would be set or unset (the latter indicated with the prefix \\`**no***\\') are listed.* **-l** *can be combined with* **-L** *or* **-R** *and* the list will be modified in the appropriate way. Note the list does not depend on the current setting of options, i.e. it includes all options that may in principle change, not just those that would actually change.\n\n    The *flags may be any of the invocation-time flags described in* the section INVOCATION in *zsh(1),* except that \\`**-o EMACS***\\' and \\`***-o VI***\\' may not be used. Flags such* as \\`**+r***\\'/\\`***+o RESTRICTED***\\' may be prohibited in some circumstances.*\n\n    If **-c** *arg appears in flags, arg is evaluated while the* requested emulation is temporarily in effect. In this case the emulation mode and all options are restored to their previous values before **emulate** *returns. The* **-R** *switch may precede the name of the shell* to emulate; note this has a meaning distinct from including **-R** *in* *flags.*\n\n    Use of **-c** *enables \\`sticky\\' emulation mode for functions defined* within the evaluated expression: the emulation mode is associated thereafter with the function so that whenever the function is executed the emulation (respecting the **-R** *switch, if present) and all* options are set (and pattern disables cleared) before entry to the function, and the state is restored after exit. If the function is called when the sticky emulation is already in effect, either within an \\`**emulate** *shell* **-c***\\' expression or* within another function with the same sticky emulation, entry and exit from the function do not cause options to be altered (except due to standard processing such as the **LOCAL_OPTIONS** *option). This also* applies to functions marked for autoload within the sticky emulation; the appropriate set of options will be applied at the point the function is loaded as well as when it is run.\n\n    For example:\n\n    > emulate sh -c 'fni() { setopt cshnullglob; }\n    >     fno() { fni; }'\n    >     fno\n\n    The two functions **fni** *and* **fno** *are defined with sticky* **sh** emulation. **fno** *is then executed, causing options associated* with emulations to be set to their values in **sh***.* **fno** *then* calls **fni***; because* **fni** *is also marked for sticky* **sh** emulation, no option changes take place on entry to or exit from it. Hence the option **cshnullglob***, turned off by* **sh** *emulation, will* be turned on within **fni** *and remain on return to* **fno***. On exit* from **fno***, the emulation mode and all options will be restored to the* state they were in before entry to the temporary emulation.\n\n    The documentation above is typically sufficient for the intended purpose of executing code designed for other shells in a suitable environment. More detailed rules follow.\n\n    1\\.\n\n    :   The sticky emulation environment provided by \\`**emulate** *shell* **-c***\\' is identical to that provided by entry to* a function marked for sticky emulation as a consequence of being defined in such an environment. Hence, for example, the sticky emulation is inherited by subfunctions defined within functions with sticky emulation.\n\n    2\\.\n\n    :   No change of options takes place on entry to or exit from functions that are not marked for sticky emulation, other than those that would normally take place, even if those functions are called within sticky emulation.\n\n    3\\.\n\n    :   No special handling is provided for functions marked for **autoload** *nor for functions present in wordcode created by* the **zcompile** *command.*\n\n    4\\.\n\n    :   The presence or absence of the **-R** *switch to* **emulate** corresponds to different sticky emulation modes, so for example \\`**emulate sh -c***\\', \\`***emulate -R sh -c***\\' and \\`***emulate csh -c***\\'* are treated as three distinct sticky emulations.\n\n    5\\.\n\n    :   Difference in shell options supplied in addition to the basic emulation also mean the sticky emulations are different, so for example \\`**emulate zsh -c***\\' and \\`***emulate zsh -o cbases -c***\\' are* treated as distinct sticky emulations.",
     "args": "emulate [ -lLR ] [ {zsh|sh|ksh|csh} [ flags ... ] ]"
   },
   "enable": {
     "shortDescription": "Enable shell features",
-    "description": ":   Enable the *named hash table elements, presumably disabled* earlier with **disable***. The default is to enable builtin commands.* The **-a** *option causes* **enable** *to act on regular or global aliases.* The **-s** *option causes* **enable** *to act on suffix aliases.* The **-f** *option causes* **enable** *to act on shell functions. The* **-r** option causes **enable** *to act on reserved words. Without arguments* all enabled hash table elements from the corresponding hash table are printed. With the **-m** *flag the arguments are taken as patterns* (should be quoted) and all hash table elements from the corresponding hash table matching these patterns are enabled. Enabled objects can be disabled with the **disable** *builtin command.*\n\n    **enable -p** *reenables patterns disabled with* **disable -p***. Note* that it does not override globbing options; for example, \\`**enable -p** \\\"\\~\\\"*\\' does not cause the pattern character* **\\~** *to be active unless* the **EXTENDED_GLOB** *option is also set. To enable all possible* patterns (so that they may be individually disabled with **disable -p***),* use \\`**setopt EXTENDED_GLOB KSH_GLOB NO_SH_GLOB***\\'.*\n",
+    "description": ":   Enable the *named hash table elements, presumably disabled* earlier with **disable***. The default is to enable builtin commands.* The **-a** *option causes* **enable** *to act on regular or global aliases.* The **-s** *option causes* **enable** *to act on suffix aliases.* The **-f** *option causes* **enable** *to act on shell functions. The* **-r** option causes **enable** *to act on reserved words. Without arguments* all enabled hash table elements from the corresponding hash table are printed. With the **-m** *flag the arguments are taken as patterns* (should be quoted) and all hash table elements from the corresponding hash table matching these patterns are enabled. Enabled objects can be disabled with the **disable** *builtin command.*\n\n    **enable -p** *reenables patterns disabled with* **disable -p***. Note* that it does not override globbing options; for example, \\`**enable -p** \\\"\\~\\\"*\\' does not cause the pattern character* **\\~** *to be active unless* the **EXTENDED_GLOB** *option is also set. To enable all possible* patterns (so that they may be individually disabled with **disable -p***),* use \\`**setopt EXTENDED_GLOB KSH_GLOB NO_SH_GLOB***\\'.*",
     "args": "enable [ -afmprs ] name ..."
   },
   "eval": {
     "shortDescription": "Execute arguments in shell",
-    "description": ":   Read the arguments as input to the shell and execute the resulting command(s) in the current shell process. The return status is the same as if the commands had been executed directly by the shell; if there are no *args or they contain no commands (i.e. are* an empty string or whitespace) the return status is zero.\n",
+    "description": ":   Read the arguments as input to the shell and execute the resulting command(s) in the current shell process. The return status is the same as if the commands had been executed directly by the shell; if there are no *args or they contain no commands (i.e. are* an empty string or whitespace) the return status is zero.",
     "args": "eval [ arg ... ]"
   },
   "exec": {
     "shortDescription": "Replace shell with command",
-    "description": ":   Replace the current shell with *command rather than forking.* If *command is a shell builtin command or a shell function,* the shell executes it, and exits when the command is complete.\n\n    With **-c** *clear the environment; with* **-l** *prepend* **-** *to the* **argv\\[0\\]** *string of the command executed (to simulate a login shell);* with **-a** *argv0 set the* **argv\\[0\\]** *string of the command* executed. See the section \\`Precommand Modifiers\\' in *zshmisc(1).*\n\n    If the option **POSIX_BUILTINS** *is set, command is never* interpreted as a shell builtin command or shell function. This means further precommand modifiers such as **builtin** *and* **noglob** *are also not interpreted within the shell. Hence* *command is always found by searching the command path.*\n\n    If *command is omitted but any redirections are specified,* then the redirections will take effect in the current shell.\n",
+    "description": ":   Replace the current shell with *command rather than forking.* If *command is a shell builtin command or a shell function,* the shell executes it, and exits when the command is complete.\n\n    With **-c** *clear the environment; with* **-l** *prepend* **-** *to the* **argv\\[0\\]** *string of the command executed (to simulate a login shell);* with **-a** *argv0 set the* **argv\\[0\\]** *string of the command* executed. See the section \\`Precommand Modifiers\\' in *zshmisc(1).*\n\n    If the option **POSIX_BUILTINS** *is set, command is never* interpreted as a shell builtin command or shell function. This means further precommand modifiers such as **builtin** *and* **noglob** *are also not interpreted within the shell. Hence* *command is always found by searching the command path.*\n\n    If *command is omitted but any redirections are specified,* then the redirections will take effect in the current shell.",
     "args": "exec [ -cl ] [ -a argv0 ] [ command [ arg ... ] ]"
   },
   "exit": {
     "shortDescription": "Exit the shell",
-    "description": ":   Exit the shell with the exit status specified by an arithmetic expression *n; if none* is specified, use the exit status from the last command executed. An EOF condition will also cause the shell to exit, unless the **IGNORE_EOF** *option is set.*\n\n    See notes at the end of the section JOBS in *zshmisc(1) for some possibly unexpected interactions* of the **exit** *command with jobs.*\n",
+    "description": ":   Exit the shell with the exit status specified by an arithmetic expression *n; if none* is specified, use the exit status from the last command executed. An EOF condition will also cause the shell to exit, unless the **IGNORE_EOF** *option is set.*\n\n    See notes at the end of the section JOBS in *zshmisc(1) for some possibly unexpected interactions* of the **exit** *command with jobs.*",
     "args": "exit [ n ]"
   },
   "export": {
     "shortDescription": "Export to environment",
-    "description": ":   The specified *names are marked for automatic export* to the environment of subsequently executed commands. Equivalent to **typeset -gx***.* If a parameter specified does not already exist, it is created in the global scope.\n",
+    "description": ":   The specified *names are marked for automatic export* to the environment of subsequently executed commands. Equivalent to **typeset -gx***.* If a parameter specified does not already exist, it is created in the global scope.",
     "args": "export [ name[=value] ... ]"
   },
   "false": {
     "shortDescription": "Return exit status of 1",
-    "description": ":   Do nothing and return an exit status of 1.\n",
+    "description": ":   Do nothing and return an exit status of 1.",
     "args": "false [ arg ... ]"
   },
   "fc": {
     "shortDescription": "Fix command",
-    "description": "**fc** **-ARWI** *\\[ filename \\]* The **fc** *command controls the interactive history mechanism. Note* that reading and writing of history options is only performed if the shell is interactive. Usually this is detected automatically, but it can be forced by setting the **interactive** *option when starting the* shell.\n\n> The first two forms of this command select a range of events from *first to last from the history list. The arguments first* and *last may be specified as a number or as a string. A negative* number is used as an offset to the current history event number. A string specifies the most recent event beginning with the given string. All substitutions *old***=***new, if any, are then performed on the* text of the events.\n>\n> The range of events selected by numbers can be narrowed further by the following flags.\n>\n> **-I**\n>\n> :   restricts to only internal events (not from **\\$HISTFILE***)*\n>\n> **-L**\n>\n> :   restricts to only local events (not from other shells, see **SHARE_HISTORY** *in zshoptions(1) \\-- note that* **\\$HISTFILE** *is* considered local when read at startup)\n>\n> **-m**\n>\n> :   takes the first argument as a pattern (which should be quoted) and only the history events matching this pattern are considered\n>\n> If *first is not specified, it will be set to -1 (the most recent* event), or to -16 if the **-l** *flag is given.* If *last is not specified, it will be set to first,* or to -1 if the **-l** *flag is given.* However, if the current event has added entries to the history with \\`**print -s***\\' or \\`***fc -R***\\', then the default last for* **-l** includes all new history entries since the current event began.\n>\n> When the **-l** *flag is given, the resulting events are listed on* standard output. Otherwise the editor program specified by **-e** *ename* is invoked on a file containing these history events. If **-e** *is not given, the* value of the parameter **FCEDIT** *is used; if that is not set the value of* the parameter **EDITOR** *is used; if that is not set a builtin default,* usually \\`**vi***\\' is used. If ename is \\`***-***\\', no editor is invoked.* When editing is complete, the edited command is executed.\n>\n> The flag \\`**-s***\\' is equivalent to \\`***-e -***\\'.* The flag **-r** *reverses the order of the events and the* flag **-n** *suppresses event numbers when listing.*\n>\n> Also when listing,\n>\n> **-d**\n>\n> :   prints timestamps for each event\n>\n> **-f**\n>\n> :   prints full time-date stamps in the US \\`*MM***/***DD***/***YY hh***:***mm\\' format*\n>\n> **-E**\n>\n> :   prints full time-date stamps in the European \\`*dd***.***mm***.***yyyy hh***:***mm\\' format*\n>\n> **-i**\n>\n> :   prints full time-date stamps in ISO8601 \\`*yyyy***-***mm***-***dd hh***:***mm\\' format*\n>\n> **-t** *fmt*\n>\n> :   prints time and date stamps in the given format; *fmt is formatted with the strftime function with the zsh extensions* described for the **%D{***string***}** *prompt format in* the section EXPANSION OF PROMPT SEQUENCES in *zshmisc(1). The resulting formatted string must be* no more than 256 characters or will not be printed\n>\n> <!-- -->\n>\n> **-D**\n>\n> :   prints elapsed times; may be combined with one of the options above\n>\n> \\`**fc -p***\\' pushes the current history list onto a stack and switches to a* new history list. If the **-a** *option is also specified, this history list* will be automatically popped when the current function scope is exited, which is a much better solution than creating a trap function to call \\`**fc -P***\\'* manually. If no arguments are specified, the history list is left empty, **\\$HISTFILE** *is unset, and* **\\$HISTSIZE** *&* **\\$SAVEHIST** *are set to their* default values. If one argument is given, **\\$HISTFILE** *is set to that* filename, **\\$HISTSIZE** *&* **\\$SAVEHIST** *are left unchanged, and the history* file is read in (if it exists) to initialize the new list. If a second argument is specified, **\\$HISTSIZE** *&* **\\$SAVEHIST** *are instead set to the* single specified numeric value. Finally, if a third argument is specified, **\\$SAVEHIST** *is set to a separate value from* **\\$HISTSIZE***. You are free to* change these environment values for the new history list however you desire in order to manipulate the new history list.\n>\n> \\`**fc -P***\\' pops the history list back to an older list saved by \\`***fc -p***\\'.* The current list is saved to its **\\$HISTFILE** *before it is destroyed* (assuming that **\\$HISTFILE** *and* **\\$SAVEHIST** *are set appropriately, of* course). The values of **\\$HISTFILE***,* **\\$HISTSIZE***, and* **\\$SAVEHIST** *are* restored to the values they had when \\`**fc -p***\\' was called. Note that this* restoration can conflict with making these variables \\\"local\\\", so your best bet is to avoid local declarations for these variables in functions that use \\`**fc -p***\\'. The one other guaranteed-safe combination is declaring these* variables to be local at the top of your function and using the automatic option (**-a***) with \\`***fc -p***\\'. Finally, note that it is legal to manually* pop a push marked for automatic popping if you need to do so before the function exits.\n>\n> \\`**fc -R***\\' reads the history from the given file,* \\`**fc -W***\\' writes the history out to the given file,* and \\`**fc -A***\\' appends the history out to the given file.* If no filename is specified, the **\\$HISTFILE** *is assumed.* If the **-I** *option is added to* **-R***, only those events that are* not already contained within the internal history list are added. If the **-I** *option is added to* **-A** *or* **-W***, only those* events that are new since last incremental append/write to the history file are appended/written. In any case, the created file will have no more than **\\$SAVEHIST** entries.\n",
+    "description": "**fc** **-ARWI** *\\[ filename \\]* The **fc** *command controls the interactive history mechanism. Note* that reading and writing of history options is only performed if the shell is interactive. Usually this is detected automatically, but it can be forced by setting the **interactive** *option when starting the* shell.\n\n> The first two forms of this command select a range of events from *first to last from the history list. The arguments first* and *last may be specified as a number or as a string. A negative* number is used as an offset to the current history event number. A string specifies the most recent event beginning with the given string. All substitutions *old***=***new, if any, are then performed on the* text of the events.\n>\n> The range of events selected by numbers can be narrowed further by the following flags.\n>\n> **-I**\n>\n> :   restricts to only internal events (not from **\\$HISTFILE***)*\n>\n> **-L**\n>\n> :   restricts to only local events (not from other shells, see **SHARE_HISTORY** *in zshoptions(1) \\-- note that* **\\$HISTFILE** *is* considered local when read at startup)\n>\n> **-m**\n>\n> :   takes the first argument as a pattern (which should be quoted) and only the history events matching this pattern are considered\n>\n> If *first is not specified, it will be set to -1 (the most recent* event), or to -16 if the **-l** *flag is given.* If *last is not specified, it will be set to first,* or to -1 if the **-l** *flag is given.* However, if the current event has added entries to the history with \\`**print -s***\\' or \\`***fc -R***\\', then the default last for* **-l** includes all new history entries since the current event began.\n>\n> When the **-l** *flag is given, the resulting events are listed on* standard output. Otherwise the editor program specified by **-e** *ename* is invoked on a file containing these history events. If **-e** *is not given, the* value of the parameter **FCEDIT** *is used; if that is not set the value of* the parameter **EDITOR** *is used; if that is not set a builtin default,* usually \\`**vi***\\' is used. If ename is \\`***-***\\', no editor is invoked.* When editing is complete, the edited command is executed.\n>\n> The flag \\`**-s***\\' is equivalent to \\`***-e -***\\'.* The flag **-r** *reverses the order of the events and the* flag **-n** *suppresses event numbers when listing.*\n>\n> Also when listing,\n>\n> **-d**\n>\n> :   prints timestamps for each event\n>\n> **-f**\n>\n> :   prints full time-date stamps in the US \\`*MM***/***DD***/***YY hh***:***mm\\' format*\n>\n> **-E**\n>\n> :   prints full time-date stamps in the European \\`*dd***.***mm***.***yyyy hh***:***mm\\' format*\n>\n> **-i**\n>\n> :   prints full time-date stamps in ISO8601 \\`*yyyy***-***mm***-***dd hh***:***mm\\' format*\n>\n> **-t** *fmt*\n>\n> :   prints time and date stamps in the given format; *fmt is formatted with the strftime function with the zsh extensions* described for the **%D{***string***}** *prompt format in* the section EXPANSION OF PROMPT SEQUENCES in *zshmisc(1). The resulting formatted string must be* no more than 256 characters or will not be printed\n>\n> <!-- -->\n>\n> **-D**\n>\n> :   prints elapsed times; may be combined with one of the options above\n>\n> \\`**fc -p***\\' pushes the current history list onto a stack and switches to a* new history list. If the **-a** *option is also specified, this history list* will be automatically popped when the current function scope is exited, which is a much better solution than creating a trap function to call \\`**fc -P***\\'* manually. If no arguments are specified, the history list is left empty, **\\$HISTFILE** *is unset, and* **\\$HISTSIZE** *&* **\\$SAVEHIST** *are set to their* default values. If one argument is given, **\\$HISTFILE** *is set to that* filename, **\\$HISTSIZE** *&* **\\$SAVEHIST** *are left unchanged, and the history* file is read in (if it exists) to initialize the new list. If a second argument is specified, **\\$HISTSIZE** *&* **\\$SAVEHIST** *are instead set to the* single specified numeric value. Finally, if a third argument is specified, **\\$SAVEHIST** *is set to a separate value from* **\\$HISTSIZE***. You are free to* change these environment values for the new history list however you desire in order to manipulate the new history list.\n>\n> \\`**fc -P***\\' pops the history list back to an older list saved by \\`***fc -p***\\'.* The current list is saved to its **\\$HISTFILE** *before it is destroyed* (assuming that **\\$HISTFILE** *and* **\\$SAVEHIST** *are set appropriately, of* course). The values of **\\$HISTFILE***,* **\\$HISTSIZE***, and* **\\$SAVEHIST** *are* restored to the values they had when \\`**fc -p***\\' was called. Note that this* restoration can conflict with making these variables \\\"local\\\", so your best bet is to avoid local declarations for these variables in functions that use \\`**fc -p***\\'. The one other guaranteed-safe combination is declaring these* variables to be local at the top of your function and using the automatic option (**-a***) with \\`***fc -p***\\'. Finally, note that it is legal to manually* pop a push marked for automatic popping if you need to do so before the function exits.\n>\n> \\`**fc -R***\\' reads the history from the given file,* \\`**fc -W***\\' writes the history out to the given file,* and \\`**fc -A***\\' appends the history out to the given file.* If no filename is specified, the **\\$HISTFILE** *is assumed.* If the **-I** *option is added to* **-R***, only those events that are* not already contained within the internal history list are added. If the **-I** *option is added to* **-A** *or* **-W***, only those* events that are new since last incremental append/write to the history file are appended/written. In any case, the created file will have no more than **\\$SAVEHIST** entries.",
     "args": "fc -P"
   },
   "fg": {
     "shortDescription": "Put a job in the foreground",
-    "description": "*job \\...* Bring each specified *job in turn to the foreground.* If no *job is specified, resume the current job.*\n",
+    "description": "*job \\...* Bring each specified *job in turn to the foreground.* If no *job is specified, resume the current job.*",
     "args": "fg [ job ... ]"
   },
   "float": {
     "shortDescription": "Floating point arithmetic",
-    "description": ":   Equivalent to **typeset -E***, except that options irrelevant to floating* point numbers are not permitted.\n",
+    "description": ":   Equivalent to **typeset -E***, except that options irrelevant to floating* point numbers are not permitted.",
     "args": "float [ {+|-}Hghlprtux ] [ {+|-}EFLRZ [ n ] ] [ name[=value] ... ]"
   },
   "functions": {
     "shortDescription": "List functions",
-    "description": "**functions -c** *oldfn newfn*\n\n**functions -M** *\\[***-s***\\] mathfn \\[ min \\[ max \\[ shellfn \\] \\] \\]*\n\n**functions -M** *\\[* **-m** *pattern \\... \\]*\n\n**functions +M** *\\[* **-m** *\\] mathfn \\...* Equivalent to **typeset -f***, with the exception of the* **-c***,* **-x***,* **-M** *and* **-W** *options. For* **functions -u** *and* **functions -U***,* see **autoload***, which provides additional options. For* **functions -t** and **functions -T***, see* **typeset -f***.*\n\n> The **-x** *option indicates that any functions output will have* each leading tab for indentation, added by the shell to show syntactic structure, expanded to the given number *num of spaces. num* can also be 0 to suppress all indentation.\n>\n> The **-W** *option turns on the option* **WARN_NESTED_VAR** *for the named* function or functions only. The option is turned off at the start of nested functions (apart from anonoymous functions) unless the called function also has the **-W** *attribute.*\n>\n> The **-c** *option causes oldfn to be copied to newfn. The* copy is efficiently handled internally by reference counting. If *oldfn was marked for autoload it is first loaded and if this* fails the copy fails. Either function may subsequently be redefined without affecting the other. A typical idiom is that *oldfn is the* name of a library shell function which is then redefined to call **newfn***, thereby installing a modified version of the function.*\n>\n> *The* **-M** *and* **+M** *flags*\n>\n> Use of the **-M** *option may not be combined with any of the options* handled by **typeset -f***.*\n>\n> **functions -M** *mathfn defines mathfn as the name of* a mathematical function recognised in all forms of arithmetical expressions; see the section \\`Arithmetic Evaluation\\' in *zshmisc(1). By default mathfn may take* any number of comma-separated arguments. If *min is given,* it must have exactly *min args; if min and max are* both given, it must have at least *min and at most max* args. *max may be -1 to indicate that there is no upper limit.*\n>\n> By default the function is implemented by a shell function of the same name; if *shellfn is specified it gives the name of the corresponding* shell function while *mathfn remains the name used in arithmetical* expressions. The name of the function in **\\$0** *is mathfn (not* *shellfn as would usually be the case), provided the option* **FUNCTION_ARGZERO** *is in effect. The positional parameters in the shell* function correspond to the arguments of the mathematical function call.\n>\n> The result of the last arithmetical expression evaluated inside the shell function gives the result of the mathematical function. This is not limited to arithmetic substitutions of the form **\\$((***\\...***))***,* but also includes arithmetical expressions evaluated in any other way, including by the **let** *builtin,* by **((***\\...***))** *statements,* and even by the **return** *builtin* and by array subscripts. Therefore, care must be taken not to use syntactical constructs that perform arithmetic evaluation after evaluating what is to be the result of the function. For example:\n>\n> > # WRONG\n> >     zmath_cube() {\n> >       (( $1 * $1 * $1 ))\n> >       return 0\n> >     }\n> >     functions -M cube 1 1 zmath_cube\n> >     print $(( cube(3) ))\n>\n> This will print \\`**0***\\' because of the* **return***.*\n>\n> Commenting the **return** *out would lead to a different problem: the* **((***\\...***))** *statement would become* the last statement in the function, so the *return status (***\\$?***) of the* function would be non-zero (indicating failure) whenever the *arithmetic* result *of the function would happen to be zero (numerically):*\n>\n> > # WRONG\n> >     zmath_cube() {\n> >       (( $1 * $1 * $1 ))\n> >     }\n> >     functions -M cube 1 1 zmath_cube\n> >     print $(( cube(0) ))\n>\n> Instead, the **true** *builtin can be used:*\n>\n> > # RIGHT\n> >     zmath_cube() {\n> >       (( $1 * $1 * $1 ))\n> >       true\n> >     }\n> >     functions -M cube 1 1 zmath_cube\n> >     print $(( cube(3) ))\n>\n> If the additional option **-s** *is given to* **functions -M***, the* argument to the function is a single string: anything between the opening and matching closing parenthesis is passed to the function as a single argument, even if it includes commas or white space. The minimum and maximum argument specifiers must therefore be 1 if given. An empty argument list is passed as a zero-length string. Thus, the following string function takes a single argument, including the commas, and prints 11:\n>\n> > stringfn() { (( $#1 )); true }\n> >     functions -Ms stringfn\n> >     print $(( stringfn(foo,bar,rod) ))\n>\n> **functions -M** *with no arguments lists all such user-defined functions in* the same form as a definition. With the additional option **-m** *and* a list of arguments, all functions whose *mathfn matches one of* the pattern arguments are listed.\n>\n> **function +M** *removes the list of mathematical functions; with the* additional option **-m** *the arguments are treated as patterns and* all functions whose *mathfn matches the pattern are removed. Note* that the shell function implementing the behaviour is not removed (regardless of whether its name coincides with *mathfn).*\n",
+    "description": "**functions -c** *oldfn newfn*\n\n**functions -M** *\\[***-s***\\] mathfn \\[ min \\[ max \\[ shellfn \\] \\] \\]*\n\n**functions -M** *\\[* **-m** *pattern \\... \\]*\n\n**functions +M** *\\[* **-m** *\\] mathfn \\...* Equivalent to **typeset -f***, with the exception of the* **-c***,* **-x***,* **-M** *and* **-W** *options. For* **functions -u** *and* **functions -U***,* see **autoload***, which provides additional options. For* **functions -t** and **functions -T***, see* **typeset -f***.*\n\n> The **-x** *option indicates that any functions output will have* each leading tab for indentation, added by the shell to show syntactic structure, expanded to the given number *num of spaces. num* can also be 0 to suppress all indentation.\n>\n> The **-W** *option turns on the option* **WARN_NESTED_VAR** *for the named* function or functions only. The option is turned off at the start of nested functions (apart from anonoymous functions) unless the called function also has the **-W** *attribute.*\n>\n> The **-c** *option causes oldfn to be copied to newfn. The* copy is efficiently handled internally by reference counting. If *oldfn was marked for autoload it is first loaded and if this* fails the copy fails. Either function may subsequently be redefined without affecting the other. A typical idiom is that *oldfn is the* name of a library shell function which is then redefined to call **newfn***, thereby installing a modified version of the function.*\n>\n> *The* **-M** *and* **+M** *flags*\n>\n> Use of the **-M** *option may not be combined with any of the options* handled by **typeset -f***.*\n>\n> **functions -M** *mathfn defines mathfn as the name of* a mathematical function recognised in all forms of arithmetical expressions; see the section \\`Arithmetic Evaluation\\' in *zshmisc(1). By default mathfn may take* any number of comma-separated arguments. If *min is given,* it must have exactly *min args; if min and max are* both given, it must have at least *min and at most max* args. *max may be -1 to indicate that there is no upper limit.*\n>\n> By default the function is implemented by a shell function of the same name; if *shellfn is specified it gives the name of the corresponding* shell function while *mathfn remains the name used in arithmetical* expressions. The name of the function in **\\$0** *is mathfn (not* *shellfn as would usually be the case), provided the option* **FUNCTION_ARGZERO** *is in effect. The positional parameters in the shell* function correspond to the arguments of the mathematical function call.\n>\n> The result of the last arithmetical expression evaluated inside the shell function gives the result of the mathematical function. This is not limited to arithmetic substitutions of the form **\\$((***\\...***))***,* but also includes arithmetical expressions evaluated in any other way, including by the **let** *builtin,* by **((***\\...***))** *statements,* and even by the **return** *builtin* and by array subscripts. Therefore, care must be taken not to use syntactical constructs that perform arithmetic evaluation after evaluating what is to be the result of the function. For example:\n>\n> > # WRONG\n> >     zmath_cube() {\n> >       (( $1 * $1 * $1 ))\n> >       return 0\n> >     }\n> >     functions -M cube 1 1 zmath_cube\n> >     print $(( cube(3) ))\n>\n> This will print \\`**0***\\' because of the* **return***.*\n>\n> Commenting the **return** *out would lead to a different problem: the* **((***\\...***))** *statement would become* the last statement in the function, so the *return status (***\\$?***) of the* function would be non-zero (indicating failure) whenever the *arithmetic* result *of the function would happen to be zero (numerically):*\n>\n> > # WRONG\n> >     zmath_cube() {\n> >       (( $1 * $1 * $1 ))\n> >     }\n> >     functions -M cube 1 1 zmath_cube\n> >     print $(( cube(0) ))\n>\n> Instead, the **true** *builtin can be used:*\n>\n> > # RIGHT\n> >     zmath_cube() {\n> >       (( $1 * $1 * $1 ))\n> >       true\n> >     }\n> >     functions -M cube 1 1 zmath_cube\n> >     print $(( cube(3) ))\n>\n> If the additional option **-s** *is given to* **functions -M***, the* argument to the function is a single string: anything between the opening and matching closing parenthesis is passed to the function as a single argument, even if it includes commas or white space. The minimum and maximum argument specifiers must therefore be 1 if given. An empty argument list is passed as a zero-length string. Thus, the following string function takes a single argument, including the commas, and prints 11:\n>\n> > stringfn() { (( $#1 )); true }\n> >     functions -Ms stringfn\n> >     print $(( stringfn(foo,bar,rod) ))\n>\n> **functions -M** *with no arguments lists all such user-defined functions in* the same form as a definition. With the additional option **-m** *and* a list of arguments, all functions whose *mathfn matches one of* the pattern arguments are listed.\n>\n> **function +M** *removes the list of mathematical functions; with the* additional option **-m** *the arguments are treated as patterns and* all functions whose *mathfn matches the pattern are removed. Note* that the shell function implementing the behaviour is not removed (regardless of whether its name coincides with *mathfn).*",
     "args": "functions [ {+|-}UkmtTuWz ] [ -x num ] [ name ... ]"
   },
   "getcap": {
     "shortDescription": "Get capabilities",
-    "description": ":   See the section \\`The zsh/cap Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/cap Module\\' in *zshmodules(1).*",
     "args": "getcap"
   },
   "getln": {
-    "description": ":   Read the top value from the buffer stack and put it in the shell parameter *name. Equivalent to* **read -zr***.*\n",
+    "description": ":   Read the top value from the buffer stack and put it in the shell parameter *name. Equivalent to* **read -zr***.*",
     "args": "getln [ -AclneE ] name ..."
   },
   "getopts": {
     "shortDescription": "Parse positional parameters",
-    "description": ":   Checks the *args for legal options. If the args are omitted,* use the positional parameters. A valid option argument begins with a \\`**+***\\' or a \\`***-***\\'. An argument not beginning with* a \\`**+***\\' or a \\`***-***\\', or the argument \\`***--***\\', ends the options.* Note that a single \\`**-***\\' is not considered a valid option argument.* *optstring contains the letters that* **getopts** recognizes. If a letter is followed by a \\`**:***\\', that option* requires an argument. The options can be separated from the argument by blanks.\n\n    Each time it is invoked, **getopts** *places the option letter it finds* in the shell parameter *name, prepended with a \\`***+***\\' when* *arg begins with a \\`***+***\\'. The index of the next arg* is stored in **OPTIND***. The option argument, if any,* is stored in **OPTARG***.*\n\n    The first option to be examined may be changed by explicitly assigning to **OPTIND***.* **OPTIND** *has an initial value of* **1***, and is* normally set to **1** *upon entry to a shell function and restored* upon exit. (The **POSIX_BUILTINS** *option disables this, and also changes* the way the value is calculated to match other shells.) **OPTARG** is not reset and retains its value from the most recent call to **getopts***. If either of* **OPTIND** *or* **OPTARG** *is explicitly* unset, it remains unset, and the index or option argument is not stored. The option itself is still stored in *name in this case.*\n\n    A leading \\`**:***\\' in optstring causes* **getopts** *to store the* letter of any invalid option in **OPTARG***, and to set name to* \\`**?***\\' for an unknown option and to \\`***:***\\' when a required argument is* missing. Otherwise, **getopts** *sets name to \\`***?***\\' and prints* an error message when an option is invalid. The exit status is nonzero when there are no more options.\n",
+    "description": ":   Checks the *args for legal options. If the args are omitted,* use the positional parameters. A valid option argument begins with a \\`**+***\\' or a \\`***-***\\'. An argument not beginning with* a \\`**+***\\' or a \\`***-***\\', or the argument \\`***--***\\', ends the options.* Note that a single \\`**-***\\' is not considered a valid option argument.* *optstring contains the letters that* **getopts** recognizes. If a letter is followed by a \\`**:***\\', that option* requires an argument. The options can be separated from the argument by blanks.\n\n    Each time it is invoked, **getopts** *places the option letter it finds* in the shell parameter *name, prepended with a \\`***+***\\' when* *arg begins with a \\`***+***\\'. The index of the next arg* is stored in **OPTIND***. The option argument, if any,* is stored in **OPTARG***.*\n\n    The first option to be examined may be changed by explicitly assigning to **OPTIND***.* **OPTIND** *has an initial value of* **1***, and is* normally set to **1** *upon entry to a shell function and restored* upon exit. (The **POSIX_BUILTINS** *option disables this, and also changes* the way the value is calculated to match other shells.) **OPTARG** is not reset and retains its value from the most recent call to **getopts***. If either of* **OPTIND** *or* **OPTARG** *is explicitly* unset, it remains unset, and the index or option argument is not stored. The option itself is still stored in *name in this case.*\n\n    A leading \\`**:***\\' in optstring causes* **getopts** *to store the* letter of any invalid option in **OPTARG***, and to set name to* \\`**?***\\' for an unknown option and to \\`***:***\\' when a required argument is* missing. Otherwise, **getopts** *sets name to \\`***?***\\' and prints* an error message when an option is invalid. The exit status is nonzero when there are no more options.",
     "args": "getopts optstring name [ arg ... ]"
   },
   "hash": {
     "shortDescription": "Remember command locations",
-    "description": ":   **hash** *can be used to directly modify the contents of the command* hash table, and the named directory hash table. Normally one would modify these tables by modifying one\\'s **PATH** (for the command hash table) or by creating appropriate shell parameters (for the named directory hash table). The choice of hash table to work on is determined by the **-d** *option;* without the option the command hash table is used, and with the option the named directory hash table is used.\n\n    A command *name starting with a* **/** *is never hashed, whether by* explicit use of the **hash** *command or otherwise. Such a command* is always found by direct look up in the file system.\n\n    Given no arguments, and neither the **-r** *or* **-f** *options,* the selected hash table will be listed in full.\n\n    The **-r** *option causes the selected hash table to be emptied.* It will be subsequently rebuilt in the normal fashion. The **-f** *option causes the selected hash table to be fully* rebuilt immediately. For the command hash table this hashes all the absolute directories in the **PATH***,* and for the named directory hash table this adds all users\\' home directories. These two options cannot be used with any arguments.\n\n    The **-m** *option causes the arguments to be taken as patterns* (which should be quoted) and the elements of the hash table matching those patterns are printed. This is the only way to display a limited selection of hash table elements.\n\n    For each *name with a corresponding value, put \\`name\\' in* the selected hash table, associating it with the pathname \\`*value\\'.* In the command hash table, this means that whenever \\`*name\\' is used as a command argument, the shell will try* to execute the file given by \\`*value\\'.* In the named directory hash table, this means that \\`*value\\' may be referred to as \\`***\\~***name\\'.*\n\n    For each *name with no* corresponding *value, attempt to add name to the hash table,* checking what the appropriate **value** *is in the normal manner for* that hash table. If an appropriate **value** *can\\'t be found, then* the hash table will be unchanged.\n\n    The **-v** *option causes hash table entries to be listed as they are* added by explicit specification. If has no effect if used with **-f***.*\n\n    If the **-L** *flag is present, then each hash table entry is printed in* the form of a call to hash.\n",
+    "description": ":   **hash** *can be used to directly modify the contents of the command* hash table, and the named directory hash table. Normally one would modify these tables by modifying one\\'s **PATH** (for the command hash table) or by creating appropriate shell parameters (for the named directory hash table). The choice of hash table to work on is determined by the **-d** *option;* without the option the command hash table is used, and with the option the named directory hash table is used.\n\n    A command *name starting with a* **/** *is never hashed, whether by* explicit use of the **hash** *command or otherwise. Such a command* is always found by direct look up in the file system.\n\n    Given no arguments, and neither the **-r** *or* **-f** *options,* the selected hash table will be listed in full.\n\n    The **-r** *option causes the selected hash table to be emptied.* It will be subsequently rebuilt in the normal fashion. The **-f** *option causes the selected hash table to be fully* rebuilt immediately. For the command hash table this hashes all the absolute directories in the **PATH***,* and for the named directory hash table this adds all users\\' home directories. These two options cannot be used with any arguments.\n\n    The **-m** *option causes the arguments to be taken as patterns* (which should be quoted) and the elements of the hash table matching those patterns are printed. This is the only way to display a limited selection of hash table elements.\n\n    For each *name with a corresponding value, put \\`name\\' in* the selected hash table, associating it with the pathname \\`*value\\'.* In the command hash table, this means that whenever \\`*name\\' is used as a command argument, the shell will try* to execute the file given by \\`*value\\'.* In the named directory hash table, this means that \\`*value\\' may be referred to as \\`***\\~***name\\'.*\n\n    For each *name with no* corresponding *value, attempt to add name to the hash table,* checking what the appropriate **value** *is in the normal manner for* that hash table. If an appropriate **value** *can\\'t be found, then* the hash table will be unchanged.\n\n    The **-v** *option causes hash table entries to be listed as they are* added by explicit specification. If has no effect if used with **-f***.*\n\n    If the **-L** *flag is present, then each hash table entry is printed in* the form of a call to hash.",
     "args": "hash [ -Ldfmrv ] [ name[=value] ] ..."
   },
   "history": {
     "shortDescription": "Command history",
-    "description": ":   Same as **fc -l***.*\n",
+    "description": ":   Same as **fc -l***.*",
     "args": "history"
   },
   "integer": {
     "shortDescription": "Integer arithmetic",
-    "description": ":   Equivalent to **typeset -i***, except that options irrelevant to* integers are not permitted.\n",
+    "description": ":   Equivalent to **typeset -i***, except that options irrelevant to* integers are not permitted.",
     "args": "integer [ {+|-}Hghlprtux ] [ {+|-}LRZi [ n ] ] [ name[=value] ... ]"
   },
   "jobs": {
     "shortDescription": "List active jobs",
-    "description": "**jobs -Z** *string* Lists information about each given job, or all jobs if *job is omitted. The* **-l** *flag lists process* IDs, and the **-p** *flag lists process groups.* If the **-r** *flag is specified only running jobs will be listed* and if the **-s** *flag is given only stopped jobs are shown.* If the **-d** *flag is given, the directory from which the job was* started (which may not be the current directory of the job) will also be shown.\n\n> The **-Z** *option replaces the shell\\'s argument and environment space with* the given string, truncated if necessary to fit. This will normally be visible in **ps** *(ps(1)) listings. This feature is typically* used by daemons, to indicate their state.\n>\n> Full job control is only available in the top-level interactive shell, not in commands run in the left hand side of pipelines or within the **(***\\...***)** *construct. However, a snapshot* of the job state at that point is taken, so it is still possible to use the **jobs** *builtin, or any parameter providing job information.* This gives information about the state of jobs at the point the subshell was created. If background processes are created within the subshell, then instead information about those processes is provided.\n>\n> For example,\n>\n> > sleep 10 &    # Job in background\n> >     (             # Shell forks\n> >     jobs          # Shows information about \"sleep 10 &\"\n> >     sleep 5 &     # Process in background (no job control)\n> >     jobs          # Shows information about \"sleep 5 &\"\n> >     )\n",
+    "description": "**jobs -Z** *string* Lists information about each given job, or all jobs if *job is omitted. The* **-l** *flag lists process* IDs, and the **-p** *flag lists process groups.* If the **-r** *flag is specified only running jobs will be listed* and if the **-s** *flag is given only stopped jobs are shown.* If the **-d** *flag is given, the directory from which the job was* started (which may not be the current directory of the job) will also be shown.\n\n> The **-Z** *option replaces the shell\\'s argument and environment space with* the given string, truncated if necessary to fit. This will normally be visible in **ps** *(ps(1)) listings. This feature is typically* used by daemons, to indicate their state.\n>\n> Full job control is only available in the top-level interactive shell, not in commands run in the left hand side of pipelines or within the **(***\\...***)** *construct. However, a snapshot* of the job state at that point is taken, so it is still possible to use the **jobs** *builtin, or any parameter providing job information.* This gives information about the state of jobs at the point the subshell was created. If background processes are created within the subshell, then instead information about those processes is provided.\n>\n> For example,\n>\n> > sleep 10 &    # Job in background\n> >     (             # Shell forks\n> >     jobs          # Shows information about \"sleep 10 &\"\n> >     sleep 5 &     # Process in background (no job control)\n> >     jobs          # Shows information about \"sleep 5 &\"\n> >     )",
     "args": "jobs [ -dlprs ] [ job ... ]"
   },
   "kill": {
     "shortDescription": "Send a signal to a process",
-    "description": "**kill** **-l** *\\[ sig \\... \\]* Sends either **SIGTERM** *or the specified signal to the given* jobs or processes. Signals are given by number or by names, with or without the \\`**SIG***\\'* prefix. If the signal being sent is not \\`**KILL***\\' or \\`***CONT***\\', then the job* will be sent a \\`**CONT***\\' signal if it is stopped.* The argument *job can be the process ID of a job* not in the job list. In the second form, **kill -l***, if sig is not* specified the signal names are listed. Otherwise, for each *sig that is a name, the corresponding signal number is* listed. For each *sig that is a signal number or a number* representing the exit status of a process which was terminated or stopped by a signal the name of the signal is printed.\n\n> On some systems, alternative signal names are allowed for a few signals. Typical examples are **SIGCHLD** *and* **SIGCLD** *or* **SIGPOLL** *and* **SIGIO***, assuming they correspond to the same signal number.* **kill** -l *will only list the preferred form, however* **kill -l** *alt will* show if the alternative form corresponds to a signal number. For example, under Linux **kill -l IO** *and* **kill -l POLL** *both output 29, hence* **kill -IO** *and* **kill -POLL** *have the same effect.*\n>\n> Many systems will allow process IDs to be negative to kill a process group or zero to kill the current process group.\n",
+    "description": "**kill** **-l** *\\[ sig \\... \\]* Sends either **SIGTERM** *or the specified signal to the given* jobs or processes. Signals are given by number or by names, with or without the \\`**SIG***\\'* prefix. If the signal being sent is not \\`**KILL***\\' or \\`***CONT***\\', then the job* will be sent a \\`**CONT***\\' signal if it is stopped.* The argument *job can be the process ID of a job* not in the job list. In the second form, **kill -l***, if sig is not* specified the signal names are listed. Otherwise, for each *sig that is a name, the corresponding signal number is* listed. For each *sig that is a signal number or a number* representing the exit status of a process which was terminated or stopped by a signal the name of the signal is printed.\n\n> On some systems, alternative signal names are allowed for a few signals. Typical examples are **SIGCHLD** *and* **SIGCLD** *or* **SIGPOLL** *and* **SIGIO***, assuming they correspond to the same signal number.* **kill** -l *will only list the preferred form, however* **kill -l** *alt will* show if the alternative form corresponds to a signal number. For example, under Linux **kill -l IO** *and* **kill -l POLL** *both output 29, hence* **kill -IO** *and* **kill -POLL** *have the same effect.*\n>\n> Many systems will allow process IDs to be negative to kill a process group or zero to kill the current process group.",
     "args": "kill [ -s signal_name | -n signal_number | -sig ] job ..."
   },
   "let": {
     "shortDescription": "Evaluate arithmetic expression",
-    "description": ":   Evaluate each *arg as an arithmetic expression.* See the section \\`Arithmetic Evaluation\\' in *zshmisc(1)* for a description of arithmetic expressions. The exit status is 0 if the value of the last expression is nonzero, 1 if it is zero, and 2 if an error occurred.\n",
+    "description": ":   Evaluate each *arg as an arithmetic expression.* See the section \\`Arithmetic Evaluation\\' in *zshmisc(1)* for a description of arithmetic expressions. The exit status is 0 if the value of the last expression is nonzero, 1 if it is zero, and 2 if an error occurred.",
     "args": "let arg ..."
   },
   "limit": {
     "shortDescription": "Set or display resource limits",
-    "description": ":   Set or display resource limits. Unless the **-s** *flag is given,* the limit applies only the children of the shell. If **-s** *is* given without other arguments, the resource limits of the current shell is set to the previously set resource limits of the children.\n\n    If *limit is not specified, print the current limit placed* on *resource, otherwise* set the limit to the specified value. If the **-h** *flag* is given, use hard limits instead of soft limits. If no *resource is given, print all limits.*\n\n    When looping over multiple resources, the shell will abort immediately if it detects a badly formed argument. However, if it fails to set a limit for some other reason it will continue trying to set the remaining limits.\n\n    *resource can be one of:*\n\n    **addressspace**\n\n    :   Maximum amount of address space used.\n\n    **aiomemorylocked**\n\n    :   Maximum amount of memory locked in RAM for AIO operations.\n\n    **aiooperations**\n\n    :   Maximum number of AIO operations.\n\n    **cachedthreads**\n\n    :   Maximum number of cached threads.\n\n    **coredumpsize**\n\n    :   Maximum size of a core dump.\n\n    **cputime**\n\n    :   Maximum CPU seconds per process.\n\n    **datasize**\n\n    :   Maximum data size (including stack) for each process.\n\n    **descriptors**\n\n    :   Maximum value for a file descriptor.\n\n    **filesize**\n\n    :   Largest single file allowed.\n\n    **kqueues**\n\n    :   Maximum number of kqueues allocated.\n\n    **maxproc**\n\n    :   Maximum number of processes.\n\n    **maxpthreads**\n\n    :   Maximum number of threads per process.\n\n    **memorylocked**\n\n    :   Maximum amount of memory locked in RAM.\n\n    **memoryuse**\n\n    :   Maximum resident set size.\n\n    **msgqueue**\n\n    :   Maximum number of bytes in POSIX message queues.\n\n    **posixlocks**\n\n    :   Maximum number of POSIX locks per user.\n\n    **pseudoterminals**\n\n    :   Maximum number of pseudo-terminals.\n\n    **resident**\n\n    :   Maximum resident set size.\n\n    **sigpending**\n\n    :   Maximum number of pending signals.\n\n    **sockbufsize**\n\n    :   Maximum size of all socket buffers.\n\n    **stacksize**\n\n    :   Maximum stack size for each process.\n\n    **swapsize**\n\n    :   Maximum amount of swap used.\n\n    **vmemorysize**\n\n    :   Maximum amount of virtual memory.\n\n    Which of these resource limits are available depends on the system. *resource can be abbreviated to any unambiguous prefix. It* can also be an integer, which corresponds to the integer defined for the resource by the operating system.\n\n    If argument corresponds to a number which is out of the range of the resources configured into the shell, the shell will try to read or write the limit anyway, and will report an error if this fails. As the shell does not store such resources internally, an attempt to set the limit will fail unless the **-s** *option is present.*\n\n    *limit is a number, with an optional scaling factor, as follows:*\n\n    *n***h**\n\n    :   hours\n\n    *n***k**\n\n    :   kilobytes (default)\n\n    *n***m**\n\n    :   megabytes or minutes\n\n    *n***g**\n\n    :   gigabytes\n\n    \\[*mm***:***\\]ss*\n\n    :   minutes and seconds\n\n    The **limit** *command is not made available by default when the* shell starts in a mode emulating another shell. It can be made available with the command \\`**zmodload -F zsh/rlimits b:limit***\\'.*\n",
+    "description": ":   Set or display resource limits. Unless the **-s** *flag is given,* the limit applies only the children of the shell. If **-s** *is* given without other arguments, the resource limits of the current shell is set to the previously set resource limits of the children.\n\n    If *limit is not specified, print the current limit placed* on *resource, otherwise* set the limit to the specified value. If the **-h** *flag* is given, use hard limits instead of soft limits. If no *resource is given, print all limits.*\n\n    When looping over multiple resources, the shell will abort immediately if it detects a badly formed argument. However, if it fails to set a limit for some other reason it will continue trying to set the remaining limits.\n\n    *resource can be one of:*\n\n    **addressspace**\n\n    :   Maximum amount of address space used.\n\n    **aiomemorylocked**\n\n    :   Maximum amount of memory locked in RAM for AIO operations.\n\n    **aiooperations**\n\n    :   Maximum number of AIO operations.\n\n    **cachedthreads**\n\n    :   Maximum number of cached threads.\n\n    **coredumpsize**\n\n    :   Maximum size of a core dump.\n\n    **cputime**\n\n    :   Maximum CPU seconds per process.\n\n    **datasize**\n\n    :   Maximum data size (including stack) for each process.\n\n    **descriptors**\n\n    :   Maximum value for a file descriptor.\n\n    **filesize**\n\n    :   Largest single file allowed.\n\n    **kqueues**\n\n    :   Maximum number of kqueues allocated.\n\n    **maxproc**\n\n    :   Maximum number of processes.\n\n    **maxpthreads**\n\n    :   Maximum number of threads per process.\n\n    **memorylocked**\n\n    :   Maximum amount of memory locked in RAM.\n\n    **memoryuse**\n\n    :   Maximum resident set size.\n\n    **msgqueue**\n\n    :   Maximum number of bytes in POSIX message queues.\n\n    **posixlocks**\n\n    :   Maximum number of POSIX locks per user.\n\n    **pseudoterminals**\n\n    :   Maximum number of pseudo-terminals.\n\n    **resident**\n\n    :   Maximum resident set size.\n\n    **sigpending**\n\n    :   Maximum number of pending signals.\n\n    **sockbufsize**\n\n    :   Maximum size of all socket buffers.\n\n    **stacksize**\n\n    :   Maximum stack size for each process.\n\n    **swapsize**\n\n    :   Maximum amount of swap used.\n\n    **vmemorysize**\n\n    :   Maximum amount of virtual memory.\n\n    Which of these resource limits are available depends on the system. *resource can be abbreviated to any unambiguous prefix. It* can also be an integer, which corresponds to the integer defined for the resource by the operating system.\n\n    If argument corresponds to a number which is out of the range of the resources configured into the shell, the shell will try to read or write the limit anyway, and will report an error if this fails. As the shell does not store such resources internally, an attempt to set the limit will fail unless the **-s** *option is present.*\n\n    *limit is a number, with an optional scaling factor, as follows:*\n\n    *n***h**\n\n    :   hours\n\n    *n***k**\n\n    :   kilobytes (default)\n\n    *n***m**\n\n    :   megabytes or minutes\n\n    *n***g**\n\n    :   gigabytes\n\n    \\[*mm***:***\\]ss*\n\n    :   minutes and seconds\n\n    The **limit** *command is not made available by default when the* shell starts in a mode emulating another shell. It can be made available with the command \\`**zmodload -F zsh/rlimits b:limit***\\'.*",
     "args": "limit [ -hs ] [ resource [ limit ] ] ..."
   },
   "local": {
     "shortDescription": "Create a local variable",
-    "description": ":   Same as **typeset***, except that the options* **-g***, and* **-f** *are not permitted. In this case the* **-x** *option does not force* the use of **-g***, i.e. exported variables will be local to functions.*\n",
+    "description": ":   Same as **typeset***, except that the options* **-g***, and* **-f** *are not permitted. In this case the* **-x** *option does not force* the use of **-g***, i.e. exported variables will be local to functions.*",
     "args": "local [ {+|-}AHUahlprtux ] [ {+|-}EFLRZi [ n ] ] [ name[=value] ... ]"
   },
   "logout": {
     "shortDescription": "Exit the shell",
-    "description": ":   Same as **exit***, except that it only works in a login shell.*\n",
+    "description": ":   Same as **exit***, except that it only works in a login shell.*",
     "args": "logout [ n ]"
   },
   "noglob": {
     "shortDescription": "Disable filename expansion",
-    "description": ":   See the section \\`Precommand Modifiers\\' in *zshmisc(1).*\n",
+    "description": ":   See the section \\`Precommand Modifiers\\' in *zshmisc(1).*",
     "args": "noglob simple command"
   },
   "popd": {
     "shortDescription": "Remove directory from stack",
-    "description": ":   Remove an entry from the directory stack, and perform a **cd** *to* the new top directory. With no argument, the current top entry is removed. An argument of the form \\`**+***n\\' identifies a stack* entry by counting from the left of the list shown by the **dirs** *command,* starting with zero. An argument of the form **-***n counts from the right.* If the **PUSHD_MINUS** *option is set, the meanings of \\`***+***\\' and* \\`**-***\\' in this context are swapped.*\n\n    If the **-q** *(quiet) option is specified, the hook function* **chpwd** and the functions in the array **\\$chpwd_functions** *are not called,* and the new directory stack is not printed. This is useful for calls to **popd** *that do not change the environment seen by an interactive user.*\n",
+    "description": ":   Remove an entry from the directory stack, and perform a **cd** *to* the new top directory. With no argument, the current top entry is removed. An argument of the form \\`**+***n\\' identifies a stack* entry by counting from the left of the list shown by the **dirs** *command,* starting with zero. An argument of the form **-***n counts from the right.* If the **PUSHD_MINUS** *option is set, the meanings of \\`***+***\\' and* \\`**-***\\' in this context are swapped.*\n\n    If the **-q** *(quiet) option is specified, the hook function* **chpwd** and the functions in the array **\\$chpwd_functions** *are not called,* and the new directory stack is not printed. This is useful for calls to **popd** *that do not change the environment seen by an interactive user.*",
     "args": "popd [ -q ] [ {+|-}n ]"
   },
   "print": {
     "shortDescription": "Print arguments",
-    "description": "*\\[* **-v** *name \\] \\[* **-xX** *tabstop \\] \\[* **-R** *\\[* **-en** *\\]\\] \\[ arg \\... \\]* With the \\`**-f***\\' option the arguments are printed as described by* **printf***.* With no flags or with the flag \\`**-***\\', the arguments are printed on* the standard output as described by **echo***, with the following differences:* the escape sequence \\`**\\\\M-***x\\' (or \\`***\\\\M***x\\') metafies the character* *x (sets the highest bit),* \\`**\\\\C-***x\\' (or \\`***\\\\C***x\\') produces a control character* (\\`**\\\\C-@***\\' and \\`***\\\\C-?***\\' give the characters NULL and delete),* a character code in octal is represented by \\`**\\\\***NNN\\'* (instead of \\`**\\\\0***NNN\\'),* and \\`**\\\\E***\\' is a synonym for \\`***\\\\e***\\'.* Finally, if not in an escape sequence, \\`**\\\\***\\' escapes the following character and is not printed.*\n\n> **-a** Print arguments with the column incrementing first. Only useful with the **-c** *and* **-C** *options.*\n>\n> **-b**\n>\n> :   Recognize all the escape sequences defined for the **bindkey** *command,* see the section \\`Zle Builtins\\' in *zshzle(1).*\n>\n> **-c**\n>\n> :   Print the arguments in columns. Unless **-a** *is also given, arguments are* printed with the row incrementing first.\n>\n> **-C** *cols*\n>\n> :   Print the arguments in *cols columns. Unless* **-a** *is also given,* arguments are printed with the row incrementing first.\n>\n> **-D**\n>\n> :   Treat the arguments as paths, replacing directory prefixes with **\\~** expressions corresponding to directory names, as appropriate.\n>\n> **-i**\n>\n> :   If given together with **-o** *or* **-O***, sorting is performed* case-independently.\n>\n> **-l**\n>\n> :   Print the arguments separated by newlines instead of spaces. Note: if the list of arguments is empty, **print -l** *will still output one empty* line. To print a possibly-empty list of arguments one per line, use **print -C1***, as in \\`***print -rC1 \\-- \\\"\\$list\\[@\\]\\\"***\\'.*\n>\n> **-m**\n>\n> :   Take the first argument as a pattern (should be quoted), and remove it from the argument list together with subsequent arguments that do not match this pattern.\n>\n> **-n**\n>\n> :   Do not add a newline to the output.\n>\n> **-N**\n>\n> :   Print the arguments separated and terminated by nulls. Again, **print -rNC1 \\-- \\\"\\$list\\[@\\]\\\"** *is a canonical way to print an* arbitrary list as null-delimited records.\n>\n> **-o**\n>\n> :   Print the arguments sorted in ascending order.\n>\n> **-O**\n>\n> :   Print the arguments sorted in descending order.\n>\n> **-p**\n>\n> :   Print the arguments to the input of the coprocess.\n>\n> **-P**\n>\n> :   Perform prompt expansion (see EXPANSION OF PROMPT SEQUENCES in *zshmisc(1)).* In combination with \\`**-f***\\',* prompt escape sequences are parsed only within interpolated arguments, not within the format string.\n>\n> **-r**\n>\n> :   Ignore the escape conventions of **echo***.*\n>\n> **-R**\n>\n> :   Emulate the BSD **echo** *command, which does not process escape sequences* unless the **-e** *flag is given. The* **-n** *flag suppresses the trailing* newline. Only the **-e** *and* **-n** *flags are recognized after* **-R***; all other arguments and options are printed.*\n>\n> **-s**\n>\n> :   Place the results in the history list instead of on the standard output. Each argument to the **print** *command is treated as a single word in the* history, regardless of its content.\n>\n> **-S**\n>\n> :   Place the results in the history list instead of on the standard output. In this case only a single argument is allowed; it will be split into words as if it were a full shell command line. The effect is similar to reading the line from a history file with the **HIST_LEX_WORDS** *option active.*\n>\n> **-u** *n*\n>\n> :   Print the arguments to file descriptor *n.*\n>\n> **-v** *name*\n>\n> :   Store the printed arguments as the value of the parameter *name.*\n>\n> **-x** *tab-stop*\n>\n> :   Expand leading tabs on each line of output in the printed string assuming a tab stop every *tab-stop characters. This is appropriate* for formatting code that may be indented with tabs. Note that leading tabs of any argument to print, not just the first, are expanded, even if **print** *is using spaces to separate arguments (the column count* is maintained across arguments but may be incorrect on output owing to previous unexpanded tabs).\n>\n>     The start of the output of each print command is assumed to be aligned with a tab stop. Widths of multibyte characters are handled if the option **MULTIBYTE** *is in effect. This option is ignored if other* formatting options are in effect, namely column alignment or **printf** *style, or if output is to a special location such as shell* history or the command line editor.\n>\n> **-X** *tab-stop*\n>\n> :   This is similar to **-x***, except that all tabs in the printed string* are expanded. This is appropriate if tabs in the arguments are being used to produce a table format.\n>\n> **-z**\n>\n> :   Push the arguments onto the editing buffer stack, separated by spaces.\n>\n> If any of \\`**-m***\\', \\`***-o***\\' or \\`***-O***\\' are used in combination with* \\`**-f***\\' and there are no arguments (after the removal process in the* case of \\`**-m***\\') then nothing is printed.*\n",
+    "description": "*\\[* **-v** *name \\] \\[* **-xX** *tabstop \\] \\[* **-R** *\\[* **-en** *\\]\\] \\[ arg \\... \\]* With the \\`**-f***\\' option the arguments are printed as described by* **printf***.* With no flags or with the flag \\`**-***\\', the arguments are printed on* the standard output as described by **echo***, with the following differences:* the escape sequence \\`**\\\\M-***x\\' (or \\`***\\\\M***x\\') metafies the character* *x (sets the highest bit),* \\`**\\\\C-***x\\' (or \\`***\\\\C***x\\') produces a control character* (\\`**\\\\C-@***\\' and \\`***\\\\C-?***\\' give the characters NULL and delete),* a character code in octal is represented by \\`**\\\\***NNN\\'* (instead of \\`**\\\\0***NNN\\'),* and \\`**\\\\E***\\' is a synonym for \\`***\\\\e***\\'.* Finally, if not in an escape sequence, \\`**\\\\***\\' escapes the following character and is not printed.*\n\n> **-a** Print arguments with the column incrementing first. Only useful with the **-c** *and* **-C** *options.*\n>\n> **-b**\n>\n> :   Recognize all the escape sequences defined for the **bindkey** *command,* see the section \\`Zle Builtins\\' in *zshzle(1).*\n>\n> **-c**\n>\n> :   Print the arguments in columns. Unless **-a** *is also given, arguments are* printed with the row incrementing first.\n>\n> **-C** *cols*\n>\n> :   Print the arguments in *cols columns. Unless* **-a** *is also given,* arguments are printed with the row incrementing first.\n>\n> **-D**\n>\n> :   Treat the arguments as paths, replacing directory prefixes with **\\~** expressions corresponding to directory names, as appropriate.\n>\n> **-i**\n>\n> :   If given together with **-o** *or* **-O***, sorting is performed* case-independently.\n>\n> **-l**\n>\n> :   Print the arguments separated by newlines instead of spaces. Note: if the list of arguments is empty, **print -l** *will still output one empty* line. To print a possibly-empty list of arguments one per line, use **print -C1***, as in \\`***print -rC1 \\-- \\\"\\$list\\[@\\]\\\"***\\'.*\n>\n> **-m**\n>\n> :   Take the first argument as a pattern (should be quoted), and remove it from the argument list together with subsequent arguments that do not match this pattern.\n>\n> **-n**\n>\n> :   Do not add a newline to the output.\n>\n> **-N**\n>\n> :   Print the arguments separated and terminated by nulls. Again, **print -rNC1 \\-- \\\"\\$list\\[@\\]\\\"** *is a canonical way to print an* arbitrary list as null-delimited records.\n>\n> **-o**\n>\n> :   Print the arguments sorted in ascending order.\n>\n> **-O**\n>\n> :   Print the arguments sorted in descending order.\n>\n> **-p**\n>\n> :   Print the arguments to the input of the coprocess.\n>\n> **-P**\n>\n> :   Perform prompt expansion (see EXPANSION OF PROMPT SEQUENCES in *zshmisc(1)).* In combination with \\`**-f***\\',* prompt escape sequences are parsed only within interpolated arguments, not within the format string.\n>\n> **-r**\n>\n> :   Ignore the escape conventions of **echo***.*\n>\n> **-R**\n>\n> :   Emulate the BSD **echo** *command, which does not process escape sequences* unless the **-e** *flag is given. The* **-n** *flag suppresses the trailing* newline. Only the **-e** *and* **-n** *flags are recognized after* **-R***; all other arguments and options are printed.*\n>\n> **-s**\n>\n> :   Place the results in the history list instead of on the standard output. Each argument to the **print** *command is treated as a single word in the* history, regardless of its content.\n>\n> **-S**\n>\n> :   Place the results in the history list instead of on the standard output. In this case only a single argument is allowed; it will be split into words as if it were a full shell command line. The effect is similar to reading the line from a history file with the **HIST_LEX_WORDS** *option active.*\n>\n> **-u** *n*\n>\n> :   Print the arguments to file descriptor *n.*\n>\n> **-v** *name*\n>\n> :   Store the printed arguments as the value of the parameter *name.*\n>\n> **-x** *tab-stop*\n>\n> :   Expand leading tabs on each line of output in the printed string assuming a tab stop every *tab-stop characters. This is appropriate* for formatting code that may be indented with tabs. Note that leading tabs of any argument to print, not just the first, are expanded, even if **print** *is using spaces to separate arguments (the column count* is maintained across arguments but may be incorrect on output owing to previous unexpanded tabs).\n>\n>     The start of the output of each print command is assumed to be aligned with a tab stop. Widths of multibyte characters are handled if the option **MULTIBYTE** *is in effect. This option is ignored if other* formatting options are in effect, namely column alignment or **printf** *style, or if output is to a special location such as shell* history or the command line editor.\n>\n> **-X** *tab-stop*\n>\n> :   This is similar to **-x***, except that all tabs in the printed string* are expanded. This is appropriate if tabs in the arguments are being used to produce a table format.\n>\n> **-z**\n>\n> :   Push the arguments onto the editing buffer stack, separated by spaces.\n>\n> If any of \\`**-m***\\', \\`***-o***\\' or \\`***-O***\\' are used in combination with* \\`**-f***\\' and there are no arguments (after the removal process in the* case of \\`**-m***\\') then nothing is printed.*",
     "args": "print [ -abcDilmnNoOpPrsSz ] [ -u n ] [ -f format ] [ -C cols ]"
   },
   "printf": {
     "shortDescription": "Format and print data",
-    "description": ":   Print the arguments according to the format specification. Formatting rules are the same as used in C. The same escape sequences as for **echo** are recognised in the format. All C conversion specifications ending in one of **csdiouxXeEfgGn** *are handled. In addition to this, \\`***%b***\\' can be* used instead of \\`**%s***\\' to cause escape sequences in the argument to be* recognised and \\`**%q***\\' can be used to quote the argument in such a way* that allows it to be reused as shell input. With the numeric format specifiers, if the corresponding argument starts with a quote character, the numeric value of the following character is used as the number to print; otherwise the argument is evaluated as an arithmetic expression. See the section \\`Arithmetic Evaluation\\' in *zshmisc(1)* for a description of arithmetic expressions. With \\`**%n***\\', the corresponding argument is taken as an* identifier which is created as an integer parameter.\n\n    Normally, conversion specifications are applied to each argument in order but they can explicitly specify the *nth argument is to be used by* replacing \\`**%***\\' by \\`***%***n***\\$***\\' and \\`***\\****\\' by \\`***\\****n***\\$***\\'.* It is recommended that you do not mix references of this explicit style with the normal style and the handling of such mixed styles may be subject to future change.\n\n    If arguments remain unused after formatting, the format string is reused until all arguments have been consumed. With the **print** *builtin, this* can be suppressed by using the **-r** *option. If more arguments are* required by the format than have been specified, the behaviour is as if zero or an empty string had been specified as the argument.\n\n    The **-v** *option causes the output to be stored as the value of the* parameter *name, instead of printed. If name is an array and* the format string is reused when consuming arguments then one array element will be used for each use of the format string.\n",
+    "description": ":   Print the arguments according to the format specification. Formatting rules are the same as used in C. The same escape sequences as for **echo** are recognised in the format. All C conversion specifications ending in one of **csdiouxXeEfgGn** *are handled. In addition to this, \\`***%b***\\' can be* used instead of \\`**%s***\\' to cause escape sequences in the argument to be* recognised and \\`**%q***\\' can be used to quote the argument in such a way* that allows it to be reused as shell input. With the numeric format specifiers, if the corresponding argument starts with a quote character, the numeric value of the following character is used as the number to print; otherwise the argument is evaluated as an arithmetic expression. See the section \\`Arithmetic Evaluation\\' in *zshmisc(1)* for a description of arithmetic expressions. With \\`**%n***\\', the corresponding argument is taken as an* identifier which is created as an integer parameter.\n\n    Normally, conversion specifications are applied to each argument in order but they can explicitly specify the *nth argument is to be used by* replacing \\`**%***\\' by \\`***%***n***\\$***\\' and \\`***\\****\\' by \\`***\\****n***\\$***\\'.* It is recommended that you do not mix references of this explicit style with the normal style and the handling of such mixed styles may be subject to future change.\n\n    If arguments remain unused after formatting, the format string is reused until all arguments have been consumed. With the **print** *builtin, this* can be suppressed by using the **-r** *option. If more arguments are* required by the format than have been specified, the behaviour is as if zero or an empty string had been specified as the argument.\n\n    The **-v** *option causes the output to be stored as the value of the* parameter *name, instead of printed. If name is an array and* the format string is reused when consuming arguments then one array element will be used for each use of the format string.",
     "args": "printf [ -v name ] format [ arg ... ]"
   },
   "pushd": {
     "shortDescription": "Add directory to stack",
-    "description": "> The third form of **pushd** *changes directory by rotating the* directory list. An argument of the form \\`**+***n\\' identifies a stack* entry by counting from the left of the list shown by the **dirs** command, starting with zero. An argument of the form \\`**-***n\\' counts* from the right. If the **PUSHD_MINUS** *option is set, the meanings* of \\`**+***\\' and \\`***-***\\' in this context are swapped.*\n>\n> If the **-q** *(quiet) option is specified, the hook function* **chpwd** and the functions in the array **\\$chpwd_functions** *are not called,* and the new directory stack is not printed. This is useful for calls to **pushd** *that do not change the environment seen by an interactive user.*\n>\n> If the option **-q** *is not specified and the shell option* **PUSHD_SILENT** is not set, the directory stack will be printed after a **pushd** *is* performed.\n>\n> The options **-s***,* **-L** *and* **-P** *have the same meanings as for the* **cd** *builtin.*\n",
+    "description": "> The third form of **pushd** *changes directory by rotating the* directory list. An argument of the form \\`**+***n\\' identifies a stack* entry by counting from the left of the list shown by the **dirs** command, starting with zero. An argument of the form \\`**-***n\\' counts* from the right. If the **PUSHD_MINUS** *option is set, the meanings* of \\`**+***\\' and \\`***-***\\' in this context are swapped.*\n>\n> If the **-q** *(quiet) option is specified, the hook function* **chpwd** and the functions in the array **\\$chpwd_functions** *are not called,* and the new directory stack is not printed. This is useful for calls to **pushd** *that do not change the environment seen by an interactive user.*\n>\n> If the option **-q** *is not specified and the shell option* **PUSHD_SILENT** is not set, the directory stack will be printed after a **pushd** *is* performed.\n>\n> The options **-s***,* **-L** *and* **-P** *have the same meanings as for the* **cd** *builtin.*",
     "args": "pushd [ -qsLP ] [ arg ]\n\npushd [ -qsLP ] old new\n\npushd [ -qsLP ] {+|-}n Change the current directory, and push the old\ncurrent directory onto the directory stack. In the first form, change\nthe current directory to arg. If arg is not specified, change to the\nsecond directory on the stack (that is, exchange the top two entries),\nor change to $HOME if the PUSHD_TO_HOME option is set or if there is\nonly one entry on the stack. Otherwise, arg is interpreted as it would\nbe by cd. The meaning of old and new in the second form is also the same\nas for cd."
   },
   "pushln": {
     "shortDescription": "Push arguments onto the buffer",
-    "description": ":   Equivalent to **print -nz***.*\n",
+    "description": ":   Equivalent to **print -nz***.*",
     "args": "pushln [ arg ... ]"
   },
   "pwd": {
     "shortDescription": "Print working directory",
-    "description": ":   Print the absolute pathname of the current working directory. If the **-r** *or the* **-P** *flag is specified, or the* **CHASE_LINKS** option is set and the **-L** *flag is not given, the printed path will not* contain symbolic links.\n",
+    "description": ":   Print the absolute pathname of the current working directory. If the **-r** *or the* **-P** *flag is specified, or the* **CHASE_LINKS** option is set and the **-L** *flag is not given, the printed path will not* contain symbolic links.",
     "args": "pwd [ -rLP ]"
   },
   "r": {
     "shortDescription": "Re-execute command",
-    "description": ":   Same as **fc -e -***.*\n",
+    "description": ":   Same as **fc -e -***.*",
     "args": "r"
   },
   "read": {
-    "description": "*\\[* **-u** *n \\] \\[ \\[name\\]\\[***?***prompt\\] \\] \\[ name \\... \\]* Read one line and break it into fields using the characters in **\\$IFS** *as separators, except as noted below.* The first field is assigned to the first *name, the second field* to the second *name, etc., with leftover* fields assigned to the last *name.* If *name is omitted then* **REPLY** *is used for scalars and* **reply** *for arrays.*\n\n> **-r** Raw mode: a \\`**\\\\***\\' at the end of a line does not signify line* continuation and backslashes in the line don\\'t quote the following character and are not removed.\n>\n> **-s**\n>\n> :   Don\\'t echo back characters if reading from the terminal.\n>\n> **-q**\n>\n> :   Read only one character from the terminal and set *name to* \\`**y***\\' if this character was \\`***y***\\' or \\`***Y***\\' and to \\`***n***\\' otherwise.* With this flag set the return status is zero only if the character was \\`**y***\\' or \\`***Y***\\'. This option may be used with a timeout (see* **-t***); if* the read times out, or encounters end of file, status 2 is returned. Input is read from the terminal unless one of **-u** *or* **-p** *is present. This option* may also be used within zle widgets.\n>\n> **-k** *\\[ num \\]*\n>\n> :   Read only one (or *num) characters. All are assigned to the first* *name, without word splitting. This flag is ignored when* **-q** *is* present. Input is read from the terminal unless one of **-u** *or* **-p** is present. This option may also be used within zle widgets.\n>\n>     Note that despite the mnemonic \\`key\\' this option does read full characters, which may consist of multiple bytes if the option **MULTIBYTE** *is set.*\n>\n> **-z**\n>\n> :   Read one entry from the editor buffer stack and assign it to the first *name, without word splitting. Text is pushed onto the stack with* \\`**print -z***\\' or with* **push-line** *from the line editor (see* *zshzle(1)). This flag is ignored when the* **-k** *or* **-q** *flags are present.*\n>\n> **-e**\n>\n> **-E** The input read is printed (echoed) to the standard output. If the **-e** flag is used, no input is assigned to the parameters.\n>\n> **-A**\n>\n> :   The first *name is taken as the name of an array and all words are* assigned to it.\n>\n> **-c**\n>\n> **-l** These flags are allowed only if called inside a function used for completion (specified with the **-K** *flag to* **compctl***). If the* **-c** *flag is given, the words of the* current command are read. If the **-l** *flag is given, the whole* line is assigned as a scalar. If both flags are present, **-l** is used and **-c** *is ignored.*\n>\n> **-n**\n>\n> :   Together with **-c***, the number of the word the cursor is on is* read. With **-l***, the index of the character the cursor is on is* read. Note that the command name is word number 1, not word 0, and that when the cursor is at the end of the line, its character index is the length of the line plus one.\n>\n> **-u** *n*\n>\n> :   Input is read from file descriptor *n.*\n>\n> **-p**\n>\n> :   Input is read from the coprocess.\n>\n> **-d** *delim*\n>\n> :   Input is terminated by the first character of *delim instead of* by newline.\n>\n> **-t** *\\[ num \\]*\n>\n> :   Test if input is available before attempting to read. If *num* is present, it must begin with a digit and will be evaluated to give a number of seconds, which may be a floating point number; in this case the read times out if input is not available within this time. If *num is not present, it is taken to be zero, so that* **read** *returns immediately if no input is available.* If no input is available, return status 1 and do not set any variables. This option is not available when reading from the editor buffer with **-z***, when called from within completion with* **-c** *or* **-l***, with* **-q** *which clears the input queue before reading, or within zle where* other mechanisms should be used to test for input. Note that read does not attempt to alter the input processing mode. The default mode is canonical input, in which an entire line is read at a time, so usually \\`**read -t***\\' will not read anything until an entire line has* been typed. However, when reading from the terminal with **-k** input is processed one key at a time; in this case, only availability of the first character is tested, so that e.g. \\`**read -t -k 2***\\' can still* block on the second character. Use two instances of \\`**read -t -k***\\' if* this is not what is wanted.\n>\n> If the first argument contains a \\`**?***\\', the remainder of this* word is used as a *prompt on standard error when the shell* is interactive.\n>\n> The value (exit status) of **read** *is 1 when an end-of-file is* encountered, or when **-c** *or* **-l** *is present and the command is* not called from a **compctl** *function, or as described for* **-q***.* Otherwise the value is 0.\n>\n> The behavior of some combinations of the **-k***,* **-p***,* **-q***,* **-u** and **-z** *flags is undefined. Presently* **-q** *cancels all the others,* **-p** *cancels* **-u***,* **-k** *cancels* **-z***, and otherwise* **-z** cancels both **-p** *and* **-u***.*\n>\n> The **-c** *or* **-l** *flags cancel any and all of* **-kpquz***.*\n",
+    "description": "*\\[* **-u** *n \\] \\[ \\[name\\]\\[***?***prompt\\] \\] \\[ name \\... \\]* Read one line and break it into fields using the characters in **\\$IFS** *as separators, except as noted below.* The first field is assigned to the first *name, the second field* to the second *name, etc., with leftover* fields assigned to the last *name.* If *name is omitted then* **REPLY** *is used for scalars and* **reply** *for arrays.*\n\n> **-r** Raw mode: a \\`**\\\\***\\' at the end of a line does not signify line* continuation and backslashes in the line don\\'t quote the following character and are not removed.\n>\n> **-s**\n>\n> :   Don\\'t echo back characters if reading from the terminal.\n>\n> **-q**\n>\n> :   Read only one character from the terminal and set *name to* \\`**y***\\' if this character was \\`***y***\\' or \\`***Y***\\' and to \\`***n***\\' otherwise.* With this flag set the return status is zero only if the character was \\`**y***\\' or \\`***Y***\\'. This option may be used with a timeout (see* **-t***); if* the read times out, or encounters end of file, status 2 is returned. Input is read from the terminal unless one of **-u** *or* **-p** *is present. This option* may also be used within zle widgets.\n>\n> **-k** *\\[ num \\]*\n>\n> :   Read only one (or *num) characters. All are assigned to the first* *name, without word splitting. This flag is ignored when* **-q** *is* present. Input is read from the terminal unless one of **-u** *or* **-p** is present. This option may also be used within zle widgets.\n>\n>     Note that despite the mnemonic \\`key\\' this option does read full characters, which may consist of multiple bytes if the option **MULTIBYTE** *is set.*\n>\n> **-z**\n>\n> :   Read one entry from the editor buffer stack and assign it to the first *name, without word splitting. Text is pushed onto the stack with* \\`**print -z***\\' or with* **push-line** *from the line editor (see* *zshzle(1)). This flag is ignored when the* **-k** *or* **-q** *flags are present.*\n>\n> **-e**\n>\n> **-E** The input read is printed (echoed) to the standard output. If the **-e** flag is used, no input is assigned to the parameters.\n>\n> **-A**\n>\n> :   The first *name is taken as the name of an array and all words are* assigned to it.\n>\n> **-c**\n>\n> **-l** These flags are allowed only if called inside a function used for completion (specified with the **-K** *flag to* **compctl***). If the* **-c** *flag is given, the words of the* current command are read. If the **-l** *flag is given, the whole* line is assigned as a scalar. If both flags are present, **-l** is used and **-c** *is ignored.*\n>\n> **-n**\n>\n> :   Together with **-c***, the number of the word the cursor is on is* read. With **-l***, the index of the character the cursor is on is* read. Note that the command name is word number 1, not word 0, and that when the cursor is at the end of the line, its character index is the length of the line plus one.\n>\n> **-u** *n*\n>\n> :   Input is read from file descriptor *n.*\n>\n> **-p**\n>\n> :   Input is read from the coprocess.\n>\n> **-d** *delim*\n>\n> :   Input is terminated by the first character of *delim instead of* by newline.\n>\n> **-t** *\\[ num \\]*\n>\n> :   Test if input is available before attempting to read. If *num* is present, it must begin with a digit and will be evaluated to give a number of seconds, which may be a floating point number; in this case the read times out if input is not available within this time. If *num is not present, it is taken to be zero, so that* **read** *returns immediately if no input is available.* If no input is available, return status 1 and do not set any variables. This option is not available when reading from the editor buffer with **-z***, when called from within completion with* **-c** *or* **-l***, with* **-q** *which clears the input queue before reading, or within zle where* other mechanisms should be used to test for input. Note that read does not attempt to alter the input processing mode. The default mode is canonical input, in which an entire line is read at a time, so usually \\`**read -t***\\' will not read anything until an entire line has* been typed. However, when reading from the terminal with **-k** input is processed one key at a time; in this case, only availability of the first character is tested, so that e.g. \\`**read -t -k 2***\\' can still* block on the second character. Use two instances of \\`**read -t -k***\\' if* this is not what is wanted.\n>\n> If the first argument contains a \\`**?***\\', the remainder of this* word is used as a *prompt on standard error when the shell* is interactive.\n>\n> The value (exit status) of **read** *is 1 when an end-of-file is* encountered, or when **-c** *or* **-l** *is present and the command is* not called from a **compctl** *function, or as described for* **-q***.* Otherwise the value is 0.\n>\n> The behavior of some combinations of the **-k***,* **-p***,* **-q***,* **-u** and **-z** *flags is undefined. Presently* **-q** *cancels all the others,* **-p** *cancels* **-u***,* **-k** *cancels* **-z***, and otherwise* **-z** cancels both **-p** *and* **-u***.*\n>\n> The **-c** *or* **-l** *flags cancel any and all of* **-kpquz***.*",
     "args": "read [ -rszpqAclneE ] [ -t [ num ] ] [ -k [ num ] ] [ -d delim ]"
   },
   "readonly": {
     "shortDescription": "Mark variables as read-only",
-    "description": ":   Same as **typeset -r***. With the* **POSIX_BUILTINS** *option set, same* as **typeset -gr***.*\n",
+    "description": ":   Same as **typeset -r***. With the* **POSIX_BUILTINS** *option set, same* as **typeset -gr***.*",
     "args": "readonly"
   },
   "rehash": {
     "shortDescription": "Recompute command hash table",
-    "description": ":   Same as **hash -r***.*\n",
+    "description": ":   Same as **hash -r***.*",
     "args": "rehash"
   },
   "return": {
-    "description": ":   Causes a shell function or \\`**.***\\' script to return to* the invoking script with the return status specified by an arithmetic expression *n.* For example, the following prints \\`**42***\\':*\n\n    > () { integer foo=40; return \"foo + 2\" }\n    >     echo $?\n\n    If *n* is omitted, the return status is that of the last command executed.\n\n    If **return** *was executed from a trap in a* **TRAP***NAL function,* the effect is different for zero and non-zero return status. With zero status (or after an implicit return at the end of the trap), the shell will return to whatever it was previously processing; with a non-zero status, the shell will behave as interrupted except that the return status of the trap is retained. Note that the numeric value of the signal which caused the trap is passed as the first argument, so the statement \\`**return \\\"128+\\$1\\\"***\\' will return the same status as if the signal* had not been trapped.\n",
+    "description": ":   Causes a shell function or \\`**.***\\' script to return to* the invoking script with the return status specified by an arithmetic expression *n.* For example, the following prints \\`**42***\\':*\n\n    > () { integer foo=40; return \"foo + 2\" }\n    >     echo $?\n\n    If *n* is omitted, the return status is that of the last command executed.\n\n    If **return** *was executed from a trap in a* **TRAP***NAL function,* the effect is different for zero and non-zero return status. With zero status (or after an implicit return at the end of the trap), the shell will return to whatever it was previously processing; with a non-zero status, the shell will behave as interrupted except that the return status of the trap is retained. Note that the numeric value of the signal which caused the trap is passed as the first argument, so the statement \\`**return \\\"128+\\$1\\\"***\\' will return the same status as if the signal* had not been trapped.",
     "args": "return [ n ]"
   },
   "sched": {
     "shortDescription": "Schedule commands",
-    "description": ":   See the section \\`The zsh/sched Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/sched Module\\' in *zshmodules(1).*",
     "args": "sched"
   },
   "set": {
-    "description": "*\\[ arg \\... \\]* Set the options for the shell and/or set the positional parameters, or declare and set an array. If the **-s** *option is given, it causes the* specified arguments to be sorted before assigning them to the positional parameters (or to the array *name if* **-A** *is used). With* **+s** sort arguments in descending order. For the meaning of the other flags, see *zshoptions(1). Flags may be specified by name using the* **-o** *option. If no option* name is supplied with **-o***, the current option states are printed: see* the description of **setopt** *below for more information on the format.* With **+o** *they are printed in a form that can be used as input* to the shell.\n\n> If the **-A** *flag is specified, name is set to an array containing* the given *args; if no name is specified, all arrays are printed* together with their values.\n>\n> If **+A** *is used and name is an array, the* given arguments will replace the initial elements of that array; if no *name is specified, all arrays are printed without their values.*\n>\n> The behaviour of arguments after **-A** *name or* **+A** *name* depends on whether the option **KSH_ARRAYS** *is set. If it is not set, all* arguments following *name are treated as values for the array,* regardless of their form. If the option is set, normal option processing continues at that point; only regular arguments are treated as values for the array. This means that\n>\n> > set -A array -x -- foo\n>\n> sets **array** *to \\`***-x -- foo***\\' if* **KSH_ARRAYS** *is not set, but sets* the array to **foo** *and turns on the option \\`***-x***\\' if it is set.*\n>\n> If the **-A** *flag is not present, but there are arguments beyond the* options, the positional parameters are set. If the option list (if any) is terminated by \\`**--***\\', and there are no further arguments, the* positional parameters will be unset.\n>\n> If no arguments and no \\`**--***\\' are given, then the names and values of* all parameters are printed on the standard output. If the only argument is \\`**+***\\', the names of all parameters are printed.*\n>\n> For historical reasons, \\`**set -***\\' is treated as \\`***set +xv***\\'* and \\`**set -** *args\\' as \\`***set +xv \\--** *args\\' when in* any other emulation mode than zsh\\'s native mode.\n",
+    "description": "*\\[ arg \\... \\]* Set the options for the shell and/or set the positional parameters, or declare and set an array. If the **-s** *option is given, it causes the* specified arguments to be sorted before assigning them to the positional parameters (or to the array *name if* **-A** *is used). With* **+s** sort arguments in descending order. For the meaning of the other flags, see *zshoptions(1). Flags may be specified by name using the* **-o** *option. If no option* name is supplied with **-o***, the current option states are printed: see* the description of **setopt** *below for more information on the format.* With **+o** *they are printed in a form that can be used as input* to the shell.\n\n> If the **-A** *flag is specified, name is set to an array containing* the given *args; if no name is specified, all arrays are printed* together with their values.\n>\n> If **+A** *is used and name is an array, the* given arguments will replace the initial elements of that array; if no *name is specified, all arrays are printed without their values.*\n>\n> The behaviour of arguments after **-A** *name or* **+A** *name* depends on whether the option **KSH_ARRAYS** *is set. If it is not set, all* arguments following *name are treated as values for the array,* regardless of their form. If the option is set, normal option processing continues at that point; only regular arguments are treated as values for the array. This means that\n>\n> > set -A array -x -- foo\n>\n> sets **array** *to \\`***-x -- foo***\\' if* **KSH_ARRAYS** *is not set, but sets* the array to **foo** *and turns on the option \\`***-x***\\' if it is set.*\n>\n> If the **-A** *flag is not present, but there are arguments beyond the* options, the positional parameters are set. If the option list (if any) is terminated by \\`**--***\\', and there are no further arguments, the* positional parameters will be unset.\n>\n> If no arguments and no \\`**--***\\' are given, then the names and values of* all parameters are printed on the standard output. If the only argument is \\`**+***\\', the names of all parameters are printed.*\n>\n> For historical reasons, \\`**set -***\\' is treated as \\`***set +xv***\\'* and \\`**set -** *args\\' as \\`***set +xv \\--** *args\\' when in* any other emulation mode than zsh\\'s native mode.",
     "args": "set [ {+|-}options | {+|-}o [ option_name ] ] ... [ {+|-}A [ name ] ]"
   },
   "setcap": {
     "shortDescription": "Set capabilities",
-    "description": ":   See the section \\`The zsh/cap Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/cap Module\\' in *zshmodules(1).*",
     "args": "setcap"
   },
   "setopt": {
-    "description": ":   Set the options for the shell. All options specified either with flags or by name are set.\n\n    If no arguments are supplied, the names of all options currently set are printed. The form is chosen so as to minimize the differences from the default options for the current emulation (the default emulation being native **zsh***, shown as* **\\<Z\\>** *in* *zshoptions(1)).* Options that are on by default for the emulation are shown with the prefix **no** *only if they are off, while other options are* shown without the prefix **no** *and only if they are on. In addition to* options changed from the default state by the user, any options activated automatically by the shell (for example, **SHIN_STDIN** *or* **INTERACTIVE***)* will be shown in the list. The format is further modified by the option **KSH_OPTION_PRINT***, however the rationale for choosing options with* or without the **no** *prefix remains the same in this case.*\n\n    If the **-m** *flag is given the arguments are taken as patterns* (which should be quoted to protect them from filename expansion), and all options with names matching these patterns are set.\n\n    Note that a bad option name does not cause execution of subsequent shell code to be aborted; this is behaviour is different from that of \\`**set** -o*\\'. This is because* **set** *is regarded as a special builtin by the* POSIX standard, but **setopt** *is not.*\n",
+    "description": ":   Set the options for the shell. All options specified either with flags or by name are set.\n\n    If no arguments are supplied, the names of all options currently set are printed. The form is chosen so as to minimize the differences from the default options for the current emulation (the default emulation being native **zsh***, shown as* **\\<Z\\>** *in* *zshoptions(1)).* Options that are on by default for the emulation are shown with the prefix **no** *only if they are off, while other options are* shown without the prefix **no** *and only if they are on. In addition to* options changed from the default state by the user, any options activated automatically by the shell (for example, **SHIN_STDIN** *or* **INTERACTIVE***)* will be shown in the list. The format is further modified by the option **KSH_OPTION_PRINT***, however the rationale for choosing options with* or without the **no** *prefix remains the same in this case.*\n\n    If the **-m** *flag is given the arguments are taken as patterns* (which should be quoted to protect them from filename expansion), and all options with names matching these patterns are set.\n\n    Note that a bad option name does not cause execution of subsequent shell code to be aborted; this is behaviour is different from that of \\`**set** -o*\\'. This is because* **set** *is regarded as a special builtin by the* POSIX standard, but **setopt** *is not.*",
     "args": "setopt [ {+|-}options | {+|-}o option_name ] [ -m ] [ name ... ]"
   },
   "shift": {
     "shortDescription": "Shift positional parameters",
-    "description": ":   The positional parameters **\\${***n+1***}** *\\... are renamed* to **\\$1** *\\..., where n is an arithmetic expression that* defaults to 1. If any *names are given then the arrays with these names are* shifted instead of the positional parameters.\n\n    If the option **-p** *is given arguments are instead removed (popped)* from the end rather than the start of the array.\n",
+    "description": ":   The positional parameters **\\${***n+1***}** *\\... are renamed* to **\\$1** *\\..., where n is an arithmetic expression that* defaults to 1. If any *names are given then the arrays with these names are* shifted instead of the positional parameters.\n\n    If the option **-p** *is given arguments are instead removed (popped)* from the end rather than the start of the array.",
     "args": "shift [ -p ] [ n ] [ name ... ]"
   },
   "source": {
     "shortDescription": "Source a file",
-    "description": ":   Same as \\`**.***\\', except that the current directory is always searched and* is always searched first, before directories in **\\$path***.*\n",
+    "description": ":   Same as \\`**.***\\', except that the current directory is always searched and* is always searched first, before directories in **\\$path***.*",
     "args": "source file [ arg ... ]"
   },
   "stat": {
     "shortDescription": "Display file status",
-    "description": ":   See the section \\`The zsh/stat Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/stat Module\\' in *zshmodules(1).*",
     "args": "stat"
   },
   "suspend": {
-    "description": ":   Suspend the execution of the shell (send it a **SIGTSTP***)* until it receives a **SIGCONT***.* Unless the **-f** *option is given, this will refuse to suspend a login shell.*\n",
+    "description": ":   Suspend the execution of the shell (send it a **SIGTSTP***)* until it receives a **SIGCONT***.* Unless the **-f** *option is given, this will refuse to suspend a login shell.*",
     "args": "suspend [ -f ]"
   },
   "test": {
     "shortDescription": "Evaluate a conditional expression",
-    "description": "**\\[** *\\[ arg \\... \\]* **\\]** Like the system version of **test***. Added for compatibility;* use conditional expressions instead (see the section \\`Conditional Expressions\\'). The main differences between the conditional expression syntax and the **test** *and* **\\[** *builtins are: these commands are not handled* syntactically, so for example an empty variable expansion may cause an argument to be omitted; syntax errors cause status 2 to be returned instead of a shell error; and arithmetic operators expect integer arguments rather than arithmetic expressions.\n\n> The command attempts to implement POSIX and its extensions where these are specified. Unfortunately there are intrinsic ambiguities in the syntax; in particular there is no distinction between test operators and strings that resemble them. The standard attempts to resolve these for small numbers of arguments (up to four); for five or more arguments compatibility cannot be relied on. Users are urged wherever possible to use the \\`**\\[\\[***\\' test syntax which does not have these ambiguities.*\n",
+    "description": "**\\[** *\\[ arg \\... \\]* **\\]** Like the system version of **test***. Added for compatibility;* use conditional expressions instead (see the section \\`Conditional Expressions\\'). The main differences between the conditional expression syntax and the **test** *and* **\\[** *builtins are: these commands are not handled* syntactically, so for example an empty variable expansion may cause an argument to be omitted; syntax errors cause status 2 to be returned instead of a shell error; and arithmetic operators expect integer arguments rather than arithmetic expressions.\n\n> The command attempts to implement POSIX and its extensions where these are specified. Unfortunately there are intrinsic ambiguities in the syntax; in particular there is no distinction between test operators and strings that resemble them. The standard attempts to resolve these for small numbers of arguments (up to four); for five or more arguments compatibility cannot be relied on. Users are urged wherever possible to use the \\`**\\[\\[***\\' test syntax which does not have these ambiguities.*",
     "args": "test [ arg ... ]"
   },
   "times": {
     "shortDescription": "Display shell times",
-    "description": ":   Print the accumulated user and system times for the shell and for processes run from the shell.\n",
+    "description": ":   Print the accumulated user and system times for the shell and for processes run from the shell.",
     "args": "times"
   },
   "trap": {
     "shortDescription": "Set signal handlers",
-    "description": ":   *arg is a series of commands (usually quoted to protect it from* immediate evaluation by the shell) to be read and executed when the shell receives any of the signals specified by one or more *sig args.* Each *sig can be given as a number,* or as the name of a signal either with or without the string **SIG** in front (e.g. 1, HUP, and SIGHUP are all the same signal).\n\n    If *arg is \\`***-***\\', then the specified signals are reset to their* defaults, or, if no *sig args are present, all traps are reset.*\n\n    If *arg is an empty string, then the specified signals* are ignored by the shell (and by the commands it invokes).\n\n    If *arg is omitted but one or more sig args are provided (i.e.* the first argument is a valid signal number or name), the effect is the same as if *arg had been specified as \\`***-***\\'.*\n\n    The **trap** *command with no arguments prints a list of commands* associated with each signal.\n\n    If *sig is* **ZERR** *then arg will be executed* after each command with a nonzero exit status. **ERR** *is an alias* for **ZERR** *on systems that have no* **SIGERR** *signal (this is the* usual case).\n\n    If *sig is* **DEBUG** *then arg will be executed* before each command if the option **DEBUG_BEFORE_CMD** *is set* (as it is by default), else after each command. Here, a \\`command\\' is what is described as a \\`sublist\\' in the shell grammar, see the section SIMPLE COMMANDS & PIPELINES in *zshmisc(1).* If **DEBUG_BEFORE_CMD** *is set various additional features are available.* First, it is possible to skip the next command by setting the option **ERR_EXIT***; see the description of the* **ERR_EXIT** *option in* *zshoptions(1). Also, the shell parameter* **ZSH_DEBUG_CMD** *is set to the string corresponding to the command* to be executed following the trap. Note that this string is reconstructed from the internal format and may not be formatted the same way as the original text. The parameter is unset after the trap is executed.\n\n    If *sig is* **0** *or* **EXIT** and the **trap** *statement is executed inside the body of a function,* then the command *arg is executed after the function completes.* The value of **\\$?** *at the start of execution is the exit status of the* shell or the return status of the function exiting. If *sig is* **0** *or* **EXIT** and the **trap** *statement is not executed inside the body of a function,* then the command *arg is executed when the shell terminates; the* trap runs before any **zshexit** *hook functions.*\n\n    **ZERR***,* **DEBUG***, and* **EXIT** *traps are not executed inside other* traps. **ZERR** *and* **DEBUG** *traps are kept within subshells, while* other traps are reset.\n\n    Note that traps defined with the **trap** *builtin are slightly different* from those defined as \\`**TRAP***NAL () { \\... }\\', as the latter have* their own function environment (line numbers, local variables, etc.) while the former use the environment of the command in which they were called. For example,\n\n    > trap 'print $LINENO' DEBUG\n\n    will print the line number of a command executed after it has run, while\n\n    > TRAPDEBUG() { print $LINENO; }\n\n    will always print the number zero.\n\n    Alternative signal names are allowed as described under **kill** *above.* Defining a trap under either name causes any trap under an alternative name to be removed. However, it is recommended that for consistency users stick exclusively to one name or another.\n",
+    "description": ":   *arg is a series of commands (usually quoted to protect it from* immediate evaluation by the shell) to be read and executed when the shell receives any of the signals specified by one or more *sig args.* Each *sig can be given as a number,* or as the name of a signal either with or without the string **SIG** in front (e.g. 1, HUP, and SIGHUP are all the same signal).\n\n    If *arg is \\`***-***\\', then the specified signals are reset to their* defaults, or, if no *sig args are present, all traps are reset.*\n\n    If *arg is an empty string, then the specified signals* are ignored by the shell (and by the commands it invokes).\n\n    If *arg is omitted but one or more sig args are provided (i.e.* the first argument is a valid signal number or name), the effect is the same as if *arg had been specified as \\`***-***\\'.*\n\n    The **trap** *command with no arguments prints a list of commands* associated with each signal.\n\n    If *sig is* **ZERR** *then arg will be executed* after each command with a nonzero exit status. **ERR** *is an alias* for **ZERR** *on systems that have no* **SIGERR** *signal (this is the* usual case).\n\n    If *sig is* **DEBUG** *then arg will be executed* before each command if the option **DEBUG_BEFORE_CMD** *is set* (as it is by default), else after each command. Here, a \\`command\\' is what is described as a \\`sublist\\' in the shell grammar, see the section SIMPLE COMMANDS & PIPELINES in *zshmisc(1).* If **DEBUG_BEFORE_CMD** *is set various additional features are available.* First, it is possible to skip the next command by setting the option **ERR_EXIT***; see the description of the* **ERR_EXIT** *option in* *zshoptions(1). Also, the shell parameter* **ZSH_DEBUG_CMD** *is set to the string corresponding to the command* to be executed following the trap. Note that this string is reconstructed from the internal format and may not be formatted the same way as the original text. The parameter is unset after the trap is executed.\n\n    If *sig is* **0** *or* **EXIT** and the **trap** *statement is executed inside the body of a function,* then the command *arg is executed after the function completes.* The value of **\\$?** *at the start of execution is the exit status of the* shell or the return status of the function exiting. If *sig is* **0** *or* **EXIT** and the **trap** *statement is not executed inside the body of a function,* then the command *arg is executed when the shell terminates; the* trap runs before any **zshexit** *hook functions.*\n\n    **ZERR***,* **DEBUG***, and* **EXIT** *traps are not executed inside other* traps. **ZERR** *and* **DEBUG** *traps are kept within subshells, while* other traps are reset.\n\n    Note that traps defined with the **trap** *builtin are slightly different* from those defined as \\`**TRAP***NAL () { \\... }\\', as the latter have* their own function environment (line numbers, local variables, etc.) while the former use the environment of the command in which they were called. For example,\n\n    > trap 'print $LINENO' DEBUG\n\n    will print the line number of a command executed after it has run, while\n\n    > TRAPDEBUG() { print $LINENO; }\n\n    will always print the number zero.\n\n    Alternative signal names are allowed as described under **kill** *above.* Defining a trap under either name causes any trap under an alternative name to be removed. However, it is recommended that for consistency users stick exclusively to one name or another.",
     "args": "trap [ arg ] [ sig ... ]"
   },
   "true": {
     "shortDescription": "Return exit status of 0",
-    "description": ":   Do nothing and return an exit status of 0.\n",
+    "description": ":   Do nothing and return an exit status of 0.",
     "args": "true [ arg ... ]"
   },
   "ttyctl": {
     "shortDescription": "Control terminal attributes",
-    "description": ":   The **-f** *option freezes the tty (i.e. terminal or terminal emulator), and* **-u** *unfreezes it.* When the tty is frozen, no changes made to the tty settings by external programs will be honored by the shell, except for changes in the size of the screen; the shell will simply reset the settings to their previous values as soon as each command exits or is suspended. Thus, **stty** *and similar programs have* no effect when the tty is frozen. Freezing the tty does not cause the current state to be remembered: instead, it causes future changes to the state to be blocked.\n\n    Without options it reports whether the terminal is frozen or not.\n\n    Note that, regardless of whether the tty is frozen or not, the shell needs to change the settings when the line editor starts, so unfreezing the tty does not guarantee settings made on the command line are preserved. Strings of commands run between editing the command line will see a consistent tty state. See also the shell variable **STTY** *for a means of initialising* the tty before running external commands and/or freezing the tty around a single command.\n",
+    "description": ":   The **-f** *option freezes the tty (i.e. terminal or terminal emulator), and* **-u** *unfreezes it.* When the tty is frozen, no changes made to the tty settings by external programs will be honored by the shell, except for changes in the size of the screen; the shell will simply reset the settings to their previous values as soon as each command exits or is suspended. Thus, **stty** *and similar programs have* no effect when the tty is frozen. Freezing the tty does not cause the current state to be remembered: instead, it causes future changes to the state to be blocked.\n\n    Without options it reports whether the terminal is frozen or not.\n\n    Note that, regardless of whether the tty is frozen or not, the shell needs to change the settings when the line editor starts, so unfreezing the tty does not guarantee settings made on the command line are preserved. Strings of commands run between editing the command line will see a consistent tty state. See also the shell variable **STTY** *for a means of initialising* the tty before running external commands and/or freezing the tty around a single command.",
     "args": "ttyctl [ -fu ]"
   },
   "type": {
     "shortDescription": "Describe a command",
-    "description": ":   Equivalent to **whence -v***.*\n",
+    "description": ":   Equivalent to **whence -v***.*",
     "args": "type [ -wfpamsS ] name ..."
   },
   "typeset": {
     "shortDescription": "Set or display parameter attributes/values",
-    "description": "*\\[* **+** *\\| SCALAR\\[***=***value\\] array\\[***=(***value \\...***)***\\] \\[ sep \\] \\]*\n\n**typeset** **-f** *\\[ {***+***\\|***-***}***TUkmtuz** *\\] \\[* **+** *\\] \\[ name \\... \\]* Set or display attributes and values for shell parameters.\n\n> Except as noted below for control flags that change the behavior, a parameter is created for each *name that does not already refer* to one. When inside a function, a new parameter is created for every *name (even those that already exist), and is unset again when the* function completes. See \\`Local Parameters\\' in *zshparam(1). The same rules apply to special shell parameters, which* retain their special attributes when made local.\n>\n> For each *name***=***value assignment, the parameter* *name is set to value. If the assignment is omitted and name* does *not refer to an existing parameter, a new parameter is intialized* to empty string, zero, or empty array (as appropriate), *unless the* shell option **TYPESET_TO_UNSET** *is set. When that option is set,* the parameter attributes are recorded but the parameter remains unset.\n>\n> If the shell option **TYPESET_SILENT** *is not set, for each remaining* *name that refers to a parameter that is already set, the name and* value of the parameter are printed in the form of an assignment. Nothing is printed for newly-created parameters, or when any attribute flags listed below are given along with the *name. Using* \\`**+***\\' instead of minus to introduce an attribute turns it off.*\n>\n> If no *name is present, the names and values of all parameters are* printed. In this case the attribute flags restrict the display to only those parameters that have the specified attributes, and using \\`**+***\\'* rather than \\`**-***\\' to introduce the flag suppresses printing of the values* of parameters when there is no parameter name.\n>\n> All forms of the command handle scalar assignment. Array assignment is possible if any of the reserved words **declare***,* **export***,* **float***,* **integer***,* **local***,* **readonly** *or* **typeset** *is matched when the* line is parsed (N.B. not when it is executed). In this case the arguments are parsed as assignments, except that the \\`**+=***\\' syntax and the* **GLOB_ASSIGN** *option are not supported, and scalar values after* **=** are *not split further into words, even if expanded (regardless of the* setting of the **KSH_TYPESET** *option; this option is obsolete).*\n>\n> Examples of the differences between command and reserved word parsing:\n>\n> > # Reserved word parsing\n> >     typeset svar=$(echo one word) avar=(several words)\n>\n> The above creates a scalar parameter **svar** *and an array* parameter **avar** *as if the assignments had been*\n>\n> > svar=\"one word\"\n> >     avar=(several words)\n>\n> On the other hand:\n>\n> > # Normal builtin interface\n> >     builtin typeset svar=$(echo two words)\n>\n> The **builtin** *keyword causes the above to use the standard builtin* interface to **typeset** *in which argument parsing is performed in the same* way as for other commands. This example creates a scalar **svar** containing the value **two** *and another scalar parameter* **words** *with* no value. An array value in this case would either cause an error or be treated as an obscure set of glob qualifiers.\n>\n> Arbitrary arguments are allowed if they take the form of assignments after command line expansion; however, these only perform scalar assignment:\n>\n> > var='svar=val'\n> >     typeset $var\n>\n> The above sets the scalar parameter **svar** *to the value* **val***.* Parentheses around the value within **var** *would not cause array* assignment as they will be treated as ordinary characters when **\\$var** is substituted. Any non-trivial expansion in the name part of the assignment causes the argument to be treated in this fashion:\n>\n> > typeset {var1,var2,var3}=name\n>\n> The above syntax is valid, and has the expected effect of setting the three parameters to the same value, but the command line is parsed as a set of three normal command line arguments to **typeset** *after* expansion. Hence it is not possible to assign to multiple arrays by this means.\n>\n> Note that each interface to any of the commands may be disabled separately. For example, \\`**disable -r typeset***\\' disables the reserved* word interface to **typeset***, exposing the builtin interface, while* \\`**disable typeset***\\' disables the builtin. Note that disabling the* reserved word interface for **typeset** *may cause problems with the* output of \\`**typeset -p***\\', which assumes the reserved word interface is* available in order to restore array and associative array values.\n>\n> Unlike parameter assignment statements, **typeset***\\'s exit status on an* assignment that involves a command substitution does not reflect the exit status of the command substitution. Therefore, to test for an error in a command substitution, separate the declaration of the parameter from its initialization:\n>\n> > # WRONG\n> >     typeset var1=$(exit 1) || echo \"Trouble with var1\"\n> >\n> >     # RIGHT\n> >     typeset var1 && var1=$(exit 1) || echo \"Trouble with var1\"\n>\n> To initialize a parameter *param to a command output and mark it readonly,* use **typeset -r** *param or* **readonly** *param after the parameter* assignment statement.\n>\n> If no attribute flags are given, and either no *name arguments are* present or the flag **+m** *is used, then each parameter name printed is* preceded by a list of the attributes of that parameter (**array***,* **association***,* **exported***,* **float***,* **integer***,* **readonly***,* or **undefined** *for autoloaded parameters not yet loaded). If* **+m** *is* used with attribute flags, and all those flags are introduced with **+***, the matching parameter names are printed but their values* are not.\n>\n> The following control flags change the behavior of **typeset***:*\n>\n> **+** If \\`**+***\\' appears by itself in a separate word as the last option,* then the names of all parameters (functions with **-f***) are printed, but* the values (function bodies) are not. No *name arguments may appear,* and it is an error for any other options to follow \\`**+***\\'. The* effect of \\`**+***\\' is as if all attribute flags which precede it were* given with a \\`**+***\\' prefix. For example, \\`***typeset -U +***\\' is* equivalent to \\`**typeset +U***\\' and displays the names of all arrays having* the uniqueness attribute, whereas \\`**typeset -f -U +***\\' displays the* names of all autoloadable functions. If **+** *is the only option,* then type information (array, readonly, etc.) is also printed for each parameter, in the same manner as \\`**typeset +m \\\"\\*\\\"***\\'.*\n>\n> **-g**\n>\n> :   The **-g** *(global) means that any resulting parameter will not be* restricted to local scope. Note that this does not necessarily mean that the parameter will be global, as the flag will apply to any existing parameter (even if unset) from an enclosing function. This flag does not affect the parameter after creation, hence it has no effect when listing existing parameters, nor does the flag **+g** *have any effect except in* combination with **-m** *(see below).*\n>\n> **-m**\n>\n> :   If the **-m** *flag is given the name arguments are taken as patterns* (use quoting to prevent these from being interpreted as file patterns). With no attribute flags, all parameters (or functions with the **-f** flag) with matching names are printed (the shell option **TYPESET_SILENT** is not used in this case).\n>\n>     If the **+g** *flag is combined with* **-m***, a new local parameter is* created for every matching parameter that is not already local. Otherwise **-m** *applies all other flags or assignments to the existing parameters.*\n>\n>     Except when assignments are made with *name***=***value, using* **+m** *forces the matching parameters and their attributes to be printed,* even inside a function. Note that **-m** *is ignored if no patterns are* given, so \\`**typeset -m***\\' displays attributes but \\`***typeset -a +m***\\'* does not.\n>\n> **-p** *\\[ n \\]*\n>\n> :   If the **-p** *option is given, parameters and values are printed in the* form of a typeset command with an assignment, regardless of other flags and options. Note that the **-H** *flag on parameters is respected; no* value will be shown for these parameters.\n>\n>     **-p** *may be followed by an optional integer argument. Currently* only the value **1** *is supported. In this case arrays and associative* arrays are printed with newlines between indented elements for readability.\n>\n> **-T** *\\[ scalar\\[***=***value\\] array\\[***=(***value \\...***)***\\] \\[ sep \\] \\]*\n>\n> :   This flag has a different meaning when used with **-f***; see below.* Otherwise the **-T** *option requires zero, two, or three arguments to be* present. With no arguments, the list of parameters created in this fashion is shown. With two or three arguments, the first two are the name of a scalar and of an array parameter (in that order) that will be tied together in the manner of **\\$PATH** *and* **\\$path***. The optional third* argument is a single-character separator which will be used to join the elements of the array to form the scalar; if absent, a colon is used, as with **\\$PATH***. Only the first character of the separator is significant;* any remaining characters are ignored. Multibyte characters are not yet supported.\n>\n>     Only one of the scalar and array parameters may be assigned an initial value (the restrictions on assignment forms described above also apply).\n>\n>     Both the scalar and the array may be manipulated as normal. If one is unset, the other will automatically be unset too. There is no way of untying the variables without unsetting them, nor of converting the type of one of them with another **typeset** *command;* **+T** *does not work,* assigning an array to *scalar is an error, and assigning a scalar to* *array sets it to be a single-element array.*\n>\n>     Note that both \\`**typeset -xT \\...***\\' and \\`***export -T \\...***\\' work, but* only the scalar will be marked for export. Setting the value using the scalar version causes a split on all separators (which cannot be quoted). It is possible to apply **-T** *to two previously tied variables but with a* different separator character, in which case the variables remain joined as before but the separator is changed.\n>\n>     When an existing scalar is tied to a new array, the value of the scalar is preserved but no attribute other than export will be preserved.\n>\n> Attribute flags that transform the final value (**-L***,* **-R***,* **-Z***,* **-l***,* **-u***) are only applied to the expanded value at the point* of a parameter expansion expression using \\`**\\$***\\'. They are not applied* when a parameter is retrieved internally by the shell for any purpose.\n>\n> The following attribute flags may be specified:\n>\n> **-A** The names refer to associative array parameters; see \\`Array Parameters\\' in *zshparam(1).*\n>\n> **-L** *\\[ n \\]*\n>\n> :   Left justify and remove leading blanks from the value when the parameter is expanded. If *n is nonzero, it defines the width of the field.* If *n is zero, the width is determined by the width of the value of* the first assignment. In the case of numeric parameters, the length of the complete value assigned to the parameter is used to determine the width, not the value that would be output.\n>\n>     The width is the count of characters, which may be multibyte characters if the **MULTIBYTE** *option is in effect. Note that the screen* width of the character is not taken into account; if this is required, use padding with parameter expansion flags **\\${(ml***\\...***)***\\...***}** *as described in* \\`Parameter Expansion Flags\\' in *zshexpn(1).*\n>\n>     When the parameter is expanded, it is filled on the right with blanks or truncated if necessary to fit the field. Note truncation can lead to unexpected results with numeric parameters. Leading zeros are removed if the **-Z** *flag is also set.*\n>\n> **-R** *\\[ n \\]*\n>\n> :   Similar to **-L***, except that right justification is used;* when the parameter is expanded, the field is left filled with blanks or truncated from the end. May not be combined with the **-Z** flag.\n>\n> **-U**\n>\n> :   For arrays (but not for associative arrays), keep only the first occurrence of each duplicated value. This may also be set for tied parameters (see **-T***) or colon-separated special parameters like* **PATH** *or* **FIGNORE***, etc. Note the flag takes effect on assignment,* and the type of the variable being assigned to is determinative; for variables with shared values it is therefore recommended to set the flag for all interfaces, e.g. \\`**typeset -U PATH path***\\'.*\n>\n>     This flag has a different meaning when used with **-f***; see below.*\n>\n> **-Z** *\\[ n \\]*\n>\n> :   Specially handled if set along with the **-L** *flag.* Otherwise, similar to **-R***, except that leading zeros are used for* padding instead of blanks if the first non-blank character is a digit. Numeric parameters are specially handled: they are always eligible for padding with zeroes, and the zeroes are inserted at an appropriate place in the output.\n>\n> **-a**\n>\n> :   The names refer to array parameters. An array parameter may be created this way, but it may be assigned to in the **typeset** statement only if the reserved word form of **typeset** *is enabled* (as it is by default). When displaying, both normal and associative arrays are shown.\n>\n> **-f**\n>\n> :   The names refer to functions rather than parameters. No assignments can be made, and the only other valid flags are **-t***,* **-T***,* **-k***,* **-u***,* **-U** *and* **-z***. The flag* **-t** *turns on execution tracing* for this function; the flag **-T** *does the same, but turns off tracing* for any named (not anonymous) function called from the present one, unless that function also has the **-t** *or* **-T** *flag. The* **-u** *and* **-U** *flags cause the* function to be marked for autoloading; **-U** *also causes alias* expansion to be suppressed when the function is loaded. See the description of the \\`**autoload***\\' builtin for details.*\n>\n>     Note that the builtin **functions** *provides the same basic capabilities* as **typeset -f** *but gives access to a few extra options;* **autoload** gives further additional options for the case **typeset -fu** *and* **typeset -fU***.*\n>\n> **-h**\n>\n> :   Hide: only useful for special parameters (those marked \\`\\<S\\>\\' in the table in *zshparam(1)), and for local parameters with the same name as a special parameter,* though harmless for others. A special parameter with this attribute will not retain its special effect when made local. Thus after \\`**typeset -h** PATH*\\', a function containing \\`***typeset PATH***\\' will create an ordinary* local parameter without the usual behaviour of **PATH***. Alternatively,* the local parameter may itself be given this attribute; hence inside a function \\`**typeset -h PATH***\\' creates an ordinary local parameter and the* special **PATH** *parameter is not altered in any way. It is also possible* to create a local parameter using \\`**typeset +h** *special\\', where the* local copy of *special will retain its special properties regardless of* having the **-h** *attribute. Global special parameters loaded from shell* modules (currently those in **zsh/mapfile** *and* **zsh/parameter***) are* automatically given the **-h** *attribute to avoid name clashes.*\n>\n> **-H**\n>\n> :   Hide value: specifies that **typeset** *will not display the value of the* parameter when listing parameters; the display for such parameters is always as if the \\`**+***\\' flag had been given. Use of the parameter is* in other respects normal, and the option does not apply if the parameter is specified by name, or by pattern with the **-m** *option. This is on by* default for the parameters in the **zsh/parameter** *and* **zsh/mapfile** modules. Note, however, that unlike the **-h** *flag this is also useful* for non-special parameters.\n>\n> **-i** *\\[ n \\]*\n>\n> :   Use an internal integer representation. If *n is nonzero it* defines the output arithmetic base, otherwise it is determined by the first assignment. Bases from 2 to 36 inclusive are allowed.\n>\n> **-E** *\\[ n \\]*\n>\n> :   Use an internal double-precision floating point representation. On output the variable will be converted to scientific notation. If *n is* nonzero it defines the number of significant figures to display; the default is ten.\n>\n> **-F** *\\[ n \\]*\n>\n> :   Use an internal double-precision floating point representation. On output the variable will be converted to fixed-point decimal notation. If *n* is nonzero it defines the number of digits to display after the decimal point; the default is ten.\n>\n> **-l**\n>\n> :   Convert the result to lower case whenever the parameter is expanded. The value is *not converted when assigned.*\n>\n> **-r**\n>\n> :   The given *names are marked readonly. Note that if name is a* special parameter, the readonly attribute can be turned on, but cannot then be turned off.\n>\n>     If the **POSIX_BUILTINS** *option is set, the readonly attribute is* more restrictive: unset variables can be marked readonly and cannot then be set; furthermore, the readonly attribute cannot be removed from any variable.\n>\n>     It is still possible to change other attributes of the variable though, some of which like **-U** *or* **-Z** *would affect the value. More generally,* the readonly attribute should not be relied on as a security mechanism.\n>\n>     Note that in zsh (like in pdksh but unlike most other shells) it is still possible to create a local variable of the same name as this is considered a different variable (though this variable, too, can be marked readonly). Special variables that have been made readonly retain their value and readonly attribute when made local.\n>\n> **-t**\n>\n> :   Tags the named parameters. Tags have no special meaning to the shell. This flag has a different meaning when used with **-f***; see above.*\n>\n> **-u**\n>\n> :   Convert the result to upper case whenever the parameter is expanded. The value is *not converted when assigned.* This flag has a different meaning when used with **-f***; see above.*\n>\n> **-x**\n>\n> :   Mark for automatic export to the environment of subsequently executed commands. If the option **GLOBAL_EXPORT** *is set, this implies* the option **-g***, unless* **+g** *is also explicitly given; in other words* the parameter is not made local to the enclosing function. This is for compatibility with previous versions of zsh.\n",
+    "description": "*\\[* **+** *\\| SCALAR\\[***=***value\\] array\\[***=(***value \\...***)***\\] \\[ sep \\] \\]*\n\n**typeset** **-f** *\\[ {***+***\\|***-***}***TUkmtuz** *\\] \\[* **+** *\\] \\[ name \\... \\]* Set or display attributes and values for shell parameters.\n\n> Except as noted below for control flags that change the behavior, a parameter is created for each *name that does not already refer* to one. When inside a function, a new parameter is created for every *name (even those that already exist), and is unset again when the* function completes. See \\`Local Parameters\\' in *zshparam(1). The same rules apply to special shell parameters, which* retain their special attributes when made local.\n>\n> For each *name***=***value assignment, the parameter* *name is set to value. If the assignment is omitted and name* does *not refer to an existing parameter, a new parameter is intialized* to empty string, zero, or empty array (as appropriate), *unless the* shell option **TYPESET_TO_UNSET** *is set. When that option is set,* the parameter attributes are recorded but the parameter remains unset.\n>\n> If the shell option **TYPESET_SILENT** *is not set, for each remaining* *name that refers to a parameter that is already set, the name and* value of the parameter are printed in the form of an assignment. Nothing is printed for newly-created parameters, or when any attribute flags listed below are given along with the *name. Using* \\`**+***\\' instead of minus to introduce an attribute turns it off.*\n>\n> If no *name is present, the names and values of all parameters are* printed. In this case the attribute flags restrict the display to only those parameters that have the specified attributes, and using \\`**+***\\'* rather than \\`**-***\\' to introduce the flag suppresses printing of the values* of parameters when there is no parameter name.\n>\n> All forms of the command handle scalar assignment. Array assignment is possible if any of the reserved words **declare***,* **export***,* **float***,* **integer***,* **local***,* **readonly** *or* **typeset** *is matched when the* line is parsed (N.B. not when it is executed). In this case the arguments are parsed as assignments, except that the \\`**+=***\\' syntax and the* **GLOB_ASSIGN** *option are not supported, and scalar values after* **=** are *not split further into words, even if expanded (regardless of the* setting of the **KSH_TYPESET** *option; this option is obsolete).*\n>\n> Examples of the differences between command and reserved word parsing:\n>\n> > # Reserved word parsing\n> >     typeset svar=$(echo one word) avar=(several words)\n>\n> The above creates a scalar parameter **svar** *and an array* parameter **avar** *as if the assignments had been*\n>\n> > svar=\"one word\"\n> >     avar=(several words)\n>\n> On the other hand:\n>\n> > # Normal builtin interface\n> >     builtin typeset svar=$(echo two words)\n>\n> The **builtin** *keyword causes the above to use the standard builtin* interface to **typeset** *in which argument parsing is performed in the same* way as for other commands. This example creates a scalar **svar** containing the value **two** *and another scalar parameter* **words** *with* no value. An array value in this case would either cause an error or be treated as an obscure set of glob qualifiers.\n>\n> Arbitrary arguments are allowed if they take the form of assignments after command line expansion; however, these only perform scalar assignment:\n>\n> > var='svar=val'\n> >     typeset $var\n>\n> The above sets the scalar parameter **svar** *to the value* **val***.* Parentheses around the value within **var** *would not cause array* assignment as they will be treated as ordinary characters when **\\$var** is substituted. Any non-trivial expansion in the name part of the assignment causes the argument to be treated in this fashion:\n>\n> > typeset {var1,var2,var3}=name\n>\n> The above syntax is valid, and has the expected effect of setting the three parameters to the same value, but the command line is parsed as a set of three normal command line arguments to **typeset** *after* expansion. Hence it is not possible to assign to multiple arrays by this means.\n>\n> Note that each interface to any of the commands may be disabled separately. For example, \\`**disable -r typeset***\\' disables the reserved* word interface to **typeset***, exposing the builtin interface, while* \\`**disable typeset***\\' disables the builtin. Note that disabling the* reserved word interface for **typeset** *may cause problems with the* output of \\`**typeset -p***\\', which assumes the reserved word interface is* available in order to restore array and associative array values.\n>\n> Unlike parameter assignment statements, **typeset***\\'s exit status on an* assignment that involves a command substitution does not reflect the exit status of the command substitution. Therefore, to test for an error in a command substitution, separate the declaration of the parameter from its initialization:\n>\n> > # WRONG\n> >     typeset var1=$(exit 1) || echo \"Trouble with var1\"\n> >\n> >     # RIGHT\n> >     typeset var1 && var1=$(exit 1) || echo \"Trouble with var1\"\n>\n> To initialize a parameter *param to a command output and mark it readonly,* use **typeset -r** *param or* **readonly** *param after the parameter* assignment statement.\n>\n> If no attribute flags are given, and either no *name arguments are* present or the flag **+m** *is used, then each parameter name printed is* preceded by a list of the attributes of that parameter (**array***,* **association***,* **exported***,* **float***,* **integer***,* **readonly***,* or **undefined** *for autoloaded parameters not yet loaded). If* **+m** *is* used with attribute flags, and all those flags are introduced with **+***, the matching parameter names are printed but their values* are not.\n>\n> The following control flags change the behavior of **typeset***:*\n>\n> **+** If \\`**+***\\' appears by itself in a separate word as the last option,* then the names of all parameters (functions with **-f***) are printed, but* the values (function bodies) are not. No *name arguments may appear,* and it is an error for any other options to follow \\`**+***\\'. The* effect of \\`**+***\\' is as if all attribute flags which precede it were* given with a \\`**+***\\' prefix. For example, \\`***typeset -U +***\\' is* equivalent to \\`**typeset +U***\\' and displays the names of all arrays having* the uniqueness attribute, whereas \\`**typeset -f -U +***\\' displays the* names of all autoloadable functions. If **+** *is the only option,* then type information (array, readonly, etc.) is also printed for each parameter, in the same manner as \\`**typeset +m \\\"\\*\\\"***\\'.*\n>\n> **-g**\n>\n> :   The **-g** *(global) means that any resulting parameter will not be* restricted to local scope. Note that this does not necessarily mean that the parameter will be global, as the flag will apply to any existing parameter (even if unset) from an enclosing function. This flag does not affect the parameter after creation, hence it has no effect when listing existing parameters, nor does the flag **+g** *have any effect except in* combination with **-m** *(see below).*\n>\n> **-m**\n>\n> :   If the **-m** *flag is given the name arguments are taken as patterns* (use quoting to prevent these from being interpreted as file patterns). With no attribute flags, all parameters (or functions with the **-f** flag) with matching names are printed (the shell option **TYPESET_SILENT** is not used in this case).\n>\n>     If the **+g** *flag is combined with* **-m***, a new local parameter is* created for every matching parameter that is not already local. Otherwise **-m** *applies all other flags or assignments to the existing parameters.*\n>\n>     Except when assignments are made with *name***=***value, using* **+m** *forces the matching parameters and their attributes to be printed,* even inside a function. Note that **-m** *is ignored if no patterns are* given, so \\`**typeset -m***\\' displays attributes but \\`***typeset -a +m***\\'* does not.\n>\n> **-p** *\\[ n \\]*\n>\n> :   If the **-p** *option is given, parameters and values are printed in the* form of a typeset command with an assignment, regardless of other flags and options. Note that the **-H** *flag on parameters is respected; no* value will be shown for these parameters.\n>\n>     **-p** *may be followed by an optional integer argument. Currently* only the value **1** *is supported. In this case arrays and associative* arrays are printed with newlines between indented elements for readability.\n>\n> **-T** *\\[ scalar\\[***=***value\\] array\\[***=(***value \\...***)***\\] \\[ sep \\] \\]*\n>\n> :   This flag has a different meaning when used with **-f***; see below.* Otherwise the **-T** *option requires zero, two, or three arguments to be* present. With no arguments, the list of parameters created in this fashion is shown. With two or three arguments, the first two are the name of a scalar and of an array parameter (in that order) that will be tied together in the manner of **\\$PATH** *and* **\\$path***. The optional third* argument is a single-character separator which will be used to join the elements of the array to form the scalar; if absent, a colon is used, as with **\\$PATH***. Only the first character of the separator is significant;* any remaining characters are ignored. Multibyte characters are not yet supported.\n>\n>     Only one of the scalar and array parameters may be assigned an initial value (the restrictions on assignment forms described above also apply).\n>\n>     Both the scalar and the array may be manipulated as normal. If one is unset, the other will automatically be unset too. There is no way of untying the variables without unsetting them, nor of converting the type of one of them with another **typeset** *command;* **+T** *does not work,* assigning an array to *scalar is an error, and assigning a scalar to* *array sets it to be a single-element array.*\n>\n>     Note that both \\`**typeset -xT \\...***\\' and \\`***export -T \\...***\\' work, but* only the scalar will be marked for export. Setting the value using the scalar version causes a split on all separators (which cannot be quoted). It is possible to apply **-T** *to two previously tied variables but with a* different separator character, in which case the variables remain joined as before but the separator is changed.\n>\n>     When an existing scalar is tied to a new array, the value of the scalar is preserved but no attribute other than export will be preserved.\n>\n> Attribute flags that transform the final value (**-L***,* **-R***,* **-Z***,* **-l***,* **-u***) are only applied to the expanded value at the point* of a parameter expansion expression using \\`**\\$***\\'. They are not applied* when a parameter is retrieved internally by the shell for any purpose.\n>\n> The following attribute flags may be specified:\n>\n> **-A** The names refer to associative array parameters; see \\`Array Parameters\\' in *zshparam(1).*\n>\n> **-L** *\\[ n \\]*\n>\n> :   Left justify and remove leading blanks from the value when the parameter is expanded. If *n is nonzero, it defines the width of the field.* If *n is zero, the width is determined by the width of the value of* the first assignment. In the case of numeric parameters, the length of the complete value assigned to the parameter is used to determine the width, not the value that would be output.\n>\n>     The width is the count of characters, which may be multibyte characters if the **MULTIBYTE** *option is in effect. Note that the screen* width of the character is not taken into account; if this is required, use padding with parameter expansion flags **\\${(ml***\\...***)***\\...***}** *as described in* \\`Parameter Expansion Flags\\' in *zshexpn(1).*\n>\n>     When the parameter is expanded, it is filled on the right with blanks or truncated if necessary to fit the field. Note truncation can lead to unexpected results with numeric parameters. Leading zeros are removed if the **-Z** *flag is also set.*\n>\n> **-R** *\\[ n \\]*\n>\n> :   Similar to **-L***, except that right justification is used;* when the parameter is expanded, the field is left filled with blanks or truncated from the end. May not be combined with the **-Z** flag.\n>\n> **-U**\n>\n> :   For arrays (but not for associative arrays), keep only the first occurrence of each duplicated value. This may also be set for tied parameters (see **-T***) or colon-separated special parameters like* **PATH** *or* **FIGNORE***, etc. Note the flag takes effect on assignment,* and the type of the variable being assigned to is determinative; for variables with shared values it is therefore recommended to set the flag for all interfaces, e.g. \\`**typeset -U PATH path***\\'.*\n>\n>     This flag has a different meaning when used with **-f***; see below.*\n>\n> **-Z** *\\[ n \\]*\n>\n> :   Specially handled if set along with the **-L** *flag.* Otherwise, similar to **-R***, except that leading zeros are used for* padding instead of blanks if the first non-blank character is a digit. Numeric parameters are specially handled: they are always eligible for padding with zeroes, and the zeroes are inserted at an appropriate place in the output.\n>\n> **-a**\n>\n> :   The names refer to array parameters. An array parameter may be created this way, but it may be assigned to in the **typeset** statement only if the reserved word form of **typeset** *is enabled* (as it is by default). When displaying, both normal and associative arrays are shown.\n>\n> **-f**\n>\n> :   The names refer to functions rather than parameters. No assignments can be made, and the only other valid flags are **-t***,* **-T***,* **-k***,* **-u***,* **-U** *and* **-z***. The flag* **-t** *turns on execution tracing* for this function; the flag **-T** *does the same, but turns off tracing* for any named (not anonymous) function called from the present one, unless that function also has the **-t** *or* **-T** *flag. The* **-u** *and* **-U** *flags cause the* function to be marked for autoloading; **-U** *also causes alias* expansion to be suppressed when the function is loaded. See the description of the \\`**autoload***\\' builtin for details.*\n>\n>     Note that the builtin **functions** *provides the same basic capabilities* as **typeset -f** *but gives access to a few extra options;* **autoload** gives further additional options for the case **typeset -fu** *and* **typeset -fU***.*\n>\n> **-h**\n>\n> :   Hide: only useful for special parameters (those marked \\`\\<S\\>\\' in the table in *zshparam(1)), and for local parameters with the same name as a special parameter,* though harmless for others. A special parameter with this attribute will not retain its special effect when made local. Thus after \\`**typeset -h** PATH*\\', a function containing \\`***typeset PATH***\\' will create an ordinary* local parameter without the usual behaviour of **PATH***. Alternatively,* the local parameter may itself be given this attribute; hence inside a function \\`**typeset -h PATH***\\' creates an ordinary local parameter and the* special **PATH** *parameter is not altered in any way. It is also possible* to create a local parameter using \\`**typeset +h** *special\\', where the* local copy of *special will retain its special properties regardless of* having the **-h** *attribute. Global special parameters loaded from shell* modules (currently those in **zsh/mapfile** *and* **zsh/parameter***) are* automatically given the **-h** *attribute to avoid name clashes.*\n>\n> **-H**\n>\n> :   Hide value: specifies that **typeset** *will not display the value of the* parameter when listing parameters; the display for such parameters is always as if the \\`**+***\\' flag had been given. Use of the parameter is* in other respects normal, and the option does not apply if the parameter is specified by name, or by pattern with the **-m** *option. This is on by* default for the parameters in the **zsh/parameter** *and* **zsh/mapfile** modules. Note, however, that unlike the **-h** *flag this is also useful* for non-special parameters.\n>\n> **-i** *\\[ n \\]*\n>\n> :   Use an internal integer representation. If *n is nonzero it* defines the output arithmetic base, otherwise it is determined by the first assignment. Bases from 2 to 36 inclusive are allowed.\n>\n> **-E** *\\[ n \\]*\n>\n> :   Use an internal double-precision floating point representation. On output the variable will be converted to scientific notation. If *n is* nonzero it defines the number of significant figures to display; the default is ten.\n>\n> **-F** *\\[ n \\]*\n>\n> :   Use an internal double-precision floating point representation. On output the variable will be converted to fixed-point decimal notation. If *n* is nonzero it defines the number of digits to display after the decimal point; the default is ten.\n>\n> **-l**\n>\n> :   Convert the result to lower case whenever the parameter is expanded. The value is *not converted when assigned.*\n>\n> **-r**\n>\n> :   The given *names are marked readonly. Note that if name is a* special parameter, the readonly attribute can be turned on, but cannot then be turned off.\n>\n>     If the **POSIX_BUILTINS** *option is set, the readonly attribute is* more restrictive: unset variables can be marked readonly and cannot then be set; furthermore, the readonly attribute cannot be removed from any variable.\n>\n>     It is still possible to change other attributes of the variable though, some of which like **-U** *or* **-Z** *would affect the value. More generally,* the readonly attribute should not be relied on as a security mechanism.\n>\n>     Note that in zsh (like in pdksh but unlike most other shells) it is still possible to create a local variable of the same name as this is considered a different variable (though this variable, too, can be marked readonly). Special variables that have been made readonly retain their value and readonly attribute when made local.\n>\n> **-t**\n>\n> :   Tags the named parameters. Tags have no special meaning to the shell. This flag has a different meaning when used with **-f***; see above.*\n>\n> **-u**\n>\n> :   Convert the result to upper case whenever the parameter is expanded. The value is *not converted when assigned.* This flag has a different meaning when used with **-f***; see above.*\n>\n> **-x**\n>\n> :   Mark for automatic export to the environment of subsequently executed commands. If the option **GLOBAL_EXPORT** *is set, this implies* the option **-g***, unless* **+g** *is also explicitly given; in other words* the parameter is not made local to the enclosing function. This is for compatibility with previous versions of zsh.",
     "args": "typeset -T [ {+|-}Uglrux ] [ {+|-}LRZp [ n ] ]"
   },
   "ulimit": {
     "shortDescription": "Set or display resource limits",
-    "description": ":   Set or display resource limits of the shell and the processes started by the shell. The value of *limit can be a number in the unit specified* below or one of the values \\`**unlimited***\\', which removes the limit on the* resource, or \\`**hard***\\', which uses the current value of the hard limit on* the resource.\n\n    By default, only soft limits are manipulated. If the **-H** *flag* is given use hard limits instead of soft limits. If the **-S** *flag is given* together with the **-H** *flag set both hard and soft limits.*\n\n    If no options are used, the file size limit (**-f***) is assumed.*\n\n    If *limit is omitted the current value of the specified resources are* printed. When more than one resource value is printed, the limit name and unit is printed before each value.\n\n    When looping over multiple resources, the shell will abort immediately if it detects a badly formed argument. However, if it fails to set a limit for some other reason it will continue trying to set the remaining limits.\n\n    Not all the following resources are supported on all systems. Running **ulimit -a** *will show which are supported.*\n\n    **-a**\n\n    :   Lists all of the current resource limits.\n\n    **-b**\n\n    :   Socket buffer size in bytes (N.B. not kilobytes)\n\n    **-c**\n\n    :   512-byte blocks on the size of core dumps.\n\n    **-d**\n\n    :   Kilobytes on the size of the data segment.\n\n    **-f**\n\n    :   512-byte blocks on the size of files written.\n\n    **-i**\n\n    :   The number of pending signals.\n\n    **-k**\n\n    :   The number of kqueues allocated.\n\n    **-l**\n\n    :   Kilobytes on the size of locked-in memory.\n\n    **-m**\n\n    :   Kilobytes on the size of physical memory.\n\n    **-n**\n\n    :   open file descriptors.\n\n    **-p**\n\n    :   The number of pseudo-terminals.\n\n    **-q**\n\n    :   Bytes in POSIX message queues.\n\n    **-r**\n\n    :   Maximum real time priority. On some systems where this is not available, such as NetBSD, this has the same effect as **-T** for compatibility with **sh***.*\n\n    **-s**\n\n    :   Kilobytes on the size of the stack.\n\n    **-T**\n\n    :   The number of simultaneous threads available to the user.\n\n    **-t**\n\n    :   CPU seconds to be used.\n\n    **-u**\n\n    :   The number of processes available to the user.\n\n    **-v**\n\n    :   Kilobytes on the size of virtual memory. On some systems this refers to the limit called \\`address space\\'.\n\n    **-w**\n\n    :   Kilobytes on the size of swapped out memory.\n\n    **-x**\n\n    :   The number of locks on files.\n\n    A resource may also be specified by integer in the form \\`**-N** *resource\\', where resource corresponds to the integer defined for* the resource by the operating system. This may be used to set the limits for resources known to the shell which do not correspond to option letters. Such limits will be shown by number in the output of \\`**ulimit -a***\\'.*\n\n    The number may alternatively be out of the range of limits compiled into the shell. The shell will try to read or write the limit anyway, and will report an error if this fails.\n",
+    "description": ":   Set or display resource limits of the shell and the processes started by the shell. The value of *limit can be a number in the unit specified* below or one of the values \\`**unlimited***\\', which removes the limit on the* resource, or \\`**hard***\\', which uses the current value of the hard limit on* the resource.\n\n    By default, only soft limits are manipulated. If the **-H** *flag* is given use hard limits instead of soft limits. If the **-S** *flag is given* together with the **-H** *flag set both hard and soft limits.*\n\n    If no options are used, the file size limit (**-f***) is assumed.*\n\n    If *limit is omitted the current value of the specified resources are* printed. When more than one resource value is printed, the limit name and unit is printed before each value.\n\n    When looping over multiple resources, the shell will abort immediately if it detects a badly formed argument. However, if it fails to set a limit for some other reason it will continue trying to set the remaining limits.\n\n    Not all the following resources are supported on all systems. Running **ulimit -a** *will show which are supported.*\n\n    **-a**\n\n    :   Lists all of the current resource limits.\n\n    **-b**\n\n    :   Socket buffer size in bytes (N.B. not kilobytes)\n\n    **-c**\n\n    :   512-byte blocks on the size of core dumps.\n\n    **-d**\n\n    :   Kilobytes on the size of the data segment.\n\n    **-f**\n\n    :   512-byte blocks on the size of files written.\n\n    **-i**\n\n    :   The number of pending signals.\n\n    **-k**\n\n    :   The number of kqueues allocated.\n\n    **-l**\n\n    :   Kilobytes on the size of locked-in memory.\n\n    **-m**\n\n    :   Kilobytes on the size of physical memory.\n\n    **-n**\n\n    :   open file descriptors.\n\n    **-p**\n\n    :   The number of pseudo-terminals.\n\n    **-q**\n\n    :   Bytes in POSIX message queues.\n\n    **-r**\n\n    :   Maximum real time priority. On some systems where this is not available, such as NetBSD, this has the same effect as **-T** for compatibility with **sh***.*\n\n    **-s**\n\n    :   Kilobytes on the size of the stack.\n\n    **-T**\n\n    :   The number of simultaneous threads available to the user.\n\n    **-t**\n\n    :   CPU seconds to be used.\n\n    **-u**\n\n    :   The number of processes available to the user.\n\n    **-v**\n\n    :   Kilobytes on the size of virtual memory. On some systems this refers to the limit called \\`address space\\'.\n\n    **-w**\n\n    :   Kilobytes on the size of swapped out memory.\n\n    **-x**\n\n    :   The number of locks on files.\n\n    A resource may also be specified by integer in the form \\`**-N** *resource\\', where resource corresponds to the integer defined for* the resource by the operating system. This may be used to set the limits for resources known to the shell which do not correspond to option letters. Such limits will be shown by number in the output of \\`**ulimit -a***\\'.*\n\n    The number may alternatively be out of the range of limits compiled into the shell. The shell will try to read or write the limit anyway, and will report an error if this fails.",
     "args": "ulimit [ -HSa ] [ { -bcdfiklmnpqrsTtvwx | -N resource } [ limit ] ... ]"
   },
   "umask": {
     "shortDescription": "Set file creation mask",
-    "description": ":   The umask is set to *mask. mask can be either* an octal number or a symbolic value as described in the *chmod(1) man page.* If *mask is omitted, the current value is printed. The* **-S** option causes the mask to be printed as a symbolic value. Otherwise, the mask is printed as an octal number. Note that in the symbolic form the permissions you specify are those which are to be allowed (not denied) to the users specified.\n",
+    "description": ":   The umask is set to *mask. mask can be either* an octal number or a symbolic value as described in the *chmod(1) man page.* If *mask is omitted, the current value is printed. The* **-S** option causes the mask to be printed as a symbolic value. Otherwise, the mask is printed as an octal number. Note that in the symbolic form the permissions you specify are those which are to be allowed (not denied) to the users specified.",
     "args": "umask [ -S ] [ mask ]"
   },
   "unalias": {
     "shortDescription": "Removes aliases",
-    "description": ":   Removes aliases. This command works the same as **unhash -a***, except that* the **-a** *option removes all regular or global aliases, or with* **-s** all suffix aliases: in this case no *name arguments may appear. The* options **-m** *(remove by pattern) and* **-s** *without* **-a** *(remove* listed suffix aliases) behave as for **unhash -a***. Note that* the meaning of **-a** *is different between* **unalias** *and* **unhash***.*\n",
+    "description": ":   Removes aliases. This command works the same as **unhash -a***, except that* the **-a** *option removes all regular or global aliases, or with* **-s** all suffix aliases: in this case no *name arguments may appear. The* options **-m** *(remove by pattern) and* **-s** *without* **-a** *(remove* listed suffix aliases) behave as for **unhash -a***. Note that* the meaning of **-a** *is different between* **unalias** *and* **unhash***.*",
     "args": "unalias [ -ams ] name ..."
   },
   "unfunction": {
     "shortDescription": "Remove function definition",
-    "description": ":   Same as **unhash -f***.*\n",
+    "description": ":   Same as **unhash -f***.*",
     "args": "unfunction"
   },
   "unhash": {
     "shortDescription": "Remove command from hash table",
-    "description": ":   Remove the element named *name from an internal hash table. The* default is remove elements from the command hash table. The **-a** option causes **unhash** *to remove regular or global aliases; note* when removing a global aliases that the argument must be quoted to prevent it from being expanded before being passed to the command. The **-s** *option causes* **unhash** *to remove suffix aliases.* The **-f** *option causes* **unhash** *to remove shell functions. The* **-d** *options causes* **unhash** *to remove named directories. If the* **-m** *flag is given* the arguments are taken as patterns (should be quoted) and all elements of the corresponding hash table with matching names will be removed.\n",
+    "description": ":   Remove the element named *name from an internal hash table. The* default is remove elements from the command hash table. The **-a** option causes **unhash** *to remove regular or global aliases; note* when removing a global aliases that the argument must be quoted to prevent it from being expanded before being passed to the command. The **-s** *option causes* **unhash** *to remove suffix aliases.* The **-f** *option causes* **unhash** *to remove shell functions. The* **-d** *options causes* **unhash** *to remove named directories. If the* **-m** *flag is given* the arguments are taken as patterns (should be quoted) and all elements of the corresponding hash table with matching names will be removed.",
     "args": "unhash [ -adfms ] name ..."
   },
   "unlimit": {
     "shortDescription": "Remove resource limits",
-    "description": ":   The resource limit for each *resource is set to the hard limit.* If the **-h** *flag is given and the shell has appropriate privileges,* the hard resource limit for each *resource is removed.* The resources of the shell process are only changed if the **-s** flag is given.\n\n    The **unlimit** *command is not made available by default when the* shell starts in a mode emulating another shell. It can be made available with the command \\`**zmodload -F zsh/rlimits b:unlimit***\\'.*\n",
+    "description": ":   The resource limit for each *resource is set to the hard limit.* If the **-h** *flag is given and the shell has appropriate privileges,* the hard resource limit for each *resource is removed.* The resources of the shell process are only changed if the **-s** flag is given.\n\n    The **unlimit** *command is not made available by default when the* shell starts in a mode emulating another shell. It can be made available with the command \\`**zmodload -F zsh/rlimits b:unlimit***\\'.*",
     "args": "unlimit [ -hs ] resource ..."
   },
   "unset": {
     "shortDescription": "Unset values and attributes of variables",
-    "description": ":   Each named parameter is unset. Local parameters remain local even if unset; they appear unset within scope, but the previous value will still reappear when the scope ends.\n\n    Individual elements of associative array parameters may be unset by using subscript syntax on *name, which should be quoted (or the entire command* prefixed with **noglob***) to protect the subscript from filename generation.*\n\n    If the **-m** *flag is specified the arguments are taken as patterns (should* be quoted) and all parameters with matching names are unset. Note that this cannot be used when unsetting associative array elements, as the subscript will be treated as part of the pattern.\n\n    The **-v** *flag specifies that name refers to parameters. This is the* default behaviour.\n\n    **unset -f** *is equivalent to* **unfunction***.*\n",
+    "description": ":   Each named parameter is unset. Local parameters remain local even if unset; they appear unset within scope, but the previous value will still reappear when the scope ends.\n\n    Individual elements of associative array parameters may be unset by using subscript syntax on *name, which should be quoted (or the entire command* prefixed with **noglob***) to protect the subscript from filename generation.*\n\n    If the **-m** *flag is specified the arguments are taken as patterns (should* be quoted) and all parameters with matching names are unset. Note that this cannot be used when unsetting associative array elements, as the subscript will be treated as part of the pattern.\n\n    The **-v** *flag specifies that name refers to parameters. This is the* default behaviour.\n\n    **unset -f** *is equivalent to* **unfunction***.*",
     "args": "unset [ -fmv ] name ..."
   },
   "unsetopt": {
     "shortDescription": "Unset shell options",
-    "description": ":   Unset the options for the shell. All options specified either with flags or by name are unset. If no arguments are supplied, the names of all options currently unset are printed. If the **-m** *flag is given the arguments are taken as patterns* (which should be quoted to preserve them from being interpreted as glob patterns), and all options with names matching these patterns are unset.\n",
+    "description": ":   Unset the options for the shell. All options specified either with flags or by name are unset. If no arguments are supplied, the names of all options currently unset are printed. If the **-m** *flag is given the arguments are taken as patterns* (which should be quoted to preserve them from being interpreted as glob patterns), and all options with names matching these patterns are unset.",
     "args": "unsetopt [ {+|-}options | {+|-}o option_name ] [ name ... ]"
   },
   "vared": {
     "shortDescription": "Edit shell variables",
-    "description": ":   See the section \\`Zle Builtins\\' in *zshzle(1).*\n",
+    "description": ":   See the section \\`Zle Builtins\\' in *zshzle(1).*",
     "args": "vared"
   },
   "wait": {
-    "description": ":   Wait for the specified jobs or processes. If *job is not given* then all currently active child processes are waited for. Each *job can be either a job specification or the process ID* of a job in the job table. The exit status from this command is that of the job waited for. If *job represents an unknown job or process ID, a warning is printed* (unless the **POSIX_BUILTINS** *option is set) and the exit status is 127.*\n\n    It is possible to wait for recent processes (specified by process ID, not by job) that were running in the background even if the process has exited. Typically the process ID will be recorded by capturing the value of the variable **\\$!** *immediately after the process has been* started. There is a limit on the number of process IDs remembered by the shell; this is given by the value of the system configuration parameter **CHILD_MAX***. When this limit is reached, older process IDs* are discarded, least recently started processes first.\n\n    Note there is no protection against the process ID wrapping, i.e. if the wait is not executed soon enough there is a chance the process waited for is the wrong one. A conflict implies both process IDs have been generated by the shell, as other processes are not recorded, and that the user is potentially interested in both, so this problem is intrinsic to process IDs.\n",
+    "description": ":   Wait for the specified jobs or processes. If *job is not given* then all currently active child processes are waited for. Each *job can be either a job specification or the process ID* of a job in the job table. The exit status from this command is that of the job waited for. If *job represents an unknown job or process ID, a warning is printed* (unless the **POSIX_BUILTINS** *option is set) and the exit status is 127.*\n\n    It is possible to wait for recent processes (specified by process ID, not by job) that were running in the background even if the process has exited. Typically the process ID will be recorded by capturing the value of the variable **\\$!** *immediately after the process has been* started. There is a limit on the number of process IDs remembered by the shell; this is given by the value of the system configuration parameter **CHILD_MAX***. When this limit is reached, older process IDs* are discarded, least recently started processes first.\n\n    Note there is no protection against the process ID wrapping, i.e. if the wait is not executed soon enough there is a chance the process waited for is the wrong one. A conflict implies both process IDs have been generated by the shell, as other processes are not recorded, and that the user is potentially interested in both, so this problem is intrinsic to process IDs.",
     "args": "wait [ job ... ]"
   },
   "whence": {
     "shortDescription": "Locate a command",
-    "description": ":   For each *name, indicate how it would be interpreted if used as a* command name.\n\n    If *name is not an alias, built-in command, external command, shell* function, hashed command, or a reserved word, the exit status shall be non-zero, and \\-- if **-v***,* **-c***, or* **-w** *was passed \\-- a message* will be written to standard output. (This is different from other shells that write that message to standard error.)\n\n    **whence** *is most useful when name is only the last path component* of a command, i.e. does not include a \\`**/***\\'; in particular, pattern* matching only succeeds if just the non-directory component of the command is passed.\n\n    **-v** Produce a more verbose report.\n\n    **-c**\n\n    :   Print the results in a **csh***-like format.* This takes precedence over **-v***.*\n\n    **-w**\n\n    :   For each *name, print \\`name***:** *word\\' where word* is one of **alias***,* **builtin***,* **command***,* **function***,* **hashed***,* **reserved** *or* **none***, according as name* corresponds to an alias, a built-in command, an external command, a shell function, a command defined with the **hash** *builtin, a* reserved word, or is not recognised. This takes precedence over **-v** *and* **-c***.*\n\n    **-f**\n\n    :   Causes the contents of a shell function to be displayed, which would otherwise not happen unless the **-c** flag were used.\n\n    **-p**\n\n    :   Do a path search for *name* even if it is an alias, reserved word, shell function or builtin.\n\n    **-a**\n\n    :   Do a search for all occurrences of *name* throughout the command path. Normally only the first occurrence is printed.\n\n    **-m**\n\n    :   The arguments are taken as patterns (pattern characters should be quoted), and the information is displayed for each command matching one of these patterns.\n\n    **-s**\n\n    :   If a pathname contains symlinks, print the symlink-free pathname as well.\n\n    **-S**\n\n    :   As **-s***, but if the pathname had to be resolved by following* multiple symlinks, the intermediate steps are printed, too. The symlink resolved at each step might be anywhere in the path.\n\n    **-x** *num*\n\n    :   Expand tabs when outputting shell functions using the **-c** *option.* This has the same effect as the **-x** *option to the* **functions** builtin.\n",
+    "description": ":   For each *name, indicate how it would be interpreted if used as a* command name.\n\n    If *name is not an alias, built-in command, external command, shell* function, hashed command, or a reserved word, the exit status shall be non-zero, and \\-- if **-v***,* **-c***, or* **-w** *was passed \\-- a message* will be written to standard output. (This is different from other shells that write that message to standard error.)\n\n    **whence** *is most useful when name is only the last path component* of a command, i.e. does not include a \\`**/***\\'; in particular, pattern* matching only succeeds if just the non-directory component of the command is passed.\n\n    **-v** Produce a more verbose report.\n\n    **-c**\n\n    :   Print the results in a **csh***-like format.* This takes precedence over **-v***.*\n\n    **-w**\n\n    :   For each *name, print \\`name***:** *word\\' where word* is one of **alias***,* **builtin***,* **command***,* **function***,* **hashed***,* **reserved** *or* **none***, according as name* corresponds to an alias, a built-in command, an external command, a shell function, a command defined with the **hash** *builtin, a* reserved word, or is not recognised. This takes precedence over **-v** *and* **-c***.*\n\n    **-f**\n\n    :   Causes the contents of a shell function to be displayed, which would otherwise not happen unless the **-c** flag were used.\n\n    **-p**\n\n    :   Do a path search for *name* even if it is an alias, reserved word, shell function or builtin.\n\n    **-a**\n\n    :   Do a search for all occurrences of *name* throughout the command path. Normally only the first occurrence is printed.\n\n    **-m**\n\n    :   The arguments are taken as patterns (pattern characters should be quoted), and the information is displayed for each command matching one of these patterns.\n\n    **-s**\n\n    :   If a pathname contains symlinks, print the symlink-free pathname as well.\n\n    **-S**\n\n    :   As **-s***, but if the pathname had to be resolved by following* multiple symlinks, the intermediate steps are printed, too. The symlink resolved at each step might be anywhere in the path.\n\n    **-x** *num*\n\n    :   Expand tabs when outputting shell functions using the **-c** *option.* This has the same effect as the **-x** *option to the* **functions** builtin.",
     "args": "whence [ -vcwfpamsS ] [ -x num ] name ..."
   },
   "where": {
     "shortDescription": "Locate a command",
-    "description": ":   Equivalent to **whence -ca***.*\n",
+    "description": ":   Equivalent to **whence -ca***.*",
     "args": "where [ -wpmsS ] [ -x num ] name ..."
   },
   "which": {
     "shortDescription": "Locate a command",
-    "description": ":   Equivalent to **whence -c***.*\n",
+    "description": ":   Equivalent to **whence -c***.*",
     "args": "which [ -wpamsS ] [ -x num ] name ..."
   },
   "zcompile": {
     "shortDescription": "Compile functions",
-    "description": "**zcompile -t** *file \\[ name \\... \\]* This builtin command can be used to compile functions or scripts, storing the compiled form in a file, and to examine files containing the compiled form. This allows faster autoloading of functions and sourcing of scripts by avoiding parsing of the text when the files are read.\n\n> The first form (without the **-c***,* **-a** *or* **-t** *options) creates a* compiled file. If only the *file argument is given, the* output file has the name \\`*file***.zwc***\\' and will be placed in* the same directory as the *file. The shell will load the compiled* file instead of the normal function file when the function is autoloaded; see the section \\`Autoloading Functions\\' in *zshmisc(1)* for a description of how autoloaded functions are searched. The extension **.zwc** *stands for \\`zsh word code\\'.*\n>\n> If there is at least one *name argument, all the named files* are compiled into the output *file given as the first argument. If* *file does not end in* **.zwc***, this extension is automatically* appended. Files containing multiple compiled functions are called \\`digest\\' files, and are intended to be used as elements of the **FPATH***/***fpath** special array.\n>\n> The second form, with the **-c** *or* **-a** *options, writes the compiled* definitions for all the named functions into *file. For* **-c***, the* names must be functions currently defined in the shell, not those marked for autoloading. Undefined functions that are marked for autoloading may be written by using the **-a** *option, in which case the* **fpath** is searched and the contents of the definition files for those functions, if found, are compiled into *file. If both* **-c** *and* **-a** *are given, names of both defined functions and functions marked* for autoloading may be given. In either case, the functions in files written with the **-c** *or* **-a** *option will be autoloaded as if the* **KSH_AUTOLOAD** *option were unset.*\n>\n> The reason for handling loaded and not-yet-loaded functions with different options is that some definition files for autoloading define multiple functions, including the function with the same name as the file, and, at the end, call that function. In such cases the output of \\`**zcompile -c***\\' does not include the additional functions defined in* the file, and any other initialization code in the file is lost. Using \\`**zcompile -a***\\' captures all this extra information.*\n>\n> If the **-m** *option is combined with* **-c** *or* **-a***,* the *names are used as patterns and all functions whose names* match one of these patterns will be written. If no *name is given,* the definitions of all functions currently defined or marked as autoloaded will be written.\n>\n> Note the second form cannot be used for compiling functions that include redirections as part of the definition rather than within the body of the function; for example\n>\n> > fn1() { { ... } >~/logfile }\n>\n> can be compiled but\n>\n> > fn1() { ... } >~/logfile\n>\n> cannot. It is possible to use the first form of **zcompile** *to compile* autoloadable functions that include the full function definition instead of just the body of the function.\n>\n> The third form, with the **-t** *option, examines an existing* compiled file. Without further arguments, the names of the original files compiled into it are listed. The first line of output shows the version of the shell which compiled the file and how the file will be used (i.e. by reading it directly or by mapping it into memory). With arguments, nothing is output and the return status is set to zero if definitions for *all names were found in the compiled* file, and non-zero if the definition for at least one *name was not* found.\n>\n> Other options:\n>\n> **-U** Aliases are not expanded when compiling the *named files.*\n>\n> **-R**\n>\n> :   When the compiled file is read, its contents are copied into the shell\\'s memory, rather than memory-mapped (see **-M***). This* happens automatically on systems that do not support memory mapping.\n>\n>     When compiling scripts instead of autoloadable functions, it is often desirable to use this option; otherwise the whole file, including the code to define functions which have already been defined, will remain mapped, consequently wasting memory.\n>\n> **-M**\n>\n> :   The compiled file is mapped into the shell\\'s memory when read. This is done in such a way that multiple instances of the shell running on the same host will share this mapped file. If neither **-R** *nor* **-M** *is given, the* **zcompile** *builtin decides what to do based* on the size of the compiled file.\n>\n> **-k**\n>\n> **-z** These options are used when the compiled file contains functions which are to be autoloaded. If **-z** *is given, the* function will be autoloaded as if the **KSH_AUTOLOAD** *option is* *not set, even if it is set at the time the compiled file is* read, while if the **-k** *is given, the function will be loaded as if* **KSH_AUTOLOAD** *is set. These options also take precedence over* any **-k** *or* **-z** *options specified to the* **autoload** *builtin. If* neither of these options is given, the function will be loaded as determined by the setting of the **KSH_AUTOLOAD** *option at the time* the compiled file is read. These options may also appear as many times as necessary between the listed *names to specify the loading style of all following functions, up to* the next **-k** *or* **-z***.*\n>\n> The created file always contains two versions of the compiled format, one for big-endian machines and one for small-endian machines. The upshot of this is that the compiled file is machine independent and if it is read or mapped, only one half of the file is actually used (and mapped).\n",
+    "description": "**zcompile -t** *file \\[ name \\... \\]* This builtin command can be used to compile functions or scripts, storing the compiled form in a file, and to examine files containing the compiled form. This allows faster autoloading of functions and sourcing of scripts by avoiding parsing of the text when the files are read.\n\n> The first form (without the **-c***,* **-a** *or* **-t** *options) creates a* compiled file. If only the *file argument is given, the* output file has the name \\`*file***.zwc***\\' and will be placed in* the same directory as the *file. The shell will load the compiled* file instead of the normal function file when the function is autoloaded; see the section \\`Autoloading Functions\\' in *zshmisc(1)* for a description of how autoloaded functions are searched. The extension **.zwc** *stands for \\`zsh word code\\'.*\n>\n> If there is at least one *name argument, all the named files* are compiled into the output *file given as the first argument. If* *file does not end in* **.zwc***, this extension is automatically* appended. Files containing multiple compiled functions are called \\`digest\\' files, and are intended to be used as elements of the **FPATH***/***fpath** special array.\n>\n> The second form, with the **-c** *or* **-a** *options, writes the compiled* definitions for all the named functions into *file. For* **-c***, the* names must be functions currently defined in the shell, not those marked for autoloading. Undefined functions that are marked for autoloading may be written by using the **-a** *option, in which case the* **fpath** is searched and the contents of the definition files for those functions, if found, are compiled into *file. If both* **-c** *and* **-a** *are given, names of both defined functions and functions marked* for autoloading may be given. In either case, the functions in files written with the **-c** *or* **-a** *option will be autoloaded as if the* **KSH_AUTOLOAD** *option were unset.*\n>\n> The reason for handling loaded and not-yet-loaded functions with different options is that some definition files for autoloading define multiple functions, including the function with the same name as the file, and, at the end, call that function. In such cases the output of \\`**zcompile -c***\\' does not include the additional functions defined in* the file, and any other initialization code in the file is lost. Using \\`**zcompile -a***\\' captures all this extra information.*\n>\n> If the **-m** *option is combined with* **-c** *or* **-a***,* the *names are used as patterns and all functions whose names* match one of these patterns will be written. If no *name is given,* the definitions of all functions currently defined or marked as autoloaded will be written.\n>\n> Note the second form cannot be used for compiling functions that include redirections as part of the definition rather than within the body of the function; for example\n>\n> > fn1() { { ... } >~/logfile }\n>\n> can be compiled but\n>\n> > fn1() { ... } >~/logfile\n>\n> cannot. It is possible to use the first form of **zcompile** *to compile* autoloadable functions that include the full function definition instead of just the body of the function.\n>\n> The third form, with the **-t** *option, examines an existing* compiled file. Without further arguments, the names of the original files compiled into it are listed. The first line of output shows the version of the shell which compiled the file and how the file will be used (i.e. by reading it directly or by mapping it into memory). With arguments, nothing is output and the return status is set to zero if definitions for *all names were found in the compiled* file, and non-zero if the definition for at least one *name was not* found.\n>\n> Other options:\n>\n> **-U** Aliases are not expanded when compiling the *named files.*\n>\n> **-R**\n>\n> :   When the compiled file is read, its contents are copied into the shell\\'s memory, rather than memory-mapped (see **-M***). This* happens automatically on systems that do not support memory mapping.\n>\n>     When compiling scripts instead of autoloadable functions, it is often desirable to use this option; otherwise the whole file, including the code to define functions which have already been defined, will remain mapped, consequently wasting memory.\n>\n> **-M**\n>\n> :   The compiled file is mapped into the shell\\'s memory when read. This is done in such a way that multiple instances of the shell running on the same host will share this mapped file. If neither **-R** *nor* **-M** *is given, the* **zcompile** *builtin decides what to do based* on the size of the compiled file.\n>\n> **-k**\n>\n> **-z** These options are used when the compiled file contains functions which are to be autoloaded. If **-z** *is given, the* function will be autoloaded as if the **KSH_AUTOLOAD** *option is* *not set, even if it is set at the time the compiled file is* read, while if the **-k** *is given, the function will be loaded as if* **KSH_AUTOLOAD** *is set. These options also take precedence over* any **-k** *or* **-z** *options specified to the* **autoload** *builtin. If* neither of these options is given, the function will be loaded as determined by the setting of the **KSH_AUTOLOAD** *option at the time* the compiled file is read. These options may also appear as many times as necessary between the listed *names to specify the loading style of all following functions, up to* the next **-k** *or* **-z***.*\n>\n> The created file always contains two versions of the compiled format, one for big-endian machines and one for small-endian machines. The upshot of this is that the compiled file is machine independent and if it is read or mapped, only one half of the file is actually used (and mapped).",
     "args": "zcompile [ -U ] [ -z | -k ] [ -R | -M ] file [ name ... ]\n\nzcompile -ca [ -m ] [ -R | -M ] file [ name ... ]"
   },
   "zformat": {
     "shortDescription": "Format strings",
-    "description": ":   See the section \\`The zsh/zutil Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/zutil Module\\' in *zshmodules(1).*",
     "args": "zformat"
   },
   "zftp": {
     "shortDescription": "Zsh FTP client",
-    "description": ":   See the section \\`The zsh/zftp Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/zftp Module\\' in *zshmodules(1).*",
     "args": "zftp"
   },
   "zle": {
-    "description": ":   See the section \\`Zle Builtins\\' in *zshzle(1).*\n",
+    "description": ":   See the section \\`Zle Builtins\\' in *zshzle(1).*",
     "args": "zle"
   },
   "zmodload": {
-    "description": "**zmodload** **-R** *modalias \\...* Performs operations relating to zsh\\'s loadable modules. Loading of modules while the shell is running (\\`dynamical loading\\') is not available on all operating systems, or on all installations on a particular operating system, although the **zmodload** *command itself is always* available and can be used to manipulate modules built into versions of the shell executable without dynamical loading.\n\n> Without arguments the names of all currently loaded binary modules are printed. The **-L** *option causes this list to be in the form of a* series of **zmodload** *commands. Forms with arguments are:*\n>\n> **zmodload** *\\[* **-is** *\\] name \\...*\n>\n> **zmodload** **-u** *\\[* **-i** *\\] name \\...* In the simplest case, **zmodload** *loads a binary module. The module must* be in a file with a name consisting of the specified *name followed by* a standard suffix, usually \\`**.so***\\' (\\`***.sl***\\' on HPUX).* If the module to be loaded is already loaded the duplicate module is ignored. If **zmodload** *detects an inconsistency, such as an* invalid module name or circular dependency list, the current code block is aborted. If it is available, the module is loaded if necessary, while if it is not available, non-zero status is silently returned. The option **-i** *is accepted for compatibility but has no effect.*\n>\n> > The *named module is searched for in the same way a command is, using* **\\$module_path** *instead of* **\\$path***. However, the path search is* performed even when the module name contains a \\`**/***\\', which it usually does.* There is no way to prevent the path search.\n> >\n> > If the module supports features (see below), **zmodload** *tries to* enable all features when loading a module. If the module was successfully loaded but not all features could be enabled, **zmodload** *returns status 2.*\n> >\n> > If the option **-s** *is given, no error is printed if the module was not* available (though other errors indicating a problem with the module are printed). The return status indicates if the module was loaded. This is appropriate if the caller considers the module optional.\n> >\n> > With **-u***,* **zmodload** *unloads modules. The same name* must be given that was given when the module was loaded, but it is not necessary for the module to exist in the file system. The **-i** *option suppresses the error if the module is already* unloaded (or was never loaded).\n> >\n> > Each module has a boot and a cleanup function. The module will not be loaded if its boot function fails. Similarly a module can only be unloaded if its cleanup function runs successfully.\n>\n> **zmodload -F** *\\[* **-almLe**  **-P** *param \\] module \\[ \\[***+-***\\]feature \\... \\]*\n>\n> :   **zmodload -F** *allows more selective control over the features provided* by modules. With no options apart from **-F***, the module named* *module is loaded, if it was not already loaded, and the list of* *features is set to the required state. If no* *features are specified, the module is loaded, if it was not already* loaded, but the state of features is unchanged. Each feature may be preceded by a **+** *to turn the feature on, or* **-** *to turn it* off; the **+** *is assumed if neither character is present.* Any feature not explicitly mentioned is left in its current state; if the module was not previously loaded this means any such features will remain disabled. The return status is zero if all features were set, 1 if the module failed to load, and 2 if some features could not be set (for example, a parameter couldn\\'t be added because there was a different parameter of the same name) but the module was loaded.\n>\n>     The standard features are builtins, conditions, parameters and math functions; these are indicated by the prefix \\`**b:***\\', \\`***c:***\\'* (\\`**C:***\\' for an infix condition), \\`***p:***\\' and \\`***f:***\\', respectively,* followed by the name that the corresponding feature would have in the shell. For example, \\`**b:strftime***\\' indicates a builtin named* **strftime** *and* **p:EPOCHSECONDS** *indicates a parameter named* **EPOCHSECONDS***. The module may provide other (\\`abstract\\') features of* its own as indicated by its documentation; these have no prefix.\n>\n>     With **-l** *or* **-L***, features provided by the module are listed. With* **-l** *alone, a list of features together with their states is shown, one* feature per line. With **-L** *alone, a* **zmodload -F** *command that would* cause enabled features of the module to be turned on is shown. With **-lL***, a* **zmodload -F** *command that would cause all the features to be* set to their current state is shown. If one of these combinations is given with the option **-P** *param then the parameter param is set to an* array of features, either features together with their state or (if **-L** *alone is given) enabled features.*\n>\n>     With the option **-L** *the module name may be omitted; then a list* of all enabled features for all modules providing features is printed in the form of **zmodload -F** *commands. If* **-l** *is also given,* the state of both enabled and disabled features is output in that form.\n>\n>     A set of features may be provided together with **-l** *or* **-L** *and a* module name; in that case only the state of those features is considered. Each feature may be preceded by **+** *or* **-** *but the* character has no effect. If no set of features is provided, all features are considered.\n>\n>     With **-e***, the command first tests that the module is loaded;* if it is not, status 1 is returned. If the module is loaded, the list of features given as an argument is examined. Any feature given with no prefix is simply tested to see if the module provides it; any feature given with a prefix **+** *or* **-** *is tested to* see if is provided and in the given state. If the tests on all features in the list succeed, status 0 is returned, else status 1.\n>\n>     With **-m***, each entry in the given list of features is taken* as a pattern to be matched against the list of features provided by the module. An initial **+** *or* **-** *must be given explicitly.* This may not be combined with the **-a** *option as autoloads must* be specified explicitly.\n>\n>     With **-a***, the given list of features is marked for autoload from* the specified module, which may not yet be loaded. An optional **+** may appear before the feature name. If the feature is prefixed with **-***, any existing autoload is removed. The options* **-l** *and* **-L** may be used to list autoloads. Autoloading is specific to individual features; when the module is loaded only the requested feature is enabled. Autoload requests are preserved if the module is subsequently unloaded until an explicit \\`**zmodload -Fa** *module* **-***feature\\' is issued. It is not an error to request an autoload* for a feature of a module that is already loaded.\n>\n>     When the module is loaded each autoload is checked against the features actually provided by the module; if the feature is not provided the autoload request is deleted. A warning message is output; if the module is being loaded to provide a different feature, and that autoload is successful, there is no effect on the status of the current command. If the module is already loaded at the time when **zmodload -Fa** *is* run, an error message is printed and status 1 returned.\n>\n>     **zmodload -Fa** *can be used with the* **-l***,* **-L***,* **-e** *and* **-P** *options for listing and testing the existence of autoloadable* features. In this case **-l** *is ignored if* **-L** *is specified.* **zmodload -FaL** *with no module name lists autoloads for all modules.*\n>\n>     Note that only standard features as described above can be autoloaded; other features require the module to be loaded before enabling.\n>\n> **zmodload** **-d** *\\[* **-L** *\\] \\[ name \\]*\n>\n> **zmodload** **-d** *name dep \\...*\n>\n> **zmodload** **-ud** *name \\[ dep \\... \\]* The **-d** *option can be used to specify module dependencies. The modules* named in the second and subsequent arguments will be loaded before the module named in the first argument.\n>\n> > With **-d** *and one argument, all dependencies for that module are listed.* With **-d** *and no arguments, all module dependencies are listed. This* listing is by default in a Makefile-like format. The **-L** *option* changes this format to a list of **zmodload -d** *commands.*\n> >\n> > If **-d** *and* **-u** *are both used, dependencies are removed. If only one* argument is given, all dependencies for that module are removed.\n>\n> **zmodload** **-ab** *\\[* **-L** *\\]*\n>\n> **zmodload** **-ab** *\\[* **-i** *\\] name \\[ builtin \\... \\]*\n>\n> **zmodload** **-ub** *\\[* **-i** *\\] builtin \\...* The **-ab** *option defines autoloaded builtins. It defines the specified* *builtins. When any of those builtins is called, the module specified* in the first argument is loaded and all its features are enabled (for selective control of features use \\`**zmodload -F -a***\\' as described* above). If only the *name is given, one builtin is defined, with* the same name as the module. **-i** *suppresses the error if the builtin* is already defined or autoloaded, but not if another builtin of the same name is already defined.\n>\n> > With **-ab** *and no arguments, all autoloaded builtins are listed, with the* module name (if different) shown in parentheses after the builtin name. The **-L** *option changes this format to a list of* **zmodload -a** commands.\n> >\n> > If **-b** *is used together with the* **-u** *option, it removes builtins* previously defined with **-ab***. This is only possible if the builtin is* not yet loaded. **-i** *suppresses the error if the builtin is already* removed (or never existed).\n> >\n> > Autoload requests are retained if the module is subsequently unloaded until an explicit \\`**zmodload -ub** *builtin\\' is issued.*\n>\n> **zmodload** **-ac** *\\[* **-IL** *\\]*\n>\n> **zmodload** **-ac** *\\[* **-iI** *\\] name \\[ cond \\... \\]*\n>\n> **zmodload** **-uc** *\\[* **-iI** *\\] cond \\...* The **-ac** *option is used to define autoloaded condition codes. The* *cond strings give the names of the conditions defined by the* module. The optional **-I** *option is used to define infix condition* names. Without this option prefix condition names are defined.\n>\n> > If given no condition names, all defined names are listed (as a series of **zmodload** *commands if the* **-L** *option is given).*\n> >\n> > The **-uc** *option removes definitions for autoloaded conditions.*\n>\n> **zmodload** **-ap** *\\[* **-L** *\\]*\n>\n> **zmodload** **-ap** *\\[* **-i** *\\] name \\[ parameter \\... \\]*\n>\n> **zmodload** **-up** *\\[* **-i** *\\] parameter \\...* The **-p** *option is like the* **-b** *and* **-c** *options, but makes* **zmodload** *work on autoloaded parameters instead.*\n>\n> **zmodload** **-af** *\\[* **-L** *\\]*\n>\n> **zmodload** **-af** *\\[* **-i** *\\] name \\[ function \\... \\]*\n>\n> **zmodload** **-uf** *\\[* **-i** *\\] function \\...* The **-f** *option is like the* **-b***,* **-p***, and* **-c** *options, but* makes **zmodload** *work on autoloaded math functions instead.*\n>\n> **zmodload** **-a** *\\[* **-L** *\\]*\n>\n> **zmodload** **-a** *\\[* **-i** *\\] name \\[ builtin \\... \\]*\n>\n> **zmodload** **-ua** *\\[* **-i** *\\] builtin \\...* Equivalent to **-ab** *and* **-ub***.*\n>\n> **zmodload -e** *\\[* **-A** *\\] \\[ string \\... \\]*\n>\n> :   The **-e** *option without arguments lists all loaded modules; if the* **-A** option is also given, module aliases corresponding to loaded modules are also shown. If arguments are provided, nothing is printed; the return status is set to zero if all *strings given as arguments* are names of loaded modules and to one if at least on *string is not* the name of a loaded module. This can be used to test for the availability of things implemented by modules. In this case, any aliases are automatically resolved and the **-A** *flag is not used.*\n>\n> **zmodload**  **-A** *\\[* **-L** *\\] \\[ modalias\\[***=***module\\] \\... \\]*\n>\n> :   For each argument, if both *modalias and module are given,* define *modalias to be an alias for the module module.* If the module *modalias is ever subsequently requested, either via a* call to **zmodload** *or implicitly, the shell will attempt to load* *module instead. If module is not given, show the definition of* *modalias. If no arguments are given, list all defined module aliases.* When listing, if the **-L** *flag was also given, list the definition as a* **zmodload** *command to recreate the alias.*\n>\n>     The existence of aliases for modules is completely independent of whether the name resolved is actually loaded as a module: while the alias exists, loading and unloading the module under any alias has exactly the same effect as using the resolved name, and does not affect the connection between the alias and the resolved name which can be removed either by **zmodload -R** *or by redefining the alias. Chains of aliases (i.e. where* the first resolved name is itself an alias) are valid so long as these are not circular. As the aliases take the same format as module names, they may include path separators: in this case, there is no requirement for any part of the path named to exist as the alias will be resolved first. For example, \\`**any/old/alias***\\' is always a valid alias.*\n>\n>     Dependencies added to aliased modules are actually added to the resolved module; these remain if the alias is removed. It is valid to create an alias whose name is one of the standard shell modules and which resolves to a different module. However, if a module has dependencies, it will not be possible to use the module name as an alias as the module will already be marked as a loadable module in its own right.\n>\n>     Apart from the above, aliases can be used in the **zmodload** *command* anywhere module names are required. However, aliases will not be shown in lists of loaded modules with a bare \\`**zmodload***\\'.*\n>\n> **zmodload**  **-R** *modalias \\...* \n>\n> :   For each *modalias argument that was previously defined as a module* alias via **zmodload -A***, delete the alias. If any was not defined, an* error is caused and the remainder of the line is ignored.\n>\n> Note that **zsh** *makes no distinction between modules that were linked* into the shell and modules that are loaded dynamically. In both cases this builtin command has to be used to make available the builtins and other things defined by modules (unless the module is autoloaded on these definitions). This is true even for systems that don\\'t support dynamic loading of modules.\n",
+    "description": "**zmodload** **-R** *modalias \\...* Performs operations relating to zsh\\'s loadable modules. Loading of modules while the shell is running (\\`dynamical loading\\') is not available on all operating systems, or on all installations on a particular operating system, although the **zmodload** *command itself is always* available and can be used to manipulate modules built into versions of the shell executable without dynamical loading.\n\n> Without arguments the names of all currently loaded binary modules are printed. The **-L** *option causes this list to be in the form of a* series of **zmodload** *commands. Forms with arguments are:*\n>\n> **zmodload** *\\[* **-is** *\\] name \\...*\n>\n> **zmodload** **-u** *\\[* **-i** *\\] name \\...* In the simplest case, **zmodload** *loads a binary module. The module must* be in a file with a name consisting of the specified *name followed by* a standard suffix, usually \\`**.so***\\' (\\`***.sl***\\' on HPUX).* If the module to be loaded is already loaded the duplicate module is ignored. If **zmodload** *detects an inconsistency, such as an* invalid module name or circular dependency list, the current code block is aborted. If it is available, the module is loaded if necessary, while if it is not available, non-zero status is silently returned. The option **-i** *is accepted for compatibility but has no effect.*\n>\n> > The *named module is searched for in the same way a command is, using* **\\$module_path** *instead of* **\\$path***. However, the path search is* performed even when the module name contains a \\`**/***\\', which it usually does.* There is no way to prevent the path search.\n> >\n> > If the module supports features (see below), **zmodload** *tries to* enable all features when loading a module. If the module was successfully loaded but not all features could be enabled, **zmodload** *returns status 2.*\n> >\n> > If the option **-s** *is given, no error is printed if the module was not* available (though other errors indicating a problem with the module are printed). The return status indicates if the module was loaded. This is appropriate if the caller considers the module optional.\n> >\n> > With **-u***,* **zmodload** *unloads modules. The same name* must be given that was given when the module was loaded, but it is not necessary for the module to exist in the file system. The **-i** *option suppresses the error if the module is already* unloaded (or was never loaded).\n> >\n> > Each module has a boot and a cleanup function. The module will not be loaded if its boot function fails. Similarly a module can only be unloaded if its cleanup function runs successfully.\n>\n> **zmodload -F** *\\[* **-almLe**  **-P** *param \\] module \\[ \\[***+-***\\]feature \\... \\]*\n>\n> :   **zmodload -F** *allows more selective control over the features provided* by modules. With no options apart from **-F***, the module named* *module is loaded, if it was not already loaded, and the list of* *features is set to the required state. If no* *features are specified, the module is loaded, if it was not already* loaded, but the state of features is unchanged. Each feature may be preceded by a **+** *to turn the feature on, or* **-** *to turn it* off; the **+** *is assumed if neither character is present.* Any feature not explicitly mentioned is left in its current state; if the module was not previously loaded this means any such features will remain disabled. The return status is zero if all features were set, 1 if the module failed to load, and 2 if some features could not be set (for example, a parameter couldn\\'t be added because there was a different parameter of the same name) but the module was loaded.\n>\n>     The standard features are builtins, conditions, parameters and math functions; these are indicated by the prefix \\`**b:***\\', \\`***c:***\\'* (\\`**C:***\\' for an infix condition), \\`***p:***\\' and \\`***f:***\\', respectively,* followed by the name that the corresponding feature would have in the shell. For example, \\`**b:strftime***\\' indicates a builtin named* **strftime** *and* **p:EPOCHSECONDS** *indicates a parameter named* **EPOCHSECONDS***. The module may provide other (\\`abstract\\') features of* its own as indicated by its documentation; these have no prefix.\n>\n>     With **-l** *or* **-L***, features provided by the module are listed. With* **-l** *alone, a list of features together with their states is shown, one* feature per line. With **-L** *alone, a* **zmodload -F** *command that would* cause enabled features of the module to be turned on is shown. With **-lL***, a* **zmodload -F** *command that would cause all the features to be* set to their current state is shown. If one of these combinations is given with the option **-P** *param then the parameter param is set to an* array of features, either features together with their state or (if **-L** *alone is given) enabled features.*\n>\n>     With the option **-L** *the module name may be omitted; then a list* of all enabled features for all modules providing features is printed in the form of **zmodload -F** *commands. If* **-l** *is also given,* the state of both enabled and disabled features is output in that form.\n>\n>     A set of features may be provided together with **-l** *or* **-L** *and a* module name; in that case only the state of those features is considered. Each feature may be preceded by **+** *or* **-** *but the* character has no effect. If no set of features is provided, all features are considered.\n>\n>     With **-e***, the command first tests that the module is loaded;* if it is not, status 1 is returned. If the module is loaded, the list of features given as an argument is examined. Any feature given with no prefix is simply tested to see if the module provides it; any feature given with a prefix **+** *or* **-** *is tested to* see if is provided and in the given state. If the tests on all features in the list succeed, status 0 is returned, else status 1.\n>\n>     With **-m***, each entry in the given list of features is taken* as a pattern to be matched against the list of features provided by the module. An initial **+** *or* **-** *must be given explicitly.* This may not be combined with the **-a** *option as autoloads must* be specified explicitly.\n>\n>     With **-a***, the given list of features is marked for autoload from* the specified module, which may not yet be loaded. An optional **+** may appear before the feature name. If the feature is prefixed with **-***, any existing autoload is removed. The options* **-l** *and* **-L** may be used to list autoloads. Autoloading is specific to individual features; when the module is loaded only the requested feature is enabled. Autoload requests are preserved if the module is subsequently unloaded until an explicit \\`**zmodload -Fa** *module* **-***feature\\' is issued. It is not an error to request an autoload* for a feature of a module that is already loaded.\n>\n>     When the module is loaded each autoload is checked against the features actually provided by the module; if the feature is not provided the autoload request is deleted. A warning message is output; if the module is being loaded to provide a different feature, and that autoload is successful, there is no effect on the status of the current command. If the module is already loaded at the time when **zmodload -Fa** *is* run, an error message is printed and status 1 returned.\n>\n>     **zmodload -Fa** *can be used with the* **-l***,* **-L***,* **-e** *and* **-P** *options for listing and testing the existence of autoloadable* features. In this case **-l** *is ignored if* **-L** *is specified.* **zmodload -FaL** *with no module name lists autoloads for all modules.*\n>\n>     Note that only standard features as described above can be autoloaded; other features require the module to be loaded before enabling.\n>\n> **zmodload** **-d** *\\[* **-L** *\\] \\[ name \\]*\n>\n> **zmodload** **-d** *name dep \\...*\n>\n> **zmodload** **-ud** *name \\[ dep \\... \\]* The **-d** *option can be used to specify module dependencies. The modules* named in the second and subsequent arguments will be loaded before the module named in the first argument.\n>\n> > With **-d** *and one argument, all dependencies for that module are listed.* With **-d** *and no arguments, all module dependencies are listed. This* listing is by default in a Makefile-like format. The **-L** *option* changes this format to a list of **zmodload -d** *commands.*\n> >\n> > If **-d** *and* **-u** *are both used, dependencies are removed. If only one* argument is given, all dependencies for that module are removed.\n>\n> **zmodload** **-ab** *\\[* **-L** *\\]*\n>\n> **zmodload** **-ab** *\\[* **-i** *\\] name \\[ builtin \\... \\]*\n>\n> **zmodload** **-ub** *\\[* **-i** *\\] builtin \\...* The **-ab** *option defines autoloaded builtins. It defines the specified* *builtins. When any of those builtins is called, the module specified* in the first argument is loaded and all its features are enabled (for selective control of features use \\`**zmodload -F -a***\\' as described* above). If only the *name is given, one builtin is defined, with* the same name as the module. **-i** *suppresses the error if the builtin* is already defined or autoloaded, but not if another builtin of the same name is already defined.\n>\n> > With **-ab** *and no arguments, all autoloaded builtins are listed, with the* module name (if different) shown in parentheses after the builtin name. The **-L** *option changes this format to a list of* **zmodload -a** commands.\n> >\n> > If **-b** *is used together with the* **-u** *option, it removes builtins* previously defined with **-ab***. This is only possible if the builtin is* not yet loaded. **-i** *suppresses the error if the builtin is already* removed (or never existed).\n> >\n> > Autoload requests are retained if the module is subsequently unloaded until an explicit \\`**zmodload -ub** *builtin\\' is issued.*\n>\n> **zmodload** **-ac** *\\[* **-IL** *\\]*\n>\n> **zmodload** **-ac** *\\[* **-iI** *\\] name \\[ cond \\... \\]*\n>\n> **zmodload** **-uc** *\\[* **-iI** *\\] cond \\...* The **-ac** *option is used to define autoloaded condition codes. The* *cond strings give the names of the conditions defined by the* module. The optional **-I** *option is used to define infix condition* names. Without this option prefix condition names are defined.\n>\n> > If given no condition names, all defined names are listed (as a series of **zmodload** *commands if the* **-L** *option is given).*\n> >\n> > The **-uc** *option removes definitions for autoloaded conditions.*\n>\n> **zmodload** **-ap** *\\[* **-L** *\\]*\n>\n> **zmodload** **-ap** *\\[* **-i** *\\] name \\[ parameter \\... \\]*\n>\n> **zmodload** **-up** *\\[* **-i** *\\] parameter \\...* The **-p** *option is like the* **-b** *and* **-c** *options, but makes* **zmodload** *work on autoloaded parameters instead.*\n>\n> **zmodload** **-af** *\\[* **-L** *\\]*\n>\n> **zmodload** **-af** *\\[* **-i** *\\] name \\[ function \\... \\]*\n>\n> **zmodload** **-uf** *\\[* **-i** *\\] function \\...* The **-f** *option is like the* **-b***,* **-p***, and* **-c** *options, but* makes **zmodload** *work on autoloaded math functions instead.*\n>\n> **zmodload** **-a** *\\[* **-L** *\\]*\n>\n> **zmodload** **-a** *\\[* **-i** *\\] name \\[ builtin \\... \\]*\n>\n> **zmodload** **-ua** *\\[* **-i** *\\] builtin \\...* Equivalent to **-ab** *and* **-ub***.*\n>\n> **zmodload -e** *\\[* **-A** *\\] \\[ string \\... \\]*\n>\n> :   The **-e** *option without arguments lists all loaded modules; if the* **-A** option is also given, module aliases corresponding to loaded modules are also shown. If arguments are provided, nothing is printed; the return status is set to zero if all *strings given as arguments* are names of loaded modules and to one if at least on *string is not* the name of a loaded module. This can be used to test for the availability of things implemented by modules. In this case, any aliases are automatically resolved and the **-A** *flag is not used.*\n>\n> **zmodload**  **-A** *\\[* **-L** *\\] \\[ modalias\\[***=***module\\] \\... \\]*\n>\n> :   For each argument, if both *modalias and module are given,* define *modalias to be an alias for the module module.* If the module *modalias is ever subsequently requested, either via a* call to **zmodload** *or implicitly, the shell will attempt to load* *module instead. If module is not given, show the definition of* *modalias. If no arguments are given, list all defined module aliases.* When listing, if the **-L** *flag was also given, list the definition as a* **zmodload** *command to recreate the alias.*\n>\n>     The existence of aliases for modules is completely independent of whether the name resolved is actually loaded as a module: while the alias exists, loading and unloading the module under any alias has exactly the same effect as using the resolved name, and does not affect the connection between the alias and the resolved name which can be removed either by **zmodload -R** *or by redefining the alias. Chains of aliases (i.e. where* the first resolved name is itself an alias) are valid so long as these are not circular. As the aliases take the same format as module names, they may include path separators: in this case, there is no requirement for any part of the path named to exist as the alias will be resolved first. For example, \\`**any/old/alias***\\' is always a valid alias.*\n>\n>     Dependencies added to aliased modules are actually added to the resolved module; these remain if the alias is removed. It is valid to create an alias whose name is one of the standard shell modules and which resolves to a different module. However, if a module has dependencies, it will not be possible to use the module name as an alias as the module will already be marked as a loadable module in its own right.\n>\n>     Apart from the above, aliases can be used in the **zmodload** *command* anywhere module names are required. However, aliases will not be shown in lists of loaded modules with a bare \\`**zmodload***\\'.*\n>\n> **zmodload**  **-R** *modalias \\...* \n>\n> :   For each *modalias argument that was previously defined as a module* alias via **zmodload -A***, delete the alias. If any was not defined, an* error is caused and the remainder of the line is ignored.\n>\n> Note that **zsh** *makes no distinction between modules that were linked* into the shell and modules that are loaded dynamically. In both cases this builtin command has to be used to make available the builtins and other things defined by modules (unless the module is autoloaded on these definitions). This is true even for systems that don\\'t support dynamic loading of modules.",
     "args": "zmodload [ -a [ -bcpf [ -I ] ] ] [ -iL ] ...\n\nzmodload -u [ -abcdpf [ -I ] ] [ -iL ] ...\n\nzmodload -A [ -L ] [ modalias[=module] ... ]"
   },
   "zparseopts": {
     "shortDescription": "Parse options",
-    "description": ":   See the section \\`The zsh/zutil Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/zutil Module\\' in *zshmodules(1).*",
     "args": "zparseopts"
   },
   "zprof": {
     "shortDescription": "Zsh profiler",
-    "description": ":   See the section \\`The zsh/zprof Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/zprof Module\\' in *zshmodules(1).*",
     "args": "zprof"
   },
   "zpty": {
-    "description": ":   See the section \\`The zsh/zpty Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/zpty Module\\' in *zshmodules(1).*",
     "args": "zpty"
   },
   "zregexparse": {
-    "description": ":   See the section \\`The zsh/zutil Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/zutil Module\\' in *zshmodules(1).*",
     "args": "zregexparse"
   },
   "zsocket": {
     "shortDescription": "Zsh socket interface",
-    "description": ":   See the section \\`The zsh/net/socket Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/net/socket Module\\' in *zshmodules(1).*",
     "args": "zsocket"
   },
   "zstyle": {
     "shortDescription": "Define styles",
-    "description": ":   See the section \\`The zsh/zutil Module\\' in *zshmodules(1).*\n",
+    "description": ":   See the section \\`The zsh/zutil Module\\' in *zshmodules(1).*",
     "args": "zstyle"
   },
   "ztcp": {

From 2112c13627be02160b54f990682a5b339bb9c64f Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 19 Feb 2025 11:40:37 -0800
Subject: [PATCH 0126/1815] Return documentation as a markdown string

---
 extensions/terminal-suggest/src/shell/zsh.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/terminal-suggest/src/shell/zsh.ts b/extensions/terminal-suggest/src/shell/zsh.ts
index 7919a1163098..7718b4a1c162 100644
--- a/extensions/terminal-suggest/src/shell/zsh.ts
+++ b/extensions/terminal-suggest/src/shell/zsh.ts
@@ -61,7 +61,7 @@ async function getBuiltins(
 				completions.push({
 					label: { label: cmd, description: result?.description },
 					detail: result?.args,
-					documentation: result?.documentation,
+					documentation: new vscode.MarkdownString(result?.documentation),
 					kind: vscode.TerminalCompletionItemKind.Method
 				});
 

From 581bd35a586384d41f0dbf712d14da349f9ffc83 Mon Sep 17 00:00:00 2001
From: meganrogge <merogge@microsoft.com>
Date: Wed, 19 Feb 2025 16:05:05 -0600
Subject: [PATCH 0127/1815] allow markdown string for doc

---
 .../workbench/api/common/extHost.protocol.ts  | 20 +++++++++++++++----
 .../api/common/extHostTerminalService.ts      |  8 ++------
 .../api/common/extHostTypeConverters.ts       | 19 +++++++++++++++---
 src/vs/workbench/api/common/extHostTypes.ts   |  4 +++-
 .../suggest/browser/simpleCompletionItem.ts   |  4 ++--
 5 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 6bf4811257bd..0e4072c38d90 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -23,6 +23,7 @@ import { IChange } from '../../../editor/common/diff/legacyLinesDiffComputer.js'
 import * as editorCommon from '../../../editor/common/editorCommon.js';
 import { StandardTokenType } from '../../../editor/common/encodedTokenAttributes.js';
 import * as languages from '../../../editor/common/languages.js';
+import { CompletionItemLabel } from '../../../editor/common/languages.js';
 import { CharacterPair, CommentRule, EnterAction } from '../../../editor/common/languages/languageConfiguration.js';
 import { EndOfLineSequence } from '../../../editor/common/model.js';
 import { IModelChangedEvent } from '../../../editor/common/model/mirrorTextModel.js';
@@ -84,7 +85,7 @@ import { IFileQueryBuilderOptions, ITextQueryBuilderOptions } from '../../servic
 import * as search from '../../services/search/common/search.js';
 import { TextSearchCompleteMessage } from '../../services/search/common/searchExtTypes.js';
 import { ISaveProfileResult } from '../../services/userDataProfile/common/userDataProfile.js';
-import { TerminalCompletionItem, TerminalShellExecutionCommandLineConfidence } from './extHostTypes.js';
+import { TerminalShellExecutionCommandLineConfidence } from './extHostTypes.js';
 import * as tasks from './shared/tasks.js';
 
 export interface IWorkspaceData extends IStaticWorkspaceData {
@@ -2428,11 +2429,22 @@ export interface ITerminalCompletionContextDto {
 	allowFallbackCompletions: boolean;
 }
 
+export interface ITerminalCompletionItemDto {
+	label: string | CompletionItemLabel;
+	detail?: string;
+	documentation?: string | IMarkdownString;
+	icon?: ThemeIcon | undefined;
+	isFile?: boolean | undefined;
+	isDirectory?: boolean | undefined;
+	isKeyword?: boolean | undefined;
+	replacementIndex: number;
+	replacementLength: number;
+}
 
 export interface ITerminalCompletionProvider {
 	id: string;
 	shellTypes?: TerminalShellType[];
-	provideCompletions(value: string, cursorPosition: number, token: CancellationToken): Promise<TerminalCompletionItem[] | TerminalCompletionListDto<TerminalCompletionItem> | undefined>;
+	provideCompletions(value: string, cursorPosition: number, token: CancellationToken): Promise<TerminalCompletionListDto<ITerminalCompletionItemDto> | undefined>;
 	triggerCharacters?: string[];
 	isBuiltin?: boolean;
 }
@@ -2440,7 +2452,7 @@ export interface ITerminalCompletionProvider {
  * Represents a collection of {@link CompletionItem completion items} to be presented
  * in the editor.
  */
-export class TerminalCompletionListDto<T extends TerminalCompletionItem = TerminalCompletionItem> {
+export class TerminalCompletionListDto<T extends ITerminalCompletionItemDto = ITerminalCompletionItemDto> {
 
 	/**
 	 * Resources should be shown in the completions list
@@ -2498,7 +2510,7 @@ export interface ExtHostTerminalServiceShape {
 	$acceptDefaultProfile(profile: ITerminalProfile, automationProfile: ITerminalProfile): void;
 	$createContributedProfileTerminal(id: string, options: ICreateContributedTerminalProfileOptions): Promise<void>;
 	$provideTerminalQuickFixes(id: string, matchResult: TerminalCommandMatchResultDto, token: CancellationToken): Promise<SingleOrMany<TerminalQuickFix> | undefined>;
-	$provideTerminalCompletions(id: string, options: ITerminalCompletionContextDto, token: CancellationToken): Promise<TerminalCompletionItem[] | TerminalCompletionListDto | undefined>;
+	$provideTerminalCompletions(id: string, options: ITerminalCompletionContextDto, token: CancellationToken): Promise<TerminalCompletionListDto | undefined>;
 }
 
 export interface ExtHostTerminalShellIntegrationShape {
diff --git a/src/vs/workbench/api/common/extHostTerminalService.ts b/src/vs/workbench/api/common/extHostTerminalService.ts
index 4cf0cc957bc6..c88dbbcaa35e 100644
--- a/src/vs/workbench/api/common/extHostTerminalService.ts
+++ b/src/vs/workbench/api/common/extHostTerminalService.ts
@@ -779,7 +779,7 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 		});
 	}
 
-	public async $provideTerminalCompletions(id: string, options: ITerminalCompletionContextDto): Promise<vscode.TerminalCompletionItem[] | TerminalCompletionListDto | undefined> {
+	public async $provideTerminalCompletions(id: string, options: ITerminalCompletionContextDto): Promise<TerminalCompletionListDto | undefined> {
 		const token = new CancellationTokenSource().token;
 		if (token.isCancellationRequested || !this.activeTerminal) {
 			return undefined;
@@ -794,11 +794,7 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
 		if (completions === null || completions === undefined) {
 			return undefined;
 		}
-		if (Array.isArray(completions)) {
-			return completions;
-		} else {
-			return TerminalCompletionList.from(completions);
-		}
+		return TerminalCompletionList.from(completions);
 	}
 
 	public $acceptTerminalShellType(id: number, shellType: TerminalShellType | undefined): void {
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
index 09b5dfcbdf0d..1acf66bce5ea 100644
--- a/src/vs/workbench/api/common/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -2947,12 +2947,25 @@ export namespace TerminalQuickFix {
 		return converter.toInternal(quickFix, disposables);
 	}
 }
+export namespace TerminalCompletionItemDto {
+	export function from(item: vscode.TerminalCompletionItem): extHostProtocol.ITerminalCompletionItemDto {
+		return {
+			...item,
+			documentation: MarkdownString.fromStrict(item.documentation),
+		};
+	}
+}
 
 export namespace TerminalCompletionList {
-	export function from(completionList: vscode.TerminalCompletionList): extHostProtocol.TerminalCompletionListDto {
+	export function from(completions: vscode.TerminalCompletionList | vscode.TerminalCompletionItem[]): extHostProtocol.TerminalCompletionListDto {
+		if (Array.isArray(completions)) {
+			return {
+				items: completions.map(i => TerminalCompletionItemDto.from(i)),
+			};
+		}
 		return {
-			...completionList,
-			resourceRequestConfig: completionList.resourceRequestConfig ? TerminalResourceRequestConfig.from(completionList.resourceRequestConfig) : undefined,
+			items: completions.items.map(i => TerminalCompletionItemDto.from(i)),
+			resourceRequestConfig: completions.resourceRequestConfig ? TerminalResourceRequestConfig.from(completions.resourceRequestConfig) : undefined,
 		};
 	}
 }
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index f7bb7d4806f0..f27aac8e0072 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -2151,16 +2151,18 @@ export class TerminalCompletionItem implements vscode.TerminalCompletionItem {
 	label: string | CompletionItemLabel;
 	icon?: ThemeIcon | undefined;
 	detail?: string | undefined;
+	documentation?: string | vscode.MarkdownString | undefined;
 	isFile?: boolean | undefined;
 	isDirectory?: boolean | undefined;
 	isKeyword?: boolean | undefined;
 	replacementIndex: number;
 	replacementLength: number;
 
-	constructor(label: string | CompletionItemLabel, icon?: ThemeIcon, detail?: string, isFile?: boolean, isDirectory?: boolean, isKeyword?: boolean, replacementIndex?: number, replacementLength?: number) {
+	constructor(label: string | CompletionItemLabel, icon?: ThemeIcon, detail?: string, documentation?: string | vscode.MarkdownString, isFile?: boolean, isDirectory?: boolean, isKeyword?: boolean, replacementIndex?: number, replacementLength?: number) {
 		this.label = label;
 		this.icon = icon;
 		this.detail = detail;
+		this.documentation = documentation;
 		this.isFile = isFile;
 		this.isDirectory = isDirectory;
 		this.isKeyword = isKeyword;
diff --git a/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts b/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts
index 1b18d26ad802..e89c53ae4b85 100644
--- a/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { FuzzyScore } from '../../../../base/common/filters.js';
-import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 
 export interface CompletionItemLabel {
@@ -37,7 +37,7 @@ export interface ISimpleCompletion {
 	/**
 	 * A human-readable string that represents a doc-comment.
 	 */
-	documentation?: string | MarkdownString;
+	documentation?: string | IMarkdownString;
 
 	/**
 	 * The start of the replacement.

From bed98fd7ede5426cf8f97c6259a73ed503dffdb9 Mon Sep 17 00:00:00 2001
From: meganrogge <merogge@microsoft.com>
Date: Wed, 19 Feb 2025 16:07:53 -0600
Subject: [PATCH 0128/1815] use markdown string in zsh/bash

---
 extensions/terminal-suggest/src/shell/bash.ts | 2 +-
 extensions/terminal-suggest/src/shell/zsh.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/terminal-suggest/src/shell/bash.ts b/extensions/terminal-suggest/src/shell/bash.ts
index c2189fffb705..8db683af892e 100644
--- a/extensions/terminal-suggest/src/shell/bash.ts
+++ b/extensions/terminal-suggest/src/shell/bash.ts
@@ -48,7 +48,7 @@ export async function getBuiltins(
 				completions.push({
 					label: { label: cmd, description },
 					detail,
-					documentation,
+					documentation: new vscode.MarkdownString(documentation),
 					kind: vscode.TerminalCompletionItemKind.Method
 				});
 
diff --git a/extensions/terminal-suggest/src/shell/zsh.ts b/extensions/terminal-suggest/src/shell/zsh.ts
index 7919a1163098..7718b4a1c162 100644
--- a/extensions/terminal-suggest/src/shell/zsh.ts
+++ b/extensions/terminal-suggest/src/shell/zsh.ts
@@ -61,7 +61,7 @@ async function getBuiltins(
 				completions.push({
 					label: { label: cmd, description: result?.description },
 					detail: result?.args,
-					documentation: result?.documentation,
+					documentation: new vscode.MarkdownString(result?.documentation),
 					kind: vscode.TerminalCompletionItemKind.Method
 				});
 

From 5312579ab04a3c12eca4270b8f37f38fb8bef642 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Thu, 20 Feb 2025 12:21:59 +1100
Subject: [PATCH 0129/1815] Ensure acceptAgentEdits is async (#241278)

* Ensure acceptAgentEdits is async

* Updates
---
 .../browser/chatEditing/chatEditingModifiedDocumentEntry.ts     | 2 +-
 .../chat/browser/chatEditing/chatEditingModifiedFileEntry.ts    | 2 +-
 .../browser/chatEditing/chatEditingModifiedNotebookEntry.ts     | 2 +-
 .../contrib/chat/browser/chatEditing/chatEditingSession.ts      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
index 6d8e6f6b27bf..1f90c36696c5 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
@@ -272,7 +272,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		}
 	}
 
-	acceptAgentEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): void {
+	async acceptAgentEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void> {
 
 		assertType(textEdits.every(TextEdit.isTextEdit), 'INVALID args, can only handle text edits');
 		assert(isEqual(resource, this.modifiedURI), ' INVALID args, can only edit THIS document');
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
index fb1b7d362740..4cd72fcc07cf 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
@@ -225,7 +225,7 @@ export abstract class AbstractChatEditingModifiedFileEntry extends Disposable im
 		this._autoAcceptCtrl.get()?.cancel();
 	}
 
-	abstract acceptAgentEdits(uri: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): void;
+	abstract acceptAgentEdits(uri: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void>;
 
 	async acceptStreamingEditsEnd(tx: ITransaction) {
 		this._resetEditsState(tx);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index be5bfde342a8..5f6deab0d153 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -36,7 +36,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		throw new Error('Method not implemented.');
 	}
 
-	override acceptAgentEdits(resource: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): void {
+	override async acceptAgentEdits(resource: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void> {
 
 		const isCellUri = resource.scheme === Schemas.vscodeNotebookCell;
 		assert(isCellUri || isEqual(resource, this.modifiedURI));
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index a8f60cd6404e..281bf906fc31 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -930,7 +930,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 
 	private async _acceptEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void> {
 		const entry = await this._getOrCreateModifiedFileEntry(resource, this._getTelemetryInfoForModel(responseModel));
-		entry.acceptAgentEdits(resource, textEdits, isLastEdits, responseModel);
+		await entry.acceptAgentEdits(resource, textEdits, isLastEdits, responseModel);
 	}
 
 	private _getTelemetryInfoForModel(responseModel: IChatResponseModel): IModifiedEntryTelemetryInfo {

From f9dd5e1a8dc6b01d2f9eaef1a87afa869a4e04bb Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 19 Feb 2025 17:38:32 -0800
Subject: [PATCH 0130/1815] chat: better problems integration (#241276)

chat: allow referencing and dragging in diagnostics

- There is a new proposal which adds `ChatReferenceDiagnostic` as a
  prompt reference type
- You can now pick "Problems..." as part of the chat attachment context
- You can drag and drop files and individual diagnostics from the
  Problems view into chat. Previously trying to do this would just
  attach the file.
---
 package.json                                  |   2 +-
 src/vs/platform/dnd/browser/dnd.ts            |  32 ++++-
 .../common/extensionsApiProposals.ts          |   3 +
 src/vs/platform/markers/common/markers.ts     |   9 ++
 .../workbench/api/common/extHost.api.impl.ts  |   3 +-
 .../api/common/extHostChatAgents2.ts          |  17 ++-
 .../api/common/extHostTypeConverters.ts       |  43 +++++-
 src/vs/workbench/api/common/extHostTypes.ts   |   4 +
 src/vs/workbench/browser/dnd.ts               |   8 +-
 .../browser/actions/chatContextActions.ts     |  71 ++++++++--
 .../contrib/chat/browser/chatDragAndDrop.ts   |  44 +++++-
 .../browser/contrib/chatDynamicVariables.ts   |  71 +++++++++-
 .../contrib/chat/common/chatModel.ts          |  39 +++++-
 .../contrib/markers/browser/markersView.ts    | 128 +++++++++++-------
 ...code.proposed.chatReferenceDiagnostic.d.ts |  23 ++++
 15 files changed, 406 insertions(+), 91 deletions(-)
 create mode 100644 src/vscode-dts/vscode.proposed.chatReferenceDiagnostic.d.ts

diff --git a/package.json b/package.json
index 3f736d096b46..090d88e772cc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.98.0",
-  "distro": "b37092a45bb95e5098cefcf6809fa6973cfd2538",
+  "distro": "18d6e62cad16da70804e341893ae344d5cdcc6ee",
   "author": {
     "name": "Microsoft Corporation"
   },
diff --git a/src/vs/platform/dnd/browser/dnd.ts b/src/vs/platform/dnd/browser/dnd.ts
index f83103d27a65..f00c4d08a732 100644
--- a/src/vs/platform/dnd/browser/dnd.ts
+++ b/src/vs/platform/dnd/browser/dnd.ts
@@ -13,7 +13,7 @@ import { ResourceMap } from '../../../base/common/map.js';
 import { parse } from '../../../base/common/marshalling.js';
 import { Schemas } from '../../../base/common/network.js';
 import { isNative, isWeb } from '../../../base/common/platform.js';
-import { URI } from '../../../base/common/uri.js';
+import { URI, UriComponents } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
 import { IDialogService } from '../../dialogs/common/dialogs.js';
 import { IBaseTextResourceEditorInput, ITextEditorSelection } from '../../editor/common/editor.js';
@@ -23,6 +23,7 @@ import { ByteSize, IFileService } from '../../files/common/files.js';
 import { IInstantiationService, ServicesAccessor } from '../../instantiation/common/instantiation.js';
 import { extractSelection } from '../../opener/common/opener.js';
 import { Registry } from '../../registry/common/platform.js';
+import { IMarker } from '../../markers/common/markers.js';
 
 
 //#region Editor / Resources DND
@@ -30,7 +31,8 @@ import { Registry } from '../../registry/common/platform.js';
 export const CodeDataTransfers = {
 	EDITORS: 'CodeEditors',
 	FILES: 'CodeFiles',
-	SYMBOLS: 'application/vnd.code.symbols'
+	SYMBOLS: 'application/vnd.code.symbols',
+	MARKERS: 'application/vnd.code.diagnostics',
 };
 
 export interface IDraggedResourceEditorInput extends IBaseTextResourceEditorInput {
@@ -414,8 +416,12 @@ export interface DocumentSymbolTransferData {
 	kind: number;
 }
 
-export function extractSymbolDropData(e: DragEvent): DocumentSymbolTransferData[] {
-	const rawSymbolsData = e.dataTransfer?.getData(CodeDataTransfers.SYMBOLS);
+function setDataAsJSON(e: DragEvent, kind: string, data: unknown) {
+	e.dataTransfer?.setData(kind, JSON.stringify(data));
+}
+
+function getDataAsJSON<T>(e: DragEvent, kind: string, defaultValue: T): T {
+	const rawSymbolsData = e.dataTransfer?.getData(kind);
 	if (rawSymbolsData) {
 		try {
 			return JSON.parse(rawSymbolsData);
@@ -424,11 +430,25 @@ export function extractSymbolDropData(e: DragEvent): DocumentSymbolTransferData[
 		}
 	}
 
-	return [];
+	return defaultValue;
+}
+
+export function extractSymbolDropData(e: DragEvent): DocumentSymbolTransferData[] {
+	return getDataAsJSON(e, CodeDataTransfers.SYMBOLS, []);
 }
 
 export function fillInSymbolsDragData(symbolsData: readonly DocumentSymbolTransferData[], e: DragEvent): void {
-	e.dataTransfer?.setData(CodeDataTransfers.SYMBOLS, JSON.stringify(symbolsData));
+	setDataAsJSON(e, CodeDataTransfers.SYMBOLS, symbolsData);
+}
+
+export type MarkerTransferData = IMarker | { uri: UriComponents };
+
+export function extractMarkerDropData(e: DragEvent): MarkerTransferData[] | undefined {
+	return getDataAsJSON(e, CodeDataTransfers.MARKERS, undefined);
+}
+
+export function fillInMarkersDragData(markerData: MarkerTransferData[], e: DragEvent): void {
+	setDataAsJSON(e, CodeDataTransfers.MARKERS, markerData);
 }
 
 /**
diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index 96770454dac8..8273d3c17d44 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -44,6 +44,9 @@ const _allApiProposals = {
 	chatReferenceBinaryData: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatReferenceBinaryData.d.ts',
 	},
+	chatReferenceDiagnostic: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatReferenceDiagnostic.d.ts',
+	},
 	chatTab: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatTab.d.ts',
 	},
diff --git a/src/vs/platform/markers/common/markers.ts b/src/vs/platform/markers/common/markers.ts
index 73cb120869a3..602a67ea0d46 100644
--- a/src/vs/platform/markers/common/markers.ts
+++ b/src/vs/platform/markers/common/markers.ts
@@ -64,6 +64,15 @@ export namespace MarkerSeverity {
 		return _displayStrings[a] || '';
 	}
 
+	const _displayStringsPlural: { [value: number]: string } = Object.create(null);
+	_displayStringsPlural[MarkerSeverity.Error] = localize('sev.errors', "Errors");
+	_displayStringsPlural[MarkerSeverity.Warning] = localize('sev.warnings', "Warnings");
+	_displayStringsPlural[MarkerSeverity.Info] = localize('sev.infos', "Infos");
+
+	export function toStringPlural(a: MarkerSeverity): string {
+		return _displayStringsPlural[a] || '';
+	}
+
 	export function fromSeverity(severity: Severity): MarkerSeverity {
 		switch (severity) {
 			case Severity.Error: return MarkerSeverity.Error;
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index f926cde3ee26..3099a31228ad 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -211,7 +211,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	const extHostUriOpeners = rpcProtocol.set(ExtHostContext.ExtHostUriOpeners, new ExtHostUriOpeners(rpcProtocol));
 	const extHostProfileContentHandlers = rpcProtocol.set(ExtHostContext.ExtHostProfileContentHandlers, new ExtHostProfileContentHandlers(rpcProtocol));
 	rpcProtocol.set(ExtHostContext.ExtHostInteractive, new ExtHostInteractive(rpcProtocol, extHostNotebook, extHostDocumentsAndEditors, extHostCommands, extHostLogService));
-	const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, new ExtHostChatAgents2(rpcProtocol, extHostLogService, extHostCommands, extHostDocuments, extHostLanguageModels));
+	const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, new ExtHostChatAgents2(rpcProtocol, extHostLogService, extHostCommands, extHostDocuments, extHostLanguageModels, extHostDiagnostics));
 	const extHostLanguageModelTools = rpcProtocol.set(ExtHostContext.ExtHostLanguageModelTools, new ExtHostLanguageModelTools(rpcProtocol));
 	const extHostAiRelatedInformation = rpcProtocol.set(ExtHostContext.ExtHostAiRelatedInformation, new ExtHostRelatedInformation(rpcProtocol));
 	const extHostAiEmbeddingVector = rpcProtocol.set(ExtHostContext.ExtHostAiEmbeddingVector, new ExtHostAiEmbeddingVector(rpcProtocol));
@@ -1544,6 +1544,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			ChatResultFeedbackKind: extHostTypes.ChatResultFeedbackKind,
 			ChatVariableLevel: extHostTypes.ChatVariableLevel,
 			ChatCompletionItem: extHostTypes.ChatCompletionItem,
+			ChatReferenceDiagnostic: extHostTypes.ChatReferenceDiagnostic,
 			CallHierarchyIncomingCall: extHostTypes.CallHierarchyIncomingCall,
 			CallHierarchyItem: extHostTypes.CallHierarchyItem,
 			CallHierarchyOutgoingCall: extHostTypes.CallHierarchyOutgoingCall,
diff --git a/src/vs/workbench/api/common/extHostChatAgents2.ts b/src/vs/workbench/api/common/extHostChatAgents2.ts
index d579589cc8a9..d053ad5e5ea8 100644
--- a/src/vs/workbench/api/common/extHostChatAgents2.ts
+++ b/src/vs/workbench/api/common/extHostChatAgents2.ts
@@ -32,6 +32,7 @@ import * as typeConvert from './extHostTypeConverters.js';
 import * as extHostTypes from './extHostTypes.js';
 import { isChatViewTitleActionContext } from '../../contrib/chat/common/chatActions.js';
 import { IChatRelatedFile, IChatRequestDraft } from '../../contrib/chat/common/chatEditingService.js';
+import { ExtHostDiagnostics } from './extHostDiagnostics.js';
 
 class ChatAgentResponseStream {
 
@@ -324,7 +325,8 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		private readonly _logService: ILogService,
 		private readonly _commands: ExtHostCommands,
 		private readonly _documents: ExtHostDocuments,
-		private readonly _languageModels: ExtHostLanguageModels
+		private readonly _languageModels: ExtHostLanguageModels,
+		private readonly _diagnostics: ExtHostDiagnostics,
 	) {
 		super();
 		this._proxy = mainContext.getProxy(MainContext.MainThreadChatAgents2);
@@ -402,7 +404,7 @@ 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 extRequest = typeConvert.ChatAgentRequest.to(request, location, model, isProposedApiEnabled(detector.extension, 'chatReadonlyPromptReference'));
+		const extRequest = typeConvert.ChatAgentRequest.to(request, location, model, isProposedApiEnabled(detector.extension, 'chatReadonlyPromptReference'), this.getDiagnosticsWhenEnabled(detector.extension));
 
 		return detector.provider.provideParticipantDetection(
 			extRequest,
@@ -486,7 +488,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 			stream = new ChatAgentResponseStream(agent.extension, request, this._proxy, this._commands.converter, sessionDisposables);
 
 			const model = await this.getModelForRequest(request, agent.extension);
-			const extRequest = typeConvert.ChatAgentRequest.to(request, location, model, isProposedApiEnabled(agent.extension, 'chatReadonlyPromptReference'));
+			const extRequest = typeConvert.ChatAgentRequest.to(request, location, model, isProposedApiEnabled(agent.extension, 'chatReadonlyPromptReference'), this.getDiagnosticsWhenEnabled(agent.extension));
 			inFlightRequest = { requestId: requestDto.requestId, extRequest };
 			this._inFlightRequests.add(inFlightRequest);
 
@@ -538,6 +540,13 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		}
 	}
 
+	private getDiagnosticsWhenEnabled(extension: Readonly<IRelaxedExtensionDescription>) {
+		if (!isProposedApiEnabled(extension, 'chatReferenceDiagnostic')) {
+			return [];
+		}
+		return this._diagnostics.getDiagnostics();
+	}
+
 	private async prepareHistoryTurns(extension: Readonly<IRelaxedExtensionDescription>, agentId: string, context: { history: IChatAgentHistoryEntryDto[] }): Promise<(vscode.ChatRequestTurn | vscode.ChatResponseTurn)[]> {
 		const res: (vscode.ChatRequestTurn | vscode.ChatResponseTurn)[] = [];
 
@@ -551,7 +560,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 			const hasReadonlyProposal = isProposedApiEnabled(extension, 'chatReadonlyPromptReference');
 			const varsWithoutTools = h.request.variables.variables
 				.filter(v => !v.isTool)
-				.map(v => typeConvert.ChatPromptReference.to(v, hasReadonlyProposal));
+				.map(v => typeConvert.ChatPromptReference.to(v, hasReadonlyProposal, this.getDiagnosticsWhenEnabled(extension)));
 			const toolReferences = h.request.variables.variables
 				.filter(v => v.isTool)
 				.map(typeConvert.ChatLanguageModelToolReference.to);
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
index 1acf66bce5ea..edd8590eedda 100644
--- a/src/vs/workbench/api/common/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -2761,7 +2761,7 @@ export namespace ChatResponsePart {
 }
 
 export namespace ChatAgentRequest {
-	export function to(request: IChatAgentRequest, location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined, model: vscode.LanguageModelChat, hasReadonlyProposal: boolean): vscode.ChatRequest {
+	export function to(request: IChatAgentRequest, location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined, model: vscode.LanguageModelChat, hasReadonlyProposal: boolean, diagnostics: readonly [vscode.Uri, readonly vscode.Diagnostic[]][]): vscode.ChatRequest {
 		const toolReferences = request.variables.variables.filter(v => v.isTool);
 		const variableReferences = request.variables.variables.filter(v => !v.isTool);
 		return {
@@ -2770,7 +2770,7 @@ export namespace ChatAgentRequest {
 			attempt: request.attempt ?? 0,
 			enableCommandDetection: request.enableCommandDetection ?? true,
 			isParticipantDetected: request.isParticipantDetected ?? false,
-			references: variableReferences.map(v => ChatPromptReference.to(v, hasReadonlyProposal)),
+			references: variableReferences.map(v => ChatPromptReference.to(v, hasReadonlyProposal, diagnostics)),
 			toolReferences: toolReferences.map(ChatLanguageModelToolReference.to),
 			location: ChatLocation.to(request.location),
 			acceptedConfirmationData: request.acceptedConfirmationData,
@@ -2814,19 +2814,48 @@ export namespace ChatLocation {
 }
 
 export namespace ChatPromptReference {
-	export function to(variable: IChatRequestVariableEntry, hasReadonlyProposal: boolean): vscode.ChatPromptReference {
-		const value = variable.value;
+	export function to(variable: IChatRequestVariableEntry, hasReadonlyProposal: boolean, diagnostics: readonly [vscode.Uri, readonly vscode.Diagnostic[]][]): vscode.ChatPromptReference {
+		let value: vscode.ChatPromptReference['value'] = variable.value;
 		if (!value) {
 			throw new Error('Invalid value reference');
 		}
 
+		if (isUriComponents(value)) {
+			value = URI.revive(value);
+		} else if (value && typeof value === 'object' && 'uri' in value && 'range' in value && isUriComponents(value.uri)) {
+			value = Location.to(revive(value));
+		} else if (variable.isImage) {
+			value = new types.ChatReferenceBinaryData(
+				variable.mimeType ?? 'image/png',
+				() => Promise.resolve(new Uint8Array(Object.values(variable.value as number[]))),
+				variable.references && URI.isUri(variable.references[0].reference) ? variable.references[0].reference : undefined
+			);
+		} else if (variable.kind === 'diagnostic') {
+			const filterSeverity = variable.filterSeverity && DiagnosticSeverity.to(variable.filterSeverity);
+			const filterUri = variable.filterUri && URI.revive(variable.filterUri).toString();
+			value = new types.ChatReferenceDiagnostic(diagnostics.map(([uri, d]): [vscode.Uri, vscode.Diagnostic[]] => {
+				if (variable.filterUri && uri.toString() !== filterUri) {
+					return [uri, []];
+				}
+
+				return [uri, d.filter(d => {
+					if (filterSeverity && d.severity > filterSeverity) {
+						return false;
+					}
+					if (variable.filterRange && !editorRange.Range.areIntersectingOrTouching(variable.filterRange, Range.from(d.range))) {
+						return false;
+					}
+
+					return true;
+				})];
+			}).filter(([, d]) => d.length > 0));
+		}
+
 		return {
 			id: variable.id,
 			name: variable.name,
 			range: variable.range && [variable.range.start, variable.range.endExclusive],
-			value: isUriComponents(value) ? URI.revive(value) :
-				value && typeof value === 'object' && 'uri' in value && 'range' in value && isUriComponents(value.uri) ?
-					Location.to(revive(value)) : variable.isImage ? new types.ChatReferenceBinaryData(variable.mimeType ?? 'image/png', () => Promise.resolve(new Uint8Array(Object.values(value))), variable.references && URI.isUri(variable.references[0].reference) ? variable.references[0].reference : undefined) : value,
+			value,
 			modelDescription: variable.modelDescription,
 			isReadonly: hasReadonlyProposal ? variable.isMarkedReadonly : undefined,
 		};
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index f27aac8e0072..75d1061cfccd 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -4716,6 +4716,10 @@ export class ChatReferenceBinaryData implements vscode.ChatReferenceBinaryData {
 	}
 }
 
+export class ChatReferenceDiagnostic implements vscode.ChatReferenceDiagnostic {
+	constructor(public readonly diagnostics: [vscode.Uri, vscode.Diagnostic[]][]) { }
+}
+
 export enum LanguageModelChatMessageRole {
 	User = 1,
 	Assistant = 2,
diff --git a/src/vs/workbench/browser/dnd.ts b/src/vs/workbench/browser/dnd.ts
index 239e5bb89ac5..72def8c4b99c 100644
--- a/src/vs/workbench/browser/dnd.ts
+++ b/src/vs/workbench/browser/dnd.ts
@@ -646,18 +646,24 @@ export class ResourceListDnDHandler<T> implements IListDragAndDrop<T> {
 
 	onDragStart(data: IDragAndDropData, originalEvent: DragEvent): void {
 		const resources: URI[] = [];
-		for (const element of (data as ElementsDragAndDropData<T>).elements) {
+		const elements = (data as ElementsDragAndDropData<T>).elements;
+		for (const element of elements) {
 			const resource = this.toResource(element);
 			if (resource) {
 				resources.push(resource);
 			}
 		}
+		this.onWillDragElements(elements, originalEvent);
 		if (resources.length) {
 			// Apply some datatransfer types to allow for dragging the element outside of the application
 			this.instantiationService.invokeFunction(accessor => fillEditorsDragData(accessor, resources, originalEvent));
 		}
 	}
 
+	protected onWillDragElements(elements: readonly T[], originalEvent: DragEvent): void {
+		// noop
+	}
+
 	onDragOver(data: IDragAndDropData, targetElement: T, targetIndex: number, targetSector: ListViewTargetSector | undefined, originalEvent: DragEvent): boolean | ITreeDragOverReaction {
 		return false;
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index de0ad326f514..5e958cb32dde 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -49,14 +49,14 @@ import { SearchContext } from '../../../search/common/constants.js';
 import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
 import { ChatContextKeys } from '../../common/chatContextKeys.js';
 import { IChatEditingService } from '../../common/chatEditingService.js';
-import { IChatRequestVariableEntry } from '../../common/chatModel.js';
+import { IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData } from '../../common/chatModel.js';
 import { ChatRequestAgentPart } from '../../common/chatParserTypes.js';
 import { IChatVariablesService } from '../../common/chatVariables.js';
 import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
 import { IChatWidget, IChatWidgetService, IQuickChatService, showChatView, showEditsView } from '../chat.js';
 import { imageToHash, isImage } from '../chatPasteProviders.js';
 import { isQuickChat } from '../chatWidget.js';
-import { createFolderQuickPick } from '../contrib/chatDynamicVariables.js';
+import { createFolderQuickPick, createMarkersQuickPick } from '../contrib/chatDynamicVariables.js';
 import { convertBufferToScreenshotVariable, ScreenshotVariableId } from '../contrib/screenshot.js';
 import { resizeImage } from '../imageUtils.js';
 import { CHAT_CATEGORY } from './chatActions.js';
@@ -75,7 +75,7 @@ export function registerChatContextActions() {
  */
 type IAttachmentQuickPickItem = ICommandVariableQuickPickItem | IQuickAccessQuickPickItem | IToolQuickPickItem |
 	IImageQuickPickItem | IOpenEditorsQuickPickItem | ISearchResultsQuickPickItem |
-	IScreenShotQuickPickItem | IRelatedFilesQuickPickItem | IPromptInstructionsQuickPickItem | IFolderQuickPickItem;
+	IScreenShotQuickPickItem | IRelatedFilesQuickPickItem | IPromptInstructionsQuickPickItem | IFolderQuickPickItem | IDiagnosticsQuickPickItem;
 
 /**
  * These are the types that we can get out of the quick pick
@@ -103,6 +103,12 @@ function isIFolderSearchResultQuickPickItem(obj: unknown): obj is IFolderResultQ
 		&& (obj as IFolderResultQuickPickItem).kind === 'folder-search-result');
 }
 
+function isIDiagnosticsQuickPickItemWithFilter(obj: unknown): obj is IDiagnosticsQuickPickItemWithFilter {
+	return (
+		typeof obj === 'object'
+		&& (obj as IDiagnosticsQuickPickItemWithFilter).kind === 'diagnostic-filter');
+}
+
 function isIQuickPickItemWithResource(obj: unknown): obj is IQuickPickItemWithResource {
 	return (
 		typeof obj === 'object'
@@ -210,6 +216,19 @@ interface IScreenShotQuickPickItem extends IQuickPickItem {
 	icon?: ThemeIcon;
 }
 
+interface IDiagnosticsQuickPickItem extends IQuickPickItem {
+	kind: 'diagnostic';
+	id: string;
+	icon?: ThemeIcon;
+}
+
+interface IDiagnosticsQuickPickItemWithFilter extends IQuickPickItem {
+	kind: 'diagnostic-filter';
+	id: string;
+	filter: IDiagnosticVariableEntryFilterData;
+	icon?: ThemeIcon;
+}
+
 /**
  * Quick pick item for prompt instructions attachment.
  */
@@ -499,6 +518,14 @@ export class AttachContextAction extends Action2 {
 					isFile: false,
 					isDirectory: true,
 				});
+			} else if (isIDiagnosticsQuickPickItemWithFilter(pick)) {
+				toAttach.push({
+					id: pick.id,
+					name: pick.label,
+					value: pick.filter,
+					kind: 'diagnostic',
+					...pick.filter,
+				});
 			} else if (isIQuickPickItemWithResource(pick) && pick.resource) {
 				if (/\.(png|jpg|jpeg|bmp|gif|tiff)$/i.test(pick.resource.path)) {
 					// checks if the file is an image
@@ -750,6 +777,13 @@ export class AttachContextAction extends Action2 {
 			id: 'folder',
 		});
 
+		quickPickItems.push({
+			kind: 'diagnostic',
+			label: localize('chatContext.diagnstic', 'Problem...'),
+			iconClass: ThemeIcon.asClassName(Codicon.error),
+			id: 'diagnostic'
+		});
+
 		if (widget.location === ChatAgentLocation.Notebook) {
 			quickPickItems.push({
 				kind: 'command',
@@ -824,16 +858,33 @@ export class AttachContextAction extends Action2 {
 		}), clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, textModelService, instantiationService, '', context?.placeholder);
 	}
 
+	private async _showDiagnosticsPick(instantiationService: IInstantiationService): Promise<IDiagnosticsQuickPickItemWithFilter | undefined> {
+		const filter = await instantiationService.invokeFunction(accessor => createMarkersQuickPick(accessor));
+		if (!filter) {
+			return undefined;
+		}
+
+		return {
+			kind: 'diagnostic-filter',
+			id: IDiagnosticVariableEntryFilterData.id(filter),
+			label: IDiagnosticVariableEntryFilterData.label(filter),
+			filter,
+		};
+	}
+
 	private _show(quickInputService: IQuickInputService, commandService: ICommandService, widget: IChatWidget, quickChatService: IQuickChatService, quickPickItems: (IChatContextQuickPickItem | QuickPickItem)[] | undefined, clipboardService: IClipboardService, editorService: IEditorService, labelService: ILabelService, viewsService: IViewsService, chatEditingService: IChatEditingService | undefined, hostService: IHostService, fileService: IFileService, textModelService: ITextModelService, instantiationService: IInstantiationService, query: string = '', placeholder?: string) {
 		const providerOptions: AnythingQuickAccessProviderRunOptions = {
-			handleAccept: async (item: IChatContextQuickPickItem, isBackgroundAccept: boolean) => {
+			handleAccept: async (inputItem: IChatContextQuickPickItem, isBackgroundAccept: boolean) => {
+				let item: IChatContextQuickPickItem | undefined = inputItem;
 				if ('kind' in item && item.kind === 'folder') {
-					const folderItem = await this._showFolders(instantiationService);
-					if (!folderItem) {
-						this._show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, textModelService, instantiationService, '', placeholder);
-						return;
-					}
-					item = folderItem;
+					item = await this._showFolders(instantiationService);
+				} else if ('kind' in item && item.kind === 'diagnostic') {
+					item = await this._showDiagnosticsPick(instantiationService);
+				}
+
+				if (!item) {
+					this._show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, textModelService, instantiationService, '', placeholder);
+					return;
 				}
 
 				if ('prefix' in item) {
diff --git a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
index 522a72577568..a6f55ecebbe4 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
@@ -11,21 +11,23 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { Mimes } from '../../../../base/common/mime.js';
 import { basename, joinPath } from '../../../../base/common/resources.js';
+import { Mutable } from '../../../../base/common/types.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 { CodeDataTransfers, containsDragType, DocumentSymbolTransferData, extractEditorsDropData, extractSymbolDropData, IDraggedResourceEditorInput } from '../../../../platform/dnd/browser/dnd.js';
+import { CodeDataTransfers, containsDragType, DocumentSymbolTransferData, extractEditorsDropData, extractMarkerDropData, extractSymbolDropData, IDraggedResourceEditorInput, MarkerTransferData } from '../../../../platform/dnd/browser/dnd.js';
 import { FileType, IFileService, IFileSystemProvider } from '../../../../platform/files/common/files.js';
+import { MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.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 { IChatRequestVariableEntry, ISymbolVariableEntry } from '../common/chatModel.js';
+import { IChatRequestVariableEntry, IDiagnosticVariableEntry, IDiagnosticVariableEntryFilterData, ISymbolVariableEntry } from '../common/chatModel.js';
 import { ChatAttachmentModel } from './chatAttachmentModel.js';
 import { IChatInputStyles } from './chatInputPart.js';
 import { resizeImage } from './imageUtils.js';
@@ -35,7 +37,8 @@ enum ChatDragAndDropType {
 	FILE_EXTERNAL,
 	FOLDER,
 	IMAGE,
-	SYMBOL
+	SYMBOL,
+	MARKER,
 }
 
 export class ChatDragAndDrop extends Themable {
@@ -169,6 +172,8 @@ export class ChatDragAndDrop extends Themable {
 			return this.extensionService.extensions.some(ext => isProposedApiEnabled(ext, 'chatReferenceBinaryData')) ? ChatDragAndDropType.IMAGE : undefined;
 		} else if (containsDragType(e, CodeDataTransfers.SYMBOLS)) {
 			return ChatDragAndDropType.SYMBOL;
+		} else if (containsDragType(e, CodeDataTransfers.MARKERS)) {
+			return ChatDragAndDropType.MARKER;
 		} else if (containsDragType(e, DataTransfers.FILES)) {
 			return ChatDragAndDropType.FILE_EXTERNAL;
 		} else if (containsDragType(e, DataTransfers.INTERNAL_URI_LIST)) {
@@ -193,6 +198,7 @@ export class ChatDragAndDrop extends Themable {
 			case ChatDragAndDropType.FOLDER: return localize('folder', 'Folder');
 			case ChatDragAndDropType.IMAGE: return localize('image', 'Image');
 			case ChatDragAndDropType.SYMBOL: return localize('symbol', 'Symbol');
+			case ChatDragAndDropType.MARKER: return localize('problem', 'Problem');
 		}
 	}
 
@@ -224,6 +230,11 @@ export class ChatDragAndDrop extends Themable {
 			return [];
 		}
 
+		const markerData = extractMarkerDropData(e);
+		if (markerData) {
+			return this.resolveMarkerAttachContext(markerData);
+		}
+
 		if (containsDragType(e, CodeDataTransfers.SYMBOLS)) {
 			const data = extractSymbolDropData(e);
 			return this.resolveSymbolsAttachContext(data);
@@ -304,6 +315,33 @@ export class ChatDragAndDrop extends Themable {
 		});
 	}
 
+	private resolveMarkerAttachContext(markers: MarkerTransferData[]): IDiagnosticVariableEntry[] {
+		return markers.map((marker): IDiagnosticVariableEntry => {
+			const filter: Mutable<IDiagnosticVariableEntryFilterData> = {};
+			if (!('severity' in marker)) {
+				filter.filterUri = URI.revive(marker.uri);
+				filter.filterSeverity = MarkerSeverity.Warning;
+			} else {
+				filter.filterUri = URI.revive(marker.resource);
+				filter.filterSeverity = marker.severity;
+				filter.filterRange = {
+					startLineNumber: marker.startLineNumber,
+					startColumn: marker.startColumn,
+					endLineNumber: marker.endLineNumber,
+					endColumn: marker.endColumn
+				};
+			}
+
+			return {
+				kind: 'diagnostic',
+				id: IDiagnosticVariableEntryFilterData.id(filter),
+				name: IDiagnosticVariableEntryFilterData.label(filter),
+				value: filter,
+				...filter,
+			};
+		});
+	}
+
 	private setOverlay(target: HTMLElement, type: ChatDragAndDropType | undefined): void {
 		// Remove any previous overlay text
 		this.overlayText?.remove();
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
index 9c805598653b..0bf919d40f03 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
@@ -4,11 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { coalesce } from '../../../../../base/common/arrays.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
 import { isCancellationError } from '../../../../../base/common/errors.js';
+import * as glob from '../../../../../base/common/glob.js';
 import { IMarkdownString, MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { ResourceSet } from '../../../../../base/common/map.js';
 import { basename, dirname, joinPath, relativePath } from '../../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { IRange, Range } from '../../../../../editor/common/core/range.js';
 import { IDecorationOptions } from '../../../../../editor/common/editorCommon.js';
@@ -22,20 +26,19 @@ import { FileType, IFileService } from '../../../../../platform/files/common/fil
 import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
+import { IMarkerService, MarkerSeverity } from '../../../../../platform/markers/common/markers.js';
+import { PromptsConfig } from '../../../../../platform/prompts/common/config.js';
 import { IQuickAccessOptions } from '../../../../../platform/quickinput/common/quickAccess.js';
-import { IQuickInputService, IQuickPickItem } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
-import { getExcludes, ISearchConfiguration, IFileQuery, QueryType, ISearchComplete, ISearchService } from '../../../../services/search/common/search.js';
+import { getExcludes, IFileQuery, ISearchComplete, ISearchConfiguration, ISearchService, QueryType } from '../../../../services/search/common/search.js';
 import { ISymbolQuickPickItem } from '../../../search/browser/symbolsQuickAccess.js';
+import { IDiagnosticVariableEntryFilterData } from '../../common/chatModel.js';
 import { IChatRequestVariableValue, IDynamicVariable } from '../../common/chatVariables.js';
-import * as glob from '../../../../../base/common/glob.js';
 import { IChatWidget } from '../chat.js';
 import { ChatWidget, IChatWidgetContrib } from '../chatWidget.js';
 import { ChatFileReference } from './chatDynamicVariables/chatFileReference.js';
-import { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { ThemeIcon } from '../../../../../base/common/themables.js';
-import { Codicon } from '../../../../../base/common/codicons.js';
-import { PromptsConfig } from '../../../../../platform/prompts/common/config.js';
 
 export const dynamicVariableDecorationType = 'chat-dynamic-variable';
 
@@ -645,3 +648,57 @@ export class AddDynamicVariableAction extends Action2 {
 	}
 }
 registerAction2(AddDynamicVariableAction);
+
+export async function createMarkersQuickPick(accessor: ServicesAccessor): Promise<IDiagnosticVariableEntryFilterData | undefined> {
+	const markers = accessor.get(IMarkerService).read();
+	if (!markers.length) {
+		return;
+	}
+
+	const uriIdentityService = accessor.get(IUriIdentityService);
+	const labelService = accessor.get(ILabelService);
+	markers.sort((a, b) => uriIdentityService.extUri.compare(a.resource, b.resource) || b.severity - a.severity);
+
+	const severities = new Set<MarkerSeverity>();
+	type MarkerPickItem = IQuickPickItem & { resource?: URI; entry: IDiagnosticVariableEntryFilterData };
+	const items: (MarkerPickItem | IQuickPickSeparator)[] = [];
+	for (const marker of markers) {
+		if (!uriIdentityService.extUri.isEqual(marker.resource, (items.at(-1) as MarkerPickItem)?.resource)) {
+			items.push({ type: 'separator', label: labelService.getUriLabel(marker.resource, { relative: true }) });
+		}
+
+		severities.add(marker.severity);
+		items.push({
+			type: 'item',
+			resource: marker.resource,
+			label: marker.message,
+			description: localize('markers.panel.at.ln.col.number', "[Ln {0}, Col {1}]", '' + marker.startLineNumber, '' + marker.startColumn),
+			entry: { filterUri: marker.resource, filterRange: { startLineNumber: marker.startLineNumber, endLineNumber: marker.endLineNumber, startColumn: marker.startColumn, endColumn: marker.endColumn } }
+		});
+	}
+
+	if (items.length === 2) { // single error in a URI
+		return (items[1] as MarkerPickItem).entry;
+	}
+
+	if (items.length > 2) {
+		if (severities.has(MarkerSeverity.Error)) {
+			items.unshift({ type: 'item', label: localize('markers.panel.allErrors', 'All Errors'), entry: { filterSeverity: MarkerSeverity.Error } });
+		}
+		if (severities.has(MarkerSeverity.Warning)) {
+			items.unshift({ type: 'item', label: localize('markers.panel.allWarnings', 'All Warnings'), entry: { filterSeverity: MarkerSeverity.Warning } });
+		}
+		if (severities.has(MarkerSeverity.Info)) {
+			items.unshift({ type: 'item', label: localize('markers.panel.allInfos', 'All Infos'), entry: { filterSeverity: MarkerSeverity.Info } });
+		}
+	}
+
+
+	const quickInputService = accessor.get(IQuickInputService);
+	const quickPick = quickInputService.createQuickPick({ useSeparators: true });
+	quickPick.placeholder = localize('pickAProblem', 'Pick a problem to attach...');
+	quickPick.items = items;
+
+	return quickInputService.pick(items, { canPickMany: false }).then(v => v?.entry);
+}
+
diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index dec4623cd07f..2eccb6163ef2 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -21,6 +21,7 @@ import { IRange } from '../../../../editor/common/core/range.js';
 import { Location, SymbolKind, TextEdit } from '../../../../editor/common/languages.js';
 import { localize } from '../../../../nls.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
+import { MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { ICellEditOperation } from '../../notebook/common/notebookCommon.js';
 import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentResult, IChatAgentService, IChatWelcomeMessageContent, reviveSerializedAgent } from './chatAgents.js';
 import { ChatRequestTextPart, IParsedChatRequest, reviveParsedChatRequest } from './chatParserTypes.js';
@@ -87,7 +88,39 @@ export interface ILinkVariableEntry extends Omit<IBaseChatRequestVariableEntry,
 	readonly value: URI;
 }
 
-export type IChatRequestVariableEntry = IChatRequestImplicitVariableEntry | IChatRequestPasteVariableEntry | ISymbolVariableEntry | ICommandResultVariableEntry | ILinkVariableEntry | IBaseChatRequestVariableEntry;
+export interface IDiagnosticVariableEntryFilterData {
+	readonly filterUri?: URI;
+	readonly filterSeverity?: MarkerSeverity;
+	readonly filterRange?: IRange;
+}
+
+export namespace IDiagnosticVariableEntryFilterData {
+	export function id(data: IDiagnosticVariableEntryFilterData) {
+		return [data.filterUri, data.filterSeverity, data.filterRange?.startLineNumber].join(':');
+	}
+
+	export function label(data: IDiagnosticVariableEntryFilterData) {
+		let labelStr: string;
+		if (data.filterSeverity) {
+			const sev = data.filterRange ? MarkerSeverity.toString(data.filterSeverity) : MarkerSeverity.toStringPlural(data.filterSeverity);
+			labelStr = data.filterUri
+				? localize('chat.attachment.problems.severity', "{0} in {1}", sev, basename(data.filterUri))
+				: localize('chat.attachment.problems.severity2', "All {0}", sev);
+		} else {
+			labelStr = data.filterUri
+				? localize('chat.attachment.problems.severity3', "Problems in {0}", basename(data.filterUri))
+				: localize('chat.attachment.problems.severity4', "All Problems");
+		}
+
+		return labelStr;
+	}
+}
+
+export interface IDiagnosticVariableEntry extends Omit<IBaseChatRequestVariableEntry, 'kind'>, IDiagnosticVariableEntryFilterData {
+	readonly kind: 'diagnostic';
+}
+
+export type IChatRequestVariableEntry = IChatRequestImplicitVariableEntry | IChatRequestPasteVariableEntry | ISymbolVariableEntry | ICommandResultVariableEntry | ILinkVariableEntry | IBaseChatRequestVariableEntry | IDiagnosticVariableEntry;
 
 export function isImplicitVariableEntry(obj: IChatRequestVariableEntry): obj is IChatRequestImplicitVariableEntry {
 	return obj.kind === 'implicit';
@@ -101,6 +134,10 @@ export function isLinkVariableEntry(obj: IChatRequestVariableEntry): obj is ILin
 	return obj.kind === 'link';
 }
 
+export function isDiagnosticsVariableEntry(obj: IChatRequestVariableEntry): obj is IDiagnosticVariableEntry {
+	return obj.kind === 'diagnostic';
+}
+
 export function isChatRequestVariableEntry(obj: unknown): obj is IChatRequestVariableEntry {
 	const entry = obj as IChatRequestVariableEntry;
 	return typeof entry === 'object' &&
diff --git a/src/vs/workbench/contrib/markers/browser/markersView.ts b/src/vs/workbench/contrib/markers/browser/markersView.ts
index 85ad02f34be6..f80cfdeebaa9 100644
--- a/src/vs/workbench/contrib/markers/browser/markersView.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersView.ts
@@ -5,57 +5,59 @@
 
 import './media/markers.css';
 
-import { URI } from '../../../../base/common/uri.js';
 import * as dom from '../../../../base/browser/dom.js';
+import { IKeyboardEvent, StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { IIdentityProvider, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
+import { ITableContextMenuEvent, ITableEvent } from '../../../../base/browser/ui/table/table.js';
+import { ITreeContextMenuEvent, ITreeElement, ITreeEvent, ITreeNode, ITreeRenderer } from '../../../../base/browser/ui/tree/tree.js';
 import { IAction, Separator } from '../../../../base/common/actions.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from '../../../services/editor/common/editorService.js';
-import { Marker, ResourceMarkers, RelatedInformation, MarkerChangesEvent, MarkersModel, compareMarkersByUri, MarkerElement, MarkerTableItem } from './markersModel.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { MarkersFilters, IMarkersFiltersChangeEvent } from './markersViewActions.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import Messages from './messages.js';
-import { RangeHighlightDecorations } from '../../../browser/codeeditor.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { groupBy } from '../../../../base/common/arrays.js';
+import { Event, Relay } from '../../../../base/common/event.js';
+import { IExpression } from '../../../../base/common/glob.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { deepClone } from '../../../../base/common/objects.js';
+import { isDefined } from '../../../../base/common/types.js';
+import { URI } from '../../../../base/common/uri.js';
 import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.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 { Iterable } from '../../../../base/common/iterator.js';
-import { ITreeElement, ITreeNode, ITreeContextMenuEvent, ITreeRenderer, ITreeEvent } from '../../../../base/browser/ui/tree/tree.js';
-import { Relay, Event } from '../../../../base/common/event.js';
-import { WorkbenchObjectTree, IListService, IWorkbenchObjectTreeOptions, IOpenEvent } from '../../../../platform/list/browser/listService.js';
-import { FilterOptions } from './markersFilterOptions.js';
-import { IExpression } from '../../../../base/common/glob.js';
-import { deepClone } from '../../../../base/common/objects.js';
-import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
-import { FilterData, Filter, VirtualDelegate, ResourceMarkersRenderer, MarkerRenderer, RelatedInformationRenderer, MarkersWidgetAccessibilityProvider, MarkersViewModel } from './markersTreeViewer.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { fillInMarkersDragData, MarkerTransferData } from '../../../../platform/dnd/browser/dnd.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 { StandardKeyboardEvent, IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { ResourceLabels } from '../../../browser/labels.js';
+import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
+import { IListService, IOpenEvent, IWorkbenchObjectTreeOptions, WorkbenchObjectTree } from '../../../../platform/list/browser/listService.js';
 import { IMarkerService, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
-import { MementoObject, Memento } from '../../../common/memento.js';
-import { IIdentityProvider, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
-import { IViewPaneOptions, FilterViewPane } from '../../../browser/parts/views/viewPane.js';
-import { IViewDescriptorService } from '../../../common/views.js';
 import { IOpenerService, withSelection } from '../../../../platform/opener/common/opener.js';
-import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
-import { DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { groupBy } from '../../../../base/common/arrays.js';
-import { ResourceMap } from '../../../../base/common/map.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
+import { RangeHighlightDecorations } from '../../../browser/codeeditor.js';
+import { ResourceListDnDHandler } from '../../../browser/dnd.js';
+import { ResourceLabels } from '../../../browser/labels.js';
+import { FilterViewPane, IViewPaneOptions } from '../../../browser/parts/views/viewPane.js';
 import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { Memento, MementoObject } from '../../../common/memento.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { Markers, MarkersContextKeys, MarkersViewMode } from '../common/markers.js';
 import { IMarkersView } from './markers.js';
-import { ResourceListDnDHandler } from '../../../browser/dnd.js';
-import { ITableContextMenuEvent, ITableEvent } from '../../../../base/browser/ui/table/table.js';
+import { FilterOptions } from './markersFilterOptions.js';
+import { compareMarkersByUri, Marker, MarkerChangesEvent, MarkerElement, MarkersModel, MarkerTableItem, RelatedInformation, ResourceMarkers } from './markersModel.js';
 import { MarkersTable } from './markersTable.js';
-import { Markers, MarkersContextKeys, MarkersViewMode } from '../common/markers.js';
-import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
-import { IHoverService } from '../../../../platform/hover/browser/hover.js';
-import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
+import { Filter, FilterData, MarkerRenderer, MarkersViewModel, MarkersWidgetAccessibilityProvider, RelatedInformationRenderer, ResourceMarkersRenderer, VirtualDelegate } from './markersTreeViewer.js';
+import { IMarkersFiltersChangeEvent, MarkersFilters } from './markersViewActions.js';
+import Messages from './messages.js';
 
 function createResourceMarkersIterator(resourceMarkers: ResourceMarkers): Iterable<ITreeElement<MarkerElement>> {
 	return Iterable.map(resourceMarkers.markers, m => {
@@ -495,18 +497,7 @@ export class MarkersView extends FilterViewPane implements IMarkersView {
 				filter: this.filter,
 				accessibilityProvider: this.widgetAccessibilityProvider,
 				identityProvider: this.widgetIdentityProvider,
-				dnd: this.instantiationService.createInstance(ResourceListDnDHandler, (element) => {
-					if (element instanceof ResourceMarkers) {
-						return element.resource;
-					}
-					if (element instanceof Marker) {
-						return withSelection(element.resource, element.range);
-					}
-					if (element instanceof RelatedInformation) {
-						return withSelection(element.raw.resource, element.raw);
-					}
-					return null;
-				}),
+				dnd: this.instantiationService.createInstance(MarkersListDnDHandler),
 				expandOnlyOnTwistieClick: (e: MarkerElement) => e instanceof Marker && e.relatedInformation.length > 0,
 				overrideStyles: this.getLocationBasedColors().listOverrideStyles,
 				selectionNavigation: true,
@@ -1078,3 +1069,40 @@ class MarkersTree extends WorkbenchObjectTree<MarkerElement, FilterData> impleme
 		super.layout(height, width);
 	}
 }
+
+class MarkersListDnDHandler extends ResourceListDnDHandler<MarkerElement | MarkerTableItem> {
+	constructor(
+		@IInstantiationService instantiationService: IInstantiationService
+	) {
+		super(element => {
+			if (element instanceof MarkerTableItem) {
+				return withSelection(element.resource, element.range);
+			} else if (element instanceof ResourceMarkers) {
+				return element.resource;
+			} else if (element instanceof Marker) {
+				return withSelection(element.resource, element.range);
+			} else if (element instanceof RelatedInformation) {
+				return withSelection(element.raw.resource, element.raw);
+			}
+			return null;
+		}, instantiationService);
+	}
+
+	protected override onWillDragElements(elements: (MarkerElement | MarkerTableItem)[], originalEvent: DragEvent) {
+		const data = elements.map((e): MarkerTransferData | undefined => {
+			if (e instanceof RelatedInformation || e instanceof Marker) {
+				return e.marker;
+			}
+			if (e instanceof ResourceMarkers) {
+				return { uri: e.resource };
+			}
+			return undefined;
+		}).filter(isDefined);
+
+		if (!data.length) {
+			return;
+		}
+
+		fillInMarkersDragData(data, originalEvent);
+	}
+}
diff --git a/src/vscode-dts/vscode.proposed.chatReferenceDiagnostic.d.ts b/src/vscode-dts/vscode.proposed.chatReferenceDiagnostic.d.ts
new file mode 100644
index 000000000000..855015de8912
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.chatReferenceDiagnostic.d.ts
@@ -0,0 +1,23 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 ChatPromptReference {
+		/**
+		 * The value of this reference. The `string | Uri | Location` types are used today, but this could expand in the future.
+		 */
+		readonly value: string | Uri | Location | ChatReferenceDiagnostic | unknown;
+	}
+
+	export class ChatReferenceDiagnostic {
+		/**
+		 * All attached diagnostics. An array of uri-diagnostics tuples or an empty array.
+		 */
+		readonly diagnostics: [Uri, Diagnostic[]][];
+
+		protected constructor(diagnostics: [Uri, Diagnostic[]][]);
+	}
+}

From 0629ca02c43b1508cb0824d37ca8ed0ea99b74af Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Thu, 20 Feb 2025 14:03:16 +1100
Subject: [PATCH 0131/1815] Initial implementation of ModifiedNotebookEntry
 (#241275)

* Initial implementation of ModifiedNotebookEntry

* Updates

* Ensure acceptAgentEdits is async

* Udpates

* Updates
---
 .../chatEditingModifiedNotebookEntry.ts       | 183 ++++++++++++++++--
 .../browser/chatEditing/chatEditingSession.ts |  15 +-
 .../chatEditingNotebookFileSystemProvider.ts  | 121 ++++++++++++
 .../browser/contrib/chatEdit/contribution.ts  |   4 +
 4 files changed, 303 insertions(+), 20 deletions(-)
 create mode 100644 src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/chatEditingNotebookFileSystemProvider.ts

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 5f6deab0d153..a36077d5d64b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -4,32 +4,125 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { assert } from '../../../../../base/common/assert.js';
+import { decodeBase64, encodeBase64, streamToBuffer, VSBuffer } from '../../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { DisposableStore, IReference } from '../../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../../base/common/network.js';
-import { ITransaction, IObservable, constObservable } from '../../../../../base/common/observable.js';
+import { ITransaction, IObservable, observableValue } 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 { OffsetEdit } from '../../../../../editor/common/core/offsetEdit.js';
 import { TextEdit } from '../../../../../editor/common/languages.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 { IEditorPane } from '../../../../common/editor.js';
-import { ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
-import { IModifiedFileEntryEditorIntegration } from '../../common/chatEditingService.js';
+import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { SnapshotContext } from '../../../../services/workingCopy/common/fileWorkingCopy.js';
+import { ChatEditingNotebookFileSystemProvider } from '../../../notebook/browser/contrib/chatEdit/chatEditingNotebookFileSystemProvider.js';
+import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
+import { ICellEditOperation, IResolvedNotebookEditorModel, NotebookData, NotebookSetting, TransientOptions } from '../../../notebook/common/notebookCommon.js';
+import { INotebookEditorModelResolverService } from '../../../notebook/common/notebookEditorModelResolverService.js';
+import { INotebookService } from '../../../notebook/common/notebookService.js';
+import { ChatEditKind, IModifiedFileEntryEditorIntegration } from '../../common/chatEditingService.js';
 import { IChatResponseModel } from '../../common/chatModel.js';
-import { AbstractChatEditingModifiedFileEntry, ISnapshotEntry } from './chatEditingModifiedFileEntry.js';
+import { IChatService } from '../../common/chatService.js';
+import { AbstractChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISnapshotEntry } from './chatEditingModifiedFileEntry.js';
+import { ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
 
 export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifiedFileEntry {
 
-	override originalURI: URI = URI.parse('todo://todo/todo');
+	private readonly modifiedModel: NotebookTextModel;
+	private readonly originalModel: NotebookTextModel;
+	override originalURI: URI;
+	override initialContent: string;
+
+	private readonly _changesCount = observableValue<number>(this, 0);
+	override changesCount: IObservable<number> = this._changesCount;
+
+	public static async create(uri: URI, _multiDiffEntryDelegate: { collapse: (transaction: ITransaction | undefined) => void }, telemetryInfo: IModifiedEntryTelemetryInfo, chatKind: ChatEditKind, initialContent: string | undefined, instantiationService: IInstantiationService): Promise<AbstractChatEditingModifiedFileEntry> {
+		return instantiationService.invokeFunction(async accessor => {
+			const notebookService = accessor.get(INotebookService);
+			const resolver = accessor.get(INotebookEditorModelResolverService);
+			const configurationServie = accessor.get(IConfigurationService);
+			const resourceRef: IReference<IResolvedNotebookEditorModel> = await resolver.resolve(uri);
+			const notebook = resourceRef.object.notebook;
+			const originalUri = ChatEditingNotebookFileSystemProvider.getSnapshotFileURI(telemetryInfo.requestId, notebook.uri.path);
+
+			const [options, buffer] = await Promise.all([
+				notebookService.withNotebookDataProvider(resourceRef.object.notebook.notebookType),
+				notebookService.createNotebookTextDocumentSnapshot(notebook.uri, SnapshotContext.Backup, CancellationToken.None).then(s => streamToBuffer(s))
+			]);
+			const originalDisposables = new DisposableStore();
+			originalDisposables.add(ChatEditingNotebookFileSystemProvider.registerFile(originalUri, buffer));
+
+			const originalRef = await resolver.resolve(originalUri, notebook.viewType);
+			originalDisposables.add(originalRef);
+			if (initialContent) {
+				restoreSnapshot(originalRef.object.notebook, initialContent);
+			}
+			initialContent = initialContent || createSnapshot(originalRef.object.notebook, options.serializer.options, configurationServie);
+			return instantiationService.createInstance(ChatEditingModifiedNotebookEntry, resourceRef, originalRef, _multiDiffEntryDelegate, options.serializer.options, telemetryInfo, chatKind, initialContent);
+		});
+	}
 
-	override initialContent: string = 'JSON.stringify(NotebookData)';
 
-	override changesCount: IObservable<number> = constObservable(Number.MAX_SAFE_INTEGER);
+	constructor(
+		modifiedResourceRef: IReference<IResolvedNotebookEditorModel>,
+		originalResourceRef: IReference<IResolvedNotebookEditorModel>,
+		private readonly _multiDiffEntryDelegate: { collapse: (transaction: ITransaction | undefined) => void },
+		private readonly transientOptions: TransientOptions | undefined,
+		telemetryInfo: IModifiedEntryTelemetryInfo,
+		kind: ChatEditKind,
+		initialContent: string,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IFilesConfigurationService fileConfigService: IFilesConfigurationService,
+		@IChatService chatService: IChatService,
+		@IFileService fileService: IFileService,
+		@IInstantiationService instantiationService: IInstantiationService
+
+	) {
+		super(modifiedResourceRef.object.notebook.uri, telemetryInfo, kind, configurationService, fileConfigService, chatService, fileService, instantiationService);
+		this._register(modifiedResourceRef);
+		this._register(originalResourceRef);
+		this.modifiedModel = modifiedResourceRef.object.notebook;
+		this.originalModel = originalResourceRef.object.notebook;
+		this.originalURI = this.originalModel.uri;
+		this.initialContent = initialContent;
+	}
+
+	protected override async _doAccept(tx: ITransaction | undefined): Promise<void> {
+		const outputSizeLimit = this.configurationService.getValue<number>(NotebookSetting.outputBackupSizeLimit) * 1024;
+		const snapshot = this.modifiedModel.createSnapshot({ context: SnapshotContext.Backup, outputSizeLimit, transientOptions: this.transientOptions });
+		this.originalModel.restoreSnapshot(snapshot, this.transientOptions);
+		this._changesCount.set(0, tx);
+		// this._diffInfo.set(nullDocumentDiff, tx);
+		// this._edit = OffsetEdit.empty;
+		await this._collapse(tx);
 
-	protected override _doAccept(tx: ITransaction | undefined): Promise<void> {
-		throw new Error('Method not implemented.');
 	}
 
-	protected override _doReject(tx: ITransaction | undefined): Promise<void> {
-		throw new Error('Method not implemented.');
+	protected override async _doReject(tx: ITransaction | undefined): Promise<void> {
+		if (this.createdInRequestId === this._telemetryInfo.requestId) {
+			// await this.docFileEditorModel.revert({ soft: true });
+			await this._fileService.del(this.modifiedURI);
+			this._onDidDelete.fire();
+		} else {
+			const outputSizeLimit = this.configurationService.getValue<number>(NotebookSetting.outputBackupSizeLimit) * 1024;
+			const snapshot = this.originalModel.createSnapshot({ context: SnapshotContext.Backup, outputSizeLimit, transientOptions: this.transientOptions });
+			this.modifiedModel.restoreSnapshot(snapshot, this.transientOptions);
+			// if (this._allEditsAreFromUs) {
+			// 	// 	// 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 });
+			// }
+			await this._collapse(tx);
+		}
+
+	}
+	private async _collapse(transaction: ITransaction | undefined): Promise<void> {
+		this._multiDiffEntryDelegate.collapse(transaction);
 	}
 
 	protected override _createEditorIntegration(editor: IEditorPane): IModifiedFileEntryEditorIntegration {
@@ -48,18 +141,78 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	}
 
 	override createSnapshot(requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry {
-		throw new Error('Method not implemented.');
+		return {
+			resource: this.modifiedURI,
+			languageId: 'notebook',
+			snapshotUri: ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(this._telemetryInfo.sessionId, requestId, undoStop, this.modifiedURI.path),
+			original: this.initialContent,
+			current: createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService),
+			originalToCurrentEdit: OffsetEdit.empty,
+			state: this.state.get(),
+			telemetryInfo: this.telemetryInfo,
+		};
 	}
 
 	override equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean {
-		throw new Error('Method not implemented.');
+		return !!snapshot &&
+			this.modifiedURI.toString() === snapshot.resource.toString() &&
+			this.state.get() === snapshot.state &&
+			createSnapshot(this.originalModel, this.transientOptions, this.configurationService) === snapshot.original &&
+			createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService) === snapshot.current;
+
 	}
 
 	override restoreFromSnapshot(snapshot: ISnapshotEntry): void {
-		throw new Error('Method not implemented.');
+		this._stateObs.set(snapshot.state, undefined);
+		restoreSnapshot(this.originalModel, snapshot.original);
+		restoreSnapshot(this.modifiedModel, snapshot.current);
+		// this._edit = snapshot.originalToCurrentEdit;
+		// this._updateDiffInfoSeq();
+		restoreSnapshot(this.modifiedModel, snapshot.current);
+
 	}
 
 	override resetToInitialContent(): void {
-		throw new Error('Method not implemented.');
+		restoreSnapshot(this.modifiedModel, this.initialContent);
 	}
 }
+
+const BufferMarker = 'ArrayBuffer-4f56482b-5a03-49ba-8356-210d3b0c1c3d';
+function createSnapshot(notebook: NotebookTextModel, transientOptions: TransientOptions | undefined, configurationService: IConfigurationService): string {
+	const outputSizeLimit = configurationService.getValue<number>(NotebookSetting.outputBackupSizeLimit) * 1024;
+	return serializeSnapshot(notebook.createSnapshot({ context: SnapshotContext.Backup, outputSizeLimit, transientOptions }), transientOptions);
+}
+
+function restoreSnapshot(notebook: NotebookTextModel, snapshot: string): void {
+	const { transientOptions, data } = deserializeSnapshot(snapshot);
+	notebook.restoreSnapshot(data, transientOptions);
+}
+
+function serializeSnapshot(data: NotebookData, transientOptions: TransientOptions | undefined): string {
+	return JSON.stringify([
+		JSON.stringify(transientOptions)
+		, JSON.stringify(data, (_key, value) => {
+			if (value instanceof VSBuffer) {
+				return {
+					type: BufferMarker,
+					data: encodeBase64(value)
+				};
+			}
+			return value;
+		})
+	]);
+}
+
+function deserializeSnapshot(snapshot: string): { transientOptions: TransientOptions | undefined; data: NotebookData } {
+	const [transientOptionsStr, dataStr] = JSON.parse(snapshot);
+	const transientOptions = transientOptionsStr ? JSON.parse(transientOptionsStr) as TransientOptions : undefined;
+
+	const data: NotebookData = JSON.parse(dataStr, (_key, value) => {
+		if (value && value.type === BufferMarker) {
+			return decodeBase64(value.data);
+		}
+		return value;
+	});
+
+	return { transientOptions, data };
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 281bf906fc31..077425865e0c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -49,6 +49,7 @@ import { AbstractChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISna
 import { ChatEditingModifiedDocumentEntry } from './chatEditingModifiedDocumentEntry.js';
 import { ChatEditingTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
 import { CellUri, ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
+import { ChatEditingModifiedNotebookEntry } from './chatEditingModifiedNotebookEntry.js';
 
 const STORAGE_CONTENTS_FOLDER = 'contents';
 const STORAGE_STATE_FILE = 'state.json';
@@ -1020,12 +1021,16 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 	}
 
 	private async _createModifiedFileEntry(resource: URI, telemetryInfo: IModifiedEntryTelemetryInfo, mustExist = false, initialContent: string | undefined): Promise<AbstractChatEditingModifiedFileEntry> {
+		const multiDiffEntryDelegate = { collapse: (transaction: ITransaction | undefined) => this._collapse(resource, transaction) };
+		const chatKind = mustExist ? ChatEditKind.Created : ChatEditKind.Modified;
 		try {
-			const ref = await this._textModelService.createModelReference(resource);
-			const ctor = this._notebookService.hasSupportedNotebooks(resource)
-				? ChatEditingModifiedDocumentEntry // TODO@DonJayamanne use NotebookEntry once ready
-				: ChatEditingModifiedDocumentEntry;
-			return this._instantiationService.createInstance(ctor, ref, { collapse: (transaction: ITransaction | undefined) => this._collapse(resource, transaction) }, telemetryInfo, mustExist ? ChatEditKind.Created : ChatEditKind.Modified, initialContent);
+			const notebookUri = CellUri.parse(resource)?.notebook || resource;
+			if (this._notebookService.hasSupportedNotebooks(notebookUri)) {
+				return ChatEditingModifiedNotebookEntry.create(notebookUri, multiDiffEntryDelegate, telemetryInfo, chatKind, initialContent, this._instantiationService);
+			} else {
+				const ref = await this._textModelService.createModelReference(resource);
+				return this._instantiationService.createInstance(ChatEditingModifiedDocumentEntry, ref, multiDiffEntryDelegate, telemetryInfo, chatKind, initialContent);
+			}
 		} catch (err) {
 			if (mustExist) {
 				throw err;
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/chatEditingNotebookFileSystemProvider.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/chatEditingNotebookFileSystemProvider.ts
new file mode 100644
index 000000000000..0b3d8cd343d0
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/chatEditingNotebookFileSystemProvider.ts
@@ -0,0 +1,121 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../../base/common/map.js';
+import { ReadableStreamEvents } from '../../../../../../base/common/stream.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { IFileService, IFileSystemProvider, FileSystemProviderCapabilities, IFileChange, IWatchOptions, IStat, IFileDeleteOptions, IFileOverwriteOptions, IFileWriteOptions, IFileReadStreamOptions, IFileOpenOptions, FileType } from '../../../../../../platform/files/common/files.js';
+import { IWorkbenchContribution } from '../../../../../common/contributions.js';
+
+
+export class ChatEditingNotebookFileSystemProviderContrib extends Disposable implements IWorkbenchContribution {
+	static ID = 'chatEditingNotebookFileSystemProviderContribution';
+	constructor(
+		@IFileService private readonly fileService: IFileService) {
+
+		super();
+		this._register(this.fileService.registerProvider(ChatEditingNotebookFileSystemProvider.scheme, new ChatEditingNotebookFileSystemProvider()));
+	}
+}
+
+export class ChatEditingNotebookFileSystemProvider implements IFileSystemProvider {
+	public static readonly scheme = 'chat-editing-notebook-model';
+	private static registeredFiles = new ResourceMap<VSBuffer>();
+
+	public static getEmptyFileURI(): URI {
+		return URI.from({
+			scheme: ChatEditingNotebookFileSystemProvider.scheme,
+			query: JSON.stringify({ kind: 'empty' }),
+		});
+	}
+
+	public static getFileURI(documentId: string, path: string): URI {
+		return URI.from({
+			scheme: ChatEditingNotebookFileSystemProvider.scheme,
+			path,
+			query: JSON.stringify({ kind: 'doc' }),
+		});
+	}
+	public static getSnapshotFileURI(requestId: string | undefined, path: string): URI {
+		return URI.from({
+			scheme: ChatEditingNotebookFileSystemProvider.scheme,
+			path,
+			query: JSON.stringify({ requestId: requestId ?? '' }),
+		});
+	}
+
+	public readonly capabilities: FileSystemProviderCapabilities = FileSystemProviderCapabilities.Readonly | FileSystemProviderCapabilities.FileAtomicRead | FileSystemProviderCapabilities.FileReadWrite;
+	public static registerFile(resource: URI, buffer: VSBuffer): IDisposable {
+		ChatEditingNotebookFileSystemProvider.registeredFiles.set(resource, buffer);
+		return {
+			dispose() {
+				if (ChatEditingNotebookFileSystemProvider.registeredFiles.get(resource) === buffer) {
+					ChatEditingNotebookFileSystemProvider.registeredFiles.delete(resource);
+				}
+			}
+		};
+	}
+
+	readonly onDidChangeCapabilities = Event.None;
+	readonly onDidChangeFile: Event<readonly IFileChange[]> = Event.None;
+	watch(_resource: URI, _opts: IWatchOptions): IDisposable {
+		return Disposable.None;
+	}
+	async stat(_resource: URI): Promise<IStat> {
+		return {
+			type: FileType.File,
+			ctime: 0,
+			mtime: 0,
+			size: 0
+		};
+	}
+	mkdir(_resource: URI): Promise<void> {
+		throw new Error('Method not implemented1.');
+	}
+	readdir(_resource: URI): Promise<[string, FileType][]> {
+		throw new Error('Method not implemented2.');
+	}
+	delete(_resource: URI, _opts: IFileDeleteOptions): Promise<void> {
+		throw new Error('Method not implemented3.');
+	}
+	rename(_from: URI, _to: URI, _opts: IFileOverwriteOptions): Promise<void> {
+		throw new Error('Method not implemented4.');
+	}
+	copy?(_from: URI, _to: URI, _opts: IFileOverwriteOptions): Promise<void> {
+		throw new Error('Method not implemented5.');
+	}
+	async readFile(resource: URI): Promise<Uint8Array> {
+		const buffer = ChatEditingNotebookFileSystemProvider.registeredFiles.get(resource);
+		if (!buffer) {
+			throw new Error('File not found');
+		}
+		return buffer.buffer;
+	}
+	writeFile?(__resource: URI, _content: Uint8Array, _opts: IFileWriteOptions): Promise<void> {
+		throw new Error('Method not implemented7.');
+	}
+	readFileStream?(__resource: URI, _opts: IFileReadStreamOptions, _token: CancellationToken): ReadableStreamEvents<Uint8Array> {
+		throw new Error('Method not implemented8.');
+	}
+	open?(__resource: URI, _opts: IFileOpenOptions): Promise<number> {
+		throw new Error('Method not implemented9.');
+	}
+	close?(_fd: number): Promise<void> {
+		throw new Error('Method not implemented10.');
+	}
+	read?(_fd: number, _pos: number, _data: Uint8Array, _offset: number, _length: number): Promise<number> {
+		throw new Error('Method not implemented11.');
+	}
+	write?(_fd: number, _pos: number, _data: Uint8Array, _offset: number, _length: number): Promise<number> {
+		throw new Error('Method not implemented12.');
+	}
+	cloneFile?(_from: URI, __to: URI): Promise<void> {
+		throw new Error('Method not implemented13.');
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/contribution.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/contribution.ts
index 6b8387bd9086..b8123bc8c092 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/contribution.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/contribution.ts
@@ -9,9 +9,13 @@ import { registerNotebookContribution } from '../../notebookEditorExtensions.js'
 import { InstantiationType, registerSingleton } from '../../../../../../platform/instantiation/common/extensions.js';
 import { INotebookOriginalCellModelFactory, OriginalNotebookCellModelFactory } from './notebookOriginalCellModelFactory.js';
 import { NotebookChatEditorControllerContrib } from './notebookChatEditController.js';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../../../common/contributions.js';
+import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditingNotebookFileSystemProvider.js';
 
 
 registerNotebookContribution(NotebookChatEditorControllerContrib.ID, NotebookChatEditorControllerContrib);
 registerSingleton(INotebookOriginalModelReferenceFactory, NotebookOriginalModelReferenceFactory, InstantiationType.Delayed);
 registerSingleton(INotebookModelSynchronizerFactory, NotebookModelSynchronizerFactory, InstantiationType.Delayed);
 registerSingleton(INotebookOriginalCellModelFactory, OriginalNotebookCellModelFactory, InstantiationType.Delayed);
+
+registerWorkbenchContribution2(ChatEditingNotebookFileSystemProviderContrib.ID, ChatEditingNotebookFileSystemProviderContrib, WorkbenchPhase.BlockStartup);

From f23861839fb21c44102dac215998647b4cd02840 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 19 Feb 2025 20:25:51 -0800
Subject: [PATCH 0132/1815] Fix leaking previous ChatModel after clearing
 session (#241294)

---
 .../contrib/chat/browser/actions/chatCodeblockActions.ts  | 8 +++++---
 src/vs/workbench/contrib/chat/browser/chat.ts             | 2 +-
 .../browser/chatContentParts/chatMarkdownContentPart.ts   | 4 ++--
 src/vs/workbench/contrib/chat/browser/chatListRenderer.ts | 6 ++++++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
index baf3f39e7c0b..aa90fc63047d 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
@@ -450,8 +450,9 @@ export function registerChatCodeBlockActions() {
 		const focused = !widget.inputEditor.hasWidgetFocus() && widget.getFocus();
 		const focusedResponse = isResponseVM(focused) ? focused : undefined;
 
-		const currentResponse = curCodeBlockInfo ?
-			curCodeBlockInfo.element :
+		const elementId = curCodeBlockInfo?.elementId;
+		const element = elementId ? widget.viewModel?.getItems().find(item => item.id === elementId) : undefined;
+		const currentResponse = element ??
 			(focusedResponse ?? widget.viewModel?.getItems().reverse().find((item): item is IChatResponseViewModel => isResponseVM(item)));
 		if (!currentResponse || !isResponseVM(currentResponse)) {
 			return;
@@ -531,8 +532,9 @@ function getContextFromEditor(editor: ICodeEditor, accessor: ServicesAccessor):
 		return;
 	}
 
+	const element = widget?.viewModel?.getItems().find(item => item.id === codeBlockInfo.elementId);
 	return {
-		element: codeBlockInfo.element,
+		element,
 		codeBlockIndex: codeBlockInfo.codeBlockIndex,
 		code: editor.getValue(),
 		languageId: editor.getModel()!.getLanguageId(),
diff --git a/src/vs/workbench/contrib/chat/browser/chat.ts b/src/vs/workbench/contrib/chat/browser/chat.ts
index 982143743ce4..0d3ff60ded22 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.ts
@@ -136,7 +136,7 @@ export interface IChatAccessibilityService {
 export interface IChatCodeBlockInfo {
 	readonly ownerMarkdownPartId: string;
 	readonly codeBlockIndex: number;
-	readonly element: ChatTreeItem;
+	readonly elementId: string;
 	readonly uri: URI | undefined;
 	readonly uriPromise: Promise<URI | undefined>;
 	codemapperUri: URI | undefined;
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
index 215acff06b2a..f97705b93034 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
@@ -130,7 +130,7 @@ export class ChatMarkdownContentPart extends Disposable implements IChatContentP
 					const info: IChatCodeBlockInfo = new class {
 						readonly ownerMarkdownPartId = ownerMarkdownPartId;
 						readonly codeBlockIndex = globalIndex;
-						readonly element = element;
+						readonly elementId = element.id;
 						readonly isStreaming = !rendererOptions.renderCodeBlockPills;
 						codemapperUri = undefined; // will be set async
 						public get uri() {
@@ -165,7 +165,7 @@ export class ChatMarkdownContentPart extends Disposable implements IChatContentP
 					const info: IChatCodeBlockInfo = new class {
 						readonly ownerMarkdownPartId = ownerMarkdownPartId;
 						readonly codeBlockIndex = globalIndex;
-						readonly element = element;
+						readonly elementId = element.id;
 						readonly isStreaming = !isCodeBlockComplete;
 						readonly codemapperUri = codemapperUri;
 						public get uri() {
diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index 8f5d0743d042..bfe7cad91f96 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -1014,6 +1014,12 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 	disposeElement(node: ITreeNode<ChatTreeItem, FuzzyScore>, index: number, templateData: IChatListItemTemplate): void {
 		this.traceLayout('disposeElement', `Disposing element, index=${index}`);
 		templateData.elementDisposables.clear();
+
+		// Don't retain the toolbar context which includes chat viewmodels
+		if (templateData.titleToolbar) {
+			templateData.titleToolbar.context = undefined;
+		}
+		templateData.footerToolbar.context = undefined;
 	}
 
 	disposeTemplate(templateData: IChatListItemTemplate): void {

From ad9c5fda0c1004f9de462b9de01f5794a11990ee Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Wed, 19 Feb 2025 22:05:54 -0800
Subject: [PATCH 0133/1815] debt: dispose notification action runner (#241273)

---
 .../browser/parts/notifications/notificationsViewer.ts        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
index c1880ef981bd..389569cf5a7c 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
@@ -491,7 +491,7 @@ export class NotificationTemplateRenderer extends Disposable {
 		if (notification.expanded && isNonEmptyArray(primaryActions)) {
 			const that = this;
 
-			const actionRunner: IActionRunner = new class extends ActionRunner {
+			const actionRunner: IActionRunner = this.inputDisposables.add(new class extends ActionRunner {
 				protected override async runAction(action: IAction): Promise<void> {
 
 					// Run action
@@ -502,7 +502,7 @@ export class NotificationTemplateRenderer extends Disposable {
 						notification.close();
 					}
 				}
-			}();
+			}());
 
 			const buttonToolbar = this.inputDisposables.add(new ButtonBar(this.template.buttonsContainer));
 			for (let i = 0; i < primaryActions.length; i++) {

From 6fdb41922c2ff82748ab95c2dc484bd78cd2b8f2 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 20 Feb 2025 07:11:11 +0100
Subject: [PATCH 0134/1815] Git - remove jschardet (#241256)

* Adopt API for stage

* Adopt API for show

* Remove package
---
 extensions/git/package-lock.json |  10 ----
 extensions/git/package.json      |   2 +-
 extensions/git/src/commands.ts   |  19 ++++--
 extensions/git/src/encoding.ts   | 100 -------------------------------
 extensions/git/src/git.ts        |  13 ----
 extensions/git/src/repository.ts |  26 ++------
 extensions/git/tsconfig.json     |   1 +
 7 files changed, 23 insertions(+), 148 deletions(-)
 delete mode 100644 extensions/git/src/encoding.ts

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index bc150555c70c..7a9cb2aded86 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -14,7 +14,6 @@
         "@vscode/iconv-lite-umd": "0.7.0",
         "byline": "^5.0.0",
         "file-type": "16.5.4",
-        "jschardet": "3.1.4",
         "picomatch": "2.3.1",
         "vscode-uri": "^2.0.0",
         "which": "4.0.0"
@@ -279,15 +278,6 @@
         "node": ">=16"
       }
     },
-    "node_modules/jschardet": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-3.1.4.tgz",
-      "integrity": "sha512-/kmVISmrwVwtyYU40iQUOp3SUPk2dhNCMsZBQX0R1/jZ8maaXJ/oZIzUOiyOqcgtLnETFKYChbJ5iDC/eWmFHg==",
-      "license": "LGPL-2.1+",
-      "engines": {
-        "node": ">=0.1.90"
-      }
-    },
     "node_modules/peek-readable": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz",
diff --git a/extensions/git/package.json b/extensions/git/package.json
index f5195eee8fb7..06f40d948a12 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -35,6 +35,7 @@
     "statusBarItemTooltip",
     "tabInputMultiDiff",
     "tabInputTextMerge",
+    "textDocumentEncoding",
     "textEditorDiffInformation",
     "timeline"
   ],
@@ -3566,7 +3567,6 @@
     "@vscode/iconv-lite-umd": "0.7.0",
     "byline": "^5.0.0",
     "file-type": "16.5.4",
-    "jschardet": "3.1.4",
     "picomatch": "2.3.1",
     "vscode-uri": "^2.0.0",
     "which": "4.0.0"
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 94bcb143c58d..b09e6d5a6c55 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -1628,19 +1628,29 @@ export class CommandCenter {
 		}
 
 		let modifiedUri = changes.modifiedUri;
+		let modifiedDocument: TextDocument | undefined;
+
 		if (!modifiedUri) {
 			const textEditor = window.activeTextEditor;
 			if (!textEditor) {
 				return;
 			}
-			const modifiedDocument = textEditor.document;
+
+			modifiedDocument = textEditor.document;
 			modifiedUri = modifiedDocument.uri;
 		}
+
 		if (modifiedUri.scheme !== 'file') {
 			return;
 		}
+
+		if (!modifiedDocument) {
+			modifiedDocument = await workspace.openTextDocument(modifiedUri);
+		}
+
 		const result = changes.originalWithModifiedChanges;
-		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
+		await this.runByRepository(modifiedUri, async (repository, resource) =>
+			await repository.stage(resource, result, modifiedDocument.encoding));
 	}
 
 	@command('git.stageSelectedRanges', { diff: true })
@@ -1817,7 +1827,8 @@ export class CommandCenter {
 		const originalDocument = await workspace.openTextDocument(originalUri);
 		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
 
-		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
+		await this.runByRepository(modifiedUri, async (repository, resource) =>
+			await repository.stage(resource, result, modifiedDocument.encoding));
 	}
 
 	@command('git.revertChange')
@@ -1989,7 +2000,7 @@ export class CommandCenter {
 		this.logger.trace(`[CommandCenter][unstageSelectedRanges] invertedDiffs: ${JSON.stringify(invertedDiffs)}`);
 
 		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
-		await repository.stage(modifiedUri, result);
+		await repository.stage(modifiedUri, result, modifiedDocument.encoding);
 	}
 
 	@command('git.unstageFile')
diff --git a/extensions/git/src/encoding.ts b/extensions/git/src/encoding.ts
deleted file mode 100644
index c80fb6ee6d5e..000000000000
--- a/extensions/git/src/encoding.ts
+++ /dev/null
@@ -1,100 +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 jschardet from 'jschardet';
-
-function detectEncodingByBOM(buffer: Buffer): string | null {
-	if (!buffer || buffer.length < 2) {
-		return null;
-	}
-
-	const b0 = buffer.readUInt8(0);
-	const b1 = buffer.readUInt8(1);
-
-	// UTF-16 BE
-	if (b0 === 0xFE && b1 === 0xFF) {
-		return 'utf16be';
-	}
-
-	// UTF-16 LE
-	if (b0 === 0xFF && b1 === 0xFE) {
-		return 'utf16le';
-	}
-
-	if (buffer.length < 3) {
-		return null;
-	}
-
-	const b2 = buffer.readUInt8(2);
-
-	// UTF-8
-	if (b0 === 0xEF && b1 === 0xBB && b2 === 0xBF) {
-		return 'utf8';
-	}
-
-	return null;
-}
-
-const IGNORE_ENCODINGS = [
-	'ascii',
-	'utf-8',
-	'utf-16',
-	'utf-32'
-];
-
-const JSCHARDET_TO_ICONV_ENCODINGS: { [name: string]: string } = {
-	'ibm866': 'cp866',
-	'big5': 'cp950'
-};
-
-const MAP_CANDIDATE_GUESS_ENCODING_TO_JSCHARDET: { [key: string]: string } = {
-	utf8: 'UTF-8',
-	utf16le: 'UTF-16LE',
-	utf16be: 'UTF-16BE',
-	windows1252: 'windows-1252',
-	windows1250: 'windows-1250',
-	iso88592: 'ISO-8859-2',
-	windows1251: 'windows-1251',
-	cp866: 'IBM866',
-	iso88595: 'ISO-8859-5',
-	koi8r: 'KOI8-R',
-	windows1253: 'windows-1253',
-	iso88597: 'ISO-8859-7',
-	windows1255: 'windows-1255',
-	iso88598: 'ISO-8859-8',
-	cp950: 'Big5',
-	shiftjis: 'SHIFT_JIS',
-	eucjp: 'EUC-JP',
-	euckr: 'EUC-KR',
-	gb2312: 'GB2312'
-};
-
-export function detectEncoding(buffer: Buffer, candidateGuessEncodings: string[]): string | null {
-	const result = detectEncodingByBOM(buffer);
-
-	if (result) {
-		return result;
-	}
-
-	candidateGuessEncodings = candidateGuessEncodings.map(e => MAP_CANDIDATE_GUESS_ENCODING_TO_JSCHARDET[e]).filter(e => !!e);
-
-	const detected = jschardet.detect(buffer, candidateGuessEncodings.length > 0 ? { detectEncodings: candidateGuessEncodings } : undefined);
-	if (!detected || !detected.encoding) {
-		return null;
-	}
-
-	const encoding = detected.encoding;
-
-	// Ignore encodings that cannot guess correctly
-	// (http://chardet.readthedocs.io/en/latest/supported-encodings.html)
-	if (0 <= IGNORE_ENCODINGS.indexOf(encoding.toLowerCase())) {
-		return null;
-	}
-
-	const normalizedEncodingName = encoding.replace(/[^a-zA-Z0-9]/g, '').toLowerCase();
-	const mapped = JSCHARDET_TO_ICONV_ENCODINGS[normalizedEncodingName];
-
-	return mapped || normalizedEncodingName;
-}
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 2f0d11bd4884..29fc38abfed1 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -14,7 +14,6 @@ import * as iconv from '@vscode/iconv-lite-umd';
 import * as filetype from 'file-type';
 import { assign, groupBy, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent, splitInChunks, Limiter, Versions, isWindows, pathEquals, isMacintosh, isDescendant } from './util';
 import { CancellationError, CancellationToken, ConfigurationChangeEvent, LogOutputChannel, Progress, Uri, workspace } from 'vscode';
-import { detectEncoding } from './encoding';
 import { Ref, RefType, Branch, Remote, ForcePushMode, GitErrorCodes, LogOptions, Change, Status, CommitOptions, RefQuery, InitOptions } from './api/git';
 import * as byline from 'byline';
 import { StringDecoder } from 'string_decoder';
@@ -1330,18 +1329,6 @@ export class Repository {
 			.filter(entry => !!entry);
 	}
 
-	async bufferString(object: string, encoding: string = 'utf8', autoGuessEncoding = false, candidateGuessEncodings: string[] = []): Promise<string> {
-		const stdout = await this.buffer(object);
-
-		if (autoGuessEncoding) {
-			encoding = detectEncoding(stdout, candidateGuessEncodings) || encoding;
-		}
-
-		encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';
-
-		return iconv.decode(stdout, encoding);
-	}
-
 	async buffer(object: string): Promise<Buffer> {
 		const child = this.stream(['show', '--textconv', object]);
 
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index ca8974f2fc56..2f164ee5ede1 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -7,7 +7,6 @@ import TelemetryReporter from '@vscode/extension-telemetry';
 import * as fs from 'fs';
 import * as path from 'path';
 import picomatch from 'picomatch';
-import * as iconv from '@vscode/iconv-lite-umd';
 import { CancellationError, CancellationToken, CancellationTokenSource, Command, commands, Disposable, Event, EventEmitter, FileDecoration, l10n, LogLevel, LogOutputChannel, Memento, ProgressLocation, ProgressOptions, QuickDiffProvider, RelativePattern, scm, SourceControl, SourceControlInputBox, SourceControlInputBoxValidation, SourceControlInputBoxValidationType, SourceControlResourceDecorations, SourceControlResourceGroup, SourceControlResourceState, TabInputNotebookDiff, TabInputTextDiff, TabInputTextMultiDiff, ThemeColor, Uri, window, workspace, WorkspaceEdit } from 'vscode';
 import { ActionButton } from './actionButton';
 import { ApiRepository } from './api/api1';
@@ -25,7 +24,6 @@ import { StatusBarCommands } from './statusbar';
 import { toGitUri } from './uri';
 import { anyEvent, combinedDisposable, debounceEvent, dispose, EmptyDisposable, eventToPromise, filterEvent, find, getCommitShortHash, IDisposable, isDescendant, isRemote, Limiter, onceEvent, pathEquals, relativePath } from './util';
 import { IFileWatcher, watch } from './watch';
-import { detectEncoding } from './encoding';
 import { ISourceControlHistoryItemDetailsProviderRegistry } from './historyItemDetailsProvider';
 
 const timeout = (millis: number) => new Promise(c => setTimeout(c, millis));
@@ -1222,19 +1220,9 @@ export class Repository implements Disposable {
 		await this.run(Operation.Remove, () => this.repository.rm(resources.map(r => r.fsPath)));
 	}
 
-	async stage(resource: Uri, contents: string): Promise<void> {
-		const path = relativePath(this.repository.root, resource.fsPath).replace(/\\/g, '/');
+	async stage(resource: Uri, contents: string, encoding: string): Promise<void> {
 		await this.run(Operation.Stage, async () => {
-			const configFiles = workspace.getConfiguration('files', Uri.file(resource.fsPath));
-			let encoding = configFiles.get<string>('encoding') ?? 'utf8';
-			const autoGuessEncoding = configFiles.get<boolean>('autoGuessEncoding') === true;
-			const candidateGuessEncodings = configFiles.get<string[]>('candidateGuessEncodings') ?? [];
-
-			if (autoGuessEncoding) {
-				encoding = detectEncoding(Buffer.from(contents), candidateGuessEncodings) ?? encoding;
-			}
-
-			encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';
+			const path = relativePath(this.repository.root, resource.fsPath).replace(/\\/g, '/');
 			await this.repository.stage(path, contents, encoding);
 
 			this._onDidChangeOriginalResource.fire(resource);
@@ -1980,17 +1968,15 @@ export class Repository implements Disposable {
 	async show(ref: string, filePath: string): Promise<string> {
 		return await this.run(Operation.Show, async () => {
 			const path = relativePath(this.repository.root, filePath).replace(/\\/g, '/');
-			const configFiles = workspace.getConfiguration('files', Uri.file(filePath));
-			const defaultEncoding = configFiles.get<string>('encoding');
-			const autoGuessEncoding = configFiles.get<boolean>('autoGuessEncoding');
-			const candidateGuessEncodings = configFiles.get<string[]>('candidateGuessEncodings');
 
 			try {
-				return await this.repository.bufferString(`${ref}:${path}`, defaultEncoding, autoGuessEncoding, candidateGuessEncodings);
+				const content = await this.repository.buffer(`${ref}:${path}`);
+				return await workspace.decode(content, Uri.file(filePath));
 			} catch (err) {
 				if (err.gitErrorCode === GitErrorCodes.WrongCase) {
 					const gitRelativePath = await this.repository.getGitRelativePath(ref, path);
-					return await this.repository.bufferString(`${ref}:${gitRelativePath}`, defaultEncoding, autoGuessEncoding, candidateGuessEncodings);
+					const content = await this.repository.buffer(`${ref}:${gitRelativePath}`);
+					return await workspace.decode(content, Uri.file(filePath));
 				}
 
 				throw err;
diff --git a/extensions/git/tsconfig.json b/extensions/git/tsconfig.json
index 42218d8decb0..1d330ea2516c 100644
--- a/extensions/git/tsconfig.json
+++ b/extensions/git/tsconfig.json
@@ -25,6 +25,7 @@
 		"../../src/vscode-dts/vscode.proposed.statusBarItemTooltip.d.ts",
 		"../../src/vscode-dts/vscode.proposed.tabInputMultiDiff.d.ts",
 		"../../src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts",
+		"../../src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts",
 		"../../src/vscode-dts/vscode.proposed.textEditorDiffInformation.d.ts",
 		"../../src/vscode-dts/vscode.proposed.timeline.d.ts",
 		"../types/lib.textEncoder.d.ts"

From 2ffc73b962a6bf7df5dbd589a7ba11d540578b78 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 19 Feb 2025 22:41:46 -0800
Subject: [PATCH 0135/1815] Keyboard shortcut to accept tool confirmations
 (#241301)

---
 .../browser/actions/chatExecuteActions.ts     |  3 +-
 .../chat/browser/actions/chatToolActions.ts   | 50 +++++++++++++++++++
 .../contrib/chat/browser/chat.contribution.ts |  2 +
 .../chatConfirmationWidget.ts                 |  3 +-
 .../chatToolInvocationPart.ts                 | 24 ++++++++-
 5 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index 59befe2e8344..4118e2156acd 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -501,8 +501,9 @@ class SendToNewChatAction extends Action2 {
 	}
 }
 
+export const CancelChatActionId = 'workbench.action.chat.cancel';
 export class CancelAction extends Action2 {
-	static readonly ID = 'workbench.action.chat.cancel';
+	static readonly ID = CancelChatActionId;
 	constructor() {
 		super({
 			id: CancelAction.ID,
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
new file mode 100644
index 000000000000..fdfbbf6a906f
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.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 { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { localize2 } from '../../../../../nls.js';
+import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ChatContextKeys } from '../../common/chatContextKeys.js';
+import { IChatToolInvocation } from '../../common/chatService.js';
+import { isResponseVM } from '../../common/chatViewModel.js';
+import { IChatWidgetService } from '../chat.js';
+import { CHAT_CATEGORY } from './chatActions.js';
+
+export const AcceptToolConfirmationActionId = 'workbench.action.chat.acceptTool';
+
+class AcceptToolConfirmation extends Action2 {
+	constructor() {
+		super({
+			id: AcceptToolConfirmationActionId,
+			title: localize2('chat.accept', "Accept"),
+			f1: false,
+			category: CHAT_CATEGORY,
+			keybinding: {
+				when: ChatContextKeys.inChatInput,
+				primary: KeyMod.CtrlCmd | KeyCode.Enter,
+				weight: KeybindingWeight.EditorContrib
+			},
+		});
+	}
+
+	run(accessor: ServicesAccessor, ...args: any[]) {
+		const chatWidgetService = accessor.get(IChatWidgetService);
+		const lastItem = chatWidgetService.lastFocusedWidget?.viewModel?.getItems().at(-1);
+		if (!isResponseVM(lastItem)) {
+			return;
+		}
+
+		const unconfirmedToolInvocation = lastItem.model.response.value.find((item): item is IChatToolInvocation => item.kind === 'toolInvocation' && !item.isConfirmed);
+		if (unconfirmedToolInvocation) {
+			unconfirmedToolInvocation.confirmed.complete(true);
+		}
+	}
+}
+
+export function registerChatToolActions() {
+	registerAction2(AcceptToolConfirmation);
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index e1110b3e84f6..d7ccf0479986 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -95,6 +95,7 @@ import { ChatEditingEditorContextKeys } from './chatEditing/chatEditingEditorCon
 import { PromptsConfig } from '../../../../platform/prompts/common/config.js';
 import { PROMPT_FILE_EXTENSION } from '../../../../platform/prompts/common/constants.js';
 import { DOCUMENTATION_URL } from '../common/promptSyntax/constants.js';
+import { registerChatToolActions } from './actions/chatToolActions.js';
 
 // Register configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -438,6 +439,7 @@ registerNewChatActions();
 registerChatContextActions();
 registerChatDeveloperActions();
 registerChatEditorActions();
+registerChatToolActions();
 
 registerEditorFeature(ChatPasteProvidersFeature);
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
index b6f42ef60cca..620c1ba5cfa1 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
@@ -16,6 +16,7 @@ import { defaultButtonStyles } from '../../../../../platform/theme/browser/defau
 export interface IChatConfirmationButton {
 	label: string;
 	isSecondary?: boolean;
+	tooltip?: string;
 	data: any;
 }
 
@@ -63,7 +64,7 @@ export class ChatConfirmationWidget extends Disposable {
 		elements.message.appendChild(renderedMessage.element);
 
 		buttons.forEach(buttonData => {
-			const button = new Button(elements.buttonsContainer, { ...defaultButtonStyles, secondary: buttonData.isSecondary });
+			const button = this._register(new Button(elements.buttonsContainer, { ...defaultButtonStyles, secondary: buttonData.isSecondary, title: buttonData.tooltip }));
 			button.label = buttonData.label;
 			this._register(button.onDidClick(() => this._onDidClick.fire(buttonData)));
 		});
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
index 0656658eff5b..d5930da63408 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
@@ -12,9 +12,12 @@ import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownR
 import { localize } from '../../../../../nls.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 { IChatProgressMessage, IChatToolInvocation, IChatToolInvocationSerialized } from '../../common/chatService.js';
 import { IChatRendererContent } from '../../common/chatViewModel.js';
 import { IToolResult } from '../../common/languageModelToolsService.js';
+import { CancelChatActionId } from '../actions/chatExecuteActions.js';
+import { AcceptToolConfirmationActionId } from '../actions/chatToolActions.js';
 import { ChatTreeItem } from '../chat.js';
 import { ChatConfirmationWidget } from './chatConfirmationWidget.js';
 import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
@@ -47,6 +50,7 @@ export class ChatToolInvocationPart extends Disposable implements IChatContentPa
 		const partStore = this._register(new DisposableStore());
 		const render = () => {
 			dom.clearNode(this.domNode);
+			partStore.clear();
 
 			const subPart = partStore.add(instantiationService.createInstance(ChatToolInvocationSubPart, toolInvocation, context, renderer, listPool));
 			this.domNode.appendChild(subPart.domNode);
@@ -84,6 +88,7 @@ class ChatToolInvocationSubPart extends Disposable {
 		listPool: CollapsibleListPool,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IHoverService hoverService: IHoverService,
+		@IKeybindingService private readonly keybindingService: IKeybindingService,
 	) {
 		super();
 
@@ -106,11 +111,28 @@ class ChatToolInvocationSubPart extends Disposable {
 		}
 		const title = toolInvocation.confirmationMessages.title;
 		const message = toolInvocation.confirmationMessages.message;
+		const continueLabel = localize('continue', "Continue");
+		const continueKeybinding = this.keybindingService.lookupKeybinding(AcceptToolConfirmationActionId)?.getLabel();
+		const continueTooltip = continueKeybinding ? `${continueLabel} (${continueKeybinding})` : continueLabel;
+		const cancelLabel = localize('cancel', "Cancel");
+		const cancelKeybinding = this.keybindingService.lookupKeybinding(CancelChatActionId)?.getLabel();
+		const cancelTooltip = cancelKeybinding ? `${cancelLabel} (${cancelKeybinding})` : cancelLabel;
 		const confirmWidget = this._register(instantiationService.createInstance(
 			ChatConfirmationWidget,
 			title,
 			message,
-			[{ label: localize('continue', "Continue"), data: true }, { label: localize('cancel', "Cancel"), data: false, isSecondary: true }]
+			[
+				{
+					label: continueLabel,
+					data: true,
+					tooltip: continueTooltip
+				},
+				{
+					label: cancelLabel,
+					data: false,
+					isSecondary: true,
+					tooltip: cancelTooltip
+				}]
 		));
 		this._register(confirmWidget.onDidClick(button => {
 			toolInvocation.confirmed.complete(button.data);

From 303b4b7edeace74fa9a3f3d10cd8a578721631ba Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Thu, 20 Feb 2025 17:50:42 +1100
Subject: [PATCH 0136/1815] Revert async AcceptAgentEdits (#241300)

---
 .../browser/chatEditing/chatEditingModifiedDocumentEntry.ts     | 2 +-
 .../chat/browser/chatEditing/chatEditingModifiedFileEntry.ts    | 2 +-
 .../browser/chatEditing/chatEditingModifiedNotebookEntry.ts     | 2 +-
 .../contrib/chat/browser/chatEditing/chatEditingSession.ts      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
index 1f90c36696c5..6d8e6f6b27bf 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
@@ -272,7 +272,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		}
 	}
 
-	async acceptAgentEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void> {
+	acceptAgentEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): void {
 
 		assertType(textEdits.every(TextEdit.isTextEdit), 'INVALID args, can only handle text edits');
 		assert(isEqual(resource, this.modifiedURI), ' INVALID args, can only edit THIS document');
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
index 4cd72fcc07cf..fb1b7d362740 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
@@ -225,7 +225,7 @@ export abstract class AbstractChatEditingModifiedFileEntry extends Disposable im
 		this._autoAcceptCtrl.get()?.cancel();
 	}
 
-	abstract acceptAgentEdits(uri: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void>;
+	abstract acceptAgentEdits(uri: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): void;
 
 	async acceptStreamingEditsEnd(tx: ITransaction) {
 		this._resetEditsState(tx);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index a36077d5d64b..2550dcb92910 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -129,7 +129,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		throw new Error('Method not implemented.');
 	}
 
-	override async acceptAgentEdits(resource: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void> {
+	override acceptAgentEdits(resource: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): void {
 
 		const isCellUri = resource.scheme === Schemas.vscodeNotebookCell;
 		assert(isCellUri || isEqual(resource, this.modifiedURI));
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 077425865e0c..4751b8a379cc 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -931,7 +931,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 
 	private async _acceptEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void> {
 		const entry = await this._getOrCreateModifiedFileEntry(resource, this._getTelemetryInfoForModel(responseModel));
-		await entry.acceptAgentEdits(resource, textEdits, isLastEdits, responseModel);
+		entry.acceptAgentEdits(resource, textEdits, isLastEdits, responseModel);
 	}
 
 	private _getTelemetryInfoForModel(responseModel: IChatResponseModel): IModifiedEntryTelemetryInfo {

From e81d4706a2a2f74a56e292cdb57c07cadeee3849 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Wed, 19 Feb 2025 10:16:25 -0800
Subject: [PATCH 0137/1815] handle folder references in prompt file reference
 class

---
 .../chat/common/promptFileReferenceErrors.ts  | 21 ++++++++++++++++++-
 .../filePromptContentsProvider.ts             | 14 ++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
index 1538f9e23164..22ee8fca39a3 100644
--- a/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
+++ b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
@@ -84,11 +84,30 @@ export class FileOpenFailed extends FailedToResolveContentsStream {
 		super(
 			uri,
 			originalError,
-			`Failed to open file '${uri.toString()}': ${originalError}.`,
+			`Failed to open file '${uri.fsPath}': ${originalError}.`,
 		);
 	}
 }
 
+// /**
+//  * TODO: @legomushroom
+//  */
+// export class FolderReference extends FailedToResolveContentsStream {
+// 	public override errorType = 'FolderReferenceError';
+
+// 	constructor(
+// 		uri: URI,
+// 		originalError: unknown,
+// 	) {
+// 		super(
+// 			uri,
+// 			originalError,
+// 			`Entity at '${uri.fsPath}' is a folder.`,
+// 		);
+// 	}
+// }
+
+
 /**
  * Error that reflects the case when attempt resolve nested file
  * references failes due to a recursive reference, e.g.,
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/filePromptContentsProvider.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/filePromptContentsProvider.ts
index 9bda1b1acf33..b287ba9ac80c 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/filePromptContentsProvider.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/filePromptContentsProvider.ts
@@ -11,7 +11,7 @@ import { CancellationError } from '../../../../../../base/common/errors.js';
 import { PromptContentsProviderBase } from './promptContentsProviderBase.js';
 import { VSBufferReadableStream } from '../../../../../../base/common/buffer.js';
 import { CancellationToken } from '../../../../../../base/common/cancellation.js';
-import { FileOpenFailed, NonPromptSnippetFile } from '../../promptFileReferenceErrors.js';
+import { FileOpenFailed, NonPromptSnippetFile, ParseError } from '../../promptFileReferenceErrors.js';
 import { FileChangesEvent, FileChangeType, IFileService } from '../../../../../../platform/files/common/files.js';
 
 /**
@@ -64,8 +64,20 @@ export class FilePromptContentProvider extends PromptContentsProviderBase<FileCh
 		// get the binary stream of the file contents
 		let fileStream;
 		try {
+			// ensure that the referenced URI points to a file before
+			// trying to get a stream for its contents
+			const info = await this.fileService.resolve(this.uri);
+			assert(
+				info.isFile,
+				new NonPromptSnippetFile(this.uri),
+			);
+
 			fileStream = await this.fileService.readFileStream(this.uri);
 		} catch (error) {
+			if (error instanceof ParseError) {
+				throw error;
+			}
+
 			throw new FileOpenFailed(this.uri, error);
 		}
 

From c661f84ffad342b3aa82dab846c6453a10ca859e Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Wed, 19 Feb 2025 11:00:51 -0800
Subject: [PATCH 0138/1815] update unit tests for the `PromptFileReference`
 class

---
 .../promptSyntax/promptFileReference.test.ts  | 38 +++++++++++++++++--
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/promptFileReference.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/promptFileReference.test.ts
index 0a19b7d85e5b..d4fb37363fce 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/promptFileReference.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/promptFileReference.test.ts
@@ -147,6 +147,8 @@ class TestPromptFileReference extends Disposable {
 /**
  * Create expected file reference for testing purposes.
  *
+ * Note! This utility also use for `markdown links` at the moment.
+ *
  * @param filePath The expected path of the file reference (without the `#file:` prefix).
  * @param lineNumber The expected line number of the file reference.
  * @param startColumnNumber The expected start column number of the file reference.
@@ -216,14 +218,14 @@ suite('PromptFileReference (Unix)', function () {
 						children: [
 							{
 								name: 'file3.prompt.md',
-								contents: `\n\n\t- some seemingly random #file:${rootFolder}/folder1/some-other-folder/yetAnotherFolder🤭/another-file.prompt.md contents\n some more\t content`,
+								contents: `\n[](./some-other-folder/non-existing-folder)\n\t- some seemingly random #file:${rootFolder}/folder1/some-other-folder/yetAnotherFolder🤭/another-file.prompt.md contents\n some more\t content`,
 							},
 							{
 								name: 'some-other-folder',
 								children: [
 									{
 										name: 'file4.prompt.md',
-										contents: 'this file has a non-existing #file:./some-non-existing/file.prompt.md\t\treference\n\n\nand some\n non-prompt #file:./some-non-prompt-file.md',
+										contents: 'this file has a non-existing #file:./some-non-existing/file.prompt.md\t\treference\n\n\nand some\n non-prompt #file:./some-non-prompt-file.md\t\t \t[](../../folder1/)\t',
 									},
 									{
 										name: 'file.txt',
@@ -234,7 +236,7 @@ suite('PromptFileReference (Unix)', function () {
 										children: [
 											{
 												name: 'another-file.prompt.md',
-												contents: 'another-file.prompt.md contents\t [#file:file.txt](../file.txt)',
+												contents: `[](${rootFolder}/folder1/some-other-folder)\nanother-file.prompt.md contents\t [#file:file.txt](../file.txt)`,
 											},
 											{
 												name: 'one_more_file_just_in_case.prompt.md',
@@ -260,6 +262,18 @@ suite('PromptFileReference (Unix)', function () {
 					rootUri,
 					createTestFileReference('folder1/file3.prompt.md', 2, 14),
 				),
+				new ExpectedReference(
+					URI.joinPath(rootUri, './folder1'),
+					createTestFileReference(
+						`./some-other-folder/non-existing-folder`,
+						2,
+						1,
+					),
+					new FileOpenFailed(
+						URI.joinPath(rootUri, './folder1/some-other-folder/non-existing-folder'),
+						'Reference to non-existing file cannot be opened.',
+					),
+				),
 				new ExpectedReference(
 					URI.joinPath(rootUri, './folder1'),
 					createTestFileReference(
@@ -268,9 +282,17 @@ suite('PromptFileReference (Unix)', function () {
 						26,
 					),
 				),
+				new ExpectedReference(
+					URI.joinPath(rootUri, './folder1/some-other-folder'),
+					createTestFileReference('.', 1, 1),
+					new NonPromptSnippetFile(
+						URI.joinPath(rootUri, './folder1/some-other-folder'),
+						'This folder is not a prompt file!',
+					),
+				),
 				new ExpectedReference(
 					URI.joinPath(rootUri, './folder1/some-other-folder/yetAnotherFolder🤭'),
-					createTestFileReference('../file.txt', 1, 35),
+					createTestFileReference('../file.txt', 2, 35),
 					new NonPromptSnippetFile(
 						URI.joinPath(rootUri, './folder1/some-other-folder/file.txt'),
 						'Ughh oh, that is not a prompt file!',
@@ -296,6 +318,14 @@ suite('PromptFileReference (Unix)', function () {
 						'Oh no!',
 					),
 				),
+				new ExpectedReference(
+					URI.joinPath(rootUri, './some-other-folder/folder1'),
+					createTestFileReference('../../folder1', 5, 48),
+					new NonPromptSnippetFile(
+						URI.joinPath(rootUri, './folder1'),
+						'Uggh ohh!',
+					),
+				),
 			]
 		));
 

From 55c1d0428c006d7ed643577d0bf2ff413038fa25 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Wed, 19 Feb 2025 11:04:40 -0800
Subject: [PATCH 0139/1815] improve parse error names

---
 .../chat/common/promptFileReferenceErrors.ts  | 34 ++++---------------
 .../filePromptContentsProvider.ts             | 10 +++---
 .../languageFeatures/promptLinkProvider.ts    |  6 ++--
 .../promptSyntax/parsers/basePromptParser.ts  | 12 +++----
 .../parsers/textModelPromptParser.test.ts     | 16 ++++-----
 .../promptSyntax/promptFileReference.test.ts  | 22 ++++++------
 6 files changed, 40 insertions(+), 60 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
index 22ee8fca39a3..fc3dbc993c17 100644
--- a/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
+++ b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
@@ -74,8 +74,8 @@ export abstract class ResolveError extends ParseError {
 /**
  * Error that reflects the case when attempt to open target file fails.
  */
-export class FileOpenFailed extends FailedToResolveContentsStream {
-	public override errorType = 'FileOpenError';
+export class OpenFailed extends FailedToResolveContentsStream {
+	public override errorType = 'OpenError';
 
 	constructor(
 		uri: URI,
@@ -84,30 +84,11 @@ export class FileOpenFailed extends FailedToResolveContentsStream {
 		super(
 			uri,
 			originalError,
-			`Failed to open file '${uri.fsPath}': ${originalError}.`,
+			`Failed to open '${uri.fsPath}': ${originalError}.`,
 		);
 	}
 }
 
-// /**
-//  * TODO: @legomushroom
-//  */
-// export class FolderReference extends FailedToResolveContentsStream {
-// 	public override errorType = 'FolderReferenceError';
-
-// 	constructor(
-// 		uri: URI,
-// 		originalError: unknown,
-// 	) {
-// 		super(
-// 			uri,
-// 			originalError,
-// 			`Entity at '${uri.fsPath}' is a folder.`,
-// 		);
-// 	}
-// }
-
-
 /**
  * Error that reflects the case when attempt resolve nested file
  * references failes due to a recursive reference, e.g.,
@@ -169,11 +150,10 @@ export class RecursiveReference extends ResolveError {
 }
 
 /**
- * Error that reflects the case when resource URI does not point to
- * a prompt snippet file, hence was not attempted to be resolved.
+ * Error for the case when a resource URI doesn't point to a prompt file.
  */
-export class NonPromptSnippetFile extends ResolveError {
-	public override errorType = 'NonPromptSnippetFileError';
+export class NotPromptFile extends ResolveError {
+	public override errorType = 'NotPromptFileError';
 
 	constructor(
 		uri: URI,
@@ -184,7 +164,7 @@ export class NonPromptSnippetFile extends ResolveError {
 
 		super(
 			uri,
-			`Resource at ${uri.path} is not a prompt snippet file${suffix}`,
+			`Resource at ${uri.path} is not a prompt file${suffix}`,
 		);
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/filePromptContentsProvider.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/filePromptContentsProvider.ts
index b287ba9ac80c..8f38013f7fbb 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/filePromptContentsProvider.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/filePromptContentsProvider.ts
@@ -11,7 +11,7 @@ import { CancellationError } from '../../../../../../base/common/errors.js';
 import { PromptContentsProviderBase } from './promptContentsProviderBase.js';
 import { VSBufferReadableStream } from '../../../../../../base/common/buffer.js';
 import { CancellationToken } from '../../../../../../base/common/cancellation.js';
-import { FileOpenFailed, NonPromptSnippetFile, ParseError } from '../../promptFileReferenceErrors.js';
+import { OpenFailed, NotPromptFile, ParseError } from '../../promptFileReferenceErrors.js';
 import { FileChangesEvent, FileChangeType, IFileService } from '../../../../../../platform/files/common/files.js';
 
 /**
@@ -69,7 +69,7 @@ export class FilePromptContentProvider extends PromptContentsProviderBase<FileCh
 			const info = await this.fileService.resolve(this.uri);
 			assert(
 				info.isFile,
-				new NonPromptSnippetFile(this.uri),
+				new NotPromptFile(this.uri),
 			);
 
 			fileStream = await this.fileService.readFileStream(this.uri);
@@ -78,12 +78,12 @@ export class FilePromptContentProvider extends PromptContentsProviderBase<FileCh
 				throw error;
 			}
 
-			throw new FileOpenFailed(this.uri, error);
+			throw new OpenFailed(this.uri, error);
 		}
 
 		assertDefined(
 			fileStream,
-			new FileOpenFailed(this.uri, 'Failed to open file stream.'),
+			new OpenFailed(this.uri, 'Failed to open file stream.'),
 		);
 
 		// after the promise above complete, this object can be already disposed or
@@ -96,7 +96,7 @@ export class FilePromptContentProvider extends PromptContentsProviderBase<FileCh
 
 		// if URI doesn't point to a prompt snippet file, don't try to resolve it
 		if (!this.isPromptSnippet()) {
-			throw new NonPromptSnippetFile(this.uri);
+			throw new NotPromptFile(this.uri);
 		}
 
 		return fileStream.value;
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkProvider.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkProvider.ts
index 4d70254532e4..772aa7d9a02a 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkProvider.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkProvider.ts
@@ -9,7 +9,7 @@ import { assert } from '../../../../../../base/common/assert.js';
 import { ITextModel } from '../../../../../../editor/common/model.js';
 import { assertDefined } from '../../../../../../base/common/types.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { NonPromptSnippetFile } from '../../promptFileReferenceErrors.js';
+import { NotPromptFile } from '../../promptFileReferenceErrors.js';
 import { CancellationError } from '../../../../../../base/common/errors.js';
 import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 import { Registry } from '../../../../../../platform/registry/common/platform.js';
@@ -69,7 +69,8 @@ export class PromptLinkProvider extends Disposable implements LinkProvider {
 					return true;
 				}
 
-				return errorCondition instanceof NonPromptSnippetFile;
+				// TODO: @legomushroom - add the "folder" error
+				return errorCondition instanceof NotPromptFile;
 			})
 			.map((reference) => {
 				const { linkRange } = reference;
@@ -80,7 +81,6 @@ export class PromptLinkProvider extends Disposable implements LinkProvider {
 					'Link range must be defined.',
 				);
 
-
 				return {
 					range: linkRange,
 					url: reference.uri,
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
index 4e6ce0657b93..40c428068c4b 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
@@ -23,7 +23,7 @@ import { ObservableDisposable } from '../../../../../../base/common/observableDi
 import { FilePromptContentProvider } from '../contentProviders/filePromptContentsProvider.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { MarkdownLink } from '../../../../../../editor/common/codecs/markdownCodec/tokens/markdownLink.js';
-import { FileOpenFailed, NonPromptSnippetFile, RecursiveReference, ParseError, FailedToResolveContentsStream } from '../../promptFileReferenceErrors.js';
+import { OpenFailed, NotPromptFile, RecursiveReference, ParseError, FailedToResolveContentsStream } from '../../promptFileReferenceErrors.js';
 
 /**
  * Well-known localized error messages.
@@ -38,7 +38,7 @@ const errorMessages = {
 /**
  * Error conditions that may happen during the file reference resolution.
  */
-export type TErrorCondition = FileOpenFailed | RecursiveReference | NonPromptSnippetFile;
+export type TErrorCondition = OpenFailed | RecursiveReference | NotPromptFile;
 
 /**
  * Base prompt parser class that provides a common interface for all
@@ -376,7 +376,7 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 			.filter((reference) => {
 				const { errorCondition } = reference;
 
-				return !errorCondition || (errorCondition instanceof NonPromptSnippetFile);
+				return !errorCondition || (errorCondition instanceof NotPromptFile);
 			});
 	}
 
@@ -404,7 +404,7 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 			.filter((childReference) => {
 				const { errorCondition } = childReference;
 
-				return errorCondition && !(errorCondition instanceof NonPromptSnippetFile);
+				return errorCondition && !(errorCondition instanceof NotPromptFile);
 			})
 			// map to error condition objects
 			.map((childReference): ParseError => {
@@ -471,7 +471,7 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 	 * @returns Error message.
 	 */
 	protected getErrorMessage<TError extends ParseError>(error: TError): string {
-		if (error instanceof FileOpenFailed) {
+		if (error instanceof OpenFailed) {
 			return `${errorMessages.fileOpenFailed} '${error.uri.path}'.`;
 		}
 
@@ -591,7 +591,7 @@ export class PromptFileReference extends BasePromptParser<FilePromptContentProvi
 	 */
 	protected override getErrorMessage(error: ParseError): string {
 		// if failed to open a file, return approprivate message and the file path
-		if (error instanceof FileOpenFailed) {
+		if (error instanceof OpenFailed) {
 			return `${errorMessages.fileOpenFailed} '${error.uri.path}'.`;
 		}
 
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/parsers/textModelPromptParser.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/parsers/textModelPromptParser.test.ts
index 95ec4f3bd17a..c13322ea1a2a 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/parsers/textModelPromptParser.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/parsers/textModelPromptParser.test.ts
@@ -10,7 +10,7 @@ import { Schemas } from '../../../../../../../base/common/network.js';
 import { ExpectedReference } from '../testUtils/expectedReference.js';
 import { ITextModel } from '../../../../../../../editor/common/model.js';
 import { Disposable } from '../../../../../../../base/common/lifecycle.js';
-import { FileOpenFailed } from '../../../../common/promptFileReferenceErrors.js';
+import { OpenFailed } from '../../../../common/promptFileReferenceErrors.js';
 import { IFileService } from '../../../../../../../platform/files/common/files.js';
 import { randomBoolean } from '../../../../../../../base/test/common/testUtils.js';
 import { FileService } from '../../../../../../../platform/files/common/fileService.js';
@@ -143,7 +143,7 @@ suite('TextModelPromptParser', () => {
 				startLine: 1,
 				startColumn: 27,
 				pathStartColumn: 33,
-				childrenOrError: new FileOpenFailed(createURI('/abs/path/to/file.md'), 'File not found.'),
+				childrenOrError: new OpenFailed(createURI('/abs/path/to/file.md'), 'File not found.'),
 			}),
 			new ExpectedReference({
 				uri: createURI('/foo/folder/binary.file'),
@@ -152,7 +152,7 @@ suite('TextModelPromptParser', () => {
 				startLine: 7,
 				startColumn: 10,
 				pathStartColumn: 16,
-				childrenOrError: new FileOpenFailed(createURI('/foo/folder/binary.file'), 'File not found.'),
+				childrenOrError: new OpenFailed(createURI('/foo/folder/binary.file'), 'File not found.'),
 			}),
 			new ExpectedReference({
 				uri: createURI('/etc/hosts/random-file.txt'),
@@ -161,7 +161,7 @@ suite('TextModelPromptParser', () => {
 				startLine: 7,
 				startColumn: 81,
 				pathStartColumn: 91,
-				childrenOrError: new FileOpenFailed(createURI('/etc/hosts/random-file.txt'), 'File not found.'),
+				childrenOrError: new OpenFailed(createURI('/etc/hosts/random-file.txt'), 'File not found.'),
 			}),
 		]);
 	});
@@ -196,7 +196,7 @@ suite('TextModelPromptParser', () => {
 				startLine: 3,
 				startColumn: 43,
 				pathStartColumn: 55,
-				childrenOrError: new FileOpenFailed(createURI('/absolute/folder/and/a/foo-bar-baz/another-file.ts'), 'File not found.'),
+				childrenOrError: new OpenFailed(createURI('/absolute/folder/and/a/foo-bar-baz/another-file.ts'), 'File not found.'),
 			}),
 			new ExpectedReference({
 				uri: createURI('/absolute/c/file_name.prompt.md'),
@@ -205,7 +205,7 @@ suite('TextModelPromptParser', () => {
 				startLine: 6,
 				startColumn: 7,
 				pathStartColumn: 17,
-				childrenOrError: new FileOpenFailed(createURI('/absolute/c/file_name.prompt.md'), 'File not found.'),
+				childrenOrError: new OpenFailed(createURI('/absolute/c/file_name.prompt.md'), 'File not found.'),
 			}),
 			new ExpectedReference({
 				uri: createURI('/absolute/folder/main.rs'),
@@ -214,7 +214,7 @@ suite('TextModelPromptParser', () => {
 				startLine: 11,
 				startColumn: 36,
 				pathStartColumn: 42,
-				childrenOrError: new FileOpenFailed(createURI('/absolute/folder/main.rs'), 'File not found.'),
+				childrenOrError: new OpenFailed(createURI('/absolute/folder/main.rs'), 'File not found.'),
 			}),
 			new ExpectedReference({
 				uri: createURI('/absolute/folder/and/a/samefile.jpeg'),
@@ -223,7 +223,7 @@ suite('TextModelPromptParser', () => {
 				startLine: 11,
 				startColumn: 56,
 				pathStartColumn: 62,
-				childrenOrError: new FileOpenFailed(createURI('/absolute/folder/and/a/samefile.jpeg'), 'File not found.'),
+				childrenOrError: new OpenFailed(createURI('/absolute/folder/and/a/samefile.jpeg'), 'File not found.'),
 			}),
 		]);
 	});
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/promptFileReference.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/promptFileReference.test.ts
index d4fb37363fce..1a456bd9933c 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/promptFileReference.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/promptFileReference.test.ts
@@ -23,9 +23,9 @@ import { waitRandom, randomBoolean } from '../../../../../../base/test/common/te
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { NotPromptFile, RecursiveReference, OpenFailed } from '../../../common/promptFileReferenceErrors.js';
 import { ConfigurationService } from '../../../../../../platform/configuration/common/configurationService.js';
 import { InMemoryFileSystemProvider } from '../../../../../../platform/files/common/inMemoryFilesystemProvider.js';
-import { NonPromptSnippetFile, RecursiveReference, FileOpenFailed } from '../../../common/promptFileReferenceErrors.js';
 import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 
 /**
@@ -189,7 +189,7 @@ suite('PromptFileReference (Unix)', function () {
 		instantiationService.stub(IConfigurationService, nullConfigService);
 	});
 
-	test('resolves nested file references', async function () {
+	test('• resolves nested file references', async function () {
 		if (isWindows) {
 			this.skip();
 		}
@@ -269,7 +269,7 @@ suite('PromptFileReference (Unix)', function () {
 						2,
 						1,
 					),
-					new FileOpenFailed(
+					new OpenFailed(
 						URI.joinPath(rootUri, './folder1/some-other-folder/non-existing-folder'),
 						'Reference to non-existing file cannot be opened.',
 					),
@@ -285,7 +285,7 @@ suite('PromptFileReference (Unix)', function () {
 				new ExpectedReference(
 					URI.joinPath(rootUri, './folder1/some-other-folder'),
 					createTestFileReference('.', 1, 1),
-					new NonPromptSnippetFile(
+					new NotPromptFile(
 						URI.joinPath(rootUri, './folder1/some-other-folder'),
 						'This folder is not a prompt file!',
 					),
@@ -293,7 +293,7 @@ suite('PromptFileReference (Unix)', function () {
 				new ExpectedReference(
 					URI.joinPath(rootUri, './folder1/some-other-folder/yetAnotherFolder🤭'),
 					createTestFileReference('../file.txt', 2, 35),
-					new NonPromptSnippetFile(
+					new NotPromptFile(
 						URI.joinPath(rootUri, './folder1/some-other-folder/file.txt'),
 						'Ughh oh, that is not a prompt file!',
 					),
@@ -305,7 +305,7 @@ suite('PromptFileReference (Unix)', function () {
 				new ExpectedReference(
 					URI.joinPath(rootUri, './folder1/some-other-folder'),
 					createTestFileReference('./some-non-existing/file.prompt.md', 1, 30),
-					new FileOpenFailed(
+					new OpenFailed(
 						URI.joinPath(rootUri, './folder1/some-other-folder/some-non-existing/file.prompt.md'),
 						'Failed to open non-existring prompt snippets file',
 					),
@@ -313,7 +313,7 @@ suite('PromptFileReference (Unix)', function () {
 				new ExpectedReference(
 					URI.joinPath(rootUri, './folder1/some-other-folder'),
 					createTestFileReference('./some-non-prompt-file.md', 5, 13),
-					new FileOpenFailed(
+					new OpenFailed(
 						URI.joinPath(rootUri, './folder1/some-other-folder/some-non-prompt-file.md'),
 						'Oh no!',
 					),
@@ -321,7 +321,7 @@ suite('PromptFileReference (Unix)', function () {
 				new ExpectedReference(
 					URI.joinPath(rootUri, './some-other-folder/folder1'),
 					createTestFileReference('../../folder1', 5, 48),
-					new NonPromptSnippetFile(
+					new NotPromptFile(
 						URI.joinPath(rootUri, './folder1'),
 						'Uggh ohh!',
 					),
@@ -332,7 +332,7 @@ suite('PromptFileReference (Unix)', function () {
 		await test.run();
 	});
 
-	test('does not fall into infinite reference recursion', async function () {
+	test('• does not fall into infinite reference recursion', async function () {
 		if (isWindows) {
 			this.skip();
 		}
@@ -439,7 +439,7 @@ suite('PromptFileReference (Unix)', function () {
 				new ExpectedReference(
 					URI.joinPath(rootUri, './folder1/some-other-folder'),
 					createTestFileReference('../some-non-existing/file.prompt.md', 1, 30),
-					new FileOpenFailed(
+					new OpenFailed(
 						URI.joinPath(rootUri, './folder1/some-non-existing/file.prompt.md'),
 						'Uggh ohh!',
 					),
@@ -472,7 +472,7 @@ suite('PromptFileReference (Unix)', function () {
 				new ExpectedReference(
 					rootUri,
 					createTestFileReference('./file1.md', 6, 2),
-					new NonPromptSnippetFile(
+					new NotPromptFile(
 						URI.joinPath(rootUri, './file1.md'),
 						'Uggh oh!',
 					),

From 9533503d8677ed6087854d5ba1875440da6ec144 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Wed, 19 Feb 2025 15:22:45 -0800
Subject: [PATCH 0140/1815] add `FolderReference` error type, don't provide
 document links for folder references

---
 .../chat/common/promptFileReferenceErrors.ts  | 20 +++++++++++++++++++
 .../filePromptContentsProvider.ts             | 11 ++++++++--
 .../languageFeatures/promptLinkProvider.ts    | 20 +++++++++++--------
 .../promptSyntax/parsers/basePromptParser.ts  | 17 +++++++++++++---
 .../promptSyntax/promptFileReference.test.ts  |  6 +++---
 5 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
index fc3dbc993c17..84e7d62551b6 100644
--- a/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
+++ b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
@@ -168,3 +168,23 @@ export class NotPromptFile extends ResolveError {
 		);
 	}
 }
+
+/**
+ * Error for the case when a resource URI points to a folder.
+ */
+export class FolderReference extends NotPromptFile {
+	public override errorType = 'FolderReferenceError';
+
+	constructor(
+		uri: URI,
+		message: string = '',
+	) {
+
+		const suffix = message ? `: ${message}` : '';
+
+		super(
+			uri,
+			`Entity at '${uri.path}' is a folder${suffix}`,
+		);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/filePromptContentsProvider.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/filePromptContentsProvider.ts
index 8f38013f7fbb..512c29e98c23 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/filePromptContentsProvider.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/filePromptContentsProvider.ts
@@ -11,7 +11,7 @@ import { CancellationError } from '../../../../../../base/common/errors.js';
 import { PromptContentsProviderBase } from './promptContentsProviderBase.js';
 import { VSBufferReadableStream } from '../../../../../../base/common/buffer.js';
 import { CancellationToken } from '../../../../../../base/common/cancellation.js';
-import { OpenFailed, NotPromptFile, ParseError } from '../../promptFileReferenceErrors.js';
+import { OpenFailed, NotPromptFile, ParseError, FolderReference } from '../../promptFileReferenceErrors.js';
 import { FileChangesEvent, FileChangeType, IFileService } from '../../../../../../platform/files/common/files.js';
 
 /**
@@ -67,9 +67,16 @@ export class FilePromptContentProvider extends PromptContentsProviderBase<FileCh
 			// ensure that the referenced URI points to a file before
 			// trying to get a stream for its contents
 			const info = await this.fileService.resolve(this.uri);
+
+			// validate that the cancellation was not yet requested
+			assert(
+				!cancellationToken?.isCancellationRequested,
+				new CancellationError(),
+			);
+
 			assert(
 				info.isFile,
-				new NotPromptFile(this.uri),
+				new FolderReference(this.uri),
 			);
 
 			fileStream = await this.fileService.readFileStream(this.uri);
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkProvider.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkProvider.ts
index 772aa7d9a02a..66bd46bc5053 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkProvider.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkProvider.ts
@@ -6,24 +6,24 @@
 import { LANGUAGE_SELECTOR } from '../constants.js';
 import { IPromptsService } from '../service/types.js';
 import { assert } from '../../../../../../base/common/assert.js';
+import { FolderReference, NotPromptFile } from '../../promptFileReferenceErrors.js';
 import { ITextModel } from '../../../../../../editor/common/model.js';
 import { assertDefined } from '../../../../../../base/common/types.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { NotPromptFile } from '../../promptFileReferenceErrors.js';
 import { CancellationError } from '../../../../../../base/common/errors.js';
 import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 import { Registry } from '../../../../../../platform/registry/common/platform.js';
 import { LifecyclePhase } from '../../../../../services/lifecycle/common/lifecycle.js';
 import { ILink, ILinksList, LinkProvider } from '../../../../../../editor/common/languages.js';
+import { IWorkbenchContributionsRegistry, Extensions } from '../../../../../common/contributions.js';
 import { ILanguageFeaturesService } from '../../../../../../editor/common/services/languageFeatures.js';
-import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../../../common/contributions.js';
 
 /**
  * Provides link references for prompt files.
  */
 export class PromptLinkProvider extends Disposable implements LinkProvider {
 	constructor(
-		@IPromptsService private readonly promptSyntaxService: IPromptsService,
+		@IPromptsService private readonly promptsService: IPromptsService,
 		@ILanguageFeaturesService private readonly languageService: ILanguageFeaturesService,
 	) {
 		super();
@@ -43,7 +43,7 @@ export class PromptLinkProvider extends Disposable implements LinkProvider {
 			new CancellationError(),
 		);
 
-		const parser = this.promptSyntaxService.getSyntaxParserFor(model);
+		const parser = this.promptsService.getSyntaxParserFor(model);
 		assert(
 			!parser.disposed,
 			'Prompt parser must not be disposed.',
@@ -69,11 +69,15 @@ export class PromptLinkProvider extends Disposable implements LinkProvider {
 					return true;
 				}
 
-				// TODO: @legomushroom - add the "folder" error
+				// don't provide links for folder references
+				if (errorCondition instanceof FolderReference) {
+					return false;
+				}
+
 				return errorCondition instanceof NotPromptFile;
 			})
 			.map((reference) => {
-				const { linkRange } = reference;
+				const { uri, linkRange } = reference;
 
 				// must always be true because of the filter above
 				assertDefined(
@@ -83,7 +87,7 @@ export class PromptLinkProvider extends Disposable implements LinkProvider {
 
 				return {
 					range: linkRange,
-					url: reference.uri,
+					url: uri,
 				};
 			});
 
@@ -94,5 +98,5 @@ export class PromptLinkProvider extends Disposable implements LinkProvider {
 }
 
 // register the provider as a workbench contribution
-Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
+Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench)
 	.registerWorkbenchContribution(PromptLinkProvider, LifecyclePhase.Eventually);
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
index 40c428068c4b..937c7e6b1bb0 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
@@ -23,7 +23,7 @@ import { ObservableDisposable } from '../../../../../../base/common/observableDi
 import { FilePromptContentProvider } from '../contentProviders/filePromptContentsProvider.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { MarkdownLink } from '../../../../../../editor/common/codecs/markdownCodec/tokens/markdownLink.js';
-import { OpenFailed, NotPromptFile, RecursiveReference, ParseError, FailedToResolveContentsStream } from '../../promptFileReferenceErrors.js';
+import { OpenFailed, NotPromptFile, RecursiveReference, FolderReference, ParseError, FailedToResolveContentsStream } from '../../promptFileReferenceErrors.js';
 
 /**
  * Well-known localized error messages.
@@ -38,7 +38,7 @@ const errorMessages = {
 /**
  * Error conditions that may happen during the file reference resolution.
  */
-export type TErrorCondition = OpenFailed | RecursiveReference | NotPromptFile;
+export type TErrorCondition = OpenFailed | RecursiveReference | FolderReference | NotPromptFile;
 
 /**
  * Base prompt parser class that provides a common interface for all
@@ -376,7 +376,18 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 			.filter((reference) => {
 				const { errorCondition } = reference;
 
-				return !errorCondition || (errorCondition instanceof NotPromptFile);
+				// include all references without errors
+				if (!errorCondition) {
+					return true;
+				}
+
+				// filter out folder references from the list
+				if (errorCondition instanceof FolderReference) {
+					return false;
+				}
+
+				// include non-prompt file references
+				return (errorCondition instanceof NotPromptFile);
 			});
 	}
 
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/promptFileReference.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/promptFileReference.test.ts
index 1a456bd9933c..f9c6214af670 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/promptFileReference.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/promptFileReference.test.ts
@@ -23,10 +23,10 @@ import { waitRandom, randomBoolean } from '../../../../../../base/test/common/te
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { NotPromptFile, RecursiveReference, OpenFailed } from '../../../common/promptFileReferenceErrors.js';
 import { ConfigurationService } from '../../../../../../platform/configuration/common/configurationService.js';
 import { InMemoryFileSystemProvider } from '../../../../../../platform/files/common/inMemoryFilesystemProvider.js';
 import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { NotPromptFile, RecursiveReference, OpenFailed, FolderReference } from '../../../common/promptFileReferenceErrors.js';
 
 /**
  * Represents a file reference with an expected
@@ -285,7 +285,7 @@ suite('PromptFileReference (Unix)', function () {
 				new ExpectedReference(
 					URI.joinPath(rootUri, './folder1/some-other-folder'),
 					createTestFileReference('.', 1, 1),
-					new NotPromptFile(
+					new FolderReference(
 						URI.joinPath(rootUri, './folder1/some-other-folder'),
 						'This folder is not a prompt file!',
 					),
@@ -321,7 +321,7 @@ suite('PromptFileReference (Unix)', function () {
 				new ExpectedReference(
 					URI.joinPath(rootUri, './some-other-folder/folder1'),
 					createTestFileReference('../../folder1', 5, 48),
-					new NotPromptFile(
+					new FolderReference(
 						URI.joinPath(rootUri, './folder1'),
 						'Uggh ohh!',
 					),

From 6367c86d6e07bb35365c42839380c801b9341d08 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 20 Feb 2025 09:58:46 +0100
Subject: [PATCH 0141/1815] make sure `Close` button is rendered in inline chat
 (#241309)

https://github.com/microsoft/vscode/issues/239090
---
 .../workbench/contrib/inlineChat/browser/inlineChatActions.ts  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
index 8949a6257519..b23098134a1a 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
@@ -386,8 +386,7 @@ export class CloseAction extends AbstractInline1ChatAction {
 				group: '0_main',
 				order: 1,
 				when: ContextKeyExpr.and(
-					CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.negate(),
-					CTX_INLINE_CHAT_RESPONSE_TYPE.isEqualTo(InlineChatResponseType.Messages)
+					CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.negate()
 				),
 			}]
 		});

From bfa04d61958838a308238298e9a97f47e998e98a Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Thu, 20 Feb 2025 10:08:20 +0100
Subject: [PATCH 0142/1815] Fix ghost text screen reader accessibility issues
 (#241311)

bug fix screen readers
---
 .../editor/contrib/inlineCompletions/browser/model/ghostText.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/ghostText.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/ghostText.ts
index ac3939847e1f..40411f027ef7 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/ghostText.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/ghostText.ts
@@ -47,7 +47,7 @@ export class GhostText {
 		const text = new TextEdit([
 			...this.parts.map(p => new SingleTextEdit(
 				Range.fromPositions(new Position(1, p.column)),
-				p.lines.join('\n')
+				p.lines.map(line => line.line).join('\n')
 			)),
 		]).applyToString(cappedLineText);
 

From 55d4dffb18a37a56320bb84cd379768d4ce62493 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Thu, 20 Feb 2025 10:35:48 +0100
Subject: [PATCH 0143/1815] Revert "Fixing appearance of the double cursor"
 (#241315)

Revert "Fixing appearance of the double cursor (#238949)"

This reverts commit 978e8605ebf4fc4cb3188e9d677cc5b363f0543b.
---
 .../controller/editContext/native/nativeEditContextUtils.ts  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
index fd170ef812d0..b3166de0437a 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
@@ -30,11 +30,6 @@ export class FocusTracker extends Disposable {
 			return;
 		}
 		this._isFocused = focused;
-		if (this._isFocused) {
-			this._domNode.focus();
-		} else {
-			this._domNode.blur();
-		}
 		this._onFocusChange(this._isFocused);
 	}
 

From fc13789ac8cbca2a499384e200f5e299dd97f9d0 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Thu, 20 Feb 2025 10:40:40 +0100
Subject: [PATCH 0144/1815] Move collapsed mode option (#241316)

Move collapsed mode down in menu
---
 .../view/inlineEdits/components/gutterIndicatorMenu.ts    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 23860ee0574f..6624abea5fa5 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
@@ -70,14 +70,14 @@ export class GutterIndicatorMenuContent {
 			})),
 			option(createOptionArgs({ id: 'reject', title: localize('reject', "Reject"), icon: Codicon.close, commandId: hideInlineCompletionId })),
 			separator(),
-			this._inlineEditsShowCollapsed.map(showCollapsed => showCollapsed ?
-				option(createOptionArgs({ id: 'showExpanded', title: localize('showExpanded', "Show Expanded"), icon: Codicon.expandAll, commandId: toggleShowCollapsedId })) :
-				option(createOptionArgs({ id: 'showCollapsed', title: localize('showCollapsed', "Show Collapsed"), icon: Codicon.collapseAll, commandId: toggleShowCollapsedId }))
-			),
 			this._host.extensionCommands?.map(c => c && c.length > 0 ? [
 				...c.map((c, idx) => option(createOptionArgs({ id: c.id + '_' + idx, title: c.title, icon: Codicon.symbolEvent, commandId: c.id, commandArgs: c.arguments }))),
 				separator()
 			] : []),
+			this._inlineEditsShowCollapsed.map(showCollapsed => showCollapsed ?
+				option(createOptionArgs({ id: 'showExpanded', title: localize('showExpanded', "Show Expanded"), icon: Codicon.expandAll, commandId: toggleShowCollapsedId })) :
+				option(createOptionArgs({ id: 'showCollapsed', title: localize('showCollapsed', "Show Collapsed"), icon: Codicon.collapseAll, commandId: toggleShowCollapsedId }))
+			),
 			option(createOptionArgs({ id: 'settings', title: localize('settings', "Settings"), icon: Codicon.gear, commandId: 'workbench.action.openSettings', commandArgs: ['@tag:nextEditSuggestions'] })),
 			this._host.action.map(action => action ? [
 				separator(),

From c4f757d3ce7073e35154889370e1834be2b6bad9 Mon Sep 17 00:00:00 2001
From: notoriousmango <psm03120@gmail.com>
Date: Thu, 20 Feb 2025 18:42:41 +0900
Subject: [PATCH 0145/1815] verbose to trace

---
 extensions/markdown-language-features/src/logging.ts   | 10 ++++------
 .../markdown-language-features/src/markdownEngine.ts   |  2 +-
 .../src/preview/documentRenderer.ts                    |  2 +-
 .../markdown-language-features/src/preview/preview.ts  |  2 +-
 .../markdown-language-features/src/test/nulLogging.ts  |  2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/extensions/markdown-language-features/src/logging.ts b/extensions/markdown-language-features/src/logging.ts
index 7bdd0c243417..3b43e172799a 100644
--- a/extensions/markdown-language-features/src/logging.ts
+++ b/extensions/markdown-language-features/src/logging.ts
@@ -8,14 +8,14 @@ import { Disposable } from './util/dispose';
 
 
 export interface ILogger {
-	verbose(message: string, ...args: any[]): void;
+	trace(title: string, message: string, data?: any): void;
 }
 
 export class VsCodeOutputLogger extends Disposable implements ILogger {
 	private _outputChannelValue?: vscode.LogOutputChannel;
 
 	private get _outputChannel() {
-		this._outputChannelValue ??= vscode.window.createOutputChannel('TypeScript', { log: true });
+		this._outputChannelValue ??= vscode.window.createOutputChannel('Markdown', { log: true });
 		return this._outputChannelValue;
 	}
 
@@ -23,9 +23,7 @@ export class VsCodeOutputLogger extends Disposable implements ILogger {
 		super();
 	}
 
-	public verbose(message: string, ...args: any[]): void {
-		if (this._outputChannel.logLevel === vscode.LogLevel.Trace) {
-			this._outputChannel.trace(message, ...args);
-		}
+	public trace(title: string, message: string, data?: any): void {
+		this._outputChannel.trace(`${title} ${message}`, ...(data ? [JSON.stringify(data, null, 4)] : []));
 	}
 }
diff --git a/extensions/markdown-language-features/src/markdownEngine.ts b/extensions/markdown-language-features/src/markdownEngine.ts
index 83925eab1324..89363a77a86d 100644
--- a/extensions/markdown-language-features/src/markdownEngine.ts
+++ b/extensions/markdown-language-features/src/markdownEngine.ts
@@ -186,7 +186,7 @@ export class MarkdownItEngine implements IMdParser {
 			return cached;
 		}
 
-		this._logger.verbose('MarkdownItEngine', `tokenizeDocument - ${document.uri}`);
+		this._logger.trace('MarkdownItEngine', `tokenizeDocument - ${document.uri}`);
 		const tokens = this._tokenizeString(document.getText(), engine);
 		this._tokenCache.update(document, config, tokens);
 		return tokens;
diff --git a/extensions/markdown-language-features/src/preview/documentRenderer.ts b/extensions/markdown-language-features/src/preview/documentRenderer.ts
index eeab8e19d9d6..8a39c9cdf4d3 100644
--- a/extensions/markdown-language-features/src/preview/documentRenderer.ts
+++ b/extensions/markdown-language-features/src/preview/documentRenderer.ts
@@ -79,7 +79,7 @@ export class MdDocumentRenderer {
 			webviewResourceRoot: resourceProvider.asWebviewUri(markdownDocument.uri).toString(),
 		};
 
-		this._logger.verbose('DocumentRenderer', `provideTextDocumentContent - ${markdownDocument.uri}`, initialData);
+		this._logger.trace('DocumentRenderer', `provideTextDocumentContent - ${markdownDocument.uri}`, initialData);
 
 		// Content Security Policy
 		const nonce = getNonce();
diff --git a/extensions/markdown-language-features/src/preview/preview.ts b/extensions/markdown-language-features/src/preview/preview.ts
index 7ccbc625b473..2d4186df9ae3 100644
--- a/extensions/markdown-language-features/src/preview/preview.ts
+++ b/extensions/markdown-language-features/src/preview/preview.ts
@@ -221,7 +221,7 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 			return;
 		}
 
-		this._logger.verbose('MarkdownPreview', 'updateForView', { markdownFile: this._resource });
+		this._logger.trace('MarkdownPreview', 'updateForView', { markdownFile: this._resource });
 		this._line = topLine;
 		this.postMessage({
 			type: 'updateView',
diff --git a/extensions/markdown-language-features/src/test/nulLogging.ts b/extensions/markdown-language-features/src/test/nulLogging.ts
index a786ab83b4f2..035e7d74c6dc 100644
--- a/extensions/markdown-language-features/src/test/nulLogging.ts
+++ b/extensions/markdown-language-features/src/test/nulLogging.ts
@@ -6,7 +6,7 @@
 import { ILogger } from '../logging';
 
 export const nulLogger = new class implements ILogger {
-	verbose(): void {
+	trace(): void {
 		// noop
 	}
 };

From 4e2822d978f1135fcadac0537c6a4d289171aff2 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Thu, 20 Feb 2025 10:56:12 +0100
Subject: [PATCH 0146/1815] Fix transient model watcher leak (#241320)

fix transient model watcher leak
---
 .../services/abstractCodeEditorService.ts     | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/vs/editor/browser/services/abstractCodeEditorService.ts b/src/vs/editor/browser/services/abstractCodeEditorService.ts
index 0743bcae74ad..295d5bf1ca10 100644
--- a/src/vs/editor/browser/services/abstractCodeEditorService.ts
+++ b/src/vs/editor/browser/services/abstractCodeEditorService.ts
@@ -7,7 +7,7 @@ import * as dom from '../../../base/browser/dom.js';
 import * as domStylesheets from '../../../base/browser/domStylesheets.js';
 import * as cssJs from '../../../base/browser/cssValue.js';
 import { Emitter, Event } from '../../../base/common/event.js';
-import { IDisposable, DisposableStore, Disposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { IDisposable, DisposableStore, Disposable, toDisposable, DisposableMap } from '../../../base/common/lifecycle.js';
 import { LinkedList } from '../../../base/common/linkedList.js';
 import * as strings from '../../../base/common/strings.js';
 import { URI } from '../../../base/common/uri.js';
@@ -210,7 +210,7 @@ export abstract class AbstractCodeEditorService extends Disposable implements IC
 		return provider.resolveDecorationCSSRules();
 	}
 
-	private readonly _transientWatchers: { [uri: string]: ModelTransientSettingWatcher } = {};
+	private readonly _transientWatchers = this._register(new DisposableMap<string, ModelTransientSettingWatcher>());
 	private readonly _modelProperties = new Map<string, Map<string, any>>();
 
 	public setModelProperty(resource: URI, key: string, value: any): void {
@@ -238,12 +238,10 @@ export abstract class AbstractCodeEditorService extends Disposable implements IC
 	public setTransientModelProperty(model: ITextModel, key: string, value: any): void {
 		const uri = model.uri.toString();
 
-		let w: ModelTransientSettingWatcher;
-		if (this._transientWatchers.hasOwnProperty(uri)) {
-			w = this._transientWatchers[uri];
-		} else {
+		let w = this._transientWatchers.get(uri);
+		if (!w) {
 			w = new ModelTransientSettingWatcher(uri, model, this);
-			this._transientWatchers[uri] = w;
+			this._transientWatchers.set(uri, w);
 		}
 
 		const previousValue = w.get(key);
@@ -256,25 +254,27 @@ export abstract class AbstractCodeEditorService extends Disposable implements IC
 	public getTransientModelProperty(model: ITextModel, key: string): any {
 		const uri = model.uri.toString();
 
-		if (!this._transientWatchers.hasOwnProperty(uri)) {
+		const watcher = this._transientWatchers.get(uri);
+		if (!watcher) {
 			return undefined;
 		}
 
-		return this._transientWatchers[uri].get(key);
+		return watcher.get(key);
 	}
 
 	public getTransientModelProperties(model: ITextModel): [string, any][] | undefined {
 		const uri = model.uri.toString();
 
-		if (!this._transientWatchers.hasOwnProperty(uri)) {
+		const watcher = this._transientWatchers.get(uri);
+		if (!watcher) {
 			return undefined;
 		}
 
-		return this._transientWatchers[uri].keys().map(key => [key, this._transientWatchers[uri].get(key)]);
+		return watcher.keys().map(key => [key, watcher.get(key)]);
 	}
 
 	_removeWatcher(w: ModelTransientSettingWatcher): void {
-		delete this._transientWatchers[w.uri];
+		this._transientWatchers.deleteAndDispose(w.uri);
 	}
 
 	abstract getActiveCodeEditor(): ICodeEditor | null;
@@ -295,14 +295,16 @@ export abstract class AbstractCodeEditorService extends Disposable implements IC
 	}
 }
 
-export class ModelTransientSettingWatcher {
+export class ModelTransientSettingWatcher extends Disposable {
 	public readonly uri: string;
 	private readonly _values: { [key: string]: any };
 
 	constructor(uri: string, model: ITextModel, owner: AbstractCodeEditorService) {
+		super();
+
 		this.uri = uri;
 		this._values = {};
-		model.onWillDispose(() => owner._removeWatcher(this));
+		this._register(model.onWillDispose(() => owner._removeWatcher(this)));
 	}
 
 	public set(key: string, value: any): void {

From a29d55f66a130260eec9196a5dc86aec4b771778 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Thu, 20 Feb 2025 11:06:22 +0100
Subject: [PATCH 0147/1815] prepare February endgame (#241323)

---
 .vscode/notebooks/endgame.github-issues    | 2 +-
 .vscode/notebooks/my-endgame.github-issues | 2 +-
 .vscode/notebooks/my-work.github-issues    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vscode/notebooks/endgame.github-issues b/.vscode/notebooks/endgame.github-issues
index d1c128a6d0a7..9f92bf0b6a62 100644
--- a/.vscode/notebooks/endgame.github-issues
+++ b/.vscode/notebooks/endgame.github-issues
@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"January 2025\""
+    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"February 2025\""
   },
   {
     "kind": 1,
diff --git a/.vscode/notebooks/my-endgame.github-issues b/.vscode/notebooks/my-endgame.github-issues
index b16f0025f564..9d5c8ccdcc54 100644
--- a/.vscode/notebooks/my-endgame.github-issues
+++ b/.vscode/notebooks/my-endgame.github-issues
@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"January 2025\"\n\n$MINE=assignee:@me"
+    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"February 2025\"\n\n$MINE=assignee:@me"
   },
   {
     "kind": 1,
diff --git a/.vscode/notebooks/my-work.github-issues b/.vscode/notebooks/my-work.github-issues
index e8b184f8e573..c7674cef414a 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:\"January 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\n\n// current milestone name\n$MILESTONE=milestone:\"February 2025\"\n"
   },
   {
     "kind": 1,

From 7e2db9ad92ba0e30532d58b0d8083e640eef8097 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 20 Feb 2025 11:07:55 +0100
Subject: [PATCH 0148/1815] debt - fix leaks around `ActionRunner` (#241325)

---
 .../browser/menuEntryActionViewItem.ts        | 19 +++++++------------
 .../parts/editor/multiEditorTabsControl.ts    |  2 +-
 .../notifications/notificationsCommands.ts    |  1 +
 .../comments/browser/commentFormActions.ts    |  4 ++--
 .../terminal/browser/terminalContextMenu.ts   |  4 +++-
 .../terminal/browser/terminalTabsList.ts      |  4 ++--
 .../contrib/terminal/browser/terminalView.ts  |  6 ++++--
 .../testing/browser/testingExplorerView.ts    |  2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
index 0581f04a6441..8971195a1c9d 100644
--- a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
+++ b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
@@ -14,7 +14,7 @@ import { Event } from '../../../base/common/event.js';
 import { UILabelProvider } from '../../../base/common/keybindingLabels.js';
 import { ResolvedKeybinding } from '../../../base/common/keybindings.js';
 import { KeyCode } from '../../../base/common/keyCodes.js';
-import { combinedDisposable, MutableDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { combinedDisposable, DisposableStore, MutableDisposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { isLinux, isWindows, OS } from '../../../base/common/platform.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import { assertType } from '../../../base/common/types.js';
@@ -429,6 +429,7 @@ export interface IDropdownWithDefaultActionViewItemOptions extends IDropdownMenu
 export class DropdownWithDefaultActionViewItem extends BaseActionViewItem {
 	private readonly _options: IDropdownWithDefaultActionViewItemOptions | undefined;
 	private _defaultAction: ActionViewItem;
+	private readonly _defaultActionDisposables = this._register(new DisposableStore());
 	private readonly _dropdown: DropdownMenuActionViewItem;
 	private _container: HTMLElement | null = null;
 	private readonly _storageKey: string;
@@ -471,7 +472,7 @@ export class DropdownWithDefaultActionViewItem extends BaseActionViewItem {
 			actionRunner: options?.actionRunner ?? this._register(new ActionRunner()),
 		};
 
-		this._dropdown = new DropdownMenuActionViewItem(submenuAction, submenuAction.actions, this._contextMenuService, dropdownOptions);
+		this._dropdown = this._register(new DropdownMenuActionViewItem(submenuAction, submenuAction.actions, this._contextMenuService, dropdownOptions));
 		this._register(this._dropdown.actionRunner.onDidRun((e: IRunEvent) => {
 			if (e.action instanceof MenuItemAction) {
 				this.update(e.action);
@@ -484,13 +485,13 @@ export class DropdownWithDefaultActionViewItem extends BaseActionViewItem {
 			this._storageService.store(this._storageKey, lastAction.id, StorageScope.WORKSPACE, StorageTarget.MACHINE);
 		}
 
-		this._defaultAction.dispose();
-		this._defaultAction = this._instaService.createInstance(MenuEntryActionViewItem, lastAction, { keybinding: this._getDefaultActionKeybindingLabel(lastAction) });
-		this._defaultAction.actionRunner = new class extends ActionRunner {
+		this._defaultActionDisposables.clear();
+		this._defaultAction = this._defaultActionDisposables.add(this._instaService.createInstance(MenuEntryActionViewItem, lastAction, { keybinding: this._getDefaultActionKeybindingLabel(lastAction) }));
+		this._defaultAction.actionRunner = this._defaultActionDisposables.add(new class extends ActionRunner {
 			protected override async runAction(action: IAction, context?: unknown): Promise<void> {
 				await action.run(undefined);
 			}
-		}();
+		}());
 
 		if (this._container) {
 			this._defaultAction.render(prepend(this._container, $('.action-container')));
@@ -567,12 +568,6 @@ export class DropdownWithDefaultActionViewItem extends BaseActionViewItem {
 			this._dropdown.setFocusable(false);
 		}
 	}
-
-	override dispose() {
-		this._defaultAction.dispose();
-		this._dropdown.dispose();
-		super.dispose();
-	}
 }
 
 class SubmenuEntrySelectActionViewItem extends SelectActionViewItem {
diff --git a/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts b/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
index 708f4d9f6d56..978c3f94059d 100644
--- a/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
@@ -837,7 +837,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 			}
 		});
 
-		const tabActionBarDisposable = combinedDisposable(tabActionBar, tabActionListener, toDisposable(insert(this.tabActionBars, tabActionBar)));
+		const tabActionBarDisposable = combinedDisposable(tabActionRunner, tabActionBar, tabActionListener, toDisposable(insert(this.tabActionBars, tabActionBar)));
 
 		// Tab Fade Hider
 		// Hides the tab fade to the right when tab action left and sizing shrink/fixed, ::after, ::before are already used
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
index 04980171865f..d3fff55ef7c1 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCommands.ts
@@ -169,6 +169,7 @@ export function registerNotificationCommands(center: INotificationsCenterControl
 			}
 			actionRunner.run(primaryAction, notification);
 			notification.close();
+			actionRunner.dispose();
 		}
 	});
 
diff --git a/src/vs/workbench/contrib/comments/browser/commentFormActions.ts b/src/vs/workbench/contrib/comments/browser/commentFormActions.ts
index 9b559a15e10a..f83a1b60a533 100644
--- a/src/vs/workbench/contrib/comments/browser/commentFormActions.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentFormActions.ts
@@ -52,11 +52,11 @@ export class CommentFormActions implements IDisposable {
 				const button = dropDownActions.length ? new ButtonWithDropdown(this.container, {
 					contextMenuProvider: this.contextMenuService,
 					actions: dropDownActions,
-					actionRunner: new class extends ActionRunner {
+					actionRunner: this._toDispose.add(new class extends ActionRunner {
 						protected override async runAction(action: IAction, context?: unknown): Promise<void> {
 							return actionHandler(action);
 						}
-					},
+					}),
 					secondary: !isPrimary,
 					title,
 					addPrimaryActionToDropdown: false,
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalContextMenu.ts b/src/vs/workbench/contrib/terminal/browser/terminalContextMenu.ts
index 16af6fc45e29..e7c3aa505a78 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalContextMenu.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalContextMenu.ts
@@ -59,10 +59,12 @@ export function openContextMenu(targetWindow: Window, event: MouseEvent, context
 
 	const context: InstanceContext[] = contextInstances ? asArray(contextInstances).map(e => new InstanceContext(e)) : [];
 
+	const actionRunner = new TerminalContextActionRunner();
 	contextMenuService.showContextMenu({
-		actionRunner: new TerminalContextActionRunner(),
+		actionRunner,
 		getAnchor: () => standardEvent,
 		getActions: () => actions,
 		getActionsContext: () => context,
+		onHide: () => actionRunner.dispose()
 	});
 }
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
index cde793d6a9ae..5d8140d604bd 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
@@ -292,10 +292,10 @@ class TerminalTabsRenderer extends Disposable implements IListRenderer<ITerminal
 		const actionsContainer = DOM.append(label.element, $('.actions'));
 
 		const actionBar = this._register(new ActionBar(actionsContainer, {
-			actionRunner: new TerminalContextActionRunner(),
+			actionRunner: this._register(new TerminalContextActionRunner()),
 			actionViewItemProvider: (action, options) =>
 				action instanceof MenuItemAction
-					? this._instantiationService.createInstance(MenuEntryActionViewItem, action, { hoverDelegate: options.hoverDelegate })
+					? this._register(this._instantiationService.createInstance(MenuEntryActionViewItem, action, { hoverDelegate: options.hoverDelegate }))
 					: undefined
 		}));
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
index d9b37e594c8e..07494bbbde31 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
@@ -547,15 +547,17 @@ class SingleTerminalTabActionViewItem extends MenuEntryActionViewItem {
 	}
 
 	private _openContextMenu() {
+		const actionRunner = new TerminalContextActionRunner();
 		this._contextMenuService.showContextMenu({
-			actionRunner: new TerminalContextActionRunner(),
+			actionRunner,
 			getAnchor: () => this.element!,
 			getActions: () => this._actions,
 			// The context is always the active instance in the terminal view
 			getActionsContext: () => {
 				const instance = this._terminalGroupService.activeInstance;
 				return instance ? [new InstanceContext(instance)] : [];
-			}
+			},
+			onHide: () => actionRunner.dispose()
 		});
 	}
 }
diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
index 1383e0061ec3..7c9c38a02399 100644
--- a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
@@ -706,7 +706,7 @@ class TestingExplorerViewModel extends Disposable {
 	private readonly _viewMode = TestingContextKeys.viewMode.bindTo(this.contextKeyService);
 	private readonly _viewSorting = TestingContextKeys.viewSorting.bindTo(this.contextKeyService);
 	private readonly welcomeVisibilityEmitter = new Emitter<WelcomeExperience>();
-	private readonly actionRunner = new TestExplorerActionRunner(() => this.tree.getSelection().filter(isDefined));
+	private readonly actionRunner = this._register(new TestExplorerActionRunner(() => this.tree.getSelection().filter(isDefined)));
 	private readonly lastViewState = this._register(new StoredValue<ISerializedTestTreeCollapseState>({
 		key: 'testing.treeState',
 		scope: StorageScope.WORKSPACE,

From 89fef848ef22db790fd00e42eba05d428ca94485 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 20 Feb 2025 12:04:34 +0100
Subject: [PATCH 0149/1815] Provide encoding-related APIs for editor extensions
 (#824) (#240804)

---
 .../src/singlefolder-tests/workspace.test.ts  | 65 ++++++++++++-
 .../api/browser/mainThreadDocuments.ts        | 33 ++++---
 .../workbench/api/common/extHost.api.impl.ts  | 10 +-
 .../workbench/api/common/extHost.protocol.ts  |  4 +-
 .../workbench/api/common/extHostDocuments.ts  | 17 +++-
 .../vscode.proposed.textDocumentEncoding.d.ts | 95 ++++++++++++++++++-
 6 files changed, 196 insertions(+), 28 deletions(-)

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 97a99fe56469..501efe7e2301 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
@@ -1311,7 +1311,7 @@ suite('vscode API - workspace', () => {
 		return deleteFile(file);
 	}
 
-	test('text document encodings', async () => {
+	test('encoding: text document encodings', async () => {
 		const uri1 = await createRandomFile();
 		const uri2 = await createRandomFile(new Uint8Array([0xEF, 0xBB, 0xBF]) /* UTF-8 with BOM */);
 		const uri3 = await createRandomFile(new Uint8Array([0xFF, 0xFE]) /* UTF-16 LE BOM */);
@@ -1333,7 +1333,66 @@ suite('vscode API - workspace', () => {
 		assert.strictEqual(doc5.encoding, 'utf8');
 	});
 
-	test('fs.decode', async function () {
+	test('encoding: openTextDocument', async () => {
+		const uri1 = await createRandomFile();
+
+		let doc1 = await vscode.workspace.openTextDocument(uri1, { encoding: 'cp1252' });
+		assert.strictEqual(doc1.encoding, 'cp1252');
+
+		let listener: vscode.Disposable | undefined;
+		const documentChangePromise = new Promise<void>(resolve => {
+			listener = vscode.workspace.onDidChangeTextDocument(e => {
+				if (e.document.uri.toString() === uri1.toString()) {
+					resolve();
+				}
+			});
+		});
+
+		doc1 = await vscode.workspace.openTextDocument(uri1, { encoding: 'utf16le' });
+		assert.strictEqual(doc1.encoding, 'utf16le');
+		await documentChangePromise;
+
+		const doc2 = await vscode.workspace.openTextDocument({ encoding: 'utf16be' });
+		assert.strictEqual(doc2.encoding, 'utf16be');
+
+		const doc3 = await vscode.workspace.openTextDocument({ content: 'Hello World', encoding: 'utf16le' });
+		assert.strictEqual(doc3.encoding, 'utf16le');
+
+		listener?.dispose();
+	});
+
+	test('encoding: openTextDocument - throws for dirty documents', async () => {
+		const uri1 = await createRandomFile();
+
+		const doc1 = await vscode.workspace.openTextDocument(uri1, { encoding: 'cp1252' });
+
+		const edit = new vscode.WorkspaceEdit();
+		edit.insert(doc1.uri, new vscode.Position(0, 0), 'Hello World');
+		await vscode.workspace.applyEdit(edit);
+		assert.strictEqual(doc1.isDirty, true);
+
+		let err;
+		try {
+			await vscode.workspace.decode(new Uint8Array([0, 0, 0, 0]), doc1.uri);
+		} catch (e) {
+			err = e;
+		}
+		assert.ok(err);
+	});
+
+	test('encoding: openTextDocument - multiple requests with different encoding work', async () => {
+		const uri1 = await createRandomFile();
+
+		const doc1P = vscode.workspace.openTextDocument(uri1);
+		const doc2P = vscode.workspace.openTextDocument(uri1, { encoding: 'cp1252' });
+
+		const [doc1, doc2] = await Promise.all([doc1P, doc2P]);
+
+		assert.strictEqual(doc1.encoding, 'cp1252');
+		assert.strictEqual(doc2.encoding, 'cp1252');
+	});
+
+	test('encoding: decode', async function () {
 		const uri = root.with({ path: posix.join(root.path, 'file.txt') });
 
 		// without setting
@@ -1375,7 +1434,7 @@ suite('vscode API - workspace', () => {
 		assert.ok(err);
 	});
 
-	test('fs.encode', async function () {
+	test('encoding: encode', async function () {
 		const uri = root.with({ path: posix.join(root.path, 'file.txt') });
 
 		// without setting
diff --git a/src/vs/workbench/api/browser/mainThreadDocuments.ts b/src/vs/workbench/api/browser/mainThreadDocuments.ts
index a882ce0beed9..47925bd1c08d 100644
--- a/src/vs/workbench/api/browser/mainThreadDocuments.ts
+++ b/src/vs/workbench/api/browser/mainThreadDocuments.ts
@@ -12,7 +12,7 @@ import { IModelService } from '../../../editor/common/services/model.js';
 import { ITextModelService } from '../../../editor/common/services/resolverService.js';
 import { IFileService, FileOperation } from '../../../platform/files/common/files.js';
 import { ExtHostContext, ExtHostDocumentsShape, MainThreadDocumentsShape } from '../common/extHost.protocol.js';
-import { ITextFileEditorModel, ITextFileService } from '../../services/textfile/common/textfiles.js';
+import { EncodingMode, ITextFileEditorModel, ITextFileService, TextFileResolveReason } from '../../services/textfile/common/textfiles.js';
 import { IUntitledTextEditorModel } from '../../services/untitled/common/untitledTextEditorModel.js';
 import { IWorkbenchEnvironmentService } from '../../services/environment/common/environmentService.js';
 import { toLocalResource, extUri, IExtUri } from '../../../base/common/resources.js';
@@ -219,7 +219,7 @@ export class MainThreadDocuments extends Disposable implements MainThreadDocumen
 		return Boolean(target);
 	}
 
-	async $tryOpenDocument(uriData: UriComponents): Promise<URI> {
+	async $tryOpenDocument(uriData: UriComponents, options?: { encoding?: string }): Promise<URI> {
 		const inputUri = URI.revive(uriData);
 		if (!inputUri.scheme || !(inputUri.fsPath || inputUri.authority)) {
 			throw new ErrorNoTelemetry(`Invalid uri. Scheme and authority or path must be set.`);
@@ -230,11 +230,11 @@ export class MainThreadDocuments extends Disposable implements MainThreadDocumen
 		let promise: Promise<URI>;
 		switch (canonicalUri.scheme) {
 			case Schemas.untitled:
-				promise = this._handleUntitledScheme(canonicalUri);
+				promise = this._handleUntitledScheme(canonicalUri, options);
 				break;
 			case Schemas.file:
 			default:
-				promise = this._handleAsResourceInput(canonicalUri);
+				promise = this._handleAsResourceInput(canonicalUri, options);
 				break;
 		}
 
@@ -255,31 +255,40 @@ export class MainThreadDocuments extends Disposable implements MainThreadDocumen
 		}
 	}
 
-	$tryCreateDocument(options?: { language?: string; content?: string }): Promise<URI> {
-		return this._doCreateUntitled(undefined, options ? options.language : undefined, options ? options.content : undefined);
+	$tryCreateDocument(options?: { language?: string; content?: string; encoding?: string }): Promise<URI> {
+		return this._doCreateUntitled(undefined, options);
 	}
 
-	private async _handleAsResourceInput(uri: URI): Promise<URI> {
+	private async _handleAsResourceInput(uri: URI, options?: { encoding?: string }): Promise<URI> {
+		if (options?.encoding) {
+			const model = await this._textFileService.files.resolve(uri, { encoding: options.encoding, reason: TextFileResolveReason.REFERENCE });
+			if (model.isDirty()) {
+				throw new ErrorNoTelemetry(`Cannot re-open a dirty text document with different encoding. Save it first.`);
+			}
+			await model.setEncoding(options.encoding, EncodingMode.Decode);
+		}
+
 		const ref = await this._textModelResolverService.createModelReference(uri);
 		this._modelReferenceCollection.add(uri, ref, ref.object.textEditorModel.getValueLength());
 		return ref.object.textEditorModel.uri;
 	}
 
-	private async _handleUntitledScheme(uri: URI): Promise<URI> {
+	private async _handleUntitledScheme(uri: URI, options?: { encoding?: string }): Promise<URI> {
 		const asLocalUri = toLocalResource(uri, this._environmentService.remoteAuthority, this._pathService.defaultUriScheme);
 		const exists = await this._fileService.exists(asLocalUri);
 		if (exists) {
 			// don't create a new file ontop of an existing file
 			return Promise.reject(new Error('file already exists'));
 		}
-		return await this._doCreateUntitled(Boolean(uri.path) ? uri : undefined);
+		return await this._doCreateUntitled(Boolean(uri.path) ? uri : undefined, options);
 	}
 
-	private async _doCreateUntitled(associatedResource?: URI, languageId?: string, initialValue?: string): Promise<URI> {
+	private async _doCreateUntitled(associatedResource?: URI, options?: { language?: string; content?: string; encoding?: string }): Promise<URI> {
 		const model = this._textFileService.untitled.create({
 			associatedResource,
-			languageId,
-			initialValue
+			languageId: options?.language,
+			initialValue: options?.content,
+			encoding: options?.encoding
 		});
 		const resource = model.resource;
 		const ref = await this._textModelResolverService.createModelReference(resource);
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index 3099a31228ad..1dac783d0a42 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -1024,10 +1024,14 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			set textDocuments(value) {
 				throw new errors.ReadonlyError('textDocuments');
 			},
-			openTextDocument(uriOrFileNameOrOptions?: vscode.Uri | string | { language?: string; content?: string }) {
+			openTextDocument(uriOrFileNameOrOptions?: vscode.Uri | string | { language?: string; content?: string; encoding?: string }, options?: { encoding?: string }) {
 				let uriPromise: Thenable<URI>;
 
-				const options = uriOrFileNameOrOptions as { language?: string; content?: string };
+				options = (options ?? uriOrFileNameOrOptions) as ({ language?: string; content?: string; encoding?: string } | undefined);
+				if (typeof options?.encoding === 'string') {
+					checkProposedApiEnabled(extension, 'textDocumentEncoding');
+				}
+
 				if (typeof uriOrFileNameOrOptions === 'string') {
 					uriPromise = Promise.resolve(URI.file(uriOrFileNameOrOptions));
 				} else if (URI.isUri(uriOrFileNameOrOptions)) {
@@ -1043,7 +1047,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 					if (uri.scheme === Schemas.vscodeRemote && !uri.authority) {
 						extHostApiDeprecation.report('workspace.openTextDocument', extension, `A URI of 'vscode-remote' scheme requires an authority.`);
 					}
-					return extHostDocuments.ensureDocumentData(uri).then(documentData => {
+					return extHostDocuments.ensureDocumentData(uri, options).then(documentData => {
 						return documentData.document;
 					});
 				});
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 0e4072c38d90..c8530c64edee 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -238,8 +238,8 @@ export interface MainThreadDocumentContentProvidersShape extends IDisposable {
 }
 
 export interface MainThreadDocumentsShape extends IDisposable {
-	$tryCreateDocument(options?: { language?: string; content?: string }): Promise<UriComponents>;
-	$tryOpenDocument(uri: UriComponents): Promise<UriComponents>;
+	$tryCreateDocument(options?: { language?: string; content?: string; encoding?: string }): Promise<UriComponents>;
+	$tryOpenDocument(uri: UriComponents, options?: { encoding?: string }): Promise<UriComponents>;
 	$trySaveDocument(uri: UriComponents): Promise<boolean>;
 }
 
diff --git a/src/vs/workbench/api/common/extHostDocuments.ts b/src/vs/workbench/api/common/extHostDocuments.ts
index c0d0ca5ad9c1..4e7dd522c51c 100644
--- a/src/vs/workbench/api/common/extHostDocuments.ts
+++ b/src/vs/workbench/api/common/extHostDocuments.ts
@@ -76,16 +76,16 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
 		return data.document;
 	}
 
-	public ensureDocumentData(uri: URI): Promise<ExtHostDocumentData> {
+	public ensureDocumentData(uri: URI, options?: { encoding?: string }): Promise<ExtHostDocumentData> {
 
 		const cached = this._documentsAndEditors.getDocument(uri);
-		if (cached) {
+		if (cached && (!options?.encoding || cached.document.encoding === options.encoding)) {
 			return Promise.resolve(cached);
 		}
 
 		let promise = this._documentLoader.get(uri.toString());
 		if (!promise) {
-			promise = this._proxy.$tryOpenDocument(uri).then(uriData => {
+			promise = this._proxy.$tryOpenDocument(uri, options).then(uriData => {
 				this._documentLoader.delete(uri.toString());
 				const canonicalUri = URI.revive(uriData);
 				return assertIsDefined(this._documentsAndEditors.getDocument(canonicalUri));
@@ -94,12 +94,21 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
 				return Promise.reject(err);
 			});
 			this._documentLoader.set(uri.toString(), promise);
+		} else {
+			if (options?.encoding) {
+				promise = promise.then(data => {
+					if (data.document.encoding !== options.encoding) {
+						return this.ensureDocumentData(uri, options);
+					}
+					return data;
+				});
+			}
 		}
 
 		return promise;
 	}
 
-	public createDocumentData(options?: { language?: string; content?: string }): Promise<URI> {
+	public createDocumentData(options?: { language?: string; content?: string; encoding?: string }): Promise<URI> {
 		return this._proxy.$tryCreateDocument(options).then(data => URI.revive(data));
 	}
 
diff --git a/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts b/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts
index 16c6b87ab3ad..73ca9341b70a 100644
--- a/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts
+++ b/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts
@@ -30,6 +30,91 @@ declare module 'vscode' {
 
 	export namespace workspace {
 
+		/**
+		 * Opens a document. Will return early if this document is already open. Otherwise
+		 * the document is loaded and the {@link workspace.onDidOpenTextDocument didOpen}-event fires.
+		 *
+		 * The document is denoted by an {@link Uri}. Depending on the {@link Uri.scheme scheme} the
+		 * following rules apply:
+		 * * `file`-scheme: Open a file on disk (`openTextDocument(Uri.file(path))`). Will be rejected if the file
+		 * does not exist or cannot be loaded.
+		 * * `untitled`-scheme: Open a blank untitled file with associated path (`openTextDocument(Uri.file(path).with({ scheme: 'untitled' }))`).
+		 * The language will be derived from the file name.
+		 * * For all other schemes contributed {@link TextDocumentContentProvider text document content providers} and
+		 * {@link FileSystemProvider file system providers} are consulted.
+		 *
+		 * *Note* that the lifecycle of the returned document is owned by the editor and not by the extension. That means an
+		 * {@linkcode workspace.onDidCloseTextDocument onDidClose}-event can occur at any time after opening it.
+		 *
+		 * @throws This method will throw an error when an existing text document with the provided uri is dirty.
+		 *
+		 * @param uri Identifies the resource to open.
+		 * @param options Options to control how the document will be opened.
+		 * @returns A promise that resolves to a {@link TextDocument document}.
+		 */
+		export function openTextDocument(uri: Uri, options?: {
+			/**
+			 * The {@link TextDocument.encoding encoding} of the document to use
+			 * for decoding the underlying buffer to text. If omitted, the encoding
+			 * will be guessed based on the file content and/or the editor settings.
+			 *
+			 * See {@link TextDocument.encoding} for more information about valid
+			 * values for encoding.
+			 *
+			 * *Note* that opening a text document that was already opened with a
+			 * different encoding has the potential of changing the text contents of
+			 * the text document.
+			 */
+			encoding?: string;
+		}): Thenable<TextDocument>;
+
+		/**
+		 * A short-hand for `openTextDocument(Uri.file(path))`.
+		 *
+		 * @see {@link workspace.openTextDocument}
+		 * @param path A path of a file on disk.
+		 * @param options Options to control how the document will be opened.
+		 * @returns A promise that resolves to a {@link TextDocument document}.
+		 */
+		export function openTextDocument(path: string, options?: {
+			/**
+			 * The {@link TextDocument.encoding encoding} of the document to use
+			 * for decoding the underlying buffer to text. If omitted, the encoding
+			 * will be guessed based on the file content and/or the editor settings.
+			 *
+			 * See {@link TextDocument.encoding} for more information about valid
+			 * values for encoding.
+			 *
+			 * *Note* that opening a text document that was already opened with a
+			 * different encoding has the potential of changing the text contents of
+			 * the text document.
+			 */
+			encoding?: string;
+		}): Thenable<TextDocument>;
+
+		/**
+		 * Opens an untitled text document. The editor will prompt the user for a file
+		 * path when the document is to be saved. The `options` parameter allows to
+		 * specify the *language*, *encoding* and/or the *content* of the document.
+		 *
+		 * @param options Options to control how the document will be created.
+		 * @returns A promise that resolves to a {@link TextDocument document}.
+		 */
+		export function openTextDocument(options?: {
+			/**
+			 * The {@link TextDocument.languageId language} of the document.
+			 */
+			language?: string;
+			/**
+			 * The initial contents of the document.
+			 */
+			content?: string;
+			/**
+			 * The {@link TextDocument.encoding encoding} of the document.
+			 */
+			encoding?: string;
+		}): Thenable<TextDocument>;
+
 		/**
 		 * Decodes the content from a `Uint8Array` to a `string`.
 		 *
@@ -42,10 +127,11 @@ declare module 'vscode' {
 		 * @param content The content to decode as a `Uint8Array`.
 		 * @param uri The URI that represents the file. This information
 		 * is used to figure out the encoding related configuration for the file.
-		 * @param options Allows to explicitly pick the encoding to use.
+		 * @param options Allows to explicitly pick the encoding to use. See {@link TextDocument.encoding}
+		 * for more information about valid values for encoding.
 		 * @returns A thenable that resolves to the decoded `string`.
 		 */
-		export function decode(content: Uint8Array, uri: Uri | undefined, options?: { readonly encoding: string }): Thenable<string>;
+		export function decode(content: Uint8Array, uri: Uri | undefined, options?: { encoding: string }): Thenable<string>;
 
 		/**
 		 * Encodes the content of a `string` to a `Uint8Array`.
@@ -56,9 +142,10 @@ declare module 'vscode' {
 		 * @param content The content to decode as a `string`.
 		 * @param uri The URI that represents the file. This information
 		 * is used to figure out the encoding related configuration for the file.
-		 * @param options Allows to explicitly pick the encoding to use.
+		 * @param options Allows to explicitly pick the encoding to use. See {@link TextDocument.encoding}
+		 * for more information about valid values for encoding.
 		 * @returns A thenable that resolves to the encoded `Uint8Array`.
 		 */
-		export function encode(content: string, uri: Uri | undefined, options?: { readonly encoding: string }): Thenable<Uint8Array>;
+		export function encode(content: string, uri: Uri | undefined, options?: { encoding: string }): Thenable<Uint8Array>;
 	}
 }

From 97f43d1c46a2e6be075251ce0d7c4cea67098233 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Thu, 20 Feb 2025 12:20:15 +0100
Subject: [PATCH 0150/1815] Insertion view indentation trim fixes (#241329)

render fixes
---
 src/vs/editor/browser/observableCodeEditor.ts    |  1 +
 .../inlineEditsViews/inlineEditsInsertionView.ts |  7 ++++++-
 .../inlineEditsLineReplacementView.ts            |  3 ++-
 .../browser/view/inlineEdits/utils/utils.ts      | 16 ++++++++++++++--
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/vs/editor/browser/observableCodeEditor.ts b/src/vs/editor/browser/observableCodeEditor.ts
index 4940703fd426..d7093a0de5c8 100644
--- a/src/vs/editor/browser/observableCodeEditor.ts
+++ b/src/vs/editor/browser/observableCodeEditor.ts
@@ -233,6 +233,7 @@ export class ObservableCodeEditor extends Disposable {
 	public readonly layoutInfoDecorationsLeft = this.layoutInfo.map(l => l.decorationsLeft);
 	public readonly layoutInfoWidth = this.layoutInfo.map(l => l.width);
 	public readonly layoutInfoMinimap = this.layoutInfo.map(l => l.minimap);
+	public readonly layoutInfoVerticalScrollbarWidth = this.layoutInfo.map(l => l.verticalScrollbarWidth);
 
 	public readonly contentWidth = observableFromEvent(this.editor.onDidContentSizeChange, () => this.editor.getContentWidth());
 
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 0815f76a3ae2..622538332e05 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
@@ -53,7 +53,12 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 		const eol = textModel.getEOL();
 		const startsWithEol = state.text.startsWith(eol);
 		const originalRange = new LineRange(state.lineNumber, state.lineNumber + (startsWithEol ? 0 : 1));
-		const modifiedLines = state.text.split(eol).splice(startsWithEol ? 0 : 1);
+		let modifiedLines = state.text.split(eol);
+		if (startsWithEol) {
+			modifiedLines = modifiedLines.splice(1);
+		} else {
+			modifiedLines[0] = textModel.getLineContent(state.lineNumber) + modifiedLines[0];
+		}
 
 		return getPrefixTrim([], originalRange, modifiedLines, this._editor);
 	});
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 6b6bcd8d65c9..e1279376dee1 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
@@ -100,6 +100,7 @@ export class InlineEditsLineReplacementView extends Disposable implements IInlin
 
 		const lineHeight = this._editor.getOption(EditorOption.lineHeight).read(reader);
 		const contentLeft = this._editor.layoutInfoContentLeft.read(reader);
+		const verticalScrollbarWidth = this._editor.layoutInfoVerticalScrollbarWidth.read(reader);
 		const scrollLeft = this._editor.scrollLeft.read(reader);
 		const scrollTop = this._editor.scrollTop.read(reader);
 		const editorLeftOffset = contentLeft - scrollLeft;
@@ -140,7 +141,7 @@ export class InlineEditsLineReplacementView extends Disposable implements IInlin
 			lowerBackground,
 			lowerText,
 			padding: PADDING,
-			minContentWidthRequired: maxLineWidth + PADDING * 2,
+			minContentWidthRequired: prefixLeftOffset + maxLineWidth + PADDING * 2 + verticalScrollbarWidth,
 		};
 	});
 
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 52b182c12828..9427e0b23a09 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
@@ -81,10 +81,22 @@ export function getPrefixTrim(diffRanges: Range[], originalLinesRange: LineRange
 
 	const replacementStart = diffRanges.map(r => r.isSingleLine() ? r.startColumn - 1 : 0);
 	const originalIndents = originalLinesRange.mapToLineArray(line => indentOfLine(textModel.getLineContent(line)));
-	const modifiedIndents = modifiedLines.map(line => indentOfLine(line));
+	const modifiedIndents = modifiedLines.filter(line => line !== '').map(line => indentOfLine(line));
 	const prefixTrim = Math.min(...replacementStart, ...originalIndents, ...modifiedIndents);
 
-	const prefixLeftOffset = editor.getOffsetForColumn(originalLinesRange.startLineNumber, prefixTrim + 1);
+	let prefixLeftOffset;
+	const startLineIndent = textModel.getLineIndentColumn(originalLinesRange.startLineNumber);
+	if (startLineIndent >= prefixTrim + 1) {
+		// We can use the editor to get the offset
+		prefixLeftOffset = editor.getOffsetForColumn(originalLinesRange.startLineNumber, prefixTrim + 1);
+	} else if (startLineIndent !== 1) {
+		// We need to approximate the offset as the editor does not contain the modified lines yet
+		const startLineIndentOffset = editor.getOffsetForColumn(originalLinesRange.startLineNumber, startLineIndent);
+		prefixLeftOffset = startLineIndentOffset / (startLineIndent - 1) * prefixTrim;
+	} else {
+		// unable to approximate the offset
+		return { prefixTrim: 0, prefixLeftOffset: 0 };
+	}
 
 	return { prefixTrim, prefixLeftOffset };
 }

From 82d32bf6b992c411b2e50245d3bb862b6588fbc3 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 20 Feb 2025 13:23:16 +0100
Subject: [PATCH 0151/1815] The order of elements in the language status
 indicator are not fixed (fix #241246) (#241333)

---
 .../browser/parts/statusbar/statusbarModel.ts | 10 ++++--
 .../parts/statusbar/statusbarModel.test.ts    | 32 +++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarModel.ts b/src/vs/workbench/browser/parts/statusbar/statusbarModel.ts
index 82db371b426c..4f4a138dbfb7 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarModel.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarModel.ts
@@ -332,7 +332,9 @@ export class StatusbarViewModel extends Disposable {
 
 				// Fill relative entries to LEFT
 				if (relativeEntries) {
-					sortedEntries.push(...relativeEntries.filter(entry => isStatusbarEntryLocation(entry.priority.primary) && entry.priority.primary.alignment === StatusbarAlignment.LEFT));
+					sortedEntries.push(...relativeEntries
+						.filter(entry => isStatusbarEntryLocation(entry.priority.primary) && entry.priority.primary.alignment === StatusbarAlignment.LEFT)
+						.sort((entryA, entryB) => entryB.priority.secondary - entryA.priority.secondary));
 				}
 
 				// Fill referenced entry
@@ -340,7 +342,9 @@ export class StatusbarViewModel extends Disposable {
 
 				// Fill relative entries to RIGHT
 				if (relativeEntries) {
-					sortedEntries.push(...relativeEntries.filter(entry => isStatusbarEntryLocation(entry.priority.primary) && entry.priority.primary.alignment === StatusbarAlignment.RIGHT));
+					sortedEntries.push(...relativeEntries
+						.filter(entry => isStatusbarEntryLocation(entry.priority.primary) && entry.priority.primary.alignment === StatusbarAlignment.RIGHT)
+						.sort((entryA, entryB) => entryB.priority.secondary - entryA.priority.secondary));
 				}
 
 				// Delete from map to mark as handled
@@ -350,7 +354,7 @@ export class StatusbarViewModel extends Disposable {
 			// Finally, just append all entries that reference another entry
 			// that does not exist to the end of the list
 			for (const [, entries] of mapEntryWithRelativePriority) {
-				sortedEntries.push(...entries.values());
+				sortedEntries.push(...Array.from(entries.values()).sort((entryA, entryB) => entryB.priority.secondary - entryA.priority.secondary));
 			}
 		}
 
diff --git a/src/vs/workbench/test/browser/parts/statusbar/statusbarModel.test.ts b/src/vs/workbench/test/browser/parts/statusbar/statusbarModel.test.ts
index 426ef2e55e16..1dad975266bb 100644
--- a/src/vs/workbench/test/browser/parts/statusbar/statusbarModel.test.ts
+++ b/src/vs/workbench/test/browser/parts/statusbar/statusbarModel.test.ts
@@ -232,5 +232,37 @@ suite('Workbench status bar model', () => {
 		assert.strictEqual(model.getEntries(StatusbarAlignment.RIGHT).length, 3);
 	});
 
+	test('entry with reference to other entry respects secondary sorting (existent)', () => {
+		const container = document.createElement('div');
+		const model = disposables.add(new StatusbarViewModel(disposables.add(new TestStorageService())));
+
+		model.add({ id: 'ref', alignment: StatusbarAlignment.LEFT, name: 'ref', priority: { primary: 0, secondary: 0 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+		model.add({ id: 'entry2', alignment: StatusbarAlignment.RIGHT, name: '2', priority: { primary: { id: 'ref', alignment: StatusbarAlignment.RIGHT }, secondary: 2 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+		model.add({ id: 'entry1', alignment: StatusbarAlignment.RIGHT, name: '1', priority: { primary: { id: 'ref', alignment: StatusbarAlignment.RIGHT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+		model.add({ id: 'entry3', alignment: StatusbarAlignment.RIGHT, name: '3', priority: { primary: { id: 'ref', alignment: StatusbarAlignment.RIGHT }, secondary: 3 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+
+		const entries = model.entries;
+		assert.strictEqual(entries.length, 4);
+		assert.strictEqual(entries[0].id, 'ref');
+		assert.strictEqual(entries[1].id, 'entry3');
+		assert.strictEqual(entries[2].id, 'entry2');
+		assert.strictEqual(entries[3].id, 'entry1');
+	});
+
+	test('entry with reference to other entry respects secondary sorting (nonexistent)', () => {
+		const container = document.createElement('div');
+		const model = disposables.add(new StatusbarViewModel(disposables.add(new TestStorageService())));
+
+		model.add({ id: 'entry2', alignment: StatusbarAlignment.RIGHT, name: '2', priority: { primary: { id: 'ref', alignment: StatusbarAlignment.RIGHT }, secondary: 2 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+		model.add({ id: 'entry1', alignment: StatusbarAlignment.RIGHT, name: '1', priority: { primary: { id: 'ref', alignment: StatusbarAlignment.RIGHT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+		model.add({ id: 'entry3', alignment: StatusbarAlignment.RIGHT, name: '3', priority: { primary: { id: 'ref', alignment: StatusbarAlignment.RIGHT }, secondary: 3 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+
+		const entries = model.entries;
+		assert.strictEqual(entries.length, 3);
+		assert.strictEqual(entries[0].id, 'entry3');
+		assert.strictEqual(entries[1].id, 'entry2');
+		assert.strictEqual(entries[2].id, 'entry1');
+	});
+
 	ensureNoDisposablesAreLeakedInTestSuite();
 });

From 7c7d37ea8d4c63861bd8cf8201e6780d2395f637 Mon Sep 17 00:00:00 2001
From: Seong Min Park <psm03120@gmail.com>
Date: Thu, 20 Feb 2025 22:09:42 +0900
Subject: [PATCH 0152/1815] revert markdown.trace.server

---
 extensions/markdown-language-features/package.json | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 7d03b4d634b6..51b9f80eb3a0 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -442,6 +442,17 @@
             "%configuration.markdown.suggest.paths.includeWorkspaceHeaderCompletions.onSingleOrDoubleHash%"
           ]
         },
+        "markdown.trace.server": {
+          "type": "string",
+          "scope": "window",
+          "enum": [
+            "off",
+            "messages",
+            "verbose"
+          ],
+          "default": "off",
+          "description": "%markdown.trace.server.desc%"
+        },
         "markdown.server.log": {
           "type": "string",
           "scope": "window",

From 3941518bee735f033b528cc90913c6b2a95cfa3b Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 20 Feb 2025 05:25:14 -0800
Subject: [PATCH 0153/1815] Show close button regardless of code block

Fixes microsoft/vscode-copilot-release#5393
---
 .../contrib/terminalContrib/chat/browser/terminalChatActions.ts  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
index 935f2731a339..782aca3edb12 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
@@ -71,7 +71,6 @@ registerActiveXtermAction({
 		id: MENU_TERMINAL_CHAT_WIDGET_STATUS,
 		group: '0_main',
 		order: 2,
-		when: TerminalChatContextKeys.responseContainsCodeBlock
 	}],
 	icon: Codicon.close,
 	f1: true,

From 8ee87efa3ff6c78d189a413883d6cdb803b82a92 Mon Sep 17 00:00:00 2001
From: Seong Min Park <psm03120@gmail.com>
Date: Thu, 20 Feb 2025 22:25:56 +0900
Subject: [PATCH 0154/1815] add colon

---
 extensions/markdown-language-features/src/logging.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/markdown-language-features/src/logging.ts b/extensions/markdown-language-features/src/logging.ts
index 3b43e172799a..fc3ae9e8c4ef 100644
--- a/extensions/markdown-language-features/src/logging.ts
+++ b/extensions/markdown-language-features/src/logging.ts
@@ -24,6 +24,6 @@ export class VsCodeOutputLogger extends Disposable implements ILogger {
 	}
 
 	public trace(title: string, message: string, data?: any): void {
-		this._outputChannel.trace(`${title} ${message}`, ...(data ? [JSON.stringify(data, null, 4)] : []));
+		this._outputChannel.trace(`${title}: ${message}`, ...(data ? [JSON.stringify(data, null, 4)] : []));
 	}
 }

From f07376dcffc3c77f0a772223738c48d7648c0442 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 20 Feb 2025 05:44:32 -0800
Subject: [PATCH 0155/1815] Improve formatting of backtick single quote code
 blocks

---
 .../scripts/pullZshBuiltins.ts                |  10 +-
 .../src/shell/zshBuiltinsCache.json           | 122 +++++++++---------
 2 files changed, 70 insertions(+), 62 deletions(-)

diff --git a/extensions/terminal-suggest/scripts/pullZshBuiltins.ts b/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
index 4ff123e68b15..79e25936ef1e 100644
--- a/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
+++ b/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
@@ -169,7 +169,7 @@ async function createCommandDescriptionsCache(): Promise<void> {
 		}
 		const formattedArgs = lines.slice(0, argsEnd - 1).join('\n');
 		const args = (await execAsync(`pandoc --from markdown --to plain <<< "${formattedArgs}"`)).stdout.trim();
-		const description = lines.slice(argsEnd).join('\n').trim();
+		const description = lines.slice(argsEnd).map(e => formatLineAsMarkdown(e)).join('\n').trim();
 		if (shortDescription) {
 			cachedCommandDescriptions.set(command, {
 				shortDescription,
@@ -187,6 +187,14 @@ async function createCommandDescriptionsCache(): Promise<void> {
 	zshBuiltinsCommandDescriptionsCache = cachedCommandDescriptions;
 }
 
+function formatLineAsMarkdown(text: string): string {
+	// Detect any inline code blocks which use the form `code' (backtick, single quote) and convert
+	// them to standard markdown `code` (backtick, backtick). This doesn't attempt to remove
+	// formatting inside the code blocks. We probably need to use the original .troff format to do
+	// this
+	const formattedText = text.replace(/\\`([^']+)\\'/g, '`$1`');
+	return formattedText;
+}
 
 const main = async () => {
 	try {
diff --git a/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json b/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json
index 3f72fc631b88..427b6fbe79a2 100644
--- a/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json
+++ b/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json
@@ -6,7 +6,7 @@
   },
   "bindkey": {
     "shortDescription": "Manipulate keymap names",
-    "description": ":   See the section \\`Zle Builtins\\' in *zshzle(1).*",
+    "description": ":   See the section `Zle Builtins` in *zshzle(1).*",
     "args": "bindkey"
   },
   "break": {
@@ -25,11 +25,11 @@
     "args": "bye"
   },
   "cap": {
-    "description": ":   See the section \\`The zsh/cap Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/cap Module` in *zshmodules(1).*",
     "args": "cap"
   },
   "cd": {
-    "description": "**cd** *\\[* **-qsLP** *\\] {***+***\\|***-***}n* Change the current directory. In the first form, change the current directory to *arg, or to the value of* **\\$HOME** *if* *arg is not specified. If arg is \\`***-***\\', change to the* previous directory.\n\n> Otherwise, if *arg begins with a slash, attempt to change to the* directory given by *arg.*\n>\n> If *arg does not begin with a slash, the behaviour depends on whether* the current directory \\`**.***\\' occurs in the list of directories contained* in the shell parameter **cdpath***. If it does not, first attempt to change* to the directory *arg under the current directory, and if that fails* but **cdpath** *is set and contains at least one element attempt to change* to the directory *arg under each component of* **cdpath** *in turn until* successful. If \\`**.***\\' occurs in* **cdpath***, then* **cdpath** *is searched* strictly in order so that \\`**.***\\' is only tried at the appropriate point.*\n>\n> The order of testing **cdpath** *is modified if the option* **POSIX_CD** is set, as described in the documentation for the option.\n>\n> If no directory is found, the option **CDABLE_VARS** *is set, and a* parameter named *arg exists whose value begins with a slash, treat its* value as the directory. In that case, the parameter is added to the named directory hash table.\n>\n> The second form of **cd** *substitutes the string new* for the string *old in the name of the current directory,* and tries to change to this new directory.\n>\n> The third form of **cd** *extracts an entry from the directory* stack, and changes to that directory. An argument of the form \\`**+***n\\' identifies a stack entry by counting from the left* of the list shown by the **dirs** *command, starting with zero.* An argument of the form \\`**-***n\\' counts from the right.* If the **PUSHD_MINUS** *option is set, the meanings of \\`***+***\\'* and \\`**-***\\' in this context are swapped.* If the **POSIX_CD** *option is set, this form of* **cd** *is not recognised* and will be interpreted as the first form.\n>\n> If the **-q** *(quiet) option is specified, the hook function* **chpwd** and the functions in the array **chpwd_functions** *are not called.* This is useful for calls to **cd** *that do not change the environment* seen by an interactive user.\n>\n> If the **-s** *option is specified,* **cd** *refuses to change the current* directory if the given pathname contains symlinks. If the **-P** *option* is given or the **CHASE_LINKS** *option is set, symbolic links are resolved* to their true values. If the **-L** *option is given symbolic links are* retained in the directory (and not resolved) regardless of the state of the **CHASE_LINKS** *option.*",
+    "description": "**cd** *\\[* **-qsLP** *\\] {***+***\\|***-***}n* Change the current directory. In the first form, change the current directory to *arg, or to the value of* **\\$HOME** *if* *arg is not specified. If arg is `***-***`, change to the* previous directory.\n\n> Otherwise, if *arg begins with a slash, attempt to change to the* directory given by *arg.*\n>\n> If *arg does not begin with a slash, the behaviour depends on whether* the current directory `**.***` occurs in the list of directories contained* in the shell parameter **cdpath***. If it does not, first attempt to change* to the directory *arg under the current directory, and if that fails* but **cdpath** *is set and contains at least one element attempt to change* to the directory *arg under each component of* **cdpath** *in turn until* successful. If `**.***` occurs in* **cdpath***, then* **cdpath** *is searched* strictly in order so that `**.***` is only tried at the appropriate point.*\n>\n> The order of testing **cdpath** *is modified if the option* **POSIX_CD** is set, as described in the documentation for the option.\n>\n> If no directory is found, the option **CDABLE_VARS** *is set, and a* parameter named *arg exists whose value begins with a slash, treat its* value as the directory. In that case, the parameter is added to the named directory hash table.\n>\n> The second form of **cd** *substitutes the string new* for the string *old in the name of the current directory,* and tries to change to this new directory.\n>\n> The third form of **cd** *extracts an entry from the directory* stack, and changes to that directory. An argument of the form `**+***n` identifies a stack entry by counting from the left* of the list shown by the **dirs** *command, starting with zero.* An argument of the form `**-***n` counts from the right.* If the **PUSHD_MINUS** *option is set, the meanings of `***+***`* and `**-***` in this context are swapped.* If the **POSIX_CD** *option is set, this form of* **cd** *is not recognised* and will be interpreted as the first form.\n>\n> If the **-q** *(quiet) option is specified, the hook function* **chpwd** and the functions in the array **chpwd_functions** *are not called.* This is useful for calls to **cd** *that do not change the environment* seen by an interactive user.\n>\n> If the **-s** *option is specified,* **cd** *refuses to change the current* directory if the given pathname contains symlinks. If the **-P** *option* is given or the **CHASE_LINKS** *option is set, symbolic links are resolved* to their true values. If the **-L** *option is given symbolic links are* retained in the directory (and not resolved) regardless of the state of the **CHASE_LINKS** *option.*",
     "args": "cd [ -qsLP ] [ arg ]\n\ncd [ -qsLP ] old new"
   },
   "chdir": {
@@ -38,61 +38,61 @@
     "args": "chdir"
   },
   "clone": {
-    "description": ":   See the section \\`The zsh/clone Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/clone Module` in *zshmodules(1).*",
     "args": "clone"
   },
   "command": {
-    "description": ":   The simple command argument is taken as an external command instead of a function or builtin and is executed. If the **POSIX_BUILTINS** *option* is set, builtins will also be executed but certain special properties of them are suppressed. The **-p** *flag causes a default path to be* searched instead of that in **\\$path***. With the* **-v** *flag,* **command** is similar to **whence** *and with* **-V***, it is equivalent to* **whence** -v*.*\n\n    See also the section \\`Precommand Modifiers\\' in *zshmisc(1).*",
+    "description": ":   The simple command argument is taken as an external command instead of a function or builtin and is executed. If the **POSIX_BUILTINS** *option* is set, builtins will also be executed but certain special properties of them are suppressed. The **-p** *flag causes a default path to be* searched instead of that in **\\$path***. With the* **-v** *flag,* **command** is similar to **whence** *and with* **-V***, it is equivalent to* **whence** -v*.*\n\n    See also the section `Precommand Modifiers` in *zshmisc(1).*",
     "args": "command [ -pvV ] simple command"
   },
   "comparguments": {
     "shortDescription": "Complete arguments",
-    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/computil Module` in *zshmodules(1).*",
     "args": "comparguments"
   },
   "compcall": {
     "shortDescription": "Complete call",
-    "description": ":   See the section \\`The zsh/compctl Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/compctl Module` in *zshmodules(1).*",
     "args": "compcall"
   },
   "compctl": {
     "shortDescription": "Complete control",
-    "description": ":   See the section \\`The zsh/compctl Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/compctl Module` in *zshmodules(1).*",
     "args": "compctl"
   },
   "compdescribe": {
     "shortDescription": "Complete describe",
-    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/computil Module` in *zshmodules(1).*",
     "args": "compdescribe"
   },
   "compfiles": {
     "shortDescription": "Complete files",
-    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/computil Module` in *zshmodules(1).*",
     "args": "compfiles"
   },
   "compgroups": {
     "shortDescription": "Complete groups",
-    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/computil Module` in *zshmodules(1).*",
     "args": "compgroups"
   },
   "compquote": {
     "shortDescription": "Complete quote",
-    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/computil Module` in *zshmodules(1).*",
     "args": "compquote"
   },
   "comptags": {
     "shortDescription": "Complete tags",
-    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/computil Module` in *zshmodules(1).*",
     "args": "comptags"
   },
   "comptry": {
     "shortDescription": "Complete try",
-    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/computil Module` in *zshmodules(1).*",
     "args": "comptry"
   },
   "compvalues": {
     "shortDescription": "Complete values",
-    "description": ":   See the section \\`The zsh/computil Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/computil Module` in *zshmodules(1).*",
     "args": "compvalues"
   },
   "continue": {
@@ -112,7 +112,7 @@
   },
   "disable": {
     "shortDescription": "Disable shell features",
-    "description": ":   Temporarily disable the *named hash table elements or patterns. The default* is to disable builtin commands. This allows you to use an external command with the same name as a builtin command. The **-a** *option* causes **disable** *to act on regular or global aliases. The* **-s** option causes **disable** *to act on suffix aliases. The* **-f** *option causes* **disable** *to act on shell functions. The* **-r** *options causes* **disable** *to act on reserved words. Without arguments all disabled* hash table elements from the corresponding hash table are printed. With the **-m** *flag the arguments are taken as patterns (which should be* quoted to prevent them from undergoing filename expansion), and all hash table elements from the corresponding hash table matching these patterns are disabled. Disabled objects can be enabled with the **enable** command.\n\n    With the option **-p***, name \\... refer to elements of the* shell\\'s pattern syntax as described in the section \\`Filename Generation\\'. Certain elements can be disabled separately, as given below.\n\n    Note that patterns not allowed by the current settings for the options **EXTENDED_GLOB***,* **KSH_GLOB** *and* **SH_GLOB** *are never enabled, regardless of the* setting here. For example, if **EXTENDED_GLOB** *is not active,* the pattern **\\^** *is ineffective even if \\`***disable -p \\\"\\^\\\"***\\' has* not been issued. The list below indicates any option settings that restrict the use of the pattern. It should be noted that setting **SH_GLOB** *has a wider effect than merely disabling patterns* as certain expressions, in particular those involving parentheses, are parsed differently.\n\n    The following patterns may be disabled; all the strings need quoting on the command line to prevent them from being interpreted immediately as patterns and the patterns are shown below in single quotes as a reminder.\n\n    **\\'?\\'** The pattern character **?** *wherever it occurs, including when preceding* a parenthesis with **KSH_GLOB***.*\n\n    **\\'\\*\\'**\n\n    :   The pattern character **\\*** *wherever it occurs, including recursive* globbing and when preceding a parenthesis with **KSH_GLOB***.*\n\n    **\\'\\[\\'**\n\n    :   Character classes.\n\n    **\\'\\<\\'** *(***NO_SH_GLOB***)*\n\n    :   Numeric ranges.\n\n    **\\'\\|\\'** *(***NO_SH_GLOB***)*\n\n    :   Alternation in grouped patterns, case statements, or KSH_GLOB parenthesised expressions.\n\n    **\\'(\\'** *(***NO_SH_GLOB***)*\n\n    :   Grouping using single parentheses. Disabling this does not disable the use of parentheses for **KSH_GLOB** *where they are introduced by a* special character, nor for glob qualifiers (use \\`**setopt** NO_BARE_GLOB_QUAL*\\' to disable glob qualifiers that use parentheses* only).\n\n    **\\'\\~\\'** *(***EXTENDED_GLOB***)*\n\n    :   Exclusion in the form *A***\\~***B.*\n\n    **\\'\\^\\'** *(***EXTENDED_GLOB***)*\n\n    :   Exclusion in the form *A***\\^***B.*\n\n    **\\'#\\'** *(***EXTENDED_GLOB***)*\n\n    :   The pattern character **\\#** *wherever it occurs, both for* repetition of a previous pattern and for indicating globbing flags.\n\n    **\\'?(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **?(***\\...***)***. Note this is also* disabled if **\\'?\\'** *is disabled.*\n\n    **\\'\\*(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **\\*(***\\...***)***. Note this is also* disabled if **\\'\\*\\'** *is disabled.*\n\n    **\\'+(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **+(***\\...***)***.*\n\n    **\\'!(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **!(***\\...***)***.*\n\n    **\\'@(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **@(***\\...***)***.*",
+    "description": ":   Temporarily disable the *named hash table elements or patterns. The default* is to disable builtin commands. This allows you to use an external command with the same name as a builtin command. The **-a** *option* causes **disable** *to act on regular or global aliases. The* **-s** option causes **disable** *to act on suffix aliases. The* **-f** *option causes* **disable** *to act on shell functions. The* **-r** *options causes* **disable** *to act on reserved words. Without arguments all disabled* hash table elements from the corresponding hash table are printed. With the **-m** *flag the arguments are taken as patterns (which should be* quoted to prevent them from undergoing filename expansion), and all hash table elements from the corresponding hash table matching these patterns are disabled. Disabled objects can be enabled with the **enable** command.\n\n    With the option **-p***, name \\... refer to elements of the* shell\\'s pattern syntax as described in the section `Filename Generation`. Certain elements can be disabled separately, as given below.\n\n    Note that patterns not allowed by the current settings for the options **EXTENDED_GLOB***,* **KSH_GLOB** *and* **SH_GLOB** *are never enabled, regardless of the* setting here. For example, if **EXTENDED_GLOB** *is not active,* the pattern **\\^** *is ineffective even if `***disable -p \\\"\\^\\\"***` has* not been issued. The list below indicates any option settings that restrict the use of the pattern. It should be noted that setting **SH_GLOB** *has a wider effect than merely disabling patterns* as certain expressions, in particular those involving parentheses, are parsed differently.\n\n    The following patterns may be disabled; all the strings need quoting on the command line to prevent them from being interpreted immediately as patterns and the patterns are shown below in single quotes as a reminder.\n\n    **\\'?\\'** The pattern character **?** *wherever it occurs, including when preceding* a parenthesis with **KSH_GLOB***.*\n\n    **\\'\\*\\'**\n\n    :   The pattern character **\\*** *wherever it occurs, including recursive* globbing and when preceding a parenthesis with **KSH_GLOB***.*\n\n    **\\'\\[\\'**\n\n    :   Character classes.\n\n    **\\'\\<\\'** *(***NO_SH_GLOB***)*\n\n    :   Numeric ranges.\n\n    **\\'\\|\\'** *(***NO_SH_GLOB***)*\n\n    :   Alternation in grouped patterns, case statements, or KSH_GLOB parenthesised expressions.\n\n    **\\'(\\'** *(***NO_SH_GLOB***)*\n\n    :   Grouping using single parentheses. Disabling this does not disable the use of parentheses for **KSH_GLOB** *where they are introduced by a* special character, nor for glob qualifiers (use `**setopt** NO_BARE_GLOB_QUAL*` to disable glob qualifiers that use parentheses* only).\n\n    **\\'\\~\\'** *(***EXTENDED_GLOB***)*\n\n    :   Exclusion in the form *A***\\~***B.*\n\n    **\\'\\^\\'** *(***EXTENDED_GLOB***)*\n\n    :   Exclusion in the form *A***\\^***B.*\n\n    **\\'#\\'** *(***EXTENDED_GLOB***)*\n\n    :   The pattern character **\\#** *wherever it occurs, both for* repetition of a previous pattern and for indicating globbing flags.\n\n    **\\'?(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **?(***\\...***)***. Note this is also* disabled if **\\'?\\'** *is disabled.*\n\n    **\\'\\*(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **\\*(***\\...***)***. Note this is also* disabled if **\\'\\*\\'** *is disabled.*\n\n    **\\'+(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **+(***\\...***)***.*\n\n    **\\'!(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **!(***\\...***)***.*\n\n    **\\'@(\\'** *(***KSH_GLOB***)*\n\n    :   The grouping form **@(***\\...***)***.*",
     "args": "disable [ -afmprs ] name ..."
   },
   "disown": {
@@ -127,20 +127,20 @@
   },
   "echotc": {
     "shortDescription": "Echo terminal capabilities",
-    "description": ":   See the section \\`The zsh/termcap Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/termcap Module` in *zshmodules(1).*",
     "args": "echotc"
   },
   "echoti": {
-    "description": ":   See the section \\`The zsh/terminfo Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/terminfo Module` in *zshmodules(1).*",
     "args": "echoti"
   },
   "emulate": {
-    "description": ":   Without any argument print current emulation mode.\n\n    With single argument set up zsh options to emulate the specified shell as much as possible. **csh** *will never be fully emulated.* If the argument is not one of the shells listed above, **zsh** will be used as a default; more precisely, the tests performed on the argument are the same as those used to determine the emulation at startup based on the shell name, see the section COMPATIBILITY in *zsh(1)* . In addition to setting shell options, the command also restores the pristine state of pattern enables, as if all patterns had been enabled using **enable -p***.*\n\n    If the **emulate** *command occurs inside a function that has been* marked for execution tracing with **functions -t** *then the* **xtrace** option will be turned on regardless of emulation mode or other options. Note that code executed inside the function by the **.***,* **source***, or* **eval** *commands is not considered to be running directly from the* function, hence does not provoke this behaviour.\n\n    If the **-R** *switch is given, all settable options* are reset to their default value corresponding to the specified emulation mode, except for certain options describing the interactive environment; otherwise, only those options likely to cause portability problems in scripts and functions are altered. If the **-L** *switch is given,* the options **LOCAL_OPTIONS***,* **LOCAL_PATTERNS** *and* **LOCAL_TRAPS** will be set as well, causing the effects of the **emulate** *command and any* **setopt***,* **disable -p** *or* **enable -p***, and* **trap** *commands to be local to* the immediately surrounding shell function, if any; normally these options are turned off in all emulation modes except **ksh***. The* **-L** *switch is mutually exclusive with the* use of **-c** *in flags.*\n\n    If there is a single argument and the **-l** *switch is given, the* options that would be set or unset (the latter indicated with the prefix \\`**no***\\') are listed.* **-l** *can be combined with* **-L** *or* **-R** *and* the list will be modified in the appropriate way. Note the list does not depend on the current setting of options, i.e. it includes all options that may in principle change, not just those that would actually change.\n\n    The *flags may be any of the invocation-time flags described in* the section INVOCATION in *zsh(1),* except that \\`**-o EMACS***\\' and \\`***-o VI***\\' may not be used. Flags such* as \\`**+r***\\'/\\`***+o RESTRICTED***\\' may be prohibited in some circumstances.*\n\n    If **-c** *arg appears in flags, arg is evaluated while the* requested emulation is temporarily in effect. In this case the emulation mode and all options are restored to their previous values before **emulate** *returns. The* **-R** *switch may precede the name of the shell* to emulate; note this has a meaning distinct from including **-R** *in* *flags.*\n\n    Use of **-c** *enables \\`sticky\\' emulation mode for functions defined* within the evaluated expression: the emulation mode is associated thereafter with the function so that whenever the function is executed the emulation (respecting the **-R** *switch, if present) and all* options are set (and pattern disables cleared) before entry to the function, and the state is restored after exit. If the function is called when the sticky emulation is already in effect, either within an \\`**emulate** *shell* **-c***\\' expression or* within another function with the same sticky emulation, entry and exit from the function do not cause options to be altered (except due to standard processing such as the **LOCAL_OPTIONS** *option). This also* applies to functions marked for autoload within the sticky emulation; the appropriate set of options will be applied at the point the function is loaded as well as when it is run.\n\n    For example:\n\n    > emulate sh -c 'fni() { setopt cshnullglob; }\n    >     fno() { fni; }'\n    >     fno\n\n    The two functions **fni** *and* **fno** *are defined with sticky* **sh** emulation. **fno** *is then executed, causing options associated* with emulations to be set to their values in **sh***.* **fno** *then* calls **fni***; because* **fni** *is also marked for sticky* **sh** emulation, no option changes take place on entry to or exit from it. Hence the option **cshnullglob***, turned off by* **sh** *emulation, will* be turned on within **fni** *and remain on return to* **fno***. On exit* from **fno***, the emulation mode and all options will be restored to the* state they were in before entry to the temporary emulation.\n\n    The documentation above is typically sufficient for the intended purpose of executing code designed for other shells in a suitable environment. More detailed rules follow.\n\n    1\\.\n\n    :   The sticky emulation environment provided by \\`**emulate** *shell* **-c***\\' is identical to that provided by entry to* a function marked for sticky emulation as a consequence of being defined in such an environment. Hence, for example, the sticky emulation is inherited by subfunctions defined within functions with sticky emulation.\n\n    2\\.\n\n    :   No change of options takes place on entry to or exit from functions that are not marked for sticky emulation, other than those that would normally take place, even if those functions are called within sticky emulation.\n\n    3\\.\n\n    :   No special handling is provided for functions marked for **autoload** *nor for functions present in wordcode created by* the **zcompile** *command.*\n\n    4\\.\n\n    :   The presence or absence of the **-R** *switch to* **emulate** corresponds to different sticky emulation modes, so for example \\`**emulate sh -c***\\', \\`***emulate -R sh -c***\\' and \\`***emulate csh -c***\\'* are treated as three distinct sticky emulations.\n\n    5\\.\n\n    :   Difference in shell options supplied in addition to the basic emulation also mean the sticky emulations are different, so for example \\`**emulate zsh -c***\\' and \\`***emulate zsh -o cbases -c***\\' are* treated as distinct sticky emulations.",
+    "description": ":   Without any argument print current emulation mode.\n\n    With single argument set up zsh options to emulate the specified shell as much as possible. **csh** *will never be fully emulated.* If the argument is not one of the shells listed above, **zsh** will be used as a default; more precisely, the tests performed on the argument are the same as those used to determine the emulation at startup based on the shell name, see the section COMPATIBILITY in *zsh(1)* . In addition to setting shell options, the command also restores the pristine state of pattern enables, as if all patterns had been enabled using **enable -p***.*\n\n    If the **emulate** *command occurs inside a function that has been* marked for execution tracing with **functions -t** *then the* **xtrace** option will be turned on regardless of emulation mode or other options. Note that code executed inside the function by the **.***,* **source***, or* **eval** *commands is not considered to be running directly from the* function, hence does not provoke this behaviour.\n\n    If the **-R** *switch is given, all settable options* are reset to their default value corresponding to the specified emulation mode, except for certain options describing the interactive environment; otherwise, only those options likely to cause portability problems in scripts and functions are altered. If the **-L** *switch is given,* the options **LOCAL_OPTIONS***,* **LOCAL_PATTERNS** *and* **LOCAL_TRAPS** will be set as well, causing the effects of the **emulate** *command and any* **setopt***,* **disable -p** *or* **enable -p***, and* **trap** *commands to be local to* the immediately surrounding shell function, if any; normally these options are turned off in all emulation modes except **ksh***. The* **-L** *switch is mutually exclusive with the* use of **-c** *in flags.*\n\n    If there is a single argument and the **-l** *switch is given, the* options that would be set or unset (the latter indicated with the prefix `**no***`) are listed.* **-l** *can be combined with* **-L** *or* **-R** *and* the list will be modified in the appropriate way. Note the list does not depend on the current setting of options, i.e. it includes all options that may in principle change, not just those that would actually change.\n\n    The *flags may be any of the invocation-time flags described in* the section INVOCATION in *zsh(1),* except that `**-o EMACS***` and `***-o VI***` may not be used. Flags such* as `**+r***`/`***+o RESTRICTED***` may be prohibited in some circumstances.*\n\n    If **-c** *arg appears in flags, arg is evaluated while the* requested emulation is temporarily in effect. In this case the emulation mode and all options are restored to their previous values before **emulate** *returns. The* **-R** *switch may precede the name of the shell* to emulate; note this has a meaning distinct from including **-R** *in* *flags.*\n\n    Use of **-c** *enables `sticky` emulation mode for functions defined* within the evaluated expression: the emulation mode is associated thereafter with the function so that whenever the function is executed the emulation (respecting the **-R** *switch, if present) and all* options are set (and pattern disables cleared) before entry to the function, and the state is restored after exit. If the function is called when the sticky emulation is already in effect, either within an `**emulate** *shell* **-c***` expression or* within another function with the same sticky emulation, entry and exit from the function do not cause options to be altered (except due to standard processing such as the **LOCAL_OPTIONS** *option). This also* applies to functions marked for autoload within the sticky emulation; the appropriate set of options will be applied at the point the function is loaded as well as when it is run.\n\n    For example:\n\n    > emulate sh -c 'fni() { setopt cshnullglob; }\n    >     fno() { fni; }'\n    >     fno\n\n    The two functions **fni** *and* **fno** *are defined with sticky* **sh** emulation. **fno** *is then executed, causing options associated* with emulations to be set to their values in **sh***.* **fno** *then* calls **fni***; because* **fni** *is also marked for sticky* **sh** emulation, no option changes take place on entry to or exit from it. Hence the option **cshnullglob***, turned off by* **sh** *emulation, will* be turned on within **fni** *and remain on return to* **fno***. On exit* from **fno***, the emulation mode and all options will be restored to the* state they were in before entry to the temporary emulation.\n\n    The documentation above is typically sufficient for the intended purpose of executing code designed for other shells in a suitable environment. More detailed rules follow.\n\n    1\\.\n\n    :   The sticky emulation environment provided by `**emulate** *shell* **-c***` is identical to that provided by entry to* a function marked for sticky emulation as a consequence of being defined in such an environment. Hence, for example, the sticky emulation is inherited by subfunctions defined within functions with sticky emulation.\n\n    2\\.\n\n    :   No change of options takes place on entry to or exit from functions that are not marked for sticky emulation, other than those that would normally take place, even if those functions are called within sticky emulation.\n\n    3\\.\n\n    :   No special handling is provided for functions marked for **autoload** *nor for functions present in wordcode created by* the **zcompile** *command.*\n\n    4\\.\n\n    :   The presence or absence of the **-R** *switch to* **emulate** corresponds to different sticky emulation modes, so for example `**emulate sh -c***`, `***emulate -R sh -c***` and `***emulate csh -c***`* are treated as three distinct sticky emulations.\n\n    5\\.\n\n    :   Difference in shell options supplied in addition to the basic emulation also mean the sticky emulations are different, so for example `**emulate zsh -c***` and `***emulate zsh -o cbases -c***` are* treated as distinct sticky emulations.",
     "args": "emulate [ -lLR ] [ {zsh|sh|ksh|csh} [ flags ... ] ]"
   },
   "enable": {
     "shortDescription": "Enable shell features",
-    "description": ":   Enable the *named hash table elements, presumably disabled* earlier with **disable***. The default is to enable builtin commands.* The **-a** *option causes* **enable** *to act on regular or global aliases.* The **-s** *option causes* **enable** *to act on suffix aliases.* The **-f** *option causes* **enable** *to act on shell functions. The* **-r** option causes **enable** *to act on reserved words. Without arguments* all enabled hash table elements from the corresponding hash table are printed. With the **-m** *flag the arguments are taken as patterns* (should be quoted) and all hash table elements from the corresponding hash table matching these patterns are enabled. Enabled objects can be disabled with the **disable** *builtin command.*\n\n    **enable -p** *reenables patterns disabled with* **disable -p***. Note* that it does not override globbing options; for example, \\`**enable -p** \\\"\\~\\\"*\\' does not cause the pattern character* **\\~** *to be active unless* the **EXTENDED_GLOB** *option is also set. To enable all possible* patterns (so that they may be individually disabled with **disable -p***),* use \\`**setopt EXTENDED_GLOB KSH_GLOB NO_SH_GLOB***\\'.*",
+    "description": ":   Enable the *named hash table elements, presumably disabled* earlier with **disable***. The default is to enable builtin commands.* The **-a** *option causes* **enable** *to act on regular or global aliases.* The **-s** *option causes* **enable** *to act on suffix aliases.* The **-f** *option causes* **enable** *to act on shell functions. The* **-r** option causes **enable** *to act on reserved words. Without arguments* all enabled hash table elements from the corresponding hash table are printed. With the **-m** *flag the arguments are taken as patterns* (should be quoted) and all hash table elements from the corresponding hash table matching these patterns are enabled. Enabled objects can be disabled with the **disable** *builtin command.*\n\n    **enable -p** *reenables patterns disabled with* **disable -p***. Note* that it does not override globbing options; for example, `**enable -p** \\\"\\~\\\"*` does not cause the pattern character* **\\~** *to be active unless* the **EXTENDED_GLOB** *option is also set. To enable all possible* patterns (so that they may be individually disabled with **disable -p***),* use `**setopt EXTENDED_GLOB KSH_GLOB NO_SH_GLOB***`.*",
     "args": "enable [ -afmprs ] name ..."
   },
   "eval": {
@@ -150,7 +150,7 @@
   },
   "exec": {
     "shortDescription": "Replace shell with command",
-    "description": ":   Replace the current shell with *command rather than forking.* If *command is a shell builtin command or a shell function,* the shell executes it, and exits when the command is complete.\n\n    With **-c** *clear the environment; with* **-l** *prepend* **-** *to the* **argv\\[0\\]** *string of the command executed (to simulate a login shell);* with **-a** *argv0 set the* **argv\\[0\\]** *string of the command* executed. See the section \\`Precommand Modifiers\\' in *zshmisc(1).*\n\n    If the option **POSIX_BUILTINS** *is set, command is never* interpreted as a shell builtin command or shell function. This means further precommand modifiers such as **builtin** *and* **noglob** *are also not interpreted within the shell. Hence* *command is always found by searching the command path.*\n\n    If *command is omitted but any redirections are specified,* then the redirections will take effect in the current shell.",
+    "description": ":   Replace the current shell with *command rather than forking.* If *command is a shell builtin command or a shell function,* the shell executes it, and exits when the command is complete.\n\n    With **-c** *clear the environment; with* **-l** *prepend* **-** *to the* **argv\\[0\\]** *string of the command executed (to simulate a login shell);* with **-a** *argv0 set the* **argv\\[0\\]** *string of the command* executed. See the section `Precommand Modifiers` in *zshmisc(1).*\n\n    If the option **POSIX_BUILTINS** *is set, command is never* interpreted as a shell builtin command or shell function. This means further precommand modifiers such as **builtin** *and* **noglob** *are also not interpreted within the shell. Hence* *command is always found by searching the command path.*\n\n    If *command is omitted but any redirections are specified,* then the redirections will take effect in the current shell.",
     "args": "exec [ -cl ] [ -a argv0 ] [ command [ arg ... ] ]"
   },
   "exit": {
@@ -170,7 +170,7 @@
   },
   "fc": {
     "shortDescription": "Fix command",
-    "description": "**fc** **-ARWI** *\\[ filename \\]* The **fc** *command controls the interactive history mechanism. Note* that reading and writing of history options is only performed if the shell is interactive. Usually this is detected automatically, but it can be forced by setting the **interactive** *option when starting the* shell.\n\n> The first two forms of this command select a range of events from *first to last from the history list. The arguments first* and *last may be specified as a number or as a string. A negative* number is used as an offset to the current history event number. A string specifies the most recent event beginning with the given string. All substitutions *old***=***new, if any, are then performed on the* text of the events.\n>\n> The range of events selected by numbers can be narrowed further by the following flags.\n>\n> **-I**\n>\n> :   restricts to only internal events (not from **\\$HISTFILE***)*\n>\n> **-L**\n>\n> :   restricts to only local events (not from other shells, see **SHARE_HISTORY** *in zshoptions(1) \\-- note that* **\\$HISTFILE** *is* considered local when read at startup)\n>\n> **-m**\n>\n> :   takes the first argument as a pattern (which should be quoted) and only the history events matching this pattern are considered\n>\n> If *first is not specified, it will be set to -1 (the most recent* event), or to -16 if the **-l** *flag is given.* If *last is not specified, it will be set to first,* or to -1 if the **-l** *flag is given.* However, if the current event has added entries to the history with \\`**print -s***\\' or \\`***fc -R***\\', then the default last for* **-l** includes all new history entries since the current event began.\n>\n> When the **-l** *flag is given, the resulting events are listed on* standard output. Otherwise the editor program specified by **-e** *ename* is invoked on a file containing these history events. If **-e** *is not given, the* value of the parameter **FCEDIT** *is used; if that is not set the value of* the parameter **EDITOR** *is used; if that is not set a builtin default,* usually \\`**vi***\\' is used. If ename is \\`***-***\\', no editor is invoked.* When editing is complete, the edited command is executed.\n>\n> The flag \\`**-s***\\' is equivalent to \\`***-e -***\\'.* The flag **-r** *reverses the order of the events and the* flag **-n** *suppresses event numbers when listing.*\n>\n> Also when listing,\n>\n> **-d**\n>\n> :   prints timestamps for each event\n>\n> **-f**\n>\n> :   prints full time-date stamps in the US \\`*MM***/***DD***/***YY hh***:***mm\\' format*\n>\n> **-E**\n>\n> :   prints full time-date stamps in the European \\`*dd***.***mm***.***yyyy hh***:***mm\\' format*\n>\n> **-i**\n>\n> :   prints full time-date stamps in ISO8601 \\`*yyyy***-***mm***-***dd hh***:***mm\\' format*\n>\n> **-t** *fmt*\n>\n> :   prints time and date stamps in the given format; *fmt is formatted with the strftime function with the zsh extensions* described for the **%D{***string***}** *prompt format in* the section EXPANSION OF PROMPT SEQUENCES in *zshmisc(1). The resulting formatted string must be* no more than 256 characters or will not be printed\n>\n> <!-- -->\n>\n> **-D**\n>\n> :   prints elapsed times; may be combined with one of the options above\n>\n> \\`**fc -p***\\' pushes the current history list onto a stack and switches to a* new history list. If the **-a** *option is also specified, this history list* will be automatically popped when the current function scope is exited, which is a much better solution than creating a trap function to call \\`**fc -P***\\'* manually. If no arguments are specified, the history list is left empty, **\\$HISTFILE** *is unset, and* **\\$HISTSIZE** *&* **\\$SAVEHIST** *are set to their* default values. If one argument is given, **\\$HISTFILE** *is set to that* filename, **\\$HISTSIZE** *&* **\\$SAVEHIST** *are left unchanged, and the history* file is read in (if it exists) to initialize the new list. If a second argument is specified, **\\$HISTSIZE** *&* **\\$SAVEHIST** *are instead set to the* single specified numeric value. Finally, if a third argument is specified, **\\$SAVEHIST** *is set to a separate value from* **\\$HISTSIZE***. You are free to* change these environment values for the new history list however you desire in order to manipulate the new history list.\n>\n> \\`**fc -P***\\' pops the history list back to an older list saved by \\`***fc -p***\\'.* The current list is saved to its **\\$HISTFILE** *before it is destroyed* (assuming that **\\$HISTFILE** *and* **\\$SAVEHIST** *are set appropriately, of* course). The values of **\\$HISTFILE***,* **\\$HISTSIZE***, and* **\\$SAVEHIST** *are* restored to the values they had when \\`**fc -p***\\' was called. Note that this* restoration can conflict with making these variables \\\"local\\\", so your best bet is to avoid local declarations for these variables in functions that use \\`**fc -p***\\'. The one other guaranteed-safe combination is declaring these* variables to be local at the top of your function and using the automatic option (**-a***) with \\`***fc -p***\\'. Finally, note that it is legal to manually* pop a push marked for automatic popping if you need to do so before the function exits.\n>\n> \\`**fc -R***\\' reads the history from the given file,* \\`**fc -W***\\' writes the history out to the given file,* and \\`**fc -A***\\' appends the history out to the given file.* If no filename is specified, the **\\$HISTFILE** *is assumed.* If the **-I** *option is added to* **-R***, only those events that are* not already contained within the internal history list are added. If the **-I** *option is added to* **-A** *or* **-W***, only those* events that are new since last incremental append/write to the history file are appended/written. In any case, the created file will have no more than **\\$SAVEHIST** entries.",
+    "description": "**fc** **-ARWI** *\\[ filename \\]* The **fc** *command controls the interactive history mechanism. Note* that reading and writing of history options is only performed if the shell is interactive. Usually this is detected automatically, but it can be forced by setting the **interactive** *option when starting the* shell.\n\n> The first two forms of this command select a range of events from *first to last from the history list. The arguments first* and *last may be specified as a number or as a string. A negative* number is used as an offset to the current history event number. A string specifies the most recent event beginning with the given string. All substitutions *old***=***new, if any, are then performed on the* text of the events.\n>\n> The range of events selected by numbers can be narrowed further by the following flags.\n>\n> **-I**\n>\n> :   restricts to only internal events (not from **\\$HISTFILE***)*\n>\n> **-L**\n>\n> :   restricts to only local events (not from other shells, see **SHARE_HISTORY** *in zshoptions(1) \\-- note that* **\\$HISTFILE** *is* considered local when read at startup)\n>\n> **-m**\n>\n> :   takes the first argument as a pattern (which should be quoted) and only the history events matching this pattern are considered\n>\n> If *first is not specified, it will be set to -1 (the most recent* event), or to -16 if the **-l** *flag is given.* If *last is not specified, it will be set to first,* or to -1 if the **-l** *flag is given.* However, if the current event has added entries to the history with `**print -s***` or `***fc -R***`, then the default last for* **-l** includes all new history entries since the current event began.\n>\n> When the **-l** *flag is given, the resulting events are listed on* standard output. Otherwise the editor program specified by **-e** *ename* is invoked on a file containing these history events. If **-e** *is not given, the* value of the parameter **FCEDIT** *is used; if that is not set the value of* the parameter **EDITOR** *is used; if that is not set a builtin default,* usually `**vi***` is used. If ename is `***-***`, no editor is invoked.* When editing is complete, the edited command is executed.\n>\n> The flag `**-s***` is equivalent to `***-e -***`.* The flag **-r** *reverses the order of the events and the* flag **-n** *suppresses event numbers when listing.*\n>\n> Also when listing,\n>\n> **-d**\n>\n> :   prints timestamps for each event\n>\n> **-f**\n>\n> :   prints full time-date stamps in the US `*MM***/***DD***/***YY hh***:***mm` format*\n>\n> **-E**\n>\n> :   prints full time-date stamps in the European `*dd***.***mm***.***yyyy hh***:***mm` format*\n>\n> **-i**\n>\n> :   prints full time-date stamps in ISO8601 `*yyyy***-***mm***-***dd hh***:***mm` format*\n>\n> **-t** *fmt*\n>\n> :   prints time and date stamps in the given format; *fmt is formatted with the strftime function with the zsh extensions* described for the **%D{***string***}** *prompt format in* the section EXPANSION OF PROMPT SEQUENCES in *zshmisc(1). The resulting formatted string must be* no more than 256 characters or will not be printed\n>\n> <!-- -->\n>\n> **-D**\n>\n> :   prints elapsed times; may be combined with one of the options above\n>\n> `**fc -p***` pushes the current history list onto a stack and switches to a* new history list. If the **-a** *option is also specified, this history list* will be automatically popped when the current function scope is exited, which is a much better solution than creating a trap function to call `**fc -P***`* manually. If no arguments are specified, the history list is left empty, **\\$HISTFILE** *is unset, and* **\\$HISTSIZE** *&* **\\$SAVEHIST** *are set to their* default values. If one argument is given, **\\$HISTFILE** *is set to that* filename, **\\$HISTSIZE** *&* **\\$SAVEHIST** *are left unchanged, and the history* file is read in (if it exists) to initialize the new list. If a second argument is specified, **\\$HISTSIZE** *&* **\\$SAVEHIST** *are instead set to the* single specified numeric value. Finally, if a third argument is specified, **\\$SAVEHIST** *is set to a separate value from* **\\$HISTSIZE***. You are free to* change these environment values for the new history list however you desire in order to manipulate the new history list.\n>\n> `**fc -P***` pops the history list back to an older list saved by `***fc -p***`.* The current list is saved to its **\\$HISTFILE** *before it is destroyed* (assuming that **\\$HISTFILE** *and* **\\$SAVEHIST** *are set appropriately, of* course). The values of **\\$HISTFILE***,* **\\$HISTSIZE***, and* **\\$SAVEHIST** *are* restored to the values they had when `**fc -p***` was called. Note that this* restoration can conflict with making these variables \\\"local\\\", so your best bet is to avoid local declarations for these variables in functions that use `**fc -p***`. The one other guaranteed-safe combination is declaring these* variables to be local at the top of your function and using the automatic option (**-a***) with `***fc -p***`. Finally, note that it is legal to manually* pop a push marked for automatic popping if you need to do so before the function exits.\n>\n> `**fc -R***` reads the history from the given file,* `**fc -W***` writes the history out to the given file,* and `**fc -A***` appends the history out to the given file.* If no filename is specified, the **\\$HISTFILE** *is assumed.* If the **-I** *option is added to* **-R***, only those events that are* not already contained within the internal history list are added. If the **-I** *option is added to* **-A** *or* **-W***, only those* events that are new since last incremental append/write to the history file are appended/written. In any case, the created file will have no more than **\\$SAVEHIST** entries.",
     "args": "fc -P"
   },
   "fg": {
@@ -185,12 +185,12 @@
   },
   "functions": {
     "shortDescription": "List functions",
-    "description": "**functions -c** *oldfn newfn*\n\n**functions -M** *\\[***-s***\\] mathfn \\[ min \\[ max \\[ shellfn \\] \\] \\]*\n\n**functions -M** *\\[* **-m** *pattern \\... \\]*\n\n**functions +M** *\\[* **-m** *\\] mathfn \\...* Equivalent to **typeset -f***, with the exception of the* **-c***,* **-x***,* **-M** *and* **-W** *options. For* **functions -u** *and* **functions -U***,* see **autoload***, which provides additional options. For* **functions -t** and **functions -T***, see* **typeset -f***.*\n\n> The **-x** *option indicates that any functions output will have* each leading tab for indentation, added by the shell to show syntactic structure, expanded to the given number *num of spaces. num* can also be 0 to suppress all indentation.\n>\n> The **-W** *option turns on the option* **WARN_NESTED_VAR** *for the named* function or functions only. The option is turned off at the start of nested functions (apart from anonoymous functions) unless the called function also has the **-W** *attribute.*\n>\n> The **-c** *option causes oldfn to be copied to newfn. The* copy is efficiently handled internally by reference counting. If *oldfn was marked for autoload it is first loaded and if this* fails the copy fails. Either function may subsequently be redefined without affecting the other. A typical idiom is that *oldfn is the* name of a library shell function which is then redefined to call **newfn***, thereby installing a modified version of the function.*\n>\n> *The* **-M** *and* **+M** *flags*\n>\n> Use of the **-M** *option may not be combined with any of the options* handled by **typeset -f***.*\n>\n> **functions -M** *mathfn defines mathfn as the name of* a mathematical function recognised in all forms of arithmetical expressions; see the section \\`Arithmetic Evaluation\\' in *zshmisc(1). By default mathfn may take* any number of comma-separated arguments. If *min is given,* it must have exactly *min args; if min and max are* both given, it must have at least *min and at most max* args. *max may be -1 to indicate that there is no upper limit.*\n>\n> By default the function is implemented by a shell function of the same name; if *shellfn is specified it gives the name of the corresponding* shell function while *mathfn remains the name used in arithmetical* expressions. The name of the function in **\\$0** *is mathfn (not* *shellfn as would usually be the case), provided the option* **FUNCTION_ARGZERO** *is in effect. The positional parameters in the shell* function correspond to the arguments of the mathematical function call.\n>\n> The result of the last arithmetical expression evaluated inside the shell function gives the result of the mathematical function. This is not limited to arithmetic substitutions of the form **\\$((***\\...***))***,* but also includes arithmetical expressions evaluated in any other way, including by the **let** *builtin,* by **((***\\...***))** *statements,* and even by the **return** *builtin* and by array subscripts. Therefore, care must be taken not to use syntactical constructs that perform arithmetic evaluation after evaluating what is to be the result of the function. For example:\n>\n> > # WRONG\n> >     zmath_cube() {\n> >       (( $1 * $1 * $1 ))\n> >       return 0\n> >     }\n> >     functions -M cube 1 1 zmath_cube\n> >     print $(( cube(3) ))\n>\n> This will print \\`**0***\\' because of the* **return***.*\n>\n> Commenting the **return** *out would lead to a different problem: the* **((***\\...***))** *statement would become* the last statement in the function, so the *return status (***\\$?***) of the* function would be non-zero (indicating failure) whenever the *arithmetic* result *of the function would happen to be zero (numerically):*\n>\n> > # WRONG\n> >     zmath_cube() {\n> >       (( $1 * $1 * $1 ))\n> >     }\n> >     functions -M cube 1 1 zmath_cube\n> >     print $(( cube(0) ))\n>\n> Instead, the **true** *builtin can be used:*\n>\n> > # RIGHT\n> >     zmath_cube() {\n> >       (( $1 * $1 * $1 ))\n> >       true\n> >     }\n> >     functions -M cube 1 1 zmath_cube\n> >     print $(( cube(3) ))\n>\n> If the additional option **-s** *is given to* **functions -M***, the* argument to the function is a single string: anything between the opening and matching closing parenthesis is passed to the function as a single argument, even if it includes commas or white space. The minimum and maximum argument specifiers must therefore be 1 if given. An empty argument list is passed as a zero-length string. Thus, the following string function takes a single argument, including the commas, and prints 11:\n>\n> > stringfn() { (( $#1 )); true }\n> >     functions -Ms stringfn\n> >     print $(( stringfn(foo,bar,rod) ))\n>\n> **functions -M** *with no arguments lists all such user-defined functions in* the same form as a definition. With the additional option **-m** *and* a list of arguments, all functions whose *mathfn matches one of* the pattern arguments are listed.\n>\n> **function +M** *removes the list of mathematical functions; with the* additional option **-m** *the arguments are treated as patterns and* all functions whose *mathfn matches the pattern are removed. Note* that the shell function implementing the behaviour is not removed (regardless of whether its name coincides with *mathfn).*",
+    "description": "**functions -c** *oldfn newfn*\n\n**functions -M** *\\[***-s***\\] mathfn \\[ min \\[ max \\[ shellfn \\] \\] \\]*\n\n**functions -M** *\\[* **-m** *pattern \\... \\]*\n\n**functions +M** *\\[* **-m** *\\] mathfn \\...* Equivalent to **typeset -f***, with the exception of the* **-c***,* **-x***,* **-M** *and* **-W** *options. For* **functions -u** *and* **functions -U***,* see **autoload***, which provides additional options. For* **functions -t** and **functions -T***, see* **typeset -f***.*\n\n> The **-x** *option indicates that any functions output will have* each leading tab for indentation, added by the shell to show syntactic structure, expanded to the given number *num of spaces. num* can also be 0 to suppress all indentation.\n>\n> The **-W** *option turns on the option* **WARN_NESTED_VAR** *for the named* function or functions only. The option is turned off at the start of nested functions (apart from anonoymous functions) unless the called function also has the **-W** *attribute.*\n>\n> The **-c** *option causes oldfn to be copied to newfn. The* copy is efficiently handled internally by reference counting. If *oldfn was marked for autoload it is first loaded and if this* fails the copy fails. Either function may subsequently be redefined without affecting the other. A typical idiom is that *oldfn is the* name of a library shell function which is then redefined to call **newfn***, thereby installing a modified version of the function.*\n>\n> *The* **-M** *and* **+M** *flags*\n>\n> Use of the **-M** *option may not be combined with any of the options* handled by **typeset -f***.*\n>\n> **functions -M** *mathfn defines mathfn as the name of* a mathematical function recognised in all forms of arithmetical expressions; see the section `Arithmetic Evaluation` in *zshmisc(1). By default mathfn may take* any number of comma-separated arguments. If *min is given,* it must have exactly *min args; if min and max are* both given, it must have at least *min and at most max* args. *max may be -1 to indicate that there is no upper limit.*\n>\n> By default the function is implemented by a shell function of the same name; if *shellfn is specified it gives the name of the corresponding* shell function while *mathfn remains the name used in arithmetical* expressions. The name of the function in **\\$0** *is mathfn (not* *shellfn as would usually be the case), provided the option* **FUNCTION_ARGZERO** *is in effect. The positional parameters in the shell* function correspond to the arguments of the mathematical function call.\n>\n> The result of the last arithmetical expression evaluated inside the shell function gives the result of the mathematical function. This is not limited to arithmetic substitutions of the form **\\$((***\\...***))***,* but also includes arithmetical expressions evaluated in any other way, including by the **let** *builtin,* by **((***\\...***))** *statements,* and even by the **return** *builtin* and by array subscripts. Therefore, care must be taken not to use syntactical constructs that perform arithmetic evaluation after evaluating what is to be the result of the function. For example:\n>\n> > # WRONG\n> >     zmath_cube() {\n> >       (( $1 * $1 * $1 ))\n> >       return 0\n> >     }\n> >     functions -M cube 1 1 zmath_cube\n> >     print $(( cube(3) ))\n>\n> This will print `**0***` because of the* **return***.*\n>\n> Commenting the **return** *out would lead to a different problem: the* **((***\\...***))** *statement would become* the last statement in the function, so the *return status (***\\$?***) of the* function would be non-zero (indicating failure) whenever the *arithmetic* result *of the function would happen to be zero (numerically):*\n>\n> > # WRONG\n> >     zmath_cube() {\n> >       (( $1 * $1 * $1 ))\n> >     }\n> >     functions -M cube 1 1 zmath_cube\n> >     print $(( cube(0) ))\n>\n> Instead, the **true** *builtin can be used:*\n>\n> > # RIGHT\n> >     zmath_cube() {\n> >       (( $1 * $1 * $1 ))\n> >       true\n> >     }\n> >     functions -M cube 1 1 zmath_cube\n> >     print $(( cube(3) ))\n>\n> If the additional option **-s** *is given to* **functions -M***, the* argument to the function is a single string: anything between the opening and matching closing parenthesis is passed to the function as a single argument, even if it includes commas or white space. The minimum and maximum argument specifiers must therefore be 1 if given. An empty argument list is passed as a zero-length string. Thus, the following string function takes a single argument, including the commas, and prints 11:\n>\n> > stringfn() { (( $#1 )); true }\n> >     functions -Ms stringfn\n> >     print $(( stringfn(foo,bar,rod) ))\n>\n> **functions -M** *with no arguments lists all such user-defined functions in* the same form as a definition. With the additional option **-m** *and* a list of arguments, all functions whose *mathfn matches one of* the pattern arguments are listed.\n>\n> **function +M** *removes the list of mathematical functions; with the* additional option **-m** *the arguments are treated as patterns and* all functions whose *mathfn matches the pattern are removed. Note* that the shell function implementing the behaviour is not removed (regardless of whether its name coincides with *mathfn).*",
     "args": "functions [ {+|-}UkmtTuWz ] [ -x num ] [ name ... ]"
   },
   "getcap": {
     "shortDescription": "Get capabilities",
-    "description": ":   See the section \\`The zsh/cap Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/cap Module` in *zshmodules(1).*",
     "args": "getcap"
   },
   "getln": {
@@ -199,12 +199,12 @@
   },
   "getopts": {
     "shortDescription": "Parse positional parameters",
-    "description": ":   Checks the *args for legal options. If the args are omitted,* use the positional parameters. A valid option argument begins with a \\`**+***\\' or a \\`***-***\\'. An argument not beginning with* a \\`**+***\\' or a \\`***-***\\', or the argument \\`***--***\\', ends the options.* Note that a single \\`**-***\\' is not considered a valid option argument.* *optstring contains the letters that* **getopts** recognizes. If a letter is followed by a \\`**:***\\', that option* requires an argument. The options can be separated from the argument by blanks.\n\n    Each time it is invoked, **getopts** *places the option letter it finds* in the shell parameter *name, prepended with a \\`***+***\\' when* *arg begins with a \\`***+***\\'. The index of the next arg* is stored in **OPTIND***. The option argument, if any,* is stored in **OPTARG***.*\n\n    The first option to be examined may be changed by explicitly assigning to **OPTIND***.* **OPTIND** *has an initial value of* **1***, and is* normally set to **1** *upon entry to a shell function and restored* upon exit. (The **POSIX_BUILTINS** *option disables this, and also changes* the way the value is calculated to match other shells.) **OPTARG** is not reset and retains its value from the most recent call to **getopts***. If either of* **OPTIND** *or* **OPTARG** *is explicitly* unset, it remains unset, and the index or option argument is not stored. The option itself is still stored in *name in this case.*\n\n    A leading \\`**:***\\' in optstring causes* **getopts** *to store the* letter of any invalid option in **OPTARG***, and to set name to* \\`**?***\\' for an unknown option and to \\`***:***\\' when a required argument is* missing. Otherwise, **getopts** *sets name to \\`***?***\\' and prints* an error message when an option is invalid. The exit status is nonzero when there are no more options.",
+    "description": ":   Checks the *args for legal options. If the args are omitted,* use the positional parameters. A valid option argument begins with a `**+***` or a `***-***`. An argument not beginning with* a `**+***` or a `***-***`, or the argument `***--***`, ends the options.* Note that a single `**-***` is not considered a valid option argument.* *optstring contains the letters that* **getopts** recognizes. If a letter is followed by a `**:***`, that option* requires an argument. The options can be separated from the argument by blanks.\n\n    Each time it is invoked, **getopts** *places the option letter it finds* in the shell parameter *name, prepended with a `***+***` when* *arg begins with a `***+***`. The index of the next arg* is stored in **OPTIND***. The option argument, if any,* is stored in **OPTARG***.*\n\n    The first option to be examined may be changed by explicitly assigning to **OPTIND***.* **OPTIND** *has an initial value of* **1***, and is* normally set to **1** *upon entry to a shell function and restored* upon exit. (The **POSIX_BUILTINS** *option disables this, and also changes* the way the value is calculated to match other shells.) **OPTARG** is not reset and retains its value from the most recent call to **getopts***. If either of* **OPTIND** *or* **OPTARG** *is explicitly* unset, it remains unset, and the index or option argument is not stored. The option itself is still stored in *name in this case.*\n\n    A leading `**:***` in optstring causes* **getopts** *to store the* letter of any invalid option in **OPTARG***, and to set name to* `**?***` for an unknown option and to `***:***` when a required argument is* missing. Otherwise, **getopts** *sets name to `***?***` and prints* an error message when an option is invalid. The exit status is nonzero when there are no more options.",
     "args": "getopts optstring name [ arg ... ]"
   },
   "hash": {
     "shortDescription": "Remember command locations",
-    "description": ":   **hash** *can be used to directly modify the contents of the command* hash table, and the named directory hash table. Normally one would modify these tables by modifying one\\'s **PATH** (for the command hash table) or by creating appropriate shell parameters (for the named directory hash table). The choice of hash table to work on is determined by the **-d** *option;* without the option the command hash table is used, and with the option the named directory hash table is used.\n\n    A command *name starting with a* **/** *is never hashed, whether by* explicit use of the **hash** *command or otherwise. Such a command* is always found by direct look up in the file system.\n\n    Given no arguments, and neither the **-r** *or* **-f** *options,* the selected hash table will be listed in full.\n\n    The **-r** *option causes the selected hash table to be emptied.* It will be subsequently rebuilt in the normal fashion. The **-f** *option causes the selected hash table to be fully* rebuilt immediately. For the command hash table this hashes all the absolute directories in the **PATH***,* and for the named directory hash table this adds all users\\' home directories. These two options cannot be used with any arguments.\n\n    The **-m** *option causes the arguments to be taken as patterns* (which should be quoted) and the elements of the hash table matching those patterns are printed. This is the only way to display a limited selection of hash table elements.\n\n    For each *name with a corresponding value, put \\`name\\' in* the selected hash table, associating it with the pathname \\`*value\\'.* In the command hash table, this means that whenever \\`*name\\' is used as a command argument, the shell will try* to execute the file given by \\`*value\\'.* In the named directory hash table, this means that \\`*value\\' may be referred to as \\`***\\~***name\\'.*\n\n    For each *name with no* corresponding *value, attempt to add name to the hash table,* checking what the appropriate **value** *is in the normal manner for* that hash table. If an appropriate **value** *can\\'t be found, then* the hash table will be unchanged.\n\n    The **-v** *option causes hash table entries to be listed as they are* added by explicit specification. If has no effect if used with **-f***.*\n\n    If the **-L** *flag is present, then each hash table entry is printed in* the form of a call to hash.",
+    "description": ":   **hash** *can be used to directly modify the contents of the command* hash table, and the named directory hash table. Normally one would modify these tables by modifying one\\'s **PATH** (for the command hash table) or by creating appropriate shell parameters (for the named directory hash table). The choice of hash table to work on is determined by the **-d** *option;* without the option the command hash table is used, and with the option the named directory hash table is used.\n\n    A command *name starting with a* **/** *is never hashed, whether by* explicit use of the **hash** *command or otherwise. Such a command* is always found by direct look up in the file system.\n\n    Given no arguments, and neither the **-r** *or* **-f** *options,* the selected hash table will be listed in full.\n\n    The **-r** *option causes the selected hash table to be emptied.* It will be subsequently rebuilt in the normal fashion. The **-f** *option causes the selected hash table to be fully* rebuilt immediately. For the command hash table this hashes all the absolute directories in the **PATH***,* and for the named directory hash table this adds all users\\' home directories. These two options cannot be used with any arguments.\n\n    The **-m** *option causes the arguments to be taken as patterns* (which should be quoted) and the elements of the hash table matching those patterns are printed. This is the only way to display a limited selection of hash table elements.\n\n    For each *name with a corresponding value, put `name` in* the selected hash table, associating it with the pathname `*value`.* In the command hash table, this means that whenever `*name` is used as a command argument, the shell will try* to execute the file given by `*value`.* In the named directory hash table, this means that `*value` may be referred to as `***\\~***name`.*\n\n    For each *name with no* corresponding *value, attempt to add name to the hash table,* checking what the appropriate **value** *is in the normal manner for* that hash table. If an appropriate **value** *can\\'t be found, then* the hash table will be unchanged.\n\n    The **-v** *option causes hash table entries to be listed as they are* added by explicit specification. If has no effect if used with **-f***.*\n\n    If the **-L** *flag is present, then each hash table entry is printed in* the form of a call to hash.",
     "args": "hash [ -Ldfmrv ] [ name[=value] ] ..."
   },
   "history": {
@@ -224,17 +224,17 @@
   },
   "kill": {
     "shortDescription": "Send a signal to a process",
-    "description": "**kill** **-l** *\\[ sig \\... \\]* Sends either **SIGTERM** *or the specified signal to the given* jobs or processes. Signals are given by number or by names, with or without the \\`**SIG***\\'* prefix. If the signal being sent is not \\`**KILL***\\' or \\`***CONT***\\', then the job* will be sent a \\`**CONT***\\' signal if it is stopped.* The argument *job can be the process ID of a job* not in the job list. In the second form, **kill -l***, if sig is not* specified the signal names are listed. Otherwise, for each *sig that is a name, the corresponding signal number is* listed. For each *sig that is a signal number or a number* representing the exit status of a process which was terminated or stopped by a signal the name of the signal is printed.\n\n> On some systems, alternative signal names are allowed for a few signals. Typical examples are **SIGCHLD** *and* **SIGCLD** *or* **SIGPOLL** *and* **SIGIO***, assuming they correspond to the same signal number.* **kill** -l *will only list the preferred form, however* **kill -l** *alt will* show if the alternative form corresponds to a signal number. For example, under Linux **kill -l IO** *and* **kill -l POLL** *both output 29, hence* **kill -IO** *and* **kill -POLL** *have the same effect.*\n>\n> Many systems will allow process IDs to be negative to kill a process group or zero to kill the current process group.",
+    "description": "**kill** **-l** *\\[ sig \\... \\]* Sends either **SIGTERM** *or the specified signal to the given* jobs or processes. Signals are given by number or by names, with or without the `**SIG***`* prefix. If the signal being sent is not `**KILL***` or `***CONT***`, then the job* will be sent a `**CONT***` signal if it is stopped.* The argument *job can be the process ID of a job* not in the job list. In the second form, **kill -l***, if sig is not* specified the signal names are listed. Otherwise, for each *sig that is a name, the corresponding signal number is* listed. For each *sig that is a signal number or a number* representing the exit status of a process which was terminated or stopped by a signal the name of the signal is printed.\n\n> On some systems, alternative signal names are allowed for a few signals. Typical examples are **SIGCHLD** *and* **SIGCLD** *or* **SIGPOLL** *and* **SIGIO***, assuming they correspond to the same signal number.* **kill** -l *will only list the preferred form, however* **kill -l** *alt will* show if the alternative form corresponds to a signal number. For example, under Linux **kill -l IO** *and* **kill -l POLL** *both output 29, hence* **kill -IO** *and* **kill -POLL** *have the same effect.*\n>\n> Many systems will allow process IDs to be negative to kill a process group or zero to kill the current process group.",
     "args": "kill [ -s signal_name | -n signal_number | -sig ] job ..."
   },
   "let": {
     "shortDescription": "Evaluate arithmetic expression",
-    "description": ":   Evaluate each *arg as an arithmetic expression.* See the section \\`Arithmetic Evaluation\\' in *zshmisc(1)* for a description of arithmetic expressions. The exit status is 0 if the value of the last expression is nonzero, 1 if it is zero, and 2 if an error occurred.",
+    "description": ":   Evaluate each *arg as an arithmetic expression.* See the section `Arithmetic Evaluation` in *zshmisc(1)* for a description of arithmetic expressions. The exit status is 0 if the value of the last expression is nonzero, 1 if it is zero, and 2 if an error occurred.",
     "args": "let arg ..."
   },
   "limit": {
     "shortDescription": "Set or display resource limits",
-    "description": ":   Set or display resource limits. Unless the **-s** *flag is given,* the limit applies only the children of the shell. If **-s** *is* given without other arguments, the resource limits of the current shell is set to the previously set resource limits of the children.\n\n    If *limit is not specified, print the current limit placed* on *resource, otherwise* set the limit to the specified value. If the **-h** *flag* is given, use hard limits instead of soft limits. If no *resource is given, print all limits.*\n\n    When looping over multiple resources, the shell will abort immediately if it detects a badly formed argument. However, if it fails to set a limit for some other reason it will continue trying to set the remaining limits.\n\n    *resource can be one of:*\n\n    **addressspace**\n\n    :   Maximum amount of address space used.\n\n    **aiomemorylocked**\n\n    :   Maximum amount of memory locked in RAM for AIO operations.\n\n    **aiooperations**\n\n    :   Maximum number of AIO operations.\n\n    **cachedthreads**\n\n    :   Maximum number of cached threads.\n\n    **coredumpsize**\n\n    :   Maximum size of a core dump.\n\n    **cputime**\n\n    :   Maximum CPU seconds per process.\n\n    **datasize**\n\n    :   Maximum data size (including stack) for each process.\n\n    **descriptors**\n\n    :   Maximum value for a file descriptor.\n\n    **filesize**\n\n    :   Largest single file allowed.\n\n    **kqueues**\n\n    :   Maximum number of kqueues allocated.\n\n    **maxproc**\n\n    :   Maximum number of processes.\n\n    **maxpthreads**\n\n    :   Maximum number of threads per process.\n\n    **memorylocked**\n\n    :   Maximum amount of memory locked in RAM.\n\n    **memoryuse**\n\n    :   Maximum resident set size.\n\n    **msgqueue**\n\n    :   Maximum number of bytes in POSIX message queues.\n\n    **posixlocks**\n\n    :   Maximum number of POSIX locks per user.\n\n    **pseudoterminals**\n\n    :   Maximum number of pseudo-terminals.\n\n    **resident**\n\n    :   Maximum resident set size.\n\n    **sigpending**\n\n    :   Maximum number of pending signals.\n\n    **sockbufsize**\n\n    :   Maximum size of all socket buffers.\n\n    **stacksize**\n\n    :   Maximum stack size for each process.\n\n    **swapsize**\n\n    :   Maximum amount of swap used.\n\n    **vmemorysize**\n\n    :   Maximum amount of virtual memory.\n\n    Which of these resource limits are available depends on the system. *resource can be abbreviated to any unambiguous prefix. It* can also be an integer, which corresponds to the integer defined for the resource by the operating system.\n\n    If argument corresponds to a number which is out of the range of the resources configured into the shell, the shell will try to read or write the limit anyway, and will report an error if this fails. As the shell does not store such resources internally, an attempt to set the limit will fail unless the **-s** *option is present.*\n\n    *limit is a number, with an optional scaling factor, as follows:*\n\n    *n***h**\n\n    :   hours\n\n    *n***k**\n\n    :   kilobytes (default)\n\n    *n***m**\n\n    :   megabytes or minutes\n\n    *n***g**\n\n    :   gigabytes\n\n    \\[*mm***:***\\]ss*\n\n    :   minutes and seconds\n\n    The **limit** *command is not made available by default when the* shell starts in a mode emulating another shell. It can be made available with the command \\`**zmodload -F zsh/rlimits b:limit***\\'.*",
+    "description": ":   Set or display resource limits. Unless the **-s** *flag is given,* the limit applies only the children of the shell. If **-s** *is* given without other arguments, the resource limits of the current shell is set to the previously set resource limits of the children.\n\n    If *limit is not specified, print the current limit placed* on *resource, otherwise* set the limit to the specified value. If the **-h** *flag* is given, use hard limits instead of soft limits. If no *resource is given, print all limits.*\n\n    When looping over multiple resources, the shell will abort immediately if it detects a badly formed argument. However, if it fails to set a limit for some other reason it will continue trying to set the remaining limits.\n\n    *resource can be one of:*\n\n    **addressspace**\n\n    :   Maximum amount of address space used.\n\n    **aiomemorylocked**\n\n    :   Maximum amount of memory locked in RAM for AIO operations.\n\n    **aiooperations**\n\n    :   Maximum number of AIO operations.\n\n    **cachedthreads**\n\n    :   Maximum number of cached threads.\n\n    **coredumpsize**\n\n    :   Maximum size of a core dump.\n\n    **cputime**\n\n    :   Maximum CPU seconds per process.\n\n    **datasize**\n\n    :   Maximum data size (including stack) for each process.\n\n    **descriptors**\n\n    :   Maximum value for a file descriptor.\n\n    **filesize**\n\n    :   Largest single file allowed.\n\n    **kqueues**\n\n    :   Maximum number of kqueues allocated.\n\n    **maxproc**\n\n    :   Maximum number of processes.\n\n    **maxpthreads**\n\n    :   Maximum number of threads per process.\n\n    **memorylocked**\n\n    :   Maximum amount of memory locked in RAM.\n\n    **memoryuse**\n\n    :   Maximum resident set size.\n\n    **msgqueue**\n\n    :   Maximum number of bytes in POSIX message queues.\n\n    **posixlocks**\n\n    :   Maximum number of POSIX locks per user.\n\n    **pseudoterminals**\n\n    :   Maximum number of pseudo-terminals.\n\n    **resident**\n\n    :   Maximum resident set size.\n\n    **sigpending**\n\n    :   Maximum number of pending signals.\n\n    **sockbufsize**\n\n    :   Maximum size of all socket buffers.\n\n    **stacksize**\n\n    :   Maximum stack size for each process.\n\n    **swapsize**\n\n    :   Maximum amount of swap used.\n\n    **vmemorysize**\n\n    :   Maximum amount of virtual memory.\n\n    Which of these resource limits are available depends on the system. *resource can be abbreviated to any unambiguous prefix. It* can also be an integer, which corresponds to the integer defined for the resource by the operating system.\n\n    If argument corresponds to a number which is out of the range of the resources configured into the shell, the shell will try to read or write the limit anyway, and will report an error if this fails. As the shell does not store such resources internally, an attempt to set the limit will fail unless the **-s** *option is present.*\n\n    *limit is a number, with an optional scaling factor, as follows:*\n\n    *n***h**\n\n    :   hours\n\n    *n***k**\n\n    :   kilobytes (default)\n\n    *n***m**\n\n    :   megabytes or minutes\n\n    *n***g**\n\n    :   gigabytes\n\n    \\[*mm***:***\\]ss*\n\n    :   minutes and seconds\n\n    The **limit** *command is not made available by default when the* shell starts in a mode emulating another shell. It can be made available with the command `**zmodload -F zsh/rlimits b:limit***`.*",
     "args": "limit [ -hs ] [ resource [ limit ] ] ..."
   },
   "local": {
@@ -249,27 +249,27 @@
   },
   "noglob": {
     "shortDescription": "Disable filename expansion",
-    "description": ":   See the section \\`Precommand Modifiers\\' in *zshmisc(1).*",
+    "description": ":   See the section `Precommand Modifiers` in *zshmisc(1).*",
     "args": "noglob simple command"
   },
   "popd": {
     "shortDescription": "Remove directory from stack",
-    "description": ":   Remove an entry from the directory stack, and perform a **cd** *to* the new top directory. With no argument, the current top entry is removed. An argument of the form \\`**+***n\\' identifies a stack* entry by counting from the left of the list shown by the **dirs** *command,* starting with zero. An argument of the form **-***n counts from the right.* If the **PUSHD_MINUS** *option is set, the meanings of \\`***+***\\' and* \\`**-***\\' in this context are swapped.*\n\n    If the **-q** *(quiet) option is specified, the hook function* **chpwd** and the functions in the array **\\$chpwd_functions** *are not called,* and the new directory stack is not printed. This is useful for calls to **popd** *that do not change the environment seen by an interactive user.*",
+    "description": ":   Remove an entry from the directory stack, and perform a **cd** *to* the new top directory. With no argument, the current top entry is removed. An argument of the form `**+***n` identifies a stack* entry by counting from the left of the list shown by the **dirs** *command,* starting with zero. An argument of the form **-***n counts from the right.* If the **PUSHD_MINUS** *option is set, the meanings of `***+***` and* `**-***` in this context are swapped.*\n\n    If the **-q** *(quiet) option is specified, the hook function* **chpwd** and the functions in the array **\\$chpwd_functions** *are not called,* and the new directory stack is not printed. This is useful for calls to **popd** *that do not change the environment seen by an interactive user.*",
     "args": "popd [ -q ] [ {+|-}n ]"
   },
   "print": {
     "shortDescription": "Print arguments",
-    "description": "*\\[* **-v** *name \\] \\[* **-xX** *tabstop \\] \\[* **-R** *\\[* **-en** *\\]\\] \\[ arg \\... \\]* With the \\`**-f***\\' option the arguments are printed as described by* **printf***.* With no flags or with the flag \\`**-***\\', the arguments are printed on* the standard output as described by **echo***, with the following differences:* the escape sequence \\`**\\\\M-***x\\' (or \\`***\\\\M***x\\') metafies the character* *x (sets the highest bit),* \\`**\\\\C-***x\\' (or \\`***\\\\C***x\\') produces a control character* (\\`**\\\\C-@***\\' and \\`***\\\\C-?***\\' give the characters NULL and delete),* a character code in octal is represented by \\`**\\\\***NNN\\'* (instead of \\`**\\\\0***NNN\\'),* and \\`**\\\\E***\\' is a synonym for \\`***\\\\e***\\'.* Finally, if not in an escape sequence, \\`**\\\\***\\' escapes the following character and is not printed.*\n\n> **-a** Print arguments with the column incrementing first. Only useful with the **-c** *and* **-C** *options.*\n>\n> **-b**\n>\n> :   Recognize all the escape sequences defined for the **bindkey** *command,* see the section \\`Zle Builtins\\' in *zshzle(1).*\n>\n> **-c**\n>\n> :   Print the arguments in columns. Unless **-a** *is also given, arguments are* printed with the row incrementing first.\n>\n> **-C** *cols*\n>\n> :   Print the arguments in *cols columns. Unless* **-a** *is also given,* arguments are printed with the row incrementing first.\n>\n> **-D**\n>\n> :   Treat the arguments as paths, replacing directory prefixes with **\\~** expressions corresponding to directory names, as appropriate.\n>\n> **-i**\n>\n> :   If given together with **-o** *or* **-O***, sorting is performed* case-independently.\n>\n> **-l**\n>\n> :   Print the arguments separated by newlines instead of spaces. Note: if the list of arguments is empty, **print -l** *will still output one empty* line. To print a possibly-empty list of arguments one per line, use **print -C1***, as in \\`***print -rC1 \\-- \\\"\\$list\\[@\\]\\\"***\\'.*\n>\n> **-m**\n>\n> :   Take the first argument as a pattern (should be quoted), and remove it from the argument list together with subsequent arguments that do not match this pattern.\n>\n> **-n**\n>\n> :   Do not add a newline to the output.\n>\n> **-N**\n>\n> :   Print the arguments separated and terminated by nulls. Again, **print -rNC1 \\-- \\\"\\$list\\[@\\]\\\"** *is a canonical way to print an* arbitrary list as null-delimited records.\n>\n> **-o**\n>\n> :   Print the arguments sorted in ascending order.\n>\n> **-O**\n>\n> :   Print the arguments sorted in descending order.\n>\n> **-p**\n>\n> :   Print the arguments to the input of the coprocess.\n>\n> **-P**\n>\n> :   Perform prompt expansion (see EXPANSION OF PROMPT SEQUENCES in *zshmisc(1)).* In combination with \\`**-f***\\',* prompt escape sequences are parsed only within interpolated arguments, not within the format string.\n>\n> **-r**\n>\n> :   Ignore the escape conventions of **echo***.*\n>\n> **-R**\n>\n> :   Emulate the BSD **echo** *command, which does not process escape sequences* unless the **-e** *flag is given. The* **-n** *flag suppresses the trailing* newline. Only the **-e** *and* **-n** *flags are recognized after* **-R***; all other arguments and options are printed.*\n>\n> **-s**\n>\n> :   Place the results in the history list instead of on the standard output. Each argument to the **print** *command is treated as a single word in the* history, regardless of its content.\n>\n> **-S**\n>\n> :   Place the results in the history list instead of on the standard output. In this case only a single argument is allowed; it will be split into words as if it were a full shell command line. The effect is similar to reading the line from a history file with the **HIST_LEX_WORDS** *option active.*\n>\n> **-u** *n*\n>\n> :   Print the arguments to file descriptor *n.*\n>\n> **-v** *name*\n>\n> :   Store the printed arguments as the value of the parameter *name.*\n>\n> **-x** *tab-stop*\n>\n> :   Expand leading tabs on each line of output in the printed string assuming a tab stop every *tab-stop characters. This is appropriate* for formatting code that may be indented with tabs. Note that leading tabs of any argument to print, not just the first, are expanded, even if **print** *is using spaces to separate arguments (the column count* is maintained across arguments but may be incorrect on output owing to previous unexpanded tabs).\n>\n>     The start of the output of each print command is assumed to be aligned with a tab stop. Widths of multibyte characters are handled if the option **MULTIBYTE** *is in effect. This option is ignored if other* formatting options are in effect, namely column alignment or **printf** *style, or if output is to a special location such as shell* history or the command line editor.\n>\n> **-X** *tab-stop*\n>\n> :   This is similar to **-x***, except that all tabs in the printed string* are expanded. This is appropriate if tabs in the arguments are being used to produce a table format.\n>\n> **-z**\n>\n> :   Push the arguments onto the editing buffer stack, separated by spaces.\n>\n> If any of \\`**-m***\\', \\`***-o***\\' or \\`***-O***\\' are used in combination with* \\`**-f***\\' and there are no arguments (after the removal process in the* case of \\`**-m***\\') then nothing is printed.*",
+    "description": "*\\[* **-v** *name \\] \\[* **-xX** *tabstop \\] \\[* **-R** *\\[* **-en** *\\]\\] \\[ arg \\... \\]* With the `**-f***` option the arguments are printed as described by* **printf***.* With no flags or with the flag `**-***`, the arguments are printed on* the standard output as described by **echo***, with the following differences:* the escape sequence `**\\\\M-***x` (or `***\\\\M***x`) metafies the character* *x (sets the highest bit),* `**\\\\C-***x` (or `***\\\\C***x`) produces a control character* (`**\\\\C-@***` and `***\\\\C-?***` give the characters NULL and delete),* a character code in octal is represented by `**\\\\***NNN`* (instead of `**\\\\0***NNN`),* and `**\\\\E***` is a synonym for `***\\\\e***`.* Finally, if not in an escape sequence, `**\\\\***` escapes the following character and is not printed.*\n\n> **-a** Print arguments with the column incrementing first. Only useful with the **-c** *and* **-C** *options.*\n>\n> **-b**\n>\n> :   Recognize all the escape sequences defined for the **bindkey** *command,* see the section `Zle Builtins` in *zshzle(1).*\n>\n> **-c**\n>\n> :   Print the arguments in columns. Unless **-a** *is also given, arguments are* printed with the row incrementing first.\n>\n> **-C** *cols*\n>\n> :   Print the arguments in *cols columns. Unless* **-a** *is also given,* arguments are printed with the row incrementing first.\n>\n> **-D**\n>\n> :   Treat the arguments as paths, replacing directory prefixes with **\\~** expressions corresponding to directory names, as appropriate.\n>\n> **-i**\n>\n> :   If given together with **-o** *or* **-O***, sorting is performed* case-independently.\n>\n> **-l**\n>\n> :   Print the arguments separated by newlines instead of spaces. Note: if the list of arguments is empty, **print -l** *will still output one empty* line. To print a possibly-empty list of arguments one per line, use **print -C1***, as in `***print -rC1 \\-- \\\"\\$list\\[@\\]\\\"***`.*\n>\n> **-m**\n>\n> :   Take the first argument as a pattern (should be quoted), and remove it from the argument list together with subsequent arguments that do not match this pattern.\n>\n> **-n**\n>\n> :   Do not add a newline to the output.\n>\n> **-N**\n>\n> :   Print the arguments separated and terminated by nulls. Again, **print -rNC1 \\-- \\\"\\$list\\[@\\]\\\"** *is a canonical way to print an* arbitrary list as null-delimited records.\n>\n> **-o**\n>\n> :   Print the arguments sorted in ascending order.\n>\n> **-O**\n>\n> :   Print the arguments sorted in descending order.\n>\n> **-p**\n>\n> :   Print the arguments to the input of the coprocess.\n>\n> **-P**\n>\n> :   Perform prompt expansion (see EXPANSION OF PROMPT SEQUENCES in *zshmisc(1)).* In combination with `**-f***`,* prompt escape sequences are parsed only within interpolated arguments, not within the format string.\n>\n> **-r**\n>\n> :   Ignore the escape conventions of **echo***.*\n>\n> **-R**\n>\n> :   Emulate the BSD **echo** *command, which does not process escape sequences* unless the **-e** *flag is given. The* **-n** *flag suppresses the trailing* newline. Only the **-e** *and* **-n** *flags are recognized after* **-R***; all other arguments and options are printed.*\n>\n> **-s**\n>\n> :   Place the results in the history list instead of on the standard output. Each argument to the **print** *command is treated as a single word in the* history, regardless of its content.\n>\n> **-S**\n>\n> :   Place the results in the history list instead of on the standard output. In this case only a single argument is allowed; it will be split into words as if it were a full shell command line. The effect is similar to reading the line from a history file with the **HIST_LEX_WORDS** *option active.*\n>\n> **-u** *n*\n>\n> :   Print the arguments to file descriptor *n.*\n>\n> **-v** *name*\n>\n> :   Store the printed arguments as the value of the parameter *name.*\n>\n> **-x** *tab-stop*\n>\n> :   Expand leading tabs on each line of output in the printed string assuming a tab stop every *tab-stop characters. This is appropriate* for formatting code that may be indented with tabs. Note that leading tabs of any argument to print, not just the first, are expanded, even if **print** *is using spaces to separate arguments (the column count* is maintained across arguments but may be incorrect on output owing to previous unexpanded tabs).\n>\n>     The start of the output of each print command is assumed to be aligned with a tab stop. Widths of multibyte characters are handled if the option **MULTIBYTE** *is in effect. This option is ignored if other* formatting options are in effect, namely column alignment or **printf** *style, or if output is to a special location such as shell* history or the command line editor.\n>\n> **-X** *tab-stop*\n>\n> :   This is similar to **-x***, except that all tabs in the printed string* are expanded. This is appropriate if tabs in the arguments are being used to produce a table format.\n>\n> **-z**\n>\n> :   Push the arguments onto the editing buffer stack, separated by spaces.\n>\n> If any of `**-m***`, `***-o***` or `***-O***` are used in combination with* `**-f***` and there are no arguments (after the removal process in the* case of `**-m***`) then nothing is printed.*",
     "args": "print [ -abcDilmnNoOpPrsSz ] [ -u n ] [ -f format ] [ -C cols ]"
   },
   "printf": {
     "shortDescription": "Format and print data",
-    "description": ":   Print the arguments according to the format specification. Formatting rules are the same as used in C. The same escape sequences as for **echo** are recognised in the format. All C conversion specifications ending in one of **csdiouxXeEfgGn** *are handled. In addition to this, \\`***%b***\\' can be* used instead of \\`**%s***\\' to cause escape sequences in the argument to be* recognised and \\`**%q***\\' can be used to quote the argument in such a way* that allows it to be reused as shell input. With the numeric format specifiers, if the corresponding argument starts with a quote character, the numeric value of the following character is used as the number to print; otherwise the argument is evaluated as an arithmetic expression. See the section \\`Arithmetic Evaluation\\' in *zshmisc(1)* for a description of arithmetic expressions. With \\`**%n***\\', the corresponding argument is taken as an* identifier which is created as an integer parameter.\n\n    Normally, conversion specifications are applied to each argument in order but they can explicitly specify the *nth argument is to be used by* replacing \\`**%***\\' by \\`***%***n***\\$***\\' and \\`***\\****\\' by \\`***\\****n***\\$***\\'.* It is recommended that you do not mix references of this explicit style with the normal style and the handling of such mixed styles may be subject to future change.\n\n    If arguments remain unused after formatting, the format string is reused until all arguments have been consumed. With the **print** *builtin, this* can be suppressed by using the **-r** *option. If more arguments are* required by the format than have been specified, the behaviour is as if zero or an empty string had been specified as the argument.\n\n    The **-v** *option causes the output to be stored as the value of the* parameter *name, instead of printed. If name is an array and* the format string is reused when consuming arguments then one array element will be used for each use of the format string.",
+    "description": ":   Print the arguments according to the format specification. Formatting rules are the same as used in C. The same escape sequences as for **echo** are recognised in the format. All C conversion specifications ending in one of **csdiouxXeEfgGn** *are handled. In addition to this, `***%b***` can be* used instead of `**%s***` to cause escape sequences in the argument to be* recognised and `**%q***` can be used to quote the argument in such a way* that allows it to be reused as shell input. With the numeric format specifiers, if the corresponding argument starts with a quote character, the numeric value of the following character is used as the number to print; otherwise the argument is evaluated as an arithmetic expression. See the section `Arithmetic Evaluation` in *zshmisc(1)* for a description of arithmetic expressions. With `**%n***`, the corresponding argument is taken as an* identifier which is created as an integer parameter.\n\n    Normally, conversion specifications are applied to each argument in order but they can explicitly specify the *nth argument is to be used by* replacing `**%***` by `***%***n***\\$***` and `***\\****` by `***\\****n***\\$***`.* It is recommended that you do not mix references of this explicit style with the normal style and the handling of such mixed styles may be subject to future change.\n\n    If arguments remain unused after formatting, the format string is reused until all arguments have been consumed. With the **print** *builtin, this* can be suppressed by using the **-r** *option. If more arguments are* required by the format than have been specified, the behaviour is as if zero or an empty string had been specified as the argument.\n\n    The **-v** *option causes the output to be stored as the value of the* parameter *name, instead of printed. If name is an array and* the format string is reused when consuming arguments then one array element will be used for each use of the format string.",
     "args": "printf [ -v name ] format [ arg ... ]"
   },
   "pushd": {
     "shortDescription": "Add directory to stack",
-    "description": "> The third form of **pushd** *changes directory by rotating the* directory list. An argument of the form \\`**+***n\\' identifies a stack* entry by counting from the left of the list shown by the **dirs** command, starting with zero. An argument of the form \\`**-***n\\' counts* from the right. If the **PUSHD_MINUS** *option is set, the meanings* of \\`**+***\\' and \\`***-***\\' in this context are swapped.*\n>\n> If the **-q** *(quiet) option is specified, the hook function* **chpwd** and the functions in the array **\\$chpwd_functions** *are not called,* and the new directory stack is not printed. This is useful for calls to **pushd** *that do not change the environment seen by an interactive user.*\n>\n> If the option **-q** *is not specified and the shell option* **PUSHD_SILENT** is not set, the directory stack will be printed after a **pushd** *is* performed.\n>\n> The options **-s***,* **-L** *and* **-P** *have the same meanings as for the* **cd** *builtin.*",
+    "description": "> The third form of **pushd** *changes directory by rotating the* directory list. An argument of the form `**+***n` identifies a stack* entry by counting from the left of the list shown by the **dirs** command, starting with zero. An argument of the form `**-***n` counts* from the right. If the **PUSHD_MINUS** *option is set, the meanings* of `**+***` and `***-***` in this context are swapped.*\n>\n> If the **-q** *(quiet) option is specified, the hook function* **chpwd** and the functions in the array **\\$chpwd_functions** *are not called,* and the new directory stack is not printed. This is useful for calls to **pushd** *that do not change the environment seen by an interactive user.*\n>\n> If the option **-q** *is not specified and the shell option* **PUSHD_SILENT** is not set, the directory stack will be printed after a **pushd** *is* performed.\n>\n> The options **-s***,* **-L** *and* **-P** *have the same meanings as for the* **cd** *builtin.*",
     "args": "pushd [ -qsLP ] [ arg ]\n\npushd [ -qsLP ] old new\n\npushd [ -qsLP ] {+|-}n Change the current directory, and push the old\ncurrent directory onto the directory stack. In the first form, change\nthe current directory to arg. If arg is not specified, change to the\nsecond directory on the stack (that is, exchange the top two entries),\nor change to $HOME if the PUSHD_TO_HOME option is set or if there is\nonly one entry on the stack. Otherwise, arg is interpreted as it would\nbe by cd. The meaning of old and new in the second form is also the same\nas for cd."
   },
   "pushln": {
@@ -288,7 +288,7 @@
     "args": "r"
   },
   "read": {
-    "description": "*\\[* **-u** *n \\] \\[ \\[name\\]\\[***?***prompt\\] \\] \\[ name \\... \\]* Read one line and break it into fields using the characters in **\\$IFS** *as separators, except as noted below.* The first field is assigned to the first *name, the second field* to the second *name, etc., with leftover* fields assigned to the last *name.* If *name is omitted then* **REPLY** *is used for scalars and* **reply** *for arrays.*\n\n> **-r** Raw mode: a \\`**\\\\***\\' at the end of a line does not signify line* continuation and backslashes in the line don\\'t quote the following character and are not removed.\n>\n> **-s**\n>\n> :   Don\\'t echo back characters if reading from the terminal.\n>\n> **-q**\n>\n> :   Read only one character from the terminal and set *name to* \\`**y***\\' if this character was \\`***y***\\' or \\`***Y***\\' and to \\`***n***\\' otherwise.* With this flag set the return status is zero only if the character was \\`**y***\\' or \\`***Y***\\'. This option may be used with a timeout (see* **-t***); if* the read times out, or encounters end of file, status 2 is returned. Input is read from the terminal unless one of **-u** *or* **-p** *is present. This option* may also be used within zle widgets.\n>\n> **-k** *\\[ num \\]*\n>\n> :   Read only one (or *num) characters. All are assigned to the first* *name, without word splitting. This flag is ignored when* **-q** *is* present. Input is read from the terminal unless one of **-u** *or* **-p** is present. This option may also be used within zle widgets.\n>\n>     Note that despite the mnemonic \\`key\\' this option does read full characters, which may consist of multiple bytes if the option **MULTIBYTE** *is set.*\n>\n> **-z**\n>\n> :   Read one entry from the editor buffer stack and assign it to the first *name, without word splitting. Text is pushed onto the stack with* \\`**print -z***\\' or with* **push-line** *from the line editor (see* *zshzle(1)). This flag is ignored when the* **-k** *or* **-q** *flags are present.*\n>\n> **-e**\n>\n> **-E** The input read is printed (echoed) to the standard output. If the **-e** flag is used, no input is assigned to the parameters.\n>\n> **-A**\n>\n> :   The first *name is taken as the name of an array and all words are* assigned to it.\n>\n> **-c**\n>\n> **-l** These flags are allowed only if called inside a function used for completion (specified with the **-K** *flag to* **compctl***). If the* **-c** *flag is given, the words of the* current command are read. If the **-l** *flag is given, the whole* line is assigned as a scalar. If both flags are present, **-l** is used and **-c** *is ignored.*\n>\n> **-n**\n>\n> :   Together with **-c***, the number of the word the cursor is on is* read. With **-l***, the index of the character the cursor is on is* read. Note that the command name is word number 1, not word 0, and that when the cursor is at the end of the line, its character index is the length of the line plus one.\n>\n> **-u** *n*\n>\n> :   Input is read from file descriptor *n.*\n>\n> **-p**\n>\n> :   Input is read from the coprocess.\n>\n> **-d** *delim*\n>\n> :   Input is terminated by the first character of *delim instead of* by newline.\n>\n> **-t** *\\[ num \\]*\n>\n> :   Test if input is available before attempting to read. If *num* is present, it must begin with a digit and will be evaluated to give a number of seconds, which may be a floating point number; in this case the read times out if input is not available within this time. If *num is not present, it is taken to be zero, so that* **read** *returns immediately if no input is available.* If no input is available, return status 1 and do not set any variables. This option is not available when reading from the editor buffer with **-z***, when called from within completion with* **-c** *or* **-l***, with* **-q** *which clears the input queue before reading, or within zle where* other mechanisms should be used to test for input. Note that read does not attempt to alter the input processing mode. The default mode is canonical input, in which an entire line is read at a time, so usually \\`**read -t***\\' will not read anything until an entire line has* been typed. However, when reading from the terminal with **-k** input is processed one key at a time; in this case, only availability of the first character is tested, so that e.g. \\`**read -t -k 2***\\' can still* block on the second character. Use two instances of \\`**read -t -k***\\' if* this is not what is wanted.\n>\n> If the first argument contains a \\`**?***\\', the remainder of this* word is used as a *prompt on standard error when the shell* is interactive.\n>\n> The value (exit status) of **read** *is 1 when an end-of-file is* encountered, or when **-c** *or* **-l** *is present and the command is* not called from a **compctl** *function, or as described for* **-q***.* Otherwise the value is 0.\n>\n> The behavior of some combinations of the **-k***,* **-p***,* **-q***,* **-u** and **-z** *flags is undefined. Presently* **-q** *cancels all the others,* **-p** *cancels* **-u***,* **-k** *cancels* **-z***, and otherwise* **-z** cancels both **-p** *and* **-u***.*\n>\n> The **-c** *or* **-l** *flags cancel any and all of* **-kpquz***.*",
+    "description": "*\\[* **-u** *n \\] \\[ \\[name\\]\\[***?***prompt\\] \\] \\[ name \\... \\]* Read one line and break it into fields using the characters in **\\$IFS** *as separators, except as noted below.* The first field is assigned to the first *name, the second field* to the second *name, etc., with leftover* fields assigned to the last *name.* If *name is omitted then* **REPLY** *is used for scalars and* **reply** *for arrays.*\n\n> **-r** Raw mode: a `**\\\\***` at the end of a line does not signify line* continuation and backslashes in the line don\\'t quote the following character and are not removed.\n>\n> **-s**\n>\n> :   Don\\'t echo back characters if reading from the terminal.\n>\n> **-q**\n>\n> :   Read only one character from the terminal and set *name to* `**y***` if this character was `***y***` or `***Y***` and to `***n***` otherwise.* With this flag set the return status is zero only if the character was `**y***` or `***Y***`. This option may be used with a timeout (see* **-t***); if* the read times out, or encounters end of file, status 2 is returned. Input is read from the terminal unless one of **-u** *or* **-p** *is present. This option* may also be used within zle widgets.\n>\n> **-k** *\\[ num \\]*\n>\n> :   Read only one (or *num) characters. All are assigned to the first* *name, without word splitting. This flag is ignored when* **-q** *is* present. Input is read from the terminal unless one of **-u** *or* **-p** is present. This option may also be used within zle widgets.\n>\n>     Note that despite the mnemonic `key` this option does read full characters, which may consist of multiple bytes if the option **MULTIBYTE** *is set.*\n>\n> **-z**\n>\n> :   Read one entry from the editor buffer stack and assign it to the first *name, without word splitting. Text is pushed onto the stack with* `**print -z***` or with* **push-line** *from the line editor (see* *zshzle(1)). This flag is ignored when the* **-k** *or* **-q** *flags are present.*\n>\n> **-e**\n>\n> **-E** The input read is printed (echoed) to the standard output. If the **-e** flag is used, no input is assigned to the parameters.\n>\n> **-A**\n>\n> :   The first *name is taken as the name of an array and all words are* assigned to it.\n>\n> **-c**\n>\n> **-l** These flags are allowed only if called inside a function used for completion (specified with the **-K** *flag to* **compctl***). If the* **-c** *flag is given, the words of the* current command are read. If the **-l** *flag is given, the whole* line is assigned as a scalar. If both flags are present, **-l** is used and **-c** *is ignored.*\n>\n> **-n**\n>\n> :   Together with **-c***, the number of the word the cursor is on is* read. With **-l***, the index of the character the cursor is on is* read. Note that the command name is word number 1, not word 0, and that when the cursor is at the end of the line, its character index is the length of the line plus one.\n>\n> **-u** *n*\n>\n> :   Input is read from file descriptor *n.*\n>\n> **-p**\n>\n> :   Input is read from the coprocess.\n>\n> **-d** *delim*\n>\n> :   Input is terminated by the first character of *delim instead of* by newline.\n>\n> **-t** *\\[ num \\]*\n>\n> :   Test if input is available before attempting to read. If *num* is present, it must begin with a digit and will be evaluated to give a number of seconds, which may be a floating point number; in this case the read times out if input is not available within this time. If *num is not present, it is taken to be zero, so that* **read** *returns immediately if no input is available.* If no input is available, return status 1 and do not set any variables. This option is not available when reading from the editor buffer with **-z***, when called from within completion with* **-c** *or* **-l***, with* **-q** *which clears the input queue before reading, or within zle where* other mechanisms should be used to test for input. Note that read does not attempt to alter the input processing mode. The default mode is canonical input, in which an entire line is read at a time, so usually `**read -t***` will not read anything until an entire line has* been typed. However, when reading from the terminal with **-k** input is processed one key at a time; in this case, only availability of the first character is tested, so that e.g. `**read -t -k 2***` can still* block on the second character. Use two instances of `**read -t -k***` if* this is not what is wanted.\n>\n> If the first argument contains a `**?***`, the remainder of this* word is used as a *prompt on standard error when the shell* is interactive.\n>\n> The value (exit status) of **read** *is 1 when an end-of-file is* encountered, or when **-c** *or* **-l** *is present and the command is* not called from a **compctl** *function, or as described for* **-q***.* Otherwise the value is 0.\n>\n> The behavior of some combinations of the **-k***,* **-p***,* **-q***,* **-u** and **-z** *flags is undefined. Presently* **-q** *cancels all the others,* **-p** *cancels* **-u***,* **-k** *cancels* **-z***, and otherwise* **-z** cancels both **-p** *and* **-u***.*\n>\n> The **-c** *or* **-l** *flags cancel any and all of* **-kpquz***.*",
     "args": "read [ -rszpqAclneE ] [ -t [ num ] ] [ -k [ num ] ] [ -d delim ]"
   },
   "readonly": {
@@ -302,25 +302,25 @@
     "args": "rehash"
   },
   "return": {
-    "description": ":   Causes a shell function or \\`**.***\\' script to return to* the invoking script with the return status specified by an arithmetic expression *n.* For example, the following prints \\`**42***\\':*\n\n    > () { integer foo=40; return \"foo + 2\" }\n    >     echo $?\n\n    If *n* is omitted, the return status is that of the last command executed.\n\n    If **return** *was executed from a trap in a* **TRAP***NAL function,* the effect is different for zero and non-zero return status. With zero status (or after an implicit return at the end of the trap), the shell will return to whatever it was previously processing; with a non-zero status, the shell will behave as interrupted except that the return status of the trap is retained. Note that the numeric value of the signal which caused the trap is passed as the first argument, so the statement \\`**return \\\"128+\\$1\\\"***\\' will return the same status as if the signal* had not been trapped.",
+    "description": ":   Causes a shell function or `**.***` script to return to* the invoking script with the return status specified by an arithmetic expression *n.* For example, the following prints `**42***`:*\n\n    > () { integer foo=40; return \"foo + 2\" }\n    >     echo $?\n\n    If *n* is omitted, the return status is that of the last command executed.\n\n    If **return** *was executed from a trap in a* **TRAP***NAL function,* the effect is different for zero and non-zero return status. With zero status (or after an implicit return at the end of the trap), the shell will return to whatever it was previously processing; with a non-zero status, the shell will behave as interrupted except that the return status of the trap is retained. Note that the numeric value of the signal which caused the trap is passed as the first argument, so the statement `**return \\\"128+\\$1\\\"***` will return the same status as if the signal* had not been trapped.",
     "args": "return [ n ]"
   },
   "sched": {
     "shortDescription": "Schedule commands",
-    "description": ":   See the section \\`The zsh/sched Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/sched Module` in *zshmodules(1).*",
     "args": "sched"
   },
   "set": {
-    "description": "*\\[ arg \\... \\]* Set the options for the shell and/or set the positional parameters, or declare and set an array. If the **-s** *option is given, it causes the* specified arguments to be sorted before assigning them to the positional parameters (or to the array *name if* **-A** *is used). With* **+s** sort arguments in descending order. For the meaning of the other flags, see *zshoptions(1). Flags may be specified by name using the* **-o** *option. If no option* name is supplied with **-o***, the current option states are printed: see* the description of **setopt** *below for more information on the format.* With **+o** *they are printed in a form that can be used as input* to the shell.\n\n> If the **-A** *flag is specified, name is set to an array containing* the given *args; if no name is specified, all arrays are printed* together with their values.\n>\n> If **+A** *is used and name is an array, the* given arguments will replace the initial elements of that array; if no *name is specified, all arrays are printed without their values.*\n>\n> The behaviour of arguments after **-A** *name or* **+A** *name* depends on whether the option **KSH_ARRAYS** *is set. If it is not set, all* arguments following *name are treated as values for the array,* regardless of their form. If the option is set, normal option processing continues at that point; only regular arguments are treated as values for the array. This means that\n>\n> > set -A array -x -- foo\n>\n> sets **array** *to \\`***-x -- foo***\\' if* **KSH_ARRAYS** *is not set, but sets* the array to **foo** *and turns on the option \\`***-x***\\' if it is set.*\n>\n> If the **-A** *flag is not present, but there are arguments beyond the* options, the positional parameters are set. If the option list (if any) is terminated by \\`**--***\\', and there are no further arguments, the* positional parameters will be unset.\n>\n> If no arguments and no \\`**--***\\' are given, then the names and values of* all parameters are printed on the standard output. If the only argument is \\`**+***\\', the names of all parameters are printed.*\n>\n> For historical reasons, \\`**set -***\\' is treated as \\`***set +xv***\\'* and \\`**set -** *args\\' as \\`***set +xv \\--** *args\\' when in* any other emulation mode than zsh\\'s native mode.",
+    "description": "*\\[ arg \\... \\]* Set the options for the shell and/or set the positional parameters, or declare and set an array. If the **-s** *option is given, it causes the* specified arguments to be sorted before assigning them to the positional parameters (or to the array *name if* **-A** *is used). With* **+s** sort arguments in descending order. For the meaning of the other flags, see *zshoptions(1). Flags may be specified by name using the* **-o** *option. If no option* name is supplied with **-o***, the current option states are printed: see* the description of **setopt** *below for more information on the format.* With **+o** *they are printed in a form that can be used as input* to the shell.\n\n> If the **-A** *flag is specified, name is set to an array containing* the given *args; if no name is specified, all arrays are printed* together with their values.\n>\n> If **+A** *is used and name is an array, the* given arguments will replace the initial elements of that array; if no *name is specified, all arrays are printed without their values.*\n>\n> The behaviour of arguments after **-A** *name or* **+A** *name* depends on whether the option **KSH_ARRAYS** *is set. If it is not set, all* arguments following *name are treated as values for the array,* regardless of their form. If the option is set, normal option processing continues at that point; only regular arguments are treated as values for the array. This means that\n>\n> > set -A array -x -- foo\n>\n> sets **array** *to `***-x -- foo***` if* **KSH_ARRAYS** *is not set, but sets* the array to **foo** *and turns on the option `***-x***` if it is set.*\n>\n> If the **-A** *flag is not present, but there are arguments beyond the* options, the positional parameters are set. If the option list (if any) is terminated by `**--***`, and there are no further arguments, the* positional parameters will be unset.\n>\n> If no arguments and no `**--***` are given, then the names and values of* all parameters are printed on the standard output. If the only argument is `**+***`, the names of all parameters are printed.*\n>\n> For historical reasons, `**set -***` is treated as `***set +xv***`* and `**set -** *args` as `***set +xv \\--** *args` when in* any other emulation mode than zsh\\'s native mode.",
     "args": "set [ {+|-}options | {+|-}o [ option_name ] ] ... [ {+|-}A [ name ] ]"
   },
   "setcap": {
     "shortDescription": "Set capabilities",
-    "description": ":   See the section \\`The zsh/cap Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/cap Module` in *zshmodules(1).*",
     "args": "setcap"
   },
   "setopt": {
-    "description": ":   Set the options for the shell. All options specified either with flags or by name are set.\n\n    If no arguments are supplied, the names of all options currently set are printed. The form is chosen so as to minimize the differences from the default options for the current emulation (the default emulation being native **zsh***, shown as* **\\<Z\\>** *in* *zshoptions(1)).* Options that are on by default for the emulation are shown with the prefix **no** *only if they are off, while other options are* shown without the prefix **no** *and only if they are on. In addition to* options changed from the default state by the user, any options activated automatically by the shell (for example, **SHIN_STDIN** *or* **INTERACTIVE***)* will be shown in the list. The format is further modified by the option **KSH_OPTION_PRINT***, however the rationale for choosing options with* or without the **no** *prefix remains the same in this case.*\n\n    If the **-m** *flag is given the arguments are taken as patterns* (which should be quoted to protect them from filename expansion), and all options with names matching these patterns are set.\n\n    Note that a bad option name does not cause execution of subsequent shell code to be aborted; this is behaviour is different from that of \\`**set** -o*\\'. This is because* **set** *is regarded as a special builtin by the* POSIX standard, but **setopt** *is not.*",
+    "description": ":   Set the options for the shell. All options specified either with flags or by name are set.\n\n    If no arguments are supplied, the names of all options currently set are printed. The form is chosen so as to minimize the differences from the default options for the current emulation (the default emulation being native **zsh***, shown as* **\\<Z\\>** *in* *zshoptions(1)).* Options that are on by default for the emulation are shown with the prefix **no** *only if they are off, while other options are* shown without the prefix **no** *and only if they are on. In addition to* options changed from the default state by the user, any options activated automatically by the shell (for example, **SHIN_STDIN** *or* **INTERACTIVE***)* will be shown in the list. The format is further modified by the option **KSH_OPTION_PRINT***, however the rationale for choosing options with* or without the **no** *prefix remains the same in this case.*\n\n    If the **-m** *flag is given the arguments are taken as patterns* (which should be quoted to protect them from filename expansion), and all options with names matching these patterns are set.\n\n    Note that a bad option name does not cause execution of subsequent shell code to be aborted; this is behaviour is different from that of `**set** -o*`. This is because* **set** *is regarded as a special builtin by the* POSIX standard, but **setopt** *is not.*",
     "args": "setopt [ {+|-}options | {+|-}o option_name ] [ -m ] [ name ... ]"
   },
   "shift": {
@@ -330,12 +330,12 @@
   },
   "source": {
     "shortDescription": "Source a file",
-    "description": ":   Same as \\`**.***\\', except that the current directory is always searched and* is always searched first, before directories in **\\$path***.*",
+    "description": ":   Same as `**.***`, except that the current directory is always searched and* is always searched first, before directories in **\\$path***.*",
     "args": "source file [ arg ... ]"
   },
   "stat": {
     "shortDescription": "Display file status",
-    "description": ":   See the section \\`The zsh/stat Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/stat Module` in *zshmodules(1).*",
     "args": "stat"
   },
   "suspend": {
@@ -344,7 +344,7 @@
   },
   "test": {
     "shortDescription": "Evaluate a conditional expression",
-    "description": "**\\[** *\\[ arg \\... \\]* **\\]** Like the system version of **test***. Added for compatibility;* use conditional expressions instead (see the section \\`Conditional Expressions\\'). The main differences between the conditional expression syntax and the **test** *and* **\\[** *builtins are: these commands are not handled* syntactically, so for example an empty variable expansion may cause an argument to be omitted; syntax errors cause status 2 to be returned instead of a shell error; and arithmetic operators expect integer arguments rather than arithmetic expressions.\n\n> The command attempts to implement POSIX and its extensions where these are specified. Unfortunately there are intrinsic ambiguities in the syntax; in particular there is no distinction between test operators and strings that resemble them. The standard attempts to resolve these for small numbers of arguments (up to four); for five or more arguments compatibility cannot be relied on. Users are urged wherever possible to use the \\`**\\[\\[***\\' test syntax which does not have these ambiguities.*",
+    "description": "**\\[** *\\[ arg \\... \\]* **\\]** Like the system version of **test***. Added for compatibility;* use conditional expressions instead (see the section `Conditional Expressions`). The main differences between the conditional expression syntax and the **test** *and* **\\[** *builtins are: these commands are not handled* syntactically, so for example an empty variable expansion may cause an argument to be omitted; syntax errors cause status 2 to be returned instead of a shell error; and arithmetic operators expect integer arguments rather than arithmetic expressions.\n\n> The command attempts to implement POSIX and its extensions where these are specified. Unfortunately there are intrinsic ambiguities in the syntax; in particular there is no distinction between test operators and strings that resemble them. The standard attempts to resolve these for small numbers of arguments (up to four); for five or more arguments compatibility cannot be relied on. Users are urged wherever possible to use the `**\\[\\[***` test syntax which does not have these ambiguities.*",
     "args": "test [ arg ... ]"
   },
   "times": {
@@ -354,7 +354,7 @@
   },
   "trap": {
     "shortDescription": "Set signal handlers",
-    "description": ":   *arg is a series of commands (usually quoted to protect it from* immediate evaluation by the shell) to be read and executed when the shell receives any of the signals specified by one or more *sig args.* Each *sig can be given as a number,* or as the name of a signal either with or without the string **SIG** in front (e.g. 1, HUP, and SIGHUP are all the same signal).\n\n    If *arg is \\`***-***\\', then the specified signals are reset to their* defaults, or, if no *sig args are present, all traps are reset.*\n\n    If *arg is an empty string, then the specified signals* are ignored by the shell (and by the commands it invokes).\n\n    If *arg is omitted but one or more sig args are provided (i.e.* the first argument is a valid signal number or name), the effect is the same as if *arg had been specified as \\`***-***\\'.*\n\n    The **trap** *command with no arguments prints a list of commands* associated with each signal.\n\n    If *sig is* **ZERR** *then arg will be executed* after each command with a nonzero exit status. **ERR** *is an alias* for **ZERR** *on systems that have no* **SIGERR** *signal (this is the* usual case).\n\n    If *sig is* **DEBUG** *then arg will be executed* before each command if the option **DEBUG_BEFORE_CMD** *is set* (as it is by default), else after each command. Here, a \\`command\\' is what is described as a \\`sublist\\' in the shell grammar, see the section SIMPLE COMMANDS & PIPELINES in *zshmisc(1).* If **DEBUG_BEFORE_CMD** *is set various additional features are available.* First, it is possible to skip the next command by setting the option **ERR_EXIT***; see the description of the* **ERR_EXIT** *option in* *zshoptions(1). Also, the shell parameter* **ZSH_DEBUG_CMD** *is set to the string corresponding to the command* to be executed following the trap. Note that this string is reconstructed from the internal format and may not be formatted the same way as the original text. The parameter is unset after the trap is executed.\n\n    If *sig is* **0** *or* **EXIT** and the **trap** *statement is executed inside the body of a function,* then the command *arg is executed after the function completes.* The value of **\\$?** *at the start of execution is the exit status of the* shell or the return status of the function exiting. If *sig is* **0** *or* **EXIT** and the **trap** *statement is not executed inside the body of a function,* then the command *arg is executed when the shell terminates; the* trap runs before any **zshexit** *hook functions.*\n\n    **ZERR***,* **DEBUG***, and* **EXIT** *traps are not executed inside other* traps. **ZERR** *and* **DEBUG** *traps are kept within subshells, while* other traps are reset.\n\n    Note that traps defined with the **trap** *builtin are slightly different* from those defined as \\`**TRAP***NAL () { \\... }\\', as the latter have* their own function environment (line numbers, local variables, etc.) while the former use the environment of the command in which they were called. For example,\n\n    > trap 'print $LINENO' DEBUG\n\n    will print the line number of a command executed after it has run, while\n\n    > TRAPDEBUG() { print $LINENO; }\n\n    will always print the number zero.\n\n    Alternative signal names are allowed as described under **kill** *above.* Defining a trap under either name causes any trap under an alternative name to be removed. However, it is recommended that for consistency users stick exclusively to one name or another.",
+    "description": ":   *arg is a series of commands (usually quoted to protect it from* immediate evaluation by the shell) to be read and executed when the shell receives any of the signals specified by one or more *sig args.* Each *sig can be given as a number,* or as the name of a signal either with or without the string **SIG** in front (e.g. 1, HUP, and SIGHUP are all the same signal).\n\n    If *arg is `***-***`, then the specified signals are reset to their* defaults, or, if no *sig args are present, all traps are reset.*\n\n    If *arg is an empty string, then the specified signals* are ignored by the shell (and by the commands it invokes).\n\n    If *arg is omitted but one or more sig args are provided (i.e.* the first argument is a valid signal number or name), the effect is the same as if *arg had been specified as `***-***`.*\n\n    The **trap** *command with no arguments prints a list of commands* associated with each signal.\n\n    If *sig is* **ZERR** *then arg will be executed* after each command with a nonzero exit status. **ERR** *is an alias* for **ZERR** *on systems that have no* **SIGERR** *signal (this is the* usual case).\n\n    If *sig is* **DEBUG** *then arg will be executed* before each command if the option **DEBUG_BEFORE_CMD** *is set* (as it is by default), else after each command. Here, a `command` is what is described as a `sublist` in the shell grammar, see the section SIMPLE COMMANDS & PIPELINES in *zshmisc(1).* If **DEBUG_BEFORE_CMD** *is set various additional features are available.* First, it is possible to skip the next command by setting the option **ERR_EXIT***; see the description of the* **ERR_EXIT** *option in* *zshoptions(1). Also, the shell parameter* **ZSH_DEBUG_CMD** *is set to the string corresponding to the command* to be executed following the trap. Note that this string is reconstructed from the internal format and may not be formatted the same way as the original text. The parameter is unset after the trap is executed.\n\n    If *sig is* **0** *or* **EXIT** and the **trap** *statement is executed inside the body of a function,* then the command *arg is executed after the function completes.* The value of **\\$?** *at the start of execution is the exit status of the* shell or the return status of the function exiting. If *sig is* **0** *or* **EXIT** and the **trap** *statement is not executed inside the body of a function,* then the command *arg is executed when the shell terminates; the* trap runs before any **zshexit** *hook functions.*\n\n    **ZERR***,* **DEBUG***, and* **EXIT** *traps are not executed inside other* traps. **ZERR** *and* **DEBUG** *traps are kept within subshells, while* other traps are reset.\n\n    Note that traps defined with the **trap** *builtin are slightly different* from those defined as `**TRAP***NAL () { \\... }`, as the latter have* their own function environment (line numbers, local variables, etc.) while the former use the environment of the command in which they were called. For example,\n\n    > trap 'print $LINENO' DEBUG\n\n    will print the line number of a command executed after it has run, while\n\n    > TRAPDEBUG() { print $LINENO; }\n\n    will always print the number zero.\n\n    Alternative signal names are allowed as described under **kill** *above.* Defining a trap under either name causes any trap under an alternative name to be removed. However, it is recommended that for consistency users stick exclusively to one name or another.",
     "args": "trap [ arg ] [ sig ... ]"
   },
   "true": {
@@ -374,12 +374,12 @@
   },
   "typeset": {
     "shortDescription": "Set or display parameter attributes/values",
-    "description": "*\\[* **+** *\\| SCALAR\\[***=***value\\] array\\[***=(***value \\...***)***\\] \\[ sep \\] \\]*\n\n**typeset** **-f** *\\[ {***+***\\|***-***}***TUkmtuz** *\\] \\[* **+** *\\] \\[ name \\... \\]* Set or display attributes and values for shell parameters.\n\n> Except as noted below for control flags that change the behavior, a parameter is created for each *name that does not already refer* to one. When inside a function, a new parameter is created for every *name (even those that already exist), and is unset again when the* function completes. See \\`Local Parameters\\' in *zshparam(1). The same rules apply to special shell parameters, which* retain their special attributes when made local.\n>\n> For each *name***=***value assignment, the parameter* *name is set to value. If the assignment is omitted and name* does *not refer to an existing parameter, a new parameter is intialized* to empty string, zero, or empty array (as appropriate), *unless the* shell option **TYPESET_TO_UNSET** *is set. When that option is set,* the parameter attributes are recorded but the parameter remains unset.\n>\n> If the shell option **TYPESET_SILENT** *is not set, for each remaining* *name that refers to a parameter that is already set, the name and* value of the parameter are printed in the form of an assignment. Nothing is printed for newly-created parameters, or when any attribute flags listed below are given along with the *name. Using* \\`**+***\\' instead of minus to introduce an attribute turns it off.*\n>\n> If no *name is present, the names and values of all parameters are* printed. In this case the attribute flags restrict the display to only those parameters that have the specified attributes, and using \\`**+***\\'* rather than \\`**-***\\' to introduce the flag suppresses printing of the values* of parameters when there is no parameter name.\n>\n> All forms of the command handle scalar assignment. Array assignment is possible if any of the reserved words **declare***,* **export***,* **float***,* **integer***,* **local***,* **readonly** *or* **typeset** *is matched when the* line is parsed (N.B. not when it is executed). In this case the arguments are parsed as assignments, except that the \\`**+=***\\' syntax and the* **GLOB_ASSIGN** *option are not supported, and scalar values after* **=** are *not split further into words, even if expanded (regardless of the* setting of the **KSH_TYPESET** *option; this option is obsolete).*\n>\n> Examples of the differences between command and reserved word parsing:\n>\n> > # Reserved word parsing\n> >     typeset svar=$(echo one word) avar=(several words)\n>\n> The above creates a scalar parameter **svar** *and an array* parameter **avar** *as if the assignments had been*\n>\n> > svar=\"one word\"\n> >     avar=(several words)\n>\n> On the other hand:\n>\n> > # Normal builtin interface\n> >     builtin typeset svar=$(echo two words)\n>\n> The **builtin** *keyword causes the above to use the standard builtin* interface to **typeset** *in which argument parsing is performed in the same* way as for other commands. This example creates a scalar **svar** containing the value **two** *and another scalar parameter* **words** *with* no value. An array value in this case would either cause an error or be treated as an obscure set of glob qualifiers.\n>\n> Arbitrary arguments are allowed if they take the form of assignments after command line expansion; however, these only perform scalar assignment:\n>\n> > var='svar=val'\n> >     typeset $var\n>\n> The above sets the scalar parameter **svar** *to the value* **val***.* Parentheses around the value within **var** *would not cause array* assignment as they will be treated as ordinary characters when **\\$var** is substituted. Any non-trivial expansion in the name part of the assignment causes the argument to be treated in this fashion:\n>\n> > typeset {var1,var2,var3}=name\n>\n> The above syntax is valid, and has the expected effect of setting the three parameters to the same value, but the command line is parsed as a set of three normal command line arguments to **typeset** *after* expansion. Hence it is not possible to assign to multiple arrays by this means.\n>\n> Note that each interface to any of the commands may be disabled separately. For example, \\`**disable -r typeset***\\' disables the reserved* word interface to **typeset***, exposing the builtin interface, while* \\`**disable typeset***\\' disables the builtin. Note that disabling the* reserved word interface for **typeset** *may cause problems with the* output of \\`**typeset -p***\\', which assumes the reserved word interface is* available in order to restore array and associative array values.\n>\n> Unlike parameter assignment statements, **typeset***\\'s exit status on an* assignment that involves a command substitution does not reflect the exit status of the command substitution. Therefore, to test for an error in a command substitution, separate the declaration of the parameter from its initialization:\n>\n> > # WRONG\n> >     typeset var1=$(exit 1) || echo \"Trouble with var1\"\n> >\n> >     # RIGHT\n> >     typeset var1 && var1=$(exit 1) || echo \"Trouble with var1\"\n>\n> To initialize a parameter *param to a command output and mark it readonly,* use **typeset -r** *param or* **readonly** *param after the parameter* assignment statement.\n>\n> If no attribute flags are given, and either no *name arguments are* present or the flag **+m** *is used, then each parameter name printed is* preceded by a list of the attributes of that parameter (**array***,* **association***,* **exported***,* **float***,* **integer***,* **readonly***,* or **undefined** *for autoloaded parameters not yet loaded). If* **+m** *is* used with attribute flags, and all those flags are introduced with **+***, the matching parameter names are printed but their values* are not.\n>\n> The following control flags change the behavior of **typeset***:*\n>\n> **+** If \\`**+***\\' appears by itself in a separate word as the last option,* then the names of all parameters (functions with **-f***) are printed, but* the values (function bodies) are not. No *name arguments may appear,* and it is an error for any other options to follow \\`**+***\\'. The* effect of \\`**+***\\' is as if all attribute flags which precede it were* given with a \\`**+***\\' prefix. For example, \\`***typeset -U +***\\' is* equivalent to \\`**typeset +U***\\' and displays the names of all arrays having* the uniqueness attribute, whereas \\`**typeset -f -U +***\\' displays the* names of all autoloadable functions. If **+** *is the only option,* then type information (array, readonly, etc.) is also printed for each parameter, in the same manner as \\`**typeset +m \\\"\\*\\\"***\\'.*\n>\n> **-g**\n>\n> :   The **-g** *(global) means that any resulting parameter will not be* restricted to local scope. Note that this does not necessarily mean that the parameter will be global, as the flag will apply to any existing parameter (even if unset) from an enclosing function. This flag does not affect the parameter after creation, hence it has no effect when listing existing parameters, nor does the flag **+g** *have any effect except in* combination with **-m** *(see below).*\n>\n> **-m**\n>\n> :   If the **-m** *flag is given the name arguments are taken as patterns* (use quoting to prevent these from being interpreted as file patterns). With no attribute flags, all parameters (or functions with the **-f** flag) with matching names are printed (the shell option **TYPESET_SILENT** is not used in this case).\n>\n>     If the **+g** *flag is combined with* **-m***, a new local parameter is* created for every matching parameter that is not already local. Otherwise **-m** *applies all other flags or assignments to the existing parameters.*\n>\n>     Except when assignments are made with *name***=***value, using* **+m** *forces the matching parameters and their attributes to be printed,* even inside a function. Note that **-m** *is ignored if no patterns are* given, so \\`**typeset -m***\\' displays attributes but \\`***typeset -a +m***\\'* does not.\n>\n> **-p** *\\[ n \\]*\n>\n> :   If the **-p** *option is given, parameters and values are printed in the* form of a typeset command with an assignment, regardless of other flags and options. Note that the **-H** *flag on parameters is respected; no* value will be shown for these parameters.\n>\n>     **-p** *may be followed by an optional integer argument. Currently* only the value **1** *is supported. In this case arrays and associative* arrays are printed with newlines between indented elements for readability.\n>\n> **-T** *\\[ scalar\\[***=***value\\] array\\[***=(***value \\...***)***\\] \\[ sep \\] \\]*\n>\n> :   This flag has a different meaning when used with **-f***; see below.* Otherwise the **-T** *option requires zero, two, or three arguments to be* present. With no arguments, the list of parameters created in this fashion is shown. With two or three arguments, the first two are the name of a scalar and of an array parameter (in that order) that will be tied together in the manner of **\\$PATH** *and* **\\$path***. The optional third* argument is a single-character separator which will be used to join the elements of the array to form the scalar; if absent, a colon is used, as with **\\$PATH***. Only the first character of the separator is significant;* any remaining characters are ignored. Multibyte characters are not yet supported.\n>\n>     Only one of the scalar and array parameters may be assigned an initial value (the restrictions on assignment forms described above also apply).\n>\n>     Both the scalar and the array may be manipulated as normal. If one is unset, the other will automatically be unset too. There is no way of untying the variables without unsetting them, nor of converting the type of one of them with another **typeset** *command;* **+T** *does not work,* assigning an array to *scalar is an error, and assigning a scalar to* *array sets it to be a single-element array.*\n>\n>     Note that both \\`**typeset -xT \\...***\\' and \\`***export -T \\...***\\' work, but* only the scalar will be marked for export. Setting the value using the scalar version causes a split on all separators (which cannot be quoted). It is possible to apply **-T** *to two previously tied variables but with a* different separator character, in which case the variables remain joined as before but the separator is changed.\n>\n>     When an existing scalar is tied to a new array, the value of the scalar is preserved but no attribute other than export will be preserved.\n>\n> Attribute flags that transform the final value (**-L***,* **-R***,* **-Z***,* **-l***,* **-u***) are only applied to the expanded value at the point* of a parameter expansion expression using \\`**\\$***\\'. They are not applied* when a parameter is retrieved internally by the shell for any purpose.\n>\n> The following attribute flags may be specified:\n>\n> **-A** The names refer to associative array parameters; see \\`Array Parameters\\' in *zshparam(1).*\n>\n> **-L** *\\[ n \\]*\n>\n> :   Left justify and remove leading blanks from the value when the parameter is expanded. If *n is nonzero, it defines the width of the field.* If *n is zero, the width is determined by the width of the value of* the first assignment. In the case of numeric parameters, the length of the complete value assigned to the parameter is used to determine the width, not the value that would be output.\n>\n>     The width is the count of characters, which may be multibyte characters if the **MULTIBYTE** *option is in effect. Note that the screen* width of the character is not taken into account; if this is required, use padding with parameter expansion flags **\\${(ml***\\...***)***\\...***}** *as described in* \\`Parameter Expansion Flags\\' in *zshexpn(1).*\n>\n>     When the parameter is expanded, it is filled on the right with blanks or truncated if necessary to fit the field. Note truncation can lead to unexpected results with numeric parameters. Leading zeros are removed if the **-Z** *flag is also set.*\n>\n> **-R** *\\[ n \\]*\n>\n> :   Similar to **-L***, except that right justification is used;* when the parameter is expanded, the field is left filled with blanks or truncated from the end. May not be combined with the **-Z** flag.\n>\n> **-U**\n>\n> :   For arrays (but not for associative arrays), keep only the first occurrence of each duplicated value. This may also be set for tied parameters (see **-T***) or colon-separated special parameters like* **PATH** *or* **FIGNORE***, etc. Note the flag takes effect on assignment,* and the type of the variable being assigned to is determinative; for variables with shared values it is therefore recommended to set the flag for all interfaces, e.g. \\`**typeset -U PATH path***\\'.*\n>\n>     This flag has a different meaning when used with **-f***; see below.*\n>\n> **-Z** *\\[ n \\]*\n>\n> :   Specially handled if set along with the **-L** *flag.* Otherwise, similar to **-R***, except that leading zeros are used for* padding instead of blanks if the first non-blank character is a digit. Numeric parameters are specially handled: they are always eligible for padding with zeroes, and the zeroes are inserted at an appropriate place in the output.\n>\n> **-a**\n>\n> :   The names refer to array parameters. An array parameter may be created this way, but it may be assigned to in the **typeset** statement only if the reserved word form of **typeset** *is enabled* (as it is by default). When displaying, both normal and associative arrays are shown.\n>\n> **-f**\n>\n> :   The names refer to functions rather than parameters. No assignments can be made, and the only other valid flags are **-t***,* **-T***,* **-k***,* **-u***,* **-U** *and* **-z***. The flag* **-t** *turns on execution tracing* for this function; the flag **-T** *does the same, but turns off tracing* for any named (not anonymous) function called from the present one, unless that function also has the **-t** *or* **-T** *flag. The* **-u** *and* **-U** *flags cause the* function to be marked for autoloading; **-U** *also causes alias* expansion to be suppressed when the function is loaded. See the description of the \\`**autoload***\\' builtin for details.*\n>\n>     Note that the builtin **functions** *provides the same basic capabilities* as **typeset -f** *but gives access to a few extra options;* **autoload** gives further additional options for the case **typeset -fu** *and* **typeset -fU***.*\n>\n> **-h**\n>\n> :   Hide: only useful for special parameters (those marked \\`\\<S\\>\\' in the table in *zshparam(1)), and for local parameters with the same name as a special parameter,* though harmless for others. A special parameter with this attribute will not retain its special effect when made local. Thus after \\`**typeset -h** PATH*\\', a function containing \\`***typeset PATH***\\' will create an ordinary* local parameter without the usual behaviour of **PATH***. Alternatively,* the local parameter may itself be given this attribute; hence inside a function \\`**typeset -h PATH***\\' creates an ordinary local parameter and the* special **PATH** *parameter is not altered in any way. It is also possible* to create a local parameter using \\`**typeset +h** *special\\', where the* local copy of *special will retain its special properties regardless of* having the **-h** *attribute. Global special parameters loaded from shell* modules (currently those in **zsh/mapfile** *and* **zsh/parameter***) are* automatically given the **-h** *attribute to avoid name clashes.*\n>\n> **-H**\n>\n> :   Hide value: specifies that **typeset** *will not display the value of the* parameter when listing parameters; the display for such parameters is always as if the \\`**+***\\' flag had been given. Use of the parameter is* in other respects normal, and the option does not apply if the parameter is specified by name, or by pattern with the **-m** *option. This is on by* default for the parameters in the **zsh/parameter** *and* **zsh/mapfile** modules. Note, however, that unlike the **-h** *flag this is also useful* for non-special parameters.\n>\n> **-i** *\\[ n \\]*\n>\n> :   Use an internal integer representation. If *n is nonzero it* defines the output arithmetic base, otherwise it is determined by the first assignment. Bases from 2 to 36 inclusive are allowed.\n>\n> **-E** *\\[ n \\]*\n>\n> :   Use an internal double-precision floating point representation. On output the variable will be converted to scientific notation. If *n is* nonzero it defines the number of significant figures to display; the default is ten.\n>\n> **-F** *\\[ n \\]*\n>\n> :   Use an internal double-precision floating point representation. On output the variable will be converted to fixed-point decimal notation. If *n* is nonzero it defines the number of digits to display after the decimal point; the default is ten.\n>\n> **-l**\n>\n> :   Convert the result to lower case whenever the parameter is expanded. The value is *not converted when assigned.*\n>\n> **-r**\n>\n> :   The given *names are marked readonly. Note that if name is a* special parameter, the readonly attribute can be turned on, but cannot then be turned off.\n>\n>     If the **POSIX_BUILTINS** *option is set, the readonly attribute is* more restrictive: unset variables can be marked readonly and cannot then be set; furthermore, the readonly attribute cannot be removed from any variable.\n>\n>     It is still possible to change other attributes of the variable though, some of which like **-U** *or* **-Z** *would affect the value. More generally,* the readonly attribute should not be relied on as a security mechanism.\n>\n>     Note that in zsh (like in pdksh but unlike most other shells) it is still possible to create a local variable of the same name as this is considered a different variable (though this variable, too, can be marked readonly). Special variables that have been made readonly retain their value and readonly attribute when made local.\n>\n> **-t**\n>\n> :   Tags the named parameters. Tags have no special meaning to the shell. This flag has a different meaning when used with **-f***; see above.*\n>\n> **-u**\n>\n> :   Convert the result to upper case whenever the parameter is expanded. The value is *not converted when assigned.* This flag has a different meaning when used with **-f***; see above.*\n>\n> **-x**\n>\n> :   Mark for automatic export to the environment of subsequently executed commands. If the option **GLOBAL_EXPORT** *is set, this implies* the option **-g***, unless* **+g** *is also explicitly given; in other words* the parameter is not made local to the enclosing function. This is for compatibility with previous versions of zsh.",
+    "description": "*\\[* **+** *\\| SCALAR\\[***=***value\\] array\\[***=(***value \\...***)***\\] \\[ sep \\] \\]*\n\n**typeset** **-f** *\\[ {***+***\\|***-***}***TUkmtuz** *\\] \\[* **+** *\\] \\[ name \\... \\]* Set or display attributes and values for shell parameters.\n\n> Except as noted below for control flags that change the behavior, a parameter is created for each *name that does not already refer* to one. When inside a function, a new parameter is created for every *name (even those that already exist), and is unset again when the* function completes. See `Local Parameters` in *zshparam(1). The same rules apply to special shell parameters, which* retain their special attributes when made local.\n>\n> For each *name***=***value assignment, the parameter* *name is set to value. If the assignment is omitted and name* does *not refer to an existing parameter, a new parameter is intialized* to empty string, zero, or empty array (as appropriate), *unless the* shell option **TYPESET_TO_UNSET** *is set. When that option is set,* the parameter attributes are recorded but the parameter remains unset.\n>\n> If the shell option **TYPESET_SILENT** *is not set, for each remaining* *name that refers to a parameter that is already set, the name and* value of the parameter are printed in the form of an assignment. Nothing is printed for newly-created parameters, or when any attribute flags listed below are given along with the *name. Using* `**+***` instead of minus to introduce an attribute turns it off.*\n>\n> If no *name is present, the names and values of all parameters are* printed. In this case the attribute flags restrict the display to only those parameters that have the specified attributes, and using `**+***`* rather than `**-***` to introduce the flag suppresses printing of the values* of parameters when there is no parameter name.\n>\n> All forms of the command handle scalar assignment. Array assignment is possible if any of the reserved words **declare***,* **export***,* **float***,* **integer***,* **local***,* **readonly** *or* **typeset** *is matched when the* line is parsed (N.B. not when it is executed). In this case the arguments are parsed as assignments, except that the `**+=***` syntax and the* **GLOB_ASSIGN** *option are not supported, and scalar values after* **=** are *not split further into words, even if expanded (regardless of the* setting of the **KSH_TYPESET** *option; this option is obsolete).*\n>\n> Examples of the differences between command and reserved word parsing:\n>\n> > # Reserved word parsing\n> >     typeset svar=$(echo one word) avar=(several words)\n>\n> The above creates a scalar parameter **svar** *and an array* parameter **avar** *as if the assignments had been*\n>\n> > svar=\"one word\"\n> >     avar=(several words)\n>\n> On the other hand:\n>\n> > # Normal builtin interface\n> >     builtin typeset svar=$(echo two words)\n>\n> The **builtin** *keyword causes the above to use the standard builtin* interface to **typeset** *in which argument parsing is performed in the same* way as for other commands. This example creates a scalar **svar** containing the value **two** *and another scalar parameter* **words** *with* no value. An array value in this case would either cause an error or be treated as an obscure set of glob qualifiers.\n>\n> Arbitrary arguments are allowed if they take the form of assignments after command line expansion; however, these only perform scalar assignment:\n>\n> > var='svar=val'\n> >     typeset $var\n>\n> The above sets the scalar parameter **svar** *to the value* **val***.* Parentheses around the value within **var** *would not cause array* assignment as they will be treated as ordinary characters when **\\$var** is substituted. Any non-trivial expansion in the name part of the assignment causes the argument to be treated in this fashion:\n>\n> > typeset {var1,var2,var3}=name\n>\n> The above syntax is valid, and has the expected effect of setting the three parameters to the same value, but the command line is parsed as a set of three normal command line arguments to **typeset** *after* expansion. Hence it is not possible to assign to multiple arrays by this means.\n>\n> Note that each interface to any of the commands may be disabled separately. For example, `**disable -r typeset***` disables the reserved* word interface to **typeset***, exposing the builtin interface, while* `**disable typeset***` disables the builtin. Note that disabling the* reserved word interface for **typeset** *may cause problems with the* output of `**typeset -p***`, which assumes the reserved word interface is* available in order to restore array and associative array values.\n>\n> Unlike parameter assignment statements, **typeset***\\'s exit status on an* assignment that involves a command substitution does not reflect the exit status of the command substitution. Therefore, to test for an error in a command substitution, separate the declaration of the parameter from its initialization:\n>\n> > # WRONG\n> >     typeset var1=$(exit 1) || echo \"Trouble with var1\"\n> >\n> >     # RIGHT\n> >     typeset var1 && var1=$(exit 1) || echo \"Trouble with var1\"\n>\n> To initialize a parameter *param to a command output and mark it readonly,* use **typeset -r** *param or* **readonly** *param after the parameter* assignment statement.\n>\n> If no attribute flags are given, and either no *name arguments are* present or the flag **+m** *is used, then each parameter name printed is* preceded by a list of the attributes of that parameter (**array***,* **association***,* **exported***,* **float***,* **integer***,* **readonly***,* or **undefined** *for autoloaded parameters not yet loaded). If* **+m** *is* used with attribute flags, and all those flags are introduced with **+***, the matching parameter names are printed but their values* are not.\n>\n> The following control flags change the behavior of **typeset***:*\n>\n> **+** If `**+***` appears by itself in a separate word as the last option,* then the names of all parameters (functions with **-f***) are printed, but* the values (function bodies) are not. No *name arguments may appear,* and it is an error for any other options to follow `**+***`. The* effect of `**+***` is as if all attribute flags which precede it were* given with a `**+***` prefix. For example, `***typeset -U +***` is* equivalent to `**typeset +U***` and displays the names of all arrays having* the uniqueness attribute, whereas `**typeset -f -U +***` displays the* names of all autoloadable functions. If **+** *is the only option,* then type information (array, readonly, etc.) is also printed for each parameter, in the same manner as `**typeset +m \\\"\\*\\\"***`.*\n>\n> **-g**\n>\n> :   The **-g** *(global) means that any resulting parameter will not be* restricted to local scope. Note that this does not necessarily mean that the parameter will be global, as the flag will apply to any existing parameter (even if unset) from an enclosing function. This flag does not affect the parameter after creation, hence it has no effect when listing existing parameters, nor does the flag **+g** *have any effect except in* combination with **-m** *(see below).*\n>\n> **-m**\n>\n> :   If the **-m** *flag is given the name arguments are taken as patterns* (use quoting to prevent these from being interpreted as file patterns). With no attribute flags, all parameters (or functions with the **-f** flag) with matching names are printed (the shell option **TYPESET_SILENT** is not used in this case).\n>\n>     If the **+g** *flag is combined with* **-m***, a new local parameter is* created for every matching parameter that is not already local. Otherwise **-m** *applies all other flags or assignments to the existing parameters.*\n>\n>     Except when assignments are made with *name***=***value, using* **+m** *forces the matching parameters and their attributes to be printed,* even inside a function. Note that **-m** *is ignored if no patterns are* given, so `**typeset -m***` displays attributes but `***typeset -a +m***`* does not.\n>\n> **-p** *\\[ n \\]*\n>\n> :   If the **-p** *option is given, parameters and values are printed in the* form of a typeset command with an assignment, regardless of other flags and options. Note that the **-H** *flag on parameters is respected; no* value will be shown for these parameters.\n>\n>     **-p** *may be followed by an optional integer argument. Currently* only the value **1** *is supported. In this case arrays and associative* arrays are printed with newlines between indented elements for readability.\n>\n> **-T** *\\[ scalar\\[***=***value\\] array\\[***=(***value \\...***)***\\] \\[ sep \\] \\]*\n>\n> :   This flag has a different meaning when used with **-f***; see below.* Otherwise the **-T** *option requires zero, two, or three arguments to be* present. With no arguments, the list of parameters created in this fashion is shown. With two or three arguments, the first two are the name of a scalar and of an array parameter (in that order) that will be tied together in the manner of **\\$PATH** *and* **\\$path***. The optional third* argument is a single-character separator which will be used to join the elements of the array to form the scalar; if absent, a colon is used, as with **\\$PATH***. Only the first character of the separator is significant;* any remaining characters are ignored. Multibyte characters are not yet supported.\n>\n>     Only one of the scalar and array parameters may be assigned an initial value (the restrictions on assignment forms described above also apply).\n>\n>     Both the scalar and the array may be manipulated as normal. If one is unset, the other will automatically be unset too. There is no way of untying the variables without unsetting them, nor of converting the type of one of them with another **typeset** *command;* **+T** *does not work,* assigning an array to *scalar is an error, and assigning a scalar to* *array sets it to be a single-element array.*\n>\n>     Note that both `**typeset -xT \\...***` and `***export -T \\...***` work, but* only the scalar will be marked for export. Setting the value using the scalar version causes a split on all separators (which cannot be quoted). It is possible to apply **-T** *to two previously tied variables but with a* different separator character, in which case the variables remain joined as before but the separator is changed.\n>\n>     When an existing scalar is tied to a new array, the value of the scalar is preserved but no attribute other than export will be preserved.\n>\n> Attribute flags that transform the final value (**-L***,* **-R***,* **-Z***,* **-l***,* **-u***) are only applied to the expanded value at the point* of a parameter expansion expression using `**\\$***`. They are not applied* when a parameter is retrieved internally by the shell for any purpose.\n>\n> The following attribute flags may be specified:\n>\n> **-A** The names refer to associative array parameters; see `Array Parameters` in *zshparam(1).*\n>\n> **-L** *\\[ n \\]*\n>\n> :   Left justify and remove leading blanks from the value when the parameter is expanded. If *n is nonzero, it defines the width of the field.* If *n is zero, the width is determined by the width of the value of* the first assignment. In the case of numeric parameters, the length of the complete value assigned to the parameter is used to determine the width, not the value that would be output.\n>\n>     The width is the count of characters, which may be multibyte characters if the **MULTIBYTE** *option is in effect. Note that the screen* width of the character is not taken into account; if this is required, use padding with parameter expansion flags **\\${(ml***\\...***)***\\...***}** *as described in* `Parameter Expansion Flags` in *zshexpn(1).*\n>\n>     When the parameter is expanded, it is filled on the right with blanks or truncated if necessary to fit the field. Note truncation can lead to unexpected results with numeric parameters. Leading zeros are removed if the **-Z** *flag is also set.*\n>\n> **-R** *\\[ n \\]*\n>\n> :   Similar to **-L***, except that right justification is used;* when the parameter is expanded, the field is left filled with blanks or truncated from the end. May not be combined with the **-Z** flag.\n>\n> **-U**\n>\n> :   For arrays (but not for associative arrays), keep only the first occurrence of each duplicated value. This may also be set for tied parameters (see **-T***) or colon-separated special parameters like* **PATH** *or* **FIGNORE***, etc. Note the flag takes effect on assignment,* and the type of the variable being assigned to is determinative; for variables with shared values it is therefore recommended to set the flag for all interfaces, e.g. `**typeset -U PATH path***`.*\n>\n>     This flag has a different meaning when used with **-f***; see below.*\n>\n> **-Z** *\\[ n \\]*\n>\n> :   Specially handled if set along with the **-L** *flag.* Otherwise, similar to **-R***, except that leading zeros are used for* padding instead of blanks if the first non-blank character is a digit. Numeric parameters are specially handled: they are always eligible for padding with zeroes, and the zeroes are inserted at an appropriate place in the output.\n>\n> **-a**\n>\n> :   The names refer to array parameters. An array parameter may be created this way, but it may be assigned to in the **typeset** statement only if the reserved word form of **typeset** *is enabled* (as it is by default). When displaying, both normal and associative arrays are shown.\n>\n> **-f**\n>\n> :   The names refer to functions rather than parameters. No assignments can be made, and the only other valid flags are **-t***,* **-T***,* **-k***,* **-u***,* **-U** *and* **-z***. The flag* **-t** *turns on execution tracing* for this function; the flag **-T** *does the same, but turns off tracing* for any named (not anonymous) function called from the present one, unless that function also has the **-t** *or* **-T** *flag. The* **-u** *and* **-U** *flags cause the* function to be marked for autoloading; **-U** *also causes alias* expansion to be suppressed when the function is loaded. See the description of the `**autoload***` builtin for details.*\n>\n>     Note that the builtin **functions** *provides the same basic capabilities* as **typeset -f** *but gives access to a few extra options;* **autoload** gives further additional options for the case **typeset -fu** *and* **typeset -fU***.*\n>\n> **-h**\n>\n> :   Hide: only useful for special parameters (those marked `\\<S\\>` in the table in *zshparam(1)), and for local parameters with the same name as a special parameter,* though harmless for others. A special parameter with this attribute will not retain its special effect when made local. Thus after `**typeset -h** PATH*`, a function containing `***typeset PATH***` will create an ordinary* local parameter without the usual behaviour of **PATH***. Alternatively,* the local parameter may itself be given this attribute; hence inside a function `**typeset -h PATH***` creates an ordinary local parameter and the* special **PATH** *parameter is not altered in any way. It is also possible* to create a local parameter using `**typeset +h** *special`, where the* local copy of *special will retain its special properties regardless of* having the **-h** *attribute. Global special parameters loaded from shell* modules (currently those in **zsh/mapfile** *and* **zsh/parameter***) are* automatically given the **-h** *attribute to avoid name clashes.*\n>\n> **-H**\n>\n> :   Hide value: specifies that **typeset** *will not display the value of the* parameter when listing parameters; the display for such parameters is always as if the `**+***` flag had been given. Use of the parameter is* in other respects normal, and the option does not apply if the parameter is specified by name, or by pattern with the **-m** *option. This is on by* default for the parameters in the **zsh/parameter** *and* **zsh/mapfile** modules. Note, however, that unlike the **-h** *flag this is also useful* for non-special parameters.\n>\n> **-i** *\\[ n \\]*\n>\n> :   Use an internal integer representation. If *n is nonzero it* defines the output arithmetic base, otherwise it is determined by the first assignment. Bases from 2 to 36 inclusive are allowed.\n>\n> **-E** *\\[ n \\]*\n>\n> :   Use an internal double-precision floating point representation. On output the variable will be converted to scientific notation. If *n is* nonzero it defines the number of significant figures to display; the default is ten.\n>\n> **-F** *\\[ n \\]*\n>\n> :   Use an internal double-precision floating point representation. On output the variable will be converted to fixed-point decimal notation. If *n* is nonzero it defines the number of digits to display after the decimal point; the default is ten.\n>\n> **-l**\n>\n> :   Convert the result to lower case whenever the parameter is expanded. The value is *not converted when assigned.*\n>\n> **-r**\n>\n> :   The given *names are marked readonly. Note that if name is a* special parameter, the readonly attribute can be turned on, but cannot then be turned off.\n>\n>     If the **POSIX_BUILTINS** *option is set, the readonly attribute is* more restrictive: unset variables can be marked readonly and cannot then be set; furthermore, the readonly attribute cannot be removed from any variable.\n>\n>     It is still possible to change other attributes of the variable though, some of which like **-U** *or* **-Z** *would affect the value. More generally,* the readonly attribute should not be relied on as a security mechanism.\n>\n>     Note that in zsh (like in pdksh but unlike most other shells) it is still possible to create a local variable of the same name as this is considered a different variable (though this variable, too, can be marked readonly). Special variables that have been made readonly retain their value and readonly attribute when made local.\n>\n> **-t**\n>\n> :   Tags the named parameters. Tags have no special meaning to the shell. This flag has a different meaning when used with **-f***; see above.*\n>\n> **-u**\n>\n> :   Convert the result to upper case whenever the parameter is expanded. The value is *not converted when assigned.* This flag has a different meaning when used with **-f***; see above.*\n>\n> **-x**\n>\n> :   Mark for automatic export to the environment of subsequently executed commands. If the option **GLOBAL_EXPORT** *is set, this implies* the option **-g***, unless* **+g** *is also explicitly given; in other words* the parameter is not made local to the enclosing function. This is for compatibility with previous versions of zsh.",
     "args": "typeset -T [ {+|-}Uglrux ] [ {+|-}LRZp [ n ] ]"
   },
   "ulimit": {
     "shortDescription": "Set or display resource limits",
-    "description": ":   Set or display resource limits of the shell and the processes started by the shell. The value of *limit can be a number in the unit specified* below or one of the values \\`**unlimited***\\', which removes the limit on the* resource, or \\`**hard***\\', which uses the current value of the hard limit on* the resource.\n\n    By default, only soft limits are manipulated. If the **-H** *flag* is given use hard limits instead of soft limits. If the **-S** *flag is given* together with the **-H** *flag set both hard and soft limits.*\n\n    If no options are used, the file size limit (**-f***) is assumed.*\n\n    If *limit is omitted the current value of the specified resources are* printed. When more than one resource value is printed, the limit name and unit is printed before each value.\n\n    When looping over multiple resources, the shell will abort immediately if it detects a badly formed argument. However, if it fails to set a limit for some other reason it will continue trying to set the remaining limits.\n\n    Not all the following resources are supported on all systems. Running **ulimit -a** *will show which are supported.*\n\n    **-a**\n\n    :   Lists all of the current resource limits.\n\n    **-b**\n\n    :   Socket buffer size in bytes (N.B. not kilobytes)\n\n    **-c**\n\n    :   512-byte blocks on the size of core dumps.\n\n    **-d**\n\n    :   Kilobytes on the size of the data segment.\n\n    **-f**\n\n    :   512-byte blocks on the size of files written.\n\n    **-i**\n\n    :   The number of pending signals.\n\n    **-k**\n\n    :   The number of kqueues allocated.\n\n    **-l**\n\n    :   Kilobytes on the size of locked-in memory.\n\n    **-m**\n\n    :   Kilobytes on the size of physical memory.\n\n    **-n**\n\n    :   open file descriptors.\n\n    **-p**\n\n    :   The number of pseudo-terminals.\n\n    **-q**\n\n    :   Bytes in POSIX message queues.\n\n    **-r**\n\n    :   Maximum real time priority. On some systems where this is not available, such as NetBSD, this has the same effect as **-T** for compatibility with **sh***.*\n\n    **-s**\n\n    :   Kilobytes on the size of the stack.\n\n    **-T**\n\n    :   The number of simultaneous threads available to the user.\n\n    **-t**\n\n    :   CPU seconds to be used.\n\n    **-u**\n\n    :   The number of processes available to the user.\n\n    **-v**\n\n    :   Kilobytes on the size of virtual memory. On some systems this refers to the limit called \\`address space\\'.\n\n    **-w**\n\n    :   Kilobytes on the size of swapped out memory.\n\n    **-x**\n\n    :   The number of locks on files.\n\n    A resource may also be specified by integer in the form \\`**-N** *resource\\', where resource corresponds to the integer defined for* the resource by the operating system. This may be used to set the limits for resources known to the shell which do not correspond to option letters. Such limits will be shown by number in the output of \\`**ulimit -a***\\'.*\n\n    The number may alternatively be out of the range of limits compiled into the shell. The shell will try to read or write the limit anyway, and will report an error if this fails.",
+    "description": ":   Set or display resource limits of the shell and the processes started by the shell. The value of *limit can be a number in the unit specified* below or one of the values `**unlimited***`, which removes the limit on the* resource, or `**hard***`, which uses the current value of the hard limit on* the resource.\n\n    By default, only soft limits are manipulated. If the **-H** *flag* is given use hard limits instead of soft limits. If the **-S** *flag is given* together with the **-H** *flag set both hard and soft limits.*\n\n    If no options are used, the file size limit (**-f***) is assumed.*\n\n    If *limit is omitted the current value of the specified resources are* printed. When more than one resource value is printed, the limit name and unit is printed before each value.\n\n    When looping over multiple resources, the shell will abort immediately if it detects a badly formed argument. However, if it fails to set a limit for some other reason it will continue trying to set the remaining limits.\n\n    Not all the following resources are supported on all systems. Running **ulimit -a** *will show which are supported.*\n\n    **-a**\n\n    :   Lists all of the current resource limits.\n\n    **-b**\n\n    :   Socket buffer size in bytes (N.B. not kilobytes)\n\n    **-c**\n\n    :   512-byte blocks on the size of core dumps.\n\n    **-d**\n\n    :   Kilobytes on the size of the data segment.\n\n    **-f**\n\n    :   512-byte blocks on the size of files written.\n\n    **-i**\n\n    :   The number of pending signals.\n\n    **-k**\n\n    :   The number of kqueues allocated.\n\n    **-l**\n\n    :   Kilobytes on the size of locked-in memory.\n\n    **-m**\n\n    :   Kilobytes on the size of physical memory.\n\n    **-n**\n\n    :   open file descriptors.\n\n    **-p**\n\n    :   The number of pseudo-terminals.\n\n    **-q**\n\n    :   Bytes in POSIX message queues.\n\n    **-r**\n\n    :   Maximum real time priority. On some systems where this is not available, such as NetBSD, this has the same effect as **-T** for compatibility with **sh***.*\n\n    **-s**\n\n    :   Kilobytes on the size of the stack.\n\n    **-T**\n\n    :   The number of simultaneous threads available to the user.\n\n    **-t**\n\n    :   CPU seconds to be used.\n\n    **-u**\n\n    :   The number of processes available to the user.\n\n    **-v**\n\n    :   Kilobytes on the size of virtual memory. On some systems this refers to the limit called `address space`.\n\n    **-w**\n\n    :   Kilobytes on the size of swapped out memory.\n\n    **-x**\n\n    :   The number of locks on files.\n\n    A resource may also be specified by integer in the form `**-N** *resource`, where resource corresponds to the integer defined for* the resource by the operating system. This may be used to set the limits for resources known to the shell which do not correspond to option letters. Such limits will be shown by number in the output of `**ulimit -a***`.*\n\n    The number may alternatively be out of the range of limits compiled into the shell. The shell will try to read or write the limit anyway, and will report an error if this fails.",
     "args": "ulimit [ -HSa ] [ { -bcdfiklmnpqrsTtvwx | -N resource } [ limit ] ... ]"
   },
   "umask": {
@@ -404,7 +404,7 @@
   },
   "unlimit": {
     "shortDescription": "Remove resource limits",
-    "description": ":   The resource limit for each *resource is set to the hard limit.* If the **-h** *flag is given and the shell has appropriate privileges,* the hard resource limit for each *resource is removed.* The resources of the shell process are only changed if the **-s** flag is given.\n\n    The **unlimit** *command is not made available by default when the* shell starts in a mode emulating another shell. It can be made available with the command \\`**zmodload -F zsh/rlimits b:unlimit***\\'.*",
+    "description": ":   The resource limit for each *resource is set to the hard limit.* If the **-h** *flag is given and the shell has appropriate privileges,* the hard resource limit for each *resource is removed.* The resources of the shell process are only changed if the **-s** flag is given.\n\n    The **unlimit** *command is not made available by default when the* shell starts in a mode emulating another shell. It can be made available with the command `**zmodload -F zsh/rlimits b:unlimit***`.*",
     "args": "unlimit [ -hs ] resource ..."
   },
   "unset": {
@@ -419,7 +419,7 @@
   },
   "vared": {
     "shortDescription": "Edit shell variables",
-    "description": ":   See the section \\`Zle Builtins\\' in *zshzle(1).*",
+    "description": ":   See the section `Zle Builtins` in *zshzle(1).*",
     "args": "vared"
   },
   "wait": {
@@ -428,7 +428,7 @@
   },
   "whence": {
     "shortDescription": "Locate a command",
-    "description": ":   For each *name, indicate how it would be interpreted if used as a* command name.\n\n    If *name is not an alias, built-in command, external command, shell* function, hashed command, or a reserved word, the exit status shall be non-zero, and \\-- if **-v***,* **-c***, or* **-w** *was passed \\-- a message* will be written to standard output. (This is different from other shells that write that message to standard error.)\n\n    **whence** *is most useful when name is only the last path component* of a command, i.e. does not include a \\`**/***\\'; in particular, pattern* matching only succeeds if just the non-directory component of the command is passed.\n\n    **-v** Produce a more verbose report.\n\n    **-c**\n\n    :   Print the results in a **csh***-like format.* This takes precedence over **-v***.*\n\n    **-w**\n\n    :   For each *name, print \\`name***:** *word\\' where word* is one of **alias***,* **builtin***,* **command***,* **function***,* **hashed***,* **reserved** *or* **none***, according as name* corresponds to an alias, a built-in command, an external command, a shell function, a command defined with the **hash** *builtin, a* reserved word, or is not recognised. This takes precedence over **-v** *and* **-c***.*\n\n    **-f**\n\n    :   Causes the contents of a shell function to be displayed, which would otherwise not happen unless the **-c** flag were used.\n\n    **-p**\n\n    :   Do a path search for *name* even if it is an alias, reserved word, shell function or builtin.\n\n    **-a**\n\n    :   Do a search for all occurrences of *name* throughout the command path. Normally only the first occurrence is printed.\n\n    **-m**\n\n    :   The arguments are taken as patterns (pattern characters should be quoted), and the information is displayed for each command matching one of these patterns.\n\n    **-s**\n\n    :   If a pathname contains symlinks, print the symlink-free pathname as well.\n\n    **-S**\n\n    :   As **-s***, but if the pathname had to be resolved by following* multiple symlinks, the intermediate steps are printed, too. The symlink resolved at each step might be anywhere in the path.\n\n    **-x** *num*\n\n    :   Expand tabs when outputting shell functions using the **-c** *option.* This has the same effect as the **-x** *option to the* **functions** builtin.",
+    "description": ":   For each *name, indicate how it would be interpreted if used as a* command name.\n\n    If *name is not an alias, built-in command, external command, shell* function, hashed command, or a reserved word, the exit status shall be non-zero, and \\-- if **-v***,* **-c***, or* **-w** *was passed \\-- a message* will be written to standard output. (This is different from other shells that write that message to standard error.)\n\n    **whence** *is most useful when name is only the last path component* of a command, i.e. does not include a `**/***`; in particular, pattern* matching only succeeds if just the non-directory component of the command is passed.\n\n    **-v** Produce a more verbose report.\n\n    **-c**\n\n    :   Print the results in a **csh***-like format.* This takes precedence over **-v***.*\n\n    **-w**\n\n    :   For each *name, print `name***:** *word` where word* is one of **alias***,* **builtin***,* **command***,* **function***,* **hashed***,* **reserved** *or* **none***, according as name* corresponds to an alias, a built-in command, an external command, a shell function, a command defined with the **hash** *builtin, a* reserved word, or is not recognised. This takes precedence over **-v** *and* **-c***.*\n\n    **-f**\n\n    :   Causes the contents of a shell function to be displayed, which would otherwise not happen unless the **-c** flag were used.\n\n    **-p**\n\n    :   Do a path search for *name* even if it is an alias, reserved word, shell function or builtin.\n\n    **-a**\n\n    :   Do a search for all occurrences of *name* throughout the command path. Normally only the first occurrence is printed.\n\n    **-m**\n\n    :   The arguments are taken as patterns (pattern characters should be quoted), and the information is displayed for each command matching one of these patterns.\n\n    **-s**\n\n    :   If a pathname contains symlinks, print the symlink-free pathname as well.\n\n    **-S**\n\n    :   As **-s***, but if the pathname had to be resolved by following* multiple symlinks, the intermediate steps are printed, too. The symlink resolved at each step might be anywhere in the path.\n\n    **-x** *num*\n\n    :   Expand tabs when outputting shell functions using the **-c** *option.* This has the same effect as the **-x** *option to the* **functions** builtin.",
     "args": "whence [ -vcwfpamsS ] [ -x num ] name ..."
   },
   "where": {
@@ -443,57 +443,57 @@
   },
   "zcompile": {
     "shortDescription": "Compile functions",
-    "description": "**zcompile -t** *file \\[ name \\... \\]* This builtin command can be used to compile functions or scripts, storing the compiled form in a file, and to examine files containing the compiled form. This allows faster autoloading of functions and sourcing of scripts by avoiding parsing of the text when the files are read.\n\n> The first form (without the **-c***,* **-a** *or* **-t** *options) creates a* compiled file. If only the *file argument is given, the* output file has the name \\`*file***.zwc***\\' and will be placed in* the same directory as the *file. The shell will load the compiled* file instead of the normal function file when the function is autoloaded; see the section \\`Autoloading Functions\\' in *zshmisc(1)* for a description of how autoloaded functions are searched. The extension **.zwc** *stands for \\`zsh word code\\'.*\n>\n> If there is at least one *name argument, all the named files* are compiled into the output *file given as the first argument. If* *file does not end in* **.zwc***, this extension is automatically* appended. Files containing multiple compiled functions are called \\`digest\\' files, and are intended to be used as elements of the **FPATH***/***fpath** special array.\n>\n> The second form, with the **-c** *or* **-a** *options, writes the compiled* definitions for all the named functions into *file. For* **-c***, the* names must be functions currently defined in the shell, not those marked for autoloading. Undefined functions that are marked for autoloading may be written by using the **-a** *option, in which case the* **fpath** is searched and the contents of the definition files for those functions, if found, are compiled into *file. If both* **-c** *and* **-a** *are given, names of both defined functions and functions marked* for autoloading may be given. In either case, the functions in files written with the **-c** *or* **-a** *option will be autoloaded as if the* **KSH_AUTOLOAD** *option were unset.*\n>\n> The reason for handling loaded and not-yet-loaded functions with different options is that some definition files for autoloading define multiple functions, including the function with the same name as the file, and, at the end, call that function. In such cases the output of \\`**zcompile -c***\\' does not include the additional functions defined in* the file, and any other initialization code in the file is lost. Using \\`**zcompile -a***\\' captures all this extra information.*\n>\n> If the **-m** *option is combined with* **-c** *or* **-a***,* the *names are used as patterns and all functions whose names* match one of these patterns will be written. If no *name is given,* the definitions of all functions currently defined or marked as autoloaded will be written.\n>\n> Note the second form cannot be used for compiling functions that include redirections as part of the definition rather than within the body of the function; for example\n>\n> > fn1() { { ... } >~/logfile }\n>\n> can be compiled but\n>\n> > fn1() { ... } >~/logfile\n>\n> cannot. It is possible to use the first form of **zcompile** *to compile* autoloadable functions that include the full function definition instead of just the body of the function.\n>\n> The third form, with the **-t** *option, examines an existing* compiled file. Without further arguments, the names of the original files compiled into it are listed. The first line of output shows the version of the shell which compiled the file and how the file will be used (i.e. by reading it directly or by mapping it into memory). With arguments, nothing is output and the return status is set to zero if definitions for *all names were found in the compiled* file, and non-zero if the definition for at least one *name was not* found.\n>\n> Other options:\n>\n> **-U** Aliases are not expanded when compiling the *named files.*\n>\n> **-R**\n>\n> :   When the compiled file is read, its contents are copied into the shell\\'s memory, rather than memory-mapped (see **-M***). This* happens automatically on systems that do not support memory mapping.\n>\n>     When compiling scripts instead of autoloadable functions, it is often desirable to use this option; otherwise the whole file, including the code to define functions which have already been defined, will remain mapped, consequently wasting memory.\n>\n> **-M**\n>\n> :   The compiled file is mapped into the shell\\'s memory when read. This is done in such a way that multiple instances of the shell running on the same host will share this mapped file. If neither **-R** *nor* **-M** *is given, the* **zcompile** *builtin decides what to do based* on the size of the compiled file.\n>\n> **-k**\n>\n> **-z** These options are used when the compiled file contains functions which are to be autoloaded. If **-z** *is given, the* function will be autoloaded as if the **KSH_AUTOLOAD** *option is* *not set, even if it is set at the time the compiled file is* read, while if the **-k** *is given, the function will be loaded as if* **KSH_AUTOLOAD** *is set. These options also take precedence over* any **-k** *or* **-z** *options specified to the* **autoload** *builtin. If* neither of these options is given, the function will be loaded as determined by the setting of the **KSH_AUTOLOAD** *option at the time* the compiled file is read. These options may also appear as many times as necessary between the listed *names to specify the loading style of all following functions, up to* the next **-k** *or* **-z***.*\n>\n> The created file always contains two versions of the compiled format, one for big-endian machines and one for small-endian machines. The upshot of this is that the compiled file is machine independent and if it is read or mapped, only one half of the file is actually used (and mapped).",
+    "description": "**zcompile -t** *file \\[ name \\... \\]* This builtin command can be used to compile functions or scripts, storing the compiled form in a file, and to examine files containing the compiled form. This allows faster autoloading of functions and sourcing of scripts by avoiding parsing of the text when the files are read.\n\n> The first form (without the **-c***,* **-a** *or* **-t** *options) creates a* compiled file. If only the *file argument is given, the* output file has the name `*file***.zwc***` and will be placed in* the same directory as the *file. The shell will load the compiled* file instead of the normal function file when the function is autoloaded; see the section `Autoloading Functions` in *zshmisc(1)* for a description of how autoloaded functions are searched. The extension **.zwc** *stands for `zsh word code`.*\n>\n> If there is at least one *name argument, all the named files* are compiled into the output *file given as the first argument. If* *file does not end in* **.zwc***, this extension is automatically* appended. Files containing multiple compiled functions are called `digest` files, and are intended to be used as elements of the **FPATH***/***fpath** special array.\n>\n> The second form, with the **-c** *or* **-a** *options, writes the compiled* definitions for all the named functions into *file. For* **-c***, the* names must be functions currently defined in the shell, not those marked for autoloading. Undefined functions that are marked for autoloading may be written by using the **-a** *option, in which case the* **fpath** is searched and the contents of the definition files for those functions, if found, are compiled into *file. If both* **-c** *and* **-a** *are given, names of both defined functions and functions marked* for autoloading may be given. In either case, the functions in files written with the **-c** *or* **-a** *option will be autoloaded as if the* **KSH_AUTOLOAD** *option were unset.*\n>\n> The reason for handling loaded and not-yet-loaded functions with different options is that some definition files for autoloading define multiple functions, including the function with the same name as the file, and, at the end, call that function. In such cases the output of `**zcompile -c***` does not include the additional functions defined in* the file, and any other initialization code in the file is lost. Using `**zcompile -a***` captures all this extra information.*\n>\n> If the **-m** *option is combined with* **-c** *or* **-a***,* the *names are used as patterns and all functions whose names* match one of these patterns will be written. If no *name is given,* the definitions of all functions currently defined or marked as autoloaded will be written.\n>\n> Note the second form cannot be used for compiling functions that include redirections as part of the definition rather than within the body of the function; for example\n>\n> > fn1() { { ... } >~/logfile }\n>\n> can be compiled but\n>\n> > fn1() { ... } >~/logfile\n>\n> cannot. It is possible to use the first form of **zcompile** *to compile* autoloadable functions that include the full function definition instead of just the body of the function.\n>\n> The third form, with the **-t** *option, examines an existing* compiled file. Without further arguments, the names of the original files compiled into it are listed. The first line of output shows the version of the shell which compiled the file and how the file will be used (i.e. by reading it directly or by mapping it into memory). With arguments, nothing is output and the return status is set to zero if definitions for *all names were found in the compiled* file, and non-zero if the definition for at least one *name was not* found.\n>\n> Other options:\n>\n> **-U** Aliases are not expanded when compiling the *named files.*\n>\n> **-R**\n>\n> :   When the compiled file is read, its contents are copied into the shell\\'s memory, rather than memory-mapped (see **-M***). This* happens automatically on systems that do not support memory mapping.\n>\n>     When compiling scripts instead of autoloadable functions, it is often desirable to use this option; otherwise the whole file, including the code to define functions which have already been defined, will remain mapped, consequently wasting memory.\n>\n> **-M**\n>\n> :   The compiled file is mapped into the shell\\'s memory when read. This is done in such a way that multiple instances of the shell running on the same host will share this mapped file. If neither **-R** *nor* **-M** *is given, the* **zcompile** *builtin decides what to do based* on the size of the compiled file.\n>\n> **-k**\n>\n> **-z** These options are used when the compiled file contains functions which are to be autoloaded. If **-z** *is given, the* function will be autoloaded as if the **KSH_AUTOLOAD** *option is* *not set, even if it is set at the time the compiled file is* read, while if the **-k** *is given, the function will be loaded as if* **KSH_AUTOLOAD** *is set. These options also take precedence over* any **-k** *or* **-z** *options specified to the* **autoload** *builtin. If* neither of these options is given, the function will be loaded as determined by the setting of the **KSH_AUTOLOAD** *option at the time* the compiled file is read. These options may also appear as many times as necessary between the listed *names to specify the loading style of all following functions, up to* the next **-k** *or* **-z***.*\n>\n> The created file always contains two versions of the compiled format, one for big-endian machines and one for small-endian machines. The upshot of this is that the compiled file is machine independent and if it is read or mapped, only one half of the file is actually used (and mapped).",
     "args": "zcompile [ -U ] [ -z | -k ] [ -R | -M ] file [ name ... ]\n\nzcompile -ca [ -m ] [ -R | -M ] file [ name ... ]"
   },
   "zformat": {
     "shortDescription": "Format strings",
-    "description": ":   See the section \\`The zsh/zutil Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/zutil Module` in *zshmodules(1).*",
     "args": "zformat"
   },
   "zftp": {
     "shortDescription": "Zsh FTP client",
-    "description": ":   See the section \\`The zsh/zftp Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/zftp Module` in *zshmodules(1).*",
     "args": "zftp"
   },
   "zle": {
-    "description": ":   See the section \\`Zle Builtins\\' in *zshzle(1).*",
+    "description": ":   See the section `Zle Builtins` in *zshzle(1).*",
     "args": "zle"
   },
   "zmodload": {
-    "description": "**zmodload** **-R** *modalias \\...* Performs operations relating to zsh\\'s loadable modules. Loading of modules while the shell is running (\\`dynamical loading\\') is not available on all operating systems, or on all installations on a particular operating system, although the **zmodload** *command itself is always* available and can be used to manipulate modules built into versions of the shell executable without dynamical loading.\n\n> Without arguments the names of all currently loaded binary modules are printed. The **-L** *option causes this list to be in the form of a* series of **zmodload** *commands. Forms with arguments are:*\n>\n> **zmodload** *\\[* **-is** *\\] name \\...*\n>\n> **zmodload** **-u** *\\[* **-i** *\\] name \\...* In the simplest case, **zmodload** *loads a binary module. The module must* be in a file with a name consisting of the specified *name followed by* a standard suffix, usually \\`**.so***\\' (\\`***.sl***\\' on HPUX).* If the module to be loaded is already loaded the duplicate module is ignored. If **zmodload** *detects an inconsistency, such as an* invalid module name or circular dependency list, the current code block is aborted. If it is available, the module is loaded if necessary, while if it is not available, non-zero status is silently returned. The option **-i** *is accepted for compatibility but has no effect.*\n>\n> > The *named module is searched for in the same way a command is, using* **\\$module_path** *instead of* **\\$path***. However, the path search is* performed even when the module name contains a \\`**/***\\', which it usually does.* There is no way to prevent the path search.\n> >\n> > If the module supports features (see below), **zmodload** *tries to* enable all features when loading a module. If the module was successfully loaded but not all features could be enabled, **zmodload** *returns status 2.*\n> >\n> > If the option **-s** *is given, no error is printed if the module was not* available (though other errors indicating a problem with the module are printed). The return status indicates if the module was loaded. This is appropriate if the caller considers the module optional.\n> >\n> > With **-u***,* **zmodload** *unloads modules. The same name* must be given that was given when the module was loaded, but it is not necessary for the module to exist in the file system. The **-i** *option suppresses the error if the module is already* unloaded (or was never loaded).\n> >\n> > Each module has a boot and a cleanup function. The module will not be loaded if its boot function fails. Similarly a module can only be unloaded if its cleanup function runs successfully.\n>\n> **zmodload -F** *\\[* **-almLe**  **-P** *param \\] module \\[ \\[***+-***\\]feature \\... \\]*\n>\n> :   **zmodload -F** *allows more selective control over the features provided* by modules. With no options apart from **-F***, the module named* *module is loaded, if it was not already loaded, and the list of* *features is set to the required state. If no* *features are specified, the module is loaded, if it was not already* loaded, but the state of features is unchanged. Each feature may be preceded by a **+** *to turn the feature on, or* **-** *to turn it* off; the **+** *is assumed if neither character is present.* Any feature not explicitly mentioned is left in its current state; if the module was not previously loaded this means any such features will remain disabled. The return status is zero if all features were set, 1 if the module failed to load, and 2 if some features could not be set (for example, a parameter couldn\\'t be added because there was a different parameter of the same name) but the module was loaded.\n>\n>     The standard features are builtins, conditions, parameters and math functions; these are indicated by the prefix \\`**b:***\\', \\`***c:***\\'* (\\`**C:***\\' for an infix condition), \\`***p:***\\' and \\`***f:***\\', respectively,* followed by the name that the corresponding feature would have in the shell. For example, \\`**b:strftime***\\' indicates a builtin named* **strftime** *and* **p:EPOCHSECONDS** *indicates a parameter named* **EPOCHSECONDS***. The module may provide other (\\`abstract\\') features of* its own as indicated by its documentation; these have no prefix.\n>\n>     With **-l** *or* **-L***, features provided by the module are listed. With* **-l** *alone, a list of features together with their states is shown, one* feature per line. With **-L** *alone, a* **zmodload -F** *command that would* cause enabled features of the module to be turned on is shown. With **-lL***, a* **zmodload -F** *command that would cause all the features to be* set to their current state is shown. If one of these combinations is given with the option **-P** *param then the parameter param is set to an* array of features, either features together with their state or (if **-L** *alone is given) enabled features.*\n>\n>     With the option **-L** *the module name may be omitted; then a list* of all enabled features for all modules providing features is printed in the form of **zmodload -F** *commands. If* **-l** *is also given,* the state of both enabled and disabled features is output in that form.\n>\n>     A set of features may be provided together with **-l** *or* **-L** *and a* module name; in that case only the state of those features is considered. Each feature may be preceded by **+** *or* **-** *but the* character has no effect. If no set of features is provided, all features are considered.\n>\n>     With **-e***, the command first tests that the module is loaded;* if it is not, status 1 is returned. If the module is loaded, the list of features given as an argument is examined. Any feature given with no prefix is simply tested to see if the module provides it; any feature given with a prefix **+** *or* **-** *is tested to* see if is provided and in the given state. If the tests on all features in the list succeed, status 0 is returned, else status 1.\n>\n>     With **-m***, each entry in the given list of features is taken* as a pattern to be matched against the list of features provided by the module. An initial **+** *or* **-** *must be given explicitly.* This may not be combined with the **-a** *option as autoloads must* be specified explicitly.\n>\n>     With **-a***, the given list of features is marked for autoload from* the specified module, which may not yet be loaded. An optional **+** may appear before the feature name. If the feature is prefixed with **-***, any existing autoload is removed. The options* **-l** *and* **-L** may be used to list autoloads. Autoloading is specific to individual features; when the module is loaded only the requested feature is enabled. Autoload requests are preserved if the module is subsequently unloaded until an explicit \\`**zmodload -Fa** *module* **-***feature\\' is issued. It is not an error to request an autoload* for a feature of a module that is already loaded.\n>\n>     When the module is loaded each autoload is checked against the features actually provided by the module; if the feature is not provided the autoload request is deleted. A warning message is output; if the module is being loaded to provide a different feature, and that autoload is successful, there is no effect on the status of the current command. If the module is already loaded at the time when **zmodload -Fa** *is* run, an error message is printed and status 1 returned.\n>\n>     **zmodload -Fa** *can be used with the* **-l***,* **-L***,* **-e** *and* **-P** *options for listing and testing the existence of autoloadable* features. In this case **-l** *is ignored if* **-L** *is specified.* **zmodload -FaL** *with no module name lists autoloads for all modules.*\n>\n>     Note that only standard features as described above can be autoloaded; other features require the module to be loaded before enabling.\n>\n> **zmodload** **-d** *\\[* **-L** *\\] \\[ name \\]*\n>\n> **zmodload** **-d** *name dep \\...*\n>\n> **zmodload** **-ud** *name \\[ dep \\... \\]* The **-d** *option can be used to specify module dependencies. The modules* named in the second and subsequent arguments will be loaded before the module named in the first argument.\n>\n> > With **-d** *and one argument, all dependencies for that module are listed.* With **-d** *and no arguments, all module dependencies are listed. This* listing is by default in a Makefile-like format. The **-L** *option* changes this format to a list of **zmodload -d** *commands.*\n> >\n> > If **-d** *and* **-u** *are both used, dependencies are removed. If only one* argument is given, all dependencies for that module are removed.\n>\n> **zmodload** **-ab** *\\[* **-L** *\\]*\n>\n> **zmodload** **-ab** *\\[* **-i** *\\] name \\[ builtin \\... \\]*\n>\n> **zmodload** **-ub** *\\[* **-i** *\\] builtin \\...* The **-ab** *option defines autoloaded builtins. It defines the specified* *builtins. When any of those builtins is called, the module specified* in the first argument is loaded and all its features are enabled (for selective control of features use \\`**zmodload -F -a***\\' as described* above). If only the *name is given, one builtin is defined, with* the same name as the module. **-i** *suppresses the error if the builtin* is already defined or autoloaded, but not if another builtin of the same name is already defined.\n>\n> > With **-ab** *and no arguments, all autoloaded builtins are listed, with the* module name (if different) shown in parentheses after the builtin name. The **-L** *option changes this format to a list of* **zmodload -a** commands.\n> >\n> > If **-b** *is used together with the* **-u** *option, it removes builtins* previously defined with **-ab***. This is only possible if the builtin is* not yet loaded. **-i** *suppresses the error if the builtin is already* removed (or never existed).\n> >\n> > Autoload requests are retained if the module is subsequently unloaded until an explicit \\`**zmodload -ub** *builtin\\' is issued.*\n>\n> **zmodload** **-ac** *\\[* **-IL** *\\]*\n>\n> **zmodload** **-ac** *\\[* **-iI** *\\] name \\[ cond \\... \\]*\n>\n> **zmodload** **-uc** *\\[* **-iI** *\\] cond \\...* The **-ac** *option is used to define autoloaded condition codes. The* *cond strings give the names of the conditions defined by the* module. The optional **-I** *option is used to define infix condition* names. Without this option prefix condition names are defined.\n>\n> > If given no condition names, all defined names are listed (as a series of **zmodload** *commands if the* **-L** *option is given).*\n> >\n> > The **-uc** *option removes definitions for autoloaded conditions.*\n>\n> **zmodload** **-ap** *\\[* **-L** *\\]*\n>\n> **zmodload** **-ap** *\\[* **-i** *\\] name \\[ parameter \\... \\]*\n>\n> **zmodload** **-up** *\\[* **-i** *\\] parameter \\...* The **-p** *option is like the* **-b** *and* **-c** *options, but makes* **zmodload** *work on autoloaded parameters instead.*\n>\n> **zmodload** **-af** *\\[* **-L** *\\]*\n>\n> **zmodload** **-af** *\\[* **-i** *\\] name \\[ function \\... \\]*\n>\n> **zmodload** **-uf** *\\[* **-i** *\\] function \\...* The **-f** *option is like the* **-b***,* **-p***, and* **-c** *options, but* makes **zmodload** *work on autoloaded math functions instead.*\n>\n> **zmodload** **-a** *\\[* **-L** *\\]*\n>\n> **zmodload** **-a** *\\[* **-i** *\\] name \\[ builtin \\... \\]*\n>\n> **zmodload** **-ua** *\\[* **-i** *\\] builtin \\...* Equivalent to **-ab** *and* **-ub***.*\n>\n> **zmodload -e** *\\[* **-A** *\\] \\[ string \\... \\]*\n>\n> :   The **-e** *option without arguments lists all loaded modules; if the* **-A** option is also given, module aliases corresponding to loaded modules are also shown. If arguments are provided, nothing is printed; the return status is set to zero if all *strings given as arguments* are names of loaded modules and to one if at least on *string is not* the name of a loaded module. This can be used to test for the availability of things implemented by modules. In this case, any aliases are automatically resolved and the **-A** *flag is not used.*\n>\n> **zmodload**  **-A** *\\[* **-L** *\\] \\[ modalias\\[***=***module\\] \\... \\]*\n>\n> :   For each argument, if both *modalias and module are given,* define *modalias to be an alias for the module module.* If the module *modalias is ever subsequently requested, either via a* call to **zmodload** *or implicitly, the shell will attempt to load* *module instead. If module is not given, show the definition of* *modalias. If no arguments are given, list all defined module aliases.* When listing, if the **-L** *flag was also given, list the definition as a* **zmodload** *command to recreate the alias.*\n>\n>     The existence of aliases for modules is completely independent of whether the name resolved is actually loaded as a module: while the alias exists, loading and unloading the module under any alias has exactly the same effect as using the resolved name, and does not affect the connection between the alias and the resolved name which can be removed either by **zmodload -R** *or by redefining the alias. Chains of aliases (i.e. where* the first resolved name is itself an alias) are valid so long as these are not circular. As the aliases take the same format as module names, they may include path separators: in this case, there is no requirement for any part of the path named to exist as the alias will be resolved first. For example, \\`**any/old/alias***\\' is always a valid alias.*\n>\n>     Dependencies added to aliased modules are actually added to the resolved module; these remain if the alias is removed. It is valid to create an alias whose name is one of the standard shell modules and which resolves to a different module. However, if a module has dependencies, it will not be possible to use the module name as an alias as the module will already be marked as a loadable module in its own right.\n>\n>     Apart from the above, aliases can be used in the **zmodload** *command* anywhere module names are required. However, aliases will not be shown in lists of loaded modules with a bare \\`**zmodload***\\'.*\n>\n> **zmodload**  **-R** *modalias \\...* \n>\n> :   For each *modalias argument that was previously defined as a module* alias via **zmodload -A***, delete the alias. If any was not defined, an* error is caused and the remainder of the line is ignored.\n>\n> Note that **zsh** *makes no distinction between modules that were linked* into the shell and modules that are loaded dynamically. In both cases this builtin command has to be used to make available the builtins and other things defined by modules (unless the module is autoloaded on these definitions). This is true even for systems that don\\'t support dynamic loading of modules.",
+    "description": "**zmodload** **-R** *modalias \\...* Performs operations relating to zsh\\'s loadable modules. Loading of modules while the shell is running (`dynamical loading`) is not available on all operating systems, or on all installations on a particular operating system, although the **zmodload** *command itself is always* available and can be used to manipulate modules built into versions of the shell executable without dynamical loading.\n\n> Without arguments the names of all currently loaded binary modules are printed. The **-L** *option causes this list to be in the form of a* series of **zmodload** *commands. Forms with arguments are:*\n>\n> **zmodload** *\\[* **-is** *\\] name \\...*\n>\n> **zmodload** **-u** *\\[* **-i** *\\] name \\...* In the simplest case, **zmodload** *loads a binary module. The module must* be in a file with a name consisting of the specified *name followed by* a standard suffix, usually `**.so***` (`***.sl***` on HPUX).* If the module to be loaded is already loaded the duplicate module is ignored. If **zmodload** *detects an inconsistency, such as an* invalid module name or circular dependency list, the current code block is aborted. If it is available, the module is loaded if necessary, while if it is not available, non-zero status is silently returned. The option **-i** *is accepted for compatibility but has no effect.*\n>\n> > The *named module is searched for in the same way a command is, using* **\\$module_path** *instead of* **\\$path***. However, the path search is* performed even when the module name contains a `**/***`, which it usually does.* There is no way to prevent the path search.\n> >\n> > If the module supports features (see below), **zmodload** *tries to* enable all features when loading a module. If the module was successfully loaded but not all features could be enabled, **zmodload** *returns status 2.*\n> >\n> > If the option **-s** *is given, no error is printed if the module was not* available (though other errors indicating a problem with the module are printed). The return status indicates if the module was loaded. This is appropriate if the caller considers the module optional.\n> >\n> > With **-u***,* **zmodload** *unloads modules. The same name* must be given that was given when the module was loaded, but it is not necessary for the module to exist in the file system. The **-i** *option suppresses the error if the module is already* unloaded (or was never loaded).\n> >\n> > Each module has a boot and a cleanup function. The module will not be loaded if its boot function fails. Similarly a module can only be unloaded if its cleanup function runs successfully.\n>\n> **zmodload -F** *\\[* **-almLe**  **-P** *param \\] module \\[ \\[***+-***\\]feature \\... \\]*\n>\n> :   **zmodload -F** *allows more selective control over the features provided* by modules. With no options apart from **-F***, the module named* *module is loaded, if it was not already loaded, and the list of* *features is set to the required state. If no* *features are specified, the module is loaded, if it was not already* loaded, but the state of features is unchanged. Each feature may be preceded by a **+** *to turn the feature on, or* **-** *to turn it* off; the **+** *is assumed if neither character is present.* Any feature not explicitly mentioned is left in its current state; if the module was not previously loaded this means any such features will remain disabled. The return status is zero if all features were set, 1 if the module failed to load, and 2 if some features could not be set (for example, a parameter couldn\\'t be added because there was a different parameter of the same name) but the module was loaded.\n>\n>     The standard features are builtins, conditions, parameters and math functions; these are indicated by the prefix `**b:***`, `***c:***`* (`**C:***` for an infix condition), `***p:***` and `***f:***`, respectively,* followed by the name that the corresponding feature would have in the shell. For example, `**b:strftime***` indicates a builtin named* **strftime** *and* **p:EPOCHSECONDS** *indicates a parameter named* **EPOCHSECONDS***. The module may provide other (`abstract`) features of* its own as indicated by its documentation; these have no prefix.\n>\n>     With **-l** *or* **-L***, features provided by the module are listed. With* **-l** *alone, a list of features together with their states is shown, one* feature per line. With **-L** *alone, a* **zmodload -F** *command that would* cause enabled features of the module to be turned on is shown. With **-lL***, a* **zmodload -F** *command that would cause all the features to be* set to their current state is shown. If one of these combinations is given with the option **-P** *param then the parameter param is set to an* array of features, either features together with their state or (if **-L** *alone is given) enabled features.*\n>\n>     With the option **-L** *the module name may be omitted; then a list* of all enabled features for all modules providing features is printed in the form of **zmodload -F** *commands. If* **-l** *is also given,* the state of both enabled and disabled features is output in that form.\n>\n>     A set of features may be provided together with **-l** *or* **-L** *and a* module name; in that case only the state of those features is considered. Each feature may be preceded by **+** *or* **-** *but the* character has no effect. If no set of features is provided, all features are considered.\n>\n>     With **-e***, the command first tests that the module is loaded;* if it is not, status 1 is returned. If the module is loaded, the list of features given as an argument is examined. Any feature given with no prefix is simply tested to see if the module provides it; any feature given with a prefix **+** *or* **-** *is tested to* see if is provided and in the given state. If the tests on all features in the list succeed, status 0 is returned, else status 1.\n>\n>     With **-m***, each entry in the given list of features is taken* as a pattern to be matched against the list of features provided by the module. An initial **+** *or* **-** *must be given explicitly.* This may not be combined with the **-a** *option as autoloads must* be specified explicitly.\n>\n>     With **-a***, the given list of features is marked for autoload from* the specified module, which may not yet be loaded. An optional **+** may appear before the feature name. If the feature is prefixed with **-***, any existing autoload is removed. The options* **-l** *and* **-L** may be used to list autoloads. Autoloading is specific to individual features; when the module is loaded only the requested feature is enabled. Autoload requests are preserved if the module is subsequently unloaded until an explicit `**zmodload -Fa** *module* **-***feature` is issued. It is not an error to request an autoload* for a feature of a module that is already loaded.\n>\n>     When the module is loaded each autoload is checked against the features actually provided by the module; if the feature is not provided the autoload request is deleted. A warning message is output; if the module is being loaded to provide a different feature, and that autoload is successful, there is no effect on the status of the current command. If the module is already loaded at the time when **zmodload -Fa** *is* run, an error message is printed and status 1 returned.\n>\n>     **zmodload -Fa** *can be used with the* **-l***,* **-L***,* **-e** *and* **-P** *options for listing and testing the existence of autoloadable* features. In this case **-l** *is ignored if* **-L** *is specified.* **zmodload -FaL** *with no module name lists autoloads for all modules.*\n>\n>     Note that only standard features as described above can be autoloaded; other features require the module to be loaded before enabling.\n>\n> **zmodload** **-d** *\\[* **-L** *\\] \\[ name \\]*\n>\n> **zmodload** **-d** *name dep \\...*\n>\n> **zmodload** **-ud** *name \\[ dep \\... \\]* The **-d** *option can be used to specify module dependencies. The modules* named in the second and subsequent arguments will be loaded before the module named in the first argument.\n>\n> > With **-d** *and one argument, all dependencies for that module are listed.* With **-d** *and no arguments, all module dependencies are listed. This* listing is by default in a Makefile-like format. The **-L** *option* changes this format to a list of **zmodload -d** *commands.*\n> >\n> > If **-d** *and* **-u** *are both used, dependencies are removed. If only one* argument is given, all dependencies for that module are removed.\n>\n> **zmodload** **-ab** *\\[* **-L** *\\]*\n>\n> **zmodload** **-ab** *\\[* **-i** *\\] name \\[ builtin \\... \\]*\n>\n> **zmodload** **-ub** *\\[* **-i** *\\] builtin \\...* The **-ab** *option defines autoloaded builtins. It defines the specified* *builtins. When any of those builtins is called, the module specified* in the first argument is loaded and all its features are enabled (for selective control of features use `**zmodload -F -a***` as described* above). If only the *name is given, one builtin is defined, with* the same name as the module. **-i** *suppresses the error if the builtin* is already defined or autoloaded, but not if another builtin of the same name is already defined.\n>\n> > With **-ab** *and no arguments, all autoloaded builtins are listed, with the* module name (if different) shown in parentheses after the builtin name. The **-L** *option changes this format to a list of* **zmodload -a** commands.\n> >\n> > If **-b** *is used together with the* **-u** *option, it removes builtins* previously defined with **-ab***. This is only possible if the builtin is* not yet loaded. **-i** *suppresses the error if the builtin is already* removed (or never existed).\n> >\n> > Autoload requests are retained if the module is subsequently unloaded until an explicit `**zmodload -ub** *builtin` is issued.*\n>\n> **zmodload** **-ac** *\\[* **-IL** *\\]*\n>\n> **zmodload** **-ac** *\\[* **-iI** *\\] name \\[ cond \\... \\]*\n>\n> **zmodload** **-uc** *\\[* **-iI** *\\] cond \\...* The **-ac** *option is used to define autoloaded condition codes. The* *cond strings give the names of the conditions defined by the* module. The optional **-I** *option is used to define infix condition* names. Without this option prefix condition names are defined.\n>\n> > If given no condition names, all defined names are listed (as a series of **zmodload** *commands if the* **-L** *option is given).*\n> >\n> > The **-uc** *option removes definitions for autoloaded conditions.*\n>\n> **zmodload** **-ap** *\\[* **-L** *\\]*\n>\n> **zmodload** **-ap** *\\[* **-i** *\\] name \\[ parameter \\... \\]*\n>\n> **zmodload** **-up** *\\[* **-i** *\\] parameter \\...* The **-p** *option is like the* **-b** *and* **-c** *options, but makes* **zmodload** *work on autoloaded parameters instead.*\n>\n> **zmodload** **-af** *\\[* **-L** *\\]*\n>\n> **zmodload** **-af** *\\[* **-i** *\\] name \\[ function \\... \\]*\n>\n> **zmodload** **-uf** *\\[* **-i** *\\] function \\...* The **-f** *option is like the* **-b***,* **-p***, and* **-c** *options, but* makes **zmodload** *work on autoloaded math functions instead.*\n>\n> **zmodload** **-a** *\\[* **-L** *\\]*\n>\n> **zmodload** **-a** *\\[* **-i** *\\] name \\[ builtin \\... \\]*\n>\n> **zmodload** **-ua** *\\[* **-i** *\\] builtin \\...* Equivalent to **-ab** *and* **-ub***.*\n>\n> **zmodload -e** *\\[* **-A** *\\] \\[ string \\... \\]*\n>\n> :   The **-e** *option without arguments lists all loaded modules; if the* **-A** option is also given, module aliases corresponding to loaded modules are also shown. If arguments are provided, nothing is printed; the return status is set to zero if all *strings given as arguments* are names of loaded modules and to one if at least on *string is not* the name of a loaded module. This can be used to test for the availability of things implemented by modules. In this case, any aliases are automatically resolved and the **-A** *flag is not used.*\n>\n> **zmodload**  **-A** *\\[* **-L** *\\] \\[ modalias\\[***=***module\\] \\... \\]*\n>\n> :   For each argument, if both *modalias and module are given,* define *modalias to be an alias for the module module.* If the module *modalias is ever subsequently requested, either via a* call to **zmodload** *or implicitly, the shell will attempt to load* *module instead. If module is not given, show the definition of* *modalias. If no arguments are given, list all defined module aliases.* When listing, if the **-L** *flag was also given, list the definition as a* **zmodload** *command to recreate the alias.*\n>\n>     The existence of aliases for modules is completely independent of whether the name resolved is actually loaded as a module: while the alias exists, loading and unloading the module under any alias has exactly the same effect as using the resolved name, and does not affect the connection between the alias and the resolved name which can be removed either by **zmodload -R** *or by redefining the alias. Chains of aliases (i.e. where* the first resolved name is itself an alias) are valid so long as these are not circular. As the aliases take the same format as module names, they may include path separators: in this case, there is no requirement for any part of the path named to exist as the alias will be resolved first. For example, `**any/old/alias***` is always a valid alias.*\n>\n>     Dependencies added to aliased modules are actually added to the resolved module; these remain if the alias is removed. It is valid to create an alias whose name is one of the standard shell modules and which resolves to a different module. However, if a module has dependencies, it will not be possible to use the module name as an alias as the module will already be marked as a loadable module in its own right.\n>\n>     Apart from the above, aliases can be used in the **zmodload** *command* anywhere module names are required. However, aliases will not be shown in lists of loaded modules with a bare `**zmodload***`.*\n>\n> **zmodload**  **-R** *modalias \\...* \n>\n> :   For each *modalias argument that was previously defined as a module* alias via **zmodload -A***, delete the alias. If any was not defined, an* error is caused and the remainder of the line is ignored.\n>\n> Note that **zsh** *makes no distinction between modules that were linked* into the shell and modules that are loaded dynamically. In both cases this builtin command has to be used to make available the builtins and other things defined by modules (unless the module is autoloaded on these definitions). This is true even for systems that don\\'t support dynamic loading of modules.",
     "args": "zmodload [ -a [ -bcpf [ -I ] ] ] [ -iL ] ...\n\nzmodload -u [ -abcdpf [ -I ] ] [ -iL ] ...\n\nzmodload -A [ -L ] [ modalias[=module] ... ]"
   },
   "zparseopts": {
     "shortDescription": "Parse options",
-    "description": ":   See the section \\`The zsh/zutil Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/zutil Module` in *zshmodules(1).*",
     "args": "zparseopts"
   },
   "zprof": {
     "shortDescription": "Zsh profiler",
-    "description": ":   See the section \\`The zsh/zprof Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/zprof Module` in *zshmodules(1).*",
     "args": "zprof"
   },
   "zpty": {
-    "description": ":   See the section \\`The zsh/zpty Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/zpty Module` in *zshmodules(1).*",
     "args": "zpty"
   },
   "zregexparse": {
-    "description": ":   See the section \\`The zsh/zutil Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/zutil Module` in *zshmodules(1).*",
     "args": "zregexparse"
   },
   "zsocket": {
     "shortDescription": "Zsh socket interface",
-    "description": ":   See the section \\`The zsh/net/socket Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/net/socket Module` in *zshmodules(1).*",
     "args": "zsocket"
   },
   "zstyle": {
     "shortDescription": "Define styles",
-    "description": ":   See the section \\`The zsh/zutil Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/zutil Module` in *zshmodules(1).*",
     "args": "zstyle"
   },
   "ztcp": {
-    "description": ":   See the section \\`The zsh/net/tcp Module\\' in *zshmodules(1).*",
+    "description": ":   See the section `The zsh/net/tcp Module` in *zshmodules(1).*",
     "args": "ztcp"
   }
 }
\ No newline at end of file

From 24190e293c709bd95901a8b620c79da84b46adbb Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Fri, 21 Feb 2025 00:48:53 +1100
Subject: [PATCH 0156/1815] Parse cell Uris to get notebook Uri when reading
 items in chat session (#241172)

---
 .../contrib/chat/browser/chatEditing/chatEditingSession.ts      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 4751b8a379cc..c90d301c4598 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -240,6 +240,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 	}
 
 	private _getEntry(uri: URI): AbstractChatEditingModifiedFileEntry | undefined {
+		uri = CellUri.parse(uri)?.notebook ?? uri;
 		return this._entriesObs.get().find(e => isEqual(e.modifiedURI, uri));
 	}
 
@@ -248,6 +249,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 	}
 
 	public readEntry(uri: URI, reader: IReader | undefined): IModifiedFileEntry | undefined {
+		uri = CellUri.parse(uri)?.notebook ?? uri;
 		return this._entriesObs.read(reader).find(e => isEqual(e.modifiedURI, uri));
 	}
 

From f6569ac921cbf4973488ae204ef14c97d2238e20 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 20 Feb 2025 05:51:05 -0800
Subject: [PATCH 0157/1815] Detect more command format cases:

---
 .../scripts/pullZshBuiltins.ts                |  7 ++++---
 .../src/shell/zshBuiltinsCache.json           | 20 +++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/extensions/terminal-suggest/scripts/pullZshBuiltins.ts b/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
index 79e25936ef1e..38f42db33e27 100644
--- a/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
+++ b/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
@@ -118,6 +118,7 @@ async function createCommandDescriptionsCache(): Promise<void> {
 	}
 
 	const commands: Map<string, string[]> = new Map();
+	const commandRegex = /^\*\*(?<command>[a-z\.:]+)\*\*(?:\s\*.+\*)?(?:\s\\\[.+\\\])?$/;
 	if (output) {
 		const lines = output.split('\n');
 		let currentCommand: string | undefined;
@@ -126,7 +127,7 @@ async function createCommandDescriptionsCache(): Promise<void> {
 		let i = 0;
 		for (; i < lines.length; i++) {
 			if (!currentCommand || seenOutput) {
-				const match = lines[i].match(/^\*\*(?<command>[a-z]+)\*\*(?:\s\*.+\*)?$/);
+				const match = lines[i].match(commandRegex);
 				if (match?.groups?.command) {
 					if (currentCommand) {
 						commands.set(currentCommand, lines.slice(currentCommandStart, i));
@@ -141,7 +142,7 @@ async function createCommandDescriptionsCache(): Promise<void> {
 			}
 			// There may be several examples of usage
 			if (!seenOutput) {
-				seenOutput = lines[i].length > 0 && !lines[i].match(/^\*\*(?<command>[a-z]+)\*\*(?:\s\*.+\*)?$/);
+				seenOutput = lines[i].length > 0 && !lines[i].match(commandRegex);
 			}
 		}
 		if (currentCommand) {
@@ -160,7 +161,7 @@ async function createCommandDescriptionsCache(): Promise<void> {
 		try {
 			while (true) {
 				const line = lines[++argsEnd];
-				if (line.trim().length > 0 && !line.match(/^\*\*(?<command>[a-z]+)\*\*(?:\s\*.+\*)?$/)) {
+				if (line.trim().length > 0 && !line.match(commandRegex)) {
 					break;
 				}
 			}
diff --git a/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json b/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json
index 427b6fbe79a2..495640b944e7 100644
--- a/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json
+++ b/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json
@@ -1,4 +1,24 @@
 {
+  ".": {
+    "shortDescription": "Source a file",
+    "description": ":   Read commands from *file* and execute them in the current shell environment.\n\n    If *file* does not contain a slash, or if **PATH_DIRS** is set, the shell looks in the components of **\\$path** to find the directory containing *file*. Files in the current directory are not read unless `**.**` appears somewhere in **\\$path**. If a file named `*file***.zwc**` is found, is newer than *file*, and is the compiled form (created with the **zcompile** builtin) of *file*, then commands are read from that file instead of *file*.\n\n    If any arguments *arg* are given, they become the positional parameters; the old positional parameters are restored when the *file* is done executing. However, if no arguments are given, the positional parameters remain those of the calling context, and no restoring is done.\n\n    If *file* was not found the return status is 127; if *file* was found but contained a syntax error the return status is 126; else the return status is the exit status of the last command executed.",
+    "args": ". file [ arg ... ]"
+  },
+  ":": {
+    "shortDescription": "No effect",
+    "description": ":   This command does nothing, although normal argument expansions is performed which may have effects on shell parameters. A zero exit status is returned.",
+    "args": ": [ arg ... ]"
+  },
+  "alias": {
+    "shortDescription": "Define or view aliases",
+    "description": ":   For each *name* with a corresponding *value*, define an alias with that value. A trailing space in *value* causes the next word to be checked for alias expansion. If the **-g** flag is present, define a global alias; global aliases are expanded even if they do not occur in command position:\n\n    > % perldoc --help 2>&1 | grep 'built-in functions'\n    >         -f   Search Perl built-in functions\n    >     % alias -g HG='--help 2>&1 | grep'\n    >     % perldoc HG 'built-in functions'\n    >         -f   Search Perl built-in functions\n\n    If the **-s** flag is present, define a suffix alias: if the command word on a command line is in the form `*text***.***name*`, where *text* is any non-empty string, it is replaced by the text `*value* *text***.***name*`. Note that *name* is treated as a literal string, not a pattern. A trailing space in *value* is not special in this case. For example,\n\n    > alias -s ps='gv --'\n\n    will cause the command `**\\*.ps**` to be expanded to `**gv \\-- \\*.ps**`. As alias expansion is carried out earlier than globbing, the `**\\*.ps**` will then be expanded. Suffix aliases constitute a different name space from other aliases (so in the above example it is still possible to create an alias for the command **ps**) and the two sets are never listed together.\n\n    For each *name* with no *value*, print the value of *name*, if any. With no arguments, print all currently defined aliases other than suffix aliases. If the **-m** flag is given the arguments are taken as patterns (they should be quoted to preserve them from being interpreted as glob patterns), and the aliases matching these patterns are printed. When printing aliases and one of the **-g**, **-r** or **-s** flags is present, restrict the printing to global, regular or suffix aliases, respectively; a regular alias is one which is neither a global nor a suffix alias. Using `**+**` instead of `**-**`, or ending the option list with a single `**+**`, prevents the values of the aliases from being printed.\n\n    If the **-L** flag is present, then print each alias in a manner suitable for putting in a startup script. The exit status is nonzero if a *name* (with no *value*) is given for which no alias has been defined.\n\n    For more on aliases, include common problems, see the section ALIASING in *zshmisc*(1).",
+    "args": "alias [ {+|-}gmrsL ] [ name[=value] ... ]"
+  },
+  "autoload": {
+    "shortDescription": "Autoload a function",
+    "description": ":   See the section `Autoloading Functions` in *zshmisc*(1) for full details. The **fpath** parameter will be searched to find the function definition when the function is first referenced.\n\n    If *name* consists of an absolute path, the function is defined to load from the file given (searching as usual for dump files in the given location). The name of the function is the basename (non-directory part) of the file. It is normally an error if the function is not found in the given location; however, if the option **-d** is given, searching for the function defaults to **\\$fpath**. If a function is loaded by absolute path, any functions loaded from it that are marked for **autoload** without an absolute path have the load path of the parent function temporarily prepended to **\\$fpath**.\n\n    If the option **-r** or **-R** is given, the function is searched for immediately and the location is recorded internally for use when the function is executed; a relative path is expanded using the value of **\\$PWD**. This protects against a change to **\\$fpath** after the call to **autoload**. With **-r**, if the function is not found, it is silently left unresolved until execution; with **-R**, an error message is printed and command processing aborted immediately the search fails, i.e. at the **autoload** command rather than at function execution..\n\n    The flag **-X** may be used only inside a shell function. It causes the calling function to be marked for autoloading and then immediately loaded and executed, with the current array of positional parameters as arguments. This replaces the previous definition of the function. If no function definition is found, an error is printed and the function remains undefined and marked for autoloading. If an argument is given, it is used as a directory (i.e. it does not include the name of the function) in which the function is to be found; this may be combined with the **-d** option to allow the function search to default to **\\$fpath** if it is not in the given location.\n\n    The flag **+X** attempts to load each *name* as an autoloaded function, but does *not* execute it. The exit status is zero (success) if the function was not previously defined *and* a definition for it was found. This does *not* replace any existing definition of the function. The exit status is nonzero (failure) if the function was already defined or when no definition was found. In the latter case the function remains undefined and marked for autoloading. If ksh-style autoloading is enabled, the function created will contain the contents of the file plus a call to the function itself appended to it, thus giving normal ksh autoloading behaviour on the first call to the function. If the **-m** flag is also given each *name* is treated as a pattern and all functions already marked for autoload that match the pattern are loaded.\n\n    With the **-t** flag, turn on execution tracing; with **-T**, turn on execution tracing only for the current function, turning it off on entry to any called functions that do not also have tracing enabled.\n\n    With the **-U** flag, alias expansion is suppressed when the function is loaded.\n\n    With the **-w** flag, the *name*s are taken as names of files compiled with the **zcompile** builtin, and all functions defined in them are marked for autoloading.\n\n    The flags **-z** and **-k** mark the function to be autoloaded using the zsh or ksh style, as if the option **KSH_AUTOLOAD** were unset or were set, respectively. The flags override the setting of the option at the time the function is loaded.\n\n    Note that the **autoload** command makes no attempt to ensure the shell options set during the loading or execution of the file have any particular value. For this, the **emulate** command can be used:\n\n    > emulate zsh -c 'autoload -Uz func'\n\n    arranges that when *func is loaded the shell is in native* **zsh** emulation, and this emulation is also applied when *func is run.*\n\n    Some of the functions of **autoload** *are also provided by* **functions** -u *or* **functions -U***, but* **autoload** *is a more comprehensive* interface.",
+    "args": "autoload [ {+|-}RTUXdkmrtWz ] [ -w ] [ name ... ]"
+  },
   "bg": {
     "shortDescription": "Put a job in the background",
     "description": "*job \\...* **&** Put each specified *job in the background,* or the current job if none is specified.",

From 002798ac49e14f02e0963b8bc67eb5bfb61beb86 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 20 Feb 2025 06:04:48 -0800
Subject: [PATCH 0158/1815] Add missing short descriptions

---
 .../scripts/pullZshBuiltins.ts                | 39 ++++++++++++++++++-
 .../src/shell/zshBuiltinsCache.json           | 18 +++++++++
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/extensions/terminal-suggest/scripts/pullZshBuiltins.ts b/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
index 38f42db33e27..7cc802c759d3 100644
--- a/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
+++ b/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
@@ -24,7 +24,11 @@ const shortDescriptions: Map<string, string> = new Map([
 	['break', 'Exit from a loop'],
 	['builtin', 'Executes a builtin'],
 	['bye', 'Exit the shell'],
+	['cap', 'Manipulating POSIX capability sets'],
+	['cd', 'Change the current directory'],
 	['chdir', 'Change the current directory'],
+	['clone', 'Clone shell onto another terminal'],
+	['command', 'Execute a command'],
 	['comparguments', 'Complete arguments'],
 	['compcall', 'Complete call'],
 	['compctl', 'Complete control'],
@@ -42,6 +46,8 @@ const shortDescriptions: Map<string, string> = new Map([
 	['disown', 'Remove job from job table'],
 	['echo', 'Write on standard output'],
 	['echotc', 'Echo terminal capabilities'],
+	['echoti', 'Echo terminal info'],
+	['emulate', 'Emulate a shell'],
 	['enable', 'Enable shell features'],
 	['eval', 'Execute arguments in shell'],
 	['exec', 'Replace shell with command'],
@@ -53,6 +59,7 @@ const shortDescriptions: Map<string, string> = new Map([
 	['float', 'Floating point arithmetic'],
 	['functions', 'List functions'],
 	['getcap', 'Get capabilities'],
+	['getln', 'Get line from buffer'],
 	['getopts', 'Parse positional parameters'],
 	['hash', 'Remember command locations'],
 	['history', 'Command history'],
@@ -71,13 +78,18 @@ const shortDescriptions: Map<string, string> = new Map([
 	['pushln', 'Push arguments onto the buffer'],
 	['pwd', 'Print working directory'],
 	['r', 'Re-execute command'],
+	['read', 'Read a line from input'],
 	['readonly', 'Mark variables as read-only'],
 	['rehash', 'Recompute command hash table'],
+	['return', 'Return from a function'],
 	['sched', 'Schedule commands'],
+	['set', 'Set shell options'],
 	['setcap', 'Set capabilities'],
+	['setopt', 'Set shell options'],
 	['shift', 'Shift positional parameters'],
 	['source', 'Source a file'],
 	['stat', 'Display file status'],
+	['suspend', 'Suspend the shell'],
 	['test', 'Evaluate a conditional expression'],
 	['times', 'Display shell times'],
 	['trap', 'Set signal handlers'],
@@ -94,20 +106,32 @@ const shortDescriptions: Map<string, string> = new Map([
 	['unset', 'Unset values and attributes of variables'],
 	['unsetopt', 'Unset shell options'],
 	['vared', 'Edit shell variables'],
+	['wait', 'Wait for a process'],
 	['whence', 'Locate a command'],
 	['where', 'Locate a command'],
 	['which', 'Locate a command'],
 	['zcompile', 'Compile functions'],
 	['zformat', 'Format strings'],
 	['zftp', 'Zsh FTP client'],
+	['zle', 'Zsh line editor'],
+	['zmodload', 'Load a module'],
 	['zparseopts', 'Parse options'],
 	['zprof', 'Zsh profiler'],
+	['zpty', 'Zsh pseudo terminal'],
+	['zregexparse', 'Parse regex'],
 	['zsocket', 'Zsh socket interface'],
-	['zstyle', 'Define styles']
+	['zstyle', 'Define styles'],
+	['ztcp', 'Manipulate TCP sockets'],
 ]);
 
 const execAsync = promisify(exec);
-let zshBuiltinsCommandDescriptionsCache = new Map<string, { description: string; args: string | undefined }>();
+
+interface ICommandDetails {
+	description: string;
+	args: string | undefined;
+	shortDescription?: string;
+}
+let zshBuiltinsCommandDescriptionsCache = new Map<string, ICommandDetails>();
 async function createCommandDescriptionsCache(): Promise<void> {
 	const cachedCommandDescriptions: Map<string, { shortDescription?: string; description: string; args: string | undefined }> = new Map();
 	let output = '';
@@ -201,6 +225,17 @@ const main = async () => {
 	try {
 		await createCommandDescriptionsCache();
 		console.log('created command descriptions cache with ', zshBuiltinsCommandDescriptionsCache.size, 'entries');
+
+		const missingShortDescription: string[] = [];
+		for (const [command, entry] of zshBuiltinsCommandDescriptionsCache.entries()) {
+			if (entry.shortDescription === undefined) {
+				missingShortDescription.push(command);
+			}
+		}
+		if (missingShortDescription.length > 0) {
+			console.log('\x1b[31mmissing short description for commands:\n' + missingShortDescription.join('\n') + '\x1b[0m');
+		}
+
 		// Save the cache to a JSON file
 		const cacheFilePath = path.join(__dirname, '../src/shell/zshBuiltinsCache.json');
 		const cacheObject = Object.fromEntries(zshBuiltinsCommandDescriptionsCache);
diff --git a/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json b/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json
index 495640b944e7..62b17d69f0a7 100644
--- a/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json
+++ b/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json
@@ -45,10 +45,12 @@
     "args": "bye"
   },
   "cap": {
+    "shortDescription": "Manipulating POSIX capability sets",
     "description": ":   See the section `The zsh/cap Module` in *zshmodules(1).*",
     "args": "cap"
   },
   "cd": {
+    "shortDescription": "Change the current directory",
     "description": "**cd** *\\[* **-qsLP** *\\] {***+***\\|***-***}n* Change the current directory. In the first form, change the current directory to *arg, or to the value of* **\\$HOME** *if* *arg is not specified. If arg is `***-***`, change to the* previous directory.\n\n> Otherwise, if *arg begins with a slash, attempt to change to the* directory given by *arg.*\n>\n> If *arg does not begin with a slash, the behaviour depends on whether* the current directory `**.***` occurs in the list of directories contained* in the shell parameter **cdpath***. If it does not, first attempt to change* to the directory *arg under the current directory, and if that fails* but **cdpath** *is set and contains at least one element attempt to change* to the directory *arg under each component of* **cdpath** *in turn until* successful. If `**.***` occurs in* **cdpath***, then* **cdpath** *is searched* strictly in order so that `**.***` is only tried at the appropriate point.*\n>\n> The order of testing **cdpath** *is modified if the option* **POSIX_CD** is set, as described in the documentation for the option.\n>\n> If no directory is found, the option **CDABLE_VARS** *is set, and a* parameter named *arg exists whose value begins with a slash, treat its* value as the directory. In that case, the parameter is added to the named directory hash table.\n>\n> The second form of **cd** *substitutes the string new* for the string *old in the name of the current directory,* and tries to change to this new directory.\n>\n> The third form of **cd** *extracts an entry from the directory* stack, and changes to that directory. An argument of the form `**+***n` identifies a stack entry by counting from the left* of the list shown by the **dirs** *command, starting with zero.* An argument of the form `**-***n` counts from the right.* If the **PUSHD_MINUS** *option is set, the meanings of `***+***`* and `**-***` in this context are swapped.* If the **POSIX_CD** *option is set, this form of* **cd** *is not recognised* and will be interpreted as the first form.\n>\n> If the **-q** *(quiet) option is specified, the hook function* **chpwd** and the functions in the array **chpwd_functions** *are not called.* This is useful for calls to **cd** *that do not change the environment* seen by an interactive user.\n>\n> If the **-s** *option is specified,* **cd** *refuses to change the current* directory if the given pathname contains symlinks. If the **-P** *option* is given or the **CHASE_LINKS** *option is set, symbolic links are resolved* to their true values. If the **-L** *option is given symbolic links are* retained in the directory (and not resolved) regardless of the state of the **CHASE_LINKS** *option.*",
     "args": "cd [ -qsLP ] [ arg ]\n\ncd [ -qsLP ] old new"
   },
@@ -58,10 +60,12 @@
     "args": "chdir"
   },
   "clone": {
+    "shortDescription": "Clone shell onto another terminal",
     "description": ":   See the section `The zsh/clone Module` in *zshmodules(1).*",
     "args": "clone"
   },
   "command": {
+    "shortDescription": "Execute a command",
     "description": ":   The simple command argument is taken as an external command instead of a function or builtin and is executed. If the **POSIX_BUILTINS** *option* is set, builtins will also be executed but certain special properties of them are suppressed. The **-p** *flag causes a default path to be* searched instead of that in **\\$path***. With the* **-v** *flag,* **command** is similar to **whence** *and with* **-V***, it is equivalent to* **whence** -v*.*\n\n    See also the section `Precommand Modifiers` in *zshmisc(1).*",
     "args": "command [ -pvV ] simple command"
   },
@@ -151,10 +155,12 @@
     "args": "echotc"
   },
   "echoti": {
+    "shortDescription": "Echo terminal info",
     "description": ":   See the section `The zsh/terminfo Module` in *zshmodules(1).*",
     "args": "echoti"
   },
   "emulate": {
+    "shortDescription": "Emulate a shell",
     "description": ":   Without any argument print current emulation mode.\n\n    With single argument set up zsh options to emulate the specified shell as much as possible. **csh** *will never be fully emulated.* If the argument is not one of the shells listed above, **zsh** will be used as a default; more precisely, the tests performed on the argument are the same as those used to determine the emulation at startup based on the shell name, see the section COMPATIBILITY in *zsh(1)* . In addition to setting shell options, the command also restores the pristine state of pattern enables, as if all patterns had been enabled using **enable -p***.*\n\n    If the **emulate** *command occurs inside a function that has been* marked for execution tracing with **functions -t** *then the* **xtrace** option will be turned on regardless of emulation mode or other options. Note that code executed inside the function by the **.***,* **source***, or* **eval** *commands is not considered to be running directly from the* function, hence does not provoke this behaviour.\n\n    If the **-R** *switch is given, all settable options* are reset to their default value corresponding to the specified emulation mode, except for certain options describing the interactive environment; otherwise, only those options likely to cause portability problems in scripts and functions are altered. If the **-L** *switch is given,* the options **LOCAL_OPTIONS***,* **LOCAL_PATTERNS** *and* **LOCAL_TRAPS** will be set as well, causing the effects of the **emulate** *command and any* **setopt***,* **disable -p** *or* **enable -p***, and* **trap** *commands to be local to* the immediately surrounding shell function, if any; normally these options are turned off in all emulation modes except **ksh***. The* **-L** *switch is mutually exclusive with the* use of **-c** *in flags.*\n\n    If there is a single argument and the **-l** *switch is given, the* options that would be set or unset (the latter indicated with the prefix `**no***`) are listed.* **-l** *can be combined with* **-L** *or* **-R** *and* the list will be modified in the appropriate way. Note the list does not depend on the current setting of options, i.e. it includes all options that may in principle change, not just those that would actually change.\n\n    The *flags may be any of the invocation-time flags described in* the section INVOCATION in *zsh(1),* except that `**-o EMACS***` and `***-o VI***` may not be used. Flags such* as `**+r***`/`***+o RESTRICTED***` may be prohibited in some circumstances.*\n\n    If **-c** *arg appears in flags, arg is evaluated while the* requested emulation is temporarily in effect. In this case the emulation mode and all options are restored to their previous values before **emulate** *returns. The* **-R** *switch may precede the name of the shell* to emulate; note this has a meaning distinct from including **-R** *in* *flags.*\n\n    Use of **-c** *enables `sticky` emulation mode for functions defined* within the evaluated expression: the emulation mode is associated thereafter with the function so that whenever the function is executed the emulation (respecting the **-R** *switch, if present) and all* options are set (and pattern disables cleared) before entry to the function, and the state is restored after exit. If the function is called when the sticky emulation is already in effect, either within an `**emulate** *shell* **-c***` expression or* within another function with the same sticky emulation, entry and exit from the function do not cause options to be altered (except due to standard processing such as the **LOCAL_OPTIONS** *option). This also* applies to functions marked for autoload within the sticky emulation; the appropriate set of options will be applied at the point the function is loaded as well as when it is run.\n\n    For example:\n\n    > emulate sh -c 'fni() { setopt cshnullglob; }\n    >     fno() { fni; }'\n    >     fno\n\n    The two functions **fni** *and* **fno** *are defined with sticky* **sh** emulation. **fno** *is then executed, causing options associated* with emulations to be set to their values in **sh***.* **fno** *then* calls **fni***; because* **fni** *is also marked for sticky* **sh** emulation, no option changes take place on entry to or exit from it. Hence the option **cshnullglob***, turned off by* **sh** *emulation, will* be turned on within **fni** *and remain on return to* **fno***. On exit* from **fno***, the emulation mode and all options will be restored to the* state they were in before entry to the temporary emulation.\n\n    The documentation above is typically sufficient for the intended purpose of executing code designed for other shells in a suitable environment. More detailed rules follow.\n\n    1\\.\n\n    :   The sticky emulation environment provided by `**emulate** *shell* **-c***` is identical to that provided by entry to* a function marked for sticky emulation as a consequence of being defined in such an environment. Hence, for example, the sticky emulation is inherited by subfunctions defined within functions with sticky emulation.\n\n    2\\.\n\n    :   No change of options takes place on entry to or exit from functions that are not marked for sticky emulation, other than those that would normally take place, even if those functions are called within sticky emulation.\n\n    3\\.\n\n    :   No special handling is provided for functions marked for **autoload** *nor for functions present in wordcode created by* the **zcompile** *command.*\n\n    4\\.\n\n    :   The presence or absence of the **-R** *switch to* **emulate** corresponds to different sticky emulation modes, so for example `**emulate sh -c***`, `***emulate -R sh -c***` and `***emulate csh -c***`* are treated as three distinct sticky emulations.\n\n    5\\.\n\n    :   Difference in shell options supplied in addition to the basic emulation also mean the sticky emulations are different, so for example `**emulate zsh -c***` and `***emulate zsh -o cbases -c***` are* treated as distinct sticky emulations.",
     "args": "emulate [ -lLR ] [ {zsh|sh|ksh|csh} [ flags ... ] ]"
   },
@@ -214,6 +220,7 @@
     "args": "getcap"
   },
   "getln": {
+    "shortDescription": "Get line from buffer",
     "description": ":   Read the top value from the buffer stack and put it in the shell parameter *name. Equivalent to* **read -zr***.*",
     "args": "getln [ -AclneE ] name ..."
   },
@@ -308,6 +315,7 @@
     "args": "r"
   },
   "read": {
+    "shortDescription": "Read a line from input",
     "description": "*\\[* **-u** *n \\] \\[ \\[name\\]\\[***?***prompt\\] \\] \\[ name \\... \\]* Read one line and break it into fields using the characters in **\\$IFS** *as separators, except as noted below.* The first field is assigned to the first *name, the second field* to the second *name, etc., with leftover* fields assigned to the last *name.* If *name is omitted then* **REPLY** *is used for scalars and* **reply** *for arrays.*\n\n> **-r** Raw mode: a `**\\\\***` at the end of a line does not signify line* continuation and backslashes in the line don\\'t quote the following character and are not removed.\n>\n> **-s**\n>\n> :   Don\\'t echo back characters if reading from the terminal.\n>\n> **-q**\n>\n> :   Read only one character from the terminal and set *name to* `**y***` if this character was `***y***` or `***Y***` and to `***n***` otherwise.* With this flag set the return status is zero only if the character was `**y***` or `***Y***`. This option may be used with a timeout (see* **-t***); if* the read times out, or encounters end of file, status 2 is returned. Input is read from the terminal unless one of **-u** *or* **-p** *is present. This option* may also be used within zle widgets.\n>\n> **-k** *\\[ num \\]*\n>\n> :   Read only one (or *num) characters. All are assigned to the first* *name, without word splitting. This flag is ignored when* **-q** *is* present. Input is read from the terminal unless one of **-u** *or* **-p** is present. This option may also be used within zle widgets.\n>\n>     Note that despite the mnemonic `key` this option does read full characters, which may consist of multiple bytes if the option **MULTIBYTE** *is set.*\n>\n> **-z**\n>\n> :   Read one entry from the editor buffer stack and assign it to the first *name, without word splitting. Text is pushed onto the stack with* `**print -z***` or with* **push-line** *from the line editor (see* *zshzle(1)). This flag is ignored when the* **-k** *or* **-q** *flags are present.*\n>\n> **-e**\n>\n> **-E** The input read is printed (echoed) to the standard output. If the **-e** flag is used, no input is assigned to the parameters.\n>\n> **-A**\n>\n> :   The first *name is taken as the name of an array and all words are* assigned to it.\n>\n> **-c**\n>\n> **-l** These flags are allowed only if called inside a function used for completion (specified with the **-K** *flag to* **compctl***). If the* **-c** *flag is given, the words of the* current command are read. If the **-l** *flag is given, the whole* line is assigned as a scalar. If both flags are present, **-l** is used and **-c** *is ignored.*\n>\n> **-n**\n>\n> :   Together with **-c***, the number of the word the cursor is on is* read. With **-l***, the index of the character the cursor is on is* read. Note that the command name is word number 1, not word 0, and that when the cursor is at the end of the line, its character index is the length of the line plus one.\n>\n> **-u** *n*\n>\n> :   Input is read from file descriptor *n.*\n>\n> **-p**\n>\n> :   Input is read from the coprocess.\n>\n> **-d** *delim*\n>\n> :   Input is terminated by the first character of *delim instead of* by newline.\n>\n> **-t** *\\[ num \\]*\n>\n> :   Test if input is available before attempting to read. If *num* is present, it must begin with a digit and will be evaluated to give a number of seconds, which may be a floating point number; in this case the read times out if input is not available within this time. If *num is not present, it is taken to be zero, so that* **read** *returns immediately if no input is available.* If no input is available, return status 1 and do not set any variables. This option is not available when reading from the editor buffer with **-z***, when called from within completion with* **-c** *or* **-l***, with* **-q** *which clears the input queue before reading, or within zle where* other mechanisms should be used to test for input. Note that read does not attempt to alter the input processing mode. The default mode is canonical input, in which an entire line is read at a time, so usually `**read -t***` will not read anything until an entire line has* been typed. However, when reading from the terminal with **-k** input is processed one key at a time; in this case, only availability of the first character is tested, so that e.g. `**read -t -k 2***` can still* block on the second character. Use two instances of `**read -t -k***` if* this is not what is wanted.\n>\n> If the first argument contains a `**?***`, the remainder of this* word is used as a *prompt on standard error when the shell* is interactive.\n>\n> The value (exit status) of **read** *is 1 when an end-of-file is* encountered, or when **-c** *or* **-l** *is present and the command is* not called from a **compctl** *function, or as described for* **-q***.* Otherwise the value is 0.\n>\n> The behavior of some combinations of the **-k***,* **-p***,* **-q***,* **-u** and **-z** *flags is undefined. Presently* **-q** *cancels all the others,* **-p** *cancels* **-u***,* **-k** *cancels* **-z***, and otherwise* **-z** cancels both **-p** *and* **-u***.*\n>\n> The **-c** *or* **-l** *flags cancel any and all of* **-kpquz***.*",
     "args": "read [ -rszpqAclneE ] [ -t [ num ] ] [ -k [ num ] ] [ -d delim ]"
   },
@@ -322,6 +330,7 @@
     "args": "rehash"
   },
   "return": {
+    "shortDescription": "Return from a function",
     "description": ":   Causes a shell function or `**.***` script to return to* the invoking script with the return status specified by an arithmetic expression *n.* For example, the following prints `**42***`:*\n\n    > () { integer foo=40; return \"foo + 2\" }\n    >     echo $?\n\n    If *n* is omitted, the return status is that of the last command executed.\n\n    If **return** *was executed from a trap in a* **TRAP***NAL function,* the effect is different for zero and non-zero return status. With zero status (or after an implicit return at the end of the trap), the shell will return to whatever it was previously processing; with a non-zero status, the shell will behave as interrupted except that the return status of the trap is retained. Note that the numeric value of the signal which caused the trap is passed as the first argument, so the statement `**return \\\"128+\\$1\\\"***` will return the same status as if the signal* had not been trapped.",
     "args": "return [ n ]"
   },
@@ -331,6 +340,7 @@
     "args": "sched"
   },
   "set": {
+    "shortDescription": "Set shell options",
     "description": "*\\[ arg \\... \\]* Set the options for the shell and/or set the positional parameters, or declare and set an array. If the **-s** *option is given, it causes the* specified arguments to be sorted before assigning them to the positional parameters (or to the array *name if* **-A** *is used). With* **+s** sort arguments in descending order. For the meaning of the other flags, see *zshoptions(1). Flags may be specified by name using the* **-o** *option. If no option* name is supplied with **-o***, the current option states are printed: see* the description of **setopt** *below for more information on the format.* With **+o** *they are printed in a form that can be used as input* to the shell.\n\n> If the **-A** *flag is specified, name is set to an array containing* the given *args; if no name is specified, all arrays are printed* together with their values.\n>\n> If **+A** *is used and name is an array, the* given arguments will replace the initial elements of that array; if no *name is specified, all arrays are printed without their values.*\n>\n> The behaviour of arguments after **-A** *name or* **+A** *name* depends on whether the option **KSH_ARRAYS** *is set. If it is not set, all* arguments following *name are treated as values for the array,* regardless of their form. If the option is set, normal option processing continues at that point; only regular arguments are treated as values for the array. This means that\n>\n> > set -A array -x -- foo\n>\n> sets **array** *to `***-x -- foo***` if* **KSH_ARRAYS** *is not set, but sets* the array to **foo** *and turns on the option `***-x***` if it is set.*\n>\n> If the **-A** *flag is not present, but there are arguments beyond the* options, the positional parameters are set. If the option list (if any) is terminated by `**--***`, and there are no further arguments, the* positional parameters will be unset.\n>\n> If no arguments and no `**--***` are given, then the names and values of* all parameters are printed on the standard output. If the only argument is `**+***`, the names of all parameters are printed.*\n>\n> For historical reasons, `**set -***` is treated as `***set +xv***`* and `**set -** *args` as `***set +xv \\--** *args` when in* any other emulation mode than zsh\\'s native mode.",
     "args": "set [ {+|-}options | {+|-}o [ option_name ] ] ... [ {+|-}A [ name ] ]"
   },
@@ -340,6 +350,7 @@
     "args": "setcap"
   },
   "setopt": {
+    "shortDescription": "Set shell options",
     "description": ":   Set the options for the shell. All options specified either with flags or by name are set.\n\n    If no arguments are supplied, the names of all options currently set are printed. The form is chosen so as to minimize the differences from the default options for the current emulation (the default emulation being native **zsh***, shown as* **\\<Z\\>** *in* *zshoptions(1)).* Options that are on by default for the emulation are shown with the prefix **no** *only if they are off, while other options are* shown without the prefix **no** *and only if they are on. In addition to* options changed from the default state by the user, any options activated automatically by the shell (for example, **SHIN_STDIN** *or* **INTERACTIVE***)* will be shown in the list. The format is further modified by the option **KSH_OPTION_PRINT***, however the rationale for choosing options with* or without the **no** *prefix remains the same in this case.*\n\n    If the **-m** *flag is given the arguments are taken as patterns* (which should be quoted to protect them from filename expansion), and all options with names matching these patterns are set.\n\n    Note that a bad option name does not cause execution of subsequent shell code to be aborted; this is behaviour is different from that of `**set** -o*`. This is because* **set** *is regarded as a special builtin by the* POSIX standard, but **setopt** *is not.*",
     "args": "setopt [ {+|-}options | {+|-}o option_name ] [ -m ] [ name ... ]"
   },
@@ -359,6 +370,7 @@
     "args": "stat"
   },
   "suspend": {
+    "shortDescription": "Suspend the shell",
     "description": ":   Suspend the execution of the shell (send it a **SIGTSTP***)* until it receives a **SIGCONT***.* Unless the **-f** *option is given, this will refuse to suspend a login shell.*",
     "args": "suspend [ -f ]"
   },
@@ -443,6 +455,7 @@
     "args": "vared"
   },
   "wait": {
+    "shortDescription": "Wait for a process",
     "description": ":   Wait for the specified jobs or processes. If *job is not given* then all currently active child processes are waited for. Each *job can be either a job specification or the process ID* of a job in the job table. The exit status from this command is that of the job waited for. If *job represents an unknown job or process ID, a warning is printed* (unless the **POSIX_BUILTINS** *option is set) and the exit status is 127.*\n\n    It is possible to wait for recent processes (specified by process ID, not by job) that were running in the background even if the process has exited. Typically the process ID will be recorded by capturing the value of the variable **\\$!** *immediately after the process has been* started. There is a limit on the number of process IDs remembered by the shell; this is given by the value of the system configuration parameter **CHILD_MAX***. When this limit is reached, older process IDs* are discarded, least recently started processes first.\n\n    Note there is no protection against the process ID wrapping, i.e. if the wait is not executed soon enough there is a chance the process waited for is the wrong one. A conflict implies both process IDs have been generated by the shell, as other processes are not recorded, and that the user is potentially interested in both, so this problem is intrinsic to process IDs.",
     "args": "wait [ job ... ]"
   },
@@ -477,10 +490,12 @@
     "args": "zftp"
   },
   "zle": {
+    "shortDescription": "Zsh line editor",
     "description": ":   See the section `Zle Builtins` in *zshzle(1).*",
     "args": "zle"
   },
   "zmodload": {
+    "shortDescription": "Load a module",
     "description": "**zmodload** **-R** *modalias \\...* Performs operations relating to zsh\\'s loadable modules. Loading of modules while the shell is running (`dynamical loading`) is not available on all operating systems, or on all installations on a particular operating system, although the **zmodload** *command itself is always* available and can be used to manipulate modules built into versions of the shell executable without dynamical loading.\n\n> Without arguments the names of all currently loaded binary modules are printed. The **-L** *option causes this list to be in the form of a* series of **zmodload** *commands. Forms with arguments are:*\n>\n> **zmodload** *\\[* **-is** *\\] name \\...*\n>\n> **zmodload** **-u** *\\[* **-i** *\\] name \\...* In the simplest case, **zmodload** *loads a binary module. The module must* be in a file with a name consisting of the specified *name followed by* a standard suffix, usually `**.so***` (`***.sl***` on HPUX).* If the module to be loaded is already loaded the duplicate module is ignored. If **zmodload** *detects an inconsistency, such as an* invalid module name or circular dependency list, the current code block is aborted. If it is available, the module is loaded if necessary, while if it is not available, non-zero status is silently returned. The option **-i** *is accepted for compatibility but has no effect.*\n>\n> > The *named module is searched for in the same way a command is, using* **\\$module_path** *instead of* **\\$path***. However, the path search is* performed even when the module name contains a `**/***`, which it usually does.* There is no way to prevent the path search.\n> >\n> > If the module supports features (see below), **zmodload** *tries to* enable all features when loading a module. If the module was successfully loaded but not all features could be enabled, **zmodload** *returns status 2.*\n> >\n> > If the option **-s** *is given, no error is printed if the module was not* available (though other errors indicating a problem with the module are printed). The return status indicates if the module was loaded. This is appropriate if the caller considers the module optional.\n> >\n> > With **-u***,* **zmodload** *unloads modules. The same name* must be given that was given when the module was loaded, but it is not necessary for the module to exist in the file system. The **-i** *option suppresses the error if the module is already* unloaded (or was never loaded).\n> >\n> > Each module has a boot and a cleanup function. The module will not be loaded if its boot function fails. Similarly a module can only be unloaded if its cleanup function runs successfully.\n>\n> **zmodload -F** *\\[* **-almLe**  **-P** *param \\] module \\[ \\[***+-***\\]feature \\... \\]*\n>\n> :   **zmodload -F** *allows more selective control over the features provided* by modules. With no options apart from **-F***, the module named* *module is loaded, if it was not already loaded, and the list of* *features is set to the required state. If no* *features are specified, the module is loaded, if it was not already* loaded, but the state of features is unchanged. Each feature may be preceded by a **+** *to turn the feature on, or* **-** *to turn it* off; the **+** *is assumed if neither character is present.* Any feature not explicitly mentioned is left in its current state; if the module was not previously loaded this means any such features will remain disabled. The return status is zero if all features were set, 1 if the module failed to load, and 2 if some features could not be set (for example, a parameter couldn\\'t be added because there was a different parameter of the same name) but the module was loaded.\n>\n>     The standard features are builtins, conditions, parameters and math functions; these are indicated by the prefix `**b:***`, `***c:***`* (`**C:***` for an infix condition), `***p:***` and `***f:***`, respectively,* followed by the name that the corresponding feature would have in the shell. For example, `**b:strftime***` indicates a builtin named* **strftime** *and* **p:EPOCHSECONDS** *indicates a parameter named* **EPOCHSECONDS***. The module may provide other (`abstract`) features of* its own as indicated by its documentation; these have no prefix.\n>\n>     With **-l** *or* **-L***, features provided by the module are listed. With* **-l** *alone, a list of features together with their states is shown, one* feature per line. With **-L** *alone, a* **zmodload -F** *command that would* cause enabled features of the module to be turned on is shown. With **-lL***, a* **zmodload -F** *command that would cause all the features to be* set to their current state is shown. If one of these combinations is given with the option **-P** *param then the parameter param is set to an* array of features, either features together with their state or (if **-L** *alone is given) enabled features.*\n>\n>     With the option **-L** *the module name may be omitted; then a list* of all enabled features for all modules providing features is printed in the form of **zmodload -F** *commands. If* **-l** *is also given,* the state of both enabled and disabled features is output in that form.\n>\n>     A set of features may be provided together with **-l** *or* **-L** *and a* module name; in that case only the state of those features is considered. Each feature may be preceded by **+** *or* **-** *but the* character has no effect. If no set of features is provided, all features are considered.\n>\n>     With **-e***, the command first tests that the module is loaded;* if it is not, status 1 is returned. If the module is loaded, the list of features given as an argument is examined. Any feature given with no prefix is simply tested to see if the module provides it; any feature given with a prefix **+** *or* **-** *is tested to* see if is provided and in the given state. If the tests on all features in the list succeed, status 0 is returned, else status 1.\n>\n>     With **-m***, each entry in the given list of features is taken* as a pattern to be matched against the list of features provided by the module. An initial **+** *or* **-** *must be given explicitly.* This may not be combined with the **-a** *option as autoloads must* be specified explicitly.\n>\n>     With **-a***, the given list of features is marked for autoload from* the specified module, which may not yet be loaded. An optional **+** may appear before the feature name. If the feature is prefixed with **-***, any existing autoload is removed. The options* **-l** *and* **-L** may be used to list autoloads. Autoloading is specific to individual features; when the module is loaded only the requested feature is enabled. Autoload requests are preserved if the module is subsequently unloaded until an explicit `**zmodload -Fa** *module* **-***feature` is issued. It is not an error to request an autoload* for a feature of a module that is already loaded.\n>\n>     When the module is loaded each autoload is checked against the features actually provided by the module; if the feature is not provided the autoload request is deleted. A warning message is output; if the module is being loaded to provide a different feature, and that autoload is successful, there is no effect on the status of the current command. If the module is already loaded at the time when **zmodload -Fa** *is* run, an error message is printed and status 1 returned.\n>\n>     **zmodload -Fa** *can be used with the* **-l***,* **-L***,* **-e** *and* **-P** *options for listing and testing the existence of autoloadable* features. In this case **-l** *is ignored if* **-L** *is specified.* **zmodload -FaL** *with no module name lists autoloads for all modules.*\n>\n>     Note that only standard features as described above can be autoloaded; other features require the module to be loaded before enabling.\n>\n> **zmodload** **-d** *\\[* **-L** *\\] \\[ name \\]*\n>\n> **zmodload** **-d** *name dep \\...*\n>\n> **zmodload** **-ud** *name \\[ dep \\... \\]* The **-d** *option can be used to specify module dependencies. The modules* named in the second and subsequent arguments will be loaded before the module named in the first argument.\n>\n> > With **-d** *and one argument, all dependencies for that module are listed.* With **-d** *and no arguments, all module dependencies are listed. This* listing is by default in a Makefile-like format. The **-L** *option* changes this format to a list of **zmodload -d** *commands.*\n> >\n> > If **-d** *and* **-u** *are both used, dependencies are removed. If only one* argument is given, all dependencies for that module are removed.\n>\n> **zmodload** **-ab** *\\[* **-L** *\\]*\n>\n> **zmodload** **-ab** *\\[* **-i** *\\] name \\[ builtin \\... \\]*\n>\n> **zmodload** **-ub** *\\[* **-i** *\\] builtin \\...* The **-ab** *option defines autoloaded builtins. It defines the specified* *builtins. When any of those builtins is called, the module specified* in the first argument is loaded and all its features are enabled (for selective control of features use `**zmodload -F -a***` as described* above). If only the *name is given, one builtin is defined, with* the same name as the module. **-i** *suppresses the error if the builtin* is already defined or autoloaded, but not if another builtin of the same name is already defined.\n>\n> > With **-ab** *and no arguments, all autoloaded builtins are listed, with the* module name (if different) shown in parentheses after the builtin name. The **-L** *option changes this format to a list of* **zmodload -a** commands.\n> >\n> > If **-b** *is used together with the* **-u** *option, it removes builtins* previously defined with **-ab***. This is only possible if the builtin is* not yet loaded. **-i** *suppresses the error if the builtin is already* removed (or never existed).\n> >\n> > Autoload requests are retained if the module is subsequently unloaded until an explicit `**zmodload -ub** *builtin` is issued.*\n>\n> **zmodload** **-ac** *\\[* **-IL** *\\]*\n>\n> **zmodload** **-ac** *\\[* **-iI** *\\] name \\[ cond \\... \\]*\n>\n> **zmodload** **-uc** *\\[* **-iI** *\\] cond \\...* The **-ac** *option is used to define autoloaded condition codes. The* *cond strings give the names of the conditions defined by the* module. The optional **-I** *option is used to define infix condition* names. Without this option prefix condition names are defined.\n>\n> > If given no condition names, all defined names are listed (as a series of **zmodload** *commands if the* **-L** *option is given).*\n> >\n> > The **-uc** *option removes definitions for autoloaded conditions.*\n>\n> **zmodload** **-ap** *\\[* **-L** *\\]*\n>\n> **zmodload** **-ap** *\\[* **-i** *\\] name \\[ parameter \\... \\]*\n>\n> **zmodload** **-up** *\\[* **-i** *\\] parameter \\...* The **-p** *option is like the* **-b** *and* **-c** *options, but makes* **zmodload** *work on autoloaded parameters instead.*\n>\n> **zmodload** **-af** *\\[* **-L** *\\]*\n>\n> **zmodload** **-af** *\\[* **-i** *\\] name \\[ function \\... \\]*\n>\n> **zmodload** **-uf** *\\[* **-i** *\\] function \\...* The **-f** *option is like the* **-b***,* **-p***, and* **-c** *options, but* makes **zmodload** *work on autoloaded math functions instead.*\n>\n> **zmodload** **-a** *\\[* **-L** *\\]*\n>\n> **zmodload** **-a** *\\[* **-i** *\\] name \\[ builtin \\... \\]*\n>\n> **zmodload** **-ua** *\\[* **-i** *\\] builtin \\...* Equivalent to **-ab** *and* **-ub***.*\n>\n> **zmodload -e** *\\[* **-A** *\\] \\[ string \\... \\]*\n>\n> :   The **-e** *option without arguments lists all loaded modules; if the* **-A** option is also given, module aliases corresponding to loaded modules are also shown. If arguments are provided, nothing is printed; the return status is set to zero if all *strings given as arguments* are names of loaded modules and to one if at least on *string is not* the name of a loaded module. This can be used to test for the availability of things implemented by modules. In this case, any aliases are automatically resolved and the **-A** *flag is not used.*\n>\n> **zmodload**  **-A** *\\[* **-L** *\\] \\[ modalias\\[***=***module\\] \\... \\]*\n>\n> :   For each argument, if both *modalias and module are given,* define *modalias to be an alias for the module module.* If the module *modalias is ever subsequently requested, either via a* call to **zmodload** *or implicitly, the shell will attempt to load* *module instead. If module is not given, show the definition of* *modalias. If no arguments are given, list all defined module aliases.* When listing, if the **-L** *flag was also given, list the definition as a* **zmodload** *command to recreate the alias.*\n>\n>     The existence of aliases for modules is completely independent of whether the name resolved is actually loaded as a module: while the alias exists, loading and unloading the module under any alias has exactly the same effect as using the resolved name, and does not affect the connection between the alias and the resolved name which can be removed either by **zmodload -R** *or by redefining the alias. Chains of aliases (i.e. where* the first resolved name is itself an alias) are valid so long as these are not circular. As the aliases take the same format as module names, they may include path separators: in this case, there is no requirement for any part of the path named to exist as the alias will be resolved first. For example, `**any/old/alias***` is always a valid alias.*\n>\n>     Dependencies added to aliased modules are actually added to the resolved module; these remain if the alias is removed. It is valid to create an alias whose name is one of the standard shell modules and which resolves to a different module. However, if a module has dependencies, it will not be possible to use the module name as an alias as the module will already be marked as a loadable module in its own right.\n>\n>     Apart from the above, aliases can be used in the **zmodload** *command* anywhere module names are required. However, aliases will not be shown in lists of loaded modules with a bare `**zmodload***`.*\n>\n> **zmodload**  **-R** *modalias \\...* \n>\n> :   For each *modalias argument that was previously defined as a module* alias via **zmodload -A***, delete the alias. If any was not defined, an* error is caused and the remainder of the line is ignored.\n>\n> Note that **zsh** *makes no distinction between modules that were linked* into the shell and modules that are loaded dynamically. In both cases this builtin command has to be used to make available the builtins and other things defined by modules (unless the module is autoloaded on these definitions). This is true even for systems that don\\'t support dynamic loading of modules.",
     "args": "zmodload [ -a [ -bcpf [ -I ] ] ] [ -iL ] ...\n\nzmodload -u [ -abcdpf [ -I ] ] [ -iL ] ...\n\nzmodload -A [ -L ] [ modalias[=module] ... ]"
   },
@@ -495,10 +510,12 @@
     "args": "zprof"
   },
   "zpty": {
+    "shortDescription": "Zsh pseudo terminal",
     "description": ":   See the section `The zsh/zpty Module` in *zshmodules(1).*",
     "args": "zpty"
   },
   "zregexparse": {
+    "shortDescription": "Parse regex",
     "description": ":   See the section `The zsh/zutil Module` in *zshmodules(1).*",
     "args": "zregexparse"
   },
@@ -513,6 +530,7 @@
     "args": "zstyle"
   },
   "ztcp": {
+    "shortDescription": "Manipulate TCP sockets",
     "description": ":   See the section `The zsh/net/tcp Module` in *zshmodules(1).*",
     "args": "ztcp"
   }

From 69b24587ee23fcc3f419ff2d5d45fa333e8d4449 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 20 Feb 2025 15:25:43 +0100
Subject: [PATCH 0159/1815] status - tweak wording for inline completions entry
 (#241345)

---
 .../inlineCompletionLanguageStatusBarContribution.ts  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts b/src/vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts
index 55b9bea7f578..9c5af29e46b6 100644
--- a/src/vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts
+++ b/src/vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { localize } from '../../../../nls.js';
 import { createHotClass } from '../../../../base/common/hotReloadHelpers.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { autorunWithStore, derived } from '../../../../base/common/observable.js';
@@ -45,19 +46,19 @@ export class InlineCompletionLanguageStatusBarContribution extends Disposable {
 
 			const statusMap: Record<typeof status, { shortLabel: string; label: string; loading: boolean }> = {
 				loading: { shortLabel: '', label: 'Loading', loading: true, },
-				ghostText: { shortLabel: '$(lightbulb)', label: 'Inline Completion available', loading: false, },
-				inlineEdit: { shortLabel: '$(lightbulb-sparkle)', label: 'Inline Edit available', loading: false, },
-				noSuggestion: { shortLabel: '$(circle-slash)', label: 'No inline suggestion available', loading: false, },
+				ghostText: { shortLabel: '$(lightbulb)', label: '$(copilot) ' + localize('inlineCompletionAvailable', "Inline completion available"), loading: false, },
+				inlineEdit: { shortLabel: '$(lightbulb-sparkle)', label: '$(copilot) ' + localize('inlineEditAvailable', "Inline edit available"), loading: false, },
+				noSuggestion: { shortLabel: '$(circle-slash)', label: '$(copilot) ' + localize('noInlineSuggestionAvailable', "No inline suggestion available"), loading: false, },
 			};
 
 			store.add(this._languageStatusService.addStatus({
 				accessibilityInfo: undefined,
 				busy: statusMap[status].loading,
 				command: undefined,
-				detail: 'Inline Suggestions',
+				detail: localize('inlineSuggestions', "Inline Suggestions"),
 				id: 'inlineSuggestions',
 				label: { value: statusMap[status].label, shortValue: statusMap[status].shortLabel },
-				name: 'Inline Suggestions',
+				name: localize('inlineSuggestions', "Inline Suggestions"),
 				selector: { pattern: state.model.textModel.uri.fsPath },
 				severity: Severity.Info,
 				source: 'inlineSuggestions',

From e4f7c4c9842004bd93e449b65d50109b70ab0b59 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Fri, 21 Feb 2025 01:47:44 +1100
Subject: [PATCH 0160/1815] Adopt notebook chat edits (#241334)

* Misc

* oops
---
 .../chatEditingModifiedNotebookEntry.ts       | 680 +++++++++++++++++-
 .../chatEditingNotebookEditorIntegration.ts   | 260 +++++++
 2 files changed, 913 insertions(+), 27 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 2550dcb92910..1d162e1ebb34 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -3,53 +3,105 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { assert } from '../../../../../base/common/assert.js';
+import { RunOnceScheduler } from '../../../../../base/common/async.js';
 import { decodeBase64, encodeBase64, streamToBuffer, VSBuffer } from '../../../../../base/common/buffer.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { DisposableStore, IReference } from '../../../../../base/common/lifecycle.js';
+import { DisposableStore, IReference, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { ResourceMap, ResourceSet } from '../../../../../base/common/map.js';
 import { Schemas } from '../../../../../base/common/network.js';
-import { ITransaction, IObservable, observableValue } from '../../../../../base/common/observable.js';
+import { ITransaction, IObservable, observableValue, autorun, transaction } from '../../../../../base/common/observable.js';
+import { ObservableDisposable } from '../../../../../base/common/observableDisposable.js';
 import { isEqual } from '../../../../../base/common/resources.js';
+import { themeColorFromId } from '../../../../../base/common/themables.js';
 import { assertType } from '../../../../../base/common/types.js';
 import { URI } from '../../../../../base/common/uri.js';
+import { EditOperation, ISingleEditOperation } from '../../../../../editor/common/core/editOperation.js';
+import { LineRange } from '../../../../../editor/common/core/lineRange.js';
 import { OffsetEdit } from '../../../../../editor/common/core/offsetEdit.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { IDocumentDiff, nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
+import { DetailedLineRangeMapping, RangeMapping } from '../../../../../editor/common/diff/rangeMapping.js';
 import { TextEdit } from '../../../../../editor/common/languages.js';
+import { IModelDeltaDecoration, ITextModel, MinimapPosition, OverviewRulerLane } from '../../../../../editor/common/model.js';
+import { SingleModelEditStackElement } from '../../../../../editor/common/model/editStack.js';
+import { ModelDecorationOptions } from '../../../../../editor/common/model/textModel.js';
+import { OffsetEdits } from '../../../../../editor/common/model/textModelOffsetEdit.js';
+import { IEditorWorkerService } from '../../../../../editor/common/services/editorWorker.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { IModelContentChangedEvent } from '../../../../../editor/common/textModelEvents.js';
+import { localize } from '../../../../../nls.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IEditorPane } from '../../../../common/editor.js';
+import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
+import { editorSelectionBackground } from '../../../../../platform/theme/common/colorRegistry.js';
+import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { IEditorPane, SaveReason } from '../../../../common/editor.js';
 import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
 import { SnapshotContext } from '../../../../services/workingCopy/common/fileWorkingCopy.js';
 import { ChatEditingNotebookFileSystemProvider } from '../../../notebook/browser/contrib/chatEdit/chatEditingNotebookFileSystemProvider.js';
+import { getNotebookEditorFromEditorPane } from '../../../notebook/browser/notebookBrowser.js';
+import { NotebookCellTextModel } from '../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
-import { ICellEditOperation, IResolvedNotebookEditorModel, NotebookData, NotebookSetting, TransientOptions } from '../../../notebook/common/notebookCommon.js';
+import { CellEditType, ICellEditOperation, IResolvedNotebookEditorModel, NotebookData, NotebookSetting, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
 import { INotebookEditorModelResolverService } from '../../../notebook/common/notebookEditorModelResolverService.js';
 import { INotebookService } from '../../../notebook/common/notebookService.js';
-import { ChatEditKind, IModifiedFileEntryEditorIntegration } from '../../common/chatEditingService.js';
+import { ChatEditKind, IModifiedFileEntryEditorIntegration, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { IChatResponseModel } from '../../common/chatModel.js';
 import { IChatService } from '../../common/chatService.js';
-import { AbstractChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISnapshotEntry } from './chatEditingModifiedFileEntry.js';
+import { IDocumentDiff2 } from './chatEditingCodeEditorIntegration.js';
+import { AbstractChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISnapshotEntry, pendingRewriteMinimap } from './chatEditingModifiedFileEntry.js';
+import { ChatEditingNotebookEditorIntegration, ICellDiffInfo } from './chatEditingNotebookEditorIntegration.js';
 import { ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
 
-export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifiedFileEntry {
 
+
+
+export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifiedFileEntry {
 	private readonly modifiedModel: NotebookTextModel;
 	private readonly originalModel: NotebookTextModel;
 	override originalURI: URI;
+	/**
+	 * JSON stringified version of the original notebook.
+	 */
 	override initialContent: string;
-
+	/**
+	 * Whether we're in the process of applying edits.
+	 */
+	private _isEditFromUs: boolean = false;
+	/**
+	 * Whether all edits are from us, e.g. is possible a user has made edits, then this will be false.
+	 */
+	private _allEditsAreFromUs: boolean = true;
 	private readonly _changesCount = observableValue<number>(this, 0);
 	override changesCount: IObservable<number> = this._changesCount;
 
+	private readonly cellEntryMap = new Map<NotebookCellTextModel, ChatEditingNotebookCellEntry>();
+	private readonly _entries = observableValue<ChatEditingNotebookCellEntry[]>('cellEntries', []);
+	private modifiedToOriginalCellMap = new ResourceMap<NotebookCellTextModel>();
+	private readonly _cellDiffInfo = observableValue<ICellDiffInfo[]>('diffInfo', []);
+	private readonly _maxModifiedLineNumbers = observableValue<number[]>('changedMaxLineNumber', []);
+
+	get cellDiffInfo(): IObservable<ICellDiffInfo[]> {
+		return this._cellDiffInfo;
+	}
+
+	/**
+	 * List of Cell URIs that are edited,
+	 * Will be cleared once all edits have been accepted.
+	 * I.e. this will only contain URIS will acceptAgentEdits are being called before `isLastEdit` is sent.
+	 */
+	private readonly editedCells = new ResourceSet();
+
 	public static async create(uri: URI, _multiDiffEntryDelegate: { collapse: (transaction: ITransaction | undefined) => void }, telemetryInfo: IModifiedEntryTelemetryInfo, chatKind: ChatEditKind, initialContent: string | undefined, instantiationService: IInstantiationService): Promise<AbstractChatEditingModifiedFileEntry> {
 		return instantiationService.invokeFunction(async accessor => {
 			const notebookService = accessor.get(INotebookService);
 			const resolver = accessor.get(INotebookEditorModelResolverService);
 			const configurationServie = accessor.get(IConfigurationService);
+			const textModelService = accessor.get(ITextModelService);
 			const resourceRef: IReference<IResolvedNotebookEditorModel> = await resolver.resolve(uri);
 			const notebook = resourceRef.object.notebook;
 			const originalUri = ChatEditingNotebookFileSystemProvider.getSnapshotFileURI(telemetryInfo.requestId, notebook.uri.path);
-
 			const [options, buffer] = await Promise.all([
 				notebookService.withNotebookDataProvider(resourceRef.object.notebook.notebookType),
 				notebookService.createNotebookTextDocumentSnapshot(notebook.uri, SnapshotContext.Backup, CancellationToken.None).then(s => streamToBuffer(s))
@@ -63,14 +115,24 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				restoreSnapshot(originalRef.object.notebook, initialContent);
 			}
 			initialContent = initialContent || createSnapshot(originalRef.object.notebook, options.serializer.options, configurationServie);
-			return instantiationService.createInstance(ChatEditingModifiedNotebookEntry, resourceRef, originalRef, _multiDiffEntryDelegate, options.serializer.options, telemetryInfo, chatKind, initialContent);
+			const modifiedCells = new ResourceMap<IReference<IResolvedTextEditorModel>>();
+			const originalCells = new ResourceMap<IReference<IResolvedTextEditorModel>>();
+			await Promise.all(resourceRef.object.notebook.cells.map(async cell => {
+				modifiedCells.set(cell.uri, await textModelService.createModelReference(cell.uri));
+			}).concat(originalRef.object.notebook.cells.map(async cell => {
+				originalCells.set(cell.uri, await textModelService.createModelReference(cell.uri));
+			})));
+
+			return instantiationService.createInstance(ChatEditingModifiedNotebookEntry, resourceRef, originalRef, modifiedCells, originalCells, _multiDiffEntryDelegate, options.serializer.options, telemetryInfo, chatKind, initialContent);
 		});
 	}
 
 
 	constructor(
-		modifiedResourceRef: IReference<IResolvedNotebookEditorModel>,
+		private readonly modifiedResourceRef: IReference<IResolvedNotebookEditorModel>,
 		originalResourceRef: IReference<IResolvedNotebookEditorModel>,
+		private readonly modifiedCellModels: ResourceMap<IReference<IResolvedTextEditorModel>>,
+		private readonly originalCellModels: ResourceMap<IReference<IResolvedTextEditorModel>>,
 		private readonly _multiDiffEntryDelegate: { collapse: (transaction: ITransaction | undefined) => void },
 		private readonly transientOptions: TransientOptions | undefined,
 		telemetryInfo: IModifiedEntryTelemetryInfo,
@@ -80,16 +142,45 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		@IFilesConfigurationService fileConfigService: IFilesConfigurationService,
 		@IChatService chatService: IChatService,
 		@IFileService fileService: IFileService,
-		@IInstantiationService instantiationService: IInstantiationService
-
+		@IInstantiationService instantiationService: IInstantiationService,
 	) {
 		super(modifiedResourceRef.object.notebook.uri, telemetryInfo, kind, configurationService, fileConfigService, chatService, fileService, instantiationService);
 		this._register(modifiedResourceRef);
 		this._register(originalResourceRef);
+		modifiedCellModels.forEach(cell => this._register(cell));
+		originalCellModels.forEach(cell => this._register(cell));
 		this.modifiedModel = modifiedResourceRef.object.notebook;
 		this.originalModel = originalResourceRef.object.notebook;
 		this.originalURI = this.originalModel.uri;
 		this.initialContent = initialContent;
+		this._register(this.modifiedModel.onDidChangeContent(this.mirrorNotebookEdits, this));
+		this._cellDiffInfo.set(this.modifiedModel.cells.map((cell, i) => ({ modifiedCellIndex: i, originalCellIndex: i, diff: nullDocumentDiff, type: 'unchanged' })), undefined);
+		this._maxModifiedLineNumbers.set(this.modifiedModel.cells.map(() => 0), undefined);
+		this.modifiedModel.cells.forEach((cell, index) => {
+			this.modifiedToOriginalCellMap.set(cell.uri, this.originalModel.cells[index]);
+			this.getOrCreateModifiedTextFileEntryForCell(cell);
+		});
+	}
+
+	mirrorNotebookEdits(e: NotebookTextModelChangedEvent) {
+		if (this._isEditFromUs) {
+			// TODO@DonJayamanne Apply this same edit to the original notebook.
+			return;
+		}
+
+		// TODO@DonJayamanne We need a way to undo this operation.
+		this._allEditsAreFromUs = this._allEditsAreFromUs || e.rawEvents.length > 0;
+
+		const didResetToOriginalContent = createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService) === this.initialContent;
+		const currentState = this._stateObs.get();
+		switch (currentState) {
+			case WorkingSetEntryState.Modified:
+				if (didResetToOriginalContent) {
+					this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
+					break;
+				}
+		}
+
 	}
 
 	protected override async _doAccept(tx: ITransaction | undefined): Promise<void> {
@@ -105,18 +196,18 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 
 	protected override async _doReject(tx: ITransaction | undefined): Promise<void> {
 		if (this.createdInRequestId === this._telemetryInfo.requestId) {
-			// await this.docFileEditorModel.revert({ soft: true });
+			await this.modifiedResourceRef.object.revert({ soft: true });
 			await this._fileService.del(this.modifiedURI);
 			this._onDidDelete.fire();
 		} else {
 			const outputSizeLimit = this.configurationService.getValue<number>(NotebookSetting.outputBackupSizeLimit) * 1024;
 			const snapshot = this.originalModel.createSnapshot({ context: SnapshotContext.Backup, outputSizeLimit, transientOptions: this.transientOptions });
 			this.modifiedModel.restoreSnapshot(snapshot, this.transientOptions);
-			// if (this._allEditsAreFromUs) {
-			// 	// 	// 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 });
-			// }
+			if (this._allEditsAreFromUs && this._entries.get().every(entry => entry.allEditsAreFromUs)) {
+				// save the file after discarding so that the dirty indicator goes away
+				// and so that an intermediate saved state gets reverted
+				await this.modifiedResourceRef.object.save({ reason: SaveReason.EXPLICIT, skipSaveParticipants: true });
+			}
 			await this._collapse(tx);
 		}
 
@@ -126,21 +217,176 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	}
 
 	protected override _createEditorIntegration(editor: IEditorPane): IModifiedFileEntryEditorIntegration {
-		throw new Error('Method not implemented.');
+		const notebookEditor = getNotebookEditorFromEditorPane(editor);
+		assertType(notebookEditor);
+		return this._instantiationService.createInstance(ChatEditingNotebookEditorIntegration, this, notebookEditor, this.modifiedModel, this._cellDiffInfo);
 	}
 
-	override acceptAgentEdits(resource: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): void {
+	protected override _resetEditsState(tx: ITransaction): void {
+		super._resetEditsState(tx);
+		this.cellEntryMap.forEach(entry => entry.clearCurrentEditLineDecoration());
+	}
 
+	override acceptAgentEdits(resource: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): void {
 		const isCellUri = resource.scheme === Schemas.vscodeNotebookCell;
-		assert(isCellUri || isEqual(resource, this.modifiedURI));
-		assertType(edits.every(edit => !TextEdit.isTextEdit(edit) || isCellUri));
+		const cell = isCellUri && this.modifiedModel.cells.find(cell => isEqual(cell.uri, resource));
+		const cellEntry = cell ? this.cellEntryMap.get(cell) : undefined;
+
+		// For all cells that were edited, send the `isLastEdits` flag.
+		const finishPreviousCells = () => {
+			this.editedCells.forEach(uri => {
+				const cell = this.modifiedModel.cells.find(cell => isEqual(cell.uri, uri));
+				const cellEntry = cell && this.cellEntryMap.get(cell);
+				cellEntry?.acceptAgentEdits([], true, responseModel);
+			});
+		};
+
+		this._applyEdits(() => {
+			edits.forEach(edit => {
+				if (TextEdit.isTextEdit(edit)) {
+					if (!this.editedCells.has(resource)) {
+						finishPreviousCells();
+						this.editedCells.add(resource);
+					}
+					cellEntry?.acceptAgentEdits([edit], isLastEdits, responseModel);
+				} else {
+					this.acceptNotebookEdit(edit);
+				}
+			});
+		});
+
+		// If the last edit for a cell was sent, then handle it
+		if (isCellUri && isLastEdits) {
+			this.editedCells.delete(resource);
+			cellEntry?.acceptAgentEdits([], isLastEdits, responseModel);
+		}
 
-		// needs to handle notebook and textual cell edits
+		// isLastEdits can be true for cell Uris, but when its true for Cells edits.
+		// It cannot be true for the notebook itself.
+		isLastEdits = !isCellUri && isLastEdits;
 
-		throw new Error('Method not implemented.');
+		transaction((tx) => {
+			if (!isLastEdits) {
+				this._stateObs.set(WorkingSetEntryState.Modified, tx);
+				this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
+				this._rewriteRatioObs.set(Math.min(1, this.calculateRewriteRadio()), tx);
+
+			} else {
+				finishPreviousCells();
+				this.editedCells.clear();
+				this._resetEditsState(tx);
+				// this._updateDiffInfoSeq();
+				this._rewriteRatioObs.set(1, tx);
+				// this._editDecorationClear.schedule();
+			}
+		});
+	}
+
+	acceptNotebookEdit(edit: ICellEditOperation): void {
+		// make the actual edit
+		this.modifiedModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+		if (edit.editType !== CellEditType.Replace) {
+			return;
+		}
+		if (edit.count === 0) {
+			const diff = this._cellDiffInfo.get().slice();
+			// All existing indexes are shifted by number of cells added.
+			diff.forEach(d => {
+				if (d.type !== 'delete' && d.modifiedCellIndex >= edit.index) {
+					d.modifiedCellIndex += edit.cells.length;
+				}
+			});
+			const diffInsert = edit.cells.map((c, i) => {
+				const lines = c.source.split(/\r?\n/);
+				const originalRange = new Range(1, 0, 1, 0);
+				const modifiedRange = new Range(1, 0, lines.length, lines[lines.length - 1].length);
+				const innerChanges = new RangeMapping(originalRange, modifiedRange);
+				const changes = [new DetailedLineRangeMapping(new LineRange(1, 1), new LineRange(1, lines.length), [innerChanges])];
+				return {
+					type: 'insert' as const,
+					originalCellIndex: undefined,
+					modifiedCellIndex: edit.index + i,
+					diff: {
+						changes,
+						identical: false,
+						moves: [],
+						quitEarly: false
+					}
+				} satisfies ICellDiffInfo;
+			});
+			diff.splice(edit.index, 0, ...diffInsert);
+			this._cellDiffInfo.set(diff, undefined);
+		} else {
+			// All existing indexes are shifted by number of cells removed.
+			// And unchanged cells should be converted to deleted cells.
+			const diff = this._cellDiffInfo.get().slice().map(d => {
+				if (d.type === 'unchanged' && d.modifiedCellIndex >= (edit.index + edit.count - 1)) {
+					const originalCell = this.originalModel.cells[d.originalCellIndex];
+					const lines = new Array(originalCell.textBuffer.getLineCount()).fill(0).map((_, i) => originalCell.textBuffer.getLineContent(i + 1));
+					const originalRange = new Range(1, 0, lines.length, lines[lines.length - 1].length);
+					const modifiedRange = new Range(1, 0, 1, 0);
+					const innerChanges = new RangeMapping(modifiedRange, originalRange);
+					const changes = [new DetailedLineRangeMapping(new LineRange(1, lines.length), new LineRange(1, 1), [innerChanges])];
+
+					// This will be deleted.
+					return {
+						type: 'delete' as const,
+						modifiedCellIndex: undefined,
+						originalCellIndex: d.originalCellIndex,
+						diff: {
+							changes,
+							identical: false,
+							moves: [],
+							quitEarly: false
+						}
+					} satisfies ICellDiffInfo;
+				}
+				if (d.type !== 'delete' && d.modifiedCellIndex >= (edit.index + edit.count)) {
+					d.modifiedCellIndex -= edit.count;
+					return d;
+				}
+				return d;
+			});
+			this._cellDiffInfo.set(diff, undefined);
+		}
+	}
+	private _applyEdits(operation: () => void) {
+		// make the actual edit
+		this._isEditFromUs = true;
+		try {
+			operation();
+		} finally {
+			this._isEditFromUs = false;
+		}
+	}
+
+	calculateRewriteRadio() {
+		const cellChanges = this._cellDiffInfo.get();
+		const totalNumberOfUpdatedLines = cellChanges.reduce((totalUpdatedLines, value) => {
+			const getUpadtedLineCount = () => {
+				if (value.type === 'unchanged') {
+					return 0;
+				}
+				if (value.type === 'delete') {
+					return this.originalModel.cells[value.originalCellIndex].textModel?.getLineCount() ?? 0;
+				}
+				if (value.type === 'insert') {
+					return this.modifiedModel.cells[value.modifiedCellIndex].textModel?.getLineCount() ?? 0;
+				}
+				return value.diff.changes.reduce((maxLineNumber, change) => {
+					return Math.max(maxLineNumber, change.modified.endLineNumberExclusive);
+				}, 0);
+			};
+
+			return totalUpdatedLines + getUpadtedLineCount();
+		}, 0);
+
+		const totalNumberOfLines = this.modifiedModel.cells.reduce((totalLines, cell) => totalLines + (cell.textModel?.getLineCount() ?? 0), 0);
+		return Math.min(1, totalNumberOfUpdatedLines / totalNumberOfLines);
 	}
 
 	override createSnapshot(requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry {
+		this.cellEntryMap.forEach(entry => entry.isFirstEditAfterStartOrSnapshot = true);
 		return {
 			resource: this.modifiedURI,
 			languageId: 'notebook',
@@ -168,13 +414,63 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		restoreSnapshot(this.modifiedModel, snapshot.current);
 		// this._edit = snapshot.originalToCurrentEdit;
 		// this._updateDiffInfoSeq();
-		restoreSnapshot(this.modifiedModel, snapshot.current);
 
 	}
 
 	override resetToInitialContent(): void {
 		restoreSnapshot(this.modifiedModel, this.initialContent);
 	}
+
+	getOrCreateModifiedTextFileEntryForCell(cell: NotebookCellTextModel): ChatEditingNotebookCellEntry | undefined {
+		let cellEntry = this.cellEntryMap.get(cell);
+		if (cellEntry) {
+			return cellEntry;
+		}
+		const index = this.modifiedModel.cells.indexOf(cell);
+		const originalCell = this.modifiedToOriginalCellMap.get(cell.uri);
+		if (!originalCell || index === -1) {
+			// Not possible.
+			return;
+		}
+		const modifiedCellModel = this.modifiedCellModels.get(cell.uri);
+		const originalCellModel = this.originalCellModels.get(originalCell.uri);
+		if (!modifiedCellModel || !originalCellModel) {
+			return;
+		}
+		const originalText = originalCellModel.object.textEditorModel.getValue();
+		cellEntry = this._register(this._instantiationService.createInstance(ChatEditingNotebookCellEntry, cell, modifiedCellModel, originalCellModel, originalText, this._telemetryInfo));
+		this.cellEntryMap.set(cell, cellEntry);
+
+		this._register(autorun(r => {
+			const cellDiff = cellEntry.diffInfo.read(r);
+			const diffs = this.cellDiffInfo.get().slice();
+			const entry = diffs.find(entry => entry.modifiedCellIndex === index);
+			if (!entry) {
+				// Not possible.
+				return;
+			}
+			entry.diff = cellDiff;
+			entry.diff = cellDiff.identical ? nullDocumentDiff : cellDiff;
+			if (entry.type === 'unchanged' || entry.type === 'modified') {
+				entry.type = cellDiff.identical ? 'unchanged' : 'modified';
+			}
+			const maxModifiedLineNumber = cellEntry.maxModifiedLineNumber.read(r);
+			const changeCount = diffs.reduce((count, diff) => count + diff.diff.changes.length, 0);
+			const maxModifiedLineNumbers = this._maxModifiedLineNumbers.get().slice();
+			maxModifiedLineNumbers[index] = maxModifiedLineNumber;
+
+			transaction(tx => {
+				this._cellDiffInfo.set(diffs, tx);
+				this._changesCount.set(changeCount, tx);
+				this._maxModifiedLineNumbers.set(maxModifiedLineNumbers, tx);
+			});
+		}));
+
+		const entries = this.modifiedModel.cells.map(cell => this.cellEntryMap.get(cell)).filter(entry => !!entry);
+		this._entries.set(entries, undefined);
+
+		return cellEntry;
+	}
 }
 
 const BufferMarker = 'ArrayBuffer-4f56482b-5a03-49ba-8356-210d3b0c1c3d';
@@ -216,3 +512,333 @@ function deserializeSnapshot(snapshot: string): { transientOptions: TransientOpt
 
 	return { transientOptions, data };
 }
+
+
+class ChatEditingNotebookCellEntry extends ObservableDisposable {
+	private static readonly _lastEditDecorationOptions = ModelDecorationOptions.register({
+		isWholeLine: true,
+		description: 'chat-last-edit',
+		className: 'chat-editing-last-edit-line',
+		marginClassName: 'chat-editing-last-edit',
+		overviewRuler: {
+			position: OverviewRulerLane.Full,
+			color: themeColorFromId(editorSelectionBackground)
+		},
+	});
+
+	private static readonly _pendingEditDecorationOptions = ModelDecorationOptions.register({
+		isWholeLine: true,
+		description: 'chat-pending-edit',
+		className: 'chat-editing-pending-edit',
+		minimap: {
+			position: MinimapPosition.Inline,
+			color: themeColorFromId(pendingRewriteMinimap)
+		}
+	});
+
+
+	private _isFirstEditAfterStartOrSnapshot: boolean = true;
+	public set isFirstEditAfterStartOrSnapshot(value: boolean) {
+		this._isFirstEditAfterStartOrSnapshot = value;
+	}
+	private _edit: OffsetEdit = OffsetEdit.empty;
+	private _isEditFromUs: boolean = false;
+	private _allEditsAreFromUs: boolean = true;
+	public get allEditsAreFromUs(): boolean {
+		return this._allEditsAreFromUs;
+	}
+	private _diffOperation: Promise<any> | undefined;
+	private _diffOperationIds: number = 0;
+
+	private readonly _diffInfo = observableValue<IDocumentDiff>(this, nullDocumentDiff);
+	public readonly changesCount: IObservable<number>;
+	public readonly diffInfo: IObservable<IDocumentDiff2>;
+	private readonly _maxModifiedLineNumber = observableValue<number>(this, 0);
+	readonly maxModifiedLineNumber = this._maxModifiedLineNumber;
+	private readonly originalModel: ITextModel;
+
+	private readonly modifiedModel: ITextModel;
+
+	private readonly _editDecorationClear = this._register(new RunOnceScheduler(() => { this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []); }, 500));
+	private _editDecorations: string[] = [];
+
+	private readonly _diffTrimWhitespace: IObservable<boolean>;
+	protected readonly _stateObs = observableValue<WorkingSetEntryState>(this, WorkingSetEntryState.Modified);
+	readonly state: IObservable<WorkingSetEntryState> = this._stateObs;
+	protected readonly _isCurrentlyBeingModifiedByObs = observableValue<IChatResponseModel | undefined>(this, undefined);
+	readonly isCurrentlyBeingModifiedBy: IObservable<IChatResponseModel | undefined> = this._isCurrentlyBeingModifiedByObs;
+
+	constructor(
+		public readonly cell: NotebookCellTextModel,
+		modifiedModel: IReference<IResolvedTextEditorModel>,
+		originalModel: IReference<IResolvedTextEditorModel>,
+		private readonly initialContent: string,
+		private readonly _telemetryInfo: IModifiedEntryTelemetryInfo,
+		@IConfigurationService configService: IConfigurationService,
+		@IChatService private readonly _chatService: IChatService,
+		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
+		@IUndoRedoService private readonly _undoRedoService: IUndoRedoService
+
+	) {
+		super();
+		this._register(modifiedModel);
+		this._register(originalModel);
+		this.modifiedModel = modifiedModel.object.textEditorModel;
+		this.originalModel = originalModel.object.textEditorModel;
+		this.diffInfo = this._diffInfo.map(value => {
+			return {
+				...value,
+				originalModel: this.originalModel,
+				modifiedModel: this.modifiedModel,
+				keep: changes => this._acceptHunk(changes),
+				undo: changes => this._rejectHunk(changes)
+			} satisfies IDocumentDiff2;
+		});
+		this.changesCount = this._diffInfo.map(diff => diff.changes.length);
+		this._register(this.modifiedModel.onDidChangeContent(e => {
+			if (this.disposed) {
+				return;
+			}
+			this._mirrorEdits(e);
+
+		}));
+		this._register(toDisposable(() => {
+			this.clearCurrentEditLineDecoration();
+		}));
+
+		this._diffTrimWhitespace = observableConfigValue('diffEditor.ignoreTrimWhitespace', true, configService);
+		this._register(autorun(r => {
+			this._diffTrimWhitespace.read(r);
+			this._updateDiffInfoSeq();
+		}));
+	}
+
+	public clearCurrentEditLineDecoration() {
+		this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []);
+	}
+
+
+	private _mirrorEdits(event: IModelContentChangedEvent) {
+		const edit = OffsetEdits.fromContentChanges(event.changes);
+
+		if (this._isEditFromUs) {
+			const e_sum = this._edit;
+			const e_ai = edit;
+			this._edit = e_sum.compose(e_ai);
+
+		} else {
+
+			//           e_ai
+			//   d0 ---------------> s0
+			//   |                   |
+			//   |                   |
+			//   | e_user_r          | e_user
+			//   |                   |
+			//   |                   |
+			//   v       e_ai_r      v
+			///  d1 ---------------> s1
+			//
+			// d0 - document snapshot
+			// s0 - document
+			// e_ai - ai edits
+			// e_user - user edits
+			//
+			const e_ai = this._edit;
+			const e_user = edit;
+
+			const e_user_r = e_user.tryRebase(e_ai.inverse(this.originalModel.getValue()), true);
+
+			if (e_user_r === undefined) {
+				// user edits overlaps/conflicts with AI edits
+				this._edit = e_ai.compose(e_user);
+			} else {
+				const edits = OffsetEdits.asEditOperations(e_user_r, this.originalModel);
+				this.originalModel.applyEdits(edits);
+				this._edit = e_ai.tryRebase(e_user_r);
+			}
+
+			this._allEditsAreFromUs = false;
+			this._updateDiffInfoSeq();
+
+			const didResetToOriginalContent = this.modifiedModel.getValue() === this.initialContent;
+			const currentState = this._stateObs.get();
+			switch (currentState) {
+				case WorkingSetEntryState.Modified:
+					if (didResetToOriginalContent) {
+						this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
+						break;
+					}
+			}
+		}
+	}
+
+	acceptAgentEdits(textEdits: TextEdit[], isLastEdits: boolean, responseModel: IChatResponseModel): void {
+
+		// push stack element for the first edit
+		if (this._isFirstEditAfterStartOrSnapshot) {
+			this._isFirstEditAfterStartOrSnapshot = false;
+			const request = this._chatService.getSession(this._telemetryInfo.sessionId)?.getRequests().at(-1);
+			const label = request?.message.text ? localize('chatEditing1', "Chat Edit: '{0}'", request.message.text) : localize('chatEditing2', "Chat Edit");
+			this._undoRedoService.pushElement(new SingleModelEditStackElement(label, 'chat.edit', this.modifiedModel, null));
+		}
+
+		const ops = textEdits.map(TextEdit.asEditOperation);
+		const undoEdits = this._applyEdits(ops);
+
+		const maxLineNumber = undoEdits.reduce((max, op) => Math.max(max, op.range.startLineNumber), 0);
+
+		const newDecorations: IModelDeltaDecoration[] = [
+			// decorate pending edit (region)
+			{
+				options: ChatEditingNotebookCellEntry._pendingEditDecorationOptions,
+				range: new Range(maxLineNumber + 1, 1, Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER)
+			}
+		];
+
+		if (maxLineNumber > 0) {
+			// decorate last edit
+			newDecorations.push({
+				options: ChatEditingNotebookCellEntry._lastEditDecorationOptions,
+				range: new Range(maxLineNumber, 1, maxLineNumber, Number.MAX_SAFE_INTEGER)
+			});
+		}
+
+		this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, newDecorations);
+
+
+		transaction((tx) => {
+			if (!isLastEdits) {
+				this._stateObs.set(WorkingSetEntryState.Modified, tx);
+				this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
+				this._maxModifiedLineNumber.set(maxLineNumber, tx);
+
+			} else {
+				this._resetEditsState(tx);
+				this._updateDiffInfoSeq();
+				this._maxModifiedLineNumber.set(0, tx);
+				this._editDecorationClear.schedule();
+			}
+		});
+	}
+
+	scheduleEditDecorations() {
+		this._editDecorationClear.schedule();
+	}
+
+	protected _resetEditsState(tx: ITransaction): void {
+		this._isCurrentlyBeingModifiedByObs.set(undefined, tx);
+		this._maxModifiedLineNumber.set(0, tx);
+	}
+
+	private async _acceptHunk(change: DetailedLineRangeMapping): Promise<boolean> {
+		if (!this._diffInfo.get().changes.includes(change)) {
+			// diffInfo should have model version ids and check them (instead of the caller doing that)
+			return false;
+		}
+		const edits: ISingleEditOperation[] = [];
+		for (const edit of change.innerChanges ?? []) {
+			const newText = this.modifiedModel.getValueInRange(edit.modifiedRange);
+			edits.push(EditOperation.replace(edit.originalRange, newText));
+		}
+		this.originalModel.pushEditOperations(null, edits, _ => null);
+		await this._updateDiffInfoSeq();
+		if (this._diffInfo.get().identical) {
+			this._stateObs.set(WorkingSetEntryState.Accepted, undefined);
+		}
+		return true;
+	}
+
+	private async _rejectHunk(change: DetailedLineRangeMapping): Promise<boolean> {
+		if (!this._diffInfo.get().changes.includes(change)) {
+			return false;
+		}
+		const edits: ISingleEditOperation[] = [];
+		for (const edit of change.innerChanges ?? []) {
+			const newText = this.originalModel.getValueInRange(edit.originalRange);
+			edits.push(EditOperation.replace(edit.modifiedRange, newText));
+		}
+		this.modifiedModel.pushEditOperations(null, edits, _ => null);
+		await this._updateDiffInfoSeq();
+		if (this._diffInfo.get().identical) {
+			this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
+		}
+		return true;
+	}
+
+	private _applyEdits(edits: ISingleEditOperation[]) {
+		// make the actual edit
+		this._isEditFromUs = true;
+		try {
+			let result: ISingleEditOperation[] = [];
+			this.modifiedModel.pushEditOperations(null, edits, (undoEdits) => {
+				result = undoEdits;
+				return null;
+			});
+			return result;
+		} finally {
+			this._isEditFromUs = false;
+		}
+	}
+
+	private async _updateDiffInfoSeq() {
+		const myDiffOperationId = ++this._diffOperationIds;
+		await Promise.resolve(this._diffOperation);
+		if (this._diffOperationIds === myDiffOperationId) {
+			const thisDiffOperation = this._updateDiffInfo();
+			this._diffOperation = thisDiffOperation;
+			await thisDiffOperation;
+		}
+	}
+
+	private async _updateDiffInfo(): Promise<void> {
+
+		if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed()) {
+			return;
+		}
+
+		const docVersionNow = this.modifiedModel.getVersionId();
+		const snapshotVersionNow = this.originalModel.getVersionId();
+
+		const ignoreTrimWhitespace = this._diffTrimWhitespace.get();
+
+		const diff = await this._editorWorkerService.computeDiff(
+			this.originalModel.uri,
+			this.modifiedModel.uri,
+			{ ignoreTrimWhitespace, computeMoves: false, maxComputationTimeMs: 3000 },
+			'advanced'
+		);
+
+		if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed()) {
+			return;
+		}
+
+		// only update the diff if the documents didn't change in the meantime
+		if (this.modifiedModel.getVersionId() === docVersionNow && this.originalModel.getVersionId() === snapshotVersionNow) {
+			const diff2 = diff ?? nullDocumentDiff;
+			this._diffInfo.set(diff2, undefined);
+			this._edit = OffsetEdits.fromLineRangeMapping(this.originalModel, this.modifiedModel, diff2.changes);
+		}
+	}
+
+	async _doAccept(tx: ITransaction | undefined): Promise<void> {
+		this.originalModel.setValue(this.modifiedModel.createSnapshot());
+		this._diffInfo.set(nullDocumentDiff, tx);
+		this._edit = OffsetEdit.empty;
+	}
+
+	async _doReject(tx: ITransaction | undefined): Promise<void> {
+		this._setDocValue(this.originalModel.getValue());
+	}
+
+	private _setDocValue(value: string): void {
+		if (this.modifiedModel.getValue() !== value) {
+
+			this.modifiedModel.pushStackElement();
+			const edit = EditOperation.replace(this.modifiedModel.getFullModelRange(), value);
+
+			this._applyEdits([edit]);
+			this._updateDiffInfoSeq();
+			this.modifiedModel.pushStackElement();
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
new file mode 100644
index 000000000000..8706e37e1aad
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
@@ -0,0 +1,260 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { autorun, IObservable, ISettableObservable, observableFromEvent, observableValue } from '../../../../../base/common/observable.js';
+import { debouncedObservable } from '../../../../../base/common/observableInternal/utils.js';
+import { basename } from '../../../../../base/common/resources.js';
+import { IDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
+import { localize } from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IResourceDiffEditorInput } from '../../../../common/editor.js';
+import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { INotebookEditor } from '../../../notebook/browser/notebookBrowser.js';
+import { NotebookCellTextModel } from '../../../notebook/common/model/notebookCellTextModel.js';
+import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
+import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
+import { IModifiedFileEntry, IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from '../../common/chatEditingService.js';
+import { ChatEditingCodeEditorIntegration, IDocumentDiff2 } from './chatEditingCodeEditorIntegration.js';
+
+/**
+ * All entries will contain a IDocumentDiff
+ * Even when there are no changes, diff will contain the number of lines in the document.
+ * This way we can always calculate the total number of lines in the document.
+ */
+export type ICellDiffInfo = {
+	originalCellIndex: number;
+	modifiedCellIndex: number;
+	type: 'unchanged';
+	diff: IDocumentDiff; // Null diff Change (property to be consistent with others, also we have a list of all line numbers)
+} | {
+	originalCellIndex: number;
+	modifiedCellIndex: number;
+	type: 'modified';
+	diff: IDocumentDiff2; // List of the changes.
+} |
+{
+	modifiedCellIndex: undefined;
+	originalCellIndex: number;
+	type: 'delete';
+	diff: IDocumentDiff; // List of all the lines deleted.
+} |
+{
+	modifiedCellIndex: number;
+	originalCellIndex: undefined;
+	type: 'insert';
+	diff: IDocumentDiff; // List of all the new lines.
+};
+
+
+export class ChatEditingNotebookEditorIntegration extends Disposable implements IModifiedFileEntryEditorIntegration {
+	private readonly _currentIndex = observableValue(this, -1);
+	readonly currentIndex: IObservable<number> = this._currentIndex;
+
+	// TODO@DonJayamanne For now we're going to ignore being able to focus on a deleted cell.
+	private readonly _currentCell = observableValue<NotebookCellTextModel | undefined>(this, undefined);
+	readonly currentCell: IObservable<NotebookCellTextModel | undefined> = this._currentCell;
+
+	private readonly cellEditorIntegrations = new Map<NotebookCellTextModel, { integration: ChatEditingCodeEditorIntegration; diff: ISettableObservable<IDocumentDiff2> }>();
+
+	constructor(
+		private readonly _entry: IModifiedFileEntry,
+		private readonly notebookEditor: INotebookEditor,
+		private readonly notebookModel: NotebookTextModel,
+		private readonly cellChanges: IObservable<ICellDiffInfo[]>,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IEditorService private readonly _editorService: IEditorService,
+		@IChatAgentService private readonly _chatAgentService: IChatAgentService,
+	) {
+		super();
+
+		const onDidChangeVisibleRanges = debouncedObservable(observableFromEvent(notebookEditor.onDidChangeVisibleRanges, () => notebookEditor.visibleRanges), 50);
+
+		// INIT current index when: enabled, not streaming anymore, once per request, and when having changes
+		let lastModifyingRequestId: string | undefined;
+		this._store.add(autorun(r => {
+
+			if (!_entry.isCurrentlyBeingModifiedBy.read(r)
+				&& lastModifyingRequestId !== _entry.lastModifyingRequestId
+				&& cellChanges.read(r).some(c => c.type !== 'unchanged' && c.type !== 'delete')
+			) {
+				lastModifyingRequestId = _entry.lastModifyingRequestId;
+				const firstModifiedCell = cellChanges.read(r).
+					filter(c => c.type !== 'unchanged' && c.type !== 'delete').
+					reduce((prev, curr) => curr.modifiedCellIndex < prev ? curr.modifiedCellIndex : prev, Number.MAX_SAFE_INTEGER);
+				if (typeof firstModifiedCell !== 'number' || firstModifiedCell === Number.MAX_SAFE_INTEGER) {
+					return;
+				}
+				const activeCell = notebookEditor.getActiveCell();
+				const index = activeCell ? notebookModel.cells.findIndex(c => c.handle === activeCell.handle) : firstModifiedCell;
+				this._currentCell.set(notebookModel.cells[index], undefined);
+			}
+		}));
+
+		this._register(autorun(r => {
+			const changes = cellChanges.read(r).filter(c => c.type === 'modified');
+			onDidChangeVisibleRanges.read(r);
+			if (!changes.length) {
+				this.cellEditorIntegrations.forEach(v => v.integration.dispose());
+				this.cellEditorIntegrations.clear();
+				return;
+			}
+
+			const validCells = new Set<NotebookCellTextModel>();
+			changes.forEach((diff) => {
+				const cell = notebookModel.cells[diff.modifiedCellIndex];
+				const editor = notebookEditor.codeEditors.find(([vm,]) => vm.handle === notebookModel.cells[diff.modifiedCellIndex].handle)?.[1];
+				if (!editor || !cell) {
+					return;
+				}
+				validCells.add(cell);
+				if (this.cellEditorIntegrations.has(cell)) {
+					this.cellEditorIntegrations.get(cell)!.diff.set(diff.diff, undefined);
+				} else {
+					const diff2 = observableValue(`diff${cell.handle}`, diff.diff);
+					const integration = this.instantiationService.createInstance(ChatEditingCodeEditorIntegration, _entry, editor, diff2);
+					this.cellEditorIntegrations.set(cell, { integration, diff: diff2 });
+					this._register(integration);
+					this._register(editor.onDidDispose(() => {
+						this.cellEditorIntegrations.get(cell)!.integration.dispose();
+						this.cellEditorIntegrations.delete(cell);
+					}));
+					this._register(editor.onDidChangeModel(() => {
+						if (editor.getModel() !== cell.textModel) {
+							this.cellEditorIntegrations.get(cell)!.integration.dispose();
+							this.cellEditorIntegrations.delete(cell);
+						}
+					}));
+				}
+			});
+
+			// Dispose old integrations as the editors are no longer valid.
+			this.cellEditorIntegrations.forEach((v, cell) => {
+				if (!validCells.has(cell)) {
+					v.integration.dispose();
+					this.cellEditorIntegrations.delete(cell);
+				}
+			});
+		}));
+	}
+
+	getCurrentCell() {
+		const activeCell = this.notebookModel.cells.find(c => c.handle === this.notebookEditor.getActiveCell()?.handle) || this._currentCell.get();
+		if (!activeCell) {
+			return undefined;
+		}
+		const index = this.notebookModel.cells.findIndex(c => c.handle === activeCell.handle);
+		const integration = this.cellEditorIntegrations.get(activeCell)?.integration;
+		return integration ? { integration, index: index, handle: activeCell.handle, cell: activeCell } : undefined;
+	}
+
+	getNextCell(nextOrPrevious: boolean) {
+		const current = this.getCurrentCell();
+		if (!current) {
+			// const changes = this.cellChanges.get().filter(c => c.type === 'modified' || c.type !== 'delete');
+			// if (!changes.length) {
+			// 	return undefined;
+			// }
+			// return this.getIntegrationForCell(changes[0].modifiedCellIndex);
+			return;
+		}
+		const changes = this.cellChanges.get().filter(c => c.type === 'modified' || c.type !== 'delete');
+		const nextIndex = changes.reduce((prev, curr) => {
+			if (nextOrPrevious) {
+				if (typeof curr.modifiedCellIndex !== 'number' || curr.modifiedCellIndex <= current.index) {
+					return prev;
+				}
+				return Math.min(prev, curr.modifiedCellIndex);
+			} else {
+				if (typeof curr.modifiedCellIndex !== 'number' || curr.modifiedCellIndex >= current.index) {
+					return prev;
+				}
+				return Math.max(prev, curr.modifiedCellIndex);
+			}
+		}, nextOrPrevious ? -1 : Number.MAX_SAFE_INTEGER);
+		if (nextIndex === -1 || nextIndex === Number.MAX_SAFE_INTEGER) {
+			return undefined;
+		}
+		return this.getCell(nextIndex);
+	}
+
+	getCell(modifiedCellIndex: number) {
+		const cell = this.notebookModel.cells[modifiedCellIndex];
+		const integration = this.cellEditorIntegrations.get(cell)?.integration;
+		return integration ? { integration, index: modifiedCellIndex, handle: cell.handle, cell } : undefined;
+	}
+
+	reveal(firstOrLast: boolean): void {
+		const changes = this.cellChanges.get().filter(c => c.type === 'modified' || c.type !== 'delete');
+		if (!changes.length) {
+			return undefined;
+		}
+		const index = firstOrLast ?
+			changes.reduce((prev, curr) => prev.modifiedCellIndex < curr.modifiedCellIndex ? prev : curr).modifiedCellIndex :
+			changes.reduce((prev, curr) => prev.modifiedCellIndex > curr.modifiedCellIndex ? prev : curr).modifiedCellIndex;
+		const info = this.getCell(index);
+		if (info) {
+			this._currentCell.set(info.cell, undefined);
+			info.integration.reveal(firstOrLast);
+		}
+	}
+	next(wrap: boolean): boolean {
+		const info = this.getCurrentCell();
+		if (info) {
+			if (info.integration.next(wrap)) {
+				return true;
+			} else {
+				const info = this.getNextCell(true);
+				if (info) {
+					this._currentCell.set(info.cell, undefined);
+					info.integration.reveal(true);
+					return true;
+				}
+				return false;
+			}
+		}
+		return false;
+	}
+	previous(wrap: boolean): boolean {
+		const info = this.getCurrentCell();
+		if (info) {
+			if (info.integration.previous(wrap)) {
+				return true;
+			} else {
+				const info = this.getNextCell(false);
+				if (info) {
+					this._currentCell.set(info.cell, undefined);
+					info.integration.reveal(false);
+					return true;
+				}
+				return false;
+			}
+		}
+		return false;
+	}
+	enableAccessibleDiffView(): void {
+		this.getCurrentCell()?.integration.enableAccessibleDiffView();
+	}
+	acceptNearestChange(change: IModifiedFileEntryChangeHunk): void {
+		change.accept();
+		this.next(true);
+	}
+	rejectNearestChange(change: IModifiedFileEntryChangeHunk): void {
+		change.reject();
+		this.next(true);
+	}
+	async toggleDiff(change: IModifiedFileEntryChangeHunk | undefined): Promise<void> {
+		const defaultAgentName = this._chatAgentService.getDefaultAgent(ChatAgentLocation.EditingSession)?.fullName;
+		const diffInput = {
+			original: { resource: this._entry.originalURI, options: { selection: undefined } },
+			modified: { resource: this._entry.modifiedURI, options: { selection: undefined } },
+			label: defaultAgentName
+				? localize('diff.agent', '{0} (changes from {1})', basename(this._entry.modifiedURI), defaultAgentName)
+				: localize('diff.generic', '{0} (changes from chat)', basename(this._entry.modifiedURI))
+		} satisfies IResourceDiffEditorInput;
+		await this._editorService.openEditor(diffInput);
+
+	}
+}

From d3cf790de58d30c00f4ce880c1fc8cebb4573249 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Fri, 21 Feb 2025 00:14:15 +0900
Subject: [PATCH 0161/1815] chore: avoid storing resources in memory cache
 under development (#241321)

---
 src/vs/base/common/network.ts                       |  3 +++
 .../protocol/electron-main/protocolMainService.ts   | 13 +++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts
index e77c500097a6..16bbfe74115e 100644
--- a/src/vs/base/common/network.ts
+++ b/src/vs/base/common/network.ts
@@ -357,6 +357,9 @@ class FileAccessImpl {
 
 export const FileAccess = new FileAccessImpl();
 
+export const CacheControlheaders: Record<string, string> = Object.freeze({
+	'Cache-Control': 'no-cache, no-store',
+});
 
 export namespace COI {
 
diff --git a/src/vs/platform/protocol/electron-main/protocolMainService.ts b/src/vs/platform/protocol/electron-main/protocolMainService.ts
index 86e0a616af8a..2f0c61b8a81d 100644
--- a/src/vs/platform/protocol/electron-main/protocolMainService.ts
+++ b/src/vs/platform/protocol/electron-main/protocolMainService.ts
@@ -5,7 +5,7 @@
 
 import { session } from 'electron';
 import { Disposable, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
-import { COI, FileAccess, Schemas } from '../../../base/common/network.js';
+import { COI, FileAccess, Schemas, CacheControlheaders } from '../../../base/common/network.js';
 import { basename, extname, normalize } from '../../../base/common/path.js';
 import { isLinux } from '../../../base/common/platform.js';
 import { TernarySearchTree } from '../../../base/common/ternarySearchTree.js';
@@ -104,6 +104,15 @@ export class ProtocolMainService extends Disposable implements IProtocolMainServ
 			}
 		}
 
+		// In OSS, evict resources from the memory cache in the renderer process
+		// Refs https://github.com/microsoft/vscode/issues/148541#issuecomment-2670891511
+		if (!this.environmentService.isBuilt) {
+			headers = {
+				...headers,
+				...CacheControlheaders
+			};
+		}
+
 		// first check by validRoots
 		if (this.validRoots.findSubstr(path)) {
 			return callback({ path, headers });
@@ -111,7 +120,7 @@ export class ProtocolMainService extends Disposable implements IProtocolMainServ
 
 		// then check by validExtensions
 		if (this.validExtensions.has(extname(path).toLowerCase())) {
-			return callback({ path });
+			return callback({ path, headers });
 		}
 
 		// finally block to load the resource

From 38b30e9cc17271b27179ca75f36f096058f92ccd Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Thu, 20 Feb 2025 16:42:47 +0100
Subject: [PATCH 0162/1815] Update @vscode/tree-sitter-wasm (#241351)

---
 package-lock.json            | 8 ++++----
 package.json                 | 2 +-
 remote/package-lock.json     | 8 ++++----
 remote/package.json          | 2 +-
 remote/web/package-lock.json | 8 ++++----
 remote/web/package.json      | 2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5b8eca420eba..1ce7d52275c7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,7 @@
         "@vscode/spdlog": "^0.15.0",
         "@vscode/sqlite3": "5.1.8-vscode",
         "@vscode/sudo-prompt": "9.3.1",
-        "@vscode/tree-sitter-wasm": "^0.1.2",
+        "@vscode/tree-sitter-wasm": "^0.1.3",
         "@vscode/vscode-languagedetection": "1.0.21",
         "@vscode/windows-mutex": "^0.5.0",
         "@vscode/windows-process-tree": "^0.6.0",
@@ -3157,9 +3157,9 @@
       }
     },
     "node_modules/@vscode/tree-sitter-wasm": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.1.2.tgz",
-      "integrity": "sha512-nXFrHey/TdhN2v15Qurs+trTSQB2ad0O8I8R7RMAjvrZi9qXAE+H+l9ZHHsA14fjZxKIyGg+nFmNpdEAuQALpw==",
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.1.3.tgz",
+      "integrity": "sha512-gs0+tlOfriWc6h1kXTCZvmPTuusN+SeDs7yDVZn/kKLGgqlhXFbl/gWKItxaTeryTDalN8N+ikneni6+3UDOag==",
       "license": "MIT"
     },
     "node_modules/@vscode/v8-heap-parser": {
diff --git a/package.json b/package.json
index 090d88e772cc..caf55b20f999 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "@vscode/spdlog": "^0.15.0",
     "@vscode/sqlite3": "5.1.8-vscode",
     "@vscode/sudo-prompt": "9.3.1",
-    "@vscode/tree-sitter-wasm": "^0.1.2",
+    "@vscode/tree-sitter-wasm": "^0.1.3",
     "@vscode/vscode-languagedetection": "1.0.21",
     "@vscode/windows-mutex": "^0.5.0",
     "@vscode/windows-process-tree": "^0.6.0",
diff --git a/remote/package-lock.json b/remote/package-lock.json
index ea100d67bb40..3d70b159decf 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -16,7 +16,7 @@
         "@vscode/proxy-agent": "^0.31.0",
         "@vscode/ripgrep": "^1.15.10",
         "@vscode/spdlog": "^0.15.0",
-        "@vscode/tree-sitter-wasm": "^0.1.2",
+        "@vscode/tree-sitter-wasm": "^0.1.3",
         "@vscode/vscode-languagedetection": "1.0.21",
         "@vscode/windows-process-tree": "^0.6.0",
         "@vscode/windows-registry": "^1.1.0",
@@ -470,9 +470,9 @@
       }
     },
     "node_modules/@vscode/tree-sitter-wasm": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.1.2.tgz",
-      "integrity": "sha512-nXFrHey/TdhN2v15Qurs+trTSQB2ad0O8I8R7RMAjvrZi9qXAE+H+l9ZHHsA14fjZxKIyGg+nFmNpdEAuQALpw==",
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.1.3.tgz",
+      "integrity": "sha512-gs0+tlOfriWc6h1kXTCZvmPTuusN+SeDs7yDVZn/kKLGgqlhXFbl/gWKItxaTeryTDalN8N+ikneni6+3UDOag==",
       "license": "MIT"
     },
     "node_modules/@vscode/vscode-languagedetection": {
diff --git a/remote/package.json b/remote/package.json
index 0733c0bb042d..f42bc392fb61 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -11,7 +11,7 @@
     "@vscode/proxy-agent": "^0.31.0",
     "@vscode/ripgrep": "^1.15.10",
     "@vscode/spdlog": "^0.15.0",
-    "@vscode/tree-sitter-wasm": "^0.1.2",
+    "@vscode/tree-sitter-wasm": "^0.1.3",
     "@vscode/vscode-languagedetection": "1.0.21",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 6bde53d629ba..e13c2c65e521 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -11,7 +11,7 @@
 				"@microsoft/1ds-core-js": "^3.2.13",
 				"@microsoft/1ds-post-js": "^3.2.13",
 				"@vscode/iconv-lite-umd": "0.7.0",
-				"@vscode/tree-sitter-wasm": "^0.1.2",
+				"@vscode/tree-sitter-wasm": "^0.1.3",
 				"@vscode/vscode-languagedetection": "1.0.21",
 				"@xterm/addon-clipboard": "^0.2.0-beta.81",
 				"@xterm/addon-image": "^0.9.0-beta.98",
@@ -76,9 +76,9 @@
 			"integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg=="
 		},
 		"node_modules/@vscode/tree-sitter-wasm": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.1.2.tgz",
-			"integrity": "sha512-nXFrHey/TdhN2v15Qurs+trTSQB2ad0O8I8R7RMAjvrZi9qXAE+H+l9ZHHsA14fjZxKIyGg+nFmNpdEAuQALpw==",
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.1.3.tgz",
+			"integrity": "sha512-gs0+tlOfriWc6h1kXTCZvmPTuusN+SeDs7yDVZn/kKLGgqlhXFbl/gWKItxaTeryTDalN8N+ikneni6+3UDOag==",
 			"license": "MIT"
 		},
 		"node_modules/@vscode/vscode-languagedetection": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 3e3b5d5ed1e9..78336aa2fa45 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -6,7 +6,7 @@
 		"@microsoft/1ds-core-js": "^3.2.13",
 		"@microsoft/1ds-post-js": "^3.2.13",
 		"@vscode/iconv-lite-umd": "0.7.0",
-		"@vscode/tree-sitter-wasm": "^0.1.2",
+		"@vscode/tree-sitter-wasm": "^0.1.3",
 		"@vscode/vscode-languagedetection": "1.0.21",
 		"@xterm/addon-clipboard": "^0.2.0-beta.81",
 		"@xterm/addon-image": "^0.9.0-beta.98",

From 1e2f34a9a5c3c1b3b083e06e8fe56ba8dfd90404 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 20 Feb 2025 09:55:45 -0600
Subject: [PATCH 0163/1815] ensure zsh version >= last version used to generate
 zsh command descriptions (#241357)

fix #241235
---
 .../terminal-suggest/scripts/pullZshBuiltins.ts    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/extensions/terminal-suggest/scripts/pullZshBuiltins.ts b/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
index 7cc802c759d3..30878aa11548 100644
--- a/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
+++ b/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
@@ -14,6 +14,8 @@ if (platform() === 'win32') {
 	process.exit(1);
 }
 
+const latestZshVersion = 5.9;
+
 const shortDescriptions: Map<string, string> = new Map([
 	['.', 'Source a file'],
 	[':', 'No effect'],
@@ -135,7 +137,17 @@ let zshBuiltinsCommandDescriptionsCache = new Map<string, ICommandDetails>();
 async function createCommandDescriptionsCache(): Promise<void> {
 	const cachedCommandDescriptions: Map<string, { shortDescription?: string; description: string; args: string | undefined }> = new Map();
 	let output = '';
-
+	const zshVersionOutput = await execAsync('zsh --version').then(r => r.stdout);
+	const zshVersionMatch = zshVersionOutput.match(/zsh (\d+\.\d+)/);
+	if (!zshVersionMatch) {
+		console.error('\x1b[31mFailed to determine zsh version\x1b[0m');
+		process.exit(1);
+	}
+	const zshVersion = parseFloat(zshVersionMatch[1]);
+	if (zshVersion < latestZshVersion) {
+		console.error(`\x1b[31mZsh version must be ${latestZshVersion} or higher\x1b[0m`);
+		process.exit(1);
+	}
 	try {
 		output = await execAsync('pandoc --from man --to markdown --wrap=none < $(man -w zshbuiltins)').then(r => r.stdout);
 	} catch {

From 55be3d7d7aee856189849c42fbc77466940ed020 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 20 Feb 2025 09:57:53 -0600
Subject: [PATCH 0164/1815] append `activeEditorState` when in screen reader
 mode by default (#241229)

---
 .../browser/parts/titlebar/windowTitle.ts        | 16 ++++++++++++++--
 .../workbench/browser/workbench.contribution.ts  |  2 +-
 .../browser/accessibilityConfiguration.ts        |  7 ++++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/browser/parts/titlebar/windowTitle.ts b/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
index b80ede705399..aa7cb6da5c35 100644
--- a/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
+++ b/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
@@ -30,10 +30,11 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { getWindowById } from '../../../../base/browser/dom.js';
 import { CodeWindow } from '../../../../base/browser/window.js';
 import { IDecorationsService } from '../../../services/decorations/common/decorations.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
 
 const enum WindowSettingNames {
 	titleSeparator = 'window.titleSeparator',
-	title = 'window.title'
+	title = 'window.title',
 }
 
 export const defaultWindowTitle = (() => {
@@ -98,7 +99,8 @@ export class WindowTitle extends Disposable {
 		@IUserDataProfileService private readonly userDataProfileService: IUserDataProfileService,
 		@IProductService private readonly productService: IProductService,
 		@IViewsService private readonly viewsService: IViewsService,
-		@IDecorationsService private readonly decorationsService: IDecorationsService
+		@IDecorationsService private readonly decorationsService: IDecorationsService,
+		@IAccessibilityService private readonly accessibilityService: IAccessibilityService
 	) {
 		super();
 
@@ -128,6 +130,12 @@ export class WindowTitle extends Disposable {
 				this.titleUpdater.schedule();
 			}
 		}));
+		this._register(this.accessibilityService.onDidChangeScreenReaderOptimized(() => {
+			if (this.accessibilityService.isScreenReaderOptimized() && !this.titleIncludesEditorState
+				|| !this.accessibilityService.isScreenReaderOptimized() && this.titleIncludesEditorState) {
+				this.titleUpdater.schedule();
+			}
+		}));
 	}
 
 	private onConfigurationChanged(event: IConfigurationChangeEvent): void {
@@ -372,6 +380,10 @@ export class WindowTitle extends Disposable {
 			titleTemplate = defaultWindowTitle;
 		}
 
+		if (!this.titleIncludesEditorState && this.accessibilityService.isScreenReaderOptimized() && this.configurationService.getValue('accessibility.windowTitleOptimized')) {
+			titleTemplate += '${separator}${activeEditorState}';
+		}
+
 		let separator = this.configurationService.getValue<string>(WindowSettingNames.titleSeparator);
 		if (typeof separator !== 'string') {
 			separator = defaultWindowTitleSeparator;
diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
index ca6f3d7a34d1..5e785e81b938 100644
--- a/src/vs/workbench/browser/workbench.contribution.ts
+++ b/src/vs/workbench/browser/workbench.contribution.ts
@@ -682,7 +682,7 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 		localize('focusedView', "`${focusedView}`: the name of the view that is currently focused."),
 		localize('activeRepositoryName', "`${activeRepositoryName}`: the name of the active repository (e.g. vscode)."),
 		localize('activeRepositoryBranchName', "`${activeRepositoryBranchName}`: the name of the active branch in the active repository (e.g. main)."),
-		localize('activeEditorState', "`${activeEditorState}`: provides information about the state of the active editor (e.g. modified)."),
+		localize('activeEditorState', "`${activeEditorState}`: provides information about the state of the active editor (e.g. modified). This will be appended by default when in screen reader mode with {0} enabled.", '`accessibility.windowTitleOptimized`'),
 		localize('separator', "`${separator}`: a conditional separator (\" - \") that only shows when surrounded by variables with values or static text.")
 	].join('\n- '); // intentionally concatenated to not produce a string that is too long for translations
 
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts b/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
index 19866e023387..6a03116343f4 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
@@ -728,7 +728,12 @@ const configuration: IConfigurationNode = {
 			enum: ['none', 'input', 'lastExecution'],
 			default: 'input',
 			description: localize('replEditor.autoFocusAppendedCell', "Control whether focus should automatically be sent to the REPL when code is executed."),
-		}
+		},
+		'accessibility.windowTitleOptimized': {
+			'type': 'boolean',
+			'default': true,
+			'markdownDescription': localize('accessibility.windowTitleOptimized', "Controls whether the {0} should be optimized for screen readers when in screen reader mode. When enabled, the window title will have {1} appended to the end.", '`#window.title#`', '`activeEditorState`')
+		},
 	}
 };
 

From efecfedc3cc6c18304aa1ef3f3891e51fa1487bc Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 20 Feb 2025 17:32:08 +0100
Subject: [PATCH 0165/1815] status - more localize use (#241360)

---
 .../browser/inlineCompletionLanguageStatusBarContribution.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts b/src/vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts
index 9c5af29e46b6..8071173c0483 100644
--- a/src/vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts
+++ b/src/vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts
@@ -45,7 +45,7 @@ export class InlineCompletionLanguageStatusBarContribution extends Disposable {
 			const status = state.status.read(reader);
 
 			const statusMap: Record<typeof status, { shortLabel: string; label: string; loading: boolean }> = {
-				loading: { shortLabel: '', label: 'Loading', loading: true, },
+				loading: { shortLabel: '', label: localize('inlineSuggestionLoading', "Loading..."), loading: true, },
 				ghostText: { shortLabel: '$(lightbulb)', label: '$(copilot) ' + localize('inlineCompletionAvailable', "Inline completion available"), loading: false, },
 				inlineEdit: { shortLabel: '$(lightbulb-sparkle)', label: '$(copilot) ' + localize('inlineEditAvailable', "Inline edit available"), loading: false, },
 				noSuggestion: { shortLabel: '$(circle-slash)', label: '$(copilot) ' + localize('noInlineSuggestionAvailable', "No inline suggestion available"), loading: false, },

From 468e0e6cdc9ff9aade96bec6ec1f36e1dea6c48d Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 20 Feb 2025 17:42:35 +0100
Subject: [PATCH 0166/1815] =?UTF-8?q?SCM=20-=20=F0=9F=92=84=20fix=20dispos?=
 =?UTF-8?q?able=20leaks=20(#241363)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts    | 5 +++--
 .../contrib/scm/browser/scmRepositoriesViewPane.ts         | 7 ++++---
 src/vs/workbench/contrib/scm/browser/scmViewPane.ts        | 3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts b/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
index fc97c0071aba..f22648c7169b 100644
--- a/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
+++ b/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
@@ -351,13 +351,14 @@ class QuickDiffWidget extends PeekViewWidget {
 
 	protected override _getActionBarOptions(): IActionBarOptions {
 		const actionRunner = new QuickDiffWidgetActionRunner();
+		this._disposables.add(actionRunner);
 
 		// close widget on successful action
-		actionRunner.onDidRun(e => {
+		this._disposables.add(actionRunner.onDidRun(e => {
 			if (!(e.action instanceof QuickDiffWidgetEditorAction) && !e.error) {
 				this.dispose();
 			}
-		});
+		}));
 
 		return {
 			...super._getActionBarOptions(),
diff --git a/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
index d1311889aad2..60b0c28c4343 100644
--- a/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
@@ -149,16 +149,17 @@ export class SCMRepositoriesViewPane extends ViewPane {
 		const menu = menus.repositoryContextMenu;
 		const actions = collectContextMenuActions(menu);
 
-		const actionRunner = this._register(new RepositoryActionRunner(() => {
+		const actionRunner = new RepositoryActionRunner(() => {
 			return this.list.getSelectedElements();
-		}));
+		});
 		actionRunner.onWillRun(() => this.list.domFocus());
 
 		this.contextMenuService.showContextMenu({
 			actionRunner,
 			getAnchor: () => e.anchor,
 			getActions: () => actions,
-			getActionsContext: () => provider
+			getActionsContext: () => provider,
+			onHide: () => actionRunner.dispose()
 		});
 	}
 
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index cec11c8fff97..58a42b2abb90 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -2603,10 +2603,11 @@ export class SCMViewPane extends ViewPane {
 		actionRunner.onWillRun(() => this.tree.domFocus());
 
 		this.contextMenuService.showContextMenu({
+			actionRunner,
 			getAnchor: () => e.anchor,
 			getActions: () => actions,
 			getActionsContext: () => context,
-			actionRunner
+			onHide: () => actionRunner.dispose()
 		});
 	}
 

From 01525ec7b61c3b90cca339a7f9e26aaabbb40a49 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Thu, 20 Feb 2025 09:16:51 -0800
Subject: [PATCH 0167/1815] debt: fix more Settings editor leaks (#241279)

Fixes #240778
---
 .../preferences/browser/settingsEditor2.ts    | 61 +++++++++++--------
 .../preferences/browser/settingsTreeModels.ts | 25 +++++---
 2 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
index b0a2617012f4..858c1a619859 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -175,7 +175,7 @@ export class SettingsEditor2 extends EditorPane {
 	private settingsTree!: SettingsTree;
 	private settingRenderers!: SettingTreeRenderers;
 	private tocTreeModel!: TOCTreeModel;
-	private settingsTreeModel!: SettingsTreeModel;
+	private readonly settingsTreeModel = this._register(new MutableDisposable<SettingsTreeModel>());
 	private noResultsMessage!: HTMLElement;
 	private clearFilterLinkContainer!: HTMLElement;
 
@@ -193,7 +193,7 @@ export class SettingsEditor2 extends EditorPane {
 	private pendingSettingUpdate: { key: string; value: any; languageFilter: string | undefined } | null = null;
 
 	private readonly viewState: ISettingsEditorViewState;
-	private _searchResultModel: SearchResultModel | null = null;
+	private readonly _searchResultModel = this._register(new MutableDisposable<SearchResultModel>());
 	private searchResultLabel: string | null = null;
 	private lastSyncedLabel: string | null = null;
 	private settingsOrderByTocIndex: Map<string, number> | null = null;
@@ -203,7 +203,7 @@ export class SettingsEditor2 extends EditorPane {
 	private inSettingsEditorContextKey: IContextKey<boolean>;
 	private searchFocusContextKey: IContextKey<boolean>;
 
-	private scheduledRefreshes: Map<string, DOM.IFocusTracker>;
+	private scheduledRefreshes: Map<string, DisposableStore>;
 	private _currentFocusContext: SettingsFocusContext = SettingsFocusContext.Search;
 
 	/** Don't spam warnings */
@@ -265,7 +265,7 @@ export class SettingsEditor2 extends EditorPane {
 		this.tocRowFocused = CONTEXT_TOC_ROW_FOCUS.bindTo(contextKeyService);
 		this.settingRowFocused = CONTEXT_SETTINGS_ROW_FOCUS.bindTo(contextKeyService);
 
-		this.scheduledRefreshes = new Map<string, DOM.IFocusTracker>();
+		this.scheduledRefreshes = new Map<string, DisposableStore>();
 
 		this.editorMemento = this.getEditorMemento<ISettingsEditor2State>(editorGroupService, textResourceConfigurationService, SETTINGS_EDITOR_STATE_KEY);
 
@@ -286,8 +286,8 @@ export class SettingsEditor2 extends EditorPane {
 		this._register(workspaceTrustManagementService.onDidChangeTrust(() => {
 			this.searchResultModel?.updateWorkspaceTrust(workspaceTrustManagementService.isWorkspaceTrusted());
 
-			if (this.settingsTreeModel) {
-				this.settingsTreeModel.updateWorkspaceTrust(workspaceTrustManagementService.isWorkspaceTrusted());
+			if (this.settingsTreeModel.value) {
+				this.settingsTreeModel.value.updateWorkspaceTrust(workspaceTrustManagementService.isWorkspaceTrusted());
 				this.renderTree();
 			}
 		}));
@@ -330,18 +330,18 @@ export class SettingsEditor2 extends EditorPane {
 	override set minimumWidth(value: number) { /*noop*/ }
 	override set maximumWidth(value: number) { /*noop*/ }
 
-	private get currentSettingsModel() {
-		return this.searchResultModel || this.settingsTreeModel;
+	private get currentSettingsModel(): SettingsTreeModel | undefined {
+		return this.searchResultModel || this.settingsTreeModel.value;
 	}
 
 	private get searchResultModel(): SearchResultModel | null {
-		return this._searchResultModel;
+		return this._searchResultModel.value ?? null;
 	}
 
 	private set searchResultModel(value: SearchResultModel | null) {
-		this._searchResultModel = value;
+		this._searchResultModel.value = value ?? undefined;
 
-		this.rootElement.classList.toggle('search-mode', !!this._searchResultModel);
+		this.rootElement.classList.toggle('search-mode', !!this._searchResultModel.value);
 	}
 
 	private get focusedSettingDOMElement(): HTMLElement | undefined {
@@ -721,7 +721,7 @@ export class SettingsEditor2 extends EditorPane {
 	}
 
 	private onDidClickSetting(evt: ISettingLinkClickEvent, recursed?: boolean): void {
-		const targetElement = this.currentSettingsModel.getElementsByName(evt.targetKey)?.[0];
+		const targetElement = this.currentSettingsModel?.getElementsByName(evt.targetKey)?.[0];
 		let revealFailed = false;
 		if (targetElement) {
 			let sourceTop = 0.5;
@@ -1247,13 +1247,15 @@ export class SettingsEditor2 extends EditorPane {
 			this.scheduledRefreshes.clear();
 		}
 
+		const store = new DisposableStore();
 		const scheduledRefreshTracker = DOM.trackFocus(element);
-		this.scheduledRefreshes.set(key, scheduledRefreshTracker);
-		scheduledRefreshTracker.onDidBlur(() => {
-			scheduledRefreshTracker.dispose();
+		store.add(scheduledRefreshTracker);
+		store.add(scheduledRefreshTracker.onDidBlur(() => {
+			this.scheduledRefreshes.get(key)?.dispose();
 			this.scheduledRefreshes.delete(key);
 			this.onConfigUpdate(new Set([key]));
-		});
+		}));
+		this.scheduledRefreshes.set(key, store);
 	}
 
 	private createSettingsOrderByTocIndex(resolvedSettingsRoot: ITOCEntry<ISetting>): Map<string, number> {
@@ -1278,8 +1280,9 @@ export class SettingsEditor2 extends EditorPane {
 	}
 
 	private refreshModels(resolvedSettingsRoot: ITOCEntry<ISetting>) {
-		this.settingsTreeModel.update(resolvedSettingsRoot);
-		this.tocTreeModel.settingsTreeRoot = this.settingsTreeModel.root;
+		// Both calls to refreshModels require a valid settingsTreeModel.
+		this.settingsTreeModel.value!.update(resolvedSettingsRoot);
+		this.tocTreeModel.settingsTreeRoot = this.settingsTreeModel.value!.root;
 		this.settingsOrderByTocIndex = this.createSettingsOrderByTocIndex(resolvedSettingsRoot);
 	}
 
@@ -1430,10 +1433,10 @@ export class SettingsEditor2 extends EditorPane {
 
 		this.searchResultModel?.updateChildren();
 
-		if (this.settingsTreeModel) {
+		if (this.settingsTreeModel.value) {
 			this.refreshModels(resolvedSettingsRoot);
 
-			if (schemaChange && !!this.searchResultModel) {
+			if (schemaChange && 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();
 			}
@@ -1441,7 +1444,7 @@ export class SettingsEditor2 extends EditorPane {
 			this.refreshTOCTree();
 			this.renderTree(undefined, forceRefresh);
 		} else {
-			this.settingsTreeModel = this.instantiationService.createInstance(SettingsTreeModel, this.viewState, this.workspaceTrustManagementService.isWorkspaceTrusted());
+			this.settingsTreeModel.value = this.instantiationService.createInstance(SettingsTreeModel, this.viewState, this.workspaceTrustManagementService.isWorkspaceTrusted());
 			this.refreshModels(resolvedSettingsRoot);
 
 			// Don't restore the cached state if we already have a query value from calling _setOptions().
@@ -1462,8 +1465,8 @@ export class SettingsEditor2 extends EditorPane {
 				keys.forEach(key => this.searchResultModel!.updateElementsByName(key));
 			}
 
-			if (this.settingsTreeModel) {
-				keys.forEach(key => this.settingsTreeModel.updateElementsByName(key));
+			if (this.settingsTreeModel.value) {
+				keys.forEach(key => this.settingsTreeModel.value!.updateElementsByName(key));
 			}
 
 			keys.forEach(key => this.renderTree(key));
@@ -1519,8 +1522,8 @@ export class SettingsEditor2 extends EditorPane {
 		this.renderResultCountMessages();
 
 		if (key) {
-			const elements = this.currentSettingsModel.getElementsByName(key);
-			if (elements && elements.length) {
+			const elements = this.currentSettingsModel?.getElementsByName(key);
+			if (elements?.length) {
 				if (elements.length >= 2) {
 					console.warn('More than one setting with key ' + key + ' found');
 				}
@@ -1547,7 +1550,7 @@ export class SettingsEditor2 extends EditorPane {
 	}
 
 	private refreshTree(): void {
-		if (this.isVisible()) {
+		if (this.isVisible() && this.currentSettingsModel) {
 			this.settingsTree.setChildren(null, createGroupIterator(this.currentSettingsModel.root));
 		}
 	}
@@ -1560,6 +1563,9 @@ export class SettingsEditor2 extends EditorPane {
 	}
 
 	private updateModifiedLabelForKey(key: string): void {
+		if (!this.currentSettingsModel) {
+			return;
+		}
 		const dataElements = this.currentSettingsModel.getElementsByName(key);
 		const isModified = dataElements && dataElements[0] && dataElements[0].isConfigured; // all elements are either configured or not
 		const elements = this.settingRenderers.getDOMElementsForSettingKey(this.settingsTree.getHTMLElement(), key);
@@ -1809,6 +1815,9 @@ export class SettingsEditor2 extends EditorPane {
 	}
 
 	private layoutSplitView(dimension: DOM.Dimension): void {
+		if (!this.isVisible()) {
+			return;
+		}
 		const listHeight = dimension.height - (72 + 11 + 14 /* header height + editor padding */);
 
 		this.splitView.el.style.height = `${listHeight}px`;
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
index a267f7d219f6..f436320f5eeb 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
@@ -15,7 +15,7 @@ import { IExtensionSetting, ISearchResult, ISetting, ISettingMatch, SettingMatch
 import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 import { FOLDER_SCOPES, WORKSPACE_SCOPES, REMOTE_MACHINE_SCOPES, LOCAL_MACHINE_SCOPES, IWorkbenchConfigurationService, APPLICATION_SCOPES } from '../../../services/configuration/common/configuration.js';
 import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { ConfigurationDefaultValueSource, ConfigurationScope, EditPresentationTypes, Extensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
@@ -510,7 +510,7 @@ function createSettingMatchRegExp(pattern: string): RegExp {
 	return new RegExp(`^${pattern}$`, 'i');
 }
 
-export class SettingsTreeModel {
+export class SettingsTreeModel implements IDisposable {
 	protected _root!: SettingsTreeGroupElement;
 	private _tocRoot!: ITOCEntry<ISetting>;
 	private readonly _treeElementsBySettingName = new Map<string, SettingsTreeSettingElement[]>();
@@ -540,6 +540,7 @@ export class SettingsTreeModel {
 		if (this._root) {
 			this.disposeChildren(this._root.children);
 			this._root.children = newRoot.children;
+			newRoot.dispose();
 		} else {
 			this._root = newRoot;
 		}
@@ -552,11 +553,11 @@ export class SettingsTreeModel {
 
 	private disposeChildren(children: SettingsTreeGroupChild[]) {
 		for (const child of children) {
-			this.recursiveDispose(child);
+			this.disposeChildAndRecurse(child);
 		}
 	}
 
-	private recursiveDispose(element: SettingsTreeElement) {
+	private disposeChildAndRecurse(element: SettingsTreeElement) {
 		if (element instanceof SettingsTreeGroupElement) {
 			this.disposeChildren(element.children);
 		}
@@ -593,9 +594,14 @@ export class SettingsTreeModel {
 
 		const children: SettingsTreeGroupChild[] = [];
 		if (tocEntry.settings) {
-			const settingChildren = tocEntry.settings.map(s => this.createSettingsTreeSettingElement(s, element))
-				.filter(el => el.setting.deprecationMessage ? el.isConfigured : true);
-			children.push(...settingChildren);
+			const settingChildren = tocEntry.settings.map(s => this.createSettingsTreeSettingElement(s, element));
+			for (const child of settingChildren) {
+				if (!child.setting.deprecationMessage || child.isConfigured) {
+					children.push(child);
+				} else {
+					child.dispose();
+				}
+			}
 		}
 
 		if (tocEntry.children) {
@@ -633,6 +639,11 @@ export class SettingsTreeModel {
 		this._treeElementsBySettingName.set(setting.key, nameElements);
 		return element;
 	}
+
+	dispose() {
+		this._treeElementsBySettingName.clear();
+		this.disposeChildAndRecurse(this._root);
+	}
 }
 
 interface IInspectResult {

From 75fffb01dc5f4619ef6c607e4a9a8a1084b261b5 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Fri, 21 Feb 2025 05:10:10 +1100
Subject: [PATCH 0168/1815] Fix notebook edit navigation and decorations
 (#241366)

---
 .../chatEditingModifiedNotebookEntry.ts       |  66 +++++----
 .../chatEditingNotebookEditorIntegration.ts   | 135 ++++++++++++++----
 .../notebookDeletedCellDecorator.ts           |   2 +-
 3 files changed, 147 insertions(+), 56 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 1d162e1ebb34..4a95cd98cdab 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -51,7 +51,7 @@ import { IChatResponseModel } from '../../common/chatModel.js';
 import { IChatService } from '../../common/chatService.js';
 import { IDocumentDiff2 } from './chatEditingCodeEditorIntegration.js';
 import { AbstractChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISnapshotEntry, pendingRewriteMinimap } from './chatEditingModifiedFileEntry.js';
-import { ChatEditingNotebookEditorIntegration, ICellDiffInfo } from './chatEditingNotebookEditorIntegration.js';
+import { ChatEditingNotebookEditorIntegration, countChanges, ICellDiffInfo } from './chatEditingNotebookEditorIntegration.js';
 import { ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
 
 
@@ -163,7 +163,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	}
 
 	mirrorNotebookEdits(e: NotebookTextModelChangedEvent) {
-		if (this._isEditFromUs) {
+		if (this._isEditFromUs || Array.from(this.cellEntryMap.values()).some(entry => entry.isEditFromUs)) {
 			// TODO@DonJayamanne Apply this same edit to the original notebook.
 			return;
 		}
@@ -188,10 +188,8 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		const snapshot = this.modifiedModel.createSnapshot({ context: SnapshotContext.Backup, outputSizeLimit, transientOptions: this.transientOptions });
 		this.originalModel.restoreSnapshot(snapshot, this.transientOptions);
 		this._changesCount.set(0, tx);
-		// this._diffInfo.set(nullDocumentDiff, tx);
-		// this._edit = OffsetEdit.empty;
+		this._cellDiffInfo.set(this.modifiedModel.cells.map((cell, i) => ({ modifiedCellIndex: i, originalCellIndex: i, diff: nullDocumentDiff, type: 'unchanged' })), undefined);
 		await this._collapse(tx);
-
 	}
 
 	protected override async _doReject(tx: ITransaction | undefined): Promise<void> {
@@ -219,7 +217,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	protected override _createEditorIntegration(editor: IEditorPane): IModifiedFileEntryEditorIntegration {
 		const notebookEditor = getNotebookEditorFromEditorPane(editor);
 		assertType(notebookEditor);
-		return this._instantiationService.createInstance(ChatEditingNotebookEditorIntegration, this, notebookEditor, this.modifiedModel, this._cellDiffInfo);
+		return this._instantiationService.createInstance(ChatEditingNotebookEditorIntegration, this, notebookEditor, this.modifiedModel, this.originalModel, this._cellDiffInfo);
 	}
 
 	protected override _resetEditsState(tx: ITransaction): void {
@@ -314,13 +312,13 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 					}
 				} satisfies ICellDiffInfo;
 			});
-			diff.splice(edit.index, 0, ...diffInsert);
+			diff.splice(edit.index + 1, 0, ...diffInsert);
 			this._cellDiffInfo.set(diff, undefined);
 		} else {
 			// All existing indexes are shifted by number of cells removed.
 			// And unchanged cells should be converted to deleted cells.
 			const diff = this._cellDiffInfo.get().slice().map(d => {
-				if (d.type === 'unchanged' && d.modifiedCellIndex >= (edit.index + edit.count - 1)) {
+				if (d.type === 'unchanged' && d.modifiedCellIndex >= edit.index && d.modifiedCellIndex <= (edit.index + edit.count - 1)) {
 					const originalCell = this.originalModel.cells[d.originalCellIndex];
 					const lines = new Array(originalCell.textBuffer.getLineCount()).fill(0).map((_, i) => originalCell.textBuffer.getLineContent(i + 1));
 					const originalRange = new Range(1, 0, lines.length, lines[lines.length - 1].length);
@@ -443,7 +441,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 
 		this._register(autorun(r => {
 			const cellDiff = cellEntry.diffInfo.read(r);
-			const diffs = this.cellDiffInfo.get().slice();
+			let diffs = this.cellDiffInfo.get().slice();
 			const entry = diffs.find(entry => entry.modifiedCellIndex === index);
 			if (!entry) {
 				// Not possible.
@@ -454,8 +452,9 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			if (entry.type === 'unchanged' || entry.type === 'modified') {
 				entry.type = cellDiff.identical ? 'unchanged' : 'modified';
 			}
+			diffs = diffs.filter(entry => entry.modifiedCellIndex !== index).concat({ ...entry });
 			const maxModifiedLineNumber = cellEntry.maxModifiedLineNumber.read(r);
-			const changeCount = diffs.reduce((count, diff) => count + diff.diff.changes.length, 0);
+			const changeCount = countChanges(diffs);
 			const maxModifiedLineNumbers = this._maxModifiedLineNumbers.get().slice();
 			maxModifiedLineNumbers[index] = maxModifiedLineNumber;
 
@@ -543,6 +542,10 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 	}
 	private _edit: OffsetEdit = OffsetEdit.empty;
 	private _isEditFromUs: boolean = false;
+	public get isEditFromUs(): boolean {
+		return this._isEditFromUs;
+	}
+
 	private _allEditsAreFromUs: boolean = true;
 	public get allEditsAreFromUs(): boolean {
 		return this._allEditsAreFromUs;
@@ -731,16 +734,22 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 	}
 
 	private async _acceptHunk(change: DetailedLineRangeMapping): Promise<boolean> {
-		if (!this._diffInfo.get().changes.includes(change)) {
-			// diffInfo should have model version ids and check them (instead of the caller doing that)
-			return false;
+		this._isEditFromUs = true;
+		try {
+			if (!this._diffInfo.get().changes.includes(change)) {
+				// diffInfo should have model version ids and check them (instead of the caller doing that)
+				return false;
+			}
+			const edits: ISingleEditOperation[] = [];
+			for (const edit of change.innerChanges ?? []) {
+				const newText = this.modifiedModel.getValueInRange(edit.modifiedRange);
+				edits.push(EditOperation.replace(edit.originalRange, newText));
+			}
+			this.originalModel.pushEditOperations(null, edits, _ => null);
 		}
-		const edits: ISingleEditOperation[] = [];
-		for (const edit of change.innerChanges ?? []) {
-			const newText = this.modifiedModel.getValueInRange(edit.modifiedRange);
-			edits.push(EditOperation.replace(edit.originalRange, newText));
+		finally {
+			this._isEditFromUs = false;
 		}
-		this.originalModel.pushEditOperations(null, edits, _ => null);
 		await this._updateDiffInfoSeq();
 		if (this._diffInfo.get().identical) {
 			this._stateObs.set(WorkingSetEntryState.Accepted, undefined);
@@ -749,15 +758,20 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 	}
 
 	private async _rejectHunk(change: DetailedLineRangeMapping): Promise<boolean> {
-		if (!this._diffInfo.get().changes.includes(change)) {
-			return false;
-		}
-		const edits: ISingleEditOperation[] = [];
-		for (const edit of change.innerChanges ?? []) {
-			const newText = this.originalModel.getValueInRange(edit.originalRange);
-			edits.push(EditOperation.replace(edit.modifiedRange, newText));
+		this._isEditFromUs = true;
+		try {
+			if (!this._diffInfo.get().changes.includes(change)) {
+				return false;
+			}
+			const edits: ISingleEditOperation[] = [];
+			for (const edit of change.innerChanges ?? []) {
+				const newText = this.originalModel.getValueInRange(edit.originalRange);
+				edits.push(EditOperation.replace(edit.modifiedRange, newText));
+			}
+			this.modifiedModel.pushEditOperations(null, edits, _ => null);
+		} finally {
+			this._isEditFromUs = false;
 		}
-		this.modifiedModel.pushEditOperations(null, edits, _ => null);
 		await this._updateDiffInfoSeq();
 		if (this._diffInfo.get().identical) {
 			this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
index 8706e37e1aad..eab0b89cf2f9 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
@@ -4,14 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { autorun, IObservable, ISettableObservable, observableFromEvent, observableValue } from '../../../../../base/common/observable.js';
+import { autorun, derivedWithStore, IObservable, ISettableObservable, observableFromEvent, observableValue } from '../../../../../base/common/observable.js';
 import { debouncedObservable } from '../../../../../base/common/observableInternal/utils.js';
 import { basename } from '../../../../../base/common/resources.js';
-import { IDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
+import { IDocumentDiff, nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
 import { localize } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IResourceDiffEditorInput } from '../../../../common/editor.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
+import { NotebookDeletedCellDecorator } from '../../../notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.js';
+import { NotebookInsertedCellDecorator } from '../../../notebook/browser/diff/inlineDiff/notebookInsertedCellDecorator.js';
 import { INotebookEditor } from '../../../notebook/browser/notebookBrowser.js';
 import { NotebookCellTextModel } from '../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
@@ -63,6 +65,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 		private readonly _entry: IModifiedFileEntry,
 		private readonly notebookEditor: INotebookEditor,
 		private readonly notebookModel: NotebookTextModel,
+		originalModel: NotebookTextModel,
 		private readonly cellChanges: IObservable<ICellDiffInfo[]>,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IEditorService private readonly _editorService: IEditorService,
@@ -71,6 +74,8 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 		super();
 
 		const onDidChangeVisibleRanges = debouncedObservable(observableFromEvent(notebookEditor.onDidChangeVisibleRanges, () => notebookEditor.visibleRanges), 50);
+		const notebookEdotirViewModelAttached = observableFromEvent(notebookEditor.onDidAttachViewModel, () => notebookEditor.getViewModel());
+
 
 		// INIT current index when: enabled, not streaming anymore, once per request, and when having changes
 		let lastModifyingRequestId: string | undefined;
@@ -97,8 +102,9 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 			const changes = cellChanges.read(r).filter(c => c.type === 'modified');
 			onDidChangeVisibleRanges.read(r);
 			if (!changes.length) {
-				this.cellEditorIntegrations.forEach(v => v.integration.dispose());
-				this.cellEditorIntegrations.clear();
+				this.cellEditorIntegrations.forEach(({ diff }) => {
+					diff.set({ ...diff.get(), ...nullDocumentDiff }, undefined);
+				});
 				return;
 			}
 
@@ -115,6 +121,13 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 				} else {
 					const diff2 = observableValue(`diff${cell.handle}`, diff.diff);
 					const integration = this.instantiationService.createInstance(ChatEditingCodeEditorIntegration, _entry, editor, diff2);
+					this._register(autorun((r) => {
+						const current = integration.currentIndex.read(r);
+						const indexOfChange = current >= 0 ? this.getIndexOfChange(cell, current) : -1;
+						if (indexOfChange >= 0) {
+							this._currentIndex.set(indexOfChange, undefined);
+						}
+					}));
 					this.cellEditorIntegrations.set(cell, { integration, diff: diff2 });
 					this._register(integration);
 					this._register(editor.onDidDispose(() => {
@@ -138,8 +151,44 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 				}
 			});
 		}));
+
+
+		const insertDeleteDecorators = derivedWithStore((r, store) => {
+			if (!notebookEdotirViewModelAttached.read(r)) {
+				return;
+			}
+
+			const insertedCellDecorator = store.add(this.instantiationService.createInstance(NotebookInsertedCellDecorator, this.notebookEditor));
+			const deletedCellDecorator = store.add(this.instantiationService.createInstance(NotebookDeletedCellDecorator, this.notebookEditor));
+
+			return {
+				insertedCellDecorator,
+				deletedCellDecorator
+			};
+		});
+
+		this._register(autorun(r => {
+			const changes = cellChanges.read(r);
+			const decorators = insertDeleteDecorators.read(r);
+			if (decorators) {
+				decorators.insertedCellDecorator.apply(changes);
+				decorators.deletedCellDecorator.apply(changes, originalModel);
+			}
+		}));
 	}
 
+	private getIndexOfChange(cell: NotebookCellTextModel, change: number): number {
+		if (this.getCurrentCell()?.cell !== cell) {
+			return -1;
+		}
+		const cellIndex = this.notebookModel.cells.findIndex(c => c.handle === cell.handle);
+		const indexOfCellChange = this.cellChanges.get().findIndex(c => c.modifiedCellIndex === cellIndex);
+		if (indexOfCellChange === -1) {
+			return -1;
+		}
+		// Count all changes upto this cell.
+		return countChanges(this.cellChanges.get().slice(0, indexOfCellChange)) + change;
+	}
 	getCurrentCell() {
 		const activeCell = this.notebookModel.cells.find(c => c.handle === this.notebookEditor.getActiveCell()?.handle) || this._currentCell.get();
 		if (!activeCell) {
@@ -150,6 +199,16 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 		return integration ? { integration, index: index, handle: activeCell.handle, cell: activeCell } : undefined;
 	}
 
+	selectCell(cell: NotebookCellTextModel) {
+		const integration = this.cellEditorIntegrations.get(cell)?.integration;
+		if (integration) {
+			this._currentCell.set(cell, undefined);
+			const cellViewModel = this.notebookEditor.getViewModel()?.viewCells.find(c => c.handle === cell.handle);
+			if (cellViewModel) {
+				this.notebookEditor.focusNotebookCell(cellViewModel, 'editor');
+			}
+		}
+	}
 	getNextCell(nextOrPrevious: boolean) {
 		const current = this.getCurrentCell();
 		if (!current) {
@@ -173,7 +232,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 				}
 				return Math.max(prev, curr.modifiedCellIndex);
 			}
-		}, nextOrPrevious ? -1 : Number.MAX_SAFE_INTEGER);
+		}, nextOrPrevious ? Number.MAX_SAFE_INTEGER : -1);
 		if (nextIndex === -1 || nextIndex === Number.MAX_SAFE_INTEGER) {
 			return undefined;
 		}
@@ -196,43 +255,45 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 			changes.reduce((prev, curr) => prev.modifiedCellIndex > curr.modifiedCellIndex ? prev : curr).modifiedCellIndex;
 		const info = this.getCell(index);
 		if (info) {
-			this._currentCell.set(info.cell, undefined);
+			this.selectCell(info.cell);
 			info.integration.reveal(firstOrLast);
 		}
 	}
+
 	next(wrap: boolean): boolean {
 		const info = this.getCurrentCell();
-		if (info) {
-			if (info.integration.next(wrap)) {
+		if (!info) {
+			return false;
+		}
+		if (info.integration.next(wrap)) {
+			return true;
+		} else {
+			const info = this.getNextCell(true);
+			if (info) {
+				this.selectCell(info.cell);
+				this.selectCell(info.cell);
+				info.integration.reveal(true);
 				return true;
-			} else {
-				const info = this.getNextCell(true);
-				if (info) {
-					this._currentCell.set(info.cell, undefined);
-					info.integration.reveal(true);
-					return true;
-				}
-				return false;
 			}
+			return false;
 		}
-		return false;
 	}
 	previous(wrap: boolean): boolean {
 		const info = this.getCurrentCell();
-		if (info) {
-			if (info.integration.previous(wrap)) {
+		if (!info) {
+			return false;
+		}
+		if (info.integration.previous(wrap)) {
+			return true;
+		} else {
+			const info = this.getNextCell(false);
+			if (info) {
+				this.selectCell(info.cell);
+				info.integration.reveal(false);
 				return true;
-			} else {
-				const info = this.getNextCell(false);
-				if (info) {
-					this._currentCell.set(info.cell, undefined);
-					info.integration.reveal(false);
-					return true;
-				}
-				return false;
 			}
+			return false;
 		}
-		return false;
 	}
 	enableAccessibleDiffView(): void {
 		this.getCurrentCell()?.integration.enableAccessibleDiffView();
@@ -245,7 +306,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 		change.reject();
 		this.next(true);
 	}
-	async toggleDiff(change: IModifiedFileEntryChangeHunk | undefined): Promise<void> {
+	async toggleDiff(_change: IModifiedFileEntryChangeHunk | undefined): Promise<void> {
 		const defaultAgentName = this._chatAgentService.getDefaultAgent(ChatAgentLocation.EditingSession)?.fullName;
 		const diffInput = {
 			original: { resource: this._entry.originalURI, options: { selection: undefined } },
@@ -258,3 +319,19 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 
 	}
 }
+
+export function countChanges(changes: ICellDiffInfo[]): number {
+	return changes.reduce((count, diff) => {
+		switch (diff.type) {
+			case 'delete':
+				return count + 1; // We want to see 1 deleted entry in the pill for navigation
+			case 'insert':
+				return count + 1; // We want to see 1 new entry in the pill for navigation
+			case 'modified':
+				return count + diff.diff.changes.length;
+			default:
+				return count;
+		}
+	}, 0);
+
+}
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 b95c1b8f9ac2..da5c81ba2252 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.ts
@@ -51,7 +51,7 @@ export class NotebookDeletedCellDecorator extends Disposable implements INoteboo
 	public apply(diffInfo: CellDiffInfo[], original: NotebookTextModel): void {
 		this.clear();
 
-		let currentIndex = 0;
+		let currentIndex = -1;
 		const deletedCellsToRender: { cells: { cell: NotebookCellTextModel; originalIndex: number; previousIndex: number }[]; index: number } = { cells: [], index: 0 };
 		diffInfo.forEach(diff => {
 			if (diff.type === 'delete') {

From 0adf97d3d6e3c080bc358f302d585a175ef11bd2 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Fri, 21 Feb 2025 05:23:26 +1100
Subject: [PATCH 0169/1815] Disable notebook synchronizer when using notebook
 edits (#241371)

---
 .../notebook/browser/contrib/chatEdit/notebookSynchronizer.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts
index 5e99759a2c80..dbebccbe2f92 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts
@@ -30,6 +30,7 @@ import { SnapshotContext } from '../../../../../services/workingCopy/common/file
 import { INotebookEditorService } from '../../services/notebookEditorService.js';
 import { CellEditState } from '../../notebookBrowser.js';
 import { IModelService } from '../../../../../../editor/common/services/model.js';
+import { ChatEditingModifiedDocumentEntry } from '../../../../chat/browser/chatEditing/chatEditingModifiedDocumentEntry.js';
 
 
 export const INotebookModelSynchronizerFactory = createDecorator<INotebookModelSynchronizerFactory>('INotebookModelSynchronizerFactory');
@@ -93,7 +94,8 @@ export class NotebookModelSynchronizer extends Disposable {
 
 		const entryObs = derived((r) => {
 			const sessions = _chatEditingService.editingSessionsObs.read(r);
-			return sessions.map(s => s.readEntry(model.uri, r)).find(r => !!r);
+			const entry = sessions.map(s => s.readEntry(model.uri, r)).find(r => !!r);
+			return entry instanceof ChatEditingModifiedDocumentEntry ? entry : undefined;
 		}).recomputeInitiallyAndOnChange(this._store);
 
 

From f99c5c64bc647d5b12e722a963646afe83525d5e Mon Sep 17 00:00:00 2001
From: Anthony Kim <62267334+anthonykim1@users.noreply.github.com>
Date: Thu, 20 Feb 2025 10:42:48 -0800
Subject: [PATCH 0170/1815] Expose shell's environment - fish shell (#240971)

* start working on fish, save progress, still lots TODO

* modify proposed.terminalShellEnv.d.ts

* remember we dont have acccess to nonce in .fish script

* save progress, adding isTrusted

* two arrays approach in fish

* provide EnvClear for fish, other shell as well.

* fix tests

* REMOVE TWO ARRAYS METHOD, always send all env

* remove deprecated comments

* remove junk get ready for review

* dont import vscode in terminal/common/capabilities.ts

* take feedback => pass in Clear as part of EnvSingleStart

* add env clear argument to SI.zsh

* update one more place to prevent vscode import

* mandatory flag description?? discuss this

* make things right
Co-authored-by: Daniel Imms <Tyriar@users.noreply.github.com>

* comment out test code

* use mapsStrictEqualIgnoreOrder instead of equals

* ready to go
---
 .../src/terminalSuggestMain.ts                |  10 +-
 .../terminal.shellIntegration.test.ts         |   5 +-
 .../common/capabilities/capabilities.ts       |  33 +++++-
 .../shellEnvDetectionCapability.ts            | 105 +++++++++---------
 .../common/xterm/shellIntegrationAddon.ts     |  27 +++--
 .../mainThreadTerminalShellIntegration.ts     |  11 +-
 .../workbench/api/common/extHost.protocol.ts  |   2 +-
 .../common/extHostTerminalShellIntegration.ts |  12 +-
 .../common/scripts/shellIntegration-bash.sh   |   2 +-
 .../common/scripts/shellIntegration-rc.zsh    |   2 +-
 .../common/scripts/shellIntegration.fish      |  13 +++
 .../browser/terminalCompletionService.ts      |   4 +-
 .../vscode.proposed.terminalShellEnv.d.ts     |  20 +++-
 13 files changed, 161 insertions(+), 85 deletions(-)

diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 08965a0e58da..731e0f9e8f33 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -99,7 +99,7 @@ export async function activate(context: vscode.ExtensionContext) {
 				return;
 			}
 
-			const commandsInPath = await pathExecutableCache.getExecutablesInPath(terminal.shellIntegration?.env);
+			const commandsInPath = await pathExecutableCache.getExecutablesInPath(terminal.shellIntegration?.env.value);
 			const shellGlobals = await getShellGlobals(shellType, commandsInPath?.labels) ?? [];
 			if (!commandsInPath?.completionResources) {
 				return;
@@ -109,17 +109,17 @@ export async function activate(context: vscode.ExtensionContext) {
 			const prefix = getPrefix(terminalContext.commandLine, terminalContext.cursorPosition);
 			const pathSeparator = isWindows ? '\\' : '/';
 			const tokenType = getTokenType(terminalContext, shellType);
-			const result = await getCompletionItemsFromSpecs(availableSpecs, terminalContext, commands, prefix, tokenType, terminal.shellIntegration?.cwd, getEnvAsRecord(terminal.shellIntegration?.env), terminal.name, token);
+			const result = await getCompletionItemsFromSpecs(availableSpecs, terminalContext, commands, prefix, tokenType, terminal.shellIntegration?.cwd, getEnvAsRecord(terminal.shellIntegration?.env.value), terminal.name, token);
 			if (terminal.shellIntegration?.env) {
 				const homeDirCompletion = result.items.find(i => i.label === '~');
-				if (homeDirCompletion && terminal.shellIntegration.env.HOME) {
-					homeDirCompletion.documentation = getFriendlyResourcePath(vscode.Uri.file(terminal.shellIntegration.env.HOME), pathSeparator, vscode.TerminalCompletionItemKind.Folder);
+				if (homeDirCompletion && terminal.shellIntegration.env?.value?.HOME) {
+					homeDirCompletion.documentation = getFriendlyResourcePath(vscode.Uri.file(terminal.shellIntegration.env.value.HOME), pathSeparator, vscode.TerminalCompletionItemKind.Folder);
 					homeDirCompletion.kind = vscode.TerminalCompletionItemKind.Folder;
 				}
 			}
 
 			if (result.cwd && (result.filesRequested || result.foldersRequested)) {
-				return new vscode.TerminalCompletionList(result.items, { filesRequested: result.filesRequested, foldersRequested: result.foldersRequested, cwd: result.cwd, env: terminal.shellIntegration?.env });
+				return new vscode.TerminalCompletionList(result.items, { filesRequested: result.filesRequested, foldersRequested: result.foldersRequested, cwd: result.cwd, env: terminal.shellIntegration?.env.value });
 			}
 			return result.items;
 		}
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
index 8f094091f962..d5d84c58f4df 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
@@ -99,8 +99,9 @@ import { assertNoRpc } from '../utils';
 				}));
 			});
 			ok(shellIntegration.env);
-			ok(shellIntegration.env.PATH);
-			ok(shellIntegration.env.PATH.length > 0, 'env.PATH should have a length greater than 0');
+			ok(shellIntegration.env.value);
+			ok(shellIntegration.env.value.PATH);
+			ok(shellIntegration.env.value.PATH.length > 0, 'env.value.PATH should have a length greater than 0');
 		});
 	}
 
diff --git a/src/vs/platform/terminal/common/capabilities/capabilities.ts b/src/vs/platform/terminal/common/capabilities/capabilities.ts
index c3924a37fb99..1b6f70a42637 100644
--- a/src/vs/platform/terminal/common/capabilities/capabilities.ts
+++ b/src/vs/platform/terminal/common/capabilities/capabilities.ts
@@ -152,14 +152,39 @@ export interface ICwdDetectionCapability {
 
 export interface IShellEnvDetectionCapability {
 	readonly type: TerminalCapability.ShellEnvDetection;
-	readonly onDidChangeEnv: Event<Map<string, string>>;
-	get env(): Map<string, string>;
+	readonly onDidChangeEnv: Event<TerminalShellIntegrationEnvironment>;
+	get env(): TerminalShellIntegrationEnvironment;
 	setEnvironment(envs: { [key: string]: string | undefined } | undefined, isTrusted: boolean): void;
-	startEnvironmentSingleVar(isTrusted: boolean): void;
+	startEnvironmentSingleVar(clear: boolean, isTrusted: boolean): void;
 	setEnvironmentSingleVar(key: string, value: string | undefined, isTrusted: boolean): void;
 	deleteEnvironmentSingleVar(key: string, value: string | undefined, isTrusted: boolean): void;
 	endEnvironmentSingleVar(isTrusted: boolean): void;
-	applyEnvironmentDiff(env: Map<string, string>, isTrusted: boolean): void;
+}
+
+export interface TerminalShellIntegrationEnvironment {
+	/**
+	 * The dictionary of environment variables.
+	 */
+	value: { [key: string]: string | undefined } | undefined;
+
+	/**
+	 * Whether the environment came from a trusted source and is therefore safe to use its
+	 * values in a manner that could lead to execution of arbitrary code. If this value is
+	 * `false`, {@link value} should either not be used for something that could lead to arbitrary
+	 * code execution, or the user should be warned beforehand.
+	 *
+	 * This is `true` only when the environment was reported explicitly and it used a nonce for
+	 * verification.
+	 */
+	isTrusted: boolean;
+}
+
+export interface TerminalShellIntegration {
+	/**
+	 * The environment of the shell process. This is undefined if the shell integration script
+	 * does not send the environment.
+	 */
+	readonly env: TerminalShellIntegrationEnvironment;
 }
 
 export const enum CommandInvalidationReason {
diff --git a/src/vs/platform/terminal/common/capabilities/shellEnvDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/shellEnvDetectionCapability.ts
index d27e2d3eec33..d701509efb4c 100644
--- a/src/vs/platform/terminal/common/capabilities/shellEnvDetectionCapability.ts
+++ b/src/vs/platform/terminal/common/capabilities/shellEnvDetectionCapability.ts
@@ -4,100 +4,101 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { IShellEnvDetectionCapability, TerminalCapability } from './capabilities.js';
+import { IShellEnvDetectionCapability, TerminalCapability, TerminalShellIntegrationEnvironment } from './capabilities.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { equals } from '../../../../base/common/objects.js';
+import { mapsStrictEqualIgnoreOrder } from '../../../../base/common/map.js';
+
+export interface IShellEnv {
+	value: Map<string, string>;
+	isTrusted: boolean;
+}
 
 export class ShellEnvDetectionCapability extends Disposable implements IShellEnvDetectionCapability {
 	readonly type = TerminalCapability.ShellEnvDetection;
 
-	private _pendingEnv: Map<string, string> | undefined;
-	private _env: Map<string, string> = new Map();
-	get env(): Map<string, string> { return this._env; }
+	private _pendingEnv: IShellEnv | undefined;
+	private _env: IShellEnv = { value: new Map(), isTrusted: true };
+
+	get env(): TerminalShellIntegrationEnvironment {
+		return this._createStateObject();
+	}
 
-	private readonly _onDidChangeEnv = this._register(new Emitter<Map<string, string>>());
+	private readonly _onDidChangeEnv = this._register(new Emitter<TerminalShellIntegrationEnvironment>());
 	readonly onDidChangeEnv = this._onDidChangeEnv.event;
 
 	setEnvironment(env: { [key: string]: string | undefined }, isTrusted: boolean): void {
-		if (!isTrusted) {
-			return;
-		}
-
-		if (equals(this._env, env)) {
+		if (equals(this.env.value, env)) {
 			return;
 		}
 
-		this._env.clear();
+		this._env.value.clear();
 		for (const [key, value] of Object.entries(env)) {
 			if (value !== undefined) {
-				this._env.set(key, value);
+				this._env.value.set(key, value);
 			}
 		}
+		this._env.isTrusted = isTrusted;
 
-		// Convert to event and fire event
-		this._onDidChangeEnv.fire(this._env);
+		this._fireEnvChange();
 	}
 
-	startEnvironmentSingleVar(isTrusted: boolean): void {
-		if (!isTrusted) {
-			return;
+	startEnvironmentSingleVar(clear: boolean, isTrusted: boolean): void {
+		if (clear) {
+			this._pendingEnv = {
+				value: new Map(),
+				isTrusted
+			};
+		} else {
+			this._pendingEnv = {
+				value: new Map(this._env.value),
+				isTrusted: this._env.isTrusted && isTrusted
+			};
 		}
-		this._pendingEnv = new Map();
+
 	}
+
 	setEnvironmentSingleVar(key: string, value: string | undefined, isTrusted: boolean): void {
-		if (!isTrusted) {
+		if (!this._pendingEnv) {
 			return;
 		}
 		if (key !== undefined && value !== undefined) {
-			this._pendingEnv?.set(key, value);
+			this._pendingEnv.value.set(key, value);
+			this._pendingEnv.isTrusted &&= isTrusted;
 		}
 	}
+
 	endEnvironmentSingleVar(isTrusted: boolean): void {
-		if (!isTrusted) {
-			return;
-		}
 		if (!this._pendingEnv) {
 			return;
 		}
-		this.applyEnvironmentDiff(this._pendingEnv, isTrusted);
+		this._pendingEnv.isTrusted &&= isTrusted;
+		const envDiffers = !mapsStrictEqualIgnoreOrder(this._env.value, this._pendingEnv.value);
+		if (envDiffers) {
+			this._env = this._pendingEnv;
+			this._fireEnvChange();
+		}
 		this._pendingEnv = undefined;
 	}
 
 	deleteEnvironmentSingleVar(key: string, value: string | undefined, isTrusted: boolean): void {
-		if (!isTrusted) {
+		if (!this._pendingEnv) {
 			return;
 		}
 		if (key !== undefined && value !== undefined) {
-			this._env.delete(key);
-			this._pendingEnv?.delete(key);
-			this._onDidChangeEnv.fire(this._env);
+			this._pendingEnv.value.delete(key);
+			this._pendingEnv.isTrusted &&= isTrusted;
 		}
-		return;
 	}
 
-	// Make sure to update this.env to the latest, fire event if there is a diff
-	applyEnvironmentDiff(env: Map<string, string>, isTrusted: boolean): void {
-		if (!isTrusted) {
-			return;
-		}
-
-		let envDiffers: boolean = false;
-
-		for (const [key, value] of env.entries()) {
-			if (this._env.has(key) && this._env.get(key) === value) {
-				// Do nothing
-			} else if (this.env.has(key) && value !== this.env.get(key)) {
-				this._env.set(key, value);
-				envDiffers = true;
-			} else if (!this.env.has(key)) {
-				this._env.set(key, value);
-				envDiffers = true;
-			}
-		}
+	private _fireEnvChange(): void {
+		this._onDidChangeEnv.fire(this._createStateObject());
+	}
 
-		if (envDiffers) {
-			this._onDidChangeEnv.fire(this._env);
-			return;
-		}
+	private _createStateObject(): TerminalShellIntegrationEnvironment {
+		return {
+			value: Object.fromEntries(this._env.value),
+			isTrusted: this._env.isTrusted
+		};
 	}
 }
diff --git a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
index 8fdf1a4b2d6c..e421a51e9177 100644
--- a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
+++ b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
@@ -233,7 +233,8 @@ const enum VSCodeOscPt {
 	 *
 	 * - `Environment` - A stringified JSON object containing the shell's complete environment. The
 	 *    variables and values use the same encoding rules as the {@link CommandLine} sequence.
-	 * - `Nonce` - An _mandatory_ nonce to ensure the sequence is not malicious.
+	 * - `Nonce` - An _mandatory_ nonce can be provided which may be required by the terminal in order
+	 *   to enable some features. This helps ensure no malicious command injection has occurred.
 	 *
 	 * WARNING: This sequence is unfinalized, DO NOT use this in your shell integration script.
 	 */
@@ -242,7 +243,10 @@ const enum VSCodeOscPt {
 	/**
 	 * Delete a single environment variable from cached environment.
 	 *
-	 * Format: `OSC 633 ; EnvSingleDelete ; <EnvironmentKey> ; <EnvironmentValue> ; <Nonce>`
+	 * Format: `OSC 633 ; EnvSingleDelete ; <EnvironmentKey> ; <EnvironmentValue> [; <Nonce>]`
+	 *
+	 * - `Nonce` - An optional nonce can be provided which may be required by the terminal in order
+	 *   to enable some features. This helps ensure no malicious command injection has occurred.
 	 *
 	 * WARNING: This sequence is unfinalized, DO NOT use this in your shell integration script.
 	 */
@@ -250,9 +254,12 @@ const enum VSCodeOscPt {
 
 	/**
 	 * The start of the collecting user's environment variables individually.
-	 * Clears any environment residuals in previous sessions.
 	 *
-	 * Format: `OSC 633 ; EnvSingleStart ; <Nonce>`
+	 * Format: `OSC 633 ; EnvSingleStart ; <Clear> [; <Nonce>]`
+	 *
+	 * - `Clear` - An _mandatory_ flag indicating any cached environment variables will be cleared.
+	 * - `Nonce` - An optional nonce can be provided which may be required by the terminal in order
+	 *   to enable some features. This helps ensure no malicious command injection has occurred.
 	 *
 	 * WARNING: This sequence is unfinalized, DO NOT use this in your shell integration script.
 	 */
@@ -261,7 +268,10 @@ const enum VSCodeOscPt {
 	/**
 	 * Sets an entry of single environment variable to transactional pending map of environment variables.
 	 *
-	 * Format: `OSC 633 ; EnvSingleEntry ; <EnvironmentKey> ; <EnvironmentValue> ; <Nonce>`
+	 * Format: `OSC 633 ; EnvSingleEntry ; <EnvironmentKey> ; <EnvironmentValue> [; <Nonce>]`
+	 *
+	 * - `Nonce` - An optional nonce can be provided which may be required by the terminal in order
+	 *   to enable some features. This helps ensure no malicious command injection has occurred.
 	 *
 	 * WARNING: This sequence is unfinalized, DO NOT use this in your shell integration script.
 	 */
@@ -271,7 +281,10 @@ const enum VSCodeOscPt {
 	 * The end of the collecting user's environment variables individually.
 	 * Clears any pending environment variables and fires an event that contains user's environment.
 	 *
-	 * Format: `OSC 633 ; EnvSingleEnd ; <Nonce>`
+	 * Format: `OSC 633 ; EnvSingleEnd [; <Nonce>]`
+	 *
+	 * - `Nonce` - An optional nonce can be provided which may be required by the terminal in order
+	 *   to enable some features. This helps ensure no malicious command injection has occurred.
 	 *
 	 * WARNING: This sequence is unfinalized, DO NOT use this in your shell integration script.
 	 */
@@ -484,7 +497,7 @@ export class ShellIntegrationAddon extends Disposable implements IShellIntegrati
 				return true;
 			}
 			case VSCodeOscPt.EnvSingleStart: {
-				this._createOrGetShellEnvDetection().startEnvironmentSingleVar(args[0] === this._nonce);
+				this._createOrGetShellEnvDetection().startEnvironmentSingleVar(args[0] === '1', args[1] === this._nonce);
 				return true;
 			}
 			case VSCodeOscPt.EnvSingleDelete: {
diff --git a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
index bfe720fc0872..ff9d34a7ceda 100644
--- a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
@@ -63,9 +63,14 @@ export class MainThreadTerminalShellIntegration extends Disposable implements Ma
 		// onDidChangeTerminalShellIntegration via env
 		const envChangeEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.ShellEnvDetection, e => e.onDidChangeEnv));
 		this._store.add(envChangeEvent.event(e => {
-			const keysArr = Array.from(e.data.keys());
-			const valuesArr = Array.from(e.data.values());
-			this._proxy.$shellEnvChange(e.instance.instanceId, keysArr, valuesArr);
+			if (e.data.value && typeof e.data.value === 'object') {
+				const envValue = e.data.value as { [key: string]: string | undefined };
+
+				// Extract keys and values
+				const keysArr = Object.keys(envValue);
+				const valuesArr = Object.values(envValue);
+				this._proxy.$shellEnvChange(e.instance.instanceId, keysArr, valuesArr as string[], e.data.isTrusted);
+			}
 		}));
 
 		// onDidStartTerminalShellExecution
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index c8530c64edee..a7542a4fd66e 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -2518,7 +2518,7 @@ export interface ExtHostTerminalShellIntegrationShape {
 	$shellExecutionStart(instanceId: number, commandLineValue: string, commandLineConfidence: TerminalShellExecutionCommandLineConfidence, isTrusted: boolean, cwd: UriComponents | undefined): void;
 	$shellExecutionEnd(instanceId: number, commandLineValue: string, commandLineConfidence: TerminalShellExecutionCommandLineConfidence, isTrusted: boolean, exitCode: number | undefined): void;
 	$shellExecutionData(instanceId: number, data: string): void;
-	$shellEnvChange(instanceId: number, shellEnvKeys: string[], shellEnvValues: string[]): void;
+	$shellEnvChange(instanceId: number, shellEnvKeys: string[], shellEnvValues: string[], isTrusted: boolean): void;
 	$cwdChange(instanceId: number, cwd: UriComponents | undefined): void;
 	$closeTerminal(instanceId: number): void;
 }
diff --git a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
index 076f1b725cc3..98620f6a363b 100644
--- a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
@@ -131,8 +131,8 @@ export class ExtHostTerminalShellIntegration extends Disposable implements IExtH
 		this._activeShellIntegrations.get(instanceId)?.emitData(data);
 	}
 
-	public $shellEnvChange(instanceId: number, shellEnvKeys: string[], shellEnvValues: string[]): void {
-		this._activeShellIntegrations.get(instanceId)?.setEnv(shellEnvKeys, shellEnvValues);
+	public $shellEnvChange(instanceId: number, shellEnvKeys: string[], shellEnvValues: string[], isTrusted: boolean): void {
+		this._activeShellIntegrations.get(instanceId)?.setEnv(shellEnvKeys, shellEnvValues, isTrusted);
 	}
 
 	public $cwdChange(instanceId: number, cwd: UriComponents | undefined): void {
@@ -151,7 +151,7 @@ class InternalTerminalShellIntegration extends Disposable {
 	get currentExecution(): InternalTerminalShellExecution | undefined { return this._currentExecution; }
 
 	private _ignoreNextExecution: boolean = false;
-	private _env: { [key: string]: string | undefined } | undefined;
+	private _env: vscode.TerminalShellIntegrationEnvironment = { value: {}, isTrusted: false };
 	private _cwd: URI | undefined;
 
 	readonly store: DisposableStore = this._register(new DisposableStore());
@@ -176,7 +176,7 @@ class InternalTerminalShellIntegration extends Disposable {
 			get cwd(): URI | undefined {
 				return that._cwd;
 			},
-			get env(): { [key: string]: string | undefined } | undefined {
+			get env(): vscode.TerminalShellIntegrationEnvironment {
 				return that._env;
 			},
 			// executeCommand(commandLine: string): vscode.TerminalShellExecution;
@@ -240,12 +240,12 @@ class InternalTerminalShellIntegration extends Disposable {
 		}
 	}
 
-	setEnv(keys: string[], values: string[]): void {
+	setEnv(keys: string[], values: string[], isTrusted: boolean): void {
 		const env: { [key: string]: string | undefined } = {};
 		for (let i = 0; i < keys.length; i++) {
 			env[keys[i]] = values[i];
 		}
-		this._env = env;
+		this._env = { value: env, isTrusted };
 		this._fireChangeEvent();
 	}
 
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 352d8dc21764..b5f2e1f53250 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh
@@ -304,7 +304,7 @@ __trackMissingEnvVars() {
 
 __vsc_update_env() {
 	if [[ "$__vscode_shell_env_reporting" == "1" ]]; then
-		builtin printf '\e]633;EnvSingleStart;%s;\a' $__vsc_nonce
+		builtin printf '\e]633;EnvSingleStart;%s;%s\a' 0 $__vsc_nonce
 
 		if [ "$use_associative_array" = 1 ]; then
 			if [ ${#vsc_aa_env[@]} -eq 0 ]; then
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 2b87ad312743..43738d95a187 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
@@ -203,7 +203,7 @@ __track_missing_env_vars() {
 
 __vsc_update_env() {
 	if [[ "$__vscode_shell_env_reporting" == "1" ]]; then
-		builtin printf '\e]633;EnvSingleStart;%s;\a' $__vsc_nonce
+		builtin printf '\e]633;EnvSingleStart;%s;%s;\a' 0 $__vsc_nonce
 		if [ $__vsc_use_aa -eq 1 ]; then
 			if [[ ${#vsc_aa_env[@]} -eq 0 ]]; then
 				# Associative array is empty, do not diff, just add
diff --git a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish
index b780c508ebf3..3d6cf19c36e4 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish
@@ -30,6 +30,9 @@ if set -q VSCODE_PATH_PREFIX
 end
 set -e VSCODE_PATH_PREFIX
 
+set -g vsc_env_keys
+set -g vsc_env_values
+
 set -g __vsc_applied_env_vars 0
 function __vsc_apply_env_vars
 	if test $__vsc_applied_env_vars -eq 1;
@@ -146,6 +149,16 @@ function __vsc_update_cwd --on-event fish_prompt
 	end
 end
 
+function __vsc_update_env --on-event fish_prompt
+	__vsc_esc EnvSingleStart 1
+	for line in (env)
+		set myVar (echo $line | awk -F= '{print $1}')
+		set myVal (echo $line | awk -F= '{print $2}')
+		__vsc_esc EnvSingleEntry $myVar (__vsc_escape_value "$myVal")
+	end
+	__vsc_esc EnvSingleEnd
+end
+
 # Sent at the start of the prompt.
 # Marks the beginning of the prompt (and, implicitly, a new line).
 function __vsc_fish_prompt_start
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
index 5211abb5869d..3d4589a775cd 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
@@ -476,9 +476,9 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 	}
 
 	private _getEnvVar(key: string, capabilities: ITerminalCapabilityStore): string | undefined {
-		const env = capabilities.get(TerminalCapability.ShellEnvDetection)?.env;
+		const env = capabilities.get(TerminalCapability.ShellEnvDetection)?.env?.value as { [key: string]: string | undefined };
 		if (env) {
-			return env.get(key);
+			return env[key];
 		}
 		return this._processEnv[key];
 	}
diff --git a/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts b/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts
index 965d48e164b4..f3724313bee7 100644
--- a/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts
+++ b/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts
@@ -6,12 +6,30 @@
 declare module 'vscode' {
 	// @anthonykim1 @tyriar https://github.com/microsoft/vscode/issues/227467
 
+	export interface TerminalShellIntegrationEnvironment {
+		/**
+		 * The dictionary of environment variables.
+		 */
+		value: { [key: string]: string | undefined } | undefined;
+
+		/**
+		 * Whether the environment came from a trusted source and is therefore safe to use its
+		 * values in a manner that could lead to execution of arbitrary code. If this value is
+		 * `false`, {@link value} should either not be used for something that could lead to arbitrary
+		 * code execution, or the user should be warned beforehand.
+		 *
+		 * This is `true` only when the environment was reported explicitly and it used a nonce for
+		 * verification.
+		 */
+		isTrusted: boolean;
+	}
+
 	export interface TerminalShellIntegration {
 		/**
 		 * The environment of the shell process. This is undefined if the shell integration script
 		 * does not send the environment.
 		 */
-		readonly env: { [key: string]: string | undefined } | undefined;
+		readonly env: TerminalShellIntegrationEnvironment;
 	}
 
 	// TODO: Is it fine that this shares onDidChangeTerminalShellIntegration with cwd and the shellIntegration object itself?

From 477129db8d3119817763a5a456dfb17dbde536ab Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 20 Feb 2025 13:00:53 -0600
Subject: [PATCH 0171/1815] don't launch contributed profile that's not been
 for custom execution tasks (#241361)

fix #200558
---
 src/vs/workbench/contrib/terminal/browser/terminalService.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
index 7e55b9f49626..42b3f065762d 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
@@ -977,7 +977,9 @@ export class TerminalService extends Disposable implements ITerminalService {
 		await this._resolveCwd(shellLaunchConfig, splitActiveTerminal, options);
 
 		// Launch the contributed profile
-		if (contributedProfile) {
+		// If it's a custom pty implementation, we did not await the profiles ready, so
+		// we cannot launch the contributed profile and doing so would cause an error
+		if (!shellLaunchConfig.customPtyImplementation && contributedProfile) {
 			const resolvedLocation = await this.resolveLocation(options?.location);
 			let location: TerminalLocation | { viewColumn: number; preserveState?: boolean } | { splitActiveTerminal: boolean } | undefined;
 			if (splitActiveTerminal) {

From e6387ead829e2545aa47c8188b0483152760a6a3 Mon Sep 17 00:00:00 2001
From: Devin Valenciano <1389808+devinvalenciano@users.noreply.github.com>
Date: Thu, 20 Feb 2025 11:18:47 -0800
Subject: [PATCH 0172/1815] Update telemetry owner

---
 src/vs/workbench/contrib/webview/browser/webviewElement.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
index 1b66babea28b..4985fa12fc7b 100644
--- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts
+++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
@@ -595,7 +595,7 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
 
 			type Classification = {
 				extension: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The id of the extension that created the webview.' };
-				owner: 'mjbz';
+				owner: 'mjbvz';
 				comment: 'Helps find which extensions are contributing webviews with invalid CSPs';
 			};
 

From 28903d1a47efb363c4b12056c09da3a3dd089c9d Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 20 Feb 2025 13:23:30 -0600
Subject: [PATCH 0173/1815] add tests for script/custom generators (#241376)

---
 .../executeCommandWrappers.ts                 |  9 ---
 .../generators/customSuggestionsGenerator.ts  |  6 +-
 .../generators/scriptSuggestionsGenerator.ts  | 10 +++-
 .../src/fig/autocomplete/state/generators.ts  | 17 ++++--
 .../executeCommand.ts => execute.ts}          | 18 +++++-
 .../terminal-suggest/src/fig/figInterface.ts  | 18 +++---
 .../src/terminalSuggestMain.ts                |  6 +-
 .../terminal-suggest/src/test/fig.test.ts     | 57 +++++++++++++++++++
 .../src/test/terminalSuggestMain.test.ts      | 26 ++++++++-
 9 files changed, 134 insertions(+), 33 deletions(-)
 delete mode 100644 extensions/terminal-suggest/src/fig/api-binding-wrappers/executeCommandWrappers.ts
 rename extensions/terminal-suggest/src/fig/{api-binding-wrappers/executeCommand.ts => execute.ts} (79%)

diff --git a/extensions/terminal-suggest/src/fig/api-binding-wrappers/executeCommandWrappers.ts b/extensions/terminal-suggest/src/fig/api-binding-wrappers/executeCommandWrappers.ts
deleted file mode 100644
index 98ac1a298a5f..000000000000
--- a/extensions/terminal-suggest/src/fig/api-binding-wrappers/executeCommandWrappers.ts
+++ /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 { executeCommandTimeout } from './executeCommand';
-
-export const executeCommand: Fig.ExecuteCommandFunction = (args) =>
-	executeCommandTimeout(args);
diff --git a/extensions/terminal-suggest/src/fig/autocomplete/generators/customSuggestionsGenerator.ts b/extensions/terminal-suggest/src/fig/autocomplete/generators/customSuggestionsGenerator.ts
index e08fea6745a8..1262b5967ad1 100644
--- a/extensions/terminal-suggest/src/fig/autocomplete/generators/customSuggestionsGenerator.ts
+++ b/extensions/terminal-suggest/src/fig/autocomplete/generators/customSuggestionsGenerator.ts
@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { executeCommand } from '../../api-binding-wrappers/executeCommandWrappers';
+
+import { IFigExecuteExternals } from '../../execute';
 import {
 	runCachedGenerator,
 	GeneratorContext,
@@ -13,6 +14,7 @@ import {
 export async function getCustomSuggestions(
 	generator: Fig.Generator,
 	context: GeneratorContext,
+	executableExternals: IFigExecuteExternals
 ): Promise<Fig.Suggestion[] | undefined> {
 	if (!generator.custom) {
 		return [];
@@ -37,7 +39,7 @@ export async function getCustomSuggestions(
 			generator,
 			context,
 			() =>
-				generator.custom!(tokenArray, executeCommand, {
+				generator.custom!(tokenArray, executableExternals.executeCommand, {
 					currentWorkingDirectory,
 					currentProcess,
 					sshPrefix: '',
diff --git a/extensions/terminal-suggest/src/fig/autocomplete/generators/scriptSuggestionsGenerator.ts b/extensions/terminal-suggest/src/fig/autocomplete/generators/scriptSuggestionsGenerator.ts
index 123a33071809..07e90069d032 100644
--- a/extensions/terminal-suggest/src/fig/autocomplete/generators/scriptSuggestionsGenerator.ts
+++ b/extensions/terminal-suggest/src/fig/autocomplete/generators/scriptSuggestionsGenerator.ts
@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { executeCommandTimeout } from '../../api-binding-wrappers/executeCommand';
+
+import { IFigExecuteExternals } from '../../execute';
 import {
 	GeneratorContext,
 	haveContextForGenerator,
@@ -14,6 +15,7 @@ export async function getScriptSuggestions(
 	generator: Fig.Generator,
 	context: GeneratorContext,
 	defaultTimeout: number = 5000,
+	executeExternals: IFigExecuteExternals
 ): Promise<Fig.Suggestion[] | undefined> {
 	const { script, postProcess, splitOn } = generator;
 	if (!script) {
@@ -62,10 +64,12 @@ export async function getScriptSuggestions(
 		const { stdout } = await runCachedGenerator(
 			generator,
 			context,
-			() => executeCommandTimeout(executeCommandInput, timeout),
+			() => {
+				return executeExternals.executeCommandTimeout(executeCommandInput, timeout);
+			},
 			generator.cache?.cacheKey ?? JSON.stringify(executeCommandInput),
 		);
-
+		//
 		let result: Array<Fig.Suggestion | string | null> | undefined = [];
 
 		// If we have a splitOn function
diff --git a/extensions/terminal-suggest/src/fig/autocomplete/state/generators.ts b/extensions/terminal-suggest/src/fig/autocomplete/state/generators.ts
index 729f8621b22a..eff0c598d1e0 100644
--- a/extensions/terminal-suggest/src/fig/autocomplete/state/generators.ts
+++ b/extensions/terminal-suggest/src/fig/autocomplete/state/generators.ts
@@ -10,6 +10,7 @@ import { GeneratorState, GeneratorContext } from '../generators/helpers';
 import { sleep } from '../../shared/utils';
 import type { ArgumentParserResult } from '../../autocomplete-parser/parseArguments';
 import { getCustomSuggestions } from '../generators/customSuggestionsGenerator';
+import { IFigExecuteExternals } from '../../execute';
 
 export const shellContextSelector = ({
 	figState,
@@ -36,7 +37,10 @@ const getGeneratorContext = (state: AutocompleteState): GeneratorContext => {
 export const createGeneratorState = (
 	// setNamed: NamedSetState<AutocompleteState>,
 	state: AutocompleteState,
-): { triggerGenerators: ((result: ArgumentParserResult) => GeneratorState[]) } => {
+	executeExternals?: IFigExecuteExternals
+): {
+	triggerGenerators: (result: ArgumentParserResult, executeExternals: IFigExecuteExternals) => GeneratorState[];
+} => {
 	// function updateGenerator(
 	// 	generatorState: GeneratorState,
 	// 	getUpdate: () => Partial<GeneratorState>,
@@ -76,8 +80,7 @@ export const createGeneratorState = (
 	// 	}
 	// 	return generatorState;
 	// }
-
-	const triggerGenerator = (currentState: GeneratorState) => {
+	const triggerGenerator = (currentState: GeneratorState, executeExternals: IFigExecuteExternals) => {
 		console.info('Triggering generator', { currentState });
 		const { generator, context } = currentState;
 		let request: Promise<Fig.Suggestion[] | undefined>;
@@ -91,11 +94,12 @@ export const createGeneratorState = (
 			request = getScriptSuggestions(
 				generator,
 				context,
-				// getSetting<number>(SETTINGS.SCRIPT_TIMEOUT, 5000),
+				undefined, // getSetting<number>(SETTINGS.SCRIPT_TIMEOUT, 5000),
+				executeExternals
 			);
 		}
 		else {
-			request = getCustomSuggestions(generator, context);
+			request = getCustomSuggestions(generator, context, executeExternals);
 			// filepaths/folders templates are now a sugar for two custom generators, we need to filter
 			// the suggestion created by those two custom generators
 			// if (generator.filterTemplateSuggestions) {
@@ -118,6 +122,7 @@ export const createGeneratorState = (
 
 	const triggerGenerators = (
 		parserResult: ArgumentParserResult,
+		executeExternals: IFigExecuteExternals,
 	): GeneratorState[] => {
 		const {
 			parserResult: { currentArg: previousArg, searchTerm: previousSearchTerm },
@@ -182,7 +187,7 @@ export const createGeneratorState = (
 			const result = previousGeneratorState?.result || [];
 			const generatorState = { generator, context, result, loading: true };
 
-			const getTriggeredState = () => triggerGenerator(generatorState);
+			const getTriggeredState = () => triggerGenerator(generatorState, executeExternals);
 			if (currentArg?.debounce) {
 				sleep(
 					typeof currentArg.debounce === 'number' && currentArg.debounce > 0
diff --git a/extensions/terminal-suggest/src/fig/api-binding-wrappers/executeCommand.ts b/extensions/terminal-suggest/src/fig/execute.ts
similarity index 79%
rename from extensions/terminal-suggest/src/fig/api-binding-wrappers/executeCommand.ts
rename to extensions/terminal-suggest/src/fig/execute.ts
index f45b02ebfad0..bc8df7015083 100644
--- a/extensions/terminal-suggest/src/fig/api-binding-wrappers/executeCommand.ts
+++ b/extensions/terminal-suggest/src/fig/execute.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { osIsWindows } from '../../helpers/os';
-import { spawnHelper2 } from '../../shell/common';
-import { withTimeout } from '../shared/utils';
+import { osIsWindows } from '../helpers/os';
+import { spawnHelper2 } from '../shell/common';
+import { withTimeout } from './shared/utils';
 
 export const cleanOutput = (output: string) =>
 	output
@@ -54,3 +54,15 @@ export const executeCommandTimeout = async (
 		throw err;
 	}
 };
+
+
+export const executeCommand: Fig.ExecuteCommandFunction = (args) =>
+	executeCommandTimeout(args);
+
+export interface IFigExecuteExternals {
+	executeCommand: Fig.ExecuteCommandFunction;
+	executeCommandTimeout: (
+		input: Fig.ExecuteCommandInput,
+		timeout: number,
+	) => Promise<Fig.ExecuteCommandOutput>;
+}
diff --git a/extensions/terminal-suggest/src/fig/figInterface.ts b/extensions/terminal-suggest/src/fig/figInterface.ts
index 3c663d8be352..9be048ed9b48 100644
--- a/extensions/terminal-suggest/src/fig/figInterface.ts
+++ b/extensions/terminal-suggest/src/fig/figInterface.ts
@@ -16,6 +16,7 @@ import type { ICompletionResource } from '../types';
 import { osIsWindows } from '../helpers/os';
 import { removeAnyFileExtension } from '../helpers/file';
 import type { EnvironmentVariable } from './api-bindings/types';
+import { IFigExecuteExternals } from './execute';
 
 export interface IFigSpecSuggestionsResult {
 	filesRequested: boolean;
@@ -34,7 +35,8 @@ export async function getFigSuggestions(
 	env: Record<string, string>,
 	name: string,
 	precedingText: string,
-	token?: vscode.CancellationToken
+	executeExternals: IFigExecuteExternals,
+	token?: vscode.CancellationToken,
 ): Promise<IFigSpecSuggestionsResult> {
 	const result: IFigSpecSuggestionsResult = {
 		filesRequested: false,
@@ -84,7 +86,7 @@ export async function getFigSuggestions(
 				continue;
 			}
 
-			const completionItemResult = await getFigSpecSuggestions(spec, terminalContext, prefix, shellIntegrationCwd, env, name, token);
+			const completionItemResult = await getFigSpecSuggestions(spec, terminalContext, prefix, shellIntegrationCwd, env, name, executeExternals, token);
 			result.hasCurrentArg ||= !!completionItemResult?.hasCurrentArg;
 			if (completionItemResult) {
 				result.filesRequested ||= completionItemResult.filesRequested;
@@ -105,7 +107,8 @@ async function getFigSpecSuggestions(
 	shellIntegrationCwd: vscode.Uri | undefined,
 	env: Record<string, string>,
 	name: string,
-	token?: vscode.CancellationToken
+	executeExternals: IFigExecuteExternals,
+	token?: vscode.CancellationToken,
 ): Promise<IFigSpecSuggestionsResult | undefined> {
 	let filesRequested = false;
 	let foldersRequested = false;
@@ -125,7 +128,7 @@ async function getFigSpecSuggestions(
 
 	const items: vscode.TerminalCompletionItem[] = [];
 	// TODO: Pass in and respect cancellation token
-	const completionItemResult = await collectCompletionItemResult(command, parsedArguments, prefix, terminalContext, shellIntegrationCwd, env, items);
+	const completionItemResult = await collectCompletionItemResult(command, parsedArguments, prefix, terminalContext, shellIntegrationCwd, env, items, executeExternals);
 	if (token?.isCancellationRequested) {
 		return undefined;
 	}
@@ -152,7 +155,8 @@ export async function collectCompletionItemResult(
 	terminalContext: { commandLine: string; cursorPosition: number },
 	shellIntegrationCwd: vscode.Uri | undefined,
 	env: Record<string, string>,
-	items: vscode.TerminalCompletionItem[]
+	items: vscode.TerminalCompletionItem[],
+	executeExternals: IFigExecuteExternals
 ): Promise<{ filesRequested: boolean; foldersRequested: boolean } | undefined> {
 	let filesRequested = false;
 	let foldersRequested = false;
@@ -191,8 +195,8 @@ export async function collectCompletionItemResult(
 				fuzzySearchEnabled: false,
 				userFuzzySearchEnabled: false,
 			};
-			const s = createGeneratorState(state);
-			const generatorResults = s.triggerGenerators(parsedArguments);
+			const s = createGeneratorState(state, executeExternals);
+			const generatorResults = s.triggerGenerators(parsedArguments, executeExternals);
 			for (const generatorResult of generatorResults) {
 				for (const item of (await generatorResult?.request) ?? []) {
 					if (!item.name) {
diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 731e0f9e8f33..6e7ba74aedb9 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -22,6 +22,7 @@ import { getTokenType, TokenType } from './tokens';
 import type { ICompletionResource } from './types';
 import { createCompletionItem } from './helpers/completionItem';
 import { getFigSuggestions } from './fig/figInterface';
+import { executeCommand, executeCommandTimeout, IFigExecuteExternals } from './fig/execute';
 
 // TODO: remove once API is finalized
 export const enum TerminalShellType {
@@ -206,7 +207,8 @@ export async function getCompletionItemsFromSpecs(
 	shellIntegrationCwd: vscode.Uri | undefined,
 	env: Record<string, string>,
 	name: string,
-	token?: vscode.CancellationToken
+	token?: vscode.CancellationToken,
+	executeExternals?: IFigExecuteExternals,
 ): Promise<{ items: vscode.TerminalCompletionItem[]; filesRequested: boolean; foldersRequested: boolean; cwd?: vscode.Uri }> {
 	const items: vscode.TerminalCompletionItem[] = [];
 	let filesRequested = false;
@@ -223,7 +225,7 @@ export async function getCompletionItemsFromSpecs(
 		}
 	}
 
-	const result = await getFigSuggestions(specs, terminalContext, availableCommands, prefix, tokenType, shellIntegrationCwd, env, name, precedingText, token);
+	const result = await getFigSuggestions(specs, terminalContext, availableCommands, prefix, tokenType, shellIntegrationCwd, env, name, precedingText, executeExternals ?? { executeCommand, executeCommandTimeout }, token);
 	if (result) {
 		hasCurrentArg ||= result.hasCurrentArg;
 		filesRequested ||= result.filesRequested;
diff --git a/extensions/terminal-suggest/src/test/fig.test.ts b/extensions/terminal-suggest/src/test/fig.test.ts
index 5df50219e86a..915d32d97ea2 100644
--- a/extensions/terminal-suggest/src/test/fig.test.ts
+++ b/extensions/terminal-suggest/src/test/fig.test.ts
@@ -127,5 +127,62 @@ export const figGenericTestSuites: ISuiteSpec[] = [
 			{ input: 'foo --bar b|', expectedCompletions: ['a', 'b', 'c'] },
 			{ input: 'foo --bar c|', expectedCompletions: ['a', 'b', 'c'] },
 		]
+	},
+	{
+		name: 'Fig script generator',
+		completionSpecs: [
+			{
+				name: 'foo',
+				description: 'Foo',
+				args: {
+					name: 'bar',
+					generators: [
+						{
+							script: () => ['echo abcd'],
+							postProcess: (out) => out.split('').map(item => {
+								return { name: item };
+							}).filter(i => !!i)
+						}
+					]
+				}
+			}
+		],
+		availableCommands: 'foo',
+		testSpecs: [
+			{ input: 'foo |', expectedCompletions: ['e', 'c', 'h', 'o', ' ', 'a', 'b', 'c', 'd'] },
+			{ input: 'foo a|', expectedCompletions: ['e', 'c', 'h', 'o', ' ', 'a', 'b', 'c', 'd'] },
+			{ input: 'foo b|', expectedCompletions: ['e', 'c', 'h', 'o', ' ', 'a', 'b', 'c', 'd'] },
+			{ input: 'foo c|', expectedCompletions: ['e', 'c', 'h', 'o', ' ', 'a', 'b', 'c', 'd'] },
+		]
+	},
+	{
+		name: 'Fig custom generator',
+		completionSpecs: [
+			{
+				name: 'foo',
+				description: 'Foo',
+				args: {
+					name: 'bar',
+					generators: [
+						{
+							custom: async (tokens: string[], executeCommand: Fig.ExecuteCommandFunction, generatorContext: Fig.GeneratorContext) => {
+								if (tokens.length) {
+									return tokens.map(token => ({ name: token }));
+								}
+								executeCommand({ command: 'echo', args: ['a\tb\nc\td'] });
+							}
+						}
+					]
+				}
+			}
+		],
+		availableCommands: 'foo',
+		testSpecs: [
+			{ input: 'foo |', expectedCompletions: ['foo'] },
+			{ input: 'foo a|', expectedCompletions: ['a', 'foo'] },
+			{ input: 'foo b|', expectedCompletions: ['b', 'foo'] },
+			{ input: 'foo c|', expectedCompletions: ['c', 'foo'] },
+		]
 	}
 ];
+
diff --git a/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts b/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts
index d13f45a28c60..b14b6a2c4d37 100644
--- a/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts
+++ b/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts
@@ -22,6 +22,7 @@ import { gitTestSuiteSpec } from './completions/upstream/git.test';
 import { osIsWindows } from '../helpers/os';
 import codeCompletionSpec from '../completions/code';
 import { figGenericTestSuites } from './fig.test';
+import { IFigExecuteExternals } from '../fig/execute';
 
 const testSpecs2: ISuiteSpec[] = [
 	{
@@ -101,7 +102,9 @@ suite('Terminal Suggest', () => {
 						getTokenType(terminalContext, undefined),
 						testPaths.cwd,
 						{},
-						'testName'
+						'testName',
+						undefined,
+						new MockFigExecuteExternals()
 					);
 					deepStrictEqual(result.items.map(i => i.label).sort(), (testSpec.expectedCompletions ?? []).sort());
 					strictEqual(result.filesRequested, filesRequested, 'Files requested different than expected, got: ' + result.filesRequested);
@@ -114,3 +117,24 @@ suite('Terminal Suggest', () => {
 		});
 	}
 });
+
+
+class MockFigExecuteExternals implements IFigExecuteExternals {
+	public async executeCommand(input: Fig.ExecuteCommandInput): Promise<Fig.ExecuteCommandOutput> {
+		return this.executeCommandTimeout(input);
+	}
+	async executeCommandTimeout(input: Fig.ExecuteCommandInput): Promise<Fig.ExecuteCommandOutput> {
+		const command = [input.command, ...input.args].join(' ');
+		try {
+			return {
+				status: 0,
+				stdout: input.command,
+				stderr: '',
+			};
+		} catch (err) {
+			console.error(`Error running shell command '${command}'`, { err });
+			throw err;
+		}
+	}
+}
+

From 79a3e46985ece760b5e24bb689e18d98204f669a Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 20 Feb 2025 10:11:34 -0800
Subject: [PATCH 0174/1815] change "create prompt" command UI label

---
 .../contributions/createPromptCommand/createPromptCommand.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
index 550acd2ac187..d692c50afbaa 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
@@ -36,12 +36,12 @@ const GLOBAL_COMMAND_ID = `${BASE_COMMAND_ID}.global`;
 /**
  * Title of the 'create local prompt' command.
  */
-const LOCAL_COMMAND_TITLE = localize('commands.prompts.create.title.local', "Create prompt");
+const LOCAL_COMMAND_TITLE = localize('commands.prompts.create.title.local', "Create Prompt");
 
 /**
  * Title of the 'create global prompt' command.
  */
-const GLOBAL_COMMAND_TITLE = localize('commands.prompts.create.title.global', "Create prompt (global)");
+const GLOBAL_COMMAND_TITLE = localize('commands.prompts.create.title.global', "Create Global Prompt");
 
 /**
  * The command implementation.

From b231693e0ca6de38934bb026bac6c76ced483fc2 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 20 Feb 2025 10:53:59 -0800
Subject: [PATCH 0175/1815] open existing prompt file instead of throwing

---
 .../createPromptCommand.ts                    |  7 +++++--
 .../createPromptCommand/errors.ts             | 14 -------------
 .../utils/createPromptFile.ts                 | 20 +++++++++++++------
 .../languageFeatures/promptLinkProvider.ts    |  2 +-
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
index d692c50afbaa..28e4f6b52a6b 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
@@ -11,6 +11,7 @@ import { askForPromptSourceFolder } from './dialogs/askForPromptSourceFolder.js'
 import { IFileService } from '../../../../../../../platform/files/common/files.js';
 import { ILabelService } from '../../../../../../../platform/label/common/label.js';
 import { IOpenerService } from '../../../../../../../platform/opener/common/opener.js';
+import { ICommandService } from '../../../../../../../platform/commands/common/commands.js';
 import { IPromptPath, IPromptsService } from '../../../../common/promptSyntax/service/types.js';
 import { appendToCommandPalette } from '../../../../../files/browser/fileActions.contribution.js';
 import { IQuickInputService } from '../../../../../../../platform/quickinput/common/quickInput.js';
@@ -53,6 +54,7 @@ const command = async (
 	const fileService = accessor.get(IFileService);
 	const labelService = accessor.get(ILabelService);
 	const openerService = accessor.get(IOpenerService);
+	const commandService = accessor.get(ICommandService);
 	const promptsService = accessor.get(IPromptsService);
 	const quickInputService = accessor.get(IQuickInputService);
 	const workspaceService = accessor.get(IWorkspaceContextService);
@@ -84,6 +86,7 @@ const command = async (
 		folder: selectedFolder,
 		content,
 		fileService,
+		commandService,
 	});
 
 	await openerService.open(promptUri);
@@ -99,7 +102,7 @@ const commandFactory = (type: 'local' | 'global') => {
 };
 
 /**
- * Register the "Create Local Prompt" command.
+ * Register the "Create Prompt" command.
  */
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: LOCAL_COMMAND_ID,
@@ -117,7 +120,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 
 /**
- * Register the "Create Local Prompt" command in the command palette.
+ * Register the "Create Prompt" command in the command palette.
  */
 appendToCommandPalette(
 	{
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/errors.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/errors.ts
index 706da39504e0..5d7ed5c84161 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/errors.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/errors.ts
@@ -24,20 +24,6 @@ export class FolderExists extends BaseCreatePromptError {
 	}
 }
 
-/**
- * Error for when a prompt file already exists at the provided
- * prompt file path.
- */
-export class PromptExists extends BaseCreatePromptError {
-	constructor(path: string) {
-		super(localize(
-			'workbench.command.prompts.create.error.prompt-exists',
-			"Prompt file '{0}' already exists.",
-			path,
-		));
-	}
-}
-
 /**
  * Error for when an invalid prompt file name is provided.
  */
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/utils/createPromptFile.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/utils/createPromptFile.ts
index 296937b25efa..e72cf88fa186 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/utils/createPromptFile.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/utils/createPromptFile.ts
@@ -3,13 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { FolderExists, InvalidPromptName } from '../errors.js';
 import { URI } from '../../../../../../../../base/common/uri.js';
 import { assert } from '../../../../../../../../base/common/assert.js';
 import { VSBuffer } from '../../../../../../../../base/common/buffer.js';
 import { dirname } from '../../../../../../../../base/common/resources.js';
-import { FolderExists, InvalidPromptName, PromptExists } from '../errors.js';
 import { IFileService } from '../../../../../../../../platform/files/common/files.js';
 import { isPromptFile, PROMPT_FILE_EXTENSION } from '../../../../../../../../platform/prompts/common/constants.js';
+import { ICommandService } from '../../../../../../../../platform/commands/common/commands.js';
 
 /**
  * Options for the {@link createPromptFile} utility.
@@ -32,6 +33,7 @@ interface ICreatePromptFileOptions {
 	readonly content: string;
 
 	fileService: IFileService;
+	commandService: ICommandService;
 }
 
 /**
@@ -45,7 +47,7 @@ interface ICreatePromptFileOptions {
 export const createPromptFile = async (
 	options: ICreatePromptFileOptions,
 ): Promise<URI> => {
-	const { fileName, folder, content, fileService } = options;
+	const { fileName, folder, content, fileService, commandService } = options;
 
 	const promptUri = URI.joinPath(folder, fileName);
 
@@ -58,10 +60,16 @@ export const createPromptFile = async (
 	if (await fileService.exists(promptUri)) {
 		const promptInfo = await fileService.resolve(promptUri);
 
-		// throw appropriate error based on the type of the existing entity
-		throw (promptInfo.isDirectory)
-			? new FolderExists(promptUri.fsPath)
-			: new PromptExists(promptUri.fsPath);
+		// if existing entity is a folder, throw an error
+		assert(
+			!promptInfo.isDirectory,
+			new FolderExists(promptUri.fsPath),
+		);
+
+		// if prompt file already exists - open it
+		await commandService.executeCommand('vscode.open', promptUri);
+
+		return promptUri;
 	}
 
 	// ensure the parent folder of the prompt file exists
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkProvider.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkProvider.ts
index 66bd46bc5053..9b40572a7aff 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkProvider.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkProvider.ts
@@ -6,13 +6,13 @@
 import { LANGUAGE_SELECTOR } from '../constants.js';
 import { IPromptsService } from '../service/types.js';
 import { assert } from '../../../../../../base/common/assert.js';
-import { FolderReference, NotPromptFile } from '../../promptFileReferenceErrors.js';
 import { ITextModel } from '../../../../../../editor/common/model.js';
 import { assertDefined } from '../../../../../../base/common/types.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { CancellationError } from '../../../../../../base/common/errors.js';
 import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 import { Registry } from '../../../../../../platform/registry/common/platform.js';
+import { FolderReference, NotPromptFile } from '../../promptFileReferenceErrors.js';
 import { LifecyclePhase } from '../../../../../services/lifecycle/common/lifecycle.js';
 import { ILink, ILinksList, LinkProvider } from '../../../../../../editor/common/languages.js';
 import { IWorkbenchContributionsRegistry, Extensions } from '../../../../../common/contributions.js';

From c2eb8ab55e5ea832fbfbb48607b27bf59e817152 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 20 Feb 2025 10:57:28 -0800
Subject: [PATCH 0176/1815] update code comments

---
 .../createPromptCommand/utils/createPromptFile.ts             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/utils/createPromptFile.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/utils/createPromptFile.ts
index e72cf88fa186..d449726d917d 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/utils/createPromptFile.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/utils/createPromptFile.ts
@@ -60,13 +60,13 @@ export const createPromptFile = async (
 	if (await fileService.exists(promptUri)) {
 		const promptInfo = await fileService.resolve(promptUri);
 
-		// if existing entity is a folder, throw an error
+		// if existing object is a folder, throw an error
 		assert(
 			!promptInfo.isDirectory,
 			new FolderExists(promptUri.fsPath),
 		);
 
-		// if prompt file already exists - open it
+		// prompt file already exists so open it
 		await commandService.executeCommand('vscode.open', promptUri);
 
 		return promptUri;

From 965c96034aaad5c488390b7df0cf178cd6eb70fd Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Thu, 20 Feb 2025 11:56:33 -0800
Subject: [PATCH 0177/1815] fix: chat attachments/working set polish (#241382)

* Restore padding for chat context attachments

* Don't show two attach buttons in terminal and inline chat

* Enable implicit context only in panel chat
---
 .../contrib/chat/browser/actions/chatContextActions.ts     | 2 +-
 src/vs/workbench/contrib/chat/browser/chat.ts              | 1 +
 src/vs/workbench/contrib/chat/browser/chatInputPart.ts     | 7 +++++--
 src/vs/workbench/contrib/chat/browser/chatQuick.ts         | 2 +-
 src/vs/workbench/contrib/chat/browser/chatViewPane.ts      | 1 +
 src/vs/workbench/contrib/chat/browser/chatWidget.ts        | 1 +
 src/vs/workbench/contrib/chat/browser/media/chat.css       | 2 ++
 7 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index 5e958cb32dde..ed87e423abd2 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -470,7 +470,7 @@ export class AttachContextAction extends Action2 {
 		},
 		menu: [
 			{
-				when: AttachContextAction._cdt,
+				when: ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel),
 				id: MenuId.ChatInput,
 				group: 'navigation',
 				order: 2
diff --git a/src/vs/workbench/contrib/chat/browser/chat.ts b/src/vs/workbench/contrib/chat/browser/chat.ts
index 0d3ff60ded22..41ab2fb8e16e 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.ts
@@ -190,6 +190,7 @@ export interface IChatWidgetViewOptions {
 	};
 	defaultElementHeight?: number;
 	editorOverflowWidgetsDomNode?: HTMLElement;
+	enableImplicitContext?: boolean;
 	enableWorkingSet?: 'explicit' | 'implicit';
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index e8885e46d438..6754891581d4 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -121,6 +121,7 @@ interface IChatInputPartOptions {
 	};
 	editorOverflowWidgetsDomNode?: HTMLElement;
 	renderWorkingSet?: boolean;
+	enableImplicitContext?: boolean;
 }
 
 export interface IWorkingSetEntry {
@@ -705,8 +706,10 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		const toolbarsContainer = elements.inputToolbars;
 		this.chatEditingSessionWidgetContainer = elements.chatEditingSessionWidgetContainer;
 		this.renderAttachedContext(widget);
-		this._implicitContext = this._register(new ChatImplicitContext());
-		this._register(this._implicitContext.onDidChangeValue(() => this._handleAttachedContextChange()));
+		if (this.options.enableImplicitContext) {
+			this._implicitContext = this._register(new ChatImplicitContext());
+			this._register(this._implicitContext.onDidChangeValue(() => this._handleAttachedContextChange()));
+		}
 
 		this._register(this._attachmentModel.onDidChangeContext(() => this._handleAttachedContextChange()));
 		this.renderChatEditingSessionState(null, widget);
diff --git a/src/vs/workbench/contrib/chat/browser/chatQuick.ts b/src/vs/workbench/contrib/chat/browser/chatQuick.ts
index 412295c39eb4..fe13bc97df61 100644
--- a/src/vs/workbench/contrib/chat/browser/chatQuick.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatQuick.ts
@@ -221,7 +221,7 @@ class QuickChat extends Disposable {
 				ChatWidget,
 				ChatAgentLocation.Panel,
 				{ isQuickChat: true },
-				{ autoScroll: true, renderInputOnTop: true, renderStyle: 'compact', menus: { inputSideToolbar: MenuId.ChatInputSide } },
+				{ autoScroll: true, renderInputOnTop: true, renderStyle: 'compact', menus: { inputSideToolbar: MenuId.ChatInputSide }, enableImplicitContext: true },
 				{
 					listForeground: quickInputForeground,
 					listBackground: quickInputBackground,
diff --git a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
index a7ad1507eb6c..ca62b586d3a4 100644
--- a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
@@ -186,6 +186,7 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 						progressMessageAtBottomOfResponse: this.chatOptions.location === ChatAgentLocation.EditingSession,
 					},
 					editorOverflowWidgetsDomNode: editorOverflowNode,
+					enableImplicitContext: this.chatOptions.location === ChatAgentLocation.Panel,
 					enableWorkingSet: this.chatOptions.location === ChatAgentLocation.EditingSession ? 'explicit' : undefined
 				},
 				{
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index f2474822d75f..76242c0260b9 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -830,6 +830,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				renderStyle: options?.renderStyle === 'minimal' ? 'compact' : options?.renderStyle,
 				menus: { executeToolbar: MenuId.ChatExecute, ...this.viewOptions.menus },
 				editorOverflowWidgetsDomNode: this.viewOptions.editorOverflowWidgetsDomNode,
+				enableImplicitContext: this.viewOptions.enableImplicitContext,
 				renderWorkingSet: this.viewOptions.enableWorkingSet === 'explicit'
 			},
 			this.styles,
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index e9dd2540fca4..9a7151dad902 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -690,6 +690,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	display: flex;
 	flex-wrap: wrap;
 	align-items: center;
+	gap: 4px;
 }
 
 .chat-related-files .monaco-button-dropdown .monaco-text-button {
@@ -1178,6 +1179,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	display: flex;
 	flex-wrap: wrap;
 	cursor: default;
+	gap: 4px;
 }
 
 .interactive-session .interactive-input-part.compact .chat-attached-context {

From 2ee32f5db2fcbe312ea290641fad4459d32540f4 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Thu, 20 Feb 2025 12:20:37 -0800
Subject: [PATCH 0178/1815] Preserve whitespace in tool confirmation codeblock
 (#241386)

Preserve whitespace in confirmation codeblock
Fix #241336
---
 src/vs/workbench/contrib/chat/browser/media/chat.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 9a7151dad902..bfb557d7f886 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -427,6 +427,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 		background-color: var(--vscode-textPreformat-background);
 		padding: 1px 3px;
 		border-radius: 4px;
+		white-space: pre-wrap;
 	}
 }
 

From 5c820ba0dfa487debbe2f990b7582ba1fe5ca467 Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Thu, 20 Feb 2025 12:23:51 -0800
Subject: [PATCH 0179/1815] fix: make chat related file suggestions opt-in
 (#241387)

---
 src/vs/workbench/contrib/chat/browser/chat.contribution.ts | 5 +++++
 src/vs/workbench/contrib/chat/browser/chatInputPart.ts     | 2 +-
 src/vs/workbench/contrib/chat/browser/chatWidget.ts        | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index d7ccf0479986..80f18c82a77a 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -165,6 +165,11 @@ configurationRegistry.registerConfiguration({
 			description: nls.localize('chat.detectParticipant.enabled', "Enables chat participant autodetection for panel chat."),
 			default: true
 		},
+		'chat.renderRelatedFiles': {
+			type: 'boolean',
+			description: nls.localize('chat.renderRelatedFiles', "Controls whether related files should be rendered in the chat input."),
+			default: false
+		},
 		[PromptsConfig.CONFIG_KEY]: {
 			type: 'object',
 			title: nls.localize(
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 6754891581d4..9ef45618de5b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -1207,7 +1207,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		dom.setVisibility(Boolean(chatEditingSession), this.chatEditingSessionWidgetContainer);
 
 		await this.renderAttachedContext(chatWidget);
-		if (chatEditingSession) {
+		if (chatEditingSession && this.configurationService.getValue('chat.renderRelatedFiles')) {
 			this.renderChatRelatedFiles(chatEditingSession, this.relatedFilesContainer);
 		}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index 76242c0260b9..baadda42781b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -23,6 +23,7 @@ import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.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 { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { ITextResourceEditorInput } from '../../../../platform/editor/common/editor.js';
@@ -223,6 +224,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		private readonly viewOptions: IChatWidgetViewOptions,
 		private readonly styles: IChatWidgetStyles,
 		@ICodeEditorService codeEditorService: ICodeEditorService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IChatService private readonly chatService: IChatService,
@@ -302,6 +304,11 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 		this._codeBlockModelCollection = this._register(instantiationService.createInstance(CodeBlockModelCollection));
 
+		this._register(this.configurationService.onDidChangeConfiguration((e) => {
+			if (e.affectsConfiguration('chat.renderRelatedFiles')) {
+				this.renderChatEditingSessionState();
+			}
+		}));
 
 		this._register(autorunWithStore((r, store) => {
 

From 34835fbea9a3c595c79d17abdb1a038767181682 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Thu, 20 Feb 2025 21:28:26 +0100
Subject: [PATCH 0180/1815] Fix nested scopes with tree sitter (#241349)

* Fix nested scopes with tree sitter

* Thank you tests
---
 .../browser/treeSitterTokenizationFeature.ts  | 90 +++++++++++--------
 .../treeSitterTokenizationFeature.test.ts     | 16 ++++
 2 files changed, 71 insertions(+), 35 deletions(-)

diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
index 1e73074306c2..7dae34db91bf 100644
--- a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
@@ -45,10 +45,10 @@ interface EndOffsetToken {
 interface EndOffsetAndScopes {
 	endOffset: number;
 	scopes: string[];
-	bracket?: boolean;
+	bracket?: number[];
 }
 
-const BRACKETS = /[\{\}\[\]\<\>\(\)]/;
+const BRACKETS = /[\{\}\[\]\<\>\(\)]/g;
 
 export class TreeSitterTokenizationFeature extends Disposable implements ITreeSitterTokenizationFeature {
 	public _serviceBrand: undefined;
@@ -558,56 +558,76 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 				continue;
 			}
 
-			const hasBracket = () => {
-				return !!capture.text?.match(BRACKETS) && capture.name.includes('punctuation');
+			const brackets = (): number[] | undefined => {
+				return (capture.name.includes('punctuation') && capture.text) ? Array.from(capture.text.matchAll(BRACKETS)).map(match => startOffset + match.index) : undefined;
 			};
 
-			const addCurrentTokenToArray = () => {
-				endOffsetsAndScopes[tokenIndex] = { endOffset: endOffset, scopes: [capture.name], bracket: hasBracket() };
+			const addCurrentTokenToArray = (position?: number) => {
+				if (position !== undefined) {
+					let oldBracket = endOffsetsAndScopes[position].bracket;
+					// Check that the previous token ends at the same point that the current token starts
+					const prevEndOffset = position > 0 ? endOffsetsAndScopes[position - 1].endOffset : 0;
+					if (prevEndOffset !== startOffset) {
+						let preInsertBracket: number[] | undefined = undefined;
+						if (oldBracket && oldBracket.length > 0) {
+							preInsertBracket = [];
+							const postInsertBracket: number[] = [];
+							for (let i = 0; i < oldBracket.length; i++) {
+								const bracket = oldBracket[i];
+								if (bracket < startOffset) {
+									preInsertBracket.push(bracket);
+								} else if (bracket > endOffset) {
+									postInsertBracket.push(bracket);
+								}
+							}
+							if (preInsertBracket.length === 0) {
+								preInsertBracket = undefined;
+							}
+							if (postInsertBracket.length === 0) {
+								oldBracket = undefined;
+							} else {
+								oldBracket = postInsertBracket;
+							}
+						}
+						// We need to add some of the position token to cover the space
+						endOffsetsAndScopes.splice(position, 0, { endOffset: startOffset, scopes: [...endOffsetsAndScopes[position].scopes], bracket: preInsertBracket });
+						position++;
+						increaseSizeOfTokensByOneToken();
+						tokenIndex++;
+					}
+
+					endOffsetsAndScopes.splice(position, 0, { endOffset: endOffset, scopes: [capture.name], bracket: brackets() });
+					endOffsetsAndScopes[tokenIndex].bracket = oldBracket;
+				} else {
+					endOffsetsAndScopes[tokenIndex] = { endOffset: endOffset, scopes: [capture.name], bracket: brackets() };
+				}
 				tokenIndex++;
 			};
 
 			if (previousEndOffset >= endOffset) {
 				// walk back through the tokens until we find the one that contains the current token
 				let withinTokenIndex = tokenIndex - 1;
-				let originalPreviousTokenEndOffset;
+				let previousTokenEndOffset = endOffsetsAndScopes[withinTokenIndex].endOffset;
 
-				let previousTokenStartOffset;
-				let previousPreviousTokenEndOffset;
+				let previousTokenStartOffset = ((withinTokenIndex >= 2) ? endOffsetsAndScopes[withinTokenIndex - 1].endOffset : 0);
 				do {
-					originalPreviousTokenEndOffset = endOffsetsAndScopes[withinTokenIndex].endOffset;
-					previousTokenStartOffset = ((withinTokenIndex >= 2) ? endOffsetsAndScopes[withinTokenIndex - 1].endOffset : 0);
-					previousPreviousTokenEndOffset = (withinTokenIndex >= 2) ? endOffsetsAndScopes[withinTokenIndex - 1].endOffset : 0;
 
 					// Check that the current token doesn't just replace the last token
-					if ((previousTokenStartOffset + currentTokenLength) === originalPreviousTokenEndOffset) {
+					if ((previousTokenStartOffset + currentTokenLength) === previousTokenEndOffset) {
 						if (previousTokenStartOffset === startOffset) {
 							// Current token and previous token span the exact same characters, replace the last scope
 							endOffsetsAndScopes[withinTokenIndex].scopes[endOffsetsAndScopes[withinTokenIndex].scopes.length - 1] = capture.name;
+							endOffsetsAndScopes[withinTokenIndex].bracket = brackets();
 						}
-					} else if (previousPreviousTokenEndOffset <= startOffset) {
-						let originalPreviousTokenScopes;
+					} else if (previousTokenStartOffset <= startOffset) {
 						// The current token is within the previous token. Adjust the end of the previous token
-						if (previousPreviousTokenEndOffset !== startOffset) {
-							endOffsetsAndScopes[withinTokenIndex] = { endOffset: startOffset, scopes: endOffsetsAndScopes[withinTokenIndex].scopes, bracket: hasBracket() };
-							addCurrentTokenToArray();
-							originalPreviousTokenScopes = [...endOffsetsAndScopes[withinTokenIndex].scopes];
-						} else {
-							originalPreviousTokenScopes = [...endOffsetsAndScopes[withinTokenIndex].scopes];
-							endOffsetsAndScopes[withinTokenIndex] = { endOffset: endOffset, scopes: [capture.name], bracket: hasBracket() };
-						}
-
-						// Add the rest of the previous token after the current token
-						if (originalPreviousTokenEndOffset !== endOffset) {
-							increaseSizeOfTokensByOneToken();
-							endOffsetsAndScopes[tokenIndex] = { endOffset: originalPreviousTokenEndOffset, scopes: originalPreviousTokenScopes, bracket: endOffsetsAndScopes[withinTokenIndex].bracket };
-							tokenIndex++;
-						} else {
-							endOffsetsAndScopes[withinTokenIndex].scopes.unshift(...originalPreviousTokenScopes);
-						}
+						addCurrentTokenToArray(withinTokenIndex);
+						break;
 					}
 					withinTokenIndex--;
-				} while (previousTokenStartOffset > startOffset);
+					previousTokenStartOffset = ((withinTokenIndex >= 2) ? endOffsetsAndScopes[withinTokenIndex - 1].endOffset : 0);
+					previousTokenEndOffset = endOffsetsAndScopes[withinTokenIndex].endOffset;
+				} while (previousTokenEndOffset > startOffset);
 			} else {
 				// Just add the token to the array
 				addCurrentTokenToArray();
@@ -640,10 +660,10 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 		if (!emptyTokens) {
 			return undefined;
 		}
-		const endOffsetsAndScopes: { endOffset: number; scopes: string[]; metadata?: number; bracket?: boolean }[] = emptyTokens.endOffsets;
+		const endOffsetsAndScopes: { endOffset: number; scopes: string[]; metadata?: number; bracket?: number[] }[] = emptyTokens.endOffsets;
 		for (let i = 0; i < endOffsetsAndScopes.length; i++) {
 			const token = endOffsetsAndScopes[i];
-			token.metadata = findMetadata(this._colorThemeData, token.scopes, encodedLanguageId, !!token.bracket);
+			token.metadata = findMetadata(this._colorThemeData, token.scopes, encodedLanguageId, !!token.bracket && (token.bracket.length > 0));
 		}
 
 		const metadataTime = stopwatch.elapsed();
diff --git a/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts b/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts
index 7ed928b15916..64bf6d3111f0 100644
--- a/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts
+++ b/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts
@@ -396,4 +396,20 @@ class y {
 		assert.deepStrictEqual(tokensContentSize(tokens), content.length);
 		modelService.destroyModel(model.uri);
 	});
+
+	test('Many nested scopes', async () => {
+		const content = `y = new x(ttt({
+	message: '{0} i\\n\\n [commandName]({1}).',
+	args: ['Test', \`command:\${openSettingsCommand}?\${encodeURIComponent('["SettingName"]')}\`],
+	// To make sure the translators don't break the link
+	comment: ["{Locked=']({'}"]
+}));`;
+		const model = await getModelAndPrepTree(content);
+		const tokens = treeSitterTokenizationSupport.getTokensInRange(model, new Range(1, 1, 6, 5), 0, 238);
+		verifyTokens(tokens);
+		assert.deepStrictEqual(tokens?.length, 56);
+		assert.deepStrictEqual(tokensContentSize(tokens), content.length);
+		modelService.destroyModel(model.uri);
+	});
+
 });

From b49aaf3634c56af1aebcc9366beaca540d8b53ac Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 20 Feb 2025 13:00:13 -0800
Subject: [PATCH 0181/1815] Differentiate flags/options, add option value type

This also fixes an issue where option values stopped working recently.

Fixes #241392
---
 .../terminal-suggest/src/fig/figInterface.ts    | 17 +++++++++++++----
 .../api/browser/mainThreadTerminalService.ts    |  9 ++++-----
 src/vs/workbench/api/common/extHostTypes.ts     |  8 +++++---
 .../suggest/browser/terminalCompletionItem.ts   | 13 ++++++++-----
 .../browser/terminalCompletionService.ts        |  5 ++---
 .../suggest/browser/terminalSuggestAddon.ts     |  7 +++++--
 ...ode.proposed.terminalCompletionProvider.d.ts |  8 +++++---
 7 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/extensions/terminal-suggest/src/fig/figInterface.ts b/extensions/terminal-suggest/src/fig/figInterface.ts
index 3c663d8be352..35a4f700ba36 100644
--- a/extensions/terminal-suggest/src/fig/figInterface.ts
+++ b/extensions/terminal-suggest/src/fig/figInterface.ts
@@ -16,6 +16,7 @@ import type { ICompletionResource } from '../types';
 import { osIsWindows } from '../helpers/os';
 import { removeAnyFileExtension } from '../helpers/file';
 import type { EnvironmentVariable } from './api-bindings/types';
+import { asArray } from '../terminalSuggestMain';
 
 export interface IFigSpecSuggestionsResult {
 	filesRequested: boolean;
@@ -64,7 +65,7 @@ export async function getFigSuggestions(
 					result.items.push(createCompletionItem(
 						terminalContext.cursorPosition,
 						prefix,
-						{ label: { label: specLabel, description } },
+						{ label: { label: specLabel, description }, kind: vscode.TerminalCompletionItemKind.Flag },
 						description,
 						availableCommand.detail)
 					);
@@ -139,7 +140,7 @@ async function getFigSpecSuggestions(
 		filesRequested,
 		foldersRequested,
 		hasCurrentArg: !!parsedArguments.currentArg,
-		items: items,
+		items,
 	};
 }
 
@@ -234,6 +235,10 @@ export async function collectCompletionItemResult(
 		}
 		const flagsToExclude = kind === vscode.TerminalCompletionItemKind.Flag ? parsedArguments?.passedOptions.map(option => option.name).flat() : undefined;
 		if (Array.isArray(specArgs)) {
+			let itemKind = kind;
+			if (parsedArguments?.currentArg?.suggestions?.length === specArgs.length) {
+				itemKind = vscode.TerminalCompletionItemKind.OptionValue;
+			}
 			for (const item of specArgs) {
 				const suggestionLabels = getFigSuggestionLabel(item);
 				if (!suggestionLabels?.length) {
@@ -250,7 +255,7 @@ export async function collectCompletionItemResult(
 							{ label },
 							undefined,
 							typeof item === 'string' ? item : item.description,
-							kind
+							itemKind
 						)
 					);
 				}
@@ -260,6 +265,10 @@ export async function collectCompletionItemResult(
 				if (flagsToExclude?.includes(label)) {
 					continue;
 				}
+				let itemKind = kind;
+				if (typeof item === 'object' && 'args' in item && (asArray(item.args ?? [])).length > 0) {
+					itemKind = vscode.TerminalCompletionItemKind.Option;
+				}
 				items.push(
 					createCompletionItem(
 						terminalContext.cursorPosition,
@@ -267,7 +276,7 @@ export async function collectCompletionItemResult(
 						{ label },
 						undefined,
 						typeof item === 'string' ? item : item.description,
-						kind
+						itemKind,
 					)
 				);
 			}
diff --git a/src/vs/workbench/api/browser/mainThreadTerminalService.ts b/src/vs/workbench/api/browser/mainThreadTerminalService.ts
index ba135ce62159..7c3a1df01711 100644
--- a/src/vs/workbench/api/browser/mainThreadTerminalService.ts
+++ b/src/vs/workbench/api/browser/mainThreadTerminalService.ts
@@ -276,11 +276,10 @@ export class MainThreadTerminalService implements MainThreadTerminalServiceShape
 			id,
 			provideCompletions: async (commandLine, cursorPosition, allowFallbackCompletions, token) => {
 				const completions = await this._proxy.$provideTerminalCompletions(id, { commandLine, cursorPosition, allowFallbackCompletions }, token);
-				if (Array.isArray(completions)) {
-					return completions.map(c => ({ ...c, provider: id }));
-				} else {
-					return { items: completions?.items.map(c => ({ ...c, provider: id })), resourceRequestConfig: completions?.resourceRequestConfig };
-				}
+				return {
+					items: completions?.items.map(c => ({ ...c, provider: id })),
+					resourceRequestConfig: completions?.resourceRequestConfig
+				};
 			}
 		}, ...triggerCharacters));
 	}
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index 75d1061cfccd..77285f33d716 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -2141,10 +2141,12 @@ export class TerminalProfile implements vscode.TerminalProfile {
 export enum TerminalCompletionItemKind {
 	File = 0,
 	Folder = 1,
-	Flag = 2,
-	Method = 3,
+	Method = 2,
+	Alias = 3,
 	Argument = 4,
-	Alias = 5
+	Option = 5,
+	OptionValue = 6,
+	Flag = 7,
 }
 
 export class TerminalCompletionItem implements vscode.TerminalCompletionItem {
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionItem.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionItem.ts
index 8d02c076a95a..f3c889ef22ce 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionItem.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionItem.ts
@@ -10,12 +10,15 @@ import { ISimpleCompletion, SimpleCompletionItem } from '../../../../services/su
 export enum TerminalCompletionItemKind {
 	File = 0,
 	Folder = 1,
-	Flag = 2,
-	Method = 3,
+	Method = 2,
+	Alias = 3,
 	Argument = 4,
-	Alias = 5,
-	InlineSuggestion = 6,
-	InlineSuggestionAlwaysOnTop = 7,
+	Option = 5,
+	OptionValue = 6,
+	Flag = 7,
+	// Kinds only for core
+	InlineSuggestion = 100,
+	InlineSuggestionAlwaysOnTop = 101,
 }
 
 export interface ITerminalCompletion extends ISimpleCompletion {
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
index 5211abb5869d..bf72031db967 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
@@ -165,7 +165,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 			if (provider.shellTypes && !provider.shellTypes.includes(shellType)) {
 				return undefined;
 			}
-			const completions: ITerminalCompletion[] | TerminalCompletionList<ITerminalCompletion> | undefined = await provider.provideCompletions(promptValue, cursorPosition, allowFallbackCompletions, token);
+			const completions = await provider.provideCompletions(promptValue, cursorPosition, allowFallbackCompletions, token);
 			if (!completions) {
 				return undefined;
 			}
@@ -189,9 +189,8 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 				if (resourceCompletions) {
 					completionItems.push(...resourceCompletions);
 				}
-				return completionItems;
 			}
-			return;
+			return completionItems;
 		});
 
 		const results = await Promise.all(completionPromises);
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index 9d9eeb3b58b9..4a804f3de58b 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -91,11 +91,14 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 	private _kindToIconMap = new Map<number, ThemeIcon>([
 		[TerminalCompletionItemKind.File, Codicon.file],
 		[TerminalCompletionItemKind.Folder, Codicon.folder],
-		[TerminalCompletionItemKind.Flag, Codicon.symbolProperty],
 		[TerminalCompletionItemKind.Method, Codicon.symbolMethod],
-		[TerminalCompletionItemKind.Argument, Codicon.symbolVariable],
 		[TerminalCompletionItemKind.Alias, Codicon.replace],
+		[TerminalCompletionItemKind.Argument, Codicon.symbolVariable],
+		[TerminalCompletionItemKind.Option, Codicon.symbolEnum],
+		[TerminalCompletionItemKind.OptionValue, Codicon.symbolEnumMember],
+		[TerminalCompletionItemKind.Flag, Codicon.symbolProperty],
 		[TerminalCompletionItemKind.InlineSuggestion, Codicon.star],
+		[TerminalCompletionItemKind.InlineSuggestionAlwaysOnTop, Codicon.star],
 	]);
 
 	private readonly _inlineCompletion: ITerminalCompletion = {
diff --git a/src/vscode-dts/vscode.proposed.terminalCompletionProvider.d.ts b/src/vscode-dts/vscode.proposed.terminalCompletionProvider.d.ts
index 86c542f20873..ddaf1428297f 100644
--- a/src/vscode-dts/vscode.proposed.terminalCompletionProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.terminalCompletionProvider.d.ts
@@ -60,10 +60,12 @@ declare module 'vscode' {
 	export enum TerminalCompletionItemKind {
 		File = 0,
 		Folder = 1,
-		Flag = 2,
-		Method = 3,
+		Method = 2,
+		Alias = 3,
 		Argument = 4,
-		Alias = 5,
+		Option = 5,
+		OptionValue = 6,
+		Flag = 7,
 	}
 
 	export interface TerminalCompletionContext {

From e14d6775d80852e977cc1535706229da9f17e6bb Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 20 Feb 2025 13:23:23 -0800
Subject: [PATCH 0182/1815] Fix suggest exception when moving cursor in
 terminal

Fixes #241394
---
 .../terminalContrib/suggest/browser/terminalSuggestAddon.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index 9d9eeb3b58b9..77010a1a3830 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -463,7 +463,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		// requested, but since extensions are expected to allow the client-side to filter, they are
 		// only invalidated when whitespace is encountered.
 		if (this._currentPromptInputState && this._currentPromptInputState.cursorIndex < this._leadingLineContent.length) {
-			if (this._currentPromptInputState.cursorIndex <= 0 || this._currentPromptInputState.value[this._currentPromptInputState.cursorIndex].match(/[\\\/\s]/)) {
+			if (this._currentPromptInputState.cursorIndex <= 0 || this._currentPromptInputState.value[this._currentPromptInputState.cursorIndex]?.match(/[\\\/\s]/)) {
 				this.hideSuggestWidget(false);
 				return;
 			}

From 08c9de5831957b69f5d1ce6c8b9a23cc4c778838 Mon Sep 17 00:00:00 2001
From: Devin Valenciano <1389808+devinvalenciano@users.noreply.github.com>
Date: Thu, 20 Feb 2025 13:45:57 -0800
Subject: [PATCH 0183/1815] Update owner on telemetry events (#241389)

Update languageDetectionWorkerService.ts
---
 .../common/languageDetectionWorkerService.ts                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.ts b/src/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.ts
index 8944b02a469f..011d68d14aed 100644
--- a/src/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.ts
+++ b/src/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.ts
@@ -44,7 +44,7 @@ export interface IAutomaticLanguageDetectionLikelyWrongData {
 }
 
 export type AutomaticLanguageDetectionLikelyWrongClassification = {
-	owner: 'TylerLeonhardt,JacksonKearl';
+	owner: 'TylerLeonhardt';
 	comment: 'Used to determine how often language detection is likely wrong.';
 	currentLanguageId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The language id we guessed.' };
 	nextLanguageId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The language id the user chose.' };
@@ -61,7 +61,7 @@ export interface ILanguageDetectionStats {
 }
 
 export type LanguageDetectionStatsClassification = {
-	owner: 'TylerLeonhardt,JacksonKearl';
+	owner: 'TylerLeonhardt';
 	comment: 'Used to determine how definitive language detection is and how long it takes.';
 	languages: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The languages the model supports.' };
 	confidences: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The confidences of those languages.' };

From b1368c3fe1555bc077337a95d8b6bfb259ec0be9 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 20 Feb 2025 15:47:45 -0600
Subject: [PATCH 0184/1815] rm a log in generators (#241396)

---
 .../terminal-suggest/src/fig/autocomplete/state/generators.ts    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extensions/terminal-suggest/src/fig/autocomplete/state/generators.ts b/extensions/terminal-suggest/src/fig/autocomplete/state/generators.ts
index eff0c598d1e0..dca21f8e4d90 100644
--- a/extensions/terminal-suggest/src/fig/autocomplete/state/generators.ts
+++ b/extensions/terminal-suggest/src/fig/autocomplete/state/generators.ts
@@ -81,7 +81,6 @@ export const createGeneratorState = (
 	// 	return generatorState;
 	// }
 	const triggerGenerator = (currentState: GeneratorState, executeExternals: IFigExecuteExternals) => {
-		console.info('Triggering generator', { currentState });
 		const { generator, context } = currentState;
 		let request: Promise<Fig.Suggestion[] | undefined>;
 

From efe29bb57dc2315507771b00fc4cbc65585a796c Mon Sep 17 00:00:00 2001
From: Seong Min Park <psm03120@gmail.com>
Date: Fri, 21 Feb 2025 07:28:57 +0900
Subject: [PATCH 0185/1815] register output channel

---
 extensions/markdown-language-features/src/logging.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/markdown-language-features/src/logging.ts b/extensions/markdown-language-features/src/logging.ts
index fc3ae9e8c4ef..b5ea76f36081 100644
--- a/extensions/markdown-language-features/src/logging.ts
+++ b/extensions/markdown-language-features/src/logging.ts
@@ -15,7 +15,7 @@ export class VsCodeOutputLogger extends Disposable implements ILogger {
 	private _outputChannelValue?: vscode.LogOutputChannel;
 
 	private get _outputChannel() {
-		this._outputChannelValue ??= vscode.window.createOutputChannel('Markdown', { log: true });
+		this._outputChannelValue ??= this._register(vscode.window.createOutputChannel('Markdown', { log: true }));
 		return this._outputChannelValue;
 	}
 

From 9654eb25e874fba73d40e5ed2a37aba1c8d59d03 Mon Sep 17 00:00:00 2001
From: Josh Spicer <23246594+joshspicer@users.noreply.github.com>
Date: Thu, 20 Feb 2025 14:33:05 -0800
Subject: [PATCH 0186/1815] Fix #238815 by using a function that calls
 `downloadAndInstall` for local downloads (#241400)

Ensure that we eventually call RemoteExtensionManagementService.downloadAndInstall()
---
 src/vs/server/node/remoteExtensionsScanner.ts   |  6 ++++--
 .../electron-sandbox/installFailedExtensions.ts | 17 +++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/vs/server/node/remoteExtensionsScanner.ts b/src/vs/server/node/remoteExtensionsScanner.ts
index a9712d781f5a..1bd6cf68c1dc 100644
--- a/src/vs/server/node/remoteExtensionsScanner.ts
+++ b/src/vs/server/node/remoteExtensionsScanner.ts
@@ -88,10 +88,12 @@ export class RemoteExtensionsScannerService implements IRemoteExtensionsScannerS
 						}
 					}
 
-					if (failed.length) {
-						_logService.info(`Reporting the following extensions as failed to install: ${failed.map(f => f.id).join(', ')}`);
+					if (!failed.length) {
+						_logService.trace(`No extensions to report as failed`);
+						return { failed: [] };
 					}
 
+					_logService.info(`Relaying the following extensions to install later: ${failed.map(f => f.id).join(', ')}`);
 					return { failed };
 				});
 		}
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/installFailedExtensions.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/installFailedExtensions.ts
index 3ec70f645d82..3f602213b23d 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/installFailedExtensions.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/installFailedExtensions.ts
@@ -11,6 +11,10 @@ import { IRemoteExtensionsScannerService } from '../../../../platform/remote/com
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { IExtensionManagementServerService } from '../../../services/extensionManagement/common/extensionManagement.js';
+/**
+ * Checks and attempts to install extensions that remote server has 'relayed' to workbench.
+ * The server would 'relay' an extension for installation if it was unable to install it by itself.
+ */
 export class InstallFailedExtensions extends Disposable implements IWorkbenchContribution {
 	constructor(
 		@IRemoteExtensionsScannerService remoteExtensionsScannerService: IRemoteExtensionsScannerService,
@@ -19,10 +23,11 @@ export class InstallFailedExtensions extends Disposable implements IWorkbenchCon
 		@ILogService logService: ILogService
 	) {
 		super();
+		logService.info('Checking for extensions relayed from server');
 		remoteExtensionsScannerService.whenExtensionsReady()
 			.then(async ({ failed }) => {
 				if (failed.length === 0) {
-					logService.trace('No failed extensions relayed from server');
+					logService.trace('No extensions relayed from server');
 					return;
 				}
 
@@ -31,6 +36,7 @@ export class InstallFailedExtensions extends Disposable implements IWorkbenchCon
 					return;
 				}
 
+				logService.trace(`Retrieved gallery information for '${failed.length}' extensions relayed from server`);
 				const extensionManagementService = this._extensionManagementServerService.remoteExtensionManagementServer.extensionManagementService;
 				const galleryExtensions = await this._extensionGalleryService.getExtensions(failed, CancellationToken.None);
 				// Join back with its installOptions
@@ -41,8 +47,15 @@ export class InstallFailedExtensions extends Disposable implements IWorkbenchCon
 					};
 				});
 
-				await extensionManagementService.installGalleryExtensions(installExtensionInfo);
+				logService.trace(`Retrieved gallery information for '${installExtensionInfo.length}' extensions relayed from server`);
+				const settled = await Promise.allSettled(
+					installExtensionInfo.map(info => extensionManagementService.installFromGallery(info.extension, info.options))
+				);
+
+				const installedCount = settled.filter(result => result.status === 'fulfilled').length;
+				logService.info(`Installed '${installedCount}' of '${failed.length}' extensions relayed from server`);
 			}).catch(e => {
+				logService.error('Unexpected failure installing extensions relayed from server');
 				logService.error(e);
 			});
 	}

From 786bf69b6e78f5e07a71d7301734bd28795afc46 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Thu, 20 Feb 2025 23:39:53 +0100
Subject: [PATCH 0187/1815] Respond to theme updates for tree sitter (#241326)

---
 .../editor/common/viewModel/viewModelImpl.ts  |  4 +--
 .../colorPickerParts/colorPickerHeader.ts     |  4 +--
 .../gotoError/browser/gotoErrorWidget.ts      |  8 +++--
 .../browser/peek/referencesWidget.ts          |  8 +++--
 .../contrib/rename/browser/renameWidget.ts    |  2 +-
 .../contrib/suggest/browser/suggestWidget.ts  |  2 +-
 .../browser/standaloneThemeService.ts         |  6 ++--
 .../test/browser/standaloneLanguages.test.ts  |  4 +--
 src/vs/platform/theme/common/themeService.ts  |  6 ++--
 .../theme/test/common/testThemeService.ts     |  8 ++---
 .../browser/parts/compositeBarActions.ts      |  4 +--
 .../browser/parts/statusbar/statusbarItem.ts  |  4 +--
 .../browser/callHierarchyPeek.ts              |  2 +-
 .../browser/commentThreadZoneWidget.ts        |  2 +-
 .../contrib/debug/browser/disassemblyView.ts  |  4 +--
 .../contrib/debug/browser/exceptionWidget.ts  |  8 +++--
 .../browser/diff/notebookDiffOverviewRuler.ts |  2 +-
 .../contrib/scm/browser/quickDiffWidget.ts    |  2 +-
 .../terminal/browser/xterm/xtermTerminal.ts   |  2 +-
 .../browser/typeHierarchyPeek.ts              |  2 +-
 .../themes/browser/workbenchThemeService.ts   | 14 ++++-----
 .../themes/common/workbenchThemeService.ts    |  8 +++--
 .../browser/treeSitterCodeEditors.ts          |  4 +++
 .../browser/treeSitterTokenizationFeature.ts  | 29 ++++++++++++++++---
 24 files changed, 90 insertions(+), 49 deletions(-)

diff --git a/src/vs/editor/common/viewModel/viewModelImpl.ts b/src/vs/editor/common/viewModel/viewModelImpl.ts
index 96043722d84c..1db590850902 100644
--- a/src/vs/editor/common/viewModel/viewModelImpl.ts
+++ b/src/vs/editor/common/viewModel/viewModelImpl.ts
@@ -153,9 +153,9 @@ export class ViewModel extends Disposable implements IViewModel {
 			this._eventDispatcher.emitSingleViewEvent(new viewEvents.ViewTokensColorsChangedEvent());
 		}));
 
-		this._register(this._themeService.onDidColorThemeChange((theme) => {
+		this._register(this._themeService.onDidColorThemeChange((e) => {
 			this._invalidateDecorationsColorCache();
-			this._eventDispatcher.emitSingleViewEvent(new viewEvents.ViewThemeChangedEvent(theme));
+			this._eventDispatcher.emitSingleViewEvent(new viewEvents.ViewThemeChangedEvent(e.theme));
 		}));
 
 		this._updateConfigurationViewLineCountNow();
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerHeader.ts b/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerHeader.ts
index 8522f41e361e..8d11bdf3ac76 100644
--- a/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerHeader.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerHeader.ts
@@ -43,8 +43,8 @@ export class ColorPickerHeader extends Disposable {
 		this._originalColorNode.style.backgroundColor = Color.Format.CSS.format(this.model.originalColor) || '';
 
 		this.backgroundColor = themeService.getColorTheme().getColor(editorHoverBackground) || Color.white;
-		this._register(themeService.onDidColorThemeChange(theme => {
-			this.backgroundColor = theme.getColor(editorHoverBackground) || Color.white;
+		this._register(themeService.onDidColorThemeChange(e => {
+			this.backgroundColor = e.theme.getColor(editorHoverBackground) || Color.white;
 		}));
 
 		this._register(dom.addDisposableListener(this._pickedColorNode, dom.EventType.CLICK, () => this.model.selectNextColorPresentation()));
diff --git a/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts b/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts
index 5a8bc4fb7ed7..33c8ce333233 100644
--- a/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts
+++ b/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts
@@ -28,7 +28,7 @@ import { IMarker, IRelatedInformation, MarkerSeverity } from '../../../../platfo
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { SeverityIcon } from '../../../../platform/severityIcon/browser/severityIcon.js';
 import { contrastBorder, editorBackground, editorErrorBorder, editorErrorForeground, editorInfoBorder, editorInfoForeground, editorWarningBorder, editorWarningForeground, oneOf, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
-import { IColorTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IColorTheme, IThemeChangeEvent, IThemeService } from '../../../../platform/theme/common/themeService.js';
 
 class MessageWidget {
 
@@ -255,11 +255,15 @@ export class MarkerNavigationWidget extends PeekViewWidget {
 		this._backgroundColor = Color.white;
 
 		this._applyTheme(_themeService.getColorTheme());
-		this._callOnDispose.add(_themeService.onDidColorThemeChange(this._applyTheme.bind(this)));
+		this._callOnDispose.add(_themeService.onDidColorThemeChange(this._ondDidColorThemeChange.bind(this)));
 
 		this.create();
 	}
 
+	private _ondDidColorThemeChange(e: IThemeChangeEvent) {
+		this._applyTheme(e.theme);
+	}
+
 	private _applyTheme(theme: IColorTheme) {
 		this._backgroundColor = theme.getColor(editorMarkerNavigationBackground);
 		let colorId = editorMarkerNavigationError;
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.ts b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.ts
index 9581b5cf6ff6..6c7da6476db1 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.ts
@@ -32,7 +32,7 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { IWorkbenchAsyncDataTreeOptions, WorkbenchAsyncDataTree } from '../../../../../platform/list/browser/listService.js';
-import { IColorTheme, IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { IColorTheme, IThemeChangeEvent, IThemeService } from '../../../../../platform/theme/common/themeService.js';
 import { FileReferences, OneReference, ReferencesModel } from '../referencesModel.js';
 import { ITreeDragAndDrop, ITreeDragOverReaction } from '../../../../../base/browser/ui/tree/tree.js';
 import { DataTransfers, IDragAndDropData } from '../../../../../base/browser/dnd.js';
@@ -276,7 +276,7 @@ export class ReferenceWidget extends peekView.PeekViewWidget {
 		super(editor, { showFrame: false, showArrow: true, isResizeable: true, isAccessible: true, supportOnTitleClick: true }, _instantiationService);
 
 		this._applyTheme(themeService.getColorTheme());
-		this._callOnDispose.add(themeService.onDidColorThemeChange(this._applyTheme.bind(this)));
+		this._callOnDispose.add(themeService.onDidColorThemeChange(this._onDidColorThemeChange.bind(this)));
 		this._peekViewService.addExclusiveWidget(editor, this);
 		this.create();
 	}
@@ -298,6 +298,10 @@ export class ReferenceWidget extends peekView.PeekViewWidget {
 		super.dispose();
 	}
 
+	private _onDidColorThemeChange(e: IThemeChangeEvent): void {
+		this._applyTheme(e.theme);
+	}
+
 	private _applyTheme(theme: IColorTheme) {
 		const borderColor = theme.getColor(peekView.peekViewBorder) || Color.transparent;
 		this.style({
diff --git a/src/vs/editor/contrib/rename/browser/renameWidget.ts b/src/vs/editor/contrib/rename/browser/renameWidget.ts
index e5a7bc714975..baf0f0b88c49 100644
--- a/src/vs/editor/contrib/rename/browser/renameWidget.ts
+++ b/src/vs/editor/contrib/rename/browser/renameWidget.ts
@@ -181,7 +181,7 @@ export class RenameWidget implements IRenameWidget, IContentWidget, IDisposable
 			}
 		}));
 
-		this._disposables.add(_themeService.onDidColorThemeChange(this._updateStyles, this));
+		this._disposables.add(_themeService.onDidColorThemeChange(e => this._updateStyles(e.theme)));
 	}
 
 	dispose(): void {
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
index 0ad604159e1a..fbaa5530d893 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
@@ -270,7 +270,7 @@ export class SuggestWidget implements IDisposable {
 		const applyStatusBarStyle = () => this.element.domNode.classList.toggle('with-status-bar', this.editor.getOption(EditorOption.suggest).showStatusBar);
 		applyStatusBarStyle();
 
-		this._disposables.add(_themeService.onDidColorThemeChange(t => this._onThemeChange(t)));
+		this._disposables.add(_themeService.onDidColorThemeChange(t => this._onThemeChange(t.theme)));
 		this._onThemeChange(_themeService.getColorTheme());
 
 		this._disposables.add(this._list.onMouseDown(e => this._onListMouseDownOrTap(e)));
diff --git a/src/vs/editor/standalone/browser/standaloneThemeService.ts b/src/vs/editor/standalone/browser/standaloneThemeService.ts
index 8a697f653ff5..4446b6932906 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, IThemeChangeEvent } 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';
@@ -213,7 +213,7 @@ export class StandaloneThemeService extends Disposable implements IStandaloneThe
 
 	declare readonly _serviceBrand: undefined;
 
-	private readonly _onColorThemeChange = this._register(new Emitter<IStandaloneTheme>());
+	private readonly _onColorThemeChange = this._register(new Emitter<IThemeChangeEvent>());
 	public readonly onDidColorThemeChange = this._onColorThemeChange.event;
 
 	private readonly _onFileIconThemeChange = this._register(new Emitter<IFileIconTheme>());
@@ -403,7 +403,7 @@ export class StandaloneThemeService extends Disposable implements IStandaloneThe
 		this._updateCSS();
 
 		TokenizationRegistry.setColorMap(colorMap);
-		this._onColorThemeChange.fire(this._theme);
+		this._onColorThemeChange.fire({ theme: this._theme });
 	}
 
 	private _updateCSS(): void {
diff --git a/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts b/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts
index 0fa82cf782b2..def6b624a189 100644
--- a/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts
+++ b/src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts
@@ -17,7 +17,7 @@ import { IStandaloneTheme, IStandaloneThemeData, IStandaloneThemeService } from
 import { UnthemedProductIconTheme } from '../../../../platform/theme/browser/iconsStyleSheet.js';
 import { ColorIdentifier } from '../../../../platform/theme/common/colorRegistry.js';
 import { ColorScheme } from '../../../../platform/theme/common/theme.js';
-import { IColorTheme, IFileIconTheme, IProductIconTheme, ITokenStyle } from '../../../../platform/theme/common/themeService.js';
+import { IFileIconTheme, IProductIconTheme, IThemeChangeEvent, ITokenStyle } from '../../../../platform/theme/common/themeService.js';
 
 suite('TokenizationSupport2Adapter', () => {
 
@@ -92,7 +92,7 @@ suite('TokenizationSupport2Adapter', () => {
 		public getProductIconTheme(): IProductIconTheme {
 			return this._builtInProductIconTheme;
 		}
-		public readonly onDidColorThemeChange = new Emitter<IColorTheme>().event;
+		public readonly onDidColorThemeChange = new Emitter<IThemeChangeEvent>().event;
 		public readonly onDidFileIconThemeChange = new Emitter<IFileIconTheme>().event;
 		public readonly onDidProductIconThemeChange = new Emitter<IProductIconTheme>().event;
 	}
diff --git a/src/vs/platform/theme/common/themeService.ts b/src/vs/platform/theme/common/themeService.ts
index 7911e0221da9..1f54a38197a5 100644
--- a/src/vs/platform/theme/common/themeService.ts
+++ b/src/vs/platform/theme/common/themeService.ts
@@ -100,12 +100,14 @@ export interface IThemingParticipant {
 	(theme: IColorTheme, collector: ICssStyleCollector, environment: IEnvironmentService): void;
 }
 
+export type IThemeChangeEvent = { theme: IColorTheme };
+
 export interface IThemeService {
 	readonly _serviceBrand: undefined;
 
 	getColorTheme(): IColorTheme;
 
-	readonly onDidColorThemeChange: Event<IColorTheme>;
+	readonly onDidColorThemeChange: Event<IThemeChangeEvent>;
 
 	getFileIconTheme(): IFileIconTheme;
 
@@ -182,7 +184,7 @@ export class Themable extends Disposable {
 		this.theme = themeService.getColorTheme();
 
 		// Hook up to theme changes
-		this._register(this.themeService.onDidColorThemeChange(theme => this.onThemeChange(theme)));
+		this._register(this.themeService.onDidColorThemeChange(e => this.onThemeChange(e.theme)));
 	}
 
 	protected onThemeChange(theme: IColorTheme): void {
diff --git a/src/vs/platform/theme/test/common/testThemeService.ts b/src/vs/platform/theme/test/common/testThemeService.ts
index 8ee388d4dbd3..0e6c72cadcc0 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, IThemeChangeEvent, IThemeService, ITokenStyle } from '../../common/themeService.js';
 
 export class TestColorTheme implements IColorTheme {
 
@@ -58,7 +58,7 @@ export class TestThemeService implements IThemeService {
 	_colorTheme: IColorTheme;
 	_fileIconTheme: IFileIconTheme;
 	_productIconTheme: IProductIconTheme;
-	_onThemeChange = new Emitter<IColorTheme>();
+	_onThemeChange = new Emitter<IThemeChangeEvent>();
 	_onFileIconThemeChange = new Emitter<IFileIconTheme>();
 	_onProductIconThemeChange = new Emitter<IProductIconTheme>();
 
@@ -78,10 +78,10 @@ export class TestThemeService implements IThemeService {
 	}
 
 	fireThemeChange() {
-		this._onThemeChange.fire(this._colorTheme);
+		this._onThemeChange.fire({ theme: this._colorTheme });
 	}
 
-	public get onDidColorThemeChange(): Event<IColorTheme> {
+	public get onDidColorThemeChange(): Event<IThemeChangeEvent> {
 		return this._onThemeChange.event;
 	}
 
diff --git a/src/vs/workbench/browser/parts/compositeBarActions.ts b/src/vs/workbench/browser/parts/compositeBarActions.ts
index 136b41c9800c..5a792fe9a3a0 100644
--- a/src/vs/workbench/browser/parts/compositeBarActions.ts
+++ b/src/vs/workbench/browser/parts/compositeBarActions.ts
@@ -9,7 +9,7 @@ import { $, addDisposableListener, append, clearNode, EventHelper, EventType, ge
 import { ICommandService } from '../../../platform/commands/common/commands.js';
 import { toDisposable, DisposableStore, MutableDisposable } from '../../../base/common/lifecycle.js';
 import { IContextMenuService } from '../../../platform/contextview/browser/contextView.js';
-import { IThemeService, IColorTheme } from '../../../platform/theme/common/themeService.js';
+import { IThemeService, IColorTheme, IThemeChangeEvent } from '../../../platform/theme/common/themeService.js';
 import { NumberBadge, IBadge, IActivity, ProgressBadge, IconBadge } from '../../services/activity/common/activity.js';
 import { IInstantiationService, ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
 import { DelayedDragHandler } from '../../../base/browser/dnd.js';
@@ -289,7 +289,7 @@ export class CompositeBarActionViewItem extends BaseActionViewItem {
 		this.updateTitle();
 	}
 
-	private onThemeChange(theme: IColorTheme): void {
+	private onThemeChange(theme: IThemeChangeEvent): void {
 		this.updateStyles();
 	}
 
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts b/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
index 149ee4cbff52..198e34c731b8 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
@@ -253,8 +253,8 @@ export class StatusbarEntryItem extends Disposable {
 			if (isThemeColor(color)) {
 				colorResult = this.themeService.getColorTheme().getColor(color.id)?.toString();
 
-				const listener = this.themeService.onDidColorThemeChange(theme => {
-					const colorValue = theme.getColor(color.id)?.toString();
+				const listener = this.themeService.onDidColorThemeChange(e => {
+					const colorValue = e.theme.getColor(color.id)?.toString();
 
 					if (isBackground) {
 						container.style.backgroundColor = colorValue ?? '';
diff --git a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts
index 75da6466a36d..0afedce845a5 100644
--- a/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts
+++ b/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.ts
@@ -96,7 +96,7 @@ export class CallHierarchyTreePeekWidget extends peekView.PeekViewWidget {
 		this.create();
 		this._peekViewService.addExclusiveWidget(editor, this);
 		this._applyTheme(themeService.getColorTheme());
-		this._disposables.add(themeService.onDidColorThemeChange(this._applyTheme, this));
+		this._disposables.add(themeService.onDidColorThemeChange(e => this._applyTheme(e.theme)));
 		this._disposables.add(this._previewDisposable);
 	}
 
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
index 0039a4030eaa..e664efbc245d 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
@@ -157,7 +157,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 		this._commentThreadDisposables = [];
 		this.create();
 
-		this._globalToDispose.add(this.themeService.onDidColorThemeChange(this._applyTheme, this));
+		this._globalToDispose.add(this.themeService.onDidColorThemeChange(e => this._applyTheme(e.theme)));
 		this._globalToDispose.add(this.editor.onDidChangeConfiguration(e => {
 			if (e.hasChanged(EditorOption.fontInfo)) {
 				this._applyTheme(this.themeService.getColorTheme());
diff --git a/src/vs/workbench/contrib/debug/browser/disassemblyView.ts b/src/vs/workbench/contrib/debug/browser/disassemblyView.ts
index c98e35153df9..95c740dcaa6a 100644
--- a/src/vs/workbench/contrib/debug/browser/disassemblyView.ts
+++ b/src/vs/workbench/contrib/debug/browser/disassemblyView.ts
@@ -775,8 +775,8 @@ class InstructionRenderer extends Disposable implements ITableRenderer<IDisassem
 		this._focusedStackFrameColor = themeService.getColorTheme().getColor(focusedStackFrameColor);
 
 		this._register(themeService.onDidColorThemeChange(e => {
-			this._topStackFrameColor = e.getColor(topStackFrameColor);
-			this._focusedStackFrameColor = e.getColor(focusedStackFrameColor);
+			this._topStackFrameColor = e.theme.getColor(topStackFrameColor);
+			this._focusedStackFrameColor = e.theme.getColor(focusedStackFrameColor);
 		}));
 	}
 
diff --git a/src/vs/workbench/contrib/debug/browser/exceptionWidget.ts b/src/vs/workbench/contrib/debug/browser/exceptionWidget.ts
index 35479f2cef73..9f8d26570ede 100644
--- a/src/vs/workbench/contrib/debug/browser/exceptionWidget.ts
+++ b/src/vs/workbench/contrib/debug/browser/exceptionWidget.ts
@@ -10,7 +10,7 @@ import { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWi
 import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { IExceptionInfo, IDebugSession, IDebugEditorContribution, EDITOR_CONTRIBUTION_ID } from '../common/debug.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
-import { IThemeService, IColorTheme } from '../../../../platform/theme/common/themeService.js';
+import { IThemeService, IColorTheme, IThemeChangeEvent } from '../../../../platform/theme/common/themeService.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { Color } from '../../../../base/common/color.js';
 import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
@@ -41,7 +41,7 @@ export class ExceptionWidget extends ZoneWidget {
 		super(editor, { showFrame: true, showArrow: true, isAccessible: true, frameWidth: 1, className: 'exception-widget-container' });
 
 		this.applyTheme(themeService.getColorTheme());
-		this._disposables.add(themeService.onDidColorThemeChange(this.applyTheme.bind(this)));
+		this._disposables.add(themeService.onDidColorThemeChange(this.onDidColorThemeChange.bind(this)));
 
 		this.create();
 		const onDidLayoutChangeScheduler = new RunOnceScheduler(() => this._doLayout(undefined, undefined), 50);
@@ -49,6 +49,10 @@ export class ExceptionWidget extends ZoneWidget {
 		this._disposables.add(onDidLayoutChangeScheduler);
 	}
 
+	private onDidColorThemeChange(e: IThemeChangeEvent): void {
+		this.applyTheme(e.theme);
+	}
+
 	private applyTheme(theme: IColorTheme): void {
 		this.backgroundColor = theme.getColor(debugExceptionWidgetBackground);
 		const frameColor = theme.getColor(debugExceptionWidgetBorder);
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.ts
index f24aabe73b4c..912e77093692 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.ts
@@ -57,7 +57,7 @@ export class NotebookDiffOverviewRuler extends Themable {
 		}));
 
 		this._register(this.themeService.onDidColorThemeChange(e => {
-			const colorChanged = this.applyColors(e);
+			const colorChanged = this.applyColors(e.theme);
 			if (colorChanged) {
 				this._scheduleRender();
 			}
diff --git a/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts b/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
index f22648c7169b..de01355fb549 100644
--- a/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
+++ b/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
@@ -172,7 +172,7 @@ class QuickDiffWidget extends PeekViewWidget {
 	) {
 		super(editor, { isResizeable: true, frameWidth: 1, keepEditorSelection: true, className: 'dirty-diff' }, instantiationService);
 
-		this._disposables.add(themeService.onDidColorThemeChange(this._applyTheme, this));
+		this._disposables.add(themeService.onDidColorThemeChange(e => this._applyTheme(e.theme)));
 		this._applyTheme(themeService.getColorTheme());
 
 		if (!Iterable.isEmpty(this.model.originalTextModels)) {
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
index b835c0b5c524..b1a9006bf1f4 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
@@ -256,7 +256,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 			}
 		}));
 
-		this._register(this._themeService.onDidColorThemeChange(theme => this._updateTheme(theme)));
+		this._register(this._themeService.onDidColorThemeChange(e => this._updateTheme(e.theme)));
 		this._register(this._logService.onDidChangeLogLevel(e => this.raw.options.logLevel = vscodeToXtermLogLevel(e)));
 
 		// Refire events
diff --git a/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.ts b/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.ts
index 0af4bb62f515..df75f745155d 100644
--- a/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.ts
+++ b/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.ts
@@ -97,7 +97,7 @@ export class TypeHierarchyTreePeekWidget extends peekView.PeekViewWidget {
 		this.create();
 		this._peekViewService.addExclusiveWidget(editor, this);
 		this._applyTheme(themeService.getColorTheme());
-		this._disposables.add(themeService.onDidColorThemeChange(this._applyTheme, this));
+		this._disposables.add(themeService.onDidColorThemeChange(e => this._applyTheme(e.theme), this));
 		this._disposables.add(this._previewDisposable);
 	}
 
diff --git a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
index baf78a990da0..f2a4f0d8dcbc 100644
--- a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
@@ -6,7 +6,7 @@
 import * as nls from '../../../../nls.js';
 import * as types from '../../../../base/common/types.js';
 import { IExtensionService } from '../../extensions/common/extensions.js';
-import { IWorkbenchThemeService, IWorkbenchColorTheme, IWorkbenchFileIconTheme, ExtensionData, ThemeSettings, IWorkbenchProductIconTheme, ThemeSettingTarget, ThemeSettingDefaults, COLOR_THEME_DARK_INITIAL_COLORS, COLOR_THEME_LIGHT_INITIAL_COLORS } from '../common/workbenchThemeService.js';
+import { IWorkbenchThemeService, IWorkbenchColorTheme, IWorkbenchFileIconTheme, ExtensionData, ThemeSettings, IWorkbenchProductIconTheme, ThemeSettingTarget, ThemeSettingDefaults, COLOR_THEME_DARK_INITIAL_COLORS, COLOR_THEME_LIGHT_INITIAL_COLORS, IWorkbenchThemeChangeEvent } from '../common/workbenchThemeService.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
@@ -79,7 +79,7 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 
 	private readonly colorThemeRegistry: ThemeRegistry<ColorThemeData>;
 	private currentColorTheme: ColorThemeData;
-	private readonly onColorThemeChange: Emitter<IWorkbenchColorTheme>;
+	private readonly onColorThemeChange: Emitter<IWorkbenchThemeChangeEvent>;
 	private readonly colorThemeWatcher: ThemeFileWatcher;
 	private colorThemingParticipantChangeListener: IDisposable | undefined;
 	private readonly colorThemeSequencer: Sequencer;
@@ -117,7 +117,7 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 
 		this.colorThemeRegistry = this._register(new ThemeRegistry(colorThemesExtPoint, ColorThemeData.fromExtensionTheme));
 		this.colorThemeWatcher = this._register(new ThemeFileWatcher(fileService, environmentService, this.reloadCurrentColorTheme.bind(this)));
-		this.onColorThemeChange = new Emitter<IWorkbenchColorTheme>({ leakWarningThreshold: 400 });
+		this.onColorThemeChange = new Emitter<IWorkbenchThemeChangeEvent>({ leakWarningThreshold: 400 });
 		this.currentColorTheme = ColorThemeData.createUnloadedTheme('');
 		this.colorThemeSequencer = new Sequencer();
 
@@ -134,7 +134,7 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 		this.currentProductIconTheme = ProductIconThemeData.createUnloadedTheme('');
 		this.productIconThemeSequencer = new Sequencer();
 
-		this._register(this.onDidColorThemeChange(theme => getColorRegistry().notifyThemeUpdate(theme)));
+		this._register(this.onDidColorThemeChange(e => getColorRegistry().notifyThemeUpdate(e.theme)));
 
 		// In order to avoid paint flashing for tokens, because
 		// themes are loaded asynchronously, we need to initialize
@@ -277,7 +277,7 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 				}
 				if (hasColorChanges) {
 					this.updateDynamicCSSRules(this.currentColorTheme);
-					this.onColorThemeChange.fire(this.currentColorTheme);
+					this.onColorThemeChange.fire({ theme: this.currentColorTheme, target: 'auto' });
 				}
 			}
 		}));
@@ -387,7 +387,7 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 		return [];
 	}
 
-	public get onDidColorThemeChange(): Event<IWorkbenchColorTheme> {
+	public get onDidColorThemeChange(): Event<IWorkbenchThemeChangeEvent> {
 		return this.onColorThemeChange.event;
 	}
 
@@ -506,7 +506,7 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 			return Promise.resolve(null);
 		}
 
-		this.onColorThemeChange.fire(this.currentColorTheme);
+		this.onColorThemeChange.fire({ theme: this.currentColorTheme, target: settingsTarget });
 
 		// remember theme data for a quick restore
 		if (newTheme.isLoaded && settingsTarget !== 'preview') {
diff --git a/src/vs/workbench/services/themes/common/workbenchThemeService.ts b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
index 3806f1a2d6c0..4154648ee781 100644
--- a/src/vs/workbench/services/themes/common/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
@@ -6,7 +6,7 @@
 import { refineServiceDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { Event } from '../../../../base/common/event.js';
 import { Color } from '../../../../base/common/color.js';
-import { IColorTheme, IThemeService, IFileIconTheme, IProductIconTheme } from '../../../../platform/theme/common/themeService.js';
+import { IColorTheme, IThemeService, IFileIconTheme, IProductIconTheme, IThemeChangeEvent } from '../../../../platform/theme/common/themeService.js';
 import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 import { isBoolean, isString } from '../../../../base/common/types.js';
 import { IconContribution, IconDefinition } from '../../../../platform/theme/common/iconRegistry.js';
@@ -132,7 +132,9 @@ export interface IWorkbenchProductIconTheme extends IWorkbenchTheme, IProductIco
 }
 
 export type ThemeSettingTarget = ConfigurationTarget | undefined | 'auto' | 'preview';
-
+export interface IWorkbenchThemeChangeEvent extends IThemeChangeEvent {
+	target: ThemeSettingTarget;
+}
 
 export interface IWorkbenchThemeService extends IThemeService {
 	readonly _serviceBrand: undefined;
@@ -140,7 +142,7 @@ export interface IWorkbenchThemeService extends IThemeService {
 	getColorTheme(): IWorkbenchColorTheme;
 	getColorThemes(): Promise<IWorkbenchColorTheme[]>;
 	getMarketplaceColorThemes(publisher: string, name: string, version: string): Promise<IWorkbenchColorTheme[]>;
-	onDidColorThemeChange: Event<IWorkbenchColorTheme>;
+	onDidColorThemeChange: Event<IWorkbenchThemeChangeEvent>;
 
 	getPreferredColorScheme(): ColorScheme | undefined;
 
diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterCodeEditors.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterCodeEditors.ts
index 777ca784c73e..46d0abab0e6d 100644
--- a/src/vs/workbench/services/treeSitter/browser/treeSitterCodeEditors.ts
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterCodeEditors.ts
@@ -31,6 +31,10 @@ export class TreeSitterCodeEditors extends Disposable {
 		this._codeEditorService.listCodeEditors().forEach(this._onCodeEditorAdd, this);
 	}
 
+	get editors(): ICodeEditor[] {
+		return Array.from(this._editors.keys());
+	}
+
 	public async getInitialViewPorts(): Promise<IViewPortChangeEvent[]> {
 		await this._treeSitterParserService.getLanguage(this._languageId);
 		const editors = this._codeEditorService.listCodeEditors();
diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
index 7dae34db91bf..6cdd23d03cd5 100644
--- a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
@@ -15,7 +15,6 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { ColorThemeData, findMetadata } from '../../themes/common/colorThemeData.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
@@ -28,6 +27,7 @@ import { setTimeout0 } from '../../../../base/common/platform.js';
 import { findLikelyRelevantLines } from '../../../../editor/common/model/textModelTokens.js';
 import { TreeSitterCodeEditors } from './treeSitterCodeEditors.js';
 import { Position } from '../../../../editor/common/core/position.js';
+import { IWorkbenchThemeChangeEvent, IWorkbenchThemeService } from '../../themes/common/workbenchThemeService.js';
 
 type TreeSitterQueries = string;
 
@@ -123,7 +123,7 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 		private readonly _languageId: string,
 		private readonly _languageIdCodec: ILanguageIdCodec,
 		@ITreeSitterParserService private readonly _treeSitterService: ITreeSitterParserService,
-		@IThemeService private readonly _themeService: IThemeService,
+		@IWorkbenchThemeService private readonly _themeService: IWorkbenchThemeService,
 		@ITreeSitterTokenizationStoreService private readonly _tokenizationStoreService: ITreeSitterTokenizationStoreService,
 		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
@@ -138,7 +138,7 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 				this._parseAndTokenizeViewPort(viewport.model, viewport.ranges);
 			}
 		});
-		this._register(Event.runAndSubscribe(this._themeService.onDidColorThemeChange, () => this.reset()));
+		this._register(Event.runAndSubscribe(this._themeService.onDidColorThemeChange, (e) => this._updateTheme(e)));
 		let hasDoneFullTokenization = false;
 		this._register(this._treeSitterService.onDidUpdateTree((e) => {
 			if (e.textModel.getLanguageId() !== this._languageId) {
@@ -438,8 +438,29 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 		return this._query;
 	}
 
-	private reset() {
+	private _updateTheme(e: IWorkbenchThemeChangeEvent | undefined) {
 		this._colorThemeData = this._themeService.getColorTheme() as ColorThemeData;
+		for (const editor of this._codeEditors.editors) {
+			const model = editor.getModel();
+			if (model) {
+				const modelRange = model.getFullModelRange();
+				this._tokenizationStoreService.markForRefresh(model, modelRange);
+				this._parseAndTokenizeViewPort(model, editor.getVisibleRangesPlusViewportAboveBelow());
+
+				if (e?.target !== 'preview') {
+					this._handleTreeUpdate({
+						ranges: [{
+							newRange: modelRange,
+							newRangeStartOffset: 0,
+							newRangeEndOffset: model.getValueLength(),
+							oldRangeLength: model.getValueLength()
+						}],
+						textModel: model,
+						versionId: model.getVersionId()
+					});
+				}
+			}
+		}
 	}
 
 	captureAtPosition(lineNumber: number, column: number, textModel: ITextModel): QueryCapture[] {

From 1abef4d973df7294f2968de5ff9e0eee8a04449a Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Thu, 20 Feb 2025 21:33:40 +0100
Subject: [PATCH 0188/1815] @vscode/proxy-agent 0.32.0

---
 package-lock.json        | 8 ++++----
 package.json             | 2 +-
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1ce7d52275c7..92612ce1e5f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.0",
         "@vscode/policy-watcher": "^1.1.10",
-        "@vscode/proxy-agent": "^0.31.0",
+        "@vscode/proxy-agent": "^0.32.0",
         "@vscode/ripgrep": "^1.15.10",
         "@vscode/spdlog": "^0.15.0",
         "@vscode/sqlite3": "5.1.8-vscode",
@@ -2850,9 +2850,9 @@
       }
     },
     "node_modules/@vscode/proxy-agent": {
-      "version": "0.31.0",
-      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.31.0.tgz",
-      "integrity": "sha512-HY6UaJ9mKsBxHGnbj9EKigH5vczvB+9wTa8csNqPIjE8i2XjinKcGTBa+ky2+Eb+LGQNvyV/v56+XF6P11xRaQ==",
+      "version": "0.32.0",
+      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.32.0.tgz",
+      "integrity": "sha512-n6h2+WVMJ3ByfGUakDbBNpR25J2JpLQabofiTKHIcLpXfxhT5TQSEH4OcjesZZfqw1zDpd7oBgcgqToWIiaBrQ==",
       "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "^3.0.0",
diff --git a/package.json b/package.json
index caf55b20f999..d6eac5664edb 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
     "@vscode/policy-watcher": "^1.1.10",
-    "@vscode/proxy-agent": "^0.31.0",
+    "@vscode/proxy-agent": "^0.32.0",
     "@vscode/ripgrep": "^1.15.10",
     "@vscode/spdlog": "^0.15.0",
     "@vscode/sqlite3": "5.1.8-vscode",
diff --git a/remote/package-lock.json b/remote/package-lock.json
index 3d70b159decf..2349babd03e8 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -13,7 +13,7 @@
         "@parcel/watcher": "2.5.1",
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.0",
-        "@vscode/proxy-agent": "^0.31.0",
+        "@vscode/proxy-agent": "^0.32.0",
         "@vscode/ripgrep": "^1.15.10",
         "@vscode/spdlog": "^0.15.0",
         "@vscode/tree-sitter-wasm": "^0.1.3",
@@ -419,9 +419,9 @@
       "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg=="
     },
     "node_modules/@vscode/proxy-agent": {
-      "version": "0.31.0",
-      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.31.0.tgz",
-      "integrity": "sha512-HY6UaJ9mKsBxHGnbj9EKigH5vczvB+9wTa8csNqPIjE8i2XjinKcGTBa+ky2+Eb+LGQNvyV/v56+XF6P11xRaQ==",
+      "version": "0.32.0",
+      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.32.0.tgz",
+      "integrity": "sha512-n6h2+WVMJ3ByfGUakDbBNpR25J2JpLQabofiTKHIcLpXfxhT5TQSEH4OcjesZZfqw1zDpd7oBgcgqToWIiaBrQ==",
       "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "^3.0.0",
diff --git a/remote/package.json b/remote/package.json
index f42bc392fb61..a25b884dedb9 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -8,7 +8,7 @@
     "@parcel/watcher": "2.5.1",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
-    "@vscode/proxy-agent": "^0.31.0",
+    "@vscode/proxy-agent": "^0.32.0",
     "@vscode/ripgrep": "^1.15.10",
     "@vscode/spdlog": "^0.15.0",
     "@vscode/tree-sitter-wasm": "^0.1.3",

From e970a7c29ac56aa783047db545a00d4b6998b46f Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Thu, 20 Feb 2025 23:52:47 +0100
Subject: [PATCH 0189/1815] clickable/hoverable ghosttext view (#241399)

---
 src/vs/editor/browser/rect.ts                 |   7 ++
 .../browser/view/ghostText/ghostTextView.css  |   8 ++
 .../browser/view/ghostText/ghostTextView.ts   | 113 ++++++++++++++----
 .../browser/view/inlineCompletionsView.ts     |   1 +
 .../view/inlineEdits/inlineEditsView.ts       |   4 +-
 .../inlineEditsInsertionView.ts               |  41 +++----
 6 files changed, 130 insertions(+), 44 deletions(-)

diff --git a/src/vs/editor/browser/rect.ts b/src/vs/editor/browser/rect.ts
index e8958b5e8465..66c1bd87ebd6 100644
--- a/src/vs/editor/browser/rect.ts
+++ b/src/vs/editor/browser/rect.ts
@@ -108,6 +108,13 @@ export class Rect {
 			&& this.bottom >= other.bottom;
 	}
 
+	containsPoint(point: Point): boolean {
+		return this.left <= point.x
+			&& this.top <= point.y
+			&& this.right >= point.x
+			&& this.bottom >= point.y;
+	}
+
 	moveToBeContainedIn(parent: Rect): Rect {
 		const width = this.width;
 		const height = this.height;
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 da6682130bc1..2839f49bb12a 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.css
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.css
@@ -24,10 +24,18 @@
 	font-size: 0;
 }
 
+.monaco-editor .ghost-text-decoration, .monaco-editor .suggest-preview-text.clickable .view-line {
+	z-index: 1;
+}
+
 .monaco-editor .ghost-text-decoration, .monaco-editor .suggest-preview-text .ghost-text {
 	font-style: italic;
 }
 
+.monaco-editor .ghost-text-decoration, .monaco-editor .suggest-preview-text.clickable .ghost-text {
+	cursor: pointer;
+}
+
 .monaco-editor .inline-completion-text-to-replace {
 	text-decoration: underline;
 	text-underline-position: under;
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 1185bd8e82e8..1960bd5326c8 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
@@ -6,13 +6,13 @@
 import { createTrustedTypesPolicy } from '../../../../../../base/browser/trustedTypes.js';
 import { renderIcon } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
-import { Event } from '../../../../../../base/common/event.js';
+import { Emitter, Event } from '../../../../../../base/common/event.js';
 import { createHotClass } from '../../../../../../base/common/hotReloadHelpers.js';
-import { Disposable, toDisposable } from '../../../../../../base/common/lifecycle.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 * as strings from '../../../../../../base/common/strings.js';
 import { applyFontInfo } from '../../../../../browser/config/domFontInfo.js';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidgetPosition, IViewZoneChangeAccessor } from '../../../../../browser/editorBrowser.js';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidgetPosition, IViewZoneChangeAccessor, MouseTargetType } from '../../../../../browser/editorBrowser.js';
 import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
 import { EditorFontLigatures, EditorOption, IComputedEditorOptions } from '../../../../../common/config/editorOptions.js';
 import { OffsetEdit, SingleOffsetEdit } from '../../../../../common/core/offsetEdit.js';
@@ -28,7 +28,7 @@ import { RenderLineInput, renderViewLine } from '../../../../../common/viewLayou
 import { InlineDecorationType } from '../../../../../common/viewModel.js';
 import { GhostText, GhostTextReplacement, IGhostTextLine } from '../../model/ghostText.js';
 import { ColumnRange } from '../../utils.js';
-import { n } from '../../../../../../base/browser/dom.js';
+import { addDisposableListener, isHTMLElement, n } from '../../../../../../base/browser/dom.js';
 import './ghostTextView.css';
 
 export interface IGhostTextWidgetModel {
@@ -39,6 +39,7 @@ export interface IGhostTextWidgetModel {
 }
 
 const USE_SQUIGGLES_FOR_WARNING = true;
+const GHOST_TEXT_CLASS_NAME = 'ghost-text';
 
 export class GhostTextView extends Disposable {
 	private readonly _isDisposed = observableValue(this, false);
@@ -53,6 +54,9 @@ export class GhostTextView extends Disposable {
 		return { lineNumber: gt.lineNumber, position: new Position(gt.lineNumber, gt.parts[0].column), icon: warning.icon };
 	});
 
+	private readonly _onDidClick = this._register(new Emitter<void>());
+	public readonly onDidClick = this._onDidClick.event;
+
 	constructor(
 		private readonly _editor: ICodeEditor,
 		private readonly _model: IGhostTextWidgetModel,
@@ -61,6 +65,7 @@ export class GhostTextView extends Disposable {
 			syntaxHighlightingEnabled: boolean;
 		}>,
 		private readonly _shouldKeepCursorStable: boolean,
+		private readonly _isClickable: boolean,
 		@ILanguageService private readonly _languageService: ILanguageService,
 	) {
 		super();
@@ -68,6 +73,20 @@ export class GhostTextView extends Disposable {
 		this._register(toDisposable(() => { this._isDisposed.set(true, undefined); }));
 		this._register(this._editorObs.setDecorations(this.decorations));
 
+		if (this._isClickable) {
+			this._register(this._additionalLinesWidget.onDidClick(() => this._onDidClick.fire()));
+			this._register(this._editor.onMouseUp(e => {
+				if (e.target.type !== MouseTargetType.CONTENT_TEXT) {
+					return;
+				}
+				const a = e.target.detail.injectedText?.options.attachedData;
+				if (a instanceof GhostTextAttachedData) {
+					this._onDidClick.fire();
+					e.event.preventDefault();
+				}
+			}));
+		}
+
 		this._register(autorunWithStore((reader, store) => {
 			if (USE_SQUIGGLES_FOR_WARNING) {
 				return;
@@ -150,7 +169,7 @@ export class GhostTextView extends Disposable {
 
 		const syntaxHighlightingEnabled = this._useSyntaxHighlighting.read(reader);
 		const extraClassNames = this._extraClassNames.read(reader);
-		const { inlineTexts, additionalLines, hiddenRange } = computeGhostTextViewData(ghostText, textModel, 'ghost-text' + extraClassNames);
+		const { inlineTexts, additionalLines, hiddenRange } = computeGhostTextViewData(ghostText, textModel, GHOST_TEXT_CLASS_NAME + extraClassNames);
 
 		const currentLine = textModel.getLineContent(ghostText.lineNumber);
 		const edit = new OffsetEdit(inlineTexts.map(t => SingleOffsetEdit.insert(t.column - 1, t.text)));
@@ -207,6 +226,7 @@ export class GhostTextView extends Disposable {
 						tokens: p.tokens,
 						inlineClassName: p.preview ? 'ghost-text-decoration-preview' : 'ghost-text-decoration' + extraClassNames + p.lineDecorations.map(d => ' ' + d.className).join(' '), // TODO: take the ranges into account for line decorations
 						cursorStops: InjectedTextCursorStops.Left,
+						attachedData: new GhostTextAttachedData(),
 					},
 					showIfCollapsed: true,
 				}
@@ -216,7 +236,7 @@ export class GhostTextView extends Disposable {
 		return decorations;
 	});
 
-	private readonly additionalLinesWidget = this._register(
+	private readonly _additionalLinesWidget = this._register(
 		new AdditionalLinesWidget(
 			this._editor,
 			derived(reader => {
@@ -229,20 +249,33 @@ export class GhostTextView extends Disposable {
 					targetTextModel: uiState.targetTextModel,
 				} : undefined;
 			}),
-			this._shouldKeepCursorStable
+			this._shouldKeepCursorStable,
+			this._isClickable
 		)
 	);
 
+	private readonly _isInlineTextHovered = this._editorObs.isTargetHovered(
+		p => p.type === MouseTargetType.CONTENT_TEXT && p.detail.injectedText?.options.attachedData instanceof GhostTextAttachedData,
+		this._store
+	);
+
+	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 = derived(this, reader => {
 		const lineHeight = this._editorObs.getOption(EditorOption.lineHeight).read(reader);
-		return lineHeight + (this.additionalLinesWidget.viewZoneHeight.read(reader) ?? 0);
+		return lineHeight + (this._additionalLinesWidget.viewZoneHeight.read(reader) ?? 0);
 	});
 
 	public ownsViewZone(viewZoneId: string): boolean {
-		return this.additionalLinesWidget.viewZoneId === viewZoneId;
+		return this._additionalLinesWidget.viewZoneId === viewZoneId;
 	}
 }
 
+class GhostTextAttachedData { }
+
 interface WidgetDomElement {
 	ghostTextViewWarningWidgetData?: {
 		range: Range;
@@ -324,7 +357,7 @@ export class AdditionalLinesWidget extends Disposable {
 	public get viewZoneHeight(): IObservable<number | undefined> { return this._viewZoneHeight; }
 
 	private readonly editorOptionsChanged = observableSignalFromEvent('editorOptionChanged', Event.filter(
-		this.editor.onDidChangeConfiguration,
+		this._editor.onDidChangeConfiguration,
 		e => e.hasChanged(EditorOption.disableMonospaceOptimizations)
 			|| e.hasChanged(EditorOption.stopRenderingLineAfter)
 			|| e.hasChanged(EditorOption.renderWhitespace)
@@ -334,21 +367,32 @@ export class AdditionalLinesWidget extends Disposable {
 			|| e.hasChanged(EditorOption.lineHeight)
 	));
 
+	private readonly _onDidClick = this._register(new Emitter<void>());
+	public readonly onDidClick = this._onDidClick.event;
+
+	private readonly _viewZoneListener = this._register(new MutableDisposable());
+
+	readonly isHovered = observableCodeEditor(this._editor).isTargetHovered(
+		p => isTargetGhostText(p.element),
+		this._store
+	);
+
 	constructor(
-		private readonly editor: ICodeEditor,
-		private readonly lines: IObservable<{
+		private readonly _editor: ICodeEditor,
+		private readonly _lines: IObservable<{
 			targetTextModel: ITextModel;
 			lineNumber: number;
 			additionalLines: LineData[];
 			minReservedLineCount: number;
 		} | undefined>,
-		private readonly shouldKeepCursorStable: boolean
+		private readonly _shouldKeepCursorStable: boolean,
+		private readonly _isClickable: boolean,
 	) {
 		super();
 
 		this._register(autorun(reader => {
 			/** @description update view zone */
-			const lines = this.lines.read(reader);
+			const lines = this._lines.read(reader);
 			this.editorOptionsChanged.read(reader);
 
 			if (lines) {
@@ -365,29 +409,43 @@ export class AdditionalLinesWidget extends Disposable {
 	}
 
 	private clear(): void {
-		this.editor.changeViewZones((changeAccessor) => {
+		this._viewZoneListener.clear();
+
+		this._editor.changeViewZones((changeAccessor) => {
 			this.removeActiveViewZone(changeAccessor);
 		});
 	}
 
 	private updateLines(lineNumber: number, additionalLines: LineData[], minReservedLineCount: number): void {
-		const textModel = this.editor.getModel();
+		const textModel = this._editor.getModel();
 		if (!textModel) {
 			return;
 		}
 
 		const { tabSize } = textModel.getOptions();
 
-		this.editor.changeViewZones((changeAccessor) => {
+		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());
+				renderLines(domNode, tabSize, additionalLines, this._editor.getOptions(), this._isClickable);
+
+				if (this._isClickable) {
+					store.add(addDisposableListener(domNode, 'mouseup', (e) => {
+						if (isTargetGhostText(e.target)) {
+							this._onDidClick.fire();
+						}
+					}));
+				}
 
 				this.addViewZone(changeAccessor, lineNumber, heightInLines, domNode);
 			}
+
+			this._viewZoneListener.value = store;
 		});
 	}
 
@@ -419,23 +477,27 @@ export class AdditionalLinesWidget extends Disposable {
 	}
 
 	private keepCursorStable(lineNumber: number, heightInLines: number): void {
-		if (!this.shouldKeepCursorStable) {
+		if (!this._shouldKeepCursorStable) {
 			return;
 		}
 
-		const cursorLineNumber = this.editor.getSelection()?.getStartPosition()?.lineNumber;
+		const cursorLineNumber = this._editor.getSelection()?.getStartPosition()?.lineNumber;
 		if (cursorLineNumber !== undefined && lineNumber < cursorLineNumber) {
-			this.editor.setScrollTop(this.editor.getScrollTop() + heightInLines * this.editor.getOption(EditorOption.lineHeight));
+			this._editor.setScrollTop(this._editor.getScrollTop() + heightInLines * this._editor.getOption(EditorOption.lineHeight));
 		}
 	}
 }
 
+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[];
 }
 
-function renderLines(domNode: HTMLElement, tabSize: number, lines: LineData[], opts: IComputedEditorOptions): void {
+function renderLines(domNode: HTMLElement, tabSize: number, lines: 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
@@ -445,8 +507,13 @@ function renderLines(domNode: HTMLElement, tabSize: number, lines: LineData[], o
 	const fontInfo = opts.get(EditorOption.fontInfo);
 	const lineHeight = opts.get(EditorOption.lineHeight);
 
+	let classNames = 'suggest-preview-text';
+	if (isClickable) {
+		classNames += ' clickable';
+	}
+
 	const sb = new StringBuilder(10000);
-	sb.appendString('<div class="suggest-preview-text">');
+	sb.appendString(`<div class="${classNames}">`);
 
 	for (let i = 0, len = lines.length; i < len; i++) {
 		const lineData = lines[i];
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts
index 8fcf2a1b05c0..ed2d6bd31269 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts
@@ -39,6 +39,7 @@ export class InlineCompletionsView extends Disposable {
 		},
 		this._editorObs.getOption(EditorOption.inlineSuggest).map(v => ({ syntaxHighlightingEnabled: v.syntaxHighlightingEnabled })),
 		false,
+		false
 	)
 	).recomputeInitiallyAndOnChange(store)
 	).recomputeInitiallyAndOnChange(this._store);
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 a1aa61c76693..0dc7b4d13746 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
@@ -221,7 +221,9 @@ export class InlineEditsView extends Disposable {
 			|| 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._lineReplacementView.isHovered.read(reader)
+			|| this._insertion.isHovered.read(reader);
+
 	});
 
 	private readonly _gutterIndicatorOffset = derived<number>(this, reader => {
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 622538332e05..3d33ebca2db1 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
@@ -9,7 +9,7 @@ import { IInstantiationService } from '../../../../../../../platform/instantiati
 import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
 import { ICodeEditor } from '../../../../../../browser/editorBrowser.js';
 import { observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
-import { Point } from '../../../../../../browser/point.js';
+import { Rect } from '../../../../../../browser/rect.js';
 import { LineSource, renderLines, RenderOptions } from '../../../../../../browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
 import { LineRange } from '../../../../../../common/core/lineRange.js';
@@ -91,6 +91,7 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 		},
 		observableValue(this, { syntaxHighlightingEnabled: true, extraClasses: ['inline-edit'] }),
 		true,
+		true
 	));
 
 	constructor(
@@ -106,6 +107,10 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 	) {
 		super();
 
+		this._register(this._ghostTextView.onDidClick(() => {
+			this._host.accept();
+		}));
+
 		this._register(this._editorObs.createOverlayWidget({
 			domNode: this._nonOverflowView.element,
 			position: constObservable(null),
@@ -113,7 +118,7 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 			minContentWidthInPx: derived(reader => {
 				const info = this._overlayLayout.read(reader);
 				if (info === null) { return 0; }
-				return info.code1.x - info.codeStart1.x;
+				return info.minContentWidthRequired;
 			}),
 		}));
 	}
@@ -196,11 +201,12 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 
 		const editorLayout = this._editorObs.layoutInfo.read(reader);
 		const horizontalScrollOffset = this._editorObs.scrollLeft.read(reader);
+		const verticalScrollbarWidth = this._editorObs.layoutInfoVerticalScrollbarWidth.read(reader);
 
-		const left = editorLayout.contentLeft + this._editorMaxContentWidthInRange.read(reader) - horizontalScrollOffset;
-		const prefixTrim = this._maxPrefixTrim.read(reader);
-		const codeLeft = editorLayout.contentLeft + (prefixTrim?.prefixLeftOffset ?? 0 /* fix due to observable bug? */);
-		if (left <= codeLeft) {
+		const right = editorLayout.contentLeft + this._editorMaxContentWidthInRange.read(reader) - horizontalScrollOffset;
+		const prefixLeftOffset = this._maxPrefixTrim.read(reader).prefixLeftOffset ?? 0 /* fix due to observable bug? */;
+		const left = editorLayout.contentLeft + prefixLeftOffset;
+		if (right <= left) {
 			return null;
 		}
 
@@ -211,18 +217,13 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 		const top = this._editor.getTopForLineNumber(state.lineNumber) - scrollTop + topTrim;
 		const bottom = top + height;
 
-		const code1 = new Point(left, top);
-		const codeStart1 = new Point(codeLeft, top);
-		const code2 = new Point(left, bottom);
-		const codeStart2 = new Point(codeLeft, bottom);
+		const PADDING = 3;
+		const overlay = new Rect(left, top, right, bottom).withMargin(PADDING);
 
 		return {
-			code1,
-			codeStart1,
-			code2,
-			codeStart2,
+			overlay,
 			horizontalScrollOffset,
-			padding: 3,
+			minContentWidthRequired: prefixLeftOffset + overlay.width + verticalScrollbarWidth,
 			borderRadius: 4,
 		};
 	}).recomputeInitiallyAndOnChange(this._store);
@@ -238,11 +239,11 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 
 		const rectangleOverlay = createRectangle(
 			{
-				topLeft: layoutInfo.codeStart1,
-				width: layoutInfo.code1.x - layoutInfo.codeStart1.x + 1,
-				height: layoutInfo.code2.y - layoutInfo.code1.y + 1,
+				topLeft: layoutInfo.overlay.getLeftTop(),
+				width: layoutInfo.overlay.width + 1,
+				height: layoutInfo.overlay.height + 1,
 			},
-			layoutInfo.padding,
+			0,
 			layoutInfo.borderRadius,
 			{ hideLeft: layoutInfo.horizontalScrollOffset !== 0 }
 		);
@@ -276,5 +277,5 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 		[this._foregroundSvg],
 	]).keepUpdated(this._store);
 
-	readonly isHovered = constObservable(false);
+	readonly isHovered = this._ghostTextView.isHovered;
 }

From 771785567adb6c6cd4771f54912f48398bcaf482 Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Thu, 20 Feb 2025 15:27:51 -0800
Subject: [PATCH 0190/1815] =?UTF-8?q?fix:=20increase=20padding=20for=20cha?=
 =?UTF-8?q?t=20attached=20context=C2=A0widget=20(#241403)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/vs/workbench/contrib/chat/browser/media/chat.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index bfb557d7f886..6e0c160bc5f0 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1176,7 +1176,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 }
 
 .interactive-session .chat-attached-context {
-	padding: 5px 0 0 0;
+	padding: 6px 0 0 0;
 	display: flex;
 	flex-wrap: wrap;
 	cursor: default;

From 786993b77e12091bdce6484d798c2a3685e511c2 Mon Sep 17 00:00:00 2001
From: Justin Chen <54879025+justschen@users.noreply.github.com>
Date: Thu, 20 Feb 2025 15:38:57 -0800
Subject: [PATCH 0191/1815] drag and drop images from web (#241404)

drag and drop from web
---
 .../chatAttachmentsContentPart.ts             | 14 ++++
 .../contrib/chat/browser/chatDragAndDrop.ts   | 74 ++++++++++++++++++-
 .../contrib/chat/browser/chatInputPart.ts     | 17 ++++-
 .../contrib/chat/browser/imageUtils.ts        | 27 ++++++-
 4 files changed, 128 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
index b62621ea5bbc..61204fc1867e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
@@ -304,6 +304,20 @@ export class ChatAttachmentsContentPart extends Disposable {
 
 		// Update hover image
 		hoverElement.appendChild(img);
+
+		img.onload = () => {
+			URL.revokeObjectURL(url);
+		};
+
+		img.onerror = () => {
+			// reset to original icon on error or invalid image
+			const pillIcon = dom.$('div.chat-attached-context-pill', {}, dom.$('span.codicon.codicon-file-media'));
+			const pill = dom.$('div.chat-attached-context-pill', {}, pillIcon);
+			const existingPill = widget.querySelector('.chat-attached-context-pill');
+			if (existingPill) {
+				existingPill.replaceWith(pill);
+			}
+		};
 	}
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
index a6f55ecebbe4..8ce32d172039 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
@@ -30,7 +30,8 @@ import { UntitledTextEditorInput } from '../../../services/untitled/common/untit
 import { IChatRequestVariableEntry, IDiagnosticVariableEntry, IDiagnosticVariableEntryFilterData, ISymbolVariableEntry } from '../common/chatModel.js';
 import { ChatAttachmentModel } from './chatAttachmentModel.js';
 import { IChatInputStyles } from './chatInputPart.js';
-import { resizeImage } from './imageUtils.js';
+import { imageToHash } from './chatPasteProviders.js';
+import { convertStringToUInt8Array, resizeImage } from './imageUtils.js';
 
 enum ChatDragAndDropType {
 	FILE_INTERNAL,
@@ -38,6 +39,7 @@ enum ChatDragAndDropType {
 	FOLDER,
 	IMAGE,
 	SYMBOL,
+	HTML,
 	MARKER,
 }
 
@@ -170,6 +172,8 @@ export class ChatDragAndDrop extends Themable {
 		// This is an esstimation based on the datatransfer types/items
 		if (this.isImageDnd(e)) {
 			return this.extensionService.extensions.some(ext => isProposedApiEnabled(ext, 'chatReferenceBinaryData')) ? ChatDragAndDropType.IMAGE : undefined;
+		} else if (containsDragType(e, 'text/html')) {
+			return ChatDragAndDropType.HTML;
 		} else if (containsDragType(e, CodeDataTransfers.SYMBOLS)) {
 			return ChatDragAndDropType.SYMBOL;
 		} else if (containsDragType(e, CodeDataTransfers.MARKERS)) {
@@ -199,6 +203,7 @@ export class ChatDragAndDrop extends Themable {
 			case ChatDragAndDropType.IMAGE: return localize('image', 'Image');
 			case ChatDragAndDropType.SYMBOL: return localize('symbol', 'Symbol');
 			case ChatDragAndDropType.MARKER: return localize('problem', 'Problem');
+			case ChatDragAndDropType.HTML: return localize('url', 'URL');
 		}
 	}
 
@@ -240,6 +245,11 @@ export class ChatDragAndDrop extends Themable {
 			return this.resolveSymbolsAttachContext(data);
 		}
 
+		if (containsDragType(e, 'text/html')) {
+			const data = e.dataTransfer?.getData('text/html');
+			return data ? this.resolveHTMLAttachContext(data) : [];
+		}
+
 		const data = extractEditorsDropData(e);
 		return coalesce(await Promise.all(data.map(editorInput => {
 			return this.resolveAttachContext(editorInput);
@@ -315,6 +325,54 @@ export class ChatDragAndDrop extends Themable {
 		});
 	}
 
+	private async resolveHTMLAttachContext(data: string): Promise<IChatRequestVariableEntry[]> {
+		const displayName = localize('dragAndDroppedImageName', 'Image from URL');
+		let finalDisplayName = displayName;
+
+		for (let appendValue = 2; this.attachmentModel.attachments.some(attachment => attachment.name === finalDisplayName); appendValue++) {
+			finalDisplayName = `${displayName} ${appendValue}`;
+		}
+
+		const { src, alt } = extractImageAttributes(data);
+		finalDisplayName = alt ?? finalDisplayName;
+
+		if (/^data:image\/[a-z]+;base64,/.test(src)) {
+			const resizedImage = await resizeImage(src);
+			return [{
+				id: await imageToHash(resizedImage),
+				name: finalDisplayName,
+				value: resizedImage,
+				isImage: true,
+				isFile: false,
+				isDirectory: false
+			}];
+		} else if (/^https?:\/\/.+/.test(src)) {
+			const url = new URL(src);
+			const isImage = /\.(jpg|jpeg|png|gif|webp)$/i.test(url.pathname);
+			if (isImage) {
+				const buffer = convertStringToUInt8Array(src);
+				return [{
+					id: url.toString(),
+					name: finalDisplayName,
+					value: buffer,
+					isImage,
+					isFile: false,
+					isDirectory: false,
+				}];
+			} else {
+				return [{
+					kind: 'link',
+					id: url.toString(),
+					name: finalDisplayName,
+					value: URI.parse(url.toString()),
+					isFile: false,
+					isDirectory: false,
+				}];
+			}
+		}
+		return [];
+	}
+
 	private resolveMarkerAttachContext(markers: MarkerTransferData[]): IDiagnosticVariableEntry[] {
 		return markers.map((marker): IDiagnosticVariableEntry => {
 			const filter: Mutable<IDiagnosticVariableEntryFilterData> = {};
@@ -515,3 +573,17 @@ function symbolId(resource: URI, range?: IRange): string {
 	}
 	return resource.fsPath + rangePart;
 }
+
+function extractImageAttributes(html: string): { src: string; alt?: string } {
+	const imgTagRegex = /<img[^>]+src=["']([^"']+)["'][^>]*>/;
+	const altRegex = /alt=["']([^"']+)["']/;
+
+	const match = imgTagRegex.exec(html);
+	if (match) {
+		const src = match[1];
+		const altMatch = match[0].match(altRegex);
+		return { src, alt: altMatch ? altMatch[1] : undefined };
+	}
+
+	return { src: '', alt: undefined };
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 9ef45618de5b..cb23ec62bac1 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -79,7 +79,7 @@ import { revealInSideBarCommand } from '../../files/browser/fileActions.contribu
 import { ChatAgentLocation, IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatEditingSession, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../common/chatEditingService.js';
-import { IChatRequestVariableEntry, isPasteVariableEntry } from '../common/chatModel.js';
+import { IChatRequestVariableEntry, isLinkVariableEntry, isPasteVariableEntry } from '../common/chatModel.js';
 import { IChatFollowup } from '../common/chatService.js';
 import { IChatVariablesService } from '../common/chatVariables.js';
 import { IChatResponseViewModel } from '../common/chatViewModel.js';
@@ -1053,7 +1053,10 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 				if (copiedFromResource) {
 					store.add(this.instantiationService.invokeFunction(accessor => hookUpResourceAttachmentDragAndContextMenu(accessor, widget, copiedFromResource)));
 				}
-
+			} else if (isLinkVariableEntry(attachment)) {
+				ariaLabel = localize('chat.attachment.link', "Attached link, {0}", attachment.name);
+				label.setResource({ resource: attachment.value, name: attachment.name }, { icon: Codicon.link, title: attachment.value.toString() });
+				this.attachButtonAndDisposables(widget, index, attachment, hoverDelegate);
 			} else {
 				const attachmentLabel = attachment.fullName ?? attachment.name;
 				const withIcon = attachment.icon?.id ? `$(${attachment.icon.id}) ${attachmentLabel}` : attachmentLabel;
@@ -1201,6 +1204,16 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		hoverImage.onload = () => {
 			URL.revokeObjectURL(url);
 		};
+
+		hoverImage.onerror = () => {
+			// reset to original icon on error or invalid image
+			const pillIcon = dom.$('div.chat-attached-context-pill', {}, dom.$('span.codicon.codicon-file-media'));
+			const pill = dom.$('div.chat-attached-context-pill', {}, pillIcon);
+			const existingPill = widget.querySelector('.chat-attached-context-pill');
+			if (existingPill) {
+				existingPill.replaceWith(pill);
+			}
+		};
 	}
 
 	async renderChatEditingSessionState(chatEditingSession: IChatEditingSession | null, chatWidget?: IChatWidget) {
diff --git a/src/vs/workbench/contrib/chat/browser/imageUtils.ts b/src/vs/workbench/contrib/chat/browser/imageUtils.ts
index 20114790df86..428bfd135dd8 100644
--- a/src/vs/workbench/contrib/chat/browser/imageUtils.ts
+++ b/src/vs/workbench/contrib/chat/browser/imageUtils.ts
@@ -11,7 +11,12 @@
  * @returns A promise that resolves to the UInt8Array string of the resized image.
  */
 
-export async function resizeImage(data: Uint8Array): Promise<Uint8Array> {
+export async function resizeImage(data: Uint8Array | string): Promise<Uint8Array> {
+
+	if (typeof data === 'string') {
+		data = convertStringToUInt8Array(data);
+	}
+
 	const blob = new Blob([data]);
 	const img = new Image();
 	const url = URL.createObjectURL(blob);
@@ -66,3 +71,23 @@ export async function resizeImage(data: Uint8Array): Promise<Uint8Array> {
 		};
 	});
 }
+
+export function convertStringToUInt8Array(data: string): Uint8Array {
+	const base64Data = data.includes(',') ? data.split(',')[1] : data;
+	if (isValidBase64(base64Data)) {
+		return Uint8Array.from(atob(base64Data), char => char.charCodeAt(0));
+	}
+	return new TextEncoder().encode(data);
+}
+
+function isValidBase64(str: string): boolean {
+	// checks if the string is a valid base64 string that is NOT encoded
+	return /^[A-Za-z0-9+/]*={0,2}$/.test(str) && (() => {
+		try {
+			atob(str);
+			return true;
+		} catch {
+			return false;
+		}
+	})();
+}

From 69f9bc0d191878bc1f5025962fbff73516aface0 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Fri, 21 Feb 2025 10:40:09 +1100
Subject: [PATCH 0192/1815] Ensure proper sequencing of notebook cell edits
 (#241350)

* Ensure proper sequencing of notebook cell edits

* Update code review comments

* Fixes

---------

Co-authored-by: Peng Lyu <penn.lv@gmail.com>
---
 .../chatEditing/chatEditingServiceImpl.ts     | 17 +++++++++---
 .../browser/chatEditing/chatEditingSession.ts |  9 ++++++-
 .../contrib/chat/browser/chatQuick.ts         | 20 +++++++++-----
 .../contrib/chat/common/chatEditingService.ts |  1 +
 .../contrib/chat/common/chatModel.ts          | 27 ++++++++++++++-----
 .../chat/browser/terminalChatWidget.ts        | 20 +++++++++-----
 6 files changed, 70 insertions(+), 24 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
index 6f31c9083355..bbce908e6415 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
@@ -33,10 +33,10 @@ import { IEditorService } from '../../../../services/editor/common/editorService
 import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
 import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
 import { IMultiDiffSourceResolver, IMultiDiffSourceResolverService, IResolvedMultiDiffSource, MultiDiffEditorItem } from '../../../multiDiffEditor/browser/multiDiffSourceResolverService.js';
-import { CellUri, ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
+import { CellUri } from '../../../notebook/common/notebookCommon.js';
 import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
 import { CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, chatEditingAgentSupportsReadonlyReferencesContextKey, chatEditingResourceContextKey, ChatEditingSessionState, chatEditingSnapshotScheme, IChatEditingService, IChatEditingSession, IChatRelatedFile, IChatRelatedFilesProvider, IModifiedFileEntry, inChatEditingSessionContextKey, IStreamingEdits, WorkingSetEntryState } from '../../common/chatEditingService.js';
-import { IChatResponseModel } from '../../common/chatModel.js';
+import { IChatResponseModel, isCellTextEditOperation } from '../../common/chatModel.js';
 import { IChatService } from '../../common/chatService.js';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingSession } from './chatEditingSession.js';
@@ -314,7 +314,7 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 						entry = { seen: 0, streaming: codeBlockUrisSeen[codeBlockIndex]!.streaming! };
 						codeBlockUrisSeen[codeBlockIndex]!.streaming = undefined;
 					} else {
-						entry = { seen: 0, streaming: session.startStreamingEdits(part.uri, responseModel, undoStop) };
+						entry = { seen: 0, streaming: session.startStreamingEdits(CellUri.parse(part.uri)?.notebook ?? part.uri, responseModel, undoStop) };
 					}
 
 					editsSeen[i] = entry;
@@ -326,7 +326,16 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 
 				if (newEdits.length > 0 || isFirst) {
 					if (part.kind === 'notebookEditGroup') {
-						entry.streaming.pushNotebook(newEdits as ICellEditOperation[]);
+						newEdits.forEach(edit => {
+							if (TextEdit.isTextEdit(edit)) {
+								// Not possible, as Notebooks would have a different type.
+								return;
+							} else if (isCellTextEditOperation(edit)) {
+								entry.streaming.pushNotebookCellText(edit.uri, [edit.edit]);
+							} else {
+								entry.streaming.pushNotebook([edit]);
+							}
+						});
 					} else if (part.kind === 'textEditGroup') {
 						entry.streaming.pushText(newEdits as TextEdit[]);
 					}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index c90d301c4598..c1552bd580ed 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -708,13 +708,20 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		let didComplete = false;
 
 		return {
-			pushText: edits => {
+			pushText: (edits) => {
 				sequencer.queue(async () => {
 					if (!this.isDisposed) {
 						await this._acceptEdits(resource, edits, false, responseModel);
 					}
 				});
 			},
+			pushNotebookCellText: (cell, edits) => {
+				sequencer.queue(async () => {
+					if (!this.isDisposed) {
+						await this._acceptEdits(cell, edits, false, responseModel);
+					}
+				});
+			},
 			pushNotebook: edits => {
 				sequencer.queue(async () => {
 					if (!this.isDisposed) {
diff --git a/src/vs/workbench/contrib/chat/browser/chatQuick.ts b/src/vs/workbench/contrib/chat/browser/chatQuick.ts
index fe13bc97df61..a4af4355058f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatQuick.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatQuick.ts
@@ -20,7 +20,7 @@ import { editorBackground, inputBackground, quickInputBackground, quickInputFore
 import { IQuickChatOpenOptions, IQuickChatService, showChatView } from './chat.js';
 import { ChatWidget } from './chatWidget.js';
 import { ChatAgentLocation } from '../common/chatAgents.js';
-import { ChatModel } from '../common/chatModel.js';
+import { ChatModel, isCellTextEditOperation } from '../common/chatModel.js';
 import { IParsedChatRequest } from '../common/chatParserTypes.js';
 import { IChatProgress, IChatService } from '../common/chatService.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
@@ -300,11 +300,19 @@ class QuickChat extends Disposable {
 						}
 					} else if (item.kind === 'notebookEditGroup') {
 						for (const group of item.edits) {
-							message.push({
-								kind: 'notebookEdit',
-								edits: group,
-								uri: item.uri
-							});
+							if (isCellTextEditOperation(group)) {
+								message.push({
+									kind: 'textEdit',
+									edits: [group.edit],
+									uri: group.uri
+								});
+							} else {
+								message.push({
+									kind: 'notebookEdit',
+									edits: [group],
+									uri: item.uri
+								});
+							}
 						}
 					} else {
 						message.push(item);
diff --git a/src/vs/workbench/contrib/chat/common/chatEditingService.ts b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
index 0f4d8ff0dc96..48431090b77c 100644
--- a/src/vs/workbench/contrib/chat/common/chatEditingService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
@@ -73,6 +73,7 @@ export interface WorkingSetDisplayMetadata {
 
 export interface IStreamingEdits {
 	pushText(edits: TextEdit[]): void;
+	pushNotebookCellText(cell: URI, edits: TextEdit[]): void;
 	pushNotebook(edits: ICellEditOperation[]): void;
 	/** Marks edits as done, idempotent */
 	complete(): void;
diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index 2eccb6163ef2..af617322297e 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -22,7 +22,7 @@ import { Location, SymbolKind, TextEdit } from '../../../../editor/common/langua
 import { localize } from '../../../../nls.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { MarkerSeverity } from '../../../../platform/markers/common/markers.js';
-import { ICellEditOperation } from '../../notebook/common/notebookCommon.js';
+import { CellUri, ICellEditOperation } from '../../notebook/common/notebookCommon.js';
 import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentResult, IChatAgentService, IChatWelcomeMessageContent, reviveSerializedAgent } from './chatAgents.js';
 import { ChatRequestTextPart, IParsedChatRequest, reviveParsedChatRequest } from './chatParserTypes.js';
 import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatLocationData, IChatMarkdownContent, IChatNotebookEdit, IChatProgress, IChatProgressMessage, IChatResponseCodeblockUriPart, IChatResponseProgressFileTreeData, IChatTask, IChatTextEdit, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop, IChatUsedContext, IChatWarningMessage, isIUsedContext } from './chatService.js';
@@ -180,9 +180,19 @@ export interface IChatTextEditGroup {
 	done: boolean | undefined;
 }
 
+export function isCellTextEditOperation(value: unknown): value is ICellTextEditOperation {
+	const candidate = value as ICellTextEditOperation;
+	return !!candidate && !!candidate.edit && !!candidate.uri && URI.isUri(candidate.uri);
+}
+
+export interface ICellTextEditOperation {
+	edit: TextEdit;
+	uri: URI;
+}
+
 export interface IChatNotebookEditGroup {
 	uri: URI;
-	edits: ICellEditOperation[][];
+	edits: (ICellTextEditOperation | ICellEditOperation)[];
 	state?: IChatTextEditGroupState;
 	kind: 'notebookEditGroup';
 	done: boolean | undefined;
@@ -522,12 +532,15 @@ export class Response extends AbstractResponse implements IDisposable {
 			this._updateRepr(quiet);
 		} else if (progress.kind === 'textEdit' || progress.kind === 'notebookEdit') {
 			// merge edits for the same file no matter when they come in
-			const groupKind = progress.kind === 'textEdit' ? 'textEditGroup' : 'notebookEditGroup';
+			const notebookUri = 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);
 			for (let i = 0; !found && i < this._responseParts.length; i++) {
 				const candidate = this._responseParts[i];
-				if (candidate.kind === groupKind && !candidate.done && isEqual(candidate.uri, progress.uri)) {
-					candidate.edits.push(progress.edits as any);
+				if (candidate.kind === groupKind && !candidate.done && isEqual(candidate.uri, uri)) {
+					candidate.edits.push(edits);
 					candidate.done = progress.done;
 					found = true;
 				}
@@ -535,8 +548,8 @@ export class Response extends AbstractResponse implements IDisposable {
 			if (!found) {
 				this._responseParts.push({
 					kind: groupKind,
-					uri: progress.uri,
-					edits: [progress.edits as any],
+					uri,
+					edits: groupKind === 'textEditGroup' ? [edits] : edits,
 					done: progress.done
 				});
 			}
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
index e127d928202b..b2be6193f47c 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
@@ -22,7 +22,7 @@ import { CancelablePromise, createCancelablePromise, DeferredPromise } from '../
 import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { IChatAcceptInputOptions, showChatView } from '../../../chat/browser/chat.js';
-import { ChatModel, IChatResponseModel } from '../../../chat/common/chatModel.js';
+import { ChatModel, IChatResponseModel, isCellTextEditOperation } from '../../../chat/common/chatModel.js';
 import { IChatService, IChatProgress } from '../../../chat/common/chatService.js';
 import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { MenuId } from '../../../../../platform/actions/common/actions.js';
@@ -448,11 +448,19 @@ export class TerminalChatWidget extends Disposable {
 				}
 			} else if (item.kind === 'notebookEditGroup') {
 				for (const group of item.edits) {
-					message.push({
-						kind: 'notebookEdit',
-						edits: group,
-						uri: item.uri
-					});
+					if (isCellTextEditOperation(group)) {
+						message.push({
+							kind: 'textEdit',
+							edits: [group.edit],
+							uri: group.uri
+						});
+					} else {
+						message.push({
+							kind: 'notebookEdit',
+							edits: [group],
+							uri: item.uri
+						});
+					}
 				}
 			} else {
 				message.push(item);

From e4dc4aed184aebfd3e7d595affc621cac4261df8 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Thu, 20 Feb 2025 16:02:00 -0800
Subject: [PATCH 0193/1815] Send search events less often (#241406)

---
 src/vs/base/common/numbers.ts                            | 5 +++++
 src/vs/workbench/services/search/common/searchService.ts | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/src/vs/base/common/numbers.ts b/src/vs/base/common/numbers.ts
index 594fcf63545d..6d3d90d5cd81 100644
--- a/src/vs/base/common/numbers.ts
+++ b/src/vs/base/common/numbers.ts
@@ -158,3 +158,8 @@ export const randomInt = (max: number, min: number = 0): number => {
 
 	return Math.round(min + randomFloat);
 };
+
+export function randomChance(p: number): boolean {
+	assert(p >= 0 && p <= 1, 'p must be between 0 and 1');
+	return Math.random() < p;
+}
diff --git a/src/vs/workbench/services/search/common/searchService.ts b/src/vs/workbench/services/search/common/searchService.ts
index b5ae676f41e6..b0981b9891cf 100644
--- a/src/vs/workbench/services/search/common/searchService.ts
+++ b/src/vs/workbench/services/search/common/searchService.ts
@@ -10,6 +10,7 @@ import { CancellationError } from '../../../../base/common/errors.js';
 import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ResourceMap, ResourceSet } from '../../../../base/common/map.js';
 import { Schemas } from '../../../../base/common/network.js';
+import { randomChance } from '../../../../base/common/numbers.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { isNumber } from '../../../../base/common/types.js';
 import { URI, URI as uri } from '../../../../base/common/uri.js';
@@ -355,6 +356,11 @@ export class SearchService extends Disposable implements ISearchService {
 	}
 
 	private sendTelemetry(query: ISearchQuery, endToEndTime: number, complete?: ISearchComplete, err?: SearchError): void {
+		if (!randomChance(5 / 100)) {
+			// Noisy events, only send 5% of them
+			return;
+		}
+
 		const fileSchemeOnly = query.folderQueries.every(fq => fq.folder.scheme === Schemas.file);
 		const otherSchemeOnly = query.folderQueries.every(fq => fq.folder.scheme !== Schemas.file);
 		const scheme = fileSchemeOnly ? Schemas.file :

From c6d9ca3e3d980d89ee3579025e2eb77c653c32ae Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Thu, 20 Feb 2025 16:07:19 -0800
Subject: [PATCH 0194/1815] Remove obsolete event (#241408)

---
 .../chat/common/chatServiceTelemetry.ts       | 26 +------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/common/chatServiceTelemetry.ts b/src/vs/workbench/contrib/chat/common/chatServiceTelemetry.ts
index 2cd48f413936..14da30a74bab 100644
--- a/src/vs/workbench/contrib/chat/common/chatServiceTelemetry.ts
+++ b/src/vs/workbench/contrib/chat/common/chatServiceTelemetry.ts
@@ -3,9 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { IChatUserActionEvent, ChatAgentVoteDirection, ChatCopyKind } from './chatService.js';
+import { ChatAgentVoteDirection, ChatCopyKind, IChatUserActionEvent } from './chatService.js';
 
 type ChatVoteEvent = {
 	direction: 'up' | 'down';
@@ -69,20 +68,6 @@ type ChatApplyClassification = {
 	comment: 'Provides insight into the usage of Chat features.';
 };
 
-type ChatCommandEvent = {
-	commandId: string;
-	agentId: string;
-	command: string | undefined;
-};
-
-type ChatCommandClassification = {
-	commandId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The id of the command that was executed.' };
-	agentId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The ID of the related chat agent.' };
-	command: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The name of the related slash command.' };
-	owner: 'roblourens';
-	comment: 'Provides insight into the usage of Chat features.';
-};
-
 type ChatFollowupEvent = {
 	agentId: string;
 	command: string | undefined;
@@ -156,15 +141,6 @@ export class ChatServiceTelemetry {
 				command: action.command,
 				editsProposed: !!action.action.editsProposed,
 			});
-		} else if (action.action.kind === 'command') {
-			// TODO not currently called
-			const command = CommandsRegistry.getCommand(action.action.commandButton.command.id);
-			const commandId = command ? action.action.commandButton.command.id : 'INVALID';
-			this.telemetryService.publicLog2<ChatCommandEvent, ChatCommandClassification>('interactiveSessionCommand', {
-				commandId,
-				agentId: action.agentId ?? '',
-				command: action.command,
-			});
 		} else if (action.action.kind === 'runInTerminal') {
 			this.telemetryService.publicLog2<ChatTerminalEvent, ChatTerminalClassification>('interactiveSessionRunInTerminal', {
 				languageId: action.action.languageId ?? '',

From 6fe9320f0ec3fb2292a27ee6698fef4737034e40 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 20 Feb 2025 19:18:10 -0600
Subject: [PATCH 0195/1815] use unique sound for chat edit modified file
 (#241411)

fix #240402
---
 .../browser/accessibilitySignalService.ts       |   3 ++-
 .../browser/media/chatEditModifiedFile.mp3      | Bin 0 -> 20800 bytes
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 src/vs/platform/accessibilitySignal/browser/media/chatEditModifiedFile.mp3

diff --git a/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts b/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts
index 9b161fcadb1b..0e919686c6a2 100644
--- a/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts
+++ b/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts
@@ -315,6 +315,7 @@ export class Sound {
 	public static readonly voiceRecordingStarted = Sound.register({ fileName: 'voiceRecordingStarted.mp3' });
 	public static readonly voiceRecordingStopped = Sound.register({ fileName: 'voiceRecordingStopped.mp3' });
 	public static readonly progress = Sound.register({ fileName: 'progress.mp3' });
+	public static readonly chatEditModifiedFile = Sound.register({ fileName: 'chatEditModifiedFile.mp3' });
 
 	private constructor(public readonly fileName: string) { }
 }
@@ -543,7 +544,7 @@ export class AccessibilitySignal {
 
 	public static readonly chatEditModifiedFile = AccessibilitySignal.register({
 		name: localize('accessibilitySignals.chatEditModifiedFile', 'Chat Edit Modified File'),
-		sound: Sound.success,
+		sound: Sound.chatEditModifiedFile,
 		announcementMessage: localize('accessibility.signals.chatEditModifiedFile', 'File Modified from Chat Edits'),
 		settingsKey: 'accessibility.signals.chatEditModifiedFile',
 	});
diff --git a/src/vs/platform/accessibilitySignal/browser/media/chatEditModifiedFile.mp3 b/src/vs/platform/accessibilitySignal/browser/media/chatEditModifiedFile.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..bc1af4973d37bedd57616c124783ff54fe0b98ac
GIT binary patch
literal 20800
zcmeIZXIv9s*Y7<kgktC|6e08?!h|A-C_#$!-VqJGcNL^aLK6_BDP4+mq$<@$07XjZ
zpdiweE=@&HS`PlN|9#H6Ki7SpH|Jc>=X##weldGxWoECnfB9x*X0k_1O$G`aH{Khj
zCME#D4Cwl}xH+H={e94uXbdPRCkd(==mCH$;N<P%W_sOQ-@sT8K!d-Vw4BU842;~_
zzYGkhD*q49SrxT^7~om(KN~V?@@M|?NNZrE|MOem@y@_s(IWmMnu(s_#lNE+2mHtG
z(wM&uc{zo@2ly);Q2s3De>nb*A^RWU|KsTYKFt5K@mrHW?T-R~6!@dS9|is>@JE3^
z3j9&vj{<)b_@lrd1^y`T{}%<w`}Nqr<|2>(t3z!4)dAE0=(vdg=>Kg0DDYn@@S7jv
z?|1$`$`4Z{u!i>XHh!qdG{_MRuTN@wQlWrDGU$slstmq9L;w1swWiwx!~b&bf1LmO
z3jCM+KtuVbVJ{<MwIe5q4z*hU`%(UNBVd#}47d@RZG{Z?iHH2N1LhaUNxAH0L?grt
zq6eg`3zoFNQU88W@HOs!N3H7{0u>R*0OthoPi83qcoPbs()uXqDEifa{Zq2nNE3zi
z6Rw{O<LGV#tH-l}{4EB40VGXqROjWTM^zp-vlW)KJ;KSouXy#8f8J_Qo+pz<MmHia
z82f?ooT|(to6^aak&SwEif0Tz!{&6rLPRQ0JIv=3vyE!%3E(@0DvTZW8G=XqYT^_S
zi4-K=24|X!#CkR=gJ^7<P1z`KhHVJD6%tublPK#-b-B5$EdOcFQvTshda@XqOg>6H
z-jMfnQIIHI%^^_|(;zB=9VpeMGdI%}8jK;a0W?Tz21?y9Y19kUeW=4H(I_?nC?$*8
zm+7I(&Q;V&c)WqE_S1LwdauBsB2lK8eEApPfu^5S<Sw(6)()Y4+(l9_h9B}Q$@ZIL
zJwneDWA%+5K5hTxuC+c3(o1+(!KjByv2z5sJLemEp%U~zWlXF44}Rb*9P*KeH;F#&
zom(N53QVHftMp$*pl<iL+YYHk3wqsTfP`QfR$V=22%JI&y6s>>EmZNH##2xRVF^=(
zkSIoArfh|PB|Ad<`sqlsBm~UOrhL2Vz0HZI==csp_5H?q+4gAGKCS-ECoZOq+@mF;
zT`BF*OO~OLqo}w(e8>E>3Q_wq`ufs}WCH^m`qfsb1$}xm)l!STc24Q}{xO?AV_cD`
zx$Z2kC124T8;nTe<PAyY!(MkBJR?dQ8R4HLZA1r?YG?s355vw6PJ=&Bz$o)0z*|5E
zJs<#D!&IR-EE52iz|vS$1Ri|CsYDQl3(r-^QLQWHEN3M%3$Su;%xff9UpxQU+2p?2
zqR}-c{{B$)iTR7>x=R;@7+E<F^#fnM_Gid8PtZ_gc6PBYP&5*BNeg+n=v?y6wLCQK
zy81*#<{2-!9OHbhH(^_!iLAzyhY|)mNA=yUDm~njcZ^cTPjhTEPsBGKa{RjeH5TWL
z!ob?1YuQk@AS;nLRunzd5DzebP32eWX13|?f%!BSB|0C8>&Td?uiN*x++VF;D{{_k
zx~84;M$zGs$D*ZH!zadb?78%$b@#WqbIdn2xdd)E2HaYrta6gI>TM1nGT*%FGpX;J
zxPK+g&WC*1PaZz~CH3moj<VDi_0ZA1b6IQ%Cag8it|a0a!s@3R+R>#r1;K834scLb
zxPXAVa-;1&Mek9H{A$P9tI%vw>Sst3aqL-=2wF=H98M4qMf~Qc6`)|fp+pgs56xD;
zjjLe+uEeXrIfC)9u`V=B$`Ifj^uXepA^C`NTX8sCCBz(Yn&vhS<%%gG@g5M;h~_fY
zJ=b05f-gWLhjoAgOAbqrRuzrgDqv>kXr=}5Nt(#x0%S;q8U^7o<=Iv8w6zq#XG;~x
zHX8#^1`fA%&*O9pzc&s`g)e@CRqn`ARqs6IGo7i>odq7b8l*Zwzg(TtSm>B8gsHL^
zWlH@x^UmW`uHxi6+2ZIKx$3zGd7b>8eAK#0-XTwZxe@kI@2HdzeGRpY^2l!>Way*1
zI0VJw3DL6D0IIKFnt*qwbVUX8MG$&6{6$eI5pN))uV?`j#bQ1o@(LmdMU4gsF<o3B
zN|NXfNd)<uQKyI&ggfnXb%X;moWtiNUWx?71Ph(Cr}?a?CQL4cD0&59j)e0ifkB3G
zcM@K~uxLRh7z6-Vpa^*+gs;5i*%UYl7}Ci_G4QI`L55-w^i+#8-OSghAPj66L;9`7
zq#?gpy~7c4K3TQ9a;NV1AWk1;`aQ5IYlD?NNyy$`_gPB&P#+e)^S<Uw&CYQd+9g};
zpFRvHo0n8<R(Uu*S)U5C)y)TEqijG`ydfwHXn-+l)ZpmtKpE$3xD2C)HMnt66O3=m
z0C^y%Kum-ch7mRaLh$mS2(SR20Wt*v79s%Lhr-T&&-WkZWWe*O5b<qZ>AyJ3-eulk
z9hrfCyYlgh+hJR>+cnuu)iL)8a>+XJH$P_q*b!$3WjGcHDICXcE(3H*MpX3ImmmW)
z`Gk!ZvyL1%S3h>fGSR*LR&r(gGM!@^9<oNP2YlOMw4<+6I7a*3y@;ej4s6Fm>g9Gh
z1df;md(p;Cb?{oBo`i#?LWAg1VXoA}hEO8FM8LXSxK5|-aDf3XstKZKzmWx5f1JWX
zpG8hx(V4vSBiz^YnJw+P!5<&2rsnh}GXo^9{|K!^Ip-HoIUl%fIN>fJuvA5kc!ADV
zTERerhn*j9OE~263CGe4N9A-XL^(6IcP7Un0BGmQJCRrgG#3~v6*LI#R9}sLQ>9D#
z;Mh23-McC5;RY?el)=~1xh8tmY12OK+##yTJbq_i`KTv^d_*QIldrSL@AW&6&-dY_
zk*SPbJy;o}U7zmeTa&vbiLq~4wEKcB5_(mUP<~QXDlI$JiE+EG7c>-jz%5!OzO6Lm
zEJxX}maB%T1FL~`<v<!zVUzKRW{^bk?eQi5EFR-%N%;x$O^ZumvD<6IY2i=zl-2jb
zcgQn8P>QINs$35+pdT+2qk(jjQULfSMBY-mP{w`-v&GOskrWF)gLl9f{6Rm8RD_`g
zC<i<RX2n4T7#8H@6!pjWurS7A)17y7Lk>-g+TOzEjp!pct-b|YS0}xhaX3#-om76j
zNj`j8ZGC$4=<wEI-cgPC4WeZXSTT%C!z{w)rQNWyG3xQdJ~(fLw}yfvTu$Re8;e~L
zEyPzBypBjk4Elg_5EBSm68z1NIUZKZ*g+8j03nYQur)Y<eNjc?W-tIf)D-NM!U9S#
zydj#S{syQJTlSnkqi?L$AXmY(h=`@8m-KV&&8rGqV1D1~^XmS-SJjD<f!&bt@cUoF
zXbU&i_pcs2Jj{OhL%bFOX%=Du0Aet79*Nv~h;3tq`XU*>ZnZI7z~S_hzab>YW6*Z`
z5L1MrW*8m`@kPbu9~X04BJMn18Ud8S(01_v9Remw4cLi6^br6R4IrwE^`*B2iU0=7
zczV0EH<B<WqM@Ov8Y2|-)r;Rr`WKWV0x4;X43m)w)a`@9pA2!w4;wwN?tXMDwaD{%
zb(Smo<0|F5CMQMDJK?L=gSMvxpNH?i%KLqq@t@mI;06wW5V|O-P!e+)gosxZcoe^2
z9^UZkEH3&%1wtX{5!x;dQijlQO~>Qt@o<D#tO)+Nz*8aM<M8}rk2d1uAS55BjBiG;
z;W=h;Fgyw9>fpkk$AiN7HfB18krS5~f6}-BpNMf(Y}_Js7n1xv^SI|68SJnLL!KW=
zQzK$obpE|+3S+YOxL*A|g+jeEDm99PZ3`#G3D)pcbyunXocG_aj==M<BQOnG4GKYC
zgJqFJ81EQ9>19?UjBR%UMq9-iq#($HSZpF_OrQmg0X|R@S^(M-R6z_-2MPdU#?F8t
zgp&SE`$a$h%nJ7xwdsorBc?3PVgkSUISs(ZQEzUCqk$j+RMPMIQ*XmS@3#b*kGCUi
zD9xG+aNr#uraMiWXjcU^R>81#n9mXIe9ORHnX5;6t>k6UEvg=jhjxLSglVu8u7b%&
zJe2;zZi^vy?_oqP27y8Zr{nY<fTjc$PzSIBb)a>i7eop?hc5=j05K3kgh|b%C!nYS
z^+%V>dpY8XPuGeuI>xch9heMfvs<>)-?Gd+xS!P1Lh!^%PJZh)qeAB0>lwlywea{5
zj==Oe0_q-$f|c=p1x=0-#me0+D$dYvF23cFBe%`QIL~i6gDWZc5|I<^8SS41AW%a&
z0c?-Gq~SYO`xuUwTx<>Z`{jZ=*x6n%tc<~oB+O%oVw!PlW}BNrhjc6JL+`i4%dgZl
zz5LKh{_?)4Q=?wjI0{QL9Y~;!W@vMaMh5&C{e*W<$fcBhFWhlDSJ#&NjNk0IUA~wo
z&f6&&n3b@M!6hv#h`!XYOrwMDy~X&-3~LqdyLW|J$e*E(Wr3>@Og_zV_Rv%)IIAzb
zNZU(%?$o+_^z!Pup7K#1+3P}{PWYQW7L55t2h$M`44c?@nk0i0jAALNT-g<jZgE68
zlxO@zQh^YMFnw|Y;EytgxJ8I6W@toaMwD^J0Y-Q<z-8~I@U?f@9*v^;WJ3Eq@pa_=
z?b$8iP+|6<png~ef8?Rpwwal8kH|_$d7(sFnBvDrRQ{Derk_81`33dX_Qzgh>+_->
z%eS-)q@s@5d%EW?f^C3*-*0}j0XQ8)NAz+132k4-9oHYWG!^k*?s(`2O~LHbhCmFj
z(kRsvT}1%Z!ELJ>a+|7)7@ELLsX(-Z>C(38wqK*uWhK63BvIgHk7P98=9mHi1a8Yx
z6L2|<Z}QB-uWx<(L33$g>(vkq>wWV+j(z1W&0xvL$}ZosmC59hnVN~g-ua{WRD;1<
zfB^tB)ZhRh6Jdex$k2sh2>D21N-SoL86akygaLxw$U%WYX#+{(cWOr%++T?<CoZ2x
zX%>g2h9rIch@g)i6s5zqHD7=Z`9f(RBq$nJkk1k8&O&{UVW+3f6H5gb&Yyw4(>Q~R
z#ls8CKE8M)`Q2|VKtD76ggW$FLTUh<Ble-bYrWC%;{CzVc=v0D%8srR-Z87z$EO`X
zj`RJeh6nHvMgTxWlMGQ|Xuw(F93)!hCqgXB7sUl9+RJ7V^3=@{S3Q?`Q{@0$V*}x{
z(KSGe8%YbvmyW-LZ^wUvtEeIQqXEuxLKGf*W3~&W8H)(!kA{7kLkerb?6JgI6&Qd9
z7$NF6aIyYT1&T}E#SDSzo#Q<Z#ZoCAfw@L0-Z<ATMn!$sc+r&r^^!<2&5}~}Jaw<5
z;;MHu|CI4>$4?BNvV+2IM_Pfi0|DH`q%nP`$MS%mvCQ<dm7p8N_jHuD>{SU>HbYPF
zI^z~G3Ooa2L`(8e1VC`%ink(Sgmn9p*Lr{RBLKjrkLyne4)BGECT)5GbcUB0=x;7T
zUeWNiZOqO>RS077ck_p!XqT7d>wKB-g_)hRwDdSjS}W^%(#rUmF7~EaF)SBOm;MM=
z^!z*9{2oos1ms&{x8V&W4@9jqNuR_A%oDpRboHZ<ZA$2Sq4v$gp0x?~7h{RzTqIHa
zs2aQ&i=u#9;Rny<(kF3nq>4)4$;8Gv>pZ!g&oDPzx_9mzvePz0cU`u^j5Gb}JIe(f
z7ZT=md~<EQ`t(5Mhc|+xoQUR*H9B4Gwu81Vbb^-Q&v*4fNCje7+h`jtQ_TDuR~nL_
z%6L2SWCVme9}Zx-OAtUl6&s}1m*MmhbB3S_XFzB(Z=c`wW{euTEcP<173#^D_ssj_
zIqjSylPyZu4tDeQ%vP!!TJ^G?-OU*!b)!x~5fZPJxJYzB{#zu=T{IHiZR&#jnw8jS
zt0zrMVxj3{gzE+~>oOq{gs8^REc_sfk`wOqwZaz8kwc`5IJ$MR>51*Bj#a(B;D~k=
zu_Wu*x*E2lkXx-}-C$+%)7`a^<M2Z><RbAT0GQJ_7`6l3FB+oDz%5h8w3vjL0y|5h
zzgo|woc@<0eayO~w~i{h!fmhH)EG%DDr#*kbh=2aCkwO$hI@otq+2|JbH+(RN+7dL
zI0WDf!SUmG09T}Gvf=H>uoF_B*d!hBIegR|Dn@jQFI8xL&r`x6p$yRu=XSsD*d7@&
zpy@6<_GR!VP=UZ(O{#^z>yPNkw_LA+4WkOn>H-I}8GOU|z4xiLzS28H&zu*P9%5E-
zV+9pbz?@bYek0j%tEZ+T@1<3lzn`d02E8au5Q7e&75qCK6rqGr6EtNqw4z!f%lI-F
z@Gbaesth<@3m;3Hfy8TKp@M2O>~k^E*`KBrNKu$%0@C+3&sQn_CqgLZgoMqRw>;sm
zXYuxX1}jEJ`2gZ1zw-scA}bOBV{%3Viz?6(bcVAoy)c$B#@cbQUQO5j8Jz|VgbC+J
z;m*PhIK$CcoHk`A9B+?HpmL_d$J)75Bj9L;-p@i`L0aIonV~t&Yjw4@ES<A2QMQIK
zPqLbubOYiwx9G{S2j@s<chcV6)RWAtOF~YuS`OM$AtcU}Xhtk@F~-oa2}?kPFGCl(
z`Gqetl^C!gJVQz*-{?A6Gie~(uHa%RU74wX@6attP=-PPhE@TsDFP_)*5GG~&(JLf
zTi-4Ph%N=uu(3?BxcD{oBVAi9(!hyS`?Hrjbi6I;OZ}cM_-B5RtlXmo2=e>|OJO+h
zqZ>>#-yZB@ETqHpV(RH-p!h@Z(}_riq<QcKPX}*Gxy&t9W`wUZmV=N%MTJGdDG(66
zFbj+s2AlwuA*n#Ew}O!-{6629<7x-w{FCJ`m>}NO?OkW@urI&tLat@RnS+AVNdbxX
zAYy{AS~U*y$nUq6$u;B&GWqb~%%KKX!hz!;T_;CGtlcc4<ZL?)PEg31i*VWQh)08>
zK-3<mDEylr69CSPQj46PAckIS_6?a-pj}gEpbwygl-~ISIllh7688kR&7}cDOX4&r
zX}qt(04y&h(2aKmGGG87eq4cD^YfF$!O;s@)#s9fg^4&yu9nX_Cg<Kgi@?Sa#Na<F
zLTp;o4{yaQAAgh94qV7z$b~Lb`$JagJ^NW`#+zvw0U3NWR*^)i3|c582FHt%gO(>O
zzE!O{X)#U{mQjWn(M7=woa>{$Gp53B8|0@xXgKBDs`&NHy9OB@{IyV|=GJvlmh=Fn
zs~>I)V~+ZpmiM2LN411&DyGPXJXN_zQNf1?ORLg0+D~O50n!4LGH?Pls0R5A#Zer0
zg$SIyEJQ)UnnuB!2{WpL5#^<U;PaK9P}7-GB1Kv87cCWNsTmR@K);eSdzK&XrVQA2
zs((E5&L$B)^H)ocuHBz8_+55?Us(TcgVN;NXVqyG4nBYiYM`16&3%o_A_NG6%Yxf?
z+ReEe8%=4?uvM0kIY(&5W>)4Ti;B5P1+NUT^$V@fh>uOD%X!D`eOmRwh-nK4`4hb0
z&v_4z^7hA^qNFZf^<KBG@ZKqVQx&=#sJSX@c;6IE7{Dl)g863PELv7*R>{sw8vII$
zJbkwGRkZ|ny2idJ^ZAT0lhOxn^@sLBinNRpY^Fx1E~+ndzA?2j(w@=#W&?w-U99pe
zt>khKGMrNzoOJMJ3;toRc&d2$Y>xGwI_l-_Ooshv){t!8^m~ckSkpd>Hnq+K6ZM$i
z{9FfMY;+xwFSNiA$TBvtS(tv!2ubfl2}y~uQ&|Tyw%bBQ*wI+kD9BHu*n_FarMtaJ
zTMr@K(YtyA2&kD+{_7=17^NM2b$up?N289fzeIL>XREX!`t!~SVHAUDBiNkdcCA2J
z<8_O0(ujJv)<P99Vs7&|JWNo@X0)^M*|x}|ieD~`qd39z!R*2xyy&rvd0OhipU8}l
zu^drbCs6W{UkM-vCY(idmgD%M=;p;Iiar&!fYfR?6h9sH{?J#ElkLLe$73FWeV;aK
z)DDYw<y_yqJiu3!?cOnOXf94SeVlja!PxHk#L36Orw*#?3})On%J9f}%-xO`w2#F|
zZIlUDsB~Rny55|(RUE`AOz4VCPF+)#Z3BR34q&h;G=UvKr6NNG7-EH$I8pK3C?dmS
zwW<%2b<QpiQ3WJEaUpRr?={O1SudN<=GAhpV~97=k=_j+v{H{Qm0NoawgoTO{X8(c
zo8@uN&s4@`2g_=CPY1of$L?+&{)4?R`v=FY9A~5h=bm)ND;iWi9A$_^T@ypeQk2$O
z9RzMbmie$H0&FJGRW@Qh0s_g9khB||c)jq}B48tH(<x~|(B8`7SD&%5X&q4!aEY4T
zPxdk8Es$SnIvTZ5Cy#A(3iQ4Y-!BVneSY;NDSULGLA`G&Y+#hAn=hh!4<LC%N!qj|
z8W?p<0DXi54`=FgZW$heDhz8#Y+${w@JjpgegUb0f9^(!cz0ff*2+h|imBfH#CNN|
z`FRAu-MCcmybLz<<1fPnW+*UGnb6SfQbM-k<_Ocvv&8n-47HY%X}(Y6M?V_`GvO}r
zA;n`v;ew%73(N-U*c%cbVpz)KjNWVTRpLsTbIcI1*Xd@D3+9_k{c9mcb!T=GWK>TD
zSRy2!Dt&%h#P?J*f{}0VwOwpGz}<!?GQlY>$*@g1JTpml#J(OPb__NXw?v7CV4E+)
zu|WmRV1Q=8*-oZHAbElFY7|P&c`IM^gip!Q>eN0bd@sFALl4BX6<097UkR=n*>3g9
zel@}FvAtR|usn9S8a_t0*xb8Ym}n`jY9Vu~V4RI15|Lyo1j9C;$Pz`tEj!*NT*t1P
zB26L9KdQ@3%G~(n9-VIpzpFA|db?1YP0Ja6gWHA$!X0{6hrU?Y+kNnL-D*O)e{@NN
zW90|#O6x&P;TqgDdf7Tg;;6J);VebYLK$C?U~>Om6&S)eStHweL90hRcAlw0MCbcb
z%Y_(D$Rb6O1{{i=6(tVoc48aO^&#pNc|<$-9~hd~4{MfOerNNHL=ze5BqP~y{ny5s
z+6T@)Eqo83>v&nvPIGZSKYe9a{fKv_x3uC?PgYIdbJtY*FU1S{l6!6=+e4wxpOmyF
zi<!~)IP8<xzwRA<-}}i^z<ha_Zcdh*^zQnB^Zxh#jVSpK$|?szk<v@Na!S&vY!GMg
z0)!blO986Gx3Fw9cvL<e3Ik+D4DymXG94v5nb-_HjQ6W#FP)lR$f{2^jCEPA{u0=~
z^qZdwJp2UR#mLE<U<yA9eaw$B?Hek37QG(9nEbZ&+04MghAT^rD-MhjjUhaHoLa{5
zUK#cNI{f{e%ZnGMH>X_2HqzCLc~vuY^KR^wcfEhgC$ZbG;Zb`=lA^EHdd`$gG5Nvs
z?WbP>@r+^9;rE>2D<w4=DL7BbNUT1B5(Z6@2UF3Qq4>%Sft4YX$Y@4wwzUBrTfU+5
zeio}Qp1iZ_>L3pc-3d`02#&Uxze_f0;R=}>xn#cjP2{I^>E<gJv*4lgAwCAuca+C&
zwU9W%ayPnt1Qu_QBf}qmtsD#3-X{-!$JKsM?|c>hWOGMq>*PlG)t{4J6|2iY4r>{O
zVCf_w5EK%p`1D3Q-x4(3K-}|fj1|`9&ytSl&qh1+JLS42I2v@<wLW&SdH*X>r#?XI
zN1~^XL?_P%dyDFQJKkUM9(R<leQsJhl~HdKzoe9T(R1hdDG#^Fp->X}JN>IHK15e#
zN39FrrNc^Xk6WE1Kb0jf%uD~Ezn96eb$TeGk1-xLm)quwwh)h66olM~YP0j~Ww3nB
zxO&>)Y`ZH^3_F<ex?mA_c(7BJb?u0}7_!$}S^cq9UsNvVVE4Iq?o6Z0KuJhu1oH=j
z!?T=AbsX0=1#b%pcvd#0N8P+Gw|20S#TKw(&gve%7TTKfI33ybQjve*@SsVmnuxu4
z;r^wf_o<87d3Rq}ImpGXgX4@c3}^^w3`vD<X*1#>1WlTf6q$?@z{J=iPe?RT$&ZQ-
z6}~hTo%VPAIn8$wR?lgixFO1Lt;5?Gew~WmRZE+KVwSLu%KU8ny<z3aLG_e%*KSR4
zrhDYIPTm1;@|vA`qJh@*>d}v-(Wx4ZS9F>qle{VU9@5IAyYX+V`i;`bZOFWcTs75b
zWv9{IS5luhekgTaJ@L7Toid9YEW6t<PS^kC15~*vF4uH1BZR6va*#FS6x59nB!hzC
z{T{Nl77M#38HZS<xtEjO%+HXgpNX6(q0*mJ+uawr)mp;Tvzfa6qyEQC;#bd!Bks~e
zA?3qyZbwy{E&S%HS9rl@v)IA*25euk=fSR}bcyx%v6=0vpM6*M6~^GvcA`yt2{kPJ
zw`vNMo91P@=_6H#N-=wI6Dk}91W|{k%HYGp%v=h5RY84du{M(FT0!)}-McyAem7aj
z2R>P3yMXAXammyf$Cb1914xfXd>+;pm;}7ruIUums}f-sM>nht38D(WP~XT;W_aK8
zxn`O)-7s96Empn+&zoYKl>J!y(%R8s^GL8qd4_E@oO|=A(AbPpX=!Wy0o4zd(Ft^A
zCz=Xr#Alg3@QxI!H*CN>J_1jG15_}`xD;d#l@^4CU64YD(t14FKq?Rx>IXj!7*_T~
z>ko_aP4Tx7G;$gn%y))IN`@EcWyWv9a^H)Yo7#Q&@Oeu3oUxG>Povn^bM1u|b<kPQ
zHt9RG(yl!#k)&JQv28DSk=*zkO9TXKjN^u!Fmk2A6FKTX#oFpeB&!Ri6|NLDU6akN
zH@P=#_SgNx96a0^s}kAC`6&nz3kHe^GXZsQdPBE(0VOnHF|OH0*?6u_tf}Ebi)L8;
z!w3DaO24o7`)Mgab7!8e$8BL#5^@KEchi;6dW{6ELyTS@>|Wfa5xqPkq{qe*fu6j2
zMUqW<4Ik8}!+EpprFj9AZ8m%wDMI-Zu}qoM&B0INxrDvXh~&V(h^6LD!oki(<pXHw
zQ#c-B>-5k9WAbK%Sr*11pwa8tTcf3QKH0|WN~v}Ao$I4L`b|QlUV}!@2hPJAtC`yq
z70*yzSz{y1jd~M%m@|bkGLKwmMy7uy{mP`SDxVr!Sj`qfdP(cA-Jg;LN$&`hFRO|^
zjIh=}tSYtx6vl|-tN_jSYam&`by@R?*c)-sS60Dw>AQr329u*Rf$B~yNyiZvEqIM_
zHdEL7!FT?-rUnN|Wrv$=w(GC-YI1LKonK0`Voy(IlK*<8Rnm&hK=W4!+4-jarkHf*
z)AZ1yR;9$pI%VoztaYo6!PTGpezf=Ph8-q6f8V_x$Q7HeA%cBNeHuZ_Da;KK=)hg(
zXQH}9C{IO1$S@Li_tJit^1@7o5m(=b6u(@Ttg5ik$y|NbJmeIpDfY-Tanb1&dHrKw
zXt`(C1ZRn(#l{Ek>sO!N=~xUeNV#=A@2XrQhluWrs?|Wxxud#_Z(Z}`CX=jh919IH
z#T~`TU-p7?;*@ej&j_ANdr4K1E90uY{3b=|P;Df8Yn?HIAPm4F0aaC@LsKL_gu2w{
zdzXof!&{}2*BZa;Pc|OT?4uG%;POwZ(*&-=ybZdo5Oi?8?&auwm5<2G1vATBKhk&)
zm-b}2&zZ4jgR$!&+P!AZ{vPfbr1#IyDehR9Js5T>%q%0l@!51XyJ2Ruy|gg<qB61j
z==}<LRKIZGyO5taxF|)~o1Cw?syTGyRr&m{uOIi2-|y-bMd+5p0hKsB_INdgaL5^F
zN;BT|D^r^ee(!mTv&fDs1ME{{XdAWYoL!8m$a+c8<Hq%~JzQ^DrmcUN?b=kLms-E&
zI&bLYt>o>8FZQhqXU!jQ3B4R>;*M**nT9PrfK7Yl9(8WIuam?F4&7Q)pXV)g4B(_e
zgGfkz6Q++!6`n6}3YunEYrOl@l1dkXk70GVP;k-Scz{uNyElzfHGJVaX-B#1?y0oP
zBW|Woz0DGKC+6zQ6`f7O3W(NB!9_{ywcStSL&>>AlV>!RloI*#Hfu6ncRJ+7HA6#5
zpB|-qkPQyUo3E&^`fr#k%ZJ|c(7!$qmcW-TQ2f#Fpm{?LgT7kGh`)<@PaTOsi-0mf
zgHnot|1cA51eiTlWAa>9u#=T9BcW4wNObXH4)deb9K@j3L#4)*Qw3sA(_5UqXn3xT
zemZIIJfNCc$n9Xv{3c#UkLuc&9IXyL17QcxZXNk}s}HGSSyJ0w1L9VWUa$4`(aq7B
z&K5ts1N@4PN}WEIPOa<Q{q<3*b^ROYa5a_pt0a@~R{)g=8Gg`hmucxs8G+4iwq8Tx
z8pY(4eya0|y1ZP;Y`^%MpF%v`H69z;!R3FC)?zD2z}skp9-v2hb$_PFhpbU$_UHxv
zyf&PiiM-S?U*aR?9AZ2|dd)h5)I*we?eM`P+grrarZu}loTN4V4^G>q9K6P=J581D
z6(mOm`N>_aa(1#hPo5}JmL~O<_(|tioRqVFSmdIaO^TdJykXS#PKx%M@JW)SJ<mzN
z?gj{jd_%KKg}h|U#eTI7B%5%LPoJ@2KiJ*i9k|BFw8DJlDTiw~-8TBlQ;RiWA$h~|
zh!?*^&nh}8KF=PjI$B*juspxhu)W(c@%-%)sg=AwdT#Tm#ir^gVDa-*D|+bG9*d1%
zb(}4Cq-h>Di59Prs3tSN1j5gQ66|4!2grJnIu**R!UML2xlLq-w=2&*{4+llJS{t?
z^&zL>*DTM-_j>6EHkYg$0uQ(3l?|Q;H3nZT*}O3G_=~Gm%I;QfXcfb?{<F4Yz8!J$
zmu_87{E$5pSMr17Q}y@o{rPGZgK!RCeU8!;rKO)TUSgo7k9gE41|VOA6R>>hED3b+
zJQdnmZ{<vRFaGYN&n=#+vwY0bBi&b|?xy?HD26?r$h8UHeo($Y$CT;yJ<;c#!X>V}
z{fZBFpVz;$-YMPn^1r~bH$R~!lv7t;lU|c~#>TO}=yLx<6BA_}_u#Xy-fCe=g&!JL
zY=kD>uKCsRF+#eRN9!B6Gk+$N6eCO>khXuzxu$o91V9BZA8?w~h08Z+yZH-9i{8TK
z^z*UlXyvhI*y|SFa+><ZX*PUz)#~JLe)90JW&|;^nV1rX37oy=;B9<%?SL-9t4Hf?
z9%T4#OFv67r&zm;`=w|5Pm(cAGbXEkUlu3|d@fI#Y*g0nRgwrnxi9ve9_S`~-*BM@
zhJ2kbZWl8->QoZasKw{6C4eXKaRr7CL{(2w#;Y(fZb4%j!%DC;-x6MO(LiLSB$4WK
z5mO)*IMlNt7Be;{x$~b>e2@`aO&aqtt4pSuxEf$1*WzQVv@$wI{o><K<K0EKlqXpO
zr%(J`xWOaiv^YOB+g6T|S=n_uFZ@pKjZpZ8qj~TL<E&J!bhZ0wyzO!{nf3I^<(2O3
zwbd~LgnosT5~j)PL8RG6%i?l(WCvY&qpCSknvr-YjSH}Bn?<B7OHC}V2AqJ-pEccm
z;2~dLSerhVCLVE~c0yHAt~sl$t)e8_zwdjWQ|ALh@oL8nAN#rY!h9Oej(!3K2NI)?
zPCn--VAOC{9MBqF)HWnY-%>aH5cvGn)oi{x)Z$3L?jelgMDCpINjG)hi_F|7-V8TQ
z?JyYQvT0W1zA1QoS!>sI*P>(8O(+BsC?Kh3pVC{6SeWTy!zUM#F{~=VqL!%^3eb;i
zUGw)v(Plf<_2Dl3T`4UXvrpv*XUv?91^RPrFWpOy$l=e_(A=uI<~;q?v%0e7l<CrN
zLVu@=w)nLVlPNhHHXL0o-x~H8wWu9<AGEBh3lBSaJ<|+JHJiU~oZ#-`Z8dxlBXogT
z9Z9n?Q%$Js$mpss@zv!fTa2V!$qxEFk}AOb?62Q10Pb#gAu^K7Khck}_Lv_-aoL}A
zQC>Zmj%k&_yDi+8=0nbDDMDrL(~42`Glhv3EqyaC3QV3buY1xMH+;E?e5N#0d7(pn
zSNhqDu1WvT0pz($+FdulEL@P!BrR$yeSFC>6x2%pSfS->X!otLR!#A8#wmXZQf8R~
zjA4FXELE;`=<Mmyu=p3ADQE1;eiqBr^gg)C8jr)mUIpCiIjzrULj{jT;7NE5eyxIJ
z3b-1^!t*XH>4}u3erVo{?nv@>Y_sbnXq&K+2ddbl_Z`OW`W0?F$Hm88y)P?#U&hQU
zq>t(EpVCMbdcwX~oVS%IEge-we7hkrc@KN{mKjT<-uqr}U(Dlh5zsT^S`$>q9Z-C#
zEVG;ng$XkQ!Z19|gE$?p);A@&MXfni^aXk)MWnCU6~$d*6*V2j98EGp6X|Bg6(X6b
zT&5=)U%jx^yysW#L1%K+x%{z=%8{78?`0#Sj&d{GNCETVNL^E|%UTonKJgIvgWhrO
zbH<ZgtHqBjk7OTj_@J|AK8`Gh@4raDkYD|fp*9Pxo1qQMa6JBp6E1p+DSoJx2%{F)
z5;7JR&qlACRF2u+(ibj2y-@td!GqT5)tN8;KA5{|voF%O;U7*p?il&qkYxC-a>G|j
zGSKIhqQvE_n*-zq+^g(6lfU*G9?q}HzuOHoxN(#ixZEQr*0@g=e);_R_9L-dWb$}j
zLW{;(QNw;{E!f-+$nspj;=%?2rr645hQCNQsk;`AnMv0C<|h>o=hIMv6>@$H7ZSnU
z5YW{Z44tNvbyG2o%x-)CLbD=OgZz$N=aKKYyHM=&dkgjY5e4}c8hk)R{^LXi@oSZe
zS^deDdfjoVt+bB!BGt8H2&J)6DnqA=%xIub-c~s1s94-IsS}IM-b+*~EpbJE+HRk9
z3IzOLsu#)rV0afh1q^YxMAK`=*`qfK$HGTYLfwqsk#BvRtX3p+8g}E%IVFOHn0Xk3
z(wUyw9Og|O*1E1nwzxzT$6N@KpQxVXH&kNsjo{mRM6GExU!szPGn5oswXO!WCEfMa
zAzzU?BzeQ0D6BponuT7Y{dkqspZ0%Bf#3YRzyo?P`A8oSN}r#$6-Wui5)sq12>_KW
zWU{R(2l9U^*1uvLda87OXElkX82?(ln!A|!c}dsw1M+J=G^akq4)?E!_-D-jS%KgD
z5CPx}v?)@H3QCQ2-tvnCuo>`a<nfILenNIz8uH(o9}yPOtH0JYzr^}^mv36kZn2jc
z3;fUX`(yuW75JMUA&7h=1c1V4HMU%_0FVQpri=mrb^=#hD)4X34~xu6=p}O8xhwSD
zeBrbITCM(!{?7{h%?~3)o^Y%_9AMkRp#iKVbQ%T#R7^m2+wtP4e?IEp#{+-xv&E%|
zU@dj@?~~L2O_}`74=d1wp926GT6jz8c>3IbJ%36?3)m31{=NA*q4py2NVM$#rjP93
zYOa6tLj#e=<Bs{sXWK#@*B=yg8o>W9M>a(Czg4>bluV%SKe_%m{$Et!Z+_s%^#^?%
d7SFZ?|10`m&%Z;D`8i&Y{HOg<;D4pSe**}d+qeJ#

literal 0
HcmV?d00001


From a49afc536c66c85d1188758c3430d0321b553955 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Thu, 20 Feb 2025 19:12:32 -0800
Subject: [PATCH 0196/1815] Make edits welcome view be not ugly when sidebar is
 minimum width (#241413)

---
 src/vs/workbench/contrib/chat/browser/media/chatViewWelcome.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/chat/browser/media/chatViewWelcome.css b/src/vs/workbench/contrib/chat/browser/media/chatViewWelcome.css
index 1a0fa8147b42..4d99cd50999a 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatViewWelcome.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatViewWelcome.css
@@ -53,6 +53,7 @@ div.chat-welcome-view {
 
 	& > .chat-welcome-view-indicator-container {
 		display: flex;
+		flex-wrap: wrap;
 		margin-top: 5px;
 		gap: 9px;
 		justify-content: center;

From 24fe33df6e1c992c78ace6f832bed345ebbf2db0 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Thu, 20 Feb 2025 20:42:11 -0800
Subject: [PATCH 0197/1815] Allow notebook provider selectors to be restored
 properly (#241420)

---
 .../workbench/contrib/notebook/common/notebookProvider.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/notebook/common/notebookProvider.ts b/src/vs/workbench/contrib/notebook/common/notebookProvider.ts
index 58264be9626b..ef560ea43fc8 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookProvider.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookProvider.ts
@@ -21,6 +21,10 @@ export interface NotebookEditorDescriptor {
 	readonly providerDisplayName: string;
 }
 
+interface INotebookEditorDescriptorDto {
+	readonly _selectors: readonly NotebookSelector[];
+}
+
 export class NotebookProviderInfo {
 
 	readonly extension?: ExtensionIdentifier;
@@ -45,7 +49,9 @@ export class NotebookProviderInfo {
 		this._selectors = descriptor.selectors?.map(selector => ({
 			include: selector.filenamePattern,
 			exclude: selector.excludeFileNamePattern || ''
-		})) || [];
+		}))
+			|| (descriptor as unknown as INotebookEditorDescriptorDto)._selectors
+			|| [];
 		this.priority = descriptor.priority;
 		this.providerDisplayName = descriptor.providerDisplayName;
 		this._options = {

From 233d086d5a613a1e9f016986f5ff056c17322c31 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Fri, 21 Feb 2025 15:43:49 +1100
Subject: [PATCH 0198/1815] Undo/redo inserted noteook cells in chat (#241421)

Undo/redo inserted cells
---
 .../chatEditingModifiedDocumentEntry.ts       |   2 +-
 .../chatEditingModifiedFileEntry.ts           |   2 +-
 .../chatEditingModifiedNotebookEntry.ts       | 163 +++++++++++++-----
 .../chatEditingNotebookEditorIntegration.ts   |   8 +-
 .../browser/chatEditing/chatEditingSession.ts |   2 +-
 5 files changed, 128 insertions(+), 49 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
index 6d8e6f6b27bf..1f90c36696c5 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
@@ -272,7 +272,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		}
 	}
 
-	acceptAgentEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): void {
+	async acceptAgentEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void> {
 
 		assertType(textEdits.every(TextEdit.isTextEdit), 'INVALID args, can only handle text edits');
 		assert(isEqual(resource, this.modifiedURI), ' INVALID args, can only edit THIS document');
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
index fb1b7d362740..4cd72fcc07cf 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
@@ -225,7 +225,7 @@ export abstract class AbstractChatEditingModifiedFileEntry extends Disposable im
 		this._autoAcceptCtrl.get()?.cancel();
 	}
 
-	abstract acceptAgentEdits(uri: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): void;
+	abstract acceptAgentEdits(uri: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void>;
 
 	async acceptStreamingEditsEnd(tx: ITransaction) {
 		this._resetEditsState(tx);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 4a95cd98cdab..d102299881d9 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -27,7 +27,8 @@ import { SingleModelEditStackElement } from '../../../../../editor/common/model/
 import { ModelDecorationOptions } from '../../../../../editor/common/model/textModel.js';
 import { OffsetEdits } from '../../../../../editor/common/model/textModelOffsetEdit.js';
 import { IEditorWorkerService } from '../../../../../editor/common/services/editorWorker.js';
-import { IResolvedTextEditorModel, ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
 import { IModelContentChangedEvent } from '../../../../../editor/common/textModelEvents.js';
 import { localize } from '../../../../../nls.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
@@ -43,7 +44,7 @@ import { ChatEditingNotebookFileSystemProvider } from '../../../notebook/browser
 import { getNotebookEditorFromEditorPane } from '../../../notebook/browser/notebookBrowser.js';
 import { NotebookCellTextModel } from '../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
-import { CellEditType, ICellEditOperation, IResolvedNotebookEditorModel, NotebookData, NotebookSetting, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
+import { CellEditType, ICellEditOperation, ICellReplaceEdit, IResolvedNotebookEditorModel, NotebookData, NotebookSetting, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
 import { INotebookEditorModelResolverService } from '../../../notebook/common/notebookEditorModelResolverService.js';
 import { INotebookService } from '../../../notebook/common/notebookService.js';
 import { ChatEditKind, IModifiedFileEntryEditorIntegration, WorkingSetEntryState } from '../../common/chatEditingService.js';
@@ -78,7 +79,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 
 	private readonly cellEntryMap = new Map<NotebookCellTextModel, ChatEditingNotebookCellEntry>();
 	private readonly _entries = observableValue<ChatEditingNotebookCellEntry[]>('cellEntries', []);
-	private modifiedToOriginalCellMap = new ResourceMap<NotebookCellTextModel>();
+	private modifiedToOriginalCellMap = new ResourceMap<ITextModel>();
 	private readonly _cellDiffInfo = observableValue<ICellDiffInfo[]>('diffInfo', []);
 	private readonly _maxModifiedLineNumbers = observableValue<number[]>('changedMaxLineNumber', []);
 
@@ -93,6 +94,14 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	 */
 	private readonly editedCells = new ResourceSet();
 
+	/**
+	 * When a new cell is inserted, we use the ChatEditingCodeEditorIntegration to handle the edits.
+	 * & to also display undo/redo and decorations.
+	 * However that needs a modified and original model.
+	 * For inserted cells there's no original model, so we create a new empty text model and pass that as the original.
+	 */
+	private readonly emptyTextModel: ITextModel;
+
 	public static async create(uri: URI, _multiDiffEntryDelegate: { collapse: (transaction: ITransaction | undefined) => void }, telemetryInfo: IModifiedEntryTelemetryInfo, chatKind: ChatEditKind, initialContent: string | undefined, instantiationService: IInstantiationService): Promise<AbstractChatEditingModifiedFileEntry> {
 		return instantiationService.invokeFunction(async accessor => {
 			const notebookService = accessor.get(INotebookService);
@@ -115,15 +124,18 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				restoreSnapshot(originalRef.object.notebook, initialContent);
 			}
 			initialContent = initialContent || createSnapshot(originalRef.object.notebook, options.serializer.options, configurationServie);
-			const modifiedCells = new ResourceMap<IReference<IResolvedTextEditorModel>>();
-			const originalCells = new ResourceMap<IReference<IResolvedTextEditorModel>>();
+			const dispsoables = new DisposableStore();
+			const modifiedCells = new ResourceMap<ITextModel>();
+			const originalCells = new ResourceMap<ITextModel>();
 			await Promise.all(resourceRef.object.notebook.cells.map(async cell => {
-				modifiedCells.set(cell.uri, await textModelService.createModelReference(cell.uri));
+				modifiedCells.set(cell.uri, dispsoables.add(await textModelService.createModelReference(cell.uri)).object.textEditorModel);
 			}).concat(originalRef.object.notebook.cells.map(async cell => {
-				originalCells.set(cell.uri, await textModelService.createModelReference(cell.uri));
+				originalCells.set(cell.uri, dispsoables.add(await textModelService.createModelReference(cell.uri)).object.textEditorModel);
 			})));
 
-			return instantiationService.createInstance(ChatEditingModifiedNotebookEntry, resourceRef, originalRef, modifiedCells, originalCells, _multiDiffEntryDelegate, options.serializer.options, telemetryInfo, chatKind, initialContent);
+			const instance = instantiationService.createInstance(ChatEditingModifiedNotebookEntry, resourceRef, originalRef, modifiedCells, originalCells, _multiDiffEntryDelegate, options.serializer.options, telemetryInfo, chatKind, initialContent);
+			instance._register(dispsoables);
+			return instance;
 		});
 	}
 
@@ -131,8 +143,8 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	constructor(
 		private readonly modifiedResourceRef: IReference<IResolvedNotebookEditorModel>,
 		originalResourceRef: IReference<IResolvedNotebookEditorModel>,
-		private readonly modifiedCellModels: ResourceMap<IReference<IResolvedTextEditorModel>>,
-		private readonly originalCellModels: ResourceMap<IReference<IResolvedTextEditorModel>>,
+		private readonly modifiedCellModels: ResourceMap<ITextModel>,
+		private readonly originalCellModels: ResourceMap<ITextModel>,
 		private readonly _multiDiffEntryDelegate: { collapse: (transaction: ITransaction | undefined) => void },
 		private readonly transientOptions: TransientOptions | undefined,
 		telemetryInfo: IModifiedEntryTelemetryInfo,
@@ -143,6 +155,8 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		@IChatService chatService: IChatService,
 		@IFileService fileService: IFileService,
 		@IInstantiationService instantiationService: IInstantiationService,
+		@ITextModelService private readonly textModelService: ITextModelService,
+		@IModelService model: IModelService,
 	) {
 		super(modifiedResourceRef.object.notebook.uri, telemetryInfo, kind, configurationService, fileConfigService, chatService, fileService, instantiationService);
 		this._register(modifiedResourceRef);
@@ -157,9 +171,11 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		this._cellDiffInfo.set(this.modifiedModel.cells.map((cell, i) => ({ modifiedCellIndex: i, originalCellIndex: i, diff: nullDocumentDiff, type: 'unchanged' })), undefined);
 		this._maxModifiedLineNumbers.set(this.modifiedModel.cells.map(() => 0), undefined);
 		this.modifiedModel.cells.forEach((cell, index) => {
-			this.modifiedToOriginalCellMap.set(cell.uri, this.originalModel.cells[index]);
+			const originalModel = this.originalCellModels.get(this.originalModel.cells[index].uri)!;
+			this.modifiedToOriginalCellMap.set(cell.uri, originalModel);
 			this.getOrCreateModifiedTextFileEntryForCell(cell);
 		});
+		this.emptyTextModel = this._register(model.createModel('', null, URI.parse('vscode-chat:///empty')));
 	}
 
 	mirrorNotebookEdits(e: NotebookTextModelChangedEvent) {
@@ -225,7 +241,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		this.cellEntryMap.forEach(entry => entry.clearCurrentEditLineDecoration());
 	}
 
-	override acceptAgentEdits(resource: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): void {
+	override async acceptAgentEdits(resource: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void> {
 		const isCellUri = resource.scheme === Schemas.vscodeNotebookCell;
 		const cell = isCellUri && this.modifiedModel.cells.find(cell => isEqual(cell.uri, resource));
 		const cellEntry = cell ? this.cellEntryMap.get(cell) : undefined;
@@ -239,8 +255,8 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			});
 		};
 
-		this._applyEdits(() => {
-			edits.forEach(edit => {
+		this._applyEdits(async () => {
+			await Promise.all(edits.map(async edit => {
 				if (TextEdit.isTextEdit(edit)) {
 					if (!this.editedCells.has(resource)) {
 						finishPreviousCells();
@@ -248,9 +264,9 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 					}
 					cellEntry?.acceptAgentEdits([edit], isLastEdits, responseModel);
 				} else {
-					this.acceptNotebookEdit(edit);
+					await this.acceptNotebookEdit(edit);
 				}
-			});
+			}));
 		});
 
 		// If the last edit for a cell was sent, then handle it
@@ -280,9 +296,10 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		});
 	}
 
-	acceptNotebookEdit(edit: ICellEditOperation): void {
+	async acceptNotebookEdit(edit: ICellEditOperation): Promise<void> {
 		// make the actual edit
 		this.modifiedModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+		// Ensure the models have been resolved for the new cells inserted.
 		if (edit.editType !== CellEditType.Replace) {
 			return;
 		}
@@ -294,12 +311,36 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 					d.modifiedCellIndex += edit.cells.length;
 				}
 			});
-			const diffInsert = edit.cells.map((c, i) => {
+			const diffInsert = await Promise.all(edit.cells.map(async (c, i) => {
 				const lines = c.source.split(/\r?\n/);
 				const originalRange = new Range(1, 0, 1, 0);
 				const modifiedRange = new Range(1, 0, lines.length, lines[lines.length - 1].length);
 				const innerChanges = new RangeMapping(originalRange, modifiedRange);
 				const changes = [new DetailedLineRangeMapping(new LineRange(1, 1), new LineRange(1, lines.length), [innerChanges])];
+				const cell = this.modifiedModel.cells[edit.index + i];
+				const modifiedModel: ITextModel = cell.textModel ?? this._register((await this.textModelService.createModelReference(cell.uri))).object.textEditorModel;
+				const originalModel = this.emptyTextModel;
+				this.modifiedCellModels.set(cell.uri, modifiedModel);
+				this.modifiedToOriginalCellMap.set(cell.uri, originalModel);
+				const keep = async () => {
+					try {
+						this._isEditFromUs = true;
+						this.keepPreviouslyInsertedCell(cell);
+					} finally {
+						this._isEditFromUs = false;
+					}
+					return true;
+				};
+				const undo = async () => {
+					try {
+						this._isEditFromUs = true;
+						this.undoPreviouslyInsertedCell(cell);
+					} finally {
+						this._isEditFromUs = false;
+					}
+					return true;
+				};
+				this.getOrCreateModifiedTextFileEntryForCell(cell, keep, undo);
 				return {
 					type: 'insert' as const,
 					originalCellIndex: undefined,
@@ -308,10 +349,14 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 						changes,
 						identical: false,
 						moves: [],
-						quitEarly: false
+						quitEarly: false,
+						keep,
+						undo,
+						modifiedModel,
+						originalModel,
 					}
 				} satisfies ICellDiffInfo;
-			});
+			}));
 			diff.splice(edit.index + 1, 0, ...diffInsert);
 			this._cellDiffInfo.set(diff, undefined);
 		} else {
@@ -348,11 +393,55 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			this._cellDiffInfo.set(diff, undefined);
 		}
 	}
-	private _applyEdits(operation: () => void) {
+
+	private undoPreviouslyInsertedCell(cell: NotebookCellTextModel) {
+		const index = this.modifiedModel.cells.indexOf(cell);
+		const diff = this._cellDiffInfo.get().slice().map(d => {
+			if (d.type === 'insert' && d.modifiedCellIndex === index) {
+				return d;
+			}
+			if (d.type !== 'delete' && d.modifiedCellIndex > index) {
+				d.modifiedCellIndex -= 1;
+				return d;
+			}
+			return d;
+		}).filter(d => !(d.type === 'insert' && d.modifiedCellIndex === index));
+		const edit: ICellReplaceEdit = { cells: [], count: 1, editType: CellEditType.Replace, index, };
+		this.modifiedModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+		this._cellDiffInfo.set(diff, undefined);
+	}
+
+	private keepPreviouslyInsertedCell(cell: NotebookCellTextModel) {
+		const index = this.modifiedModel.cells.indexOf(cell);
+		const diff = this._cellDiffInfo.get().slice().map(d => {
+			if (d.type === 'insert' && d.modifiedCellIndex === index) {
+				return {
+					type: 'insert',
+					modifiedCellIndex: index,
+					originalCellIndex: undefined,
+					diff: {
+						...nullDocumentDiff,
+						keep: async () => true,
+						undo: async () => true,
+						modifiedModel: d.diff.modifiedModel,
+						originalModel: d.diff.originalModel
+					}
+				} satisfies ICellDiffInfo;
+			}
+			if (d.type !== 'delete' && d.modifiedCellIndex > index) {
+				d.modifiedCellIndex -= 1;
+				return d;
+			}
+			return d;
+		}).filter(d => !(d.type === 'insert' && d.modifiedCellIndex === index));
+		this._cellDiffInfo.set(diff, undefined);
+	}
+
+	private async _applyEdits(operation: () => Promise<void>) {
 		// make the actual edit
 		this._isEditFromUs = true;
 		try {
-			operation();
+			await operation();
 		} finally {
 			this._isEditFromUs = false;
 		}
@@ -419,24 +508,19 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		restoreSnapshot(this.modifiedModel, this.initialContent);
 	}
 
-	getOrCreateModifiedTextFileEntryForCell(cell: NotebookCellTextModel): ChatEditingNotebookCellEntry | undefined {
+	getOrCreateModifiedTextFileEntryForCell(cell: NotebookCellTextModel, accept?: () => Promise<boolean>, reject?: () => Promise<boolean>): ChatEditingNotebookCellEntry | undefined {
 		let cellEntry = this.cellEntryMap.get(cell);
 		if (cellEntry) {
 			return cellEntry;
 		}
 		const index = this.modifiedModel.cells.indexOf(cell);
-		const originalCell = this.modifiedToOriginalCellMap.get(cell.uri);
-		if (!originalCell || index === -1) {
-			// Not possible.
-			return;
-		}
+		const originalCellModel = this.modifiedToOriginalCellMap.get(cell.uri);
 		const modifiedCellModel = this.modifiedCellModels.get(cell.uri);
-		const originalCellModel = this.originalCellModels.get(originalCell.uri);
 		if (!modifiedCellModel || !originalCellModel) {
 			return;
 		}
-		const originalText = originalCellModel.object.textEditorModel.getValue();
-		cellEntry = this._register(this._instantiationService.createInstance(ChatEditingNotebookCellEntry, cell, modifiedCellModel, originalCellModel, originalText, this._telemetryInfo));
+		const originalText = originalCellModel.getValue();
+		cellEntry = this._register(this._instantiationService.createInstance(ChatEditingNotebookCellEntry, cell, modifiedCellModel, originalCellModel, originalText, this._telemetryInfo, accept, reject));
 		this.cellEntryMap.set(cell, cellEntry);
 
 		this._register(autorun(r => {
@@ -558,9 +642,6 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 	public readonly diffInfo: IObservable<IDocumentDiff2>;
 	private readonly _maxModifiedLineNumber = observableValue<number>(this, 0);
 	readonly maxModifiedLineNumber = this._maxModifiedLineNumber;
-	private readonly originalModel: ITextModel;
-
-	private readonly modifiedModel: ITextModel;
 
 	private readonly _editDecorationClear = this._register(new RunOnceScheduler(() => { this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []); }, 500));
 	private _editDecorations: string[] = [];
@@ -573,10 +654,12 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 
 	constructor(
 		public readonly cell: NotebookCellTextModel,
-		modifiedModel: IReference<IResolvedTextEditorModel>,
-		originalModel: IReference<IResolvedTextEditorModel>,
+		private readonly modifiedModel: ITextModel,
+		private readonly originalModel: ITextModel,
 		private readonly initialContent: string,
 		private readonly _telemetryInfo: IModifiedEntryTelemetryInfo,
+		acceptChange: (() => Promise<boolean>) | undefined,
+		undoChange: (() => Promise<boolean>) | undefined,
 		@IConfigurationService configService: IConfigurationService,
 		@IChatService private readonly _chatService: IChatService,
 		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
@@ -584,17 +667,13 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 
 	) {
 		super();
-		this._register(modifiedModel);
-		this._register(originalModel);
-		this.modifiedModel = modifiedModel.object.textEditorModel;
-		this.originalModel = originalModel.object.textEditorModel;
 		this.diffInfo = this._diffInfo.map(value => {
 			return {
 				...value,
 				originalModel: this.originalModel,
 				modifiedModel: this.modifiedModel,
-				keep: changes => this._acceptHunk(changes),
-				undo: changes => this._rejectHunk(changes)
+				keep: changes => acceptChange ? acceptChange() : this._acceptHunk(changes),
+				undo: changes => undoChange ? undoChange() : this._rejectHunk(changes)
 			} satisfies IDocumentDiff2;
 		});
 		this.changesCount = this._diffInfo.map(diff => diff.changes.length);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
index eab0b89cf2f9..d60bdc83ddd2 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
@@ -47,7 +47,7 @@ export type ICellDiffInfo = {
 	modifiedCellIndex: number;
 	originalCellIndex: undefined;
 	type: 'insert';
-	diff: IDocumentDiff; // List of all the new lines.
+	diff: IDocumentDiff2; // List of all the new lines.
 };
 
 
@@ -99,7 +99,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 		}));
 
 		this._register(autorun(r => {
-			const changes = cellChanges.read(r).filter(c => c.type === 'modified');
+			const changes = cellChanges.read(r).filter(c => c.type !== 'unchanged' && c.type !== 'delete');
 			onDidChangeVisibleRanges.read(r);
 			if (!changes.length) {
 				this.cellEditorIntegrations.forEach(({ diff }) => {
@@ -219,7 +219,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 			// return this.getIntegrationForCell(changes[0].modifiedCellIndex);
 			return;
 		}
-		const changes = this.cellChanges.get().filter(c => c.type === 'modified' || c.type !== 'delete');
+		const changes = this.cellChanges.get().filter(c => c.type === 'modified' || c.type === 'insert');
 		const nextIndex = changes.reduce((prev, curr) => {
 			if (nextOrPrevious) {
 				if (typeof curr.modifiedCellIndex !== 'number' || curr.modifiedCellIndex <= current.index) {
@@ -246,7 +246,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 	}
 
 	reveal(firstOrLast: boolean): void {
-		const changes = this.cellChanges.get().filter(c => c.type === 'modified' || c.type !== 'delete');
+		const changes = this.cellChanges.get().filter(c => c.type === 'modified' || c.type === 'insert');
 		if (!changes.length) {
 			return undefined;
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index c1552bd580ed..ba88a430f421 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -940,7 +940,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 
 	private async _acceptEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void> {
 		const entry = await this._getOrCreateModifiedFileEntry(resource, this._getTelemetryInfoForModel(responseModel));
-		entry.acceptAgentEdits(resource, textEdits, isLastEdits, responseModel);
+		await entry.acceptAgentEdits(resource, textEdits, isLastEdits, responseModel);
 	}
 
 	private _getTelemetryInfoForModel(responseModel: IChatResponseModel): IModifiedEntryTelemetryInfo {

From f5f0a61d3d146665ff61b68b8cbb19a527714aa3 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Fri, 21 Feb 2025 18:04:44 +1100
Subject: [PATCH 0199/1815] Fix leaks in notebook actions (#241430)

---
 .../contrib/chatEdit/notebookChatActionsOverlay.ts | 14 +++++++-------
 .../contrib/notebook/browser/notebookEditor.ts     |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts
index c02bbabb0844..28dfc42b1c2b 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts
@@ -107,15 +107,15 @@ export class NotebookChatActionsOverlay extends Disposable {
 			actionViewItemProvider: (action, options) => {
 
 				if (action.id === navigationBearingFakeActionId) {
-					return new class extends ActionViewItem {
+					return this._register(new class extends ActionViewItem {
 						constructor() {
 							super(undefined, action, { ...options, icon: false, label: false, keybindingNotRenderedWithLabel: true });
 						}
-					};
+					});
 				}
 
 				if (action.id === AcceptAction.ID || action.id === RejectAction.ID) {
-					return new class extends ActionViewItem {
+					return this._register(new class extends ActionViewItem {
 						private readonly _reveal = this._store.add(new MutableDisposable());
 						constructor() {
 							super(undefined, action, { ...options, icon: false, label: true, keybindingNotRenderedWithLabel: true });
@@ -143,23 +143,23 @@ export class NotebookChatActionsOverlay extends Disposable {
 						override get actionRunner(): IActionRunner {
 							return super.actionRunner;
 						}
-					};
+					});
 				}
 				// Override next/previous with our implementation.
 				if (action.id === 'chatEditor.action.navigateNext' || action.id === 'chatEditor.action.navigatePrevious') {
-					return new class extends ActionViewItem {
+					return this._register(new class extends ActionViewItem {
 						constructor() {
 							super(undefined, action, { ...options, icon: true, label: false, keybindingNotRenderedWithLabel: true });
 						}
 						override set actionRunner(_: IActionRunner) {
 							const next = action.id === 'chatEditor.action.navigateNext' ? nextEntry : previousEntry;
 							const direction = action.id === 'chatEditor.action.navigateNext' ? 'next' : 'previous';
-							super.actionRunner = new NextPreviousChangeActionRunner(notebookEditor, cellDiffInfo, entry, next, direction, _editorService, deletedCellDecorator, focusedDiff);
+							super.actionRunner = this._register(new NextPreviousChangeActionRunner(notebookEditor, cellDiffInfo, entry, next, direction, _editorService, deletedCellDecorator, focusedDiff));
 						}
 						override get actionRunner(): IActionRunner {
 							return super.actionRunner;
 						}
-					};
+					});
 				}
 				return undefined;
 			}
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
index 743b101a4f30..e9c536554d2a 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
@@ -146,7 +146,7 @@ export class NotebookEditor extends EditorPane implements INotebookEditorPane, I
 	override getActionViewItem(action: IAction, options: IActionViewItemOptions): IActionViewItem | undefined {
 		if (action.id === SELECT_KERNEL_ID) {
 			// this is being disposed by the consumer
-			return this._instantiationService.createInstance(NotebooKernelActionViewItem, action, this, options);
+			return this._register(this._instantiationService.createInstance(NotebooKernelActionViewItem, action, this, options));
 		}
 		return undefined;
 	}

From ad74b0a22d05a62a037182b3777c5597dd84fa26 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Fri, 21 Feb 2025 18:05:21 +1100
Subject: [PATCH 0200/1815] Fix accept/reject in Notebook Chat (#241429)

---
 .../chatEditingModifiedNotebookEntry.ts       | 92 +++++++++++--------
 .../chatEditingNotebookEditorIntegration.ts   |  6 +-
 2 files changed, 55 insertions(+), 43 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index d102299881d9..90e1e0ba706f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -56,7 +56,8 @@ import { ChatEditingNotebookEditorIntegration, countChanges, ICellDiffInfo } fro
 import { ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
 
 
-
+const noopKeep = () => Promise.resolve(true);
+const noopUndo = () => Promise.resolve(true);
 
 export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifiedFileEntry {
 	private readonly modifiedModel: NotebookTextModel;
@@ -115,26 +116,23 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				notebookService.withNotebookDataProvider(resourceRef.object.notebook.notebookType),
 				notebookService.createNotebookTextDocumentSnapshot(notebook.uri, SnapshotContext.Backup, CancellationToken.None).then(s => streamToBuffer(s))
 			]);
-			const originalDisposables = new DisposableStore();
-			originalDisposables.add(ChatEditingNotebookFileSystemProvider.registerFile(originalUri, buffer));
-
+			const disposables = new DisposableStore();
+			disposables.add(ChatEditingNotebookFileSystemProvider.registerFile(originalUri, buffer));
 			const originalRef = await resolver.resolve(originalUri, notebook.viewType);
-			originalDisposables.add(originalRef);
 			if (initialContent) {
 				restoreSnapshot(originalRef.object.notebook, initialContent);
 			}
 			initialContent = initialContent || createSnapshot(originalRef.object.notebook, options.serializer.options, configurationServie);
-			const dispsoables = new DisposableStore();
 			const modifiedCells = new ResourceMap<ITextModel>();
 			const originalCells = new ResourceMap<ITextModel>();
 			await Promise.all(resourceRef.object.notebook.cells.map(async cell => {
-				modifiedCells.set(cell.uri, dispsoables.add(await textModelService.createModelReference(cell.uri)).object.textEditorModel);
+				modifiedCells.set(cell.uri, disposables.add(await textModelService.createModelReference(cell.uri)).object.textEditorModel);
 			}).concat(originalRef.object.notebook.cells.map(async cell => {
-				originalCells.set(cell.uri, dispsoables.add(await textModelService.createModelReference(cell.uri)).object.textEditorModel);
+				originalCells.set(cell.uri, disposables.add(await textModelService.createModelReference(cell.uri)).object.textEditorModel);
 			})));
 
 			const instance = instantiationService.createInstance(ChatEditingModifiedNotebookEntry, resourceRef, originalRef, modifiedCells, originalCells, _multiDiffEntryDelegate, options.serializer.options, telemetryInfo, chatKind, initialContent);
-			instance._register(dispsoables);
+			instance._register(disposables);
 			return instance;
 		});
 	}
@@ -161,15 +159,13 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		super(modifiedResourceRef.object.notebook.uri, telemetryInfo, kind, configurationService, fileConfigService, chatService, fileService, instantiationService);
 		this._register(modifiedResourceRef);
 		this._register(originalResourceRef);
-		modifiedCellModels.forEach(cell => this._register(cell));
-		originalCellModels.forEach(cell => this._register(cell));
 		this.modifiedModel = modifiedResourceRef.object.notebook;
 		this.originalModel = originalResourceRef.object.notebook;
 		this.originalURI = this.originalModel.uri;
 		this.initialContent = initialContent;
 		this._register(this.modifiedModel.onDidChangeContent(this.mirrorNotebookEdits, this));
-		this._cellDiffInfo.set(this.modifiedModel.cells.map((cell, i) => ({ modifiedCellIndex: i, originalCellIndex: i, diff: nullDocumentDiff, type: 'unchanged' })), undefined);
 		this._maxModifiedLineNumbers.set(this.modifiedModel.cells.map(() => 0), undefined);
+		this.createEmptyDiffs();
 		this.modifiedModel.cells.forEach((cell, index) => {
 			const originalModel = this.originalCellModels.get(this.originalModel.cells[index].uri)!;
 			this.modifiedToOriginalCellMap.set(cell.uri, originalModel);
@@ -178,6 +174,22 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		this.emptyTextModel = this._register(model.createModel('', null, URI.parse('vscode-chat:///empty')));
 	}
 
+	createEmptyDiffs() {
+		this._cellDiffInfo.set(this.modifiedModel.cells.map((cell, i) => {
+			return { modifiedCellIndex: i, originalCellIndex: i, diff: this.getDiffForUnchangedCell(cell), type: 'unchanged' };
+		}), undefined);
+	}
+
+	getDiffForUnchangedCell(cell: NotebookCellTextModel): IDocumentDiff2 {
+		return {
+			...nullDocumentDiff,
+			keep: noopKeep,
+			undo: noopUndo,
+			originalModel: this.modifiedToOriginalCellMap.get(cell.uri) || this.emptyTextModel,
+			modifiedModel: this.modifiedCellModels.get(cell.uri) || this.emptyTextModel,
+		};
+	}
+
 	mirrorNotebookEdits(e: NotebookTextModelChangedEvent) {
 		if (this._isEditFromUs || Array.from(this.cellEntryMap.values()).some(entry => entry.isEditFromUs)) {
 			// TODO@DonJayamanne Apply this same edit to the original notebook.
@@ -204,24 +216,29 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		const snapshot = this.modifiedModel.createSnapshot({ context: SnapshotContext.Backup, outputSizeLimit, transientOptions: this.transientOptions });
 		this.originalModel.restoreSnapshot(snapshot, this.transientOptions);
 		this._changesCount.set(0, tx);
-		this._cellDiffInfo.set(this.modifiedModel.cells.map((cell, i) => ({ modifiedCellIndex: i, originalCellIndex: i, diff: nullDocumentDiff, type: 'unchanged' })), undefined);
+		this.createEmptyDiffs();
+
 		await this._collapse(tx);
 	}
 
 	protected override async _doReject(tx: ITransaction | undefined): Promise<void> {
 		if (this.createdInRequestId === this._telemetryInfo.requestId) {
-			await this.modifiedResourceRef.object.revert({ soft: true });
-			await this._fileService.del(this.modifiedURI);
+			await this._applyEdits(async () => {
+				await this.modifiedResourceRef.object.revert({ soft: true });
+				await this._fileService.del(this.modifiedURI);
+			});
 			this._onDidDelete.fire();
 		} else {
-			const outputSizeLimit = this.configurationService.getValue<number>(NotebookSetting.outputBackupSizeLimit) * 1024;
-			const snapshot = this.originalModel.createSnapshot({ context: SnapshotContext.Backup, outputSizeLimit, transientOptions: this.transientOptions });
-			this.modifiedModel.restoreSnapshot(snapshot, this.transientOptions);
-			if (this._allEditsAreFromUs && this._entries.get().every(entry => entry.allEditsAreFromUs)) {
-				// save the file after discarding so that the dirty indicator goes away
-				// and so that an intermediate saved state gets reverted
-				await this.modifiedResourceRef.object.save({ reason: SaveReason.EXPLICIT, skipSaveParticipants: true });
-			}
+			await this._applyEdits(async () => {
+				const outputSizeLimit = this.configurationService.getValue<number>(NotebookSetting.outputBackupSizeLimit) * 1024;
+				const snapshot = this.originalModel.createSnapshot({ context: SnapshotContext.Backup, outputSizeLimit, transientOptions: this.transientOptions });
+				this.modifiedModel.restoreSnapshot(snapshot, this.transientOptions);
+				if (this._allEditsAreFromUs && this._entries.get().every(entry => entry.allEditsAreFromUs)) {
+					// save the file after discarding so that the dirty indicator goes away
+					// and so that an intermediate saved state gets reverted
+					await this.modifiedResourceRef.object.save({ reason: SaveReason.EXPLICIT, skipSaveParticipants: true });
+				}
+			});
 			await this._collapse(tx);
 		}
 
@@ -238,7 +255,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 
 	protected override _resetEditsState(tx: ITransaction): void {
 		super._resetEditsState(tx);
-		this.cellEntryMap.forEach(entry => entry.clearCurrentEditLineDecoration());
+		this.cellEntryMap.forEach(entry => !entry.disposed && entry.clearCurrentEditLineDecoration());
 	}
 
 	override async acceptAgentEdits(resource: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void> {
@@ -255,7 +272,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			});
 		};
 
-		this._applyEdits(async () => {
+		await this._applyEdits(async () => {
 			await Promise.all(edits.map(async edit => {
 				if (TextEdit.isTextEdit(edit)) {
 					if (!this.editedCells.has(resource)) {
@@ -323,21 +340,11 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				this.modifiedCellModels.set(cell.uri, modifiedModel);
 				this.modifiedToOriginalCellMap.set(cell.uri, originalModel);
 				const keep = async () => {
-					try {
-						this._isEditFromUs = true;
-						this.keepPreviouslyInsertedCell(cell);
-					} finally {
-						this._isEditFromUs = false;
-					}
+					await this._applyEdits(async () => this.keepPreviouslyInsertedCell(cell));
 					return true;
 				};
 				const undo = async () => {
-					try {
-						this._isEditFromUs = true;
-						this.undoPreviouslyInsertedCell(cell);
-					} finally {
-						this._isEditFromUs = false;
-					}
+					await this._applyEdits(async () => this.undoPreviouslyInsertedCell(cell));
 					return true;
 				};
 				this.getOrCreateModifiedTextFileEntryForCell(cell, keep, undo);
@@ -513,7 +520,6 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		if (cellEntry) {
 			return cellEntry;
 		}
-		const index = this.modifiedModel.cells.indexOf(cell);
 		const originalCellModel = this.modifiedToOriginalCellMap.get(cell.uri);
 		const modifiedCellModel = this.modifiedCellModels.get(cell.uri);
 		if (!modifiedCellModel || !originalCellModel) {
@@ -526,13 +532,16 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		this._register(autorun(r => {
 			const cellDiff = cellEntry.diffInfo.read(r);
 			let diffs = this.cellDiffInfo.get().slice();
+			const index = this.modifiedModel.cells.indexOf(cell);
 			const entry = diffs.find(entry => entry.modifiedCellIndex === index);
 			if (!entry) {
 				// Not possible.
 				return;
 			}
-			entry.diff = cellDiff;
-			entry.diff = cellDiff.identical ? nullDocumentDiff : cellDiff;
+			entry.diff = { ...entry.diff, ...cellDiff };
+			if (cellDiff.identical) {
+				entry.diff = { ...entry.diff, ...nullDocumentDiff };
+			}
 			if (entry.type === 'unchanged' || entry.type === 'modified') {
 				entry.type = cellDiff.identical ? 'unchanged' : 'modified';
 			}
@@ -696,6 +705,9 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 	}
 
 	public clearCurrentEditLineDecoration() {
+		if (this.modifiedModel.isDisposed()) {
+			return;
+		}
 		this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []);
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
index d60bdc83ddd2..5b92d7e8a708 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
@@ -30,7 +30,7 @@ export type ICellDiffInfo = {
 	originalCellIndex: number;
 	modifiedCellIndex: number;
 	type: 'unchanged';
-	diff: IDocumentDiff; // Null diff Change (property to be consistent with others, also we have a list of all line numbers)
+	diff: IDocumentDiff2; // Null diff Change (property to be consistent with others, also we have a list of all line numbers)
 } | {
 	originalCellIndex: number;
 	modifiedCellIndex: number;
@@ -131,12 +131,12 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 					this.cellEditorIntegrations.set(cell, { integration, diff: diff2 });
 					this._register(integration);
 					this._register(editor.onDidDispose(() => {
-						this.cellEditorIntegrations.get(cell)!.integration.dispose();
+						this.cellEditorIntegrations.get(cell)?.integration.dispose();
 						this.cellEditorIntegrations.delete(cell);
 					}));
 					this._register(editor.onDidChangeModel(() => {
 						if (editor.getModel() !== cell.textModel) {
-							this.cellEditorIntegrations.get(cell)!.integration.dispose();
+							this.cellEditorIntegrations.get(cell)?.integration.dispose();
 							this.cellEditorIntegrations.delete(cell);
 						}
 					}));

From 9aa43e8d4a667da5803e65d8c630dcefaa0d253a Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Fri, 21 Feb 2025 07:59:01 +0100
Subject: [PATCH 0201/1815] Skip unused telemetry events
 (microsoft/vscode-internalbacklog#5288)

---
 src/vs/workbench/api/node/proxyResolver.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/api/node/proxyResolver.ts b/src/vs/workbench/api/node/proxyResolver.ts
index 533144660e47..48c6bf2801cb 100644
--- a/src/vs/workbench/api/node/proxyResolver.ts
+++ b/src/vs/workbench/api/node/proxyResolver.ts
@@ -223,9 +223,9 @@ const fetchFeatureUse: FetchFeatureUseEvent = {
 };
 
 let timer: NodeJS.Timeout | undefined;
-
+const enableFeatureUseTelemetry = false;
 function recordFetchFeatureUse(mainThreadTelemetry: MainThreadTelemetryShape, feature: keyof typeof fetchFeatureUse) {
-	if (!fetchFeatureUse[feature]++) {
+	if (enableFeatureUseTelemetry && !fetchFeatureUse[feature]++) {
 		if (timer) {
 			clearTimeout(timer);
 		}
@@ -394,9 +394,9 @@ type ProxyAuthenticationEvent = {
 };
 
 let telemetrySent = false;
-
+const enableProxyAuthenticationTelemetry = false;
 function sendTelemetry(mainThreadTelemetry: MainThreadTelemetryShape, authenticate: string[], isRemote: boolean) {
-	if (telemetrySent || !authenticate.length) {
+	if (!enableProxyAuthenticationTelemetry || telemetrySent || !authenticate.length) {
 		return;
 	}
 	telemetrySent = true;

From 04ef60decbcfe53bbec2a68b9748d768c3f7cc88 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 21 Feb 2025 08:27:26 +0100
Subject: [PATCH 0202/1815] modified document should resolve (accept itself)
 when after editing nothing has changed (#241432)

---
 .../chatEditing/chatEditingEditorOverlay.ts       | 10 +++++++---
 .../chatEditingModifiedDocumentEntry.ts           | 15 ++++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
index 2779b1fa483e..46f478ff2b3f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
@@ -90,9 +90,13 @@ class ChatEditorOverlayWidget {
 								assertType(this.label);
 
 								const { changeCount, activeIdx } = that._navigationBearings.read(r);
-								const n = activeIdx === -1 ? '?' : `${activeIdx + 1}`;
-								const m = changeCount === -1 ? '?' : `${changeCount}`;
-								this.label.innerText = localize('nOfM', "{0} of {1}", n, m);
+
+								if (changeCount > 0) {
+									const n = activeIdx === -1 ? '1' : `${activeIdx + 1}`;
+									this.label.innerText = localize('nOfM', "{0} of {1}", n, changeCount);
+								} else {
+									this.label.innerText = localize('0Of0', "0 of 0");
+								}
 
 								this.updateTooltip();
 							}));
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
index 1f90c36696c5..bd7eb6898c41 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
@@ -87,7 +87,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 	private _edit: OffsetEdit = OffsetEdit.empty;
 	private _isEditFromUs: boolean = false;
 	private _allEditsAreFromUs: boolean = true;
-	private _diffOperation: Promise<any> | undefined;
+	private _diffOperation: Promise<IDocumentDiff | undefined> | undefined;
 	private _diffOperationIds: number = 0;
 
 	private readonly _diffInfo = observableValue<IDocumentDiff>(this, nullDocumentDiff);
@@ -209,8 +209,11 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 	}
 
 	override async acceptStreamingEditsEnd(tx: ITransaction) {
-		await this._diffOperation;
+		const diff = await this._diffOperation;
 		super.acceptStreamingEditsEnd(tx);
+		if (diff?.identical) {
+			this.accept(tx);
+		}
 	}
 
 	protected override _resetEditsState(tx: ITransaction): void {
@@ -385,10 +388,10 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		}
 	}
 
-	private async _updateDiffInfo(): Promise<void> {
+	private async _updateDiffInfo(): Promise<IDocumentDiff | undefined> {
 
 		if (this.docSnapshot.isDisposed() || this.doc.isDisposed()) {
-			return;
+			return undefined;
 		}
 
 		const docVersionNow = this.doc.getVersionId();
@@ -404,7 +407,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		);
 
 		if (this.docSnapshot.isDisposed() || this.doc.isDisposed()) {
-			return;
+			return undefined;
 		}
 
 		// only update the diff if the documents didn't change in the meantime
@@ -412,7 +415,9 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 			const diff2 = diff ?? nullDocumentDiff;
 			this._diffInfo.set(diff2, undefined);
 			this._edit = OffsetEdits.fromLineRangeMapping(this.docSnapshot, this.doc, diff2.changes);
+			return diff2;
 		}
+		return undefined;
 	}
 
 	protected override async _doAccept(tx: ITransaction | undefined): Promise<void> {

From d1b7a58b25761660e040b7fa93a71f09d847eb92 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 20 Feb 2025 11:01:03 -0800
Subject: [PATCH 0203/1815] update ID of the `use prompt` command to avoid
 collisions

---
 .../browser/promptSyntax/contributions/usePromptCommand.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
index 0b89425d47b6..b5f18df91dd2 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
@@ -25,7 +25,7 @@ const USE_COMMAND_KEY_BINDING = KeyMod.Alt | KeyMod.Shift | KeyCode.KeyE;
 /**
  * Command ID for the "Use Prompt" command.
  */
-const USE_PROMPT_COMMAND_ID = 'use-prompt';
+const USE_PROMPT_COMMAND_ID = 'workbench.command.prompts.use';
 
 /**
  * Implementation of the "Use Prompt" command. The command works in the following way.
@@ -74,7 +74,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 appendToCommandPalette(
 	{
 		id: USE_PROMPT_COMMAND_ID,
-		title: localize('commands.prompts.use-prompt', "Use Prompt"),
+		title: localize('commands.prompts.use.title', "Use Prompt"),
 		category: CHAT_CATEGORY,
 	},
 );

From 65d3ac0ff7a0d2b64031cc79f63e65839f306432 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 20 Feb 2025 11:09:53 -0800
Subject: [PATCH 0204/1815] update localization string IDs

---
 .../showPromptSelectionDialog.ts              | 21 +++++++++++++++----
 .../dialogs/askForPromptSourceFolder.ts       |  4 ++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/showPromptSelectionDialog.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/showPromptSelectionDialog.ts
index 2c71d30d3dd1..c5c8c9ab0c3a 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/showPromptSelectionDialog.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/showPromptSelectionDialog.ts
@@ -82,14 +82,21 @@ const createPickItem = (
  * Creates a placeholder text to show in the prompt selection dialog.
  */
 const createPlaceholderText = (widget?: IChatWidget): string => {
-	let text = localize('selectPromptPlaceholder', 'Select a prompt to use');
+	let text = localize(
+		'commands.prompts.use.select-dialog.placeholder',
+		'Select a prompt to use',
+	);
 
 	// if no widget reference is provided, add the note about
 	// the `alt`/`option` key modifier users can use
 	if (!widget) {
 		const key = (isWindows || isLinux) ? 'alt' : 'option';
 
-		text += ' ' + localize('selectPromptPlaceholder.holdAltOption', '(hold `{0}` to use in Edits)', key);
+		text += ' ' + localize(
+			'commands.prompts.use.select-dialog.alt-modifier-note',
+			'(hold `{0}` to use in Edits)',
+			key,
+		);
 	}
 
 	return text;
@@ -122,7 +129,10 @@ export const showSelectPromptDialog = async (
 	if (files.length === 0) {
 		const docsQuickPick: WithUriValue<IQuickPickItem> = {
 			type: 'item',
-			label: localize('noPromptFilesFoundTooltipLabel', 'Learn how to create reusable prompts'),
+			label: localize(
+				'commands.prompts.use.select-dialog.empty.docs-label',
+				'Learn how to create reusable prompts',
+			),
 			description: DOCUMENTATION_URL,
 			tooltip: DOCUMENTATION_URL,
 			value: URI.parse(DOCUMENTATION_URL),
@@ -131,7 +141,10 @@ export const showSelectPromptDialog = async (
 		const result = await quickInputService.pick(
 			[docsQuickPick],
 			{
-				placeHolder: localize('noPromptFilesFoundLabel', 'No prompts found.'),
+				placeHolder: localize(
+					'commands.prompts.use.select-dialog.empty.placeholder',
+					'No prompts found.',
+				),
 				canPickMany: false,
 			});
 
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/dialogs/askForPromptSourceFolder.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/dialogs/askForPromptSourceFolder.ts
index 94754b2f0142..68f93da4348f 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/dialogs/askForPromptSourceFolder.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/dialogs/askForPromptSourceFolder.ts
@@ -119,7 +119,7 @@ const showNoFoldersDialog = async (
 	const docsQuickPick: WithUriValue<IQuickPickItem> = {
 		type: 'item',
 		label: localize(
-			'commands.prompts.create.ask-folder.no-folders-found.learn-more',
+			'commands.prompts.create.ask-folder.empty.docs-label',
 			'Learn how to configure reusable prompts',
 		),
 		description: DOCUMENTATION_URL,
@@ -131,7 +131,7 @@ const showNoFoldersDialog = async (
 		[docsQuickPick],
 		{
 			placeHolder: localize(
-				'commands.prompts.create.ask-folder.no-folders-found.placeholder',
+				'commands.prompts.create.ask-folder.empty.placeholder',
 				'No prompt source folders found.',
 			),
 			canPickMany: false,

From 02c7108e2e2b577c61a7a3f20f6914906469bc6f Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 20 Feb 2025 13:51:46 -0800
Subject: [PATCH 0205/1815] add `right arrow` gesture support to the prompts
 selection dialog

---
 .../browser/actions/chatAttachPromptAction.ts |  56 +-------
 .../showPromptSelectionDialog.ts              | 136 ++++++++++++------
 .../browser/actions/chatContextActions.ts     |   2 +-
 3 files changed, 93 insertions(+), 101 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction.ts
index f733f7382c7e..3d63fbefbf5c 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction.ts
@@ -5,17 +5,15 @@
 
 import { CHAT_CATEGORY } from './chatActions.js';
 import { localize2 } from '../../../../../nls.js';
-import { assertDefined } from '../../../../../base/common/types.js';
-import { IChatWidget, showChatView, showEditsView } from '../chat.js';
 import { Action2 } from '../../../../../platform/actions/common/actions.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { IPromptsService } from '../../common/promptSyntax/service/types.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
 import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ISelectPromptOptions, showSelectPromptDialog } from './chatAttachPromptAction/showPromptSelectionDialog.js';
-import { IPromptsService } from '../../common/promptSyntax/service/types.js';
 
 /**
  * Action ID for the `Attach Prompt` action.
@@ -53,62 +51,14 @@ export class AttachPromptAction extends Action2 {
 		const initService = accessor.get(IInstantiationService);
 		const quickInputService = accessor.get(IQuickInputService);
 
-		const selectionResult = await showSelectPromptDialog({
+		await showSelectPromptDialog({
 			...options,
 			initService,
 			labelService,
+			viewsService,
 			openerService,
 			promptsService,
 			quickInputService,
 		});
-
-		// no prompt selected, nothing to do
-		if (!selectionResult) {
-			return;
-		}
-
-		const { selected, altOption } = selectionResult;
-
-		// reveal appropriate chat widget
-		const widget = await revealChatWidget(options, altOption, viewsService);
-
-		widget
-			.attachmentModel
-			.promptInstructions
-			.add(selected.value);
-
-		widget.focusInput();
 	}
 }
-
-/**
- * Reveals a chat widget based on the provided {@link IChatAttachPromptActionOptions.widget widget}
- * reference. If no widget reference is provided, the function will reveal a `chat panel` by default
- * (either a last focused, or a new one), but if the {@link altOption} is set to `true`, a `chat edits`
- * panel will be revealed instead (likewise either a last focused, or a new one).
- */
-const revealChatWidget = async (
-	options: IChatAttachPromptActionOptions,
-	altOption: boolean,
-	viewsService: IViewsService,
-): Promise<IChatWidget> => {
-	const { widget } = options;
-
-	// if no widget reference is present, the command was triggered from outside of
-	// an active chat input, so we reveal a chat widget window based on the `alt`
-	// key modifier state when a prompt was selected from the picker UI dialog
-	if (!widget) {
-		const widget = (altOption)
-			? await showEditsView(viewsService)
-			: await showChatView(viewsService);
-
-		assertDefined(
-			widget,
-			'Revealed chat widget must be defined.',
-		);
-
-		return widget;
-	}
-
-	return widget;
-};
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/showPromptSelectionDialog.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/showPromptSelectionDialog.ts
index c5c8c9ab0c3a..e268ec9ea21b 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/showPromptSelectionDialog.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/showPromptSelectionDialog.ts
@@ -3,19 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IChatWidget } from '../../chat.js';
 import { localize } from '../../../../../../nls.js';
 import { URI } from '../../../../../../base/common/uri.js';
-import { WithUriValue } from '../../../../../../base/common/types.js';
+import { IChatWidget, showChatView, showEditsView } from '../../chat.js';
 import { dirname, extUri } from '../../../../../../base/common/resources.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { IChatAttachPromptActionOptions } from '../chatAttachPromptAction.js';
 import { DOCUMENTATION_URL } from '../../../common/promptSyntax/constants.js';
 import { isLinux, isWindows } from '../../../../../../base/common/platform.js';
 import { ILabelService } from '../../../../../../platform/label/common/label.js';
 import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
-import { IPromptPath, IPromptsService } from '../../../common/promptSyntax/service/types.js';
+import { assertDefined, WithUriValue } from '../../../../../../base/common/types.js';
+import { IViewsService } from '../../../../../services/views/common/viewsService.js';
 import { getCleanPromptName } from '../../../../../../platform/prompts/common/constants.js';
+import { IPromptPath, IPromptsService } from '../../../common/promptSyntax/service/types.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { IPickOptions, IQuickInputService, IQuickPickItem } from '../../../../../../platform/quickinput/common/quickInput.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../../../platform/quickinput/common/quickInput.js';
 
 /**
  * Options for the {@link showSelectPromptDialog} function.
@@ -38,28 +41,13 @@ export interface ISelectPromptOptions {
 	widget?: IChatWidget;
 
 	labelService: ILabelService;
+	viewsService: IViewsService;
 	openerService: IOpenerService;
 	promptsService: IPromptsService;
 	initService: IInstantiationService;
 	quickInputService: IQuickInputService;
 }
 
-/**
- * Result of user interaction with the prompt selection dialog.
- */
-interface IPromptSelectionResult {
-	/**
-	 * Selected prompt item in the dialog.
-	 */
-	selected: WithUriValue<IQuickPickItem>;
-
-	/**
-	 * Whether the `alt` (`option` on mac) key was pressed when
-	 * the prompt selection was made.
-	 */
-	altOption: boolean;
-}
-
 /**
  * Creates a quick pick item for a prompt.
  */
@@ -75,13 +63,16 @@ const createPickItem = (
 		description: labelService.getUriLabel(dirname(uri), { relative: true }),
 		tooltip: uri.fsPath,
 		value: uri,
+		id: uri.toString(),
 	};
 };
 
 /**
  * Creates a placeholder text to show in the prompt selection dialog.
  */
-const createPlaceholderText = (widget?: IChatWidget): string => {
+const createPlaceholderText = (options: ISelectPromptOptions): string => {
+	const { widget } = options;
+
 	let text = localize(
 		'commands.prompts.use.select-dialog.placeholder',
 		'Select a prompt to use',
@@ -110,7 +101,7 @@ const createPlaceholderText = (widget?: IChatWidget): string => {
  */
 export const showSelectPromptDialog = async (
 	options: ISelectPromptOptions,
-): Promise<IPromptSelectionResult | null> => {
+): Promise<void> => {
 	const { resource, labelService, promptsService } = options;
 
 	// find all prompt instruction files in the user workspace
@@ -149,12 +140,12 @@ export const showSelectPromptDialog = async (
 			});
 
 		if (!result) {
-			return null;
+			return;
 		}
 
 		await openerService.open(result.value);
 
-		return null;
+		return;
 	}
 
 	// if a resource is provided, create an `activeItem` for it to pre-select
@@ -179,34 +170,85 @@ export const showSelectPromptDialog = async (
 	}
 
 	// otherwise show the prompt file selection dialog
+	const { viewsService } = options;
+
+	const quickPick = quickInputService.createQuickPick<WithUriValue<IQuickPickItem>>();
+	quickPick.activeItems = activeItem ? [activeItem] : [];
+	quickPick.placeholder = createPlaceholderText(options);
+	quickPick.canAcceptInBackground = true;
+	quickPick.matchOnDescription = true;
+	quickPick.items = files;
+
+	return await new Promise<void>(resolve => {
+		const disposables = new DisposableStore();
+
+		let lastActiveWidget = options.widget;
+		disposables.add({
+			dispose() {
+				quickPick.dispose();
+				resolve();
+
+				// if something was attached, focus on the target chat input
+				lastActiveWidget?.focusInput();
+			},
+		});
+
+		disposables.add(quickPick.onDidAccept(async (event) => {
+			lastActiveWidget = await revealChatWidget(
+				options,
+				quickPick.keyMods.alt,
+				viewsService,
+			);
+
+			for (const selectedItem of quickPick.selectedItems) {
+				lastActiveWidget
+					.attachmentModel
+					.promptInstructions
+					.add(selectedItem.value);
+			}
+
+			// if user submitted their selection, close the dialog
+			if (!event.inBackground) {
+				return disposables.dispose();
+			}
+		}));
+
+		disposables.add(quickPick.onDidHide(
+			disposables.dispose.bind(disposables),
+		));
+
+		quickPick.show();
+	});
+};
+
+/**
+ * Reveals a chat widget based on the provided {@link IChatAttachPromptActionOptions.widget widget}
+ * reference. If no widget reference is provided, the function will reveal a `chat panel` by default
+ * (either a last focused, or a new one), but if the {@link altOption} is set to `true`, a `chat edits`
+ * panel will be revealed instead (likewise either a last focused, or a new one).
+ */
+const revealChatWidget = async (
+	options: IChatAttachPromptActionOptions,
+	altOption: boolean,
+	viewsService: IViewsService,
+): Promise<IChatWidget> => {
 	const { widget } = options;
-	const pickOptions: IPickOptions<WithUriValue<IQuickPickItem>> = {
-		placeHolder: createPlaceholderText(widget),
-		activeItem,
-		canPickMany: false,
-		matchOnDescription: true,
-	};
 
-	// keep track of whether the `alt` (`option` on mac) key is
-	// pressed when a prompt item is selected in the dialog
-	let altOption = false;
+	// if no widget reference is present, the command was triggered from outside of
+	// an active chat input, so we reveal a chat widget window based on the `alt`
+	// key modifier state when a prompt was selected from the picker UI dialog
 	if (!widget) {
-		pickOptions.onKeyMods = (keyMods) => {
-			if (keyMods.alt) {
-				altOption = true;
-			}
-		};
-	}
+		const widget = (altOption)
+			? await showEditsView(viewsService)
+			: await showChatView(viewsService);
 
-	const maybeSelectedFile = await quickInputService.pick(files, pickOptions);
+		assertDefined(
+			widget,
+			'Revealed chat widget must be defined.',
+		);
 
-	// if user cancels the dialog, return `null` instead
-	if (!maybeSelectedFile) {
-		return null;
+		return widget;
 	}
 
-	return {
-		selected: maybeSelectedFile,
-		altOption,
-	};
+	return widget;
 };
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index ed87e423abd2..b9d9e4ff2da0 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -833,7 +833,7 @@ export class AttachContextAction extends Action2 {
 			quickPickItems.push({
 				kind: 'prompt-instructions',
 				id: 'prompt-instructions',
-				label: localize('promptWithEllipsis', 'Prompt...'),
+				label: localize('chatContext.attach.prompt.label', 'Prompt...'),
 				iconClass: ThemeIcon.asClassName(Codicon.bookmark),
 			});
 		}

From d601e51c36f237af27dfa0e9d9d918a194b2a08c Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 20 Feb 2025 14:21:56 -0800
Subject: [PATCH 0206/1815] refactor dialog utilities of the "use prompt
 command"

---
 .../chatAttachPromptAction.ts                 |  48 ++--
 .../askToSelectPrompt.ts}                     | 209 ++++++++----------
 .../dialogs/showHowToCreate.ts                |  47 ++++
 .../browser/actions/chatContextActions.ts     |   2 +-
 .../contributions/usePromptCommand.ts         |  20 +-
 5 files changed, 173 insertions(+), 153 deletions(-)
 rename src/vs/workbench/contrib/chat/browser/actions/{ => chatAttachPromptAction}/chatAttachPromptAction.ts (51%)
 rename src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/{showPromptSelectionDialog.ts => dialogs/askToSelectPrompt.ts} (62%)
 create mode 100644 src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/showHowToCreate.ts

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts
similarity index 51%
rename from src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction.ts
rename to src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts
index 3d63fbefbf5c..516f4d699cd8 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CHAT_CATEGORY } from './chatActions.js';
-import { localize2 } from '../../../../../nls.js';
-import { Action2 } from '../../../../../platform/actions/common/actions.js';
-import { ILabelService } from '../../../../../platform/label/common/label.js';
-import { IPromptsService } from '../../common/promptSyntax/service/types.js';
-import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
-import { IViewsService } from '../../../../services/views/common/viewsService.js';
-import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
-import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { ISelectPromptOptions, showSelectPromptDialog } from './chatAttachPromptAction/showPromptSelectionDialog.js';
+import { CHAT_CATEGORY } from '../chatActions.js';
+import { localize2 } from '../../../../../../nls.js';
+import { showHowToCreateLink } from './dialogs/showHowToCreate.js';
+import { Action2 } from '../../../../../../platform/actions/common/actions.js';
+import { IPromptsService } from '../../../common/promptSyntax/service/types.js';
+import { ILabelService } from '../../../../../../platform/label/common/label.js';
+import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
+import { IViewsService } from '../../../../../services/views/common/viewsService.js';
+import { ServicesAccessor } from '../../../../../../editor/browser/editorExtensions.js';
+import { ISelectPromptOptions, askToSelectPrompt } from './dialogs/askToSelectPrompt.js';
+import { IQuickInputService } from '../../../../../../platform/quickinput/common/quickInput.js';
 
 /**
  * Action ID for the `Attach Prompt` action.
@@ -48,17 +48,23 @@ export class AttachPromptAction extends Action2 {
 		const viewsService = accessor.get(IViewsService);
 		const openerService = accessor.get(IOpenerService);
 		const promptsService = accessor.get(IPromptsService);
-		const initService = accessor.get(IInstantiationService);
 		const quickInputService = accessor.get(IQuickInputService);
 
-		await showSelectPromptDialog({
-			...options,
-			initService,
-			labelService,
-			viewsService,
-			openerService,
-			promptsService,
-			quickInputService,
-		});
+		// find all prompt files in the user workspace
+		const promptFiles = await promptsService.listPromptFiles();
+
+		// if no prompt files found, show instructions on how to create one
+		if (promptFiles.length === 0) {
+			return await showHowToCreateLink(openerService, quickInputService);
+		}
+
+		await askToSelectPrompt(
+			{
+				...options,
+				promptFiles,
+				labelService,
+				viewsService,
+				quickInputService,
+			});
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/showPromptSelectionDialog.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
similarity index 62%
rename from src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/showPromptSelectionDialog.ts
rename to src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
index e268ec9ea21b..d69b731f885b 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/showPromptSelectionDialog.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
@@ -3,25 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from '../../../../../../nls.js';
-import { URI } from '../../../../../../base/common/uri.js';
-import { IChatWidget, showChatView, showEditsView } from '../../chat.js';
-import { dirname, extUri } from '../../../../../../base/common/resources.js';
-import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { localize } from '../../../../../../../nls.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { assert } from '../../../../../../../base/common/assert.js';
+import { IChatWidget, showChatView, showEditsView } from '../../../chat.js';
 import { IChatAttachPromptActionOptions } from '../chatAttachPromptAction.js';
-import { DOCUMENTATION_URL } from '../../../common/promptSyntax/constants.js';
-import { isLinux, isWindows } from '../../../../../../base/common/platform.js';
-import { ILabelService } from '../../../../../../platform/label/common/label.js';
-import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
-import { assertDefined, WithUriValue } from '../../../../../../base/common/types.js';
-import { IViewsService } from '../../../../../services/views/common/viewsService.js';
-import { getCleanPromptName } from '../../../../../../platform/prompts/common/constants.js';
-import { IPromptPath, IPromptsService } from '../../../common/promptSyntax/service/types.js';
-import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { IQuickInputService, IQuickPickItem } from '../../../../../../platform/quickinput/common/quickInput.js';
+import { IPromptPath } from '../../../../common/promptSyntax/service/types.js';
+import { DisposableStore } from '../../../../../../../base/common/lifecycle.js';
+import { dirname, extUri } from '../../../../../../../base/common/resources.js';
+import { isLinux, isWindows } from '../../../../../../../base/common/platform.js';
+import { ILabelService } from '../../../../../../../platform/label/common/label.js';
+import { IViewsService } from '../../../../../../services/views/common/viewsService.js';
+import { assertDefined, WithUriValue } from '../../../../../../../base/common/types.js';
+import { getCleanPromptName } from '../../../../../../../platform/prompts/common/constants.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../../../../platform/quickinput/common/quickInput.js';
 
 /**
- * Options for the {@link showSelectPromptDialog} function.
+ * Options for the {@link askToSelectPrompt} function.
  */
 export interface ISelectPromptOptions {
 	/**
@@ -29,7 +27,7 @@ export interface ISelectPromptOptions {
 	 * 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.
 	 */
-	resource?: URI;
+	readonly resource?: URI;
 
 	/**
 	 * Target chat widget reference to attach the prompt to. If not provided, the command
@@ -38,125 +36,49 @@ export interface ISelectPromptOptions {
 	 * selected, the `edits` widget is used instead (likewise, either the last focused,
 	 * or a new one).
 	 */
-	widget?: IChatWidget;
-
-	labelService: ILabelService;
-	viewsService: IViewsService;
-	openerService: IOpenerService;
-	promptsService: IPromptsService;
-	initService: IInstantiationService;
-	quickInputService: IQuickInputService;
-}
+	readonly widget?: IChatWidget;
 
-/**
- * Creates a quick pick item for a prompt.
- */
-const createPickItem = (
-	{ uri }: IPromptPath,
-	labelService: ILabelService,
-): WithUriValue<IQuickPickItem> => {
-	const fileWithoutExtension = getCleanPromptName(uri);
-
-	return {
-		type: 'item',
-		label: fileWithoutExtension,
-		description: labelService.getUriLabel(dirname(uri), { relative: true }),
-		tooltip: uri.fsPath,
-		value: uri,
-		id: uri.toString(),
-	};
-};
-
-/**
- * Creates a placeholder text to show in the prompt selection dialog.
- */
-const createPlaceholderText = (options: ISelectPromptOptions): string => {
-	const { widget } = options;
-
-	let text = localize(
-		'commands.prompts.use.select-dialog.placeholder',
-		'Select a prompt to use',
-	);
-
-	// if no widget reference is provided, add the note about
-	// the `alt`/`option` key modifier users can use
-	if (!widget) {
-		const key = (isWindows || isLinux) ? 'alt' : 'option';
-
-		text += ' ' + localize(
-			'commands.prompts.use.select-dialog.alt-modifier-note',
-			'(hold `{0}` to use in Edits)',
-			key,
-		);
-	}
+	/**
+	 * List of prompt files to show in the selection dialog.
+	 */
+	readonly promptFiles: readonly IPromptPath[];
 
-	return text;
-};
+	readonly labelService: ILabelService;
+	readonly viewsService: IViewsService;
+	readonly quickInputService: IQuickInputService;
+}
 
 /**
- * Shows a prompt selection dialog to the user and waits for a selection.
+ * Shows the prompt selection dialog to the user that allows to select a prompt file(s).
  *
  * If {@link ISelectPromptOptions.resource resource} is provided, the dialog will have
  * the resource pre-selected in the prompts list.
  */
-export const showSelectPromptDialog = async (
+export const askToSelectPrompt = async (
 	options: ISelectPromptOptions,
 ): Promise<void> => {
-	const { resource, labelService, promptsService } = options;
-
-	// find all prompt instruction files in the user workspace
-	// and present them to the user so they can select one
-	const files = await promptsService.listPromptFiles()
-		.then((promptFiles) => {
-			return promptFiles.map((promptFile) => {
-				return createPickItem(promptFile, labelService);
-			});
-		});
+	const { promptFiles, resource, quickInputService, labelService } = options;
+
+	// a sanity check - this function must be used only if there are prompt files to show
+	assert(
+		promptFiles.length > 0,
+		'Prompt files list must not be empty.',
+	);
+
+	const fileOptions = promptFiles.map((promptFile) => {
+		return createPickItem(promptFile, labelService);
+	});
 
-	const { quickInputService, openerService } = options;
-
-	// if not prompt files found, render the "how to add" message
-	// to the user with a link to the documentation
-	if (files.length === 0) {
-		const docsQuickPick: WithUriValue<IQuickPickItem> = {
-			type: 'item',
-			label: localize(
-				'commands.prompts.use.select-dialog.empty.docs-label',
-				'Learn how to create reusable prompts',
-			),
-			description: DOCUMENTATION_URL,
-			tooltip: DOCUMENTATION_URL,
-			value: URI.parse(DOCUMENTATION_URL),
-		};
-
-		const result = await quickInputService.pick(
-			[docsQuickPick],
-			{
-				placeHolder: localize(
-					'commands.prompts.use.select-dialog.empty.placeholder',
-					'No prompts found.',
-				),
-				canPickMany: false,
-			});
-
-		if (!result) {
-			return;
-		}
-
-		await openerService.open(result.value);
-
-		return;
-	}
 
 	// if a resource is provided, create an `activeItem` for it to pre-select
 	// it in the UI, and sort the list so the active item appears at the top
 	let activeItem: WithUriValue<IQuickPickItem> | undefined;
 	if (resource) {
-		activeItem = files.find((file) => {
+		activeItem = fileOptions.find((file) => {
 			return extUri.isEqual(file.value, resource);
 		});
 
-		files.sort((file1, file2) => {
+		fileOptions.sort((file1, file2) => {
 			if (extUri.isEqual(file1.value, resource)) {
 				return -1;
 			}
@@ -177,7 +99,7 @@ export const showSelectPromptDialog = async (
 	quickPick.placeholder = createPlaceholderText(options);
 	quickPick.canAcceptInBackground = true;
 	quickPick.matchOnDescription = true;
-	quickPick.items = files;
+	quickPick.items = fileOptions;
 
 	return await new Promise<void>(resolve => {
 		const disposables = new DisposableStore();
@@ -194,7 +116,7 @@ export const showSelectPromptDialog = async (
 		});
 
 		disposables.add(quickPick.onDidAccept(async (event) => {
-			lastActiveWidget = await revealChatWidget(
+			lastActiveWidget = await getChatWidgetObject(
 				options,
 				quickPick.keyMods.alt,
 				viewsService,
@@ -222,12 +144,57 @@ export const showSelectPromptDialog = async (
 };
 
 /**
- * Reveals a chat widget based on the provided {@link IChatAttachPromptActionOptions.widget widget}
+ * Creates a quick pick item for a prompt.
+ */
+const createPickItem = (
+	{ uri }: IPromptPath,
+	labelService: ILabelService,
+): WithUriValue<IQuickPickItem> => {
+	const fileWithoutExtension = getCleanPromptName(uri);
+
+	return {
+		type: 'item',
+		label: fileWithoutExtension,
+		description: labelService.getUriLabel(dirname(uri), { relative: true }),
+		tooltip: uri.fsPath,
+		value: uri,
+		id: uri.toString(),
+	};
+};
+
+/**
+ * Creates a placeholder text to show in the prompt selection dialog.
+ */
+const createPlaceholderText = (options: ISelectPromptOptions): string => {
+	const { widget } = options;
+
+	let text = localize(
+		'commands.prompts.use.select-dialog.placeholder',
+		'Select a prompt to use',
+	);
+
+	// if no widget reference is provided, add the note about
+	// the `alt`/`option` key modifier users can use
+	if (!widget) {
+		const key = (isWindows || isLinux) ? 'alt' : 'option';
+
+		text += ' ' + localize(
+			'commands.prompts.use.select-dialog.alt-modifier-note',
+			'(hold `{0}` to use in Edits)',
+			key,
+		);
+	}
+
+	return text;
+};
+
+/**
+ * Gets a chat widget based on the provided {@link IChatAttachPromptActionOptions.widget widget}
  * reference. If no widget reference is provided, the function will reveal a `chat panel` by default
  * (either a last focused, or a new one), but if the {@link altOption} is set to `true`, a `chat edits`
  * panel will be revealed instead (likewise either a last focused, or a new one).
  */
-const revealChatWidget = async (
+const getChatWidgetObject = async (
 	options: IChatAttachPromptActionOptions,
 	altOption: boolean,
 	viewsService: IViewsService,
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/showHowToCreate.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/showHowToCreate.ts
new file mode 100644
index 000000000000..73a55bc5347a
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/showHowToCreate.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 { localize } from '../../../../../../../nls.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { WithUriValue } from '../../../../../../../base/common/types.js';
+import { DOCUMENTATION_URL } from '../../../../common/promptSyntax/constants.js';
+import { IOpenerService } from '../../../../../../../platform/opener/common/opener.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../../../../platform/quickinput/common/quickInput.js';
+
+/**
+ * Shows the dialogs with a link to docs.
+ */
+
+export const showHowToCreateLink = async (
+	openerService: IOpenerService,
+	quickInputService: IQuickInputService
+): Promise<void> => {
+	const docsQuickPick: WithUriValue<IQuickPickItem> = {
+		type: 'item',
+		label: localize(
+			'commands.prompts.use.select-dialog.empty.docs-label',
+			'Learn how to create reusable prompts'
+		),
+		description: DOCUMENTATION_URL,
+		tooltip: DOCUMENTATION_URL,
+		value: URI.parse(DOCUMENTATION_URL),
+	};
+
+	const result = await quickInputService.pick(
+		[docsQuickPick],
+		{
+			placeHolder: localize(
+				'commands.prompts.use.select-dialog.empty.placeholder',
+				'No prompts found.'
+			),
+			canPickMany: false,
+		});
+
+	if (!result) {
+		return;
+	}
+
+	await openerService.open(result.value);
+};
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index b9d9e4ff2da0..4a54574306ce 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -60,7 +60,7 @@ import { createFolderQuickPick, createMarkersQuickPick } from '../contrib/chatDy
 import { convertBufferToScreenshotVariable, ScreenshotVariableId } from '../contrib/screenshot.js';
 import { resizeImage } from '../imageUtils.js';
 import { CHAT_CATEGORY } from './chatActions.js';
-import { ATTACH_PROMPT_ACTION_ID, AttachPromptAction, IChatAttachPromptActionOptions } from './chatAttachPromptAction.js';
+import { ATTACH_PROMPT_ACTION_ID, AttachPromptAction, IChatAttachPromptActionOptions } from './chatAttachPromptAction/chatAttachPromptAction.js';
 
 export function registerChatContextActions() {
 	registerAction2(AttachContextAction);
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
index b5f18df91dd2..98d884ab4705 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
@@ -14,18 +14,18 @@ import { ICommandService } from '../../../../../../platform/commands/common/comm
 import { appendToCommandPalette } from '../../../../files/browser/fileActions.contribution.js';
 import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { IActiveCodeEditor, isCodeEditor, isDiffEditor } from '../../../../../../editor/browser/editorBrowser.js';
-import { IChatAttachPromptActionOptions, ATTACH_PROMPT_ACTION_ID } from '../../actions/chatAttachPromptAction.js';
 import { KeybindingsRegistry, KeybindingWeight } from '../../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IChatAttachPromptActionOptions, ATTACH_PROMPT_ACTION_ID } from '../../actions/chatAttachPromptAction/chatAttachPromptAction.js';
 
 /**
- * Keybinding for the "Use Prompt" command.
+ * Command ID for the "Use Prompt" command.
  */
-const USE_COMMAND_KEY_BINDING = KeyMod.Alt | KeyMod.Shift | KeyCode.KeyE;
+const COMMAND_ID = 'workbench.command.prompts.use';
 
 /**
- * Command ID for the "Use Prompt" command.
+ * Keybinding for the "Use Prompt" command.
  */
-const USE_PROMPT_COMMAND_ID = 'workbench.command.prompts.use';
+const COMMAND_KEY_BINDING = KeyMod.Alt | KeyMod.Shift | KeyCode.KeyE;
 
 /**
  * Implementation of the "Use Prompt" command. The command works in the following way.
@@ -45,7 +45,7 @@ const USE_PROMPT_COMMAND_ID = 'workbench.command.prompts.use';
  * was pressed when the prompt was selected, a `chat edits` panel is used instead
  * (likewise either the last focused or a new one).
  */
-const usePromptCommand = async (
+const command = async (
 	accessor: ServicesAccessor,
 ): Promise<void> => {
 	const commandService = accessor.get(ICommandService);
@@ -62,10 +62,10 @@ const usePromptCommand = async (
  * Register the "Use Prompt" command with its keybinding.
  */
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-	id: USE_PROMPT_COMMAND_ID,
+	id: COMMAND_ID,
 	weight: KeybindingWeight.WorkbenchContrib,
-	primary: USE_COMMAND_KEY_BINDING,
-	handler: usePromptCommand,
+	primary: COMMAND_KEY_BINDING,
+	handler: command,
 });
 
 /**
@@ -73,7 +73,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
  */
 appendToCommandPalette(
 	{
-		id: USE_PROMPT_COMMAND_ID,
+		id: COMMAND_ID,
 		title: localize('commands.prompts.use.title', "Use Prompt"),
 		category: CHAT_CATEGORY,
 	},

From 5a34a0a23757d6cc8ffd29c2bd61d0454d311ef4 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 20 Feb 2025 15:35:38 -0800
Subject: [PATCH 0207/1815] ensure that currently active prompt file always in
 the selection list

---
 .../dialogs/askToSelectPrompt.ts                 | 16 ++++++++++++----
 .../contributions/usePromptCommand.ts            |  4 ++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
index d69b731f885b..ff7fd235d96f 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
@@ -65,11 +65,10 @@ export const askToSelectPrompt = async (
 		'Prompt files list must not be empty.',
 	);
 
-	const fileOptions = promptFiles.map((promptFile) => {
-		return createPickItem(promptFile, labelService);
+	const fileOptions = promptFiles.map(({ uri }) => {
+		return createPickItem(uri, labelService);
 	});
 
-
 	// if a resource is provided, create an `activeItem` for it to pre-select
 	// it in the UI, and sort the list so the active item appears at the top
 	let activeItem: WithUriValue<IQuickPickItem> | undefined;
@@ -78,6 +77,15 @@ export const askToSelectPrompt = async (
 			return extUri.isEqual(file.value, resource);
 		});
 
+		// if no item for the `resource` was found, it means that the resource is not
+		// in the list of prompt files, so add a new item for it; this ensures that
+		// the currently active prompt file is always available in the selection dialog,
+		// even if it is not included in the prompts list otherwise(from location setting)
+		if (!activeItem) {
+			activeItem = createPickItem(resource, labelService);
+			fileOptions.push(activeItem);
+		}
+
 		fileOptions.sort((file1, file2) => {
 			if (extUri.isEqual(file1.value, resource)) {
 				return -1;
@@ -147,7 +155,7 @@ export const askToSelectPrompt = async (
  * Creates a quick pick item for a prompt.
  */
 const createPickItem = (
-	{ uri }: IPromptPath,
+	uri: URI,
 	labelService: ILabelService,
 ): WithUriValue<IQuickPickItem> => {
 	const fileWithoutExtension = getCleanPromptName(uri);
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
index 98d884ab4705..776433e6625e 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
@@ -18,12 +18,12 @@ import { KeybindingsRegistry, KeybindingWeight } from '../../../../../../platfor
 import { IChatAttachPromptActionOptions, ATTACH_PROMPT_ACTION_ID } from '../../actions/chatAttachPromptAction/chatAttachPromptAction.js';
 
 /**
- * Command ID for the "Use Prompt" command.
+ * Command ID of the "Use Prompt" command.
  */
 const COMMAND_ID = 'workbench.command.prompts.use';
 
 /**
- * Keybinding for the "Use Prompt" command.
+ * Keybinding of the "Use Prompt" command.
  */
 const COMMAND_KEY_BINDING = KeyMod.Alt | KeyMod.Shift | KeyCode.KeyE;
 

From 47121560fd871113c48057c491bea3773b425b8e Mon Sep 17 00:00:00 2001
From: Devin Valenciano <1389808+devinvalenciano@users.noreply.github.com>
Date: Fri, 21 Feb 2025 00:24:02 -0800
Subject: [PATCH 0208/1815] Update telemetry event owner (#241410)

---
 .../common/services/treeSitter/treeSitterParserService.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/common/services/treeSitter/treeSitterParserService.ts b/src/vs/editor/common/services/treeSitter/treeSitterParserService.ts
index 0205c524395a..a7af9009f50d 100644
--- a/src/vs/editor/common/services/treeSitter/treeSitterParserService.ts
+++ b/src/vs/editor/common/services/treeSitter/treeSitterParserService.ts
@@ -456,7 +456,7 @@ export class TreeSitterParseResult implements IDisposable, ITreeSitterParseResul
 	private sendParseTimeTelemetry(parseType: TelemetryParseType, languageId: string, time: number, passes: number): void {
 		this._logService.debug(`Tree parsing (${parseType}) took ${time} ms and ${passes} passes.`);
 		type ParseTimeClassification = {
-			owner: 'alros';
+			owner: 'alexr00';
 			comment: 'Used to understand how long it takes to parse a tree-sitter tree';
 			languageId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The programming language ID.' };
 			time: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; isMeasurement: true; comment: 'The ms it took to parse' };

From cdca87617757eb0f5fb2eae5ff2cd9043152c749 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 21 Feb 2025 09:48:25 +0100
Subject: [PATCH 0209/1815] linux - cleanup from custom title experiment
 (#241379)

---
 src/vs/code/electron-main/app.ts              | 10 +---
 src/vs/platform/native/common/native.ts       |  3 --
 .../electron-main/nativeHostMainService.ts    | 12 +----
 src/vs/platform/window/common/window.ts       | 15 +-----
 .../electron-main/windowsMainService.ts       |  3 +-
 src/vs/workbench/common/contextkeys.ts        |  4 +-
 .../electron-sandbox/desktop.contribution.ts  | 10 +---
 .../electron-sandbox/desktop.main.ts          | 15 +-----
 .../parts/titlebar/titlebarPart.ts            | 51 -------------------
 .../electron-sandbox/workbenchTestServices.ts |  1 -
 10 files changed, 9 insertions(+), 115 deletions(-)

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 9c7c68572b6e..21a297a12d85 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -83,7 +83,7 @@ import { NativeURLService } from '../../platform/url/common/urlService.js';
 import { ElectronURLListener } from '../../platform/url/electron-main/electronUrlListener.js';
 import { IWebviewManagerService } from '../../platform/webview/common/webviewManagerService.js';
 import { WebviewMainService } from '../../platform/webview/electron-main/webviewMainService.js';
-import { isFolderToOpen, isWorkspaceToOpen, IWindowOpenable, TitlebarStyle, overrideDefaultTitlebarStyle } from '../../platform/window/common/window.js';
+import { isFolderToOpen, isWorkspaceToOpen, IWindowOpenable } from '../../platform/window/common/window.js';
 import { IWindowsMainService, OpenContext } from '../../platform/windows/electron-main/windows.js';
 import { ICodeWindow } from '../../platform/window/electron-main/window.js';
 import { WindowsMainService } from '../../platform/windows/electron-main/windowsMainService.js';
@@ -599,14 +599,6 @@ export class CodeApplication extends Disposable {
 		// Services
 		const appInstantiationService = await this.initServices(machineId, sqmId, devDeviceId, sharedProcessReady);
 
-		// Linux (stable only): custom title default style override
-		if (isLinux && this.productService.quality === 'stable') {
-			const titleBarDefaultStyleOverride = this.stateService.getItem('window.titleBarStyleOverride');
-			if (titleBarDefaultStyleOverride === TitlebarStyle.CUSTOM) {
-				overrideDefaultTitlebarStyle(titleBarDefaultStyleOverride);
-			}
-		}
-
 		// Auth Handler
 		appInstantiationService.invokeFunction(accessor => accessor.get(IProxyAuthService));
 
diff --git a/src/vs/platform/native/common/native.ts b/src/vs/platform/native/common/native.ts
index 03a2d54de4ec..049c19d1ec57 100644
--- a/src/vs/platform/native/common/native.ts
+++ b/src/vs/platform/native/common/native.ts
@@ -110,9 +110,6 @@ export interface ICommonNativeHostService {
 	 */
 	focusWindow(options?: INativeHostOptions & { force?: boolean }): Promise<void>;
 
-	// Titlebar default style override
-	overrideDefaultTitlebarStyle(style: 'custom' | undefined): Promise<void>;
-
 	// Dialogs
 	showMessageBox(options: MessageBoxOptions & INativeHostOptions): Promise<MessageBoxReturnValue>;
 	showSaveDialog(options: SaveDialogOptions & INativeHostOptions): Promise<SaveDialogReturnValue>;
diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts
index b24a24ea61bb..c2241a9a4524 100644
--- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
+++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
@@ -48,7 +48,6 @@ import { IConfigurationService } from '../../configuration/common/configuration.
 import { IProxyAuthService } from './auth.js';
 import { AuthInfo, Credentials, IRequestService } from '../../request/common/request.js';
 import { randomPath } from '../../../base/common/extpath.js';
-import { IStateService } from '../../state/node/state.js';
 
 export interface INativeHostMainService extends AddFirstParameterToFunctions<ICommonNativeHostService, Promise<unknown> /* only methods, not events */, number | undefined /* window ID */> { }
 
@@ -71,8 +70,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IRequestService private readonly requestService: IRequestService,
 		@IProxyAuthService private readonly proxyAuthService: IProxyAuthService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IStateService private readonly stateService: IStateService
+		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
 		super();
 	}
@@ -313,14 +311,6 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		this.themeMainService.saveWindowSplash(windowId, window?.openedWorkspace, splash);
 	}
 
-	async overrideDefaultTitlebarStyle(windowId: number | undefined, style: 'custom' | undefined): Promise<void> {
-		if (style === 'custom') {
-			this.stateService.setItem('window.titleBarStyleOverride', style);
-		} else {
-			this.stateService.removeItem('window.titleBarStyleOverride');
-		}
-	}
-
 	//#endregion
 
 
diff --git a/src/vs/platform/window/common/window.ts b/src/vs/platform/window/common/window.ts
index 56cbfacd20d2..e230d1a09a5c 100644
--- a/src/vs/platform/window/common/window.ts
+++ b/src/vs/platform/window/common/window.ts
@@ -6,7 +6,7 @@
 import { VSBuffer } from '../../../base/common/buffer.js';
 import { IStringDictionary } from '../../../base/common/collections.js';
 import { PerformanceMark } from '../../../base/common/performance.js';
-import { isLinux, isMacintosh, isNative, isWeb } from '../../../base/common/platform.js';
+import { isMacintosh, isNative, isWeb } from '../../../base/common/platform.js';
 import { URI, UriComponents, UriDto } from '../../../base/common/uri.js';
 import { ISandboxConfiguration } from '../../../base/parts/sandbox/common/sandboxTypes.js';
 import { IConfigurationService } from '../../configuration/common/configuration.js';
@@ -15,7 +15,6 @@ import { NativeParsedArgs } from '../../environment/common/argv.js';
 import { FileType } from '../../files/common/files.js';
 import { ILoggerResource, LogLevel } from '../../log/common/log.js';
 import { PolicyDefinition, PolicyValue } from '../../policy/common/policy.js';
-import product from '../../product/common/product.js';
 import { IPartsSplash } from '../../theme/common/themeService.js';
 import { IUserDataProfile } from '../../userDataProfile/common/userDataProfile.js';
 import { IAnyWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from '../../workspace/common/workspace.js';
@@ -186,11 +185,6 @@ export const enum CustomTitleBarVisibility {
 	NEVER = 'never',
 }
 
-export let titlebarStyleDefaultOverride: 'custom' | undefined = undefined;
-export function overrideDefaultTitlebarStyle(style: 'custom'): void {
-	titlebarStyleDefaultOverride = style;
-}
-
 export function hasCustomTitlebar(configurationService: IConfigurationService, titleBarStyle?: TitlebarStyle): boolean {
 	// Returns if it possible to have a custom title bar in the curren session
 	// Does not imply that the title bar is visible
@@ -228,11 +222,7 @@ export function getTitleBarStyle(configurationService: IConfigurationService): T
 		}
 	}
 
-	if (titlebarStyleDefaultOverride === 'custom') {
-		return TitlebarStyle.CUSTOM;
-	}
-
-	return isLinux && product.quality === 'stable' ? TitlebarStyle.NATIVE : TitlebarStyle.CUSTOM; // default to custom on all OS except Linux stable (for now)
+	return TitlebarStyle.CUSTOM; // default to custom on all OS
 }
 
 export const DEFAULT_CUSTOM_TITLEBAR_HEIGHT = 35; // includes space for command center
@@ -392,7 +382,6 @@ export interface INativeWindowConfiguration extends IWindowConfiguration, Native
 	autoDetectHighContrast?: boolean;
 	autoDetectColorScheme?: boolean;
 	isCustomZoomLevel?: boolean;
-	overrideDefaultTitlebarStyle?: 'custom';
 
 	perfMarks: PerformanceMark[];
 
diff --git a/src/vs/platform/windows/electron-main/windowsMainService.ts b/src/vs/platform/windows/electron-main/windowsMainService.ts
index 4690b9702df0..d2ca2f8f6c7a 100644
--- a/src/vs/platform/windows/electron-main/windowsMainService.ts
+++ b/src/vs/platform/windows/electron-main/windowsMainService.ts
@@ -37,7 +37,7 @@ import product from '../../product/common/product.js';
 import { IProtocolMainService } from '../../protocol/electron-main/protocol.js';
 import { getRemoteAuthority } from '../../remote/common/remoteHosts.js';
 import { IStateService } from '../../state/node/state.js';
-import { IAddRemoveFoldersRequest, INativeOpenFileRequest, INativeWindowConfiguration, IOpenEmptyWindowOptions, IPath, IPathsToWaitFor, isFileToOpen, isFolderToOpen, isWorkspaceToOpen, IWindowOpenable, IWindowSettings, titlebarStyleDefaultOverride } from '../../window/common/window.js';
+import { IAddRemoveFoldersRequest, INativeOpenFileRequest, INativeWindowConfiguration, IOpenEmptyWindowOptions, IPath, IPathsToWaitFor, isFileToOpen, isFolderToOpen, isWorkspaceToOpen, IWindowOpenable, IWindowSettings } from '../../window/common/window.js';
 import { CodeWindow } from './windowImpl.js';
 import { IOpenConfiguration, IOpenEmptyConfiguration, IWindowsCountChangedEvent, IWindowsMainService, OpenContext, getLastFocused } from './windows.js';
 import { findWindowOnExtensionDevelopmentPath, findWindowOnFile, findWindowOnWorkspaceOrFolder } from './windowsFinder.js';
@@ -1506,7 +1506,6 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 
 			autoDetectHighContrast: windowConfig?.autoDetectHighContrast ?? true,
 			autoDetectColorScheme: windowConfig?.autoDetectColorScheme ?? false,
-			overrideDefaultTitlebarStyle: titlebarStyleDefaultOverride,
 			accessibilitySupport: app.accessibilitySupportEnabled,
 			colorScheme: this.themeMainService.getColorScheme(),
 			policiesData: this.policyService.serialize(),
diff --git a/src/vs/workbench/common/contextkeys.ts b/src/vs/workbench/common/contextkeys.ts
index 8e3f6a2f3c74..d11f9b168aa1 100644
--- a/src/vs/workbench/common/contextkeys.ts
+++ b/src/vs/workbench/common/contextkeys.ts
@@ -15,8 +15,6 @@ import { Schemas } from '../../base/common/network.js';
 import { EditorInput } from './editor/editorInput.js';
 import { IEditorResolverService } from '../services/editor/common/editorResolverService.js';
 import { DEFAULT_EDITOR_ASSOCIATION } from './editor.js';
-import { isLinux } from '../../base/common/platform.js';
-import product from '../../platform/product/common/product.js';
 
 //#region < --- Workbench --- >
 
@@ -111,7 +109,7 @@ export const StatusBarFocused = new RawContextKey<boolean>('statusBarFocused', f
 
 //#region < --- Title Bar --- >
 
-export const TitleBarStyleContext = new RawContextKey<string>('titleBarStyle', isLinux && product.quality === 'stable' ? 'native' : 'custom', localize('titleBarStyle', "Style of the window title bar"));
+export const TitleBarStyleContext = new RawContextKey<string>('titleBarStyle', 'custom', localize('titleBarStyle', "Style of the window title bar"));
 export const TitleBarVisibleContext = new RawContextKey<boolean>('titleBarVisible', false, localize('titleBarVisible', "Whether the title bar is visible"));
 
 //#endregion
diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
index 94a754a3e71d..c420ccfefc36 100644
--- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts
+++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
@@ -28,9 +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-sandbox/window.js';
-import product from '../../platform/product/common/product.js';
-import { registerWorkbenchContribution2, WorkbenchPhase } from '../common/contributions.js';
-import { LinuxCustomTitlebarExperiment } from './parts/titlebar/titlebarPart.js';
 
 // Actions
 (function registerActions(): void {
@@ -235,7 +232,7 @@ import { LinuxCustomTitlebarExperiment } from './parts/titlebar/titlebarPart.js'
 			'window.titleBarStyle': {
 				'type': 'string',
 				'enum': ['native', 'custom'],
-				'default': isLinux && product.quality === 'stable' ? 'native' : 'custom',
+				'default': 'custom',
 				'scope': ConfigurationScope.APPLICATION,
 				'description': localize('titleBarStyle', "Adjust the appearance of the window title bar to be native by the OS or custom. On Linux and Windows, this setting also affects the application and context menu appearances. Changes require a full restart to apply."),
 			},
@@ -247,7 +244,7 @@ import { LinuxCustomTitlebarExperiment } from './parts/titlebar/titlebarPart.js'
 					localize(`window.customTitleBarVisibility.windowed`, "Hide custom titlebar in full screen. When not in full screen, automatically change custom title bar visibility."),
 					localize(`window.customTitleBarVisibility.never`, "Hide custom titlebar when {0} is set to `native`.", '`#window.titleBarStyle#`'),
 				],
-				'default': isLinux && product.quality === 'stable' ? 'never' : 'auto',
+				'default': 'auto',
 				'scope': ConfigurationScope.APPLICATION,
 				'markdownDescription': localize('window.customTitleBarVisibility', "Adjust when the custom title bar should be shown. The custom title bar can be hidden when in full screen mode with `windowed`. The custom title bar can only be hidden in non full screen mode with `never` when {0} is set to `native`.", '`#window.titleBarStyle#`'),
 			},
@@ -418,6 +415,3 @@ import { LinuxCustomTitlebarExperiment } from './parts/titlebar/titlebarPart.js'
 
 	jsonRegistry.registerSchema(argvDefinitionFileSchemaId, schema);
 })();
-
-// Workbench Contributions
-registerWorkbenchContribution2(LinuxCustomTitlebarExperiment.ID, LinuxCustomTitlebarExperiment, WorkbenchPhase.Eventually);
diff --git a/src/vs/workbench/electron-sandbox/desktop.main.ts b/src/vs/workbench/electron-sandbox/desktop.main.ts
index a728f602f530..b173b981f3b1 100644
--- a/src/vs/workbench/electron-sandbox/desktop.main.ts
+++ b/src/vs/workbench/electron-sandbox/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-sandbox/utilityProcessWorkerWorkbenchService.js';
-import { isBigSurOrNewer, isCI, isLinux, isMacintosh } from '../../base/common/platform.js';
+import { isBigSurOrNewer, isCI, isMacintosh } from '../../base/common/platform.js';
 import { Schemas } from '../../base/common/network.js';
 import { DiskFileSystemProvider } from '../services/files/electron-sandbox/diskFileSystemProvider.js';
 import { FileUserDataProvider } from '../../platform/userData/common/fileUserDataProvider.js';
@@ -61,8 +61,6 @@ import { ElectronRemoteResourceLoader } from '../../platform/remote/electron-san
 import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
 import { applyZoom } from '../../platform/window/electron-sandbox/window.js';
 import { mainWindow } from '../../base/browser/window.js';
-import { Registry } from '../../platform/registry/common/platform.js';
-import { IConfigurationRegistry, Extensions } from '../../platform/configuration/common/configurationRegistry.js';
 
 export class DesktopMain extends Disposable {
 
@@ -81,17 +79,6 @@ export class DesktopMain extends Disposable {
 
 		// Apply fullscreen early if configured
 		setFullscreen(!!this.configuration.fullscreen, mainWindow);
-
-		// Apply custom title override to defaults if any
-		if (isLinux && product.quality === 'stable' && this.configuration.overrideDefaultTitlebarStyle === 'custom') {
-			const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
-			configurationRegistry.registerDefaultConfigurations([{
-				overrides: {
-					'window.titleBarStyle': 'custom',
-					'window.customTitleBarVisibility': 'auto'
-				}
-			}]);
-		}
 	}
 
 	private reviveUris() {
diff --git a/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts b/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
index 92af982b57e2..9e7022319dcd 100644
--- a/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
@@ -24,10 +24,6 @@ import { IEditorGroupsContainer, IEditorGroupsService } from '../../../services/
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { CodeWindow, mainWindow } from '../../../../base/browser/window.js';
-import { IProductService } from '../../../../platform/product/common/productService.js';
-import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
 
 export class NativeTitlebarPart extends BrowserTitlebarPart {
 
@@ -284,50 +280,3 @@ export class NativeTitleService extends BrowserTitleService {
 		return this.instantiationService.createInstance(AuxiliaryNativeTitlebarPart, container, editorGroupsContainer, this.mainPart);
 	}
 }
-
-export class LinuxCustomTitlebarExperiment extends Disposable implements IWorkbenchContribution {
-
-	static readonly ID = 'workbench.contrib.linuxCustomTitlebarExperiment';
-
-	private readonly treatment = this.assignmentService.getTreatment('config.window.experimentalTitleBarStyle');
-
-	constructor(
-		@IProductService productService: IProductService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@INativeHostService private readonly nativeHostService: INativeHostService,
-		@IWorkbenchAssignmentService private readonly assignmentService: IWorkbenchAssignmentService
-	) {
-		super();
-
-		if (isLinux && productService.quality === 'stable') {
-			this.handleDefaultTitlebarStyle(); // TODO@bpasero remove me eventually once settled
-		}
-	}
-
-	private handleDefaultTitlebarStyle(): void {
-		this.updateDefaultTitlebarStyle();
-		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration('window.titleBarStyle')) {
-				this.updateDefaultTitlebarStyle();
-			}
-		}));
-	}
-
-	private async updateDefaultTitlebarStyle(): Promise<void> {
-		const titleBarStyle = this.configurationService.inspect('window.titleBarStyle');
-
-		let titleBarStyleOverride: 'custom' | undefined;
-		if (titleBarStyle.applicationValue || titleBarStyle.userValue) {
-			// configured by user or application: clear override
-			titleBarStyleOverride = undefined;
-		} else {
-			// not configured: set override if experiment is active
-			const value = await this.treatment;
-			if (value === 'custom') {
-				titleBarStyleOverride = 'custom';
-			}
-		}
-
-		await this.nativeHostService.overrideDefaultTitlebarStyle(titleBarStyleOverride);
-	}
-}
diff --git a/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts b/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts
index ee1302e17fc7..431160fe73d7 100644
--- a/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts
+++ b/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts
@@ -159,7 +159,6 @@ export class TestNativeHostService implements INativeHostService {
 	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 profileRenderer(): Promise<any> { throw new Error(); }
 	async getScreenshot(): Promise<ArrayBufferLike | undefined> { return undefined; }
-	async overrideDefaultTitlebarStyle(style: 'native' | 'custom' | undefined): Promise<void> { }
 }
 
 export class TestExtensionTipsService extends AbstractNativeExtensionTipsService {

From bce432147b8b26a6817d85dd9cad242c20bfb104 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 21 Feb 2025 10:08:57 +0100
Subject: [PATCH 0210/1815] Skip resolving save conxflict when the contents
 between disk and editor are equal (fix #241381) (#241443)

---
 src/vs/base/common/buffer.ts                  | 12 +++
 src/vs/base/test/common/buffer.test.ts        | 99 +++++++++++++++++++
 src/vs/platform/files/common/fileService.ts   | 64 ++++++++----
 .../node/diskFileService.integrationTest.ts   | 40 ++++++++
 4 files changed, 196 insertions(+), 19 deletions(-)

diff --git a/src/vs/base/common/buffer.ts b/src/vs/base/common/buffer.ts
index 7f8e1b34a811..4702f6ffdcaa 100644
--- a/src/vs/base/common/buffer.ts
+++ b/src/vs/base/common/buffer.ts
@@ -175,6 +175,18 @@ export class VSBuffer {
 	indexOf(subarray: VSBuffer | Uint8Array, offset = 0) {
 		return binaryIndexOf(this.buffer, subarray instanceof VSBuffer ? subarray.buffer : subarray, offset);
 	}
+
+	equals(other: VSBuffer): boolean {
+		if (this === other) {
+			return true;
+		}
+
+		if (this.byteLength !== other.byteLength) {
+			return false;
+		}
+
+		return this.buffer.every((value, index) => value === other.buffer[index]);
+	}
 }
 
 /**
diff --git a/src/vs/base/test/common/buffer.test.ts b/src/vs/base/test/common/buffer.test.ts
index 3ff4056f2efd..94bc1815fcea 100644
--- a/src/vs/base/test/common/buffer.test.ts
+++ b/src/vs/base/test/common/buffer.test.ts
@@ -429,7 +429,106 @@ suite('Buffer', () => {
 		assert.strictEqual(haystack.indexOf(VSBuffer.fromString('ccc')), 15);
 
 		assert.strictEqual(haystack.indexOf(VSBuffer.fromString('cccb')), -1);
+	});
+
+	test('wrap', () => {
+		const actual = new Uint8Array([1, 2, 3]);
+		const wrapped = VSBuffer.wrap(actual);
+		assert.strictEqual(wrapped.byteLength, 3);
+		assert.deepStrictEqual(Array.from(wrapped.buffer), [1, 2, 3]);
+	});
+
+	test('fromString', () => {
+		const value = 'Hello World';
+		const buff = VSBuffer.fromString(value);
+		assert.strictEqual(buff.toString(), value);
+	});
+
+	test('fromByteArray', () => {
+		const array = [1, 2, 3, 4, 5];
+		const buff = VSBuffer.fromByteArray(array);
+		assert.strictEqual(buff.byteLength, array.length);
+		assert.deepStrictEqual(Array.from(buff.buffer), array);
+	});
+
+	test('concat', () => {
+		const chunks = [
+			VSBuffer.fromString('abc'),
+			VSBuffer.fromString('def'),
+			VSBuffer.fromString('ghi')
+		];
+
+		// Test without total length
+		const result1 = VSBuffer.concat(chunks);
+		assert.strictEqual(result1.toString(), 'abcdefghi');
+
+		// Test with total length
+		const result2 = VSBuffer.concat(chunks, 9);
+		assert.strictEqual(result2.toString(), 'abcdefghi');
+	});
+
+	test('clone', () => {
+		const original = VSBuffer.fromString('test');
+		const clone = original.clone();
+
+		assert.notStrictEqual(original.buffer, clone.buffer);
+		assert.deepStrictEqual(Array.from(original.buffer), Array.from(clone.buffer));
+	});
+
+	test('slice', () => {
+		const buff = VSBuffer.fromString('Hello World');
+
+		const slice1 = buff.slice(0, 5);
+		assert.strictEqual(slice1.toString(), 'Hello');
+
+		const slice2 = buff.slice(6);
+		assert.strictEqual(slice2.toString(), 'World');
+	});
+
+	test('set', () => {
+		const buff = VSBuffer.alloc(5);
+
+		// Test setting from VSBuffer
+		buff.set(VSBuffer.fromString('ab'), 0);
+		assert.strictEqual(buff.toString().substring(0, 2), 'ab');
+
+		// Test setting from Uint8Array
+		buff.set(new Uint8Array([99, 100]), 2); // 'cd'
+		assert.strictEqual(buff.toString().substring(2, 4), 'cd');
+
+		// Test invalid input
+		assert.throws(() => {
+			buff.set({} as any);
+		});
+	});
+
+	test('equals', () => {
+		const buff1 = VSBuffer.fromString('test');
+		const buff2 = VSBuffer.fromString('test');
+		const buff3 = VSBuffer.fromString('different');
+		const buff4 = VSBuffer.fromString('tes1');
+
+		assert.strictEqual(buff1.equals(buff1), true);
+		assert.strictEqual(buff1.equals(buff2), true);
+		assert.strictEqual(buff1.equals(buff3), false);
+		assert.strictEqual(buff1.equals(buff4), false);
+	});
+
+	test('read/write methods', () => {
+		const buff = VSBuffer.alloc(8);
+
+		// Test UInt32BE
+		buff.writeUInt32BE(0x12345678, 0);
+		assert.strictEqual(buff.readUInt32BE(0), 0x12345678);
+
+		// Test UInt32LE
+		buff.writeUInt32LE(0x12345678, 4);
+		assert.strictEqual(buff.readUInt32LE(4), 0x12345678);
 
+		// Test UInt8
+		const buff2 = VSBuffer.alloc(1);
+		buff2.writeUInt8(123, 0);
+		assert.strictEqual(buff2.readUInt8(0), 123);
 	});
 
 	suite('base64', () => {
diff --git a/src/vs/platform/files/common/fileService.ts b/src/vs/platform/files/common/fileService.ts
index 978cac73b675..e36ae7bcee57 100644
--- a/src/vs/platform/files/common/fileService.ts
+++ b/src/vs/platform/files/common/fileService.ts
@@ -379,8 +379,8 @@ export class FileService extends Disposable implements IFileService {
 
 		try {
 
-			// validate write
-			const stat = await this.validateWriteFile(provider, resource, writeFileOptions);
+			// validate write (this may already return a peeked-at buffer)
+			let { stat, buffer: bufferOrReadableOrStreamOrBufferedStream } = await this.validateWriteFile(provider, resource, bufferOrReadableOrStream, writeFileOptions);
 
 			// mkdir recursively as needed
 			if (!stat) {
@@ -391,20 +391,8 @@ export class FileService extends Disposable implements IFileService {
 			// to write is not a buffer, we consume up to 3 chunks and try to write the data
 			// unbuffered to reduce the overhead. If the stream or readable has more data
 			// to provide we continue to write buffered.
-			let bufferOrReadableOrStreamOrBufferedStream: VSBuffer | VSBufferReadable | VSBufferReadableStream | VSBufferReadableBufferedStream;
-			if (hasReadWriteCapability(provider) && !(bufferOrReadableOrStream instanceof VSBuffer)) {
-				if (isReadableStream(bufferOrReadableOrStream)) {
-					const bufferedStream = await peekStream(bufferOrReadableOrStream, 3);
-					if (bufferedStream.ended) {
-						bufferOrReadableOrStreamOrBufferedStream = VSBuffer.concat(bufferedStream.buffer);
-					} else {
-						bufferOrReadableOrStreamOrBufferedStream = bufferedStream;
-					}
-				} else {
-					bufferOrReadableOrStreamOrBufferedStream = peekReadable(bufferOrReadableOrStream, data => VSBuffer.concat(data), 3);
-				}
-			} else {
-				bufferOrReadableOrStreamOrBufferedStream = bufferOrReadableOrStream;
+			if (!bufferOrReadableOrStreamOrBufferedStream) {
+				bufferOrReadableOrStreamOrBufferedStream = await this.peekBufferForWriting(provider, bufferOrReadableOrStream);
 			}
 
 			// write file: unbuffered
@@ -430,7 +418,28 @@ export class FileService extends Disposable implements IFileService {
 		return this.resolve(resource, { resolveMetadata: true });
 	}
 
-	private async validateWriteFile(provider: IFileSystemProvider, resource: URI, options?: IWriteFileOptions): Promise<IStat | undefined> {
+
+	private async peekBufferForWriting(provider: IFileSystemProviderWithFileReadWriteCapability | IFileSystemProviderWithOpenReadWriteCloseCapability, bufferOrReadableOrStream: VSBuffer | VSBufferReadable | VSBufferReadableStream): Promise<VSBuffer | VSBufferReadable | VSBufferReadableStream | VSBufferReadableBufferedStream> {
+		let peekResult: VSBuffer | VSBufferReadable | VSBufferReadableStream | VSBufferReadableBufferedStream;
+		if (hasReadWriteCapability(provider) && !(bufferOrReadableOrStream instanceof VSBuffer)) {
+			if (isReadableStream(bufferOrReadableOrStream)) {
+				const bufferedStream = await peekStream(bufferOrReadableOrStream, 3);
+				if (bufferedStream.ended) {
+					peekResult = VSBuffer.concat(bufferedStream.buffer);
+				} else {
+					peekResult = bufferedStream;
+				}
+			} else {
+				peekResult = peekReadable(bufferOrReadableOrStream, data => VSBuffer.concat(data), 3);
+			}
+		} else {
+			peekResult = bufferOrReadableOrStream;
+		}
+
+		return peekResult;
+	}
+
+	private async validateWriteFile(provider: IFileSystemProviderWithFileReadWriteCapability | IFileSystemProviderWithOpenReadWriteCloseCapability, resource: URI, bufferOrReadableOrStream: VSBuffer | VSBufferReadable | VSBufferReadableStream, options?: IWriteFileOptions): Promise<{ stat: IStat | undefined; buffer: VSBuffer | VSBufferReadable | VSBufferReadableStream | VSBufferReadableBufferedStream | undefined }> {
 
 		// Validate unlock support
 		const unlock = !!options?.unlock;
@@ -459,7 +468,7 @@ export class FileService extends Disposable implements IFileService {
 		try {
 			stat = await provider.stat(resource);
 		} catch (error) {
-			return undefined; // file might not exist
+			return Object.create(null); // file might not exist
 		}
 
 		// File cannot be directory
@@ -482,15 +491,32 @@ export class FileService extends Disposable implements IFileService {
 		// check for size is a weaker check because it can return a false negative if the file has changed
 		// but to the same length. This is a compromise we take to avoid having to produce checksums of
 		// the file content for comparison which would be much slower to compute.
+		//
+		// Third, if the etag() turns out to be different, we do one attempt to compare the buffer we
+		// are about to write with the contents on disk to figure out if the contents are identical.
+		// In that case we allow the writing as it would result in the same contents in the file.
+		let buffer: VSBuffer | VSBufferReadable | VSBufferReadableStream | VSBufferReadableBufferedStream | undefined;
 		if (
 			typeof options?.mtime === 'number' && typeof options.etag === 'string' && options.etag !== ETAG_DISABLED &&
 			typeof stat.mtime === 'number' && typeof stat.size === 'number' &&
 			options.mtime < stat.mtime && options.etag !== etag({ mtime: options.mtime /* not using stat.mtime for a reason, see above */, size: stat.size })
 		) {
+			buffer = await this.peekBufferForWriting(provider, bufferOrReadableOrStream);
+			if (buffer instanceof VSBuffer && buffer.byteLength === stat.size) {
+				try {
+					const { value } = await this.readFile(resource);
+					if (buffer.equals(value)) {
+						return { stat, buffer }; // allow writing since contents are identical
+					}
+				} catch (error) {
+					// ignore, throw the FILE_MODIFIED_SINCE error
+				}
+			}
+
 			throw new FileOperationError(localize('fileModifiedError', "File Modified Since"), FileOperationResult.FILE_MODIFIED_SINCE, options);
 		}
 
-		return stat;
+		return { stat, buffer };
 	}
 
 	async readFile(resource: URI, options?: IReadFileOptions, token?: CancellationToken): Promise<IFileContent> {
diff --git a/src/vs/platform/files/test/node/diskFileService.integrationTest.ts b/src/vs/platform/files/test/node/diskFileService.integrationTest.ts
index 38d1af9be8f7..555eb780087d 100644
--- a/src/vs/platform/files/test/node/diskFileService.integrationTest.ts
+++ b/src/vs/platform/files/test/node/diskFileService.integrationTest.ts
@@ -2406,6 +2406,46 @@ flakySuite('Disk File Service', function () {
 		assert.ok(!error);
 	});
 
+	test('writeFile - no error when writing to file where content is the same', async () => {
+		const resource = URI.file(join(testDir, 'small.txt'));
+
+		await service.resolve(resource);
+
+		const content = readFileSync(resource.fsPath).toString();
+		assert.strictEqual(content, 'Small File');
+
+		const newContent = content; // same content
+		let error: FileOperationError | undefined = undefined;
+		try {
+			await service.writeFile(resource, VSBuffer.fromString(newContent), { etag: 'anything', mtime: 0 } /* fake it */);
+		} catch (err) {
+			error = err;
+		}
+
+		assert.ok(!error);
+	});
+
+	test('writeFile - error when writing to file where content is the same length but different', async () => {
+		const resource = URI.file(join(testDir, 'small.txt'));
+
+		await service.resolve(resource);
+
+		const content = readFileSync(resource.fsPath).toString();
+		assert.strictEqual(content, 'Small File');
+
+		const newContent = content.split('').reverse().join(''); // reverse content
+		let error: FileOperationError | undefined = undefined;
+		try {
+			await service.writeFile(resource, VSBuffer.fromString(newContent), { etag: 'anything', mtime: 0 } /* fake it */);
+		} catch (err) {
+			error = err;
+		}
+
+		assert.ok(error);
+		assert.ok(error instanceof FileOperationError);
+		assert.strictEqual(error.fileOperationResult, FileOperationResult.FILE_MODIFIED_SINCE);
+	});
+
 	test('writeFile - no error when writing to same nonexistent folder multiple times different new files', async () => {
 		const newFolder = URI.file(join(testDir, 'some', 'new', 'folder'));
 

From 6b903962b47c5fa31cdc5a6ac805ce1888d870d7 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Fri, 21 Feb 2025 10:13:30 +0100
Subject: [PATCH 0211/1815] Removing 'Bulk Edit Pane' telemetry (#241444)

removing telemtry
---
 .../contrib/bulkEdit/browser/preview/bulkEditPane.ts        | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
index 20566aac91b3..d5e6865ba916 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
@@ -101,12 +101,6 @@ export class BulkEditPane extends ViewPane {
 		this._ctxHasCategories = BulkEditPane.ctxHasCategories.bindTo(contextKeyService);
 		this._ctxGroupByFile = BulkEditPane.ctxGroupByFile.bindTo(contextKeyService);
 		this._ctxHasCheckedChanges = BulkEditPane.ctxHasCheckedChanges.bindTo(contextKeyService);
-		// telemetry
-		type BulkEditPaneOpened = {
-			owner: 'aiday-mar';
-			comment: 'Report when the bulk edit pane has been opened';
-		};
-		this.telemetryService.publicLog2<{}, BulkEditPaneOpened>('views.bulkEditPane');
 	}
 
 	override dispose(): void {

From 8b6202a9d5b4aa2ead90ca6e97ebe1f34f2125f1 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 21 Feb 2025 10:36:40 +0100
Subject: [PATCH 0212/1815] chat - clean up copilot menu (#241446)

---
 .../workbench/browser/actions/helpActions.ts  | 30 +++++++++++++++++++
 .../chat/browser/actions/chatActions.ts       |  1 -
 .../browser/actions/chatContextActions.ts     | 19 +-----------
 3 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/vs/workbench/browser/actions/helpActions.ts b/src/vs/workbench/browser/actions/helpActions.ts
index 3a366903e8af..efda59bfc12f 100644
--- a/src/vs/workbench/browser/actions/helpActions.ts
+++ b/src/vs/workbench/browser/actions/helpActions.ts
@@ -309,7 +309,9 @@ class OpenPrivacyStatementUrlAction extends Action2 {
 }
 
 class GetStartedWithAccessibilityFeatures extends Action2 {
+
 	static readonly ID = 'workbench.action.getStartedWithAccessibilityFeatures';
+
 	constructor() {
 		super({
 			id: GetStartedWithAccessibilityFeatures.ID,
@@ -329,6 +331,30 @@ class GetStartedWithAccessibilityFeatures extends Action2 {
 	}
 }
 
+class GetStartedWithCopilot extends Action2 {
+
+	static readonly ID = 'workbench.action.getStartedWithCopilot';
+	static readonly AVAILABE = !!product.defaultChatAgent?.documentationUrl;
+
+	constructor() {
+		super({
+			id: GetStartedWithCopilot.ID,
+			title: localize2('getStartedWithCopilot', 'Get Started with Copilot'),
+			category: Categories.Help,
+			f1: true,
+			menu: {
+				id: MenuId.MenubarHelpMenu,
+				group: '1_welcome',
+				order: 7
+			}
+		});
+	}
+	run(accessor: ServicesAccessor): void {
+		const openerService = accessor.get(IOpenerService);
+		openerService.open(URI.parse(product.defaultChatAgent!.documentationUrl));
+	}
+}
+
 // --- Actions Registration
 
 if (KeybindingsReferenceAction.AVAILABLE) {
@@ -368,3 +394,7 @@ if (OpenPrivacyStatementUrlAction.AVAILABE) {
 }
 
 registerAction2(GetStartedWithAccessibilityFeatures);
+
+if (GetStartedWithCopilot.AVAILABE) {
+	registerAction2(GetStartedWithCopilot);
+}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index fff8f932e20b..241c10e9b679 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -489,7 +489,6 @@ export function registerChatActions() {
 	const nonEnterpriseCopilotUsers = ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.notEquals(`config.${defaultChat.providerSetting}`, defaultChat.enterpriseProviderId));
 	registerOpenLinkAction('workbench.action.chat.managePlan', localize2('managePlan', "Manage Copilot Plan"), defaultChat.managePlanUrl, 1, nonEnterpriseCopilotUsers);
 	registerOpenLinkAction('workbench.action.chat.manageSettings', localize2('manageSettings', "Manage Copilot Settings"), defaultChat.manageSettingsUrl, 2, nonEnterpriseCopilotUsers);
-	registerOpenLinkAction('workbench.action.chat.learnMore', localize2('learnMore', "Learn More"), defaultChat.documentationUrl, 3);
 
 	registerAction2(class ShowExtensionsUsingCopilot extends Action2 {
 
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index 4a54574306ce..e4a2b453b16e 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -284,10 +284,6 @@ class AttachFileToChatAction extends AttachFileAction {
 			f1: false,
 			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.or(ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID), TextCompareEditorActiveContext)),
 			menu: [{
-				id: MenuId.ChatTitleBarMenu,
-				group: 'b_chat_context',
-				order: 15,
-			}, {
 				id: MenuId.SearchContext,
 				group: 'z_chat',
 				order: 1
@@ -320,10 +316,6 @@ class AttachSelectionToChatAction extends Action2 {
 			f1: false,
 			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.or(ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID), TextCompareEditorActiveContext)),
 			menu: [{
-				id: MenuId.ChatTitleBarMenu,
-				group: 'b_chat_context',
-				order: 10,
-			}, {
 				id: MenuId.SearchContext,
 				group: 'z_chat',
 				order: 2
@@ -385,10 +377,6 @@ class AttachFileToEditingSessionAction extends AttachFileAction {
 			f1: false,
 			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.or(ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID), TextCompareEditorActiveContext)),
 			menu: [{
-				id: MenuId.ChatTitleBarMenu,
-				group: 'c_edits_context',
-				order: 15,
-			}, {
 				id: MenuId.SearchContext,
 				group: 'z_chat',
 				order: 2
@@ -419,12 +407,7 @@ class AttachSelectionToEditingSessionAction extends Action2 {
 			title: localize2('workbench.action.edits.attachSelection.label', "Add Selection to {0}", 'Copilot Edits'),
 			category: CHAT_CATEGORY,
 			f1: false,
-			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.or(ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID), TextCompareEditorActiveContext)),
-			menu: {
-				id: MenuId.ChatTitleBarMenu,
-				group: 'c_edits_context',
-				order: 10,
-			}
+			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.or(ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID), TextCompareEditorActiveContext))
 		});
 	}
 

From 4edf8d685b8b69ba2d0618696b385eb64ed47416 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 21 Feb 2025 10:46:13 +0100
Subject: [PATCH 0213/1815] encoding - add a test that simulates saving a
 document with different encoding (#241448)

* encoding - add a test that simulates saving a document with different encoding

* update pointer to issue
---
 .../src/singlefolder-tests/workspace.test.ts   | 18 ++++++++++++++++++
 .../vscode.proposed.textDocumentEncoding.d.ts  |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

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 501efe7e2301..b75235f4473a 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
@@ -1480,4 +1480,22 @@ suite('vscode API - workspace', () => {
 		}
 		return true;
 	}
+
+	test('encoding: save text document with a different encoding', async () => {
+		const originalText = 'Hellö\nWörld';
+		const uri = await createRandomFile(originalText);
+
+		let doc = await vscode.workspace.openTextDocument(uri);
+		assert.strictEqual(doc.encoding, 'utf8');
+
+		const text = doc.getText();
+		assert.strictEqual(text, originalText);
+		const buf = await vscode.workspace.encode(text, uri, { encoding: 'windows1252' });
+		await vscode.workspace.fs.writeFile(uri, buf);
+
+		doc = await vscode.workspace.openTextDocument(uri, { encoding: 'windows1252' });
+		assert.strictEqual(doc.encoding, 'windows1252');
+		const updatedText = doc.getText();
+		assert.strictEqual(updatedText, text);
+	});
 });
diff --git a/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts b/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts
index 73ca9341b70a..5a0c99aa207b 100644
--- a/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts
+++ b/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts
@@ -5,7 +5,7 @@
 
 declare module 'vscode' {
 
-	// https://github.com/microsoft/vscode/issues/824
+	// https://github.com/microsoft/vscode/issues/241449
 
 	export interface TextDocument {
 

From 79e56cb43ab93cfda416c30bd862ed0747ce66e9 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Fri, 21 Feb 2025 21:31:50 +1100
Subject: [PATCH 0214/1815] Create an empty model for each inserted cells
 (#241452)

Create an empty model for each inserted cell
---
 .../chatEditingModifiedNotebookEntry.ts       | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 90e1e0ba706f..b065995f2858 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -95,14 +95,6 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	 */
 	private readonly editedCells = new ResourceSet();
 
-	/**
-	 * When a new cell is inserted, we use the ChatEditingCodeEditorIntegration to handle the edits.
-	 * & to also display undo/redo and decorations.
-	 * However that needs a modified and original model.
-	 * For inserted cells there's no original model, so we create a new empty text model and pass that as the original.
-	 */
-	private readonly emptyTextModel: ITextModel;
-
 	public static async create(uri: URI, _multiDiffEntryDelegate: { collapse: (transaction: ITransaction | undefined) => void }, telemetryInfo: IModifiedEntryTelemetryInfo, chatKind: ChatEditKind, initialContent: string | undefined, instantiationService: IInstantiationService): Promise<AbstractChatEditingModifiedFileEntry> {
 		return instantiationService.invokeFunction(async accessor => {
 			const notebookService = accessor.get(INotebookService);
@@ -154,7 +146,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		@IFileService fileService: IFileService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ITextModelService private readonly textModelService: ITextModelService,
-		@IModelService model: IModelService,
+		@IModelService private readonly modelService: IModelService,
 	) {
 		super(modifiedResourceRef.object.notebook.uri, telemetryInfo, kind, configurationService, fileConfigService, chatService, fileService, instantiationService);
 		this._register(modifiedResourceRef);
@@ -171,7 +163,6 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			this.modifiedToOriginalCellMap.set(cell.uri, originalModel);
 			this.getOrCreateModifiedTextFileEntryForCell(cell);
 		});
-		this.emptyTextModel = this._register(model.createModel('', null, URI.parse('vscode-chat:///empty')));
 	}
 
 	createEmptyDiffs() {
@@ -185,8 +176,8 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			...nullDocumentDiff,
 			keep: noopKeep,
 			undo: noopUndo,
-			originalModel: this.modifiedToOriginalCellMap.get(cell.uri) || this.emptyTextModel,
-			modifiedModel: this.modifiedCellModels.get(cell.uri) || this.emptyTextModel,
+			originalModel: this.modifiedToOriginalCellMap.get(cell.uri)!,
+			modifiedModel: this.modifiedCellModels.get(cell.uri)!,
 		};
 	}
 
@@ -336,7 +327,11 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				const changes = [new DetailedLineRangeMapping(new LineRange(1, 1), new LineRange(1, lines.length), [innerChanges])];
 				const cell = this.modifiedModel.cells[edit.index + i];
 				const modifiedModel: ITextModel = cell.textModel ?? this._register((await this.textModelService.createModelReference(cell.uri))).object.textEditorModel;
-				const originalModel = this.emptyTextModel;
+				// When a new cell is inserted, we use the ChatEditingCodeEditorIntegration to handle the edits.
+				// & to also display undo/redo and decorations.
+				// However that needs a modified and original model.
+				// For inserted cells there's no original model, so we create a new empty text model and pass that as the original.
+				const originalModel = this._register(this.modelService.createModel('', null, URI.parse('vscode-chat:///empty')));
 				this.modifiedCellModels.set(cell.uri, modifiedModel);
 				this.modifiedToOriginalCellMap.set(cell.uri, originalModel);
 				const keep = async () => {

From 084875914a89b07a1d0e93375f597d40e6a2d899 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Fri, 21 Feb 2025 11:32:57 +0100
Subject: [PATCH 0215/1815] Make all widgets clickable and align (#241453)

---
 src/vs/editor/browser/observableCodeEditor.ts |  6 ++---
 .../browser/view/ghostText/ghostTextView.ts   | 18 ++++++-------
 .../view/inlineEdits/inlineEditsView.ts       | 22 +++++++++++++---
 .../inlineEdits/inlineEditsViewInterface.ts   |  3 +++
 .../inlineEditsDeletionView.ts                |  5 ++++
 .../inlineEditsInsertionView.ts               |  9 +++++--
 .../inlineEditsLineReplacementView.ts         | 26 ++++++++++++++++---
 .../inlineEditsSideBySideView.ts              |  9 +++++--
 .../inlineEditsWordInsertView.ts              |  6 +++++
 .../inlineEditsWordReplacementView.ts         |  9 +++++--
 .../originalEditorInlineDiffView.ts           | 13 ++++++----
 11 files changed, 96 insertions(+), 30 deletions(-)

diff --git a/src/vs/editor/browser/observableCodeEditor.ts b/src/vs/editor/browser/observableCodeEditor.ts
index d7093a0de5c8..eb5172693cef 100644
--- a/src/vs/editor/browser/observableCodeEditor.ts
+++ b/src/vs/editor/browser/observableCodeEditor.ts
@@ -14,7 +14,7 @@ import { Selection } from '../common/core/selection.js';
 import { ICursorSelectionChangedEvent } from '../common/cursorEvents.js';
 import { IModelDeltaDecoration, ITextModel } from '../common/model.js';
 import { IModelContentChangedEvent } from '../common/textModelEvents.js';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition, IMouseTarget, IOverlayWidget, IOverlayWidgetPosition, IPasteEvent } from './editorBrowser.js';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition, IEditorMouseEvent, IOverlayWidget, IOverlayWidgetPosition, IPasteEvent } from './editorBrowser.js';
 import { Point } from './point.js';
 
 /**
@@ -356,10 +356,10 @@ export class ObservableCodeEditor extends Disposable {
 
 	public readonly openedPeekWidgets = observableValue(this, 0);
 
-	isTargetHovered(predicate: (target: IMouseTarget) => boolean, store: DisposableStore): IObservable<boolean> {
+	isTargetHovered(predicate: (target: IEditorMouseEvent) => boolean, store: DisposableStore): IObservable<boolean> {
 		const isHovered = observableValue('isInjectedTextHovered', false);
 		store.add(this.editor.onMouseMove(e => {
-			const val = predicate(e.target);
+			const val = predicate(e);
 			isHovered.set(val, undefined);
 		}));
 
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 1960bd5326c8..fb04686f119f 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
@@ -28,8 +28,9 @@ import { RenderLineInput, renderViewLine } from '../../../../../common/viewLayou
 import { InlineDecorationType } from '../../../../../common/viewModel.js';
 import { GhostText, GhostTextReplacement, IGhostTextLine } from '../../model/ghostText.js';
 import { ColumnRange } from '../../utils.js';
-import { addDisposableListener, isHTMLElement, n } from '../../../../../../base/browser/dom.js';
+import { addDisposableListener, getWindow, isHTMLElement, n } from '../../../../../../base/browser/dom.js';
 import './ghostTextView.css';
+import { IMouseEvent, StandardMouseEvent } from '../../../../../../base/browser/mouseEvent.js';
 
 export interface IGhostTextWidgetModel {
 	readonly targetTextModel: IObservable<ITextModel | undefined>;
@@ -54,7 +55,7 @@ export class GhostTextView extends Disposable {
 		return { lineNumber: gt.lineNumber, position: new Position(gt.lineNumber, gt.parts[0].column), icon: warning.icon };
 	});
 
-	private readonly _onDidClick = this._register(new Emitter<void>());
+	private readonly _onDidClick = this._register(new Emitter<IMouseEvent>());
 	public readonly onDidClick = this._onDidClick.event;
 
 	constructor(
@@ -74,15 +75,14 @@ export class GhostTextView extends Disposable {
 		this._register(this._editorObs.setDecorations(this.decorations));
 
 		if (this._isClickable) {
-			this._register(this._additionalLinesWidget.onDidClick(() => this._onDidClick.fire()));
+			this._register(this._additionalLinesWidget.onDidClick((e) => this._onDidClick.fire(e)));
 			this._register(this._editor.onMouseUp(e => {
 				if (e.target.type !== MouseTargetType.CONTENT_TEXT) {
 					return;
 				}
 				const a = e.target.detail.injectedText?.options.attachedData;
 				if (a instanceof GhostTextAttachedData) {
-					this._onDidClick.fire();
-					e.event.preventDefault();
+					this._onDidClick.fire(e.event);
 				}
 			}));
 		}
@@ -255,7 +255,7 @@ export class GhostTextView extends Disposable {
 	);
 
 	private readonly _isInlineTextHovered = this._editorObs.isTargetHovered(
-		p => p.type === MouseTargetType.CONTENT_TEXT && p.detail.injectedText?.options.attachedData instanceof GhostTextAttachedData,
+		p => p.target.type === MouseTargetType.CONTENT_TEXT && p.target.detail.injectedText?.options.attachedData instanceof GhostTextAttachedData,
 		this._store
 	);
 
@@ -367,13 +367,13 @@ export class AdditionalLinesWidget extends Disposable {
 			|| e.hasChanged(EditorOption.lineHeight)
 	));
 
-	private readonly _onDidClick = this._register(new Emitter<void>());
+	private readonly _onDidClick = this._register(new Emitter<IMouseEvent>());
 	public readonly onDidClick = this._onDidClick.event;
 
 	private readonly _viewZoneListener = this._register(new MutableDisposable());
 
 	readonly isHovered = observableCodeEditor(this._editor).isTargetHovered(
-		p => isTargetGhostText(p.element),
+		p => isTargetGhostText(p.target.element),
 		this._store
 	);
 
@@ -437,7 +437,7 @@ export class AdditionalLinesWidget extends Disposable {
 				if (this._isClickable) {
 					store.add(addDisposableListener(domNode, 'mouseup', (e) => {
 						if (isTargetGhostText(e.target)) {
-							this._onDidClick.fire();
+							this._onDidClick.fire(new StandardMouseEvent(getWindow(e), e));
 						}
 					}));
 				}
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 0dc7b4d13746..fc6e425aeb3c 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
@@ -3,8 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Event } from '../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { derived, derivedObservableWithCache, derivedWithStore, IObservable, IReader, ISettableObservable, mapObservableArrayCached } from '../../../../../../base/common/observable.js';
+import { autorunWithStore, derived, derivedObservableWithCache, derivedWithStore, IObservable, IReader, ISettableObservable, mapObservableArrayCached } from '../../../../../../base/common/observable.js';
 import { localize } from '../../../../../../nls.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { ICodeEditor } from '../../../../../browser/editorBrowser.js';
@@ -56,6 +57,22 @@ export class InlineEditsView extends Disposable {
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
 		super();
+
+		this._register(autorunWithStore((reader, store) => {
+			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,
+				)(e => {
+					e.preventDefault();
+					this._host.accept();
+				})
+			);
+		}));
 	}
 
 	private readonly _uiState = derived<{
@@ -197,7 +214,7 @@ export class InlineEditsView extends Disposable {
 		};
 	});
 
-	protected readonly _inlineDiffView = this._register(new OriginalEditorInlineDiffView(this._editor, this._inlineDiffViewState, this._previewTextModel, this._host));
+	protected readonly _inlineDiffView = this._register(new OriginalEditorInlineDiffView(this._editor, this._inlineDiffViewState, this._previewTextModel));
 
 	protected readonly _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, [e], this._host));
@@ -223,7 +240,6 @@ export class InlineEditsView extends Disposable {
 			|| this._inlineDiffView.isHovered.read(reader)
 			|| this._lineReplacementView.isHovered.read(reader)
 			|| this._insertion.isHovered.read(reader);
-
 	});
 
 	private readonly _gutterIndicatorOffset = derived<number>(this, reader => {
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 7ff746f47f22..2384ab3ac873 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,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { IMouseEvent } from '../../../../../../base/browser/mouseEvent.js';
+import { Event } from '../../../../../../base/common/event.js';
 import { IObservable } from '../../../../../../base/common/observable.js';
 import { Command } from '../../../../../common/languages.js';
 import { InlineEditTabAction } from './utils/utils.js';
 
 export interface IInlineEditsView {
 	isHovered: IObservable<boolean>;
+	onDidClick: Event<IMouseEvent>;
 }
 
 export interface IInlineEditsViewHost {
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 a0d6b6caff08..f8c6bcf39345 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,6 +3,8 @@
  *  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, derivedObservableWithCache, IObservable } from '../../../../../../../base/common/observable.js';
 import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
@@ -20,6 +22,9 @@ import { createRectangle, getPrefixTrim, mapOutFalsy, maxContentWidthInRange } f
 export class InlineEditsDeletionView extends Disposable implements IInlineEditsView {
 	private readonly _editorObs = observableCodeEditor(this._editor);
 
+	private readonly _onDidClick = this._register(new Emitter<IMouseEvent>());
+	readonly onDidClick = this._onDidClick.event;
+
 	constructor(
 		private readonly _editor: ICodeEditor,
 		private readonly _edit: IObservable<InlineEditWithChanges | undefined>,
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 3d33ebca2db1..494210fa6c7f 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,6 +3,8 @@
  *  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, derivedWithStore, IObservable, observableValue } from '../../../../../../../base/common/observable.js';
 import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
@@ -28,6 +30,9 @@ import { createRectangle, getPrefixTrim, mapOutFalsy } from '../utils/utils.js';
 export class InlineEditsInsertionView extends Disposable implements IInlineEditsView {
 	private readonly _editorObs = observableCodeEditor(this._editor);
 
+	private readonly _onDidClick = this._register(new Emitter<IMouseEvent>());
+	readonly onDidClick = this._onDidClick.event;
+
 	private readonly _state = derived(this, reader => {
 		const state = this._input.read(reader);
 		if (!state) { return undefined; }
@@ -107,8 +112,8 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 	) {
 		super();
 
-		this._register(this._ghostTextView.onDidClick(() => {
-			this._host.accept();
+		this._register(this._ghostTextView.onDidClick((e) => {
+			this._onDidClick.fire(e);
 		}));
 
 		this._register(this._editorObs.createOverlayWidget({
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 e1279376dee1..d952cda8a05b 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,13 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { $, n } from '../../../../../../../base/browser/dom.js';
+import { $, getWindow, n } from '../../../../../../../base/browser/dom.js';
+import { IMouseEvent, StandardMouseEvent } from '../../../../../../../base/browser/mouseEvent.js';
+import { Emitter } from '../../../../../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../../../../../base/common/lifecycle.js';
 import { autorun, autorunDelta, constObservable, derived, IObservable } from '../../../../../../../base/common/observable.js';
 import { editorBackground, scrollbarShadow } from '../../../../../../../platform/theme/common/colorRegistry.js';
 import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
-import { IViewZoneChangeAccessor } from '../../../../../../browser/editorBrowser.js';
+import { IEditorMouseEvent, IViewZoneChangeAccessor } from '../../../../../../browser/editorBrowser.js';
+import { EditorMouseEvent } from '../../../../../../browser/editorDom.js';
 import { ObservableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
+import { Point } from '../../../../../../browser/point.js';
 import { Rect } from '../../../../../../browser/rect.js';
 import { LineSource, renderLines, RenderOptions } from '../../../../../../browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
@@ -28,6 +32,9 @@ import { rangesToBubbleRanges, Replacement } from './inlineEditsWordReplacementV
 
 export class InlineEditsLineReplacementView extends Disposable implements IInlineEditsView {
 
+	private readonly _onDidClick = this._register(new Emitter<IMouseEvent>());
+	readonly onDidClick = this._onDidClick.event;
+
 	private readonly _originalBubblesDecorationCollection = this._editor.editor.createDecorationsCollection();
 	private readonly _originalBubblesDecorationOptions: IModelDecorationOptions = {
 		description: 'inlineCompletions-original-bubble',
@@ -223,8 +230,10 @@ export class InlineEditsLineReplacementView extends Disposable implements IInlin
 							boxShadow: `${asCssVariable(scrollbarShadow)} 0 6px 6px -6px`,
 							borderTop: `1px solid ${modifiedBorderColor}`,
 							overflow: 'hidden',
+							cursor: 'pointer',
+							pointerEvents: 'auto',
 						},
-						//onmouseup: () => this._host.accept(),
+						onmouseup: (e) => this._onDidClick.fire(new StandardMouseEvent(getWindow(e), e)),
 					}, [
 						n.div({
 							style: {
@@ -265,7 +274,7 @@ export class InlineEditsLineReplacementView extends Disposable implements IInlin
 		})
 	]).keepUpdated(this._store);
 
-	readonly isHovered = this._div.didMouseMoveDuringHover;
+	readonly isHovered = this._editor.isTargetHovered((e) => this._isMouseOverWidget(e), this._store);
 
 	constructor(
 		private readonly _editor: ObservableCodeEditor,
@@ -313,6 +322,15 @@ export class InlineEditsLineReplacementView extends Disposable implements IInlin
 		}));
 	}
 
+	private _isMouseOverWidget(e: IEditorMouseEvent): boolean {
+		const layout = this._layout.get();
+		if (!layout || !(e.event instanceof EditorMouseEvent)) {
+			return false;
+		}
+
+		return layout.lowerBackground.containsPoint(new Point(e.event.relativePos.x, e.event.relativePos.y));
+	}
+
 	// View Zones
 	private _previousViewZoneInfo: { height: number; lineNumber: number; id: string } | undefined = undefined;
 
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 dcd987f2cd01..12648f46114c 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,7 +3,9 @@
  *  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';
@@ -50,6 +52,9 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 
 	private readonly _editorObs = observableCodeEditor(this._editor);
 
+	private readonly _onDidClick = this._register(new Emitter<IMouseEvent>());
+	readonly onDidClick = this._onDidClick.event;
+
 	constructor(
 		private readonly _editor: ICodeEditor,
 		private readonly _edit: IObservable<InlineEditWithChanges | undefined>,
@@ -120,8 +125,8 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 	private readonly _editorContainer = n.div({
 		class: ['editorContainer', this._editorObs.getOption(EditorOption.inlineSuggest).map(v => !v.edits.useGutterIndicator && 'showHover')],
 		style: { position: 'absolute', overflow: 'hidden', cursor: 'pointer' },
-		onclick: () => {
-			this._host.accept();
+		onclick: (e) => {
+			this._onDidClick.fire(new StandardMouseEvent(getWindow(e), e));
 		}
 	}, [
 		n.div({ class: 'preview', style: { pointerEvents: 'none' }, ref: this.previewRef }),
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 dcd1747fd577..d3ee68c60cc3 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,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 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 } from '../../../../../../../base/common/observable.js';
 import { ObservableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
@@ -17,6 +19,10 @@ import { getModifiedBorderColor } from '../theme.js';
 import { InlineEditTabAction, mapOutFalsy, rectToProps } from '../utils/utils.js';
 
 export class InlineEditsWordInsertView extends Disposable implements IInlineEditsView {
+
+	private readonly _onDidClick = this._register(new Emitter<IMouseEvent>());
+	readonly onDidClick = this._onDidClick.event;
+
 	private readonly _start = this._editor.observePosition(constObservable(this._edit.range.getStartPosition()), this._store);
 
 	private readonly _layout = derived(this, reader => {
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 c948e0097ffe..6303d7955811 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,7 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { n, ObserverNodeWithElement } from '../../../../../../../base/browser/dom.js';
+import { getWindow, n, ObserverNodeWithElement } from '../../../../../../../base/browser/dom.js';
+import { IMouseEvent, StandardMouseEvent } from '../../../../../../../base/browser/mouseEvent.js';
+import { Emitter } from '../../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../../base/common/lifecycle.js';
 import { constObservable, derived, observableValue } from '../../../../../../../base/common/observable.js';
 import { editorBackground, editorHoverForeground, scrollbarShadow } from '../../../../../../../platform/theme/common/colorRegistry.js';
@@ -28,6 +30,9 @@ export class InlineEditsWordReplacementView extends Disposable implements IInlin
 
 	public static MAX_LENGTH = 100;
 
+	private readonly _onDidClick = this._register(new Emitter<IMouseEvent>());
+	readonly onDidClick = this._onDidClick.event;
+
 	private readonly _start = this._editor.observePosition(constObservable(this._edit.range.getStartPosition()), this._store);
 	private readonly _end = this._editor.observePosition(constObservable(this._edit.range.getEndPosition()), this._store);
 
@@ -181,7 +186,7 @@ export class InlineEditsWordReplacementView extends Disposable implements IInlin
 							cursor: 'pointer',
 							pointerEvents: 'auto',
 						},
-						onmouseup: () => this._host.accept(),
+						onmouseup: (e) => this._onDidClick.fire(new StandardMouseEvent(getWindow(e), e)),
 						obsRef: (elem) => {
 							this._hoverableElement.set(elem, undefined);
 						}
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 903ae1338791..414f455553d7 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,6 +3,8 @@
  *  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';
 import { ICodeEditor, MouseTargetType } from '../../../../../../browser/editorBrowser.js';
@@ -19,7 +21,7 @@ import { DetailedLineRangeMapping } from '../../../../../../common/diff/rangeMap
 import { EndOfLinePreference, IModelDeltaDecoration, InjectedTextCursorStops, ITextModel } from '../../../../../../common/model.js';
 import { ModelDecorationOptions } from '../../../../../../common/model/textModel.js';
 import { InlineDecoration, InlineDecorationType } from '../../../../../../common/viewModel.js';
-import { IInlineEditsView, IInlineEditsViewHost } from '../inlineEditsViewInterface.js';
+import { IInlineEditsView } from '../inlineEditsViewInterface.js';
 import { classNames } from '../utils/utils.js';
 
 export interface IOriginalEditorInlineDiffViewState {
@@ -35,8 +37,11 @@ export class OriginalEditorInlineDiffView extends Disposable implements IInlineE
 		return allowsTrueInlineDiffRendering(mapping);
 	}
 
+	private readonly _onDidClick = this._register(new Emitter<IMouseEvent>());
+	readonly onDidClick = this._onDidClick.event;
+
 	readonly isHovered = observableCodeEditor(this._originalEditor).isTargetHovered(
-		p => p.type === MouseTargetType.CONTENT_TEXT && p.detail.injectedText?.options.attachedData instanceof InlineEditAttachedData,
+		p => p.target.type === MouseTargetType.CONTENT_TEXT && p.target.detail.injectedText?.options.attachedData instanceof InlineEditAttachedData,
 		this._store
 	);
 
@@ -46,7 +51,6 @@ export class OriginalEditorInlineDiffView extends Disposable implements IInlineE
 		private readonly _originalEditor: ICodeEditor,
 		private readonly _state: IObservable<IOriginalEditorInlineDiffViewState | undefined>,
 		private readonly _modifiedTextModel: ITextModel,
-		private readonly _host: IInlineEditsViewHost,
 	) {
 		super();
 
@@ -68,8 +72,7 @@ export class OriginalEditorInlineDiffView extends Disposable implements IInlineE
 			}
 			const a = e.target.detail.injectedText?.options.attachedData;
 			if (a instanceof InlineEditAttachedData) {
-				this._host.accept();
-				e.event.preventDefault();
+				this._onDidClick.fire(e.event);
 			}
 		}));
 

From 8c1d5674c7c345c9c0663a15ab34d83847df2a2d Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Fri, 21 Feb 2025 21:41:50 +1100
Subject: [PATCH 0216/1815] Remove unwanted metrics (#241455)

---
 .../browser/parameterHintsWidget.ts           | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts b/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
index 67334742dad8..ef3cd7d78ccf 100644
--- a/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
+++ b/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
@@ -26,8 +26,6 @@ import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { listHighlightForeground, registerColor } from '../../../../platform/theme/common/colorRegistry.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-import { StopWatch } from '../../../../base/common/stopwatch.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 
 const $ = dom.$;
 
@@ -62,8 +60,7 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
 		private readonly model: ParameterHintsModel,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IOpenerService openerService: IOpenerService,
-		@ILanguageService languageService: ILanguageService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@ILanguageService languageService: ILanguageService
 	) {
 		super();
 
@@ -275,30 +272,12 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
 	}
 
 	private renderMarkdownDocs(markdown: IMarkdownString | undefined): IMarkdownRenderResult {
-		const stopWatch = new StopWatch();
 		const renderedContents = this.renderDisposeables.add(this.markdownRenderer.render(markdown, {
 			asyncRenderCallback: () => {
 				this.domNodes?.scrollbar.scanDomNode();
 			}
 		}));
 		renderedContents.element.classList.add('markdown-docs');
-
-		type RenderMarkdownPerformanceClassification = {
-			owner: 'donjayamanne';
-			comment: 'Measure the time taken to render markdown for parameter hints';
-			renderDuration: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Time in ms to render the markdown' };
-		};
-
-		type RenderMarkdownPerformanceEvent = {
-			renderDuration: number;
-		};
-		const renderDuration = stopWatch.elapsed();
-		if (renderDuration > 300) {
-			this.telemetryService.publicLog2<RenderMarkdownPerformanceEvent, RenderMarkdownPerformanceClassification>('parameterHints.parseMarkdown', {
-				renderDuration
-			});
-		}
-
 		return renderedContents;
 	}
 

From 9134c55d4502e5d897064aa415e3953ea5bc2443 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Fri, 21 Feb 2025 11:52:54 +0100
Subject: [PATCH 0217/1815] vscode.comments API has a bug that multiplies
 comments when changing CommentMode (#241457)

Fixes #239191
---
 .../workbench/contrib/comments/browser/commentThreadBody.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadBody.ts b/src/vs/workbench/contrib/comments/browser/commentThreadBody.ts
index 035b88131fe7..7daa727eddcd 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadBody.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadBody.ts
@@ -204,6 +204,8 @@ export class CommentThreadBody<T extends IRange | ICellRange = IRange> extends D
 		let lastCommentElement: HTMLElement | null = null;
 		const newCommentNodeList: CommentNode<T>[] = [];
 		const newCommentsInEditMode: CommentNode<T>[] = [];
+		const startEditing: Promise<void>[] = [];
+
 		for (let i = newCommentsLen - 1; i >= 0; i--) {
 			const currentComment = commentThread.comments![i];
 			const oldCommentNode = this._commentElements.filter(commentNode => commentNode.comment.uniqueIdInThread === currentComment.uniqueIdInThread);
@@ -223,7 +225,7 @@ export class CommentThreadBody<T extends IRange | ICellRange = IRange> extends D
 				}
 
 				if (currentComment.mode === languages.CommentMode.Editing) {
-					await newElement.switchToEditMode();
+					startEditing.push(newElement.switchToEditMode());
 					newCommentsInEditMode.push(newElement);
 				}
 			}
@@ -231,6 +233,8 @@ export class CommentThreadBody<T extends IRange | ICellRange = IRange> extends D
 
 		this._commentThread = commentThread;
 		this._commentElements = newCommentNodeList;
+		// Start editing *after* updating the thread and elements to avoid a sequencing issue https://github.com/microsoft/vscode/issues/239191
+		await Promise.all(startEditing);
 
 		if (newCommentsInEditMode.length) {
 			const lastIndex = this._commentElements.indexOf(newCommentsInEditMode[newCommentsInEditMode.length - 1]);

From a3177f65aef78196d1f3eda00dc6dfc4758efa8b Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 21 Feb 2025 11:57:14 +0100
Subject: [PATCH 0218/1815] clear diff rendering when dispose code editor
 integration (#241458)

---
 .../browser/chatEditing/chatEditingCodeEditorIntegration.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
index 19f72730a4ac..de769b9fb747 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
@@ -254,7 +254,7 @@ export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEdito
 
 	private _clear() {
 		this._diffLineDecorations.clear();
-		// this._currentChangeIndex.set(undefined, undefined);
+		this._clearDiffRendering();
 		this._currentIndex.set(-1, undefined);
 	}
 

From 60634f869020a756128646b2a8324d2f13889313 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Fri, 21 Feb 2025 12:10:26 +0100
Subject: [PATCH 0219/1815] Make some more tree sitter typescript fixes
 (#241358)

* Make some more tree sitter typescript fixes
And add a test for https://github.com/microsoft/vscode/issues/241001

* Test should only look at most specific scope, just like is actually done right now.
---
 .../test/colorize-fixtures/test-241001.ts     |   36 +
 .../test/colorize-results/test-241001_ts.json | 3124 +++++++++++++++++
 .../test-241001_ts.json                       | 2144 +++++++++++
 .../test-function-inv_ts.json                 |   22 +-
 .../test-issue11_ts.json                      |  104 +-
 .../test-issue5431_ts.json                    |   32 +-
 .../test-issue5566_ts.json                    |   24 +-
 .../test-keywords_ts.json                     |   14 +-
 .../test-members_ts.json                      |   44 +-
 .../test-strings_ts.json                      |   50 +-
 .../test-this_ts.json                         |    2 +-
 .../colorize-tree-sitter-results/test_ts.json |  646 ++--
 .../languages/highlights/typescript.scm       |   14 +
 .../browser/themes.test.contribution.ts       |    2 +-
 14 files changed, 5788 insertions(+), 470 deletions(-)
 create mode 100644 extensions/vscode-colorize-tests/test/colorize-fixtures/test-241001.ts
 create mode 100644 extensions/vscode-colorize-tests/test/colorize-results/test-241001_ts.json
 create mode 100644 extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json

diff --git a/extensions/vscode-colorize-tests/test/colorize-fixtures/test-241001.ts b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-241001.ts
new file mode 100644
index 000000000000..7405806f14ec
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-241001.ts
@@ -0,0 +1,36 @@
+const n = null;
+const u = undefined;
+const a = true || false;
+type T = null | unknown | undefined | true | false;
+
+function bar(a?: string): string { return '' }
+interface A {
+    b?: 2;
+    a: 1;
+}
+const obj = {
+    a: 1,
+};
+
+const obj1 = {};
+const obj2 = {
+    ...obj1,
+}
+function foo(param: string, ...rest) {}
+
+undefined
+null
+NaN
+Infinity
+
+type One = 'zcxvf';
+
+type Two = 'one' | 'two' & 'three';
+
+const obj = {
+    one: 1
+};
+
+type Rec = Record<string, string>;
+
+new URL('./../../renderer/dist/index.html', import.meta.url);
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
new file mode 100644
index 000000000000..67b874115af3
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-241001_ts.json
@@ -0,0 +1,3124 @@
+[
+	{
+		"c": "const",
+		"t": "source.ts meta.var.expr.ts storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "n",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts",
+		"r": {
+			"dark_plus": "variable.other.constant: #4FC1FF",
+			"light_plus": "variable.other.constant: #0070C1",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_modern": "variable.other.constant: #0070C1"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.var.expr.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "null",
+		"t": "source.ts meta.var.expr.ts constant.language.null.ts",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "source.ts meta.var.expr.ts storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "u",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts",
+		"r": {
+			"dark_plus": "variable.other.constant: #4FC1FF",
+			"light_plus": "variable.other.constant: #0070C1",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_modern": "variable.other.constant: #0070C1"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.var.expr.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "undefined",
+		"t": "source.ts meta.var.expr.ts constant.language.undefined.ts",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "source.ts meta.var.expr.ts storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "a",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts",
+		"r": {
+			"dark_plus": "variable.other.constant: #4FC1FF",
+			"light_plus": "variable.other.constant: #0070C1",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_modern": "variable.other.constant: #0070C1"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.var.expr.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "true",
+		"t": "source.ts meta.var.expr.ts constant.language.boolean.true.ts",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "||",
+		"t": "source.ts meta.var.expr.ts keyword.operator.logical.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "false",
+		"t": "source.ts meta.var.expr.ts constant.language.boolean.false.ts",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "source.ts meta.type.declaration.ts storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "T",
+		"t": "source.ts meta.type.declaration.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "null",
+		"t": "source.ts meta.type.declaration.ts support.type.builtin.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "|",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "unknown",
+		"t": "source.ts meta.type.declaration.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "|",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "undefined",
+		"t": "source.ts meta.type.declaration.ts support.type.builtin.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "|",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "true",
+		"t": "source.ts meta.type.declaration.ts support.type.builtin.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "|",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "false",
+		"t": "source.ts meta.type.declaration.ts support.type.builtin.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "source.ts meta.function.ts storage.type.function.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "bar",
+		"t": "source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "a",
+		"t": "source.ts meta.function.ts meta.parameters.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "?",
+		"t": "source.ts meta.function.ts meta.parameters.ts keyword.operator.optional.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "string",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.return.type.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.return.type.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "string",
+		"t": "source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.return.type.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "source.ts meta.function.ts meta.block.ts keyword.control.flow.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "'",
+		"t": "source.ts meta.function.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts",
+		"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": "source.ts meta.function.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.end.ts",
+		"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": "source.ts meta.function.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "interface",
+		"t": "source.ts meta.interface.ts storage.type.interface.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.interface.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "A",
+		"t": "source.ts meta.interface.ts entity.name.type.interface.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.interface.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.ts meta.interface.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "    ",
+		"t": "source.ts meta.interface.ts meta.field.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "b",
+		"t": "source.ts meta.interface.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "?",
+		"t": "source.ts meta.interface.ts meta.field.declaration.ts keyword.operator.optional.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "2",
+		"t": "source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts constant.numeric.decimal.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts meta.interface.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "    ",
+		"t": "source.ts meta.interface.ts meta.field.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "a",
+		"t": "source.ts meta.interface.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "1",
+		"t": "source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts constant.numeric.decimal.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts meta.interface.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.ts meta.interface.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "source.ts meta.var.expr.ts storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "obj",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts",
+		"r": {
+			"dark_plus": "variable.other.constant: #4FC1FF",
+			"light_plus": "variable.other.constant: #0070C1",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_modern": "variable.other.constant: #0070C1"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.var.expr.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "    ",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "a",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts",
+		"r": {
+			"dark_plus": "meta.object-literal.key: #9CDCFE",
+			"light_plus": "meta.object-literal.key: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "meta.object-literal.key: #9CDCFE",
+			"dark_modern": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_modern": "meta.object-literal.key: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts",
+		"r": {
+			"dark_plus": "meta.object-literal.key: #9CDCFE",
+			"light_plus": "meta.object-literal.key: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "meta.object-literal.key: #9CDCFE",
+			"dark_modern": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_modern": "meta.object-literal.key: #001080"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "1",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts constant.numeric.decimal.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.separator.comma.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "source.ts meta.var.expr.ts storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "obj1",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts",
+		"r": {
+			"dark_plus": "variable.other.constant: #4FC1FF",
+			"light_plus": "variable.other.constant: #0070C1",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_modern": "variable.other.constant: #0070C1"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.var.expr.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{}",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "source.ts meta.var.expr.ts storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "obj2",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts",
+		"r": {
+			"dark_plus": "variable.other.constant: #4FC1FF",
+			"light_plus": "variable.other.constant: #0070C1",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_modern": "variable.other.constant: #0070C1"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.var.expr.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "    ",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "...",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts keyword.operator.spread.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "obj1",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts variable.other.readwrite.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.separator.comma.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "source.ts meta.function.ts storage.type.function.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "foo",
+		"t": "source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "param",
+		"t": "source.ts meta.function.ts meta.parameters.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "string",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "...",
+		"t": "source.ts meta.function.ts meta.parameters.ts keyword.operator.rest.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "rest",
+		"t": "source.ts meta.function.ts meta.parameters.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{}",
+		"t": "source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "undefined",
+		"t": "source.ts constant.language.undefined.ts",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": "null",
+		"t": "source.ts constant.language.null.ts",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": "NaN",
+		"t": "source.ts constant.language.nan.ts",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": "Infinity",
+		"t": "source.ts constant.language.infinity.ts",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": "type",
+		"t": "source.ts meta.type.declaration.ts storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "One",
+		"t": "source.ts meta.type.declaration.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "'",
+		"t": "source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts",
+		"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": "zcxvf",
+		"t": "source.ts meta.type.declaration.ts string.quoted.single.ts",
+		"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": "source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts",
+		"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": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "source.ts meta.type.declaration.ts storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "Two",
+		"t": "source.ts meta.type.declaration.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "'",
+		"t": "source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts",
+		"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": "one",
+		"t": "source.ts meta.type.declaration.ts string.quoted.single.ts",
+		"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": "source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts",
+		"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": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "|",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "'",
+		"t": "source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts",
+		"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": "two",
+		"t": "source.ts meta.type.declaration.ts string.quoted.single.ts",
+		"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": "source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts",
+		"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": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "&",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "'",
+		"t": "source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts",
+		"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": "three",
+		"t": "source.ts meta.type.declaration.ts string.quoted.single.ts",
+		"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": "source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts",
+		"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": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "source.ts meta.var.expr.ts storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "obj",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts",
+		"r": {
+			"dark_plus": "variable.other.constant: #4FC1FF",
+			"light_plus": "variable.other.constant: #0070C1",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_modern": "variable.other.constant: #0070C1"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.var.expr.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "    ",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "one",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts",
+		"r": {
+			"dark_plus": "meta.object-literal.key: #9CDCFE",
+			"light_plus": "meta.object-literal.key: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "meta.object-literal.key: #9CDCFE",
+			"dark_modern": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_modern": "meta.object-literal.key: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts",
+		"r": {
+			"dark_plus": "meta.object-literal.key: #9CDCFE",
+			"light_plus": "meta.object-literal.key: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "meta.object-literal.key: #9CDCFE",
+			"dark_modern": "meta.object-literal.key: #9CDCFE",
+			"hc_light": "meta.object-literal.key: #001080",
+			"light_modern": "meta.object-literal.key: #001080"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "1",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts constant.numeric.decimal.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "source.ts meta.type.declaration.ts storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "Rec",
+		"t": "source.ts meta.type.declaration.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "Record",
+		"t": "source.ts meta.type.declaration.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "<",
+		"t": "source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "string",
+		"t": "source.ts meta.type.declaration.ts meta.type.parameters.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.separator.comma.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts meta.type.parameters.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "string",
+		"t": "source.ts meta.type.declaration.ts meta.type.parameters.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ">",
+		"t": "source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "new",
+		"t": "source.ts new.expr.ts keyword.operator.new.ts",
+		"r": {
+			"dark_plus": "keyword.operator.new: #569CD6",
+			"light_plus": "keyword.operator.new: #0000FF",
+			"dark_vs": "keyword.operator.new: #569CD6",
+			"light_vs": "keyword.operator.new: #0000FF",
+			"hc_black": "keyword.operator.new: #569CD6",
+			"dark_modern": "keyword.operator.new: #569CD6",
+			"hc_light": "keyword.operator.new: #0F4A85",
+			"light_modern": "keyword.operator.new: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts new.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "URL",
+		"t": "source.ts new.expr.ts meta.function-call.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.ts new.expr.ts meta.brace.round.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "'",
+		"t": "source.ts new.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts",
+		"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": "./../../renderer/dist/index.html",
+		"t": "source.ts new.expr.ts string.quoted.single.ts",
+		"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": "source.ts new.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts",
+		"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": "source.ts new.expr.ts punctuation.separator.comma.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts new.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "import",
+		"t": "source.ts new.expr.ts keyword.control.import.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": ".",
+		"t": "source.ts new.expr.ts punctuation.accessor.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "meta",
+		"t": "source.ts new.expr.ts support.variable.property.importmeta.ts",
+		"r": {
+			"dark_plus": "support.variable: #9CDCFE",
+			"light_plus": "support.variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.variable: #9CDCFE",
+			"dark_modern": "support.variable: #9CDCFE",
+			"hc_light": "support.variable: #001080",
+			"light_modern": "support.variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "source.ts new.expr.ts punctuation.accessor.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "url",
+		"t": "source.ts new.expr.ts variable.other.property.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.ts new.expr.ts meta.brace.round.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	}
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json
new file mode 100644
index 000000000000..e870a69ea3f9
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json
@@ -0,0 +1,2144 @@
+[
+	{
+		"c": "const",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "n",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "null",
+		"t": "constant.language.null",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "u",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "undefined",
+		"t": "constant.language.undefined",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "a",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "true",
+		"t": "constant.language.boolean.true",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": "||",
+		"t": "keyword.operator.logical",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "false",
+		"t": "constant.language.boolean.false",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "T",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "null",
+		"t": "support.type.builtin",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "|",
+		"t": "keyword.operator.type",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "unknown",
+		"t": "support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "|",
+		"t": "keyword.operator.type",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "undefined",
+		"t": "support.type.builtin",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "|",
+		"t": "keyword.operator.type",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "true",
+		"t": "support.type.builtin",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "|",
+		"t": "keyword.operator.type",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "false",
+		"t": "support.type.builtin",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "bar",
+		"t": "entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "a",
+		"t": "variable.parameter",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "?",
+		"t": "keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ":",
+		"t": "keyword.operator.type.annotation",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "string",
+		"t": "support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "keyword.operator.type.annotation",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "string",
+		"t": "support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "interface",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "A",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "b",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "?",
+		"t": "keyword.operator.optional",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ":",
+		"t": "keyword.operator.type.annotation",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "2",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "a",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "keyword.operator.type.annotation",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "1",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "obj",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "a",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "1",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "obj1",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "obj2",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "...",
+		"t": "keyword.operator.spread",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "obj1",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "foo",
+		"t": "entity.name.function",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "param",
+		"t": "variable.parameter",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "keyword.operator.type.annotation",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "string",
+		"t": "support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "...",
+		"t": "keyword.operator.rest",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "rest",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "undefined",
+		"t": "constant.language.undefined",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": "null",
+		"t": "constant.language.null",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": "NaN",
+		"t": "constant.language.nan",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": "Infinity",
+		"t": "constant.language.infinity",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": "type",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "One",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "zcxvf",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "Two",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "one",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "|",
+		"t": "keyword.operator.type",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "two",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "&",
+		"t": "keyword.operator.type",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "three",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "storage.type",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "obj",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "one",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "1",
+		"t": "constant.numeric",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "Rec",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "Record",
+		"t": "entity.name.type",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "<",
+		"t": "punctuation.definition.typeparameters",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "string",
+		"t": "support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "string",
+		"t": "support.type.primitive",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ">",
+		"t": "punctuation.definition.typeparameters",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "new",
+		"t": "keyword.operator.new",
+		"r": {
+			"dark_plus": "keyword.operator.new: #569CD6",
+			"light_plus": "keyword.operator.new: #0000FF",
+			"dark_vs": "keyword.operator.new: #569CD6",
+			"light_vs": "keyword.operator.new: #0000FF",
+			"hc_black": "keyword.operator.new: #569CD6",
+			"dark_modern": "keyword.operator.new: #569CD6",
+			"hc_light": "keyword.operator.new: #0F4A85",
+			"light_modern": "keyword.operator.new: #0000FF"
+		}
+	},
+	{
+		"c": "URL",
+		"t": "variable.other.constant",
+		"r": {
+			"dark_plus": "variable.other.constant: #4FC1FF",
+			"light_plus": "variable.other.constant: #0070C1",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_modern": "variable.other.constant: #0070C1"
+		}
+	},
+	{
+		"c": "(",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "./../../renderer/dist/index.html",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "import",
+		"t": "keyword.control",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "meta",
+		"t": "new.expr",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "url",
+		"t": "variable",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "punctuation",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	}
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json
index cffeb46fdca8..e2bc3557ae5c 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "push",
-		"t": "variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": "callback",
-		"t": "variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "new",
-		"t": "new.expr keyword.operator.new",
+		"t": "keyword.operator.new",
 		"r": {
 			"dark_plus": "keyword.operator.new: #569CD6",
 			"light_plus": "keyword.operator.new: #0000FF",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "new.expr variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "(",
-		"t": "new.expr punctuation",
+		"t": "punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "row",
-		"t": "new.expr variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": ",",
-		"t": "new.expr punctuation.delimiter",
+		"t": "punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "col",
-		"t": "new.expr variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": ",",
-		"t": "new.expr punctuation.delimiter",
+		"t": "punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "false",
-		"t": "new.expr constant.language.boolean.false",
+		"t": "constant.language.boolean.false",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": ")",
-		"t": "new.expr punctuation",
+		"t": "punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
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 71c61dfc5cbb..9ffdc10c74cc 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
@@ -1541,7 +1541,7 @@
 	},
 	{
 		"c": "?",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1569,7 +1569,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1639,7 +1639,7 @@
 	},
 	{
 		"c": "?",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1667,7 +1667,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1947,16 +1947,16 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2003,7 +2003,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -2199,7 +2199,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2381,16 +2381,16 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2437,7 +2437,7 @@
 	},
 	{
 		"c": "param",
-		"t": "variable variable.parameter",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2451,7 +2451,7 @@
 	},
 	{
 		"c": "?",
-		"t": "punctuation.delimiter keyword.operator.optional",
+		"t": "keyword.operator.optional",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2465,21 +2465,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -2521,7 +2521,7 @@
 	},
 	{
 		"c": "void",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -2619,16 +2619,16 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2675,7 +2675,7 @@
 	},
 	{
 		"c": "|",
-		"t": "keyword.operator keyword.operator.type",
+		"t": "keyword.operator.type",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2731,7 +2731,7 @@
 	},
 	{
 		"c": "&",
-		"t": "keyword.operator keyword.operator.type",
+		"t": "keyword.operator.type",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2913,7 +2913,7 @@
 	},
 	{
 		"c": "?",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2941,7 +2941,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -3067,7 +3067,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3095,7 +3095,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
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 bcbec84c6672..4e5c11e475e1 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
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "isAll",
-		"t": "variable variable.parameter",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "startTime",
-		"t": "variable variable.parameter",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "endTime",
-		"t": "variable variable.parameter",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": "?",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -253,7 +253,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -281,7 +281,7 @@
 	},
 	{
 		"c": "${",
-		"t": "string punctuation.definition.template-expression.begin",
+		"t": "punctuation.definition.template-expression.begin",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
@@ -295,12 +295,12 @@
 	},
 	{
 		"c": "startTime",
-		"t": "string variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": "}",
-		"t": "string punctuation punctuation.definition.template-expression.end",
+		"t": "punctuation.definition.template-expression.end",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
@@ -337,7 +337,7 @@
 	},
 	{
 		"c": "${",
-		"t": "string punctuation.definition.template-expression.begin",
+		"t": "punctuation.definition.template-expression.begin",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
@@ -351,12 +351,12 @@
 	},
 	{
 		"c": "endTime",
-		"t": "string variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -365,7 +365,7 @@
 	},
 	{
 		"c": "}",
-		"t": "string punctuation punctuation.definition.template-expression.end",
+		"t": "punctuation.definition.template-expression.end",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json
index 16bd135e41d5..0f1813112792 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "foo3",
-		"t": "variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -141,21 +141,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "any",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
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 f484d1f7efc1..005ae69ef887 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
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "new",
-		"t": "new.expr keyword.operator.new",
+		"t": "keyword.operator.new",
 		"r": {
 			"dark_plus": "keyword.operator.new: #569CD6",
 			"light_plus": "keyword.operator.new: #0000FF",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "RegExp",
-		"t": "new.expr variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "(",
-		"t": "new.expr punctuation",
+		"t": "punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": "'",
-		"t": "new.expr string",
+		"t": "string",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "'",
-		"t": "new.expr string",
+		"t": "string",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": ")",
-		"t": "new.expr punctuation",
+		"t": "punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json
index ed55ef245875..a34e098b59d0 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "B1",
-		"t": "variable entity.other.inherited-class",
+		"t": "entity.other.inherited-class",
 		"r": {
 			"dark_plus": "entity.other.inherited-class: #4EC9B0",
 			"light_plus": "entity.other.inherited-class: #267F99",
@@ -99,21 +99,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "resolveNextGeneration",
-		"t": "variable meta.definition.method entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable variable.parameter",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -225,16 +225,16 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json
index c7fd2b14cfaf..58210899070d 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "${",
-		"t": "string punctuation.definition.template-expression.begin",
+		"t": "punctuation.definition.template-expression.begin",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
@@ -85,12 +85,12 @@
 	},
 	{
 		"c": "foo",
-		"t": "string variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "}",
-		"t": "string punctuation punctuation.definition.template-expression.end",
+		"t": "punctuation.definition.template-expression.end",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "log",
-		"t": "variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": "tag",
-		"t": "variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -351,7 +351,7 @@
 	},
 	{
 		"c": "${",
-		"t": "string punctuation.definition.template-expression.begin",
+		"t": "punctuation.definition.template-expression.begin",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
@@ -365,12 +365,12 @@
 	},
 	{
 		"c": "a",
-		"t": "string variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -379,7 +379,7 @@
 	},
 	{
 		"c": "+",
-		"t": "string keyword.operator.arithmetic",
+		"t": "keyword.operator.arithmetic",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -393,12 +393,12 @@
 	},
 	{
 		"c": "b",
-		"t": "string variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -407,7 +407,7 @@
 	},
 	{
 		"c": "}",
-		"t": "string punctuation punctuation.definition.template-expression.end",
+		"t": "punctuation.definition.template-expression.end",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
@@ -435,7 +435,7 @@
 	},
 	{
 		"c": "${",
-		"t": "string punctuation.definition.template-expression.begin",
+		"t": "punctuation.definition.template-expression.begin",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
@@ -449,12 +449,12 @@
 	},
 	{
 		"c": "a",
-		"t": "string variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -463,7 +463,7 @@
 	},
 	{
 		"c": "*",
-		"t": "string keyword.operator.arithmetic",
+		"t": "keyword.operator.arithmetic",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -477,12 +477,12 @@
 	},
 	{
 		"c": "b",
-		"t": "string variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -491,7 +491,7 @@
 	},
 	{
 		"c": "}",
-		"t": "string punctuation punctuation.definition.template-expression.end",
+		"t": "punctuation.definition.template-expression.end",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json
index f496120fdbad..4583b6573635 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
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 926f880f84b7..8a0ca583697f 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
@@ -141,21 +141,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -211,21 +211,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -281,21 +281,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "boolean",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -323,7 +323,7 @@
 	},
 	{
 		"c": "constructor",
-		"t": "variable meta.definition.method storage.type",
+		"t": "storage.type",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -351,7 +351,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable variable.parameter",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -365,21 +365,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -407,7 +407,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable variable.parameter",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -421,21 +421,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -463,7 +463,7 @@
 	},
 	{
 		"c": "live",
-		"t": "variable variable.parameter",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -477,21 +477,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "boolean",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -561,7 +561,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -645,7 +645,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -729,7 +729,7 @@
 	},
 	{
 		"c": "live",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -883,21 +883,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -953,21 +953,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1023,21 +1023,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "string",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1093,21 +1093,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "string",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1163,21 +1163,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "string",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1233,21 +1233,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1303,21 +1303,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1373,21 +1373,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1457,7 +1457,7 @@
 	},
 	{
 		"c": "constructor",
-		"t": "variable meta.definition.method storage.type",
+		"t": "storage.type",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1541,7 +1541,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1625,7 +1625,7 @@
 	},
 	{
 		"c": "canvasSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1709,7 +1709,7 @@
 	},
 	{
 		"c": "lineColor",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1821,7 +1821,7 @@
 	},
 	{
 		"c": "liveColor",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1933,7 +1933,7 @@
 	},
 	{
 		"c": "deadColor",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2045,7 +2045,7 @@
 	},
 	{
 		"c": "initialLifeProbability",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2129,7 +2129,7 @@
 	},
 	{
 		"c": "animationRate",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2213,7 +2213,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2297,7 +2297,7 @@
 	},
 	{
 		"c": "world",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2353,7 +2353,7 @@
 	},
 	{
 		"c": "createWorld",
-		"t": "variable variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2437,7 +2437,7 @@
 	},
 	{
 		"c": "circleOfLife",
-		"t": "variable variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2521,7 +2521,7 @@
 	},
 	{
 		"c": "createWorld",
-		"t": "variable meta.definition.method entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2619,7 +2619,7 @@
 	},
 	{
 		"c": "travelWorld",
-		"t": "variable variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2661,7 +2661,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable variable.parameter",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2675,16 +2675,16 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -2829,7 +2829,7 @@
 	},
 	{
 		"c": "random",
-		"t": "variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2913,7 +2913,7 @@
 	},
 	{
 		"c": "initialLifeProbability",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3053,7 +3053,7 @@
 	},
 	{
 		"c": "circleOfLife",
-		"t": "variable meta.definition.method entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3095,21 +3095,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "void",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -3165,7 +3165,7 @@
 	},
 	{
 		"c": "world",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3221,7 +3221,7 @@
 	},
 	{
 		"c": "travelWorld",
-		"t": "variable variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3263,7 +3263,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable variable.parameter",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3277,16 +3277,16 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -3403,7 +3403,7 @@
 	},
 	{
 		"c": "world",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3599,7 +3599,7 @@
 	},
 	{
 		"c": "draw",
-		"t": "variable variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3711,7 +3711,7 @@
 	},
 	{
 		"c": "resolveNextGeneration",
-		"t": "variable variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3823,7 +3823,7 @@
 	},
 	{
 		"c": "setTimeout",
-		"t": "variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3935,7 +3935,7 @@
 	},
 	{
 		"c": "circleOfLife",
-		"t": "variable variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -4033,7 +4033,7 @@
 	},
 	{
 		"c": "animationRate",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4103,7 +4103,7 @@
 	},
 	{
 		"c": "resolveNextGeneration",
-		"t": "variable meta.definition.method entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -4131,7 +4131,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable variable.parameter",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4145,16 +4145,16 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -4271,7 +4271,7 @@
 	},
 	{
 		"c": "countNeighbors",
-		"t": "variable variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -4383,7 +4383,7 @@
 	},
 	{
 		"c": "new",
-		"t": "new.expr keyword.operator.new",
+		"t": "keyword.operator.new",
 		"r": {
 			"dark_plus": "keyword.operator.new: #569CD6",
 			"light_plus": "keyword.operator.new: #0000FF",
@@ -4397,7 +4397,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "new.expr variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -4411,7 +4411,7 @@
 	},
 	{
 		"c": "(",
-		"t": "new.expr punctuation",
+		"t": "punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4425,7 +4425,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "new.expr variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4439,7 +4439,7 @@
 	},
 	{
 		"c": ".",
-		"t": "new.expr punctuation.delimiter",
+		"t": "punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4453,7 +4453,7 @@
 	},
 	{
 		"c": "row",
-		"t": "new.expr variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4467,7 +4467,7 @@
 	},
 	{
 		"c": ",",
-		"t": "new.expr punctuation.delimiter",
+		"t": "punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4481,7 +4481,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "new.expr variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4495,7 +4495,7 @@
 	},
 	{
 		"c": ".",
-		"t": "new.expr punctuation.delimiter",
+		"t": "punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4509,7 +4509,7 @@
 	},
 	{
 		"c": "col",
-		"t": "new.expr variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4523,7 +4523,7 @@
 	},
 	{
 		"c": ",",
-		"t": "new.expr punctuation.delimiter",
+		"t": "punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4537,7 +4537,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "new.expr variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4551,7 +4551,7 @@
 	},
 	{
 		"c": ".",
-		"t": "new.expr punctuation.delimiter",
+		"t": "punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4565,7 +4565,7 @@
 	},
 	{
 		"c": "live",
-		"t": "new.expr variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4579,7 +4579,7 @@
 	},
 	{
 		"c": ")",
-		"t": "new.expr punctuation",
+		"t": "punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5083,7 +5083,7 @@
 	},
 	{
 		"c": "countNeighbors",
-		"t": "variable meta.definition.method entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -5111,7 +5111,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable variable.parameter",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -5125,16 +5125,16 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5923,7 +5923,7 @@
 	},
 	{
 		"c": "isAlive",
-		"t": "variable variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -6301,7 +6301,7 @@
 	},
 	{
 		"c": "isAlive",
-		"t": "variable meta.definition.method entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -6329,7 +6329,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable variable.parameter",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6343,21 +6343,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -6385,7 +6385,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable variable.parameter",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6399,21 +6399,21 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -6651,7 +6651,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6735,7 +6735,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6847,7 +6847,7 @@
 	},
 	{
 		"c": "world",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7015,7 +7015,7 @@
 	},
 	{
 		"c": "travelWorld",
-		"t": "variable meta.definition.method entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -7043,7 +7043,7 @@
 	},
 	{
 		"c": "callback",
-		"t": "variable variable.parameter",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7323,7 +7323,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7645,7 +7645,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7757,7 +7757,7 @@
 	},
 	{
 		"c": "push",
-		"t": "variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -7785,7 +7785,7 @@
 	},
 	{
 		"c": "callback",
-		"t": "variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -7813,7 +7813,7 @@
 	},
 	{
 		"c": "new",
-		"t": "new.expr keyword.operator.new",
+		"t": "keyword.operator.new",
 		"r": {
 			"dark_plus": "keyword.operator.new: #569CD6",
 			"light_plus": "keyword.operator.new: #0000FF",
@@ -7827,7 +7827,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "new.expr variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -7841,7 +7841,7 @@
 	},
 	{
 		"c": "(",
-		"t": "new.expr punctuation",
+		"t": "punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7855,7 +7855,7 @@
 	},
 	{
 		"c": "row",
-		"t": "new.expr variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7869,7 +7869,7 @@
 	},
 	{
 		"c": ",",
-		"t": "new.expr punctuation.delimiter",
+		"t": "punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7883,7 +7883,7 @@
 	},
 	{
 		"c": "col",
-		"t": "new.expr variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7897,7 +7897,7 @@
 	},
 	{
 		"c": ",",
-		"t": "new.expr punctuation.delimiter",
+		"t": "punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7911,7 +7911,7 @@
 	},
 	{
 		"c": "false",
-		"t": "new.expr constant.language.boolean.false",
+		"t": "constant.language.boolean.false",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -7925,7 +7925,7 @@
 	},
 	{
 		"c": ")",
-		"t": "new.expr punctuation",
+		"t": "punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8023,7 +8023,7 @@
 	},
 	{
 		"c": "push",
-		"t": "variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -8177,7 +8177,7 @@
 	},
 	{
 		"c": "draw",
-		"t": "variable meta.definition.method entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -8205,7 +8205,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable variable.parameter",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8219,16 +8219,16 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "keyword.operator.type.annotation",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8331,7 +8331,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8415,7 +8415,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8471,7 +8471,7 @@
 	},
 	{
 		"c": "canvasSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8527,7 +8527,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8583,7 +8583,7 @@
 	},
 	{
 		"c": "context",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8667,7 +8667,7 @@
 	},
 	{
 		"c": "lineColor",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8723,7 +8723,7 @@
 	},
 	{
 		"c": "context",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8751,7 +8751,7 @@
 	},
 	{
 		"c": "strokeRect",
-		"t": "variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -8863,7 +8863,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8975,7 +8975,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9031,7 +9031,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9087,7 +9087,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9157,7 +9157,7 @@
 	},
 	{
 		"c": "context",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9255,7 +9255,7 @@
 	},
 	{
 		"c": "?",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -9297,7 +9297,7 @@
 	},
 	{
 		"c": "liveColor",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9311,7 +9311,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -9353,7 +9353,7 @@
 	},
 	{
 		"c": "deadColor",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9409,7 +9409,7 @@
 	},
 	{
 		"c": "context",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9437,7 +9437,7 @@
 	},
 	{
 		"c": "fillRect",
-		"t": "variable entity.name.function",
+		"t": "entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -9549,7 +9549,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9661,7 +9661,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9717,7 +9717,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9773,7 +9773,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9899,7 +9899,7 @@
 	},
 	{
 		"c": "new",
-		"t": "new.expr keyword.operator.new",
+		"t": "keyword.operator.new",
 		"r": {
 			"dark_plus": "keyword.operator.new: #569CD6",
 			"light_plus": "keyword.operator.new: #0000FF",
@@ -9913,7 +9913,7 @@
 	},
 	{
 		"c": "Conway",
-		"t": "new.expr variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9927,7 +9927,7 @@
 	},
 	{
 		"c": ".",
-		"t": "new.expr punctuation.delimiter",
+		"t": "punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9941,7 +9941,7 @@
 	},
 	{
 		"c": "GameOfLife",
-		"t": "new.expr variable",
+		"t": "variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9955,7 +9955,7 @@
 	},
 	{
 		"c": "(",
-		"t": "new.expr punctuation",
+		"t": "punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9969,7 +9969,7 @@
 	},
 	{
 		"c": ")",
-		"t": "new.expr punctuation",
+		"t": "punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/src/vs/editor/common/languages/highlights/typescript.scm b/src/vs/editor/common/languages/highlights/typescript.scm
index 5e36868e5bee..18d45571ccfe 100644
--- a/src/vs/editor/common/languages/highlights/typescript.scm
+++ b/src/vs/editor/common/languages/highlights/typescript.scm
@@ -201,6 +201,9 @@
 (intersection_type
   ("&") @keyword.operator.type)
 
+(type_annotation
+  (":") @keyword.operator.type.annotation)
+
 [
   "{"
   "}"
@@ -313,6 +316,9 @@
 (public_field_definition
   ("?") @keyword.operator.optional)
 
+(property_signature
+  ("?") @keyword.operator.optional)
+
 (optional_parameter
   ([
     "?"
@@ -357,5 +363,13 @@
   (false)
 ] @constant.language.boolean.false
 
+(literal_type
+  [
+    (null)
+    (undefined)
+    (true)
+    (false)
+  ] @support.type.builtin)
+
 (namespace_import
   "*" @constant.language)
diff --git a/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts
index fd1cd59d4697..a5806666f08e 100644
--- a/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts
+++ b/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts
@@ -286,7 +286,7 @@ class Snapper {
 				const capture = tokenizationSupport?.captureAtPositionTree(cursor.currentNode.startPosition.row + 1, cursor.currentNode.startPosition.column + 1, tree);
 				tokens.push({
 					c: cursor.currentNode.text.replace(/\r/g, ''),
-					t: capture?.map(cap => cap.name).join(' ') ?? '',
+					t: capture && capture.length > 0 ? capture[capture.length - 1].name : '',
 					r: {
 						dark_plus: undefined,
 						light_plus: undefined,

From b7308ab4f1145cbddee46af84ddd0c4935001c45 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Fri, 21 Feb 2025 12:32:00 +0100
Subject: [PATCH 0220/1815] Fix array index out of bounds and other tree sitter
 bugs (#241460)

---
 .../services/treeSitter/treeSitterParserService.ts   | 12 ++++++++++--
 .../browser/treeSitterTokenizationFeature.ts         |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/vs/editor/common/services/treeSitter/treeSitterParserService.ts b/src/vs/editor/common/services/treeSitter/treeSitterParserService.ts
index a7af9009f50d..2df635ed6d9c 100644
--- a/src/vs/editor/common/services/treeSitter/treeSitterParserService.ts
+++ b/src/vs/editor/common/services/treeSitter/treeSitterParserService.ts
@@ -307,7 +307,7 @@ export class TreeSitterParseResult implements IDisposable, ITreeSitterParseResul
 		}
 	}
 
-	private calculateRangeChange(changedNodes: ChangedRange[] | undefined): RangeChange[] | undefined {
+	private calculateRangeChange(model: ITextModel, changedNodes: ChangedRange[] | undefined): RangeChange[] | undefined {
 		if (!changedNodes) {
 			return undefined;
 		}
@@ -328,6 +328,14 @@ export class TreeSitterParseResult implements IDisposable, ITreeSitterParseResul
 				ranges.push({ newRange: Range.fromPositions(node.newStartPosition, node.newEndPosition), oldRangeLength: node.oldEndIndex - node.oldStartIndex, newRangeStartOffset: node.newStartIndex, newRangeEndOffset: node.newEndIndex });
 			}
 		}
+
+		if (ranges.length > 0) {
+			const lastRange = ranges[ranges.length - 1];
+			const maxLine = model.getLineCount();
+			if (lastRange.newRange.endLineNumber > maxLine) {
+				lastRange.newRange = new Range(lastRange.newRange.startLineNumber, lastRange.newRange.startColumn, maxLine, model.getLineMaxColumn(maxLine));
+			}
+		}
 		return ranges;
 	}
 
@@ -348,7 +356,7 @@ export class TreeSitterParseResult implements IDisposable, ITreeSitterParseResul
 
 			let ranges: RangeChange[] | undefined;
 			if (this._lastFullyParsedWithEdits && this._lastFullyParsed) {
-				ranges = this.calculateRangeChange(this.findChangedNodes(this._lastFullyParsedWithEdits, this._lastFullyParsed));
+				ranges = this.calculateRangeChange(model, this.findChangedNodes(this._lastFullyParsedWithEdits, this._lastFullyParsed));
 			}
 
 			const completed = await this._parseAndUpdateTree(model, version);
diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
index 6cdd23d03cd5..889ddc3c835a 100644
--- a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
@@ -646,8 +646,8 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 						break;
 					}
 					withinTokenIndex--;
-					previousTokenStartOffset = ((withinTokenIndex >= 2) ? endOffsetsAndScopes[withinTokenIndex - 1].endOffset : 0);
-					previousTokenEndOffset = endOffsetsAndScopes[withinTokenIndex].endOffset;
+					previousTokenStartOffset = ((withinTokenIndex >= 1) ? endOffsetsAndScopes[withinTokenIndex - 1].endOffset : 0);
+					previousTokenEndOffset = ((withinTokenIndex >= 0) ? endOffsetsAndScopes[withinTokenIndex].endOffset : 0);
 				} while (previousTokenEndOffset > startOffset);
 			} else {
 				// Just add the token to the array

From 94ae470f1b87ec468ae121e7ff730f2a541e55a9 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Fri, 21 Feb 2025 12:47:29 +0100
Subject: [PATCH 0221/1815] Adopt ensureNoDisposablesAreLeakedInTestSuite in a
 few files (#241462)

Part of #200091
---
 eslint.config.js                                         | 3 ---
 .../api/test/browser/mainThreadConfiguration.test.ts     | 3 +++
 .../workbench/api/test/node/extHostTunnelService.test.ts | 2 ++
 .../contrib/tasks/test/common/taskConfiguration.test.ts  | 9 +++++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/eslint.config.js b/eslint.config.js
index 7263f3813130..8e3d288967b3 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -224,15 +224,12 @@ export default tseslint.config(
 						'src/vs/platform/registry/test/common/platform.test.ts',
 						'src/vs/platform/workspace/test/common/workspace.test.ts',
 						'src/vs/platform/workspaces/test/electron-main/workspaces.test.ts',
-						'src/vs/workbench/api/test/browser/mainThreadConfiguration.test.ts',
-						'src/vs/workbench/api/test/node/extHostTunnelService.test.ts',
 						'src/vs/workbench/contrib/bulkEdit/test/browser/bulkCellEdits.test.ts',
 						'src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts',
 						'src/vs/workbench/contrib/extensions/test/common/extensionQuery.test.ts',
 						'src/vs/workbench/contrib/notebook/test/browser/notebookExecutionService.test.ts',
 						'src/vs/workbench/contrib/notebook/test/browser/notebookExecutionStateService.test.ts',
 						'src/vs/workbench/contrib/tasks/test/common/problemMatcher.test.ts',
-						'src/vs/workbench/contrib/tasks/test/common/taskConfiguration.test.ts',
 						'src/vs/workbench/services/commands/test/common/commandService.test.ts',
 						'src/vs/workbench/services/userActivity/test/browser/domActivityTracker.test.ts',
 						'src/vs/workbench/test/browser/quickAccess.test.ts'
diff --git a/src/vs/workbench/api/test/browser/mainThreadConfiguration.test.ts b/src/vs/workbench/api/test/browser/mainThreadConfiguration.test.ts
index a616447bbcc1..fe7e7337167b 100644
--- a/src/vs/workbench/api/test/browser/mainThreadConfiguration.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadConfiguration.test.ts
@@ -15,9 +15,12 @@ import { SingleProxyRPCProtocol } from '../common/testRPCProtocol.js';
 import { IConfigurationService, ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 import { WorkspaceService } from '../../../services/configuration/browser/configurationService.js';
 import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 suite('MainThreadConfiguration', function () {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	const proxy = {
 		$initializeConfiguration: () => { }
 	};
diff --git a/src/vs/workbench/api/test/node/extHostTunnelService.test.ts b/src/vs/workbench/api/test/node/extHostTunnelService.test.ts
index d260fbe726e8..cd2e03b12476 100644
--- a/src/vs/workbench/api/test/node/extHostTunnelService.test.ts
+++ b/src/vs/workbench/api/test/node/extHostTunnelService.test.ts
@@ -5,6 +5,7 @@
 
 import assert from 'assert';
 import { findPorts, getRootProcesses, getSockets, loadConnectionTable, loadListeningPorts, parseIpAddress, tryFindRootPorts } from '../../node/extHostTunnelService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 
 const tcp =
 	`  sl  local_address rem_address   st tx_queue rx_queue tr tm->when retrnsmt   uid  timeout inode
@@ -225,6 +226,7 @@ const psStdOut =
 0 S node      1058  1056  0  80   0 -   770 pipe_w   888   9 14:43 ?        00:00:00 grep root`;
 
 suite('ExtHostTunnelService', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
 	test('getSockets', function () {
 		const result = getSockets(procSockets);
 		assert.strictEqual(Object.keys(result).length, 75);
diff --git a/src/vs/workbench/contrib/tasks/test/common/taskConfiguration.test.ts b/src/vs/workbench/contrib/tasks/test/common/taskConfiguration.test.ts
index 49cf44a0c316..5bd1a4da9350 100644
--- a/src/vs/workbench/contrib/tasks/test/common/taskConfiguration.test.ts
+++ b/src/vs/workbench/contrib/tasks/test/common/taskConfiguration.test.ts
@@ -20,6 +20,7 @@ import { IContext } from '../../../../../platform/contextkey/common/contextkey.j
 import { Workspace } from '../../../../../platform/workspace/test/common/testWorkspace.js';
 import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 import { ITaskDefinitionRegistry } from '../../common/taskDefinitionRegistry.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 const workspaceFolder: WorkspaceFolder = new WorkspaceFolder({
 	uri: URI.file('/workspace/folderOne'),
@@ -598,6 +599,8 @@ function assertProblemPattern(actual: IProblemPattern, expected: IProblemPattern
 }
 
 suite('Tasks version 0.1.0', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	test('tasks: all default', () => {
 		const builder = new ConfigurationBuilder();
 		builder.task('tsc', 'tsc').
@@ -1497,6 +1500,8 @@ suite('Tasks version 0.1.0', () => {
 });
 
 suite('Tasks version 2.0.0', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	test.skip('Build workspace task', () => {
 		const external: IExternalTaskRunnerConfiguration = {
 			version: '2.0.0',
@@ -1677,6 +1682,8 @@ suite('Tasks version 2.0.0', () => {
 });
 
 suite('Bugs / regression tests', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	(Platform.isLinux ? test.skip : test)('Bug 19548', () => {
 		const external: IExternalTaskRunnerConfiguration = {
 			version: '0.1.0',
@@ -1784,6 +1791,8 @@ class TestTaskDefinitionRegistry implements Partial<ITaskDefinitionRegistry> {
 }
 
 suite('Task configuration conversions', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	const globals = {} as IGlobals;
 	const taskConfigSource = {} as TaskConfigSource;
 	const TaskDefinitionRegistry = new TestTaskDefinitionRegistry();

From 2e1ee1e9be93616dcd1c883df7d0f0c449c7a28b Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 21 Feb 2025 14:01:01 +0100
Subject: [PATCH 0222/1815] simplify undo stops, push an undo point each time
 streaming edits starts (#241466)

---
 .../chatEditingModifiedDocumentEntry.ts       | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
index bd7eb6898c41..555bc876a166 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
@@ -83,7 +83,6 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		return this.doc;
 	}
 
-	private _isFirstEditAfterStartOrSnapshot: boolean = true;
 	private _edit: OffsetEdit = OffsetEdit.empty;
 	private _isEditFromUs: boolean = false;
 	private _allEditsAreFromUs: boolean = true;
@@ -183,7 +182,6 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 	}
 
 	createSnapshot(requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry {
-		this._isFirstEditAfterStartOrSnapshot = true;
 		return {
 			resource: this.modifiedURI,
 			languageId: this.modifiedModel.getLanguageId(),
@@ -275,19 +273,20 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		}
 	}
 
+	override acceptStreamingEditsStart(responseModel: IChatResponseModel, tx: ITransaction) {
+		super.acceptStreamingEditsStart(responseModel, tx);
+
+		// push stack element whenever streaming starts
+		const request = responseModel.session.getRequests().find(req => req.id === responseModel.requestId);
+		const label = request?.message.text ? localize('chatEditing1', "Chat Edit: '{0}'", request.message.text) : localize('chatEditing2', "Chat Edit");
+		this._undoRedoService.pushElement(new SingleModelEditStackElement(label, 'chat.edit', this.doc, null));
+	}
+
 	async acceptAgentEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void> {
 
 		assertType(textEdits.every(TextEdit.isTextEdit), 'INVALID args, can only handle text edits');
 		assert(isEqual(resource, this.modifiedURI), ' INVALID args, can only edit THIS document');
 
-		// push stack element for the first edit
-		if (this._isFirstEditAfterStartOrSnapshot) {
-			this._isFirstEditAfterStartOrSnapshot = false;
-			const request = this._chatService.getSession(this._telemetryInfo.sessionId)?.getRequests().at(-1);
-			const label = request?.message.text ? localize('chatEditing1', "Chat Edit: '{0}'", request.message.text) : localize('chatEditing2', "Chat Edit");
-			this._undoRedoService.pushElement(new SingleModelEditStackElement(label, 'chat.edit', this.doc, null));
-		}
-
 		const ops = textEdits.map(TextEdit.asEditOperation);
 		const undoEdits = this._applyEdits(ops);
 

From 4cd5cd8c293a763ad3aeaa69f80507f21e32918f Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Fri, 21 Feb 2025 15:01:51 +0100
Subject: [PATCH 0223/1815] Fix reference to incorrect range (#241468)

---
 .../treeSitter/browser/treeSitterTokenizationFeature.ts         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
index 889ddc3c835a..055812bce28d 100644
--- a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
@@ -318,7 +318,7 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 					});
 				} else if (rangeChanges[i - 1].range.endLineNumber < e.ranges[i].newRange.endLineNumber) {
 					// clip the range to the previous range
-					const range = new Range(rangeChanges[i - 1].range.endLineNumber + 1, 1, rangeChanges[i].range.endLineNumber, e.textModel.getLineMaxColumn(rangeChanges[i].range.endLineNumber));
+					const range = new Range(rangeChanges[i - 1].range.endLineNumber + 1, 1, e.ranges[i].newRange.endLineNumber, e.textModel.getLineMaxColumn(e.ranges[i].newRange.endLineNumber));
 					rangeChanges.push({
 						range,
 						startOffset: e.textModel.getOffsetAt(range.getStartPosition()),

From db11bb43b90cf386ab7f6964f3f28c1e96278dea Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 21 Feb 2025 06:33:11 -0800
Subject: [PATCH 0224/1815] Adjust command started X when prompt is reprinted

This handles properly when plugins are loaded after the initial print
in zsh.

fixes #241353
---
 .../commandDetection/promptInputModel.ts             | 12 ++++++++++++
 .../capabilities/commandDetectionCapability.ts       |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts b/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts
index e90a476fa677..0e1e340b3d30 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts
@@ -105,6 +105,7 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 	constructor(
 		private readonly _xterm: Terminal,
 		onCommandStart: Event<ITerminalCommand>,
+		onCommandStartChanged: Event<ITerminalCommand>,
 		onCommandExecuted: Event<ITerminalCommand>,
 		@ILogService private readonly _logService: ILogService
 	) {
@@ -118,6 +119,7 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 		this._register(this._xterm.onData(e => this._handleUserInput(e)));
 
 		this._register(onCommandStart(e => this._handleCommandStart(e as { marker: IMarker })));
+		this._register(onCommandStartChanged(() => this._handleCommandStartChanged()));
 		this._register(onCommandExecuted(() => this._handleCommandExecuted()));
 
 		this._register(this.onDidStartInput(() => this._logCombinedStringIfTrace('PromptInputModel#onDidStartInput')));
@@ -215,6 +217,16 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 		}
 	}
 
+	private _handleCommandStartChanged() {
+		if (this._state !== PromptInputState.Input) {
+			return;
+		}
+
+		this._commandStartX = this._xterm.buffer.active.cursorX;
+		this._onDidChangeInput.fire(this._createStateObject());
+		this._sync();
+	}
+
 	private _handleCommandExecuted() {
 		if (this._state === PromptInputState.Execute) {
 			return;
diff --git a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
index d2413b5897ea..ffbd030e9252 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
@@ -61,6 +61,8 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 
 	private readonly _onCommandStarted = this._register(new Emitter<ITerminalCommand>());
 	readonly onCommandStarted = this._onCommandStarted.event;
+	private readonly _onCommandStartChanged = this._register(new Emitter<ITerminalCommand>());
+	readonly onCommandStartChanged = this._onCommandStartChanged.event;
 	private readonly _onBeforeCommandFinished = this._register(new Emitter<ITerminalCommand>());
 	readonly onBeforeCommandFinished = this._onBeforeCommandFinished.event;
 	private readonly _onCommandFinished = this._register(new Emitter<ITerminalCommand>());
@@ -78,7 +80,7 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 	) {
 		super();
 
-		this._promptInputModel = this._register(new PromptInputModel(this._terminal, this.onCommandStarted, this.onCommandExecuted, this._logService));
+		this._promptInputModel = this._register(new PromptInputModel(this._terminal, this.onCommandStarted, this.onCommandStartChanged, this.onCommandExecuted, this._logService));
 
 		// Pull command line from the buffer if it was not set explicitly
 		this._register(this.onCommandExecuted(command => {
@@ -330,6 +332,7 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 		this._currentCommand.commandStartMarker = options?.marker || this._currentCommand.commandStartMarker;
 		if (this._currentCommand.commandStartMarker?.line === this._terminal.buffer.active.cursorY) {
 			this._currentCommand.commandStartX = this._terminal.buffer.active.cursorX;
+			this._onCommandStartChanged.fire(this._currentCommand as any);
 			this._logService.debug('CommandDetectionCapability#handleCommandStart', this._currentCommand.commandStartX, this._currentCommand.commandStartMarker?.line);
 			return;
 		}

From ce703825ba0db2e5fd57277178683af3ed645e72 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 21 Feb 2025 07:02:32 -0800
Subject: [PATCH 0225/1815] Fix compile in prompt tests

---
 .../common/capabilities/commandDetectionCapability.ts         | 2 +-
 .../capabilities/commandDetection/promptInputModel.test.ts    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
index ffbd030e9252..65237a89fe53 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
@@ -332,7 +332,7 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 		this._currentCommand.commandStartMarker = options?.marker || this._currentCommand.commandStartMarker;
 		if (this._currentCommand.commandStartMarker?.line === this._terminal.buffer.active.cursorY) {
 			this._currentCommand.commandStartX = this._terminal.buffer.active.cursorX;
-			this._onCommandStartChanged.fire(this._currentCommand as any);
+			this._onCommandStartChanged.fire(this._currentCommand as any as ITerminalCommand);
 			this._logService.debug('CommandDetectionCapability#handleCommandStart', this._currentCommand.commandStartX, this._currentCommand.commandStartMarker?.line);
 			return;
 		}
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 32934ec84986..0e10e25cce9e 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
@@ -19,6 +19,7 @@ suite('PromptInputModel', () => {
 	let promptInputModel: PromptInputModel;
 	let xterm: Terminal;
 	let onCommandStart: Emitter<ITerminalCommand>;
+	let onCommandStartChanged: Emitter<ITerminalCommand>;
 	let onCommandExecuted: Emitter<ITerminalCommand>;
 
 	async function writePromise(data: string) {
@@ -62,8 +63,9 @@ suite('PromptInputModel', () => {
 		const TerminalCtor = (await importAMDNodeModule<typeof import('@xterm/xterm')>('@xterm/xterm', 'lib/xterm.js')).Terminal;
 		xterm = store.add(new TerminalCtor({ allowProposedApi: true }));
 		onCommandStart = store.add(new Emitter());
+		onCommandStartChanged = store.add(new Emitter());
 		onCommandExecuted = store.add(new Emitter());
-		promptInputModel = store.add(new PromptInputModel(xterm, onCommandStart.event, onCommandExecuted.event, new NullLogService));
+		promptInputModel = store.add(new PromptInputModel(xterm, onCommandStart.event, onCommandStartChanged.event, onCommandExecuted.event, new NullLogService));
 	});
 
 	test('basic input and execute', async () => {

From a172de5aa4acd085b1c03d9b3e4202caf74dcd5e Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Fri, 21 Feb 2025 16:04:59 +0100
Subject: [PATCH 0226/1815] Introduce action to accept next inline edit part
 (#241475)

Try out accept partial
---
 .../browser/controller/commands.ts            | 20 ++++++
 .../browser/inlineCompletions.contribution.ts |  3 +-
 .../browser/model/inlineCompletionsModel.ts   | 71 ++++++++++++++++++-
 .../browser/model/inlineCompletionsSource.ts  |  8 +++
 .../view/inlineEdits/inlineEditsView.ts       | 12 +++-
 .../view/inlineEdits/viewAndDiffProducer.ts   |  3 +-
 6 files changed, 112 insertions(+), 5 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
index 501d1fcb6f14..eee8fb8c0d49 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
@@ -261,6 +261,26 @@ export class JumpToNextInlineEdit extends EditorAction {
 	}
 }
 
+export class AcceptNextInlineEditPart extends EditorAction {
+	constructor() {
+		super({
+			id: 'editor.action.inlineSuggest.acceptNextInlineEditPart',
+			label: nls.localize2('action.inlineSuggest.acceptNextInlineEditPart', "Accept Next Inline Edit Part"),
+			precondition: ContextKeyExpr.and(EditorContextKeys.writable, InlineCompletionContextKeys.inlineEditVisible),
+			kbOpts: {
+				weight: KeybindingWeight.EditorContrib + 1,
+				primary: KeyMod.CtrlCmd | KeyCode.RightArrow,
+				kbExpr: ContextKeyExpr.and(EditorContextKeys.writable, InlineCompletionContextKeys.inlineEditVisible),
+			},
+		});
+	}
+
+	public async run(accessor: ServicesAccessor | undefined, editor: ICodeEditor): Promise<void> {
+		const controller = InlineCompletionsController.get(editor);
+		await controller?.model.get()?.acceptNextInlineEditPart(controller.editor);
+	}
+}
+
 export class HideInlineCompletion extends EditorAction {
 	public static ID = hideInlineCompletionId;
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts
index 06a0b9d92041..5bf486b87759 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, registerEditorCommand, registerEditorContribution } from '../../../browser/editorExtensions.js';
 import { HoverParticipantRegistry } from '../../hover/browser/hoverTypes.js';
-import { AcceptInlineCompletion, AcceptNextLineOfInlineCompletion, AcceptNextWordOfInlineCompletion, DevExtractReproSample, HideInlineCompletion, JumpToNextInlineEdit, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, ToggleAlwaysShowInlineSuggestionToolbar, ExplicitTriggerInlineEditAction, TriggerInlineSuggestionAction, TriggerInlineEditAction, ToggleInlineCompletionShowCollapsed } from './controller/commands.js';
+import { AcceptInlineCompletion, AcceptNextLineOfInlineCompletion, AcceptNextWordOfInlineCompletion, DevExtractReproSample, HideInlineCompletion, JumpToNextInlineEdit, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, ToggleAlwaysShowInlineSuggestionToolbar, ExplicitTriggerInlineEditAction, TriggerInlineSuggestionAction, TriggerInlineEditAction, ToggleInlineCompletionShowCollapsed, AcceptNextInlineEditPart } from './controller/commands.js';
 import { InlineCompletionsController } from './controller/inlineCompletionsController.js';
 import { InlineCompletionsHoverParticipant } from './hintsWidget/hoverParticipant.js';
 import { InlineCompletionsAccessibleView } from './inlineCompletionsAccessibleView.js';
@@ -29,6 +29,7 @@ registerEditorAction(AcceptNextLineOfInlineCompletion);
 registerEditorAction(AcceptInlineCompletion);
 registerEditorAction(ToggleInlineCompletionShowCollapsed);
 registerEditorAction(HideInlineCompletion);
+registerEditorAction(AcceptNextInlineEditPart);
 registerEditorAction(JumpToNextInlineEdit);
 registerAction2(ToggleAlwaysShowInlineSuggestionToolbar);
 registerEditorAction(DevExtractReproSample);
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
index 5bb02e8c8f46..5ea7bfe4a8b6 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -32,7 +32,7 @@ import { TextModelText } from '../../../../common/model/textModelText.js';
 import { IFeatureDebounceInformation } from '../../../../common/services/languageFeatureDebounce.js';
 import { IModelContentChangedEvent } from '../../../../common/textModelEvents.js';
 import { SnippetController2 } from '../../../snippet/browser/snippetController2.js';
-import { addPositions, getEndPositionsAfterApplying, substringPos, subtractPositions } from '../utils.js';
+import { addPositions, getEndPositionsAfterApplying, getModifiedRangesAfterApplying, substringPos, subtractPositions } from '../utils.js';
 import { AnimatedValue, easeOutCubic, ObservableAnimatedValue } from './animation.js';
 import { computeGhostText } from './computeGhostText.js';
 import { GhostText, GhostTextOrReplacement, ghostTextOrReplacementEquals, ghostTextsOrReplacementsEqual } from './ghostText.js';
@@ -269,6 +269,7 @@ export class InlineCompletionsModel extends Disposable {
 				}
 			}
 
+			this._inAcceptPartialFlow.set(false, tx);
 			this._isActive.set(false, tx);
 			this._source.clear(tx);
 		});
@@ -594,6 +595,12 @@ export class InlineCompletionsModel extends Disposable {
 			throw new BugIndicatingError();
 		}
 
+		if (this._inAcceptPartialFlow.get()) {
+			this._inAcceptPartialFlow.set(false, undefined);
+			this.jump();
+			return;
+		}
+
 		let completionWithUpdatedRange: InlineCompletionWithUpdatedRange;
 
 		const state = this.state.get();
@@ -762,6 +769,68 @@ export class InlineCompletionsModel extends Disposable {
 		}
 	}
 
+	// TODO: clean this up if we keep it
+	private readonly _inAcceptPartialFlow = observableValue(this, false);
+	public readonly inAcceptPartialFlow: IObservable<boolean> = this._inAcceptPartialFlow;
+	public async acceptNextInlineEditPart(editor: ICodeEditor): Promise<void> {
+		if (editor.getModel() !== this.textModel) {
+			throw new BugIndicatingError();
+		}
+
+		const state = this.inlineEditState.get();
+		const updatedEdit = state?.inlineCompletion.updatedEdit.get();
+		const completion = state?.inlineCompletion.toInlineCompletion(undefined);
+		if (!updatedEdit || updatedEdit.isEmpty || !completion) {
+			return;
+		}
+
+		const nextPart = updatedEdit.edits[0];
+
+		const edit = new SingleTextEdit(Range.fromPositions(
+			this.textModel.getPositionAt(nextPart.replaceRange.start),
+			this.textModel.getPositionAt(nextPart.replaceRange.endExclusive)
+		), nextPart.newText);
+
+		const cursorAtStartPosition = this._editor.getSelection()?.getStartPosition().equals(edit.range.getStartPosition());
+		if (!cursorAtStartPosition || !this._inAcceptPartialFlow.get()) {
+			this._inAcceptPartialFlow.set(true, undefined);
+			this.jump();
+			return;
+		}
+
+		const partToJumpToNext = updatedEdit.edits[1] ?? undefined;
+		const editToJumpToNext = partToJumpToNext ? new SingleTextEdit(Range.fromPositions(
+			this.textModel.getPositionAt(partToJumpToNext.replaceRange.start),
+			this.textModel.getPositionAt(partToJumpToNext.replaceRange.endExclusive)
+		), partToJumpToNext.newText) : undefined;
+
+		// Executing the edit might free the completion, so we have to hold a reference on it.
+		completion.source.addRef();
+		try {
+			this._isAcceptingPartially = true;
+			try {
+				editor.pushUndoStop();
+
+				let selections;
+				if (editToJumpToNext) {
+					const [_, rangeOfEditToJumpTo] = getModifiedRangesAfterApplying([edit, editToJumpToNext]);
+					selections = [Selection.fromPositions(rangeOfEditToJumpTo.getStartPosition())];
+				} else {
+					selections = getEndPositionsAfterApplying([edit]).map(p => Selection.fromPositions(p));
+				}
+
+				const edits = [edit];
+				editor.executeEdits('inlineSuggestion.accept', edits.map(edit => EditOperation.replace(edit.range, edit.text)));
+				editor.setSelections(selections, 'inlineCompletionPartialAccept');
+				editor.revealPositionInCenterIfOutsideViewport(editor.getPosition()!, ScrollType.Immediate);
+			} finally {
+				this._isAcceptingPartially = false;
+			}
+		} finally {
+			completion.source.removeRef();
+		}
+	}
+
 	public handleSuggestAccepted(item: SuggestItemInfo) {
 		const itemEdit = singleTextRemoveCommonPrefix(item.toSingleTextEdit(), this.textModel);
 		const augmentedCompletion = this._computeAugmentation(itemEdit, undefined);
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
index d37c28d4cf88..d9d9f0e09912 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
@@ -702,6 +702,14 @@ class SingleUpdatedNextEdit extends SingleUpdatedEdit {
 				continue;
 			}
 
+			// user did exactly the edit
+			if (change.equals(edit)) {
+				editHasChanged = true;
+				editStart = change.replaceRange.endExclusive;
+				editReplaceText = '';
+				continue;
+			}
+
 			// MOVE EDIT
 			if (change.replaceRange.start > editEnd) {
 				// the change happens after the completion range
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 fc6e425aeb3c..8e8ad4a56429 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
@@ -286,9 +286,17 @@ export class InlineEditsView extends Disposable {
 		}
 	}).recomputeInitiallyAndOnChange(this._store);
 
+	private getCacheId(edit: InlineEditWithChanges) {
+		if (this._model.get()?.inAcceptPartialFlow.get()) {
+			return `${edit.inlineCompletion.id}_${edit.edit.edits.map(edit => edit.range.toString() + edit.text).join(',')}`;
+		}
+
+		return edit.inlineCompletion.id;
+	}
+
 	private determineView(edit: InlineEditWithChanges, reader: IReader, diff: DetailedLineRangeMapping[], newText: StringText, originalDisplayRange: LineRange): string {
 		// Check if we can use the previous view if it is the same InlineCompletion as previously shown
-		const canUseCache = this._previousView?.id === edit.inlineCompletion.id;
+		const canUseCache = this._previousView?.id === this.getCacheId(edit);
 		const reconsiderViewAfterJump = edit.userJumpedToIt !== this._previousView?.userJumpedToIt &&
 			(
 				(this._useMixedLinesDiff.read(reader) === 'afterJumpWhenPossible' && this._previousView?.view !== 'mixedLines') ||
@@ -365,7 +373,7 @@ export class InlineEditsView extends Disposable {
 
 		const view = this.determineView(edit, reader, diff, newText, originalDisplayRange);
 
-		this._previousView = { id: edit.inlineCompletion.id, view, userJumpedToIt: edit.userJumpedToIt, editorWidth: this._editor.getLayoutInfo().width };
+		this._previousView = { id: this.getCacheId(edit), view, userJumpedToIt: edit.userJumpedToIt, editorWidth: this._editor.getLayoutInfo().width };
 
 		switch (view) {
 			case 'insertionInline': return { kind: 'insertionInline' as const };
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts
index 232fda504581..9b5fcbb5159b 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts
@@ -30,7 +30,8 @@ export class InlineEditsViewAndDiffProducer extends Disposable { // TODO: This c
 		const editOffset = model.inlineEditState.get()?.inlineCompletion.updatedEdit.read(reader);
 		if (!editOffset) { return undefined; }
 
-		const edits = editOffset.edits.map(e => {
+		const offsetEdits = model.inAcceptPartialFlow.read(reader) ? [editOffset.edits[0]] : editOffset.edits;
+		const edits = offsetEdits.map(e => {
 			const innerEditRange = Range.fromPositions(
 				textModel.getPositionAt(e.replaceRange.start),
 				textModel.getPositionAt(e.replaceRange.endExclusive)

From 8fd4b42fcde32c684f456c12ccfc0b128e794838 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 21 Feb 2025 16:11:59 +0100
Subject: [PATCH 0227/1815] chat overlay work (#241477)

* reveal inline chat widget when pressing overlay request
* simplify overlay logic and render
---
 .../chatEditing/chatEditingEditorActions.ts   |  25 ++-
 .../chatEditingEditorContextKeys.ts           |  71 +++++--
 .../chatEditing/chatEditingEditorOverlay.ts   | 181 ++++++++++--------
 ...erlay.css => chatEditingEditorOverlay.css} |  30 +--
 4 files changed, 181 insertions(+), 126 deletions(-)
 rename src/vs/workbench/contrib/chat/browser/media/{chatEditorOverlay.css => chatEditingEditorOverlay.css} (90%)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts
index a394490b3e86..2bf35d04e94c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts
@@ -14,7 +14,6 @@ import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contex
 import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
 import { ACTIVE_GROUP, IEditorService } from '../../../../services/editor/common/editorService.js';
 import { CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, IChatEditingService, IChatEditingSession, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, WorkingSetEntryState } from '../../common/chatEditingService.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
 import { ctxNotebookHasEditorModification } from '../../../notebook/browser/contrib/chatEdit/notebookChatEditContext.js';
 import { resolveCommandsContext } from '../../../../browser/parts/editor/editorCommandsContext.js';
 import { IListService } from '../../../../../platform/list/browser/listService.js';
@@ -73,6 +72,7 @@ abstract class NavigateAction extends ChatEditingEditorAction {
 				? localize2('next', 'Go to Next Chat Edit')
 				: localize2('prev', 'Go to Previous Chat Edit'),
 			icon: next ? Codicon.arrowDown : Codicon.arrowUp,
+			precondition: ctxHasRequestInProgress.negate(),
 			keybinding: {
 				primary: next
 					? KeyMod.Alt | KeyCode.F5
@@ -88,7 +88,7 @@ abstract class NavigateAction extends ChatEditingEditorAction {
 				id: MenuId.ChatEditingEditorContent,
 				group: 'navigate',
 				order: !next ? 2 : 3,
-				when: ctxReviewModeEnabled
+				when: ContextKeyExpr.and(ctxReviewModeEnabled, ctxHasRequestInProgress.negate())
 			}
 		});
 	}
@@ -147,7 +147,11 @@ async function openNextOrPreviousChange(accessor: ServicesAccessor, session: ICh
 		return false;
 	}
 
-	newEntry.getEditorIntegration(pane).reveal(next);
+	if (session.entries.get().includes(newEntry)) {
+		// make sure newEntry is still valid!
+		newEntry.getEditorIntegration(pane).reveal(next);
+	}
+
 	return true;
 }
 
@@ -165,7 +169,7 @@ abstract class AcceptDiscardAction extends ChatEditingEditorAction {
 			tooltip: accept
 				? localize2('accept3', 'Keep Chat Edits in this File')
 				: localize2('discard3', 'Undo Chat Edits in this File'),
-			precondition: ContextKeyExpr.and(ctxHasEditorModification),
+			precondition: ContextKeyExpr.and(ctxHasEditorModification, ctxHasRequestInProgress.negate()),
 			icon: accept
 				? Codicon.check
 				: Codicon.discard,
@@ -181,7 +185,7 @@ abstract class AcceptDiscardAction extends ChatEditingEditorAction {
 				id: MenuId.ChatEditingEditorContent,
 				group: 'a_resolve',
 				order: accept ? 0 : 1,
-				when: !accept ? ctxReviewModeEnabled : undefined
+				when: ContextKeyExpr.and(!accept ? ctxReviewModeEnabled : undefined, ctxHasRequestInProgress.negate())
 			}
 		});
 	}
@@ -262,7 +266,7 @@ class ToggleDiffAction extends ChatEditingEditorAction {
 				condition: ContextKeyExpr.or(EditorContextKeys.inDiffEditor, ActiveEditorContext.isEqualTo(TEXT_DIFF_EDITOR_ID))!,
 				icon: Codicon.goToFile,
 			},
-			precondition: ContextKeyExpr.and(ctxHasEditorModification, ChatContextKeys.requestInProgress.negate()),
+			precondition: ContextKeyExpr.and(ctxHasEditorModification, ctxHasRequestInProgress.negate()),
 			icon: Codicon.diffSingle,
 			keybinding: {
 				when: EditorContextKeys.focus,
@@ -276,7 +280,7 @@ class ToggleDiffAction extends ChatEditingEditorAction {
 				id: MenuId.ChatEditingEditorContent,
 				group: 'a_resolve',
 				order: 2,
-				when: ctxReviewModeEnabled
+				when: ContextKeyExpr.and(ctxReviewModeEnabled, ctxHasRequestInProgress.negate())
 			}]
 		});
 	}
@@ -292,7 +296,7 @@ class ToggleAccessibleDiffViewAction extends ChatEditingEditorAction {
 			id: 'chatEditor.action.showAccessibleDiffView',
 			title: localize2('accessibleDiff', 'Show Accessible Diff View'),
 			f1: true,
-			precondition: ContextKeyExpr.and(ctxHasEditorModification, ChatContextKeys.requestInProgress.negate()),
+			precondition: ContextKeyExpr.and(ctxHasEditorModification, ctxHasRequestInProgress.negate()),
 			keybinding: {
 				when: EditorContextKeys.focus,
 				weight: KeybindingWeight.WorkbenchContrib,
@@ -312,11 +316,12 @@ export class ReviewChangesAction extends ChatEditingEditorAction {
 		super({
 			id: 'chatEditor.action.reviewChanges',
 			title: localize2('review', "Review"),
+			precondition: ContextKeyExpr.and(ctxHasEditorModification, ctxHasRequestInProgress.negate()),
 			menu: [{
 				id: MenuId.ChatEditingEditorContent,
 				group: 'a_resolve',
 				order: 3,
-				when: ctxReviewModeEnabled.negate(),
+				when: ContextKeyExpr.and(ctxReviewModeEnabled.negate(), ctxHasRequestInProgress.negate()),
 			}]
 		});
 	}
@@ -395,7 +400,7 @@ export function registerChatEditorActions() {
 		},
 		group: 'navigate',
 		order: -1,
-		when: ctxReviewModeEnabled,
+		when: ContextKeyExpr.and(ctxReviewModeEnabled, ctxHasRequestInProgress.negate()),
 	});
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts
index ee536a777996..0785cd0afbea 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts
@@ -4,12 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 import { Event } from '../../../../../base/common/event.js';
 import { DisposableMap, DisposableStore } from '../../../../../base/common/lifecycle.js';
-import { autorun, constObservable, observableFromEvent } from '../../../../../base/common/observable.js';
+import { autorun, constObservable, derived, IObservable, observableFromEvent } from '../../../../../base/common/observable.js';
+import { URI } from '../../../../../base/common/uri.js';
 import { localize } from '../../../../../nls.js';
 import { IContextKey, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 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 { ChatEditingSessionState, IChatEditingService, IChatEditingSession, IModifiedFileEntry } from '../../common/chatEditingService.js';
 import { IChatService } from '../../common/chatService.js';
 
@@ -26,8 +29,7 @@ export class ChatEditingEditorContextKeys implements IWorkbenchContribution {
 	private readonly _store = new DisposableStore();
 
 	constructor(
-		@IChatEditingService chatEditingService: IChatEditingService,
-		@IChatService chatService: IChatService,
+		@IInstantiationService instaService: IInstantiationService,
 		@IEditorGroupsService editorGroupsService: IEditorGroupsService,
 	) {
 
@@ -51,7 +53,7 @@ export class ChatEditingEditorContextKeys implements IWorkbenchContribution {
 					continue;
 				}
 
-				editorGroupCtx.set(group, new ContextKeyGroup(group, chatEditingService, chatService));
+				editorGroupCtx.set(group, instaService.createInstance(ContextKeyGroup, group));
 			}
 
 			for (const item of toDispose) {
@@ -78,8 +80,9 @@ class ContextKeyGroup {
 
 	constructor(
 		group: IEditorGroup,
-		chatEditingService: IChatEditingService,
-		chatService: IChatService,
+		@IInlineChatSessionService inlineChatSessionService: IInlineChatSessionService,
+		@IChatEditingService chatEditingService: IChatEditingService,
+		@IChatService chatService: IChatService,
 	) {
 		this._ctxIsGlobalEditingSession = ctxIsGlobalEditingSession.bindTo(group.scopedContextKeyService);
 		this._ctxHasEditorModification = ctxHasEditorModification.bindTo(group.scopedContextKeyService);
@@ -99,29 +102,27 @@ class ContextKeyGroup {
 				return;
 			}
 
-			let tuple: [IChatEditingSession, IModifiedFileEntry] | undefined;
-			for (const session of chatEditingService.editingSessionsObs.read(r)) {
-				const entry = session.readEntry(uri, r);
-				if (entry) {
-					tuple = [session, entry];
-					break;
-				}
-			}
+			const tuple = new ObservableEditorSession(uri, chatEditingService, inlineChatSessionService).value.read(r);
 
 			if (!tuple) {
 				this._reset();
 				return;
 			}
 
-			const [session, entry] = tuple;
+			const { session, entry } = tuple;
+
+			const chatModel = chatService.getSession(session.chatSessionId);
+
+			const isRequestInProgress = chatModel
+				? observableFromEvent(this, chatModel.onDidChange, () => chatModel.requestInProgress)
+				: constObservable(false);
 
 			this._ctxHasEditorModification.set(true);
 			this._ctxIsGlobalEditingSession.set(session.isGlobalEditingSession);
-			this._ctxReviewModeEnabled.set(entry.reviewMode.read(r));
-			this._ctxHasRequestInProgress.set(session.state.read(r) === ChatEditingSessionState.StreamingEdits);
+			this._ctxReviewModeEnabled.set(entry ? entry.reviewMode.read(r) : false);
+			this._ctxHasRequestInProgress.set(session.state.read(r) === ChatEditingSessionState.StreamingEdits || isRequestInProgress.read(r) || !entry);
 
 			// number of requests
-			const chatModel = chatService.getSession(session.chatSessionId);
 			const requestCount = chatModel
 				? observableFromEvent(this, chatModel.onDidChange, () => chatModel.getRequests().length)
 				: constObservable(0);
@@ -143,3 +144,37 @@ class ContextKeyGroup {
 		this._reset();
 	}
 }
+
+export class ObservableEditorSession {
+
+	readonly value: IObservable<undefined | { session: IChatEditingSession; entry: IModifiedFileEntry | undefined }>;
+
+	constructor(
+		uri: URI,
+		@IChatEditingService chatEditingService: IChatEditingService,
+		@IInlineChatSessionService inlineChatService: IInlineChatSessionService
+	) {
+		this.value = derived(r => {
+			const sessionObs = chatEditingService.editingSessionsObs.map((value, r) => {
+				for (const session of value) {
+					const entry = session.readEntry(uri, r);
+					if (entry) {
+						return { session, entry };
+					}
+				}
+				return undefined;
+			});
+
+			const result = sessionObs.read(r);
+			if (result) {
+				return result;
+			}
+
+			const inlineSessionObs = observableFromEvent(this, inlineChatService.onDidChangeSessions, () => inlineChatService.getSession2(uri));
+			const inlineSession = inlineSessionObs.read(r);
+			return inlineSession
+				? { session: inlineSession.editingSession, entry: inlineSession.editingSession.readEntry(uri, r) }
+				: undefined;
+		});
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
index 46f478ff2b3f..1a5c9c250b6a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
@@ -3,25 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import '../media/chatEditingEditorOverlay.css';
 import { combinedDisposable, DisposableMap, DisposableStore, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
-import { autorun, derived, derivedOpts, IObservable, observableFromEvent, observableSignalFromEvent, observableValue, transaction } from '../../../../../base/common/observable.js';
+import { autorun, constObservable, derived, derivedOpts, IObservable, observableFromEvent, observableSignalFromEvent, observableValue, transaction } from '../../../../../base/common/observable.js';
 import { HiddenItemStrategy, MenuWorkbenchToolBar, WorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IChatEditingService, IChatEditingSession, IModifiedFileEntry, WorkingSetEntryState } from '../../common/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 { $, addDisposableGenericMouseMoveListener, append, reset } from '../../../../../base/browser/dom.js';
+import { addDisposableGenericMouseMoveListener, append, reset } from '../../../../../base/browser/dom.js';
 import { renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { assertType } from '../../../../../base/common/types.js';
 import { localize } from '../../../../../nls.js';
 import { AcceptAction, navigationBearingFakeActionId, RejectAction } from './chatEditingEditorActions.js';
-import '../media/chatEditorOverlay.css';
 import { IChatService } from '../../common/chatService.js';
-import { rcut } from '../../../../../base/common/strings.js';
-import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
 import { IWorkbenchContribution } from '../../../../common/contributions.js';
 import { IEditorGroup, IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
 import { EditorGroupView } from '../../../../browser/parts/editor/editorGroupView.js';
@@ -31,22 +29,24 @@ import { IContextKeyService } from '../../../../../platform/contextkey/common/co
 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 { rcut } from '../../../../../base/common/strings.js';
 
 class ChatEditorOverlayWidget {
 
 	private readonly _domNode: HTMLElement;
-	private readonly _progressNode: HTMLElement;
+	// private readonly _progressNode: HTMLElement;
 	private readonly _toolbar: WorkbenchToolBar;
 
 	private readonly _showStore = new DisposableStore();
 
+	private readonly _session = observableValue<IChatEditingSession | undefined>(this, undefined);
 	private readonly _entry = observableValue<IModifiedFileEntry | undefined>(this, undefined);
 
 	private readonly _navigationBearings = observableValue<{ changeCount: number; activeIdx: number; entriesCount: number }>(this, { changeCount: -1, activeIdx: -1, entriesCount: -1 });
 
 	constructor(
 		private readonly _editor: { focus(): void },
-		@IHoverService private readonly _hoverService: IHoverService,
 		@IChatService private readonly _chatService: IChatService,
 		@IInstantiationService instaService: IInstantiationService,
 	) {
@@ -56,7 +56,6 @@ class ChatEditorOverlayWidget {
 		const progressNode = document.createElement('div');
 		progressNode.classList.add('chat-editor-overlay-progress');
 		append(progressNode, renderIcon(ThemeIcon.modify(Codicon.loading, 'spin')));
-		this._progressNode = append(progressNode, $('SPAN.busy-label'));
 		this._domNode.appendChild(progressNode);
 
 		const toolbarNode = document.createElement('div');
@@ -168,6 +167,93 @@ class ChatEditorOverlayWidget {
 						}
 					};
 				}
+
+				if (action.id === 'inlineChat2.reveal' || action.id === 'workbench.action.chat.openEditSession') {
+					return new class extends ActionViewItem {
+
+						private _requestMessage: IObservable<{ message: string; paused?: boolean } | undefined>;
+
+						constructor() {
+							super(undefined, action, options);
+
+							this._requestMessage = derived(r => {
+								const session = that._session.read(r);
+								const chatModel = that._chatService.getSession(session?.chatSessionId ?? '');
+								if (!session || !chatModel) {
+									return undefined;
+								}
+
+								const response = that._entry.read(r)?.isCurrentlyBeingModifiedBy.read(r);
+
+								if (response) {
+
+									if (response?.isPaused.read(r)) {
+										return { message: localize('paused', "Edits Paused"), paused: true };
+									}
+
+									const entry = that._entry.read(r);
+									if (entry) {
+										const progress = entry?.rewriteRatio.read(r);
+										const message = progress === 0
+											? localize('generating', "Generating Edits")
+											: localize('applyingPercentage', "{0}% Applying Edits", Math.round(progress * 100));
+
+										return { message };
+									}
+								}
+
+								if (session.isGlobalEditingSession) {
+									return undefined;
+								}
+
+								const request = observableFromEvent(this, chatModel.onDidChange, () => chatModel.getRequests().at(-1)).read(r);
+								if (!request || request.response?.isComplete) {
+									return undefined;
+								}
+								return { message: request.message.text };
+							});
+						}
+
+						override render(container: HTMLElement) {
+							super.render(container);
+
+							container.classList.add('label-item');
+
+							this._store.add(autorun(r => {
+								assertType(this.label);
+
+								const value = this._requestMessage.read(r);
+								if (!value) {
+									// normal rendering
+									this.options.icon = true;
+									this.options.label = false;
+									reset(this.label);
+									this.updateClass();
+									this.updateLabel();
+									this.updateTooltip();
+
+								} else {
+									this.options.icon = false;
+									this.options.label = true;
+									this.updateClass();
+									this.updateTooltip();
+
+									const message = rcut(value.message, 47);
+									reset(this.label, message);
+								}
+
+								const busy = Boolean(value && !value.paused);
+								that._domNode.classList.toggle('busy', busy);
+								this.label.classList.toggle('busy', busy);
+
+							}));
+						}
+
+						protected override getTooltip(): string | undefined {
+							return this._requestMessage.get()?.message;
+						}
+					};
+				}
 				return undefined;
 			}
 		});
@@ -183,54 +269,14 @@ class ChatEditorOverlayWidget {
 		return this._domNode;
 	}
 
-	showRequest(session: IChatEditingSession) {
-
-		this._showStore.clear();
-
-		const chatModel = this._chatService.getSession(session.chatSessionId);
-		const chatRequest = chatModel?.getRequests().at(-1);
-
-		if (!chatRequest || !chatRequest.response) {
-			this.hide();
-			return;
-		}
-
-		this._domNode.classList.toggle('busy', true);
-
-		const message = rcut(chatRequest.message.text, 47);
-		reset(this._progressNode, message);
-
-		this._showStore.add(this._hoverService.setupDelayedHover(this._progressNode, {
-			content: chatRequest.message.text,
-			appearance: { showPointer: true }
-		}));
-
-	}
-
-	showEntry(session: IChatEditingSession, activeEntry: IModifiedFileEntry, indicies: { entryIndex: IObservable<number | undefined>; changeIndex: IObservable<number | undefined> }) {
+	show(session: IChatEditingSession, entry: IModifiedFileEntry | undefined, indicies: { entryIndex: IObservable<number>; changeIndex: IObservable<number> }) {
 
 		this._showStore.clear();
 
-		this._entry.set(activeEntry, undefined);
-
-		this._showStore.add(autorun(r => {
-			const busy = activeEntry.isCurrentlyBeingModifiedBy.read(r);
-			this._domNode.classList.toggle('busy', !!busy);
-		}));
-
-		this._showStore.add(autorun(r => {
-			const paused = activeEntry.isCurrentlyBeingModifiedBy.read(r)?.isPaused.read(r);
-			const progress = activeEntry.rewriteRatio.read(r);
-
-			const text = paused
-				? localize('paused', "Edits Paused")
-				: progress === 0
-					? localize('generating', "Generating Edits")
-					: localize('applyingPercentage', "{0}% Applying Edits", Math.round(progress * 100));
-
-			this._domNode.classList.toggle('paused', !!paused);
-			reset(this._progressNode, text);
-		}));
+		transaction(tx => {
+			this._session.set(session, tx);
+			this._entry.set(entry, tx);
+		});
 
 		this._showStore.add(autorun(r => {
 
@@ -260,6 +306,7 @@ class ChatEditorOverlayWidget {
 
 	hide() {
 		transaction(tx => {
+			this._session.set(undefined, tx);
 			this._entry.set(undefined, tx);
 			this._navigationBearings.set({ changeCount: -1, activeIdx: -1, entriesCount: -1 }, tx);
 		});
@@ -327,27 +374,7 @@ class ChatEditingOverlayController {
 				return undefined;
 			}
 
-			const sessionObs = chatEditingService.editingSessionsObs.map((value, r) => {
-				for (const session of value) {
-					const entry = session.readEntry(uri, r);
-					if (entry) {
-						return { session, entry };
-					}
-				}
-				return undefined;
-			});
-
-			const result = sessionObs.read(r);
-			if (result) {
-				return result;
-			}
-
-			const inlineSessionObs = observableFromEvent(this, inlineChatService.onDidChangeSessions, () => inlineChatService.getSession2(uri));
-			const inlineSession = inlineSessionObs.read(r);
-			return inlineSession
-				? { session: inlineSession.editingSession, entry: inlineSession.editingSession.readEntry(uri, r) }
-				: undefined;
-
+			return new ObservableEditorSession(uri, chatEditingService, inlineChatService).value.read(r);
 		});
 
 		const isInProgress = derived(r => {
@@ -380,7 +407,7 @@ class ChatEditingOverlayController {
 
 			if (!session.isGlobalEditingSession && isInProgress.read(r) && !entry?.isCurrentlyBeingModifiedBy.read(r)) {
 				// inline chat request
-				widget.showRequest(session);
+				widget.show(session, undefined, { entryIndex: constObservable(0), changeIndex: constObservable(0) });
 				show();
 
 			} else if (entry?.state.read(r) === WorkingSetEntryState.Modified) {
@@ -390,10 +417,10 @@ class ChatEditingOverlayController {
 
 				const changeIndex = derived(r => {
 					const idx = entry.getEditorIntegration(editorPane).currentIndex.read(r);
-					return idx < 0 ? undefined : idx;
+					return idx;
 				});
 
-				widget.showEntry(session, entry, {
+				widget.show(session, entry, {
 					entryIndex: derived(r => session.entries.read(r).indexOf(entry)),
 					changeIndex
 				});
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatEditorOverlay.css b/src/vs/workbench/contrib/chat/browser/media/chatEditingEditorOverlay.css
similarity index 90%
rename from src/vs/workbench/contrib/chat/browser/media/chatEditorOverlay.css
rename to src/vs/workbench/contrib/chat/browser/media/chatEditingEditorOverlay.css
index 79c7251217f6..331871acc2f0 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatEditorOverlay.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatEditingEditorOverlay.css
@@ -46,10 +46,6 @@
 	display: inline-flex;
 }
 
-.chat-editor-overlay-widget.busy .chat-editor-overlay-progress .busy-label {
-	padding: 5px;
-	/* font-style: italic; */
-}
 
 @keyframes ellipsis {
 	0% {
@@ -69,27 +65,10 @@
 	}
 }
 
-.chat-editor-overlay-widget.busy .chat-editor-overlay-progress .busy-label::after {
-	content: "";
-	display: inline-flex;
-	white-space: nowrap;
-	overflow: hidden;
-	width: 3ch;
-	animation: ellipsis steps(4, end) 1s infinite;
-}
-
 .chat-editor-overlay-widget.busy.paused .chat-editor-overlay-progress {
 	.codicon-loading {
 		display: none;
 	}
-
-	.busy-label::after {
-		animation-duration: 5s;
-	}
-}
-
-.chat-editor-overlay-widget.busy .chat-editor-overlay-toolbar {
-	display: none;
 }
 
 .chat-editor-overlay-widget .action-item > .action-label {
@@ -97,6 +76,15 @@
 	font-size: 12px;
 }
 
+.chat-editor-overlay-widget.busy .action-item > .action-label.busy::after {
+	content: "";
+	display: inline-flex;
+	white-space: nowrap;
+	overflow: hidden;
+	width: 3ch;
+	animation: ellipsis steps(4, end) 1s infinite;
+}
+
 .chat-editor-overlay-widget .action-item:first-child > .action-label {
 	padding-left: 7px;
 }

From 4b83f34c151a5676e37fb117d3736efb70aac72c Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 21 Feb 2025 16:19:13 +0100
Subject: [PATCH 0228/1815] Make autorun/derived restartable in case of an
 error (#241479)

---
 src/vs/base/common/observableInternal/autorun.ts | 12 +++++-------
 src/vs/base/common/observableInternal/derived.ts | 13 ++++++-------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/vs/base/common/observableInternal/autorun.ts b/src/vs/base/common/observableInternal/autorun.ts
index 9a8200c0c5a4..b1f8f4e95301 100644
--- a/src/vs/base/common/observableInternal/autorun.ts
+++ b/src/vs/base/common/observableInternal/autorun.ts
@@ -188,7 +188,7 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 	) {
 		this.changeSummary = this.createChangeSummary?.();
 		getLogger()?.handleAutorunCreated(this);
-		this._runIfNeeded();
+		this._run();
 
 		trackDisposable(this);
 	}
@@ -204,11 +204,7 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 		markAsDisposed(this);
 	}
 
-	private _runIfNeeded() {
-		if (this._state === AutorunState.upToDate) {
-			return;
-		}
-
+	private _run() {
 		const emptySet = this.dependenciesToBeRemoved;
 		this.dependenciesToBeRemoved = this._dependencies;
 		this._dependencies = emptySet;
@@ -269,7 +265,9 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 						}
 					}
 
-					this._runIfNeeded(); // Warning: indirect external call!
+					if (this._state !== AutorunState.upToDate) {
+						this._run(); // Warning: indirect external call!
+					}
 				} while (this._state !== AutorunState.upToDate);
 			}
 		} finally {
diff --git a/src/vs/base/common/observableInternal/derived.ts b/src/vs/base/common/observableInternal/derived.ts
index b8ff0a7fab02..0735be62c234 100644
--- a/src/vs/base/common/observableInternal/derived.ts
+++ b/src/vs/base/common/observableInternal/derived.ts
@@ -100,8 +100,8 @@ export function derivedHandleChanges<T, TChangeSummary>(
 }
 
 export function derivedWithStore<T>(computeFn: (reader: IReader, store: DisposableStore) => T): IObservable<T>;
-export function derivedWithStore<T>(owner: object, computeFn: (reader: IReader, store: DisposableStore) => T): IObservable<T>;
-export function derivedWithStore<T>(computeFnOrOwner: ((reader: IReader, store: DisposableStore) => T) | object, computeFnOrUndefined?: ((reader: IReader, store: DisposableStore) => T)): IObservable<T> {
+export function derivedWithStore<T>(owner: DebugOwner, computeFn: (reader: IReader, store: DisposableStore) => T): IObservable<T>;
+export function derivedWithStore<T>(computeFnOrOwner: ((reader: IReader, store: DisposableStore) => T) | DebugOwner, computeFnOrUndefined?: ((reader: IReader, store: DisposableStore) => T)): IObservable<T> {
 	let computeFn: (reader: IReader, store: DisposableStore) => T;
 	let owner: DebugOwner;
 	if (computeFnOrUndefined === undefined) {
@@ -278,17 +278,16 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 					this._state = DerivedState.upToDate;
 				}
 
-				this._recomputeIfNeeded();
+				if (this._state !== DerivedState.upToDate) {
+					this._recompute();
+				}
 				// In case recomputation changed one of our dependencies, we need to recompute again.
 			} while (this._state !== DerivedState.upToDate);
 			return this.value!;
 		}
 	}
 
-	private _recomputeIfNeeded() {
-		if (this._state === DerivedState.upToDate) {
-			return;
-		}
+	private _recompute() {
 		const emptySet = this.dependenciesToBeRemoved;
 		this.dependenciesToBeRemoved = this._dependencies;
 		this._dependencies = emptySet;

From dc49da54e6f2e71f1fc3211354b28c022d1fea56 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Fri, 21 Feb 2025 16:23:45 +0100
Subject: [PATCH 0229/1815] Fix ghost text cursor style (#241480)

fix ghost text cursor is pointer
---
 .../browser/view/ghostText/ghostTextView.css          | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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 2839f49bb12a..3bcb8b5f61ab 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.css
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.css
@@ -24,15 +24,16 @@
 	font-size: 0;
 }
 
-.monaco-editor .ghost-text-decoration, .monaco-editor .suggest-preview-text.clickable .view-line {
-	z-index: 1;
+.monaco-editor .ghost-text-decoration,
+.monaco-editor .suggest-preview-text .ghost-text {
+	font-style: italic;
 }
 
-.monaco-editor .ghost-text-decoration, .monaco-editor .suggest-preview-text .ghost-text {
-	font-style: italic;
+.monaco-editor .suggest-preview-text.clickable .view-line {
+	z-index: 1;
 }
 
-.monaco-editor .ghost-text-decoration, .monaco-editor .suggest-preview-text.clickable .ghost-text {
+.monaco-editor .suggest-preview-text.clickable .ghost-text {
 	cursor: pointer;
 }
 

From ad1bc3e2051d1e7dc95a0154635e525f6f07e348 Mon Sep 17 00:00:00 2001
From: meganrogge <merogge@microsoft.com>
Date: Fri, 21 Feb 2025 10:12:43 -0600
Subject: [PATCH 0230/1815] ensure completion items are returned

---
 .../suggest/browser/terminalCompletionService.ts                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
index 3d4589a775cd..c29b2a57d48f 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
@@ -191,7 +191,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 				}
 				return completionItems;
 			}
-			return;
+			return completionItems.length ? completionItems : undefined;
 		});
 
 		const results = await Promise.all(completionPromises);

From e380facb66e760f7702e995d8efd65a2ea09e07a Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 21 Feb 2025 08:41:51 -0800
Subject: [PATCH 0231/1815] Make execution.read() return output consistently

Previously TerminalShellExecution.read() would return output inconsistently,
sometimes including the 633;D sequences, sometimes, not, sometimes including the
following prompt. This change ensures that the output is always consistent by
first segmenting any data events containing C and D sequences, and then ensuring
nothing async happens between the D handler firing and the execution end event
firing to the exthost. This means that C will consistently be included (as was
the case before) and D will consistently be excluded.

Fixes #237208
---
 .../commandDetectionCapability.ts             | 13 ++++------
 .../mainThreadTerminalShellIntegration.ts     | 12 +++++----
 .../terminal/browser/terminalInstance.ts      | 25 +++++++++++--------
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
index d2413b5897ea..00d03a94a11c 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
@@ -381,14 +381,11 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 
 		if (newCommand) {
 			this._commands.push(newCommand);
-			this._commitCommandFinished = new RunOnceScheduler(() => {
-				this._onBeforeCommandFinished.fire(newCommand);
-				if (!this._currentCommand.isInvalid) {
-					this._logService.debug('CommandDetectionCapability#onCommandFinished', newCommand);
-					this._onCommandFinished.fire(newCommand);
-				}
-			}, 50);
-			this._commitCommandFinished.schedule();
+			this._onBeforeCommandFinished.fire(newCommand);
+			if (!this._currentCommand.isInvalid) {
+				this._logService.debug('CommandDetectionCapability#onCommandFinished', newCommand);
+				this._onCommandFinished.fire(newCommand);
+			}
 		}
 		this._currentCommand = new PartialTerminalCommand(this._terminal);
 		this._handleCommandStartOptions = undefined;
diff --git a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
index ff9d34a7ceda..44cc83b1116e 100644
--- a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
@@ -90,7 +90,9 @@ export class MainThreadTerminalShellIntegration extends Disposable implements Ma
 			// TerminalShellExecution.createDataStream
 			// Debounce events to reduce the message count - when this listener is disposed the events will be flushed
 			instanceDataListeners.get(instanceId)?.dispose();
-			instanceDataListeners.set(instanceId, Event.accumulate(e.instance.onData, 50, this._store)(events => this._proxy.$shellExecutionData(instanceId, events.join(''))));
+			instanceDataListeners.set(instanceId, Event.accumulate(e.instance.onData, 50, this._store)(events => {
+				this._proxy.$shellExecutionData(instanceId, events.join(''));
+			}));
 		}));
 
 		// onDidEndTerminalShellExecution
@@ -99,10 +101,10 @@ export class MainThreadTerminalShellIntegration extends Disposable implements Ma
 			currentCommand = undefined;
 			const instanceId = e.instance.instanceId;
 			instanceDataListeners.get(instanceId)?.dispose();
-			// Send end in a microtask to ensure the data events are sent first
-			setTimeout(() => {
-				this._proxy.$shellExecutionEnd(instanceId, e.data.command, convertToExtHostCommandLineConfidence(e.data), e.data.isTrusted, e.data.exitCode);
-			});
+			// Shell integration C (executed) and D (command finished) sequences should always be in
+			// their own events, so send this immediately. This means that the D sequence will not
+			// be included as it's currently being parsed when the command finished event fires.
+			this._proxy.$shellExecutionEnd(instanceId, e.data.command, convertToExtHostCommandLineConfidence(e.data), e.data.isTrusted, e.data.exitCode);
 		}));
 
 		// Clean up after dispose
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index 3da24081cb8d..f66318637f62 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -1522,18 +1522,23 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	}
 
 	private _onProcessData(ev: IProcessDataEvent): void {
-		// Ensure events are split by SI command execute sequence to ensure the output of the
-		// command can be read by extensions. This must be done here as xterm.js does not currently
-		// have a listener for when individual data events are parsed, only `onWriteParsed` which
-		// fires when the write buffer is flushed.
-		const execIndex = ev.data.indexOf('\x1b]633;C\x07');
-		if (execIndex !== -1) {
+		// Ensure events are split by SI command execute and command finished sequence to ensure the
+		// output of the command can be read by extensions and the output of the command is of a
+		// consistent form respectively. This must be done here as xterm.js does not currently have
+		// a listener for when individual data events are parsed, only `onWriteParsed` which fires
+		// when the write buffer is flushed.
+		const match = ev.data.match(/(?<seq>\x1b][16]33;(?:C|D(?:;\d+)?)\x07)/);
+		const index = match?.index;
+		if (match?.groups?.seq && index !== undefined) {
+			const seq = match?.groups?.seq;
 			if (ev.trackCommit) {
-				this._writeProcessData(ev.data.substring(0, execIndex + '\x1b]633;C\x07'.length));
-				ev.writePromise = new Promise<void>(r => this._writeProcessData(ev.data.substring(execIndex + '\x1b]633;C\x07'.length), r));
+				this._writeProcessData(ev.data.substring(0, index));
+				this._writeProcessData(seq);
+				ev.writePromise = new Promise<void>(r => this._writeProcessData(ev.data.substring(index + seq.length), r));
 			} else {
-				this._writeProcessData(ev.data.substring(0, execIndex + '\x1b]633;C\x07'.length));
-				this._writeProcessData(ev.data.substring(execIndex + '\x1b]633;C\x07'.length));
+				this._writeProcessData(ev.data.substring(0, index));
+				this._writeProcessData(seq);
+				this._writeProcessData(ev.data.substring(index + seq.length));
 			}
 		} else {
 			if (ev.trackCommit) {

From 5a68d927f3fbc2e8cac12c5f3157b68af9d38eb8 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 21 Feb 2025 08:44:11 -0800
Subject: [PATCH 0232/1815] Be explicit about ] not being a special regex char

---
 src/vs/workbench/contrib/terminal/browser/terminalInstance.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index f66318637f62..3494d3fccc18 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -1527,7 +1527,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		// consistent form respectively. This must be done here as xterm.js does not currently have
 		// a listener for when individual data events are parsed, only `onWriteParsed` which fires
 		// when the write buffer is flushed.
-		const match = ev.data.match(/(?<seq>\x1b][16]33;(?:C|D(?:;\d+)?)\x07)/);
+		const match = ev.data.match(/(?<seq>\x1b\][16]33;(?:C|D(?:;\d+)?)\x07)/);
 		const index = match?.index;
 		if (match?.groups?.seq && index !== undefined) {
 			const seq = match?.groups?.seq;

From d0f6d4247ff6e76f0375067b09488d19d31ac178 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 21 Feb 2025 08:47:52 -0800
Subject: [PATCH 0233/1815] Remove unneeded unsafe cast

Follow up on #241474
---
 .../common/capabilities/commandDetection/promptInputModel.ts  | 2 +-
 .../common/capabilities/commandDetectionCapability.ts         | 4 ++--
 .../capabilities/commandDetection/promptInputModel.test.ts    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts b/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts
index 0e1e340b3d30..b04874d672de 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.ts
@@ -105,7 +105,7 @@ export class PromptInputModel extends Disposable implements IPromptInputModel {
 	constructor(
 		private readonly _xterm: Terminal,
 		onCommandStart: Event<ITerminalCommand>,
-		onCommandStartChanged: Event<ITerminalCommand>,
+		onCommandStartChanged: Event<void>,
 		onCommandExecuted: Event<ITerminalCommand>,
 		@ILogService private readonly _logService: ILogService
 	) {
diff --git a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
index 65237a89fe53..4310f46a83cf 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
@@ -61,7 +61,7 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 
 	private readonly _onCommandStarted = this._register(new Emitter<ITerminalCommand>());
 	readonly onCommandStarted = this._onCommandStarted.event;
-	private readonly _onCommandStartChanged = this._register(new Emitter<ITerminalCommand>());
+	private readonly _onCommandStartChanged = this._register(new Emitter<void>());
 	readonly onCommandStartChanged = this._onCommandStartChanged.event;
 	private readonly _onBeforeCommandFinished = this._register(new Emitter<ITerminalCommand>());
 	readonly onBeforeCommandFinished = this._onBeforeCommandFinished.event;
@@ -332,7 +332,7 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 		this._currentCommand.commandStartMarker = options?.marker || this._currentCommand.commandStartMarker;
 		if (this._currentCommand.commandStartMarker?.line === this._terminal.buffer.active.cursorY) {
 			this._currentCommand.commandStartX = this._terminal.buffer.active.cursorX;
-			this._onCommandStartChanged.fire(this._currentCommand as any as ITerminalCommand);
+			this._onCommandStartChanged.fire();
 			this._logService.debug('CommandDetectionCapability#handleCommandStart', this._currentCommand.commandStartX, this._currentCommand.commandStartMarker?.line);
 			return;
 		}
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 0e10e25cce9e..dc34f387e61a 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
@@ -19,7 +19,7 @@ suite('PromptInputModel', () => {
 	let promptInputModel: PromptInputModel;
 	let xterm: Terminal;
 	let onCommandStart: Emitter<ITerminalCommand>;
-	let onCommandStartChanged: Emitter<ITerminalCommand>;
+	let onCommandStartChanged: Emitter<void>;
 	let onCommandExecuted: Emitter<ITerminalCommand>;
 
 	async function writePromise(data: string) {

From 7006564fa220c111b8b826aeb51c11c3b61984ab Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 21 Feb 2025 09:02:26 -0800
Subject: [PATCH 0234/1815] Remove commit command finished

---
 .../capabilities/commandDetectionCapability.ts    | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
index 00d03a94a11c..161fa5c5b16e 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
@@ -34,8 +34,6 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 	private __isCommandStorageDisabled: boolean = false;
 	private _handleCommandStartOptions?: IHandleCommandOptions;
 
-	private _commitCommandFinished?: RunOnceScheduler;
-
 	private _ptyHeuristicsHooks: ICommandDetectionHeuristicsHooks;
 	private readonly _ptyHeuristics: MandatoryMutableDisposable<IPtyHeuristics>;
 
@@ -128,10 +126,6 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 			get commandMarkers() { return that._commandMarkers; }
 			set commandMarkers(value) { that._commandMarkers = value; }
 			get clearCommandsInViewport() { return that._clearCommandsInViewport.bind(that); }
-			commitCommandFinished() {
-				that._commitCommandFinished?.flush();
-				that._commitCommandFinished = undefined;
-			}
 		};
 		this._ptyHeuristics = this._register(new MandatoryMutableDisposable(new UnixPtyHeuristics(this._terminal, this, this._ptyHeuristicsHooks, this._logService)));
 
@@ -219,10 +213,6 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 					get commandMarkers() { return that._commandMarkers; }
 					set commandMarkers(value) { that._commandMarkers = value; }
 					get clearCommandsInViewport() { return that._clearCommandsInViewport.bind(that); }
-					commitCommandFinished() {
-						that._commitCommandFinished?.flush();
-						that._commitCommandFinished = undefined;
-					}
 				},
 				this._logService
 			);
@@ -467,7 +457,6 @@ interface ICommandDetectionHeuristicsHooks {
 	commandMarkers: IMarker[];
 
 	clearCommandsInViewport(): void;
-	commitCommandFinished(): void;
 }
 
 type IPtyHeuristics = (
@@ -499,8 +488,6 @@ class UnixPtyHeuristics extends Disposable {
 	}
 
 	handleCommandStart(options?: IHandleCommandOptions) {
-		this._hooks.commitCommandFinished();
-
 		const currentCommand = this._capability.currentCommand;
 		currentCommand.commandStartX = this._terminal.buffer.active.cursorX;
 		currentCommand.commandStartMarker = options?.marker || this._terminal.registerMarker(0);
@@ -755,8 +742,6 @@ class WindowsPtyHeuristics extends Disposable {
 			this._tryAdjustCommandStartMarkerScheduler = undefined;
 		}
 
-		this._hooks.commitCommandFinished();
-
 		if (!this._capability.currentCommand.commandExecutedMarker) {
 			this._onCursorMoveListener.value = this._terminal.onCursorMove(() => {
 				if (this._hooks.commandMarkers.length === 0 || this._hooks.commandMarkers[this._hooks.commandMarkers.length - 1].line !== this._terminal.buffer.active.cursorY) {

From 8cee84ca1fb73e3f7de8b26a9485c0115fa2f952 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 21 Feb 2025 09:07:53 -0800
Subject: [PATCH 0235/1815] Mark fields in `Selection` as readonly

The implementation of this class [only has getters](https://github.com/microsoft/vscode/blob/c1c6484a64a059f2e367ffa3b6c8de4aaa58159d/src/vs/workbench/api/common/extHostTypes.ts#L450) so I don't think these were meant to be writable
---
 src/vscode-dts/vscode.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts
index 180f9bbcaa11..7873c0dc665b 100644
--- a/src/vscode-dts/vscode.d.ts
+++ b/src/vscode-dts/vscode.d.ts
@@ -501,13 +501,13 @@ declare module 'vscode' {
 		 * The position at which the selection starts.
 		 * This position might be before or after {@link Selection.active active}.
 		 */
-		anchor: Position;
+		readonly anchor: Position;
 
 		/**
 		 * The position of the cursor.
 		 * This position might be before or after {@link Selection.anchor anchor}.
 		 */
-		active: Position;
+		readonly active: Position;
 
 		/**
 		 * Create a selection from two positions.
@@ -530,7 +530,7 @@ declare module 'vscode' {
 		/**
 		 * A selection is reversed if its {@link Selection.anchor anchor} is the {@link Selection.end end} position.
 		 */
-		isReversed: boolean;
+		readonly isReversed: boolean;
 	}
 
 	/**

From cf93804e070ab26abcf5c2d7fcdc0e935e58bf19 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 21 Feb 2025 18:18:14 +0100
Subject: [PATCH 0236/1815] chat - refactor status entry (#241454)

---
 .../lib/stylelint/vscode-known-variables.json |  21 +-
 .../parts/statusbar/media/statusbarpart.css   |  12 +-
 .../browser/parts/statusbar/statusbarPart.ts  |   9 +-
 src/vs/workbench/common/theme.ts              |  16 +-
 .../chat/browser/actions/chatActions.ts       |  80 ++++++-
 .../browser/actions/chatGettingStarted.ts     |   9 +-
 .../contrib/chat/browser/chat.contribution.ts |   5 +-
 .../contrib/chat/browser/chatQuotasService.ts | 224 ------------------
 .../contrib/chat/browser/chatSetup.ts         |  76 +++---
 .../contrib/chat/browser/chatStatus.ts        | 139 +++++++++++
 .../contrib/chat/common/chatQuotasService.ts  | 117 +++++++++
 .../contrib/remote/browser/remoteIndicator.ts |   2 +-
 .../services/statusbar/browser/statusbar.ts   |   4 +-
 .../parts/statusbar/statusbarModel.test.ts    |  20 ++
 14 files changed, 456 insertions(+), 278 deletions(-)
 delete mode 100644 src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
 create mode 100644 src/vs/workbench/contrib/chat/browser/chatStatus.ts
 create mode 100644 src/vs/workbench/contrib/chat/common/chatQuotasService.ts

diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
index 92fe96c874f3..3fbded851903 100644
--- a/build/lib/stylelint/vscode-known-variables.json
+++ b/build/lib/stylelint/vscode-known-variables.json
@@ -57,6 +57,7 @@
 		"--vscode-chat-requestBorder",
 		"--vscode-chat-slashCommandBackground",
 		"--vscode-chat-slashCommandForeground",
+		"--vscode-chatEdits-minimapColor",
 		"--vscode-checkbox-background",
 		"--vscode-checkbox-border",
 		"--vscode-checkbox-foreground",
@@ -279,6 +280,7 @@
 		"--vscode-editorMarkerNavigationInfo-headerBackground",
 		"--vscode-editorMarkerNavigationWarning-background",
 		"--vscode-editorMarkerNavigationWarning-headerBackground",
+		"--vscode-editorMinimap-inlineChatInserted",
 		"--vscode-editorMultiCursor-primary-background",
 		"--vscode-editorMultiCursor-primary-foreground",
 		"--vscode-editorMultiCursor-secondary-background",
@@ -360,17 +362,26 @@
 		"--vscode-inlineChatInput-border",
 		"--vscode-inlineChatInput-focusBorder",
 		"--vscode-inlineChatInput-placeholderForeground",
-		"--vscode-inlineEdit-border",
+		"--vscode-inlineEdit-gutterIndicator-background",
+		"--vscode-inlineEdit-gutterIndicator-primaryBackground",
+		"--vscode-inlineEdit-gutterIndicator-primaryForeground",
+		"--vscode-inlineEdit-gutterIndicator-secondaryBackground",
+		"--vscode-inlineEdit-gutterIndicator-secondaryForeground",
+		"--vscode-inlineEdit-gutterIndicator-successfulBackground",
+		"--vscode-inlineEdit-gutterIndicator-successfulForeground",
 		"--vscode-inlineEdit-indicator-background",
 		"--vscode-inlineEdit-indicator-border",
 		"--vscode-inlineEdit-indicator-foreground",
 		"--vscode-inlineEdit-modifiedBackground",
+		"--vscode-inlineEdit-modifiedBorder",
 		"--vscode-inlineEdit-modifiedChangedLineBackground",
 		"--vscode-inlineEdit-modifiedChangedTextBackground",
 		"--vscode-inlineEdit-originalBackground",
+		"--vscode-inlineEdit-originalBorder",
 		"--vscode-inlineEdit-originalChangedLineBackground",
 		"--vscode-inlineEdit-originalChangedTextBackground",
-		"--vscode-inlineEdit-acceptedBackground",
+		"--vscode-inlineEdit-tabWillAcceptBorder",
+		"--vscode-inlineEdit-wordReplacementView-background",
 		"--vscode-input-background",
 		"--vscode-input-border",
 		"--vscode-input-foreground",
@@ -638,6 +649,10 @@
 		"--vscode-statusBar-noFolderForeground",
 		"--vscode-statusBarItem-activeBackground",
 		"--vscode-statusBarItem-compactHoverBackground",
+		"--vscode-statusBarItem-copilotBackground",
+		"--vscode-statusBarItem-copilotForeground",
+		"--vscode-statusBarItem-copilotHoverBackground",
+		"--vscode-statusBarItem-copilotHoverForeground",
 		"--vscode-statusBarItem-errorBackground",
 		"--vscode-statusBarItem-errorForeground",
 		"--vscode-statusBarItem-errorHoverBackground",
@@ -919,4 +934,4 @@
 		"--monaco-editor-warning-decoration",
 		"--animation-opacity"
 	]
-}
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
index b7b1bd7dd7c8..3244a1b4cb37 100644
--- a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
+++ b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
@@ -98,7 +98,7 @@
 }
 
 .monaco-workbench .part.statusbar > .items-container > .statusbar-item.right.last-visible-item {
-	margin-right: 7px; /* Add margin to the most right status bar item */
+	padding-right: 7px; /* Add padding to the most right status bar item */
 }
 
 /* Tweak appearance for items with background to improve hover feedback */
@@ -239,3 +239,13 @@
 	color: var(--vscode-statusBarItem-offlineHoverForeground);
 	background-color: var(--vscode-statusBarItem-offlineHoverBackground) !important;
 }
+
+.monaco-workbench .part.statusbar > .items-container > .statusbar-item.copilot-kind {
+	color: var(--vscode-statusBarItem-copilotForeground);
+	background-color: var(--vscode-statusBarItem-copilotBackground);
+}
+
+.monaco-workbench .part.statusbar > .items-container > .statusbar-item.copilot-kind a:hover:not(.disabled) {
+	color: var(--vscode-statusBarItem-copilotHoverForeground);
+	background-color: var(--vscode-statusBarItem-copilotHoverBackground) !important;
+}
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index 6aee246ef2c4..9b8e33d5f7d0 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -794,11 +794,12 @@ export class StatusbarService extends MultiWindowParts<StatusbarPart> implements
 		return this.mainPart.addEntry(entry, id, alignment, priorityOrLocation);
 	}
 
-	private doAddEntryToAllWindows(entry: IStatusbarEntry, id: string, alignment: StatusbarAlignment, priorityOrLocation: number | IStatusbarEntryLocation | IStatusbarEntryPriority = 0): IStatusbarEntryAccessor {
+	private doAddEntryToAllWindows(originalEntry: IStatusbarEntry, id: string, alignment: StatusbarAlignment, priorityOrLocation: number | IStatusbarEntryLocation | IStatusbarEntryPriority = 0): IStatusbarEntryAccessor {
 		const entryDisposables = new DisposableStore();
 
 		const accessors = new Set<IStatusbarEntryAccessor>();
 
+		let entry = originalEntry;
 		function addEntry(part: StatusbarPart | AuxiliaryStatusbarPart): void {
 			const partDisposables = new DisposableStore();
 			partDisposables.add(part.onWillDispose(() => partDisposables.dispose()));
@@ -818,9 +819,11 @@ export class StatusbarService extends MultiWindowParts<StatusbarPart> implements
 		entryDisposables.add(this.onDidCreateAuxiliaryStatusbarPart(part => addEntry(part)));
 
 		return {
-			update: (entry: IStatusbarEntry) => {
+			update: (updatedEntry: IStatusbarEntry) => {
+				entry = updatedEntry;
+
 				for (const update of accessors) {
-					update.update(entry);
+					update.update(updatedEntry);
 				}
 			},
 			dispose: () => entryDisposables.dispose()
diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
index 0ddf956f715d..6c725fcfcba5 100644
--- a/src/vs/workbench/common/theme.ts
+++ b/src/vs/workbench/common/theme.ts
@@ -565,11 +565,12 @@ export const PROFILE_BADGE_FOREGROUND = registerColor('profileBadge.foreground',
 	hcLight: Color.white
 }, localize('profileBadgeForeground', "Profile badge foreground color. The profile badge shows on top of the settings gear icon in the activity bar."));
 
+
 // < --- Remote --- >
 
-export const STATUS_BAR_REMOTE_ITEM_BACKGROUND = registerColor('statusBarItem.remoteBackground', ACTIVITY_BAR_BADGE_BACKGROUND, localize('statusBarItemHostBackground', "Background color for the remote indicator on the status bar."));
+export const STATUS_BAR_REMOTE_ITEM_BACKGROUND = registerColor('statusBarItem.remoteBackground', ACTIVITY_BAR_BADGE_BACKGROUND, localize('statusBarItemRemoteBackground', "Background color for the remote indicator on the status bar."));
 
-export const STATUS_BAR_REMOTE_ITEM_FOREGROUND = registerColor('statusBarItem.remoteForeground', ACTIVITY_BAR_BADGE_FOREGROUND, localize('statusBarItemHostForeground', "Foreground color for the remote indicator on the status bar."));
+export const STATUS_BAR_REMOTE_ITEM_FOREGROUND = registerColor('statusBarItem.remoteForeground', ACTIVITY_BAR_BADGE_FOREGROUND, localize('statusBarItemRemoteForeground', "Foreground color for the remote indicator on the status bar."));
 
 export const STATUS_BAR_REMOTE_ITEM_HOVER_FOREGROUND = registerColor('statusBarItem.remoteHoverForeground', STATUS_BAR_ITEM_HOVER_FOREGROUND, localize('statusBarRemoteItemHoverForeground', "Foreground color for the remote indicator on the status bar when hovering."));
 
@@ -598,6 +599,17 @@ export const EXTENSION_BADGE_REMOTE_BACKGROUND = registerColor('extensionBadge.r
 export const EXTENSION_BADGE_REMOTE_FOREGROUND = registerColor('extensionBadge.remoteForeground', ACTIVITY_BAR_BADGE_FOREGROUND, localize('extensionBadge.remoteForeground', "Foreground color for the remote badge in the extensions view."));
 
 
+// < --- Copilot --- >
+
+export const STATUS_BAR_COPILOT_ITEM_BACKGROUND = registerColor('statusBarItem.copilotBackground', STATUS_BAR_REMOTE_ITEM_BACKGROUND, localize('statusBarItemCopilotBackground', "Background color for the Copilot indicator on the status bar."));
+
+export const STATUS_BAR_COPILOT_ITEM_FOREGROUND = registerColor('statusBarItem.copilotForeground', STATUS_BAR_REMOTE_ITEM_FOREGROUND, localize('statusBarItemCopilotForeground', "Foreground color for the Copilot indicator on the status bar."));
+
+export const STATUS_BAR_COPILOT_ITEM_HOVER_FOREGROUND = registerColor('statusBarItem.copilotHoverForeground', STATUS_BAR_REMOTE_ITEM_HOVER_FOREGROUND, localize('statusBarCopilotItemHoverForeground', "Foreground color for the Copilot indicator on the status bar when hovering."));
+
+export const STATUS_BAR_COPILOT_ITEM_HOVER_BACKGROUND = registerColor('statusBarItem.copilotHoverBackground', STATUS_BAR_REMOTE_ITEM_HOVER_BACKGROUND, localize('statusBarAiItemHoverBackground', "Background color for the Copilot indicator on the status bar when hovering."));
+
+
 // < --- Side Bar --- >
 
 export const SIDE_BAR_BACKGROUND = registerColor('sideBar.background', {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index 241c10e9b679..9b9c3c409a2f 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -6,7 +6,7 @@
 import { toAction } from '../../../../../base/common/actions.js';
 import { coalesce } from '../../../../../base/common/arrays.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
-import { fromNowByDay } from '../../../../../base/common/date.js';
+import { fromNowByDay, safeIntl } from '../../../../../base/common/date.js';
 import { Event } from '../../../../../base/common/event.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore, markAsSingleton } from '../../../../../base/common/lifecycle.js';
@@ -46,14 +46,20 @@ import { ILanguageModelToolsService } from '../../common/languageModelToolsServi
 import { ChatViewId, IChatWidget, IChatWidgetService, showChatView } from '../chat.js';
 import { IChatEditorOptions } from '../chatEditor.js';
 import { ChatEditorInput } from '../chatEditorInput.js';
-import { IChatQuotasService, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, quotaToButtonMessage } from '../chatQuotasService.js';
+import { IChatQuotasService } from '../../common/chatQuotasService.js';
 import { ChatViewPane } from '../chatViewPane.js';
 import { convertBufferToScreenshotVariable } from '../contrib/screenshot.js';
 import { clearChatEditor } from './chatClear.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
+import { language } from '../../../../../base/common/platform.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 
 export const CHAT_CATEGORY = localize2('chat.category', 'Chat');
 export const CHAT_OPEN_ACTION_ID = 'workbench.action.chat.open';
 
+export const CHAT_SETUP_ACTION_ID = 'workbench.action.chat.triggerSetup';
+export const CHAT_SETUP_ACTION_LABEL = localize2('triggerChatSetup', "Use AI Features with Copilot for Free...");
+
 export interface IChatViewOpenOptions {
 	/**
 	 * The query for quick chat.
@@ -341,6 +347,8 @@ MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
 	when: ContextKeyExpr.equals('view', ChatViewId)
 });
 
+export const OPEN_CHAT_QUOTA_EXCEEDED_DIALOG = 'workbench.action.chat.openQuotaExceededDialog';
+
 export function registerChatActions() {
 	registerAction2(OpenChatGlobalAction);
 	registerAction2(ChatHistoryAction);
@@ -527,6 +535,58 @@ export function registerChatActions() {
 			commandService.executeCommand('github.copilot.toggleStatusMenu');
 		}
 	});
+
+	registerAction2(class ShowLimitReachedDialogAction extends Action2 {
+
+		constructor() {
+			super({
+				id: OPEN_CHAT_QUOTA_EXCEEDED_DIALOG,
+				title: localize('upgradeChat', "Upgrade to Copilot Pro")
+			});
+		}
+
+		override async run(accessor: ServicesAccessor) {
+			const chatQuotasService = accessor.get(IChatQuotasService);
+			const commandService = accessor.get(ICommandService);
+			const dialogService = accessor.get(IDialogService);
+
+			const dateFormatter = safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric' });
+
+			let message: string;
+			const { chatQuotaExceeded, completionsQuotaExceeded } = chatQuotasService.quotas;
+			if (chatQuotaExceeded && !completionsQuotaExceeded) {
+				message = localize('chatQuotaExceeded', "You've run out of free chat messages. You still have free code completions available in the Copilot Free plan. These limits will reset on {0}.", dateFormatter.format(chatQuotasService.quotas.quotaResetDate));
+			} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
+				message = localize('completionsQuotaExceeded', "You've run out of free code completions. You still have free chat messages available in the Copilot Free plan. These limits will reset on {0}.", dateFormatter.format(chatQuotasService.quotas.quotaResetDate));
+			} else {
+				message = localize('chatAndCompletionsQuotaExceeded', "You've reached the limit of the Copilot Free plan. These limits will reset on {0}.", dateFormatter.format(chatQuotasService.quotas.quotaResetDate));
+			}
+
+			const upgradeToPro = localize('upgradeToPro', "Upgrade to Copilot Pro (your first 30 days are free) for:\n- Unlimited code completions\n- Unlimited chat messages\n- Access to additional models");
+
+			await dialogService.prompt({
+				type: 'none',
+				message: localize('copilotFree', "Copilot Limit Reached"),
+				cancelButton: {
+					label: localize('dismiss', "Dismiss"),
+					run: () => { /* noop */ }
+				},
+				buttons: [
+					{
+						label: localize('upgradePro', "Upgrade to Copilot Pro"),
+						run: () => commandService.executeCommand('workbench.action.chat.upgradePlan')
+					},
+				],
+				custom: {
+					icon: Codicon.copilotWarningLarge,
+					markdownDetails: [
+						{ markdown: new MarkdownString(message, true) },
+						{ markdown: new MarkdownString(upgradeToPro, true) }
+					]
+				}
+			});
+		}
+	});
 }
 
 export function stringifyItem(item: IChatRequestViewModel | IChatResponseViewModel, includeName = true): string {
@@ -619,14 +679,14 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 			let primaryActionTitle: string;
 			let primaryActionIcon: ThemeIcon;
 			if (!chatExtensionInstalled) {
-				primaryActionId = 'workbench.action.chat.triggerSetup';
-				primaryActionTitle = localize('triggerChatSetup', "Use AI Features with Copilot for Free...");
+				primaryActionId = CHAT_SETUP_ACTION_ID;
+				primaryActionTitle = CHAT_SETUP_ACTION_LABEL.value;
 				primaryActionIcon = Codicon.copilot;
 			} else {
 				if (signedOut) {
 					primaryActionId = CHAT_OPEN_ACTION_ID;
 					primaryActionTitle = localize('signInToChatSetup', "Sign in to Use Copilot...");
-					primaryActionIcon = Codicon.copilotWarning;
+					primaryActionIcon = Codicon.copilotNotConnected;
 				} else if (chatQuotaExceeded || completionsQuotaExceeded) {
 					primaryActionId = OPEN_CHAT_QUOTA_EXCEEDED_DIALOG;
 					primaryActionTitle = quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded });
@@ -652,3 +712,13 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 		markAsSingleton(disposable);
 	}
 }
+
+export function quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded }: { chatQuotaExceeded: boolean; completionsQuotaExceeded: boolean }): string {
+	if (chatQuotaExceeded && !completionsQuotaExceeded) {
+		return localize('chatQuotaExceededButton', "Monthly chat messages limit reached. Click for details.");
+	} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
+		return localize('completionsQuotaExceededButton', "Monthly code completions limit reached. Click for details.");
+	} else {
+		return localize('chatAndCompletionsQuotaExceededButton', "Copilot Free plan limit reached. Click for details.");
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.ts b/src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.ts
index 7beb2b8c1fd4..e14222c1acf0 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.ts
@@ -16,6 +16,7 @@ import { IWorkbenchLayoutService } from '../../../../services/layout/browser/lay
 import { ensureSideBarChatViewSize, showCopilotView } from '../chat.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { IStatusbarService } from '../../../../services/statusbar/browser/statusbar.js';
 
 
 export class ChatGettingStartedContribution extends Disposable implements IWorkbenchContribution {
@@ -33,6 +34,7 @@ export class ChatGettingStartedContribution extends Disposable implements IWorkb
 		@IViewDescriptorService private readonly viewDescriptorService: IViewDescriptorService,
 		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IStatusbarService private readonly statusbarService: IStatusbarService,
 	) {
 		super();
 
@@ -71,9 +73,6 @@ export class ChatGettingStartedContribution extends Disposable implements IWorkb
 
 	private async onDidInstallChat() {
 
-		// Enable chat command center if previously disabled
-		this.configurationService.updateValue('chat.commandCenter.enabled', true);
-
 		// Open Copilot view
 		showCopilotView(this.viewsService, this.layoutService);
 		ensureSideBarChatViewSize(this.viewDescriptorService, this.layoutService, this.viewsService);
@@ -81,5 +80,9 @@ export class ChatGettingStartedContribution extends Disposable implements IWorkb
 		// Only do this once
 		this.storageService.store(ChatGettingStartedContribution.hideWelcomeView, true, StorageScope.APPLICATION, StorageTarget.MACHINE);
 		this.recentlyInstalled = false;
+
+		// Enable Copilot related UI if previously disabled
+		this.statusbarService.updateEntryVisibility('chat.statusBarEntry', true);
+		this.configurationService.updateValue('chat.commandCenter.enabled', true);
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 80f18c82a77a..53851d9015b5 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -78,7 +78,7 @@ import { agentSlashCommandToMarkdown, agentToMarkdown } from './chatMarkdownDeco
 import { ChatCompatibilityNotifier, ChatExtensionPointHandler } from './chatParticipant.contribution.js';
 import { ChatPasteProvidersFeature } from './chatPasteProviders.js';
 import { QuickChatService } from './chatQuick.js';
-import { ChatQuotasService, ChatQuotasStatusBarEntry, IChatQuotasService } from './chatQuotasService.js';
+import { ChatQuotasService, IChatQuotasService } from '../common/chatQuotasService.js';
 import { ChatResponseAccessibleView } from './chatResponseAccessibleView.js';
 import { ChatSetupContribution } from './chatSetup.js';
 import { ChatVariablesService } from './chatVariables.js';
@@ -96,6 +96,7 @@ import { PromptsConfig } from '../../../../platform/prompts/common/config.js';
 import { PROMPT_FILE_EXTENSION } from '../../../../platform/prompts/common/constants.js';
 import { DOCUMENTATION_URL } from '../common/promptSyntax/constants.js';
 import { registerChatToolActions } from './actions/chatToolActions.js';
+import { ChatStatusBarEntry } from './chatStatus.js';
 
 // Register configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -423,7 +424,7 @@ registerWorkbenchContribution2(ChatRelatedFilesContribution.ID, ChatRelatedFiles
 registerWorkbenchContribution2(ChatViewsWelcomeHandler.ID, ChatViewsWelcomeHandler, WorkbenchPhase.BlockStartup);
 registerWorkbenchContribution2(ChatGettingStartedContribution.ID, ChatGettingStartedContribution, WorkbenchPhase.Eventually);
 registerWorkbenchContribution2(ChatSetupContribution.ID, ChatSetupContribution, WorkbenchPhase.BlockRestore);
-registerWorkbenchContribution2(ChatQuotasStatusBarEntry.ID, ChatQuotasStatusBarEntry, WorkbenchPhase.Eventually);
+registerWorkbenchContribution2(ChatStatusBarEntry.ID, ChatStatusBarEntry, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(BuiltinToolsContribution.ID, BuiltinToolsContribution, WorkbenchPhase.Eventually);
 registerWorkbenchContribution2(ChatAgentSettingContribution.ID, ChatAgentSettingContribution, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(ChatEditingEditorAccessibility.ID, ChatEditingEditorAccessibility, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts b/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
deleted file mode 100644
index 65d287a23f30..000000000000
--- a/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
+++ /dev/null
@@ -1,224 +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 { safeIntl } from '../../../../base/common/date.js';
-import { language } from '../../../../base/common/platform.js';
-import { Emitter, Event } from '../../../../base/common/event.js';
-import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { localize } from '../../../../nls.js';
-import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
-import { createDecorator, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
-import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
-import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { ICommandService } from '../../../../platform/commands/common/commands.js';
-
-export const IChatQuotasService = createDecorator<IChatQuotasService>('chatQuotasService');
-
-export interface IChatQuotasService {
-	_serviceBrand: undefined;
-
-	readonly onDidChangeQuotas: Event<void>;
-	readonly quotas: IChatQuotas;
-
-	acceptQuotas(quotas: IChatQuotas): void;
-	clearQuotas(): void;
-}
-
-export interface IChatQuotas {
-	chatQuotaExceeded: boolean;
-	completionsQuotaExceeded: boolean;
-	quotaResetDate: Date | undefined;
-}
-
-export const OPEN_CHAT_QUOTA_EXCEEDED_DIALOG = 'workbench.action.chat.openQuotaExceededDialog';
-
-export class ChatQuotasService extends Disposable implements IChatQuotasService {
-
-	declare _serviceBrand: undefined;
-
-	private readonly _onDidChangeQuotas = this._register(new Emitter<void>());
-	readonly onDidChangeQuotas: Event<void> = this._onDidChangeQuotas.event;
-
-	private _quotas: IChatQuotas = { chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: undefined };
-	get quotas(): IChatQuotas { return this._quotas; }
-
-	private readonly chatQuotaExceededContextKey = ChatContextKeys.chatQuotaExceeded.bindTo(this.contextKeyService);
-	private readonly completionsQuotaExceededContextKey = ChatContextKeys.completionsQuotaExceeded.bindTo(this.contextKeyService);
-
-	private ExtensionQuotaContextKeys = {
-		chatQuotaExceeded: 'github.copilot.chat.quotaExceeded',
-		completionsQuotaExceeded: 'github.copilot.completions.quotaExceeded',
-	};
-
-	constructor(
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-	) {
-		super();
-
-		this.registerListeners();
-		this.registerActions();
-	}
-
-	private registerListeners(): void {
-		const chatQuotaExceededSet = new Set([this.ExtensionQuotaContextKeys.chatQuotaExceeded]);
-		const completionsQuotaExceededSet = new Set([this.ExtensionQuotaContextKeys.completionsQuotaExceeded]);
-
-		this._register(this.contextKeyService.onDidChangeContext(e => {
-			let changed = false;
-			if (e.affectsSome(chatQuotaExceededSet)) {
-				const newChatQuotaExceeded = this.contextKeyService.getContextKeyValue<boolean>(this.ExtensionQuotaContextKeys.chatQuotaExceeded);
-				if (typeof newChatQuotaExceeded === 'boolean' && newChatQuotaExceeded !== this._quotas.chatQuotaExceeded) {
-					this._quotas.chatQuotaExceeded = newChatQuotaExceeded;
-					changed = true;
-				}
-			}
-
-			if (e.affectsSome(completionsQuotaExceededSet)) {
-				const newCompletionsQuotaExceeded = this.contextKeyService.getContextKeyValue<boolean>(this.ExtensionQuotaContextKeys.completionsQuotaExceeded);
-				if (typeof newCompletionsQuotaExceeded === 'boolean' && newCompletionsQuotaExceeded !== this._quotas.completionsQuotaExceeded) {
-					this._quotas.completionsQuotaExceeded = newCompletionsQuotaExceeded;
-					changed = true;
-				}
-			}
-
-			if (changed) {
-				this.updateContextKeys();
-				this._onDidChangeQuotas.fire();
-			}
-		}));
-	}
-
-	private registerActions(): void {
-		const that = this;
-
-		class ShowLimitReachedDialogAction extends Action2 {
-
-			constructor() {
-				super({
-					id: OPEN_CHAT_QUOTA_EXCEEDED_DIALOG,
-					title: localize('upgradeChat', "Upgrade to Copilot Pro"),
-				});
-			}
-
-			override async run(accessor: ServicesAccessor) {
-				const commandService = accessor.get(ICommandService);
-				const dialogService = accessor.get(IDialogService);
-
-				const dateFormatter = safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric' });
-
-				let message: string;
-				const { chatQuotaExceeded, completionsQuotaExceeded } = that.quotas;
-				if (chatQuotaExceeded && !completionsQuotaExceeded) {
-					message = localize('chatQuotaExceeded', "You've run out of free chat messages. You still have free code completions available in the Copilot Free plan. These limits will reset on {0}.", dateFormatter.format(that.quotas.quotaResetDate));
-				} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-					message = localize('completionsQuotaExceeded', "You've run out of free code completions. You still have free chat messages available in the Copilot Free plan. These limits will reset on {0}.", dateFormatter.format(that.quotas.quotaResetDate));
-				} else {
-					message = localize('chatAndCompletionsQuotaExceeded', "You've reached the limit of the Copilot Free plan. These limits will reset on {0}.", dateFormatter.format(that.quotas.quotaResetDate));
-				}
-
-				const upgradeToPro = localize('upgradeToPro', "Upgrade to Copilot Pro (your first 30 days are free) for:\n- Unlimited code completions\n- Unlimited chat messages\n- Access to additional models");
-
-				await dialogService.prompt({
-					type: 'none',
-					message: localize('copilotFree', "Copilot Limit Reached"),
-					cancelButton: {
-						label: localize('dismiss', "Dismiss"),
-						run: () => { /* noop */ }
-					},
-					buttons: [
-						{
-							label: localize('managePlan', "Upgrade to Copilot Pro"),
-							run: () => commandService.executeCommand('workbench.action.chat.upgradePlan')
-						},
-					],
-					custom: {
-						icon: Codicon.copilotWarningLarge,
-						markdownDetails: [
-							{ markdown: new MarkdownString(message, true) },
-							{ markdown: new MarkdownString(upgradeToPro, true) }
-						]
-					}
-				});
-			}
-		}
-
-		registerAction2(ShowLimitReachedDialogAction);
-	}
-
-	acceptQuotas(quotas: IChatQuotas): void {
-		this._quotas = quotas;
-		this.updateContextKeys();
-
-		this._onDidChangeQuotas.fire();
-	}
-
-	clearQuotas(): void {
-		if (this.quotas.chatQuotaExceeded || this.quotas.completionsQuotaExceeded) {
-			this.acceptQuotas({ chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: undefined });
-		}
-	}
-
-	private updateContextKeys(): void {
-		this.chatQuotaExceededContextKey.set(this._quotas.chatQuotaExceeded);
-		this.completionsQuotaExceededContextKey.set(this._quotas.completionsQuotaExceeded);
-	}
-}
-
-export class ChatQuotasStatusBarEntry extends Disposable implements IWorkbenchContribution {
-
-	static readonly ID = 'chat.quotasStatusBarEntry';
-
-	private readonly entry = this._register(new DisposableStore());
-
-	constructor(
-		@IStatusbarService private readonly statusbarService: IStatusbarService,
-		@IChatQuotasService private readonly chatQuotasService: IChatQuotasService
-	) {
-		super();
-
-		this._register(Event.runAndSubscribe(this.chatQuotasService.onDidChangeQuotas, () => this.updateStatusbarEntry()));
-	}
-
-	private updateStatusbarEntry(): void {
-		this.entry.clear();
-
-		const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatQuotasService.quotas;
-		if (chatQuotaExceeded || completionsQuotaExceeded) {
-			let text: string;
-			if (chatQuotaExceeded && !completionsQuotaExceeded) {
-				text = localize('chatQuotaExceededStatus', "Chat limit reached");
-			} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-				text = localize('completionsQuotaExceededStatus', "Completions limit reached");
-			} else {
-				text = localize('chatAndCompletionsQuotaExceededStatus', "Copilot limit reached");
-			}
-
-			this.entry.add(this.statusbarService.addEntry({
-				name: localize('indicator', "Copilot Limit Indicator"),
-				text: `$(copilot-warning) ${text}`,
-				ariaLabel: text,
-				command: OPEN_CHAT_QUOTA_EXCEEDED_DIALOG,
-				showInAllWindows: true,
-				kind: 'prominent',
-				tooltip: quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded })
-			}, ChatQuotasStatusBarEntry.ID, StatusbarAlignment.RIGHT, 1));
-		}
-	}
-}
-
-export function quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded }: { chatQuotaExceeded: boolean; completionsQuotaExceeded: boolean }): string {
-	if (chatQuotaExceeded && !completionsQuotaExceeded) {
-		return localize('chatQuotaExceededButton', "Monthly chat messages limit reached. Click for details.");
-	} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-		return localize('completionsQuotaExceededButton', "Monthly code completions limit reached. Click for details.");
-	} else {
-		return localize('chatAndCompletionsQuotaExceededButton', "Copilot Free plan limit reached. Click for details.");
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 12003d4dc8a7..21ea3c6bccc6 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -48,11 +48,11 @@ import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { IExtension, IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
 import { IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { CHAT_CATEGORY } from './actions/chatActions.js';
+import { CHAT_CATEGORY, CHAT_SETUP_ACTION_ID, CHAT_SETUP_ACTION_LABEL } from './actions/chatActions.js';
 import { ChatViewId, EditsViewId, ensureSideBarChatViewSize, preferCopilotEditsView, showCopilotView } from './chat.js';
 import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
 import { ChatViewsWelcomeExtensions, IChatViewsWelcomeContributionRegistry } from './viewsWelcome/chatViewsWelcome.js';
-import { IChatQuotasService } from './chatQuotasService.js';
+import { IChatQuotasService } from '../common/chatQuotasService.js';
 import { mainWindow } from '../../../../base/browser/window.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { URI } from '../../../../base/common/uri.js';
@@ -69,6 +69,7 @@ import { IQuickInputService } from '../../../../platform/quickinput/common/quick
 import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
 import { equalsIgnoreCase } from '../../../../base/common/strings.js';
 import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
+import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -108,9 +109,6 @@ enum ChatEntitlement {
 
 //#region Contribution
 
-const TRIGGER_SETUP_COMMAND_ID = 'workbench.action.chat.triggerSetup';
-const TRIGGER_SETUP_COMMAND_LABEL = localize2('triggerChatSetup', "Use AI Features with Copilot for Free...");
-
 export class ChatSetupContribution extends Disposable implements IWorkbenchContribution {
 
 	static readonly ID = 'workbench.chat.setup';
@@ -161,8 +159,8 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 
 			constructor() {
 				super({
-					id: TRIGGER_SETUP_COMMAND_ID,
-					title: TRIGGER_SETUP_COMMAND_LABEL,
+					id: CHAT_SETUP_ACTION_ID,
+					title: CHAT_SETUP_ACTION_LABEL,
 					category: CHAT_CATEGORY,
 					f1: true,
 					precondition: chatSetupTriggerContext,
@@ -180,12 +178,14 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 				const viewDescriptorService = accessor.get(IViewDescriptorService);
 				const configurationService = accessor.get(IConfigurationService);
 				const layoutService = accessor.get(IWorkbenchLayoutService);
+				const statusbarService = accessor.get(IStatusbarService);
 
 				await context.update({ hidden: false });
 
 				showCopilotView(viewsService, layoutService);
 				ensureSideBarChatViewSize(viewDescriptorService, layoutService, viewsService);
 
+				statusbarService.updateEntryVisibility('chat.statusBarEntry', true);
 				configurationService.updateValue('chat.commandCenter.enabled', true);
 			}
 		}
@@ -216,10 +216,11 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 				const layoutService = accessor.get(IWorkbenchLayoutService);
 				const configurationService = accessor.get(IConfigurationService);
 				const dialogService = accessor.get(IDialogService);
+				const statusbarService = accessor.get(IStatusbarService);
 
 				const { confirmed } = await dialogService.confirm({
 					message: localize('hideChatSetupConfirm', "Are you sure you want to hide Copilot?"),
-					detail: localize('hideChatSetupDetail', "You can restore Copilot by running the '{0}' command.", TRIGGER_SETUP_COMMAND_LABEL.value),
+					detail: localize('hideChatSetupDetail', "You can restore Copilot by running the '{0}' command.", CHAT_SETUP_ACTION_LABEL.value),
 					primaryButton: localize('hideChatSetupButton', "Hide Copilot")
 				});
 
@@ -227,8 +228,18 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 					return;
 				}
 
-				await hideSetupView(viewsDescriptorService, layoutService);
+				const location = viewsDescriptorService.getViewLocationById(ChatViewId);
+
+				await context.update({ hidden: true });
+
+				if (location === ViewContainerLocation.AuxiliaryBar) {
+					const activeContainers = viewsDescriptorService.getViewContainersByLocation(location).filter(container => viewsDescriptorService.getViewContainerModel(container).activeViewDescriptors.length > 0);
+					if (activeContainers.length === 0) {
+						layoutService.setPartHidden(true, Parts.AUXILIARYBAR_PART); // hide if there are no views in the secondary sidebar
+					}
+				}
 
+				statusbarService.updateEntryVisibility('chat.statusBarEntry', false);
 				configurationService.updateValue('chat.commandCenter.enabled', false);
 			}
 		}
@@ -287,19 +298,6 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 			}
 		}
 
-		async function hideSetupView(viewsDescriptorService: IViewDescriptorService, layoutService: IWorkbenchLayoutService): Promise<void> {
-			const location = viewsDescriptorService.getViewLocationById(ChatViewId);
-
-			await context.update({ hidden: true });
-
-			if (location === ViewContainerLocation.AuxiliaryBar) {
-				const activeContainers = viewsDescriptorService.getViewContainersByLocation(location).filter(container => viewsDescriptorService.getViewContainerModel(container).activeViewDescriptors.length > 0);
-				if (activeContainers.length === 0) {
-					layoutService.setPartHidden(true, Parts.AUXILIARYBAR_PART); // hide if there are no views in the secondary sidebar
-				}
-			}
-		}
-
 		registerAction2(ChatSetupTriggerAction);
 		registerAction2(ChatSetupHideAction);
 		registerAction2(UpgradePlanAction);
@@ -312,9 +310,9 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 			},
 			handleURL: async url => {
 				const params = new URLSearchParams(url.query);
-				this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: TRIGGER_SETUP_COMMAND_ID, from: 'url', detail: params.get('referrer') ?? undefined });
+				this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'url', detail: params.get('referrer') ?? undefined });
 
-				await this.commandService.executeCommand(TRIGGER_SETUP_COMMAND_ID);
+				await this.commandService.executeCommand(CHAT_SETUP_ACTION_ID);
 
 				return true;
 			}
@@ -384,12 +382,20 @@ interface IEntitlementsResponse {
 		readonly chat: number;
 		readonly completions: number;
 	};
+	readonly monthly_quotas?: {
+		readonly chat: number;
+		readonly completions: number;
+	};
 	readonly limited_user_reset_date: string;
 }
 
 interface IQuotas {
-	readonly chat?: number;
-	readonly completions?: number;
+	readonly chatTotal?: number;
+	readonly completionsTotal?: number;
+
+	readonly chatRemaining?: number;
+	readonly completionsRemaining?: number;
+
 	readonly resetDate?: string;
 }
 
@@ -597,8 +603,10 @@ class ChatSetupRequests extends Disposable {
 		const entitlements: IChatEntitlements = {
 			entitlement,
 			quotas: {
-				chat: entitlementsResponse.limited_user_quotas?.chat,
-				completions: entitlementsResponse.limited_user_quotas?.completions,
+				chatTotal: entitlementsResponse.monthly_quotas?.chat,
+				completionsTotal: entitlementsResponse.monthly_quotas?.completions,
+				chatRemaining: entitlementsResponse.limited_user_quotas?.chat,
+				completionsRemaining: entitlementsResponse.limited_user_quotas?.completions,
 				resetDate: entitlementsResponse.limited_user_reset_date
 			}
 		};
@@ -642,9 +650,13 @@ class ChatSetupRequests extends Disposable {
 
 		if (state.quotas) {
 			this.chatQuotasService.acceptQuotas({
-				chatQuotaExceeded: typeof state.quotas.chat === 'number' ? state.quotas.chat <= 0 : false,
-				completionsQuotaExceeded: typeof state.quotas.completions === 'number' ? state.quotas.completions <= 0 : false,
-				quotaResetDate: state.quotas.resetDate ? new Date(state.quotas.resetDate) : undefined
+				chatQuotaExceeded: typeof state.quotas.chatRemaining === 'number' ? state.quotas.chatRemaining <= 0 : false,
+				completionsQuotaExceeded: typeof state.quotas.completionsRemaining === 'number' ? state.quotas.completionsRemaining <= 0 : false,
+				quotaResetDate: state.quotas.resetDate ? new Date(state.quotas.resetDate) : undefined,
+				chatTotal: state.quotas.chatTotal,
+				completionsTotal: state.quotas.completionsTotal,
+				chatRemaining: state.quotas.chatRemaining,
+				completionsRemaining: state.quotas.completionsRemaining
 			});
 		}
 	}
@@ -842,7 +854,7 @@ class ChatSetupController extends Disposable {
 		try {
 			await this.progressService.withProgress({
 				location: ProgressLocation.Window,
-				command: TRIGGER_SETUP_COMMAND_ID,
+				command: CHAT_SETUP_ACTION_ID,
 				title,
 			}, () => this.doSetup(options?.forceSignIn ?? false, watch));
 		} finally {
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
new file mode 100644
index 000000000000..b41f82f53711
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -0,0 +1,139 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.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 { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
+import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
+import { ChatContextKeys } from '../common/chatContextKeys.js';
+import { IChatQuotasService } from '../common/chatQuotasService.js';
+import { quotaToButtonMessage, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_ID, CHAT_SETUP_ACTION_LABEL, CHAT_OPEN_ACTION_ID } from './actions/chatActions.js';
+
+export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'chat.statusBarEntry';
+
+	private readonly treatment = this.assignmentService.getTreatment<boolean>('config.chat.experimental.statusIndicator.enabled'); //TODO@bpasero remove this experiment eventually
+
+	private entry: IStatusbarEntryAccessor | undefined = undefined;
+
+	constructor(
+		@IStatusbarService private readonly statusbarService: IStatusbarService,
+		@IChatQuotasService private readonly chatQuotasService: IChatQuotasService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IWorkbenchAssignmentService private readonly assignmentService: IWorkbenchAssignmentService,
+		@IProductService private readonly productService: IProductService,
+		@IKeybindingService private readonly keybindingService: IKeybindingService
+	) {
+		super();
+
+		this.create();
+		this.registerListeners();
+	}
+
+	private async create(): Promise<void> {
+		let enabled = false;
+		if (this.productService.quality === 'stable') {
+			enabled = (await this.treatment) === true;
+		} else {
+			enabled = true;
+		}
+
+		if (!enabled) {
+			return;
+		}
+
+		this.entry = this._register(this.statusbarService.addEntry(this.getEntryProps(), ChatStatusBarEntry.ID, StatusbarAlignment.RIGHT, Number.NEGATIVE_INFINITY /* the end of the right hand side */));
+	}
+
+	private registerListeners(): void {
+		const contextKeysSet = new Set([
+			ChatContextKeys.Setup.limited.key,
+			ChatContextKeys.Setup.installed.key,
+			ChatContextKeys.Setup.canSignUp.key,
+			ChatContextKeys.Setup.signedOut.key
+		]);
+		this._register(this.contextKeyService.onDidChangeContext(e => {
+			if (!this.entry) {
+				return;
+			}
+
+			if (e.affectsSome(contextKeysSet)) {
+				this.entry.update(this.getEntryProps());
+			}
+		}));
+
+		this._register(this.chatQuotasService.onDidChangeQuotas(() => this.entry?.update(this.getEntryProps())));
+	}
+
+	private getEntryProps(): IStatusbarEntry {
+		let text = '$(copilot)';
+		let ariaLabel = localize('chatStatus', "Copilot Status");
+		let command = CHAT_OPEN_ACTION_ID;
+		let tooltip: string | IMarkdownString = localize('openChat', "Open Chat ({0})", this.keybindingService.lookupKeybinding(command)?.getLabel() ?? '');
+
+		// Quota Exceeded
+		const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatQuotasService.quotas;
+		if (chatQuotaExceeded || completionsQuotaExceeded) {
+			let quotaWarning: string;
+			if (chatQuotaExceeded && !completionsQuotaExceeded) {
+				quotaWarning = localize('chatQuotaExceededStatus', "Chat limit reached");
+			} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
+				quotaWarning = localize('completionsQuotaExceededStatus', "Completions limit reached");
+			} else {
+				quotaWarning = localize('chatAndCompletionsQuotaExceededStatus', "Copilot limit reached");
+			}
+
+			text = `$(copilot-warning) ${quotaWarning}`;
+			ariaLabel = quotaWarning;
+			command = OPEN_CHAT_QUOTA_EXCEEDED_DIALOG;
+			tooltip = quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded });
+		}
+
+		// Copilot Not Installed
+		else if (
+			this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.installed.key) === false ||
+			this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.canSignUp.key) === true
+		) {
+			command = CHAT_SETUP_ACTION_ID;
+			tooltip = CHAT_SETUP_ACTION_LABEL.value;
+		}
+
+		// Signed out
+		else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.signedOut.key) === true) {
+			text = '$(copilot-not-connected)';
+			ariaLabel = localize('signInToUseCopilot', "Sign in to Use Copilot...");
+			tooltip = localize('signInToUseCopilot', "Sign in to Use Copilot...");
+		}
+
+		// Copilot Limited User
+		else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.limited.key) === true) {
+			const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = this.chatQuotasService.quotas;
+			if (typeof chatRemaining === 'number' && typeof chatTotal === 'number' && typeof completionsRemaining === 'number' && typeof completionsTotal === 'number') {
+				tooltip = new MarkdownString([
+					localize('limitTitle', "You are currently using Copilot Free"),
+					'---',
+					localize('limitChatQuota', "<code>{0}</code> of <code>{1}</code> chats remaining", chatRemaining, chatTotal),
+					localize('limitCompletionsQuota', "<code>{0}</code> of <code>{1}</code> code completions remaining", completionsRemaining, completionsTotal),
+				].join('\n\n'), { supportHtml: true });
+			}
+		}
+
+		return {
+			name: localize('chatStatus', "Copilot Status"),
+			text,
+			ariaLabel,
+			command,
+			showInAllWindows: true,
+			kind: 'copilot',
+			tooltip
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatQuotasService.ts b/src/vs/workbench/contrib/chat/common/chatQuotasService.ts
new file mode 100644
index 000000000000..f8b9eb23fdf3
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/chatQuotasService.ts
@@ -0,0 +1,117 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ChatContextKeys } from './chatContextKeys.js';
+
+export const IChatQuotasService = createDecorator<IChatQuotasService>('chatQuotasService');
+
+export interface IChatQuotasService {
+
+	_serviceBrand: undefined;
+
+	readonly onDidChangeQuotas: Event<void>;
+	readonly quotas: IChatQuotas;
+
+	acceptQuotas(quotas: IChatQuotas): void;
+	clearQuotas(): void;
+}
+
+export interface IChatQuotas {
+	chatQuotaExceeded: boolean;
+	completionsQuotaExceeded: boolean;
+	quotaResetDate: Date | undefined;
+
+	chatTotal?: number;
+	completionsTotal?: number;
+
+	chatRemaining?: number;
+	completionsRemaining?: number;
+}
+
+export class ChatQuotasService extends Disposable implements IChatQuotasService {
+
+	declare _serviceBrand: undefined;
+
+	private readonly _onDidChangeQuotas = this._register(new Emitter<void>());
+	readonly onDidChangeQuotas: Event<void> = this._onDidChangeQuotas.event;
+
+	private _quotas: IChatQuotas = { chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: undefined };
+	get quotas(): IChatQuotas { return this._quotas; }
+
+	private readonly chatQuotaExceededContextKey = ChatContextKeys.chatQuotaExceeded.bindTo(this.contextKeyService);
+	private readonly completionsQuotaExceededContextKey = ChatContextKeys.completionsQuotaExceeded.bindTo(this.contextKeyService);
+
+	private ExtensionQuotaContextKeys = {
+		chatQuotaExceeded: 'github.copilot.chat.quotaExceeded',
+		completionsQuotaExceeded: 'github.copilot.completions.quotaExceeded',
+	};
+
+	constructor(
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+	) {
+		super();
+
+		this.registerListeners();
+	}
+
+	private registerListeners(): void {
+		const chatQuotaExceededSet = new Set([this.ExtensionQuotaContextKeys.chatQuotaExceeded]);
+		const completionsQuotaExceededSet = new Set([this.ExtensionQuotaContextKeys.completionsQuotaExceeded]);
+
+		this._register(this.contextKeyService.onDidChangeContext(e => {
+			let changed = false;
+			if (e.affectsSome(chatQuotaExceededSet)) {
+				const newChatQuotaExceeded = this.contextKeyService.getContextKeyValue<boolean>(this.ExtensionQuotaContextKeys.chatQuotaExceeded);
+				if (typeof newChatQuotaExceeded === 'boolean' && newChatQuotaExceeded !== this._quotas.chatQuotaExceeded) {
+					this._quotas.chatQuotaExceeded = newChatQuotaExceeded;
+					changed = true;
+				}
+			}
+
+			if (e.affectsSome(completionsQuotaExceededSet)) {
+				const newCompletionsQuotaExceeded = this.contextKeyService.getContextKeyValue<boolean>(this.ExtensionQuotaContextKeys.completionsQuotaExceeded);
+				if (typeof newCompletionsQuotaExceeded === 'boolean' && newCompletionsQuotaExceeded !== this._quotas.completionsQuotaExceeded) {
+					this._quotas.completionsQuotaExceeded = newCompletionsQuotaExceeded;
+					changed = true;
+				}
+			}
+
+			if (changed) {
+				this.updateContextKeys();
+				this._onDidChangeQuotas.fire();
+			}
+		}));
+	}
+
+	acceptQuotas(quotas: IChatQuotas): void {
+		this._quotas = this.massageQuotas(quotas);
+		this.updateContextKeys();
+
+		this._onDidChangeQuotas.fire();
+	}
+
+	private massageQuotas(quotas: IChatQuotas): IChatQuotas {
+		return {
+			...quotas,
+			chatTotal: typeof quotas.chatTotal === 'number' ? Math.floor(quotas.chatTotal / 10) : undefined,
+			chatRemaining: typeof quotas.chatRemaining === 'number' ? Math.floor(quotas.chatRemaining / 10) : undefined
+		};
+	}
+
+	clearQuotas(): void {
+		if (this.quotas.chatQuotaExceeded || this.quotas.completionsQuotaExceeded) {
+			this.acceptQuotas({ chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: undefined });
+		}
+	}
+
+	private updateContextKeys(): void {
+		this.chatQuotaExceededContextKey.set(this._quotas.chatQuotaExceeded);
+		this.completionsQuotaExceededContextKey.set(this._quotas.completionsQuotaExceeded);
+	}
+}
diff --git a/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts b/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts
index 101650b7dbd9..d8f7af344b47 100644
--- a/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts
+++ b/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts
@@ -559,7 +559,7 @@ export class RemoteStatusIndicator extends Disposable implements IWorkbenchContr
 		if (this.remoteStatusEntry) {
 			this.remoteStatusEntry.update(properties);
 		} else {
-			this.remoteStatusEntry = this.statusbarService.addEntry(properties, 'status.host', StatusbarAlignment.LEFT, Number.MAX_VALUE /* first entry */);
+			this.remoteStatusEntry = this.statusbarService.addEntry(properties, 'status.host', StatusbarAlignment.LEFT, Number.POSITIVE_INFINITY /* first entry */);
 		}
 	}
 
diff --git a/src/vs/workbench/services/statusbar/browser/statusbar.ts b/src/vs/workbench/services/statusbar/browser/statusbar.ts
index 61cc9f3029e9..8a739b4960b7 100644
--- a/src/vs/workbench/services/statusbar/browser/statusbar.ts
+++ b/src/vs/workbench/services/statusbar/browser/statusbar.ts
@@ -109,8 +109,8 @@ export interface IStatusbarStyleOverride {
 	readonly border?: ColorIdentifier;
 }
 
-export type StatusbarEntryKind = 'standard' | 'warning' | 'error' | 'prominent' | 'remote' | 'offline';
-export const StatusbarEntryKinds: StatusbarEntryKind[] = ['standard', 'warning', 'error', 'prominent', 'remote', 'offline'];
+export type StatusbarEntryKind = 'standard' | 'warning' | 'error' | 'prominent' | 'remote' | 'offline' | 'copilot';
+export const StatusbarEntryKinds: StatusbarEntryKind[] = ['standard', 'warning', 'error', 'prominent', 'remote', 'offline', 'copilot'];
 
 export type TooltipContent = string | IMarkdownString | IManagedHoverTooltipMarkdownString | HTMLElement;
 
diff --git a/src/vs/workbench/test/browser/parts/statusbar/statusbarModel.test.ts b/src/vs/workbench/test/browser/parts/statusbar/statusbarModel.test.ts
index 1dad975266bb..1a6590e7e531 100644
--- a/src/vs/workbench/test/browser/parts/statusbar/statusbarModel.test.ts
+++ b/src/vs/workbench/test/browser/parts/statusbar/statusbarModel.test.ts
@@ -78,6 +78,26 @@ suite('Workbench status bar model', () => {
 		assert.strictEqual(model.entries.length, 0);
 	});
 
+	test('sorting with infinity and max number', () => {
+		const container = document.createElement('div');
+		const model = disposables.add(new StatusbarViewModel(disposables.add(new TestStorageService())));
+
+		assert.strictEqual(model.entries.length, 0);
+
+		model.add({ id: '3', alignment: StatusbarAlignment.LEFT, name: '3', priority: { primary: Number.MAX_VALUE, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+		model.add({ id: '2', alignment: StatusbarAlignment.LEFT, name: '2', priority: { primary: Number.MIN_VALUE, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+		model.add({ id: '1', alignment: StatusbarAlignment.LEFT, name: '1', priority: { primary: Number.POSITIVE_INFINITY, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+		model.add({ id: '0', alignment: StatusbarAlignment.LEFT, name: '0', priority: { primary: Number.NEGATIVE_INFINITY, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+		model.add({ id: '4', alignment: StatusbarAlignment.LEFT, name: '4', priority: { primary: 100, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+
+		const entries = model.entries;
+		assert.strictEqual(entries[0].id, '1');
+		assert.strictEqual(entries[1].id, '3');
+		assert.strictEqual(entries[2].id, '4');
+		assert.strictEqual(entries[3].id, '2');
+		assert.strictEqual(entries[4].id, '0');
+	});
+
 	test('secondary priority used when primary is same', () => {
 		const container = document.createElement('div');
 		const model = disposables.add(new StatusbarViewModel(disposables.add(new TestStorageService())));

From 0b23fa11fefc128fb90b93b29a5250c1de97a6a6 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 21 Feb 2025 18:18:57 +0100
Subject: [PATCH 0237/1815] Adds support for showInlineEditMenu (#241478)

---
 src/vs/editor/common/languages.ts             |   1 +
 .../browser/view/inlineCompletionsView.ts     |   2 +-
 .../components/gutterIndicatorView.ts         |   8 +-
 .../view/inlineEdits/inlineEditsView.ts       | 135 +++++++++-------
 .../inlineEdits/inlineEditsViewInterface.ts   |   1 +
 src/vs/monaco.d.ts                            |   1 +
 .../api/common/extHostLanguageFeatures.ts     |   1 +
 .../chat/browser/media/chatEditorOverlay.css  | 146 ++++++++++++++++++
 ...e.proposed.inlineCompletionsAdditions.d.ts |   2 +
 9 files changed, 232 insertions(+), 65 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/browser/media/chatEditorOverlay.css

diff --git a/src/vs/editor/common/languages.ts b/src/vs/editor/common/languages.ts
index 286793eb242b..47785fad3bbf 100644
--- a/src/vs/editor/common/languages.ts
+++ b/src/vs/editor/common/languages.ts
@@ -799,6 +799,7 @@ export interface InlineCompletion {
 	readonly completeBracketPairs?: boolean;
 
 	readonly isInlineEdit?: boolean;
+	readonly showInlineEditMenu?: boolean;
 
 	readonly showRange?: IRange;
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts
index ed2d6bd31269..04afc6a88f39 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts
@@ -45,7 +45,7 @@ export class InlineCompletionsView extends Disposable {
 	).recomputeInitiallyAndOnChange(this._store);
 
 	private readonly _inlineEdit = derived(this, reader => this._model.read(reader)?.inlineEditState.read(reader)?.inlineEdit);
-	private readonly _everHadInlineEdit = derivedObservableWithCache<boolean>(this, (reader, last) => last || !!this._inlineEdit.read(reader));
+	private readonly _everHadInlineEdit = derivedObservableWithCache<boolean>(this, (reader, last) => last || !!this._inlineEdit.read(reader) || !!this._model.read(reader)?.inlineCompletionState.read(reader)?.inlineCompletion?.sourceInlineCompletion.showInlineEditMenu);
 	protected readonly _inlineEditWidget = derivedDisposable(reader => {
 		if (!this._everHadInlineEdit.read(reader)) {
 			return undefined;
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 170fa86dce8e..e737ff7aa25f 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
@@ -21,7 +21,6 @@ import { EditorOption } from '../../../../../../common/config/editorOptions.js';
 import { LineRange } from '../../../../../../common/core/lineRange.js';
 import { OffsetRange } from '../../../../../../common/core/offsetRange.js';
 import { StickyScrollController } from '../../../../../stickyScroll/browser/stickyScrollController.js';
-import { InlineCompletionsModel } from '../../../model/inlineCompletionsModel.js';
 import { IInlineEditsViewHost } from '../inlineEditsViewInterface.js';
 import { inlineEditIndicatorBackground, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorPrimaryForeground, inlineEditIndicatorSecondaryBackground, inlineEditIndicatorSecondaryForeground, inlineEditIndicatorsuccessfulBackground, inlineEditIndicatorsuccessfulForeground } from '../theme.js';
 import { InlineEditTabAction, mapOutFalsy, rectToProps } from '../utils/utils.js';
@@ -32,7 +31,6 @@ export class InlineEditsGutterIndicator extends Disposable {
 		private readonly _editorObs: ObservableCodeEditor,
 		private readonly _originalRange: IObservable<LineRange | undefined>,
 		private readonly _verticalOffset: IObservable<number>,
-		private readonly _model: IObservable<InlineCompletionsModel | undefined>,
 		private readonly _host: IInlineEditsViewHost,
 		private readonly _isHoveringOverInlineEdit: IObservable<boolean>,
 		private readonly _focusIsInMenu: ISettableObservable<boolean>,
@@ -166,14 +164,12 @@ export class InlineEditsGutterIndicator extends Disposable {
 	private readonly _indicator = n.div({
 		class: 'inline-edits-view-gutter-indicator',
 		onclick: () => {
-			const model = this._model.get();
-			if (!model) { return; }
 			const docked = this._layout.map(l => l && l.docked).get();
 			this._editorObs.editor.focus();
 			if (docked) {
-				model.accept();
+				this._host.accept();
 			} else {
-				model.jump();
+				this._host.jump();
 			}
 		},
 		tabIndex: 0,
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 8e8ad4a56429..d2e4a05a95f0 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
@@ -3,9 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { equalsIfDefined, itemEquals } from '../../../../../../base/common/equals.js';
 import { Event } from '../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { autorunWithStore, derived, derivedObservableWithCache, derivedWithStore, IObservable, IReader, ISettableObservable, mapObservableArrayCached } from '../../../../../../base/common/observable.js';
+import { autorunWithStore, derived, derivedObservableWithCache, derivedOpts, derivedWithStore, IObservable, IReader, ISettableObservable, mapObservableArrayCached, observableValue } from '../../../../../../base/common/observable.js';
 import { localize } from '../../../../../../nls.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { ICodeEditor } from '../../../../../browser/editorBrowser.js';
@@ -73,6 +74,11 @@ export class InlineEditsView extends Disposable {
 				})
 			);
 		}));
+
+		this._indicator.recomputeInitiallyAndOnChange(this._store);
+		this._wordReplacementViews.recomputeInitiallyAndOnChange(this._store);
+
+		this._indicatorCyclicDependencyCircuitBreaker.set(true, undefined);
 	}
 
 	private readonly _uiState = derived<{
@@ -122,7 +128,7 @@ export class InlineEditsView extends Disposable {
 			this._previewTextModel.setValue(newText);
 		}
 
-		if (this._showCollapsed.read(reader) && this._host.tabAction.read(reader) !== InlineEditTabAction.Accept && !this._indicator.read(reader).isHoverVisible.read(reader) && !this._model.get()!.inAcceptFlow.read(reader)) {
+		if (this._showCollapsed.read(reader) && this._host.tabAction.read(reader) !== InlineEditTabAction.Accept && !this._indicator.read(reader)?.isHoverVisible.read(reader) && !this._model.get()!.inAcceptFlow.read(reader)) {
 			state = { kind: 'hidden' };
 		}
 
@@ -158,6 +164,7 @@ export class InlineEditsView extends Disposable {
 			if (this._editorObs.isFocused.read(reader)) {
 				if (m && m.tabShouldJumpToInlineEdit.read(reader)) { return InlineEditTabAction.Jump; }
 				if (m && m.tabShouldAcceptInlineEdit.read(reader)) { return InlineEditTabAction.Accept; }
+				if (m && m.inlineCompletionState.read(reader)?.inlineCompletion?.sourceInlineCompletion.showInlineEditMenu) { return InlineEditTabAction.Accept; }
 			}
 			return InlineEditTabAction.Inactive;
 		}),
@@ -165,9 +172,76 @@ export class InlineEditsView extends Disposable {
 		extensionCommands: this._model.map((m, r) => m?.state.read(r)?.inlineCompletion?.source.inlineCompletions.commands ?? []),
 		accept: () => {
 			this._model.get()?.accept();
+		},
+		jump: () => {
+			this._model.get()?.jump();
 		}
 	};
 
+	private readonly _useGutterIndicator = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.useGutterIndicator);
+
+	private readonly _indicatorCyclicDependencyCircuitBreaker = observableValue(this, false);
+
+	protected readonly _indicator = derivedWithStore<InlineEditsGutterIndicator | InlineEditsIndicator | undefined>(this, (reader, store) => {
+		if (!this._indicatorCyclicDependencyCircuitBreaker.read(reader)) {
+			return undefined;
+		}
+
+		const indicatorDisplayRange = derivedOpts({ owner: this, equalsFn: equalsIfDefined(itemEquals()) }, reader => {
+			const s = this._model.read(reader)?.inlineCompletionState.read(reader);
+			if (s && s.inlineCompletion?.sourceInlineCompletion.showInlineEditMenu) {
+				return LineRange.ofLength(s.primaryGhostText.lineNumber, 1);
+			}
+
+			const state = this._uiState.read(reader);
+			if (state?.state?.kind === 'insertionMultiLine') {
+				return this._insertion.originalLines.read(reader);
+			}
+			return state?.originalDisplayRange;
+		});
+
+		if (this._useGutterIndicator.read(reader)) {
+			return store.add(this._instantiationService.createInstance(
+				InlineEditsGutterIndicator,
+				this._editorObs,
+				indicatorDisplayRange,
+				this._gutterIndicatorOffset,
+				this._host,
+				this._inlineEditsIsHovered,
+				this._focusIsInMenu,
+			));
+		} else {
+			return store.add(new InlineEditsIndicator(
+				this._editorObs,
+				derived<IInlineEditsIndicatorState | undefined>(reader => {
+					const state = this._uiState.read(reader);
+					const range = indicatorDisplayRange.read(reader);
+					if (!state || !state.state || !range) { return undefined; }
+					const top = this._editor.getTopForLineNumber(range.startLineNumber) - this._editorObs.scrollTop.read(reader) + this._gutterIndicatorOffset.read(reader);
+					return { editTop: top, showAlways: state.state.kind !== 'sideBySide' };
+				}),
+				this._model,
+			));
+		}
+	});
+
+	private 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);
+	});
+
+	private 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 readonly _sideBySide = this._register(this._instantiationService.createInstance(InlineEditsSideBySideView,
 		this._editor,
 		this._edit,
@@ -218,7 +292,7 @@ export class InlineEditsView extends Disposable {
 
 	protected readonly _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, [e], this._host));
-	}).recomputeInitiallyAndOnChange(this._store);
+	});
 
 	protected readonly _lineReplacementView = this._register(this._instantiationService.createInstance(InlineEditsLineReplacementView,
 		this._editorObs,
@@ -231,61 +305,6 @@ export class InlineEditsView extends Disposable {
 		this._host
 	));
 
-	private readonly _useGutterIndicator = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.useGutterIndicator);
-
-	private 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);
-	});
-
-	private 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;
-	});
-
-	protected readonly _indicator = derivedWithStore<InlineEditsGutterIndicator | InlineEditsIndicator>(this, (reader, store) => {
-
-		const indicatorDisplayRange = derived(this, reader => {
-			const state = this._uiState.read(reader);
-			if (state?.state?.kind === 'insertionMultiLine') {
-				return this._insertion.originalLines.read(reader);
-			}
-			return state?.originalDisplayRange;
-		});
-
-		if (this._useGutterIndicator.read(reader)) {
-			return store.add(this._instantiationService.createInstance(
-				InlineEditsGutterIndicator,
-				this._editorObs,
-				indicatorDisplayRange,
-				this._gutterIndicatorOffset,
-				this._model,
-				this._host,
-				this._inlineEditsIsHovered,
-				this._focusIsInMenu,
-			));
-		} else {
-			return store.add(new InlineEditsIndicator(
-				this._editorObs,
-				derived<IInlineEditsIndicatorState | undefined>(reader => {
-					const state = this._uiState.read(reader);
-					const range = indicatorDisplayRange.read(reader);
-					if (!state || !state.state || !range) { return undefined; }
-					const top = this._editor.getTopForLineNumber(range.startLineNumber) - this._editorObs.scrollTop.read(reader) + this._gutterIndicatorOffset.read(reader);
-					return { editTop: top, showAlways: state.state.kind !== 'sideBySide' };
-				}),
-				this._model,
-			));
-		}
-	}).recomputeInitiallyAndOnChange(this._store);
-
 	private getCacheId(edit: InlineEditWithChanges) {
 		if (this._model.get()?.inAcceptPartialFlow.get()) {
 			return `${edit.inlineCompletion.id}_${edit.edit.edits.map(edit => edit.range.toString() + edit.text).join(',')}`;
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 2384ab3ac873..ffa4cdbaffff 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.ts
@@ -20,4 +20,5 @@ export interface IInlineEditsViewHost {
 	tabAction: IObservable<InlineEditTabAction>;
 	extensionCommands: IObservable<readonly Command[] | undefined>;
 	accept(): void;
+	jump(): void;
 }
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 12d9e3de28c8..50d113b437f2 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -7309,6 +7309,7 @@ declare namespace monaco.languages {
 		*/
 		readonly completeBracketPairs?: boolean;
 		readonly isInlineEdit?: boolean;
+		readonly showInlineEditMenu?: boolean;
 		readonly showRange?: IRange;
 		readonly warning?: InlineCompletionWarning;
 	}
diff --git a/src/vs/workbench/api/common/extHostLanguageFeatures.ts b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
index a44a8709b8ba..86e7f8f45cfa 100644
--- a/src/vs/workbench/api/common/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
@@ -1412,6 +1412,7 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
 					idx: idx,
 					completeBracketPairs: this._isAdditionsProposedApiEnabled ? item.completeBracketPairs : false,
 					isInlineEdit: this._isAdditionsProposedApiEnabled ? item.isInlineEdit : false,
+					showInlineEditMenu: this._isAdditionsProposedApiEnabled ? item.showInlineEditMenu : false,
 					warning: (item.warning && this._isAdditionsProposedApiEnabled) ? {
 						message: typeConvert.MarkdownString.from(item.warning.message),
 						icon: item.warning.icon ? typeConvert.IconPath.fromThemeIcon(item.warning.icon) : undefined,
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatEditorOverlay.css b/src/vs/workbench/contrib/chat/browser/media/chatEditorOverlay.css
new file mode 100644
index 000000000000..79c7251217f6
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/media/chatEditorOverlay.css
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------------------------
+ *  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: 0px;
+	color: var(--vscode-button-foreground);
+	background-color: var(--vscode-button-background);
+	border-radius: 5px;
+	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: 0px 5px;
+	font-size: 12px;
+	font-variant-numeric: tabular-nums;
+	overflow: hidden;
+	white-space: nowrap;
+}
+
+.chat-editor-overlay-widget.busy .chat-editor-overlay-progress {
+	display: inline-flex;
+}
+
+.chat-editor-overlay-widget.busy .chat-editor-overlay-progress .busy-label {
+	padding: 5px;
+	/* font-style: italic; */
+}
+
+@keyframes ellipsis {
+	0% {
+		content: "";
+	}
+	25% {
+		content: ".";
+	}
+	50% {
+		content: "..";
+	}
+	75% {
+		content: "...";
+	}
+	100% {
+		content: "";
+	}
+}
+
+.chat-editor-overlay-widget.busy .chat-editor-overlay-progress .busy-label::after {
+	content: "";
+	display: inline-flex;
+	white-space: nowrap;
+	overflow: hidden;
+	width: 3ch;
+	animation: ellipsis steps(4, end) 1s infinite;
+}
+
+.chat-editor-overlay-widget.busy.paused .chat-editor-overlay-progress {
+	.codicon-loading {
+		display: none;
+	}
+
+	.busy-label::after {
+		animation-duration: 5s;
+	}
+}
+
+.chat-editor-overlay-widget.busy .chat-editor-overlay-toolbar {
+	display: none;
+}
+
+.chat-editor-overlay-widget .action-item > .action-label {
+	padding: 5px;
+	font-size: 12px;
+}
+
+.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-editor-overlay-widget .monaco-action-bar .action-item.disabled > .action-label.codicon::before,
+.chat-editor-overlay-widget .monaco-action-bar .action-item.disabled > .action-label.codicon,
+.chat-editor-overlay-widget .monaco-action-bar .action-item.disabled > .action-label,
+.chat-editor-overlay-widget .monaco-action-bar .action-item.disabled > .action-label:hover {
+	color: var(--vscode-button-foreground);
+	opacity: 0.7;
+}
+
+
+.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/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts b/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
index 8ab645ba5f98..80e3ebdd751d 100644
--- a/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
+++ b/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
@@ -35,6 +35,8 @@ declare module 'vscode' {
 		/** If set to `true`, this item is rendered as inline edit. */
 		isInlineEdit?: boolean;
 
+		showInlineEditMenu?: boolean;
+
 		action?: Command;
 	}
 

From 8841b8ab8473fc40cb1581eb2be2e197009979fd Mon Sep 17 00:00:00 2001
From: Simon Siefke <simon.siefke@gmail.com>
Date: Fri, 21 Feb 2025 18:32:16 +0100
Subject: [PATCH 0238/1815] fix: memory leak in settings indicators (#236417)

---
 .../preferences/browser/settingsEditorSettingIndicators.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts
index e2fe1833fe37..678042ec78be 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts
@@ -362,6 +362,7 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 	}
 
 	updateScopeOverrides(element: SettingsTreeSettingElement, onDidClickOverrideElement: Emitter<ISettingOverrideClickEvent>, onApplyFilter: Emitter<string>) {
+		this.scopeOverridesIndicator.disposables.clear();
 		this.scopeOverridesIndicator.element.innerText = '';
 		this.scopeOverridesIndicator.element.style.display = 'none';
 		this.scopeOverridesIndicator.focusElement = this.scopeOverridesIndicator.element;
@@ -409,7 +410,6 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 				// just to click into the one override there is.
 				this.scopeOverridesIndicator.element.style.display = 'inline';
 				this.scopeOverridesIndicator.element.classList.remove('setting-indicator');
-				this.scopeOverridesIndicator.disposables.clear();
 
 				const prefaceText = element.isConfigured ?
 					localize('alsoConfiguredIn', "Also modified in") :

From 213aa048e70c2771123ca1a000ba229fcc0b5dcf Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 21 Feb 2025 09:32:46 -0800
Subject: [PATCH 0239/1815] Update codicons

Part of #239706
---
 src/vs/base/common/codiconsLibrary.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/vs/base/common/codiconsLibrary.ts b/src/vs/base/common/codiconsLibrary.ts
index 87b0a393661a..13a3a4f0c310 100644
--- a/src/vs/base/common/codiconsLibrary.ts
+++ b/src/vs/base/common/codiconsLibrary.ts
@@ -589,4 +589,7 @@ export const codiconsLibrary = {
 	keyboardTab: register('keyboard-tab', 0xec3c),
 	copilotBlocked: register('copilot-blocked', 0xec3d),
 	copilotNotConnected: register('copilot-not-connected', 0xec3e),
+	flag: register('flag', 0xec3f),
+	lightbulbEmpty: register('lightbulb-empty', 0xec40),
+	symbolMethodArrow: register('symbol-method-arrow', 0xec41),
 } as const;

From e737be7e37cd33f2834018a427557e94e85965e4 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Fri, 21 Feb 2025 11:35:22 -0600
Subject: [PATCH 0240/1815] rm task telemetry event (#241495)

---
 .../contrib/tasks/browser/abstractTaskService.ts    | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
index 2b59ca09d85a..d6a12341d75b 100644
--- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
+++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -2503,17 +2503,6 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 			const workspaceFolder: IWorkspaceFolder = this._contextService.getWorkspace().folders[0];
 			workspaceFolders.push(workspaceFolder);
 			executionEngine = this._computeExecutionEngine(workspaceFolder);
-			const telemetryData: { [key: string]: any } = {
-				executionEngineVersion: executionEngine
-			};
-			/* __GDPR__
-				"taskService.engineVersion" : {
-					"owner": "alexr00",
-					"comment": "The engine version of tasks. Used to determine if a user is using a deprecated version.",
-					"executionEngineVersion" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The engine version of tasks." }
-				}
-			*/
-			this._telemetryService.publicLog('taskService.engineVersion', telemetryData);
 			schemaVersion = this._computeJsonSchemaVersion(workspaceFolder);
 		} else if (this._contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
 			workspace = this._contextService.getWorkspace();
@@ -2523,7 +2512,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 				} else {
 					ignoredWorkspaceFolders.push(workspaceFolder);
 					this._log(nls.localize(
-						'taskService.ignoreingFolder',
+						'taskService.ignoringFolder',
 						'Ignoring task configurations for workspace folder {0}. Multi folder workspace task support requires that all folders use task version 2.0.0',
 						workspaceFolder.uri.fsPath));
 				}

From d21e43eff7f927ad024e0ea7638cc933d6fca94d Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Fri, 21 Feb 2025 11:38:44 -0600
Subject: [PATCH 0241/1815] add owner for telemetry event (#241496)

add me as owner for telemetry event
---
 src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
index e421a51e9177..eed96c0f8f22 100644
--- a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
+++ b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
@@ -423,7 +423,7 @@ export class ShellIntegrationAddon extends Disposable implements IShellIntegrati
 		}
 		this._activationTimeout = setTimeout(() => {
 			if (!this.capabilities.get(TerminalCapability.CommandDetection) && !this.capabilities.get(TerminalCapability.CwdDetection)) {
-				this._telemetryService?.publicLog2<{ classification: 'SystemMetaData'; purpose: 'FeatureInsight' }>('terminal/shellIntegrationActivationTimeout');
+				this._telemetryService?.publicLog2<{}, { owner: 'meganrogge'; comment: 'Indicates shell integration activation timeout' }>('terminal/shellIntegrationActivationTimeout');
 				this._logService.warn('Shell integration failed to add capabilities within 10 seconds');
 			}
 			this._hasUpdatedTelemetry = true;

From b10bff1c16946e9d5fdc802b8b1a5c24a814c452 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 21 Feb 2025 09:40:41 -0800
Subject: [PATCH 0242/1815] Update ttf

---
 .../browser/ui/codicons/codicon/codicon.ttf   | Bin 83420 -> 84152 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf
index 7f16295a0f47b3ccaf34bd8ad97e9b66b026caf5..f38ab6d17c03ac7f5f88e450e177611791f0274f 100644
GIT binary patch
delta 6509
zcmaLb33ycHxd-s~KQo!hN<s(;OGsh@Ngx|!CuC#a!XCB|LJ~*_kN}22*knKvQE|aR
zK~zeqq9Q613IR7%R78t$Lj-T@MeA+nj8xIuXf5>r`Qm+g?{jZ?p5OfEo6MX!-*R5g
zH=o|=*S_8F-huA1^Ojr|3793)d&k1YHTB7@^F9$tepKM-(NI^jVAjsPGeqPw%5C5a
zwmEhupT9tT8=6{Hr?{_miohr0YHVCKzvf_r?`HmqZF_rD&Fba0pRkF4@4@%SEv;#)
z^K>3B6QuI<=v=;RMM%rhg9jP}=|@C*Ikvx$5OPt#_tIORU-@dgZxAlF#o&nDbJ@|?
zQ(zBk>*Cj9_gqB;8xfvjdoZ6L@RS8~%PIZ&gW@O<`_Io(nSmmHrQ&dO;UU8%jIY?d
zTfN)7Z+hRd0<4L?p`IN9gWc`?t6hG=3`~<3FdX|Z5NpvB8)XtY(1=x7DZ3;WL*y<w
zj{q5pz2cTAye<3W9!x?qViAYm%KP$+oWj%CCih_vZpHoZU<)3=BiMy|<xSj)-C`4m
z`0>1gBv?YEi-by;r!4Rh_v7+}JShj{DS28B$#Zg89+EaWB1h$<ydtm5Tk<<OEAPn%
z@}Ybr=j2oQ5Ba_PffMtea!J0BALJi$6@UYNaKeQk1fwg$(G5M&3%wDI7{nt1iAcf#
zq#z4<$j4w5pb$kUaibJNF$|+I24gV}<57kQn25=kigHZHOw2+B=AaUDQH46xV<8%_
z2urXWH=-FWXvG@bgbi?G6K=+B*oxb62kye%xCh&@13U2`9>Sw|4A0<MJcl+M!BHGT
zJC5T7+%MrIUcsw)9dF=GyoED(5AWjxe29<m2`<Pr2yC!Ry)2YfQXs9e7!S)zStBc?
zMv^2M5wb%bly~tmXTOImkxukS4St0jc@@jB6lu5xxfm(cI4vX4UGA4N2t+@Ok^#te
zBUSPwU&iCtcnvS&dAuO)n1@>Qm1dm7d3=n=@dTd40X&6+*e_jWHZtT<yerG)g8Y|!
zDSwoyGDRj!ceyCX<haa}rC1;brBNc~ZFvWo5+^snUm|b{H^|@QPx5EEEI#>4z83d4
z@~!+;z86cp_>Fvw5wcyJ;u3!ekniL#az&!017Qe}A<|2F%0xLK&ttJnKoi!>Cy2r!
z9F{RyEzjZ|8H7RTgGfw~S@L(x#yYuOwqP?>$jkDgyo9s(os7hMR7-`thEQ~gm(xg>
zZt{j~lTk7g#ZoRa<a3!O(`CQ>i2LNXZ5u;E;4bI2!hg6Z;;mM^cEnqw<R@mW0t<(C
zzT%Z7-UZ4O4{x2qaAv*2KITG&fy@Slwai6o9D4G}V#Nzoyi1f!Vm2ytFq;(2YfBYY
zF_$T<^vnoN=r@F|6^a+Pcw3a5XRcHT@azeV!d}nO&;-2gxe%J*Hs7^DA(`n`h-I2{
zBE&H_DV7HDvML%Z65_o@v0R9EvyxNHTNR#WZc!{I;=N7Deax*QZu5XWY}}z>K6t0X
z{Y>*Af`@sJf;r&53J);1D?Gw92PW)dn$Hj`mUwq4d6Q|5OSqG@%WDom*xlyrn&M#f
z67RQ)bxge9DONP`{#CKIiT8WODkt8*Db_pjb}Cjr@&2G#1I7EJVl@=+-xcekc+Dy!
zR!H&w!wd)?SS-bRRk3V}_nKk><yECvO2vX=Q5DOkSYE~AGB#Lf#d0W?T(SHVi?3Kt
z#WF0GOR*rk#qwu^SewNPP^{8o1u52Rv4RyVw^$*HHC(JNiq%}KP$i!+!xSsLSX~us
zy;$LjRbQ-b2G<||0}v}h@xKDGx+~#`Sdj{*=TQo#hdmTb4|!b~Fg@(0V0zeF!E_{A
z!E~gLf;lmF3?B&Q%y<zPFlQF0%zyvZ4GQMq@e1bP2@2-meHF~{`YD+ACMuZsCMlTL
zl9e0g#r_HdnAahN&#yxkpQkG1G1C<Cndu6HnHdTN%z+Ap%s~o8%uIz6W|o<M9vr1?
zWGf71<|qtf<|>S4nlC4eVVW-|jAfcHCyZm7FDHy=4pAs$niC;RV44#lOyvAq#R`*|
z=Bx-)ndYPj<xF!@gy~FkQiPez;R>^uBNQr_BNgT_M=4Y?O(zI*nWhtNKA?(EOfLv^
zOw$WOJ=64pu#jnbL1<u_UJw>BCn_vqnobawGp8ur$TS@yG&83uwD9`3Oz#M-Ow&8U
z8s-dzo0z7jgbhs7Q-T?}*~;9fTBg^8o0+E9gxi>=*MzN1(`&-*Ow;Kq&Oh$plX(hv
zF{>5sX4WXM5?i$j+nMtfb}$zx>|~nJBRt47qepm%X-1FmDASA{;W6eS(+dtEo?$Ll
zc$R5~lJFd}QK605q;Q0}RN*LdnZhxq8G1rH(+oY~IMWP0;RJJq;@umcv?!cpu2gu1
zxk}+xW~;*M%+(5SFwImE-ej&-c#FAC;S6)V!h1|JorL$9oX&dlfDhO(BSH9(xl!RG
zrkPv9CrmT9#G6X7Zc%cLxmiJ&w<_3}TNLb`!02gs*i*&F2+!f@gphanmt6`kdoD$1
zxI5W;M4>-(k3tReR|+QgD&Cxm^=l<&fc7bvnfQ%@nISXfgfym^a)LSc{R*bMJT4Mr
z9(a!{))PvqnNKR5_B_)ks-`<z2Nmyu#d=za8Dq162!YIJ75Xs`Dc&oKWfl|30OnzZ
zY^GUQgj7#rOorQZ$}AniYfQ6r2rn|t(jh$0ypFfqVqGWZbLM@7c}%mq2(`?Y6>rPM
zI;q4g$yXH4F*%U+<^ku~Fkepin0ZQpgJiv~U<S%8L4p}5vjhnTn5Pw<Vw&YhFhggC
zim=~P5SxGuPgQJGky#5JiaP?a%rYhJ4a73bl(<U}%dAr3enBj=N=g3cIUGBr=S8;6
zyNUY;u}qufxW^fn5VC-+KPWlq$&E|s`8HdhD|v_cg+ivMIWEEN&(@!mL@@uXV8+0!
zxC;@>QrwS-<x||5i1n2c^SR54yA`qiqPTAn>ubdwj9A|&?q$TfVkUqOVqW}KaepJ$
zcZxe5v99BuN3842eVS!Xgv6X=r{a!CtRIwo%=}SdglFvyqsQ{7J}B;##Aj37Gl|cx
zxO)<xLkXwJ=cf?HbSi{+0^^7DJi%7560S~Ph{9q|ReY4Yi7oRP;=W6KU6rt~_`(&U
znB5c(F**DO_h;hc)n~{UW~AbtO?>7vB)sZ;JrwtG;_Ino5VIFAI`aV2=&jI)X*x$R
z2Q+QM6i-Y-RL{S&6{j$p$r(4W&NDF~!M&L+Ufu?`hT=<9+$4%GNpZU<zGNl52z~t(
z&N2rmZYIT-qGTj9Rbf6eO`)2ZuDIzGUxtY1>jb~Cukrang;1vH8=(s`Q^{#&mf|i|
zeA$ZoRq^F0dBaoOHv`3<rF|2|e$Lm56nC)VD^}dgimya*S1Z0!B|kEUD(-aU8!je;
zd*1fGli;pOzSLj(NB7U~zoq}F{+$C72kc4-Ou0GbY)WV9>eM}Hebd_0v(sP5aAu6l
z`2E0`f#n157<hWn;z3_z`e*LT>YG)WwL9x_wk>;1c4PLg?DN@Ib1HMT<y_7kkUJ}P
zPwv&c^t`gX-Fav8uH;weAI-lqIDYW*g5-jVf|CUoh723>fP2XKLT6!2VQyi0;rhb8
zg|8NVR(Q22x+uG7YSH4Ntwno_+Ka9frx$N5K3~#Ya=7GNX@2SC(#D~-p}mF{3~e0R
zG4%4V(qWCmb`Se(xN~^o@Z#aKhHoBzX!yAi&Ji0&>>ly;$mEgDBOe}lepJ|~$)h%p
z`f#*!boS__qqmLj7~MH$!x(q_*vzr($5oHpHSWy#f#b`^?;C%qY(&|^W#=cvOlY3q
zomf2a-iiAso|_asseDr7q#cuvOkO^@V~S(S-BWy1Cr;fswPWf}(`u*PH?6%qtUR^6
zp!~b(71K9N@0`&x<HXDXGizt=o_S?f+^os7KAT-I`+?bCSM;bTtf;PNuQ*@v)11k3
z4!Y-jS(#W_R=KhA#9YVR+PORC9-e!-YHigQ^Qz{Zs_t98yZZf_;F|iH3$<~z+vZ2i
zzc9aZL1dkyZbsc5bshD+>Z|KF)*r6_e&LpdPb|FD5Z^GWp}Ap4!<j|Zi*_u!ytvom
z>Lopv3|sQ*lB<mkjrTU5X)0}6-*j@RZE5k+%}YC$B`<TAEqh>j`tmK!TUrWR8d|os
zbgqnBS+;V)%KKJ+u_}Dkf>v8=VQX1yWou*W`qocZN3X72y??cDP34*`Yd&0CvG)6Q
ziR)IcJFxD{^@Zy<tUt5fdsF32dvCh5p>RXxhTR+9aL2ieH`+EfZ;IHoZBxh1!Tfzt
zu3bYae~{`b@sceI+BPK5o;>9mcVjN$RiBrW<#I;E!j%=7n}NLC#1zCk`ye7RGdE}a
z&VDvqznxF|IUOk}4yWH?htuircgu}gHkU0c96^qvLPwC(an|AI=V<F#Jua0y7aq5p
z^pU|la&|E?W6(Xq>2ii5At^B_9Z^}XF8sMLJ~1gTz6<{p85J4JpAv^4Gq(h}dBw=d
zPDes{cue1z@Sp&v%~kBOIRk={v+eM+N89}n6_pej5^O`LJv1OXfRC^RheRet9S)BP
z504oT9?~<w>FUwL<qYUq5o~uj?5CrWqPoTg+iiIPK|uj|HhXYvR~|#!x;<7==4NeY
zap=mr-N)3#ZpDa<wZ$MJ6j6~~kO7x79VJLg%+4*bnO;OihH{Kz`HFcp={9?Cu)R--
z%ik|O2>!v&!GoQ_{s>C<^LLe`_I3mmrMhf^x&HpSfpDf41@PBYr^Dea2tZJXBdydK
z<aXF&V(c8l(lkd%5CYQk{B8azF8`uF4o9CNe^&~dJimWA$$xu__;=^?zrWjjwfkSb
zn_u$FXoO0PxgRS5C-DCpkG!bNUxpzAi~HF81O09P_ed;pIDYAW@3#xgTKVq*=oR!o
z2Ve<)>2+S)m@D_V+-cn3NAUO8X#Pek-D1%_G2WHq>Yf*aC|5!Ta!TNe%1O#|Mdd|x
zL43N6^Mr(WPS=p1Cyl4b$#lB*&JFYnbd(3%Tz<W}RRsi8O`kr!YWD2e-EDS<-458g
zk2dEuy1U)a-`>y07tk|5Y!W#6>2)rL%NCX&c4Jun@yxpPF*$<<y~KCe`AJ)MF6~I0
zzn?7;Tx)3S_@VzGWbXWN0Dq~@+_^P{ztvwnmY9k|cBk!v?V|0|W9Kr^=<nyKZ>(8(
zY*;>$9buu3ixxJt)UIr-O{;5K-m>P{;zEQvBf70v(^R{xF|DbtrD55Ew3_DTWv$27
I3`4d3pU4cPIsgCw

delta 5783
zcmYk=dt6o3z6J0x00m7E%><2<!~_))1jQ5--!BA2#J7T?AOcz-Vy4^7-c;JQvbR~s
z%FIkm&8*CltgOt+JRPs6+v(iv*=y&qx0%@;(_gpG`Qy9BUVAV0oNKPReyq9ou5Who
zu4d~}e4l(UHUnsp16)~AR=IpZ$=OcN0Ev|#H<iyXDV_S@rXm1eO8;`b5i%n*RIm3-
zxALmm`h;J9KL;=fgcnyXo>$WS<A3hfM|*+LomD0EOG19(P5L}W$H!HdRL%GQ{K|N+
zXDhvTZpq@B*0mQyN3{f#!hnvSt=}Kt`UI$B<<K)v9$z0!<%!15+!gA-CnCy!kx?!i
zBb&_%>o@Syfe1@S=%rUl%9cR0fd~tW&{woWl->ym+#YBMyc2lWYvJVv2m3d*xYoB*
zpN8T*3po+5awwl*GV2-5RmkH9tY9r`uo3-vE$+tW498GD1|On%7@Kh~C$KxOVrTBe
z$9Ms6aVzh{eSCyB^FFTQTKf4g@8>;e;vIYtAqYb=_3JXULTf~#4Wj&0TR!I7f@kn7
zp2Jpb!;9E~m+%O7q7g6S4IIGRIE*9s07r2QpWst`hQHw?{tKt@cU_AA#y@Zlzv2RZ
zX9z<X#%656mTbc)wq*y#up>J$mT|nA-FOWX*@LO<$NtRV01o6JX8AanLzvBx9L3Qb
z!?7I4@yuZ^^I5=2oXjFl<up#`49?^{mU2E9u#5{?&Ba{8>$#N6xPmuwC4F4YTX-vP
z<L$hQ4ZNH8ay>Wj0dC}z+|1{>joZ0{FR_uk_%e5M4}GulHNMU_c#v=LZ8q^8e#nn_
zlppgLkMnc<hKtl3!~&F|4g;|a6?_Owu^crhK>`xl4jb?gKIDE~{TM95&rIMPKFTz_
z$tqT|7jI%ZhohK>FoKuke!R;F#&ZOEvagRlk%0ji&&PRy`?!~{U=L@pm|bx_KjCNm
zluz?7+`?!0ET7|3Xp3p=ji-48OYm3x5B`a-QGkia#})VjyRjE@P|dk`9+l{T_wYVb
z5QnST9PRlgyWl7MFHYkdcnIR(@SVkX_yIp6fPZllj&m5+qdCG6ffo24XYegz@ew0=
z83v&fIwBXZU?0mdfs1$pPVfr8z!x!wb=b~#k;*>2lI@v?srZFcxEy!jR<7Z7cwM*Z
zYkZ&YVI)g98`E)+t=TFL?=T6M;}9A!3R9SgLKNXEOu}UB((TvW|77cP{vE9^^XX0n
zI;6O*-ai2Zij8g|1WF9fE9V*(D(4y9U<i~NysDgUI8?d7@Cjv^VY0H^uwJ<^-)+=z
zw6enJK1E=WL7uYG@B?L)p*yzPuvWR)u*P5BCjOdhwO3<wk0aoY5PYs&Y8dX{(I%RY
z`46{==V5=aO}uY{K5=aeyDNQ$S1DH;c2?eGR3Q*pV^k{;xY?*`Ah6cpE#)nSTa~vO
z)f5D7Gq_KAJK%F0KB67>q0oKdU54(U2E%pAdktMfZeQqEt~Y#G>HbD|ztVjsDqIL`
zFlbV`&xCiVgasbZj_|?8n6|ybRKyVY-l&`*@PkodL*PfF5{JM~M#T<+pN+~M0_Thh
zAOgP_l|lsEY!Vek1b#Itj|f~aDwGKP<_1I?)l38~8dXmOemAP4y4MU2C}~t%;e{Ag
zS$LsF^%h>3QRRi#%%}##Yi?AH;e{L3Wgol<?TAV=ycR~q8s23_WgA{AqXG`EwNWXD
z7im<~;k7X;@9?4wzErj~D*5o*85Mtcmpht&`ab}#z0rRJcvl$xZ-CdqKqKPm{&DEe
zJjT$Sc}GKc=A8`PnO|w>PAb;0rBZX<q3f_ulid@#9(OTxJ&rSU9k|-KCjhUjp=&hW
z&^6l4&^2_8q5F>RhVDBO4BfGb#z%K>4@386Peb=!FT+%2l3_n(Z^Qn|WWx+)AHxC4
z6vKf^_xHj<%D#qK$~1TV)AYe$?W7wHQMyKi*-F=laHP^TA{?c3jR;38Rg4^tQMv|&
zW0kH!;W%Zc;drHMT$rQl@43c>xk}f#Fkk5!7Zxao8ctFUGn}j(ZdjxoVK`OkIxC!}
zbe$DWSGvv$XDD4~ecEuQUbx;0=P6xpg{4Z@Tj6|Vj^P631j90=>$q^C(sf)|t(<7M
zSm{nexJ2nrLU_IIf3HwG!lg=gM#5!EcSgb$$|;67D&5%$S1R4v3Ee2VvlFgXy0a7B
zqI4%Gyj3~N@HXY_OMKw%dNIfFE@iP{gR;c%ZslCVdzEgKgzJ@Vl!P0UZj^)%DBUOt
zH!9sI37=G!8*WxEbUoLw@p)y1;Wp(W!|lpS!yU>h!<Uq9h=q+xH^jnSN;ky9mzCEU
z?pA8J9qv)q7(K-4MXlj$N_QEAuPf^e-%z?sB0Q+9H+)OE-0*GX4TeohciDvRDBWcf
zeyDVpP56;=6|lf<cvL%XB!nL;-8B>*Q{H5FT)D>R*%IE(Mo*dW)*4(?x@#_k(p_^Q
z{jsr=_>g~zw(b0H$HupIU2zvixZnRnY#-mx+I!3}LHW4h9OV;+k197AJ)^>Nms9Yj
z(p^rWyFyPHx-0jzVK3!hj9X55TMW~c&j6j>MvuDio;4^|K4*Byf8eU<lFPN{CWq)z
z7~Ts8?<%(&Mkrr2j90ozBYI?p=O&Gyr*fxZU!|Ks!k+#Co%{IQiSIQ$pnSz}pYjiM
zpSzhOdg_L^-(ZjOHN#oT*A3mdykYco4$pnBK-1B4gD3n%dC<)WZTOjX-ZK1D>86*^
zjpiXkH=1s$3EgPEW2k}j4ja0`bi*TbgZZA}Q~sPT@$Bti(j_|Uh~9HEP_!_B=VqX2
zi2%>dK+$3Wp6j4!*#OV=N$|D*?Jk2lexbcTXc+<TZw7n)F>&#&=W6fo2G9G)#Km`X
zz4(X0`^v8kQ~Yb=;(g7vciN!6@?VB-paMpV5qO@_vIJhxXn_Ln8>6KPyfa3N7I^<Q
z?vctnYqXGo_pQ;A2Htn>0%!ww!1qSW9C$w%EqLJlXteZ!=NcC+g5bGZNZ>kr&Ty0R
z7lY%<^M=Fx4OfpIs}_PZS}-9PVzhKZFw|%fg<zP$N6Kb~kxC7f!^`}!T?cj4OboU%
z&`b@sHZ1oq=^E`@q`fGk<rji&4NfTA8D62h-0%gZhTqXL4MF#rV2rYZ(b5gUXan7W
z!5BkLw_rzuRAndKbZ)~w+PTuur8_yHYv?M&Jby}jbVm(ZFwSs_@@m87{^I!fsx{iX
z#%P6zV0WXnB7zCV{lF7UG|){M>|v-G7wl=YrbMup!AND2VTrQ0;cWle_~@~^D}yP9
zZeZPM3EhDAHP9UxOfy=VBA9NpNJX%p!6AQsw?54DukIF~@Ri=nGFrAGIM`?bi*Ge8
z9JiEh40g+-Z+GISiD!GX>M^~?#vVs{obOrL^Hi^*UYmOzNy<sOKIvTVhUAFkb;)1!
z>D*^$pYKu<Q)Z_;nmRajZ|cdub$!pJrKDA-9ZWl(9-E$>UYWiv{aC-0e#QL`_Pf|W
zssHu;k7a~p#AQ@xY|dyJkUrqf0Zjvbx^~317X~H|+%Rzapbmp725s{V`eM*`nJqID
zGxIZRGaty@m3b`lY*s{8_pHHLGqY;58nT)OhYT(pd}c`Ukb)t*h8!7kI(t?21KGQ?
zPY=x*S}}D0(9^>@44XM@&9KeG_6_@VIEE(;FBraN_=OQ2MpTY?dc>KLF(V5{HjF$n
z3ZwEztr@jrRA6+(=$z5DqtA~?AG3Xo@7&mv<JylKHE!FuqvJb|pFRFSPE1Z=&ciup
zCM=k+FSk{0*W7~Kjk!m2Pv=GDrQ`+kbMjYDY&o%f;(HS>6yy}t7o3_DIVpWo!=z^?
z?JitWc)alZ<l4z+i~1LBDLOT!!<6bNk4`x<b>`IF)7nj|oVH=w-f1VNr%x}OUO)ZF
zjKmppXKeP(I6ULR%>FZ1&pb6NYF6^BidjF+E}s3xoa{N9iaQkN7T;d{RY_6FqjMwX
zuA5ghuXf&jrK?MKmL4uWGk?JRRr4R8e{@0n1y3(%DnnUzS!vn2vYln8%U6}}EI+ld
z+rpC-%`0xLIJhWjQQ@L{D#I$XE7w*wRfSZIsoGE#td6RlUj5x--?;0>)u1M+CckEX
z&DXV2wTZPwwa?ZbUz)hIsSb5fb#Zkmb=h^B>b_hSx2$5>j{3OzarGOQcV514dEkc3
z8>(;Ex&kYPt+;2!_8a4FEWL5dO00}qIeX=uE5BY9vZ~3~-*;kl{^|{@k7~-P+Wh`I
zlQf0fqASu-3S5)kxG!;Xeq-74;Yp3tw@k|MsSIiMchcggg?<%mqeFE+XC#EjM~7!b
zCuD@DWwZ&&h*w0Xg-0iZXYA_Sd455c{QNEj-xS2eM8#|^C`gKoOzIZdty|=txpT8i
z2M;dIZjqOlp1-zj@7}S!V`F<?dWiY|HvZ$g-B-=D@A~sEFZKG*4(TUK{dkHY{G;)N
zE=<UXPv{pNU;k$}ZdTJtkrf4he#K}t+B+>zr`0&(hkL^tZ@bVnm8lPI?X8~!Qy(0V
o%*S|Q&+%mL2;I}rmz5EFejCWdus!{TuubzlQ%AD+($C8O2MW|qw*UYD


From 1a5a85453ef828baeba9203e63e4b321967766fb Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 21 Feb 2025 09:44:42 -0800
Subject: [PATCH 0243/1815] Add explicit `| undefined` for
 `LanguageModelChatTool`

Fixes #241285

This property can either be unset of set to undefined
---
 src/vscode-dts/vscode.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts
index 180f9bbcaa11..3c2266e0e8d7 100644
--- a/src/vscode-dts/vscode.d.ts
+++ b/src/vscode-dts/vscode.d.ts
@@ -20121,7 +20121,7 @@ declare module 'vscode' {
 		/**
 		 * A JSON schema for the input this tool accepts.
 		 */
-		inputSchema?: object;
+		inputSchema?: object | undefined;
 	}
 
 	/**

From 0fd0ae956e5715e58788b9f592c5d68ddb6325df Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 20 Feb 2025 15:54:39 -0800
Subject: [PATCH 0244/1815] rename chat instruction attachment * files

---
 ...nstructionAttachments.ts => instructionAttachmentsWidget.ts} | 2 +-
 ...nstructionsAttachment.ts => instructionsAttachmentWidget.ts} | 0
 src/vs/workbench/contrib/chat/browser/chatInputPart.ts          | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/{instructionAttachments.ts => instructionAttachmentsWidget.ts} (99%)
 rename src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/{instructionsAttachment.ts => instructionsAttachmentWidget.ts} (100%)

diff --git a/src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionAttachments.ts b/src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionAttachmentsWidget.ts
similarity index 99%
rename from src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionAttachments.ts
rename to src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionAttachmentsWidget.ts
index 58e60e5fbcd0..8b748bc6dd2e 100644
--- a/src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionAttachments.ts
+++ b/src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionAttachmentsWidget.ts
@@ -8,7 +8,7 @@ import * as dom from '../../../../../../base/browser/dom.js';
 import { Emitter } from '../../../../../../base/common/event.js';
 import { ResourceLabels } from '../../../../../browser/labels.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { InstructionsAttachmentWidget } from './instructionsAttachment.js';
+import { InstructionsAttachmentWidget } from './instructionsAttachmentWidget.js';
 import { ILogService } from '../../../../../../platform/log/common/log.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { ChatInstructionAttachmentsModel } from '../../chatAttachmentModel/chatInstructionAttachmentsModel.js';
diff --git a/src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionsAttachment.ts b/src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionsAttachmentWidget.ts
similarity index 100%
rename from src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionsAttachment.ts
rename to src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionsAttachmentWidget.ts
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index cb23ec62bac1..7e2ef515e623 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -87,7 +87,7 @@ import { ChatInputHistoryMaxEntries, IChatHistoryEntry, IChatInputState, IChatWi
 import { ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../common/languageModels.js';
 import { CancelAction, ChatModelPickerActionId, ChatSubmitAction, ChatSubmitSecondaryAgentAction, IChatExecuteActionContext, IToggleAgentModeArgs, ToggleAgentModeActionId } from './actions/chatExecuteActions.js';
 import { ImplicitContextAttachmentWidget } from './attachments/implicitContextAttachment.js';
-import { InstructionAttachmentsWidget } from './attachments/instructionsAttachment/instructionAttachments.js';
+import { InstructionAttachmentsWidget } from './attachments/instructionsAttachment/instructionAttachmentsWidget.js';
 import { IChatWidget } from './chat.js';
 import { ChatAttachmentModel } from './chatAttachmentModel.js';
 import { toChatVariable } from './chatAttachmentModel/chatInstructionAttachmentsModel.js';

From 4337c043fcf289bdfd036217c4f49893c269e078 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 20 Feb 2025 16:45:59 -0800
Subject: [PATCH 0245/1815] render prompt file attachments into the common
 parent DOM node

---
 .../instructionAttachmentsWidget.ts           | 46 +++++++++++--------
 .../contrib/chat/browser/chatInputPart.ts     |  2 +-
 .../contrib/chat/browser/media/chat.css       | 14 ++----
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionAttachmentsWidget.ts b/src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionAttachmentsWidget.ts
index 8b748bc6dd2e..d1428e65d5e1 100644
--- a/src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionAttachmentsWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionAttachmentsWidget.ts
@@ -4,17 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from '../../../../../../base/common/uri.js';
-import * as dom from '../../../../../../base/browser/dom.js';
 import { Emitter } from '../../../../../../base/common/event.js';
 import { ResourceLabels } from '../../../../../browser/labels.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { InstructionsAttachmentWidget } from './instructionsAttachmentWidget.js';
 import { ILogService } from '../../../../../../platform/log/common/log.js';
+import { InstructionsAttachmentWidget } from './instructionsAttachmentWidget.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { ChatInstructionAttachmentsModel } from '../../chatAttachmentModel/chatInstructionAttachmentsModel.js';
 
 /**
- * Widget fot a collection of prompt instructions attachments.
+ * Widget for a collection of prompt instructions attachments.
  * See {@linkcode InstructionsAttachmentWidget}.
  */
 export class InstructionAttachmentsWidget extends Disposable {
@@ -40,9 +39,9 @@ export class InstructionAttachmentsWidget extends Disposable {
 	}
 
 	/**
-	 * The root DOM node of the widget.
+	 * The parent DOM node this widget was rendered into.
 	 */
-	public readonly domNode: HTMLElement;
+	private parentNode: HTMLElement | undefined;
 
 	/**
 	 * Get all `URI`s of all valid references, including all
@@ -76,9 +75,6 @@ export class InstructionAttachmentsWidget extends Disposable {
 		super();
 
 		this.render = this.render.bind(this);
-		this.domNode = dom.$('.chat-prompt-instructions-attachments');
-
-		this._register(this.model.onUpdate(this.render));
 
 		// when a new attachment model is added, create a new child widget for it
 		this.model.onAdd((attachment) => {
@@ -93,8 +89,12 @@ export class InstructionAttachmentsWidget extends Disposable {
 
 			// register the new child widget
 			this.children.push(widget);
-			this.domNode.appendChild(widget.domNode);
-			this.render();
+
+			// if parent node is present - append the wiget to it, otherwise wait
+			// until the `render` method will be called
+			if (this.parentNode) {
+				this.parentNode.appendChild(widget.domNode);
+			}
 
 			// fire the event to notify about the change in the number of attachments
 			this._onAttachmentsCountChange.fire();
@@ -138,11 +138,14 @@ export class InstructionAttachmentsWidget extends Disposable {
 			);
 		}
 
-		// remove the child widget root node from the DOM
-		this.domNode.removeChild(widget.domNode);
+		if (!this.parentNode) {
+			this.logService.warn(
+				`${logPrefix} no parent node reference found.`,
+			);
+		}
 
-		// re-render the whole widget
-		this.render();
+		// remove the child widget root node from the DOM
+		this.parentNode?.removeChild(widget.domNode);
 
 		// fire the event to notify about the change in the number of attachments
 		this._onAttachmentsCountChange.fire();
@@ -151,11 +154,18 @@ export class InstructionAttachmentsWidget extends Disposable {
 	}
 
 	/**
-	 * Render this widget.
+	 * Render attachments into the provided `parentNode`.
+	 *
+	 * Note! this method assumes that the provided `parentNode` is cleared by the caller.
 	 */
-	private render(): this {
-		// set visibility of the root node based on the presence of attachments
-		dom.setVisibility(!this.empty, this.domNode);
+	public render(
+		parentNode: HTMLElement,
+	): this {
+		this.parentNode = parentNode;
+
+		for (const widget of this.children) {
+			this.parentNode.appendChild(widget.domNode);
+		}
 
 		return this;
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 7e2ef515e623..1f4a686f2eb0 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -947,7 +947,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}
 
 		this.promptInstructionsAttached.set(!this.instructionAttachmentsPart.empty);
-		container.appendChild(this.instructionAttachmentsPart.domNode);
+		this.instructionAttachmentsPart.render(container);
 
 		const attachmentInitPromises: Promise<void>[] = [];
 		for (const [index, attachment] of attachments) {
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 6e0c160bc5f0..f1f424a3d421 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1003,14 +1003,8 @@ have to be updated for changes to the rules above, or to support more deeply nes
 }
 
 /**
- * Styles for the `prompt instructions` attachment widget.
+ * Styles for the `reusable prompts` attachment widget.
  */
-.chat-attached-context .chat-prompt-instructions-attachments {
-	display: flex;
-	flex-direction: column;
-	align-items: flex-start;
-	gap: 2px;
-}
 .chat-attached-context .chat-prompt-instructions-attachment {
 	display: flex;
 	gap: 4px;
@@ -1052,11 +1046,11 @@ have to be updated for changes to the rules above, or to support more deeply nes
  * This overly-specific CSS selector is needed to beat priority of some
  * styles applied on the `.chat-attached-context-attachment` element.
  */
-.chat-attached-context .chat-prompt-instructions-attachments .chat-prompt-instructions-attachment.error.implicit,
-.chat-attached-context .chat-prompt-instructions-attachments .chat-prompt-instructions-attachment.warning.implicit {
+.chat-attached-context .chat-prompt-instructions-attachment.error.implicit,
+.chat-attached-context .chat-prompt-instructions-attachment.warning.implicit {
 	border: 1px solid currentColor;
 }
-.chat-attached-context .chat-prompt-instructions-attachments .chat-prompt-instructions-attachment.implicit .monaco-button {
+.chat-attached-context .chat-prompt-instructions-attachment.implicit .monaco-button {
 	padding-left: 2px;
 	padding-right: 2px;
 }

From db99236db3ac5bed47591b0422fa00cba2427b13 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 20 Feb 2025 17:02:14 -0800
Subject: [PATCH 0246/1815] rename classes and filenames to get rid of the old
 "instructions" naming

---
 .../promptAttachmentWidget.ts}                |  8 ++--
 .../promptAttachmentsCollectionWidget.ts}     | 16 +++----
 .../chat/browser/chatAttachmentModel.ts       | 10 ++---
 ...chment.ts => chatPromptAttachmentModel.ts} |  2 +-
 ....ts => chatPromptAttachmentsCollection.ts} | 14 +++---
 .../contrib/chat/browser/chatInputPart.ts     | 10 ++---
 .../contrib/chat/browser/media/chat.css       | 44 +++++++++----------
 7 files changed, 52 insertions(+), 52 deletions(-)
 rename src/vs/workbench/contrib/chat/browser/attachments/{instructionsAttachment/instructionsAttachmentWidget.ts => promptAttachments/promptAttachmentWidget.ts} (95%)
 rename src/vs/workbench/contrib/chat/browser/attachments/{instructionsAttachment/instructionAttachmentsWidget.ts => promptAttachments/promptAttachmentsCollectionWidget.ts} (90%)
 rename src/vs/workbench/contrib/chat/browser/chatAttachmentModel/{chatInstructionsAttachment.ts => chatPromptAttachmentModel.ts} (98%)
 rename src/vs/workbench/contrib/chat/browser/chatAttachmentModel/{chatInstructionAttachmentsModel.ts => chatPromptAttachmentsCollection.ts} (91%)

diff --git a/src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionsAttachmentWidget.ts b/src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentWidget.ts
similarity index 95%
rename from src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionsAttachmentWidget.ts
rename to src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentWidget.ts
index dc2742e19345..8c1068988f56 100644
--- a/src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionsAttachmentWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentWidget.ts
@@ -22,16 +22,16 @@ import { ILanguageService } from '../../../../../../editor/common/languages/lang
 import { FileKind, IFileService } from '../../../../../../platform/files/common/files.js';
 import { IMenuService, MenuId } from '../../../../../../platform/actions/common/actions.js';
 import { getCleanPromptName } from '../../../../../../platform/prompts/common/constants.js';
+import { ChatPromptAttachmentModel } from '../../chatAttachmentModel/chatPromptAttachmentModel.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
-import { ChatInstructionsAttachmentModel } from '../../chatAttachmentModel/chatInstructionsAttachment.js';
 import { getDefaultHoverDelegate } from '../../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { getFlatContextMenuActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
 
 /**
  * Widget for a single prompt instructions attachment.
  */
-export class InstructionsAttachmentWidget extends Disposable {
+export class PromptAttachmentWidget extends Disposable {
 	/**
 	 * The root DOM node of the widget.
 	 */
@@ -66,7 +66,7 @@ export class InstructionsAttachmentWidget extends Disposable {
 	private readonly renderDisposables = this._register(new DisposableStore());
 
 	constructor(
-		private readonly model: ChatInstructionsAttachmentModel,
+		private readonly model: ChatPromptAttachmentModel,
 		private readonly resourceLabels: ResourceLabels,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
@@ -79,7 +79,7 @@ export class InstructionsAttachmentWidget extends Disposable {
 	) {
 		super();
 
-		this.domNode = dom.$('.chat-prompt-instructions-attachment.chat-attached-context-attachment.show-file-icons.implicit');
+		this.domNode = dom.$('.chat-prompt-attachment.chat-attached-context-attachment.show-file-icons.implicit');
 
 		this.render = this.render.bind(this);
 		this.dispose = this.dispose.bind(this);
diff --git a/src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionAttachmentsWidget.ts b/src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentsCollectionWidget.ts
similarity index 90%
rename from src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionAttachmentsWidget.ts
rename to src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentsCollectionWidget.ts
index d1428e65d5e1..d05558a0489b 100644
--- a/src/vs/workbench/contrib/chat/browser/attachments/instructionsAttachment/instructionAttachmentsWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentsCollectionWidget.ts
@@ -6,21 +6,21 @@
 import { URI } from '../../../../../../base/common/uri.js';
 import { Emitter } from '../../../../../../base/common/event.js';
 import { ResourceLabels } from '../../../../../browser/labels.js';
+import { PromptAttachmentWidget } from './promptAttachmentWidget.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { ILogService } from '../../../../../../platform/log/common/log.js';
-import { InstructionsAttachmentWidget } from './instructionsAttachmentWidget.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { ChatInstructionAttachmentsModel } from '../../chatAttachmentModel/chatInstructionAttachmentsModel.js';
+import { ChatPromptAttachmentsCollection } from '../../chatAttachmentModel/chatPromptAttachmentsCollection.js';
 
 /**
  * Widget for a collection of prompt instructions attachments.
- * See {@linkcode InstructionsAttachmentWidget}.
+ * See {@linkcode PromptAttachmentWidget}.
  */
-export class InstructionAttachmentsWidget extends Disposable {
+export class PromptAttachmentsCollectionWidget extends Disposable {
 	/**
 	 * List of child instruction attachment widgets.
 	 */
-	private children: InstructionsAttachmentWidget[] = [];
+	private children: PromptAttachmentWidget[] = [];
 
 	/**
 	 * Event that fires when number of attachments change
@@ -67,7 +67,7 @@ export class InstructionAttachmentsWidget extends Disposable {
 	}
 
 	constructor(
-		private readonly model: ChatInstructionAttachmentsModel,
+		private readonly model: ChatPromptAttachmentsCollection,
 		private readonly resourceLabels: ResourceLabels,
 		@IInstantiationService private readonly initService: IInstantiationService,
 		@ILogService private readonly logService: ILogService,
@@ -79,7 +79,7 @@ export class InstructionAttachmentsWidget extends Disposable {
 		// when a new attachment model is added, create a new child widget for it
 		this.model.onAdd((attachment) => {
 			const widget = this.initService.createInstance(
-				InstructionsAttachmentWidget,
+				PromptAttachmentWidget,
 				attachment,
 				this.resourceLabels,
 			);
@@ -105,7 +105,7 @@ export class InstructionAttachmentsWidget extends Disposable {
 	 * Handle child widget disposal.
 	 * @param widget The child widget that was disposed.
 	 */
-	public handleAttachmentDispose(widget: InstructionsAttachmentWidget): this {
+	public handleAttachmentDispose(widget: PromptAttachmentWidget): this {
 		// common prefix for all log messages
 		const logPrefix = `[onChildDispose] Widget for instructions attachment '${widget.uri.path}'`;
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatAttachmentModel.ts b/src/vs/workbench/contrib/chat/browser/chatAttachmentModel.ts
index 9278fe4aed0a..30b1bd350d8d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatAttachmentModel.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatAttachmentModel.ts
@@ -3,20 +3,20 @@
  *  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 { Disposable } from '../../../../base/common/lifecycle.js';
 import { basename } from '../../../../base/common/resources.js';
-import { URI } from '../../../../base/common/uri.js';
 import { IRange } from '../../../../editor/common/core/range.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 import { IChatRequestVariableEntry } from '../common/chatModel.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { ChatInstructionAttachmentsModel } from './chatAttachmentModel/chatInstructionAttachmentsModel.js';
+import { ChatPromptAttachmentsCollection } from './chatAttachmentModel/chatPromptAttachmentsCollection.js';
 
 export class ChatAttachmentModel extends Disposable {
 	/**
 	 * Collection on prompt instruction attachments.
 	 */
-	public readonly promptInstructions: ChatInstructionAttachmentsModel;
+	public readonly promptInstructions: ChatPromptAttachmentsCollection;
 
 	constructor(
 		@IInstantiationService private readonly initService: IInstantiationService,
@@ -24,7 +24,7 @@ export class ChatAttachmentModel extends Disposable {
 		super();
 
 		this.promptInstructions = this._register(
-			this.initService.createInstance(ChatInstructionAttachmentsModel),
+			this.initService.createInstance(ChatPromptAttachmentsCollection),
 		).onUpdate(() => {
 			this._onDidChangeContext.fire();
 		});
diff --git a/src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatInstructionsAttachment.ts b/src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatPromptAttachmentModel.ts
similarity index 98%
rename from src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatInstructionsAttachment.ts
rename to src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatPromptAttachmentModel.ts
index a9a6a6ffbe5a..bb41b884ec65 100644
--- a/src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatInstructionsAttachment.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatPromptAttachmentModel.ts
@@ -12,7 +12,7 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 /**
  * Model for a single chat prompt instructions attachment.
  */
-export class ChatInstructionsAttachmentModel extends Disposable {
+export class ChatPromptAttachmentModel extends Disposable {
 	/**
 	 * Private reference of the underlying prompt instructions
 	 * reference instance.
diff --git a/src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatInstructionAttachmentsModel.ts b/src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatPromptAttachmentsCollection.ts
similarity index 91%
rename from src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatInstructionAttachmentsModel.ts
rename to src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatPromptAttachmentsCollection.ts
index 144e5bb96a17..047a6a80fc06 100644
--- a/src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatInstructionAttachmentsModel.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatPromptAttachmentsCollection.ts
@@ -6,9 +6,9 @@
 import { URI } from '../../../../../base/common/uri.js';
 import { Emitter } from '../../../../../base/common/event.js';
 import { IChatRequestVariableEntry } from '../../common/chatModel.js';
+import { ChatPromptAttachmentModel } from './chatPromptAttachmentModel.js';
 import { PromptsConfig } from '../../../../../platform/prompts/common/config.js';
 import { IPromptFileReference } from '../../common/promptSyntax/parsers/types.js';
-import { ChatInstructionsAttachmentModel } from './chatInstructionsAttachment.js';
 import { Disposable, DisposableMap } from '../../../../../base/common/lifecycle.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
@@ -61,13 +61,13 @@ export const toChatVariable = (
 
 /**
  * Model for a collection of prompt instruction attachments.
- * See {@linkcode ChatInstructionsAttachmentModel} for individual attachment.
+ * See {@linkcode ChatPromptAttachmentModel} for individual attachment.
  */
-export class ChatInstructionAttachmentsModel extends Disposable {
+export class ChatPromptAttachmentsCollection extends Disposable {
 	/**
 	 * List of all prompt instruction attachments.
 	 */
-	private attachments: DisposableMap<string, ChatInstructionsAttachmentModel> =
+	private attachments: DisposableMap<string, ChatPromptAttachmentModel> =
 		this._register(new DisposableMap());
 
 	/**
@@ -146,13 +146,13 @@ export class ChatInstructionAttachmentsModel extends Disposable {
 	 * Event that fires when a new prompt instruction attachment is added.
 	 * See {@linkcode onAdd}.
 	 */
-	protected _onAdd = this._register(new Emitter<ChatInstructionsAttachmentModel>());
+	protected _onAdd = this._register(new Emitter<ChatPromptAttachmentModel>());
 	/**
 	 * The `onAdd` event fires when a new prompt instruction attachment is added.
 	 *
 	 * @param callback Function to invoke on add.
 	 */
-	public onAdd(callback: (attachment: ChatInstructionsAttachmentModel) => unknown): this {
+	public onAdd(callback: (attachment: ChatPromptAttachmentModel) => unknown): this {
 		this._register(this._onAdd.event(callback));
 
 		return this;
@@ -177,7 +177,7 @@ export class ChatInstructionAttachmentsModel extends Disposable {
 			return this;
 		}
 
-		const instruction = this.initService.createInstance(ChatInstructionsAttachmentModel, uri)
+		const instruction = this.initService.createInstance(ChatPromptAttachmentModel, uri)
 			.onUpdate(this._onUpdate.fire)
 			.onDispose(() => {
 				// note! we have to use `deleteAndLeak` here, because the `*AndDispose`
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 1f4a686f2eb0..bdd7a0d0fb44 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -87,10 +87,10 @@ import { ChatInputHistoryMaxEntries, IChatHistoryEntry, IChatInputState, IChatWi
 import { ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../common/languageModels.js';
 import { CancelAction, ChatModelPickerActionId, ChatSubmitAction, ChatSubmitSecondaryAgentAction, IChatExecuteActionContext, IToggleAgentModeArgs, ToggleAgentModeActionId } from './actions/chatExecuteActions.js';
 import { ImplicitContextAttachmentWidget } from './attachments/implicitContextAttachment.js';
-import { InstructionAttachmentsWidget } from './attachments/instructionsAttachment/instructionAttachmentsWidget.js';
+import { PromptAttachmentsCollectionWidget } from './attachments/promptAttachments/promptAttachmentsCollectionWidget.js';
 import { IChatWidget } from './chat.js';
 import { ChatAttachmentModel } from './chatAttachmentModel.js';
-import { toChatVariable } from './chatAttachmentModel/chatInstructionAttachmentsModel.js';
+import { toChatVariable } from './chatAttachmentModel/chatPromptAttachmentsCollection.js';
 import { hookUpResourceAttachmentDragAndContextMenu, hookUpSymbolAttachmentDragAndContextMenu } from './chatContentParts/chatAttachmentsContentPart.js';
 import { IDisposableReference } from './chatContentParts/chatCollections.js';
 import { CollapsibleListPool, IChatCollapsibleListItem } from './chatContentParts/chatReferencesContentPart.js';
@@ -324,9 +324,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 	/**
 	 * Child widget of prompt instruction attachments.
-	 * See {@linkcode InstructionAttachmentsWidget}.
+	 * See {@linkcode PromptAttachmentsCollectionWidget}.
 	 */
-	private instructionAttachmentsPart: InstructionAttachmentsWidget;
+	private instructionAttachmentsPart: PromptAttachmentsCollectionWidget;
 
 	constructor(
 		// private readonly editorOptions: ChatEditorOptions, // TODO this should be used
@@ -393,7 +393,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 		this.instructionAttachmentsPart = this._register(
 			instantiationService.createInstance(
-				InstructionAttachmentsWidget,
+				PromptAttachmentsCollectionWidget,
 				this.attachmentModel.promptInstructions,
 				this._contextResourceLabels,
 			),
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index f1f424a3d421..f80c66f3ac58 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1005,52 +1005,52 @@ have to be updated for changes to the rules above, or to support more deeply nes
 /**
  * Styles for the `reusable prompts` attachment widget.
  */
-.chat-attached-context .chat-prompt-instructions-attachment {
+.chat-attached-context .chat-prompt-attachment {
 	display: flex;
 	gap: 4px;
 }
-.chat-attached-context .chat-prompt-instructions-attachment .codicon {
+.chat-attached-context .chat-prompt-attachment .codicon {
 	color: inherit;
 	text-decoration: none;
 }
-.chat-attached-context .chat-prompt-instructions-attachment .chat-implicit-hint {
+.chat-attached-context .chat-prompt-attachment .chat-implicit-hint {
 	opacity: 0.7;
 	font-size: .9em;
 	margin-top: -0.5px;
 }
-.chat-attached-context .chat-prompt-instructions-attachment.warning {
+.chat-attached-context .chat-prompt-attachment.warning {
 	color: var(--vscode-notificationsWarningIcon-foreground);
 }
-.chat-attached-context .chat-prompt-instructions-attachment.error {
+.chat-attached-context .chat-prompt-attachment.error {
 	color: var(--vscode-notificationsErrorIcon-foreground);
 }
-.chat-attached-context .chat-prompt-instructions-attachment.disabled {
+.chat-attached-context .chat-prompt-attachment.disabled {
 	border-style: dashed;
 	opacity: 0.75;
 }
-.chat-attached-context .chat-prompt-instructions-attachment .monaco-button {
+.chat-attached-context .chat-prompt-attachment .monaco-button {
 	border-left: 1px solid var(--vscode-chat-requestBorder, var(--vscode-input-background, transparent));
 	margin-left: 3px;
 }
-.chat-attached-context .chat-prompt-instructions-attachment.error .monaco-button,
-.chat-attached-context .chat-prompt-instructions-attachment.warning .monaco-button {
+.chat-attached-context .chat-prompt-attachment.error .monaco-button,
+.chat-attached-context .chat-prompt-attachment.warning .monaco-button {
 	border-left-color: currentColor;
 }
-.chat-attached-context .chat-prompt-instructions-attachment:focus .monaco-button {
+.chat-attached-context .chat-prompt-attachment:focus .monaco-button {
 	border-color: var(--vscode-focusBorder);
 }
-.chat-attached-context .chat-prompt-instructions-attachment .monaco-icon-label-container {
+.chat-attached-context .chat-prompt-attachment .monaco-icon-label-container {
 	margin-top: -0.1em;
 }
 /*
  * This overly-specific CSS selector is needed to beat priority of some
  * styles applied on the `.chat-attached-context-attachment` element.
  */
-.chat-attached-context .chat-prompt-instructions-attachment.error.implicit,
-.chat-attached-context .chat-prompt-instructions-attachment.warning.implicit {
+.chat-attached-context .chat-prompt-attachment.error.implicit,
+.chat-attached-context .chat-prompt-attachment.warning.implicit {
 	border: 1px solid currentColor;
 }
-.chat-attached-context .chat-prompt-instructions-attachment.implicit .monaco-button {
+.chat-attached-context .chat-prompt-attachment.implicit .monaco-button {
 	padding-left: 2px;
 	padding-right: 2px;
 }
@@ -1058,23 +1058,23 @@ have to be updated for changes to the rules above, or to support more deeply nes
  * If in one of the non-normal states, make sure the `main icon` of
  * the component has the same color as the component itself
  */
-.chat-attached-context .chat-prompt-instructions-attachment.error .monaco-icon-label::before,
-.chat-attached-context .chat-prompt-instructions-attachment.warning .monaco-icon-label::before,
-.chat-attached-context .chat-prompt-instructions-attachment.disabled .monaco-icon-label::before {
+.chat-attached-context .chat-prompt-attachment.error .monaco-icon-label::before,
+.chat-attached-context .chat-prompt-attachment.warning .monaco-icon-label::before,
+.chat-attached-context .chat-prompt-attachment.disabled .monaco-icon-label::before {
 	color: inherit;
 }
-.chat-attached-context .chat-prompt-instructions-attachment.disabled .monaco-icon-label::before {
+.chat-attached-context .chat-prompt-attachment.disabled .monaco-icon-label::before {
 	font-style: italic;
 }
-.chat-attached-context .chat-prompt-instructions-attachment.disabled:hover {
+.chat-attached-context .chat-prompt-attachment.disabled:hover {
 	opacity: 1;
 }
-.chat-attached-context .chat-prompt-instructions-attachment.disabled .chat-implicit-hint,
-.chat-attached-context .chat-prompt-instructions-attachment.disabled .label-name {
+.chat-attached-context .chat-prompt-attachment.disabled .chat-implicit-hint,
+.chat-attached-context .chat-prompt-attachment.disabled .label-name {
 	font-style: italic;
 	text-decoration: line-through;
 }
-.chat-attached-context .chat-prompt-instructions-attachment.disabled:focus {
+.chat-attached-context .chat-prompt-attachment.disabled:focus {
 	outline: none;
 	border-color: var(--vscode-focusBorder);
 }

From f4edc9af6c1d8e3018ca13a4e0d7de350f8f1368 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 21 Feb 2025 19:07:28 +0100
Subject: [PATCH 0247/1815] Migration from InlineEdit API to InlineCompletion
 API (#241501)

---
 src/vs/editor/common/languages.ts             |  1 +
 .../browser/model/inlineCompletionsModel.ts   | 12 ++--
 .../browser/model/provideInlineCompletions.ts |  1 +
 .../view/inlineEdits/inlineEditsView.ts       |  5 +-
 src/vs/monaco.d.ts                            |  1 +
 .../api/browser/mainThreadLanguageFeatures.ts |  8 ++-
 .../workbench/api/common/extHost.protocol.ts  |  3 +-
 .../api/common/extHostLanguageFeatures.ts     | 72 ++++++++++---------
 ...e.proposed.inlineCompletionsAdditions.d.ts | 16 ++++-
 9 files changed, 77 insertions(+), 42 deletions(-)

diff --git a/src/vs/editor/common/languages.ts b/src/vs/editor/common/languages.ts
index 47785fad3bbf..331c3f199c5f 100644
--- a/src/vs/editor/common/languages.ts
+++ b/src/vs/editor/common/languages.ts
@@ -789,6 +789,7 @@ export interface InlineCompletion {
 
 	/**
 	 * Is called the first time an inline completion is shown.
+	 * @deprecated. Use `onDidShow` of the provider instead.
 	*/
 	readonly shownCommand?: Command;
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
index 5ea7bfe4a8b6..efcbda1a33d9 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -891,15 +891,17 @@ export class InlineCompletionsModel extends Disposable {
 		});
 	}
 
-	public async handleInlineCompletionShown(inlineCompletion: InlineCompletionItem): Promise<void> {
-		if (!inlineCompletion.shownCommand) {
-			return;
-		}
+	public async handleInlineEditShown(inlineCompletion: InlineCompletionItem): Promise<void> {
 		if (inlineCompletion.didShow) {
 			return;
 		}
 		inlineCompletion.markAsShown();
-		await this._commandService.executeCommand(inlineCompletion.shownCommand.id, ...(inlineCompletion.shownCommand.arguments || []));
+
+		inlineCompletion.source.provider.handleItemDidShow?.(inlineCompletion.source.inlineCompletions, inlineCompletion.sourceInlineCompletion, inlineCompletion.insertText);
+
+		if (inlineCompletion.shownCommand) {
+			await this._commandService.executeCommand(inlineCompletion.shownCommand.id, ...(inlineCompletion.shownCommand.arguments || []));
+		}
 	}
 }
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
index b85881e6b886..f510bfab8538 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
@@ -345,6 +345,7 @@ export class InlineCompletionItem {
 	constructor(
 		readonly filterText: string,
 		readonly command: Command | undefined,
+		/** @deprecated. Use handleItemDidShow */
 		readonly shownCommand: Command | undefined,
 		readonly action: Command | undefined,
 		readonly range: Range,
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 d2e4a05a95f0..fe29ffa062be 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
@@ -94,7 +94,7 @@ export class InlineEditsView extends Disposable {
 			return undefined;
 		}
 
-		this._model.get()?.handleInlineCompletionShown(edit.inlineCompletion);
+		this._model.get()?.handleInlineEditShown(edit.inlineCompletion);
 
 		let mappings = RangeMapping.fromEdit(edit.edit);
 		let newText = edit.edit.apply(edit.originalText);
@@ -157,7 +157,8 @@ export class InlineEditsView extends Disposable {
 			const item = state?.read(reader);
 			const completionSource = item?.inlineCompletion?.source;
 			// TODO: expose the provider (typed) and expose the provider the edit belongs to typing and get correct edit
-			return (completionSource?.inlineCompletions as any)?.edits?.[0]?.provider?.displayName ?? previousDisplayName ?? localize('inlineEdit', "Inline Edit");
+			return (completionSource?.inlineCompletions as any)?.edits?.[0]?.provider?.displayName ?? previousDisplayName
+				?? completionSource?.provider.displayName ?? localize('inlineEdit', "Inline Edit");
 		}),
 		tabAction: derived<InlineEditTabAction>(this, reader => {
 			const m = this._model.read(reader);
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 50d113b437f2..8fcb54449116 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -7301,6 +7301,7 @@ declare namespace monaco.languages {
 		readonly action?: Command;
 		/**
 		 * Is called the first time an inline completion is shown.
+		 * @deprecated. Use `onDidShow` of the provider instead.
 		*/
 		readonly shownCommand?: Command;
 		/**
diff --git a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
index c744021cf31d..8c7d32de8273 100644
--- a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
+++ b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
@@ -614,7 +614,7 @@ 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, yieldsToExtensionIds: string[], debounceDelayMs: number | undefined): void {
+	$registerInlineCompletionsSupport(handle: number, selector: IDocumentFilterDto[], supportsHandleEvents: boolean, extensionId: string, yieldsToExtensionIds: string[], displayName: string | undefined, debounceDelayMs: number | undefined): void {
 		const provider: languages.InlineCompletionsProvider<IdentifiableInlineCompletions> = {
 			provideInlineCompletions: async (model: ITextModel, position: EditorPosition, context: languages.InlineCompletionContext, token: CancellationToken): Promise<IdentifiableInlineCompletions | undefined> => {
 				return this._proxy.$provideInlineCompletions(handle, model.uri, position, context, token);
@@ -635,9 +635,15 @@ export class MainThreadLanguageFeatures extends Disposable implements MainThread
 			freeInlineCompletions: (completions: IdentifiableInlineCompletions): void => {
 				this._proxy.$freeInlineCompletionsList(handle, completions.pid);
 			},
+			handleRejection: async (completions, item): Promise<void> => {
+				if (supportsHandleEvents) {
+					await this._proxy.$handleInlineCompletionRejection(handle, completions.pid, item.idx);
+				}
+			},
 			groupId: extensionId,
 			yieldsToGroupIds: yieldsToExtensionIds,
 			debounceDelayMs,
+			displayName,
 			toString() {
 				return `InlineCompletionsProvider(${extensionId})`;
 			},
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index a7542a4fd66e..ad532fcdcb04 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -472,7 +472,7 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable {
 	$emitDocumentSemanticTokensEvent(eventHandle: number): void;
 	$registerDocumentRangeSemanticTokensProvider(handle: number, selector: IDocumentFilterDto[], legend: languages.SemanticTokensLegend): void;
 	$registerCompletionsProvider(handle: number, selector: IDocumentFilterDto[], triggerCharacters: string[], supportsResolveDetails: boolean, extensionId: ExtensionIdentifier): void;
-	$registerInlineCompletionsSupport(handle: number, selector: IDocumentFilterDto[], supportsHandleDidShowCompletionItem: boolean, extensionId: string, yieldsToExtensionIds: string[], debounceDelayMs: number | undefined): void;
+	$registerInlineCompletionsSupport(handle: number, selector: IDocumentFilterDto[], supportsHandleDidShowCompletionItem: boolean, extensionId: string, yieldsToExtensionIds: string[], displayName: string | undefined, debounceDelayMs: number | undefined): void;
 	$registerInlineEditProvider(handle: number, selector: IDocumentFilterDto[], extensionId: ExtensionIdentifier, displayName: string): void;
 	$registerSignatureHelpProvider(handle: number, selector: IDocumentFilterDto[], metadata: ISignatureHelpProviderMetadataDto): void;
 	$registerInlayHintsProvider(handle: number, selector: IDocumentFilterDto[], supportsResolve: boolean, eventHandle: number | undefined, displayName: string | undefined): void;
@@ -2333,6 +2333,7 @@ export interface ExtHostLanguageFeaturesShape {
 	$provideInlineEditsForRange(handle: number, resource: UriComponents, range: IRange, context: languages.InlineCompletionContext, token: CancellationToken): Promise<IdentifiableInlineCompletions | undefined>;
 	$handleInlineCompletionDidShow(handle: number, pid: number, idx: number, updatedInsertText: string): void;
 	$handleInlineCompletionPartialAccept(handle: number, pid: number, idx: number, acceptedCharacters: number, info: languages.PartialAcceptInfo): void;
+	$handleInlineCompletionRejection(handle: number, pid: number, idx: number): void;
 	$freeInlineCompletionsList(handle: number, pid: number): void;
 	$provideSignatureHelp(handle: number, resource: UriComponents, position: IPosition, context: languages.SignatureHelpContext, token: CancellationToken): Promise<ISignatureHelpDto | undefined>;
 	$releaseSignatureHelp(handle: number, id: number): void;
diff --git a/src/vs/workbench/api/common/extHostLanguageFeatures.ts b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
index 86e7f8f45cfa..4a785ef16ded 100644
--- a/src/vs/workbench/api/common/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
@@ -1300,23 +1300,7 @@ class CompletionsAdapter {
 	}
 }
 
-class InlineCompletionAdapterBase {
-	async provideInlineCompletions(resource: URI, position: IPosition, context: languages.InlineCompletionContext, token: CancellationToken): Promise<extHostProtocol.IdentifiableInlineCompletions | undefined> {
-		return undefined;
-	}
-
-	async provideInlineEditsForRange(resource: URI, range: IRange, context: languages.InlineCompletionContext, token: CancellationToken): Promise<extHostProtocol.IdentifiableInlineCompletions | undefined> {
-		return undefined;
-	}
-
-	disposeCompletions(pid: number): void { }
-
-	handleDidShowCompletionItem(pid: number, idx: number, updatedInsertText: string): void { }
-
-	handlePartialAccept(pid: number, idx: number, acceptedCharacters: number, info: languages.PartialAcceptInfo): void { }
-}
-
-class InlineCompletionAdapter extends InlineCompletionAdapterBase {
+class InlineCompletionAdapter {
 	private readonly _references = new ReferenceMap<{
 		dispose(): void;
 		items: readonly vscode.InlineCompletionItem[];
@@ -1330,13 +1314,14 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
 		private readonly _provider: vscode.InlineCompletionItemProvider,
 		private readonly _commands: CommandsConverter,
 	) {
-		super();
 	}
 
 	public get supportsHandleEvents(): boolean {
 		return isProposedApiEnabled(this._extension, 'inlineCompletionsAdditions')
 			&& (typeof this._provider.handleDidShowCompletionItem === 'function'
-				|| typeof this._provider.handleDidPartiallyAcceptCompletionItem === 'function');
+				|| typeof this._provider.handleDidPartiallyAcceptCompletionItem === 'function'
+				|| typeof this._provider.handleDidRejectCompletionItem === 'function'
+			);
 	}
 
 	private readonly languageTriggerKindToVSCodeTriggerKind: Record<languages.InlineCompletionTriggerKind, InlineCompletionTriggerKind> = {
@@ -1344,7 +1329,7 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
 		[languages.InlineCompletionTriggerKind.Explicit]: InlineCompletionTriggerKind.Invoke,
 	};
 
-	override async provideInlineCompletions(resource: URI, position: IPosition, context: languages.InlineCompletionContext, token: CancellationToken): Promise<extHostProtocol.IdentifiableInlineCompletions | undefined> {
+	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);
 
@@ -1407,6 +1392,7 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
 					insertText: typeof insertText === 'string' ? insertText : { snippet: insertText.value },
 					filterText: item.filterText,
 					range: item.range ? typeConvert.Range.from(item.range) : undefined,
+					showRange: (this._isAdditionsProposedApiEnabled && item.showRange) ? typeConvert.Range.from(item.showRange) : undefined,
 					command,
 					action,
 					idx: idx,
@@ -1430,7 +1416,7 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
 		};
 	}
 
-	override async provideInlineEditsForRange(resource: URI, range: IRange, context: languages.InlineCompletionContext, token: CancellationToken): Promise<extHostProtocol.IdentifiableInlineCompletions | undefined> {
+	async provideInlineEditsForRange(resource: URI, range: IRange, context: languages.InlineCompletionContext, token: CancellationToken): Promise<extHostProtocol.IdentifiableInlineCompletions | undefined> {
 		if (!this._provider.provideInlineEditsForRange) {
 			return undefined;
 		}
@@ -1516,12 +1502,12 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
 		};
 	}
 
-	override disposeCompletions(pid: number) {
+	disposeCompletions(pid: number) {
 		const data = this._references.disposeReferenceId(pid);
 		data?.dispose();
 	}
 
-	override handleDidShowCompletionItem(pid: number, idx: number, updatedInsertText: string): void {
+	handleDidShowCompletionItem(pid: number, idx: number, updatedInsertText: string): void {
 		const completionItem = this._references.get(pid)?.items[idx];
 		if (completionItem) {
 			if (this._provider.handleDidShowCompletionItem && this._isAdditionsProposedApiEnabled) {
@@ -1530,7 +1516,7 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
 		}
 	}
 
-	override handlePartialAccept(pid: number, idx: number, acceptedCharacters: number, info: languages.PartialAcceptInfo): void {
+	handlePartialAccept(pid: number, idx: number, acceptedCharacters: number, info: languages.PartialAcceptInfo): void {
 		const completionItem = this._references.get(pid)?.items[idx];
 		if (completionItem) {
 			if (this._provider.handleDidPartiallyAcceptCompletionItem && this._isAdditionsProposedApiEnabled) {
@@ -1539,6 +1525,15 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
 			}
 		}
 	}
+
+	handleRejection(pid: number, idx: number): void {
+		const completionItem = this._references.get(pid)?.items[idx];
+		if (completionItem) {
+			if (this._provider.handleDidRejectCompletionItem && this._isAdditionsProposedApiEnabled) {
+				this._provider.handleDidRejectCompletionItem(completionItem);
+			}
+		}
+	}
 }
 
 class InlineEditAdapter {
@@ -2677,38 +2672,51 @@ export class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageF
 		this._withAdapter(handle, CompletionsAdapter, adapter => adapter.releaseCompletionItems(id), undefined, undefined);
 	}
 
-	// --- ghost test
+	// --- ghost text
 
 	registerInlineCompletionsProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.InlineCompletionItemProvider, metadata: vscode.InlineCompletionItemProviderMetadata | undefined): vscode.Disposable {
 		const adapter = new InlineCompletionAdapter(extension, this._documents, provider, this._commands.converter);
 		const handle = this._addNewAdapter(adapter, extension);
-		this._proxy.$registerInlineCompletionsSupport(handle, this._transformDocumentSelector(selector, extension), adapter.supportsHandleEvents,
-			ExtensionIdentifier.toKey(extension.identifier.value), metadata?.yieldTo?.map(extId => ExtensionIdentifier.toKey(extId)) || [], metadata?.debounceDelayMs);
+		this._proxy.$registerInlineCompletionsSupport(
+			handle,
+			this._transformDocumentSelector(selector, extension),
+			adapter.supportsHandleEvents,
+			ExtensionIdentifier.toKey(extension.identifier.value),
+			metadata?.yieldTo?.map(extId => ExtensionIdentifier.toKey(extId)) || [],
+			metadata?.displayName,
+			metadata?.debounceDelayMs,
+		);
 		return this._createDisposable(handle);
 	}
 
 	$provideInlineCompletions(handle: number, resource: UriComponents, position: IPosition, context: languages.InlineCompletionContext, token: CancellationToken): Promise<extHostProtocol.IdentifiableInlineCompletions | undefined> {
-		return this._withAdapter(handle, InlineCompletionAdapterBase, adapter => adapter.provideInlineCompletions(URI.revive(resource), position, context, token), undefined, token);
+		return this._withAdapter(handle, InlineCompletionAdapter, adapter => adapter.provideInlineCompletions(URI.revive(resource), position, context, token), undefined, token);
 	}
 
 	$provideInlineEditsForRange(handle: number, resource: UriComponents, range: IRange, context: languages.InlineCompletionContext, token: CancellationToken): Promise<extHostProtocol.IdentifiableInlineCompletions | undefined> {
-		return this._withAdapter(handle, InlineCompletionAdapterBase, adapter => adapter.provideInlineEditsForRange(URI.revive(resource), range, context, token), undefined, token);
+		return this._withAdapter(handle, InlineCompletionAdapter, adapter => adapter.provideInlineEditsForRange(URI.revive(resource), range, context, token), undefined, token);
 	}
 
 	$handleInlineCompletionDidShow(handle: number, pid: number, idx: number, updatedInsertText: string): void {
-		this._withAdapter(handle, InlineCompletionAdapterBase, async adapter => {
+		this._withAdapter(handle, InlineCompletionAdapter, async adapter => {
 			adapter.handleDidShowCompletionItem(pid, idx, updatedInsertText);
 		}, undefined, undefined);
 	}
 
 	$handleInlineCompletionPartialAccept(handle: number, pid: number, idx: number, acceptedCharacters: number, info: languages.PartialAcceptInfo): void {
-		this._withAdapter(handle, InlineCompletionAdapterBase, async adapter => {
+		this._withAdapter(handle, InlineCompletionAdapter, async adapter => {
 			adapter.handlePartialAccept(pid, idx, acceptedCharacters, info);
 		}, undefined, undefined);
 	}
 
+	$handleInlineCompletionRejection(handle: number, pid: number, idx: number): void {
+		this._withAdapter(handle, InlineCompletionAdapter, async adapter => {
+			adapter.handleRejection(pid, idx);
+		}, undefined, undefined);
+	}
+
 	$freeInlineCompletionsList(handle: number, pid: number): void {
-		this._withAdapter(handle, InlineCompletionAdapterBase, async adapter => { adapter.disposeCompletions(pid); }, undefined, undefined);
+		this._withAdapter(handle, InlineCompletionAdapter, async adapter => { adapter.disposeCompletions(pid); }, undefined, undefined);
 	}
 
 	// --- inline edit
diff --git a/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts b/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
index 80e3ebdd751d..2bbd50bb777a 100644
--- a/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
+++ b/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
@@ -32,9 +32,15 @@ declare module 'vscode' {
 
 		warning?: InlineCompletionWarning;
 
-		/** If set to `true`, this item is rendered as inline edit. */
+		/** If set to `true`, this item is treated as inline edit. */
 		isInlineEdit?: boolean;
 
+		/**
+		 * A range specifying when the edit can be shown based on the cursor position.
+		 * If the cursor is within this range, the inline edit can be displayed.
+		 */
+		showRange?: Range;
+
 		showInlineEditMenu?: boolean;
 
 		action?: Command;
@@ -53,6 +59,8 @@ declare module 'vscode' {
 		yieldTo?: string[];
 
 		debounceDelayMs?: number;
+
+		displayName?: string;
 	}
 
 	export interface InlineCompletionItemProvider {
@@ -63,6 +71,12 @@ declare module 'vscode' {
 		// eslint-disable-next-line local/vscode-dts-provider-naming
 		handleDidShowCompletionItem?(completionItem: InlineCompletionItem, updatedInsertText: string): void;
 
+		/**
+		 * @param completionItem The completion item that was rejected.
+		*/
+		// eslint-disable-next-line local/vscode-dts-provider-naming
+		handleDidRejectCompletionItem?(completionItem: InlineCompletionItem): void;
+
 		/**
 		 * Is called when an inline completion item was accepted partially.
 		 * @param acceptedLength The length of the substring of the inline completion that was accepted already.

From 77e89e2d0c28ea3a05a444fb99a6e13f6d9218ea Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Fri, 21 Feb 2025 12:31:11 -0600
Subject: [PATCH 0248/1815] factor in completion description in sorting
 (#241505)

fix #241252
---
 .../suggest/browser/terminalCompletionModel.ts           | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionModel.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionModel.ts
index 9629c65bce2d..c83bbe13a7ce 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionModel.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionModel.ts
@@ -67,7 +67,14 @@ const compareCompletionsFn = (leadingLineContent: string, a: TerminalCompletionI
 
 	// Sort by more detailed completions
 	if (a.completion.kind === TerminalCompletionItemKind.Method && b.completion.kind === TerminalCompletionItemKind.Method) {
-		score = (b.completion.detail ? 1 : 0) + (b.completion.documentation ? 2 : 0) - (a.completion.detail ? 1 : 0) - (a.completion.documentation ? 2 : 0);
+		if (typeof a.completion.label !== 'string' && a.completion.label.description && typeof b.completion.label !== 'string' && b.completion.label.description) {
+			score = 0;
+		} else if (typeof a.completion.label !== 'string' && a.completion.label.description) {
+			score = -2;
+		} else if (typeof b.completion.label !== 'string' && 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);
 		if (score !== 0) {
 			return score;
 		}

From a8e09c199664cede7d99232e1b7c02a51ff53a15 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 21 Feb 2025 10:33:14 -0800
Subject: [PATCH 0249/1815] Remove no longer needed logging

---
 .../api/browser/mainThreadWebviewPanels.ts    | 20 ++-----------
 .../chat/browser/chatInlineAnchorWidget.ts    | 28 -------------------
 .../contrib/webview/browser/webviewElement.ts | 22 +++------------
 3 files changed, 6 insertions(+), 64 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts b/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts
index 3a7ddf961e8e..e96588a20c91 100644
--- a/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts
+++ b/src/vs/workbench/api/browser/mainThreadWebviewPanels.ts
@@ -10,9 +10,6 @@ import { URI } from '../../../base/common/uri.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
 import { IStorageService } from '../../../platform/storage/common/storage.js';
-import { ITelemetryService } from '../../../platform/telemetry/common/telemetry.js';
-import { MainThreadWebviews, reviveWebviewContentOptions, reviveWebviewExtension } from './mainThreadWebviews.js';
-import * as extHostProtocol from '../common/extHost.protocol.js';
 import { DiffEditorInput } from '../../common/editor/diffEditorInput.js';
 import { EditorInput } from '../../common/editor/editorInput.js';
 import { ExtensionKeyedWebviewOriginStore, WebviewOptions } from '../../contrib/webview/browser/webview.js';
@@ -24,6 +21,8 @@ import { GroupLocation, GroupsOrder, IEditorGroup, IEditorGroupsService, preferr
 import { ACTIVE_GROUP, IEditorService, PreferredGroup, SIDE_GROUP } from '../../services/editor/common/editorService.js';
 import { IExtensionService } from '../../services/extensions/common/extensions.js';
 import { IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
+import * as extHostProtocol from '../common/extHost.protocol.js';
+import { MainThreadWebviews, reviveWebviewContentOptions, reviveWebviewExtension } from './mainThreadWebviews.js';
 
 /**
  * Bi-directional map between webview handles and inputs.
@@ -98,7 +97,6 @@ export class MainThreadWebviewPanels extends Disposable implements extHostProtoc
 		@IEditorService private readonly _editorService: IEditorService,
 		@IExtensionService extensionService: IExtensionService,
 		@IStorageService storageService: IStorageService,
-		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@IWebviewWorkbenchService private readonly _webviewWorkbenchService: IWebviewWorkbenchService,
 	) {
 		super();
@@ -174,20 +172,6 @@ export class MainThreadWebviewPanels extends Disposable implements extHostProtoc
 		}, this.webviewPanelViewType.fromExternal(viewType), initData.title, mainThreadShowOptions);
 
 		this.addWebviewInput(handle, webview, { serializeBuffersForPostMessage: initData.serializeBuffersForPostMessage });
-
-		const payload = {
-			extensionId: extension.id.value,
-			viewType
-		} as const;
-
-		type Classification = {
-			extensionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Id of the extension that created the webview panel' };
-			viewType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Id of the webview' };
-			owner: 'mjbvz';
-			comment: 'Triggered when a webview is created. Records the type of webview and the extension which created it';
-		};
-
-		this._telemetryService.publicLog2<typeof payload, Classification>('webviews:createWebviewPanel', payload);
 	}
 
 	public $disposeWebview(handle: extHostProtocol.WebviewHandle): void {
diff --git a/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts b/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts
index 6849ca7b0817..f3479e017bdd 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts
@@ -7,10 +7,8 @@ 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 { Lazy } from '../../../../base/common/lazy.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { URI } from '../../../../base/common/uri.js';
-import { generateUuid } from '../../../../base/common/uuid.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { IRange } from '../../../../editor/common/core/range.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
@@ -92,8 +90,6 @@ export class InlineAnchorWidget extends Disposable {
 		const contextKeyService = this._register(originalContextKeyService.createScoped(element));
 		this._chatResourceContext = chatAttachmentResourceContextKey.bindTo(contextKeyService);
 
-		const anchorId = new Lazy(generateUuid);
-
 		element.classList.add(InlineAnchorWidget.className, 'show-file-icons');
 
 		let iconText: string;
@@ -109,18 +105,6 @@ export class InlineAnchorWidget extends Disposable {
 			iconText = this.data.symbol.name;
 			iconClasses = ['codicon', ...getIconClasses(modelService, languageService, undefined, undefined, SymbolKinds.toIcon(symbol.kind))];
 
-			this._register(dom.addDisposableListener(element, 'click', () => {
-				telemetryService.publicLog2<{
-					anchorId: string;
-				}, {
-					anchorId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Unique identifier for the current anchor.' };
-					owner: 'mjbvz';
-					comment: 'Provides insight into the usage of Chat features.';
-				}>('chat.inlineAnchor.openSymbol', {
-					anchorId: anchorId.value
-				});
-			}));
-
 			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;
@@ -148,18 +132,6 @@ export class InlineAnchorWidget extends Disposable {
 				})
 				.catch(() => { });
 
-			this._register(dom.addDisposableListener(element, 'click', () => {
-				telemetryService.publicLog2<{
-					anchorId: string;
-				}, {
-					anchorId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Unique identifier for the current anchor.' };
-					owner: 'mjbvz';
-					comment: 'Provides insight into the usage of Chat features.';
-				}>('chat.inlineAnchor.openResource', {
-					anchorId: anchorId.value
-				});
-			}));
-
 			// Context menu
 			this._register(dom.addDisposableListener(element, dom.EventType.CONTEXT_MENU, async domEvent => {
 				const event = new StandardMouseEvent(dom.getWindow(domEvent), domEvent);
diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
index 1b66babea28b..1273b8c7a9a5 100644
--- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts
+++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
@@ -5,7 +5,9 @@
 
 import { isFirefox } from '../../../../base/browser/browser.js';
 import { addDisposableListener, EventType, getWindowById } from '../../../../base/browser/dom.js';
+import { parentOriginHash } from '../../../../base/browser/iframe.js';
 import { IMouseWheelEvent } from '../../../../base/browser/mouseEvent.js';
+import { CodeWindow } from '../../../../base/browser/window.js';
 import { promiseWithResolvers, ThrottledDelayer } from '../../../../base/common/async.js';
 import { streamToBuffer, VSBufferReadableStream } from '../../../../base/common/buffer.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
@@ -26,18 +28,15 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { ITunnelService } from '../../../../platform/tunnel/common/tunnel.js';
 import { WebviewPortMappingManager } from '../../../../platform/webview/common/webviewPortMapping.js';
-import { parentOriginHash } from '../../../../base/browser/iframe.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { decodeAuthority, webviewGenericCspSource, webviewRootResourceAuthority } from '../common/webview.js';
 import { loadLocalResource, WebviewResourceResponse } from './resourceLoading.js';
 import { WebviewThemeDataProvider } from './themeing.js';
 import { areWebviewContentOptionsEqual, IWebview, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent, WebviewOptions } from './webview.js';
 import { WebviewFindDelegate, WebviewFindWidget } from './webviewFindWidget.js';
 import { FromWebviewMessage, KeyEvent, ToWebviewMessage, WebViewDragEvent } from './webviewMessages.js';
-import { decodeAuthority, webviewGenericCspSource, webviewRootResourceAuthority } from '../common/webview.js';
-import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
-import { CodeWindow } from '../../../../base/browser/window.js';
 
 interface WebviewContent {
 	readonly html: string;
@@ -158,7 +157,6 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
 		@IFileService private readonly _fileService: IFileService,
 		@ILogService private readonly _logService: ILogService,
 		@IRemoteAuthorityResolverService private readonly _remoteAuthorityResolverService: IRemoteAuthorityResolverService,
-		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@ITunnelService private readonly _tunnelService: ITunnelService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
@@ -588,18 +586,6 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
 			if (this._environmentService.isExtensionDevelopment) {
 				this._onMissingCsp.fire(this.extension.id);
 			}
-
-			const payload = {
-				extension: this.extension.id.value
-			} as const;
-
-			type Classification = {
-				extension: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The id of the extension that created the webview.' };
-				owner: 'mjbz';
-				comment: 'Helps find which extensions are contributing webviews with invalid CSPs';
-			};
-
-			this._telemetryService.publicLog2<typeof payload, Classification>('webviewMissingCsp', payload);
 		}
 	}
 

From 98d4b8bdd1f34d372a74e04faf991721caa65a21 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Fri, 21 Feb 2025 10:41:23 -0800
Subject: [PATCH 0250/1815] Change "Generating" to "Working" (#241506)

---
 src/vs/workbench/contrib/chat/browser/chatListRenderer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index bfe7cad91f96..5e49967cbc60 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -465,7 +465,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			if (element.model.isPaused.get()) {
 				templateData.detail.textContent = localize('paused', "Paused");
 			} else {
-				templateData.detail.textContent = localize('generating', "Generating");
+				templateData.detail.textContent = localize('working', "Working");
 			}
 		}
 	}

From c2c5cb0b570307173bbdc04d821cc1e5306687a9 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 21 Feb 2025 11:07:01 -0800
Subject: [PATCH 0251/1815] .

---
 src/vs/editor/contrib/symbolIcons/browser/symbolIcons.css   | 4 ++++
 src/vs/editor/contrib/symbolIcons/browser/symbolIcons.ts    | 5 +++++
 .../terminalContrib/suggest/browser/terminalSuggestAddon.ts | 6 ++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.css b/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.css
index 475006090b4e..a025a03ac2aa 100644
--- a/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.css
+++ b/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.css
@@ -11,6 +11,10 @@
 .monaco-workbench .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-editor .codicon.codicon-symbol-method-arrow,
+.monaco-workbench .codicon.codicon-symbol-method-arrow { color: var(--vscode-symbolIcon-methodArrowForeground); }
+.monaco-editor .codicon.codicon-flag,
+.monaco-workbench .codicon.codicon-flag { color: var(--vscode-symbolIcon-flagForeground); }
 .monaco-editor .codicon.codicon-symbol-color,
 .monaco-workbench .codicon.codicon-symbol-color { color: var(--vscode-symbolIcon-colorForeground); }
 .monaco-editor .codicon.codicon-symbol-constant,
diff --git a/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.ts b/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.ts
index a2795f7541ce..0cd566196475 100644
--- a/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.ts
+++ b/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.ts
@@ -36,6 +36,9 @@ export const SYMBOL_ICON_ENUMERATOR_FOREGROUND = registerColor('symbolIcon.enume
 	hcLight: '#D67E00'
 }, localize('symbolIcon.enumeratorForeground', 'The foreground color for enumerator symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
+
+export const SYMBOL_ICON_FLAG_FOREGROUND = registerColor('symbolIcon.flagForeground', SYMBOL_ICON_ENUMERATOR_FOREGROUND, localize('symbolIcon.enumeratorForeground', 'The foreground color for enumerator symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
+
 export const SYMBOL_ICON_ENUMERATOR_MEMBER_FOREGROUND = registerColor('symbolIcon.enumeratorMemberForeground', {
 	dark: '#75BEFF',
 	light: '#007ACC',
@@ -86,6 +89,8 @@ export const SYMBOL_ICON_METHOD_FOREGROUND = registerColor('symbolIcon.methodFor
 	hcLight: '#652D90'
 }, localize('symbolIcon.methodForeground', 'The foreground color for method symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
+export const SYMBOL_ICON_METHOD_ARROW_FOREGROUND = registerColor('symbolIcon.methodArrowForeground', SYMBOL_ICON_METHOD_FOREGROUND, localize('symbolIcon.methodArrowForeground', 'The foreground color for method with an arrow symbols. These symbols appear in the suggest widget.'));
+
 export const SYMBOL_ICON_MODULE_FOREGROUND = registerColor('symbolIcon.moduleForeground', foreground, localize('symbolIcon.moduleForeground', 'The foreground color for module symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
 export const SYMBOL_ICON_NAMESPACE_FOREGROUND = registerColor('symbolIcon.namespaceForeground', foreground, localize('symbolIcon.namespaceForeground', 'The foreground color for namespace symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index ebbfc3cdb6e9..1b2ccfdc8e4f 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -92,11 +92,11 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		[TerminalCompletionItemKind.File, Codicon.file],
 		[TerminalCompletionItemKind.Folder, Codicon.folder],
 		[TerminalCompletionItemKind.Method, Codicon.symbolMethod],
-		[TerminalCompletionItemKind.Alias, Codicon.replace],
+		[TerminalCompletionItemKind.Alias, Codicon.symbolMethodArrow],
 		[TerminalCompletionItemKind.Argument, Codicon.symbolVariable],
 		[TerminalCompletionItemKind.Option, Codicon.symbolEnum],
 		[TerminalCompletionItemKind.OptionValue, Codicon.symbolEnumMember],
-		[TerminalCompletionItemKind.Flag, Codicon.symbolProperty],
+		[TerminalCompletionItemKind.Flag, Codicon.flag],
 		[TerminalCompletionItemKind.InlineSuggestion, Codicon.star],
 		[TerminalCompletionItemKind.InlineSuggestionAlwaysOnTop, Codicon.star],
 	]);
@@ -524,11 +524,13 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			this._inlineCompletionItem.idx = x.idx;
 			this._inlineCompletionItem.score = x.score;
 			this._inlineCompletionItem.labelLow = x.labelLow;
+			this._inlineCompletionItem.textLabel = x.textLabel;
 			this._inlineCompletionItem.fileExtLow = x.fileExtLow;
 			this._inlineCompletionItem.labelLowExcludeFileExt = x.labelLowExcludeFileExt;
 			this._inlineCompletionItem.labelLowNormalizedPath = x.labelLowNormalizedPath;
 			this._inlineCompletionItem.underscorePenalty = x.underscorePenalty;
 			this._inlineCompletionItem.word = x.word;
+			this._model?.forceRefilterAll();
 		}
 
 		// Force a filter all in order to re-evaluate the inline completion

From 72329c8c579d1e4229f51885715f49bd7cfc9c36 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Fri, 21 Feb 2025 11:15:45 -0800
Subject: [PATCH 0252/1815] Tweak chat stream rate computation again (#241513)

Now, just ignoring the initial pause entirely. Don't start counting until we have some words. This is especially helpful for Claude which has a long initial pause. Previously the timer would be started by some references showing up.
---
 src/vs/workbench/contrib/chat/common/chatViewModel.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/common/chatViewModel.ts b/src/vs/workbench/contrib/chat/common/chatViewModel.ts
index 88d973ecc41d..063bd4b0a7f5 100644
--- a/src/vs/workbench/contrib/chat/common/chatViewModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatViewModel.ts
@@ -588,9 +588,13 @@ export class ChatResponseViewModel extends Disposable implements IChatResponseVi
 				const now = Date.now();
 				const wordCount = countWords(_model.entireResponse.getMarkdown());
 
-				if (wordCount > 0 && wordCount === this._contentUpdateTimings.lastWordCount) {
+				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, 1000);
 					const newTotalTime = Math.max(this._contentUpdateTimings.totalTime + timeDiff, 250);
 					const impliedWordLoadRate = wordCount / (newTotalTime / 1000);

From 4e45baad220bb80f2cb54eba11c8c0481c585bea Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Fri, 21 Feb 2025 11:27:57 -0800
Subject: [PATCH 0253/1815] Fix folder icon for chat (#241514)

The LLM doesn't necessarily write a path that ends in /. Could patch it up in the tool but relying on stat is better.
---
 .../contrib/chat/browser/chatInlineAnchorWidget.ts   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts b/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts
index 6849ca7b0817..0e19db104f3d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.ts
@@ -130,21 +130,29 @@ export class InlineAnchorWidget extends Disposable {
 				`${label}#${location.range.startLineNumber}-${location.range.endLineNumber}` :
 				label;
 
-			const fileKind = location.uri.path.endsWith('/') ? FileKind.FOLDER : FileKind.FILE;
+			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();
 
-			this._register(themeService.onDidFileIconThemeChange(() => {
+			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(() => { });
 

From e00ff2803fd0b24778728b83fe7654a21074064f Mon Sep 17 00:00:00 2001
From: meganrogge <merogge@microsoft.com>
Date: Fri, 21 Feb 2025 14:12:15 -0600
Subject: [PATCH 0254/1815] get it working

---
 .../src/completions/index.d.ts                |  45 +++
 .../src/completions/upstream/apt.ts           |   4 +-
 .../src/completions/upstream/node.ts          |  12 +-
 .../src/completions/upstream/python.ts        |  10 +-
 .../fig/autocomplete-parser/parseArguments.ts |  13 +-
 .../autocomplete-tools/generators/index.ts    |   8 +
 .../autocomplete-tools/generators/src/ai.ts   | 130 +++++++
 .../generators/src/filepaths.ts               | 224 +++++++++++
 .../generators/src/keyvalue.ts                | 355 ++++++++++++++++++
 .../generators/src/resolve.ts                 |  36 ++
 .../generators/customSuggestionsGenerator.ts  |   7 +-
 .../src/fig/autocomplete/state/generators.ts  |   2 +-
 .../terminal-suggest/src/fig/figInterface.ts  |   6 +
 .../src/terminalSuggestMain.ts                |   8 +-
 .../workbench/api/common/extHost.protocol.ts  |   1 +
 .../browser/terminalCompletionService.ts      |  10 +-
 ...e.proposed.terminalCompletionProvider.d.ts |   6 +
 17 files changed, 857 insertions(+), 20 deletions(-)
 create mode 100644 extensions/terminal-suggest/src/fig/autocomplete-tools/generators/index.ts
 create mode 100644 extensions/terminal-suggest/src/fig/autocomplete-tools/generators/src/ai.ts
 create mode 100644 extensions/terminal-suggest/src/fig/autocomplete-tools/generators/src/filepaths.ts
 create mode 100644 extensions/terminal-suggest/src/fig/autocomplete-tools/generators/src/keyvalue.ts
 create mode 100644 extensions/terminal-suggest/src/fig/autocomplete-tools/generators/src/resolve.ts

diff --git a/extensions/terminal-suggest/src/completions/index.d.ts b/extensions/terminal-suggest/src/completions/index.d.ts
index 44dcb9814456..56ff7fac7fcf 100644
--- a/extensions/terminal-suggest/src/completions/index.d.ts
+++ b/extensions/terminal-suggest/src/completions/index.d.ts
@@ -1296,5 +1296,50 @@ declare namespace Fig {
 		 *
 		 */
 		cache?: Cache;
+
+		/**
+		 * Options related to file paths used in the generator, including filtering options and handling of file extensions.
+		 */
+		filepathOptions?: FilepathsOptions; // <-- VS Code edit to return file resource request config as we resolve files in core
+	}
+
+	type FilepathsOptions = {
+		/**
+		 * Show suggestions with any of these extensions. Do not include the leading dot.
+		 */
+		extensions?: string[];
+		/**
+		 * Show suggestions where the name exactly matches one of these strings
+		 */
+		equals?: string | string[];
+		/**
+		 * Show suggestions where the name matches this expression
+		 */
+		matches?: RegExp;
+		/**
+		 * Will treat folders like files, filtering based on the name.
+		 */
+		filterFolders?: boolean;
+		/**
+		 * Set properties of suggestions of type 'file'.
+		 */
+		editFileSuggestions?: Omit<Fig.Suggestion, 'name' | 'type'>;
+		/**
+		 * Set properties of suggestions of type 'folder'.
+		 */
+		editFolderSuggestions?: Omit<Fig.Suggestion, 'name' | 'type'>;
+		/**
+		 * Start to suggest filepaths and folders from this directory.
+		 */
+		rootDirectory?: string;
+		/**
+		 * Set how the generator should display folders:
+		 * - **Default:** `always` will always suggest folders.
+		 * - `never`: will never suggest folders.
+		 * - `only`: will show only folders and no files.
+		 */
+		showFolders?: 'always' | 'never' | 'only';
 	}
 }
+
+
diff --git a/extensions/terminal-suggest/src/completions/upstream/apt.ts b/extensions/terminal-suggest/src/completions/upstream/apt.ts
index c2157963fd9b..a6ec97abfd0a 100644
--- a/extensions/terminal-suggest/src/completions/upstream/apt.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/apt.ts
@@ -1,4 +1,4 @@
-// import { filepaths } from "@fig/autocomplete-generators";
+import { filepaths } from '../../fig/autocomplete-tools/generators'
 
 const packages: Fig.Generator = {
 	// only trigger when the token length transitions to or from 0
@@ -137,7 +137,7 @@ const completionSpec: Fig.Spec = {
 				template: 'filepaths',
 				generators: [
 					packages,
-					// filepaths({ extensions: ["deb"] })
+					filepaths({ extensions: ["deb"] })
 				],
 			},
 			options: [
diff --git a/extensions/terminal-suggest/src/completions/upstream/node.ts b/extensions/terminal-suggest/src/completions/upstream/node.ts
index bc261c5affe4..034ccb78cdc5 100644
--- a/extensions/terminal-suggest/src/completions/upstream/node.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/node.ts
@@ -1,4 +1,4 @@
-// import { filepaths } from "@fig/autocomplete-generators";
+import { filepaths } from '../../fig/autocomplete-tools/generators'
 
 const completionSpec: Fig.Subcommand = {
 	name: "node",
@@ -6,11 +6,11 @@ const completionSpec: Fig.Subcommand = {
 	args: {
 		name: "node script",
 		isScript: true,
-		template: 'folders',
-		// generators: filepaths({
-		//   extensions: ["mjs", "js", "cjs"],
-		//   editFileSuggestions: { priority: 76 },
-		// }),
+		template: 'filepaths',
+		generators: filepaths({
+			extensions: ["mjs", "js", "cjs"],
+			editFileSuggestions: { priority: 76 },
+		}),
 	},
 	options: [
 		{
diff --git a/extensions/terminal-suggest/src/completions/upstream/python.ts b/extensions/terminal-suggest/src/completions/upstream/python.ts
index c9efa79499d2..97fdb841c234 100644
--- a/extensions/terminal-suggest/src/completions/upstream/python.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/python.ts
@@ -1,4 +1,4 @@
-// import { filepaths } from "@fig/autocomplete-generators";
+import { filepaths } from '../../fig/autocomplete-tools/generators'
 
 const completionSpec: Fig.Spec = {
 	name: "python",
@@ -22,10 +22,10 @@ const completionSpec: Fig.Spec = {
 	args: {
 		name: "python script",
 		template: "filepaths",
-		// generators: filepaths({
-		// 	extensions: ["py"],
-		// 	editFileSuggestions: { priority: 76 },
-		// }),
+		generators: filepaths({
+			extensions: ["py"],
+			editFileSuggestions: { priority: 76 },
+		}),
 	},
 	options: [
 		{
diff --git a/extensions/terminal-suggest/src/fig/autocomplete-parser/parseArguments.ts b/extensions/terminal-suggest/src/fig/autocomplete-parser/parseArguments.ts
index c26f3a77143d..ac28d1cc8555 100644
--- a/extensions/terminal-suggest/src/fig/autocomplete-parser/parseArguments.ts
+++ b/extensions/terminal-suggest/src/fig/autocomplete-parser/parseArguments.ts
@@ -89,6 +89,7 @@ export type ArgumentParserState = {
 	// Used to exclude subcommand suggestions after user has entered a subcommand arg.
 	haveEnteredSubcommandArgs: boolean;
 	isEndOfOptions: boolean;
+	fileExtensions?: string[];
 };
 
 // Result with derived completionObj/currentArg from cached state.
@@ -100,6 +101,7 @@ export type ArgumentParserResult = {
 	commandIndex: number;
 	suggestionFlags: SuggestionFlags;
 	annotations: Annotation[];
+	fileExtensions?: string[];
 };
 
 export const createArgState = (args?: Internal.Arg[]): ArgArrayState => {
@@ -749,6 +751,7 @@ export const getResultFromState = (
 		currentArg,
 		searchTerm,
 		suggestionFlags,
+		fileExtensions: state.fileExtensions,
 	};
 };
 
@@ -1036,7 +1039,15 @@ const parseArgumentsCached = async (
 	// } else {
 	// 	parseArgumentsCache.set(cacheKey, state);
 	// }
-
+	if ('args' in spec) {
+		for (const arg of Array.isArray(spec.args) ? spec.args : [spec.args]) {
+			for (const generator of Array.isArray(arg?.generators) ? arg.generators : [arg?.generators]) {
+				if (generator?.filepathOptions?.extensions) {
+					state.fileExtensions = generator.filepathOptions.extensions;
+				}
+			}
+		}
+	}
 	return state;
 };
 
diff --git a/extensions/terminal-suggest/src/fig/autocomplete-tools/generators/index.ts b/extensions/terminal-suggest/src/fig/autocomplete-tools/generators/index.ts
new file mode 100644
index 000000000000..38cacb06514e
--- /dev/null
+++ b/extensions/terminal-suggest/src/fig/autocomplete-tools/generators/index.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.
+ *--------------------------------------------------------------------------------------------*/
+
+export { filepaths, FilepathsOptions, folders } from './src/filepaths';
+export * from './src/keyvalue';
+export { ai } from './src/ai';
diff --git a/extensions/terminal-suggest/src/fig/autocomplete-tools/generators/src/ai.ts b/extensions/terminal-suggest/src/fig/autocomplete-tools/generators/src/ai.ts
new file mode 100644
index 000000000000..87e0b0891d5e
--- /dev/null
+++ b/extensions/terminal-suggest/src/fig/autocomplete-tools/generators/src/ai.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.
+ *--------------------------------------------------------------------------------------------*/
+export type GeneratorFn<T> = (args: {
+	tokens: string[];
+	executeCommand: Fig.ExecuteCommandFunction;
+	generatorContext: Fig.GeneratorContext;
+}) => Promise<T> | T;
+
+const MAX_TOKENS = 4097;
+const TOKEN_TO_CHAR_RATIO = 4;
+const MARGIN_RATIO = 0.8;
+const MAX_CHARS = MAX_TOKENS * TOKEN_TO_CHAR_RATIO * MARGIN_RATIO;
+
+/**
+ * A generator that uses the Fig AI API to generate suggestions.
+ *
+ * @param prompt The prompt to use for the AI. Can be a string or a generator function.
+ * @param message The message to send to the AI. Can be a string or a generator function.
+ * @param postProcess A function to post-process the AI's response.
+ * @param temperature The temperature to use for the AI.
+ * @returns A Fig generator.
+ */
+export function ai({
+	name,
+	prompt,
+	message,
+	postProcess,
+	temperature,
+	splitOn,
+}: {
+	name: string;
+	prompt?: string | GeneratorFn<string>;
+	message: string | GeneratorFn<string | null> | null;
+	postProcess?: (out: string) => Fig.Suggestion[];
+	temperature?: number;
+	splitOn?: string;
+}): Fig.Generator {
+	return {
+		scriptTimeout: 15000,
+		custom: async (tokens, executeCommand, generatorContext) => {
+			const settingOutput = await executeCommand({
+				command: 'fig',
+				args: ['settings', '--format', 'json', 'autocomplete.ai.enabled'],
+			});
+
+			if (!JSON.parse(settingOutput.stdout)) {
+				return [];
+			}
+
+			const promptString =
+				typeof prompt === 'function'
+					? await prompt({
+						tokens,
+						executeCommand,
+						generatorContext,
+					})
+					: prompt;
+
+			const messageString =
+				typeof message === 'function'
+					? await message({
+						tokens,
+						executeCommand,
+						generatorContext,
+					})
+					: message;
+
+			if (messageString === null || messageString.length === 0) {
+				console.warn('No message provided to AI generator');
+				return [];
+			}
+
+			const budget = MAX_CHARS - (promptString?.length ?? 0);
+
+			const body = {
+				model: 'gpt-3.5-turbo',
+				source: 'autocomplete',
+				name,
+				messages: [
+					...(promptString
+						? [
+							{
+								role: 'system',
+								content: promptString,
+							},
+						]
+						: []),
+					{
+						role: 'user',
+						content: messageString.slice(0, budget),
+					},
+				],
+				temperature,
+			};
+
+			const bodyJson = JSON.stringify(body);
+
+			const requestOutput = await executeCommand({
+				command: 'fig',
+				args: ['_', 'request', '--route', '/ai/chat', '--method', 'POST', '--body', bodyJson],
+			});
+			const json = JSON.parse(requestOutput.stdout);
+
+			const a =
+				json?.choices
+					.map((c: any) => c?.message?.content)
+					.filter((c: unknown) => typeof c === 'string')
+					.flatMap((c: string) =>
+						splitOn ? c.split(splitOn).filter((s) => s.trim().length > 0) : [c]
+					)
+					.map((out: string) => {
+						if (postProcess) {
+							return postProcess(out);
+						}
+						const text = out.trim().replace(/\n/g, ' ');
+						// eslint-disable-next-line local/code-no-dangerous-type-assertions allow-any-unicode-next-line
+						return {
+							icon: '🪄',
+							name: text,
+							insertValue: `'${text}'`,
+							description: 'Generated by Fig AI',
+						} as Fig.Suggestion;
+					}) ?? [];
+
+			return a;
+		},
+	};
+}
diff --git a/extensions/terminal-suggest/src/fig/autocomplete-tools/generators/src/filepaths.ts b/extensions/terminal-suggest/src/fig/autocomplete-tools/generators/src/filepaths.ts
new file mode 100644
index 000000000000..59d19203f169
--- /dev/null
+++ b/extensions/terminal-suggest/src/fig/autocomplete-tools/generators/src/filepaths.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 { ensureTrailingSlash, shellExpand } from './resolve';
+
+export interface FilepathsOptions {
+	/**
+	 * Show suggestions with any of these extensions. Do not include the leading dot.
+	 */
+	extensions?: string[];
+	/**
+	 * Show suggestions where the name exactly matches one of these strings
+	 */
+	equals?: string | string[];
+	/**
+	 * Show suggestions where the name matches this expression
+	 */
+	matches?: RegExp;
+	/**
+	 * Will treat folders like files, filtering based on the name.
+	 */
+	filterFolders?: boolean;
+	/**
+	 * Set properties of suggestions of type 'file'.
+	 */
+	editFileSuggestions?: Omit<Fig.Suggestion, 'name' | 'type'>;
+	/**
+	 * Set properties of suggestions of type 'folder'.
+	 */
+	editFolderSuggestions?: Omit<Fig.Suggestion, 'name' | 'type'>;
+	/**
+	 * Start to suggest filepaths and folders from this directory.
+	 */
+	rootDirectory?: string;
+	/**
+	 * Set how the generator should display folders:
+	 * - **Default:** `always` will always suggest folders.
+	 * - `never`: will never suggest folders.
+	 * - `only`: will show only folders and no files.
+	 */
+	showFolders?: 'always' | 'never' | 'only';
+}
+
+export function sortFilesAlphabetically(array: string[], skip: string[] = []): string[] {
+	const skipLower = skip.map((str) => str.toLowerCase());
+	const results = array.filter((x) => !skipLower.includes(x.toLowerCase()));
+
+	// Put all files beginning with . after all those that don't, sort alphabetically within each.
+	return [
+		...results.filter((x) => !x.startsWith('.')).sort((a, b) => a.localeCompare(b)),
+		...results.filter((x) => x.startsWith('.')).sort((a, b) => a.localeCompare(b)),
+		'../',
+	];
+}
+
+/**
+ * @param cwd - The current working directory when the user started typing the new path
+ * @param searchTerm - The path inserted by the user, it can be relative to cwd or absolute
+ * @returns The directory the user inserted, taking into account the cwd.
+ */
+export const getCurrentInsertedDirectory = (
+	cwd: string | null,
+	searchTerm: string,
+	context: Fig.ShellContext
+): string => {
+	if (cwd === null) {
+		return '/';
+	}
+	const resolvedPath = shellExpand(searchTerm, context);
+
+	const dirname = resolvedPath.slice(0, resolvedPath.lastIndexOf('/') + 1);
+
+	if (dirname === '') {
+		return ensureTrailingSlash(cwd);
+	}
+
+	return dirname.startsWith('/') ? dirname : `${ensureTrailingSlash(cwd)}${dirname}`;
+};
+
+/**
+ * Sugar over using the `filepaths` template with `filterTemplateSuggestions`. If any of the
+ * conditions match, the suggestion will be accepted.
+ *
+ * Basic filepath filters can be replaced with this generator.
+ *
+ * @example
+ * ```
+ * // inside a `Fig.Arg`...
+ * generators: filepaths({ extensions: ['mjs', 'js', 'json'] });
+ * ```
+ */
+function filepathsFn(options: FilepathsOptions = {}): Fig.Generator {
+	const {
+		extensions = [],
+		equals = [],
+		matches,
+		filterFolders = false,
+		editFileSuggestions,
+		editFolderSuggestions,
+		rootDirectory,
+		showFolders = 'always',
+	} = options;
+	// TODO: automatically remove eventual leading dots
+	const extensionsSet = new Set(extensions);
+	const equalsSet = new Set(equals);
+
+	// NOTE: If no filter is provided we should not run the filterSuggestions fn.
+	// !! When new filtering parameters are added we should increase this function
+	const shouldFilterSuggestions = () => extensions.length > 0 || equals.length > 0 || matches;
+
+	const filterSuggestions = (
+		suggestions: Fig.TemplateSuggestion[] = []
+	): Fig.TemplateSuggestion[] => {
+		if (!shouldFilterSuggestions()) { return suggestions; }
+
+		return suggestions.filter(({ name = '', type }) => {
+			if (!filterFolders && type === 'folder') { return true; }
+
+			if (equalsSet.has(name)) { return true; }
+			if (matches && !!name.match(matches)) { return true; }
+			// handle extensions
+			const [, ...suggestionExtensions] = name.split('.');
+			if (suggestionExtensions.length >= 1) {
+				let i = suggestionExtensions.length - 1;
+				let stackedExtensions = suggestionExtensions[i];
+				do {
+					if (extensionsSet.has(stackedExtensions)) {
+						return true;
+					}
+					i -= 1;
+					// `i` may become -1 which is not a valid index, but the extensionSet check at the beginning is not run in that case,
+					// so the wrong extension is not evaluated
+					stackedExtensions = [suggestionExtensions[i], stackedExtensions].join('.');
+				} while (i >= 0);
+			}
+			return false;
+		});
+	};
+
+	const postProcessSuggestions = (
+		suggestions: Fig.TemplateSuggestion[] = []
+	): Fig.TemplateSuggestion[] => {
+		if (!editFileSuggestions && !editFolderSuggestions) { return suggestions; }
+
+		return suggestions.map((suggestion) => ({
+			...suggestion,
+			...((suggestion.type === 'file' ? editFileSuggestions : editFolderSuggestions) || {})
+		}));
+	};
+
+	return {
+		trigger: (oldToken, newToken) => {
+			const oldLastSlashIndex = oldToken.lastIndexOf('/');
+			const newLastSlashIndex = newToken.lastIndexOf('/');
+			// If the final path segment has changed, trigger new suggestions
+			if (oldLastSlashIndex !== newLastSlashIndex) {
+				return true;
+			}
+			// Here, there could either be no slashes, or something before the
+			// final slash has changed. In the case where there are no slashes,
+			// we don't want to trigger on each keystroke, so explicitly return false.
+			if (oldLastSlashIndex === -1 && newLastSlashIndex === -1) {
+				return false;
+			}
+			// We know there's at least one slash in the string thanks to the case
+			// above, so trigger if anything before the final slash has changed.
+			return oldToken.slice(0, oldLastSlashIndex) !== newToken.slice(0, newLastSlashIndex);
+		},
+		getQueryTerm: (token) => token.slice(token.lastIndexOf('/') + 1),
+		filepathOptions: options,
+		custom: async (_, executeCommand, generatorContext) => {
+			const { isDangerous, currentWorkingDirectory, searchTerm } = generatorContext;
+			const currentInsertedDirectory =
+				getCurrentInsertedDirectory(
+					rootDirectory ?? currentWorkingDirectory,
+					searchTerm,
+					generatorContext
+				) ?? '/';
+
+			try {
+				const data = await executeCommand({
+					command: 'ls',
+					args: ['-1ApL'],
+					cwd: currentInsertedDirectory,
+				});
+				const sortedFiles = sortFilesAlphabetically(data.stdout.split('\n'), ['.DS_Store']);
+
+				const generatorOutputArray: Fig.TemplateSuggestion[] = [];
+				// Then loop through them and add them to the generatorOutputArray
+				// depending on the template type
+				for (const name of sortedFiles) {
+					if (name) {
+						const templateType = name.endsWith('/') ? 'folders' : 'filepaths';
+						if (
+							(templateType === 'filepaths' && showFolders !== 'only') ||
+							(templateType === 'folders' && showFolders !== 'never')
+						) {
+							generatorOutputArray.push({
+								type: templateType === 'filepaths' ? 'file' : 'folder',
+								name,
+								insertValue: name,
+								isDangerous,
+								context: { templateType },
+							});
+						}
+					}
+				}
+
+				// Filter suggestions. This takes in the array of suggestions, filters it,
+				// and outputs an array of suggestions
+				return postProcessSuggestions(filterSuggestions(generatorOutputArray));
+			} catch (err) {
+				return [];
+			}
+		},
+	};
+}
+
+export const folders = Object.assign(
+	() => filepathsFn({ showFolders: 'only' }),
+	Object.freeze(filepathsFn({ showFolders: 'only' }))
+);
+export const filepaths = Object.assign(filepathsFn, Object.freeze(filepathsFn()));
diff --git a/extensions/terminal-suggest/src/fig/autocomplete-tools/generators/src/keyvalue.ts b/extensions/terminal-suggest/src/fig/autocomplete-tools/generators/src/keyvalue.ts
new file mode 100644
index 000000000000..d26a630e25e8
--- /dev/null
+++ b/extensions/terminal-suggest/src/fig/autocomplete-tools/generators/src/keyvalue.ts
@@ -0,0 +1,355 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+export type KeyValueSuggestions =
+	| string[]
+	| Fig.Suggestion[]
+	| NonNullable<Fig.Generator['custom']>;
+
+/** @deprecated use `KeyValueSuggestions` */
+export type Suggestions = KeyValueSuggestions;
+
+export type CacheValue = boolean | 'keys' | 'values';
+
+export interface ValueListInit {
+	/** String to use as the separator between keys and values */
+	delimiter?: string;
+
+	/** List of suggestions */
+	values?: KeyValueSuggestions;
+
+	/** Cache key and value suggestions */
+	cache?: boolean;
+
+	/** Insert the delimiter string after accepting a suggestion (default: false) */
+	insertDelimiter?: boolean;
+
+	/** Don't filter repeated values from suggestions (default: false) */
+	allowRepeatedValues?: boolean;
+}
+
+export interface KeyValueInit {
+	/** String to use as the separator between keys and values */
+	separator?: string;
+
+	/** List of key suggestions */
+	keys?: KeyValueSuggestions;
+
+	/** List of value suggestions */
+	values?: KeyValueSuggestions;
+
+	/** Cache key and value suggestions */
+	cache?: CacheValue;
+
+	/** Should the separator be inserted after a key? (default: true ) */
+	insertSeparator?: boolean;
+}
+
+export interface KeyValueListInit {
+	/** String to use as the separator between keys and values */
+	separator?: string;
+
+	/** String to use as the separator between key-value pairs */
+	delimiter?: string;
+
+	/** List of key suggestions */
+	keys?: KeyValueSuggestions;
+
+	/** List of value suggestions */
+	values?: KeyValueSuggestions;
+
+	/** Cache key and value suggestions */
+	cache?: CacheValue;
+
+	/** Should the separator be inserted after a key? (default: true ) */
+	insertSeparator?: boolean;
+
+	/** Insert the delimiter string after accepting a value suggestion (default: false) */
+	insertDelimiter?: boolean;
+
+	/** Don't filter repeated keys from suggestions (default: false) */
+	allowRepeatedKeys?: boolean;
+
+	/** Don't filter repeated values from suggestions (default: true) */
+	allowRepeatedValues?: boolean;
+}
+
+/** Cache of Fig suggestions using the string[]/Suggestion[]/function as a key */
+const suggestionCache = new Map<KeyValueSuggestions, Fig.Suggestion[]>();
+
+function appendToInsertValue(append: string, suggestions: Fig.Suggestion[]): Fig.Suggestion[] {
+	if (append.length === 0) {
+		return suggestions;
+	}
+	return suggestions.map((item) =>
+		item.insertValue ? item : { ...item, insertValue: item.name + append }
+	);
+}
+
+async function kvSuggestionsToFigSuggestions(
+	suggestions: KeyValueSuggestions,
+	append: string,
+	init: Parameters<NonNullable<Fig.Generator['custom']>>
+): Promise<Fig.Suggestion[]> {
+	if (typeof suggestions === 'function') {
+		const out = await suggestions(...init);
+		return appendToInsertValue(append, out?.filter(o => !!o) as Fig.Suggestion[]);
+	}
+	if (typeof suggestions[0] === 'string') {
+		const out = (suggestions as string[]).map((name) => ({ name }));
+		return appendToInsertValue(append, out);
+	}
+	return appendToInsertValue(append, suggestions as Fig.Suggestion[]);
+}
+
+async function getSuggestions(
+	suggestions: KeyValueSuggestions,
+	append: string,
+	useSuggestionCache: boolean,
+	init: Parameters<NonNullable<Fig.Generator['custom']>>
+): Promise<Fig.Suggestion[]> {
+	if (useSuggestionCache || Array.isArray(suggestions)) {
+		let value = suggestionCache.get(suggestions);
+		if (value === undefined) {
+			value = await kvSuggestionsToFigSuggestions(suggestions, append, init);
+			suggestionCache.set(suggestions, value);
+		}
+		return value;
+	}
+	return kvSuggestionsToFigSuggestions(suggestions, append, init);
+}
+
+function shouldUseCache(isKey: boolean, cache: CacheValue) {
+	if (typeof cache === 'string') {
+		return (isKey && cache === 'keys') || (!isKey && cache === 'values');
+	}
+	return cache;
+}
+
+/** Get the final index of any of the strings */
+function lastIndexOf(haystack: string, ...needles: readonly string[]) {
+	return Math.max(...needles.map((needle) => haystack.lastIndexOf(needle)));
+}
+
+function removeRepeatSuggestions(
+	alreadyUsed: string[],
+	suggestions: readonly Fig.Suggestion[]
+): Fig.Suggestion[] {
+	const seen = new Set(alreadyUsed);
+	return suggestions.filter((suggestion) => {
+		if (typeof suggestion.name === 'string') {
+			return !seen.has(suggestion.name);
+		}
+		return !suggestion.name?.some((name) => seen.has(name));
+	});
+}
+
+/**
+ * Create a generator that gives suggestions for val,val,... arguments. You
+ * can use a `string[]` or `Fig.Suggestion[]` for the values.
+ *
+ * You can set `cache: true` to enable caching results. The suggestions are cached
+ * globally using the function as a key, so enabling caching for any one generator
+ * will set the cache values for the functions for the entire spec. This behavior
+ * can be used to compose expensive generators without incurring a cost every time
+ * they're used.
+ *
+ * The primary use of this is to enable the same caching behavior as `keyValue`
+ * and `keyValueList`. If your goal is to create a $PATH-like value, use a generator
+ * object literal: `{ template: 'filepaths', trigger: ':', getQueryTerm: ':' }`
+ */
+export function valueList({
+	delimiter = ',',
+	values = [],
+	cache = false,
+	insertDelimiter = false,
+	allowRepeatedValues = false,
+}: ValueListInit): Fig.Generator {
+	return {
+		trigger: (newToken, oldToken) =>
+			newToken.lastIndexOf(delimiter) !== oldToken.lastIndexOf(delimiter),
+
+		getQueryTerm: (token) => token.slice(token.lastIndexOf(delimiter) + delimiter.length),
+
+		custom: async (...init) => {
+			const out = await getSuggestions(values, insertDelimiter ? delimiter : '', cache, init);
+			if (allowRepeatedValues) {
+				return out;
+			}
+			const [tokens] = init;
+			const valuesInList = tokens[tokens.length - 1]?.split(delimiter);
+			return removeRepeatSuggestions(valuesInList, out);
+		},
+	};
+}
+
+/**
+ * Create a generator that gives suggestions for key=value arguments. You
+ * can use a `string[]` or `Fig.Suggestion[]` for the keys and values, or a
+ * function with the same signature as `Fig.Generator['custom']`.
+ *
+ * You can set `cache: true` to enable caching results. The suggestions are cached
+ * globally using the function as a key, so enabling caching for any one generator
+ * will set the cache values for the functions for the entire spec. This behavior
+ * can be used to copmpose expensive key/value generators without incurring the
+ * initial cost every time they're used.
+ *
+ * Note that you should only cache generators that produce the same output regardless
+ * of their input. You can cache either the keys or values individually using `'keys'`
+ * or `'values'` as the `cache` property value.
+ *
+ * @example
+ *
+ * ```typescript
+ * // set-values a=1 b=3 c=2
+ * const spec: Fig.Spec = {
+ *   name: 'set-values',
+ *   args: {
+ *     name: 'values',
+ *     isVariadic: true,
+ *     generators: keyValue({
+ *       keys: ['a', 'b', 'c'],
+ *       values: ['1', '2', '3'],
+ *     }),
+ *   },
+ * }
+ * ```
+ *
+ * @example The separator between keys and values can be customized (default: `=`)
+ *
+ * ```typescript
+ * // key1:value
+ * keyValue({
+ *   separator: ':',
+ *   keys: [
+ *     { name: 'key1', icon: 'fig://icon?type=string' },
+ *     { name: 'key2', icon: 'fig://icon?type=string' },
+ *   ],
+ * }),
+ * ```
+ */
+export function keyValue({
+	separator = '=',
+	keys = [],
+	values = [],
+	cache = false,
+	insertSeparator = true,
+}: KeyValueInit): Fig.Generator {
+	return {
+		trigger: (newToken, oldToken) => newToken.indexOf(separator) !== oldToken.indexOf(separator),
+		getQueryTerm: (token) => token.slice(token.indexOf(separator) + 1),
+		custom: async (...init) => {
+			const [tokens] = init;
+			const finalToken = tokens[tokens.length - 1];
+			const isKey = !finalToken.includes(separator);
+			const suggestions = isKey ? keys : values;
+			const useCache = shouldUseCache(isKey, cache);
+			const append = isKey ? (insertSeparator ? separator : '') : '';
+			return getSuggestions(suggestions, append, useCache, init);
+		},
+	};
+}
+
+/**
+ * Create a generator that gives suggestions for `k=v,k=v,...` arguments. You
+ * can use a `string[]` or `Fig.Suggestion[]` for the keys and values, or a
+ * function with the same signature as `Fig.Generator['custom']`
+ *
+ * You can set `cache: true` to enable caching results. The suggestions are cached
+ * globally using the function as a key, so enabling caching for any one generator
+ * will set the cache values for the functions for the entire spec. This behavior
+ * can be used to copmpose expensive key/value generators without incurring the
+ * initial cost every time they're used.
+ *
+ * Note that you should only cache generators that produce the same output regardless
+ * of their input. You can cache either the keys or values individually using `'keys'`
+ * or `'values'` as the `cache` property value.
+ *
+ * @example
+ *
+ * ```typescript
+ * // set-values a=1,b=3,c=2
+ * const spec: Fig.Spec = {
+ *   name: 'set-values',
+ *   args: {
+ *     name: 'values',
+ *     generators: keyValueList({
+ *       keys: ['a', 'b', 'c'],
+ *       values: ['1', '2', '3'],
+ *     }),
+ *   },
+ * }
+ * ```
+ *
+ * @example
+ *
+ * The separator between keys and values can be customized. It's `=` by
+ * default. You can also change the key/value pair delimiter, which is `,`
+ * by default.
+ *
+ * ```typescript
+ * // key1:value&key2:another
+ * keyValueList({
+ *   separator: ':',
+ *   delimiter: '&'
+ *   keys: [
+ *     { name: 'key1', icon: 'fig://icon?type=string' },
+ *     { name: 'key2', icon: 'fig://icon?type=string' },
+ *   ],
+ * }),
+ * ```
+ */
+export function keyValueList({
+	separator = '=',
+	delimiter = ',',
+	keys = [],
+	values = [],
+	cache = false,
+	insertSeparator = true,
+	insertDelimiter = false,
+	allowRepeatedKeys = false,
+	allowRepeatedValues = true,
+}: KeyValueListInit): Fig.Generator {
+	return {
+		trigger: (newToken, oldToken) => {
+			const newTokenIdx = lastIndexOf(newToken, separator, delimiter);
+			const oldTokenIdx = lastIndexOf(oldToken, separator, delimiter);
+			return newTokenIdx !== oldTokenIdx;
+		},
+		getQueryTerm: (token) => {
+			const index = lastIndexOf(token, separator, delimiter);
+			return token.slice(index + 1);
+		},
+		custom: async (...init) => {
+			const [tokens] = init;
+
+			const finalToken = tokens[tokens.length - 1];
+			const index = lastIndexOf(finalToken, separator, delimiter);
+			const isKey = index === -1 || finalToken.slice(index, index + separator.length) !== separator;
+
+			const suggestions = isKey ? keys : values;
+			const useCache = shouldUseCache(isKey, cache);
+			const append = isKey ? (insertSeparator ? separator : '') : insertDelimiter ? delimiter : '';
+			const out = await getSuggestions(suggestions, append, useCache, init);
+
+			if (isKey) {
+				if (allowRepeatedKeys) {
+					return out;
+				}
+				const existingKeys = finalToken
+					.split(delimiter)
+					.map((chunk) => chunk.slice(0, chunk.indexOf(separator)));
+				return removeRepeatSuggestions(existingKeys, out);
+			}
+
+			if (allowRepeatedValues) {
+				return out;
+			}
+			const existingValues = finalToken
+				.split(delimiter)
+				.map((chunk) => chunk.slice(chunk.indexOf(separator) + separator.length));
+			return removeRepeatSuggestions(existingValues, out);
+		},
+	};
+}
diff --git a/extensions/terminal-suggest/src/fig/autocomplete-tools/generators/src/resolve.ts b/extensions/terminal-suggest/src/fig/autocomplete-tools/generators/src/resolve.ts
new file mode 100644
index 000000000000..da43cc352d66
--- /dev/null
+++ b/extensions/terminal-suggest/src/fig/autocomplete-tools/generators/src/resolve.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.
+ *--------------------------------------------------------------------------------------------*/
+export const ensureTrailingSlash = (str: string) => (str.endsWith('/') ? str : `${str}/`);
+
+const replaceTilde = (path: string, homeDir: string) => {
+	if (path.startsWith('~') && (path.length === 1 || path.charAt(1) === '/')) {
+		return path.replace('~', homeDir);
+	}
+	return path;
+};
+
+const replaceVariables = (path: string, environmentVariables: Record<string, string>) => {
+	// Replace simple $VAR variables
+	const resolvedSimpleVariables = path.replace(/\$([A-Za-z0-9_]+)/g, (key) => {
+		const envKey = key.slice(1);
+		return environmentVariables[envKey] ?? key;
+	});
+
+	// Replace complex ${VAR} variables
+	const resolvedComplexVariables = resolvedSimpleVariables.replace(
+		/\$\{([A-Za-z0-9_]+)(?::-([^}]+))?\}/g,
+		(match, envKey, defaultValue) => environmentVariables[envKey] ?? defaultValue ?? match
+	);
+
+	return resolvedComplexVariables;
+};
+
+export const shellExpand = (path: string, context: Fig.ShellContext): string => {
+	const { environmentVariables } = context;
+	return replaceVariables(
+		replaceTilde(path, environmentVariables?.HOME ?? '~'),
+		environmentVariables
+	);
+};
diff --git a/extensions/terminal-suggest/src/fig/autocomplete/generators/customSuggestionsGenerator.ts b/extensions/terminal-suggest/src/fig/autocomplete/generators/customSuggestionsGenerator.ts
index 1262b5967ad1..4aa412ba248c 100644
--- a/extensions/terminal-suggest/src/fig/autocomplete/generators/customSuggestionsGenerator.ts
+++ b/extensions/terminal-suggest/src/fig/autocomplete/generators/customSuggestionsGenerator.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 
+import { FilepathsOptions } from '../../autocomplete-tools/generators';
 import { IFigExecuteExternals } from '../../execute';
 import {
 	runCachedGenerator,
@@ -15,7 +16,7 @@ export async function getCustomSuggestions(
 	generator: Fig.Generator,
 	context: GeneratorContext,
 	executableExternals: IFigExecuteExternals
-): Promise<Fig.Suggestion[] | undefined> {
+): Promise<Fig.Suggestion[] | FilepathsOptions | undefined> {
 	if (!generator.custom) {
 		return [];
 	}
@@ -25,6 +26,10 @@ export async function getCustomSuggestions(
 		return [];
 	}
 
+	if (generator.filepathOptions) {
+		return generator.filepathOptions;
+	}
+
 	const {
 		tokenArray,
 		currentWorkingDirectory,
diff --git a/extensions/terminal-suggest/src/fig/autocomplete/state/generators.ts b/extensions/terminal-suggest/src/fig/autocomplete/state/generators.ts
index dca21f8e4d90..4a0b72b55c38 100644
--- a/extensions/terminal-suggest/src/fig/autocomplete/state/generators.ts
+++ b/extensions/terminal-suggest/src/fig/autocomplete/state/generators.ts
@@ -82,7 +82,7 @@ export const createGeneratorState = (
 	// }
 	const triggerGenerator = (currentState: GeneratorState, executeExternals: IFigExecuteExternals) => {
 		const { generator, context } = currentState;
-		let request: Promise<Fig.Suggestion[] | undefined>;
+		let request: Promise<Fig.Suggestion[] | Fig.FilepathsOptions | undefined>;
 
 		if (generator.template) {
 			// TODO: Implement template generators
diff --git a/extensions/terminal-suggest/src/fig/figInterface.ts b/extensions/terminal-suggest/src/fig/figInterface.ts
index 9be048ed9b48..f2ec4ce8ea60 100644
--- a/extensions/terminal-suggest/src/fig/figInterface.ts
+++ b/extensions/terminal-suggest/src/fig/figInterface.ts
@@ -21,6 +21,7 @@ import { IFigExecuteExternals } from './execute';
 export interface IFigSpecSuggestionsResult {
 	filesRequested: boolean;
 	foldersRequested: boolean;
+	fileExtensions?: string[];
 	hasCurrentArg: boolean;
 	items: vscode.TerminalCompletionItem[];
 }
@@ -42,6 +43,7 @@ export async function getFigSuggestions(
 		filesRequested: false,
 		foldersRequested: false,
 		hasCurrentArg: false,
+		fileExtensions: undefined,
 		items: [],
 	};
 	for (const spec of specs) {
@@ -91,6 +93,7 @@ export async function getFigSuggestions(
 			if (completionItemResult) {
 				result.filesRequested ||= completionItemResult.filesRequested;
 				result.foldersRequested ||= completionItemResult.foldersRequested;
+				result.fileExtensions = completionItemResult.fileExtensions;
 				if (completionItemResult.items) {
 					result.items.push(...completionItemResult.items);
 				}
@@ -112,6 +115,7 @@ async function getFigSpecSuggestions(
 ): Promise<IFigSpecSuggestionsResult | undefined> {
 	let filesRequested = false;
 	let foldersRequested = false;
+	let fileExtensions: string[] | undefined;
 
 	const command = getCommand(terminalContext.commandLine, {}, terminalContext.cursorPosition);
 	if (!command || !shellIntegrationCwd) {
@@ -136,11 +140,13 @@ async function getFigSpecSuggestions(
 	if (completionItemResult) {
 		filesRequested = completionItemResult.filesRequested;
 		foldersRequested = completionItemResult.foldersRequested;
+		fileExtensions = completionItemResult.filesRequested ? parsedArguments.fileExtensions : undefined;
 	}
 
 	return {
 		filesRequested,
 		foldersRequested,
+		fileExtensions,
 		hasCurrentArg: !!parsedArguments.currentArg,
 		items: items,
 	};
diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 6e7ba74aedb9..ec0db7065688 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -120,7 +120,7 @@ export async function activate(context: vscode.ExtensionContext) {
 			}
 
 			if (result.cwd && (result.filesRequested || result.foldersRequested)) {
-				return new vscode.TerminalCompletionList(result.items, { filesRequested: result.filesRequested, foldersRequested: result.foldersRequested, cwd: result.cwd, env: terminal.shellIntegration?.env.value });
+				return new vscode.TerminalCompletionList(result.items, { filesRequested: result.filesRequested, foldersRequested: result.foldersRequested, fileExtensions: result.fileExtensions,cwd: result.cwd, env: terminal.shellIntegration?.env.value });
 			}
 			return result.items;
 		}
@@ -209,11 +209,12 @@ export async function getCompletionItemsFromSpecs(
 	name: string,
 	token?: vscode.CancellationToken,
 	executeExternals?: IFigExecuteExternals,
-): Promise<{ items: vscode.TerminalCompletionItem[]; filesRequested: boolean; foldersRequested: boolean; cwd?: vscode.Uri }> {
+): Promise<{ items: vscode.TerminalCompletionItem[]; filesRequested: boolean; foldersRequested: boolean; fileExtensions?: string[]; cwd?: vscode.Uri }> {
 	const items: vscode.TerminalCompletionItem[] = [];
 	let filesRequested = false;
 	let foldersRequested = false;
 	let hasCurrentArg = false;
+	let fileExtensions: string[] | undefined;
 
 	let precedingText = terminalContext.commandLine.slice(0, terminalContext.cursorPosition + 1);
 	if (isWindows) {
@@ -230,6 +231,7 @@ export async function getCompletionItemsFromSpecs(
 		hasCurrentArg ||= result.hasCurrentArg;
 		filesRequested ||= result.filesRequested;
 		foldersRequested ||= result.foldersRequested;
+		fileExtensions ??= result.fileExtensions;
 		if (result.items) {
 			items.push(...result.items);
 		}
@@ -276,7 +278,7 @@ export async function getCompletionItemsFromSpecs(
 		cwd = await resolveCwdFromPrefix(prefix, shellIntegrationCwd) ?? shellIntegrationCwd;
 	}
 
-	return { items, filesRequested, foldersRequested, cwd };
+	return { items, filesRequested, foldersRequested, fileExtensions, cwd };
 }
 
 function compareItems(existingItem: vscode.TerminalCompletionItem, command: ICompletionResource): vscode.TerminalCompletionItem | undefined {
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index ad532fcdcb04..6654da09e906 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -2480,6 +2480,7 @@ export class TerminalCompletionListDto<T extends ITerminalCompletionItemDto = IT
 export interface TerminalResourceRequestConfigDto {
 	filesRequested?: boolean;
 	foldersRequested?: boolean;
+	fileExtensions?: string[];
 	cwd?: UriComponents;
 	pathSeparator: string;
 }
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
index c29b2a57d48f..d3dd9b7596bd 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
@@ -50,6 +50,7 @@ export class TerminalCompletionList<ITerminalCompletion> {
 export interface TerminalResourceRequestConfig {
 	filesRequested?: boolean;
 	foldersRequested?: boolean;
+	fileExtensions?: string[];
 	cwd?: UriComponents;
 	pathSeparator: string;
 	env?: { [key: string]: string | null | undefined };
@@ -209,7 +210,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 		// provide diagnostics when a folder is provided where a file is expected.
 		const foldersRequested = (resourceRequestConfig.foldersRequested || resourceRequestConfig.filesRequested) ?? false;
 		const filesRequested = resourceRequestConfig.filesRequested ?? false;
-
+		const fileExtensions = resourceRequestConfig.fileExtensions ?? undefined;
 		const cwd = URI.revive(resourceRequestConfig.cwd);
 		if (!cwd || (!foldersRequested && !filesRequested)) {
 			return;
@@ -378,6 +379,13 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 				label += resourceRequestConfig.pathSeparator;
 			}
 
+			if (child.isFile && fileExtensions) {
+				const extension = child.name.split('.').length > 1 ? child.name.split('.').at(-1) : undefined;
+				if (extension && !fileExtensions.includes(extension)) {
+					continue;
+				}
+			}
+
 			resourceCompletions.push({
 				label,
 				provider,
diff --git a/src/vscode-dts/vscode.proposed.terminalCompletionProvider.d.ts b/src/vscode-dts/vscode.proposed.terminalCompletionProvider.d.ts
index 86c542f20873..8e44c2180484 100644
--- a/src/vscode-dts/vscode.proposed.terminalCompletionProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.terminalCompletionProvider.d.ts
@@ -126,6 +126,12 @@ declare module 'vscode' {
 		 * Show folders as completion items.
 		 */
 		foldersRequested?: boolean;
+
+		/**
+		 * The file extensions to show as completion items.
+		 */
+		fileExtensions?: string[];
+
 		/**
 		 * If no cwd is provided, no resources will be shown as completions.
 		 */

From a9afbd46c455c64ebac250c7674887fe51418973 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 21 Feb 2025 21:21:43 +0100
Subject: [PATCH 0255/1815] chat - better status visibility updating based on
 state (#241518)

---
 .../contrib/chat/browser/actions/chatGettingStarted.ts       | 4 ----
 src/vs/workbench/contrib/chat/browser/chatSetup.ts           | 5 -----
 src/vs/workbench/contrib/chat/browser/chatStatus.ts          | 3 +++
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.ts b/src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.ts
index e14222c1acf0..4e9aef91edc4 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.ts
@@ -16,8 +16,6 @@ import { IWorkbenchLayoutService } from '../../../../services/layout/browser/lay
 import { ensureSideBarChatViewSize, showCopilotView } from '../chat.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
-import { IStatusbarService } from '../../../../services/statusbar/browser/statusbar.js';
-
 
 export class ChatGettingStartedContribution extends Disposable implements IWorkbenchContribution {
 	static readonly ID = 'workbench.contrib.chatGettingStarted';
@@ -34,7 +32,6 @@ export class ChatGettingStartedContribution extends Disposable implements IWorkb
 		@IViewDescriptorService private readonly viewDescriptorService: IViewDescriptorService,
 		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IStatusbarService private readonly statusbarService: IStatusbarService,
 	) {
 		super();
 
@@ -82,7 +79,6 @@ export class ChatGettingStartedContribution extends Disposable implements IWorkb
 		this.recentlyInstalled = false;
 
 		// Enable Copilot related UI if previously disabled
-		this.statusbarService.updateEntryVisibility('chat.statusBarEntry', true);
 		this.configurationService.updateValue('chat.commandCenter.enabled', true);
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 21ea3c6bccc6..f4c3c6f7b824 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -69,7 +69,6 @@ import { IQuickInputService } from '../../../../platform/quickinput/common/quick
 import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
 import { equalsIgnoreCase } from '../../../../base/common/strings.js';
 import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
-import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -178,14 +177,12 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 				const viewDescriptorService = accessor.get(IViewDescriptorService);
 				const configurationService = accessor.get(IConfigurationService);
 				const layoutService = accessor.get(IWorkbenchLayoutService);
-				const statusbarService = accessor.get(IStatusbarService);
 
 				await context.update({ hidden: false });
 
 				showCopilotView(viewsService, layoutService);
 				ensureSideBarChatViewSize(viewDescriptorService, layoutService, viewsService);
 
-				statusbarService.updateEntryVisibility('chat.statusBarEntry', true);
 				configurationService.updateValue('chat.commandCenter.enabled', true);
 			}
 		}
@@ -216,7 +213,6 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 				const layoutService = accessor.get(IWorkbenchLayoutService);
 				const configurationService = accessor.get(IConfigurationService);
 				const dialogService = accessor.get(IDialogService);
-				const statusbarService = accessor.get(IStatusbarService);
 
 				const { confirmed } = await dialogService.confirm({
 					message: localize('hideChatSetupConfirm', "Are you sure you want to hide Copilot?"),
@@ -239,7 +235,6 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 					}
 				}
 
-				statusbarService.updateEntryVisibility('chat.statusBarEntry', false);
 				configurationService.updateValue('chat.commandCenter.enabled', false);
 			}
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index b41f82f53711..e70211e91c0d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -55,6 +55,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 	private registerListeners(): void {
 		const contextKeysSet = new Set([
+			ChatContextKeys.Setup.hidden.key,
 			ChatContextKeys.Setup.limited.key,
 			ChatContextKeys.Setup.installed.key,
 			ChatContextKeys.Setup.canSignUp.key,
@@ -68,6 +69,8 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			if (e.affectsSome(contextKeysSet)) {
 				this.entry.update(this.getEntryProps());
 			}
+
+			this.statusbarService.updateEntryVisibility(ChatStatusBarEntry.ID, !this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.hidden.key));
 		}));
 
 		this._register(this.chatQuotasService.onDidChangeQuotas(() => this.entry?.update(this.getEntryProps())));

From 3357530a4accb2b3172bfb117c5eb82431e46c15 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 21 Feb 2025 12:36:12 -0800
Subject: [PATCH 0256/1815] Clarify that our character offsets are in utf-16
 code units

---
 src/vscode-dts/vscode.d.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts
index 180f9bbcaa11..a0852f1837d2 100644
--- a/src/vscode-dts/vscode.d.ts
+++ b/src/vscode-dts/vscode.d.ts
@@ -182,14 +182,14 @@ declare module 'vscode' {
 		 * The position will be {@link TextDocument.validatePosition adjusted}.
 		 *
 		 * @param position A position.
-		 * @returns A valid zero-based offset.
+		 * @returns A valid zero-based offset in UTF-16 [code units](https://developer.mozilla.org/en-US/docs/Glossary/Code_unit).
 		 */
 		offsetAt(position: Position): number;
 
 		/**
 		 * Converts a zero-based offset to a position.
 		 *
-		 * @param offset A zero-based offset.
+		 * @param offset A zero-based offset into the document. This offset is in UTF-16 [code units](https://developer.mozilla.org/en-US/docs/Glossary/Code_unit).
 		 * @returns A valid {@link Position}.
 		 */
 		positionAt(offset: number): Position;
@@ -257,6 +257,8 @@ declare module 'vscode' {
 
 		/**
 		 * The zero-based character value.
+		 *
+		 * Character offsets are expressed using UTF-16 [code units](https://developer.mozilla.org/en-US/docs/Glossary/Code_unit).
 		 */
 		readonly character: number;
 

From 83f42a7a583d1e9209e102c559b57dbd65a35736 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Sat, 22 Feb 2025 05:48:19 +0900
Subject: [PATCH 0257/1815] chore: add support to collect memory-infra traces
 (#241519)

---
 src/main.ts                                | 33 +++++++++++++++++++---
 src/vs/platform/environment/common/argv.ts |  1 +
 src/vs/platform/environment/node/argv.ts   |  1 +
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index 7e2ab209c01a..c132c9b8b9bb 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -149,10 +149,35 @@ if (process.platform === 'win32' || process.platform === 'linux') {
 // Load our code once ready
 app.once('ready', function () {
 	if (args['trace']) {
-		const traceOptions = {
-			categoryFilter: args['trace-category-filter'] || '*',
-			traceOptions: args['trace-options'] || 'record-until-full,enable-sampling'
-		};
+		let traceOptions: Electron.TraceConfig | Electron.TraceCategoriesAndOptions;
+		if (args['trace-memory-infra']) {
+			const customCategories = args['trace-category-filter']?.split(',') || [];
+			customCategories.push('disabled-by-default-memory-infra', 'disabled-by-default-memory-infra.v8.code_stats');
+			traceOptions = {
+				included_categories: customCategories,
+				excluded_categories: ['*'],
+				memory_dump_config: {
+					allowed_dump_modes: ['light', 'detailed'],
+					triggers: [
+						{
+							type: 'periodic_interval',
+							mode: 'detailed',
+							min_time_between_dumps_ms: 10000
+						},
+						{
+							type: 'periodic_interval',
+							mode: 'light',
+							min_time_between_dumps_ms: 1000
+						}
+					]
+				}
+			};
+		} else {
+			traceOptions = {
+				categoryFilter: args['trace-category-filter'] || '*',
+				traceOptions: args['trace-options'] || 'record-until-full,enable-sampling'
+			};
+		}
 
 		contentTracing.startRecording(traceOptions).finally(() => onReady());
 	} else {
diff --git a/src/vs/platform/environment/common/argv.ts b/src/vs/platform/environment/common/argv.ts
index ba88dab2f392..cdcb8ee0a053 100644
--- a/src/vs/platform/environment/common/argv.ts
+++ b/src/vs/platform/environment/common/argv.ts
@@ -51,6 +51,7 @@ export interface NativeParsedArgs {
 	'no-cached-data'?: boolean;
 	verbose?: boolean;
 	trace?: boolean;
+	'trace-memory-infra'?: boolean;
 	'trace-category-filter'?: string;
 	'trace-options'?: string;
 	'open-devtools'?: boolean;
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
index eb2fc365d596..7ac132ae5cdf 100644
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -167,6 +167,7 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'do-not-sync': { type: 'boolean' },
 	'do-not-include-pack-dependencies': { type: 'boolean' },
 	'trace': { type: 'boolean' },
+	'trace-memory-infra': { type: 'boolean' },
 	'trace-category-filter': { type: 'string' },
 	'trace-options': { type: 'string' },
 	'preserve-env': { type: 'boolean' },

From ca669a6865ad967f2e65f6c9f9aa16ec1b55d330 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Fri, 21 Feb 2025 12:52:40 -0800
Subject: [PATCH 0258/1815] clean up should prompt event. (#241520)

---
 .../notebook/browser/notebookEditor.ts        | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
index e9c536554d2a..7234b9b4143b 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
@@ -45,7 +45,6 @@ import { EnablementState } from '../../../services/extensionManagement/common/ex
 import { IWorkingCopyBackupService } from '../../../services/workingCopy/common/workingCopyBackup.js';
 import { streamToBuffer } from '../../../../base/common/buffer.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
-import { INotebookEditorWorkerService } from '../common/services/notebookWorkerService.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
 import { IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
@@ -96,7 +95,6 @@ export class NotebookEditor extends EditorPane implements INotebookEditorPane, I
 		@IExtensionsWorkbenchService private readonly _extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IWorkingCopyBackupService private readonly _workingCopyBackupService: IWorkingCopyBackupService,
 		@ILogService private readonly logService: ILogService,
-		@INotebookEditorWorkerService private readonly _notebookEditorWorkerService: INotebookEditorWorkerService,
 		@IPreferencesService private readonly _preferencesService: IPreferencesService
 	) {
 		super(NotebookEditor.ID, group, telemetryService, themeService, storageService);
@@ -334,7 +332,6 @@ export class NotebookEditor extends EditorPane implements INotebookEditorPane, I
 			}
 
 			this._handlePerfMark(perf, input, model.notebook);
-			this._handlePromptRecommendations(model.notebook);
 		} catch (e) {
 			this.logService.warn('NotebookEditorWidget#setInput failed', e);
 			if (isEditorOpenError(e)) {
@@ -506,24 +503,6 @@ export class NotebookEditor extends EditorPane implements INotebookEditorPane, I
 		});
 	}
 
-	private _handlePromptRecommendations(model: NotebookTextModel) {
-		this._notebookEditorWorkerService.canPromptRecommendation(model.uri).then(shouldPrompt => {
-			type WorkbenchNotebookShouldPromptRecommendationClassification = {
-				owner: 'rebornix';
-				comment: 'The notebook file metrics. Used to get a better understanding of if we should prompt for notebook extension recommendations';
-				shouldPrompt: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Should we prompt for notebook extension recommendations' };
-			};
-
-			type WorkbenchNotebookShouldPromptRecommendationEvent = {
-				shouldPrompt: boolean;
-			};
-
-			this.telemetryService.publicLog2<WorkbenchNotebookShouldPromptRecommendationEvent, WorkbenchNotebookShouldPromptRecommendationClassification>('notebook/shouldPromptRecommendation', {
-				shouldPrompt: shouldPrompt
-			});
-		});
-	}
-
 	override clearInput(): void {
 		this._inputListener.clear();
 

From f8b29f8da2c9bfda02924243e02a5da864581aa0 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Sat, 22 Feb 2025 06:26:39 +0900
Subject: [PATCH 0259/1815] chore: bump electron@34.2.0 (#241077)

* chore: bump electron@34.2.0

* chore: update builds

* chore: update builds

* chore: bump distro
---
 .npmrc                                   |   4 +-
 .nvmrc                                   |   2 +-
 build/azure-pipelines/linux/setup-env.sh |   8 +-
 build/checksums/electron.txt             | 150 +++++++++++------------
 build/checksums/nodejs.txt               |  14 +--
 build/linux/dependencies-generator.js    |   2 +-
 build/linux/dependencies-generator.ts    |   2 +-
 cgmanifest.json                          |  12 +-
 package-lock.json                        |   8 +-
 package.json                             |   4 +-
 remote/.npmrc                            |   4 +-
 11 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/.npmrc b/.npmrc
index 4a3500427e89..bfa6fba99e3d 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,6 +1,6 @@
 disturl="https://electronjs.org/headers"
-target="34.1.0"
-ms_build_id="10990655"
+target="34.2.0"
+ms_build_id="11044223"
 runtime="electron"
 build_from_source="true"
 legacy-peer-deps="true"
diff --git a/.nvmrc b/.nvmrc
index d4b7699d36ca..0254b1e633c7 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.18.1
+20.18.2
diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh
index dc444cc83f82..1f198441bc3e 100755
--- a/build/azure-pipelines/linux/setup-env.sh
+++ b/build/azure-pipelines/linux/setup-env.sh
@@ -17,7 +17,7 @@ fi
 
 if [ "$npm_config_arch" == "x64" ]; then
     # Download clang based on chromium revision used by vscode
-    curl -s https://raw.githubusercontent.com/chromium/chromium/132.0.6834.194/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
+    curl -s https://raw.githubusercontent.com/chromium/chromium/132.0.6834.196/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 \
@@ -29,9 +29,9 @@ if [ "$npm_config_arch" == "x64" ]; then
 
     # Set compiler toolchain
     # Flags for the client build are based on
-    # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.194:build/config/arm.gni
-    # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.194:build/config/compiler/BUILD.gn
-    # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.194:build/config/c++/BUILD.gn
+    # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:build/config/arm.gni
+    # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:build/config/compiler/BUILD.gn
+    # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:build/config/c++/BUILD.gn
     export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu"
     export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu"
     export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -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_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot"
diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt
index 7ea1ada127ca..dcc7bf55c5ca 100644
--- a/build/checksums/electron.txt
+++ b/build/checksums/electron.txt
@@ -1,75 +1,75 @@
-2e7aec01196298a2d8ce2f348a7b7f73cb8aa5b368fc6793411b9b173716383a *chromedriver-v34.1.0-darwin-arm64.zip
-beeaeef6fc09cebb0daeae09c77884a3e4ba8e136aa7ff5e7e2b73f9139d0c1c *chromedriver-v34.1.0-darwin-x64.zip
-5914d3df6b44207d086eecab2297980f01cd0c2641de9338222547868ca752de *chromedriver-v34.1.0-linux-arm64.zip
-4116d2237e5c1aeb829dedc4284e224453577b500b42dcf0854e3dc43eecd584 *chromedriver-v34.1.0-linux-armv7l.zip
-a3198d2a4bfcb984e00fe4b4bc9b2bb6c886a1822ff97e99fad570cf5d346de7 *chromedriver-v34.1.0-linux-x64.zip
-1be1aff31889fae70833e41f1d2c5c786e982db631f52930976367406bec2e99 *chromedriver-v34.1.0-mas-arm64.zip
-8acd9a0d3be0e59fc9ef5eb041afbd8064a0b36e72b255e0266f9cc0d2a32a8e *chromedriver-v34.1.0-mas-x64.zip
-ed9ef15dd34a37cc382fb1873b2c7f56a8012551d30fc1b2373d8fb5a7c370e9 *chromedriver-v34.1.0-win32-arm64.zip
-97853f50cc657c53f970de66b9709ea2853ac0a7b07f61f5f491538bc9372af9 *chromedriver-v34.1.0-win32-ia32.zip
-8342eec7aa41c1c383f13d9d6515ebfb50892e5ac4fe1f42c5111f4c5e2b7e6c *chromedriver-v34.1.0-win32-x64.zip
-ed5fdef3441a90c9d7b2425d77575d92ce8c718ecf41caee9ae105b9f0519a2e *electron-api.json
-82ee848a4c83c1390453cf1475a4a74a49fc3753ae899266d4db4227fe233a4b *electron-v34.1.0-darwin-arm64-dsym-snapshot.zip
-3a45222b3978325b62c31cf85e7c68ce3f58222e53e2ef72acc2be6ed60f264b *electron-v34.1.0-darwin-arm64-dsym.zip
-aee0826753792516d01c89edb77dbe6f43d3bd8a30b03288fd0d6d704a7d3f91 *electron-v34.1.0-darwin-arm64-symbols.zip
-fce8fd9bd56d0bdfbed5dcaab44538a6b109db688719062d28419970883166de *electron-v34.1.0-darwin-arm64.zip
-159d5c354c769bd6c67983f076a399d2c702e29341c06171185d3779dda7ea08 *electron-v34.1.0-darwin-x64-dsym-snapshot.zip
-0415b02fa238326269ff32637a7c96f798ebbc5b948091231be036c1dc166260 *electron-v34.1.0-darwin-x64-dsym.zip
-eeb1d0188adbeb007acc84328036d870938f1e6634c64f117a90bd05503555c0 *electron-v34.1.0-darwin-x64-symbols.zip
-3a6c0ac76faee46d4d3f7be98f0b1f5b3a549589bcb996a21d1f6dccf2b3e986 *electron-v34.1.0-darwin-x64.zip
-fb69e1089d16bd6cc8e66f7c517eb8447155497533b779a1becadbea942c537b *electron-v34.1.0-linux-arm64-debug.zip
-f048b5257ccf022e4b0d2d69f3775dfe48286a9d375280652eb4394be45d47a0 *electron-v34.1.0-linux-arm64-symbols.zip
-a15f59dbe664b3d711cc0f8a7b9693a44ad27a096341d9b9b15f05c880d65e64 *electron-v34.1.0-linux-arm64.zip
-fb69e1089d16bd6cc8e66f7c517eb8447155497533b779a1becadbea942c537b *electron-v34.1.0-linux-armv7l-debug.zip
-44b53952aa5730d1a1882f1e64a85e52894fb1c970ab334a49e44a4d09ac9db3 *electron-v34.1.0-linux-armv7l-symbols.zip
-8136d1a88275d5e4b30c1f7fa2ffda966283d9a062460f844549e3d8cdac8cdd *electron-v34.1.0-linux-armv7l.zip
-b66e225ecb4f5821bb2c0c06a587987b93a5c891bf170b2a6f18bd069ac585c2 *electron-v34.1.0-linux-x64-debug.zip
-f067ae81ef451c2d5708cc55a37973072462063baca5a6bc57708f57bd7c626a *electron-v34.1.0-linux-x64-symbols.zip
-ded3f8a3e603c06529b12c0400f1bbda7ae201863510a5aa8d78ae721773e5aa *electron-v34.1.0-linux-x64.zip
-c5078be0a0c8acc9701b8f734909a45d8225aeb81a13a8b114cac16d016b4835 *electron-v34.1.0-mas-arm64-dsym-snapshot.zip
-8a948ad2ef24fce9dc4844670a6c1a3f1af99ebb3a8410d666a1d2c8f4660d24 *electron-v34.1.0-mas-arm64-dsym.zip
-8b45c07da9fb118416b6ba0217439378675045cd94e3a5340d6e02bde93c9115 *electron-v34.1.0-mas-arm64-symbols.zip
-71aa2f5b0c2973b5700e75a24bdeb662d164096ed4bbbabc60629ec81e1c7abe *electron-v34.1.0-mas-arm64.zip
-1f186d6067c2055b40d39baf06e4ee43f6b27711e835b86220ce95dfd3c8c29e *electron-v34.1.0-mas-x64-dsym-snapshot.zip
-ab7a2fd2fd26932198603ec01194421ab141c4a9d0d9c5831457479ff4d67e3b *electron-v34.1.0-mas-x64-dsym.zip
-d91423ac49e20dee1a3250ef3a24ecac48254a9e65a9d9e9826d1e675f9a98d5 *electron-v34.1.0-mas-x64-symbols.zip
-c3c49687b910022d66aebecb93118c83035462d69591bc2c218cf21015700567 *electron-v34.1.0-mas-x64.zip
-e395b2b2518a680c5632c0d607d04d7886583791b0041ef36e3a3aae6e4fbf18 *electron-v34.1.0-win32-arm64-pdb.zip
-c85c78ff1336a7ade70bffe75f19ac71480b5b81462b4997a8bdd218921ea18f *electron-v34.1.0-win32-arm64-symbols.zip
-0fb20c9c01fa1748309b4c3ef9ec0d9ec53828b333b7938d811c06923a2e3915 *electron-v34.1.0-win32-arm64-toolchain-profile.zip
-b0e2c41af5146f5095c9b6f2de1de4a3332caf76f70142dfd1a2e53fd96f0f56 *electron-v34.1.0-win32-arm64.zip
-f921c2c6dd52d5b550967f94d16e6029e829945102c1302e65255f46cab7ad90 *electron-v34.1.0-win32-ia32-pdb.zip
-f093520765c39088adae7efd15bf2c13a70b64c6d3592cdfa9e05061b8f6e35f *electron-v34.1.0-win32-ia32-symbols.zip
-0fb20c9c01fa1748309b4c3ef9ec0d9ec53828b333b7938d811c06923a2e3915 *electron-v34.1.0-win32-ia32-toolchain-profile.zip
-5e5a4a87623920e03ac62b60f6a6cdbb146265437ae1deb20903f40b151eb3f0 *electron-v34.1.0-win32-ia32.zip
-900b08d73c26b4277ba8abfb2ff9000b924aeffab910b3f983440f06ad8792b9 *electron-v34.1.0-win32-x64-pdb.zip
-f834dc09210e2a326126ffb9b53e727af5fcaa5d900cf2e05bafa78634b3640a *electron-v34.1.0-win32-x64-symbols.zip
-0fb20c9c01fa1748309b4c3ef9ec0d9ec53828b333b7938d811c06923a2e3915 *electron-v34.1.0-win32-x64-toolchain-profile.zip
-059e628cb591a8eac961b255aa81d64d2b414295ff6984efd2b8fdf3dce9f40a *electron-v34.1.0-win32-x64.zip
-52191fc329244f20416d07f2b7353a8eaa1d9e532587ede1211cede0bfbe5f71 *electron.d.ts
-6f52f192329cc1df54e35ec94f7d8167790dcedbb1fb5ba7dcb90933df703bac *ffmpeg-v34.1.0-darwin-arm64.zip
-801a45f22dfcd70b161b4a90b8cf011f7d7645ff4e140f8e4b214be2fe4dfe41 *ffmpeg-v34.1.0-darwin-x64.zip
-3a4c3b1eeac3fdfc6258946ce072e2ef22668463baa3d45e142322f90ed55ebc *ffmpeg-v34.1.0-linux-arm64.zip
-5b9e86fc74ecf4fd40f06792b69e402367d51e59be2ad2de1e93ed544c13fcd0 *ffmpeg-v34.1.0-linux-armv7l.zip
-ce4a651403b866404353a9a2e2b9e385daf111888040664f3af955c602754b23 *ffmpeg-v34.1.0-linux-x64.zip
-8b3aabc3d468229895592e0945222ead389f2c4bf31c2c52d062c1adcb21fbe6 *ffmpeg-v34.1.0-mas-arm64.zip
-f5ed2bc39da590aeaf63c5f2ea8fc08b212dcd8d3cb0439802eb7e12d88dada4 *ffmpeg-v34.1.0-mas-x64.zip
-e001821ce780541bb36fe6a101060ded7cff20537ea1ca5cdbf4e4a89fb93d45 *ffmpeg-v34.1.0-win32-arm64.zip
-f1ef2f7a751b7894cc0bd08a01f8bc13999c769d5453ac1024b2df6d0dfa662d *ffmpeg-v34.1.0-win32-ia32.zip
-8edefb7f2920ac87bef2407ff4c3486b295e0e48613cbacdf4211a0090396526 *ffmpeg-v34.1.0-win32-x64.zip
-ce2a30a8784c19c446f8a2173c7fd23d0606443cef7c5b2d17bdb3a237d92481 *hunspell_dictionaries.zip
-8ceacc2f2230da0431d9f8f7308fd30070a945cb4b95f84eeb977cec942c0019 *libcxx-objects-v34.1.0-linux-arm64.zip
-0b6d462f60fd2cdc2282ae7dd239900568019b1b0b22b72b2536227a5c3a2b62 *libcxx-objects-v34.1.0-linux-armv7l.zip
-bc53041d9a7cf26dd804e061e5ce72db84bdaa32c1646d7b8baa8bf3203984b3 *libcxx-objects-v34.1.0-linux-x64.zip
-2934be982e54f49d9a0e1071cfb1f07890611a9505e9fa3885c534af7b521a12 *libcxx_headers.zip
-23be04f992ee37ce8f29ffb9e53bd5bf461c50a91b6eddedaecc9f20b8967937 *libcxxabi_headers.zip
-e45742b0a3f607840b7617dcd3ebcb6d3b5f5f88bbb252aba8d519e8287e28c1 *mksnapshot-v34.1.0-darwin-arm64.zip
-74c4e22d2a23fa924da5ea3647755e1c24f279656017a9be9d0d494cd6bd6f02 *mksnapshot-v34.1.0-darwin-x64.zip
-6eff2e983909137c89672dde61c4382f7f23e4848f3c1c767af90eda65e09c34 *mksnapshot-v34.1.0-linux-arm64-x64.zip
-60221b726687a31f629ab703ce4adfa52381170ad23a5fa442ad875b1c231458 *mksnapshot-v34.1.0-linux-armv7l-x64.zip
-3bd0ae894f8f124350be423ea25d34b959d13232f95d0843f4da361408d33894 *mksnapshot-v34.1.0-linux-x64.zip
-422b1dee280db0b18ad501ede5feb19e41f6e69239d813ecafd49a6e38ebcba7 *mksnapshot-v34.1.0-mas-arm64.zip
-78d3201cdcda856dc8b8adf12582e3a270b82e9aff50e070fd0fc3269ec98f22 *mksnapshot-v34.1.0-mas-x64.zip
-175d9b23829676b5df18f996ed8d26750d865340302a4cfc98f19bd100e0c194 *mksnapshot-v34.1.0-win32-arm64-x64.zip
-1fdb2437733687f079eb6bda27c8df30c358b2bb2b794d0f46c3de1119e7c6e1 *mksnapshot-v34.1.0-win32-ia32.zip
-58e2ee0656fae9401b9dbb3e3521bcd414b817eb0894d6167d5a14827acdb76f *mksnapshot-v34.1.0-win32-x64.zip
+c0a187acca68906c4a6387e8fabd052cb031ace6132d60a71001d9a0e891958e *chromedriver-v34.2.0-darwin-arm64.zip
+fa5a46d752267d8497d375e19079e8b6a8df70c234a79b2d6b48f5862e1a0abc *chromedriver-v34.2.0-darwin-x64.zip
+61e03d4fa570976d80f740637f56192b6448a05a73d1fba9717900b29f2b1b4d *chromedriver-v34.2.0-linux-arm64.zip
+ec774d9b1a1b828a0db1502a1017fcab1dfed99b1b6b2fd2308dd600a1efa98a *chromedriver-v34.2.0-linux-armv7l.zip
+cc15a6e6206485a2d96649ceb60509b9da04fa2811c4824b2e0eb43d1f4b1417 *chromedriver-v34.2.0-linux-x64.zip
+9777122f6684180ef375b9b21dcabbc731d8a8befa300d1d47ad954a5b64c1c8 *chromedriver-v34.2.0-mas-arm64.zip
+69451fa148b105fec9644646b22ca758a206499574c5816591354835c8056679 *chromedriver-v34.2.0-mas-x64.zip
+eb7adc7e720f5e0f1d2c12ecbe886bdc01f2c9aaa3954bd6ebd313750bb18819 *chromedriver-v34.2.0-win32-arm64.zip
+cb1973b0c2f5565974d5c2cb51816692f064b6cdc7897fa341d528ba7f9b14bf *chromedriver-v34.2.0-win32-ia32.zip
+af5575b4727c3dbe7272016cbbaa8872043f843168a47d86748a50397efb4f77 *chromedriver-v34.2.0-win32-x64.zip
+fcc718af2a28fb953290dc971e945818b4dbb293f297e6e25acb669d450cc0dd *electron-api.json
+fa47e752e559a6472b87d8907f63296ed8cd53ecf862a4ae113018474d40aa8e *electron-v34.2.0-darwin-arm64-dsym-snapshot.zip
+336c3374e721e2379901141be6345459f78d243b037c65b55bac4ae8cb14bfbe *electron-v34.2.0-darwin-arm64-dsym.zip
+ac3b9d712d9f036f066d8eba42797117a513e2d250fcc117f0354300b7d5c1e5 *electron-v34.2.0-darwin-arm64-symbols.zip
+ee447c17b2ac545e48083113d7e39a916821c1316f60f42cbcbee4fffe7c022a *electron-v34.2.0-darwin-arm64.zip
+d7510bc038d06b26690ac9a78fbb256626502303ff7f5b1c2242f64a02832b1b *electron-v34.2.0-darwin-x64-dsym-snapshot.zip
+0e95c2bbda00afe78e6229b824e3ffe0cc8612956dc11a5a30380224acdbecae *electron-v34.2.0-darwin-x64-dsym.zip
+6d734ef8e8fd007071aae9a13534894dd801f11900f3e73e49cf5352b426e575 *electron-v34.2.0-darwin-x64-symbols.zip
+8ef741819c8a5370dabc3b9df5e6ac217366477c5d5c656ed23c800bc984d887 *electron-v34.2.0-darwin-x64.zip
+c2f448882a0392ebfd9810058a6a9580b087002c74fca3dcd3cf4ba5c3b27a7c *electron-v34.2.0-linux-arm64-debug.zip
+51e887c382593021127593ceba89ad662d3a6de0f748b94fe3a0ce78a7393923 *electron-v34.2.0-linux-arm64-symbols.zip
+818c91309da8ff948c43df58a996c05c0d27daa690e1d659355d9db01e351919 *electron-v34.2.0-linux-arm64.zip
+c2f448882a0392ebfd9810058a6a9580b087002c74fca3dcd3cf4ba5c3b27a7c *electron-v34.2.0-linux-armv7l-debug.zip
+71ec2b7473db766194bcf04648229c4affedce06e150e692745cc72dbc3749c5 *electron-v34.2.0-linux-armv7l-symbols.zip
+0c75996c6bf2d37d0441d3e1021386a9348f8d21783d75571cdb10ede606424f *electron-v34.2.0-linux-armv7l.zip
+d1f17be8df8ec6dc1a23afd8a7752f0b949c755a493b8a2c1e83f76c629258ca *electron-v34.2.0-linux-x64-debug.zip
+d8fa79154b0b663dbd0054d69f53aec326997449ef21943d27225a2d6899660f *electron-v34.2.0-linux-x64-symbols.zip
+f12a02d86cc657500978d263ec6d1841b6e2085cd3bd4d30a97cfe14685396f3 *electron-v34.2.0-linux-x64.zip
+71ef8bfebb8513a405fd2beb44ad18f802bbac2248f81a5328ddaaa12906d70c *electron-v34.2.0-mas-arm64-dsym-snapshot.zip
+437aca6cad3158f15fd852e5913462637052940f812b20ccc10fccc133d5a0d6 *electron-v34.2.0-mas-arm64-dsym.zip
+7f253375a7b43d34b770c03153e47185be7a64bc0c10a783993a93144eb35492 *electron-v34.2.0-mas-arm64-symbols.zip
+1f601c20430b036b485c7dc02a39a297f0d08905462a4568306c12f299375e2f *electron-v34.2.0-mas-arm64.zip
+d32664181804a17f825bf1fbfd8f0cbe01e0b41b284937359e6d9754b3481ed8 *electron-v34.2.0-mas-x64-dsym-snapshot.zip
+f6b394b89fb77dfeefdf525739fe8cd9695f8c2ac2251ed7c571a376cde059e9 *electron-v34.2.0-mas-x64-dsym.zip
+539328d93e9bc122e6e34faeab6a42f4845c523f796c7a11bbdcfe5e856f6b98 *electron-v34.2.0-mas-x64-symbols.zip
+749b6ced7a9d35a719ad98d4c3bf1a08c315c19ce97d2497235d4ac302cda665 *electron-v34.2.0-mas-x64.zip
+e843ea4cb7a93686728d056c957c124760886167932ff619b518e45917edf38a *electron-v34.2.0-win32-arm64-pdb.zip
+4908423be5f8ad1b5dd737edfd69ee0870460e16bb639bb963b0981bda2628e4 *electron-v34.2.0-win32-arm64-symbols.zip
+9d13b2bd61416eec28f43faa399cc5c0dc9e36dec226314bbf397828f55d74de *electron-v34.2.0-win32-arm64-toolchain-profile.zip
+1629cec7b5620e6ca3b5305c393ae147d1a3871a8f164d686b7bee3810fc1109 *electron-v34.2.0-win32-arm64.zip
+e7182f1ef5ed13187fe12f35133cefb50c59e1d52ada758cbb72813dda575205 *electron-v34.2.0-win32-ia32-pdb.zip
+a10f778f62bf060a7e38f5ea75ea472679b9ef4f12767ee0703e6d77effae78a *electron-v34.2.0-win32-ia32-symbols.zip
+9d13b2bd61416eec28f43faa399cc5c0dc9e36dec226314bbf397828f55d74de *electron-v34.2.0-win32-ia32-toolchain-profile.zip
+96396712a0240f04471f71246b3885a513b08e3f2d40154272d34e59419db7e6 *electron-v34.2.0-win32-ia32.zip
+0c55ef5b1a6ea4604e3f0e9f8b5e946944abd1cfc3b974432d40e924a9996812 *electron-v34.2.0-win32-x64-pdb.zip
+d6b67cf12edabcc62ae21e7c90ac6b1161dbefe4e6b765c69fc7040096b7d026 *electron-v34.2.0-win32-x64-symbols.zip
+9d13b2bd61416eec28f43faa399cc5c0dc9e36dec226314bbf397828f55d74de *electron-v34.2.0-win32-x64-toolchain-profile.zip
+a4fdf617dca787b7f1c6f8d0d1cb69c8adb37ee23f9553fe69803f9cad713360 *electron-v34.2.0-win32-x64.zip
+5ca44a4ee9cc74a56c9556ce3f3774986dbb8b4f4953088c7f4577bfba4356a8 *electron.d.ts
+86247a6815cc98f321374edcbfc0ab7ee79bcb13a5c25213f42151e4059ec690 *ffmpeg-v34.2.0-darwin-arm64.zip
+e94f4707a91194f97d0451f9d5a27982c873a5c13d83d20926ce6fdb613f536c *ffmpeg-v34.2.0-darwin-x64.zip
+947d7b7cb035eab94cc15b602dfa8a925cf238c1d9225c01732fe0c41f59c571 *ffmpeg-v34.2.0-linux-arm64.zip
+64d74b6b94ac4fd755b97e0ec8d50af9cd73810fdb52f6c081b13a3337ace0ea *ffmpeg-v34.2.0-linux-armv7l.zip
+a62cb20c5e5f2ba6f1df6f1bc406cc30f7ed44fe6380b506afa333d1b4ad7a87 *ffmpeg-v34.2.0-linux-x64.zip
+715bbb3d193b1ca57d4b329edd05cd6b125dc188cdb73d1c66f220f62c8562e3 *ffmpeg-v34.2.0-mas-arm64.zip
+866bf47106e8c3e50f046783eb8f5c756069c6de962a46f4edc7a5ee7e4593ee *ffmpeg-v34.2.0-mas-x64.zip
+71a2a6c4cca15ccbcbf8912f5d73f855b0ca79804f941f68527ae808f8163957 *ffmpeg-v34.2.0-win32-arm64.zip
+399f841cca166781078ca42c8ea060e3d5850ec6cb79716186d0806f3ce20842 *ffmpeg-v34.2.0-win32-ia32.zip
+afad2a44f20a0c0c01fb1fea637f3f821842399593c9961c74d650ca12d32cbb *ffmpeg-v34.2.0-win32-x64.zip
+c95fdc9dba05aa68aeccb69d4c34f0cb1fb98d7f5291d974d0b638488693655f *hunspell_dictionaries.zip
+0abe74138afdb6e45a085d77407659f13c75ab96f694313d4e98bd662f9c6df2 *libcxx-objects-v34.2.0-linux-arm64.zip
+3d0cbf6fb150b006428eab78235856d2204d5e93ca85f162e429b4c8bd9b0d3b *libcxx-objects-v34.2.0-linux-armv7l.zip
+3a5491e32cec825499919be1b8bf0550d28fe5a31ff00a95572d49a58bb4820a *libcxx-objects-v34.2.0-linux-x64.zip
+ff8753d52f759041b8e5462125ee2b96798fe8b5047f8fb8ae60cd07af2fb13d *libcxx_headers.zip
+c98cce0091681bc367a48f66c5f4602961aa9cb6dd1a995d8969d6b39ce732f3 *libcxxabi_headers.zip
+78a9606190fb227460ddcd276ad540873595d6a82fd1007f42900f53347e3eb1 *mksnapshot-v34.2.0-darwin-arm64.zip
+6d4587a36f509356a908b6752de527cfe8a294a2d435b82ea3a98288c3a3a178 *mksnapshot-v34.2.0-darwin-x64.zip
+17737bd34f7feefc5143b745f2c4f0e5a41678780e144eb43de41f8d4b9d7852 *mksnapshot-v34.2.0-linux-arm64-x64.zip
+565aa9a84d913b7b5eb8d3b868cff151cb8a6c16548233ffd92b2f9bf3789227 *mksnapshot-v34.2.0-linux-armv7l-x64.zip
+7332d7864ab4e5ee7fa8d00580d9357f30d0e69d3d1434d67c61f79f666314a4 *mksnapshot-v34.2.0-linux-x64.zip
+cc81bfc9894378a9fc8a777429e04cc80860663b3dff8eba1f8cc72559a4f23d *mksnapshot-v34.2.0-mas-arm64.zip
+c98230088698638159f6e7e0c5ddde3cb4dba9fa81d76e3c58fc86f96b63ef81 *mksnapshot-v34.2.0-mas-x64.zip
+cc7b42943d998e1083ad8119dc2201dd27d709c15aa2a9b78f409485d2927592 *mksnapshot-v34.2.0-win32-arm64-x64.zip
+ade9e3126f113318e226f9bdeba068b4383b30a98517a361386eff448459effa *mksnapshot-v34.2.0-win32-ia32.zip
+344292ea318dc0e21f37bc7c82d57a57449f0fb278d9868f1b1b597bdcb1f36f *mksnapshot-v34.2.0-win32-x64.zip
diff --git a/build/checksums/nodejs.txt b/build/checksums/nodejs.txt
index 9e53ad908323..d00d52bc25f9 100644
--- a/build/checksums/nodejs.txt
+++ b/build/checksums/nodejs.txt
@@ -1,7 +1,7 @@
-9e92ce1032455a9cc419fe71e908b27ae477799371b45a0844eedb02279922a4  node-v20.18.1-darwin-arm64.tar.gz
-c5497dd17c8875b53712edaf99052f961013cedc203964583fc0cfc0aaf93581  node-v20.18.1-darwin-x64.tar.gz
-73cd297378572e0bc9dfc187c5ec8cca8d43aee6a596c10ebea1ed5f9ec682b6  node-v20.18.1-linux-arm64.tar.gz
-7b7c3315818e9fe57512737c2380fada14d8717ce88945fb6f7b8baadd3cfb92  node-v20.18.1-linux-armv7l.tar.gz
-259e5a8bf2e15ecece65bd2a47153262eda71c0b2c9700d5e703ce4951572784  node-v20.18.1-linux-x64.tar.gz
-9a52905b5d22b08b5b34e86b8d5358cd22c03fbd0fcb9dbb37c9bd82a8f18c17  win-arm64/node.exe
-06c1dec1b428927d6ff01c8f5882f119ec13b61ac77483760aa7fba215c72cf5  win-x64/node.exe
+fa76d5b5340f14070ebaa88ef8faa28c1e9271502725e830cb52f0cf5b6493de  node-v20.18.2-darwin-arm64.tar.gz
+00a16bb0a82a2ad5d00d66b466ae1afa678482283747c27e9bce96668f334744  node-v20.18.2-darwin-x64.tar.gz
+319789e8a055ff80793a05e633c8c5c9226050144a09da3747225b4ec56a2a99  node-v20.18.2-linux-arm64.tar.gz
+65397a4a63960bda94718099698d2961623e9ef400f60f4c3a71add2268bccfb  node-v20.18.2-linux-armv7l.tar.gz
+eb5b031bdd728871c3b9a82655dbfa533bc262c0b6da1d09a86842430cef07d4  node-v20.18.2-linux-x64.tar.gz
+83e7ad1b8c4d4d9c5e06849c3e8f3a5948a5eb6aa34c5bd973ba700e0386f42c  win-arm64/node.exe
+8487a277e92282904dfe0f860dbd5d229543e97a858a223fbe9c9b8670bbe170  win-x64/node.exe
diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
index 913de4df7d7c..39e2b4e317b2 100644
--- a/build/linux/dependencies-generator.js
+++ b/build/linux/dependencies-generator.js
@@ -26,7 +26,7 @@ const product = require("../../product.json");
 // The reference dependencies, which one has to update when the new dependencies
 // are valid, are in dep-lists.ts
 const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
-// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.194:chrome/installer/linux/BUILD.gn;l=64-80
+// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196: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/dependencies-generator.ts b/build/linux/dependencies-generator.ts
index 4796980b96e3..83d2ec78abb0 100644
--- a/build/linux/dependencies-generator.ts
+++ b/build/linux/dependencies-generator.ts
@@ -25,7 +25,7 @@ import product = require('../../product.json');
 // are valid, are in dep-lists.ts
 const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true;
 
-// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.194:chrome/installer/linux/BUILD.gn;l=64-80
+// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196: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/cgmanifest.json b/cgmanifest.json
index 865be1331ce0..24c00b3731dc 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "chromium",
 					"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
-					"commitHash": "84f6285324151a9aeb0422e3683e4ff85b9f77c8"
+					"commitHash": "46a5bd1e987735e0cdc41cf48a7db4988ae73d16"
 				}
 			},
 			"licenseDetail": [
@@ -40,7 +40,7 @@
 				"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 			],
 			"isOnlyProductionDependency": true,
-			"version": "132.0.6834.194"
+			"version": "132.0.6834.196"
 		},
 		{
 			"component": {
@@ -516,11 +516,11 @@
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "70178110a8e52d28dc957b6b20da94e455922025"
+					"commitHash": "53a57efd83a18efe7a84bf1b460acc789139939b"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "20.18.1"
+			"version": "20.18.2"
 		},
 		{
 			"component": {
@@ -528,12 +528,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "c1918f96cb88b61be2b54589f98038c01a0881de"
+					"commitHash": "ddc7afd3f006dab49a3b6bf73bf3222b017556d5"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "34.1.0"
+			"version": "34.2.0"
 		},
 		{
 			"component": {
diff --git a/package-lock.json b/package-lock.json
index 92612ce1e5f9..d4bc1fb28bf6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -96,7 +96,7 @@
         "cssnano": "^6.0.3",
         "debounce": "^1.0.0",
         "deemon": "^1.8.0",
-        "electron": "34.1.0",
+        "electron": "34.2.0",
         "eslint": "^9.11.1",
         "eslint-formatter-compact": "^8.40.0",
         "eslint-plugin-header": "3.1.1",
@@ -6099,9 +6099,9 @@
       "dev": true
     },
     "node_modules/electron": {
-      "version": "34.1.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-34.1.0.tgz",
-      "integrity": "sha512-ZUid8XrGPA0dfes97PPADc8ecWOUX/qYRNp1glze9coZLEYc+PsMvgjVDCHSvjfHfiI+V3unwngSVpBouX71YQ==",
+      "version": "34.2.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-34.2.0.tgz",
+      "integrity": "sha512-SYwBJNeXBTm1q/ErybQMUBZAYqEreBUqBwTrNkw1rV4YatDZk5Aittpcus3PPeC4UoI/tqmJ946uG8AKHTd6CA==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
diff --git a/package.json b/package.json
index d6eac5664edb..6506e910803c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.98.0",
-  "distro": "18d6e62cad16da70804e341893ae344d5cdcc6ee",
+  "distro": "f14af7417b4d5795b7e10ad0200ce11977e0742f",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -154,7 +154,7 @@
     "cssnano": "^6.0.3",
     "debounce": "^1.0.0",
     "deemon": "^1.8.0",
-    "electron": "34.1.0",
+    "electron": "34.2.0",
     "eslint": "^9.11.1",
     "eslint-formatter-compact": "^8.40.0",
     "eslint-plugin-header": "3.1.1",
diff --git a/remote/.npmrc b/remote/.npmrc
index b74c59d2b8f3..1d8b1e877826 100644
--- a/remote/.npmrc
+++ b/remote/.npmrc
@@ -1,6 +1,6 @@
 disturl="https://nodejs.org/dist"
-target="20.18.1"
-ms_build_id="307485"
+target="20.18.2"
+ms_build_id="320948"
 runtime="node"
 build_from_source="true"
 legacy-peer-deps="true"

From 649f968510a3eb09b513a9a76ddb23868d9be24d Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Fri, 21 Feb 2025 14:47:18 -0800
Subject: [PATCH 0260/1815] fix: register more disposables (#241528)

Ref #241469
---
 .../workbench/contrib/preferences/browser/settingsEditor2.ts  | 4 ++--
 src/vs/workbench/contrib/preferences/browser/settingsTree.ts  | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
index 858c1a619859..777931961e11 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -617,8 +617,8 @@ export class SettingsEditor2 extends EditorPane {
 
 		const searchContainer = DOM.append(this.headerContainer, $('.search-container'));
 
-		const clearInputAction = new Action(SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, localize('clearInput', "Clear Settings Search Input"), ThemeIcon.asClassName(preferencesClearInputIcon), false, async () => this.clearSearchResults());
-		const filterAction = new Action(SETTINGS_EDITOR_COMMAND_SUGGEST_FILTERS, localize('filterInput', "Filter Settings"), ThemeIcon.asClassName(preferencesFilterIcon));
+		const clearInputAction = this._register(new Action(SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, localize('clearInput', "Clear Settings Search Input"), ThemeIcon.asClassName(preferencesClearInputIcon), false, async () => this.clearSearchResults()));
+		const filterAction = this._register(new Action(SETTINGS_EDITOR_COMMAND_SUGGEST_FILTERS, localize('filterInput', "Filter Settings"), ThemeIcon.asClassName(preferencesFilterIcon)));
 		this.searchWidget = this._register(this.instantiationService.createInstance(SuggestEnabledInput, `${SettingsEditor2.ID}.searchbox`, searchContainer, {
 			triggerCharacters: ['@', ':'],
 			provideResults: (query: string) => {
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
index a9af207ce5c1..03f59d9c2ca3 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -867,8 +867,7 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
 		const categoryElement = DOM.append(labelCategoryContainer, $('span.setting-item-category'));
 		const labelElementContainer = DOM.append(labelCategoryContainer, $('span.setting-item-label'));
 		const labelElement = toDispose.add(new SimpleIconLabel(labelElementContainer));
-		const indicatorsLabel = this._instantiationService.createInstance(SettingsTreeIndicatorsLabel, titleElement);
-		toDispose.add(indicatorsLabel);
+		const indicatorsLabel = toDispose.add(this._instantiationService.createInstance(SettingsTreeIndicatorsLabel, titleElement));
 
 		const descriptionElement = DOM.append(container, $('.setting-item-description'));
 		const modifiedIndicatorElement = DOM.append(container, $('.setting-item-modified-indicator'));

From ca74c1ece137669f1aa3689533f54ef03afa5d2b Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Fri, 21 Feb 2025 15:11:41 -0800
Subject: [PATCH 0261/1815] fix: SearchResultModel leaks disposables (#241533)

Fixes #241469
---
 .../preferences/browser/settingsTreeModels.ts | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
index f436320f5eeb..95e7cfe79f27 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
@@ -1057,11 +1057,24 @@ export class SearchResultModel extends SettingsTreeModel {
 			settings: this.getFlatSettings()
 		});
 
-		// Save time, filter children in the search model instead of relying on the tree filter, which still requires heights to be calculated.
+		// Save time by filtering children in the search model instead of relying on the tree filter, which still requires heights to be calculated.
 		const isRemote = !!this.environmentService.remoteAuthority;
 
-		this.root.children = this.root.children
-			.filter(child => child instanceof SettingsTreeSettingElement && child.matchesAllTags(this._viewState.tagFilters) && child.matchesScope(this._viewState.settingsTarget, isRemote) && child.matchesAnyExtension(this._viewState.extensionFilters) && child.matchesAnyId(this._viewState.idFilters) && child.matchesAnyFeature(this._viewState.featureFilters) && child.matchesAllLanguages(this._viewState.languageFilter));
+		const newChildren = [];
+		for (const child of this.root.children) {
+			if (child instanceof SettingsTreeSettingElement
+				&& child.matchesAllTags(this._viewState.tagFilters)
+				&& child.matchesScope(this._viewState.settingsTarget, isRemote)
+				&& child.matchesAnyExtension(this._viewState.extensionFilters)
+				&& child.matchesAnyId(this._viewState.idFilters)
+				&& child.matchesAnyFeature(this._viewState.featureFilters)
+				&& child.matchesAllLanguages(this._viewState.languageFilter)) {
+				newChildren.push(child);
+			} else {
+				child.dispose();
+			}
+		}
+		this.root.children = newChildren;
 		this.searchResultCount = this.root.children.length;
 
 		if (this.newExtensionSearchResults?.filterMatches.length) {

From 1bfa206332b34491ac355855fc1a2f2712139692 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Fri, 21 Feb 2025 15:28:03 -0800
Subject: [PATCH 0262/1815] fix: Workspace Trust editor leaks disposables
 (#241534)

---
 .../workspace/browser/workspaceTrustEditor.ts        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts b/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts
index fb904f26b045..451e30dd5d3e 100644
--- a/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts
+++ b/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts
@@ -1052,9 +1052,9 @@ export class WorkspaceTrustEditor extends EditorPane {
 	}
 
 	private addTrustButtonToElement(parent: HTMLElement): void {
-		const trustAction = new Action('workspace.trust.button.action.grant', localize('trustButton', "Trust"), undefined, true, async () => {
+		const trustAction = this.rerenderDisposables.add(new Action('workspace.trust.button.action.grant', localize('trustButton', "Trust"), undefined, true, async () => {
 			await this.workspaceTrustManagementService.setWorkspaceTrust(true);
-		});
+		}));
 
 		const trustActions = [{ action: trustAction, keybinding: this.keybindingService.resolveUserBinding(isMacintosh ? 'Cmd+Enter' : 'Ctrl+Enter')[0] }];
 
@@ -1065,9 +1065,9 @@ export class WorkspaceTrustEditor extends EditorPane {
 			const trustMessageElement = append(parent, $('.trust-message-box'));
 			trustMessageElement.innerText = localize('trustMessage', "Trust the authors of all files in the current folder or its parent '{0}'.", name);
 
-			const trustParentAction = new Action('workspace.trust.button.action.grantParent', localize('trustParentButton', "Trust Parent"), undefined, true, async () => {
+			const trustParentAction = this.rerenderDisposables.add(new Action('workspace.trust.button.action.grantParent', localize('trustParentButton', "Trust Parent"), undefined, true, async () => {
 				await this.workspaceTrustManagementService.setParentFolderTrust(true);
-			});
+			}));
 
 			trustActions.push({ action: trustParentAction, keybinding: this.keybindingService.resolveUserBinding(isMacintosh ? 'Cmd+Shift+Enter' : 'Ctrl+Shift+Enter')[0] });
 		}
@@ -1077,9 +1077,9 @@ export class WorkspaceTrustEditor extends EditorPane {
 
 	private addDontTrustButtonToElement(parent: HTMLElement): void {
 		this.createButtonRow(parent, [{
-			action: new Action('workspace.trust.button.action.deny', localize('dontTrustButton', "Don't Trust"), undefined, true, async () => {
+			action: this.rerenderDisposables.add(new Action('workspace.trust.button.action.deny', localize('dontTrustButton', "Don't Trust"), undefined, true, async () => {
 				await this.workspaceTrustManagementService.setWorkspaceTrust(false);
-			}),
+			})),
 			keybinding: this.keybindingService.resolveUserBinding(isMacintosh ? 'Cmd+Enter' : 'Ctrl+Enter')[0]
 		}]);
 	}

From 56f3955b441491a145d70becbc92431282b55126 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Fri, 21 Feb 2025 16:41:26 -0800
Subject: [PATCH 0263/1815] fix: multiple Settings ToC groups with the same ID
 (#241541)

Fixes #241521
---
 .../contrib/preferences/browser/settingsTree.ts       | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
index 03f59d9c2ca3..be9840d7bc11 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -492,11 +492,14 @@ export async function createTocTreeForExtensionSettings(extensionService: IExten
 		const extension = await extensionService.getExtension(extensionId);
 		const extensionName = extension?.displayName ?? extension?.name ?? extensionId;
 
-		// Each group represents a single category of settings.
-		// If the extension author forgets to specify an id for the group,
-		// fall back to the title given to the group.
+		// There could be multiple groups with the same extension id that all belong to the same extension.
+		// To avoid highlighting all groups upon expanding the extension's ToC entry,
+		// use the group ID only if it is non-empty and isn't the extension ID.
+		// Ref https://github.com/microsoft/vscode/issues/241521.
+		const settingGroupId = (group.id && group.id !== extensionId) ? group.id : group.title;
+
 		const childEntry: ITOCEntry<ISetting> = {
-			id: group.id || group.title,
+			id: settingGroupId,
 			label: group.title,
 			order: group.order,
 			settings: flatSettings

From a4172cc4c6a29774c7dd8489a634e971fadab5f8 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Fri, 21 Feb 2025 16:41:45 -0800
Subject: [PATCH 0264/1815] fix: Search editor leaks event listeners (#241538)

---
 .../workbench/contrib/searchEditor/browser/searchEditor.ts  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
index 841b309d3648..2ef0de41b46f 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
@@ -212,7 +212,7 @@ export class SearchEditor extends AbstractTextCodeEditor<SearchEditorViewState>
 			ariaLabel: localize('label.excludes', 'Search Exclude Patterns'),
 			inputBoxStyles: searchEditorInputboxStyles
 		}));
-		this.inputPatternExcludes.onSubmit(triggeredOnType => this.triggerSearch({ resetCursor: false, delay: triggeredOnType ? this.searchConfig.searchOnTypeDebouncePeriod : 0 }));
+		this._register(this.inputPatternExcludes.onSubmit(triggeredOnType => this.triggerSearch({ resetCursor: false, delay: triggeredOnType ? this.searchConfig.searchOnTypeDebouncePeriod : 0 })));
 		this._register(this.inputPatternExcludes.onChangeIgnoreBox(() => this.triggerSearch()));
 
 		// Messages
@@ -251,7 +251,7 @@ export class SearchEditor extends AbstractTextCodeEditor<SearchEditorViewState>
 	}
 
 	private registerEditorListeners() {
-		this.searchResultEditor.onMouseUp(e => {
+		this._register(this.searchResultEditor.onMouseUp(e => {
 			if (e.event.detail === 1) {
 				const behaviour = this.searchConfig.searchEditor.singleClickBehaviour;
 				const position = e.target.position;
@@ -276,7 +276,7 @@ export class SearchEditor extends AbstractTextCodeEditor<SearchEditorViewState>
 					}
 				}
 			}
-		});
+		}));
 		this._register(this.searchResultEditor.onDidChangeModelContent(() => {
 			if (!this.updatingModelForSearch) {
 				this.getInput()?.setDirty(true);

From b4b0191e53fd5bddf9e29f76cf12b037c96500ae Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Fri, 21 Feb 2025 18:47:26 -0800
Subject: [PATCH 0265/1815] Enable rendering tool progress/confirmation
 messages with codeblocks (#241545)

* Render terminal commands in an editor

* Use editors for tool confirmation message codeblocks

* Remove unused getContent

* Always wrap tool editors
---
 src/vs/workbench/contrib/chat/browser/chat.ts |   1 -
 .../chatConfirmationWidget.ts                 |  57 +++--
 .../chatContentParts/chatContentParts.ts      |  14 +-
 .../chatMarkdownContentPart.ts                |  35 +--
 .../chatProgressContentPart.ts                |  17 ++
 .../chatToolInvocationPart.ts                 | 206 ++++++++++++------
 .../chatWarningContentPart.ts                 |   2 +-
 .../contrib/chat/browser/chatListRenderer.ts  |  96 +++++---
 .../contrib/chat/browser/chatWidget.ts        |   2 +-
 .../contrib/chat/browser/codeBlockPart.ts     |  54 +++--
 .../contrib/chat/browser/media/chat.css       |   4 +
 .../chat/common/codeBlockModelCollection.ts   |   4 +-
 .../chat/common/languageModelToolsService.ts  |   2 +-
 ...scode.proposed.chatParticipantPrivate.d.ts |   2 +-
 14 files changed, 341 insertions(+), 155 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chat.ts b/src/vs/workbench/contrib/chat/browser/chat.ts
index 41ab2fb8e16e..250b763f4518 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.ts
@@ -142,7 +142,6 @@ export interface IChatCodeBlockInfo {
 	codemapperUri: URI | undefined;
 	readonly isStreaming: boolean;
 	focus(): void;
-	getContent(): string;
 }
 
 export interface IChatFileTreeInfo {
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
index 620c1ba5cfa1..761e83ff51c9 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
@@ -20,11 +20,11 @@ export interface IChatConfirmationButton {
 	data: any;
 }
 
-export class ChatConfirmationWidget extends Disposable {
+abstract class BaseChatConfirmationWidget extends Disposable {
 	private _onDidClick = this._register(new Emitter<IChatConfirmationButton>());
 	get onDidClick(): Event<IChatConfirmationButton> { return this._onDidClick.event; }
 
-	private _onDidChangeHeight = this._register(new Emitter<void>());
+	protected _onDidChangeHeight = this._register(new Emitter<void>());
 	get onDidChangeHeight(): Event<void> { return this._onDidChangeHeight.event; }
 
 	private _domNode: HTMLElement;
@@ -36,11 +36,13 @@ export class ChatConfirmationWidget extends Disposable {
 		this.domNode.classList.toggle('hideButtons', !showButton);
 	}
 
+	private readonly messageElement: HTMLElement;
+	protected readonly markdownRenderer: MarkdownRenderer;
+
 	constructor(
 		title: string,
-		message: string | IMarkdownString,
 		buttons: IChatConfirmationButton[],
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IInstantiationService protected readonly instantiationService: IInstantiationService,
 	) {
 		super();
 
@@ -50,23 +52,50 @@ export class ChatConfirmationWidget extends Disposable {
 			dom.h('.chat-confirmation-buttons-container@buttonsContainer'),
 		]);
 		this._domNode = elements.root;
-		const renderer = this.instantiationService.createInstance(MarkdownRenderer, {});
+		this.markdownRenderer = this.instantiationService.createInstance(MarkdownRenderer, {});
 
-		const renderedTitle = this._register(renderer.render(new MarkdownString(title), {
+		const renderedTitle = this._register(this.markdownRenderer.render(new MarkdownString(title), {
 			asyncRenderCallback: () => this._onDidChangeHeight.fire(),
 		}));
-		elements.title.appendChild(renderedTitle.element);
-
-		const renderedMessage = this._register(renderer.render(
-			typeof message === 'string' ? new MarkdownString(message) : message,
-			{ asyncRenderCallback: () => this._onDidChangeHeight.fire() }
-		));
-		elements.message.appendChild(renderedMessage.element);
-
+		elements.title.append(renderedTitle.element);
+		this.messageElement = elements.message;
 		buttons.forEach(buttonData => {
 			const button = this._register(new Button(elements.buttonsContainer, { ...defaultButtonStyles, secondary: buttonData.isSecondary, title: buttonData.tooltip }));
 			button.label = buttonData.label;
 			this._register(button.onDidClick(() => this._onDidClick.fire(buttonData)));
 		});
 	}
+
+	protected renderMessage(element: HTMLElement): void {
+		this.messageElement.append(element);
+	}
+}
+
+export class ChatConfirmationWidget extends BaseChatConfirmationWidget {
+	constructor(
+		title: string,
+		private readonly message: string | IMarkdownString,
+		buttons: IChatConfirmationButton[],
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super(title, buttons, instantiationService);
+
+		const renderedMessage = this._register(this.markdownRenderer.render(
+			typeof this.message === 'string' ? new MarkdownString(this.message) : this.message,
+			{ asyncRenderCallback: () => this._onDidChangeHeight.fire() }
+		));
+		this.renderMessage(renderedMessage.element);
+	}
+}
+
+export class ChatCustomConfirmationWidget extends BaseChatConfirmationWidget {
+	constructor(
+		title: string,
+		messageElement: HTMLElement,
+		buttons: IChatConfirmationButton[],
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
+		super(title, buttons, instantiationService);
+		this.renderMessage(messageElement);
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts.ts
index a9375bb86881..92b5dc7540f7 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts.ts
@@ -4,18 +4,30 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IDisposable } from '../../../../../base/common/lifecycle.js';
-import { ChatTreeItem } from '../chat.js';
+import { ChatTreeItem, IChatCodeBlockInfo } from '../chat.js';
 import { IChatRendererContent } from '../../common/chatViewModel.js';
 
 export interface IChatContentPart extends IDisposable {
 	domNode: HTMLElement;
 
+	/**
+	 * 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 {
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
index f97705b93034..d51c29af5b73 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
@@ -35,20 +35,25 @@ import { IChatProgressRenderableResponseContent } from '../../common/chatModel.j
 import { IChatMarkdownContent, IChatUndoStop } from '../../common/chatService.js';
 import { isRequestVM, isResponseVM } from '../../common/chatViewModel.js';
 import { CodeBlockModelCollection } from '../../common/codeBlockModelCollection.js';
-import { IChatCodeBlockInfo, IChatListItemRendererOptions } from '../chat.js';
+import { IChatCodeBlockInfo } from '../chat.js';
 import { IChatRendererDelegate } from '../chatListRenderer.js';
 import { ChatMarkdownDecorationsRenderer } from '../chatMarkdownDecorationsRenderer.js';
 import { ChatEditorOptions } from '../chatOptions.js';
-import { CodeBlockPart, ICodeBlockData, localFileLanguageId, parseLocalFileData } from '../codeBlockPart.js';
+import { CodeBlockPart, ICodeBlockData, ICodeBlockRenderOptions, localFileLanguageId, parseLocalFileData } from '../codeBlockPart.js';
 import '../media/chatCodeBlockPill.css';
 import { IDisposableReference, ResourcePool } from './chatCollections.js';
 import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
 
 const $ = dom.$;
 
+export interface IChatMarkdownContentPartOptions {
+	readonly codeBlockRenderOptions?: ICodeBlockRenderOptions;
+	readonly renderCodeBlockPills?: boolean;
+}
+
 export class ChatMarkdownContentPart extends Disposable implements IChatContentPart {
 	private static idPool = 0;
-	public readonly id = String(++ChatMarkdownContentPart.idPool);
+	public readonly codeblocksPartId = String(++ChatMarkdownContentPart.idPool);
 	public readonly domNode: HTMLElement;
 	private readonly allRefs: IDisposableReference<CodeBlockPart | CollapsedCodeBlock>[] = [];
 
@@ -66,7 +71,7 @@ export class ChatMarkdownContentPart extends Disposable implements IChatContentP
 		renderer: MarkdownRenderer,
 		currentWidth: number,
 		private readonly codeBlockModelCollection: CodeBlockModelCollection,
-		private readonly rendererOptions: IChatListItemRendererOptions,
+		private readonly rendererOptions: IChatMarkdownContentPartOptions,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@ITextModelService private readonly textModelService: ITextModelService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -116,7 +121,13 @@ export class ChatMarkdownContentPart extends Disposable implements IChatContentP
 				}
 
 				const hideToolbar = isResponseVM(element) && element.errorDetails?.responseIsFiltered;
-				const codeBlockInfo: ICodeBlockData = { languageId, textModel, codeBlockIndex: globalIndex, codeBlockPartIndex: thisPartIndex, element, range, hideToolbar, parentContextKeyService: contextKeyService, vulns, codemapperUri };
+				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, renderOptions };
 
 				if (!rendererOptions.renderCodeBlockPills || element.isCompleteAddedRequest || !codemapperUri) {
 					const ref = this.renderCodeBlock(codeBlockInfo, text, isCodeBlockComplete, currentWidth);
@@ -126,8 +137,8 @@ export class ChatMarkdownContentPart extends Disposable implements IChatContentP
 					// not during a renderElement OR a progressive render (when we will be firing this event anyway at the end of the render)
 					this._register(ref.object.onDidChangeContentHeight(() => this._onDidChangeHeight.fire()));
 
-					const ownerMarkdownPartId = this.id;
-					const info: IChatCodeBlockInfo = new class {
+					const ownerMarkdownPartId = this.codeblocksPartId;
+					const info: IChatCodeBlockInfo = new class implements IChatCodeBlockInfo {
 						readonly ownerMarkdownPartId = ownerMarkdownPartId;
 						readonly codeBlockIndex = globalIndex;
 						readonly elementId = element.id;
@@ -142,9 +153,6 @@ export class ChatMarkdownContentPart extends Disposable implements IChatContentP
 						public focus() {
 							ref.object.focus();
 						}
-						public getContent(): string {
-							return ref.object.editor.getValue();
-						}
 					}();
 					this.codeblocks.push(info);
 					orderedDisposablesList.push(ref);
@@ -161,8 +169,8 @@ export class ChatMarkdownContentPart extends Disposable implements IChatContentP
 						});
 					}
 					this.allRefs.push(ref);
-					const ownerMarkdownPartId = this.id;
-					const info: IChatCodeBlockInfo = new class {
+					const ownerMarkdownPartId = this.codeblocksPartId;
+					const info: IChatCodeBlockInfo = new class implements IChatCodeBlockInfo {
 						readonly ownerMarkdownPartId = ownerMarkdownPartId;
 						readonly codeBlockIndex = globalIndex;
 						readonly elementId = element.id;
@@ -175,9 +183,6 @@ export class ChatMarkdownContentPart extends Disposable implements IChatContentP
 						public focus() {
 							return ref.object.element.focus();
 						}
-						public getContent(): string {
-							return ''; // Not needed for collapsed code blocks
-						}
 					}();
 					this.codeblocks.push(info);
 					orderedDisposablesList.push(ref);
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts
index 8a6c2c3d6ec4..bec50c892532 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts
@@ -117,3 +117,20 @@ export class ChatWorkingProgressContentPart extends ChatProgressContentPart impl
 		return other.kind === 'working' && this.workingProgress.isPaused === other.isPaused;
 	}
 }
+
+export class ChatCustomProgressPart {
+	public readonly domNode: HTMLElement;
+
+	constructor(
+		messageElement: HTMLElement,
+		icon: ThemeIcon,
+	) {
+		this.domNode = $('.progress-container');
+		const iconElement = $('div');
+		iconElement.classList.add(...ThemeIcon.asClassNameArray(icon));
+		append(this.domNode, iconElement);
+
+		messageElement.classList.add('progress-step');
+		append(this.domNode, messageElement);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
index d5930da63408..c6c81f05fbc1 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
@@ -5,23 +5,27 @@
 
 import * as dom from '../../../../../base/browser/dom.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
-import { Emitter, Relay } from '../../../../../base/common/event.js';
+import { Emitter } from '../../../../../base/common/event.js';
 import { IMarkdownString, MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { Disposable, DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { localize } from '../../../../../nls.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 { IChatProgressMessage, IChatToolInvocation, IChatToolInvocationSerialized } from '../../common/chatService.js';
+import { IChatMarkdownContent, IChatProgressMessage, IChatToolInvocation, IChatToolInvocationSerialized } from '../../common/chatService.js';
 import { IChatRendererContent } from '../../common/chatViewModel.js';
+import { CodeBlockModelCollection } from '../../common/codeBlockModelCollection.js';
 import { IToolResult } from '../../common/languageModelToolsService.js';
 import { CancelChatActionId } from '../actions/chatExecuteActions.js';
 import { AcceptToolConfirmationActionId } from '../actions/chatToolActions.js';
-import { ChatTreeItem } from '../chat.js';
-import { ChatConfirmationWidget } from './chatConfirmationWidget.js';
+import { ChatTreeItem, IChatCodeBlockInfo } from '../chat.js';
+import { ICodeBlockRenderOptions } from '../codeBlockPart.js';
+import { ChatConfirmationWidget, ChatCustomConfirmationWidget, IChatConfirmationButton } from './chatConfirmationWidget.js';
 import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
-import { ChatProgressContentPart } from './chatProgressContentPart.js';
+import { ChatMarkdownContentPart, EditorPool } from './chatMarkdownContentPart.js';
+import { ChatCustomProgressPart, ChatProgressContentPart } from './chatProgressContentPart.js';
 import { ChatCollapsibleListContentPart, CollapsibleListPool, IChatCollapsibleListItem } from './chatReferencesContentPart.js';
 
 export class ChatToolInvocationPart extends Disposable implements IChatContentPart {
@@ -30,11 +34,25 @@ export class ChatToolInvocationPart extends Disposable implements IChatContentPa
 	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!: ChatToolInvocationSubPart;
+
 	constructor(
 		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
 		context: IChatContentPartRenderContext,
 		renderer: MarkdownRenderer,
 		listPool: CollapsibleListPool,
+		editorPool: EditorPool,
+		currentWidth: number,
+		codeBlockModelCollection: CodeBlockModelCollection,
+		codeBlockStartIndex: number,
 		@IInstantiationService instantiationService: IInstantiationService,
 	) {
 		super();
@@ -52,10 +70,10 @@ export class ChatToolInvocationPart extends Disposable implements IChatContentPa
 			dom.clearNode(this.domNode);
 			partStore.clear();
 
-			const subPart = partStore.add(instantiationService.createInstance(ChatToolInvocationSubPart, toolInvocation, context, renderer, listPool));
-			this.domNode.appendChild(subPart.domNode);
-			partStore.add(subPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-			partStore.add(subPart.onNeedsRerender(() => {
+			this.subPart = partStore.add(instantiationService.createInstance(ChatToolInvocationSubPart, toolInvocation, context, renderer, listPool, editorPool, currentWidth, codeBlockModelCollection, codeBlockStartIndex));
+			this.domNode.appendChild(this.subPart.domNode);
+			partStore.add(this.subPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
+			partStore.add(this.subPart.onNeedsRerender(() => {
 				render();
 				this._onDidChangeHeight.fire();
 			}));
@@ -78,26 +96,41 @@ class ChatToolInvocationSubPart extends Disposable {
 	private _onNeedsRerender = this._register(new Emitter<void>());
 	public readonly onNeedsRerender = this._onNeedsRerender.event;
 
-	private _onDidChangeHeight = this._register(new Relay<void>());
+	private _onDidChangeHeight = this._register(new Emitter<void>());
 	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
 
+	private markdownPart: ChatMarkdownContentPart | undefined;
+	public get codeblocks(): IChatCodeBlockInfo[] {
+		return this.markdownPart?.codeblocks ?? [];
+	}
+
+	public get codeblocksPartId(): string | undefined {
+		return this.markdownPart?.codeblocksPartId;
+	}
+
 	constructor(
-		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
-		context: IChatContentPartRenderContext,
-		renderer: MarkdownRenderer,
-		listPool: CollapsibleListPool,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IHoverService hoverService: IHoverService,
+		private readonly toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
+		private readonly context: IChatContentPartRenderContext,
+		private readonly renderer: MarkdownRenderer,
+		private readonly listPool: CollapsibleListPool,
+		private readonly editorPool: EditorPool,
+		private readonly currentWidth: number,
+		private readonly codeBlockModelCollection: CodeBlockModelCollection,
+		private readonly codeBlockStartIndex: number,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IHoverService private readonly hoverService: IHoverService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 	) {
 		super();
 
 		if (toolInvocation.kind === 'toolInvocation' && toolInvocation.confirmationMessages) {
-			this.domNode = this.createConfirmationWidget(toolInvocation, instantiationService);
+			this.domNode = this.createConfirmationWidget(toolInvocation);
+		} else if (toolInvocation.presentation === 'withCodeblocks' && typeof toolInvocation.invocationMessage !== 'string') {
+			this.domNode = this.createMarkdownProgressPart(toolInvocation);
 		} else if (toolInvocation.resultDetails?.length) {
-			this.domNode = this.createResultList(toolInvocation.pastTenseMessage ?? toolInvocation.invocationMessage, toolInvocation.resultDetails, context, instantiationService, listPool);
+			this.domNode = this.createResultList(toolInvocation.pastTenseMessage ?? toolInvocation.invocationMessage, toolInvocation.resultDetails);
 		} else {
-			this.domNode = this.createProgressPart(toolInvocation, context, renderer, instantiationService, hoverService);
+			this.domNode = this.createProgressPart();
 		}
 
 		if (toolInvocation.kind === 'toolInvocation' && !toolInvocation.isComplete) {
@@ -105,7 +138,7 @@ class ChatToolInvocationSubPart extends Disposable {
 		}
 	}
 
-	private createConfirmationWidget(toolInvocation: IChatToolInvocation, instantiationService: IInstantiationService): HTMLElement {
+	private createConfirmationWidget(toolInvocation: IChatToolInvocation): HTMLElement {
 		if (!toolInvocation.confirmationMessages) {
 			throw new Error('Confirmation messages are missing');
 		}
@@ -117,85 +150,130 @@ class ChatToolInvocationSubPart extends Disposable {
 		const cancelLabel = localize('cancel', "Cancel");
 		const cancelKeybinding = this.keybindingService.lookupKeybinding(CancelChatActionId)?.getLabel();
 		const cancelTooltip = cancelKeybinding ? `${cancelLabel} (${cancelKeybinding})` : cancelLabel;
-		const confirmWidget = this._register(instantiationService.createInstance(
-			ChatConfirmationWidget,
-			title,
-			message,
-			[
-				{
-					label: continueLabel,
-					data: true,
-					tooltip: continueTooltip
-				},
-				{
-					label: cancelLabel,
-					data: false,
-					isSecondary: true,
-					tooltip: cancelTooltip
-				}]
-		));
+
+		const buttons: IChatConfirmationButton[] = [
+			{
+				label: continueLabel,
+				data: true,
+				tooltip: continueTooltip
+			},
+			{
+				label: cancelLabel,
+				data: false,
+				isSecondary: true,
+				tooltip: cancelTooltip
+			}];
+		let confirmWidget: ChatConfirmationWidget | ChatCustomConfirmationWidget;
+		if (typeof message === 'string') {
+			confirmWidget = this._register(this.instantiationService.createInstance(
+				ChatConfirmationWidget,
+				title,
+				message,
+				buttons
+			));
+		} else {
+			const chatMarkdownContent: IChatMarkdownContent = {
+				kind: 'markdownContent',
+				content: message,
+			};
+			const codeBlockRenderOptions: ICodeBlockRenderOptions = {
+				hideToolbar: true,
+				reserveWidth: 19,
+				verticalPadding: 5,
+				editorOptions: {
+					wordWrap: 'on'
+				}
+			};
+			this.markdownPart = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart, chatMarkdownContent, this.context, this.editorPool, false, this.codeBlockStartIndex, this.renderer, this.currentWidth, this.codeBlockModelCollection, { codeBlockRenderOptions }));
+			this._register(this.markdownPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
+			confirmWidget = this._register(this.instantiationService.createInstance(
+				ChatCustomConfirmationWidget,
+				title,
+				this.markdownPart.domNode,
+				buttons
+			));
+		}
+
 		this._register(confirmWidget.onDidClick(button => {
 			toolInvocation.confirmed.complete(button.data);
 		}));
-		this._onDidChangeHeight.input = confirmWidget.onDidChangeHeight;
+		this._register(confirmWidget.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
 		toolInvocation.confirmed.p.then(() => {
 			this._onNeedsRerender.fire();
 		});
 		return confirmWidget.domNode;
 	}
 
-	private createProgressPart(
-		toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized,
-		context: IChatContentPartRenderContext,
-		renderer: MarkdownRenderer,
-		instantiationService: IInstantiationService,
-		hoverService: IHoverService
-	): HTMLElement {
+	private createProgressPart(): HTMLElement {
 		let content: IMarkdownString;
-		if (toolInvocation.isComplete && toolInvocation.isConfirmed !== false && toolInvocation.pastTenseMessage) {
-			content = typeof toolInvocation.pastTenseMessage === 'string' ?
-				new MarkdownString().appendText(toolInvocation.pastTenseMessage) :
-				toolInvocation.pastTenseMessage;
+		if (this.toolInvocation.isComplete && this.toolInvocation.isConfirmed !== false && this.toolInvocation.pastTenseMessage) {
+			content = typeof this.toolInvocation.pastTenseMessage === 'string' ?
+				new MarkdownString().appendText(this.toolInvocation.pastTenseMessage) :
+				this.toolInvocation.pastTenseMessage;
 		} else {
-			content = typeof toolInvocation.invocationMessage === 'string' ?
-				new MarkdownString().appendText(toolInvocation.invocationMessage + '…') :
-				new MarkdownString(toolInvocation.invocationMessage.value + '…');
+			content = typeof this.toolInvocation.invocationMessage === 'string' ?
+				new MarkdownString().appendText(this.toolInvocation.invocationMessage + '…') :
+				new MarkdownString(this.toolInvocation.invocationMessage.value + '…');
 		}
 
 		const progressMessage: IChatProgressMessage = {
 			kind: 'progressMessage',
 			content
 		};
-		const iconOverride = toolInvocation.isConfirmed === false ?
+		const iconOverride = this.toolInvocation.isConfirmed === false ?
 			Codicon.error :
-			toolInvocation.isComplete ?
+			this.toolInvocation.isComplete ?
 				Codicon.check : undefined;
-		const progressPart = this._register(instantiationService.createInstance(ChatProgressContentPart, progressMessage, renderer, context, undefined, true, iconOverride));
-		if (toolInvocation.tooltip) {
-			this._register(hoverService.setupDelayedHover(progressPart.domNode, { content: toolInvocation.tooltip, additionalClasses: ['chat-tool-hover'] }));
+		const progressPart = this._register(this.instantiationService.createInstance(ChatProgressContentPart, progressMessage, this.renderer, this.context, undefined, true, iconOverride));
+		if (this.toolInvocation.tooltip) {
+			this._register(this.hoverService.setupDelayedHover(progressPart.domNode, { content: this.toolInvocation.tooltip, additionalClasses: ['chat-tool-hover'] }));
 		}
 
 		return progressPart.domNode;
 	}
 
+	private createMarkdownProgressPart(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): HTMLElement {
+		const content = toolInvocation.isComplete ?
+			(toolInvocation.pastTenseMessage ?? toolInvocation.invocationMessage)
+			: toolInvocation.invocationMessage;
+		const chatMarkdownContent: IChatMarkdownContent = {
+			kind: 'markdownContent',
+			content: content as IMarkdownString,
+		};
+
+		const codeBlockRenderOptions: ICodeBlockRenderOptions = {
+			hideToolbar: true,
+			reserveWidth: 19,
+			verticalPadding: 5,
+			editorOptions: {
+				wordWrap: 'on'
+			}
+		};
+		this.markdownPart = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart, chatMarkdownContent, this.context, this.editorPool, false, this.codeBlockStartIndex, this.renderer, this.currentWidth, this.codeBlockModelCollection, { codeBlockRenderOptions }));
+		this._register(this.markdownPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
+		const icon = this.toolInvocation.isConfirmed === false ?
+			Codicon.error :
+			this.toolInvocation.isComplete ?
+				Codicon.check : ThemeIcon.modify(Codicon.loading, 'spin');
+		const progressPart = this.instantiationService.createInstance(ChatCustomProgressPart, this.markdownPart.domNode, icon);
+		return progressPart.domNode;
+	}
+
 	private createResultList(
 		message: string | IMarkdownString,
 		toolDetails: NonNullable<IToolResult['toolResultDetails']>,
-		context: IChatContentPartRenderContext,
-		instantiationService: IInstantiationService,
-		listPool: CollapsibleListPool
 	): HTMLElement {
-		const collapsibleListPart = this._register(instantiationService.createInstance(
+		const collapsibleListPart = this._register(this.instantiationService.createInstance(
 			ChatCollapsibleListContentPart,
 			toolDetails.map<IChatCollapsibleListItem>(detail => ({
 				kind: 'reference',
 				reference: detail,
 			})),
 			message,
-			context,
-			listPool,
+			this.context,
+			this.listPool,
 		));
-		this._onDidChangeHeight.input = collapsibleListPart.onDidChangeHeight;
+		this._register(collapsibleListPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
 		return collapsibleListPart.domNode;
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatWarningContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatWarningContentPart.ts
index d3cc224782a1..73ad31e50cf1 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatWarningContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatWarningContentPart.ts
@@ -42,7 +42,7 @@ export class ChatWarningContentPart extends Disposable implements IChatContentPa
 				break;
 		}
 		this.domNode.appendChild($(iconClass, undefined, renderIcon(icon)));
-		const markdownContent = renderer.render(content);
+		const markdownContent = this._register(renderer.render(content));
 		this.domNode.appendChild(markdownContent.element);
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index 5e49967cbc60..524e5aedc849 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -59,7 +59,7 @@ import { ChatCodeCitationContentPart } from './chatContentParts/chatCodeCitation
 import { ChatCommandButtonContentPart } from './chatContentParts/chatCommandContentPart.js';
 import { ChatConfirmationContentPart } from './chatContentParts/chatConfirmationContentPart.js';
 import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts/chatContentParts.js';
-import { ChatMarkdownContentPart, EditorPool } from './chatContentParts/chatMarkdownContentPart.js';
+import { ChatMarkdownContentPart, EditorPool, IChatMarkdownContentPartOptions } from './chatContentParts/chatMarkdownContentPart.js';
 import { ChatProgressContentPart, ChatWorkingProgressContentPart } from './chatContentParts/chatProgressContentPart.js';
 import { ChatQuotaExceededPart } from './chatContentParts/chatQuotaExceededPart.js';
 import { ChatCollapsibleListContentPart, ChatUsedReferencesListContentPart, CollapsibleListPool } from './chatContentParts/chatReferencesContentPart.js';
@@ -140,6 +140,12 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 	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 @mjbvz is there a better solution?
+	 */
+	private readonly _toolInvocationCodeBlockCollection: CodeBlockModelCollection;
+
 	constructor(
 		editorOptions: ChatEditorOptions,
 		private readonly rendererOptions: IChatListItemRendererOptions,
@@ -165,6 +171,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		this._contentReferencesListPool = this._register(this.instantiationService.createInstance(CollapsibleListPool, this._onDidChangeVisibility.event, undefined));
 
 		this._register(this.instantiationService.createInstance(ChatCodeBlockContentProvider));
+		this._toolInvocationCodeBlockCollection = this._register(this.instantiationService.createInstance(CodeBlockModelCollection, 'tools'));
 	}
 
 	get templateId(): string {
@@ -921,11 +928,56 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		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;
+			info.uriPromise.then(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 part = this.instantiationService.createInstance(ChatToolInvocationPart, toolInvocation, context, this.renderer, this._contentReferencesListPool);
+		const codeBlockStartIndex = this.getCodeBlockStartIndex(context);
+		const part = this.instantiationService.createInstance(ChatToolInvocationPart, toolInvocation, context, this.renderer, this._contentReferencesListPool, this._editorPool, this._currentLayoutWidth, this._toolInvocationCodeBlockCollection, codeBlockStartIndex);
 		part.addDisposable(part.onDidChangeHeight(() => {
 			this.updateItemHeight(templateData);
 		}));
+		this.handleRenderedCodeblocks(context.element, part, codeBlockStartIndex);
 		return part;
 	}
 
@@ -968,45 +1020,17 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 	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 = context.preceedingContentParts.reduce((acc, part) => acc + (part instanceof ChatMarkdownContentPart ? part.codeblocks.length : 0), 0);
-		const markdownPart = templateData.instantiationService.createInstance(ChatMarkdownContentPart, markdown, context, this._editorPool, fillInIncompleteTokens, codeBlockStartIndex, this.renderer, this._currentLayoutWidth, this.codeBlockModelCollection, this.rendererOptions);
-		const markdownPartId = markdownPart.id;
+		const codeBlockStartIndex = this.getCodeBlockStartIndex(context);
+		const options: IChatMarkdownContentPartOptions = {
+			renderCodeBlockPills: this.rendererOptions.renderCodeBlockPills,
+		};
+		const markdownPart = templateData.instantiationService.createInstance(ChatMarkdownContentPart, markdown, context, this._editorPool, fillInIncompleteTokens, codeBlockStartIndex, this.renderer, this._currentLayoutWidth, this.codeBlockModelCollection, options);
 		markdownPart.addDisposable(markdownPart.onDidChangeHeight(() => {
 			markdownPart.layout(this._currentLayoutWidth);
 			this.updateItemHeight(templateData);
 		}));
 
-		const codeBlocksByResponseId = this.codeBlocksByResponseId.get(element.id) ?? [];
-		this.codeBlocksByResponseId.set(element.id, codeBlocksByResponseId);
-		markdownPart.addDisposable(toDisposable(() => {
-			const codeBlocksByResponseId = this.codeBlocksByResponseId.get(element.id);
-			if (codeBlocksByResponseId) {
-				// Only delete if this is my code block
-				markdownPart.codeblocks.forEach((info, i) => {
-					const codeblock = codeBlocksByResponseId[codeBlockStartIndex + i];
-					if (codeblock?.ownerMarkdownPartId === markdownPartId) {
-						delete codeBlocksByResponseId[codeBlockStartIndex + i];
-					}
-				});
-			}
-		}));
-
-		markdownPart.codeblocks.forEach((info, i) => {
-			codeBlocksByResponseId[codeBlockStartIndex + i] = info;
-			info.uriPromise.then(uri => {
-				if (!uri) {
-					return;
-				}
-
-				this.codeBlocksByEditorUri.set(uri, info);
-				markdownPart.addDisposable(toDisposable(() => {
-					const codeblock = this.codeBlocksByEditorUri.get(uri);
-					if (codeblock?.ownerMarkdownPartId === markdownPartId) {
-						this.codeBlocksByEditorUri.delete(uri);
-					}
-				}));
-			});
-		});
+		this.handleRenderedCodeblocks(element, markdownPart, codeBlockStartIndex);
 
 		return markdownPart;
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index baadda42781b..5a2d737c3704 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -302,7 +302,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			return lastResponse?.result?.errorDetails && !lastResponse?.result?.errorDetails.responseIsIncomplete;
 		}));
 
-		this._codeBlockModelCollection = this._register(instantiationService.createInstance(CodeBlockModelCollection));
+		this._codeBlockModelCollection = this._register(instantiationService.createInstance(CodeBlockModelCollection, undefined));
 
 		this._register(this.configurationService.onDidChangeConfiguration((e) => {
 			if (e.affectsConfiguration('chat.renderRelatedFiles')) {
diff --git a/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts b/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts
index db1da2cdcdc7..05276d45608c 100644
--- a/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts
@@ -86,7 +86,7 @@ export interface ICodeBlockData {
 	readonly range?: Range;
 
 	readonly parentContextKeyService?: IContextKeyService;
-	readonly hideToolbar?: boolean;
+	readonly renderOptions?: ICodeBlockRenderOptions;
 }
 
 /**
@@ -135,6 +135,13 @@ export interface ICodeBlockActionContext {
 	element: unknown;
 }
 
+export interface ICodeBlockRenderOptions {
+	hideToolbar?: boolean;
+	verticalPadding?: number;
+	reserveWidth?: number;
+	editorOptions?: IEditorOptions;
+}
+
 const defaultCodeblockPadding = 10;
 export class CodeBlockPart extends Disposable {
 	protected readonly _onDidChangeContentHeight = this._register(new Emitter<void>());
@@ -156,8 +163,12 @@ export class CodeBlockPart extends Disposable {
 
 	private resourceContextKey: ResourceContextKey;
 
+	private get verticalPadding(): number {
+		return this.currentCodeBlockData?.renderOptions?.verticalPadding ?? defaultCodeblockPadding;
+	}
+
 	constructor(
-		private readonly options: ChatEditorOptions,
+		private readonly editorOptions: ChatEditorOptions,
 		readonly menuId: MenuId,
 		delegate: IChatRendererDelegate,
 		overflowWidgetsDomNode: HTMLElement | undefined,
@@ -182,7 +193,7 @@ export class CodeBlockPart extends Disposable {
 			scrollBeyondLastLine: false,
 			lineDecorationsWidth: 8,
 			dragAndDrop: false,
-			padding: { top: defaultCodeblockPadding, bottom: defaultCodeblockPadding },
+			padding: { top: this.verticalPadding, bottom: this.verticalPadding },
 			mouseWheelZoom: false,
 			scrollbar: {
 				vertical: 'hidden',
@@ -246,7 +257,7 @@ export class CodeBlockPart extends Disposable {
 			}
 		}));
 
-		this._register(this.options.onDidChange(() => {
+		this._register(this.editorOptions.onDidChange(() => {
 			this.editor.updateOptions(this.getEditorOptionsFromConfig());
 		}));
 
@@ -319,9 +330,9 @@ export class CodeBlockPart extends Disposable {
 		const horizontalScrollbarVisible = this.currentScrollWidth > this.editor.getLayoutInfo().contentWidth;
 		const scrollbarHeight = this.editor.getLayoutInfo().horizontalScrollbarHeight;
 		const bottomPadding = horizontalScrollbarVisible ?
-			Math.max(defaultCodeblockPadding - scrollbarHeight, 2) :
-			defaultCodeblockPadding;
-		this.editor.updateOptions({ padding: { top: defaultCodeblockPadding, bottom: bottomPadding } });
+			Math.max(this.verticalPadding - scrollbarHeight, 2) :
+			this.verticalPadding;
+		this.editor.updateOptions({ padding: { top: this.verticalPadding, bottom: bottomPadding } });
 	}
 
 	private _configureForScreenReader(): void {
@@ -336,22 +347,24 @@ export class CodeBlockPart extends Disposable {
 
 	private getEditorOptionsFromConfig(): IEditorOptions {
 		return {
-			wordWrap: this.options.configuration.resultEditor.wordWrap,
-			fontLigatures: this.options.configuration.resultEditor.fontLigatures,
-			bracketPairColorization: this.options.configuration.resultEditor.bracketPairColorization,
-			fontFamily: this.options.configuration.resultEditor.fontFamily === 'default' ?
+			wordWrap: this.editorOptions.configuration.resultEditor.wordWrap,
+			fontLigatures: this.editorOptions.configuration.resultEditor.fontLigatures,
+			bracketPairColorization: this.editorOptions.configuration.resultEditor.bracketPairColorization,
+			fontFamily: this.editorOptions.configuration.resultEditor.fontFamily === 'default' ?
 				EDITOR_FONT_DEFAULTS.fontFamily :
-				this.options.configuration.resultEditor.fontFamily,
-			fontSize: this.options.configuration.resultEditor.fontSize,
-			fontWeight: this.options.configuration.resultEditor.fontWeight,
-			lineHeight: this.options.configuration.resultEditor.lineHeight,
+				this.editorOptions.configuration.resultEditor.fontFamily,
+			fontSize: this.editorOptions.configuration.resultEditor.fontSize,
+			fontWeight: this.editorOptions.configuration.resultEditor.fontWeight,
+			lineHeight: this.editorOptions.configuration.resultEditor.lineHeight,
+			...this.currentCodeBlockData?.renderOptions?.editorOptions,
 		};
 	}
 
 	layout(width: number): void {
 		const contentHeight = this.getContentHeight();
 		const editorBorder = 2;
-		this.editor.layout({ width: width - editorBorder, height: contentHeight });
+		width = width - editorBorder - (this.currentCodeBlockData?.renderOptions?.reserveWidth ?? 0);
+		this.editor.layout({ width, height: contentHeight });
 		this.updatePaddingForLayout();
 	}
 
@@ -370,7 +383,7 @@ export class CodeBlockPart extends Disposable {
 			this.contextKeyService.updateParent(data.parentContextKeyService);
 		}
 
-		if (this.options.configuration.resultEditor.wordWrap === 'on') {
+		if (this.getEditorOptionsFromConfig().wordWrap === 'on') {
 			// Initialize the editor with the new proper width so that getContentHeight
 			// will be computed correctly in the next call to layout()
 			this.layout(width);
@@ -382,9 +395,12 @@ export class CodeBlockPart extends Disposable {
 		}
 
 		this.layout(width);
-		this.editor.updateOptions({ ariaLabel: localize('chat.codeBlockLabel', "Code block {0}", data.codeBlockIndex + 1) });
+		this.editor.updateOptions({
+			...this.getEditorOptionsFromConfig(),
+			ariaLabel: localize('chat.codeBlockLabel', "Code block {0}", data.codeBlockIndex + 1),
+		});
 		this.toolbar.setAriaLabel(localize('chat.codeBlockToolbarLabel', "Toolbar for code block {0}", data.codeBlockIndex + 1));
-		if (data.hideToolbar) {
+		if (data.renderOptions?.hideToolbar) {
 			dom.hide(this.toolbar.getElement());
 		} else {
 			dom.show(this.toolbar.getElement());
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index f80c66f3ac58..1890e2637943 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -370,6 +370,10 @@
 		margin: 0 0 6px 0;
 	}
 
+	.rendered-markdown [data-code] {
+		margin: 0;
+	}
+
 	.progress-container {
 		padding-top: 2px;
 	}
diff --git a/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.ts b/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.ts
index 7dd9973b03b3..59c605b64815 100644
--- a/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.ts
+++ b/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.ts
@@ -43,6 +43,7 @@ export class CodeBlockModelCollection extends Disposable {
 	private readonly maxModelCount = 100;
 
 	constructor(
+		private readonly tag: string | undefined,
 		@ILanguageService private readonly languageService: ILanguageService,
 		@ITextModelService private readonly textModelService: ITextModelService,
 	) {
@@ -201,10 +202,11 @@ export class CodeBlockModelCollection extends Disposable {
 
 	private getCodeBlockUri(sessionId: string, chat: IChatRequestViewModel | IChatResponseViewModel, index: number): URI {
 		const metadata = this.getUriMetaData(chat);
+		const indexPart = this.tag ? `${this.tag}-${index}` : `${index}`;
 		return URI.from({
 			scheme: Schemas.vscodeChatCodeBlock,
 			authority: sessionId,
-			path: `/${chat.id}/${index}`,
+			path: `/${chat.id}/${indexPart}`,
 			fragment: metadata ? JSON.stringify(metadata) : undefined,
 		});
 	}
diff --git a/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
index 878810b26f9d..d2ff9b0dfdc8 100644
--- a/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
+++ b/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
@@ -72,7 +72,7 @@ export interface IPreparedToolInvocation {
 	pastTenseMessage?: string | IMarkdownString;
 	tooltip?: string | IMarkdownString;
 	confirmationMessages?: IToolConfirmationMessages;
-	presentation?: 'hidden' | undefined;
+	presentation?: 'withCodeblocks' | 'hidden' | undefined;
 }
 
 export interface IToolImpl {
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
index bb453c04e267..cc3a917b148c 100644
--- a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
@@ -121,7 +121,7 @@ declare module 'vscode' {
 	export interface PreparedToolInvocation {
 		pastTenseMessage?: string | MarkdownString;
 		tooltip?: string | MarkdownString;
-		presentation?: 'hidden' | undefined;
+		presentation?: 'withCodeblocks' | 'hidden' | undefined;
 	}
 
 	export class ExtendedLanguageModelToolResult extends LanguageModelToolResult {

From 0b111a9a743a9fdcc121c3a733f4c7f1fda795e8 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Fri, 21 Feb 2025 19:57:45 -0800
Subject: [PATCH 0266/1815] Remove PreparedToolInvocation#tooltip (#241549)

No longer used
---
 src/vs/workbench/api/common/extHostLanguageModelTools.ts    | 3 +--
 .../chat/browser/chatContentParts/chatToolInvocationPart.ts | 6 ------
 .../chat/common/chatProgressTypes/chatToolInvocation.ts     | 3 ---
 src/vs/workbench/contrib/chat/common/chatService.ts         | 2 --
 .../contrib/chat/common/languageModelToolsService.ts        | 1 -
 src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts  | 1 -
 6 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/vs/workbench/api/common/extHostLanguageModelTools.ts b/src/vs/workbench/api/common/extHostLanguageModelTools.ts
index d61e28d2a095..acd7c106ec3c 100644
--- a/src/vs/workbench/api/common/extHostLanguageModelTools.ts
+++ b/src/vs/workbench/api/common/extHostLanguageModelTools.ts
@@ -144,7 +144,7 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 			return undefined;
 		}
 
-		if (result.pastTenseMessage || result.tooltip) {
+		if (result.pastTenseMessage || result.presentation) {
 			checkProposedApiEnabled(item.extension, 'chatParticipantPrivate');
 		}
 
@@ -155,7 +155,6 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 			} : undefined,
 			invocationMessage: typeConvert.MarkdownString.fromStrict(result.invocationMessage),
 			pastTenseMessage: typeConvert.MarkdownString.fromStrict(result.pastTenseMessage),
-			tooltip: result.tooltip ? typeConvert.MarkdownString.fromStrict(result.tooltip) : undefined,
 			presentation: result.presentation
 		};
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
index c6c81f05fbc1..90acd162d45d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
@@ -11,7 +11,6 @@ import { Disposable, DisposableStore, IDisposable } from '../../../../../base/co
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { localize } from '../../../../../nls.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 { IChatMarkdownContent, IChatProgressMessage, IChatToolInvocation, IChatToolInvocationSerialized } from '../../common/chatService.js';
@@ -118,7 +117,6 @@ class ChatToolInvocationSubPart extends Disposable {
 		private readonly codeBlockModelCollection: CodeBlockModelCollection,
 		private readonly codeBlockStartIndex: number,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IHoverService private readonly hoverService: IHoverService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 	) {
 		super();
@@ -225,10 +223,6 @@ class ChatToolInvocationSubPart extends Disposable {
 			this.toolInvocation.isComplete ?
 				Codicon.check : undefined;
 		const progressPart = this._register(this.instantiationService.createInstance(ChatProgressContentPart, progressMessage, this.renderer, this.context, undefined, true, iconOverride));
-		if (this.toolInvocation.tooltip) {
-			this._register(this.hoverService.setupDelayedHover(progressPart.domNode, { content: this.toolInvocation.tooltip, additionalClasses: ['chat-tool-hover'] }));
-		}
-
 		return progressPart.domNode;
 	}
 
diff --git a/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.ts b/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.ts
index 8bbc84f11d25..79d1f9ebe3e8 100644
--- a/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.ts
+++ b/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.ts
@@ -39,7 +39,6 @@ export class ChatToolInvocation implements IChatToolInvocation {
 
 	public readonly invocationMessage: string | IMarkdownString;
 	public pastTenseMessage: string | IMarkdownString | undefined;
-	public readonly tooltip: string | IMarkdownString | undefined;
 	private _confirmationMessages: IToolConfirmationMessages | undefined;
 	public readonly presentation: IPreparedToolInvocation['presentation'];
 
@@ -48,7 +47,6 @@ export class ChatToolInvocation implements IChatToolInvocation {
 		const invocationMessage = preparedInvocation?.invocationMessage ?? defaultMessage;
 		this.invocationMessage = invocationMessage;
 		this.pastTenseMessage = preparedInvocation?.pastTenseMessage;
-		this.tooltip = preparedInvocation?.tooltip;
 		this._confirmationMessages = preparedInvocation?.confirmationMessages;
 		this.presentation = preparedInvocation?.presentation;
 
@@ -87,7 +85,6 @@ export class ChatToolInvocation implements IChatToolInvocation {
 			presentation: this.presentation,
 			invocationMessage: this.invocationMessage,
 			pastTenseMessage: this.pastTenseMessage,
-			tooltip: this.tooltip,
 			isConfirmed: this._isConfirmed,
 			isComplete: this._isComplete,
 			resultDetails: this._resultDetails
diff --git a/src/vs/workbench/contrib/chat/common/chatService.ts b/src/vs/workbench/contrib/chat/common/chatService.ts
index b2246a10052a..32eeb99e8ac7 100644
--- a/src/vs/workbench/contrib/chat/common/chatService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatService.ts
@@ -212,7 +212,6 @@ export interface IChatToolInvocation {
 	isConfirmed: boolean | undefined;
 	invocationMessage: string | IMarkdownString;
 	pastTenseMessage: string | IMarkdownString | undefined;
-	tooltip: string | IMarkdownString | undefined;
 	resultDetails: IToolResult['toolResultDetails'];
 
 	isCompletePromise: Promise<void>;
@@ -229,7 +228,6 @@ export interface IChatToolInvocationSerialized {
 	invocationMessage: string | IMarkdownString;
 	pastTenseMessage: string | IMarkdownString | undefined;
 	resultDetails: IToolResult['toolResultDetails'];
-	tooltip: string | IMarkdownString | undefined;
 	isConfirmed: boolean | undefined;
 	isComplete: boolean;
 	kind: 'toolInvocationSerialized';
diff --git a/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
index d2ff9b0dfdc8..5a8956dd45be 100644
--- a/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
+++ b/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
@@ -70,7 +70,6 @@ export interface IToolConfirmationMessages {
 export interface IPreparedToolInvocation {
 	invocationMessage?: string | IMarkdownString;
 	pastTenseMessage?: string | IMarkdownString;
-	tooltip?: string | IMarkdownString;
 	confirmationMessages?: IToolConfirmationMessages;
 	presentation?: 'withCodeblocks' | 'hidden' | undefined;
 }
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
index cc3a917b148c..87da8184e314 100644
--- a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
@@ -120,7 +120,6 @@ declare module 'vscode' {
 
 	export interface PreparedToolInvocation {
 		pastTenseMessage?: string | MarkdownString;
-		tooltip?: string | MarkdownString;
 		presentation?: 'withCodeblocks' | 'hidden' | undefined;
 	}
 

From 92803a9dc3e68216be7965512e5bfd6f5ae55a8b Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Sat, 22 Feb 2025 01:01:10 -0800
Subject: [PATCH 0267/1815] fix: reenable implicit context for edits, disable
 after first request, reenable on new editing session (#241550)

* fix: decouple Add Files from chat attachments rendering

* fix: reenable implicit context for edits, disable after first request, reenable on new editing session
---
 src/vs/platform/actions/common/actions.ts     |  1 +
 .../browser/actions/chatContextActions.ts     |  3 +
 .../contrib/chat/browser/chatInputPart.ts     | 89 ++++++++++++-------
 .../contrib/chat/browser/chatViewPane.ts      |  2 +-
 .../browser/contrib/chatImplicitContext.ts    | 22 ++++-
 .../contrib/chat/browser/media/chat.css       | 32 +++++--
 .../contrib/chat/common/chatService.ts        |  2 +
 .../contrib/chat/common/chatServiceImpl.ts    |  4 +
 .../chat/test/common/mockChatService.ts       |  1 +
 9 files changed, 113 insertions(+), 43 deletions(-)

diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index 676182697e79..f5350e998e82 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -234,6 +234,7 @@ export class MenuId {
 	static readonly ChatEditingWidgetToolbar = new MenuId('ChatEditingWidgetToolbar');
 	static readonly ChatEditingEditorContent = new MenuId('ChatEditingEditorContent');
 	static readonly ChatEditingEditorHunk = new MenuId('ChatEditingEditorHunk');
+	static readonly ChatInputAttachmentToolbar = new MenuId('ChatInputAttachmentToolbar');
 	static readonly ChatEditingWidgetModifiedFilesToolbar = new MenuId('ChatEditingWidgetModifiedFilesToolbar');
 	static readonly ChatInputResourceAttachmentContext = new MenuId('ChatInputResourceAttachmentContext');
 	static readonly ChatInputSymbolAttachmentContext = new MenuId('ChatInputSymbolAttachmentContext');
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index e4a2b453b16e..071c06552f4d 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -953,8 +953,11 @@ registerAction2(class AttachFilesAction extends AttachContextAction {
 		super({
 			id: 'workbench.action.chat.editing.attachFiles',
 			title: localize2('workbench.action.chat.editing.attachFiles.label', "Add Files to Copilot Edits"),
+			shortTitle: localize2('workbench.action.chat.editing.attachFiles.shortLabel', "Add Files..."),
 			f1: false,
 			category: CHAT_CATEGORY,
+			menu: { id: MenuId.ChatInputAttachmentToolbar, group: 'navigation' },
+			icon: Codicon.attach,
 			precondition: ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
 			keybinding: {
 				when: ContextKeyExpr.and(ChatContextKeys.inChatInput, ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)),
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index bdd7a0d0fb44..3aade02fa2cb 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -8,6 +8,7 @@ import { addDisposableListener } from '../../../../base/browser/dom.js';
 import { DEFAULT_FONT_FAMILY } from '../../../../base/browser/fonts.js';
 import { IHistoryNavigationWidget } from '../../../../base/browser/history.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { ActionViewItem, IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import * as aria from '../../../../base/browser/ui/aria/aria.js';
 import { Button } from '../../../../base/browser/ui/button/button.js';
 import { IActionProvider } from '../../../../base/browser/ui/dropdown/dropdown.js';
@@ -236,6 +237,8 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	private followupsContainer!: HTMLElement;
 	private readonly followupsDisposables = this._register(new DisposableStore());
 
+	private attachmentsContainer!: HTMLElement;
+
 	private attachedContextContainer!: HTMLElement;
 	private readonly attachedContextDisposables = this._register(new MutableDisposable<DisposableStore>());
 
@@ -675,8 +678,11 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 							dom.h('.chat-input-toolbars@inputToolbars'),
 						]),
 					]),
-					dom.h('.chat-attached-context@attachedContextContainer'),
-					dom.h('.chat-related-files@relatedFilesContainer'),
+					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'),
 				])
 			]);
@@ -686,8 +692,11 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 				dom.h('.chat-editing-session@chatEditingSessionWidgetContainer'),
 				dom.h('.interactive-input-and-side-toolbar@inputAndSideToolbar', [
 					dom.h('.chat-input-container@inputContainer', [
-						dom.h('.chat-attached-context@attachedContextContainer'),
-						dom.h('.chat-related-files@relatedFilesContainer'),
+						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('.chat-editor-container@editorContainer'),
 						dom.h('.chat-input-toolbars@inputToolbars'),
 					]),
@@ -701,11 +710,13 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		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.renderAttachedContext(widget);
+		this.renderAttachedContext();
 		if (this.options.enableImplicitContext) {
 			this._implicitContext = this._register(new ChatImplicitContext());
 			this._register(this._implicitContext.onDidChangeValue(() => this._handleAttachedContextChange()));
@@ -825,7 +836,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 							onDidChangeModel: this._onDidChangeCurrentLanguageModel.event,
 							setModel: (model: ILanguageModelChatMetadataAndIdentifier) => {
 								this.setCurrentLanguageModelByUser(model);
-								this.renderAttachedContext(widget);
+								this.renderAttachedContext();
 							},
 							getModels: () => this.getModels()
 						};
@@ -902,29 +913,37 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		onDidChangeCursorPosition();
 
 		this._register(this.themeService.onDidFileIconThemeChange(() => {
-			this.renderAttachedContext(widget);
+			this.renderAttachedContext();
 		}));
-	}
 
-	private renderAddFilesHint(container: HTMLElement, hoverDelegate: IHoverDelegate, store: DisposableStore, chatWidget: IChatWidget) {
-		const button = store.add(new Button(container, {
-			supportIcons: true,
-			secondary: true,
-			hoverDelegate
-		}));
-		button.element.classList.add('chat-attached-context-attachment', 'chat-add-files');
-		button.label = localize('chatAddFiles', '{0} Add Files...', '$(attach)');
-		const commandId = 'workbench.action.chat.editing.attachFiles';
-		const kb = this.keybindingService.lookupKeybinding(commandId)?.getLabel();
-		const title = localize('attachFiles.label', 'Attach files to your request{0}', kb ? ` (${kb})` : '');
-		button.setTitle(title);
-		store.add(button.onDidClick(() => {
-			this.commandService.executeCommand(commandId, { widget: chatWidget, placeholder: localize('chatAttachFiles', 'Search for files and context to add to your request') });
-		}));
-		dom.append(container, button.element);
+		if (this.options.renderWorkingSet) {
+			const attachmentToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, attachmentToolbarContainer, MenuId.ChatInputAttachmentToolbar, {
+				telemetrySource: this.options.menus.telemetrySource,
+				label: true,
+				menuOptions: { shouldForwardArgs: true, renderShortTitle: true },
+				hiddenItemStrategy: HiddenItemStrategy.Ignore,
+				hoverDelegate,
+				getKeyBinding: () => undefined,
+				actionViewItemProvider: (action, options) => {
+					if (action.id === 'workbench.action.chat.editing.attachFiles') {
+						const viewItem = this.instantiationService.createInstance(AddFilesButton, undefined, action, options);
+						return viewItem;
+					}
+					return undefined;
+				}
+			}));
+			attachmentToolbar.context = { widget, placeholder: localize('chatAttachFiles', 'Search for files and context to add to your request') };
+			this._register(attachmentToolbar.onDidChangeMenuItems(() => {
+				if (this.cachedDimensions) {
+					this.layout(this.cachedDimensions.height, this.cachedDimensions.width);
+				}
+			}));
+		} else {
+			dom.hide(attachmentToolbarContainer);
+		}
 	}
 
-	private async renderAttachedContext(widget?: IChatWidget) {
+	private async renderAttachedContext() {
 		const container = this.attachedContextContainer;
 		const oldHeight = container.offsetHeight;
 		const store = new DisposableStore();
@@ -932,11 +951,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 		dom.clearNode(container);
 		const hoverDelegate = store.add(createInstantHoverDelegate());
-		if (widget && this.options.renderWorkingSet) {
-			this.renderAddFilesHint(container, hoverDelegate, store, widget);
-		}
+
 		const attachments = [...this.attachmentModel.attachments.entries()];
-		dom.setVisibility(Boolean(widget && this.options.renderWorkingSet) || Boolean(attachments.length) || Boolean(this.implicitContext?.value) || !this.instructionAttachmentsPart.empty, this.attachedContextContainer);
+		dom.setVisibility(Boolean(attachments.length) || Boolean(this.implicitContext?.value) || !this.instructionAttachmentsPart.empty, this.attachedContextContainer);
 		if (!attachments.length) {
 			this._indexOfLastAttachedContextDeletedWithKeyboard = -1;
 		}
@@ -1219,7 +1236,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	async renderChatEditingSessionState(chatEditingSession: IChatEditingSession | null, chatWidget?: IChatWidget) {
 		dom.setVisibility(Boolean(chatEditingSession), this.chatEditingSessionWidgetContainer);
 
-		await this.renderAttachedContext(chatWidget);
 		if (chatEditingSession && this.configurationService.getValue('chat.renderRelatedFiles')) {
 			this.renderChatRelatedFiles(chatEditingSession, this.relatedFilesContainer);
 		}
@@ -1470,7 +1486,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			inputPartEditorHeight: Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight),
 			inputPartHorizontalPadding: this.options.renderStyle === 'compact' ? 16 : 32,
 			inputPartVerticalPadding: this.options.renderStyle === 'compact' ? 12 : 28,
-			attachmentsHeight: this.attachedContextContainer.offsetHeight + this.relatedFilesContainer.offsetHeight,
+			attachmentsHeight: this.attachmentsContainer.offsetHeight + 6,
 			editorBorder: 2,
 			inputPartHorizontalPaddingInside: 12,
 			toolbarsWidth: this.options.renderStyle === 'compact' ? executeToolbarWidth + executeToolbarPadding + inputToolbarWidth + inputToolbarPadding : 0,
@@ -1666,3 +1682,14 @@ class ToggleAgentActionViewItem extends DropdownMenuActionViewItemWithKeybinding
 		container.classList.add('chat-modelPicker-item');
 	}
 }
+
+class AddFilesButton extends ActionViewItem {
+	constructor(context: unknown, action: IAction, options: IActionViewItemOptions) {
+		super(context, action, options);
+	}
+
+	override render(container: HTMLElement): void {
+		super.render(container);
+		container.classList.add('chat-attached-context-attachment', 'chat-add-files');
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
index ca62b586d3a4..b7394e296a8d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
@@ -186,7 +186,7 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 						progressMessageAtBottomOfResponse: this.chatOptions.location === ChatAgentLocation.EditingSession,
 					},
 					editorOverflowWidgetsDomNode: editorOverflowNode,
-					enableImplicitContext: this.chatOptions.location === ChatAgentLocation.Panel,
+					enableImplicitContext: this.chatOptions.location === ChatAgentLocation.Panel || this.chatOptions.location === ChatAgentLocation.EditingSession,
 					enableWorkingSet: this.chatOptions.location === ChatAgentLocation.EditingSession ? 'explicit' : undefined
 				},
 				{
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
index aeb6c1911d1b..3c9b18a921ff 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
@@ -6,6 +6,7 @@
 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 { autorun } from '../../../../../base/common/observable.js';
 import { basename } from '../../../../../base/common/resources.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ICodeEditor, isCodeEditor, isDiffEditor } from '../../../../../editor/browser/editorBrowser.js';
@@ -15,7 +16,9 @@ import { IWorkbenchContribution } from '../../../../common/contributions.js';
 import { EditorsOrder } from '../../../../common/editor.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { ChatAgentLocation } from '../../common/chatAgents.js';
+import { IChatEditingService } from '../../common/chatEditingService.js';
 import { IBaseChatRequestVariableEntry, IChatRequestImplicitVariableEntry } from '../../common/chatModel.js';
+import { IChatService } from '../../common/chatService.js';
 import { ILanguageModelIgnoredFilesService } from '../../common/ignoredFiles.js';
 import { IChatWidget, IChatWidgetService } from '../chat.js';
 
@@ -28,6 +31,8 @@ export class ChatImplicitContextContribution extends Disposable implements IWork
 		@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,
 		@ILanguageModelIgnoredFilesService private readonly ignoredFilesService: ILanguageModelIgnoredFilesService,
 	) {
 		super();
@@ -50,7 +55,16 @@ export class ChatImplicitContextContribution extends Disposable implements IWork
 
 				this.updateImplicitContext();
 			})));
-		this._register(chatWidgetService.onDidAddWidget(widget => this.updateImplicitContext(widget)));
+		this._register(autorun((reader) => {
+			this.chatEditingService.editingSessionsObs.read(reader);
+			this.updateImplicitContext();
+		}));
+		this._register(this.chatService.onDidSubmitRequest(({ chatSessionId }) => {
+			const widget = this.chatWidgetService.getWidgetBySessionId(chatSessionId);
+			if (widget?.input.implicitContext && widget.location === ChatAgentLocation.EditingSession && widget.viewModel?.getItems().length !== 0) {
+				widget.input.implicitContext.setValue(undefined, false);
+			}
+		}));
 	}
 
 	private findActiveCodeEditor(): ICodeEditor | undefined {
@@ -115,9 +129,11 @@ export class ChatImplicitContextContribution extends Disposable implements IWork
 			return;
 		}
 
-		const widgets = updateWidget ? [updateWidget] : [...this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Panel), ...this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Editor)];
+		const widgets = updateWidget ? [updateWidget] : [...this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Panel), ...this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.EditingSession), ...this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Editor)];
 		for (const widget of widgets) {
-			if (widget.input.implicitContext) {
+			if (widget.input.implicitContext && widget.location === ChatAgentLocation.EditingSession && widget.viewModel?.getItems().length !== 0) {
+				widget.input.implicitContext.setValue(undefined, false);
+			} else if (widget.input.implicitContext) {
 				widget.input.implicitContext.setValue(newValue, isSelection);
 			}
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 1890e2637943..d38067912ab2 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -690,8 +690,16 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	justify-content: start;
 }
 
+.chat-attachments-container {
+	display: flex;
+	flex-direction: row;
+	gap: 4px;
+	margin-top: 6px;
+	flex-wrap: wrap;
+	overflow: hidden;
+}
+
 .chat-related-files {
-	padding: 4px 0 0 0;
 	display: flex;
 	flex-wrap: wrap;
 	align-items: center;
@@ -731,7 +739,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 }
 
 .interactive-session .chat-related-files .monaco-icon-label::before {
-	padding: 2px 2px 0 0;
+	padding: 4px 3px 0 2px;
 }
 
 .interactive-session .chat-editing-session .chat-related-files .monaco-button.secondary:first-child {
@@ -1111,6 +1119,13 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	padding: 8px 0 0 0
 }
 
+.action-item.chat-attached-context-attachment.chat-add-files {
+	height: 20px;
+	gap: 0px;
+	color: var(--vscode-descriptionForeground);
+}
+
+.action-item.chat-attached-context-attachment.chat-add-files .action-label,
 .interactive-session .chat-attached-context .chat-attached-context-attachment {
 	display: flex;
 	gap: 2px;
@@ -1124,10 +1139,13 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	width: fit-content;
 }
 
-.interactive-session .chat-attached-context .chat-attached-context-attachment.chat-add-files {
-	height: 20px;
-	gap: 0px;
+.action-item.chat-attached-context-attachment.chat-add-files .action-label {
 	color: var(--vscode-descriptionForeground);
+	font-family: unset;
+}
+
+.action-item.chat-attached-context-attachment.chat-add-files .action-label.codicon::before {
+	font: normal normal normal 16px/1 codicon;
 }
 
 .interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-button {
@@ -1142,7 +1160,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 }
 
 .chat-related-files .monaco-button.codicon.codicon-add:hover,
-.interactive-session .chat-attached-context .chat-attached-context-attachment.chat-add-files:hover,
+.action-item.chat-attached-context-attachment.chat-add-files:hover,
 .interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-button:hover {
 	cursor: pointer;
 	background: var(--vscode-toolbar-hoverBackground);
@@ -1174,7 +1192,6 @@ have to be updated for changes to the rules above, or to support more deeply nes
 }
 
 .interactive-session .chat-attached-context {
-	padding: 6px 0 0 0;
 	display: flex;
 	flex-wrap: wrap;
 	cursor: default;
@@ -1182,7 +1199,6 @@ have to be updated for changes to the rules above, or to support more deeply nes
 }
 
 .interactive-session .interactive-input-part.compact .chat-attached-context {
-	padding-top: 8px;
 	padding-bottom: 0px;
 	display: flex;
 	gap: 4px;
diff --git a/src/vs/workbench/contrib/chat/common/chatService.ts b/src/vs/workbench/contrib/chat/common/chatService.ts
index 32eeb99e8ac7..723504d6b20f 100644
--- a/src/vs/workbench/contrib/chat/common/chatService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatService.ts
@@ -458,6 +458,8 @@ export interface IChatService {
 	_serviceBrand: undefined;
 	transferredSessionData: IChatTransferredSessionData | undefined;
 
+	onDidSubmitRequest: Event<{ chatSessionId: string }>;
+
 	isEnabled(location: ChatAgentLocation): boolean;
 	hasSessions(): boolean;
 	startSession(location: ChatAgentLocation, token: CancellationToken): ChatModel;
diff --git a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
index 6e5e83b27a0c..34b83be76fee 100644
--- a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
@@ -120,6 +120,9 @@ export class ChatService extends Disposable implements IChatService {
 		return this._transferredSessionData;
 	}
 
+	private readonly _onDidSubmitRequest = this._register(new Emitter<{ chatSessionId: string }>());
+	public readonly onDidSubmitRequest: Event<{ chatSessionId: string }> = this._onDidSubmitRequest.event;
+
 	private readonly _onDidPerformUserAction = this._register(new Emitter<IChatUserActionEvent>());
 	public readonly onDidPerformUserAction: Event<IChatUserActionEvent> = this._onDidPerformUserAction.event;
 
@@ -806,6 +809,7 @@ export class ChatService extends Disposable implements IChatService {
 		rawResponsePromise.finally(() => {
 			this._pendingRequests.deleteAndDispose(model.sessionId);
 		});
+		this._onDidSubmitRequest.fire({ chatSessionId: model.sessionId });
 		return {
 			responseCreatedPromise: responseCreated.p,
 			responseCompletePromise: rawResponsePromise,
diff --git a/src/vs/workbench/contrib/chat/test/common/mockChatService.ts b/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
index 841b65ccc085..4797a66c721c 100644
--- a/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
+++ b/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
@@ -14,6 +14,7 @@ import { IChatCompleteResponse, IChatDetail, IChatProviderInfo, IChatSendRequest
 export class MockChatService implements IChatService {
 	_serviceBrand: undefined;
 	transferredSessionData: IChatTransferredSessionData | undefined;
+	onDidSubmitRequest: Event<{ chatSessionId: string }> = Event.None;
 
 	private sessions = new Map<string, IChatModel>();
 

From 27ada980cf9d594c900a8ea5e589d052e0e43017 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sat, 22 Feb 2025 12:10:58 +0100
Subject: [PATCH 0268/1815] chat status tweaks (#241561)

---
 .../chat/browser/actions/chatActions.ts       | 508 ++++++++++--------
 .../contrib/chat/browser/chat.contribution.ts |   4 +-
 .../contrib/chat/browser/chatSetup.ts         |  94 ++--
 .../contrib/chat/browser/chatStatus.ts        |  46 +-
 .../chat/common/chatEntitlementsService.ts    |  46 ++
 .../contrib/chat/common/chatQuotasService.ts  |  28 +-
 6 files changed, 427 insertions(+), 299 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/common/chatEntitlementsService.ts

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index 9b9c3c409a2f..ee6dccdf4d20 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -43,7 +43,7 @@ import { IChatRequestViewModel, IChatResponseViewModel, isRequestVM } from '../.
 import { IChatWidgetHistoryService } from '../../common/chatWidgetHistoryService.js';
 import { CopilotUsageExtensionFeatureId } from '../../common/languageModelStats.js';
 import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
-import { ChatViewId, IChatWidget, IChatWidgetService, showChatView } from '../chat.js';
+import { ChatViewId, EditsViewId, IChatWidget, IChatWidgetService, showChatView, showCopilotView } from '../chat.js';
 import { IChatEditorOptions } from '../chatEditor.js';
 import { ChatEditorInput } from '../chatEditorInput.js';
 import { IChatQuotasService } from '../../common/chatQuotasService.js';
@@ -53,13 +53,19 @@ import { clearChatEditor } from './chatClear.js';
 import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
 import { language } from '../../../../../base/common/platform.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { IWorkbenchLayoutService, Parts } from '../../../../services/layout/browser/layoutService.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../../../../common/views.js';
 
 export const CHAT_CATEGORY = localize2('chat.category', 'Chat');
+
 export const CHAT_OPEN_ACTION_ID = 'workbench.action.chat.open';
+export const CHAT_OPEN_ACTION_LABEL = localize2('openChat', "Open Chat");
 
 export const CHAT_SETUP_ACTION_ID = 'workbench.action.chat.triggerSetup';
 export const CHAT_SETUP_ACTION_LABEL = localize2('triggerChatSetup', "Use AI Features with Copilot for Free...");
 
+export const TOGGLE_CHAT_ACTION_ID = 'workbench.action.chat.toggle';
+
 export interface IChatViewOpenOptions {
 	/**
 	 * The query for quick chat.
@@ -89,271 +95,309 @@ export interface IChatViewOpenRequestEntry {
 	response: string;
 }
 
-class OpenChatGlobalAction extends Action2 {
+MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
+	command: {
+		id: 'update.showCurrentReleaseNotes',
+		title: localize2('chat.releaseNotes.label', "Show Release Notes"),
+	},
+	when: ContextKeyExpr.equals('view', ChatViewId)
+});
 
-	static readonly TITLE = localize2('openChat', "Open Chat");
+export const OPEN_CHAT_QUOTA_EXCEEDED_DIALOG = 'workbench.action.chat.openQuotaExceededDialog';
 
-	constructor() {
-		super({
-			id: CHAT_OPEN_ACTION_ID,
-			title: OpenChatGlobalAction.TITLE,
-			icon: Codicon.copilot,
-			f1: true,
-			category: CHAT_CATEGORY,
-			keybinding: {
-				weight: KeybindingWeight.WorkbenchContrib,
-				primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyI,
-				mac: {
-					primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KeyI
+export function registerChatActions() {
+	registerAction2(class OpenChatGlobalAction extends Action2 {
+
+		constructor() {
+			super({
+				id: CHAT_OPEN_ACTION_ID,
+				title: CHAT_OPEN_ACTION_LABEL,
+				icon: Codicon.copilot,
+				f1: true,
+				category: CHAT_CATEGORY,
+				keybinding: {
+					weight: KeybindingWeight.WorkbenchContrib,
+					primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyI,
+					mac: {
+						primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KeyI
+					}
+				},
+				menu: {
+					id: MenuId.ChatTitleBarMenu,
+					group: 'a_open',
+					order: 1
 				}
-			},
-			menu: {
-				id: MenuId.ChatTitleBarMenu,
-				group: 'a_open',
-				order: 1
-			}
-		});
-	}
+			});
+		}
 
-	override async run(accessor: ServicesAccessor, opts?: string | IChatViewOpenOptions): Promise<void> {
-		opts = typeof opts === 'string' ? { query: opts } : opts;
+		override async run(accessor: ServicesAccessor, opts?: string | IChatViewOpenOptions): Promise<void> {
+			opts = typeof opts === 'string' ? { query: opts } : opts;
 
-		const chatService = accessor.get(IChatService);
-		const toolsService = accessor.get(ILanguageModelToolsService);
-		const viewsService = accessor.get(IViewsService);
-		const hostService = accessor.get(IHostService);
+			const chatService = accessor.get(IChatService);
+			const toolsService = accessor.get(ILanguageModelToolsService);
+			const viewsService = accessor.get(IViewsService);
+			const hostService = accessor.get(IHostService);
 
-		const chatWidget = await showChatView(viewsService);
-		if (!chatWidget) {
-			return;
-		}
-		if (opts?.previousRequests?.length && chatWidget.viewModel) {
-			for (const { request, response } of opts.previousRequests) {
-				chatService.addCompleteRequest(chatWidget.viewModel.sessionId, request, undefined, 0, { message: response });
+			const chatWidget = await showChatView(viewsService);
+			if (!chatWidget) {
+				return;
 			}
-		}
-		if (opts?.attachScreenshot) {
-			const screenshot = await hostService.getScreenshot();
-			if (screenshot) {
-				chatWidget.attachmentModel.addContext(convertBufferToScreenshotVariable(screenshot));
+			if (opts?.previousRequests?.length && chatWidget.viewModel) {
+				for (const { request, response } of opts.previousRequests) {
+					chatService.addCompleteRequest(chatWidget.viewModel.sessionId, request, undefined, 0, { message: response });
+				}
 			}
-		}
-		if (opts?.query) {
-			if (opts.isPartialQuery) {
-				chatWidget.setInput(opts.query);
-			} else {
-				chatWidget.acceptInput(opts.query);
+			if (opts?.attachScreenshot) {
+				const screenshot = await hostService.getScreenshot();
+				if (screenshot) {
+					chatWidget.attachmentModel.addContext(convertBufferToScreenshotVariable(screenshot));
+				}
 			}
-		}
-		if (opts?.toolIds && opts.toolIds.length > 0) {
-			for (const toolId of opts.toolIds) {
-				const tool = toolsService.getTool(toolId);
-				if (tool) {
-					chatWidget.attachmentModel.addContext({
-						id: tool.id,
-						name: tool.displayName,
-						fullName: tool.displayName,
-						value: undefined,
-						icon: ThemeIcon.isThemeIcon(tool.icon) ? tool.icon : undefined,
-						isTool: true
-					});
+			if (opts?.query) {
+				if (opts.isPartialQuery) {
+					chatWidget.setInput(opts.query);
+				} else {
+					chatWidget.acceptInput(opts.query);
+				}
+			}
+			if (opts?.toolIds && opts.toolIds.length > 0) {
+				for (const toolId of opts.toolIds) {
+					const tool = toolsService.getTool(toolId);
+					if (tool) {
+						chatWidget.attachmentModel.addContext({
+							id: tool.id,
+							name: tool.displayName,
+							fullName: tool.displayName,
+							value: undefined,
+							icon: ThemeIcon.isThemeIcon(tool.icon) ? tool.icon : undefined,
+							isTool: true
+						});
+					}
 				}
 			}
-		}
 
-		chatWidget.focusInput();
-	}
-}
+			chatWidget.focusInput();
+		}
+	});
 
-class ChatHistoryAction extends Action2 {
-	constructor() {
-		super({
-			id: `workbench.action.chat.history`,
-			title: localize2('chat.history.label', "Show Chats..."),
-			menu: {
-				id: MenuId.ViewTitle,
-				when: ContextKeyExpr.equals('view', ChatViewId),
-				group: 'navigation',
-				order: 2
-			},
-			category: CHAT_CATEGORY,
-			icon: Codicon.history,
-			f1: true,
-			precondition: ChatContextKeys.enabled
-		});
-	}
+	registerAction2(class ToggleChatAction extends Action2 {
+		constructor() {
+			super({
+				id: TOGGLE_CHAT_ACTION_ID,
+				title: localize2('toggleChat', "Toggle Chat"),
+				category: CHAT_CATEGORY
+			});
+		}
 
-	async run(accessor: ServicesAccessor) {
-		const chatService = accessor.get(IChatService);
-		const quickInputService = accessor.get(IQuickInputService);
-		const viewsService = accessor.get(IViewsService);
-		const editorService = accessor.get(IEditorService);
+		async run(accessor: ServicesAccessor) {
+			const layoutService = accessor.get(IWorkbenchLayoutService);
+			const viewsService = accessor.get(IViewsService);
+			const viewDescriptorService = accessor.get(IViewDescriptorService);
 
-		const showPicker = () => {
-			const openInEditorButton: IQuickInputButton = {
-				iconClass: ThemeIcon.asClassName(Codicon.file),
-				tooltip: localize('interactiveSession.history.editor', "Open in Editor"),
-			};
-			const deleteButton: IQuickInputButton = {
-				iconClass: ThemeIcon.asClassName(Codicon.x),
-				tooltip: localize('interactiveSession.history.delete', "Delete"),
-			};
-			const renameButton: IQuickInputButton = {
-				iconClass: ThemeIcon.asClassName(Codicon.pencil),
-				tooltip: localize('chat.history.rename', "Rename"),
-			};
+			const chatLocation = viewDescriptorService.getViewLocationById(ChatViewId);
+			const editsLocation = viewDescriptorService.getViewLocationById(EditsViewId);
 
-			interface IChatPickerItem extends IQuickPickItem {
-				chat: IChatDetail;
+			if (viewsService.isViewVisible(ChatViewId) || (chatLocation === editsLocation && viewsService.isViewVisible(EditsViewId))) {
+				this.updatePartVisibility(layoutService, chatLocation, false);
+			} else {
+				this.updatePartVisibility(layoutService, chatLocation, true);
+				(await showCopilotView(viewsService, layoutService))?.focusInput();
 			}
+		}
 
-			const getPicks = () => {
-				const items = chatService.getHistory();
-				items.sort((a, b) => (b.lastMessageDate ?? 0) - (a.lastMessageDate ?? 0));
-
-				let lastDate: string | undefined = undefined;
-				const picks = items.flatMap((i): [IQuickPickSeparator | undefined, IChatPickerItem] => {
-					const timeAgoStr = fromNowByDay(i.lastMessageDate, true, true);
-					const separator: IQuickPickSeparator | undefined = timeAgoStr !== lastDate ? {
-						type: 'separator', label: timeAgoStr,
-					} : undefined;
-					lastDate = timeAgoStr;
-					return [
-						separator,
-						{
-							label: i.title,
-							description: i.isActive ? `(${localize('currentChatLabel', 'current')})` : '',
-							chat: i,
-							buttons: i.isActive ? [renameButton] : [
-								renameButton,
-								openInEditorButton,
-								deleteButton,
-							]
-						}
-					];
-				});
+		private updatePartVisibility(layoutService: IWorkbenchLayoutService, location: ViewContainerLocation | null, visible: boolean): void {
+			let part: Parts.PANEL_PART | Parts.SIDEBAR_PART | Parts.AUXILIARYBAR_PART | undefined;
+			switch (location) {
+				case ViewContainerLocation.Panel:
+					part = Parts.PANEL_PART;
+					break;
+				case ViewContainerLocation.Sidebar:
+					part = Parts.SIDEBAR_PART;
+					break;
+				case ViewContainerLocation.AuxiliaryBar:
+					part = Parts.AUXILIARYBAR_PART;
+					break;
+			}
 
-				return coalesce(picks);
-			};
+			if (part) {
+				layoutService.setPartHidden(!visible, part);
+			}
+		}
+	});
 
-			const store = new DisposableStore();
-			const picker = store.add(quickInputService.createQuickPick<IChatPickerItem>({ useSeparators: true }));
-			picker.placeholder = localize('interactiveSession.history.pick', "Switch to chat");
-			const picks = getPicks();
-			picker.items = picks;
-			store.add(picker.onDidTriggerItemButton(async context => {
-				if (context.button === openInEditorButton) {
-					const options: IChatEditorOptions = { target: { sessionId: context.item.chat.sessionId }, pinned: true };
-					editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options }, ACTIVE_GROUP);
-					picker.hide();
-				} else if (context.button === deleteButton) {
-					chatService.removeHistoryEntry(context.item.chat.sessionId);
-					picker.items = getPicks();
-				} else if (context.button === renameButton) {
-					const title = await quickInputService.input({ title: localize('newChatTitle', "New chat title"), value: context.item.chat.title });
-					if (title) {
-						chatService.setChatSessionTitle(context.item.chat.sessionId, title);
-					}
+	registerAction2(class ChatHistoryAction extends Action2 {
+		constructor() {
+			super({
+				id: `workbench.action.chat.history`,
+				title: localize2('chat.history.label', "Show Chats..."),
+				menu: {
+					id: MenuId.ViewTitle,
+					when: ContextKeyExpr.equals('view', ChatViewId),
+					group: 'navigation',
+					order: 2
+				},
+				category: CHAT_CATEGORY,
+				icon: Codicon.history,
+				f1: true,
+				precondition: ChatContextKeys.enabled
+			});
+		}
 
-					// The quick input hides the picker, it gets disposed, so we kick it off from scratch
-					showPicker();
-				}
-			}));
-			store.add(picker.onDidAccept(async () => {
-				try {
-					const item = picker.selectedItems[0];
-					const sessionId = item.chat.sessionId;
-					const view = await viewsService.openView(ChatViewId) as ChatViewPane;
-					view.loadSession(sessionId);
-				} finally {
-					picker.hide();
+		async run(accessor: ServicesAccessor) {
+			const chatService = accessor.get(IChatService);
+			const quickInputService = accessor.get(IQuickInputService);
+			const viewsService = accessor.get(IViewsService);
+			const editorService = accessor.get(IEditorService);
+
+			const showPicker = () => {
+				const openInEditorButton: IQuickInputButton = {
+					iconClass: ThemeIcon.asClassName(Codicon.file),
+					tooltip: localize('interactiveSession.history.editor', "Open in Editor"),
+				};
+				const deleteButton: IQuickInputButton = {
+					iconClass: ThemeIcon.asClassName(Codicon.x),
+					tooltip: localize('interactiveSession.history.delete', "Delete"),
+				};
+				const renameButton: IQuickInputButton = {
+					iconClass: ThemeIcon.asClassName(Codicon.pencil),
+					tooltip: localize('chat.history.rename', "Rename"),
+				};
+
+				interface IChatPickerItem extends IQuickPickItem {
+					chat: IChatDetail;
 				}
-			}));
-			store.add(picker.onDidHide(() => store.dispose()));
 
-			picker.show();
-		};
-		showPicker();
-	}
-}
-
-class OpenChatEditorAction extends Action2 {
-	constructor() {
-		super({
-			id: `workbench.action.openChat`,
-			title: localize2('interactiveSession.open', "Open Editor"),
-			f1: true,
-			category: CHAT_CATEGORY,
-			precondition: ChatContextKeys.enabled
-		});
-	}
+				const getPicks = () => {
+					const items = chatService.getHistory();
+					items.sort((a, b) => (b.lastMessageDate ?? 0) - (a.lastMessageDate ?? 0));
+
+					let lastDate: string | undefined = undefined;
+					const picks = items.flatMap((i): [IQuickPickSeparator | undefined, IChatPickerItem] => {
+						const timeAgoStr = fromNowByDay(i.lastMessageDate, true, true);
+						const separator: IQuickPickSeparator | undefined = timeAgoStr !== lastDate ? {
+							type: 'separator', label: timeAgoStr,
+						} : undefined;
+						lastDate = timeAgoStr;
+						return [
+							separator,
+							{
+								label: i.title,
+								description: i.isActive ? `(${localize('currentChatLabel', 'current')})` : '',
+								chat: i,
+								buttons: i.isActive ? [renameButton] : [
+									renameButton,
+									openInEditorButton,
+									deleteButton,
+								]
+							}
+						];
+					});
 
-	async run(accessor: ServicesAccessor) {
-		const editorService = accessor.get(IEditorService);
-		await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true } satisfies IChatEditorOptions });
-	}
-}
+					return coalesce(picks);
+				};
+
+				const store = new DisposableStore();
+				const picker = store.add(quickInputService.createQuickPick<IChatPickerItem>({ useSeparators: true }));
+				picker.placeholder = localize('interactiveSession.history.pick', "Switch to chat");
+				const picks = getPicks();
+				picker.items = picks;
+				store.add(picker.onDidTriggerItemButton(async context => {
+					if (context.button === openInEditorButton) {
+						const options: IChatEditorOptions = { target: { sessionId: context.item.chat.sessionId }, pinned: true };
+						editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options }, ACTIVE_GROUP);
+						picker.hide();
+					} else if (context.button === deleteButton) {
+						chatService.removeHistoryEntry(context.item.chat.sessionId);
+						picker.items = getPicks();
+					} else if (context.button === renameButton) {
+						const title = await quickInputService.input({ title: localize('newChatTitle', "New chat title"), value: context.item.chat.title });
+						if (title) {
+							chatService.setChatSessionTitle(context.item.chat.sessionId, title);
+						}
 
+						// The quick input hides the picker, it gets disposed, so we kick it off from scratch
+						showPicker();
+					}
+				}));
+				store.add(picker.onDidAccept(async () => {
+					try {
+						const item = picker.selectedItems[0];
+						const sessionId = item.chat.sessionId;
+						const view = await viewsService.openView(ChatViewId) as ChatViewPane;
+						view.loadSession(sessionId);
+					} finally {
+						picker.hide();
+					}
+				}));
+				store.add(picker.onDidHide(() => store.dispose()));
 
-class ChatAddAction extends Action2 {
-	constructor() {
-		super({
-			id: 'workbench.action.chat.addParticipant',
-			title: localize2('chatWith', "Chat with Extension"),
-			icon: Codicon.mention,
-			f1: false,
-			category: CHAT_CATEGORY,
-			menu: {
-				id: MenuId.ChatInput,
-				when: ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel),
-				group: 'navigation',
-				order: 1
-			}
-		});
-	}
+				picker.show();
+			};
+			showPicker();
+		}
+	});
 
-	override async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
-		const widgetService = accessor.get(IChatWidgetService);
-		const context: { widget?: IChatWidget } | undefined = args[0];
-		const widget = context?.widget ?? widgetService.lastFocusedWidget;
-		if (!widget) {
-			return;
+	registerAction2(class OpenChatEditorAction extends Action2 {
+		constructor() {
+			super({
+				id: `workbench.action.openChat`,
+				title: localize2('interactiveSession.open', "Open Editor"),
+				f1: true,
+				category: CHAT_CATEGORY,
+				precondition: ChatContextKeys.enabled
+			});
 		}
 
-		const hasAgentOrCommand = extractAgentAndCommand(widget.parsedInput);
-		if (hasAgentOrCommand?.agentPart || hasAgentOrCommand?.commandPart) {
-			return;
+		async run(accessor: ServicesAccessor) {
+			const editorService = accessor.get(IEditorService);
+			await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true } satisfies IChatEditorOptions });
 		}
+	});
 
-		const suggestCtrl = SuggestController.get(widget.inputEditor);
-		if (suggestCtrl) {
-			const curText = widget.inputEditor.getValue();
-			const newValue = curText ? `@ ${curText}` : '@';
-			if (!curText.startsWith('@')) {
-				widget.inputEditor.setValue(newValue);
-			}
 
-			widget.inputEditor.setPosition(new Position(1, 2));
-			suggestCtrl.triggerSuggest(undefined, true);
+	registerAction2(class ChatAddAction extends Action2 {
+		constructor() {
+			super({
+				id: 'workbench.action.chat.addParticipant',
+				title: localize2('chatWith', "Chat with Extension"),
+				icon: Codicon.mention,
+				f1: false,
+				category: CHAT_CATEGORY,
+				menu: {
+					id: MenuId.ChatInput,
+					when: ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel),
+					group: 'navigation',
+					order: 1
+				}
+			});
 		}
-	}
-}
 
-MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
-	command: {
-		id: 'update.showCurrentReleaseNotes',
-		title: localize2('chat.releaseNotes.label', "Show Release Notes"),
-	},
-	when: ContextKeyExpr.equals('view', ChatViewId)
-});
+		override async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+			const widgetService = accessor.get(IChatWidgetService);
+			const context: { widget?: IChatWidget } | undefined = args[0];
+			const widget = context?.widget ?? widgetService.lastFocusedWidget;
+			if (!widget) {
+				return;
+			}
 
-export const OPEN_CHAT_QUOTA_EXCEEDED_DIALOG = 'workbench.action.chat.openQuotaExceededDialog';
+			const hasAgentOrCommand = extractAgentAndCommand(widget.parsedInput);
+			if (hasAgentOrCommand?.agentPart || hasAgentOrCommand?.commandPart) {
+				return;
+			}
 
-export function registerChatActions() {
-	registerAction2(OpenChatGlobalAction);
-	registerAction2(ChatHistoryAction);
-	registerAction2(OpenChatEditorAction);
-	registerAction2(ChatAddAction);
+			const suggestCtrl = SuggestController.get(widget.inputEditor);
+			if (suggestCtrl) {
+				const curText = widget.inputEditor.getValue();
+				const newValue = curText ? `@ ${curText}` : '@';
+				if (!curText.startsWith('@')) {
+					widget.inputEditor.setValue(newValue);
+				}
+
+				widget.inputEditor.setPosition(new Position(1, 2));
+				suggestCtrl.triggerSuggest(undefined, true);
+			}
+		}
+	});
 
 	registerAction2(class ClearChatInputHistoryAction extends Action2 {
 		constructor() {
@@ -693,7 +737,7 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 					primaryActionIcon = Codicon.copilotWarning;
 				} else {
 					primaryActionId = CHAT_OPEN_ACTION_ID;
-					primaryActionTitle = OpenChatGlobalAction.TITLE.value;
+					primaryActionTitle = CHAT_OPEN_ACTION_LABEL.value;
 					primaryActionIcon = Codicon.copilot;
 				}
 			}
@@ -704,7 +748,7 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 			}, undefined, undefined, undefined, undefined), dropdownAction, action.actions, '', { ...options, skipTelemetry: true });
 		}, Event.any(
 			agentService.onDidChangeAgents,
-			chatQuotasService.onDidChangeQuotas,
+			chatQuotasService.onDidChangeQuotaExceeded,
 			Event.filter(contextKeyService.onDidChangeContext, e => e.affectsSome(contextKeySet))
 		));
 
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 53851d9015b5..093980c3c6c5 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -80,7 +80,8 @@ import { ChatPasteProvidersFeature } from './chatPasteProviders.js';
 import { QuickChatService } from './chatQuick.js';
 import { ChatQuotasService, IChatQuotasService } from '../common/chatQuotasService.js';
 import { ChatResponseAccessibleView } from './chatResponseAccessibleView.js';
-import { ChatSetupContribution } from './chatSetup.js';
+import { ChatEntitlementsService, ChatSetupContribution } from './chatSetup.js';
+import { IChatEntitlementsService } from '../common/chatEntitlementsService.js';
 import { ChatVariablesService } from './chatVariables.js';
 import { ChatWidgetService } from './chatWidget.js';
 import { ChatCodeBlockContextProviderService } from './codeBlockContextProviderService.js';
@@ -469,5 +470,6 @@ registerSingleton(IChatEditingService, ChatEditingService, InstantiationType.Del
 registerSingleton(IChatMarkdownAnchorService, ChatMarkdownAnchorService, InstantiationType.Delayed);
 registerSingleton(ILanguageModelIgnoredFilesService, LanguageModelIgnoredFilesService, InstantiationType.Delayed);
 registerSingleton(IChatQuotasService, ChatQuotasService, InstantiationType.Delayed);
+registerSingleton(IChatEntitlementsService, ChatEntitlementsService, InstantiationType.Delayed);
 
 registerSingleton(IPromptsService, PromptsService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index f4c3c6f7b824..fbdfd043dda3 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -69,6 +69,7 @@ import { IQuickInputService } from '../../../../platform/quickinput/common/quick
 import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
 import { equalsIgnoreCase } from '../../../../base/common/strings.js';
 import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
+import { ChatEntitlement, IChatEntitlements, IChatEntitlementsService } from '../common/chatEntitlementsService.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -91,21 +92,40 @@ const defaultChat = {
 	manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? '',
 };
 
-enum ChatEntitlement {
-	/** Signed out */
-	Unknown = 1,
-	/** Signed in but not yet resolved */
-	Unresolved,
-	/** Signed in and entitled to Limited */
-	Available,
-	/** Signed in but not entitled to Limited */
-	Unavailable,
-	/** Signed-up to Limited */
-	Limited,
-	/** Signed-up to Pro */
-	Pro
+//#region Service
+
+export class ChatEntitlementsService extends Disposable implements IChatEntitlementsService {
+
+	declare _serviceBrand: undefined;
+
+	readonly context: ChatSetupContext | undefined;
+	readonly requests: ChatSetupRequests | undefined;
+
+	constructor(
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IProductService productService: IProductService,
+		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService
+	) {
+		super();
+
+		if (
+			!productService.defaultChatAgent ||				// needs product config
+			(isWeb && !environmentService.remoteAuthority)	// only enabled locally or a remote backend
+		) {
+			return;
+		}
+
+		this.context = this._register(instantiationService.createInstance(ChatSetupContext));
+		this.requests = this._register(instantiationService.createInstance(ChatSetupRequests, this.context));
+	}
+
+	async resolve(token: CancellationToken): Promise<IChatEntitlements | undefined> {
+		return this.requests?.forceResolveEntitlement(undefined, token);
+	}
 }
 
+//#endregion
+
 //#region Contribution
 
 export class ChatSetupContribution extends Disposable implements IWorkbenchContribution {
@@ -115,22 +135,19 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 	constructor(
 		@IProductService private readonly productService: IProductService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
 		@ICommandService private readonly commandService: ICommandService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IWorkbenchAssignmentService private readonly experimentService: IWorkbenchAssignmentService,
+		@IChatEntitlementsService chatEntitlementsService: ChatEntitlementsService,
 	) {
 		super();
 
-		if (
-			!this.productService.defaultChatAgent ||			// needs product config
-			(isWeb && !this.environmentService.remoteAuthority)	// only enabled locally or a remote backend
-		) {
-			return;
+		const context = chatEntitlementsService.context;
+		const requests = chatEntitlementsService.requests;
+		if (!context || !requests) {
+			return; // disabled
 		}
 
-		const context = this._register(this.instantiationService.createInstance(ChatSetupContext));
-		const requests = this._register(this.instantiationService.createInstance(ChatSetupRequests, context));
 		const controller = new Lazy(() => this._register(this.instantiationService.createInstance(ChatSetupController, context, requests)));
 
 		this.registerChatWelcome(controller, context);
@@ -285,8 +302,8 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 				if (focus) {
 					windowFocusListener.clear();
 
-					const entitlement = await requests.forceResolveEntitlement(undefined);
-					if (entitlement === ChatEntitlement.Pro) {
+					const entitlements = await requests.forceResolveEntitlement(undefined);
+					if (entitlements?.entitlement === ChatEntitlement.Pro) {
 						refreshTokens(commandService);
 					}
 				}
@@ -384,21 +401,6 @@ interface IEntitlementsResponse {
 	readonly limited_user_reset_date: string;
 }
 
-interface IQuotas {
-	readonly chatTotal?: number;
-	readonly completionsTotal?: number;
-
-	readonly chatRemaining?: number;
-	readonly completionsRemaining?: number;
-
-	readonly resetDate?: string;
-}
-
-interface IChatEntitlements {
-	readonly entitlement: ChatEntitlement;
-	readonly quotas?: IQuotas;
-}
-
 class ChatSetupRequests extends Disposable {
 
 	static providerId(configurationService: IConfigurationService): string {
@@ -525,14 +527,14 @@ class ChatSetupRequests extends Disposable {
 		return scopes.length === expectedScopes.length && expectedScopes.every(scope => scopes.includes(scope));
 	}
 
-	private async resolveEntitlement(session: AuthenticationSession, token: CancellationToken): Promise<ChatEntitlement | undefined> {
+	private async resolveEntitlement(session: AuthenticationSession, token: CancellationToken): Promise<IChatEntitlements | undefined> {
 		const entitlements = await this.doResolveEntitlement(session, token);
 		if (typeof entitlements?.entitlement === 'number' && !token.isCancellationRequested) {
 			this.didResolveEntitlements = true;
 			this.update(entitlements);
 		}
 
-		return entitlements?.entitlement;
+		return entitlements;
 	}
 
 	private async doResolveEntitlement(session: AuthenticationSession, token: CancellationToken): Promise<IChatEntitlements | undefined> {
@@ -656,16 +658,16 @@ class ChatSetupRequests extends Disposable {
 		}
 	}
 
-	async forceResolveEntitlement(session: AuthenticationSession | undefined): Promise<ChatEntitlement | undefined> {
+	async forceResolveEntitlement(session: AuthenticationSession | undefined, token = CancellationToken.None): Promise<IChatEntitlements | undefined> {
 		if (!session) {
-			session = await this.findMatchingProviderSession(CancellationToken.None);
+			session = await this.findMatchingProviderSession(token);
 		}
 
 		if (!session) {
 			return undefined;
 		}
 
-		return this.resolveEntitlement(session, CancellationToken.None);
+		return this.resolveEntitlement(session, token);
 	}
 
 	async signUpLimited(session: AuthenticationSession): Promise<true /* signed up */ | false /* already signed up */ | { errorCode: number } /* error */> {
@@ -907,7 +909,7 @@ class ChatSetupController extends Disposable {
 
 	private async signIn(providerId: string): Promise<{ session: AuthenticationSession | undefined; entitlement: ChatEntitlement | undefined }> {
 		let session: AuthenticationSession | undefined;
-		let entitlement: ChatEntitlement | undefined;
+		let entitlements: IChatEntitlements | undefined;
 		try {
 			showCopilotView(this.viewsService, this.layoutService);
 
@@ -916,7 +918,7 @@ class ChatSetupController extends Disposable {
 			this.authenticationExtensionsService.updateAccountPreference(defaultChat.extensionId, providerId, session.account);
 			this.authenticationExtensionsService.updateAccountPreference(defaultChat.chatExtensionId, providerId, session.account);
 
-			entitlement = await this.requests.forceResolveEntitlement(session);
+			entitlements = await this.requests.forceResolveEntitlement(session);
 		} catch (e) {
 			this.logService.error(`[chat setup] signIn: error ${e}`);
 		}
@@ -934,7 +936,7 @@ class ChatSetupController extends Disposable {
 			}
 		}
 
-		return { session, entitlement };
+		return { session, entitlement: entitlements?.entitlement };
 	}
 
 	private async install(session: AuthenticationSession | undefined, entitlement: ChatEntitlement, providerId: string, watch: StopWatch,): Promise<void> {
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index e70211e91c0d..90e2179231a9 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { IManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { localize } from '../../../../nls.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
@@ -13,8 +14,9 @@ import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
 import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
+import { IChatEntitlementsService } from '../common/chatEntitlementsService.js';
 import { IChatQuotasService } from '../common/chatQuotasService.js';
-import { quotaToButtonMessage, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_ID, CHAT_SETUP_ACTION_LABEL, CHAT_OPEN_ACTION_ID } from './actions/chatActions.js';
+import { quotaToButtonMessage, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, TOGGLE_CHAT_ACTION_ID } from './actions/chatActions.js';
 
 export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
 
@@ -27,6 +29,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	constructor(
 		@IStatusbarService private readonly statusbarService: IStatusbarService,
 		@IChatQuotasService private readonly chatQuotasService: IChatQuotasService,
+		@IChatEntitlementsService private readonly chatEntitlementsService: IChatEntitlementsService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IWorkbenchAssignmentService private readonly assignmentService: IWorkbenchAssignmentService,
 		@IProductService private readonly productService: IProductService,
@@ -73,14 +76,14 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			this.statusbarService.updateEntryVisibility(ChatStatusBarEntry.ID, !this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.hidden.key));
 		}));
 
-		this._register(this.chatQuotasService.onDidChangeQuotas(() => this.entry?.update(this.getEntryProps())));
+		this._register(this.chatQuotasService.onDidChangeQuotaExceeded(() => this.entry?.update(this.getEntryProps())));
 	}
 
 	private getEntryProps(): IStatusbarEntry {
 		let text = '$(copilot)';
 		let ariaLabel = localize('chatStatus', "Copilot Status");
-		let command = CHAT_OPEN_ACTION_ID;
-		let tooltip: string | IMarkdownString = localize('openChat', "Open Chat ({0})", this.keybindingService.lookupKeybinding(command)?.getLabel() ?? '');
+		let command = TOGGLE_CHAT_ACTION_ID;
+		let tooltip: string | IManagedHoverTooltipMarkdownString = localize('openChat', "Open Chat ({0})", this.keybindingService.lookupKeybinding(command)?.getLabel() ?? '');
 
 		// Quota Exceeded
 		const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatQuotasService.quotas;
@@ -105,7 +108,6 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.installed.key) === false ||
 			this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.canSignUp.key) === true
 		) {
-			command = CHAT_SETUP_ACTION_ID;
 			tooltip = CHAT_SETUP_ACTION_LABEL.value;
 		}
 
@@ -118,15 +120,29 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 		// Copilot Limited User
 		else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.limited.key) === true) {
-			const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = this.chatQuotasService.quotas;
-			if (typeof chatRemaining === 'number' && typeof chatTotal === 'number' && typeof completionsRemaining === 'number' && typeof completionsTotal === 'number') {
-				tooltip = new MarkdownString([
-					localize('limitTitle', "You are currently using Copilot Free"),
-					'---',
-					localize('limitChatQuota', "<code>{0}</code> of <code>{1}</code> chats remaining", chatRemaining, chatTotal),
-					localize('limitCompletionsQuota', "<code>{0}</code> of <code>{1}</code> code completions remaining", completionsRemaining, completionsTotal),
-				].join('\n\n'), { supportHtml: true });
-			}
+			const that = this;
+			tooltip = {
+				async markdown(token) {
+					const entitlements = await that.chatEntitlementsService.resolve(token);
+
+					if (token.isCancellationRequested || !entitlements?.quotas) {
+						return;
+					}
+
+					const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = entitlements.quotas;
+					if (typeof chatRemaining === 'number' && typeof chatTotal === 'number' && typeof completionsRemaining === 'number' && typeof completionsTotal === 'number') {
+						return new MarkdownString([
+							localize('limitTitle', "You are currently using Copilot Free"),
+							'---',
+							localize('limitChatQuota', "<code>{0}</code> of <code>{1}</code> chats remaining", chatRemaining, chatTotal),
+							localize('limitCompletionsQuota', "<code>{0}</code> of <code>{1}</code> code completions remaining", completionsRemaining, completionsTotal),
+						].join('\n\n'), { supportHtml: true });
+					}
+
+					return undefined;
+				},
+				markdownNotSupportedFallback: undefined
+			};
 		}
 
 		return {
diff --git a/src/vs/workbench/contrib/chat/common/chatEntitlementsService.ts b/src/vs/workbench/contrib/chat/common/chatEntitlementsService.ts
new file mode 100644
index 000000000000..c0f6f1ce8470
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/chatEntitlementsService.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 { CancellationToken } from '../../../../base/common/cancellation.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+export const IChatEntitlementsService = createDecorator<IChatEntitlementsService>('chatEntitlementsService');
+
+export enum ChatEntitlement {
+	/** Signed out */
+	Unknown = 1,
+	/** Signed in but not yet resolved */
+	Unresolved,
+	/** Signed in and entitled to Limited */
+	Available,
+	/** Signed in but not entitled to Limited */
+	Unavailable,
+	/** Signed-up to Limited */
+	Limited,
+	/** Signed-up to Pro */
+	Pro
+}
+
+export interface IChatEntitlements {
+	readonly entitlement: ChatEntitlement;
+	readonly quotas?: IQuotas;
+}
+
+export interface IQuotas {
+	readonly chatTotal?: number;
+	readonly completionsTotal?: number;
+
+	readonly chatRemaining?: number;
+	readonly completionsRemaining?: number;
+
+	readonly resetDate?: string;
+}
+
+export interface IChatEntitlementsService {
+
+	_serviceBrand: undefined;
+
+	resolve(token: CancellationToken): Promise<IChatEntitlements | undefined>;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatQuotasService.ts b/src/vs/workbench/contrib/chat/common/chatQuotasService.ts
index f8b9eb23fdf3..ac39166487bb 100644
--- a/src/vs/workbench/contrib/chat/common/chatQuotasService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatQuotasService.ts
@@ -15,7 +15,9 @@ export interface IChatQuotasService {
 
 	_serviceBrand: undefined;
 
-	readonly onDidChangeQuotas: Event<void>;
+	readonly onDidChangeQuotaExceeded: Event<void>;
+	readonly onDidChangeQuotaRemaining: Event<void>;
+
 	readonly quotas: IChatQuotas;
 
 	acceptQuotas(quotas: IChatQuotas): void;
@@ -38,8 +40,11 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 
 	declare _serviceBrand: undefined;
 
-	private readonly _onDidChangeQuotas = this._register(new Emitter<void>());
-	readonly onDidChangeQuotas: Event<void> = this._onDidChangeQuotas.event;
+	private readonly _onDidChangeQuotaExceeded = this._register(new Emitter<void>());
+	readonly onDidChangeQuotaExceeded = this._onDidChangeQuotaExceeded.event;
+
+	private readonly _onDidChangeQuotaRemaining = this._register(new Emitter<void>());
+	readonly onDidChangeQuotaRemaining = this._onDidChangeQuotaRemaining.event;
 
 	private _quotas: IChatQuotas = { chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: undefined };
 	get quotas(): IChatQuotas { return this._quotas; }
@@ -84,16 +89,29 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 
 			if (changed) {
 				this.updateContextKeys();
-				this._onDidChangeQuotas.fire();
+				this._onDidChangeQuotaExceeded.fire();
 			}
 		}));
 	}
 
 	acceptQuotas(quotas: IChatQuotas): void {
+		const oldQuota = this._quotas;
 		this._quotas = this.massageQuotas(quotas);
 		this.updateContextKeys();
 
-		this._onDidChangeQuotas.fire();
+		if (
+			oldQuota.chatQuotaExceeded !== this._quotas.chatQuotaExceeded ||
+			oldQuota.completionsQuotaExceeded !== this._quotas.completionsQuotaExceeded
+		) {
+			this._onDidChangeQuotaExceeded.fire();
+		}
+
+		if (
+			oldQuota.chatRemaining !== this._quotas.chatRemaining ||
+			oldQuota.completionsRemaining !== this._quotas.completionsRemaining
+		) {
+			this._onDidChangeQuotaRemaining.fire();
+		}
 	}
 
 	private massageQuotas(quotas: IChatQuotas): IChatQuotas {

From cde4b9f62c799c3892e573586016c121f21f4a4f Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Sat, 22 Feb 2025 08:29:26 -0600
Subject: [PATCH 0269/1815] Merge pull request #241543 from
 microsoft/merogge/filepaths

add `fileExtensions` to terminal completion resource request config
---
 .../src/completions/upstream/apt.ts           |  5 ++---
 .../src/completions/upstream/node.ts          | 11 +++++------
 .../src/completions/upstream/python.ts        | 13 ++++++-------
 .../terminal-suggest/src/fig/figInterface.ts  | 19 +++++++++++++++++--
 .../terminal-suggest/src/helpers/filepaths.ts | 17 +++++++++++++++++
 .../src/terminalSuggestMain.ts                |  8 +++++---
 .../workbench/api/common/extHost.protocol.ts  |  1 +
 src/vs/workbench/api/common/extHostTypes.ts   |  1 +
 .../browser/terminalCompletionService.ts      |  9 +++++++++
 ...e.proposed.terminalCompletionProvider.d.ts |  4 ++++
 10 files changed, 67 insertions(+), 21 deletions(-)
 create mode 100644 extensions/terminal-suggest/src/helpers/filepaths.ts

diff --git a/extensions/terminal-suggest/src/completions/upstream/apt.ts b/extensions/terminal-suggest/src/completions/upstream/apt.ts
index c2157963fd9b..e3ebbb89a0d4 100644
--- a/extensions/terminal-suggest/src/completions/upstream/apt.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/apt.ts
@@ -1,4 +1,4 @@
-// import { filepaths } from "@fig/autocomplete-generators";
+import { filepaths } from '../../helpers/filepaths';
 
 const packages: Fig.Generator = {
 	// only trigger when the token length transitions to or from 0
@@ -134,10 +134,9 @@ const completionSpec: Fig.Spec = {
 				name: "package",
 				description: "The package you want to install",
 				isVariadic: true,
-				template: 'filepaths',
 				generators: [
 					packages,
-					// filepaths({ extensions: ["deb"] })
+					filepaths({ extensions: ["deb"] })
 				],
 			},
 			options: [
diff --git a/extensions/terminal-suggest/src/completions/upstream/node.ts b/extensions/terminal-suggest/src/completions/upstream/node.ts
index bc261c5affe4..b967b8545732 100644
--- a/extensions/terminal-suggest/src/completions/upstream/node.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/node.ts
@@ -1,4 +1,4 @@
-// import { filepaths } from "@fig/autocomplete-generators";
+import { filepaths } from '../../helpers/filepaths';
 
 const completionSpec: Fig.Subcommand = {
 	name: "node",
@@ -6,11 +6,10 @@ const completionSpec: Fig.Subcommand = {
 	args: {
 		name: "node script",
 		isScript: true,
-		template: 'folders',
-		// generators: filepaths({
-		//   extensions: ["mjs", "js", "cjs"],
-		//   editFileSuggestions: { priority: 76 },
-		// }),
+		generators: filepaths({
+			extensions: ["mjs", "js", "cjs"],
+			editFileSuggestions: { priority: 76 },
+		}),
 	},
 	options: [
 		{
diff --git a/extensions/terminal-suggest/src/completions/upstream/python.ts b/extensions/terminal-suggest/src/completions/upstream/python.ts
index c9efa79499d2..947677766b7e 100644
--- a/extensions/terminal-suggest/src/completions/upstream/python.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/python.ts
@@ -1,7 +1,7 @@
-// import { filepaths } from "@fig/autocomplete-generators";
+import { filepaths } from '../../helpers/filepaths';
 
 const completionSpec: Fig.Spec = {
-	name: "python",
+	name: ["python", "python3"],
 	description: "Run the python interpreter",
 	generateSpec: async (tokens, executeShellCommand) => {
 		const isDjangoManagePyFilePresentCommand = "cat manage.py | grep -q django";
@@ -21,11 +21,10 @@ const completionSpec: Fig.Spec = {
 	},
 	args: {
 		name: "python script",
-		template: "filepaths",
-		// generators: filepaths({
-		// 	extensions: ["py"],
-		// 	editFileSuggestions: { priority: 76 },
-		// }),
+		generators: filepaths({
+			extensions: ["py"],
+			editFileSuggestions: { priority: 76 },
+		}),
 	},
 	options: [
 		{
diff --git a/extensions/terminal-suggest/src/fig/figInterface.ts b/extensions/terminal-suggest/src/fig/figInterface.ts
index 9be048ed9b48..df37585394a0 100644
--- a/extensions/terminal-suggest/src/fig/figInterface.ts
+++ b/extensions/terminal-suggest/src/fig/figInterface.ts
@@ -21,6 +21,7 @@ import { IFigExecuteExternals } from './execute';
 export interface IFigSpecSuggestionsResult {
 	filesRequested: boolean;
 	foldersRequested: boolean;
+	fileExtensions?: string[];
 	hasCurrentArg: boolean;
 	items: vscode.TerminalCompletionItem[];
 }
@@ -91,6 +92,7 @@ export async function getFigSuggestions(
 			if (completionItemResult) {
 				result.filesRequested ||= completionItemResult.filesRequested;
 				result.foldersRequested ||= completionItemResult.foldersRequested;
+				result.fileExtensions ||= completionItemResult.fileExtensions;
 				if (completionItemResult.items) {
 					result.items.push(...completionItemResult.items);
 				}
@@ -112,6 +114,7 @@ async function getFigSpecSuggestions(
 ): Promise<IFigSpecSuggestionsResult | undefined> {
 	let filesRequested = false;
 	let foldersRequested = false;
+	let fileExtensions: string[] | undefined;
 
 	const command = getCommand(terminalContext.commandLine, {}, terminalContext.cursorPosition);
 	if (!command || !shellIntegrationCwd) {
@@ -136,11 +139,13 @@ async function getFigSpecSuggestions(
 	if (completionItemResult) {
 		filesRequested = completionItemResult.filesRequested;
 		foldersRequested = completionItemResult.foldersRequested;
+		fileExtensions = completionItemResult.fileExtensions;
 	}
 
 	return {
 		filesRequested,
 		foldersRequested,
+		fileExtensions,
 		hasCurrentArg: !!parsedArguments.currentArg,
 		items: items,
 	};
@@ -157,9 +162,10 @@ export async function collectCompletionItemResult(
 	env: Record<string, string>,
 	items: vscode.TerminalCompletionItem[],
 	executeExternals: IFigExecuteExternals
-): Promise<{ filesRequested: boolean; foldersRequested: boolean } | undefined> {
+): Promise<{ filesRequested: boolean; foldersRequested: boolean; fileExtensions: string[] | undefined } | undefined> {
 	let filesRequested = false;
 	let foldersRequested = false;
+	let fileExtensions: string[] | undefined;
 
 	const addSuggestions = async (specArgs: SpecArg[] | Record<string, SpecArg> | undefined, kind: vscode.TerminalCompletionItemKind, parsedArguments?: ArgumentParserResult) => {
 		if (kind === vscode.TerminalCompletionItemKind.Argument && parsedArguments?.currentArg?.generators) {
@@ -199,6 +205,15 @@ export async function collectCompletionItemResult(
 			const generatorResults = s.triggerGenerators(parsedArguments, executeExternals);
 			for (const generatorResult of generatorResults) {
 				for (const item of (await generatorResult?.request) ?? []) {
+					if (item.type === 'file') {
+						filesRequested = true;
+						foldersRequested = true;
+						fileExtensions = item._internal?.fileExtensions as string[] | undefined;
+					}
+					if (item.type === 'folder') {
+						foldersRequested = true;
+					}
+
 					if (!item.name) {
 						continue;
 					}
@@ -288,7 +303,7 @@ export async function collectCompletionItemResult(
 		await addSuggestions(parsedArguments.completionObj.options, vscode.TerminalCompletionItemKind.Flag, parsedArguments);
 	}
 
-	return { filesRequested, foldersRequested };
+	return { filesRequested, foldersRequested, fileExtensions };
 }
 
 function convertEnvRecordToArray(env: Record<string, string>): EnvironmentVariable[] {
diff --git a/extensions/terminal-suggest/src/helpers/filepaths.ts b/extensions/terminal-suggest/src/helpers/filepaths.ts
new file mode 100644
index 000000000000..ff35aae22556
--- /dev/null
+++ b/extensions/terminal-suggest/src/helpers/filepaths.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 function filepaths(options: { extensions?: string[]; editFileSuggestions?: { priority: number } }): Fig.Generator {
+	return {
+		custom: async (tokens, executeCommand, generatorContext) => {
+			const fileExtensionsMap: Record<string, string[]> = { fileExtensions: options.extensions || [] };
+			return [{ type: 'file', _internal: fileExtensionsMap }, { type: 'folder' }];
+		},
+		trigger: (oldToken, newToken) => {
+			return true;
+		},
+		getQueryTerm: (token) => token
+	};
+}
diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 6e7ba74aedb9..addfe8aee81d 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -120,7 +120,7 @@ export async function activate(context: vscode.ExtensionContext) {
 			}
 
 			if (result.cwd && (result.filesRequested || result.foldersRequested)) {
-				return new vscode.TerminalCompletionList(result.items, { filesRequested: result.filesRequested, foldersRequested: result.foldersRequested, cwd: result.cwd, env: terminal.shellIntegration?.env.value });
+				return new vscode.TerminalCompletionList(result.items, { filesRequested: result.filesRequested, foldersRequested: result.foldersRequested, fileExtensions: result.fileExtensions, cwd: result.cwd, env: terminal.shellIntegration?.env.value });
 			}
 			return result.items;
 		}
@@ -209,11 +209,12 @@ export async function getCompletionItemsFromSpecs(
 	name: string,
 	token?: vscode.CancellationToken,
 	executeExternals?: IFigExecuteExternals,
-): Promise<{ items: vscode.TerminalCompletionItem[]; filesRequested: boolean; foldersRequested: boolean; cwd?: vscode.Uri }> {
+): Promise<{ items: vscode.TerminalCompletionItem[]; filesRequested: boolean; foldersRequested: boolean; fileExtensions?: string[]; cwd?: vscode.Uri }> {
 	const items: vscode.TerminalCompletionItem[] = [];
 	let filesRequested = false;
 	let foldersRequested = false;
 	let hasCurrentArg = false;
+	let fileExtensions: string[] | undefined;
 
 	let precedingText = terminalContext.commandLine.slice(0, terminalContext.cursorPosition + 1);
 	if (isWindows) {
@@ -230,6 +231,7 @@ export async function getCompletionItemsFromSpecs(
 		hasCurrentArg ||= result.hasCurrentArg;
 		filesRequested ||= result.filesRequested;
 		foldersRequested ||= result.foldersRequested;
+		fileExtensions = result.fileExtensions;
 		if (result.items) {
 			items.push(...result.items);
 		}
@@ -276,7 +278,7 @@ export async function getCompletionItemsFromSpecs(
 		cwd = await resolveCwdFromPrefix(prefix, shellIntegrationCwd) ?? shellIntegrationCwd;
 	}
 
-	return { items, filesRequested, foldersRequested, cwd };
+	return { items, filesRequested, foldersRequested, fileExtensions, cwd };
 }
 
 function compareItems(existingItem: vscode.TerminalCompletionItem, command: ICompletionResource): vscode.TerminalCompletionItem | undefined {
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index ad532fcdcb04..6654da09e906 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -2480,6 +2480,7 @@ export class TerminalCompletionListDto<T extends ITerminalCompletionItemDto = IT
 export interface TerminalResourceRequestConfigDto {
 	filesRequested?: boolean;
 	foldersRequested?: boolean;
+	fileExtensions?: string[];
 	cwd?: UriComponents;
 	pathSeparator: string;
 }
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index 75d1061cfccd..d05e0b628b0d 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -2202,6 +2202,7 @@ export class TerminalCompletionList<T extends TerminalCompletionItem = TerminalC
 export interface TerminalResourceRequestConfig {
 	filesRequested?: boolean;
 	foldersRequested?: boolean;
+	fileExtensions?: string[];
 	cwd?: vscode.Uri;
 }
 
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
index c29b2a57d48f..5dd7147ef305 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
@@ -50,6 +50,7 @@ export class TerminalCompletionList<ITerminalCompletion> {
 export interface TerminalResourceRequestConfig {
 	filesRequested?: boolean;
 	foldersRequested?: boolean;
+	fileExtensions?: string[];
 	cwd?: UriComponents;
 	pathSeparator: string;
 	env?: { [key: string]: string | null | undefined };
@@ -209,6 +210,7 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 		// provide diagnostics when a folder is provided where a file is expected.
 		const foldersRequested = (resourceRequestConfig.foldersRequested || resourceRequestConfig.filesRequested) ?? false;
 		const filesRequested = resourceRequestConfig.filesRequested ?? false;
+		const fileExtensions = resourceRequestConfig.fileExtensions ?? undefined;
 
 		const cwd = URI.revive(resourceRequestConfig.cwd);
 		if (!cwd || (!foldersRequested && !filesRequested)) {
@@ -378,6 +380,13 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 				label += resourceRequestConfig.pathSeparator;
 			}
 
+			if (child.isFile && fileExtensions) {
+				const extension = child.name.split('.').length > 1 ? child.name.split('.').at(-1) : undefined;
+				if (extension && !fileExtensions.includes(extension)) {
+					continue;
+				}
+			}
+
 			resourceCompletions.push({
 				label,
 				provider,
diff --git a/src/vscode-dts/vscode.proposed.terminalCompletionProvider.d.ts b/src/vscode-dts/vscode.proposed.terminalCompletionProvider.d.ts
index 86c542f20873..9b7f0edf856b 100644
--- a/src/vscode-dts/vscode.proposed.terminalCompletionProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.terminalCompletionProvider.d.ts
@@ -126,6 +126,10 @@ declare module 'vscode' {
 		 * Show folders as completion items.
 		 */
 		foldersRequested?: boolean;
+		/**
+		 * File extensions to filter by.
+		 */
+		fileExtensions?: string[];
 		/**
 		 * If no cwd is provided, no resources will be shown as completions.
 		 */

From 08bdd9345031a70b7da371389b6a630b9fdb0ba5 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sat, 22 Feb 2025 06:18:58 -0800
Subject: [PATCH 0270/1815] Add python3 spec

---
 .../src/completions/upstream/python.ts        |   2 +-
 .../src/completions/upstream/python3.ts       | 170 ++++++++++++++++++
 extensions/terminal-suggest/src/constants.ts  |   1 +
 3 files changed, 172 insertions(+), 1 deletion(-)
 create mode 100644 extensions/terminal-suggest/src/completions/upstream/python3.ts

diff --git a/extensions/terminal-suggest/src/completions/upstream/python.ts b/extensions/terminal-suggest/src/completions/upstream/python.ts
index 947677766b7e..2374ee6b5e89 100644
--- a/extensions/terminal-suggest/src/completions/upstream/python.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/python.ts
@@ -1,7 +1,7 @@
 import { filepaths } from '../../helpers/filepaths';
 
 const completionSpec: Fig.Spec = {
-	name: ["python", "python3"],
+	name: "python",
 	description: "Run the python interpreter",
 	generateSpec: async (tokens, executeShellCommand) => {
 		const isDjangoManagePyFilePresentCommand = "cat manage.py | grep -q django";
diff --git a/extensions/terminal-suggest/src/completions/upstream/python3.ts b/extensions/terminal-suggest/src/completions/upstream/python3.ts
new file mode 100644
index 000000000000..7e08e0a20f90
--- /dev/null
+++ b/extensions/terminal-suggest/src/completions/upstream/python3.ts
@@ -0,0 +1,170 @@
+import { filepaths } from '../../helpers/filepaths';
+
+const completionSpec: Fig.Spec = {
+	name: "python3",
+	description: "Run the python interpreter",
+	generateSpec: async (tokens, executeShellCommand) => {
+		const isDjangoManagePyFilePresentCommand = "cat manage.py | grep -q django";
+
+		if (
+			(
+				await executeShellCommand({
+					command: "bash",
+					args: ["-c", isDjangoManagePyFilePresentCommand],
+				})
+			).status === 0
+		) {
+			return {
+				name: "python3",
+				subcommands: [{ name: "manage.py", loadSpec: "django-admin" }],
+			};
+		}
+	},
+	args: {
+		name: "python script",
+		isScript: true,
+		generators: filepaths({
+			extensions: ["py"],
+			editFileSuggestions: { priority: 76 },
+		}),
+	},
+	options: [
+		{
+			name: "-c",
+			insertValue: "-c '{cursor}'",
+			description:
+				"Execute the Python code in command. command can be one or more statements separated by newlines, with significant leading whitespace as in normal module code",
+			args: {
+				name: "command",
+				isCommand: true,
+			},
+		},
+		{
+			name: "-m",
+			insertValue: "-m '{cursor}'",
+			description:
+				"Search sys.path for the named module and execute its contents as the __main__ module",
+			args: {
+				name: "command",
+				isCommand: true,
+			},
+		},
+		{
+			name: ["-?", "-h", "--help"],
+			description: "Print a short description of all command line options",
+		},
+		{
+			name: ["-V", "--version"],
+			description: "Print the Python version number and exit",
+		},
+		{
+			name: "-b",
+			description:
+				"Issue a warning when comparing bytes or bytearray with str or bytes with int. Issue an error when the option is given twice (-bb)",
+		},
+		{
+			name: "-B",
+			description:
+				"If given, Python won’t try to write .pyc files on the import of source modules",
+		},
+		{
+			name: "--check-hash-based-pycs",
+			description:
+				"Control the validation behavior of hash-based .pyc files. See Cached bytecode invalidation",
+			args: {
+				suggestions: [
+					{ name: "default" },
+					{ name: "always" },
+					{ name: "never" },
+				],
+			},
+		},
+		{
+			name: "-d",
+			description:
+				"Turn on parser debugging output (for expert only, depending on compilation options)",
+		},
+		{
+			name: "-E",
+			description:
+				"Ignore all PYTHON* environment variables, e.g. PYTHONPATH and PYTHONHOME, that might be set",
+		},
+		{
+			name: "-i",
+			description:
+				"When a script is passed as first argument or the -c option is used, enter interactive mode after executing the script or the command, even when sys.stdin does not appear to be a terminal",
+		},
+		{
+			name: "-I",
+			description:
+				"Run Python in isolated mode. This also implies -E and -s. In isolated mode sys.path contains neither the script’s directory nor the user’s site-packages directory",
+		},
+		{
+			name: "-O",
+			description:
+				"Remove assert statements and any code conditional on the value of __debug__",
+		},
+		{
+			name: "-OO",
+			description: "Do -O and also discard docstrings",
+		},
+		{
+			name: "-g",
+			description:
+				"Don’t display the copyright and version messages even in interactive mode",
+		},
+		{
+			name: "-R",
+			description:
+				"Turn on hash randomization. This option only has an effect if the PYTHONHASHSEED environment variable is set to 0, since hash randomization is enabled by default",
+		},
+		{
+			name: "-s",
+			description: "Don’t add the user site-packages directory to sys.path",
+		},
+		{
+			name: "-S",
+			description:
+				"Disable the import of the module site and the site-dependent manipulations of sys.path that it entails",
+		},
+		{
+			name: "-u",
+			description:
+				"Force the stdout and stderr streams to be unbuffered. This option has no effect on the stdin stream",
+		},
+		{
+			name: "-v",
+			description:
+				"Print a message each time a module is initialized, showing the place (filename or built-in module) from which it is loaded",
+		},
+		{
+			name: "-W",
+			description:
+				"Warning control. Python’s warning machinery by default prints warning messages to sys.stderr",
+			args: {},
+		},
+		{
+			name: "-x",
+			description:
+				"Skip the first line of the source, allowing use of non-Unix forms of #!cmd. This is intended for a DOS specific hack only",
+		},
+		{
+			name: "-X",
+			description: "Reserved for various implementation-specific options",
+			args: {
+				suggestions: [
+					{ name: "faulthandler" },
+					{ name: "showrefcount" },
+					{ name: "tracemalloc" },
+					{ name: "showalloccount" },
+					{ name: "importtime" },
+					{ name: "dev" },
+					{ name: "utf8" },
+					{ name: "pycache_prefix=PATH" },
+				],
+			},
+		},
+	],
+};
+
+export default completionSpec;
diff --git a/extensions/terminal-suggest/src/constants.ts b/extensions/terminal-suggest/src/constants.ts
index 8f04abc5fe63..91e0dfa107a3 100644
--- a/extensions/terminal-suggest/src/constants.ts
+++ b/extensions/terminal-suggest/src/constants.ts
@@ -42,6 +42,7 @@ export const upstreamSpecs = [
 	'npm',
 	'yarn',
 	'python',
+	'python3',
 	'pnpm',
 	'node',
 	'nvm',

From 3331655f534f0535b72deafc77afb791e6897b42 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sat, 22 Feb 2025 06:45:12 -0800
Subject: [PATCH 0271/1815] Replace imports on update-specs

---
 .../terminal-suggest/scripts/update-specs.js     | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/extensions/terminal-suggest/scripts/update-specs.js b/extensions/terminal-suggest/scripts/update-specs.js
index 3573c6664d6d..5f6e0ec5717a 100644
--- a/extensions/terminal-suggest/scripts/update-specs.js
+++ b/extensions/terminal-suggest/scripts/update-specs.js
@@ -3,14 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+// @ts-check
+
 const fs = require('fs');
 const path = require('path');
 
 const upstreamSpecs = require('../out/constants.js').upstreamSpecs;
-
 const extRoot = path.resolve(path.join(__dirname, '..'));
+const replaceStrings = [
+	[
+		'import { filepaths } from "@fig/autocomplete-generators";',
+		'import { filepaths } from \'../../helpers/filepaths\';'
+	]
+]
+
 for (const spec of upstreamSpecs) {
 	const source = path.join(extRoot, `third_party/autocomplete/src/${spec}.ts`);
 	const destination = path.join(extRoot, `src/completions/upstream/${spec}.ts`);
 	fs.copyFileSync(source, destination);
+
+	let content = fs.readFileSync(destination).toString();
+	for (const replaceString of replaceStrings) {
+		content = content.replaceAll(replaceString[0], replaceString[1]);
+	}
+	fs.writeFileSync(destination, content);
 }

From 29b0e1fe3af9936e158eab3ef186174482ed08d1 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sat, 22 Feb 2025 07:26:18 -0800
Subject: [PATCH 0272/1815] Add set-location spec for pwsh

Without this, there are no file/folder completions when the quickSuggestions
setting has unknown as off (default).

Fixes #241583
---
 .../src/completions/set-location.ts           | 27 +++++++++++++++++++
 .../src/terminalSuggestMain.ts                |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 extensions/terminal-suggest/src/completions/set-location.ts

diff --git a/extensions/terminal-suggest/src/completions/set-location.ts b/extensions/terminal-suggest/src/completions/set-location.ts
new file mode 100644
index 000000000000..56344911132b
--- /dev/null
+++ b/extensions/terminal-suggest/src/completions/set-location.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.
+ *--------------------------------------------------------------------------------------------*/
+
+const cdSpec: Fig.Spec = {
+	name: 'Set-Location',
+	description: 'Change the shell working directory',
+	args: {
+		name: 'folder',
+		template: 'folders',
+		suggestions: [
+			{
+				name: '-',
+				description: 'Go to previous directory',
+				hidden: true,
+			},
+			{
+				name: '+',
+				description: 'Go to next directory',
+				hidden: true,
+			},
+		],
+	}
+};
+
+export default cdSpec;
diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index addfe8aee81d..7f6de0e71d44 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -10,6 +10,7 @@ import * as vscode from 'vscode';
 import cdSpec from './completions/cd';
 import codeCompletionSpec from './completions/code';
 import codeInsidersCompletionSpec from './completions/code-insiders';
+import setLocationSpec from './completions/set-location';
 import { upstreamSpecs } from './constants';
 import { PathExecutableCache } from './env/pathExecutableCache';
 import { osIsWindows } from './helpers/os';
@@ -49,6 +50,7 @@ export const availableSpecs: Fig.Spec[] = [
 	cdSpec,
 	codeInsidersCompletionSpec,
 	codeCompletionSpec,
+	setLocationSpec,
 ];
 for (const spec of upstreamSpecs) {
 	availableSpecs.push(require(`./completions/upstream/${spec}`).default);

From 2a96971a95722bed4954cba1ce8f10daeb958f5c Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sat, 22 Feb 2025 07:27:46 -0800
Subject: [PATCH 0273/1815] Explain cd -/+ in set-location better

---
 extensions/terminal-suggest/src/completions/set-location.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/terminal-suggest/src/completions/set-location.ts b/extensions/terminal-suggest/src/completions/set-location.ts
index 56344911132b..ae550d6fb992 100644
--- a/extensions/terminal-suggest/src/completions/set-location.ts
+++ b/extensions/terminal-suggest/src/completions/set-location.ts
@@ -12,12 +12,12 @@ const cdSpec: Fig.Spec = {
 		suggestions: [
 			{
 				name: '-',
-				description: 'Go to previous directory',
+				description: 'Go to previous directory in history stack',
 				hidden: true,
 			},
 			{
 				name: '+',
-				description: 'Go to next directory',
+				description: 'Go to next directory in history stack',
 				hidden: true,
 			},
 		],

From edfcc410edfe21e9aa9bf9745b80e3efea681482 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sat, 22 Feb 2025 07:43:53 -0800
Subject: [PATCH 0274/1815] Correct flag -> method completion kind

---
 extensions/terminal-suggest/src/fig/figInterface.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/extensions/terminal-suggest/src/fig/figInterface.ts b/extensions/terminal-suggest/src/fig/figInterface.ts
index 0df5b96d3963..6f746627adc8 100644
--- a/extensions/terminal-suggest/src/fig/figInterface.ts
+++ b/extensions/terminal-suggest/src/fig/figInterface.ts
@@ -68,10 +68,13 @@ export async function getFigSuggestions(
 					result.items.push(createCompletionItem(
 						terminalContext.cursorPosition,
 						prefix,
-						{ label: { label: specLabel, description }, kind: vscode.TerminalCompletionItemKind.Flag },
+						{
+							label: { label: specLabel, description },
+							kind: vscode.TerminalCompletionItemKind.Method
+						},
 						description,
-						availableCommand.detail)
-					);
+						availableCommand.detail
+					));
 				}
 				continue;
 			}

From 300cf3addaccff57f4f0bd5deb9acd44c43870d8 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sat, 22 Feb 2025 07:59:15 -0800
Subject: [PATCH 0275/1815] Restore margin on terminal in confirmation widget
 (#241585)

---
 src/vs/workbench/contrib/chat/browser/media/chat.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index d38067912ab2..6072276af192 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -370,7 +370,7 @@
 		margin: 0 0 6px 0;
 	}
 
-	.rendered-markdown [data-code] {
+	.progress-container .rendered-markdown [data-code] {
 		margin: 0;
 	}
 

From 42f728419cbad5952f1e14e1ba6d9917c58b9b75 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sat, 22 Feb 2025 08:02:17 -0800
Subject: [PATCH 0276/1815] Clean up adding items and classifying options and
 option values

---
 .../terminal-suggest/src/fig/figInterface.ts  | 59 +++++++++----------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/extensions/terminal-suggest/src/fig/figInterface.ts b/extensions/terminal-suggest/src/fig/figInterface.ts
index 6f746627adc8..1e283e463559 100644
--- a/extensions/terminal-suggest/src/fig/figInterface.ts
+++ b/extensions/terminal-suggest/src/fig/figInterface.ts
@@ -256,51 +256,46 @@ export async function collectCompletionItemResult(
 			return { filesRequested, foldersRequested };
 		}
 		const flagsToExclude = kind === vscode.TerminalCompletionItemKind.Flag ? parsedArguments?.passedOptions.map(option => option.name).flat() : undefined;
-		if (Array.isArray(specArgs)) {
+
+		function addItem(label: string, item: SpecArg) {
+			if (flagsToExclude?.includes(label)) {
+				return;
+			}
+
 			let itemKind = kind;
-			if (parsedArguments?.currentArg?.suggestions?.length === specArgs.length) {
+			if (typeof item === 'object' && 'args' in item && (asArray(item.args ?? [])).length > 0) {
+				itemKind = vscode.TerminalCompletionItemKind.Option;
+			}
+			const lastArgType: string | undefined = parsedArguments?.annotations.at(-1)?.type;
+			if (lastArgType === 'option_arg') {
 				itemKind = vscode.TerminalCompletionItemKind.OptionValue;
 			}
+
+			items.push(
+				createCompletionItem(
+					terminalContext.cursorPosition,
+					prefix,
+					{ label },
+					undefined,
+					typeof item === 'string' ? item : item.description,
+					itemKind,
+				)
+			);
+		}
+
+		if (Array.isArray(specArgs)) {
 			for (const item of specArgs) {
 				const suggestionLabels = getFigSuggestionLabel(item);
 				if (!suggestionLabels?.length) {
 					continue;
 				}
 				for (const label of suggestionLabels) {
-					if (flagsToExclude?.includes(label)) {
-						continue;
-					}
-					items.push(
-						createCompletionItem(
-							terminalContext.cursorPosition,
-							prefix,
-							{ label },
-							undefined,
-							typeof item === 'string' ? item : item.description,
-							itemKind
-						)
-					);
+					addItem(label, item);
 				}
 			}
 		} else {
 			for (const [label, item] of Object.entries(specArgs)) {
-				if (flagsToExclude?.includes(label)) {
-					continue;
-				}
-				let itemKind = kind;
-				if (typeof item === 'object' && 'args' in item && (asArray(item.args ?? [])).length > 0) {
-					itemKind = vscode.TerminalCompletionItemKind.Option;
-				}
-				items.push(
-					createCompletionItem(
-						terminalContext.cursorPosition,
-						prefix,
-						{ label },
-						undefined,
-						typeof item === 'string' ? item : item.description,
-						itemKind,
-					)
-				);
+				addItem(label, item);
 			}
 		}
 	};

From 9a81630638d2ce8ac737ae29f716f24fa799dc8c Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sat, 22 Feb 2025 08:25:15 -0800
Subject: [PATCH 0277/1815] Polish trigger/quick suggestions and when the
 widget is hidden

Fixes #241587
---
 .../suggest/browser/terminalSuggestAddon.ts   | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index 77010a1a3830..3d927fbefb6b 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -343,6 +343,18 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		await this._handleCompletionProviders(this._terminal, token, explicitlyInvoked);
 	}
 
+	private _requestTriggerCharQuickSuggestCompletions(): boolean {
+		if (!this._wasLastInputVerticalArrowKey()) {
+			// Only request on trigger character when it's a regular input, or on an arrow if the widget
+			// is already visible
+			if (!this._wasLastInputArrowKey() || this._terminalSuggestWidgetVisibleContextKey.get()) {
+				this.requestCompletions();
+				return true;
+			}
+		}
+		return false;
+	}
+
 	private _wasLastInputRightArrowKey(): boolean {
 		return !!this._lastUserData?.match(/^\x1b[\[O]?C$/);
 	}
@@ -373,10 +385,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 						(typeof config.quickSuggestions === 'object' && commandLineHasSpace && config.quickSuggestions.arguments !== 'off')
 					) {
 						if (promptInputState.prefix.match(/[^\s]$/)) {
-							if (!this._wasLastInputArrowKey()) {
-								this.requestCompletions();
-								sent = true;
-							}
+							sent = this._requestTriggerCharQuickSuggestCompletions();
 						}
 					}
 				}
@@ -392,10 +401,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 						// with git branches in particular
 						this._isFilteringDirectories && prefix?.match(/[\\\/]$/)
 					) {
-						if (!this._wasLastInputVerticalArrowKey()) {
-							this.requestCompletions();
-							sent = true;
-						}
+						sent = this._requestTriggerCharQuickSuggestCompletions();
 					}
 					if (!sent) {
 						for (const provider of this._terminalCompletionService.providers) {
@@ -404,10 +410,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 							}
 							for (const char of provider.triggerCharacters) {
 								if (prefix?.endsWith(char)) {
-									if (!this._wasLastInputVerticalArrowKey()) {
-										this.requestCompletions();
-										sent = true;
-									}
+									sent = this._requestTriggerCharQuickSuggestCompletions();
 									break;
 								}
 							}
@@ -426,10 +429,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 						// with git branches in particular
 						this._isFilteringDirectories && char.match(/[\\\/]$/)
 					) {
-						if (!this._wasLastInputVerticalArrowKey()) {
-							this.requestCompletions();
-							sent = true;
-						}
+						sent = this._requestTriggerCharQuickSuggestCompletions();
 					}
 				}
 			}
@@ -450,12 +450,15 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			return;
 		}
 
+		const previousPromptInputState = this._currentPromptInputState;
 		this._currentPromptInputState = promptInputState;
 
 		// Hide the widget if the latest character was a space
 		if (this._currentPromptInputState.cursorIndex > 1 && this._currentPromptInputState.value.at(this._currentPromptInputState.cursorIndex - 1) === ' ') {
-			this.hideSuggestWidget(false);
-			return;
+			if (!this._wasLastInputArrowKey()) {
+				this.hideSuggestWidget(false);
+				return;
+			}
 		}
 
 		// Hide the widget if the cursor moves to the left and invalidates the completions.
@@ -463,7 +466,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		// requested, but since extensions are expected to allow the client-side to filter, they are
 		// only invalidated when whitespace is encountered.
 		if (this._currentPromptInputState && this._currentPromptInputState.cursorIndex < this._leadingLineContent.length) {
-			if (this._currentPromptInputState.cursorIndex <= 0 || this._currentPromptInputState.value[this._currentPromptInputState.cursorIndex]?.match(/[\\\/\s]/)) {
+			if (this._currentPromptInputState.cursorIndex <= 0 || previousPromptInputState?.value[this._currentPromptInputState.cursorIndex]?.match(/[\\\/\s]/)) {
 				this.hideSuggestWidget(false);
 				return;
 			}

From 7cc14fc51c0895950ebb1894f463580e1b864ac1 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sat, 22 Feb 2025 08:33:48 -0800
Subject: [PATCH 0278/1815] Handle no environment reporting properly

We need to differentiate undefined (no env reporting ever) and an empty
environment (env was reported, but maybe incomplete).

Fixes #241504
---
 extensions/terminal-suggest/src/terminalSuggestMain.ts      | 6 +++---
 .../workbench/api/common/extHostTerminalShellIntegration.ts | 4 ++--
 src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index addfe8aee81d..563b85e8a4ea 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -100,7 +100,7 @@ export async function activate(context: vscode.ExtensionContext) {
 				return;
 			}
 
-			const commandsInPath = await pathExecutableCache.getExecutablesInPath(terminal.shellIntegration?.env.value);
+			const commandsInPath = await pathExecutableCache.getExecutablesInPath(terminal.shellIntegration?.env?.value);
 			const shellGlobals = await getShellGlobals(shellType, commandsInPath?.labels) ?? [];
 			if (!commandsInPath?.completionResources) {
 				return;
@@ -110,7 +110,7 @@ export async function activate(context: vscode.ExtensionContext) {
 			const prefix = getPrefix(terminalContext.commandLine, terminalContext.cursorPosition);
 			const pathSeparator = isWindows ? '\\' : '/';
 			const tokenType = getTokenType(terminalContext, shellType);
-			const result = await getCompletionItemsFromSpecs(availableSpecs, terminalContext, commands, prefix, tokenType, terminal.shellIntegration?.cwd, getEnvAsRecord(terminal.shellIntegration?.env.value), terminal.name, token);
+			const result = await getCompletionItemsFromSpecs(availableSpecs, terminalContext, commands, prefix, tokenType, terminal.shellIntegration?.cwd, getEnvAsRecord(terminal.shellIntegration?.env?.value), terminal.name, token);
 			if (terminal.shellIntegration?.env) {
 				const homeDirCompletion = result.items.find(i => i.label === '~');
 				if (homeDirCompletion && terminal.shellIntegration.env?.value?.HOME) {
@@ -120,7 +120,7 @@ export async function activate(context: vscode.ExtensionContext) {
 			}
 
 			if (result.cwd && (result.filesRequested || result.foldersRequested)) {
-				return new vscode.TerminalCompletionList(result.items, { filesRequested: result.filesRequested, foldersRequested: result.foldersRequested, fileExtensions: result.fileExtensions, cwd: result.cwd, env: terminal.shellIntegration?.env.value });
+				return new vscode.TerminalCompletionList(result.items, { filesRequested: result.filesRequested, foldersRequested: result.foldersRequested, fileExtensions: result.fileExtensions, cwd: result.cwd, env: terminal.shellIntegration?.env?.value });
 			}
 			return result.items;
 		}
diff --git a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
index 98620f6a363b..684782ee8969 100644
--- a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
@@ -151,7 +151,7 @@ class InternalTerminalShellIntegration extends Disposable {
 	get currentExecution(): InternalTerminalShellExecution | undefined { return this._currentExecution; }
 
 	private _ignoreNextExecution: boolean = false;
-	private _env: vscode.TerminalShellIntegrationEnvironment = { value: {}, isTrusted: false };
+	private _env: vscode.TerminalShellIntegrationEnvironment | undefined;
 	private _cwd: URI | undefined;
 
 	readonly store: DisposableStore = this._register(new DisposableStore());
@@ -176,7 +176,7 @@ class InternalTerminalShellIntegration extends Disposable {
 			get cwd(): URI | undefined {
 				return that._cwd;
 			},
-			get env(): vscode.TerminalShellIntegrationEnvironment {
+			get env(): vscode.TerminalShellIntegrationEnvironment | undefined {
 				return that._env;
 			},
 			// executeCommand(commandLine: string): vscode.TerminalShellExecution;
diff --git a/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts b/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts
index f3724313bee7..ff3ea00e7659 100644
--- a/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts
+++ b/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts
@@ -29,7 +29,7 @@ declare module 'vscode' {
 		 * The environment of the shell process. This is undefined if the shell integration script
 		 * does not send the environment.
 		 */
-		readonly env: TerminalShellIntegrationEnvironment;
+		readonly env: TerminalShellIntegrationEnvironment | undefined;
 	}
 
 	// TODO: Is it fine that this shares onDidChangeTerminalShellIntegration with cwd and the shellIntegration object itself?

From 904587908c332cea5675e3d47ce6994f2cdbc2e7 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sat, 22 Feb 2025 20:30:12 +0100
Subject: [PATCH 0279/1815] unblock build (skip tests) (#241591)

---
 .../src/singlefolder-tests/terminal.shellIntegration.test.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
index d5d84c58f4df..c40710763191 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
@@ -164,7 +164,7 @@ import { assertNoRpc } from '../utils';
 		await closeTerminalAsync(terminal);
 	});
 
-	test('TerminalShellExecution.read events should fire with contents of command', async () => {
+	test.skip('TerminalShellExecution.read events should fire with contents of command', async () => {
 		const { terminal, shellIntegration } = await createTerminalAndWaitForShellIntegration();
 		const events: string[] = [];
 
@@ -179,7 +179,7 @@ import { assertNoRpc } from '../utils';
 		await closeTerminalAsync(terminal);
 	});
 
-	test('TerminalShellExecution.read events should give separate iterables per call', async () => {
+	test.skip('TerminalShellExecution.read events should give separate iterables per call', async () => {
 		const { terminal, shellIntegration } = await createTerminalAndWaitForShellIntegration();
 
 		const { execution, endEvent } = executeCommandAsync(shellIntegration, 'echo hello');

From 8cfb2b0e6c8dd80523711236d89dbead0338420b Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sat, 22 Feb 2025 20:30:46 +0100
Subject: [PATCH 0280/1815] status - dynamic hover delay based on content
 (#241590)

* status - dynamic hover delay based on content

* fix tests
---
 src/vs/base/browser/ui/hover/hoverDelegate.ts |  4 ++--
 .../services/hoverService/hoverService.ts     |  4 ++--
 .../diffEditor/features/gutterFeature.ts      |  2 +-
 .../hover/browser/markdownHoverParticipant.ts |  2 +-
 .../browser/standaloneCodeEditor.ts           |  2 +-
 src/vs/platform/hover/browser/hover.ts        | 22 ++++++++++++++-----
 .../platform/quickinput/browser/quickInput.ts |  2 +-
 .../quickinput/browser/quickInputTree.ts      |  2 +-
 .../browser/parts/statusbar/statusbarPart.ts  | 16 ++++++++++++--
 .../workbench/browser/parts/views/treeView.ts |  2 +-
 src/vs/workbench/browser/workbench.ts         |  2 +-
 .../viewParts/notebookEditorToolbar.ts        |  2 +-
 .../contrib/scm/browser/scmHistoryViewPane.ts |  2 +-
 .../contrib/timeline/browser/timelinePane.ts  |  2 +-
 .../browser/userDataProfilesEditor.ts         |  2 +-
 15 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/vs/base/browser/ui/hover/hoverDelegate.ts b/src/vs/base/browser/ui/hover/hoverDelegate.ts
index 31ec93f727ae..cfb87d1ac348 100644
--- a/src/vs/base/browser/ui/hover/hoverDelegate.ts
+++ b/src/vs/base/browser/ui/hover/hoverDelegate.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { IHoverWidget, IManagedHoverOptions } from './hover.js';
+import type { IHoverWidget, IManagedHoverContentOrFactory, IManagedHoverOptions } from './hover.js';
 import { HoverPosition } from './hoverWidget.js';
 import { IMarkdownString } from '../../../common/htmlContent.js';
 import { IDisposable } from '../../../common/lifecycle.js';
@@ -67,7 +67,7 @@ export interface IHoverDelegateOptions extends IManagedHoverOptions {
 export interface IHoverDelegate {
 	showHover(options: IHoverDelegateOptions, focus?: boolean): IHoverWidget | undefined;
 	onDidHideHover?: () => void;
-	delay: number;
+	delay: number | ((content?: IManagedHoverContentOrFactory) => number);
 	placement?: 'mouse' | 'element';
 	showNativeHover?: boolean; // TODO@benibenj remove this, only temp fix for contextviews
 }
diff --git a/src/vs/editor/browser/services/hoverService/hoverService.ts b/src/vs/editor/browser/services/hoverService/hoverService.ts
index 83b8c5d2276a..7d249eb7065f 100644
--- a/src/vs/editor/browser/services/hoverService/hoverService.ts
+++ b/src/vs/editor/browser/services/hoverService/hoverService.ts
@@ -440,7 +440,7 @@ export class HoverService extends Disposable implements IHoverService {
 				return; // Do not show hover when the mouse is over another hover target
 			}
 
-			mouseOverStore.add(triggerShowHover(hoverDelegate.delay, false, target));
+			mouseOverStore.add(triggerShowHover(typeof hoverDelegate.delay === 'function' ? hoverDelegate.delay(content) : hoverDelegate.delay, false, target));
 		}, true));
 
 		const onFocus = () => {
@@ -454,7 +454,7 @@ export class HoverService extends Disposable implements IHoverService {
 			const toDispose: DisposableStore = new DisposableStore();
 			const onBlur = () => hideHover(true, true);
 			toDispose.add(addDisposableListener(targetElement, EventType.BLUR, onBlur, true));
-			toDispose.add(triggerShowHover(hoverDelegate.delay, false, target));
+			toDispose.add(triggerShowHover(typeof hoverDelegate.delay === 'function' ? hoverDelegate.delay(content) : hoverDelegate.delay, false, target));
 			hoverPreparation = toDispose;
 		};
 
diff --git a/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.ts b/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.ts
index a9aaeab304d5..0d8b665b9e46 100644
--- a/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.ts
+++ b/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.ts
@@ -218,7 +218,7 @@ class DiffToolBar extends Disposable implements IGutterItemView {
 		const hoverDelegate = this._register(instantiationService.createInstance(
 			WorkbenchHoverDelegate,
 			'element',
-			true,
+			{ instantHover: true },
 			{ position: { hoverPosition: HoverPosition.RIGHT } }
 		));
 
diff --git a/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts b/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
index bc663ef46bb6..03b585a99b10 100644
--- a/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
+++ b/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
@@ -327,7 +327,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', false, { target: container, position: { hoverPosition: HoverPosition.LEFT } }, this._configurationService, this._hoverService);
+		const hoverDelegate = 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');
diff --git a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
index 2b7abea38c13..dffab646d2b4 100644
--- a/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
+++ b/src/vs/editor/standalone/browser/standaloneCodeEditor.ts
@@ -293,7 +293,7 @@ export class StandaloneCodeEditor extends CodeEditorWidget implements IStandalon
 
 		createAriaDomNode(options.ariaContainerElement);
 
-		setHoverDelegateFactory((placement, enableInstantHover) => instantiationService.createInstance(WorkbenchHoverDelegate, placement, enableInstantHover, {}));
+		setHoverDelegateFactory((placement, enableInstantHover) => instantiationService.createInstance(WorkbenchHoverDelegate, placement, { instantHover: enableInstantHover }, {}));
 		setBaseLayerHoverDelegate(hoverService);
 	}
 
diff --git a/src/vs/platform/hover/browser/hover.ts b/src/vs/platform/hover/browser/hover.ts
index 64fe7c21defe..f2651c086d15 100644
--- a/src/vs/platform/hover/browser/hover.ts
+++ b/src/vs/platform/hover/browser/hover.ts
@@ -9,7 +9,7 @@ import { IHoverDelegate, IHoverDelegateOptions } from '../../../base/browser/ui/
 import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { addStandardDisposableListener, isHTMLElement } from '../../../base/browser/dom.js';
 import { KeyCode } from '../../../base/common/keyCodes.js';
-import type { IHoverDelegate2, IHoverOptions, IHoverWidget } from '../../../base/browser/ui/hover/hover.js';
+import type { IHoverDelegate2, IHoverOptions, IHoverWidget, IManagedHoverContentOrFactory } from '../../../base/browser/ui/hover/hover.js';
 
 export const IHoverService = createDecorator<IHoverService>('hoverService');
 
@@ -17,16 +17,26 @@ export interface IHoverService extends IHoverDelegate2 {
 	readonly _serviceBrand: undefined;
 }
 
+export interface IHoverDelayOptions {
+	readonly instantHover?: boolean;
+	readonly dynamicDelay?: (content?: IManagedHoverContentOrFactory) => number | undefined;
+}
+
 export class WorkbenchHoverDelegate extends Disposable implements IHoverDelegate {
 
 	private lastHoverHideTime = 0;
 	private timeLimit = 200;
 
 	private _delay: number;
-	get delay(): number {
+	get delay(): number | ((content: IManagedHoverContentOrFactory) => number) {
 		if (this.isInstantlyHovering()) {
 			return 0; // show instantly when a hover was recently shown
 		}
+
+		if (this.hoverOptions?.dynamicDelay) {
+			return content => this.hoverOptions?.dynamicDelay?.(content) ?? this._delay;
+		}
+
 		return this._delay;
 	}
 
@@ -34,7 +44,7 @@ export class WorkbenchHoverDelegate extends Disposable implements IHoverDelegate
 
 	constructor(
 		public readonly placement: 'mouse' | 'element',
-		private readonly instantHover: boolean,
+		private readonly hoverOptions: IHoverDelayOptions | undefined,
 		private overrideOptions: Partial<IHoverOptions> | ((options: IHoverDelegateOptions, focus?: boolean) => Partial<IHoverOptions>) = {},
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IHoverService private readonly hoverService: IHoverService,
@@ -87,11 +97,11 @@ export class WorkbenchHoverDelegate extends Disposable implements IHoverDelegate
 	}
 
 	private isInstantlyHovering(): boolean {
-		return this.instantHover && Date.now() - this.lastHoverHideTime < this.timeLimit;
+		return !!this.hoverOptions?.instantHover && Date.now() - this.lastHoverHideTime < this.timeLimit;
 	}
 
 	setInstantHoverTimeLimit(timeLimit: number): void {
-		if (!this.instantHover) {
+		if (!this.hoverOptions?.instantHover) {
 			throw new Error('Instant hover is not enabled');
 		}
 		this.timeLimit = timeLimit;
@@ -99,7 +109,7 @@ export class WorkbenchHoverDelegate extends Disposable implements IHoverDelegate
 
 	onDidHideHover(): void {
 		this.hoverDisposables.clear();
-		if (this.instantHover) {
+		if (this.hoverOptions?.instantHover) {
 			this.lastHoverHideTime = Date.now();
 		}
 	}
diff --git a/src/vs/platform/quickinput/browser/quickInput.ts b/src/vs/platform/quickinput/browser/quickInput.ts
index 1ea9c37ab5fc..2324a1e3a761 100644
--- a/src/vs/platform/quickinput/browser/quickInput.ts
+++ b/src/vs/platform/quickinput/browser/quickInput.ts
@@ -1296,7 +1296,7 @@ export class QuickInputHoverDelegate extends WorkbenchHoverDelegate {
 		@IConfigurationService configurationService: IConfigurationService,
 		@IHoverService hoverService: IHoverService
 	) {
-		super('element', false, (options) => this.getOverrideOptions(options), configurationService, hoverService);
+		super('element', undefined, (options) => this.getOverrideOptions(options), configurationService, hoverService);
 	}
 
 	private getOverrideOptions(options: IHoverDelegateOptions): Partial<IHoverOptions> {
diff --git a/src/vs/platform/quickinput/browser/quickInputTree.ts b/src/vs/platform/quickinput/browser/quickInputTree.ts
index 18dbc087992b..94f0488fc4ea 100644
--- a/src/vs/platform/quickinput/browser/quickInputTree.ts
+++ b/src/vs/platform/quickinput/browser/quickInputTree.ts
@@ -929,7 +929,7 @@ export class QuickInputTree extends Disposable {
 	}
 
 	private _registerHoverListeners() {
-		const delayer = this._register(new ThrottledDelayer(this.hoverDelegate.delay));
+		const delayer = this._register(new ThrottledDelayer(typeof this.hoverDelegate.delay === 'function' ? this.hoverDelegate.delay() : this.hoverDelegate.delay));
 		this._register(this._tree.onMouseOver(async e => {
 			// If we hover over an anchor element, we don't want to show the hover because
 			// the anchor may have a tooltip that we want to show instead.
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index 9b8e33d5f7d0..781659aca4fa 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -16,7 +16,7 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.js
 import { STATUS_BAR_BACKGROUND, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_BACKGROUND, STATUS_BAR_ITEM_HOVER_BACKGROUND, STATUS_BAR_BORDER, STATUS_BAR_NO_FOLDER_FOREGROUND, STATUS_BAR_NO_FOLDER_BORDER, STATUS_BAR_ITEM_COMPACT_HOVER_BACKGROUND, STATUS_BAR_ITEM_FOCUS_BORDER, STATUS_BAR_FOCUS_BORDER } from '../../../common/theme.js';
 import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
 import { contrastBorder, activeContrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
-import { EventHelper, addDisposableListener, EventType, clearNode, getWindow } from '../../../../base/browser/dom.js';
+import { EventHelper, addDisposableListener, EventType, clearNode, getWindow, isHTMLElement } from '../../../../base/browser/dom.js';
 import { createStyleSheet } from '../../../../base/browser/domStylesheets.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { Parts, IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
@@ -145,7 +145,19 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 	private leftItemsContainer: HTMLElement | undefined;
 	private rightItemsContainer: HTMLElement | undefined;
 
-	private readonly hoverDelegate = this._register(this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', true, (_, focus?: boolean) => (
+	private readonly hoverDelegate = this._register(this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', {
+		instantHover: true,
+		dynamicDelay(content) {
+			if (typeof content === 'function' || isHTMLElement(content)) {
+				// override the delay for content that is rich (e.g. html or long running)
+				// so that is appears more instantly. these hovers carry more important
+				// information and should not be delayed by preference.
+				return 500;
+			}
+
+			return undefined;
+		}
+	}, (_, focus?: boolean) => (
 		{
 			persistence: {
 				hideOnKeyDown: true,
diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts
index 23b256ad2265..de175c02c891 100644
--- a/src/vs/workbench/browser/parts/views/treeView.ts
+++ b/src/vs/workbench/browser/parts/views/treeView.ts
@@ -1265,7 +1265,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 		@IInstantiationService instantiationService: IInstantiationService,
 	) {
 		super();
-		this._hoverDelegate = this._register(instantiationService.createInstance(WorkbenchHoverDelegate, 'mouse', false, {}));
+		this._hoverDelegate = this._register(instantiationService.createInstance(WorkbenchHoverDelegate, 'mouse', undefined, {}));
 		this._register(this.themeService.onDidFileIconThemeChange(() => this.rerender()));
 		this._register(this.themeService.onDidColorThemeChange(() => this.rerender()));
 		this._register(checkboxStateHandler.onDidChangeCheckboxState(items => {
diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts
index 3d4375d13b22..267da8cf7dbe 100644
--- a/src/vs/workbench/browser/workbench.ts
+++ b/src/vs/workbench/browser/workbench.ts
@@ -136,7 +136,7 @@ export class Workbench extends Layout {
 
 				// Default Hover Delegate must be registered before creating any workbench/layout components
 				// as these possibly will use the default hover delegate
-				setHoverDelegateFactory((placement, enableInstantHover) => instantiationService.createInstance(WorkbenchHoverDelegate, placement, enableInstantHover, {}));
+				setHoverDelegateFactory((placement, enableInstantHover) => instantiationService.createInstance(WorkbenchHoverDelegate, placement, { instantHover: enableInstantHover }, {}));
 				setBaseLayerHoverDelegate(hoverService);
 
 				// Layout
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts
index 457fc209aa13..8c02d7def9f1 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts
@@ -353,7 +353,7 @@ export class NotebookEditorWorkbenchToolbar extends Disposable {
 
 		// Make sure both toolbars have the same hover delegate for instant hover to work
 		// Due to the elements being further apart than normal toolbars, the default time limit is to short and has to be increased
-		const hoverDelegate = this._register(this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', true, {}));
+		const hoverDelegate = this._register(this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', { instantHover: true }, {}));
 		hoverDelegate.setInstantHoverTimeLimit(600);
 
 		const leftToolbarOptions: IWorkbenchToolBarOptions = {
diff --git a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
index 43895d363315..37d8732b9be6 100644
--- a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
@@ -625,7 +625,7 @@ class HistoryItemHoverDelegate extends WorkbenchHoverDelegate {
 		@IHoverService hoverService: IHoverService,
 
 	) {
-		super('element', true, () => this.getHoverOptions(), configurationService, hoverService);
+		super('element', { instantHover: true }, () => this.getHoverOptions(), configurationService, hoverService);
 	}
 
 	private getHoverOptions(): Partial<IHoverOptions> {
diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
index 810f79817671..1267040d4a8e 100644
--- a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
+++ b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
@@ -1162,7 +1162,7 @@ class TimelineTreeRenderer implements ITreeRenderer<TreeElement, FuzzyScore, Tim
 		@IThemeService private themeService: IThemeService,
 	) {
 		this.actionViewItemProvider = createActionViewItem.bind(undefined, this.instantiationService);
-		this._hoverDelegate = this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', true, {
+		this._hoverDelegate = this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', { instantHover: true }, {
 			position: {
 				hoverPosition: HoverPosition.RIGHT // Will flip when there's no space
 			}
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
index 9da6bd6ea38d..c4a03276d860 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
@@ -1891,7 +1891,7 @@ class ProfileResourceChildTreeItemRenderer extends AbstractProfileResourceTreeRe
 	) {
 		super();
 		this.labels = instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER);
-		this.hoverDelegate = this._register(instantiationService.createInstance(WorkbenchHoverDelegate, 'mouse', false, {}));
+		this.hoverDelegate = this._register(instantiationService.createInstance(WorkbenchHoverDelegate, 'mouse', undefined, {}));
 	}
 
 	renderTemplate(parent: HTMLElement): IProfileResourceChildTreeItemTemplateData {

From 6dbd062eba30fe4f06e06611ac48d5bcb1ab0070 Mon Sep 17 00:00:00 2001
From: Jean Pierre <jeanp413@hotmail.com>
Date: Sat, 22 Feb 2025 15:27:04 -0500
Subject: [PATCH 0281/1815] Fixes #241598

---
 .../commandGuide/browser/terminal.commandGuide.contribution.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0b6d31f0e9c2..293261bdb019 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
@@ -64,7 +64,7 @@ class TerminalCommandGuideContribution extends Disposable implements ITerminalCo
 			this._activeCommandGuide.value = combinedDisposable(
 				addDisposableListener(screenElement, 'mousemove', (e: MouseEvent) => this._tryShowHighlight(screenElement, xterm, e)),
 				addDisposableListener(viewportElement, 'mousemove', (e: MouseEvent) => this._tryShowHighlight(screenElement, xterm, e)),
-				addDisposableListener(xterm.raw.element!, 'mouseout', () => xterm.markTracker.showCommandGuide(undefined)),
+				addDisposableListener(xterm.raw.element!, 'mouseleave', () => xterm.markTracker.showCommandGuide(undefined)),
 				xterm.raw.onData(() => xterm.markTracker.showCommandGuide(undefined)),
 				toDisposable(() => xterm.markTracker.showCommandGuide(undefined)),
 			);

From f4c602693743d533b0a5b96b8d0bc1bd6d041d32 Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <2644648+TylerLeonhardt@users.noreply.github.com>
Date: Sat, 22 Feb 2025 17:07:39 -0800
Subject: [PATCH 0282/1815] Bump distro (#241604)

for trustedAuth product.json changes
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6506e910803c..f8179b2be9e4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.98.0",
-  "distro": "f14af7417b4d5795b7e10ad0200ce11977e0742f",
+  "distro": "d054e34303cd79eea3d201581106226c091cae72",
   "author": {
     "name": "Microsoft Corporation"
   },

From 8b14930e34f85a7963797062211b680f380fd4d4 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sun, 23 Feb 2025 07:30:07 +0100
Subject: [PATCH 0283/1815] unblock build (skip tests) (#241619)

---
 .../src/singlefolder-tests/terminal.shellIntegration.test.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
index c40710763191..3a63841d6007 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
@@ -142,7 +142,7 @@ import { assertNoRpc } from '../utils';
 		await closeTerminalAsync(terminal);
 	});
 
-	test('TerminalShellExecution.read iterables should be available between the start and end execution events', async () => {
+	test.skip('TerminalShellExecution.read iterables should be available between the start and end execution events', async () => {
 		const { terminal, shellIntegration } = await createTerminalAndWaitForShellIntegration();
 		const events: string[] = [];
 		disposables.push(window.onDidStartTerminalShellExecution(() => events.push('start')));

From 199a1b6c9592dda441260fb4b09834d66c0db0d1 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Sun, 23 Feb 2025 13:39:02 +0100
Subject: [PATCH 0284/1815] Delete unused telemetry code (#241625)

delete unused telemetry
---
 .../browser/parts/paneCompositeBar.ts          | 16 ----------------
 .../browser/telemetry.contribution.ts          | 18 ------------------
 2 files changed, 34 deletions(-)

diff --git a/src/vs/workbench/browser/parts/paneCompositeBar.ts b/src/vs/workbench/browser/parts/paneCompositeBar.ts
index 26693cb4be95..3c14098d65ff 100644
--- a/src/vs/workbench/browser/parts/paneCompositeBar.ts
+++ b/src/vs/workbench/browser/parts/paneCompositeBar.ts
@@ -29,7 +29,6 @@ import { IAction, Separator, SubmenuAction, toAction } from '../../../base/commo
 import { StringSHA1 } from '../../../base/common/hash.js';
 import { GestureEvent } from '../../../base/browser/touch.js';
 import { IPaneCompositePart } from './paneCompositePart.js';
-import { ITelemetryService } from '../../../platform/telemetry/common/telemetry.js';
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
 import { IViewsService } from '../../services/views/common/viewsService.js';
 
@@ -777,7 +776,6 @@ class ViewContainerActivityAction extends CompositeBarAction {
 		private readonly part: Parts,
 		private readonly paneCompositePart: IPaneCompositePart,
 		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IActivityService private readonly activityService: IActivityService,
 	) {
@@ -820,36 +818,22 @@ class ViewContainerActivityAction extends CompositeBarAction {
 			if (sideBarVisible && activeViewlet?.getId() === this.compositeBarActionItem.id) {
 				switch (focusBehavior) {
 					case 'focus':
-						this.logAction('refocus');
 						this.paneCompositePart.openPaneComposite(this.compositeBarActionItem.id, focus);
 						break;
 					case 'toggle':
 					default:
 						// Hide sidebar if selected viewlet already visible
-						this.logAction('hide');
 						this.layoutService.setPartHidden(true, Parts.SIDEBAR_PART);
 						break;
 				}
 
 				return;
 			}
-
-			this.logAction('show');
 		}
 
 		await this.paneCompositePart.openPaneComposite(this.compositeBarActionItem.id, focus);
 		return this.activate();
 	}
-
-	private logAction(action: string) {
-		type ActivityBarActionClassification = {
-			owner: 'benibenj';
-			comment: 'Event logged when an activity bar action is triggered.';
-			viewletId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The view in the activity bar for which the action was performed.' };
-			action: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The action that was performed. e.g. "hide", "show", or "refocus"' };
-		};
-		this.telemetryService.publicLog2<{ viewletId: String; action: String }, ActivityBarActionClassification>('activityBarAction', { viewletId: this.compositeBarActionItem.id, action });
-	}
 }
 
 class PlaceHolderViewContainerActivityAction extends ViewContainerActivityAction { }
diff --git a/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts b/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts
index 8e99b7c667eb..04ccc1762656 100644
--- a/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts
+++ b/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts
@@ -388,24 +388,6 @@ class ConfigurationTelemetryContribution extends Disposable implements IWorkbenc
 				}>('window.titleBarStyle', { settingValue: this.getValueToReport(key, target), source });
 				return;
 
-			case 'window.customTitleBarVisibility':
-				this.telemetryService.publicLog2<UpdatedSettingEvent, {
-					owner: 'benibenj';
-					comment: 'This is used to know if window custom title bar visibility is configured or not';
-					settingValue: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'value of the setting' };
-					source: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'source of the setting' };
-				}>('window.customTitleBarVisibility', { settingValue: this.getValueToReport(key, target), source });
-				return;
-
-			case 'window.nativeTabs':
-				this.telemetryService.publicLog2<UpdatedSettingEvent, {
-					owner: 'benibenj';
-					comment: 'This is used to know if window native tabs are enabled or not';
-					settingValue: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'value of the setting' };
-					source: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'source of the setting' };
-				}>('window.nativeTabs', { settingValue: this.getValueToReport(key, target), source });
-				return;
-
 			case 'extensions.verifySignature':
 				this.telemetryService.publicLog2<UpdatedSettingEvent, {
 					owner: 'sandy081';

From 55feb94b296b97edaccc017b4f1520b04d0f0296 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sun, 23 Feb 2025 07:35:37 -0800
Subject: [PATCH 0285/1815] Ensure terminal data is segmented by C and D
 sequences

The tests failed because on mac the 633;C and 633;D events both appear in the
same event. The change ensures we match globally on the regex and cleans up
handling of multiple events. This went from failing consistently to passing
consistently on my mac.

Fixes #241592
---
 .../terminal.shellIntegration.test.ts         |  6 +--
 .../terminal/browser/terminalInstance.ts      | 41 ++++++++++---------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
index 3a63841d6007..d5d84c58f4df 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
@@ -142,7 +142,7 @@ import { assertNoRpc } from '../utils';
 		await closeTerminalAsync(terminal);
 	});
 
-	test.skip('TerminalShellExecution.read iterables should be available between the start and end execution events', async () => {
+	test('TerminalShellExecution.read iterables should be available between the start and end execution events', async () => {
 		const { terminal, shellIntegration } = await createTerminalAndWaitForShellIntegration();
 		const events: string[] = [];
 		disposables.push(window.onDidStartTerminalShellExecution(() => events.push('start')));
@@ -164,7 +164,7 @@ import { assertNoRpc } from '../utils';
 		await closeTerminalAsync(terminal);
 	});
 
-	test.skip('TerminalShellExecution.read events should fire with contents of command', async () => {
+	test('TerminalShellExecution.read events should fire with contents of command', async () => {
 		const { terminal, shellIntegration } = await createTerminalAndWaitForShellIntegration();
 		const events: string[] = [];
 
@@ -179,7 +179,7 @@ import { assertNoRpc } from '../utils';
 		await closeTerminalAsync(terminal);
 	});
 
-	test.skip('TerminalShellExecution.read events should give separate iterables per call', async () => {
+	test('TerminalShellExecution.read events should give separate iterables per call', async () => {
 		const { terminal, shellIntegration } = await createTerminalAndWaitForShellIntegration();
 
 		const { execution, endEvent } = executeCommandAsync(shellIntegration, 'echo hello');
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index 3494d3fccc18..e0a7854c29de 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -13,7 +13,7 @@ import { DomScrollableElement } from '../../../../base/browser/ui/scrollbar/scro
 import { AutoOpenBarrier, Barrier, Promises, disposableTimeout, timeout } from '../../../../base/common/async.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { debounce } from '../../../../base/common/decorators.js';
-import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { BugIndicatingError, onUnexpectedError } from '../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { ISeparator, template } from '../../../../base/common/labels.js';
@@ -1527,25 +1527,28 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		// consistent form respectively. This must be done here as xterm.js does not currently have
 		// a listener for when individual data events are parsed, only `onWriteParsed` which fires
 		// when the write buffer is flushed.
-		const match = ev.data.match(/(?<seq>\x1b\][16]33;(?:C|D(?:;\d+)?)\x07)/);
-		const index = match?.index;
-		if (match?.groups?.seq && index !== undefined) {
-			const seq = match?.groups?.seq;
-			if (ev.trackCommit) {
-				this._writeProcessData(ev.data.substring(0, index));
-				this._writeProcessData(seq);
-				ev.writePromise = new Promise<void>(r => this._writeProcessData(ev.data.substring(index + seq.length), r));
-			} else {
-				this._writeProcessData(ev.data.substring(0, index));
-				this._writeProcessData(seq);
-				this._writeProcessData(ev.data.substring(index + seq.length));
-			}
+		const leadingSegmentedData: string[] = [];
+		const matches = ev.data.matchAll(/(?<seq>\x1b\][16]33;(?:C|D(?:;\d+)?)\x07)/g);
+		let i = 0;
+		for (const match of matches) {
+			if (match.groups?.seq === undefined) {
+				throw new BugIndicatingError('seq must be defined');
+			}
+			leadingSegmentedData.push(ev.data.substring(i, match.index));
+			leadingSegmentedData.push(match.groups?.seq ?? '');
+			i = match.index + match[0].length;
+		}
+		const lastData = ev.data.substring(i);
+
+		// Write all leading segmented data first, followed by the last data, tracking commit if
+		// necessary
+		for (let i = 0; i < leadingSegmentedData.length; i++) {
+			this._writeProcessData(leadingSegmentedData[i]);
+		}
+		if (ev.trackCommit) {
+			ev.writePromise = new Promise<void>(r => this._writeProcessData(lastData, r));
 		} else {
-			if (ev.trackCommit) {
-				ev.writePromise = new Promise<void>(r => this._writeProcessData(ev.data, r));
-			} else {
-				this._writeProcessData(ev.data);
-			}
+			this._writeProcessData(lastData);
 		}
 	}
 

From 79678deb716809950ca507ea9edc0cf56631d399 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sun, 23 Feb 2025 17:15:30 +0100
Subject: [PATCH 0286/1815] status - chat tweaks (#241620)

---
 src/vs/base/browser/ui/hover/hover.ts         |  5 ++
 .../browser/parts/statusbar/statusbarItem.ts  |  2 +-
 .../browser/parts/statusbar/statusbarPart.ts  |  9 +-
 .../contrib/chat/browser/chatStatus.ts        | 87 +++++++++++++------
 .../contrib/chat/browser/media/chatStatus.css | 28 ++++++
 .../contrib/chat/common/chatQuotasService.ts  |  3 +-
 .../services/statusbar/browser/statusbar.ts   |  4 +-
 7 files changed, 105 insertions(+), 33 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/browser/media/chatStatus.css

diff --git a/src/vs/base/browser/ui/hover/hover.ts b/src/vs/base/browser/ui/hover/hover.ts
index ec7408607080..df0e343e3efb 100644
--- a/src/vs/base/browser/ui/hover/hover.ts
+++ b/src/vs/base/browser/ui/hover/hover.ts
@@ -382,6 +382,11 @@ export interface IManagedHoverTooltipMarkdownString {
 	markdownNotSupportedFallback: string | undefined;
 }
 
+export function isManagedHoverTooltipMarkdownString(obj: unknown): obj is IManagedHoverTooltipMarkdownString {
+	const candidate = obj as IManagedHoverTooltipMarkdownString;
+	return typeof candidate === 'object' && 'markdown' in candidate && 'markdownNotSupportedFallback' in candidate;
+}
+
 export type IManagedHoverContent = string | IManagedHoverTooltipMarkdownString | HTMLElement | undefined;
 export type IManagedHoverContentOrFactory = IManagedHoverContent | (() => IManagedHoverContent);
 
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts b/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
index 198e34c731b8..f7375016f1a0 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
@@ -133,7 +133,7 @@ export class StatusbarEntryItem extends Disposable {
 
 			const hoverContents = isMarkdownString(hoverTooltip) ? { markdown: hoverTooltip, markdownNotSupportedFallback: undefined } : hoverTooltip;
 			if (this.hover) {
-				this.hover.update(hoverContents, hoverOptions);
+				this.hover.update(typeof hoverContents === 'function' ? hoverContents() : hoverContents, hoverOptions);
 			} else {
 				this.hover = this._register(this.hoverService.setupManagedHover(this.hoverDelegate, this.container, hoverContents, hoverOptions));
 			}
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index 781659aca4fa..2939ef90e130 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -35,6 +35,7 @@ import { StatusbarEntryItem } from './statusbarItem.js';
 import { StatusBarFocused } from '../../../common/contextkeys.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { IView } from '../../../../base/browser/ui/grid/grid.js';
+import { isManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
 
 export interface IStatusbarEntryContainer extends IDisposable {
 
@@ -148,9 +149,13 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 	private readonly hoverDelegate = this._register(this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', {
 		instantHover: true,
 		dynamicDelay(content) {
-			if (typeof content === 'function' || isHTMLElement(content)) {
+			if (
+				typeof content === 'function' ||
+				isHTMLElement(content) ||
+				(isManagedHoverTooltipMarkdownString(content) && typeof content.markdown === 'function')
+			) {
 				// override the delay for content that is rich (e.g. html or long running)
-				// so that is appears more instantly. these hovers carry more important
+				// so that it appears more instantly. these hovers carry more important
 				// information and should not be delayed by preference.
 				return 500;
 			}
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 90e2179231a9..25d7a232d4f9 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -3,20 +3,23 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
-import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import './media/chatStatus.css';
+import { safeIntl } from '../../../../base/common/date.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { language } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.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 { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
-import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
+import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment, TooltipContent } from '../../../services/statusbar/browser/statusbar.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { IChatEntitlementsService } from '../common/chatEntitlementsService.js';
 import { IChatQuotasService } from '../common/chatQuotasService.js';
 import { quotaToButtonMessage, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, TOGGLE_CHAT_ACTION_ID } from './actions/chatActions.js';
+import { $ } from '../../../../base/browser/dom.js';
+import { IChatEntitlementsService } from '../common/chatEntitlementsService.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
 
 export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
 
@@ -26,6 +29,8 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 	private entry: IStatusbarEntryAccessor | undefined = undefined;
 
+	private dateFormatter = safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric' });
+
 	constructor(
 		@IStatusbarService private readonly statusbarService: IStatusbarService,
 		@IChatQuotasService private readonly chatQuotasService: IChatQuotasService,
@@ -83,7 +88,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		let text = '$(copilot)';
 		let ariaLabel = localize('chatStatus', "Copilot Status");
 		let command = TOGGLE_CHAT_ACTION_ID;
-		let tooltip: string | IManagedHoverTooltipMarkdownString = localize('openChat', "Open Chat ({0})", this.keybindingService.lookupKeybinding(command)?.getLabel() ?? '');
+		let tooltip: TooltipContent = localize('openChat', "Open Chat ({0})", this.keybindingService.lookupKeybinding(command)?.getLabel() ?? '');
 
 		// Quota Exceeded
 		const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatQuotasService.quotas;
@@ -120,28 +125,28 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 		// Copilot Limited User
 		else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.limited.key) === true) {
-			const that = this;
-			tooltip = {
-				async markdown(token) {
-					const entitlements = await that.chatEntitlementsService.resolve(token);
-
-					if (token.isCancellationRequested || !entitlements?.quotas) {
-						return;
-					}
-
-					const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = entitlements.quotas;
-					if (typeof chatRemaining === 'number' && typeof chatTotal === 'number' && typeof completionsRemaining === 'number' && typeof completionsTotal === 'number') {
-						return new MarkdownString([
-							localize('limitTitle', "You are currently using Copilot Free"),
-							'---',
-							localize('limitChatQuota', "<code>{0}</code> of <code>{1}</code> chats remaining", chatRemaining, chatTotal),
-							localize('limitCompletionsQuota', "<code>{0}</code> of <code>{1}</code> code completions remaining", completionsRemaining, completionsTotal),
-						].join('\n\n'), { supportHtml: true });
-					}
-
-					return undefined;
-				},
-				markdownNotSupportedFallback: undefined
+			tooltip = () => {
+				const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate } = this.chatQuotasService.quotas;
+
+				const container = $('div.chat-status-bar-entry-tooltip');
+				container.appendChild($('div', undefined, localize('limitTitle', "You are currently using Copilot Free:")));
+
+				const chatQuotaIndicator = this.createQuotaIndicator(chatTotal, chatRemaining, localize('chatsLabel', "Chat Messages"));
+				container.appendChild(chatQuotaIndicator.element);
+
+				const completionsQuotaIndicator = this.createQuotaIndicator(completionsTotal, completionsRemaining, localize('completionsLabel', "Code Completions"));
+				container.appendChild(completionsQuotaIndicator.element);
+
+				this.chatEntitlementsService.resolve(CancellationToken.None).then(() => {
+					const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = this.chatQuotasService.quotas;
+
+					chatQuotaIndicator.update(chatTotal, chatRemaining);
+					completionsQuotaIndicator.update(completionsTotal, completionsRemaining);
+				});
+
+				container.appendChild($('div', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.format(quotaResetDate))));
+
+				return container;
 			};
 		}
 
@@ -155,4 +160,32 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			tooltip
 		};
 	}
+
+	private createQuotaIndicator(total: number | undefined, remaining: number | undefined, label: string): { element: HTMLElement; update: (total: number | undefined, remaining: number | undefined) => void } {
+		const quotaText = $('span');
+		const quotaBit = $('div.quota-bit');
+		const quotaContainer = $('div.quota-indicator', undefined,
+			$('div.quota-label', undefined,
+				$('span', undefined, label),
+				quotaText
+			),
+			$('div.quota-bar', undefined,
+				quotaBit
+			)
+		);
+
+		const update = (total: number | undefined, remaining: number | undefined) => {
+			if (typeof total === 'number' && typeof remaining === 'number') {
+				quotaText.textContent = localize('quotaDisplay', "{0} / {1}", remaining, total);
+				quotaBit.style.width = `${(remaining / total) * 100}%`;
+			}
+		};
+
+		update(total, remaining);
+
+		return {
+			element: quotaContainer,
+			update
+		};
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
new file mode 100644
index 000000000000..a70fc7c39523
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.chat-status-bar-entry-tooltip .quota-indicator {
+	margin-top: 8px;
+	margin-bottom: 8px;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator .quota-label {
+	display: flex;
+	justify-content: space-between;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator .quota-bar {
+	width: 100%;
+	height: 8px;
+	background-color: var(--vscode-activityBarBadge-foreground);
+	border-color: var(--vscode-activityBarBadge-background);
+	border-radius: 6px;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator .quota-bar .quota-bit {
+	height: 100%;
+	background-color: var(--vscode-activityBarBadge-background);
+	border-radius: 6px;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatQuotasService.ts b/src/vs/workbench/contrib/chat/common/chatQuotasService.ts
index ac39166487bb..e79bcf34a58c 100644
--- a/src/vs/workbench/contrib/chat/common/chatQuotasService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatQuotasService.ts
@@ -118,7 +118,8 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 		return {
 			...quotas,
 			chatTotal: typeof quotas.chatTotal === 'number' ? Math.floor(quotas.chatTotal / 10) : undefined,
-			chatRemaining: typeof quotas.chatRemaining === 'number' ? Math.floor(quotas.chatRemaining / 10) : undefined
+			chatRemaining: typeof quotas.chatRemaining === 'number' ? Math.floor(Math.max(0, quotas.chatRemaining) / 10) : undefined,
+			completionsRemaining: typeof quotas.completionsRemaining === 'number' ? Math.max(0, quotas.completionsRemaining) : undefined
 		};
 	}
 
diff --git a/src/vs/workbench/services/statusbar/browser/statusbar.ts b/src/vs/workbench/services/statusbar/browser/statusbar.ts
index 8a739b4960b7..26515f0af925 100644
--- a/src/vs/workbench/services/statusbar/browser/statusbar.ts
+++ b/src/vs/workbench/services/statusbar/browser/statusbar.ts
@@ -8,7 +8,7 @@ import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.
 import { ThemeColor } from '../../../../base/common/themables.js';
 import { Command } from '../../../../editor/common/languages.js';
 import { IMarkdownString } from '../../../../base/common/htmlContent.js';
-import { IManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
+import { IManagedHoverContentOrFactory } from '../../../../base/browser/ui/hover/hover.js';
 import { ColorIdentifier } from '../../../../platform/theme/common/colorRegistry.js';
 import { IAuxiliaryStatusbarPart, IStatusbarEntryContainer } from '../../../browser/parts/statusbar/statusbarPart.js';
 
@@ -112,7 +112,7 @@ export interface IStatusbarStyleOverride {
 export type StatusbarEntryKind = 'standard' | 'warning' | 'error' | 'prominent' | 'remote' | 'offline' | 'copilot';
 export const StatusbarEntryKinds: StatusbarEntryKind[] = ['standard', 'warning', 'error', 'prominent', 'remote', 'offline', 'copilot'];
 
-export type TooltipContent = string | IMarkdownString | IManagedHoverTooltipMarkdownString | HTMLElement;
+export type TooltipContent = IMarkdownString | IManagedHoverContentOrFactory;
 
 export interface ITooltipWithCommands {
 	readonly content: TooltipContent;

From 17cb19c885e0927189615e89057f806c2e9ddcb5 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sun, 23 Feb 2025 19:01:53 +0100
Subject: [PATCH 0287/1815] status - chat tweaks (#241635)

---
 .../contrib/chat/browser/chatStatus.ts        | 56 +++++++++++++++++--
 .../contrib/chat/browser/media/chatStatus.css | 26 +++++++++
 2 files changed, 77 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 25d7a232d4f9..22742da5292d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -5,8 +5,8 @@
 
 import './media/chatStatus.css';
 import { safeIntl } from '../../../../base/common/date.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { language } from '../../../../base/common/platform.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { language, OS } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
@@ -16,10 +16,12 @@ import { IWorkbenchAssignmentService } from '../../../services/assignment/common
 import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment, TooltipContent } from '../../../services/statusbar/browser/statusbar.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatQuotasService } from '../common/chatQuotasService.js';
-import { quotaToButtonMessage, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, TOGGLE_CHAT_ACTION_ID } from './actions/chatActions.js';
-import { $ } from '../../../../base/browser/dom.js';
+import { quotaToButtonMessage, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, TOGGLE_CHAT_ACTION_ID, CHAT_OPEN_ACTION_ID } from './actions/chatActions.js';
+import { $, append } from '../../../../base/browser/dom.js';
 import { IChatEntitlementsService } from '../common/chatEntitlementsService.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 
 export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
 
@@ -28,6 +30,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	private readonly treatment = this.assignmentService.getTreatment<boolean>('config.chat.experimental.statusIndicator.enabled'); //TODO@bpasero remove this experiment eventually
 
 	private entry: IStatusbarEntryAccessor | undefined = undefined;
+	private readonly entryDisposables = this._register(new DisposableStore());
 
 	private dateFormatter = safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric' });
 
@@ -85,6 +88,8 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	}
 
 	private getEntryProps(): IStatusbarEntry {
+		this.entryDisposables.clear();
+
 		let text = '$(copilot)';
 		let ariaLabel = localize('chatStatus', "Copilot Status");
 		let command = TOGGLE_CHAT_ACTION_ID;
@@ -126,9 +131,11 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		// Copilot Limited User
 		else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.limited.key) === true) {
 			tooltip = () => {
+				const container = $('div.chat-status-bar-entry-tooltip');
+
+				// Quota Indicator
 				const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate } = this.chatQuotasService.quotas;
 
-				const container = $('div.chat-status-bar-entry-tooltip');
 				container.appendChild($('div', undefined, localize('limitTitle', "You are currently using Copilot Free:")));
 
 				const chatQuotaIndicator = this.createQuotaIndicator(chatTotal, chatRemaining, localize('chatsLabel', "Chat Messages"));
@@ -146,6 +153,20 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 				container.appendChild($('div', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.format(quotaResetDate))));
 
+				// Shortcuts
+				container.appendChild(document.createElement('hr'));
+				this.createShortcuts(container);
+
+				return container;
+			};
+		}
+
+		// Any other User
+		else {
+			tooltip = () => {
+				const container = $('div.chat-status-bar-entry-tooltip');
+				this.createShortcuts(container);
+
 				return container;
 			};
 		}
@@ -188,4 +209,29 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			update
 		};
 	}
+
+	private createShortcuts(container: HTMLElement): HTMLElement {
+		const shortcuts = container.appendChild($('div.shortcuts'));
+
+		const openChat = { text: localize('shortcuts.chat', "Chat"), id: CHAT_OPEN_ACTION_ID };
+		const openCopilotEdits = { text: localize('shortcuts.copilotEdits', "Copilot Edits"), id: 'workbench.action.chat.openEditSession' };
+		const inlineChat = { text: localize('shortcuts.inlineChat', "Inline Chat"), id: 'inlineChat.start' };
+
+		for (const entry of [openChat, openCopilotEdits, inlineChat]) {
+			const keys = this.keybindingService.lookupKeybinding(entry.id);
+			if (!keys) {
+				continue;
+			}
+
+			const shortcut = append(shortcuts, $('div.shortcut'));
+
+			const labelValue = append(shortcut, $('span.shortcut-label'));
+			labelValue.textContent = entry.text;
+
+			const labelKey = this.entryDisposables.add(new KeybindingLabel(shortcut, OS, { ...defaultKeybindingLabelStyles }));
+			labelKey.set(keys);
+		}
+
+		return shortcuts;
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
index a70fc7c39523..4a6d225f93c0 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
@@ -3,6 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+/* Overall */
+
+.chat-status-bar-entry-tooltip hr {
+	margin-top: 8px;
+	margin-bottom: 8px;
+}
+
+/* Shortcuts */
+
+.chat-status-bar-entry-tooltip .shortcuts {
+	display: flex;
+	flex-direction: column;
+	gap: 5px;
+}
+
+.chat-status-bar-entry-tooltip .shortcuts .shortcut {
+	display: flex;
+	gap: 10px;
+}
+
+.chat-status-bar-entry-tooltip .shortcuts .shortcut .shortcut-label {
+	flex: 1;
+}
+
+/* Quota Indicator */
+
 .chat-status-bar-entry-tooltip .quota-indicator {
 	margin-top: 8px;
 	margin-bottom: 8px;

From e08f57208f087abed82852b24b5f4937357a95c1 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sun, 23 Feb 2025 11:47:39 -0800
Subject: [PATCH 0288/1815] Fix not uri-transforming links in tool invocations
 (#241637)

Was recreating the markdown string and dropping the uri objects
---
 src/vs/base/common/htmlContent.ts             | 12 ++++++++++
 .../base/test/common/markdownString.test.ts   | 24 ++++++++++++++++++-
 .../chatProgressContentPart.ts                | 13 ++++++----
 .../chatToolInvocationPart.ts                 |  6 ++---
 .../contrib/chat/browser/media/chat.css       |  8 +++----
 5 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/src/vs/base/common/htmlContent.ts b/src/vs/base/common/htmlContent.ts
index 8b6213d18445..070103b838d2 100644
--- a/src/vs/base/common/htmlContent.ts
+++ b/src/vs/base/common/htmlContent.ts
@@ -34,6 +34,18 @@ export class MarkdownString implements IMarkdownString {
 	public supportThemeIcons?: boolean;
 	public supportHtml?: boolean;
 	public baseUri?: URI;
+	public uris?: { [href: string]: UriComponents } | undefined;
+
+	public static lift(dto: IMarkdownString): MarkdownString {
+		if (dto instanceof MarkdownString) {
+			return dto;
+		}
+
+		const markdownString = new MarkdownString(dto.value, dto);
+		markdownString.uris = dto.uris;
+		markdownString.baseUri = dto.baseUri ? URI.revive(dto.baseUri) : undefined;
+		return markdownString;
+	}
 
 	constructor(
 		value: string = '',
diff --git a/src/vs/base/test/common/markdownString.test.ts b/src/vs/base/test/common/markdownString.test.ts
index 509325d07c0f..28fd291fb140 100644
--- a/src/vs/base/test/common/markdownString.test.ts
+++ b/src/vs/base/test/common/markdownString.test.ts
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { MarkdownString } from '../../common/htmlContent.js';
+import { IMarkdownString, MarkdownString } from '../../common/htmlContent.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
+import { URI } from '../../common/uri.js';
 
 suite('MarkdownString', () => {
 
@@ -65,6 +66,27 @@ suite('MarkdownString', () => {
 		);
 	});
 
+	test('lift', () => {
+		const dto: IMarkdownString = {
+			value: 'hello',
+			baseUri: URI.file('/foo/bar'),
+			supportThemeIcons: true,
+			isTrusted: true,
+			supportHtml: true,
+			uris: {
+				[URI.file('/foo/bar2').toString()]: URI.file('/foo/bar2'),
+				[URI.file('/foo/bar3').toString()]: URI.file('/foo/bar3')
+			}
+		};
+		const mds = MarkdownString.lift(dto);
+		assert.strictEqual(mds.value, dto.value);
+		assert.strictEqual(mds.baseUri?.toString(), dto.baseUri?.toString());
+		assert.strictEqual(mds.supportThemeIcons, dto.supportThemeIcons);
+		assert.strictEqual(mds.isTrusted, dto.isTrusted);
+		assert.strictEqual(mds.supportHtml, dto.supportHtml);
+		assert.deepStrictEqual(mds.uris, dto.uris);
+	});
+
 	suite('appendCodeBlock', () => {
 		function assertCodeBlock(lang: string, code: string, result: string) {
 			const mds = new MarkdownString();
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts
index bec50c892532..e3f08938b2d8 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts
@@ -70,11 +70,14 @@ export class ChatProgressContentPart extends Disposable implements IChatContentP
 	private renderFileWidgets(element: HTMLElement): void {
 		const links = element.querySelectorAll('a');
 		links.forEach(a => {
-			const href = a.getAttribute('data-href');
-			const uri = href ? URI.parse(href) : undefined;
-			if (uri?.scheme) {
-				const widget = this._register(this.instantiationService.createInstance(InlineAnchorWidget, a, { kind: 'inlineReference', inlineReference: uri }));
-				this._register(this.chatMarkdownAnchorService.register(widget));
+			// 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 = this._register(this.instantiationService.createInstance(InlineAnchorWidget, a, { kind: 'inlineReference', inlineReference: uri }));
+					this._register(this.chatMarkdownAnchorService.register(widget));
+				}
 			}
 		});
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
index 90acd162d45d..2550d071f5e9 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
@@ -124,7 +124,7 @@ class ChatToolInvocationSubPart extends Disposable {
 		if (toolInvocation.kind === 'toolInvocation' && toolInvocation.confirmationMessages) {
 			this.domNode = this.createConfirmationWidget(toolInvocation);
 		} else if (toolInvocation.presentation === 'withCodeblocks' && typeof toolInvocation.invocationMessage !== 'string') {
-			this.domNode = this.createMarkdownProgressPart(toolInvocation);
+			this.domNode = this.createMarkdownWithCodeblocksProgressPart(toolInvocation);
 		} else if (toolInvocation.resultDetails?.length) {
 			this.domNode = this.createResultList(toolInvocation.pastTenseMessage ?? toolInvocation.invocationMessage, toolInvocation.resultDetails);
 		} else {
@@ -211,7 +211,7 @@ class ChatToolInvocationSubPart extends Disposable {
 		} else {
 			content = typeof this.toolInvocation.invocationMessage === 'string' ?
 				new MarkdownString().appendText(this.toolInvocation.invocationMessage + '…') :
-				new MarkdownString(this.toolInvocation.invocationMessage.value + '…');
+				MarkdownString.lift(this.toolInvocation.invocationMessage).appendText('…');
 		}
 
 		const progressMessage: IChatProgressMessage = {
@@ -226,7 +226,7 @@ class ChatToolInvocationSubPart extends Disposable {
 		return progressPart.domNode;
 	}
 
-	private createMarkdownProgressPart(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): HTMLElement {
+	private createMarkdownWithCodeblocksProgressPart(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): HTMLElement {
 		const content = toolInvocation.isComplete ?
 			(toolInvocation.pastTenseMessage ?? toolInvocation.invocationMessage)
 			: toolInvocation.invocationMessage;
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 6072276af192..2539c043e73d 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -373,10 +373,6 @@
 	.progress-container .rendered-markdown [data-code] {
 		margin: 0;
 	}
-
-	.progress-container {
-		padding-top: 2px;
-	}
 }
 
 .interactive-item-container .value > .rendered-markdown li > p {
@@ -1538,6 +1534,10 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	gap: 7px;
 	margin: 0 0 6px 4px;
 
+	/* Tool calls transition from a progress to a collapsible list part, which needs to have this top padding.
+	The working progress also can be replaced by a tool progress part. So align this padding so the text doesn't appear to shift. */
+	padding-top: 2px;
+
 	> .codicon[class*='codicon-'] {
 		height: 12px;
 		font-size: 12px;

From 8ecf362d5277569d83ddb1190fb467079be906cf Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sun, 23 Feb 2025 21:08:03 +0100
Subject: [PATCH 0289/1815] chat - more status tweaks (#241639)

---
 .../contrib/chat/browser/chatStatus.ts        | 93 +++++++++++++------
 .../contrib/chat/browser/media/chatStatus.css | 16 ++++
 2 files changed, 82 insertions(+), 27 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 22742da5292d..7450514ec564 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -5,7 +5,7 @@
 
 import './media/chatStatus.css';
 import { safeIntl } from '../../../../base/common/date.js';
-import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { language, OS } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
@@ -17,11 +17,13 @@ import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarA
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatQuotasService } from '../common/chatQuotasService.js';
 import { quotaToButtonMessage, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, TOGGLE_CHAT_ACTION_ID, CHAT_OPEN_ACTION_ID } from './actions/chatActions.js';
-import { $, append } from '../../../../base/browser/dom.js';
+import { $, addDisposableListener, append, EventType } from '../../../../base/browser/dom.js';
 import { IChatEntitlementsService } from '../common/chatEntitlementsService.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
-import { defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { defaultCheckboxStyles, defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { Checkbox } from '../../../../base/browser/ui/toggle/toggle.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 
 export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
 
@@ -30,7 +32,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	private readonly treatment = this.assignmentService.getTreatment<boolean>('config.chat.experimental.statusIndicator.enabled'); //TODO@bpasero remove this experiment eventually
 
 	private entry: IStatusbarEntryAccessor | undefined = undefined;
-	private readonly entryDisposables = this._register(new DisposableStore());
+	private readonly entryDisposables = this._register(new MutableDisposable());
 
 	private dateFormatter = safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric' });
 
@@ -41,7 +43,8 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IWorkbenchAssignmentService private readonly assignmentService: IWorkbenchAssignmentService,
 		@IProductService private readonly productService: IProductService,
-		@IKeybindingService private readonly keybindingService: IKeybindingService
+		@IKeybindingService private readonly keybindingService: IKeybindingService,
+		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		super();
 
@@ -88,7 +91,8 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	}
 
 	private getEntryProps(): IStatusbarEntry {
-		this.entryDisposables.clear();
+		const disposables = new DisposableStore();
+		this.entryDisposables.value = disposables;
 
 		let text = '$(copilot)';
 		let ariaLabel = localize('chatStatus', "Copilot Status");
@@ -138,24 +142,25 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 				container.appendChild($('div', undefined, localize('limitTitle', "You are currently using Copilot Free:")));
 
-				const chatQuotaIndicator = this.createQuotaIndicator(chatTotal, chatRemaining, localize('chatsLabel', "Chat Messages"));
-				container.appendChild(chatQuotaIndicator.element);
-
-				const completionsQuotaIndicator = this.createQuotaIndicator(completionsTotal, completionsRemaining, localize('completionsLabel', "Code Completions"));
-				container.appendChild(completionsQuotaIndicator.element);
+				const chatQuotaIndicator = this.createQuotaIndicator(container, chatTotal, chatRemaining, localize('chatsLabel', "Chat Messages"));
+				const completionsQuotaIndicator = this.createQuotaIndicator(container, completionsTotal, completionsRemaining, localize('completionsLabel', "Code Completions"));
 
 				this.chatEntitlementsService.resolve(CancellationToken.None).then(() => {
 					const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = this.chatQuotasService.quotas;
 
-					chatQuotaIndicator.update(chatTotal, chatRemaining);
-					completionsQuotaIndicator.update(completionsTotal, completionsRemaining);
+					chatQuotaIndicator(chatTotal, chatRemaining);
+					completionsQuotaIndicator(completionsTotal, completionsRemaining);
 				});
 
 				container.appendChild($('div', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.format(quotaResetDate))));
 
+				// Settings
+				container.appendChild(document.createElement('hr'));
+				this.createSettings(container, disposables);
+
 				// Shortcuts
 				container.appendChild(document.createElement('hr'));
-				this.createShortcuts(container);
+				this.createShortcuts(container, disposables);
 
 				return container;
 			};
@@ -165,7 +170,13 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		else {
 			tooltip = () => {
 				const container = $('div.chat-status-bar-entry-tooltip');
-				this.createShortcuts(container);
+
+				// Settings
+				this.createSettings(container, disposables);
+
+				// Shortcuts
+				container.appendChild($('hr'));
+				this.createShortcuts(container, disposables);
 
 				return container;
 			};
@@ -182,10 +193,11 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		};
 	}
 
-	private createQuotaIndicator(total: number | undefined, remaining: number | undefined, label: string): { element: HTMLElement; update: (total: number | undefined, remaining: number | undefined) => void } {
+	private createQuotaIndicator(container: HTMLElement, total: number | undefined, remaining: number | undefined, label: string): (total: number | undefined, remaining: number | undefined) => void {
 		const quotaText = $('span');
 		const quotaBit = $('div.quota-bit');
-		const quotaContainer = $('div.quota-indicator', undefined,
+
+		container.appendChild($('div.quota-indicator', undefined,
 			$('div.quota-label', undefined,
 				$('span', undefined, label),
 				quotaText
@@ -193,7 +205,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			$('div.quota-bar', undefined,
 				quotaBit
 			)
-		);
+		));
 
 		const update = (total: number | undefined, remaining: number | undefined) => {
 			if (typeof total === 'number' && typeof remaining === 'number') {
@@ -204,13 +216,10 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 		update(total, remaining);
 
-		return {
-			element: quotaContainer,
-			update
-		};
+		return update;
 	}
 
-	private createShortcuts(container: HTMLElement): HTMLElement {
+	private createShortcuts(container: HTMLElement, disposables: DisposableStore): HTMLElement {
 		const shortcuts = container.appendChild($('div.shortcuts'));
 
 		const openChat = { text: localize('shortcuts.chat', "Chat"), id: CHAT_OPEN_ACTION_ID };
@@ -225,13 +234,43 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 			const shortcut = append(shortcuts, $('div.shortcut'));
 
-			const labelValue = append(shortcut, $('span.shortcut-label'));
-			labelValue.textContent = entry.text;
+			append(shortcut, $('span.shortcut-label', undefined, entry.text));
 
-			const labelKey = this.entryDisposables.add(new KeybindingLabel(shortcut, OS, { ...defaultKeybindingLabelStyles }));
-			labelKey.set(keys);
+			const shortcutKey = disposables.add(new KeybindingLabel(shortcut, OS, { ...defaultKeybindingLabelStyles }));
+			shortcutKey.set(keys);
 		}
 
 		return shortcuts;
 	}
+
+	private createSettings(container: HTMLElement, disposables: DisposableStore): HTMLElement {
+		const settings = container.appendChild($('div.settings'));
+
+		const toggleCompletions = { text: localize('settings.toggleCompletions', "Code Completions"), id: 'editor.inlineSuggest.enabled' };
+		const toggleNextEditSuggestions = { text: localize('settings.toggleNextEditSuggestions', "Next Edit Suggestions (Preview)"), id: 'github.copilot.nextEditSuggestions.enabled' };
+
+		for (const entry of [toggleCompletions, toggleNextEditSuggestions]) {
+			const checked = Boolean(this.configurationService.getValue<boolean>(entry.id));
+
+			const setting = append(settings, $('div.setting'));
+
+			const checkbox = this._register(new Checkbox(entry.text, checked, defaultCheckboxStyles));
+			setting.appendChild(checkbox.domNode);
+
+			const settingLabel = append(setting, $('span.setting-label', undefined, entry.text));
+			disposables.add(addDisposableListener(settingLabel, EventType.CLICK, e => {
+				if (checkbox?.enabled && (e.target as HTMLElement).tagName !== 'A') {
+					checkbox.checked = !checkbox.checked;
+					this.configurationService.updateValue(entry.id, checkbox.checked);
+					checkbox.focus();
+				}
+			}));
+
+			disposables.add(checkbox.onChange(() => {
+				this.configurationService.updateValue(entry.id, checkbox.checked);
+			}));
+		}
+
+		return settings;
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
index 4a6d225f93c0..b102e539997c 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
@@ -10,6 +10,22 @@
 	margin-bottom: 8px;
 }
 
+/* Settings */
+
+.chat-status-bar-entry-tooltip .settings {
+	display: flex;
+	flex-direction: column;
+	gap: 5px;
+}
+
+.chat-status-bar-entry-tooltip .settings .setting .codicon {
+	font-size: 16px;
+}
+
+.chat-status-bar-entry-tooltip .settings .setting .setting-label {
+	cursor: pointer;
+}
+
 /* Shortcuts */
 
 .chat-status-bar-entry-tooltip .shortcuts {

From ffc463fe60d253e95c74c0a50737e63130e30a66 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Sun, 23 Feb 2025 14:50:53 -0800
Subject: [PATCH 0290/1815] Improve notebook edit navigation (#241535)

---
 .../chatEditingModifiedNotebookEntry.ts       |   2 +
 .../chatEditingNotebookEditorIntegration.ts   | 244 ++++++++++++++----
 .../notebookDeletedCellDecorator.ts           |  18 +-
 3 files changed, 209 insertions(+), 55 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index b065995f2858..b947c21aab6b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -393,6 +393,8 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				return d;
 			});
 			this._cellDiffInfo.set(diff, undefined);
+			const changeCount = countChanges(this._cellDiffInfo.get());
+			this._changesCount.set(changeCount, undefined);
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
index 5b92d7e8a708..f6f9258f0edd 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
@@ -59,8 +59,13 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 	private readonly _currentCell = observableValue<NotebookCellTextModel | undefined>(this, undefined);
 	readonly currentCell: IObservable<NotebookCellTextModel | undefined> = this._currentCell;
 
+	private readonly _currentChange = observableValue<{ change: ICellDiffInfo; index: number } | undefined>(this, undefined);
+	readonly currentChange: IObservable<{ change: ICellDiffInfo; index: number } | undefined> = this._currentChange;
+
 	private readonly cellEditorIntegrations = new Map<NotebookCellTextModel, { integration: ChatEditingCodeEditorIntegration; diff: ISettableObservable<IDocumentDiff2> }>();
 
+	private readonly insertDeleteDecorators: IObservable<{ insertedCellDecorator: NotebookInsertedCellDecorator; deletedCellDecorator: NotebookDeletedCellDecorator } | undefined>;
+
 	constructor(
 		private readonly _entry: IModifiedFileEntry,
 		private readonly notebookEditor: INotebookEditor,
@@ -99,7 +104,9 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 		}));
 
 		this._register(autorun(r => {
-			const changes = cellChanges.read(r).filter(c => c.type !== 'unchanged' && c.type !== 'delete');
+			const sortedCellChanges = sortCellChanges(cellChanges.read(r));
+
+			const changes = sortedCellChanges.filter(c => c.type !== 'unchanged' && c.type !== 'delete');
 			onDidChangeVisibleRanges.read(r);
 			if (!changes.length) {
 				this.cellEditorIntegrations.forEach(({ diff }) => {
@@ -121,13 +128,6 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 				} else {
 					const diff2 = observableValue(`diff${cell.handle}`, diff.diff);
 					const integration = this.instantiationService.createInstance(ChatEditingCodeEditorIntegration, _entry, editor, diff2);
-					this._register(autorun((r) => {
-						const current = integration.currentIndex.read(r);
-						const indexOfChange = current >= 0 ? this.getIndexOfChange(cell, current) : -1;
-						if (indexOfChange >= 0) {
-							this._currentIndex.set(indexOfChange, undefined);
-						}
-					}));
 					this.cellEditorIntegrations.set(cell, { integration, diff: diff2 });
 					this._register(integration);
 					this._register(editor.onDidDispose(() => {
@@ -150,10 +150,29 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 					this.cellEditorIntegrations.delete(cell);
 				}
 			});
+
+			// set initial index
+			this._currentIndex.set(0, undefined);
+			this._revealChange(sortedCellChanges[0]);
+
+			this._register(autorun(r => {
+				const currentChange = this.currentChange.read(r);
+				if (currentChange) {
+					const change = currentChange.change;
+					const indexInChange = currentChange.index;
+					const diffChangeIndex = sortCellChanges(this.cellChanges.get().filter(c => c.type !== 'unchanged')).findIndex(c => c === change);
+
+					if (diffChangeIndex !== -1) {
+						this._currentIndex.set(diffChangeIndex + indexInChange, undefined);
+					}
+				} else {
+					this._currentIndex.set(-1, undefined);
+				}
+			}));
 		}));
 
 
-		const insertDeleteDecorators = derivedWithStore((r, store) => {
+		this.insertDeleteDecorators = derivedWithStore((r, store) => {
 			if (!notebookEdotirViewModelAttached.read(r)) {
 				return;
 			}
@@ -169,7 +188,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 
 		this._register(autorun(r => {
 			const changes = cellChanges.read(r);
-			const decorators = insertDeleteDecorators.read(r);
+			const decorators = this.insertDeleteDecorators.read(r);
 			if (decorators) {
 				decorators.insertedCellDecorator.apply(changes);
 				decorators.deletedCellDecorator.apply(changes, originalModel);
@@ -177,18 +196,6 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 		}));
 	}
 
-	private getIndexOfChange(cell: NotebookCellTextModel, change: number): number {
-		if (this.getCurrentCell()?.cell !== cell) {
-			return -1;
-		}
-		const cellIndex = this.notebookModel.cells.findIndex(c => c.handle === cell.handle);
-		const indexOfCellChange = this.cellChanges.get().findIndex(c => c.modifiedCellIndex === cellIndex);
-		if (indexOfCellChange === -1) {
-			return -1;
-		}
-		// Count all changes upto this cell.
-		return countChanges(this.cellChanges.get().slice(0, indexOfCellChange)) + change;
-	}
 	getCurrentCell() {
 		const activeCell = this.notebookModel.cells.find(c => c.handle === this.notebookEditor.getActiveCell()?.handle) || this._currentCell.get();
 		if (!activeCell) {
@@ -246,55 +253,156 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 	}
 
 	reveal(firstOrLast: boolean): void {
-		const changes = this.cellChanges.get().filter(c => c.type === 'modified' || c.type === 'insert');
+		const changes = sortCellChanges(this.cellChanges.get().filter(c => c.type !== 'unchanged'));
 		if (!changes.length) {
 			return undefined;
 		}
-		const index = firstOrLast ?
-			changes.reduce((prev, curr) => prev.modifiedCellIndex < curr.modifiedCellIndex ? prev : curr).modifiedCellIndex :
-			changes.reduce((prev, curr) => prev.modifiedCellIndex > curr.modifiedCellIndex ? prev : curr).modifiedCellIndex;
-		const info = this.getCell(index);
-		if (info) {
-			this.selectCell(info.cell);
-			info.integration.reveal(firstOrLast);
+		const change = firstOrLast ? changes[0] : changes[changes.length - 1];
+		this._revealChange(change, firstOrLast);
+	}
+
+	private _revealChange(change: ICellDiffInfo, firstOrLast?: boolean) {
+		switch (change.type) {
+			case 'insert':
+			case 'modified':
+				{
+					const cell = this.getCell(change.modifiedCellIndex);
+					if (!cell) {
+						return false;
+					}
+
+					cell.integration.reveal(firstOrLast ?? true);
+					this._currentChange.set({ change: change, index: cell.integration.currentIndex.get() }, undefined);
+
+					return true;
+				}
+			case 'delete':
+				// reveal the deleted cell decorator
+				this._currentCell.set(undefined, undefined);
+				this.insertDeleteDecorators.get()?.deletedCellDecorator.reveal(change.originalCellIndex);
+				this._currentChange.set({ change: change, index: 0 }, undefined);
+				return true;
+			default:
+				break;
 		}
+
+		return false;
 	}
 
 	next(wrap: boolean): boolean {
-		const info = this.getCurrentCell();
-		if (!info) {
-			return false;
-		}
-		if (info.integration.next(wrap)) {
-			return true;
-		} else {
-			const info = this.getNextCell(true);
-			if (info) {
-				this.selectCell(info.cell);
-				this.selectCell(info.cell);
-				info.integration.reveal(true);
-				return true;
+		const changes = sortCellChanges(this.cellChanges.get().filter(c => c.type !== 'unchanged'));
+		const currentChange = this.currentChange.get();
+		if (!currentChange) {
+			const firstChange = changes[0];
+
+			if (firstChange) {
+				this._currentCell.set(undefined, undefined);
+				return this._revealChange(firstChange);
 			}
+
 			return false;
 		}
+
+		// go to next
+		// first check if we are at the end of the current change
+		switch (currentChange.change.type) {
+			case 'modified':
+				{
+					const currentChangeInfo = this.getCell(currentChange.change.modifiedCellIndex);
+					if (!currentChangeInfo) {
+						return false;
+					}
+
+					if (currentChangeInfo.integration.next(false)) {
+						this._currentChange.set({ change: currentChange.change, index: currentChangeInfo.integration.currentIndex.get() }, undefined);
+						return true;
+					} else {
+						const nextChange = changes[changes.indexOf(currentChange.change) + 1];
+						if (nextChange) {
+							return this._revealChange(nextChange, true);
+						}
+					}
+				}
+				break;
+			case 'insert':
+			case 'delete':
+				{
+					// go to next change directly
+					const nextChange = changes[changes.indexOf(currentChange.change) + 1];
+					if (nextChange) {
+						return this._revealChange(nextChange, true);
+					}
+				}
+				break;
+			default:
+				break;
+		}
+
+		if (wrap) {
+			return this.next(false);
+		}
+
+		return false;
 	}
+
 	previous(wrap: boolean): boolean {
-		const info = this.getCurrentCell();
-		if (!info) {
+		const changes = sortCellChanges(this.cellChanges.get().filter(c => c.type !== 'unchanged'));
+		const currentChange = this.currentChange.get();
+		if (!currentChange) {
+			const lastChange = changes[changes.length - 1];
+			if (lastChange) {
+				this._currentCell.set(undefined, undefined);
+				return this._revealChange(lastChange, false);
+			}
+
 			return false;
 		}
-		if (info.integration.previous(wrap)) {
-			return true;
-		} else {
-			const info = this.getNextCell(false);
-			if (info) {
-				this.selectCell(info.cell);
-				info.integration.reveal(false);
-				return true;
+
+		// go to previous
+		// first check if we are at the start of the current change
+		switch (currentChange.change.type) {
+			case 'modified':
+				{
+					const currentChangeInfo = this.getCell(currentChange.change.modifiedCellIndex);
+					if (!currentChangeInfo) {
+						return false;
+					}
+
+					if (currentChangeInfo.integration.previous(false)) {
+						this._currentChange.set({ change: currentChange.change, index: currentChangeInfo.integration.currentIndex.get() }, undefined);
+						return true;
+					} else {
+						const prevChange = changes[changes.indexOf(currentChange.change) - 1];
+						if (prevChange) {
+							return this._revealChange(prevChange, false);
+						}
+					}
+				}
+				break;
+			case 'insert':
+			case 'delete':
+				{
+					// go to previous change directly
+					const prevChange = changes[changes.indexOf(currentChange.change) - 1];
+					if (prevChange) {
+						return this._revealChange(prevChange, false);
+					}
+				}
+				break;
+			default:
+				break;
+		}
+
+		if (wrap) {
+			const lastChange = changes[changes.length - 1];
+			if (lastChange) {
+				return this._revealChange(lastChange, false);
 			}
-			return false;
 		}
+
+		return false;
 	}
+
 	enableAccessibleDiffView(): void {
 		this.getCurrentCell()?.integration.enableAccessibleDiffView();
 	}
@@ -335,3 +443,31 @@ export function countChanges(changes: ICellDiffInfo[]): number {
 	}, 0);
 
 }
+
+export function sortCellChanges(changes: ICellDiffInfo[]): ICellDiffInfo[] {
+	return [...changes].sort((a, b) => {
+		// For unchanged and modified, use modifiedCellIndex
+		if ((a.type === 'unchanged' || a.type === 'modified') &&
+			(b.type === 'unchanged' || b.type === 'modified')) {
+			return a.modifiedCellIndex - b.modifiedCellIndex;
+		}
+
+		// For delete entries, use originalCellIndex
+		if (a.type === 'delete' && b.type === 'delete') {
+			return a.originalCellIndex - b.originalCellIndex;
+		}
+
+		// For insert entries, use modifiedCellIndex
+		if (a.type === 'insert' && b.type === 'insert') {
+			return a.modifiedCellIndex - b.modifiedCellIndex;
+		}
+
+		// Mixed types: compare based on available indices
+		const aIndex = a.type === 'delete' ? a.originalCellIndex :
+			(a.type === 'insert' ? a.modifiedCellIndex : a.modifiedCellIndex);
+		const bIndex = b.type === 'delete' ? b.originalCellIndex :
+			(b.type === 'insert' ? b.modifiedCellIndex : b.modifiedCellIndex);
+
+		return aIndex - bIndex;
+	});
+}
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 da5c81ba2252..663788a92c30 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.ts
@@ -40,7 +40,7 @@ export class NotebookDeletedCellDecorator extends Disposable implements INoteboo
 		}
 		const cells = this._notebookEditor.getCellsInRange({ start: info.previousIndex, end: info.previousIndex + 1 });
 		if (!cells.length) {
-			return;
+			return this._notebookEditor.getLayoutInfo().height + info.offset;
 		}
 		const cell = cells[0];
 		const cellHeight = this._notebookEditor.getHeightOfElement(cell);
@@ -48,6 +48,22 @@ export class NotebookDeletedCellDecorator extends Disposable implements INoteboo
 		return top + cellHeight + info.offset;
 	}
 
+	reveal(deletedIndex: number) {
+		const top = this.getTop(deletedIndex);
+		if (typeof top === 'number') {
+			this._notebookEditor.focusContainer();
+			this._notebookEditor.revealOffsetInCenterIfOutsideViewport(top);
+
+			const info = this.deletedCellInfos.get(deletedIndex);
+
+			if (info) {
+				const prevIndex = info.previousIndex;
+				this._notebookEditor.setFocus({ start: prevIndex, end: prevIndex });
+				this._notebookEditor.setSelections([{ start: prevIndex, end: prevIndex }]);
+			}
+		}
+	}
+
 	public apply(diffInfo: CellDiffInfo[], original: NotebookTextModel): void {
 		this.clear();
 

From d1bf60ba33669d65c9d2a7b4fd011fb558de2333 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Mon, 24 Feb 2025 12:31:34 +1100
Subject: [PATCH 0291/1815] Use synchronizer only if notebook isn't open
 (#241650)

* Use synchronizer only if notebook isn't open

* Log failure to restore snapshot
---
 .../chatEditing/chatEditingModifiedNotebookEntry.ts      | 9 +++++++--
 .../chat/browser/chatEditing/chatEditingSession.ts       | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index b947c21aab6b..1879a02d2bb3 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -569,8 +569,13 @@ function createSnapshot(notebook: NotebookTextModel, transientOptions: Transient
 }
 
 function restoreSnapshot(notebook: NotebookTextModel, snapshot: string): void {
-	const { transientOptions, data } = deserializeSnapshot(snapshot);
-	notebook.restoreSnapshot(data, transientOptions);
+	try {
+		const { transientOptions, data } = deserializeSnapshot(snapshot);
+		notebook.restoreSnapshot(data, transientOptions);
+	}
+	catch (ex) {
+		console.error('Error restoring Notebook snapshot', ex);
+	}
 }
 
 function serializeSnapshot(data: NotebookData, transientOptions: TransientOptions | undefined): string {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index ba88a430f421..3734e3f81b80 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -1034,7 +1034,8 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		const chatKind = mustExist ? ChatEditKind.Created : ChatEditKind.Modified;
 		try {
 			const notebookUri = CellUri.parse(resource)?.notebook || resource;
-			if (this._notebookService.hasSupportedNotebooks(notebookUri)) {
+			// If a notebook isn't open, then use the old synchronization approach.
+			if (this._notebookService.hasSupportedNotebooks(notebookUri) && this._notebookService.getNotebookTextModel(notebookUri)) {
 				return ChatEditingModifiedNotebookEntry.create(notebookUri, multiDiffEntryDelegate, telemetryInfo, chatKind, initialContent, this._instantiationService);
 			} else {
 				const ref = await this._textModelService.createModelReference(resource);

From e16693a5c6fa509429f7c685c2d12b0e53ad39f9 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Sun, 23 Feb 2025 20:21:32 -0800
Subject: [PATCH 0292/1815] Diff hunk toolbar for deleted cell (#241422)

* Diff hunk toolbar for deleted cell

* Fix scoped context key service
---
 src/vs/platform/actions/common/actions.ts     |   1 +
 .../chatEditingModifiedNotebookEntry.ts       | 105 +++++++++++++++---
 .../chatEditingNotebookEditorIntegration.ts   |  46 ++++++--
 .../chatEdit/notebookChatEditController.ts    |   2 +-
 .../notebookDeletedCellDecorator.ts           |  46 +++++++-
 .../diff/inlineDiff/notebookInlineDiff.ts     |   2 +-
 6 files changed, 170 insertions(+), 32 deletions(-)

diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index f5350e998e82..ab2b28b2bbf0 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -234,6 +234,7 @@ export class MenuId {
 	static readonly ChatEditingWidgetToolbar = new MenuId('ChatEditingWidgetToolbar');
 	static readonly ChatEditingEditorContent = new MenuId('ChatEditingEditorContent');
 	static readonly ChatEditingEditorHunk = new MenuId('ChatEditingEditorHunk');
+	static readonly ChatEditingDeletedNotebookCell = new MenuId('ChatEditingDeletedNotebookCell');
 	static readonly ChatInputAttachmentToolbar = new MenuId('ChatInputAttachmentToolbar');
 	static readonly ChatEditingWidgetModifiedFilesToolbar = new MenuId('ChatEditingWidgetModifiedFilesToolbar');
 	static readonly ChatInputResourceAttachmentContext = new MenuId('ChatInputResourceAttachmentContext');
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 1879a02d2bb3..b4b957a0e73a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -44,7 +44,7 @@ import { ChatEditingNotebookFileSystemProvider } from '../../../notebook/browser
 import { getNotebookEditorFromEditorPane } from '../../../notebook/browser/notebookBrowser.js';
 import { NotebookCellTextModel } from '../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
-import { CellEditType, ICellEditOperation, ICellReplaceEdit, IResolvedNotebookEditorModel, NotebookData, NotebookSetting, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
+import { CellEditType, ICellDto2, ICellEditOperation, ICellReplaceEdit, IResolvedNotebookEditorModel, NotebookData, NotebookSetting, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
 import { INotebookEditorModelResolverService } from '../../../notebook/common/notebookEditorModelResolverService.js';
 import { INotebookService } from '../../../notebook/common/notebookService.js';
 import { ChatEditKind, IModifiedFileEntryEditorIntegration, WorkingSetEntryState } from '../../common/chatEditingService.js';
@@ -52,7 +52,7 @@ import { IChatResponseModel } from '../../common/chatModel.js';
 import { IChatService } from '../../common/chatService.js';
 import { IDocumentDiff2 } from './chatEditingCodeEditorIntegration.js';
 import { AbstractChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISnapshotEntry, pendingRewriteMinimap } from './chatEditingModifiedFileEntry.js';
-import { ChatEditingNotebookEditorIntegration, countChanges, ICellDiffInfo } from './chatEditingNotebookEditorIntegration.js';
+import { ChatEditingNotebookEditorIntegration, countChanges, ICellDiffInfo, sortCellChanges } from './chatEditingNotebookEditorIntegration.js';
 import { ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
 
 
@@ -312,7 +312,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			return;
 		}
 		if (edit.count === 0) {
-			const diff = this._cellDiffInfo.get().slice();
+			const diff = sortCellChanges(this._cellDiffInfo.get()).slice();
 			// All existing indexes are shifted by number of cells added.
 			diff.forEach(d => {
 				if (d.type !== 'delete' && d.modifiedCellIndex >= edit.index) {
@@ -360,11 +360,11 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				} satisfies ICellDiffInfo;
 			}));
 			diff.splice(edit.index + 1, 0, ...diffInsert);
-			this._cellDiffInfo.set(diff, undefined);
+			this._cellDiffInfo.set(sortCellChanges(diff), undefined);
 		} else {
 			// All existing indexes are shifted by number of cells removed.
 			// And unchanged cells should be converted to deleted cells.
-			const diff = this._cellDiffInfo.get().slice().map(d => {
+			const diff = sortCellChanges(this._cellDiffInfo.get()).slice().map(d => {
 				if (d.type === 'unchanged' && d.modifiedCellIndex >= edit.index && d.modifiedCellIndex <= (edit.index + edit.count - 1)) {
 					const originalCell = this.originalModel.cells[d.originalCellIndex];
 					const lines = new Array(originalCell.textBuffer.getLineCount()).fill(0).map((_, i) => originalCell.textBuffer.getLineContent(i + 1));
@@ -372,6 +372,16 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 					const modifiedRange = new Range(1, 0, 1, 0);
 					const innerChanges = new RangeMapping(modifiedRange, originalRange);
 					const changes = [new DetailedLineRangeMapping(new LineRange(1, lines.length), new LineRange(1, 1), [innerChanges])];
+					const modifiedModel = this._register(this.modelService.createModel('', null, URI.parse(`vscode-chat:///empty${d.originalCellIndex}`)));
+					const originalModel = this.originalModel.cells[d.originalCellIndex];
+					const keep = async () => {
+						await this._applyEdits(async () => this.keepPreviouslyDeletedCell(d.originalCellIndex));
+						return true;
+					};
+					const undo = async () => {
+						await this._applyEdits(async () => this.undoPreviouslyDeletedCell(d.originalCellIndex, originalModel));
+						return true;
+					};
 
 					// This will be deleted.
 					return {
@@ -382,7 +392,11 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 							changes,
 							identical: false,
 							moves: [],
-							quitEarly: false
+							quitEarly: false,
+							originalModel: originalModel.textModel!,
+							modifiedModel: modifiedModel,
+							keep,
+							undo,
 						}
 					} satisfies ICellDiffInfo;
 				}
@@ -393,31 +407,33 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				return d;
 			});
 			this._cellDiffInfo.set(diff, undefined);
-			const changeCount = countChanges(this._cellDiffInfo.get());
-			this._changesCount.set(changeCount, undefined);
+			this._changesCount.set(countChanges(this._cellDiffInfo.get()), undefined);
 		}
 	}
 
 	private undoPreviouslyInsertedCell(cell: NotebookCellTextModel) {
 		const index = this.modifiedModel.cells.indexOf(cell);
-		const diff = this._cellDiffInfo.get().slice().map(d => {
+		const diff = sortCellChanges(this._cellDiffInfo.get()).slice().map(d => {
 			if (d.type === 'insert' && d.modifiedCellIndex === index) {
 				return d;
 			}
 			if (d.type !== 'delete' && d.modifiedCellIndex > index) {
-				d.modifiedCellIndex -= 1;
-				return d;
+				return {
+					...d,
+					modifiedCellIndex: d.modifiedCellIndex - 1,
+				};
 			}
 			return d;
 		}).filter(d => !(d.type === 'insert' && d.modifiedCellIndex === index));
 		const edit: ICellReplaceEdit = { cells: [], count: 1, editType: CellEditType.Replace, index, };
 		this.modifiedModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
 		this._cellDiffInfo.set(diff, undefined);
+		this._changesCount.set(countChanges(this._cellDiffInfo.get()), undefined);
 	}
 
 	private keepPreviouslyInsertedCell(cell: NotebookCellTextModel) {
 		const index = this.modifiedModel.cells.indexOf(cell);
-		const diff = this._cellDiffInfo.get().slice().map(d => {
+		const diff = sortCellChanges(this._cellDiffInfo.get()).slice().map(d => {
 			if (d.type === 'insert' && d.modifiedCellIndex === index) {
 				return {
 					type: 'insert',
@@ -432,13 +448,68 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 					}
 				} satisfies ICellDiffInfo;
 			}
-			if (d.type !== 'delete' && d.modifiedCellIndex > index) {
-				d.modifiedCellIndex -= 1;
-				return d;
-			}
 			return d;
 		}).filter(d => !(d.type === 'insert' && d.modifiedCellIndex === index));
 		this._cellDiffInfo.set(diff, undefined);
+		this._changesCount.set(countChanges(this._cellDiffInfo.get()), undefined);
+	}
+
+	private async undoPreviouslyDeletedCell(deletedOriginalIndex: number, originalCell: NotebookCellTextModel) {
+		// Find where we should insert this cell.
+		const index = sortCellChanges(this._cellDiffInfo.get()).reverse().reduce((previous, curr) => {
+			if (curr.type === 'delete' || curr.type === 'insert') {
+				return previous;
+			}
+			if (curr.originalCellIndex <= deletedOriginalIndex) {
+				return previous;
+			}
+			if (curr.modifiedCellIndex < previous) {
+				return curr.modifiedCellIndex;
+			}
+			return previous;
+		}, this.modifiedModel.cells.length - 1);
+
+		const diff = sortCellChanges(this._cellDiffInfo.get()).slice()
+			.map(d => {
+				if (d.type !== 'delete' && d.modifiedCellIndex >= index) {
+					return {
+						...d,
+						modifiedCellIndex: d.modifiedCellIndex + 1,
+					};
+				}
+				return d;
+			}).filter(d => !(d.type === 'delete' && d.originalCellIndex === deletedOriginalIndex));
+
+		const cellToInsert: ICellDto2 = {
+			cellKind: originalCell.cellKind,
+			language: originalCell.language,
+			metadata: originalCell.metadata,
+			outputs: originalCell.outputs,
+			source: originalCell.getValue(),
+			mime: originalCell.mime
+		};
+		const edit: ICellReplaceEdit = { cells: [cellToInsert], count: 0, editType: CellEditType.Replace, index, };
+		this.modifiedModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+		const newCell = this.modifiedModel.cells[index + 1];
+		const modifiedModel = newCell.textModel ?? this._register((await this.textModelService.createModelReference(newCell.uri))).object.textEditorModel;
+		this.modifiedCellModels.set(newCell.uri, modifiedModel);
+		this.modifiedToOriginalCellMap.set(newCell.uri, originalCell.textModel!);
+		const unchangedCell: ICellDiffInfo = {
+			type: 'unchanged',
+			modifiedCellIndex: index,
+			originalCellIndex: deletedOriginalIndex,
+			diff: this.getDiffForUnchangedCell(newCell)
+		};
+		diff.push(unchangedCell);
+		this._cellDiffInfo.set(sortCellChanges(diff), undefined);
+		this._changesCount.set(countChanges(this._cellDiffInfo.get()), undefined);
+	}
+
+
+	private keepPreviouslyDeletedCell(deletedOriginalIndex: number) {
+		const diff = sortCellChanges(this._cellDiffInfo.get()).slice().filter(d => !(d.type === 'delete' && d.originalCellIndex === deletedOriginalIndex));
+		this._cellDiffInfo.set(diff, undefined);
+		this._changesCount.set(countChanges(this._cellDiffInfo.get()), undefined);
 	}
 
 	private async _applyEdits(operation: () => Promise<void>) {
@@ -549,7 +620,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			maxModifiedLineNumbers[index] = maxModifiedLineNumber;
 
 			transaction(tx => {
-				this._cellDiffInfo.set(diffs, tx);
+				this._cellDiffInfo.set(sortCellChanges(diffs), tx);
 				this._changesCount.set(changeCount, tx);
 				this._maxModifiedLineNumbers.set(maxModifiedLineNumbers, tx);
 			});
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
index f6f9258f0edd..9d12de1f215c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
@@ -7,8 +7,9 @@ import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { autorun, derivedWithStore, IObservable, ISettableObservable, observableFromEvent, observableValue } from '../../../../../base/common/observable.js';
 import { debouncedObservable } from '../../../../../base/common/observableInternal/utils.js';
 import { basename } from '../../../../../base/common/resources.js';
-import { IDocumentDiff, nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
+import { nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
 import { localize } from '../../../../../nls.js';
+import { MenuId } from '../../../../../platform/actions/common/actions.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IResourceDiffEditorInput } from '../../../../common/editor.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
@@ -41,7 +42,7 @@ export type ICellDiffInfo = {
 	modifiedCellIndex: undefined;
 	originalCellIndex: number;
 	type: 'delete';
-	diff: IDocumentDiff; // List of all the lines deleted.
+	diff: IDocumentDiff2; // List of all the lines deleted.
 } |
 {
 	modifiedCellIndex: number;
@@ -88,11 +89,12 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 
 			if (!_entry.isCurrentlyBeingModifiedBy.read(r)
 				&& lastModifyingRequestId !== _entry.lastModifyingRequestId
-				&& cellChanges.read(r).some(c => c.type !== 'unchanged' && c.type !== 'delete')
+				&& cellChanges.read(r).some(c => c.type !== 'unchanged' && c.type !== 'delete' && !c.diff.identical && !c.diff.identical)
 			) {
 				lastModifyingRequestId = _entry.lastModifyingRequestId;
 				const firstModifiedCell = cellChanges.read(r).
 					filter(c => c.type !== 'unchanged' && c.type !== 'delete').
+					filter(c => !c.diff.identical).
 					reduce((prev, curr) => curr.modifiedCellIndex < prev ? curr.modifiedCellIndex : prev, Number.MAX_SAFE_INTEGER);
 				if (typeof firstModifiedCell !== 'number' || firstModifiedCell === Number.MAX_SAFE_INTEGER) {
 					return;
@@ -106,7 +108,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 		this._register(autorun(r => {
 			const sortedCellChanges = sortCellChanges(cellChanges.read(r));
 
-			const changes = sortedCellChanges.filter(c => c.type !== 'unchanged' && c.type !== 'delete');
+			const changes = sortedCellChanges.filter(c => c.type !== 'unchanged' && c.type !== 'delete' && !c.diff.identical);
 			onDidChangeVisibleRanges.read(r);
 			if (!changes.length) {
 				this.cellEditorIntegrations.forEach(({ diff }) => {
@@ -117,6 +119,9 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 
 			const validCells = new Set<NotebookCellTextModel>();
 			changes.forEach((diff) => {
+				if (diff.modifiedCellIndex === undefined) {
+					return;
+				}
 				const cell = notebookModel.cells[diff.modifiedCellIndex];
 				const editor = notebookEditor.codeEditors.find(([vm,]) => vm.handle === notebookModel.cells[diff.modifiedCellIndex].handle)?.[1];
 				if (!editor || !cell) {
@@ -160,7 +165,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 				if (currentChange) {
 					const change = currentChange.change;
 					const indexInChange = currentChange.index;
-					const diffChangeIndex = sortCellChanges(this.cellChanges.get().filter(c => c.type !== 'unchanged')).findIndex(c => c === change);
+					const diffChangeIndex = sortCellChanges(this.cellChanges.get().filter(c => c.type !== 'unchanged' && !c.diff.identical)).findIndex(c => c === change);
 
 					if (diffChangeIndex !== -1) {
 						this._currentIndex.set(diffChangeIndex + indexInChange, undefined);
@@ -171,14 +176,35 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 			}));
 		}));
 
-
 		this.insertDeleteDecorators = derivedWithStore((r, store) => {
 			if (!notebookEdotirViewModelAttached.read(r)) {
 				return;
 			}
 
 			const insertedCellDecorator = store.add(this.instantiationService.createInstance(NotebookInsertedCellDecorator, this.notebookEditor));
-			const deletedCellDecorator = store.add(this.instantiationService.createInstance(NotebookDeletedCellDecorator, this.notebookEditor));
+			const deletedCellDecorator = store.add(this.instantiationService.createInstance(NotebookDeletedCellDecorator, this.notebookEditor, {
+				className: 'chat-diff-change-content-widget',
+				telemetrySource: 'chatEditingNotebookHunk',
+				menuId: MenuId.ChatEditingEditorHunk,
+				argFactory: (deletedCellIndex: number) => {
+					return {
+						accept() {
+							const entry = cellChanges.get().find(c => c.type === 'delete' && c.originalCellIndex === deletedCellIndex)?.diff;
+							if (entry) {
+								return entry.keep(entry.changes[0]);
+							}
+							return Promise.resolve(true);
+						},
+						reject() {
+							const entry = cellChanges.get().find(c => c.type === 'delete' && c.originalCellIndex === deletedCellIndex)?.diff;
+							if (entry) {
+								return entry.undo(entry.changes[0]);
+							}
+							return Promise.resolve(true);
+						},
+					} satisfies IModifiedFileEntryChangeHunk;
+				}
+			}));
 
 			return {
 				insertedCellDecorator,
@@ -187,7 +213,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 		});
 
 		this._register(autorun(r => {
-			const changes = cellChanges.read(r);
+			const changes = cellChanges.read(r).filter(c => !c.diff.identical);
 			const decorators = this.insertDeleteDecorators.read(r);
 			if (decorators) {
 				decorators.insertedCellDecorator.apply(changes);
@@ -430,6 +456,10 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 
 export function countChanges(changes: ICellDiffInfo[]): number {
 	return changes.reduce((count, diff) => {
+		// When we accept some of the cell insert/delete the items might still be in the list.
+		if (diff.diff.identical) {
+			return count;
+		}
 		switch (diff.type) {
 			case 'delete':
 				return count + 1; // We want to see 1 deleted entry in the pill for navigation
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts
index 8ed24d724ea3..5b54650d1a5d 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts
@@ -53,7 +53,7 @@ class NotebookChatEditorController extends Disposable {
 	) {
 		super();
 		this._ctxHasEditorModification = ctxNotebookHasEditorModification.bindTo(contextKeyService);
-		this.deletedCellDecorator = this._register(instantiationService.createInstance(NotebookDeletedCellDecorator, notebookEditor));
+		this.deletedCellDecorator = this._register(instantiationService.createInstance(NotebookDeletedCellDecorator, notebookEditor, undefined));
 		this.insertedCellDecorator = this._register(instantiationService.createInstance(NotebookInsertedCellDecorator, notebookEditor));
 		const notebookModel = observableFromEvent(this.notebookEditor.onDidChangeModel, e => e);
 		const originalModel = observableValue<NotebookTextModel | undefined>('originalModel', undefined);
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 663788a92c30..2d9733f68ec2 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.ts
@@ -15,6 +15,11 @@ import { DefaultLineHeight } from '../diffElementViewModel.js';
 import { CellDiffInfo } from '../notebookDiffViewModel.js';
 import { INotebookEditor } from '../../notebookBrowser.js';
 import * as DOM from '../../../../../../base/browser/dom.js';
+import { MenuWorkbenchToolBar, HiddenItemStrategy } from '../../../../../../platform/actions/browser/toolbar.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 { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
 
 const ttPolicy = createTrustedTypesPolicy('notebookRenderer', { createHTML: value => value });
 
@@ -22,13 +27,16 @@ export interface INotebookDeletedCellDecorator {
 	getTop(deletedIndex: number): number | undefined;
 }
 
+
 export class NotebookDeletedCellDecorator extends Disposable implements INotebookDeletedCellDecorator {
 	private readonly zoneRemover = this._register(new DisposableStore());
 	private readonly createdViewZones = new Map<number, string>();
 	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,
 		@ILanguageService private readonly languageService: ILanguageService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
 	}
@@ -102,7 +110,7 @@ export class NotebookDeletedCellDecorator extends Disposable implements INoteboo
 		const rootContainer = document.createElement('div');
 		const widgets: NotebookDeletedCellWidget[] = [];
 		const heights = await Promise.all(cells.map(async cell => {
-			const widget = new NotebookDeletedCellWidget(this._notebookEditor, cell.cell.getValue(), cell.cell.language, rootContainer, cell.originalIndex, this.languageService);
+			const widget = new NotebookDeletedCellWidget(this._notebookEditor, this.toolbar, cell.cell.getValue(), cell.cell.language, rootContainer, cell.originalIndex, this.languageService, this.instantiationService);
 			widgets.push(widget);
 			const height = await widget.render();
 			this.deletedCellInfos.set(cell.originalIndex, { height, previousIndex: cell.previousIndex, offset: 0 });
@@ -149,14 +157,17 @@ export class NotebookDeletedCellDecorator extends Disposable implements INoteboo
 
 export class NotebookDeletedCellWidget extends Disposable {
 	private readonly container: HTMLElement;
+	// private readonly toolbar: HTMLElement;
+
 	constructor(
 		private readonly _notebookEditor: INotebookEditor,
-		// private readonly _index: number,
+		private readonly _toolbarOptions: { menuId: MenuId; className: string; telemetrySource?: string; argFactory: (deletedCellIndex: number) => any } | undefined,
 		private readonly code: string,
 		private readonly language: string,
 		container: HTMLElement,
-		public readonly originalIndex: number,
+		private readonly _originalIndex: number,
 		@ILanguageService private readonly languageService: ILanguageService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
 		this.container = DOM.append(container, document.createElement('div'));
@@ -187,11 +198,36 @@ export class NotebookDeletedCellWidget extends Disposable {
 				+ layoutInfo?.contentLeft ? `margin-left: ${layoutInfo}px;` : ''
 		+ `white-space: pre;`;
 
-
-
 		const rootContainer = this.container;
 		rootContainer.classList.add('code-cell-row');
+
+		if (this._toolbarOptions) {
+			const toolbar = document.createElement('div');
+			toolbar.className = this._toolbarOptions?.className;
+			rootContainer.appendChild(toolbar);
+
+			const scopedInstaService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, this._notebookEditor.scopedContextKeyService])));
+			const toolbarWidget = scopedInstaService.createInstance(MenuWorkbenchToolBar, toolbar, this._toolbarOptions.menuId, {
+				telemetrySource: this._toolbarOptions.telemetrySource,
+				hiddenItemStrategy: HiddenItemStrategy.NoHide,
+				toolbarOptions: { primaryGroup: () => true },
+				menuOptions: {
+					renderShortTitle: true,
+					arg: this._toolbarOptions.argFactory(this._originalIndex),
+				},
+			});
+
+			this._store.add(toolbarWidget);
+
+			toolbar.style.position = 'absolute';
+			toolbar.style.right = '40px';
+			toolbar.style.zIndex = '10';
+			toolbar.classList.add('hover'); // Show by default
+		}
+
 		const container = DOM.append(rootContainer, DOM.$('.cell-inner-container'));
+		container.style.position = 'relative'; // Add this line
+
 		const focusIndicatorLeft = DOM.append(container, DOM.$('.cell-focus-indicator.cell-focus-indicator-side.cell-focus-indicator-left'));
 		const cellContainer = DOM.append(container, DOM.$('.cell.code'));
 		DOM.append(focusIndicatorLeft, DOM.$('div.execution-count-label'));
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInlineDiff.ts b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInlineDiff.ts
index 735e281426d0..0b1668d0711b 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInlineDiff.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInlineDiff.ts
@@ -79,7 +79,7 @@ export class NotebookInlineDiffDecorationContribution extends Disposable impleme
 		}
 
 		this.insertedCellDecorator = this.instantiationService.createInstance(NotebookInsertedCellDecorator, this.notebookEditor);
-		this.deletedCellDecorator = this.instantiationService.createInstance(NotebookDeletedCellDecorator, this.notebookEditor);
+		this.deletedCellDecorator = this.instantiationService.createInstance(NotebookDeletedCellDecorator, this.notebookEditor, undefined);
 
 		this._update();
 		const onVisibleChange = Event.debounce(this.notebookEditor.onDidChangeVisibleRanges, (e) => e, 100, undefined, undefined, undefined, this._store);

From 50b127e57c64eddde57680f73f7dfd4dad25dd51 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Sun, 23 Feb 2025 21:04:05 -0800
Subject: [PATCH 0293/1815] Ensure notebook modified entry snapshot is detected
 on window reload (#241663)

---
 .../chatEditing/chatEditingModifiedNotebookEntry.ts | 13 +++++++++++++
 .../chat/browser/chatEditing/chatEditingSession.ts  |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index b4b957a0e73a..6086c0bd805c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -129,6 +129,19 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		});
 	}
 
+	public static canHandleSnapshot(initialContent: string | undefined): boolean {
+		if (!initialContent) {
+			return false;
+		}
+
+		try {
+			deserializeSnapshot(initialContent);
+			return true;
+		} catch (ex) {
+			// not a valid snapshot
+			return false;
+		}
+	}
 
 	constructor(
 		private readonly modifiedResourceRef: IReference<IResolvedNotebookEditorModel>,
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 3734e3f81b80..b657dbf0470b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -1035,7 +1035,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		try {
 			const notebookUri = CellUri.parse(resource)?.notebook || resource;
 			// If a notebook isn't open, then use the old synchronization approach.
-			if (this._notebookService.hasSupportedNotebooks(notebookUri) && this._notebookService.getNotebookTextModel(notebookUri)) {
+			if (this._notebookService.hasSupportedNotebooks(notebookUri) && (this._notebookService.getNotebookTextModel(notebookUri) || ChatEditingModifiedNotebookEntry.canHandleSnapshot(initialContent))) {
 				return ChatEditingModifiedNotebookEntry.create(notebookUri, multiDiffEntryDelegate, telemetryInfo, chatKind, initialContent, this._instantiationService);
 			} else {
 				const ref = await this._textModelService.createModelReference(resource);

From 62732ae9431971dd58d0e55e4be22780d50461ea Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Sun, 23 Feb 2025 22:28:15 -0800
Subject: [PATCH 0294/1815] Fix notebook whitespace positioning (#241668)

---
 .../browser/view/notebookCellListView.ts      |   4 +-
 .../test/browser/notebookViewZones.test.ts    | 113 ++++++++++++++++++
 2 files changed, 114 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.ts b/src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.ts
index 16a00de19770..7034d6bb0376 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.ts
@@ -189,9 +189,7 @@ export class NotebookCellsLayout implements IRangeMap {
 		const index = afterPosition - 1;
 		const previousItemPosition = this._prefixSumComputer.getPrefixSum(index);
 		const previousItemSize = this._items[index].size;
-		const previousWhitespace = this._whitespace.filter(ws => (ws.afterPosition <= afterPosition - 1 && ws.afterPosition > 0));
-		const whitespaceBefore = previousWhitespace.reduce((acc, ws) => acc + ws.size, 0);
-		return previousItemPosition + previousItemSize + whitespaceBeforeFirstItem + this.paddingTop + whitespaceBefore;
+		return previousItemPosition + previousItemSize + whitespaceBeforeFirstItem + this.paddingTop;
 	}
 
 	indexAt(position: number): number {
diff --git a/src/vs/workbench/contrib/notebook/test/browser/notebookViewZones.test.ts b/src/vs/workbench/contrib/notebook/test/browser/notebookViewZones.test.ts
index fe54ccba3064..7786121c9b3c 100644
--- a/src/vs/workbench/contrib/notebook/test/browser/notebookViewZones.test.ts
+++ b/src/vs/workbench/contrib/notebook/test/browser/notebookViewZones.test.ts
@@ -563,6 +563,119 @@ suite('NotebookRangeMap with whitesspaces', () => {
 			});
 	});
 
+	test('Multiple Whitespaces 3', async function () {
+		await withTestNotebook(
+			[
+				['# header a', 'markdown', CellKind.Markup, [], {}],
+				['var b = 1;', 'javascript', CellKind.Code, [], {}],
+				['# header b', 'markdown', CellKind.Markup, [], {}],
+				['var b = 2;', 'javascript', CellKind.Code, [], {}],
+				['# header c', 'markdown', CellKind.Markup, [], {}]
+			],
+			async (editor, viewModel, disposables) => {
+				viewModel.restoreEditorViewState({
+					editingCells: [false, false, false, false, false],
+					cellLineNumberStates: {},
+					editorViewStates: [null, null, null, null, null],
+					cellTotalHeights: [50, 100, 50, 100, 50],
+					collapsedInputCells: {},
+					collapsedOutputCells: {},
+				});
+
+				const cellList = createNotebookCellList(instantiationService, disposables);
+				disposables.add(cellList);
+				cellList.attachViewModel(viewModel);
+
+				// render height 210, it can render 3 full cells and 1 partial cell
+				cellList.layout(210, 100);
+				assert.strictEqual(cellList.scrollHeight, 350);
+
+				cellList.changeViewZones(accessor => {
+					const first = accessor.addZone({
+						afterModelPosition: 1,
+						heightInPx: 20,
+						domNode: document.createElement('div')
+					});
+					accessor.layoutZone(first);
+
+					const second = accessor.addZone({
+						afterModelPosition: 2,
+						heightInPx: 20,
+						domNode: document.createElement('div')
+					});
+					accessor.layoutZone(second);
+
+					assert.strictEqual(cellList.scrollHeight, 390);
+					assert.strictEqual(cellList._getView().getWhitespacePosition(first), 50);
+					assert.strictEqual(cellList._getView().getWhitespacePosition(second), 170);
+
+					accessor.removeZone(first);
+					accessor.removeZone(second);
+				});
+			});
+	});
+
+	// test('Multiple Whitespaces 4', async function () {
+	// 	await withTestNotebook(
+	// 		[
+	// 			['# header a', 'markdown', CellKind.Markup, [], {}],
+	// 			['var b = 1;', 'javascript', CellKind.Code, [], {}],
+	// 			['# header b', 'markdown', CellKind.Markup, [], {}],
+	// 			['var b = 2;', 'javascript', CellKind.Code, [], {}],
+	// 			['# header c', 'markdown', CellKind.Markup, [], {}]
+	// 		],
+	// 		async (editor, viewModel, disposables) => {
+	// 			viewModel.restoreEditorViewState({
+	// 				editingCells: [false, false, false, false, false],
+	// 				cellLineNumberStates: {},
+	// 				editorViewStates: [null, null, null, null, null],
+	// 				cellTotalHeights: [50, 100, 50, 100, 50],
+	// 				collapsedInputCells: {},
+	// 				collapsedOutputCells: {},
+	// 			});
+
+	// 			const cellList = createNotebookCellList(instantiationService, disposables);
+	// 			disposables.add(cellList);
+	// 			cellList.attachViewModel(viewModel);
+
+	// 			// render height 210, it can render 3 full cells and 1 partial cell
+	// 			cellList.layout(210, 100);
+	// 			assert.strictEqual(cellList.scrollHeight, 350);
+
+	// 			cellList.changeViewZones(accessor => {
+	// 				const first = accessor.addZone({
+	// 					afterModelPosition: 1,
+	// 					heightInPx: 20,
+	// 					domNode: document.createElement('div')
+	// 				});
+	// 				accessor.layoutZone(first);
+
+	// 				const second = accessor.addZone({
+	// 					afterModelPosition: 1,
+	// 					heightInPx: 20,
+	// 					domNode: document.createElement('div')
+	// 				});
+	// 				accessor.layoutZone(second);
+
+	// 				const third = accessor.addZone({
+	// 					afterModelPosition: 2,
+	// 					heightInPx: 20,
+	// 					domNode: document.createElement('div')
+	// 				});
+	// 				accessor.layoutZone(second);
+
+	// 				assert.strictEqual(cellList.scrollHeight, 410);
+	// 				assert.strictEqual(cellList._getView().getWhitespacePosition(first), 50);
+	// 				assert.strictEqual(cellList._getView().getWhitespacePosition(second), 70);
+	// 				assert.strictEqual(cellList._getView().getWhitespacePosition(third), 190);
+
+	// 				accessor.removeZone(first);
+	// 				accessor.removeZone(second);
+	// 				accessor.removeZone(third);
+	// 			});
+	// 		});
+	// });
+
 	test('Whitespace with folding support', async function () {
 		await withTestNotebook(
 			[

From ff15792d9021e3ae336bb2cdd2624ad98455ec92 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Mon, 24 Feb 2025 17:46:03 +1100
Subject: [PATCH 0295/1815] Improved sorting of deleted cells (#241667)

* Improved sorting of deleted cells

* Misc

* wip

* Fixes
---
 .../chatEditing/chatEditingModifiedNotebookEntry.ts    | 10 +++++++---
 .../chatEditingNotebookEditorIntegration.ts            |  6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 6086c0bd805c..7d0833d1eb4c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -60,6 +60,7 @@ const noopKeep = () => Promise.resolve(true);
 const noopUndo = () => Promise.resolve(true);
 
 export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifiedFileEntry {
+	static NewModelCounter: number = 0;
 	private readonly modifiedModel: NotebookTextModel;
 	private readonly originalModel: NotebookTextModel;
 	override originalURI: URI;
@@ -226,6 +227,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	}
 
 	protected override async _doReject(tx: ITransaction | undefined): Promise<void> {
+		this._cellDiffInfo.set([], undefined);
 		if (this.createdInRequestId === this._telemetryInfo.requestId) {
 			await this._applyEdits(async () => {
 				await this.modifiedResourceRef.object.revert({ soft: true });
@@ -245,7 +247,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			});
 			await this._collapse(tx);
 		}
-
+		this.createEmptyDiffs();
 	}
 	private async _collapse(transaction: ITransaction | undefined): Promise<void> {
 		this._multiDiffEntryDelegate.collapse(transaction);
@@ -344,7 +346,8 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				// & to also display undo/redo and decorations.
 				// However that needs a modified and original model.
 				// For inserted cells there's no original model, so we create a new empty text model and pass that as the original.
-				const originalModel = this._register(this.modelService.createModel('', null, URI.parse('vscode-chat:///empty')));
+				const originalModelUri = this.modifiedModel.uri.with({ query: (ChatEditingModifiedNotebookEntry.NewModelCounter++).toString(), scheme: 'emptyCell' });
+				const originalModel = this.modelService.getModel(originalModelUri) || this._register(this.modelService.createModel('', null, originalModelUri));
 				this.modifiedCellModels.set(cell.uri, modifiedModel);
 				this.modifiedToOriginalCellMap.set(cell.uri, originalModel);
 				const keep = async () => {
@@ -385,7 +388,8 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 					const modifiedRange = new Range(1, 0, 1, 0);
 					const innerChanges = new RangeMapping(modifiedRange, originalRange);
 					const changes = [new DetailedLineRangeMapping(new LineRange(1, lines.length), new LineRange(1, 1), [innerChanges])];
-					const modifiedModel = this._register(this.modelService.createModel('', null, URI.parse(`vscode-chat:///empty${d.originalCellIndex}`)));
+					const modifiedModelUri = this.modifiedModel.uri.with({ query: (ChatEditingModifiedNotebookEntry.NewModelCounter++).toString(), scheme: 'emptyCell' });
+					const modifiedModel = this.modelService.getModel(modifiedModelUri) || this._register(this.modelService.createModel('', null, modifiedModelUri));
 					const originalModel = this.originalModel.cells[d.originalCellIndex];
 					const keep = async () => {
 						await this._applyEdits(async () => this.keepPreviouslyDeletedCell(d.originalCellIndex));
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
index 9d12de1f215c..b31a34257fc1 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
@@ -213,7 +213,8 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 		});
 
 		this._register(autorun(r => {
-			const changes = cellChanges.read(r).filter(c => !c.diff.identical);
+			// We can have inserted cells that have been accepted, in those cases we do not wany any decorators on them.
+			const changes = cellChanges.read(r).filter(c => c.type === 'insert' ? !c.diff.identical : true);
 			const decorators = this.insertDeleteDecorators.read(r);
 			if (decorators) {
 				decorators.insertedCellDecorator.apply(changes);
@@ -492,6 +493,9 @@ export function sortCellChanges(changes: ICellDiffInfo[]): ICellDiffInfo[] {
 			return a.modifiedCellIndex - b.modifiedCellIndex;
 		}
 
+		if ((a.type === 'delete' && b.type !== 'insert') || (a.type !== 'insert' && b.type === 'delete')) {
+			return a.originalCellIndex - b.originalCellIndex;
+		}
 		// Mixed types: compare based on available indices
 		const aIndex = a.type === 'delete' ? a.originalCellIndex :
 			(a.type === 'insert' ? a.modifiedCellIndex : a.modifiedCellIndex);

From 5063c3df1367af98f50ce1f07568aaf0a85fe0c7 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 24 Feb 2025 08:40:12 +0100
Subject: [PATCH 0296/1815] chat - status tweaks (#241669)

---
 .../contrib/chat/browser/actions/chatGettingStarted.ts       | 3 +++
 src/vs/workbench/contrib/chat/browser/chatSetup.ts           | 5 +++++
 src/vs/workbench/contrib/chat/browser/chatStatus.ts          | 5 +----
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.ts b/src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.ts
index 4e9aef91edc4..45ee1c6fedf4 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatGettingStarted.ts
@@ -16,6 +16,7 @@ import { IWorkbenchLayoutService } from '../../../../services/layout/browser/lay
 import { ensureSideBarChatViewSize, showCopilotView } from '../chat.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
+import { IStatusbarService } from '../../../../services/statusbar/browser/statusbar.js';
 
 export class ChatGettingStartedContribution extends Disposable implements IWorkbenchContribution {
 	static readonly ID = 'workbench.contrib.chatGettingStarted';
@@ -32,6 +33,7 @@ export class ChatGettingStartedContribution extends Disposable implements IWorkb
 		@IViewDescriptorService private readonly viewDescriptorService: IViewDescriptorService,
 		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IStatusbarService private readonly statusbarService: IStatusbarService,
 	) {
 		super();
 
@@ -79,6 +81,7 @@ export class ChatGettingStartedContribution extends Disposable implements IWorkb
 		this.recentlyInstalled = false;
 
 		// Enable Copilot related UI if previously disabled
+		this.statusbarService.updateEntryVisibility('chat.statusBarEntry', true);
 		this.configurationService.updateValue('chat.commandCenter.enabled', true);
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index fbdfd043dda3..0fe3d34257fa 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -70,6 +70,7 @@ import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.
 import { equalsIgnoreCase } from '../../../../base/common/strings.js';
 import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
 import { ChatEntitlement, IChatEntitlements, IChatEntitlementsService } from '../common/chatEntitlementsService.js';
+import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -194,12 +195,14 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 				const viewDescriptorService = accessor.get(IViewDescriptorService);
 				const configurationService = accessor.get(IConfigurationService);
 				const layoutService = accessor.get(IWorkbenchLayoutService);
+				const statusbarService = accessor.get(IStatusbarService);
 
 				await context.update({ hidden: false });
 
 				showCopilotView(viewsService, layoutService);
 				ensureSideBarChatViewSize(viewDescriptorService, layoutService, viewsService);
 
+				statusbarService.updateEntryVisibility('chat.statusBarEntry', true);
 				configurationService.updateValue('chat.commandCenter.enabled', true);
 			}
 		}
@@ -230,6 +233,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 				const layoutService = accessor.get(IWorkbenchLayoutService);
 				const configurationService = accessor.get(IConfigurationService);
 				const dialogService = accessor.get(IDialogService);
+				const statusbarService = accessor.get(IStatusbarService);
 
 				const { confirmed } = await dialogService.confirm({
 					message: localize('hideChatSetupConfirm', "Are you sure you want to hide Copilot?"),
@@ -252,6 +256,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 					}
 				}
 
+				statusbarService.updateEntryVisibility('chat.statusBarEntry', false);
 				configurationService.updateValue('chat.commandCenter.enabled', false);
 			}
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 7450514ec564..bfd7a9716217 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -69,7 +69,6 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 	private registerListeners(): void {
 		const contextKeysSet = new Set([
-			ChatContextKeys.Setup.hidden.key,
 			ChatContextKeys.Setup.limited.key,
 			ChatContextKeys.Setup.installed.key,
 			ChatContextKeys.Setup.canSignUp.key,
@@ -83,8 +82,6 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			if (e.affectsSome(contextKeysSet)) {
 				this.entry.update(this.getEntryProps());
 			}
-
-			this.statusbarService.updateEntryVisibility(ChatStatusBarEntry.ID, !this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.hidden.key));
 		}));
 
 		this._register(this.chatQuotasService.onDidChangeQuotaExceeded(() => this.entry?.update(this.getEntryProps())));
@@ -254,7 +251,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 			const setting = append(settings, $('div.setting'));
 
-			const checkbox = this._register(new Checkbox(entry.text, checked, defaultCheckboxStyles));
+			const checkbox = disposables.add(new Checkbox(entry.text, checked, defaultCheckboxStyles));
 			setting.appendChild(checkbox.domNode);
 
 			const settingLabel = append(setting, $('span.setting-label', undefined, entry.text));

From c66aef66c1c61716227a2da3389eb4f476c21857 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 24 Feb 2025 08:41:24 +0100
Subject: [PATCH 0297/1815] terminal - skip flaky tests (#241678)

---
 .../singlefolder-tests/terminal.shellIntegration.test.ts    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
index d5d84c58f4df..3a63841d6007 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
@@ -142,7 +142,7 @@ import { assertNoRpc } from '../utils';
 		await closeTerminalAsync(terminal);
 	});
 
-	test('TerminalShellExecution.read iterables should be available between the start and end execution events', async () => {
+	test.skip('TerminalShellExecution.read iterables should be available between the start and end execution events', async () => {
 		const { terminal, shellIntegration } = await createTerminalAndWaitForShellIntegration();
 		const events: string[] = [];
 		disposables.push(window.onDidStartTerminalShellExecution(() => events.push('start')));
@@ -164,7 +164,7 @@ import { assertNoRpc } from '../utils';
 		await closeTerminalAsync(terminal);
 	});
 
-	test('TerminalShellExecution.read events should fire with contents of command', async () => {
+	test.skip('TerminalShellExecution.read events should fire with contents of command', async () => {
 		const { terminal, shellIntegration } = await createTerminalAndWaitForShellIntegration();
 		const events: string[] = [];
 
@@ -179,7 +179,7 @@ import { assertNoRpc } from '../utils';
 		await closeTerminalAsync(terminal);
 	});
 
-	test('TerminalShellExecution.read events should give separate iterables per call', async () => {
+	test.skip('TerminalShellExecution.read events should give separate iterables per call', async () => {
 		const { terminal, shellIntegration } = await createTerminalAndWaitForShellIntegration();
 
 		const { execution, endEvent } = executeCommandAsync(shellIntegration, 'echo hello');

From fa907e1b4967c7db216f988d9ae551c2d8e0edd5 Mon Sep 17 00:00:00 2001
From: Bhavya U <bhavyau@microsoft.com>
Date: Mon, 24 Feb 2025 00:12:41 -0800
Subject: [PATCH 0298/1815] Update IChatTransfer to store location and
 toolsAgentEnablement state and fix restoring chat to correct ChatViewPane
 (#241651)

* Save toolsAgentEnabled status to IChatTransfer and fix restoring chat to correct ChatViewPane
---
 .../api/browser/mainThreadChatAgents2.ts      |  4 +++-
 .../contrib/chat/browser/chatViewPane.ts      |  4 ++--
 .../contrib/chat/common/chatService.ts        |  2 ++
 .../contrib/chat/common/chatServiceImpl.ts    | 19 ++++++++++++++++---
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
index 1d4022618387..510f26d520ab 100644
--- a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
+++ b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
@@ -137,7 +137,9 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 		}
 
 		const inputValue = widget?.inputEditor.getValue() ?? '';
-		this._chatService.transferChatSession({ sessionId, inputValue }, URI.revive(toWorkspace));
+		const location = widget.location;
+		const toolsAgentModeEnabled = this._chatAgentService.toolsAgentModeEnabled;
+		this._chatService.transferChatSession({ sessionId, inputValue, location, toolsAgentModeEnabled }, URI.revive(toWorkspace));
 	}
 
 	async $registerAgent(handle: number, extension: ExtensionIdentifier, id: string, metadata: IExtensionChatAgentMetadata, dynamicProps: IDynamicChatAgentProps | undefined): Promise<void> {
diff --git a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
index b7394e296a8d..1bcc7732202b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
@@ -120,7 +120,7 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 	private updateModel(model?: IChatModel | undefined, viewState?: IChatViewState): void {
 		this.modelDisposables.clear();
 
-		model = model ?? (this.chatService.transferredSessionData?.sessionId
+		model = model ?? (this.chatService.transferredSessionData?.sessionId && this.chatService.transferredSessionData?.location === this.chatOptions.location
 			? this.chatService.getOrRestoreSession(this.chatService.transferredSessionData.sessionId)
 			: this.chatService.startSession(this.chatOptions.location, CancellationToken.None));
 		if (!model) {
@@ -148,7 +148,7 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 
 	private getSessionId() {
 		let sessionId: string | undefined;
-		if (this.chatService.transferredSessionData) {
+		if (this.chatService.transferredSessionData?.location === this.chatOptions.location) {
 			sessionId = this.chatService.transferredSessionData.sessionId;
 			this.viewState.inputValue = this.chatService.transferredSessionData.inputValue;
 		} else {
diff --git a/src/vs/workbench/contrib/chat/common/chatService.ts b/src/vs/workbench/contrib/chat/common/chatService.ts
index 723504d6b20f..dc63bb692def 100644
--- a/src/vs/workbench/contrib/chat/common/chatService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatService.ts
@@ -395,6 +395,8 @@ export interface IChatProviderInfo {
 export interface IChatTransferredSessionData {
 	sessionId: string;
 	inputValue: string;
+	location: ChatAgentLocation;
+	toolsAgentModeEnabled: boolean;
 }
 
 export interface IChatSendRequestResponseState {
diff --git a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
index 34b83be76fee..f519d27d9323 100644
--- a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
@@ -44,6 +44,8 @@ interface IChatTransfer {
 	timestampInMilliseconds: number;
 	chat: ISerializableChatData;
 	inputValue: string;
+	location: ChatAgentLocation;
+	toolsAgentModeEnabled: boolean;
 }
 const SESSION_TRANSFER_EXPIRATION_IN_MILLISECONDS = 1000 * 60;
 
@@ -165,7 +167,12 @@ export class ChatService extends Disposable implements IChatService {
 		if (transferredChat) {
 			this.trace('constructor', `Transferred session ${transferredChat.sessionId}`);
 			this._persistedSessions[transferredChat.sessionId] = transferredChat;
-			this._transferredSessionData = { sessionId: transferredChat.sessionId, inputValue: transferredData.inputValue };
+			this._transferredSessionData = {
+				sessionId: transferredChat.sessionId,
+				inputValue: transferredData.inputValue,
+				location: transferredData.location,
+				toolsAgentModeEnabled: transferredData.toolsAgentModeEnabled,
+			};
 		}
 
 		this._register(storageService.onWillSaveState(() => this.saveState()));
@@ -443,11 +450,15 @@ export class ChatService extends Disposable implements IChatService {
 			return undefined;
 		}
 
-		if (sessionId === this.transferredSessionData?.sessionId) {
+		const session = this._startSession(sessionData, sessionData.initialLocation ?? ChatAgentLocation.Panel, CancellationToken.None);
+
+		const isTransferred = this.transferredSessionData?.sessionId === sessionId;
+		if (isTransferred) {
+			this.chatAgentService.toggleToolsAgentMode(this.transferredSessionData.toolsAgentModeEnabled);
 			this._transferredSessionData = undefined;
 		}
 
-		return this._startSession(sessionData, sessionData.initialLocation ?? ChatAgentLocation.Panel, CancellationToken.None);
+		return session;
 	}
 
 	loadSessionFromContent(data: IExportableChatData | ISerializableChatData): IChatModel | undefined {
@@ -1000,6 +1011,8 @@ export class ChatService extends Disposable implements IChatService {
 			timestampInMilliseconds: Date.now(),
 			toWorkspace: toWorkspace,
 			inputValue: transferredSessionData.inputValue,
+			location: transferredSessionData.location,
+			toolsAgentModeEnabled: transferredSessionData.toolsAgentModeEnabled,
 		});
 
 		this.storageService.store(globalChatKey, JSON.stringify(existingRaw), StorageScope.PROFILE, StorageTarget.MACHINE);

From 87a6a6d4638cb425d8c3f5b3b6e7795f798dcabf Mon Sep 17 00:00:00 2001
From: Natha Paquette <natha.paquette@gmail.com>
Date: Mon, 24 Feb 2025 05:37:21 -0400
Subject: [PATCH 0299/1815] Typo in storage URI docs (#241600)

typo fix
---
 src/vscode-dts/vscode.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts
index 180f9bbcaa11..c1da7938f308 100644
--- a/src/vscode-dts/vscode.d.ts
+++ b/src/vscode-dts/vscode.d.ts
@@ -8407,7 +8407,7 @@ declare module 'vscode' {
 		 * {@linkcode ExtensionContext.globalState globalState} to store key value data.
 		 *
 		 * @see {@linkcode FileSystem workspace.fs} for how to read and write files and folders from
-		 *  an uri.
+		 *  a uri.
 		 */
 		readonly storageUri: Uri | undefined;
 

From c5549bc00e5f2e17773e9cffa694996fff318772 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 24 Feb 2025 10:45:32 +0100
Subject: [PATCH 0300/1815] asorted fixes (#241684)

* fix https://github.com/microsoft/vscode/issues/241674

* reveal inline chat when switching back to editor

* fixes https://github.com/microsoft/vscode-copilot/issues/13260
---
 .../chatEditingCodeEditorIntegration.ts       | 17 ++++++++-----
 .../chatEditingEditorContextKeys.ts           | 12 +++++-----
 .../browser/inlineChatController.ts           | 24 ++++++++++++++-----
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
index de769b9fb747..e96a4d4aa2be 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
@@ -210,6 +210,16 @@ export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEdito
 		// ---- readonly while streaming
 
 		let actualOptions: IEditorOptions | undefined;
+
+		const restoreActualOptions = () => {
+			if (actualOptions !== undefined) {
+				this._editor.updateOptions(actualOptions);
+				actualOptions = undefined;
+			}
+		};
+
+		this._store.add(toDisposable(restoreActualOptions));
+
 		const shouldBeReadOnly = derived(this, r => {
 			const model = codeEditorObs.model.read(r);
 			if (!model) {
@@ -239,10 +249,7 @@ export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEdito
 					stickyScroll: { enabled: false }
 				});
 			} else {
-				if (actualOptions !== undefined) {
-					this._editor.updateOptions(actualOptions);
-					actualOptions = undefined;
-				}
+				restoreActualOptions();
 			}
 		}));
 	}
@@ -415,8 +422,6 @@ export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEdito
 			diffHunkDecoCollection.clear();
 		}));
 
-
-
 		const positionObs = observableFromEvent(this._editor.onDidChangeCursorPosition, _ => this._editor.getPosition());
 
 		const activeWidgetIdx = derived(r => {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts
index 0785cd0afbea..69f6d04b3d73 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts
@@ -13,7 +13,7 @@ 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 { ChatEditingSessionState, IChatEditingService, IChatEditingSession, IModifiedFileEntry } from '../../common/chatEditingService.js';
+import { ChatEditingSessionState, IChatEditingService, IChatEditingSession, IModifiedFileEntry, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { IChatService } from '../../common/chatService.js';
 
 export const ctxIsGlobalEditingSession = new RawContextKey<boolean>('chatEdits.isGlobalEditingSession', undefined, localize('chat.ctxEditSessionIsGlobal', "The current editor is part of the global edit session"));
@@ -109,7 +109,7 @@ class ContextKeyGroup {
 				return;
 			}
 
-			const { session, entry } = tuple;
+			const { session, entry, isInlineChat } = tuple;
 
 			const chatModel = chatService.getSession(session.chatSessionId);
 
@@ -117,7 +117,7 @@ class ContextKeyGroup {
 				? observableFromEvent(this, chatModel.onDidChange, () => chatModel.requestInProgress)
 				: constObservable(false);
 
-			this._ctxHasEditorModification.set(true);
+			this._ctxHasEditorModification.set(isInlineChat || entry?.state.read(r) === WorkingSetEntryState.Modified);
 			this._ctxIsGlobalEditingSession.set(session.isGlobalEditingSession);
 			this._ctxReviewModeEnabled.set(entry ? entry.reviewMode.read(r) : false);
 			this._ctxHasRequestInProgress.set(session.state.read(r) === ChatEditingSessionState.StreamingEdits || isRequestInProgress.read(r) || !entry);
@@ -147,7 +147,7 @@ class ContextKeyGroup {
 
 export class ObservableEditorSession {
 
-	readonly value: IObservable<undefined | { session: IChatEditingSession; entry: IModifiedFileEntry | undefined }>;
+	readonly value: IObservable<undefined | { session: IChatEditingSession; entry: IModifiedFileEntry | undefined; isInlineChat: boolean }>;
 
 	constructor(
 		uri: URI,
@@ -159,7 +159,7 @@ export class ObservableEditorSession {
 				for (const session of value) {
 					const entry = session.readEntry(uri, r);
 					if (entry) {
-						return { session, entry };
+						return { session, entry, isInlineChat: false };
 					}
 				}
 				return undefined;
@@ -173,7 +173,7 @@ export class ObservableEditorSession {
 			const inlineSessionObs = observableFromEvent(this, inlineChatService.onDidChangeSessions, () => inlineChatService.getSession2(uri));
 			const inlineSession = inlineSessionObs.read(r);
 			return inlineSession
-				? { session: inlineSession.editingSession, entry: inlineSession.editingSession.readEntry(uri, r) }
+				? { session: inlineSession.editingSession, entry: inlineSession.editingSession.readEntry(uri, r), isInlineChat: true }
 				: undefined;
 		});
 	}
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
index 34a1d40b4c2e..55da3ca89eb9 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
@@ -19,6 +19,7 @@ import { assertType } from '../../../../base/common/types.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { ICodeEditor, isCodeEditor } 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';
@@ -1195,6 +1196,7 @@ export class InlineChatController2 implements IEditorContribution {
 		@IInstantiationService private readonly _instaService: IInstantiationService,
 		@INotebookEditorService private readonly _notebookEditorService: INotebookEditorService,
 		@IInlineChatSessionService private readonly _inlineChatSessions: IInlineChatSessionService,
+		@ICodeEditorService codeEditorService: ICodeEditorService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 	) {
 
@@ -1260,11 +1262,21 @@ export class InlineChatController2 implements IEditorContribution {
 		});
 
 
-		this._store.add(autorunWithStore((r, store) => {
+		this._store.add(autorun(r => {
 			const session = this._currentSession.read(r);
-
 			if (!session) {
 				this._isActiveController.set(false, undefined);
+				return;
+			}
+			let foundOne = false;
+			for (const editor of codeEditorService.listCodeEditors()) {
+				if (Boolean(InlineChatController2.get(editor)?._isActiveController.get())) {
+					foundOne = true;
+					break;
+				}
+			}
+			if (!foundOne && _editor.hasWidgetFocus()) {
+				this._isActiveController.set(true, undefined);
 			}
 		}));
 
@@ -1354,7 +1366,6 @@ export class InlineChatController2 implements IEditorContribution {
 		this._showWidgetOverrideObs.set(!value, undefined);
 	}
 
-
 	getWidgetPosition(): Position | undefined {
 		return this._zone.rawValue?.position;
 	}
@@ -1370,11 +1381,12 @@ export class InlineChatController2 implements IEditorContribution {
 	async run(arg?: InlineChatRunOptions): Promise<boolean> {
 		assertType(this._editor.hasModel());
 
-		const uri = this._editor.getModel().uri;
-		const session = await this._inlineChatSessions.createSession2(this._editor, uri, CancellationToken.None);
-
 		this.markActiveController();
 
+		const uri = this._editor.getModel().uri;
+		const session = this._inlineChatSessions.getSession2(uri)
+			?? await this._inlineChatSessions.createSession2(this._editor, uri, CancellationToken.None);
+
 		if (arg && InlineChatRunOptions.isInlineChatRunOptions(arg)) {
 			if (arg.initialRange) {
 				this._editor.revealRange(arg.initialRange);

From 28ab93455c176b9d66198857cfc69b189adba616 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 24 Feb 2025 11:45:25 +0100
Subject: [PATCH 0301/1815] polish (#241689)

---
 .../extensions.contribution.ts                |  6 +-
 .../installFailedExtensions.ts                | 62 -------------------
 .../electron-sandbox/remoteExtensionsInit.ts  | 48 +++++++++++++-
 3 files changed, 49 insertions(+), 67 deletions(-)
 delete mode 100644 src/vs/workbench/contrib/extensions/electron-sandbox/installFailedExtensions.ts

diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts
index 9f793d53124e..d7ab04b698f4 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts
@@ -23,8 +23,7 @@ import { DebugExtensionHostAction, DebugExtensionsContribution } from './debugEx
 import { ExtensionHostProfileService } from './extensionProfileService.js';
 import { CleanUpExtensionsFolderAction, OpenExtensionsFolderAction } from './extensionsActions.js';
 import { ExtensionsAutoProfiler } from './extensionsAutoProfiler.js';
-import { InstallFailedExtensions } from './installFailedExtensions.js';
-import { RemoteExtensionsInitializerContribution } from './remoteExtensionsInit.js';
+import { InstallFailedRemoteExtensionsContribution, RemoteExtensionsInitializerContribution } from './remoteExtensionsInit.js';
 import { IExtensionHostProfileService, OpenExtensionHostProfileACtion, RuntimeExtensionsEditor, SaveExtensionHostProfileAction, StartExtensionHostProfileAction, StopExtensionHostProfileAction } from './runtimeExtensionsEditor.js';
 
 // Singletons
@@ -72,8 +71,8 @@ const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(Workbench
 workbenchRegistry.registerWorkbenchContribution(ExtensionsContributions, LifecyclePhase.Restored);
 workbenchRegistry.registerWorkbenchContribution(ExtensionsAutoProfiler, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(RemoteExtensionsInitializerContribution, LifecyclePhase.Restored);
+workbenchRegistry.registerWorkbenchContribution(InstallFailedRemoteExtensionsContribution, LifecyclePhase.Restored);
 workbenchRegistry.registerWorkbenchContribution(DebugExtensionsContribution, LifecyclePhase.Restored);
-workbenchRegistry.registerWorkbenchContribution(InstallFailedExtensions, LifecyclePhase.Restored);
 
 // Register Commands
 
@@ -82,4 +81,3 @@ registerAction2(StartExtensionHostProfileAction);
 registerAction2(StopExtensionHostProfileAction);
 registerAction2(SaveExtensionHostProfileAction);
 registerAction2(OpenExtensionHostProfileACtion);
-
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/installFailedExtensions.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/installFailedExtensions.ts
deleted file mode 100644
index 3f602213b23d..000000000000
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/installFailedExtensions.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 { Disposable } from '../../../../base/common/lifecycle.js';
-import { IExtensionGalleryService, InstallExtensionInfo } from '../../../../platform/extensionManagement/common/extensionManagement.js';
-import { ILogService } from '../../../../platform/log/common/log.js';
-import { IRemoteExtensionsScannerService } from '../../../../platform/remote/common/remoteExtensionsScanner.js';
-import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
-import { IExtensionManagementServerService } from '../../../services/extensionManagement/common/extensionManagement.js';
-/**
- * Checks and attempts to install extensions that remote server has 'relayed' to workbench.
- * The server would 'relay' an extension for installation if it was unable to install it by itself.
- */
-export class InstallFailedExtensions extends Disposable implements IWorkbenchContribution {
-	constructor(
-		@IRemoteExtensionsScannerService remoteExtensionsScannerService: IRemoteExtensionsScannerService,
-		@IExtensionGalleryService private readonly _extensionGalleryService: IExtensionGalleryService,
-		@IExtensionManagementServerService private readonly _extensionManagementServerService: IExtensionManagementServerService,
-		@ILogService logService: ILogService
-	) {
-		super();
-		logService.info('Checking for extensions relayed from server');
-		remoteExtensionsScannerService.whenExtensionsReady()
-			.then(async ({ failed }) => {
-				if (failed.length === 0) {
-					logService.trace('No extensions relayed from server');
-					return;
-				}
-
-				if (!this._extensionManagementServerService.remoteExtensionManagementServer) {
-					logService.error('No remote extension management server available');
-					return;
-				}
-
-				logService.trace(`Retrieved gallery information for '${failed.length}' extensions relayed from server`);
-				const extensionManagementService = this._extensionManagementServerService.remoteExtensionManagementServer.extensionManagementService;
-				const galleryExtensions = await this._extensionGalleryService.getExtensions(failed, CancellationToken.None);
-				// Join back with its installOptions
-				const installExtensionInfo: InstallExtensionInfo[] = galleryExtensions.map(ext => {
-					return {
-						extension: ext,
-						options: failed.find(f => areSameExtensions(f, ext.identifier))?.installOptions || {}
-					};
-				});
-
-				logService.trace(`Retrieved gallery information for '${installExtensionInfo.length}' extensions relayed from server`);
-				const settled = await Promise.allSettled(
-					installExtensionInfo.map(info => extensionManagementService.installFromGallery(info.extension, info.options))
-				);
-
-				const installedCount = settled.filter(result => result.status === 'fulfilled').length;
-				logService.info(`Installed '${installedCount}' of '${failed.length}' extensions relayed from server`);
-			}).catch(e => {
-				logService.error('Unexpected failure installing extensions relayed from server');
-				logService.error(e);
-			});
-	}
-}
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
index 203212373a6e..88e2f38ec668 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
@@ -5,13 +5,14 @@
 
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
-import { IExtensionGalleryService, IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IExtensionGalleryService, IExtensionManagementService, InstallExtensionInfo } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
+import { IRemoteExtensionsScannerService } from '../../../../platform/remote/common/remoteExtensionsScanner.js';
 import { IStorageService, IS_NEW_KEY, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
@@ -25,6 +26,51 @@ import { IExtensionManagementServerService } from '../../../services/extensionMa
 import { IExtensionManifestPropertiesService } from '../../../services/extensions/common/extensionManifestPropertiesService.js';
 import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
 
+export class InstallFailedRemoteExtensionsContribution implements IWorkbenchContribution {
+	constructor(
+		@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
+		@IRemoteExtensionsScannerService private readonly remoteExtensionsScannerService: IRemoteExtensionsScannerService,
+		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
+		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
+		@ILogService private readonly logService: ILogService
+	) {
+		this.installFailedRemoteExtensions();
+	}
+
+	private async installFailedRemoteExtensions(): Promise<void> {
+		if (!this.remoteAgentService.getConnection()) {
+			return;
+		}
+
+		const { failed } = await this.remoteExtensionsScannerService.whenExtensionsReady();
+		if (failed.length === 0) {
+			this.logService.trace('No extensions relayed from server');
+			return;
+		}
+
+		if (!this.extensionManagementServerService.remoteExtensionManagementServer) {
+			this.logService.error('No remote extension management server available');
+			return;
+		}
+
+		this.logService.info(`Installing '${failed.length}' extensions relayed from server`);
+		const galleryExtensions = await this.extensionGalleryService.getExtensions(failed.map(({ id }) => ({ id })), CancellationToken.None);
+		const installExtensionInfo: InstallExtensionInfo[] = [];
+		for (const { id, installOptions } of failed) {
+			const extension = galleryExtensions.find(e => areSameExtensions(e.identifier, { id }));
+			if (extension) {
+				installExtensionInfo.push({ extension, options: installOptions });
+			} else {
+				this.logService.warn(`Relayed failed extension '${id}' from server is not found in the gallery`);
+			}
+		}
+
+		if (installExtensionInfo.length) {
+			await this.extensionManagementServerService.remoteExtensionManagementServer.extensionManagementService.installGalleryExtensions(installExtensionInfo);
+		}
+	}
+}
+
 export class RemoteExtensionsInitializerContribution implements IWorkbenchContribution {
 	constructor(
 		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,

From ea8aabc6b65d996cdd9ef26118e506f25f38486c Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 24 Feb 2025 11:49:46 +0100
Subject: [PATCH 0302/1815] only rely on `crypto.getRandomValues` and treat
 `randomUUID` as being optional (#241690)

fixes https://github.com/microsoft/vscode/issues/240334
---
 src/vs/base/common/uuid.ts | 54 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/vs/base/common/uuid.ts b/src/vs/base/common/uuid.ts
index d1d08064f5af..8aa1e8801db2 100644
--- a/src/vs/base/common/uuid.ts
+++ b/src/vs/base/common/uuid.ts
@@ -10,4 +10,56 @@ export function isUUID(value: string): boolean {
 	return _UUIDPattern.test(value);
 }
 
-export const generateUuid: () => string = crypto.randomUUID.bind(crypto);
+export const generateUuid = (function (): () => string {
+
+	// use `randomUUID` if possible
+	if (typeof crypto.randomUUID === 'function') {
+		// see https://developer.mozilla.org/en-US/docs/Web/API/Window/crypto
+		// > Although crypto is available on all windows, the returned Crypto object only has one
+		// > usable feature in insecure contexts: the getRandomValues() method.
+		// > In general, you should use this API only in secure contexts.
+
+		return crypto.randomUUID.bind(crypto);
+	}
+
+	// prep-work
+	const _data = new Uint8Array(16);
+	const _hex: string[] = [];
+	for (let i = 0; i < 256; i++) {
+		_hex.push(i.toString(16).padStart(2, '0'));
+	}
+
+	return function generateUuid(): string {
+		// get data
+		crypto.getRandomValues(_data);
+
+		// set version bits
+		_data[6] = (_data[6] & 0x0f) | 0x40;
+		_data[8] = (_data[8] & 0x3f) | 0x80;
+
+		// print as string
+		let i = 0;
+		let result = '';
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += '-';
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += '-';
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += '-';
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += '-';
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		result += _hex[_data[i++]];
+		return result;
+	};
+})();

From 9a179aa6a263165b8fa32080167df78e42f3bfd0 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 24 Feb 2025 12:55:26 +0100
Subject: [PATCH 0303/1815] fix
 https://github.com/microsoft/vscode-copilot/issues/13309 (#241691)

---
 .../contrib/chat/browser/contrib/chatInputCompletions.ts     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
index c5c3fedf9a6d..0f4cd25c10dc 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
@@ -802,12 +802,11 @@ class BuiltinDynamicCompletions extends Disposable {
 		const makeSymbolCompletionItem = (symbolItem: { name: string; location: Location; kind: SymbolKind }, pattern: string): CompletionItem => {
 			const text = `${chatVariableLeader}sym:${symbolItem.name}`;
 			const resource = symbolItem.location.uri;
-			const symbolLabelWithIcon = `$(${SymbolKinds.toIcon(symbolItem.kind).id}) ${symbolItem.name}`;
 			const uriLabel = this.labelService.getUriLabel(resource, { relative: true });
 			const sortText = pattern ? '{' /* after z */ : '|' /* after { */;
 
 			return {
-				label: { label: symbolLabelWithIcon, description: uriLabel },
+				label: { label: symbolItem.name, description: uriLabel },
 				filterText: `${chatVariableLeader}${symbolItem.name}`,
 				insertText: info.varWord?.endColumn === info.replace.endColumn ? `${text} ` : text,
 				range: info,
@@ -817,7 +816,7 @@ class BuiltinDynamicCompletions extends Disposable {
 					id: BuiltinDynamicCompletions.addReferenceCommand, title: '', arguments: [new ReferenceArgument(widget, {
 						id: 'vscode.symbol',
 						prefix: 'sym',
-						fullName: symbolLabelWithIcon,
+						fullName: symbolItem.name,
 						range: { startLineNumber: info.replace.startLineNumber, startColumn: info.replace.startColumn, endLineNumber: info.replace.endLineNumber, endColumn: info.replace.startColumn + text.length },
 						data: symbolItem.location
 					})]

From 71714b7da4dfa9cf234fc4c24df876375269d491 Mon Sep 17 00:00:00 2001
From: Vincent Ging Ho Yim <cenviity@gmail.com>
Date: Fri, 7 Feb 2025 22:27:49 +1100
Subject: [PATCH 0304/1815] Fix typos in `editorOptions.ts`

---
 src/vs/editor/common/config/editorOptions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 7db0030e063b..3fdecc8717e1 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -4371,8 +4371,8 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 					description: nls.localize('inlineSuggest.edits.renderSideBySide', "Controls whether larger suggestions can be shown side by side."),
 					enum: ['auto', 'never'],
 					enumDescriptions: [
-						nls.localize('editor.inlineSuggest.edits.renderSideBySide.auto', "Larger suggestions will show side by side if there is enough space, otherwise they will be shown bellow."),
-						nls.localize('editor.inlineSuggest.edits.renderSideBySide.never', "Larger suggestions are never shown side by side and will always be shown bellow."),
+						nls.localize('editor.inlineSuggest.edits.renderSideBySide.auto', "Larger suggestions will show side by side if there is enough space, otherwise they will be shown below."),
+						nls.localize('editor.inlineSuggest.edits.renderSideBySide.never', "Larger suggestions are never shown side by side and will always be shown below."),
 					],
 					tags: ['nextEditSuggestions']
 				},

From d894a16f365787053b91a34f0a8d9e0b6acb8c85 Mon Sep 17 00:00:00 2001
From: Jean Pierre <jeanp413@hotmail.com>
Date: Mon, 24 Feb 2025 07:00:58 -0500
Subject: [PATCH 0305/1815] Fix timeline view leaks event listeners (#241607)

* Fixes #241536

* Feedback

* cleanup

* fix hygieene

---------

Co-authored-by: Benjamin Pasero <benjamin.pasero@gmail.com>
---
 .../contrib/timeline/browser/timelinePane.ts  | 48 +++++++++++--------
 .../timeline/common/timelineService.ts        | 27 ++++++-----
 2 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
index 1267040d4a8e..f8ac877916a8 100644
--- a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
+++ b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
@@ -235,6 +235,10 @@ export const TimelineFollowActiveEditorContext = new RawContextKey<boolean>('tim
 export const TimelineExcludeSources = new RawContextKey<string>('timelineExcludeSources', '[]', true);
 export const TimelineViewFocusedContext = new RawContextKey<boolean>('timelineFocused', true);
 
+interface IPendingRequest extends IDisposable {
+	readonly request: TimelineRequest;
+}
+
 export class TimelinePane extends ViewPane {
 	static readonly TITLE: ILocalizedString = localize2('timeline', "Timeline");
 
@@ -250,7 +254,7 @@ export class TimelinePane extends ViewPane {
 	private timelineExcludeSourcesContext: IContextKey<string>;
 
 	private excludedSources: Set<string>;
-	private pendingRequests = new Map<string, TimelineRequest>();
+	private pendingRequests = new Map<string, IPendingRequest>();
 	private timelinesBySource = new Map<string, TimelineAggregate>();
 
 	private uri: URI | undefined;
@@ -495,8 +499,9 @@ export class TimelinePane extends ViewPane {
 		this.timelinesBySource.clear();
 
 		if (cancelPending) {
-			for (const { tokenSource } of this.pendingRequests.values()) {
-				tokenSource.dispose(true);
+			for (const pendingRequest of this.pendingRequests.values()) {
+				pendingRequest.request.tokenSource.cancel();
+				pendingRequest.dispose();
 			}
 
 			this.pendingRequests.clear();
@@ -588,34 +593,38 @@ export class TimelinePane extends ViewPane {
 			options = { cursor: reset ? undefined : timeline?.cursor, limit: this.pageSize };
 		}
 
-		let request = this.pendingRequests.get(source);
-		if (request !== undefined) {
-			options.cursor = request.options.cursor;
+		const pendingRequest = this.pendingRequests.get(source);
+		if (pendingRequest !== undefined) {
+			options.cursor = pendingRequest.request.options.cursor;
 
 			// TODO@eamodio deal with concurrent requests better
 			if (typeof options.limit === 'number') {
-				if (typeof request.options.limit === 'number') {
-					options.limit += request.options.limit;
+				if (typeof pendingRequest.request.options.limit === 'number') {
+					options.limit += pendingRequest.request.options.limit;
 				} else {
-					options.limit = request.options.limit;
+					options.limit = pendingRequest.request.options.limit;
 				}
 			}
 		}
-		request?.tokenSource.dispose(true);
+		pendingRequest?.request?.tokenSource.cancel();
+		pendingRequest?.dispose();
+
 		options.cacheResults = true;
 		options.resetCache = reset;
-		request = this.timelineService.getTimeline(
-			source, uri, options, new CancellationTokenSource()
-		);
+		const tokenSource = new CancellationTokenSource();
+		const newRequest = this.timelineService.getTimeline(source, uri, options, tokenSource);
 
-		if (request === undefined) {
+		if (newRequest === undefined) {
+			tokenSource.dispose();
 			return false;
 		}
 
-		this.pendingRequests.set(source, request);
-		request.tokenSource.token.onCancellationRequested(() => this.pendingRequests.delete(source));
+		const disposables = new DisposableStore();
+		this.pendingRequests.set(source, { request: newRequest, dispose: () => disposables.dispose() });
+		disposables.add(tokenSource);
+		disposables.add(tokenSource.token.onCancellationRequested(() => this.pendingRequests.delete(source)));
 
-		this.handleRequest(request);
+		this.handleRequest(newRequest);
 
 		return true;
 	}
@@ -641,6 +650,7 @@ export class TimelinePane extends ViewPane {
 			response = await this.progressService.withProgress({ location: this.id }, () => request.result);
 		}
 		finally {
+			this.pendingRequests.get(request.source)?.dispose();
 			this.pendingRequests.delete(request.source);
 		}
 
@@ -920,11 +930,11 @@ export class TimelinePane extends ViewPane {
 		container.appendChild(this.$tree);
 
 		this.treeRenderer = this.instantiationService.createInstance(TimelineTreeRenderer, this.commands);
-		this.treeRenderer.onDidScrollToEnd(item => {
+		this._register(this.treeRenderer.onDidScrollToEnd(item => {
 			if (this.pageOnScroll) {
 				this.loadMore(item);
 			}
-		});
+		}));
 
 		this.tree = this.instantiationService.createInstance(WorkbenchObjectTree<TreeElement, FuzzyScore>, 'TimelinePane',
 			this.$tree, new TimelineListVirtualDelegate(), [this.treeRenderer], {
diff --git a/src/vs/workbench/contrib/timeline/common/timelineService.ts b/src/vs/workbench/contrib/timeline/common/timelineService.ts
index cecaef8b5210..42193a625d40 100644
--- a/src/vs/workbench/contrib/timeline/common/timelineService.ts
+++ b/src/vs/workbench/contrib/timeline/common/timelineService.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
-import { Event, Emitter } from '../../../../base/common/event.js';
-import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
 import { URI } from '../../../../base/common/uri.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { ITimelineService, TimelineChangeEvent, TimelineOptions, TimelineProvidersChangeEvent, TimelineProvider, TimelinePaneId } from './timeline.js';
@@ -15,16 +15,16 @@ import { IContextKey, IContextKeyService, RawContextKey } from '../../../../plat
 
 export const TimelineHasProviderContext = new RawContextKey<boolean>('timelineHasProvider', false);
 
-export class TimelineService implements ITimelineService {
+export class TimelineService extends Disposable implements ITimelineService {
 	declare readonly _serviceBrand: undefined;
 
-	private readonly _onDidChangeProviders = new Emitter<TimelineProvidersChangeEvent>();
-	readonly onDidChangeProviders: Event<TimelineProvidersChangeEvent> = this._onDidChangeProviders.event;
+	private readonly _onDidChangeProviders = this._register(new Emitter<TimelineProvidersChangeEvent>());
+	readonly onDidChangeProviders = this._onDidChangeProviders.event;
 
-	private readonly _onDidChangeTimeline = new Emitter<TimelineChangeEvent>();
-	readonly onDidChangeTimeline: Event<TimelineChangeEvent> = this._onDidChangeTimeline.event;
-	private readonly _onDidChangeUri = new Emitter<URI>();
-	readonly onDidChangeUri: Event<URI> = this._onDidChangeUri.event;
+	private readonly _onDidChangeTimeline = this._register(new Emitter<TimelineChangeEvent>());
+	readonly onDidChangeTimeline = this._onDidChangeTimeline.event;
+	private readonly _onDidChangeUri = this._register(new Emitter<URI>());
+	readonly onDidChangeUri = this._onDidChangeUri.event;
 
 	private readonly hasProviderContext: IContextKey<boolean>;
 	private readonly providers = new Map<string, TimelineProvider>();
@@ -36,6 +36,8 @@ export class TimelineService implements ITimelineService {
 		@IConfigurationService protected configurationService: IConfigurationService,
 		@IContextKeyService protected contextKeyService: IContextKeyService,
 	) {
+		super();
+
 		this.hasProviderContext = TimelineHasProviderContext.bindTo(this.contextKeyService);
 		this.updateHasProviderContext();
 	}
@@ -72,10 +74,10 @@ export class TimelineService implements ITimelineService {
 
 					return result;
 				}),
-			options: options,
+			options,
 			source: provider.id,
-			tokenSource: tokenSource,
-			uri: uri
+			tokenSource,
+			uri
 		};
 	}
 
@@ -120,6 +122,7 @@ export class TimelineService implements ITimelineService {
 		}
 
 		this.providers.delete(id);
+		this.providerSubscriptions.get(id)?.dispose();
 		this.providerSubscriptions.delete(id);
 
 		this.updateHasProviderContext();

From 0110d569c01f71f5cde45901a11b8c114350895b Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 24 Feb 2025 13:15:30 +0100
Subject: [PATCH 0306/1815] log internal code (#241697)

---
 .../node/extensionSignatureVerificationService.ts              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts b/src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts
index fe7b99e5f99a..03a34cc09d0e 100644
--- a/src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionSignatureVerificationService.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { getErrorMessage } from '../../../base/common/errors.js';
+import { isDefined } from '../../../base/common/types.js';
 import { TargetPlatform } from '../../extensions/common/extensions.js';
 import { createDecorator } from '../../instantiation/common/instantiation.js';
 import { ILogService, LogLevel } from '../../log/common/log.js';
@@ -97,7 +98,7 @@ export class ExtensionSignatureVerificationService implements IExtensionSignatur
 
 		const duration = new Date().getTime() - startTime;
 
-		this.logService.info(`Extension signature verification result for ${extensionId}: ${result.code}. Executed: ${result.didExecute}. Duration: ${duration}ms.`);
+		this.logService.info(`Extension signature verification result for ${extensionId}: ${result.code}. ${isDefined(result.internalCode) ? `Internal Code: ${result.internalCode}. ` : ''}Executed: ${result.didExecute}. Duration: ${duration}ms.`);
 		this.logService.trace(`Extension signature verification output for ${extensionId}:\n${result.output}`);
 
 		type ExtensionSignatureVerificationClassification = {

From 3889e52264d7ee3d2c86dd4fe6cc4c9fb7f36d2f Mon Sep 17 00:00:00 2001
From: Jean Pierre <jeanp413@hotmail.com>
Date: Mon, 24 Feb 2025 09:01:54 -0500
Subject: [PATCH 0307/1815] Fix terminal split view disposable leaked (#241597)

Fixes #241596
---
 .../workbench/contrib/terminal/browser/terminalGroup.ts   | 6 +++---
 .../contrib/terminal/browser/widgets/widgetManager.ts     | 2 ++
 .../browser/terminal.accessibility.contribution.ts        | 8 ++++----
 .../developer/browser/terminal.developer.contribution.ts  | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts b/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
index b8f346ec36d8..62553e78cf47 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalGroup.ts
@@ -52,8 +52,9 @@ class SplitPaneContainer extends Disposable {
 	}
 
 	private _createSplitView(): void {
-		this._splitView = new SplitView(this._container, { orientation: this.orientation });
 		this._splitViewDisposables.clear();
+		this._splitView = new SplitView(this._container, { orientation: this.orientation });
+		this._splitViewDisposables.add(this._splitView);
 		this._splitViewDisposables.add(this._splitView.onDidSashReset(() => this._splitView.distributeViewSizes()));
 	}
 
@@ -180,8 +181,6 @@ class SplitPaneContainer extends Disposable {
 		while (this._container.children.length > 0) {
 			this._container.children[0].remove();
 		}
-		this._splitViewDisposables.clear();
-		this._splitView.dispose();
 
 		// Create new split view with updated orientation
 		this._createSplitView();
@@ -323,6 +322,7 @@ export class TerminalGroup extends Disposable implements ITerminalGroup {
 	override dispose(): void {
 		this._terminalInstances = [];
 		this._onInstancesChanged.fire();
+		this._splitPaneContainer?.dispose();
 		super.dispose();
 	}
 
diff --git a/src/vs/workbench/contrib/terminal/browser/widgets/widgetManager.ts b/src/vs/workbench/contrib/terminal/browser/widgets/widgetManager.ts
index d1141f3d6f00..8a4d8d35bd9e 100644
--- a/src/vs/workbench/contrib/terminal/browser/widgets/widgetManager.ts
+++ b/src/vs/workbench/contrib/terminal/browser/widgets/widgetManager.ts
@@ -23,6 +23,8 @@ export class TerminalWidgetManager implements IDisposable {
 			this._container.remove();
 			this._container = undefined;
 		}
+		this._attached.forEach(w => w.dispose());
+		this._attached.clear();
 	}
 
 	attachWidget(widget: ITerminalWidget): IDisposable | undefined {
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 b0f68a6eecfc..9200de5d255f 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
@@ -6,7 +6,7 @@
 import type { Terminal } from '@xterm/xterm';
 import { Event } from '../../../../../base/common/event.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../../base/common/lifecycle.js';
 import { isWindows } from '../../../../../base/common/platform.js';
 import { Position } from '../../../../../editor/common/core/position.js';
 import { localize2 } from '../../../../../nls.js';
@@ -68,7 +68,7 @@ export class TerminalAccessibleViewContribution extends Disposable implements IT
 	private _bufferTracker: BufferContentTracker | undefined;
 	private _bufferProvider: TerminalAccessibleBufferProvider | undefined;
 	private _xterm: Pick<IXtermTerminal, 'shellIntegration' | 'getFont'> & { raw: Terminal } | undefined;
-	private readonly _onDidRunCommand: MutableDisposable<IDisposable> = new MutableDisposable();
+	private readonly _onDidRunCommand = this._register(new MutableDisposable());
 
 	constructor(
 		private readonly _ctx: ITerminalContributionContext,
@@ -144,11 +144,11 @@ export class TerminalAccessibleViewContribution extends Disposable implements IT
 		}
 
 		const capability = this._ctx.instance.capabilities.get(TerminalCapability.CommandDetection)!;
-		this._onDidRunCommand.value = this._register(capability.onCommandExecuted(() => {
+		this._onDidRunCommand.value = capability.onCommandExecuted(() => {
 			if (this._ctx.instance.hasFocus) {
 				this.show();
 			}
-		}));
+		});
 	}
 
 	private _isTerminalAccessibleViewOpen(): boolean {
diff --git a/src/vs/workbench/contrib/terminalContrib/developer/browser/terminal.developer.contribution.ts b/src/vs/workbench/contrib/terminalContrib/developer/browser/terminal.developer.contribution.ts
index 98ea746e7f37..067736bd947c 100644
--- a/src/vs/workbench/contrib/terminalContrib/developer/browser/terminal.developer.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/developer/browser/terminal.developer.contribution.ts
@@ -227,7 +227,7 @@ class DevModeContribution extends Disposable implements ITerminalContribution {
 	}
 
 	private _xterm: IXtermTerminal & { raw: Terminal } | undefined;
-	private readonly _activeDevModeDisposables = new MutableDisposable();
+	private readonly _activeDevModeDisposables = this._register(new MutableDisposable());
 	private _currentColor = 0;
 
 	private _state: DevModeContributionState = DevModeContributionState.Off;

From c6d090cd69c9a4c6fa98d0a665b24e68c2821250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joaomoreno@users.noreply.github.com>
Date: Mon, 24 Feb 2025 15:20:09 +0100
Subject: [PATCH 0308/1815] cleanup telemetry events (#241701)

---
 .../electron-main/abstractUpdateService.ts    |  6 -----
 .../electron-main/updateService.darwin.ts     |  3 +--
 .../electron-main/updateService.linux.ts      |  6 +----
 .../electron-main/updateService.snap.ts       |  6 -----
 .../electron-main/updateService.win32.ts      |  4 +---
 .../workbench/browser/parts/views/treeView.ts |  3 +--
 .../workbench/browser/parts/views/viewPane.ts | 14 +----------
 .../bulkEdit/browser/preview/bulkEditPane.ts  |  4 +---
 .../contrib/chat/browser/chatViewPane.ts      |  4 +---
 .../contrib/comments/browser/commentsView.ts  |  4 +---
 .../contrib/debug/browser/breakpointsView.ts  |  4 +---
 .../contrib/debug/browser/callStackView.ts    |  4 +---
 .../debug/browser/loadedScriptsView.ts        |  4 +---
 .../workbench/contrib/debug/browser/repl.ts   |  4 +---
 .../contrib/debug/browser/variablesView.ts    |  3 +--
 .../debug/browser/watchExpressionsView.ts     |  4 +---
 .../contrib/debug/browser/welcomeView.ts      |  4 +---
 .../extensions/browser/extensionsViews.ts     |  4 ++--
 .../contrib/files/browser/views/emptyView.ts  |  4 +---
 .../files/browser/views/explorerView.ts       |  4 ++--
 .../files/browser/views/openEditorsView.ts    |  4 ++--
 .../contrib/markers/browser/markersView.ts    |  4 +---
 .../notebookVariablesView.ts                  |  4 +---
 .../contrib/outline/browser/outlinePane.ts    |  4 +---
 .../contrib/output/browser/outputView.ts      |  3 +--
 .../contrib/remote/browser/remote.ts          |  3 +--
 .../contrib/remote/browser/tunnelView.ts      |  4 +---
 .../contrib/scm/browser/scmHistoryViewPane.ts |  4 +---
 .../scm/browser/scmRepositoriesViewPane.ts    |  4 +---
 .../contrib/scm/browser/scmViewPane.ts        |  3 +--
 .../contrib/search/browser/searchView.ts      |  4 +---
 .../contrib/terminal/browser/terminalView.ts  |  4 +---
 .../testing/browser/testCoverageView.ts       |  4 +---
 .../testing/browser/testingExplorerView.ts    |  4 +---
 .../testing/browser/testingOutputPeek.ts      |  4 +---
 .../contrib/timeline/browser/timelinePane.ts  |  4 +---
 .../browser/userDataSyncConflictsView.ts      |  4 +---
 .../webviewView/browser/webviewViewPane.ts    |  4 +---
 .../extensions/browser/extensionUrlHandler.ts | 24 +------------------
 39 files changed, 40 insertions(+), 146 deletions(-)

diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index 48638aa12f73..a1ec3fed95da 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -18,12 +18,6 @@ export function createUpdateURL(platform: string, quality: string, productServic
 	return `${productService.updateUrl}/api/update/${platform}/${quality}/${productService.commit}`;
 }
 
-export type UpdateNotAvailableClassification = {
-	owner: 'joaomoreno';
-	explicit: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the user has manually checked for updates, or this was an automatic check.' };
-	comment: 'This is used to understand how often VS Code pings the update server for an update and there\'s none available.';
-};
-
 export type UpdateErrorClassification = {
 	owner: 'joaomoreno';
 	messageHash: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The hash of the error message.' };
diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
index d3f27d3711e5..a7e7bb4a44b3 100644
--- a/src/vs/platform/update/electron-main/updateService.darwin.ts
+++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -16,7 +16,7 @@ import { IProductService } from '../../product/common/productService.js';
 import { IRequestService } from '../../request/common/request.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 import { IUpdate, State, StateType, UpdateType } from '../common/update.js';
-import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification, UpdateNotAvailableClassification } from './abstractUpdateService.js';
+import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification } from './abstractUpdateService.js';
 
 export class DarwinUpdateService extends AbstractUpdateService implements IRelaunchHandler {
 
@@ -125,7 +125,6 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
 		if (this.state.type !== StateType.CheckingForUpdates) {
 			return;
 		}
-		this.telemetryService.publicLog2<{ explicit: boolean }, UpdateNotAvailableClassification>('update:notAvailable', { explicit: this.state.explicit });
 
 		this.setState(State.Idle(UpdateType.Archive));
 	}
diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts
index 6e076c72ed80..dd18900547dd 100644
--- a/src/vs/platform/update/electron-main/updateService.linux.ts
+++ b/src/vs/platform/update/electron-main/updateService.linux.ts
@@ -11,16 +11,14 @@ import { ILogService } from '../../log/common/log.js';
 import { INativeHostMainService } from '../../native/electron-main/nativeHostMainService.js';
 import { IProductService } from '../../product/common/productService.js';
 import { asJson, IRequestService } from '../../request/common/request.js';
-import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 import { AvailableForDownload, IUpdate, State, UpdateType } from '../common/update.js';
-import { AbstractUpdateService, createUpdateURL, UpdateNotAvailableClassification } from './abstractUpdateService.js';
+import { AbstractUpdateService, createUpdateURL } from './abstractUpdateService.js';
 
 export class LinuxUpdateService extends AbstractUpdateService {
 
 	constructor(
 		@ILifecycleMainService lifecycleMainService: ILifecycleMainService,
 		@IConfigurationService configurationService: IConfigurationService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IEnvironmentMainService environmentMainService: IEnvironmentMainService,
 		@IRequestService requestService: IRequestService,
 		@ILogService logService: ILogService,
@@ -44,8 +42,6 @@ export class LinuxUpdateService extends AbstractUpdateService {
 			.then<IUpdate | null>(asJson)
 			.then(update => {
 				if (!update || !update.url || !update.version || !update.productVersion) {
-					this.telemetryService.publicLog2<{ explicit: boolean }, UpdateNotAvailableClassification>('update:notAvailable', { explicit: !!context });
-
 					this.setState(State.Idle(UpdateType.Archive));
 				} else {
 					this.setState(State.AvailableForDownload(update));
diff --git a/src/vs/platform/update/electron-main/updateService.snap.ts b/src/vs/platform/update/electron-main/updateService.snap.ts
index 78bcf9d7a456..4ca2a34a7a92 100644
--- a/src/vs/platform/update/electron-main/updateService.snap.ts
+++ b/src/vs/platform/update/electron-main/updateService.snap.ts
@@ -11,9 +11,7 @@ import * as path from '../../../base/common/path.js';
 import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
 import { ILifecycleMainService } from '../../lifecycle/electron-main/lifecycleMainService.js';
 import { ILogService } from '../../log/common/log.js';
-import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 import { AvailableForDownload, IUpdateService, State, StateType, UpdateType } from '../common/update.js';
-import { UpdateNotAvailableClassification } from './abstractUpdateService.js';
 
 abstract class AbstractUpdateService implements IUpdateService {
 
@@ -145,7 +143,6 @@ export class SnapUpdateService extends AbstractUpdateService {
 		@ILifecycleMainService lifecycleMainService: ILifecycleMainService,
 		@IEnvironmentMainService environmentMainService: IEnvironmentMainService,
 		@ILogService logService: ILogService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService
 	) {
 		super(lifecycleMainService, environmentMainService, logService);
 
@@ -167,13 +164,10 @@ export class SnapUpdateService extends AbstractUpdateService {
 			if (result) {
 				this.setState(State.Ready({ version: 'something' }));
 			} else {
-				this.telemetryService.publicLog2<{ explicit: boolean }, UpdateNotAvailableClassification>('update:notAvailable', { explicit: false });
-
 				this.setState(State.Idle(UpdateType.Snap));
 			}
 		}, err => {
 			this.logService.error(err);
-			this.telemetryService.publicLog2<{ explicit: boolean }, UpdateNotAvailableClassification>('update:notAvailable', { explicit: false });
 			this.setState(State.Idle(UpdateType.Snap, err.message || err));
 		});
 	}
diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
index 61109e547417..db92de2f1987 100644
--- a/src/vs/platform/update/electron-main/updateService.win32.ts
+++ b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -24,7 +24,7 @@ import { IProductService } from '../../product/common/productService.js';
 import { asJson, IRequestService } from '../../request/common/request.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, UpdateType } from '../common/update.js';
-import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification, UpdateNotAvailableClassification } from './abstractUpdateService.js';
+import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification } from './abstractUpdateService.js';
 
 async function pollUntil(fn: () => boolean, millis = 1000): Promise<void> {
 	while (!fn()) {
@@ -124,8 +124,6 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 				const updateType = getUpdateType();
 
 				if (!update || !update.url || !update.version || !update.productVersion) {
-					this.telemetryService.publicLog2<{ explicit: boolean }, UpdateNotAvailableClassification>('update:notAvailable', { explicit: !!context });
-
 					this.setState(State.Idle(updateType));
 					return Promise.resolve(null);
 				}
diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts
index de175c02c891..9a152cef023d 100644
--- a/src/vs/workbench/browser/parts/views/treeView.ts
+++ b/src/vs/workbench/browser/parts/views/treeView.ts
@@ -94,12 +94,11 @@ export class TreeViewPane extends ViewPane {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@INotificationService notificationService: INotificationService,
 		@IHoverService hoverService: IHoverService,
 		@IAccessibleViewInformationService accessibleViewService: IAccessibleViewInformationService,
 	) {
-		super({ ...(options as IViewPaneOptions), titleMenuId: MenuId.ViewTitle, donotForwardArgs: false }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService, accessibleViewService);
+		super({ ...(options as IViewPaneOptions), titleMenuId: MenuId.ViewTitle, donotForwardArgs: false }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService, accessibleViewService);
 		const { treeView } = (<ITreeViewDescriptor>Registry.as<IViewsRegistry>(Extensions.ViewsRegistry).getView(options.id));
 		this.treeView = treeView;
 		this._register(this.treeView.onDidChangeActions(() => this.updateActions(), this));
diff --git a/src/vs/workbench/browser/parts/views/viewPane.ts b/src/vs/workbench/browser/parts/views/viewPane.ts
index d01b9fd373f7..87acf448f1d1 100644
--- a/src/vs/workbench/browser/parts/views/viewPane.ts
+++ b/src/vs/workbench/browser/parts/views/viewPane.ts
@@ -16,7 +16,6 @@ import { ActionsOrientation, IActionViewItem, prepareActions } from '../../../..
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { IPaneOptions, Pane, IPaneStyles } from '../../../../base/browser/ui/splitview/paneview.js';
@@ -83,13 +82,6 @@ export interface IFilterViewPaneOptions extends IViewPaneOptions {
 
 export const VIEWPANE_FILTER_ACTION = new Action('viewpane.action.filter');
 
-type WelcomeActionClassification = {
-	owner: 'joaomoreno';
-	viewId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The view ID in which the welcome view button was clicked.' };
-	uri: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The URI of the command ran by the result of clicking the button.' };
-	comment: 'This is used to know when users click on the welcome view buttons.';
-};
-
 const viewPaneContainerExpandedIcon = registerIcon('view-pane-container-expanded', Codicon.chevronDown, nls.localize('viewPaneContainerExpandedIcon', 'Icon for an expanded view pane container.'));
 const viewPaneContainerCollapsedIcon = registerIcon('view-pane-container-collapsed', Codicon.chevronRight, nls.localize('viewPaneContainerCollapsedIcon', 'Icon for a collapsed view pane container.'));
 
@@ -125,7 +117,6 @@ class ViewWelcomeController {
 		private readonly delegate: IViewWelcomeDelegate,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IOpenerService protected openerService: IOpenerService,
-		@ITelemetryService protected telemetryService: ITelemetryService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
 		@ILifecycleService lifecycleService: ILifecycleService
 	) {
@@ -257,7 +248,6 @@ class ViewWelcomeController {
 					const button = new Button(buttonContainer, { title: node.title, supportIcons: true, secondary: renderSecondaryButtons && buttonsCount > 0 ? true : false, ...defaultButtonStyles, });
 					button.label = node.label;
 					button.onDidClick(_ => {
-						this.telemetryService.publicLog2<{ viewId: string; uri: string }, WelcomeActionClassification>('views.welcomeAction', { viewId: this.delegate.id, uri: node.href });
 						this.openerService.open(node.href, { allowCommands: true });
 					}, null, this.renderDisposables);
 					this.renderDisposables.add(button);
@@ -381,7 +371,6 @@ export abstract class ViewPane extends Pane implements IView {
 		@IInstantiationService protected instantiationService: IInstantiationService,
 		@IOpenerService protected openerService: IOpenerService,
 		@IThemeService protected themeService: IThemeService,
-		@ITelemetryService protected telemetryService: ITelemetryService,
 		@IHoverService protected readonly hoverService: IHoverService,
 		protected readonly accessibleViewInformationService?: IAccessibleViewInformationService
 	) {
@@ -760,11 +749,10 @@ export abstract class FilterViewPane extends ViewPane {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		accessibleViewService?: IAccessibleViewInformationService
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService, accessibleViewService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService, accessibleViewService);
 		const childInstantiationService = this._register(instantiationService.createChild(new ServiceCollection([IContextKeyService, this.scopedContextKeyService])));
 		this.filterWidget = this._register(childInstantiationService.createInstance(FilterWidget, options.filterOptions));
 	}
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
index d5e6865ba916..267b9be32f59 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts
@@ -30,7 +30,6 @@ import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { IOpenEvent, WorkbenchAsyncDataTree } from '../../../../../platform/list/browser/listService.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
-import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
 import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
 import { ResourceLabels } from '../../../../browser/labels.js';
@@ -89,12 +88,11 @@ export class BulkEditPane extends ViewPane {
 		@IConfigurationService configurationService: IConfigurationService,
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 	) {
 		super(
 			{ ...options, titleMenuId: MenuId.BulkEditTitle },
-			keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, _instaService, openerService, themeService, telemetryService, hoverService
+			keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, _instaService, openerService, themeService, hoverService
 		);
 
 		this.element.classList.add('bulk-edit-panel', 'show-file-icons');
diff --git a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
index 1bcc7732202b..6e9563085f7a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
@@ -18,7 +18,6 @@ import { ILayoutService } from '../../../../platform/layout/browser/layoutServic
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { IViewPaneOptions, ViewPane } from '../../../browser/parts/views/viewPane.js';
@@ -62,7 +61,6 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@IStorageService private readonly storageService: IStorageService,
 		@IChatService private readonly chatService: IChatService,
@@ -70,7 +68,7 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 		@ILogService private readonly logService: ILogService,
 		@ILayoutService private readonly layoutService: ILayoutService,
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		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.chatOptions.location === ChatAgentLocation.EditingSession ? `-edits` : ''), this.storageService);
diff --git a/src/vs/workbench/contrib/comments/browser/commentsView.ts b/src/vs/workbench/contrib/comments/browser/commentsView.ts
index a78d91f4a7ca..e9dcf952046e 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsView.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsView.ts
@@ -21,7 +21,6 @@ import { IContextKey, IContextKeyService, RawContextKey } from '../../../../plat
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { CommentsViewFilterFocusContextKey, ICommentsView } from './comments.js';
 import { CommentsFilters, CommentsFiltersChangeEvent, CommentsSortOrder } from './commentsViewActions.js';
@@ -148,7 +147,6 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
 		@ICommentService private readonly commentService: ICommentService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@IStorageService storageService: IStorageService,
@@ -165,7 +163,7 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 				text: viewState['filter'] || '',
 				focusContextKey: CommentsViewFilterFocusContextKey.key
 			}
-		}, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		}, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 		this.hasCommentsContextKey = CONTEXT_KEY_HAS_COMMENTS.bindTo(contextKeyService);
 		this.someCommentsExpandedContextKey = CONTEXT_KEY_SOME_COMMENTS_EXPANDED.bindTo(contextKeyService);
 		this.commentsFocusedContextKey = CONTEXT_KEY_COMMENT_FOCUSED.bindTo(contextKeyService);
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
index 3847044be077..f1879eac040f 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
@@ -42,7 +42,6 @@ import { WorkbenchList } from '../../../../platform/list/browser/listService.js'
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { ViewAction, ViewPane } from '../../../browser/parts/views/viewPane.js';
@@ -116,13 +115,12 @@ export class BreakpointsView extends ViewPane {
 		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IOpenerService openerService: IOpenerService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@ILabelService private readonly labelService: ILabelService,
 		@IMenuService menuService: IMenuService,
 		@IHoverService hoverService: IHoverService,
 		@ILanguageService private readonly languageService: ILanguageService,
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
 		this.menu = menuService.createMenu(MenuId.DebugBreakpointsContext, contextKeyService);
 		this._register(this.menu);
diff --git a/src/vs/workbench/contrib/debug/browser/callStackView.ts b/src/vs/workbench/contrib/debug/browser/callStackView.ts
index 4655198264d1..28d99d7646ff 100644
--- a/src/vs/workbench/contrib/debug/browser/callStackView.ts
+++ b/src/vs/workbench/contrib/debug/browser/callStackView.ts
@@ -34,7 +34,6 @@ import { ILabelService } from '../../../../platform/label/common/label.js';
 import { WorkbenchCompressibleAsyncDataTree } from '../../../../platform/list/browser/listService.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { asCssVariable, textLinkForeground } from '../../../../platform/theme/common/colorRegistry.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
@@ -158,11 +157,10 @@ export class CallStackView extends ViewPane {
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@IMenuService private readonly menuService: IMenuService,
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
 		// Create scheduler to prevent unnecessary flashing of tree when reacting to changes
 		this.onCallStackChangeScheduler = this._register(new RunOnceScheduler(async () => {
diff --git a/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts b/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
index 4876cc3a7977..daf85e275b12 100644
--- a/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
@@ -30,7 +30,6 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { WorkbenchCompressibleObjectTree } from '../../../../platform/list/browser/listService.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IFileIconTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
 import { IResourceLabel, IResourceLabelOptions, IResourceLabelProps, ResourceLabels } from '../../../browser/labels.js';
@@ -437,10 +436,9 @@ export class LoadedScriptsView extends ViewPane {
 		@IPathService private readonly pathService: IPathService,
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 		this.loadedScriptsItemType = CONTEXT_LOADED_SCRIPTS_ITEM_TYPE.bindTo(contextKeyService);
 	}
 
diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
index 0e8672cdf642..e5ed01694c60 100644
--- a/src/vs/workbench/contrib/debug/browser/repl.ts
+++ b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -56,7 +56,6 @@ import { WorkbenchAsyncDataTree } from '../../../../platform/list/browser/listSe
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { editorForeground, resolveColorValue } from '../../../../platform/theme/common/colorRegistry.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
@@ -139,7 +138,6 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 		@IEditorService private readonly editorService: IEditorService,
 		@IKeybindingService protected override readonly keybindingService: IKeybindingService,
 		@IOpenerService openerService: IOpenerService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@IMenuService menuService: IMenuService,
 		@ILanguageFeaturesService private readonly languageFeaturesService: ILanguageFeaturesService,
@@ -153,7 +151,7 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 				text: filterText,
 				history: JSON.parse(storageService.get(FILTER_HISTORY_STORAGE_KEY, StorageScope.WORKSPACE, '[]')) as string[],
 			}
-		}, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		}, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
 		this.menu = menuService.createMenu(MenuId.DebugConsoleContext, contextKeyService);
 		this._register(this.menu);
diff --git a/src/vs/workbench/contrib/debug/browser/variablesView.ts b/src/vs/workbench/contrib/debug/browser/variablesView.ts
index 74c22d9ee976..d578ce13fb41 100644
--- a/src/vs/workbench/contrib/debug/browser/variablesView.ts
+++ b/src/vs/workbench/contrib/debug/browser/variablesView.ts
@@ -85,11 +85,10 @@ export class VariablesView extends ViewPane implements IDebugViewWithVariables {
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@IMenuService private readonly menuService: IMenuService
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
 		// Use scheduler to prevent unnecessary flashing
 		this.updateTreeScheduler = new RunOnceScheduler(async () => {
diff --git a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
index a56d4aae4623..117e4757eca8 100644
--- a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
@@ -24,7 +24,6 @@ import { IInstantiationService, ServicesAccessor } from '../../../../platform/in
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { WorkbenchAsyncDataTree } from '../../../../platform/list/browser/listService.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { ViewAction, ViewPane } from '../../../browser/parts/views/viewPane.js';
 import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
@@ -66,11 +65,10 @@ export class WatchExpressionsView extends ViewPane implements IDebugViewWithVari
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@IMenuService menuService: IMenuService
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
 		this.menu = menuService.createMenu(MenuId.DebugWatchContext, contextKeyService);
 		this._register(this.menu);
diff --git a/src/vs/workbench/contrib/debug/browser/welcomeView.ts b/src/vs/workbench/contrib/debug/browser/welcomeView.ts
index f1ca97ff5e6d..ebb161fc785f 100644
--- a/src/vs/workbench/contrib/debug/browser/welcomeView.ts
+++ b/src/vs/workbench/contrib/debug/browser/welcomeView.ts
@@ -17,7 +17,6 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { OpenFileAction, OpenFileFolderAction, OpenFolderAction } from '../../../browser/actions/workspaceActions.js';
 import { ViewPane } from '../../../browser/parts/views/viewPane.js';
@@ -53,10 +52,9 @@ export class WelcomeView extends ViewPane {
 		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
 		@IOpenerService openerService: IOpenerService,
 		@IStorageService storageSevice: IStorageService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
 		this.debugStartLanguageContext = CONTEXT_DEBUG_START_LANGUAGE.bindTo(contextKeyService);
 		this.debuggerInterestedContext = CONTEXT_DEBUGGER_INTERESTED_IN_ACTIVE_EDITOR.bindTo(contextKeyService);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
index f970b351e4e7..cbb4d0cbd4e3 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
@@ -144,7 +144,7 @@ export class ExtensionsListView extends ViewPane {
 		@IExtensionService private readonly extensionService: IExtensionService,
 		@IExtensionsWorkbenchService protected extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IExtensionRecommendationsService protected extensionRecommendationsService: IExtensionRecommendationsService,
-		@ITelemetryService telemetryService: ITelemetryService,
+		@ITelemetryService protected readonly telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IWorkspaceContextService protected contextService: IWorkspaceContextService,
@@ -169,7 +169,7 @@ export class ExtensionsListView extends ViewPane {
 			...(viewletViewOptions as IViewPaneOptions),
 			showActions: ViewPaneShowActions.Always,
 			maximumBodySize: options.flexibleHeight ? (storageService.getNumber(`${viewletViewOptions.id}.size`, StorageScope.PROFILE, 0) ? undefined : 0) : undefined
-		}, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		}, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 		if (this.options.onDidChangeTitle) {
 			this._register(this.options.onDidChangeTitle(title => this.updateTitle(title)));
 		}
diff --git a/src/vs/workbench/contrib/files/browser/views/emptyView.ts b/src/vs/workbench/contrib/files/browser/views/emptyView.ts
index a70269a9cbaf..ea0b6a96276f 100644
--- a/src/vs/workbench/contrib/files/browser/views/emptyView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/emptyView.ts
@@ -18,7 +18,6 @@ import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IViewDescriptorService } from '../../../../common/views.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
-import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 import { isWeb } from '../../../../../base/common/platform.js';
 import { DragAndDropObserver, getWindow } from '../../../../../base/browser/dom.js';
 import { ILocalizedString } from '../../../../../platform/action/common/action.js';
@@ -42,10 +41,9 @@ export class EmptyView extends ViewPane {
 		@ILabelService private labelService: ILabelService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IOpenerService openerService: IOpenerService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
 		this._register(this.contextService.onDidChangeWorkbenchState(() => this.refreshTitle()));
 		this._register(this.labelService.onDidChangeFormatters(() => this.refreshTitle()));
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerView.ts b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
index f91029d58d5e..c7056e38868e 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
@@ -201,7 +201,7 @@ export class ExplorerView extends ViewPane implements IExplorerView {
 		@IDecorationsService private readonly decorationService: IDecorationsService,
 		@ILabelService private readonly labelService: ILabelService,
 		@IThemeService themeService: IWorkbenchThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@IExplorerService private readonly explorerService: IExplorerService,
 		@IStorageService private readonly storageService: IStorageService,
@@ -211,7 +211,7 @@ export class ExplorerView extends ViewPane implements IExplorerView {
 		@ICommandService private readonly commandService: ICommandService,
 		@IOpenerService openerService: IOpenerService
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
 		this.delegate = options.delegate;
 		this.resourceContext = instantiationService.createInstance(ResourceContextKey);
diff --git a/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
index dbc04e88561b..aadefafbe38c 100644
--- a/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
@@ -88,14 +88,14 @@ export class OpenEditorsView extends ViewPane {
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@IWorkingCopyService private readonly workingCopyService: IWorkingCopyService,
 		@IFilesConfigurationService private readonly filesConfigurationService: IFilesConfigurationService,
 		@IOpenerService openerService: IOpenerService,
 		@IFileService private readonly fileService: IFileService
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
 		this.structuralRefreshDelay = 0;
 		this.sortOrder = configurationService.getValue('explorer.openEditors.sortOrder');
diff --git a/src/vs/workbench/contrib/markers/browser/markersView.ts b/src/vs/workbench/contrib/markers/browser/markersView.ts
index f80cfdeebaa9..d62dbd05f116 100644
--- a/src/vs/workbench/contrib/markers/browser/markersView.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersView.ts
@@ -37,7 +37,6 @@ import { IListService, IOpenEvent, IWorkbenchObjectTreeOptions, WorkbenchObjectT
 import { IMarkerService, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { IOpenerService, withSelection } 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 { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
@@ -132,7 +131,6 @@ export class MarkersView extends FilterViewPane implements IMarkersView {
 		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IConfigurationService configurationService: IConfigurationService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IMarkerService private readonly markerService: IMarkerService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
@@ -155,7 +153,7 @@ export class MarkersView extends FilterViewPane implements IMarkersView {
 				text: panelState['filter'] || '',
 				history: panelState['filterHistory'] || []
 			}
-		}, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		}, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 		this.memento = memento;
 		this.panelState = panelState;
 
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.ts b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.ts
index f1df88b5028b..dc86e5ba940d 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.ts
@@ -20,7 +20,6 @@ import { IKeybindingService } from '../../../../../../platform/keybinding/common
 import { WorkbenchAsyncDataTree } from '../../../../../../platform/list/browser/listService.js';
 import { IOpenerService } from '../../../../../../platform/opener/common/opener.js';
 import { IQuickInputService } from '../../../../../../platform/quickinput/common/quickInput.js';
-import { ITelemetryService } from '../../../../../../platform/telemetry/common/telemetry.js';
 import { IThemeService } from '../../../../../../platform/theme/common/themeService.js';
 import { IViewPaneOptions, ViewPane } from '../../../../../browser/parts/views/viewPane.js';
 import { IViewDescriptorService } from '../../../../../common/views.js';
@@ -64,11 +63,10 @@ export class NotebookVariablesView extends ViewPane {
 		@IQuickInputService protected quickInputService: IQuickInputService,
 		@ICommandService protected commandService: ICommandService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@IMenuService private readonly menuService: IMenuService
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
 		this._register(this.editorService.onDidActiveEditorChange(() => this.handleActiveEditorChange()));
 		this._register(this.notebookKernelService.onDidNotebookVariablesUpdate(this.handleVariablesChanged.bind(this)));
diff --git a/src/vs/workbench/contrib/outline/browser/outlinePane.ts b/src/vs/workbench/contrib/outline/browser/outlinePane.ts
index aa34cef4e641..94f14deb4ed1 100644
--- a/src/vs/workbench/contrib/outline/browser/outlinePane.ts
+++ b/src/vs/workbench/contrib/outline/browser/outlinePane.ts
@@ -25,7 +25,6 @@ import { FuzzyScore } from '../../../../base/common/filters.js';
 import { basename } from '../../../../base/common/resources.js';
 import { IViewDescriptorService } from '../../../common/views.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { OutlineViewState } from './outlineViewState.js';
 import { IOutline, IOutlineComparator, IOutlineService, OutlineTarget } from '../../../services/outline/browser/outline.js';
 import { EditorResourceAccessor, IEditorPane } from '../../../common/editor.js';
@@ -94,10 +93,9 @@ export class OutlinePane extends ViewPane implements IOutlinePane {
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, _instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, _instantiationService, openerService, themeService, hoverService);
 		this._outlineViewState.restore(this._storageService);
 		this._disposables.add(this._outlineViewState);
 
diff --git a/src/vs/workbench/contrib/output/browser/outputView.ts b/src/vs/workbench/contrib/output/browser/outputView.ts
index d3d24dd49f3d..a73d4cc25e56 100644
--- a/src/vs/workbench/contrib/output/browser/outputView.ts
+++ b/src/vs/workbench/contrib/output/browser/outputView.ts
@@ -73,7 +73,6 @@ export class OutputViewPane extends FilterViewPane {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@IOutputService private readonly outputService: IOutputService,
 		@IStorageService storageService: IStorageService,
@@ -88,7 +87,7 @@ export class OutputViewPane extends FilterViewPane {
 				text: viewState['filter'] || '',
 				history: []
 			}
-		}, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		}, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 		this.memento = memento;
 		this.panelState = viewState;
 
diff --git a/src/vs/workbench/contrib/remote/browser/remote.ts b/src/vs/workbench/contrib/remote/browser/remote.ts
index d2d6835f722f..9737ac70ef50 100644
--- a/src/vs/workbench/contrib/remote/browser/remote.ts
+++ b/src/vs/workbench/contrib/remote/browser/remote.ts
@@ -460,12 +460,11 @@ class HelpPanel extends ViewPane {
 		@IRemoteExplorerService protected readonly remoteExplorerService: IRemoteExplorerService,
 		@IWorkbenchEnvironmentService protected readonly environmentService: IWorkbenchEnvironmentService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
 		@IWalkthroughsService private readonly walkthroughsService: IWalkthroughsService,
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 	}
 
 	protected override renderBody(container: HTMLElement): void {
diff --git a/src/vs/workbench/contrib/remote/browser/tunnelView.ts b/src/vs/workbench/contrib/remote/browser/tunnelView.ts
index abb7d7884820..7786bd99c2cb 100644
--- a/src/vs/workbench/contrib/remote/browser/tunnelView.ts
+++ b/src/vs/workbench/contrib/remote/browser/tunnelView.ts
@@ -40,7 +40,6 @@ import { isAllInterfaces, isLocalhost, ITunnelService, RemoteTunnel, TunnelPriva
 import { TunnelPrivacy } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { copyAddressIcon, forwardedPortWithoutProcessIcon, forwardedPortWithProcessIcon, forwardPortIcon, labelPortIcon, openBrowserIcon, openPreviewIcon, portsViewIcon, privatePortIcon, stopForwardIcon } from './remoteIcons.js';
 import { IExternalUriOpenerService } from '../../externalUriOpener/common/externalUriOpenerService.js';
@@ -782,12 +781,11 @@ export class TunnelPanel extends ViewPane {
 		@IMenuService private readonly menuService: IMenuService,
 		@IThemeService themeService: IThemeService,
 		@IRemoteExplorerService private readonly remoteExplorerService: IRemoteExplorerService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@ITunnelService private readonly tunnelService: ITunnelService,
 		@IContextViewService private readonly contextViewService: IContextViewService,
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 		this.tunnelTypeContext = TunnelTypeContextKey.bindTo(contextKeyService);
 		this.tunnelCloseableContext = TunnelCloseableContextKey.bindTo(contextKeyService);
 		this.tunnelPrivacyContext = TunnelPrivacyContextKey.bindTo(contextKeyService);
diff --git a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
index 37d8732b9be6..64d04fc0cbce 100644
--- a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
@@ -27,7 +27,6 @@ import { IInstantiationService, ServicesAccessor } from '../../../../platform/in
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { IOpenEvent, WorkbenchAsyncDataTree } from '../../../../platform/list/browser/listService.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { asCssVariable, ColorIdentifier, foreground } from '../../../../platform/theme/common/colorRegistry.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { IViewPaneOptions, ViewAction, ViewPane, ViewPaneShowActions } from '../../../browser/parts/views/viewPane.js';
@@ -1250,14 +1249,13 @@ export class SCMHistoryViewPane extends ViewPane {
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService
 	) {
 		super({
 			...options,
 			titleMenuId: MenuId.SCMHistoryTitle,
 			showActions: ViewPaneShowActions.WhenExpanded
-		}, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		}, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
 		this._scmProviderCtx = ContextKeys.SCMProvider.bindTo(this.scopedContextKeyService);
 		this._scmCurrentHistoryItemRefHasRemote = ContextKeys.SCMCurrentHistoryItemRefHasRemote.bindTo(this.scopedContextKeyService);
diff --git a/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
index 60b0c28c4343..254f02be73e3 100644
--- a/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
@@ -19,7 +19,6 @@ import { WorkbenchList } from '../../../../platform/list/browser/listService.js'
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IViewDescriptorService } from '../../../common/views.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { RepositoryActionRunner, RepositoryRenderer } from './scmRepositoryRenderer.js';
 import { collectContextMenuActions, getActionViewItemProvider } from './util.js';
 import { Orientation } from '../../../../base/browser/ui/sash/sash.js';
@@ -55,10 +54,9 @@ export class SCMRepositoriesViewPane extends ViewPane {
 		@IConfigurationService configurationService: IConfigurationService,
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService
 	) {
-		super({ ...options, titleMenuId: MenuId.SCMSourceControlTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super({ ...options, titleMenuId: MenuId.SCMSourceControlTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 	}
 
 	protected override renderBody(container: HTMLElement): void {
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index 58a42b2abb90..013eeeac0636 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -2159,10 +2159,9 @@ export class SCMViewPane extends ViewPane {
 		@IConfigurationService configurationService: IConfigurationService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IOpenerService openerService: IOpenerService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 	) {
-		super({ ...options, titleMenuId: MenuId.SCMTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super({ ...options, titleMenuId: MenuId.SCMTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
 		// View mode and sort key
 		this._viewMode = this.getViewMode();
diff --git a/src/vs/workbench/contrib/search/browser/searchView.ts b/src/vs/workbench/contrib/search/browser/searchView.ts
index 2fb47a12ab16..e46972d43aaf 100644
--- a/src/vs/workbench/contrib/search/browser/searchView.ts
+++ b/src/vs/workbench/contrib/search/browser/searchView.ts
@@ -44,7 +44,6 @@ import { INotificationService } from '../../../../platform/notification/common/n
 import { IOpenerService, withSelection } from '../../../../platform/opener/common/opener.js';
 import { IProgress, IProgressService, IProgressStep } from '../../../../platform/progress/common/progress.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { defaultInputBoxStyles, defaultToggleStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { IFileIconTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
@@ -196,14 +195,13 @@ export class SearchView extends ViewPane {
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IStorageService private readonly storageService: IStorageService,
 		@IOpenerService openerService: IOpenerService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@INotebookService private readonly notebookService: INotebookService,
 		@ILogService private readonly logService: ILogService,
 		@IAccessibilitySignalService private readonly accessibilitySignalService: IAccessibilitySignalService
 	) {
 
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
 		this.container = dom.$('.search-view');
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
index 07494bbbde31..7e22be4d682a 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
@@ -11,7 +11,6 @@ import { Action, IAction } from '../../../../base/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { switchTerminalActionViewItemSeparator, switchTerminalShowTabsTitle } from './terminalActions.js';
@@ -81,7 +80,6 @@ export class TerminalViewPane extends ViewPane {
 		@ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService,
 		@ITerminalGroupService private readonly _terminalGroupService: ITerminalGroupService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@INotificationService private readonly _notificationService: INotificationService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
@@ -92,7 +90,7 @@ export class TerminalViewPane extends ViewPane {
 		@IThemeService private readonly _themeService: IThemeService,
 		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService
 	) {
-		super(options, keybindingService, _contextMenuService, _configurationService, _contextKeyService, viewDescriptorService, _instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, _contextMenuService, _configurationService, _contextKeyService, viewDescriptorService, _instantiationService, openerService, themeService, hoverService);
 		this._register(this._terminalService.onDidRegisterProcessSupport(() => {
 			this._onDidChangeViewWelcomeState.fire();
 		}));
diff --git a/src/vs/workbench/contrib/testing/browser/testCoverageView.ts b/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
index b660cc798b1c..470a1ff5c106 100644
--- a/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
+++ b/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
@@ -40,7 +40,6 @@ import { ILabelService } from '../../../../platform/label/common/label.js';
 import { WorkbenchCompressibleObjectTree } from '../../../../platform/list/browser/listService.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { IQuickInputService, IQuickPickItem, QuickPickInput } from '../../../../platform/quickinput/common/quickInput.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { IResourceLabel, ResourceLabels } from '../../../browser/labels.js';
 import { IViewPaneOptions, ViewAction, ViewPane } from '../../../browser/parts/views/viewPane.js';
@@ -77,11 +76,10 @@ export class TestCoverageView extends ViewPane {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@ITestCoverageService private readonly coverageService: ITestCoverageService,
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 	}
 
 	protected override renderBody(container: HTMLElement): void {
diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
index 7c9c38a02399..421f9578df87 100644
--- a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
@@ -44,7 +44,6 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { UnmanagedProgress } from '../../../../platform/progress/common/progress.js';
 import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from '../../../../platform/storage/common/storage.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { foreground } from '../../../../platform/theme/common/colorRegistry.js';
 import { spinningLoading } from '../../../../platform/theme/common/iconRegistry.js';
@@ -115,14 +114,13 @@ export class TestingExplorerView extends ViewPane {
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
 		@ITestService private readonly testService: ITestService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@ITestProfileService private readonly testProfileService: ITestProfileService,
 		@ICommandService private readonly commandService: ICommandService,
 		@IMenuService private readonly menuService: IMenuService,
 		@ITestingContinuousRunService private readonly crService: ITestingContinuousRunService,
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
 		const relayout = this._register(new RunOnceScheduler(() => this.layoutBody(), 1));
 		this._register(this.onDidChangeViewWelcomeState(() => {
diff --git a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
index 08611d53fc3e..bb40133b638e 100644
--- a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
@@ -47,7 +47,6 @@ import { INotificationService } from '../../../../platform/notification/common/n
 import { bindContextKey } from '../../../../platform/observable/common/platformObservableUtils.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
@@ -897,11 +896,10 @@ export class TestResultsView extends ViewPane {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@ITestResultService private readonly resultService: ITestResultService,
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 	}
 
 	public get subject() {
diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
index f8ac877916a8..d6582ce54f89 100644
--- a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
+++ b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
@@ -41,7 +41,6 @@ import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { ActionBar, IActionViewItemProvider } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { getContextMenuActions, createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { IMenuService, MenuId, registerAction2, Action2, MenuRegistry } from '../../../../platform/actions/common/actions.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { ColorScheme } from '../../../../platform/theme/common/theme.js';
 import { Codicon } from '../../../../base/common/codicons.js';
@@ -274,13 +273,12 @@ export class TimelinePane extends ViewPane {
 		@ITimelineService protected timelineService: ITimelineService,
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@ILabelService private readonly labelService: ILabelService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@IExtensionService private readonly extensionService: IExtensionService,
 	) {
-		super({ ...options, titleMenuId: MenuId.TimelineTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super({ ...options, titleMenuId: MenuId.TimelineTitle }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 
 		this.commands = this._register(this.instantiationService.createInstance(TimelinePaneCommands, this));
 
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncConflictsView.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncConflictsView.ts
index 0f644befc337..b26d97bf66a6 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncConflictsView.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncConflictsView.ts
@@ -21,7 +21,6 @@ import { IContextMenuService } from '../../../../platform/contextview/browser/co
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { IUserDataProfile, IUserDataProfilesService, reviveProfile } from '../../../../platform/userDataProfile/common/userDataProfile.js';
@@ -44,7 +43,6 @@ export class UserDataSyncConflictsViewPane extends TreeViewPane implements IUser
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@INotificationService notificationService: INotificationService,
 		@IHoverService hoverService: IHoverService,
 		@IUserDataSyncService private readonly userDataSyncService: IUserDataSyncService,
@@ -53,7 +51,7 @@ export class UserDataSyncConflictsViewPane extends TreeViewPane implements IUser
 		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
 		@IAccessibleViewInformationService accessibleViewVisibilityService: IAccessibleViewInformationService,
 	) {
-		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, notificationService, hoverService, accessibleViewVisibilityService);
+		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, notificationService, hoverService, accessibleViewVisibilityService);
 		this._register(this.userDataSyncService.onDidChangeConflicts(() => this.treeView.refresh()));
 		this.registerActions();
 	}
diff --git a/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts b/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts
index 88f4a86cd2f4..6dae8155249f 100644
--- a/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts
+++ b/src/vs/workbench/contrib/webviewView/browser/webviewViewPane.ts
@@ -17,7 +17,6 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { IProgressService } from '../../../../platform/progress/common/progress.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { ViewPane, ViewPaneShowActions } from '../../../browser/parts/views/viewPane.js';
 import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
@@ -74,7 +73,6 @@ export class WebviewViewPane extends ViewPane {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IOpenerService openerService: IOpenerService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IHoverService hoverService: IHoverService,
 		@IThemeService themeService: IThemeService,
 		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
@@ -86,7 +84,7 @@ export class WebviewViewPane extends ViewPane {
 		@IWebviewService private readonly webviewService: IWebviewService,
 		@IWebviewViewService private readonly webviewViewService: IWebviewViewService,
 	) {
-		super({ ...options, titleMenuId: MenuId.ViewTitle, showActions: ViewPaneShowActions.WhenExpanded }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
+		super({ ...options, titleMenuId: MenuId.ViewTitle, showActions: ViewPaneShowActions.WhenExpanded }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
 		this.extensionId = options.fromExtensionId;
 		this.defaultTitle = this.title;
 
diff --git a/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts b/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts
index ee1e81a8f15c..b5123044a0af 100644
--- a/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts
+++ b/src/vs/workbench/services/extensions/browser/extensionUrlHandler.ts
@@ -19,7 +19,6 @@ import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2
 import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
 import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { disposableWindowInterval } from '../../../../base/browser/dom.js';
 import { mainWindow } from '../../../../base/browser/window.js';
@@ -77,16 +76,6 @@ export interface IExtensionUrlHandler {
 	unregisterExtensionHandler(extensionId: ExtensionIdentifier): void;
 }
 
-export interface ExtensionUrlHandlerEvent {
-	readonly extensionId: string;
-}
-
-type ExtensionUrlHandlerClassification = {
-	owner: 'joaomoreno';
-	readonly extensionId: { classification: 'PublicNonPersonalData'; purpose: 'FeatureInsight'; comment: 'The ID of the extension that should handle the URI' };
-	comment: 'This is used to understand the drop funnel of extension URI handling by the OS & VS Code.';
-};
-
 export interface IExtensionUrlHandlerOverride {
 	canHandleURL(uri: URI): boolean;
 	handleURL(uri: URI): Promise<boolean>;
@@ -139,7 +128,6 @@ class ExtensionUrlHandler implements IExtensionUrlHandler, IURLHandler {
 		@IHostService private readonly hostService: IHostService,
 		@IStorageService private readonly storageService: IStorageService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@INotificationService private readonly notificationService: INotificationService,
 		@IProductService private readonly productService: IProductService,
 	) {
@@ -175,7 +163,6 @@ class ExtensionUrlHandler implements IExtensionUrlHandler, IURLHandler {
 		}
 
 		const extensionId = uri.authority;
-		this.telemetryService.publicLog2<ExtensionUrlHandlerEvent, ExtensionUrlHandlerClassification>('uri_invoked/start', { extensionId });
 
 		const initialHandler = this.extensionHandlers.get(ExtensionIdentifier.toKey(extensionId));
 		let extensionDisplayName: string;
@@ -219,7 +206,6 @@ class ExtensionUrlHandler implements IExtensionUrlHandler, IURLHandler {
 			});
 
 			if (!result.confirmed) {
-				this.telemetryService.publicLog2<ExtensionUrlHandlerEvent, ExtensionUrlHandlerClassification>('uri_invoked/cancel', { extensionId });
 				return true;
 			}
 
@@ -274,14 +260,10 @@ class ExtensionUrlHandler implements IExtensionUrlHandler, IURLHandler {
 	}
 
 	private async handleURLByExtension(extensionId: ExtensionIdentifier | string, handler: IURLHandler, uri: URI, options?: IOpenURLOptions): Promise<boolean> {
-		this.telemetryService.publicLog2<ExtensionUrlHandlerEvent, ExtensionUrlHandlerClassification>('uri_invoked/end', { extensionId: ExtensionIdentifier.toKey(extensionId) });
 		return await handler.handleURL(uri, options);
 	}
 
 	private async handleUnhandledURL(uri: URI, extensionId: string, options?: IOpenURLOptions): Promise<void> {
-
-		this.telemetryService.publicLog2<ExtensionUrlHandlerEvent, ExtensionUrlHandlerClassification>('uri_invoked/install_extension/start', { extensionId });
-
 		try {
 			await this.commandService.executeCommand('workbench.extensions.installExtension', extensionId, {
 				justification: {
@@ -290,12 +272,8 @@ class ExtensionUrlHandler implements IExtensionUrlHandler, IURLHandler {
 				},
 				enable: true
 			});
-			this.telemetryService.publicLog2<ExtensionUrlHandlerEvent, ExtensionUrlHandlerClassification>('uri_invoked/install_extension/accept', { extensionId });
 		} catch (error) {
-			if (isCancellationError(error)) {
-				this.telemetryService.publicLog2<ExtensionUrlHandlerEvent, ExtensionUrlHandlerClassification>('uri_invoked/install_extension/cancel', { extensionId });
-			} else {
-				this.telemetryService.publicLog2<ExtensionUrlHandlerEvent, ExtensionUrlHandlerClassification>('uri_invoked/install_extension/error', { extensionId });
+			if (!isCancellationError(error)) {
 				this.notificationService.error(error);
 			}
 			return;

From 3d148bd50b74ce43849f5576305c62f0f4344a93 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 24 Feb 2025 15:32:52 +0100
Subject: [PATCH 0309/1815] Revert addition of Configure option in Open Editors
 view (#241069)

Revert "Add a Configure option to overflow menu of Open Editors view (#237678)"

This reverts commit 567f6e35bf7b2fd089ec4bec513e5f3d03f0efaa.
---
 .../files/browser/views/openEditorsView.ts    | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
index aadefafbe38c..9446c1ddd459 100644
--- a/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts
@@ -56,7 +56,6 @@ import { mainWindow } from '../../../../../base/browser/window.js';
 import { EditorGroupView } from '../../../../browser/parts/editor/editorGroupView.js';
 import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
-import { IPreferencesService } from '../../../../services/preferences/common/preferences.js';
 
 const $ = dom.$;
 
@@ -944,24 +943,3 @@ registerAction2(class extends Action2 {
 		await commandService.executeCommand(NEW_UNTITLED_FILE_COMMAND_ID);
 	}
 });
-
-registerAction2(class extends Action2 {
-	constructor() {
-		super({
-			id: 'openEditors.configure',
-			title: nls.localize('configureOpenEditorsView', 'Configure \'{0}\'', OpenEditorsView.NAME.value),
-			f1: false,
-			icon: Codicon.gear,
-			menu: {
-				id: MenuId.ViewTitle,
-				group: '9_configure',
-				when: ContextKeyExpr.equals('view', OpenEditorsView.ID),
-				order: 10
-			}
-		});
-	}
-	async run(accessor: ServicesAccessor): Promise<void> {
-		const preferencesService = accessor.get(IPreferencesService);
-		preferencesService.openSettings({ jsonEditor: false, query: '@feature:explorer openEditors' });
-	}
-});

From 42c5863214c48f63466d67696df9e1be2b20b88a Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Mon, 24 Feb 2025 08:40:09 -0600
Subject: [PATCH 0310/1815] remove info log (#241671)

---
 extensions/terminal-suggest/src/fig/execute.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/extensions/terminal-suggest/src/fig/execute.ts b/extensions/terminal-suggest/src/fig/execute.ts
index bc8df7015083..ab9792f61378 100644
--- a/extensions/terminal-suggest/src/fig/execute.ts
+++ b/extensions/terminal-suggest/src/fig/execute.ts
@@ -21,7 +21,6 @@ export const executeCommandTimeout = async (
 	const command = [input.command, ...input.args].join(' ');
 	try {
 		console.info(`About to run shell command '${command}'`);
-		const start = performance.now();
 		const result = await withTimeout(
 			Math.max(timeout, input.timeout ?? 0),
 			spawnHelper2(input.command, input.args, {
@@ -30,11 +29,6 @@ export const executeCommandTimeout = async (
 				timeout: input.timeout,
 			})
 		);
-		const end = performance.now();
-		console.info(`Result of shell command '${command}'`, {
-			result,
-			time: end - start,
-		});
 
 		const cleanStdout = cleanOutput(result.stdout);
 		const cleanStderr = cleanOutput(result.stderr);

From e501fea2bbb564e5d3b6a8907d911abe9e972fbe Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Mon, 24 Feb 2025 15:59:06 +0100
Subject: [PATCH 0311/1815] Adding telemetry for TypeScript expandable hover
 (#241706)

adding telemetry
---
 .../contrib/telemetry/browser/telemetry.contribution.ts  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts b/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts
index 04ccc1762656..06e08fcd7899 100644
--- a/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts
+++ b/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts
@@ -379,6 +379,15 @@ class ConfigurationTelemetryContribution extends Disposable implements IWorkbenc
 				}>('editor.stickyScroll.enabled', { settingValue: this.getValueToReport(key, target), source });
 				return;
 
+			case 'typescript.experimental.expandableHover':
+				this.telemetryService.publicLog2<UpdatedSettingEvent, {
+					owner: 'aiday-mar';
+					comment: 'This is used to know if the TypeScript expandbale hover is enabled or not';
+					settingValue: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'value of the setting' };
+					source: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'source of the setting' };
+				}>('typescript.experimental.expandableHover', { settingValue: this.getValueToReport(key, target), source });
+				return;
+
 			case 'window.titleBarStyle':
 				this.telemetryService.publicLog2<UpdatedSettingEvent, {
 					owner: 'benibenj';

From bb9d2223bacc4e7f1a6239fedd10190651427793 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 24 Feb 2025 16:00:55 +0100
Subject: [PATCH 0312/1815] disable mandatory signature verification in linux
 and stable (#241707)

---
 .../extensionManagement/node/extensionManagementService.ts     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 05182a5c8b94..35838459323b 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -53,6 +53,7 @@ import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
 import { IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
 import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { isLinux } from '../../../base/common/platform.js';
 
 export const INativeServerExtensionManagementService = refineServiceDecorator<IExtensionManagementService, INativeServerExtensionManagementService>(IExtensionManagementService);
 export interface INativeServerExtensionManagementService extends IExtensionManagementService {
@@ -328,7 +329,7 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 		}
 		const { location, verificationStatus } = await this.extensionsDownloader.download(extension, operation, verifySignature, clientTargetPlatform);
 
-		if (verificationStatus !== ExtensionSignatureVerificationCode.Success && verificationStatus !== ExtensionSignatureVerificationCode.NotSigned && verifySignature && this.environmentService.isBuilt) {
+		if (verificationStatus !== ExtensionSignatureVerificationCode.Success && verificationStatus !== ExtensionSignatureVerificationCode.NotSigned && verifySignature && this.environmentService.isBuilt && !(isLinux && this.productService.quality === 'stable')) {
 			try {
 				await this.extensionsDownloader.delete(location);
 			} catch (e) {

From 87dc506eca183dc167207677a47b25654dc532bd Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Mon, 24 Feb 2025 07:30:40 -0800
Subject: [PATCH 0313/1815] Ensure data events are flushed before execution end
 fires

Fixes #241592
---
 .../terminal.shellIntegration.test.ts         |  6 ++---
 .../common/extHostTerminalShellIntegration.ts | 23 +++++++++++++++++--
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
index 3a63841d6007..d5d84c58f4df 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
@@ -142,7 +142,7 @@ import { assertNoRpc } from '../utils';
 		await closeTerminalAsync(terminal);
 	});
 
-	test.skip('TerminalShellExecution.read iterables should be available between the start and end execution events', async () => {
+	test('TerminalShellExecution.read iterables should be available between the start and end execution events', async () => {
 		const { terminal, shellIntegration } = await createTerminalAndWaitForShellIntegration();
 		const events: string[] = [];
 		disposables.push(window.onDidStartTerminalShellExecution(() => events.push('start')));
@@ -164,7 +164,7 @@ import { assertNoRpc } from '../utils';
 		await closeTerminalAsync(terminal);
 	});
 
-	test.skip('TerminalShellExecution.read events should fire with contents of command', async () => {
+	test('TerminalShellExecution.read events should fire with contents of command', async () => {
 		const { terminal, shellIntegration } = await createTerminalAndWaitForShellIntegration();
 		const events: string[] = [];
 
@@ -179,7 +179,7 @@ import { assertNoRpc } from '../utils';
 		await closeTerminalAsync(terminal);
 	});
 
-	test.skip('TerminalShellExecution.read events should give separate iterables per call', async () => {
+	test('TerminalShellExecution.read events should give separate iterables per call', async () => {
 		const { terminal, shellIntegration } = await createTerminalAndWaitForShellIntegration();
 
 		const { execution, endEvent } = executeCommandAsync(shellIntegration, 'echo hello');
diff --git a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
index 684782ee8969..c2d7b9e31729 100644
--- a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
@@ -235,8 +235,17 @@ class InternalTerminalShellIntegration extends Disposable {
 	endShellExecution(commandLine: vscode.TerminalShellExecutionCommandLine | undefined, exitCode: number | undefined): void {
 		if (this._currentExecution) {
 			this._currentExecution.endExecution(commandLine);
-			this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value, exitCode });
-			this._currentExecution = undefined;
+			const currentExecution = this._currentExecution;
+			// IMPORTANT: Ensure the current execution's data events are flushed in order to
+			// prevent data events firing after the end event fires.
+			currentExecution.flush().then(() => {
+				// Only fire if it's still the same execution, if it's changed it would have already
+				// been fired.
+				if (this._currentExecution === currentExecution) {
+					this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: currentExecution.value, exitCode });
+					this._currentExecution = undefined;
+				}
+			});
 		}
 	}
 
@@ -314,10 +323,15 @@ class InternalTerminalShellExecution {
 		this._dataStream = undefined;
 		this._ended = true;
 	}
+
+	async flush(): Promise<void> {
+		await this._dataStream?.flush();
+	}
 }
 
 class ShellExecutionDataStream extends Disposable {
 	private _barrier: Barrier | undefined;
+	private _iterables: AsyncIterableObject<string>[] = [];
 	private _emitters: AsyncIterableEmitter<string>[] = [];
 
 	createIterable(): AsyncIterable<string> {
@@ -329,6 +343,7 @@ class ShellExecutionDataStream extends Disposable {
 			this._emitters.push(emitter);
 			await barrier.wait();
 		});
+		this._iterables.push(iterable);
 		return iterable;
 	}
 
@@ -342,4 +357,8 @@ class ShellExecutionDataStream extends Disposable {
 		this._barrier?.open();
 		this._barrier = undefined;
 	}
+
+	async flush(): Promise<void> {
+		await Promise.all(this._iterables.map(e => e.toPromise()));
+	}
 }

From 59d35c387dcb7fe7fe5fdd0166823eb82ccfcbde Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Mon, 24 Feb 2025 16:42:36 +0100
Subject: [PATCH 0314/1815] Fixes #241517 (#241710)

---
 .../browser/textMateTokenizationFeatureImpl.ts     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts
index 2620e9a42006..844f240bddb7 100644
--- a/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts
+++ b/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts
@@ -52,7 +52,7 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate
 
 	private _grammarDefinitions: IValidGrammarDefinition[] | null = null;
 	private _grammarFactory: TMGrammarFactory | null = null;
-	private readonly _tokenizersRegistrations = new DisposableStore();
+	private readonly _tokenizersRegistrations = this._register(new DisposableStore());
 	private _currentTheme: IRawTheme | null = null;
 	private _currentTokenColorMap: string[] | null = null;
 	private readonly _threadedBackgroundTokenizerFactory = this._instantiationService.createInstance(
@@ -291,7 +291,8 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate
 				-1,
 				this._configurationService
 			);
-			const tokenization = new TextMateTokenizationSupport(
+			const store = new DisposableStore();
+			const tokenization = store.add(new TextMateTokenizationSupport(
 				r.grammar,
 				r.initialState,
 				r.containsEmbeddedLanguages,
@@ -301,15 +302,16 @@ export class TextMateTokenizationFeature extends Disposable implements ITextMate
 					this._reportTokenizationTime(timeMs, languageId, r.sourceExtensionId, lineLength, false, isRandomSample);
 				},
 				true,
-			);
-			const disposable = tokenization.onDidEncounterLanguage((encodedLanguageId) => {
+			));
+			store.add(tokenization.onDidEncounterLanguage((encodedLanguageId) => {
 				if (!this._encounteredLanguages[encodedLanguageId]) {
 					const languageId = this._languageService.languageIdCodec.decodeLanguageId(encodedLanguageId);
 					this._encounteredLanguages[encodedLanguageId] = true;
 					this._languageService.requestBasicLanguageFeatures(languageId);
 				}
-			});
-			return new TokenizationSupportWithLineLimit(encodedLanguageId, tokenization, disposable, maxTokenizationLineLength);
+			}));
+
+			return new TokenizationSupportWithLineLimit(encodedLanguageId, tokenization, store, maxTokenizationLineLength);
 		} catch (err) {
 			if (err.message && err.message === missingTMGrammarErrorMessage) {
 				// Don't log this error message

From 50258567fadcab2ca9abaaee12398ee170a6ea89 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Tue, 25 Feb 2025 02:52:14 +1100
Subject: [PATCH 0315/1815] Fix notebook inline chat (#241687)

* Fix notebook inline chat

* Fixes
---
 src/vs/workbench/contrib/chat/common/chatModel.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index af617322297e..a8cbc385a71a 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -531,8 +531,11 @@ export class Response extends AbstractResponse implements IDisposable {
 			}
 			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 = CellUri.parse(progress.uri)?.notebook;
+			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';

From f38e3b0dfba871c9a1703ccb0612da7518bb7fd0 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Mon, 24 Feb 2025 09:52:53 -0600
Subject: [PATCH 0316/1815] clear most recent prompt value input on input
 finished  (#241666)

---
 .../terminalContrib/suggest/browser/terminalSuggestAddon.ts  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index bfc73ac73a95..693bfefc3bbe 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -162,7 +162,10 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 					this._promptInputModel = commandDetection.promptInputModel;
 					this._promptInputModelSubscriptions.value = combinedDisposable(
 						this._promptInputModel.onDidChangeInput(e => this._sync(e)),
-						this._promptInputModel.onDidFinishInput(() => this.hideSuggestWidget(true)),
+						this._promptInputModel.onDidFinishInput(() => {
+							this._mostRecentPromptInputState = undefined;
+							this.hideSuggestWidget(true);
+						}),
 					);
 					if (this._shouldSyncWhenReady) {
 						this._sync(this._promptInputModel);

From e95380d32c974525a0736f258db73214a27b1a09 Mon Sep 17 00:00:00 2001
From: Michael Lively <michaellively00@gmail.com>
Date: Mon, 24 Feb 2025 08:20:11 -0800
Subject: [PATCH 0317/1815] Contribute rich hover for inline values for
 debugger + notebook execution values (#241713)

* show as a language hover

* viewport truncation good to go
---
 .../debug/browser/debugEditorContribution.ts  |  51 ++++-
 .../notebookInlineVariables.ts                | 190 ++++++++----------
 2 files changed, 128 insertions(+), 113 deletions(-)

diff --git a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
index 277b6a907af3..cce623efe947 100644
--- a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
@@ -52,6 +52,7 @@ import { ExceptionWidget } from './exceptionWidget.js';
 import { CONTEXT_EXCEPTION_WIDGET_VISIBLE, IDebugConfiguration, IDebugEditorContribution, IDebugService, IDebugSession, IExceptionInfo, IExpression, IStackFrame, State } from '../common/debug.js';
 import { Expression } from '../common/debugModel.js';
 import { IHostService } from '../../../services/host/browser/host.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
 
 const MAX_NUM_INLINE_VALUES = 100; // JS Global scope can have 700+ entries. We want to limit ourselves for perf reasons
 const MAX_INLINE_DECORATOR_LENGTH = 150; // Max string length of each inline decorator when debugging. If exceeded ... is added
@@ -73,10 +74,30 @@ class InlineSegment {
 	}
 }
 
-function createInlineValueDecoration(lineNumber: number, contentText: string, column = Constants.MAX_SAFE_SMALL_INTEGER): IModelDeltaDecoration[] {
-	// If decoratorText is too long, trim and add ellipses. This could happen for minified files with everything on a single line
-	if (contentText.length > MAX_INLINE_DECORATOR_LENGTH) {
-		contentText = contentText.substring(0, MAX_INLINE_DECORATOR_LENGTH) + '...';
+export function formatHoverContent(contentText: string): MarkdownString {
+	if (contentText.includes('\n') || contentText.includes('\r')) {
+		// Split by commas in case of multiple variables
+		const pairs = contentText.split(/,\s*/);
+		const formattedPairs = pairs.map(pair => {
+			const equalsIndex = pair.indexOf('=');
+			if (equalsIndex !== -1) {
+				const indent = ' '.repeat(equalsIndex + 2);
+				const [firstLine, ...restLines] = pair.trim().split(/\r?\n/);
+				return [firstLine, ...restLines.map(line => indent + line)].join('\n');
+			}
+			return pair;
+		});
+		return new MarkdownString().appendCodeblock('', formattedPairs.join(',\n'));
+	}
+	return new MarkdownString().appendCodeblock('', contentText);
+}
+
+export function createInlineValueDecoration(lineNumber: number, contentText: string, classNamePrefix: string, column = Constants.MAX_SAFE_SMALL_INTEGER, viewportMaxCol: number = MAX_INLINE_DECORATOR_LENGTH): IModelDeltaDecoration[] {
+	const rawText = contentText; // store raw text for hover message
+
+	// Truncate contentText if it exceeds the viewport max column
+	if (contentText.length > viewportMaxCol) {
+		contentText = contentText.substring(0, viewportMaxCol) + '...';
 	}
 
 	return [
@@ -88,7 +109,7 @@ function createInlineValueDecoration(lineNumber: number, contentText: string, co
 				endColumn: column
 			},
 			options: {
-				description: 'debug-inline-value-decoration-spacer',
+				description: `${classNamePrefix}-inline-value-decoration-spacer`,
 				after: {
 					content: strings.noBreakWhitespace,
 					cursorStops: InjectedTextCursorStops.None
@@ -104,14 +125,15 @@ function createInlineValueDecoration(lineNumber: number, contentText: string, co
 				endColumn: column
 			},
 			options: {
-				description: 'debug-inline-value-decoration',
+				description: `${classNamePrefix}-inline-value-decoration`,
 				after: {
 					content: replaceWsWithNoBreakWs(contentText),
-					inlineClassName: 'debug-inline-value',
+					inlineClassName: `${classNamePrefix}-inline-value`,
 					inlineClassNameAffectsLetterSpacing: true,
 					cursorStops: InjectedTextCursorStops.None
 				},
 				showIfCollapsed: true,
+				hoverMessage: formatHoverContent(rawText)
 			}
 		},
 	];
@@ -769,7 +791,10 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 				if (segments.length > 0) {
 					segments = segments.sort((a, b) => a.column - b.column);
 					const text = segments.map(s => s.text).join(separator);
-					allDecorations.push(...createInlineValueDecoration(line, text));
+					const editorWidth = this.editor.getLayoutInfo().width;
+					const fontInfo = this.editor.getOption(EditorOption.fontInfo);
+					const viewportMaxCol = Math.floor((editorWidth - 50) / fontInfo.typicalHalfwidthCharacterWidth);
+					allDecorations.push(...createInlineValueDecoration(line, text, 'debug', undefined, viewportMaxCol));
 				}
 			});
 
@@ -813,9 +838,13 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 				}
 			}
 
-			allDecorations = [...valuesPerLine.entries()].flatMap(([line, values]) =>
-				createInlineValueDecoration(line, [...values].map(([n, v]) => `${n} = ${v}`).join(', '))
-			);
+			allDecorations = [...valuesPerLine.entries()].flatMap(([line, values]) => {
+				const text = [...values].map(([n, v]) => `${n} = ${v}`).join(', ');
+				const editorWidth = this.editor.getLayoutInfo().width;
+				const fontInfo = this.editor.getOption(EditorOption.fontInfo);
+				const viewportMaxCol = Math.floor((editorWidth - 50) / fontInfo.typicalHalfwidthCharacterWidth);
+				return createInlineValueDecoration(line, text, 'debug', undefined, viewportMaxCol);
+			});
 		}
 
 		if (cts.token.isCancellationRequested) {
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookInlineVariables.ts b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookInlineVariables.ts
index badfa1415ae0..38164a2b381e 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookInlineVariables.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookInlineVariables.ts
@@ -9,28 +9,25 @@ import { Event } from '../../../../../../base/common/event.js';
 import { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../../../base/common/map.js';
 import { isEqual } from '../../../../../../base/common/resources.js';
-import { format, noBreakWhitespace } from '../../../../../../base/common/strings.js';
-import { Constants } from '../../../../../../base/common/uint.js';
+import { format } from '../../../../../../base/common/strings.js';
 import { Position } from '../../../../../../editor/common/core/position.js';
 import { Range } from '../../../../../../editor/common/core/range.js';
 import { InlineValueContext, InlineValueText, InlineValueVariableLookup } from '../../../../../../editor/common/languages.js';
-import { IModelDeltaDecoration, InjectedTextCursorStops, ITextModel } from '../../../../../../editor/common/model.js';
+import { IModelDeltaDecoration, ITextModel } from '../../../../../../editor/common/model.js';
 import { ILanguageFeaturesService } from '../../../../../../editor/common/services/languageFeatures.js';
 import { localize } from '../../../../../../nls.js';
 import { registerAction2 } from '../../../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { createInlineValueDecoration } from '../../../../debug/browser/debugEditorContribution.js';
 import { IDebugService, State } from '../../../../debug/common/debug.js';
 import { NotebookSetting } from '../../../common/notebookCommon.js';
 import { ICellExecutionStateChangedEvent, INotebookExecutionStateService, NotebookExecutionType } from '../../../common/notebookExecutionStateService.js';
-import { INotebookKernelMatchResult, INotebookKernelService, VariablesResult } from '../../../common/notebookKernelService.js';
+import { INotebookKernelService, VariablesResult } from '../../../common/notebookKernelService.js';
 import { INotebookActionContext, NotebookAction } from '../../controller/coreActions.js';
 import { ICellViewModel, INotebookEditor, INotebookEditorContribution } from '../../notebookBrowser.js';
 import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
 
-// value from debug, may need to keep an eye on and shorter to account for cells having a narrower viewport width
-const MAX_INLINE_DECORATOR_LENGTH = 150; // Max string length of each inline decorator. If exceeded ... is added
-
 class InlineSegment {
 	constructor(public column: number, public text: string) {
 	}
@@ -136,57 +133,61 @@ export class NotebookInlineVariablesController extends Disposable implements INo
 			const fullCellRange = new Range(1, 1, lastLine, lastColumn);
 
 			const promises = providers.flatMap(provider => Promise.resolve(provider.provideInlineValues(model, fullCellRange, ctx, token)).then(async (result) => {
-				if (result) {
+				if (!result) {
+					return;
+				}
 
-					let kernel: INotebookKernelMatchResult;
-					const kernelVars: VariablesResult[] = [];
-					if (result.some(iv => iv.type === 'variable')) { // if anyone will need a lookup, get vars now to avoid needing to do it multiple times
-						if (!this.notebookEditor.hasModel()) {
-							return; // should not happen, a cell will be executed
-						}
-						kernel = this.notebookKernelService.getMatchingKernel(this.notebookEditor.textModel);
-						const variables = kernel.selected?.provideVariables(event.notebook, undefined, 'named', 0, token);
-						if (!variables) {
-							return;
-						}
+				const notebook = this.notebookEditor.textModel;
+				if (!notebook) {
+					return;
+				}
+
+				const kernel = this.notebookKernelService.getMatchingKernel(notebook);
+				const kernelVars: VariablesResult[] = [];
+				if (result.some(iv => iv.type === 'variable')) { // if anyone will need a lookup, get vars now to avoid needing to do it multiple times
+					if (!this.notebookEditor.hasModel()) {
+						return; // should not happen, a cell will be executed
+					}
+					const variables = kernel.selected?.provideVariables(event.notebook, undefined, 'named', 0, token);
+					if (variables) {
 						for await (const v of variables) {
 							kernelVars.push(v);
 						}
 					}
+				}
 
-					for (const iv of result) {
-						let text: string | undefined = undefined;
-						switch (iv.type) {
-							case 'text':
-								text = (iv as InlineValueText).text;
-								break;
-							case 'variable': {
-								const name = (iv as InlineValueVariableLookup).variableName;
-								if (!name) {
-									continue; // skip to next var, no valid name to lookup with
-								}
-								const value = kernelVars.find(v => v.name === name)?.value;
-								if (!value) {
-									continue;
-								}
-								text = format('{0} = {1}', name, value);
-								break;
+				for (const iv of result) {
+					let text: string | undefined = undefined;
+					switch (iv.type) {
+						case 'text':
+							text = (iv as InlineValueText).text;
+							break;
+						case 'variable': {
+							const name = (iv as InlineValueVariableLookup).variableName;
+							if (!name) {
+								continue; // skip to next var, no valid name to lookup with
 							}
-							case 'expression': {
-								continue; // no active debug session, so evaluate would break
+							const value = kernelVars.find(v => v.name === name)?.value;
+							if (!value) {
+								continue;
 							}
+							text = format('{0} = {1}', name, value);
+							break;
 						}
+						case 'expression': {
+							continue; // no active debug session, so evaluate would break
+						}
+					}
 
-						if (text) {
-							const line = iv.range.startLineNumber;
-							let lineSegments = lineDecorations.get(line);
-							if (!lineSegments) {
-								lineSegments = [];
-								lineDecorations.set(line, lineSegments);
-							}
-							if (!lineSegments.some(iv => iv.text === text)) { // de-dupe
-								lineSegments.push(new InlineSegment(iv.range.startColumn, text));
-							}
+					if (text) {
+						const line = iv.range.startLineNumber;
+						let lineSegments = lineDecorations.get(line);
+						if (!lineSegments) {
+							lineSegments = [];
+							lineDecorations.set(line, lineSegments);
+						}
+						if (!lineSegments.some(iv => iv.text === text)) { // de-dupe
+							lineSegments.push(new InlineSegment(iv.range.startColumn, text));
 						}
 					}
 				}
@@ -199,10 +200,18 @@ export class NotebookInlineVariablesController extends Disposable implements INo
 			// sort line segments and concatenate them into a decoration
 			lineDecorations.forEach((segments, line) => {
 				if (segments.length > 0) {
-					segments = segments.sort((a, b) => a.column - b.column);
+					segments.sort((a, b) => a.column - b.column);
 					const text = segments.map(s => s.text).join(', ');
-					inlineDecorations.push(...this.createNotebookInlineValueDecoration(line, text));
-
+					const editorWidth = cell.layoutInfo.editorWidth;
+					const fontInfo = cell.layoutInfo.fontInfo;
+					if (fontInfo && cell.textModel) {
+						const base = Math.floor((editorWidth - 50) / fontInfo.typicalHalfwidthCharacterWidth);
+						const lineLength = cell.textModel.getLineLength(line);
+						const available = Math.max(0, base - lineLength);
+						inlineDecorations.push(...createInlineValueDecoration(line, text, 'nb', undefined, available));
+					} else {
+						inlineDecorations.push(...createInlineValueDecoration(line, text, 'nb'));
+					}
 				}
 			});
 
@@ -231,6 +240,7 @@ export class NotebookInlineVariablesController extends Disposable implements INo
 			const processedVars = new Set<string>();
 
 			const functionRanges = this.getFunctionRanges(document);
+			const lineDecorations = new Map<number, InlineSegment[]>();
 
 			// For each variable name found in the kernel results
 			for (const varName of varNames) {
@@ -270,12 +280,38 @@ export class NotebookInlineVariablesController extends Disposable implements INo
 
 				if (lastMatchOutsideFunction) {
 					const inlineVal = varName + ' = ' + vars.find(v => v.name === varName)?.value;
-					inlineDecorations.push(...this.createNotebookInlineValueDecoration(lastMatchOutsideFunction.line, inlineVal));
+
+					let lineSegments = lineDecorations.get(lastMatchOutsideFunction.line);
+					if (!lineSegments) {
+						lineSegments = [];
+						lineDecorations.set(lastMatchOutsideFunction.line, lineSegments);
+					}
+					if (!lineSegments.some(iv => iv.text === inlineVal)) { // de-dupe
+						lineSegments.push(new InlineSegment(lastMatchOutsideFunction.column, inlineVal));
+					}
 				}
 
 				processedVars.add(varName);
 			}
 
+			// sort line segments and concatenate them into a decoration
+			lineDecorations.forEach((segments, line) => {
+				if (segments.length > 0) {
+					segments.sort((a, b) => a.column - b.column);
+					const text = segments.map(s => s.text).join(', ');
+					const editorWidth = cell.layoutInfo.editorWidth;
+					const fontInfo = cell.layoutInfo.fontInfo;
+					if (fontInfo && cell.textModel) {
+						const base = Math.floor((editorWidth - 50) / fontInfo.typicalHalfwidthCharacterWidth);
+						const lineLength = cell.textModel.getLineLength(line);
+						const available = Math.max(0, base - lineLength);
+						inlineDecorations.push(...createInlineValueDecoration(line, text, 'nb', undefined, available));
+					} else {
+						inlineDecorations.push(...createInlineValueDecoration(line, text, 'nb'));
+					}
+				}
+			});
+
 			if (inlineDecorations.length > 0) {
 				this.updateCellInlineDecorations(cell, inlineDecorations);
 				this.initCellContentListener(cell);
@@ -421,55 +457,6 @@ export class NotebookInlineVariablesController extends Disposable implements INo
 		this._clearNotebookInlineDecorations();
 	}
 
-	// taken from /src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
-	private createNotebookInlineValueDecoration(lineNumber: number, contentText: string, column = Constants.MAX_SAFE_SMALL_INTEGER): IModelDeltaDecoration[] {
-		// If decoratorText is too long, trim and add ellipses. This could happen for minified files with everything on a single line
-		if (contentText.length > MAX_INLINE_DECORATOR_LENGTH) {
-			contentText = contentText.substring(0, MAX_INLINE_DECORATOR_LENGTH) + '...';
-		}
-
-		return [
-			{
-				range: {
-					startLineNumber: lineNumber,
-					endLineNumber: lineNumber,
-					startColumn: column,
-					endColumn: column
-				},
-				options: {
-					description: 'nb-inline-value-decoration-spacer',
-					after: {
-						content: noBreakWhitespace,
-						cursorStops: InjectedTextCursorStops.None
-					},
-					showIfCollapsed: true,
-				}
-			},
-			{
-				range: {
-					startLineNumber: lineNumber,
-					endLineNumber: lineNumber,
-					startColumn: column,
-					endColumn: column
-				},
-				options: {
-					description: 'nb-inline-value-decoration',
-					after: {
-						content: this.replaceWsWithNoBreakWs(contentText),
-						inlineClassName: 'nb-inline-value',
-						inlineClassNameAffectsLetterSpacing: true,
-						cursorStops: InjectedTextCursorStops.None
-					},
-					showIfCollapsed: true,
-				}
-			},
-		];
-	}
-
-	private replaceWsWithNoBreakWs(str: string): string {
-		return str.replace(/[ \t]/g, noBreakWhitespace);
-	}
-
 	override dispose(): void {
 		super.dispose();
 		this._clearNotebookInlineDecorations();
@@ -478,7 +465,6 @@ export class NotebookInlineVariablesController extends Disposable implements INo
 	}
 }
 
-
 registerNotebookContribution(NotebookInlineVariablesController.id, NotebookInlineVariablesController);
 
 registerAction2(class ClearNotebookInlineValues extends NotebookAction {

From aa3d78ec4911c1b135bbbd0dbef62c318a88e8d0 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 24 Feb 2025 17:34:37 +0100
Subject: [PATCH 0318/1815] fix #240640 (#241717)

---
 .../common/unsupportedExtensionsMigration.ts                | 4 ++--
 .../extensions/electron-sandbox/remoteExtensionsInit.ts     | 4 ++--
 .../services/userDataSync/browser/userDataSyncInit.ts       | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/unsupportedExtensionsMigration.ts b/src/vs/platform/extensionManagement/common/unsupportedExtensionsMigration.ts
index 1fea9a2abf81..de38da03b0a6 100644
--- a/src/vs/platform/extensionManagement/common/unsupportedExtensionsMigration.ts
+++ b/src/vs/platform/extensionManagement/common/unsupportedExtensionsMigration.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken } from '../../../base/common/cancellation.js';
-import { IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, InstallOperation } from './extensionManagement.js';
+import { EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT, IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, InstallOperation } from './extensionManagement.js';
 import { areSameExtensions, getExtensionId } from './extensionManagementUtil.js';
 import { IExtensionStorageService } from './extensionStorage.js';
 import { ExtensionType } from '../../extensions/common/extensions.js';
@@ -53,7 +53,7 @@ export async function migrateUnsupportedExtensions(extensionManagementService: I
 
 				let preReleaseExtension = installed.find(i => areSameExtensions(i.identifier, { id: preReleaseExtensionId }));
 				if (!preReleaseExtension || (!preReleaseExtension.isPreReleaseVersion && isUnsupportedExtensionEnabled)) {
-					preReleaseExtension = await extensionManagementService.installFromGallery(gallery, { installPreReleaseVersion: true, isMachineScoped: unsupportedExtension.isMachineScoped, operation: InstallOperation.Migrate });
+					preReleaseExtension = await extensionManagementService.installFromGallery(gallery, { installPreReleaseVersion: true, isMachineScoped: unsupportedExtension.isMachineScoped, operation: InstallOperation.Migrate, context: { [EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT]: true } });
 					logService.info(`Installed the pre-release extension '${preReleaseExtension.identifier.id}'`);
 					if (!isUnsupportedExtensionEnabled) {
 						await extensionEnablementService.disableExtension(preReleaseExtension.identifier);
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
index 88e2f38ec668..7c2520981e8f 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
@@ -5,7 +5,7 @@
 
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
-import { IExtensionGalleryService, IExtensionManagementService, InstallExtensionInfo } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT, IExtensionGalleryService, IExtensionManagementService, InstallExtensionInfo } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -181,7 +181,7 @@ class RemoteExtensionsInitializer extends AbstractExtensionsInitializer {
 				const manifest = await this.extensionGalleryService.getManifest(e, CancellationToken.None);
 				if (manifest && this.extensionManifestPropertiesService.canExecuteOnWorkspace(manifest)) {
 					const syncedExtension = remoteExtensions.find(e => areSameExtensions(e.identifier, e.identifier));
-					await this.extensionManagementService.installFromGallery(e, { installPreReleaseVersion: syncedExtension?.preRelease, donotIncludePackAndDependencies: true });
+					await this.extensionManagementService.installFromGallery(e, { installPreReleaseVersion: syncedExtension?.preRelease, donotIncludePackAndDependencies: true, context: { [EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT]: true } });
 				}
 			}));
 		}
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts
index eeefd1b1b05c..366d2367fb47 100644
--- a/src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts
+++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts
@@ -20,7 +20,7 @@ import { AuthenticationSessionInfo, getCurrentAuthenticationSessionInfo } from '
 import { getSyncAreaLabel } from '../common/userDataSync.js';
 import { isWeb } from '../../../../base/common/platform.js';
 import { Barrier, Promises } from '../../../../base/common/async.js';
-import { IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, ILocalExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT, EXTENSION_INSTALL_SOURCE_CONTEXT, ExtensionInstallSource, IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, ILocalExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
 import { IExtensionService, toExtensionDescription } from '../../extensions/common/extensions.js';
 import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
@@ -384,10 +384,10 @@ class NewExtensionsInitializer implements IUserDataSyncResourceInitializer {
 				}
 				this.logService.trace(`Installing extension...`, galleryExtension.identifier.id);
 				const local = await this.extensionManagementService.installFromGallery(galleryExtension, {
-					isMachineScoped: false, /* set isMachineScoped to prevent install and sync dialog in web */
 					donotIncludePackAndDependencies: true,
 					installGivenVersion: !!extensionToSync.version,
-					installPreReleaseVersion: extensionToSync.preRelease
+					installPreReleaseVersion: extensionToSync.preRelease,
+					context: { [EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT]: true, [EXTENSION_INSTALL_SOURCE_CONTEXT]: ExtensionInstallSource.SETTINGS_SYNC }
 				});
 				if (!preview.disabledExtensions.some(identifier => areSameExtensions(identifier, galleryExtension.identifier))) {
 					newlyEnabledExtensions.push(local);

From bcb8b9168c1eb38bdd0fc7333b3632f21a5c17f8 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 24 Feb 2025 17:51:41 +0100
Subject: [PATCH 0319/1815] Remove keybinding for partial accept (#241721)

---
 .../contrib/inlineCompletions/browser/controller/commands.ts     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
index eee8fb8c0d49..cb1b72e21253 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
@@ -269,7 +269,6 @@ export class AcceptNextInlineEditPart extends EditorAction {
 			precondition: ContextKeyExpr.and(EditorContextKeys.writable, InlineCompletionContextKeys.inlineEditVisible),
 			kbOpts: {
 				weight: KeybindingWeight.EditorContrib + 1,
-				primary: KeyMod.CtrlCmd | KeyCode.RightArrow,
 				kbExpr: ContextKeyExpr.and(EditorContextKeys.writable, InlineCompletionContextKeys.inlineEditVisible),
 			},
 		});

From b7bdece8948dbeac14bd32118c04678796ba7cbf Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Mon, 24 Feb 2025 09:07:54 -0800
Subject: [PATCH 0320/1815] fix: update edits transfer data property (#241723)

---
 .../workbench/contrib/chat/browser/actions/chatTitleActions.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
index 53beeabd7990..c4595b8c4ed3 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
@@ -492,7 +492,7 @@ export function registerChatTitleActions() {
 			// make request
 			await chatService.sendRequest(editingSession.chatSessionId, '', {
 				agentId: editAgent.id,
-				acceptedConfirmationData: [{ _type: 'toEditTransfer', transferedTurnResults: sourceRequests.map(v => v.response?.result) }], // TODO@jrieken HACKY
+				acceptedConfirmationData: [{ _type: 'toEditTransfer', transferredTurnResults: sourceRequests.map(v => v.response?.result) }], // TODO@jrieken HACKY
 				confirmation: typeof this.desc.title === 'string' ? this.desc.title : this.desc.title.value
 			});
 		}

From a12b46d05867c0535df5f072ff0f16b70bee4ded Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 24 Feb 2025 18:12:34 +0100
Subject: [PATCH 0321/1815] chat - status tweaks (#241720)

---
 .../contrib/chat/browser/chatStatus.ts        | 31 +++++++++++++------
 .../contrib/chat/browser/media/chatStatus.css |  5 +++
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index bfd7a9716217..f4e9d75cc1c5 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -13,7 +13,7 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
-import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment, TooltipContent } from '../../../services/statusbar/browser/statusbar.js';
+import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowTooltipCommand, StatusbarAlignment, TooltipContent } from '../../../services/statusbar/browser/statusbar.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatQuotasService } from '../common/chatQuotasService.js';
 import { quotaToButtonMessage, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, TOGGLE_CHAT_ACTION_ID, CHAT_OPEN_ACTION_ID } from './actions/chatActions.js';
@@ -24,6 +24,8 @@ import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/key
 import { defaultCheckboxStyles, defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { Checkbox } from '../../../../base/browser/ui/toggle/toggle.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { Command } from '../../../../editor/common/languages.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
 
 export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
 
@@ -44,7 +46,8 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		@IWorkbenchAssignmentService private readonly assignmentService: IWorkbenchAssignmentService,
 		@IProductService private readonly productService: IProductService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
-		@IConfigurationService private readonly configurationService: IConfigurationService
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@ICommandService private readonly commandService: ICommandService
 	) {
 		super();
 
@@ -93,7 +96,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 		let text = '$(copilot)';
 		let ariaLabel = localize('chatStatus', "Copilot Status");
-		let command = TOGGLE_CHAT_ACTION_ID;
+		let command: string | Command = TOGGLE_CHAT_ACTION_ID;
 		let tooltip: TooltipContent = localize('openChat', "Open Chat ({0})", this.keybindingService.lookupKeybinding(command)?.getLabel() ?? '');
 
 		// Quota Exceeded
@@ -105,7 +108,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
 				quotaWarning = localize('completionsQuotaExceededStatus', "Completions limit reached");
 			} else {
-				quotaWarning = localize('chatAndCompletionsQuotaExceededStatus', "Copilot limit reached");
+				quotaWarning = localize('chatAndCompletionsQuotaExceededStatus', "Limit reached");
 			}
 
 			text = `$(copilot-warning) ${quotaWarning}`;
@@ -139,8 +142,8 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 				container.appendChild($('div', undefined, localize('limitTitle', "You are currently using Copilot Free:")));
 
-				const chatQuotaIndicator = this.createQuotaIndicator(container, chatTotal, chatRemaining, localize('chatsLabel', "Chat Messages"));
-				const completionsQuotaIndicator = this.createQuotaIndicator(container, completionsTotal, completionsRemaining, localize('completionsLabel', "Code Completions"));
+				const chatQuotaIndicator = this.createQuotaIndicator(container, chatTotal, chatRemaining, localize('chatsLabel', "Chats Used"));
+				const completionsQuotaIndicator = this.createQuotaIndicator(container, completionsTotal, completionsRemaining, localize('completionsLabel', "Completions Used"));
 
 				this.chatEntitlementsService.resolve(CancellationToken.None).then(() => {
 					const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = this.chatQuotasService.quotas;
@@ -149,7 +152,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 					completionsQuotaIndicator(completionsTotal, completionsRemaining);
 				});
 
-				container.appendChild($('div', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.format(quotaResetDate))));
+				container.appendChild($('div', undefined, localize('limitQuota', "Usage will reset on {0}.", this.dateFormatter.format(quotaResetDate))));
 
 				// Settings
 				container.appendChild(document.createElement('hr'));
@@ -161,6 +164,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 				return container;
 			};
+			command = ShowTooltipCommand;
 		}
 
 		// Any other User
@@ -177,6 +181,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 				return container;
 			};
+			command = ShowTooltipCommand;
 		}
 
 		return {
@@ -206,8 +211,8 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 		const update = (total: number | undefined, remaining: number | undefined) => {
 			if (typeof total === 'number' && typeof remaining === 'number') {
-				quotaText.textContent = localize('quotaDisplay', "{0} / {1}", remaining, total);
-				quotaBit.style.width = `${(remaining / total) * 100}%`;
+				quotaText.textContent = localize('quotaDisplay', "{0} / {1}", total - remaining, total);
+				quotaBit.style.width = `${((total - remaining) / total) * 100}%`;
 			}
 		};
 
@@ -231,10 +236,16 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 			const shortcut = append(shortcuts, $('div.shortcut'));
 
-			append(shortcut, $('span.shortcut-label', undefined, entry.text));
+			const shortcutLabel = append(shortcut, $('span.shortcut-label', undefined, entry.text));
 
 			const shortcutKey = disposables.add(new KeybindingLabel(shortcut, OS, { ...defaultKeybindingLabelStyles }));
 			shortcutKey.set(keys);
+
+			for (const element of [shortcutLabel, shortcutKey.element]) {
+				disposables.add(addDisposableListener(element, EventType.CLICK, e => {
+					this.commandService.executeCommand(entry.id);
+				}));
+			}
 		}
 
 		return shortcuts;
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
index b102e539997c..911602f593f2 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
@@ -41,6 +41,11 @@
 
 .chat-status-bar-entry-tooltip .shortcuts .shortcut .shortcut-label {
 	flex: 1;
+	cursor: pointer;
+}
+
+.chat-status-bar-entry-tooltip .shortcuts .shortcut .monaco-keybinding {
+	cursor: pointer;
 }
 
 /* Quota Indicator */

From be0396185e40e7ee2045ab8f69b791416e7ab3f8 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Mon, 24 Feb 2025 08:44:53 -0800
Subject: [PATCH 0322/1815] change order of sync resources

---
 src/vs/platform/userDataSync/common/userDataSyncService.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/platform/userDataSync/common/userDataSyncService.ts b/src/vs/platform/userDataSync/common/userDataSyncService.ts
index d6d22ed4a3de..cc0e93e20d64 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncService.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncService.ts
@@ -865,9 +865,9 @@ class ProfileSynchronizer extends Disposable {
 			case SyncResource.Tasks: return 3;
 			case SyncResource.GlobalState: return 4;
 			case SyncResource.Extensions: return 5;
-			case SyncResource.Profiles: return 6;
-			case SyncResource.WorkspaceState: return 7;
-			case SyncResource.Prompts: return 8;
+			case SyncResource.Prompts: return 6;
+			case SyncResource.Profiles: return 7;
+			case SyncResource.WorkspaceState: return 8;
 		}
 	}
 }

From fd202eb97991726240fe3e9da061d588892d7922 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Mon, 24 Feb 2025 08:56:01 -0800
Subject: [PATCH 0323/1815] update unit tests for the user data sync service

---
 .../test/common/userDataSyncService.test.ts   | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/vs/platform/userDataSync/test/common/userDataSyncService.test.ts b/src/vs/platform/userDataSync/test/common/userDataSyncService.test.ts
index 62624c494e79..3048a8dd304c 100644
--- a/src/vs/platform/userDataSync/test/common/userDataSyncService.test.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataSyncService.test.ts
@@ -47,11 +47,11 @@ suite('UserDataSyncService', () => {
 			{ type: 'POST', url: `${target.url}/v1/resource/globalState`, headers: { 'If-Match': '0' } },
 			// Extensions
 			{ type: 'GET', url: `${target.url}/v1/resource/extensions/latest`, headers: {} },
-			// Profiles
-			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 			// Prompts
 			{ type: 'GET', url: `${target.url}/v1/resource/prompts/latest`, headers: {} },
 			{ type: 'POST', url: `${target.url}/v1/resource/prompts`, headers: { 'If-Match': '0' } },
+			// Profiles
+			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 		]);
 
 	});
@@ -84,11 +84,11 @@ suite('UserDataSyncService', () => {
 			{ type: 'POST', url: `${target.url}/v1/resource/globalState`, headers: { 'If-Match': '0' } },
 			// Extensions
 			{ type: 'GET', url: `${target.url}/v1/resource/extensions/latest`, headers: {} },
-			// Profiles
-			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 			// Prompts
 			{ type: 'GET', url: `${target.url}/v1/resource/prompts/latest`, headers: {} },
 			{ type: 'POST', url: `${target.url}/v1/resource/prompts`, headers: { 'If-Match': '0' } },
+			// Profiles
+			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 		]);
 	});
 
@@ -117,12 +117,11 @@ suite('UserDataSyncService', () => {
 			{ type: 'GET', url: `${target.url}/v1/resource/globalState/latest`, headers: {} },
 			// Extensions
 			{ type: 'GET', url: `${target.url}/v1/resource/extensions/latest`, headers: {} },
-			// Profiles
-			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 			// Prompts
 			{ type: 'GET', url: `${target.url}/v1/resource/prompts/latest`, headers: {} },
+			// Profiles
+			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 		]);
-
 	});
 
 	test('test first time sync from the client with no changes - merge', async () => {
@@ -150,10 +149,9 @@ suite('UserDataSyncService', () => {
 			{ type: 'GET', url: `${target.url}/v1/resource/tasks/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/globalState/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/extensions/latest`, headers: {} },
-			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/prompts/latest`, headers: {} },
+			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 		]);
-
 	});
 
 	test('test first time sync from the client with changes - merge', async () => {
@@ -193,9 +191,9 @@ suite('UserDataSyncService', () => {
 			{ type: 'GET', url: `${target.url}/v1/resource/tasks/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/globalState/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/extensions/latest`, headers: {} },
-			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/prompts/latest`, headers: {} },
 			{ type: 'POST', url: `${target.url}/v1/resource/prompts`, headers: { 'If-Match': '1' } },
+			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 		]);
 
 	});
@@ -238,11 +236,11 @@ suite('UserDataSyncService', () => {
 			{ type: 'GET', url: `${target.url}/v1/resource/tasks/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/globalState/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/resource/extensions/latest`, headers: {} },
+			{ type: 'GET', url: `${target.url}/v1/resource/prompts/latest`, headers: {} },
+			{ type: 'POST', url: `${target.url}/v1/resource/prompts`, headers: { 'If-Match': '1' } },
 			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 			{ type: 'POST', url: `${target.url}/v1/collection`, headers: {} },
 			{ type: 'POST', url: `${target.url}/v1/resource/profiles`, headers: { 'If-Match': '0' } },
-			{ type: 'GET', url: `${target.url}/v1/resource/prompts/latest`, headers: {} },
-			{ type: 'POST', url: `${target.url}/v1/resource/prompts`, headers: { 'If-Match': '1' } },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/settings/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/keybindings/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/snippets/latest`, headers: {} },
@@ -347,11 +345,11 @@ suite('UserDataSyncService', () => {
 			{ type: 'POST', url: `${target.url}/v1/resource/snippets`, headers: { 'If-Match': '1' } },
 			// Global state
 			{ type: 'POST', url: `${target.url}/v1/resource/globalState`, headers: { 'If-Match': '1' } },
+			// Prompts
+			{ type: 'POST', url: `${target.url}/v1/resource/prompts`, headers: { 'If-Match': '1' } },
 			// Profiles
 			{ type: 'POST', url: `${target.url}/v1/collection`, headers: {} },
 			{ type: 'POST', url: `${target.url}/v1/resource/profiles`, headers: { 'If-Match': '0' } },
-			// Prompts
-			{ type: 'POST', url: `${target.url}/v1/resource/prompts`, headers: { 'If-Match': '1' } },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/settings/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/keybindings/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/snippets/latest`, headers: {} },
@@ -486,10 +484,10 @@ suite('UserDataSyncService', () => {
 			{ type: 'GET', url: `${target.url}/v1/resource/snippets/latest`, headers: { 'If-None-Match': '1' } },
 			// Global state
 			{ type: 'GET', url: `${target.url}/v1/resource/globalState/latest`, headers: { 'If-None-Match': '1' } },
-			// Profiles
-			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: { 'If-None-Match': '0' } },
 			// Prompts
 			{ type: 'GET', url: `${target.url}/v1/resource/prompts/latest`, headers: { 'If-None-Match': '1' } },
+			// Profiles
+			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: { 'If-None-Match': '0' } },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/settings/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/keybindings/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/snippets/latest`, headers: {} },
@@ -558,11 +556,11 @@ suite('UserDataSyncService', () => {
 			{ type: 'POST', url: `${target.url}/v1/resource/globalState`, headers: { 'If-Match': '0' } },
 			// Extensions
 			{ type: 'GET', url: `${target.url}/v1/resource/extensions/latest`, headers: {} },
-			// Profiles
-			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 			// Prompts
 			{ type: 'GET', url: `${target.url}/v1/resource/prompts/latest`, headers: {} },
 			{ type: 'POST', url: `${target.url}/v1/resource/prompts`, headers: { 'If-Match': '0' } },
+			// Profiles
+			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 		]);
 
 	});
@@ -749,11 +747,11 @@ suite('UserDataSyncService', () => {
 			{ type: 'POST', url: `${target.url}/v1/resource/snippets`, headers: { 'If-Match': '1' } },
 			// Global state
 			{ type: 'POST', url: `${target.url}/v1/resource/globalState`, headers: { 'If-Match': '1' } },
+			// Prompts
+			{ type: 'POST', url: `${target.url}/v1/resource/prompts`, headers: { 'If-Match': '1' } },
 			// Profiles
 			{ type: 'POST', url: `${target.url}/v1/collection`, headers: {} },
 			{ type: 'POST', url: `${target.url}/v1/resource/profiles`, headers: { 'If-Match': '0' } },
-			// Prompts
-			{ type: 'POST', url: `${target.url}/v1/resource/prompts`, headers: { 'If-Match': '1' } },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/keybindings/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/snippets/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/tasks/latest`, headers: {} },
@@ -804,10 +802,10 @@ suite('UserDataSyncService', () => {
 			{ type: 'GET', url: `${target.url}/v1/resource/snippets/latest`, headers: { 'If-None-Match': '1' } },
 			// Global state
 			{ type: 'GET', url: `${target.url}/v1/resource/globalState/latest`, headers: { 'If-None-Match': '1' } },
-			// Profiles
-			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: { 'If-None-Match': '0' } },
 			// Prompts
 			{ type: 'GET', url: `${target.url}/v1/resource/prompts/latest`, headers: { 'If-None-Match': '1' } },
+			// Profiles
+			{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: { 'If-None-Match': '0' } },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/settings/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/snippets/latest`, headers: {} },
 			{ type: 'GET', url: `${target.url}/v1/collection/1/resource/tasks/latest`, headers: {} },
@@ -817,5 +815,4 @@ suite('UserDataSyncService', () => {
 		]);
 
 	});
-
 });

From 750b94ab1845b2725baf1c12514943e8eed172ca Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Mon, 24 Feb 2025 08:58:12 -0800
Subject: [PATCH 0324/1815] fix unit tests for user data auto sync service

---
 .../userDataSync/test/common/userDataAutoSyncService.test.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts b/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts
index 950d974455a3..559d2bf4179a 100644
--- a/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataAutoSyncService.test.ts
@@ -164,11 +164,11 @@ suite('UserDataAutoSyncService', () => {
 				{ type: 'POST', url: `${target.url}/v1/resource/globalState`, headers: { 'If-Match': '0' } },
 				// Extensions
 				{ type: 'GET', url: `${target.url}/v1/resource/extensions/latest`, headers: {} },
-				// Profiles
-				{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 				// Prompts
 				{ type: 'GET', url: `${target.url}/v1/resource/prompts/latest`, headers: {} },
 				{ type: 'POST', url: `${target.url}/v1/resource/prompts`, headers: { 'If-Match': '0' } },
+				// Profiles
+				{ type: 'GET', url: `${target.url}/v1/resource/profiles/latest`, headers: {} },
 				// Manifest
 				{ type: 'GET', url: `${target.url}/v1/manifest`, headers: {} },
 				// Machines

From 5b996725685810f77274c4eef8bef21a9f6bb9ea Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Mon, 24 Feb 2025 09:39:49 -0800
Subject: [PATCH 0325/1815] feat: add more match types for new Settings search
 (#241409)

---
 .../preferences/browser/preferencesSearch.ts  | 194 +++++++++++-------
 .../preferences/browser/settingsTreeModels.ts |   4 +-
 .../preferences/common/preferences.ts         |   9 +-
 3 files changed, 125 insertions(+), 82 deletions(-)

diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
index 128ffb047adf..e2829fa2f9c1 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
@@ -98,28 +98,29 @@ export class LocalSearchProvider implements ISearchProvider {
 		}
 
 		let orderedScore = LocalSearchProvider.START_SCORE; // Sort is not stable
-		const useNewKeyMatchingSearch = this.configurationService.getValue('workbench.settings.useWeightedKeySearch') === true;
+		const useNewKeyMatchAlgorithm = this.configurationService.getValue('workbench.settings.useWeightedKeySearch') === true;
 		const settingMatcher = (setting: ISetting) => {
 			const { matches, matchType, keyMatchScore } = new SettingMatches(
 				this._filter,
 				setting,
 				true,
 				(filter, setting) => preferencesModel.findValueMatches(filter, setting),
-				useNewKeyMatchingSearch,
+				useNewKeyMatchAlgorithm,
 				this.configurationService
 			);
+			if (matchType === SettingMatchType.None || matches.length === 0) {
+				return null;
+			}
+
 			const score = strings.equalsIgnoreCase(this._filter, setting.key) ?
 				LocalSearchProvider.EXACT_MATCH_SCORE :
 				orderedScore--;
-
-			return matches.length ?
-				{
-					matches,
-					matchType,
-					keyMatchScore,
-					score
-				} :
-				null;
+			return {
+				matches,
+				matchType,
+				keyMatchScore,
+				score
+			};
 		};
 
 		const filterMatches = preferencesModel.filterSettings(this._filter, this.getGroupFilter(this._filter), settingMatcher);
@@ -129,6 +130,14 @@ export class LocalSearchProvider implements ISearchProvider {
 				filterMatches: [exactMatch],
 				exactMatch: true
 			});
+		} else if (useNewKeyMatchAlgorithm) {
+			// Filter by the top match type.
+			const topMatchType = Math.max(...filterMatches.map(m => m.matchType));
+			const filteredMatches = filterMatches.filter(m => m.matchType === topMatchType);
+			return Promise.resolve({
+				filterMatches: filteredMatches,
+				exactMatch: false
+			});
 		} else {
 			return Promise.resolve({
 				filterMatches: filterMatches,
@@ -159,7 +168,7 @@ export class SettingMatches {
 		setting: ISetting,
 		private searchDescription: boolean,
 		valuesMatcher: (filter: string, setting: ISetting) => IRange[],
-		private useNewKeyMatchingSearch: boolean,
+		private useNewKeyMatchAlgorithm: boolean,
 		private readonly configurationService: IConfigurationService
 	) {
 		this.matches = distinct(this._findMatchesInSetting(searchString, setting), (match) => `${match.startLineNumber}_${match.startColumn}_${match.endLineNumber}_${match.endColumn}_`);
@@ -180,53 +189,82 @@ export class SettingMatches {
 		return label;
 	}
 
+	private _toAlphaNumeric(s: string): string {
+		return s.replace(/[^A-Za-z0-9]+/g, '');
+	}
+
 	private _doFindMatchesInSetting(searchString: string, setting: ISetting): IRange[] {
 		const descriptionMatchingWords: Map<string, IRange[]> = new Map<string, IRange[]>();
 		const keyMatchingWords: Map<string, IRange[]> = new Map<string, IRange[]>();
 		const valueMatchingWords: Map<string, IRange[]> = new Map<string, IRange[]>();
 
-		// Key search
+		// Key (ID) search
+		// First, search by the setting's ID and label.
 		const settingKeyAsWords: string = this._keyToLabel(setting.key);
 		const queryWords = new Set<string>(searchString.split(' '));
 		for (const word of queryWords) {
 			// Check if the key contains the word.
 			// Force contiguous matching iff we're using the new algorithm.
-			const keyMatches = matchesWords(word, settingKeyAsWords, this.useNewKeyMatchingSearch);
+			const keyMatches = matchesWords(word, settingKeyAsWords, this.useNewKeyMatchAlgorithm);
 			if (keyMatches?.length) {
 				keyMatchingWords.set(word, keyMatches.map(match => this.toKeyRange(setting, match)));
 			}
 		}
-		if (this.useNewKeyMatchingSearch) {
+		if (this.useNewKeyMatchAlgorithm) {
+			// New key match algorithm
 			if (keyMatchingWords.size === queryWords.size) {
 				// All words in the query matched with something in the setting key.
-				this.matchType |= SettingMatchType.KeyMatch;
-				// Score based on how many words matched out of the entire key, penalizing longer setting names.
-				const settingKeyAsWordsCount = settingKeyAsWords.split(' ').length;
-				this.keyMatchScore = (keyMatchingWords.size / settingKeyAsWordsCount) + (1 / setting.key.length);
-			}
-			const keyMatches = matchesSubString(searchString, settingKeyAsWords);
-			if (keyMatches?.length) {
-				// Handles cases such as "editor formonpast" with missing letters.
-				keyMatchingWords.set(searchString, keyMatches.map(match => this.toKeyRange(setting, match)));
-				this.matchType |= SettingMatchType.KeyMatch;
+				// Matches "edit format on paste" to "editor.formatOnPaste".
+				this.matchType |= SettingMatchType.AllWordsInSettingsLabel;
+			} else if (keyMatchingWords.size >= 2) {
+				// Matches "edit paste" to "editor.formatOnPaste".
+				// The if statement reduces noise by preventing "editor formatonpast" from matching all editor settings.
+				this.matchType |= SettingMatchType.ContiguousWordsInSettingsLabel;
 				this.keyMatchScore = keyMatchingWords.size;
 			}
+			const searchStringAlphaNumeric = this._toAlphaNumeric(searchString);
+			const keyAlphaNumeric = this._toAlphaNumeric(setting.key);
+			const keyIdMatches = matchesContiguousSubString(searchStringAlphaNumeric, keyAlphaNumeric);
+			if (keyIdMatches?.length) {
+				// Matches "editorformatonp" to "editor.formatonpaste".
+				keyMatchingWords.set(setting.key, keyIdMatches.map(match => this.toKeyRange(setting, match)));
+				this.matchType |= SettingMatchType.ContiguousQueryInSettingId;
+			}
+
+			// Fall back to non-contiguous searches if nothing matched yet.
+			if (this.matchType === SettingMatchType.None) {
+				keyMatchingWords.clear();
+				for (const word of queryWords) {
+					const keyMatches = matchesWords(word, settingKeyAsWords, false);
+					if (keyMatches?.length) {
+						keyMatchingWords.set(word, keyMatches.map(match => this.toKeyRange(setting, match)));
+					}
+				}
+				if (keyMatchingWords.size >= 2 || (keyMatchingWords.size === 1 && queryWords.size === 1)) {
+					// Matches "edforonpas" to "editor.formatOnPaste".
+					// The if statement reduces noise by preventing "editor fomonpast" from matching all editor settings.
+					this.matchType |= SettingMatchType.NonContiguousWordsInSettingsLabel;
+					this.keyMatchScore = keyMatchingWords.size;
+				} else {
+					const keyIdMatches = matchesSubString(searchStringAlphaNumeric, keyAlphaNumeric);
+					if (keyIdMatches?.length) {
+						// Matches "edfmonpas" to "editor.formatOnPaste".
+						keyMatchingWords.set(setting.key, keyIdMatches.map(match => this.toKeyRange(setting, match)));
+						this.matchType |= SettingMatchType.NonContiguousQueryInSettingId;
+					}
+				}
+			}
 		} else {
-			// Fall back to the old algorithm.
+			// Old key match algorithm
 			if (keyMatchingWords.size) {
-				this.matchType |= SettingMatchType.KeyMatch;
+				this.matchType |= SettingMatchType.NonContiguousWordsInSettingsLabel;
 				this.keyMatchScore = keyMatchingWords.size;
 			}
-		}
-		const keyIdMatches = matchesContiguousSubString(searchString, setting.key);
-		if (keyIdMatches?.length) {
-			// Handles cases such as "editor.formatonpaste" where the user tries searching for the ID.
-			keyMatchingWords.set(setting.key, keyIdMatches.map(match => this.toKeyRange(setting, match)));
-			if (this.useNewKeyMatchingSearch) {
-				this.matchType |= SettingMatchType.KeyMatch;
-				this.keyMatchScore = Math.max(this.keyMatchScore, searchString.length / setting.key.length);
-			} else {
-				this.matchType |= SettingMatchType.KeyIdMatch;
+			const keyIdMatches = matchesContiguousSubString(searchString, setting.key);
+			if (keyIdMatches?.length) {
+				// Handles cases such as "editor.formatonpaste" where the user tries searching for the ID.
+				keyMatchingWords.set(setting.key, keyIdMatches.map(match => this.toKeyRange(setting, match)));
+				this.matchType |= SettingMatchType.ContiguousQueryInSettingId;
 			}
 		}
 
@@ -239,15 +277,12 @@ export class SettingMatches {
 			return [...keyRanges];
 		}
 
-		// New algorithm only: exit early if the key already matched.
-		if (this.useNewKeyMatchingSearch && (this.matchType !== SettingMatchType.None)) {
-			const keyRanges = keyMatchingWords.size ?
-				Array.from(keyMatchingWords.values()).flat() : [];
-			return [...keyRanges];
-		}
-
 		// Description search
-		if (this.searchDescription && this.matchType === SettingMatchType.None) {
+		// Old algorithm: search the description if we haven't matched anything yet.
+		// New algorithm: search the description if we found non-contiguous key matches at best.
+		const hasContiguousKeyMatchTypes = this.matchType >= SettingMatchType.ContiguousWordsInSettingsLabel;
+		const checkDescription = (!this.useNewKeyMatchAlgorithm && this.matchType === SettingMatchType.None) || (this.useNewKeyMatchAlgorithm && !hasContiguousKeyMatchTypes);
+		if (this.searchDescription && checkDescription) {
 			for (const word of queryWords) {
 				// Search the description lines.
 				for (let lineIndex = 0; lineIndex < setting.description.length; lineIndex++) {
@@ -267,42 +302,47 @@ export class SettingMatches {
 
 		// Value search
 		// Check if the value contains all the words.
-		if (setting.enum?.length) {
-			// Search all string values of enums.
-			for (const option of setting.enum) {
-				if (typeof option !== 'string') {
-					continue;
-				}
-				valueMatchingWords.clear();
-				for (const word of queryWords) {
-					const valueMatches = matchesContiguousSubString(word, option);
-					if (valueMatches?.length) {
-						valueMatchingWords.set(word, valueMatches.map(match => this.toValueRange(setting, match)));
+		// Old algorithm: always search the values.
+		// New algorithm: search the values if we found non-contiguous key matches at best.
+		const checkValue = !this.useNewKeyMatchAlgorithm || !hasContiguousKeyMatchTypes;
+		if (checkValue) {
+			if (setting.enum?.length) {
+				// Search all string values of enums.
+				for (const option of setting.enum) {
+					if (typeof option !== 'string') {
+						continue;
 					}
-				}
-				if (valueMatchingWords.size === queryWords.size) {
-					this.matchType |= SettingMatchType.DescriptionOrValueMatch;
-					break;
-				} else {
-					// Clear out the match for now. We want to require all words to match in the value.
 					valueMatchingWords.clear();
-				}
-			}
-		} else {
-			// Search single string value.
-			const settingValue = this.configurationService.getValue(setting.key);
-			if (typeof settingValue === 'string') {
-				for (const word of queryWords) {
-					const valueMatches = matchesContiguousSubString(word, settingValue);
-					if (valueMatches?.length) {
-						valueMatchingWords.set(word, valueMatches.map(match => this.toValueRange(setting, match)));
+					for (const word of queryWords) {
+						const valueMatches = matchesContiguousSubString(word, option);
+						if (valueMatches?.length) {
+							valueMatchingWords.set(word, valueMatches.map(match => this.toValueRange(setting, match)));
+						}
+					}
+					if (valueMatchingWords.size === queryWords.size) {
+						this.matchType |= SettingMatchType.DescriptionOrValueMatch;
+						break;
+					} else {
+						// Clear out the match for now. We want to require all words to match in the value.
+						valueMatchingWords.clear();
 					}
 				}
-				if (valueMatchingWords.size === queryWords.size) {
-					this.matchType |= SettingMatchType.DescriptionOrValueMatch;
-				} else {
-					// Clear out the match for now. We want to require all words to match in the value.
-					valueMatchingWords.clear();
+			} else {
+				// Search single string value.
+				const settingValue = this.configurationService.getValue(setting.key);
+				if (typeof settingValue === 'string') {
+					for (const word of queryWords) {
+						const valueMatches = matchesContiguousSubString(word, settingValue);
+						if (valueMatches?.length) {
+							valueMatchingWords.set(word, valueMatches.map(match => this.toValueRange(setting, match)));
+						}
+					}
+					if (valueMatchingWords.size === queryWords.size) {
+						this.matchType |= SettingMatchType.DescriptionOrValueMatch;
+					} else {
+						// Clear out the match for now. We want to require all words to match in the value.
+						valueMatchingWords.clear();
+					}
 				}
 			}
 		}
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
index 95e7cfe79f27..73be2476f99e 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
@@ -971,8 +971,8 @@ export class SearchResultModel extends SettingsTreeModel {
 				// Sort by match type if the match types are not the same.
 				// The priority of the match type is given by the SettingMatchType enum.
 				return b.matchType - a.matchType;
-			} else if (a.matchType === SettingMatchType.KeyMatch) {
-				// The match types are the same and are KeyMatch.
+			} else if (a.matchType === SettingMatchType.NonContiguousWordsInSettingsLabel || a.matchType === SettingMatchType.ContiguousWordsInSettingsLabel) {
+				// The match types are the same.
 				// Sort by the number of words matched in the key.
 				// If those are the same, sort by the order in the table of contents.
 				return (b.keyMatchScore - a.keyMatchScore) || compareTwoNullableNumbers(a.setting.internalOrder, b.setting.internalOrder);
diff --git a/src/vs/workbench/services/preferences/common/preferences.ts b/src/vs/workbench/services/preferences/common/preferences.ts
index f9cb32deed32..321b9e7fc901 100644
--- a/src/vs/workbench/services/preferences/common/preferences.ts
+++ b/src/vs/workbench/services/preferences/common/preferences.ts
@@ -137,9 +137,12 @@ export enum SettingMatchType {
 	None = 0,
 	LanguageTagSettingMatch = 1 << 0,
 	RemoteMatch = 1 << 1,
-	DescriptionOrValueMatch = 1 << 2,
-	KeyMatch = 1 << 3,
-	KeyIdMatch = 1 << 4,
+	NonContiguousQueryInSettingId = 1 << 2,
+	DescriptionOrValueMatch = 1 << 3,
+	NonContiguousWordsInSettingsLabel = 1 << 4,
+	ContiguousWordsInSettingsLabel = 1 << 5,
+	ContiguousQueryInSettingId = 1 << 6,
+	AllWordsInSettingsLabel = 1 << 7,
 }
 
 export interface ISettingMatch {

From f64fab09111db36c35e136d5e24a747248d8c4af Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Mon, 24 Feb 2025 12:40:55 -0500
Subject: [PATCH 0326/1815] report perf for outputs within size window
 (#241728)

Co-authored-by: amunger <>
---
 .../view/renderers/backLayerWebView.ts        |  9 +++------
 .../browser/view/renderers/webviewMessages.ts |  1 -
 .../browser/view/renderers/webviewPreloads.ts | 20 +++++++++----------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
index 743deddfce3a..f33e4a2dfbed 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
@@ -930,8 +930,8 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Themable {
 				}
 				case 'notebookPerformanceMessage': {
 					this.notebookEditor.updatePerformanceMetadata(data.cellId, data.executionId, data.duration, data.rendererId);
-					if (data.mimeType && data.outputSize && data.rendererId === 'vscode.builtin-renderer') {
-						this._sendPerformanceData(data.mimeType, data.outputSize, data.duration);
+					if (data.outputSize && data.rendererId === 'vscode.builtin-renderer') {
+						this._sendPerformanceData(data.outputSize, data.duration);
 					}
 					break;
 				}
@@ -951,23 +951,20 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Themable {
 		return initializePromise.p;
 	}
 
-	private _sendPerformanceData(mimeType: string, outputSize: number, renderTime: number) {
+	private _sendPerformanceData(outputSize: number, renderTime: number) {
 		type NotebookOutputRenderClassification = {
 			owner: 'amunger';
 			comment: 'Track performance data for output rendering';
-			mimeType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Presentation type of the output.' };
 			outputSize: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Size of the output data buffer.'; isMeasurement: true };
 			renderTime: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Time spent rendering output.'; isMeasurement: true };
 		};
 
 		type NotebookOutputRenderEvent = {
-			mimeType: string;
 			outputSize: number;
 			renderTime: number;
 		};
 
 		const telemetryData = {
-			mimeType,
 			outputSize,
 			renderTime
 		};
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewMessages.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewMessages.ts
index b18398d54971..073737f5b79b 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewMessages.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewMessages.ts
@@ -486,7 +486,6 @@ export interface IPerformanceMessage extends BaseToWebviewMessage {
 	readonly duration: number;
 	readonly rendererId: string;
 	readonly outputSize?: number;
-	readonly mimeType?: string;
 }
 
 
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 ff6f74f9096a..5b7077bf1d11 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
@@ -2733,20 +2733,20 @@ async function webviewPreloads(ctx: PreloadContext) {
 
 			if (!!data.executionId && !!data.rendererId) {
 				let outputSize: number | undefined = undefined;
-				let mimeType: string | undefined = undefined;
 				if (data.content.type === 1 /* extension */) {
 					outputSize = data.content.output.valueBytes.length;
-					mimeType = data.content.output.mime;
 				}
 
-				postNotebookMessage<webviewMessages.IPerformanceMessage>('notebookPerformanceMessage', {
-					cellId: data.cellId,
-					executionId: data.executionId,
-					duration: Date.now() - startTime,
-					rendererId: data.rendererId,
-					outputSize,
-					mimeType
-				});
+				// Only send performance messages for non-empty outputs up to a certain size
+				if (outputSize !== undefined && outputSize > 0 && outputSize < 100 * 1024) {
+					postNotebookMessage<webviewMessages.IPerformanceMessage>('notebookPerformanceMessage', {
+						cellId: data.cellId,
+						executionId: data.executionId,
+						duration: Date.now() - startTime,
+						rendererId: data.rendererId,
+						outputSize
+					});
+				}
 			}
 		}
 

From 6f886217dafd408f12808a4f63775148aef136f4 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 24 Feb 2025 19:00:56 +0100
Subject: [PATCH 0327/1815] download the extensions locally while installing
 failed remote extensions from workbench (#241719)

---
 .../extensionManagement/common/extensionManagement.ts    | 1 +
 .../extensions/electron-sandbox/remoteExtensionsInit.ts  | 9 +++++++--
 .../electron-sandbox/remoteExtensionManagementService.ts | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index cd1dd853677b..f431353d8a07 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -537,6 +537,7 @@ export type InstallOptions = {
 	installOnlyNewlyAddedFromExtensionPack?: boolean;
 	productVersion?: IProductVersion;
 	keepExisting?: boolean;
+	downloadExtensionsLocally?: boolean;
 	/**
 	 * Context passed through to InstallExtensionResult
 	 */
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
index 7c2520981e8f..9bdf631a0bc5 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
@@ -59,14 +59,19 @@ export class InstallFailedRemoteExtensionsContribution implements IWorkbenchCont
 		for (const { id, installOptions } of failed) {
 			const extension = galleryExtensions.find(e => areSameExtensions(e.identifier, { id }));
 			if (extension) {
-				installExtensionInfo.push({ extension, options: installOptions });
+				installExtensionInfo.push({
+					extension, options: {
+						...installOptions,
+						downloadExtensionsLocally: true,
+					}
+				});
 			} else {
 				this.logService.warn(`Relayed failed extension '${id}' from server is not found in the gallery`);
 			}
 		}
 
 		if (installExtensionInfo.length) {
-			await this.extensionManagementServerService.remoteExtensionManagementServer.extensionManagementService.installGalleryExtensions(installExtensionInfo);
+			await Promise.allSettled(installExtensionInfo.map(e => this.extensionManagementServerService.remoteExtensionManagementServer!.extensionManagementService.installFromGallery(e.extension, e.options)));
 		}
 	}
 }
diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/remoteExtensionManagementService.ts b/src/vs/workbench/services/extensionManagement/electron-sandbox/remoteExtensionManagementService.ts
index f8fb1fd55ea3..e7c4ef4ae5b6 100644
--- a/src/vs/workbench/services/extensionManagement/electron-sandbox/remoteExtensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/electron-sandbox/remoteExtensionManagementService.ts
@@ -64,7 +64,7 @@ export class NativeRemoteExtensionManagementService extends RemoteExtensionManag
 	}
 
 	private async doInstallFromGallery(extension: IGalleryExtension, installOptions: InstallOptions): Promise<ILocalExtension> {
-		if (this.configurationService.getValue('remote.downloadExtensionsLocally')) {
+		if (installOptions.downloadExtensionsLocally || this.configurationService.getValue('remote.downloadExtensionsLocally')) {
 			return this.downloadAndInstall(extension, installOptions);
 		}
 		try {

From 87bf10ccb467e09582b75d159ffedf7f7e5062d4 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Mon, 24 Feb 2025 12:01:40 -0600
Subject: [PATCH 0328/1815] only adjust top when resizing if widget is rendered
 above (#241729)

fix #239030
---
 .../workbench/services/suggest/browser/simpleSuggestWidget.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
index 5389f4906814..294fccfd2e87 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
@@ -749,7 +749,7 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 
 		this._listElement.style.width = `${width}px`;
 		this.element.layout(height, width);
-		if (this._cursorPosition) {
+		if (this._cursorPosition && this._preference === WidgetPositionPreference.Above) {
 			this.element.domNode.style.top = `${this._cursorPosition.top - height}px`;
 		}
 		this._positionDetails();

From f66e839a38dfe39ee66a86619a790f9c2336d698 Mon Sep 17 00:00:00 2001
From: Justin Chen <54879025+justschen@users.noreply.github.com>
Date: Mon, 24 Feb 2025 10:58:33 -0800
Subject: [PATCH 0329/1815] telemetry cleanup (#241737)

remove telemetryservice
---
 .../browser/codeActionController.ts           | 30 +++++++++----------
 .../codeAction/browser/codeActionModel.ts     | 25 ----------------
 .../codeEditor/browser/saveParticipants.ts    | 24 +--------------
 3 files changed, 15 insertions(+), 64 deletions(-)

diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionController.ts b/src/vs/editor/contrib/codeAction/browser/codeActionController.ts
index de55ee700d9a..e65f9ab38da3 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionController.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionController.ts
@@ -10,20 +10,9 @@ import { IAction } from '../../../../base/common/actions.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Color } from '../../../../base/common/color.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 import { Lazy } from '../../../../base/common/lazy.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { ICodeEditor } from '../../../browser/editorBrowser.js';
-import { IPosition, Position } from '../../../common/core/position.js';
-import { IEditorContribution, ScrollType } from '../../../common/editorCommon.js';
-import { CodeActionTriggerType } from '../../../common/languages.js';
-import { IModelDeltaDecoration } from '../../../common/model.js';
-import { ModelDecorationOptions } from '../../../common/model/textModel.js';
-import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
-import { ApplyCodeActionReason, applyCodeAction } from './codeAction.js';
-import { CodeActionKeybindingResolver } from './codeActionKeybindingResolver.js';
-import { toMenuItems } from './codeActionMenu.js';
-import { LightBulbWidget } from './lightBulbWidget.js';
-import { MessageController } from '../../message/browser/messageController.js';
 import { localize } from '../../../../nls.js';
 import { IActionListDelegate } from '../../../../platform/actionWidget/browser/actionList.js';
 import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
@@ -36,10 +25,20 @@ import { IEditorProgressService } from '../../../../platform/progress/common/pro
 import { editorFindMatchHighlight, editorFindMatchHighlightBorder } from '../../../../platform/theme/common/colorRegistry.js';
 import { isHighContrast } from '../../../../platform/theme/common/theme.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { ICodeEditor } from '../../../browser/editorBrowser.js';
+import { IPosition, Position } from '../../../common/core/position.js';
+import { IEditorContribution, ScrollType } from '../../../common/editorCommon.js';
+import { CodeActionTriggerType } from '../../../common/languages.js';
+import { IModelDeltaDecoration } from '../../../common/model.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { MessageController } from '../../message/browser/messageController.js';
 import { CodeActionAutoApply, CodeActionFilter, CodeActionItem, CodeActionKind, CodeActionSet, CodeActionTrigger, CodeActionTriggerSource } from '../common/types.js';
+import { ApplyCodeActionReason, applyCodeAction } from './codeAction.js';
+import { CodeActionKeybindingResolver } from './codeActionKeybindingResolver.js';
+import { toMenuItems } from './codeActionMenu.js';
 import { CodeActionModel, CodeActionsState } from './codeActionModel.js';
-import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { LightBulbWidget } from './lightBulbWidget.js';
 
 interface IActionShowOptions {
 	readonly includeDisabledActions?: boolean;
@@ -79,13 +78,12 @@ export class CodeActionController extends Disposable implements IEditorContribut
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IActionWidgetService private readonly _actionWidgetService: IActionWidgetService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@ITelemetryService private readonly _telemetryService: ITelemetryService,
 		@IEditorProgressService private readonly _progressService: IEditorProgressService,
 	) {
 		super();
 
 		this._editor = editor;
-		this._model = this._register(new CodeActionModel(this._editor, languageFeaturesService.codeActionProvider, markerService, contextKeyService, progressService, _configurationService, this._telemetryService));
+		this._model = this._register(new CodeActionModel(this._editor, languageFeaturesService.codeActionProvider, markerService, contextKeyService, progressService, _configurationService));
 		this._register(this._model.onDidChangeState(newState => this.update(newState)));
 
 		this._lightBulbWidget = new Lazy(() => {
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionModel.ts b/src/vs/editor/contrib/codeAction/browser/codeActionModel.ts
index 4922ba46c4aa..d5e249add65d 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionModel.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionModel.ts
@@ -9,13 +9,11 @@ import { Emitter } from '../../../../base/common/event.js';
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 import { Disposable, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { isEqual } from '../../../../base/common/resources.js';
-import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IMarkerService } from '../../../../platform/markers/common/markers.js';
 import { IEditorProgressService, Progress } from '../../../../platform/progress/common/progress.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { ICodeEditor } from '../../../browser/editorBrowser.js';
 import { EditorOption, ShowLightbulbIconMode } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
@@ -176,7 +174,6 @@ export class CodeActionModel extends Disposable {
 		contextKeyService: IContextKeyService,
 		private readonly _progressService?: IEditorProgressService,
 		private readonly _configurationService?: IConfigurationService,
-		private readonly _telemetryService?: ITelemetryService
 	) {
 		super();
 		this._supportedCodeActions = SUPPORTED_CODE_ACTIONS.bindTo(contextKeyService);
@@ -328,29 +325,7 @@ export class CodeActionModel extends Disposable {
 
 					// Case for manual triggers - specifically Source Actions and Refactors
 					if (trigger.trigger.type === CodeActionTriggerType.Invoke) {
-						const sw = new StopWatch();
 						const codeActions = await getCodeActions(this._registry, model, trigger.selection, trigger.trigger, Progress.None, token);
-
-						// Telemetry for duration of each code action on save.
-						if (this._telemetryService) {
-							type RenderActionMenu = {
-								codeActions: number;
-								duration: number;
-							};
-
-							type RenderActionMenuClassification = {
-								owner: 'justschen';
-								comment: 'Information about how long it took for code actions to be received from the provider and shown in the UI.';
-								codeActions: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Number of valid code actions received from TS.' };
-								duration: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Duration it took for TS to return the action to run for each kind. ' };
-							};
-
-							this._telemetryService.publicLog2<RenderActionMenu, RenderActionMenuClassification>('codeAction.invokedDurations', {
-								codeActions: codeActions.validActions.length,
-								duration: sw.elapsed()
-							});
-						}
-
 						return codeActions;
 					}
 
diff --git a/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.ts b/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.ts
index 00a919f8aabe..d7ccb452f4b1 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.ts
@@ -6,7 +6,6 @@
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { StopWatch } from '../../../../base/common/stopwatch.js';
 import * as strings from '../../../../base/common/strings.js';
 import { IActiveCodeEditor, isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
@@ -28,14 +27,13 @@ import { ExtensionIdentifier } from '../../../../platform/extensions/common/exte
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IProgress, IProgressStep, Progress } from '../../../../platform/progress/common/progress.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchContributionsExtensions } from '../../../common/contributions.js';
 import { SaveReason } from '../../../common/editor.js';
-import { getModifiedRanges } from '../../format/browser/formatModified.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IHostService } from '../../../services/host/browser/host.js';
 import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 import { ITextFileEditorModel, ITextFileSaveParticipant, ITextFileSaveParticipantContext, ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { getModifiedRanges } from '../../format/browser/formatModified.js';
 
 export class TrimWhitespaceParticipant implements ITextFileSaveParticipant {
 
@@ -280,7 +278,6 @@ class CodeActionOnSaveParticipant extends Disposable implements ITextFileSavePar
 		@IHostService private readonly hostService: IHostService,
 		@IEditorService private readonly editorService: IEditorService,
 		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService
 	) {
 		super();
 
@@ -411,27 +408,8 @@ class CodeActionOnSaveParticipant extends Disposable implements ITextFileSavePar
 		};
 
 		for (const codeActionKind of codeActionsOnSave) {
-			const sw = new StopWatch();
-
 			const actionsToRun = await this.getActionsToRun(model, codeActionKind, excludes, getActionProgress, token);
 
-			// Telemetry for duration of each code action on save.
-			type CodeActionOnSave = {
-				codeAction: string;
-				duration: number;
-			};
-			type CodeActionOnSaveClassification = {
-				owner: 'justschen';
-				comment: 'Information about the code action that was accepted on save.';
-				codeAction: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Kind of the code action setting that is run.' };
-				duration: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Duration it took for TS to return the action to run for each kind. ' };
-			};
-
-			this.telemetryService.publicLog2<CodeActionOnSave, CodeActionOnSaveClassification>('codeAction.appliedOnSave', {
-				codeAction: codeActionKind.value,
-				duration: sw.elapsed()
-			});
-
 			if (token.isCancellationRequested) {
 				actionsToRun.dispose();
 				return;

From 9697d7ea663e3e1e29f269fdbe5001bafc98479b Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 24 Feb 2025 11:08:54 -0800
Subject: [PATCH 0330/1815] Always try sending along project root paths

If the user opens a ts file outside of any workspace, currently we may not send along a project root path to TS. This can result in extra projects being loaded

Instead we should tell TS about the current workspace we have opened
---
 .../src/tsServer/bufferSyncSupport.ts             | 15 ++++++++++++++-
 .../src/typescriptServiceClient.ts                |  5 +++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts b/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts
index 56d2896fa339..7b47be8d32f4 100644
--- a/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts
+++ b/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts
@@ -191,7 +191,20 @@ class SyncedBuffer {
 	}
 
 	private getProjectRootPath(resource: vscode.Uri): string | undefined {
-		const workspaceRoot = this.client.getWorkspaceRootForResource(resource);
+		let workspaceRoot = this.client.getWorkspaceRootForResource(resource);
+
+		// If we didn't find a real workspace, we still want to try sending along a workspace folder
+		// to prevent TS from loading projects from outside of any workspace.
+		// Just pick the highest level one on the same FS even though the file is outside of it
+		if (!workspaceRoot && vscode.workspace.workspaceFolders) {
+			for (const root of Array.from(vscode.workspace.workspaceFolders).sort((a, b) => a.uri.path.length - b.uri.path.length)) {
+				if (root.uri.scheme === resource.scheme && root.uri.authority === resource.authority) {
+					workspaceRoot = root.uri;
+					break;
+				}
+			}
+		}
+
 		if (workspaceRoot) {
 			const tsRoot = this.client.toTsFilePath(workspaceRoot);
 			return tsRoot?.startsWith(inMemoryResourcePrefix) ? undefined : tsRoot;
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index d9f47c1b85a5..4201d6da29b8 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -836,9 +836,10 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 			}
 		}
 
-		for (const root of roots.sort((a, b) => a.uri.fsPath.length - b.uri.fsPath.length)) {
+		// Find the highest level workspace folder that contains the file
+		for (const root of roots.sort((a, b) => a.uri.path.length - b.uri.path.length)) {
 			if (root.uri.scheme === resource.scheme && root.uri.authority === resource.authority) {
-				if (resource.fsPath.startsWith(root.uri.fsPath + path.sep)) {
+				if (resource.path.startsWith(root.uri.path + '/')) {
 					return root.uri;
 				}
 			}

From 21a561c61bbfcb6c0923c39fc53b360e70feb745 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Mon, 24 Feb 2025 11:12:59 -0800
Subject: [PATCH 0331/1815] Prevent new search regressing issue #239936
 (#241733)

---
 .../contrib/preferences/browser/preferencesSearch.ts   | 10 ++++++----
 .../contrib/preferences/browser/settingsTreeModels.ts  |  7 +++----
 .../services/preferences/common/preferences.ts         |  5 +++++
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
index e2829fa2f9c1..57f59b72d5d4 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ISettingsEditorModel, ISetting, ISettingsGroup, ISearchResult, IGroupFilter, SettingMatchType, ISettingMatch } from '../../../services/preferences/common/preferences.js';
+import { ISettingsEditorModel, ISetting, ISettingsGroup, ISearchResult, IGroupFilter, SettingMatchType, ISettingMatch, SettingKeyMatchTypes } from '../../../services/preferences/common/preferences.js';
 import { IRange } from '../../../../editor/common/core/range.js';
 import { distinct } from '../../../../base/common/arrays.js';
 import * as strings from '../../../../base/common/strings.js';
@@ -131,9 +131,11 @@ export class LocalSearchProvider implements ISearchProvider {
 				exactMatch: true
 			});
 		} else if (useNewKeyMatchAlgorithm) {
-			// Filter by the top match type.
-			const topMatchType = Math.max(...filterMatches.map(m => m.matchType));
-			const filteredMatches = filterMatches.filter(m => m.matchType === topMatchType);
+			// Check the top key match type.
+			const topKeyMatchType = Math.max(...filterMatches.map(m => (m.matchType & SettingKeyMatchTypes)));
+			// Always allow description matches as part of https://github.com/microsoft/vscode/issues/239936.
+			const alwaysAllowedMatchTypes = SettingMatchType.DescriptionOrValueMatch | SettingMatchType.LanguageTagSettingMatch;
+			const filteredMatches = filterMatches.filter(m => (m.matchType & topKeyMatchType) || (m.matchType & alwaysAllowedMatchTypes));
 			return Promise.resolve({
 				filterMatches: filteredMatches,
 				exactMatch: false
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
index 73be2476f99e..d48eb5628836 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
@@ -971,10 +971,9 @@ export class SearchResultModel extends SettingsTreeModel {
 				// Sort by match type if the match types are not the same.
 				// The priority of the match type is given by the SettingMatchType enum.
 				return b.matchType - a.matchType;
-			} else if (a.matchType === SettingMatchType.NonContiguousWordsInSettingsLabel || a.matchType === SettingMatchType.ContiguousWordsInSettingsLabel) {
-				// The match types are the same.
-				// Sort by the number of words matched in the key.
-				// If those are the same, sort by the order in the table of contents.
+			} else if ((a.matchType & SettingMatchType.NonContiguousWordsInSettingsLabel) || (a.matchType & SettingMatchType.ContiguousWordsInSettingsLabel)) {
+				// The match types of a and b are the same and can be sorted by their number of matched words.
+				// If those numbers are the same, sort by the order in the table of contents.
 				return (b.keyMatchScore - a.keyMatchScore) || compareTwoNullableNumbers(a.setting.internalOrder, b.setting.internalOrder);
 			} else if (a.matchType === SettingMatchType.RemoteMatch) {
 				// The match types are the same and are RemoteMatch.
diff --git a/src/vs/workbench/services/preferences/common/preferences.ts b/src/vs/workbench/services/preferences/common/preferences.ts
index 321b9e7fc901..f36d548facf3 100644
--- a/src/vs/workbench/services/preferences/common/preferences.ts
+++ b/src/vs/workbench/services/preferences/common/preferences.ts
@@ -144,6 +144,11 @@ export enum SettingMatchType {
 	ContiguousQueryInSettingId = 1 << 6,
 	AllWordsInSettingsLabel = 1 << 7,
 }
+export const SettingKeyMatchTypes = (SettingMatchType.AllWordsInSettingsLabel
+	| SettingMatchType.ContiguousWordsInSettingsLabel
+	| SettingMatchType.NonContiguousWordsInSettingsLabel
+	| SettingMatchType.NonContiguousQueryInSettingId
+	| SettingMatchType.ContiguousQueryInSettingId);
 
 export interface ISettingMatch {
 	setting: ISetting;

From 16b9b76cbf83be1a0cec1a38cb9e2d45f0cd212a Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 24 Feb 2025 11:33:06 -0800
Subject: [PATCH 0332/1815] User clearer name for function

---
 src/vs/base/browser/markdownRenderer.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/base/browser/markdownRenderer.ts b/src/vs/base/browser/markdownRenderer.ts
index 71af77b8f254..cf15d43b0abb 100644
--- a/src/vs/base/browser/markdownRenderer.ts
+++ b/src/vs/base/browser/markdownRenderer.ts
@@ -585,7 +585,7 @@ const unescapeInfo = new Map<string, string>([
 	['&gt;', '>'],
 ]);
 
-function createRenderer(): marked.Renderer {
+function createPlainTextRenderer(): marked.Renderer {
 	const renderer = new marked.Renderer();
 
 	renderer.code = ({ text }: marked.Tokens.Code): string => {
@@ -647,10 +647,10 @@ function createRenderer(): marked.Renderer {
 	};
 	return renderer;
 }
-const plainTextRenderer = new Lazy<marked.Renderer>(createRenderer);
+const plainTextRenderer = new Lazy<marked.Renderer>(createPlainTextRenderer);
 
 const plainTextWithCodeBlocksRenderer = new Lazy<marked.Renderer>(() => {
-	const renderer = createRenderer();
+	const renderer = createPlainTextRenderer();
 	renderer.code = ({ text }: marked.Tokens.Code): string => {
 		return `\n\`\`\`\n${escape(text)}\n\`\`\`\n`;
 	};

From e25a69af073ed8a4f8743586d103d27356001e2c Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 24 Feb 2025 20:44:54 +0100
Subject: [PATCH 0333/1815] Copilot Icon is shown far right after global VS
 Code settings icon (fix #241695) (#241744)

---
 .../browser/parts/titlebar/titlebarPart.ts    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 8aa33c789709..718037ce3e67 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -636,15 +636,6 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 				}
 			}
 
-			// --- Activity Actions
-			if (this.activityActionsEnabled) {
-				if (isAccountsActionVisible(this.storageService)) {
-					actions.primary.push(ACCOUNTS_ACTIVITY_TILE_ACTION);
-				}
-
-				actions.primary.push(GLOBAL_ACTIVITY_TITLE_ACTION);
-			}
-
 			// --- Global Actions
 			const globalToolbarActions = this.globalToolbarMenu.getActions();
 			this.hasGlobalToolbarEntries = globalToolbarActions.length > 0;
@@ -653,7 +644,7 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 				actions
 			);
 
-			// --- Layout Actions (always at the end)
+			// --- Layout Actions
 			if (this.layoutToolbarMenu) {
 				fillInActionBarActions(
 					this.layoutToolbarMenu.getActions(),
@@ -662,6 +653,15 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 				);
 			}
 
+			// --- Activity Actions (always at the end)
+			if (this.activityActionsEnabled) {
+				if (isAccountsActionVisible(this.storageService)) {
+					actions.primary.push(ACCOUNTS_ACTIVITY_TILE_ACTION);
+				}
+
+				actions.primary.push(GLOBAL_ACTIVITY_TITLE_ACTION);
+			}
+
 			this.actionToolBar.setActions(prepareActions(actions.primary), prepareActions(actions.secondary));
 		};
 

From a841f4054aa17b9ca3e3d9509f8bcd4b42f49dd7 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Tue, 25 Feb 2025 06:55:44 +1100
Subject: [PATCH 0334/1815] Disable inline notebook diff if notebook chat is in
 progress (#241741)

---
 .../contrib/notebook/browser/diff/notebookDiffActions.ts      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts
index ce14ccefd3eb..e3438e83bd72 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffActions.ts
@@ -29,6 +29,7 @@ import { Codicon } from '../../../../../base/common/codicons.js';
 import type { URI } from '../../../../../base/common/uri.js';
 import { TextEditorSelectionRevealType, type ITextEditorOptions } from '../../../../../platform/editor/common/editor.js';
 import product from '../../../../../platform/product/common/product.js';
+import { ctxHasEditorModification, ctxHasRequestInProgress } from '../../../chat/browser/chatEditing/chatEditingEditorContextKeys.js';
 
 // ActiveEditorContext.isEqualTo(SearchEditorConstants.SearchEditorID)
 
@@ -707,7 +708,8 @@ registerAction2(class extends Action2 {
 					group: '1_diff',
 					order: 10,
 					when: ContextKeyExpr.and(ActiveEditorContext.isEqualTo(NotebookTextDiffEditor.ID),
-						ContextKeyExpr.equals('config.notebook.diff.experimental.toggleInline', true))
+						ContextKeyExpr.equals('config.notebook.diff.experimental.toggleInline', true),
+						ctxHasEditorModification.negate(), ctxHasRequestInProgress.negate())
 				}
 			}
 		);

From c694759085dda74607c7e09f1aaea4a18f0da06d Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Tue, 25 Feb 2025 06:55:59 +1100
Subject: [PATCH 0335/1815] Remove leak in notebook diff editor (#241739)

---
 .../notebook/browser/diff/notebookDiffEditor.ts     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
index d581c194e6ad..0bf00ecd0fff 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
@@ -669,8 +669,9 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 			this._list.updateElementHeight2(cell, height);
 		};
 
-		if (this.pendingLayouts.has(cell)) {
-			this.pendingLayouts.get(cell)!.dispose();
+		let disposable = this.pendingLayouts.get(cell);
+		if (disposable) {
+			this._localStore.delete(disposable);
 		}
 
 		let r: () => void;
@@ -680,11 +681,13 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 			relayout(cell, height);
 			r();
 		});
-
-		this.pendingLayouts.set(cell, toDisposable(() => {
+		disposable = toDisposable(() => {
 			layoutDisposable.dispose();
 			r();
-		}));
+		});
+		this._localStore.add(disposable);
+
+		this.pendingLayouts.set(cell, disposable);
 
 		return new Promise<void>(resolve => { r = resolve; });
 	}

From a0055f31b50fba0bbf5e1355db03601013913f0a Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Mon, 24 Feb 2025 15:00:52 -0500
Subject: [PATCH 0336/1815] register disposable state (#241750)

Co-authored-by: amunger <>
---
 .../notebook/browser/contrib/find/notebookFindReplaceWidget.ts  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts
index d700b962cd94..f2de65d5bdc1 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts
@@ -330,6 +330,8 @@ export abstract class SimpleFindReplaceWidget extends Widget {
 	) {
 		super();
 
+		this._register(this._state);
+
 		const findFilters = this._configurationService.getValue<{
 			markupSource: boolean;
 			markupPreview: boolean;

From 793631c90aa42eea16fc8b0f2f5c3f2c2be378a3 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 24 Feb 2025 21:01:37 +0100
Subject: [PATCH 0337/1815] path - update to the node.js version we ship
 (`20.18.2`) (#241745)

* path - update to the node.js version we ship (`20.18.2`)

* https://github.com/nodejs/node/commit/f82d086e90b8ed6274fe5380c5e9381bffe6ac4d

* https://github.com/nodejs/node/commit/329be5cc355cd9f930ad59062171c401ceb8793c

* https://github.com/nodejs/node/commit/c61cee2138952060f4bef78de58c0793fcafe51f

* https://github.com/nodejs/node/commit/2859b4ba9ab9aae47d3576847cd157839900fe4a

* https://github.com/nodejs/node/commit/309cb1cbd21711f6acc40be93d4b39f0df27be5a

* https://github.com/nodejs/node/commit/3a682cca03ff6f35391c0aead64b4ad4b3455bb3

* https://github.com/nodejs/node/commit/42d58218737b69491bcb4b9c171a4782b9db5f6b
---
 src/vs/base/common/path.ts | 94 +++++++++++++++++++++++++++++++-------
 1 file changed, 77 insertions(+), 17 deletions(-)

diff --git a/src/vs/base/common/path.ts b/src/vs/base/common/path.ts
index 29621411b780..14a0dcda30ad 100644
--- a/src/vs/base/common/path.ts
+++ b/src/vs/base/common/path.ts
@@ -4,9 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 // NOTE: VSCode's copy of nodejs path library to be usable in common (non-node) namespace
-// Copied from: https://github.com/nodejs/node/commits/v20.9.0/lib/path.js
+// Copied from: https://github.com/nodejs/node/commits/v20.18.2/lib/path.js
 // Excluding: the change that adds primordials
 // (https://github.com/nodejs/node/commit/187a862d221dec42fa9a5c4214e7034d9092792f and others)
+// Excluding: the change that adds glob matching
+// (https://github.com/nodejs/node/commit/57b8b8e18e5e2007114c63b71bf0baedc01936a6)
 
 /**
  * Copyright Joyent, Inc. and other Node contributors.
@@ -425,6 +427,23 @@ export const win32: IPath = {
 		if (tail.length > 0 && isPathSeparator(path.charCodeAt(len - 1))) {
 			tail += '\\';
 		}
+		if (!isAbsolute && device === undefined && path.includes(':')) {
+			// If the original path was not absolute and if we have not been able to
+			// resolve it relative to a particular device, we need to ensure that the
+			// `tail` has not become something that Windows might interpret as an
+			// absolute path. See CVE-2024-36139.
+			if (tail.length >= 2 &&
+				isWindowsDeviceRoot(tail.charCodeAt(0)) &&
+				tail.charCodeAt(1) === CHAR_COLON) {
+				return `.\\${tail}`;
+			}
+			let index = path.indexOf(':');
+			do {
+				if (index === len - 1 || isPathSeparator(path.charCodeAt(index + 1))) {
+					return `.\\${tail}`;
+				}
+			} while ((index = path.indexOf(':', index + 1)) !== -1);
+		}
 		if (device === undefined) {
 			return isAbsolute ? `\\${tail}` : tail;
 		}
@@ -544,6 +563,42 @@ export const win32: IPath = {
 			return '';
 		}
 
+		if (fromOrig.length !== from.length || toOrig.length !== to.length) {
+			const fromSplit = fromOrig.split('\\');
+			const toSplit = toOrig.split('\\');
+			if (fromSplit[fromSplit.length - 1] === '') {
+				fromSplit.pop();
+			}
+			if (toSplit[toSplit.length - 1] === '') {
+				toSplit.pop();
+			}
+
+			const fromLen = fromSplit.length;
+			const toLen = toSplit.length;
+			const length = fromLen < toLen ? fromLen : toLen;
+
+			let i;
+			for (i = 0; i < length; i++) {
+				if (fromSplit[i].toLowerCase() !== toSplit[i].toLowerCase()) {
+					break;
+				}
+			}
+
+			if (i === 0) {
+				return toOrig;
+			} else if (i === length) {
+				if (toLen > length) {
+					return toSplit.slice(i).join('\\');
+				}
+				if (fromLen > length) {
+					return '..\\'.repeat(fromLen - 1 - i) + '..';
+				}
+				return '';
+			}
+
+			return '..\\'.repeat(fromLen - i) + toSplit.slice(i).join('\\');
+		}
+
 		// Trim any leading backslashes
 		let fromStart = 0;
 		while (fromStart < from.length &&
@@ -672,7 +727,7 @@ export const win32: IPath = {
 			return `\\\\?\\${resolvedPath}`;
 		}
 
-		return path;
+		return resolvedPath;
 	},
 
 	dirname(path: string): string {
@@ -1098,9 +1153,8 @@ export const posix: IPath = {
 		let resolvedPath = '';
 		let resolvedAbsolute = false;
 
-		for (let i = pathSegments.length - 1; i >= -1 && !resolvedAbsolute; i--) {
-			const path = i >= 0 ? pathSegments[i] : posixCwd();
-
+		for (let i = pathSegments.length - 1; i >= 0 && !resolvedAbsolute; i--) {
+			const path = pathSegments[i];
 			validateString(path, `paths[${i}]`);
 
 			// Skip empty entries
@@ -1112,6 +1166,13 @@ export const posix: IPath = {
 			resolvedAbsolute = path.charCodeAt(0) === CHAR_FORWARD_SLASH;
 		}
 
+		if (!resolvedAbsolute) {
+			const cwd = posixCwd();
+			resolvedPath = `${cwd}/${resolvedPath}`;
+			resolvedAbsolute =
+				cwd.charCodeAt(0) === CHAR_FORWARD_SLASH;
+		}
+
 		// At this point the path should be resolved to a full absolute path, but
 		// handle relative paths to be safe (might happen when process.cwd() fails)
 
@@ -1161,22 +1222,21 @@ export const posix: IPath = {
 		if (paths.length === 0) {
 			return '.';
 		}
-		let joined;
+
+		const path = [];
 		for (let i = 0; i < paths.length; ++i) {
 			const arg = paths[i];
 			validateString(arg, 'path');
 			if (arg.length > 0) {
-				if (joined === undefined) {
-					joined = arg;
-				} else {
-					joined += `/${arg}`;
-				}
+				path.push(arg);
 			}
 		}
-		if (joined === undefined) {
+
+		if (path.length === 0) {
 			return '.';
 		}
-		return posix.normalize(joined);
+
+		return posix.normalize(path.join('/'));
 	},
 
 	relative(from: string, to: string): string {
@@ -1288,7 +1348,7 @@ export const posix: IPath = {
 
 	basename(path: string, suffix?: string): string {
 		if (suffix !== undefined) {
-			validateString(suffix, 'ext');
+			validateString(suffix, 'suffix');
 		}
 		validateString(path, 'path');
 
@@ -1376,8 +1436,8 @@ export const posix: IPath = {
 		// after any path separator we find
 		let preDotState = 0;
 		for (let i = path.length - 1; i >= 0; --i) {
-			const code = path.charCodeAt(i);
-			if (code === CHAR_FORWARD_SLASH) {
+			const char = path[i];
+			if (char === '/') {
 				// If we reached a path separator that was not part of a set of path
 				// separators at the end of the string, stop now
 				if (!matchedSlash) {
@@ -1392,7 +1452,7 @@ export const posix: IPath = {
 				matchedSlash = false;
 				end = i + 1;
 			}
-			if (code === CHAR_DOT) {
+			if (char === '.') {
 				// If this is our first dot, mark it as the start of our extension
 				if (startDot === -1) {
 					startDot = i;

From 434ebfb9e336741eadb0eb541e609c03d4ae0f7d Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Mon, 24 Feb 2025 12:02:49 -0800
Subject: [PATCH 0338/1815] fix: polish chat related files UI (#241751)

* fix: adopt dashed border for chat related files

* fix: decrease + button size for chat related files
---
 src/vs/workbench/contrib/chat/browser/media/chat.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 2539c043e73d..aaa0bc4e35b8 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -720,6 +720,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	border-radius: 4px;
 	height: 18px;
 	border: 1px solid var(--vscode-input-border);
+	border-style: dashed;
 	align-items: center;
 	overflow: hidden;
 	padding: 0 0 0 2px;
@@ -730,7 +731,8 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	color: var(--vscode-descriptionForeground);
 	padding-right: 4px;
 	padding-left: 4px;
-	padding-top: 3px;
+	padding-top: 5px;
+	font-size: 14px; /* The + codicon is large, make it look more like the x codicon */
 	height: 100%;
 }
 

From a0055ca55fba406c0894955bbf7e3839e7a277bf Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Mon, 24 Feb 2025 12:07:47 -0800
Subject: [PATCH 0339/1815] feat: allow to configure implicit context
 enablement in chat and edits (#241752)

---
 .../contrib/chat/browser/chat.contribution.ts | 19 +++++++++++++
 .../browser/contrib/chatImplicitContext.ts    | 27 ++++++++++++++++---
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 093980c3c6c5..29bd893d1499 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -137,6 +137,25 @@ configurationRegistry.registerConfiguration({
 			markdownDescription: nls.localize('chat.commandCenter.enabled', "Controls whether the command center shows a menu for actions to control Copilot (requires {0}).", '`#window.commandCenter#`'),
 			default: true
 		},
+		'chat.implicitContext.enabled': {
+			type: 'object',
+			tags: ['experimental'],
+			description: nls.localize('chat.implicitContext.enabled', "Enables the implicit context widget for specified chat locations."),
+			additionalProperties: {
+				type: 'string',
+				enum: ['never', 'first', 'always'],
+				description: nls.localize('chat.implicitContext.value', "The value for the implicit context."),
+				enumDescriptions: [
+					nls.localize('chat.implicitContext.value.never', "Implicit context is never enabled."),
+					nls.localize('chat.implicitContext.value.first', "Implicit context is enabled for the first interaction."),
+					nls.localize('chat.implicitContext.value.always', "Implicit context is always enabled.")
+				]
+			},
+			default: {
+				'panel': 'always',
+				'editing-session': 'first'
+			}
+		},
 		'chat.editing.autoAcceptDelay': {
 			type: 'number',
 			markdownDescription: nls.localize('chat.editing.autoAcceptDelay', "Delay after which changes made by chat are automatically accepted. Values are in seconds, `0` means disabled and `100` seconds is the maximum."),
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
index 3c9b18a921ff..f4673ffc8580 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
@@ -12,6 +12,7 @@ import { URI } from '../../../../../base/common/uri.js';
 import { ICodeEditor, isCodeEditor, isDiffEditor } 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';
@@ -27,17 +28,21 @@ export class ChatImplicitContextContribution extends Disposable implements IWork
 
 	private readonly _currentCancelTokenSource = this._register(new MutableDisposable<CancellationTokenSource>());
 
+	private _implicitContextEnablement = this.configurationService.getValue<{ [mode: string]: string }>('chat.implicitContext.enabled');
+
 	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,
 	) {
 		super();
 
 		const activeEditorDisposables = this._register(new DisposableStore());
+
 		this._register(Event.runAndSubscribe(
 			editorService.onDidVisibleEditorsChange,
 			(() => {
@@ -59,9 +64,18 @@ export class ChatImplicitContextContribution extends Disposable implements IWork
 			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(({ chatSessionId }) => {
 			const widget = this.chatWidgetService.getWidgetBySessionId(chatSessionId);
-			if (widget?.input.implicitContext && widget.location === ChatAgentLocation.EditingSession && widget.viewModel?.getItems().length !== 0) {
+			if (!widget?.input.implicitContext) {
+				return;
+			}
+			if (this._implicitContextEnablement[widget.location] === 'first' && widget.viewModel?.getItems().length !== 0) {
 				widget.input.implicitContext.setValue(undefined, false);
 			}
 		}));
@@ -131,10 +145,17 @@ export class ChatImplicitContextContribution extends Disposable implements IWork
 
 		const widgets = updateWidget ? [updateWidget] : [...this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Panel), ...this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.EditingSession), ...this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Editor)];
 		for (const widget of widgets) {
-			if (widget.input.implicitContext && widget.location === ChatAgentLocation.EditingSession && widget.viewModel?.getItems().length !== 0) {
+			if (!widget.input.implicitContext) {
+				continue;
+			}
+			const setting = this._implicitContextEnablement[widget.location];
+			const isFirstInteraction = widget.viewModel?.getItems().length === 0;
+			if (setting === 'first' && !isFirstInteraction) {
 				widget.input.implicitContext.setValue(undefined, false);
-			} else if (widget.input.implicitContext) {
+			} else if (setting === 'always' || setting === 'first' && isFirstInteraction) {
 				widget.input.implicitContext.setValue(newValue, isSelection);
+			} else if (setting === 'never') {
+				widget.input.implicitContext.setValue(undefined, false);
 			}
 		}
 	}

From eb6f14e5900a61c45d4d7b0a764d02663808da65 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Mon, 24 Feb 2025 12:18:49 -0800
Subject: [PATCH 0340/1815] chat: make undo/redo work with manually restored
 snapshots/removed requests (#241755)

Fixes https://github.com/microsoft/vscode-copilot/issues/13372
---
 .../browser/chatEditing/chatEditingActions.ts |  5 -----
 .../browser/chatEditing/chatEditingSession.ts | 21 +++++++++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
index 12f2ec5f187a..622c070ce969 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
@@ -572,11 +572,6 @@ registerAction2(class RemoveAction extends Action2 {
 			// Restore the snapshot to what it was before the request(s) that we deleted
 			const snapshotRequestId = chatRequests[itemIndex].id;
 			await session.restoreSnapshot(snapshotRequestId, undefined);
-
-			// Remove the request and all that come after it
-			for (const request of requestsToRemove) {
-				await chatService.removeRequest(item.sessionId, request.id);
-			}
 		}
 	}
 });
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index b657dbf0470b..ca4ccb333311 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -302,8 +302,13 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		return this._linearHistory.get().find(s => s.requestId === requestId);
 	}
 
-	private _findEditStop(requestId: string, undoStop: string | undefined): IChatEditingSessionStop | undefined {
-		return this._findSnapshot(requestId)?.stops.find(s => s.stopId === undoStop);
+	private _findEditStop(requestId: string, undoStop: string | undefined) {
+		const snapshot = this._findSnapshot(requestId);
+		if (!snapshot) {
+			return undefined;
+		}
+		const idx = snapshot.stops.findIndex(s => s.stopId === undoStop);
+		return idx === -1 ? undefined : { stop: snapshot.stops[idx], snapshot, historyIndex: snapshot.startIndex + idx };
 	}
 
 	private _ensurePendingSnapshot() {
@@ -467,7 +472,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 	public async getSnapshotModel(requestId: string, undoStop: string | undefined, snapshotUri: URI): Promise<ITextModel | null> {
 		const entries = undoStop === POST_EDIT_STOP_ID
 			? this._findSnapshot(requestId)?.postEdit
-			: this._findEditStop(requestId, undoStop)?.entries;
+			: this._findEditStop(requestId, undoStop)?.stop.entries;
 		if (!entries) {
 			return null;
 		}
@@ -491,10 +496,14 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 	private _pendingSnapshot: IChatEditingSessionStop | undefined;
 	public async restoreSnapshot(requestId: string | undefined, stopId: string | undefined): Promise<void> {
 		if (requestId !== undefined) {
-			const snapshot = this._findEditStop(requestId, stopId);
-			if (snapshot) {
+			const stopRef = this._findEditStop(requestId, stopId);
+			if (stopRef) {
 				this._ensurePendingSnapshot();
-				await this._restoreSnapshot(snapshot, undefined);
+				await asyncTransaction(async tx => {
+					this._linearHistoryIndex.set(stopRef.historyIndex, tx);
+					await this._restoreSnapshot(stopRef.stop, tx);
+				});
+				this._updateRequestHiddenState();
 			}
 		} else {
 			const pendingSnapshot = this._pendingSnapshot;

From 2e6b2792b966bbb3384d8fa84a3673dee0caba3f Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Mon, 24 Feb 2025 12:19:12 -0800
Subject: [PATCH 0341/1815] Move edit_file tool to extension (#241657)

Core contributes a tool which is the real implementation of file editing, but the extension gets to control the tool result
---
 src/vs/platform/extensions/common/extensionsApiProposals.ts | 2 +-
 src/vs/workbench/api/common/extHostLanguageModelTools.ts    | 6 +++---
 src/vs/workbench/contrib/chat/common/tools/editFileTool.ts  | 6 +++---
 src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index 8273d3c17d44..6d62272e988c 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -33,7 +33,7 @@ const _allApiProposals = {
 	},
 	chatParticipantPrivate: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts',
-		version: 3
+		version: 4
 	},
 	chatProvider: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatProvider.d.ts',
diff --git a/src/vs/workbench/api/common/extHostLanguageModelTools.ts b/src/vs/workbench/api/common/extHostLanguageModelTools.ts
index acd7c106ec3c..3cf4bc4b6723 100644
--- a/src/vs/workbench/api/common/extHostLanguageModelTools.ts
+++ b/src/vs/workbench/api/common/extHostLanguageModelTools.ts
@@ -16,7 +16,7 @@ import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/ex
 import { ExtHostLanguageModelToolsShape, IMainContext, IToolDataDto, MainContext, MainThreadLanguageModelToolsShape } from './extHost.protocol.js';
 import * as typeConvert from './extHostTypeConverters.js';
 import { IToolInputProcessor } from '../../contrib/chat/common/tools/tools.js';
-import { EditToolData, EditToolId, EditToolInputProcessor } from '../../contrib/chat/common/tools/editFileTool.js';
+import { EditToolData, InternalEditToolId, EditToolInputProcessor, ExtensionEditToolId } from '../../contrib/chat/common/tools/editFileTool.js';
 import { Dto } from '../../services/extensions/common/proxyIdentifier.js';
 
 export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape {
@@ -62,7 +62,7 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 				throw new Error(`Invalid tool invocation token`);
 			}
 
-			if (toolId === EditToolId && !isProposedApiEnabled(extension, 'chatParticipantPrivate')) {
+			if ((toolId === InternalEditToolId || toolId === ExtensionEditToolId) && !isProposedApiEnabled(extension, 'chatParticipantPrivate')) {
 				throw new Error(`Invalid tool: ${toolId}`);
 			}
 
@@ -93,7 +93,7 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 		return Array.from(this._allTools.values())
 			.map(tool => typeConvert.LanguageModelToolDescription.to(tool))
 			.filter(tool => {
-				if (tool.name === EditToolId) {
+				if (tool.name === InternalEditToolId || tool.name === ExtensionEditToolId) {
 					return isProposedApiEnabled(extension, 'chatParticipantPrivate');
 				}
 
diff --git a/src/vs/workbench/contrib/chat/common/tools/editFileTool.ts b/src/vs/workbench/contrib/chat/common/tools/editFileTool.ts
index 655ee5a35fae..27b3a2b81208 100644
--- a/src/vs/workbench/contrib/chat/common/tools/editFileTool.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/editFileTool.ts
@@ -41,10 +41,10 @@ class Person {
 }
 `;
 
-export const EditToolId = 'vscode_editFile';
+export const ExtensionEditToolId = 'vscode_editFile';
+export const InternalEditToolId = 'vscode_editFile_internal';
 export const EditToolData: IToolData = {
-	id: EditToolId,
-	tags: ['vscode_editing'],
+	id: InternalEditToolId,
 	displayName: localize('chat.tools.editFile', "Edit File"),
 	modelDescription: `Edit a file in the workspace. Use this tool once per file that needs to be modified, even if there are multiple changes for a file. Generate the "explanation" property first. ${codeInstructions}`,
 	inputSchema: {
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
index 87da8184e314..01dd8aa49bdf 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: 3
+// version: 4
 
 declare module 'vscode' {
 

From 8d7910be599f30bb96d846cd3fcd363d5f741b9a Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Mon, 24 Feb 2025 21:22:26 +0100
Subject: [PATCH 0342/1815] dimmed monokai: remove duplicate rules (#241756)

---
 .../themes/dimmed-monokai-color-theme.json    | 36 ++-----------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
index a79ad3853262..8e879df0e9c8 100644
--- a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
+++ b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
@@ -19,8 +19,8 @@
 		"editor.wordHighlightStrongBackground": "#6767ce80",
 		"editorCursor.foreground": "#c07020",
 		"editorWhitespace.foreground": "#505037",
-		"editorIndentGuide.background": "#505037",
-		"editorIndentGuide.activeBackground": "#707057",
+		"editorIndentGuide.background1": "#505037",
+		"editorIndentGuide.activeBackground1": "#707057",
 		"editorGroupHeader.tabsBackground": "#282828",
 		"tab.inactiveBackground": "#404040",
 		"tab.border": "#303030",
@@ -126,14 +126,6 @@
 				"foreground": "#8080FF",
 			}
 		},
-		{
-			"name": "Keyword",
-			"scope": "keyword",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#6089B4"
-			}
-		},
 		{
 			"name": "Support",
 			"scope": "support",
@@ -185,22 +177,6 @@
 				"foreground": "#6089B4"
 			}
 		},
-		{
-			"name": "Tag name",
-			"scope": "entity.name.tag",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#9872A2"
-			}
-		},
-		{
-			"name": "Tag attribute",
-			"scope": "entity.other.attribute-name",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#9872A2"
-			}
-		},
 		{
 			"name": "Library function",
 			"scope": "support.function",
@@ -225,14 +201,6 @@
 				"foreground": "#6089B4"
 			}
 		},
-		{
-			"name": "Meta Brace",
-			"scope": "punctuation.section.embedded -(source string source punctuation.section.embedded), meta.brace.erb.html",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#008200"
-			}
-		},
 		{
 			"name": "Invalid",
 			"scope": "invalid",

From 4fb6e4a08f25280d637991c1c96bc2629366196b Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 24 Feb 2025 12:51:18 -0800
Subject: [PATCH 0343/1815] Preserve original data transfer value if still in
 same ext host context

Fixes #241164
---
 .../src/languageFeatures/copyPaste.ts         | 24 +++++++-
 src/vs/base/common/dataTransfer.ts            |  7 ++-
 .../api/browser/mainThreadLanguageFeatures.ts |  2 +-
 .../workbench/api/common/extHost.protocol.ts  |  3 +-
 .../api/common/extHostLanguageFeatures.ts     | 55 ++++++++++++++-----
 .../api/common/extHostTypeConverters.ts       | 36 ++++++------
 src/vs/workbench/api/common/extHostTypes.ts   | 10 ++--
 7 files changed, 94 insertions(+), 43 deletions(-)

diff --git a/extensions/typescript-language-features/src/languageFeatures/copyPaste.ts b/extensions/typescript-language-features/src/languageFeatures/copyPaste.ts
index a0d59256f108..98b14148d95a 100644
--- a/extensions/typescript-language-features/src/languageFeatures/copyPaste.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/copyPaste.ts
@@ -15,6 +15,20 @@ import FileConfigurationManager from './fileConfigurationManager';
 import { conditionalRegistration, requireGlobalConfiguration, requireMinVersion, requireSomeCapability } from './util/dependentRegistration';
 
 class CopyMetadata {
+
+	static parse(data: string): CopyMetadata | undefined {
+		try {
+
+			const parsedData = JSON.parse(data);
+			const resource = vscode.Uri.parse(parsedData.resource);
+			const ranges = parsedData.ranges.map((range: any) => new vscode.Range(range.start, range.end));
+			const copyOperation = parsedData.copyOperation ? Promise.resolve(parsedData.copyOperation) : undefined;
+			return new CopyMetadata(resource, ranges, copyOperation);
+		} catch (error) {
+			return undefined;
+		}
+	}
+
 	constructor(
 		public readonly resource: vscode.Uri,
 		public readonly ranges: readonly vscode.Range[],
@@ -213,7 +227,15 @@ class DocumentPasteProvider implements vscode.DocumentPasteEditProvider<TsPasteE
 			return undefined;
 		}
 
-		return metadata instanceof CopyMetadata ? metadata : undefined;
+		if (metadata instanceof CopyMetadata) {
+			return metadata;
+		}
+
+		if (typeof metadata === 'string') {
+			return CopyMetadata.parse(metadata);
+		}
+
+		return undefined;
 	}
 
 	private isEnabled(document: vscode.TextDocument) {
diff --git a/src/vs/base/common/dataTransfer.ts b/src/vs/base/common/dataTransfer.ts
index dd3f31f6e796..3ce5770c57f9 100644
--- a/src/vs/base/common/dataTransfer.ts
+++ b/src/vs/base/common/dataTransfer.ts
@@ -16,22 +16,25 @@ export interface IDataTransferFile {
 }
 
 export interface IDataTransferItem {
+	id?: string;
 	asString(): Thenable<string>;
 	asFile(): IDataTransferFile | undefined;
 	value: any;
 }
 
-export function createStringDataTransferItem(stringOrPromise: string | Promise<string>): IDataTransferItem {
+export function createStringDataTransferItem(stringOrPromise: string | Promise<string>, id?: string): IDataTransferItem {
 	return {
+		id,
 		asString: async () => stringOrPromise,
 		asFile: () => undefined,
 		value: typeof stringOrPromise === 'string' ? stringOrPromise : undefined,
 	};
 }
 
-export function createFileDataTransferItem(fileName: string, uri: URI | undefined, data: () => Promise<Uint8Array>): IDataTransferItem {
+export function createFileDataTransferItem(fileName: string, uri: URI | undefined, data: () => Promise<Uint8Array>, id?: string): IDataTransferItem {
 	const file = { id: generateUuid(), name: fileName, uri, data };
 	return {
+		id,
 		asString: async () => '',
 		asFile: () => file,
 		value: undefined,
diff --git a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
index 8c7d32de8273..8f48835044b5 100644
--- a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
+++ b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
@@ -1051,7 +1051,7 @@ class MainThreadPasteEditProvider implements languages.DocumentPasteEditProvider
 
 				const dataTransferOut = new VSDataTransfer();
 				for (const [type, item] of newDataTransfer.items) {
-					dataTransferOut.replace(type, createStringDataTransferItem(item.asString));
+					dataTransferOut.replace(type, createStringDataTransferItem(item.asString, item.id));
 				}
 				return dataTransferOut;
 			};
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 6654da09e906..575b5f4f5b5e 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -1889,13 +1889,14 @@ export interface IDataTransferFileDTO {
 }
 
 export interface DataTransferItemDTO {
+	id: string;
 	readonly asString: string;
 	readonly fileData: IDataTransferFileDTO | undefined;
 	readonly uriListData?: ReadonlyArray<string | UriComponents>;
 }
 
 export interface DataTransferDTO {
-	readonly items: Array<[/* type */string, DataTransferItemDTO]>;
+	items: Array<readonly [/* type */string, DataTransferItemDTO]>;
 }
 
 export interface CheckboxUpdate {
diff --git a/src/vs/workbench/api/common/extHostLanguageFeatures.ts b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
index 4a785ef16ded..b8122b07faa8 100644
--- a/src/vs/workbench/api/common/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import type * as vscode from 'vscode';
 import { asArray, coalesce, isFalsyOrEmpty, isNonEmptyArray } from '../../../base/common/arrays.js';
 import { raceCancellationError } from '../../../base/common/async.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
@@ -16,6 +17,7 @@ import { regExpLeadsToEndlessLoop } from '../../../base/common/strings.js';
 import { assertType, isObject } from '../../../base/common/types.js';
 import { URI, UriComponents } from '../../../base/common/uri.js';
 import { IURITransformer } from '../../../base/common/uriIpc.js';
+import { generateUuid } from '../../../base/common/uuid.js';
 import { IPosition } from '../../../editor/common/core/position.js';
 import { Range as EditorRange, IRange } from '../../../editor/common/core/range.js';
 import { ISelection, Selection } from '../../../editor/common/core/selection.js';
@@ -25,17 +27,16 @@ import { encodeSemanticTokensDto } from '../../../editor/common/services/semanti
 import { localize } from '../../../nls.js';
 import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import { ILogService } from '../../../platform/log/common/log.js';
+import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { Cache } from './cache.js';
+import * as extHostProtocol from './extHost.protocol.js';
 import { IExtHostApiDeprecationService } from './extHostApiDeprecationService.js';
 import { CommandsConverter, ExtHostCommands } from './extHostCommands.js';
 import { ExtHostDiagnostics } from './extHostDiagnostics.js';
 import { ExtHostDocuments } from './extHostDocuments.js';
 import { ExtHostTelemetry, IExtHostTelemetry } from './extHostTelemetry.js';
 import * as typeConvert from './extHostTypeConverters.js';
-import { CodeAction, CodeActionKind, CompletionList, Disposable, DocumentDropOrPasteEditKind, DocumentSymbol, InlineCompletionTriggerKind, InlineEditTriggerKind, InternalDataTransferItem, Location, NewSymbolNameTriggerKind, Range, SemanticTokens, SemanticTokensEdit, SemanticTokensEdits, SnippetString, SymbolInformation, SyntaxTokenType } from './extHostTypes.js';
-import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
-import type * as vscode from 'vscode';
-import { Cache } from './cache.js';
-import * as extHostProtocol from './extHost.protocol.js';
+import { CodeAction, CodeActionKind, CompletionList, DataTransfer, Disposable, DocumentDropOrPasteEditKind, DocumentSymbol, InlineCompletionTriggerKind, InlineEditTriggerKind, InternalDataTransferItem, Location, NewSymbolNameTriggerKind, Range, SemanticTokens, SemanticTokensEdit, SemanticTokensEdits, SnippetString, SymbolInformation, SyntaxTokenType } from './extHostTypes.js';
 
 // --- adapter
 
@@ -586,7 +587,9 @@ class CodeActionAdapter {
 
 class DocumentPasteEditProvider {
 
-	private readonly _cache = new Cache<vscode.DocumentPasteEdit>('DocumentPasteEdit');
+	private _cachedPrepare?: Map<string, vscode.DataTransferItem>;
+
+	private readonly _editsCache = new Cache<vscode.DocumentPasteEdit>('DocumentPasteEdit.edits');
 
 	constructor(
 		private readonly _proxy: extHostProtocol.MainThreadLanguageFeaturesShape,
@@ -601,6 +604,8 @@ class DocumentPasteEditProvider {
 			return;
 		}
 
+		this._cachedPrepare = undefined;
+
 		const doc = this._documents.getDocument(resource);
 		const vscodeRanges = ranges.map(range => typeConvert.Range.to(range));
 
@@ -613,8 +618,20 @@ class DocumentPasteEditProvider {
 		}
 
 		// Only send back values that have been added to the data transfer
-		const entries = Array.from(dataTransfer).filter(([, value]) => !(value instanceof InternalDataTransferItem));
-		return typeConvert.DataTransfer.from(entries);
+		const newEntries = Array.from(dataTransfer).filter(([, value]) => !(value instanceof InternalDataTransferItem));
+
+		// Store off original data transfer items so we can retrieve them on paste
+		const newCache = new Map<string, vscode.DataTransferItem>();
+
+		const items = await Promise.all(Array.from(newEntries, async ([mime, value]) => {
+			const id = generateUuid();
+			newCache.set(id, value);
+			return [mime, await typeConvert.DataTransferItem.from(mime, value, id)] as const;
+		}));
+
+		this._cachedPrepare = newCache;
+
+		return { items };
 	}
 
 	async providePasteEdits(requestId: number, resource: URI, ranges: IRange[], dataTransferDto: extHostProtocol.DataTransferDTO, context: extHostProtocol.IDocumentPasteContextDto, token: CancellationToken): Promise<extHostProtocol.IPasteEditDto[]> {
@@ -625,10 +642,22 @@ class DocumentPasteEditProvider {
 		const doc = this._documents.getDocument(resource);
 		const vscodeRanges = ranges.map(range => typeConvert.Range.to(range));
 
-		const dataTransfer = typeConvert.DataTransfer.toDataTransfer(dataTransferDto, async (id) => {
-			return (await this._proxy.$resolvePasteFileData(this._handle, requestId, id)).buffer;
+		const items = dataTransferDto.items.map(([mime, value]): [string, vscode.DataTransferItem] => {
+			const cached = this._cachedPrepare?.get(value.id);
+			if (cached) {
+				return [mime, cached];
+			}
+
+			return [
+				mime,
+				typeConvert.DataTransferItem.to(mime, value, async id => {
+					return (await this._proxy.$resolvePasteFileData(this._handle, requestId, id)).buffer;
+				})
+			];
 		});
 
+		const dataTransfer = new DataTransfer(items);
+
 		const edits = await this._provider.provideDocumentPasteEdits(doc, vscodeRanges, dataTransfer, {
 			only: context.only ? new DocumentDropOrPasteEditKind(context.only) : undefined,
 			triggerKind: context.triggerKind,
@@ -637,7 +666,7 @@ class DocumentPasteEditProvider {
 			return [];
 		}
 
-		const cacheId = this._cache.add(edits);
+		const cacheId = this._editsCache.add(edits);
 
 		return edits.map((edit, i): extHostProtocol.IPasteEditDto => ({
 			_cacheId: [cacheId, i],
@@ -651,7 +680,7 @@ class DocumentPasteEditProvider {
 
 	async resolvePasteEdit(id: extHostProtocol.ChainedCacheId, token: CancellationToken): Promise<{ insertText?: string | vscode.SnippetString; additionalEdit?: extHostProtocol.IWorkspaceEditDto }> {
 		const [sessionId, itemId] = id;
-		const item = this._cache.get(sessionId, itemId);
+		const item = this._editsCache.get(sessionId, itemId);
 		if (!item || !this._provider.resolveDocumentPasteEdit) {
 			return {}; // this should not happen...
 		}
@@ -664,7 +693,7 @@ class DocumentPasteEditProvider {
 	}
 
 	releasePasteEdits(id: number): any {
-		this._cache.delete(id);
+		this._editsCache.delete(id);
 	}
 }
 
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
index edd8590eedda..3c171452e9ec 100644
--- a/src/vs/workbench/api/common/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -13,14 +13,17 @@ import { DisposableStore } from '../../../base/common/lifecycle.js';
 import { ResourceMap, ResourceSet } from '../../../base/common/map.js';
 import * as marked from '../../../base/common/marked/marked.js';
 import { parse, revive } from '../../../base/common/marshalling.js';
+import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { Mimes } from '../../../base/common/mime.js';
 import { cloneAndChange } from '../../../base/common/objects.js';
+import { isWindows } from '../../../base/common/platform.js';
 import { IPrefixTreeNode, WellDefinedPrefixTree } from '../../../base/common/prefixTree.js';
 import { basename } from '../../../base/common/resources.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import { isDefined, isEmptyObject, isNumber, isString, isUndefinedOrNull } from '../../../base/common/types.js';
 import { URI, UriComponents, isUriComponents } from '../../../base/common/uri.js';
 import { IURITransformer } from '../../../base/common/uriIpc.js';
+import { generateUuid } from '../../../base/common/uuid.js';
 import { RenderLineNumbersType } from '../../../editor/common/config/editorOptions.js';
 import { IPosition } from '../../../editor/common/core/position.js';
 import * as editorRange from '../../../editor/common/core/range.js';
@@ -37,30 +40,28 @@ import { ProgressLocation as MainProgressLocation } from '../../../platform/prog
 import { DEFAULT_EDITOR_ASSOCIATION, SaveReason } from '../../common/editor.js';
 import { IViewBadge } from '../../common/views.js';
 import { ChatAgentLocation, IChatAgentRequest, IChatAgentResult } from '../../contrib/chat/common/chatAgents.js';
+import { IChatRequestDraft } from '../../contrib/chat/common/chatEditingService.js';
 import { IChatRequestVariableEntry } from '../../contrib/chat/common/chatModel.js';
 import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatMarkdownContent, IChatMoveMessage, IChatProgressMessage, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatTreeData, IChatUserActionEvent, IChatWarningMessage } from '../../contrib/chat/common/chatService.js';
 import { IToolData, IToolResult } from '../../contrib/chat/common/languageModelToolsService.js';
 import * as chatProvider from '../../contrib/chat/common/languageModels.js';
+import { IChatResponsePromptTsxPart, IChatResponseTextPart } from '../../contrib/chat/common/languageModels.js';
 import { DebugTreeItemCollapsibleState, IDebugVisualizationTreeItem } from '../../contrib/debug/common/debug.js';
 import * as notebooks from '../../contrib/notebook/common/notebookCommon.js';
+import { CellEditType } from '../../contrib/notebook/common/notebookCommon.js';
 import { ICellRange } from '../../contrib/notebook/common/notebookRange.js';
 import * as search from '../../contrib/search/common/search.js';
 import { TestId } from '../../contrib/testing/common/testId.js';
 import { CoverageDetails, DetailType, ICoverageCount, IFileCoverage, ISerializedTestResults, ITestErrorMessage, ITestItem, ITestRunProfileReference, ITestTag, TestMessageType, TestResultItem, TestRunProfileBitset, denamespaceTestTag, namespaceTestTag } from '../../contrib/testing/common/testTypes.js';
 import { EditorGroupColumn } from '../../services/editor/common/editorGroupColumn.js';
 import { ACTIVE_GROUP, SIDE_GROUP } from '../../services/editor/common/editorService.js';
+import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { Dto } from '../../services/extensions/common/proxyIdentifier.js';
 import * as extHostProtocol from './extHost.protocol.js';
 import { CommandsConverter } from './extHostCommands.js';
 import { getPrivateApiFor } from './extHostTestingPrivateApi.js';
 import * as types from './extHostTypes.js';
-import { IChatResponseTextPart, IChatResponsePromptTsxPart } from '../../contrib/chat/common/languageModels.js';
-import { LanguageModelTextPart, LanguageModelPromptTsxPart } from './extHostTypes.js';
-import { MarshalledId } from '../../../base/common/marshallingIds.js';
-import { IChatRequestDraft } from '../../contrib/chat/common/chatEditingService.js';
-import { isWindows } from '../../../base/common/platform.js';
-import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
-import { CellEditType } from '../../contrib/notebook/common/notebookCommon.js';
+import { LanguageModelPromptTsxPart, LanguageModelTextPart } from './extHostTypes.js';
 
 export namespace Command {
 
@@ -2198,11 +2199,12 @@ export namespace DataTransferItem {
 		return new types.InternalDataTransferItem(item.asString);
 	}
 
-	export async function from(mime: string, item: vscode.DataTransferItem | IDataTransferItem): Promise<extHostProtocol.DataTransferItemDTO> {
+	export async function from(mime: string, item: vscode.DataTransferItem | IDataTransferItem, id: string = generateUuid()): Promise<extHostProtocol.DataTransferItemDTO> {
 		const stringValue = await item.asString();
 
 		if (mime === Mimes.uriList) {
 			return {
+				id,
 				asString: stringValue,
 				fileData: undefined,
 				uriListData: serializeUriList(stringValue),
@@ -2211,6 +2213,7 @@ export namespace DataTransferItem {
 
 		const fileValue = item.asFile();
 		return {
+			id,
 			asString: stringValue,
 			fileData: fileValue ? {
 				name: fileValue.name,
@@ -2251,19 +2254,12 @@ export namespace DataTransfer {
 		return new types.DataTransfer(init);
 	}
 
-	export async function from(dataTransfer: Iterable<readonly [string, vscode.DataTransferItem | IDataTransferItem]>): Promise<extHostProtocol.DataTransferDTO> {
-		const newDTO: extHostProtocol.DataTransferDTO = { items: [] };
-
-		const promises: Promise<any>[] = [];
-		for (const [mime, value] of dataTransfer) {
-			promises.push((async () => {
-				newDTO.items.push([mime, await DataTransferItem.from(mime, value)]);
-			})());
-		}
-
-		await Promise.all(promises);
+	export async function from(dataTransfer: Iterable<readonly [string, IDataTransferItem]>): Promise<extHostProtocol.DataTransferDTO> {
+		const items = await Promise.all(Array.from(dataTransfer, async ([mime, value]) => {
+			return [mime, await DataTransferItem.from(mime, value, value.id)] as const;
+		}));
 
-		return newDTO;
+		return { items };
 	}
 }
 
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index edaf58d9a47d..3c1d961a1853 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -2902,9 +2902,9 @@ export class DataTransferFile implements vscode.DataTransferFile {
 
 @es5ClassCompat
 export class DataTransfer implements vscode.DataTransfer {
-	#items = new Map<string, DataTransferItem[]>();
+	#items = new Map<string, vscode.DataTransferItem[]>();
 
-	constructor(init?: Iterable<readonly [string, DataTransferItem]>) {
+	constructor(init?: Iterable<readonly [string, vscode.DataTransferItem]>) {
 		for (const [mime, item] of init ?? []) {
 			const existing = this.#items.get(this.#normalizeMime(mime));
 			if (existing) {
@@ -2915,17 +2915,17 @@ export class DataTransfer implements vscode.DataTransfer {
 		}
 	}
 
-	get(mimeType: string): DataTransferItem | undefined {
+	get(mimeType: string): vscode.DataTransferItem | undefined {
 		return this.#items.get(this.#normalizeMime(mimeType))?.[0];
 	}
 
-	set(mimeType: string, value: DataTransferItem): void {
+	set(mimeType: string, value: vscode.DataTransferItem): void {
 		// This intentionally overwrites all entries for a given mimetype.
 		// This is similar to how the DOM DataTransfer type works
 		this.#items.set(this.#normalizeMime(mimeType), [value]);
 	}
 
-	forEach(callbackfn: (value: DataTransferItem, key: string, dataTransfer: DataTransfer) => void, thisArg?: unknown): void {
+	forEach(callbackfn: (value: vscode.DataTransferItem, key: string, dataTransfer: DataTransfer) => void, thisArg?: unknown): void {
 		for (const [mime, items] of this.#items) {
 			for (const item of items) {
 				callbackfn.call(thisArg, item, mime, this);

From 21418a5a58470b6c2f75839bfd59157771b4cd3c Mon Sep 17 00:00:00 2001
From: Michael Lively <michaellively00@gmail.com>
Date: Mon, 24 Feb 2025 13:03:26 -0800
Subject: [PATCH 0344/1815] Fix inline hover splitting every comma into
 newlines (#241761)

fix hover splitting every comma into newlines
---
 .../debug/browser/debugEditorContribution.ts  | 38 +++++++++++++++++--
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
index cce623efe947..34ef1b0806bd 100644
--- a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
@@ -75,14 +75,44 @@ class InlineSegment {
 }
 
 export function formatHoverContent(contentText: string): MarkdownString {
-	if (contentText.includes('\n') || contentText.includes('\r')) {
-		// Split by commas in case of multiple variables
-		const pairs = contentText.split(/,\s*/);
+	if (contentText.includes(',') && contentText.includes('=')) {
+		// Custom split: for each equals sign after the first, backtrack to the nearest comma
+		const customSplit = (text: string): string[] => {
+			const splits: number[] = [];
+			let equalsFound = 0;
+			let start = 0;
+			for (let i = 0; i < text.length; i++) {
+				if (text[i] === '=') {
+					if (equalsFound === 0) {
+						equalsFound++;
+						continue;
+					}
+					const commaIndex = text.lastIndexOf(',', i);
+					if (commaIndex !== -1 && commaIndex >= start) {
+						splits.push(commaIndex);
+						start = commaIndex + 1;
+					}
+					equalsFound++;
+				}
+			}
+			const result: string[] = [];
+			let s = 0;
+			for (const index of splits) {
+				result.push(text.substring(s, index).trim());
+				s = index + 1;
+			}
+			if (s < text.length) {
+				result.push(text.substring(s).trim());
+			}
+			return result;
+		};
+
+		const pairs = customSplit(contentText);
 		const formattedPairs = pairs.map(pair => {
 			const equalsIndex = pair.indexOf('=');
 			if (equalsIndex !== -1) {
 				const indent = ' '.repeat(equalsIndex + 2);
-				const [firstLine, ...restLines] = pair.trim().split(/\r?\n/);
+				const [firstLine, ...restLines] = pair.split(/\r?\n/);
 				return [firstLine, ...restLines.map(line => indent + line)].join('\n');
 			}
 			return pair;

From 8cce2575e467cd840e32949a83ffae3cdf8eb350 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Tue, 25 Feb 2025 08:05:02 +1100
Subject: [PATCH 0345/1815] Support navigating notebook chat change from
 notebook diff editor (#241760)

Support navigating notebook chat change in notebook diff editor
---
 .../chatEditingModifiedNotebookEntry.ts       |  8 ++-
 .../chatEditingNotebookEditorIntegration.ts   | 71 +++++++++++++++++++
 .../browser/diff/notebookDiffEditor.ts        | 49 +++++++++++--
 .../browser/diff/notebookDiffEditorBrowser.ts |  4 ++
 4 files changed, 127 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 7d0833d1eb4c..ff17a00951b5 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -41,6 +41,8 @@ import { IEditorPane, SaveReason } from '../../../../common/editor.js';
 import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
 import { SnapshotContext } from '../../../../services/workingCopy/common/fileWorkingCopy.js';
 import { ChatEditingNotebookFileSystemProvider } from '../../../notebook/browser/contrib/chatEdit/chatEditingNotebookFileSystemProvider.js';
+import { NotebookTextDiffEditor } from '../../../notebook/browser/diff/notebookDiffEditor.js';
+import { INotebookTextDiffEditor } from '../../../notebook/browser/diff/notebookDiffEditorBrowser.js';
 import { getNotebookEditorFromEditorPane } from '../../../notebook/browser/notebookBrowser.js';
 import { NotebookCellTextModel } from '../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
@@ -52,7 +54,7 @@ import { IChatResponseModel } from '../../common/chatModel.js';
 import { IChatService } from '../../common/chatService.js';
 import { IDocumentDiff2 } from './chatEditingCodeEditorIntegration.js';
 import { AbstractChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISnapshotEntry, pendingRewriteMinimap } from './chatEditingModifiedFileEntry.js';
-import { ChatEditingNotebookEditorIntegration, countChanges, ICellDiffInfo, sortCellChanges } from './chatEditingNotebookEditorIntegration.js';
+import { ChatEditingNotebookDiffEditorIntegration, ChatEditingNotebookEditorIntegration, countChanges, ICellDiffInfo, sortCellChanges } from './chatEditingNotebookEditorIntegration.js';
 import { ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
 
 
@@ -255,6 +257,10 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 
 	protected override _createEditorIntegration(editor: IEditorPane): IModifiedFileEntryEditorIntegration {
 		const notebookEditor = getNotebookEditorFromEditorPane(editor);
+		if (!notebookEditor && editor.getId() === NotebookTextDiffEditor.ID) {
+			const diffEditor = (editor.getControl() as INotebookTextDiffEditor);
+			return this._instantiationService.createInstance(ChatEditingNotebookDiffEditorIntegration, diffEditor, this._cellDiffInfo);
+		}
 		assertType(notebookEditor);
 		return this._instantiationService.createInstance(ChatEditingNotebookEditorIntegration, this, notebookEditor, this.modifiedModel, this.originalModel, this._cellDiffInfo);
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
index b31a34257fc1..f702df873c88 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
@@ -15,6 +15,7 @@ import { IResourceDiffEditorInput } from '../../../../common/editor.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { NotebookDeletedCellDecorator } from '../../../notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.js';
 import { NotebookInsertedCellDecorator } from '../../../notebook/browser/diff/inlineDiff/notebookInsertedCellDecorator.js';
+import { INotebookTextDiffEditor } from '../../../notebook/browser/diff/notebookDiffEditorBrowser.js';
 import { INotebookEditor } from '../../../notebook/browser/notebookBrowser.js';
 import { NotebookCellTextModel } from '../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
@@ -454,6 +455,76 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 
 	}
 }
+export class ChatEditingNotebookDiffEditorIntegration extends Disposable implements IModifiedFileEntryEditorIntegration {
+	private readonly _currentIndex = observableValue(this, -1);
+	readonly currentIndex: IObservable<number> = this._currentIndex;
+
+	constructor(
+		private readonly notebookDiffEditor: INotebookTextDiffEditor,
+		private readonly cellChanges: IObservable<ICellDiffInfo[]>
+	) {
+		super();
+
+		this._store.add(autorun(r => {
+			const index = notebookDiffEditor.currentChangedIndex.read(r);
+			const numberOfCellChanges = cellChanges.read(r).filter(c => !c.diff.identical);
+			if (numberOfCellChanges.length && index >= 0 && index < numberOfCellChanges.length) {
+				// Notebook Diff editor only supports navigating through changes to cells.
+				// However in chat we take changes to lines in the cells into account.
+				// So if we're on the second cell and first cell has 3 changes, then we're on the 4th change.
+				const changesSoFar = countChanges(numberOfCellChanges.slice(0, index + 1));
+				this._currentIndex.set(changesSoFar - 1, undefined);
+			} else {
+				this._currentIndex.set(-1, undefined);
+			}
+		}));
+	}
+
+	reveal(firstOrLast: boolean): void {
+		const changes = sortCellChanges(this.cellChanges.get().filter(c => c.type !== 'unchanged'));
+		if (!changes.length) {
+			return undefined;
+		}
+		if (firstOrLast) {
+			this.notebookDiffEditor.firstChange();
+		} else {
+			this.notebookDiffEditor.lastChange();
+		}
+	}
+
+	next(_wrap: boolean): boolean {
+		const changes = this.cellChanges.get().filter(c => !c.diff.identical).length;
+		if (this.notebookDiffEditor.currentChangedIndex.get() === changes - 1) {
+			return false;
+		}
+		this.notebookDiffEditor.nextChange();
+		return true;
+	}
+
+	previous(_wrap: boolean): boolean {
+		const changes = this.cellChanges.get().filter(c => !c.diff.identical).length;
+		if (this.notebookDiffEditor.currentChangedIndex.get() === changes - 1) {
+			return false;
+		}
+		this.notebookDiffEditor.nextChange();
+		return true;
+	}
+
+	enableAccessibleDiffView(): void {
+		//
+	}
+	acceptNearestChange(change: IModifiedFileEntryChangeHunk): void {
+		change.accept();
+		this.next(true);
+	}
+	rejectNearestChange(change: IModifiedFileEntryChangeHunk): void {
+		change.reject();
+		this.next(true);
+	}
+	async toggleDiff(_change: IModifiedFileEntryChangeHunk | undefined): Promise<void> {
+		//
+	}
+}
 
 export function countChanges(changes: ICellDiffInfo[]): number {
 	return changes.reduce((count, diff) => {
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
index 0bf00ecd0fff..81689f503bd0 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
@@ -49,6 +49,7 @@ import { INotebookService } from '../../common/notebookService.js';
 import { DiffEditorHeightCalculatorService, IDiffEditorHeightCalculatorService } from './editorHeightCalculator.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { NotebookInlineDiffWidget } from './inlineDiff/notebookInlineDiffWidget.js';
+import { IObservable, observableValue } from '../../../../../base/common/observable.js';
 
 const $ = DOM.$;
 
@@ -153,6 +154,8 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 	get isDisposed() {
 		return this._isDisposed;
 	}
+	private readonly _currentChangedIndex = observableValue(this, -1);
+	readonly currentChangedIndex: IObservable<number> = this._currentChangedIndex;
 
 	constructor(
 		group: IEditorGroup,
@@ -561,6 +564,17 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 			updateInsets();
 		}));
 
+		this._localStore.add(this._list.onDidChangeFocus((e) => {
+			if (e.indexes.length && this.notebookDiffViewModel && e.indexes[0] < this.notebookDiffViewModel.items.length) {
+				const selectedItem = this.notebookDiffViewModel.items[e.indexes[0]];
+				const changedItems = this.notebookDiffViewModel.items.filter(item => item.type !== 'unchanged' && item.type !== 'unchangedMetadata' && item.type !== 'placeholder');
+				if (selectedItem && selectedItem?.type !== 'placeholder' && selectedItem?.type !== 'unchanged' && selectedItem?.type !== 'unchangedMetadata') {
+					return this._currentChangedIndex.set(changedItems.indexOf(selectedItem), undefined);
+				}
+			}
+			return this._currentChangedIndex.set(-1, undefined);
+		}));
+
 		this._localStore.add(this._eventDispatcher.onDidChangeCellLayout(() => {
 			updateInsets();
 		}));
@@ -700,6 +714,33 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		this._list.triggerScrollFromMouseWheelEvent(event);
 	}
 
+	firstChange(): void {
+		if (!this.notebookDiffViewModel) {
+			return;
+		}
+		// go to the first one
+		const currentViewModels = this.notebookDiffViewModel.items;
+		const index = currentViewModels.findIndex(vm => vm.type !== 'unchanged' && vm.type !== 'unchangedMetadata' && vm.type !== 'placeholder');
+		if (index >= 0) {
+			this._list.setFocus([index]);
+			this._list.reveal(index);
+		}
+	}
+
+	lastChange(): void {
+		if (!this.notebookDiffViewModel) {
+			return;
+		}
+		// go to the first one
+		const currentViewModels = this.notebookDiffViewModel.items;
+		const item = currentViewModels.slice().reverse().find(vm => vm.type !== 'unchanged' && vm.type !== 'unchangedMetadata' && vm.type !== 'placeholder');
+		const index = item ? currentViewModels.indexOf(item) : -1;
+		if (index >= 0) {
+			this._list.setFocus([index]);
+			this._list.reveal(index);
+		}
+	}
+
 	previousChange(): void {
 		if (!this.notebookDiffViewModel) {
 			return;
@@ -715,7 +756,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		const currentViewModels = this.notebookDiffViewModel.items;
 		while (prevChangeIndex >= 0) {
 			const vm = currentViewModels[prevChangeIndex];
-			if (vm.type !== 'unchanged' && vm.type !== 'placeholder') {
+			if (vm.type !== 'unchanged' && vm.type !== 'unchangedMetadata' && vm.type !== 'placeholder') {
 				break;
 			}
 
@@ -727,7 +768,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 			this._list.reveal(prevChangeIndex);
 		} else {
 			// go to the last one
-			const index = findLastIdx(currentViewModels, vm => vm.type !== 'unchanged' && vm.type !== 'placeholder');
+			const index = findLastIdx(currentViewModels, vm => vm.type !== 'unchanged' && vm.type !== 'unchangedMetadata' && vm.type !== 'placeholder');
 			if (index >= 0) {
 				this._list.setFocus([index]);
 				this._list.reveal(index);
@@ -750,7 +791,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 		const currentViewModels = this.notebookDiffViewModel.items;
 		while (nextChangeIndex < currentViewModels.length) {
 			const vm = currentViewModels[nextChangeIndex];
-			if (vm.type !== 'unchanged' && vm.type !== 'placeholder') {
+			if (vm.type !== 'unchanged' && vm.type !== 'unchangedMetadata' && vm.type !== 'placeholder') {
 				break;
 			}
 
@@ -762,7 +803,7 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 			this._list.reveal(nextChangeIndex);
 		} else {
 			// go to the first one
-			const index = currentViewModels.findIndex(vm => vm.type !== 'unchanged' && vm.type !== 'placeholder');
+			const index = currentViewModels.findIndex(vm => vm.type !== 'unchanged' && vm.type !== 'unchangedMetadata' && vm.type !== 'placeholder');
 			if (index >= 0) {
 				this._list.setFocus([index]);
 				this._list.reveal(index);
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts
index 6dee16a30c34..3e435fad6673 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.ts
@@ -18,6 +18,7 @@ import { WorkbenchToolBar } from '../../../../../platform/actions/browser/toolba
 import { DiffEditorWidget } from '../../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { localize } from '../../../../../nls.js';
+import { IObservable } from '../../../../../base/common/observable.js';
 
 export enum DiffSide {
 	Original = 0,
@@ -32,6 +33,7 @@ export interface INotebookTextDiffEditor {
 	notebookOptions: NotebookOptions;
 	readonly textModel?: NotebookTextModel;
 	inlineNotebookEditor: INotebookEditor | undefined;
+	readonly currentChangedIndex: IObservable<number>;
 	onMouseUp: Event<{ readonly event: MouseEvent; readonly target: IDiffElementViewModelBase }>;
 	onDidScroll: Event<void>;
 	onDidDynamicOutputRendered: Event<{ cell: IGenericCellViewModel; output: ICellOutputViewModel }>;
@@ -54,6 +56,8 @@ export interface INotebookTextDiffEditor {
 	focusNextNotebookCell(cell: IGenericCellViewModel, focus: 'editor' | 'container' | 'output'): Promise<void>;
 	updateOutputHeight(cellInfo: ICommonCellInfo, output: ICellOutputViewModel, height: number, isInit: boolean): void;
 	deltaCellOutputContainerClassNames(diffSide: DiffSide, cellId: string, added: string[], removed: string[]): void;
+	firstChange(): void;
+	lastChange(): void;
 	previousChange(): void;
 	nextChange(): void;
 	toggleInlineView(): void;

From 299a50cdd81d9be0cbb0e5a75fef1c23d2f88dbf Mon Sep 17 00:00:00 2001
From: Logan Ramos <lramos15@gmail.com>
Date: Mon, 24 Feb 2025 14:26:55 -0700
Subject: [PATCH 0346/1815] Bump distro (#241763)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f8179b2be9e4..bf845d0d4b95 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.98.0",
-  "distro": "d054e34303cd79eea3d201581106226c091cae72",
+  "distro": "f419b17841f01854d4a70a768353a6bf8e0ca07f",
   "author": {
     "name": "Microsoft Corporation"
   },

From 45f744af6cad2bb005ad6de8263723a516747687 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Mon, 24 Feb 2025 14:35:06 -0800
Subject: [PATCH 0347/1815] Custom tool invocation renderer for terminal tool
 (#241768)

* Custom tool invocation renderer for terminal tool
Enable editing the terminal command

* Fix issues
---
 .../workbench/api/common/extHost.api.impl.ts  |   1 +
 .../api/common/extHostLanguageModelTools.ts   |  59 +++++---
 src/vs/workbench/api/common/extHostTypes.ts   |   8 ++
 .../chat/browser/actions/chatToolActions.ts   |   8 +-
 .../chatToolInvocationPart.ts                 | 133 +++++++++++++++---
 .../contrib/chat/browser/chatListRenderer.ts  |   2 +-
 .../chat/browser/languageModelToolsService.ts |   2 +
 .../contrib/chat/browser/media/chat.css       |   2 +-
 .../chatProgressTypes/chatToolInvocation.ts   |   8 +-
 .../contrib/chat/common/chatService.ts        |   8 ++
 .../chat/common/languageModelToolsService.ts  |   5 +-
 ...scode.proposed.chatParticipantPrivate.d.ts |  19 ++-
 12 files changed, 210 insertions(+), 45 deletions(-)

diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index 1dac783d0a42..78e34e821fa1 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -1794,6 +1794,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			LanguageModelError: extHostTypes.LanguageModelError,
 			LanguageModelToolResult: extHostTypes.LanguageModelToolResult,
 			ExtendedLanguageModelToolResult: extHostTypes.ExtendedLanguageModelToolResult,
+			PreparedTerminalToolInvocation: extHostTypes.PreparedTerminalToolInvocation,
 			LanguageModelChatToolMode: extHostTypes.LanguageModelChatToolMode,
 			LanguageModelPromptTsxPart: extHostTypes.LanguageModelPromptTsxPart,
 			NewSymbolName: extHostTypes.NewSymbolName,
diff --git a/src/vs/workbench/api/common/extHostLanguageModelTools.ts b/src/vs/workbench/api/common/extHostLanguageModelTools.ts
index 3cf4bc4b6723..7ef25620b846 100644
--- a/src/vs/workbench/api/common/extHostLanguageModelTools.ts
+++ b/src/vs/workbench/api/common/extHostLanguageModelTools.ts
@@ -112,6 +112,10 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 			toolInvocationToken: dto.context as vscode.ChatParticipantToolToken | undefined,
 			chatRequestId: dto.chatRequestId,
 		};
+		if (isProposedApiEnabled(item.extension, 'chatParticipantPrivate') && dto.toolSpecificData?.kind === 'terminal') {
+			options.terminalCommand = dto.toolSpecificData.command;
+		}
+
 		if (dto.tokenBudget !== undefined) {
 			options.tokenizationOptions = {
 				tokenBudget: dto.tokenBudget,
@@ -134,29 +138,46 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 			throw new Error(`Unknown tool ${toolId}`);
 		}
 
-		if (!item.tool.prepareInvocation) {
-			return undefined;
-		}
-
 		const options: vscode.LanguageModelToolInvocationPrepareOptions<any> = { input };
-		const result = await item.tool.prepareInvocation(options, token);
-		if (!result) {
-			return undefined;
-		}
+		if (isProposedApiEnabled(item.extension, 'chatParticipantPrivate') && item.tool.prepareInvocation2) {
+			const result = await item.tool.prepareInvocation2(options, token);
+			if (!result) {
+				return undefined;
+			}
+
+			return {
+				confirmationMessages: result.confirmationMessages ? {
+					title: result.confirmationMessages.title,
+					message: typeof result.confirmationMessages.message === 'string' ? result.confirmationMessages.message : typeConvert.MarkdownString.from(result.confirmationMessages.message),
+				} : undefined,
+				toolSpecificData: {
+					kind: 'terminal',
+					language: result.language,
+					command: result.command,
+				}
+			};
+		} else if (item.tool.prepareInvocation) {
+			const result = await item.tool.prepareInvocation(options, token);
+			if (!result) {
+				return undefined;
+			}
 
-		if (result.pastTenseMessage || result.presentation) {
-			checkProposedApiEnabled(item.extension, 'chatParticipantPrivate');
+			if (result.pastTenseMessage || result.presentation) {
+				checkProposedApiEnabled(item.extension, 'chatParticipantPrivate');
+			}
+
+			return {
+				confirmationMessages: result.confirmationMessages ? {
+					title: result.confirmationMessages.title,
+					message: typeof result.confirmationMessages.message === 'string' ? result.confirmationMessages.message : typeConvert.MarkdownString.from(result.confirmationMessages.message),
+				} : undefined,
+				invocationMessage: typeConvert.MarkdownString.fromStrict(result.invocationMessage),
+				pastTenseMessage: typeConvert.MarkdownString.fromStrict(result.pastTenseMessage),
+				presentation: result.presentation
+			};
 		}
 
-		return {
-			confirmationMessages: result.confirmationMessages ? {
-				title: result.confirmationMessages.title,
-				message: typeof result.confirmationMessages.message === 'string' ? result.confirmationMessages.message : typeConvert.MarkdownString.from(result.confirmationMessages.message),
-			} : undefined,
-			invocationMessage: typeConvert.MarkdownString.fromStrict(result.invocationMessage),
-			pastTenseMessage: typeConvert.MarkdownString.fromStrict(result.pastTenseMessage),
-			presentation: result.presentation
-		};
+		return undefined;
 	}
 
 	registerTool(extension: IExtensionDescription, id: string, tool: vscode.LanguageModelTool<any>): IDisposable {
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index edaf58d9a47d..6e2325be5d2b 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -4742,6 +4742,14 @@ export class LanguageModelToolResultPart implements vscode.LanguageModelToolResu
 	}
 }
 
+export class PreparedTerminalToolInvocation {
+	constructor(
+		public readonly command: string,
+		public readonly language: string,
+		public readonly confirmationMessages?: vscode.LanguageModelToolConfirmationMessages,
+	) { }
+}
+
 export class LanguageModelChatMessage implements vscode.LanguageModelChatMessage {
 
 	static User(content: string | (LanguageModelTextPart | LanguageModelToolResultPart | LanguageModelToolCallPart)[], name?: string): LanguageModelChatMessage {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
index fdfbbf6a906f..1f059820435b 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
@@ -24,7 +24,7 @@ class AcceptToolConfirmation extends Action2 {
 			f1: false,
 			category: CHAT_CATEGORY,
 			keybinding: {
-				when: ChatContextKeys.inChatInput,
+				when: ChatContextKeys.inChatSession,
 				primary: KeyMod.CtrlCmd | KeyCode.Enter,
 				weight: KeybindingWeight.EditorContrib
 			},
@@ -33,7 +33,8 @@ class AcceptToolConfirmation extends Action2 {
 
 	run(accessor: ServicesAccessor, ...args: any[]) {
 		const chatWidgetService = accessor.get(IChatWidgetService);
-		const lastItem = chatWidgetService.lastFocusedWidget?.viewModel?.getItems().at(-1);
+		const widget = chatWidgetService.lastFocusedWidget;
+		const lastItem = widget?.viewModel?.getItems().at(-1);
 		if (!isResponseVM(lastItem)) {
 			return;
 		}
@@ -42,6 +43,9 @@ class AcceptToolConfirmation extends Action2 {
 		if (unconfirmedToolInvocation) {
 			unconfirmedToolInvocation.confirmed.complete(true);
 		}
+
+		// Return focus to the chat input, in case it was in the tool confirmation editor
+		widget?.focusInput();
 	}
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
index 2550d071f5e9..dd9ce637084a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
@@ -10,10 +10,12 @@ import { IMarkdownString, MarkdownString } from '../../../../../base/common/html
 import { Disposable, DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
 import { localize } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
-import { IChatMarkdownContent, IChatProgressMessage, IChatToolInvocation, IChatToolInvocationSerialized } from '../../common/chatService.js';
+import { IChatMarkdownContent, IChatProgressMessage, IChatTerminalToolInvocationData, IChatToolInvocation, IChatToolInvocationSerialized } from '../../common/chatService.js';
 import { IChatRendererContent } from '../../common/chatViewModel.js';
 import { CodeBlockModelCollection } from '../../common/codeBlockModelCollection.js';
 import { IToolResult } from '../../common/languageModelToolsService.js';
@@ -49,7 +51,7 @@ export class ChatToolInvocationPart extends Disposable implements IChatContentPa
 		renderer: MarkdownRenderer,
 		listPool: CollapsibleListPool,
 		editorPool: EditorPool,
-		currentWidth: number,
+		currentWidthDelegate: () => number,
 		codeBlockModelCollection: CodeBlockModelCollection,
 		codeBlockStartIndex: number,
 		@IInstantiationService instantiationService: IInstantiationService,
@@ -69,7 +71,7 @@ export class ChatToolInvocationPart extends Disposable implements IChatContentPa
 			dom.clearNode(this.domNode);
 			partStore.clear();
 
-			this.subPart = partStore.add(instantiationService.createInstance(ChatToolInvocationSubPart, toolInvocation, context, renderer, listPool, editorPool, currentWidth, codeBlockModelCollection, codeBlockStartIndex));
+			this.subPart = partStore.add(instantiationService.createInstance(ChatToolInvocationSubPart, toolInvocation, context, renderer, listPool, editorPool, currentWidthDelegate, codeBlockModelCollection, codeBlockStartIndex));
 			this.domNode.appendChild(this.subPart.domNode);
 			partStore.add(this.subPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
 			partStore.add(this.subPart.onNeedsRerender(() => {
@@ -90,6 +92,9 @@ export class ChatToolInvocationPart extends Disposable implements IChatContentPa
 }
 
 class ChatToolInvocationSubPart extends Disposable {
+	private static idPool = 0;
+	private readonly _codeblocksPartId = 'tool-' + (ChatToolInvocationSubPart.idPool++);
+
 	public readonly domNode: HTMLElement;
 
 	private _onNeedsRerender = this._register(new Emitter<void>());
@@ -99,12 +104,14 @@ class ChatToolInvocationSubPart extends Disposable {
 	public readonly onDidChangeHeight = this._onDidChangeHeight.event;
 
 	private markdownPart: ChatMarkdownContentPart | undefined;
+	private _codeblocks: IChatCodeBlockInfo[] = [];
 	public get codeblocks(): IChatCodeBlockInfo[] {
-		return this.markdownPart?.codeblocks ?? [];
+		// TODO this is weird, the separate cases should maybe be their own "subparts"
+		return this.markdownPart?.codeblocks ?? this._codeblocks;
 	}
 
-	public get codeblocksPartId(): string | undefined {
-		return this.markdownPart?.codeblocksPartId;
+	public get codeblocksPartId(): string {
+		return this.markdownPart?.codeblocksPartId ?? this._codeblocksPartId;
 	}
 
 	constructor(
@@ -113,18 +120,24 @@ class ChatToolInvocationSubPart extends Disposable {
 		private readonly renderer: MarkdownRenderer,
 		private readonly listPool: CollapsibleListPool,
 		private readonly editorPool: EditorPool,
-		private readonly currentWidth: number,
+		private readonly currentWidthDelegate: () => number,
 		private readonly codeBlockModelCollection: CodeBlockModelCollection,
 		private readonly codeBlockStartIndex: number,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
+		@IModelService private readonly modelService: IModelService,
+		@ILanguageService private readonly languageService: ILanguageService,
 	) {
 		super();
 
 		if (toolInvocation.kind === 'toolInvocation' && toolInvocation.confirmationMessages) {
-			this.domNode = this.createConfirmationWidget(toolInvocation);
-		} else if (toolInvocation.presentation === 'withCodeblocks' && typeof toolInvocation.invocationMessage !== 'string') {
-			this.domNode = this.createMarkdownWithCodeblocksProgressPart(toolInvocation);
+			if (toolInvocation.toolSpecificData?.kind === 'terminal') {
+				this.domNode = this.createTerminalConfirmationWidget(toolInvocation, toolInvocation.toolSpecificData);
+			} else {
+				this.domNode = this.createConfirmationWidget(toolInvocation);
+			}
+		} else if (toolInvocation.toolSpecificData?.kind === 'terminal') {
+			this.domNode = this.createTerminalMarkdownProgressPart(toolInvocation, toolInvocation.toolSpecificData);
 		} else if (toolInvocation.resultDetails?.length) {
 			this.domNode = this.createResultList(toolInvocation.pastTenseMessage ?? toolInvocation.invocationMessage, toolInvocation.resultDetails);
 		} else {
@@ -182,7 +195,7 @@ class ChatToolInvocationSubPart extends Disposable {
 					wordWrap: 'on'
 				}
 			};
-			this.markdownPart = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart, chatMarkdownContent, this.context, this.editorPool, false, this.codeBlockStartIndex, this.renderer, this.currentWidth, this.codeBlockModelCollection, { codeBlockRenderOptions }));
+			this.markdownPart = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart, chatMarkdownContent, this.context, this.editorPool, false, this.codeBlockStartIndex, this.renderer, this.currentWidthDelegate(), this.codeBlockModelCollection, { codeBlockRenderOptions }));
 			this._register(this.markdownPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
 			confirmWidget = this._register(this.instantiationService.createInstance(
 				ChatCustomConfirmationWidget,
@@ -202,6 +215,92 @@ class ChatToolInvocationSubPart extends Disposable {
 		return confirmWidget.domNode;
 	}
 
+	private createTerminalConfirmationWidget(toolInvocation: IChatToolInvocation, terminalData: IChatTerminalToolInvocationData): HTMLElement {
+		if (!toolInvocation.confirmationMessages) {
+			throw new Error('Confirmation messages are missing');
+		}
+		const title = toolInvocation.confirmationMessages.title;
+		const message = toolInvocation.confirmationMessages.message;
+		const continueLabel = localize('continue', "Continue");
+		const continueKeybinding = this.keybindingService.lookupKeybinding(AcceptToolConfirmationActionId)?.getLabel();
+		const continueTooltip = continueKeybinding ? `${continueLabel} (${continueKeybinding})` : continueLabel;
+		const cancelLabel = localize('cancel', "Cancel");
+		const cancelKeybinding = this.keybindingService.lookupKeybinding(CancelChatActionId)?.getLabel();
+		const cancelTooltip = cancelKeybinding ? `${cancelLabel} (${cancelKeybinding})` : cancelLabel;
+
+		const buttons: IChatConfirmationButton[] = [
+			{
+				label: continueLabel,
+				data: true,
+				tooltip: continueTooltip
+			},
+			{
+				label: cancelLabel,
+				data: false,
+				isSecondary: true,
+				tooltip: cancelTooltip
+			}];
+		const renderedMessage = this._register(this.renderer.render(
+			typeof message === 'string' ? new MarkdownString(message) : message,
+			{ asyncRenderCallback: () => this._onDidChangeHeight.fire() }
+		));
+		const codeBlockRenderOptions: ICodeBlockRenderOptions = {
+			hideToolbar: true,
+			reserveWidth: 19,
+			verticalPadding: 5,
+			editorOptions: {
+				wordWrap: 'on',
+				readOnly: false
+			}
+		};
+		const langId = this.languageService.getLanguageIdByLanguageName(terminalData.language ?? 'sh') ?? 'shellscript';
+		const model = this.modelService.createModel(terminalData.command, this.languageService.createById(langId));
+		const editor = this._register(this.editorPool.get());
+		editor.object.render({
+			codeBlockIndex: this.codeBlockStartIndex,
+			codeBlockPartIndex: 0,
+			element: this.context.element,
+			languageId: langId,
+			renderOptions: codeBlockRenderOptions,
+			textModel: Promise.resolve(model)
+		}, this.currentWidthDelegate());
+		this._codeblocks.push({
+			codeBlockIndex: this.codeBlockStartIndex,
+			codemapperUri: undefined,
+			elementId: this.context.element.id,
+			focus: () => editor.object.focus(),
+			isStreaming: false,
+			ownerMarkdownPartId: this.codeblocksPartId,
+			uri: model.uri,
+			uriPromise: Promise.resolve(model.uri)
+		});
+		this._register(editor.object.onDidChangeContentHeight(() => {
+			editor.object.layout(this.currentWidthDelegate());
+			this._onDidChangeHeight.fire();
+		}));
+		this._register(model.onDidChangeContent(e => {
+			terminalData.command = model.getValue();
+		}));
+		const element = dom.$('');
+		dom.append(element, editor.object.element);
+		dom.append(element, renderedMessage.element);
+		const confirmWidget = this._register(this.instantiationService.createInstance(
+			ChatCustomConfirmationWidget,
+			title,
+			element,
+			buttons
+		));
+
+		this._register(confirmWidget.onDidClick(button => {
+			toolInvocation.confirmed.complete(button.data);
+		}));
+		this._register(confirmWidget.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
+		toolInvocation.confirmed.p.then(() => {
+			this._onNeedsRerender.fire();
+		});
+		return confirmWidget.domNode;
+	}
+
 	private createProgressPart(): HTMLElement {
 		let content: IMarkdownString;
 		if (this.toolInvocation.isComplete && this.toolInvocation.isConfirmed !== false && this.toolInvocation.pastTenseMessage) {
@@ -218,7 +317,7 @@ class ChatToolInvocationSubPart extends Disposable {
 			kind: 'progressMessage',
 			content
 		};
-		const iconOverride = this.toolInvocation.isConfirmed === false ?
+		const iconOverride = !this.toolInvocation.isConfirmed ?
 			Codicon.error :
 			this.toolInvocation.isComplete ?
 				Codicon.check : undefined;
@@ -226,10 +325,8 @@ class ChatToolInvocationSubPart extends Disposable {
 		return progressPart.domNode;
 	}
 
-	private createMarkdownWithCodeblocksProgressPart(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized): HTMLElement {
-		const content = toolInvocation.isComplete ?
-			(toolInvocation.pastTenseMessage ?? toolInvocation.invocationMessage)
-			: toolInvocation.invocationMessage;
+	private createTerminalMarkdownProgressPart(toolInvocation: IChatToolInvocation | IChatToolInvocationSerialized, terminalData: IChatTerminalToolInvocationData): HTMLElement {
+		const content = new MarkdownString(`\`\`\`${terminalData.language}\n${terminalData.command}\n\`\`\``);
 		const chatMarkdownContent: IChatMarkdownContent = {
 			kind: 'markdownContent',
 			content: content as IMarkdownString,
@@ -243,9 +340,9 @@ class ChatToolInvocationSubPart extends Disposable {
 				wordWrap: 'on'
 			}
 		};
-		this.markdownPart = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart, chatMarkdownContent, this.context, this.editorPool, false, this.codeBlockStartIndex, this.renderer, this.currentWidth, this.codeBlockModelCollection, { codeBlockRenderOptions }));
+		this.markdownPart = this._register(this.instantiationService.createInstance(ChatMarkdownContentPart, chatMarkdownContent, this.context, this.editorPool, false, this.codeBlockStartIndex, this.renderer, this.currentWidthDelegate(), this.codeBlockModelCollection, { codeBlockRenderOptions }));
 		this._register(this.markdownPart.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
-		const icon = this.toolInvocation.isConfirmed === false ?
+		const icon = !this.toolInvocation.isConfirmed ?
 			Codicon.error :
 			this.toolInvocation.isComplete ?
 				Codicon.check : ThemeIcon.modify(Codicon.loading, 'spin');
diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index 524e5aedc849..9a710ab7f278 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -973,7 +973,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 	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.renderer, this._contentReferencesListPool, this._editorPool, this._currentLayoutWidth, this._toolInvocationCodeBlockCollection, codeBlockStartIndex);
+		const part = this.instantiationService.createInstance(ChatToolInvocationPart, toolInvocation, context, this.renderer, this._contentReferencesListPool, this._editorPool, () => this._currentLayoutWidth, this._toolInvocationCodeBlockCollection, codeBlockStartIndex);
 		part.addDisposable(part.onDidChangeHeight(() => {
 			this.updateItemHeight(templateData);
 		}));
diff --git a/src/vs/workbench/contrib/chat/browser/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/browser/languageModelToolsService.ts
index 2ed4ea4bbe8f..ab12b8c94625 100644
--- a/src/vs/workbench/contrib/chat/browser/languageModelToolsService.ts
+++ b/src/vs/workbench/contrib/chat/browser/languageModelToolsService.ts
@@ -191,6 +191,8 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 					if (!userConfirmed) {
 						throw new CancellationError();
 					}
+
+					dto.toolSpecificData = toolInvocation?.toolSpecificData;
 				}
 			} else {
 				const prepared = tool.impl.prepareToolInvocation ?
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index aaa0bc4e35b8..b5d6a38798c0 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1595,7 +1595,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	padding: 4px 8px;
 }
 
-.interactive-item-container .chat-confirmation-widget .rendered-markdown [data-code] {
+.interactive-item-container .chat-confirmation-widget .interactive-result-code-block {
 	margin-bottom: 8px;
 }
 
diff --git a/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.ts b/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.ts
index 79d1f9ebe3e8..8a601045354b 100644
--- a/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.ts
+++ b/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.ts
@@ -6,7 +6,7 @@
 import { DeferredPromise } from '../../../../../base/common/async.js';
 import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
 import { localize } from '../../../../../nls.js';
-import { IChatToolInvocation, IChatToolInvocationSerialized } from '../chatService.js';
+import { IChatTerminalToolInvocationData, IChatToolInvocation, IChatToolInvocationSerialized } from '../chatService.js';
 import { IPreparedToolInvocation, IToolConfirmationMessages, IToolData, IToolResult } from '../languageModelToolsService.js';
 
 export class ChatToolInvocation implements IChatToolInvocation {
@@ -42,6 +42,8 @@ export class ChatToolInvocation implements IChatToolInvocation {
 	private _confirmationMessages: IToolConfirmationMessages | undefined;
 	public readonly presentation: IPreparedToolInvocation['presentation'];
 
+	public readonly toolSpecificData?: IChatTerminalToolInvocationData;
+
 	constructor(preparedInvocation: IPreparedToolInvocation | undefined, toolData: IToolData) {
 		const defaultMessage = localize('toolInvocationMessage', "Using {0}", `"${toolData.displayName}"`);
 		const invocationMessage = preparedInvocation?.invocationMessage ?? defaultMessage;
@@ -49,6 +51,7 @@ export class ChatToolInvocation implements IChatToolInvocation {
 		this.pastTenseMessage = preparedInvocation?.pastTenseMessage;
 		this._confirmationMessages = preparedInvocation?.confirmationMessages;
 		this.presentation = preparedInvocation?.presentation;
+		this.toolSpecificData = preparedInvocation?.toolSpecificData;
 
 		if (!this._confirmationMessages) {
 			// No confirmation needed
@@ -87,7 +90,8 @@ export class ChatToolInvocation implements IChatToolInvocation {
 			pastTenseMessage: this.pastTenseMessage,
 			isConfirmed: this._isConfirmed,
 			isComplete: this._isComplete,
-			resultDetails: this._resultDetails
+			resultDetails: this._resultDetails,
+			toolSpecificData: this.toolSpecificData,
 		};
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/common/chatService.ts b/src/vs/workbench/contrib/chat/common/chatService.ts
index dc63bb692def..9a6a32cb43e6 100644
--- a/src/vs/workbench/contrib/chat/common/chatService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatService.ts
@@ -203,8 +203,15 @@ export interface IChatConfirmation {
 	kind: 'confirmation';
 }
 
+export interface IChatTerminalToolInvocationData {
+	kind: 'terminal';
+	command: string;
+	language: string;
+}
+
 export interface IChatToolInvocation {
 	presentation: IPreparedToolInvocation['presentation'];
+	toolSpecificData?: IChatTerminalToolInvocationData;
 	/** Presence of this property says that confirmation is required */
 	confirmationMessages?: IToolConfirmationMessages;
 	confirmed: DeferredPromise<boolean>;
@@ -225,6 +232,7 @@ export interface IChatToolInvocation {
  */
 export interface IChatToolInvocationSerialized {
 	presentation: IPreparedToolInvocation['presentation'];
+	toolSpecificData?: IChatTerminalToolInvocationData;
 	invocationMessage: string | IMarkdownString;
 	pastTenseMessage: string | IMarkdownString | undefined;
 	resultDetails: IToolResult['toolResultDetails'];
diff --git a/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
index 5a8956dd45be..8a692ee4cf0a 100644
--- a/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
+++ b/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
@@ -14,6 +14,7 @@ import { ContextKeyExpression } from '../../../../platform/contextkey/common/con
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { Location } from '../../../../editor/common/languages.js';
+import { IChatTerminalToolInvocationData } from './chatService.js';
 
 export interface IToolData {
 	id: string;
@@ -36,6 +37,7 @@ export interface IToolInvocation {
 	tokenBudget?: number;
 	context: IToolInvocationContext | undefined;
 	chatRequestId?: string;
+	toolSpecificData?: IChatTerminalToolInvocationData;
 }
 
 export interface IToolInvocationContext {
@@ -71,7 +73,8 @@ export interface IPreparedToolInvocation {
 	invocationMessage?: string | IMarkdownString;
 	pastTenseMessage?: string | IMarkdownString;
 	confirmationMessages?: IToolConfirmationMessages;
-	presentation?: 'withCodeblocks' | 'hidden' | undefined;
+	presentation?: 'hidden' | undefined;
+	toolSpecificData?: IChatTerminalToolInvocationData;
 }
 
 export interface IToolImpl {
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
index 01dd8aa49bdf..446f1f5f2b98 100644
--- a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
@@ -116,11 +116,28 @@ declare module 'vscode' {
 
 	export interface LanguageModelToolInvocationOptions<T> {
 		chatRequestId?: string;
+		terminalCommand?: string;
 	}
 
 	export interface PreparedToolInvocation {
 		pastTenseMessage?: string | MarkdownString;
-		presentation?: 'withCodeblocks' | 'hidden' | undefined;
+		presentation?: 'hidden' | undefined;
+	}
+
+	export interface LanguageModelTool<T> {
+		prepareInvocation2?(options: LanguageModelToolInvocationPrepareOptions<T>, token: CancellationToken): ProviderResult<PreparedTerminalToolInvocation>;
+	}
+
+	export class PreparedTerminalToolInvocation {
+		readonly command: string;
+		readonly language: string;
+		readonly confirmationMessages?: LanguageModelToolConfirmationMessages;
+
+		constructor(
+			command: string,
+			language: string,
+			confirmationMessages?: LanguageModelToolConfirmationMessages,
+		);
 	}
 
 	export class ExtendedLanguageModelToolResult extends LanguageModelToolResult {

From 0ff9bfdb139398898096f2921884f9df0d7d2db6 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Mon, 24 Feb 2025 15:04:45 -0800
Subject: [PATCH 0348/1815] debug: fix repl completions and disposable leak
 (#241776)

---
 src/vs/workbench/api/browser/mainThreadDebugService.ts | 4 ++--
 src/vs/workbench/contrib/debug/browser/repl.ts         | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadDebugService.ts b/src/vs/workbench/api/browser/mainThreadDebugService.ts
index 69edcaa8ecd9..16cd23d554b6 100644
--- a/src/vs/workbench/api/browser/mainThreadDebugService.ts
+++ b/src/vs/workbench/api/browser/mainThreadDebugService.ts
@@ -116,12 +116,12 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 	}
 
 	$registerDebugVisualizerTree(treeId: string, canEdit: boolean): void {
-		this.visualizerService.registerTree(treeId, {
+		this._visualizerTreeHandles.set(treeId, this.visualizerService.registerTree(treeId, {
 			disposeItem: id => this._proxy.$disposeVisualizedTree(id),
 			getChildren: e => this._proxy.$getVisualizerTreeItemChildren(treeId, e),
 			getTreeItem: e => this._proxy.$getVisualizerTreeItem(treeId, e),
 			editItem: canEdit ? ((e, v) => this._proxy.$editVisualizerTreeItem(e, v)) : undefined
-		});
+		}));
 	}
 
 	$unregisterDebugVisualizerTree(treeId: string): void {
diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
index e5ed01694c60..a7dbf5cdc76b 100644
--- a/src/vs/workbench/contrib/debug/browser/repl.ts
+++ b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -173,9 +173,7 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 		}
 
 		this._register(this.debugService.getViewModel().onDidFocusSession(session => {
-			if (this.isVisible()) {
-				this.onDidFocusSession(session);
-			}
+			this.onDidFocusSession(session);
 		}));
 		this._register(this.debugService.getViewModel().onDidEvaluateLazyExpression(async e => {
 			if (e instanceof Variable && this.tree?.hasNode(e)) {
@@ -213,8 +211,6 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 			const focusedSession = this.debugService.getViewModel().focusedSession;
 			if (this.tree && this.tree.getInput() !== focusedSession) {
 				this.onDidFocusSession(focusedSession);
-			} else {
-				this.selectSession();
 			}
 
 			this.setMode();

From c9ed24f13bb053371a2ba04ad8332d40ef3d42e5 Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Mon, 24 Feb 2025 15:20:40 -0800
Subject: [PATCH 0349/1815] fix: improve tab focus feedback for chat related
 files (#241778)

---
 src/vs/workbench/contrib/chat/browser/media/chat.css | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index b5d6a38798c0..a542bb5c97b0 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -708,6 +708,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	width: fit-content;
 	padding: 0px;
 	border: none;
+	height: 18px;
 }
 
 .chat-related-files .monaco-button-dropdown .monaco-text-button span {
@@ -724,16 +725,18 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	align-items: center;
 	overflow: hidden;
 	padding: 0 0 0 2px;
+	gap: 2px;
 }
 
 .chat-related-files .monaco-button.codicon.codicon-add {
 	display: flex;
+	flex-direction: column;
 	color: var(--vscode-descriptionForeground);
-	padding-right: 4px;
-	padding-left: 4px;
-	padding-top: 5px;
+	padding-top: 3px;
 	font-size: 14px; /* The + codicon is large, make it look more like the x codicon */
-	height: 100%;
+	height: calc(100% - 3px);
+	width: 20px;
+	outline-offset: -2px !important;
 }
 
 .interactive-session .chat-related-files .monaco-icon-label::before {

From f0df7377db37d92b0b038fa5b5d39822f97cffc3 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Mon, 24 Feb 2025 15:35:34 -0800
Subject: [PATCH 0350/1815] debug: allow copying debug expression (#241780)

- ctrl+c while an expression is being edited now correctly copies that
  expression
- ctrl+alt+c while on a watch expression copies the expression

Fixes #240127
---
 .../debug/browser/debug.contribution.ts       | 47 ++++++++++---------
 .../contrib/debug/browser/debugCommands.ts    |  1 +
 .../debug/browser/watchExpressionsView.ts     | 43 ++++++++++++++++-
 3 files changed, 68 insertions(+), 23 deletions(-)

diff --git a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
index fe281b6c1b14..1c522165c231 100644
--- a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
@@ -7,8 +7,6 @@ import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { FileAccess } from '../../../../base/common/network.js';
 import { isMacintosh, isWeb } from '../../../../base/common/platform.js';
 import { URI } from '../../../../base/common/uri.js';
-import './media/debug.contribution.css';
-import './media/debugHover.css';
 import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
 import * as nls from '../../../../nls.js';
 import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
@@ -18,18 +16,29 @@ import { Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurati
 import { ContextKeyExpr, ContextKeyExpression } from '../../../../platform/contextkey/common/contextkey.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { KeybindingWeight, KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from '../../../../platform/quickinput/common/quickAccess.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
 import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
-import { IWorkbenchContributionsRegistry, registerWorkbenchContribution2, Extensions as WorkbenchExtensions, WorkbenchPhase } from '../../../common/contributions.js';
+import { FocusedViewContext } from '../../../common/contextkeys.js';
+import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
 import { EditorExtensions } from '../../../common/editor.js';
 import { IViewContainersRegistry, IViewsRegistry, ViewContainer, ViewContainerLocation, Extensions as ViewExtensions } from '../../../common/views.js';
+import { launchSchemaId } from '../../../services/configuration/common/configuration.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
+import { COPY_NOTEBOOK_VARIABLE_VALUE_ID, COPY_NOTEBOOK_VARIABLE_VALUE_LABEL } from '../../notebook/browser/contrib/notebookVariables/notebookVariableCommands.js';
+import { BREAKPOINTS_VIEW_ID, BREAKPOINT_EDITOR_CONTRIBUTION_ID, CALLSTACK_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE, CONTEXT_DEBUG_UX, CONTEXT_EXPRESSION_SELECTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_HAS_DEBUGGED, CONTEXT_IN_DEBUG_MODE, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_VARIABLE_VALUE, CONTEXT_WATCH_ITEM_TYPE, DEBUG_PANEL_ID, DISASSEMBLY_VIEW_ID, EDITOR_CONTRIBUTION_ID, IDebugService, INTERNAL_CONSOLE_OPTIONS_SCHEMA, LOADED_SCRIPTS_VIEW_ID, REPL_VIEW_ID, State, VARIABLES_VIEW_ID, VIEWLET_ID, WATCH_VIEW_ID, getStateLabel } from '../common/debug.js';
+import { DebugWatchAccessibilityAnnouncer } from '../common/debugAccessibilityAnnouncer.js';
+import { DebugContentProvider } from '../common/debugContentProvider.js';
+import { DebugLifecycle } from '../common/debugLifecycle.js';
+import { DebugVisualizerService, IDebugVisualizerService } from '../common/debugVisualizers.js';
+import { DisassemblyViewInput } from '../common/disassemblyViewInput.js';
+import { ReplAccessibilityAnnouncer } from '../common/replAccessibilityAnnouncer.js';
 import { BreakpointEditorContribution } from './breakpointEditorContribution.js';
 import { BreakpointsView } from './breakpointsView.js';
 import { CallStackEditorContribution } from './callStackEditorContribution.js';
 import { CallStackView } from './callStackView.js';
-import { ReplAccessibleView } from './replAccessibleView.js';
 import { registerColors } from './debugColors.js';
 import { ADD_CONFIGURATION_ID, ADD_TO_WATCH_ID, ADD_TO_WATCH_LABEL, CALLSTACK_BOTTOM_ID, CALLSTACK_BOTTOM_LABEL, CALLSTACK_DOWN_ID, CALLSTACK_DOWN_LABEL, CALLSTACK_TOP_ID, CALLSTACK_TOP_LABEL, CALLSTACK_UP_ID, CALLSTACK_UP_LABEL, CONTINUE_ID, CONTINUE_LABEL, COPY_EVALUATE_PATH_ID, COPY_EVALUATE_PATH_LABEL, COPY_STACK_TRACE_ID, COPY_VALUE_ID, COPY_VALUE_LABEL, DEBUG_COMMAND_CATEGORY, DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, DEBUG_QUICK_ACCESS_PREFIX, DEBUG_RUN_COMMAND_ID, DEBUG_RUN_LABEL, DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, DISCONNECT_AND_SUSPEND_ID, DISCONNECT_AND_SUSPEND_LABEL, DISCONNECT_ID, DISCONNECT_LABEL, EDIT_EXPRESSION_COMMAND_ID, JUMP_TO_CURSOR_ID, NEXT_DEBUG_CONSOLE_ID, NEXT_DEBUG_CONSOLE_LABEL, OPEN_LOADED_SCRIPTS_LABEL, PAUSE_ID, PAUSE_LABEL, PREV_DEBUG_CONSOLE_ID, PREV_DEBUG_CONSOLE_LABEL, REMOVE_EXPRESSION_COMMAND_ID, RESTART_FRAME_ID, RESTART_LABEL, RESTART_SESSION_ID, SELECT_AND_START_ID, SELECT_AND_START_LABEL, SELECT_DEBUG_CONSOLE_ID, SELECT_DEBUG_CONSOLE_LABEL, SELECT_DEBUG_SESSION_ID, SELECT_DEBUG_SESSION_LABEL, SET_EXPRESSION_COMMAND_ID, SHOW_LOADED_SCRIPTS_ID, STEP_INTO_ID, STEP_INTO_LABEL, STEP_INTO_TARGET_ID, STEP_INTO_TARGET_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STOP_ID, STOP_LABEL, TERMINATE_THREAD_ID, TOGGLE_INLINE_BREAKPOINT_ID } from './debugCommands.js';
 import { DebugConsoleQuickAccess } from './debugConsoleQuickAccess.js';
@@ -39,32 +48,23 @@ import * as icons from './debugIcons.js';
 import { DebugProgressContribution } from './debugProgress.js';
 import { StartDebugQuickAccessProvider } from './debugQuickAccess.js';
 import { DebugService } from './debugService.js';
+import './debugSettingMigration.js';
 import { DebugStatusContribution } from './debugStatus.js';
 import { DebugTitleContribution } from './debugTitle.js';
 import { DebugToolBar } from './debugToolBar.js';
 import { DebugViewPaneContainer } from './debugViewlet.js';
 import { DisassemblyView, DisassemblyViewContribution } from './disassemblyView.js';
 import { LoadedScriptsView } from './loadedScriptsView.js';
+import './media/debug.contribution.css';
+import './media/debugHover.css';
 import { Repl } from './repl.js';
+import { ReplAccessibilityHelp } from './replAccessibilityHelp.js';
+import { ReplAccessibleView } from './replAccessibleView.js';
+import { RunAndDebugAccessibilityHelp } from './runAndDebugAccessibilityHelp.js';
 import { StatusBarColorProvider } from './statusbarColorProvider.js';
 import { BREAK_WHEN_VALUE_CHANGES_ID, BREAK_WHEN_VALUE_IS_ACCESSED_ID, BREAK_WHEN_VALUE_IS_READ_ID, SET_VARIABLE_ID, VIEW_MEMORY_ID, VariablesView } from './variablesView.js';
 import { ADD_WATCH_ID, ADD_WATCH_LABEL, REMOVE_WATCH_EXPRESSIONS_COMMAND_ID, REMOVE_WATCH_EXPRESSIONS_LABEL, WatchExpressionsView } from './watchExpressionsView.js';
 import { WelcomeView } from './welcomeView.js';
-import { BREAKPOINTS_VIEW_ID, BREAKPOINT_EDITOR_CONTRIBUTION_ID, CALLSTACK_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_STATE, CONTEXT_DEBUG_UX, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_HAS_DEBUGGED, CONTEXT_IN_DEBUG_MODE, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_VARIABLE_VALUE, CONTEXT_WATCH_ITEM_TYPE, DEBUG_PANEL_ID, DISASSEMBLY_VIEW_ID, EDITOR_CONTRIBUTION_ID, IDebugService, INTERNAL_CONSOLE_OPTIONS_SCHEMA, LOADED_SCRIPTS_VIEW_ID, REPL_VIEW_ID, State, VARIABLES_VIEW_ID, VIEWLET_ID, WATCH_VIEW_ID, getStateLabel } from '../common/debug.js';
-import { DebugContentProvider } from '../common/debugContentProvider.js';
-import { DebugLifecycle } from '../common/debugLifecycle.js';
-import { DebugVisualizerService, IDebugVisualizerService } from '../common/debugVisualizers.js';
-import { DisassemblyViewInput } from '../common/disassemblyViewInput.js';
-import { COPY_NOTEBOOK_VARIABLE_VALUE_ID, COPY_NOTEBOOK_VARIABLE_VALUE_LABEL } from '../../notebook/browser/contrib/notebookVariables/notebookVariableCommands.js';
-import { launchSchemaId } from '../../../services/configuration/common/configuration.js';
-import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
-import './debugSettingMigration.js';
-import { ReplAccessibilityHelp } from './replAccessibilityHelp.js';
-import { ReplAccessibilityAnnouncer } from '../common/replAccessibilityAnnouncer.js';
-import { RunAndDebugAccessibilityHelp } from './runAndDebugAccessibilityHelp.js';
-import { DebugWatchAccessibilityAnnouncer } from '../common/debugAccessibilityAnnouncer.js';
-import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { FocusedViewContext } from '../../../common/contextkeys.js';
 
 const debugCategory = nls.localize('debugCategory', "Debug");
 registerColors();
@@ -210,9 +210,12 @@ registerDebugViewMenuItem(MenuId.NotebookVariablesContext, COPY_NOTEBOOK_VARIABL
 KeybindingsRegistry.registerKeybindingRule({
 	id: COPY_VALUE_ID,
 	weight: KeybindingWeight.WorkbenchContrib,
-	when: ContextKeyExpr.or(
-		FocusedViewContext.isEqualTo(WATCH_VIEW_ID),
-		FocusedViewContext.isEqualTo(VARIABLES_VIEW_ID),
+	when: ContextKeyExpr.and(
+		CONTEXT_EXPRESSION_SELECTED.negate(),
+		ContextKeyExpr.or(
+			FocusedViewContext.isEqualTo(WATCH_VIEW_ID),
+			FocusedViewContext.isEqualTo(VARIABLES_VIEW_ID),
+		),
 	),
 	primary: KeyMod.CtrlCmd | KeyCode.KeyC
 });
diff --git a/src/vs/workbench/contrib/debug/browser/debugCommands.ts b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
index 2d3cb0c46c83..92b79ee572be 100644
--- a/src/vs/workbench/contrib/debug/browser/debugCommands.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
@@ -66,6 +66,7 @@ export const DEBUG_CONFIGURE_COMMAND_ID = 'workbench.action.debug.configure';
 export const DEBUG_START_COMMAND_ID = 'workbench.action.debug.start';
 export const DEBUG_RUN_COMMAND_ID = 'workbench.action.debug.run';
 export const EDIT_EXPRESSION_COMMAND_ID = 'debug.renameWatchExpression';
+export const COPY_WATCH_EXPRESSION_COMMAND_ID = 'debug.copyWatchExpression';
 export const SET_EXPRESSION_COMMAND_ID = 'debug.setWatchExpression';
 export const REMOVE_EXPRESSION_COMMAND_ID = 'debug.removeWatchExpression';
 export const NEXT_DEBUG_CONSOLE_ID = 'workbench.action.debug.nextConsole';
diff --git a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
index 117e4757eca8..55398607cd36 100644
--- a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
@@ -13,24 +13,29 @@ import { ITreeContextMenuEvent, ITreeDragAndDrop, ITreeDragOverReaction, ITreeMo
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { FuzzyScore } from '../../../../base/common/filters.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { localize } from '../../../../nls.js';
 import { getContextMenuActions, getFlatContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { Action2, IMenu, IMenuService, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { WorkbenchAsyncDataTree } from '../../../../platform/list/browser/listService.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { ViewAction, ViewPane } from '../../../browser/parts/views/viewPane.js';
 import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
+import { FocusedViewContext } from '../../../common/contextkeys.js';
 import { IViewDescriptorService } from '../../../common/views.js';
-import { CONTEXT_CAN_VIEW_MEMORY, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_WATCH_EXPRESSIONS_EXIST, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_WATCH_ITEM_TYPE, IDebugConfiguration, IDebugService, IDebugViewWithVariables, IExpression, WATCH_VIEW_ID } from '../common/debug.js';
+import { CONTEXT_CAN_VIEW_MEMORY, CONTEXT_EXPRESSION_SELECTED, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_WATCH_EXPRESSIONS_EXIST, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_WATCH_ITEM_TYPE, IDebugConfiguration, IDebugService, IDebugViewWithVariables, IExpression, WATCH_VIEW_ID } from '../common/debug.js';
 import { Expression, Variable, VisualizedExpression } from '../common/debugModel.js';
 import { AbstractExpressionDataSource, AbstractExpressionsRenderer, expressionAndScopeLabelProvider, IExpressionTemplateData, IInputBoxOptions, renderViewTree } from './baseDebugView.js';
+import { COPY_WATCH_EXPRESSION_COMMAND_ID } from './debugCommands.js';
 import { DebugExpressionRenderer } from './debugExpressionRenderer.js';
 import { watchExpressionsAdd, watchExpressionsRemoveAll } from './debugIcons.js';
 import { VariablesRenderer, VisualizedVariableRenderer } from './variablesView.js';
@@ -570,3 +575,39 @@ registerAction2(class RemoveAllWatchExpressionsAction extends Action2 {
 		debugService.removeWatchExpressions();
 	}
 });
+
+registerAction2(class CopyExpression extends ViewAction<WatchExpressionsView> {
+	constructor() {
+		super({
+			id: COPY_WATCH_EXPRESSION_COMMAND_ID,
+			title: localize('copyWatchExpression', "Copy Expression"),
+			f1: false,
+			viewId: WATCH_VIEW_ID,
+			precondition: CONTEXT_WATCH_EXPRESSIONS_EXIST,
+			keybinding: {
+				primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyC,
+				weight: KeybindingWeight.WorkbenchContrib,
+				when: ContextKeyExpr.and(
+					FocusedViewContext.isEqualTo(WATCH_VIEW_ID),
+					CONTEXT_EXPRESSION_SELECTED.negate(),
+				),
+			},
+			menu: {
+				id: MenuId.DebugWatchContext,
+				order: 20,
+				group: '3_modification',
+				when: CONTEXT_WATCH_ITEM_TYPE.isEqualTo('expression')
+			}
+		});
+	}
+
+	runInView(accessor: ServicesAccessor, view: WatchExpressionsView, value?: IExpression): void {
+		const clipboardService = accessor.get(IClipboardService);
+		if (!value) {
+			value = view.treeSelection.at(-1);
+		}
+		if (value) {
+			clipboardService.writeText(value.name);
+		}
+	}
+});

From ac0e2ac21071cb2394accbf96fb7f62acdbc811a Mon Sep 17 00:00:00 2001
From: Justin Chen <54879025+justschen@users.noreply.github.com>
Date: Mon, 24 Feb 2025 15:46:03 -0800
Subject: [PATCH 0351/1815] adds images in history, create file for pasted
 images in chat (#241664)

* references for pasted images and adding images back to history

* cleanup

* make sure to resize after re-reading the file

* change name to specify vscode chat images

* adds to workspaceStorage

* delete temp storage after a whilegit add .

* some cleanup
---
 .../contrib/chat/browser/chatInputPart.ts     |  62 +++++++++--
 .../chat/browser/chatPasteProviders.ts        | 104 +++++++++++++++---
 .../contrib/chat/browser/imageUtils.ts        |   2 +-
 .../contrib/chat/common/chatModel.ts          |  11 +-
 4 files changed, 150 insertions(+), 29 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 3aade02fa2cb..94405a7465c4 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -80,7 +80,7 @@ import { revealInSideBarCommand } from '../../files/browser/fileActions.contribu
 import { ChatAgentLocation, IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatEditingSession, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../common/chatEditingService.js';
-import { IChatRequestVariableEntry, isLinkVariableEntry, isPasteVariableEntry } from '../common/chatModel.js';
+import { IChatRequestVariableEntry, isImageVariableEntry, isLinkVariableEntry, isPasteVariableEntry } from '../common/chatModel.js';
 import { IChatFollowup } from '../common/chatService.js';
 import { IChatVariablesService } from '../common/chatVariables.js';
 import { IChatResponseViewModel } from '../common/chatViewModel.js';
@@ -101,6 +101,7 @@ import { ChatFollowups } from './chatFollowups.js';
 import { IChatViewState } from './chatWidget.js';
 import { ChatFileReference } from './contrib/chatDynamicVariables/chatFileReference.js';
 import { ChatImplicitContext } from './contrib/chatImplicitContext.js';
+import { resizeImage } from './imageUtils.js';
 
 const $ = dom.$;
 
@@ -538,12 +539,13 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		return this.container;
 	}
 
-	showPreviousValue(): void {
+	async showPreviousValue(): Promise<void> {
 		const inputState = this.getInputState();
 		if (this.history.isAtEnd()) {
 			this.saveCurrentValue(inputState);
 		} else {
-			if (!this.history.has({ text: this._inputEditor.getValue(), state: inputState })) {
+			const currentEntry = this.getFilteredEntry(this._inputEditor.getValue(), inputState);
+			if (!this.history.has(currentEntry)) {
 				this.saveCurrentValue(inputState);
 				this.history.resetCursor();
 			}
@@ -552,12 +554,13 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		this.navigateHistory(true);
 	}
 
-	showNextValue(): void {
+	async showNextValue(): Promise<void> {
 		const inputState = this.getInputState();
 		if (this.history.isAtEnd()) {
 			return;
 		} else {
-			if (!this.history.has({ text: this._inputEditor.getValue(), state: inputState })) {
+			const currentEntry = this.getFilteredEntry(this._inputEditor.getValue(), inputState);
+			if (!this.history.has(currentEntry)) {
 				this.saveCurrentValue(inputState);
 				this.history.resetCursor();
 			}
@@ -566,11 +569,30 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		this.navigateHistory(false);
 	}
 
-	private navigateHistory(previous: boolean): void {
+	private async navigateHistory(previous: boolean): Promise<void> {
 		const historyEntry = previous ?
 			this.history.previous() : this.history.next();
 
-		const historyAttachments = historyEntry.state?.chatContextAttachments ?? [];
+		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 (attachment.isImage && attachment.references?.length && URI.isUri(attachment.references[0].reference)) {
+					try {
+						const buffer = await this.fileService.readFile(attachment.references[0].reference);
+						const newAttachment = { ...attachment };
+						newAttachment.value = (isImageVariableEntry(attachment) && attachment.isPasted) ? buffer.value.buffer : await resizeImage(buffer.value.buffer); // if pasted image, we do not need to resize.
+						return newAttachment;
+					} catch (err) {
+						this.logService.error('Failed to restore image from history', err);
+						return undefined;
+					}
+				}
+				return attachment;
+			}))).filter(attachment => attachment !== undefined);
+		}
+
 		this._attachmentModel.clearAndSetContext(...historyAttachments);
 
 		aria.status(historyEntry.text);
@@ -610,8 +632,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	}
 
 	private saveCurrentValue(inputState: IChatInputState): void {
-		inputState.chatContextAttachments = inputState.chatContextAttachments?.filter(attachment => !attachment.isImage);
-		const newEntry = { text: this._inputEditor.getValue(), state: inputState };
+		const newEntry = this.getFilteredEntry(this._inputEditor.getValue(), inputState);
 		this.history.replaceLast(newEntry);
 	}
 
@@ -631,8 +652,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		if (isUserQuery) {
 			const userQuery = this._inputEditor.getValue();
 			const inputState = this.getInputState();
-			inputState.chatContextAttachments = inputState.chatContextAttachments?.filter(attachment => !attachment.isImage);
-			const entry: IChatHistoryEntry = { text: userQuery, state: inputState };
+			const entry = this.getFilteredEntry(userQuery, inputState);
 			this.history.replaceLast(entry);
 			this.history.add({ text: '' });
 		}
@@ -648,6 +668,26 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}
 	}
 
+	// A funtion that filters out specifically the `value` property of the attachment.
+	private getFilteredEntry(query: string, inputState: IChatInputState): IChatHistoryEntry {
+		const attachmentsWithoutImageValues = inputState.chatContextAttachments?.map(attachment => {
+			if (attachment.isImage && 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) {
diff --git a/src/vs/workbench/contrib/chat/browser/chatPasteProviders.ts b/src/vs/workbench/contrib/chat/browser/chatPasteProviders.ts
index fc71eeb1bdc8..72911840c5f3 100644
--- a/src/vs/workbench/contrib/chat/browser/chatPasteProviders.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatPasteProviders.ts
@@ -2,25 +2,28 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
+import { VSBuffer } from '../../../../base/common/buffer.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 { Mimes } from '../../../../base/common/mime.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 { Disposable } from '../../../../base/common/lifecycle.js';
-import { ChatInputPart } from './chatInputPart.js';
-import { IChatWidgetService } from './chat.js';
-import { Codicon } from '../../../../base/common/codicons.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
 import { localize } from '../../../../nls.js';
-import { IChatRequestPasteVariableEntry, IChatRequestVariableEntry } from '../common/chatModel.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 import { IExtensionService, isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
-import { Mimes } from '../../../../base/common/mime.js';
-import { IModelService } from '../../../../editor/common/services/model.js';
-import { URI, UriComponents } from '../../../../base/common/uri.js';
-import { basename } from '../../../../base/common/resources.js';
+import { IChatRequestPasteVariableEntry, IChatRequestVariableEntry } from '../common/chatModel.js';
+import { IChatWidgetService } from './chat.js';
+import { ChatInputPart } from './chatInputPart.js';
 import { resizeImage } from './imageUtils.js';
 
 const COPY_MIME_TYPES = 'application/vnd.code.additional-editor-data';
@@ -31,6 +34,7 @@ interface SerializedCopyData {
 }
 
 export class PasteImageProvider implements DocumentPasteEditProvider {
+	private readonly imagesFolder: URI;
 
 	public readonly kind = new HierarchicalKind('chat.attach.image');
 	public readonly providedPasteEditKinds = [this.kind];
@@ -41,7 +45,13 @@ export class PasteImageProvider implements DocumentPasteEditProvider {
 	constructor(
 		private readonly chatWidgetService: IChatWidgetService,
 		private readonly extensionService: IExtensionService,
-	) { }
+		@IFileService private readonly fileService: IFileService,
+		@IEnvironmentService private readonly environmentService: IEnvironmentService,
+		@ILogService private readonly logService: ILogService,
+	) {
+		this.imagesFolder = joinPath(this.environmentService.workspaceStorageHome, 'vscode-chat-images');
+		this.cleanupOldImages();
+	}
 
 	async provideDocumentPasteEdits(model: ITextModel, ranges: readonly IRange[], dataTransfer: IReadonlyVSDataTransfer, context: DocumentPasteContext, token: CancellationToken): Promise<DocumentPasteEditsSession | undefined> {
 		if (!this.extensionService.extensions.some(ext => isProposedApiEnabled(ext, 'chatReferenceBinaryData'))) {
@@ -90,12 +100,17 @@ export class PasteImageProvider implements DocumentPasteEditProvider {
 			tempDisplayName = `${displayName} ${appendValue}`;
 		}
 
+		const fileReference = await this.createFileForMedia(currClipboard, mimeType);
+		if (token.isCancellationRequested || !fileReference) {
+			return;
+		}
+
 		const scaledImageData = await resizeImage(currClipboard);
 		if (token.isCancellationRequested || !scaledImageData) {
 			return;
 		}
 
-		const scaledImageContext = await getImageAttachContext(scaledImageData, mimeType, token, tempDisplayName);
+		const scaledImageContext = await getImageAttachContext(scaledImageData, mimeType, token, tempDisplayName, fileReference);
 		if (token.isCancellationRequested || !scaledImageContext) {
 			return;
 		}
@@ -111,21 +126,75 @@ export class PasteImageProvider implements DocumentPasteEditProvider {
 		const edit = createCustomPasteEdit(model, scaledImageContext, mimeType, this.kind, localize('pastedImageAttachment', 'Pasted Image Attachment'), this.chatWidgetService);
 		return createEditSession(edit);
 	}
+
+	private async createFileForMedia(
+		dataTransfer: Uint8Array,
+		mimeType: string,
+	): Promise<URI | undefined> {
+		const exists = await this.fileService.exists(this.imagesFolder);
+		if (!exists) {
+			await this.fileService.createFolder(this.imagesFolder);
+		}
+
+		const ext = mimeType.split('/')[1] || 'png';
+		const filename = `image-${Date.now()}.${ext}`;
+		const fileUri = joinPath(this.imagesFolder, filename);
+
+		const buffer = VSBuffer.wrap(dataTransfer);
+		await this.fileService.writeFile(fileUri, buffer);
+
+		return fileUri;
+	}
+
+	private async cleanupOldImages(): Promise<void> {
+		const exists = await this.fileService.exists(this.imagesFolder);
+		if (!exists) {
+			return;
+		}
+
+		const duration = 7 * 24 * 60 * 60 * 1000; // 7 days
+		const files = await this.fileService.resolve(this.imagesFolder);
+		if (!files.children) {
+			return;
+		}
+
+		await Promise.all(files.children.map(async (file) => {
+			try {
+				const timestamp = this.getTimestampFromFilename(file.name);
+				if (timestamp && (Date.now() - timestamp > duration)) {
+					await this.fileService.del(file.resource);
+				}
+			} catch (err) {
+				this.logService.error('Failed to clean up old images', err);
+			}
+		}));
+	}
+
+	private getTimestampFromFilename(filename: string): number | undefined {
+		const match = filename.match(/image-(\d+)\./);
+		if (match) {
+			return parseInt(match[1], 10);
+		}
+		return undefined;
+	}
 }
 
-async function getImageAttachContext(data: Uint8Array, mimeType: string, token: CancellationToken, displayName: string): Promise<IChatRequestVariableEntry | undefined> {
+async function getImageAttachContext(data: Uint8Array, mimeType: string, token: CancellationToken, displayName: string, resource: URI): Promise<IChatRequestVariableEntry | undefined> {
 	const imageHash = await imageToHash(data);
 	if (token.isCancellationRequested) {
 		return undefined;
 	}
 
 	return {
+		kind: 'image',
 		value: data,
 		id: imageHash,
 		name: displayName,
 		isImage: true,
 		icon: Codicon.fileMedia,
-		mimeType
+		mimeType,
+		isPasted: true,
+		references: [{ reference: resource, kind: 'reference' }]
 	};
 }
 
@@ -308,10 +377,13 @@ export class ChatPasteProvidersFeature extends Disposable {
 		@ILanguageFeaturesService languageFeaturesService: ILanguageFeaturesService,
 		@IChatWidgetService chatWidgetService: IChatWidgetService,
 		@IExtensionService extensionService: IExtensionService,
-		@IModelService modelService: IModelService
+		@IFileService fileService: IFileService,
+		@IModelService modelService: IModelService,
+		@IEnvironmentService environmentService: IEnvironmentService,
+		@ILogService logService: ILogService,
 	) {
 		super();
-		this._register(languageFeaturesService.documentPasteEditProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, pattern: '*', hasAccessToAllModels: true }, new PasteImageProvider(chatWidgetService, extensionService)));
+		this._register(languageFeaturesService.documentPasteEditProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, pattern: '*', hasAccessToAllModels: true }, new PasteImageProvider(chatWidgetService, extensionService, fileService, environmentService, logService)));
 		this._register(languageFeaturesService.documentPasteEditProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, pattern: '*', hasAccessToAllModels: true }, new PasteTextProvider(chatWidgetService, modelService)));
 		this._register(languageFeaturesService.documentPasteEditProvider.register('*', new CopyTextProvider()));
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/imageUtils.ts b/src/vs/workbench/contrib/chat/browser/imageUtils.ts
index 428bfd135dd8..e336a86b0f20 100644
--- a/src/vs/workbench/contrib/chat/browser/imageUtils.ts
+++ b/src/vs/workbench/contrib/chat/browser/imageUtils.ts
@@ -27,7 +27,7 @@ export async function resizeImage(data: Uint8Array | string): Promise<Uint8Array
 			URL.revokeObjectURL(url);
 			let { width, height } = img;
 
-			if (width < 768 || height < 768) {
+			if (width <= 768 || height <= 768) {
 				resolve(data);
 				return;
 			}
diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index a8cbc385a71a..a62958b43673 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -88,6 +88,11 @@ export interface ILinkVariableEntry extends Omit<IBaseChatRequestVariableEntry,
 	readonly value: URI;
 }
 
+export interface IImageVariableEntry extends Omit<IBaseChatRequestVariableEntry, 'kind'> {
+	readonly kind: 'image';
+	readonly isPasted?: boolean;
+}
+
 export interface IDiagnosticVariableEntryFilterData {
 	readonly filterUri?: URI;
 	readonly filterSeverity?: MarkerSeverity;
@@ -120,7 +125,7 @@ export interface IDiagnosticVariableEntry extends Omit<IBaseChatRequestVariableE
 	readonly kind: 'diagnostic';
 }
 
-export type IChatRequestVariableEntry = IChatRequestImplicitVariableEntry | IChatRequestPasteVariableEntry | ISymbolVariableEntry | ICommandResultVariableEntry | ILinkVariableEntry | IBaseChatRequestVariableEntry | IDiagnosticVariableEntry;
+export type IChatRequestVariableEntry = IChatRequestImplicitVariableEntry | IChatRequestPasteVariableEntry | ISymbolVariableEntry | ICommandResultVariableEntry | ILinkVariableEntry | IBaseChatRequestVariableEntry | IDiagnosticVariableEntry | IImageVariableEntry;
 
 export function isImplicitVariableEntry(obj: IChatRequestVariableEntry): obj is IChatRequestImplicitVariableEntry {
 	return obj.kind === 'implicit';
@@ -134,6 +139,10 @@ export function isLinkVariableEntry(obj: IChatRequestVariableEntry): obj is ILin
 	return obj.kind === 'link';
 }
 
+export function isImageVariableEntry(obj: IChatRequestVariableEntry): obj is IImageVariableEntry {
+	return obj.kind === 'image';
+}
+
 export function isDiagnosticsVariableEntry(obj: IChatRequestVariableEntry): obj is IDiagnosticVariableEntry {
 	return obj.kind === 'diagnostic';
 }

From 963c934a937b0fe6e8e771d76d355cf29477a60b Mon Sep 17 00:00:00 2001
From: Michael Lively <michaellively00@gmail.com>
Date: Mon, 24 Feb 2025 15:58:07 -0800
Subject: [PATCH 0352/1815] Fix flicker when typing in notebooks -- aggressive
 hueristic (#241784)

fix flicker when typing in notebooks -- aggressive hueristic
---
 .../wordHighlighter/browser/wordHighlighter.ts   |  2 +-
 .../contrib/multicursor/notebookMulticursor.ts   | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts
index de82ea26de3d..118a9e66da40 100644
--- a/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts
+++ b/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.ts
@@ -548,7 +548,7 @@ class WordHighlighter {
 
 		// ignore typing & other
 		// need to check if the model is a notebook cell, should not stop if nb
-		if (e.source !== 'api' && e.reason !== CursorChangeReason.Explicit && this.editor.getModel()?.uri.scheme !== Schemas.vscodeNotebookCell) {
+		if (e.source !== 'api' && e.reason !== CursorChangeReason.Explicit) {
 			this._stopAll();
 			return;
 		}
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 8d0938fceac9..8ce231cbd249 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts
@@ -31,7 +31,6 @@ import { indentOfLine } from '../../../../../../editor/common/model/textModel.js
 import { ITextModelService } from '../../../../../../editor/common/services/resolverService.js';
 import { ICoordinatesConverter } from '../../../../../../editor/common/viewModel.js';
 import { ViewModelEventsCollector } from '../../../../../../editor/common/viewModelEventDispatcher.js';
-import { WordHighlighterContribution } from '../../../../../../editor/contrib/wordHighlighter/browser/wordHighlighter.js';
 import { IAccessibilityService } from '../../../../../../platform/accessibility/common/accessibility.js';
 import { MenuId, registerAction2 } from '../../../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
@@ -886,21 +885,6 @@ export class NotebookMultiCursorController extends Disposable implements INotebo
 				cell.decorationIds,
 				newDecorations
 			);
-
-			/**
-			 * TODO: @Yoyokrazy debt
-			 * goal: draw decorations for occurrence higlight on the cursor blink cycle
-			 *
-			 * Trigger WH with delay: x ms (x = cursor blink cycle)
-			 * -> start = Date()
-			 * -> WordHighlighter -> compute
-			 * -> end = Date()
-			 * -> delay = x - ((end - start) % x)
-			 */
-			const matchingEditor = this.notebookEditor.codeEditors.find(cellEditor => cellEditor[0] === cell.cellViewModel);
-			if (matchingEditor) {
-				WordHighlighterContribution.get(matchingEditor[1])?.wordHighlighter?.trigger();
-			}
 		});
 	}
 

From 59990f4108d681df9c0673e8254593697cd5141d Mon Sep 17 00:00:00 2001
From: Justin Chen <54879025+justschen@users.noreply.github.com>
Date: Mon, 24 Feb 2025 16:04:18 -0800
Subject: [PATCH 0353/1815] omit SVG from chat (#241762)

remove svg specifically
---
 src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
index 8ce32d172039..da5d68df4447 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
@@ -525,6 +525,10 @@ async function getResourceAttachContext(resource: URI, isDirectory: boolean, tex
 		isOmitted = true;
 	}
 
+	if (/\.(svg)$/i.test(resource.path)) {
+		isOmitted = true;
+	}
+
 	return {
 		value: resource,
 		id: resource.toString(),

From 56c64a2da71d81991080d99ed598426ef5e2e3ba Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Mon, 24 Feb 2025 19:36:52 -0800
Subject: [PATCH 0354/1815] fix: don't duplicate non-file chat attachments
 (#241774)

---
 src/vs/workbench/contrib/chat/browser/chatWidget.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index 5a2d737c3704..12fba91fa444 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -1124,13 +1124,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 					}
 				}
 
-				// Then take any attachments that are not files
-				for (const attachment of this.attachmentModel.attachments) {
-					if (!URI.isUri(attachment.value)) {
-						editingSessionAttachedContext.push(attachment);
-					}
-				}
-
 				// add prompt instruction references to the attached context, if enabled
 				const promptInstructionUris = new ResourceSet(promptInstructions.chatAttachments.map((v) => v.value) as URI[]);
 				if (instructionsEnabled) {

From ac0e8f0f32e3de145dc3aa11d8182f208a05397f Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Tue, 25 Feb 2025 14:51:12 +1100
Subject: [PATCH 0355/1815] Avoid using notebook synchronizer in nb chat edits
 (#241798)

---
 .../browser/contrib/chatEdit/notebookChatActionsOverlay.ts    | 4 +++-
 .../browser/contrib/chatEdit/notebookChatEditController.ts    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts
index 28dfc42b1c2b..5669e5b1ed97 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts
@@ -18,6 +18,7 @@ import { isEqual } from '../../../../../../base/common/resources.js';
 import { CellDiffInfo } from '../../diff/notebookDiffViewModel.js';
 import { AcceptAction, navigationBearingFakeActionId, RejectAction } from '../../../../chat/browser/chatEditing/chatEditingEditorActions.js';
 import { INotebookDeletedCellDecorator } from '../../diff/inlineDiff/notebookDeletedCellDecorator.js';
+import { ChatEditingModifiedDocumentEntry } from '../../../../chat/browser/chatEditing/chatEditingModifiedDocumentEntry.js';
 
 export class NotebookChatActionsOverlayController extends Disposable {
 	constructor(
@@ -38,7 +39,8 @@ export class NotebookChatActionsOverlayController extends Disposable {
 			}
 			const sessions = this._chatEditingService.editingSessionsObs.read(r);
 			const session = sessions.find(s => s.readEntry(model.uri, r));
-			if (!session) {
+			const entry = session?.readEntry(model.uri, r);
+			if (!session || !entry || !(entry instanceof ChatEditingModifiedDocumentEntry)) {
 				return;
 			}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts
index 5b54650d1a5d..32cce7d96854 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts
@@ -22,6 +22,7 @@ import { Event } from '../../../../../../base/common/event.js';
 import { ctxNotebookHasEditorModification } from './notebookChatEditContext.js';
 import { NotebookDeletedCellDecorator } from '../../diff/inlineDiff/notebookDeletedCellDecorator.js';
 import { NotebookInsertedCellDecorator } from '../../diff/inlineDiff/notebookInsertedCellDecorator.js';
+import { ChatEditingModifiedDocumentEntry } from '../../../../chat/browser/chatEditing/chatEditingModifiedDocumentEntry.js';
 
 export class NotebookChatEditorControllerContrib extends Disposable implements INotebookEditorContribution {
 
@@ -84,7 +85,8 @@ class NotebookChatEditorController extends Disposable {
 				return;
 			}
 			const sessions = this._chatEditingService.editingSessionsObs.read(r);
-			return sessions.map(s => s.readEntry(model.uri, r)).find(r => !!r);
+			const entry = sessions.map(s => s.readEntry(model.uri, r)).find(r => !!r);
+			return entry instanceof ChatEditingModifiedDocumentEntry ? entry : undefined;
 		}).recomputeInitiallyAndOnChange(this._store);
 
 

From 8b5daf28a120e05f6afa2cad1d38c59ef71429d8 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Mon, 24 Feb 2025 21:17:33 -0800
Subject: [PATCH 0356/1815] chat: fix diff not showing for streaming chat pills
 (#241799)

The addition of `typesToSkip` broke because the chat pill looks back for
the last undo stop to know what to diff between. See:
https://github.com/microsoft/vscode-copilot/issues/13229#issuecomment-2679994707

This gets rid of that, and instead allows IChatContentPart to choose
not to render a domNode. We can then 'render' undo stops without
side-effects and fix the issue. This is kind of special but I feel like
this is the cleanest way to do things now, and I can imagine other parts
might use this in the future.

Fixes https://github.com/microsoft/vscode-copilot/issues/13229
---
 .../chatContentParts/chatContentParts.ts      |  2 +-
 .../contrib/chat/browser/chatListRenderer.ts  | 57 +++++++++++++------
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts.ts
index 92b5dc7540f7..c4d1f90c5761 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts.ts
@@ -8,7 +8,7 @@ import { ChatTreeItem, IChatCodeBlockInfo } from '../chat.js';
 import { IChatRendererContent } from '../../common/chatViewModel.js';
 
 export interface IChatContentPart extends IDisposable {
-	domNode: HTMLElement;
+	domNode: HTMLElement | undefined;
 
 	/**
 	 * Used to indicate a part's ownership of a code block.
diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index 9a710ab7f278..8d1682e18c5f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -46,7 +46,7 @@ import { ChatAgentLocation, IChatAgentMetadata } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatRequestVariableEntry, IChatTextEditGroup } from '../common/chatModel.js';
 import { chatSubcommandLeader } from '../common/chatParserTypes.js';
-import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatConfirmation, IChatContentReference, IChatFollowup, IChatMarkdownContent, IChatTask, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData } from '../common/chatService.js';
+import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatConfirmation, IChatContentReference, IChatFollowup, IChatMarkdownContent, IChatTask, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop } from '../common/chatService.js';
 import { IChatCodeCitations, IChatReferences, IChatRendererContent, IChatRequestViewModel, IChatResponseViewModel, IChatWorkingProgress, isRequestVM, isResponseVM } from '../common/chatViewModel.js';
 import { getNWords } from '../common/chatWordCounter.js';
 import { CodeBlockModelCollection } from '../common/codeBlockModelCollection.js';
@@ -565,14 +565,18 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 						&& isRequestVM(element) && 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
 					) {
-						newPart.domNode.style.display = 'inline-flex';
+						if (newPart.domNode) {
+							newPart.domNode.style.display = 'inline-flex';
+						}
 						const cmdPart = this.instantiationService.createInstance(ChatAgentCommandContentPart, element.slashCommand, () => this._onDidClickRerunWithAgentOrCommandDetection.fire({ sessionId: element.sessionId, requestId: element.id }));
 						templateData.value.appendChild(cmdPart.domNode);
 						parts.push(cmdPart);
 						inlineSlashCommandRendered = true;
 					}
 
-					templateData.value.appendChild(newPart.domNode);
+					if (newPart.domNode) {
+						templateData.value.appendChild(newPart.domNode);
+					}
 					parts.push(newPart);
 				}
 			});
@@ -715,21 +719,24 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			};
 			const newPart = this.renderChatContentPart(partToRender, templateData, context);
 			if (newPart) {
+				renderedParts[index] = newPart;
 				// Maybe the part can't be rendered in this context, but this shouldn't really happen
-				if (alreadyRenderedPart) {
-					try {
-						// This method can throw HierarchyRequestError
-						alreadyRenderedPart.domNode.replaceWith(newPart.domNode);
-					} catch (err) {
-						this.logService.error('ChatListItemRenderer#renderChatContentDiff: error replacing part', err);
+				try {
+					if (alreadyRenderedPart?.domNode) {
+						if (newPart.domNode) {
+							// This method can throw HierarchyRequestError
+							alreadyRenderedPart.domNode.replaceWith(newPart.domNode);
+						} else {
+							alreadyRenderedPart.domNode.remove();
+						}
+					} else if (newPart.domNode) {
+						templateData.value.appendChild(newPart.domNode);
 					}
-				} else {
-					templateData.value.appendChild(newPart.domNode);
+				} catch (err) {
+					this.logService.error('ChatListItemRenderer#renderChatContentDiff: error replacing part', err);
 				}
-
-				renderedParts[index] = newPart;
-			} else if (alreadyRenderedPart) {
-				alreadyRenderedPart.domNode.remove();
+			} else {
+				alreadyRenderedPart?.domNode?.remove();
 			}
 		});
 	}
@@ -744,7 +751,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 		this.traceLayout('getNextProgressiveRenderContent', `Want to render ${data.numWordsToRender} at ${data.rate} words/s, counting...`);
 		let numNeededWords = data.numWordsToRender;
-		const typesToSkip = new Set<string>(['undoStop']);
 		const partsToRender: IChatRendererContent[] = [];
 		if (element.contentReferences.length) {
 			partsToRender.push({ kind: 'references', references: element.contentReferences });
@@ -763,7 +769,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 					// 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' && !typesToSkip.has(nextPart.kind)) {
+						if (nextPart.kind !== 'markdownContent') {
 							i++;
 							partsToRender.push(nextPart);
 						} else {
@@ -783,7 +789,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 					}
 					break;
 				}
-			} else if (!typesToSkip.has(part.kind)) {
+			} else {
 				partsToRender.push(part);
 			}
 		}
@@ -877,11 +883,26 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			return this.renderToolInvocation(content, context, templateData);
 		} else if (content.kind === 'working') {
 			return this.renderWorkingProgress(content, context);
+		} else if (content.kind === 'undoStop') {
+			return this.renderUndoStop(content);
 		}
 
+		// todo@connor4312/roblourens: should this throw or renderNoContent to avoid progressive render thrashing?
 		return undefined;
 	}
 
+	private renderUndoStop(content: IChatUndoStop) {
+		return this.renderNoContent(other => other.kind === 'undoStop' && 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;

From 4f68d9e5c41c4287d0453866f03d0930cf63ba70 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 25 Feb 2025 07:17:41 +0100
Subject: [PATCH 0357/1815] chat - toggle from title if installed (#241753)

---
 .../workbench/contrib/chat/browser/actions/chatActions.ts  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index ee6dccdf4d20..c6c90a3691a9 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -65,6 +65,7 @@ export const CHAT_SETUP_ACTION_ID = 'workbench.action.chat.triggerSetup';
 export const CHAT_SETUP_ACTION_LABEL = localize2('triggerChatSetup', "Use AI Features with Copilot for Free...");
 
 export const TOGGLE_CHAT_ACTION_ID = 'workbench.action.chat.toggle';
+export const TOGGLE_CHAT_ACTION_LABEL = localize('toggleChat', "Toggle Chat");
 
 export interface IChatViewOpenOptions {
 	/**
@@ -728,7 +729,7 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 				primaryActionIcon = Codicon.copilot;
 			} else {
 				if (signedOut) {
-					primaryActionId = CHAT_OPEN_ACTION_ID;
+					primaryActionId = TOGGLE_CHAT_ACTION_ID;
 					primaryActionTitle = localize('signInToChatSetup', "Sign in to Use Copilot...");
 					primaryActionIcon = Codicon.copilotNotConnected;
 				} else if (chatQuotaExceeded || completionsQuotaExceeded) {
@@ -736,8 +737,8 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 					primaryActionTitle = quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded });
 					primaryActionIcon = Codicon.copilotWarning;
 				} else {
-					primaryActionId = CHAT_OPEN_ACTION_ID;
-					primaryActionTitle = CHAT_OPEN_ACTION_LABEL.value;
+					primaryActionId = TOGGLE_CHAT_ACTION_ID;
+					primaryActionTitle = TOGGLE_CHAT_ACTION_LABEL;
 					primaryActionIcon = Codicon.copilot;
 				}
 			}

From f67a36b84639ab659fcbf7e884a2162a915e38e6 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 25 Feb 2025 08:32:43 +0100
Subject: [PATCH 0358/1815] files - use limits when checking for dirty writes

---
 src/vs/platform/files/common/fileService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/platform/files/common/fileService.ts b/src/vs/platform/files/common/fileService.ts
index e36ae7bcee57..33666b18f45b 100644
--- a/src/vs/platform/files/common/fileService.ts
+++ b/src/vs/platform/files/common/fileService.ts
@@ -504,7 +504,7 @@ export class FileService extends Disposable implements IFileService {
 			buffer = await this.peekBufferForWriting(provider, bufferOrReadableOrStream);
 			if (buffer instanceof VSBuffer && buffer.byteLength === stat.size) {
 				try {
-					const { value } = await this.readFile(resource);
+					const { value } = await this.readFile(resource, { limits: { size: stat.size } });
 					if (buffer.equals(value)) {
 						return { stat, buffer }; // allow writing since contents are identical
 					}

From acdb6fafbbddb4c6051ba47fc2832d48b7aa25ae Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 25 Feb 2025 08:52:37 +0100
Subject: [PATCH 0359/1815] chat - cleanup copilot menu further

---
 .../chat/browser/actions/chatActions.ts       | 53 +++++++++----------
 .../browser/actions/chatQuickInputActions.ts  |  4 +-
 .../inlineChat/browser/inlineChatActions.ts   |  4 +-
 3 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index c6c90a3691a9..2dea32904639 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -16,12 +16,12 @@ import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
 import { EditorAction2 } from '../../../../../editor/browser/editorExtensions.js';
 import { Position } from '../../../../../editor/common/core/position.js';
 import { SuggestController } from '../../../../../editor/contrib/suggest/browser/suggestController.js';
-import { ILocalizedString, localize, localize2 } from '../../../../../nls.js';
+import { localize, localize2 } from '../../../../../nls.js';
 import { IActionViewItemService } from '../../../../../platform/actions/browser/actionViewItemService.js';
 import { DropdownWithPrimaryActionViewItem } from '../../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
 import { Action2, MenuId, MenuItemAction, MenuRegistry, registerAction2, SubmenuItemAction } from '../../../../../platform/actions/common/actions.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
-import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IsLinuxContext, IsWindowsContext } from '../../../../../platform/contextkey/common/contextkeys.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
@@ -514,34 +514,29 @@ export function registerChatActions() {
 		}
 	});
 
-	function registerOpenLinkAction(id: string, title: ILocalizedString, url: string, order: number, contextKey: ContextKeyExpression = ChatContextKeys.enabled): void {
-		registerAction2(class extends Action2 {
-			constructor() {
-				super({
-					id,
-					title,
-					category: CHAT_CATEGORY,
-					f1: true,
-					precondition: contextKey,
-					menu: {
-						id: MenuId.ChatTitleBarMenu,
-						group: 'y_manage',
-						order,
-						when: contextKey
-					}
-				});
-			}
-
-			override async run(accessor: ServicesAccessor): Promise<void> {
-				const openerService = accessor.get(IOpenerService);
-				openerService.open(URI.parse(url));
-			}
-		});
-	}
-
 	const nonEnterpriseCopilotUsers = ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.notEquals(`config.${defaultChat.providerSetting}`, defaultChat.enterpriseProviderId));
-	registerOpenLinkAction('workbench.action.chat.managePlan', localize2('managePlan', "Manage Copilot Plan"), defaultChat.managePlanUrl, 1, nonEnterpriseCopilotUsers);
-	registerOpenLinkAction('workbench.action.chat.manageSettings', localize2('manageSettings', "Manage Copilot Settings"), defaultChat.manageSettingsUrl, 2, nonEnterpriseCopilotUsers);
+	registerAction2(class extends Action2 {
+		constructor() {
+			super({
+				id: 'workbench.action.chat.manageSettings',
+				title: localize2('manageCopilot', "Manage Copilot"),
+				category: CHAT_CATEGORY,
+				f1: true,
+				precondition: nonEnterpriseCopilotUsers,
+				menu: {
+					id: MenuId.ChatTitleBarMenu,
+					group: 'y_manage',
+					order: 1,
+					when: nonEnterpriseCopilotUsers
+				}
+			});
+		}
+
+		override async run(accessor: ServicesAccessor): Promise<void> {
+			const openerService = accessor.get(IOpenerService);
+			openerService.open(URI.parse(defaultChat.manageSettingsUrl));
+		}
+	});
 
 	registerAction2(class ShowExtensionsUsingCopilot 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 46c4ab4ed314..7d59054a9d16 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts
@@ -80,8 +80,8 @@ class QuickChatGlobalAction extends Action2 {
 			},
 			menu: {
 				id: MenuId.ChatTitleBarMenu,
-				group: 'e_quickChat',
-				order: 5
+				group: 'a_open',
+				order: 4
 			},
 			metadata: {
 				description: localize('toggle.desc', 'Toggle the quick chat'),
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
index b23098134a1a..7fa126eccc01 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
@@ -70,8 +70,8 @@ export class StartSessionAction extends Action2 {
 			icon: START_INLINE_CHAT,
 			menu: {
 				id: MenuId.ChatTitleBarMenu,
-				group: 'd_inlineChat',
-				order: 10,
+				group: 'a_open',
+				order: 3,
 			}
 		});
 	}

From 1d88981fd405a5390d400803cf9c8e0863118c47 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 25 Feb 2025 09:20:04 +0100
Subject: [PATCH 0360/1815] Setup: Confusion with GitHub Enterprise & GHE.com
 (fix microsoft/vscode-copilot#12590)

---
 .../contrib/chat/browser/chatSetup.ts         | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 0fe3d34257fa..b60f4810dde2 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -1186,35 +1186,36 @@ class ChatSetupWelcomeContent extends Disposable {
 	}
 
 	private async handleEnterpriseInstance(): Promise<boolean /* success */> {
+		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 (uri) {
-			return true; // already setup
+		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.enterpriseProviderName),
 			placeHolder: localize('enterpriseInstancePlaceholder', 'i.e. "octocat" or "https://octocat.ghe.com"...'),
+			value: uri,
 			validateInput: async value => {
 				isSingleWord = false;
 				if (!value) {
 					return undefined;
 				}
 
-				if (/^[a-zA-Z\-_]+$/.test(value)) {
+				if (domainRegEx.test(value)) {
 					isSingleWord = true;
 					return {
 						content: localize('willResolveTo', "Will resolve to {0}", `https://${value}.ghe.com`),
 						severity: Severity.Info
 					};
-				} else {
-					const regex = /^(https:\/\/)?([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.ghe\.com\/?$/;
-					if (!regex.test(value)) {
-						return {
-							content: localize('invalidEnterpriseInstance', 'Please enter a valid {0} instance (i.e. "octocat" or "https://octocat.ghe.com")', defaultChat.enterpriseProviderName),
-							severity: Severity.Error
-						};
-					}
+				} if (!fullUriRegEx.test(value)) {
+					return {
+						content: localize('invalidEnterpriseInstance', 'Please enter a valid {0} instance (i.e. "octocat" or "https://octocat.ghe.com")', defaultChat.enterpriseProviderName),
+						severity: Severity.Error
+					};
 				}
 
 				return undefined;

From b91f8eb95c070be0c6037b866feac1b596f3c5e8 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Tue, 25 Feb 2025 19:31:52 +1100
Subject: [PATCH 0361/1815] Apply changes to original nb model when
 accept/reject chat edits (#241804)

---
 .../chatEditingModifiedNotebookEntry.ts       | 359 +++++++++++-------
 1 file changed, 219 insertions(+), 140 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index ff17a00951b5..98327e224050 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -43,12 +43,15 @@ import { SnapshotContext } from '../../../../services/workingCopy/common/fileWor
 import { ChatEditingNotebookFileSystemProvider } from '../../../notebook/browser/contrib/chatEdit/chatEditingNotebookFileSystemProvider.js';
 import { NotebookTextDiffEditor } from '../../../notebook/browser/diff/notebookDiffEditor.js';
 import { INotebookTextDiffEditor } from '../../../notebook/browser/diff/notebookDiffEditorBrowser.js';
+import { CellDiffInfo, computeDiff } from '../../../notebook/browser/diff/notebookDiffViewModel.js';
 import { getNotebookEditorFromEditorPane } from '../../../notebook/browser/notebookBrowser.js';
 import { NotebookCellTextModel } from '../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
 import { CellEditType, ICellDto2, ICellEditOperation, ICellReplaceEdit, IResolvedNotebookEditorModel, NotebookData, NotebookSetting, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
 import { INotebookEditorModelResolverService } from '../../../notebook/common/notebookEditorModelResolverService.js';
+import { INotebookLoggingService } from '../../../notebook/common/notebookLoggingService.js';
 import { INotebookService } from '../../../notebook/common/notebookService.js';
+import { INotebookEditorWorkerService } from '../../../notebook/common/services/notebookWorkerService.js';
 import { ChatEditKind, IModifiedFileEntryEditorIntegration, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { IChatResponseModel } from '../../common/chatModel.js';
 import { IChatService } from '../../common/chatService.js';
@@ -114,6 +117,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			const disposables = new DisposableStore();
 			disposables.add(ChatEditingNotebookFileSystemProvider.registerFile(originalUri, buffer));
 			const originalRef = await resolver.resolve(originalUri, notebook.viewType);
+			const loadedFromSnapshot = !!initialContent;
 			if (initialContent) {
 				restoreSnapshot(originalRef.object.notebook, initialContent);
 			}
@@ -126,7 +130,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				originalCells.set(cell.uri, disposables.add(await textModelService.createModelReference(cell.uri)).object.textEditorModel);
 			})));
 
-			const instance = instantiationService.createInstance(ChatEditingModifiedNotebookEntry, resourceRef, originalRef, modifiedCells, originalCells, _multiDiffEntryDelegate, options.serializer.options, telemetryInfo, chatKind, initialContent);
+			const instance = instantiationService.createInstance(ChatEditingModifiedNotebookEntry, resourceRef, originalRef, modifiedCells, originalCells, _multiDiffEntryDelegate, options.serializer.options, telemetryInfo, chatKind, initialContent, loadedFromSnapshot);
 			instance._register(disposables);
 			return instance;
 		});
@@ -156,6 +160,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		telemetryInfo: IModifiedEntryTelemetryInfo,
 		kind: ChatEditKind,
 		initialContent: string,
+		loadedFromSnapshot: boolean = false,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IFilesConfigurationService fileConfigService: IFilesConfigurationService,
 		@IChatService chatService: IChatService,
@@ -163,6 +168,8 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ITextModelService private readonly textModelService: ITextModelService,
 		@IModelService private readonly modelService: IModelService,
+		@INotebookEditorWorkerService private readonly notebookEditorWorkerService: INotebookEditorWorkerService,
+		@INotebookLoggingService private readonly notebookLoggingService: INotebookLoggingService,
 	) {
 		super(modifiedResourceRef.object.notebook.uri, telemetryInfo, kind, configurationService, fileConfigService, chatService, fileService, instantiationService);
 		this._register(modifiedResourceRef);
@@ -179,12 +186,58 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			this.modifiedToOriginalCellMap.set(cell.uri, originalModel);
 			this.getOrCreateModifiedTextFileEntryForCell(cell);
 		});
+		if (loadedFromSnapshot) {
+			this.computeDiff();
+		}
 	}
 
+	private async computeDiff() {
+		const cellDiffInfo: CellDiffInfo[] = [];
+		try {
+			const notebookDiff = await this.notebookEditorWorkerService.computeDiff(this.originalURI, this.modifiedURI);
+			const result = computeDiff(this.originalModel, this.modifiedModel, notebookDiff);
+			if (result.cellDiffInfo.length) {
+				cellDiffInfo.push(...result.cellDiffInfo);
+			} else {
+				return;
+			}
+		} catch (e) {
+			this.notebookLoggingService.error('Notebook Chat', 'Error computing diff:\n' + e);
+			return;
+		}
+		const diffs = await Promise.all(cellDiffInfo.map(async (diff, i) => {
+			switch (diff.type) {
+				case 'unchanged':
+					return this.createUnchangedCellDiffInfo(diff.originalCellIndex, diff.modifiedCellIndex);
+				case 'delete':
+					return this.createDeleteCellDiffInfo(diff.originalCellIndex);
+				case 'insert':
+					return this.createInsertedCellDiffInfo(diff.modifiedCellIndex);
+				default: {
+					const cell = this.modifiedModel.cells[diff.modifiedCellIndex]!;
+					const entry = this.cellEntryMap.get(cell);
+					const originalCell = this.originalModel.cells[diff.originalCellIndex]!;
+					const diff2: IDocumentDiff2 = {
+						...(entry?.diffInfo.get() ?? nullDocumentDiff),
+						keep: noopKeep,
+						undo: noopUndo,
+						modifiedModel: this.modifiedCellModels.get(cell.uri)!,
+						originalModel: this.originalCellModels.get(originalCell.uri)!,
+					};
+					return {
+						modifiedCellIndex: diff.modifiedCellIndex,
+						originalCellIndex: diff.originalCellIndex,
+						diff: diff2,
+						type: 'modified'
+					} satisfies ICellDiffInfo;
+				}
+			}
+		}));
+		this._cellDiffInfo.set(diffs, undefined);
+		this._changesCount.set(countChanges(diffs), undefined);
+	}
 	createEmptyDiffs() {
-		this._cellDiffInfo.set(this.modifiedModel.cells.map((cell, i) => {
-			return { modifiedCellIndex: i, originalCellIndex: i, diff: this.getDiffForUnchangedCell(cell), type: 'unchanged' };
-		}), undefined);
+		this._cellDiffInfo.set(this.modifiedModel.cells.map((_, i) => this.createUnchangedCellDiffInfo(i, i)), undefined);
 	}
 
 	getDiffForUnchangedCell(cell: NotebookCellTextModel): IDocumentDiff2 {
@@ -341,45 +394,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				}
 			});
 			const diffInsert = await Promise.all(edit.cells.map(async (c, i) => {
-				const lines = c.source.split(/\r?\n/);
-				const originalRange = new Range(1, 0, 1, 0);
-				const modifiedRange = new Range(1, 0, lines.length, lines[lines.length - 1].length);
-				const innerChanges = new RangeMapping(originalRange, modifiedRange);
-				const changes = [new DetailedLineRangeMapping(new LineRange(1, 1), new LineRange(1, lines.length), [innerChanges])];
-				const cell = this.modifiedModel.cells[edit.index + i];
-				const modifiedModel: ITextModel = cell.textModel ?? this._register((await this.textModelService.createModelReference(cell.uri))).object.textEditorModel;
-				// When a new cell is inserted, we use the ChatEditingCodeEditorIntegration to handle the edits.
-				// & to also display undo/redo and decorations.
-				// However that needs a modified and original model.
-				// For inserted cells there's no original model, so we create a new empty text model and pass that as the original.
-				const originalModelUri = this.modifiedModel.uri.with({ query: (ChatEditingModifiedNotebookEntry.NewModelCounter++).toString(), scheme: 'emptyCell' });
-				const originalModel = this.modelService.getModel(originalModelUri) || this._register(this.modelService.createModel('', null, originalModelUri));
-				this.modifiedCellModels.set(cell.uri, modifiedModel);
-				this.modifiedToOriginalCellMap.set(cell.uri, originalModel);
-				const keep = async () => {
-					await this._applyEdits(async () => this.keepPreviouslyInsertedCell(cell));
-					return true;
-				};
-				const undo = async () => {
-					await this._applyEdits(async () => this.undoPreviouslyInsertedCell(cell));
-					return true;
-				};
-				this.getOrCreateModifiedTextFileEntryForCell(cell, keep, undo);
-				return {
-					type: 'insert' as const,
-					originalCellIndex: undefined,
-					modifiedCellIndex: edit.index + i,
-					diff: {
-						changes,
-						identical: false,
-						moves: [],
-						quitEarly: false,
-						keep,
-						undo,
-						modifiedModel,
-						originalModel,
-					}
-				} satisfies ICellDiffInfo;
+				return this.createInsertedCellDiffInfo(edit.index + i);
 			}));
 			diff.splice(edit.index + 1, 0, ...diffInsert);
 			this._cellDiffInfo.set(sortCellChanges(diff), undefined);
@@ -388,40 +403,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			// And unchanged cells should be converted to deleted cells.
 			const diff = sortCellChanges(this._cellDiffInfo.get()).slice().map(d => {
 				if (d.type === 'unchanged' && d.modifiedCellIndex >= edit.index && d.modifiedCellIndex <= (edit.index + edit.count - 1)) {
-					const originalCell = this.originalModel.cells[d.originalCellIndex];
-					const lines = new Array(originalCell.textBuffer.getLineCount()).fill(0).map((_, i) => originalCell.textBuffer.getLineContent(i + 1));
-					const originalRange = new Range(1, 0, lines.length, lines[lines.length - 1].length);
-					const modifiedRange = new Range(1, 0, 1, 0);
-					const innerChanges = new RangeMapping(modifiedRange, originalRange);
-					const changes = [new DetailedLineRangeMapping(new LineRange(1, lines.length), new LineRange(1, 1), [innerChanges])];
-					const modifiedModelUri = this.modifiedModel.uri.with({ query: (ChatEditingModifiedNotebookEntry.NewModelCounter++).toString(), scheme: 'emptyCell' });
-					const modifiedModel = this.modelService.getModel(modifiedModelUri) || this._register(this.modelService.createModel('', null, modifiedModelUri));
-					const originalModel = this.originalModel.cells[d.originalCellIndex];
-					const keep = async () => {
-						await this._applyEdits(async () => this.keepPreviouslyDeletedCell(d.originalCellIndex));
-						return true;
-					};
-					const undo = async () => {
-						await this._applyEdits(async () => this.undoPreviouslyDeletedCell(d.originalCellIndex, originalModel));
-						return true;
-					};
-
-					// This will be deleted.
-					return {
-						type: 'delete' as const,
-						modifiedCellIndex: undefined,
-						originalCellIndex: d.originalCellIndex,
-						diff: {
-							changes,
-							identical: false,
-							moves: [],
-							quitEarly: false,
-							originalModel: originalModel.textModel!,
-							modifiedModel: modifiedModel,
-							keep,
-							undo,
-						}
-					} satisfies ICellDiffInfo;
+					return this.createDeleteCellDiffInfo(d.originalCellIndex);
 				}
 				if (d.type !== 'delete' && d.modifiedCellIndex >= (edit.index + edit.count)) {
 					d.modifiedCellIndex -= edit.count;
@@ -434,6 +416,98 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		}
 	}
 
+	createUnchangedCellDiffInfo(originalCellIndex: number, modifiedCellIndex: number): ICellDiffInfo {
+		const cell = this.modifiedModel.cells[modifiedCellIndex];
+		return { modifiedCellIndex, originalCellIndex, diff: this.getDiffForUnchangedCell(cell), type: 'unchanged' };
+	}
+	async createInsertedCellDiffInfo(modifiedCellIndex: number): Promise<ICellDiffInfo> {
+		const cell = this.modifiedModel.cells[modifiedCellIndex];
+		const lines = cell.getValue().split(/\r?\n/);
+		const originalRange = new Range(1, 0, 1, 0);
+		const modifiedRange = new Range(1, 0, lines.length, lines[lines.length - 1].length);
+		const innerChanges = new RangeMapping(originalRange, modifiedRange);
+		const changes = [new DetailedLineRangeMapping(new LineRange(1, 1), new LineRange(1, lines.length), [innerChanges])];
+		const modifiedModel: ITextModel = cell.textModel ?? this._register((await this.textModelService.createModelReference(cell.uri))).object.textEditorModel;
+		// When a new cell is inserted, we use the ChatEditingCodeEditorIntegration to handle the edits.
+		// & to also display undo/redo and decorations.
+		// However that needs a modified and original model.
+		// For inserted cells there's no original model, so we create a new empty text model and pass that as the original.
+		const originalModelUri = this.modifiedModel.uri.with({ query: (ChatEditingModifiedNotebookEntry.NewModelCounter++).toString(), scheme: 'emptyCell' });
+		const originalModel = this.modelService.getModel(originalModelUri) || this._register(this.modelService.createModel('', null, originalModelUri));
+		this.modifiedCellModels.set(cell.uri, modifiedModel);
+		this.modifiedToOriginalCellMap.set(cell.uri, originalModel);
+		const keep = async () => {
+			await this._applyEdits(async () => this.keepPreviouslyInsertedCell(cell));
+			this.computeStateAfterAcceptingRejectingChanges(true);
+			return true;
+		};
+		const undo = async () => {
+			await this._applyEdits(async () => this.undoPreviouslyInsertedCell(cell));
+			this.computeStateAfterAcceptingRejectingChanges(false);
+			return true;
+		};
+		this.getOrCreateModifiedTextFileEntryForCell(cell, keep, undo);
+		return {
+			type: 'insert' as const,
+			originalCellIndex: undefined,
+			modifiedCellIndex: modifiedCellIndex,
+			diff: {
+				changes,
+				identical: false,
+				moves: [],
+				quitEarly: false,
+				keep,
+				undo,
+				modifiedModel,
+				originalModel,
+			}
+		} satisfies ICellDiffInfo;
+	}
+	private computeStateAfterAcceptingRejectingChanges(accepted: boolean) {
+		const currentSnapshot = createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService);
+		const originalSnapshot = createSnapshot(this.originalModel, this.transientOptions, this.configurationService);
+		if (currentSnapshot === originalSnapshot) {
+			const state = accepted ? WorkingSetEntryState.Accepted : WorkingSetEntryState.Rejected;
+			this._stateObs.set(state, undefined);
+		}
+	}
+	createDeleteCellDiffInfo(originalCellIndex: number): ICellDiffInfo {
+		const originalCell = this.originalModel.cells[originalCellIndex];
+		const lines = new Array(originalCell.textBuffer.getLineCount()).fill(0).map((_, i) => originalCell.textBuffer.getLineContent(i + 1));
+		const originalRange = new Range(1, 0, lines.length, lines[lines.length - 1].length);
+		const modifiedRange = new Range(1, 0, 1, 0);
+		const innerChanges = new RangeMapping(modifiedRange, originalRange);
+		const changes = [new DetailedLineRangeMapping(new LineRange(1, lines.length), new LineRange(1, 1), [innerChanges])];
+		const modifiedModelUri = this.modifiedModel.uri.with({ query: (ChatEditingModifiedNotebookEntry.NewModelCounter++).toString(), scheme: 'emptyCell' });
+		const modifiedModel = this.modelService.getModel(modifiedModelUri) || this._register(this.modelService.createModel('', null, modifiedModelUri));
+		const keep = async () => {
+			await this._applyEdits(async () => this.keepPreviouslyDeletedCell(this.originalModel.cells.indexOf(originalCell)));
+			this.computeStateAfterAcceptingRejectingChanges(true);
+			return true;
+		};
+		const undo = async () => {
+			await this._applyEdits(async () => this.undoPreviouslyDeletedCell(this.originalModel.cells.indexOf(originalCell), originalCell));
+			this.computeStateAfterAcceptingRejectingChanges(false);
+			return true;
+		};
+
+		// This will be deleted.
+		return {
+			type: 'delete' as const,
+			modifiedCellIndex: undefined,
+			originalCellIndex,
+			diff: {
+				changes,
+				identical: false,
+				moves: [],
+				quitEarly: false,
+				originalModel: originalCell.textModel!,
+				modifiedModel: modifiedModel,
+				keep,
+				undo,
+			}
+		} satisfies ICellDiffInfo;
+	}
 	private undoPreviouslyInsertedCell(cell: NotebookCellTextModel) {
 		const index = this.modifiedModel.cells.indexOf(cell);
 		const diff = sortCellChanges(this._cellDiffInfo.get()).slice().map(d => {
@@ -454,26 +528,43 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		this._changesCount.set(countChanges(this._cellDiffInfo.get()), undefined);
 	}
 
-	private keepPreviouslyInsertedCell(cell: NotebookCellTextModel) {
-		const index = this.modifiedModel.cells.indexOf(cell);
-		const diff = sortCellChanges(this._cellDiffInfo.get()).slice().map(d => {
-			if (d.type === 'insert' && d.modifiedCellIndex === index) {
-				return {
-					type: 'insert',
-					modifiedCellIndex: index,
-					originalCellIndex: undefined,
-					diff: {
-						...nullDocumentDiff,
-						keep: async () => true,
-						undo: async () => true,
-						modifiedModel: d.diff.modifiedModel,
-						originalModel: d.diff.originalModel
-					}
-				} satisfies ICellDiffInfo;
-			}
-			return d;
-		}).filter(d => !(d.type === 'insert' && d.modifiedCellIndex === index));
-		this._cellDiffInfo.set(diff, undefined);
+	private async keepPreviouslyInsertedCell(cell: NotebookCellTextModel) {
+		const modifiedCellIndex = this.modifiedModel.cells.indexOf(cell);
+		if (modifiedCellIndex === -1) {
+			// Not possible.
+			return;
+		}
+		// Find where we should insert this cell in the original notebook.
+		let diff = sortCellChanges(this._cellDiffInfo.get()).slice();
+		const entryIndex = diff.findIndex(d => d.type === 'insert' && d.modifiedCellIndex === modifiedCellIndex);
+		if (entryIndex === -1) {
+			// Not possible.
+			return;
+		}
+		diff = diff.slice(0, entryIndex);
+		const index = diff.reduce((prev, d) => Math.max(prev, d.type === 'insert' ? -1 : d.originalCellIndex), 0);
+		const cellToInsert: ICellDto2 = {
+			cellKind: cell.cellKind,
+			language: cell.language,
+			metadata: cell.metadata,
+			outputs: cell.outputs,
+			source: cell.getValue(),
+			mime: cell.mime
+		};
+		const edit: ICellReplaceEdit = { cells: [cellToInsert], count: 0, editType: CellEditType.Replace, index, };
+		this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+		const originalCell = this.originalModel.cells[index];
+		const originalModel = originalCell.textModel ?? this._register((await this.textModelService.createModelReference(originalCell.uri))).object.textEditorModel;
+		this.originalCellModels.set(originalCell.uri, originalModel);
+		this.modifiedToOriginalCellMap.set(cell.uri, originalCell.textModel!);
+		const unchangedCell: ICellDiffInfo = {
+			type: 'unchanged',
+			modifiedCellIndex,
+			originalCellIndex: index,
+			diff: this.getDiffForUnchangedCell(cell)
+		};
+		diff.push(unchangedCell);
+		this._cellDiffInfo.set(sortCellChanges(diff), undefined);
 		this._changesCount.set(countChanges(this._cellDiffInfo.get()), undefined);
 	}
 
@@ -513,7 +604,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		};
 		const edit: ICellReplaceEdit = { cells: [cellToInsert], count: 0, editType: CellEditType.Replace, index, };
 		this.modifiedModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
-		const newCell = this.modifiedModel.cells[index + 1];
+		const newCell = this.modifiedModel.cells[index];
 		const modifiedModel = newCell.textModel ?? this._register((await this.textModelService.createModelReference(newCell.uri))).object.textEditorModel;
 		this.modifiedCellModels.set(newCell.uri, modifiedModel);
 		this.modifiedToOriginalCellMap.set(newCell.uri, originalCell.textModel!);
@@ -530,8 +621,21 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 
 
 	private keepPreviouslyDeletedCell(deletedOriginalIndex: number) {
-		const diff = sortCellChanges(this._cellDiffInfo.get()).slice().filter(d => !(d.type === 'delete' && d.originalCellIndex === deletedOriginalIndex));
-		this._cellDiffInfo.set(diff, undefined);
+		// Delete this cell from original as well.
+		const edit: ICellReplaceEdit = { cells: [], count: 1, editType: CellEditType.Replace, index: deletedOriginalIndex, };
+		this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+		const diffs = sortCellChanges(this._cellDiffInfo.get()).slice()
+			.filter(d => !(d.type === 'delete' && d.originalCellIndex === deletedOriginalIndex))
+			.map(diff => {
+				if (diff.type !== 'insert' && diff.originalCellIndex > deletedOriginalIndex) {
+					return {
+						...diff,
+						originalCellIndex: diff.originalCellIndex - 1,
+					};
+				}
+				return diff;
+			});
+		this._cellDiffInfo.set(diffs, undefined);
 		this._changesCount.set(countChanges(this._cellDiffInfo.get()), undefined);
 	}
 
@@ -576,7 +680,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			resource: this.modifiedURI,
 			languageId: 'notebook',
 			snapshotUri: ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(this._telemetryInfo.sessionId, requestId, undoStop, this.modifiedURI.path),
-			original: this.initialContent,
+			original: createSnapshot(this.originalModel, this.transientOptions, this.configurationService),
 			current: createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService),
 			originalToCurrentEdit: OffsetEdit.empty,
 			state: this.state.get(),
@@ -597,9 +701,6 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		this._stateObs.set(snapshot.state, undefined);
 		restoreSnapshot(this.originalModel, snapshot.original);
 		restoreSnapshot(this.modifiedModel, snapshot.current);
-		// this._edit = snapshot.originalToCurrentEdit;
-		// this._updateDiffInfoSeq();
-
 	}
 
 	override resetToInitialContent(): void {
@@ -616,8 +717,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		if (!modifiedCellModel || !originalCellModel) {
 			return;
 		}
-		const originalText = originalCellModel.getValue();
-		cellEntry = this._register(this._instantiationService.createInstance(ChatEditingNotebookCellEntry, cell, modifiedCellModel, originalCellModel, originalText, this._telemetryInfo, accept, reject));
+		cellEntry = this._register(this._instantiationService.createInstance(ChatEditingNotebookCellEntry, cell, modifiedCellModel, originalCellModel, this._telemetryInfo, accept, reject));
 		this.cellEntryMap.set(cell, cellEntry);
 
 		this._register(autorun(r => {
@@ -649,6 +749,15 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			});
 		}));
 
+		this._register(autorun(r => {
+			const cellState = cellEntry.state.read(r);
+			if (cellState === WorkingSetEntryState.Accepted) {
+				this.computeStateAfterAcceptingRejectingChanges(true);
+			} else if (cellState === WorkingSetEntryState.Rejected) {
+				this.computeStateAfterAcceptingRejectingChanges(false);
+			}
+		}));
+
 		const entries = this.modifiedModel.cells.map(cell => this.cellEntryMap.get(cell)).filter(entry => !!entry);
 		this._entries.set(entries, undefined);
 
@@ -672,7 +781,10 @@ function restoreSnapshot(notebook: NotebookTextModel, snapshot: string): void {
 	}
 }
 
-function serializeSnapshot(data: NotebookData, transientOptions: TransientOptions | undefined): string {
+export function serializeSnapshot(data: NotebookData, transientOptions: TransientOptions | undefined): string {
+	// No need to store the internal metadata, as this can contain unique information such as cell ids.
+	// Also its not something that can be persisted, hence no need to try to restore that either.
+	data.cells.forEach(cell => cell.internalMetadata = undefined);
 	return JSON.stringify([
 		JSON.stringify(transientOptions)
 		, JSON.stringify(data, (_key, value) => {
@@ -761,7 +873,6 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 		public readonly cell: NotebookCellTextModel,
 		private readonly modifiedModel: ITextModel,
 		private readonly originalModel: ITextModel,
-		private readonly initialContent: string,
 		private readonly _telemetryInfo: IModifiedEntryTelemetryInfo,
 		acceptChange: (() => Promise<boolean>) | undefined,
 		undoChange: (() => Promise<boolean>) | undefined,
@@ -849,16 +960,6 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 
 			this._allEditsAreFromUs = false;
 			this._updateDiffInfoSeq();
-
-			const didResetToOriginalContent = this.modifiedModel.getValue() === this.initialContent;
-			const currentState = this._stateObs.get();
-			switch (currentState) {
-				case WorkingSetEntryState.Modified:
-					if (didResetToOriginalContent) {
-						this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
-						break;
-					}
-			}
 		}
 	}
 
@@ -1020,26 +1121,4 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 			this._edit = OffsetEdits.fromLineRangeMapping(this.originalModel, this.modifiedModel, diff2.changes);
 		}
 	}
-
-	async _doAccept(tx: ITransaction | undefined): Promise<void> {
-		this.originalModel.setValue(this.modifiedModel.createSnapshot());
-		this._diffInfo.set(nullDocumentDiff, tx);
-		this._edit = OffsetEdit.empty;
-	}
-
-	async _doReject(tx: ITransaction | undefined): Promise<void> {
-		this._setDocValue(this.originalModel.getValue());
-	}
-
-	private _setDocValue(value: string): void {
-		if (this.modifiedModel.getValue() !== value) {
-
-			this.modifiedModel.pushStackElement();
-			const edit = EditOperation.replace(this.modifiedModel.getFullModelRange(), value);
-
-			this._applyEdits([edit]);
-			this._updateDiffInfoSeq();
-			this.modifiedModel.pushStackElement();
-		}
-	}
 }

From 649a74e7d88fccfece20f86e82c451bb162bfa37 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 25 Feb 2025 12:42:35 +0100
Subject: [PATCH 0362/1815] Update third party licenses for 1.98 (#241806)

* Update third party licenses for 1.98

* update
---
 ThirdPartyNotices.txt     | 634 +++++++++++++++++++++++++++++++++++++-
 cli/ThirdPartyNotices.txt | 110 ++-----
 package.json              |   2 +-
 3 files changed, 653 insertions(+), 93 deletions(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index a0026469915f..0f17c5ed11bd 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -4,6 +4,34 @@ This repository incorporates material as listed below or described in the code.
 
 
 
+---------------------------------------------------------
+
+@fig/autocomplete-shared 1.1.2
+https://github.com/withfig/autocomplete-tools
+
+MIT License
+
+Copyright (c) 2021 Hercules Labs Inc. (Fig)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+---------------------------------------------------------
+
 ---------------------------------------------------------
 
 @iktakahiro/markdown-it-katex 4.0.2 - MIT
@@ -58,6 +86,34 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
+amazon-q-developer-cli f66e0b0e917ab185eef528dc36eca56b78ca8b5d
+https://github.com/aws/amazon-q-developer-cli
+
+MIT License
+
+Copyright (c) 2024 Amazon.com, Inc. or its affiliates.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+---------------------------------------------------------
+
+---------------------------------------------------------
+
 atom/language-clojure 0.22.8 - MIT
 https://github.com/atom/language-clojure
 
@@ -468,6 +524,580 @@ Title to copyright in this work will at all times remain with copyright holders.
 
 ---------------------------------------------------------
 
+dompurify 3.1.7 - Apache 2.0
+https://github.com/cure53/DOMPurify
+
+DOMPurify
+Copyright 2025 Dr.-Ing. Mario Heiderich, Cure53
+
+DOMPurify is free software; you can redistribute it and/or modify it under the
+terms of either:
+
+a) the Apache License Version 2.0, or
+b) the Mozilla Public License Version 2.0
+
+-----------------------------------------------------------------------------
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+-----------------------------------------------------------------------------
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. "Contributor"
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor’s Contribution.
+
+1.3. "Contribution"
+
+     means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of version
+        1.1 or earlier of the License, but not also under the terms of a
+        Secondary License.
+
+1.6. "Executable Form"
+
+     means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+
+     means a work that combines Covered Software with other material, in a separate
+     file or files, that is not Covered Software.
+
+1.8. "License"
+
+     means this document.
+
+1.9. "Licensable"
+
+     means having the right to grant, to the maximum extent possible, whether at the
+     time of the initial grant or subsequently, any and all of the rights conveyed by
+     this License.
+
+1.10. "Modifications"
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to, deletion
+        from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. "Patent Claims" of a Contributor
+
+      means any patent claim(s), including without limitation, method, process,
+      and apparatus claims, in any patent Licensable by such Contributor that
+      would be infringed, but for the grant of the License, by the making,
+      using, selling, offering for sale, having made, import, or transfer of
+      either its Contributions or its Contributor Version.
+
+1.12. "Secondary License"
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. "Source Code Form"
+
+      means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, "You" includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, "control" means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or as
+        part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its Contributions
+        or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution become
+     effective for each Contribution on the date the Contributor first distributes
+     such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under this
+     License. No additional rights or licenses will be implied from the distribution
+     or licensing of Covered Software under this License. Notwithstanding Section
+     2.1(b) above, no patent license is granted by a Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party’s
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of its
+        Contributions.
+
+     This License does not grant any rights in the trademarks, service marks, or
+     logos of any Contributor (except as may be necessary to comply with the
+     notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this License
+     (see Section 10.2) or under the terms of a Secondary License (if permitted
+     under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its Contributions
+     are its original creation(s) or it has sufficient rights to grant the
+     rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under applicable
+     copyright doctrines of fair use, fair dealing, or other equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under the
+     terms of this License. You must inform recipients that the Source Code Form
+     of the Covered Software is governed by the terms of this License, and how
+     they can obtain a copy of this License. You may not attempt to alter or
+     restrict the recipients’ rights in the Source Code Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this License,
+        or sublicense it under different terms, provided that the license for
+        the Executable Form does not attempt to limit or alter the recipients’
+        rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for the
+     Covered Software. If the Larger Work is a combination of Covered Software
+     with a work governed by one or more Secondary Licenses, and the Covered
+     Software is not Incompatible With Secondary Licenses, this License permits
+     You to additionally distribute such Covered Software under the terms of
+     such Secondary License(s), so that the recipient of the Larger Work may, at
+     their option, further distribute the Covered Software under the terms of
+     either this License or such Secondary License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices (including
+     copyright notices, patent notices, disclaimers of warranty, or limitations
+     of liability) contained within the Source Code Form of the Covered
+     Software, except that You may alter any license notices to the extent
+     required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on behalf
+     of any Contributor. You must make it absolutely clear that any such
+     warranty, support, indemnity, or liability obligation is offered by You
+     alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute, judicial
+   order, or regulation then You must: (a) comply with the terms of this License
+   to the maximum extent possible; and (b) describe the limitations and the code
+   they affect. Such description must be placed in a text file included with all
+   distributions of the Covered Software under this License. Except to the
+   extent prohibited by statute or regulation, such description must be
+   sufficiently detailed for a recipient of ordinary skill to be able to
+   understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
+     if such Contributor fails to notify You of the non-compliance by some
+     reasonable means prior to 60 days after You have come back into compliance.
+     Moreover, Your grants from a particular Contributor are reinstated on an
+     ongoing basis if such Contributor notifies You of the non-compliance by
+     some reasonable means, this is the first time You have received notice of
+     non-compliance with this License from such Contributor, and You become
+     compliant prior to 30 days after Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions, counter-claims,
+     and cross-claims) alleging that a Contributor Version directly or
+     indirectly infringes any patent, then the rights granted to You by any and
+     all Contributors for the Covered Software under Section 2.1 of this License
+     shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an "as is" basis, without
+   warranty of any kind, either expressed, implied, or statutory, including,
+   without limitation, warranties that the Covered Software is free of defects,
+   merchantable, fit for a particular purpose or non-infringing. The entire
+   risk as to the quality and performance of the Covered Software is with You.
+   Should any Covered Software prove defective in any respect, You (not any
+   Contributor) assume the cost of any necessary servicing, repair, or
+   correction. This disclaimer of warranty constitutes an essential part of this
+   License. No use of  any Covered Software is authorized under this License
+   except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from such
+   party’s negligence to the extent applicable law prohibits such limitation.
+   Some jurisdictions do not allow the exclusion or limitation of incidental or
+   consequential damages, so this exclusion and limitation may not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts of
+   a jurisdiction where the defendant maintains its principal place of business
+   and such litigation shall be governed by laws of that jurisdiction, without
+   reference to its conflict-of-law provisions. Nothing in this Section shall
+   prevent a party’s ability to bring cross-claims or counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject matter
+   hereof. If any provision of this License is held to be unenforceable, such
+   provision shall be reformed only to the extent necessary to make it
+   enforceable. Any law or regulation which provides that the language of a
+   contract shall be construed against the drafter shall not be used to construe
+   this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version of
+      the License under which You originally received the Covered Software, or
+      under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a modified
+      version of this License if you rename the license and remove any
+      references to the name of the license steward (except to note that such
+      modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
+      If You choose to distribute Source Code Form that is Incompatible With
+      Secondary Licenses under the terms of this version of the License, the
+      notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file, then
+You may include the notice in a location (such as a LICENSE file in a relevant
+directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+
+      This Source Code Form is "Incompatible
+      With Secondary Licenses", as defined by
+      the Mozilla Public License, v. 2.0.
+---------------------------------------------------------
+
+---------------------------------------------------------
+
 dotnet/csharp-tmLanguage 0.1.0 - MIT
 https://github.com/dotnet/csharp-tmLanguage
 
@@ -889,7 +1519,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-jlelong/vscode-latex-basics 1.9.0 - MIT
+jlelong/vscode-latex-basics 1.10.0 - MIT
 https://github.com/jlelong/vscode-latex-basics
 
 Copyright (c) vscode-latex-basics authors
@@ -2539,7 +3169,7 @@ Creative Commons may be contacted at creativecommons.org.
 
 ---------------------------------------------------------
 
-vscode-logfile-highlighter 2.17.0 - MIT
+vscode-logfile-highlighter 3.3.4 - MIT
 https://github.com/emilast/vscode-logfile-highlighter
 
 The MIT License (MIT)
diff --git a/cli/ThirdPartyNotices.txt b/cli/ThirdPartyNotices.txt
index 03ac5838391f..cc255c04cfdc 100644
--- a/cli/ThirdPartyNotices.txt
+++ b/cli/ThirdPartyNotices.txt
@@ -684,16 +684,6 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [deps-image]: https://deps.rs/repo/github/RustCrypto/utils/status.svg
 [deps-link]: https://deps.rs/repo/github/RustCrypto/utils
 
-[msrv-1.39]: https://img.shields.io/badge/rustc-1.39.0+-blue.svg
-[msrv-1.40]: https://img.shields.io/badge/rustc-1.40.0+-blue.svg
-[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg
-[msrv-1.45]: https://img.shields.io/badge/rustc-1.45.0+-blue.svg
-[msrv-1.51]: https://img.shields.io/badge/rustc-1.51.0+-blue.svg
-[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg
-[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg
-[msrv-1.59]: https://img.shields.io/badge/rustc-1.59.0+-blue.svg
-[msrv-1.60]: https://img.shields.io/badge/rustc-1.60.0+-blue.svg
-
 [//]: # (crates)
 
 [`blobby`]: ./blobby
@@ -738,16 +728,6 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [deps-image]: https://deps.rs/repo/github/RustCrypto/utils/status.svg
 [deps-link]: https://deps.rs/repo/github/RustCrypto/utils
 
-[msrv-1.39]: https://img.shields.io/badge/rustc-1.39.0+-blue.svg
-[msrv-1.40]: https://img.shields.io/badge/rustc-1.40.0+-blue.svg
-[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg
-[msrv-1.45]: https://img.shields.io/badge/rustc-1.45.0+-blue.svg
-[msrv-1.51]: https://img.shields.io/badge/rustc-1.51.0+-blue.svg
-[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg
-[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg
-[msrv-1.59]: https://img.shields.io/badge/rustc-1.59.0+-blue.svg
-[msrv-1.60]: https://img.shields.io/badge/rustc-1.60.0+-blue.svg
-
 [//]: # (crates)
 
 [`blobby`]: ./blobby
@@ -962,7 +942,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--2017, Kang Seonghoon and
+Apache 2.0 License [2]. Copyright (c) 2014--2025, Kang Seonghoon and
 contributors.
 
 Nota Bene: This is same as the Rust Project's own license.
@@ -1525,16 +1505,6 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [deps-image]: https://deps.rs/repo/github/RustCrypto/utils/status.svg
 [deps-link]: https://deps.rs/repo/github/RustCrypto/utils
 
-[msrv-1.39]: https://img.shields.io/badge/rustc-1.39.0+-blue.svg
-[msrv-1.40]: https://img.shields.io/badge/rustc-1.40.0+-blue.svg
-[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg
-[msrv-1.45]: https://img.shields.io/badge/rustc-1.45.0+-blue.svg
-[msrv-1.51]: https://img.shields.io/badge/rustc-1.51.0+-blue.svg
-[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg
-[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg
-[msrv-1.59]: https://img.shields.io/badge/rustc-1.59.0+-blue.svg
-[msrv-1.60]: https://img.shields.io/badge/rustc-1.60.0+-blue.svg
-
 [//]: # (crates)
 
 [`blobby`]: ./blobby
@@ -1674,10 +1644,7 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
 [deps-image]: https://deps.rs/repo/github/RustCrypto/traits/status.svg
 [deps-link]: https://deps.rs/repo/github/RustCrypto/traits
-[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg
-[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg
-[msrv-1.60]: https://img.shields.io/badge/rustc-1.60.0+-blue.svg
-[msrv-1.65]: https://img.shields.io/badge/rustc-1.65.0+-blue.svg
+[msrv-1.85]: https://img.shields.io/badge/rustc-1.85.0+-blue.svg
 
 [//]: # (crates)
 
@@ -1839,10 +1806,7 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
 [deps-image]: https://deps.rs/repo/github/RustCrypto/traits/status.svg
 [deps-link]: https://deps.rs/repo/github/RustCrypto/traits
-[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg
-[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg
-[msrv-1.60]: https://img.shields.io/badge/rustc-1.60.0+-blue.svg
-[msrv-1.65]: https://img.shields.io/badge/rustc-1.65.0+-blue.svg
+[msrv-1.85]: https://img.shields.io/badge/rustc-1.85.0+-blue.svg
 
 [//]: # (crates)
 
@@ -2272,7 +2236,7 @@ DEALINGS IN THE SOFTWARE.
 flate2 1.0.30 - MIT OR Apache-2.0
 https://github.com/rust-lang/flate2-rs
 
-Copyright (c) 2014 Alex Crichton
+Copyright (c) 2014-2025 Alex Crichton
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
@@ -2388,7 +2352,7 @@ SOFTWARE.
 form_urlencoded 1.2.1 - MIT OR Apache-2.0
 https://github.com/servo/rust-url
 
-Copyright (c) 2013-2022 The rust-url developers
+Copyright (c) 2013-2025 The rust-url developers
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
@@ -3225,16 +3189,6 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [deps-image]: https://deps.rs/repo/github/RustCrypto/utils/status.svg
 [deps-link]: https://deps.rs/repo/github/RustCrypto/utils
 
-[msrv-1.39]: https://img.shields.io/badge/rustc-1.39.0+-blue.svg
-[msrv-1.40]: https://img.shields.io/badge/rustc-1.40.0+-blue.svg
-[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg
-[msrv-1.45]: https://img.shields.io/badge/rustc-1.45.0+-blue.svg
-[msrv-1.51]: https://img.shields.io/badge/rustc-1.51.0+-blue.svg
-[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg
-[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg
-[msrv-1.59]: https://img.shields.io/badge/rustc-1.59.0+-blue.svg
-[msrv-1.60]: https://img.shields.io/badge/rustc-1.60.0+-blue.svg
-
 [//]: # (crates)
 
 [`blobby`]: ./blobby
@@ -3278,9 +3232,7 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
 [deps-image]: https://deps.rs/repo/github/RustCrypto/MACs/status.svg
 [deps-link]: https://deps.rs/repo/github/RustCrypto/MACs
-[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg
-[msrv-1.81]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg
-[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg
+[msrv-1.85]: https://img.shields.io/badge/rustc-1.85.0+-blue.svg
 
 [//]: # (crates)
 
@@ -3344,7 +3296,7 @@ https://github.com/hyperium/http-body
 
 The MIT License (MIT)
 
-Copyright (c) 2019-2024 Sean McArthur & Hyper Contributors
+Copyright (c) 2019-2025 Sean McArthur & Hyper Contributors
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
@@ -3376,7 +3328,7 @@ DEALINGS IN THE SOFTWARE.
 httparse 1.8.0 - MIT/Apache-2.0
 https://github.com/seanmonstar/httparse
 
-Copyright (c) 2015-2024 Sean McArthur
+Copyright (c) 2015-2025 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
@@ -3430,7 +3382,7 @@ https://github.com/hyperium/hyper
 
 The MIT License (MIT)
 
-Copyright (c) 2014-2021 Sean McArthur
+Copyright (c) 2014-2025 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
@@ -4076,7 +4028,7 @@ ICU 1.8.1 to ICU 57.1 © 1995-2016 International Business Machines Corporation a
 idna 1.0.3 - MIT OR Apache-2.0
 https://github.com/servo/rust-url/
 
-Copyright (c) 2013-2022 The rust-url developers
+Copyright (c) 2013-2025 The rust-url developers
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
@@ -4220,16 +4172,6 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [deps-image]: https://deps.rs/repo/github/RustCrypto/utils/status.svg
 [deps-link]: https://deps.rs/repo/github/RustCrypto/utils
 
-[msrv-1.39]: https://img.shields.io/badge/rustc-1.39.0+-blue.svg
-[msrv-1.40]: https://img.shields.io/badge/rustc-1.40.0+-blue.svg
-[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg
-[msrv-1.45]: https://img.shields.io/badge/rustc-1.45.0+-blue.svg
-[msrv-1.51]: https://img.shields.io/badge/rustc-1.51.0+-blue.svg
-[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg
-[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg
-[msrv-1.59]: https://img.shields.io/badge/rustc-1.59.0+-blue.svg
-[msrv-1.60]: https://img.shields.io/badge/rustc-1.60.0+-blue.svg
-
 [//]: # (crates)
 
 [`blobby`]: ./blobby
@@ -4509,8 +4451,6 @@ DEALINGS IN THE SOFTWARE.
 lazy_static 1.4.0 - MIT/Apache-2.0
 https://github.com/rust-lang-nursery/lazy-static.rs
 
-Copyright (c) 2010 The Rust Project Developers
-
 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
@@ -5315,7 +5255,7 @@ DEALINGS IN THE SOFTWARE.
 num_cpus 1.16.0 - MIT OR Apache-2.0
 https://github.com/seanmonstar/num_cpus
 
-Copyright (c) 2015
+Copyright (c) 2015-2025 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
@@ -5459,7 +5399,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
-openssl 0.10.66 - Apache-2.0
+openssl 0.10.70 - Apache-2.0
 https://github.com/sfackler/rust-openssl
 
 Copyright 2011-2017 Google Inc.
@@ -5538,7 +5478,7 @@ DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------------------------
 
-openssl-sys 0.9.103 - MIT
+openssl-sys 0.9.105 - MIT
 https://github.com/sfackler/rust-openssl
 
 The MIT License (MIT)
@@ -6791,7 +6731,7 @@ DEALINGS IN THE SOFTWARE.
 percent-encoding 2.3.1 - MIT OR Apache-2.0
 https://github.com/servo/rust-url/
 
-Copyright (c) 2013-2022 The rust-url developers
+Copyright (c) 2013-2025 The rust-url developers
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
@@ -7505,7 +7445,7 @@ DEALINGS IN THE SOFTWARE.
 reqwest 0.11.27 - MIT OR Apache-2.0
 https://github.com/seanmonstar/reqwest
 
-Copyright (c) 2016 Sean McArthur
+Copyright (c) 2016-2025 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
@@ -8358,7 +8298,7 @@ DEALINGS IN THE SOFTWARE.
 secret-service 3.0.1 - MIT OR Apache-2.0
 https://github.com/hwchen/secret-service-rs
 
-Copyright (c) 2016 secret-service Developers
+Copyright (c) 2025 secret-service Developers
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
@@ -8644,7 +8584,7 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
 [deps-image]: https://deps.rs/repo/github/RustCrypto/hashes/status.svg
 [deps-link]: https://deps.rs/repo/github/RustCrypto/hashes
-[msrv-1.81]: https://img.shields.io/badge/rustc-1.81.0+-blue.svg
+[msrv-1.85]: https://img.shields.io/badge/rustc-1.85.0+-blue.svg
 
 [//]: # (crates)
 
@@ -8737,7 +8677,7 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
 [deps-image]: https://deps.rs/repo/github/RustCrypto/hashes/status.svg
 [deps-link]: https://deps.rs/repo/github/RustCrypto/hashes
-[msrv-1.81]: https://img.shields.io/badge/rustc-1.81.0+-blue.svg
+[msrv-1.85]: https://img.shields.io/badge/rustc-1.85.0+-blue.svg
 
 [//]: # (crates)
 
@@ -10049,7 +9989,7 @@ https://github.com/seanmonstar/try-lock
 
 The MIT License (MIT)
 
-Copyright (c) 2018-2023 Sean McArthur
+Copyright (c) 2018-2025 Sean McArthur
 Copyright (c) 2016 Alex Crichton
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -10261,7 +10201,7 @@ DEALINGS IN THE SOFTWARE.
 url 2.5.4 - MIT OR Apache-2.0
 https://github.com/servo/rust-url
 
-Copyright (c) 2013-2022 The rust-url developers
+Copyright (c) 2013-2025 The rust-url developers
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
@@ -11829,16 +11769,6 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 [deps-image]: https://deps.rs/repo/github/RustCrypto/utils/status.svg
 [deps-link]: https://deps.rs/repo/github/RustCrypto/utils
 
-[msrv-1.39]: https://img.shields.io/badge/rustc-1.39.0+-blue.svg
-[msrv-1.40]: https://img.shields.io/badge/rustc-1.40.0+-blue.svg
-[msrv-1.41]: https://img.shields.io/badge/rustc-1.41.0+-blue.svg
-[msrv-1.45]: https://img.shields.io/badge/rustc-1.45.0+-blue.svg
-[msrv-1.51]: https://img.shields.io/badge/rustc-1.51.0+-blue.svg
-[msrv-1.56]: https://img.shields.io/badge/rustc-1.56.0+-blue.svg
-[msrv-1.57]: https://img.shields.io/badge/rustc-1.57.0+-blue.svg
-[msrv-1.59]: https://img.shields.io/badge/rustc-1.59.0+-blue.svg
-[msrv-1.60]: https://img.shields.io/badge/rustc-1.60.0+-blue.svg
-
 [//]: # (crates)
 
 [`blobby`]: ./blobby
diff --git a/package.json b/package.json
index bf845d0d4b95..925462fb087e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.98.0",
-  "distro": "f419b17841f01854d4a70a768353a6bf8e0ca07f",
+  "distro": "aee970faa436e6fdd88d579c1409364c3fdab6a8",
   "author": {
     "name": "Microsoft Corporation"
   },

From ae43cc72b6efb00bebf54eba9d882b46f6d65a7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joaomoreno@users.noreply.github.com>
Date: Tue, 25 Feb 2025 15:18:20 +0100
Subject: [PATCH 0363/1815] make unit tests faster (#241847)

---
 .../browser/ui/tree/asyncDataTree.test.ts     |  63 +--
 .../browser/extHostLanguageFeatures.test.ts   | 410 +++++++++---------
 test/unit/browser/renderer.html               |  40 ++
 test/unit/electron/renderer.html              |   6 -
 test/unit/electron/renderer.js                |  59 ++-
 test/unit/node/index.js                       |  10 +-
 6 files changed, 340 insertions(+), 248 deletions(-)

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 4f7ba0d46c81..6b3d35df9ffd 100644
--- a/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts
+++ b/src/vs/base/test/browser/ui/tree/asyncDataTree.test.ts
@@ -12,6 +12,7 @@ import { IAsyncDataSource, ITreeNode } from '../../../../browser/ui/tree/tree.js
 import { timeout } from '../../../../common/async.js';
 import { Iterable } from '../../../../common/iterator.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../common/utils.js';
+import { runWithFakedTimers } from '../../../common/timeTravelScheduler.js';
 
 interface Element {
 	id: string;
@@ -465,45 +466,47 @@ suite('AsyncDataTree', function () {
 	});
 
 	test('issue #80098 - first expand should call getChildren', async () => {
-		const container = document.createElement('div');
+		return runWithFakedTimers({ useFakeTimers: true }, async () => {
+			const container = document.createElement('div');
 
-		const calls: Function[] = [];
-		const dataSource = new class implements IAsyncDataSource<Element, Element> {
-			hasChildren(element: Element): boolean {
-				return !!element.children && element.children.length > 0;
-			}
-			getChildren(element: Element): Promise<Element[]> {
-				return new Promise(c => calls.push(() => c(element.children || [])));
-			}
-		};
+			const calls: Function[] = [];
+			const dataSource = new class implements IAsyncDataSource<Element, Element> {
+				hasChildren(element: Element): boolean {
+					return !!element.children && element.children.length > 0;
+				}
+				getChildren(element: Element): Promise<Element[]> {
+					return new Promise(c => calls.push(() => c(element.children || [])));
+				}
+			};
 
-		const model = new Model({
-			id: 'root',
-			children: [{
-				id: 'a', children: [{
-					id: 'aa'
+			const model = new Model({
+				id: 'root',
+				children: [{
+					id: 'a', children: [{
+						id: 'aa'
+					}]
 				}]
-			}]
-		});
+			});
 
-		const tree = store.add(new AsyncDataTree<Element, Element>('test', container, new VirtualDelegate(), [new Renderer()], dataSource, { identityProvider: new IdentityProvider() }));
-		tree.layout(200);
+			const tree = store.add(new AsyncDataTree<Element, Element>('test', container, new VirtualDelegate(), [new Renderer()], dataSource, { identityProvider: new IdentityProvider() }));
+			tree.layout(200);
 
-		const pSetInput = tree.setInput(model.root);
-		calls.pop()!(); // resolve getChildren(root)
-		await pSetInput;
+			const pSetInput = tree.setInput(model.root);
+			calls.pop()!(); // resolve getChildren(root)
+			await pSetInput;
 
-		const pExpandA = tree.expand(model.get('a'));
-		assert.strictEqual(calls.length, 1, 'expand(a) should\'ve called getChildren(a)');
+			const pExpandA = tree.expand(model.get('a'));
+			assert.strictEqual(calls.length, 1, 'expand(a) should\'ve called getChildren(a)');
 
-		let race = await Promise.race([pExpandA.then(() => 'expand'), timeout(1).then(() => 'timeout')]);
-		assert.strictEqual(race, 'timeout', 'expand(a) should not be yet done');
+			let race = await Promise.race([pExpandA.then(() => 'expand'), timeout(1).then(() => 'timeout')]);
+			assert.strictEqual(race, 'timeout', 'expand(a) should not be yet done');
 
-		calls.pop()!();
-		assert.strictEqual(calls.length, 0, 'no pending getChildren calls');
+			calls.pop()!();
+			assert.strictEqual(calls.length, 0, 'no pending getChildren calls');
 
-		race = await Promise.race([pExpandA.then(() => 'expand'), timeout(1).then(() => 'timeout')]);
-		assert.strictEqual(race, 'expand', 'expand(a) should now be done');
+			race = await Promise.race([pExpandA.then(() => 'expand'), timeout(1).then(() => 'timeout')]);
+			assert.strictEqual(race, 'expand', 'expand(a) should now be done');
+		});
 	});
 
 	test('issue #78388 - tree should react to hasChildren toggles', async () => {
diff --git a/src/vs/workbench/api/test/browser/extHostLanguageFeatures.test.ts b/src/vs/workbench/api/test/browser/extHostLanguageFeatures.test.ts
index 7aa83e5df457..294a8286dbbd 100644
--- a/src/vs/workbench/api/test/browser/extHostLanguageFeatures.test.ts
+++ b/src/vs/workbench/api/test/browser/extHostLanguageFeatures.test.ts
@@ -56,6 +56,7 @@ import { CodeActionTriggerSource } from '../../../../editor/contrib/codeAction/c
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { IExtHostTelemetry } from '../../common/extHostTelemetry.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { runWithFakedTimers } from '../../../../base/test/common/timeTravelScheduler.js';
 
 suite('ExtHostLanguageFeatures', function () {
 
@@ -233,62 +234,65 @@ suite('ExtHostLanguageFeatures', function () {
 	// --- code lens
 
 	test('CodeLens, evil provider', async () => {
+		return runWithFakedTimers({ useFakeTimers: true }, async () => {
+			disposables.add(extHost.registerCodeLensProvider(defaultExtension, defaultSelector, new class implements vscode.CodeLensProvider {
+				provideCodeLenses(): any {
+					throw new Error('evil');
+				}
+			}));
+			disposables.add(extHost.registerCodeLensProvider(defaultExtension, defaultSelector, new class implements vscode.CodeLensProvider {
+				provideCodeLenses() {
+					return [new types.CodeLens(new types.Range(0, 0, 0, 0))];
+				}
+			}));
 
-		disposables.add(extHost.registerCodeLensProvider(defaultExtension, defaultSelector, new class implements vscode.CodeLensProvider {
-			provideCodeLenses(): any {
-				throw new Error('evil');
-			}
-		}));
-		disposables.add(extHost.registerCodeLensProvider(defaultExtension, defaultSelector, new class implements vscode.CodeLensProvider {
-			provideCodeLenses() {
-				return [new types.CodeLens(new types.Range(0, 0, 0, 0))];
-			}
-		}));
-
-		await rpcProtocol.sync();
-		const value = await getCodeLensModel(languageFeaturesService.codeLensProvider, model, CancellationToken.None);
-		assert.strictEqual(value.lenses.length, 1);
-		value.dispose();
+			await rpcProtocol.sync();
+			const value = await getCodeLensModel(languageFeaturesService.codeLensProvider, model, CancellationToken.None);
+			assert.strictEqual(value.lenses.length, 1);
+			value.dispose();
+		});
 	});
 
 	test('CodeLens, do not resolve a resolved lens', async () => {
-
-		disposables.add(extHost.registerCodeLensProvider(defaultExtension, defaultSelector, new class implements vscode.CodeLensProvider {
-			provideCodeLenses(): any {
-				return [new types.CodeLens(
-					new types.Range(0, 0, 0, 0),
-					{ command: 'id', title: 'Title' })];
-			}
-			resolveCodeLens(): any {
-				assert.ok(false, 'do not resolve');
-			}
-		}));
-
-		await rpcProtocol.sync();
-		const value = await getCodeLensModel(languageFeaturesService.codeLensProvider, model, CancellationToken.None);
-		assert.strictEqual(value.lenses.length, 1);
-		const [data] = value.lenses;
-		const symbol = await Promise.resolve(data.provider.resolveCodeLens!(model, data.symbol, CancellationToken.None));
-		assert.strictEqual(symbol!.command!.id, 'id');
-		assert.strictEqual(symbol!.command!.title, 'Title');
-		value.dispose();
+		return runWithFakedTimers({ useFakeTimers: true }, async () => {
+			disposables.add(extHost.registerCodeLensProvider(defaultExtension, defaultSelector, new class implements vscode.CodeLensProvider {
+				provideCodeLenses(): any {
+					return [new types.CodeLens(
+						new types.Range(0, 0, 0, 0),
+						{ command: 'id', title: 'Title' })];
+				}
+				resolveCodeLens(): any {
+					assert.ok(false, 'do not resolve');
+				}
+			}));
+
+			await rpcProtocol.sync();
+			const value = await getCodeLensModel(languageFeaturesService.codeLensProvider, model, CancellationToken.None);
+			assert.strictEqual(value.lenses.length, 1);
+			const [data] = value.lenses;
+			const symbol = await Promise.resolve(data.provider.resolveCodeLens!(model, data.symbol, CancellationToken.None));
+			assert.strictEqual(symbol!.command!.id, 'id');
+			assert.strictEqual(symbol!.command!.title, 'Title');
+			value.dispose();
+		});
 	});
 
 	test('CodeLens, missing command', async () => {
-
-		disposables.add(extHost.registerCodeLensProvider(defaultExtension, defaultSelector, new class implements vscode.CodeLensProvider {
-			provideCodeLenses() {
-				return [new types.CodeLens(new types.Range(0, 0, 0, 0))];
-			}
-		}));
-
-		await rpcProtocol.sync();
-		const value = await getCodeLensModel(languageFeaturesService.codeLensProvider, model, CancellationToken.None);
-		assert.strictEqual(value.lenses.length, 1);
-		const [data] = value.lenses;
-		const symbol = await Promise.resolve(data.provider.resolveCodeLens!(model, data.symbol, CancellationToken.None));
-		assert.strictEqual(symbol, undefined);
-		value.dispose();
+		return runWithFakedTimers({ useFakeTimers: true }, async () => {
+			disposables.add(extHost.registerCodeLensProvider(defaultExtension, defaultSelector, new class implements vscode.CodeLensProvider {
+				provideCodeLenses() {
+					return [new types.CodeLens(new types.Range(0, 0, 0, 0))];
+				}
+			}));
+
+			await rpcProtocol.sync();
+			const value = await getCodeLensModel(languageFeaturesService.codeLensProvider, model, CancellationToken.None);
+			assert.strictEqual(value.lenses.length, 1);
+			const [data] = value.lenses;
+			const symbol = await Promise.resolve(data.provider.resolveCodeLens!(model, data.symbol, CancellationToken.None));
+			assert.strictEqual(symbol, undefined);
+			value.dispose();
+		});
 	});
 
 	// --- definition
@@ -636,92 +640,96 @@ suite('ExtHostLanguageFeatures', function () {
 	// --- quick fix
 
 	test('Quick Fix, command data conversion', async () => {
-
-		disposables.add(extHost.registerCodeActionProvider(defaultExtension, defaultSelector, {
-			provideCodeActions(): vscode.Command[] {
-				return [
-					{ command: 'test1', title: 'Testing1' },
-					{ command: 'test2', title: 'Testing2' }
-				];
-			}
-		}));
-
-		await rpcProtocol.sync();
-		const value = await getCodeActions(languageFeaturesService.codeActionProvider, model, model.getFullModelRange(), { type: languages.CodeActionTriggerType.Invoke, triggerAction: CodeActionTriggerSource.QuickFix }, Progress.None, CancellationToken.None);
-		const { validActions: actions } = value;
-		assert.strictEqual(actions.length, 2);
-		const [first, second] = actions;
-		assert.strictEqual(first.action.title, 'Testing1');
-		assert.strictEqual(first.action.command!.id, 'test1');
-		assert.strictEqual(second.action.title, 'Testing2');
-		assert.strictEqual(second.action.command!.id, 'test2');
-		value.dispose();
+		return runWithFakedTimers({ useFakeTimers: true }, async () => {
+			disposables.add(extHost.registerCodeActionProvider(defaultExtension, defaultSelector, {
+				provideCodeActions(): vscode.Command[] {
+					return [
+						{ command: 'test1', title: 'Testing1' },
+						{ command: 'test2', title: 'Testing2' }
+					];
+				}
+			}));
+
+			await rpcProtocol.sync();
+			const value = await getCodeActions(languageFeaturesService.codeActionProvider, model, model.getFullModelRange(), { type: languages.CodeActionTriggerType.Invoke, triggerAction: CodeActionTriggerSource.QuickFix }, Progress.None, CancellationToken.None);
+			const { validActions: actions } = value;
+			assert.strictEqual(actions.length, 2);
+			const [first, second] = actions;
+			assert.strictEqual(first.action.title, 'Testing1');
+			assert.strictEqual(first.action.command!.id, 'test1');
+			assert.strictEqual(second.action.title, 'Testing2');
+			assert.strictEqual(second.action.command!.id, 'test2');
+			value.dispose();
+		});
 	});
 
 	test('Quick Fix, code action data conversion', async () => {
-
-		disposables.add(extHost.registerCodeActionProvider(defaultExtension, defaultSelector, {
-			provideCodeActions(): vscode.CodeAction[] {
-				return [
-					{
-						title: 'Testing1',
-						command: { title: 'Testing1Command', command: 'test1' },
-						kind: types.CodeActionKind.Empty.append('test.scope')
-					}
-				];
-			}
-		}));
-
-		await rpcProtocol.sync();
-		const value = await getCodeActions(languageFeaturesService.codeActionProvider, model, model.getFullModelRange(), { type: languages.CodeActionTriggerType.Invoke, triggerAction: CodeActionTriggerSource.Default }, Progress.None, CancellationToken.None);
-		const { validActions: actions } = value;
-		assert.strictEqual(actions.length, 1);
-		const [first] = actions;
-		assert.strictEqual(first.action.title, 'Testing1');
-		assert.strictEqual(first.action.command!.title, 'Testing1Command');
-		assert.strictEqual(first.action.command!.id, 'test1');
-		assert.strictEqual(first.action.kind, 'test.scope');
-		value.dispose();
+		return runWithFakedTimers({ useFakeTimers: true }, async () => {
+			disposables.add(extHost.registerCodeActionProvider(defaultExtension, defaultSelector, {
+				provideCodeActions(): vscode.CodeAction[] {
+					return [
+						{
+							title: 'Testing1',
+							command: { title: 'Testing1Command', command: 'test1' },
+							kind: types.CodeActionKind.Empty.append('test.scope')
+						}
+					];
+				}
+			}));
+
+			await rpcProtocol.sync();
+			const value = await getCodeActions(languageFeaturesService.codeActionProvider, model, model.getFullModelRange(), { type: languages.CodeActionTriggerType.Invoke, triggerAction: CodeActionTriggerSource.Default }, Progress.None, CancellationToken.None);
+			const { validActions: actions } = value;
+			assert.strictEqual(actions.length, 1);
+			const [first] = actions;
+			assert.strictEqual(first.action.title, 'Testing1');
+			assert.strictEqual(first.action.command!.title, 'Testing1Command');
+			assert.strictEqual(first.action.command!.id, 'test1');
+			assert.strictEqual(first.action.kind, 'test.scope');
+			value.dispose();
+		});
 	});
 
 
 	test('Cannot read property \'id\' of undefined, #29469', async () => {
+		return runWithFakedTimers({ useFakeTimers: true }, async () => {
+			disposables.add(extHost.registerCodeActionProvider(defaultExtension, defaultSelector, new class implements vscode.CodeActionProvider {
+				provideCodeActions(): any {
+					return [
+						undefined,
+						null,
+						{ command: 'test', title: 'Testing' }
+					];
+				}
+			}));
 
-		disposables.add(extHost.registerCodeActionProvider(defaultExtension, defaultSelector, new class implements vscode.CodeActionProvider {
-			provideCodeActions(): any {
-				return [
-					undefined,
-					null,
-					{ command: 'test', title: 'Testing' }
-				];
-			}
-		}));
-
-		await rpcProtocol.sync();
-		const value = await getCodeActions(languageFeaturesService.codeActionProvider, model, model.getFullModelRange(), { type: languages.CodeActionTriggerType.Invoke, triggerAction: CodeActionTriggerSource.Default }, Progress.None, CancellationToken.None);
-		const { validActions: actions } = value;
-		assert.strictEqual(actions.length, 1);
-		value.dispose();
+			await rpcProtocol.sync();
+			const value = await getCodeActions(languageFeaturesService.codeActionProvider, model, model.getFullModelRange(), { type: languages.CodeActionTriggerType.Invoke, triggerAction: CodeActionTriggerSource.Default }, Progress.None, CancellationToken.None);
+			const { validActions: actions } = value;
+			assert.strictEqual(actions.length, 1);
+			value.dispose();
+		});
 	});
 
 	test('Quick Fix, evil provider', async () => {
+		return runWithFakedTimers({ useFakeTimers: true }, async () => {
+			disposables.add(extHost.registerCodeActionProvider(defaultExtension, defaultSelector, new class implements vscode.CodeActionProvider {
+				provideCodeActions(): any {
+					throw new Error('evil');
+				}
+			}));
+			disposables.add(extHost.registerCodeActionProvider(defaultExtension, defaultSelector, new class implements vscode.CodeActionProvider {
+				provideCodeActions(): any {
+					return [{ command: 'test', title: 'Testing' }];
+				}
+			}));
 
-		disposables.add(extHost.registerCodeActionProvider(defaultExtension, defaultSelector, new class implements vscode.CodeActionProvider {
-			provideCodeActions(): any {
-				throw new Error('evil');
-			}
-		}));
-		disposables.add(extHost.registerCodeActionProvider(defaultExtension, defaultSelector, new class implements vscode.CodeActionProvider {
-			provideCodeActions(): any {
-				return [{ command: 'test', title: 'Testing' }];
-			}
-		}));
-
-		await rpcProtocol.sync();
-		const value = await getCodeActions(languageFeaturesService.codeActionProvider, model, model.getFullModelRange(), { type: languages.CodeActionTriggerType.Invoke, triggerAction: CodeActionTriggerSource.QuickFix }, Progress.None, CancellationToken.None);
-		const { validActions: actions } = value;
-		assert.strictEqual(actions.length, 1);
-		value.dispose();
+			await rpcProtocol.sync();
+			const value = await getCodeActions(languageFeaturesService.codeActionProvider, model, model.getFullModelRange(), { type: languages.CodeActionTriggerType.Invoke, triggerAction: CodeActionTriggerSource.QuickFix }, Progress.None, CancellationToken.None);
+			const { validActions: actions } = value;
+			assert.strictEqual(actions.length, 1);
+			value.dispose();
+		});
 	});
 
 	// --- navigate types
@@ -965,103 +973,107 @@ suite('ExtHostLanguageFeatures', function () {
 	// --- suggestions
 
 	test('Suggest, order 1/3', async () => {
+		return runWithFakedTimers({ useFakeTimers: true }, async () => {
+			disposables.add(extHost.registerCompletionItemProvider(defaultExtension, '*', new class implements vscode.CompletionItemProvider {
+				provideCompletionItems(): any {
+					return [new types.CompletionItem('testing1')];
+				}
+			}, []));
 
-		disposables.add(extHost.registerCompletionItemProvider(defaultExtension, '*', new class implements vscode.CompletionItemProvider {
-			provideCompletionItems(): any {
-				return [new types.CompletionItem('testing1')];
-			}
-		}, []));
-
-		disposables.add(extHost.registerCompletionItemProvider(defaultExtension, defaultSelector, new class implements vscode.CompletionItemProvider {
-			provideCompletionItems(): any {
-				return [new types.CompletionItem('testing2')];
-			}
-		}, []));
+			disposables.add(extHost.registerCompletionItemProvider(defaultExtension, defaultSelector, new class implements vscode.CompletionItemProvider {
+				provideCompletionItems(): any {
+					return [new types.CompletionItem('testing2')];
+				}
+			}, []));
 
-		await rpcProtocol.sync();
-		const value = await provideSuggestionItems(languageFeaturesService.completionProvider, model, new EditorPosition(1, 1), new CompletionOptions(undefined, new Set<languages.CompletionItemKind>().add(languages.CompletionItemKind.Snippet)));
-		assert.strictEqual(value.items.length, 1);
-		assert.strictEqual(value.items[0].completion.insertText, 'testing2');
-		value.disposable.dispose();
+			await rpcProtocol.sync();
+			const value = await provideSuggestionItems(languageFeaturesService.completionProvider, model, new EditorPosition(1, 1), new CompletionOptions(undefined, new Set<languages.CompletionItemKind>().add(languages.CompletionItemKind.Snippet)));
+			assert.strictEqual(value.items.length, 1);
+			assert.strictEqual(value.items[0].completion.insertText, 'testing2');
+			value.disposable.dispose();
+		});
 	});
 
 	test('Suggest, order 2/3', async () => {
+		return runWithFakedTimers({ useFakeTimers: true }, async () => {
+			disposables.add(extHost.registerCompletionItemProvider(defaultExtension, '*', new class implements vscode.CompletionItemProvider {
+				provideCompletionItems(): any {
+					return [new types.CompletionItem('weak-selector')]; // weaker selector but result
+				}
+			}, []));
 
-		disposables.add(extHost.registerCompletionItemProvider(defaultExtension, '*', new class implements vscode.CompletionItemProvider {
-			provideCompletionItems(): any {
-				return [new types.CompletionItem('weak-selector')]; // weaker selector but result
-			}
-		}, []));
-
-		disposables.add(extHost.registerCompletionItemProvider(defaultExtension, defaultSelector, new class implements vscode.CompletionItemProvider {
-			provideCompletionItems(): any {
-				return []; // stronger selector but not a good result;
-			}
-		}, []));
+			disposables.add(extHost.registerCompletionItemProvider(defaultExtension, defaultSelector, new class implements vscode.CompletionItemProvider {
+				provideCompletionItems(): any {
+					return []; // stronger selector but not a good result;
+				}
+			}, []));
 
-		await rpcProtocol.sync();
-		const value = await provideSuggestionItems(languageFeaturesService.completionProvider, model, new EditorPosition(1, 1), new CompletionOptions(undefined, new Set<languages.CompletionItemKind>().add(languages.CompletionItemKind.Snippet)));
-		assert.strictEqual(value.items.length, 1);
-		assert.strictEqual(value.items[0].completion.insertText, 'weak-selector');
-		value.disposable.dispose();
+			await rpcProtocol.sync();
+			const value = await provideSuggestionItems(languageFeaturesService.completionProvider, model, new EditorPosition(1, 1), new CompletionOptions(undefined, new Set<languages.CompletionItemKind>().add(languages.CompletionItemKind.Snippet)));
+			assert.strictEqual(value.items.length, 1);
+			assert.strictEqual(value.items[0].completion.insertText, 'weak-selector');
+			value.disposable.dispose();
+		});
 	});
 
 	test('Suggest, order 3/3', async () => {
+		return runWithFakedTimers({ useFakeTimers: true }, async () => {
+			disposables.add(extHost.registerCompletionItemProvider(defaultExtension, defaultSelector, new class implements vscode.CompletionItemProvider {
+				provideCompletionItems(): any {
+					return [new types.CompletionItem('strong-1')];
+				}
+			}, []));
 
-		disposables.add(extHost.registerCompletionItemProvider(defaultExtension, defaultSelector, new class implements vscode.CompletionItemProvider {
-			provideCompletionItems(): any {
-				return [new types.CompletionItem('strong-1')];
-			}
-		}, []));
-
-		disposables.add(extHost.registerCompletionItemProvider(defaultExtension, defaultSelector, new class implements vscode.CompletionItemProvider {
-			provideCompletionItems(): any {
-				return [new types.CompletionItem('strong-2')];
-			}
-		}, []));
-
-		await rpcProtocol.sync();
-		const value = await provideSuggestionItems(languageFeaturesService.completionProvider, model, new EditorPosition(1, 1), new CompletionOptions(undefined, new Set<languages.CompletionItemKind>().add(languages.CompletionItemKind.Snippet)));
-		assert.strictEqual(value.items.length, 2);
-		assert.strictEqual(value.items[0].completion.insertText, 'strong-1'); // sort by label
-		assert.strictEqual(value.items[1].completion.insertText, 'strong-2');
-		value.disposable.dispose();
+			disposables.add(extHost.registerCompletionItemProvider(defaultExtension, defaultSelector, new class implements vscode.CompletionItemProvider {
+				provideCompletionItems(): any {
+					return [new types.CompletionItem('strong-2')];
+				}
+			}, []));
+
+			await rpcProtocol.sync();
+			const value = await provideSuggestionItems(languageFeaturesService.completionProvider, model, new EditorPosition(1, 1), new CompletionOptions(undefined, new Set<languages.CompletionItemKind>().add(languages.CompletionItemKind.Snippet)));
+			assert.strictEqual(value.items.length, 2);
+			assert.strictEqual(value.items[0].completion.insertText, 'strong-1'); // sort by label
+			assert.strictEqual(value.items[1].completion.insertText, 'strong-2');
+			value.disposable.dispose();
+		});
 	});
 
 	test('Suggest, evil provider', async () => {
+		return runWithFakedTimers({ useFakeTimers: true }, async () => {
+			disposables.add(extHost.registerCompletionItemProvider(defaultExtension, defaultSelector, new class implements vscode.CompletionItemProvider {
+				provideCompletionItems(): any {
+					throw new Error('evil');
+				}
+			}, []));
 
-		disposables.add(extHost.registerCompletionItemProvider(defaultExtension, defaultSelector, new class implements vscode.CompletionItemProvider {
-			provideCompletionItems(): any {
-				throw new Error('evil');
-			}
-		}, []));
-
-		disposables.add(extHost.registerCompletionItemProvider(defaultExtension, defaultSelector, new class implements vscode.CompletionItemProvider {
-			provideCompletionItems(): any {
-				return [new types.CompletionItem('testing')];
-			}
-		}, []));
-
+			disposables.add(extHost.registerCompletionItemProvider(defaultExtension, defaultSelector, new class implements vscode.CompletionItemProvider {
+				provideCompletionItems(): any {
+					return [new types.CompletionItem('testing')];
+				}
+			}, []));
 
-		await rpcProtocol.sync();
-		const value = await provideSuggestionItems(languageFeaturesService.completionProvider, model, new EditorPosition(1, 1), new CompletionOptions(undefined, new Set<languages.CompletionItemKind>().add(languages.CompletionItemKind.Snippet)));
-		assert.strictEqual(value.items[0].container.incomplete, false);
-		value.disposable.dispose();
 
+			await rpcProtocol.sync();
+			const value = await provideSuggestionItems(languageFeaturesService.completionProvider, model, new EditorPosition(1, 1), new CompletionOptions(undefined, new Set<languages.CompletionItemKind>().add(languages.CompletionItemKind.Snippet)));
+			assert.strictEqual(value.items[0].container.incomplete, false);
+			value.disposable.dispose();
+		});
 	});
 
 	test('Suggest, CompletionList', async () => {
+		return runWithFakedTimers({ useFakeTimers: true }, async () => {
+			disposables.add(extHost.registerCompletionItemProvider(defaultExtension, defaultSelector, new class implements vscode.CompletionItemProvider {
+				provideCompletionItems(): any {
+					return new types.CompletionList([<any>new types.CompletionItem('hello')], true);
+				}
+			}, []));
 
-		disposables.add(extHost.registerCompletionItemProvider(defaultExtension, defaultSelector, new class implements vscode.CompletionItemProvider {
-			provideCompletionItems(): any {
-				return new types.CompletionList([<any>new types.CompletionItem('hello')], true);
-			}
-		}, []));
-
-		await rpcProtocol.sync();
-		await provideSuggestionItems(languageFeaturesService.completionProvider, model, new EditorPosition(1, 1), new CompletionOptions(undefined, new Set<languages.CompletionItemKind>().add(languages.CompletionItemKind.Snippet))).then(model => {
-			assert.strictEqual(model.items[0].container.incomplete, true);
-			model.disposable.dispose();
+			await rpcProtocol.sync();
+			await provideSuggestionItems(languageFeaturesService.completionProvider, model, new EditorPosition(1, 1), new CompletionOptions(undefined, new Set<languages.CompletionItemKind>().add(languages.CompletionItemKind.Snippet))).then(model => {
+				assert.strictEqual(model.items[0].container.incomplete, true);
+				model.disposable.dispose();
+			});
 		});
 	});
 
diff --git a/test/unit/browser/renderer.html b/test/unit/browser/renderer.html
index 45c315c9da02..e94cf77a6f8f 100644
--- a/test/unit/browser/renderer.html
+++ b/test/unit/browser/renderer.html
@@ -34,6 +34,46 @@
 		const urlParams = new URLSearchParams(window.location.search);
 		const isCI = urlParams.get('ci');
 
+		const $globalThis = globalThis;
+		const setTimeout0IsFaster = (typeof $globalThis.postMessage === 'function' && !$globalThis.importScripts);
+
+		/**
+		 * See https://html.spec.whatwg.org/multipage/timers-and-user-prompts.html#:~:text=than%204%2C%20then-,set%20timeout%20to%204,-.
+		 *
+		 * Works similarly to `setTimeout(0)` but doesn't suffer from the 4ms artificial delay
+		 * that browsers set when the nesting level is > 5.
+		 */
+		const setTimeout0 = (() => {
+			if (setTimeout0IsFaster) {
+				const pending = [];
+
+				$globalThis.addEventListener('message', (e) => {
+					if (e.data && e.data.vscodeScheduleAsyncWork) {
+						for (let i = 0, len = pending.length; i < len; i++) {
+							const candidate = pending[i];
+							if (candidate.id === e.data.vscodeScheduleAsyncWork) {
+								pending.splice(i, 1);
+								candidate.callback();
+								return;
+							}
+						}
+					}
+				});
+				let lastId = 0;
+				return (callback) => {
+					const myId = ++lastId;
+					pending.push({
+						id: myId,
+						callback: callback
+					});
+					$globalThis.postMessage({ vscodeScheduleAsyncWork: myId }, '*');
+				};
+			}
+			return (callback) => setTimeout(callback);
+		})();
+
+		Mocha.Runner.immediately = setTimeout0;
+
 		mocha.setup({
 			ui: 'tdd',
 			timeout: isCI ? 30000 : 5000
diff --git a/test/unit/electron/renderer.html b/test/unit/electron/renderer.html
index a8d0dd98abee..4ae458986e6c 100644
--- a/test/unit/electron/renderer.html
+++ b/test/unit/electron/renderer.html
@@ -32,12 +32,6 @@
 				e.stopPropagation();
 			}
 		});
-
-		mocha.setup({
-			ui: 'tdd',
-			timeout: typeof process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] === 'string' ? 30000 : 5000,
-			forbidOnly: typeof process.env['BUILD_ARTIFACTSTAGINGDIRECTORY'] === 'string' // disallow .only() when running on build machine
-		});
 	</script>
 	<script>
 		const urlParams = new URLSearchParams(window.location.search);
diff --git a/test/unit/electron/renderer.js b/test/unit/electron/renderer.js
index 033667df0aa2..aa4f05984a25 100644
--- a/test/unit/electron/renderer.js
+++ b/test/unit/electron/renderer.js
@@ -398,7 +398,57 @@ class IPCReporter {
 	}
 }
 
+const $globalThis = globalThis;
+const setTimeout0IsFaster = (typeof $globalThis.postMessage === 'function' && !$globalThis.importScripts);
+
+/**
+ * See https://html.spec.whatwg.org/multipage/timers-and-user-prompts.html#:~:text=than%204%2C%20then-,set%20timeout%20to%204,-.
+ *
+ * Works similarly to `setTimeout(0)` but doesn't suffer from the 4ms artificial delay
+ * that browsers set when the nesting level is > 5.
+ */
+const setTimeout0 = (() => {
+	if (setTimeout0IsFaster) {
+		const pending = [];
+
+		$globalThis.addEventListener('message', (e) => {
+			if (e.data && e.data.vscodeScheduleAsyncWork) {
+				for (let i = 0, len = pending.length; i < len; i++) {
+					const candidate = pending[i];
+					if (candidate.id === e.data.vscodeScheduleAsyncWork) {
+						pending.splice(i, 1);
+						candidate.callback();
+						return;
+					}
+				}
+			}
+		});
+		let lastId = 0;
+		return (callback) => {
+			const myId = ++lastId;
+			pending.push({
+				id: myId,
+				callback: callback
+			});
+			$globalThis.postMessage({ vscodeScheduleAsyncWork: myId }, '*');
+		};
+	}
+	return (callback) => setTimeout(callback);
+})();
+
 async function runTests(opts) {
+	// @ts-expect-error
+	Mocha.Runner.immediately = setTimeout0;
+
+	mocha.setup({
+		ui: 'tdd',
+		// @ts-expect-error
+		reporter: opts.dev ? 'html' : IPCReporter,
+		grep: opts.grep,
+		timeout: opts.timeout ?? (IS_CI ? 30000 : 5000),
+		forbidOnly: IS_CI // disallow .only() when running on build machine
+	});
+
 	// this *must* come before loadTests, or it doesn't work.
 	if (opts.timeout !== undefined) {
 		mocha.timeout(opts.timeout);
@@ -406,15 +456,6 @@ async function runTests(opts) {
 
 	await loadTests(opts);
 
-	if (opts.grep) {
-		mocha.grep(opts.grep);
-	}
-
-	if (!opts.dev) {
-		// @ts-expect-error
-		mocha.reporter(IPCReporter);
-	}
-
 	const runner = mocha.run(async () => {
 		await createCoverageReport(opts)
 		ipcRenderer.send('all done');
diff --git a/test/unit/node/index.js b/test/unit/node/index.js
index 79d5ee1a1ec7..36c2164dd98a 100644
--- a/test/unit/node/index.js
+++ b/test/unit/node/index.js
@@ -17,6 +17,7 @@ import minimatch from 'minimatch';
 import minimist from 'minimist';
 import * as module from 'module';
 import { fileURLToPath, pathToFileURL } from 'url';
+import semver from 'semver';
 
 /**
  * @type {{ build: boolean; run: string; runGlob: string; coverage: boolean; help: boolean; coverageFormats: string | string[]; coveragePath: string; }}
@@ -68,10 +69,11 @@ const src = path.join(REPO_ROOT, out);
 const baseUrl = pathToFileURL(src);
 
 //@ts-ignore
-const majorRequiredNodeVersion = `v${/^target="(.*)"$/m.exec(fs.readFileSync(path.join(REPO_ROOT, 'remote', '.npmrc'), 'utf8'))[1]}`.substring(0, 3);
-const currentMajorNodeVersion = process.version.substring(0, 3);
-if (majorRequiredNodeVersion !== currentMajorNodeVersion) {
-	console.error(`node.js unit tests require a major node.js version of ${majorRequiredNodeVersion} (your version is: ${currentMajorNodeVersion})`);
+const requiredNodeVersion = semver.parse(/^target="(.*)"$/m.exec(fs.readFileSync(path.join(REPO_ROOT, 'remote', '.npmrc'), 'utf8'))[1]);
+const currentNodeVersion = semver.parse(process.version);
+//@ts-ignore
+if (currentNodeVersion?.major < requiredNodeVersion?.major) {
+	console.error(`node.js unit tests require a major node.js version of ${requiredNodeVersion?.major} (your version is: ${currentNodeVersion?.major})`);
 	process.exit(1);
 }
 

From c13400e91ce4be6b09e39c134c60bd22ae4155d4 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 25 Feb 2025 16:15:04 +0100
Subject: [PATCH 0364/1815] Status Bar Entry: Not guaranteed to be located to
 the far right (fix microsoft/vscode-copilot#13487)

---
 .../api/browser/mainThreadOutputService.ts    |  2 +-
 .../browser/parts/statusbar/statusbarModel.ts | 26 ++++++++-----
 .../browser/parts/statusbar/statusbarPart.ts  |  2 +-
 .../browser/languageDetection.contribution.ts |  2 +-
 .../languageStatus/browser/languageStatus.ts  |  4 +-
 .../workbench/contrib/scm/browser/activity.ts |  2 +-
 .../services/statusbar/browser/statusbar.ts   | 12 ++++--
 .../parts/statusbar/statusbarModel.test.ts    | 38 ++++++++++++-------
 8 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadOutputService.ts b/src/vs/workbench/api/browser/mainThreadOutputService.ts
index 063ed1901e71..3ca6415b382a 100644
--- a/src/vs/workbench/api/browser/mainThreadOutputService.ts
+++ b/src/vs/workbench/api/browser/mainThreadOutputService.ts
@@ -106,7 +106,7 @@ export class MainThreadOutputService extends Disposable implements MainThreadOut
 				statusProperties,
 				'status.view.showQuietly',
 				StatusbarAlignment.RIGHT,
-				{ id: 'status.notifications', alignment: StatusbarAlignment.LEFT }
+				{ location: { id: 'status.notifications', priority: -Number.MAX_VALUE }, alignment: StatusbarAlignment.LEFT }
 			);
 		} else {
 			this._outputStatusItem.value.update(statusProperties);
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarModel.ts b/src/vs/workbench/browser/parts/statusbar/statusbarModel.ts
index 4f4a138dbfb7..5f0264991d04 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarModel.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarModel.ts
@@ -120,7 +120,7 @@ export class StatusbarViewModel extends Disposable {
 
 			// Re-sort entries if this one was used
 			// as reference from other entries
-			if (this._entries.some(otherEntry => isStatusbarEntryLocation(otherEntry.priority.primary) && otherEntry.priority.primary.id === entry.id)) {
+			if (this._entries.some(otherEntry => isStatusbarEntryLocation(otherEntry.priority.primary) && otherEntry.priority.primary.location.id === entry.id)) {
 				this.sort();
 			}
 
@@ -254,19 +254,19 @@ export class StatusbarViewModel extends Disposable {
 	}
 
 	private sort(): void {
+		const allEntryIds = new Set(this._entries.map(entry => entry.id));
 
 		// Split up entries into 2 buckets:
-		// - those with `priority: number` that can be compared
-		// - those with `priority: string` that must be sorted
-		//   relative to another entry if possible
+		// - those with priority as number that can be compared or with a missing relative entry
+		// - those with a relative priority that must be sorted relative to another entry that exists
 		const mapEntryWithNumberedPriorityToIndex = new Map<IStatusbarViewModelEntry, number /* priority of entry as number */>();
 		const mapEntryWithRelativePriority = new Map<string /* id of entry to position after */, Map<string, IStatusbarViewModelEntry>>();
 		for (let i = 0; i < this._entries.length; i++) {
 			const entry = this._entries[i];
-			if (typeof entry.priority.primary === 'number') {
+			if (typeof entry.priority.primary === 'number' || !allEntryIds.has(entry.priority.primary.location.id)) {
 				mapEntryWithNumberedPriorityToIndex.set(entry, i);
 			} else {
-				const referenceEntryId = entry.priority.primary.id;
+				const referenceEntryId = entry.priority.primary.location.id;
 				let entries = mapEntryWithRelativePriority.get(referenceEntryId);
 				if (!entries) {
 
@@ -290,15 +290,18 @@ export class StatusbarViewModel extends Disposable {
 			}
 		}
 
-		// Sort the entries with `priority: number` according to that
+		// Sort the entries with `priority: number` or referencing a missing entry accordingly
 		const sortedEntriesWithNumberedPriority = Array.from(mapEntryWithNumberedPriorityToIndex.keys());
 		sortedEntriesWithNumberedPriority.sort((entryA, entryB) => {
 			if (entryA.alignment === entryB.alignment) {
 
 				// Sort by primary/secondary priority: higher values move towards the left
 
-				if (entryA.priority.primary !== entryB.priority.primary) {
-					return Number(entryB.priority.primary) - Number(entryA.priority.primary);
+				const entryAPrimaryPriority = typeof entryA.priority.primary === 'number' ? entryA.priority.primary : entryA.priority.primary.location.priority;
+				const entryBPrimaryPriority = typeof entryB.priority.primary === 'number' ? entryB.priority.primary : entryB.priority.primary.location.priority;
+
+				if (entryAPrimaryPriority !== entryBPrimaryPriority) {
+					return entryBPrimaryPriority - entryAPrimaryPriority;
 				}
 
 				if (entryA.priority.secondary !== entryB.priority.secondary) {
@@ -353,6 +356,11 @@ export class StatusbarViewModel extends Disposable {
 
 			// Finally, just append all entries that reference another entry
 			// that does not exist to the end of the list
+			//
+			// Note: this should really not happen because of our check in
+			// `allEntryIds`, but we play it safe here to really consume
+			// all entries.
+			//
 			for (const [, entries] of mapEntryWithRelativePriority) {
 				sortedEntries.push(...Array.from(entries.values()).sort((entryA, entryB) => entryB.priority.secondary - entryA.priority.secondary));
 			}
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index 2939ef90e130..e66eaea94ee4 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -501,7 +501,7 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 				isStatusbarEntryLocation(entry.priority.primary) && // entry references another entry as location
 				entry.priority.primary.compact						// entry wants to be compact
 			) {
-				const locationId = entry.priority.primary.id;
+				const locationId = entry.priority.primary.location.id;
 				const location = mapIdToVisibleEntry.get(locationId);
 				if (!location) {
 					continue; // skip if location does not exist
diff --git a/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.ts b/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.ts
index d32ed42432f7..729a6932d6ed 100644
--- a/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.ts
+++ b/src/vs/workbench/contrib/languageDetection/browser/languageDetection.contribution.ts
@@ -103,7 +103,7 @@ class LanguageDetectionStatusContribution implements IWorkbenchContribution {
 					text: '$(lightbulb-autofix)',
 				};
 				if (!this._combinedEntry) {
-					this._combinedEntry = this._statusBarService.addEntry(props, LanguageDetectionStatusContribution._id, StatusbarAlignment.RIGHT, { id: 'status.editor.mode', alignment: StatusbarAlignment.RIGHT, compact: true });
+					this._combinedEntry = this._statusBarService.addEntry(props, LanguageDetectionStatusContribution._id, StatusbarAlignment.RIGHT, { location: { id: 'status.editor.mode', priority: 100.1 }, alignment: StatusbarAlignment.RIGHT, compact: true });
 				} else {
 					this._combinedEntry.update(props);
 				}
diff --git a/src/vs/workbench/contrib/languageStatus/browser/languageStatus.ts b/src/vs/workbench/contrib/languageStatus/browser/languageStatus.ts
index 142d518e68be..17bff692d742 100644
--- a/src/vs/workbench/contrib/languageStatus/browser/languageStatus.ts
+++ b/src/vs/workbench/contrib/languageStatus/browser/languageStatus.ts
@@ -224,7 +224,7 @@ class LanguageStatus {
 				text: isOneBusy ? '$(loading~spin)' : text,
 			};
 			if (!this._combinedEntry) {
-				this._combinedEntry = this._statusBarService.addEntry(props, LanguageStatus._id, StatusbarAlignment.RIGHT, { id: 'status.editor.mode', alignment: StatusbarAlignment.LEFT, compact: true });
+				this._combinedEntry = this._statusBarService.addEntry(props, LanguageStatus._id, StatusbarAlignment.RIGHT, { location: { id: 'status.editor.mode', priority: 100.1 }, alignment: StatusbarAlignment.LEFT, compact: true });
 			} else {
 				this._combinedEntry.update(props);
 			}
@@ -274,7 +274,7 @@ class LanguageStatus {
 			const props = LanguageStatus._asStatusbarEntry(status);
 			let entry = this._dedicatedEntries.get(status.id);
 			if (!entry) {
-				entry = this._statusBarService.addEntry(props, status.id, StatusbarAlignment.RIGHT, { id: 'status.editor.mode', alignment: StatusbarAlignment.RIGHT });
+				entry = this._statusBarService.addEntry(props, status.id, StatusbarAlignment.RIGHT, { location: { id: 'status.editor.mode', priority: 100.1 }, alignment: StatusbarAlignment.RIGHT });
 			} else {
 				entry.update(props);
 				this._dedicatedEntries.delete(status.id);
diff --git a/src/vs/workbench/contrib/scm/browser/activity.ts b/src/vs/workbench/contrib/scm/browser/activity.ts
index a5d9ca5adde5..adda8fa26c40 100644
--- a/src/vs/workbench/contrib/scm/browser/activity.ts
+++ b/src/vs/workbench/contrib/scm/browser/activity.ts
@@ -165,7 +165,7 @@ export class SCMActiveRepositoryController extends Disposable implements IWorkbe
 
 			store.add(index === 0 ?
 				this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, MainThreadStatusBarAlignment.LEFT, 10000) :
-				this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, MainThreadStatusBarAlignment.LEFT, { id: `status.scm.${index - 1}`, alignment: MainThreadStatusBarAlignment.RIGHT, compact: true })
+				this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, MainThreadStatusBarAlignment.LEFT, { location: { id: `status.scm.${index - 1}`, priority: 10000 }, alignment: MainThreadStatusBarAlignment.RIGHT, compact: true })
 			);
 		}
 	}
diff --git a/src/vs/workbench/services/statusbar/browser/statusbar.ts b/src/vs/workbench/services/statusbar/browser/statusbar.ts
index 26515f0af925..2c44613af2ba 100644
--- a/src/vs/workbench/services/statusbar/browser/statusbar.ts
+++ b/src/vs/workbench/services/statusbar/browser/statusbar.ts
@@ -43,10 +43,14 @@ export const enum StatusbarAlignment {
 export interface IStatusbarEntryLocation {
 
 	/**
-	 * The identifier of another status bar entry to
-	 * position relative to.
+	 * The identifier and priority of another status bar
+	 * entry to position relative to. If the referenced
+	 * entry does not exist, the priority will be used.
 	 */
-	id: string;
+	location: {
+		id: string;
+		priority: number;
+	};
 
 	/**
 	 * The alignment of the status bar entry relative
@@ -65,7 +69,7 @@ export interface IStatusbarEntryLocation {
 export function isStatusbarEntryLocation(thing: unknown): thing is IStatusbarEntryLocation {
 	const candidate = thing as IStatusbarEntryLocation | undefined;
 
-	return typeof candidate?.id === 'string' && typeof candidate.alignment === 'number';
+	return typeof candidate?.location?.id === 'string' && typeof candidate.alignment === 'number';
 }
 
 export interface IStatusbarEntryPriority {
diff --git a/src/vs/workbench/test/browser/parts/statusbar/statusbarModel.test.ts b/src/vs/workbench/test/browser/parts/statusbar/statusbarModel.test.ts
index 1a6590e7e531..9ad8e6713ad4 100644
--- a/src/vs/workbench/test/browser/parts/statusbar/statusbarModel.test.ts
+++ b/src/vs/workbench/test/browser/parts/statusbar/statusbarModel.test.ts
@@ -138,7 +138,7 @@ suite('Workbench status bar model', () => {
 		model.add({ id: 'a', alignment: StatusbarAlignment.LEFT, name: '1', priority: { primary: 2, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
 		model.add({ id: 'b', alignment: StatusbarAlignment.LEFT, name: '2', priority: { primary: 1, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
 
-		let entry = { id: 'c', alignment: StatusbarAlignment.LEFT, name: '3', priority: { primary: { id: 'a', alignment: StatusbarAlignment.LEFT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined };
+		let entry = { id: 'c', alignment: StatusbarAlignment.LEFT, name: '3', priority: { primary: { location: { id: 'a', priority: 2 }, alignment: StatusbarAlignment.LEFT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined };
 		model.add(entry);
 
 		let entries = model.entries;
@@ -150,7 +150,7 @@ suite('Workbench status bar model', () => {
 		model.remove(entry);
 
 		// Existing reference, Alignment: right
-		entry = { id: 'c', alignment: StatusbarAlignment.RIGHT, name: '3', priority: { primary: { id: 'a', alignment: StatusbarAlignment.RIGHT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined };
+		entry = { id: 'c', alignment: StatusbarAlignment.RIGHT, name: '3', priority: { primary: { location: { id: 'a', priority: 2 }, alignment: StatusbarAlignment.RIGHT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined };
 		model.add(entry);
 
 		entries = model.entries;
@@ -168,7 +168,7 @@ suite('Workbench status bar model', () => {
 		model.add({ id: 'a', alignment: StatusbarAlignment.LEFT, name: '1', priority: { primary: 2, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
 		model.add({ id: 'b', alignment: StatusbarAlignment.LEFT, name: '2', priority: { primary: 1, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
 
-		let entry = { id: 'c', alignment: StatusbarAlignment.LEFT, name: '3', priority: { primary: { id: 'not-existing', alignment: StatusbarAlignment.LEFT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined };
+		let entry = { id: 'c', alignment: StatusbarAlignment.LEFT, name: '3', priority: { primary: { location: { id: 'not-existing', priority: 0 }, alignment: StatusbarAlignment.LEFT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined };
 		model.add(entry);
 
 		let entries = model.entries;
@@ -179,8 +179,20 @@ suite('Workbench status bar model', () => {
 
 		model.remove(entry);
 
+		// Nonexistent reference, Alignment: different fallback priority
+		entry = { id: 'c', alignment: StatusbarAlignment.LEFT, name: '3', priority: { primary: { location: { id: 'not-existing', priority: 3 }, alignment: StatusbarAlignment.LEFT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined };
+		model.add(entry);
+
+		entries = model.entries;
+		assert.strictEqual(entries.length, 3);
+		assert.strictEqual(entries[0].id, 'c');
+		assert.strictEqual(entries[1].id, 'a');
+		assert.strictEqual(entries[2].id, 'b');
+
+		model.remove(entry);
+
 		// Nonexistent reference, Alignment: right
-		entry = { id: 'c', alignment: StatusbarAlignment.RIGHT, name: '3', priority: { primary: { id: 'not-existing', alignment: StatusbarAlignment.RIGHT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined };
+		entry = { id: 'c', alignment: StatusbarAlignment.RIGHT, name: '3', priority: { primary: { location: { id: 'not-existing', priority: 3 }, alignment: StatusbarAlignment.RIGHT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined };
 		model.add(entry);
 
 		entries = model.entries;
@@ -196,7 +208,7 @@ suite('Workbench status bar model', () => {
 
 		model.add({ id: 'a', alignment: StatusbarAlignment.LEFT, name: '1', priority: { primary: 2, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
 		model.add({ id: 'b', alignment: StatusbarAlignment.LEFT, name: '2', priority: { primary: 1, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
-		model.add({ id: 'c', alignment: StatusbarAlignment.LEFT, name: '3', priority: { primary: { id: 'not-existing', alignment: StatusbarAlignment.LEFT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+		model.add({ id: 'c', alignment: StatusbarAlignment.LEFT, name: '3', priority: { primary: { location: { id: 'not-existing', priority: 0 }, alignment: StatusbarAlignment.LEFT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
 
 		let entries = model.entries;
 		assert.strictEqual(entries.length, 3);
@@ -236,7 +248,7 @@ suite('Workbench status bar model', () => {
 		assert.strictEqual(model.getEntries(StatusbarAlignment.LEFT).length, 2);
 		assert.strictEqual(model.getEntries(StatusbarAlignment.RIGHT).length, 2);
 
-		const relativeEntryLeft = { id: 'relative', alignment: StatusbarAlignment.LEFT, name: 'relative', priority: { primary: { id: '1-right', alignment: StatusbarAlignment.LEFT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined };
+		const relativeEntryLeft = { id: 'relative', alignment: StatusbarAlignment.LEFT, name: 'relative', priority: { primary: { location: { id: '1-right', priority: 2 }, alignment: StatusbarAlignment.LEFT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined };
 		model.add(relativeEntryLeft);
 
 		assert.strictEqual(model.getEntries(StatusbarAlignment.LEFT).length, 3);
@@ -245,7 +257,7 @@ suite('Workbench status bar model', () => {
 
 		model.remove(relativeEntryLeft);
 
-		const relativeEntryRight = { id: 'relative', alignment: StatusbarAlignment.RIGHT, name: 'relative', priority: { primary: { id: '1-right', alignment: StatusbarAlignment.LEFT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined };
+		const relativeEntryRight = { id: 'relative', alignment: StatusbarAlignment.RIGHT, name: 'relative', priority: { primary: { location: { id: '1-right', priority: 2 }, alignment: StatusbarAlignment.LEFT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined };
 		model.add(relativeEntryRight);
 
 		assert.strictEqual(model.getEntries(StatusbarAlignment.LEFT).length, 2);
@@ -257,9 +269,9 @@ suite('Workbench status bar model', () => {
 		const model = disposables.add(new StatusbarViewModel(disposables.add(new TestStorageService())));
 
 		model.add({ id: 'ref', alignment: StatusbarAlignment.LEFT, name: 'ref', priority: { primary: 0, secondary: 0 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
-		model.add({ id: 'entry2', alignment: StatusbarAlignment.RIGHT, name: '2', priority: { primary: { id: 'ref', alignment: StatusbarAlignment.RIGHT }, secondary: 2 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
-		model.add({ id: 'entry1', alignment: StatusbarAlignment.RIGHT, name: '1', priority: { primary: { id: 'ref', alignment: StatusbarAlignment.RIGHT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
-		model.add({ id: 'entry3', alignment: StatusbarAlignment.RIGHT, name: '3', priority: { primary: { id: 'ref', alignment: StatusbarAlignment.RIGHT }, secondary: 3 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+		model.add({ id: 'entry2', alignment: StatusbarAlignment.RIGHT, name: '2', priority: { primary: { location: { id: 'ref', priority: 0 }, alignment: StatusbarAlignment.RIGHT }, secondary: 2 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+		model.add({ id: 'entry1', alignment: StatusbarAlignment.RIGHT, name: '1', priority: { primary: { location: { id: 'ref', priority: 0 }, alignment: StatusbarAlignment.RIGHT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+		model.add({ id: 'entry3', alignment: StatusbarAlignment.RIGHT, name: '3', priority: { primary: { location: { id: 'ref', priority: 0 }, alignment: StatusbarAlignment.RIGHT }, secondary: 3 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
 
 		const entries = model.entries;
 		assert.strictEqual(entries.length, 4);
@@ -273,9 +285,9 @@ suite('Workbench status bar model', () => {
 		const container = document.createElement('div');
 		const model = disposables.add(new StatusbarViewModel(disposables.add(new TestStorageService())));
 
-		model.add({ id: 'entry2', alignment: StatusbarAlignment.RIGHT, name: '2', priority: { primary: { id: 'ref', alignment: StatusbarAlignment.RIGHT }, secondary: 2 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
-		model.add({ id: 'entry1', alignment: StatusbarAlignment.RIGHT, name: '1', priority: { primary: { id: 'ref', alignment: StatusbarAlignment.RIGHT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
-		model.add({ id: 'entry3', alignment: StatusbarAlignment.RIGHT, name: '3', priority: { primary: { id: 'ref', alignment: StatusbarAlignment.RIGHT }, secondary: 3 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+		model.add({ id: 'entry2', alignment: StatusbarAlignment.RIGHT, name: '2', priority: { primary: { location: { id: 'ref', priority: 1 }, alignment: StatusbarAlignment.RIGHT }, secondary: 2 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+		model.add({ id: 'entry1', alignment: StatusbarAlignment.RIGHT, name: '1', priority: { primary: { location: { id: 'ref', priority: 1 }, alignment: StatusbarAlignment.RIGHT }, secondary: 1 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
+		model.add({ id: 'entry3', alignment: StatusbarAlignment.RIGHT, name: '3', priority: { primary: { location: { id: 'ref', priority: 1 }, alignment: StatusbarAlignment.RIGHT }, secondary: 3 }, container, labelContainer: container, hasCommand: false, extensionId: undefined });
 
 		const entries = model.entries;
 		assert.strictEqual(entries.length, 3);

From c6318da7a7a74d2dc33cd25d3fe8dbe13578089e Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 25 Feb 2025 16:43:53 +0100
Subject: [PATCH 0365/1815] chat - tweak visuals of chat entry

---
 .../contrib/chat/browser/chatStatus.ts        | 23 ++++++++++++-------
 .../contrib/chat/browser/media/chatStatus.css | 11 ++++++---
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index f4e9d75cc1c5..1a0773257374 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -140,10 +140,11 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 				// Quota Indicator
 				const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate } = this.chatQuotasService.quotas;
 
-				container.appendChild($('div', undefined, localize('limitTitle', "You are currently using Copilot Free:")));
+				container.appendChild($('div', undefined, localize('limitTitle', "You are using Copilot Free")));
+				container.appendChild($('hr'));
 
-				const chatQuotaIndicator = this.createQuotaIndicator(container, chatTotal, chatRemaining, localize('chatsLabel', "Chats Used"));
-				const completionsQuotaIndicator = this.createQuotaIndicator(container, completionsTotal, completionsRemaining, localize('completionsLabel', "Completions Used"));
+				const chatQuotaIndicator = this.createQuotaIndicator(container, chatTotal, chatRemaining, localize('chatsLabel', "Chats Messages Remaining"));
+				const completionsQuotaIndicator = this.createQuotaIndicator(container, completionsTotal, completionsRemaining, localize('completionsLabel', "Code Completions Remaining"));
 
 				this.chatEntitlementsService.resolve(CancellationToken.None).then(() => {
 					const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = this.chatQuotasService.quotas;
@@ -152,14 +153,14 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 					completionsQuotaIndicator(completionsTotal, completionsRemaining);
 				});
 
-				container.appendChild($('div', undefined, localize('limitQuota', "Usage will reset on {0}.", this.dateFormatter.format(quotaResetDate))));
+				container.appendChild($('div', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.format(quotaResetDate))));
 
 				// Settings
-				container.appendChild(document.createElement('hr'));
+				container.appendChild($('hr'));
 				this.createSettings(container, disposables);
 
 				// Shortcuts
-				container.appendChild(document.createElement('hr'));
+				container.appendChild($('hr'));
 				this.createShortcuts(container, disposables);
 
 				return container;
@@ -172,6 +173,11 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			tooltip = () => {
 				const container = $('div.chat-status-bar-entry-tooltip');
 
+				if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.pro.key) === true) {
+					container.appendChild($('div', undefined, localize('proTitle', "You are using Copilot Pro")));
+					container.appendChild($('hr'));
+				}
+
 				// Settings
 				this.createSettings(container, disposables);
 
@@ -211,8 +217,9 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 		const update = (total: number | undefined, remaining: number | undefined) => {
 			if (typeof total === 'number' && typeof remaining === 'number') {
-				quotaText.textContent = localize('quotaDisplay', "{0} / {1}", total - remaining, total);
-				quotaBit.style.width = `${((total - remaining) / total) * 100}%`;
+				// TODO@bpasero: enable this label when we can track this better
+				//quotaText.textContent = localize('quotaDisplay', "{0} / {1}", remaining, total);
+				quotaBit.style.width = `${(remaining / total) * 100}%`;
 			}
 		};
 
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
index 911602f593f2..db06923f4494 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
@@ -5,6 +5,11 @@
 
 /* Overall */
 
+.chat-status-bar-entry-tooltip {
+	margin-top: 8px;
+	margin-bottom: 8px;
+}
+
 .chat-status-bar-entry-tooltip hr {
 	margin-top: 8px;
 	margin-bottom: 8px;
@@ -62,14 +67,14 @@
 
 .chat-status-bar-entry-tooltip .quota-indicator .quota-bar {
 	width: 100%;
-	height: 8px;
+	height: 6px;
 	background-color: var(--vscode-activityBarBadge-foreground);
 	border-color: var(--vscode-activityBarBadge-background);
-	border-radius: 6px;
+	border-radius: 4px;
 }
 
 .chat-status-bar-entry-tooltip .quota-indicator .quota-bar .quota-bit {
 	height: 100%;
 	background-color: var(--vscode-activityBarBadge-background);
-	border-radius: 6px;
+	border-radius: 4px;
 }

From 949b5cf564eccdc7a196ad94a94062c2a8a52052 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Tue, 25 Feb 2025 16:47:03 +0100
Subject: [PATCH 0366/1815] Fix memory leak in
 InlineSuggestionHintsContentWidget (#241877)

fix leak
---
 .../browser/hintsWidget/inlineCompletionsHintsWidget.ts     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts b/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts
index 084715904702..d5b54d82af8b 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts
@@ -172,9 +172,9 @@ export class InlineSuggestionHintsContentWidget extends Disposable implements IC
 		return action;
 	}
 
-	private readonly previousAction = this.createCommandAction(showPreviousInlineSuggestionActionId, localize('previous', 'Previous'), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon));
-	private readonly availableSuggestionCountAction = new Action('inlineSuggestionHints.availableSuggestionCount', '', undefined, false);
-	private readonly nextAction = this.createCommandAction(showNextInlineSuggestionActionId, localize('next', 'Next'), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon));
+	private readonly previousAction = this._register(this.createCommandAction(showPreviousInlineSuggestionActionId, localize('previous', 'Previous'), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon)));
+	private readonly availableSuggestionCountAction = this._register(new Action('inlineSuggestionHints.availableSuggestionCount', '', undefined, false));
+	private readonly nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, localize('next', 'Next'), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
 
 	private readonly toolBar: CustomizedMenuWorkbenchToolBar;
 

From c415b320be27d3a02d29403772101ef263586ec3 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 25 Feb 2025 17:08:35 +0100
Subject: [PATCH 0367/1815] chat - turn status into an exp setting

---
 .../contrib/chat/browser/chat.contribution.ts |  7 ++++
 .../contrib/chat/browser/chatStatus.ts        | 33 ++++++++++---------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 29bd893d1499..70eea5c8556f 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -98,6 +98,7 @@ import { PROMPT_FILE_EXTENSION } from '../../../../platform/prompts/common/const
 import { DOCUMENTATION_URL } from '../common/promptSyntax/constants.js';
 import { registerChatToolActions } from './actions/chatToolActions.js';
 import { ChatStatusBarEntry } from './chatStatus.js';
+import product from '../../../../platform/product/common/product.js';
 
 // Register configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -191,6 +192,12 @@ configurationRegistry.registerConfiguration({
 			description: nls.localize('chat.renderRelatedFiles', "Controls whether related files should be rendered in the chat input."),
 			default: false
 		},
+		'chat.experimental.statusIndicator.enabled': { // TODO@bpasero remove this eventually
+			type: 'boolean',
+			description: nls.localize('chat.statusIndicator', "Controls whether a Copilot related status indicator appears in the lower right corner."),
+			default: product.quality !== 'stable',
+			tags: ['experimental', 'onExp']
+		},
 		[PromptsConfig.CONFIG_KEY]: {
 			type: 'object',
 			title: nls.localize(
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 1a0773257374..ac49a2a26ce4 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -10,9 +10,7 @@ import { language, OS } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.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 { IWorkbenchContribution } from '../../../common/contributions.js';
-import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
 import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowTooltipCommand, StatusbarAlignment, TooltipContent } from '../../../services/statusbar/browser/statusbar.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatQuotasService } from '../common/chatQuotasService.js';
@@ -31,8 +29,6 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 	static readonly ID = 'chat.statusBarEntry';
 
-	private readonly treatment = this.assignmentService.getTreatment<boolean>('config.chat.experimental.statusIndicator.enabled'); //TODO@bpasero remove this experiment eventually
-
 	private entry: IStatusbarEntryAccessor | undefined = undefined;
 	private readonly entryDisposables = this._register(new MutableDisposable());
 
@@ -43,8 +39,6 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		@IChatQuotasService private readonly chatQuotasService: IChatQuotasService,
 		@IChatEntitlementsService private readonly chatEntitlementsService: IChatEntitlementsService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IWorkbenchAssignmentService private readonly assignmentService: IWorkbenchAssignmentService,
-		@IProductService private readonly productService: IProductService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@ICommandService private readonly commandService: ICommandService
@@ -56,21 +50,21 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	}
 
 	private async create(): Promise<void> {
-		let enabled = false;
-		if (this.productService.quality === 'stable') {
-			enabled = (await this.treatment) === true;
+		if (this.configurationService.getValue<boolean>('chat.experimental.statusIndicator.enabled') === true) {
+			this.entry ||= this.statusbarService.addEntry(this.getEntryProps(), ChatStatusBarEntry.ID, StatusbarAlignment.RIGHT, Number.NEGATIVE_INFINITY /* the end of the right hand side */);
 		} else {
-			enabled = true;
-		}
-
-		if (!enabled) {
-			return;
+			this.entry?.dispose();
+			this.entry = undefined;
 		}
-
-		this.entry = this._register(this.statusbarService.addEntry(this.getEntryProps(), ChatStatusBarEntry.ID, StatusbarAlignment.RIGHT, Number.NEGATIVE_INFINITY /* the end of the right hand side */));
 	}
 
 	private registerListeners(): void {
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('chat.experimental.statusIndicator.enabled')) {
+				this.create();
+			}
+		}));
+
 		const contextKeysSet = new Set([
 			ChatContextKeys.Setup.limited.key,
 			ChatContextKeys.Setup.installed.key,
@@ -288,4 +282,11 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 		return settings;
 	}
+
+	override dispose(): void {
+		super.dispose();
+
+		this.entry?.dispose();
+		this.entry = undefined;
+	}
 }

From d94e9952c42bb31cefe7025f8eec46209b928762 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Tue, 25 Feb 2025 17:56:45 +0100
Subject: [PATCH 0368/1815] Dispose test decoration actions (#241885)

dispose test decoration actions
---
 .../contrib/testing/browser/testingDecorations.ts     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/testing/browser/testingDecorations.ts b/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
index ef1483188f53..dfe9127e8e45 100644
--- a/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingDecorations.ts
@@ -1026,7 +1026,7 @@ abstract class RunTestDecoration {
 	 * Gets context menu actions relevant for a singel test.
 	 */
 	protected getTestContextMenuActions(test: InternalTestItem, resultItem?: TestResultItem): IReference<IAction[]> {
-		const testActions: IAction[] = [];
+		const testActions: Action[] = [];
 		const capabilities = this.testProfileService.capabilitiesForTest(test.item);
 
 		[
@@ -1067,7 +1067,7 @@ abstract class RunTestDecoration {
 			() => this.commandService.executeCommand('_revealTestInExplorer', test.item.extId)));
 
 		const contributed = this.getContributedTestActions(test, capabilities);
-		return { object: Separator.join(testActions, contributed), dispose() { } };
+		return { object: Separator.join(testActions, contributed), dispose() { testActions.forEach(a => a.dispose()); } };
 	}
 
 	private getContributedTestActions(test: InternalTestItem, capabilities: number): IAction[] {
@@ -1110,8 +1110,8 @@ class MultiRunTestDecoration extends RunTestDecoration implements ITestDecoratio
 	}
 
 	public override getContextMenuActions() {
-		const allActions: IAction[] = [];
-
+		const disposable = new DisposableStore();
+		const allActions: Action[] = [];
 		[
 			{ bitset: TestRunProfileBitset.Run, label: localize('run all test', 'Run All Tests') },
 			{ bitset: TestRunProfileBitset.Coverage, label: localize('run all test with coverage', 'Run All Tests with Coverage') },
@@ -1123,6 +1123,8 @@ class MultiRunTestDecoration extends RunTestDecoration implements ITestDecoratio
 			}
 		});
 
+		disposable.add(toDisposable(() => allActions.forEach(a => a.dispose())));
+
 		const testItems = this.tests.map((testItem): IMultiRunTest => ({
 			currentLabel: testItem.test.item.label,
 			testItem,
@@ -1157,7 +1159,6 @@ class MultiRunTestDecoration extends RunTestDecoration implements ITestDecoratio
 			return (ai.sortText || ai.label).localeCompare(bi.sortText || bi.label);
 		});
 
-		const disposable = new DisposableStore();
 		let testSubmenus: IAction[] = testItems.map(({ currentLabel, testItem }) => {
 			const actions = this.getTestContextMenuActions(testItem.test, testItem.resultItem);
 			disposable.add(actions);

From d984cb50ed77966ab55dcde383181695e8407b50 Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Tue, 25 Feb 2025 09:57:04 -0800
Subject: [PATCH 0369/1815] fix: improve `chat.implicitContext.enabled` setting
 description (#241901)

---
 src/vs/workbench/contrib/chat/browser/chat.contribution.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 29bd893d1499..ffe914d85ea4 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -140,7 +140,7 @@ configurationRegistry.registerConfiguration({
 		'chat.implicitContext.enabled': {
 			type: 'object',
 			tags: ['experimental'],
-			description: nls.localize('chat.implicitContext.enabled', "Enables the implicit context widget for specified chat locations."),
+			description: nls.localize('chat.implicitContext.enabled.1', "Enables automatically using the active editor as chat context for specified chat locations."),
 			additionalProperties: {
 				type: 'string',
 				enum: ['never', 'first', 'always'],

From 65c78d2c536f11045773772792a1c0859681c00d Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 25 Feb 2025 10:25:53 -0800
Subject: [PATCH 0370/1815] chat: fix potential issue with chat session being
 stuck in streaming state (#241917)

---
 .../chatEditingModifiedFileEntry.ts           |  2 +-
 .../browser/chatEditing/chatEditingSession.ts | 28 ++++++++++++-------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
index 4cd72fcc07cf..cf67b39bf99a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
@@ -227,7 +227,7 @@ export abstract class AbstractChatEditingModifiedFileEntry extends Disposable im
 
 	abstract acceptAgentEdits(uri: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void>;
 
-	async acceptStreamingEditsEnd(tx: ITransaction) {
+	acceptStreamingEditsEnd(tx: ITransaction) {
 		this._resetEditsState(tx);
 
 		// AUTO accept mode
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index ca4ccb333311..01e9f18edc68 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -711,7 +711,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 
 			startPromise.complete();
 			return completePromise.p;
-		});
+		}).then(() => this._onStreamingEditDequeued());
 
 
 		let didComplete = false;
@@ -747,7 +747,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 				sequencer.queue(async () => {
 					if (!this.isDisposed) {
 						await this._acceptEdits(resource, [], true, responseModel);
-						await this._resolve(responseModel.requestId, inUndoStop, resource);
+						this._resolve(responseModel.requestId, inUndoStop, resource);
 						completePromise.complete();
 					}
 				});
@@ -755,6 +755,19 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		};
 	}
 
+	private _onStreamingEditDequeued() {
+		const state = this._state.get();
+		if (state === ChatEditingSessionState.Disposed) {
+			return;
+		}
+
+		const isStreamingEdits = !Iterable.isEmpty(this._streamingEditLocks.keys());
+		const targetState = isStreamingEdits ? ChatEditingSessionState.StreamingEdits : ChatEditingSessionState.Idle;
+		if (state !== targetState) {
+			this._state.set(targetState, undefined);
+		}
+	}
+
 	private _trackUntitledWorkingSetEntry(resource: URI) {
 		if (resource.scheme !== Schemas.untitled) {
 			return;
@@ -963,20 +976,15 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		};
 	}
 
-	private async _resolve(requestId: string, undoStop: string | undefined, resource: URI): Promise<void> {
-		await asyncTransaction(async (tx) => {
-			const hasOtherTasks = Iterable.some(this._streamingEditLocks.keys(), k => k !== resource.toString());
-			if (!hasOtherTasks) {
-				this._state.set(ChatEditingSessionState.Idle, tx);
-			}
-
+	private _resolve(requestId: string, undoStop: string | undefined, resource: URI): void {
+		transaction((tx) => {
 			const entry = this._getEntry(resource);
 			if (!entry) {
 				return;
 			}
 
 			this.ensureEditInUndoStopMatches(requestId, undoStop, entry, /* next= */ true, tx);
-			return entry.acceptStreamingEditsEnd(tx);
+			entry.acceptStreamingEditsEnd(tx);
 		});
 
 		this._onDidChange.fire(ChatEditingSessionChangeType.Other);

From 661e8fa7c1f15aa51be115ed7792d57fa28e3f14 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Tue, 25 Feb 2025 11:14:45 -0800
Subject: [PATCH 0371/1815] Exclude on-testplan from verification-needed
 (#241931)

---
 .vscode/notebooks/endgame.github-issues | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vscode/notebooks/endgame.github-issues b/.vscode/notebooks/endgame.github-issues
index 9f92bf0b6a62..ca93d5033384 100644
--- a/.vscode/notebooks/endgame.github-issues
+++ b/.vscode/notebooks/endgame.github-issues
@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"February 2025\""
+    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\r\n\r\n$MILESTONE=milestone:\"February 2025\""
   },
   {
     "kind": 1,
@@ -97,7 +97,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE is:issue is:closed reason:completed label:verification-needed -label:verified"
+    "value": "$REPOS $MILESTONE is:issue is:closed reason:completed label:verification-needed -label:verified -label:on-testplan"
   },
   {
     "kind": 1,

From a56b56df3a09a345d3ccdab4868603a787cdaca9 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Tue, 25 Feb 2025 09:52:32 -0800
Subject: [PATCH 0372/1815] don't add root prompt link variable to the
 attached/implicit context

---
 src/vs/workbench/contrib/chat/browser/chatInputPart.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 94405a7465c4..e9dc55f3275b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -184,7 +184,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			});
 		}
 
-		// factor in nested file references into the implicit context
+		// factor in nested file links of a prompt into the implicit context
 		const variables = this.variableService.getDynamicVariables(sessionId);
 		for (const variable of variables) {
 			if (!(variable instanceof ChatFileReference)) {
@@ -198,10 +198,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 					return toChatVariable(link, false);
 				}),
 			);
-			// then add the root reference itself
-			contextArr.push(
-				toChatVariable(variable, true),
-			);
 		}
 
 		contextArr

From 32e31424e44477fc49d538f1db28dad3614e0eaf Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Tue, 25 Feb 2025 11:58:31 -0800
Subject: [PATCH 0373/1815] fix: don't send prompt instructions twice in Edits
 context (#241940)

---
 src/vs/workbench/contrib/chat/browser/chatWidget.ts | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index 12fba91fa444..e883ca52781e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -1124,13 +1124,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 					}
 				}
 
-				// add prompt instruction references to the attached context, if enabled
-				const promptInstructionUris = new ResourceSet(promptInstructions.chatAttachments.map((v) => v.value) as URI[]);
-				if (instructionsEnabled) {
-					editingSessionAttachedContext
-						.push(...promptInstructions.chatAttachments);
-				}
-
 				for (const file of uniqueWorkingSetEntries) {
 					// Make sure that any files that we sent are part of the working set
 					// but do not permanently add file variables from previous requests to the working set
@@ -1144,7 +1137,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 					for (const variable of request.variableData.variables) {
 						if (URI.isUri(variable.value) && variable.isFile) {
 							const uri = variable.value;
-							if (!uniqueWorkingSetEntries.has(uri) && !promptInstructionUris.has(uri)) {
+							if (!uniqueWorkingSetEntries.has(uri)) {
 								editingSessionAttachedContext.push(variable);
 								uniqueWorkingSetEntries.add(variable.value);
 							}

From 846dacfedcd9589a0f0f062699c4477263a027a8 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Wed, 26 Feb 2025 07:16:02 +1100
Subject: [PATCH 0374/1815] Compute notebook diff before loading modifed entry
 (#241935)

---
 .../chatEditingModifiedNotebookEntry.ts       | 136 +++++++++++-------
 1 file changed, 82 insertions(+), 54 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 98327e224050..1bc136b3359d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -47,7 +47,7 @@ import { CellDiffInfo, computeDiff } from '../../../notebook/browser/diff/notebo
 import { getNotebookEditorFromEditorPane } from '../../../notebook/browser/notebookBrowser.js';
 import { NotebookCellTextModel } from '../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
-import { CellEditType, ICellDto2, ICellEditOperation, ICellReplaceEdit, IResolvedNotebookEditorModel, NotebookData, NotebookSetting, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
+import { CellEditType, ICellDto2, ICellEditOperation, ICellReplaceEdit, IOutputItemDto, IResolvedNotebookEditorModel, NotebookData, NotebookSetting, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
 import { INotebookEditorModelResolverService } from '../../../notebook/common/notebookEditorModelResolverService.js';
 import { INotebookLoggingService } from '../../../notebook/common/notebookLoggingService.js';
 import { INotebookService } from '../../../notebook/common/notebookService.js';
@@ -107,6 +107,8 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			const resolver = accessor.get(INotebookEditorModelResolverService);
 			const configurationServie = accessor.get(IConfigurationService);
 			const textModelService = accessor.get(ITextModelService);
+			const notebookEditorWorkerService = accessor.get(INotebookEditorWorkerService);
+			const loggingService = accessor.get(INotebookLoggingService);
 			const resourceRef: IReference<IResolvedNotebookEditorModel> = await resolver.resolve(uri);
 			const notebook = resourceRef.object.notebook;
 			const originalUri = ChatEditingNotebookFileSystemProvider.getSnapshotFileURI(telemetryInfo.requestId, notebook.uri.path);
@@ -117,11 +119,6 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			const disposables = new DisposableStore();
 			disposables.add(ChatEditingNotebookFileSystemProvider.registerFile(originalUri, buffer));
 			const originalRef = await resolver.resolve(originalUri, notebook.viewType);
-			const loadedFromSnapshot = !!initialContent;
-			if (initialContent) {
-				restoreSnapshot(originalRef.object.notebook, initialContent);
-			}
-			initialContent = initialContent || createSnapshot(originalRef.object.notebook, options.serializer.options, configurationServie);
 			const modifiedCells = new ResourceMap<ITextModel>();
 			const originalCells = new ResourceMap<ITextModel>();
 			await Promise.all(resourceRef.object.notebook.cells.map(async cell => {
@@ -129,8 +126,25 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			}).concat(originalRef.object.notebook.cells.map(async cell => {
 				originalCells.set(cell.uri, disposables.add(await textModelService.createModelReference(cell.uri)).object.textEditorModel);
 			})));
-
-			const instance = instantiationService.createInstance(ChatEditingModifiedNotebookEntry, resourceRef, originalRef, modifiedCells, originalCells, _multiDiffEntryDelegate, options.serializer.options, telemetryInfo, chatKind, initialContent, loadedFromSnapshot);
+			const cellDiffInfo: CellDiffInfo[] = [];
+			if (initialContent) {
+				restoreSnapshot(originalRef.object.notebook, initialContent);
+				try {
+					const notebookDiff = await notebookEditorWorkerService.computeDiff(originalRef.object.resource, resourceRef.object.resource);
+					const result = computeDiff(originalRef.object.notebook, resourceRef.object.notebook, notebookDiff);
+					if (result.cellDiffInfo.length) {
+						cellDiffInfo.push(...result.cellDiffInfo);
+					}
+				} catch (ex) {
+					loggingService.error('Notebook Chat', 'Error computing diff:\n' + ex);
+				}
+			} else {
+				originalRef.object.notebook.cells.forEach((_, index) => {
+					cellDiffInfo.push({ type: 'unchanged', originalCellIndex: index, modifiedCellIndex: index });
+				});
+			}
+			initialContent = initialContent || createSnapshot(originalRef.object.notebook, options.serializer.options, configurationServie);
+			const instance = instantiationService.createInstance(ChatEditingModifiedNotebookEntry, resourceRef, originalRef, modifiedCells, originalCells, _multiDiffEntryDelegate, options.serializer.options, telemetryInfo, chatKind, initialContent, cellDiffInfo);
 			instance._register(disposables);
 			return instance;
 		});
@@ -160,16 +174,14 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		telemetryInfo: IModifiedEntryTelemetryInfo,
 		kind: ChatEditKind,
 		initialContent: string,
-		loadedFromSnapshot: boolean = false,
+		cellDiffInfo: CellDiffInfo[],
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IFilesConfigurationService fileConfigService: IFilesConfigurationService,
 		@IChatService chatService: IChatService,
 		@IFileService fileService: IFileService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ITextModelService private readonly textModelService: ITextModelService,
-		@IModelService private readonly modelService: IModelService,
-		@INotebookEditorWorkerService private readonly notebookEditorWorkerService: INotebookEditorWorkerService,
-		@INotebookLoggingService private readonly notebookLoggingService: INotebookLoggingService,
+		@IModelService private readonly modelService: IModelService
 	) {
 		super(modifiedResourceRef.object.notebook.uri, telemetryInfo, kind, configurationService, fileConfigService, chatService, fileService, instantiationService);
 		this._register(modifiedResourceRef);
@@ -180,48 +192,35 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		this.initialContent = initialContent;
 		this._register(this.modifiedModel.onDidChangeContent(this.mirrorNotebookEdits, this));
 		this._maxModifiedLineNumbers.set(this.modifiedModel.cells.map(() => 0), undefined);
-		this.createEmptyDiffs();
-		this.modifiedModel.cells.forEach((cell, index) => {
-			const originalModel = this.originalCellModels.get(this.originalModel.cells[index].uri)!;
-			this.modifiedToOriginalCellMap.set(cell.uri, originalModel);
-			this.getOrCreateModifiedTextFileEntryForCell(cell);
-		});
-		if (loadedFromSnapshot) {
-			this.computeDiff();
-		}
-	}
-
-	private async computeDiff() {
-		const cellDiffInfo: CellDiffInfo[] = [];
-		try {
-			const notebookDiff = await this.notebookEditorWorkerService.computeDiff(this.originalURI, this.modifiedURI);
-			const result = computeDiff(this.originalModel, this.modifiedModel, notebookDiff);
-			if (result.cellDiffInfo.length) {
-				cellDiffInfo.push(...result.cellDiffInfo);
-			} else {
-				return;
-			}
-		} catch (e) {
-			this.notebookLoggingService.error('Notebook Chat', 'Error computing diff:\n' + e);
-			return;
-		}
-		const diffs = await Promise.all(cellDiffInfo.map(async (diff, i) => {
+		const diffs = cellDiffInfo.map((diff, i) => {
 			switch (diff.type) {
-				case 'unchanged':
+				case 'unchanged': {
+					const modifiedCell = this.modifiedModel.cells[diff.modifiedCellIndex];
+					const originalCell = this.originalModel.cells[diff.originalCellIndex];
+					const originalCellModel = this.originalCellModels.get(originalCell.uri)!;
+					this.modifiedToOriginalCellMap.set(modifiedCell.uri, originalCellModel);
+					this.getOrCreateModifiedTextFileEntryForCell(modifiedCell);
 					return this.createUnchangedCellDiffInfo(diff.originalCellIndex, diff.modifiedCellIndex);
+				}
 				case 'delete':
 					return this.createDeleteCellDiffInfo(diff.originalCellIndex);
-				case 'insert':
-					return this.createInsertedCellDiffInfo(diff.modifiedCellIndex);
+				case 'insert': {
+					const cell = this.modifiedModel.cells[diff.modifiedCellIndex];
+					return this.createInsertedCellDiffInfo(diff.modifiedCellIndex, this.modifiedCellModels.get(cell.uri)!);
+				}
 				default: {
-					const cell = this.modifiedModel.cells[diff.modifiedCellIndex]!;
-					const entry = this.cellEntryMap.get(cell);
-					const originalCell = this.originalModel.cells[diff.originalCellIndex]!;
+					const modifiedCell = this.modifiedModel.cells[diff.modifiedCellIndex];
+					const originalCell = this.originalModel.cells[diff.originalCellIndex];
+					const orgiginalCellModel = this.originalCellModels.get(originalCell.uri)!;
+					this.modifiedToOriginalCellMap.set(modifiedCell.uri, orgiginalCellModel);
+					this.getOrCreateModifiedTextFileEntryForCell(modifiedCell);
+
+					const entry = this.cellEntryMap.get(modifiedCell);
 					const diff2: IDocumentDiff2 = {
 						...(entry?.diffInfo.get() ?? nullDocumentDiff),
 						keep: noopKeep,
 						undo: noopUndo,
-						modifiedModel: this.modifiedCellModels.get(cell.uri)!,
+						modifiedModel: this.modifiedCellModels.get(modifiedCell.uri)!,
 						originalModel: this.originalCellModels.get(originalCell.uri)!,
 					};
 					return {
@@ -232,10 +231,11 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 					} satisfies ICellDiffInfo;
 				}
 			}
-		}));
+		});
 		this._cellDiffInfo.set(diffs, undefined);
 		this._changesCount.set(countChanges(diffs), undefined);
 	}
+
 	createEmptyDiffs() {
 		this._cellDiffInfo.set(this.modifiedModel.cells.map((_, i) => this.createUnchangedCellDiffInfo(i, i)), undefined);
 	}
@@ -394,7 +394,9 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				}
 			});
 			const diffInsert = await Promise.all(edit.cells.map(async (c, i) => {
-				return this.createInsertedCellDiffInfo(edit.index + i);
+				const cell = this.modifiedModel.cells[edit.index + i];
+				const modifiedCellModel: ITextModel = cell.textModel ?? this._register((await this.textModelService.createModelReference(cell.uri))).object.textEditorModel;
+				return this.createInsertedCellDiffInfo(edit.index + i, modifiedCellModel);
 			}));
 			diff.splice(edit.index + 1, 0, ...diffInsert);
 			this._cellDiffInfo.set(sortCellChanges(diff), undefined);
@@ -420,21 +422,20 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		const cell = this.modifiedModel.cells[modifiedCellIndex];
 		return { modifiedCellIndex, originalCellIndex, diff: this.getDiffForUnchangedCell(cell), type: 'unchanged' };
 	}
-	async createInsertedCellDiffInfo(modifiedCellIndex: number): Promise<ICellDiffInfo> {
+	createInsertedCellDiffInfo(modifiedCellIndex: number, modifiedCellModel: ITextModel): ICellDiffInfo {
 		const cell = this.modifiedModel.cells[modifiedCellIndex];
 		const lines = cell.getValue().split(/\r?\n/);
 		const originalRange = new Range(1, 0, 1, 0);
 		const modifiedRange = new Range(1, 0, lines.length, lines[lines.length - 1].length);
 		const innerChanges = new RangeMapping(originalRange, modifiedRange);
 		const changes = [new DetailedLineRangeMapping(new LineRange(1, 1), new LineRange(1, lines.length), [innerChanges])];
-		const modifiedModel: ITextModel = cell.textModel ?? this._register((await this.textModelService.createModelReference(cell.uri))).object.textEditorModel;
 		// When a new cell is inserted, we use the ChatEditingCodeEditorIntegration to handle the edits.
 		// & to also display undo/redo and decorations.
 		// However that needs a modified and original model.
 		// For inserted cells there's no original model, so we create a new empty text model and pass that as the original.
 		const originalModelUri = this.modifiedModel.uri.with({ query: (ChatEditingModifiedNotebookEntry.NewModelCounter++).toString(), scheme: 'emptyCell' });
 		const originalModel = this.modelService.getModel(originalModelUri) || this._register(this.modelService.createModel('', null, originalModelUri));
-		this.modifiedCellModels.set(cell.uri, modifiedModel);
+		this.modifiedCellModels.set(cell.uri, modifiedCellModel);
 		this.modifiedToOriginalCellMap.set(cell.uri, originalModel);
 		const keep = async () => {
 			await this._applyEdits(async () => this.keepPreviouslyInsertedCell(cell));
@@ -458,7 +459,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				quitEarly: false,
 				keep,
 				undo,
-				modifiedModel,
+				modifiedModel: modifiedCellModel,
 				originalModel,
 			}
 		} satisfies ICellDiffInfo;
@@ -782,9 +783,36 @@ function restoreSnapshot(notebook: NotebookTextModel, snapshot: string): void {
 }
 
 export function serializeSnapshot(data: NotebookData, transientOptions: TransientOptions | undefined): string {
-	// No need to store the internal metadata, as this can contain unique information such as cell ids.
-	// Also its not something that can be persisted, hence no need to try to restore that either.
-	data.cells.forEach(cell => cell.internalMetadata = undefined);
+	data.cells.forEach(cell => {
+		const outputs = cell.outputs.map(output => {
+			// Ensure we're in full control of the data being stored.
+			// Possible we have classes instead of plain objects.
+			return {
+				outputId: output.outputId,
+				metadata: output.metadata,
+				outputs: output.outputs.map(item => {
+					return {
+						data: item.data,
+						mime: item.mime,
+					} satisfies IOutputItemDto;
+				}),
+			};
+		});
+		// Ensure we're in full control of the data being stored.
+		// Possible we have classes instead of plain objects.
+		return {
+			cellKind: cell.cellKind,
+			language: cell.language,
+			metadata: cell.metadata,
+			outputs,
+			mime: cell.mime,
+			source: cell.source,
+			collapseState: cell.collapseState,
+			// No need to store the internal metadata, as this can contain unique information such as cell ids.
+			// Also its not something that can be persisted, hence no need to try to restore that either.
+			internalMetadata: undefined
+		} satisfies ICellDto2;
+	});
 	return JSON.stringify([
 		JSON.stringify(transientOptions)
 		, JSON.stringify(data, (_key, value) => {

From 2c1752d5a1a08798c6335767a4e16bd2cfb5840b Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Tue, 25 Feb 2025 12:33:20 -0800
Subject: [PATCH 0375/1815] fix: hide attachments container when it has no
 children (#241947)

---
 .../workbench/contrib/chat/browser/chatInputPart.ts  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index e9dc55f3275b..e9507a1dd598 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -264,6 +264,8 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	private executeToolbar!: MenuWorkbenchToolBar;
 	private inputActionsToolbar!: MenuWorkbenchToolBar;
 
+	private addFilesToolbar: MenuWorkbenchToolBar | undefined;
+
 	get inputEditor() {
 		return this._inputEditor;
 	}
@@ -953,7 +955,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}));
 
 		if (this.options.renderWorkingSet) {
-			const attachmentToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, attachmentToolbarContainer, MenuId.ChatInputAttachmentToolbar, {
+			this.addFilesToolbar = this._register(this.instantiationService.createInstance(MenuWorkbenchToolBar, attachmentToolbarContainer, MenuId.ChatInputAttachmentToolbar, {
 				telemetrySource: this.options.menus.telemetrySource,
 				label: true,
 				menuOptions: { shouldForwardArgs: true, renderShortTitle: true },
@@ -968,8 +970,8 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 					return undefined;
 				}
 			}));
-			attachmentToolbar.context = { widget, placeholder: localize('chatAttachFiles', 'Search for files and context to add to your request') };
-			this._register(attachmentToolbar.onDidChangeMenuItems(() => {
+			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.layout(this.cachedDimensions.height, this.cachedDimensions.width);
 				}
@@ -989,7 +991,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		const hoverDelegate = store.add(createInstantHoverDelegate());
 
 		const attachments = [...this.attachmentModel.attachments.entries()];
-		dom.setVisibility(Boolean(attachments.length) || Boolean(this.implicitContext?.value) || !this.instructionAttachmentsPart.empty, this.attachedContextContainer);
+		dom.setVisibility(Boolean(attachments.length) || (this.addFilesToolbar && !this.addFilesToolbar.isEmpty()) || Boolean(this.implicitContext?.value) || !this.instructionAttachmentsPart.empty, this.attachmentsContainer);
 		if (!attachments.length) {
 			this._indexOfLastAttachedContextDeletedWithKeyboard = -1;
 		}
@@ -1522,7 +1524,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			inputPartEditorHeight: Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight),
 			inputPartHorizontalPadding: this.options.renderStyle === 'compact' ? 16 : 32,
 			inputPartVerticalPadding: this.options.renderStyle === 'compact' ? 12 : 28,
-			attachmentsHeight: this.attachmentsContainer.offsetHeight + 6,
+			attachmentsHeight: this.attachmentsContainer.offsetHeight + (this.attachmentsContainer.checkVisibility() ? 6 : 0),
 			editorBorder: 2,
 			inputPartHorizontalPaddingInside: 12,
 			toolbarsWidth: this.options.renderStyle === 'compact' ? executeToolbarWidth + executeToolbarPadding + inputToolbarWidth + inputToolbarPadding : 0,

From cc353c52c737081dd95147940e0bc13143c73f75 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Tue, 25 Feb 2025 21:49:23 +0100
Subject: [PATCH 0376/1815] Tree sitter force tokenize fixes (#241874)

Part of microsoft/vscode-internalbacklog#5352
---
 .../browser/treeSitterTokenizationFeature.ts  | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
index 055812bce28d..28652a63c900 100644
--- a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
@@ -335,7 +335,7 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 		return this._updateTreeForRanges(e.textModel, rangeChanges, e.versionId, captures).then(() => {
 			const tree = this._getTree(e.textModel);
 			if (!e.textModel.isDisposed() && (tree?.versionId === e.textModel.getVersionId())) {
-				this._refreshNeedsRefresh(e.textModel);
+				this._refreshNeedsRefresh(e.textModel, e.versionId);
 			}
 
 		});
@@ -370,7 +370,7 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 		}
 	}
 
-	private _refreshNeedsRefresh(textModel: ITextModel) {
+	private _refreshNeedsRefresh(textModel: ITextModel, versionId: number) {
 		const rangesToRefresh = this._tokenizationStoreService.getNeedsRefresh(textModel);
 		if (rangesToRefresh.length === 0) {
 			return;
@@ -386,7 +386,7 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 				oldRangeLength: range.endOffset - range.startOffset
 			};
 		}
-		this._handleTreeUpdate({ ranges: rangeChanges, textModel, versionId: textModel.getVersionId() });
+		this._handleTreeUpdate({ ranges: rangeChanges, textModel, versionId });
 	}
 
 	private _rangeTokensAsUpdates(rangeOffset: number, endOffsetToken: EndOffsetToken[], startingOffsetInArray?: number) {
@@ -506,7 +506,9 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 			return undefined;
 		}
 		const updates = this._rangeTokensAsUpdates(textModel.getOffsetAt({ lineNumber, column: 1 }), tokens.result);
-		this._tokenizationStoreService.updateTokens(textModel, textModel.getVersionId(), [{ newTokens: updates, oldRangeLength: textModel.getLineLength(lineNumber) }], TokenQuality.Accurate);
+		if (tokens.versionId === textModel.getVersionId()) {
+			this._tokenizationStoreService.updateTokens(textModel, tokens.versionId, [{ newTokens: updates, oldRangeLength: textModel.getLineLength(lineNumber) }], TokenQuality.Accurate);
+		}
 	}
 
 	public tokenizeEncodedInstrumented(lineNumber: number, textModel: ITextModel): { result: Uint32Array; captureTime: number; metadataTime: number } | undefined {
@@ -523,9 +525,13 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 		return { tree, captures };
 	}
 
-	private _tokenize(encodedLanguageId: LanguageId, range: Range, rangeStartOffset: number, rangeEndOffset: number, textModel: ITextModel): { endOffsetsAndMetadata: { endOffset: number; metadata: number }[]; captureTime: number; metadataTime: number } | undefined {
+	private _tokenize(encodedLanguageId: LanguageId, range: Range, rangeStartOffset: number, rangeEndOffset: number, textModel: ITextModel): { endOffsetsAndMetadata: { endOffset: number; metadata: number }[]; versionId: number; captureTime: number; metadataTime: number } | undefined {
 		const { tree, captures } = this._getTreeAndCaptures(range, textModel);
-		return this._tokenizeCapturesWithMetadata(tree?.tree, captures, encodedLanguageId, rangeStartOffset, rangeEndOffset);
+		const result = this._tokenizeCapturesWithMetadata(tree?.tree, captures, encodedLanguageId, rangeStartOffset, rangeEndOffset);
+		if (!tree || !result) {
+			return undefined;
+		}
+		return { ...result, versionId: tree.versionId };
 	}
 
 	private _createTokensFromCaptures(tree: Parser.Tree | undefined, captures: QueryCapture[], rangeStartOffset: number, rangeEndOffset: number): { endOffsets: EndOffsetAndScopes[]; captureTime: number } | undefined {
@@ -695,18 +701,18 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 		return findMetadata(this._colorThemeData, [], encodedLanguageId, false);
 	}
 
-	private _tokenizeEncoded(lineNumber: number, textModel: ITextModel): { result: EndOffsetToken[]; captureTime: number; metadataTime: number } | undefined {
+	private _tokenizeEncoded(lineNumber: number, textModel: ITextModel): { result: EndOffsetToken[]; captureTime: number; metadataTime: number; versionId: number } | undefined {
 		const encodedLanguageId = this._languageIdCodec.encodeLanguageId(this._languageId);
 		const lineOffset = textModel.getOffsetAt({ lineNumber: lineNumber, column: 1 });
 		const maxLine = textModel.getLineCount();
 		const lineEndOffset = (lineNumber + 1 <= maxLine) ? textModel.getOffsetAt({ lineNumber: lineNumber + 1, column: 1 }) : textModel.getValueLength();
 		const lineLength = lineEndOffset - lineOffset;
 
-		const result = this._tokenize(encodedLanguageId, new Range(lineNumber, 1, lineNumber, lineLength), lineOffset, lineEndOffset, textModel);
+		const result = this._tokenize(encodedLanguageId, new Range(lineNumber, 1, lineNumber, lineLength + 1), lineOffset, lineEndOffset, textModel);
 		if (!result) {
 			return undefined;
 		}
-		return { result: result.endOffsetsAndMetadata, captureTime: result.captureTime, metadataTime: result.metadataTime };
+		return { result: result.endOffsetsAndMetadata, captureTime: result.captureTime, metadataTime: result.metadataTime, versionId: result.versionId };
 	}
 
 	private _endOffsetTokensToUint32Array(endOffsetsAndMetadata: EndOffsetToken[]): Uint32Array {

From 497645a3f70e3f0780474cec256f788f34200f92 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Tue, 25 Feb 2025 21:51:51 +0100
Subject: [PATCH 0377/1815] Git - rename "untrackedChangesSoftDelete" to
 "untrackedChangesEnableTrash" (#241953)

---
 extensions/git/package.json      | 4 ++--
 extensions/git/package.nls.json  | 2 +-
 extensions/git/src/commands.ts   | 8 ++++----
 extensions/git/src/repository.ts | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extensions/git/package.json b/extensions/git/package.json
index 06f40d948a12..e35d19e0fb05 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3323,10 +3323,10 @@
           "markdownDescription": "%config.diagnosticsCommitHook.Sources%",
           "scope": "resource"
         },
-        "git.untrackedChangesSoftDelete": {
+        "git.untrackedChangesEnableTrash": {
           "type": "boolean",
           "default": true,
-          "markdownDescription": "%config.untrackedChangesSoftDelete%"
+          "markdownDescription": "%config.untrackedChangesEnableTrash%"
         }
       }
     },
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index 08b0cc49ed57..dcd6783a735a 100644
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -288,7 +288,7 @@
 	"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`.",
-	"config.untrackedChangesSoftDelete": "Controls whether discarding untracked changes moves the file(s) to the Recycle Bin (Windows), Trash (macOS, Linux) instead of deleting them. **Note:** This setting has no effect when connected to a remote.",
+	"config.untrackedChangesEnableTrash": "Controls whether discarding untracked changes moves the file(s) to the Recycle Bin (Windows), Trash (macOS, Linux) instead of deleting them permanently. **Note:** This setting has no effect when connected to a remote.",
 	"submenu.explorer": "Git",
 	"submenu.commit": "Commit",
 	"submenu.commit.amend": "Amend",
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index b09e6d5a6c55..43746097e20f 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -2175,9 +2175,9 @@ export class CommandCenter {
 
 	private getDiscardUntrackedChangesDialogDetails(resources: Resource[]): [string, string, string] {
 		const config = workspace.getConfiguration('git');
-		const untrackedChangesSoftDelete = config.get<boolean>('untrackedChangesSoftDelete', true) && !isRemote;
+		const untrackedChangesEnableTrash = config.get<boolean>('untrackedChangesEnableTrash', true) && !isRemote;
 
-		const messageWarning = !untrackedChangesSoftDelete
+		const messageWarning = !untrackedChangesEnableTrash
 			? resources.length === 1
 				? '\n\nThis is IRREVERSIBLE!\nThis file will be FOREVER LOST if you proceed.'
 				: '\n\nThis is IRREVERSIBLE!\nThese files will be FOREVER LOST if you proceed.'
@@ -2187,7 +2187,7 @@ export class CommandCenter {
 			? l10n.t('Are you sure you want to DELETE the following untracked file: \'{0}\'?{1}', path.basename(resources[0].resourceUri.fsPath), messageWarning)
 			: l10n.t('Are you sure you want to DELETE the {0} untracked files?{1}', resources.length, messageWarning);
 
-		const messageDetail = untrackedChangesSoftDelete
+		const messageDetail = untrackedChangesEnableTrash
 			? isWindows
 				? resources.length === 1
 					? 'You can restore this file from the Recycle Bin.'
@@ -2197,7 +2197,7 @@ export class CommandCenter {
 					: 'You can restore these files from the Trash.'
 			: '';
 
-		const primaryAction = untrackedChangesSoftDelete
+		const primaryAction = untrackedChangesEnableTrash
 			? isWindows
 				? l10n.t('Move to Recycle Bin')
 				: l10n.t('Move to Trash')
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 2f164ee5ede1..ac1832aada90 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -1349,7 +1349,7 @@ export class Repository implements Disposable {
 
 	async clean(resources: Uri[]): Promise<void> {
 		const config = workspace.getConfiguration('git');
-		const untrackedChangesSoftDelete = config.get<boolean>('untrackedChangesSoftDelete', true) && !isRemote;
+		const untrackedChangesEnableTrash = config.get<boolean>('untrackedChangesEnableTrash', true) && !isRemote;
 
 		await this.run(
 			Operation.Clean(!this.optimisticUpdateEnabled()),
@@ -1388,7 +1388,7 @@ export class Repository implements Disposable {
 					}
 				});
 
-				if (untrackedChangesSoftDelete) {
+				if (untrackedChangesEnableTrash) {
 					const limiter = new Limiter<void>(5);
 					await Promise.all(toClean.map(fsPath => limiter.queue(
 						async () => await workspace.fs.delete(Uri.file(fsPath), { useTrash: true }))));

From ea5802dc2a5ee57f950f036f42df34fa07da3e43 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Tue, 25 Feb 2025 12:57:29 -0800
Subject: [PATCH 0378/1815] Ensure we use basename of title to detect shell
 type

Fixes #241946
---
 src/vs/platform/terminal/node/terminalProcess.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/vs/platform/terminal/node/terminalProcess.ts b/src/vs/platform/terminal/node/terminalProcess.ts
index 1fff426753ac..90b4683f8d9e 100644
--- a/src/vs/platform/terminal/node/terminalProcess.ts
+++ b/src/vs/platform/terminal/node/terminalProcess.ts
@@ -418,7 +418,12 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		this._currentTitle = (ptyProcess.process ?? '');
 		this._onDidChangeProperty.fire({ type: ProcessPropertyType.Title, value: this._currentTitle });
 		// If fig is installed it may change the title of the process
-		const sanitizedTitle = this.currentTitle.replace(/ \(figterm\)$/g, '');
+		let sanitizedTitle = this.currentTitle.replace(/ \(figterm\)$/g, '');
+		// Ensure any prefixed path is removed so that the executable name since we use this to
+		// detect the shell type
+		if (!isWindows) {
+			sanitizedTitle = path.basename(sanitizedTitle);
+		}
 
 		if (sanitizedTitle.toLowerCase().startsWith('python')) {
 			this._onDidChangeProperty.fire({ type: ProcessPropertyType.ShellType, value: GeneralShellType.Python });

From 360dedd945c18c79adeb1352393dec8ce7ccf480 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Tue, 25 Feb 2025 13:00:29 -0800
Subject: [PATCH 0379/1815] Add 'powershell' to the list of titles

---
 src/vs/platform/terminal/node/terminalProcess.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/platform/terminal/node/terminalProcess.ts b/src/vs/platform/terminal/node/terminalProcess.ts
index 90b4683f8d9e..e33d5beccb36 100644
--- a/src/vs/platform/terminal/node/terminalProcess.ts
+++ b/src/vs/platform/terminal/node/terminalProcess.ts
@@ -78,6 +78,7 @@ const posixShellTypeMap = new Map<string, PosixShellType>([
 
 const generalShellTypeMap = new Map<string, GeneralShellType>([
 	['pwsh', GeneralShellType.PowerShell],
+	['powershell', GeneralShellType.PowerShell],
 	['python', GeneralShellType.Python],
 	['julia', GeneralShellType.Julia],
 	['nu', GeneralShellType.NuShell],

From 9bbae57b73c9f128fa5b7664cf7b9f09312bd588 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Tue, 25 Feb 2025 16:44:55 -0600
Subject: [PATCH 0380/1815] ensure window title is updated (considered custom)
 when in screen reader mode (#241908)

fix issues with window title var
---
 src/vs/workbench/browser/parts/titlebar/windowTitle.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vs/workbench/browser/parts/titlebar/windowTitle.ts b/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
index aa7cb6da5c35..62760bad1fee 100644
--- a/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
+++ b/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
@@ -413,6 +413,11 @@ export class WindowTitle extends Disposable {
 	}
 
 	isCustomTitleFormat(): boolean {
+		if (this.accessibilityService.isScreenReaderOptimized()) {
+			// We add activeEditorState by default when screen reader optimized,
+			// make sure that gets applied
+			return true;
+		}
 		const title = this.configurationService.inspect<string>(WindowSettingNames.title);
 		const titleSeparator = this.configurationService.inspect<string>(WindowSettingNames.titleSeparator);
 

From 2dbfd1e50a302e2bef0e307142b4da5f967dd2ac Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Tue, 25 Feb 2025 16:54:35 -0600
Subject: [PATCH 0381/1815] save zsh builtin command descriptions to ts file vs
 json (#241967)

---
 .eslint-ignore                                |  1 +
 build/filters.js                              |  3 +-
 .../scripts/pullZshBuiltins.ts                | 15 +++++---
 extensions/terminal-suggest/src/shell/zsh.ts  | 34 ++++++++-----------
 ...BuiltinsCache.json => zshBuiltinsCache.ts} | 10 ++++--
 5 files changed, 37 insertions(+), 26 deletions(-)
 rename extensions/terminal-suggest/src/shell/{zshBuiltinsCache.json => zshBuiltinsCache.ts} (99%)

diff --git a/.eslint-ignore b/.eslint-ignore
index 91b5117c20a8..233c9b3e6146 100644
--- a/.eslint-ignore
+++ b/.eslint-ignore
@@ -13,6 +13,7 @@
 **/extensions/notebook-renderers/renderer-out/index.js
 **/extensions/simple-browser/media/index.js
 **/extensions/terminal-suggest/src/completions/upstream/**
+**/extensions/terminal-suggest/src/shell/zshBuiltinsCache.ts
 **/extensions/terminal-suggest/third_party/**
 **/extensions/typescript-language-features/test-workspace/**
 **/extensions/typescript-language-features/extension.webpack.config.js
diff --git a/build/filters.js b/build/filters.js
index 1d18e0c942a1..716d7be104c9 100644
--- a/build/filters.js
+++ b/build/filters.js
@@ -89,7 +89,7 @@ module.exports.indentationFilter = [
 	'!test/automation/out/**',
 	'!test/monaco/out/**',
 	'!test/smoke/out/**',
-	'!extensions/terminal-suggest/src/shell/zshBuiltinsCache.json',
+	'!extensions/terminal-suggest/src/shell/zshBuiltinsCache.ts',
 	'!extensions/terminal-suggest/src/completions/upstream/**',
 	'!extensions/typescript-language-features/test-workspace/**',
 	'!extensions/typescript-language-features/resources/walkthroughs/**',
@@ -194,6 +194,7 @@ module.exports.tsFormattingFilter = [
 	'!extensions/vscode-api-tests/testWorkspace2/**',
 	'!extensions/**/*.test.ts',
 	'!extensions/html-language-features/server/lib/jquery.d.ts',
+	'!extensions/terminal-suggest/src/shell/zshBuiltinsCache.ts',
 ];
 
 module.exports.eslintFilter = [
diff --git a/extensions/terminal-suggest/scripts/pullZshBuiltins.ts b/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
index 30878aa11548..cedfc85cd138 100644
--- a/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
+++ b/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
@@ -248,14 +248,21 @@ const main = async () => {
 			console.log('\x1b[31mmissing short description for commands:\n' + missingShortDescription.join('\n') + '\x1b[0m');
 		}
 
-		// Save the cache to a JSON file
-		const cacheFilePath = path.join(__dirname, '../src/shell/zshBuiltinsCache.json');
+		// Save the cache to a TypeScript file
+		const cacheFilePath = path.join(__dirname, '../src/shell/zshBuiltinsCache.ts');
 		const cacheObject = Object.fromEntries(zshBuiltinsCommandDescriptionsCache);
-		await fs.writeFile(cacheFilePath, JSON.stringify(cacheObject, null, 2), 'utf8');
-		console.log('saved command descriptions cache to zshBuiltinsCache.json with ', Object.keys(cacheObject).length, 'entries');
+		const tsContent = `${copyright}\n\nexport const zshBuiltinsCommandDescriptionsCache = ${JSON.stringify(cacheObject, null, 2)} as const;`;
+		await fs.writeFile(cacheFilePath, tsContent, 'utf8');
+		console.log('saved command descriptions cache to zshBuiltinsCache.ts with ', Object.keys(cacheObject).length, 'entries');
 	} catch (error) {
 		console.error('Error:', error);
 	}
 };
 
+const copyright = `
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/`;
+
 main();
diff --git a/extensions/terminal-suggest/src/shell/zsh.ts b/extensions/terminal-suggest/src/shell/zsh.ts
index 7718b4a1c162..989d49a51fe3 100644
--- a/extensions/terminal-suggest/src/shell/zsh.ts
+++ b/extensions/terminal-suggest/src/shell/zsh.ts
@@ -7,10 +7,9 @@ import * as vscode from 'vscode';
 import type { ICompletionResource } from '../types';
 import { execHelper, getAliasesHelper } from './common';
 import { type ExecOptionsWithStringEncoding } from 'node:child_process';
-import * as path from 'path';
-import * as fs from 'fs';
+import { zshBuiltinsCommandDescriptionsCache } from './zshBuiltinsCache';
 
-let zshBuiltinsCommandDescriptionsCache: Map<string, { shortDescription?: string; description: string; args: string | undefined }> | undefined;
+const commandDescriptionsCache: Map<string, { shortDescription?: string; description: string; args: string | undefined }> | undefined = parseCache(zshBuiltinsCommandDescriptionsCache);
 
 export async function getZshGlobals(options: ExecOptionsWithStringEncoding, existingCommands?: Set<string>): Promise<(string | ICompletionResource)[]> {
 	return [
@@ -39,22 +38,8 @@ async function getBuiltins(
 		});
 	}
 
-	if (!zshBuiltinsCommandDescriptionsCache) {
-		const cacheFilePath = path.join(__dirname, 'zshBuiltinsCache.json');
-		if (fs.existsSync(cacheFilePath)) {
-			try {
-				const cacheFileContent = fs.readFileSync(cacheFilePath, 'utf8');
-				const cacheObject = JSON.parse(cacheFileContent);
-				zshBuiltinsCommandDescriptionsCache = new Map(Object.entries(cacheObject));
-			} catch (e) {
-				console.error('Failed to load zsh builtins cache', e);
-			}
-		} else {
-			console.warn('zsh builtins cache not found');
-		}
-	}
 
-	for (const cmd of zshBuiltinsCommandDescriptionsCache?.keys() ?? []) {
+	for (const cmd of commandDescriptionsCache?.keys() ?? []) {
 		if (typeof cmd === 'string') {
 			try {
 				const result = getCommandDescription(cmd);
@@ -83,7 +68,7 @@ export function getCommandDescription(command: string): { documentation?: string
 	if (!zshBuiltinsCommandDescriptionsCache) {
 		return undefined;
 	}
-	const result = zshBuiltinsCommandDescriptionsCache?.get(command);
+	const result = commandDescriptionsCache?.get(command);
 	if (result?.shortDescription) {
 		return {
 			description: result.shortDescription,
@@ -98,3 +83,14 @@ export function getCommandDescription(command: string): { documentation?: string
 		};
 	}
 }
+
+function parseCache(cache: Object): Map<string, { shortDescription?: string; description: string; args: string | undefined }> | undefined {
+	if (!cache) {
+		return undefined;
+	}
+	const result = new Map<string, { shortDescription?: string; description: string; args: string | undefined }>();
+	for (const [key, value] of Object.entries(cache)) {
+		result.set(key, value);
+	}
+	return result;
+}
diff --git a/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json b/extensions/terminal-suggest/src/shell/zshBuiltinsCache.ts
similarity index 99%
rename from extensions/terminal-suggest/src/shell/zshBuiltinsCache.json
rename to extensions/terminal-suggest/src/shell/zshBuiltinsCache.ts
index 62b17d69f0a7..6626192ce987 100644
--- a/extensions/terminal-suggest/src/shell/zshBuiltinsCache.json
+++ b/extensions/terminal-suggest/src/shell/zshBuiltinsCache.ts
@@ -1,4 +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 const zshBuiltinsCommandDescriptionsCache = {
   ".": {
     "shortDescription": "Source a file",
     "description": ":   Read commands from *file* and execute them in the current shell environment.\n\n    If *file* does not contain a slash, or if **PATH_DIRS** is set, the shell looks in the components of **\\$path** to find the directory containing *file*. Files in the current directory are not read unless `**.**` appears somewhere in **\\$path**. If a file named `*file***.zwc**` is found, is newer than *file*, and is the compiled form (created with the **zcompile** builtin) of *file*, then commands are read from that file instead of *file*.\n\n    If any arguments *arg* are given, they become the positional parameters; the old positional parameters are restored when the *file* is done executing. However, if no arguments are given, the positional parameters remain those of the calling context, and no restoring is done.\n\n    If *file* was not found the return status is 127; if *file* was found but contained a syntax error the return status is 126; else the return status is the exit status of the last command executed.",
@@ -534,4 +540,4 @@
     "description": ":   See the section `The zsh/net/tcp Module` in *zshmodules(1).*",
     "args": "ztcp"
   }
-}
\ No newline at end of file
+} as const;
\ No newline at end of file

From ad12a38732458194233deadd21b38a27667740c5 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 25 Feb 2025 12:45:51 -0800
Subject: [PATCH 0382/1815] chat: fix send button not active when paused

Fixes #241834
---
 .../browser/actions/chatExecuteActions.ts     | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index 4118e2156acd..ef9515f6e702 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -45,6 +45,8 @@ abstract class SubmitAction extends Action2 {
 	}
 }
 
+const whenNotInProgressOrPaused = ContextKeyExpr.or(ChatContextKeys.isRequestPaused, ChatContextKeys.requestInProgress.negate());
+
 export class ChatSubmitAction extends SubmitAction {
 	static readonly ID = 'workbench.action.chat.submit';
 
@@ -53,7 +55,7 @@ export class ChatSubmitAction extends SubmitAction {
 			// 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.instructionsAttached),
-			ChatContextKeys.requestInProgress.negate(),
+			whenNotInProgressOrPaused,
 			ChatContextKeys.location.notEqualsTo(ChatAgentLocation.EditingSession),
 		);
 
@@ -79,7 +81,7 @@ export class ChatSubmitAction extends SubmitAction {
 					id: MenuId.ChatExecute,
 					order: 4,
 					when: ContextKeyExpr.and(
-						ContextKeyExpr.or(ChatContextKeys.isRequestPaused, ChatContextKeys.requestInProgress.negate()),
+						whenNotInProgressOrPaused,
 						ChatContextKeys.location.notEqualsTo(ChatAgentLocation.EditingSession),
 					),
 					group: 'navigation',
@@ -215,7 +217,7 @@ export class ChatEditingSessionSubmitAction extends SubmitAction {
 			// 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.instructionsAttached),
-			ChatContextKeys.requestInProgress.negate(),
+			whenNotInProgressOrPaused,
 			ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
 		);
 
@@ -235,13 +237,13 @@ export class ChatEditingSessionSubmitAction extends SubmitAction {
 				{
 					id: MenuId.ChatExecuteSecondary,
 					group: 'group_1',
-					when: ContextKeyExpr.and(ContextKeyExpr.or(ChatContextKeys.isRequestPaused, ChatContextKeys.requestInProgress.negate()), ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)),
+					when: ContextKeyExpr.and(whenNotInProgressOrPaused, ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)),
 					order: 1
 				},
 				{
 					id: MenuId.ChatExecute,
 					order: 4,
-					when: ContextKeyExpr.and(ContextKeyExpr.or(ChatContextKeys.isRequestPaused, ChatContextKeys.requestInProgress.negate()), ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)),
+					when: ContextKeyExpr.and(whenNotInProgressOrPaused, ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)),
 					group: 'navigation',
 				},
 			]
@@ -257,7 +259,7 @@ class SubmitWithoutDispatchingAction extends Action2 {
 			// 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.instructionsAttached),
-			ContextKeyExpr.or(ChatContextKeys.isRequestPaused, ChatContextKeys.requestInProgress.negate()),
+			whenNotInProgressOrPaused,
 			ContextKeyExpr.and(ContextKeyExpr.or(
 				ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel),
 				ChatContextKeys.location.isEqualTo(ChatAgentLocation.Editor),
@@ -323,7 +325,7 @@ export class ChatSubmitSecondaryAgentAction extends Action2 {
 			// without text present - having instructions is enough context for a request
 			ContextKeyExpr.or(ChatContextKeys.inputHasText, ChatContextKeys.instructionsAttached),
 			ChatContextKeys.inputHasAgent.negate(),
-			ContextKeyExpr.or(ChatContextKeys.isRequestPaused, ChatContextKeys.requestInProgress.negate()),
+			whenNotInProgressOrPaused,
 		);
 
 		super({
@@ -374,7 +376,7 @@ class SendToChatEditingAction extends EditingSessionAction {
 			// without text present - having instructions is enough context for a request
 			ContextKeyExpr.or(ChatContextKeys.inputHasText, ChatContextKeys.instructionsAttached),
 			ChatContextKeys.inputHasAgent.negate(),
-			ContextKeyExpr.or(ChatContextKeys.isRequestPaused, ChatContextKeys.requestInProgress.negate()),
+			whenNotInProgressOrPaused,
 		);
 
 		super({
@@ -464,7 +466,7 @@ class SendToNewChatAction extends Action2 {
 			// 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.instructionsAttached),
-			ContextKeyExpr.or(ChatContextKeys.isRequestPaused, ChatContextKeys.requestInProgress.negate()),
+			whenNotInProgressOrPaused,
 		);
 
 		super({

From 9733f26f01c06b02e9028c0310d658d2c55098cd Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 25 Feb 2025 12:58:01 -0800
Subject: [PATCH 0383/1815] chat: make the play/pause/send button 'trimodal'

- Stop and pause shown when a request is running
- Resume is shown when paused and the input is empty
- Send is shown when paused with input

Fixes #241808
---
 .../contrib/chat/browser/actions/chatExecuteActions.ts   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index ef9515f6e702..d6d800abf468 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -194,6 +194,7 @@ export class ToggleRequestPausedAction extends Action2 {
 						ChatContextKeys.canRequestBePaused,
 						ChatContextKeys.Editing.agentMode,
 						ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
+						ContextKeyExpr.or(ChatContextKeys.isRequestPaused.negate(), ChatContextKeys.inputHasText.negate()),
 					),
 					group: 'navigation',
 				},
@@ -243,7 +244,13 @@ export class ChatEditingSessionSubmitAction extends SubmitAction {
 				{
 					id: MenuId.ChatExecute,
 					order: 4,
-					when: ContextKeyExpr.and(whenNotInProgressOrPaused, ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)),
+					when: ContextKeyExpr.and(
+						ContextKeyExpr.or(
+							ContextKeyExpr.and(ChatContextKeys.isRequestPaused, ChatContextKeys.inputHasText),
+							ChatContextKeys.requestInProgress.negate(),
+						),
+						ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
+					),
 					group: 'navigation',
 				},
 			]

From 84acc0673528d5f8dd0d324e2e851d3b99ee0528 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 25 Feb 2025 12:58:29 -0800
Subject: [PATCH 0384/1815] chat: enable pause for stable

---
 src/vs/workbench/contrib/chat/browser/chatWidget.ts | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index e883ca52781e..65c48bcdd25e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -12,7 +12,7 @@ import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { FuzzyScore } from '../../../../base/common/filters.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable, combinedDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { combinedDisposable, 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 { autorunWithStore, observableFromEvent, observableValue } from '../../../../base/common/observable.js';
@@ -32,7 +32,6 @@ import { ServiceCollection } from '../../../../platform/instantiation/common/ser
 import { WorkbenchObjectTree } from '../../../../platform/list/browser/listService.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { bindContextKey } from '../../../../platform/observable/common/platformObservableUtils.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 { buttonSecondaryBackground, buttonSecondaryForeground, buttonSecondaryHoverBackground } from '../../../../platform/theme/common/colorRegistry.js';
@@ -42,7 +41,7 @@ import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentService
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { applyingChatEditsFailedContextKey, decidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, IChatEditingService, IChatEditingSession, inChatEditingSessionContextKey, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../common/chatEditingService.js';
 import { ChatPauseState, IChatModel, IChatRequestVariableEntry, IChatResponseModel } from '../common/chatModel.js';
-import { ChatRequestAgentPart, IParsedChatRequest, chatAgentLeader, chatSubcommandLeader, formatChatQuestion } from '../common/chatParserTypes.js';
+import { chatAgentLeader, ChatRequestAgentPart, chatSubcommandLeader, formatChatQuestion, IParsedChatRequest } from '../common/chatParserTypes.js';
 import { ChatRequestParser } from '../common/chatRequestParser.js';
 import { IChatFollowup, IChatLocationData, IChatSendRequestOptions, IChatService } from '../common/chatService.js';
 import { IChatSlashCommandService } from '../common/chatSlashCommands.js';
@@ -238,7 +237,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		@IChatEditingService chatEditingService: IChatEditingService,
 		@IStorageService private readonly storageService: IStorageService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IProductService private readonly productService: IProductService,
 	) {
 		super();
 
@@ -952,10 +950,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 			this.requestInProgress.set(this.viewModel.requestInProgress);
 			this.isRequestPaused.set(this.viewModel.requestPausibility === ChatPauseState.Paused);
-			// todo@connor4312: disabled for stable 1.97 release.
-			if (this.productService.quality !== 'stable') {
-				this.canRequestBePaused.set(this.viewModel.requestPausibility !== ChatPauseState.NotPausable);
-			}
+			this.canRequestBePaused.set(this.viewModel.requestPausibility !== ChatPauseState.NotPausable);
 
 			this.onDidChangeItems();
 			if (events.some(e => e?.kind === 'addRequest') && this.visible) {

From 56a60e9441633d3820c8bd6f93088b6061267535 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 25 Feb 2025 13:04:31 -0800
Subject: [PATCH 0385/1815] chat: always show paused indicator for incomplete
 requests when paused

Closes #241835
---
 src/vs/workbench/contrib/chat/browser/chatListRenderer.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index 8d1682e18c5f..9c9c7c1d933f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -816,6 +816,10 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			return false;
 		}
 
+		if (element.model.isPaused.get()) {
+			return true;
+		}
+
 		// 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 = partsToRender.at(-1);
 		if (!lastPart || lastPart.kind === 'references' || (lastPart.kind === 'toolInvocation' && lastPart.isComplete) || (lastPart.kind === 'textEditGroup' && lastPart.done && !partsToRender.some(part => part.kind === 'toolInvocation' && !part.isComplete))) {

From bc970a19d6350cb6a2aab6bce8ceecd440ed4b7e Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 25 Feb 2025 13:49:55 -0800
Subject: [PATCH 0386/1815] chat: make the default state for modified files
 'attached'

This allows undoing to an unmodified state, fixes #241896
---
 .../chat/browser/chatEditing/chatEditingModifiedFileEntry.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
index cf67b39bf99a..1a7707ea3bc8 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
@@ -49,7 +49,7 @@ export abstract class AbstractChatEditingModifiedFileEntry extends Disposable im
 	protected readonly _onDidDelete = this._register(new Emitter<void>());
 	readonly onDidDelete = this._onDidDelete.event;
 
-	protected readonly _stateObs = observableValue<WorkingSetEntryState>(this, WorkingSetEntryState.Modified);
+	protected readonly _stateObs = observableValue<WorkingSetEntryState>(this, WorkingSetEntryState.Attached);
 	readonly state: IObservable<WorkingSetEntryState> = this._stateObs;
 
 	protected readonly _isCurrentlyBeingModifiedByObs = observableValue<IChatResponseModel | undefined>(this, undefined);

From 19dbb258bd2565c5aa7b8c9c1de6128391372023 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 25 Feb 2025 14:26:10 -0800
Subject: [PATCH 0387/1815] chat: clean up attachment problems label

Fixes https://github.com/microsoft/vscode-copilot/issues/13505
---
 src/vs/workbench/contrib/chat/common/chatModel.ts | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index a62958b43673..2bb6ed0b1002 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -105,16 +105,9 @@ export namespace IDiagnosticVariableEntryFilterData {
 	}
 
 	export function label(data: IDiagnosticVariableEntryFilterData) {
-		let labelStr: string;
-		if (data.filterSeverity) {
-			const sev = data.filterRange ? MarkerSeverity.toString(data.filterSeverity) : MarkerSeverity.toStringPlural(data.filterSeverity);
-			labelStr = data.filterUri
-				? localize('chat.attachment.problems.severity', "{0} in {1}", sev, basename(data.filterUri))
-				: localize('chat.attachment.problems.severity2', "All {0}", sev);
-		} else {
-			labelStr = data.filterUri
-				? localize('chat.attachment.problems.severity3', "Problems in {0}", basename(data.filterUri))
-				: localize('chat.attachment.problems.severity4', "All Problems");
+		let labelStr = localize('chat.attachment.problems.all', "All Problems");
+		if (data.filterUri) {
+			labelStr = localize('chat.attachment.problems.inFile', "Problems in {0}", basename(data.filterUri));
 		}
 
 		return labelStr;

From 63fd37c8606ef34eba18aae67dc54ece1715f273 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 25 Feb 2025 14:28:48 -0800
Subject: [PATCH 0388/1815] chat: add icon to problem attachment pill

Fixes https://github.com/microsoft/vscode-copilot/issues/13508
---
 .../contrib/chat/browser/actions/chatContextActions.ts         | 1 +
 src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts       | 1 +
 src/vs/workbench/contrib/chat/common/chatModel.ts              | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index 071c06552f4d..b37482e8b9c1 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -851,6 +851,7 @@ export class AttachContextAction extends Action2 {
 			kind: 'diagnostic-filter',
 			id: IDiagnosticVariableEntryFilterData.id(filter),
 			label: IDiagnosticVariableEntryFilterData.label(filter),
+			icon: IDiagnosticVariableEntryFilterData.icon,
 			filter,
 		};
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
index da5d68df4447..134e6a0f9a11 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
@@ -394,6 +394,7 @@ export class ChatDragAndDrop extends Themable {
 				kind: 'diagnostic',
 				id: IDiagnosticVariableEntryFilterData.id(filter),
 				name: IDiagnosticVariableEntryFilterData.label(filter),
+				icon: IDiagnosticVariableEntryFilterData.icon,
 				value: filter,
 				...filter,
 			};
diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index 2bb6ed0b1002..e95e6906cf03 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -5,6 +5,7 @@
 
 import { asArray } from '../../../../base/common/arrays.js';
 import { DeferredPromise } from '../../../../base/common/async.js';
+import { Codicon } from '../../../../base/common/codicons.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';
@@ -104,6 +105,8 @@ export namespace IDiagnosticVariableEntryFilterData {
 		return [data.filterUri, data.filterSeverity, data.filterRange?.startLineNumber].join(':');
 	}
 
+	export const icon = Codicon.warning;
+
 	export function label(data: IDiagnosticVariableEntryFilterData) {
 		let labelStr = localize('chat.attachment.problems.all', "All Problems");
 		if (data.filterUri) {

From 7a5a3b31e9d9014709185d9e106c58e7b02a80f2 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 25 Feb 2025 14:45:32 -0800
Subject: [PATCH 0389/1815] chat: allow picking multiple problems

Fixes https://github.com/microsoft/vscode-copilot/issues/13500
---
 .../browser/actions/chatContextActions.ts     | 29 ++++++++++---------
 .../contrib/chat/browser/chatDragAndDrop.ts   |  6 +---
 .../browser/contrib/chatDynamicVariables.ts   | 18 ++++++++++--
 .../contrib/chat/common/chatModel.ts          | 11 +++++++
 4 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index b37482e8b9c1..cc56343cd58e 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -841,29 +841,32 @@ export class AttachContextAction extends Action2 {
 		}), clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, textModelService, instantiationService, '', context?.placeholder);
 	}
 
-	private async _showDiagnosticsPick(instantiationService: IInstantiationService): Promise<IDiagnosticsQuickPickItemWithFilter | undefined> {
-		const filter = await instantiationService.invokeFunction(accessor => createMarkersQuickPick(accessor));
-		if (!filter) {
-			return undefined;
-		}
-
-		return {
+	private async _showDiagnosticsPick(instantiationService: IInstantiationService, onBackgroundAccept: (item: IChatContextQuickPickItem[]) => void): Promise<IDiagnosticsQuickPickItemWithFilter | undefined> {
+		const convert = (item: IDiagnosticVariableEntryFilterData): IDiagnosticsQuickPickItemWithFilter => ({
 			kind: 'diagnostic-filter',
-			id: IDiagnosticVariableEntryFilterData.id(filter),
-			label: IDiagnosticVariableEntryFilterData.label(filter),
+			id: IDiagnosticVariableEntryFilterData.id(item),
+			label: IDiagnosticVariableEntryFilterData.label(item),
 			icon: IDiagnosticVariableEntryFilterData.icon,
-			filter,
-		};
+			filter: item,
+		});
+
+		const filter = await instantiationService.invokeFunction(accessor =>
+			createMarkersQuickPick(accessor, items => onBackgroundAccept(items.map(convert))));
+		return filter && convert(filter);
 	}
 
 	private _show(quickInputService: IQuickInputService, commandService: ICommandService, widget: IChatWidget, quickChatService: IQuickChatService, quickPickItems: (IChatContextQuickPickItem | QuickPickItem)[] | undefined, clipboardService: IClipboardService, editorService: IEditorService, labelService: ILabelService, viewsService: IViewsService, chatEditingService: IChatEditingService | undefined, hostService: IHostService, fileService: IFileService, textModelService: ITextModelService, instantiationService: IInstantiationService, query: string = '', placeholder?: string) {
+		const attach = (isBackgroundAccept: boolean, ...items: IChatContextQuickPickItem[]) => {
+			this._attachContext(widget, quickInputService, commandService, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, textModelService, isBackgroundAccept, ...items);
+		};
+
 		const providerOptions: AnythingQuickAccessProviderRunOptions = {
 			handleAccept: async (inputItem: IChatContextQuickPickItem, isBackgroundAccept: boolean) => {
 				let item: IChatContextQuickPickItem | undefined = inputItem;
 				if ('kind' in item && item.kind === 'folder') {
 					item = await this._showFolders(instantiationService);
 				} else if ('kind' in item && item.kind === 'diagnostic') {
-					item = await this._showDiagnosticsPick(instantiationService);
+					item = await this._showDiagnosticsPick(instantiationService, i => attach(true, ...i));
 				}
 
 				if (!item) {
@@ -877,7 +880,7 @@ export class AttachContextAction extends Action2 {
 					if (!clipboardService) {
 						return;
 					}
-					this._attachContext(widget, quickInputService, commandService, clipboardService, editorService, labelService, viewsService, chatEditingService, hostService, fileService, textModelService, isBackgroundAccept, item);
+					attach(isBackgroundAccept, item);
 					if (isQuickChat(widget)) {
 						quickChatService.open();
 					}
diff --git a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
index 134e6a0f9a11..1782bf81f504 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
@@ -391,11 +391,7 @@ export class ChatDragAndDrop extends Themable {
 			}
 
 			return {
-				kind: 'diagnostic',
-				id: IDiagnosticVariableEntryFilterData.id(filter),
-				name: IDiagnosticVariableEntryFilterData.label(filter),
-				icon: IDiagnosticVariableEntryFilterData.icon,
-				value: filter,
+				...IDiagnosticVariableEntryFilterData.toEntry(filter),
 				...filter,
 			};
 		});
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
index 0bf919d40f03..bfcb35301525 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
@@ -649,7 +649,7 @@ export class AddDynamicVariableAction extends Action2 {
 }
 registerAction2(AddDynamicVariableAction);
 
-export async function createMarkersQuickPick(accessor: ServicesAccessor): Promise<IDiagnosticVariableEntryFilterData | undefined> {
+export async function createMarkersQuickPick(accessor: ServicesAccessor, onBackgroundAccept: (item: IDiagnosticVariableEntryFilterData[]) => void): Promise<IDiagnosticVariableEntryFilterData | undefined> {
 	const markers = accessor.get(IMarkerService).read();
 	if (!markers.length) {
 		return;
@@ -695,10 +695,22 @@ export async function createMarkersQuickPick(accessor: ServicesAccessor): Promis
 
 
 	const quickInputService = accessor.get(IQuickInputService);
-	const quickPick = quickInputService.createQuickPick({ useSeparators: true });
+	const quickPick = quickInputService.createQuickPick<MarkerPickItem>({ useSeparators: true });
+	quickPick.canAcceptInBackground = true;
 	quickPick.placeholder = localize('pickAProblem', 'Pick a problem to attach...');
 	quickPick.items = items;
 
-	return quickInputService.pick(items, { canPickMany: false }).then(v => v?.entry);
+	return new Promise<IDiagnosticVariableEntryFilterData | undefined>(resolve => {
+		quickPick.onDidHide(() => resolve(undefined));
+		quickPick.onDidAccept(ev => {
+			if (ev.inBackground) {
+				onBackgroundAccept(quickPick.selectedItems.map(i => i.entry));
+			} else {
+				resolve(quickPick.selectedItems[0]?.entry);
+				quickPick.dispose();
+			}
+		});
+		quickPick.show();
+	}).finally(() => quickPick.dispose());
 }
 
diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index e95e6906cf03..2a8bf9de3f55 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -101,6 +101,17 @@ export interface IDiagnosticVariableEntryFilterData {
 }
 
 export namespace IDiagnosticVariableEntryFilterData {
+	export function toEntry(data: IDiagnosticVariableEntryFilterData) {
+		return {
+			id: id(data),
+			name: label(data),
+			icon,
+			value: data,
+			kind: 'diagnostic' as const,
+			range: data.filterRange ? new OffsetRange(data.filterRange.startColumn, data.filterRange.endLineNumber) : undefined,
+		};
+	}
+
 	export function id(data: IDiagnosticVariableEntryFilterData) {
 		return [data.filterUri, data.filterSeverity, data.filterRange?.startLineNumber].join(':');
 	}

From b2d1641765b46f86d3be844280bdc8029ee05912 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 25 Feb 2025 15:04:53 -0800
Subject: [PATCH 0390/1815] chat: make problems marker clickable

Fixes https://github.com/microsoft/vscode-copilot/issues/13501
---
 .../chat/browser/actions/chatContextActions.ts       |  1 +
 .../workbench/contrib/chat/browser/chatInputPart.ts  | 12 ++++++++++++
 src/vs/workbench/contrib/chat/common/chatModel.ts    |  6 +++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index cc56343cd58e..d337dac1ef88 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -507,6 +507,7 @@ export class AttachContextAction extends Action2 {
 					name: pick.label,
 					value: pick.filter,
 					kind: 'diagnostic',
+					icon: pick.icon,
 					...pick.filter,
 				});
 			} else if (isIQuickPickItemWithResource(pick) && pick.resource) {
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index e9507a1dd598..9f9491a64a6c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -1120,6 +1120,18 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 				ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
 
 				this.attachButtonAndDisposables(widget, index, attachment, hoverDelegate);
+
+				if (attachment.kind === 'diagnostic') {
+					if (attachment.filterUri) {
+						resource = attachment.filterUri ? URI.revive(attachment.filterUri) : undefined;
+						range = attachment.filterRange;
+					} else {
+						widget.style.cursor = 'pointer';
+						store.add(dom.addDisposableListener(widget, dom.EventType.CLICK, () => {
+							this.commandService.executeCommand('workbench.panel.markers.view.focus');
+						}));
+					}
+				}
 			}
 
 			if (attachment.kind === 'symbol') {
diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index 2a8bf9de3f55..38f177f8153f 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -101,6 +101,8 @@ export interface IDiagnosticVariableEntryFilterData {
 }
 
 export namespace IDiagnosticVariableEntryFilterData {
+	export const icon = Codicon.warning;
+
 	export function toEntry(data: IDiagnosticVariableEntryFilterData) {
 		return {
 			id: id(data),
@@ -108,7 +110,7 @@ export namespace IDiagnosticVariableEntryFilterData {
 			icon,
 			value: data,
 			kind: 'diagnostic' as const,
-			range: data.filterRange ? new OffsetRange(data.filterRange.startColumn, data.filterRange.endLineNumber) : undefined,
+			range: data.filterRange ? new OffsetRange(data.filterRange.startLineNumber, data.filterRange.endLineNumber) : undefined,
 		};
 	}
 
@@ -116,8 +118,6 @@ export namespace IDiagnosticVariableEntryFilterData {
 		return [data.filterUri, data.filterSeverity, data.filterRange?.startLineNumber].join(':');
 	}
 
-	export const icon = Codicon.warning;
-
 	export function label(data: IDiagnosticVariableEntryFilterData) {
 		let labelStr = localize('chat.attachment.problems.all', "All Problems");
 		if (data.filterUri) {

From f487ae8b104218c4a46c790a9073ac46de349b15 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 25 Feb 2025 15:19:05 -0800
Subject: [PATCH 0391/1815] chat: fix multiple problem pills not being added,
 and use problem messages to label pills

Fixes https://github.com/microsoft/vscode-copilot/issues/13506
---
 .../contrib/chat/browser/chatDragAndDrop.ts   | 15 ++-------
 .../browser/contrib/chatDynamicVariables.ts   |  2 +-
 .../contrib/chat/common/chatModel.ts          | 32 +++++++++++++++++--
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
index 1782bf81f504..79a6481ef75d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
@@ -11,7 +11,6 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { Mimes } from '../../../../base/common/mime.js';
 import { basename, joinPath } from '../../../../base/common/resources.js';
-import { Mutable } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IRange } from '../../../../editor/common/core/range.js';
 import { SymbolKinds } from '../../../../editor/common/languages.js';
@@ -375,19 +374,11 @@ export class ChatDragAndDrop extends Themable {
 
 	private resolveMarkerAttachContext(markers: MarkerTransferData[]): IDiagnosticVariableEntry[] {
 		return markers.map((marker): IDiagnosticVariableEntry => {
-			const filter: Mutable<IDiagnosticVariableEntryFilterData> = {};
+			let filter: IDiagnosticVariableEntryFilterData;
 			if (!('severity' in marker)) {
-				filter.filterUri = URI.revive(marker.uri);
-				filter.filterSeverity = MarkerSeverity.Warning;
+				filter = { filterUri: URI.revive(marker.uri), filterSeverity: MarkerSeverity.Warning };
 			} else {
-				filter.filterUri = URI.revive(marker.resource);
-				filter.filterSeverity = marker.severity;
-				filter.filterRange = {
-					startLineNumber: marker.startLineNumber,
-					startColumn: marker.startColumn,
-					endLineNumber: marker.endLineNumber,
-					endColumn: marker.endColumn
-				};
+				filter = IDiagnosticVariableEntryFilterData.fromMarker(marker);
 			}
 
 			return {
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
index bfcb35301525..cea387531070 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
@@ -673,7 +673,7 @@ export async function createMarkersQuickPick(accessor: ServicesAccessor, onBackg
 			resource: marker.resource,
 			label: marker.message,
 			description: localize('markers.panel.at.ln.col.number', "[Ln {0}, Col {1}]", '' + marker.startLineNumber, '' + marker.startColumn),
-			entry: { filterUri: marker.resource, filterRange: { startLineNumber: marker.startLineNumber, endLineNumber: marker.endLineNumber, startColumn: marker.startColumn, endColumn: marker.endColumn } }
+			entry: IDiagnosticVariableEntryFilterData.fromMarker(marker),
 		});
 	}
 
diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index 38f177f8153f..1e6dcc3d6f0f 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -22,7 +22,7 @@ import { IRange } from '../../../../editor/common/core/range.js';
 import { Location, SymbolKind, TextEdit } from '../../../../editor/common/languages.js';
 import { localize } from '../../../../nls.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
-import { MarkerSeverity } from '../../../../platform/markers/common/markers.js';
+import { IMarker, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { CellUri, ICellEditOperation } from '../../notebook/common/notebookCommon.js';
 import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentResult, IChatAgentService, IChatWelcomeMessageContent, reviveSerializedAgent } from './chatAgents.js';
 import { ChatRequestTextPart, IParsedChatRequest, reviveParsedChatRequest } from './chatParserTypes.js';
@@ -95,6 +95,8 @@ export interface IImageVariableEntry extends Omit<IBaseChatRequestVariableEntry,
 }
 
 export interface IDiagnosticVariableEntryFilterData {
+	readonly owner?: string;
+	readonly problemMessage?: string;
 	readonly filterUri?: URI;
 	readonly filterSeverity?: MarkerSeverity;
 	readonly filterRange?: IRange;
@@ -103,6 +105,15 @@ export interface IDiagnosticVariableEntryFilterData {
 export namespace IDiagnosticVariableEntryFilterData {
 	export const icon = Codicon.warning;
 
+	export function fromMarker(marker: IMarker): IDiagnosticVariableEntryFilterData {
+		return {
+			filterUri: marker.resource,
+			owner: marker.owner,
+			problemMessage: marker.message,
+			filterRange: { startLineNumber: marker.startLineNumber, endLineNumber: marker.endLineNumber, startColumn: marker.startColumn, endColumn: marker.endColumn }
+		};
+	}
+
 	export function toEntry(data: IDiagnosticVariableEntryFilterData) {
 		return {
 			id: id(data),
@@ -115,10 +126,27 @@ export namespace IDiagnosticVariableEntryFilterData {
 	}
 
 	export function id(data: IDiagnosticVariableEntryFilterData) {
-		return [data.filterUri, data.filterSeverity, data.filterRange?.startLineNumber].join(':');
+		return [data.filterUri, data.owner, data.filterSeverity, data.filterRange?.startLineNumber].join(':');
 	}
 
 	export function label(data: IDiagnosticVariableEntryFilterData) {
+		const enum TrimThreshold {
+			MaxChars = 30,
+			MaxSpaceLookback = 10,
+		}
+		if (data.problemMessage) {
+			if (data.problemMessage.length < TrimThreshold.MaxChars) {
+				return data.problemMessage;
+			}
+
+			// Trim the message, on a space if it would not lose too much
+			// data (MaxSpaceLookback) or just blindly otherwise.
+			const lastSpace = data.problemMessage.lastIndexOf(' ', TrimThreshold.MaxChars);
+			if (lastSpace === -1 || lastSpace + TrimThreshold.MaxSpaceLookback < TrimThreshold.MaxChars) {
+				return data.problemMessage.substring(0, TrimThreshold.MaxChars) + '…';
+			}
+			return data.problemMessage.substring(0, lastSpace) + '…';
+		}
 		let labelStr = localize('chat.attachment.problems.all', "All Problems");
 		if (data.filterUri) {
 			labelStr = localize('chat.attachment.problems.inFile', "Problems in {0}", basename(data.filterUri));

From 2871f37fa3a0f6138d4146c88363a43cba492e72 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Tue, 25 Feb 2025 15:38:52 -0800
Subject: [PATCH 0392/1815] Add more missing on-testplan filters (#241977)

---
 .vscode/notebooks/my-endgame.github-issues | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vscode/notebooks/my-endgame.github-issues b/.vscode/notebooks/my-endgame.github-issues
index 9d5c8ccdcc54..0fd05ece4853 100644
--- a/.vscode/notebooks/my-endgame.github-issues
+++ b/.vscode/notebooks/my-endgame.github-issues
@@ -62,7 +62,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request label:verification-needed -label:verified"
+    "value": "$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request label:verification-needed -label:verified -label:on-testplan"
   },
   {
     "kind": 1,
@@ -87,7 +87,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed -assignee:@me -label:verified -label:z-author-verified label:feature-request label:verification-needed -label:verification-steps-needed -label:unreleased"
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed -assignee:@me -label:verified -label:z-author-verified label:feature-request label:verification-needed -label:verification-steps-needed -label:unreleased -label:on-testplan"
   },
   {
     "kind": 1,

From 182316e7e89583391dfaa10619b5dc60f016068d Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Tue, 25 Feb 2025 15:58:36 -0800
Subject: [PATCH 0393/1815] fix: render X buttons on chat attachments in narrow
 view ports (#241984)

---
 src/vs/workbench/contrib/chat/browser/media/chat.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index a542bb5c97b0..0b9e491a7d26 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -692,7 +692,6 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	gap: 4px;
 	margin-top: 6px;
 	flex-wrap: wrap;
-	overflow: hidden;
 }
 
 .chat-related-files {
@@ -700,6 +699,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	flex-wrap: wrap;
 	align-items: center;
 	gap: 4px;
+	width: 100%;
 }
 
 .chat-related-files .monaco-button-dropdown .monaco-text-button {
@@ -1197,6 +1197,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	flex-wrap: wrap;
 	cursor: default;
 	gap: 4px;
+	width: 100%;
 }
 
 .interactive-session .interactive-input-part.compact .chat-attached-context {

From 9d8e6f24890482510db42f35859294385e0ac1e0 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 25 Feb 2025 16:00:09 -0800
Subject: [PATCH 0394/1815] chat: disallow accept/discard while a request is
 going on (#241986)

We could probably be more granular, but I think this prevents torn states that are especially easy to get into when the request is paused.

Fixes #241961
---
 .../contrib/chat/browser/chatEditing/chatEditingActions.ts     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
index 622c070ce969..cc9c752977f5 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
@@ -148,6 +148,7 @@ registerAction2(class RemoveFileFromWorkingSet extends WorkingSetAction {
 			id: 'chatEditing.removeFileFromWorkingSet',
 			title: localize2('removeFileFromWorkingSet', 'Remove File'),
 			icon: Codicon.close,
+			precondition: ChatContextKeys.requestInProgress.negate(),
 			menu: [{
 				id: MenuId.ChatEditingWidgetModifiedFilesToolbar,
 				// when: ContextKeyExpr.or(ContextKeyExpr.equals(chatEditingWidgetFileStateContextKey.key, WorkingSetEntryState.Attached), ContextKeyExpr.equals(chatEditingWidgetFileStateContextKey.key, WorkingSetEntryState.Suggested), ContextKeyExpr.equals(chatEditingWidgetFileStateContextKey.key, WorkingSetEntryState.Transient)),
@@ -232,6 +233,7 @@ registerAction2(class AcceptAction extends WorkingSetAction {
 			id: 'chatEditing.acceptFile',
 			title: localize2('accept.file', 'Keep'),
 			icon: Codicon.check,
+			precondition: ChatContextKeys.requestInProgress.negate(),
 			menu: [{
 				when: ContextKeyExpr.and(ContextKeyExpr.equals('resourceScheme', CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME), ContextKeyExpr.notIn(chatEditingResourceContextKey.key, decidedChatEditingResourceContextKey.key)),
 				id: MenuId.MultiDiffEditorFileToolbar,
@@ -257,6 +259,7 @@ registerAction2(class DiscardAction extends WorkingSetAction {
 			id: 'chatEditing.discardFile',
 			title: localize2('discard.file', 'Undo'),
 			icon: Codicon.discard,
+			precondition: ChatContextKeys.requestInProgress.negate(),
 			menu: [{
 				when: ContextKeyExpr.and(ContextKeyExpr.equals('resourceScheme', CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME), ContextKeyExpr.notIn(chatEditingResourceContextKey.key, decidedChatEditingResourceContextKey.key)),
 				id: MenuId.MultiDiffEditorFileToolbar,

From bad4623c1e2c8a650ce75661a403749889a5e64a Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Tue, 25 Feb 2025 16:04:30 -0800
Subject: [PATCH 0395/1815] fix: render attachments after instantiating
 implicit context (#241987)

---
 src/vs/workbench/contrib/chat/browser/chatInputPart.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 9f9491a64a6c..a8ea4069aa48 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -754,12 +754,12 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		const toolbarsContainer = elements.inputToolbars;
 		const attachmentToolbarContainer = elements.attachmentToolbar;
 		this.chatEditingSessionWidgetContainer = elements.chatEditingSessionWidgetContainer;
-		this.renderAttachedContext();
 		if (this.options.enableImplicitContext) {
 			this._implicitContext = this._register(new ChatImplicitContext());
 			this._register(this._implicitContext.onDidChangeValue(() => this._handleAttachedContextChange()));
 		}
 
+		this.renderAttachedContext();
 		this._register(this._attachmentModel.onDidChangeContext(() => this._handleAttachedContextChange()));
 		this.renderChatEditingSessionState(null, widget);
 

From 4cf1c1d5387550587197a770debad63b6a04f499 Mon Sep 17 00:00:00 2001
From: Justin Chen <54879025+justschen@users.noreply.github.com>
Date: Tue, 25 Feb 2025 16:30:08 -0800
Subject: [PATCH 0396/1815] fix custom attachment overflow (#241990)

some css
---
 src/vs/workbench/contrib/chat/browser/media/chat.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 0b9e491a7d26..abc8acd7da50 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1660,6 +1660,11 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	user-select: none;
 	outline: none;
 	border: none;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	max-width: 100%;
+	display: inline-block;
 }
 
 .chat-attached-context-attachment.show-file-icons.warning .chat-attached-context-custom-text {

From 4649c499b4472f106fa08a729786ba732d8dfe97 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Tue, 25 Feb 2025 17:20:06 -0800
Subject: [PATCH 0397/1815] Render implicit context for notebook cells
 properly. (#241974)

---
 .../browser/contrib/chatImplicitContext.ts    | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
index f4673ffc8580..33ad79d9bde5 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
@@ -6,6 +6,7 @@
 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 } from '../../../../../base/common/resources.js';
 import { URI } from '../../../../../base/common/uri.js';
@@ -16,6 +17,7 @@ import { IConfigurationService } from '../../../../../platform/configuration/com
 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 { ChatAgentLocation } from '../../common/chatAgents.js';
 import { IChatEditingService } from '../../common/chatEditingService.js';
 import { IBaseChatRequestVariableEntry, IChatRequestImplicitVariableEntry } from '../../common/chatModel.js';
@@ -58,6 +60,17 @@ export class ChatImplicitContextContribution extends Disposable implements IWork
 						500)(() => this.updateImplicitContext()));
 				}
 
+				const notebookEditor = this.findActiveNotebookEditor();
+				if (notebookEditor) {
+					activeEditorDisposables.add(Event.debounce(
+						Event.any(
+							notebookEditor.onDidChangeModel,
+							notebookEditor.onDidChangeActiveCell
+						),
+						() => undefined,
+						500)(() => this.updateImplicitContext()));
+				}
+
 				this.updateImplicitContext();
 			})));
 		this._register(autorun((reader) => {
@@ -85,6 +98,10 @@ export class ChatImplicitContextContribution extends Disposable implements IWork
 		const codeEditor = this.codeEditorService.getActiveCodeEditor();
 		if (codeEditor) {
 			const model = codeEditor.getModel();
+			if (model?.uri.scheme === Schemas.vscodeNotebookCell) {
+				return undefined;
+			}
+
 			if (model) {
 				return codeEditor;
 			}
@@ -107,6 +124,10 @@ export class ChatImplicitContextContribution extends Disposable implements IWork
 		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();
@@ -134,6 +155,16 @@ export class ChatImplicitContextContribution extends Disposable implements IWork
 			}
 		}
 
+		const notebookEditor = this.findActiveNotebookEditor();
+		if (notebookEditor) {
+			const activeCell = notebookEditor.getActiveCell();
+			if (activeCell) {
+				newValue = activeCell.uri;
+			} else {
+				newValue = notebookEditor.textModel?.uri;
+			}
+		}
+
 		const uri = newValue instanceof URI ? newValue : newValue?.uri;
 		if (uri && await this.ignoredFilesService.fileIsIgnored(uri, cancelTokenSource.token)) {
 			newValue = undefined;

From 0278d8c929447c9721a30086ba17ec9b64593311 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 25 Feb 2025 17:39:45 -0800
Subject: [PATCH 0398/1815] Fix compile error

---
 .../api/browser/mainThreadLanguageFeatures.ts          |  6 +++---
 src/vs/workbench/api/browser/mainThreadTreeViews.ts    |  2 +-
 src/vs/workbench/api/common/extHostTypeConverters.ts   | 10 +++++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
index 8f48835044b5..9aadd0d679ae 100644
--- a/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
+++ b/src/vs/workbench/api/browser/mainThreadLanguageFeatures.ts
@@ -1039,7 +1039,7 @@ class MainThreadPasteEditProvider implements languages.DocumentPasteEditProvider
 
 		if (metadata.supportsCopy) {
 			this.prepareDocumentPaste = async (model: ITextModel, selections: readonly IRange[], dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): Promise<IReadonlyVSDataTransfer | undefined> => {
-				const dataTransferDto = await typeConvert.DataTransfer.from(dataTransfer);
+				const dataTransferDto = await typeConvert.DataTransfer.fromList(dataTransfer);
 				if (token.isCancellationRequested) {
 					return undefined;
 				}
@@ -1061,7 +1061,7 @@ class MainThreadPasteEditProvider implements languages.DocumentPasteEditProvider
 			this.provideDocumentPasteEdits = async (model: ITextModel, selections: Selection[], dataTransfer: IReadonlyVSDataTransfer, context: languages.DocumentPasteContext, token: CancellationToken) => {
 				const request = this.dataTransfers.add(dataTransfer);
 				try {
-					const dataTransferDto = await typeConvert.DataTransfer.from(dataTransfer);
+					const dataTransferDto = await typeConvert.DataTransfer.fromList(dataTransfer);
 					if (token.isCancellationRequested) {
 						return;
 					}
@@ -1145,7 +1145,7 @@ class MainThreadDocumentOnDropEditProvider implements languages.DocumentDropEdit
 	async provideDocumentDropEdits(model: ITextModel, position: IPosition, dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): Promise<languages.DocumentDropEditsSession | undefined> {
 		const request = this.dataTransfers.add(dataTransfer);
 		try {
-			const dataTransferDto = await typeConvert.DataTransfer.from(dataTransfer);
+			const dataTransferDto = await typeConvert.DataTransfer.fromList(dataTransfer);
 			if (token.isCancellationRequested) {
 				return;
 			}
diff --git a/src/vs/workbench/api/browser/mainThreadTreeViews.ts b/src/vs/workbench/api/browser/mainThreadTreeViews.ts
index dc7ca02ac90c..ac6eb174bfe9 100644
--- a/src/vs/workbench/api/browser/mainThreadTreeViews.ts
+++ b/src/vs/workbench/api/browser/mainThreadTreeViews.ts
@@ -227,7 +227,7 @@ class TreeViewDragAndDropController implements ITreeViewDragAndDropController {
 		operationUuid?: string, sourceTreeId?: string, sourceTreeItemHandles?: string[]): Promise<void> {
 		const request = this.dataTransfersCache.add(dataTransfer);
 		try {
-			const dataTransferDto = await typeConvert.DataTransfer.from(dataTransfer);
+			const dataTransferDto = await typeConvert.DataTransfer.fromList(dataTransfer);
 			if (token.isCancellationRequested) {
 				return;
 			}
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
index 3c171452e9ec..d5344f435217 100644
--- a/src/vs/workbench/api/common/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -2254,7 +2254,15 @@ export namespace DataTransfer {
 		return new types.DataTransfer(init);
 	}
 
-	export async function from(dataTransfer: Iterable<readonly [string, IDataTransferItem]>): Promise<extHostProtocol.DataTransferDTO> {
+	export async function from(dataTransfer: vscode.DataTransfer): Promise<extHostProtocol.DataTransferDTO> {
+		const items = await Promise.all(Array.from(dataTransfer, async ([mime, value]) => {
+			return [mime, await DataTransferItem.from(mime, value)] as const;
+		}));
+
+		return { items };
+	}
+
+	export async function fromList(dataTransfer: Iterable<readonly [string, IDataTransferItem]>): Promise<extHostProtocol.DataTransferDTO> {
 		const items = await Promise.all(Array.from(dataTransfer, async ([mime, value]) => {
 			return [mime, await DataTransferItem.from(mime, value, value.id)] as const;
 		}));

From 2085fe45b6219dfa893174dd7c71ae6aabcea106 Mon Sep 17 00:00:00 2001
From: Justin Chen <54879025+justschen@users.noreply.github.com>
Date: Tue, 25 Feb 2025 17:44:52 -0800
Subject: [PATCH 0399/1815] fix hover for url images (#242000)

better hover for urls and better image classifications
---
 .../chatContentParts/chatAttachmentsContentPart.ts | 14 +++++++++++---
 .../contrib/chat/browser/chatDragAndDrop.ts        |  2 ++
 .../contrib/chat/browser/chatInputPart.ts          | 12 +++++++++---
 .../workbench/contrib/chat/browser/imageUtils.ts   | 11 +++++++++++
 src/vs/workbench/contrib/chat/common/chatModel.ts  |  1 +
 5 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
index 61204fc1867e..e61ad046c7d9 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
@@ -41,8 +41,9 @@ import { fillEditorsDragData } from '../../../../browser/dnd.js';
 import { ResourceLabels } from '../../../../browser/labels.js';
 import { ResourceContextKey } from '../../../../common/contextkeys.js';
 import { revealInSideBarCommand } from '../../../files/browser/fileActions.contribution.js';
-import { IChatRequestVariableEntry, isLinkVariableEntry, isPasteVariableEntry } from '../../common/chatModel.js';
+import { IChatRequestVariableEntry, isImageVariableEntry, isLinkVariableEntry, isPasteVariableEntry } from '../../common/chatModel.js';
 import { ChatResponseReferencePartStatusKind, IChatContentReference } from '../../common/chatService.js';
+import { convertUint8ArrayToString } from '../imageUtils.js';
 
 export const chatAttachmentResourceContextKey = new RawContextKey<string>('chatAttachmentResource', undefined, { type: 'URI', description: localize('resource', "The full value of the chat attachment resource, including scheme and path") });
 
@@ -133,7 +134,8 @@ export class ChatAttachmentsContentPart extends Disposable {
 			} else if (attachment.isImage) {
 				ariaLabel = localize('chat.imageAttachment', "Attached image, {0}", attachment.name);
 
-				const hoverElement = this.customAttachment(widget, attachment.name, hoverDelegate, ariaLabel, isAttachmentOmitted, attachment.isImage);
+				const isURL = isImageVariableEntry(attachment) && attachment.isURL;
+				const hoverElement = this.customAttachment(widget, attachment.name, hoverDelegate, ariaLabel, isAttachmentOmitted, attachment.isImage, isURL, attachment.value as Uint8Array);
 
 				if (attachment.references) {
 					widget.style.cursor = 'pointer';
@@ -253,7 +255,7 @@ export class ChatAttachmentsContentPart extends Disposable {
 		});
 	}
 
-	private customAttachment(widget: HTMLElement, friendlyName: string, hoverDelegate: IHoverDelegate, ariaLabel: string, isAttachmentOmitted: boolean, isImage?: boolean): HTMLElement {
+	private customAttachment(widget: HTMLElement, friendlyName: string, hoverDelegate: IHoverDelegate, ariaLabel: string, isAttachmentOmitted: boolean, isImage?: boolean, isURL?: boolean, value?: Uint8Array): HTMLElement {
 		const pillIcon = dom.$('div.chat-attached-context-pill', {}, dom.$(isAttachmentOmitted ? 'span.codicon.codicon-warning' : 'span.codicon.codicon-file-media'));
 		const textLabel = dom.$('span.chat-attached-context-custom-text', {}, friendlyName);
 		widget.appendChild(pillIcon);
@@ -262,6 +264,12 @@ export class ChatAttachmentsContentPart extends Disposable {
 		const hoverElement = dom.$('div.chat-attached-context-hover');
 		hoverElement.setAttribute('aria-label', ariaLabel);
 
+		if (isURL && !isAttachmentOmitted && value) {
+			hoverElement.textContent = localize('chat.imageAttachmentHover', "{0}", convertUint8ArrayToString(value));
+			this.attachedContextDisposables.add(this.hoverService.setupManagedHover(hoverDelegate, widget, hoverElement, { trapFocus: true }));
+		}
+
+
 		if (isAttachmentOmitted) {
 			widget.classList.add('warning');
 			hoverElement.textContent = localize('chat.fileAttachmentHover', "Selected model does not support this {0} type.", isImage ? 'image' : 'file');
diff --git a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
index 79a6481ef75d..36bfde02e393 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
@@ -351,12 +351,14 @@ export class ChatDragAndDrop extends Themable {
 			if (isImage) {
 				const buffer = convertStringToUInt8Array(src);
 				return [{
+					kind: 'image',
 					id: url.toString(),
 					name: finalDisplayName,
 					value: buffer,
 					isImage,
 					isFile: false,
 					isDirectory: false,
+					isURL: true,
 				}];
 			} else {
 				return [{
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index a8ea4069aa48..f3cb3d0b1581 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -101,7 +101,7 @@ import { ChatFollowups } from './chatFollowups.js';
 import { IChatViewState } from './chatWidget.js';
 import { ChatFileReference } from './contrib/chatDynamicVariables/chatFileReference.js';
 import { ChatImplicitContext } from './contrib/chatImplicitContext.js';
-import { resizeImage } from './imageUtils.js';
+import { convertUint8ArrayToString, resizeImage } from './imageUtils.js';
 
 const $ = dom.$;
 
@@ -1043,7 +1043,8 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			} else if (attachment.isImage) {
 				ariaLabel = localize('chat.imageAttachment', "Attached image, {0}", attachment.name);
 				const supportsVision = this.supportsVision();
-				const hoverElement = this.customAttachment(widget, attachment.name, hoverDelegate, ariaLabel, store, attachment.isImage, supportsVision);
+				const isURL = isImageVariableEntry(attachment) && attachment.isURL;
+				const hoverElement = this.customAttachment(widget, attachment.name, hoverDelegate, ariaLabel, store, attachment.isImage, supportsVision, isURL, attachment.value as Uint8Array);
 
 				if (attachment.references) {
 					widget.style.cursor = 'pointer';
@@ -1177,7 +1178,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}
 	}
 
-	private customAttachment(widget: HTMLElement, friendlyName: string, hoverDelegate: IHoverDelegate, ariaLabel: string, store: DisposableStore, isImage?: boolean, supportsVision?: boolean): HTMLElement {
+	private customAttachment(widget: HTMLElement, friendlyName: string, hoverDelegate: IHoverDelegate, ariaLabel: string, store: DisposableStore, isImage?: boolean, supportsVision?: boolean, isURL?: boolean, value?: Uint8Array): HTMLElement {
 		const pillIcon = dom.$('div.chat-attached-context-pill', {}, dom.$(supportsVision ? 'span.codicon.codicon-file-media' : 'span.codicon.codicon-warning'));
 		const textLabel = dom.$('span.chat-attached-context-custom-text', {}, friendlyName);
 		widget.appendChild(pillIcon);
@@ -1186,6 +1187,11 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		const hoverElement = dom.$('div.chat-attached-context-hover');
 		hoverElement.setAttribute('aria-label', ariaLabel);
 
+		if (isURL && supportsVision && value) {
+			hoverElement.textContent = localize('chat.imageAttachmentHover', "{0}", convertUint8ArrayToString(value));
+			store.add(this.hoverService.setupManagedHover(hoverDelegate, widget, hoverElement, { trapFocus: true }));
+		}
+
 		if (!supportsVision) {
 			widget.classList.add('warning');
 			hoverElement.textContent = localize('chat.fileAttachmentHover', "{0} does not support this {1} type.", this.currentLanguageModel ? this.languageModelsService.lookupLanguageModel(this.currentLanguageModel)?.name : this.currentLanguageModel, isImage ? 'image' : 'file');
diff --git a/src/vs/workbench/contrib/chat/browser/imageUtils.ts b/src/vs/workbench/contrib/chat/browser/imageUtils.ts
index e336a86b0f20..b5f426737fd6 100644
--- a/src/vs/workbench/contrib/chat/browser/imageUtils.ts
+++ b/src/vs/workbench/contrib/chat/browser/imageUtils.ts
@@ -80,6 +80,17 @@ export function convertStringToUInt8Array(data: string): Uint8Array {
 	return new TextEncoder().encode(data);
 }
 
+// Only used for URLs
+export function convertUint8ArrayToString(data: Uint8Array): string {
+	try {
+		const decoder = new TextDecoder();
+		const decodedString = decoder.decode(data);
+		return decodedString;
+	} catch {
+		return '';
+	}
+}
+
 function isValidBase64(str: string): boolean {
 	// checks if the string is a valid base64 string that is NOT encoded
 	return /^[A-Za-z0-9+/]*={0,2}$/.test(str) && (() => {
diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index 1e6dcc3d6f0f..4d000aac1452 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -92,6 +92,7 @@ export interface ILinkVariableEntry extends Omit<IBaseChatRequestVariableEntry,
 export interface IImageVariableEntry extends Omit<IBaseChatRequestVariableEntry, 'kind'> {
 	readonly kind: 'image';
 	readonly isPasted?: boolean;
+	readonly isURL?: boolean;
 }
 
 export interface IDiagnosticVariableEntryFilterData {

From eec4df75061b1621d02d19e747b99b3f6a5f69d9 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Tue, 25 Feb 2025 19:56:41 -0800
Subject: [PATCH 0400/1815] Modified markup cell decorators (#242012)

---
 .../chatEditingModifiedNotebookEntry.ts       | 15 ++++--
 .../chatEditingNotebookEditorIntegration.ts   |  6 ++-
 .../notebookModifiedCellDecorator.ts          | 51 +++++++++++++++++++
 .../view/renderers/backLayerWebView.ts        |  4 ++
 4 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.ts

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 1bc136b3359d..145cb1a8d24d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -44,7 +44,8 @@ import { ChatEditingNotebookFileSystemProvider } from '../../../notebook/browser
 import { NotebookTextDiffEditor } from '../../../notebook/browser/diff/notebookDiffEditor.js';
 import { INotebookTextDiffEditor } from '../../../notebook/browser/diff/notebookDiffEditorBrowser.js';
 import { CellDiffInfo, computeDiff } from '../../../notebook/browser/diff/notebookDiffViewModel.js';
-import { getNotebookEditorFromEditorPane } from '../../../notebook/browser/notebookBrowser.js';
+import { CellEditState, getNotebookEditorFromEditorPane } from '../../../notebook/browser/notebookBrowser.js';
+import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
 import { NotebookCellTextModel } from '../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
 import { CellEditType, ICellDto2, ICellEditOperation, ICellReplaceEdit, IOutputItemDto, IResolvedNotebookEditorModel, NotebookData, NotebookSetting, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
@@ -718,7 +719,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		if (!modifiedCellModel || !originalCellModel) {
 			return;
 		}
-		cellEntry = this._register(this._instantiationService.createInstance(ChatEditingNotebookCellEntry, cell, modifiedCellModel, originalCellModel, this._telemetryInfo, accept, reject));
+		cellEntry = this._register(this._instantiationService.createInstance(ChatEditingNotebookCellEntry, this.modifiedResourceRef.object.resource, cell, modifiedCellModel, originalCellModel, this._telemetryInfo, accept, reject));
 		this.cellEntryMap.set(cell, cellEntry);
 
 		this._register(autorun(r => {
@@ -898,6 +899,7 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 	readonly isCurrentlyBeingModifiedBy: IObservable<IChatResponseModel | undefined> = this._isCurrentlyBeingModifiedByObs;
 
 	constructor(
+		public readonly notebookUri: URI,
 		public readonly cell: NotebookCellTextModel,
 		private readonly modifiedModel: ITextModel,
 		private readonly originalModel: ITextModel,
@@ -907,8 +909,8 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 		@IConfigurationService configService: IConfigurationService,
 		@IChatService private readonly _chatService: IChatService,
 		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
-		@IUndoRedoService private readonly _undoRedoService: IUndoRedoService
-
+		@IUndoRedoService private readonly _undoRedoService: IUndoRedoService,
+		@INotebookEditorService private readonly notebookEditorService: INotebookEditorService
 	) {
 		super();
 		this.diffInfo = this._diffInfo.map(value => {
@@ -992,6 +994,11 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 	}
 
 	acceptAgentEdits(textEdits: TextEdit[], isLastEdits: boolean, responseModel: IChatResponseModel): void {
+		const notebookEditor = this.notebookEditorService.retrieveExistingWidgetFromURI(this.notebookUri)?.value;
+		if (notebookEditor) {
+			const vm = notebookEditor.getCellByHandle(this.cell.handle);
+			vm?.updateEditState(CellEditState.Editing, 'chatEdit');
+		}
 
 		// push stack element for the first edit
 		if (this._isFirstEditAfterStartOrSnapshot) {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
index f702df873c88..7306e57148ea 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
@@ -15,6 +15,7 @@ import { IResourceDiffEditorInput } from '../../../../common/editor.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { NotebookDeletedCellDecorator } from '../../../notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.js';
 import { NotebookInsertedCellDecorator } from '../../../notebook/browser/diff/inlineDiff/notebookInsertedCellDecorator.js';
+import { NotebookModifiedCellDecorator } from '../../../notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.js';
 import { INotebookTextDiffEditor } from '../../../notebook/browser/diff/notebookDiffEditorBrowser.js';
 import { INotebookEditor } from '../../../notebook/browser/notebookBrowser.js';
 import { NotebookCellTextModel } from '../../../notebook/common/model/notebookCellTextModel.js';
@@ -66,7 +67,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 
 	private readonly cellEditorIntegrations = new Map<NotebookCellTextModel, { integration: ChatEditingCodeEditorIntegration; diff: ISettableObservable<IDocumentDiff2> }>();
 
-	private readonly insertDeleteDecorators: IObservable<{ insertedCellDecorator: NotebookInsertedCellDecorator; deletedCellDecorator: NotebookDeletedCellDecorator } | undefined>;
+	private readonly insertDeleteDecorators: IObservable<{ insertedCellDecorator: NotebookInsertedCellDecorator; modifiedCellDecorator: NotebookModifiedCellDecorator; deletedCellDecorator: NotebookDeletedCellDecorator } | undefined>;
 
 	constructor(
 		private readonly _entry: IModifiedFileEntry,
@@ -183,6 +184,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 			}
 
 			const insertedCellDecorator = store.add(this.instantiationService.createInstance(NotebookInsertedCellDecorator, this.notebookEditor));
+			const modifiedCellDecorator = store.add(this.instantiationService.createInstance(NotebookModifiedCellDecorator, this.notebookEditor));
 			const deletedCellDecorator = store.add(this.instantiationService.createInstance(NotebookDeletedCellDecorator, this.notebookEditor, {
 				className: 'chat-diff-change-content-widget',
 				telemetrySource: 'chatEditingNotebookHunk',
@@ -209,6 +211,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 
 			return {
 				insertedCellDecorator,
+				modifiedCellDecorator,
 				deletedCellDecorator
 			};
 		});
@@ -219,6 +222,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 			const decorators = this.insertDeleteDecorators.read(r);
 			if (decorators) {
 				decorators.insertedCellDecorator.apply(changes);
+				decorators.modifiedCellDecorator.apply(changes);
 				decorators.deletedCellDecorator.apply(changes, originalModel);
 			}
 		}));
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.ts b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.ts
new file mode 100644
index 000000000000..f2993cbb42eb
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.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 { Disposable, DisposableStore, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { CellDiffInfo } from '../notebookDiffViewModel.js';
+import { INotebookEditor } from '../../notebookBrowser.js';
+import { CellKind } from '../../../common/notebookCommon.js';
+import { NotebookCellTextModel } from '../../../common/model/notebookCellTextModel.js';
+
+export class NotebookModifiedCellDecorator extends Disposable {
+	private readonly decorators = this._register(new DisposableStore());
+	constructor(
+		private readonly notebookEditor: INotebookEditor,
+	) {
+		super();
+	}
+
+	public apply(diffInfo: CellDiffInfo[]) {
+		const model = this.notebookEditor.textModel;
+		if (!model) {
+			return;
+		}
+
+		const modifiedMarkdownCells: NotebookCellTextModel[] = [];
+		for (const diff of diffInfo) {
+			if (diff.type === 'modified') {
+				const cell = model.cells[diff.modifiedCellIndex];
+				if (cell.cellKind === CellKind.Markup) {
+					modifiedMarkdownCells.push(cell);
+				}
+			}
+		}
+
+		const ids = this.notebookEditor.deltaCellDecorations([], modifiedMarkdownCells.map(cell => ({
+			handle: cell.handle,
+			options: { outputClassName: 'nb-insertHighlight' }
+		})));
+
+		this.clear();
+		this.decorators.add(toDisposable(() => {
+			if (!this.notebookEditor.isDisposed) {
+				this.notebookEditor.deltaCellDecorations(ids, []);
+			}
+		}));
+	}
+	public clear() {
+		this.decorators.clear();
+	}
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
index f33e4a2dfbed..26e9dbba4408 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
@@ -404,6 +404,10 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Themable {
 						background-color: var(--theme-notebook-symbol-highlight-background);
 					}
 
+					#container .markup > div.nb-insertHighlight {
+						background-color: var(--vscode-diffEditor-insertedLineBackground, var(--vscode-diffEditor-insertedTextBackground));
+					}
+
 					#container .nb-symbolHighlight .output_container .output {
 						background-color: var(--theme-notebook-symbol-highlight-background);
 					}

From b7d674d3f420c3ca862cf3a315d52317fe475b4f Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Wed, 26 Feb 2025 15:13:35 +1100
Subject: [PATCH 0401/1815] Support creating Jupyter Notebooks via chat edits
 (#242006)

---
 .../chat/browser/chatEditing/chatEditingSession.ts        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 01e9f18edc68..82a921bcc6c6 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -1049,8 +1049,8 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 	private async _createModifiedFileEntry(resource: URI, telemetryInfo: IModifiedEntryTelemetryInfo, mustExist = false, initialContent: string | undefined): Promise<AbstractChatEditingModifiedFileEntry> {
 		const multiDiffEntryDelegate = { collapse: (transaction: ITransaction | undefined) => this._collapse(resource, transaction) };
 		const chatKind = mustExist ? ChatEditKind.Created : ChatEditKind.Modified;
+		const notebookUri = CellUri.parse(resource)?.notebook || resource;
 		try {
-			const notebookUri = CellUri.parse(resource)?.notebook || resource;
 			// If a notebook isn't open, then use the old synchronization approach.
 			if (this._notebookService.hasSupportedNotebooks(notebookUri) && (this._notebookService.getNotebookTextModel(notebookUri) || ChatEditingModifiedNotebookEntry.canHandleSnapshot(initialContent))) {
 				return ChatEditingModifiedNotebookEntry.create(notebookUri, multiDiffEntryDelegate, telemetryInfo, chatKind, initialContent, this._instantiationService);
@@ -1065,7 +1065,11 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			// this file does not exist yet, create it and try again
 			await this._bulkEditService.apply({ edits: [{ newResource: resource }] });
 			this._editorService.openEditor({ resource, options: { inactive: true, preserveFocus: true, pinned: true } });
-			return this._createModifiedFileEntry(resource, telemetryInfo, true, initialContent);
+			if (this._notebookService.hasSupportedNotebooks(notebookUri)) {
+				return ChatEditingModifiedNotebookEntry.create(resource, multiDiffEntryDelegate, telemetryInfo, chatKind, initialContent, this._instantiationService);
+			} else {
+				return this._createModifiedFileEntry(resource, telemetryInfo, true, initialContent);
+			}
 		}
 	}
 

From b7f484ee669cf90243a13a8104691d0bf6c8b123 Mon Sep 17 00:00:00 2001
From: Michael Lively <michaellively00@gmail.com>
Date: Tue, 25 Feb 2025 21:17:46 -0800
Subject: [PATCH 0402/1815] Inline value polish - better variable
 identification (#242005)

* add tokenization to help dodging comments

* add string and regex to token stuff
---
 .../notebookInlineVariables.ts                | 208 ++++++++++++++++--
 1 file changed, 187 insertions(+), 21 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookInlineVariables.ts b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookInlineVariables.ts
index 38164a2b381e..571038352440 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookInlineVariables.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookInlineVariables.ts
@@ -12,6 +12,7 @@ import { isEqual } from '../../../../../../base/common/resources.js';
 import { format } from '../../../../../../base/common/strings.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 { InlineValueContext, InlineValueText, InlineValueVariableLookup } from '../../../../../../editor/common/languages.js';
 import { IModelDeltaDecoration, ITextModel } from '../../../../../../editor/common/model.js';
 import { ILanguageFeaturesService } from '../../../../../../editor/common/services/languageFeatures.js';
@@ -42,6 +43,8 @@ export class NotebookInlineVariablesController extends Disposable implements INo
 
 	private currentCancellationTokenSources = new ResourceMap<CancellationTokenSource>();
 
+	private static readonly MAX_CELL_LINES = 5000; // Skip extremely large cells
+
 	constructor(
 		private readonly notebookEditor: INotebookEditor,
 		@INotebookKernelService private readonly notebookKernelService: INotebookKernelService,
@@ -236,10 +239,18 @@ export class NotebookInlineVariablesController extends Disposable implements INo
 				return;
 			}
 
+			// Skip processing for extremely large cells
+			if (document.getLineCount() > NotebookInlineVariablesController.MAX_CELL_LINES) {
+				return;
+			}
+
 			const inlineDecorations: IModelDeltaDecoration[] = [];
 			const processedVars = new Set<string>();
 
+			// Get both function ranges and comment ranges
 			const functionRanges = this.getFunctionRanges(document);
+			const commentedRanges = this.getCommentedRanges(document);
+			const ignoredRanges = [...functionRanges, ...commentedRanges];
 			const lineDecorations = new Map<number, InlineSegment[]>();
 
 			// For each variable name found in the kernel results
@@ -248,46 +259,47 @@ export class NotebookInlineVariablesController extends Disposable implements INo
 					continue;
 				}
 
-				// Look for variable usage globally
-				const regex = new RegExp(`\\b${varName}\\b`, 'g');
-				let lastMatchOutsideFunction: { line: number; column: number } | null = null;
+				// Look for variable usage globally - using word boundaries to ensure exact matches
+				const regex = new RegExp(`\\b${varName}\\b(?!\\w)`, 'g');
+				let lastMatchOutsideIgnored: { line: number; column: number } | null = null;
+				let foundMatch = false;
 
+				// Scan lines in reverse to find last occurrence first
 				const lines = document.getValue().split('\n');
-				for (let lineNumber = 0; lineNumber < lines.length; lineNumber++) {
+				for (let lineNumber = lines.length - 1; lineNumber >= 0; lineNumber--) {
 					const line = lines[lineNumber];
 					let match: RegExpExecArray | null;
 
 					while ((match = regex.exec(line)) !== null) {
-						const pos = new Position(lineNumber + 1, match.index + 1);
-						let isInFunction = false;
-
-						// Check if this usage is within any function range
-						for (const range of functionRanges) {
-							if (range.containsPosition(pos)) {
-								isInFunction = true;
-								break;
-							}
-						}
+						const startIndex = match.index;
+						const pos = new Position(lineNumber + 1, startIndex + 1);
 
-						if (!isInFunction) {
-							lastMatchOutsideFunction = {
+						// Check if this position is in any ignored range (function or comment)
+						if (!this.isPositionInRanges(pos, ignoredRanges)) {
+							lastMatchOutsideIgnored = {
 								line: lineNumber + 1,
-								column: match.index + 1
+								column: startIndex + 1
 							};
+							foundMatch = true;
+							break; // Take first match in reverse order (which is last chronologically)
 						}
 					}
+
+					if (foundMatch) {
+						break; // We found our last valid occurrence, no need to check earlier lines
+					}
 				}
 
-				if (lastMatchOutsideFunction) {
+				if (lastMatchOutsideIgnored) {
 					const inlineVal = varName + ' = ' + vars.find(v => v.name === varName)?.value;
 
-					let lineSegments = lineDecorations.get(lastMatchOutsideFunction.line);
+					let lineSegments = lineDecorations.get(lastMatchOutsideIgnored.line);
 					if (!lineSegments) {
 						lineSegments = [];
-						lineDecorations.set(lastMatchOutsideFunction.line, lineSegments);
+						lineDecorations.set(lastMatchOutsideIgnored.line, lineSegments);
 					}
 					if (!lineSegments.some(iv => iv.text === inlineVal)) { // de-dupe
-						lineSegments.push(new InlineSegment(lastMatchOutsideFunction.column, inlineVal));
+						lineSegments.push(new InlineSegment(lastMatchOutsideIgnored.column, inlineVal));
 					}
 				}
 
@@ -414,6 +426,157 @@ export class NotebookInlineVariablesController extends Disposable implements INo
 		return functionRanges;
 	}
 
+	private getCommentedRanges(document: ITextModel): Range[] {
+		return this._getCommentedRanges(document);
+	}
+
+	private _getCommentedRanges(document: ITextModel): Range[] {
+		try {
+			return this.getCommentedRangesByAccurateTokenization(document);
+		} catch (e) {
+			// Fall back to manual parsing if tokenization fails
+			return this.getCommentedRangesByManualParsing(document);
+		}
+	}
+
+	private getCommentedRangesByAccurateTokenization(document: ITextModel): Range[] {
+		const commentRanges: Range[] = [];
+		const lineCount = document.getLineCount();
+
+		// Skip processing for extremely large documents
+		if (lineCount > NotebookInlineVariablesController.MAX_CELL_LINES) {
+			return commentRanges;
+		}
+
+		// Process each line - force tokenization if needed and process tokens in a single pass
+		for (let lineNumber = 1; lineNumber <= lineCount; lineNumber++) {
+			// Force tokenization if needed
+			if (!document.tokenization.hasAccurateTokensForLine(lineNumber)) {
+				document.tokenization.forceTokenization(lineNumber);
+			}
+
+			const lineTokens = document.tokenization.getLineTokens(lineNumber);
+
+			// Skip lines with no tokens
+			if (lineTokens.getCount() === 0) {
+				continue;
+			}
+
+			let startCharacter: number | undefined;
+
+			// Check each token in the line
+			for (let tokenIndex = 0; tokenIndex < lineTokens.getCount(); tokenIndex++) {
+				const tokenType = lineTokens.getStandardTokenType(tokenIndex);
+
+				if (tokenType === StandardTokenType.Comment || tokenType === StandardTokenType.String || tokenType === StandardTokenType.RegEx) {
+					if (startCharacter === undefined) {
+						// Start of a comment or string
+						startCharacter = lineTokens.getStartOffset(tokenIndex);
+					}
+
+					const endCharacter = lineTokens.getEndOffset(tokenIndex);
+
+					// Check if this is the end of the comment/string section (either end of line or different token type follows)
+					const isLastToken = tokenIndex === lineTokens.getCount() - 1;
+					const nextTokenDifferent = !isLastToken &&
+						lineTokens.getStandardTokenType(tokenIndex + 1) !== tokenType;
+
+					if (isLastToken || nextTokenDifferent) {
+						// End of comment/string section
+						commentRanges.push(new Range(lineNumber, startCharacter + 1, lineNumber, endCharacter + 1));
+						startCharacter = undefined;
+					}
+				} else {
+					// Reset when we hit a non-comment, non-string token
+					startCharacter = undefined;
+				}
+			}
+		}
+
+		return commentRanges;
+	}
+
+	private getCommentedRangesByManualParsing(document: ITextModel): Range[] {
+		const commentRanges: Range[] = [];
+		const lines = document.getValue().split('\n');
+		const languageId = document.getLanguageId();
+
+		// Different comment patterns by language
+		const lineCommentToken =
+			languageId === 'python' ? '#' :
+				languageId === 'javascript' || languageId === 'typescript' ? '//' :
+					null;
+
+		const blockComments =
+			(languageId === 'javascript' || languageId === 'typescript') ? { start: '/*', end: '*/' } :
+				null;
+
+		let inBlockComment = false;
+		let blockCommentStartLine = -1;
+		let blockCommentStartCol = -1;
+
+		for (let lineNumber = 0; lineNumber < lines.length; lineNumber++) {
+			const line = lines[lineNumber];
+			const trimmedLine = line.trim();
+
+			// Skip empty lines
+			if (trimmedLine.length === 0) {
+				continue;
+			}
+
+			if (blockComments) {
+				if (!inBlockComment) {
+					const startIndex = line.indexOf(blockComments.start);
+					if (startIndex !== -1) {
+						inBlockComment = true;
+						blockCommentStartLine = lineNumber;
+						blockCommentStartCol = startIndex;
+					}
+				}
+
+				if (inBlockComment) {
+					const endIndex = line.indexOf(blockComments.end);
+					if (endIndex !== -1) {
+						commentRanges.push(new Range(
+							blockCommentStartLine + 1,
+							blockCommentStartCol + 1,
+							lineNumber + 1,
+							endIndex + blockComments.end.length + 1
+						));
+						inBlockComment = false;
+					}
+					continue;
+				}
+			}
+
+			if (!inBlockComment && lineCommentToken && line.trimLeft().startsWith(lineCommentToken)) {
+				const startCol = line.indexOf(lineCommentToken);
+				commentRanges.push(new Range(
+					lineNumber + 1,
+					startCol + 1,
+					lineNumber + 1,
+					line.length + 1
+				));
+			}
+		}
+
+		// Handle block comment at end of file
+		if (inBlockComment) {
+			commentRanges.push(new Range(
+				blockCommentStartLine + 1,
+				blockCommentStartCol + 1,
+				lines.length,
+				lines[lines.length - 1].length + 1
+			));
+		}
+
+		return commentRanges;
+	}
+
+	private isPositionInRanges(position: Position, ranges: Range[]): boolean {
+		return ranges.some(range => range.containsPosition(position));
+	}
+
 	private updateCellInlineDecorations(cell: ICellViewModel, decorations: IModelDeltaDecoration[]) {
 		const oldDecorations = this.cellDecorationIds.get(cell) ?? [];
 		this.cellDecorationIds.set(cell, cell.deltaModelDecorations(
@@ -428,6 +591,7 @@ export class NotebookInlineVariablesController extends Disposable implements INo
 			return; // should not happen
 		}
 
+		// Clear decorations on content change
 		this.cellContentListeners.set(cell.uri, cellModel.onDidChangeContent(() => {
 			this.clearCellInlineDecorations(cell);
 		}));
@@ -462,6 +626,8 @@ export class NotebookInlineVariablesController extends Disposable implements INo
 		this._clearNotebookInlineDecorations();
 		this.currentCancellationTokenSources.forEach(source => source.cancel());
 		this.currentCancellationTokenSources.clear();
+		this.cellContentListeners.forEach(listener => listener.dispose());
+		this.cellContentListeners.clear();
 	}
 }
 

From 90732c28df3750f84e02a8d978161a2fa3bb690a Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Tue, 25 Feb 2025 22:04:56 -0800
Subject: [PATCH 0403/1815] Ensure untitled notebook document is identified for
 edit session. (#242002)

---
 .../browser/chatEditing/chatEditingModifiedNotebookEntry.ts  | 2 +-
 .../contrib/notebook/browser/services/notebookServiceImpl.ts | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 145cb1a8d24d..d63450e6504c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -112,7 +112,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			const loggingService = accessor.get(INotebookLoggingService);
 			const resourceRef: IReference<IResolvedNotebookEditorModel> = await resolver.resolve(uri);
 			const notebook = resourceRef.object.notebook;
-			const originalUri = ChatEditingNotebookFileSystemProvider.getSnapshotFileURI(telemetryInfo.requestId, notebook.uri.path);
+			const originalUri = ChatEditingNotebookFileSystemProvider.getSnapshotFileURI(telemetryInfo.requestId, notebook.uri.scheme === Schemas.untitled ? `/${notebook.uri.path}` : notebook.uri.path);
 			const [options, buffer] = await Promise.all([
 				notebookService.withNotebookDataProvider(resourceRef.object.notebook.notebookType),
 				notebookService.createNotebookTextDocumentSnapshot(notebook.uri, SnapshotContext.Backup, CancellationToken.None).then(s => streamToBuffer(s))
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
index b1670958f9fa..1bc15e00ae32 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
@@ -871,6 +871,11 @@ export class NotebookService extends Disposable implements INotebookService {
 	}
 
 	hasSupportedNotebooks(resource: URI): boolean {
+		if (this._models.has(resource)) {
+			// it might be untitled
+			return true;
+		}
+
 		const contribution = this.notebookProviderInfoStore.getContributedNotebook(resource);
 		if (!contribution.length) {
 			return false;

From 5fd3eff3102763657b35d94f3d3f9228ef01e335 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 25 Feb 2025 22:07:13 -0800
Subject: [PATCH 0404/1815] Fix broken #selection (#242013)

`vscode.file` is assumed to be a URI by prompt file support
---
 .../contrib/chat/browser/contrib/chatInputCompletions.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
index 0f4cd25c10dc..41759588e185 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
@@ -560,7 +560,7 @@ class BuiltinDynamicCompletions extends Disposable {
 				sortText: 'z',
 				command: {
 					id: BuiltinDynamicCompletions.addReferenceCommand, title: '', arguments: [new ReferenceArgument(widget, {
-						id: 'vscode.file',
+						id: 'vscode.selection',
 						prefix: 'file',
 						isFile: true,
 						range: { startLineNumber: range.replace.startLineNumber, startColumn: range.replace.startColumn, endLineNumber: range.replace.endLineNumber, endColumn: range.replace.startColumn + text.length },

From 1bebd2730c60dd025ed36d2f451319f903890304 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 25 Feb 2025 22:07:45 -0800
Subject: [PATCH 0405/1815] Fix terminal editor layout issues (#242015)

* Fix terminal editor layout issues

* comment
---
 .../contrib/chat/browser/chatListRenderer.ts         | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index 9c9c7c1d933f..81ec6916c421 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -17,6 +17,7 @@ import { Codicon } from '../../../../base/common/codicons.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, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../base/common/map.js';
@@ -132,6 +133,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 	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;
@@ -142,7 +144,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 	/**
 	 * Tool invocations get their own so that the ChatViewModel doesn't overwrite it.
-	 * TODO@roblourens @mjbvz is there a better solution?
+	 * TODO@roblourens shouldn't use the CodeBlockModelCollection at all
 	 */
 	private readonly _toolInvocationCodeBlockCollection: CodeBlockModelCollection;
 
@@ -166,6 +168,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		this.renderer = this.instantiationService.createInstance(ChatMarkdownRenderer, undefined);
 		this.markdownDecorationsRenderer = this.instantiationService.createInstance(ChatMarkdownDecorationsRenderer);
 		this._editorPool = this._register(this.instantiationService.createInstance(EditorPool, editorOptions, delegate, overflowWidgetsDomNode));
+		this._toolEditorPool = this._register(this.instantiationService.createInstance(EditorPool, editorOptions, delegate, overflowWidgetsDomNode));
 		this._diffEditorPool = this._register(this.instantiationService.createInstance(DiffEditorPool, editorOptions, delegate, overflowWidgetsDomNode));
 		this._treePool = this._register(this.instantiationService.createInstance(TreePool, this._onDidChangeVisibility.event));
 		this._contentReferencesListPool = this._register(this.instantiationService.createInstance(CollapsibleListPool, this._onDidChangeVisibility.event, undefined));
@@ -179,7 +182,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 	}
 
 	editorsInUse(): Iterable<CodeBlockPart> {
-		return this._editorPool.inUse();
+		return Iterable.concat(this._editorPool.inUse(), this._toolEditorPool.inUse());
 	}
 
 	private traceLayout(method: string, message: string) {
@@ -244,6 +247,9 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		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);
 		}
@@ -998,7 +1004,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 	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.renderer, this._contentReferencesListPool, this._editorPool, () => this._currentLayoutWidth, this._toolInvocationCodeBlockCollection, codeBlockStartIndex);
+		const part = this.instantiationService.createInstance(ChatToolInvocationPart, toolInvocation, context, this.renderer, this._contentReferencesListPool, this._toolEditorPool, () => this._currentLayoutWidth, this._toolInvocationCodeBlockCollection, codeBlockStartIndex);
 		part.addDisposable(part.onDidChangeHeight(() => {
 			this.updateItemHeight(templateData);
 		}));

From 2c3e19a400708d3a91c7e02e2008c65abb0330e4 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 25 Feb 2025 22:09:01 -0800
Subject: [PATCH 0406/1815] Remove overlapping border in theme with transparent
 input color (#242017)

Towards #237349
---
 src/vs/workbench/contrib/chat/browser/media/chat.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index abc8acd7da50..5afe77989365 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -569,11 +569,12 @@ have to be updated for changes to the rules above, or to support more deeply nes
 }
 
 .interactive-session .chat-editing-session .chat-editing-session-container {
-	margin-bottom: -14px;
+	margin-bottom: -13px;
 	padding: 6px 8px 18px 8px;
 	box-sizing: border-box;
 	background-color: var(--vscode-editor-background);
 	border: 1px solid var(--vscode-input-border, transparent);
+	border-bottom: none;
 	border-radius: 4px;
 	display: flex;
 	flex-direction: column;

From 8e7f0bd9879586fabb13016ce1105f3e672a216f Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 26 Feb 2025 07:12:57 +0100
Subject: [PATCH 0407/1815] `TextInputActionProvider` not disposing `Action`s
 (fix #241889) (#242018)

---
 .../browser/actions/textInputActions.ts       | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/vs/workbench/browser/actions/textInputActions.ts b/src/vs/workbench/browser/actions/textInputActions.ts
index 144544e2032d..7932de953a88 100644
--- a/src/vs/workbench/browser/actions/textInputActions.ts
+++ b/src/vs/workbench/browser/actions/textInputActions.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAction, Action, Separator } from '../../../base/common/actions.js';
+import { IAction, Separator, toAction } from '../../../base/common/actions.js';
 import { localize } from '../../../nls.js';
 import { IWorkbenchLayoutService } from '../../services/layout/browser/layoutService.js';
 import { IContextMenuService } from '../../../platform/contextview/browser/contextView.js';
@@ -18,30 +18,29 @@ import { Lazy } from '../../../base/common/lazy.js';
 export function createTextInputActions(clipboardService: IClipboardService): IAction[] {
 	return [
 
-		// Undo/Redo
-		new Action('undo', localize('undo', "Undo"), undefined, true, async () => getActiveDocument().execCommand('undo')),
-		new Action('redo', localize('redo', "Redo"), undefined, true, async () => getActiveDocument().execCommand('redo')),
+		toAction({ id: 'undo', label: localize('undo', "Undo"), run: () => getActiveDocument().execCommand('undo') }),
+		toAction({ id: 'redo', label: localize('redo', "Redo"), run: () => getActiveDocument().execCommand('redo') }),
 		new Separator(),
-
-		// Cut / Copy / Paste
-		new Action('editor.action.clipboardCutAction', localize('cut', "Cut"), undefined, true, async () => getActiveDocument().execCommand('cut')),
-		new Action('editor.action.clipboardCopyAction', localize('copy', "Copy"), undefined, true, async () => getActiveDocument().execCommand('copy')),
-		new Action('editor.action.clipboardPasteAction', localize('paste', "Paste"), undefined, true, async element => {
-			const clipboardText = await clipboardService.readText();
-			if (isHTMLTextAreaElement(element) || isHTMLInputElement(element)) {
-				const selectionStart = element.selectionStart || 0;
-				const selectionEnd = element.selectionEnd || 0;
-
-				element.value = `${element.value.substring(0, selectionStart)}${clipboardText}${element.value.substring(selectionEnd, element.value.length)}`;
-				element.selectionStart = selectionStart + clipboardText.length;
-				element.selectionEnd = element.selectionStart;
-				element.dispatchEvent(new Event('input', { bubbles: true, cancelable: true }));
+		toAction({ id: 'editor.action.clipboardCutAction', label: localize('cut', "Cut"), run: () => getActiveDocument().execCommand('cut') }),
+		toAction({ id: 'editor.action.clipboardCopyAction', label: localize('copy', "Copy"), run: () => getActiveDocument().execCommand('copy') }),
+		toAction({
+			id: 'editor.action.clipboardPasteAction',
+			label: localize('paste', "Paste"),
+			run: async (element: unknown) => {
+				const clipboardText = await clipboardService.readText();
+				if (isHTMLTextAreaElement(element) || isHTMLInputElement(element)) {
+					const selectionStart = element.selectionStart || 0;
+					const selectionEnd = element.selectionEnd || 0;
+
+					element.value = `${element.value.substring(0, selectionStart)}${clipboardText}${element.value.substring(selectionEnd, element.value.length)}`;
+					element.selectionStart = selectionStart + clipboardText.length;
+					element.selectionEnd = element.selectionStart;
+					element.dispatchEvent(new Event('input', { bubbles: true, cancelable: true }));
+				}
 			}
 		}),
 		new Separator(),
-
-		// Select All
-		new Action('editor.action.selectAll', localize('selectAll', "Select All"), undefined, true, async () => getActiveDocument().execCommand('selectAll'))
+		toAction({ id: 'editor.action.selectAll', label: localize('selectAll', "Select All"), run: () => getActiveDocument().execCommand('selectAll') })
 	];
 }
 

From 5b62c2e5845d63d76950f438c6214875bfd7a123 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 26 Feb 2025 07:23:37 +0100
Subject: [PATCH 0408/1815] Very vague sentence about text encoding change (fix
 #241836) (#242019)

---
 .../vscode.proposed.textDocumentEncoding.d.ts        | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts b/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts
index 5a0c99aa207b..5c2690ba2e48 100644
--- a/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts
+++ b/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts
@@ -56,14 +56,16 @@ declare module 'vscode' {
 			/**
 			 * The {@link TextDocument.encoding encoding} of the document to use
 			 * for decoding the underlying buffer to text. If omitted, the encoding
-			 * will be guessed based on the file content and/or the editor settings.
+			 * will be guessed based on the file content and/or the editor settings
+			 * unless the document is already opened.
 			 *
 			 * See {@link TextDocument.encoding} for more information about valid
 			 * values for encoding.
 			 *
 			 * *Note* that opening a text document that was already opened with a
 			 * different encoding has the potential of changing the text contents of
-			 * the text document.
+			 * the text document. Specifically, when the encoding results in a
+			 * different set of characters than the previous encoding.
 			 */
 			encoding?: string;
 		}): Thenable<TextDocument>;
@@ -80,14 +82,16 @@ declare module 'vscode' {
 			/**
 			 * The {@link TextDocument.encoding encoding} of the document to use
 			 * for decoding the underlying buffer to text. If omitted, the encoding
-			 * will be guessed based on the file content and/or the editor settings.
+			 * will be guessed based on the file content and/or the editor settings
+			 * unless the document is already opened.
 			 *
 			 * See {@link TextDocument.encoding} for more information about valid
 			 * values for encoding.
 			 *
 			 * *Note* that opening a text document that was already opened with a
 			 * different encoding has the potential of changing the text contents of
-			 * the text document.
+			 * the text document. Specifically, when the encoding results in a
+			 * different set of characters than the previous encoding.
 			 */
 			encoding?: string;
 		}): Thenable<TextDocument>;

From 7f59e066a04c2243e672de7f0237f6c53d9314bf Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Tue, 25 Feb 2025 22:26:09 -0800
Subject: [PATCH 0409/1815] Fix decorations removal when cell is outside of
 viewport. (#242020)

* Modified markup cell decorators

* Fix decorations removal when cell is outside of viewport.
---
 .../notebook/browser/notebookEditorWidget.ts  | 22 +++++++++++++++++++
 .../browser/view/cellParts/cellDecorations.ts | 10 ---------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
index 1f078d4222bc..1c6d1eed11b5 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -1614,6 +1614,28 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 			}
 		}));
 
+		store.add(cell.onCellDecorationsChanged(e => {
+			e.added.forEach(options => {
+				if (options.className) {
+					this.deltaCellContainerClassNames(cell.id, [options.className], []);
+				}
+
+				if (options.outputClassName) {
+					this.deltaCellContainerClassNames(cell.id, [options.outputClassName], []);
+				}
+			});
+
+			e.removed.forEach(options => {
+				if (options.className) {
+					this.deltaCellContainerClassNames(cell.id, [], [options.className]);
+				}
+
+				if (options.outputClassName) {
+					this.deltaCellContainerClassNames(cell.id, [], [options.outputClassName]);
+				}
+			});
+		}));
+
 		return store;
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDecorations.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDecorations.ts
index 98340a20af7e..9068b002c64b 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDecorations.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDecorations.ts
@@ -59,22 +59,12 @@ export class CellDecorations extends CellContentPart {
 			e.added.forEach(options => {
 				if (options.className && this.currentCell) {
 					this.rootContainer.classList.add(options.className);
-					this.notebookEditor.deltaCellContainerClassNames(this.currentCell.id, [options.className], []);
-				}
-
-				if (options.outputClassName && this.currentCell) {
-					this.notebookEditor.deltaCellContainerClassNames(this.currentCell.id, [options.outputClassName], []);
 				}
 			});
 
 			e.removed.forEach(options => {
 				if (options.className && this.currentCell) {
 					this.rootContainer.classList.remove(options.className);
-					this.notebookEditor.deltaCellContainerClassNames(this.currentCell.id, [], [options.className]);
-				}
-
-				if (options.outputClassName && this.currentCell) {
-					this.notebookEditor.deltaCellContainerClassNames(this.currentCell.id, [], [options.outputClassName]);
 				}
 			});
 		}));

From a68acca8cb0c424937dcc7d5d3e7d088951b958f Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 26 Feb 2025 07:49:40 +0100
Subject: [PATCH 0410/1815] =?UTF-8?q?Revert=20"chat:=20fix=20potential=20i?=
 =?UTF-8?q?ssue=20with=20chat=20session=20being=20stuck=20in=20streaming?=
 =?UTF-8?q?=20=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 65c78d2c536f11045773772792a1c0859681c00d.
---
 .../chatEditingModifiedFileEntry.ts           |  2 +-
 .../browser/chatEditing/chatEditingSession.ts | 28 +++++++------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
index 1a7707ea3bc8..df0a5bd60521 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
@@ -227,7 +227,7 @@ export abstract class AbstractChatEditingModifiedFileEntry extends Disposable im
 
 	abstract acceptAgentEdits(uri: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void>;
 
-	acceptStreamingEditsEnd(tx: ITransaction) {
+	async acceptStreamingEditsEnd(tx: ITransaction) {
 		this._resetEditsState(tx);
 
 		// AUTO accept mode
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 82a921bcc6c6..2fd6cb404d23 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -711,7 +711,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 
 			startPromise.complete();
 			return completePromise.p;
-		}).then(() => this._onStreamingEditDequeued());
+		});
 
 
 		let didComplete = false;
@@ -747,7 +747,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 				sequencer.queue(async () => {
 					if (!this.isDisposed) {
 						await this._acceptEdits(resource, [], true, responseModel);
-						this._resolve(responseModel.requestId, inUndoStop, resource);
+						await this._resolve(responseModel.requestId, inUndoStop, resource);
 						completePromise.complete();
 					}
 				});
@@ -755,19 +755,6 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		};
 	}
 
-	private _onStreamingEditDequeued() {
-		const state = this._state.get();
-		if (state === ChatEditingSessionState.Disposed) {
-			return;
-		}
-
-		const isStreamingEdits = !Iterable.isEmpty(this._streamingEditLocks.keys());
-		const targetState = isStreamingEdits ? ChatEditingSessionState.StreamingEdits : ChatEditingSessionState.Idle;
-		if (state !== targetState) {
-			this._state.set(targetState, undefined);
-		}
-	}
-
 	private _trackUntitledWorkingSetEntry(resource: URI) {
 		if (resource.scheme !== Schemas.untitled) {
 			return;
@@ -976,15 +963,20 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		};
 	}
 
-	private _resolve(requestId: string, undoStop: string | undefined, resource: URI): void {
-		transaction((tx) => {
+	private async _resolve(requestId: string, undoStop: string | undefined, resource: URI): Promise<void> {
+		await asyncTransaction(async (tx) => {
+			const hasOtherTasks = Iterable.some(this._streamingEditLocks.keys(), k => k !== resource.toString());
+			if (!hasOtherTasks) {
+				this._state.set(ChatEditingSessionState.Idle, tx);
+			}
+
 			const entry = this._getEntry(resource);
 			if (!entry) {
 				return;
 			}
 
 			this.ensureEditInUndoStopMatches(requestId, undoStop, entry, /* next= */ true, tx);
-			entry.acceptStreamingEditsEnd(tx);
+			return entry.acceptStreamingEditsEnd(tx);
 		});
 
 		this._onDidChange.fire(ChatEditingSessionChangeType.Other);

From af7149f604bdb2e485258fb64bed898efeea73fa Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 26 Feb 2025 07:50:01 +0100
Subject: [PATCH 0411/1815] chat - fix perf regression in contributions
 (#242021)

---
 .../contrib/chat/browser/chat.contribution.ts      |  1 -
 src/vs/workbench/contrib/chat/browser/chatSetup.ts | 14 +++++++-------
 .../workbench/contrib/chat/browser/chatStatus.ts   |  5 +++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 9a6820747a27..b4edc100f262 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -497,5 +497,4 @@ registerSingleton(IChatMarkdownAnchorService, ChatMarkdownAnchorService, Instant
 registerSingleton(ILanguageModelIgnoredFilesService, LanguageModelIgnoredFilesService, InstantiationType.Delayed);
 registerSingleton(IChatQuotasService, ChatQuotasService, InstantiationType.Delayed);
 registerSingleton(IChatEntitlementsService, ChatEntitlementsService, InstantiationType.Delayed);
-
 registerSingleton(IPromptsService, PromptsService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index b60f4810dde2..2a6fe9bc56b8 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -99,8 +99,8 @@ export class ChatEntitlementsService extends Disposable implements IChatEntitlem
 
 	declare _serviceBrand: undefined;
 
-	readonly context: ChatSetupContext | undefined;
-	readonly requests: ChatSetupRequests | undefined;
+	readonly context: Lazy<ChatSetupContext> | undefined;
+	readonly requests: Lazy<ChatSetupRequests> | undefined;
 
 	constructor(
 		@IInstantiationService instantiationService: IInstantiationService,
@@ -116,12 +116,12 @@ export class ChatEntitlementsService extends Disposable implements IChatEntitlem
 			return;
 		}
 
-		this.context = this._register(instantiationService.createInstance(ChatSetupContext));
-		this.requests = this._register(instantiationService.createInstance(ChatSetupRequests, this.context));
+		const context = this.context = new Lazy(() => this._register(instantiationService.createInstance(ChatSetupContext)));
+		this.requests = new Lazy(() => this._register(instantiationService.createInstance(ChatSetupRequests, context.value)));
 	}
 
 	async resolve(token: CancellationToken): Promise<IChatEntitlements | undefined> {
-		return this.requests?.forceResolveEntitlement(undefined, token);
+		return this.requests?.value.forceResolveEntitlement(undefined, token);
 	}
 }
 
@@ -143,8 +143,8 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 	) {
 		super();
 
-		const context = chatEntitlementsService.context;
-		const requests = chatEntitlementsService.requests;
+		const context = chatEntitlementsService.context?.value;
+		const requests = chatEntitlementsService.requests?.value;
 		if (!context || !requests) {
 			return; // disabled
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index ac49a2a26ce4..5805e5fb0501 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -24,6 +24,7 @@ import { Checkbox } from '../../../../base/browser/ui/toggle/toggle.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { Command } from '../../../../editor/common/languages.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { Lazy } from '../../../../base/common/lazy.js';
 
 export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
 
@@ -32,7 +33,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	private entry: IStatusbarEntryAccessor | undefined = undefined;
 	private readonly entryDisposables = this._register(new MutableDisposable());
 
-	private dateFormatter = safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric' });
+	private dateFormatter = new Lazy(() => safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric' }));
 
 	constructor(
 		@IStatusbarService private readonly statusbarService: IStatusbarService,
@@ -147,7 +148,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 					completionsQuotaIndicator(completionsTotal, completionsRemaining);
 				});
 
-				container.appendChild($('div', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.format(quotaResetDate))));
+				container.appendChild($('div', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.value.format(quotaResetDate))));
 
 				// Settings
 				container.appendChild($('hr'));

From dbbf3c8960c0bd375116263fe835b06fdf36004f Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 26 Feb 2025 08:01:01 +0100
Subject: [PATCH 0412/1815] hover - render focus border for beak (#242023)

---
 src/vs/editor/browser/services/hoverService/hover.css | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/vs/editor/browser/services/hoverService/hover.css b/src/vs/editor/browser/services/hoverService/hover.css
index 21f7221bf68e..aa7e6ed99ce3 100644
--- a/src/vs/editor/browser/services/hoverService/hover.css
+++ b/src/vs/editor/browser/services/hoverService/hover.css
@@ -33,13 +33,9 @@
 .monaco-workbench .workbench-hover-container.locked .workbench-hover {
 	outline: 1px solid var(--vscode-editorHoverWidget-border);
 }
-.monaco-workbench .workbench-hover-container.locked .workbench-hover:focus,
-.monaco-workbench .workbench-hover-lock:focus {
+.monaco-workbench .workbench-hover-container.locked .workbench-hover:focus {
 	outline: 1px solid var(--vscode-focusBorder);
 }
-.monaco-workbench .workbench-hover-container.locked .workbench-hover-lock:hover {
-	background: var(--vscode-toolbar-hoverBackground);
-}
 
 .monaco-workbench .workbench-hover-pointer {
 	position: absolute;
@@ -62,6 +58,8 @@
 	height: 4px;
 	border-right-width: 2px;
 	border-bottom-width: 2px;
+	border-right: 1px solid var(--vscode-focusBorder);
+	border-bottom: 1px solid var(--vscode-focusBorder);
 }
 
 .monaco-workbench .workbench-hover-pointer.left   { left: -3px; }

From 114286205a152ccefa98329544dad88e16c85a56 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Wed, 26 Feb 2025 18:20:31 +1100
Subject: [PATCH 0413/1815] Trigger change event in model when response model
 completes (#242014)

---
 src/vs/workbench/contrib/chat/common/chatModel.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index 4d000aac1452..e88d7a096403 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -1114,6 +1114,7 @@ export type IChatChangeEvent =
 	| IChatSetAgentEvent
 	| IChatMoveEvent
 	| IChatSetHiddenEvent
+	| IChatCompletedRequestEvent
 	;
 
 export interface IChatAddRequestEvent {
@@ -1126,6 +1127,11 @@ export interface IChatChangedRequestEvent {
 	request: IChatRequestModel;
 }
 
+export interface IChatCompletedRequestEvent {
+	kind: 'completedRequest';
+	request: IChatRequestModel;
+}
+
 export interface IChatAddResponseEvent {
 	kind: 'addResponse';
 	response: IChatResponseModel;
@@ -1585,6 +1591,7 @@ export class ChatModel extends Disposable implements IChatModel {
 		}
 
 		request.response.complete();
+		this._onDidChange.fire({ kind: 'completedRequest', request });
 	}
 
 	setFollowups(request: ChatRequestModel, followups: IChatFollowup[] | undefined): void {

From 33df589a3a6a2e2ea6bcf016520ae04932b8104a Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 26 Feb 2025 09:05:47 +0100
Subject: [PATCH 0414/1815] fixes
 https://github.com/microsoft/vscode-copilot/issues/13511 (#242028)

---
 .../browser/media/chatEditingEditorOverlay.css   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/media/chatEditingEditorOverlay.css b/src/vs/workbench/contrib/chat/browser/media/chatEditingEditorOverlay.css
index 331871acc2f0..9356b690797b 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatEditingEditorOverlay.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatEditingEditorOverlay.css
@@ -98,12 +98,16 @@
 	color: var(--vscode-button-foreground);
 }
 
-.chat-editor-overlay-widget .monaco-action-bar .action-item.disabled > .action-label.codicon::before,
-.chat-editor-overlay-widget .monaco-action-bar .action-item.disabled > .action-label.codicon,
-.chat-editor-overlay-widget .monaco-action-bar .action-item.disabled > .action-label,
-.chat-editor-overlay-widget .monaco-action-bar .action-item.disabled > .action-label:hover {
-	color: var(--vscode-button-foreground);
-	opacity: 0.7;
+.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-foreground);
+		opacity: 0.7;
+	}
 }
 
 

From 39f5cd6f8ed646056f800220caecdf2fe48ce209 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 26 Feb 2025 09:21:07 +0100
Subject: [PATCH 0415/1815] use `isCurrentlyBeingModifiedBy` instead of
 `StreamingEdits` state (#242030)

fixes https://github.com/microsoft/vscode-copilot/issues/13485

fixes https://github.com/microsoft/vscode-copilot/issues/13363
---
 .../chatEditingCodeEditorIntegration.ts       |  5 ++--
 .../chatEditingEditorContextKeys.ts           |  7 +++--
 .../chatEditing/chatEditingEditorOverlay.ts   | 29 +++++++++----------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
index e96a4d4aa2be..def65addf686 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
@@ -36,7 +36,7 @@ import { EditorsOrder, IEditorIdentifier, isDiffEditorInput } from '../../../../
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { overviewRulerModifiedForeground, minimapGutterModifiedBackground, overviewRulerAddedForeground, minimapGutterAddedBackground, overviewRulerDeletedForeground, minimapGutterDeletedBackground } from '../../../scm/common/quickDiff.js';
 import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
-import { ChatEditingSessionState, IChatEditingService, IModifiedFileEntry, IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration, WorkingSetEntryState } from '../../common/chatEditingService.js';
+import { IChatEditingService, IModifiedFileEntry, IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { isTextDiffEditorForEntry } from './chatEditing.js';
 
 export interface IDocumentDiff2 extends IDocumentDiff {
@@ -226,7 +226,8 @@ export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEdito
 				return false;
 			}
 			for (const session of chatEditingService.editingSessionsObs.read(r)) {
-				if (session.readEntry(model.uri, r) && session.state.read(r) === ChatEditingSessionState.StreamingEdits) {
+				const entry = session.readEntry(model.uri, r);
+				if (entry?.isCurrentlyBeingModifiedBy.read(r)) {
 					return true;
 				}
 			}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts
index 69f6d04b3d73..9d8308703893 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts
@@ -13,7 +13,7 @@ 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 { ChatEditingSessionState, IChatEditingService, IChatEditingSession, IModifiedFileEntry, WorkingSetEntryState } from '../../common/chatEditingService.js';
+import { IChatEditingService, IChatEditingSession, IModifiedFileEntry, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { IChatService } from '../../common/chatService.js';
 
 export const ctxIsGlobalEditingSession = new RawContextKey<boolean>('chatEdits.isGlobalEditingSession', undefined, localize('chat.ctxEditSessionIsGlobal', "The current editor is part of the global edit session"));
@@ -120,7 +120,10 @@ class ContextKeyGroup {
 			this._ctxHasEditorModification.set(isInlineChat || entry?.state.read(r) === WorkingSetEntryState.Modified);
 			this._ctxIsGlobalEditingSession.set(session.isGlobalEditingSession);
 			this._ctxReviewModeEnabled.set(entry ? entry.reviewMode.read(r) : false);
-			this._ctxHasRequestInProgress.set(session.state.read(r) === ChatEditingSessionState.StreamingEdits || isRequestInProgress.read(r) || !entry);
+			this._ctxHasRequestInProgress.set(
+				Boolean(entry?.isCurrentlyBeingModifiedBy.read(r)) // any entry changing
+				|| (isInlineChat && isRequestInProgress.read(r)) // inline chat request
+			);
 
 			// number of requests
 			const requestCount = chatModel
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
index 1a5c9c250b6a..5f72cf88ae33 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
@@ -5,7 +5,7 @@
 
 import '../media/chatEditingEditorOverlay.css';
 import { combinedDisposable, DisposableMap, DisposableStore, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
-import { autorun, constObservable, derived, derivedOpts, IObservable, observableFromEvent, 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, WorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IChatEditingService, IChatEditingSession, IModifiedFileEntry, WorkingSetEntryState } from '../../common/chatEditingService.js';
@@ -405,25 +405,24 @@ class ChatEditingOverlayController {
 
 			const { session, entry } = data;
 
-			if (!session.isGlobalEditingSession && isInProgress.read(r) && !entry?.isCurrentlyBeingModifiedBy.read(r)) {
-				// inline chat request
-				widget.show(session, undefined, { entryIndex: constObservable(0), changeIndex: constObservable(0) });
-				show();
-
-			} else if (entry?.state.read(r) === WorkingSetEntryState.Modified) {
+			if (
+				entry?.state.read(r) === WorkingSetEntryState.Modified // any entry changing
+				|| (!session.isGlobalEditingSession && isInProgress.read(r)) // inline chat request
+			) {
 				// any session with changes
 				const editorPane = group.activeEditorPane;
 				assertType(editorPane);
 
-				const changeIndex = derived(r => {
-					const idx = entry.getEditorIntegration(editorPane).currentIndex.read(r);
-					return idx;
-				});
+				const changeIndex = derived(r => entry
+					? entry.getEditorIntegration(editorPane).currentIndex.read(r)
+					: 0);
+
+				const entryIndex = derived(r => entry
+					? session.entries.read(r).indexOf(entry)
+					: 0
+				);
 
-				widget.show(session, entry, {
-					entryIndex: derived(r => session.entries.read(r).indexOf(entry)),
-					changeIndex
-				});
+				widget.show(session, entry, { entryIndex, changeIndex });
 				show();
 
 			} else {

From ca388504429bc2f713f44dc628cdc13e5decf5db Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 26 Feb 2025 09:25:29 +0100
Subject: [PATCH 0416/1815] fixes
 https://github.com/microsoft/vscode-copilot/issues/13560 (#242031)

---
 .../chat/browser/chatEditing/chatEditingEditorOverlay.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
index 5f72cf88ae33..13643c63bf9b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorOverlay.ts
@@ -250,7 +250,7 @@ class ChatEditorOverlayWidget {
 						}
 
 						protected override getTooltip(): string | undefined {
-							return this._requestMessage.get()?.message;
+							return this._requestMessage.get()?.message || super.getTooltip();
 						}
 					};
 				}

From 6988f72b9185a984772d0b8218a70f670e306b11 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 26 Feb 2025 09:35:15 +0100
Subject: [PATCH 0417/1815] chat - status UX tweaks (#242027)

---
 build/lib/stylelint/vscode-known-variables.json     |  4 ++++
 src/vs/workbench/contrib/chat/browser/chatStatus.ts | 13 ++++++++++++-
 .../contrib/chat/browser/media/chatStatus.css       | 11 +++++++----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
index 3fbded851903..7298c32d5447 100644
--- a/build/lib/stylelint/vscode-known-variables.json
+++ b/build/lib/stylelint/vscode-known-variables.json
@@ -351,6 +351,8 @@
 		"--vscode-extensionIcon-verifiedForeground",
 		"--vscode-focusBorder",
 		"--vscode-foreground",
+		"--vscode-gauge-background",
+		"--vscode-gauge-foreground",
 		"--vscode-icon-foreground",
 		"--vscode-inlineChat-background",
 		"--vscode-inlineChat-border",
@@ -687,11 +689,13 @@
 		"--vscode-symbolIcon-eventForeground",
 		"--vscode-symbolIcon-fieldForeground",
 		"--vscode-symbolIcon-fileForeground",
+		"--vscode-symbolIcon-flagForeground",
 		"--vscode-symbolIcon-folderForeground",
 		"--vscode-symbolIcon-functionForeground",
 		"--vscode-symbolIcon-interfaceForeground",
 		"--vscode-symbolIcon-keyForeground",
 		"--vscode-symbolIcon-keywordForeground",
+		"--vscode-symbolIcon-methodArrowForeground",
 		"--vscode-symbolIcon-methodForeground",
 		"--vscode-symbolIcon-moduleForeground",
 		"--vscode-symbolIcon-namespaceForeground",
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 5805e5fb0501..39bafab59d23 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -25,6 +25,17 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { Command } from '../../../../editor/common/languages.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { Lazy } from '../../../../base/common/lazy.js';
+import { registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
+import { ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND } from '../../../common/theme.js';
+
+const GAUGE_BACKGROUND = registerColor('gauge.background', ACTIVITY_BAR_BADGE_BACKGROUND, localize('gaugeBackground', "Gauge background color."));
+
+registerColor('gauge.foreground', {
+	dark: transparent(GAUGE_BACKGROUND, 0.3),
+	light: transparent(GAUGE_BACKGROUND, 0.3),
+	hcDark: ACTIVITY_BAR_BADGE_FOREGROUND,
+	hcLight: ACTIVITY_BAR_BADGE_FOREGROUND
+}, localize('gaugeForeground', "Gauge foreground color."));
 
 export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
 
@@ -148,7 +159,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 					completionsQuotaIndicator(completionsTotal, completionsRemaining);
 				});
 
-				container.appendChild($('div', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.value.format(quotaResetDate))));
+				container.appendChild($('div.description', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.value.format(quotaResetDate))));
 
 				// Settings
 				container.appendChild($('hr'));
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
index db06923f4494..9f23450d9e08 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
@@ -15,6 +15,10 @@
 	margin-bottom: 8px;
 }
 
+.chat-status-bar-entry-tooltip div.description {
+	color: var(--vscode-descriptionForeground);
+}
+
 /* Settings */
 
 .chat-status-bar-entry-tooltip .settings {
@@ -67,14 +71,13 @@
 
 .chat-status-bar-entry-tooltip .quota-indicator .quota-bar {
 	width: 100%;
-	height: 6px;
-	background-color: var(--vscode-activityBarBadge-foreground);
-	border-color: var(--vscode-activityBarBadge-background);
+	height: 4px;
+	background-color: var(--vscode-gauge-foreground);
 	border-radius: 4px;
 }
 
 .chat-status-bar-entry-tooltip .quota-indicator .quota-bar .quota-bit {
 	height: 100%;
-	background-color: var(--vscode-activityBarBadge-background);
+	background-color: var(--vscode-gauge-background);
 	border-radius: 4px;
 }

From 79f2dd4a8a153b6e9f75c9acd9a876efedb88f7b Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Wed, 26 Feb 2025 09:44:16 +0100
Subject: [PATCH 0418/1815] Fix json schema for viewsContainers (#241700)

Fix json schema for viewContainers
Fixes #240707
---
 src/vs/workbench/api/browser/viewsExtensionPoint.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
index 9a40656e9906..fdf354d1f544 100644
--- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts
+++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts
@@ -71,7 +71,8 @@ export const viewsContainersContribution: IJSONSchema = {
 			type: 'array',
 			items: viewsContainerSchema
 		}
-	}
+	},
+	additionalProperties: false
 };
 
 enum ViewType {

From dfeb7b06f6095655ab0212ca1662e88ac6d0d045 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 26 Feb 2025 10:05:43 +0100
Subject: [PATCH 0419/1815] fix #242036 (#242037)

---
 .../browser/extensionsWorkbenchService.ts     | 19 ++++++-----
 .../contrib/extensions/common/extensions.ts   |  6 ++--
 .../common/extensionManagement.ts             |  6 +---
 .../common/extensionManagementService.ts      | 34 +++++++++----------
 4 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index 41bcd531cfaf..460e36296d3c 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -2333,6 +2333,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 	async install(arg: string | URI | IExtension, installOptions: InstallExtensionOptions = {}, progressLocation?: ProgressLocation | string): Promise<IExtension> {
 		let installable: URI | IGalleryExtension | IResourceExtension | undefined;
 		let extension: IExtension | undefined;
+		let servers: IExtensionManagementServer[] | undefined;
 
 		if (arg instanceof URI) {
 			installable = arg;
@@ -2379,11 +2380,11 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 				// If requested to install everywhere
 				// then install the extension in all the servers where it is not installed
 				if (installOptions.installEverywhere) {
-					installOptions.servers = [];
+					servers = [];
 					const installableServers = await this.extensionManagementService.getInstallableServers(gallery);
 					for (const extensionsServer of this.extensionsServers) {
 						if (installableServers.includes(extensionsServer.server) && !extensionsServer.local.find(e => areSameExtensions(e.identifier, gallery.identifier))) {
-							installOptions.servers.push(extensionsServer.server);
+							servers.push(extensionsServer.server);
 						}
 					}
 				}
@@ -2391,17 +2392,17 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 				// Check if the extension is disabled because of extension kind
 				// If so, install the extension in the server that is compatible.
 				else if (installOptions.enable && extension?.local) {
-					installOptions.servers = [];
+					servers = [];
 					if (extension.enablementState === EnablementState.DisabledByExtensionKind) {
 						const [installableServer] = await this.extensionManagementService.getInstallableServers(gallery);
 						if (installableServer) {
-							installOptions.servers.push(installableServer);
+							servers.push(installableServer);
 						}
 					}
 				}
 			}
 
-			if (!installOptions.servers || installOptions.servers.length) {
+			if (!servers || servers.length) {
 				if (!installable) {
 					if (!gallery) {
 						const id = isString(arg) ? arg : (<IExtension>arg).identifier.id;
@@ -2458,7 +2459,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 				if (extension.resourceExtension) {
 					extension = await this.doInstall(extension, () => this.extensionManagementService.installResourceExtension(installable as IResourceExtension, installOptions), progressLocation);
 				} else {
-					extension = await this.doInstall(extension, () => this.installFromGallery(extension!, installable as IGalleryExtension, installOptions), progressLocation);
+					extension = await this.doInstall(extension, () => this.installFromGallery(extension!, installable as IGalleryExtension, installOptions, servers), progressLocation);
 				}
 			}
 		}
@@ -2762,15 +2763,15 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		return this.extensionManagementService.installVSIX(vsix, manifest, installOptions);
 	}
 
-	private installFromGallery(extension: IExtension, gallery: IGalleryExtension, installOptions?: InstallExtensionOptions): Promise<ILocalExtension> {
+	private installFromGallery(extension: IExtension, gallery: IGalleryExtension, installOptions: InstallExtensionOptions, servers: IExtensionManagementServer[] | undefined): Promise<ILocalExtension> {
 		installOptions = installOptions ?? {};
 		installOptions.pinned = extension.local?.pinned || !this.shouldAutoUpdateExtension(extension);
-		if (extension.local && !installOptions.servers) {
+		if (extension.local && !servers) {
 			installOptions.productVersion = this.getProductVersion();
 			installOptions.operation = InstallOperation.Update;
 			return this.extensionManagementService.updateFromGallery(gallery, extension.local, installOptions);
 		} else {
-			return this.extensionManagementService.installFromGallery(gallery, installOptions);
+			return this.extensionManagementService.installFromGallery(gallery, installOptions, servers);
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/extensions/common/extensions.ts b/src/vs/workbench/contrib/extensions/common/extensions.ts
index e8f26f634cab..97e8d4b6d153 100644
--- a/src/vs/workbench/contrib/extensions/common/extensions.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensions.ts
@@ -6,8 +6,8 @@
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { Event } from '../../../../base/common/event.js';
 import { IPager } from '../../../../base/common/paging.js';
-import { IQueryOptions, ILocalExtension, IGalleryExtension, IExtensionIdentifier, IExtensionInfo, IExtensionQueryOptions, IDeprecationInfo, InstallExtensionResult } from '../../../../platform/extensionManagement/common/extensionManagement.js';
-import { EnablementState, IExtensionManagementServer, IResourceExtension, IWorkbenchInstallOptions } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { IQueryOptions, ILocalExtension, IGalleryExtension, IExtensionIdentifier, IExtensionInfo, IExtensionQueryOptions, IDeprecationInfo, InstallExtensionResult, InstallOptions } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { EnablementState, IExtensionManagementServer, IResourceExtension } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
 import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
@@ -108,7 +108,7 @@ export interface IExtension {
 
 export const IExtensionsWorkbenchService = createDecorator<IExtensionsWorkbenchService>('extensionsWorkbenchService');
 
-export interface InstallExtensionOptions extends IWorkbenchInstallOptions {
+export interface InstallExtensionOptions extends InstallOptions {
 	version?: string;
 	justification?: string | { reason: string; action: string };
 	enable?: boolean;
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts
index 9c6c53338b17..f65608c8fa70 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts
@@ -59,10 +59,6 @@ export type UninstallExtensionOnServerEvent = UninstallExtensionEvent & { server
 export type DidUninstallExtensionOnServerEvent = DidUninstallExtensionEvent & { server: IExtensionManagementServer };
 export type DidChangeProfileForServerEvent = DidChangeProfileEvent & { server: IExtensionManagementServer };
 
-export interface IWorkbenchInstallOptions extends InstallOptions {
-	servers?: IExtensionManagementServer[];
-}
-
 export interface IPublisherInfo {
 	readonly publisher: string;
 	readonly publisherDisplayName: string;
@@ -91,7 +87,7 @@ export interface IWorkbenchExtensionManagementService extends IProfileAwareExten
 
 	getInstallableServers(extension: IGalleryExtension): Promise<IExtensionManagementServer[]>;
 	installVSIX(location: URI, manifest: IExtensionManifest, installOptions?: InstallOptions): Promise<ILocalExtension>;
-	installFromGallery(gallery: IGalleryExtension, installOptions?: IWorkbenchInstallOptions): Promise<ILocalExtension>;
+	installFromGallery(gallery: IGalleryExtension, installOptions?: InstallOptions, servers?: IExtensionManagementServer[]): Promise<ILocalExtension>;
 	installFromLocation(location: URI): Promise<ILocalExtension>;
 	installResourceExtension(extension: IResourceExtension, installOptions: InstallOptions): Promise<ILocalExtension>;
 
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
index 067b3a93c4fd..bcf58d25cd92 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
@@ -14,7 +14,7 @@ import {
 	IAllowedExtensionsService,
 	EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT,
 } from '../../../../platform/extensionManagement/common/extensionManagement.js';
-import { DidChangeProfileForServerEvent, DidUninstallExtensionOnServerEvent, IExtensionManagementServer, IExtensionManagementServerService, InstallExtensionOnServerEvent, IPublisherInfo, IResourceExtension, IWorkbenchExtensionManagementService, IWorkbenchInstallOptions, UninstallExtensionOnServerEvent } from './extensionManagement.js';
+import { DidChangeProfileForServerEvent, DidUninstallExtensionOnServerEvent, IExtensionManagementServer, IExtensionManagementServerService, InstallExtensionOnServerEvent, IPublisherInfo, IResourceExtension, IWorkbenchExtensionManagementService, UninstallExtensionOnServerEvent } from './extensionManagement.js';
 import { ExtensionType, isLanguagePackExtension, IExtensionManifest, getWorkspaceSupportTypeMessage, TargetPlatform } from '../../../../platform/extensions/common/extensions.js';
 import { URI } from '../../../../base/common/uri.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
@@ -475,7 +475,7 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 					}
 				}
 
-				const servers = await this.getExtensionManagementServersToInstall(extension, manifest, options);
+				const servers = await this.getExtensionManagementServersToInstall(extension, manifest);
 				if (!options.isMachineScoped && this.isExtensionsSyncEnabled()) {
 					if (this.extensionManagementServerService.localExtensionManagementServer
 						&& !servers.includes(this.extensionManagementServerService.localExtensionManagementServer)
@@ -510,7 +510,7 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 		return [...results.values()];
 	}
 
-	async installFromGallery(gallery: IGalleryExtension, installOptions?: IWorkbenchInstallOptions): Promise<ILocalExtension> {
+	async installFromGallery(gallery: IGalleryExtension, installOptions?: InstallOptions, servers?: IExtensionManagementServer[]): Promise<ILocalExtension> {
 		const manifest = await this.extensionGalleryService.getManifest(gallery, CancellationToken.None);
 		if (!manifest) {
 			throw new Error(localize('Manifest is not found', "Installing Extension {0} failed: Manifest is not found.", gallery.displayName || gallery.name));
@@ -529,7 +529,7 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 			}
 		}
 
-		const servers = await this.getExtensionManagementServersToInstall(gallery, manifest, installOptions);
+		servers = servers?.length ? this.validServers(gallery, manifest, servers) : await this.getExtensionManagementServersToInstall(gallery, manifest);
 		if (!installOptions || isUndefined(installOptions.isMachineScoped)) {
 			const isMachineScoped = await this.hasToFlagExtensionsMachineScoped([gallery]);
 			installOptions = { ...(installOptions || {}), isMachineScoped };
@@ -674,23 +674,23 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 		}
 	}
 
-	private async getExtensionManagementServersToInstall(gallery: IGalleryExtension, manifest: IExtensionManifest, installOptions?: IWorkbenchInstallOptions): Promise<IExtensionManagementServer[]> {
-		const servers: IExtensionManagementServer[] = [];
-
-		if (installOptions?.servers?.length) {
-			const installableServers = this.getInstallableExtensionManagementServers(manifest);
-			servers.push(...installOptions.servers);
-			for (const server of servers) {
-				if (!installableServers.includes(server)) {
-					const error = new Error(localize('cannot be installed in server', "Cannot install the '{0}' extension because it is not available in the '{1}' setup.", gallery.displayName || gallery.name, server.label));
-					error.name = ExtensionManagementErrorCode.Unsupported;
-					throw error;
-				}
+	private validServers(gallery: IGalleryExtension, manifest: IExtensionManifest, servers: IExtensionManagementServer[]): IExtensionManagementServer[] {
+		const installableServers = this.getInstallableExtensionManagementServers(manifest);
+		for (const server of servers) {
+			if (!installableServers.includes(server)) {
+				const error = new Error(localize('cannot be installed in server', "Cannot install the '{0}' extension because it is not available in the '{1}' setup.", gallery.displayName || gallery.name, server.label));
+				error.name = ExtensionManagementErrorCode.Unsupported;
+				throw error;
 			}
 		}
+		return servers;
+	}
+
+	private async getExtensionManagementServersToInstall(gallery: IGalleryExtension, manifest: IExtensionManifest): Promise<IExtensionManagementServer[]> {
+		const servers: IExtensionManagementServer[] = [];
 
 		// Language packs should be installed on both local and remote servers
-		else if (isLanguagePackExtension(manifest)) {
+		if (isLanguagePackExtension(manifest)) {
 			servers.push(...this.servers.filter(server => server !== this.extensionManagementServerService.webExtensionManagementServer));
 		}
 

From 326130e5933a9f0420fb8a3becb096b965da5b09 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Wed, 26 Feb 2025 11:21:09 +0100
Subject: [PATCH 0420/1815] Swap the eye icons in simple file dialog (#242045)

Fixes #241826
---
 src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
index a94b19878654..f419a0875e4f 100644
--- a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
+++ b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
@@ -472,7 +472,7 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 
 	private setButtons() {
 		this.filePickBox.buttons = [{
-			iconClass: this._showDotFiles ? ThemeIcon.asClassName(Codicon.eyeClosed) : ThemeIcon.asClassName(Codicon.eye),
+			iconClass: this._showDotFiles ? ThemeIcon.asClassName(Codicon.eye) : ThemeIcon.asClassName(Codicon.eyeClosed),
 			tooltip: this._showDotFiles ? nls.localize('remoteFileDialog.hideDotFiles', "Hide dot files") : nls.localize('remoteFileDialog.showDotFiles', "Show dot files"),
 			alwaysVisible: true
 		}];

From 1a2a6a3fb94b82a6e16fe8b98f163c1a818fc19e Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 26 Feb 2025 11:36:31 +0100
Subject: [PATCH 0421/1815] make sure inline chat shows as soon as a request is
 started (#242044)

---
 .../chatEditingEditorContextKeys.ts           | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts
index 9d8308703893..d86957b3ca83 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.ts
@@ -157,27 +157,28 @@ export class ObservableEditorSession {
 		@IChatEditingService chatEditingService: IChatEditingService,
 		@IInlineChatSessionService inlineChatService: IInlineChatSessionService
 	) {
-		this.value = derived(r => {
-			const sessionObs = chatEditingService.editingSessionsObs.map((value, r) => {
-				for (const session of value) {
-					const entry = session.readEntry(uri, r);
-					if (entry) {
-						return { session, entry, isInlineChat: false };
-					}
-				}
-				return undefined;
-			});
 
-			const result = sessionObs.read(r);
-			if (result) {
-				return result;
+		const inlineSessionObs = observableFromEvent(this, inlineChatService.onDidChangeSessions, () => inlineChatService.getSession2(uri));
+
+		const sessionObs = chatEditingService.editingSessionsObs.map((value, r) => {
+			for (const session of value) {
+				const entry = session.readEntry(uri, r);
+				if (entry) {
+					return { session, entry, isInlineChat: false };
+				}
 			}
+			return undefined;
+		});
+
+		this.value = derived(r => {
 
-			const inlineSessionObs = observableFromEvent(this, inlineChatService.onDidChangeSessions, () => inlineChatService.getSession2(uri));
 			const inlineSession = inlineSessionObs.read(r);
-			return inlineSession
-				? { session: inlineSession.editingSession, entry: inlineSession.editingSession.readEntry(uri, r), isInlineChat: true }
-				: undefined;
+
+			if (inlineSession) {
+				return { session: inlineSession.editingSession, entry: inlineSession.editingSession.readEntry(uri, r), isInlineChat: true };
+			}
+
+			return sessionObs.read(r);
 		});
 	}
 }

From 5d760580d48ca91b1a5984911621e6312dfce3aa Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 26 Feb 2025 11:39:42 +0100
Subject: [PATCH 0422/1815] chat - more status UI tweaks (#242050)

* chat - more status UI tweaks

* color tweaks
---
 src/vs/base/browser/ui/hover/hover.ts         |  4 +-
 .../services/hoverService/hoverService.ts     |  4 +-
 .../contrib/chat/browser/chatStatus.ts        | 48 +++++++++++++------
 .../contrib/chat/browser/media/chatStatus.css | 21 +++++++-
 .../electron-sandbox/rendererAutoProfiler.ts  |  2 +-
 .../browser/startupPage.ts                    |  2 +-
 .../browser/userDataSyncWorkbenchService.ts   | 12 ++++-
 7 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/src/vs/base/browser/ui/hover/hover.ts b/src/vs/base/browser/ui/hover/hover.ts
index df0e343e3efb..f96dceb1b0d6 100644
--- a/src/vs/base/browser/ui/hover/hover.ts
+++ b/src/vs/base/browser/ui/hover/hover.ts
@@ -102,9 +102,9 @@ export interface IHoverDelegate2 {
 
 	/**
 	 * Hides the hover if it was visible. This call will be ignored if the hover is currently
-	 * "locked" via the alt/option key.
+	 * "locked" via the alt/option key unless `force` is set.
 	 */
-	hideHover(): void;
+	hideHover(force?: boolean): void;
 
 	/**
 	 * This should only be used until we have the ability to show multiple context views
diff --git a/src/vs/editor/browser/services/hoverService/hoverService.ts b/src/vs/editor/browser/services/hoverService/hoverService.ts
index 7d249eb7065f..3949c56e5069 100644
--- a/src/vs/editor/browser/services/hoverService/hoverService.ts
+++ b/src/vs/editor/browser/services/hoverService/hoverService.ts
@@ -291,8 +291,8 @@ export class HoverService extends Disposable implements IHoverService {
 		);
 	}
 
-	hideHover(): void {
-		if (this._currentHover?.isLocked || !this._currentHoverOptions) {
+	hideHover(force?: boolean): void {
+		if ((!force && this._currentHover?.isLocked) || !this._currentHoverOptions) {
 			return;
 		}
 		this.doHideHover();
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 39bafab59d23..3087999ab16d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -8,7 +8,7 @@ import { safeIntl } from '../../../../base/common/date.js';
 import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { language, OS } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowTooltipCommand, StatusbarAlignment, TooltipContent } from '../../../services/statusbar/browser/statusbar.js';
@@ -25,16 +25,26 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { Command } from '../../../../editor/common/languages.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { Lazy } from '../../../../base/common/lazy.js';
-import { registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
-import { ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND } from '../../../common/theme.js';
-
-const GAUGE_BACKGROUND = registerColor('gauge.background', ACTIVITY_BAR_BADGE_BACKGROUND, localize('gaugeBackground', "Gauge background color."));
+import { contrastBorder, registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { ACTIVITY_BAR_BADGE_BACKGROUND } from '../../../common/theme.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { coalesce } from '../../../../base/common/arrays.js';
+import { CTX_INLINE_CHAT_POSSIBLE } from '../../inlineChat/common/inlineChat.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { Color } from '../../../../base/common/color.js';
+
+registerColor('gauge.background', {
+	dark: ACTIVITY_BAR_BADGE_BACKGROUND,
+	light: ACTIVITY_BAR_BADGE_BACKGROUND,
+	hcDark: contrastBorder,
+	hcLight: contrastBorder
+}, localize('gaugeBackground', "Gauge background color."));
 
 registerColor('gauge.foreground', {
-	dark: transparent(GAUGE_BACKGROUND, 0.3),
-	light: transparent(GAUGE_BACKGROUND, 0.3),
-	hcDark: ACTIVITY_BAR_BADGE_FOREGROUND,
-	hcLight: ACTIVITY_BAR_BADGE_FOREGROUND
+	dark: Color.black,
+	light: Color.white,
+	hcDark: Color.white,
+	hcLight: Color.white
 }, localize('gaugeForeground', "Gauge foreground color."));
 
 export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
@@ -53,7 +63,8 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@ICommandService private readonly commandService: ICommandService
+		@ICommandService private readonly commandService: ICommandService,
+		@IHoverService private readonly hoverService: IHoverService
 	) {
 		super();
 
@@ -237,11 +248,17 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	private createShortcuts(container: HTMLElement, disposables: DisposableStore): HTMLElement {
 		const shortcuts = container.appendChild($('div.shortcuts'));
 
-		const openChat = { text: localize('shortcuts.chat', "Chat"), id: CHAT_OPEN_ACTION_ID };
-		const openCopilotEdits = { text: localize('shortcuts.copilotEdits', "Copilot Edits"), id: 'workbench.action.chat.openEditSession' };
-		const inlineChat = { text: localize('shortcuts.inlineChat', "Inline Chat"), id: 'inlineChat.start' };
+		const entries = coalesce([
+			{ text: localize('shortcuts.chat', "Chat"), id: CHAT_OPEN_ACTION_ID },
+			{ text: localize('shortcuts.copilotEdits', "Copilot Edits"), id: 'workbench.action.chat.openEditSession' },
+			this.contextKeyService.contextMatchesRules(ContextKeyExpr.and(
+				CTX_INLINE_CHAT_POSSIBLE,
+				EditorContextKeys.writable,
+				EditorContextKeys.editorSimpleInput.negate()
+			)) ? { text: localize('shortcuts.inlineChat', "Inline Chat"), id: 'inlineChat.start' } : undefined
+		]);
 
-		for (const entry of [openChat, openCopilotEdits, inlineChat]) {
+		for (const entry of entries) {
 			const keys = this.keybindingService.lookupKeybinding(entry.id);
 			if (!keys) {
 				continue;
@@ -255,7 +272,8 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			shortcutKey.set(keys);
 
 			for (const element of [shortcutLabel, shortcutKey.element]) {
-				disposables.add(addDisposableListener(element, EventType.CLICK, e => {
+				disposables.add(addDisposableListener(element, EventType.CLICK, () => {
+					this.hoverService.hideHover(true);
 					this.commandService.executeCommand(entry.id);
 				}));
 			}
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
index 9f23450d9e08..f9fc27968924 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
@@ -40,12 +40,29 @@
 .chat-status-bar-entry-tooltip .shortcuts {
 	display: flex;
 	flex-direction: column;
-	gap: 5px;
+	gap: 2px;
 }
 
 .chat-status-bar-entry-tooltip .shortcuts .shortcut {
 	display: flex;
 	gap: 10px;
+
+	/** Make room for the hover feedback */
+	margin-left: -5px;
+	margin-right: -5px;
+	padding-left: 5px;
+	padding-right: 5px;
+	margin-top: -1px;
+	margin-bottom: -1px;
+	padding-top: 1px;
+	padding-bottom: 1px;
+}
+
+.chat-status-bar-entry-tooltip .shortcuts .shortcut:hover {
+	outline: 1px dashed var(--vscode-toolbar-hoverOutline);
+	outline-offset: -1px;
+	background-color: var(--vscode-toolbar-hoverBackground);
+	border-radius: 3px;
 }
 
 .chat-status-bar-entry-tooltip .shortcuts .shortcut .shortcut-label {
@@ -67,6 +84,7 @@
 .chat-status-bar-entry-tooltip .quota-indicator .quota-label {
 	display: flex;
 	justify-content: space-between;
+	margin-bottom: 3px;
 }
 
 .chat-status-bar-entry-tooltip .quota-indicator .quota-bar {
@@ -74,6 +92,7 @@
 	height: 4px;
 	background-color: var(--vscode-gauge-foreground);
 	border-radius: 4px;
+	border: 1px solid var(--vscode-gauge-background);
 }
 
 .chat-status-bar-entry-tooltip .quota-indicator .quota-bar .quota-bit {
diff --git a/src/vs/workbench/contrib/performance/electron-sandbox/rendererAutoProfiler.ts b/src/vs/workbench/contrib/performance/electron-sandbox/rendererAutoProfiler.ts
index 274d3340b871..5286ecc047ba 100644
--- a/src/vs/workbench/contrib/performance/electron-sandbox/rendererAutoProfiler.ts
+++ b/src/vs/workbench/contrib/performance/electron-sandbox/rendererAutoProfiler.ts
@@ -38,7 +38,7 @@ export class RendererProfiling {
 		}
 
 		timerService.perfBaseline.then(perfBaseline => {
-			_logService.info(`[perf] Render performance baseline is ${perfBaseline}ms`);
+			(_environmentService.isBuilt ? _logService.info : _logService.trace).apply(_logService, [`[perf] Render performance baseline is ${perfBaseline}ms`]);
 
 			if (perfBaseline < 0) {
 				// too slow
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts
index 1b5a6a1f92cc..ca01ace770ba 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts
@@ -222,7 +222,7 @@ function isStartupPageEnabled(configurationService: IConfigurationService, conte
 	}
 
 	if (startupEditor.value !== startupEditor.userRemoteValue) {
-		logService.info(`Startup editor is configured to be "${startupEditor.value}". This setting will be overridden by "${startupEditor.userRemoteValue}".`);
+		logService.trace(`Startup editor is configured to be "${startupEditor.value}". This setting will be overridden by "${startupEditor.userRemoteValue}".`);
 	}
 
 	return startupEditor.value === 'welcomePage'
diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
index b80dbf6c2b06..e8abfebf49e4 100644
--- a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
+++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
@@ -260,7 +260,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
 			try {
 				this.logService.trace('Settings Sync: Updating the token for the account', current.accountName);
 				const token = current.token;
-				this.logService.info('Settings Sync: Token updated for the account', current.accountName);
+				this.traceOrInfo('Settings Sync: Token updated for the account', current.accountName);
 				value = { token, authenticationProviderId: current.authenticationProviderId };
 			} catch (e) {
 				this.logService.error(e);
@@ -269,11 +269,19 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
 		await this.userDataSyncAccountService.updateAccount(value);
 	}
 
+	private traceOrInfo(msg: string, ...args: any[]): void {
+		if (this.environmentService.isBuilt) {
+			this.logService.info(msg, ...args);
+		} else {
+			this.logService.trace(msg, ...args);
+		}
+	}
+
 	private updateAccountStatus(accountStatus: AccountStatus): void {
 		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}`);
+			this.traceOrInfo(`Settings Sync: Account status changed from ${previous} to ${accountStatus}`);
 
 			this._accountStatus = accountStatus;
 			this.accountStatusContext.set(accountStatus);

From 1740d7d3c8c231eca36e16a1435fb15ec93ce37b Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 26 Feb 2025 11:49:45 +0100
Subject: [PATCH 0423/1815] fix #239434 (#242052)

---
 .../common/extensionsProfileScannerService.ts |  3 +-
 .../common/extensionsScannerService.ts        | 35 +++++++++++--------
 .../node/extensionManagementService.ts        | 16 ++++-----
 .../extensionsProfileScannerService.test.ts   | 22 ++++++++++++
 .../node/extensionsScannerService.test.ts     | 29 ++++++++++++---
 5 files changed, 76 insertions(+), 29 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts b/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts
index c0eefb920636..16ba453fd05b 100644
--- a/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.ts
@@ -270,8 +270,9 @@ export abstract class AbstractExtensionsProfileScannerService extends Disposable
 						migrate = true;
 						e.metadata.hasPreReleaseVersion = true;
 					}
+					const uuid = e.metadata?.id ?? e.identifier.uuid;
 					extensions.push({
-						identifier: e.identifier,
+						identifier: uuid ? { id: e.identifier.id, uuid } : { id: e.identifier.id },
 						location,
 						version: e.version,
 						metadata: e.metadata,
diff --git a/src/vs/platform/extensionManagement/common/extensionsScannerService.ts b/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
index c613e0669b4e..ddcacaf37b2d 100644
--- a/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
@@ -35,7 +35,12 @@ import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfil
 import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
 import { localizeManifest } from './extensionNls.js';
 
-export type IScannedExtensionManifest = IRelaxedExtensionManifest & { __metadata?: Metadata };
+export type ManifestMetadata = Partial<{
+	installedTimestamp: number;
+	size: number;
+}>;
+
+export type IScannedExtensionManifest = IRelaxedExtensionManifest & { __metadata?: ManifestMetadata };
 
 interface IRelaxedScannedExtension {
 	type: ExtensionType;
@@ -136,7 +141,7 @@ export interface IExtensionsScannerService {
 	scanMultipleExtensions(extensionLocations: URI[], extensionType: ExtensionType, scanOptions: ScanOptions): Promise<IScannedExtension[]>;
 	scanOneOrMultipleExtensions(extensionLocation: URI, extensionType: ExtensionType, scanOptions: ScanOptions): Promise<IScannedExtension[]>;
 
-	updateMetadata(extensionLocation: URI, metadata: Partial<Metadata>): Promise<void>;
+	updateManifestMetadata(extensionLocation: URI, metadata: ManifestMetadata): Promise<void>;
 	initializeDefaultProfileExtensions(): Promise<void>;
 }
 
@@ -270,18 +275,10 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 		return this.applyScanOptions(extensions, extensionType, { includeInvalid: scanOptions.includeInvalid, pickLatest: true });
 	}
 
-	async updateMetadata(extensionLocation: URI, metaData: Partial<Metadata>): Promise<void> {
+	async updateManifestMetadata(extensionLocation: URI, metaData: ManifestMetadata): Promise<void> {
 		const manifestLocation = joinPath(extensionLocation, 'package.json');
 		const content = (await this.fileService.readFile(manifestLocation)).value.toString();
 		const manifest: IScannedExtensionManifest = JSON.parse(content);
-
-		// unset if false
-		if (metaData.isMachineScoped === false) {
-			delete metaData.isMachineScoped;
-		}
-		if (metaData.isBuiltin === false) {
-			delete metaData.isBuiltin;
-		}
 		manifest.__metadata = { ...manifest.__metadata, ...metaData };
 
 		await this.fileService.writeFile(joinPath(extensionLocation, 'package.json'), VSBuffer.fromString(JSON.stringify(manifest, null, '\t')));
@@ -665,10 +662,20 @@ class ExtensionsScanner extends Disposable {
 		if (!manifest.publisher) {
 			manifest.publisher = UNDEFINED_PUBLISHER;
 		}
-		const metadata = scannedProfileExtension?.metadata ?? manifest.__metadata;
-		if (metadata && !metadata?.size && manifest.__metadata?.size) {
-			metadata.size = manifest.__metadata?.size;
+
+		let metadata: Metadata | undefined;
+		if (scannedProfileExtension) {
+			metadata = {
+				...scannedProfileExtension.metadata,
+				size: manifest.__metadata?.size,
+			};
+		} else if (manifest.__metadata) {
+			metadata = {
+				installedTimestamp: manifest.__metadata.installedTimestamp,
+				size: manifest.__metadata.size,
+			};
 		}
+
 		delete manifest.__metadata;
 		const id = getGalleryExtensionId(manifest.publisher, manifest.name);
 		const identifier = metadata?.id ? { id, uuid: metadata.id } : { id };
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 35838459323b..04ed18266096 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -37,7 +37,7 @@ import {
 } from '../common/extensionManagement.js';
 import { areSameExtensions, computeTargetPlatform, ExtensionKey, getGalleryExtensionId, groupByExtension } from '../common/extensionManagementUtil.js';
 import { IExtensionsProfileScannerService, IScannedProfileExtension } from '../common/extensionsProfileScannerService.js';
-import { IExtensionsScannerService, IScannedExtension, UserExtensionsScanOptions } from '../common/extensionsScannerService.js';
+import { IExtensionsScannerService, IScannedExtension, ManifestMetadata, UserExtensionsScanOptions } from '../common/extensionsScannerService.js';
 import { ExtensionsDownloader } from './extensionDownloader.js';
 import { ExtensionsLifecycle } from './extensionLifecycle.js';
 import { fromExtractError, getManifest } from './extensionManagementUtil.js';
@@ -624,7 +624,7 @@ export class ExtensionsScanner extends Disposable {
 				throw fromExtractError(e);
 			}
 
-			const metadata: Metadata = { installedTimestamp: Date.now() };
+			const metadata: ManifestMetadata = { installedTimestamp: Date.now() };
 			try {
 				metadata.size = await computeSize(tempLocation, this.fileService);
 			} catch (error) {
@@ -633,7 +633,7 @@ export class ExtensionsScanner extends Disposable {
 			}
 
 			try {
-				await this.extensionsScannerService.updateMetadata(tempLocation, metadata);
+				await this.extensionsScannerService.updateManifestMetadata(tempLocation, metadata);
 			} catch (error) {
 				this.telemetryService.publicLog2<UpdateMetadataErrorEvent, UpdateMetadataErrorClassification>('extension:extract', { extensionId: extensionKey.id, code: `${toFileOperationResult(error)}` });
 				throw toExtensionManagementError(error, ExtensionManagementErrorCode.UpdateMetadata);
@@ -678,13 +678,9 @@ export class ExtensionsScanner extends Disposable {
 		return extensions.find(e => areSameExtensions(e.identifier, local.identifier));
 	}
 
-	async updateMetadata(local: ILocalExtension, metadata: Partial<Metadata>, profileLocation?: URI): Promise<ILocalExtension> {
+	async updateMetadata(local: ILocalExtension, metadata: Partial<Metadata>, profileLocation: URI): Promise<ILocalExtension> {
 		try {
-			if (profileLocation) {
-				await this.extensionsProfileScannerService.updateMetadata([[local, metadata]], profileLocation);
-			} else {
-				await this.extensionsScannerService.updateMetadata(local.location, metadata);
-			}
+			await this.extensionsProfileScannerService.updateMetadata([[local, metadata]], profileLocation);
 		} catch (error) {
 			this.telemetryService.publicLog2<UpdateMetadataErrorEvent, UpdateMetadataErrorClassification>('extension:extract', { extensionId: local.identifier.id, code: `${toFileOperationResult(error)}`, isProfile: !!profileLocation });
 			throw toExtensionManagementError(error, ExtensionManagementErrorCode.UpdateMetadata);
@@ -873,7 +869,7 @@ export class ExtensionsScanner extends Disposable {
 			// set size if not set before
 			if (isDefined(extension.metadata?.installedTimestamp) && isUndefined(extension.metadata?.size)) {
 				const size = await computeSize(extension.location, this.fileService);
-				await this.extensionsScannerService.updateMetadata(extension.location, { size });
+				await this.extensionsScannerService.updateManifestMetadata(extension.location, { size });
 			}
 		}));
 	}
diff --git a/src/vs/platform/extensionManagement/test/common/extensionsProfileScannerService.test.ts b/src/vs/platform/extensionManagement/test/common/extensionsProfileScannerService.test.ts
index a21b64a95a5e..7cecdfad82ba 100644
--- a/src/vs/platform/extensionManagement/test/common/extensionsProfileScannerService.test.ts
+++ b/src/vs/platform/extensionManagement/test/common/extensionsProfileScannerService.test.ts
@@ -574,6 +574,28 @@ suite('ExtensionsProfileScannerService', () => {
 		assert.ok(target4.notCalled);
 	});
 
+	test('read extension when uuid is different in identifier and manifest', async () => {
+		const extensionsManifest = joinPath(extensionsLocation, 'extensions.json');
+		await instantiationService.get(IFileService).writeFile(extensionsManifest, VSBuffer.fromString(JSON.stringify([{
+			identifier: {
+				id: 'pub.a',
+				uuid: 'uuid1`'
+			},
+			version: '1.0.0',
+			location: joinPath(extensionsLocation, 'pub.a-1.0.0').toString(),
+			relativeLocation: 'pub.a-1.0.0',
+			metadata: {
+				id: 'uuid',
+			}
+		}])));
+
+		const testObject = disposables.add(instantiationService.createInstance(TestObject, extensionsLocation));
+		const actual = await testObject.scanProfileExtensions(extensionsManifest);
+		assert.deepStrictEqual(actual.length, 1);
+		assert.deepStrictEqual(actual[0].identifier.id, 'pub.a');
+		assert.deepStrictEqual(actual[0].identifier.uuid, 'uuid');
+	});
+
 	function aExtension(id: string, location: URI, e?: Partial<IExtension>, manifest?: Partial<IExtensionManifest>): IExtension {
 		return {
 			identifier: { id },
diff --git a/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts b/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
index 1d349f5822ab..ea0a4661df03 100644
--- a/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
+++ b/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
@@ -105,20 +105,20 @@ suite('NativeExtensionsScanerService Test', () => {
 	});
 
 	test('scan user extensions', async () => {
-		const manifest: Partial<IScannedExtensionManifest> = anExtensionManifest({ 'name': 'name', 'publisher': 'pub', __metadata: { id: 'uuid' } });
+		const manifest: Partial<IScannedExtensionManifest> = anExtensionManifest({ 'name': 'name', 'publisher': 'pub' });
 		const extensionLocation = await aUserExtension(manifest);
 		const testObject: IExtensionsScannerService = disposables.add(instantiationService.createInstance(ExtensionsScannerService));
 
 		const actual = await testObject.scanAllUserExtensions();
 
 		assert.deepStrictEqual(actual.length, 1);
-		assert.deepStrictEqual(actual[0].identifier, { id: 'pub.name', uuid: 'uuid' });
+		assert.deepStrictEqual(actual[0].identifier, { id: 'pub.name' });
 		assert.deepStrictEqual(actual[0].location.toString(), extensionLocation.toString());
 		assert.deepStrictEqual(actual[0].isBuiltin, false);
 		assert.deepStrictEqual(actual[0].type, ExtensionType.User);
 		assert.deepStrictEqual(actual[0].isValid, true);
 		assert.deepStrictEqual(actual[0].validations, []);
-		assert.deepStrictEqual(actual[0].metadata, { id: 'uuid' });
+		assert.deepStrictEqual(actual[0].metadata, undefined);
 		assert.deepStrictEqual(actual[0].targetPlatform, TargetPlatform.UNDEFINED);
 		delete manifest.__metadata;
 		assert.deepStrictEqual(actual[0].manifest, manifest);
@@ -298,6 +298,27 @@ suite('NativeExtensionsScanerService Test', () => {
 		assert.deepStrictEqual(actual!.manifest.displayName, 'Hello World');
 	});
 
+	test('scan single extension with manifest metadata retains manifest metadata', async () => {
+		const manifest: Partial<IExtensionManifest> = anExtensionManifest({ 'name': 'name', 'publisher': 'pub' });
+		const extensionLocation = await aUserExtension({
+			...manifest,
+			__metadata: { size: 12345, installedTimestamp: 1234567890 }
+		});
+		const testObject: IExtensionsScannerService = disposables.add(instantiationService.createInstance(ExtensionsScannerService));
+
+		const actual = await testObject.scanExistingExtension(extensionLocation, ExtensionType.User, {});
+
+		assert.notStrictEqual(actual, null);
+		assert.deepStrictEqual(actual!.identifier, { id: 'pub.name' });
+		assert.deepStrictEqual(actual!.location.toString(), extensionLocation.toString());
+		assert.deepStrictEqual(actual!.isBuiltin, false);
+		assert.deepStrictEqual(actual!.type, ExtensionType.User);
+		assert.deepStrictEqual(actual!.isValid, true);
+		assert.deepStrictEqual(actual!.validations, []);
+		assert.deepStrictEqual(actual!.metadata, { size: 12345, installedTimestamp: 1234567890 });
+		assert.deepStrictEqual(actual!.manifest, manifest);
+	});
+
 	async function aUserExtension(manifest: Partial<IScannedExtensionManifest>): Promise<URI> {
 		const environmentService = instantiationService.get(INativeEnvironmentService);
 		return anExtension(manifest, URI.file(environmentService.extensionsPath));
@@ -310,7 +331,7 @@ suite('NativeExtensionsScanerService Test', () => {
 
 	async function anExtension(manifest: Partial<IScannedExtensionManifest>, root: URI): Promise<URI> {
 		const fileService = instantiationService.get(IFileService);
-		const extensionLocation = joinPath(root, `${manifest.publisher}.${manifest.name}-${manifest.version}-${manifest.__metadata?.targetPlatform ?? TargetPlatform.UNDEFINED}`);
+		const extensionLocation = joinPath(root, `${manifest.publisher}.${manifest.name}-${manifest.version}`);
 		await fileService.writeFile(joinPath(extensionLocation, 'package.json'), VSBuffer.fromString(JSON.stringify(manifest)));
 		return extensionLocation;
 	}

From 17664082227da0546da503d82c7ff6b3132a44ef Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 26 Feb 2025 12:06:50 +0100
Subject: [PATCH 0424/1815] chat - make status keyboard shortcuts accessible
 (#242053)

---
 src/vs/base/browser/ui/toolbar/toolbar.ts     |  2 --
 .../contrib/chat/browser/chatStatus.ts        | 33 ++++++++++++++-----
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts
index 75ab73a53541..1c2be8cc6a8f 100644
--- a/src/vs/base/browser/ui/toolbar/toolbar.ts
+++ b/src/vs/base/browser/ui/toolbar/toolbar.ts
@@ -18,8 +18,6 @@ import * as nls from '../../../../nls.js';
 import { IHoverDelegate } from '../hover/hoverDelegate.js';
 import { createInstantHoverDelegate } from '../hover/hoverDelegateFactory.js';
 
-
-
 export interface IToolBarOptions {
 	orientation?: ActionsOrientation;
 	actionViewItemProvider?: IActionViewItemProvider;
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 3087999ab16d..aadf1a6ae561 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -15,7 +15,7 @@ import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowToolti
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatQuotasService } from '../common/chatQuotasService.js';
 import { quotaToButtonMessage, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, TOGGLE_CHAT_ACTION_ID, CHAT_OPEN_ACTION_ID } from './actions/chatActions.js';
-import { $, addDisposableListener, append, EventType } from '../../../../base/browser/dom.js';
+import { $, addDisposableListener, append, EventHelper, EventLike, EventType } from '../../../../base/browser/dom.js';
 import { IChatEntitlementsService } from '../common/chatEntitlementsService.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
@@ -32,6 +32,9 @@ import { coalesce } from '../../../../base/common/arrays.js';
 import { CTX_INLINE_CHAT_POSSIBLE } from '../../inlineChat/common/inlineChat.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { Color } from '../../../../base/common/color.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { Gesture, EventType as TouchEventType } from '../../../../base/browser/touch.js';
 
 registerColor('gauge.background', {
 	dark: ACTIVITY_BAR_BADGE_BACKGROUND,
@@ -258,25 +261,37 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			)) ? { text: localize('shortcuts.inlineChat', "Inline Chat"), id: 'inlineChat.start' } : undefined
 		]);
 
+		const onTrigger = (commandId: string, e: EventLike) => {
+			EventHelper.stop(e, true);
+
+			this.hoverService.hideHover(true);
+			this.commandService.executeCommand(commandId);
+		};
+
 		for (const entry of entries) {
 			const keys = this.keybindingService.lookupKeybinding(entry.id);
 			if (!keys) {
 				continue;
 			}
 
-			const shortcut = append(shortcuts, $('div.shortcut'));
+			const shortcut = append(shortcuts, $('div.shortcut', { tabIndex: 0, role: 'button', 'aria-label': entry.text }));
 
-			const shortcutLabel = append(shortcut, $('span.shortcut-label', undefined, entry.text));
+			append(shortcut, $('span.shortcut-label', undefined, entry.text));
 
 			const shortcutKey = disposables.add(new KeybindingLabel(shortcut, OS, { ...defaultKeybindingLabelStyles }));
 			shortcutKey.set(keys);
 
-			for (const element of [shortcutLabel, shortcutKey.element]) {
-				disposables.add(addDisposableListener(element, EventType.CLICK, () => {
-					this.hoverService.hideHover(true);
-					this.commandService.executeCommand(entry.id);
-				}));
-			}
+			disposables.add(Gesture.addTarget(shortcut));
+			[EventType.CLICK, TouchEventType.Tap].forEach(eventType => {
+				disposables.add(addDisposableListener(shortcuts, eventType, e => onTrigger(entry.id, e)));
+			});
+
+			disposables.add(addDisposableListener(shortcut, EventType.KEY_DOWN, e => {
+				const event = new StandardKeyboardEvent(e);
+				if ((event.equals(KeyCode.Enter) || event.equals(KeyCode.Space))) {
+					onTrigger(entry.id, e);
+				}
+			}));
 		}
 
 		return shortcuts;

From 9b47b78aaf39a46913744e5adc55b166dc9bb049 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Wed, 26 Feb 2025 12:10:05 +0100
Subject: [PATCH 0425/1815] cannot show dot files once I have added to the path
 (#242054)

Fixes #241930
---
 .../services/dialogs/browser/simpleFileDialog.ts          | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
index f419a0875e4f..b280750431f7 100644
--- a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
+++ b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
@@ -159,10 +159,14 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 
 		this.getShowDotFiles();
 		const disposableStore = this._register(new DisposableStore());
-		this.storageService.onDidChangeValue(StorageScope.WORKSPACE, 'remoteFileDialog.showDotFiles', disposableStore)(e => {
+		this.storageService.onDidChangeValue(StorageScope.WORKSPACE, 'remoteFileDialog.showDotFiles', disposableStore)(async _ => {
 			this.getShowDotFiles();
 			this.setButtons();
-			this.tryUpdateItems(this.filePickBox.value, this.filePickBoxValue(), true);
+			const startingValue = this.filePickBox.value;
+			const folderValue = this.pathFromUri(this.currentFolder, true);
+			this.filePickBox.value = folderValue;
+			await this.tryUpdateItems(folderValue, this.currentFolder, true);
+			this.filePickBox.value = startingValue;
 		});
 	}
 

From f08ca68ba07b8433f62f5c709ecb7f273d08451f Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 26 Feb 2025 12:42:59 +0100
Subject: [PATCH 0426/1815] fix #242043 (#242055)

---
 .../abstractExtensionManagementService.ts      | 18 +++++++-----------
 .../common/extensionManagement.ts              |  1 -
 .../browser/extensions.contribution.ts         |  2 +-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
index 4bef58907b79..73fbccd8f518 100644
--- a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
@@ -321,7 +321,6 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 				const isApplicationScoped = options.isApplicationScoped || options.isBuiltin || isApplicationScopedExtension(manifest);
 				const installExtensionTaskOptions: InstallExtensionTaskOptions = {
 					...options,
-					installOnlyNewlyAddedFromExtensionPack: options.installOnlyNewlyAddedFromExtensionPack ?? !URI.isUri(extension) /* always true for gallery extensions */,
 					isApplicationScoped,
 					profileLocation: isApplicationScoped ? this.userDataProfilesService.defaultProfile.extensionsResource : options.profileLocation ?? this.getCurrentExtensionsManifestLocation(),
 					productVersion: options.productVersion ?? { version: this.productService.version, date: this.productService.date }
@@ -342,11 +341,13 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 					this.logService.info('Installing the extension without checking dependencies and pack', task.identifier.id);
 				} else {
 					try {
-						const allDepsAndPackExtensionsToInstall = await this.getAllDepsAndPackExtensions(task.identifier, task.manifest, !!task.options.installOnlyNewlyAddedFromExtensionPack, !!task.options.installPreReleaseVersion, task.options.profileLocation, task.options.productVersion);
+						const allDepsAndPackExtensionsToInstall = await this.getAllDepsAndPackExtensions(task.identifier, task.manifest, !!task.options.installPreReleaseVersion, task.options.productVersion);
 						const installed = await this.getInstalled(undefined, task.options.profileLocation, task.options.productVersion);
 						const options: InstallExtensionTaskOptions = { ...task.options, context: { ...task.options.context, [EXTENSION_INSTALL_DEP_PACK_CONTEXT]: true } };
 						for (const { gallery, manifest } of distinct(allDepsAndPackExtensionsToInstall, ({ gallery }) => gallery.identifier.id)) {
-							if (installed.some(({ identifier }) => areSameExtensions(identifier, gallery.identifier))) {
+							const existing = installed.find(e => areSameExtensions(e.identifier, gallery.identifier));
+							// Skip if the extension is already installed and has the same application scope
+							if (existing && existing.isApplicationScoped === !!options.isApplicationScoped) {
 								continue;
 							}
 							createInstallExtensionTask(manifest, gallery, options, task);
@@ -578,12 +579,11 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 		throw error;
 	}
 
-	private async getAllDepsAndPackExtensions(extensionIdentifier: IExtensionIdentifier, manifest: IExtensionManifest, getOnlyNewlyAddedFromExtensionPack: boolean, installPreRelease: boolean, profile: URI | undefined, productVersion: IProductVersion): Promise<{ gallery: IGalleryExtension; manifest: IExtensionManifest }[]> {
+	private async getAllDepsAndPackExtensions(extensionIdentifier: IExtensionIdentifier, manifest: IExtensionManifest, installPreRelease: boolean, productVersion: IProductVersion): Promise<{ gallery: IGalleryExtension; manifest: IExtensionManifest }[]> {
 		if (!this.galleryService.isEnabled()) {
 			return [];
 		}
 
-		const installed = await this.getInstalled(undefined, profile, productVersion);
 		const knownIdentifiers: IExtensionIdentifier[] = [];
 
 		const allDependenciesAndPacks: { gallery: IGalleryExtension; manifest: IExtensionManifest }[] = [];
@@ -592,13 +592,9 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 			const dependecies: string[] = manifest.extensionDependencies || [];
 			const dependenciesAndPackExtensions = [...dependecies];
 			if (manifest.extensionPack) {
-				const existing = getOnlyNewlyAddedFromExtensionPack ? installed.find(e => areSameExtensions(e.identifier, extensionIdentifier)) : undefined;
 				for (const extension of manifest.extensionPack) {
-					// add only those extensions which are new in currently installed extension
-					if (!(existing && existing.manifest.extensionPack && existing.manifest.extensionPack.some(old => areSameExtensions({ id: old }, { id: extension })))) {
-						if (dependenciesAndPackExtensions.every(e => !areSameExtensions({ id: e }, { id: extension }))) {
-							dependenciesAndPackExtensions.push(extension);
-						}
+					if (dependenciesAndPackExtensions.every(e => !areSameExtensions({ id: e }, { id: extension }))) {
+						dependenciesAndPackExtensions.push(extension);
 					}
 				}
 			}
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index f431353d8a07..578f0c6dd7fd 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -534,7 +534,6 @@ export type InstallOptions = {
 	donotVerifySignature?: boolean;
 	operation?: InstallOperation;
 	profileLocation?: URI;
-	installOnlyNewlyAddedFromExtensionPack?: boolean;
 	productVersion?: IProductVersion;
 	keepExisting?: boolean;
 	downloadExtensionsLocally?: boolean;
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index 0fb425ed79c8..35d83e17b79b 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -456,7 +456,7 @@ CommandsRegistry.registerCommand({
 				}
 			} else {
 				const vsix = URI.revive(arg);
-				await extensionsWorkbenchService.install(vsix, { installOnlyNewlyAddedFromExtensionPack: options?.installOnlyNewlyAddedFromExtensionPackVSIX, installGivenVersion: true });
+				await extensionsWorkbenchService.install(vsix, { installGivenVersion: true });
 			}
 		} catch (e) {
 			onUnexpectedError(e);

From 393c628829370ceb37ecae0e4ff9eb88acec038a Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 26 Feb 2025 13:03:21 +0100
Subject: [PATCH 0427/1815] fix
 https://github.com/microsoft/vscode/issues/241839 (#242056)

---
 .../inlineChat/browser/inlineChatController.ts  | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
index 55da3ca89eb9..b42f3ded5761 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
@@ -12,7 +12,7 @@ import { Emitter, Event } from '../../../../base/common/event.js';
 import { Lazy } from '../../../../base/common/lazy.js';
 import { DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { MovingAverage } from '../../../../base/common/numbers.js';
-import { autorun, autorunWithStore, derived, IObservable, observableFromEvent, observableSignalFromEvent, observableValue, transaction } from '../../../../base/common/observable.js';
+import { autorun, autorunWithStore, derived, IObservable, observableFromEvent, observableSignalFromEvent, observableValue, transaction, 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';
@@ -1450,14 +1450,17 @@ export async function reviewEdits(accessor: ServicesAccessor, editor: ICodeEdito
 		chatRequest.response.complete();
 	}
 
-	const whenDecided = new Promise(resolve => {
-		store.add(autorun(r => {
-			if (!editSession.entries.read(r).some(e => e.state.read(r) === WorkingSetEntryState.Modified)) {
-				resolve(undefined);
-			}
-		}));
+	const isSettled = derived(r => {
+		const entry = editSession.readEntry(uri, r);
+		if (!entry) {
+			return false;
+		}
+		const state = entry.state.read(r);
+		return state === WorkingSetEntryState.Accepted || state === WorkingSetEntryState.Rejected;
 	});
 
+	const whenDecided = waitForState(isSettled, Boolean);
+
 	await raceCancellation(whenDecided, token);
 
 	store.dispose();

From 4a93ee1faf1835c4bbf6e64d4961c3d06f914181 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 26 Feb 2025 13:14:57 +0100
Subject: [PATCH 0428/1815] fixes
 https://github.com/microsoft/vscode-copilot/issues/13152 (#242060)

---
 .../inlineChat/browser/inlineChatCurrentLine.ts       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
index e4143ceff4a3..0e6b7f98cee1 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
@@ -20,7 +20,7 @@ import { IValidEditOperation, TrackedRangeStickiness } from '../../../../editor/
 import { URI } from '../../../../base/common/uri.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { StandardTokenType } from '../../../../editor/common/encodedTokenAttributes.js';
-import { autorun, derived, observableFromEvent, observableValue } from '../../../../base/common/observable.js';
+import { autorun, derivedWithStore, observableFromEvent, observableValue } from '../../../../base/common/observable.js';
 import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import './media/inlineChat.css';
@@ -38,6 +38,7 @@ import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modes
 import { createStyleSheet2 } from '../../../../base/browser/domStylesheets.js';
 import { stringValue } from '../../../../base/browser/cssValue.js';
 import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
+import { Emitter } from '../../../../base/common/event.js';
 
 export const CTX_INLINE_CHAT_SHOWING_HINT = new RawContextKey<boolean>('inlineChatShowingHint', false, localize('inlineChatShowingHint', "Whether inline chat shows a contextual hint"));
 
@@ -222,7 +223,7 @@ export class InlineChatHintsController extends Disposable implements IEditorCont
 		const configHintEmpty = observableConfigValue(InlineChatConfigKeys.LineEmptyHint, false, this._configurationService);
 		const configHintNL = observableConfigValue(InlineChatConfigKeys.LineNLHint, false, this._configurationService);
 
-		const showDataObs = derived(r => {
+		const showDataObs = derivedWithStore((r, store) => {
 			const ghostState = ghostCtrl?.model.read(r)?.state.read(r);
 
 			const textFocus = editorObs.isTextFocused.read(r);
@@ -239,6 +240,12 @@ export class InlineChatHintsController extends Disposable implements IEditorCont
 				return undefined;
 			}
 
+			// DEBT - I cannot use `model.onDidChangeContent` directly here
+			// https://github.com/microsoft/vscode/issues/242059
+			const emitter = store.add(new Emitter<void>());
+			store.add(model.onDidChangeContent(() => emitter.fire()));
+			observableFromEvent(emitter.event, () => model.getVersionId()).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;

From a67bbc0ea79a8c6f0fcee3f821b346ab4223ca11 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Wed, 26 Feb 2025 13:16:17 +0100
Subject: [PATCH 0429/1815] Fixes on click not working due to focus issues
 (#242061)

---
 .../browser/view/ghostText/ghostTextView.ts                  | 5 ++++-
 .../inlineEditsViews/inlineEditsLineReplacementView.ts       | 5 ++++-
 .../inlineEditsViews/inlineEditsSideBySideView.ts            | 3 +++
 .../inlineEditsViews/inlineEditsWordReplacementView.ts       | 3 +++
 4 files changed, 14 insertions(+), 2 deletions(-)

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 fb04686f119f..6171e83b1dda 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
@@ -435,7 +435,10 @@ export class AdditionalLinesWidget extends Disposable {
 				renderLines(domNode, tabSize, additionalLines, this._editor.getOptions(), this._isClickable);
 
 				if (this._isClickable) {
-					store.add(addDisposableListener(domNode, 'mouseup', (e) => {
+					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));
 						}
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 d952cda8a05b..123fb77cd78a 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
@@ -233,7 +233,10 @@ export class InlineEditsLineReplacementView extends Disposable implements IInlin
 							cursor: 'pointer',
 							pointerEvents: 'auto',
 						},
-						onmouseup: (e) => this._onDidClick.fire(new StandardMouseEvent(getWindow(e), e)),
+						onmousedown: e => {
+							e.preventDefault(); // This prevents that the editor loses focus
+						},
+						onclick: (e) => this._onDidClick.fire(new StandardMouseEvent(getWindow(e), e)),
 					}, [
 						n.div({
 							style: {
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 12648f46114c..a2e6f5fa2337 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
@@ -125,6 +125,9 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 	private readonly _editorContainer = n.div({
 		class: ['editorContainer', this._editorObs.getOption(EditorOption.inlineSuggest).map(v => !v.edits.useGutterIndicator && 'showHover')],
 		style: { position: 'absolute', overflow: 'hidden', cursor: 'pointer' },
+		onmousedown: e => {
+			e.preventDefault(); // This prevents that the editor loses focus
+		},
 		onclick: (e) => {
 			this._onDidClick.fire(new StandardMouseEvent(getWindow(e), e));
 		}
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 6303d7955811..86d42cb4de31 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
@@ -186,6 +186,9 @@ export class InlineEditsWordReplacementView extends Disposable implements IInlin
 							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);

From 475dd116a427f3fb2b9c415c932c2d3e303a7dba Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 26 Feb 2025 13:24:37 +0100
Subject: [PATCH 0430/1815] chat - tweaks to settings in status (#242062)

---
 .../contrib/chat/browser/chatStatus.ts        | 59 ++++++++++++-------
 .../contrib/chat/browser/media/chatStatus.css | 13 +++-
 2 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index aadf1a6ae561..175eb28bb6df 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -35,6 +35,7 @@ import { Color } from '../../../../base/common/color.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Gesture, EventType as TouchEventType } from '../../../../base/browser/touch.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 
 registerColor('gauge.background', {
 	dark: ACTIVITY_BAR_BADGE_BACKGROUND,
@@ -67,7 +68,8 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@ICommandService private readonly commandService: ICommandService,
-		@IHoverService private readonly hoverService: IHoverService
+		@IHoverService private readonly hoverService: IHoverService,
+		@IEditorService private readonly editorService: IEditorService
 	) {
 		super();
 
@@ -163,8 +165,8 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 				container.appendChild($('div', undefined, localize('limitTitle', "You are using Copilot Free")));
 				container.appendChild($('hr'));
 
-				const chatQuotaIndicator = this.createQuotaIndicator(container, chatTotal, chatRemaining, localize('chatsLabel', "Chats Messages Remaining"));
-				const completionsQuotaIndicator = this.createQuotaIndicator(container, completionsTotal, completionsRemaining, localize('completionsLabel', "Code Completions Remaining"));
+				const chatQuotaIndicator = this.createQuotaIndicator(container, chatTotal, chatRemaining, localize('chatsLabel', "Chats messages remaining"));
+				const completionsQuotaIndicator = this.createQuotaIndicator(container, completionsTotal, completionsRemaining, localize('completionsLabel', "Code completions remaining"));
 
 				this.chatEntitlementsService.resolve(CancellationToken.None).then(() => {
 					const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = this.chatQuotasService.quotas;
@@ -298,34 +300,49 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	}
 
 	private createSettings(container: HTMLElement, disposables: DisposableStore): HTMLElement {
+		const languageId = this.editorService.activeTextEditorLanguageId;
 		const settings = container.appendChild($('div.settings'));
 
-		const toggleCompletions = { text: localize('settings.toggleCompletions', "Code Completions"), id: 'editor.inlineSuggest.enabled' };
-		const toggleNextEditSuggestions = { text: localize('settings.toggleNextEditSuggestions', "Next Edit Suggestions (Preview)"), id: 'github.copilot.nextEditSuggestions.enabled' };
+		// --- Code Completions
+		{
+			const settingId = 'github.copilot.editor.enableAutoCompletions';
+			const globalSetting = append(settings, $('div.setting'));
+			this.createSetting(globalSetting, localize('settings.codeCompletions', "Enable code completions (all)"), { key: settingId, override: undefined }, disposables);
 
-		for (const entry of [toggleCompletions, toggleNextEditSuggestions]) {
-			const checked = Boolean(this.configurationService.getValue<boolean>(entry.id));
+			if (languageId) {
+				const languageSetting = append(settings, $('div.setting'));
+				this.createSetting(languageSetting, localize('settings.codeCompletionsLanguage', "Enable code completions ({0})", languageId), { key: settingId, override: languageId }, disposables);
+			}
+		}
+
+		return settings;
+	}
 
-			const setting = append(settings, $('div.setting'));
+	private createSetting(container: HTMLElement, label: string, setting: { key: string; override: string | undefined }, disposables: DisposableStore): Checkbox {
+		const checked = Boolean(this.configurationService.getValue<boolean>(setting.key, { overrideIdentifier: setting.override }));
 
-			const checkbox = disposables.add(new Checkbox(entry.text, checked, defaultCheckboxStyles));
-			setting.appendChild(checkbox.domNode);
+		const settingCheckbox = disposables.add(new Checkbox(label, checked, defaultCheckboxStyles));
+		container.appendChild(settingCheckbox.domNode);
 
-			const settingLabel = append(setting, $('span.setting-label', undefined, entry.text));
-			disposables.add(addDisposableListener(settingLabel, EventType.CLICK, e => {
-				if (checkbox?.enabled && (e.target as HTMLElement).tagName !== 'A') {
-					checkbox.checked = !checkbox.checked;
-					this.configurationService.updateValue(entry.id, checkbox.checked);
-					checkbox.focus();
+		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 (settingCheckbox?.enabled) {
+					EventHelper.stop(e, true);
+
+					settingCheckbox.checked = !settingCheckbox.checked;
+					this.configurationService.updateValue(setting.key, settingCheckbox.checked, { overrideIdentifier: setting.override });
+					settingCheckbox.focus();
 				}
 			}));
+		});
 
-			disposables.add(checkbox.onChange(() => {
-				this.configurationService.updateValue(entry.id, checkbox.checked);
-			}));
-		}
+		disposables.add(settingCheckbox.onChange(() => {
+			this.configurationService.updateValue(setting.key, settingCheckbox.checked, { overrideIdentifier: setting.override });
+		}));
 
-		return settings;
+		return settingCheckbox;
 	}
 
 	override dispose(): void {
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
index f9fc27968924..3cd3f0bb79de 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
@@ -27,8 +27,19 @@
 	gap: 5px;
 }
 
+.chat-status-bar-entry-tooltip .settings .setting {
+	display: flex;
+	align-items: center;
+}
+
+.chat-status-bar-entry-tooltip .settings .setting .monaco-checkbox {
+	height: 14px;
+	width: 14px;
+	margin-right: 5px;
+}
+
 .chat-status-bar-entry-tooltip .settings .setting .codicon {
-	font-size: 16px;
+	font-size: 12px;
 }
 
 .chat-status-bar-entry-tooltip .settings .setting .setting-label {

From 3e141e276d4ac2ddb19916b66e7c8815af1b2a1f Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Wed, 26 Feb 2025 14:21:03 +0100
Subject: [PATCH 0431/1815] Folder rendering improvements (#242065)

folder rendering improvements
---
 .../contrib/chat/browser/chatDragAndDrop.ts   | 19 +++++++++++--------
 .../contrib/chat/browser/chatVariables.ts     |  2 +-
 .../browser/contrib/chatDynamicVariables.ts   |  1 +
 .../browser/contrib/chatInputCompletions.ts   |  1 +
 .../contrib/chat/browser/media/chat.css       |  1 +
 .../contrib/chat/common/chatParserTypes.ts    |  5 +++--
 .../contrib/chat/common/chatRequestParser.ts  |  2 +-
 .../contrib/chat/common/chatVariables.ts      |  1 +
 8 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
index 36bfde02e393..4a538b5a86e8 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
@@ -508,15 +508,18 @@ async function resolveFilesInDirectory(resource: URI, fileSystemProvider: IFileS
 
 async function getResourceAttachContext(resource: URI, isDirectory: boolean, textModelService: ITextModelService): Promise<IChatRequestVariableEntry | undefined> {
 	let isOmitted = false;
-	try {
-		const createdModel = await textModelService.createModelReference(resource);
-		createdModel.dispose();
-	} catch {
-		isOmitted = true;
-	}
 
-	if (/\.(svg)$/i.test(resource.path)) {
-		isOmitted = true;
+	if (!isDirectory) {
+		try {
+			const createdModel = await textModelService.createModelReference(resource);
+			createdModel.dispose();
+		} catch {
+			isOmitted = true;
+		}
+
+		if (/\.(svg)$/i.test(resource.path)) {
+			isOmitted = true;
+		}
 	}
 
 	return {
diff --git a/src/vs/workbench/contrib/chat/browser/chatVariables.ts b/src/vs/workbench/contrib/chat/browser/chatVariables.ts
index dde6ec6e59f7..7ebacc6ae38e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatVariables.ts
@@ -30,7 +30,7 @@ export class ChatVariablesService implements IChatVariablesService {
 		prompt.parts
 			.forEach((part, i) => {
 				if (part instanceof ChatRequestDynamicVariablePart) {
-					resolvedVariables[i] = { id: part.id, name: part.referenceText, range: part.range, value: part.data, fullName: part.fullName, icon: part.icon, isFile: part.isFile };
+					resolvedVariables[i] = { id: part.id, name: part.referenceText, range: part.range, value: part.data, fullName: part.fullName, icon: part.icon, isFile: part.isFile, isDirectory: part.isDirectory };
 				} else if (part instanceof ChatRequestToolPart) {
 					resolvedVariables[i] = { id: part.toolId, name: part.toolName, range: part.range, value: undefined, isTool: true, icon: ThemeIcon.isThemeIcon(part.icon) ? part.icon : undefined, fullName: part.displayName };
 				}
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
index cea387531070..51c982387921 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
@@ -348,6 +348,7 @@ export class SelectAndInsertFolderAction extends Action2 {
 		context.widget.getContrib<ChatDynamicVariableModel>(ChatDynamicVariableModel.ID)?.addReference({
 			id: 'vscode.folder',
 			isFile: false,
+			isDirectory: true,
 			prefix: 'folder',
 			range: { startLineNumber: range.startLineNumber, startColumn: range.startColumn, endLineNumber: range.endLineNumber, endColumn: range.startColumn + text.length },
 			data: folder
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
index 41759588e185..ed38f7ce71f7 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
@@ -755,6 +755,7 @@ class BuiltinDynamicCompletions extends Disposable {
 						id: 'vscode.folder',
 						prefix: 'folder',
 						isFile: false,
+						isDirectory: true,
 						range: { startLineNumber: info.replace.startLineNumber, startColumn: info.replace.startColumn, endLineNumber: info.replace.endLineNumber, endColumn: info.replace.startColumn + text.length },
 						data: resource
 					})]
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 5afe77989365..1741ace76c5e 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1267,6 +1267,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 
 .interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-icon-label.predefined-file-icon::before {
 	padding: 0 0 0 2px;
+	align-content: center;
 }
 
 .interactive-session .interactive-item-container.interactive-request .chat-attached-context .chat-attached-context-attachment {
diff --git a/src/vs/workbench/contrib/chat/common/chatParserTypes.ts b/src/vs/workbench/contrib/chat/common/chatParserTypes.ts
index 0dff77c6e12e..386ae49778eb 100644
--- a/src/vs/workbench/contrib/chat/common/chatParserTypes.ts
+++ b/src/vs/workbench/contrib/chat/common/chatParserTypes.ts
@@ -143,7 +143,7 @@ export class ChatRequestSlashCommandPart implements IParsedChatRequestPart {
 export class ChatRequestDynamicVariablePart implements IParsedChatRequestPart {
 	static readonly Kind = 'dynamic';
 	readonly kind = ChatRequestDynamicVariablePart.Kind;
-	constructor(readonly range: OffsetRange, readonly editorRange: IRange, readonly text: string, readonly id: string, readonly modelDescription: string | undefined, readonly data: IChatRequestVariableValue, readonly fullName?: string, readonly icon?: ThemeIcon, readonly isFile?: boolean) { }
+	constructor(readonly range: OffsetRange, readonly editorRange: IRange, readonly text: string, readonly id: string, readonly modelDescription: string | undefined, readonly data: IChatRequestVariableValue, readonly fullName?: string, readonly icon?: ThemeIcon, readonly isFile?: boolean, readonly isDirectory?: boolean) { }
 
 	get referenceText(): string {
 		return this.text.replace(chatVariableLeader, '');
@@ -212,7 +212,8 @@ export function reviveParsedChatRequest(serialized: IParsedChatRequest): IParsed
 					revive((part as ChatRequestDynamicVariablePart).data),
 					(part as ChatRequestDynamicVariablePart).fullName,
 					(part as ChatRequestDynamicVariablePart).icon,
-					(part as ChatRequestDynamicVariablePart).isFile
+					(part as ChatRequestDynamicVariablePart).isFile,
+					(part as ChatRequestDynamicVariablePart).isDirectory
 				);
 			} else {
 				throw new Error(`Unknown chat request part: ${part.kind}`);
diff --git a/src/vs/workbench/contrib/chat/common/chatRequestParser.ts b/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
index b710d18bd310..230b17fc556f 100644
--- a/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
+++ b/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
@@ -219,7 +219,7 @@ export class ChatRequestParser {
 			const length = refAtThisPosition.range.endColumn - refAtThisPosition.range.startColumn;
 			const text = message.substring(0, length);
 			const range = new OffsetRange(offset, offset + length);
-			return new ChatRequestDynamicVariablePart(range, refAtThisPosition.range, text, refAtThisPosition.id, refAtThisPosition.modelDescription, refAtThisPosition.data, refAtThisPosition.fullName, refAtThisPosition.icon, refAtThisPosition.isFile);
+			return new ChatRequestDynamicVariablePart(range, refAtThisPosition.range, text, refAtThisPosition.id, refAtThisPosition.modelDescription, refAtThisPosition.data, refAtThisPosition.fullName, refAtThisPosition.icon, refAtThisPosition.isFile, refAtThisPosition.isDirectory);
 		}
 
 		return;
diff --git a/src/vs/workbench/contrib/chat/common/chatVariables.ts b/src/vs/workbench/contrib/chat/common/chatVariables.ts
index de02d68cf919..8a5dd90bf100 100644
--- a/src/vs/workbench/contrib/chat/common/chatVariables.ts
+++ b/src/vs/workbench/contrib/chat/common/chatVariables.ts
@@ -55,5 +55,6 @@ export interface IDynamicVariable {
 	prefix?: string;
 	modelDescription?: string;
 	isFile?: boolean;
+	isDirectory?: boolean;
 	data: IChatRequestVariableValue;
 }

From e5364e6c601489f0722fc8699cbad5518886c1d2 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Wed, 26 Feb 2025 15:49:48 +0100
Subject: [PATCH 0432/1815] Fix loading animation when font is italic (#238936)

fix: https://github.com/microsoft/vscode-copilot-release/issues/3981
---
 .../services/decorations/browser/decorationsService.ts          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/decorations/browser/decorationsService.ts b/src/vs/workbench/services/decorations/browser/decorationsService.ts
index 16344696c82c..d68cad08bed1 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' : ''};
+			${modifier === 'spin' ? 'animation: codicon-spin 1.5s steps(30) infinite; font-style: normal !important;' : ''};
 			`,
 			element
 		);

From 74e43f037576578f58f8c77f5a26a0f2297a98b1 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 26 Feb 2025 16:05:46 +0100
Subject: [PATCH 0433/1815] chat - tweaks to status (#242073)

---
 .../lib/stylelint/vscode-known-variables.json |  1 +
 .../contrib/chat/browser/chatStatus.ts        | 19 +++++++++++++------
 .../contrib/chat/browser/media/chatStatus.css | 19 ++++++++++++-------
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
index 7298c32d5447..0199b12b80b0 100644
--- a/build/lib/stylelint/vscode-known-variables.json
+++ b/build/lib/stylelint/vscode-known-variables.json
@@ -352,6 +352,7 @@
 		"--vscode-focusBorder",
 		"--vscode-foreground",
 		"--vscode-gauge-background",
+		"--vscode-gauge-border",
 		"--vscode-gauge-foreground",
 		"--vscode-icon-foreground",
 		"--vscode-inlineChat-background",
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 175eb28bb6df..1a24879564d9 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -25,7 +25,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { Command } from '../../../../editor/common/languages.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { Lazy } from '../../../../base/common/lazy.js';
-import { contrastBorder, registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { contrastBorder, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
 import { ACTIVITY_BAR_BADGE_BACKGROUND } from '../../../common/theme.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { coalesce } from '../../../../base/common/arrays.js';
@@ -37,7 +37,7 @@ import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Gesture, EventType as TouchEventType } from '../../../../base/browser/touch.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 
-registerColor('gauge.background', {
+const gaugeBackground = registerColor('gauge.background', {
 	dark: ACTIVITY_BAR_BADGE_BACKGROUND,
 	light: ACTIVITY_BAR_BADGE_BACKGROUND,
 	hcDark: contrastBorder,
@@ -45,12 +45,19 @@ registerColor('gauge.background', {
 }, localize('gaugeBackground', "Gauge background color."));
 
 registerColor('gauge.foreground', {
-	dark: Color.black,
-	light: Color.white,
+	dark: transparent(gaugeBackground, 0.3),
+	light: transparent(gaugeBackground, 0.3),
 	hcDark: Color.white,
 	hcLight: Color.white
 }, localize('gaugeForeground', "Gauge foreground color."));
 
+registerColor('gauge.border', {
+	dark: null,
+	light: null,
+	hcDark: contrastBorder,
+	hcLight: contrastBorder
+}, localize('gaugeBorder', "Gauge border color."));
+
 export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
 
 	static readonly ID = 'chat.statusBarEntry';
@@ -307,11 +314,11 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		{
 			const settingId = 'github.copilot.editor.enableAutoCompletions';
 			const globalSetting = append(settings, $('div.setting'));
-			this.createSetting(globalSetting, localize('settings.codeCompletions', "Enable code completions (all)"), { key: settingId, override: undefined }, disposables);
+			this.createSetting(globalSetting, localize('settings.codeCompletions', "Code completions (all)"), { key: settingId, override: undefined }, disposables);
 
 			if (languageId) {
 				const languageSetting = append(settings, $('div.setting'));
-				this.createSetting(languageSetting, localize('settings.codeCompletionsLanguage', "Enable code completions ({0})", languageId), { key: settingId, override: languageId }, disposables);
+				this.createSetting(languageSetting, localize('settings.codeCompletionsLanguage', "Code completions ({0})", languageId), { key: settingId, override: languageId }, disposables);
 			}
 		}
 
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
index 3cd3f0bb79de..6570d12f173d 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
@@ -6,8 +6,8 @@
 /* Overall */
 
 .chat-status-bar-entry-tooltip {
-	margin-top: 8px;
-	margin-bottom: 8px;
+	margin-top: 6px;
+	margin-bottom: 6px;
 }
 
 .chat-status-bar-entry-tooltip hr {
@@ -59,10 +59,10 @@
 	gap: 10px;
 
 	/** Make room for the hover feedback */
-	margin-left: -5px;
-	margin-right: -5px;
-	padding-left: 5px;
-	padding-right: 5px;
+	margin-left: -3px;
+	margin-right: -3px;
+	padding-left: 3px;
+	padding-right: 3px;
 	margin-top: -1px;
 	margin-bottom: -1px;
 	padding-top: 1px;
@@ -85,6 +85,11 @@
 	cursor: pointer;
 }
 
+.chat-status-bar-entry-tooltip .shortcuts .shortcut .monaco-keybinding > .monaco-keybinding-key {
+	padding: 2px 4px;
+	font-size: 10px;
+}
+
 /* Quota Indicator */
 
 .chat-status-bar-entry-tooltip .quota-indicator {
@@ -103,7 +108,7 @@
 	height: 4px;
 	background-color: var(--vscode-gauge-foreground);
 	border-radius: 4px;
-	border: 1px solid var(--vscode-gauge-background);
+	border: 1px solid var(--vscode-gauge-border);
 }
 
 .chat-status-bar-entry-tooltip .quota-indicator .quota-bar .quota-bit {

From 08558cdc211aac792bfa37f27b504acb91b8a6e7 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Wed, 26 Feb 2025 16:46:45 +0100
Subject: [PATCH 0434/1815] Fix NES rendering of full line insertions when
 horizontally scrolling (#242084)

fixes https://github.com/microsoft/vscode-copilot/issues/13626
---
 .../inlineEditsInsertionView.ts               | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

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 494210fa6c7f..38fe0c00ee0c 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
@@ -210,7 +210,7 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 
 		const right = editorLayout.contentLeft + this._editorMaxContentWidthInRange.read(reader) - horizontalScrollOffset;
 		const prefixLeftOffset = this._maxPrefixTrim.read(reader).prefixLeftOffset ?? 0 /* fix due to observable bug? */;
-		const left = editorLayout.contentLeft + prefixLeftOffset;
+		const left = editorLayout.contentLeft + prefixLeftOffset - horizontalScrollOffset;
 		if (right <= left) {
 			return null;
 		}
@@ -222,14 +222,14 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 		const top = this._editor.getTopForLineNumber(state.lineNumber) - scrollTop + topTrim;
 		const bottom = top + height;
 
-		const PADDING = 3;
-		const overlay = new Rect(left, top, right, bottom).withMargin(PADDING);
+		const overlay = new Rect(left, top, right, bottom);
 
 		return {
 			overlay,
-			horizontalScrollOffset,
+			contentLeft: editorLayout.contentLeft,
 			minContentWidthRequired: prefixLeftOffset + overlay.width + verticalScrollbarWidth,
 			borderRadius: 4,
+			padding: 3
 		};
 	}).recomputeInitiallyAndOnChange(this._store);
 
@@ -241,16 +241,18 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 		if (!overlayLayoutObs) { return undefined; }
 
 		const layoutInfo = overlayLayoutObs.read(reader);
+		const overlay = layoutInfo.overlay;
+		const croppedOverlay = new Rect(Math.max(overlay.left, layoutInfo.contentLeft), overlay.top, overlay.right, overlay.bottom);
 
 		const rectangleOverlay = createRectangle(
 			{
-				topLeft: layoutInfo.overlay.getLeftTop(),
-				width: layoutInfo.overlay.width + 1,
-				height: layoutInfo.overlay.height + 1,
+				topLeft: croppedOverlay.getLeftTop(),
+				width: croppedOverlay.width + 1,
+				height: croppedOverlay.height + 1,
 			},
-			0,
+			layoutInfo.padding,
 			layoutInfo.borderRadius,
-			{ hideLeft: layoutInfo.horizontalScrollOffset !== 0 }
+			{ hideLeft: croppedOverlay.left !== overlay.left }
 		);
 
 		const modifiedBorderColor = getModifiedBorderColor(this._host.tabAction).read(reader);

From 3f1ff35be2750b14e3b0243a9e549e6c59ab62c2 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Wed, 26 Feb 2025 16:48:17 +0100
Subject: [PATCH 0435/1815] Differences in syntax colorization on file full of
 errors (#242085)

Fixes #241813
---
 .../test-241001_ts.json                       |  2 +-
 .../colorize-tree-sitter-results/test_ts.json | 18 ++++++-------
 .../languages/highlights/typescript.scm       | 13 ++++++++++
 .../services/themes/common/colorThemeData.ts  | 25 +++++++++----------
 4 files changed, 35 insertions(+), 23 deletions(-)

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 e870a69ea3f9..8180a2388eaa 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
@@ -1261,7 +1261,7 @@
 	},
 	{
 		"c": "rest",
-		"t": "variable",
+		"t": "variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
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 8a0ca583697f..70b287ec2c16 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
@@ -15,16 +15,16 @@
 	},
 	{
 		"c": "module",
-		"t": "",
+		"t": "storage.type.namespace.ts",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
 		}
 	},
 	{
diff --git a/src/vs/editor/common/languages/highlights/typescript.scm b/src/vs/editor/common/languages/highlights/typescript.scm
index 18d45571ccfe..c536c7160cbf 100644
--- a/src/vs/editor/common/languages/highlights/typescript.scm
+++ b/src/vs/editor/common/languages/highlights/typescript.scm
@@ -75,9 +75,16 @@
 (required_parameter
   (identifier) @variable.parameter)
 
+(required_parameter
+  (rest_pattern
+    (identifier) @variable.parameter))
+
 (optional_parameter
   (identifier) @variable.parameter)
 
+(catch_clause
+  parameter: (identifier) @variable.parameter)
+
 ; Function and method calls
 
 (call_expression
@@ -103,6 +110,8 @@
 (predefined_type) @support.type
 (predefined_type (["string" "boolean" "number" "any" "unknown"])) @support.type.primitive
 (type_identifier) @entity.name.type
+(internal_module
+  name: (identifier) @entity.name.type.ts)
 
 ([
   (identifier)
@@ -297,6 +306,10 @@
   "var"
 ] @storage.type
 
+[
+  "module"
+] @storage.type.namespace.ts
+
 [
   "debugger"
   "target"
diff --git a/src/vs/workbench/services/themes/common/colorThemeData.ts b/src/vs/workbench/services/themes/common/colorThemeData.ts
index c4eb060a76a7..4d879061713b 100644
--- a/src/vs/workbench/services/themes/common/colorThemeData.ts
+++ b/src/vs/workbench/services/themes/common/colorThemeData.ts
@@ -905,20 +905,19 @@ export function findMetadata(colorThemeData: ColorThemeData, captureNames: strin
 	}
 
 	const fontStyle = definitions.foreground?.settings.fontStyle || definitions.bold?.settings.fontStyle;
-	switch (fontStyle) {
-		case 'italic':
-			metadata |= FontStyle.Italic | MetadataConsts.ITALIC_MASK;
-			break;
-		case 'bold':
-			metadata |= FontStyle.Bold | MetadataConsts.BOLD_MASK;
-			break;
-		case 'underline':
-			metadata |= FontStyle.Underline | MetadataConsts.UNDERLINE_MASK;
-			break;
-		case 'strikethrough':
-			metadata |= FontStyle.Strikethrough | MetadataConsts.STRIKETHROUGH_MASK;
-			break;
+	if (fontStyle?.includes('italic')) {
+		metadata |= FontStyle.Italic | MetadataConsts.ITALIC_MASK;
 	}
+	if (fontStyle?.includes('bold')) {
+		metadata |= FontStyle.Bold | MetadataConsts.BOLD_MASK;
+	}
+	if (fontStyle?.includes('underline')) {
+		metadata |= FontStyle.Underline | MetadataConsts.UNDERLINE_MASK;
+	}
+	if (fontStyle?.includes('strikethrough')) {
+		metadata |= FontStyle.Strikethrough | MetadataConsts.STRIKETHROUGH_MASK;
+	}
+
 	const foreground = tokenStyle?.foreground;
 	const tokenStyleForeground = (foreground !== undefined) ? colorThemeData.getTokenColorIndex().get(foreground) : ColorId.DefaultForeground;
 	metadata |= tokenStyleForeground << MetadataConsts.FOREGROUND_OFFSET;

From de73e2000aff48de8b5117b4c907a7fc5a653a64 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Wed, 26 Feb 2025 16:49:15 +0100
Subject: [PATCH 0436/1815] Fix ghost text view clickability (#242086)

fix ghost text view clickability
---
 .../browser/view/ghostText/ghostTextView.css                 | 2 ++
 .../browser/view/ghostText/ghostTextView.ts                  | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

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 3bcb8b5f61ab..16148bd87b09 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.css
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.css
@@ -33,6 +33,8 @@
 	z-index: 1;
 }
 
+.monaco-editor .ghost-text-decoration.clickable,
+.monaco-editor .ghost-text-decoration-preview.clickable,
 .monaco-editor .suggest-preview-text.clickable .ghost-text {
 	cursor: pointer;
 }
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 6171e83b1dda..06d68f717821 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
@@ -224,7 +224,10 @@ export class GhostTextView extends Disposable {
 					after: {
 						content: p.text,
 						tokens: p.tokens,
-						inlineClassName: p.preview ? 'ghost-text-decoration-preview' : 'ghost-text-decoration' + extraClassNames + p.lineDecorations.map(d => ' ' + d.className).join(' '), // TODO: take the ranges into account for line decorations
+						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(),
 					},

From d7ca4447b04e544d0e1e5768705b538b41b9f75c Mon Sep 17 00:00:00 2001
From: Cassidy Williams <1454517+cassidoo@users.noreply.github.com>
Date: Wed, 26 Feb 2025 10:03:19 -0600
Subject: [PATCH 0437/1815] Fix #241903: Add override for GitHub in
 settingsLayout.ts (#241911)

Add override for GitHub in settingsLayout.ts
---
 src/vs/workbench/contrib/preferences/browser/settingsLayout.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
index 7e9aab40f941..8408d9a11a93 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
@@ -319,3 +319,4 @@ knownTermMappings.set('power shell', 'PowerShell');
 knownTermMappings.set('powershell', 'PowerShell');
 knownTermMappings.set('javascript', 'JavaScript');
 knownTermMappings.set('typescript', 'TypeScript');
+knownTermMappings.set('github', 'GitHub');

From e97b871e8994ac81813582e896cdf5bfbd0b6bad Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 26 Feb 2025 17:06:35 +0100
Subject: [PATCH 0438/1815] chat - setup settings listen to changes (#242088)

---
 .../workbench/contrib/chat/browser/chatStatus.ts  | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 1a24879564d9..a3027b194116 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -326,9 +326,10 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	}
 
 	private createSetting(container: HTMLElement, label: string, setting: { key: string; override: string | undefined }, disposables: DisposableStore): Checkbox {
-		const checked = Boolean(this.configurationService.getValue<boolean>(setting.key, { overrideIdentifier: setting.override }));
+		const readSetting = () => Boolean(this.configurationService.getValue<boolean>(setting.key, { overrideIdentifier: setting.override }));
+		const writeSetting = (checkbox: Checkbox) => this.configurationService.updateValue(setting.key, checkbox.checked, { overrideIdentifier: setting.override });
 
-		const settingCheckbox = disposables.add(new Checkbox(label, checked, defaultCheckboxStyles));
+		const settingCheckbox = disposables.add(new Checkbox(label, readSetting(), defaultCheckboxStyles));
 		container.appendChild(settingCheckbox.domNode);
 
 		const settingLabel = append(container, $('span.setting-label', undefined, label));
@@ -339,14 +340,20 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 					EventHelper.stop(e, true);
 
 					settingCheckbox.checked = !settingCheckbox.checked;
-					this.configurationService.updateValue(setting.key, settingCheckbox.checked, { overrideIdentifier: setting.override });
+					writeSetting(settingCheckbox);
 					settingCheckbox.focus();
 				}
 			}));
 		});
 
 		disposables.add(settingCheckbox.onChange(() => {
-			this.configurationService.updateValue(setting.key, settingCheckbox.checked, { overrideIdentifier: setting.override });
+			writeSetting(settingCheckbox);
+		}));
+
+		disposables.add(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(setting.key, { overrideIdentifier: setting.override })) {
+				settingCheckbox.checked = readSetting();
+			}
 		}));
 
 		return settingCheckbox;

From bb70a72158e38b14291db484d90a630a65e3e0a3 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 26 Feb 2025 17:12:01 +0100
Subject: [PATCH 0439/1815] don't handle `codeblockUri`-parts as signal for
 edits (#242038)

https://github.com/microsoft/vscode-copilot-release/issues/5629
---
 .../chatEditing/chatEditingServiceImpl.ts     | 23 ++-----------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
index bbce908e6415..a3da95a5fc3f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { coalesce, compareBy, delta } from '../../../../../base/common/arrays.js';
-import { findLastIdx } from '../../../../../base/common/arraysFind.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { ErrorNoTelemetry } from '../../../../../base/common/errors.js';
@@ -14,7 +13,6 @@ import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from
 import { LinkedList } from '../../../../../base/common/linkedList.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
 import { derived, IObservable, observableValueOpts, runOnChange, ValueWithChangeEventFromObservable } from '../../../../../base/common/observable.js';
-import { isEqual } from '../../../../../base/common/resources.js';
 import { compare } from '../../../../../base/common/strings.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { assertType, isString } from '../../../../../base/common/types.js';
@@ -245,11 +243,6 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 		// 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)[] = [];
-		// Same deal as above, but for code block URIs. Code block URIs preceed a
-		// text edit group, and are used to allow us to start an editing state
-		// prior to the code actually streaming in. When a new edit block it seen,
-		// it'll look back and 'claim' the last unclaimed matchin codeblock URI.
-		const codeBlockUrisSeen: ({ uri: URI; streaming?: IStreamingEdits } | undefined)[] = [];
 
 		const editedFilesExist = new ResourceMap<Promise<void>>();
 		const ensureEditorOpen = (partUri: URI) => {
@@ -295,28 +288,16 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 					continue;
 				}
 
-				if (part.kind === 'codeblockUri') {
-					ensureEditorOpen(part.uri);
-					codeBlockUrisSeen[i] ??= { uri: part.uri, streaming: session.startStreamingEdits(part.uri, responseModel, undoStop) };
-					continue;
-				}
-
 				if (part.kind !== 'textEditGroup' && part.kind !== 'notebookEditGroup') {
 					continue;
 				}
 
+				ensureEditorOpen(part.uri);
 
 				// get new edits and start editing session
 				let entry = editsSeen[i];
 				if (!entry) {
-					const codeBlockIndex = findLastIdx(codeBlockUrisSeen, e => e?.streaming && isEqual(e.uri, part.uri), i - 1);
-					if (codeBlockIndex !== -1) {
-						entry = { seen: 0, streaming: codeBlockUrisSeen[codeBlockIndex]!.streaming! };
-						codeBlockUrisSeen[codeBlockIndex]!.streaming = undefined;
-					} else {
-						entry = { seen: 0, streaming: session.startStreamingEdits(CellUri.parse(part.uri)?.notebook ?? part.uri, responseModel, undoStop) };
-					}
-
+					entry = { seen: 0, streaming: session.startStreamingEdits(CellUri.parse(part.uri)?.notebook ?? part.uri, responseModel, undoStop) };
 					editsSeen[i] = entry;
 				}
 

From c72dd1ef9f3515ddfc6a1dc0cd7b20bfb19b49a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joaomoreno@users.noreply.github.com>
Date: Wed, 26 Feb 2025 17:26:19 +0100
Subject: [PATCH 0440/1815] rename telemetry prop (#242090)

---
 src/vs/platform/update/electron-main/updateService.darwin.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
index a7e7bb4a44b3..57398fba4c8f 100644
--- a/src/vs/platform/update/electron-main/updateService.darwin.ts
+++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -113,10 +113,10 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
 
 		type UpdateDownloadedClassification = {
 			owner: 'joaomoreno';
-			version: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The version number of the new VS Code that has been downloaded.' };
+			newVersion: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The version number of the new VS Code that has been downloaded.' };
 			comment: 'This is used to know how often VS Code has successfully downloaded the update.';
 		};
-		this.telemetryService.publicLog2<{ version: String }, UpdateDownloadedClassification>('update:downloaded', { version: update.version });
+		this.telemetryService.publicLog2<{ newVersion: String }, UpdateDownloadedClassification>('update:downloaded', { newVersion: update.version });
 
 		this.setState(State.Ready(update));
 	}

From 94c20704c88f9185983718ba6e71450677d43e82 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Wed, 26 Feb 2025 08:35:57 -0800
Subject: [PATCH 0441/1815] Revert cleanup (#242080)

---
 .../workbench/contrib/preferences/browser/settingsEditor2.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
index 777931961e11..ca7251acf19d 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -1160,11 +1160,6 @@ export class SettingsEditor2 extends EditorPane {
 				this.renderTree(key, isManualReset);
 				this.pendingSettingUpdate = null;
 
-				// Only log 1% of modification events to reduce the volume of data
-				if (Math.random() >= 0.01) {
-					return;
-				}
-
 				const reportModifiedProps = {
 					key,
 					query,

From 33c09e47c374fbcb8de2a256d812c5baa8450c28 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Wed, 26 Feb 2025 18:15:07 +0100
Subject: [PATCH 0442/1815] Bring back icons for symbols in chat suggest widget
 (#242095)

* Bring back icons for symbols in chat suggest widget

* :lipstick:
---
 src/vs/workbench/contrib/chat/browser/chatInputPart.ts | 5 ++++-
 src/vs/workbench/contrib/chat/browser/media/chat.css   | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index f3cb3d0b1581..0ef761851462 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -786,7 +786,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		options.wrappingStrategy = 'advanced';
 		options.bracketPairColorization = { enabled: false };
 		options.suggest = {
-			showIcons: false,
+			showIcons: true,
 			showSnippets: false,
 			showWords: true,
 			showStatusBar: false,
@@ -799,7 +799,10 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		const editorOptions = getSimpleCodeEditorWidgetOptions();
 		editorOptions.contributions?.push(...EditorExtensionsRegistry.getSomeEditorContributions([ContentHoverController.ID, GlyphHoverController.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');
 
 		this._register(this._inputEditor.onDidChangeModelContent(() => {
 			const currentHeight = Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight);
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 1741ace76c5e..e4aa79814cc5 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1731,3 +1731,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 		}
 	}
 }
+
+.hideSuggestTextIcons .suggest-widget .monaco-list .monaco-list-row .suggest-icon.codicon-symbol-text::before {
+	display: none;
+}

From 0f49f0e6491dac7154177c4e16a46cca3985c0ca Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 26 Feb 2025 10:22:30 -0800
Subject: [PATCH 0443/1815] npm: fix run button in scripts tree not updating
 when npm.scriptRunner is changed (#242098)

---
 extensions/npm/.vscode/launch.json | 5 +----
 extensions/npm/src/npmMain.ts      | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/extensions/npm/.vscode/launch.json b/extensions/npm/.vscode/launch.json
index 017c87624153..b5cc96144bc8 100644
--- a/extensions/npm/.vscode/launch.json
+++ b/extensions/npm/.vscode/launch.json
@@ -9,10 +9,7 @@
 			"args": [
 				"--extensionDevelopmentPath=${workspaceFolder}"
 			],
-			"stopOnEntry": false,
 			"sourceMaps": true,
-			"outFiles": ["${workspaceFolder}/client/out/**/*.js"],
-			"preLaunchTask": "npm"
 		}
 	]
-}
\ No newline at end of file
+}
diff --git a/extensions/npm/src/npmMain.ts b/extensions/npm/src/npmMain.ts
index dc1c2c241262..c37056fc4a65 100644
--- a/extensions/npm/src/npmMain.ts
+++ b/extensions/npm/src/npmMain.ts
@@ -38,7 +38,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 	treeDataProvider = registerExplorer(context);
 
 	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration((e) => {
-		if (e.affectsConfiguration('npm.exclude') || e.affectsConfiguration('npm.autoDetect') || e.affectsConfiguration('npm.scriptExplorerExclude')) {
+		if (e.affectsConfiguration('npm.exclude') || e.affectsConfiguration('npm.autoDetect') || e.affectsConfiguration('npm.scriptExplorerExclude') || e.affectsConfiguration('npm.runSilent') || e.affectsConfiguration('npm.packageManager') || e.affectsConfiguration('npm.scriptRunner')) {
 			invalidateTasksCache();
 			if (treeDataProvider) {
 				treeDataProvider.refresh();

From 55112f992c4912c1ebe77bed6e4d5b2dc1b7660b Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Thu, 27 Feb 2025 05:48:16 +1100
Subject: [PATCH 0444/1815] Support diffing notebook snapshots (#242042)

---
 .../contrib/chat/browser/chat.contribution.ts |   3 +
 .../chatEditingModifiedNotebookEntry.ts       | 161 +++++++++---------
 .../chatEditingModifiedNotebookSnapshot.ts    | 103 +++++++++++
 .../chatEditingNotebookFileSystemProvider.ts  |  81 ++++-----
 .../browser/chatEditing/chatEditingSession.ts |  22 ++-
 .../browser/contrib/chatEdit/contribution.ts  |   4 -
 6 files changed, 238 insertions(+), 136 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookSnapshot.ts
 rename src/vs/workbench/contrib/{notebook/browser/contrib/chatEdit => chat/browser/chatEditing}/chatEditingNotebookFileSystemProvider.ts (54%)

diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index b4edc100f262..beb5e2a1bc9c 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -99,6 +99,7 @@ import { DOCUMENTATION_URL } from '../common/promptSyntax/constants.js';
 import { registerChatToolActions } from './actions/chatToolActions.js';
 import { ChatStatusBarEntry } from './chatStatus.js';
 import product from '../../../../platform/product/common/product.js';
+import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditing/chatEditingNotebookFileSystemProvider.js';
 
 // Register configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -498,3 +499,5 @@ registerSingleton(ILanguageModelIgnoredFilesService, LanguageModelIgnoredFilesSe
 registerSingleton(IChatQuotasService, ChatQuotasService, InstantiationType.Delayed);
 registerSingleton(IChatEntitlementsService, ChatEntitlementsService, InstantiationType.Delayed);
 registerSingleton(IPromptsService, PromptsService, InstantiationType.Delayed);
+
+registerWorkbenchContribution2(ChatEditingNotebookFileSystemProviderContrib.ID, ChatEditingNotebookFileSystemProviderContrib, WorkbenchPhase.BlockStartup);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index d63450e6504c..640e7b92be59 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { RunOnceScheduler } from '../../../../../base/common/async.js';
-import { decodeBase64, encodeBase64, streamToBuffer, VSBuffer } from '../../../../../base/common/buffer.js';
+import { streamToBuffer } from '../../../../../base/common/buffer.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { DisposableStore, IReference, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { ResourceMap, ResourceSet } from '../../../../../base/common/map.js';
@@ -15,6 +15,7 @@ import { isEqual } from '../../../../../base/common/resources.js';
 import { themeColorFromId } 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 { EditOperation, ISingleEditOperation } from '../../../../../editor/common/core/editOperation.js';
 import { LineRange } from '../../../../../editor/common/core/lineRange.js';
 import { OffsetEdit } from '../../../../../editor/common/core/offsetEdit.js';
@@ -40,7 +41,6 @@ import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRe
 import { IEditorPane, SaveReason } from '../../../../common/editor.js';
 import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
 import { SnapshotContext } from '../../../../services/workingCopy/common/fileWorkingCopy.js';
-import { ChatEditingNotebookFileSystemProvider } from '../../../notebook/browser/contrib/chatEdit/chatEditingNotebookFileSystemProvider.js';
 import { NotebookTextDiffEditor } from '../../../notebook/browser/diff/notebookDiffEditor.js';
 import { INotebookTextDiffEditor } from '../../../notebook/browser/diff/notebookDiffEditorBrowser.js';
 import { CellDiffInfo, computeDiff } from '../../../notebook/browser/diff/notebookDiffViewModel.js';
@@ -48,22 +48,81 @@ import { CellEditState, getNotebookEditorFromEditorPane } from '../../../noteboo
 import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
 import { NotebookCellTextModel } from '../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
-import { CellEditType, ICellDto2, ICellEditOperation, ICellReplaceEdit, IOutputItemDto, IResolvedNotebookEditorModel, NotebookData, NotebookSetting, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
+import { CellEditType, ICellDto2, ICellEditOperation, ICellReplaceEdit, IResolvedNotebookEditorModel, NotebookSetting, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
 import { INotebookEditorModelResolverService } from '../../../notebook/common/notebookEditorModelResolverService.js';
 import { INotebookLoggingService } from '../../../notebook/common/notebookLoggingService.js';
 import { INotebookService } from '../../../notebook/common/notebookService.js';
 import { INotebookEditorWorkerService } from '../../../notebook/common/services/notebookWorkerService.js';
-import { ChatEditKind, IModifiedFileEntryEditorIntegration, WorkingSetEntryState } from '../../common/chatEditingService.js';
+import { ChatEditKind, IEditSessionEntryDiff, IModifiedFileEntryEditorIntegration, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { IChatResponseModel } from '../../common/chatModel.js';
 import { IChatService } from '../../common/chatService.js';
 import { IDocumentDiff2 } from './chatEditingCodeEditorIntegration.js';
 import { AbstractChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISnapshotEntry, pendingRewriteMinimap } from './chatEditingModifiedFileEntry.js';
+import { createSnapshot, deserializeSnapshot, getNotebookSnapshotFileURI, restoreSnapshot } from './chatEditingModifiedNotebookSnapshot.js';
 import { ChatEditingNotebookDiffEditorIntegration, ChatEditingNotebookEditorIntegration, countChanges, ICellDiffInfo, sortCellChanges } from './chatEditingNotebookEditorIntegration.js';
-import { ChatEditingSnapshotTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
+import { ChatEditingNotebookFileSystemProvider } from './chatEditingNotebookFileSystemProvider.js';
 
 
 const noopKeep = () => Promise.resolve(true);
 const noopUndo = () => Promise.resolve(true);
+const SnapshotLanguageId = 'VSCodeChatNotebookSnapshotLanguage';
+
+export class ChatEditingModifiedNotebookDiff {
+	static NewModelCounter: number = 0;
+	constructor(
+		private readonly original: ISnapshotEntry,
+		private readonly modified: ISnapshotEntry,
+		@INotebookEditorWorkerService private readonly notebookEditorWorkerService: INotebookEditorWorkerService,
+		@INotebookLoggingService private readonly notebookLoggingService: INotebookLoggingService,
+		@INotebookEditorModelResolverService private readonly notebookEditorModelService: INotebookEditorModelResolverService,
+	) {
+
+	}
+
+	async computeDiff(): Promise<IEditSessionEntryDiff> {
+
+		let added = 0;
+		let removed = 0;
+
+		const disposables = new DisposableStore();
+		try {
+			const [modifiedRef, originalRef] = await Promise.all([
+				this.notebookEditorModelService.resolve(this.modified.snapshotUri),
+				this.notebookEditorModelService.resolve(this.original.snapshotUri)
+			]);
+			disposables.add(modifiedRef);
+			disposables.add(originalRef);
+			const notebookDiff = await this.notebookEditorWorkerService.computeDiff(this.original.snapshotUri, this.modified.snapshotUri);
+			const result = computeDiff(originalRef.object.notebook, modifiedRef.object.notebook, notebookDiff);
+			result.cellDiffInfo.forEach(diff => {
+				switch (diff.type) {
+					case 'modified':
+					case 'insert':
+						added++;
+						break;
+					case 'delete':
+						removed++;
+						break;
+					default:
+						break;
+				}
+			});
+		} catch (e) {
+			this.notebookLoggingService.error('Notebook Chat', 'Error computing diff:\n' + e);
+		} finally {
+			disposables.dispose();
+		}
+
+		return {
+			added,
+			removed,
+			identical: added === 0 && removed === 0,
+			quitEarly: false,
+			modifiedURI: this.modified.snapshotUri,
+			originalURI: this.original.snapshotUri,
+		};
+	}
+}
 
 export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifiedFileEntry {
 	static NewModelCounter: number = 0;
@@ -112,12 +171,13 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			const loggingService = accessor.get(INotebookLoggingService);
 			const resourceRef: IReference<IResolvedNotebookEditorModel> = await resolver.resolve(uri);
 			const notebook = resourceRef.object.notebook;
-			const originalUri = ChatEditingNotebookFileSystemProvider.getSnapshotFileURI(telemetryInfo.requestId, notebook.uri.scheme === Schemas.untitled ? `/${notebook.uri.path}` : notebook.uri.path);
+			const originalUri = getNotebookSnapshotFileURI(telemetryInfo.sessionId, 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))
 			]);
 			const disposables = new DisposableStore();
+			// Register so that we can load this from file system.
 			disposables.add(ChatEditingNotebookFileSystemProvider.registerFile(originalUri, buffer));
 			const originalRef = await resolver.resolve(originalUri, notebook.viewType);
 			const modifiedCells = new ResourceMap<ITextModel>();
@@ -151,7 +211,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		});
 	}
 
-	public static canHandleSnapshot(initialContent: string | undefined): boolean {
+	public static canHandleSnapshotContent(initialContent: string | undefined): boolean {
 		if (!initialContent) {
 			return false;
 		}
@@ -165,6 +225,13 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		}
 	}
 
+	public static canHandleSnapshot(snapshot: ISnapshotEntry): boolean {
+		if (snapshot.languageId === SnapshotLanguageId && ChatEditingModifiedNotebookEntry.canHandleSnapshotContent(snapshot.current)) {
+			return true;
+		}
+		return false;
+	}
+
 	constructor(
 		private readonly modifiedResourceRef: IReference<IResolvedNotebookEditorModel>,
 		originalResourceRef: IReference<IResolvedNotebookEditorModel>,
@@ -680,8 +747,8 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		this.cellEntryMap.forEach(entry => entry.isFirstEditAfterStartOrSnapshot = true);
 		return {
 			resource: this.modifiedURI,
-			languageId: 'notebook',
-			snapshotUri: ChatEditingSnapshotTextModelContentProvider.getSnapshotFileURI(this._telemetryInfo.sessionId, requestId, undoStop, this.modifiedURI.path),
+			languageId: SnapshotLanguageId,
+			snapshotUri: getNotebookSnapshotFileURI(this._telemetryInfo.sessionId, requestId, undoStop, this.modifiedURI.path, this.modifiedModel.viewType),
 			original: createSnapshot(this.originalModel, this.transientOptions, this.configurationService),
 			current: createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService),
 			originalToCurrentEdit: OffsetEdit.empty,
@@ -767,82 +834,6 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	}
 }
 
-const BufferMarker = 'ArrayBuffer-4f56482b-5a03-49ba-8356-210d3b0c1c3d';
-function createSnapshot(notebook: NotebookTextModel, transientOptions: TransientOptions | undefined, configurationService: IConfigurationService): string {
-	const outputSizeLimit = configurationService.getValue<number>(NotebookSetting.outputBackupSizeLimit) * 1024;
-	return serializeSnapshot(notebook.createSnapshot({ context: SnapshotContext.Backup, outputSizeLimit, transientOptions }), transientOptions);
-}
-
-function restoreSnapshot(notebook: NotebookTextModel, snapshot: string): void {
-	try {
-		const { transientOptions, data } = deserializeSnapshot(snapshot);
-		notebook.restoreSnapshot(data, transientOptions);
-	}
-	catch (ex) {
-		console.error('Error restoring Notebook snapshot', ex);
-	}
-}
-
-export function serializeSnapshot(data: NotebookData, transientOptions: TransientOptions | undefined): string {
-	data.cells.forEach(cell => {
-		const outputs = cell.outputs.map(output => {
-			// Ensure we're in full control of the data being stored.
-			// Possible we have classes instead of plain objects.
-			return {
-				outputId: output.outputId,
-				metadata: output.metadata,
-				outputs: output.outputs.map(item => {
-					return {
-						data: item.data,
-						mime: item.mime,
-					} satisfies IOutputItemDto;
-				}),
-			};
-		});
-		// Ensure we're in full control of the data being stored.
-		// Possible we have classes instead of plain objects.
-		return {
-			cellKind: cell.cellKind,
-			language: cell.language,
-			metadata: cell.metadata,
-			outputs,
-			mime: cell.mime,
-			source: cell.source,
-			collapseState: cell.collapseState,
-			// No need to store the internal metadata, as this can contain unique information such as cell ids.
-			// Also its not something that can be persisted, hence no need to try to restore that either.
-			internalMetadata: undefined
-		} satisfies ICellDto2;
-	});
-	return JSON.stringify([
-		JSON.stringify(transientOptions)
-		, JSON.stringify(data, (_key, value) => {
-			if (value instanceof VSBuffer) {
-				return {
-					type: BufferMarker,
-					data: encodeBase64(value)
-				};
-			}
-			return value;
-		})
-	]);
-}
-
-function deserializeSnapshot(snapshot: string): { transientOptions: TransientOptions | undefined; data: NotebookData } {
-	const [transientOptionsStr, dataStr] = JSON.parse(snapshot);
-	const transientOptions = transientOptionsStr ? JSON.parse(transientOptionsStr) as TransientOptions : undefined;
-
-	const data: NotebookData = JSON.parse(dataStr, (_key, value) => {
-		if (value && value.type === BufferMarker) {
-			return decodeBase64(value.data);
-		}
-		return value;
-	});
-
-	return { transientOptions, data };
-}
-
-
 class ChatEditingNotebookCellEntry extends ObservableDisposable {
 	private static readonly _lastEditDecorationOptions = ModelDecorationOptions.register({
 		isWholeLine: true,
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookSnapshot.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookSnapshot.ts
new file mode 100644
index 000000000000..68e96412c6d2
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookSnapshot.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 { decodeBase64, encodeBase64, VSBuffer } from '../../../../../base/common/buffer.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { SnapshotContext } from '../../../../services/workingCopy/common/fileWorkingCopy.js';
+import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
+import { ICellDto2, IOutputItemDto, NotebookData, NotebookSetting, TransientOptions } from '../../../notebook/common/notebookCommon.js';
+
+const BufferMarker = 'ArrayBuffer-4f56482b-5a03-49ba-8356-210d3b0c1c3d';
+
+type ChatEditingSnapshotNotebookContentQueryData = { sessionId: string; 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 {
+	return URI.from({
+		scheme: ChatEditingNotebookSnapshotScheme,
+		path,
+		query: JSON.stringify({ sessionId: chatSessionId, 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 };
+}
+
+export function createSnapshot(notebook: NotebookTextModel, transientOptions: TransientOptions | undefined, configurationService: IConfigurationService): string {
+	const outputSizeLimit = configurationService.getValue<number>(NotebookSetting.outputBackupSizeLimit) * 1024;
+	return serializeSnapshot(notebook.createSnapshot({ context: SnapshotContext.Backup, outputSizeLimit, transientOptions }), transientOptions);
+}
+
+export function restoreSnapshot(notebook: NotebookTextModel, snapshot: string): void {
+	try {
+		const { transientOptions, data } = deserializeSnapshot(snapshot);
+		notebook.restoreSnapshot(data, transientOptions);
+	}
+	catch (ex) {
+		console.error('Error restoring Notebook snapshot', ex);
+	}
+}
+
+export function serializeSnapshot(data: NotebookData, transientOptions: TransientOptions | undefined): string {
+	data.cells.forEach(cell => {
+		const outputs = cell.outputs.map(output => {
+			// Ensure we're in full control of the data being stored.
+			// Possible we have classes instead of plain objects.
+			return {
+				outputId: output.outputId,
+				metadata: output.metadata,
+				outputs: output.outputs.map(item => {
+					return {
+						data: item.data,
+						mime: item.mime,
+					} satisfies IOutputItemDto;
+				}),
+			};
+		});
+		// Ensure we're in full control of the data being stored.
+		// Possible we have classes instead of plain objects.
+		return {
+			cellKind: cell.cellKind,
+			language: cell.language,
+			metadata: cell.metadata,
+			outputs,
+			mime: cell.mime,
+			source: cell.source,
+			collapseState: cell.collapseState,
+			// No need to store the internal metadata, as this can contain unique information such as cell ids.
+			// Also its not something that can be persisted, hence no need to try to restore that either.
+			internalMetadata: undefined
+		} satisfies ICellDto2;
+	});
+	return JSON.stringify([
+		JSON.stringify(transientOptions)
+		, JSON.stringify(data, (_key, value) => {
+			if (value instanceof VSBuffer) {
+				return {
+					type: BufferMarker,
+					data: encodeBase64(value)
+				};
+			}
+			return value;
+		})
+	]);
+}
+
+export function deserializeSnapshot(snapshot: string): { transientOptions: TransientOptions | undefined; data: NotebookData } {
+	const [transientOptionsStr, dataStr] = JSON.parse(snapshot);
+	const transientOptions = transientOptionsStr ? JSON.parse(transientOptionsStr) as TransientOptions : undefined;
+
+	const data: NotebookData = JSON.parse(dataStr, (_key, value) => {
+		if (value && value.type === BufferMarker) {
+			return decodeBase64(value.data);
+		}
+		return value;
+	});
+
+	return { transientOptions, data };
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/chatEditingNotebookFileSystemProvider.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookFileSystemProvider.ts
similarity index 54%
rename from src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/chatEditingNotebookFileSystemProvider.ts
rename to src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookFileSystemProvider.ts
index 0b3d8cd343d0..05716980af0f 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/chatEditingNotebookFileSystemProvider.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookFileSystemProvider.ts
@@ -3,53 +3,39 @@
  *  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 { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
-import { ResourceMap } from '../../../../../../base/common/map.js';
-import { ReadableStreamEvents } from '../../../../../../base/common/stream.js';
-import { URI } from '../../../../../../base/common/uri.js';
-import { IFileService, IFileSystemProvider, FileSystemProviderCapabilities, IFileChange, IWatchOptions, IStat, IFileDeleteOptions, IFileOverwriteOptions, IFileWriteOptions, IFileReadStreamOptions, IFileOpenOptions, FileType } from '../../../../../../platform/files/common/files.js';
-import { IWorkbenchContribution } from '../../../../../common/contributions.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { Event } from '../../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
+import { ReadableStreamEvents } from '../../../../../base/common/stream.js';
+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 { INotebookService } from '../../../notebook/common/notebookService.js';
+import { IChatEditingService } from '../../common/chatEditingService.js';
+import { ChatEditingNotebookSnapshotScheme, deserializeSnapshot } from './chatEditingModifiedNotebookSnapshot.js';
+import { ChatEditingSession } from './chatEditingSession.js';
 
 
 export class ChatEditingNotebookFileSystemProviderContrib extends Disposable implements IWorkbenchContribution {
 	static ID = 'chatEditingNotebookFileSystemProviderContribution';
 	constructor(
-		@IFileService private readonly fileService: IFileService) {
+		@IFileService private readonly fileService: IFileService,
+		@IInstantiationService instantiationService: IInstantiationService,
+	) {
 
 		super();
-		this._register(this.fileService.registerProvider(ChatEditingNotebookFileSystemProvider.scheme, new ChatEditingNotebookFileSystemProvider()));
+		const fileSystemProvider = instantiationService.createInstance(ChatEditingNotebookFileSystemProvider);
+		this._register(this.fileService.registerProvider(ChatEditingNotebookSnapshotScheme, fileSystemProvider));
 	}
 }
 
+type ChatEditingSnapshotNotebookContentQueryData = { sessionId: string; requestId: string | undefined; undoStop: string | undefined; viewType: string };
+
 export class ChatEditingNotebookFileSystemProvider implements IFileSystemProvider {
-	public static readonly scheme = 'chat-editing-notebook-model';
 	private static registeredFiles = new ResourceMap<VSBuffer>();
-
-	public static getEmptyFileURI(): URI {
-		return URI.from({
-			scheme: ChatEditingNotebookFileSystemProvider.scheme,
-			query: JSON.stringify({ kind: 'empty' }),
-		});
-	}
-
-	public static getFileURI(documentId: string, path: string): URI {
-		return URI.from({
-			scheme: ChatEditingNotebookFileSystemProvider.scheme,
-			path,
-			query: JSON.stringify({ kind: 'doc' }),
-		});
-	}
-	public static getSnapshotFileURI(requestId: string | undefined, path: string): URI {
-		return URI.from({
-			scheme: ChatEditingNotebookFileSystemProvider.scheme,
-			path,
-			query: JSON.stringify({ requestId: requestId ?? '' }),
-		});
-	}
-
 	public readonly capabilities: FileSystemProviderCapabilities = FileSystemProviderCapabilities.Readonly | FileSystemProviderCapabilities.FileAtomicRead | FileSystemProviderCapabilities.FileReadWrite;
 	public static registerFile(resource: URI, buffer: VSBuffer): IDisposable {
 		ChatEditingNotebookFileSystemProvider.registeredFiles.set(resource, buffer);
@@ -62,6 +48,9 @@ export class ChatEditingNotebookFileSystemProvider implements IFileSystemProvide
 		};
 	}
 
+	constructor(
+		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
+		@INotebookService private readonly notebookService: INotebookService) { }
 	readonly onDidChangeCapabilities = Event.None;
 	readonly onDidChangeFile: Event<readonly IFileChange[]> = Event.None;
 	watch(_resource: URI, _opts: IWatchOptions): IDisposable {
@@ -92,11 +81,27 @@ export class ChatEditingNotebookFileSystemProvider implements IFileSystemProvide
 	}
 	async readFile(resource: URI): Promise<Uint8Array> {
 		const buffer = ChatEditingNotebookFileSystemProvider.registeredFiles.get(resource);
-		if (!buffer) {
-			throw new Error('File not found');
+		if (buffer) {
+			return buffer.buffer;
+		}
+		const queryData = JSON.parse(resource.query) as ChatEditingSnapshotNotebookContentQueryData;
+		if (!queryData.viewType) {
+			throw new Error('File not found, viewType not found');
+		}
+		const session = this._chatEditingService.getEditingSession(queryData.sessionId);
+		if (!(session instanceof ChatEditingSession) || !queryData.requestId) {
+			throw new Error('File not found, session not found');
 		}
-		return buffer.buffer;
+		const snapshotEntry = session.getSnapshot(queryData.requestId, queryData.undoStop || undefined, resource);
+		if (!snapshotEntry) {
+			throw new Error('File not found, snapshot not found');
+		}
+
+		const { data } = deserializeSnapshot(snapshotEntry.current);
+		const { serializer } = await this.notebookService.withNotebookDataProvider(queryData.viewType);
+		return serializer.notebookToData(data).then(s => s.buffer);
 	}
+
 	writeFile?(__resource: URI, _content: Uint8Array, _opts: IFileWriteOptions): Promise<void> {
 		throw new Error('Method not implemented7.');
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 2fd6cb404d23..0ce571f8d6eb 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -49,7 +49,7 @@ import { AbstractChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISna
 import { ChatEditingModifiedDocumentEntry } from './chatEditingModifiedDocumentEntry.js';
 import { ChatEditingTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
 import { CellUri, ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
-import { ChatEditingModifiedNotebookEntry } from './chatEditingModifiedNotebookEntry.js';
+import { ChatEditingModifiedNotebookDiff, ChatEditingModifiedNotebookEntry } from './chatEditingModifiedNotebookEntry.js';
 
 const STORAGE_CONTENTS_FOLDER = 'contents';
 const STORAGE_STATE_FILE = 'state.json';
@@ -351,8 +351,13 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 				return;
 			}
 
-			entriesContent.read(reader); // trigger re-diffing when contents change
+			const entries = entriesContent.read(reader); // trigger re-diffing when contents change
 
+			if (entries?.before && ChatEditingModifiedNotebookEntry.canHandleSnapshot(entries.before)) {
+				const diffService = this._instantiationService.createInstance(ChatEditingModifiedNotebookDiff, entries.before, entries.after);
+				return new ObservablePromise(diffService.computeDiff());
+
+			}
 			const ignoreTrimWhitespace = this._ignoreTrimWhitespaceObservable.read(reader);
 			const promise = this._editorWorkerService.computeDiff(
 				refs[0].object.textEditorModel.uri,
@@ -404,7 +409,6 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			return [entriesValue.before.snapshotUri, entriesValue.after.snapshotUri];
 		});
 
-		// todo@DonJayamanne support notebooks here too
 		const diff = this._entryDiffBetweenTextStops(entries, modelUrisObservable);
 
 		return derived(reader => {
@@ -469,15 +473,15 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		};
 	}
 
-	public async getSnapshotModel(requestId: string, undoStop: string | undefined, snapshotUri: URI): Promise<ITextModel | null> {
+	public getSnapshot(requestId: string, undoStop: string | undefined, snapshotUri: URI): ISnapshotEntry | undefined {
 		const entries = undoStop === POST_EDIT_STOP_ID
 			? this._findSnapshot(requestId)?.postEdit
 			: this._findEditStop(requestId, undoStop)?.stop.entries;
-		if (!entries) {
-			return null;
-		}
+		return entries && [...entries.values()].find((e) => isEqual(e.snapshotUri, snapshotUri));
+	}
 
-		const snapshotEntry = [...entries.values()].find((e) => isEqual(e.snapshotUri, snapshotUri));
+	public async getSnapshotModel(requestId: string, undoStop: string | undefined, snapshotUri: URI): Promise<ITextModel | null> {
+		const snapshotEntry = this.getSnapshot(requestId, undoStop, snapshotUri);
 		if (!snapshotEntry) {
 			return null;
 		}
@@ -1044,7 +1048,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		const notebookUri = CellUri.parse(resource)?.notebook || resource;
 		try {
 			// If a notebook isn't open, then use the old synchronization approach.
-			if (this._notebookService.hasSupportedNotebooks(notebookUri) && (this._notebookService.getNotebookTextModel(notebookUri) || ChatEditingModifiedNotebookEntry.canHandleSnapshot(initialContent))) {
+			if (this._notebookService.hasSupportedNotebooks(notebookUri) && (this._notebookService.getNotebookTextModel(notebookUri) || ChatEditingModifiedNotebookEntry.canHandleSnapshotContent(initialContent))) {
 				return ChatEditingModifiedNotebookEntry.create(notebookUri, multiDiffEntryDelegate, telemetryInfo, chatKind, initialContent, this._instantiationService);
 			} else {
 				const ref = await this._textModelService.createModelReference(resource);
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/contribution.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/contribution.ts
index b8123bc8c092..6b8387bd9086 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/contribution.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/contribution.ts
@@ -9,13 +9,9 @@ import { registerNotebookContribution } from '../../notebookEditorExtensions.js'
 import { InstantiationType, registerSingleton } from '../../../../../../platform/instantiation/common/extensions.js';
 import { INotebookOriginalCellModelFactory, OriginalNotebookCellModelFactory } from './notebookOriginalCellModelFactory.js';
 import { NotebookChatEditorControllerContrib } from './notebookChatEditController.js';
-import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../../../common/contributions.js';
-import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditingNotebookFileSystemProvider.js';
 
 
 registerNotebookContribution(NotebookChatEditorControllerContrib.ID, NotebookChatEditorControllerContrib);
 registerSingleton(INotebookOriginalModelReferenceFactory, NotebookOriginalModelReferenceFactory, InstantiationType.Delayed);
 registerSingleton(INotebookModelSynchronizerFactory, NotebookModelSynchronizerFactory, InstantiationType.Delayed);
 registerSingleton(INotebookOriginalCellModelFactory, OriginalNotebookCellModelFactory, InstantiationType.Delayed);
-
-registerWorkbenchContribution2(ChatEditingNotebookFileSystemProviderContrib.ID, ChatEditingNotebookFileSystemProviderContrib, WorkbenchPhase.BlockStartup);

From 5b1e54e663b67dc4e241244f94383c21d7dd3bf0 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 26 Feb 2025 19:51:01 +0100
Subject: [PATCH 0445/1815] hover - fix beak regression (#242094)

* hover - fix beak regression

* Don't apply lock 2px width when hover is focused

---------

Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
---
 src/vs/editor/browser/services/hoverService/hover.css | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/vs/editor/browser/services/hoverService/hover.css b/src/vs/editor/browser/services/hoverService/hover.css
index aa7e6ed99ce3..8d483a541633 100644
--- a/src/vs/editor/browser/services/hoverService/hover.css
+++ b/src/vs/editor/browser/services/hoverService/hover.css
@@ -33,8 +33,8 @@
 .monaco-workbench .workbench-hover-container.locked .workbench-hover {
 	outline: 1px solid var(--vscode-editorHoverWidget-border);
 }
-.monaco-workbench .workbench-hover-container.locked .workbench-hover:focus {
-	outline: 1px solid var(--vscode-focusBorder);
+.monaco-workbench .workbench-hover-container:focus-within.locked .workbench-hover {
+	outline-color: var(--vscode-focusBorder);
 }
 
 .monaco-workbench .workbench-hover-pointer {
@@ -53,11 +53,13 @@
 	border-right: 1px solid var(--vscode-editorHoverWidget-border);
 	border-bottom: 1px solid var(--vscode-editorHoverWidget-border);
 }
-.monaco-workbench .locked .workbench-hover-pointer:after {
+.monaco-workbench .workbench-hover-container:not(:focus-within).locked .workbench-hover-pointer:after {
 	width: 4px;
 	height: 4px;
 	border-right-width: 2px;
 	border-bottom-width: 2px;
+}
+.monaco-workbench .workbench-hover-container:focus-within .workbench-hover-pointer:after {
 	border-right: 1px solid var(--vscode-focusBorder);
 	border-bottom: 1px solid var(--vscode-focusBorder);
 }

From ffa4a758e6465e78cca7aaec81a494771b250c63 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 26 Feb 2025 11:11:16 -0800
Subject: [PATCH 0446/1815] Move agent mode enablement for models to extension
 (#242104)

---
 src/vs/workbench/contrib/chat/browser/chatInputPart.ts | 4 +++-
 src/vs/workbench/contrib/chat/common/languageModels.ts | 1 +
 src/vscode-dts/vscode.proposed.chatProvider.d.ts       | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 0ef761851462..459fb2a1adc0 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -453,8 +453,10 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 				return true;
 			}
 
+			const supportsToolsAgent = typeof model.metadata.capabilities?.agentMode === 'undefined' || model.metadata.capabilities.agentMode;
+
 			// Filter out models that don't support tool calling, and models that don't support enough context to have a good experience with the tools agent
-			return !!model.metadata.capabilities?.toolCalling && model.metadata.maxInputTokens > 40000;
+			return supportsToolsAgent && !!model.metadata.capabilities?.toolCalling;
 		}
 
 		return true;
diff --git a/src/vs/workbench/contrib/chat/common/languageModels.ts b/src/vs/workbench/contrib/chat/common/languageModels.ts
index 8424946dac5c..3db81d2941c1 100644
--- a/src/vs/workbench/contrib/chat/common/languageModels.ts
+++ b/src/vs/workbench/contrib/chat/common/languageModels.ts
@@ -89,6 +89,7 @@ export interface ILanguageModelChatMetadata {
 	readonly capabilities?: {
 		readonly vision?: boolean;
 		readonly toolCalling?: boolean;
+		readonly agentMode?: boolean;
 	};
 }
 
diff --git a/src/vscode-dts/vscode.proposed.chatProvider.d.ts b/src/vscode-dts/vscode.proposed.chatProvider.d.ts
index 68dda301e7dd..7903aed3e8c5 100644
--- a/src/vscode-dts/vscode.proposed.chatProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatProvider.d.ts
@@ -71,6 +71,7 @@ declare module 'vscode' {
 		readonly capabilities?: {
 			readonly vision?: boolean;
 			readonly toolCalling?: boolean;
+			readonly agentMode?: boolean;
 		};
 	}
 

From 8c4d8ba7210bdbf78174c1691c70e01212bf23ec Mon Sep 17 00:00:00 2001
From: Michael Lively <michaellively00@gmail.com>
Date: Wed, 26 Feb 2025 11:17:04 -0800
Subject: [PATCH 0447/1815] Fix icon coloring changing wrt nb editor focus
 (#242107)

* fix unfocused nb icon coloring

* fix icon coloring
---
 .../notebook/browser/media/notebookCellStatusBar.css      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/vs/workbench/contrib/notebook/browser/media/notebookCellStatusBar.css b/src/vs/workbench/contrib/notebook/browser/media/notebookCellStatusBar.css
index 8f5eb5dc052a..d1d06fdf9bc3 100644
--- a/src/vs/workbench/contrib/notebook/browser/media/notebookCellStatusBar.css
+++ b/src/vs/workbench/contrib/notebook/browser/media/notebookCellStatusBar.css
@@ -68,3 +68,11 @@
 .monaco-workbench .notebookOverlay .cell-statusbar-container.is-active-cell .cell-status-item-show-when-active {
 	display: initial;
 }
+
+/* Ensure execution status icons always maintain their themed colors */
+.monaco-workbench .notebookOverlay .cell-statusbar-container .codicon-notebook-state-success {
+	color: var(--vscode-notebookStatusSuccessIcon-foreground);
+}
+.monaco-workbench .notebookOverlay .cell-statusbar-container .codicon-notebook-state-error {
+	color: var(--vscode-notebookStatusErrorIcon-foreground);
+}

From 10434e3f459fb6e93fd2ac25ae3170f7b42c3a7d Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 26 Feb 2025 20:19:01 +0100
Subject: [PATCH 0448/1815] chat - hide old GH status (#242108)

---
 src/vs/workbench/contrib/chat/browser/chatStatus.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index a3027b194116..e90632eb2472 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -36,6 +36,7 @@ import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Gesture, EventType as TouchEventType } from '../../../../base/browser/touch.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
 
 const gaugeBackground = registerColor('gauge.background', {
 	dark: ACTIVITY_BAR_BADGE_BACKGROUND,
@@ -76,7 +77,8 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@ICommandService private readonly commandService: ICommandService,
 		@IHoverService private readonly hoverService: IHoverService,
-		@IEditorService private readonly editorService: IEditorService
+		@IEditorService private readonly editorService: IEditorService,
+		@IProductService private readonly productService: IProductService
 	) {
 		super();
 
@@ -87,6 +89,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	private async create(): Promise<void> {
 		if (this.configurationService.getValue<boolean>('chat.experimental.statusIndicator.enabled') === true) {
 			this.entry ||= this.statusbarService.addEntry(this.getEntryProps(), ChatStatusBarEntry.ID, StatusbarAlignment.RIGHT, Number.NEGATIVE_INFINITY /* the end of the right hand side */);
+			this.statusbarService.updateEntryVisibility(`${this.productService.defaultChatAgent?.extensionId}.status`, false); // TODO@bpasero: remove this eventually
 		} else {
 			this.entry?.dispose();
 			this.entry = undefined;

From e383a4a08d1751dd9f24b01e02740bf6b2e507e3 Mon Sep 17 00:00:00 2001
From: Osvaldo Ortega <osortega@microsoft.com>
Date: Wed, 26 Feb 2025 11:52:34 -0800
Subject: [PATCH 0449/1815] Fix for automatically expanding AI search tree

---
 .../search/browser/searchActionsRemoveReplace.ts       | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.ts b/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.ts
index ea1260b104fb..b2861e967511 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.ts
@@ -24,6 +24,7 @@ import { category, getElementsToOperateOn, getSearchView, shouldRefocus } from '
 import { equals } from '../../../../base/common/arrays.js';
 import { arrayContainsElementOrParent, RenderableMatch, ISearchResult, isSearchTreeFileMatch, isSearchTreeFolderMatch, isSearchTreeMatch, isSearchResult, isTextSearchHeading } from './searchTreeModel/searchTreeCommon.js';
 import { MatchInNotebook } from './notebookSearch/notebookSearchModel.js';
+import { AITextSearchHeadingImpl } from './AISearch/aiSearchModel.js';
 
 
 //#region Interfaces
@@ -375,10 +376,17 @@ export async function getElementToFocusAfterRemoved(viewer: WorkbenchCompressibl
 		while (!!navigator.next() && (!isSearchTreeFolderMatch(navigator.current()) || arrayContainsElementOrParent(navigator.current(), elementsToRemove))) { }
 	} else if (isSearchTreeFileMatch(element)) {
 		while (!!navigator.next() && (!isSearchTreeFileMatch(navigator.current()) || arrayContainsElementOrParent(navigator.current(), elementsToRemove))) {
-			await viewer.expand(navigator.current());
+			// Never expand AI search results by default
+			if (navigator.current() instanceof AITextSearchHeadingImpl) {
+				return navigator.current();
+			}
 		}
 	} else {
 		while (navigator.next() && (!isSearchTreeMatch(navigator.current()) || arrayContainsElementOrParent(navigator.current(), elementsToRemove))) {
+			// Never expand AI search results by default
+			if (navigator.current() instanceof AITextSearchHeadingImpl) {
+				return navigator.current();
+			}
 			await viewer.expand(navigator.current());
 		}
 	}

From 44bc117127ab572b59a2093c14da4f7bbcff3fc0 Mon Sep 17 00:00:00 2001
From: Osvaldo Ortega <osortega@microsoft.com>
Date: Wed, 26 Feb 2025 12:11:27 -0800
Subject: [PATCH 0450/1815] Revert line deletion

---
 .../contrib/search/browser/searchActionsRemoveReplace.ts         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.ts b/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.ts
index b2861e967511..54d7b8f24d8f 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.ts
@@ -380,6 +380,7 @@ export async function getElementToFocusAfterRemoved(viewer: WorkbenchCompressibl
 			if (navigator.current() instanceof AITextSearchHeadingImpl) {
 				return navigator.current();
 			}
+			await viewer.expand(navigator.current());
 		}
 	} else {
 		while (navigator.next() && (!isSearchTreeMatch(navigator.current()) || arrayContainsElementOrParent(navigator.current(), elementsToRemove))) {

From 7e5536de622ef5284d38df34e68b0ec691cd6d08 Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Wed, 26 Feb 2025 15:18:28 -0500
Subject: [PATCH 0451/1815] update layout to ensure the cell renders correctly
 (#242111)

* update layout to ensure the cell renders correctly

* use the appropriate cancellation token

---------

Co-authored-by: amunger <>
---
 .../contrib/notebook/browser/diff/notebookDiffEditor.ts      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
index 81689f503bd0..639e2fcd80d3 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.ts
@@ -289,6 +289,8 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 	}
 
 	async toggleInlineView(): Promise<void> {
+		this._layoutCancellationTokenSource?.dispose();
+
 		this._inlineView = !this._inlineView;
 
 		if (!this._lastLayoutProperties) {
@@ -302,6 +304,9 @@ export class NotebookTextDiffEditor extends EditorPane implements INotebookTextD
 			this.layout(this._lastLayoutProperties?.dimension, this._lastLayoutProperties?.position);
 			this.inlineDiffWidget?.hide();
 		}
+
+		this._layoutCancellationTokenSource = new CancellationTokenSource();
+		this.updateLayout(this._layoutCancellationTokenSource.token);
 	}
 
 	protected createEditor(parent: HTMLElement): void {

From c75ab9d934afcedc7a713746c4704bc2aed5640e Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 26 Feb 2025 21:31:46 +0100
Subject: [PATCH 0452/1815] chat - status tweaks (#242110)

---
 .../lib/stylelint/vscode-known-variables.json |   4 +
 .../contrib/chat/browser/chatStatus.ts        | 128 +++++++++++++-----
 .../contrib/chat/browser/media/chatStatus.css |  29 +++-
 3 files changed, 121 insertions(+), 40 deletions(-)

diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
index 0199b12b80b0..339c201f166a 100644
--- a/build/lib/stylelint/vscode-known-variables.json
+++ b/build/lib/stylelint/vscode-known-variables.json
@@ -353,7 +353,11 @@
 		"--vscode-foreground",
 		"--vscode-gauge-background",
 		"--vscode-gauge-border",
+		"--vscode-gauge-errorBackground",
+		"--vscode-gauge-errorForeground",
 		"--vscode-gauge-foreground",
+		"--vscode-gauge-warningBackground",
+		"--vscode-gauge-warningForeground",
 		"--vscode-icon-foreground",
 		"--vscode-inlineChat-background",
 		"--vscode-inlineChat-border",
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index e90632eb2472..04c4ae1177f0 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -5,7 +5,7 @@
 
 import './media/chatStatus.css';
 import { safeIntl } from '../../../../base/common/date.js';
-import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { language, OS } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.js';
 import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
@@ -17,7 +17,7 @@ import { IChatQuotasService } from '../common/chatQuotasService.js';
 import { quotaToButtonMessage, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, TOGGLE_CHAT_ACTION_ID, CHAT_OPEN_ACTION_ID } from './actions/chatActions.js';
 import { $, addDisposableListener, append, EventHelper, EventLike, EventType } from '../../../../base/browser/dom.js';
 import { IChatEntitlementsService } from '../common/chatEntitlementsService.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { defaultCheckboxStyles, defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { Checkbox } from '../../../../base/browser/ui/toggle/toggle.js';
@@ -25,8 +25,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { Command } from '../../../../editor/common/languages.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { Lazy } from '../../../../base/common/lazy.js';
-import { contrastBorder, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
-import { ACTIVITY_BAR_BADGE_BACKGROUND } from '../../../common/theme.js';
+import { contrastBorder, inputValidationErrorBorder, inputValidationInfoBorder, inputValidationWarningBorder, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { coalesce } from '../../../../base/common/arrays.js';
 import { CTX_INLINE_CHAT_POSSIBLE } from '../../inlineChat/common/inlineChat.js';
@@ -38,9 +37,11 @@ import { Gesture, EventType as TouchEventType } from '../../../../base/browser/t
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 
+//#region --- colors
+
 const gaugeBackground = registerColor('gauge.background', {
-	dark: ACTIVITY_BAR_BADGE_BACKGROUND,
-	light: ACTIVITY_BAR_BADGE_BACKGROUND,
+	dark: inputValidationInfoBorder,
+	light: inputValidationInfoBorder,
 	hcDark: contrastBorder,
 	hcLight: contrastBorder
 }, localize('gaugeBackground', "Gauge background color."));
@@ -59,6 +60,36 @@ registerColor('gauge.border', {
 	hcLight: contrastBorder
 }, localize('gaugeBorder', "Gauge border color."));
 
+const gaugeWarningBackground = registerColor('gauge.warningBackground', {
+	dark: inputValidationWarningBorder,
+	light: inputValidationWarningBorder,
+	hcDark: contrastBorder,
+	hcLight: contrastBorder
+}, localize('gaugeWarningBackground', "Gauge warning background color."));
+
+registerColor('gauge.warningForeground', {
+	dark: transparent(gaugeWarningBackground, 0.3),
+	light: transparent(gaugeWarningBackground, 0.3),
+	hcDark: Color.white,
+	hcLight: Color.white
+}, localize('gaugeWarningForeground', "Gauge warning foreground color."));
+
+const gaugeErrorBackground = registerColor('gauge.errorBackground', {
+	dark: inputValidationErrorBorder,
+	light: inputValidationErrorBorder,
+	hcDark: contrastBorder,
+	hcLight: contrastBorder
+}, localize('gaugeErrorBackground', "Gauge error background color."));
+
+registerColor('gauge.errorForeground', {
+	dark: transparent(gaugeErrorBackground, 0.3),
+	light: transparent(gaugeErrorBackground, 0.3),
+	hcDark: Color.white,
+	hcLight: Color.white
+}, localize('gaugeErrorForeground', "Gauge error foreground color."));
+
+//#endregion
+
 export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
 
 	static readonly ID = 'chat.statusBarEntry';
@@ -170,30 +201,43 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 				const container = $('div.chat-status-bar-entry-tooltip');
 
 				// Quota Indicator
-				const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate } = this.chatQuotasService.quotas;
+				{
+					const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate } = this.chatQuotasService.quotas;
 
-				container.appendChild($('div', undefined, localize('limitTitle', "You are using Copilot Free")));
-				container.appendChild($('hr'));
+					container.appendChild($('div.header', undefined, localize('usageTitle', "Copilot Free Usage")));
 
-				const chatQuotaIndicator = this.createQuotaIndicator(container, chatTotal, chatRemaining, localize('chatsLabel', "Chats messages remaining"));
-				const completionsQuotaIndicator = this.createQuotaIndicator(container, completionsTotal, completionsRemaining, localize('completionsLabel', "Code completions remaining"));
+					const chatQuotaIndicator = this.createQuotaIndicator(container, chatTotal, chatRemaining, localize('chatsLabel', "Chats messages"));
+					const completionsQuotaIndicator = this.createQuotaIndicator(container, completionsTotal, completionsRemaining, localize('completionsLabel', "Code completions"));
 
-				this.chatEntitlementsService.resolve(CancellationToken.None).then(() => {
-					const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = this.chatQuotasService.quotas;
+					container.appendChild($('div.description', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.value.format(quotaResetDate))));
 
-					chatQuotaIndicator(chatTotal, chatRemaining);
-					completionsQuotaIndicator(completionsTotal, completionsRemaining);
-				});
+					const cts = new CancellationTokenSource();
+					disposables.add(toDisposable(() => cts.dispose(true)));
+					this.chatEntitlementsService.resolve(cts.token).then(() => {
+						if (cts.token.isCancellationRequested) {
+							return;
+						}
 
-				container.appendChild($('div.description', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.value.format(quotaResetDate))));
+						const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = this.chatQuotasService.quotas;
+
+						chatQuotaIndicator(chatTotal, chatRemaining);
+						completionsQuotaIndicator(completionsTotal, completionsRemaining);
+					});
+				}
 
 				// Settings
-				container.appendChild($('hr'));
-				this.createSettings(container, disposables);
+				{
+					container.appendChild($('hr'));
+					container.appendChild($('div.header', undefined, localize('settingsTitle', "Settings")));
+					this.createSettings(container, disposables);
+				}
 
 				// Shortcuts
-				container.appendChild($('hr'));
-				this.createShortcuts(container, disposables);
+				{
+					container.appendChild($('hr'));
+					container.appendChild($('div.header', undefined, localize('keybindingsTitle', "Keybindings")));
+					this.createShortcuts(container, disposables);
+				}
 
 				return container;
 			};
@@ -205,17 +249,18 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			tooltip = () => {
 				const container = $('div.chat-status-bar-entry-tooltip');
 
-				if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.pro.key) === true) {
-					container.appendChild($('div', undefined, localize('proTitle', "You are using Copilot Pro")));
-					container.appendChild($('hr'));
-				}
-
 				// Settings
-				this.createSettings(container, disposables);
+				{
+					container.appendChild($('div.header', undefined, localize('settingsTitle', "Settings")));
+					this.createSettings(container, disposables);
+				}
 
 				// Shortcuts
-				container.appendChild($('hr'));
-				this.createShortcuts(container, disposables);
+				{
+					container.appendChild($('hr'));
+					container.appendChild($('div.header', undefined, localize('keybindingsTitle', "Keybindings")));
+					this.createShortcuts(container, disposables);
+				}
 
 				return container;
 			};
@@ -237,7 +282,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		const quotaText = $('span');
 		const quotaBit = $('div.quota-bit');
 
-		container.appendChild($('div.quota-indicator', undefined,
+		const quotaIndicator = container.appendChild($('div.quota-indicator', undefined,
 			$('div.quota-label', undefined,
 				$('span', undefined, label),
 				quotaText
@@ -248,10 +293,23 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		));
 
 		const update = (total: number | undefined, remaining: number | undefined) => {
+			quotaIndicator.classList.remove('error');
+			quotaIndicator.classList.remove('warning');
+
 			if (typeof total === 'number' && typeof remaining === 'number') {
-				// TODO@bpasero: enable this label when we can track this better
-				//quotaText.textContent = localize('quotaDisplay', "{0} / {1}", remaining, total);
-				quotaBit.style.width = `${(remaining / total) * 100}%`;
+				let usedPercentage = Math.round(((total - remaining) / total) * 100);
+				if (total !== remaining && usedPercentage === 0) {
+					usedPercentage = 1; // indicate minimal usage as 1%
+				}
+
+				quotaText.textContent = localize('quotaDisplay', "{0}%", usedPercentage);
+				quotaBit.style.width = `${usedPercentage}%`;
+
+				if (usedPercentage >= 90) {
+					quotaIndicator.classList.add('error');
+				} else if (usedPercentage >= 75) {
+					quotaIndicator.classList.add('warning');
+				}
 			}
 		};
 
@@ -328,7 +386,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		return settings;
 	}
 
-	private createSetting(container: HTMLElement, label: string, setting: { key: string; override: string | undefined }, disposables: DisposableStore): Checkbox {
+	private createSetting(container: HTMLElement, label: string, setting: { key: string; override: string | undefined }, disposables: DisposableStore): void {
 		const readSetting = () => Boolean(this.configurationService.getValue<boolean>(setting.key, { overrideIdentifier: setting.override }));
 		const writeSetting = (checkbox: Checkbox) => this.configurationService.updateValue(setting.key, checkbox.checked, { overrideIdentifier: setting.override });
 
@@ -358,8 +416,6 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 				settingCheckbox.checked = readSetting();
 			}
 		}));
-
-		return settingCheckbox;
 	}
 
 	override dispose(): void {
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
index 6570d12f173d..74da950c9d6f 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
@@ -6,8 +6,8 @@
 /* Overall */
 
 .chat-status-bar-entry-tooltip {
-	margin-top: 6px;
-	margin-bottom: 6px;
+	margin-top: 4px;
+	margin-bottom: 4px;
 }
 
 .chat-status-bar-entry-tooltip hr {
@@ -15,6 +15,12 @@
 	margin-bottom: 8px;
 }
 
+.chat-status-bar-entry-tooltip div.header {
+	color: var(--vscode-descriptionForeground);
+	margin-bottom: 4px;
+	font-weight: 600;
+}
+
 .chat-status-bar-entry-tooltip div.description {
 	color: var(--vscode-descriptionForeground);
 }
@@ -93,8 +99,7 @@
 /* Quota Indicator */
 
 .chat-status-bar-entry-tooltip .quota-indicator {
-	margin-top: 8px;
-	margin-bottom: 8px;
+	margin-bottom: 6px;
 }
 
 .chat-status-bar-entry-tooltip .quota-indicator .quota-label {
@@ -116,3 +121,19 @@
 	background-color: var(--vscode-gauge-background);
 	border-radius: 4px;
 }
+
+.chat-status-bar-entry-tooltip .quota-indicator.warning .quota-bar {
+	background-color: var(--vscode-gauge-warningForeground);
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.warning .quota-bar .quota-bit {
+	background-color: var(--vscode-gauge-warningBackground);
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.error .quota-bar {
+	background-color: var(--vscode-gauge-errorForeground);
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.error .quota-bar .quota-bit {
+	background-color: var(--vscode-gauge-errorBackground);
+}

From 5090a351b179ab877499a303f57e0f9e460b664e Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 26 Feb 2025 12:36:41 -0800
Subject: [PATCH 0453/1815] Make option item kind check stricter

Fixes #241825
---
 extensions/terminal-suggest/src/fig/figInterface.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/extensions/terminal-suggest/src/fig/figInterface.ts b/extensions/terminal-suggest/src/fig/figInterface.ts
index 1e283e463559..7e09c8b6b34a 100644
--- a/extensions/terminal-suggest/src/fig/figInterface.ts
+++ b/extensions/terminal-suggest/src/fig/figInterface.ts
@@ -263,11 +263,13 @@ export async function collectCompletionItemResult(
 			}
 
 			let itemKind = kind;
-			if (typeof item === 'object' && 'args' in item && (asArray(item.args ?? [])).length > 0) {
-				itemKind = vscode.TerminalCompletionItemKind.Option;
-			}
 			const lastArgType: string | undefined = parsedArguments?.annotations.at(-1)?.type;
-			if (lastArgType === 'option_arg') {
+			if (lastArgType === 'subcommand_arg') {
+				if (typeof item === 'object' && 'args' in item && (asArray(item.args ?? [])).length > 0) {
+					itemKind = vscode.TerminalCompletionItemKind.Option;
+				}
+			}
+			else if (lastArgType === 'option_arg') {
 				itemKind = vscode.TerminalCompletionItemKind.OptionValue;
 			}
 

From 943f45aefe1a4df04cca7e83de492bed89ce2a2d Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Wed, 26 Feb 2025 14:56:17 -0600
Subject: [PATCH 0454/1815] update title on screen reader mode change (#242087)

---
 .../browser/parts/titlebar/commandCenterControl.ts       | 9 +++++++--
 src/vs/workbench/browser/parts/titlebar/windowTitle.ts   | 5 -----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts b/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts
index 3202bfacf341..23afe340a33e 100644
--- a/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts
+++ b/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts
@@ -22,6 +22,7 @@ import { IQuickInputService } from '../../../../platform/quickinput/common/quick
 import { WindowTitle } from './windowTitle.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
 
 export class CommandCenterControl {
 
@@ -86,6 +87,7 @@ class CommandCenterCenterViewItem extends BaseActionViewItem {
 		@IKeybindingService private _keybindingService: IKeybindingService,
 		@IInstantiationService private _instaService: IInstantiationService,
 		@IEditorGroupsService private _editorGroupService: IEditorGroupsService,
+		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService
 	) {
 		super(undefined, _submenu.actions.find(action => action.id === 'workbench.action.quickOpenWithModes') ?? _submenu.actions[0], options);
 		this._hoverDelegate = options.hoverDelegate ?? getDefaultHoverDelegate('mouse');
@@ -165,6 +167,9 @@ class CommandCenterCenterViewItem extends BaseActionViewItem {
 								labelElement.innerText = this._getLabel();
 							}));
 
+							this._store.add(that._accessibilityService.onDidChangeScreenReaderOptimized(() => labelElement.innerText = this._getLabel(true)));
+
+
 							// update label & tooltip when tabs visibility changes
 							this._store.add(that._editorGroupService.onDidChangeEditorPartOptions(({ newPartOptions, oldPartOptions }) => {
 								if (newPartOptions.showTabs !== oldPartOptions.showTabs) {
@@ -178,10 +183,10 @@ class CommandCenterCenterViewItem extends BaseActionViewItem {
 							return that.getTooltip();
 						}
 
-						private _getLabel(): string {
+						private _getLabel(screenReaderModeChanged?: boolean): string {
 							const { prefix, suffix } = that._windowTitle.getTitleDecorations();
 							let label = that._windowTitle.workspaceName;
-							if (that._windowTitle.isCustomTitleFormat()) {
+							if (screenReaderModeChanged || that._windowTitle.isCustomTitleFormat()) {
 								label = that._windowTitle.getWindowTitle();
 							} else if (that._editorGroupService.partOptions.showTabs === 'none') {
 								label = that._windowTitle.fileName ?? label;
diff --git a/src/vs/workbench/browser/parts/titlebar/windowTitle.ts b/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
index 62760bad1fee..aa7cb6da5c35 100644
--- a/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
+++ b/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
@@ -413,11 +413,6 @@ export class WindowTitle extends Disposable {
 	}
 
 	isCustomTitleFormat(): boolean {
-		if (this.accessibilityService.isScreenReaderOptimized()) {
-			// We add activeEditorState by default when screen reader optimized,
-			// make sure that gets applied
-			return true;
-		}
 		const title = this.configurationService.inspect<string>(WindowSettingNames.title);
 		const titleSeparator = this.configurationService.inspect<string>(WindowSettingNames.titleSeparator);
 

From c25c5e8612bf608bb2745ec575686eaf9bb6b3b6 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 26 Feb 2025 12:55:42 -0800
Subject: [PATCH 0455/1815] Remove cwd fallback, ensuring we don't suggest
 non-existent folders

Fixes #241702
---
 extensions/terminal-suggest/src/terminalSuggestMain.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 5138d5f7f808..3f181bcd5876 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -170,7 +170,7 @@ export async function resolveCwdFromPrefix(prefix: string, currentCwd?: vscode.U
 	}
 
 	// If the prefix is not a folder, return the current cwd
-	return currentCwd;
+	return undefined;
 }
 
 function getPrefix(commandLine: string, cursorPosition: number): string {
@@ -277,7 +277,7 @@ export async function getCompletionItemsFromSpecs(
 
 	let cwd: vscode.Uri | undefined;
 	if (shellIntegrationCwd && (filesRequested || foldersRequested)) {
-		cwd = await resolveCwdFromPrefix(prefix, shellIntegrationCwd) ?? shellIntegrationCwd;
+		cwd = await resolveCwdFromPrefix(prefix, shellIntegrationCwd);
 	}
 
 	return { items, filesRequested, foldersRequested, fileExtensions, cwd };

From 4060deb2dfa8fbd6ef47934fa4f502978df0334a Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Wed, 26 Feb 2025 13:33:56 -0800
Subject: [PATCH 0456/1815] fix: update implicit context widget for new chat
 widgets (#242102)

---
 .../contrib/chat/browser/contrib/chatImplicitContext.ts        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
index 33ad79d9bde5..480c6f78b38c 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
@@ -92,6 +92,9 @@ export class ChatImplicitContextContribution extends Disposable implements IWork
 				widget.input.implicitContext.setValue(undefined, false);
 			}
 		}));
+		this._register(this.chatWidgetService.onDidAddWidget(async (widget) => {
+			await this.updateImplicitContext(widget);
+		}));
 	}
 
 	private findActiveCodeEditor(): ICodeEditor | undefined {

From 1ea44634bf023fa3eca0e48327a076e5e22d617c Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Wed, 26 Feb 2025 13:34:22 -0800
Subject: [PATCH 0457/1815] fix: focus input editor when attachment zone is
 clicked (#242105)

---
 src/vs/workbench/contrib/chat/browser/chatInputPart.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 459fb2a1adc0..877f01e1088a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -842,6 +842,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		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, toolbarsContainer, MenuId.ChatInput, {
 			telemetrySource: this.options.menus.telemetrySource,
 			menuOptions: { shouldForwardArgs: true },

From ee5f9882a7ae2063c59dff6433d1a09c7409046e Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Wed, 26 Feb 2025 14:12:40 -0800
Subject: [PATCH 0458/1815] Fix args

---
 .../contrib/webview/electron-sandbox/webviewElement.ts      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/webview/electron-sandbox/webviewElement.ts b/src/vs/workbench/contrib/webview/electron-sandbox/webviewElement.ts
index f4fc6b8365f6..13d75633fb41 100644
--- a/src/vs/workbench/contrib/webview/electron-sandbox/webviewElement.ts
+++ b/src/vs/workbench/contrib/webview/electron-sandbox/webviewElement.ts
@@ -18,14 +18,13 @@ import { ILogService } from '../../../../platform/log/common/log.js';
 import { INativeHostService } from '../../../../platform/native/common/native.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { ITunnelService } from '../../../../platform/tunnel/common/tunnel.js';
 import { FindInFrameOptions, IWebviewManagerService } from '../../../../platform/webview/common/webviewManagerService.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 import { WebviewThemeDataProvider } from '../browser/themeing.js';
 import { WebviewInitInfo } from '../browser/webview.js';
 import { WebviewElement } from '../browser/webviewElement.js';
 import { WindowIgnoreMenuShortcutsManager } from './windowIgnoreMenuShortcutsManager.js';
-import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 
 /**
  * Webview backed by an iframe but that uses Electron APIs to power the webview.
@@ -48,7 +47,6 @@ export class ElectronWebviewElement extends WebviewElement {
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@ITunnelService tunnelService: ITunnelService,
 		@IFileService fileService: IFileService,
-		@ITelemetryService telemetryService: ITelemetryService,
 		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
 		@IRemoteAuthorityResolverService remoteAuthorityResolverService: IRemoteAuthorityResolverService,
 		@ILogService logService: ILogService,
@@ -61,7 +59,7 @@ export class ElectronWebviewElement extends WebviewElement {
 	) {
 		super(initInfo, webviewThemeDataProvider,
 			configurationService, contextMenuService, notificationService, environmentService,
-			fileService, logService, remoteAuthorityResolverService, telemetryService, tunnelService, instantiationService, accessibilityService);
+			fileService, logService, remoteAuthorityResolverService, tunnelService, instantiationService, accessibilityService);
 
 		this._webviewKeyboardHandler = new WindowIgnoreMenuShortcutsManager(configurationService, mainProcessService, _nativeHostService);
 

From a7f76c368998127176d0a41dd4f76eac9f750b5c Mon Sep 17 00:00:00 2001
From: David Barbet <dabarbet@microsoft.com>
Date: Wed, 26 Feb 2025 14:20:22 -0800
Subject: [PATCH 0459/1815] Update C# onEnterRules to account for documentation
 comments

---
 extensions/csharp/language-configuration.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/extensions/csharp/language-configuration.json b/extensions/csharp/language-configuration.json
index 60814ae02f4a..7db6640f4c59 100644
--- a/extensions/csharp/language-configuration.json
+++ b/extensions/csharp/language-configuration.json
@@ -84,9 +84,10 @@
 	},
 	"onEnterRules": [
 		// Add // when pressing enter from inside line comment
+		// We do not want to match /// (a documentation comment)
 		{
 			"beforeText": {
-				"pattern": "\/\/.*"
+				"pattern": "[^\/]\/\/[^\/].*"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
@@ -96,5 +97,16 @@
 				"appendText": "// "
 			}
 		},
+		// Add /// when pressing enter from anywhere inside a documentation comment.
+		// Documentation comments are not valid after non-whitespace.
+		{
+			"beforeText": {
+				"pattern": "^\\s*\/\/\/"
+			},
+			"action": {
+				"indent": "none",
+				"appendText": "/// "
+			}
+		},
 	]
 }

From 5a676dc28d2afe432e68d591b140bae05aab6adf Mon Sep 17 00:00:00 2001
From: Justin Chen <54879025+justschen@users.noreply.github.com>
Date: Wed, 26 Feb 2025 15:44:08 -0800
Subject: [PATCH 0460/1815] temporarily disable web image drag and drop
 (#242113)

---
 .../contrib/chat/browser/chatDragAndDrop.ts   | 136 +++++++++---------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
index 4a538b5a86e8..fadac7d9da0a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
@@ -29,8 +29,7 @@ import { UntitledTextEditorInput } from '../../../services/untitled/common/untit
 import { IChatRequestVariableEntry, IDiagnosticVariableEntry, IDiagnosticVariableEntryFilterData, ISymbolVariableEntry } from '../common/chatModel.js';
 import { ChatAttachmentModel } from './chatAttachmentModel.js';
 import { IChatInputStyles } from './chatInputPart.js';
-import { imageToHash } from './chatPasteProviders.js';
-import { convertStringToUInt8Array, resizeImage } from './imageUtils.js';
+import { resizeImage } from './imageUtils.js';
 
 enum ChatDragAndDropType {
 	FILE_INTERNAL,
@@ -171,8 +170,8 @@ export class ChatDragAndDrop extends Themable {
 		// This is an esstimation based on the datatransfer types/items
 		if (this.isImageDnd(e)) {
 			return this.extensionService.extensions.some(ext => isProposedApiEnabled(ext, 'chatReferenceBinaryData')) ? ChatDragAndDropType.IMAGE : undefined;
-		} else if (containsDragType(e, 'text/html')) {
-			return ChatDragAndDropType.HTML;
+			// } else if (containsDragType(e, 'text/html')) {
+			// 	return ChatDragAndDropType.HTML;
 		} else if (containsDragType(e, CodeDataTransfers.SYMBOLS)) {
 			return ChatDragAndDropType.SYMBOL;
 		} else if (containsDragType(e, CodeDataTransfers.MARKERS)) {
@@ -244,10 +243,11 @@ export class ChatDragAndDrop extends Themable {
 			return this.resolveSymbolsAttachContext(data);
 		}
 
-		if (containsDragType(e, 'text/html')) {
-			const data = e.dataTransfer?.getData('text/html');
-			return data ? this.resolveHTMLAttachContext(data) : [];
-		}
+		// Removing HTML support for now
+		// if (containsDragType(e, 'text/html')) {
+		// 	const data = e.dataTransfer?.getData('text/html');
+		// 	return data ? this.resolveHTMLAttachContext(data) : [];
+		// }
 
 		const data = extractEditorsDropData(e);
 		return coalesce(await Promise.all(data.map(editorInput => {
@@ -324,55 +324,55 @@ export class ChatDragAndDrop extends Themable {
 		});
 	}
 
-	private async resolveHTMLAttachContext(data: string): Promise<IChatRequestVariableEntry[]> {
-		const displayName = localize('dragAndDroppedImageName', 'Image from URL');
-		let finalDisplayName = displayName;
-
-		for (let appendValue = 2; this.attachmentModel.attachments.some(attachment => attachment.name === finalDisplayName); appendValue++) {
-			finalDisplayName = `${displayName} ${appendValue}`;
-		}
-
-		const { src, alt } = extractImageAttributes(data);
-		finalDisplayName = alt ?? finalDisplayName;
-
-		if (/^data:image\/[a-z]+;base64,/.test(src)) {
-			const resizedImage = await resizeImage(src);
-			return [{
-				id: await imageToHash(resizedImage),
-				name: finalDisplayName,
-				value: resizedImage,
-				isImage: true,
-				isFile: false,
-				isDirectory: false
-			}];
-		} else if (/^https?:\/\/.+/.test(src)) {
-			const url = new URL(src);
-			const isImage = /\.(jpg|jpeg|png|gif|webp)$/i.test(url.pathname);
-			if (isImage) {
-				const buffer = convertStringToUInt8Array(src);
-				return [{
-					kind: 'image',
-					id: url.toString(),
-					name: finalDisplayName,
-					value: buffer,
-					isImage,
-					isFile: false,
-					isDirectory: false,
-					isURL: true,
-				}];
-			} else {
-				return [{
-					kind: 'link',
-					id: url.toString(),
-					name: finalDisplayName,
-					value: URI.parse(url.toString()),
-					isFile: false,
-					isDirectory: false,
-				}];
-			}
-		}
-		return [];
-	}
+	// private async resolveHTMLAttachContext(data: string): Promise<IChatRequestVariableEntry[]> {
+	// 	const displayName = localize('dragAndDroppedImageName', 'Image from URL');
+	// 	let finalDisplayName = displayName;
+
+	// 	for (let appendValue = 2; this.attachmentModel.attachments.some(attachment => attachment.name === finalDisplayName); appendValue++) {
+	// 		finalDisplayName = `${displayName} ${appendValue}`;
+	// 	}
+
+	// 	const { src, alt } = extractImageAttributes(data);
+	// 	finalDisplayName = alt ?? finalDisplayName;
+
+	// 	if (/^data:image\/[a-z]+;base64,/.test(src)) {
+	// 		const resizedImage = await resizeImage(src);
+	// 		return [{
+	// 			id: await imageToHash(resizedImage),
+	// 			name: finalDisplayName,
+	// 			value: resizedImage,
+	// 			isImage: true,
+	// 			isFile: false,
+	// 			isDirectory: false
+	// 		}];
+	// 	} else if (/^https?:\/\/.+/.test(src)) {
+	// 		const url = new URL(src);
+	// 		const isImage = /\.(jpg|jpeg|png|gif|webp)$/i.test(url.pathname);
+	// 		if (isImage) {
+	// 			const buffer = convertStringToUInt8Array(src);
+	// 			return [{
+	// 				kind: 'image',
+	// 				id: url.toString(),
+	// 				name: finalDisplayName,
+	// 				value: buffer,
+	// 				isImage,
+	// 				isFile: false,
+	// 				isDirectory: false,
+	// 				isURL: true,
+	// 			}];
+	// 		} else {
+	// 			return [{
+	// 				kind: 'link',
+	// 				id: url.toString(),
+	// 				name: finalDisplayName,
+	// 				value: URI.parse(url.toString()),
+	// 				isFile: false,
+	// 				isDirectory: false,
+	// 			}];
+	// 		}
+	// 	}
+	// 	return [];
+	// }
 
 	private resolveMarkerAttachContext(markers: MarkerTransferData[]): IDiagnosticVariableEntry[] {
 		return markers.map((marker): IDiagnosticVariableEntry => {
@@ -571,16 +571,16 @@ function symbolId(resource: URI, range?: IRange): string {
 	return resource.fsPath + rangePart;
 }
 
-function extractImageAttributes(html: string): { src: string; alt?: string } {
-	const imgTagRegex = /<img[^>]+src=["']([^"']+)["'][^>]*>/;
-	const altRegex = /alt=["']([^"']+)["']/;
+// function extractImageAttributes(html: string): { src: string; alt?: string } {
+// 	const imgTagRegex = /<img[^>]+src=["']([^"']+)["'][^>]*>/;
+// 	const altRegex = /alt=["']([^"']+)["']/;
 
-	const match = imgTagRegex.exec(html);
-	if (match) {
-		const src = match[1];
-		const altMatch = match[0].match(altRegex);
-		return { src, alt: altMatch ? altMatch[1] : undefined };
-	}
+// 	const match = imgTagRegex.exec(html);
+// 	if (match) {
+// 		const src = match[1];
+// 		const altMatch = match[0].match(altRegex);
+// 		return { src, alt: altMatch ? altMatch[1] : undefined };
+// 	}
 
-	return { src: '', alt: undefined };
-}
+// 	return { src: '', alt: undefined };
+// }

From 7d3d01ef351b695f40b98e4d48e6c7b8f2966f1d Mon Sep 17 00:00:00 2001
From: Justin Chen <54879025+justschen@users.noreply.github.com>
Date: Wed, 26 Feb 2025 16:05:08 -0800
Subject: [PATCH 0461/1815] fix ellipses (#242126)

FIX DA ELLIPSES
---
 src/vs/workbench/contrib/chat/browser/media/chat.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index e4aa79814cc5..8d5018eca40b 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1178,8 +1178,11 @@ have to be updated for changes to the rules above, or to support more deeply nes
 }
 
 .interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-icon-label-container .monaco-highlighted-label {
-	display: flex !important;
+	display: block !important;
 	align-items: center !important;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
 }
 
 .interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-icon-label .monaco-button.codicon.codicon-close,

From 39bf4cf0b0ca09540005d680c3db42187984a7cb Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 26 Feb 2025 16:09:54 -0800
Subject: [PATCH 0462/1815] chat: add #problems reference to core (#242127)

- Users can reference #problems in core now
- It will ask the user to pick a file, or all files, when there's >1
  file with errors. ([demo](https://memes.peet.io/img/25-02-8fbc8580-5f13-4714-b9d3-231edb53bdf7.mp4))
- Tweaked the icon to match the error icon in the markers view
---
 .../browser/media/severityIcon.css            |   3 +-
 .../browser/actions/chatContextActions.ts     |   2 +-
 .../contrib/chat/browser/chatDragAndDrop.ts   |   5 +-
 .../contrib/chat/browser/chatVariables.ts     |   7 +-
 .../browser/contrib/chatDynamicVariables.ts   | 131 ++++++++++++++----
 .../browser/contrib/chatInputCompletions.ts   |  28 +++-
 .../contrib/chat/common/chatModel.ts          |   5 +-
 .../contrib/chat/common/chatParserTypes.ts    |  15 +-
 .../contrib/chat/common/chatVariables.ts      |  12 +-
 9 files changed, 162 insertions(+), 46 deletions(-)

diff --git a/src/vs/platform/severityIcon/browser/media/severityIcon.css b/src/vs/platform/severityIcon/browser/media/severityIcon.css
index 4fd1d06c80be..62d99edf3370 100644
--- a/src/vs/platform/severityIcon/browser/media/severityIcon.css
+++ b/src/vs/platform/severityIcon/browser/media/severityIcon.css
@@ -8,7 +8,8 @@
 .text-search-provider-messages .providerMessage .codicon.codicon-error,
 .extensions-viewlet > .extensions .codicon.codicon-error,
 .extension-editor .codicon.codicon-error,
-.preferences-editor .codicon.codicon-error {
+.preferences-editor .codicon.codicon-error,
+.chat-attached-context-attachment .codicon.codicon-error {
 	color: var(--vscode-problemsErrorIcon-foreground);
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index d337dac1ef88..9791210961c6 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -852,7 +852,7 @@ export class AttachContextAction extends Action2 {
 		});
 
 		const filter = await instantiationService.invokeFunction(accessor =>
-			createMarkersQuickPick(accessor, items => onBackgroundAccept(items.map(convert))));
+			createMarkersQuickPick(accessor, 'problem', items => onBackgroundAccept(items.map(convert))));
 		return filter && convert(filter);
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
index fadac7d9da0a..33c18caa6a1e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
@@ -383,10 +383,7 @@ export class ChatDragAndDrop extends Themable {
 				filter = IDiagnosticVariableEntryFilterData.fromMarker(marker);
 			}
 
-			return {
-				...IDiagnosticVariableEntryFilterData.toEntry(filter),
-				...filter,
-			};
+			return IDiagnosticVariableEntryFilterData.toEntry(filter);
 		});
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatVariables.ts b/src/vs/workbench/contrib/chat/browser/chatVariables.ts
index 7ebacc6ae38e..68bae12a4a8c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatVariables.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { coalesce } from '../../../../base/common/arrays.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
 import { URI } from '../../../../base/common/uri.js';
 import { Location } from '../../../../editor/common/languages.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
@@ -29,10 +28,8 @@ export class ChatVariablesService implements IChatVariablesService {
 
 		prompt.parts
 			.forEach((part, i) => {
-				if (part instanceof ChatRequestDynamicVariablePart) {
-					resolvedVariables[i] = { id: part.id, name: part.referenceText, range: part.range, value: part.data, fullName: part.fullName, icon: part.icon, isFile: part.isFile, isDirectory: part.isDirectory };
-				} else if (part instanceof ChatRequestToolPart) {
-					resolvedVariables[i] = { id: part.toolId, name: part.toolName, range: part.range, value: undefined, isTool: true, icon: ThemeIcon.isThemeIcon(part.icon) ? part.icon : undefined, fullName: part.displayName };
+				if (part instanceof ChatRequestDynamicVariablePart || part instanceof ChatRequestToolPart) {
+					resolvedVariables[i] = part.toVariableEntry();
 				}
 			});
 
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
index 51c982387921..533e954c8b1d 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { coalesce } from '../../../../../base/common/arrays.js';
+import { coalesce, groupBy } from '../../../../../base/common/arrays.js';
+import { assertNever } from '../../../../../base/common/assert.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { isCancellationError } from '../../../../../base/common/errors.js';
@@ -35,7 +36,7 @@ import { IWorkspaceContextService } from '../../../../../platform/workspace/comm
 import { getExcludes, IFileQuery, ISearchComplete, ISearchConfiguration, ISearchService, QueryType } from '../../../../services/search/common/search.js';
 import { ISymbolQuickPickItem } from '../../../search/browser/symbolsQuickAccess.js';
 import { IDiagnosticVariableEntryFilterData } from '../../common/chatModel.js';
-import { IChatRequestVariableValue, IDynamicVariable } from '../../common/chatVariables.js';
+import { IChatRequestProblemsVariable, IChatRequestVariableValue, IDynamicVariable } from '../../common/chatVariables.js';
 import { IChatWidget } from '../chat.js';
 import { ChatWidget, IChatWidgetContrib } from '../chatWidget.js';
 import { ChatFileReference } from './chatDynamicVariables/chatFileReference.js';
@@ -650,7 +651,7 @@ export class AddDynamicVariableAction extends Action2 {
 }
 registerAction2(AddDynamicVariableAction);
 
-export async function createMarkersQuickPick(accessor: ServicesAccessor, onBackgroundAccept: (item: IDiagnosticVariableEntryFilterData[]) => void): Promise<IDiagnosticVariableEntryFilterData | undefined> {
+export async function createMarkersQuickPick(accessor: ServicesAccessor, level: 'problem' | 'file', onBackgroundAccept?: (item: IDiagnosticVariableEntryFilterData[]) => void): Promise<IDiagnosticVariableEntryFilterData | undefined> {
 	const markers = accessor.get(IMarkerService).read();
 	if (!markers.length) {
 		return;
@@ -658,46 +659,68 @@ export async function createMarkersQuickPick(accessor: ServicesAccessor, onBackg
 
 	const uriIdentityService = accessor.get(IUriIdentityService);
 	const labelService = accessor.get(ILabelService);
-	markers.sort((a, b) => uriIdentityService.extUri.compare(a.resource, b.resource) || b.severity - a.severity);
+	const grouped = groupBy(markers, (a, b) => uriIdentityService.extUri.compare(a.resource, b.resource));
 
 	const severities = new Set<MarkerSeverity>();
 	type MarkerPickItem = IQuickPickItem & { resource?: URI; entry: IDiagnosticVariableEntryFilterData };
 	const items: (MarkerPickItem | IQuickPickSeparator)[] = [];
-	for (const marker of markers) {
-		if (!uriIdentityService.extUri.isEqual(marker.resource, (items.at(-1) as MarkerPickItem)?.resource)) {
-			items.push({ type: 'separator', label: labelService.getUriLabel(marker.resource, { relative: true }) });
+
+	let pickCount = 0;
+	for (const group of grouped) {
+		const resource = group[0].resource;
+		if (level === 'problem') {
+			items.push({ type: 'separator', label: labelService.getUriLabel(resource, { relative: true }) });
+			for (const marker of group) {
+				pickCount++;
+				severities.add(marker.severity);
+				items.push({
+					type: 'item',
+					resource: marker.resource,
+					label: marker.message,
+					description: localize('markers.panel.at.ln.col.number', "[Ln {0}, Col {1}]", '' + marker.startLineNumber, '' + marker.startColumn),
+					entry: IDiagnosticVariableEntryFilterData.fromMarker(marker),
+				});
+			}
+		} else if (level === 'file') {
+			const entry = { filterUri: resource };
+			pickCount++;
+			items.push({
+				type: 'item',
+				resource,
+				label: IDiagnosticVariableEntryFilterData.label(entry),
+				description: group[0].message + (group.length > 1 ? localize('problemsMore', '+ {0} more', group.length - 1) : ''),
+				entry,
+			});
+			for (const marker of group) {
+				severities.add(marker.severity);
+			}
+		} else {
+			assertNever(level);
 		}
+	}
 
-		severities.add(marker.severity);
-		items.push({
-			type: 'item',
-			resource: marker.resource,
-			label: marker.message,
-			description: localize('markers.panel.at.ln.col.number', "[Ln {0}, Col {1}]", '' + marker.startLineNumber, '' + marker.startColumn),
-			entry: IDiagnosticVariableEntryFilterData.fromMarker(marker),
-		});
+	if (pickCount < 2) { // single error in a URI
+		return items.find((i): i is MarkerPickItem => i.type === 'item')?.entry;
 	}
 
-	if (items.length === 2) { // single error in a URI
-		return (items[1] as MarkerPickItem).entry;
+	if (level === 'file') {
+		items.unshift({ type: 'separator', label: localize('markers.panel.files', 'Files') });
 	}
 
-	if (items.length > 2) {
-		if (severities.has(MarkerSeverity.Error)) {
-			items.unshift({ type: 'item', label: localize('markers.panel.allErrors', 'All Errors'), entry: { filterSeverity: MarkerSeverity.Error } });
-		}
-		if (severities.has(MarkerSeverity.Warning)) {
-			items.unshift({ type: 'item', label: localize('markers.panel.allWarnings', 'All Warnings'), entry: { filterSeverity: MarkerSeverity.Warning } });
-		}
-		if (severities.has(MarkerSeverity.Info)) {
-			items.unshift({ type: 'item', label: localize('markers.panel.allInfos', 'All Infos'), entry: { filterSeverity: MarkerSeverity.Info } });
-		}
+	if (severities.has(MarkerSeverity.Error)) {
+		items.unshift({ type: 'item', label: localize('markers.panel.allErrors', 'All Errors'), entry: { filterSeverity: MarkerSeverity.Error } });
+	}
+	if (severities.has(MarkerSeverity.Warning)) {
+		items.unshift({ type: 'item', label: localize('markers.panel.allWarnings', 'All Warnings'), entry: { filterSeverity: MarkerSeverity.Warning } });
+	}
+	if (severities.has(MarkerSeverity.Info)) {
+		items.unshift({ type: 'item', label: localize('markers.panel.allInfos', 'All Infos'), entry: { filterSeverity: MarkerSeverity.Info } });
 	}
 
 
 	const quickInputService = accessor.get(IQuickInputService);
 	const quickPick = quickInputService.createQuickPick<MarkerPickItem>({ useSeparators: true });
-	quickPick.canAcceptInBackground = true;
+	quickPick.canAcceptInBackground = !onBackgroundAccept;
 	quickPick.placeholder = localize('pickAProblem', 'Pick a problem to attach...');
 	quickPick.items = items;
 
@@ -705,7 +728,7 @@ export async function createMarkersQuickPick(accessor: ServicesAccessor, onBackg
 		quickPick.onDidHide(() => resolve(undefined));
 		quickPick.onDidAccept(ev => {
 			if (ev.inBackground) {
-				onBackgroundAccept(quickPick.selectedItems.map(i => i.entry));
+				onBackgroundAccept?.(quickPick.selectedItems.map(i => i.entry));
 			} else {
 				resolve(quickPick.selectedItems[0]?.entry);
 				quickPick.dispose();
@@ -715,3 +738,53 @@ export async function createMarkersQuickPick(accessor: ServicesAccessor, onBackg
 	}).finally(() => quickPick.dispose());
 }
 
+export class SelectAndInsertProblemAction extends Action2 {
+	static readonly Name = 'problems';
+	static readonly ID = 'workbench.action.chat.selectAndInsertProblems';
+
+	constructor() {
+		super({
+			id: SelectAndInsertProblemAction.ID,
+			title: '' // not displayed
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: any[]) {
+		const logService = accessor.get(ILogService);
+		const context = args[0];
+		if (!isSelectAndInsertActionContext(context)) {
+			return;
+		}
+
+		const doCleanup = () => {
+			// Failed, remove the dangling `problem`
+			context.widget.inputEditor.executeEdits('chatInsertProblems', [{ range: context.range, text: `` }]);
+		};
+
+		const pick = await createMarkersQuickPick(accessor, 'file');
+		if (!pick) {
+			doCleanup();
+			return;
+		}
+
+		const editor = context.widget.inputEditor;
+		const originalRange = context.range;
+		const insertText = `#${SelectAndInsertProblemAction.Name}:${pick.filterUri ? basename(pick.filterUri) : MarkerSeverity.toString(pick.filterSeverity!)}`;
+
+		const varRange = new Range(originalRange.startLineNumber, originalRange.startColumn, originalRange.endLineNumber, originalRange.startColumn + insertText.length);
+		const success = editor.executeEdits('chatInsertProblems', [{ range: varRange, text: insertText + ' ' }]);
+		if (!success) {
+			logService.trace(`SelectAndInsertProblemsAction: failed to insert "${insertText}"`);
+			doCleanup();
+			return;
+		}
+
+		context.widget.getContrib<ChatDynamicVariableModel>(ChatDynamicVariableModel.ID)?.addReference({
+			id: 'vscode.problems',
+			prefix: SelectAndInsertProblemAction.Name,
+			range: varRange,
+			data: { id: 'vscode.problems', filter: pick } satisfies IChatRequestProblemsVariable,
+		});
+	}
+}
+registerAction2(SelectAndInsertProblemAction);
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
index ed38f7ce71f7..2b6c3ba35d38 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
@@ -27,6 +27,7 @@ import { IConfigurationService } from '../../../../../platform/configuration/com
 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 { IMarkerService } from '../../../../../platform/markers/common/markers.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';
@@ -44,7 +45,7 @@ import { ILanguageModelToolsService } from '../../common/languageModelToolsServi
 import { ChatEditingSessionSubmitAction, ChatSubmitAction } from '../actions/chatExecuteActions.js';
 import { IChatWidget, IChatWidgetService } from '../chat.js';
 import { ChatInputPart } from '../chatInputPart.js';
-import { ChatDynamicVariableModel, getTopLevelFolders, searchFolders, SelectAndInsertFolderAction, SelectAndInsertFileAction, SelectAndInsertSymAction } from './chatDynamicVariables.js';
+import { ChatDynamicVariableModel, SelectAndInsertFileAction, SelectAndInsertFolderAction, SelectAndInsertProblemAction, SelectAndInsertSymAction, getTopLevelFolders, searchFolders } from './chatDynamicVariables.js';
 
 class SlashCommandCompletions extends Disposable {
 	constructor(
@@ -467,6 +468,7 @@ class BuiltinDynamicCompletions extends Disposable {
 		@IEditorService private readonly editorService: IEditorService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IFileService private readonly fileService: IFileService,
+		@IMarkerService markerService: IMarkerService,
 	) {
 		super();
 
@@ -598,6 +600,30 @@ class BuiltinDynamicCompletions extends Disposable {
 			return result;
 		});
 
+		// Problems completions, we just attach all problems in this case
+		this.registerVariableCompletions(SelectAndInsertProblemAction.Name, ({ widget, range, position, model }, token) => {
+			const stats = markerService.getStatistics();
+			if (!stats.errors && !stats.warnings) {
+				return null;
+			}
+
+			const result: CompletionList = { suggestions: [] };
+
+			const completedText = `${chatVariableLeader}${SelectAndInsertProblemAction.Name}:`;
+			const afterTextRange = new Range(position.lineNumber, range.replace.startColumn, position.lineNumber, range.replace.startColumn + completedText.length);
+			result.suggestions.push({
+				label: `${chatVariableLeader}${SelectAndInsertProblemAction.Name}`,
+				insertText: completedText,
+				documentation: localize('pickProblemsLabel', "Problems in your workspace"),
+				range,
+				kind: CompletionItemKind.Text,
+				command: { id: SelectAndInsertProblemAction.ID, title: SelectAndInsertProblemAction.ID, arguments: [{ widget, range: afterTextRange }] },
+				sortText: 'z'
+			});
+
+			return result;
+		});
+
 		this._register(CommandsRegistry.registerCommand(BuiltinDynamicCompletions.addReferenceCommand, (_services, arg) => this.cmdAddReference(arg)));
 
 		this.queryBuilder = this.instantiationService.createInstance(QueryBuilder);
diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index e88d7a096403..abd866eea893 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -104,7 +104,7 @@ export interface IDiagnosticVariableEntryFilterData {
 }
 
 export namespace IDiagnosticVariableEntryFilterData {
-	export const icon = Codicon.warning;
+	export const icon = Codicon.error;
 
 	export function fromMarker(marker: IMarker): IDiagnosticVariableEntryFilterData {
 		return {
@@ -115,7 +115,7 @@ export namespace IDiagnosticVariableEntryFilterData {
 		};
 	}
 
-	export function toEntry(data: IDiagnosticVariableEntryFilterData) {
+	export function toEntry(data: IDiagnosticVariableEntryFilterData): IDiagnosticVariableEntry {
 		return {
 			id: id(data),
 			name: label(data),
@@ -123,6 +123,7 @@ export namespace IDiagnosticVariableEntryFilterData {
 			value: data,
 			kind: 'diagnostic' as const,
 			range: data.filterRange ? new OffsetRange(data.filterRange.startLineNumber, data.filterRange.endLineNumber) : undefined,
+			...data,
 		};
 	}
 
diff --git a/src/vs/workbench/contrib/chat/common/chatParserTypes.ts b/src/vs/workbench/contrib/chat/common/chatParserTypes.ts
index 386ae49778eb..164b87785ef8 100644
--- a/src/vs/workbench/contrib/chat/common/chatParserTypes.ts
+++ b/src/vs/workbench/contrib/chat/common/chatParserTypes.ts
@@ -8,8 +8,9 @@ import { ThemeIcon } from '../../../../base/common/themables.js';
 import { IOffsetRange, OffsetRange } from '../../../../editor/common/core/offsetRange.js';
 import { IRange } from '../../../../editor/common/core/range.js';
 import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentService, reviveSerializedAgent } from './chatAgents.js';
+import { IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData } from './chatModel.js';
 import { IChatSlashData } from './chatSlashCommands.js';
-import { IChatRequestVariableValue } from './chatVariables.js';
+import { IChatRequestProblemsVariable, IChatRequestVariableValue } from './chatVariables.js';
 import { IToolData } from './languageModelToolsService.js';
 
 // These are in a separate file to avoid circular dependencies with the dependencies of the parser
@@ -84,6 +85,10 @@ export class ChatRequestToolPart implements IParsedChatRequestPart {
 	get promptText(): string {
 		return this.text;
 	}
+
+	toVariableEntry(): IChatRequestVariableEntry {
+		return { id: this.toolId, name: this.toolName, range: this.range, value: undefined, isTool: true, icon: ThemeIcon.isThemeIcon(this.icon) ? this.icon : undefined, fullName: this.displayName };
+	}
 }
 
 /**
@@ -152,6 +157,14 @@ export class ChatRequestDynamicVariablePart implements IParsedChatRequestPart {
 	get promptText(): string {
 		return this.text;
 	}
+
+	toVariableEntry(): IChatRequestVariableEntry {
+		if (this.id === 'vscode.problems') {
+			return IDiagnosticVariableEntryFilterData.toEntry((this.data as IChatRequestProblemsVariable).filter);
+		}
+
+		return { id: this.id, name: this.referenceText, range: this.range, value: this.data, fullName: this.fullName, icon: this.icon, isFile: this.isFile, isDirectory: this.isDirectory };
+	}
 }
 
 export function reviveParsedChatRequest(serialized: IParsedChatRequest): IParsedChatRequest {
diff --git a/src/vs/workbench/contrib/chat/common/chatVariables.ts b/src/vs/workbench/contrib/chat/common/chatVariables.ts
index 8a5dd90bf100..2edc51c47865 100644
--- a/src/vs/workbench/contrib/chat/common/chatVariables.ts
+++ b/src/vs/workbench/contrib/chat/common/chatVariables.ts
@@ -10,7 +10,7 @@ import { IRange } from '../../../../editor/common/core/range.js';
 import { Location } from '../../../../editor/common/languages.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { ChatAgentLocation } from './chatAgents.js';
-import { IChatModel, IChatRequestVariableData, IChatRequestVariableEntry } from './chatModel.js';
+import { IChatModel, IChatRequestVariableData, IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData } from './chatModel.js';
 import { IParsedChatRequest } from './chatParserTypes.js';
 import { IChatContentReference, IChatProgressMessage } from './chatService.js';
 
@@ -24,7 +24,15 @@ export interface IChatVariableData {
 	canTakeArgument?: boolean;
 }
 
-export type IChatRequestVariableValue = string | URI | Location | unknown | Uint8Array;
+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 | unknown | Uint8Array | IChatRequestProblemsVariable;
 
 export type IChatVariableResolverProgress =
 	| IChatContentReference

From fdca1232919aa1614d31eb7e3d5a7390e3bc3cca Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Wed, 26 Feb 2025 16:44:37 -0800
Subject: [PATCH 0463/1815] Small alignment of prompt attachment button

For #13572

Use consistent icon and don't add border
---
 .../promptAttachments/promptAttachmentWidget.ts           | 3 ++-
 src/vs/workbench/contrib/chat/browser/media/chat.css      | 8 --------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentWidget.ts b/src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentWidget.ts
index 8c1068988f56..4b07d7bacd62 100644
--- a/src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentWidget.ts
@@ -157,7 +157,8 @@ export class PromptAttachmentWidget extends Disposable {
 				},
 			),
 		);
-		removeButton.icon = Codicon.x;
+
+		removeButton.icon = Codicon.close;
 		this.renderDisposables.add(removeButton.onDidClick((e) => {
 			e.stopPropagation();
 			this.model.dispose();
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 8d5018eca40b..9f61911e7fd7 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1042,14 +1042,6 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	border-style: dashed;
 	opacity: 0.75;
 }
-.chat-attached-context .chat-prompt-attachment .monaco-button {
-	border-left: 1px solid var(--vscode-chat-requestBorder, var(--vscode-input-background, transparent));
-	margin-left: 3px;
-}
-.chat-attached-context .chat-prompt-attachment.error .monaco-button,
-.chat-attached-context .chat-prompt-attachment.warning .monaco-button {
-	border-left-color: currentColor;
-}
 .chat-attached-context .chat-prompt-attachment:focus .monaco-button {
 	border-color: var(--vscode-focusBorder);
 }

From 737dc61e74c0df203e016a9decdfada18d4fe483 Mon Sep 17 00:00:00 2001
From: Osvaldo Ortega <osortega@microsoft.com>
Date: Wed, 26 Feb 2025 18:27:22 -0800
Subject: [PATCH 0464/1815] Fix for deleting a whole AI search folder

---
 .../workbench/contrib/search/browser/AISearch/aiSearchModel.ts   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/search/browser/AISearch/aiSearchModel.ts b/src/vs/workbench/contrib/search/browser/AISearch/aiSearchModel.ts
index 3a21a6db7523..df9d8a5dccdf 100644
--- a/src/vs/workbench/contrib/search/browser/AISearch/aiSearchModel.ts
+++ b/src/vs/workbench/contrib/search/browser/AISearch/aiSearchModel.ts
@@ -295,6 +295,7 @@ export class AIFolderMatchWorkspaceRootImpl extends Disposable implements ISearc
 	private disposeMatches(): void {
 		[...this._fileMatches.values()].forEach((fileMatch: ISearchTreeFileMatch) => fileMatch.dispose());
 		[...this._unDisposedFileMatches.values()].forEach((fileMatch: ISearchTreeFileMatch) => fileMatch.dispose());
+		this._fileMatches.clear();
 	}
 
 	override dispose(): void {

From cfe8020e4eea77801264c93447539b32f8e8d3b3 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 26 Feb 2025 18:48:19 -0800
Subject: [PATCH 0465/1815] Add ChatErrorLevel to ChatErrorDetails (#242139)

We need this so that the error when the rate limit is exceeded can show as 'info' without having to set `responseIsFiltered`
---
 .../extensions/common/extensionsApiProposals.ts        |  2 +-
 src/vs/workbench/api/common/extHost.api.impl.ts        |  1 +
 src/vs/workbench/api/common/extHostTypes.ts            |  6 ++++++
 .../browser/chatContentParts/chatWarningContentPart.ts |  9 +++++----
 .../workbench/contrib/chat/browser/chatListRenderer.ts |  7 ++++---
 src/vs/workbench/contrib/chat/common/chatService.ts    |  7 +++++++
 .../vscode.proposed.chatParticipantPrivate.d.ts        | 10 +++++++++-
 7 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index 6d62272e988c..d006ee0201ab 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -33,7 +33,7 @@ const _allApiProposals = {
 	},
 	chatParticipantPrivate: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts',
-		version: 4
+		version: 5
 	},
 	chatProvider: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatProvider.d.ts',
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index 78e34e821fa1..898d747ddfbc 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -1806,6 +1806,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			TextSearchContext2: TextSearchContext2,
 			TextSearchMatch2: TextSearchMatch2,
 			TextSearchCompleteMessageTypeNew: TextSearchCompleteMessageType,
+			ChatErrorLevel: extHostTypes.ChatErrorLevel,
 		};
 	};
 }
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index d9c68f67407a..f1fcdc1ab1b8 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -4750,6 +4750,12 @@ export class PreparedTerminalToolInvocation {
 	) { }
 }
 
+export enum ChatErrorLevel {
+	Info = 0,
+	Warning = 1,
+	Error = 2
+}
+
 export class LanguageModelChatMessage implements vscode.LanguageModelChatMessage {
 
 	static User(content: string | (LanguageModelTextPart | LanguageModelToolResultPart | LanguageModelToolCallPart)[], name?: string): LanguageModelChatMessage {
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatWarningContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatWarningContentPart.ts
index 73ad31e50cf1..236d3552e501 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatWarningContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatWarningContentPart.ts
@@ -11,6 +11,7 @@ import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { IChatContentPart } from './chatContentParts.js';
 import { IChatProgressRenderableResponseContent } from '../../common/chatModel.js';
+import { ChatErrorLevel } from '../../common/chatService.js';
 
 const $ = dom.$;
 
@@ -18,7 +19,7 @@ export class ChatWarningContentPart extends Disposable implements IChatContentPa
 	public readonly domNode: HTMLElement;
 
 	constructor(
-		kind: 'info' | 'warning' | 'error',
+		kind: ChatErrorLevel,
 		content: IMarkdownString,
 		renderer: MarkdownRenderer,
 	) {
@@ -28,15 +29,15 @@ export class ChatWarningContentPart extends Disposable implements IChatContentPa
 		let icon;
 		let iconClass;
 		switch (kind) {
-			case 'warning':
+			case ChatErrorLevel.Warning:
 				icon = Codicon.warning;
 				iconClass = '.chat-warning-codicon';
 				break;
-			case 'error':
+			case ChatErrorLevel.Error:
 				icon = Codicon.error;
 				iconClass = '.chat-error-codicon';
 				break;
-			case 'info':
+			case ChatErrorLevel.Info:
 				icon = Codicon.info;
 				iconClass = '.chat-info-codicon';
 				break;
diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index 81ec6916c421..95674d712b63 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -47,7 +47,7 @@ import { ChatAgentLocation, IChatAgentMetadata } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatRequestVariableEntry, IChatTextEditGroup } from '../common/chatModel.js';
 import { chatSubcommandLeader } from '../common/chatParserTypes.js';
-import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatConfirmation, IChatContentReference, IChatFollowup, IChatMarkdownContent, IChatTask, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop } from '../common/chatService.js';
+import { ChatAgentVoteDirection, ChatAgentVoteDownReason, ChatErrorLevel, IChatConfirmation, IChatContentReference, IChatFollowup, IChatMarkdownContent, IChatTask, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop } from '../common/chatService.js';
 import { IChatCodeCitations, IChatReferences, IChatRendererContent, IChatRequestViewModel, IChatResponseViewModel, IChatWorkingProgress, isRequestVM, isResponseVM } from '../common/chatViewModel.js';
 import { getNWords } from '../common/chatWordCounter.js';
 import { CodeBlockModelCollection } from '../common/codeBlockModelCollection.js';
@@ -613,7 +613,8 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 				templateData.value.appendChild(renderedError.domNode);
 				templateData.elementDisposables.add(renderedError.onDidChangeHeight(() => this.updateItemHeight(templateData)));
 			} else {
-				const renderedError = this.instantiationService.createInstance(ChatWarningContentPart, element.errorDetails.responseIsFiltered ? 'info' : 'error', new MarkdownString(element.errorDetails.message), this.renderer);
+				const level = element.errorDetails.level ?? (element.errorDetails.responseIsFiltered ? ChatErrorLevel.Info : ChatErrorLevel.Error);
+				const renderedError = this.instantiationService.createInstance(ChatWarningContentPart, level, new MarkdownString(element.errorDetails.message), this.renderer);
 				templateData.elementDisposables.add(renderedError);
 				templateData.value.appendChild(renderedError.domNode);
 			}
@@ -882,7 +883,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		} else if (content.kind === 'confirmation') {
 			return this.renderConfirmation(context, content, templateData);
 		} else if (content.kind === 'warning') {
-			return this.instantiationService.createInstance(ChatWarningContentPart, 'warning', content.content, this.renderer);
+			return this.instantiationService.createInstance(ChatWarningContentPart, ChatErrorLevel.Warning, content.content, this.renderer);
 		} else if (content.kind === 'markdownContent') {
 			return this.renderMarkdown(content, templateData, context);
 		} else if (content.kind === 'references') {
diff --git a/src/vs/workbench/contrib/chat/common/chatService.ts b/src/vs/workbench/contrib/chat/common/chatService.ts
index 9a6a32cb43e6..8340deb8945d 100644
--- a/src/vs/workbench/contrib/chat/common/chatService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatService.ts
@@ -28,12 +28,19 @@ export interface IChatRequest {
 	variables: Record<string, IChatRequestVariableValue[]>;
 }
 
+export enum ChatErrorLevel {
+	Info = 0,
+	Warning = 1,
+	Error = 2
+}
+
 export interface IChatResponseErrorDetails {
 	message: string;
 	responseIsIncomplete?: boolean;
 	responseIsFiltered?: boolean;
 	responseIsRedacted?: boolean;
 	isQuotaExceeded?: boolean;
+	level?: ChatErrorLevel;
 }
 
 export interface IChatResponseProgressFileTreeData {
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
index 446f1f5f2b98..0f274bf257b6 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: 4
+// version: 5
 
 declare module 'vscode' {
 
@@ -83,6 +83,12 @@ declare module 'vscode' {
 		supportIssueReporting?: boolean;
 	}
 
+	export enum ChatErrorLevel {
+		Info = 0,
+		Warning = 1,
+		Error = 2,
+	}
+
 	export interface ChatErrorDetails {
 		/**
 		 * If set to true, the message content is completely hidden. Only ChatErrorDetails#message will be shown.
@@ -90,6 +96,8 @@ declare module 'vscode' {
 		responseIsRedacted?: boolean;
 
 		isQuotaExceeded?: boolean;
+
+		level?: ChatErrorLevel;
 	}
 
 	export namespace chat {

From e319464a258837ed0477e7228cbe2fc000f51dce Mon Sep 17 00:00:00 2001
From: Caleb Brose <5447118+cmbrose@users.noreply.github.com>
Date: Thu, 27 Feb 2025 01:49:32 -0600
Subject: [PATCH 0466/1815] Update chat's `newEditSession` command to take an
 input prompt (#241796)

* Update chat's newEditSession command to take an input prompt

* Use acceptInput instead

* PR feedback - making a type and supporting partial queries
---
 .../chat/browser/actions/chatClearActions.ts  | 72 ++++++++++++++-----
 1 file changed, 55 insertions(+), 17 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
index 71d64cc9a65e..cdd73683c537 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
@@ -15,7 +15,7 @@ import { KeybindingWeight } from '../../../../../platform/keybinding/common/keyb
 import { ActiveEditorContext } from '../../../../common/contextkeys.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { isChatViewTitleActionContext } from '../../common/chatActions.js';
-import { ChatAgentLocation } from '../../common/chatAgents.js';
+import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
 import { ChatContextKeys } from '../../common/chatContextKeys.js';
 import { hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, IChatEditingSession, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { ChatViewId, EditsViewId, IChatWidget, IChatWidgetService } from '../chat.js';
@@ -30,6 +30,24 @@ export const ACTION_ID_NEW_CHAT = `workbench.action.chat.newChat`;
 export const ACTION_ID_NEW_EDIT_SESSION = `workbench.action.chat.newEditSession`;
 export const ChatDoneActionId = 'workbench.action.chat.done';
 
+export interface INewEditSessionActionContext {
+	/**
+	 * An initial prompt to write to the chat.
+	 */
+	inputValue?: string;
+
+	/**
+	 * Selects opening in agent mode or not. If not set, the current mode is used.
+	 * This is ignored when coming from a chat view title context.
+	 */
+	agentMode?: boolean;
+
+	/**
+	 * Whether the inputValue is partial and should wait for further user input. If false or not set, the prompt is sent immediately.
+	 */
+	isPartialQuery?: boolean;
+}
+
 export function registerNewChatActions() {
 	registerAction2(class NewChatEditorAction extends Action2 {
 		constructor() {
@@ -175,34 +193,54 @@ export function registerNewChatActions() {
 		}
 
 		async runEditingSessionAction(accessor: ServicesAccessor, editingSession: IChatEditingSession, chatWidget: IChatWidget, ...args: any[]) {
-			const context = args[0];
+			const context: INewEditSessionActionContext | undefined = args[0];
 			const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
 			const widgetService = accessor.get(IChatWidgetService);
 			const dialogService = accessor.get(IDialogService);
 			const viewsService = accessor.get(IViewsService);
+			const agentService = accessor.get(IChatAgentService);
+
 			if (!(await this._handleCurrentEditingSession(editingSession, dialogService))) {
 				return;
 			}
-			if (isChatViewTitleActionContext(context)) {
+
+			const isChatViewTitleAction = isChatViewTitleActionContext(context);
+
+			let widget: IChatWidget | undefined;
+			if (isChatViewTitleAction) {
 				// Is running in the Chat view title
-				announceChatCleared(accessibilitySignalService);
-				const widget = widgetService.getWidgetBySessionId(context.sessionId);
-				if (widget) {
-					await editingSession.stop(true);
-					widget.clear();
-					widget.attachmentModel.clear();
-					widget.focusInput();
-				}
+				widget = widgetService.getWidgetBySessionId(context.sessionId);
 			} else {
 				// Is running from f1 or keybinding
 				const chatView = await viewsService.openView(EditsViewId) as ChatViewPane;
-				const widget = chatView.widget;
+				widget = chatView.widget;
+			}
 
-				announceChatCleared(accessibilitySignalService);
-				await editingSession.stop(true);
-				widget.clear();
-				widget.attachmentModel.clear();
-				widget.focusInput();
+			announceChatCleared(accessibilitySignalService);
+
+			if (!widget) {
+				return;
+			}
+
+			await editingSession.stop(true);
+			widget.clear();
+			widget.attachmentModel.clear();
+			widget.focusInput();
+
+			if (!context) {
+				return;
+			}
+
+			if (!isChatViewTitleAction && typeof context.agentMode === 'boolean') {
+				agentService.toggleToolsAgentMode(context.agentMode);
+			}
+
+			if (context.inputValue) {
+				if (context.isPartialQuery) {
+					widget.setInput(context.inputValue);
+				} else {
+					widget.acceptInput(context.inputValue);
+				}
 			}
 		}
 	});

From fb28dca732cce37e797b83814e694bb14ba04b9a Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 27 Feb 2025 09:26:37 +0100
Subject: [PATCH 0467/1815] :lipstick: (#242152)

---
 src/vs/platform/utilityProcess/electron-main/utilityProcess.ts | 2 +-
 src/vs/workbench/contrib/chat/browser/chatStatus.ts            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts b/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts
index e2f88fbf8c0f..6378c6d4c0c6 100644
--- a/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts
+++ b/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts
@@ -244,7 +244,7 @@ export class UtilityProcess extends Disposable {
 		this.process = utilityProcess.fork(modulePath, args, {
 			serviceName,
 			env,
-			execArgv,
+			execArgv, // !!! Add `--trace-warnings` for node.js tracing !!!
 			allowLoadingUnsignedLibraries,
 			respondToAuthRequestsFromMainProcess,
 			stdio
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 04c4ae1177f0..2c88942cd93c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -206,7 +206,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 					container.appendChild($('div.header', undefined, localize('usageTitle', "Copilot Free Usage")));
 
-					const chatQuotaIndicator = this.createQuotaIndicator(container, chatTotal, chatRemaining, localize('chatsLabel', "Chats messages"));
+					const chatQuotaIndicator = this.createQuotaIndicator(container, chatTotal, chatRemaining, localize('chatsLabel', "Chat messages"));
 					const completionsQuotaIndicator = this.createQuotaIndicator(container, completionsTotal, completionsRemaining, localize('completionsLabel', "Code completions"));
 
 					container.appendChild($('div.description', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.value.format(quotaResetDate))));

From c202fb0bcfc7ac863f90756bdf668e801b96901d Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 27 Feb 2025 10:14:21 +0100
Subject: [PATCH 0468/1815] ux - tweak status locations including copilot to be
 more aligned with our UX standards (#242154)

---
 build/lib/stylelint/vscode-known-variables.json       |  4 ----
 .../workbench/api/browser/mainThreadOutputService.ts  |  2 +-
 src/vs/workbench/browser/parts/editor/editorStatus.ts |  5 +++--
 .../parts/notifications/notificationsStatus.ts        |  4 ++--
 .../browser/parts/statusbar/media/statusbarpart.css   | 10 ----------
 src/vs/workbench/common/theme.ts                      | 11 -----------
 src/vs/workbench/contrib/chat/browser/chatStatus.ts   |  8 +++++---
 .../contrib/tasks/browser/task.contribution.ts        |  2 +-
 .../workspace/browser/workspace.contribution.ts       |  2 +-
 .../services/progress/browser/progressService.ts      |  2 +-
 .../workbench/services/statusbar/browser/statusbar.ts |  4 ++--
 11 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
index 339c201f166a..6bf3ddb025a7 100644
--- a/build/lib/stylelint/vscode-known-variables.json
+++ b/build/lib/stylelint/vscode-known-variables.json
@@ -656,10 +656,6 @@
 		"--vscode-statusBar-noFolderForeground",
 		"--vscode-statusBarItem-activeBackground",
 		"--vscode-statusBarItem-compactHoverBackground",
-		"--vscode-statusBarItem-copilotBackground",
-		"--vscode-statusBarItem-copilotForeground",
-		"--vscode-statusBarItem-copilotHoverBackground",
-		"--vscode-statusBarItem-copilotHoverForeground",
 		"--vscode-statusBarItem-errorBackground",
 		"--vscode-statusBarItem-errorForeground",
 		"--vscode-statusBarItem-errorHoverBackground",
diff --git a/src/vs/workbench/api/browser/mainThreadOutputService.ts b/src/vs/workbench/api/browser/mainThreadOutputService.ts
index 3ca6415b382a..434fc88d497c 100644
--- a/src/vs/workbench/api/browser/mainThreadOutputService.ts
+++ b/src/vs/workbench/api/browser/mainThreadOutputService.ts
@@ -106,7 +106,7 @@ export class MainThreadOutputService extends Disposable implements MainThreadOut
 				statusProperties,
 				'status.view.showQuietly',
 				StatusbarAlignment.RIGHT,
-				{ location: { id: 'status.notifications', priority: -Number.MAX_VALUE }, alignment: StatusbarAlignment.LEFT }
+				{ location: { id: 'status.notifications', priority: Number.NEGATIVE_INFINITY }, alignment: StatusbarAlignment.LEFT }
 			);
 		} else {
 			this._outputStatusItem.value.update(statusProperties);
diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index a1b9bd5215c2..e4213505fa04 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -994,9 +994,10 @@ class ShowCurrentMarkerInStatusbarContribution extends Disposable {
 				const line = splitLines(this.currentMarker.message)[0];
 				const text = `${this.getType(this.currentMarker)} ${line}`;
 				if (!this.statusBarEntryAccessor.value) {
-					this.statusBarEntryAccessor.value = this.statusbarService.addEntry({ name: localize('currentProblem', "Current Problem"), text: '', ariaLabel: '' }, 'statusbar.currentProblem', StatusbarAlignment.LEFT);
+					this.statusBarEntryAccessor.value = this.statusbarService.addEntry({ name: localize('currentProblem', "Current Problem"), text, ariaLabel: text }, 'statusbar.currentProblem', StatusbarAlignment.LEFT, { location: { id: 'status.problems', priority: 50 }, alignment: StatusbarAlignment.RIGHT });
+				} else {
+					this.statusBarEntryAccessor.value.update({ name: localize('currentProblem', "Current Problem"), text, ariaLabel: text });
 				}
-				this.statusBarEntryAccessor.value.update({ name: localize('currentProblem', "Current Problem"), text, ariaLabel: text });
 			} else {
 				this.statusBarEntryAccessor.clear();
 			}
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts b/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts
index 3e0ec62380d0..42778c61f741 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsStatus.ts
@@ -97,7 +97,7 @@ export class NotificationsStatus extends Disposable {
 				statusProperties,
 				'status.notifications',
 				StatusbarAlignment.RIGHT,
-				-Number.MAX_VALUE /* towards the far end of the right hand side */
+				Number.NEGATIVE_INFINITY /* last entry */
 			);
 		} else {
 			this.notificationsCenterStatusItem.update(statusProperties);
@@ -200,7 +200,7 @@ export class NotificationsStatus extends Disposable {
 				},
 				'status.message',
 				StatusbarAlignment.LEFT,
-				-Number.MAX_VALUE /* far right on left hand side */
+				Number.NEGATIVE_INFINITY /* last entry */
 			);
 			showHandle = null;
 		}, showAfter);
diff --git a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
index 3244a1b4cb37..9e1e2041ab8d 100644
--- a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
+++ b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
@@ -239,13 +239,3 @@
 	color: var(--vscode-statusBarItem-offlineHoverForeground);
 	background-color: var(--vscode-statusBarItem-offlineHoverBackground) !important;
 }
-
-.monaco-workbench .part.statusbar > .items-container > .statusbar-item.copilot-kind {
-	color: var(--vscode-statusBarItem-copilotForeground);
-	background-color: var(--vscode-statusBarItem-copilotBackground);
-}
-
-.monaco-workbench .part.statusbar > .items-container > .statusbar-item.copilot-kind a:hover:not(.disabled) {
-	color: var(--vscode-statusBarItem-copilotHoverForeground);
-	background-color: var(--vscode-statusBarItem-copilotHoverBackground) !important;
-}
diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
index 6c725fcfcba5..bba032c63875 100644
--- a/src/vs/workbench/common/theme.ts
+++ b/src/vs/workbench/common/theme.ts
@@ -599,17 +599,6 @@ export const EXTENSION_BADGE_REMOTE_BACKGROUND = registerColor('extensionBadge.r
 export const EXTENSION_BADGE_REMOTE_FOREGROUND = registerColor('extensionBadge.remoteForeground', ACTIVITY_BAR_BADGE_FOREGROUND, localize('extensionBadge.remoteForeground', "Foreground color for the remote badge in the extensions view."));
 
 
-// < --- Copilot --- >
-
-export const STATUS_BAR_COPILOT_ITEM_BACKGROUND = registerColor('statusBarItem.copilotBackground', STATUS_BAR_REMOTE_ITEM_BACKGROUND, localize('statusBarItemCopilotBackground', "Background color for the Copilot indicator on the status bar."));
-
-export const STATUS_BAR_COPILOT_ITEM_FOREGROUND = registerColor('statusBarItem.copilotForeground', STATUS_BAR_REMOTE_ITEM_FOREGROUND, localize('statusBarItemCopilotForeground', "Foreground color for the Copilot indicator on the status bar."));
-
-export const STATUS_BAR_COPILOT_ITEM_HOVER_FOREGROUND = registerColor('statusBarItem.copilotHoverForeground', STATUS_BAR_REMOTE_ITEM_HOVER_FOREGROUND, localize('statusBarCopilotItemHoverForeground', "Foreground color for the Copilot indicator on the status bar when hovering."));
-
-export const STATUS_BAR_COPILOT_ITEM_HOVER_BACKGROUND = registerColor('statusBarItem.copilotHoverBackground', STATUS_BAR_REMOTE_ITEM_HOVER_BACKGROUND, localize('statusBarAiItemHoverBackground', "Background color for the Copilot indicator on the status bar when hovering."));
-
-
 // < --- Side Bar --- >
 
 export const SIDE_BAR_BACKGROUND = registerColor('sideBar.background', {
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 2c88942cd93c..8ef5818af694 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -11,7 +11,7 @@ import { localize } from '../../../../nls.js';
 import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowTooltipCommand, StatusbarAlignment, TooltipContent } from '../../../services/statusbar/browser/statusbar.js';
+import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowTooltipCommand, StatusbarAlignment, StatusbarEntryKind, TooltipContent } from '../../../services/statusbar/browser/statusbar.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatQuotasService } from '../common/chatQuotasService.js';
 import { quotaToButtonMessage, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, TOGGLE_CHAT_ACTION_ID, CHAT_OPEN_ACTION_ID } from './actions/chatActions.js';
@@ -119,7 +119,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 	private async create(): Promise<void> {
 		if (this.configurationService.getValue<boolean>('chat.experimental.statusIndicator.enabled') === true) {
-			this.entry ||= this.statusbarService.addEntry(this.getEntryProps(), ChatStatusBarEntry.ID, StatusbarAlignment.RIGHT, Number.NEGATIVE_INFINITY /* the end of the right hand side */);
+			this.entry ||= this.statusbarService.addEntry(this.getEntryProps(), ChatStatusBarEntry.ID, StatusbarAlignment.RIGHT, { location: { id: 'status.editor.mode', priority: 100.1 }, alignment: StatusbarAlignment.RIGHT });
 			this.statusbarService.updateEntryVisibility(`${this.productService.defaultChatAgent?.extensionId}.status`, false); // TODO@bpasero: remove this eventually
 		} else {
 			this.entry?.dispose();
@@ -161,6 +161,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		let ariaLabel = localize('chatStatus', "Copilot Status");
 		let command: string | Command = TOGGLE_CHAT_ACTION_ID;
 		let tooltip: TooltipContent = localize('openChat', "Open Chat ({0})", this.keybindingService.lookupKeybinding(command)?.getLabel() ?? '');
+		let kind: StatusbarEntryKind | undefined;
 
 		// Quota Exceeded
 		const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatQuotasService.quotas;
@@ -178,6 +179,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			ariaLabel = quotaWarning;
 			command = OPEN_CHAT_QUOTA_EXCEEDED_DIALOG;
 			tooltip = quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded });
+			kind = 'prominent';
 		}
 
 		// Copilot Not Installed
@@ -273,7 +275,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			ariaLabel,
 			command,
 			showInAllWindows: true,
-			kind: 'copilot',
+			kind,
 			tooltip
 		};
 	}
diff --git a/src/vs/workbench/contrib/tasks/browser/task.contribution.ts b/src/vs/workbench/contrib/tasks/browser/task.contribution.ts
index aab10e088716..98592cc01a37 100644
--- a/src/vs/workbench/contrib/tasks/browser/task.contribution.ts
+++ b/src/vs/workbench/contrib/tasks/browser/task.contribution.ts
@@ -142,7 +142,7 @@ export class TaskStatusBarContributions extends Disposable implements IWorkbench
 			};
 
 			if (!this._runningTasksStatusItem) {
-				this._runningTasksStatusItem = this._statusbarService.addEntry(itemProps, 'status.runningTasks', StatusbarAlignment.LEFT, 49 /* Medium Priority, next to Markers */);
+				this._runningTasksStatusItem = this._statusbarService.addEntry(itemProps, 'status.runningTasks', StatusbarAlignment.LEFT, { location: { id: 'status.problems', priority: 50 }, alignment: StatusbarAlignment.RIGHT });
 			} else {
 				this._runningTasksStatusItem.update(itemProps);
 			}
diff --git a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
index 0ab68289fb67..c512b648529b 100644
--- a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
+++ b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
@@ -627,7 +627,7 @@ export class WorkspaceTrustUXHandler extends Disposable implements IWorkbenchCon
 
 		if (!trusted && !this.statusbarEntryAccessor.value) {
 			const entry = this.getRestrictedModeStatusbarEntry();
-			this.statusbarEntryAccessor.value = this.statusbarService.addEntry(entry, this.entryId, StatusbarAlignment.LEFT, 0.99 * Number.MAX_VALUE /* Right of remote indicator */);
+			this.statusbarEntryAccessor.value = this.statusbarService.addEntry(entry, this.entryId, StatusbarAlignment.LEFT, { location: { id: 'status.host', priority: Number.POSITIVE_INFINITY }, alignment: StatusbarAlignment.RIGHT });
 		}
 	}
 
diff --git a/src/vs/workbench/services/progress/browser/progressService.ts b/src/vs/workbench/services/progress/browser/progressService.ts
index 73b4c71daba1..994f4d17ae85 100644
--- a/src/vs/workbench/services/progress/browser/progressService.ts
+++ b/src/vs/workbench/services/progress/browser/progressService.ts
@@ -190,7 +190,7 @@ export class ProgressService extends Disposable implements IProgressService {
 			if (this.windowProgressStatusEntry) {
 				this.windowProgressStatusEntry.update(statusEntryProperties);
 			} else {
-				this.windowProgressStatusEntry = this.statusbarService.addEntry(statusEntryProperties, 'status.progress', StatusbarAlignment.LEFT);
+				this.windowProgressStatusEntry = this.statusbarService.addEntry(statusEntryProperties, 'status.progress', StatusbarAlignment.LEFT, Number.NEGATIVE_INFINITY /* last entry */);
 			}
 		}
 
diff --git a/src/vs/workbench/services/statusbar/browser/statusbar.ts b/src/vs/workbench/services/statusbar/browser/statusbar.ts
index 2c44613af2ba..0cb6914db5cf 100644
--- a/src/vs/workbench/services/statusbar/browser/statusbar.ts
+++ b/src/vs/workbench/services/statusbar/browser/statusbar.ts
@@ -113,8 +113,8 @@ export interface IStatusbarStyleOverride {
 	readonly border?: ColorIdentifier;
 }
 
-export type StatusbarEntryKind = 'standard' | 'warning' | 'error' | 'prominent' | 'remote' | 'offline' | 'copilot';
-export const StatusbarEntryKinds: StatusbarEntryKind[] = ['standard', 'warning', 'error', 'prominent', 'remote', 'offline', 'copilot'];
+export type StatusbarEntryKind = 'standard' | 'warning' | 'error' | 'prominent' | 'remote' | 'offline';
+export const StatusbarEntryKinds: StatusbarEntryKind[] = ['standard', 'warning', 'error', 'prominent', 'remote', 'offline'];
 
 export type TooltipContent = IMarkdownString | IManagedHoverContentOrFactory;
 

From a03cb7c4764314d491c11ec67bbd05779a9ee9bd Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Thu, 27 Feb 2025 11:45:54 +0100
Subject: [PATCH 0469/1815] Adjusts inline edit <-> inline completion
 preference (#242169)

---
 .../browser/model/inlineCompletionsModel.ts                 | 2 +-
 .../browser/model/provideInlineCompletions.ts               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
index efcbda1a33d9..e31394a52013 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -282,7 +282,7 @@ export class InlineCompletionsModel extends Disposable {
 		let inlineEdit: InlineCompletionWithUpdatedRange | undefined = undefined;
 		const visibleCompletions: InlineCompletionWithUpdatedRange[] = [];
 		for (const completion of c.inlineCompletions) {
-			if (!completion.sourceInlineCompletion.isInlineEdit) {
+			if (!(completion.sourceInlineCompletion.isInlineEdit || completion.sourceInlineCompletion.showInlineEditMenu)) {
 				if (completion.isVisible(this.textModel, cursorPosition, reader)) {
 					visibleCompletions.push(completion);
 				}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
index f510bfab8538..0f7691cbf87b 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
@@ -180,10 +180,10 @@ async function addRefAndCreateResult(
 		completions.addRef();
 		lists.push(completions);
 		for (const item of completions.inlineCompletions.items) {
-			if (!context.includeInlineEdits && item.isInlineEdit) {
+			if (!context.includeInlineEdits && (item.isInlineEdit || item.showInlineEditMenu)) {
 				continue;
 			}
-			if (!context.includeInlineCompletions && !item.isInlineEdit) {
+			if (!context.includeInlineCompletions && !(item.isInlineEdit || item.showInlineEditMenu)) {
 				continue;
 			}
 			const inlineCompletionItem = InlineCompletionItem.from(
@@ -197,7 +197,7 @@ async function addRefAndCreateResult(
 			itemsByHash.set(inlineCompletionItem.hash(), inlineCompletionItem);
 
 			// Stop after first visible inline completion
-			if (!item.isInlineEdit && context.triggerKind === InlineCompletionTriggerKind.Automatic) {
+			if (!(item.isInlineEdit || item.showInlineEditMenu) && context.triggerKind === InlineCompletionTriggerKind.Automatic) {
 				const minifiedEdit = inlineCompletionItem.toSingleTextEdit().removeCommonPrefix(new TextModelText(model));
 				if (!minifiedEdit.isEmpty) {
 					shouldStop = true;

From def9aff5460793d0df69d2a4ccdc1d2a78a011d3 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Thu, 27 Feb 2025 11:50:11 +0100
Subject: [PATCH 0470/1815] Edits and Chat drag and drop should align again
 (#242171)

fixes https://github.com/microsoft/vscode-copilot/issues/13496
---
 .../contrib/chat/browser/chatDragAndDrop.ts   | 97 ++-----------------
 .../contrib/chat/browser/chatInputPart.ts     |  8 +-
 2 files changed, 11 insertions(+), 94 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
index 33c18caa6a1e..a99dac08677b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
@@ -10,7 +10,7 @@ import { coalesce } from '../../../../base/common/arrays.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { Mimes } from '../../../../base/common/mime.js';
-import { basename, joinPath } from '../../../../base/common/resources.js';
+import { basename } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IRange } from '../../../../editor/common/core/range.js';
 import { SymbolKinds } from '../../../../editor/common/languages.js';
@@ -18,7 +18,7 @@ import { ITextModelService } from '../../../../editor/common/services/resolverSe
 import { localize } from '../../../../nls.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { CodeDataTransfers, containsDragType, DocumentSymbolTransferData, extractEditorsDropData, extractMarkerDropData, extractSymbolDropData, IDraggedResourceEditorInput, MarkerTransferData } from '../../../../platform/dnd/browser/dnd.js';
-import { FileType, IFileService, IFileSystemProvider } from '../../../../platform/files/common/files.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
 import { MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
 import { isUntitledResourceEditorInput } from '../../../common/editor.js';
@@ -48,14 +48,14 @@ export class ChatDragAndDrop extends Themable {
 	private overlayTextBackground: string = '';
 
 	constructor(
-		protected readonly attachmentModel: ChatAttachmentModel,
+		private readonly attachmentModel: ChatAttachmentModel,
 		private readonly styles: IChatInputStyles,
 		@IThemeService themeService: IThemeService,
 		@IExtensionService private readonly extensionService: IExtensionService,
-		@IFileService protected readonly fileService: IFileService,
-		@IEditorService protected readonly editorService: IEditorService,
-		@IDialogService protected readonly dialogService: IDialogService,
-		@ITextModelService protected readonly textModelService: ITextModelService
+		@IFileService private readonly fileService: IFileService,
+		@IEditorService private readonly editorService: IEditorService,
+		@IDialogService private readonly dialogService: IDialogService,
+		@ITextModelService private readonly textModelService: ITextModelService
 	) {
 		super(themeService);
 
@@ -150,10 +150,6 @@ export class ChatDragAndDrop extends Themable {
 			return;
 		}
 
-		this.handleDrop(contexts);
-	}
-
-	protected handleDrop(contexts: IChatRequestVariableEntry[]): void {
 		this.attachmentModel.addContext(...contexts);
 	}
 
@@ -193,7 +189,7 @@ export class ChatDragAndDrop extends Themable {
 		return dropType !== undefined;
 	}
 
-	protected getDropTypeName(type: ChatDragAndDropType): string {
+	private getDropTypeName(type: ChatDragAndDropType): string {
 		switch (type) {
 			case ChatDragAndDropType.FILE_INTERNAL: return localize('file', 'File');
 			case ChatDragAndDropType.FILE_EXTERNAL: return localize('file', 'File');
@@ -412,7 +408,7 @@ export class ChatDragAndDrop extends Themable {
 		overlay.classList.toggle('visible', type !== undefined);
 	}
 
-	protected getOverlayText(type: ChatDragAndDropType): string {
+	private getOverlayText(type: ChatDragAndDropType): string {
 		const typeName = this.getDropTypeName(type);
 		return localize('attacAsContext', 'Attach {0} as Context', typeName);
 	}
@@ -428,81 +424,6 @@ export class ChatDragAndDrop extends Themable {
 	}
 }
 
-export class EditsDragAndDrop extends ChatDragAndDrop {
-
-	constructor(
-		attachmentModel: ChatAttachmentModel,
-		styles: IChatInputStyles,
-		@IThemeService themeService: IThemeService,
-		@IExtensionService extensionService: IExtensionService,
-		@IFileService fileService: IFileService,
-		@IEditorService editorService: IEditorService,
-		@IDialogService dialogService: IDialogService,
-		@ITextModelService textModelService: ITextModelService
-	) {
-		super(attachmentModel, styles, themeService, extensionService, fileService, editorService, dialogService, textModelService);
-	}
-
-	protected override handleDrop(context: IChatRequestVariableEntry[]): void {
-		this.handleDropAsync(context);
-	}
-
-	protected async handleDropAsync(context: IChatRequestVariableEntry[]): Promise<void> {
-		const nonDirectoryContext = context.filter(context => !context.isDirectory);
-		const directories = context
-			.filter(context => context.isDirectory)
-			.map(context => context.value)
-			.filter(value => !!value && URI.isUri(value));
-
-		// If there are directories, we need to resolve the files and add them to the working set
-		for (const directory of directories) {
-			const fileSystemProvider = this.fileService.getProvider(directory.scheme);
-			if (!fileSystemProvider) {
-				continue;
-			}
-
-			const resolvedFiles = await resolveFilesInDirectory(directory, fileSystemProvider, true);
-			const resolvedFileContext = await Promise.all(resolvedFiles.map(file => getResourceAttachContext(file, false, this.textModelService)));
-			nonDirectoryContext.push(...resolvedFileContext.filter(context => !!context));
-		}
-
-		super.handleDrop(nonDirectoryContext);
-	}
-
-	protected override getOverlayText(type: ChatDragAndDropType): string {
-		const typeName = this.getDropTypeName(type);
-		switch (type) {
-			case ChatDragAndDropType.FILE_INTERNAL:
-			case ChatDragAndDropType.FILE_EXTERNAL:
-				return localize('addToWorkingSet', 'Add {0} to Working Set', typeName);
-			case ChatDragAndDropType.FOLDER:
-				return localize('addToWorkingSet', 'Add {0} to Working Set', localize('files', 'Files'));
-			default:
-				return super.getOverlayText(type);
-		}
-	}
-}
-
-async function resolveFilesInDirectory(resource: URI, fileSystemProvider: IFileSystemProvider, shouldRecurse: boolean): Promise<URI[]> {
-	const entries = await fileSystemProvider.readdir(resource);
-
-	const files: URI[] = [];
-	const folders: URI[] = [];
-
-	for (const [name, type] of entries) {
-		const entryResource = joinPath(resource, name);
-		if (type === FileType.File) {
-			files.push(entryResource);
-		} else if (type === FileType.Directory && shouldRecurse) {
-			folders.push(entryResource);
-		}
-	}
-
-	const subFiles = await Promise.all(folders.map(folder => resolveFilesInDirectory(folder, fileSystemProvider, shouldRecurse)));
-
-	return [...files, ...subFiles.flat()];
-}
-
 async function getResourceAttachContext(resource: URI, isDirectory: boolean, textModelService: ITextModelService): Promise<IChatRequestVariableEntry | undefined> {
 	let isOmitted = false;
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 877f01e1088a..b2510f1cf131 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -95,7 +95,7 @@ import { toChatVariable } from './chatAttachmentModel/chatPromptAttachmentsColle
 import { hookUpResourceAttachmentDragAndContextMenu, hookUpSymbolAttachmentDragAndContextMenu } from './chatContentParts/chatAttachmentsContentPart.js';
 import { IDisposableReference } from './chatContentParts/chatCollections.js';
 import { CollapsibleListPool, IChatCollapsibleListItem } from './chatContentParts/chatReferencesContentPart.js';
-import { ChatDragAndDrop, EditsDragAndDrop } from './chatDragAndDrop.js';
+import { ChatDragAndDrop } from './chatDragAndDrop.js';
 import { ChatEditingRemoveAllFilesAction, ChatEditingShowChangesAction } from './chatEditing/chatEditingActions.js';
 import { ChatFollowups } from './chatFollowups.js';
 import { IChatViewState } from './chatWidget.js';
@@ -361,11 +361,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		super();
 
 		this._attachmentModel = this._register(this.instantiationService.createInstance(ChatAttachmentModel));
-		if (this.location === ChatAgentLocation.EditingSession) {
-			this.dnd = this._register(this.instantiationService.createInstance(EditsDragAndDrop, this.attachmentModel, styles));
-		} else {
-			this.dnd = this._register(this.instantiationService.createInstance(ChatDragAndDrop, this.attachmentModel, styles));
-		}
+		this.dnd = this._register(this.instantiationService.createInstance(ChatDragAndDrop, this._attachmentModel, styles));
 
 		this.getInputState = (): IChatInputState => {
 			return {

From 153a3faa7074f43d2aeeb81695c62dc8c719bf91 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Thu, 27 Feb 2025 12:06:02 +0100
Subject: [PATCH 0471/1815] Comments panel: Line numbers too far to the right
 (#242175)

Fixes #239221
---
 src/vs/workbench/contrib/comments/browser/media/panel.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/comments/browser/media/panel.css b/src/vs/workbench/contrib/comments/browser/media/panel.css
index e6c66b601742..971e079b14ce 100644
--- a/src/vs/workbench/contrib/comments/browser/media/panel.css
+++ b/src/vs/workbench/contrib/comments/browser/media/panel.css
@@ -105,6 +105,7 @@
 
 .comments-panel .comments-panel-container .tree-container .comment-thread-container .range {
 	opacity: 0.8;
+	overflow: visible;
 }
 
 .comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-snippet-container .text code {

From bd4ab867f9ca31105f05032cf09edbce31fc6fe3 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 27 Feb 2025 12:45:04 +0100
Subject: [PATCH 0472/1815] status - partially restore locations (#242180)

---
 src/vs/workbench/browser/parts/editor/editorStatus.ts         | 2 +-
 src/vs/workbench/common/notifications.ts                      | 2 +-
 src/vs/workbench/services/progress/browser/progressService.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index e4213505fa04..1b5c562771cf 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -994,7 +994,7 @@ class ShowCurrentMarkerInStatusbarContribution extends Disposable {
 				const line = splitLines(this.currentMarker.message)[0];
 				const text = `${this.getType(this.currentMarker)} ${line}`;
 				if (!this.statusBarEntryAccessor.value) {
-					this.statusBarEntryAccessor.value = this.statusbarService.addEntry({ name: localize('currentProblem', "Current Problem"), text, ariaLabel: text }, 'statusbar.currentProblem', StatusbarAlignment.LEFT, { location: { id: 'status.problems', priority: 50 }, alignment: StatusbarAlignment.RIGHT });
+					this.statusBarEntryAccessor.value = this.statusbarService.addEntry({ name: localize('currentProblem', "Current Problem"), text, ariaLabel: text }, 'statusbar.currentProblem', StatusbarAlignment.LEFT);
 				} else {
 					this.statusBarEntryAccessor.value.update({ name: localize('currentProblem', "Current Problem"), text, ariaLabel: text });
 				}
diff --git a/src/vs/workbench/common/notifications.ts b/src/vs/workbench/common/notifications.ts
index 31cef956ceb2..6a690593672a 100644
--- a/src/vs/workbench/common/notifications.ts
+++ b/src/vs/workbench/common/notifications.ts
@@ -29,7 +29,7 @@ export interface INotificationsModel {
 	//#endregion
 
 
-	//#region  Notifications as Status
+	//#region Notifications as Status
 
 	readonly statusMessage: IStatusMessageViewItem | undefined;
 
diff --git a/src/vs/workbench/services/progress/browser/progressService.ts b/src/vs/workbench/services/progress/browser/progressService.ts
index 994f4d17ae85..18bffc2561db 100644
--- a/src/vs/workbench/services/progress/browser/progressService.ts
+++ b/src/vs/workbench/services/progress/browser/progressService.ts
@@ -190,7 +190,7 @@ export class ProgressService extends Disposable implements IProgressService {
 			if (this.windowProgressStatusEntry) {
 				this.windowProgressStatusEntry.update(statusEntryProperties);
 			} else {
-				this.windowProgressStatusEntry = this.statusbarService.addEntry(statusEntryProperties, 'status.progress', StatusbarAlignment.LEFT, Number.NEGATIVE_INFINITY /* last entry */);
+				this.windowProgressStatusEntry = this.statusbarService.addEntry(statusEntryProperties, 'status.progress', StatusbarAlignment.LEFT, -Number.MAX_VALUE /* almost last entry */);
 			}
 		}
 

From 6a06fb719e3a44ce546ecd7a75e484fc584df9d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joaomoreno@users.noreply.github.com>
Date: Thu, 27 Feb 2025 15:42:12 +0100
Subject: [PATCH 0473/1815] rename untrackedChangesEnableTrash to
 discardUntrackedChangesToTrash (#242186)

---
 extensions/git/package.json      | 4 ++--
 extensions/git/package.nls.json  | 2 +-
 extensions/git/src/commands.ts   | 8 ++++----
 extensions/git/src/repository.ts | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extensions/git/package.json b/extensions/git/package.json
index e35d19e0fb05..23feced6ea1b 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3323,10 +3323,10 @@
           "markdownDescription": "%config.diagnosticsCommitHook.Sources%",
           "scope": "resource"
         },
-        "git.untrackedChangesEnableTrash": {
+        "git.discardUntrackedChangesToTrash": {
           "type": "boolean",
           "default": true,
-          "markdownDescription": "%config.untrackedChangesEnableTrash%"
+          "markdownDescription": "%config.discardUntrackedChangesToTrash%"
         }
       }
     },
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index dcd6783a735a..ec511106e142 100644
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -288,7 +288,7 @@
 	"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`.",
-	"config.untrackedChangesEnableTrash": "Controls whether discarding untracked changes moves the file(s) to the Recycle Bin (Windows), Trash (macOS, Linux) instead of deleting them permanently. **Note:** This setting has no effect when connected to a remote.",
+	"config.discardUntrackedChangesToTrash": "Controls whether discarding untracked changes moves the file(s) to the Recycle Bin (Windows), Trash (macOS, Linux) instead of deleting them permanently. **Note:** This setting has no effect when connected to a remote.",
 	"submenu.explorer": "Git",
 	"submenu.commit": "Commit",
 	"submenu.commit.amend": "Amend",
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 43746097e20f..0c2d805bb03f 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -2175,9 +2175,9 @@ export class CommandCenter {
 
 	private getDiscardUntrackedChangesDialogDetails(resources: Resource[]): [string, string, string] {
 		const config = workspace.getConfiguration('git');
-		const untrackedChangesEnableTrash = config.get<boolean>('untrackedChangesEnableTrash', true) && !isRemote;
+		const discardUntrackedChangesToTrash = config.get<boolean>('discardUntrackedChangesToTrash', true) && !isRemote;
 
-		const messageWarning = !untrackedChangesEnableTrash
+		const messageWarning = !discardUntrackedChangesToTrash
 			? resources.length === 1
 				? '\n\nThis is IRREVERSIBLE!\nThis file will be FOREVER LOST if you proceed.'
 				: '\n\nThis is IRREVERSIBLE!\nThese files will be FOREVER LOST if you proceed.'
@@ -2187,7 +2187,7 @@ export class CommandCenter {
 			? l10n.t('Are you sure you want to DELETE the following untracked file: \'{0}\'?{1}', path.basename(resources[0].resourceUri.fsPath), messageWarning)
 			: l10n.t('Are you sure you want to DELETE the {0} untracked files?{1}', resources.length, messageWarning);
 
-		const messageDetail = untrackedChangesEnableTrash
+		const messageDetail = discardUntrackedChangesToTrash
 			? isWindows
 				? resources.length === 1
 					? 'You can restore this file from the Recycle Bin.'
@@ -2197,7 +2197,7 @@ export class CommandCenter {
 					: 'You can restore these files from the Trash.'
 			: '';
 
-		const primaryAction = untrackedChangesEnableTrash
+		const primaryAction = discardUntrackedChangesToTrash
 			? isWindows
 				? l10n.t('Move to Recycle Bin')
 				: l10n.t('Move to Trash')
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index ac1832aada90..c537bb23ff1d 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -1349,7 +1349,7 @@ export class Repository implements Disposable {
 
 	async clean(resources: Uri[]): Promise<void> {
 		const config = workspace.getConfiguration('git');
-		const untrackedChangesEnableTrash = config.get<boolean>('untrackedChangesEnableTrash', true) && !isRemote;
+		const discardUntrackedChangesToTrash = config.get<boolean>('discardUntrackedChangesToTrash', true) && !isRemote;
 
 		await this.run(
 			Operation.Clean(!this.optimisticUpdateEnabled()),
@@ -1388,7 +1388,7 @@ export class Repository implements Disposable {
 					}
 				});
 
-				if (untrackedChangesEnableTrash) {
+				if (discardUntrackedChangesToTrash) {
 					const limiter = new Limiter<void>(5);
 					await Promise.all(toClean.map(fsPath => limiter.queue(
 						async () => await workspace.fs.delete(Uri.file(fsPath), { useTrash: true }))));

From d88e573b5b63dfe0b2ad2aa80de25da8d55dc714 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Thu, 27 Feb 2025 16:05:53 +0100
Subject: [PATCH 0474/1815] fuzzy matching folder names (#242190)

https://github.com/microsoft/vscode-copilot/issues/13497
---
 .../browser/contrib/chatDynamicVariables.ts   | 40 +++++++++++++++++--
 .../browser/contrib/chatInputCompletions.ts   |  2 +-
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
index 533e954c8b1d..7d2709132c67 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
@@ -394,6 +394,7 @@ export async function createFolderQuickPick(accessor: ServicesAccessor): Promise
 					searchFolders(
 						workspace,
 						value,
+						true,
 						undefined,
 						undefined,
 						configurationService,
@@ -421,6 +422,7 @@ export async function createFolderQuickPick(accessor: ServicesAccessor): Promise
 			type: 'item',
 			id: folder.toString(),
 			resource: folder,
+			alwaysShow: true,
 			label: basename(folder),
 			description: labelService.getUriLabel(dirname(folder), { relative: true }),
 			iconClass: ThemeIcon.asClassName(Codicon.folder),
@@ -451,11 +453,14 @@ export async function getTopLevelFolders(workspaces: URI[], fileService: IFileSe
 export async function searchFolders(
 	workspace: URI,
 	pattern: string,
+	fuzzyMatch: boolean,
 	token: CancellationToken | undefined,
 	cacheKey: string | undefined,
 	configurationService: IConfigurationService,
 	searchService: ISearchService
 ): Promise<URI[]> {
+	const segmentMatchPattern = caseInsensitiveGlobPattern(fuzzyMatch ? fuzzyMatchingGlobPattern(pattern) : continousMatchingGlobPattern(pattern));
+
 	const searchExcludePattern = getExcludes(configurationService.getValue<ISearchConfiguration>({ resource: workspace })) || {};
 	const searchOptions: IFileQuery = {
 		folderQueries: [{
@@ -470,7 +475,7 @@ export async function searchFolders(
 
 	let folderResults: ISearchComplete | undefined;
 	try {
-		folderResults = await searchService.fileSearch({ ...searchOptions, filePattern: `**/*${pattern}*/**` }, token);
+		folderResults = await searchService.fileSearch({ ...searchOptions, filePattern: `**/${segmentMatchPattern}/**` }, token);
 	} catch (e) {
 		if (!isCancellationError(e)) {
 			throw e;
@@ -481,13 +486,40 @@ export async function searchFolders(
 		return [];
 	}
 
-	const folderResources = getMatchingFoldersFromFiles(folderResults.results.map(result => result.resource), workspace, pattern);
+	const folderResources = getMatchingFoldersFromFiles(folderResults.results.map(result => result.resource), workspace, segmentMatchPattern);
 	return folderResources;
 }
 
+function fuzzyMatchingGlobPattern(pattern: string): string {
+	if (!pattern) {
+		return '*';
+	}
+	return '*' + pattern.split('').join('*') + '*';
+}
+
+function continousMatchingGlobPattern(pattern: string): string {
+	if (!pattern) {
+		return '*';
+	}
+	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, pattern: string): URI[] {
+function getMatchingFoldersFromFiles(resources: URI[], workspace: URI, segmentMatchPattern: string): URI[] {
 	const uniqueFolders = new ResourceSet();
 	for (const resource of resources) {
 		const relativePathToRoot = relativePath(workspace, resource);
@@ -507,7 +539,7 @@ function getMatchingFoldersFromFiles(resources: URI[], workspace: URI, pattern:
 	for (const folderResource of uniqueFolders) {
 		const stats = folderResource.path.split('/');
 		const dirStat = stats[stats.length - 1];
-		if (!dirStat || !glob.match(`*${pattern}*`, dirStat)) {
+		if (!dirStat || !glob.match(segmentMatchPattern, dirStat)) {
 			continue;
 		}
 
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
index 2b6c3ba35d38..60ce746437cb 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
@@ -808,7 +808,7 @@ class BuiltinDynamicCompletions extends Disposable {
 
 			const cacheKey = this.updateCacheKey();
 
-			const folders = await Promise.all(workspaces.map(workspace => searchFolders(workspace, pattern, token, cacheKey.key, this.configurationService, this.searchService)));
+			const folders = await Promise.all(workspaces.map(workspace => searchFolders(workspace, pattern, true, token, cacheKey.key, this.configurationService, this.searchService)));
 			for (const resource of folders.flat()) {
 				if (seen.has(resource)) {
 					// already included via history

From 25c371614f975db455641b053fc1a90e514a7fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joaomoreno@users.noreply.github.com>
Date: Thu, 27 Feb 2025 16:36:12 +0100
Subject: [PATCH 0475/1815] disable untrackedChangesEnableTrash in linux snap
 (#242188)

* disable untrackedChangesEnableTrash in linux snap

related to #241476
cc @lszomoru

* missing isLinuxSnap check
---
 extensions/git/package.nls.json  | 2 +-
 extensions/git/src/commands.ts   | 4 ++--
 extensions/git/src/repository.ts | 4 ++--
 extensions/git/src/util.ts       | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index ec511106e142..101618a8e451 100644
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -288,7 +288,7 @@
 	"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`.",
-	"config.discardUntrackedChangesToTrash": "Controls whether discarding untracked changes moves the file(s) to the Recycle Bin (Windows), Trash (macOS, Linux) instead of deleting them permanently. **Note:** This setting has no effect when connected to a remote.",
+	"config.discardUntrackedChangesToTrash": "Controls whether discarding untracked changes moves the file(s) to the Recycle Bin (Windows), Trash (macOS, Linux) instead of deleting them permanently. **Note:** This setting has no effect when connected to a remote or when running in Linux as a snap package.",
 	"submenu.explorer": "Git",
 	"submenu.commit": "Commit",
 	"submenu.commit.amend": "Amend",
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 0c2d805bb03f..fa566adbeadd 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -14,7 +14,7 @@ import { Model } from './model';
 import { GitResourceGroup, Repository, Resource, ResourceGroupType } from './repository';
 import { DiffEditorSelectionHunkToolbarContext, applyLineChanges, getIndexDiffInformation, getModifiedRange, getWorkingTreeDiffInformation, intersectDiffWithRange, invertLineChange, toLineChanges, toLineRanges } from './staging';
 import { fromGitUri, toGitUri, isGitUri, toMergeUris, toMultiFileDiffEditorUris } from './uri';
-import { DiagnosticSeverityConfig, dispose, getCommitShortHash, grep, isDefined, isDescendant, isRemote, isWindows, pathEquals, relativePath, toDiagnosticSeverity, truncate } from './util';
+import { DiagnosticSeverityConfig, dispose, getCommitShortHash, grep, isDefined, isDescendant, isLinuxSnap, isRemote, isWindows, pathEquals, relativePath, toDiagnosticSeverity, truncate } from './util';
 import { GitTimelineItem } from './timelineProvider';
 import { ApiRepository } from './api/api1';
 import { getRemoteSourceActions, pickRemoteSource } from './remoteSource';
@@ -2175,7 +2175,7 @@ export class CommandCenter {
 
 	private getDiscardUntrackedChangesDialogDetails(resources: Resource[]): [string, string, string] {
 		const config = workspace.getConfiguration('git');
-		const discardUntrackedChangesToTrash = config.get<boolean>('discardUntrackedChangesToTrash', true) && !isRemote;
+		const discardUntrackedChangesToTrash = config.get<boolean>('discardUntrackedChangesToTrash', true) && !isRemote && !isLinuxSnap;
 
 		const messageWarning = !discardUntrackedChangesToTrash
 			? resources.length === 1
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index c537bb23ff1d..25445d2668c8 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -22,7 +22,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, isRemote, Limiter, onceEvent, pathEquals, relativePath } from './util';
+import { anyEvent, combinedDisposable, debounceEvent, dispose, EmptyDisposable, eventToPromise, filterEvent, find, getCommitShortHash, IDisposable, isDescendant, isLinuxSnap, isRemote, Limiter, onceEvent, pathEquals, relativePath } from './util';
 import { IFileWatcher, watch } from './watch';
 import { ISourceControlHistoryItemDetailsProviderRegistry } from './historyItemDetailsProvider';
 
@@ -1349,7 +1349,7 @@ export class Repository implements Disposable {
 
 	async clean(resources: Uri[]): Promise<void> {
 		const config = workspace.getConfiguration('git');
-		const discardUntrackedChangesToTrash = config.get<boolean>('discardUntrackedChangesToTrash', true) && !isRemote;
+		const discardUntrackedChangesToTrash = config.get<boolean>('discardUntrackedChangesToTrash', true) && !isRemote && !isLinuxSnap;
 
 		await this.run(
 			Operation.Clean(!this.optimisticUpdateEnabled()),
diff --git a/extensions/git/src/util.ts b/extensions/git/src/util.ts
index 9565b7e5171d..7dd1cbafbdf0 100644
--- a/extensions/git/src/util.ts
+++ b/extensions/git/src/util.ts
@@ -12,6 +12,8 @@ import byline from 'byline';
 export const isMacintosh = process.platform === 'darwin';
 export const isWindows = process.platform === 'win32';
 export const isRemote = env.remoteName !== undefined;
+export const isLinux = process.platform === 'linux';
+export const isLinuxSnap = isLinux && !!process.env['SNAP'] && !!process.env['SNAP_REVISION'];
 
 export function log(...args: any[]): void {
 	console.log.apply(console, ['git:', ...args]);

From 8e99f3d4377b6b95b4345e688404d19445f432bf Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Thu, 27 Feb 2025 16:40:25 +0100
Subject: [PATCH 0476/1815] rename chatEdits.minimapColor to
 minimap.chatEditHighlight (#242194)

---
 .../chat/browser/chatEditing/chatEditingModifiedFileEntry.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
index df0a5bd60521..813bc0e3eb1f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
@@ -33,7 +33,7 @@ class AutoAcceptControl {
 	) { }
 }
 
-export const pendingRewriteMinimap = registerColor('chatEdits.minimapColor',
+export const pendingRewriteMinimap = registerColor('minimap.chatEditHighlight',
 	transparent(editorBackground, 0.6),
 	localize('editorSelectionBackground', "Color of pending edit regions in the minimap"));
 

From ba563bda3cb8a32a6ca4e025fe80c7d89940add3 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 27 Feb 2025 16:45:40 +0100
Subject: [PATCH 0477/1815] chat - tweak completions setting from status
 (#242189)

---
 .../contrib/chat/browser/chatStatus.ts        | 38 ++++++++++++++-----
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 8ef5818af694..8b6eb985cd35 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -36,6 +36,8 @@ import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Gesture, EventType as TouchEventType } from '../../../../base/browser/touch.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
+import { isObject } from '../../../../base/common/types.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
 
 //#region --- colors
 
@@ -109,7 +111,8 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		@ICommandService private readonly commandService: ICommandService,
 		@IHoverService private readonly hoverService: IHoverService,
 		@IEditorService private readonly editorService: IEditorService,
-		@IProductService private readonly productService: IProductService
+		@IProductService private readonly productService: IProductService,
+		@ILanguageService private readonly languageService: ILanguageService
 	) {
 		super();
 
@@ -370,27 +373,42 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	}
 
 	private createSettings(container: HTMLElement, disposables: DisposableStore): HTMLElement {
-		const languageId = this.editorService.activeTextEditorLanguageId;
+		const language = this.editorService.activeTextEditorLanguageId;
 		const settings = container.appendChild($('div.settings'));
 
 		// --- Code Completions
 		{
-			const settingId = 'github.copilot.editor.enableAutoCompletions';
 			const globalSetting = append(settings, $('div.setting'));
-			this.createSetting(globalSetting, localize('settings.codeCompletions', "Code completions (all)"), { key: settingId, override: undefined }, disposables);
+			this.createCodeCompletionsSetting(globalSetting, localize('settings.codeCompletions', "Code completions (all files)"), '*', disposables);
 
-			if (languageId) {
+			if (language) {
 				const languageSetting = append(settings, $('div.setting'));
-				this.createSetting(languageSetting, localize('settings.codeCompletionsLanguage', "Code completions ({0})", languageId), { key: settingId, override: languageId }, disposables);
+				this.createCodeCompletionsSetting(languageSetting, localize('settings.codeCompletionsLanguage', "Code completions ({0})", this.languageService.getLanguageName(language) ?? language), language, disposables);
 			}
 		}
 
 		return settings;
 	}
 
-	private createSetting(container: HTMLElement, label: string, setting: { key: string; override: string | undefined }, disposables: DisposableStore): void {
-		const readSetting = () => Boolean(this.configurationService.getValue<boolean>(setting.key, { overrideIdentifier: setting.override }));
-		const writeSetting = (checkbox: Checkbox) => this.configurationService.updateValue(setting.key, checkbox.checked, { overrideIdentifier: setting.override });
+	private createCodeCompletionsSetting(container: HTMLElement, label: string, language: string, disposables: DisposableStore): void {
+		const settingId = 'github.copilot.enable';
+
+		const readSetting = () => {
+			const result = this.configurationService.getValue<Record<string, boolean>>(settingId);
+			if (!isObject(result)) {
+				return false;
+			}
+
+			return Boolean(result[language]);
+		};
+		const writeSetting = (checkbox: Checkbox) => {
+			let result = this.configurationService.getValue<Record<string, boolean>>(settingId);
+			if (!isObject(result)) {
+				result = Object.create(null);
+			}
+
+			return this.configurationService.updateValue(settingId, { ...result, [language]: checkbox.checked });
+		};
 
 		const settingCheckbox = disposables.add(new Checkbox(label, readSetting(), defaultCheckboxStyles));
 		container.appendChild(settingCheckbox.domNode);
@@ -414,7 +432,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		}));
 
 		disposables.add(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(setting.key, { overrideIdentifier: setting.override })) {
+			if (e.affectsConfiguration(settingId)) {
 				settingCheckbox.checked = readSetting();
 			}
 		}));

From 27a7e11b55a57a13ac80b35b18fb7c983b1ec601 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 27 Feb 2025 16:47:45 +0100
Subject: [PATCH 0478/1815] chat - make ootb consistent for shortcuts (#242197)

---
 .../workbench/browser/parts/editor/editorGroupWatermark.ts  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts b/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts
index 0c7e37ccc097..541b7ab1b90d 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts
@@ -38,8 +38,10 @@ const findInFiles: WatermarkEntry = { text: localize('watermark.findInFiles', "F
 const toggleTerminal: WatermarkEntry = { text: localize({ key: 'watermark.toggleTerminal', comment: ['toggle is a verb here'] }, "Toggle Terminal"), id: 'workbench.action.terminal.toggleTerminal', when: { web: ContextKeyExpr.equals('terminalProcessSupported', true) } };
 const startDebugging: WatermarkEntry = { text: localize('watermark.startDebugging', "Start Debugging"), id: 'workbench.action.debug.start', when: { web: ContextKeyExpr.equals('terminalProcessSupported', true) } };
 const openSettings: WatermarkEntry = { text: localize('watermark.openSettings', "Open Settings"), id: 'workbench.action.openSettings' };
-const openChat: WatermarkEntry = { text: localize('watermark.openChat', "Open Chat"), id: 'workbench.action.chat.open', when: { native: ContextKeyExpr.equals('chatSetupInstalled', true), web: ContextKeyExpr.equals('chatSetupInstalled', true) } };
-const openCopilotEdits: WatermarkEntry = { text: localize('watermark.openCopilotEdits', "Open Copilot Edits"), id: 'workbench.action.chat.openEditSession', when: { native: ContextKeyExpr.equals('chatSetupInstalled', true), web: ContextKeyExpr.equals('chatSetupInstalled', true) } };
+
+const showCopilot = ContextKeyExpr.or(ContextKeyExpr.equals('chatSetupHidden', false), ContextKeyExpr.equals('chatSetupInstalled', true));
+const openChat: WatermarkEntry = { text: localize('watermark.openChat', "Open Chat"), id: 'workbench.action.chat.open', when: { native: showCopilot, web: showCopilot } };
+const openCopilotEdits: WatermarkEntry = { text: localize('watermark.openCopilotEdits', "Open Copilot Edits"), id: 'workbench.action.chat.openEditSession', when: { native: showCopilot, web: showCopilot } };
 
 const emptyWindowEntries: WatermarkEntry[] = coalesce([
 	showCommands,

From 04edc751542bc7b86bca6d2c0f5349d1ad583d24 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 27 Feb 2025 16:53:59 +0100
Subject: [PATCH 0479/1815] chat - add quick chat to status (#242199)

---
 src/vs/workbench/contrib/chat/browser/chatStatus.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 8b6eb985cd35..e61dc1df8be6 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -333,7 +333,8 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 				CTX_INLINE_CHAT_POSSIBLE,
 				EditorContextKeys.writable,
 				EditorContextKeys.editorSimpleInput.negate()
-			)) ? { text: localize('shortcuts.inlineChat', "Inline Chat"), id: 'inlineChat.start' } : undefined
+			)) ? { text: localize('shortcuts.inlineChat', "Inline Chat"), id: 'inlineChat.start' } : undefined,
+			{ text: localize('shortcuts.quickChat', "Quick Chat"), id: 'workbench.action.quickchat.toggle' },
 		]);
 
 		const onTrigger = (commandId: string, e: EventLike) => {
@@ -358,7 +359,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 			disposables.add(Gesture.addTarget(shortcut));
 			[EventType.CLICK, TouchEventType.Tap].forEach(eventType => {
-				disposables.add(addDisposableListener(shortcuts, eventType, e => onTrigger(entry.id, e)));
+				disposables.add(addDisposableListener(shortcut, eventType, e => onTrigger(entry.id, e)));
 			});
 
 			disposables.add(addDisposableListener(shortcut, EventType.KEY_DOWN, e => {

From fc6f977554899ca163622ca5979c0fed756e9c9f Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Thu, 27 Feb 2025 16:59:15 +0100
Subject: [PATCH 0480/1815] Adding mime type to support remote folder dnd
 (#242200)

https://github.com/microsoft/vscode-copilot/issues/13491
---
 src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
index a99dac08677b..0de0ecc7d072 100644
--- a/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.ts
@@ -176,7 +176,7 @@ export class ChatDragAndDrop extends Themable {
 			return ChatDragAndDropType.FILE_EXTERNAL;
 		} else if (containsDragType(e, DataTransfers.INTERNAL_URI_LIST)) {
 			return ChatDragAndDropType.FILE_INTERNAL;
-		} else if (containsDragType(e, Mimes.uriList, CodeDataTransfers.FILES)) {
+		} else if (containsDragType(e, Mimes.uriList, CodeDataTransfers.FILES, DataTransfers.RESOURCES)) {
 			return ChatDragAndDropType.FOLDER;
 		}
 

From 5b8244c3c6b44b0ce1ce857b2a8d245b2d2d56e0 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 27 Feb 2025 17:32:45 +0100
Subject: [PATCH 0481/1815] chat - reduce contributions blocking startup
 (#242203)

---
 .../contrib/chat/browser/chatStatus.ts        |  2 +-
 .../browser/extensions.contribution.ts        |  9 +++++++-
 .../browser/extensionsWorkbenchService.ts     | 23 -------------------
 3 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index e61dc1df8be6..5848ca22b3c1 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -163,7 +163,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		let text = '$(copilot)';
 		let ariaLabel = localize('chatStatus', "Copilot Status");
 		let command: string | Command = TOGGLE_CHAT_ACTION_ID;
-		let tooltip: TooltipContent = localize('openChat', "Open Chat ({0})", this.keybindingService.lookupKeybinding(command)?.getLabel() ?? '');
+		let tooltip: TooltipContent;
 		let kind: StatusbarEntryKind | undefined;
 
 		// Quota Exceeded
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index 35d83e17b79b..e30163945172 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -13,7 +13,7 @@ import { EnablementState, IExtensionManagementServerService, IPublisherInfo, IWo
 import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from '../../../common/contributions.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
-import { VIEWLET_ID, IExtensionsWorkbenchService, IExtensionsViewPaneContainer, TOGGLE_IGNORE_EXTENSION_ACTION_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, IWorkspaceRecommendedExtensionsView, AutoUpdateConfigurationKey, HasOutdatedExtensionsContext, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, ExtensionEditorTab, THEME_ACTIONS_GROUP, INSTALL_ACTIONS_GROUP, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu, UPDATE_ACTIONS_GROUP, IExtensionArg, ExtensionRuntimeActionType, EXTENSIONS_CATEGORY } from '../common/extensions.js';
+import { VIEWLET_ID, IExtensionsWorkbenchService, IExtensionsViewPaneContainer, TOGGLE_IGNORE_EXTENSION_ACTION_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, IWorkspaceRecommendedExtensionsView, AutoUpdateConfigurationKey, HasOutdatedExtensionsContext, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, ExtensionEditorTab, THEME_ACTIONS_GROUP, INSTALL_ACTIONS_GROUP, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu, UPDATE_ACTIONS_GROUP, IExtensionArg, ExtensionRuntimeActionType, EXTENSIONS_CATEGORY, AutoRestartConfigurationKey } from '../common/extensions.js';
 import { InstallSpecificVersionOfExtensionAction, ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, SetColorThemeAction, SetFileIconThemeAction, SetProductIconThemeAction, ClearLanguageAction, ToggleAutoUpdateForExtensionAction, ToggleAutoUpdatesForPublisherAction, TogglePreReleaseExtensionAction, InstallAnotherVersionAction, InstallAction } from './extensionsActions.js';
 import { ExtensionsInput } from '../common/extensionsInput.js';
 import { ExtensionEditor } from './extensionEditor.js';
@@ -79,6 +79,7 @@ import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uri
 import { IConfigurationMigrationRegistry, Extensions as ConfigurationMigrationExtensions } from '../../../common/configuration.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import product from '../../../../platform/product/common/product.js';
 
 // Singletons
 registerSingleton(IExtensionsWorkbenchService, ExtensionsWorkbenchService, InstantiationType.Eager /* Auto updates extensions */);
@@ -265,6 +266,12 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 				scope: ConfigurationScope.APPLICATION,
 				included: isNative
 			},
+			[AutoRestartConfigurationKey]: {
+				type: 'boolean',
+				description: localize('autoRestart', "If activated, extensions will automatically restart following an update if the window is not in focus. There can be a data loss if you have open Notebooks or Custom Editors."),
+				default: false,
+				included: product.quality !== 'stable'
+			},
 			[UseUnpkgResourceApiConfigKey]: {
 				type: 'boolean',
 				description: localize('extensions.gallery.useUnpkgResourceApi', "When enabled, extensions to update are fetched from Unpkg service."),
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index 460e36296d3c..74f8e88fb618 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -63,8 +63,6 @@ import { areApiProposalsCompatible, isEngineValid } from '../../../../platform/e
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { ShowCurrentReleaseNotesActionId } from '../../update/common/update.js';
-import { Registry } from '../../../../platform/registry/common/platform.js';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
 import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
@@ -1020,30 +1018,9 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 
 		urlService.registerHandler(this);
 
-		if (this.productService.quality !== 'stable') {
-			this.registerAutoRestartConfig();
-		}
-
 		this.whenInitialized = this.initialize();
 	}
 
-	private registerAutoRestartConfig(): void {
-		Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
-			.registerConfiguration({
-				id: 'extensions',
-				order: 30,
-				title: nls.localize('extensionsConfigurationTitle', "Extensions"),
-				type: 'object',
-				properties: {
-					[AutoRestartConfigurationKey]: {
-						type: 'boolean',
-						description: nls.localize('autoRestart', "If activated, extensions will automatically restart following an update if the window is not in focus. There can be a data loss if you have open Notebooks or Custom Editors."),
-						default: false,
-					}
-				}
-			});
-	}
-
 	private async initialize(): Promise<void> {
 		// initialize local extensions
 		await Promise.all([this.queryLocal(), this.extensionService.whenInstalledExtensionsRegistered()]);

From acbcb2b7ecca10ee1a28dcf5a7e8f296f83f6525 Mon Sep 17 00:00:00 2001
From: meganrogge <merogge@microsoft.com>
Date: Thu, 27 Feb 2025 11:09:47 -0600
Subject: [PATCH 0482/1815] update comment

---
 extensions/terminal-suggest/src/terminalSuggestMain.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 3f181bcd5876..15fccf2e6be2 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -169,7 +169,7 @@ export async function resolveCwdFromPrefix(prefix: string, currentCwd?: vscode.U
 		// Ignore errors
 	}
 
-	// If the prefix is not a folder, return the current cwd
+	// No valid path found
 	return undefined;
 }
 

From 9ca120452183f7746681406b4df44c5e2b7673c1 Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <2644648+TylerLeonhardt@users.noreply.github.com>
Date: Thu, 27 Feb 2025 09:47:41 -0800
Subject: [PATCH 0483/1815] Doc calling out GitHub OAuth client secret behavior
 (#242210)

---
 extensions/github-authentication/src/config.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extensions/github-authentication/src/config.ts b/extensions/github-authentication/src/config.ts
index 30b9dd662653..8cd3a9ed7931 100644
--- a/extensions/github-authentication/src/config.ts
+++ b/extensions/github-authentication/src/config.ts
@@ -10,6 +10,10 @@ export interface IConfig {
 }
 
 // For easy access to mixin client ID and secret
+//
+// NOTE: GitHub client secrets cannot be secured when running in a native client so in other words, the client secret is
+// not really a secret... so we allow the client secret in code. It is brought in before we publish VS Code. Reference:
+// https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/best-practices-for-creating-an-oauth-app#client-secrets
 export const Config: IConfig = {
 	gitHubClientId: '01ab8ac9400c4e429b23'
 };

From 6b92583707d8c4e07ca51b7782cf12edda07e785 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 27 Feb 2025 19:00:14 +0100
Subject: [PATCH 0484/1815] chat - remove hardcoded quota massaging (#242214)

---
 src/vs/workbench/contrib/chat/common/chatQuotasService.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/common/chatQuotasService.ts b/src/vs/workbench/contrib/chat/common/chatQuotasService.ts
index e79bcf34a58c..9d4a350a72c0 100644
--- a/src/vs/workbench/contrib/chat/common/chatQuotasService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatQuotasService.ts
@@ -117,8 +117,7 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 	private massageQuotas(quotas: IChatQuotas): IChatQuotas {
 		return {
 			...quotas,
-			chatTotal: typeof quotas.chatTotal === 'number' ? Math.floor(quotas.chatTotal / 10) : undefined,
-			chatRemaining: typeof quotas.chatRemaining === 'number' ? Math.floor(Math.max(0, quotas.chatRemaining) / 10) : undefined,
+			chatRemaining: typeof quotas.chatRemaining === 'number' ? Math.max(0, quotas.chatRemaining) : undefined,
 			completionsRemaining: typeof quotas.completionsRemaining === 'number' ? Math.max(0, quotas.completionsRemaining) : undefined
 		};
 	}

From 477d7c4f6393b09b7d32d091e1c78709521e828f Mon Sep 17 00:00:00 2001
From: Anthony Kim <62267334+anthonykim1@users.noreply.github.com>
Date: Thu, 27 Feb 2025 10:10:09 -0800
Subject: [PATCH 0485/1815] Fix issue where remote and virtual linux did not
 get env reporting (#242207)

fix issue where remote and virtual linux did not get env reporting
---
 src/vs/server/node/remoteTerminalChannel.ts                    | 3 ++-
 .../contrib/terminal/browser/remoteTerminalBackend.ts          | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/server/node/remoteTerminalChannel.ts b/src/vs/server/node/remoteTerminalChannel.ts
index 279c5113240e..325e8db1c517 100644
--- a/src/vs/server/node/remoteTerminalChannel.ts
+++ b/src/vs/server/node/remoteTerminalChannel.ts
@@ -201,7 +201,8 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
 			reconnectionProperties: args.shellLaunchConfig.reconnectionProperties,
 			type: args.shellLaunchConfig.type,
 			isFeatureTerminal: args.shellLaunchConfig.isFeatureTerminal,
-			tabActions: args.shellLaunchConfig.tabActions
+			tabActions: args.shellLaunchConfig.tabActions,
+			shellIntegrationEnvironmentReporting: args.shellLaunchConfig.shellIntegrationEnvironmentReporting,
 		};
 
 
diff --git a/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts b/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
index f256d72e4c42..03c08c8151da 100644
--- a/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
+++ b/src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts
@@ -190,6 +190,7 @@ class RemoteTerminalBackend extends BaseTerminalBackend implements ITerminalBack
 			type: shellLaunchConfig.type,
 			isFeatureTerminal: shellLaunchConfig.isFeatureTerminal,
 			tabActions: shellLaunchConfig.tabActions,
+			shellIntegrationEnvironmentReporting: shellLaunchConfig.shellIntegrationEnvironmentReporting,
 		};
 		const activeWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot();
 

From 73b48e98f556cb50b7de300f8f3d907e2538aaf4 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 27 Feb 2025 12:27:36 -0600
Subject: [PATCH 0486/1815] provide `activeEditorState` setting completion
 (#242216)

fixes #241880
---
 extensions/configuration-editing/src/settingsDocumentHelper.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/configuration-editing/src/settingsDocumentHelper.ts b/extensions/configuration-editing/src/settingsDocumentHelper.ts
index 6135df5315a5..12b50f31759d 100644
--- a/extensions/configuration-editing/src/settingsDocumentHelper.ts
+++ b/extensions/configuration-editing/src/settingsDocumentHelper.ts
@@ -127,7 +127,7 @@ export class SettingsDocument {
 		completions.push(this.newSimpleCompletionItem(getText('separator'), range, vscode.l10n.t("a conditional separator (' - ') that only shows when surrounded by variables with values")));
 		completions.push(this.newSimpleCompletionItem(getText('activeRepositoryName'), range, vscode.l10n.t("the name of the active repository (e.g. vscode)")));
 		completions.push(this.newSimpleCompletionItem(getText('activeRepositoryBranchName'), range, vscode.l10n.t("the name of the active branch in the active repository (e.g. main)")));
-
+		completions.push(this.newSimpleCompletionItem(getText('activeEditorState'), range, vscode.l10n.t("the state of the active editor (e.g. modified).")));
 		return completions;
 	}
 

From e90011b39fb509ffc7608c81ec79d066734dffad Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 27 Feb 2025 12:53:49 -0600
Subject: [PATCH 0487/1815] update command id in help dialogs (#242220)

fixes #239325
---
 src/vs/editor/common/standaloneStrings.ts                       | 2 +-
 .../contrib/chat/browser/actions/chatAccessibilityHelp.ts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/common/standaloneStrings.ts b/src/vs/editor/common/standaloneStrings.ts
index 2a82f208c622..8d30948923d3 100644
--- a/src/vs/editor/common/standaloneStrings.ts
+++ b/src/vs/editor/common/standaloneStrings.ts
@@ -41,7 +41,7 @@ export namespace AccessibilityHelpNLS {
 	export const debugExecuteSelection = nls.localize('debugConsole.executeSelection', "The Debug: Execute Selection command{0} will execute the selected text in the debug console.", '<keybinding:editor.debug.action.selectionToRepl>');
 	export const chatEditorModification = nls.localize('chatEditorModification', "The editor contains pending modifications that have been made by chat.");
 	export const chatEditorRequestInProgress = nls.localize('chatEditorRequestInProgress', "The editor is currently waiting for modifications to be made by chat.");
-	export const chatEditActions = nls.localize('chatEditing.navigation', 'Navigate between edits in the editor with navigate previous{0} and next{1} and accept{2}, reject{3} or view the diff{4} for the current change.', '<keybinding:chatEditor.action.navigatePrevious>', '<keybinding:chatEditor.action.navigateNext>', '<keybinding:chatEditor.action.acceptHunk>', '<keybinding:chatEditor.action.undoHunk>', '<keybinding:chatEditor.action.diffHunk>');
+	export const chatEditActions = nls.localize('chatEditing.navigation', 'Navigate between edits in the editor with navigate previous{0} and next{1} and accept{2}, reject{3} or view the diff{4} for the current change.', '<keybinding:chatEditor.action.navigatePrevious>', '<keybinding:chatEditor.action.navigateNext>', '<keybinding:chatEditor.action.acceptHunk>', '<keybinding:chatEditor.action.undoHunk>', '<keybinding:chatEditor.action.toggleDiff>');
 }
 
 export namespace InspectTokensNLS {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
index 84531e48c77c..6de18445dec7 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
@@ -79,7 +79,7 @@ export function getAccessibilityHelpText(type: 'panelChat' | 'inlineChat' | 'qui
 		content.push(localize('chatEditing.expectation', 'When a request is made, a progress indicator will play while the edits are being applied.'));
 		content.push(localize('chatEditing.review', 'Once the edits are applied, a sound will play to indicate the document has been opened and is ready for review. The sound can be disabled with accessibility.signals.chatEditModifiedFile.'));
 		content.push(localize('chatEditing.sections', 'Navigate between edits in the editor with navigate previous{0} and next{1}', '<keybinding:chatEditor.action.navigatePrevious>', '<keybinding:chatEditor.action.navigateNext>'));
-		content.push(localize('chatEditing.acceptHunk', 'In the editor, Accept{0}, Reject{1}, or Toggle the Diff{2} for the current Change.', '<keybinding:chatEditor.action.acceptHunk>', '<keybinding:chatEditor.action.undoHunk>', '<keybinding:chatEditor.action.diffHunk>'));
+		content.push(localize('chatEditing.acceptHunk', 'In the editor, Accept{0}, Reject{1}, or Toggle the Diff{2} for the current Change.', '<keybinding:chatEditor.action.acceptHunk>', '<keybinding:chatEditor.action.undoHunk>', '<keybinding:chatEditor.action.toggleDiff>'));
 		content.push(localize('chatEditing.helpfulCommands', 'When in the edits view, some helpful commands include:'));
 		content.push(localize('workbench.action.chat.undoEdits', '- Undo Edits{0}.', '<keybinding:workbench.action.chat.undoEdits>'));
 		content.push(localize('workbench.action.chat.editing.attachFiles', '- Attach Files{0}.', '<keybinding:workbench.action.chat.editing.attachFiles>'));

From 557dd4daddd82591576616c3d3aa0c5d2e1a8df8 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 10:01:59 -0800
Subject: [PATCH 0488/1815] change "use prompt" commadn shortcut to `cmd+alt+/`

---
 .../browser/promptSyntax/contributions/usePromptCommand.ts  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
index 776433e6625e..20a075f0cd00 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
@@ -20,12 +20,14 @@ import { IChatAttachPromptActionOptions, ATTACH_PROMPT_ACTION_ID } from '../../a
 /**
  * Command ID of the "Use Prompt" command.
  */
-const COMMAND_ID = 'workbench.command.prompts.use';
+export const COMMAND_ID = 'workbench.command.prompts.use';
 
 /**
  * Keybinding of the "Use Prompt" command.
+ * The `cmd + /` is the current keybinding for 'attachment', so we use
+ * the `alt` key modifier to convey the "prompt attachment" action.
  */
-const COMMAND_KEY_BINDING = KeyMod.Alt | KeyMod.Shift | KeyCode.KeyE;
+const COMMAND_KEY_BINDING = KeyMod.CtrlCmd | KeyCode.Slash | KeyMod.Alt;
 
 /**
  * Implementation of the "Use Prompt" command. The command works in the following way.

From 74275298fb8c480dcdbf8dbb1d0ee46f1208db69 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 10:02:56 -0800
Subject: [PATCH 0489/1815] add the shortcut info for the 'prompt' item in the
 attachments list

---
 .../browser/actions/chatContextActions.ts     | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index 9791210961c6..3aaf9fc132b8 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -5,6 +5,7 @@
 
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
+import { ResolvedKeybinding } from '../../../../../base/common/keybindings.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
 import { Schemas } from '../../../../../base/common/network.js';
 import { isElectron } from '../../../../../base/common/platform.js';
@@ -25,6 +26,7 @@ import { ICommandService } from '../../../../../platform/commands/common/command
 import { ContextKeyExpr, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { AnythingQuickAccessProviderRunOptions } from '../../../../../platform/quickinput/common/quickAccess.js';
@@ -59,6 +61,7 @@ import { isQuickChat } from '../chatWidget.js';
 import { createFolderQuickPick, createMarkersQuickPick } from '../contrib/chatDynamicVariables.js';
 import { convertBufferToScreenshotVariable, ScreenshotVariableId } from '../contrib/screenshot.js';
 import { resizeImage } from '../imageUtils.js';
+import { COMMAND_ID as USE_PROMPT_COMMAND_ID } from '../promptSyntax/contributions/usePromptCommand.js';
 import { CHAT_CATEGORY } from './chatActions.js';
 import { ATTACH_PROMPT_ACTION_ID, AttachPromptAction, IChatAttachPromptActionOptions } from './chatAttachPromptAction/chatAttachPromptAction.js';
 
@@ -75,7 +78,7 @@ export function registerChatContextActions() {
  */
 type IAttachmentQuickPickItem = ICommandVariableQuickPickItem | IQuickAccessQuickPickItem | IToolQuickPickItem |
 	IImageQuickPickItem | IOpenEditorsQuickPickItem | ISearchResultsQuickPickItem |
-	IScreenShotQuickPickItem | IRelatedFilesQuickPickItem | IPromptInstructionsQuickPickItem | IFolderQuickPickItem | IDiagnosticsQuickPickItem;
+	IScreenShotQuickPickItem | IRelatedFilesQuickPickItem | IReusablePromptQuickPickItem | IFolderQuickPickItem | IDiagnosticsQuickPickItem;
 
 /**
  * These are the types that we can get out of the quick pick
@@ -144,7 +147,7 @@ function isRelatedFileQuickPickItem(obj: unknown): obj is IRelatedFilesQuickPick
 /**
  * Checks is a provided object is a prompt instructions quick pick item.
  */
-function isPromptInstructionsQuickPickItem(obj: unknown): obj is IPromptInstructionsQuickPickItem {
+function isPromptInstructionsQuickPickItem(obj: unknown): obj is IReusablePromptQuickPickItem {
 	if (!obj || typeof obj !== 'object') {
 		return false;
 	}
@@ -230,19 +233,23 @@ interface IDiagnosticsQuickPickItemWithFilter extends IQuickPickItem {
 }
 
 /**
- * Quick pick item for prompt instructions attachment.
+ * Quick pick item for reusable prompt attachment.
  */
-interface IPromptInstructionsQuickPickItem extends IQuickPickItem {
+interface IReusablePromptQuickPickItem extends IQuickPickItem {
 	/**
-	 * Unique kind identifier of the prompt instructions
-	 * attachment quick pick item.
+	 * The ID of the quick pick item.
 	 */
-	kind: 'prompt-instructions';
+	id: 'reusable-prompt';
 
 	/**
-	 * The id of the qucik pick item.
+	 * Unique kind identifier of the reusable prompt attachment.
 	 */
-	id: string;
+	kind: 'reusable-prompt';
+
+	/**
+	 * Keybinding of the command.
+	 */
+	keybinding?: ResolvedKeybinding;
 }
 
 abstract class AttachFileAction extends Action2 {
@@ -674,6 +681,7 @@ export class AttachContextAction extends Action2 {
 		const fileService = accessor.get(IFileService);
 		const textModelService = accessor.get(ITextModelService);
 		const instantiationService = accessor.get(IInstantiationService);
+		const keybindingService = accessor.get(IKeybindingService);
 
 		const context: { widget?: IChatWidget; showFilesOnly?: boolean; placeholder?: string } | undefined = args[0];
 		const widget = context?.widget ?? widgetService.lastFocusedWidget;
@@ -811,14 +819,17 @@ export class AttachContextAction extends Action2 {
 			}
 		}
 
-		// if the `prompt instructions` feature is enabled, add
-		// the `Instructions` attachment type to the list
+		// if the `reusable prompts` feature is enabled, add
+		// the appropriate attachment type to the list
 		if (widget.attachmentModel.promptInstructions.featureEnabled) {
+			const keybinding = keybindingService.lookupKeybinding(USE_PROMPT_COMMAND_ID, contextKeyService);
+
 			quickPickItems.push({
-				kind: 'prompt-instructions',
-				id: 'prompt-instructions',
+				kind: 'reusable-prompt',
+				id: 'reusable-prompt',
 				label: localize('chatContext.attach.prompt.label', 'Prompt...'),
 				iconClass: ThemeIcon.asClassName(Codicon.bookmark),
+				keybinding,
 			});
 		}
 

From a51c2a30b2301de9c6346b1a04108812adf85808 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 10:40:40 -0800
Subject: [PATCH 0490/1815] handle `cmd` modifier in the prompt selection
 dialog

---
 .../chatAttachPromptAction.ts                 |  1 +
 .../dialogs/askToSelectPrompt.ts              | 26 ++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts
index 516f4d699cd8..2c6779d059fb 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts
@@ -64,6 +64,7 @@ export class AttachPromptAction extends Action2 {
 				promptFiles,
 				labelService,
 				viewsService,
+				openerService,
 				quickInputService,
 			});
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
index ff7fd235d96f..7c97b754a9a7 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
@@ -13,6 +13,7 @@ import { DisposableStore } from '../../../../../../../base/common/lifecycle.js';
 import { dirname, extUri } from '../../../../../../../base/common/resources.js';
 import { isLinux, isWindows } from '../../../../../../../base/common/platform.js';
 import { ILabelService } from '../../../../../../../platform/label/common/label.js';
+import { IOpenerService } from '../../../../../../../platform/opener/common/opener.js';
 import { IViewsService } from '../../../../../../services/views/common/viewsService.js';
 import { assertDefined, WithUriValue } from '../../../../../../../base/common/types.js';
 import { getCleanPromptName } from '../../../../../../../platform/prompts/common/constants.js';
@@ -45,6 +46,7 @@ export interface ISelectPromptOptions {
 
 	readonly labelService: ILabelService;
 	readonly viewsService: IViewsService;
+	readonly openerService: IOpenerService;
 	readonly quickInputService: IQuickInputService;
 }
 
@@ -100,7 +102,7 @@ export const askToSelectPrompt = async (
 	}
 
 	// otherwise show the prompt file selection dialog
-	const { viewsService } = options;
+	const { viewsService, openerService } = options;
 
 	const quickPick = quickInputService.createQuickPick<WithUriValue<IQuickPickItem>>();
 	quickPick.activeItems = activeItem ? [activeItem] : [];
@@ -124,9 +126,27 @@ export const askToSelectPrompt = async (
 		});
 
 		disposables.add(quickPick.onDidAccept(async (event) => {
+			const { alt, ctrlCmd } = quickPick.keyMods;
+
+			// TODO: @lego - refactor?
+			// if `cmd`/`ctrl` key was pressed, open the selected prompt file(s)
+			if (ctrlCmd) {
+				for (const selectedItem of quickPick.selectedItems) {
+					await openerService.open(selectedItem.value);
+				}
+
+				// if user submitted their selection, close the dialog
+				if (!event.inBackground) {
+					disposables.dispose();
+				}
+
+				return;
+			}
+
+			// otherwise attach the selected prompt to a chat input
 			lastActiveWidget = await getChatWidgetObject(
 				options,
-				quickPick.keyMods.alt,
+				alt,
 				viewsService,
 			);
 
@@ -139,7 +159,7 @@ export const askToSelectPrompt = async (
 
 			// if user submitted their selection, close the dialog
 			if (!event.inBackground) {
-				return disposables.dispose();
+				disposables.dispose();
 			}
 		}));
 

From 555257b68e97d2d4c785a445a061dfdca7fb6f72 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 10:53:41 -0800
Subject: [PATCH 0491/1815] refactor the ask-to-select-prompt dialog

---
 .../chatAttachPromptAction.ts                 |  2 +-
 .../dialogs/askToSelectPrompt.ts              | 67 +++++++++++--------
 .../browser/actions/chatContextActions.ts     |  2 +-
 .../contributions/usePromptCommand.ts         |  3 +
 4 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts
index 2c6779d059fb..40535af08eb8 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts
@@ -24,7 +24,7 @@ export const ATTACH_PROMPT_ACTION_ID = 'workbench.action.chat.attach.prompt';
  * Options for the {@link AttachPromptAction} action.
  */
 export interface IChatAttachPromptActionOptions extends Pick<
-	ISelectPromptOptions, 'resource' | 'widget'
+	ISelectPromptOptions, 'resource' | 'widget' | 'viewsService'
 > { }
 
 /**
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
index 7c97b754a9a7..4916c2e2c36b 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
@@ -102,7 +102,7 @@ export const askToSelectPrompt = async (
 	}
 
 	// otherwise show the prompt file selection dialog
-	const { viewsService, openerService } = options;
+	const { openerService } = options;
 
 	const quickPick = quickInputService.createQuickPick<WithUriValue<IQuickPickItem>>();
 	quickPick.activeItems = activeItem ? [activeItem] : [];
@@ -126,36 +126,16 @@ export const askToSelectPrompt = async (
 		});
 
 		disposables.add(quickPick.onDidAccept(async (event) => {
+			const { selectedItems } = quickPick;
 			const { alt, ctrlCmd } = quickPick.keyMods;
 
-			// TODO: @lego - refactor?
-			// if `cmd`/`ctrl` key was pressed, open the selected prompt file(s)
+			// if `super` key was pressed, open the selected prompt file(s)
 			if (ctrlCmd) {
-				for (const selectedItem of quickPick.selectedItems) {
-					await openerService.open(selectedItem.value);
-				}
-
-				// if user submitted their selection, close the dialog
-				if (!event.inBackground) {
-					disposables.dispose();
-				}
-
-				return;
+				return await openFiles(selectedItems, openerService);
 			}
 
 			// otherwise attach the selected prompt to a chat input
-			lastActiveWidget = await getChatWidgetObject(
-				options,
-				alt,
-				viewsService,
-			);
-
-			for (const selectedItem of quickPick.selectedItems) {
-				lastActiveWidget
-					.attachmentModel
-					.promptInstructions
-					.add(selectedItem.value);
-			}
+			lastActiveWidget = await attachFiles(selectedItems, options, alt);
 
 			// if user submitted their selection, close the dialog
 			if (!event.inBackground) {
@@ -216,18 +196,51 @@ const createPlaceholderText = (options: ISelectPromptOptions): string => {
 	return text;
 };
 
+/**
+ * Opens provided files in the editor.
+ */
+const openFiles = async (
+	files: readonly WithUriValue<IQuickPickItem>[],
+	openerService: IOpenerService,
+) => {
+	for (const file of files) {
+		await openerService.open(file.value);
+	}
+};
+
+/**
+ * Attaches provided files to a chat input.
+ */
+const attachFiles = async (
+	files: readonly WithUriValue<IQuickPickItem>[],
+	options: ISelectPromptOptions,
+	altOption: boolean,
+): Promise<IChatWidget> => {
+	const widget = await getChatWidgetObject(options, altOption);
+
+	for (const file of files) {
+		widget
+			.attachmentModel
+			.promptInstructions
+			.add(file.value);
+	}
+
+	return widget;
+};
+
 /**
  * Gets a chat widget based on the provided {@link IChatAttachPromptActionOptions.widget widget}
  * reference. If no widget reference is provided, the function will reveal a `chat panel` by default
  * (either a last focused, or a new one), but if the {@link altOption} is set to `true`, a `chat edits`
  * panel will be revealed instead (likewise either a last focused, or a new one).
+ *
+ * @throws if failed to reveal a chat widget.
  */
 const getChatWidgetObject = async (
 	options: IChatAttachPromptActionOptions,
 	altOption: boolean,
-	viewsService: IViewsService,
 ): Promise<IChatWidget> => {
-	const { widget } = options;
+	const { widget, viewsService } = options;
 
 	// if no widget reference is present, the command was triggered from outside of
 	// an active chat input, so we reveal a chat widget window based on the `alt`
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index 3aaf9fc132b8..11a2c31cfdb2 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -615,7 +615,7 @@ export class AttachContextAction extends Action2 {
 					toAttach.push(convertBufferToScreenshotVariable(blob));
 				}
 			} else if (isPromptInstructionsQuickPickItem(pick)) {
-				const options: IChatAttachPromptActionOptions = { widget };
+				const options: IChatAttachPromptActionOptions = { widget, viewsService };
 				await commandService.executeCommand(ATTACH_PROMPT_ACTION_ID, options);
 			} else {
 				// Anything else is an attachment
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
index 20a075f0cd00..0c486a00d8d9 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
@@ -8,6 +8,7 @@ import { URI } from '../../../../../../base/common/uri.js';
 import { CHAT_CATEGORY } from '../../actions/chatActions.js';
 import { IChatWidget, IChatWidgetService } from '../../chat.js';
 import { KeyMod, KeyCode } from '../../../../../../base/common/keyCodes.js';
+import { IViewsService } from '../../../../../services/views/common/viewsService.js';
 import { isPromptFile } from '../../../../../../platform/prompts/common/constants.js';
 import { IEditorService } from '../../../../../services/editor/common/editorService.js';
 import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
@@ -51,10 +52,12 @@ const command = async (
 	accessor: ServicesAccessor,
 ): Promise<void> => {
 	const commandService = accessor.get(ICommandService);
+	const viewsService = accessor.get(IViewsService);
 
 	const options: IChatAttachPromptActionOptions = {
 		resource: getActivePromptUri(accessor),
 		widget: getFocusedChatWidget(accessor),
+		viewsService,
 	};
 
 	await commandService.executeCommand(ATTACH_PROMPT_ACTION_ID, options);

From ce3d246164dc513218f9e612cc69d7ea8c168c52 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 11:04:41 -0800
Subject: [PATCH 0492/1815] add `supper` modifier notice to the prompt
 selection dialog

---
 .../dialogs/askToSelectPrompt.ts              | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
index 4916c2e2c36b..08b7657eecef 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
@@ -181,15 +181,29 @@ const createPlaceholderText = (options: ISelectPromptOptions): string => {
 		'Select a prompt to use',
 	);
 
-	// if no widget reference is provided, add the note about
-	// the `alt`/`option` key modifier users can use
+	// if no widget reference is provided, add the note about `options`
+	// and `cmd` modifiers users can use to alter the command behavior
 	if (!widget) {
-		const key = (isWindows || isLinux) ? 'alt' : 'option';
+		const altOptionkey = (isWindows || isLinux) ? 'Alt' : 'Option';
 
-		text += ' ' + localize(
+		const altOptionModifierNote = localize(
 			'commands.prompts.use.select-dialog.alt-modifier-note',
-			'(hold `{0}` to use in Edits)',
-			key,
+			'{0}-key to use in Edits',
+			altOptionkey,
+		);
+
+		const cmdCtrlkey = (isWindows || isLinux) ? 'Ctrl' : 'Cmd';
+		const superModifierNote = localize(
+			'commands.prompts.use.select-dialog.super-modifier-note',
+			'{0}-key to open in editor',
+			cmdCtrlkey,
+		);
+
+		text += localize(
+			'commands.prompts.use.select-dialog.modifier-notes',
+			' (hold {0} or {1})',
+			altOptionModifierNote,
+			superModifierNote,
 		);
 	}
 

From 941479b9940f8dd87b51c4092e5a1a64d57de8d6 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 27 Feb 2025 20:42:52 +0100
Subject: [PATCH 0493/1815] fix #242222 (#242225)

---
 .../services/userDataSync/browser/userDataSyncInit.ts        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts
index 366d2367fb47..b97bb50f533c 100644
--- a/src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts
+++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncInit.ts
@@ -20,7 +20,7 @@ import { AuthenticationSessionInfo, getCurrentAuthenticationSessionInfo } from '
 import { getSyncAreaLabel } from '../common/userDataSync.js';
 import { isWeb } from '../../../../base/common/platform.js';
 import { Barrier, Promises } from '../../../../base/common/async.js';
-import { EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT, EXTENSION_INSTALL_SOURCE_CONTEXT, ExtensionInstallSource, IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, ILocalExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT, IExtensionGalleryService, IExtensionManagementService, IGlobalExtensionEnablementService, ILocalExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
 import { IExtensionService, toExtensionDescription } from '../../extensions/common/extensions.js';
 import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
@@ -384,10 +384,11 @@ class NewExtensionsInitializer implements IUserDataSyncResourceInitializer {
 				}
 				this.logService.trace(`Installing extension...`, galleryExtension.identifier.id);
 				const local = await this.extensionManagementService.installFromGallery(galleryExtension, {
+					isMachineScoped: false, /* set isMachineScoped to prevent install and sync dialog in web */
 					donotIncludePackAndDependencies: true,
 					installGivenVersion: !!extensionToSync.version,
 					installPreReleaseVersion: extensionToSync.preRelease,
-					context: { [EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT]: true, [EXTENSION_INSTALL_SOURCE_CONTEXT]: ExtensionInstallSource.SETTINGS_SYNC }
+					context: { [EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT]: true }
 				});
 				if (!preview.disabledExtensions.some(identifier => areSameExtensions(identifier, galleryExtension.identifier))) {
 					newlyEnabledExtensions.push(local);

From cc54a9156c6d4d56ccf2407bf6df4d35354041ee Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 27 Feb 2025 11:49:55 -0800
Subject: [PATCH 0494/1815] Fix default for conpty and env reporting settings

Fixes #242227
---
 .../contrib/terminal/common/terminalConfiguration.ts | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index 41575c9fc97f..278027854051 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -5,9 +5,9 @@
 
 import { Codicon } from '../../../../base/common/codicons.js';
 import { isMacintosh, isWindows } from '../../../../base/common/platform.js';
-import { IProductConfiguration } from '../../../../base/common/product.js';
 import { localize } from '../../../../nls.js';
 import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
+import product from '../../../../platform/product/common/product.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { TerminalLocationString, TerminalSettingId } from '../../../../platform/terminal/common/terminal.js';
 import { terminalColorSchema, terminalIconSchema } from '../../../../platform/terminal/common/terminalPlatformConfiguration.js';
@@ -486,10 +486,7 @@ const terminalConfiguration: IConfigurationNode = {
 			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."),
 			type: 'boolean',
 			tags: ['preview'],
-			default: ((): boolean => {
-				const productService = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurations()[0] as IProductConfiguration;
-				return productService?.quality !== 'stable';
-			})()
+			default: product.quality !== 'stable',
 		},
 		[TerminalSettingId.SplitCwd]: {
 			description: localize('terminal.integrated.splitCwd', "Controls the working directory a split terminal starts with."),
@@ -613,10 +610,7 @@ const terminalConfiguration: IConfigurationNode = {
 		[TerminalSettingId.ShellIntegrationEnvironmentReporting]: {
 			markdownDescription: localize('terminal.integrated.shellIntegration.environmentReporting', "Controls whether to report the shell environment, enabling its use in features such as {0}. This may cause a slowdown when printing your shell's prompt.", `\`#${TerminalContribSettingId.SuggestEnabled}#\``),
 			type: 'boolean',
-			default: ((): boolean => {
-				const productService = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurations()[0] as IProductConfiguration;
-				return productService?.quality !== 'stable';
-			})()
+			default: product.quality !== 'stable',
 		},
 		[TerminalSettingId.SmoothScrolling]: {
 			markdownDescription: localize('terminal.integrated.smoothScrolling', "Controls whether the terminal will scroll using an animation."),

From b1f84424441f1c522338517e6e7d469e4db48dfe Mon Sep 17 00:00:00 2001
From: Michael Lively <michaellively00@gmail.com>
Date: Thu, 27 Feb 2025 12:16:45 -0800
Subject: [PATCH 0495/1815] Cell status bar - execution state icon css
 (#242229)

ah heck we need more specificity
---
 .../contrib/notebook/browser/media/notebookCellStatusBar.css  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/media/notebookCellStatusBar.css b/src/vs/workbench/contrib/notebook/browser/media/notebookCellStatusBar.css
index d1d06fdf9bc3..64dd58eecd25 100644
--- a/src/vs/workbench/contrib/notebook/browser/media/notebookCellStatusBar.css
+++ b/src/vs/workbench/contrib/notebook/browser/media/notebookCellStatusBar.css
@@ -70,9 +70,9 @@
 }
 
 /* Ensure execution status icons always maintain their themed colors */
-.monaco-workbench .notebookOverlay .cell-statusbar-container .codicon-notebook-state-success {
+.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row .cell-statusbar-container .cell-status-item .codicon-notebook-state-success {
 	color: var(--vscode-notebookStatusSuccessIcon-foreground);
 }
-.monaco-workbench .notebookOverlay .cell-statusbar-container .codicon-notebook-state-error {
+.monaco-workbench .notebookOverlay .monaco-list .monaco-list-row .cell-statusbar-container .cell-status-item .codicon-notebook-state-error {
 	color: var(--vscode-notebookStatusErrorIcon-foreground);
 }

From 7e84e802908d7408799524b9f0ee5d96b0912415 Mon Sep 17 00:00:00 2001
From: Justin Chen <54879025+justschen@users.noreply.github.com>
Date: Thu, 27 Feb 2025 12:50:06 -0800
Subject: [PATCH 0496/1815] fix chat rendering issue - renderAttachments back
 to sync (#242238)

fix rendering issue, back to sync
---
 .../chatAttachmentsContentPart.ts             | 26 +++---------------
 .../contrib/chat/browser/chatInputPart.ts     | 27 +++----------------
 2 files changed, 7 insertions(+), 46 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
index e61ad046c7d9..2c6413069a47 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
@@ -8,7 +8,6 @@ import { StandardMouseEvent } from '../../../../../base/browser/mouseEvent.js';
 import { IManagedHoverTooltipMarkdownString } from '../../../../../base/browser/ui/hover/hover.js';
 import { IHoverDelegate } from '../../../../../base/browser/ui/hover/hoverDelegate.js';
 import { createInstantHoverDelegate } from '../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
-import { Promises } from '../../../../../base/common/async.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable, DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
@@ -62,7 +61,6 @@ export class ChatAttachmentsContentPart extends Disposable {
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IOpenerService private readonly openerService: IOpenerService,
 		@IHoverService private readonly hoverService: IHoverService,
-		@IFileService private readonly fileService: IFileService,
 		@ICommandService private readonly commandService: ICommandService,
 		@IThemeService private readonly themeService: IThemeService,
 		@ILabelService private readonly labelService: ILabelService,
@@ -80,7 +78,6 @@ export class ChatAttachmentsContentPart extends Disposable {
 		this.attachedContextDisposables.clear();
 		const hoverDelegate = this.attachedContextDisposables.add(createInstantHoverDelegate());
 
-		const attachmentInitPromises: Promise<void>[] = [];
 		this.variables.forEach(async (attachment) => {
 			let 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;
 			let range = attachment.value && typeof attachment.value === 'object' && 'range' in attachment.value && Range.isIRange(attachment.value.range) ? attachment.value.range : undefined;
@@ -148,25 +145,9 @@ export class ChatAttachmentsContentPart extends Disposable {
 				}
 
 				if (!isAttachmentPartialOrOmitted) {
-					attachmentInitPromises.push(Promises.withAsyncBody(async (resolve) => {
-						let buffer: Uint8Array;
-						try {
-							if (attachment.value instanceof URI) {
-								const readFile = await this.fileService.readFile(attachment.value);
-								if (this.attachedContextDisposables.isDisposed) {
-									return;
-								}
-								buffer = readFile.value.buffer;
-							} else {
-								buffer = attachment.value as Uint8Array;
-							}
-							this.createImageElements(buffer, widget, hoverElement);
-						} catch (error) {
-							console.error('Error processing attachment:', error);
-						}
-						this.attachedContextDisposables.add(this.hoverService.setupManagedHover(hoverDelegate, widget, hoverElement, { trapFocus: false }));
-						resolve();
-					}));
+					const buffer = attachment.value as Uint8Array;
+					this.createImageElements(buffer, widget, hoverElement);
+					this.attachedContextDisposables.add(this.hoverService.setupManagedHover(hoverDelegate, widget, hoverElement, { trapFocus: false }));
 				}
 				widget.style.position = 'relative';
 			} else if (isPasteVariableEntry(attachment)) {
@@ -231,7 +212,6 @@ export class ChatAttachmentsContentPart extends Disposable {
 				}
 			}
 
-			await Promise.all(attachmentInitPromises);
 			if (this.attachedContextDisposables.isDisposed) {
 				return;
 			}
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index b2510f1cf131..c30361f502fc 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -17,7 +17,6 @@ import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.
 import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { IAction, Separator, toAction } from '../../../../base/common/actions.js';
-import { Promises } from '../../../../base/common/async.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { HistoryNavigator2 } from '../../../../base/common/history.js';
@@ -983,7 +982,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}
 	}
 
-	private async renderAttachedContext() {
+	private renderAttachedContext() {
 		const container = this.attachedContextContainer;
 		const oldHeight = container.offsetHeight;
 		const store = new DisposableStore();
@@ -1006,7 +1005,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		this.promptInstructionsAttached.set(!this.instructionAttachmentsPart.empty);
 		this.instructionAttachmentsPart.render(container);
 
-		const attachmentInitPromises: Promise<void>[] = [];
 		for (const [index, attachment] of attachments) {
 			const widget = dom.append(container, $('.chat-attached-context-attachment.show-file-icons'));
 			const label = this._contextResourceLabels.create(widget, { supportIcons: true, hoverDelegate, hoverTargetOverride: widget });
@@ -1059,25 +1057,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 				}
 
 				if (supportsVision) {
-					attachmentInitPromises.push(Promises.withAsyncBody(async (resolve) => {
-						let buffer: Uint8Array;
-						try {
-							if (attachment.value instanceof URI) {
-								const readFile = await this.fileService.readFile(attachment.value);
-								if (store.isDisposed) {
-									return;
-								}
-								buffer = readFile.value.buffer;
-							} else {
-								buffer = attachment.value as Uint8Array;
-							}
-							this.createImageElements(buffer, widget, hoverElement);
-						} catch (error) {
-							console.error('Error processing attachment:', error);
-						}
-						store.add(this.hoverService.setupManagedHover(hoverDelegate, widget, hoverElement, { trapFocus: false }));
-						resolve();
-					}));
+					const buffer = attachment.value as Uint8Array;
+					this.createImageElements(buffer, widget, hoverElement);
+					store.add(this.hoverService.setupManagedHover(hoverDelegate, widget, hoverElement, { trapFocus: false }));
 				}
 
 				this.attachButtonAndDisposables(widget, index, attachment, hoverDelegate);
@@ -1142,7 +1124,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 				store.add(this.instantiationService.invokeFunction(accessor => hookUpSymbolAttachmentDragAndContextMenu(accessor, widget, scopedContextKeyService, { ...attachment, kind: attachment.symbolKind }, MenuId.ChatInputSymbolAttachmentContext)));
 			}
 
-			await Promise.all(attachmentInitPromises);
 			if (store.isDisposed) {
 				return;
 			}

From db9b89952571e554f02b2a9f452bef2bc5c657d3 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 27 Feb 2025 13:21:52 -0800
Subject: [PATCH 0497/1815] Fix new terminal suggest icon colors

Part of #241727

The rest of this issue will be fixed in March
---
 build/lib/stylelint/vscode-known-variables.json     |  6 +++---
 .../contrib/symbolIcons/browser/symbolIcons.css     |  4 ----
 .../contrib/symbolIcons/browser/symbolIcons.ts      |  5 -----
 .../suggest/browser/media/terminalSymbolIcons.css   |  9 +++++++++
 .../browser/terminal.suggest.contribution.ts        |  1 +
 .../suggest/browser/terminalSymbolIcons.ts          | 13 +++++++++++++
 6 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 src/vs/workbench/contrib/terminalContrib/suggest/browser/media/terminalSymbolIcons.css
 create mode 100644 src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSymbolIcons.ts

diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
index 6bf3ddb025a7..9a5b08022b64 100644
--- a/build/lib/stylelint/vscode-known-variables.json
+++ b/build/lib/stylelint/vscode-known-variables.json
@@ -57,7 +57,6 @@
 		"--vscode-chat-requestBorder",
 		"--vscode-chat-slashCommandBackground",
 		"--vscode-chat-slashCommandForeground",
-		"--vscode-chatEdits-minimapColor",
 		"--vscode-checkbox-background",
 		"--vscode-checkbox-border",
 		"--vscode-checkbox-foreground",
@@ -473,6 +472,7 @@
 		"--vscode-mergeEditor-conflict-unhandledUnfocused-border",
 		"--vscode-mergeEditor-conflictingLines-background",
 		"--vscode-minimap-background",
+		"--vscode-minimap-chatEditHighlight",
 		"--vscode-minimap-errorHighlight",
 		"--vscode-minimap-findMatchHighlight",
 		"--vscode-minimap-foregroundOpacity",
@@ -690,13 +690,11 @@
 		"--vscode-symbolIcon-eventForeground",
 		"--vscode-symbolIcon-fieldForeground",
 		"--vscode-symbolIcon-fileForeground",
-		"--vscode-symbolIcon-flagForeground",
 		"--vscode-symbolIcon-folderForeground",
 		"--vscode-symbolIcon-functionForeground",
 		"--vscode-symbolIcon-interfaceForeground",
 		"--vscode-symbolIcon-keyForeground",
 		"--vscode-symbolIcon-keywordForeground",
-		"--vscode-symbolIcon-methodArrowForeground",
 		"--vscode-symbolIcon-methodForeground",
 		"--vscode-symbolIcon-moduleForeground",
 		"--vscode-symbolIcon-namespaceForeground",
@@ -784,6 +782,8 @@
 		"--vscode-terminalStickyScroll-background",
 		"--vscode-terminalStickyScroll-border",
 		"--vscode-terminalStickyScrollHover-background",
+		"--vscode-terminalSymbolIcon-aliasForeground",
+		"--vscode-terminalSymbolIcon-flagForeground",
 		"--vscode-testing-coverCountBadgeBackground",
 		"--vscode-testing-coverCountBadgeForeground",
 		"--vscode-testing-coveredBackground",
diff --git a/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.css b/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.css
index a025a03ac2aa..475006090b4e 100644
--- a/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.css
+++ b/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.css
@@ -11,10 +11,6 @@
 .monaco-workbench .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-editor .codicon.codicon-symbol-method-arrow,
-.monaco-workbench .codicon.codicon-symbol-method-arrow { color: var(--vscode-symbolIcon-methodArrowForeground); }
-.monaco-editor .codicon.codicon-flag,
-.monaco-workbench .codicon.codicon-flag { color: var(--vscode-symbolIcon-flagForeground); }
 .monaco-editor .codicon.codicon-symbol-color,
 .monaco-workbench .codicon.codicon-symbol-color { color: var(--vscode-symbolIcon-colorForeground); }
 .monaco-editor .codicon.codicon-symbol-constant,
diff --git a/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.ts b/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.ts
index 0cd566196475..a2795f7541ce 100644
--- a/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.ts
+++ b/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.ts
@@ -36,9 +36,6 @@ export const SYMBOL_ICON_ENUMERATOR_FOREGROUND = registerColor('symbolIcon.enume
 	hcLight: '#D67E00'
 }, localize('symbolIcon.enumeratorForeground', 'The foreground color for enumerator symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-
-export const SYMBOL_ICON_FLAG_FOREGROUND = registerColor('symbolIcon.flagForeground', SYMBOL_ICON_ENUMERATOR_FOREGROUND, localize('symbolIcon.enumeratorForeground', 'The foreground color for enumerator symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
-
 export const SYMBOL_ICON_ENUMERATOR_MEMBER_FOREGROUND = registerColor('symbolIcon.enumeratorMemberForeground', {
 	dark: '#75BEFF',
 	light: '#007ACC',
@@ -89,8 +86,6 @@ export const SYMBOL_ICON_METHOD_FOREGROUND = registerColor('symbolIcon.methodFor
 	hcLight: '#652D90'
 }, localize('symbolIcon.methodForeground', 'The foreground color for method symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_METHOD_ARROW_FOREGROUND = registerColor('symbolIcon.methodArrowForeground', SYMBOL_ICON_METHOD_FOREGROUND, localize('symbolIcon.methodArrowForeground', 'The foreground color for method with an arrow symbols. These symbols appear in the suggest widget.'));
-
 export const SYMBOL_ICON_MODULE_FOREGROUND = registerColor('symbolIcon.moduleForeground', foreground, localize('symbolIcon.moduleForeground', 'The foreground color for module symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
 export const SYMBOL_ICON_NAMESPACE_FOREGROUND = registerColor('symbolIcon.namespaceForeground', foreground, localize('symbolIcon.namespaceForeground', 'The foreground color for namespace symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/media/terminalSymbolIcons.css b/src/vs/workbench/contrib/terminalContrib/suggest/browser/media/terminalSymbolIcons.css
new file mode 100644
index 000000000000..6d918851badb
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/media/terminalSymbolIcons.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.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-editor .codicon.codicon-symbol-method-arrow,
+.monaco-workbench .codicon.codicon-symbol-method-arrow { color: var(--vscode-terminalSymbolIcon-aliasForeground); }
+.monaco-editor .codicon.codicon-flag,
+.monaco-workbench .codicon.codicon-flag { color: var(--vscode-terminalSymbolIcon-flagForeground); }
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 c769b337fed0..51ca3fed8680 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
@@ -32,6 +32,7 @@ import { SuggestDetailsClassName } from '../../../../services/suggest/browser/si
 import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
 import { MenuId } from '../../../../../platform/actions/common/actions.js';
 import { IPreferencesService } from '../../../../services/preferences/common/preferences.js';
+import './terminalSymbolIcons.js';
 
 registerSingleton(ITerminalCompletionService, TerminalCompletionService, InstantiationType.Delayed);
 
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSymbolIcons.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSymbolIcons.ts
new file mode 100644
index 000000000000..a2039d2cd570
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSymbolIcons.ts
@@ -0,0 +1,13 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/terminalSymbolIcons.css';
+import { SYMBOL_ICON_ENUMERATOR_FOREGROUND, SYMBOL_ICON_METHOD_FOREGROUND } from '../../../../../editor/contrib/symbolIcons/browser/symbolIcons.js';
+import { registerColor } from '../../../../../platform/theme/common/colorUtils.js';
+import { localize } from '../../../../../nls.js';
+
+export const TERMINAL_SYMBOL_ICON_FLAG_FOREGROUND = registerColor('terminalSymbolIcon.flagForeground', SYMBOL_ICON_ENUMERATOR_FOREGROUND, localize('terminalSymbolIcon.flagForeground', 'The foreground color for an flag icon. These icons will appear in the terminal suggest widget.'));
+
+export const TERMINAL_SYMBOL_ICON_ALIAS_FOREGROUND = registerColor('terminalSymbolIcon.aliasForeground', SYMBOL_ICON_METHOD_FOREGROUND, localize('terminalSymbolIcon.aliasForeground', 'The foreground color for an alias icon. These icons will appear in the terminal suggest widget.'));

From 21353cf05054a7762072b3112d2d523f185908b3 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 27 Feb 2025 15:45:34 -0600
Subject: [PATCH 0498/1815] Improve help dialog wording for activeEditorState
 inclusion (#242246)

fixes #242244
---
 src/vs/editor/common/standaloneStrings.ts            |  3 ++-
 .../accessibility/browser/editorAccessibilityHelp.ts | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/vs/editor/common/standaloneStrings.ts b/src/vs/editor/common/standaloneStrings.ts
index 8d30948923d3..f1b89210a4bf 100644
--- a/src/vs/editor/common/standaloneStrings.ts
+++ b/src/vs/editor/common/standaloneStrings.ts
@@ -12,7 +12,8 @@ export namespace AccessibilityHelpNLS {
 	export const editableDiffEditor = nls.localize("editableDiffEditor", "You are in a pane of a diff editor.");
 	export const readonlyEditor = nls.localize("readonlyEditor", "You are in a read-only code editor.");
 	export const editableEditor = nls.localize("editableEditor", "You are in a code editor.");
-	export const activeEditorState = nls.localize("activeEditorState", "Get information about the active editor such as Modified, Problems, and more by setting activeEditorState as a part of the window.title setting.");
+	export const defaultWindowTitleIncludesEditorState = nls.localize("defaultWindowTitleIncludesEditorState", "activeEditorState - such as modified, problems, and more, is included as a part of the window.title setting by default. Disable it with accessibility.windowTitleOptimized.");
+	export const defaultWindowTitleExcludingEditorState = nls.localize("defaultWindowTitleExcludingEditorState", "activeEditorState - such as modified, problems, and more, is currently not included as a part of the window.title setting by default. Enable it with accessibility.windowTitleOptimized.");
 	export const toolbar = nls.localize("toolbar", "Around the workbench, when the screen reader announces you've landed in a toolbar, use narrow keys to navigate between the toolbar's actions.");
 	export const changeConfigToOnMac = nls.localize("changeConfigToOnMac", "Configure the application to be optimized for usage with a Screen Reader (Command+E).");
 	export const changeConfigToOnWinLinux = nls.localize("changeConfigToOnWinLinux", "Configure the application to be optimized for usage with a Screen Reader (Control+E).");
diff --git a/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts b/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts
index 0bffd4614283..5f993a6a6d86 100644
--- a/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.ts
@@ -20,6 +20,8 @@ import { NEW_UNTITLED_FILE_COMMAND_ID } from '../../files/browser/fileConstants.
 import { IAccessibleViewService, IAccessibleViewContentProvider, AccessibleViewProviderId, IAccessibleViewOptions, AccessibleViewType } from '../../../../platform/accessibility/browser/accessibleView.js';
 import { AccessibilityVerbositySettingId } from './accessibilityConfiguration.js';
 import { ctxHasEditorModification, ctxHasRequestInProgress } from '../../chat/browser/chatEditing/chatEditingEditorContextKeys.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 
 export class EditorAccessibilityHelpContribution extends Disposable {
 	static ID: 'editorAccessibilityHelpContribution';
@@ -50,7 +52,9 @@ class EditorAccessibilityHelpProvider extends Disposable implements IAccessibleV
 	constructor(
 		private readonly _editor: ICodeEditor,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
-		@IContextKeyService private readonly _contextKeyService: IContextKeyService
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IAccessibilityService private readonly accessibilityService: IAccessibilityService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
 	) {
 		super();
 	}
@@ -72,7 +76,11 @@ class EditorAccessibilityHelpProvider extends Disposable implements IAccessibleV
 				content.push(AccessibilityHelpNLS.editableEditor);
 			}
 		}
-		content.push(AccessibilityHelpNLS.activeEditorState);
+		if (this.accessibilityService.isScreenReaderOptimized() && this._configurationService.getValue('accessibility.windowTitleOptimized')) {
+			content.push(AccessibilityHelpNLS.defaultWindowTitleIncludesEditorState);
+		} else {
+			content.push(AccessibilityHelpNLS.defaultWindowTitleExcludingEditorState);
+		}
 		content.push(AccessibilityHelpNLS.toolbar);
 
 		const chatEditInfo = getChatEditInfo(this._keybindingService, this._contextKeyService, this._editor);

From a7b227e320600754b025f5a139c75478e08bfce0 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 27 Feb 2025 17:04:59 -0600
Subject: [PATCH 0499/1815] fix window title issue (#242252)

fix #242248
---
 .../browser/parts/titlebar/commandCenterControl.ts     |  9 ++-------
 src/vs/workbench/browser/parts/titlebar/windowTitle.ts | 10 ++++------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts b/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts
index 23afe340a33e..3202bfacf341 100644
--- a/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts
+++ b/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts
@@ -22,7 +22,6 @@ import { IQuickInputService } from '../../../../platform/quickinput/common/quick
 import { WindowTitle } from './windowTitle.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
-import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
 
 export class CommandCenterControl {
 
@@ -87,7 +86,6 @@ class CommandCenterCenterViewItem extends BaseActionViewItem {
 		@IKeybindingService private _keybindingService: IKeybindingService,
 		@IInstantiationService private _instaService: IInstantiationService,
 		@IEditorGroupsService private _editorGroupService: IEditorGroupsService,
-		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService
 	) {
 		super(undefined, _submenu.actions.find(action => action.id === 'workbench.action.quickOpenWithModes') ?? _submenu.actions[0], options);
 		this._hoverDelegate = options.hoverDelegate ?? getDefaultHoverDelegate('mouse');
@@ -167,9 +165,6 @@ class CommandCenterCenterViewItem extends BaseActionViewItem {
 								labelElement.innerText = this._getLabel();
 							}));
 
-							this._store.add(that._accessibilityService.onDidChangeScreenReaderOptimized(() => labelElement.innerText = this._getLabel(true)));
-
-
 							// update label & tooltip when tabs visibility changes
 							this._store.add(that._editorGroupService.onDidChangeEditorPartOptions(({ newPartOptions, oldPartOptions }) => {
 								if (newPartOptions.showTabs !== oldPartOptions.showTabs) {
@@ -183,10 +178,10 @@ class CommandCenterCenterViewItem extends BaseActionViewItem {
 							return that.getTooltip();
 						}
 
-						private _getLabel(screenReaderModeChanged?: boolean): string {
+						private _getLabel(): string {
 							const { prefix, suffix } = that._windowTitle.getTitleDecorations();
 							let label = that._windowTitle.workspaceName;
-							if (screenReaderModeChanged || that._windowTitle.isCustomTitleFormat()) {
+							if (that._windowTitle.isCustomTitleFormat()) {
 								label = that._windowTitle.getWindowTitle();
 							} else if (that._editorGroupService.partOptions.showTabs === 'none') {
 								label = that._windowTitle.fileName ?? label;
diff --git a/src/vs/workbench/browser/parts/titlebar/windowTitle.ts b/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
index aa7cb6da5c35..9d901f2ffe88 100644
--- a/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
+++ b/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
@@ -130,12 +130,7 @@ export class WindowTitle extends Disposable {
 				this.titleUpdater.schedule();
 			}
 		}));
-		this._register(this.accessibilityService.onDidChangeScreenReaderOptimized(() => {
-			if (this.accessibilityService.isScreenReaderOptimized() && !this.titleIncludesEditorState
-				|| !this.accessibilityService.isScreenReaderOptimized() && this.titleIncludesEditorState) {
-				this.titleUpdater.schedule();
-			}
-		}));
+		this._register(this.accessibilityService.onDidChangeScreenReaderOptimized(() => this.titleUpdater.schedule()));
 	}
 
 	private onConfigurationChanged(event: IConfigurationChangeEvent): void {
@@ -413,6 +408,9 @@ export class WindowTitle extends Disposable {
 	}
 
 	isCustomTitleFormat(): boolean {
+		if (this.accessibilityService.isScreenReaderOptimized() || this.titleIncludesEditorState) {
+			return true;
+		}
 		const title = this.configurationService.inspect<string>(WindowSettingNames.title);
 		const titleSeparator = this.configurationService.inspect<string>(WindowSettingNames.titleSeparator);
 

From 809c7f813f36afe97fab5a0812e921cf80a0df73 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 27 Feb 2025 15:32:54 -0800
Subject: [PATCH 0500/1815] Fix icon sizing for themes with custom font-sizes

Fixes #13719
---
 src/vs/workbench/contrib/chat/browser/media/chat.css          | 4 +++-
 .../contrib/chat/browser/media/chatInlineAnchorWidget.css     | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 9f61911e7fd7..a12c2099f5dc 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1249,12 +1249,14 @@ have to be updated for changes to the rules above, or to support more deeply nes
 }
 
 .interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-icon-label::before {
-	height: 90%;
+	height: 1em;
 	width: auto;
 	padding: 0;
 	line-height: 1em !important;
 	align-self: center;
 
+	font-size: 100%;
+
 	background-size: contain;
 	background-position: center;
 	background-repeat: no-repeat;
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatInlineAnchorWidget.css b/src/vs/workbench/contrib/chat/browser/media/chatInlineAnchorWidget.css
index d3e9784d3e21..324e94d42e26 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatInlineAnchorWidget.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatInlineAnchorWidget.css
@@ -39,6 +39,7 @@
 	display: inline-block;
 	line-height: 100%;
 	overflow: hidden;
+	font-size: 100% !important;
 
 	background-size: contain;
 	background-position: center;

From a4287ca236dfd589743a39b88ef81ba7ce3d40af Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 27 Feb 2025 16:29:18 -0800
Subject: [PATCH 0501/1815] More tweaks to icons

---
 src/vs/workbench/contrib/chat/browser/media/chat.css | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index a12c2099f5dc..6ab881a12fcc 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1245,7 +1245,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 }
 
 .interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-icon-label {
-	gap: 3px;
+	gap: 4px;
 }
 
 .interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-icon-label::before {
@@ -1255,8 +1255,6 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	line-height: 1em !important;
 	align-self: center;
 
-	font-size: 100%;
-
 	background-size: contain;
 	background-position: center;
 	background-repeat: no-repeat;

From 56d1dd4e9a39938c2b2d80a8b82974f6b845fb45 Mon Sep 17 00:00:00 2001
From: Anthony Kim <62267334+anthonykim1@users.noreply.github.com>
Date: Thu, 27 Feb 2025 16:47:19 -0800
Subject: [PATCH 0502/1815] Fix to respect environment reporting setting in
 fish  (#242234)

* fix to respect env setting in fish

* take the if clause outside of __vsc_update_env
---
 .../common/scripts/shellIntegration.fish       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish
index 3d6cf19c36e4..e67701b03b95 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish
@@ -21,6 +21,8 @@ and ! set --query VSCODE_SHELL_INTEGRATION
 or exit
 
 set --global VSCODE_SHELL_INTEGRATION 1
+set --global __vscode_shell_env_reporting $VSCODE_SHELL_ENV_REPORTING
+set -e VSCODE_SHELL_ENV_REPORTING
 
 # Apply any explicit path prefix (see #99878)
 # On fish, '$fish_user_paths' is always prepended to the PATH, for both login and non-login shells, so we need
@@ -149,14 +151,16 @@ function __vsc_update_cwd --on-event fish_prompt
 	end
 end
 
-function __vsc_update_env --on-event fish_prompt
-	__vsc_esc EnvSingleStart 1
-	for line in (env)
-		set myVar (echo $line | awk -F= '{print $1}')
-		set myVal (echo $line | awk -F= '{print $2}')
-		__vsc_esc EnvSingleEntry $myVar (__vsc_escape_value "$myVal")
+if test "$__vscode_shell_env_reporting" = "1"
+	function __vsc_update_env --on-event fish_prompt
+		__vsc_esc EnvSingleStart 1
+		for line in (env)
+			set myVar (echo $line | awk -F= '{print $1}')
+			set myVal (echo $line | awk -F= '{print $2}')
+			__vsc_esc EnvSingleEntry $myVar (__vsc_escape_value "$myVal")
+		end
+		__vsc_esc EnvSingleEnd
 	end
-	__vsc_esc EnvSingleEnd
 end
 
 # Sent at the start of the prompt.

From 29b7ad23bb6b63eafc834ad9878a5b2eac9f9b42 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Thu, 27 Feb 2025 17:25:52 -0800
Subject: [PATCH 0503/1815] Fix NAN for edits in notebook (#242263)

---
 .../browser/chatEditing/chatEditingModifiedNotebookEntry.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 640e7b92be59..ba4c15c6b2d6 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -740,7 +740,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		}, 0);
 
 		const totalNumberOfLines = this.modifiedModel.cells.reduce((totalLines, cell) => totalLines + (cell.textModel?.getLineCount() ?? 0), 0);
-		return Math.min(1, totalNumberOfUpdatedLines / totalNumberOfLines);
+		return totalNumberOfLines === 0 ? 0 : Math.min(1, totalNumberOfUpdatedLines / totalNumberOfLines);
 	}
 
 	override createSnapshot(requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry {

From a45463da09414c9b597c59e2908c2325b07b279f Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Fri, 28 Feb 2025 12:37:07 +1100
Subject: [PATCH 0504/1815] Ensure the notebook selectors are serialized
 (#242264)

---
 src/vs/workbench/contrib/notebook/common/notebookProvider.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/notebook/common/notebookProvider.ts b/src/vs/workbench/contrib/notebook/common/notebookProvider.ts
index ef560ea43fc8..ab14d89413d9 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookProvider.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookProvider.ts
@@ -33,7 +33,7 @@ export class NotebookProviderInfo {
 	readonly priority: RegisteredEditorPriority;
 	readonly providerDisplayName: string;
 
-	private _selectors: NotebookSelector[];
+	public _selectors: NotebookSelector[];
 	get selectors() {
 		return this._selectors;
 	}

From c6b1d6d63170c2f29aef3249c6673bc568948e6c Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 16:13:20 -0800
Subject: [PATCH 0505/1815] fix issue related to no prompts showing up and
 always keep the docs item in the list

---
 .../chatAttachPromptAction.ts                 | 23 ++++-----
 .../dialogs/askToSelectPrompt.ts              | 44 ++++++++++++++---
 .../dialogs/showHowToCreate.ts                | 47 -------------------
 3 files changed, 45 insertions(+), 69 deletions(-)
 delete mode 100644 src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/showHowToCreate.ts

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts
index 40535af08eb8..985dc1b9aa9e 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts
@@ -5,7 +5,6 @@
 
 import { CHAT_CATEGORY } from '../chatActions.js';
 import { localize2 } from '../../../../../../nls.js';
-import { showHowToCreateLink } from './dialogs/showHowToCreate.js';
 import { Action2 } from '../../../../../../platform/actions/common/actions.js';
 import { IPromptsService } from '../../../common/promptSyntax/service/types.js';
 import { ILabelService } from '../../../../../../platform/label/common/label.js';
@@ -53,19 +52,13 @@ export class AttachPromptAction extends Action2 {
 		// find all prompt files in the user workspace
 		const promptFiles = await promptsService.listPromptFiles();
 
-		// if no prompt files found, show instructions on how to create one
-		if (promptFiles.length === 0) {
-			return await showHowToCreateLink(openerService, quickInputService);
-		}
-
-		await askToSelectPrompt(
-			{
-				...options,
-				promptFiles,
-				labelService,
-				viewsService,
-				openerService,
-				quickInputService,
-			});
+		await askToSelectPrompt({
+			...options,
+			promptFiles,
+			labelService,
+			viewsService,
+			openerService,
+			quickInputService,
+		});
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
index 08b7657eecef..10033415a359 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
@@ -11,6 +11,7 @@ import { IChatAttachPromptActionOptions } from '../chatAttachPromptAction.js';
 import { IPromptPath } from '../../../../common/promptSyntax/service/types.js';
 import { DisposableStore } from '../../../../../../../base/common/lifecycle.js';
 import { dirname, extUri } from '../../../../../../../base/common/resources.js';
+import { DOCUMENTATION_URL } from '../../../../common/promptSyntax/constants.js';
 import { isLinux, isWindows } from '../../../../../../../base/common/platform.js';
 import { ILabelService } from '../../../../../../../platform/label/common/label.js';
 import { IOpenerService } from '../../../../../../../platform/opener/common/opener.js';
@@ -50,6 +51,20 @@ export interface ISelectPromptOptions {
 	readonly quickInputService: IQuickInputService;
 }
 
+/**
+ * A special quick pick item that links to the documentation.
+ */
+const DOCS_OPTION: WithUriValue<IQuickPickItem> = {
+	type: 'item',
+	label: localize(
+		'commands.prompts.use.select-dialog.docs-label',
+		'Learn how to create reusable prompts',
+	),
+	description: DOCUMENTATION_URL,
+	tooltip: DOCUMENTATION_URL,
+	value: URI.parse(DOCUMENTATION_URL),
+};
+
 /**
  * Shows the prompt selection dialog to the user that allows to select a prompt file(s).
  *
@@ -61,16 +76,15 @@ export const askToSelectPrompt = async (
 ): Promise<void> => {
 	const { promptFiles, resource, quickInputService, labelService } = options;
 
-	// a sanity check - this function must be used only if there are prompt files to show
-	assert(
-		promptFiles.length > 0,
-		'Prompt files list must not be empty.',
-	);
-
 	const fileOptions = promptFiles.map(({ uri }) => {
 		return createPickItem(uri, labelService);
 	});
 
+	/**
+	 * Add a link to the documentation to the end of prompts list.
+	 */
+	fileOptions.push(DOCS_OPTION);
+
 	// if a resource is provided, create an `activeItem` for it to pre-select
 	// it in the UI, and sort the list so the active item appears at the top
 	let activeItem: WithUriValue<IQuickPickItem> | undefined;
@@ -101,6 +115,13 @@ export const askToSelectPrompt = async (
 		});
 	}
 
+	/**
+	 * If still no active item present, fall back to the first item in the list.
+	 */
+	if (!activeItem) {
+		activeItem = fileOptions[0];
+	}
+
 	// otherwise show the prompt file selection dialog
 	const { openerService } = options;
 
@@ -129,8 +150,17 @@ export const askToSelectPrompt = async (
 			const { selectedItems } = quickPick;
 			const { alt, ctrlCmd } = quickPick.keyMods;
 
+			// sanity check to confirm our expectations
+			assert(
+				selectedItems.length === 1,
+				`Only one item can be accepted, got '${selectedItems.length}'.`,
+			);
+
+			// whether user selected the docs link option
+			const docsSelected = (selectedItems[0] === DOCS_OPTION);
+
 			// if `super` key was pressed, open the selected prompt file(s)
-			if (ctrlCmd) {
+			if (ctrlCmd || docsSelected) {
 				return await openFiles(selectedItems, openerService);
 			}
 
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/showHowToCreate.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/showHowToCreate.ts
deleted file mode 100644
index 73a55bc5347a..000000000000
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/showHowToCreate.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { localize } from '../../../../../../../nls.js';
-import { URI } from '../../../../../../../base/common/uri.js';
-import { WithUriValue } from '../../../../../../../base/common/types.js';
-import { DOCUMENTATION_URL } from '../../../../common/promptSyntax/constants.js';
-import { IOpenerService } from '../../../../../../../platform/opener/common/opener.js';
-import { IQuickInputService, IQuickPickItem } from '../../../../../../../platform/quickinput/common/quickInput.js';
-
-/**
- * Shows the dialogs with a link to docs.
- */
-
-export const showHowToCreateLink = async (
-	openerService: IOpenerService,
-	quickInputService: IQuickInputService
-): Promise<void> => {
-	const docsQuickPick: WithUriValue<IQuickPickItem> = {
-		type: 'item',
-		label: localize(
-			'commands.prompts.use.select-dialog.empty.docs-label',
-			'Learn how to create reusable prompts'
-		),
-		description: DOCUMENTATION_URL,
-		tooltip: DOCUMENTATION_URL,
-		value: URI.parse(DOCUMENTATION_URL),
-	};
-
-	const result = await quickInputService.pick(
-		[docsQuickPick],
-		{
-			placeHolder: localize(
-				'commands.prompts.use.select-dialog.empty.placeholder',
-				'No prompts found.'
-			),
-			canPickMany: false,
-		});
-
-	if (!result) {
-		return;
-	}
-
-	await openerService.open(result.value);
-};

From 75854809afa439b169b32bc5a137d09afbd1aaf9 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 16:23:28 -0800
Subject: [PATCH 0506/1815] improve doc comments

---
 .../chatAttachPromptAction/dialogs/askToSelectPrompt.ts     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
index 10033415a359..a9929afb7546 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
@@ -117,6 +117,12 @@ export const askToSelectPrompt = async (
 
 	/**
 	 * If still no active item present, fall back to the first item in the list.
+	 * This can happen only if command was invoked not from a focused prompt file
+	 * (hence the `resource` is not provided in the options).
+	 *
+	 * Fixes the two main cases:
+	 *  - when no prompt files found it, pre-selects the documentation link
+	 *  - when there is only a single prompt file, pre-selects it
 	 */
 	if (!activeItem) {
 		activeItem = fileOptions[0];

From 90ba895dcf576e262bd23a480dd287c0342ac492 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 16:31:43 -0800
Subject: [PATCH 0507/1815] rename "global" prompts to "user" ones

---
 .../common/promptsSync/promptsSync.ts         |  2 +-
 .../createPromptCommand.ts                    | 22 +++++++++----------
 .../dialogs/askForPromptName.ts               |  2 +-
 .../dialogs/askForPromptSourceFolder.ts       |  2 +-
 .../promptSyntax/service/promptsService.ts    | 14 ++++++------
 .../chat/common/promptSyntax/service/types.ts |  4 ++--
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/vs/platform/userDataSync/common/promptsSync/promptsSync.ts b/src/vs/platform/userDataSync/common/promptsSync/promptsSync.ts
index 918e1cf6eb85..8c4324017771 100644
--- a/src/vs/platform/userDataSync/common/promptsSync/promptsSync.ts
+++ b/src/vs/platform/userDataSync/common/promptsSync/promptsSync.ts
@@ -34,7 +34,7 @@ export function parsePrompts(syncData: ISyncData): IStringDictionary<string> {
 }
 
 /**
- * Synchronizer class for the global prompt files.
+ * Synchronizer class for the "user" prompt files.
  * Adopted from {@link SnippetsSynchroniser}.
  */
 export class PromptsSynchronizer extends AbstractSynchroniser implements IUserDataSynchroniser {
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
index 28e4f6b52a6b..5bc04044144d 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
@@ -30,9 +30,9 @@ const BASE_COMMAND_ID = 'workbench.command.prompts.create';
 const LOCAL_COMMAND_ID = `${BASE_COMMAND_ID}.local`;
 
 /**
- * Command ID for creating a 'global' prompt.
+ * Command ID for creating a 'user' prompt.
  */
-const GLOBAL_COMMAND_ID = `${BASE_COMMAND_ID}.global`;
+const USER_COMMAND_ID = `${BASE_COMMAND_ID}.user`;
 
 /**
  * Title of the 'create local prompt' command.
@@ -40,9 +40,9 @@ const GLOBAL_COMMAND_ID = `${BASE_COMMAND_ID}.global`;
 const LOCAL_COMMAND_TITLE = localize('commands.prompts.create.title.local', "Create Prompt");
 
 /**
- * Title of the 'create global prompt' command.
+ * Title of the 'create user prompt' command.
  */
-const GLOBAL_COMMAND_TITLE = localize('commands.prompts.create.title.global', "Create Global Prompt");
+const USER_COMMAND_TITLE = localize('commands.prompts.create.title.user', "Create User Prompt");
 
 /**
  * The command implementation.
@@ -95,7 +95,7 @@ const command = async (
 /**
  * Factory for creating the command handler with specific prompt `type`.
  */
-const commandFactory = (type: 'local' | 'global') => {
+const commandFactory = (type: 'local' | 'user') => {
 	return async (accessor: ServicesAccessor): Promise<void> => {
 		return command(accessor, type);
 	};
@@ -111,12 +111,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 
 /**
- * Register the "Create Global Prompt" command.
+ * Register the "Create User Prompt" command.
  */
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-	id: GLOBAL_COMMAND_ID,
+	id: USER_COMMAND_ID,
 	weight: KeybindingWeight.WorkbenchContrib,
-	handler: commandFactory('global'),
+	handler: commandFactory('user'),
 });
 
 /**
@@ -131,12 +131,12 @@ appendToCommandPalette(
 );
 
 /**
- * Register the "Create Global Prompt" command in the command palette.
+ * Register the "Create User Prompt" command in the command palette.
  */
 appendToCommandPalette(
 	{
-		id: GLOBAL_COMMAND_ID,
-		title: GLOBAL_COMMAND_TITLE,
+		id: USER_COMMAND_ID,
+		title: USER_COMMAND_TITLE,
 		category: CHAT_CATEGORY,
 	},
 );
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/dialogs/askForPromptName.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/dialogs/askForPromptName.ts
index 0c7ff2db72f3..cd412256291e 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/dialogs/askForPromptName.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/dialogs/askForPromptName.ts
@@ -11,7 +11,7 @@ import { IQuickInputService } from '../../../../../../../../platform/quickinput/
  * Asks the user for a prompt name.
  */
 export const askForPromptName = async (
-	_type: 'local' | 'global',
+	_type: 'local' | 'user',
 	quickInputService: IQuickInputService,
 ): Promise<string | undefined> => {
 	const result = await quickInputService.input(
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/dialogs/askForPromptSourceFolder.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/dialogs/askForPromptSourceFolder.ts
index 68f93da4348f..2f446a81472d 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/dialogs/askForPromptSourceFolder.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/dialogs/askForPromptSourceFolder.ts
@@ -21,7 +21,7 @@ interface IAskForFolderOptions {
 	/**
 	 * Prompt type.
 	 */
-	readonly type: 'local' | 'global';
+	readonly type: 'local' | 'user';
 
 	readonly labelService: ILabelService;
 	readonly openerService: IOpenerService;
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 4f0de893ce3c..dc1ac08c94da 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.ts
@@ -82,11 +82,11 @@ export class PromptsService extends Disposable implements IPromptsService {
 	}
 
 	public async listPromptFiles(): Promise<readonly IPromptPath[]> {
-		const globalLocations = [this.userDataService.currentProfile.promptsHome];
+		const userLocations = [this.userDataService.currentProfile.promptsHome];
 
 		const prompts = await Promise.all([
-			this.fileLocator.listFilesIn(globalLocations, [])
-				.then(withType('global')),
+			this.fileLocator.listFilesIn(userLocations, [])
+				.then(withType('user')),
 			this.fileLocator.listFiles([])
 				.then(withType('local')),
 		]);
@@ -100,11 +100,11 @@ export class PromptsService extends Disposable implements IPromptsService {
 		// sanity check to make sure we don't miss a new prompt type
 		// added in the future
 		assert(
-			type === 'local' || type === 'global',
+			type === 'local' || type === 'user',
 			`Unknown prompt type '${type}'.`,
 		);
 
-		const prompts = (type === 'global')
+		const prompts = (type === 'user')
 			? [this.userDataService.currentProfile.promptsHome]
 			: this.fileLocator.getConfigBasedSourceFolders();
 
@@ -116,7 +116,7 @@ export class PromptsService extends Disposable implements IPromptsService {
  * Utility to add a provided prompt `type` to a prompt URI.
  */
 const addType = (
-	type: 'local' | 'global',
+	type: 'local' | 'user',
 ): (uri: URI) => IPromptPath => {
 	return (uri) => {
 		return { uri, type: type };
@@ -127,7 +127,7 @@ const addType = (
  * Utility to add a provided prompt `type` to a list of prompt URIs.
  */
 const withType = (
-	type: 'local' | 'global',
+	type: 'local' | 'user',
 ): (uris: readonly URI[]) => (readonly IPromptPath[]) => {
 	return (uris) => {
 		return uris
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/service/types.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/service/types.ts
index cf8576067f24..1f29a5811b5e 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/service/types.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/service/types.ts
@@ -17,9 +17,9 @@ export const IPromptsService = createDecorator<IPromptsService>('IPromptsService
 /**
 * Supported prompt types.
 *  - `local` means the prompt is a local file.
-*  - `global` means a "roamble" prompt file (similar to snippets).
+*  - `user` means a "roamble" prompt file (similar to snippets).
 */
-type TPromptsType = 'local' | 'global';
+type TPromptsType = 'local' | 'user';
 
 /**
  * Represents a prompt path with its type.

From f959c07c9b189efc282a57445127020550f379a3 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 16:54:47 -0800
Subject: [PATCH 0508/1815] hide full filepath for all "user" prompts

---
 .../dialogs/askToSelectPrompt.ts              | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
index a9929afb7546..77cd2a0e4a21 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
@@ -76,8 +76,14 @@ export const askToSelectPrompt = async (
 ): Promise<void> => {
 	const { promptFiles, resource, quickInputService, labelService } = options;
 
-	const fileOptions = promptFiles.map(({ uri }) => {
-		return createPickItem(uri, labelService);
+	// a sanity check - this function must be used only if there are prompt files to show
+	assert(
+		promptFiles.length > 0,
+		'Prompt files list must not be empty.',
+	);
+
+	const fileOptions = promptFiles.map((promptFile) => {
+		return createPickItem(promptFile, labelService);
 	});
 
 	/**
@@ -98,7 +104,12 @@ export const askToSelectPrompt = async (
 		// the currently active prompt file is always available in the selection dialog,
 		// even if it is not included in the prompts list otherwise(from location setting)
 		if (!activeItem) {
-			activeItem = createPickItem(resource, labelService);
+			activeItem = createPickItem({
+				uri: resource,
+				// "user" prompts are always registered in the prompts list, hence it
+				// should be safe to assume that `resource` is not "user" prompt here
+				type: 'local',
+			}, labelService);
 			fileOptions.push(activeItem);
 		}
 
@@ -191,16 +202,30 @@ export const askToSelectPrompt = async (
  * Creates a quick pick item for a prompt.
  */
 const createPickItem = (
-	uri: URI,
+	promptFile: IPromptPath,
 	labelService: ILabelService,
 ): WithUriValue<IQuickPickItem> => {
+	const { uri, type } = promptFile;
 	const fileWithoutExtension = getCleanPromptName(uri);
 
+	// if a "user" prompt, don't show its filesystem path in
+	// the user interface, but do that for all the "local" ones
+	const description = (type === 'user')
+		? localize(
+			'user-prompt.capitalized',
+			'User prompt',
+		)
+		: labelService.getUriLabel(dirname(uri), { relative: true });
+
+	const tooltip = (type === 'user')
+		? description
+		: uri.fsPath;
+
 	return {
 		type: 'item',
 		label: fileWithoutExtension,
-		description: labelService.getUriLabel(dirname(uri), { relative: true }),
-		tooltip: uri.fsPath,
+		description,
+		tooltip,
 		value: uri,
 		id: uri.toString(),
 	};

From 2daf886e20631c9b236a1f574fa9d4d05c61942c Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 18:17:28 -0800
Subject: [PATCH 0509/1815] fix merge conflict

---
 .../chatAttachPromptAction/dialogs/askToSelectPrompt.ts     | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
index 77cd2a0e4a21..79d7ceccd250 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/dialogs/askToSelectPrompt.ts
@@ -76,12 +76,6 @@ export const askToSelectPrompt = async (
 ): Promise<void> => {
 	const { promptFiles, resource, quickInputService, labelService } = options;
 
-	// a sanity check - this function must be used only if there are prompt files to show
-	assert(
-		promptFiles.length > 0,
-		'Prompt files list must not be empty.',
-	);
-
 	const fileOptions = promptFiles.map((promptFile) => {
 		return createPickItem(promptFile, labelService);
 	});

From e24a783761520514b6a6930f658b0a983876fa4d Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Thu, 27 Feb 2025 21:20:25 -0800
Subject: [PATCH 0510/1815] Avoid tool confirm keybinding conflict with "keep
 edits" keybinding (#242269)

---
 .../contrib/chat/browser/actions/chatToolActions.ts         | 6 ++++--
 .../chat/browser/chatContentParts/chatToolInvocationPart.ts | 5 +++++
 src/vs/workbench/contrib/chat/common/chatContextKeys.ts     | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
index 1f059820435b..56d1b4e5a199 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
@@ -7,6 +7,7 @@ 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/chatContextKeys.js';
 import { IChatToolInvocation } from '../../common/chatService.js';
@@ -24,9 +25,10 @@ class AcceptToolConfirmation extends Action2 {
 			f1: false,
 			category: CHAT_CATEGORY,
 			keybinding: {
-				when: ChatContextKeys.inChatSession,
+				when: ContextKeyExpr.and(ChatContextKeys.inChatSession, ChatContextKeys.Editing.hasToolConfirmation),
 				primary: KeyMod.CtrlCmd | KeyCode.Enter,
-				weight: KeybindingWeight.EditorContrib
+				// Override chatEditor.action.accept
+				weight: KeybindingWeight.WorkbenchContrib + 1,
 			},
 		});
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
index dd9ce637084a..d9070aa16184 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
@@ -13,8 +13,10 @@ import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownR
 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 { ChatContextKeys } from '../../common/chatContextKeys.js';
 import { IChatMarkdownContent, IChatProgressMessage, IChatTerminalToolInvocationData, IChatToolInvocation, IChatToolInvocationSerialized } from '../../common/chatService.js';
 import { IChatRendererContent } from '../../common/chatViewModel.js';
 import { CodeBlockModelCollection } from '../../common/codeBlockModelCollection.js';
@@ -127,6 +129,7 @@ class ChatToolInvocationSubPart extends Disposable {
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@IModelService private readonly modelService: IModelService,
 		@ILanguageService private readonly languageService: ILanguageService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 	) {
 		super();
 
@@ -291,11 +294,13 @@ class ChatToolInvocationSubPart extends Disposable {
 			buttons
 		));
 
+		ChatContextKeys.Editing.hasToolConfirmation.bindTo(this.contextKeyService).set(true);
 		this._register(confirmWidget.onDidClick(button => {
 			toolInvocation.confirmed.complete(button.data);
 		}));
 		this._register(confirmWidget.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
 		toolInvocation.confirmed.p.then(() => {
+			ChatContextKeys.Editing.hasToolConfirmation.bindTo(this.contextKeyService).set(false);
 			this._onNeedsRerender.fire();
 		});
 		return confirmWidget.domNode;
diff --git a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
index 591bbdcad92c..b88c1ac7673e 100644
--- a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
@@ -84,5 +84,6 @@ export namespace ChatContextKeys {
 		hasToolsAgent: new RawContextKey<boolean>('chatHasToolsAgent', false, { type: 'boolean', description: localize('chatEditingHasToolsAgent', "True when a tools agent is registered.") }),
 		agentMode: new RawContextKey<boolean>('chatAgentMode', false, { type: 'boolean', description: localize('chatEditingAgentMode', "True when edits is in agent mode.") }),
 		agentModeDisallowed: new RawContextKey<boolean>('chatAgentModeDisallowed', undefined, { type: 'boolean', description: localize('chatAgentModeDisallowed', "True when agent mode is not allowed.") }), // experiment-driven disablement
+		hasToolConfirmation: new RawContextKey<boolean>('chatHasToolConfirmation', false, { type: 'boolean', description: localize('chatEditingHasToolConfirmation', "True when a tool confirmation is present.") }),
 	};
 }

From 4404a4a551160073eb6c75b73f6be2df5da8bdcc Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 17:37:55 -0800
Subject: [PATCH 0511/1815] add the new "enablement" config setting

---
 src/vs/platform/prompts/common/config.ts | 43 ++++++++++++++----------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/vs/platform/prompts/common/config.ts b/src/vs/platform/prompts/common/config.ts
index 06032e80341a..25f2dfab6517 100644
--- a/src/vs/platform/prompts/common/config.ts
+++ b/src/vs/platform/prompts/common/config.ts
@@ -7,11 +7,11 @@ import { IConfigurationService } from '../../configuration/common/configuration.
 
 /**
  * Configuration helper for the `reusable prompts` feature.
- * @see {@link CONFIG_KEY}.
+ * @see {@link CONFIG_KEY} and {@link LOCATIONS_CONFIG_KEY}.
  *
  * ### Functions
  *
- * - {@link getValue} allows to current read configuration value
+ * - {@link getLocationsValue} allows to current read configuration value
  * - {@link enabled} allows to check if the feature is enabled
  * - {@link promptSourceFolders} gets list of source folders for prompt files
  *
@@ -70,7 +70,12 @@ export namespace PromptsConfig {
 	 * Configuration key for the `prompt files` feature (also
 	 * known as `prompt files`, `prompt instructions`, etc.).
 	 */
-	export const CONFIG_KEY: string = 'chat.promptFiles';
+	export const CONFIG_KEY: string = 'chat.reusablePrompts';
+
+	/**
+	 * Configuration key for the locations of reusable prompt files.
+	 */
+	export const LOCATIONS_CONFIG_KEY: string = 'chat.reusablePrompt.locations';
 
 	/**
 	 * Default reusable prompt files source folder.
@@ -78,12 +83,25 @@ export namespace PromptsConfig {
 	export const DEFAULT_SOURCE_FOLDER = '.github/prompts';
 
 	/**
-	 * Get value of the `prompt files` configuration setting.
+	 * Checks if the feature is enabled.
+	 * @see {@link CONFIG_KEY}.
 	 */
-	export const getValue = (
+	export const enabled = (
+		configService: IConfigurationService,
+	): boolean => {
+		const enabledValue = configService.getValue(CONFIG_KEY);
+
+		return asBoolean(enabledValue) ?? false;
+	};
+
+	/**
+	 * Get value of the `reusable prompt locations` configuration setting.
+	 * @see {@link LOCATIONS_CONFIG_KEY}.
+	 */
+	export const getLocationsValue = (
 		configService: IConfigurationService,
 	): Record<string, boolean> | undefined => {
-		const configValue = configService.getValue(CONFIG_KEY);
+		const configValue = configService.getValue(LOCATIONS_CONFIG_KEY);
 
 		if (configValue === undefined || configValue === null || Array.isArray(configValue)) {
 			return undefined;
@@ -111,17 +129,6 @@ export namespace PromptsConfig {
 		return undefined;
 	};
 
-	/**
-	 * Checks if the feature is enabled.
-	 */
-	export const enabled = (
-		configService: IConfigurationService,
-	): boolean => {
-		const value = getValue(configService);
-
-		return value !== undefined;
-	};
-
 	/**
 	 * Gets list of source folders for prompt files.
 	 * Defaults to {@link DEFAULT_SOURCE_FOLDER}.
@@ -129,7 +136,7 @@ export namespace PromptsConfig {
 	export const promptSourceFolders = (
 		configService: IConfigurationService,
 	): string[] => {
-		const value = getValue(configService);
+		const value = getLocationsValue(configService);
 
 		// note! the `value &&` part handles the `undefined`, `null`, and `false` cases
 		if (value && (typeof value === 'object')) {

From 78328fe7c676792649214a7c04b8190fcc8c123c Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 17:38:06 -0800
Subject: [PATCH 0512/1815] update unit tests

---
 .../prompts/test/common/config.test.ts        | 24 ++++++++++--------
 .../contrib/chat/browser/chat.contribution.ts | 25 ++++++++++++++++---
 .../utils/promptFilesLocator.test.ts          | 12 ++++++---
 3 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/src/vs/platform/prompts/test/common/config.test.ts b/src/vs/platform/prompts/test/common/config.test.ts
index 672ae2c74c0e..3ab37362836b 100644
--- a/src/vs/platform/prompts/test/common/config.test.ts
+++ b/src/vs/platform/prompts/test/common/config.test.ts
@@ -16,10 +16,14 @@ import { IConfigurationOverrides, IConfigurationService } from '../../../configu
 const createMock = <T>(value: T): IConfigurationService => {
 	return mockService<IConfigurationService>({
 		getValue(key?: string | IConfigurationOverrides) {
-			assert.strictEqual(
-				key,
-				PromptsConfig.CONFIG_KEY,
-				`Mocked service supports only one configuration key: '${PromptsConfig.CONFIG_KEY}'.`,
+			assert(
+				typeof key === 'string',
+				`Expected string configuration key, got '${typeof key}'.`,
+			);
+
+			assert(
+				[PromptsConfig.CONFIG_KEY, PromptsConfig.LOCATIONS_CONFIG_KEY].includes(key),
+				`Unsupported configuration key '${key}'.`,
 			);
 
 			return value;
@@ -35,7 +39,7 @@ suite('PromptsConfig', () => {
 			const configService = createMock(undefined);
 
 			assert.strictEqual(
-				PromptsConfig.getValue(configService),
+				PromptsConfig.getLocationsValue(configService),
 				undefined,
 				'Must read correct value.',
 			);
@@ -45,7 +49,7 @@ suite('PromptsConfig', () => {
 			const configService = createMock(null);
 
 			assert.strictEqual(
-				PromptsConfig.getValue(configService),
+				PromptsConfig.getLocationsValue(configService),
 				undefined,
 				'Must read correct value.',
 			);
@@ -54,7 +58,7 @@ suite('PromptsConfig', () => {
 		suite('• object', () => {
 			test('• empty', () => {
 				assert.deepStrictEqual(
-					PromptsConfig.getValue(createMock({})),
+					PromptsConfig.getLocationsValue(createMock({})),
 					{},
 					'Must read correct value.',
 				);
@@ -62,7 +66,7 @@ suite('PromptsConfig', () => {
 
 			test('• only valid strings', () => {
 				assert.deepStrictEqual(
-					PromptsConfig.getValue(createMock({
+					PromptsConfig.getLocationsValue(createMock({
 						'/root/.bashrc': true,
 						'../../folder/.hidden-folder/config.xml': true,
 						'/srv/www/Public_html/.htaccess': true,
@@ -96,7 +100,7 @@ suite('PromptsConfig', () => {
 
 			test('• filters out non valid entries', () => {
 				assert.deepStrictEqual(
-					PromptsConfig.getValue(createMock({
+					PromptsConfig.getLocationsValue(createMock({
 						'/etc/hosts.backup': '\t\n\t',
 						'./run.tests.sh': '\v',
 						'../assets/img/logo.v2.png': true,
@@ -135,7 +139,7 @@ suite('PromptsConfig', () => {
 
 			test('• only invalid or false values', () => {
 				assert.deepStrictEqual(
-					PromptsConfig.getValue(createMock({
+					PromptsConfig.getLocationsValue(createMock({
 						'/etc/hosts.backup': '\t\n\t',
 						'./run.tests.sh': '\v',
 						'../assets/IMG/logo.v2.png': '',
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index beb5e2a1bc9c..cdeb416aaf6c 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -200,19 +200,36 @@ configurationRegistry.registerConfiguration({
 			tags: ['experimental', 'onExp']
 		},
 		[PromptsConfig.CONFIG_KEY]: {
+			type: 'boolean',
+			title: nls.localize(
+				'chat.reusablePrompts.config.enabled.title',
+				"Reusable Prompts",
+			),
+			markdownDescription: nls.localize(
+				'chat.reusablePrompts.config.enabled.description',
+				"Enable reusable prompts (`*{0}`) in Chat, Edits, and Inline Chat sessions. [Learn More]({0}).",
+				PROMPT_FILE_EXTENSION,
+				DOCUMENTATION_URL,
+			),
+			default: true,
+			restricted: true,
+			disallowConfigurationDefault: true,
+			tags: ['experimental'],
+		},
+		[PromptsConfig.LOCATIONS_CONFIG_KEY]: {
 			type: 'object',
 			title: nls.localize(
-				'chat.promptFiles.config.title',
-				"Prompt Files",
+				'chat.reusablePrompts.config.locations.title',
+				"Reusable Prompt Locations",
 			),
 			markdownDescription: nls.localize(
-				'chat.promptFiles.config.description',
+				'chat.reusablePrompts.config.locations.description',
 				"Specify location(s) of reusable prompt files (`*{0}`) that can be attached in Chat, Edits, and Inline Chat sessions. [Learn More]({1}).\n\nRelative paths are resolved from the root folder(s) of your workspace.",
 				PROMPT_FILE_EXTENSION,
 				DOCUMENTATION_URL,
 			),
 			default: {
-				[PromptsConfig.DEFAULT_SOURCE_FOLDER]: false,
+				[PromptsConfig.DEFAULT_SOURCE_FOLDER]: true,
 			},
 			required: [PromptsConfig.DEFAULT_SOURCE_FOLDER],
 			additionalProperties: { type: 'boolean' },
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 14347ec2af32..8228a56d3cf1 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
@@ -27,10 +27,14 @@ import { IWorkspace, IWorkspaceContextService, IWorkspaceFolder } from '../../..
 const mockConfigService = <T>(value: T): IConfigurationService => {
 	return mockService<IConfigurationService>({
 		getValue(key?: string | IConfigurationOverrides) {
-			assert.strictEqual(
-				key,
-				PromptsConfig.CONFIG_KEY,
-				`Mocked service supports only one configuration key: '${PromptsConfig.CONFIG_KEY}'.`,
+			assert(
+				typeof key === 'string',
+				`Expected string configuration key, got '${typeof key}'.`,
+			);
+
+			assert(
+				[PromptsConfig.CONFIG_KEY, PromptsConfig.LOCATIONS_CONFIG_KEY].includes(key),
+				`Unsupported configuration key '${key}'.`,
 			);
 
 			return value;

From a054f1a87b4204a7e93f2473751a097ae73f68f4 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 17:57:12 -0800
Subject: [PATCH 0513/1815] update config keys

---
 src/vs/platform/prompts/common/config.ts      |  9 ++--
 .../contrib/chat/browser/chat.contribution.ts |  1 +
 .../contributions/usePromptCommand.ts         | 51 +++++++++++--------
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/src/vs/platform/prompts/common/config.ts b/src/vs/platform/prompts/common/config.ts
index 25f2dfab6517..abc0405ff2e9 100644
--- a/src/vs/platform/prompts/common/config.ts
+++ b/src/vs/platform/prompts/common/config.ts
@@ -5,6 +5,9 @@
 
 import { IConfigurationService } from '../../configuration/common/configuration.js';
 
+// TODO: @lego - update the docs
+// TODO: @lego - update unit tests
+
 /**
  * Configuration helper for the `reusable prompts` feature.
  * @see {@link CONFIG_KEY} and {@link LOCATIONS_CONFIG_KEY}.
@@ -67,15 +70,15 @@ import { IConfigurationService } from '../../configuration/common/configuration.
  */
 export namespace PromptsConfig {
 	/**
-	 * Configuration key for the `prompt files` feature (also
-	 * known as `prompt files`, `prompt instructions`, etc.).
+	 * Configuration key for the `reusable prompts` feature
+	 * (also known as `prompt files`, `prompt instructions`, etc.).
 	 */
 	export const CONFIG_KEY: string = 'chat.reusablePrompts';
 
 	/**
 	 * Configuration key for the locations of reusable prompt files.
 	 */
-	export const LOCATIONS_CONFIG_KEY: string = 'chat.reusablePrompt.locations';
+	export const LOCATIONS_CONFIG_KEY: string = 'chat.reusablePromptsLocations';
 
 	/**
 	 * Default reusable prompt files source folder.
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index cdeb416aaf6c..65afec410911 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -216,6 +216,7 @@ configurationRegistry.registerConfiguration({
 			disallowConfigurationDefault: true,
 			tags: ['experimental'],
 		},
+		// TODO: @lego - add more tags?
 		[PromptsConfig.LOCATIONS_CONFIG_KEY]: {
 			type: 'object',
 			title: nls.localize(
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
index 0c486a00d8d9..de479f2ef0e8 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
@@ -8,12 +8,15 @@ import { URI } from '../../../../../../base/common/uri.js';
 import { CHAT_CATEGORY } from '../../actions/chatActions.js';
 import { IChatWidget, IChatWidgetService } from '../../chat.js';
 import { KeyMod, KeyCode } from '../../../../../../base/common/keyCodes.js';
+import { Registry } from '../../../../../../platform/registry/common/platform.js';
 import { IViewsService } from '../../../../../services/views/common/viewsService.js';
 import { isPromptFile } from '../../../../../../platform/prompts/common/constants.js';
+import { LifecyclePhase } from '../../../../../services/lifecycle/common/lifecycle.js';
 import { IEditorService } from '../../../../../services/editor/common/editorService.js';
 import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
 import { appendToCommandPalette } from '../../../../files/browser/fileActions.contribution.js';
 import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IWorkbenchContributionsRegistry, Extensions } from '../../../../../common/contributions.js';
 import { IActiveCodeEditor, isCodeEditor, isDiffEditor } from '../../../../../../editor/browser/editorBrowser.js';
 import { KeybindingsRegistry, KeybindingWeight } from '../../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IChatAttachPromptActionOptions, ATTACH_PROMPT_ACTION_ID } from '../../actions/chatAttachPromptAction/chatAttachPromptAction.js';
@@ -63,27 +66,6 @@ const command = async (
 	await commandService.executeCommand(ATTACH_PROMPT_ACTION_ID, options);
 };
 
-/**
- * Register the "Use Prompt" command with its keybinding.
- */
-KeybindingsRegistry.registerCommandAndKeybindingRule({
-	id: COMMAND_ID,
-	weight: KeybindingWeight.WorkbenchContrib,
-	primary: COMMAND_KEY_BINDING,
-	handler: command,
-});
-
-/**
- * Register the "Use Prompt" command in the `command palette`.
- */
-appendToCommandPalette(
-	{
-		id: COMMAND_ID,
-		title: localize('commands.prompts.use.title', "Use Prompt"),
-		category: CHAT_CATEGORY,
-	},
-);
-
 /**
  * Get chat widget reference to attach prompt to.
  */
@@ -144,3 +126,30 @@ const getActivePromptUri = (
 
 	return undefined;
 };
+
+/**
+ * Register the "Use Prompt" command with its keybinding.
+ */
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: COMMAND_ID,
+	weight: KeybindingWeight.WorkbenchContrib,
+	primary: COMMAND_KEY_BINDING,
+	handler: command,
+});
+
+/**
+ * Register the "Use Prompt" command in the `command palette`.
+ */
+appendToCommandPalette(
+	{
+		id: COMMAND_ID,
+		title: localize('commands.prompts.use.title', "Use Prompt"),
+		category: CHAT_CATEGORY,
+	},
+);
+
+class RunIfEnabled { }
+
+// register the command as a workbench contribution
+Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench)
+	.registerWorkbenchContribution(RunIfEnabled, LifecyclePhase.Eventually);

From dbdce753a2dfd6e9856a19d3c27a2552874bbb6a Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 18:51:37 -0800
Subject: [PATCH 0514/1815] conditionally register 'use prompt' command

---
 src/vs/platform/prompts/common/config.ts             |  6 ++++++
 .../promptSyntax/contributions/usePromptCommand.ts   | 12 +++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/vs/platform/prompts/common/config.ts b/src/vs/platform/prompts/common/config.ts
index abc0405ff2e9..4bba6295f5b5 100644
--- a/src/vs/platform/prompts/common/config.ts
+++ b/src/vs/platform/prompts/common/config.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../contextkey/common/contextkey.js';
 
 // TODO: @lego - update the docs
 // TODO: @lego - update unit tests
@@ -97,6 +98,11 @@ export namespace PromptsConfig {
 		return asBoolean(enabledValue) ?? false;
 	};
 
+	/**
+	 * TODO: @lego
+	 */
+	export const ENABLED_CTX = ContextKeyExpr.equals(`config.${CONFIG_KEY}`, true);
+
 	/**
 	 * Get value of the `reusable prompt locations` configuration setting.
 	 * @see {@link LOCATIONS_CONFIG_KEY}.
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
index de479f2ef0e8..22b9f8b41c6f 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
@@ -8,15 +8,13 @@ import { URI } from '../../../../../../base/common/uri.js';
 import { CHAT_CATEGORY } from '../../actions/chatActions.js';
 import { IChatWidget, IChatWidgetService } from '../../chat.js';
 import { KeyMod, KeyCode } from '../../../../../../base/common/keyCodes.js';
-import { Registry } from '../../../../../../platform/registry/common/platform.js';
+import { PromptsConfig } from '../../../../../../platform/prompts/common/config.js';
 import { IViewsService } from '../../../../../services/views/common/viewsService.js';
 import { isPromptFile } from '../../../../../../platform/prompts/common/constants.js';
-import { LifecyclePhase } from '../../../../../services/lifecycle/common/lifecycle.js';
 import { IEditorService } from '../../../../../services/editor/common/editorService.js';
 import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
 import { appendToCommandPalette } from '../../../../files/browser/fileActions.contribution.js';
 import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { IWorkbenchContributionsRegistry, Extensions } from '../../../../../common/contributions.js';
 import { IActiveCodeEditor, isCodeEditor, isDiffEditor } from '../../../../../../editor/browser/editorBrowser.js';
 import { KeybindingsRegistry, KeybindingWeight } from '../../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IChatAttachPromptActionOptions, ATTACH_PROMPT_ACTION_ID } from '../../actions/chatAttachPromptAction/chatAttachPromptAction.js';
@@ -135,6 +133,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	weight: KeybindingWeight.WorkbenchContrib,
 	primary: COMMAND_KEY_BINDING,
 	handler: command,
+	when: PromptsConfig.ENABLED_CTX,
 });
 
 /**
@@ -146,10 +145,5 @@ appendToCommandPalette(
 		title: localize('commands.prompts.use.title', "Use Prompt"),
 		category: CHAT_CATEGORY,
 	},
+	PromptsConfig.ENABLED_CTX,
 );
-
-class RunIfEnabled { }
-
-// register the command as a workbench contribution
-Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench)
-	.registerWorkbenchContribution(RunIfEnabled, LifecyclePhase.Eventually);

From 8f97a0a3a957c99bc7cdff85dfd1f98fe621d096 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 19:00:06 -0800
Subject: [PATCH 0515/1815] conditionally register 'create prompt' command

---
 .../contributions/createPromptCommand/createPromptCommand.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
index 5bc04044144d..824c1d506523 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
@@ -11,6 +11,7 @@ import { askForPromptSourceFolder } from './dialogs/askForPromptSourceFolder.js'
 import { IFileService } from '../../../../../../../platform/files/common/files.js';
 import { ILabelService } from '../../../../../../../platform/label/common/label.js';
 import { IOpenerService } from '../../../../../../../platform/opener/common/opener.js';
+import { PromptsConfig } from '../../../../../../../platform/prompts/common/config.js';
 import { ICommandService } from '../../../../../../../platform/commands/common/commands.js';
 import { IPromptPath, IPromptsService } from '../../../../common/promptSyntax/service/types.js';
 import { appendToCommandPalette } from '../../../../../files/browser/fileActions.contribution.js';
@@ -108,6 +109,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: LOCAL_COMMAND_ID,
 	weight: KeybindingWeight.WorkbenchContrib,
 	handler: commandFactory('local'),
+	when: PromptsConfig.ENABLED_CTX,
 });
 
 /**
@@ -117,6 +119,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: USER_COMMAND_ID,
 	weight: KeybindingWeight.WorkbenchContrib,
 	handler: commandFactory('user'),
+	when: PromptsConfig.ENABLED_CTX,
 });
 
 /**
@@ -128,6 +131,7 @@ appendToCommandPalette(
 		title: LOCAL_COMMAND_TITLE,
 		category: CHAT_CATEGORY,
 	},
+	PromptsConfig.ENABLED_CTX,
 );
 
 /**
@@ -139,4 +143,5 @@ appendToCommandPalette(
 		title: USER_COMMAND_TITLE,
 		category: CHAT_CATEGORY,
 	},
+	PromptsConfig.ENABLED_CTX,
 );

From 45aaeff2a3f7de5bebf48e305eabe1b58408e446 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 19:08:40 -0800
Subject: [PATCH 0516/1815] fix prompt attachment ID issue

---
 src/vs/platform/prompts/common/config.ts              |  4 ++--
 .../chat/browser/actions/chatContextActions.ts        | 11 ++++++-----
 .../createPromptCommand/createPromptCommand.ts        |  8 ++++----
 .../promptSyntax/contributions/usePromptCommand.ts    |  4 ++--
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/vs/platform/prompts/common/config.ts b/src/vs/platform/prompts/common/config.ts
index 4bba6295f5b5..1e4d1bf09ee2 100644
--- a/src/vs/platform/prompts/common/config.ts
+++ b/src/vs/platform/prompts/common/config.ts
@@ -99,9 +99,9 @@ export namespace PromptsConfig {
 	};
 
 	/**
-	 * TODO: @lego
+	 * Context key expression for the `reusable prompts` feature `enabled` status.
 	 */
-	export const ENABLED_CTX = ContextKeyExpr.equals(`config.${CONFIG_KEY}`, true);
+	export const enabledCtx = ContextKeyExpr.equals(`config.${CONFIG_KEY}`, true);
 
 	/**
 	 * Get value of the `reusable prompt locations` configuration setting.
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index 11a2c31cfdb2..85827db0582d 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -152,7 +152,7 @@ function isPromptInstructionsQuickPickItem(obj: unknown): obj is IReusablePrompt
 		return false;
 	}
 
-	return ('kind' in obj && obj.kind === 'prompt-instructions');
+	return ('kind' in obj && obj.kind === 'reusable-prompt');
 }
 
 interface IRelatedFilesQuickPickItem extends IQuickPickItem {
@@ -235,16 +235,17 @@ interface IDiagnosticsQuickPickItemWithFilter extends IQuickPickItem {
 /**
  * Quick pick item for reusable prompt attachment.
  */
+const REUSABLE_PROMPT_PICK_ID = 'reusable-prompt';
 interface IReusablePromptQuickPickItem extends IQuickPickItem {
 	/**
 	 * The ID of the quick pick item.
 	 */
-	id: 'reusable-prompt';
+	id: typeof REUSABLE_PROMPT_PICK_ID;
 
 	/**
 	 * Unique kind identifier of the reusable prompt attachment.
 	 */
-	kind: 'reusable-prompt';
+	kind: typeof REUSABLE_PROMPT_PICK_ID;
 
 	/**
 	 * Keybinding of the command.
@@ -825,8 +826,8 @@ export class AttachContextAction extends Action2 {
 			const keybinding = keybindingService.lookupKeybinding(USE_PROMPT_COMMAND_ID, contextKeyService);
 
 			quickPickItems.push({
-				kind: 'reusable-prompt',
-				id: 'reusable-prompt',
+				id: REUSABLE_PROMPT_PICK_ID,
+				kind: REUSABLE_PROMPT_PICK_ID,
 				label: localize('chatContext.attach.prompt.label', 'Prompt...'),
 				iconClass: ThemeIcon.asClassName(Codicon.bookmark),
 				keybinding,
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
index 824c1d506523..e3f61c986d4c 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
@@ -109,7 +109,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: LOCAL_COMMAND_ID,
 	weight: KeybindingWeight.WorkbenchContrib,
 	handler: commandFactory('local'),
-	when: PromptsConfig.ENABLED_CTX,
+	when: PromptsConfig.enabledCtx,
 });
 
 /**
@@ -119,7 +119,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: USER_COMMAND_ID,
 	weight: KeybindingWeight.WorkbenchContrib,
 	handler: commandFactory('user'),
-	when: PromptsConfig.ENABLED_CTX,
+	when: PromptsConfig.enabledCtx,
 });
 
 /**
@@ -131,7 +131,7 @@ appendToCommandPalette(
 		title: LOCAL_COMMAND_TITLE,
 		category: CHAT_CATEGORY,
 	},
-	PromptsConfig.ENABLED_CTX,
+	PromptsConfig.enabledCtx,
 );
 
 /**
@@ -143,5 +143,5 @@ appendToCommandPalette(
 		title: USER_COMMAND_TITLE,
 		category: CHAT_CATEGORY,
 	},
-	PromptsConfig.ENABLED_CTX,
+	PromptsConfig.enabledCtx,
 );
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
index 22b9f8b41c6f..efad59458244 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
@@ -133,7 +133,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	weight: KeybindingWeight.WorkbenchContrib,
 	primary: COMMAND_KEY_BINDING,
 	handler: command,
-	when: PromptsConfig.ENABLED_CTX,
+	when: PromptsConfig.enabledCtx,
 });
 
 /**
@@ -145,5 +145,5 @@ appendToCommandPalette(
 		title: localize('commands.prompts.use.title', "Use Prompt"),
 		category: CHAT_CATEGORY,
 	},
-	PromptsConfig.ENABLED_CTX,
+	PromptsConfig.enabledCtx,
 );

From 33a53aad9967433651515d41d3cf69cecc33328e Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 19:22:28 -0800
Subject: [PATCH 0517/1815] update docs of the `config` module, use the current
 `prompt files` public feature name

---
 src/vs/platform/prompts/common/config.ts      | 51 ++-----------------
 .../prompts/test/common/config.test.ts        |  2 +-
 .../contrib/chat/browser/chat.contribution.ts | 11 ++--
 3 files changed, 10 insertions(+), 54 deletions(-)

diff --git a/src/vs/platform/prompts/common/config.ts b/src/vs/platform/prompts/common/config.ts
index 1e4d1bf09ee2..4ea1187b61e3 100644
--- a/src/vs/platform/prompts/common/config.ts
+++ b/src/vs/platform/prompts/common/config.ts
@@ -3,11 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { ContextKeyExpr } from '../../contextkey/common/contextkey.js';
-
-// TODO: @lego - update the docs
-// TODO: @lego - update unit tests
+import { IConfigurationService } from '../../configuration/common/configuration.js';
 
 /**
  * Configuration helper for the `reusable prompts` feature.
@@ -15,50 +12,10 @@ import { ContextKeyExpr } from '../../contextkey/common/contextkey.js';
  *
  * ### Functions
  *
- * - {@link getLocationsValue} allows to current read configuration value
  * - {@link enabled} allows to check if the feature is enabled
+ * - {@link getLocationsValue} allows to current read configuration value
  * - {@link promptSourceFolders} gets list of source folders for prompt files
  *
- * ### Configuration Examples
- *
- * Enable the feature using the default `'.github/prompts'` folder as a source of prompt files:
- * ```json
- * {
- *   "chat.promptFiles": {},
- * }
- * ```
- *
- * Enable the feature, providing multiple source folder paths for prompt files,
- * in addition to the default `'.github/prompts'` one:
- * ```json
- * {
- *   "chat.promptFiles": {
- *     ".copilot/prompts" : false,
- *     "/Users/legomushroom/repos/prompts" : true,
- *   },
- * }
- * ```
- *
- * See the next section for details on how we treat the config value.
- *
- * ### Possible Values
- *
- * - `undefined`/`null`: feature is disabledx
- * - `object`:
- *   - expects the { "string": `boolean` } pairs, where the `string` is a path and the `boolean`
- *     is a flag that defines if this additional source folder is enabled or disabled;
- *     enabled source folders are used in addition to the default {@link DEFAULT_SOURCE_FOLDER} path;
- *     you can explicitly disable the default source folder by setting it to `false` in the object
- *   - value of a record in the object can also be a `string`:
- *     - if the string can be clearly mapped to a `boolean` (e.g., `"true"`, `"FALSE", "TrUe"`, etc.),
- *       it is treated as `boolean` value
- *     - any other string value is treated as `false` and is effectively ignored
- *   - if the record `key` is an `empty` string, it is ignored
- *   - if the resulting object is empty, the feature is considered `enabled`, prompt files source
- *     folders fallback to the default {@link DEFAULT_SOURCE_FOLDER} path
- *   - if the resulting object is not empty, and the default {@link DEFAULT_SOURCE_FOLDER} path
- *     is not explicitly disabled, it is added to the list of prompt files source folders
- *
  * ### File Paths Resolution
  *
  * We resolve only `*.prompt.md` files inside the resulting source folders. Relative paths are resolved
@@ -74,12 +31,12 @@ export namespace PromptsConfig {
 	 * Configuration key for the `reusable prompts` feature
 	 * (also known as `prompt files`, `prompt instructions`, etc.).
 	 */
-	export const CONFIG_KEY: string = 'chat.reusablePrompts';
+	export const CONFIG_KEY: string = 'chat.promptFiles';
 
 	/**
 	 * Configuration key for the locations of reusable prompt files.
 	 */
-	export const LOCATIONS_CONFIG_KEY: string = 'chat.reusablePromptsLocations';
+	export const LOCATIONS_CONFIG_KEY: string = 'chat.promptFilesLocations';
 
 	/**
 	 * Default reusable prompt files source folder.
diff --git a/src/vs/platform/prompts/test/common/config.test.ts b/src/vs/platform/prompts/test/common/config.test.ts
index 3ab37362836b..d79145e6588f 100644
--- a/src/vs/platform/prompts/test/common/config.test.ts
+++ b/src/vs/platform/prompts/test/common/config.test.ts
@@ -34,7 +34,7 @@ const createMock = <T>(value: T): IConfigurationService => {
 suite('PromptsConfig', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
-	suite('• getValue', () => {
+	suite('• getLocationsValue', () => {
 		test('• undefined', () => {
 			const configService = createMock(undefined);
 
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 65afec410911..cc9e03cf8199 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -203,25 +203,24 @@ configurationRegistry.registerConfiguration({
 			type: 'boolean',
 			title: nls.localize(
 				'chat.reusablePrompts.config.enabled.title',
-				"Reusable Prompts",
+				"Prompt Files",
 			),
 			markdownDescription: nls.localize(
 				'chat.reusablePrompts.config.enabled.description',
-				"Enable reusable prompts (`*{0}`) in Chat, Edits, and Inline Chat sessions. [Learn More]({0}).",
+				"Enable reusable prompt files (`*{0}`) in Chat, Edits, and Inline Chat sessions. [Learn More]({0}).",
 				PROMPT_FILE_EXTENSION,
 				DOCUMENTATION_URL,
 			),
 			default: true,
 			restricted: true,
 			disallowConfigurationDefault: true,
-			tags: ['experimental'],
+			tags: ['experimental', 'prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
 		},
-		// TODO: @lego - add more tags?
 		[PromptsConfig.LOCATIONS_CONFIG_KEY]: {
 			type: 'object',
 			title: nls.localize(
 				'chat.reusablePrompts.config.locations.title',
-				"Reusable Prompt Locations",
+				"Prompt File Locations",
 			),
 			markdownDescription: nls.localize(
 				'chat.reusablePrompts.config.locations.description',
@@ -237,7 +236,7 @@ configurationRegistry.registerConfiguration({
 			unevaluatedProperties: { type: 'boolean' },
 			restricted: true,
 			disallowConfigurationDefault: true,
-			tags: ['experimental'],
+			tags: ['experimental', 'prompts', 'reusable prompts', 'prompt snippets', 'instructions'],
 			examples: [
 				{
 					[PromptsConfig.DEFAULT_SOURCE_FOLDER]: true,

From 715bdfa17de18c69c388152bb52bac45ac90ff13 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 27 Feb 2025 21:17:13 -0800
Subject: [PATCH 0518/1815] update localization string

---
 src/vs/workbench/contrib/chat/browser/chat.contribution.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index cc9e03cf8199..0e38b614370a 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -207,7 +207,7 @@ configurationRegistry.registerConfiguration({
 			),
 			markdownDescription: nls.localize(
 				'chat.reusablePrompts.config.enabled.description',
-				"Enable reusable prompt files (`*{0}`) in Chat, Edits, and Inline Chat sessions. [Learn More]({0}).",
+				"Enable reusable prompt files (`*{0}`) in Chat, Edits, and Inline Chat sessions. [Learn More]({1}).",
 				PROMPT_FILE_EXTENSION,
 				DOCUMENTATION_URL,
 			),

From 4e6f06d1c7ad67cb14a654cee571518f8ead0ef2 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Fri, 28 Feb 2025 08:13:06 +0100
Subject: [PATCH 0519/1815] disable, restart extension host, uninstall and
 remove problematic extension (#242249)

* disable, restart extension host, uninstall and remove problematic extension

* fix tests

* fix tests
---
 .../abstractExtensionManagementService.ts     |  41 ++++++-
 .../common/extensionManagement.ts             |   6 +
 .../node/extensionManagementService.ts        |   4 +
 .../browser/extensions.contribution.ts        |   7 +-
 .../extensions/browser/extensionsActions.ts   |   2 +-
 .../extensions/browser/extensionsViewlet.ts   |  59 +---------
 .../browser/extensionsWorkbenchService.ts     | 105 ++++++++++++++----
 .../extensionsWorkbenchService.test.ts        |   1 +
 .../browser/extensionEnablementService.ts     |   6 +-
 .../common/extensionManagementService.ts      |   2 +-
 .../common/webExtensionManagementService.ts   |   4 +
 .../common/abstractExtensionService.ts        |   2 +-
 12 files changed, 144 insertions(+), 95 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
index 73fbccd8f518..7de8487c813d 100644
--- a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
@@ -723,14 +723,22 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 				this.logService.info('Successfully uninstalled extension from the profile', `${extension.identifier.id}@${extension.manifest.version}`, uninstallOptions.profileLocation.toString());
 			}
 			reportTelemetry(this.telemetryService, 'extensionGallery:uninstall', { extensionData: getLocalExtensionTelemetryData(extension), error });
-			this._onDidUninstallExtension.fire({ identifier: extension.identifier, error: error?.code, profileLocation: uninstallOptions.profileLocation, applicationScoped: extension.isApplicationScoped });
+			this._onDidUninstallExtension.fire({ identifier: extension.identifier, context: uninstallOptions.context, error: error?.code, profileLocation: uninstallOptions.profileLocation, applicationScoped: extension.isApplicationScoped });
 		};
 
 		const allTasks: IUninstallExtensionTask[] = [];
 		const processedTasks: IUninstallExtensionTask[] = [];
 		const alreadyRequestedUninstalls: Promise<any>[] = [];
+		const extensionsToRemove: ILocalExtension[] = [];
 
 		const installedExtensionsMap = new ResourceMap<ILocalExtension[]>();
+		const getInstalledExtensions = async (profileLocation: URI) => {
+			let installed = installedExtensionsMap.get(profileLocation);
+			if (!installed) {
+				installedExtensionsMap.set(profileLocation, installed = await this.getInstalled(ExtensionType.User, profileLocation));
+			}
+			return installed;
+		};
 
 		for (const { extension, options } of extensions) {
 			const uninstallOptions: UninstallExtensionTaskOptions = {
@@ -744,14 +752,32 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 			} else {
 				allTasks.push(createUninstallExtensionTask(extension, uninstallOptions));
 			}
+
+			if (uninstallOptions.remove) {
+				extensionsToRemove.push(extension);
+				for (const profile of this.userDataProfilesService.profiles) {
+					if (this.uriIdentityService.extUri.isEqual(profile.extensionsResource, uninstallOptions.profileLocation)) {
+						continue;
+					}
+					const installed = await getInstalledExtensions(profile.extensionsResource);
+					const profileExtension = installed.find(e => areSameExtensions(e.identifier, extension.identifier));
+					if (profileExtension) {
+						const uninstallOptionsWithProfile = { ...uninstallOptions, profileLocation: profile.extensionsResource };
+						const uninstallExtensionTask = this.uninstallingExtensions.get(getUninstallExtensionTaskKey(profileExtension, uninstallOptionsWithProfile));
+						if (uninstallExtensionTask) {
+							this.logService.info('Extensions is already requested to uninstall', profileExtension.identifier.id);
+							alreadyRequestedUninstalls.push(uninstallExtensionTask.waitUntilTaskIsFinished());
+						} else {
+							allTasks.push(createUninstallExtensionTask(profileExtension, uninstallOptionsWithProfile));
+						}
+					}
+				}
+			}
 		}
 
 		try {
 			for (const task of allTasks.slice(0)) {
-				let installed = installedExtensionsMap.get(task.options.profileLocation);
-				if (!installed) {
-					installedExtensionsMap.set(task.options.profileLocation, installed = await this.getInstalled(ExtensionType.User, task.options.profileLocation));
-				}
+				const installed = await getInstalledExtensions(task.options.profileLocation);
 
 				if (task.options.donotIncludePack) {
 					this.logService.info('Uninstalling the extension without including packed extension', `${task.extension.identifier.id}@${task.extension.manifest.version}`);
@@ -799,6 +825,10 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 			for (const task of allTasks) {
 				postUninstallExtension(task.extension, task.options);
 			}
+
+			if (extensionsToRemove.length) {
+				await this.joinAllSettled(extensionsToRemove.map(extension => this.removeExtension(extension)));
+			}
 		} catch (e) {
 			const error = toExtensionManagementError(e);
 			for (const task of allTasks) {
@@ -895,6 +925,7 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 	protected abstract createInstallExtensionTask(manifest: IExtensionManifest, extension: URI | IGalleryExtension, options: InstallExtensionTaskOptions): IInstallExtensionTask;
 	protected abstract createUninstallExtensionTask(extension: ILocalExtension, options: UninstallExtensionTaskOptions): IUninstallExtensionTask;
 	protected abstract copyExtension(extension: ILocalExtension, fromProfileLocation: URI, toProfileLocation: URI, metadata?: Partial<Metadata>): Promise<ILocalExtension>;
+	protected abstract removeExtension(extension: ILocalExtension): Promise<void>;
 }
 
 export function toExtensionManagementError(error: Error, code?: ExtensionManagementErrorCode): ExtensionManagementError {
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 578f0c6dd7fd..9ad3b5e75a6f 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -23,6 +23,7 @@ export const EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT = 'skipPublisherTrus
 export const EXTENSION_INSTALL_SOURCE_CONTEXT = 'extensionInstallSource';
 export const EXTENSION_INSTALL_DEP_PACK_CONTEXT = 'dependecyOrPackExtensionInstall';
 export const EXTENSION_INSTALL_CLIENT_TARGET_PLATFORM_CONTEXT = 'clientTargetPlatform';
+export const EXTENSION_UNINSTALL_MALICIOUS_CONTEXT = 'uninstallMaliciousExtension';
 
 export const enum ExtensionInstallSource {
 	COMMAND = 'command',
@@ -415,6 +416,7 @@ export interface UninstallExtensionEvent {
 
 export interface DidUninstallExtensionEvent {
 	readonly identifier: IExtensionIdentifier;
+	readonly context?: IStringDictionary<any>;
 	readonly error?: string;
 	readonly profileLocation: URI;
 	readonly applicationScoped?: boolean;
@@ -549,6 +551,10 @@ export type UninstallOptions = {
 	readonly donotCheckDependents?: boolean;
 	readonly versionOnly?: boolean;
 	readonly remove?: boolean;
+	/**
+	 * Context passed through to DidUninstallExtensionEvent
+	 */
+	context?: IStringDictionary<any>;
 };
 
 export interface IExtensionManagementParticipant {
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 04ed18266096..11bb73f08484 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -214,6 +214,10 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 		return local;
 	}
 
+	protected removeExtension(extension: ILocalExtension): Promise<void> {
+		return this.extensionsScanner.deleteExtension(extension, 'remove');
+	}
+
 	protected copyExtension(extension: ILocalExtension, fromProfileLocation: URI, toProfileLocation: URI, metadata: Partial<Metadata>): Promise<ILocalExtension> {
 		return this.extensionsScanner.copyExtension(extension, fromProfileLocation, toProfileLocation, metadata);
 	}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index e30163945172..ef2b9bc2b7ca 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -17,7 +17,7 @@ import { VIEWLET_ID, IExtensionsWorkbenchService, IExtensionsViewPaneContainer,
 import { InstallSpecificVersionOfExtensionAction, ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, SetColorThemeAction, SetFileIconThemeAction, SetProductIconThemeAction, ClearLanguageAction, ToggleAutoUpdateForExtensionAction, ToggleAutoUpdatesForPublisherAction, TogglePreReleaseExtensionAction, InstallAnotherVersionAction, InstallAction } from './extensionsActions.js';
 import { ExtensionsInput } from '../common/extensionsInput.js';
 import { ExtensionEditor } from './extensionEditor.js';
-import { StatusUpdater, MaliciousExtensionChecker, ExtensionsViewletViewsContribution, ExtensionsViewPaneContainer, BuiltInExtensionsContext, SearchMarketplaceExtensionsContext, RecommendedExtensionsContext, DefaultViewsContext, ExtensionsSortByContext, SearchHasTextContext, ExtensionsSearchValueContext } from './extensionsViewlet.js';
+import { StatusUpdater, ExtensionsViewletViewsContribution, ExtensionsViewPaneContainer, BuiltInExtensionsContext, SearchMarketplaceExtensionsContext, RecommendedExtensionsContext, DefaultViewsContext, ExtensionsSortByContext, SearchHasTextContext, ExtensionsSearchValueContext } from './extensionsViewlet.js';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
 import * as jsonContributionRegistry from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
 import { ExtensionsConfigurationSchema, ExtensionsConfigurationSchemaId } from '../common/extensionsFileTemplate.js';
@@ -1670,7 +1670,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			title: localize('download VSIX', "Download VSIX"),
 			menu: {
 				id: MenuId.ExtensionContext,
-				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.has('isGalleryExtension')),
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.not('extensionDisallowInstall'), ContextKeyExpr.has('isGalleryExtension')),
 				order: this.productService.quality === 'stable' ? 0 : 1
 			},
 			run: async (accessor: ServicesAccessor, extensionId: string) => {
@@ -1683,7 +1683,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			title: localize('download pre-release', "Download Pre-Release VSIX"),
 			menu: {
 				id: MenuId.ExtensionContext,
-				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.has('isGalleryExtension'), ContextKeyExpr.has('extensionHasPreReleaseVersion')),
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.not('extensionDisallowInstall'), ContextKeyExpr.has('isGalleryExtension'), ContextKeyExpr.has('extensionHasPreReleaseVersion')),
 				order: this.productService.quality === 'stable' ? 1 : 0
 			},
 			run: async (accessor: ServicesAccessor, extensionId: string) => {
@@ -1997,7 +1997,6 @@ class TrustedPublishersInitializer implements IWorkbenchContribution {
 const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 workbenchRegistry.registerWorkbenchContribution(ExtensionsContributions, LifecyclePhase.Restored);
 workbenchRegistry.registerWorkbenchContribution(StatusUpdater, LifecyclePhase.Eventually);
-workbenchRegistry.registerWorkbenchContribution(MaliciousExtensionChecker, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(KeymapExtensions, LifecyclePhase.Restored);
 workbenchRegistry.registerWorkbenchContribution(ExtensionsViewletViewsContribution, LifecyclePhase.Restored);
 workbenchRegistry.registerWorkbenchContribution(ExtensionActivationProgress, LifecyclePhase.Eventually);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
index 8b062d1d47d6..3cd6405610ef 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
@@ -1250,7 +1250,7 @@ async function getContextMenuActionsGroups(extension: IExtension | undefined | n
 			cksOverlay.push(['galleryExtensionHasPreReleaseVersion', extension.gallery?.hasPreReleaseVersion]);
 			cksOverlay.push(['extensionHasPreReleaseVersion', extension.hasPreReleaseVersion]);
 			cksOverlay.push(['extensionHasReleaseVersion', extension.hasReleaseVersion]);
-			cksOverlay.push(['extensionDisallowInstall', !!extension.deprecationInfo?.disallowInstall]);
+			cksOverlay.push(['extensionDisallowInstall', extension.isMalicious || extension.deprecationInfo?.disallowInstall]);
 			cksOverlay.push(['isExtensionAllowed', allowedExtensionsService.isAllowed({ id: extension.identifier.id, publisherDisplayName: extension.publisherDisplayName }) === true]);
 			cksOverlay.push(['isPreReleaseExtensionAllowed', allowedExtensionsService.isAllowed({ id: extension.identifier.id, publisherDisplayName: extension.publisherDisplayName, prerelease: true }) === true]);
 			cksOverlay.push(['extensionIsUnsigned', extension.gallery && !extension.gallery.isSigned]);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
index ee75bba1ed6f..49c0ffed6ba6 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
@@ -5,7 +5,7 @@
 
 import './media/extensionsViewlet.css';
 import { localize, localize2 } from '../../../../nls.js';
-import { timeout, Delayer, Promises } from '../../../../base/common/async.js';
+import { Delayer } from '../../../../base/common/async.js';
 import { isCancellationError } from '../../../../base/common/errors.js';
 import { createErrorWithActions } from '../../../../base/common/errorMessage.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
@@ -18,7 +18,6 @@ import { IInstantiationService, ServicesAccessor } from '../../../../platform/in
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IExtensionsWorkbenchService, IExtensionsViewPaneContainer, VIEWLET_ID, CloseExtensionDetailsOnViewChangeKey, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, AutoCheckUpdatesConfigurationKey, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu, AutoRestartConfigurationKey } from '../common/extensions.js';
 import { InstallLocalExtensionsInRemoteAction, InstallRemoteExtensionsInLocalAction } from './extensionsActions.js';
-import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IWorkbenchExtensionEnablementService, IExtensionManagementServerService, IExtensionManagementServer } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { ExtensionsInput } from '../common/extensionsInput.js';
 import { ExtensionsListView, EnabledExtensionsView, DisabledExtensionsView, RecommendedExtensionsView, WorkspaceRecommendedExtensionsView, ServerInstalledExtensionsView, DefaultRecommendedExtensionsView, UntrustedWorkspaceUnsupportedExtensionsView, UntrustedWorkspacePartiallySupportedExtensionsView, VirtualWorkspaceUnsupportedExtensionsView, VirtualWorkspacePartiallySupportedExtensionsView, DefaultPopularExtensionsView, DeprecatedExtensionsView, SearchMarketplaceExtensionsView, RecentlyUpdatedExtensionsView, OutdatedExtensionsView, StaticQueryExtensionsView, NONE_CATEGORY } from './extensionsViews.js';
@@ -34,22 +33,20 @@ import { IWorkspaceContextService } from '../../../../platform/workspace/common/
 import { IContextKeyService, ContextKeyExpr, RawContextKey, IContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
-import { INotificationService, NotificationPriority } from '../../../../platform/notification/common/notification.js';
-import { IHostService } from '../../../services/host/browser/host.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
 import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
 import { ViewPane } from '../../../browser/parts/views/viewPane.js';
 import { Query } from '../common/extensionQuery.js';
 import { SuggestEnabledInput } from '../../codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
-import { EXTENSION_CATEGORIES, ExtensionType } from '../../../../platform/extensions/common/extensions.js';
+import { EXTENSION_CATEGORIES } from '../../../../platform/extensions/common/extensions.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { MementoObject } from '../../../common/memento.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
 import { SIDE_BAR_DRAG_AND_DROP_BACKGROUND } from '../../../common/theme.js';
-import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 import { VirtualWorkspaceContext, WorkbenchStateContext } from '../../../common/contextkeys.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { installLocalInRemoteIcon } from './extensionsIcons.js';
@@ -59,7 +56,6 @@ import { IPaneCompositePartService } from '../../../services/panecomposite/brows
 import { coalesce } from '../../../../base/common/arrays.js';
 import { extractEditorsAndFilesDropData } from '../../../../platform/dnd/browser/dnd.js';
 import { extname } from '../../../../base/common/resources.js';
-import { isMalicious } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { ILocalizedString } from '../../../../platform/action/common/action.js';
 import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
 import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
@@ -967,52 +963,3 @@ export class StatusUpdater extends Disposable implements IWorkbenchContribution
 		}
 	}
 }
-
-export class MaliciousExtensionChecker implements IWorkbenchContribution {
-
-	constructor(
-		@IExtensionManagementService private readonly extensionsManagementService: IExtensionManagementService,
-		@IHostService private readonly hostService: IHostService,
-		@ILogService private readonly logService: ILogService,
-		@INotificationService private readonly notificationService: INotificationService,
-		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService
-	) {
-		if (!this.environmentService.disableExtensions) {
-			this.loopCheckForMaliciousExtensions();
-		}
-	}
-
-	private loopCheckForMaliciousExtensions(): void {
-		this.checkForMaliciousExtensions()
-			.then(() => timeout(1000 * 60 * 5)) // every five minutes
-			.then(() => this.loopCheckForMaliciousExtensions());
-	}
-
-	private checkForMaliciousExtensions(): Promise<void> {
-		return this.extensionsManagementService.getExtensionsControlManifest().then(extensionsControlManifest => {
-
-			return this.extensionsManagementService.getInstalled(ExtensionType.User).then(installed => {
-				const maliciousExtensions = installed.filter(e => isMalicious(e.identifier, extensionsControlManifest));
-
-				if (maliciousExtensions.length) {
-					return Promises.settled(maliciousExtensions.map(e => this.extensionsManagementService.uninstall(e).then(() => {
-						this.notificationService.prompt(
-							Severity.Warning,
-							localize('malicious warning', "We have uninstalled '{0}' which was reported to be problematic.", e.identifier.id),
-							[{
-								label: localize('reloadNow', "Reload Now"),
-								run: () => this.hostService.reload()
-							}],
-							{
-								sticky: true,
-								priority: NotificationPriority.URGENT
-							}
-						);
-					})));
-				} else {
-					return Promise.resolve(undefined);
-				}
-			}).then(() => undefined);
-		}, err => this.logService.error(err));
-	}
-}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index 74f8e88fb618..ce78298844a0 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -21,7 +21,8 @@ import {
 	TargetPlatformToString,
 	IAllowedExtensionsService,
 	AllowedExtensionsConfigKey,
-	EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT
+	EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT,
+	EXTENSION_UNINSTALL_MALICIOUS_CONTEXT,
 } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, DefaultIconPath, IResourceExtension } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, areSameExtensions, groupByExtension, getGalleryExtensionId, isMalicious } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
@@ -915,6 +916,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 
 	private updatesCheckDelayer: ThrottledDelayer<void>;
 	private autoUpdateDelayer: ThrottledDelayer<void>;
+	private maliciousExtensionsCheckDelayer: ThrottledDelayer<void>;
 
 	private readonly _onChange = this._register(new Emitter<IExtension | undefined>());
 	get onChange(): Event<IExtension | undefined> { return this._onChange.event; }
@@ -1011,9 +1013,11 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 
 		this.updatesCheckDelayer = new ThrottledDelayer<void>(ExtensionsWorkbenchService.UpdatesCheckInterval);
 		this.autoUpdateDelayer = new ThrottledDelayer<void>(1000);
+		this.maliciousExtensionsCheckDelayer = new ThrottledDelayer<void>(1000 * 60 * 5 /* every five minutes */);
 		this._register(toDisposable(() => {
 			this.updatesCheckDelayer.cancel();
 			this.autoUpdateDelayer.cancel();
+			this.maliciousExtensionsCheckDelayer.cancel();
 		}));
 
 		urlService.registerHandler(this);
@@ -1045,6 +1049,8 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 			this.updateExtensionsNotificaiton();
 			this.reportProgressFromOtherSources();
 		}));
+
+		this.loopCheckForMaliciousExtensions();
 	}
 
 	private initializeAutoUpdate(): void {
@@ -1517,7 +1523,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		return undefined;
 	}
 
-	async updateRunningExtensions(auto: boolean = false): Promise<void> {
+	async updateRunningExtensions(auto: boolean = false, reason: string = nls.localize('restart', "Updating Extensions")): Promise<void> {
 		const toAdd: ILocalExtension[] = [];
 		const toRemove: string[] = [];
 
@@ -1558,7 +1564,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		}
 
 		if (toAdd.length || toRemove.length) {
-			if (await this.extensionService.stopExtensionHosts(nls.localize('restart', "Changing extension enablement"), auto)) {
+			if (await this.extensionService.stopExtensionHosts(reason, auto)) {
 				await this.extensionService.startExtensionHosts({ toAdd, toRemove });
 				if (auto) {
 					this.notificationService.notify({
@@ -2526,9 +2532,9 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		return this.localeService.setLocale({ id: locale, galleryExtension: extension.gallery, extensionId: extension.identifier.id, label: localizedLanguageName ?? extension.displayName });
 	}
 
-	setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState): Promise<void> {
+	setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState, force: boolean = false): Promise<void> {
 		extensions = Array.isArray(extensions) ? extensions : [extensions];
-		return this.promptAndSetEnablement(extensions, enablementState);
+		return this.promptAndSetEnablement(extensions, enablementState, force);
 	}
 
 	async uninstall(e: IExtension): Promise<void> {
@@ -2786,43 +2792,45 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		});
 	}
 
-	private promptAndSetEnablement(extensions: IExtension[], enablementState: EnablementState): Promise<any> {
+	private promptAndSetEnablement(extensions: IExtension[], enablementState: EnablementState, force: boolean): Promise<any> {
 		const enable = enablementState === EnablementState.EnabledGlobally || enablementState === EnablementState.EnabledWorkspace;
 		if (enable) {
 			const allDependenciesAndPackedExtensions = this.getExtensionsRecursively(extensions, this.local, enablementState, { dependencies: true, pack: true });
-			return this.checkAndSetEnablement(extensions, allDependenciesAndPackedExtensions, enablementState);
+			return this.checkAndSetEnablement(extensions, allDependenciesAndPackedExtensions, enablementState, force);
 		} else {
 			const packedExtensions = this.getExtensionsRecursively(extensions, this.local, enablementState, { dependencies: false, pack: true });
 			if (packedExtensions.length) {
-				return this.checkAndSetEnablement(extensions, packedExtensions, enablementState);
+				return this.checkAndSetEnablement(extensions, packedExtensions, enablementState, force);
 			}
-			return this.checkAndSetEnablement(extensions, [], enablementState);
+			return this.checkAndSetEnablement(extensions, [], enablementState, force);
 		}
 	}
 
-	private async checkAndSetEnablement(extensions: IExtension[], otherExtensions: IExtension[], enablementState: EnablementState): Promise<any> {
+	private async checkAndSetEnablement(extensions: IExtension[], otherExtensions: IExtension[], enablementState: EnablementState, force: boolean): Promise<any> {
 		const allExtensions = [...extensions, ...otherExtensions];
 		const enable = enablementState === EnablementState.EnabledGlobally || enablementState === EnablementState.EnabledWorkspace;
 		if (!enable) {
 			for (const extension of extensions) {
 				const dependents = this.getDependentsAfterDisablement(extension, allExtensions, this.local);
 				if (dependents.length) {
-					const { result } = await this.dialogService.prompt({
-						title: nls.localize('disableDependents', "Disable Extension with Dependents"),
-						type: Severity.Warning,
-						message: this.getDependentsErrorMessageForDisablement(extension, allExtensions, dependents),
-						buttons: [{
-							label: nls.localize('disable all', 'Disable All'),
-							run: () => true
-						}],
-						cancelButton: {
-							run: () => false
+					if (!force) {
+						const { result } = await this.dialogService.prompt({
+							title: nls.localize('disableDependents', "Disable Extension with Dependents"),
+							type: Severity.Warning,
+							message: this.getDependentsErrorMessageForDisablement(extension, allExtensions, dependents),
+							buttons: [{
+								label: nls.localize('disable all', 'Disable All'),
+								run: () => true
+							}],
+							cancelButton: {
+								run: () => false
+							}
+						});
+						if (!result) {
+							throw new CancellationError();
 						}
-					});
-					if (!result) {
-						throw new CancellationError();
 					}
-					await this.checkAndSetEnablement(dependents, [extension], enablementState);
+					await this.checkAndSetEnablement(dependents, [extension], enablementState, force);
 				}
 			}
 		}
@@ -2947,6 +2955,55 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		this.notificationService.error(err);
 	}
 
+	private loopCheckForMaliciousExtensions(): void {
+		this.checkForMaliciousExtensions()
+			.then(() => this.maliciousExtensionsCheckDelayer.trigger(async () => this.loopCheckForMaliciousExtensions()));
+	}
+
+	private async checkForMaliciousExtensions(): Promise<void> {
+		try {
+			await this.queryLocal();
+
+			const maliciousExtensions = this.installed.filter(e => e.isMalicious);
+
+			if (maliciousExtensions.length) {
+
+				// First disable them
+				await this.setEnablement(maliciousExtensions, EnablementState.DisabledGlobally, true);
+
+				await Promises.settled([
+					// Update running extensions to remove them
+					this.updateRunningExtensions(false, nls.localize('remove malicious', "Removing problematic extensions")),
+					// Uninstall them
+					...maliciousExtensions.map(async e => {
+						if (!e.local) {
+							return;
+						}
+						await this.extensionManagementService.uninstallExtensions([{
+							extension: e.local,
+							options: {
+								remove: true,
+								donotCheckDependents: true,
+								context: { [EXTENSION_UNINSTALL_MALICIOUS_CONTEXT]: true }
+							}
+						}]);
+						this.notificationService.prompt(
+							Severity.Warning,
+							nls.localize('malicious warning', "The extension '{0}' was found to be problematic and has been removed.", e.identifier.id),
+							[],
+							{
+								sticky: true,
+								priority: NotificationPriority.URGENT
+							}
+						);
+					})
+				]);
+			}
+		} catch (err) {
+			this.logService.error(err);
+		}
+	}
+
 	handleURL(uri: URI, options?: IOpenURLOptions): Promise<boolean> {
 		if (!/^extension/.test(uri.path)) {
 			return Promise.resolve(false);
diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts
index 9c8f2b5c983a..744958fffa35 100644
--- a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts
+++ b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts
@@ -997,6 +997,7 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 			.then(async () => {
 				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a')]);
 				testObject = await aWorkbenchService();
+				await testObject.whenInitialized;
 				const target = sinon.spy();
 				disposableStore.add(testObject.onChange(target));
 
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
index 2ad63cc370b8..8c221fd4a2bb 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
@@ -6,7 +6,7 @@
 import { localize } from '../../../../nls.js';
 import { Event, Emitter } from '../../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { IExtensionManagementService, IExtensionIdentifier, IGlobalExtensionEnablementService, ENABLED_EXTENSIONS_STORAGE_PATH, DISABLED_EXTENSIONS_STORAGE_PATH, InstallOperation, IAllowedExtensionsService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IExtensionManagementService, IExtensionIdentifier, IGlobalExtensionEnablementService, ENABLED_EXTENSIONS_STORAGE_PATH, DISABLED_EXTENSIONS_STORAGE_PATH, InstallOperation, IAllowedExtensionsService, EXTENSION_UNINSTALL_MALICIOUS_CONTEXT } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IWorkbenchExtensionManagementService, IExtensionManagementServer, ExtensionInstallLocation } from '../common/extensionManagement.js';
 import { areSameExtensions, BetterMergeId, getExtensionDependencies } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
@@ -67,7 +67,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		super();
 		this.storageManager = this._register(new StorageManager(storageService));
 
-		const uninstallDisposable = this._register(Event.filter(extensionManagementService.onDidUninstallExtension, e => !e.error)(({ identifier }) => this._reset(identifier)));
+		const uninstallDisposable = this._register(Event.filter(extensionManagementService.onDidUninstallExtension, e => !e.error && !e.context?.[EXTENSION_UNINSTALL_MALICIOUS_CONTEXT])(({ identifier }) => this._reset(identifier)));
 		let isDisposed = false;
 		this._register(toDisposable(() => isDisposed = true));
 		this.extensionsManager = this._register(instantiationService.createInstance(ExtensionsManager));
@@ -738,7 +738,7 @@ class ExtensionsManager extends Disposable {
 			this.updateExtensions(e.reduce<IExtension[]>((result, { local, operation }) => {
 				if (local && operation !== InstallOperation.Migrate) { result.push(local); } return result;
 			}, []), [], undefined, false)));
-		this._register(Event.filter(this.extensionManagementService.onDidUninstallExtension, (e => !e.error))(e => this.updateExtensions([], [e.identifier], e.server, false)));
+		this._register(Event.filter(this.extensionManagementService.onDidUninstallExtension, (e => !e.error && !e.context?.[EXTENSION_UNINSTALL_MALICIOUS_CONTEXT]))(e => this.updateExtensions([], [e.identifier], e.server, false)));
 		this._register(this.extensionManagementService.onDidChangeProfile(({ added, removed, server }) => {
 			this.updateExtensions(added, removed.map(({ identifier }) => identifier), server, true);
 		}));
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
index bcf58d25cd92..75d90366ab1f 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
@@ -783,7 +783,7 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 		if (this.extensionManagementServerService.webExtensionManagementServer) {
 			return this.extensionManagementServerService.webExtensionManagementServer.extensionManagementService.getExtensionsControlManifest();
 		}
-		return Promise.resolve({ malicious: [], deprecated: {}, search: [] });
+		return this.extensionGalleryService.getExtensionsControlManifest();
 	}
 
 	private getServer(extension: ILocalExtension): IExtensionManagementServer | null {
diff --git a/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
index 65b49fb7bd12..c3e21ded56a6 100644
--- a/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
@@ -119,6 +119,10 @@ export class WebExtensionManagementService extends AbstractExtensionManagementSe
 		return this.install(location, { profileLocation });
 	}
 
+	protected async removeExtension(extension: ILocalExtension): Promise<void> {
+		// do nothing
+	}
+
 	protected async copyExtension(extension: ILocalExtension, fromProfileLocation: URI, toProfileLocation: URI, metadata: Partial<Metadata>): Promise<ILocalExtension> {
 		const target = await this.webExtensionsScannerService.scanExistingExtension(extension.location, extension.type, toProfileLocation);
 		const source = await this.webExtensionsScannerService.scanExistingExtension(extension.location, extension.type, fromProfileLocation);
diff --git a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
index 382683f3cf76..1dd6c88c05a7 100644
--- a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
+++ b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
@@ -764,7 +764,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 
 				const { confirmed } = await this._dialogService.confirm({
 					type: Severity.Warning,
-					message: nls.localize('extensionStopVetoMessage', "Please confirm restart of extensions."),
+					message: nls.localize('extensionStopVetoMessage', "Please confirm restart of extensions: {0}.", reason),
 					detail: vetoReasonsArray.length === 1 ?
 						vetoReasonsArray[0] :
 						vetoReasonsArray.join('\n -'),

From 9c227f0795178b87d749f2ca8b73a82cd7a2d225 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Fri, 28 Feb 2025 09:38:38 +0100
Subject: [PATCH 0520/1815] bump to 1.99.0 (#242274)

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d4bc1fb28bf6..1c163334b1a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "code-oss-dev",
-  "version": "1.98.0",
+  "version": "1.99.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "code-oss-dev",
-      "version": "1.98.0",
+      "version": "1.99.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 925462fb087e..3abe2f26aeba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "code-oss-dev",
-  "version": "1.98.0",
+  "version": "1.99.0",
   "distro": "aee970faa436e6fdd88d579c1409364c3fdab6a8",
   "author": {
     "name": "Microsoft Corporation"

From 6e6ef83a2a13dcff87debe01e07d7b65645b8bb5 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 28 Feb 2025 09:55:53 +0100
Subject: [PATCH 0521/1815] terminal - use `product` to figure out `quality`
 (#242226)

---
 src/vs/platform/product/common/product.ts                  | 7 +++----
 .../contrib/terminal/common/terminalConfiguration.ts       | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
index 1a2a6192ec8b..d27cdce900fd 100644
--- a/src/vs/platform/product/common/product.ts
+++ b/src/vs/platform/product/common/product.ts
@@ -8,7 +8,9 @@ import { IProductConfiguration } from '../../../base/common/product.js';
 import { ISandboxConfiguration } from '../../../base/parts/sandbox/common/sandboxTypes.js';
 
 /**
- * @deprecated You MUST use `IProductService` if possible.
+ * @deprecated It is preferred that you use `IProductService` if you can. This
+ * allows web embedders to override our defaults. But for things like `product.quality`,
+ * the use is fine because that property is not overridable.
  */
 let product: IProductConfiguration;
 
@@ -72,7 +74,4 @@ else {
 	}
 }
 
-/**
- * @deprecated You MUST use `IProductService` if possible.
- */
 export default product;
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index 278027854051..22c9690746d4 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -486,7 +486,7 @@ const terminalConfiguration: IConfigurationNode = {
 			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."),
 			type: 'boolean',
 			tags: ['preview'],
-			default: product.quality !== 'stable',
+			default: product.quality !== 'stable'
 		},
 		[TerminalSettingId.SplitCwd]: {
 			description: localize('terminal.integrated.splitCwd', "Controls the working directory a split terminal starts with."),
@@ -610,7 +610,7 @@ const terminalConfiguration: IConfigurationNode = {
 		[TerminalSettingId.ShellIntegrationEnvironmentReporting]: {
 			markdownDescription: localize('terminal.integrated.shellIntegration.environmentReporting', "Controls whether to report the shell environment, enabling its use in features such as {0}. This may cause a slowdown when printing your shell's prompt.", `\`#${TerminalContribSettingId.SuggestEnabled}#\``),
 			type: 'boolean',
-			default: product.quality !== 'stable',
+			default: product.quality !== 'stable'
 		},
 		[TerminalSettingId.SmoothScrolling]: {
 			markdownDescription: localize('terminal.integrated.smoothScrolling', "Controls whether the terminal will scroll using an animation."),

From edf0ad763e591f6171ec197844e03834e7df9d3a Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 28 Feb 2025 11:23:16 +0100
Subject: [PATCH 0522/1815] api - clarify encoding for #241844 (#242278)

---
 .../vscode.proposed.textDocumentEncoding.d.ts        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts b/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts
index 5c2690ba2e48..329899feb9d7 100644
--- a/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts
+++ b/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts
@@ -66,6 +66,10 @@ declare module 'vscode' {
 			 * different encoding has the potential of changing the text contents of
 			 * the text document. Specifically, when the encoding results in a
 			 * different set of characters than the previous encoding.
+			 *
+			 * *Note* that if you open a document with an encoding that does not
+			 * support decoding the underlying bytes, content may be replaced with
+			 * substitution characters appropriate for the character encoding.
 			 */
 			encoding?: string;
 		}): Thenable<TextDocument>;
@@ -92,6 +96,10 @@ declare module 'vscode' {
 			 * different encoding has the potential of changing the text contents of
 			 * the text document. Specifically, when the encoding results in a
 			 * different set of characters than the previous encoding.
+			 *
+			 * *Note* that if you open a document with an encoding that does not
+			 * support decoding the underlying bytes, content may be replaced with
+			 * substitution characters appropriate for the character encoding.
 			 */
 			encoding?: string;
 		}): Thenable<TextDocument>;
@@ -126,6 +134,10 @@ declare module 'vscode' {
 		 * on user settings and the content of the buffer (for example
 		 * byte order marks).
 		 *
+		 * *Note* that if you decode content that is unsupported by the
+		 * encoding, the result may contain substitution characters appropriate
+		 * for the character encoding.
+		 *
 		 * @throws This method will throw an error when the content is binary.
 		 *
 		 * @param content The content to decode as a `Uint8Array`.

From 75c8626ea5bed112038631f4c6d59afee4d37722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joaomoreno@users.noreply.github.com>
Date: Fri, 28 Feb 2025 11:39:25 +0100
Subject: [PATCH 0523/1815] remove unused pipeline param (#242280)

---
 build/azure-pipelines/product-build.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 7e680884b45d..3eb368406e1f 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -129,8 +129,6 @@ variables:
     value: ${{ and(eq(parameters.VSCODE_PUBLISH, true), eq(variables.VSCODE_CIBUILD, false), eq(parameters.VSCODE_COMPILE_ONLY, false)) }}
   - name: VSCODE_SCHEDULEDBUILD
     value: ${{ eq(variables['Build.Reason'], 'Schedule') }}
-  - name: VSCODE_7PM_BUILD
-    value: ${{ in(variables['Build.Reason'], 'BuildCompletion', 'ResourceTrigger') }}
   - name: VSCODE_STEP_ON_IT
     value: ${{ eq(parameters.VSCODE_STEP_ON_IT, true) }}
   - name: VSCODE_BUILD_MACOS_UNIVERSAL

From 3a26f60ab59101bd3a6806dc0b5bcec8d0d3fe77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joaomoreno@users.noreply.github.com>
Date: Fri, 28 Feb 2025 11:42:32 +0100
Subject: [PATCH 0524/1815] disable terrapin when in CI (#242282)

---
 build/azure-pipelines/product-build.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 3eb368406e1f..0e5faf242961 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -106,7 +106,10 @@ variables:
   - name: VSCODE_PRIVATE_BUILD
     value: ${{ ne(variables['Build.Repository.Uri'], 'https://github.com/microsoft/vscode.git') }}
   - name: NPM_REGISTRY
-    value: ${{ parameters.NPM_REGISTRY }}
+    ${{ if in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI') }}: # disable terrapin when in VSCODE_CIBUILD
+      value: none
+    ${{ else }}:
+      value: ${{ parameters.NPM_REGISTRY }}
   - name: CARGO_REGISTRY
     value: ${{ parameters.CARGO_REGISTRY }}
   - name: VSCODE_QUALITY

From fbab2623ef1339bea0dc5729d534a433a0b8108a Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 28 Feb 2025 12:32:47 +0100
Subject: [PATCH 0525/1815] clean up, re
 https://github.com/microsoft/vscode-internalbacklog/issues/5288 (#242292)

---
 .../suggest/browser/suggestController.ts      |  3 +-
 .../contrib/suggest/browser/suggestModel.ts   |  9 +++---
 .../format/browser/formatActionsMultiple.ts   | 28 -------------------
 .../extensions/common/extensionHostManager.ts |  3 +-
 .../services/timer/browser/timerService.ts    |  2 +-
 5 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/src/vs/editor/contrib/suggest/browser/suggestController.ts b/src/vs/editor/contrib/suggest/browser/suggestController.ts
index 0ede4624f230..7f871915d76c 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestController.ts
@@ -517,8 +517,7 @@ export class SuggestController implements IEditorContribution {
 	}
 
 	private _reportSuggestionAcceptedTelemetry(item: CompletionItem, model: ITextModel, itemResolved: boolean, commandExectionDuration: number, additionalEditsAppliedAsync: number, index: number, completionItems: CompletionItem[]): void {
-		if (Math.floor(Math.random() * 100) === 0) {
-			// throttle telemetry event because accepting completions happens a lot
+		if (Math.random() > 0.0001) { // 0.01%
 			return;
 		}
 
diff --git a/src/vs/editor/contrib/suggest/browser/suggestModel.ts b/src/vs/editor/contrib/suggest/browser/suggestModel.ts
index 7a7019032cab..bf6ce4b68676 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestModel.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestModel.ts
@@ -561,11 +561,12 @@ export class SuggestModel implements IDisposable {
 		}).catch(onUnexpectedError);
 	}
 
-	private _telemetryGate: number = 0;
-
+	/**
+	 * Report durations telemetry with a 1% sampling rate.
+	 * The telemetry is reported only if a random number between 0 and 100 is less than or equal to 1.
+	 */
 	private _reportDurationsTelemetry(durations: CompletionDurations): void {
-
-		if (this._telemetryGate++ % 230 !== 0) {
+		if (Math.random() > 0.0001) { // 0.01%
 			return;
 		}
 
diff --git a/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts b/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts
index a80963b7f626..2eec08fd35a4 100644
--- a/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts
+++ b/src/vs/workbench/contrib/format/browser/formatActionsMultiple.ts
@@ -14,7 +14,6 @@ import { CancellationToken, CancellationTokenSource } from '../../../../base/com
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { formatDocumentRangesWithProvider, formatDocumentWithProvider, getRealAndSyntheticDocumentFormattersOrdered, FormattingConflicts, FormattingMode, FormattingKind } from '../../../../editor/contrib/format/browser/format.js';
 import { Range } from '../../../../editor/common/core/range.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
@@ -263,28 +262,6 @@ interface IIndexedPick extends IQuickPickItem {
 	index: number;
 }
 
-function logFormatterTelemetry<T extends { extensionId?: ExtensionIdentifier }>(telemetryService: ITelemetryService, mode: 'document' | 'range', options: T[], pick?: T) {
-	type FormatterPicks = {
-		mode: 'document' | 'range';
-		extensions: string[];
-		pick: string;
-	};
-	type FormatterPicksClassification = {
-		owner: 'jrieken';
-		comment: 'Information about resolving formatter conflicts';
-		mode: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Formatting mode: whole document or a range/selection' };
-		extensions: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The extension that got picked' };
-		pick: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The possible extensions to pick' };
-	};
-	function extKey(obj: T): string {
-		return obj.extensionId ? ExtensionIdentifier.toKey(obj.extensionId) : 'unknown';
-	}
-	telemetryService.publicLog2<FormatterPicks, FormatterPicksClassification>('formatterpick', {
-		mode,
-		extensions: options.map(extKey),
-		pick: pick ? extKey(pick) : 'none'
-	});
-}
 
 async function showFormatterPick(accessor: ServicesAccessor, model: ITextModel, formatters: FormattingEditProvider[]): Promise<number | undefined> {
 	const quickPickService = accessor.get(IQuickInputService);
@@ -362,7 +339,6 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
 			return;
 		}
 		const instaService = accessor.get(IInstantiationService);
-		const telemetryService = accessor.get(ITelemetryService);
 		const languageFeaturesService = accessor.get(ILanguageFeaturesService);
 		const model = editor.getModel();
 		const provider = getRealAndSyntheticDocumentFormattersOrdered(languageFeaturesService.documentFormattingEditProvider, languageFeaturesService.documentRangeFormattingEditProvider, model);
@@ -370,7 +346,6 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
 		if (typeof pick === 'number') {
 			await instaService.invokeFunction(formatDocumentWithProvider, provider[pick], editor, FormattingMode.Explicit, CancellationToken.None);
 		}
-		logFormatterTelemetry(telemetryService, 'document', provider, typeof pick === 'number' && provider[pick] || undefined);
 	}
 });
 
@@ -396,7 +371,6 @@ registerEditorAction(class FormatSelectionMultipleAction extends EditorAction {
 		}
 		const instaService = accessor.get(IInstantiationService);
 		const languageFeaturesService = accessor.get(ILanguageFeaturesService);
-		const telemetryService = accessor.get(ITelemetryService);
 
 		const model = editor.getModel();
 		let range: Range = editor.getSelection();
@@ -409,7 +383,5 @@ registerEditorAction(class FormatSelectionMultipleAction extends EditorAction {
 		if (typeof pick === 'number') {
 			await instaService.invokeFunction(formatDocumentRangesWithProvider, provider[pick], editor, range, CancellationToken.None, true);
 		}
-
-		logFormatterTelemetry(telemetryService, 'range', provider, typeof pick === 'number' && provider[pick] || undefined);
 	}
 });
diff --git a/src/vs/workbench/services/extensions/common/extensionHostManager.ts b/src/vs/workbench/services/extensions/common/extensionHostManager.ts
index 339094c02867..66d18ac21f8e 100644
--- a/src/vs/workbench/services/extensions/common/extensionHostManager.ts
+++ b/src/vs/workbench/services/extensions/common/extensionHostManager.ts
@@ -552,8 +552,7 @@ type RPCTelemetryDataClassification = {
 class TelemetryRPCLogger implements IRPCProtocolLogger {
 
 	static isEnabled(): boolean {
-		// this will be a very high frequency event, so we only log a small percentage of them
-		return Math.trunc(Math.random() * 1000) < 0.5;
+		return Math.random() < 0.0001; // 0.01% of users
 	}
 
 	private readonly _pendingRequests = new Map<number, string>();
diff --git a/src/vs/workbench/services/timer/browser/timerService.ts b/src/vs/workbench/services/timer/browser/timerService.ts
index fdab1110746c..755f00263d43 100644
--- a/src/vs/workbench/services/timer/browser/timerService.ts
+++ b/src/vs/workbench/services/timer/browser/timerService.ts
@@ -508,7 +508,7 @@ export abstract class AbstractTimerService implements ITimerService {
 
 	private readonly _barrier = new Barrier();
 	private readonly _marks = new PerfMarks();
-	private readonly _rndValueShouldSendTelemetry = Math.random() < .05; // 5% of users
+	private readonly _rndValueShouldSendTelemetry = Math.random() < .03; // 3% of users
 
 	private _startupMetrics?: IStartupMetrics;
 

From 79570ba3fde5ea74b248e3ae3fa930fbb6fe4901 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Fri, 28 Feb 2025 12:39:14 +0100
Subject: [PATCH 0526/1815] Revert "disable, restart extension host, uninstall
 and remove problematic extension (#242249)" (#242293)

This reverts commit 4e6f06d1c7ad67cb14a654cee571518f8ead0ef2.
---
 .../abstractExtensionManagementService.ts     |  41 +------
 .../common/extensionManagement.ts             |   6 -
 .../node/extensionManagementService.ts        |   4 -
 .../browser/extensions.contribution.ts        |   7 +-
 .../extensions/browser/extensionsActions.ts   |   2 +-
 .../extensions/browser/extensionsViewlet.ts   |  59 +++++++++-
 .../browser/extensionsWorkbenchService.ts     | 105 ++++--------------
 .../extensionsWorkbenchService.test.ts        |   1 -
 .../browser/extensionEnablementService.ts     |   6 +-
 .../common/extensionManagementService.ts      |   2 +-
 .../common/webExtensionManagementService.ts   |   4 -
 .../common/abstractExtensionService.ts        |   2 +-
 12 files changed, 95 insertions(+), 144 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
index 7de8487c813d..73fbccd8f518 100644
--- a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
@@ -723,22 +723,14 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 				this.logService.info('Successfully uninstalled extension from the profile', `${extension.identifier.id}@${extension.manifest.version}`, uninstallOptions.profileLocation.toString());
 			}
 			reportTelemetry(this.telemetryService, 'extensionGallery:uninstall', { extensionData: getLocalExtensionTelemetryData(extension), error });
-			this._onDidUninstallExtension.fire({ identifier: extension.identifier, context: uninstallOptions.context, error: error?.code, profileLocation: uninstallOptions.profileLocation, applicationScoped: extension.isApplicationScoped });
+			this._onDidUninstallExtension.fire({ identifier: extension.identifier, error: error?.code, profileLocation: uninstallOptions.profileLocation, applicationScoped: extension.isApplicationScoped });
 		};
 
 		const allTasks: IUninstallExtensionTask[] = [];
 		const processedTasks: IUninstallExtensionTask[] = [];
 		const alreadyRequestedUninstalls: Promise<any>[] = [];
-		const extensionsToRemove: ILocalExtension[] = [];
 
 		const installedExtensionsMap = new ResourceMap<ILocalExtension[]>();
-		const getInstalledExtensions = async (profileLocation: URI) => {
-			let installed = installedExtensionsMap.get(profileLocation);
-			if (!installed) {
-				installedExtensionsMap.set(profileLocation, installed = await this.getInstalled(ExtensionType.User, profileLocation));
-			}
-			return installed;
-		};
 
 		for (const { extension, options } of extensions) {
 			const uninstallOptions: UninstallExtensionTaskOptions = {
@@ -752,32 +744,14 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 			} else {
 				allTasks.push(createUninstallExtensionTask(extension, uninstallOptions));
 			}
-
-			if (uninstallOptions.remove) {
-				extensionsToRemove.push(extension);
-				for (const profile of this.userDataProfilesService.profiles) {
-					if (this.uriIdentityService.extUri.isEqual(profile.extensionsResource, uninstallOptions.profileLocation)) {
-						continue;
-					}
-					const installed = await getInstalledExtensions(profile.extensionsResource);
-					const profileExtension = installed.find(e => areSameExtensions(e.identifier, extension.identifier));
-					if (profileExtension) {
-						const uninstallOptionsWithProfile = { ...uninstallOptions, profileLocation: profile.extensionsResource };
-						const uninstallExtensionTask = this.uninstallingExtensions.get(getUninstallExtensionTaskKey(profileExtension, uninstallOptionsWithProfile));
-						if (uninstallExtensionTask) {
-							this.logService.info('Extensions is already requested to uninstall', profileExtension.identifier.id);
-							alreadyRequestedUninstalls.push(uninstallExtensionTask.waitUntilTaskIsFinished());
-						} else {
-							allTasks.push(createUninstallExtensionTask(profileExtension, uninstallOptionsWithProfile));
-						}
-					}
-				}
-			}
 		}
 
 		try {
 			for (const task of allTasks.slice(0)) {
-				const installed = await getInstalledExtensions(task.options.profileLocation);
+				let installed = installedExtensionsMap.get(task.options.profileLocation);
+				if (!installed) {
+					installedExtensionsMap.set(task.options.profileLocation, installed = await this.getInstalled(ExtensionType.User, task.options.profileLocation));
+				}
 
 				if (task.options.donotIncludePack) {
 					this.logService.info('Uninstalling the extension without including packed extension', `${task.extension.identifier.id}@${task.extension.manifest.version}`);
@@ -825,10 +799,6 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 			for (const task of allTasks) {
 				postUninstallExtension(task.extension, task.options);
 			}
-
-			if (extensionsToRemove.length) {
-				await this.joinAllSettled(extensionsToRemove.map(extension => this.removeExtension(extension)));
-			}
 		} catch (e) {
 			const error = toExtensionManagementError(e);
 			for (const task of allTasks) {
@@ -925,7 +895,6 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 	protected abstract createInstallExtensionTask(manifest: IExtensionManifest, extension: URI | IGalleryExtension, options: InstallExtensionTaskOptions): IInstallExtensionTask;
 	protected abstract createUninstallExtensionTask(extension: ILocalExtension, options: UninstallExtensionTaskOptions): IUninstallExtensionTask;
 	protected abstract copyExtension(extension: ILocalExtension, fromProfileLocation: URI, toProfileLocation: URI, metadata?: Partial<Metadata>): Promise<ILocalExtension>;
-	protected abstract removeExtension(extension: ILocalExtension): Promise<void>;
 }
 
 export function toExtensionManagementError(error: Error, code?: ExtensionManagementErrorCode): ExtensionManagementError {
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 9ad3b5e75a6f..578f0c6dd7fd 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -23,7 +23,6 @@ export const EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT = 'skipPublisherTrus
 export const EXTENSION_INSTALL_SOURCE_CONTEXT = 'extensionInstallSource';
 export const EXTENSION_INSTALL_DEP_PACK_CONTEXT = 'dependecyOrPackExtensionInstall';
 export const EXTENSION_INSTALL_CLIENT_TARGET_PLATFORM_CONTEXT = 'clientTargetPlatform';
-export const EXTENSION_UNINSTALL_MALICIOUS_CONTEXT = 'uninstallMaliciousExtension';
 
 export const enum ExtensionInstallSource {
 	COMMAND = 'command',
@@ -416,7 +415,6 @@ export interface UninstallExtensionEvent {
 
 export interface DidUninstallExtensionEvent {
 	readonly identifier: IExtensionIdentifier;
-	readonly context?: IStringDictionary<any>;
 	readonly error?: string;
 	readonly profileLocation: URI;
 	readonly applicationScoped?: boolean;
@@ -551,10 +549,6 @@ export type UninstallOptions = {
 	readonly donotCheckDependents?: boolean;
 	readonly versionOnly?: boolean;
 	readonly remove?: boolean;
-	/**
-	 * Context passed through to DidUninstallExtensionEvent
-	 */
-	context?: IStringDictionary<any>;
 };
 
 export interface IExtensionManagementParticipant {
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 11bb73f08484..04ed18266096 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -214,10 +214,6 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 		return local;
 	}
 
-	protected removeExtension(extension: ILocalExtension): Promise<void> {
-		return this.extensionsScanner.deleteExtension(extension, 'remove');
-	}
-
 	protected copyExtension(extension: ILocalExtension, fromProfileLocation: URI, toProfileLocation: URI, metadata: Partial<Metadata>): Promise<ILocalExtension> {
 		return this.extensionsScanner.copyExtension(extension, fromProfileLocation, toProfileLocation, metadata);
 	}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index ef2b9bc2b7ca..e30163945172 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -17,7 +17,7 @@ import { VIEWLET_ID, IExtensionsWorkbenchService, IExtensionsViewPaneContainer,
 import { InstallSpecificVersionOfExtensionAction, ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, SetColorThemeAction, SetFileIconThemeAction, SetProductIconThemeAction, ClearLanguageAction, ToggleAutoUpdateForExtensionAction, ToggleAutoUpdatesForPublisherAction, TogglePreReleaseExtensionAction, InstallAnotherVersionAction, InstallAction } from './extensionsActions.js';
 import { ExtensionsInput } from '../common/extensionsInput.js';
 import { ExtensionEditor } from './extensionEditor.js';
-import { StatusUpdater, ExtensionsViewletViewsContribution, ExtensionsViewPaneContainer, BuiltInExtensionsContext, SearchMarketplaceExtensionsContext, RecommendedExtensionsContext, DefaultViewsContext, ExtensionsSortByContext, SearchHasTextContext, ExtensionsSearchValueContext } from './extensionsViewlet.js';
+import { StatusUpdater, MaliciousExtensionChecker, ExtensionsViewletViewsContribution, ExtensionsViewPaneContainer, BuiltInExtensionsContext, SearchMarketplaceExtensionsContext, RecommendedExtensionsContext, DefaultViewsContext, ExtensionsSortByContext, SearchHasTextContext, ExtensionsSearchValueContext } from './extensionsViewlet.js';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
 import * as jsonContributionRegistry from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
 import { ExtensionsConfigurationSchema, ExtensionsConfigurationSchemaId } from '../common/extensionsFileTemplate.js';
@@ -1670,7 +1670,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			title: localize('download VSIX', "Download VSIX"),
 			menu: {
 				id: MenuId.ExtensionContext,
-				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.not('extensionDisallowInstall'), ContextKeyExpr.has('isGalleryExtension')),
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.has('isGalleryExtension')),
 				order: this.productService.quality === 'stable' ? 0 : 1
 			},
 			run: async (accessor: ServicesAccessor, extensionId: string) => {
@@ -1683,7 +1683,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			title: localize('download pre-release', "Download Pre-Release VSIX"),
 			menu: {
 				id: MenuId.ExtensionContext,
-				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.not('extensionDisallowInstall'), ContextKeyExpr.has('isGalleryExtension'), ContextKeyExpr.has('extensionHasPreReleaseVersion')),
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.has('isGalleryExtension'), ContextKeyExpr.has('extensionHasPreReleaseVersion')),
 				order: this.productService.quality === 'stable' ? 1 : 0
 			},
 			run: async (accessor: ServicesAccessor, extensionId: string) => {
@@ -1997,6 +1997,7 @@ class TrustedPublishersInitializer implements IWorkbenchContribution {
 const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 workbenchRegistry.registerWorkbenchContribution(ExtensionsContributions, LifecyclePhase.Restored);
 workbenchRegistry.registerWorkbenchContribution(StatusUpdater, LifecyclePhase.Eventually);
+workbenchRegistry.registerWorkbenchContribution(MaliciousExtensionChecker, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(KeymapExtensions, LifecyclePhase.Restored);
 workbenchRegistry.registerWorkbenchContribution(ExtensionsViewletViewsContribution, LifecyclePhase.Restored);
 workbenchRegistry.registerWorkbenchContribution(ExtensionActivationProgress, LifecyclePhase.Eventually);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
index 3cd6405610ef..8b062d1d47d6 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
@@ -1250,7 +1250,7 @@ async function getContextMenuActionsGroups(extension: IExtension | undefined | n
 			cksOverlay.push(['galleryExtensionHasPreReleaseVersion', extension.gallery?.hasPreReleaseVersion]);
 			cksOverlay.push(['extensionHasPreReleaseVersion', extension.hasPreReleaseVersion]);
 			cksOverlay.push(['extensionHasReleaseVersion', extension.hasReleaseVersion]);
-			cksOverlay.push(['extensionDisallowInstall', extension.isMalicious || extension.deprecationInfo?.disallowInstall]);
+			cksOverlay.push(['extensionDisallowInstall', !!extension.deprecationInfo?.disallowInstall]);
 			cksOverlay.push(['isExtensionAllowed', allowedExtensionsService.isAllowed({ id: extension.identifier.id, publisherDisplayName: extension.publisherDisplayName }) === true]);
 			cksOverlay.push(['isPreReleaseExtensionAllowed', allowedExtensionsService.isAllowed({ id: extension.identifier.id, publisherDisplayName: extension.publisherDisplayName, prerelease: true }) === true]);
 			cksOverlay.push(['extensionIsUnsigned', extension.gallery && !extension.gallery.isSigned]);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
index 49c0ffed6ba6..ee75bba1ed6f 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
@@ -5,7 +5,7 @@
 
 import './media/extensionsViewlet.css';
 import { localize, localize2 } from '../../../../nls.js';
-import { Delayer } from '../../../../base/common/async.js';
+import { timeout, Delayer, Promises } from '../../../../base/common/async.js';
 import { isCancellationError } from '../../../../base/common/errors.js';
 import { createErrorWithActions } from '../../../../base/common/errorMessage.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
@@ -18,6 +18,7 @@ import { IInstantiationService, ServicesAccessor } from '../../../../platform/in
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IExtensionsWorkbenchService, IExtensionsViewPaneContainer, VIEWLET_ID, CloseExtensionDetailsOnViewChangeKey, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, AutoCheckUpdatesConfigurationKey, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu, AutoRestartConfigurationKey } from '../common/extensions.js';
 import { InstallLocalExtensionsInRemoteAction, InstallRemoteExtensionsInLocalAction } from './extensionsActions.js';
+import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IWorkbenchExtensionEnablementService, IExtensionManagementServerService, IExtensionManagementServer } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { ExtensionsInput } from '../common/extensionsInput.js';
 import { ExtensionsListView, EnabledExtensionsView, DisabledExtensionsView, RecommendedExtensionsView, WorkspaceRecommendedExtensionsView, ServerInstalledExtensionsView, DefaultRecommendedExtensionsView, UntrustedWorkspaceUnsupportedExtensionsView, UntrustedWorkspacePartiallySupportedExtensionsView, VirtualWorkspaceUnsupportedExtensionsView, VirtualWorkspacePartiallySupportedExtensionsView, DefaultPopularExtensionsView, DeprecatedExtensionsView, SearchMarketplaceExtensionsView, RecentlyUpdatedExtensionsView, OutdatedExtensionsView, StaticQueryExtensionsView, NONE_CATEGORY } from './extensionsViews.js';
@@ -33,20 +34,22 @@ import { IWorkspaceContextService } from '../../../../platform/workspace/common/
 import { IContextKeyService, ContextKeyExpr, RawContextKey, IContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
-import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { INotificationService, NotificationPriority } from '../../../../platform/notification/common/notification.js';
+import { IHostService } from '../../../services/host/browser/host.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
 import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
 import { ViewPane } from '../../../browser/parts/views/viewPane.js';
 import { Query } from '../common/extensionQuery.js';
 import { SuggestEnabledInput } from '../../codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
-import { EXTENSION_CATEGORIES } from '../../../../platform/extensions/common/extensions.js';
+import { EXTENSION_CATEGORIES, ExtensionType } from '../../../../platform/extensions/common/extensions.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { MementoObject } from '../../../common/memento.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
 import { SIDE_BAR_DRAG_AND_DROP_BACKGROUND } from '../../../common/theme.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 import { VirtualWorkspaceContext, WorkbenchStateContext } from '../../../common/contextkeys.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { installLocalInRemoteIcon } from './extensionsIcons.js';
@@ -56,6 +59,7 @@ import { IPaneCompositePartService } from '../../../services/panecomposite/brows
 import { coalesce } from '../../../../base/common/arrays.js';
 import { extractEditorsAndFilesDropData } from '../../../../platform/dnd/browser/dnd.js';
 import { extname } from '../../../../base/common/resources.js';
+import { isMalicious } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { ILocalizedString } from '../../../../platform/action/common/action.js';
 import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
 import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
@@ -963,3 +967,52 @@ export class StatusUpdater extends Disposable implements IWorkbenchContribution
 		}
 	}
 }
+
+export class MaliciousExtensionChecker implements IWorkbenchContribution {
+
+	constructor(
+		@IExtensionManagementService private readonly extensionsManagementService: IExtensionManagementService,
+		@IHostService private readonly hostService: IHostService,
+		@ILogService private readonly logService: ILogService,
+		@INotificationService private readonly notificationService: INotificationService,
+		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService
+	) {
+		if (!this.environmentService.disableExtensions) {
+			this.loopCheckForMaliciousExtensions();
+		}
+	}
+
+	private loopCheckForMaliciousExtensions(): void {
+		this.checkForMaliciousExtensions()
+			.then(() => timeout(1000 * 60 * 5)) // every five minutes
+			.then(() => this.loopCheckForMaliciousExtensions());
+	}
+
+	private checkForMaliciousExtensions(): Promise<void> {
+		return this.extensionsManagementService.getExtensionsControlManifest().then(extensionsControlManifest => {
+
+			return this.extensionsManagementService.getInstalled(ExtensionType.User).then(installed => {
+				const maliciousExtensions = installed.filter(e => isMalicious(e.identifier, extensionsControlManifest));
+
+				if (maliciousExtensions.length) {
+					return Promises.settled(maliciousExtensions.map(e => this.extensionsManagementService.uninstall(e).then(() => {
+						this.notificationService.prompt(
+							Severity.Warning,
+							localize('malicious warning', "We have uninstalled '{0}' which was reported to be problematic.", e.identifier.id),
+							[{
+								label: localize('reloadNow', "Reload Now"),
+								run: () => this.hostService.reload()
+							}],
+							{
+								sticky: true,
+								priority: NotificationPriority.URGENT
+							}
+						);
+					})));
+				} else {
+					return Promise.resolve(undefined);
+				}
+			}).then(() => undefined);
+		}, err => this.logService.error(err));
+	}
+}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index ce78298844a0..74f8e88fb618 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -21,8 +21,7 @@ import {
 	TargetPlatformToString,
 	IAllowedExtensionsService,
 	AllowedExtensionsConfigKey,
-	EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT,
-	EXTENSION_UNINSTALL_MALICIOUS_CONTEXT,
+	EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT
 } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, DefaultIconPath, IResourceExtension } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, areSameExtensions, groupByExtension, getGalleryExtensionId, isMalicious } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
@@ -916,7 +915,6 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 
 	private updatesCheckDelayer: ThrottledDelayer<void>;
 	private autoUpdateDelayer: ThrottledDelayer<void>;
-	private maliciousExtensionsCheckDelayer: ThrottledDelayer<void>;
 
 	private readonly _onChange = this._register(new Emitter<IExtension | undefined>());
 	get onChange(): Event<IExtension | undefined> { return this._onChange.event; }
@@ -1013,11 +1011,9 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 
 		this.updatesCheckDelayer = new ThrottledDelayer<void>(ExtensionsWorkbenchService.UpdatesCheckInterval);
 		this.autoUpdateDelayer = new ThrottledDelayer<void>(1000);
-		this.maliciousExtensionsCheckDelayer = new ThrottledDelayer<void>(1000 * 60 * 5 /* every five minutes */);
 		this._register(toDisposable(() => {
 			this.updatesCheckDelayer.cancel();
 			this.autoUpdateDelayer.cancel();
-			this.maliciousExtensionsCheckDelayer.cancel();
 		}));
 
 		urlService.registerHandler(this);
@@ -1049,8 +1045,6 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 			this.updateExtensionsNotificaiton();
 			this.reportProgressFromOtherSources();
 		}));
-
-		this.loopCheckForMaliciousExtensions();
 	}
 
 	private initializeAutoUpdate(): void {
@@ -1523,7 +1517,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		return undefined;
 	}
 
-	async updateRunningExtensions(auto: boolean = false, reason: string = nls.localize('restart', "Updating Extensions")): Promise<void> {
+	async updateRunningExtensions(auto: boolean = false): Promise<void> {
 		const toAdd: ILocalExtension[] = [];
 		const toRemove: string[] = [];
 
@@ -1564,7 +1558,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		}
 
 		if (toAdd.length || toRemove.length) {
-			if (await this.extensionService.stopExtensionHosts(reason, auto)) {
+			if (await this.extensionService.stopExtensionHosts(nls.localize('restart', "Changing extension enablement"), auto)) {
 				await this.extensionService.startExtensionHosts({ toAdd, toRemove });
 				if (auto) {
 					this.notificationService.notify({
@@ -2532,9 +2526,9 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		return this.localeService.setLocale({ id: locale, galleryExtension: extension.gallery, extensionId: extension.identifier.id, label: localizedLanguageName ?? extension.displayName });
 	}
 
-	setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState, force: boolean = false): Promise<void> {
+	setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState): Promise<void> {
 		extensions = Array.isArray(extensions) ? extensions : [extensions];
-		return this.promptAndSetEnablement(extensions, enablementState, force);
+		return this.promptAndSetEnablement(extensions, enablementState);
 	}
 
 	async uninstall(e: IExtension): Promise<void> {
@@ -2792,45 +2786,43 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		});
 	}
 
-	private promptAndSetEnablement(extensions: IExtension[], enablementState: EnablementState, force: boolean): Promise<any> {
+	private promptAndSetEnablement(extensions: IExtension[], enablementState: EnablementState): Promise<any> {
 		const enable = enablementState === EnablementState.EnabledGlobally || enablementState === EnablementState.EnabledWorkspace;
 		if (enable) {
 			const allDependenciesAndPackedExtensions = this.getExtensionsRecursively(extensions, this.local, enablementState, { dependencies: true, pack: true });
-			return this.checkAndSetEnablement(extensions, allDependenciesAndPackedExtensions, enablementState, force);
+			return this.checkAndSetEnablement(extensions, allDependenciesAndPackedExtensions, enablementState);
 		} else {
 			const packedExtensions = this.getExtensionsRecursively(extensions, this.local, enablementState, { dependencies: false, pack: true });
 			if (packedExtensions.length) {
-				return this.checkAndSetEnablement(extensions, packedExtensions, enablementState, force);
+				return this.checkAndSetEnablement(extensions, packedExtensions, enablementState);
 			}
-			return this.checkAndSetEnablement(extensions, [], enablementState, force);
+			return this.checkAndSetEnablement(extensions, [], enablementState);
 		}
 	}
 
-	private async checkAndSetEnablement(extensions: IExtension[], otherExtensions: IExtension[], enablementState: EnablementState, force: boolean): Promise<any> {
+	private async checkAndSetEnablement(extensions: IExtension[], otherExtensions: IExtension[], enablementState: EnablementState): Promise<any> {
 		const allExtensions = [...extensions, ...otherExtensions];
 		const enable = enablementState === EnablementState.EnabledGlobally || enablementState === EnablementState.EnabledWorkspace;
 		if (!enable) {
 			for (const extension of extensions) {
 				const dependents = this.getDependentsAfterDisablement(extension, allExtensions, this.local);
 				if (dependents.length) {
-					if (!force) {
-						const { result } = await this.dialogService.prompt({
-							title: nls.localize('disableDependents', "Disable Extension with Dependents"),
-							type: Severity.Warning,
-							message: this.getDependentsErrorMessageForDisablement(extension, allExtensions, dependents),
-							buttons: [{
-								label: nls.localize('disable all', 'Disable All'),
-								run: () => true
-							}],
-							cancelButton: {
-								run: () => false
-							}
-						});
-						if (!result) {
-							throw new CancellationError();
+					const { result } = await this.dialogService.prompt({
+						title: nls.localize('disableDependents', "Disable Extension with Dependents"),
+						type: Severity.Warning,
+						message: this.getDependentsErrorMessageForDisablement(extension, allExtensions, dependents),
+						buttons: [{
+							label: nls.localize('disable all', 'Disable All'),
+							run: () => true
+						}],
+						cancelButton: {
+							run: () => false
 						}
+					});
+					if (!result) {
+						throw new CancellationError();
 					}
-					await this.checkAndSetEnablement(dependents, [extension], enablementState, force);
+					await this.checkAndSetEnablement(dependents, [extension], enablementState);
 				}
 			}
 		}
@@ -2955,55 +2947,6 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		this.notificationService.error(err);
 	}
 
-	private loopCheckForMaliciousExtensions(): void {
-		this.checkForMaliciousExtensions()
-			.then(() => this.maliciousExtensionsCheckDelayer.trigger(async () => this.loopCheckForMaliciousExtensions()));
-	}
-
-	private async checkForMaliciousExtensions(): Promise<void> {
-		try {
-			await this.queryLocal();
-
-			const maliciousExtensions = this.installed.filter(e => e.isMalicious);
-
-			if (maliciousExtensions.length) {
-
-				// First disable them
-				await this.setEnablement(maliciousExtensions, EnablementState.DisabledGlobally, true);
-
-				await Promises.settled([
-					// Update running extensions to remove them
-					this.updateRunningExtensions(false, nls.localize('remove malicious', "Removing problematic extensions")),
-					// Uninstall them
-					...maliciousExtensions.map(async e => {
-						if (!e.local) {
-							return;
-						}
-						await this.extensionManagementService.uninstallExtensions([{
-							extension: e.local,
-							options: {
-								remove: true,
-								donotCheckDependents: true,
-								context: { [EXTENSION_UNINSTALL_MALICIOUS_CONTEXT]: true }
-							}
-						}]);
-						this.notificationService.prompt(
-							Severity.Warning,
-							nls.localize('malicious warning', "The extension '{0}' was found to be problematic and has been removed.", e.identifier.id),
-							[],
-							{
-								sticky: true,
-								priority: NotificationPriority.URGENT
-							}
-						);
-					})
-				]);
-			}
-		} catch (err) {
-			this.logService.error(err);
-		}
-	}
-
 	handleURL(uri: URI, options?: IOpenURLOptions): Promise<boolean> {
 		if (!/^extension/.test(uri.path)) {
 			return Promise.resolve(false);
diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts
index 744958fffa35..9c8f2b5c983a 100644
--- a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts
+++ b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts
@@ -997,7 +997,6 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 			.then(async () => {
 				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a')]);
 				testObject = await aWorkbenchService();
-				await testObject.whenInitialized;
 				const target = sinon.spy();
 				disposableStore.add(testObject.onChange(target));
 
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
index 8c221fd4a2bb..2ad63cc370b8 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
@@ -6,7 +6,7 @@
 import { localize } from '../../../../nls.js';
 import { Event, Emitter } from '../../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { IExtensionManagementService, IExtensionIdentifier, IGlobalExtensionEnablementService, ENABLED_EXTENSIONS_STORAGE_PATH, DISABLED_EXTENSIONS_STORAGE_PATH, InstallOperation, IAllowedExtensionsService, EXTENSION_UNINSTALL_MALICIOUS_CONTEXT } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IExtensionManagementService, IExtensionIdentifier, IGlobalExtensionEnablementService, ENABLED_EXTENSIONS_STORAGE_PATH, DISABLED_EXTENSIONS_STORAGE_PATH, InstallOperation, IAllowedExtensionsService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IWorkbenchExtensionManagementService, IExtensionManagementServer, ExtensionInstallLocation } from '../common/extensionManagement.js';
 import { areSameExtensions, BetterMergeId, getExtensionDependencies } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
@@ -67,7 +67,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		super();
 		this.storageManager = this._register(new StorageManager(storageService));
 
-		const uninstallDisposable = this._register(Event.filter(extensionManagementService.onDidUninstallExtension, e => !e.error && !e.context?.[EXTENSION_UNINSTALL_MALICIOUS_CONTEXT])(({ identifier }) => this._reset(identifier)));
+		const uninstallDisposable = this._register(Event.filter(extensionManagementService.onDidUninstallExtension, e => !e.error)(({ identifier }) => this._reset(identifier)));
 		let isDisposed = false;
 		this._register(toDisposable(() => isDisposed = true));
 		this.extensionsManager = this._register(instantiationService.createInstance(ExtensionsManager));
@@ -738,7 +738,7 @@ class ExtensionsManager extends Disposable {
 			this.updateExtensions(e.reduce<IExtension[]>((result, { local, operation }) => {
 				if (local && operation !== InstallOperation.Migrate) { result.push(local); } return result;
 			}, []), [], undefined, false)));
-		this._register(Event.filter(this.extensionManagementService.onDidUninstallExtension, (e => !e.error && !e.context?.[EXTENSION_UNINSTALL_MALICIOUS_CONTEXT]))(e => this.updateExtensions([], [e.identifier], e.server, false)));
+		this._register(Event.filter(this.extensionManagementService.onDidUninstallExtension, (e => !e.error))(e => this.updateExtensions([], [e.identifier], e.server, false)));
 		this._register(this.extensionManagementService.onDidChangeProfile(({ added, removed, server }) => {
 			this.updateExtensions(added, removed.map(({ identifier }) => identifier), server, true);
 		}));
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
index 75d90366ab1f..bcf58d25cd92 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
@@ -783,7 +783,7 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 		if (this.extensionManagementServerService.webExtensionManagementServer) {
 			return this.extensionManagementServerService.webExtensionManagementServer.extensionManagementService.getExtensionsControlManifest();
 		}
-		return this.extensionGalleryService.getExtensionsControlManifest();
+		return Promise.resolve({ malicious: [], deprecated: {}, search: [] });
 	}
 
 	private getServer(extension: ILocalExtension): IExtensionManagementServer | null {
diff --git a/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
index c3e21ded56a6..65b49fb7bd12 100644
--- a/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
@@ -119,10 +119,6 @@ export class WebExtensionManagementService extends AbstractExtensionManagementSe
 		return this.install(location, { profileLocation });
 	}
 
-	protected async removeExtension(extension: ILocalExtension): Promise<void> {
-		// do nothing
-	}
-
 	protected async copyExtension(extension: ILocalExtension, fromProfileLocation: URI, toProfileLocation: URI, metadata: Partial<Metadata>): Promise<ILocalExtension> {
 		const target = await this.webExtensionsScannerService.scanExistingExtension(extension.location, extension.type, toProfileLocation);
 		const source = await this.webExtensionsScannerService.scanExistingExtension(extension.location, extension.type, fromProfileLocation);
diff --git a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
index 1dd6c88c05a7..382683f3cf76 100644
--- a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
+++ b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
@@ -764,7 +764,7 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 
 				const { confirmed } = await this._dialogService.confirm({
 					type: Severity.Warning,
-					message: nls.localize('extensionStopVetoMessage', "Please confirm restart of extensions: {0}.", reason),
+					message: nls.localize('extensionStopVetoMessage', "Please confirm restart of extensions."),
 					detail: vetoReasonsArray.length === 1 ?
 						vetoReasonsArray[0] :
 						vetoReasonsArray.join('\n -'),

From 4cf2712386fca7993e03b0563647f88b5635f850 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 28 Feb 2025 12:40:17 +0100
Subject: [PATCH 0527/1815] Fix for #241866 in main (#242294)

---
 ...ineCompletionLanguageStatusBarContribution.ts | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts b/src/vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts
index 8071173c0483..4f8c7c4799ef 100644
--- a/src/vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts
+++ b/src/vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts
@@ -5,24 +5,29 @@
 
 import { localize } from '../../../../nls.js';
 import { createHotClass } from '../../../../base/common/hotReloadHelpers.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { autorunWithStore, derived } from '../../../../base/common/observable.js';
 import { debouncedObservable } from '../../../../base/common/observableInternal/utils.js';
 import Severity from '../../../../base/common/severity.js';
 import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { InlineCompletionsController } from '../../../../editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js';
 import { ILanguageStatusService } from '../../../services/languageStatus/common/languageStatusService.js';
+import { observableCodeEditor } from '../../../../editor/browser/observableCodeEditor.js';
 
 export class InlineCompletionLanguageStatusBarContribution extends Disposable {
 	public static readonly hot = createHotClass(InlineCompletionLanguageStatusBarContribution);
 
 	public static Id = 'vs.editor.contrib.inlineCompletionLanguageStatusBarContribution';
+	public static readonly languageStatusBarDisposables = new Set<DisposableStore>();
 
 	private readonly _c = InlineCompletionsController.get(this._editor);
 
 	private readonly _state = derived(this, reader => {
 		const model = this._c?.model.read(reader);
 		if (!model) { return undefined; }
+		if (!observableCodeEditor(this._editor).isFocused.read(reader)) {
+			return undefined;
+		}
 
 		return {
 			model,
@@ -51,6 +56,15 @@ export class InlineCompletionLanguageStatusBarContribution extends Disposable {
 				noSuggestion: { shortLabel: '$(circle-slash)', label: '$(copilot) ' + localize('noInlineSuggestionAvailable', "No inline suggestion available"), loading: false, },
 			};
 
+			// Make sure previous status is cleared before the new is registered. This works, but is a bit hacky.
+			// TODO: Use a workbench contribution to get singleton behavior.
+			InlineCompletionLanguageStatusBarContribution.languageStatusBarDisposables.forEach(d => d.clear());
+
+			InlineCompletionLanguageStatusBarContribution.languageStatusBarDisposables.add(store);
+			store.add({
+				dispose: () => InlineCompletionLanguageStatusBarContribution.languageStatusBarDisposables.delete(store)
+			});
+
 			store.add(this._languageStatusService.addStatus({
 				accessibilityInfo: undefined,
 				busy: statusMap[status].loading,

From a26707320440021f45b508767c94c2634eb6e897 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Fri, 28 Feb 2025 13:20:44 +0100
Subject: [PATCH 0528/1815] Update grammars (#242296)

---
 extensions/csharp/cgmanifest.json             |   2 +-
 .../csharp/syntaxes/csharp.tmLanguage.json    |  10 +-
 extensions/latex/cgmanifest.json              |   4 +-
 .../latex/syntaxes/LaTeX.tmLanguage.json      |  10 +-
 .../markdown-latex-combined.tmLanguage.json   |   4 +-
 extensions/ruby/cgmanifest.json               |   2 +-
 extensions/ruby/syntaxes/ruby.tmLanguage.json |  17 +-
 extensions/scss/cgmanifest.json               |   4 +-
 extensions/sql/cgmanifest.json                |   4 +-
 extensions/sql/syntaxes/sql.tmLanguage.json   |   4 +-
 .../test/colorize-results/test_rb.json        | 224 +++++++++++-------
 11 files changed, 169 insertions(+), 116 deletions(-)

diff --git a/extensions/csharp/cgmanifest.json b/extensions/csharp/cgmanifest.json
index fefe63e47868..58ae5ece50ae 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": "62026a70f9fcc42d9222eccfec34ed5ee0784f3d"
+					"commitHash": "1381bedfb087c18aca67af8278050d11bc9d9349"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/csharp/syntaxes/csharp.tmLanguage.json b/extensions/csharp/syntaxes/csharp.tmLanguage.json
index c4d9a2519dc3..1afcc3053b60 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/62026a70f9fcc42d9222eccfec34ed5ee0784f3d",
+	"version": "https://github.com/dotnet/csharp-tmLanguage/commit/1381bedfb087c18aca67af8278050d11bc9d9349",
 	"name": "C#",
 	"scopeName": "source.cs",
 	"patterns": [
@@ -714,11 +714,11 @@
 		},
 		"enum-declaration": {
 			"begin": "(?=\\benum\\b)",
-			"end": "(?<=\\})",
+			"end": "(?<=\\})|(?=;)",
 			"patterns": [
 				{
 					"begin": "(?=enum)",
-					"end": "(?=\\{)",
+					"end": "(?=\\{)|(?=;)",
 					"patterns": [
 						{
 							"include": "#comment"
@@ -805,7 +805,7 @@
 		},
 		"interface-declaration": {
 			"begin": "(?=\\binterface\\b)",
-			"end": "(?<=\\})",
+			"end": "(?<=\\})|(?=;)",
 			"patterns": [
 				{
 					"begin": "(?x)\n(interface)\\b\\s+\n(@?[_[:alpha:]][_[:alnum:]]*)",
@@ -817,7 +817,7 @@
 							"name": "entity.name.type.interface.cs"
 						}
 					},
-					"end": "(?=\\{)",
+					"end": "(?=\\{)|(?=;)",
 					"patterns": [
 						{
 							"include": "#comment"
diff --git a/extensions/latex/cgmanifest.json b/extensions/latex/cgmanifest.json
index c798b2aedd75..d937ba4f4304 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": "dfa69a16a1154dbc820dc1111d72faa6954dd1e2"
+					"commitHash": "df6ef817c932d24da5cc72927344a547e463cc65"
 				}
 			},
 			"license": "MIT",
-			"version": "1.10.0",
+			"version": "1.9.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 d7201e8c652f..06c4c59c60e8 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/7a35f5e0f19b28f5f1366579e2a9ad34df4f40c9",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/7b75bae583f3f9802c533e021f882428872c572c",
 	"name": "LaTeX",
 	"scopeName": "text.tex.latex",
 	"patterns": [
@@ -2349,16 +2349,16 @@
 					]
 				}
 			},
-			"contentName": "meta.embedded.markdown_latex_combined",
+			"contentName": "meta.embedded.internal_only_markdown_latex_combined",
 			"end": "(\\\\end\\{markdown\\})",
 			"patterns": [
 				{
-					"include": "text.tex.markdown_latex_combined"
+					"include": "text.tex.internal_only_markdown_latex_combined"
 				}
 			]
 		},
 		{
-			"begin": "(\\s*\\\\begin\\{(\\w+\\*?)\\})",
+			"begin": "(\\s*\\\\begin\\{(\\p{Alphabetic}+\\*?)\\})",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -3192,7 +3192,7 @@
 					"name": "punctuation.definition.arguments.end.latex"
 				}
 			},
-			"match": "\\s*((\\\\)(?:begin|end))(\\{)([a-zA-Z]*\\*?)(\\})(?:(\\[)([^\\]]*)(\\])){,2}(?:(\\{)([^{}]*)(\\}))?"
+			"match": "\\s*((\\\\)(?:begin|end))(\\{)(\\p{Alphabetic}+\\*?)(\\})(?:(\\[)([^\\]]*)(\\])){,2}(?:(\\{)([^{}]*)(\\}))?"
 		},
 		"definition-label": {
 			"begin": "((\\\\)z?label)((?:\\[[^\\[]*?\\])*)(\\{)",
diff --git a/extensions/latex/syntaxes/markdown-latex-combined.tmLanguage.json b/extensions/latex/syntaxes/markdown-latex-combined.tmLanguage.json
index 566ede8e6c36..2211906fc7b3 100644
--- a/extensions/latex/syntaxes/markdown-latex-combined.tmLanguage.json
+++ b/extensions/latex/syntaxes/markdown-latex-combined.tmLanguage.json
@@ -4,9 +4,9 @@
 		"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/dfa69a16a1154dbc820dc1111d72faa6954dd1e2",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/ed0a6d72377d89eb90280f4159f2d6cdbd63a3a3",
 	"name": "Markdown",
-	"scopeName": "text.tex.markdown_latex_combined",
+	"scopeName": "text.tex.internal_only_markdown_latex_combined",
 	"patterns": [
 		{
 			"include": "text.tex.latex"
diff --git a/extensions/ruby/cgmanifest.json b/extensions/ruby/cgmanifest.json
index 49719a8afe98..f54ddba7ce79 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": "01a8ecf608b7d8607adcd89c32db72ae3852f33b"
+					"commitHash": "958bb1aa0c7aa4b6119c947b69afa7f12b19dceb"
 				}
 			},
 			"licenseDetail": [
diff --git a/extensions/ruby/syntaxes/ruby.tmLanguage.json b/extensions/ruby/syntaxes/ruby.tmLanguage.json
index 84fb37228e64..785b0e4a9287 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/01a8ecf608b7d8607adcd89c32db72ae3852f33b",
+	"version": "https://github.com/Shopify/ruby-lsp/commit/958bb1aa0c7aa4b6119c947b69afa7f12b19dceb",
 	"name": "Ruby",
 	"scopeName": "source.ruby",
 	"patterns": [
@@ -30,7 +30,7 @@
 				}
 			},
 			"comment": "class Namespace::ClassName < OtherNamespace::OtherClassName",
-			"match": "\b(class)\\s+(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*)\\s*((<)\\s*(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*))?",
+			"match": "\\b(class)\\s+(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*)\\s*((<)\\s*(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*))?",
 			"name": "meta.class.ruby"
 		},
 		{
@@ -45,7 +45,7 @@
 					"name": "punctuation.separator.namespace.ruby"
 				}
 			},
-			"match": "\b(module)\\s+(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*)",
+			"match": "\\b(module)\\s+(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*)",
 			"name": "meta.module.ruby"
 		},
 		{
@@ -57,7 +57,7 @@
 					"name": "punctuation.separator.inheritance.ruby"
 				}
 			},
-			"match": "\b(class)\\s*(<<)\\s*",
+			"match": "\\b(class)\\s*(<<)\\s*",
 			"name": "meta.class.ruby"
 		},
 		{
@@ -125,7 +125,7 @@
 					"name": "variable.ruby"
 				}
 			},
-			"match": "^\\s*([a-z]([A-Za-z0-9_])*)\\s*=[^=>]",
+			"match": "^\\s*([a-z]([A-Za-z0-9_])*)\\s*(?==[^=>])",
 			"comment": "A local variable assignment"
 		},
 		{
@@ -2211,7 +2211,7 @@
 			]
 		},
 		{
-			"begin": "(?<={|{\\s|[^A-Za-z0-9_:@$]do|^do|[^A-Za-z0-9_:@$]do\\s|^do\\s)(\\|)",
+			"begin": "(?<={|{\\s+|[^A-Za-z0-9_:@$]do|^do|[^A-Za-z0-9_:@$]do\\s+|^do\\s+)(\\|)",
 			"name": "meta.block.parameters.ruby",
 			"captures": {
 				"1": {
@@ -2225,16 +2225,13 @@
 					"end": "(?=,|\\|\\s*)",
 					"patterns": [
 						{
-							"match": "\\G([&*]?)([a-zA-Z][\\w_]*)|(_[\\w_]*)",
+							"match": "\\G((?:&|\\*\\*?)?)([a-zA-Z_][\\w_]*)",
 							"captures": {
 								"1": {
 									"name": "storage.type.variable.ruby"
 								},
 								"2": {
 									"name": "variable.other.block.ruby"
-								},
-								"3": {
-									"name": "variable.other.block.unused.ruby variable.other.constant.ruby"
 								}
 							}
 						}
diff --git a/extensions/scss/cgmanifest.json b/extensions/scss/cgmanifest.json
index 12247769ce22..a67a4f546096 100644
--- a/extensions/scss/cgmanifest.json
+++ b/extensions/scss/cgmanifest.json
@@ -6,12 +6,12 @@
 				"git": {
 					"name": "atom/language-sass",
 					"repositoryUrl": "https://github.com/atom/language-sass",
-					"commitHash": "f52ab12f7f9346cc2568129d8c4419bd3d506b47"
+					"commitHash": "303bbf0c250fe380b9e57375598cfd916110758b"
 				}
 			},
 			"license": "MIT",
 			"description": "The file syntaxes/scss.json was derived from the Atom package https://github.com/atom/language-sass which was originally converted from the TextMate bundle https://github.com/alexsancho/SASS.tmbundle.",
-			"version": "0.62.1"
+			"version": "0.61.4"
 		}
 	],
 	"version": 1
diff --git a/extensions/sql/cgmanifest.json b/extensions/sql/cgmanifest.json
index fec241862ef0..4a1455ebd319 100644
--- a/extensions/sql/cgmanifest.json
+++ b/extensions/sql/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "microsoft/vscode-mssql",
 					"repositoryUrl": "https://github.com/microsoft/vscode-mssql",
-					"commitHash": "49eff02f68b6ee73025c6665c672ca1c93385dde"
+					"commitHash": "d07e0f838eabff968e4387841427d3c3af8aeec6"
 				}
 			},
 			"license": "MIT",
-			"version": "1.23.0"
+			"version": "1.29.0"
 		}
 	],
 	"version": 1
diff --git a/extensions/sql/syntaxes/sql.tmLanguage.json b/extensions/sql/syntaxes/sql.tmLanguage.json
index 9db452210265..4341bc81528f 100644
--- a/extensions/sql/syntaxes/sql.tmLanguage.json
+++ b/extensions/sql/syntaxes/sql.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/microsoft/vscode-mssql/commit/49eff02f68b6ee73025c6665c672ca1c93385dde",
+	"version": "https://github.com/microsoft/vscode-mssql/commit/d07e0f838eabff968e4387841427d3c3af8aeec6",
 	"name": "SQL",
 	"scopeName": "source.sql",
 	"patterns": [
@@ -372,7 +372,7 @@
 			"include": "#regexps"
 		},
 		{
-			"match": "\\b(?i)(abort|abort_after_wait|absent|absolute|accent_sensitivity|acceptable_cursopt|acp|action|activation|add|address|admin|aes_128|aes_192|aes_256|affinity|after|aggregate|algorithm|all_constraints|all_errormsgs|all_indexes|all_levels|all_results|allow_connections|allow_dup_row|allow_encrypted_value_modifications|allow_page_locks|allow_row_locks|allow_snapshot_isolation|alter|altercolumn|always|anonymous|ansi_defaults|ansi_null_default|ansi_null_dflt_off|ansi_null_dflt_on|ansi_nulls|ansi_padding|ansi_warnings|appdomain|append|application|apply|arithabort|arithignore|array|assembly|asymmetric|asynchronous_commit|at|atan2|atomic|attach|attach_force_rebuild_log|attach_rebuild_log|audit|auth_realm|authentication|auto|auto_cleanup|auto_close|auto_create_statistics|auto_drop|auto_shrink|auto_update_statistics|auto_update_statistics_async|automated_backup_preference|automatic|autopilot|availability|availability_mode|backup|backup_priority|base64|basic|batches|batchsize|before|between|bigint|binary|binding|bit|block|blockers|blocksize|bmk|both|break|broker|broker_instance|bucket_count|buffer|buffercount|bulk_logged|by|call|caller|card|case|catalog|catch|cert|certificate|change_retention|change_tracking|change_tracking_context|changes|char|character|character_set|check_expiration|check_policy|checkconstraints|checkindex|checkpoint|checksum|cleanup_policy|clear|clear_port|close|clustered|codepage|collection|column_encryption_key|column_master_key|columnstore|columnstore_archive|colv_80_to_100|colv_100_to_80|commit_differential_base|committed|compatibility_level|compress_all_row_groups|compression|compression_delay|concat_null_yields_null|concatenate|configuration|connect|connection|containment|continue|continue_after_error|contract|contract_name|control|conversation|conversation_group_id|conversation_handle|copy|copy_only|count_rows|counter|create(\\\\s+or\\\\s+alter)?|credential|cross|cryptographic|cryptographic_provider|cube|cursor|cursor_close_on_commit|cursor_default|data|data_compression|data_flush_interval_seconds|data_mirroring|data_purity|data_source|database|database_name|database_snapshot|datafiletype|date_correlation_optimization|date|datefirst|dateformat|date_format|datetime|datetime2|datetimeoffset|day(s)?|db_chaining|dbid|dbidexec|dbo_only|deadlock_priority|deallocate|dec|decimal|declare|decrypt|decrypt_a|decryption|default_database|default_fulltext_language|default_language|default_logon_domain|default_schema|definition|delay|delayed_durability|delimitedtext|density_vector|dependent|des|description|desired_state|desx|differential|digest|disable|disable_broker|disable_def_cnst_chk|disabled|disk|distinct|distributed|distribution|drop|drop_existing|dts_buffers|dump|durability|dynamic|edition|elements|else|emergency|empty|enable|enable_broker|enabled|encoding|encrypted|encrypted_value|encryption|encryption_type|end|endpoint|endpoint_url|enhancedintegrity|entry|error_broker_conversations|errorfile|estimateonly|event|except|exec|executable|execute|exists|expand|expiredate|expiry_date|explicit|external|external_access|failover|failover_mode|failure_condition_level|fast|fast_forward|fastfirstrow|federated_service_account|fetch|field_terminator|fieldterminator|file|filelistonly|filegroup|filegrowth|filename|filestream|filestream_log|filestream_on|filetable|file_format|filter|first_row|fips_flagger|fire_triggers|first|firstrow|float|flush_interval_seconds|fmtonly|following|for|force|force_failover_allow_data_loss|force_service_allow_data_loss|forced|forceplan|formatfile|format_options|format_type|formsof|forward_only|free_cursors|free_exec_context|fullscan|fulltext|fulltextall|fulltextkey|function|generated|get|geography|geometry|global|go|goto|governor|guid|hadoop|hardening|hash|hashed|header_limit|headeronly|health_check_timeout|hidden|hierarchyid|histogram|histogram_steps|hits_cursors|hits_exec_context|hour(s)?|http|identity|identity_value|if|ifnull|ignore|ignore_constraints|ignore_dup_key|ignore_dup_row|ignore_triggers|image|immediate|implicit_transactions|include|include_null_values|incremental|index|inflectional|init|initiator|insensitive|insert|instead|int|integer|integrated|intersect|intermediate|interval_length_minutes|into|inuse_cursors|inuse_exec_context|io|is|isabout|iso_week|isolation|job_tracker_location|json|keep|keep_nulls|keep_replication|keepdefaults|keepfixed|keepidentity|keepnulls|kerberos|key|key_path|key_source|key_store_provider_name|keyset|kill|kilobytes_per_batch|labelonly|langid|language|last|lastrow|leading|legacy_cardinality_estimation|length|level|lifetime|lineage_80_to_100|lineage_100_to_80|listener_ip|listener_port|load|loadhistory|lob_compaction|local|local_service_name|locate|location|lock_escalation|lock_timeout|lockres|log|login|login_type|loop|manual|mark_in_use_for_removal|masked|master|match|matched|max_queue_readers|max_duration|max_outstanding_io_per_volume|maxdop|maxerrors|maxlength|maxtransfersize|max_plans_per_query|max_storage_size_mb|mediadescription|medianame|mediapassword|memogroup|memory_optimized|merge|message|message_forward_size|message_forwarding|microsecond|millisecond|minute(s)?|mirror_address|misses_cursors|misses_exec_context|mixed|modify|money|month|move|multi_user|must_change|name|namespace|nanosecond|native|native_compilation|nchar|ncharacter|nested_triggers|never|new_account|new_broker|newname|next|no|no_browsetable|no_checksum|no_compression|no_infomsgs|no_triggers|no_truncate|nocount|noexec|noexpand|noformat|noinit|nolock|nonatomic|nonclustered|nondurable|none|norecompute|norecovery|noreset|norewind|noskip|not|notification|nounload|now|nowait|ntext|ntlm|nulls|numeric|numeric_roundabort|nvarchar|object|objid|oem|offline|old_account|online|operation_mode|open|openjson|optimistic|option|orc|out|outer|output|over|override|owner|ownership|pad_index|page|page_checksum|page_verify|pagecount|paglock|param|parameter_sniffing|parameter_type_expansion|parameterization|parquet|parseonly|partial|partition|partner|password|path|pause|percentage|permission_set|persisted|period|physical_only|plan_forcing_mode|policy|pool|population|ports|preceding|precision|predicate|presume_abort|primary|primary_role|print|prior|priority |priority_level|private|proc(edure)?|procedure_name|profile|provider|quarter|query_capture_mode|query_governor_cost_limit|query_optimizer_hotfixes|query_store|queue|quoted_identifier|raiserror|range|raw|rcfile|rc2|rc4|rc4_128|rdbms|read_committed_snapshot|read|read_only|read_write|readcommitted|readcommittedlock|readonly|readpast|readuncommitted|readwrite|real|rebuild|receive|recmodel_70backcomp|recompile|reconfigure|recovery|recursive|recursive_triggers|redo_queue|reject_sample_value|reject_type|reject_value|relative|remote|remote_data_archive|remote_proc_transactions|remote_service_name|remove|removed_cursors|removed_exec_context|reorganize|repeat|repeatable|repeatableread|replace|replica|replicated|replnick_100_to_80|replnickarray_80_to_100|replnickarray_100_to_80|required|required_cursopt|resample|reset|resource|resource_manager_location|respect|restart|restore|restricted_user|resume|retaindays|retention|return|revert|rewind|rewindonly|returns|robust|role|rollup|root|round_robin|route|row|rowdump|rowguidcol|rowlock|row_terminator|rows|rows_per_batch|rowsets_only|rowterminator|rowversion|rsa_1024|rsa_2048|rsa_3072|rsa_4096|rsa_512|safe|safety|sample|save|scalar|schema|schemabinding|scoped|scroll|scroll_locks|sddl|second|secexpr|seconds|secondary|secondary_only|secondary_role|secret|security|securityaudit|selective|self|send|sent|sequence|serde_method|serializable|server|service|service_broker|service_name|service_objective|session_timeout|session|sessions|seterror|setopts|sets|shard_map_manager|shard_map_name|sharded|shared_memory|shortest_path|show_statistics|showplan_all|showplan_text|showplan_xml|showplan_xml_with_recompile|shrinkdb|shutdown|sid|signature|simple|single_blob|single_clob|single_nclob|single_user|singleton|site|size|size_based_cleanup_mode|skip|smalldatetime|smallint|smallmoney|snapshot|snapshot_import|snapshotrestorephase|soap|softnuma|sort_in_tempdb|sorted_data|sorted_data_reorg|spatial|sql|sql_bigint|sql_binary|sql_bit|sql_char|sql_date|sql_decimal|sql_double|sql_float|sql_guid|sql_handle|sql_longvarbinary|sql_longvarchar|sql_numeric|sql_real|sql_smallint|sql_time|sql_timestamp|sql_tinyint|sql_tsi_day|sql_tsi_frac_second|sql_tsi_hour|sql_tsi_minute|sql_tsi_month|sql_tsi_quarter|sql_tsi_second|sql_tsi_week|sql_tsi_year|sql_type_date|sql_type_time|sql_type_timestamp|sql_varbinary|sql_varchar|sql_variant|sql_wchar|sql_wlongvarchar|ssl|ssl_port|standard|standby|start|start_date|started|stat_header|state|statement|static|statistics|statistics_incremental|statistics_norecompute|statistics_only|statman|stats|stats_stream|status|stop|stop_on_error|stopat|stopatmark|stopbeforemark|stoplist|stopped|string_delimiter|subject|supplemental_logging|supported|suspend|symmetric|synchronous_commit|synonym|sysname|system|system_time|system_versioning|table|tableresults|tablock|tablockx|take|tape|target|target_index|target_partition|target_recovery_time|tcp|temporal_history_retention|text|textimage_on|then|thesaurus|throw|time|timeout|timestamp|tinyint|to|top|torn_page_detection|track_columns_updated|trailing|tran|transaction|transfer|transform_noise_words|triple_des|triple_des_3key|truncate|trustworthy|try|tsql|two_digit_year_cutoff|type|type_desc|type_warning|tzoffset|uid|unbounded|uncommitted|unique|uniqueidentifier|unlimited|unload|unlock|unsafe|updlock|url|use|useplan|useroptions|use_type_default|using|utcdatetime|valid_xml|validation|value|values|varbinary|varchar|verbose|verifyonly|version|view_metadata|virtual_device|visiblity|wait_at_low_priority|waitfor|webmethod|week|weekday|weight|well_formed_xml|when|while|widechar|widechar_ansi|widenative|window|windows|with|within|within group|witness|without|without_array_wrapper|workload|wsdl|xact_abort|xlock|xml|xmlschema|xquery|xsinil|year|zone)\\b",
+			"match": "\\b(?i)(abort|abort_after_wait|absent|absolute|accent_sensitivity|acceptable_cursopt|acp|action|activation|add|address|admin|aes_128|aes_192|aes_256|affinity|after|aggregate|algorithm|all_constraints|all_errormsgs|all_indexes|all_levels|all_results|allow_connections|allow_dup_row|allow_encrypted_value_modifications|allow_page_locks|allow_row_locks|allow_snapshot_isolation|alter|altercolumn|always|anonymous|ansi_defaults|ansi_null_default|ansi_null_dflt_off|ansi_null_dflt_on|ansi_nulls|ansi_padding|ansi_warnings|appdomain|append|application|apply|arithabort|arithignore|array|assembly|asymmetric|asynchronous_commit|at|atan2|atomic|attach|attach_force_rebuild_log|attach_rebuild_log|audit|auth_realm|authentication|auto|auto_cleanup|auto_close|auto_create_statistics|auto_drop|auto_shrink|auto_update_statistics|auto_update_statistics_async|automated_backup_preference|automatic|autopilot|availability|availability_mode|backup|backup_priority|base64|basic|batches|batchsize|before|between|bigint|binary|binding|bit|block|blockers|blocksize|bmk|both|break|broker|broker_instance|bucket_count|buffer|buffercount|bulk_logged|by|call|caller|card|case|catalog|catch|cert|certificate|change_retention|change_tracking|change_tracking_context|changes|char|character|character_set|check_expiration|check_policy|checkconstraints|checkindex|checkpoint|checksum|cleanup_policy|clear|clear_port|close|clustered|codepage|collection|column_encryption_key|column_master_key|columnstore|columnstore_archive|colv_80_to_100|colv_100_to_80|commit_differential_base|committed|compatibility_level|compress_all_row_groups|compression|compression_delay|concat_null_yields_null|concatenate|configuration|connect|connection|containment|continue|continue_after_error|contract|contract_name|control|conversation|conversation_group_id|conversation_handle|copy|copy_only|count_rows|counter|create(\\\\s+or\\\\s+alter)?|credential|cross|cryptographic|cryptographic_provider|cube|cursor|cursor_close_on_commit|cursor_default|data|data_compression|data_flush_interval_seconds|data_mirroring|data_purity|data_source|database|database_name|database_snapshot|datafiletype|date_correlation_optimization|date|datefirst|dateformat|date_format|datetime|datetime2|datetimeoffset|day(s)?|db_chaining|dbid|dbidexec|dbo_only|deadlock_priority|deallocate|dec|decimal|declare|decrypt|decrypt_a|decryption|default_database|default_fulltext_language|default_language|default_logon_domain|default_schema|definition|delay|delayed_durability|delimitedtext|density_vector|dependent|des|description|desired_state|desx|differential|digest|disable|disable_broker|disable_def_cnst_chk|disabled|disk|distinct|distributed|distribution|drop|drop_existing|dts_buffers|dump|durability|dynamic|edition|elements|else|emergency|empty|enable|enable_broker|enabled|encoding|encrypted|encrypted_value|encryption|encryption_type|end|endpoint|endpoint_url|enhancedintegrity|entry|error_broker_conversations|errorfile|estimateonly|event|except|exec|executable|execute|exists|expand|expiredate|expiry_date|explicit|external|external_access|failover|failover_mode|failure_condition_level|fast|fast_forward|fastfirstrow|federated_service_account|fetch|field_terminator|fieldterminator|file|filelistonly|filegroup|filegrowth|filename|filestream|filestream_log|filestream_on|filetable|file_format|filter|first_row|fips_flagger|fire_triggers|first|firstrow|float|flush_interval_seconds|fmtonly|following|for|force|force_failover_allow_data_loss|force_service_allow_data_loss|forced|forceplan|formatfile|format_options|format_type|formsof|forward_only|free_cursors|free_exec_context|fullscan|fulltext|fulltextall|fulltextkey|function|generated|get|geography|geometry|global|go|goto|governor|guid|hadoop|hardening|hash|hashed|header_limit|headeronly|health_check_timeout|hidden|hierarchyid|histogram|histogram_steps|hits_cursors|hits_exec_context|hour(s)?|http|identity|identity_value|if|ifnull|ignore|ignore_constraints|ignore_dup_key|ignore_dup_row|ignore_triggers|image|immediate|implicit_transactions|include|include_null_values|incremental|index|inflectional|init|initiator|insensitive|insert|instead|int|integer|integrated|intersect|intermediate|interval_length_minutes|into|inuse_cursors|inuse_exec_context|io|is|isabout|iso_week|isolation|job_tracker_location|json|keep|keep_nulls|keep_replication|keepdefaults|keepfixed|keepidentity|keepnulls|kerberos|key|key_path|key_source|key_store_provider_name|keyset|kill|kilobytes_per_batch|labelonly|langid|language|last|lastrow|leading|legacy_cardinality_estimation|length|level|lifetime|lineage_80_to_100|lineage_100_to_80|listener_ip|listener_port|load|loadhistory|lob_compaction|local|local_service_name|locate|location|lock_escalation|lock_timeout|lockres|log|login|login_type|loop|manual|mark_in_use_for_removal|masked|master|match|matched|max_queue_readers|max_duration|max_outstanding_io_per_volume|maxdop|maxerrors|maxlength|maxtransfersize|max_plans_per_query|max_storage_size_mb|mediadescription|medianame|mediapassword|memogroup|memory_optimized|merge|message|message_forward_size|message_forwarding|microsecond|millisecond|minute(s)?|mirror_address|misses_cursors|misses_exec_context|mixed|modify|money|month|move|multi_user|must_change|name|namespace|nanosecond|native|native_compilation|nchar|ncharacter|nested_triggers|never|new_account|new_broker|newname|next|no|no_browsetable|no_checksum|no_compression|no_infomsgs|no_triggers|no_truncate|nocount|noexec|noexpand|noformat|noinit|nolock|nonatomic|nonclustered|nondurable|none|norecompute|norecovery|noreset|norewind|noskip|not|notification|nounload|now|nowait|ntext|ntlm|nulls|numeric|numeric_roundabort|nvarchar|object|objid|oem|offline|old_account|online|operation_mode|open|openjson|optimistic|option|orc|out|outer|output|over|override|owner|ownership|pad_index|page|page_checksum|page_verify|pagecount|paglock|param|parameter_sniffing|parameter_type_expansion|parameterization|parquet|parseonly|partial|partition|partner|password|path|pause|percentage|permission_set|persisted|period|physical_only|plan_forcing_mode|policy|pool|population|ports|preceding|precision|predicate|presume_abort|primary|primary_role|print|prior|priority |priority_level|private|proc(edure)?|procedure_name|profile|provider|quarter|query_capture_mode|query_governor_cost_limit|query_optimizer_hotfixes|query_store|queue|quoted_identifier|raiserror|range|raw|rcfile|rc2|rc4|rc4_128|rdbms|read_committed_snapshot|read|read_only|read_write|readcommitted|readcommittedlock|readonly|readpast|readuncommitted|readwrite|real|rebuild|receive|recmodel_70backcomp|recompile|reconfigure|recovery|recursive|recursive_triggers|redo_queue|reject_sample_value|reject_type|reject_value|relative|remote|remote_data_archive|remote_proc_transactions|remote_service_name|remove|removed_cursors|removed_exec_context|reorganize|repeat|repeatable|repeatableread|replace|replica|replicated|replnick_100_to_80|replnickarray_80_to_100|replnickarray_100_to_80|required|required_cursopt|resample|reset|resource|resource_manager_location|respect|restart|restore|restricted_user|resume|retaindays|retention|return|revert|rewind|rewindonly|returns|robust|role|rollup|root|round_robin|route|row|rowdump|rowguidcol|rowlock|row_terminator|rows|rows_per_batch|rowsets_only|rowterminator|rowversion|rsa_1024|rsa_2048|rsa_3072|rsa_4096|rsa_512|safe|safety|sample|save|scalar|schema|schemabinding|scoped|scroll|scroll_locks|sddl|second|secexpr|seconds|secondary|secondary_only|secondary_role|secret|security|securityaudit|selective|self|send|sent|sequence|serde_method|serializable|server|service|service_broker|service_name|service_objective|session_timeout|session|sessions|seterror|setopts|sets|shard_map_manager|shard_map_name|sharded|shared_memory|shortest_path|show_statistics|showplan_all|showplan_text|showplan_xml|showplan_xml_with_recompile|shrinkdb|shutdown|sid|signature|simple|single_blob|single_clob|single_nclob|single_user|singleton|site|size|size_based_cleanup_mode|skip|smalldatetime|smallint|smallmoney|snapshot|snapshot_import|snapshotrestorephase|soap|softnuma|sort_in_tempdb|sorted_data|sorted_data_reorg|spatial|sql|sql_bigint|sql_binary|sql_bit|sql_char|sql_date|sql_decimal|sql_double|sql_float|sql_guid|sql_handle|sql_longvarbinary|sql_longvarchar|sql_numeric|sql_real|sql_smallint|sql_time|sql_timestamp|sql_tinyint|sql_tsi_day|sql_tsi_frac_second|sql_tsi_hour|sql_tsi_minute|sql_tsi_month|sql_tsi_quarter|sql_tsi_second|sql_tsi_week|sql_tsi_year|sql_type_date|sql_type_time|sql_type_timestamp|sql_varbinary|sql_varchar|sql_variant|sql_wchar|sql_wlongvarchar|ssl|ssl_port|standard|standby|start|start_date|started|stat_header|state|statement|static|statistics|statistics_incremental|statistics_norecompute|statistics_only|statman|stats|stats_stream|status|stop|stop_on_error|stopat|stopatmark|stopbeforemark|stoplist|stopped|string_delimiter|subject|supplemental_logging|supported|suspend|symmetric|synchronous_commit|synonym|sysname|system|system_time|system_versioning|table|tableresults|tablock|tablockx|take|tape|target|target_index|target_partition|target_recovery_time|tcp|temporal_history_retention|text|textimage_on|then|thesaurus|throw|time|timeout|timestamp|tinyint|to|top|torn_page_detection|track_columns_updated|trailing|tran|transaction|transfer|transform_noise_words|triple_des|triple_des_3key|truncate|trustworthy|try|tsql|two_digit_year_cutoff|type|type_desc|type_warning|tzoffset|uid|unbounded|uncommitted|unique|uniqueidentifier|unlimited|unload|unlock|unsafe|updlock|url|use|useplan|useroptions|use_type_default|using|utcdatetime|valid_xml|validation|value|values|varbinary|varchar|vector|verbose|verifyonly|version|view_metadata|virtual_device|visiblity|wait_at_low_priority|waitfor|webmethod|week|weekday|weight|well_formed_xml|when|while|widechar|widechar_ansi|widenative|window|windows|with|within|within group|witness|without|without_array_wrapper|workload|wsdl|xact_abort|xlock|xml|xmlschema|xquery|xsinil|year|zone)\\b",
 			"name": "keyword.other.sql"
 		},
 		{
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 6230a5f14b3b..032617573e41 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "module",
-		"t": "source.ruby keyword.control.ruby",
+		"t": "source.ruby meta.module.ruby keyword.control.module.ruby",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ruby",
+		"t": "source.ruby meta.module.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -140,50 +140,22 @@
 		}
 	},
 	{
-		"c": "Azure",
-		"t": "source.ruby support.class.ruby",
-		"r": {
-			"dark_plus": "support.class: #4EC9B0",
-			"light_plus": "support.class: #267F99",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "support.class: #4EC9B0",
-			"dark_modern": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
-		}
-	},
-	{
-		"c": "::",
-		"t": "source.ruby punctuation.separator.namespace.ruby",
-		"r": {
-			"dark_plus": "punctuation.separator.namespace.ruby: #4EC9B0",
-			"light_plus": "punctuation.separator.namespace.ruby: #267F99",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "punctuation.separator.namespace.ruby: #4EC9B0",
-			"dark_modern": "punctuation.separator.namespace.ruby: #4EC9B0",
-			"hc_light": "punctuation.separator.namespace.ruby: #185E73",
-			"light_modern": "punctuation.separator.namespace.ruby: #267F99"
-		}
-	},
-	{
-		"c": "ARM",
-		"t": "source.ruby support.class.ruby",
+		"c": "Azure::ARM",
+		"t": "source.ruby meta.module.ruby entity.name.type.module.ruby",
 		"r": {
-			"dark_plus": "support.class: #4EC9B0",
-			"light_plus": "support.class: #267F99",
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "support.class: #4EC9B0",
-			"dark_modern": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
 		}
 	},
 	{
 		"c": "::",
-		"t": "source.ruby punctuation.separator.namespace.ruby",
+		"t": "source.ruby meta.module.ruby entity.name.type.module.ruby punctuation.separator.namespace.ruby",
 		"r": {
 			"dark_plus": "punctuation.separator.namespace.ruby: #4EC9B0",
 			"light_plus": "punctuation.separator.namespace.ruby: #267F99",
@@ -197,16 +169,16 @@
 	},
 	{
 		"c": "Scheduler",
-		"t": "source.ruby variable.other.constant.ruby",
+		"t": "source.ruby meta.module.ruby entity.name.type.module.ruby",
 		"r": {
-			"dark_plus": "variable.other.constant: #4FC1FF",
-			"light_plus": "variable.other.constant: #0070C1",
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE",
-			"dark_modern": "variable.other.constant: #4FC1FF",
-			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
 		}
 	},
 	{
@@ -323,7 +295,7 @@
 	},
 	{
 		"c": "class",
-		"t": "source.ruby keyword.control.ruby",
+		"t": "source.ruby meta.class.ruby keyword.control.class.ruby",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -337,7 +309,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ruby",
+		"t": "source.ruby meta.class.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -351,21 +323,21 @@
 	},
 	{
 		"c": "SchedulerManagementClient",
-		"t": "source.ruby variable.other.constant.ruby",
+		"t": "source.ruby meta.class.ruby entity.name.type.class.ruby",
 		"r": {
-			"dark_plus": "variable.other.constant: #4FC1FF",
-			"light_plus": "variable.other.constant: #0070C1",
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE",
-			"dark_modern": "variable.other.constant: #4FC1FF",
-			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.ruby",
+		"t": "source.ruby meta.class.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -379,21 +351,21 @@
 	},
 	{
 		"c": "<",
-		"t": "source.ruby keyword.operator.comparison.ruby",
+		"t": "source.ruby meta.class.ruby punctuation.separator.inheritance.ruby",
 		"r": {
-			"dark_plus": "keyword.operator: #D4D4D4",
-			"light_plus": "keyword.operator: #000000",
-			"dark_vs": "keyword.operator: #D4D4D4",
-			"light_vs": "keyword.operator: #000000",
-			"hc_black": "keyword.operator: #D4D4D4",
-			"dark_modern": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.ruby",
+		"t": "source.ruby meta.class.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -407,21 +379,21 @@
 	},
 	{
 		"c": "MsRestAzure",
-		"t": "source.ruby support.class.ruby",
+		"t": "source.ruby meta.class.ruby entity.other.inherited-class.ruby",
 		"r": {
-			"dark_plus": "support.class: #4EC9B0",
-			"light_plus": "support.class: #267F99",
+			"dark_plus": "entity.other.inherited-class: #4EC9B0",
+			"light_plus": "entity.other.inherited-class: #267F99",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "support.class: #4EC9B0",
-			"dark_modern": "support.class: #4EC9B0",
-			"hc_light": "support.class: #185E73",
-			"light_modern": "support.class: #267F99"
+			"hc_black": "entity.other.inherited-class: #4EC9B0",
+			"dark_modern": "entity.other.inherited-class: #4EC9B0",
+			"hc_light": "entity.other.inherited-class: #185E73",
+			"light_modern": "entity.other.inherited-class: #267F99"
 		}
 	},
 	{
 		"c": "::",
-		"t": "source.ruby punctuation.separator.namespace.ruby",
+		"t": "source.ruby meta.class.ruby entity.other.inherited-class.ruby punctuation.separator.namespace.ruby",
 		"r": {
 			"dark_plus": "punctuation.separator.namespace.ruby: #4EC9B0",
 			"light_plus": "punctuation.separator.namespace.ruby: #267F99",
@@ -435,16 +407,16 @@
 	},
 	{
 		"c": "AzureServiceClient",
-		"t": "source.ruby variable.other.constant.ruby",
+		"t": "source.ruby meta.class.ruby entity.other.inherited-class.ruby",
 		"r": {
-			"dark_plus": "variable.other.constant: #4FC1FF",
-			"light_plus": "variable.other.constant: #0070C1",
+			"dark_plus": "entity.other.inherited-class: #4EC9B0",
+			"light_plus": "entity.other.inherited-class: #267F99",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE",
-			"dark_modern": "variable.other.constant: #4FC1FF",
-			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"hc_black": "entity.other.inherited-class: #4EC9B0",
+			"dark_modern": "entity.other.inherited-class: #4EC9B0",
+			"hc_light": "entity.other.inherited-class: #185E73",
+			"light_modern": "entity.other.inherited-class: #267F99"
 		}
 	},
 	{
@@ -3318,7 +3290,35 @@
 		}
 	},
 	{
-		"c": " = ",
+		"c": " ",
+		"t": "source.ruby",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ruby keyword.operator.assignment.ruby",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -3472,7 +3472,35 @@
 		}
 	},
 	{
-		"c": " = ",
+		"c": " ",
+		"t": "source.ruby",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ruby keyword.operator.assignment.ruby",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -3584,7 +3612,35 @@
 		}
 	},
 	{
-		"c": " = version",
+		"c": " ",
+		"t": "source.ruby",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ruby keyword.operator.assignment.ruby",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " version",
 		"t": "source.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",

From 559a51e69f02329cbcdef2707688f018af4644da Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Fri, 28 Feb 2025 13:41:42 +0100
Subject: [PATCH 0529/1815] problematic extensions: disable them and uninstall
 in all profiles (#242297)

* simpler fix

* fix tests

* update message

* get back action to reload
---
 .../abstractExtensionManagementService.ts     | 33 +++++++-
 .../extensions/browser/extensionsViewlet.ts   | 80 +++++++++++--------
 .../browser/extensionsWorkbenchService.ts     | 44 +++++-----
 .../contrib/extensions/common/extensions.ts   |  2 +-
 .../browser/extensionEnablementService.ts     | 24 +++---
 .../extensionEnablementService.test.ts        | 13 ++-
 6 files changed, 127 insertions(+), 69 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
index 73fbccd8f518..dba7975aad5a 100644
--- a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
@@ -731,6 +731,13 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 		const alreadyRequestedUninstalls: Promise<any>[] = [];
 
 		const installedExtensionsMap = new ResourceMap<ILocalExtension[]>();
+		const getInstalledExtensions = async (profileLocation: URI) => {
+			let installed = installedExtensionsMap.get(profileLocation);
+			if (!installed) {
+				installedExtensionsMap.set(profileLocation, installed = await this.getInstalled(ExtensionType.User, profileLocation));
+			}
+			return installed;
+		};
 
 		for (const { extension, options } of extensions) {
 			const uninstallOptions: UninstallExtensionTaskOptions = {
@@ -744,14 +751,32 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 			} else {
 				allTasks.push(createUninstallExtensionTask(extension, uninstallOptions));
 			}
+
+			if (uninstallOptions.remove) {
+				// Remove from all profiles
+				for (const profile of this.userDataProfilesService.profiles) {
+					if (this.uriIdentityService.extUri.isEqual(profile.extensionsResource, uninstallOptions.profileLocation)) {
+						continue;
+					}
+					const installed = await getInstalledExtensions(profile.extensionsResource);
+					const profileExtension = installed.find(e => areSameExtensions(e.identifier, extension.identifier));
+					if (profileExtension) {
+						const uninstallOptionsWithProfile = { ...uninstallOptions, profileLocation: profile.extensionsResource };
+						const uninstallExtensionTask = this.uninstallingExtensions.get(getUninstallExtensionTaskKey(profileExtension, uninstallOptionsWithProfile));
+						if (uninstallExtensionTask) {
+							this.logService.info('Extensions is already requested to uninstall', profileExtension.identifier.id);
+							alreadyRequestedUninstalls.push(uninstallExtensionTask.waitUntilTaskIsFinished());
+						} else {
+							allTasks.push(createUninstallExtensionTask(profileExtension, uninstallOptionsWithProfile));
+						}
+					}
+				}
+			}
 		}
 
 		try {
 			for (const task of allTasks.slice(0)) {
-				let installed = installedExtensionsMap.get(task.options.profileLocation);
-				if (!installed) {
-					installedExtensionsMap.set(task.options.profileLocation, installed = await this.getInstalled(ExtensionType.User, task.options.profileLocation));
-				}
+				const installed = await getInstalledExtensions(task.options.profileLocation);
 
 				if (task.options.donotIncludePack) {
 					this.logService.info('Uninstalling the extension without including packed extension', `${task.extension.identifier.id}@${task.extension.manifest.version}`);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
index ee75bba1ed6f..c81219c33846 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
@@ -5,7 +5,7 @@
 
 import './media/extensionsViewlet.css';
 import { localize, localize2 } from '../../../../nls.js';
-import { timeout, Delayer, Promises } from '../../../../base/common/async.js';
+import { timeout, Delayer } from '../../../../base/common/async.js';
 import { isCancellationError } from '../../../../base/common/errors.js';
 import { createErrorWithActions } from '../../../../base/common/errorMessage.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
@@ -16,10 +16,10 @@ import { append, $, Dimension, hide, show, DragAndDropObserver, trackFocus, addD
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { IExtensionsWorkbenchService, IExtensionsViewPaneContainer, VIEWLET_ID, CloseExtensionDetailsOnViewChangeKey, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, AutoCheckUpdatesConfigurationKey, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu, AutoRestartConfigurationKey } from '../common/extensions.js';
+import { IExtensionsWorkbenchService, IExtensionsViewPaneContainer, VIEWLET_ID, CloseExtensionDetailsOnViewChangeKey, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, AutoCheckUpdatesConfigurationKey, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu, AutoRestartConfigurationKey, IExtension } from '../common/extensions.js';
 import { InstallLocalExtensionsInRemoteAction, InstallRemoteExtensionsInLocalAction } from './extensionsActions.js';
-import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
-import { IWorkbenchExtensionEnablementService, IExtensionManagementServerService, IExtensionManagementServer } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { IExtensionManagementService, UninstallExtensionInfo } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IWorkbenchExtensionEnablementService, IExtensionManagementServerService, IExtensionManagementServer, EnablementState } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { ExtensionsInput } from '../common/extensionsInput.js';
 import { ExtensionsListView, EnabledExtensionsView, DisabledExtensionsView, RecommendedExtensionsView, WorkspaceRecommendedExtensionsView, ServerInstalledExtensionsView, DefaultRecommendedExtensionsView, UntrustedWorkspaceUnsupportedExtensionsView, UntrustedWorkspacePartiallySupportedExtensionsView, VirtualWorkspaceUnsupportedExtensionsView, VirtualWorkspacePartiallySupportedExtensionsView, DefaultPopularExtensionsView, DeprecatedExtensionsView, SearchMarketplaceExtensionsView, RecentlyUpdatedExtensionsView, OutdatedExtensionsView, StaticQueryExtensionsView, NONE_CATEGORY } from './extensionsViews.js';
 import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
@@ -35,14 +35,13 @@ import { IContextKeyService, ContextKeyExpr, RawContextKey, IContextKey } from '
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { INotificationService, NotificationPriority } from '../../../../platform/notification/common/notification.js';
-import { IHostService } from '../../../services/host/browser/host.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
 import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
 import { ViewPane } from '../../../browser/parts/views/viewPane.js';
 import { Query } from '../common/extensionQuery.js';
 import { SuggestEnabledInput } from '../../codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
-import { EXTENSION_CATEGORIES, ExtensionType } from '../../../../platform/extensions/common/extensions.js';
+import { EXTENSION_CATEGORIES } from '../../../../platform/extensions/common/extensions.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { MementoObject } from '../../../common/memento.js';
@@ -59,7 +58,6 @@ import { IPaneCompositePartService } from '../../../services/panecomposite/brows
 import { coalesce } from '../../../../base/common/arrays.js';
 import { extractEditorsAndFilesDropData } from '../../../../platform/dnd/browser/dnd.js';
 import { extname } from '../../../../base/common/resources.js';
-import { isMalicious } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { ILocalizedString } from '../../../../platform/action/common/action.js';
 import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
 import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
@@ -69,6 +67,7 @@ import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { Codicon } from '../../../../base/common/codicons.js';
+import { IHostService } from '../../../services/host/browser/host.js';
 
 export const DefaultViewsContext = new RawContextKey<boolean>('defaultExtensionViews', true);
 export const ExtensionsSortByContext = new RawContextKey<string>('extensionsSortByValue', '');
@@ -973,6 +972,7 @@ export class MaliciousExtensionChecker implements IWorkbenchContribution {
 	constructor(
 		@IExtensionManagementService private readonly extensionsManagementService: IExtensionManagementService,
 		@IHostService private readonly hostService: IHostService,
+		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@ILogService private readonly logService: ILogService,
 		@INotificationService private readonly notificationService: INotificationService,
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService
@@ -988,31 +988,47 @@ export class MaliciousExtensionChecker implements IWorkbenchContribution {
 			.then(() => this.loopCheckForMaliciousExtensions());
 	}
 
-	private checkForMaliciousExtensions(): Promise<void> {
-		return this.extensionsManagementService.getExtensionsControlManifest().then(extensionsControlManifest => {
-
-			return this.extensionsManagementService.getInstalled(ExtensionType.User).then(installed => {
-				const maliciousExtensions = installed.filter(e => isMalicious(e.identifier, extensionsControlManifest));
-
-				if (maliciousExtensions.length) {
-					return Promises.settled(maliciousExtensions.map(e => this.extensionsManagementService.uninstall(e).then(() => {
-						this.notificationService.prompt(
-							Severity.Warning,
-							localize('malicious warning', "We have uninstalled '{0}' which was reported to be problematic.", e.identifier.id),
-							[{
-								label: localize('reloadNow', "Reload Now"),
-								run: () => this.hostService.reload()
-							}],
-							{
-								sticky: true,
-								priority: NotificationPriority.URGENT
-							}
-						);
-					})));
-				} else {
-					return Promise.resolve(undefined);
+	private async checkForMaliciousExtensions(): Promise<void> {
+		try {
+			const extensionsToUninstall: UninstallExtensionInfo[] = [];
+			const maliciousExtensions: IExtension[] = [];
+
+			await this.extensionsWorkbenchService.queryLocal();
+
+			for (const e of this.extensionsWorkbenchService.installed) {
+				if (e.local && e.isMalicious) {
+					maliciousExtensions.push(e);
+					extensionsToUninstall.push({
+						extension: e.local,
+						options: {
+							donotCheckDependents: true,
+							remove: true,
+						}
+					});
 				}
-			}).then(() => undefined);
-		}, err => this.logService.error(err));
+			}
+
+			if (!maliciousExtensions.length) {
+				return;
+			}
+
+			await this.extensionsWorkbenchService.setEnablement(maliciousExtensions, EnablementState.DisabledGlobally, true);
+			await this.extensionsManagementService.uninstallExtensions(extensionsToUninstall);
+
+			this.notificationService.prompt(
+				Severity.Warning,
+				localize('malicious warning', "The following extensions were found to be problematic and have been uninstalled: {0}", maliciousExtensions.map(e => e.identifier.id).join(', ')),
+				[{
+					label: localize('reloadNow', "Reload Now"),
+					run: () => this.hostService.reload()
+				}],
+				{
+					sticky: true,
+					priority: NotificationPriority.URGENT
+				}
+			);
+		} catch (err) {
+			this.logService.error(err);
+		}
 	}
 }
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index 74f8e88fb618..c578e5e4eed7 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -2526,9 +2526,9 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		return this.localeService.setLocale({ id: locale, galleryExtension: extension.gallery, extensionId: extension.identifier.id, label: localizedLanguageName ?? extension.displayName });
 	}
 
-	setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState): Promise<void> {
+	setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState, force: boolean = false): Promise<void> {
 		extensions = Array.isArray(extensions) ? extensions : [extensions];
-		return this.promptAndSetEnablement(extensions, enablementState);
+		return this.promptAndSetEnablement(extensions, enablementState, force);
 	}
 
 	async uninstall(e: IExtension): Promise<void> {
@@ -2786,43 +2786,45 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		});
 	}
 
-	private promptAndSetEnablement(extensions: IExtension[], enablementState: EnablementState): Promise<any> {
+	private promptAndSetEnablement(extensions: IExtension[], enablementState: EnablementState, force: boolean): Promise<any> {
 		const enable = enablementState === EnablementState.EnabledGlobally || enablementState === EnablementState.EnabledWorkspace;
 		if (enable) {
 			const allDependenciesAndPackedExtensions = this.getExtensionsRecursively(extensions, this.local, enablementState, { dependencies: true, pack: true });
-			return this.checkAndSetEnablement(extensions, allDependenciesAndPackedExtensions, enablementState);
+			return this.checkAndSetEnablement(extensions, allDependenciesAndPackedExtensions, enablementState, force);
 		} else {
 			const packedExtensions = this.getExtensionsRecursively(extensions, this.local, enablementState, { dependencies: false, pack: true });
 			if (packedExtensions.length) {
-				return this.checkAndSetEnablement(extensions, packedExtensions, enablementState);
+				return this.checkAndSetEnablement(extensions, packedExtensions, enablementState, force);
 			}
-			return this.checkAndSetEnablement(extensions, [], enablementState);
+			return this.checkAndSetEnablement(extensions, [], enablementState, force);
 		}
 	}
 
-	private async checkAndSetEnablement(extensions: IExtension[], otherExtensions: IExtension[], enablementState: EnablementState): Promise<any> {
+	private async checkAndSetEnablement(extensions: IExtension[], otherExtensions: IExtension[], enablementState: EnablementState, force: boolean): Promise<any> {
 		const allExtensions = [...extensions, ...otherExtensions];
 		const enable = enablementState === EnablementState.EnabledGlobally || enablementState === EnablementState.EnabledWorkspace;
 		if (!enable) {
 			for (const extension of extensions) {
 				const dependents = this.getDependentsAfterDisablement(extension, allExtensions, this.local);
 				if (dependents.length) {
-					const { result } = await this.dialogService.prompt({
-						title: nls.localize('disableDependents', "Disable Extension with Dependents"),
-						type: Severity.Warning,
-						message: this.getDependentsErrorMessageForDisablement(extension, allExtensions, dependents),
-						buttons: [{
-							label: nls.localize('disable all', 'Disable All'),
-							run: () => true
-						}],
-						cancelButton: {
-							run: () => false
+					if (!force) {
+						const { result } = await this.dialogService.prompt({
+							title: nls.localize('disableDependents', "Disable Extension with Dependents"),
+							type: Severity.Warning,
+							message: this.getDependentsErrorMessageForDisablement(extension, allExtensions, dependents),
+							buttons: [{
+								label: nls.localize('disable all', 'Disable All'),
+								run: () => true
+							}],
+							cancelButton: {
+								run: () => false
+							}
+						});
+						if (!result) {
+							throw new CancellationError();
 						}
-					});
-					if (!result) {
-						throw new CancellationError();
 					}
-					await this.checkAndSetEnablement(dependents, [extension], enablementState);
+					await this.checkAndSetEnablement(dependents, [extension], enablementState, force);
 				}
 			}
 		}
diff --git a/src/vs/workbench/contrib/extensions/common/extensions.ts b/src/vs/workbench/contrib/extensions/common/extensions.ts
index 97e8d4b6d153..a43a65693111 100644
--- a/src/vs/workbench/contrib/extensions/common/extensions.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensions.ts
@@ -147,7 +147,7 @@ export interface IExtensionsWorkbenchService {
 	togglePreRelease(extension: IExtension): Promise<void>;
 	canSetLanguage(extension: IExtension): boolean;
 	setLanguage(extension: IExtension): Promise<void>;
-	setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState): Promise<void>;
+	setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState, force?: boolean): Promise<void>;
 	isAutoUpdateEnabledFor(extensionOrPublisher: IExtension | string): boolean;
 	updateAutoUpdateEnablementFor(extensionOrPublisher: IExtension | string, enable: boolean): Promise<void>;
 	shouldRequireConsentToUpdate(extension: IExtension): Promise<string | undefined>;
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
index 2ad63cc370b8..e49be121a4e9 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
@@ -8,7 +8,7 @@ import { Event, Emitter } from '../../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { IExtensionManagementService, IExtensionIdentifier, IGlobalExtensionEnablementService, ENABLED_EXTENSIONS_STORAGE_PATH, DISABLED_EXTENSIONS_STORAGE_PATH, InstallOperation, IAllowedExtensionsService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IWorkbenchExtensionManagementService, IExtensionManagementServer, ExtensionInstallLocation } from '../common/extensionManagement.js';
-import { areSameExtensions, BetterMergeId, getExtensionDependencies } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { areSameExtensions, BetterMergeId, getExtensionDependencies, isMalicious } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
 import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
 import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
@@ -49,7 +49,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		@IGlobalExtensionEnablementService protected readonly globalExtensionEnablementService: IGlobalExtensionEnablementService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
-		@IExtensionManagementService extensionManagementService: IExtensionManagementService,
+		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
 		@IUserDataSyncEnablementService private readonly userDataSyncEnablementService: IUserDataSyncEnablementService,
@@ -67,7 +67,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		super();
 		this.storageManager = this._register(new StorageManager(storageService));
 
-		const uninstallDisposable = this._register(Event.filter(extensionManagementService.onDidUninstallExtension, e => !e.error)(({ identifier }) => this._reset(identifier)));
+		const uninstallDisposable = this._register(Event.filter(extensionManagementService.onDidUninstallExtension, e => !e.error)(({ identifier }) => this._reset([identifier])));
 		let isDisposed = false;
 		this._register(toDisposable(() => isDisposed = true));
 		this.extensionsManager = this._register(instantiationService.createInstance(ExtensionsManager));
@@ -662,8 +662,8 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		if (changedExtensions.length) {
 			this._onEnablementChanged.fire(changedExtensions);
 		}
-		if (!isProfileSwitch) {
-			removed.forEach(({ identifier }) => this._reset(identifier));
+		if (!isProfileSwitch && removed.length) {
+			this._reset(removed.map(({ identifier }) => identifier));
 		}
 	}
 
@@ -689,10 +689,16 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		return { trusted: this.workspaceTrustManagementService.isWorkspaceTrusted(), virtual: isVirtualWorkspace(this.contextService.getWorkspace()) };
 	}
 
-	private _reset(extension: IExtensionIdentifier) {
-		this._removeFromWorkspaceDisabledExtensions(extension);
-		this._removeFromWorkspaceEnabledExtensions(extension);
-		this.globalExtensionEnablementService.enableExtension(extension);
+	private async _reset(extensions: IExtensionIdentifier[]): Promise<void> {
+		const controlManifest = await this.extensionManagementService.getExtensionsControlManifest();
+		for (const extension of extensions) {
+			if (isMalicious(extension, controlManifest)) {
+				continue;
+			}
+			this._removeFromWorkspaceDisabledExtensions(extension);
+			this._removeFromWorkspaceEnabledExtensions(extension);
+			this.globalExtensionEnablementService.enableExtension(extension);
+		}
 	}
 }
 
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 f7c0ff78feb9..9d84a26fb0ac 100644
--- a/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
+++ b/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { IExtensionManagementService, DidUninstallExtensionEvent, ILocalExtension, InstallExtensionEvent, InstallExtensionResult, UninstallExtensionEvent, DidUpdateExtensionMetadata, InstallOperation, IAllowedExtensionsService, AllowedExtensionsConfigKey } from '../../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IExtensionManagementService, DidUninstallExtensionEvent, ILocalExtension, InstallExtensionEvent, InstallExtensionResult, UninstallExtensionEvent, DidUpdateExtensionMetadata, InstallOperation, IAllowedExtensionsService, AllowedExtensionsConfigKey, IExtensionsControlManifest } from '../../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, ExtensionInstallLocation, IProfileAwareExtensionManagementService, DidChangeProfileEvent } from '../../common/extensionManagement.js';
 import { ExtensionEnablementService } from '../../browser/extensionEnablementService.js';
 import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
@@ -73,6 +73,9 @@ export class TestExtensionEnablementService extends ExtensionEnablementService {
 					onDidChangeProfile: disposables.add(new Emitter<DidChangeProfileEvent>()).event,
 					onDidUpdateExtensionMetadata: disposables.add(new Emitter<DidUpdateExtensionMetadata>()).event,
 					onProfileAwareDidInstallExtensions: Event.None,
+					async getExtensionsControlManifest(): Promise<IExtensionsControlManifest> {
+						return { malicious: [], deprecated: {}, search: [] };
+					},
 				},
 			}, null, null));
 		const extensionManagementService = disposables.add(instantiationService.createInstance(ExtensionManagementService));
@@ -149,7 +152,10 @@ suite('ExtensionEnablementService Test', () => {
 				onDidUninstallExtension: didUninstallEvent.event,
 				onDidChangeProfile: didChangeProfileExtensionsEvent.event,
 				onProfileAwareDidInstallExtensions: Event.None,
-				getInstalled: () => Promise.resolve(installed)
+				getInstalled: () => Promise.resolve(installed),
+				async getExtensionsControlManifest(): Promise<IExtensionsControlManifest> {
+					return { malicious: [], deprecated: {}, search: [] };
+				},
 			},
 		}, null, null));
 		instantiationService.stub(ILogService, NullLogService);
@@ -462,8 +468,11 @@ suite('ExtensionEnablementService Test', () => {
 
 		await testObject.setEnablement([extension], EnablementState.DisabledWorkspace);
 		await testObject.setEnablement([extension], EnablementState.DisabledGlobally);
+		const promise = Event.toPromise(testObject.onEnablementChanged);
+
 		didUninstallEvent.fire({ identifier: { id: 'pub.a' }, profileLocation: null! });
 
+		await promise;
 		assert.ok(testObject.isEnabled(extension));
 		assert.strictEqual(testObject.getEnablementState(extension), EnablementState.EnabledGlobally);
 	});

From 7625487ec23dc4e0673df886b8a78454a0bfe142 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 28 Feb 2025 13:54:30 +0100
Subject: [PATCH 0530/1815] Improve documentation for text document encoding
 methods (#242299)

---
 .../vscode.proposed.textDocumentEncoding.d.ts       | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts b/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts
index 329899feb9d7..6886cb1cbfe6 100644
--- a/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts
+++ b/src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts
@@ -69,7 +69,7 @@ declare module 'vscode' {
 			 *
 			 * *Note* that if you open a document with an encoding that does not
 			 * support decoding the underlying bytes, content may be replaced with
-			 * substitution characters appropriate for the character encoding.
+			 * substitution characters as appropriate.
 			 */
 			encoding?: string;
 		}): Thenable<TextDocument>;
@@ -99,7 +99,7 @@ declare module 'vscode' {
 			 *
 			 * *Note* that if you open a document with an encoding that does not
 			 * support decoding the underlying bytes, content may be replaced with
-			 * substitution characters appropriate for the character encoding.
+			 * substitution characters as appropriate.
 			 */
 			encoding?: string;
 		}): Thenable<TextDocument>;
@@ -128,15 +128,18 @@ declare module 'vscode' {
 		}): Thenable<TextDocument>;
 
 		/**
-		 * Decodes the content from a `Uint8Array` to a `string`.
+		 * Decodes the content from a `Uint8Array` to a `string`. You MUST
+		 * provide the entire content at once to ensure that the encoding
+		 * can properly apply. Do not use this method to decode content
+		 * in chunks, as that may lead to incorrect results.
 		 *
 		 * If no encoding is provided, will try to pick an encoding based
 		 * on user settings and the content of the buffer (for example
 		 * byte order marks).
 		 *
 		 * *Note* that if you decode content that is unsupported by the
-		 * encoding, the result may contain substitution characters appropriate
-		 * for the character encoding.
+		 * encoding, the result may contain substitution characters as
+		 * appropriate.
 		 *
 		 * @throws This method will throw an error when the content is binary.
 		 *

From 58083f8adfa8a5483d36a9c29115e4a804cb2869 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 28 Feb 2025 14:00:28 +0100
Subject: [PATCH 0531/1815] add a way to install resource filters in the marker
 service (#242283)

* code editor integration should set readonly-ness only when the editor shows its modified file and unset it otherwise

https://github.com/microsoft/vscode-copilot/issues/13578

* add a way to install resource filters in the marker service

https://github.com/microsoft/vscode-copilot/issues/13744

* fix compile errors
---
 .../platform/markers/common/markerService.ts  | 116 +++++++---
 src/vs/platform/markers/common/markers.ts     |   3 +
 .../markers/test/common/markerService.test.ts | 211 ++++++++++++++++++
 .../chatEditingCodeEditorIntegration.ts       |  12 +-
 .../test/common/workbenchTestServices.ts      |   3 +
 5 files changed, 305 insertions(+), 40 deletions(-)

diff --git a/src/vs/platform/markers/common/markerService.ts b/src/vs/platform/markers/common/markerService.ts
index 8e9968a94c92..c1be33ca9668 100644
--- a/src/vs/platform/markers/common/markerService.ts
+++ b/src/vs/platform/markers/common/markerService.ts
@@ -6,10 +6,11 @@
 import { isFalsyOrEmpty, isNonEmptyArray } from '../../../base/common/arrays.js';
 import { DebounceEmitter } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';
-import { IDisposable } from '../../../base/common/lifecycle.js';
-import { ResourceMap } from '../../../base/common/map.js';
+import { IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { ResourceMap, ResourceSet } from '../../../base/common/map.js';
 import { Schemas } from '../../../base/common/network.js';
 import { URI } from '../../../base/common/uri.js';
+import { localize } from '../../../nls.js';
 import { IMarker, IMarkerData, IMarkerService, IResourceMarker, MarkerSeverity, MarkerStatistics } from './markers.js';
 
 export const unsupportedSchemas = new Set([
@@ -158,6 +159,7 @@ export class MarkerService implements IMarkerService {
 
 	private readonly _data = new DoubleResourceMap<IMarker[]>();
 	private readonly _stats = new MarkerStats(this);
+	private readonly _filteredResources = new ResourceMap<string[]>();
 
 	dispose(): void {
 		this._stats.dispose();
@@ -197,6 +199,32 @@ export class MarkerService implements IMarkerService {
 		}
 	}
 
+	installResourceFilter(resource: URI, reason: string): IDisposable {
+		let reasons = this._filteredResources.get(resource);
+
+		if (!reasons) {
+			reasons = [];
+			this._filteredResources.set(resource, reasons);
+		}
+		reasons.push(reason);
+		this._onMarkerChanged.fire([resource]);
+
+		return toDisposable(() => {
+			const reasons = this._filteredResources.get(resource);
+			if (!reasons) {
+				return;
+			}
+			const reasonIndex = reasons.indexOf(reason);
+			if (reasonIndex !== -1) {
+				reasons.splice(reasonIndex, 1);
+				if (reasons.length === 0) {
+					this._filteredResources.delete(resource);
+				}
+				this._onMarkerChanged.fire([resource]);
+			}
+		});
+	}
+
 	private static _toMarker(owner: string, resource: URI, data: IMarkerData): IMarker | undefined {
 		let {
 			code, severity,
@@ -278,6 +306,28 @@ export class MarkerService implements IMarkerService {
 		}
 	}
 
+	/**
+	 * Creates an information marker for filtered resources
+	 */
+	private _createFilteredMarker(resource: URI, reasons: string[]): IMarker {
+		// Join all reasons with a comma or use the first reason if there's only one
+
+		const message = reasons.length > 1
+			? localize('filter.n', "{0} filters active", reasons.length)
+			: localize('filter.1', "Filtered: {0}", reasons[0]);
+
+		return {
+			owner: 'markersFilter',
+			resource,
+			severity: MarkerSeverity.Info,
+			message,
+			startLineNumber: 1,
+			startColumn: 1,
+			endLineNumber: 1,
+			endColumn: 1,
+		};
+	}
+
 	read(filter: { owner?: string; resource?: URI; severities?: number; take?: number } = Object.create(null)): IMarker[] {
 
 		let { owner, resource, severities, take } = filter;
@@ -288,48 +338,56 @@ export class MarkerService implements IMarkerService {
 
 		if (owner && resource) {
 			// exactly one owner AND resource
+			const reasons = this._filteredResources.get(resource);
+			if (reasons?.length) {
+				const infoMarker = this._createFilteredMarker(resource, reasons);
+				return [infoMarker];
+			}
+
 			const data = this._data.get(resource, owner);
 			if (!data) {
 				return [];
-			} else {
-				const result: IMarker[] = [];
-				for (const marker of data) {
-					if (MarkerService._accept(marker, severities)) {
-						const newLen = result.push(marker);
-						if (take > 0 && newLen === take) {
-							break;
-						}
-					}
-				}
-				return result;
 			}
 
-		} else if (!owner && !resource) {
-			// all
 			const result: IMarker[] = [];
-			for (const markers of this._data.values()) {
-				for (const data of markers) {
-					if (MarkerService._accept(data, severities)) {
-						const newLen = result.push(data);
-						if (take > 0 && newLen === take) {
-							return result;
-						}
-					}
+			for (const marker of data) {
+				if (take > 0 && result.length === take) {
+					break;
+				}
+				const reasons = this._filteredResources.get(resource);
+				if (reasons?.length) {
+					result.push(this._createFilteredMarker(resource, reasons));
+
+				} else if (MarkerService._accept(marker, severities)) {
+					result.push(marker);
 				}
 			}
 			return result;
 
 		} else {
 			// of one resource OR owner
-			const iterable = this._data.values(resource ?? owner!);
+			const iterable = !owner && !resource
+				? this._data.values()
+				: this._data.values(resource ?? owner!);
+
 			const result: IMarker[] = [];
+			const filtered = new ResourceSet();
+
 			for (const markers of iterable) {
 				for (const data of markers) {
-					if (MarkerService._accept(data, severities)) {
-						const newLen = result.push(data);
-						if (take > 0 && newLen === take) {
-							return result;
-						}
+					if (filtered.has(data.resource)) {
+						continue;
+					}
+					if (take > 0 && result.length === take) {
+						break;
+					}
+					const reasons = this._filteredResources.get(data.resource);
+					if (reasons?.length) {
+						result.push(this._createFilteredMarker(data.resource, reasons));
+						filtered.add(data.resource);
+
+					} else if (MarkerService._accept(data, severities)) {
+						result.push(data);
 					}
 				}
 			}
diff --git a/src/vs/platform/markers/common/markers.ts b/src/vs/platform/markers/common/markers.ts
index 602a67ea0d46..2c7f16685144 100644
--- a/src/vs/platform/markers/common/markers.ts
+++ b/src/vs/platform/markers/common/markers.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Event } from '../../../base/common/event.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
 import Severity from '../../../base/common/severity.js';
 import { URI } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
@@ -22,6 +23,8 @@ export interface IMarkerService {
 
 	read(filter?: { owner?: string; resource?: URI; severities?: number; take?: number }): IMarker[];
 
+	installResourceFilter(resource: URI, reason: string): IDisposable;
+
 	readonly onMarkerChanged: Event<readonly URI[]>;
 }
 
diff --git a/src/vs/platform/markers/test/common/markerService.test.ts b/src/vs/platform/markers/test/common/markerService.test.ts
index b3d1ff9a2ad4..2a543ed5b7b6 100644
--- a/src/vs/platform/markers/test/common/markerService.test.ts
+++ b/src/vs/platform/markers/test/common/markerService.test.ts
@@ -211,4 +211,215 @@ suite('Marker Service', () => {
 		assert.strictEqual(marker.length, 1);
 		assert.strictEqual(marker[0].code, '0');
 	});
+
+	test('resource filter hides markers for the filtered resource', () => {
+		service = new markerService.MarkerService();
+		const resource1 = URI.parse('file:///path/file1.cs');
+		const resource2 = URI.parse('file:///path/file2.cs');
+
+		// Add markers to both resources
+		service.changeOne('owner1', resource1, [randomMarkerData()]);
+		service.changeOne('owner1', resource2, [randomMarkerData()]);
+
+		// Verify both resources have markers
+		assert.strictEqual(service.read().length, 2);
+		assert.strictEqual(service.read({ resource: resource1 }).length, 1);
+		assert.strictEqual(service.read({ resource: resource2 }).length, 1);
+
+		// Install filter for resource1
+		const filter = service.installResourceFilter(resource1, 'Test filter');
+
+		// Verify resource1 markers are filtered out, but have 1 info marker instead
+		assert.strictEqual(service.read().length, 2); // 1 real + 1 info
+		assert.strictEqual(service.read({ resource: resource1 }).length, 1); // 1 info
+		assert.strictEqual(service.read({ resource: resource2 }).length, 1);
+
+		// Dispose filter
+		filter.dispose();
+
+		// Verify resource1 markers are visible again
+		assert.strictEqual(service.read().length, 2);
+		assert.strictEqual(service.read({ resource: resource1 }).length, 1);
+		assert.strictEqual(service.read({ resource: resource2 }).length, 1);
+	});
+
+	test('resource filter affects all filter combinations', () => {
+		service = new markerService.MarkerService();
+		const resource = URI.parse('file:///path/file.cs');
+
+		service.changeOne('owner1', resource, [randomMarkerData(MarkerSeverity.Error)]);
+		service.changeOne('owner2', resource, [randomMarkerData(MarkerSeverity.Warning)]);
+
+		// Verify initial state
+		assert.strictEqual(service.read().length, 2);
+		assert.strictEqual(service.read({ resource }).length, 2);
+		assert.strictEqual(service.read({ owner: 'owner1' }).length, 1);
+		assert.strictEqual(service.read({ owner: 'owner2' }).length, 1);
+		assert.strictEqual(service.read({ owner: 'owner1', resource }).length, 1);
+		assert.strictEqual(service.read({ severities: MarkerSeverity.Error }).length, 1);
+		assert.strictEqual(service.read({ severities: MarkerSeverity.Warning }).length, 1);
+
+		// Install filter
+		const filter = service.installResourceFilter(resource, 'Filter reason');
+
+		// Verify information marker is shown for resource queries
+		assert.strictEqual(service.read().length, 1); // 1 info marker
+		assert.strictEqual(service.read({ resource }).length, 1); // 1 info marker
+		assert.strictEqual(service.read({ owner: 'owner1' }).length, 1); // 1 info marker
+		assert.strictEqual(service.read({ owner: 'owner2' }).length, 1); // 1 info marker
+
+		// Verify owner+resource query returns an info marker for filtered resources
+		const ownerResourceMarkers = service.read({ owner: 'owner1', resource });
+		assert.strictEqual(ownerResourceMarkers.length, 1);
+		assert.strictEqual(ownerResourceMarkers[0].severity, MarkerSeverity.Info);
+		assert.strictEqual(ownerResourceMarkers[0].owner, 'markersFilter');
+
+		assert.strictEqual(service.read({ severities: MarkerSeverity.Error }).length, 1); // 1 info marker
+		assert.strictEqual(service.read({ severities: MarkerSeverity.Warning }).length, 1); // 1 info marker
+		assert.strictEqual(service.read({ severities: MarkerSeverity.Info }).length, 1); // Our info marker
+
+		// Remove filter and verify markers are visible again
+		filter.dispose();
+		assert.strictEqual(service.read().length, 2);
+	});
+
+	test('multiple filters for same resource are handled correctly', () => {
+		service = new markerService.MarkerService();
+		const resource = URI.parse('file:///path/file.cs');
+
+		// Add marker to resource
+		service.changeOne('owner1', resource, [randomMarkerData()]);
+
+		// Verify resource has markers
+		assert.strictEqual(service.read().length, 1);
+		assert.strictEqual(service.read({ resource }).length, 1);
+
+		// Install two filters for the same resource
+		const filter1 = service.installResourceFilter(resource, 'First filter');
+		const filter2 = service.installResourceFilter(resource, 'Second filter');
+
+		// Verify resource markers are filtered out but info marker is shown
+		assert.strictEqual(service.read().length, 1); // 1 info marker
+		assert.strictEqual(service.read({ resource }).length, 1); // 1 info marker
+
+		// Dispose only one filter
+		filter1.dispose();
+
+		// Verify resource markers are still filtered out because one filter remains
+		assert.strictEqual(service.read().length, 1); // still 1 info marker
+		assert.strictEqual(service.read({ resource }).length, 1); // still 1 info marker
+
+		// Dispose the second filter
+		filter2.dispose();
+
+		// Now all filters are gone, so markers should be visible again
+		assert.strictEqual(service.read().length, 1);
+		assert.strictEqual(service.read({ resource }).length, 1);
+	});
+
+	test('resource filter with reason shows info marker when markers are filtered', () => {
+		service = new markerService.MarkerService();
+		const resource = URI.parse('file:///path/file.cs');
+
+		// Add error and warning to the resource
+		service.changeOne('owner1', resource, [
+			randomMarkerData(MarkerSeverity.Error),
+			randomMarkerData(MarkerSeverity.Warning)
+		]);
+
+		// Verify initial state
+		assert.strictEqual(service.read().length, 2);
+		assert.strictEqual(service.read({ resource }).length, 2);
+
+		// Apply a filter with reason
+		const filterReason = 'Test filter reason';
+		const filter = service.installResourceFilter(resource, filterReason);
+
+		// Verify that we get a single info marker with our reason
+		const markers = service.read({ resource });
+		assert.strictEqual(markers.length, 1);
+		assert.strictEqual(markers[0].severity, MarkerSeverity.Info);
+		assert.ok(markers[0].message.includes(filterReason));
+
+		// Remove filter and verify the original markers are back
+		filter.dispose();
+		assert.strictEqual(service.read({ resource }).length, 2);
+	});
+
+	test('reading all markers shows info marker for filtered resources', () => {
+		service = new markerService.MarkerService();
+		const resource1 = URI.parse('file:///path/file1.cs');
+		const resource2 = URI.parse('file:///path/file2.cs');
+
+		// Add markers to both resources
+		service.changeOne('owner1', resource1, [randomMarkerData()]);
+		service.changeOne('owner1', resource2, [randomMarkerData()]);
+
+		// Verify initial state
+		assert.strictEqual(service.read().length, 2);
+
+		// Filter one resource with a reason
+		const filterReason = 'Resource is being edited';
+		const filter = service.installResourceFilter(resource1, filterReason);
+
+		// Read all markers
+		const allMarkers = service.read();
+
+		// Should have 2 markers - one real marker and one info marker
+		assert.strictEqual(allMarkers.length, 2);
+
+		// Find the info marker
+		const infoMarker = allMarkers.find(marker =>
+			marker.owner === 'markersFilter' &&
+			marker.severity === MarkerSeverity.Info
+		);
+
+		// Verify the info marker
+		assert.ok(infoMarker);
+		assert.strictEqual(infoMarker?.resource.toString(), resource1.toString());
+		assert.ok(infoMarker?.message.includes(filterReason));
+
+		// Remove filter
+		filter.dispose();
+	});
+
+	test('out of order filter disposal works correctly', () => {
+		service = new markerService.MarkerService();
+		const resource = URI.parse('file:///path/file.cs');
+
+		// Add marker to resource
+		service.changeOne('owner1', resource, [randomMarkerData()]);
+
+		// Verify resource has markers
+		assert.strictEqual(service.read().length, 1);
+		assert.strictEqual(service.read({ resource }).length, 1);
+
+		// Install three filters for the same resource
+		const filter1 = service.installResourceFilter(resource, 'First filter');
+		const filter2 = service.installResourceFilter(resource, 'Second filter');
+		const filter3 = service.installResourceFilter(resource, 'Third filter');
+
+		// Verify resource markers are filtered out but info marker is shown
+		assert.strictEqual(service.read().length, 1); // 1 info marker
+		assert.strictEqual(service.read({ resource }).length, 1); // 1 info marker
+
+		// Dispose filters in a different order than they were created
+		filter2.dispose();  // Remove the second filter first
+
+		// Verify resource markers are still filtered out with 2 filters remaining
+		assert.strictEqual(service.read().length, 1); // still 1 info marker
+		assert.strictEqual(service.read({ resource }).length, 1); // still 1 info marker
+
+		// Check if message contains the correct count of filters
+		const markers = service.read({ resource });
+		assert.ok(markers[0].message.includes('2 filters active'));
+
+		// Remove remaining filters in any order
+		filter3.dispose();
+		filter1.dispose();
+
+		// Now all filters are gone, so markers should be visible again
+		assert.strictEqual(service.read().length, 1);
+		assert.strictEqual(service.read({ resource }).length, 1);
+	});
 });
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
index def65addf686..5cbf3e713427 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
@@ -221,17 +221,7 @@ export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEdito
 		this._store.add(toDisposable(restoreActualOptions));
 
 		const shouldBeReadOnly = derived(this, r => {
-			const model = codeEditorObs.model.read(r);
-			if (!model) {
-				return false;
-			}
-			for (const session of chatEditingService.editingSessionsObs.read(r)) {
-				const entry = session.readEntry(model.uri, r);
-				if (entry?.isCurrentlyBeingModifiedBy.read(r)) {
-					return true;
-				}
-			}
-			return false;
+			return enabledObs.read(r) && Boolean(_entry.isCurrentlyBeingModifiedBy.read(r));
 		});
 
 		this._store.add(autorun(r => {
diff --git a/src/vs/workbench/test/common/workbenchTestServices.ts b/src/vs/workbench/test/common/workbenchTestServices.ts
index ef7fce72b1e0..aab81fcaf4e4 100644
--- a/src/vs/workbench/test/common/workbenchTestServices.ts
+++ b/src/vs/workbench/test/common/workbenchTestServices.ts
@@ -478,4 +478,7 @@ export class TestMarkerService implements IMarkerService {
 	changeAll(owner: string, data: IResourceMarker[]): void { }
 	remove(owner: string, resources: URI[]): void { }
 	read(filter?: { owner?: string | undefined; resource?: URI | undefined; severities?: number | undefined; take?: number | undefined } | undefined): IMarker[] { return []; }
+	installResourceFilter(resource: URI, reason: string): IDisposable {
+		return { dispose: () => { /* TODO: Implement cleanup logic */ } };
+	}
 }

From 353fea39d3c0537ac391473cb8b5d53ed99aade9 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 28 Feb 2025 14:06:31 +0100
Subject: [PATCH 0532/1815] Code completions settings is not accurate (#242300)
 (#242301)

---
 src/vs/workbench/contrib/chat/browser/chatStatus.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 5848ca22b3c1..fc00513e9065 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -400,7 +400,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 				return false;
 			}
 
-			return Boolean(result[language]);
+			return result[language] !== false;
 		};
 		const writeSetting = (checkbox: Checkbox) => {
 			let result = this.configurationService.getValue<Record<string, boolean>>(settingId);

From 1c6aa345b723e52bea50ede68fa8b586c28e1463 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 28 Feb 2025 14:14:35 +0100
Subject: [PATCH 0533/1815] Increase gap between shortcuts in chat status bar
 tooltip (#242303)

---
 src/vs/workbench/contrib/chat/browser/media/chatStatus.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
index 74da950c9d6f..aecbe61a4b17 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
@@ -62,7 +62,7 @@
 
 .chat-status-bar-entry-tooltip .shortcuts .shortcut {
 	display: flex;
-	gap: 10px;
+	gap: 15px;
 
 	/** Make room for the hover feedback */
 	margin-left: -3px;

From 478646b7b6700c2ee0570d8833e57a682836ad03 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 28 Feb 2025 14:47:39 +0100
Subject: [PATCH 0534/1815] debt - adopt `system-context-menu` (#242224)

* debt - adopt `system-context-menu`

* chore: convert point from event to DIP

---------

Co-authored-by: deepak1556 <hop2deep@gmail.com>
---
 .../windows/electron-main/windowImpl.ts       | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/vs/platform/windows/electron-main/windowImpl.ts b/src/vs/platform/windows/electron-main/windowImpl.ts
index 7ea47d522f8e..fd18c9f8da05 100644
--- a/src/vs/platform/windows/electron-main/windowImpl.ts
+++ b/src/vs/platform/windows/electron-main/windowImpl.ts
@@ -146,23 +146,13 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 			}
 		}
 
-		// Windows Custom System Context Menu
-		// See https://github.com/electron/electron/issues/24893
-		//
-		// The purpose of this is to allow for the context menu in the Windows Title Bar
-		//
-		// Currently, all mouse events in the title bar are captured by the OS
-		// thus we need to capture them here with a window hook specific to Windows
-		// and then forward them to the correct window.
+		// Setup windows system context menu so it only is allowed in certain cases
 		if (isWindows && useCustomTitleStyle) {
-			const WM_INITMENU = 0x0116; // https://docs.microsoft.com/en-us/windows/win32/menurc/wm-initmenu
-
-			// This sets up a listener for the window hook. This is a Windows-only API provided by electron.
-			win.hookWindowMessage(WM_INITMENU, () => {
+			this._register(Event.fromNodeEventEmitter(win, 'system-context-menu', (event: Electron.Event, point: Electron.Point) => ({ event, point }))((e) => {
 				const [x, y] = win.getPosition();
-				const cursorPos = electron.screen.getCursorScreenPoint();
-				const cx = cursorPos.x - x;
-				const cy = cursorPos.y - y;
+				const cursorPos = electron.screen.screenToDipPoint(e.point);
+				const cx = Math.floor(cursorPos.x) - x;
+				const cy = Math.floor(cursorPos.y) - y;
 
 				// In some cases, show the default system context menu
 				// 1) The mouse position is not within the title bar
@@ -180,16 +170,11 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 				};
 
 				if (!shouldTriggerDefaultSystemContextMenu()) {
-
-					// This is necessary to make sure the native system context menu does not show up.
-					win.setEnabled(false);
-					win.setEnabled(true);
+					e.event.preventDefault();
 
 					this._onDidTriggerSystemContextMenu.fire({ x: cx, y: cy });
 				}
-
-				return 0;
-			});
+			}));
 		}
 
 		// Open devtools if instructed from command line args

From 54af93e53194c27e987f0c8f4a202d7838ad34ef Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 28 Feb 2025 14:50:29 +0100
Subject: [PATCH 0535/1815] Code completions settings is not accurate (#242300)
 (#242307)

---
 src/vs/workbench/contrib/chat/browser/chatStatus.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index fc00513e9065..8345bb4c90bc 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -391,7 +391,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		return settings;
 	}
 
-	private createCodeCompletionsSetting(container: HTMLElement, label: string, language: string, disposables: DisposableStore): void {
+	private createCodeCompletionsSetting(container: HTMLElement, label: string, language: string | '*', disposables: DisposableStore): void {
 		const settingId = 'github.copilot.enable';
 
 		const readSetting = () => {
@@ -400,7 +400,11 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 				return false;
 			}
 
-			return result[language] !== false;
+			if (typeof result[language] !== 'undefined') {
+				return Boolean(result[language]); // go with setting if explicitly defined
+			}
+
+			return Boolean(result['*']); // fallback to global setting otherwise
 		};
 		const writeSetting = (checkbox: Checkbox) => {
 			let result = this.configurationService.getValue<Record<string, boolean>>(settingId);

From 5dcdc6c3ee0f02e239221c7e12146177b585fc7e Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Fri, 28 Feb 2025 15:02:59 +0100
Subject: [PATCH 0536/1815] Revert "problematic extensions: disable them and
 uninstall in all profiles (#242297)" (#242308)

This reverts commit 559a51e69f02329cbcdef2707688f018af4644da.
---
 .../abstractExtensionManagementService.ts     | 33 +-------
 .../extensions/browser/extensionsViewlet.ts   | 80 ++++++++-----------
 .../browser/extensionsWorkbenchService.ts     | 44 +++++-----
 .../contrib/extensions/common/extensions.ts   |  2 +-
 .../browser/extensionEnablementService.ts     | 24 +++---
 .../extensionEnablementService.test.ts        | 13 +--
 6 files changed, 69 insertions(+), 127 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
index dba7975aad5a..73fbccd8f518 100644
--- a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
@@ -731,13 +731,6 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 		const alreadyRequestedUninstalls: Promise<any>[] = [];
 
 		const installedExtensionsMap = new ResourceMap<ILocalExtension[]>();
-		const getInstalledExtensions = async (profileLocation: URI) => {
-			let installed = installedExtensionsMap.get(profileLocation);
-			if (!installed) {
-				installedExtensionsMap.set(profileLocation, installed = await this.getInstalled(ExtensionType.User, profileLocation));
-			}
-			return installed;
-		};
 
 		for (const { extension, options } of extensions) {
 			const uninstallOptions: UninstallExtensionTaskOptions = {
@@ -751,32 +744,14 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 			} else {
 				allTasks.push(createUninstallExtensionTask(extension, uninstallOptions));
 			}
-
-			if (uninstallOptions.remove) {
-				// Remove from all profiles
-				for (const profile of this.userDataProfilesService.profiles) {
-					if (this.uriIdentityService.extUri.isEqual(profile.extensionsResource, uninstallOptions.profileLocation)) {
-						continue;
-					}
-					const installed = await getInstalledExtensions(profile.extensionsResource);
-					const profileExtension = installed.find(e => areSameExtensions(e.identifier, extension.identifier));
-					if (profileExtension) {
-						const uninstallOptionsWithProfile = { ...uninstallOptions, profileLocation: profile.extensionsResource };
-						const uninstallExtensionTask = this.uninstallingExtensions.get(getUninstallExtensionTaskKey(profileExtension, uninstallOptionsWithProfile));
-						if (uninstallExtensionTask) {
-							this.logService.info('Extensions is already requested to uninstall', profileExtension.identifier.id);
-							alreadyRequestedUninstalls.push(uninstallExtensionTask.waitUntilTaskIsFinished());
-						} else {
-							allTasks.push(createUninstallExtensionTask(profileExtension, uninstallOptionsWithProfile));
-						}
-					}
-				}
-			}
 		}
 
 		try {
 			for (const task of allTasks.slice(0)) {
-				const installed = await getInstalledExtensions(task.options.profileLocation);
+				let installed = installedExtensionsMap.get(task.options.profileLocation);
+				if (!installed) {
+					installedExtensionsMap.set(task.options.profileLocation, installed = await this.getInstalled(ExtensionType.User, task.options.profileLocation));
+				}
 
 				if (task.options.donotIncludePack) {
 					this.logService.info('Uninstalling the extension without including packed extension', `${task.extension.identifier.id}@${task.extension.manifest.version}`);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
index c81219c33846..ee75bba1ed6f 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
@@ -5,7 +5,7 @@
 
 import './media/extensionsViewlet.css';
 import { localize, localize2 } from '../../../../nls.js';
-import { timeout, Delayer } from '../../../../base/common/async.js';
+import { timeout, Delayer, Promises } from '../../../../base/common/async.js';
 import { isCancellationError } from '../../../../base/common/errors.js';
 import { createErrorWithActions } from '../../../../base/common/errorMessage.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
@@ -16,10 +16,10 @@ import { append, $, Dimension, hide, show, DragAndDropObserver, trackFocus, addD
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { IExtensionsWorkbenchService, IExtensionsViewPaneContainer, VIEWLET_ID, CloseExtensionDetailsOnViewChangeKey, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, AutoCheckUpdatesConfigurationKey, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu, AutoRestartConfigurationKey, IExtension } from '../common/extensions.js';
+import { IExtensionsWorkbenchService, IExtensionsViewPaneContainer, VIEWLET_ID, CloseExtensionDetailsOnViewChangeKey, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, AutoCheckUpdatesConfigurationKey, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu, AutoRestartConfigurationKey } from '../common/extensions.js';
 import { InstallLocalExtensionsInRemoteAction, InstallRemoteExtensionsInLocalAction } from './extensionsActions.js';
-import { IExtensionManagementService, UninstallExtensionInfo } from '../../../../platform/extensionManagement/common/extensionManagement.js';
-import { IWorkbenchExtensionEnablementService, IExtensionManagementServerService, IExtensionManagementServer, EnablementState } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IWorkbenchExtensionEnablementService, IExtensionManagementServerService, IExtensionManagementServer } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { ExtensionsInput } from '../common/extensionsInput.js';
 import { ExtensionsListView, EnabledExtensionsView, DisabledExtensionsView, RecommendedExtensionsView, WorkspaceRecommendedExtensionsView, ServerInstalledExtensionsView, DefaultRecommendedExtensionsView, UntrustedWorkspaceUnsupportedExtensionsView, UntrustedWorkspacePartiallySupportedExtensionsView, VirtualWorkspaceUnsupportedExtensionsView, VirtualWorkspacePartiallySupportedExtensionsView, DefaultPopularExtensionsView, DeprecatedExtensionsView, SearchMarketplaceExtensionsView, RecentlyUpdatedExtensionsView, OutdatedExtensionsView, StaticQueryExtensionsView, NONE_CATEGORY } from './extensionsViews.js';
 import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
@@ -35,13 +35,14 @@ import { IContextKeyService, ContextKeyExpr, RawContextKey, IContextKey } from '
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { INotificationService, NotificationPriority } from '../../../../platform/notification/common/notification.js';
+import { IHostService } from '../../../services/host/browser/host.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
 import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
 import { ViewPane } from '../../../browser/parts/views/viewPane.js';
 import { Query } from '../common/extensionQuery.js';
 import { SuggestEnabledInput } from '../../codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
-import { EXTENSION_CATEGORIES } from '../../../../platform/extensions/common/extensions.js';
+import { EXTENSION_CATEGORIES, ExtensionType } from '../../../../platform/extensions/common/extensions.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { MementoObject } from '../../../common/memento.js';
@@ -58,6 +59,7 @@ import { IPaneCompositePartService } from '../../../services/panecomposite/brows
 import { coalesce } from '../../../../base/common/arrays.js';
 import { extractEditorsAndFilesDropData } from '../../../../platform/dnd/browser/dnd.js';
 import { extname } from '../../../../base/common/resources.js';
+import { isMalicious } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { ILocalizedString } from '../../../../platform/action/common/action.js';
 import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
 import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
@@ -67,7 +69,6 @@ import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { IHostService } from '../../../services/host/browser/host.js';
 
 export const DefaultViewsContext = new RawContextKey<boolean>('defaultExtensionViews', true);
 export const ExtensionsSortByContext = new RawContextKey<string>('extensionsSortByValue', '');
@@ -972,7 +973,6 @@ export class MaliciousExtensionChecker implements IWorkbenchContribution {
 	constructor(
 		@IExtensionManagementService private readonly extensionsManagementService: IExtensionManagementService,
 		@IHostService private readonly hostService: IHostService,
-		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@ILogService private readonly logService: ILogService,
 		@INotificationService private readonly notificationService: INotificationService,
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService
@@ -988,47 +988,31 @@ export class MaliciousExtensionChecker implements IWorkbenchContribution {
 			.then(() => this.loopCheckForMaliciousExtensions());
 	}
 
-	private async checkForMaliciousExtensions(): Promise<void> {
-		try {
-			const extensionsToUninstall: UninstallExtensionInfo[] = [];
-			const maliciousExtensions: IExtension[] = [];
-
-			await this.extensionsWorkbenchService.queryLocal();
-
-			for (const e of this.extensionsWorkbenchService.installed) {
-				if (e.local && e.isMalicious) {
-					maliciousExtensions.push(e);
-					extensionsToUninstall.push({
-						extension: e.local,
-						options: {
-							donotCheckDependents: true,
-							remove: true,
-						}
-					});
-				}
-			}
-
-			if (!maliciousExtensions.length) {
-				return;
-			}
-
-			await this.extensionsWorkbenchService.setEnablement(maliciousExtensions, EnablementState.DisabledGlobally, true);
-			await this.extensionsManagementService.uninstallExtensions(extensionsToUninstall);
-
-			this.notificationService.prompt(
-				Severity.Warning,
-				localize('malicious warning', "The following extensions were found to be problematic and have been uninstalled: {0}", maliciousExtensions.map(e => e.identifier.id).join(', ')),
-				[{
-					label: localize('reloadNow', "Reload Now"),
-					run: () => this.hostService.reload()
-				}],
-				{
-					sticky: true,
-					priority: NotificationPriority.URGENT
+	private checkForMaliciousExtensions(): Promise<void> {
+		return this.extensionsManagementService.getExtensionsControlManifest().then(extensionsControlManifest => {
+
+			return this.extensionsManagementService.getInstalled(ExtensionType.User).then(installed => {
+				const maliciousExtensions = installed.filter(e => isMalicious(e.identifier, extensionsControlManifest));
+
+				if (maliciousExtensions.length) {
+					return Promises.settled(maliciousExtensions.map(e => this.extensionsManagementService.uninstall(e).then(() => {
+						this.notificationService.prompt(
+							Severity.Warning,
+							localize('malicious warning', "We have uninstalled '{0}' which was reported to be problematic.", e.identifier.id),
+							[{
+								label: localize('reloadNow', "Reload Now"),
+								run: () => this.hostService.reload()
+							}],
+							{
+								sticky: true,
+								priority: NotificationPriority.URGENT
+							}
+						);
+					})));
+				} else {
+					return Promise.resolve(undefined);
 				}
-			);
-		} catch (err) {
-			this.logService.error(err);
-		}
+			}).then(() => undefined);
+		}, err => this.logService.error(err));
 	}
 }
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index c578e5e4eed7..74f8e88fb618 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -2526,9 +2526,9 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		return this.localeService.setLocale({ id: locale, galleryExtension: extension.gallery, extensionId: extension.identifier.id, label: localizedLanguageName ?? extension.displayName });
 	}
 
-	setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState, force: boolean = false): Promise<void> {
+	setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState): Promise<void> {
 		extensions = Array.isArray(extensions) ? extensions : [extensions];
-		return this.promptAndSetEnablement(extensions, enablementState, force);
+		return this.promptAndSetEnablement(extensions, enablementState);
 	}
 
 	async uninstall(e: IExtension): Promise<void> {
@@ -2786,45 +2786,43 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		});
 	}
 
-	private promptAndSetEnablement(extensions: IExtension[], enablementState: EnablementState, force: boolean): Promise<any> {
+	private promptAndSetEnablement(extensions: IExtension[], enablementState: EnablementState): Promise<any> {
 		const enable = enablementState === EnablementState.EnabledGlobally || enablementState === EnablementState.EnabledWorkspace;
 		if (enable) {
 			const allDependenciesAndPackedExtensions = this.getExtensionsRecursively(extensions, this.local, enablementState, { dependencies: true, pack: true });
-			return this.checkAndSetEnablement(extensions, allDependenciesAndPackedExtensions, enablementState, force);
+			return this.checkAndSetEnablement(extensions, allDependenciesAndPackedExtensions, enablementState);
 		} else {
 			const packedExtensions = this.getExtensionsRecursively(extensions, this.local, enablementState, { dependencies: false, pack: true });
 			if (packedExtensions.length) {
-				return this.checkAndSetEnablement(extensions, packedExtensions, enablementState, force);
+				return this.checkAndSetEnablement(extensions, packedExtensions, enablementState);
 			}
-			return this.checkAndSetEnablement(extensions, [], enablementState, force);
+			return this.checkAndSetEnablement(extensions, [], enablementState);
 		}
 	}
 
-	private async checkAndSetEnablement(extensions: IExtension[], otherExtensions: IExtension[], enablementState: EnablementState, force: boolean): Promise<any> {
+	private async checkAndSetEnablement(extensions: IExtension[], otherExtensions: IExtension[], enablementState: EnablementState): Promise<any> {
 		const allExtensions = [...extensions, ...otherExtensions];
 		const enable = enablementState === EnablementState.EnabledGlobally || enablementState === EnablementState.EnabledWorkspace;
 		if (!enable) {
 			for (const extension of extensions) {
 				const dependents = this.getDependentsAfterDisablement(extension, allExtensions, this.local);
 				if (dependents.length) {
-					if (!force) {
-						const { result } = await this.dialogService.prompt({
-							title: nls.localize('disableDependents', "Disable Extension with Dependents"),
-							type: Severity.Warning,
-							message: this.getDependentsErrorMessageForDisablement(extension, allExtensions, dependents),
-							buttons: [{
-								label: nls.localize('disable all', 'Disable All'),
-								run: () => true
-							}],
-							cancelButton: {
-								run: () => false
-							}
-						});
-						if (!result) {
-							throw new CancellationError();
+					const { result } = await this.dialogService.prompt({
+						title: nls.localize('disableDependents', "Disable Extension with Dependents"),
+						type: Severity.Warning,
+						message: this.getDependentsErrorMessageForDisablement(extension, allExtensions, dependents),
+						buttons: [{
+							label: nls.localize('disable all', 'Disable All'),
+							run: () => true
+						}],
+						cancelButton: {
+							run: () => false
 						}
+					});
+					if (!result) {
+						throw new CancellationError();
 					}
-					await this.checkAndSetEnablement(dependents, [extension], enablementState, force);
+					await this.checkAndSetEnablement(dependents, [extension], enablementState);
 				}
 			}
 		}
diff --git a/src/vs/workbench/contrib/extensions/common/extensions.ts b/src/vs/workbench/contrib/extensions/common/extensions.ts
index a43a65693111..97e8d4b6d153 100644
--- a/src/vs/workbench/contrib/extensions/common/extensions.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensions.ts
@@ -147,7 +147,7 @@ export interface IExtensionsWorkbenchService {
 	togglePreRelease(extension: IExtension): Promise<void>;
 	canSetLanguage(extension: IExtension): boolean;
 	setLanguage(extension: IExtension): Promise<void>;
-	setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState, force?: boolean): Promise<void>;
+	setEnablement(extensions: IExtension | IExtension[], enablementState: EnablementState): Promise<void>;
 	isAutoUpdateEnabledFor(extensionOrPublisher: IExtension | string): boolean;
 	updateAutoUpdateEnablementFor(extensionOrPublisher: IExtension | string, enable: boolean): Promise<void>;
 	shouldRequireConsentToUpdate(extension: IExtension): Promise<string | undefined>;
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
index e49be121a4e9..2ad63cc370b8 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
@@ -8,7 +8,7 @@ import { Event, Emitter } from '../../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { IExtensionManagementService, IExtensionIdentifier, IGlobalExtensionEnablementService, ENABLED_EXTENSIONS_STORAGE_PATH, DISABLED_EXTENSIONS_STORAGE_PATH, InstallOperation, IAllowedExtensionsService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IWorkbenchExtensionManagementService, IExtensionManagementServer, ExtensionInstallLocation } from '../common/extensionManagement.js';
-import { areSameExtensions, BetterMergeId, getExtensionDependencies, isMalicious } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { areSameExtensions, BetterMergeId, getExtensionDependencies } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
 import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
 import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
@@ -49,7 +49,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		@IGlobalExtensionEnablementService protected readonly globalExtensionEnablementService: IGlobalExtensionEnablementService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
-		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
+		@IExtensionManagementService extensionManagementService: IExtensionManagementService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
 		@IUserDataSyncEnablementService private readonly userDataSyncEnablementService: IUserDataSyncEnablementService,
@@ -67,7 +67,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		super();
 		this.storageManager = this._register(new StorageManager(storageService));
 
-		const uninstallDisposable = this._register(Event.filter(extensionManagementService.onDidUninstallExtension, e => !e.error)(({ identifier }) => this._reset([identifier])));
+		const uninstallDisposable = this._register(Event.filter(extensionManagementService.onDidUninstallExtension, e => !e.error)(({ identifier }) => this._reset(identifier)));
 		let isDisposed = false;
 		this._register(toDisposable(() => isDisposed = true));
 		this.extensionsManager = this._register(instantiationService.createInstance(ExtensionsManager));
@@ -662,8 +662,8 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		if (changedExtensions.length) {
 			this._onEnablementChanged.fire(changedExtensions);
 		}
-		if (!isProfileSwitch && removed.length) {
-			this._reset(removed.map(({ identifier }) => identifier));
+		if (!isProfileSwitch) {
+			removed.forEach(({ identifier }) => this._reset(identifier));
 		}
 	}
 
@@ -689,16 +689,10 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		return { trusted: this.workspaceTrustManagementService.isWorkspaceTrusted(), virtual: isVirtualWorkspace(this.contextService.getWorkspace()) };
 	}
 
-	private async _reset(extensions: IExtensionIdentifier[]): Promise<void> {
-		const controlManifest = await this.extensionManagementService.getExtensionsControlManifest();
-		for (const extension of extensions) {
-			if (isMalicious(extension, controlManifest)) {
-				continue;
-			}
-			this._removeFromWorkspaceDisabledExtensions(extension);
-			this._removeFromWorkspaceEnabledExtensions(extension);
-			this.globalExtensionEnablementService.enableExtension(extension);
-		}
+	private _reset(extension: IExtensionIdentifier) {
+		this._removeFromWorkspaceDisabledExtensions(extension);
+		this._removeFromWorkspaceEnabledExtensions(extension);
+		this.globalExtensionEnablementService.enableExtension(extension);
 	}
 }
 
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 9d84a26fb0ac..f7c0ff78feb9 100644
--- a/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
+++ b/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { IExtensionManagementService, DidUninstallExtensionEvent, ILocalExtension, InstallExtensionEvent, InstallExtensionResult, UninstallExtensionEvent, DidUpdateExtensionMetadata, InstallOperation, IAllowedExtensionsService, AllowedExtensionsConfigKey, IExtensionsControlManifest } from '../../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IExtensionManagementService, DidUninstallExtensionEvent, ILocalExtension, InstallExtensionEvent, InstallExtensionResult, UninstallExtensionEvent, DidUpdateExtensionMetadata, InstallOperation, IAllowedExtensionsService, AllowedExtensionsConfigKey } from '../../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, ExtensionInstallLocation, IProfileAwareExtensionManagementService, DidChangeProfileEvent } from '../../common/extensionManagement.js';
 import { ExtensionEnablementService } from '../../browser/extensionEnablementService.js';
 import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
@@ -73,9 +73,6 @@ export class TestExtensionEnablementService extends ExtensionEnablementService {
 					onDidChangeProfile: disposables.add(new Emitter<DidChangeProfileEvent>()).event,
 					onDidUpdateExtensionMetadata: disposables.add(new Emitter<DidUpdateExtensionMetadata>()).event,
 					onProfileAwareDidInstallExtensions: Event.None,
-					async getExtensionsControlManifest(): Promise<IExtensionsControlManifest> {
-						return { malicious: [], deprecated: {}, search: [] };
-					},
 				},
 			}, null, null));
 		const extensionManagementService = disposables.add(instantiationService.createInstance(ExtensionManagementService));
@@ -152,10 +149,7 @@ suite('ExtensionEnablementService Test', () => {
 				onDidUninstallExtension: didUninstallEvent.event,
 				onDidChangeProfile: didChangeProfileExtensionsEvent.event,
 				onProfileAwareDidInstallExtensions: Event.None,
-				getInstalled: () => Promise.resolve(installed),
-				async getExtensionsControlManifest(): Promise<IExtensionsControlManifest> {
-					return { malicious: [], deprecated: {}, search: [] };
-				},
+				getInstalled: () => Promise.resolve(installed)
 			},
 		}, null, null));
 		instantiationService.stub(ILogService, NullLogService);
@@ -468,11 +462,8 @@ suite('ExtensionEnablementService Test', () => {
 
 		await testObject.setEnablement([extension], EnablementState.DisabledWorkspace);
 		await testObject.setEnablement([extension], EnablementState.DisabledGlobally);
-		const promise = Event.toPromise(testObject.onEnablementChanged);
-
 		didUninstallEvent.fire({ identifier: { id: 'pub.a' }, profileLocation: null! });
 
-		await promise;
 		assert.ok(testObject.isEnabled(extension));
 		assert.strictEqual(testObject.getEnablementState(extension), EnablementState.EnabledGlobally);
 	});

From 66ce179658a5ff48b25c1d58372ef8e3c6f62728 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Fri, 28 Feb 2025 15:37:00 +0100
Subject: [PATCH 0537/1815] Revert "The code background and foreground color
 are inversed for the default high contrast theme" (#242314)

This reverts commit 75237f1e98ef3fe0f7273cea64cfe7518e5daad7.
---
 src/vs/platform/theme/common/colors/baseColors.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/theme/common/colors/baseColors.ts b/src/vs/platform/theme/common/colors/baseColors.ts
index 9c61daf2dffe..514fdc8a4e99 100644
--- a/src/vs/platform/theme/common/colors/baseColors.ts
+++ b/src/vs/platform/theme/common/colors/baseColors.ts
@@ -65,11 +65,11 @@ export const textSeparatorForeground = registerColor('textSeparator.foreground',
 // ------ text preformat
 
 export const textPreformatForeground = registerColor('textPreformat.foreground',
-	{ light: '#A31515', dark: '#D7BA7D', hcDark: Color.white, hcLight: '#292929' },
+	{ light: '#A31515', dark: '#D7BA7D', hcDark: '#000000', hcLight: '#FFFFFF' },
 	nls.localize('textPreformatForeground', "Foreground color for preformatted text segments."));
 
 export const textPreformatBackground = registerColor('textPreformat.background',
-	{ light: '#0000001A', dark: '#FFFFFF1A', hcDark: Color.black, hcLight: '#F2F2F2' },
+	{ light: '#0000001A', dark: '#FFFFFF1A', hcDark: '#FFFFFF', hcLight: '#09345f' },
 	nls.localize('textPreformatBackground', "Background color for preformatted text segments."));
 
 

From 501ee833b16b8e83ba656c46e0888aadd9d2db04 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 28 Feb 2025 16:00:45 +0100
Subject: [PATCH 0538/1815] Walkthrough Leak (fix #242305) (#242317)

---
 .../contrib/welcomeGettingStarted/browser/gettingStarted.ts      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
index 39313994cd0d..143018f6cc58 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
@@ -1359,6 +1359,7 @@ export class GettingStartedPage extends EditorPane {
 						container.appendChild(shortcutMessage);
 						const label = new KeybindingLabel(shortcutMessage, OS, { ...defaultKeybindingLabelStyles });
 						label.set(keybinding);
+						this.detailsPageDisposables.add(label);
 					}
 				}
 

From 41714c12fdb3436224e3ff883160fcae75c29440 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 28 Feb 2025 16:25:56 +0100
Subject: [PATCH 0539/1815] chore - test for modified file entry and
 `isCurrentlyBeingModifiedBy` state (#242324)

---
 .../browser/chatEditing/chatEditingSession.ts |  3 +-
 .../test/browser/chatEditingService.test.ts   | 58 +++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 0ce571f8d6eb..2d7f1a46d169 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -50,6 +50,7 @@ import { ChatEditingModifiedDocumentEntry } from './chatEditingModifiedDocumentE
 import { ChatEditingTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
 import { CellUri, ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
 import { ChatEditingModifiedNotebookDiff, ChatEditingModifiedNotebookEntry } from './chatEditingModifiedNotebookEntry.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
 
 const STORAGE_CONTENTS_FOLDER = 'contents';
 const STORAGE_STATE_FILE = 'state.json';
@@ -77,7 +78,7 @@ class ThrottledSequencer extends Sequencer {
 				const p1 = promiseTask();
 				const p2 = noDelay
 					? Promise.resolve(undefined)
-					: timeout(this._minDuration);
+					: timeout(this._minDuration, CancellationToken.None);
 
 				const [result] = await Promise.all([p1, p2]);
 				return result;
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatEditingService.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatEditingService.test.ts
index 974e7f0f5fd1..220f55e8e4e1 100644
--- a/src/vs/workbench/contrib/chat/test/browser/chatEditingService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/chatEditingService.test.ts
@@ -23,6 +23,14 @@ import { IWorkbenchAssignmentService } from '../../../../services/assignment/com
 import { NullWorkbenchAssignmentService } from '../../../../services/assignment/test/common/nullAssignmentService.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { nullExtensionDescription } from '../../../../services/extensions/common/extensions.js';
+import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { assertType } from '../../../../../base/common/types.js';
+import { isEqual } from '../../../../../base/common/resources.js';
+import { waitForState } from '../../../../../base/common/observable.js';
+import { INotebookService } from '../../../notebook/common/notebookService.js';
+import { Range } from '../../../../../editor/common/core/range.js';
 
 function getAgentData(id: string) {
 	return {
@@ -44,6 +52,7 @@ suite('ChatEditingService', function () {
 	const store = new DisposableStore();
 	let editingService: ChatEditingService;
 	let chatService: IChatService;
+	let textModelService: ITextModelService;
 
 	setup(function () {
 		const collection = new ServiceCollection();
@@ -58,6 +67,11 @@ suite('ChatEditingService', function () {
 				return Disposable.None;
 			}
 		});
+		collection.set(INotebookService, new class extends mock<INotebookService>() {
+			override hasSupportedNotebooks(resource: URI): boolean {
+				return false;
+			}
+		});
 		const insta = store.add(store.add(workbenchInstantiationService(undefined, store)).createChild(collection));
 		const value = insta.get(IChatEditingService);
 		assert.ok(value instanceof ChatEditingService);
@@ -74,6 +88,16 @@ suite('ChatEditingService', function () {
 		};
 		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 modelService.createModel(resource.path.repeat(10), null, resource, false);
+			},
+		}));
 	});
 
 	teardown(() => {
@@ -100,4 +124,38 @@ suite('ChatEditingService', function () {
 		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.EditingSession, CancellationToken.None);
+		const session = await editingService.createEditingSession(model.sessionId, true);
+
+		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() === chatRequest.response);
+
+		const unset = waitForState(entry.isCurrentlyBeingModifiedBy.map(res => res === undefined));
+
+		chatRequest.response.complete();
+
+		await unset;
+
+		await entry.reject(undefined);
+
+		session.dispose();
+		model.dispose();
+	});
+
 });

From 65a60f0390121ddfe3148b07c6bd77f82f27a7d2 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 28 Feb 2025 16:26:32 +0100
Subject: [PATCH 0540/1815] status - actually fix tooltip to resolve adhoc
 (#242316)

* status - actually fix tooltip to resolve adhoc

* less erorr loggin
---
 src/vs/base/browser/ui/hover/hover.ts         |  11 +-
 .../hoverService/updatableHoverWidget.ts      |  41 +++---
 .../browser/parts/statusbar/statusbarItem.ts  |   2 +-
 .../browser/parts/statusbar/statusbarPart.ts  |   5 +-
 .../contrib/chat/browser/chatSetup.ts         |   4 +-
 .../contrib/chat/browser/chatStatus.ts        | 117 ++++++++++--------
 .../services/statusbar/browser/statusbar.ts   |   4 +-
 7 files changed, 109 insertions(+), 75 deletions(-)

diff --git a/src/vs/base/browser/ui/hover/hover.ts b/src/vs/base/browser/ui/hover/hover.ts
index f96dceb1b0d6..be6a8ab1ace1 100644
--- a/src/vs/base/browser/ui/hover/hover.ts
+++ b/src/vs/base/browser/ui/hover/hover.ts
@@ -387,7 +387,16 @@ export function isManagedHoverTooltipMarkdownString(obj: unknown): obj is IManag
 	return typeof candidate === 'object' && 'markdown' in candidate && 'markdownNotSupportedFallback' in candidate;
 }
 
-export type IManagedHoverContent = string | IManagedHoverTooltipMarkdownString | HTMLElement | undefined;
+export interface IManagedHoverTooltipHTMLElement {
+	element: (token: CancellationToken) => HTMLElement | Promise<HTMLElement>;
+}
+
+export function isManagedHoverTooltipHTMLElement(obj: unknown): obj is IManagedHoverTooltipHTMLElement {
+	const candidate = obj as IManagedHoverTooltipHTMLElement;
+	return typeof candidate === 'object' && 'element' in candidate;
+}
+
+export type IManagedHoverContent = string | IManagedHoverTooltipMarkdownString | IManagedHoverTooltipHTMLElement | HTMLElement | undefined;
 export type IManagedHoverContentOrFactory = IManagedHoverContent | (() => IManagedHoverContent);
 
 export interface IManagedHoverOptions extends Pick<IHoverOptions, 'actions' | 'linkHandler' | 'trapFocus'> {
diff --git a/src/vs/editor/browser/services/hoverService/updatableHoverWidget.ts b/src/vs/editor/browser/services/hoverService/updatableHoverWidget.ts
index c5b656b99d36..19a333e0035a 100644
--- a/src/vs/editor/browser/services/hoverService/updatableHoverWidget.ts
+++ b/src/vs/editor/browser/services/hoverService/updatableHoverWidget.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { isHTMLElement } from '../../../../base/browser/dom.js';
-import type { IHoverWidget, IManagedHoverContent, IManagedHoverOptions } from '../../../../base/browser/ui/hover/hover.js';
+import { isManagedHoverTooltipMarkdownString, type IHoverWidget, type IManagedHoverContent, type IManagedHoverOptions } from '../../../../base/browser/ui/hover/hover.js';
 import type { IHoverDelegate, IHoverDelegateOptions, IHoverDelegateTarget } from '../../../../base/browser/ui/hover/hoverDelegate.js';
 import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
@@ -20,8 +20,7 @@ export class ManagedHoverWidget implements IDisposable {
 	private _hoverWidget: IHoverWidget | undefined;
 	private _cancellationTokenSource: CancellationTokenSource | undefined;
 
-	constructor(private hoverDelegate: IHoverDelegate, private target: IHoverDelegateTarget | HTMLElement, private fadeInAnimation: boolean) {
-	}
+	constructor(private hoverDelegate: IHoverDelegate, private target: IHoverDelegateTarget | HTMLElement, private fadeInAnimation: boolean) { }
 
 	async update(content: IManagedHoverContent, focus?: boolean, options?: IManagedHoverOptions): Promise<void> {
 		if (this._cancellationTokenSource) {
@@ -33,25 +32,37 @@ export class ManagedHoverWidget implements IDisposable {
 			return;
 		}
 
-		let resolvedContent;
-		if (content === undefined || isString(content) || isHTMLElement(content)) {
+		let resolvedContent: string | HTMLElement | IMarkdownString | undefined;
+		if (isString(content) || isHTMLElement(content) || content === undefined) {
 			resolvedContent = content;
-		} else if (!isFunction(content.markdown)) {
-			resolvedContent = content.markdown ?? content.markdownNotSupportedFallback;
 		} else {
 			// compute the content, potentially long-running
 
-			// show 'Loading' if no hover is up yet
-			if (!this._hoverWidget) {
-				this.show(localize('iconLabel.loading', "Loading..."), focus, options);
+			this._cancellationTokenSource = new CancellationTokenSource();
+			const token = this._cancellationTokenSource.token;
+
+			let managedContent;
+			if (isManagedHoverTooltipMarkdownString(content)) {
+				if (isFunction(content.markdown)) {
+					managedContent = content.markdown(token).then(resolvedContent => resolvedContent ?? content.markdownNotSupportedFallback);
+				} else {
+					managedContent = content.markdown ?? content.markdownNotSupportedFallback;
+				}
+			} else {
+				managedContent = content.element(token);
 			}
 
 			// compute the content
-			this._cancellationTokenSource = new CancellationTokenSource();
-			const token = this._cancellationTokenSource.token;
-			resolvedContent = await content.markdown(token);
-			if (resolvedContent === undefined) {
-				resolvedContent = content.markdownNotSupportedFallback;
+			if (managedContent instanceof Promise) {
+
+				// show 'Loading' if no hover is up yet
+				if (!this._hoverWidget) {
+					this.show(localize('iconLabel.loading', "Loading..."), focus, options);
+				}
+
+				resolvedContent = await managedContent;
+			} else {
+				resolvedContent = managedContent;
 			}
 
 			if (this.isDisposed || token.isCancellationRequested) {
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts b/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
index f7375016f1a0..198e34c731b8 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
@@ -133,7 +133,7 @@ export class StatusbarEntryItem extends Disposable {
 
 			const hoverContents = isMarkdownString(hoverTooltip) ? { markdown: hoverTooltip, markdownNotSupportedFallback: undefined } : hoverTooltip;
 			if (this.hover) {
-				this.hover.update(typeof hoverContents === 'function' ? hoverContents() : hoverContents, hoverOptions);
+				this.hover.update(hoverContents, hoverOptions);
 			} else {
 				this.hover = this._register(this.hoverService.setupManagedHover(this.hoverDelegate, this.container, hoverContents, hoverOptions));
 			}
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index e66eaea94ee4..ba3d0d62c8cd 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -35,7 +35,7 @@ import { StatusbarEntryItem } from './statusbarItem.js';
 import { StatusBarFocused } from '../../../common/contextkeys.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { IView } from '../../../../base/browser/ui/grid/grid.js';
-import { isManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
+import { isManagedHoverTooltipHTMLElement, isManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
 
 export interface IStatusbarEntryContainer extends IDisposable {
 
@@ -152,7 +152,8 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 			if (
 				typeof content === 'function' ||
 				isHTMLElement(content) ||
-				(isManagedHoverTooltipMarkdownString(content) && typeof content.markdown === 'function')
+				(isManagedHoverTooltipMarkdownString(content) && typeof content.markdown === 'function') ||
+				isManagedHoverTooltipHTMLElement(content)
 			) {
 				// override the delay for content that is rich (e.g. html or long running)
 				// so that it appears more instantly. these hovers carry more important
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 2a6fe9bc56b8..122d75815f4a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -639,7 +639,9 @@ class ChatSetupRequests extends Disposable {
 				}
 			}, token);
 		} catch (error) {
-			this.logService.error(`[chat setup] request: error ${error}`);
+			if (!token.isCancellationRequested) {
+				this.logService.error(`[chat setup] request: error ${error}`);
+			}
 
 			return undefined;
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 8345bb4c90bc..bf3b280f3099 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -5,7 +5,7 @@
 
 import './media/chatStatus.css';
 import { safeIntl } from '../../../../base/common/date.js';
-import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { language, OS } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.js';
 import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
@@ -17,7 +17,7 @@ import { IChatQuotasService } from '../common/chatQuotasService.js';
 import { quotaToButtonMessage, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, TOGGLE_CHAT_ACTION_ID, CHAT_OPEN_ACTION_ID } from './actions/chatActions.js';
 import { $, addDisposableListener, append, EventHelper, EventLike, EventType } from '../../../../base/browser/dom.js';
 import { IChatEntitlementsService } from '../common/chatEntitlementsService.js';
-import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { defaultCheckboxStyles, defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { Checkbox } from '../../../../base/browser/ui/toggle/toggle.js';
@@ -157,8 +157,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	}
 
 	private getEntryProps(): IStatusbarEntry {
-		const disposables = new DisposableStore();
-		this.entryDisposables.value = disposables;
+		this.entryDisposables.clear();
 
 		let text = '$(copilot)';
 		let ariaLabel = localize('chatStatus', "Copilot Status");
@@ -202,72 +201,74 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 		// Copilot Limited User
 		else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.limited.key) === true) {
-			tooltip = () => {
-				const container = $('div.chat-status-bar-entry-tooltip');
+			tooltip = {
+				element: token => {
+					const { container, disposables } = this.createContainer(token);
 
-				// Quota Indicator
-				{
-					const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate } = this.chatQuotasService.quotas;
+					// Quota Indicator
+					{
+						const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate } = this.chatQuotasService.quotas;
 
-					container.appendChild($('div.header', undefined, localize('usageTitle', "Copilot Free Usage")));
+						container.appendChild($('div.header', undefined, localize('usageTitle', "Copilot Free Usage")));
 
-					const chatQuotaIndicator = this.createQuotaIndicator(container, chatTotal, chatRemaining, localize('chatsLabel', "Chat messages"));
-					const completionsQuotaIndicator = this.createQuotaIndicator(container, completionsTotal, completionsRemaining, localize('completionsLabel', "Code completions"));
+						const chatQuotaIndicator = this.createQuotaIndicator(container, chatTotal, chatRemaining, localize('chatsLabel', "Chat messages"));
+						const completionsQuotaIndicator = this.createQuotaIndicator(container, completionsTotal, completionsRemaining, localize('completionsLabel', "Code completions"));
 
-					container.appendChild($('div.description', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.value.format(quotaResetDate))));
+						container.appendChild($('div.description', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.value.format(quotaResetDate))));
 
-					const cts = new CancellationTokenSource();
-					disposables.add(toDisposable(() => cts.dispose(true)));
-					this.chatEntitlementsService.resolve(cts.token).then(() => {
-						if (cts.token.isCancellationRequested) {
-							return;
-						}
+						this.chatEntitlementsService.resolve(token).then(() => {
+							if (token.isCancellationRequested) {
+								return;
+							}
 
-						const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = this.chatQuotasService.quotas;
+							const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = this.chatQuotasService.quotas;
 
-						chatQuotaIndicator(chatTotal, chatRemaining);
-						completionsQuotaIndicator(completionsTotal, completionsRemaining);
-					});
-				}
+							chatQuotaIndicator(chatTotal, chatRemaining);
+							completionsQuotaIndicator(completionsTotal, completionsRemaining);
+						});
+					}
 
-				// Settings
-				{
-					container.appendChild($('hr'));
-					container.appendChild($('div.header', undefined, localize('settingsTitle', "Settings")));
-					this.createSettings(container, disposables);
-				}
+					// Settings
+					{
+						container.appendChild($('hr'));
+						container.appendChild($('div.header', undefined, localize('settingsTitle', "Settings")));
+						this.createSettings(container, disposables);
+					}
 
-				// Shortcuts
-				{
-					container.appendChild($('hr'));
-					container.appendChild($('div.header', undefined, localize('keybindingsTitle', "Keybindings")));
-					this.createShortcuts(container, disposables);
-				}
+					// Shortcuts
+					{
+						container.appendChild($('hr'));
+						container.appendChild($('div.header', undefined, localize('keybindingsTitle', "Keybindings")));
+						this.createShortcuts(container, disposables);
+					}
 
-				return container;
+					return container;
+				}
 			};
 			command = ShowTooltipCommand;
 		}
 
 		// Any other User
 		else {
-			tooltip = () => {
-				const container = $('div.chat-status-bar-entry-tooltip');
-
-				// Settings
-				{
-					container.appendChild($('div.header', undefined, localize('settingsTitle', "Settings")));
-					this.createSettings(container, disposables);
-				}
-
-				// Shortcuts
-				{
-					container.appendChild($('hr'));
-					container.appendChild($('div.header', undefined, localize('keybindingsTitle', "Keybindings")));
-					this.createShortcuts(container, disposables);
+			tooltip = {
+				element: token => {
+					const { container, disposables } = this.createContainer(token);
+
+					// Settings
+					{
+						container.appendChild($('div.header', undefined, localize('settingsTitle', "Settings")));
+						this.createSettings(container, disposables);
+					}
+
+					// Shortcuts
+					{
+						container.appendChild($('hr'));
+						container.appendChild($('div.header', undefined, localize('keybindingsTitle', "Keybindings")));
+						this.createShortcuts(container, disposables);
+					}
+
+					return container;
 				}
-
-				return container;
 			};
 			command = ShowTooltipCommand;
 		}
@@ -283,6 +284,16 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		};
 	}
 
+	private createContainer(token: CancellationToken): { container: HTMLElement; disposables: DisposableStore } {
+		const disposables = this.entryDisposables.value = new DisposableStore();
+		disposables.add(token.onCancellationRequested(() => disposables.dispose()));
+
+		return {
+			container: $('div.chat-status-bar-entry-tooltip'),
+			disposables
+		};
+	}
+
 	private createQuotaIndicator(container: HTMLElement, total: number | undefined, remaining: number | undefined, label: string): (total: number | undefined, remaining: number | undefined) => void {
 		const quotaText = $('span');
 		const quotaBit = $('div.quota-bit');
diff --git a/src/vs/workbench/services/statusbar/browser/statusbar.ts b/src/vs/workbench/services/statusbar/browser/statusbar.ts
index 0cb6914db5cf..c016e25f756d 100644
--- a/src/vs/workbench/services/statusbar/browser/statusbar.ts
+++ b/src/vs/workbench/services/statusbar/browser/statusbar.ts
@@ -8,7 +8,7 @@ import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.
 import { ThemeColor } from '../../../../base/common/themables.js';
 import { Command } from '../../../../editor/common/languages.js';
 import { IMarkdownString } from '../../../../base/common/htmlContent.js';
-import { IManagedHoverContentOrFactory } from '../../../../base/browser/ui/hover/hover.js';
+import { IManagedHoverTooltipHTMLElement, IManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
 import { ColorIdentifier } from '../../../../platform/theme/common/colorRegistry.js';
 import { IAuxiliaryStatusbarPart, IStatusbarEntryContainer } from '../../../browser/parts/statusbar/statusbarPart.js';
 
@@ -116,7 +116,7 @@ export interface IStatusbarStyleOverride {
 export type StatusbarEntryKind = 'standard' | 'warning' | 'error' | 'prominent' | 'remote' | 'offline';
 export const StatusbarEntryKinds: StatusbarEntryKind[] = ['standard', 'warning', 'error', 'prominent', 'remote', 'offline'];
 
-export type TooltipContent = IMarkdownString | IManagedHoverContentOrFactory;
+export type TooltipContent = string | IMarkdownString | HTMLElement | IManagedHoverTooltipMarkdownString | IManagedHoverTooltipHTMLElement;
 
 export interface ITooltipWithCommands {
 	readonly content: TooltipContent;

From 3b94dcb7e1877213caae98ab3b86ae9ffa7d5f80 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 28 Feb 2025 16:32:11 +0100
Subject: [PATCH 0541/1815] chore - only have `originalModel` and
 `modifiedModel` (#242325)

---
 .../chatEditingModifiedDocumentEntry.ts       | 81 +++++++++----------
 1 file changed, 37 insertions(+), 44 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
index 555bc876a166..706b1f2653af 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
@@ -71,17 +71,10 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 
 	readonly initialContent: string;
 
-	private readonly docSnapshot: ITextModel;
-	private readonly doc: ITextModel;
-	readonly docFileEditorModel: IResolvedTextFileEditorModel;
-
-	get originalModel(): ITextModel {
-		return this.docSnapshot;
-	}
+	private readonly originalModel: ITextModel;
+	private readonly modifiedModel: ITextModel;
 
-	get modifiedModel(): ITextModel {
-		return this.doc;
-	}
+	readonly docFileEditorModel: IResolvedTextFileEditorModel;
 
 	private _edit: OffsetEdit = OffsetEdit.empty;
 	private _isEditFromUs: boolean = false;
@@ -93,7 +86,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 
 	readonly changesCount = this._diffInfo.map(diff => diff.changes.length);
 
-	private readonly _editDecorationClear = this._register(new RunOnceScheduler(() => { this._editDecorations = this.doc.deltaDecorations(this._editDecorations, []); }, 500));
+	private readonly _editDecorationClear = this._register(new RunOnceScheduler(() => { this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []); }, 500));
 	private _editDecorations: string[] = [];
 
 
@@ -130,14 +123,14 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		);
 
 		this.docFileEditorModel = this._register(resourceRef).object as IResolvedTextFileEditorModel;
-		this.doc = resourceRef.object.textEditorModel;
+		this.modifiedModel = resourceRef.object.textEditorModel;
 		this.originalURI = ChatEditingTextModelContentProvider.getFileURI(telemetryInfo.sessionId, this.entryId, this.modifiedURI.path);
 
-		this.initialContent = initialContent ?? this.doc.getValue();
-		const docSnapshot = this.docSnapshot = this._register(
+		this.initialContent = initialContent ?? this.modifiedModel.getValue();
+		const docSnapshot = this.originalModel = this._register(
 			modelService.createModel(
-				createTextBufferFactoryFromSnapshot(initialContent ? stringToSnapshot(initialContent) : this.doc.createSnapshot()),
-				languageService.createById(this.doc.getLanguageId()),
+				createTextBufferFactoryFromSnapshot(initialContent ? stringToSnapshot(initialContent) : this.modifiedModel.createSnapshot()),
+				languageService.createById(this.modifiedModel.getLanguageId()),
 				this.originalURI,
 				false
 			)
@@ -154,7 +147,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		})();
 
 
-		this._register(this.doc.onDidChangeContent(e => this._mirrorEdits(e)));
+		this._register(this.modifiedModel.onDidChangeContent(e => this._mirrorEdits(e)));
 
 		this._register(toDisposable(() => {
 			this._clearCurrentEditLineDecoration();
@@ -168,7 +161,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 	}
 
 	private _clearCurrentEditLineDecoration() {
-		this._editDecorations = this.doc.deltaDecorations(this._editDecorations, []);
+		this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []);
 	}
 
 	equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean {
@@ -196,7 +189,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 
 	restoreFromSnapshot(snapshot: ISnapshotEntry) {
 		this._stateObs.set(snapshot.state, undefined);
-		this.docSnapshot.setValue(snapshot.original);
+		this.originalModel.setValue(snapshot.original);
 		this._setDocValue(snapshot.current);
 		this._edit = snapshot.originalToCurrentEdit;
 		this._updateDiffInfoSeq();
@@ -247,21 +240,21 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 			const e_ai = this._edit;
 			const e_user = edit;
 
-			const e_user_r = e_user.tryRebase(e_ai.inverse(this.docSnapshot.getValue()), true);
+			const e_user_r = e_user.tryRebase(e_ai.inverse(this.originalModel.getValue()), true);
 
 			if (e_user_r === undefined) {
 				// user edits overlaps/conflicts with AI edits
 				this._edit = e_ai.compose(e_user);
 			} else {
-				const edits = OffsetEdits.asEditOperations(e_user_r, this.docSnapshot);
-				this.docSnapshot.applyEdits(edits);
+				const edits = OffsetEdits.asEditOperations(e_user_r, this.originalModel);
+				this.originalModel.applyEdits(edits);
 				this._edit = e_ai.tryRebase(e_user_r);
 			}
 
 			this._allEditsAreFromUs = false;
 			this._updateDiffInfoSeq();
 
-			const didResetToOriginalContent = this.doc.getValue() === this.initialContent;
+			const didResetToOriginalContent = this.modifiedModel.getValue() === this.initialContent;
 			const currentState = this._stateObs.get();
 			switch (currentState) {
 				case WorkingSetEntryState.Modified:
@@ -279,7 +272,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		// push stack element whenever streaming starts
 		const request = responseModel.session.getRequests().find(req => req.id === responseModel.requestId);
 		const label = request?.message.text ? localize('chatEditing1', "Chat Edit: '{0}'", request.message.text) : localize('chatEditing2', "Chat Edit");
-		this._undoRedoService.pushElement(new SingleModelEditStackElement(label, 'chat.edit', this.doc, null));
+		this._undoRedoService.pushElement(new SingleModelEditStackElement(label, 'chat.edit', this.modifiedModel, null));
 	}
 
 	async acceptAgentEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void> {
@@ -308,14 +301,14 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 			});
 		}
 
-		this._editDecorations = this.doc.deltaDecorations(this._editDecorations, newDecorations);
+		this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, newDecorations);
 
 
 		transaction((tx) => {
 			if (!isLastEdits) {
 				this._stateObs.set(WorkingSetEntryState.Modified, tx);
 				this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
-				const lineCount = this.doc.getLineCount();
+				const lineCount = this.modifiedModel.getLineCount();
 				this._rewriteRatioObs.set(Math.min(1, maxLineNumber / lineCount), tx);
 
 			} else {
@@ -337,7 +330,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 			const newText = this.modifiedModel.getValueInRange(edit.modifiedRange);
 			edits.push(EditOperation.replace(edit.originalRange, newText));
 		}
-		this.docSnapshot.pushEditOperations(null, edits, _ => null);
+		this.originalModel.pushEditOperations(null, edits, _ => null);
 		await this._updateDiffInfoSeq();
 		if (this._diffInfo.get().identical) {
 			this._stateObs.set(WorkingSetEntryState.Accepted, undefined);
@@ -351,10 +344,10 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		}
 		const edits: ISingleEditOperation[] = [];
 		for (const edit of change.innerChanges ?? []) {
-			const newText = this.docSnapshot.getValueInRange(edit.originalRange);
+			const newText = this.originalModel.getValueInRange(edit.originalRange);
 			edits.push(EditOperation.replace(edit.modifiedRange, newText));
 		}
-		this.doc.pushEditOperations(null, edits, _ => null);
+		this.modifiedModel.pushEditOperations(null, edits, _ => null);
 		await this._updateDiffInfoSeq();
 		if (this._diffInfo.get().identical) {
 			this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
@@ -367,7 +360,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		this._isEditFromUs = true;
 		try {
 			let result: ISingleEditOperation[] = [];
-			this.doc.pushEditOperations(null, edits, (undoEdits) => {
+			this.modifiedModel.pushEditOperations(null, edits, (undoEdits) => {
 				result = undoEdits;
 				return null;
 			});
@@ -389,38 +382,38 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 
 	private async _updateDiffInfo(): Promise<IDocumentDiff | undefined> {
 
-		if (this.docSnapshot.isDisposed() || this.doc.isDisposed()) {
+		if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed()) {
 			return undefined;
 		}
 
-		const docVersionNow = this.doc.getVersionId();
-		const snapshotVersionNow = this.docSnapshot.getVersionId();
+		const docVersionNow = this.modifiedModel.getVersionId();
+		const snapshotVersionNow = this.originalModel.getVersionId();
 
 		const ignoreTrimWhitespace = this._diffTrimWhitespace.get();
 
 		const diff = await this._editorWorkerService.computeDiff(
-			this.docSnapshot.uri,
-			this.doc.uri,
+			this.originalModel.uri,
+			this.modifiedModel.uri,
 			{ ignoreTrimWhitespace, computeMoves: false, maxComputationTimeMs: 3000 },
 			'advanced'
 		);
 
-		if (this.docSnapshot.isDisposed() || this.doc.isDisposed()) {
+		if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed()) {
 			return undefined;
 		}
 
 		// only update the diff if the documents didn't change in the meantime
-		if (this.doc.getVersionId() === docVersionNow && this.docSnapshot.getVersionId() === snapshotVersionNow) {
+		if (this.modifiedModel.getVersionId() === docVersionNow && this.originalModel.getVersionId() === snapshotVersionNow) {
 			const diff2 = diff ?? nullDocumentDiff;
 			this._diffInfo.set(diff2, undefined);
-			this._edit = OffsetEdits.fromLineRangeMapping(this.docSnapshot, this.doc, diff2.changes);
+			this._edit = OffsetEdits.fromLineRangeMapping(this.originalModel, this.modifiedModel, diff2.changes);
 			return diff2;
 		}
 		return undefined;
 	}
 
 	protected override async _doAccept(tx: ITransaction | undefined): Promise<void> {
-		this.docSnapshot.setValue(this.doc.createSnapshot());
+		this.originalModel.setValue(this.modifiedModel.createSnapshot());
 		this._diffInfo.set(nullDocumentDiff, tx);
 		this._edit = OffsetEdit.empty;
 		await this._collapse(tx);
@@ -432,7 +425,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 			await this._fileService.del(this.modifiedURI);
 			this._onDidDelete.fire();
 		} else {
-			this._setDocValue(this.docSnapshot.getValue());
+			this._setDocValue(this.originalModel.getValue());
 			if (this._allEditsAreFromUs) {
 				// save the file after discarding so that the dirty indicator goes away
 				// and so that an intermediate saved state gets reverted
@@ -443,14 +436,14 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 	}
 
 	private _setDocValue(value: string): void {
-		if (this.doc.getValue() !== value) {
+		if (this.modifiedModel.getValue() !== value) {
 
-			this.doc.pushStackElement();
-			const edit = EditOperation.replace(this.doc.getFullModelRange(), value);
+			this.modifiedModel.pushStackElement();
+			const edit = EditOperation.replace(this.modifiedModel.getFullModelRange(), value);
 
 			this._applyEdits([edit]);
 			this._updateDiffInfoSeq();
-			this.doc.pushStackElement();
+			this.modifiedModel.pushStackElement();
 		}
 	}
 

From fa24065b85cc63b7c5005029cb5d6996703e75bd Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Fri, 28 Feb 2025 16:48:47 +0100
Subject: [PATCH 0542/1815] Fix some cases where tokens aren't updating
 (#242327)

Fixes microsoft/vscode-internalbacklog#5352
---
 src/vs/editor/common/languages.ts             |  2 +-
 .../model/treeSitterTokenStoreService.ts      |  9 ++++
 .../editor/common/model/treeSitterTokens.ts   |  5 +-
 .../treeSitter/treeSitterParserService.ts     |  2 +-
 .../browser/treeSitterCodeEditors.ts          | 50 +++++++++++--------
 .../browser/treeSitterTokenizationFeature.ts  | 21 +++-----
 .../treeSitterTokenizationFeature.test.ts     |  3 ++
 7 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/src/vs/editor/common/languages.ts b/src/vs/editor/common/languages.ts
index 331c3f199c5f..10f7119dd2c2 100644
--- a/src/vs/editor/common/languages.ts
+++ b/src/vs/editor/common/languages.ts
@@ -110,7 +110,7 @@ export interface ITreeSitterTokenizationSupport {
 	captureAtPosition(lineNumber: number, column: number, textModel: model.ITextModel): QueryCapture[];
 	captureAtPositionTree(lineNumber: number, column: number, tree: Parser.Tree): QueryCapture[];
 	onDidChangeTokens: Event<{ textModel: model.ITextModel; changes: IModelTokensChangedEvent }>;
-	onDidCompleteFirstTokenization: Event<{ textModel: model.ITextModel }>;
+	onDidChangeBackgroundTokenization: Event<{ textModel: model.ITextModel }>;
 	tokenizeEncodedInstrumented(lineNumber: number, textModel: model.ITextModel): { result: Uint32Array; captureTime: number; metadataTime: number } | undefined;
 }
 
diff --git a/src/vs/editor/common/model/treeSitterTokenStoreService.ts b/src/vs/editor/common/model/treeSitterTokenStoreService.ts
index 8c544cdb4164..d0fa8b42c6d4 100644
--- a/src/vs/editor/common/model/treeSitterTokenStoreService.ts
+++ b/src/vs/editor/common/model/treeSitterTokenStoreService.ts
@@ -19,6 +19,7 @@ export interface ITreeSitterTokenizationStoreService {
 	getNeedsRefresh(model: ITextModel): { range: Range; startOffset: number; endOffset: number }[];
 	hasTokens(model: ITextModel, accurateForRange?: Range): boolean;
 	rangeHasTokens(model: ITextModel, range: Range, minimumTokenQuality: TokenQuality): boolean;
+	delete(model: ITextModel): void;
 }
 
 export const ITreeSitterTokenizationStoreService = createDecorator<ITreeSitterTokenizationStoreService>('treeSitterTokenizationStoreService');
@@ -158,6 +159,14 @@ class TreeSitterTokenizationStoreService implements ITreeSitterTokenizationStore
 		}));
 	}
 
+	delete(model: ITextModel): void {
+		const storeInfo = this.tokens.get(model);
+		if (storeInfo) {
+			storeInfo.disposables.dispose();
+			this.tokens.delete(model);
+		}
+	}
+
 	dispose(): void {
 		for (const [, value] of this.tokens) {
 			value.disposables.dispose();
diff --git a/src/vs/editor/common/model/treeSitterTokens.ts b/src/vs/editor/common/model/treeSitterTokens.ts
index 105a81b2f07d..1fe9c3cbb05c 100644
--- a/src/vs/editor/common/model/treeSitterTokens.ts
+++ b/src/vs/editor/common/model/treeSitterTokens.ts
@@ -24,7 +24,7 @@ export class TreeSitterTokens extends AbstractTokens {
 
 	private _lastLanguageId: string | undefined;
 	private readonly _tokensChangedListener: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
-	private readonly _firstTokenizationCompleteListener: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
+	private readonly _onDidChangeBackgroundTokenization: MutableDisposable<IDisposable> = this._register(new MutableDisposable());
 
 	constructor(languageIdCodec: ILanguageIdCodec,
 		textModel: TextModel,
@@ -45,11 +45,10 @@ export class TreeSitterTokens extends AbstractTokens {
 					this._onDidChangeTokens.fire(e.changes);
 				}
 			});
-			this._firstTokenizationCompleteListener.value = this._tokenizationSupport?.onDidCompleteFirstTokenization(e => {
+			this._onDidChangeBackgroundTokenization.value = this._tokenizationSupport?.onDidChangeBackgroundTokenization(e => {
 				if (e.textModel === this._textModel) {
 					this._backgroundTokenizationState = BackgroundTokenizationState.Completed;
 					this._onDidChangeBackgroundTokenizationState.fire();
-					this._firstTokenizationCompleteListener.clear();
 				}
 			});
 		}
diff --git a/src/vs/editor/common/services/treeSitter/treeSitterParserService.ts b/src/vs/editor/common/services/treeSitter/treeSitterParserService.ts
index 2df635ed6d9c..49c61dd249b7 100644
--- a/src/vs/editor/common/services/treeSitter/treeSitterParserService.ts
+++ b/src/vs/editor/common/services/treeSitter/treeSitterParserService.ts
@@ -88,7 +88,7 @@ export class TextModelTreeSitter extends Disposable implements ITextModelTreeSit
 		const treeSitterTree = this._parseSessionDisposables.add(new TreeSitterParseResult(new Parser(), language, this._logService, this._telemetryService));
 		this._parseResult = treeSitterTree;
 		this._parseSessionDisposables.add(treeSitterTree.onDidUpdate(e => {
-			if (e.ranges && (e.versionId > this._versionId)) {
+			if (e.ranges && (e.versionId >= this._versionId)) {
 				this._versionId = e.versionId;
 				this._onDidChangeParseResult.fire({ ranges: e.ranges, versionId: e.versionId });
 			}
diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterCodeEditors.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterCodeEditors.ts
index 46d0abab0e6d..62abcbb881c2 100644
--- a/src/vs/workbench/services/treeSitter/browser/treeSitterCodeEditors.ts
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterCodeEditors.ts
@@ -8,7 +8,6 @@ import { Disposable, DisposableMap, DisposableStore } from '../../../../base/com
 import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { ITextModel } from '../../../../editor/common/model.js';
-import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { ITreeSitterParserService } from '../../../../editor/common/services/treeSitterParserService.js';
 
@@ -18,9 +17,12 @@ export interface IViewPortChangeEvent {
 }
 
 export class TreeSitterCodeEditors extends Disposable {
-	private readonly _editors = this._register(new DisposableMap<ICodeEditor>());
+	private readonly _languageEditors = this._register(new DisposableMap<ICodeEditor>());
+	private readonly _allEditors = this._register(new DisposableMap<ICodeEditor>());
 	private readonly _onDidChangeViewport = this._register(new Emitter<IViewPortChangeEvent>());
 	public readonly onDidChangeViewport = this._onDidChangeViewport.event;
+	private readonly _onDidRemoveEditor = this._register(new Emitter<ITextModel>());
+	public readonly onDidRemoveEditor = this._onDidRemoveEditor.event;
 
 	constructor(private readonly _languageId: string,
 		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
@@ -32,7 +34,7 @@ export class TreeSitterCodeEditors extends Disposable {
 	}
 
 	get editors(): ICodeEditor[] {
-		return Array.from(this._editors.keys());
+		return Array.from(this._languageEditors.keys());
 	}
 
 	public async getInitialViewPorts(): Promise<IViewPortChangeEvent[]> {
@@ -52,7 +54,7 @@ export class TreeSitterCodeEditors extends Disposable {
 	}
 
 	private _onCodeEditorRemove(editor: ICodeEditor): void {
-		this._editors.deleteAndDispose(editor);
+		this._languageEditors.deleteAndDispose(editor);
 	}
 
 	private async getEditorModel(editor: ICodeEditor): Promise<ITextModel | undefined> {
@@ -62,32 +64,40 @@ export class TreeSitterCodeEditors extends Disposable {
 			await Event.toPromise(Event.once(editor.onDidChangeModel), disposableStore);
 			model = editor.getModel() ?? undefined;
 		}
-
-		if (!model) {
-			return;
-		}
-
-		let language = model.getLanguageId();
-		if (language === PLAINTEXT_LANGUAGE_ID) {
-			const disposableStore = this._register(new DisposableStore());
-			await Event.toPromise(Event.once(model.onDidChangeLanguage), disposableStore);
-			language = model.getLanguageId();
-		}
-
-		if (language !== this._languageId) {
-			return;
-		}
 		return model;
 	}
 
 	private async _onCodeEditorAdd(editor: ICodeEditor): Promise<void> {
 		const model = await this.getEditorModel(editor);
 		if (model) {
-			this._editors.set(editor, editor.onDidScrollChange(() => this._onViewportChange(editor), this));
+			const otherEditorDisposables = new DisposableStore();
+			otherEditorDisposables.add(model.onDidChangeLanguage(() => this._onLanguageChange(editor, model), this));
+			this._allEditors.set(editor, otherEditorDisposables);
+
+			this._tryAddEditor(editor, model);
+		}
+	}
+
+	private _tryAddEditor(editor: ICodeEditor, model: ITextModel): void {
+		const language = model.getLanguageId();
+		if (language === this._languageId) {
+			const langaugeEditorDisposables = new DisposableStore();
+			langaugeEditorDisposables.add(editor.onDidScrollChange(() => this._onViewportChange(editor), this));
+			this._languageEditors.set(editor, langaugeEditorDisposables);
 			this._onViewportChange(editor);
 		}
 	}
 
+	private async _onLanguageChange(editor: ICodeEditor, model: ITextModel): Promise<void> {
+		const language = model.getLanguageId();
+		if ((language !== this._languageId) && this._languageEditors.has(editor)) {
+			this._languageEditors.deleteAndDispose(editor);
+			this._onDidRemoveEditor.fire(model);
+		} else if (!this._languageEditors.has(editor)) {
+			this._tryAddEditor(editor, model);
+		}
+	}
+
 	private async _onViewportChange(editor: ICodeEditor): Promise<void> {
 		const ranges = this._nonIntersectingViewPortRanges(editor);
 		this._onDidChangeViewport.fire({ model: editor.getModel()!, ranges });
diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
index 28652a63c900..c623dde498d4 100644
--- a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
@@ -111,8 +111,8 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 	private _query: Parser.Query | undefined;
 	private readonly _onDidChangeTokens: Emitter<{ textModel: ITextModel; changes: IModelTokensChangedEvent }> = this._register(new Emitter());
 	public readonly onDidChangeTokens: Event<{ textModel: ITextModel; changes: IModelTokensChangedEvent }> = this._onDidChangeTokens.event;
-	private readonly _onDidCompleteFirstTokenization: Emitter<{ textModel: ITextModel }> = this._register(new Emitter());
-	public readonly onDidCompleteFirstTokenization: Event<{ textModel: ITextModel }> = this._onDidCompleteFirstTokenization.event;
+	private readonly _onDidCompleteBackgroundTokenization: Emitter<{ textModel: ITextModel }> = this._register(new Emitter());
+	public readonly onDidChangeBackgroundTokenization: Event<{ textModel: ITextModel }> = this._onDidCompleteBackgroundTokenization.event;
 	private _colorThemeData!: ColorThemeData;
 	private _languageAddedListener: IDisposable | undefined;
 	private _codeEditors: TreeSitterCodeEditors;
@@ -133,13 +133,15 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 		this._register(this._codeEditors.onDidChangeViewport(e => {
 			this._parseAndTokenizeViewPort(e.model, e.ranges);
 		}));
+		this._register(this._codeEditors.onDidRemoveEditor(e => {
+			this._tokenizationStoreService.delete(e);
+		}));
 		this._codeEditors.getInitialViewPorts().then(async (viewports) => {
 			for (const viewport of viewports) {
 				this._parseAndTokenizeViewPort(viewport.model, viewport.ranges);
 			}
 		});
 		this._register(Event.runAndSubscribe(this._themeService.onDidColorThemeChange, (e) => this._updateTheme(e)));
-		let hasDoneFullTokenization = false;
 		this._register(this._treeSitterService.onDidUpdateTree((e) => {
 			if (e.textModel.getLanguageId() !== this._languageId) {
 				return;
@@ -154,20 +156,12 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 				return;
 			}
 
-			let updatePromise: Promise<void>;
 			// First time we see a tree we need to build a token store.
 			if (!this._tokenizationStoreService.hasTokens(e.textModel)) {
 				// This will likely not happen as we first handle all models, which are ready before trees.
-				updatePromise = this._firstTreeUpdate(e.textModel, e.versionId);
+				this._firstTreeUpdate(e.textModel, e.versionId);
 			} else {
-				updatePromise = this._handleTreeUpdate(e);
-			}
-
-			if (!hasDoneFullTokenization) {
-				hasDoneFullTokenization = true;
-				updatePromise.then(() => {
-					this._onDidCompleteFirstTokenization.fire({ textModel: e.textModel });
-				});
+				this._handleTreeUpdate(e);
 			}
 		}));
 	}
@@ -368,6 +362,7 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 			});
 			await new Promise<void>(resolve => setTimeout0(resolve));
 		}
+		this._onDidCompleteBackgroundTokenization.fire({ textModel });
 	}
 
 	private _refreshNeedsRefresh(textModel: ITextModel, versionId: number) {
diff --git a/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts b/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts
index 64bf6d3111f0..bb85bcff128c 100644
--- a/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts
+++ b/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts
@@ -72,6 +72,9 @@ class MockTelemetryService implements ITelemetryService {
 }
 
 class MockTokenStoreService implements ITreeSitterTokenizationStoreService {
+	delete(model: ITextModel): void {
+		throw new Error('Method not implemented.');
+	}
 	rangeHasTokens(model: ITextModel, range: Range, minimumTokenQuality: TokenQuality): boolean {
 		return true;
 	}

From b1ede3cee4b02e52bd9e18c78f4a111a911c5150 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 28 Feb 2025 17:21:17 +0100
Subject: [PATCH 0543/1815] Event leak in HistoryNavigator (fix #241677)
 (#242332)

---
 src/vs/base/browser/ui/inputbox/inputBox.ts           |  2 +-
 src/vs/base/common/history.ts                         | 11 ++++++++++-
 .../suggestEnabledInput/suggestEnabledInput.ts        |  2 +-
 src/vs/workbench/contrib/debug/browser/repl.ts        |  2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts
index 5ccf89beee48..4081c2f28b22 100644
--- a/src/vs/base/browser/ui/inputbox/inputBox.ts
+++ b/src/vs/base/browser/ui/inputbox/inputBox.ts
@@ -650,7 +650,7 @@ export class HistoryInputBox extends InputBox implements IHistoryNavigationWidge
 		}, ' ({0} for history)', `\u21C5`);
 
 		super(container, contextViewProvider, options);
-		this.history = new HistoryNavigator<string>(options.history, 100);
+		this.history = this._register(new HistoryNavigator<string>(options.history, 100));
 
 		// Function to append the history suffix to the placeholder if necessary
 		const addSuffix = () => {
diff --git a/src/vs/base/common/history.ts b/src/vs/base/common/history.ts
index a705839b71e3..3c23e8e3a29a 100644
--- a/src/vs/base/common/history.ts
+++ b/src/vs/base/common/history.ts
@@ -5,6 +5,7 @@
 
 import { SetWithKey } from './collections.js';
 import { Event } from './event.js';
+import { IDisposable } from './lifecycle.js';
 import { ArrayNavigator, INavigator } from './navigator.js';
 
 export interface IHistory<T> {
@@ -20,6 +21,7 @@ export interface IHistory<T> {
 export class HistoryNavigator<T> implements INavigator<T> {
 	private _limit: number;
 	private _navigator!: ArrayNavigator<T>;
+	private _disposable: IDisposable | undefined;
 
 	constructor(
 		private _history: IHistory<T> = new Set(),
@@ -28,7 +30,7 @@ export class HistoryNavigator<T> implements INavigator<T> {
 		this._limit = limit;
 		this._onChange();
 		if (this._history.onDidChange) {
-			this._history.onDidChange(() => this._onChange());
+			this._disposable = this._history.onDidChange(() => this._onChange());
 		}
 	}
 
@@ -119,6 +121,13 @@ export class HistoryNavigator<T> implements INavigator<T> {
 		this._history.forEach(e => elements.push(e));
 		return elements;
 	}
+
+	public dispose(): void {
+		if (this._disposable) {
+			this._disposable.dispose();
+			this._disposable = undefined;
+		}
+	}
 }
 
 interface HistoryNode<T> {
diff --git a/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts b/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts
index 8241f44ff195..2bea83e98e1c 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts
@@ -361,7 +361,7 @@ export class SuggestEnabledInputWithHistory extends SuggestEnabledInput implemen
 		@IConfigurationService configurationService: IConfigurationService
 	) {
 		super(id, parent, suggestionProvider, ariaLabel, resourceHandle, suggestOptions, instantiationService, modelService, contextKeyService, languageFeaturesService, configurationService);
-		this.history = new HistoryNavigator<string>(new Set(history), 100);
+		this.history = this._register(new HistoryNavigator<string>(new Set(history), 100));
 	}
 
 	public addToHistory(): void {
diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
index a7dbf5cdc76b..930812de0f99 100644
--- a/src/vs/workbench/contrib/debug/browser/repl.ts
+++ b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -155,7 +155,7 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 
 		this.menu = menuService.createMenu(MenuId.DebugConsoleContext, contextKeyService);
 		this._register(this.menu);
-		this.history = new HistoryNavigator(new Set(JSON.parse(this.storageService.get(HISTORY_STORAGE_KEY, StorageScope.WORKSPACE, '[]'))), 100);
+		this.history = this._register(new HistoryNavigator(new Set(JSON.parse(this.storageService.get(HISTORY_STORAGE_KEY, StorageScope.WORKSPACE, '[]'))), 100));
 		this.filter = new ReplFilter();
 		this.filter.filterQuery = filterText;
 		this.multiSessionRepl = CONTEXT_MULTI_SESSION_REPL.bindTo(contextKeyService);

From 0a535f715759afbf4acb2147dc87516ee606ce68 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 28 Feb 2025 08:25:09 -0800
Subject: [PATCH 0544/1815] chat: avoid showing 'hints' in problem attachment,
 simplify 'all errors' action (#242253)

---
 .../chat/browser/contrib/chatDynamicVariables.ts    | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
index 7d2709132c67..96c04a3fbba8 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
@@ -684,7 +684,7 @@ export class AddDynamicVariableAction extends Action2 {
 registerAction2(AddDynamicVariableAction);
 
 export async function createMarkersQuickPick(accessor: ServicesAccessor, level: 'problem' | 'file', onBackgroundAccept?: (item: IDiagnosticVariableEntryFilterData[]) => void): Promise<IDiagnosticVariableEntryFilterData | undefined> {
-	const markers = accessor.get(IMarkerService).read();
+	const markers = accessor.get(IMarkerService).read({ severities: MarkerSeverity.Error | MarkerSeverity.Warning | MarkerSeverity.Info });
 	if (!markers.length) {
 		return;
 	}
@@ -739,16 +739,7 @@ export async function createMarkersQuickPick(accessor: ServicesAccessor, level:
 		items.unshift({ type: 'separator', label: localize('markers.panel.files', 'Files') });
 	}
 
-	if (severities.has(MarkerSeverity.Error)) {
-		items.unshift({ type: 'item', label: localize('markers.panel.allErrors', 'All Errors'), entry: { filterSeverity: MarkerSeverity.Error } });
-	}
-	if (severities.has(MarkerSeverity.Warning)) {
-		items.unshift({ type: 'item', label: localize('markers.panel.allWarnings', 'All Warnings'), entry: { filterSeverity: MarkerSeverity.Warning } });
-	}
-	if (severities.has(MarkerSeverity.Info)) {
-		items.unshift({ type: 'item', label: localize('markers.panel.allInfos', 'All Infos'), entry: { filterSeverity: MarkerSeverity.Info } });
-	}
-
+	items.unshift({ type: 'item', label: localize('markers.panel.allErrors', 'All Problems'), entry: { filterSeverity: MarkerSeverity.Info } });
 
 	const quickInputService = accessor.get(IQuickInputService);
 	const quickPick = quickInputService.createQuickPick<MarkerPickItem>({ useSeparators: true });

From 9f0f6966323653b654803e14a40a9e46030e7be6 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Fri, 28 Feb 2025 09:47:44 -0800
Subject: [PATCH 0545/1815] Set new search to true on Insiders (#242343)

---
 .../contrib/preferences/common/preferencesContribution.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts b/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
index 7231d92bcc9e..b57d8931d6c9 100644
--- a/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
+++ b/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
@@ -128,7 +128,7 @@ registry.registerConfiguration({
 		},
 		'workbench.settings.useWeightedKeySearch': {
 			'type': 'boolean',
-			'default': false,
+			'default': true,
 			'description': nls.localize('useWeightedKeySearch', "Controls whether to use an experimental ranking algorithm for search results in the Settings editor. The newer algorithm is still in development and aims to show fewer and more relevant results."),
 			'scope': ConfigurationScope.WINDOW,
 			'tags': ['experimental']

From 355e73c5e06d977b34f36a9675fc78f62018b7d9 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 28 Feb 2025 20:15:28 +0100
Subject: [PATCH 0546/1815] encoding - add tests for utf8bom (#242132)
 (#242347)

---
 .../src/singlefolder-tests/workspace.test.ts    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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 b75235f4473a..ceb3aea00d53 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
@@ -1498,4 +1498,21 @@ suite('vscode API - workspace', () => {
 		const updatedText = doc.getText();
 		assert.strictEqual(updatedText, text);
 	});
+
+	test('encoding: utf8bom does not explode (https://github.com/microsoft/vscode/issues/242132)', async function () {
+		const buffer = [0xEF, 0xBB, 0xBF, 72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100];
+		const uri = await createRandomFile(new Uint8Array(buffer) /* UTF-8 with BOM */);
+
+		let doc = await vscode.workspace.openTextDocument(uri);
+		assert.strictEqual(doc.encoding, 'utf8bom');
+
+		doc = await vscode.workspace.openTextDocument(uri, { encoding: 'utf8bom' });
+		assert.strictEqual(doc.encoding, 'utf8bom');
+
+		const decoded = await vscode.workspace.decode(new Uint8Array(buffer), uri, { encoding: 'utf8bom' });
+		assert.strictEqual(decoded, 'Hello World');
+
+		const encoded = await vscode.workspace.encode('Hello World', uri, { encoding: 'utf8bom' });
+		assert.ok(equalsUint8Array(encoded, new Uint8Array(buffer)));
+	});
 });

From 4c9de9e97ba0ea1c326b80bffc8b230c0024f750 Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Fri, 28 Feb 2025 13:01:57 -0800
Subject: [PATCH 0547/1815] fix: improve presentation of chat related file
 suggestions (#242354)

* fix: improve presentation of chat related file suggestions

* Pin extractor version

---------

Co-authored-by: Logan Ramos <lramos15@gmail.com>
---
 .github/workflows/telemetry.yml                     |  2 +-
 .../workbench/contrib/chat/browser/chatInputPart.ts | 13 +++++--------
 .../workbench/contrib/chat/browser/media/chat.css   |  8 +++++---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml
index d29ea6c58dac..a5ac3be41981 100644
--- a/.github/workflows/telemetry.yml
+++ b/.github/workflows/telemetry.yml
@@ -14,6 +14,6 @@ jobs:
           node-version: 'lts/*'
 
       - name: 'Run vscode-telemetry-extractor'
-        run: 'npx --package=@vscode/telemetry-extractor --yes vscode-telemetry-extractor -s .'
+        run: 'npx --package=@vscode/telemetry-extractor@1.14.0 --yes vscode-telemetry-extractor -s .'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index c30361f502fc..3f335c8d43b0 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -33,9 +33,7 @@ import { EditorOptions } from '../../../../editor/common/config/editorOptions.js
 import { IDimension } from '../../../../editor/common/core/dimension.js';
 import { IPosition } from '../../../../editor/common/core/position.js';
 import { IRange, 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 { CopyPasteController } from '../../../../editor/contrib/dropOrPasteInto/browser/copyPasteController.js';
@@ -337,7 +335,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		getContribsInputState: () => any,
 		@IChatWidgetHistoryService private readonly historyService: IChatWidgetHistoryService,
 		@IModelService private readonly modelService: IModelService,
-		@ILanguageService private readonly languageService: ILanguageService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -729,8 +726,8 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 					dom.h('.chat-input-container@inputContainer', [
 						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('.chat-attached-context@attachedContextContainer'),
 						]),
 						dom.h('.chat-editor-container@editorContainer'),
 						dom.h('.chat-input-toolbars@inputToolbars'),
@@ -1422,7 +1419,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 				hoverDelegate
 			}));
 			uriLabel.label = this.labelService.getUriBasenameLabel(uri);
-			uriLabel.element.classList.add('monaco-icon-label', ...getIconClasses(this.modelService, this.languageService, uri, FileKind.FILE));
+			uriLabel.element.classList.add('monaco-icon-label');
 			uriLabel.element.title = localize('suggeste.title', "{0} - {1}", this.labelService.getUriLabel(uri, { relative: true }), metadata.description ?? '');
 
 			this._chatEditsActionsDisposables.add(uriLabel.onDidClick(() => {
@@ -1449,10 +1446,10 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			sep.classList.add('separator');
 
 			const group = document.createElement('span');
-			group.classList.add('monaco-button-dropdown', 'sidebyside-button', 'show-file-icons');
-			group.appendChild(uriLabel.element);
-			group.appendChild(sep);
+			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(() => {
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 6ab881a12fcc..da52cbb6ca98 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -700,7 +700,6 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	flex-wrap: wrap;
 	align-items: center;
 	gap: 4px;
-	width: 100%;
 }
 
 .chat-related-files .monaco-button-dropdown .monaco-text-button {
@@ -725,8 +724,8 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	border-style: dashed;
 	align-items: center;
 	overflow: hidden;
-	padding: 0 0 0 2px;
 	gap: 2px;
+	padding: 0 4px;
 }
 
 .chat-related-files .monaco-button.codicon.codicon-add {
@@ -734,9 +733,11 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	flex-direction: column;
 	color: var(--vscode-descriptionForeground);
 	padding-top: 3px;
+	margin-left: -4px;
+	padding-left: 4px;
 	font-size: 14px; /* The + codicon is large, make it look more like the x codicon */
 	height: calc(100% - 3px);
-	width: 20px;
+	width: 17px;
 	outline-offset: -2px !important;
 }
 
@@ -1136,6 +1137,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 .action-item.chat-attached-context-attachment.chat-add-files .action-label {
 	color: var(--vscode-descriptionForeground);
 	font-family: unset;
+	gap: 5px;
 }
 
 .action-item.chat-attached-context-attachment.chat-add-files .action-label.codicon::before {

From cb28ffece29fc82ee26f04714487383ef98abc46 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 28 Feb 2025 13:10:21 -0800
Subject: [PATCH 0548/1815] Bundle TS 5.8.2

For #242359
---
 extensions/package-lock.json | 8 ++++----
 extensions/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/package-lock.json b/extensions/package-lock.json
index 2fe3d1616983..e3e87e1f52d3 100644
--- a/extensions/package-lock.json
+++ b/extensions/package-lock.json
@@ -10,7 +10,7 @@
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "typescript": "^5.7.3"
+        "typescript": "^5.8.2"
       },
       "devDependencies": {
         "@parcel/watcher": "2.5.1",
@@ -940,9 +940,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
-      "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
+      "version": "5.8.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz",
+      "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==",
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
diff --git a/extensions/package.json b/extensions/package.json
index 734351856417..d24575b17f50 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -4,7 +4,7 @@
   "license": "MIT",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "typescript": "^5.7.3"
+    "typescript": "^5.8.2"
   },
   "scripts": {
     "postinstall": "node ./postinstall.mjs"

From 0480008e3221e6743799332fc0018a98e8e90457 Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Fri, 28 Feb 2025 16:56:21 -0800
Subject: [PATCH 0549/1815] fix: rename Add Files to Add Context (#242355)

---
 .../contrib/chat/browser/actions/chatContextActions.ts      | 6 +++---
 src/vs/workbench/contrib/chat/browser/chatInputPart.ts      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index 85827db0582d..4f18fc10e5fd 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -968,9 +968,9 @@ export class AttachContextAction extends Action2 {
 registerAction2(class AttachFilesAction extends AttachContextAction {
 	constructor() {
 		super({
-			id: 'workbench.action.chat.editing.attachFiles',
-			title: localize2('workbench.action.chat.editing.attachFiles.label', "Add Files to Copilot Edits"),
-			shortTitle: localize2('workbench.action.chat.editing.attachFiles.shortLabel', "Add Files..."),
+			id: 'workbench.action.chat.editing.attachContext',
+			title: localize2('workbench.action.chat.editing.attachContext.label', "Add Context to Copilot Edits"),
+			shortTitle: localize2('workbench.action.chat.editing.attachContext.shortLabel', "Add Context..."),
 			f1: false,
 			category: CHAT_CATEGORY,
 			menu: { id: MenuId.ChatInputAttachmentToolbar, group: 'navigation' },
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 3f335c8d43b0..83391be21886 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -961,7 +961,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 				hoverDelegate,
 				getKeyBinding: () => undefined,
 				actionViewItemProvider: (action, options) => {
-					if (action.id === 'workbench.action.chat.editing.attachFiles') {
+					if (action.id === 'workbench.action.chat.editing.attachContext') {
 						const viewItem = this.instantiationService.createInstance(AddFilesButton, undefined, action, options);
 						return viewItem;
 					}

From f884804cf3d6053424f3ceced72dcf0ee5666205 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Sun, 2 Mar 2025 00:27:27 +1100
Subject: [PATCH 0550/1815] Ensure cell Id is the only part of internal
 metadata used in diffing (#242382)

* Ensure cell Id is the only part of internal metadata used in diffing

* misc

* misc

* Add comments

* wip

* Misc
---
 .../contrib/notebook/common/model/notebookCellTextModel.ts   | 3 ---
 src/vs/workbench/contrib/notebook/common/notebookCommon.ts   | 5 +++++
 .../contrib/notebook/common/services/notebookSimpleWorker.ts | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts b/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
index 8f84a01bd2f3..3970dd6be5fd 100644
--- a/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
@@ -209,9 +209,6 @@ export class NotebookCellTextModel extends Disposable implements ICell {
 		this._outputs = outputs.map(op => new NotebookCellOutputTextModel(op));
 		this._metadata = metadata ?? {};
 		this._internalMetadata = internalMetadata ?? {};
-		this._internalMetadata.cellId = this._internalMetadata.cellId ??
-			this._metadata.id as string ??
-			uri.fragment;
 	}
 
 	enableAutoLanguageDetection() {
diff --git a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
index d87906fa713e..3d834d49c1b8 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
@@ -121,6 +121,11 @@ export interface NotebookCellMetadata {
 }
 
 export interface NotebookCellInternalMetadata {
+	/**
+	 * Used only for diffing of Notebooks.
+	 * This is not persisted and generally useful only when diffing two notebooks.
+	 * Useful only after we've manually matched a few cells together so we know which cells are matching.
+	 */
 	cellId?: string;
 	executionId?: string;
 	executionOrder?: number;
diff --git a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
index c5b12612bb82..6414195810c9 100644
--- a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
+++ b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
@@ -56,7 +56,8 @@ class MirrorCell {
 		hashValue = doHash(this.language, hashValue);
 		hashValue = doHash(this.getValue(), hashValue);
 		hashValue = doHash(this.metadata, hashValue);
-		hashValue = doHash({ ...this.internalMetadata, 'cellId': '' }, hashValue);
+		// For purpose of diffing only cellId matters, rest do not
+		hashValue = doHash(this.internalMetadata?.cellId || '', hashValue);
 		for (const op of this.outputs) {
 			hashValue = doHash(op.metadata, hashValue);
 			for (const output of op.outputs) {

From 14db919201946fd44b493f5de416d75cbe118ed4 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Sun, 2 Mar 2025 00:27:47 +1100
Subject: [PATCH 0551/1815] Move notebook diff class into its own file
 (#242380)

---
 .../chatEditingModifiedNotebookDiff.ts        | 69 +++++++++++++++++++
 .../chatEditingModifiedNotebookEntry.ts       | 59 +---------------
 .../browser/chatEditing/chatEditingSession.ts |  3 +-
 3 files changed, 72 insertions(+), 59 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookDiff.ts

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookDiff.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookDiff.ts
new file mode 100644
index 000000000000..06b40dcd516f
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookDiff.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 { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { computeDiff } from '../../../notebook/browser/diff/notebookDiffViewModel.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 } from '../../common/chatEditingService.js';
+import { ISnapshotEntry } from './chatEditingModifiedFileEntry.js';
+
+export class ChatEditingModifiedNotebookDiff {
+	static NewModelCounter: number = 0;
+	constructor(
+		private readonly original: ISnapshotEntry,
+		private readonly modified: ISnapshotEntry,
+		@INotebookEditorWorkerService private readonly notebookEditorWorkerService: INotebookEditorWorkerService,
+		@INotebookLoggingService private readonly notebookLoggingService: INotebookLoggingService,
+		@INotebookEditorModelResolverService private readonly notebookEditorModelService: INotebookEditorModelResolverService,
+	) {
+
+	}
+
+	async computeDiff(): Promise<IEditSessionEntryDiff> {
+
+		let added = 0;
+		let removed = 0;
+
+		const disposables = new DisposableStore();
+		try {
+			const [modifiedRef, originalRef] = await Promise.all([
+				this.notebookEditorModelService.resolve(this.modified.snapshotUri),
+				this.notebookEditorModelService.resolve(this.original.snapshotUri)
+			]);
+			disposables.add(modifiedRef);
+			disposables.add(originalRef);
+			const notebookDiff = await this.notebookEditorWorkerService.computeDiff(this.original.snapshotUri, this.modified.snapshotUri);
+			const result = computeDiff(originalRef.object.notebook, modifiedRef.object.notebook, notebookDiff);
+			result.cellDiffInfo.forEach(diff => {
+				switch (diff.type) {
+					case 'modified':
+					case 'insert':
+						added++;
+						break;
+					case 'delete':
+						removed++;
+						break;
+					default:
+						break;
+				}
+			});
+		} catch (e) {
+			this.notebookLoggingService.error('Notebook Chat', 'Error computing diff:\n' + e);
+		} finally {
+			disposables.dispose();
+		}
+
+		return {
+			added,
+			removed,
+			identical: added === 0 && removed === 0,
+			quitEarly: false,
+			modifiedURI: this.modified.snapshotUri,
+			originalURI: this.original.snapshotUri,
+		};
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index ba4c15c6b2d6..f77f40487496 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -53,7 +53,7 @@ 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, IEditSessionEntryDiff, IModifiedFileEntryEditorIntegration, WorkingSetEntryState } from '../../common/chatEditingService.js';
+import { ChatEditKind, IModifiedFileEntryEditorIntegration, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { IChatResponseModel } from '../../common/chatModel.js';
 import { IChatService } from '../../common/chatService.js';
 import { IDocumentDiff2 } from './chatEditingCodeEditorIntegration.js';
@@ -67,63 +67,6 @@ const noopKeep = () => Promise.resolve(true);
 const noopUndo = () => Promise.resolve(true);
 const SnapshotLanguageId = 'VSCodeChatNotebookSnapshotLanguage';
 
-export class ChatEditingModifiedNotebookDiff {
-	static NewModelCounter: number = 0;
-	constructor(
-		private readonly original: ISnapshotEntry,
-		private readonly modified: ISnapshotEntry,
-		@INotebookEditorWorkerService private readonly notebookEditorWorkerService: INotebookEditorWorkerService,
-		@INotebookLoggingService private readonly notebookLoggingService: INotebookLoggingService,
-		@INotebookEditorModelResolverService private readonly notebookEditorModelService: INotebookEditorModelResolverService,
-	) {
-
-	}
-
-	async computeDiff(): Promise<IEditSessionEntryDiff> {
-
-		let added = 0;
-		let removed = 0;
-
-		const disposables = new DisposableStore();
-		try {
-			const [modifiedRef, originalRef] = await Promise.all([
-				this.notebookEditorModelService.resolve(this.modified.snapshotUri),
-				this.notebookEditorModelService.resolve(this.original.snapshotUri)
-			]);
-			disposables.add(modifiedRef);
-			disposables.add(originalRef);
-			const notebookDiff = await this.notebookEditorWorkerService.computeDiff(this.original.snapshotUri, this.modified.snapshotUri);
-			const result = computeDiff(originalRef.object.notebook, modifiedRef.object.notebook, notebookDiff);
-			result.cellDiffInfo.forEach(diff => {
-				switch (diff.type) {
-					case 'modified':
-					case 'insert':
-						added++;
-						break;
-					case 'delete':
-						removed++;
-						break;
-					default:
-						break;
-				}
-			});
-		} catch (e) {
-			this.notebookLoggingService.error('Notebook Chat', 'Error computing diff:\n' + e);
-		} finally {
-			disposables.dispose();
-		}
-
-		return {
-			added,
-			removed,
-			identical: added === 0 && removed === 0,
-			quitEarly: false,
-			modifiedURI: this.modified.snapshotUri,
-			originalURI: this.original.snapshotUri,
-		};
-	}
-}
-
 export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifiedFileEntry {
 	static NewModelCounter: number = 0;
 	private readonly modifiedModel: NotebookTextModel;
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 2d7f1a46d169..ef4b0fb5a39b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -49,8 +49,9 @@ import { AbstractChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISna
 import { ChatEditingModifiedDocumentEntry } from './chatEditingModifiedDocumentEntry.js';
 import { ChatEditingTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
 import { CellUri, ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
-import { ChatEditingModifiedNotebookDiff, ChatEditingModifiedNotebookEntry } from './chatEditingModifiedNotebookEntry.js';
+import { ChatEditingModifiedNotebookEntry } from './chatEditingModifiedNotebookEntry.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { ChatEditingModifiedNotebookDiff } from './chatEditingModifiedNotebookDiff.js';
 
 const STORAGE_CONTENTS_FOLDER = 'contents';
 const STORAGE_STATE_FILE = 'state.json';

From c0ab6000ac75a7162b84e6a660392c90a08ec4d9 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Sun, 2 Mar 2025 00:28:09 +1100
Subject: [PATCH 0552/1815] Move notebook diffing helpers into separate file
 (#242384)

---
 .../chatEditingModifiedNotebookEntry.ts       |   3 +-
 .../contrib/chatEdit/notebookSynchronizer.ts  |   3 +-
 .../diff/inlineDiff/notebookInlineDiff.ts     |   3 +-
 .../browser/diff/notebookDiffViewModel.ts     |  94 +------------
 .../contrib/notebook/common/notebookCommon.ts |   2 -
 .../contrib/notebook/common/notebookDiff.ts   | 133 ++++++++++++++++++
 6 files changed, 142 insertions(+), 96 deletions(-)
 create mode 100644 src/vs/workbench/contrib/notebook/common/notebookDiff.ts

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index f77f40487496..e2efe6a4c9e2 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -43,12 +43,13 @@ import { IFilesConfigurationService } from '../../../../services/filesConfigurat
 import { SnapshotContext } from '../../../../services/workingCopy/common/fileWorkingCopy.js';
 import { NotebookTextDiffEditor } from '../../../notebook/browser/diff/notebookDiffEditor.js';
 import { INotebookTextDiffEditor } from '../../../notebook/browser/diff/notebookDiffEditorBrowser.js';
-import { CellDiffInfo, computeDiff } from '../../../notebook/browser/diff/notebookDiffViewModel.js';
+import { CellDiffInfo } from '../../../notebook/browser/diff/notebookDiffViewModel.js';
 import { CellEditState, getNotebookEditorFromEditorPane } from '../../../notebook/browser/notebookBrowser.js';
 import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
 import { NotebookCellTextModel } from '../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
 import { CellEditType, ICellDto2, ICellEditOperation, ICellReplaceEdit, IResolvedNotebookEditorModel, NotebookSetting, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
+import { computeDiff } from '../../../notebook/common/notebookDiff.js';
 import { INotebookEditorModelResolverService } from '../../../notebook/common/notebookEditorModelResolverService.js';
 import { INotebookLoggingService } from '../../../notebook/common/notebookLoggingService.js';
 import { INotebookService } from '../../../notebook/common/notebookService.js';
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts
index dbebccbe2f92..56be90aafa6b 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts
@@ -10,7 +10,7 @@ import { INotebookService } from '../../../common/notebookService.js';
 import { bufferToStream, streamToBuffer, VSBuffer } from '../../../../../../base/common/buffer.js';
 import { NotebookTextModel } from '../../../common/model/notebookTextModel.js';
 import { raceCancellation, ThrottledDelayer } from '../../../../../../base/common/async.js';
-import { CellDiffInfo, computeDiff, prettyChanges } from '../../diff/notebookDiffViewModel.js';
+import { CellDiffInfo, prettyChanges } from '../../diff/notebookDiffViewModel.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
 import { INotebookEditorWorkerService } from '../../../common/services/notebookWorkerService.js';
 import { CellEditType, ICellDto2, ICellEditOperation, ICellReplaceEdit, NotebookData, NotebookSetting } from '../../../common/notebookCommon.js';
@@ -31,6 +31,7 @@ import { INotebookEditorService } from '../../services/notebookEditorService.js'
 import { CellEditState } from '../../notebookBrowser.js';
 import { IModelService } from '../../../../../../editor/common/services/model.js';
 import { ChatEditingModifiedDocumentEntry } from '../../../../chat/browser/chatEditing/chatEditingModifiedDocumentEntry.js';
+import { computeDiff } from '../../../common/notebookDiff.js';
 
 
 export const INotebookModelSynchronizerFactory = createDecorator<INotebookModelSynchronizerFactory>('INotebookModelSynchronizerFactory');
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInlineDiff.ts b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInlineDiff.ts
index 0b1668d0711b..974b5acb0033 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInlineDiff.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInlineDiff.ts
@@ -10,13 +10,14 @@ import { IInstantiationService } from '../../../../../../platform/instantiation/
 import { NotebookCellTextModel } from '../../../common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../common/model/notebookTextModel.js';
 import { INotebookEditorWorkerService } from '../../../common/services/notebookWorkerService.js';
-import { CellDiffInfo, computeDiff } from '../notebookDiffViewModel.js';
+import { CellDiffInfo } from '../notebookDiffViewModel.js';
 import { INotebookEditorContribution, INotebookEditor } from '../../notebookBrowser.js';
 import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
 import { NotebookCellDiffDecorator } from './notebookCellDiffDecorator.js';
 import { NotebookDeletedCellDecorator } from './notebookDeletedCellDecorator.js';
 import { NotebookInsertedCellDecorator } from './notebookInsertedCellDecorator.js';
 import { INotebookLoggingService } from '../../../common/notebookLoggingService.js';
+import { computeDiff } from '../../../common/notebookDiff.js';
 
 export class NotebookInlineDiffDecorationContribution extends Disposable implements INotebookEditorContribution {
 	static ID: string = 'workbench.notebook.inlineDiffDecoration';
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel.ts
index 8ec5ec7691c5..6ef165a48213 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { IDiffResult, IDiffChange } from '../../../../../base/common/diff/diff.js';
+import { IDiffResult } from '../../../../../base/common/diff/diff.js';
 import { Emitter, type IValueWithChangeEvent } from '../../../../../base/common/event.js';
 import { Disposable, DisposableStore, dispose } from '../../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../../base/common/network.js';
@@ -17,11 +17,12 @@ import { DiffElementCellViewModelBase, DiffElementPlaceholderViewModel, IDiffEle
 import { NotebookDiffEditorEventDispatcher } from './eventDispatcher.js';
 import { INotebookDiffViewModel, INotebookDiffViewModelUpdateEvent, NOTEBOOK_DIFF_ITEM_DIFF_STATE, NOTEBOOK_DIFF_ITEM_KIND } from './notebookDiffEditorBrowser.js';
 import { NotebookTextModel } from '../../common/model/notebookTextModel.js';
-import { CellUri, INotebookDiffEditorModel, INotebookDiffResult } from '../../common/notebookCommon.js';
+import { CellUri, INotebookDiffEditorModel } from '../../common/notebookCommon.js';
 import { INotebookService } from '../../common/notebookService.js';
 import { INotebookEditorWorkerService } from '../../common/services/notebookWorkerService.js';
 import { IDiffEditorHeightCalculatorService } from './editorHeightCalculator.js';
 import { raceCancellation } from '../../../../../base/common/async.js';
+import { computeDiff } from '../../common/notebookDiff.js';
 
 export class NotebookDiffViewModel extends Disposable implements INotebookDiffViewModel, IValueWithChangeEvent<readonly MultiDiffEditorItem[]> {
 	private readonly placeholderAndRelatedCells = new Map<DiffElementPlaceholderViewModel, DiffElementCellViewModelBase[]>();
@@ -415,62 +416,7 @@ export type CellDiffInfo = {
 	modifiedCellIndex: number;
 	type: 'insert';
 };
-export function computeDiff(originalModel: NotebookTextModel, modifiedModel: NotebookTextModel, diffResult: INotebookDiffResult) {
-	const cellChanges = diffResult.cellsDiff.changes;
-	const cellDiffInfo: CellDiffInfo[] = [];
-	let originalCellIndex = 0;
-	let modifiedCellIndex = 0;
-
-	let firstChangeIndex = -1;
-
-	for (let i = 0; i < cellChanges.length; i++) {
-		const change = cellChanges[i];
-		// common cells
-
-		for (let j = 0; j < change.originalStart - originalCellIndex; j++) {
-			const originalCell = originalModel.cells[originalCellIndex + j];
-			const modifiedCell = modifiedModel.cells[modifiedCellIndex + j];
-			if (originalCell.getHashValue() === modifiedCell.getHashValue()) {
-				cellDiffInfo.push({
-					originalCellIndex: originalCellIndex + j,
-					modifiedCellIndex: modifiedCellIndex + j,
-					type: 'unchanged'
-				});
-			} else {
-				if (firstChangeIndex === -1) {
-					firstChangeIndex = cellDiffInfo.length;
-				}
-				cellDiffInfo.push({
-					originalCellIndex: originalCellIndex + j,
-					modifiedCellIndex: modifiedCellIndex + j,
-					type: 'modified'
-				});
-			}
-		}
 
-		const modifiedLCS = computeModifiedLCS(change, originalModel, modifiedModel);
-		if (modifiedLCS.length && firstChangeIndex === -1) {
-			firstChangeIndex = cellDiffInfo.length;
-		}
-
-		cellDiffInfo.push(...modifiedLCS);
-		originalCellIndex = change.originalStart + change.originalLength;
-		modifiedCellIndex = change.modifiedStart + change.modifiedLength;
-	}
-
-	for (let i = originalCellIndex; i < originalModel.cells.length; i++) {
-		cellDiffInfo.push({
-			originalCellIndex: i,
-			modifiedCellIndex: i - originalCellIndex + modifiedCellIndex,
-			type: 'unchanged'
-		});
-	}
-
-	return {
-		cellDiffInfo,
-		firstChangeIndex
-	};
-}
 function isEqual(cellDiffInfo: CellDiffInfo[], viewModels: IDiffElementViewModelBase[], model: INotebookDiffEditorModel) {
 	if (cellDiffInfo.length !== viewModels.length) {
 		return false;
@@ -510,40 +456,6 @@ function isEqual(cellDiffInfo: CellDiffInfo[], viewModels: IDiffElementViewModel
 
 	return true;
 }
-
-function computeModifiedLCS(change: IDiffChange, originalModel: NotebookTextModel, modifiedModel: NotebookTextModel) {
-	const result: CellDiffInfo[] = [];
-	// modified cells
-	const modifiedLen = Math.min(change.originalLength, change.modifiedLength);
-
-	for (let j = 0; j < modifiedLen; j++) {
-		const isTheSame = originalModel.cells[change.originalStart + j].equal(modifiedModel.cells[change.modifiedStart + j]);
-		result.push({
-			originalCellIndex: change.originalStart + j,
-			modifiedCellIndex: change.modifiedStart + j,
-			type: isTheSame ? 'unchanged' : 'modified'
-		});
-	}
-
-	for (let j = modifiedLen; j < change.originalLength; j++) {
-		// deletion
-		result.push({
-			originalCellIndex: change.originalStart + j,
-			type: 'delete'
-		});
-	}
-
-	for (let j = modifiedLen; j < change.modifiedLength; j++) {
-		result.push({
-			modifiedCellIndex: change.modifiedStart + j,
-			type: 'insert'
-		});
-	}
-
-	return result;
-}
-
-
 export abstract class NotebookMultiDiffEditorItem extends MultiDiffEditorItem {
 	constructor(
 		originalUri: URI | undefined,
diff --git a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
index 3d834d49c1b8..1558447f16e0 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookCommon.ts
@@ -19,7 +19,6 @@ import { ISplice } from '../../../../base/common/sequence.js';
 import { ThemeColor } from '../../../../base/common/themables.js';
 import { URI, UriComponents } from '../../../../base/common/uri.js';
 import { Range } from '../../../../editor/common/core/range.js';
-import { ILineChange } from '../../../../editor/common/diff/legacyLinesDiffComputer.js';
 import * as editorCommon from '../../../../editor/common/editorCommon.js';
 import { Command, WorkspaceEditMetadata } from '../../../../editor/common/languages.js';
 import { IReadonlyTextBuffer, ITextModel } from '../../../../editor/common/model.js';
@@ -960,7 +959,6 @@ export interface INotebookCellStatusBarItemProvider {
 export interface INotebookDiffResult {
 	cellsDiff: IDiffResult;
 	metadataChanged: boolean;
-	linesDiff?: { originalCellhandle: number; modifiedCellhandle: number; lineChanges: ILineChange[] }[];
 }
 
 export interface INotebookCellStatusBarItem {
diff --git a/src/vs/workbench/contrib/notebook/common/notebookDiff.ts b/src/vs/workbench/contrib/notebook/common/notebookDiff.ts
new file mode 100644
index 000000000000..fb8844cfc132
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/common/notebookDiff.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 { IDiffChange } from '../../../../base/common/diff/diff.js';
+import { CellKind, INotebookDiffResult } from './notebookCommon.js';
+
+export type CellDiffInfo = {
+	originalCellIndex: number;
+	modifiedCellIndex: number;
+	type: 'unchanged' | 'modified';
+} |
+{
+	originalCellIndex: number;
+	type: 'delete';
+} |
+{
+	modifiedCellIndex: number;
+	type: 'insert';
+};
+
+interface ICell {
+	cellKind: CellKind;
+	getHashValue(): number;
+	equal(cell: ICell): boolean;
+}
+// interface INotebookDiffResult {
+// 	cellsDiff: IDiffResult;
+// 	metadataChanged: boolean;
+// }
+
+export function computeDiff(originalModel: { readonly cells: readonly ICell[] }, modifiedModel: { readonly cells: readonly ICell[] }, diffResult: INotebookDiffResult) {
+	const cellChanges = diffResult.cellsDiff.changes;
+	const cellDiffInfo: CellDiffInfo[] = [];
+	let originalCellIndex = 0;
+	let modifiedCellIndex = 0;
+
+	let firstChangeIndex = -1;
+
+	for (let i = 0; i < cellChanges.length; i++) {
+		const change = cellChanges[i];
+		// common cells
+
+		for (let j = 0; j < change.originalStart - originalCellIndex; j++) {
+			const originalCell = originalModel.cells[originalCellIndex + j];
+			const modifiedCell = modifiedModel.cells[modifiedCellIndex + j];
+			if (originalCell.getHashValue() === modifiedCell.getHashValue()) {
+				cellDiffInfo.push({
+					originalCellIndex: originalCellIndex + j,
+					modifiedCellIndex: modifiedCellIndex + j,
+					type: 'unchanged'
+				});
+			} else {
+				if (firstChangeIndex === -1) {
+					firstChangeIndex = cellDiffInfo.length;
+				}
+				cellDiffInfo.push({
+					originalCellIndex: originalCellIndex + j,
+					modifiedCellIndex: modifiedCellIndex + j,
+					type: 'modified'
+				});
+			}
+		}
+
+		const modifiedLCS = computeModifiedLCS(change, originalModel, modifiedModel);
+		if (modifiedLCS.length && firstChangeIndex === -1) {
+			firstChangeIndex = cellDiffInfo.length;
+		}
+
+		cellDiffInfo.push(...modifiedLCS);
+		originalCellIndex = change.originalStart + change.originalLength;
+		modifiedCellIndex = change.modifiedStart + change.modifiedLength;
+	}
+
+	for (let i = originalCellIndex; i < originalModel.cells.length; i++) {
+		cellDiffInfo.push({
+			originalCellIndex: i,
+			modifiedCellIndex: i - originalCellIndex + modifiedCellIndex,
+			type: 'unchanged'
+		});
+	}
+
+	return {
+		cellDiffInfo,
+		firstChangeIndex
+	};
+}
+
+function computeModifiedLCS(change: IDiffChange, originalModel: { readonly cells: readonly ICell[] }, modifiedModel: { readonly cells: readonly ICell[] }) {
+	const result: CellDiffInfo[] = [];
+	// modified cells
+	const modifiedLen = Math.min(change.originalLength, change.modifiedLength);
+
+	for (let j = 0; j < modifiedLen; j++) {
+		const originalCell = originalModel.cells[change.originalStart + j];
+		const modifiedCell = modifiedModel.cells[change.modifiedStart + j];
+		if (originalCell.cellKind !== modifiedCell.cellKind) {
+			result.push({
+				originalCellIndex: change.originalStart + j,
+				type: 'delete'
+			});
+			result.push({
+				modifiedCellIndex: change.modifiedStart + j,
+				type: 'insert'
+			});
+		} else {
+			const isTheSame = originalCell.equal(modifiedCell);
+			result.push({
+				originalCellIndex: change.originalStart + j,
+				modifiedCellIndex: change.modifiedStart + j,
+				type: isTheSame ? 'unchanged' : 'modified'
+			});
+		}
+	}
+
+	for (let j = modifiedLen; j < change.originalLength; j++) {
+		// deletion
+		result.push({
+			originalCellIndex: change.originalStart + j,
+			type: 'delete'
+		});
+	}
+
+	for (let j = modifiedLen; j < change.modifiedLength; j++) {
+		result.push({
+			modifiedCellIndex: change.modifiedStart + j,
+			type: 'insert'
+		});
+	}
+
+	return result;
+}

From 0ae8e420ca646ffeb7e5d3f4ccafd376f3f1f861 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Sun, 2 Mar 2025 00:28:29 +1100
Subject: [PATCH 0553/1815] Fix leaks in notebook diffing (#242385)

---
 .../notebook/browser/services/notebookWorkerServiceImpl.ts       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts
index 4a0527917e60..d45bdc91ad19 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookWorkerServiceImpl.ts
@@ -65,6 +65,7 @@ class WorkerManager extends Disposable {
 		// this._lastWorkerUsedTime = (new Date()).getTime();
 		if (!this._editorWorkerClient) {
 			this._editorWorkerClient = new NotebookWorkerClient(this._notebookService, this._modelService);
+			this._register(this._editorWorkerClient);
 		}
 		return Promise.resolve(this._editorWorkerClient);
 	}

From 23e2fba193d92bf4a8cb6c0a4b61220aef74a03f Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sat, 1 Mar 2025 16:18:22 +0100
Subject: [PATCH 0554/1815] chat - make status a control with lifecycle and
 adopt more services (#242376)

---
 .../chat/browser/actions/chatActions.ts       |  11 +-
 .../contrib/chat/browser/chat.contribution.ts |  46 ++-
 .../chatEditingModifiedNotebookDiff.ts        |   2 +-
 .../contrib/chat/browser/chatInputPart.ts     |   4 +-
 .../contrib/chat/browser/chatSetup.ts         |  76 +++--
 .../contrib/chat/browser/chatStatus.ts        | 284 +++++++++---------
 .../chat/common/chatEntitlementsService.ts    |   5 +
 .../contrib/chat/common/chatQuotasService.ts  |  13 +-
 8 files changed, 227 insertions(+), 214 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index 2dea32904639..c6a801fc308e 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -21,7 +21,7 @@ import { IActionViewItemService } from '../../../../../platform/actions/browser/
 import { DropdownWithPrimaryActionViewItem } from '../../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
 import { Action2, MenuId, MenuItemAction, MenuRegistry, registerAction2, SubmenuItemAction } from '../../../../../platform/actions/common/actions.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
-import { ContextKeyExpr, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IsLinuxContext, IsWindowsContext } from '../../../../../platform/contextkey/common/contextkeys.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
@@ -55,6 +55,7 @@ import { language } from '../../../../../base/common/platform.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { IWorkbenchLayoutService, Parts } from '../../../../services/layout/browser/layoutService.js';
 import { IViewDescriptorService, ViewContainerLocation } from '../../../../common/views.js';
+import { ChatEntitlement, IChatEntitlementsService } from '../../common/chatEntitlementsService.js';
 
 export const CHAT_CATEGORY = localize2('chat.category', 'Chat');
 
@@ -694,12 +695,10 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 		@IChatAgentService agentService: IChatAgentService,
 		@IChatQuotasService chatQuotasService: IChatQuotasService,
 		@IInstantiationService instantiationService: IInstantiationService,
-		@IContextKeyService contextKeyService: IContextKeyService,
+		@IChatEntitlementsService chatEntitlementsService: IChatEntitlementsService
 	) {
 		super();
 
-		const contextKeySet = new Set([ChatContextKeys.Setup.signedOut.key]);
-
 		const disposable = actionViewItemService.register(MenuId.CommandCenter, MenuId.ChatTitleBarMenu, (action, options) => {
 			if (!(action instanceof SubmenuItemAction)) {
 				return undefined;
@@ -713,7 +712,7 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 
 			const chatExtensionInstalled = agentService.getAgents().some(agent => agent.isDefault);
 			const { chatQuotaExceeded, completionsQuotaExceeded } = chatQuotasService.quotas;
-			const signedOut = contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.signedOut.key) ?? false;
+			const signedOut = chatEntitlementsService.entitlement === ChatEntitlement.Unknown;
 
 			let primaryActionId: string;
 			let primaryActionTitle: string;
@@ -745,7 +744,7 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 		}, Event.any(
 			agentService.onDidChangeAgents,
 			chatQuotasService.onDidChangeQuotaExceeded,
-			Event.filter(contextKeyService.onDidChangeContext, e => e.affectsSome(contextKeySet))
+			chatEntitlementsService.onDidChangeEntitlement
 		));
 
 		// Reduces flicker a bit on reload/restart
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 0e38b614370a..35c7fd59ad90 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -81,7 +81,7 @@ import { QuickChatService } from './chatQuick.js';
 import { ChatQuotasService, IChatQuotasService } from '../common/chatQuotasService.js';
 import { ChatResponseAccessibleView } from './chatResponseAccessibleView.js';
 import { ChatEntitlementsService, ChatSetupContribution } from './chatSetup.js';
-import { IChatEntitlementsService } from '../common/chatEntitlementsService.js';
+import { ChatEntitlement, IChatEntitlementsService } from '../common/chatEntitlementsService.js';
 import { ChatVariablesService } from './chatVariables.js';
 import { ChatWidgetService } from './chatWidget.js';
 import { ChatCodeBlockContextProviderService } from './codeBlockContextProviderService.js';
@@ -100,6 +100,7 @@ import { registerChatToolActions } from './actions/chatToolActions.js';
 import { ChatStatusBarEntry } from './chatStatus.js';
 import product from '../../../../platform/product/common/product.js';
 import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditing/chatEditingNotebookFileSystemProvider.js';
+import { Event } from '../../../../base/common/event.js';
 
 // Register configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -299,34 +300,39 @@ class ChatResolverContribution extends Disposable {
 	}
 }
 
-class ChatAgentSettingContribution implements IWorkbenchContribution {
+class ChatAgentSettingContribution extends Disposable implements IWorkbenchContribution {
 
 	static readonly ID = 'workbench.contrib.chatAgentSetting';
 
 	private registeredNode: IConfigurationNode | undefined;
 
 	constructor(
-		@IWorkbenchAssignmentService experimentService: IWorkbenchAssignmentService,
+		@IWorkbenchAssignmentService private readonly experimentService: IWorkbenchAssignmentService,
 		@IProductService private readonly productService: IProductService,
 		@IContextKeyService contextKeyService: IContextKeyService,
+		@IChatEntitlementsService private readonly entitlementService: IChatEntitlementsService,
 	) {
+		super();
+
 		if (this.productService.quality !== 'stable') {
-			this.registerSetting();
+			this.registerEnablementSetting();
 		}
 
 		const expDisabledKey = ChatContextKeys.Editing.agentModeDisallowed.bindTo(contextKeyService);
 		experimentService.getTreatment<boolean>('chatAgentEnabled').then(enabled => {
 			if (enabled) {
-				this.registerSetting();
+				this.registerEnablementSetting();
 				expDisabledKey.set(false);
 			} else if (enabled === false) {
 				this.deregisterSetting();
 				expDisabledKey.set(true);
 			}
 		});
+
+		this.registerMaxRequestsSetting();
 	}
 
-	private registerSetting() {
+	private registerEnablementSetting() {
 		if (this.registeredNode) {
 			return;
 		}
@@ -353,6 +359,34 @@ class ChatAgentSettingContribution implements IWorkbenchContribution {
 			this.registeredNode = undefined;
 		}
 	}
+
+	private registerMaxRequestsSetting(): void {
+		let lastNode: IConfigurationNode | undefined;
+		const registerMaxRequestsSetting = () => {
+			const treatmentId = this.entitlementService.entitlement === ChatEntitlement.Limited ?
+				'chatAgentMaxRequestsFree' :
+				'chatAgentMaxRequestsPro';
+			this.experimentService.getTreatment<number>(treatmentId).then(value => {
+				const defaultValue = value ?? (this.entitlementService.entitlement === ChatEntitlement.Limited ? 5 : 15);
+				const node: IConfigurationNode = {
+					id: 'chatSidebar',
+					title: nls.localize('interactiveSessionConfigurationTitle', "Chat"),
+					type: 'object',
+					properties: {
+						'chat.agent.maxRequests': {
+							type: 'number',
+							markdownDescription: nls.localize('chat.agent.maxRequests', "The maximum number of requests to allow Copilot Edits to use per-turn in agent mode. When the limit is reached, Copilot will ask the user to confirm that it should keep working. \n\n> **Note**: For users on the Copilot Free plan, note that each agent mode request currently uses one chat request."),
+							default: defaultValue,
+							tags: ['experimental']
+						},
+					}
+				};
+				configurationRegistry.updateConfigurations({ remove: lastNode ? [lastNode] : [], add: [node] });
+				lastNode = node;
+			});
+		};
+		this._register(Event.runAndSubscribe(Event.debounce(this.entitlementService.onDidChangeEntitlement, () => { }, 1000), () => registerMaxRequestsSetting()));
+	}
 }
 
 AccessibleViewRegistry.register(new ChatResponseAccessibleView());
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookDiff.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookDiff.ts
index 06b40dcd516f..c55960ee1f03 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookDiff.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookDiff.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
-import { computeDiff } from '../../../notebook/browser/diff/notebookDiffViewModel.js';
+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';
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 83391be21886..e30bd8af05f7 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -77,6 +77,7 @@ import { revealInSideBarCommand } from '../../files/browser/fileActions.contribu
 import { ChatAgentLocation, IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatEditingSession, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../common/chatEditingService.js';
+import { ChatEntitlement, IChatEntitlementsService } from '../common/chatEntitlementsService.js';
 import { IChatRequestVariableEntry, isImageVariableEntry, isLinkVariableEntry, isPasteVariableEntry } from '../common/chatModel.js';
 import { IChatFollowup } from '../common/chatService.js';
 import { IChatVariablesService } from '../common/chatVariables.js';
@@ -1618,6 +1619,7 @@ class ModelPickerActionViewItem extends DropdownMenuActionViewItemWithKeybinding
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IContextKeyService contextKeyService: IContextKeyService,
+		@IChatEntitlementsService chatEntitlementsService: IChatEntitlementsService,
 		@ICommandService commandService: ICommandService,
 	) {
 		const modelActionsProvider: IActionProvider = {
@@ -1640,7 +1642,7 @@ class ModelPickerActionViewItem extends DropdownMenuActionViewItemWithKeybinding
 
 				const models: ILanguageModelChatMetadataAndIdentifier[] = this.delegate.getModels();
 				const actions = models.map(entry => setLanguageModelAction(entry));
-				if (contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.limited.key) === true) {
+				if (chatEntitlementsService.entitlement === ChatEntitlement.Limited) {
 					actions.push(new Separator());
 					actions.push(toAction({ id: 'moreModels', label: localize('chat.moreModels', "Add More Models..."), run: () => commandService.executeCommand('workbench.action.chat.upgradePlan') }));
 				}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 122d75815f4a..a55e7f20cef7 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -52,7 +52,7 @@ import { CHAT_CATEGORY, CHAT_SETUP_ACTION_ID, CHAT_SETUP_ACTION_LABEL } from './
 import { ChatViewId, EditsViewId, ensureSideBarChatViewSize, preferCopilotEditsView, showCopilotView } from './chat.js';
 import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
 import { ChatViewsWelcomeExtensions, IChatViewsWelcomeContributionRegistry } from './viewsWelcome/chatViewsWelcome.js';
-import { IChatQuotasService } from '../common/chatQuotasService.js';
+import { ChatQuotasService, IChatQuotasService } from '../common/chatQuotasService.js';
 import { mainWindow } from '../../../../base/browser/window.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { URI } from '../../../../base/common/uri.js';
@@ -64,11 +64,10 @@ import { ExtensionUrlHandlerOverrideRegistry } from '../../../services/extension
 import { IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions, IConfigurationNode } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
 import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
 import { equalsIgnoreCase } from '../../../../base/common/strings.js';
-import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
 import { ChatEntitlement, IChatEntitlements, IChatEntitlementsService } from '../common/chatEntitlementsService.js';
 import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
 
@@ -99,13 +98,39 @@ export class ChatEntitlementsService extends Disposable implements IChatEntitlem
 
 	declare _serviceBrand: undefined;
 
+	readonly onDidChangeEntitlement = Event.map(
+		Event.filter(
+			this.contextKeyService.onDidChangeContext, e => e.affectsSome(new Set([
+				ChatContextKeys.Setup.pro.key,
+				ChatContextKeys.Setup.limited.key,
+				ChatContextKeys.Setup.canSignUp.key,
+				ChatContextKeys.Setup.signedOut.key
+			])), this._store
+		), () => { }, this._store
+	);
+
 	readonly context: Lazy<ChatSetupContext> | undefined;
 	readonly requests: Lazy<ChatSetupRequests> | undefined;
 
+	get entitlement(): ChatEntitlement {
+		if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.pro.key) === true) {
+			return ChatEntitlement.Pro;
+		} else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.limited.key) === true) {
+			return ChatEntitlement.Limited;
+		} else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.canSignUp.key) === true) {
+			return ChatEntitlement.Available;
+		} else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.signedOut.key) === true) {
+			return ChatEntitlement.Unknown;
+		}
+
+		return ChatEntitlement.Unresolved;
+	}
+
 	constructor(
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IProductService productService: IProductService,
-		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService
+		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 	) {
 		super();
 
@@ -138,8 +163,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ICommandService private readonly commandService: ICommandService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IWorkbenchAssignmentService private readonly experimentService: IWorkbenchAssignmentService,
-		@IChatEntitlementsService chatEntitlementsService: ChatEntitlementsService,
+		@IChatEntitlementsService chatEntitlementsService: ChatEntitlementsService
 	) {
 		super();
 
@@ -154,7 +178,6 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 		this.registerChatWelcome(controller, context);
 		this.registerActions(context, requests);
 		this.registerUrlLinkHandler();
-		this.registerSetting(context);
 	}
 
 	private registerChatWelcome(controller: Lazy<ChatSetupController>, context: ChatSetupContext): void {
@@ -335,36 +358,6 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 			}
 		}));
 	}
-
-	private registerSetting(context: ChatSetupContext): void {
-		const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
-
-		let lastNode: IConfigurationNode | undefined;
-		const registerSetting = () => {
-			const treatmentId = context.state.entitlement === ChatEntitlement.Limited ?
-				'chatAgentMaxRequestsFree' :
-				'chatAgentMaxRequestsPro';
-			this.experimentService.getTreatment<number>(treatmentId).then(value => {
-				const defaultValue = value ?? (context.state.entitlement === ChatEntitlement.Limited ? 5 : 15);
-				const node: IConfigurationNode = {
-					id: 'chatSidebar',
-					title: localize('interactiveSessionConfigurationTitle', "Chat"),
-					type: 'object',
-					properties: {
-						'chat.agent.maxRequests': {
-							type: 'number',
-							markdownDescription: localize('chat.agent.maxRequests', "The maximum number of requests to allow Copilot Edits to use per-turn in agent mode. When the limit is reached, Copilot will ask the user to confirm that it should keep working. \n\n> **Note**: For users on the Copilot Free plan, note that each agent mode request currently uses one chat request."),
-							default: defaultValue,
-							tags: ['experimental']
-						},
-					}
-				};
-				configurationRegistry.updateConfigurations({ remove: lastNode ? [lastNode] : [], add: [node] });
-				lastNode = node;
-			});
-		};
-		this._register(Event.runAndSubscribe(Event.debounce(context.onDidChange, () => { }, 1000), () => registerSetting()));
-	}
 }
 
 //#endregion
@@ -427,7 +420,7 @@ class ChatSetupRequests extends Disposable {
 		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
 		@ILogService private readonly logService: ILogService,
 		@IRequestService private readonly requestService: IRequestService,
-		@IChatQuotasService private readonly chatQuotasService: IChatQuotasService,
+		@IChatQuotasService private readonly chatQuotasService: ChatQuotasService,
 		@IDialogService private readonly dialogService: IDialogService,
 		@IOpenerService private readonly openerService: IOpenerService,
 		@IConfigurationService private readonly configurationService: IConfigurationService
@@ -602,13 +595,16 @@ class ChatSetupRequests extends Disposable {
 			entitlement = ChatEntitlement.Unavailable;
 		}
 
+		const chatRemaining = entitlementsResponse.limited_user_quotas?.chat;
+		const completionsRemaining = entitlementsResponse.limited_user_quotas?.completions;
+
 		const entitlements: IChatEntitlements = {
 			entitlement,
 			quotas: {
 				chatTotal: entitlementsResponse.monthly_quotas?.chat,
 				completionsTotal: entitlementsResponse.monthly_quotas?.completions,
-				chatRemaining: entitlementsResponse.limited_user_quotas?.chat,
-				completionsRemaining: entitlementsResponse.limited_user_quotas?.completions,
+				chatRemaining: typeof chatRemaining === 'number' ? Math.max(0, chatRemaining) : undefined,
+				completionsRemaining: typeof completionsRemaining === 'number' ? Math.max(0, completionsRemaining) : undefined,
 				resetDate: entitlementsResponse.limited_user_reset_date
 			}
 		};
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index bf3b280f3099..73b88c35f1ac 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -15,8 +15,8 @@ import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowToolti
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatQuotasService } from '../common/chatQuotasService.js';
 import { quotaToButtonMessage, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, TOGGLE_CHAT_ACTION_ID, CHAT_OPEN_ACTION_ID } from './actions/chatActions.js';
-import { $, addDisposableListener, append, EventHelper, EventLike, EventType } from '../../../../base/browser/dom.js';
-import { IChatEntitlementsService } from '../common/chatEntitlementsService.js';
+import { $, addDisposableListener, append, clearNode, EventHelper, EventLike, EventType } from '../../../../base/browser/dom.js';
+import { ChatEntitlement, IChatEntitlementsService } from '../common/chatEntitlementsService.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { defaultCheckboxStyles, defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
@@ -38,6 +38,7 @@ import { IEditorService } from '../../../services/editor/common/editorService.js
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { isObject } from '../../../../base/common/types.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 
 //#region --- colors
 
@@ -96,23 +97,20 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 	static readonly ID = 'chat.statusBarEntry';
 
+	private static readonly SETTING = 'chat.experimental.statusIndicator.enabled';
+
 	private entry: IStatusbarEntryAccessor | undefined = undefined;
-	private readonly entryDisposables = this._register(new MutableDisposable());
 
-	private dateFormatter = new Lazy(() => safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric' }));
+	private dashboard = new Lazy<ChatStatusDashboard>(() => this.instantiationService.createInstance(ChatStatusDashboard));
 
 	constructor(
 		@IStatusbarService private readonly statusbarService: IStatusbarService,
 		@IChatQuotasService private readonly chatQuotasService: IChatQuotasService,
 		@IChatEntitlementsService private readonly chatEntitlementsService: IChatEntitlementsService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@ICommandService private readonly commandService: ICommandService,
-		@IHoverService private readonly hoverService: IHoverService,
-		@IEditorService private readonly editorService: IEditorService,
 		@IProductService private readonly productService: IProductService,
-		@ILanguageService private readonly languageService: ILanguageService
+		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
 		super();
 
@@ -121,7 +119,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	}
 
 	private async create(): Promise<void> {
-		if (this.configurationService.getValue<boolean>('chat.experimental.statusIndicator.enabled') === true) {
+		if (this.configurationService.getValue<boolean>(ChatStatusBarEntry.SETTING) === true) {
 			this.entry ||= this.statusbarService.addEntry(this.getEntryProps(), ChatStatusBarEntry.ID, StatusbarAlignment.RIGHT, { location: { id: 'status.editor.mode', priority: 100.1 }, alignment: StatusbarAlignment.RIGHT });
 			this.statusbarService.updateEntryVisibility(`${this.productService.defaultChatAgent?.extensionId}.status`, false); // TODO@bpasero: remove this eventually
 		} else {
@@ -132,17 +130,12 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 	private registerListeners(): void {
 		this._register(this.configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration('chat.experimental.statusIndicator.enabled')) {
+			if (e.affectsConfiguration(ChatStatusBarEntry.SETTING)) {
 				this.create();
 			}
 		}));
 
-		const contextKeysSet = new Set([
-			ChatContextKeys.Setup.limited.key,
-			ChatContextKeys.Setup.installed.key,
-			ChatContextKeys.Setup.canSignUp.key,
-			ChatContextKeys.Setup.signedOut.key
-		]);
+		const contextKeysSet = new Set([ChatContextKeys.Setup.installed.key]);
 		this._register(this.contextKeyService.onDidChangeContext(e => {
 			if (!this.entry) {
 				return;
@@ -154,14 +147,13 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		}));
 
 		this._register(this.chatQuotasService.onDidChangeQuotaExceeded(() => this.entry?.update(this.getEntryProps())));
+		this._register(this.chatEntitlementsService.onDidChangeEntitlement(() => this.entry?.update(this.getEntryProps())));
 	}
 
 	private getEntryProps(): IStatusbarEntry {
-		this.entryDisposables.clear();
-
 		let text = '$(copilot)';
 		let ariaLabel = localize('chatStatus', "Copilot Status");
-		let command: string | Command = TOGGLE_CHAT_ACTION_ID;
+		let command: string | Command;
 		let tooltip: TooltipContent;
 		let kind: StatusbarEntryKind | undefined;
 
@@ -187,88 +179,24 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		// Copilot Not Installed
 		else if (
 			this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.installed.key) === false ||
-			this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.canSignUp.key) === true
+			this.chatEntitlementsService.entitlement === ChatEntitlement.Available
 		) {
 			tooltip = CHAT_SETUP_ACTION_LABEL.value;
+			command = TOGGLE_CHAT_ACTION_ID;
 		}
 
 		// Signed out
-		else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.signedOut.key) === true) {
+		else if (this.chatEntitlementsService.entitlement === ChatEntitlement.Unknown) {
 			text = '$(copilot-not-connected)';
 			ariaLabel = localize('signInToUseCopilot', "Sign in to Use Copilot...");
 			tooltip = localize('signInToUseCopilot', "Sign in to Use Copilot...");
-		}
-
-		// Copilot Limited User
-		else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.limited.key) === true) {
-			tooltip = {
-				element: token => {
-					const { container, disposables } = this.createContainer(token);
-
-					// Quota Indicator
-					{
-						const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate } = this.chatQuotasService.quotas;
-
-						container.appendChild($('div.header', undefined, localize('usageTitle', "Copilot Free Usage")));
-
-						const chatQuotaIndicator = this.createQuotaIndicator(container, chatTotal, chatRemaining, localize('chatsLabel', "Chat messages"));
-						const completionsQuotaIndicator = this.createQuotaIndicator(container, completionsTotal, completionsRemaining, localize('completionsLabel', "Code completions"));
-
-						container.appendChild($('div.description', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.value.format(quotaResetDate))));
-
-						this.chatEntitlementsService.resolve(token).then(() => {
-							if (token.isCancellationRequested) {
-								return;
-							}
-
-							const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = this.chatQuotasService.quotas;
-
-							chatQuotaIndicator(chatTotal, chatRemaining);
-							completionsQuotaIndicator(completionsTotal, completionsRemaining);
-						});
-					}
-
-					// Settings
-					{
-						container.appendChild($('hr'));
-						container.appendChild($('div.header', undefined, localize('settingsTitle', "Settings")));
-						this.createSettings(container, disposables);
-					}
-
-					// Shortcuts
-					{
-						container.appendChild($('hr'));
-						container.appendChild($('div.header', undefined, localize('keybindingsTitle', "Keybindings")));
-						this.createShortcuts(container, disposables);
-					}
-
-					return container;
-				}
-			};
-			command = ShowTooltipCommand;
+			command = TOGGLE_CHAT_ACTION_ID;
 		}
 
 		// Any other User
 		else {
 			tooltip = {
-				element: token => {
-					const { container, disposables } = this.createContainer(token);
-
-					// Settings
-					{
-						container.appendChild($('div.header', undefined, localize('settingsTitle', "Settings")));
-						this.createSettings(container, disposables);
-					}
-
-					// Shortcuts
-					{
-						container.appendChild($('hr'));
-						container.appendChild($('div.header', undefined, localize('keybindingsTitle', "Keybindings")));
-						this.createShortcuts(container, disposables);
-					}
-
-					return container;
-				}
+				element: token => this.dashboard.value.show(token)
 			};
 			command = ShowTooltipCommand;
 		}
@@ -284,14 +212,81 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		};
 	}
 
-	private createContainer(token: CancellationToken): { container: HTMLElement; disposables: DisposableStore } {
+	override dispose(): void {
+		super.dispose();
+
+		this.entry?.dispose();
+		this.entry = undefined;
+	}
+}
+
+class ChatStatusDashboard extends Disposable {
+
+	private readonly element = $('div.chat-status-bar-entry-tooltip');
+
+	private dateFormatter = new Lazy(() => safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric' }));
+	private readonly entryDisposables = this._register(new MutableDisposable());
+
+	constructor(
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IChatQuotasService private readonly chatQuotasService: IChatQuotasService,
+		@IChatEntitlementsService private readonly chatEntitlementsService: IChatEntitlementsService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IHoverService private readonly hoverService: IHoverService,
+		@IEditorService private readonly editorService: IEditorService,
+		@ILanguageService private readonly languageService: ILanguageService,
+		@IKeybindingService private readonly keybindingService: IKeybindingService,
+		@ICommandService private readonly commandService: ICommandService,
+	) {
+		super();
+	}
+
+	show(token: CancellationToken): HTMLElement {
+		clearNode(this.element);
+
 		const disposables = this.entryDisposables.value = new DisposableStore();
 		disposables.add(token.onCancellationRequested(() => disposables.dispose()));
 
-		return {
-			container: $('div.chat-status-bar-entry-tooltip'),
-			disposables
-		};
+		// Quota Indicator
+		if (this.chatEntitlementsService.entitlement === ChatEntitlement.Limited) {
+			const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate } = this.chatQuotasService.quotas;
+
+			this.element.appendChild($('div.header', undefined, localize('usageTitle', "Copilot Free Usage")));
+
+			const chatQuotaIndicator = this.createQuotaIndicator(this.element, chatTotal, chatRemaining, localize('chatsLabel', "Chat messages"));
+			const completionsQuotaIndicator = this.createQuotaIndicator(this.element, completionsTotal, completionsRemaining, localize('completionsLabel', "Code completions"));
+
+			this.element.appendChild($('div.description', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.value.format(quotaResetDate))));
+
+			(async () => {
+				const res = await this.chatEntitlementsService.resolve(token);
+				if (!res?.quotas || token.isCancellationRequested) {
+					return;
+				}
+
+				const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = res.quotas;
+
+				chatQuotaIndicator(chatTotal, chatRemaining);
+				completionsQuotaIndicator(completionsTotal, completionsRemaining);
+			})();
+
+			this.element.appendChild($('hr'));
+		}
+
+		// Settings
+		{
+			this.element.appendChild($('div.header', undefined, localize('settingsTitle', "Settings")));
+			this.createSettings(this.element, disposables);
+		}
+
+		// Shortcuts
+		{
+			this.element.appendChild($('hr'));
+			this.element.appendChild($('div.header', undefined, localize('keybindingsTitle', "Keybindings")));
+			this.createShortcuts(this.element, disposables);
+		}
+
+		return this.element;
 	}
 
 	private createQuotaIndicator(container: HTMLElement, total: number | undefined, remaining: number | undefined, label: string): (total: number | undefined, remaining: number | undefined) => void {
@@ -334,56 +329,6 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		return update;
 	}
 
-	private createShortcuts(container: HTMLElement, disposables: DisposableStore): HTMLElement {
-		const shortcuts = container.appendChild($('div.shortcuts'));
-
-		const entries = coalesce([
-			{ text: localize('shortcuts.chat', "Chat"), id: CHAT_OPEN_ACTION_ID },
-			{ text: localize('shortcuts.copilotEdits', "Copilot Edits"), id: 'workbench.action.chat.openEditSession' },
-			this.contextKeyService.contextMatchesRules(ContextKeyExpr.and(
-				CTX_INLINE_CHAT_POSSIBLE,
-				EditorContextKeys.writable,
-				EditorContextKeys.editorSimpleInput.negate()
-			)) ? { text: localize('shortcuts.inlineChat', "Inline Chat"), id: 'inlineChat.start' } : undefined,
-			{ text: localize('shortcuts.quickChat', "Quick Chat"), id: 'workbench.action.quickchat.toggle' },
-		]);
-
-		const onTrigger = (commandId: string, e: EventLike) => {
-			EventHelper.stop(e, true);
-
-			this.hoverService.hideHover(true);
-			this.commandService.executeCommand(commandId);
-		};
-
-		for (const entry of entries) {
-			const keys = this.keybindingService.lookupKeybinding(entry.id);
-			if (!keys) {
-				continue;
-			}
-
-			const shortcut = append(shortcuts, $('div.shortcut', { tabIndex: 0, role: 'button', 'aria-label': entry.text }));
-
-			append(shortcut, $('span.shortcut-label', undefined, entry.text));
-
-			const shortcutKey = disposables.add(new KeybindingLabel(shortcut, OS, { ...defaultKeybindingLabelStyles }));
-			shortcutKey.set(keys);
-
-			disposables.add(Gesture.addTarget(shortcut));
-			[EventType.CLICK, TouchEventType.Tap].forEach(eventType => {
-				disposables.add(addDisposableListener(shortcut, eventType, e => onTrigger(entry.id, e)));
-			});
-
-			disposables.add(addDisposableListener(shortcut, EventType.KEY_DOWN, e => {
-				const event = new StandardKeyboardEvent(e);
-				if ((event.equals(KeyCode.Enter) || event.equals(KeyCode.Space))) {
-					onTrigger(entry.id, e);
-				}
-			}));
-		}
-
-		return shortcuts;
-	}
-
 	private createSettings(container: HTMLElement, disposables: DisposableStore): HTMLElement {
 		const language = this.editorService.activeTextEditorLanguageId;
 		const settings = container.appendChild($('div.settings'));
@@ -454,10 +399,53 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		}));
 	}
 
-	override dispose(): void {
-		super.dispose();
+	private createShortcuts(container: HTMLElement, disposables: DisposableStore): HTMLElement {
+		const shortcuts = container.appendChild($('div.shortcuts'));
 
-		this.entry?.dispose();
-		this.entry = undefined;
+		const entries = coalesce([
+			{ text: localize('shortcuts.chat', "Chat"), id: CHAT_OPEN_ACTION_ID },
+			{ text: localize('shortcuts.copilotEdits', "Copilot Edits"), id: 'workbench.action.chat.openEditSession' },
+			this.contextKeyService.contextMatchesRules(ContextKeyExpr.and(
+				CTX_INLINE_CHAT_POSSIBLE,
+				EditorContextKeys.writable,
+				EditorContextKeys.editorSimpleInput.negate()
+			)) ? { text: localize('shortcuts.inlineChat', "Inline Chat"), id: 'inlineChat.start' } : undefined,
+			{ text: localize('shortcuts.quickChat', "Quick Chat"), id: 'workbench.action.quickchat.toggle' },
+		]);
+
+		const onTrigger = (commandId: string, e: EventLike) => {
+			EventHelper.stop(e, true);
+
+			this.hoverService.hideHover(true);
+			this.commandService.executeCommand(commandId);
+		};
+
+		for (const entry of entries) {
+			const keys = this.keybindingService.lookupKeybinding(entry.id);
+			if (!keys) {
+				continue;
+			}
+
+			const shortcut = append(shortcuts, $('div.shortcut', { tabIndex: 0, role: 'button', 'aria-label': entry.text }));
+
+			append(shortcut, $('span.shortcut-label', undefined, entry.text));
+
+			const shortcutKey = disposables.add(new KeybindingLabel(shortcut, OS, { ...defaultKeybindingLabelStyles }));
+			shortcutKey.set(keys);
+
+			disposables.add(Gesture.addTarget(shortcut));
+			[EventType.CLICK, TouchEventType.Tap].forEach(eventType => {
+				disposables.add(addDisposableListener(shortcut, eventType, e => onTrigger(entry.id, e)));
+			});
+
+			disposables.add(addDisposableListener(shortcut, EventType.KEY_DOWN, e => {
+				const event = new StandardKeyboardEvent(e);
+				if ((event.equals(KeyCode.Enter) || event.equals(KeyCode.Space))) {
+					onTrigger(entry.id, e);
+				}
+			}));
+		}
+
+		return shortcuts;
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/common/chatEntitlementsService.ts b/src/vs/workbench/contrib/chat/common/chatEntitlementsService.ts
index c0f6f1ce8470..41c001c1ee7f 100644
--- a/src/vs/workbench/contrib/chat/common/chatEntitlementsService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatEntitlementsService.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Event } from '../../../../base/common/event.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
 export const IChatEntitlementsService = createDecorator<IChatEntitlementsService>('chatEntitlementsService');
@@ -42,5 +43,9 @@ export interface IChatEntitlementsService {
 
 	_serviceBrand: undefined;
 
+	readonly onDidChangeEntitlement: Event<void>;
+
+	readonly entitlement: ChatEntitlement;
+
 	resolve(token: CancellationToken): Promise<IChatEntitlements | undefined>;
 }
diff --git a/src/vs/workbench/contrib/chat/common/chatQuotasService.ts b/src/vs/workbench/contrib/chat/common/chatQuotasService.ts
index 9d4a350a72c0..a77b5ae38460 100644
--- a/src/vs/workbench/contrib/chat/common/chatQuotasService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatQuotasService.ts
@@ -19,9 +19,6 @@ export interface IChatQuotasService {
 	readonly onDidChangeQuotaRemaining: Event<void>;
 
 	readonly quotas: IChatQuotas;
-
-	acceptQuotas(quotas: IChatQuotas): void;
-	clearQuotas(): void;
 }
 
 export interface IChatQuotas {
@@ -96,7 +93,7 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 
 	acceptQuotas(quotas: IChatQuotas): void {
 		const oldQuota = this._quotas;
-		this._quotas = this.massageQuotas(quotas);
+		this._quotas = quotas;
 		this.updateContextKeys();
 
 		if (
@@ -114,14 +111,6 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 		}
 	}
 
-	private massageQuotas(quotas: IChatQuotas): IChatQuotas {
-		return {
-			...quotas,
-			chatRemaining: typeof quotas.chatRemaining === 'number' ? Math.max(0, quotas.chatRemaining) : undefined,
-			completionsRemaining: typeof quotas.completionsRemaining === 'number' ? Math.max(0, quotas.completionsRemaining) : undefined
-		};
-	}
-
 	clearQuotas(): void {
 		if (this.quotas.chatQuotaExceeded || this.quotas.completionsQuotaExceeded) {
 			this.acceptQuotas({ chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: undefined });

From 3e9713ff8c089714178f320a42dac223a0636824 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sat, 1 Mar 2025 11:02:49 -0800
Subject: [PATCH 0555/1815] Don't collect codeblocks after chat part disposal
 (#242392)

Fix #241859
---
 src/vs/base/common/lifecycle.ts               | 16 +++++++++++
 src/vs/base/test/common/lifecycle.test.ts     | 28 ++++++++++++++++++-
 .../contrib/chat/browser/chatListRenderer.ts  |  6 ++--
 .../contrib/mergeEditor/browser/utils.ts      | 16 +----------
 .../mergeEditor/browser/view/mergeEditor.ts   |  4 +--
 5 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/src/vs/base/common/lifecycle.ts b/src/vs/base/common/lifecycle.ts
index e04e62f76d38..036ff73392e8 100644
--- a/src/vs/base/common/lifecycle.ts
+++ b/src/vs/base/common/lifecycle.ts
@@ -827,3 +827,19 @@ export class DisposableMap<K, V extends IDisposable = IDisposable> implements ID
 		return this._store[Symbol.iterator]();
 	}
 }
+
+/**
+ * Call `then` on a Promise, unless the returned disposable is disposed.
+ */
+export function thenIfNotDisposed<T>(promise: Promise<T>, then: (result: T) => void): IDisposable {
+	let disposed = false;
+	promise.then(result => {
+		if (disposed) {
+			return;
+		}
+		then(result);
+	});
+	return toDisposable(() => {
+		disposed = true;
+	});
+}
diff --git a/src/vs/base/test/common/lifecycle.test.ts b/src/vs/base/test/common/lifecycle.test.ts
index fd2fa4ef562c..6576cab31bde 100644
--- a/src/vs/base/test/common/lifecycle.test.ts
+++ b/src/vs/base/test/common/lifecycle.test.ts
@@ -5,7 +5,7 @@
 
 import assert from 'assert';
 import { Emitter } from '../../common/event.js';
-import { DisposableStore, dispose, IDisposable, markAsSingleton, ReferenceCollection, SafeDisposable, toDisposable } from '../../common/lifecycle.js';
+import { DisposableStore, dispose, IDisposable, markAsSingleton, ReferenceCollection, SafeDisposable, thenIfNotDisposed, toDisposable } from '../../common/lifecycle.js';
 import { ensureNoDisposablesAreLeakedInTestSuite, throwIfDisposablesAreLeaked } from './utils.js';
 
 class Disposable implements IDisposable {
@@ -328,4 +328,30 @@ suite('No Leakage Utilities', () => {
 			toDisposable(() => { }).dispose();
 		});
 	});
+
+	suite('thenIfNotDisposed', () => {
+		const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+		test('normal case', async () => {
+			let called = false;
+			store.add(thenIfNotDisposed(Promise.resolve(123), (result: number) => {
+				assert.strictEqual(result, 123);
+				called = true;
+			}));
+
+			await new Promise(resolve => setTimeout(resolve, 0));
+			assert.strictEqual(called, true);
+		});
+
+		test('disposed before promise resolves', async () => {
+			let called = false;
+			const disposable = thenIfNotDisposed(Promise.resolve(123), () => {
+				called = true;
+			});
+
+			disposable.dispose();
+			await new Promise(resolve => setTimeout(resolve, 0));
+			assert.strictEqual(called, false);
+		});
+	});
 });
diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index 95674d712b63..8605f76403cf 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -19,7 +19,7 @@ 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, toDisposable } from '../../../../base/common/lifecycle.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';
@@ -986,7 +986,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 
 		part.codeblocks?.forEach((info, i) => {
 			codeBlocksByResponseId[codeBlockStartIndex + i] = info;
-			info.uriPromise.then(uri => {
+			part.addDisposable!(thenIfNotDisposed(info.uriPromise, uri => {
 				if (!uri) {
 					return;
 				}
@@ -998,7 +998,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 						this.codeBlocksByEditorUri.delete(uri);
 					}
 				}));
-			});
+			}));
 		});
 
 	}
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/utils.ts b/src/vs/workbench/contrib/mergeEditor/browser/utils.ts
index d60d64bcb8d0..308db886d5b4 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/utils.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/utils.ts
@@ -5,7 +5,7 @@
 
 import { ArrayQueue, CompareResult } from '../../../../base/common/arrays.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
-import { DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
 import { IObservable, autorunOpts } from '../../../../base/common/observable.js';
 import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
 import { IModelDeltaDecoration } from '../../../../editor/common/model.js';
@@ -85,19 +85,6 @@ export function elementAtOrUndefined<T>(arr: T[], index: number): T | undefined
 	return arr[index];
 }
 
-export function thenIfNotDisposed<T>(promise: Promise<T>, then: () => void): IDisposable {
-	let disposed = false;
-	promise.then(() => {
-		if (disposed) {
-			return;
-		}
-		then();
-	});
-	return toDisposable(() => {
-		disposed = true;
-	});
-}
-
 export function setFields<T extends {}>(obj: T, fields: Partial<T>): T {
 	return Object.assign(obj, fields);
 }
@@ -154,4 +141,3 @@ export class PersistentStore<T> {
 		);
 	}
 }
-
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts
index 32b12772bef7..d011172bcb13 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts
@@ -10,7 +10,7 @@ import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Color } from '../../../../../base/common/color.js';
 import { BugIndicatingError, onUnexpectedError } from '../../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../../base/common/event.js';
-import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable, thenIfNotDisposed, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { autorun, autorunWithStore, IObservable, IReader, observableValue, transaction } from '../../../../../base/common/observable.js';
 import { basename, isEqual } from '../../../../../base/common/resources.js';
 import { isDefined } from '../../../../../base/common/types.js';
@@ -39,7 +39,7 @@ import { readTransientState, writeTransientState } from '../../../codeEditor/bro
 import { MergeEditorInput } from '../mergeEditorInput.js';
 import { IMergeEditorInputModel } from '../mergeEditorInputModel.js';
 import { MergeEditorModel } from '../model/mergeEditorModel.js';
-import { deepMerge, PersistentStore, thenIfNotDisposed } from '../utils.js';
+import { deepMerge, PersistentStore } from '../utils.js';
 import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
 import { BaseCodeEditorView } from './editors/baseCodeEditorView.js';
 import { ScrollSynchronizer } from './scrollSynchronizer.js';

From 207f99df3c8eb2025c6976afe512b3a1c6024dd5 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Sun, 2 Mar 2025 11:32:59 +1100
Subject: [PATCH 0556/1815] Sync hashing of notebook outputs, hence sync nb
 diffing (#242386)

---
 .../common/services/notebookSimpleWorker.ts   | 56 +++++++++----------
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
index 6414195810c9..0319e8fb93e2 100644
--- a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
+++ b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { IDiffResult, ISequence, LcsDiff } from '../../../../../base/common/diff/diff.js';
-import { doHash, numberHash } from '../../../../../base/common/hash.js';
+import { doHash, hash, numberHash } from '../../../../../base/common/hash.js';
 import { IDisposable } from '../../../../../base/common/lifecycle.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { IRequestHandler, IWorkerServer } from '../../../../../base/common/worker/simpleWorker.js';
@@ -18,7 +18,7 @@ import { filter } from '../../../../../base/common/objects.js';
 
 class MirrorCell {
 	private readonly textModel: MirrorModel;
-	private _hash?: Promise<number>;
+	private _hash?: number;
 	public get eol() {
 		return this._eol === '\r\n' ? DefaultEndOfLine.CRLF : DefaultEndOfLine.LF;
 	}
@@ -46,11 +46,11 @@ class MirrorCell {
 		return this.textModel.getValue();
 	}
 
-	async getComparisonValue(): Promise<number> {
+	getComparisonValue(): number {
 		return this._hash ??= this._getHash();
 	}
 
-	private async _getHash() {
+	private _getHash() {
 		let hashValue = numberHash(104579, 0);
 
 		hashValue = doHash(this.language, hashValue);
@@ -65,15 +65,13 @@ class MirrorCell {
 			}
 		}
 
-		// note: hash has not updated within the Promise.all since we must retain order
-		const digests = await Promise.all(this.outputs.flatMap(op =>
-			op.outputs.map(o => crypto.subtle.digest('sha-1', o.data.buffer))
-		));
+		const digests = this.outputs.flatMap(op =>
+			op.outputs.map(o => hash(Array.from(o.data.buffer)))
+		);
 		for (const digest of digests) {
-			hashValue = numberHash(new Int32Array(digest)[0], hashValue);
+			hashValue = numberHash(digest, hashValue);
 		}
 
-
 		return hashValue;
 	}
 }
@@ -148,21 +146,21 @@ class MirrorNotebookDocument {
 
 class CellSequence implements ISequence {
 
-	static async create(textModel: MirrorNotebookDocument) {
+	static create(textModel: MirrorNotebookDocument) {
 		const hashValue = new Int32Array(textModel.cells.length);
-		await Promise.all(textModel.cells.map(async (c, i) => {
-			hashValue[i] = await c.getComparisonValue();
-		}));
+		textModel.cells.map((c, i) => {
+			hashValue[i] = c.getComparisonValue();
+		});
 		return new CellSequence(hashValue);
 	}
 
-	static async createWithCellId(textModel: MirrorNotebookDocument): Promise<Map<string, number>> {
+	static createWithCellId(textModel: MirrorNotebookDocument): Map<string, number> {
 		const hashValue = new Map<string, number>();
-		await Promise.all(textModel.cells.map(async (c, i) => {
-			const value = await c.getComparisonValue();
+		textModel.cells.map((c, i) => {
+			const value = c.getComparisonValue();
 			const id: string = (c.metadata?.id || '') as string;
 			hashValue.set(id, value);
-		}));
+		});
 		return hashValue;
 	}
 
@@ -220,10 +218,8 @@ export class NotebookEditorSimpleWorker implements IRequestHandler, IDisposable
 		const original = this._getModel(originalUrl);
 		const modified = this._getModel(modifiedUrl);
 
-		const [originalSeq, modifiedSeq] = await Promise.all([
-			CellSequence.create(original),
-			CellSequence.create(modified),
-		]);
+		const originalSeq = CellSequence.create(original);
+		const modifiedSeq = CellSequence.create(modified);
 
 		const diff = new LcsDiff(originalSeq, modifiedSeq);
 		const diffResult = diff.ComputeDiff(false);
@@ -232,12 +228,11 @@ export class NotebookEditorSimpleWorker implements IRequestHandler, IDisposable
 		const modifiedMetadata = filter(modified.metadata, key => !modified.transientDocumentMetadata[key]);
 		return {
 			metadataChanged: JSON.stringify(originalMetadata) !== JSON.stringify(modifiedMetadata),
-			cellsDiff: await this.$computeDiffWithCellIds(original, modified) || diffResult,
-			// linesDiff: cellLineChanges
+			cellsDiff: this.$computeDiffWithCellIds(original, modified) || diffResult,
 		};
 	}
 
-	async $computeDiffWithCellIds(original: MirrorNotebookDocument, modified: MirrorNotebookDocument): Promise<IDiffResult | undefined> {
+	$computeDiffWithCellIds(original: MirrorNotebookDocument, modified: MirrorNotebookDocument): IDiffResult | undefined {
 		const originalCellIndexIds = original.cells.map((cell, index) => ({ index, id: (cell.metadata?.id || '') as string }));
 		const modifiedCellIndexIds = modified.cells.map((cell, index) => ({ index, id: (cell.metadata?.id || '') as string }));
 		const originalCellIds = originalCellIndexIds.map(c => c.id);
@@ -250,18 +245,19 @@ export class NotebookEditorSimpleWorker implements IRequestHandler, IDisposable
 
 		const diffResult: IDiffResult = { changes: [], quitEarly: false, };
 
-		const computeCellHashesById = async (notebook: MirrorNotebookDocument) => {
+		const computeCellHashesById = (notebook: MirrorNotebookDocument) => {
 			const hashValue = new Map<string, number>();
-			await Promise.all(notebook.cells.map(async (c, i) => {
-				const value = await c.getComparisonValue();
+			notebook.cells.map((c, i) => {
+				const value = c.getComparisonValue();
 				// Verified earlier that these cannot be empty.
 				const id: string = (c.metadata?.id || '') as string;
 				hashValue.set(id, value);
-			}));
+			});
 			return hashValue;
 		};
 
-		const [originalSeq, modifiedSeq] = await Promise.all([computeCellHashesById(original), computeCellHashesById(modified)]);
+		const originalSeq = computeCellHashesById(original);
+		const modifiedSeq = computeCellHashesById(modified);
 
 		while (modifiedCellIndexIds.length) {
 			const modifiedCell = modifiedCellIndexIds.shift()!;

From 6a9abc778eb8ce4356f4b40bdc71a133edc32c52 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Sat, 1 Mar 2025 21:18:44 -0800
Subject: [PATCH 0557/1815] Fix a few broken `@link` in vscode.d.ts

---
 src/vscode-dts/vscode.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts
index b4c132d62817..c1130767a8a2 100644
--- a/src/vscode-dts/vscode.d.ts
+++ b/src/vscode-dts/vscode.d.ts
@@ -18634,7 +18634,7 @@ declare module 'vscode' {
 		 * used to represent line coverage.
 		 * @param branchCoverage Branch coverage information
 		 * @param declarationCoverage Declaration coverage information
-		 * @param includesTests Test cases included in this coverage report, see {@link includesTests}
+		 * @param includesTests Test cases included in this coverage report, see {@link FileCoverage.includesTests}
 		 */
 		constructor(
 			uri: Uri,
@@ -19481,7 +19481,7 @@ declare module 'vscode' {
 		readonly toolInvocationToken: ChatParticipantToolToken;
 
 		/**
-		 * This is the model that is currently selected in the UI. Extensions can use this or use {@link chat.selectChatModels} to
+		 * This is the model that is currently selected in the UI. Extensions can use this or use {@link lm.selectChatModels} to
 		 * pick another model. Don't hold onto this past the lifetime of the request.
 		 */
 		readonly model: LanguageModelChat;
@@ -19774,7 +19774,7 @@ declare module 'vscode' {
 	/**
 	 * Represents a language model response.
 	 *
-	 * @see {@link LanguageModelAccess.chatRequest}
+	 * @see {@link ChatRequest}
 	 */
 	export interface LanguageModelChatResponse {
 

From e8c27bc34442a660e50e97331ef7ace6bc9fa9be Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sun, 2 Mar 2025 09:31:58 +0100
Subject: [PATCH 0558/1815] chat - merge quota and entitlement service
 (#242408)

---
 .../chat/browser/actions/chatActions.ts       |  24 +-
 .../contrib/chat/browser/chat.contribution.ts |  10 +-
 .../contrib/chat/browser/chatInputPart.ts     |   6 +-
 .../contrib/chat/browser/chatSetup.ts         | 636 +-------------
 .../contrib/chat/browser/chatStatus.ts        |  29 +-
 .../chat/common/chatEntitlementService.ts     | 810 ++++++++++++++++++
 .../chat/common/chatEntitlementsService.ts    |  51 --
 .../contrib/chat/common/chatQuotasService.ts  | 124 ---
 8 files changed, 850 insertions(+), 840 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
 delete mode 100644 src/vs/workbench/contrib/chat/common/chatEntitlementsService.ts
 delete mode 100644 src/vs/workbench/contrib/chat/common/chatQuotasService.ts

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index c6a801fc308e..43a4a2646fd1 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -46,7 +46,6 @@ import { ILanguageModelToolsService } from '../../common/languageModelToolsServi
 import { ChatViewId, EditsViewId, IChatWidget, IChatWidgetService, showChatView, showCopilotView } from '../chat.js';
 import { IChatEditorOptions } from '../chatEditor.js';
 import { ChatEditorInput } from '../chatEditorInput.js';
-import { IChatQuotasService } from '../../common/chatQuotasService.js';
 import { ChatViewPane } from '../chatViewPane.js';
 import { convertBufferToScreenshotVariable } from '../contrib/screenshot.js';
 import { clearChatEditor } from './chatClear.js';
@@ -55,7 +54,7 @@ import { language } from '../../../../../base/common/platform.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { IWorkbenchLayoutService, Parts } from '../../../../services/layout/browser/layoutService.js';
 import { IViewDescriptorService, ViewContainerLocation } from '../../../../common/views.js';
-import { ChatEntitlement, IChatEntitlementsService } from '../../common/chatEntitlementsService.js';
+import { ChatEntitlement, IChatEntitlementService } from '../../common/chatEntitlementService.js';
 
 export const CHAT_CATEGORY = localize2('chat.category', 'Chat');
 
@@ -587,20 +586,20 @@ export function registerChatActions() {
 		}
 
 		override async run(accessor: ServicesAccessor) {
-			const chatQuotasService = accessor.get(IChatQuotasService);
+			const chatEntitlementService = accessor.get(IChatEntitlementService);
 			const commandService = accessor.get(ICommandService);
 			const dialogService = accessor.get(IDialogService);
 
 			const dateFormatter = safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric' });
 
 			let message: string;
-			const { chatQuotaExceeded, completionsQuotaExceeded } = chatQuotasService.quotas;
+			const { chatQuotaExceeded, completionsQuotaExceeded } = chatEntitlementService.quotas;
 			if (chatQuotaExceeded && !completionsQuotaExceeded) {
-				message = localize('chatQuotaExceeded', "You've run out of free chat messages. You still have free code completions available in the Copilot Free plan. These limits will reset on {0}.", dateFormatter.format(chatQuotasService.quotas.quotaResetDate));
+				message = localize('chatQuotaExceeded', "You've run out of free chat messages. You still have free code completions available in the Copilot Free plan. These limits will reset on {0}.", dateFormatter.format(chatEntitlementService.quotas.quotaResetDate));
 			} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-				message = localize('completionsQuotaExceeded', "You've run out of free code completions. You still have free chat messages available in the Copilot Free plan. These limits will reset on {0}.", dateFormatter.format(chatQuotasService.quotas.quotaResetDate));
+				message = localize('completionsQuotaExceeded', "You've run out of free code completions. You still have free chat messages available in the Copilot Free plan. These limits will reset on {0}.", dateFormatter.format(chatEntitlementService.quotas.quotaResetDate));
 			} else {
-				message = localize('chatAndCompletionsQuotaExceeded', "You've reached the limit of the Copilot Free plan. These limits will reset on {0}.", dateFormatter.format(chatQuotasService.quotas.quotaResetDate));
+				message = localize('chatAndCompletionsQuotaExceeded', "You've reached the limit of the Copilot Free plan. These limits will reset on {0}.", dateFormatter.format(chatEntitlementService.quotas.quotaResetDate));
 			}
 
 			const upgradeToPro = localize('upgradeToPro', "Upgrade to Copilot Pro (your first 30 days are free) for:\n- Unlimited code completions\n- Unlimited chat messages\n- Access to additional models");
@@ -693,9 +692,8 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 	constructor(
 		@IActionViewItemService actionViewItemService: IActionViewItemService,
 		@IChatAgentService agentService: IChatAgentService,
-		@IChatQuotasService chatQuotasService: IChatQuotasService,
 		@IInstantiationService instantiationService: IInstantiationService,
-		@IChatEntitlementsService chatEntitlementsService: IChatEntitlementsService
+		@IChatEntitlementService chatEntitlementService: IChatEntitlementService
 	) {
 		super();
 
@@ -711,8 +709,8 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 			});
 
 			const chatExtensionInstalled = agentService.getAgents().some(agent => agent.isDefault);
-			const { chatQuotaExceeded, completionsQuotaExceeded } = chatQuotasService.quotas;
-			const signedOut = chatEntitlementsService.entitlement === ChatEntitlement.Unknown;
+			const { chatQuotaExceeded, completionsQuotaExceeded } = chatEntitlementService.quotas;
+			const signedOut = chatEntitlementService.entitlement === ChatEntitlement.Unknown;
 
 			let primaryActionId: string;
 			let primaryActionTitle: string;
@@ -743,8 +741,8 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 			}, undefined, undefined, undefined, undefined), dropdownAction, action.actions, '', { ...options, skipTelemetry: true });
 		}, Event.any(
 			agentService.onDidChangeAgents,
-			chatQuotasService.onDidChangeQuotaExceeded,
-			chatEntitlementsService.onDidChangeEntitlement
+			chatEntitlementService.onDidChangeQuotaExceeded,
+			chatEntitlementService.onDidChangeEntitlement
 		));
 
 		// Reduces flicker a bit on reload/restart
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 35c7fd59ad90..fd5e161458f4 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -78,10 +78,9 @@ import { agentSlashCommandToMarkdown, agentToMarkdown } from './chatMarkdownDeco
 import { ChatCompatibilityNotifier, ChatExtensionPointHandler } from './chatParticipant.contribution.js';
 import { ChatPasteProvidersFeature } from './chatPasteProviders.js';
 import { QuickChatService } from './chatQuick.js';
-import { ChatQuotasService, IChatQuotasService } from '../common/chatQuotasService.js';
 import { ChatResponseAccessibleView } from './chatResponseAccessibleView.js';
-import { ChatEntitlementsService, ChatSetupContribution } from './chatSetup.js';
-import { ChatEntitlement, IChatEntitlementsService } from '../common/chatEntitlementsService.js';
+import { ChatSetupContribution } from './chatSetup.js';
+import { ChatEntitlement, ChatEntitlementService, IChatEntitlementService } from '../common/chatEntitlementService.js';
 import { ChatVariablesService } from './chatVariables.js';
 import { ChatWidgetService } from './chatWidget.js';
 import { ChatCodeBlockContextProviderService } from './codeBlockContextProviderService.js';
@@ -310,7 +309,7 @@ class ChatAgentSettingContribution extends Disposable implements IWorkbenchContr
 		@IWorkbenchAssignmentService private readonly experimentService: IWorkbenchAssignmentService,
 		@IProductService private readonly productService: IProductService,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IChatEntitlementsService private readonly entitlementService: IChatEntitlementsService,
+		@IChatEntitlementService private readonly entitlementService: IChatEntitlementService,
 	) {
 		super();
 
@@ -547,8 +546,7 @@ registerSingleton(ICodeMapperService, CodeMapperService, InstantiationType.Delay
 registerSingleton(IChatEditingService, ChatEditingService, InstantiationType.Delayed);
 registerSingleton(IChatMarkdownAnchorService, ChatMarkdownAnchorService, InstantiationType.Delayed);
 registerSingleton(ILanguageModelIgnoredFilesService, LanguageModelIgnoredFilesService, InstantiationType.Delayed);
-registerSingleton(IChatQuotasService, ChatQuotasService, InstantiationType.Delayed);
-registerSingleton(IChatEntitlementsService, ChatEntitlementsService, InstantiationType.Delayed);
+registerSingleton(IChatEntitlementService, ChatEntitlementService, InstantiationType.Delayed);
 registerSingleton(IPromptsService, PromptsService, InstantiationType.Delayed);
 
 registerWorkbenchContribution2(ChatEditingNotebookFileSystemProviderContrib.ID, ChatEditingNotebookFileSystemProviderContrib, WorkbenchPhase.BlockStartup);
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index e30bd8af05f7..8944f97fc43f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -77,7 +77,7 @@ import { revealInSideBarCommand } from '../../files/browser/fileActions.contribu
 import { ChatAgentLocation, IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatEditingSession, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../common/chatEditingService.js';
-import { ChatEntitlement, IChatEntitlementsService } from '../common/chatEntitlementsService.js';
+import { ChatEntitlement, IChatEntitlementService } from '../common/chatEntitlementService.js';
 import { IChatRequestVariableEntry, isImageVariableEntry, isLinkVariableEntry, isPasteVariableEntry } from '../common/chatModel.js';
 import { IChatFollowup } from '../common/chatService.js';
 import { IChatVariablesService } from '../common/chatVariables.js';
@@ -1619,7 +1619,7 @@ class ModelPickerActionViewItem extends DropdownMenuActionViewItemWithKeybinding
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IChatEntitlementsService chatEntitlementsService: IChatEntitlementsService,
+		@IChatEntitlementService chatEntitlementService: IChatEntitlementService,
 		@ICommandService commandService: ICommandService,
 	) {
 		const modelActionsProvider: IActionProvider = {
@@ -1642,7 +1642,7 @@ class ModelPickerActionViewItem extends DropdownMenuActionViewItemWithKeybinding
 
 				const models: ILanguageModelChatMetadataAndIdentifier[] = this.delegate.getModels();
 				const actions = models.map(entry => setLanguageModelAction(entry));
-				if (chatEntitlementsService.entitlement === ChatEntitlement.Limited) {
+				if (chatEntitlementService.entitlement === ChatEntitlement.Limited) {
 					actions.push(new Separator());
 					actions.push(toAction({ id: 'moreModels', label: localize('chat.moreModels', "Add More Models..."), run: () => commandService.executeCommand('workbench.action.chat.upgradePlan') }));
 				}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index a55e7f20cef7..c0c4a49447e8 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -8,58 +8,48 @@ import { $, getActiveElement, setVisibility } from '../../../../base/browser/dom
 import { ButtonWithDropdown } from '../../../../base/browser/ui/button/button.js';
 import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { toAction, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../base/common/actions.js';
-import { Barrier, timeout } from '../../../../base/common/async.js';
-import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { timeout } from '../../../../base/common/async.js';
 import { Codicon } from '../../../../base/common/codicons.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, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { IRequestContext } from '../../../../base/parts/request/common/request.js';
 import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
 import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/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 { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.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 { 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 { Registry } from '../../../../platform/registry/common/platform.js';
-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 { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.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, IAuthenticationExtensionsService, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
-import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
-import { IExtension, IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
 import { IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { CHAT_CATEGORY, CHAT_SETUP_ACTION_ID, CHAT_SETUP_ACTION_LABEL } from './actions/chatActions.js';
 import { ChatViewId, EditsViewId, ensureSideBarChatViewSize, preferCopilotEditsView, showCopilotView } from './chat.js';
 import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
 import { ChatViewsWelcomeExtensions, IChatViewsWelcomeContributionRegistry } from './viewsWelcome/chatViewsWelcome.js';
-import { ChatQuotasService, IChatQuotasService } from '../common/chatQuotasService.js';
 import { mainWindow } from '../../../../base/browser/window.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IHostService } from '../../../services/host/browser/host.js';
 import Severity from '../../../../base/common/severity.js';
-import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
-import { isWeb } from '../../../../base/common/platform.js';
 import { ExtensionUrlHandlerOverrideRegistry } from '../../../services/extensions/browser/extensionUrlHandler.js';
 import { IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
@@ -68,8 +58,8 @@ import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '.
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
 import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
 import { equalsIgnoreCase } from '../../../../base/common/strings.js';
-import { ChatEntitlement, IChatEntitlements, IChatEntitlementsService } from '../common/chatEntitlementsService.js';
 import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
+import { IChatEntitlementService, ChatEntitlement, ChatEntitlementService, ChatSetupContext, ChatSetupRequests } from '../common/chatEntitlementService.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -80,78 +70,15 @@ const defaultChat = {
 	skusDocumentationUrl: product.defaultChatAgent?.skusDocumentationUrl ?? '',
 	publicCodeMatchesUrl: product.defaultChatAgent?.publicCodeMatchesUrl ?? '',
 	upgradePlanUrl: product.defaultChatAgent?.upgradePlanUrl ?? '',
-	providerId: product.defaultChatAgent?.providerId ?? '',
 	providerName: product.defaultChatAgent?.providerName ?? '',
 	enterpriseProviderId: product.defaultChatAgent?.enterpriseProviderId ?? '',
 	enterpriseProviderName: product.defaultChatAgent?.enterpriseProviderName ?? '',
 	providerSetting: product.defaultChatAgent?.providerSetting ?? '',
 	providerUriSetting: product.defaultChatAgent?.providerUriSetting ?? '',
 	providerScopes: product.defaultChatAgent?.providerScopes ?? [[]],
-	entitlementUrl: product.defaultChatAgent?.entitlementUrl ?? '',
-	entitlementSignupLimitedUrl: product.defaultChatAgent?.entitlementSignupLimitedUrl ?? '',
 	manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? '',
 };
 
-//#region Service
-
-export class ChatEntitlementsService extends Disposable implements IChatEntitlementsService {
-
-	declare _serviceBrand: undefined;
-
-	readonly onDidChangeEntitlement = Event.map(
-		Event.filter(
-			this.contextKeyService.onDidChangeContext, e => e.affectsSome(new Set([
-				ChatContextKeys.Setup.pro.key,
-				ChatContextKeys.Setup.limited.key,
-				ChatContextKeys.Setup.canSignUp.key,
-				ChatContextKeys.Setup.signedOut.key
-			])), this._store
-		), () => { }, this._store
-	);
-
-	readonly context: Lazy<ChatSetupContext> | undefined;
-	readonly requests: Lazy<ChatSetupRequests> | undefined;
-
-	get entitlement(): ChatEntitlement {
-		if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.pro.key) === true) {
-			return ChatEntitlement.Pro;
-		} else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.limited.key) === true) {
-			return ChatEntitlement.Limited;
-		} else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.canSignUp.key) === true) {
-			return ChatEntitlement.Available;
-		} else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.signedOut.key) === true) {
-			return ChatEntitlement.Unknown;
-		}
-
-		return ChatEntitlement.Unresolved;
-	}
-
-	constructor(
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IProductService productService: IProductService,
-		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-	) {
-		super();
-
-		if (
-			!productService.defaultChatAgent ||				// needs product config
-			(isWeb && !environmentService.remoteAuthority)	// only enabled locally or a remote backend
-		) {
-			return;
-		}
-
-		const context = this.context = new Lazy(() => this._register(instantiationService.createInstance(ChatSetupContext)));
-		this.requests = new Lazy(() => this._register(instantiationService.createInstance(ChatSetupRequests, context.value)));
-	}
-
-	async resolve(token: CancellationToken): Promise<IChatEntitlements | undefined> {
-		return this.requests?.value.forceResolveEntitlement(undefined, token);
-	}
-}
-
-//#endregion
-
 //#region Contribution
 
 export class ChatSetupContribution extends Disposable implements IWorkbenchContribution {
@@ -163,12 +90,12 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ICommandService private readonly commandService: ICommandService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IChatEntitlementsService chatEntitlementsService: ChatEntitlementsService
+		@IChatEntitlementService chatEntitlementService: ChatEntitlementService
 	) {
 		super();
 
-		const context = chatEntitlementsService.context?.value;
-		const requests = chatEntitlementsService.requests?.value;
+		const context = chatEntitlementService.context?.value;
+		const requests = chatEntitlementService.requests?.value;
 		if (!context || !requests) {
 			return; // disabled
 		}
@@ -190,11 +117,11 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 	}
 
 	private registerActions(context: ChatSetupContext, requests: ChatSetupRequests): void {
-
 		const chatSetupTriggerContext = ContextKeyExpr.or(
 			ChatContextKeys.Setup.installed.negate(),
 			ChatContextKeys.Setup.canSignUp
 		);
+
 		class ChatSetupTriggerAction extends Action2 {
 
 			constructor() {
@@ -362,418 +289,6 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 
 //#endregion
 
-//#region Chat Setup Request Service
-
-type EntitlementClassification = {
-	tid: { classification: 'EndUserPseudonymizedInformation'; purpose: 'BusinessInsight'; comment: 'The anonymized analytics id returned by the service'; endpoint: 'GoogleAnalyticsId' };
-	entitlement: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Flag indicating the chat entitlement state' };
-	quotaChat: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of chat completions available to the user' };
-	quotaCompletions: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of chat completions available to the user' };
-	quotaResetDate: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The date the quota will reset' };
-	owner: 'bpasero';
-	comment: 'Reporting chat setup entitlements';
-};
-
-type EntitlementEvent = {
-	entitlement: ChatEntitlement;
-	tid: string;
-	quotaChat: number | undefined;
-	quotaCompletions: number | undefined;
-	quotaResetDate: string | undefined;
-};
-
-interface IEntitlementsResponse {
-	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;
-}
-
-class ChatSetupRequests extends Disposable {
-
-	static providerId(configurationService: IConfigurationService): string {
-		if (configurationService.getValue<string | undefined>(defaultChat.providerSetting) === defaultChat.enterpriseProviderId) {
-			return defaultChat.enterpriseProviderId;
-		}
-
-		return defaultChat.providerId;
-	}
-
-	private state: IChatEntitlements = { entitlement: this.context.state.entitlement };
-
-	private pendingResolveCts = new CancellationTokenSource();
-	private didResolveEntitlements = false;
-
-	constructor(
-		private readonly context: ChatSetupContext,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
-		@ILogService private readonly logService: ILogService,
-		@IRequestService private readonly requestService: IRequestService,
-		@IChatQuotasService private readonly chatQuotasService: ChatQuotasService,
-		@IDialogService private readonly dialogService: IDialogService,
-		@IOpenerService private readonly openerService: IOpenerService,
-		@IConfigurationService private readonly configurationService: IConfigurationService
-	) {
-		super();
-
-		this.registerListeners();
-
-		this.resolve();
-	}
-
-	private registerListeners(): void {
-		this._register(this.authenticationService.onDidChangeDeclaredProviders(() => this.resolve()));
-
-		this._register(this.authenticationService.onDidChangeSessions(e => {
-			if (e.providerId === ChatSetupRequests.providerId(this.configurationService)) {
-				this.resolve();
-			}
-		}));
-
-		this._register(this.authenticationService.onDidRegisterAuthenticationProvider(e => {
-			if (e.id === ChatSetupRequests.providerId(this.configurationService)) {
-				this.resolve();
-			}
-		}));
-
-		this._register(this.authenticationService.onDidUnregisterAuthenticationProvider(e => {
-			if (e.id === ChatSetupRequests.providerId(this.configurationService)) {
-				this.resolve();
-			}
-		}));
-
-		this._register(this.context.onDidChange(() => {
-			if (!this.context.state.installed || this.context.state.entitlement === ChatEntitlement.Unknown) {
-				// When the extension is not installed or the user is not entitled
-				// make sure to clear quotas so that any indicators are also gone
-				this.state = { entitlement: this.state.entitlement, quotas: undefined };
-				this.chatQuotasService.clearQuotas();
-			}
-		}));
-	}
-
-	private async resolve(): Promise<void> {
-		this.pendingResolveCts.dispose(true);
-		const cts = this.pendingResolveCts = new CancellationTokenSource();
-
-		const session = await this.findMatchingProviderSession(cts.token);
-		if (cts.token.isCancellationRequested) {
-			return;
-		}
-
-		// Immediately signal whether we have a session or not
-		let state: IChatEntitlements | undefined = undefined;
-		if (session) {
-			// 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) {
-			// Afterwards resolve entitlement with a network request
-			// but only unless it was not already resolved before.
-			await this.resolveEntitlement(session, cts.token);
-		}
-	}
-
-	private async findMatchingProviderSession(token: CancellationToken): Promise<AuthenticationSession | undefined> {
-		const sessions = await this.doGetSessions(ChatSetupRequests.providerId(this.configurationService));
-		if (token.isCancellationRequested) {
-			return undefined;
-		}
-
-		for (const session of sessions) {
-			for (const scopes of defaultChat.providerScopes) {
-				if (this.scopesMatch(session.scopes, scopes)) {
-					return session;
-				}
-			}
-		}
-
-		return undefined;
-	}
-
-	private async doGetSessions(providerId: string): Promise<readonly AuthenticationSession[]> {
-		try {
-			return await this.authenticationService.getSessions(providerId);
-		} catch (error) {
-			// ignore - errors can throw if a provider is not registered
-		}
-
-		return [];
-	}
-
-	private scopesMatch(scopes: ReadonlyArray<string>, expectedScopes: string[]): boolean {
-		return scopes.length === expectedScopes.length && expectedScopes.every(scope => scopes.includes(scope));
-	}
-
-	private async resolveEntitlement(session: AuthenticationSession, token: CancellationToken): Promise<IChatEntitlements | undefined> {
-		const entitlements = await this.doResolveEntitlement(session, token);
-		if (typeof entitlements?.entitlement === 'number' && !token.isCancellationRequested) {
-			this.didResolveEntitlements = true;
-			this.update(entitlements);
-		}
-
-		return entitlements;
-	}
-
-	private async doResolveEntitlement(session: AuthenticationSession, token: CancellationToken): Promise<IChatEntitlements | undefined> {
-		if (ChatSetupRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId) {
-			this.logService.trace('[chat setup] entitlement: enterprise provider, assuming Pro');
-			return { entitlement: ChatEntitlement.Pro };
-		}
-
-		if (token.isCancellationRequested) {
-			return undefined;
-		}
-
-		const response = await this.request(defaultChat.entitlementUrl, 'GET', undefined, session, token);
-		if (token.isCancellationRequested) {
-			return undefined;
-		}
-
-		if (!response) {
-			this.logService.trace('[chat setup] entitlement: no response');
-			return { entitlement: ChatEntitlement.Unresolved };
-		}
-
-		if (response.res.statusCode && response.res.statusCode !== 200) {
-			this.logService.trace(`[chat setup] entitlement: unexpected status code ${response.res.statusCode}`);
-			return { 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 setup] entitlement: response has no content');
-			return { entitlement: ChatEntitlement.Unresolved };
-		}
-
-		let entitlementsResponse: IEntitlementsResponse;
-		try {
-			entitlementsResponse = JSON.parse(responseText);
-			this.logService.trace(`[chat setup] entitlement: parsed result is ${JSON.stringify(entitlementsResponse)}`);
-		} catch (err) {
-			this.logService.trace(`[chat setup] entitlement: error parsing response (${err})`);
-			return { entitlement: ChatEntitlement.Unresolved };
-		}
-
-		let entitlement: ChatEntitlement;
-		if (entitlementsResponse.access_type_sku === 'free_limited_copilot') {
-			entitlement = ChatEntitlement.Limited;
-		} else if (entitlementsResponse.can_signup_for_limited) {
-			entitlement = ChatEntitlement.Available;
-		} else if (entitlementsResponse.chat_enabled) {
-			entitlement = ChatEntitlement.Pro;
-		} else {
-			entitlement = ChatEntitlement.Unavailable;
-		}
-
-		const chatRemaining = entitlementsResponse.limited_user_quotas?.chat;
-		const completionsRemaining = entitlementsResponse.limited_user_quotas?.completions;
-
-		const entitlements: IChatEntitlements = {
-			entitlement,
-			quotas: {
-				chatTotal: entitlementsResponse.monthly_quotas?.chat,
-				completionsTotal: entitlementsResponse.monthly_quotas?.completions,
-				chatRemaining: typeof chatRemaining === 'number' ? Math.max(0, chatRemaining) : undefined,
-				completionsRemaining: typeof completionsRemaining === 'number' ? Math.max(0, completionsRemaining) : undefined,
-				resetDate: entitlementsResponse.limited_user_reset_date
-			}
-		};
-
-		this.logService.trace(`[chat setup] entitlement: resolved to ${entitlements.entitlement}, quotas: ${JSON.stringify(entitlements.quotas)}`);
-		this.telemetryService.publicLog2<EntitlementEvent, EntitlementClassification>('chatInstallEntitlement', {
-			entitlement: entitlements.entitlement,
-			tid: entitlementsResponse.analytics_tracking_id,
-			quotaChat: entitlementsResponse.limited_user_quotas?.chat,
-			quotaCompletions: entitlementsResponse.limited_user_quotas?.completions,
-			quotaResetDate: entitlementsResponse.limited_user_reset_date
-		});
-
-		return entitlements;
-	}
-
-	private async request(url: string, type: 'GET', body: undefined, session: AuthenticationSession, token: CancellationToken): Promise<IRequestContext | undefined>;
-	private async request(url: string, type: 'POST', body: object, session: AuthenticationSession, token: CancellationToken): Promise<IRequestContext | undefined>;
-	private async request(url: string, type: 'GET' | 'POST', body: object | undefined, session: AuthenticationSession, token: CancellationToken): Promise<IRequestContext | undefined> {
-		try {
-			return await this.requestService.request({
-				type,
-				url,
-				data: type === 'POST' ? JSON.stringify(body) : undefined,
-				disableCache: true,
-				headers: {
-					'Authorization': `Bearer ${session.accessToken}`
-				}
-			}, token);
-		} catch (error) {
-			if (!token.isCancellationRequested) {
-				this.logService.error(`[chat setup] request: error ${error}`);
-			}
-
-			return undefined;
-		}
-	}
-
-	private update(state: IChatEntitlements): void {
-		this.state = state;
-
-		this.context.update({ entitlement: this.state.entitlement });
-
-		if (state.quotas) {
-			this.chatQuotasService.acceptQuotas({
-				chatQuotaExceeded: typeof state.quotas.chatRemaining === 'number' ? state.quotas.chatRemaining <= 0 : false,
-				completionsQuotaExceeded: typeof state.quotas.completionsRemaining === 'number' ? state.quotas.completionsRemaining <= 0 : false,
-				quotaResetDate: state.quotas.resetDate ? new Date(state.quotas.resetDate) : undefined,
-				chatTotal: state.quotas.chatTotal,
-				completionsTotal: state.quotas.completionsTotal,
-				chatRemaining: state.quotas.chatRemaining,
-				completionsRemaining: state.quotas.completionsRemaining
-			});
-		}
-	}
-
-	async forceResolveEntitlement(session: AuthenticationSession | undefined, token = CancellationToken.None): Promise<IChatEntitlements | undefined> {
-		if (!session) {
-			session = await this.findMatchingProviderSession(token);
-		}
-
-		if (!session) {
-			return undefined;
-		}
-
-		return this.resolveEntitlement(session, token);
-	}
-
-	async signUpLimited(session: 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, session, CancellationToken.None);
-		if (!response) {
-			const retry = await this.onUnknownSignUpError(localize('signUpNoResponseError', "No response received."), '[chat setup] sign-up: no response');
-			return retry ? this.signUpLimited(session) : { errorCode: 1 };
-		}
-
-		if (response.res.statusCode && response.res.statusCode !== 200) {
-			if (response.res.statusCode === 422) {
-				try {
-					const responseText = await asText(response);
-					if (responseText) {
-						const responseError: { message: string } = JSON.parse(responseText);
-						if (typeof responseError.message === 'string' && responseError.message) {
-							this.onUnprocessableSignUpError(`[chat setup] sign-up: unprocessable entity (${responseError.message})`, responseError.message);
-							return { errorCode: response.res.statusCode };
-						}
-					}
-				} catch (error) {
-					// ignore - handled below
-				}
-			}
-			const retry = await this.onUnknownSignUpError(localize('signUpUnexpectedStatusError', "Unexpected status code {0}.", response.res.statusCode), `[chat setup] sign-up: unexpected status code ${response.res.statusCode}`);
-			return retry ? this.signUpLimited(session) : { errorCode: response.res.statusCode };
-		}
-
-		let responseText: string | null = null;
-		try {
-			responseText = await asText(response);
-		} catch (error) {
-			// ignore - handled below
-		}
-
-		if (!responseText) {
-			const retry = await this.onUnknownSignUpError(localize('signUpNoResponseContentsError', "Response has no contents."), '[chat setup] sign-up: response has no content');
-			return retry ? this.signUpLimited(session) : { errorCode: 2 };
-		}
-
-		let parsedResult: { subscribed: boolean } | undefined = undefined;
-		try {
-			parsedResult = JSON.parse(responseText);
-			this.logService.trace(`[chat setup] sign-up: response is ${responseText}`);
-		} catch (err) {
-			const retry = await this.onUnknownSignUpError(localize('signUpInvalidResponseError', "Invalid response contents."), `[chat setup] sign-up: error parsing response (${err})`);
-			return retry ? this.signUpLimited(session) : { errorCode: 3 };
-		}
-
-		// We have made it this far, so the user either did sign-up or was signed-up already.
-		// That is, because the endpoint throws in all other case according to Patrick.
-		this.update({ entitlement: ChatEntitlement.Limited });
-
-		return Boolean(parsedResult?.subscribed);
-	}
-
-	private async onUnknownSignUpError(detail: string, logMessage: string): Promise<boolean> {
-		this.logService.error(logMessage);
-
-		const { confirmed } = await this.dialogService.confirm({
-			type: Severity.Error,
-			message: localize('unknownSignUpError', "An error occurred while signing up for Copilot Free. Would you like to try again?"),
-			detail,
-			primaryButton: localize('retry', "Retry")
-		});
-
-		return confirmed;
-	}
-
-	private onUnprocessableSignUpError(logMessage: string, logDetails: string): void {
-		this.logService.error(logMessage);
-
-		this.dialogService.prompt({
-			type: Severity.Error,
-			message: localize('unprocessableSignUpError', "An error occurred while signing up for Copilot Free."),
-			detail: logDetails,
-			buttons: [
-				{
-					label: localize('ok', "OK"),
-					run: () => { /* noop */ }
-				},
-				{
-					label: localize('learnMore', "Learn More"),
-					run: () => this.openerService.open(URI.parse(defaultChat.upgradePlanUrl))
-				}
-			]
-		});
-	}
-
-	override dispose(): void {
-		this.pendingResolveCts.dispose(true);
-
-		super.dispose();
-	}
-}
-
-//#endregion
-
 //#region Setup Rendering
 
 type InstallChatClassification = {
@@ -912,7 +427,7 @@ class ChatSetupController extends Disposable {
 
 	private async signIn(providerId: string): Promise<{ session: AuthenticationSession | undefined; entitlement: ChatEntitlement | undefined }> {
 		let session: AuthenticationSession | undefined;
-		let entitlements: IChatEntitlements | undefined;
+		let entitlements;
 		try {
 			showCopilotView(this.viewsService, this.layoutService);
 
@@ -1253,139 +768,6 @@ class ChatSetupWelcomeContent extends Disposable {
 
 //#endregion
 
-//#region Context
-
-interface IChatSetupContextState {
-	entitlement: ChatEntitlement;
-	hidden?: boolean;
-	installed?: boolean;
-	registered?: boolean;
-}
-
-class ChatSetupContext extends Disposable {
-
-	private static readonly CHAT_SETUP_CONTEXT_STORAGE_KEY = 'chat.setupContext';
-
-	private readonly canSignUpContextKey = ChatContextKeys.Setup.canSignUp.bindTo(this.contextKeyService);
-	private readonly signedOutContextKey = ChatContextKeys.Setup.signedOut.bindTo(this.contextKeyService);
-	private readonly limitedContextKey = ChatContextKeys.Setup.limited.bindTo(this.contextKeyService);
-	private readonly proContextKey = ChatContextKeys.Setup.pro.bindTo(this.contextKeyService);
-	private readonly hiddenContext = ChatContextKeys.Setup.hidden.bindTo(this.contextKeyService);
-	private readonly installedContext = ChatContextKeys.Setup.installed.bindTo(this.contextKeyService);
-
-	private _state: IChatSetupContextState = this.storageService.getObject<IChatSetupContextState>(ChatSetupContext.CHAT_SETUP_CONTEXT_STORAGE_KEY, StorageScope.PROFILE) ?? { entitlement: ChatEntitlement.Unknown };
-	private suspendedState: IChatSetupContextState | undefined = undefined;
-	get state(): IChatSetupContextState {
-		return this.suspendedState ?? this._state;
-	}
-
-	private readonly _onDidChange = this._register(new Emitter<void>());
-	readonly onDidChange = this._onDidChange.event;
-
-	private updateBarrier: Barrier | undefined = undefined;
-
-	constructor(
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IStorageService private readonly storageService: IStorageService,
-		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
-		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
-		@ILogService private readonly logService: ILogService,
-		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
-	) {
-		super();
-
-		this.checkExtensionInstallation();
-		this.updateContextSync();
-	}
-
-	private async checkExtensionInstallation(): Promise<void> {
-
-		// Await extensions to be ready to be queried
-		await this.extensionsWorkbenchService.queryLocal();
-
-		// Listen to change and process extensions once
-		this._register(Event.runAndSubscribe<IExtension | undefined>(this.extensionsWorkbenchService.onChange, e => {
-			if (e && !ExtensionIdentifier.equals(e.identifier.id, defaultChat.extensionId)) {
-				return; // unrelated event
-			}
-
-			const defaultChatExtension = this.extensionsWorkbenchService.local.find(value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.extensionId));
-			this.update({ installed: !!defaultChatExtension?.local && this.extensionEnablementService.isEnabled(defaultChatExtension.local) });
-		}));
-	}
-
-	update(context: { installed: boolean }): Promise<void>;
-	update(context: { hidden: boolean }): Promise<void>;
-	update(context: { entitlement: ChatEntitlement }): Promise<void>;
-	update(context: { installed?: boolean; hidden?: boolean; entitlement?: ChatEntitlement }): Promise<void> {
-		this.logService.trace(`[chat setup] update(): ${JSON.stringify(context)}`);
-
-		if (typeof context.installed === 'boolean') {
-			this._state.installed = context.installed;
-
-			if (context.installed) {
-				context.hidden = false; // allows to fallback to setup view if the extension is uninstalled
-			}
-		}
-
-		if (typeof context.hidden === 'boolean') {
-			this._state.hidden = context.hidden;
-		}
-
-		if (typeof context.entitlement === 'number') {
-			this._state.entitlement = context.entitlement;
-
-			if (this._state.entitlement === ChatEntitlement.Limited || this._state.entitlement === ChatEntitlement.Pro) {
-				this._state.registered = true; // remember that the user did register to improve setup screen
-			} else if (this._state.entitlement === ChatEntitlement.Available) {
-				this._state.registered = false; // only restore when signed-in user can sign-up for limited
-			}
-		}
-
-		this.storageService.store(ChatSetupContext.CHAT_SETUP_CONTEXT_STORAGE_KEY, this._state, StorageScope.PROFILE, StorageTarget.MACHINE);
-
-		return this.updateContext();
-	}
-
-	private async updateContext(): Promise<void> {
-		await this.updateBarrier?.wait();
-
-		this.updateContextSync();
-	}
-
-	private updateContextSync(): void {
-		this.logService.trace(`[chat setup] updateContext(): ${JSON.stringify(this._state)}`);
-
-		if (!this._state.hidden && !this._state.installed) {
-			// this is ugly but fixes flicker from a previous chat install
-			this.storageService.remove('chat.welcomeMessageContent.panel', StorageScope.APPLICATION);
-			this.storageService.remove('interactive.sessions', this.workspaceContextService.getWorkspace().folders.length ? StorageScope.WORKSPACE : StorageScope.APPLICATION);
-		}
-
-		this.signedOutContextKey.set(this._state.entitlement === ChatEntitlement.Unknown);
-		this.canSignUpContextKey.set(this._state.entitlement === ChatEntitlement.Available);
-		this.limitedContextKey.set(this._state.entitlement === ChatEntitlement.Limited);
-		this.proContextKey.set(this._state.entitlement === ChatEntitlement.Pro);
-		this.hiddenContext.set(!!this._state.hidden);
-		this.installedContext.set(!!this._state.installed);
-
-		this._onDidChange.fire();
-	}
-
-	suspend(): void {
-		this.suspendedState = { ...this._state };
-		this.updateBarrier = new Barrier();
-	}
-
-	resume(): void {
-		this.suspendedState = undefined;
-		this.updateBarrier?.open();
-		this.updateBarrier = undefined;
-	}
-}
-
-//#endregion
-
 function refreshTokens(commandService: ICommandService): void {
 	// ugly, but we need to signal to the extension that entitlements changed
 	commandService.executeCommand('github.copilot.signIn');
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 73b88c35f1ac..ced0ce0fd3ea 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -13,10 +13,9 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowTooltipCommand, StatusbarAlignment, StatusbarEntryKind, TooltipContent } from '../../../services/statusbar/browser/statusbar.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { IChatQuotasService } from '../common/chatQuotasService.js';
 import { quotaToButtonMessage, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, TOGGLE_CHAT_ACTION_ID, CHAT_OPEN_ACTION_ID } from './actions/chatActions.js';
 import { $, addDisposableListener, append, clearNode, EventHelper, EventLike, EventType } from '../../../../base/browser/dom.js';
-import { ChatEntitlement, IChatEntitlementsService } from '../common/chatEntitlementsService.js';
+import { ChatEntitlement, IChatEntitlementService } from '../common/chatEntitlementService.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { defaultCheckboxStyles, defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
@@ -105,8 +104,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 	constructor(
 		@IStatusbarService private readonly statusbarService: IStatusbarService,
-		@IChatQuotasService private readonly chatQuotasService: IChatQuotasService,
-		@IChatEntitlementsService private readonly chatEntitlementsService: IChatEntitlementsService,
+		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IProductService private readonly productService: IProductService,
@@ -146,8 +144,8 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			}
 		}));
 
-		this._register(this.chatQuotasService.onDidChangeQuotaExceeded(() => this.entry?.update(this.getEntryProps())));
-		this._register(this.chatEntitlementsService.onDidChangeEntitlement(() => this.entry?.update(this.getEntryProps())));
+		this._register(this.chatEntitlementService.onDidChangeQuotaExceeded(() => this.entry?.update(this.getEntryProps())));
+		this._register(this.chatEntitlementService.onDidChangeEntitlement(() => this.entry?.update(this.getEntryProps())));
 	}
 
 	private getEntryProps(): IStatusbarEntry {
@@ -158,7 +156,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		let kind: StatusbarEntryKind | undefined;
 
 		// Quota Exceeded
-		const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatQuotasService.quotas;
+		const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatEntitlementService.quotas;
 		if (chatQuotaExceeded || completionsQuotaExceeded) {
 			let quotaWarning: string;
 			if (chatQuotaExceeded && !completionsQuotaExceeded) {
@@ -179,14 +177,14 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		// Copilot Not Installed
 		else if (
 			this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.installed.key) === false ||
-			this.chatEntitlementsService.entitlement === ChatEntitlement.Available
+			this.chatEntitlementService.entitlement === ChatEntitlement.Available
 		) {
 			tooltip = CHAT_SETUP_ACTION_LABEL.value;
 			command = TOGGLE_CHAT_ACTION_ID;
 		}
 
 		// Signed out
-		else if (this.chatEntitlementsService.entitlement === ChatEntitlement.Unknown) {
+		else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
 			text = '$(copilot-not-connected)';
 			ariaLabel = localize('signInToUseCopilot', "Sign in to Use Copilot...");
 			tooltip = localize('signInToUseCopilot', "Sign in to Use Copilot...");
@@ -229,8 +227,7 @@ class ChatStatusDashboard extends Disposable {
 
 	constructor(
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IChatQuotasService private readonly chatQuotasService: IChatQuotasService,
-		@IChatEntitlementsService private readonly chatEntitlementsService: IChatEntitlementsService,
+		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IHoverService private readonly hoverService: IHoverService,
 		@IEditorService private readonly editorService: IEditorService,
@@ -248,8 +245,8 @@ class ChatStatusDashboard extends Disposable {
 		disposables.add(token.onCancellationRequested(() => disposables.dispose()));
 
 		// Quota Indicator
-		if (this.chatEntitlementsService.entitlement === ChatEntitlement.Limited) {
-			const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate } = this.chatQuotasService.quotas;
+		if (this.chatEntitlementService.entitlement === ChatEntitlement.Limited) {
+			const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate } = this.chatEntitlementService.quotas;
 
 			this.element.appendChild($('div.header', undefined, localize('usageTitle', "Copilot Free Usage")));
 
@@ -259,12 +256,12 @@ class ChatStatusDashboard extends Disposable {
 			this.element.appendChild($('div.description', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.value.format(quotaResetDate))));
 
 			(async () => {
-				const res = await this.chatEntitlementsService.resolve(token);
-				if (!res?.quotas || token.isCancellationRequested) {
+				await this.chatEntitlementService.update(token);
+				if (token.isCancellationRequested) {
 					return;
 				}
 
-				const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = res.quotas;
+				const { chatTotal, chatRemaining, completionsTotal, completionsRemaining } = this.chatEntitlementService.quotas;
 
 				chatQuotaIndicator(chatTotal, chatRemaining);
 				completionsQuotaIndicator(completionsTotal, completionsRemaining);
diff --git a/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts b/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
new file mode 100644
index 000000000000..2c9711944bbd
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/chatEntitlementService.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 product from '../../../../platform/product/common/product.js';
+import { Barrier } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IRequestContext } from '../../../../base/parts/request/common/request.js';
+import { localize } from '../../../../nls.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 { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+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 { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { AuthenticationSession, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
+import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
+import { IExtension, IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { ChatContextKeys } from './chatContextKeys.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { URI } from '../../../../base/common/uri.js';
+import Severity from '../../../../base/common/severity.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { isWeb } from '../../../../base/common/platform.js';
+
+export const IChatEntitlementService = createDecorator<IChatEntitlementService>('chatEntitlementService');
+
+export enum ChatEntitlement {
+	/** Signed out */
+	Unknown = 1,
+	/** Signed in but not yet resolved */
+	Unresolved,
+	/** Signed in and entitled to Limited */
+	Available,
+	/** Signed in but not entitled to Limited */
+	Unavailable,
+	/** Signed-up to Limited */
+	Limited,
+	/** Signed-up to Pro */
+	Pro
+}
+
+export interface IChatQuotas {
+	readonly chatQuotaExceeded: boolean;
+	readonly completionsQuotaExceeded: boolean;
+	readonly quotaResetDate: Date | undefined;
+
+	readonly chatTotal?: number;
+	readonly completionsTotal?: number;
+
+	readonly chatRemaining?: number;
+	readonly completionsRemaining?: number;
+}
+
+export interface IChatEntitlementService {
+
+	_serviceBrand: undefined;
+
+	readonly onDidChangeEntitlement: Event<void>;
+
+	readonly entitlement: ChatEntitlement;
+
+	readonly onDidChangeQuotaExceeded: Event<void>;
+	readonly onDidChangeQuotaRemaining: Event<void>;
+
+	readonly quotas: IChatQuotas;
+
+	update(token: CancellationToken): Promise<void>;
+}
+
+//#region Service Implementation
+
+const defaultChat = {
+	extensionId: product.defaultChatAgent?.extensionId ?? '',
+	upgradePlanUrl: product.defaultChatAgent?.upgradePlanUrl ?? '',
+	providerId: product.defaultChatAgent?.providerId ?? '',
+	enterpriseProviderId: product.defaultChatAgent?.enterpriseProviderId ?? '',
+	providerSetting: product.defaultChatAgent?.providerSetting ?? '',
+	providerScopes: product.defaultChatAgent?.providerScopes ?? [[]],
+	entitlementUrl: product.defaultChatAgent?.entitlementUrl ?? '',
+	entitlementSignupLimitedUrl: product.defaultChatAgent?.entitlementSignupLimitedUrl ?? '',
+};
+
+interface IChatQuotasAccessor {
+	clearQuotas(): void;
+	acceptQuotas(quotas: IChatQuotas): void;
+}
+
+export class ChatEntitlementService extends Disposable implements IChatEntitlementService {
+
+	declare _serviceBrand: undefined;
+
+	readonly context: Lazy<ChatSetupContext> | undefined;
+	readonly requests: Lazy<ChatSetupRequests> | undefined;
+
+	constructor(
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IProductService productService: IProductService,
+		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+	) {
+		super();
+
+		if (
+			!productService.defaultChatAgent ||				// needs product config
+			(isWeb && !environmentService.remoteAuthority)	// only enabled locally or a remote backend
+		) {
+			return;
+		}
+
+		const context = this.context = new Lazy(() => this._register(instantiationService.createInstance(ChatSetupContext)));
+		this.requests = new Lazy(() => this._register(instantiationService.createInstance(ChatSetupRequests, context.value, {
+			clearQuotas: () => this.clearQuotas(),
+			acceptQuotas: quotas => this.acceptQuotas(quotas)
+		})));
+
+		this.registerListeners();
+	}
+
+	//#region --- Entitlements
+
+	readonly onDidChangeEntitlement = Event.map(
+		Event.filter(
+			this.contextKeyService.onDidChangeContext, e => e.affectsSome(new Set([
+				ChatContextKeys.Setup.pro.key,
+				ChatContextKeys.Setup.limited.key,
+				ChatContextKeys.Setup.canSignUp.key,
+				ChatContextKeys.Setup.signedOut.key
+			])), this._store
+		), () => { }, this._store
+	);
+
+	get entitlement(): ChatEntitlement {
+		if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.pro.key) === true) {
+			return ChatEntitlement.Pro;
+		} else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.limited.key) === true) {
+			return ChatEntitlement.Limited;
+		} else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.canSignUp.key) === true) {
+			return ChatEntitlement.Available;
+		} else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.signedOut.key) === true) {
+			return ChatEntitlement.Unknown;
+		}
+
+		return ChatEntitlement.Unresolved;
+	}
+
+	//#endregion
+
+	//#region --- Quotas
+
+	private readonly _onDidChangeQuotaExceeded = this._register(new Emitter<void>());
+	readonly onDidChangeQuotaExceeded = this._onDidChangeQuotaExceeded.event;
+
+	private readonly _onDidChangeQuotaRemaining = this._register(new Emitter<void>());
+	readonly onDidChangeQuotaRemaining = this._onDidChangeQuotaRemaining.event;
+
+	private _quotas: IChatQuotas = { chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: undefined };
+	get quotas() { return this._quotas; }
+
+	private readonly chatQuotaExceededContextKey = ChatContextKeys.chatQuotaExceeded.bindTo(this.contextKeyService);
+	private readonly completionsQuotaExceededContextKey = ChatContextKeys.completionsQuotaExceeded.bindTo(this.contextKeyService);
+
+	private ExtensionQuotaContextKeys = {
+		chatQuotaExceeded: 'github.copilot.chat.quotaExceeded',
+		completionsQuotaExceeded: 'github.copilot.completions.quotaExceeded',
+	};
+
+	private registerListeners(): void {
+		const chatQuotaExceededSet = new Set([this.ExtensionQuotaContextKeys.chatQuotaExceeded]);
+		const completionsQuotaExceededSet = new Set([this.ExtensionQuotaContextKeys.completionsQuotaExceeded]);
+
+		this._register(this.contextKeyService.onDidChangeContext(e => {
+			let changed = false;
+			if (e.affectsSome(chatQuotaExceededSet)) {
+				const newChatQuotaExceeded = this.contextKeyService.getContextKeyValue<boolean>(this.ExtensionQuotaContextKeys.chatQuotaExceeded);
+				if (typeof newChatQuotaExceeded === 'boolean' && newChatQuotaExceeded !== this._quotas.chatQuotaExceeded) {
+					this._quotas = {
+						...this._quotas,
+						chatQuotaExceeded: newChatQuotaExceeded,
+					};
+					changed = true;
+				}
+			}
+
+			if (e.affectsSome(completionsQuotaExceededSet)) {
+				const newCompletionsQuotaExceeded = this.contextKeyService.getContextKeyValue<boolean>(this.ExtensionQuotaContextKeys.completionsQuotaExceeded);
+				if (typeof newCompletionsQuotaExceeded === 'boolean' && newCompletionsQuotaExceeded !== this._quotas.completionsQuotaExceeded) {
+					this._quotas = {
+						...this._quotas,
+						completionsQuotaExceeded: newCompletionsQuotaExceeded,
+					};
+					changed = true;
+				}
+			}
+
+			if (changed) {
+				this.updateContextKeys();
+				this._onDidChangeQuotaExceeded.fire();
+			}
+		}));
+	}
+
+	acceptQuotas(quotas: IChatQuotas): void {
+		const oldQuota = this._quotas;
+		this._quotas = quotas;
+		this.updateContextKeys();
+
+		if (
+			oldQuota.chatQuotaExceeded !== this._quotas.chatQuotaExceeded ||
+			oldQuota.completionsQuotaExceeded !== this._quotas.completionsQuotaExceeded
+		) {
+			this._onDidChangeQuotaExceeded.fire();
+		}
+
+		if (
+			oldQuota.chatRemaining !== this._quotas.chatRemaining ||
+			oldQuota.completionsRemaining !== this._quotas.completionsRemaining
+		) {
+			this._onDidChangeQuotaRemaining.fire();
+		}
+	}
+
+	clearQuotas(): void {
+		if (this.quotas.chatQuotaExceeded || this.quotas.completionsQuotaExceeded) {
+			this.acceptQuotas({ chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: undefined });
+		}
+	}
+
+	private updateContextKeys(): void {
+		this.chatQuotaExceededContextKey.set(this._quotas.chatQuotaExceeded);
+		this.completionsQuotaExceededContextKey.set(this._quotas.completionsQuotaExceeded);
+	}
+
+	//#endregion
+
+	async update(token: CancellationToken): Promise<void> {
+		await this.requests?.value.forceResolveEntitlement(undefined, token);
+	}
+}
+
+//#endregion
+
+//#region Chat Setup Request Service
+
+type EntitlementClassification = {
+	tid: { classification: 'EndUserPseudonymizedInformation'; purpose: 'BusinessInsight'; comment: 'The anonymized analytics id returned by the service'; endpoint: 'GoogleAnalyticsId' };
+	entitlement: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Flag indicating the chat entitlement state' };
+	quotaChat: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of chat completions available to the user' };
+	quotaCompletions: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of chat completions available to the user' };
+	quotaResetDate: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The date the quota will reset' };
+	owner: 'bpasero';
+	comment: 'Reporting chat setup entitlements';
+};
+
+type EntitlementEvent = {
+	entitlement: ChatEntitlement;
+	tid: string;
+	quotaChat: number | undefined;
+	quotaCompletions: number | undefined;
+	quotaResetDate: string | undefined;
+};
+
+interface IEntitlementsResponse {
+	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 IEntitlements {
+	readonly entitlement: ChatEntitlement;
+	readonly quotas?: IQuotas;
+}
+
+interface IQuotas {
+	readonly chatTotal?: number;
+	readonly completionsTotal?: number;
+
+	readonly chatRemaining?: number;
+	readonly completionsRemaining?: number;
+
+	readonly resetDate?: string;
+}
+
+export class ChatSetupRequests extends Disposable {
+
+	static providerId(configurationService: IConfigurationService): string {
+		if (configurationService.getValue<string | undefined>(defaultChat.providerSetting) === defaultChat.enterpriseProviderId) {
+			return defaultChat.enterpriseProviderId;
+		}
+
+		return defaultChat.providerId;
+	}
+
+	private state: IEntitlements = { entitlement: this.context.state.entitlement };
+
+	private pendingResolveCts = new CancellationTokenSource();
+	private didResolveEntitlements = false;
+
+	constructor(
+		private readonly context: ChatSetupContext,
+		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
+	) {
+		super();
+
+		this.registerListeners();
+
+		this.resolve();
+	}
+
+	private registerListeners(): void {
+		this._register(this.authenticationService.onDidChangeDeclaredProviders(() => this.resolve()));
+
+		this._register(this.authenticationService.onDidChangeSessions(e => {
+			if (e.providerId === ChatSetupRequests.providerId(this.configurationService)) {
+				this.resolve();
+			}
+		}));
+
+		this._register(this.authenticationService.onDidRegisterAuthenticationProvider(e => {
+			if (e.id === ChatSetupRequests.providerId(this.configurationService)) {
+				this.resolve();
+			}
+		}));
+
+		this._register(this.authenticationService.onDidUnregisterAuthenticationProvider(e => {
+			if (e.id === ChatSetupRequests.providerId(this.configurationService)) {
+				this.resolve();
+			}
+		}));
+
+		this._register(this.context.onDidChange(() => {
+			if (!this.context.state.installed || this.context.state.entitlement === ChatEntitlement.Unknown) {
+				// When the extension is not installed or the user is not entitled
+				// make sure to clear quotas so that any indicators are also gone
+				this.state = { entitlement: this.state.entitlement, quotas: undefined };
+				this.chatQuotasAccessor.clearQuotas();
+			}
+		}));
+	}
+
+	private async resolve(): Promise<void> {
+		this.pendingResolveCts.dispose(true);
+		const cts = this.pendingResolveCts = new CancellationTokenSource();
+
+		const session = await this.findMatchingProviderSession(cts.token);
+		if (cts.token.isCancellationRequested) {
+			return;
+		}
+
+		// Immediately signal whether we have a session or not
+		let state: IEntitlements | undefined = undefined;
+		if (session) {
+			// 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) {
+			// Afterwards resolve entitlement with a network request
+			// but only unless it was not already resolved before.
+			await this.resolveEntitlement(session, cts.token);
+		}
+	}
+
+	private async findMatchingProviderSession(token: CancellationToken): Promise<AuthenticationSession | undefined> {
+		const sessions = await this.doGetSessions(ChatSetupRequests.providerId(this.configurationService));
+		if (token.isCancellationRequested) {
+			return undefined;
+		}
+
+		for (const session of sessions) {
+			for (const scopes of defaultChat.providerScopes) {
+				if (this.scopesMatch(session.scopes, scopes)) {
+					return session;
+				}
+			}
+		}
+
+		return undefined;
+	}
+
+	private async doGetSessions(providerId: string): Promise<readonly AuthenticationSession[]> {
+		try {
+			return await this.authenticationService.getSessions(providerId);
+		} catch (error) {
+			// ignore - errors can throw if a provider is not registered
+		}
+
+		return [];
+	}
+
+	private scopesMatch(scopes: ReadonlyArray<string>, expectedScopes: string[]): boolean {
+		return scopes.length === expectedScopes.length && expectedScopes.every(scope => scopes.includes(scope));
+	}
+
+	private async resolveEntitlement(session: AuthenticationSession, token: CancellationToken): Promise<IEntitlements | undefined> {
+		const entitlements = await this.doResolveEntitlement(session, token);
+		if (typeof entitlements?.entitlement === 'number' && !token.isCancellationRequested) {
+			this.didResolveEntitlements = true;
+			this.update(entitlements);
+		}
+
+		return entitlements;
+	}
+
+	private async doResolveEntitlement(session: AuthenticationSession, token: CancellationToken): Promise<IEntitlements | undefined> {
+		if (ChatSetupRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId) {
+			this.logService.trace('[chat setup] entitlement: enterprise provider, assuming Pro');
+			return { entitlement: ChatEntitlement.Pro };
+		}
+
+		if (token.isCancellationRequested) {
+			return undefined;
+		}
+
+		const response = await this.request(defaultChat.entitlementUrl, 'GET', undefined, session, token);
+		if (token.isCancellationRequested) {
+			return undefined;
+		}
+
+		if (!response) {
+			this.logService.trace('[chat setup] entitlement: no response');
+			return { entitlement: ChatEntitlement.Unresolved };
+		}
+
+		if (response.res.statusCode && response.res.statusCode !== 200) {
+			this.logService.trace(`[chat setup] entitlement: unexpected status code ${response.res.statusCode}`);
+			return { 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 setup] entitlement: response has no content');
+			return { entitlement: ChatEntitlement.Unresolved };
+		}
+
+		let entitlementsResponse: IEntitlementsResponse;
+		try {
+			entitlementsResponse = JSON.parse(responseText);
+			this.logService.trace(`[chat setup] entitlement: parsed result is ${JSON.stringify(entitlementsResponse)}`);
+		} catch (err) {
+			this.logService.trace(`[chat setup] entitlement: error parsing response (${err})`);
+			return { entitlement: ChatEntitlement.Unresolved };
+		}
+
+		let entitlement: ChatEntitlement;
+		if (entitlementsResponse.access_type_sku === 'free_limited_copilot') {
+			entitlement = ChatEntitlement.Limited;
+		} else if (entitlementsResponse.can_signup_for_limited) {
+			entitlement = ChatEntitlement.Available;
+		} else if (entitlementsResponse.chat_enabled) {
+			entitlement = ChatEntitlement.Pro;
+		} else {
+			entitlement = ChatEntitlement.Unavailable;
+		}
+
+		const chatRemaining = entitlementsResponse.limited_user_quotas?.chat;
+		const completionsRemaining = entitlementsResponse.limited_user_quotas?.completions;
+
+		const entitlements: IEntitlements = {
+			entitlement,
+			quotas: {
+				chatTotal: entitlementsResponse.monthly_quotas?.chat,
+				completionsTotal: entitlementsResponse.monthly_quotas?.completions,
+				chatRemaining: typeof chatRemaining === 'number' ? Math.max(0, chatRemaining) : undefined,
+				completionsRemaining: typeof completionsRemaining === 'number' ? Math.max(0, completionsRemaining) : undefined,
+				resetDate: entitlementsResponse.limited_user_reset_date
+			}
+		};
+
+		this.logService.trace(`[chat setup] entitlement: resolved to ${entitlements.entitlement}, quotas: ${JSON.stringify(entitlements.quotas)}`);
+		this.telemetryService.publicLog2<EntitlementEvent, EntitlementClassification>('chatInstallEntitlement', {
+			entitlement: entitlements.entitlement,
+			tid: entitlementsResponse.analytics_tracking_id,
+			quotaChat: entitlementsResponse.limited_user_quotas?.chat,
+			quotaCompletions: entitlementsResponse.limited_user_quotas?.completions,
+			quotaResetDate: entitlementsResponse.limited_user_reset_date
+		});
+
+		return entitlements;
+	}
+
+	private async request(url: string, type: 'GET', body: undefined, session: AuthenticationSession, token: CancellationToken): Promise<IRequestContext | undefined>;
+	private async request(url: string, type: 'POST', body: object, session: AuthenticationSession, token: CancellationToken): Promise<IRequestContext | undefined>;
+	private async request(url: string, type: 'GET' | 'POST', body: object | undefined, session: AuthenticationSession, token: CancellationToken): Promise<IRequestContext | undefined> {
+		try {
+			return await this.requestService.request({
+				type,
+				url,
+				data: type === 'POST' ? JSON.stringify(body) : undefined,
+				disableCache: true,
+				headers: {
+					'Authorization': `Bearer ${session.accessToken}`
+				}
+			}, token);
+		} catch (error) {
+			if (!token.isCancellationRequested) {
+				this.logService.error(`[chat setup] request: error ${error}`);
+			}
+
+			return undefined;
+		}
+	}
+
+	private update(state: IEntitlements): void {
+		this.state = state;
+
+		this.context.update({ entitlement: this.state.entitlement });
+
+		if (state.quotas) {
+			this.chatQuotasAccessor.acceptQuotas({
+				chatQuotaExceeded: typeof state.quotas.chatRemaining === 'number' ? state.quotas.chatRemaining <= 0 : false,
+				completionsQuotaExceeded: typeof state.quotas.completionsRemaining === 'number' ? state.quotas.completionsRemaining <= 0 : false,
+				quotaResetDate: state.quotas.resetDate ? new Date(state.quotas.resetDate) : undefined,
+				chatTotal: state.quotas.chatTotal,
+				completionsTotal: state.quotas.completionsTotal,
+				chatRemaining: state.quotas.chatRemaining,
+				completionsRemaining: state.quotas.completionsRemaining
+			});
+		}
+	}
+
+	async forceResolveEntitlement(session: AuthenticationSession | undefined, token = CancellationToken.None): Promise<IEntitlements | undefined> {
+		if (!session) {
+			session = await this.findMatchingProviderSession(token);
+		}
+
+		if (!session) {
+			return undefined;
+		}
+
+		return this.resolveEntitlement(session, token);
+	}
+
+	async signUpLimited(session: 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, session, CancellationToken.None);
+		if (!response) {
+			const retry = await this.onUnknownSignUpError(localize('signUpNoResponseError', "No response received."), '[chat setup] sign-up: no response');
+			return retry ? this.signUpLimited(session) : { errorCode: 1 };
+		}
+
+		if (response.res.statusCode && response.res.statusCode !== 200) {
+			if (response.res.statusCode === 422) {
+				try {
+					const responseText = await asText(response);
+					if (responseText) {
+						const responseError: { message: string } = JSON.parse(responseText);
+						if (typeof responseError.message === 'string' && responseError.message) {
+							this.onUnprocessableSignUpError(`[chat setup] sign-up: unprocessable entity (${responseError.message})`, responseError.message);
+							return { errorCode: response.res.statusCode };
+						}
+					}
+				} catch (error) {
+					// ignore - handled below
+				}
+			}
+			const retry = await this.onUnknownSignUpError(localize('signUpUnexpectedStatusError', "Unexpected status code {0}.", response.res.statusCode), `[chat setup] sign-up: unexpected status code ${response.res.statusCode}`);
+			return retry ? this.signUpLimited(session) : { errorCode: response.res.statusCode };
+		}
+
+		let responseText: string | null = null;
+		try {
+			responseText = await asText(response);
+		} catch (error) {
+			// ignore - handled below
+		}
+
+		if (!responseText) {
+			const retry = await this.onUnknownSignUpError(localize('signUpNoResponseContentsError', "Response has no contents."), '[chat setup] sign-up: response has no content');
+			return retry ? this.signUpLimited(session) : { errorCode: 2 };
+		}
+
+		let parsedResult: { subscribed: boolean } | undefined = undefined;
+		try {
+			parsedResult = JSON.parse(responseText);
+			this.logService.trace(`[chat setup] sign-up: response is ${responseText}`);
+		} catch (err) {
+			const retry = await this.onUnknownSignUpError(localize('signUpInvalidResponseError', "Invalid response contents."), `[chat setup] sign-up: error parsing response (${err})`);
+			return retry ? this.signUpLimited(session) : { errorCode: 3 };
+		}
+
+		// We have made it this far, so the user either did sign-up or was signed-up already.
+		// That is, because the endpoint throws in all other case according to Patrick.
+		this.update({ entitlement: ChatEntitlement.Limited });
+
+		return Boolean(parsedResult?.subscribed);
+	}
+
+	private async onUnknownSignUpError(detail: string, logMessage: string): Promise<boolean> {
+		this.logService.error(logMessage);
+
+		const { confirmed } = await this.dialogService.confirm({
+			type: Severity.Error,
+			message: localize('unknownSignUpError', "An error occurred while signing up for Copilot Free. Would you like to try again?"),
+			detail,
+			primaryButton: localize('retry', "Retry")
+		});
+
+		return confirmed;
+	}
+
+	private onUnprocessableSignUpError(logMessage: string, logDetails: string): void {
+		this.logService.error(logMessage);
+
+		this.dialogService.prompt({
+			type: Severity.Error,
+			message: localize('unprocessableSignUpError', "An error occurred while signing up for Copilot Free."),
+			detail: logDetails,
+			buttons: [
+				{
+					label: localize('ok', "OK"),
+					run: () => { /* noop */ }
+				},
+				{
+					label: localize('learnMore', "Learn More"),
+					run: () => this.openerService.open(URI.parse(defaultChat.upgradePlanUrl))
+				}
+			]
+		});
+	}
+
+	override dispose(): void {
+		this.pendingResolveCts.dispose(true);
+
+		super.dispose();
+	}
+}
+
+//#endregion
+
+//#region Context
+
+export interface IChatSetupContextState {
+	entitlement: ChatEntitlement;
+	hidden?: boolean;
+	installed?: boolean;
+	registered?: boolean;
+}
+
+export class ChatSetupContext extends Disposable {
+
+	private static readonly CHAT_SETUP_CONTEXT_STORAGE_KEY = 'chat.setupContext';
+
+	private readonly canSignUpContextKey = ChatContextKeys.Setup.canSignUp.bindTo(this.contextKeyService);
+	private readonly signedOutContextKey = ChatContextKeys.Setup.signedOut.bindTo(this.contextKeyService);
+	private readonly limitedContextKey = ChatContextKeys.Setup.limited.bindTo(this.contextKeyService);
+	private readonly proContextKey = ChatContextKeys.Setup.pro.bindTo(this.contextKeyService);
+	private readonly hiddenContext = ChatContextKeys.Setup.hidden.bindTo(this.contextKeyService);
+	private readonly installedContext = ChatContextKeys.Setup.installed.bindTo(this.contextKeyService);
+
+	private _state: IChatSetupContextState = this.storageService.getObject<IChatSetupContextState>(ChatSetupContext.CHAT_SETUP_CONTEXT_STORAGE_KEY, StorageScope.PROFILE) ?? { entitlement: ChatEntitlement.Unknown };
+	private suspendedState: IChatSetupContextState | undefined = undefined;
+	get state(): IChatSetupContextState {
+		return this.suspendedState ?? this._state;
+	}
+
+	private readonly _onDidChange = this._register(new Emitter<void>());
+	readonly onDidChange = this._onDidChange.event;
+
+	private updateBarrier: Barrier | undefined = undefined;
+
+	constructor(
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IStorageService private readonly storageService: IStorageService,
+		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
+		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
+		@ILogService private readonly logService: ILogService,
+		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
+	) {
+		super();
+
+		this.checkExtensionInstallation();
+		this.updateContextSync();
+	}
+
+	private async checkExtensionInstallation(): Promise<void> {
+
+		// Await extensions to be ready to be queried
+		await this.extensionsWorkbenchService.queryLocal();
+
+		// Listen to change and process extensions once
+		this._register(Event.runAndSubscribe<IExtension | undefined>(this.extensionsWorkbenchService.onChange, e => {
+			if (e && !ExtensionIdentifier.equals(e.identifier.id, defaultChat.extensionId)) {
+				return; // unrelated event
+			}
+
+			const defaultChatExtension = this.extensionsWorkbenchService.local.find(value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.extensionId));
+			this.update({ installed: !!defaultChatExtension?.local && this.extensionEnablementService.isEnabled(defaultChatExtension.local) });
+		}));
+	}
+
+	update(context: { installed: boolean }): Promise<void>;
+	update(context: { hidden: boolean }): Promise<void>;
+	update(context: { entitlement: ChatEntitlement }): Promise<void>;
+	update(context: { installed?: boolean; hidden?: boolean; entitlement?: ChatEntitlement }): Promise<void> {
+		this.logService.trace(`[chat setup] update(): ${JSON.stringify(context)}`);
+
+		if (typeof context.installed === 'boolean') {
+			this._state.installed = context.installed;
+
+			if (context.installed) {
+				context.hidden = false; // allows to fallback to setup view if the extension is uninstalled
+			}
+		}
+
+		if (typeof context.hidden === 'boolean') {
+			this._state.hidden = context.hidden;
+		}
+
+		if (typeof context.entitlement === 'number') {
+			this._state.entitlement = context.entitlement;
+
+			if (this._state.entitlement === ChatEntitlement.Limited || this._state.entitlement === ChatEntitlement.Pro) {
+				this._state.registered = true; // remember that the user did register to improve setup screen
+			} else if (this._state.entitlement === ChatEntitlement.Available) {
+				this._state.registered = false; // only restore when signed-in user can sign-up for limited
+			}
+		}
+
+		this.storageService.store(ChatSetupContext.CHAT_SETUP_CONTEXT_STORAGE_KEY, this._state, StorageScope.PROFILE, StorageTarget.MACHINE);
+
+		return this.updateContext();
+	}
+
+	private async updateContext(): Promise<void> {
+		await this.updateBarrier?.wait();
+
+		this.updateContextSync();
+	}
+
+	private updateContextSync(): void {
+		this.logService.trace(`[chat setup] updateContext(): ${JSON.stringify(this._state)}`);
+
+		if (!this._state.hidden && !this._state.installed) {
+			// this is ugly but fixes flicker from a previous chat install
+			this.storageService.remove('chat.welcomeMessageContent.panel', StorageScope.APPLICATION);
+			this.storageService.remove('interactive.sessions', this.workspaceContextService.getWorkspace().folders.length ? StorageScope.WORKSPACE : StorageScope.APPLICATION);
+		}
+
+		this.signedOutContextKey.set(this._state.entitlement === ChatEntitlement.Unknown);
+		this.canSignUpContextKey.set(this._state.entitlement === ChatEntitlement.Available);
+		this.limitedContextKey.set(this._state.entitlement === ChatEntitlement.Limited);
+		this.proContextKey.set(this._state.entitlement === ChatEntitlement.Pro);
+		this.hiddenContext.set(!!this._state.hidden);
+		this.installedContext.set(!!this._state.installed);
+
+		this._onDidChange.fire();
+	}
+
+	suspend(): void {
+		this.suspendedState = { ...this._state };
+		this.updateBarrier = new Barrier();
+	}
+
+	resume(): void {
+		this.suspendedState = undefined;
+		this.updateBarrier?.open();
+		this.updateBarrier = undefined;
+	}
+}
+
+//#endregion
diff --git a/src/vs/workbench/contrib/chat/common/chatEntitlementsService.ts b/src/vs/workbench/contrib/chat/common/chatEntitlementsService.ts
deleted file mode 100644
index 41c001c1ee7f..000000000000
--- a/src/vs/workbench/contrib/chat/common/chatEntitlementsService.ts
+++ /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.
- *--------------------------------------------------------------------------------------------*/
-
-import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { Event } from '../../../../base/common/event.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-
-export const IChatEntitlementsService = createDecorator<IChatEntitlementsService>('chatEntitlementsService');
-
-export enum ChatEntitlement {
-	/** Signed out */
-	Unknown = 1,
-	/** Signed in but not yet resolved */
-	Unresolved,
-	/** Signed in and entitled to Limited */
-	Available,
-	/** Signed in but not entitled to Limited */
-	Unavailable,
-	/** Signed-up to Limited */
-	Limited,
-	/** Signed-up to Pro */
-	Pro
-}
-
-export interface IChatEntitlements {
-	readonly entitlement: ChatEntitlement;
-	readonly quotas?: IQuotas;
-}
-
-export interface IQuotas {
-	readonly chatTotal?: number;
-	readonly completionsTotal?: number;
-
-	readonly chatRemaining?: number;
-	readonly completionsRemaining?: number;
-
-	readonly resetDate?: string;
-}
-
-export interface IChatEntitlementsService {
-
-	_serviceBrand: undefined;
-
-	readonly onDidChangeEntitlement: Event<void>;
-
-	readonly entitlement: ChatEntitlement;
-
-	resolve(token: CancellationToken): Promise<IChatEntitlements | undefined>;
-}
diff --git a/src/vs/workbench/contrib/chat/common/chatQuotasService.ts b/src/vs/workbench/contrib/chat/common/chatQuotasService.ts
deleted file mode 100644
index a77b5ae38460..000000000000
--- a/src/vs/workbench/contrib/chat/common/chatQuotasService.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 { Emitter, Event } from '../../../../base/common/event.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { ChatContextKeys } from './chatContextKeys.js';
-
-export const IChatQuotasService = createDecorator<IChatQuotasService>('chatQuotasService');
-
-export interface IChatQuotasService {
-
-	_serviceBrand: undefined;
-
-	readonly onDidChangeQuotaExceeded: Event<void>;
-	readonly onDidChangeQuotaRemaining: Event<void>;
-
-	readonly quotas: IChatQuotas;
-}
-
-export interface IChatQuotas {
-	chatQuotaExceeded: boolean;
-	completionsQuotaExceeded: boolean;
-	quotaResetDate: Date | undefined;
-
-	chatTotal?: number;
-	completionsTotal?: number;
-
-	chatRemaining?: number;
-	completionsRemaining?: number;
-}
-
-export class ChatQuotasService extends Disposable implements IChatQuotasService {
-
-	declare _serviceBrand: undefined;
-
-	private readonly _onDidChangeQuotaExceeded = this._register(new Emitter<void>());
-	readonly onDidChangeQuotaExceeded = this._onDidChangeQuotaExceeded.event;
-
-	private readonly _onDidChangeQuotaRemaining = this._register(new Emitter<void>());
-	readonly onDidChangeQuotaRemaining = this._onDidChangeQuotaRemaining.event;
-
-	private _quotas: IChatQuotas = { chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: undefined };
-	get quotas(): IChatQuotas { return this._quotas; }
-
-	private readonly chatQuotaExceededContextKey = ChatContextKeys.chatQuotaExceeded.bindTo(this.contextKeyService);
-	private readonly completionsQuotaExceededContextKey = ChatContextKeys.completionsQuotaExceeded.bindTo(this.contextKeyService);
-
-	private ExtensionQuotaContextKeys = {
-		chatQuotaExceeded: 'github.copilot.chat.quotaExceeded',
-		completionsQuotaExceeded: 'github.copilot.completions.quotaExceeded',
-	};
-
-	constructor(
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-	) {
-		super();
-
-		this.registerListeners();
-	}
-
-	private registerListeners(): void {
-		const chatQuotaExceededSet = new Set([this.ExtensionQuotaContextKeys.chatQuotaExceeded]);
-		const completionsQuotaExceededSet = new Set([this.ExtensionQuotaContextKeys.completionsQuotaExceeded]);
-
-		this._register(this.contextKeyService.onDidChangeContext(e => {
-			let changed = false;
-			if (e.affectsSome(chatQuotaExceededSet)) {
-				const newChatQuotaExceeded = this.contextKeyService.getContextKeyValue<boolean>(this.ExtensionQuotaContextKeys.chatQuotaExceeded);
-				if (typeof newChatQuotaExceeded === 'boolean' && newChatQuotaExceeded !== this._quotas.chatQuotaExceeded) {
-					this._quotas.chatQuotaExceeded = newChatQuotaExceeded;
-					changed = true;
-				}
-			}
-
-			if (e.affectsSome(completionsQuotaExceededSet)) {
-				const newCompletionsQuotaExceeded = this.contextKeyService.getContextKeyValue<boolean>(this.ExtensionQuotaContextKeys.completionsQuotaExceeded);
-				if (typeof newCompletionsQuotaExceeded === 'boolean' && newCompletionsQuotaExceeded !== this._quotas.completionsQuotaExceeded) {
-					this._quotas.completionsQuotaExceeded = newCompletionsQuotaExceeded;
-					changed = true;
-				}
-			}
-
-			if (changed) {
-				this.updateContextKeys();
-				this._onDidChangeQuotaExceeded.fire();
-			}
-		}));
-	}
-
-	acceptQuotas(quotas: IChatQuotas): void {
-		const oldQuota = this._quotas;
-		this._quotas = quotas;
-		this.updateContextKeys();
-
-		if (
-			oldQuota.chatQuotaExceeded !== this._quotas.chatQuotaExceeded ||
-			oldQuota.completionsQuotaExceeded !== this._quotas.completionsQuotaExceeded
-		) {
-			this._onDidChangeQuotaExceeded.fire();
-		}
-
-		if (
-			oldQuota.chatRemaining !== this._quotas.chatRemaining ||
-			oldQuota.completionsRemaining !== this._quotas.completionsRemaining
-		) {
-			this._onDidChangeQuotaRemaining.fire();
-		}
-	}
-
-	clearQuotas(): void {
-		if (this.quotas.chatQuotaExceeded || this.quotas.completionsQuotaExceeded) {
-			this.acceptQuotas({ chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: undefined });
-		}
-	}
-
-	private updateContextKeys(): void {
-		this.chatQuotaExceededContextKey.set(this._quotas.chatQuotaExceeded);
-		this.completionsQuotaExceededContextKey.set(this._quotas.completionsQuotaExceeded);
-	}
-}

From 371c2592c35c73682984c8b20ae175c0cec834b4 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Sun, 2 Mar 2025 19:57:37 +0100
Subject: [PATCH 0559/1815] More reuse via abstract modified file entry
 (#242311)

* More reuse via abstract modified file entry

re https://github.com/microsoft/vscode-copilot/issues/13692 and https://github.com/microsoft/vscode-copilot/issues/13693

* Updates

* add todo

* Fixes

---------

Co-authored-by: Don Jayamanne <don.jayamanne@outlook.com>
---
 .../chatEditingModifiedDocumentEntry.ts       | 21 +++++++------------
 .../chatEditingModifiedFileEntry.ts           | 19 +++++++++++++++--
 .../chatEditingModifiedNotebookEntry.ts       | 16 +++++++++++---
 3 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
index 706b1f2653af..1c0e47fb8946 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
@@ -33,7 +33,7 @@ import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
 import { editorSelectionBackground } from '../../../../../platform/theme/common/colorRegistry.js';
-import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { IUndoRedoElement, IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
 import { SaveReason, IEditorPane } from '../../../../common/editor.js';
 import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
 import { IResolvedTextFileEditorModel, stringToSnapshot } from '../../../../services/textfile/common/textfiles.js';
@@ -107,8 +107,8 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		@IFilesConfigurationService fileConfigService: IFilesConfigurationService,
 		@IChatService chatService: IChatService,
 		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
-		@IUndoRedoService private readonly _undoRedoService: IUndoRedoService,
 		@IFileService fileService: IFileService,
+		@IUndoRedoService undoRedoService: IUndoRedoService,
 		@IInstantiationService instantiationService: IInstantiationService
 	) {
 		super(
@@ -119,6 +119,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 			fileConfigService,
 			chatService,
 			fileService,
+			undoRedoService,
 			instantiationService
 		);
 
@@ -199,12 +200,9 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		this._setDocValue(this.initialContent);
 	}
 
-	override async acceptStreamingEditsEnd(tx: ITransaction) {
+	protected override async _areOriginalAndModifiedIdentical(): Promise<boolean> {
 		const diff = await this._diffOperation;
-		super.acceptStreamingEditsEnd(tx);
-		if (diff?.identical) {
-			this.accept(tx);
-		}
+		return diff ? diff.identical : false;
 	}
 
 	protected override _resetEditsState(tx: ITransaction): void {
@@ -266,13 +264,10 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		}
 	}
 
-	override acceptStreamingEditsStart(responseModel: IChatResponseModel, tx: ITransaction) {
-		super.acceptStreamingEditsStart(responseModel, tx);
-
-		// push stack element whenever streaming starts
-		const request = responseModel.session.getRequests().find(req => req.id === responseModel.requestId);
+	protected override _createUndoRedoElement(response: IChatResponseModel): IUndoRedoElement {
+		const request = response.session.getRequests().find(req => req.id === response.requestId);
 		const label = request?.message.text ? localize('chatEditing1', "Chat Edit: '{0}'", request.message.text) : localize('chatEditing2', "Chat Edit");
-		this._undoRedoService.pushElement(new SingleModelEditStackElement(label, 'chat.edit', this.modifiedModel, null));
+		return new SingleModelEditStackElement(label, 'chat.edit', this.modifiedModel, null);
 	}
 
 	async acceptAgentEdits(resource: URI, textEdits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void> {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
index 813bc0e3eb1f..73bd3f496953 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
@@ -17,6 +17,7 @@ import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
 import { editorBackground, registerColor, transparent } from '../../../../../platform/theme/common/colorRegistry.js';
+import { IUndoRedoElement, IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
 import { IEditorPane } from '../../../../common/editor.js';
 import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
 import { ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
@@ -88,6 +89,7 @@ export abstract class AbstractChatEditingModifiedFileEntry extends Disposable im
 		@IFilesConfigurationService fileConfigService: IFilesConfigurationService,
 		@IChatService protected readonly _chatService: IChatService,
 		@IFileService protected readonly _fileService: IFileService,
+		@IUndoRedoService private readonly _undoRedoService: IUndoRedoService,
 		@IInstantiationService protected readonly _instantiationService: IInstantiationService,
 	) {
 		super();
@@ -223,15 +225,26 @@ export abstract class AbstractChatEditingModifiedFileEntry extends Disposable im
 		this._resetEditsState(tx);
 		this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
 		this._autoAcceptCtrl.get()?.cancel();
+
+		const undoRedoElement = this._createUndoRedoElement(responseModel);
+		if (undoRedoElement) {
+			this._undoRedoService.pushElement(undoRedoElement);
+		}
 	}
 
+	protected abstract _createUndoRedoElement(response: IChatResponseModel): IUndoRedoElement | undefined;
+
 	abstract acceptAgentEdits(uri: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void>;
 
 	async acceptStreamingEditsEnd(tx: ITransaction) {
 		this._resetEditsState(tx);
 
-		// AUTO accept mode
-		if (!this.reviewMode.get() && !this._autoAcceptCtrl.get()) {
+		if (await this._areOriginalAndModifiedIdentical()) {
+			// ACCEPT if identical
+			this.accept(tx);
+
+		} else if (!this.reviewMode.get() && !this._autoAcceptCtrl.get()) {
+			// AUTO accept mode
 
 			const acceptTimeout = this._autoAcceptTimeout.get() * 1000;
 			const future = Date.now() + acceptTimeout;
@@ -259,6 +272,8 @@ export abstract class AbstractChatEditingModifiedFileEntry extends Disposable im
 		}
 	}
 
+	protected abstract _areOriginalAndModifiedIdentical(): Promise<boolean>;
+
 	protected _resetEditsState(tx: ITransaction): void {
 		this._isCurrentlyBeingModifiedByObs.set(undefined, tx);
 		this._rewriteRatioObs.set(0, tx);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index e2efe6a4c9e2..52281971d8f7 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -37,7 +37,7 @@ import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
 import { editorSelectionBackground } from '../../../../../platform/theme/common/colorRegistry.js';
-import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
+import { IUndoRedoElement, IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
 import { IEditorPane, SaveReason } from '../../../../common/editor.js';
 import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
 import { SnapshotContext } from '../../../../services/workingCopy/common/fileWorkingCopy.js';
@@ -193,9 +193,10 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		@IFileService fileService: IFileService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ITextModelService private readonly textModelService: ITextModelService,
-		@IModelService private readonly modelService: IModelService
+		@IModelService private readonly modelService: IModelService,
+		@IUndoRedoService undoRedoService: IUndoRedoService
 	) {
-		super(modifiedResourceRef.object.notebook.uri, telemetryInfo, kind, configurationService, fileConfigService, chatService, fileService, instantiationService);
+		super(modifiedResourceRef.object.notebook.uri, telemetryInfo, kind, configurationService, fileConfigService, chatService, fileService, undoRedoService, instantiationService);
 		this._register(modifiedResourceRef);
 		this._register(originalResourceRef);
 		this.modifiedModel = modifiedResourceRef.object.notebook;
@@ -335,6 +336,15 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		this.cellEntryMap.forEach(entry => !entry.disposed && entry.clearCurrentEditLineDecoration());
 	}
 
+	protected override _createUndoRedoElement(_response: IChatResponseModel): IUndoRedoElement | undefined {
+		// TODO@amunger
+		return undefined;
+	}
+
+	protected override async _areOriginalAndModifiedIdentical(): Promise<boolean> {
+		return createSnapshot(this.originalModel, this.transientOptions, this.configurationService) === createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService);
+	}
+
 	override async acceptAgentEdits(resource: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void> {
 		const isCellUri = resource.scheme === Schemas.vscodeNotebookCell;
 		const cell = isCellUri && this.modifiedModel.cells.find(cell => isEqual(cell.uri, resource));

From 761ef6fce3048c24cb9736db409cac155ccb2bb4 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sun, 2 Mar 2025 20:41:51 +0100
Subject: [PATCH 0560/1815] Explore higher delay for deciding to show dirty
 indicator for settings changes (fix #242063) (#242423)

---
 .../common/configurationEditing.ts            | 20 ++++++++++--
 .../common/jsonEditingService.ts              | 31 +++++++++++++------
 .../common/filesConfigurationService.ts       | 31 +++++++++++++++++++
 .../test/common/workbenchTestServices.ts      |  1 +
 4 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/src/vs/workbench/services/configuration/common/configurationEditing.ts b/src/vs/workbench/services/configuration/common/configurationEditing.ts
index 150c993d79d4..cd732b3ef0dd 100644
--- a/src/vs/workbench/services/configuration/common/configurationEditing.ts
+++ b/src/vs/workbench/services/configuration/common/configurationEditing.ts
@@ -22,13 +22,14 @@ import { INotificationService, Severity } from '../../../../platform/notificatio
 import { IOpenSettingsOptions, IPreferencesService } from '../../preferences/common/preferences.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { ITextModel } from '../../../../editor/common/model.js';
-import { IReference } from '../../../../base/common/lifecycle.js';
+import { IDisposable, IReference } from '../../../../base/common/lifecycle.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { EditOperation } from '../../../../editor/common/core/editOperation.js';
 import { Selection } from '../../../../editor/common/core/selection.js';
 import { IUserDataProfileService } from '../../userDataProfile/common/userDataProfile.js';
 import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
 import { ErrorNoTelemetry } from '../../../../base/common/errors.js';
+import { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.js';
 
 export const enum ConfigurationEditingErrorCode {
 
@@ -154,6 +155,7 @@ export class ConfigurationEditing {
 		@IPreferencesService private readonly preferencesService: IPreferencesService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+		@IFilesConfigurationService private readonly filesConfigurationService: IFilesConfigurationService
 	) {
 		this.queue = new Queue<void>();
 	}
@@ -198,8 +200,20 @@ export class ConfigurationEditing {
 		}
 
 		const edit = this.getEdits(operation, model.getValue(), formattingOptions)[0];
-		if (edit && this.applyEditsToBuffer(edit, model)) {
-			await this.save(model, operation);
+		if (edit) {
+			let disposable: IDisposable | undefined;
+			try {
+				// Optimization: we apply edits to a text model and save it
+				// right after. Use the files config service to signal this
+				// to the workbench to optimise the UI during this operation.
+				// For example, avoids to briefly show dirty indicators.
+				disposable = this.filesConfigurationService.enableAutoSaveAfterShortDelay(model.uri);
+				if (this.applyEditsToBuffer(edit, model)) {
+					await this.save(model, operation);
+				}
+			} finally {
+				disposable?.dispose();
+			}
 		}
 	}
 
diff --git a/src/vs/workbench/services/configuration/common/jsonEditingService.ts b/src/vs/workbench/services/configuration/common/jsonEditingService.ts
index 24dadd330c8d..9ce5e10e4dd0 100644
--- a/src/vs/workbench/services/configuration/common/jsonEditingService.ts
+++ b/src/vs/workbench/services/configuration/common/jsonEditingService.ts
@@ -9,7 +9,7 @@ import * as json from '../../../../base/common/json.js';
 import { setProperty } from '../../../../base/common/jsonEdit.js';
 import { Queue } from '../../../../base/common/async.js';
 import { Edit } from '../../../../base/common/jsonFormatter.js';
-import { IReference } from '../../../../base/common/lifecycle.js';
+import { IDisposable, IReference } from '../../../../base/common/lifecycle.js';
 import { EditOperation } from '../../../../editor/common/core/editOperation.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { Selection } from '../../../../editor/common/core/selection.js';
@@ -19,6 +19,7 @@ import { ITextModelService, IResolvedTextEditorModel } from '../../../../editor/
 import { IJSONEditingService, IJSONValue, JSONEditingError, JSONEditingErrorCode } from './jsonEditing.js';
 import { ITextModel } from '../../../../editor/common/model.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.js';
 
 export class JSONEditingService implements IJSONEditingService {
 
@@ -29,7 +30,8 @@ export class JSONEditingService implements IJSONEditingService {
 	constructor(
 		@IFileService private readonly fileService: IFileService,
 		@ITextModelService private readonly textModelResolverService: ITextModelService,
-		@ITextFileService private readonly textFileService: ITextFileService
+		@ITextFileService private readonly textFileService: ITextFileService,
+		@IFilesConfigurationService private readonly filesConfigurationService: IFilesConfigurationService
 	) {
 		this.queue = new Queue<void>();
 	}
@@ -48,13 +50,24 @@ export class JSONEditingService implements IJSONEditingService {
 	}
 
 	private async writeToBuffer(model: ITextModel, values: IJSONValue[]): Promise<any> {
-		let hasEdits: boolean = false;
-		for (const value of values) {
-			const edit = this.getEdits(model, value)[0];
-			hasEdits = !!edit && this.applyEditsToBuffer(edit, model);
-		}
-		if (hasEdits) {
-			return this.textFileService.save(model.uri);
+		let disposable: IDisposable | undefined;
+		try {
+			// Optimization: we apply edits to a text model and save it
+			// right after. Use the files config service to signal this
+			// to the workbench to optimise the UI during this operation.
+			// For example, avoids to briefly show dirty indicators.
+			disposable = this.filesConfigurationService.enableAutoSaveAfterShortDelay(model.uri);
+
+			let hasEdits: boolean = false;
+			for (const value of values) {
+				const edit = this.getEdits(model, value)[0];
+				hasEdits = !!edit && this.applyEditsToBuffer(edit, model);
+			}
+			if (hasEdits) {
+				return this.textFileService.save(model.uri);
+			}
+		} finally {
+			disposable?.dispose();
 		}
 	}
 
diff --git a/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts b/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts
index e9e60430f255..f7479b7912ef 100644
--- a/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts
+++ b/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts
@@ -92,6 +92,7 @@ export interface IFilesConfigurationService {
 
 	toggleAutoSave(): Promise<void>;
 
+	enableAutoSaveAfterShortDelay(resourceOrEditor: EditorInput | URI): IDisposable;
 	disableAutoSave(resourceOrEditor: EditorInput | URI): IDisposable;
 
 	//#endregion
@@ -147,6 +148,8 @@ export class FilesConfigurationService extends Disposable implements IFilesConfi
 	private currentHotExitConfiguration: string;
 
 	private readonly autoSaveConfigurationCache = new LRUCache<URI, ICachedAutoSaveConfiguration>(1000);
+
+	private readonly autoSaveAfterShortDelayOverrides = new ResourceMap<number /* counter */>();
 	private readonly autoSaveDisabledOverrides = new ResourceMap<number /* counter */>();
 
 	private readonly autoSaveAfterShortDelayContext = AutoSaveAfterShortDelayContext.bindTo(this.contextKeyService);
@@ -377,6 +380,11 @@ export class FilesConfigurationService extends Disposable implements IFilesConfi
 
 	hasShortAutoSaveDelay(resourceOrEditor: EditorInput | URI | undefined): boolean {
 		const resource = this.toResource(resourceOrEditor);
+
+		if (resource && this.autoSaveAfterShortDelayOverrides.has(resource)) {
+			return true; // overridden to be enabled after short delay
+		}
+
 		if (this.getAutoSaveConfiguration(resource).isShortAutoSaveDelay) {
 			return !resource || !this.autoSaveDisabledOverrides.has(resource);
 		}
@@ -386,6 +394,10 @@ export class FilesConfigurationService extends Disposable implements IFilesConfi
 
 	getAutoSaveMode(resourceOrEditor: EditorInput | URI | undefined, saveReason?: SaveReason): IAutoSaveMode {
 		const resource = this.toResource(resourceOrEditor);
+		if (resource && this.autoSaveAfterShortDelayOverrides.has(resource)) {
+			return { mode: AutoSaveMode.AFTER_SHORT_DELAY }; // overridden to be enabled after short delay
+		}
+
 		if (resource && this.autoSaveDisabledOverrides.has(resource)) {
 			return { mode: AutoSaveMode.OFF, reason: AutoSaveDisabledReason.DISABLED };
 		}
@@ -446,6 +458,25 @@ export class FilesConfigurationService extends Disposable implements IFilesConfi
 		return this.configurationService.updateValue('files.autoSave', newAutoSaveValue);
 	}
 
+	enableAutoSaveAfterShortDelay(resourceOrEditor: EditorInput | URI): IDisposable {
+		const resource = this.toResource(resourceOrEditor);
+		if (!resource) {
+			return Disposable.None;
+		}
+
+		const counter = this.autoSaveAfterShortDelayOverrides.get(resource) ?? 0;
+		this.autoSaveAfterShortDelayOverrides.set(resource, counter + 1);
+
+		return toDisposable(() => {
+			const counter = this.autoSaveAfterShortDelayOverrides.get(resource) ?? 0;
+			if (counter <= 1) {
+				this.autoSaveAfterShortDelayOverrides.delete(resource);
+			} else {
+				this.autoSaveAfterShortDelayOverrides.set(resource, counter - 1);
+			}
+		});
+	}
+
 	disableAutoSave(resourceOrEditor: EditorInput | URI): IDisposable {
 		const resource = this.toResource(resourceOrEditor);
 		if (!resource) {
diff --git a/src/vs/workbench/test/common/workbenchTestServices.ts b/src/vs/workbench/test/common/workbenchTestServices.ts
index aab81fcaf4e4..1ac3c9f52d34 100644
--- a/src/vs/workbench/test/common/workbenchTestServices.ts
+++ b/src/vs/workbench/test/common/workbenchTestServices.ts
@@ -323,6 +323,7 @@ export const NullFilesConfigurationService = new class implements IFilesConfigur
 	getAutoSaveMode(): IAutoSaveMode { throw new Error('Method not implemented.'); }
 	hasShortAutoSaveDelay(): boolean { throw new Error('Method not implemented.'); }
 	toggleAutoSave(): Promise<void> { throw new Error('Method not implemented.'); }
+	enableAutoSaveAfterShortDelay(resourceOrEditor: URI | EditorInput): IDisposable { throw new Error('Method not implemented.'); }
 	disableAutoSave(resourceOrEditor: URI | EditorInput): IDisposable { throw new Error('Method not implemented.'); }
 	isReadonly(resource: URI, stat?: IBaseFileStat | undefined): boolean { return false; }
 	async updateReadonly(resource: URI, readonly: boolean | 'toggle' | 'reset'): Promise<void> { }

From b002965b0ee32e71688eda9ceb718962c9e6604e Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Mon, 3 Mar 2025 13:57:56 +1100
Subject: [PATCH 0561/1815] Improvements to notebook diffing (#242405)

---
 .../common/services/notebookCellMatching.ts   |   505 +
 .../common/services/notebookSimpleWorker.ts   |   397 +-
 .../browser/diff/notebookDiffService.test.ts  | 14750 ++++++++++++++++
 3 files changed, 15560 insertions(+), 92 deletions(-)
 create mode 100644 src/vs/workbench/contrib/notebook/common/services/notebookCellMatching.ts
 create mode 100644 src/vs/workbench/contrib/notebook/test/browser/diff/notebookDiffService.test.ts

diff --git a/src/vs/workbench/contrib/notebook/common/services/notebookCellMatching.ts b/src/vs/workbench/contrib/notebook/common/services/notebookCellMatching.ts
new file mode 100644
index 000000000000..8e7375819c6f
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/common/services/notebookCellMatching.ts
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CellKind } from '../notebookCommon.js';
+
+
+type EditCount = number;
+type OriginalIndex = number;
+type ModifiedIndex = number;
+type CellEditCountCache = {
+	modifiedToOriginal: Map<ModifiedIndex, Map<OriginalIndex, { editCount: EditCount }>>;
+	originalToModified: Map<OriginalIndex, Map<ModifiedIndex, { editCount: EditCount }>>;
+};
+
+type ICell = {
+	getValue(): string;
+	getLinesContent(): string[];
+	cellKind: CellKind;
+};
+
+/**
+ * Given a set of modified cells and original cells, this function will attempt to match the modified cells with the original cells.
+ * E.g. Assume you have (original on left and modified on right):
+ * =================
+ * Cell A  | Cell a
+ * Cell B  | Cell b
+ * Cell C  | Cell d
+ * Cell D  | Cell e
+ * =================
+ * Here we know that `Cell C` has been removed and `Cell e` has been added.
+ * The mapping from modified to original will be as follows:
+ * Cell a => Cell A
+ * Cell b => Cell B
+ * Cell d => Cell D
+ * Cell e => <Does not match anything in original, hence a new Cell>
+ * Cell C in original was not matched, hence it was deleted.
+ *
+ * Thus the return value is as follows:
+ * [
+ * { modified: 0, original: 0 },
+ * { modified: 1, original: 1 },
+ * { modified: 2, original: 3 },
+ * { modified: 3, original: -1 },
+ * ]
+ * @returns
+ */
+export function matchCellBasedOnSimilarties(modifiedCells: ICell[], originalCells: ICell[]): { modified: number; original: number; percentage: number }[] {
+	const cache: CellEditCountCache = {
+		modifiedToOriginal: new Map<ModifiedIndex, Map<OriginalIndex, { editCount: EditCount }>>(),
+		originalToModified: new Map<OriginalIndex, Map<ModifiedIndex, { editCount: EditCount }>>(),
+	};
+	const results: { modified: number; original: number; dist: number; percentage: number; possibleOriginal: number }[] = [];
+	const mappedOriginalCellToModifiedCell = new Map<number, number>();
+	const mappedModifiedIndexes = new Set<number>();
+	const originalIndexWithMostEdits = new Map<number, { dist: number; modifiedIndex: number }>();
+	const canOriginalIndexBeMappedToModifiedIndex = (originalIndex: number, value: { editCount: EditCount }) => {
+		if (mappedOriginalCellToModifiedCell.has(originalIndex)) {
+			return false;
+		}
+		const existingEdits = originalIndexWithMostEdits.get(originalIndex)?.dist ?? Number.MAX_SAFE_INTEGER;
+		return value.editCount < existingEdits;
+	};
+	const trackMappedIndexes = (modifiedIndex: number, originalIndex: number) => {
+		mappedOriginalCellToModifiedCell.set(originalIndex, modifiedIndex);
+		mappedModifiedIndexes.add(modifiedIndex);
+	};
+
+	for (let i = 0; i < modifiedCells.length; i++) {
+		const modifiedCell = modifiedCells[i];
+		const { index, editCount: dist, percentage } = computeClosestCell({ cell: modifiedCell, index: i }, originalCells, true, cache, canOriginalIndexBeMappedToModifiedIndex);
+		if (index >= 0 && dist === 0) {
+			trackMappedIndexes(i, index);
+			results.push({ modified: i, original: index, dist, percentage, possibleOriginal: index });
+		} else {
+			originalIndexWithMostEdits.set(index, { dist: dist, modifiedIndex: i });
+			results.push({ modified: i, original: -1, dist: dist, percentage, possibleOriginal: index });
+		}
+	}
+
+	results.forEach((result, i) => {
+		if (result.original >= 0) {
+			return;
+		}
+
+		/**
+		 * I.e. Assume you have the following
+		 * =================
+		 * A a (this has ben matched)
+		 * B b <not matched>
+		 * C c <not matched>
+		 * D d (these two have been matched)
+		 * e e
+		 * f f
+		 * =================
+		 * Just match A => a, B => b, C => c
+		 */
+		// Find the next cell that has been matched.
+		const previousMatchedCell = i > 0 ? results.slice(0, i).reverse().find(r => r.original >= 0) : undefined;
+		const previousMatchedOriginalIndex = previousMatchedCell?.original ?? -1;
+		const previousMatchedModifiedIndex = previousMatchedCell?.modified ?? -1;
+		const matchedCell = results.slice(i + 1).find(r => r.original >= 0);
+		const unavailableIndexes = new Set<number>();
+		const nextMatchedModifiedIndex = results.findIndex((item, idx) => idx > i && item.original >= 0);
+		const nextMatchedOriginalIndex = nextMatchedModifiedIndex >= 0 ? results[nextMatchedModifiedIndex].original : -1;
+		// Find the available indexes that we can match with.
+		// We are only interested in b and c (anything after d is of no use).
+		originalCells.forEach((_, i) => {
+			if (mappedOriginalCellToModifiedCell.has(i)) {
+				unavailableIndexes.add(i);
+				return;
+			}
+			if (matchedCell && i >= matchedCell.original) {
+				unavailableIndexes.add(i);
+			}
+			if (nextMatchedOriginalIndex >= 0 && i > nextMatchedOriginalIndex) {
+				unavailableIndexes.add(i);
+			}
+		});
+
+
+		const modifiedCell = modifiedCells[i];
+		/**
+		 * I.e. Assume you have the following
+		 * =================
+		 * A a (this has ben matched)
+		 * B b <not matched because the % of change is too high, but we do have a probable match>
+		 * C c <not matched>
+		 * D d (these two have been matched)
+		 * e e
+		 * f f
+		 * =================
+		 * Given that we have a probable match for B => b, we can match it.
+		 */
+		if (result.original === -1 && result.possibleOriginal >= 0 && !unavailableIndexes.has(result.possibleOriginal) && canOriginalIndexBeMappedToModifiedIndex(result.possibleOriginal, { editCount: result.dist })) {
+			trackMappedIndexes(i, result.possibleOriginal);
+			result.original = result.possibleOriginal;
+			return;
+		}
+
+
+		/**
+		 * I.e. Assume you have the following
+		 * =================
+		 * A a (this has ben matched)
+		 * B b <not matched>
+		 * C c <not matched>
+		 * D d (these two have been matched)
+		 * =================
+		 * Its possible that B matches better with c and C matches better with b.
+		 * However given the fact that we have matched A => a and D => d.
+		 * & if the indexes are an exact match.
+		 * I.e. index of D in Modified === index of d in Original, and index of A in Modified === index of a in Original.
+		 * Then this means there are absolutely no modifications.
+		 * Hence we can just assign the indexes as is.
+		 *
+		 * NOTE: For this, we must ensure we have exactly the same number of items on either side.
+		 * I.e. we have B, C remaining in Modified, and b, c remaining in Original.
+		 * Thats 2 Modified items === 2 Original Items.
+		 * If its not the same, then this means something has been deleted/inserted, and we cannot blindly map the indexes.
+		*/
+		if (previousMatchedOriginalIndex > 0 && previousMatchedModifiedIndex > 0 && previousMatchedOriginalIndex === previousMatchedModifiedIndex) {
+			if ((nextMatchedModifiedIndex >= 0 ? nextMatchedModifiedIndex : modifiedCells.length - 1) === (nextMatchedOriginalIndex >= 0 ? nextMatchedOriginalIndex : originalCells.length - 1) && !unavailableIndexes.has(i) && i < originalCells.length) {
+				const remainingModifiedItems = (nextMatchedModifiedIndex >= 0 ? nextMatchedModifiedIndex : modifiedCells.length) - previousMatchedModifiedIndex;
+				const remainingOriginalItems = (nextMatchedOriginalIndex >= 0 ? nextMatchedOriginalIndex : originalCells.length) - previousMatchedOriginalIndex;
+				if (remainingModifiedItems === remainingOriginalItems && modifiedCell.cellKind === originalCells[i].cellKind) {
+					trackMappedIndexes(i, i);
+					result.original = i;
+					return;
+				}
+			}
+		}
+		/**
+		 * I.e. Assume you have the following
+		 * =================
+		 * A a (this has ben matched)
+		 * B b <not matched>
+		 * C c <not matched>
+		 * D d (these two have been matched)
+		 * e e
+		 * f f
+		 * =================
+		 * We can now try to match B with b and c and figure out which is best.
+		 * RULE 1. Its possible that B will match best with c, howevber C matches better with c, meaning we should match B with b.
+		 * To do this, we need to see if c has a better match with something else.
+		*/
+		// RULE 1
+		// Try to find the next best match, but exclucde items that have a better match.
+		const { index, percentage } = computeClosestCell({ cell: modifiedCell, index: i }, originalCells, false, cache, (originalIndex: number, originalValue: { editCount: EditCount }) => {
+			if (unavailableIndexes.has(originalIndex)) {
+				return false;
+			}
+
+			if (nextMatchedModifiedIndex > 0 || previousMatchedOriginalIndex > 0) {
+				// See if we have a beter match for this.
+				const matchesForThisOriginalIndex = cache.originalToModified.get(originalIndex);
+				if (matchesForThisOriginalIndex && previousMatchedOriginalIndex < originalIndex) {
+					const betterMatch = Array.from(matchesForThisOriginalIndex).find(([modifiedIndex, value]) => {
+						if (modifiedIndex === i) {
+							// This is the same modifeid entry.
+							return false;
+						}
+						if (modifiedIndex >= nextMatchedModifiedIndex) {
+							// We're only interested in matches that are before the next matched index.
+							return false;
+						}
+						if (mappedModifiedIndexes.has(i)) {
+							// This has already been matched.
+							return false;
+						}
+						return value.editCount < originalValue.editCount;
+					});
+					if (betterMatch) {
+						// We do have a better match for this, hence do not use this.
+						return false;
+					}
+				}
+			}
+			return !unavailableIndexes.has(originalIndex);
+		});
+
+		/**
+		 * I.e. Assume you have the following
+		 * =================
+		 * A a (this has ben matched)
+		 * B bbbbbbbbbbbbbb <not matched>
+		 * C cccccccccccccc <not matched>
+		 * D d (these two have been matched)
+		 * e e
+		 * f f
+		 * =================
+		 * RULE 1 . Now when attempting to match `bbbbbbbbbbbb` with B, the number of edits is very high and the percentage is also very high.
+		 * Basically majority of the text needs to be changed.
+		 * However if the indexes line up perfectly well, and this is the best match, then use it.
+		*
+		 * Similarly its possible we're trying to match b with `BBBBBBBBBBBB` and the number of edits is very high, but the indexes line up perfectly well.
+		*
+		* RULE 2. However it is also possible that there's a better match with another cell
+		* Assume we have
+		 * =================
+		 * AAAA     a (this has been matched)
+		 * bbbbbbbb b <not matched>
+		 * bbbb     c <not matched>
+		 * dddd     d (these two have been matched)
+		 * =================
+		 * In this case if we use the algorithm of (1) above, we'll end up matching bbbb with b, and bbbbbbbb with c.
+		 * But we're not really sure if this is the best match.
+		 * In such cases try to match with the same cell index.
+		 *
+		*/
+		// RULE 1 (got a match and the indexes line up perfectly well, use it regardless of the number of edits).
+		if (index >= 0 && i > 0 && results[i - 1].original === index - 1) {
+			trackMappedIndexes(i, index);
+			results[i].original = index;
+			return;
+		}
+
+		// RULE 2
+		// Here we know that `AAAA => a`
+		// Check if the previous cell has been matched.
+		// And if the next modified and next original cells are a match.
+		const nextOriginalCell = (i > 0 && originalCells.length > results[i - 1].original) ? results[i - 1].original + 1 : -1;
+		const nextOriginalCellValue = i > 0 && nextOriginalCell >= 0 && nextOriginalCell < originalCells.length ? originalCells[nextOriginalCell].getValue() : undefined;
+		if (index >= 0 && i > 0 && typeof nextOriginalCellValue === 'string' && !mappedOriginalCellToModifiedCell.has(nextOriginalCell)) {
+			if (modifiedCell.getValue().includes(nextOriginalCellValue) || nextOriginalCellValue.includes(modifiedCell.getValue())) {
+				trackMappedIndexes(i, nextOriginalCell);
+				results[i].original = nextOriginalCell;
+				return;
+			}
+		}
+
+		if (percentage < 90 || (i === 0 && results.length === 1)) {
+			trackMappedIndexes(i, index);
+			results[i].original = index;
+			return;
+		}
+	});
+
+	return results;
+}
+
+function computeClosestCell({ cell, index: cellIndex }: { cell: ICell; index: number }, arr: readonly ICell[], ignoreEmptyCells: boolean, cache: CellEditCountCache, canOriginalIndexBeMappedToModifiedIndex: (originalIndex: number, value: { editCount: EditCount }) => boolean): { index: number; editCount: number; percentage: number } {
+	let min_edits = Infinity;
+	let min_index = -1;
+	for (let i = 0; i < arr.length; i++) {
+		// Skip cells that are not of the same kind.
+		if (arr[i].cellKind !== cell.cellKind) {
+			continue;
+		}
+		const str = arr[i].getValue();
+		const cacheEntry = cache.modifiedToOriginal.get(cellIndex) ?? new Map<OriginalIndex, { editCount: EditCount }>();
+		const value = cacheEntry.get(i) ?? { editCount: computeNumberOfEdits(cell, arr[i]), };
+		cacheEntry.set(i, value);
+		cache.modifiedToOriginal.set(cellIndex, cacheEntry);
+
+		const originalCacheEntry = cache.originalToModified.get(i) ?? new Map<ModifiedIndex, { editCount: EditCount }>();
+		originalCacheEntry.set(cellIndex, value);
+		cache.originalToModified.set(i, originalCacheEntry);
+
+		if (!canOriginalIndexBeMappedToModifiedIndex(i, value)) {
+			continue;
+		}
+		if (str.length === 0 && ignoreEmptyCells) {
+			continue;
+		}
+		if (str === cell.getValue() && cell.getValue().length > 0) {
+			return { index: i, editCount: 0, percentage: 0 };
+		}
+
+		if (value.editCount < min_edits) {
+			min_edits = value.editCount;
+			min_index = i;
+		}
+	}
+
+	if (min_index === -1) {
+		return { index: -1, editCount: Number.MAX_SAFE_INTEGER, percentage: Number.MAX_SAFE_INTEGER };
+	}
+	const percentage = !cell.getValue().length && !arr[min_index].getValue().length ? 0 : (cell.getValue().length ? (min_edits * 100 / cell.getValue().length) : Number.MAX_SAFE_INTEGER);
+	return { index: min_index, editCount: min_edits, percentage };
+}
+
+function computeNumberOfEdits(modified: ICell, original: ICell) {
+	if (modified.getValue() === original.getValue()) {
+		return 0;
+	}
+
+	return computeLevenshteinDistance(modified.getValue(), original.getValue());
+}
+
+/**
+ * Precomputed equality array for character codes.
+ */
+const precomputedEqualityArray = new Uint32Array(0x10000);
+
+/**
+ * Computes the Levenshtein distance for strings of length <= 32.
+ * @param firstString - The first string.
+ * @param secondString - The second string.
+ * @returns The Levenshtein distance.
+ */
+const computeLevenshteinDistanceForShortStrings = (firstString: string, secondString: string): number => {
+	const firstStringLength = firstString.length;
+	const secondStringLength = secondString.length;
+	const lastBitMask = 1 << (firstStringLength - 1);
+	let positiveVector = -1;
+	let negativeVector = 0;
+	let distance = firstStringLength;
+	let index = firstStringLength;
+
+	// Initialize precomputedEqualityArray for firstString
+	while (index--) {
+		precomputedEqualityArray[firstString.charCodeAt(index)] |= 1 << index;
+	}
+
+	// Process each character of secondString
+	for (index = 0; index < secondStringLength; index++) {
+		let equalityMask = precomputedEqualityArray[secondString.charCodeAt(index)];
+		const combinedVector = equalityMask | negativeVector;
+		equalityMask |= ((equalityMask & positiveVector) + positiveVector) ^ positiveVector;
+		negativeVector |= ~(equalityMask | positiveVector);
+		positiveVector &= equalityMask;
+		if (negativeVector & lastBitMask) {
+			distance++;
+		}
+		if (positiveVector & lastBitMask) {
+			distance--;
+		}
+		negativeVector = (negativeVector << 1) | 1;
+		positiveVector = (positiveVector << 1) | ~(combinedVector | negativeVector);
+		negativeVector &= combinedVector;
+	}
+
+	// Reset precomputedEqualityArray
+	index = firstStringLength;
+	while (index--) {
+		precomputedEqualityArray[firstString.charCodeAt(index)] = 0;
+	}
+
+	return distance;
+};
+
+/**
+ * Computes the Levenshtein distance for strings of length > 32.
+ * @param firstString - The first string.
+ * @param secondString - The second string.
+ * @returns The Levenshtein distance.
+ */
+function computeLevenshteinDistanceForLongStrings(firstString: string, secondString: string): number {
+	const firstStringLength = firstString.length;
+	const secondStringLength = secondString.length;
+	const horizontalBitArray = [];
+	const verticalBitArray = [];
+	const horizontalSize = Math.ceil(firstStringLength / 32);
+	const verticalSize = Math.ceil(secondStringLength / 32);
+
+	// Initialize horizontal and vertical bit arrays
+	for (let i = 0; i < horizontalSize; i++) {
+		horizontalBitArray[i] = -1;
+		verticalBitArray[i] = 0;
+	}
+
+	let verticalIndex = 0;
+	for (; verticalIndex < verticalSize - 1; verticalIndex++) {
+		let negativeVector = 0;
+		let positiveVector = -1;
+		const start = verticalIndex * 32;
+		const verticalLength = Math.min(32, secondStringLength) + start;
+
+		// Initialize precomputedEqualityArray for secondString
+		for (let k = start; k < verticalLength; k++) {
+			precomputedEqualityArray[secondString.charCodeAt(k)] |= 1 << k;
+		}
+
+		// Process each character of firstString
+		for (let i = 0; i < firstStringLength; i++) {
+			const equalityMask = precomputedEqualityArray[firstString.charCodeAt(i)];
+			const previousBit = (horizontalBitArray[(i / 32) | 0] >>> i) & 1;
+			const matchBit = (verticalBitArray[(i / 32) | 0] >>> i) & 1;
+			const combinedVector = equalityMask | negativeVector;
+			const combinedHorizontalVector = ((((equalityMask | matchBit) & positiveVector) + positiveVector) ^ positiveVector) | equalityMask | matchBit;
+			let positiveHorizontalVector = negativeVector | ~(combinedHorizontalVector | positiveVector);
+			let negativeHorizontalVector = positiveVector & combinedHorizontalVector;
+			if ((positiveHorizontalVector >>> 31) ^ previousBit) {
+				horizontalBitArray[(i / 32) | 0] ^= 1 << i;
+			}
+			if ((negativeHorizontalVector >>> 31) ^ matchBit) {
+				verticalBitArray[(i / 32) | 0] ^= 1 << i;
+			}
+			positiveHorizontalVector = (positiveHorizontalVector << 1) | previousBit;
+			negativeHorizontalVector = (negativeHorizontalVector << 1) | matchBit;
+			positiveVector = negativeHorizontalVector | ~(combinedVector | positiveHorizontalVector);
+			negativeVector = positiveHorizontalVector & combinedVector;
+		}
+
+		// Reset precomputedEqualityArray
+		for (let k = start; k < verticalLength; k++) {
+			precomputedEqualityArray[secondString.charCodeAt(k)] = 0;
+		}
+	}
+
+	let negativeVector = 0;
+	let positiveVector = -1;
+	const start = verticalIndex * 32;
+	const verticalLength = Math.min(32, secondStringLength - start) + start;
+
+	// Initialize precomputedEqualityArray for secondString
+	for (let k = start; k < verticalLength; k++) {
+		precomputedEqualityArray[secondString.charCodeAt(k)] |= 1 << k;
+	}
+
+	let distance = secondStringLength;
+
+	// Process each character of firstString
+	for (let i = 0; i < firstStringLength; i++) {
+		const equalityMask = precomputedEqualityArray[firstString.charCodeAt(i)];
+		const previousBit = (horizontalBitArray[(i / 32) | 0] >>> i) & 1;
+		const matchBit = (verticalBitArray[(i / 32) | 0] >>> i) & 1;
+		const combinedVector = equalityMask | negativeVector;
+		const combinedHorizontalVector = ((((equalityMask | matchBit) & positiveVector) + positiveVector) ^ positiveVector) | equalityMask | matchBit;
+		let positiveHorizontalVector = negativeVector | ~(combinedHorizontalVector | positiveVector);
+		let negativeHorizontalVector = positiveVector & combinedHorizontalVector;
+		distance += (positiveHorizontalVector >>> (secondStringLength - 1)) & 1;
+		distance -= (negativeHorizontalVector >>> (secondStringLength - 1)) & 1;
+		if ((positiveHorizontalVector >>> 31) ^ previousBit) {
+			horizontalBitArray[(i / 32) | 0] ^= 1 << i;
+		}
+		if ((negativeHorizontalVector >>> 31) ^ matchBit) {
+			verticalBitArray[(i / 32) | 0] ^= 1 << i;
+		}
+		positiveHorizontalVector = (positiveHorizontalVector << 1) | previousBit;
+		negativeHorizontalVector = (negativeHorizontalVector << 1) | matchBit;
+		positiveVector = negativeHorizontalVector | ~(combinedVector | positiveHorizontalVector);
+		negativeVector = positiveHorizontalVector & combinedVector;
+	}
+
+	// Reset precomputedEqualityArray
+	for (let k = start; k < verticalLength; k++) {
+		precomputedEqualityArray[secondString.charCodeAt(k)] = 0;
+	}
+
+	return distance;
+}
+
+/**
+ * Computes the Levenshtein distance between two strings.
+ * @param firstString - The first string.
+ * @param secondString - The second string.
+ * @returns The Levenshtein distance.
+ */
+function computeLevenshteinDistance(firstString: string, secondString: string): number {
+	if (firstString.length < secondString.length) {
+		const temp = secondString;
+		secondString = firstString;
+		firstString = temp;
+	}
+	if (secondString.length === 0) {
+		return firstString.length;
+	}
+	if (firstString.length <= 32) {
+		return computeLevenshteinDistanceForShortStrings(firstString, secondString);
+	}
+	return computeLevenshteinDistanceForLongStrings(firstString, secondString);
+}
diff --git a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
index 0319e8fb93e2..3ebedc7bab49 100644
--- a/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
+++ b/src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.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 { IDiffResult, ISequence, LcsDiff } from '../../../../../base/common/diff/diff.js';
+import { IDiffChange, ISequence, LcsDiff } from '../../../../../base/common/diff/diff.js';
 import { doHash, hash, numberHash } from '../../../../../base/common/hash.js';
 import { IDisposable } from '../../../../../base/common/lifecycle.js';
 import { URI } from '../../../../../base/common/uri.js';
@@ -15,6 +15,12 @@ import { MirrorModel } from '../../../../../editor/common/services/textModelSync
 import { DefaultEndOfLine } from '../../../../../editor/common/model.js';
 import { IModelChangedEvent } from '../../../../../editor/common/model/mirrorTextModel.js';
 import { filter } from '../../../../../base/common/objects.js';
+import { matchCellBasedOnSimilarties } from './notebookCellMatching.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { DiffChange } from '../../../../../base/common/diff/diffChange.js';
+import { computeDiff } from '../notebookDiff.js';
+
+const PREFIX_FOR_UNMATCHED_ORIGINAL_CELLS = `unmatchedOriginalCell`;
 
 class MirrorCell {
 	private readonly textModel: MirrorModel;
@@ -46,6 +52,9 @@ class MirrorCell {
 		return this.textModel.getValue();
 	}
 
+	getLinesContent(): string[] {
+		return this.textModel.getLinesContent();
+	}
 	getComparisonValue(): number {
 		return this._hash ??= this._getHash();
 	}
@@ -147,24 +156,21 @@ class MirrorNotebookDocument {
 class CellSequence implements ISequence {
 
 	static create(textModel: MirrorNotebookDocument) {
-		const hashValue = new Int32Array(textModel.cells.length);
-		textModel.cells.map((c, i) => {
-			hashValue[i] = c.getComparisonValue();
-		});
+		const hashValue = textModel.cells.map(c => c.getComparisonValue());
 		return new CellSequence(hashValue);
 	}
-
-	static createWithCellId(textModel: MirrorNotebookDocument): Map<string, number> {
-		const hashValue = new Map<string, number>();
-		textModel.cells.map((c, i) => {
-			const value = c.getComparisonValue();
-			const id: string = (c.metadata?.id || '') as string;
-			hashValue.set(id, value);
+	static createWithCellId(cells: MirrorCell[], includeCellContents?: boolean) {
+		const hashValue = cells.map((c) => {
+			if (includeCellContents) {
+				return `${doHash(c.internalMetadata?.cellId, numberHash(104579, 0))}#${c.getComparisonValue()}`;
+			} else {
+				return `${doHash(c.internalMetadata?.cellId, numberHash(104579, 0))}}`;
+			}
 		});
-		return hashValue;
+		return new CellSequence(hashValue);
 	}
 
-	constructor(readonly hashValue: Int32Array) { }
+	constructor(readonly hashValue: number[] | string[]) { }
 
 	getElements(): string[] | number[] | Int32Array {
 		return this.hashValue;
@@ -218,101 +224,258 @@ export class NotebookEditorSimpleWorker implements IRequestHandler, IDisposable
 		const original = this._getModel(originalUrl);
 		const modified = this._getModel(modifiedUrl);
 
-		const originalSeq = CellSequence.create(original);
-		const modifiedSeq = CellSequence.create(modified);
-
-		const diff = new LcsDiff(originalSeq, modifiedSeq);
-		const diffResult = diff.ComputeDiff(false);
+		const originalModel = new NotebookTextModelFacade(original);
+		const modifiedModel = new NotebookTextModelFacade(modified);
 
 		const originalMetadata = filter(original.metadata, key => !original.transientDocumentMetadata[key]);
 		const modifiedMetadata = filter(modified.metadata, key => !modified.transientDocumentMetadata[key]);
-		return {
-			metadataChanged: JSON.stringify(originalMetadata) !== JSON.stringify(modifiedMetadata),
-			cellsDiff: this.$computeDiffWithCellIds(original, modified) || diffResult,
-		};
-	}
+		const metadataChanged = JSON.stringify(originalMetadata) !== JSON.stringify(modifiedMetadata);
+		// TODO@DonJayamanne
+		// In the future we might want to avoid computing LCS of outputs
+		// That will make this faster.
+		const originalDiff = new LcsDiff(CellSequence.create(original), CellSequence.create(modified)).ComputeDiff(false);
+		if (originalDiff.changes.length === 0) {
+			return {
+				metadataChanged,
+				cellsDiff: originalDiff
+			};
+		}
 
-	$computeDiffWithCellIds(original: MirrorNotebookDocument, modified: MirrorNotebookDocument): IDiffResult | undefined {
-		const originalCellIndexIds = original.cells.map((cell, index) => ({ index, id: (cell.metadata?.id || '') as string }));
-		const modifiedCellIndexIds = modified.cells.map((cell, index) => ({ index, id: (cell.metadata?.id || '') as string }));
-		const originalCellIds = originalCellIndexIds.map(c => c.id);
-		const modifiedCellIds = modifiedCellIndexIds.map(c => c.id);
-		const orderOrOriginalCellIds = originalCellIds.filter(id => modifiedCellIds.includes(id)).join(',');
-		const orderOrModifiedCellIds = modifiedCellIds.filter(id => originalCellIds.includes(id)).join(',');
-		if (originalCellIndexIds.some(c => !c.id) || modifiedCellIndexIds.some(c => !c.id) || orderOrOriginalCellIds !== orderOrModifiedCellIds) {
-			return;
+		// This will return the mapping of the cells and what cells were inserted/deleted.
+		// We do not care much about accuracy of the diff, but care about the mapping of unmodified cells.
+		// That can be used as anchor points to find the cells that have changed.
+		// And on cells that have changed, we can use similarity algorithms to find the mapping.
+		// Eg as mentioned earlier, its possible after similarity algorithms we find that cells weren't inserted/deleted but were just modified.
+		const cellMapping = computeDiff(originalModel, modifiedModel, { cellsDiff: { changes: originalDiff.changes, quitEarly: false }, metadataChanged: false, }).cellDiffInfo;
+
+		// If we have no insertions/deletions, then this is a good diffing.
+		if (cellMapping.every(c => c.type === 'modified')) {
+			return {
+				metadataChanged,
+				cellsDiff: originalDiff
+			};
 		}
 
-		const diffResult: IDiffResult = { changes: [], quitEarly: false, };
+		let diffUsingCellIds = this.canComputeDiffWithCellIds(original, modified);
+		if (!diffUsingCellIds) {
+			/**
+			 * Assume we have cells as follows
+			 * Original   Modified
+			 * A	  		A
+			 * B			B
+			 * C			e
+			 * D			F
+			 * E
+			 * F
+			 *
+			 * Using LCS we know easily that A, B cells match.
+			 * Using LCS it would look like C changed to e
+			 * Using LCS D & E were removed.
+			 *
+			 * A human would be able to tell that cell C, D were removed.
+			 * A human can tell that E changed to e because the code in the cells are very similar.
+			 * Note the words `similar`, humans try to match cells based on certain heuristics.
+			 * & the most obvious one is the similarity of the code in the cells.
+			 *
+			 * LCS has no notion of similarity, it only knows about equality.
+			 * We can use other algorithms to find similarity.
+			 * So if we eliminate A, B, we are left with C, D, E, F and we need to find what they map to in `e, F` in modifed document.
+			 * We can use a similarity algorithm to find that.
+			 *
+			 * The purpose of using LCS first is to find the cells that have not changed.
+			 * This avoids the need to use similarity algorithms on all cells.
+			 *
+			 * At the end of the day what we need is as follows
+			 * A <=> A
+			 * B <=> B
+			 * C => Deleted
+			 * D => Deleted
+			 * E => e
+			 * F => F
+			 */
+
+
+
+			// Note, if cells are swapped, then this compilicates things
+			// Trying to solve diff manually is not easy.
+			// Lets instead use LCS find the cells that haven't changed,
+			// & the cells that have.
+			// For the range of cells that have change, lets see if we can get better results using similarity algorithms.
+			// Assume we have
+			// Code Cell = print("Hello World")
+			// Code Cell = print("Foo Bar")
+			// We now change this to
+			// MD Cell = # Description
+			// Code Cell = print("Hello WorldZ")
+			// Code Cell = print("Foo BarZ")
+			// LCS will tell us that everything changed.
+			// But using similarity algorithms we can tell that the first cell is new and last 2 changed.
+
+
+
+			// Lets try the similarity algorithms on all cells.
+			// We might fare better.
+			const result = matchCellBasedOnSimilarties(modified.cells, original.cells);
+			// If we have at least one match, then great.
+			if (result.some(c => c.original !== -1)) {
+				// We have managed to find similarities between cells.
+				// Now we can definitely find what cell is new/removed.
+				this.updateCellIdsBasedOnMappings(result, original.cells, modified.cells);
+				diffUsingCellIds = true;
+			}
+		}
 
-		const computeCellHashesById = (notebook: MirrorNotebookDocument) => {
-			const hashValue = new Map<string, number>();
-			notebook.cells.map((c, i) => {
-				const value = c.getComparisonValue();
-				// Verified earlier that these cannot be empty.
-				const id: string = (c.metadata?.id || '') as string;
-				hashValue.set(id, value);
-			});
-			return hashValue;
-		};
+		if (!diffUsingCellIds) {
+			return {
+				metadataChanged,
+				cellsDiff: originalDiff
+			};
+		}
 
-		const originalSeq = computeCellHashesById(original);
-		const modifiedSeq = computeCellHashesById(modified);
-
-		while (modifiedCellIndexIds.length) {
-			const modifiedCell = modifiedCellIndexIds.shift()!;
-			const originalCell = originalCellIndexIds.find(c => c.id === modifiedCell.id);
-			if (originalCell) {
-				// Everything before this cell is a deletion
-				const index = originalCellIndexIds.indexOf(originalCell);
-				const deletedFromOriginal = originalCellIndexIds.splice(0, index + 1);
-
-				if (deletedFromOriginal.length === 1) {
-					if (originalSeq.get(originalCell.id) === modifiedSeq.get(originalCell.id)) {
-						// Cell contents are the same.
-						// No changes, hence ignore this cell.
+		// At this stage we can use internalMetadata.cellId for tracking changes.
+		// I.e. we compute LCS diff and the hashes of some cells from original will be equal to that in modified as we're using cellId.
+		// Thus we can find what cells are new/deleted.
+		// After that we can find whether the contents of the cells changed.
+		const cellsInsertedOrDeletedDiff = new LcsDiff(CellSequence.createWithCellId(original.cells), CellSequence.createWithCellId(modified.cells)).ComputeDiff(false);
+		const cellDiffInfo = computeDiff(originalModel, modifiedModel, { cellsDiff: { changes: cellsInsertedOrDeletedDiff.changes, quitEarly: false }, metadataChanged: false, }).cellDiffInfo;
+
+		let processedIndex = 0;
+		const changes: IDiffChange[] = [];
+		cellsInsertedOrDeletedDiff.changes.forEach(change => {
+			if (!change.originalLength && change.modifiedLength) {
+				// Inserted.
+				// Find all modified cells before this.
+				const changeIndex = cellDiffInfo.findIndex(c => c.type === 'insert' && c.modifiedCellIndex === change.modifiedStart);
+				cellDiffInfo.slice(processedIndex, changeIndex).forEach(c => {
+					if (c.type === 'unchanged' || c.type === 'modified') {
+						const originalCell = original.cells[c.originalCellIndex];
+						const modifiedCell = modified.cells[c.modifiedCellIndex];
+						const changed = c.type === 'modified' || originalCell.getComparisonValue() !== modifiedCell.getComparisonValue();
+						if (changed) {
+							changes.push(new DiffChange(c.originalCellIndex, 1, c.modifiedCellIndex, 1));
+						}
 					}
-					else {
-						diffResult.changes.push({
-							originalStart: originalCell.index,
-							originalLength: 1,
-							modifiedStart: modifiedCell.index,
-							modifiedLength: 1
-						});
+				});
+				changes.push(change);
+				processedIndex = changeIndex + 1;
+			} else if (change.originalLength && !change.modifiedLength) {
+				// Deleted.
+				// Find all modified cells before this.
+				const changeIndex = cellDiffInfo.findIndex(c => c.type === 'delete' && c.originalCellIndex === change.originalStart);
+				cellDiffInfo.slice(processedIndex, changeIndex).forEach(c => {
+					if (c.type === 'unchanged' || c.type === 'modified') {
+						const originalCell = original.cells[c.originalCellIndex];
+						const modifiedCell = modified.cells[c.modifiedCellIndex];
+						const changed = c.type === 'modified' || originalCell.getComparisonValue() !== modifiedCell.getComparisonValue();
+						if (changed) {
+							changes.push(new DiffChange(c.originalCellIndex, 1, c.modifiedCellIndex, 1));
+						}
 					}
-				} else {
-					// This means we have some cells before this and they were removed.
-					diffResult.changes.push({
-						originalStart: deletedFromOriginal[0].index,
-						originalLength: deletedFromOriginal.length - 1,
-						modifiedStart: modifiedCell.index,
-						modifiedLength: 0
-					});
+				});
+				changes.push(change);
+				processedIndex = changeIndex + 1;
+			} else {
+				// This could be a situation where a cell has been deleted on left and inserted on the right.
+				// E.g. markdown cell deleted and code cell inserted.
+				// But LCS shows them as a modification.
+				const changeIndex = cellDiffInfo.findIndex(c => (c.type === 'delete' && c.originalCellIndex === change.originalStart) || (c.type === 'insert' && c.modifiedCellIndex === change.modifiedStart));
+				cellDiffInfo.slice(processedIndex, changeIndex).forEach(c => {
+					if (c.type === 'unchanged' || c.type === 'modified') {
+						const originalCell = original.cells[c.originalCellIndex];
+						const modifiedCell = modified.cells[c.modifiedCellIndex];
+						const changed = c.type === 'modified' || originalCell.getComparisonValue() !== modifiedCell.getComparisonValue();
+						if (changed) {
+							changes.push(new DiffChange(c.originalCellIndex, 1, c.modifiedCellIndex, 1));
+						}
+					}
+				});
+				changes.push(change);
+				processedIndex = changeIndex + 1;
+			}
+		});
+		cellDiffInfo.slice(processedIndex).forEach(c => {
+			if (c.type === 'unchanged' || c.type === 'modified') {
+				const originalCell = original.cells[c.originalCellIndex];
+				const modifiedCell = modified.cells[c.modifiedCellIndex];
+				const changed = c.type === 'modified' || originalCell.getComparisonValue() !== modifiedCell.getComparisonValue();
+				if (changed) {
+					changes.push(new DiffChange(c.originalCellIndex, 1, c.modifiedCellIndex, 1));
 				}
-				continue;
 			}
-			else {
-				// This is a new cell.
-				diffResult.changes.push({
-					originalStart: originalCellIndexIds.length ? originalCellIndexIds[0].index : original.cells.length,
-					originalLength: 0,
-					modifiedStart: modifiedCell.index,
-					modifiedLength: 1
-				});
+		});
+
+		return {
+			metadataChanged,
+			cellsDiff: {
+				changes,
+				quitEarly: false
 			}
+		};
+	}
+
+	canComputeDiffWithCellIds(original: MirrorNotebookDocument, modified: MirrorNotebookDocument): boolean {
+		return this.canComputeDiffWithCellInternalIds(original, modified) || this.canComputeDiffWithCellMetadataIds(original, modified);
+	}
+
+	canComputeDiffWithCellInternalIds(original: MirrorNotebookDocument, modified: MirrorNotebookDocument): boolean {
+		const originalCellIndexIds = original.cells.map((cell, index) => ({ index, id: (cell.internalMetadata?.cellId || '') as string }));
+		const modifiedCellIndexIds = modified.cells.map((cell, index) => ({ index, id: (cell.internalMetadata?.cellId || '') as string }));
+		// If we have a cell without an id, do not use metadata.id for diffing.
+		if (originalCellIndexIds.some(c => !c.id) || modifiedCellIndexIds.some(c => !c.id)) {
+			return false;
 		}
+		// If none of the ids in original can be found in modified, then we can't use metadata.id for diffing.
+		// I.e. everything is new, no point trying.
+		return originalCellIndexIds.some(c => modifiedCellIndexIds.find(m => m.id === c.id));
+	}
 
-		// If we still have some original cells, then those have been removed.
-		if (originalCellIndexIds.length) {
-			diffResult.changes.push({
-				originalStart: originalCellIndexIds[0].index,
-				originalLength: originalCellIndexIds.length,
-				modifiedStart: modifiedCellIndexIds.length,
-				modifiedLength: 0
-			});
+	canComputeDiffWithCellMetadataIds(original: MirrorNotebookDocument, modified: MirrorNotebookDocument): boolean {
+		const originalCellIndexIds = original.cells.map((cell, index) => ({ index, id: (cell.metadata?.id || '') as string }));
+		const modifiedCellIndexIds = modified.cells.map((cell, index) => ({ index, id: (cell.metadata?.id || '') as string }));
+		// If we have a cell without an id, do not use metadata.id for diffing.
+		if (originalCellIndexIds.some(c => !c.id) || modifiedCellIndexIds.some(c => !c.id)) {
+			return false;
+		}
+		// If none of the ids in original can be found in modified, then we can't use metadata.id for diffing.
+		// I.e. everything is new, no point trying.
+		if (originalCellIndexIds.every(c => !modifiedCellIndexIds.find(m => m.id === c.id))) {
+			return false;
 		}
 
-		return diffResult;
+		// Internally we use internalMetadata.cellId for diffing, hence update the internalMetadata.cellId
+		original.cells.map((cell, index) => {
+			cell.internalMetadata = cell.internalMetadata || {};
+			cell.internalMetadata.cellId = cell.metadata?.id as string || '';
+		});
+		modified.cells.map((cell, index) => {
+			cell.internalMetadata = cell.internalMetadata || {};
+			cell.internalMetadata.cellId = cell.metadata?.id as string || '';
+		});
+		return true;
+	}
+
+
+	isOriginalCellMatchedWithModifiedCell(originalCell: MirrorCell) {
+		return (originalCell.internalMetadata?.cellId as string || '').startsWith(PREFIX_FOR_UNMATCHED_ORIGINAL_CELLS);
+	}
+	updateCellIdsBasedOnMappings(mappings: { modified: number; original: number }[], originalCells: MirrorCell[], modifiedCells: MirrorCell[]): boolean {
+		const uuids = new Map<number, string>();
+		originalCells.map((cell, index) => {
+			cell.internalMetadata = cell.internalMetadata || { cellId: '' };
+			cell.internalMetadata.cellId = `${PREFIX_FOR_UNMATCHED_ORIGINAL_CELLS}${generateUuid()}`;
+			const found = mappings.find(r => r.original === index);
+			if (found) {
+				// Do not use the indexes as ids.
+				// If we do, then the hashes will be very similar except for last digit.
+				cell.internalMetadata.cellId = generateUuid();
+				uuids.set(found.modified, cell.internalMetadata.cellId as string);
+			}
+		});
+		modifiedCells.map((cell, index) => {
+			cell.internalMetadata = cell.internalMetadata || { cellId: '' };
+			cell.internalMetadata.cellId = uuids.get(index) ?? generateUuid();
+		});
+		return true;
 	}
 
 	$canPromptRecommendation(modelUrl: string): boolean {
@@ -365,3 +528,53 @@ export class NotebookEditorSimpleWorker implements IRequestHandler, IDisposable
 export function create(workerServer: IWorkerServer): IRequestHandler {
 	return new NotebookEditorSimpleWorker();
 }
+
+export type CellDiffInfo = {
+	originalCellIndex: number;
+	modifiedCellIndex: number;
+	type: 'unchanged' | 'modified';
+} |
+{
+	originalCellIndex: number;
+	type: 'delete';
+} |
+{
+	modifiedCellIndex: number;
+	type: 'insert';
+};
+
+interface ICell {
+	cellKind: CellKind;
+	getHashValue(): number;
+	equal(cell: ICell): boolean;
+}
+
+class NotebookTextModelFacade {
+	public readonly cells: readonly ICell[];
+	constructor(
+		readonly notebook: MirrorNotebookDocument
+	) {
+
+		this.cells = notebook.cells.map(cell => new NotebookCellTextModelFacade(cell));
+	}
+
+}
+class NotebookCellTextModelFacade implements ICell {
+	get cellKind(): CellKind {
+		return this.cell.cellKind;
+	}
+	constructor(
+		private readonly cell: MirrorCell
+	) {
+	}
+	getHashValue(): number {
+		return this.cell.getComparisonValue();
+	}
+	equal(cell: ICell): boolean {
+		if (cell.cellKind !== this.cellKind) {
+			return false;
+		}
+		return this.getHashValue() === cell.getHashValue();
+	}
+
+}
diff --git a/src/vs/workbench/contrib/notebook/test/browser/diff/notebookDiffService.test.ts b/src/vs/workbench/contrib/notebook/test/browser/diff/notebookDiffService.test.ts
new file mode 100644
index 000000000000..afc0ab1f8ae9
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/test/browser/diff/notebookDiffService.test.ts
@@ -0,0 +1,14750 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Mimes } from '../../../../../../base/common/mime.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { CellKind, IMainCellDto, IOutputDto, NotebookCellMetadata } from '../../../common/notebookCommon.js';
+import { matchCellBasedOnSimilarties } from '../../../common/services/notebookCellMatching.js';
+import { NotebookEditorSimpleWorker } from '../../../common/services/notebookSimpleWorker.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { IDiffChange } from '../../../../../../base/common/diff/diff.js';
+
+
+suite('NotebookDiff Diff Service', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+	let worker: NotebookEditorSimpleWorker;
+	suiteSetup(() => {
+		worker = new NotebookEditorSimpleWorker();
+	});
+	suiteTeardown(() => {
+		worker.dispose();
+	});
+
+	test('No changes', async () => {
+		const { mapping, diff } = await mapCells([
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		], [
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes.length, 0);
+	});
+
+	test('diff different source', async () => {
+		const { mapping, diff } = await mapCells([
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		], [
+			[['y'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 1, modifiedStart: 0, modifiedLength: 1 } satisfies IDiffChange
+		]);
+	});
+
+	test('diff different source (2 cells)', async () => {
+		const { mapping, diff } = await mapCells([
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+			[['y'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		], [
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+			[['z'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 1, originalLength: 1, modifiedStart: 1, modifiedLength: 1 } satisfies IDiffChange
+		]);
+	});
+
+	test('diff different source (first cell changed)', async () => {
+		const { mapping, diff } = await mapCells([
+			[['import sys'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+			[['y'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		], [
+			[['import pandas'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+			[['y'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 1, modifiedStart: 0, modifiedLength: 1 } satisfies IDiffChange
+		]);
+	});
+
+
+	test('diff test small source', async () => {
+		const { mapping, diff } = await mapCells([
+			[['123456789'], 'javascript', CellKind.Code, [], {}]
+		], [
+			[['987654321'], 'javascript', CellKind.Code, [], {}],
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 1, modifiedStart: 0, modifiedLength: 1 } satisfies IDiffChange
+		]);
+	});
+
+	test('diff test data single cell', async () => {
+		const { mapping, diff } = await mapCells([
+			[[
+				'# This version has a bug\n',
+				'def mult(a, b):\n',
+				'    return a / b'
+			], 'javascript', CellKind.Code, [], {}]
+		], [
+			[[
+				'def mult(a, b):\n',
+				'    \'This version is debugged.\'\n',
+				'    return a * b'
+			], 'javascript', CellKind.Code, [], {}],
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 1, modifiedStart: 0, modifiedLength: 1 } satisfies IDiffChange
+		]);
+	});
+
+	test('diff foo/foe (swapped cells)', async () => {
+		const { mapping, diff } = await mapCells([
+			[['def foe(x, y):\n', '    return x + y\n', 'foe(3, 2)'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([6])) }] }], { metadata: { collapsed: false }, executionOrder: 5 }],
+			[['def foo(x, y):\n', '    return x * y\n', 'foo(1, 2)'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([2])) }] }], { metadata: { collapsed: false }, executionOrder: 6 }],
+			[[''], 'javascript', CellKind.Code, [], {}]
+		], [
+			[['def foo(x, y):\n', '    return x * y\n', 'foo(1, 2)'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([2])) }] }], { metadata: { collapsed: false }, executionOrder: 6 }],
+			[['def foe(x, y):\n', '    return x + y\n', 'foe(3, 2)'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([6])) }] }], { metadata: { collapsed: false }, executionOrder: 5 }],
+			[[''], 'javascript', CellKind.Code, [], {}]
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 1 },
+			{ modified: 1, original: 0 },
+			{ modified: 2, original: 2 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 0, modifiedStart: 0, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 1, originalLength: 1, modifiedStart: 2, modifiedLength: 0 } satisfies IDiffChange,
+			// { originalStart: 1, originalLength: 1, modifiedStart: 2, modifiedLength: 0 } satisfies IDiffChange
+		]);
+	});
+
+	test('diff foo/foe (swapped cells with changes in output)', async () => {
+		const { mapping, diff } = await mapCells([
+			[['def foe(x, y):\n', '    return x + y\n', 'foe(3, 2)'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([6])) }] }], { metadata: { collapsed: false }, executionOrder: 5 }],
+			[['def foo(x, y):\n', '    return x * y\n', 'foo(1, 2)'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([2])) }] }], { metadata: { collapsed: false }, executionOrder: 6 }],
+			[[''], 'javascript', CellKind.Code, [], {}]
+		], [
+			[['def foo(x, y):\n', '    return x * y\n', 'foo(1, 2)'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([6])) }] }], { metadata: { collapsed: false }, executionOrder: 5 }],
+			[['def foe(x, y):\n', '    return x + y\n', 'foe(3, 2)'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([2])) }] }], { metadata: { collapsed: false }, executionOrder: 6 }],
+			[[''], 'javascript', CellKind.Code, [], {}]
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 1 },
+			{ modified: 1, original: 0 },
+			{ modified: 2, original: 2 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 0, modifiedStart: 0, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 0, originalLength: 1, modifiedStart: 1, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 1, originalLength: 1, modifiedStart: 2, modifiedLength: 0 } satisfies IDiffChange,
+		]);
+	});
+
+	test('diff markdown', async () => {
+		const { mapping, diff } = await mapCells([
+			[['This is a test notebook with only markdown cells'], 'markdown', CellKind.Markup, [], {}],
+			[['Lorem ipsum dolor sit amet'], 'markdown', CellKind.Markup, [], {}],
+			[['In other news'], 'markdown', CellKind.Markup, [], {}],
+		], [
+			[['This is a test notebook with markdown cells only'], 'markdown', CellKind.Markup, [], {}],
+			[['Lorem ipsum dolor sit amet'], 'markdown', CellKind.Markup, [], {}],
+			[['In the news'], 'markdown', CellKind.Markup, [], {}],
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 1, modifiedStart: 0, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 2, originalLength: 1, modifiedStart: 2, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+
+	test('diff insert 1 at the top', async () => {
+		const { mapping, diff } = await mapCells([
+			[['var a = 1;'], 'javascript', CellKind.Code, [], {}],
+			[['var b = 2;'], 'javascript', CellKind.Code, [], {}]
+		], [
+			[['var h = 8;'], 'javascript', CellKind.Code, [], {}],
+			[['var a = 1;'], 'javascript', CellKind.Code, [], {}],
+			[['var b = 2;'], 'javascript', CellKind.Code, [], {}]
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: -1 },
+			{ modified: 1, original: 0 },
+			{ modified: 2, original: 1 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 0, modifiedStart: 0, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+
+	test('diff insert 1 at the top with lots of cells', async () => {
+
+		const { mapping, diff } = await mapCells([
+			[['var a = 1;'], 'javascript', CellKind.Code, [], {}],
+			[['var b = 2;'], 'javascript', CellKind.Code, [], {}],
+			[['var c = 3;'], 'javascript', CellKind.Code, [], {}],
+			[['var d = 4;'], 'javascript', CellKind.Code, [], {}],
+			[['var e = 5;'], 'javascript', CellKind.Code, [], {}],
+			[['var f = 6;'], 'javascript', CellKind.Code, [], {}],
+			[['var g = 7;'], 'javascript', CellKind.Code, [], {}],
+		], [
+			[['var h = 8;'], 'javascript', CellKind.Code, [], {}],
+			[['var a = 1;'], 'javascript', CellKind.Code, [], {}],
+			[['var b = 2;'], 'javascript', CellKind.Code, [], {}],
+			[['var c = 3;'], 'javascript', CellKind.Code, [], {}],
+			[['var d = 4;'], 'javascript', CellKind.Code, [], {}],
+			[['var e = 5;'], 'javascript', CellKind.Code, [], {}],
+			[['var f = 6;'], 'javascript', CellKind.Code, [], {}],
+			[['var g = 7;'], 'javascript', CellKind.Code, [], {}],
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: -1 },
+			{ modified: 1, original: 0 },
+			{ modified: 2, original: 1 },
+			{ modified: 3, original: 2 },
+			{ modified: 4, original: 3 },
+			{ modified: 5, original: 4 },
+			{ modified: 6, original: 5 },
+			{ modified: 7, original: 6 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 0, modifiedStart: 0, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+
+	test('diff insert 3 at the top with lots of cells', async () => {
+
+		const { mapping, diff } = await mapCells([
+			[['var a = 1;'], 'javascript', CellKind.Code, [], {}],
+			[['var b = 2;'], 'javascript', CellKind.Code, [], {}],
+			[['var c = 3;'], 'javascript', CellKind.Code, [], {}],
+			[['var d = 4;'], 'javascript', CellKind.Code, [], {}],
+			[['var e = 5;'], 'javascript', CellKind.Code, [], {}],
+			[['var f = 6;'], 'javascript', CellKind.Code, [], {}],
+			[['var g = 7;'], 'javascript', CellKind.Code, [], {}],
+		], [
+			[['var h = 8;'], 'javascript', CellKind.Code, [], {}],
+			[['var i = 8;'], 'javascript', CellKind.Code, [], {}],
+			[['var j = 8;'], 'javascript', CellKind.Code, [], {}],
+			[['var a = 1;'], 'javascript', CellKind.Code, [], {}],
+			[['var b = 2;'], 'javascript', CellKind.Code, [], {}],
+			[['var c = 3;'], 'javascript', CellKind.Code, [], {}],
+			[['var d = 4;'], 'javascript', CellKind.Code, [], {}],
+			[['var e = 5;'], 'javascript', CellKind.Code, [], {}],
+			[['var f = 6;'], 'javascript', CellKind.Code, [], {}],
+			[['var g = 7;'], 'javascript', CellKind.Code, [], {}],
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: -1 },
+			{ modified: 1, original: -1 },
+			{ modified: 2, original: -1 },
+			{ modified: 3, original: 0 },
+			{ modified: 4, original: 1 },
+			{ modified: 5, original: 2 },
+			{ modified: 6, original: 3 },
+			{ modified: 7, original: 4 },
+			{ modified: 8, original: 5 },
+			{ modified: 9, original: 6 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 0, modifiedStart: 0, modifiedLength: 3 } satisfies IDiffChange,
+		]);
+	});
+
+	test('diff insert 1 in the middle', async () => {
+
+		const { mapping, diff } = await mapCells([
+			[['var a = 1;'], 'javascript', CellKind.Code, [], {}],
+			[['var b = 2;'], 'javascript', CellKind.Code, [], {}],
+			[['var c = 3;'], 'javascript', CellKind.Code, [], {}],
+			[['var d = 4;'], 'javascript', CellKind.Code, [], {}],
+			[['var e = 5;'], 'javascript', CellKind.Code, [], {}],
+			[['var f = 6;'], 'javascript', CellKind.Code, [], {}],
+			[['var g = 7;'], 'javascript', CellKind.Code, [], {}],
+		], [
+			[['var a = 1;'], 'javascript', CellKind.Code, [], {}],
+			[['var b = 2;'], 'javascript', CellKind.Code, [], {}],
+			[['var c = 3;'], 'javascript', CellKind.Code, [], {}],
+			[['var d = 4;'], 'javascript', CellKind.Code, [], {}],
+			[['var h = 8;'], 'javascript', CellKind.Code, [], {}],
+			[['var e = 5;'], 'javascript', CellKind.Code, [], {}],
+			[['var f = 6;'], 'javascript', CellKind.Code, [], {}],
+			[['var g = 7;'], 'javascript', CellKind.Code, [], {}],
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: -1 },
+			{ modified: 5, original: 4 },
+			{ modified: 6, original: 5 },
+			{ modified: 7, original: 6 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 4, originalLength: 0, modifiedStart: 4, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+
+	test('LCS (swap cells with outputs)', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Description'], 'markdown', CellKind.Markup, [], { metadata: {} }],
+			[['x = 3'], 'javascript', CellKind.Code, [], { metadata: { collapsed: true }, executionOrder: 1 }],
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 1 }],
+			[['x'], 'javascript', CellKind.Code, [], { metadata: { collapsed: false } }]
+		], [
+			[['# Description'], 'markdown', CellKind.Markup, [], { metadata: {} }],
+			[['x = 3'], 'javascript', CellKind.Code, [], { metadata: { collapsed: true }, executionOrder: 1 }],
+			[['x'], 'javascript', CellKind.Code, [], { metadata: { collapsed: false } }],
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 1 }]
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 2, originalLength: 1, modifiedStart: 2, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 3, originalLength: 1, modifiedStart: 3, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+
+	test('LCS (outputs changed)', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Description'], 'markdown', CellKind.Markup, [], { metadata: {} }],
+			[['x = 3'], 'javascript', CellKind.Code, [], { metadata: { collapsed: true }, executionOrder: 1 }],
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 1 }],
+			[['y'], 'javascript', CellKind.Code, [], { metadata: { collapsed: false } }]
+		], [
+			[['# Description'], 'markdown', CellKind.Markup, [], { metadata: {} }],
+			[['x = 3'], 'javascript', CellKind.Code, [], { metadata: { collapsed: true }, executionOrder: 1 }],
+			[['x'], 'javascript', CellKind.Code, [], { metadata: { collapsed: true } }],
+			[['y'], 'javascript', CellKind.Code, [], { metadata: { collapsed: false } }],
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 2, originalLength: 1, modifiedStart: 2, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+
+	test('Swap cells with output and with same code in each cell', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Description'], 'markdown', CellKind.Markup, [], { metadata: {} }],
+			[['x = 3'], 'javascript', CellKind.Code, [], { metadata: { collapsed: true }, executionOrder: 1 }],
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 1 }],
+			[['x'], 'javascript', CellKind.Code, [], { metadata: { collapsed: false } }],
+			[['x = 5'], 'javascript', CellKind.Code, [], {}],
+			[['x'], 'javascript', CellKind.Code, [], {}],
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], {}],
+		], [
+			[['# Description'], 'markdown', CellKind.Markup, [], { metadata: {} }],
+			[['x = 3'], 'javascript', CellKind.Code, [], { metadata: { collapsed: true }, executionOrder: 1 }],
+			[['x'], 'javascript', CellKind.Code, [], { metadata: { collapsed: false } }],
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 1 }],
+			[['x = 5'], 'javascript', CellKind.Code, [], {}],
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], {}],
+			[['x'], 'javascript', CellKind.Code, [], {}],
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: 4 },
+			{ modified: 5, original: 5 },
+			{ modified: 6, original: 6 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 2, originalLength: 1, modifiedStart: 2, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 3, originalLength: 1, modifiedStart: 3, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 5, originalLength: 1, modifiedStart: 5, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 6, originalLength: 1, modifiedStart: 6, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+
+	test('Change outputs of cells', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Description'], 'markdown', CellKind.Markup, [], { metadata: {} }],
+			[['x = 3'], 'javascript', CellKind.Code, [], { metadata: { collapsed: true }, executionOrder: 1 }],
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 1 }],
+			[['y'], 'javascript', CellKind.Code, [], { metadata: { collapsed: false } }],
+			[['x = 5'], 'javascript', CellKind.Code, [], {}],
+			[['x'], 'javascript', CellKind.Code, [], {}],
+			[['y'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], {}],
+		], [
+			[['# Description'], 'markdown', CellKind.Markup, [], { metadata: {} }],
+			[['x = 3'], 'javascript', CellKind.Code, [], { metadata: { collapsed: true }, executionOrder: 1 }],
+			[['x'], 'javascript', CellKind.Code, [], { metadata: { collapsed: false } }],
+			[['y'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 1 }],
+			[['x = 5'], 'javascript', CellKind.Code, [], {}],
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], {}],
+			[['y'], 'javascript', CellKind.Code, [], {}],
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: 4 },
+			{ modified: 5, original: 5 },
+			{ modified: 6, original: 6 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 2, originalLength: 1, modifiedStart: 2, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 3, originalLength: 1, modifiedStart: 3, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 5, originalLength: 1, modifiedStart: 5, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 6, originalLength: 1, modifiedStart: 6, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+
+	test('Insert a new cell', async () => {
+		const { mapping, diff } = await mapCells([
+			[['var a = 1;'], 'javascript', CellKind.Code, [], {}],
+			[['var b = 2;'], 'javascript', CellKind.Code, [], {}],
+			[['var c = 3;'], 'javascript', CellKind.Code, [], {}],
+			[['var d = 4;'], 'javascript', CellKind.Code, [], {}],
+			[['var e = 5;'], 'javascript', CellKind.Code, [], {}],
+			[['var f = 6;'], 'javascript', CellKind.Code, [], {}],
+			[['var g = 7;'], 'javascript', CellKind.Code, [], {}],
+		], [
+			[['var a = 1;'], 'javascript', CellKind.Code, [], {}],
+			[['var b = 2;'], 'javascript', CellKind.Code, [], {}],
+			[['var c = 3;'], 'javascript', CellKind.Code, [], {}],
+			[['var d = 4;'], 'javascript', CellKind.Code, [], {}],
+			[['var h = 8;'], 'javascript', CellKind.Code, [], {}],
+			[['var e = 5;'], 'javascript', CellKind.Code, [], {}],
+			[['var f = 6;'], 'javascript', CellKind.Code, [], {}],
+			[['var g = 7;'], 'javascript', CellKind.Code, [], {}],
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: -1 },//
+			{ modified: 5, original: 4 },
+			{ modified: 6, original: 5 },
+			{ modified: 7, original: 6 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 4, originalLength: 0, modifiedStart: 4, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+
+	test('diff output', async () => {
+		const { mapping, diff } = await mapCells([
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+			[['y'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([4])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		], [
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+			[['y'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 1, originalLength: 1, modifiedStart: 1, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+
+	test('diff output fast check', async () => {
+		const { mapping, diff } = await mapCells([
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+			[['y'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([4])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		], [
+			[['x'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([3])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+			[['y'], 'javascript', CellKind.Code, [{ outputId: 'someOtherId', outputs: [{ mime: Mimes.text, data: VSBuffer.wrap(new Uint8Array([5])) }] }], { metadata: { collapsed: false }, executionOrder: 3 }],
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 1, originalLength: 1, modifiedStart: 1, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+
+	test('No cells', async () => {
+		const { mapping, diff } = await mapCells([
+		], [
+		]);
+
+		assert.deepStrictEqual(mapping, [
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+		]);
+	});
+	test('No cells and add 1 cell', async () => {
+		const { mapping, diff } = await mapCells([
+		], [
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined]
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: -1 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 0, modifiedStart: 0, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+	test('One cells and delete 1 cell', async () => {
+		const { mapping, diff } = await mapCells([
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined]
+		], [
+		]);
+
+		assert.deepStrictEqual(mapping, [
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 1, modifiedStart: 0, modifiedLength: 0 } satisfies IDiffChange,
+		]);
+	});
+	test('No changes with 1 cell', async () => {
+		const { mapping, diff } = await mapCells([
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined]
+		], [
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined]
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			// { originalStart: 0, originalLength: 0, modifiedStart: 0, modifiedLength: 0 } satisfies IDiffChange,
+		]);
+	});
+	test('One changes with 1 cell', async () => {
+		const { mapping, diff } = await mapCells([
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined]
+		],
+			[
+				[['print("Foo Bar")'], 'python', CellKind.Code, [], undefined]
+			]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 1, modifiedStart: 0, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+	test('No changes with 2 cells', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined]
+		], [
+			[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined]
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			// { originalStart: 0, originalLength: 1, modifiedStart: 0, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+	test('One changes with 2 cells, 1st cell changed', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined]
+		], [
+			[['# Foo Bar'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined]
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 1, modifiedStart: 0, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+	test('2 cells, 1st cell deleted', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined]
+		], [
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined]
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 1 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 1, modifiedStart: 0, modifiedLength: 0 } satisfies IDiffChange,
+		]);
+	});
+	test('2 cells, inserted a cell in the middle', async () => {
+		const { mapping, diff } = await mapCells([
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+			[['print("Foo Bar")'], 'python', CellKind.Code, [], undefined]
+		], [
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+			[['print("Bar Baz")'], 'python', CellKind.Code, [], undefined],
+			[['print("Foo Bar")'], 'python', CellKind.Code, [], undefined]
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: -1 },
+			{ modified: 2, original: 1 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 1, originalLength: 0, modifiedStart: 1, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+	test('One changes with 2 cells, 2nd cell changed', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined]
+		], [
+			[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Foo Bar")'], 'python', CellKind.Code, [], undefined]
+		]);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 1, originalLength: 1, modifiedStart: 1, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+	test('Two cells, all cells changed', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined]
+		]
+			, [
+				[['# Foo Bar'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("Foo Bar")'], 'python', CellKind.Code, [], undefined]
+			]
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 2, modifiedStart: 0, modifiedLength: 2 } satisfies IDiffChange,
+		]);
+	});
+	test('Insert a md cell and modify the next code cell (few cells)', async () => {
+		const { mapping, diff } = await mapCells([
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+			[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+		]
+			, [
+				[['# Description'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("Hello worldz")'], 'python', CellKind.Code, [], undefined],
+				[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+			]
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: -1 },
+			{ modified: 1, original: 0 },
+			{ modified: 2, original: 1 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 0, modifiedStart: 0, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 0, originalLength: 1, modifiedStart: 1, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+	test('Insert a md cell and modify the next code cell', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+			[['# Foo Bar'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+			[['print("bar baz1234")'], 'python', CellKind.Code, [], undefined]
+		]
+			, [
+				[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+				[['# Foo Bar'], 'markdown', CellKind.Markup, [], undefined],
+				[['# New Markdown cell'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("foo baz")'], 'python', CellKind.Code, [], undefined],
+				[['print("bar baz1234")'], 'python', CellKind.Code, [], undefined]
+			]
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: -1 },
+			{ modified: 4, original: 3 },
+			{ modified: 5, original: 4 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 3, originalLength: 0, modifiedStart: 3, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 3, originalLength: 1, modifiedStart: 4, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+	test('Delete code cell and insert MD cell, both will not match', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+			[['import sys'], 'python', CellKind.Code, [], undefined],
+			[['sys.executable'], 'python', CellKind.Code, [], undefined],
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+			[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+		]
+			, [
+				[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+				[['import sys'], 'python', CellKind.Code, [], undefined],
+				[['# Header'], 'python', CellKind.Markup, [], undefined],
+				[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+				[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+			]
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: -1 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: 4 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 2, originalLength: 1, modifiedStart: 2, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+
+	test('Delete MD cell and insert code cell, both will not match', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+			[['import sys'], 'python', CellKind.Code, [], undefined],
+			[['sys.executable'], 'python', CellKind.Code, [], undefined],
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+			[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+		]
+			, [
+				[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+				[['import sys'], 'python', CellKind.Code, [], undefined],
+				[['# Header'], 'python', CellKind.Markup, [], undefined],
+				[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+				[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+			]
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: -1 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: 4 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 2, originalLength: 1, modifiedStart: 2, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+
+	test('Insert a md cell and modify the next 2 code cells', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+			[['# Foo Bar'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Foo Bar")'], 'python', CellKind.Code, [], undefined],
+			[['print("bar baz")'], 'python', CellKind.Code, [], undefined]
+		]
+			, [
+				[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+				[['# Foo Bar'], 'markdown', CellKind.Markup, [], undefined],
+				[['# New Markdown cell'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("Foo BaZ")'], 'python', CellKind.Code, [], undefined],
+				[['print("bar baz Modified")'], 'python', CellKind.Code, [], undefined]
+			]
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: -1 },
+			{ modified: 4, original: 3 },
+			{ modified: 5, original: 4 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 3, originalLength: 0, modifiedStart: 3, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 3, originalLength: 1, modifiedStart: 4, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 4, originalLength: 1, modifiedStart: 5, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+
+	test('Insert a md cell, delete a cell and modify the next 2 code cells', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+			[['# Foo Bar'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Foo Bar")'], 'python', CellKind.Code, [], undefined],
+			[['print("bar baz")'], 'python', CellKind.Code, [], undefined],
+			[['print("Fox Trot")'], 'python', CellKind.Code, [], undefined]
+		]
+			, [
+				[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+				[['# Foo Bar'], 'markdown', CellKind.Markup, [], undefined],
+				[['# New Markdown cell'], 'markdown', CellKind.Markup, [], undefined],
+				// [['print("Foo BaZ")'], 'python', CellKind.Code, [], undefined],
+				[['print("bar baz Modified")'], 'python', CellKind.Code, [], undefined],
+				[['print("Fox Trots")'], 'python', CellKind.Code, [], undefined]
+			]
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: -1 },
+			{ modified: 4, original: 4 },
+			{ modified: 5, original: 5 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 3, originalLength: 1, modifiedStart: 3, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 4, originalLength: 1, modifiedStart: 4, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 5, originalLength: 1, modifiedStart: 5, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+	test('Insert a md cell, delete a code cell and modify the next 2 code cells (deleted and inserted lineup)', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+			[['import sys'], 'python', CellKind.Code, [], undefined],
+			[['print("Foo Bar")'], 'python', CellKind.Code, [], undefined],
+			[['print("bar baz")'], 'python', CellKind.Code, [], undefined],
+			[['print("Fox Trot")'], 'python', CellKind.Code, [], undefined]
+		]
+			, [
+				[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+				[['import sys'], 'python', CellKind.Code, [], undefined],
+				[['sys.executable'], 'python', CellKind.Code, [], undefined],
+				// [['print("Foo BaZ")'], 'python', CellKind.Code, [], undefined],
+				[['print("bar baz Modified")'], 'python', CellKind.Code, [], undefined],
+				[['print("Fox Trot")'], 'python', CellKind.Code, [], undefined]
+			]
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: 4 },
+			{ modified: 5, original: 5 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 3, originalLength: 1, modifiedStart: 3, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 4, originalLength: 1, modifiedStart: 4, modifiedLength: 1 } satisfies IDiffChange,
+			// { originalStart: 5, originalLength: 1, modifiedStart: 5, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+
+	test('Insert a few md cells and modify the next few code cells', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+			[['# Foo Bar'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+			[['# Another MD cell'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+			[['# Yet another MD cell'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+		]
+			, [
+				[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+				[['# Foo Bar'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+				[['# New 1'], 'markdown', CellKind.Markup, [], undefined],
+				[['# New 2'], 'markdown', CellKind.Markup, [], undefined],
+				[['# Another MD cell (modified1)'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+				[['# Another MD cell (modified)'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+			]
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: -1 },
+			{ modified: 5, original: -1 },
+			{ modified: 6, original: 4 },
+			{ modified: 7, original: 5 },
+			{ modified: 8, original: 6 },
+			{ modified: 9, original: 7 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 4, originalLength: 0, modifiedStart: 4, modifiedLength: 2 } satisfies IDiffChange,
+			{ originalStart: 4, originalLength: 1, modifiedStart: 6, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 6, originalLength: 1, modifiedStart: 8, modifiedLength: 1 } satisfies IDiffChange,
+			// { originalStart: 5, originalLength: 1, modifiedStart: 5, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+	test('Insert & delete a few md cells and modify the next few code cells', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+			[['# Foo Bar'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+			[['# Another MD cell'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+			[['# Yet another MD cell'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+		]
+			, [
+				[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+				[['# Foo Bar'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+				[['# New 1'], 'markdown', CellKind.Markup, [], undefined],
+				[['# New 2'], 'markdown', CellKind.Markup, [], undefined],
+				[['# Another MD cell (modified1)'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+				[['# Another MD cell (modified)'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+			]
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: -1 },
+			{ modified: 5, original: -1 },
+			{ modified: 6, original: 4 },
+			{ modified: 7, original: 5 },
+			{ modified: 8, original: 6 },
+			{ modified: 9, original: 7 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 4, originalLength: 0, modifiedStart: 4, modifiedLength: 2 } satisfies IDiffChange,
+			{ originalStart: 4, originalLength: 1, modifiedStart: 6, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 6, originalLength: 1, modifiedStart: 8, modifiedLength: 1 } satisfies IDiffChange,
+			// { originalStart: 5, originalLength: 1, modifiedStart: 5, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+	test('Modify, then insert ', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+			[['# Foo Bar'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+			[['# Another MD cell'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+			[['# Yet another MD cell'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+		]
+			, [
+				[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+				[['# Foo BaZ'], 'markdown', CellKind.Markup, [], undefined],
+				[['# Header'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+				[['# Another MD cell'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+				[['# Yet another MD cell'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+			]
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: -1 },
+			{ modified: 4, original: 3 },
+			{ modified: 5, original: 4 },
+			{ modified: 6, original: 5 },
+			{ modified: 7, original: 6 },
+			{ modified: 8, original: 7 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 2, originalLength: 1, modifiedStart: 2, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 3, originalLength: 0, modifiedStart: 3, modifiedLength: 1 } satisfies IDiffChange,
+			// { originalStart: 6, originalLength: 1, modifiedStart: 8, modifiedLength: 1 } satisfies IDiffChange,
+			// { originalStart: 5, originalLength: 1, modifiedStart: 5, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+	test('Modify, then delete ', async () => {
+		const { mapping, diff } = await mapCells([
+			[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+			[['# Foo Bar'], 'markdown', CellKind.Markup, [], undefined],
+			[['print("foo bar")'], 'python', CellKind.Code, [], undefined],
+			[['# Another MD cell'], 'markdown', CellKind.Markup, [], undefined],
+			[['import sys'], 'python', CellKind.Code, [], undefined],
+			[['# Yet another MD cell'], 'markdown', CellKind.Markup, [], undefined],
+			[['sys.executable'], 'python', CellKind.Code, [], undefined],
+		]
+			, [
+				[['# Hello World'], 'markdown', CellKind.Markup, [], undefined],
+				[['print("Hello world")'], 'python', CellKind.Code, [], undefined],
+				[['# Foo BaZ'], 'markdown', CellKind.Markup, [], undefined],
+				[['# Another MD cell'], 'markdown', CellKind.Markup, [], undefined],
+				[['import sys'], 'python', CellKind.Code, [], undefined],
+				[['# Yet another MD cell'], 'markdown', CellKind.Markup, [], undefined],
+				[['sys.executable'], 'python', CellKind.Code, [], undefined],
+			]
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 4 },
+			{ modified: 4, original: 5 },
+			{ modified: 5, original: 6 },
+			{ modified: 6, original: 7 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 2, originalLength: 1, modifiedStart: 2, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 3, originalLength: 1, modifiedStart: 3, modifiedLength: 0 } satisfies IDiffChange,
+			// { originalStart: 6, originalLength: 1, modifiedStart: 8, modifiedLength: 1 } satisfies IDiffChange,
+			// { originalStart: 5, originalLength: 1, modifiedStart: 5, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+	test('Update code cell', async () => {
+		const { mapping, diff } = await mapCells([
+			[
+				[
+					"# This is a simple notebook\n",
+					"\n",
+					"There's nothing special here, I am just writing some text and plotting a function"
+				], 'markdown', CellKind.Markup, [], undefined],
+			[
+				[
+					"import numpy as np\n",
+					"import matplotlib.pyplot as plt\n",
+					"import pandas as pd\n",
+					"\n",
+					"%matplotlib inline"
+				], 'python', CellKind.Code, [], undefined],
+			[
+				[
+					"x = np.linspace(0, 4*np.pi,50)\n",
+					"y = np.sin(x)\n",
+					"\n",
+					"plt.plot(x, y)"
+				], 'python', CellKind.Code, [], undefined],
+			[
+				[
+					"df = pd.DataFrame({f\"column_{c}\": np.random.normal(size=100) for c in range(100)})\n",
+					"df"
+				], 'python', CellKind.Code, [], undefined],
+			[
+				[
+					"You could actually do some neat stuff with it, pandas like changing the colors (values above 1 should be green)"
+				], 'python', CellKind.Markup, [], undefined],
+			[
+				[
+					"df.style.applymap(lambda x: \"background-color: green\" if x>1 else \"background-color: white\")"
+				], 'python', CellKind.Code, [], undefined],
+			[
+				[], 'python', CellKind.Code, [], undefined],
+		]
+			, [
+				[
+					[
+						"# This is a simple notebook\n",
+						"\n",
+						"There's nothing special here, I am just writing some text and plotting a function"
+					], 'markdown', CellKind.Markup, [], undefined],
+				[
+					[
+						"import numpy as np\n",
+						"import matplotlib.pyplot as plt\n",
+						"import pandas as pd\n",
+						"\n",
+						"%matplotlib inline"
+					], 'python', CellKind.Code, [], undefined],
+				[
+					[
+						"x = np.linspace(0, 4*np.pi,50)\n",
+						"y = 2 * np.sin(x)\n",
+						"\n",
+						"plt.plot(x, y)"
+					], 'python', CellKind.Code, [], undefined],
+				[
+					[
+						"df = pd.DataFrame({f\"column_{c}\": np.random.normal(size=100) for c in range(100)})\n",
+						"df"
+					], 'python', CellKind.Code, [], undefined],
+				[
+					[
+						"You could actually do some neat stuff with it, pandas like changing the colors (values above 1 should be green)"
+					], 'python', CellKind.Markup, [], undefined],
+				[
+					[
+						"df.style.applymap(lambda x: \"background-color: green\" if x>1 else \"background-color: white\")"
+					], 'python', CellKind.Code, [], undefined],
+				[
+					[], 'python', CellKind.Code, [], undefined],
+			]
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: 4 },
+			{ modified: 5, original: 5 },
+			{ modified: 6, original: 6 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 2, originalLength: 1, modifiedStart: 2, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+
+	});
+	test('Update code cell 1', async () => {
+		const { mapping, diff } = await mapCells([
+			[
+				[
+					"# Hello World"
+				], 'markdown', CellKind.Markup, [], undefined],
+			[
+				[
+					"import os\n",
+					"from pprint import pprint \n",
+					"from sklearn.preprocessing import LabelEncoder\n",
+					"import ast\n",
+					"import pandas as pd\n",
+					"from clipper import clipper\n",
+					"import ffmpeg"
+				], 'python', CellKind.Code, [], undefined],
+			[
+				[
+					"data_dir = '../../../app/data/'\n",
+					"output_dir = 'output/'\n",
+					"video_dir = 'videos/'\n",
+					"\n",
+					"file_path = data_dir+output_dir+data_file\n",
+					"video_path = data_dir+video_dir+video_file\n",
+					"\n",
+					"df = pd.read_csv(file_path)\n",
+					"df.head()"
+				], 'python', CellKind.Code, [], undefined],
+			[
+				[
+					"# convert the string representation of results to a list\n",
+					"df['list_categories'] = df['categories'].apply(ast.literal_eval)\n",
+					"\n",
+					"# get most likely label from each list\n",
+					"df['label'] = df['list_categories'].apply(lambda x: x[0] if x else None)"
+				], 'python', CellKind.Code, [], undefined],
+			[
+				[
+					"# initialize the LabelEncoder\n",
+					"label_encoder = LabelEncoder()\n",
+					"\n",
+					"# fit and transform the label to a numerical value\n",
+					"numerical_data = label_encoder.fit_transform(df['label'])\n",
+					"\n",
+					"df['label_value'] = numerical_data"
+				], 'python', CellKind.Markup, [], undefined],
+		]
+			, [
+				[
+					[
+						"# Updated markdown cell"
+					], 'markdown', CellKind.Markup, [], undefined],
+				[
+					[
+						"from sklearn.preprocessing import LabelEncoder\n",
+						"import ast\n",
+						"import pandas as pd\n",
+						"from clipper import clipper\n",
+						"import ffmpeg"
+					], 'python', CellKind.Code, [], undefined],
+				[
+					[
+						"data_dir = '../../../app/data/'\n",
+						"output_dir = 'output/'\n",
+						"video_dir = 'videos/'\n",
+						"\n",
+						"file_path = data_dir+output_dir+data_file\n",
+						"video_path = data_dir+video_dir+video_file\n",
+						"\n",
+						"df = pd.read_csv(file_path)\n",
+						"df.head()"
+					], 'python', CellKind.Code, [], undefined],
+				[
+					[
+						"# convert the string representation of results to a list\n",
+						"df['list_categories'] = df['categories'].apply(ast.literal_eval)\n",
+						"\n",
+						"# get most likely label from each list\n",
+						"df['label'] = df['list_categories'].apply(lambda x: x[0] if x else None)"
+					], 'python', CellKind.Code, [], undefined],
+				[
+					[
+						"# initialize the LabelEncoder\n",
+						"label_encoder = LabelEncoder()\n",
+						"\n",
+						"# fit and transform the label to a numerical value\n",
+						"numerical_data = label_encoder.fit_transform(df['label'])\n",
+						"\n",
+						"df['label_value'] = numerical_data"
+					], 'python', CellKind.Markup, [], undefined],
+			]
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: 4 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 1, modifiedStart: 0, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 1, originalLength: 1, modifiedStart: 1, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+	});
+	test('Detect modification and insertion of cells', async () => {
+		const { mapping, diff } = await mapCells(
+			[
+				{
+					"cell_type": "markdown",
+					"source": [
+						"# Live 3D Human Pose Estimation with OpenVINO\n",
+						"\n",
+						"This notebook demonstrates live 3D Human Pose Estimation with OpenVINO via a webcam. We utilize the model [human-pose-estimation-3d-0001](https://github.com/openvinotoolkit/open_model_zoo/tree/master/models/public/human-pose-estimation-3d-0001) from [Open Model Zoo](https://github.com/openvinotoolkit/open_model_zoo/). At the end of this notebook, you will see live inference results from your webcam (if available). Alternatively, you can also upload a video file to test out the algorithms.\n",
+						"**Make sure you have properly installed the [Jupyter extension](https://github.com/jupyter-widgets/pythreejs#jupyterlab) and been using JupyterLab to run the demo as suggested in the `README.md`**\n",
+						"\n",
+						"> **NOTE**: _To use a webcam, you must run this Jupyter notebook on a computer with a webcam. If you run on a remote server, the webcam will not work. However, you can still do inference on a video file in the final step. This demo utilizes the Python interface in `Three.js` integrated with WebGL to process data from the model inference. These results are processed and displayed in the notebook._\n",
+						"\n",
+						"_To ensure that the results are displayed correctly, run the code in a recommended browser on one of the following operating systems:_\n",
+						"_Ubuntu, Windows: Chrome_\n",
+						"_macOS: Safari_\n",
+						"\n",
+						"\n",
+						"#### Table of contents:\n",
+						"\n",
+						"- [Prerequisites](#Prerequisites)\n",
+						"- [Imports](#Imports)\n",
+						"- [The model](#The-model)\n",
+						"    - [Download the model](#Download-the-model)\n",
+						"    - [Convert Model to OpenVINO IR format](#Convert-Model-to-OpenVINO-IR-format)\n",
+						"    - [Select inference device](#Select-inference-device)\n",
+						"    - [Load the model](#Load-the-model)\n",
+						"- [Processing](#Processing)\n",
+						"    - [Model Inference](#Model-Inference)\n",
+						"    - [Draw 2D Pose Overlays](#Draw-2D-Pose-Overlays)\n",
+						"    - [Main Processing Function](#Main-Processing-Function)\n",
+						"- [Run](#Run)\n",
+						"\n",
+						"\n",
+						"### Installation Instructions\n",
+						"\n",
+						"This is a self-contained example that relies solely on its own code.\n",
+						"\n",
+						"We recommend  running the notebook in a virtual environment. You only need a Jupyter server to start.\n",
+						"For details, please refer to [Installation Guide](https://github.com/openvinotoolkit/openvino_notebooks/blob/latest/README.md#-installation-guide).\n",
+						"\n",
+						"Make sure your [Jupyter extension](https://github.com/jupyter-widgets/pythreejs#jupyterlab) is working properly.\n",
+						"To avoid errors that may arise from the version of the dependency package, it is recommended to use the **JupyterLab** instead of the Jupyter notebook to display image results.\n",
+						"```\n",
+						"- pip install --upgrade pip && pip install -r requirements.txt\n",
+						"- jupyter labextension install --no-build @jupyter-widgets/jupyterlab-manager\n",
+						"- jupyter labextension install --no-build jupyter-datawidgets/extension\n",
+						"- jupyter labextension install jupyter-threejs\n",
+						"- jupyter labextension list\n",
+						"```\n",
+						"\n",
+						"You should see:\n",
+						"```\n",
+						"JupyterLab v...\n",
+						"  ...\n",
+						"    jupyterlab-datawidgets v... enabled OK\n",
+						"    @jupyter-widgets/jupyterlab-manager v... enabled OK\n",
+						"    jupyter-threejs v... enabled OK\n",
+						"```\n",
+						"\n",
+						"<img referrerpolicy=\"no-referrer-when-downgrade\" src=\"https://static.scarf.sh/a.png?x-pxid=5b5a4db0-7875-4bfb-bdbd-01698b5b1a77&file=notebooks/3D-pose-estimation-webcam/3D-pose-estimation.ipynb\" />\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Prerequisites\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"**The `pythreejs` extension may not display properly when using a Jupyter Notebook release. Therefore, it is recommended to use Jupyter Lab instead.**"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%pip install pythreejs \"openvino-dev>=2024.0.0\" \"opencv-python\" \"torch\" \"onnx<1.16.2\" --extra-index-url https://download.pytorch.org/whl/cpu"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Imports\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"import collections\n",
+						"import time\n",
+						"from pathlib import Path\n",
+						"\n",
+						"import cv2\n",
+						"import ipywidgets as widgets\n",
+						"import numpy as np\n",
+						"from IPython.display import clear_output, display\n",
+						"import openvino as ov\n",
+						"\n",
+						"# Fetch `notebook_utils` module\n",
+						"import requests\n",
+						"\n",
+						"r = requests.get(\n",
+						"    url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/notebook_utils.py\",\n",
+						")\n",
+						"with open(\"notebook_utils.py\", \"w\") as f:\n",
+						"    f.write(r.text)\n",
+						"\n",
+						"r = requests.get(\n",
+						"    url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/engine3js.py\",\n",
+						")\n",
+						"with open(\"engine3js.py\", \"w\") as f:\n",
+						"    f.write(r.text)\n",
+						"\n",
+						"import notebook_utils as utils\n",
+						"import engine3js as engine"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## The model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"### Download the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"We use `omz_downloader`, which is a command line tool from the `openvino-dev` package. `omz_downloader` automatically creates a directory structure and downloads the selected model."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# directory where model will be downloaded\n",
+						"base_model_dir = \"model\"\n",
+						"\n",
+						"# model name as named in Open Model Zoo\n",
+						"model_name = \"human-pose-estimation-3d-0001\"\n",
+						"# selected precision (FP32, FP16)\n",
+						"precision = \"FP32\"\n",
+						"\n",
+						"BASE_MODEL_NAME = f\"{base_model_dir}/public/{model_name}/{model_name}\"\n",
+						"model_path = Path(BASE_MODEL_NAME).with_suffix(\".pth\")\n",
+						"onnx_path = Path(BASE_MODEL_NAME).with_suffix(\".onnx\")\n",
+						"\n",
+						"ir_model_path = Path(f\"model/public/{model_name}/{precision}/{model_name}.xml\")\n",
+						"model_weights_path = Path(f\"model/public/{model_name}/{precision}/{model_name}.bin\")\n",
+						"\n",
+						"if not model_path.exists():\n",
+						"    download_command = f\"omz_downloader \" f\"--name {model_name} \" f\"--output_dir {base_model_dir}\"\n",
+						"    ! $download_command"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Convert Model to OpenVINO IR format\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"The selected model comes from the public directory, which means it must be converted into OpenVINO Intermediate Representation (OpenVINO IR). We use `omz_converter` to convert the ONNX format model to the OpenVINO IR format."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"if not onnx_path.exists():\n",
+						"    convert_command = (\n",
+						"        f\"omz_converter \" f\"--name {model_name} \" f\"--precisions {precision} \" f\"--download_dir {base_model_dir} \" f\"--output_dir {base_model_dir}\"\n",
+						"    )\n",
+						"    ! $convert_command"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Select inference device\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"select device from dropdown list for running inference using OpenVINO"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"device = utils.device_widget()\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Load the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Converted models are located in a fixed structure, which indicates vendor, model name and precision.\n",
+						"\n",
+						"First, initialize the inference engine, OpenVINO Runtime. Then, read the network architecture and model weights from the `.bin` and `.xml` files to compile for the desired device. An inference request is then created to infer the compiled model."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# initialize inference engine\n",
+						"core = ov.Core()\n",
+						"# read the network and corresponding weights from file\n",
+						"model = core.read_model(model=ir_model_path, weights=model_weights_path)\n",
+						"# load the model on the specified device\n",
+						"compiled_model = core.compile_model(model=model, device_name=device.value)\n",
+						"infer_request = compiled_model.create_infer_request()\n",
+						"input_tensor_name = model.inputs[0].get_any_name()\n",
+						"\n",
+						"# get input and output names of nodes\n",
+						"input_layer = compiled_model.input(0)\n",
+						"output_layers = list(compiled_model.outputs)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"The input for the model is data from the input image and the outputs are heat maps, PAF (part affinity fields) and features."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"input_layer.any_name, [o.any_name for o in output_layers]"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Processing\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"### Model Inference\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Frames captured from video files or the live webcam are used as the input for the 3D model. This is how you obtain the output heat maps, PAF (part affinity fields) and features."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"def model_infer(scaled_img, stride):\n",
+						"    \"\"\"\n",
+						"    Run model inference on the input image\n",
+						"\n",
+						"    Parameters:\n",
+						"        scaled_img: resized image according to the input size of the model\n",
+						"        stride: int, the stride of the window\n",
+						"    \"\"\"\n",
+						"\n",
+						"    # Remove excess space from the picture\n",
+						"    img = scaled_img[\n",
+						"        0 : scaled_img.shape[0] - (scaled_img.shape[0] % stride),\n",
+						"        0 : scaled_img.shape[1] - (scaled_img.shape[1] % stride),\n",
+						"    ]\n",
+						"\n",
+						"    img = np.transpose(img, (2, 0, 1))[None,]\n",
+						"    infer_request.infer({input_tensor_name: img})\n",
+						"    # A set of three inference results is obtained\n",
+						"    results = {name: infer_request.get_tensor(name).data[:] for name in {\"features\", \"heatmaps\", \"pafs\"}}\n",
+						"    # Get the results\n",
+						"    results = (results[\"features\"][0], results[\"heatmaps\"][0], results[\"pafs\"][0])\n",
+						"\n",
+						"    return results"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Draw 2D Pose Overlays\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"We need to define some connections between the joints in advance, so that we can draw the structure of the human body in the resulting image after obtaining the inference results.\n",
+						"Joints are drawn as circles and limbs are drawn as lines. The code is based on the [3D Human Pose Estimation Demo](https://github.com/openvinotoolkit/open_model_zoo/tree/master/demos/human_pose_estimation_3d_demo/python) from Open Model Zoo."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# 3D edge index array\n",
+						"body_edges = np.array(\n",
+						"    [\n",
+						"        [0, 1],\n",
+						"        [0, 9],\n",
+						"        [9, 10],\n",
+						"        [10, 11],  # neck - r_shoulder - r_elbow - r_wrist\n",
+						"        [0, 3],\n",
+						"        [3, 4],\n",
+						"        [4, 5],  # neck - l_shoulder - l_elbow - l_wrist\n",
+						"        [1, 15],\n",
+						"        [15, 16],  # nose - l_eye - l_ear\n",
+						"        [1, 17],\n",
+						"        [17, 18],  # nose - r_eye - r_ear\n",
+						"        [0, 6],\n",
+						"        [6, 7],\n",
+						"        [7, 8],  # neck - l_hip - l_knee - l_ankle\n",
+						"        [0, 12],\n",
+						"        [12, 13],\n",
+						"        [13, 14],  # neck - r_hip - r_knee - r_ankle\n",
+						"    ]\n",
+						")\n",
+						"\n",
+						"\n",
+						"body_edges_2d = np.array(\n",
+						"    [\n",
+						"        [0, 1],  # neck - nose\n",
+						"        [1, 16],\n",
+						"        [16, 18],  # nose - l_eye - l_ear\n",
+						"        [1, 15],\n",
+						"        [15, 17],  # nose - r_eye - r_ear\n",
+						"        [0, 3],\n",
+						"        [3, 4],\n",
+						"        [4, 5],  # neck - l_shoulder - l_elbow - l_wrist\n",
+						"        [0, 9],\n",
+						"        [9, 10],\n",
+						"        [10, 11],  # neck - r_shoulder - r_elbow - r_wrist\n",
+						"        [0, 6],\n",
+						"        [6, 7],\n",
+						"        [7, 8],  # neck - l_hip - l_knee - l_ankle\n",
+						"        [0, 12],\n",
+						"        [12, 13],\n",
+						"        [13, 14],  # neck - r_hip - r_knee - r_ankle\n",
+						"    ]\n",
+						")\n",
+						"\n",
+						"\n",
+						"def draw_poses(frame, poses_2d, scaled_img, use_popup):\n",
+						"    \"\"\"\n",
+						"    Draw 2D pose overlays on the image to visualize estimated poses.\n",
+						"    Joints are drawn as circles and limbs are drawn as lines.\n",
+						"\n",
+						"    :param frame: the input image\n",
+						"    :param poses_2d: array of human joint pairs\n",
+						"    \"\"\"\n",
+						"    for pose in poses_2d:\n",
+						"        pose = np.array(pose[0:-1]).reshape((-1, 3)).transpose()\n",
+						"        was_found = pose[2] > 0\n",
+						"\n",
+						"        pose[0], pose[1] = (\n",
+						"            pose[0] * frame.shape[1] / scaled_img.shape[1],\n",
+						"            pose[1] * frame.shape[0] / scaled_img.shape[0],\n",
+						"        )\n",
+						"\n",
+						"        # Draw joints.\n",
+						"        for edge in body_edges_2d:\n",
+						"            if was_found[edge[0]] and was_found[edge[1]]:\n",
+						"                cv2.line(\n",
+						"                    frame,\n",
+						"                    tuple(pose[0:2, edge[0]].astype(np.int32)),\n",
+						"                    tuple(pose[0:2, edge[1]].astype(np.int32)),\n",
+						"                    (255, 255, 0),\n",
+						"                    4,\n",
+						"                    cv2.LINE_AA,\n",
+						"                )\n",
+						"        # Draw limbs.\n",
+						"        for kpt_id in range(pose.shape[1]):\n",
+						"            if pose[2, kpt_id] != -1:\n",
+						"                cv2.circle(\n",
+						"                    frame,\n",
+						"                    tuple(pose[0:2, kpt_id].astype(np.int32)),\n",
+						"                    3,\n",
+						"                    (0, 255, 255),\n",
+						"                    -1,\n",
+						"                    cv2.LINE_AA,\n",
+						"                )\n",
+						"\n",
+						"    return frame"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Main Processing Function\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Run 3D pose estimation on the specified source. It could be either a webcam feed or a video file."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"def run_pose_estimation(source=0, flip=False, use_popup=False, skip_frames=0):\n",
+						"    \"\"\"\n",
+						"    2D image as input, using OpenVINO as inference backend,\n",
+						"    get joints 3D coordinates, and draw 3D human skeleton in the scene\n",
+						"\n",
+						"    :param source:      The webcam number to feed the video stream with primary webcam set to \"0\", or the video path.\n",
+						"    :param flip:        To be used by VideoPlayer function for flipping capture image.\n",
+						"    :param use_popup:   False for showing encoded frames over this notebook, True for creating a popup window.\n",
+						"    :param skip_frames: Number of frames to skip at the beginning of the video.\n",
+						"    \"\"\"\n",
+						"\n",
+						"    focal_length = -1  # default\n",
+						"    stride = 8\n",
+						"    player = None\n",
+						"    skeleton_set = None\n",
+						"\n",
+						"    try:\n",
+						"        # create video player to play with target fps  video_path\n",
+						"        # get the frame from camera\n",
+						"        # You can skip first N frames to fast forward video. change 'skip_first_frames'\n",
+						"        player = utils.VideoPlayer(source, flip=flip, fps=30, skip_first_frames=skip_frames)\n",
+						"        # start capturing\n",
+						"        player.start()\n",
+						"\n",
+						"        input_image = player.next()\n",
+						"        # set the window size\n",
+						"        resize_scale = 450 / input_image.shape[1]\n",
+						"        windows_width = int(input_image.shape[1] * resize_scale)\n",
+						"        windows_height = int(input_image.shape[0] * resize_scale)\n",
+						"\n",
+						"        # use visualization library\n",
+						"        engine3D = engine.Engine3js(grid=True, axis=True, view_width=windows_width, view_height=windows_height)\n",
+						"\n",
+						"        if use_popup:\n",
+						"            # display the 3D human pose in this notebook, and origin frame in popup window\n",
+						"            display(engine3D.renderer)\n",
+						"            title = \"Press ESC to Exit\"\n",
+						"            cv2.namedWindow(title, cv2.WINDOW_KEEPRATIO | cv2.WINDOW_AUTOSIZE)\n",
+						"        else:\n",
+						"            # set the 2D image box, show both human pose and image in the notebook\n",
+						"            imgbox = widgets.Image(format=\"jpg\", height=windows_height, width=windows_width)\n",
+						"            display(widgets.HBox([engine3D.renderer, imgbox]))\n",
+						"\n",
+						"        skeleton = engine.Skeleton(body_edges=body_edges)\n",
+						"\n",
+						"        processing_times = collections.deque()\n",
+						"\n",
+						"        while True:\n",
+						"            # grab the frame\n",
+						"            frame = player.next()\n",
+						"            if frame is None:\n",
+						"                print(\"Source ended\")\n",
+						"                break\n",
+						"\n",
+						"            # resize image and change dims to fit neural network input\n",
+						"            # (see https://github.com/openvinotoolkit/open_model_zoo/tree/master/models/public/human-pose-estimation-3d-0001)\n",
+						"            scaled_img = cv2.resize(frame, dsize=(model.inputs[0].shape[3], model.inputs[0].shape[2]))\n",
+						"\n",
+						"            if focal_length < 0:  # Focal length is unknown\n",
+						"                focal_length = np.float32(0.8 * scaled_img.shape[1])\n",
+						"\n",
+						"            # inference start\n",
+						"            start_time = time.time()\n",
+						"            # get results\n",
+						"            inference_result = model_infer(scaled_img, stride)\n",
+						"\n",
+						"            # inference stop\n",
+						"            stop_time = time.time()\n",
+						"            processing_times.append(stop_time - start_time)\n",
+						"            # Process the point to point coordinates of the data\n",
+						"            poses_3d, poses_2d = engine.parse_poses(inference_result, 1, stride, focal_length, True)\n",
+						"\n",
+						"            # use processing times from last 200 frames\n",
+						"            if len(processing_times) > 200:\n",
+						"                processing_times.popleft()\n",
+						"\n",
+						"            processing_time = np.mean(processing_times) * 1000\n",
+						"            fps = 1000 / processing_time\n",
+						"\n",
+						"            if len(poses_3d) > 0:\n",
+						"                # From here, you can rotate the 3D point positions using the function \"draw_poses\",\n",
+						"                # or you can directly make the correct mapping below to properly display the object image on the screen\n",
+						"                poses_3d_copy = poses_3d.copy()\n",
+						"                x = poses_3d_copy[:, 0::4]\n",
+						"                y = poses_3d_copy[:, 1::4]\n",
+						"                z = poses_3d_copy[:, 2::4]\n",
+						"                poses_3d[:, 0::4], poses_3d[:, 1::4], poses_3d[:, 2::4] = (\n",
+						"                    -z + np.ones(poses_3d[:, 2::4].shape) * 200,\n",
+						"                    -y + np.ones(poses_3d[:, 2::4].shape) * 100,\n",
+						"                    -x,\n",
+						"                )\n",
+						"\n",
+						"                poses_3d = poses_3d.reshape(poses_3d.shape[0], 19, -1)[:, :, 0:3]\n",
+						"                people = skeleton(poses_3d=poses_3d)\n",
+						"\n",
+						"                try:\n",
+						"                    engine3D.scene_remove(skeleton_set)\n",
+						"                except Exception:\n",
+						"                    pass\n",
+						"\n",
+						"                engine3D.scene_add(people)\n",
+						"                skeleton_set = people\n",
+						"\n",
+						"                # draw 2D\n",
+						"                frame = draw_poses(frame, poses_2d, scaled_img, use_popup)\n",
+						"\n",
+						"            else:\n",
+						"                try:\n",
+						"                    engine3D.scene_remove(skeleton_set)\n",
+						"                    skeleton_set = None\n",
+						"                except Exception:\n",
+						"                    pass\n",
+						"\n",
+						"            cv2.putText(\n",
+						"                frame,\n",
+						"                f\"Inference time: {processing_time:.1f}ms ({fps:.1f} FPS)\",\n",
+						"                (10, 30),\n",
+						"                cv2.FONT_HERSHEY_COMPLEX,\n",
+						"                0.7,\n",
+						"                (0, 0, 255),\n",
+						"                1,\n",
+						"                cv2.LINE_AA,\n",
+						"            )\n",
+						"\n",
+						"            if use_popup:\n",
+						"                cv2.imshow(title, frame)\n",
+						"                key = cv2.waitKey(1)\n",
+						"                # escape = 27, use ESC to exit\n",
+						"                if key == 27:\n",
+						"                    break\n",
+						"            else:\n",
+						"                # encode numpy array to jpg\n",
+						"                imgbox.value = cv2.imencode(\n",
+						"                    \".jpg\",\n",
+						"                    frame,\n",
+						"                    params=[cv2.IMWRITE_JPEG_QUALITY, 90],\n",
+						"                )[1].tobytes()\n",
+						"\n",
+						"            engine3D.renderer.render(engine3D.scene, engine3D.cam)\n",
+						"\n",
+						"    except KeyboardInterrupt:\n",
+						"        print(\"Interrupted\")\n",
+						"    except RuntimeError as e:\n",
+						"        print(e)\n",
+						"    finally:\n",
+						"        clear_output()\n",
+						"        if player is not None:\n",
+						"            # stop capturing\n",
+						"            player.stop()\n",
+						"        if use_popup:\n",
+						"            cv2.destroyAllWindows()\n",
+						"        if skeleton_set:\n",
+						"            engine3D.scene_remove(skeleton_set)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Run\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Run, using a webcam as the video input. By default, the primary webcam is set with `source=0`. If you have multiple webcams, each one will be assigned a consecutive number starting at 0. Set `flip=True` when using a front-facing camera. Some web browsers, especially Mozilla Firefox, may cause flickering. If you experience flickering, set `use_popup=True`.\n",
+						"\n",
+						"> **NOTE**:\n",
+						">\n",
+						"> *1. To use this notebook with a webcam, you need to run the notebook on a computer with a webcam. If you run the notebook on a server (e.g. Binder), the webcam will not work.*\n",
+						">\n",
+						"> *2. Popup mode may not work if you run this notebook on a remote computer (e.g. Binder).*\n",
+						"\n",
+						"If you do not have a webcam, you can still run this demo with a video file. Any [format supported by OpenCV](https://docs.opencv.org/4.5.1/dd/d43/tutorial_py_video_display.html) will work."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Using the following method, you can click and move your mouse over the picture on the left to interact."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"USE_WEBCAM = False\n",
+						"\n",
+						"cam_id = 0\n",
+						"video_path = \"https://storage.openvinotoolkit.org/data/test_data/videos/face-demographics-walking.mp4\"\n",
+						"\n",
+						"source = cam_id if USE_WEBCAM else video_path\n",
+						"\n",
+						"run_pose_estimation(source=source, flip=isinstance(source, int), use_popup=False)"
+					]
+				}
+			].map(fromJupyterCell)
+			, [
+				{
+					"cell_type": "markdown",
+					"source": [
+						"# Live 3D Human Pose Estimation with OpenVINO\n",
+						"\n",
+						"This notebook demonstrates live 3D Human Pose Estimation with OpenVINO via a webcam. We utilize the model [human-pose-estimation-3d-0001](https://github.com/openvinotoolkit/open_model_zoo/tree/master/models/public/human-pose-estimation-3d-0001) from [Open Model Zoo](https://github.com/openvinotoolkit/open_model_zoo/). At the end of this notebook, you will see live inference results from your webcam (if available). Alternatively, you can also upload a video file to test out the algorithms.\n",
+						"**Make sure you have properly installed the [Jupyter extension](https://github.com/jupyter-widgets/pythreejs#jupyterlab) and been using JupyterLab to run the demo as suggested in the `README.md`**\n",
+						"\n",
+						"> **NOTE**: _To use a webcam, you must run this Jupyter notebook on a computer with a webcam. If you run on a remote server, the webcam will not work. However, you can still do inference on a video file in the final step. This demo utilizes the Python interface in `Three.js` integrated with WebGL to process data from the model inference. These results are processed and displayed in the notebook._\n",
+						"\n",
+						"_To ensure that the results are displayed correctly, run the code in a recommended browser on one of the following operating systems:_\n",
+						"_Ubuntu, Windows: Chrome_\n",
+						"_macOS: Safari_\n",
+						"\n",
+						"\n",
+						"#### Table of contents:\n",
+						"\n",
+						"- [Prerequisites](#Prerequisites)\n",
+						"- [Imports](#Imports)\n",
+						"- [The model](#The-model)\n",
+						"    - [Download the model](#Download-the-model)\n",
+						"    - [Convert Model to OpenVINO IR format](#Convert-Model-to-OpenVINO-IR-format)\n",
+						"    - [Select inference device](#Select-inference-device)\n",
+						"    - [Load the model](#Load-the-model)\n",
+						"- [Processing](#Processing)\n",
+						"    - [Model Inference](#Model-Inference)\n",
+						"    - [Draw 2D Pose Overlays](#Draw-2D-Pose-Overlays)\n",
+						"    - [Main Processing Function](#Main-Processing-Function)\n",
+						"- [Run](#Run)\n",
+						"\n",
+						"\n",
+						"### Installation Instructions\n",
+						"\n",
+						"This is a self-contained example that relies solely on its own code.\n",
+						"\n",
+						"We recommend  running the notebook in a virtual environment. You only need a Jupyter server to start.\n",
+						"For details, please refer to [Installation Guide](https://github.com/openvinotoolkit/openvino_notebooks/blob/latest/README.md#-installation-guide).\n",
+						"\n",
+						"Make sure your [Jupyter extension](https://github.com/jupyter-widgets/pythreejs#jupyterlab) is working properly.\n",
+						"To avoid errors that may arise from the version of the dependency package, it is recommended to use the **JupyterLab** instead of the Jupyter notebook to display image results.\n",
+						"```\n",
+						"- pip install --upgrade pip && pip install -r requirements.txt\n",
+						"- jupyter labextension install --no-build @jupyter-widgets/jupyterlab-manager\n",
+						"- jupyter labextension install --no-build jupyter-datawidgets/extension\n",
+						"- jupyter labextension install jupyter-threejs\n",
+						"- jupyter labextension list\n",
+						"```\n",
+						"\n",
+						"You should see:\n",
+						"```\n",
+						"JupyterLab v...\n",
+						"  ...\n",
+						"    jupyterlab-datawidgets v... enabled OK\n",
+						"    @jupyter-widgets/jupyterlab-manager v... enabled OK\n",
+						"    jupyter-threejs v... enabled OK\n",
+						"```\n",
+						"\n",
+						"<img referrerpolicy=\"no-referrer-when-downgrade\" src=\"https://static.scarf.sh/a.png?x-pxid=5b5a4db0-7875-4bfb-bdbd-01698b5b1a77&file=notebooks/3D-pose-estimation-webcam/3D-pose-estimation.ipynb\" />\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Prerequisites\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"**The `pythreejs` extension may not display properly when using a Jupyter Notebook release. Therefore, it is recommended to use Jupyter Lab instead.**"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%pip install pythreejs \"openvino>=2024.4.0\" \"opencv-python\" \"torch\" --extra-index-url https://download.pytorch.org/whl/cpu"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Imports\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"import collections\n",
+						"import time\n",
+						"from pathlib import Path\n",
+						"\n",
+						"import cv2\n",
+						"import ipywidgets as widgets\n",
+						"import numpy as np\n",
+						"from IPython.display import clear_output, display\n",
+						"import openvino as ov\n",
+						"\n",
+						"# Fetch `notebook_utils` module\n",
+						"import requests\n",
+						"\n",
+						"r = requests.get(\n",
+						"    url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/notebook_utils.py\",\n",
+						")\n",
+						"with open(\"notebook_utils.py\", \"w\") as f:\n",
+						"    f.write(r.text)\n",
+						"\n",
+						"r = requests.get(\n",
+						"    url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/engine3js.py\",\n",
+						")\n",
+						"with open(\"engine3js.py\", \"w\") as f:\n",
+						"    f.write(r.text)\n",
+						"\n",
+						"import notebook_utils as utils\n",
+						"import engine3js as engine"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## The model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"### Download the model\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"from notebook_utils import download_file\n",
+						"import tarfile\n",
+						"\n",
+						"\n",
+						"# directory where model will be downloaded\n",
+						"base_model_dir = Path(\"model\")\n",
+						"\n",
+						"download_file(\"https://storage.openvinotoolkit.org/repositories/open_model_zoo/public/2022.1/human-pose-estimation-3d-0001/human-pose-estimation-3d.tar.gz\", directory=base_model_dir)\n",
+						"\n",
+						"ckpt_file =  base_model_dir / \"human-pose-estimation-3d-0001.pth\"\n",
+						"\n",
+						"if not ckpt_file.exists():\n",
+						"    with tarfile.open(base_model_dir / \"human-pose-estimation-3d.tar.gz\") as f:\n",
+						"        f.extractall(base_model_dir)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Convert Model to OpenVINO IR format\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"import torch\n",
+						"import openvino as ov\n",
+						"\n",
+						"ov_model_path = Path(base_model_dir) / \"human-pose-estimation-3d-0001.xml\"\n",
+						"\n",
+						"if not ov_model_path.exists():\n",
+						"    from model.model import PoseEstimationWithMobileNet\n",
+						"\n",
+						"    pose_estimation_model = PoseEstimationWithMobileNet(is_convertible_by_mo=True)\n",
+						"    pose_estimation_model.loas_state_dict(torch.load(ckpt_file, map_location=\"cpu\"))\n",
+						"    pose_estimation_model.eval()\n",
+						"\n",
+						"    with torch.no_grad():\n",
+						"        ov_model = ov.convert_model(pose_estimation_model, example_input=torch.zeros([1, 3, 256, 448]), input=[1, 3, 256, 448])\n",
+						"        ov.save_model(ov_model, ov_model_path)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Select inference device\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"select device from dropdown list for running inference using OpenVINO"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"device = utils.device_widget()\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Load the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Converted models are located in a fixed structure, which indicates vendor, model name and precision.\n",
+						"\n",
+						"First, initialize the inference engine, OpenVINO Runtime. Then, read the network architecture and model weights from the `.bin` and `.xml` files to compile for the desired device. An inference request is then created to infer the compiled model."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# initialize inference engine\n",
+						"core = ov.Core()\n",
+						"# read the network and corresponding weights from file\n",
+						"model = core.read_model(ov_model_path)\n",
+						"# load the model on the specified device\n",
+						"compiled_model = core.compile_model(model=model, device_name=device.value)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Processing\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"### Model Inference\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Frames captured from video files or the live webcam are used as the input for the 3D model. This is how you obtain the output heat maps, PAF (part affinity fields) and features."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"def model_infer(scaled_img, stride):\n",
+						"    \"\"\"\n",
+						"    Run model inference on the input image\n",
+						"\n",
+						"    Parameters:\n",
+						"        scaled_img: resized image according to the input size of the model\n",
+						"        stride: int, the stride of the window\n",
+						"    \"\"\"\n",
+						"\n",
+						"    # Remove excess space from the picture\n",
+						"    img = scaled_img[\n",
+						"        0 : scaled_img.shape[0] - (scaled_img.shape[0] % stride),\n",
+						"        0 : scaled_img.shape[1] - (scaled_img.shape[1] % stride),\n",
+						"    ]\n",
+						"\n",
+						"    mean_value = 128.0\n",
+						"    scale_value = 255.0\n",
+						"\n",
+						"    img = (img - mean_value) / scale_value\n",
+						"\n",
+						"    img = np.transpose(img, (2, 0, 1))[None,]\n",
+						"    result = compiled_model(img)\n",
+						"    # Get the results\n",
+						"    results = (result[0][0], results[1][0], results[2][0])\n",
+						"\n",
+						"    return results"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Draw 2D Pose Overlays\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"We need to define some connections between the joints in advance, so that we can draw the structure of the human body in the resulting image after obtaining the inference results.\n",
+						"Joints are drawn as circles and limbs are drawn as lines. The code is based on the [3D Human Pose Estimation Demo](https://github.com/openvinotoolkit/open_model_zoo/tree/master/demos/human_pose_estimation_3d_demo/python) from Open Model Zoo."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# 3D edge index array\n",
+						"body_edges = np.array(\n",
+						"    [\n",
+						"        [0, 1],\n",
+						"        [0, 9],\n",
+						"        [9, 10],\n",
+						"        [10, 11],  # neck - r_shoulder - r_elbow - r_wrist\n",
+						"        [0, 3],\n",
+						"        [3, 4],\n",
+						"        [4, 5],  # neck - l_shoulder - l_elbow - l_wrist\n",
+						"        [1, 15],\n",
+						"        [15, 16],  # nose - l_eye - l_ear\n",
+						"        [1, 17],\n",
+						"        [17, 18],  # nose - r_eye - r_ear\n",
+						"        [0, 6],\n",
+						"        [6, 7],\n",
+						"        [7, 8],  # neck - l_hip - l_knee - l_ankle\n",
+						"        [0, 12],\n",
+						"        [12, 13],\n",
+						"        [13, 14],  # neck - r_hip - r_knee - r_ankle\n",
+						"    ]\n",
+						")\n",
+						"\n",
+						"\n",
+						"body_edges_2d = np.array(\n",
+						"    [\n",
+						"        [0, 1],  # neck - nose\n",
+						"        [1, 16],\n",
+						"        [16, 18],  # nose - l_eye - l_ear\n",
+						"        [1, 15],\n",
+						"        [15, 17],  # nose - r_eye - r_ear\n",
+						"        [0, 3],\n",
+						"        [3, 4],\n",
+						"        [4, 5],  # neck - l_shoulder - l_elbow - l_wrist\n",
+						"        [0, 9],\n",
+						"        [9, 10],\n",
+						"        [10, 11],  # neck - r_shoulder - r_elbow - r_wrist\n",
+						"        [0, 6],\n",
+						"        [6, 7],\n",
+						"        [7, 8],  # neck - l_hip - l_knee - l_ankle\n",
+						"        [0, 12],\n",
+						"        [12, 13],\n",
+						"        [13, 14],  # neck - r_hip - r_knee - r_ankle\n",
+						"    ]\n",
+						")\n",
+						"\n",
+						"\n",
+						"def draw_poses(frame, poses_2d, scaled_img, use_popup):\n",
+						"    \"\"\"\n",
+						"    Draw 2D pose overlays on the image to visualize estimated poses.\n",
+						"    Joints are drawn as circles and limbs are drawn as lines.\n",
+						"\n",
+						"    :param frame: the input image\n",
+						"    :param poses_2d: array of human joint pairs\n",
+						"    \"\"\"\n",
+						"    for pose in poses_2d:\n",
+						"        pose = np.array(pose[0:-1]).reshape((-1, 3)).transpose()\n",
+						"        was_found = pose[2] > 0\n",
+						"\n",
+						"        pose[0], pose[1] = (\n",
+						"            pose[0] * frame.shape[1] / scaled_img.shape[1],\n",
+						"            pose[1] * frame.shape[0] / scaled_img.shape[0],\n",
+						"        )\n",
+						"\n",
+						"        # Draw joints.\n",
+						"        for edge in body_edges_2d:\n",
+						"            if was_found[edge[0]] and was_found[edge[1]]:\n",
+						"                cv2.line(\n",
+						"                    frame,\n",
+						"                    tuple(pose[0:2, edge[0]].astype(np.int32)),\n",
+						"                    tuple(pose[0:2, edge[1]].astype(np.int32)),\n",
+						"                    (255, 255, 0),\n",
+						"                    4,\n",
+						"                    cv2.LINE_AA,\n",
+						"                )\n",
+						"        # Draw limbs.\n",
+						"        for kpt_id in range(pose.shape[1]):\n",
+						"            if pose[2, kpt_id] != -1:\n",
+						"                cv2.circle(\n",
+						"                    frame,\n",
+						"                    tuple(pose[0:2, kpt_id].astype(np.int32)),\n",
+						"                    3,\n",
+						"                    (0, 255, 255),\n",
+						"                    -1,\n",
+						"                    cv2.LINE_AA,\n",
+						"                )\n",
+						"\n",
+						"    return frame"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Main Processing Function\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Run 3D pose estimation on the specified source. It could be either a webcam feed or a video file."
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"tags": []
+					},
+					"source": [
+						"def run_pose_estimation(source=0, flip=False, use_popup=False, skip_frames=0):\n",
+						"    \"\"\"\n",
+						"    2D image as input, using OpenVINO as inference backend,\n",
+						"    get joints 3D coordinates, and draw 3D human skeleton in the scene\n",
+						"\n",
+						"    :param source:      The webcam number to feed the video stream with primary webcam set to \"0\", or the video path.\n",
+						"    :param flip:        To be used by VideoPlayer function for flipping capture image.\n",
+						"    :param use_popup:   False for showing encoded frames over this notebook, True for creating a popup window.\n",
+						"    :param skip_frames: Number of frames to skip at the beginning of the video.\n",
+						"    \"\"\"\n",
+						"\n",
+						"    focal_length = -1  # default\n",
+						"    stride = 8\n",
+						"    player = None\n",
+						"    skeleton_set = None\n",
+						"\n",
+						"    try:\n",
+						"        # create video player to play with target fps  video_path\n",
+						"        # get the frame from camera\n",
+						"        # You can skip first N frames to fast forward video. change 'skip_first_frames'\n",
+						"        player = utils.VideoPlayer(source, flip=flip, fps=30, skip_first_frames=skip_frames)\n",
+						"        # start capturing\n",
+						"        player.start()\n",
+						"\n",
+						"        input_image = player.next()\n",
+						"        # set the window size\n",
+						"        resize_scale = 450 / input_image.shape[1]\n",
+						"        windows_width = int(input_image.shape[1] * resize_scale)\n",
+						"        windows_height = int(input_image.shape[0] * resize_scale)\n",
+						"\n",
+						"        # use visualization library\n",
+						"        engine3D = engine.Engine3js(grid=True, axis=True, view_width=windows_width, view_height=windows_height)\n",
+						"\n",
+						"        if use_popup:\n",
+						"            # display the 3D human pose in this notebook, and origin frame in popup window\n",
+						"            display(engine3D.renderer)\n",
+						"            title = \"Press ESC to Exit\"\n",
+						"            cv2.namedWindow(title, cv2.WINDOW_KEEPRATIO | cv2.WINDOW_AUTOSIZE)\n",
+						"        else:\n",
+						"            # set the 2D image box, show both human pose and image in the notebook\n",
+						"            imgbox = widgets.Image(format=\"jpg\", height=windows_height, width=windows_width)\n",
+						"            display(widgets.HBox([engine3D.renderer, imgbox]))\n",
+						"\n",
+						"        skeleton = engine.Skeleton(body_edges=body_edges)\n",
+						"\n",
+						"        processing_times = collections.deque()\n",
+						"\n",
+						"        while True:\n",
+						"            # grab the frame\n",
+						"            frame = player.next()\n",
+						"            if frame is None:\n",
+						"                print(\"Source ended\")\n",
+						"                break\n",
+						"\n",
+						"            # resize image and change dims to fit neural network input\n",
+						"            # (see https://github.com/openvinotoolkit/open_model_zoo/tree/master/models/public/human-pose-estimation-3d-0001)\n",
+						"            scaled_img = cv2.resize(frame, dsize=(model.inputs[0].shape[3], model.inputs[0].shape[2]))\n",
+						"\n",
+						"            if focal_length < 0:  # Focal length is unknown\n",
+						"                focal_length = np.float32(0.8 * scaled_img.shape[1])\n",
+						"\n",
+						"            # inference start\n",
+						"            start_time = time.time()\n",
+						"            # get results\n",
+						"            inference_result = model_infer(scaled_img, stride)\n",
+						"\n",
+						"            # inference stop\n",
+						"            stop_time = time.time()\n",
+						"            processing_times.append(stop_time - start_time)\n",
+						"            # Process the point to point coordinates of the data\n",
+						"            poses_3d, poses_2d = engine.parse_poses(inference_result, 1, stride, focal_length, True)\n",
+						"\n",
+						"            # use processing times from last 200 frames\n",
+						"            if len(processing_times) > 200:\n",
+						"                processing_times.popleft()\n",
+						"\n",
+						"            processing_time = np.mean(processing_times) * 1000\n",
+						"            fps = 1000 / processing_time\n",
+						"\n",
+						"            if len(poses_3d) > 0:\n",
+						"                # From here, you can rotate the 3D point positions using the function \"draw_poses\",\n",
+						"                # or you can directly make the correct mapping below to properly display the object image on the screen\n",
+						"                poses_3d_copy = poses_3d.copy()\n",
+						"                x = poses_3d_copy[:, 0::4]\n",
+						"                y = poses_3d_copy[:, 1::4]\n",
+						"                z = poses_3d_copy[:, 2::4]\n",
+						"                poses_3d[:, 0::4], poses_3d[:, 1::4], poses_3d[:, 2::4] = (\n",
+						"                    -z + np.ones(poses_3d[:, 2::4].shape) * 200,\n",
+						"                    -y + np.ones(poses_3d[:, 2::4].shape) * 100,\n",
+						"                    -x,\n",
+						"                )\n",
+						"\n",
+						"                poses_3d = poses_3d.reshape(poses_3d.shape[0], 19, -1)[:, :, 0:3]\n",
+						"                people = skeleton(poses_3d=poses_3d)\n",
+						"\n",
+						"                try:\n",
+						"                    engine3D.scene_remove(skeleton_set)\n",
+						"                except Exception:\n",
+						"                    pass\n",
+						"\n",
+						"                engine3D.scene_add(people)\n",
+						"                skeleton_set = people\n",
+						"\n",
+						"                # draw 2D\n",
+						"                frame = draw_poses(frame, poses_2d, scaled_img, use_popup)\n",
+						"\n",
+						"            else:\n",
+						"                try:\n",
+						"                    engine3D.scene_remove(skeleton_set)\n",
+						"                    skeleton_set = None\n",
+						"                except Exception:\n",
+						"                    pass\n",
+						"\n",
+						"            cv2.putText(\n",
+						"                frame,\n",
+						"                f\"Inference time: {processing_time:.1f}ms ({fps:.1f} FPS)\",\n",
+						"                (10, 30),\n",
+						"                cv2.FONT_HERSHEY_COMPLEX,\n",
+						"                0.7,\n",
+						"                (0, 0, 255),\n",
+						"                1,\n",
+						"                cv2.LINE_AA,\n",
+						"            )\n",
+						"\n",
+						"            if use_popup:\n",
+						"                cv2.imshow(title, frame)\n",
+						"                key = cv2.waitKey(1)\n",
+						"                # escape = 27, use ESC to exit\n",
+						"                if key == 27:\n",
+						"                    break\n",
+						"            else:\n",
+						"                # encode numpy array to jpg\n",
+						"                imgbox.value = cv2.imencode(\n",
+						"                    \".jpg\",\n",
+						"                    frame,\n",
+						"                    params=[cv2.IMWRITE_JPEG_QUALITY, 90],\n",
+						"                )[1].tobytes()\n",
+						"\n",
+						"            engine3D.renderer.render(engine3D.scene, engine3D.cam)\n",
+						"\n",
+						"    except KeyboardInterrupt:\n",
+						"        print(\"Interrupted\")\n",
+						"    except RuntimeError as e:\n",
+						"        print(e)\n",
+						"    finally:\n",
+						"        clear_output()\n",
+						"        if player is not None:\n",
+						"            # stop capturing\n",
+						"            player.stop()\n",
+						"        if use_popup:\n",
+						"            cv2.destroyAllWindows()\n",
+						"        if skeleton_set:\n",
+						"            engine3D.scene_remove(skeleton_set)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Run\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Run, using a webcam as the video input. By default, the primary webcam is set with `source=0`. If you have multiple webcams, each one will be assigned a consecutive number starting at 0. Set `flip=True` when using a front-facing camera. Some web browsers, especially Mozilla Firefox, may cause flickering. If you experience flickering, set `use_popup=True`.\n",
+						"\n",
+						"> **NOTE**:\n",
+						">\n",
+						"> *1. To use this notebook with a webcam, you need to run the notebook on a computer with a webcam. If you run the notebook on a server (e.g. Binder), the webcam will not work.*\n",
+						">\n",
+						"> *2. Popup mode may not work if you run this notebook on a remote computer (e.g. Binder).*\n",
+						"\n",
+						"If you do not have a webcam, you can still run this demo with a video file. Any [format supported by OpenCV](https://docs.opencv.org/4.5.1/dd/d43/tutorial_py_video_display.html) will work."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Using the following method, you can click and move your mouse over the picture on the left to interact."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"USE_WEBCAM = False\n",
+						"\n",
+						"cam_id = 0\n",
+						"video_path = \"https://storage.openvinotoolkit.org/data/test_data/videos/face-demographics-walking.mp4\"\n",
+						"\n",
+						"source = cam_id if USE_WEBCAM else video_path\n",
+						"\n",
+						"run_pose_estimation(source=source, flip=isinstance(source, int), use_popup=False)"
+					]
+				}
+			].map(fromJupyterCell)
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: 4 },
+			{ modified: 5, original: 5 },
+			{ modified: 6, original: 6 },
+			{ modified: 7, original: 7 },
+			{ modified: 8, original: 8 },
+			{ modified: 9, original: 9 },
+			{ modified: 10, original: 10 },
+			{ modified: 11, original: 11 },
+			{ modified: 12, original: 12 },
+			{ modified: 13, original: 15 },
+			{ modified: 14, original: 16 },
+			{ modified: 15, original: 17 },
+			{ modified: 16, original: 18 },
+			{ modified: 17, original: 19 },
+			{ modified: 18, original: 20 },
+			{ modified: 19, original: 21 },
+			{ modified: 20, original: 22 },
+			{ modified: 21, original: 23 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 2, originalLength: 1, modifiedStart: 2, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 5, originalLength: 1, modifiedStart: 5, modifiedLength: 1 } satisfies IDiffChange,
+			{
+				modifiedLength: 1,
+				modifiedStart: 6,
+				originalLength: 1,
+				originalStart: 6
+			},
+			{
+				modifiedLength: 1,
+				modifiedStart: 7,
+				originalLength: 1,
+				originalStart: 7
+			},
+			{
+				modifiedLength: 1,
+				modifiedStart: 8,
+				originalLength: 1,
+				originalStart: 8
+			},
+			{
+				modifiedLength: 1,
+				modifiedStart: 12,
+				originalLength: 1,
+				originalStart: 12
+			},
+			{
+				modifiedLength: 0,
+				modifiedStart: 13,
+				originalLength: 2,
+				originalStart: 13
+			},
+			{
+				modifiedLength: 1,
+				modifiedStart: 14,
+				originalLength: 1,
+				originalStart: 16
+			}
+		]);
+	});
+	test('Detect modification in 2 cells', async () => {
+		const { mapping, diff } = await mapCells(
+			[
+				{
+					"cell_type": "markdown",
+					"source": [
+						"# Live 3D Human Pose Estimation with OpenVINO\n",
+						"\n",
+						"This notebook demonstrates live 3D Human Pose Estimation with OpenVINO via a webcam. We utilize the model [human-pose-estimation-3d-0001](https://github.com/openvinotoolkit/open_model_zoo/tree/master/models/public/human-pose-estimation-3d-0001) from [Open Model Zoo](https://github.com/openvinotoolkit/open_model_zoo/). At the end of this notebook, you will see live inference results from your webcam (if available). Alternatively, you can also upload a video file to test out the algorithms.\n",
+						"**Make sure you have properly installed the [Jupyter extension](https://github.com/jupyter-widgets/pythreejs#jupyterlab) and been using JupyterLab to run the demo as suggested in the `README.md`**\n",
+						"\n",
+						"> **NOTE**: _To use a webcam, you must run this Jupyter notebook on a computer with a webcam. If you run on a remote server, the webcam will not work. However, you can still do inference on a video file in the final step. This demo utilizes the Python interface in `Three.js` integrated with WebGL to process data from the model inference. These results are processed and displayed in the notebook._\n",
+						"\n",
+						"_To ensure that the results are displayed correctly, run the code in a recommended browser on one of the following operating systems:_\n",
+						"_Ubuntu, Windows: Chrome_\n",
+						"_macOS: Safari_\n",
+						"\n",
+						"\n",
+						"#### Table of contents:\n",
+						"\n",
+						"- [Prerequisites](#Prerequisites)\n",
+						"- [Imports](#Imports)\n",
+						"- [The model](#The-model)\n",
+						"    - [Download the model](#Download-the-model)\n",
+						"    - [Convert Model to OpenVINO IR format](#Convert-Model-to-OpenVINO-IR-format)\n",
+						"    - [Select inference device](#Select-inference-device)\n",
+						"    - [Load the model](#Load-the-model)\n",
+						"- [Processing](#Processing)\n",
+						"    - [Model Inference](#Model-Inference)\n",
+						"    - [Draw 2D Pose Overlays](#Draw-2D-Pose-Overlays)\n",
+						"    - [Main Processing Function](#Main-Processing-Function)\n",
+						"- [Run](#Run)\n",
+						"\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Prerequisites\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"**The `pythreejs` extension may not display properly when using the latest Jupyter Notebook release (2.4.1). Therefore, it is recommended to use Jupyter Lab instead.**"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%pip install pythreejs \"openvino-dev>=2024.0.0\" \"opencv-python\" \"torch\" \"onnx\" --extra-index-url https://download.pytorch.org/whl/cpu"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Imports\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"import collections\n",
+						"import sys\n",
+						"import time\n",
+						"from pathlib import Path\n",
+						"\n",
+						"import cv2\n",
+						"import ipywidgets as widgets\n",
+						"import numpy as np\n",
+						"from IPython.display import clear_output, display\n",
+						"import openvino as ov\n",
+						"\n",
+						"# Fetch `notebook_utils` module\n",
+						"import requests\n",
+						"\n",
+						"r = requests.get(\n",
+						"    url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/notebook_utils.py\",\n",
+						")\n",
+						"open(\"notebook_utils.py\", \"w\").write(r.text)\n",
+						"import notebook_utils as utils\n",
+						"\n",
+						"sys.path.append(\"./engine\")\n",
+						"import engine.engine3js as engine\n",
+						"from engine.parse_poses import parse_poses"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## The model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"### Download the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"We use `omz_downloader`, which is a command line tool from the `openvino-dev` package. `omz_downloader` automatically creates a directory structure and downloads the selected model."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# directory where model will be downloaded\n",
+						"base_model_dir = \"model\"\n",
+						"\n",
+						"# model name as named in Open Model Zoo\n",
+						"model_name = \"human-pose-estimation-3d-0001\"\n",
+						"# selected precision (FP32, FP16)\n",
+						"precision = \"FP32\"\n",
+						"\n",
+						"BASE_MODEL_NAME = f\"{base_model_dir}/public/{model_name}/{model_name}\"\n",
+						"model_path = Path(BASE_MODEL_NAME).with_suffix(\".pth\")\n",
+						"onnx_path = Path(BASE_MODEL_NAME).with_suffix(\".onnx\")\n",
+						"\n",
+						"ir_model_path = f\"model/public/{model_name}/{precision}/{model_name}.xml\"\n",
+						"model_weights_path = f\"model/public/{model_name}/{precision}/{model_name}.bin\"\n",
+						"\n",
+						"if not model_path.exists():\n",
+						"    download_command = f\"omz_downloader \" f\"--name {model_name} \" f\"--output_dir {base_model_dir}\"\n",
+						"    ! $download_command"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Convert Model to OpenVINO IR format\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"The selected model comes from the public directory, which means it must be converted into OpenVINO Intermediate Representation (OpenVINO IR). We use `omz_converter` to convert the ONNX format model to the OpenVINO IR format."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"if not onnx_path.exists():\n",
+						"    convert_command = (\n",
+						"        f\"omz_converter \" f\"--name {model_name} \" f\"--precisions {precision} \" f\"--download_dir {base_model_dir} \" f\"--output_dir {base_model_dir}\"\n",
+						"    )\n",
+						"    ! $convert_command"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Select inference device\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"select device from dropdown list for running inference using OpenVINO"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"core = ov.Core()\n",
+						"\n",
+						"device = widgets.Dropdown(\n",
+						"    options=core.available_devices + [\"AUTO\"],\n",
+						"    value=\"AUTO\",\n",
+						"    description=\"Device:\",\n",
+						"    disabled=False,\n",
+						")\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Load the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Converted models are located in a fixed structure, which indicates vendor, model name and precision.\n",
+						"\n",
+						"First, initialize the inference engine, OpenVINO Runtime. Then, read the network architecture and model weights from the `.bin` and `.xml` files to compile for the desired device. An inference request is then created to infer the compiled model."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# initialize inference engine\n",
+						"core = ov.Core()\n",
+						"# read the network and corresponding weights from file\n",
+						"model = core.read_model(model=ir_model_path, weights=model_weights_path)\n",
+						"# load the model on the specified device\n",
+						"compiled_model = core.compile_model(model=model, device_name=device.value)\n",
+						"infer_request = compiled_model.create_infer_request()\n",
+						"input_tensor_name = model.inputs[0].get_any_name()\n",
+						"\n",
+						"# get input and output names of nodes\n",
+						"input_layer = compiled_model.input(0)\n",
+						"output_layers = list(compiled_model.outputs)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"The input for the model is data from the input image and the outputs are heat maps, PAF (part affinity fields) and features."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"input_layer.any_name, [o.any_name for o in output_layers]"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Processing\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"### Model Inference\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Frames captured from video files or the live webcam are used as the input for the 3D model. This is how you obtain the output heat maps, PAF (part affinity fields) and features."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"def model_infer(scaled_img, stride):\n",
+						"    \"\"\"\n",
+						"    Run model inference on the input image\n",
+						"\n",
+						"    Parameters:\n",
+						"        scaled_img: resized image according to the input size of the model\n",
+						"        stride: int, the stride of the window\n",
+						"    \"\"\"\n",
+						"\n",
+						"    # Remove excess space from the picture\n",
+						"    img = scaled_img[\n",
+						"        0 : scaled_img.shape[0] - (scaled_img.shape[0] % stride),\n",
+						"        0 : scaled_img.shape[1] - (scaled_img.shape[1] % stride),\n",
+						"    ]\n",
+						"\n",
+						"    img = np.transpose(img, (2, 0, 1))[None,]\n",
+						"    infer_request.infer({input_tensor_name: img})\n",
+						"    # A set of three inference results is obtained\n",
+						"    results = {name: infer_request.get_tensor(name).data[:] for name in {\"features\", \"heatmaps\", \"pafs\"}}\n",
+						"    # Get the results\n",
+						"    results = (results[\"features\"][0], results[\"heatmaps\"][0], results[\"pafs\"][0])\n",
+						"\n",
+						"    return results"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Draw 2D Pose Overlays\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"We need to define some connections between the joints in advance, so that we can draw the structure of the human body in the resulting image after obtaining the inference results.\n",
+						"Joints are drawn as circles and limbs are drawn as lines. The code is based on the [3D Human Pose Estimation Demo](https://github.com/openvinotoolkit/open_model_zoo/tree/master/demos/human_pose_estimation_3d_demo/python) from Open Model Zoo."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# 3D edge index array\n",
+						"body_edges = np.array(\n",
+						"    [\n",
+						"        [0, 1],\n",
+						"        [0, 9],\n",
+						"        [9, 10],\n",
+						"        [10, 11],  # neck - r_shoulder - r_elbow - r_wrist\n",
+						"        [0, 3],\n",
+						"        [3, 4],\n",
+						"        [4, 5],  # neck - l_shoulder - l_elbow - l_wrist\n",
+						"        [1, 15],\n",
+						"        [15, 16],  # nose - l_eye - l_ear\n",
+						"        [1, 17],\n",
+						"        [17, 18],  # nose - r_eye - r_ear\n",
+						"        [0, 6],\n",
+						"        [6, 7],\n",
+						"        [7, 8],  # neck - l_hip - l_knee - l_ankle\n",
+						"        [0, 12],\n",
+						"        [12, 13],\n",
+						"        [13, 14],  # neck - r_hip - r_knee - r_ankle\n",
+						"    ]\n",
+						")\n",
+						"\n",
+						"\n",
+						"body_edges_2d = np.array(\n",
+						"    [\n",
+						"        [0, 1],  # neck - nose\n",
+						"        [1, 16],\n",
+						"        [16, 18],  # nose - l_eye - l_ear\n",
+						"        [1, 15],\n",
+						"        [15, 17],  # nose - r_eye - r_ear\n",
+						"        [0, 3],\n",
+						"        [3, 4],\n",
+						"        [4, 5],  # neck - l_shoulder - l_elbow - l_wrist\n",
+						"        [0, 9],\n",
+						"        [9, 10],\n",
+						"        [10, 11],  # neck - r_shoulder - r_elbow - r_wrist\n",
+						"        [0, 6],\n",
+						"        [6, 7],\n",
+						"        [7, 8],  # neck - l_hip - l_knee - l_ankle\n",
+						"        [0, 12],\n",
+						"        [12, 13],\n",
+						"        [13, 14],  # neck - r_hip - r_knee - r_ankle\n",
+						"    ]\n",
+						")\n",
+						"\n",
+						"\n",
+						"def draw_poses(frame, poses_2d, scaled_img, use_popup):\n",
+						"    \"\"\"\n",
+						"    Draw 2D pose overlays on the image to visualize estimated poses.\n",
+						"    Joints are drawn as circles and limbs are drawn as lines.\n",
+						"\n",
+						"    :param frame: the input image\n",
+						"    :param poses_2d: array of human joint pairs\n",
+						"    \"\"\"\n",
+						"    for pose in poses_2d:\n",
+						"        pose = np.array(pose[0:-1]).reshape((-1, 3)).transpose()\n",
+						"        was_found = pose[2] > 0\n",
+						"\n",
+						"        pose[0], pose[1] = (\n",
+						"            pose[0] * frame.shape[1] / scaled_img.shape[1],\n",
+						"            pose[1] * frame.shape[0] / scaled_img.shape[0],\n",
+						"        )\n",
+						"\n",
+						"        # Draw joints.\n",
+						"        for edge in body_edges_2d:\n",
+						"            if was_found[edge[0]] and was_found[edge[1]]:\n",
+						"                cv2.line(\n",
+						"                    frame,\n",
+						"                    tuple(pose[0:2, edge[0]].astype(np.int32)),\n",
+						"                    tuple(pose[0:2, edge[1]].astype(np.int32)),\n",
+						"                    (255, 255, 0),\n",
+						"                    4,\n",
+						"                    cv2.LINE_AA,\n",
+						"                )\n",
+						"        # Draw limbs.\n",
+						"        for kpt_id in range(pose.shape[1]):\n",
+						"            if pose[2, kpt_id] != -1:\n",
+						"                cv2.circle(\n",
+						"                    frame,\n",
+						"                    tuple(pose[0:2, kpt_id].astype(np.int32)),\n",
+						"                    3,\n",
+						"                    (0, 255, 255),\n",
+						"                    -1,\n",
+						"                    cv2.LINE_AA,\n",
+						"                )\n",
+						"\n",
+						"    return frame"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Main Processing Function\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Run 3D pose estimation on the specified source. It could be either a webcam feed or a video file."
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"tags": []
+					},
+					"source": [
+						"def run_pose_estimation(source=0, flip=False, use_popup=False, skip_frames=0):\n",
+						"    \"\"\"\n",
+						"    2D image as input, using OpenVINO as inference backend,\n",
+						"    get joints 3D coordinates, and draw 3D human skeleton in the scene\n",
+						"\n",
+						"    :param source:      The webcam number to feed the video stream with primary webcam set to \"0\", or the video path.\n",
+						"    :param flip:        To be used by VideoPlayer function for flipping capture image.\n",
+						"    :param use_popup:   False for showing encoded frames over this notebook, True for creating a popup window.\n",
+						"    :param skip_frames: Number of frames to skip at the beginning of the video.\n",
+						"    \"\"\"\n",
+						"\n",
+						"    focal_length = -1  # default\n",
+						"    stride = 8\n",
+						"    player = None\n",
+						"    skeleton_set = None\n",
+						"\n",
+						"    try:\n",
+						"        # create video player to play with target fps  video_path\n",
+						"        # get the frame from camera\n",
+						"        # You can skip first N frames to fast forward video. change 'skip_first_frames'\n",
+						"        player = utils.VideoPlayer(source, flip=flip, fps=30, skip_first_frames=skip_frames)\n",
+						"        # start capturing\n",
+						"        player.start()\n",
+						"\n",
+						"        input_image = player.next()\n",
+						"        # set the window size\n",
+						"        resize_scale = 450 / input_image.shape[1]\n",
+						"        windows_width = int(input_image.shape[1] * resize_scale)\n",
+						"        windows_height = int(input_image.shape[0] * resize_scale)\n",
+						"\n",
+						"        # use visualization library\n",
+						"        engine3D = engine.Engine3js(grid=True, axis=True, view_width=windows_width, view_height=windows_height)\n",
+						"\n",
+						"        if use_popup:\n",
+						"            # display the 3D human pose in this notebook, and origin frame in popup window\n",
+						"            display(engine3D.renderer)\n",
+						"            title = \"Press ESC to Exit\"\n",
+						"            cv2.namedWindow(title, cv2.WINDOW_KEEPRATIO | cv2.WINDOW_AUTOSIZE)\n",
+						"        else:\n",
+						"            # set the 2D image box, show both human pose and image in the notebook\n",
+						"            imgbox = widgets.Image(format=\"jpg\", height=windows_height, width=windows_width)\n",
+						"            display(widgets.HBox([engine3D.renderer, imgbox]))\n",
+						"\n",
+						"        skeleton = engine.Skeleton(body_edges=body_edges)\n",
+						"\n",
+						"        processing_times = collections.deque()\n",
+						"\n",
+						"        while True:\n",
+						"            # grab the frame\n",
+						"            frame = player.next()\n",
+						"            if frame is None:\n",
+						"                print(\"Source ended\")\n",
+						"                break\n",
+						"\n",
+						"            # resize image and change dims to fit neural network input\n",
+						"            # (see https://github.com/openvinotoolkit/open_model_zoo/tree/master/models/public/human-pose-estimation-3d-0001)\n",
+						"            scaled_img = cv2.resize(frame, dsize=(model.inputs[0].shape[3], model.inputs[0].shape[2]))\n",
+						"\n",
+						"            if focal_length < 0:  # Focal length is unknown\n",
+						"                focal_length = np.float32(0.8 * scaled_img.shape[1])\n",
+						"\n",
+						"            # inference start\n",
+						"            start_time = time.time()\n",
+						"            # get results\n",
+						"            inference_result = model_infer(scaled_img, stride)\n",
+						"\n",
+						"            # inference stop\n",
+						"            stop_time = time.time()\n",
+						"            processing_times.append(stop_time - start_time)\n",
+						"            # Process the point to point coordinates of the data\n",
+						"            poses_3d, poses_2d = parse_poses(inference_result, 1, stride, focal_length, True)\n",
+						"\n",
+						"            # use processing times from last 200 frames\n",
+						"            if len(processing_times) > 200:\n",
+						"                processing_times.popleft()\n",
+						"\n",
+						"            processing_time = np.mean(processing_times) * 1000\n",
+						"            fps = 1000 / processing_time\n",
+						"\n",
+						"            if len(poses_3d) > 0:\n",
+						"                # From here, you can rotate the 3D point positions using the function \"draw_poses\",\n",
+						"                # or you can directly make the correct mapping below to properly display the object image on the screen\n",
+						"                poses_3d_copy = poses_3d.copy()\n",
+						"                x = poses_3d_copy[:, 0::4]\n",
+						"                y = poses_3d_copy[:, 1::4]\n",
+						"                z = poses_3d_copy[:, 2::4]\n",
+						"                poses_3d[:, 0::4], poses_3d[:, 1::4], poses_3d[:, 2::4] = (\n",
+						"                    -z + np.ones(poses_3d[:, 2::4].shape) * 200,\n",
+						"                    -y + np.ones(poses_3d[:, 2::4].shape) * 100,\n",
+						"                    -x,\n",
+						"                )\n",
+						"\n",
+						"                poses_3d = poses_3d.reshape(poses_3d.shape[0], 19, -1)[:, :, 0:3]\n",
+						"                people = skeleton(poses_3d=poses_3d)\n",
+						"\n",
+						"                try:\n",
+						"                    engine3D.scene_remove(skeleton_set)\n",
+						"                except Exception:\n",
+						"                    pass\n",
+						"\n",
+						"                engine3D.scene_add(people)\n",
+						"                skeleton_set = people\n",
+						"\n",
+						"                # draw 2D\n",
+						"                frame = draw_poses(frame, poses_2d, scaled_img, use_popup)\n",
+						"\n",
+						"            else:\n",
+						"                try:\n",
+						"                    engine3D.scene_remove(skeleton_set)\n",
+						"                    skeleton_set = None\n",
+						"                except Exception:\n",
+						"                    pass\n",
+						"\n",
+						"            cv2.putText(\n",
+						"                frame,\n",
+						"                f\"Inference time: {processing_time:.1f}ms ({fps:.1f} FPS)\",\n",
+						"                (10, 30),\n",
+						"                cv2.FONT_HERSHEY_COMPLEX,\n",
+						"                0.7,\n",
+						"                (0, 0, 255),\n",
+						"                1,\n",
+						"                cv2.LINE_AA,\n",
+						"            )\n",
+						"\n",
+						"            if use_popup:\n",
+						"                cv2.imshow(title, frame)\n",
+						"                key = cv2.waitKey(1)\n",
+						"                # escape = 27, use ESC to exit\n",
+						"                if key == 27:\n",
+						"                    break\n",
+						"            else:\n",
+						"                # encode numpy array to jpg\n",
+						"                imgbox.value = cv2.imencode(\n",
+						"                    \".jpg\",\n",
+						"                    frame,\n",
+						"                    params=[cv2.IMWRITE_JPEG_QUALITY, 90],\n",
+						"                )[1].tobytes()\n",
+						"\n",
+						"            engine3D.renderer.render(engine3D.scene, engine3D.cam)\n",
+						"\n",
+						"    except KeyboardInterrupt:\n",
+						"        print(\"Interrupted\")\n",
+						"    except RuntimeError as e:\n",
+						"        print(e)\n",
+						"    finally:\n",
+						"        clear_output()\n",
+						"        if player is not None:\n",
+						"            # stop capturing\n",
+						"            player.stop()\n",
+						"        if use_popup:\n",
+						"            cv2.destroyAllWindows()\n",
+						"        if skeleton_set:\n",
+						"            engine3D.scene_remove(skeleton_set)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Run\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Run, using a webcam as the video input. By default, the primary webcam is set with `source=0`. If you have multiple webcams, each one will be assigned a consecutive number starting at 0. Set `flip=True` when using a front-facing camera. Some web browsers, especially Mozilla Firefox, may cause flickering. If you experience flickering, set `use_popup=True`.\n",
+						"\n",
+						"> **NOTE**:\n",
+						">\n",
+						"> *1. To use this notebook with a webcam, you need to run the notebook on a computer with a webcam. If you run the notebook on a server (e.g. Binder), the webcam will not work.*\n",
+						">\n",
+						"> *2. Popup mode may not work if you run this notebook on a remote computer (e.g. Binder).*\n",
+						"\n",
+						"If you do not have a webcam, you can still run this demo with a video file. Any [format supported by OpenCV](https://docs.opencv.org/4.5.1/dd/d43/tutorial_py_video_display.html) will work."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Using the following method, you can click and move your mouse over the picture on the left to interact."
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"tags": []
+					},
+					"source": [
+						"USE_WEBCAM = False\n",
+						"\n",
+						"cam_id = 0\n",
+						"video_path = \"https://github.com/intel-iot-devkit/sample-videos/raw/master/face-demographics-walking.mp4\"\n",
+						"\n",
+						"source = cam_id if USE_WEBCAM else video_path\n",
+						"\n",
+						"run_pose_estimation(source=source, flip=isinstance(source, int), use_popup=False)"
+					]
+				}
+			].map(fromJupyterCell)
+			, [
+				{
+					"cell_type": "markdown",
+					"source": [
+						"# Live 3D Human Pose Estimation with OpenVINO\n",
+						"\n",
+						"This notebook demonstrates live 3D Human Pose Estimation with OpenVINO via a webcam. We utilize the model [human-pose-estimation-3d-0001](https://github.com/openvinotoolkit/open_model_zoo/tree/master/models/public/human-pose-estimation-3d-0001) from [Open Model Zoo](https://github.com/openvinotoolkit/open_model_zoo/). At the end of this notebook, you will see live inference results from your webcam (if available). Alternatively, you can also upload a video file to test out the algorithms.\n",
+						"**Make sure you have properly installed the [Jupyter extension](https://github.com/jupyter-widgets/pythreejs#jupyterlab) and been using JupyterLab to run the demo as suggested in the `README.md`**\n",
+						"\n",
+						"> **NOTE**: _To use a webcam, you must run this Jupyter notebook on a computer with a webcam. If you run on a remote server, the webcam will not work. However, you can still do inference on a video file in the final step. This demo utilizes the Python interface in `Three.js` integrated with WebGL to process data from the model inference. These results are processed and displayed in the notebook._\n",
+						"\n",
+						"_To ensure that the results are displayed correctly, run the code in a recommended browser on one of the following operating systems:_\n",
+						"_Ubuntu, Windows: Chrome_\n",
+						"_macOS: Safari_\n",
+						"\n",
+						"\n",
+						"#### Table of contents:\n",
+						"\n",
+						"- [Prerequisites](#Prerequisites)\n",
+						"- [Imports](#Imports)\n",
+						"- [The model](#The-model)\n",
+						"    - [Download the model](#Download-the-model)\n",
+						"    - [Convert Model to OpenVINO IR format](#Convert-Model-to-OpenVINO-IR-format)\n",
+						"    - [Select inference device](#Select-inference-device)\n",
+						"    - [Load the model](#Load-the-model)\n",
+						"- [Processing](#Processing)\n",
+						"    - [Model Inference](#Model-Inference)\n",
+						"    - [Draw 2D Pose Overlays](#Draw-2D-Pose-Overlays)\n",
+						"    - [Main Processing Function](#Main-Processing-Function)\n",
+						"- [Run](#Run)\n",
+						"\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Prerequisites\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"**The `pythreejs` extension may not display properly when using a Jupyter Notebook release. Therefore, it is recommended to use Jupyter Lab instead.**"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%pip install pythreejs \"openvino-dev>=2024.0.0\" \"opencv-python\" \"torch\" \"onnx\" --extra-index-url https://download.pytorch.org/whl/cpu"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Imports\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"import collections\n",
+						"import time\n",
+						"from pathlib import Path\n",
+						"\n",
+						"import cv2\n",
+						"import ipywidgets as widgets\n",
+						"import numpy as np\n",
+						"from IPython.display import clear_output, display\n",
+						"import openvino as ov\n",
+						"\n",
+						"# Fetch `notebook_utils` module\n",
+						"import requests\n",
+						"\n",
+						"r = requests.get(\n",
+						"    url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/notebook_utils.py\",\n",
+						")\n",
+						"with open(\"notebook_utils.py\", \"w\") as f:\n",
+						"    f.write(r.text)\n",
+						"\n",
+						"r = requests.get(\n",
+						"    url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/engine3js.py\",\n",
+						")\n",
+						"with open(\"engine3js.py\", \"w\") as f:\n",
+						"    f.write(r.text)\n",
+						"\n",
+						"import notebook_utils as utils\n",
+						"import engine3js as engine"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## The model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"### Download the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"We use `omz_downloader`, which is a command line tool from the `openvino-dev` package. `omz_downloader` automatically creates a directory structure and downloads the selected model."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# directory where model will be downloaded\n",
+						"base_model_dir = \"model\"\n",
+						"\n",
+						"# model name as named in Open Model Zoo\n",
+						"model_name = \"human-pose-estimation-3d-0001\"\n",
+						"# selected precision (FP32, FP16)\n",
+						"precision = \"FP32\"\n",
+						"\n",
+						"BASE_MODEL_NAME = f\"{base_model_dir}/public/{model_name}/{model_name}\"\n",
+						"model_path = Path(BASE_MODEL_NAME).with_suffix(\".pth\")\n",
+						"onnx_path = Path(BASE_MODEL_NAME).with_suffix(\".onnx\")\n",
+						"\n",
+						"ir_model_path = f\"model/public/{model_name}/{precision}/{model_name}.xml\"\n",
+						"model_weights_path = f\"model/public/{model_name}/{precision}/{model_name}.bin\"\n",
+						"\n",
+						"if not model_path.exists():\n",
+						"    download_command = f\"omz_downloader \" f\"--name {model_name} \" f\"--output_dir {base_model_dir}\"\n",
+						"    ! $download_command"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Convert Model to OpenVINO IR format\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"The selected model comes from the public directory, which means it must be converted into OpenVINO Intermediate Representation (OpenVINO IR). We use `omz_converter` to convert the ONNX format model to the OpenVINO IR format."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"if not onnx_path.exists():\n",
+						"    convert_command = (\n",
+						"        f\"omz_converter \" f\"--name {model_name} \" f\"--precisions {precision} \" f\"--download_dir {base_model_dir} \" f\"--output_dir {base_model_dir}\"\n",
+						"    )\n",
+						"    ! $convert_command"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Select inference device\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"select device from dropdown list for running inference using OpenVINO"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"core = ov.Core()\n",
+						"\n",
+						"device = widgets.Dropdown(\n",
+						"    options=core.available_devices + [\"AUTO\"],\n",
+						"    value=\"AUTO\",\n",
+						"    description=\"Device:\",\n",
+						"    disabled=False,\n",
+						")\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Load the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Converted models are located in a fixed structure, which indicates vendor, model name and precision.\n",
+						"\n",
+						"First, initialize the inference engine, OpenVINO Runtime. Then, read the network architecture and model weights from the `.bin` and `.xml` files to compile for the desired device. An inference request is then created to infer the compiled model."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# initialize inference engine\n",
+						"core = ov.Core()\n",
+						"# read the network and corresponding weights from file\n",
+						"model = core.read_model(model=ir_model_path, weights=model_weights_path)\n",
+						"# load the model on the specified device\n",
+						"compiled_model = core.compile_model(model=model, device_name=device.value)\n",
+						"infer_request = compiled_model.create_infer_request()\n",
+						"input_tensor_name = model.inputs[0].get_any_name()\n",
+						"\n",
+						"# get input and output names of nodes\n",
+						"input_layer = compiled_model.input(0)\n",
+						"output_layers = list(compiled_model.outputs)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"The input for the model is data from the input image and the outputs are heat maps, PAF (part affinity fields) and features."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"input_layer.any_name, [o.any_name for o in output_layers]"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Processing\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"### Model Inference\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Frames captured from video files or the live webcam are used as the input for the 3D model. This is how you obtain the output heat maps, PAF (part affinity fields) and features."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"def model_infer(scaled_img, stride):\n",
+						"    \"\"\"\n",
+						"    Run model inference on the input image\n",
+						"\n",
+						"    Parameters:\n",
+						"        scaled_img: resized image according to the input size of the model\n",
+						"        stride: int, the stride of the window\n",
+						"    \"\"\"\n",
+						"\n",
+						"    # Remove excess space from the picture\n",
+						"    img = scaled_img[\n",
+						"        0 : scaled_img.shape[0] - (scaled_img.shape[0] % stride),\n",
+						"        0 : scaled_img.shape[1] - (scaled_img.shape[1] % stride),\n",
+						"    ]\n",
+						"\n",
+						"    img = np.transpose(img, (2, 0, 1))[None,]\n",
+						"    infer_request.infer({input_tensor_name: img})\n",
+						"    # A set of three inference results is obtained\n",
+						"    results = {name: infer_request.get_tensor(name).data[:] for name in {\"features\", \"heatmaps\", \"pafs\"}}\n",
+						"    # Get the results\n",
+						"    results = (results[\"features\"][0], results[\"heatmaps\"][0], results[\"pafs\"][0])\n",
+						"\n",
+						"    return results"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Draw 2D Pose Overlays\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"We need to define some connections between the joints in advance, so that we can draw the structure of the human body in the resulting image after obtaining the inference results.\n",
+						"Joints are drawn as circles and limbs are drawn as lines. The code is based on the [3D Human Pose Estimation Demo](https://github.com/openvinotoolkit/open_model_zoo/tree/master/demos/human_pose_estimation_3d_demo/python) from Open Model Zoo."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# 3D edge index array\n",
+						"body_edges = np.array(\n",
+						"    [\n",
+						"        [0, 1],\n",
+						"        [0, 9],\n",
+						"        [9, 10],\n",
+						"        [10, 11],  # neck - r_shoulder - r_elbow - r_wrist\n",
+						"        [0, 3],\n",
+						"        [3, 4],\n",
+						"        [4, 5],  # neck - l_shoulder - l_elbow - l_wrist\n",
+						"        [1, 15],\n",
+						"        [15, 16],  # nose - l_eye - l_ear\n",
+						"        [1, 17],\n",
+						"        [17, 18],  # nose - r_eye - r_ear\n",
+						"        [0, 6],\n",
+						"        [6, 7],\n",
+						"        [7, 8],  # neck - l_hip - l_knee - l_ankle\n",
+						"        [0, 12],\n",
+						"        [12, 13],\n",
+						"        [13, 14],  # neck - r_hip - r_knee - r_ankle\n",
+						"    ]\n",
+						")\n",
+						"\n",
+						"\n",
+						"body_edges_2d = np.array(\n",
+						"    [\n",
+						"        [0, 1],  # neck - nose\n",
+						"        [1, 16],\n",
+						"        [16, 18],  # nose - l_eye - l_ear\n",
+						"        [1, 15],\n",
+						"        [15, 17],  # nose - r_eye - r_ear\n",
+						"        [0, 3],\n",
+						"        [3, 4],\n",
+						"        [4, 5],  # neck - l_shoulder - l_elbow - l_wrist\n",
+						"        [0, 9],\n",
+						"        [9, 10],\n",
+						"        [10, 11],  # neck - r_shoulder - r_elbow - r_wrist\n",
+						"        [0, 6],\n",
+						"        [6, 7],\n",
+						"        [7, 8],  # neck - l_hip - l_knee - l_ankle\n",
+						"        [0, 12],\n",
+						"        [12, 13],\n",
+						"        [13, 14],  # neck - r_hip - r_knee - r_ankle\n",
+						"    ]\n",
+						")\n",
+						"\n",
+						"\n",
+						"def draw_poses(frame, poses_2d, scaled_img, use_popup):\n",
+						"    \"\"\"\n",
+						"    Draw 2D pose overlays on the image to visualize estimated poses.\n",
+						"    Joints are drawn as circles and limbs are drawn as lines.\n",
+						"\n",
+						"    :param frame: the input image\n",
+						"    :param poses_2d: array of human joint pairs\n",
+						"    \"\"\"\n",
+						"    for pose in poses_2d:\n",
+						"        pose = np.array(pose[0:-1]).reshape((-1, 3)).transpose()\n",
+						"        was_found = pose[2] > 0\n",
+						"\n",
+						"        pose[0], pose[1] = (\n",
+						"            pose[0] * frame.shape[1] / scaled_img.shape[1],\n",
+						"            pose[1] * frame.shape[0] / scaled_img.shape[0],\n",
+						"        )\n",
+						"\n",
+						"        # Draw joints.\n",
+						"        for edge in body_edges_2d:\n",
+						"            if was_found[edge[0]] and was_found[edge[1]]:\n",
+						"                cv2.line(\n",
+						"                    frame,\n",
+						"                    tuple(pose[0:2, edge[0]].astype(np.int32)),\n",
+						"                    tuple(pose[0:2, edge[1]].astype(np.int32)),\n",
+						"                    (255, 255, 0),\n",
+						"                    4,\n",
+						"                    cv2.LINE_AA,\n",
+						"                )\n",
+						"        # Draw limbs.\n",
+						"        for kpt_id in range(pose.shape[1]):\n",
+						"            if pose[2, kpt_id] != -1:\n",
+						"                cv2.circle(\n",
+						"                    frame,\n",
+						"                    tuple(pose[0:2, kpt_id].astype(np.int32)),\n",
+						"                    3,\n",
+						"                    (0, 255, 255),\n",
+						"                    -1,\n",
+						"                    cv2.LINE_AA,\n",
+						"                )\n",
+						"\n",
+						"    return frame"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Main Processing Function\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Run 3D pose estimation on the specified source. It could be either a webcam feed or a video file."
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"tags": []
+					},
+					"source": [
+						"def run_pose_estimation(source=0, flip=False, use_popup=False, skip_frames=0):\n",
+						"    \"\"\"\n",
+						"    2D image as input, using OpenVINO as inference backend,\n",
+						"    get joints 3D coordinates, and draw 3D human skeleton in the scene\n",
+						"\n",
+						"    :param source:      The webcam number to feed the video stream with primary webcam set to \"0\", or the video path.\n",
+						"    :param flip:        To be used by VideoPlayer function for flipping capture image.\n",
+						"    :param use_popup:   False for showing encoded frames over this notebook, True for creating a popup window.\n",
+						"    :param skip_frames: Number of frames to skip at the beginning of the video.\n",
+						"    \"\"\"\n",
+						"\n",
+						"    focal_length = -1  # default\n",
+						"    stride = 8\n",
+						"    player = None\n",
+						"    skeleton_set = None\n",
+						"\n",
+						"    try:\n",
+						"        # create video player to play with target fps  video_path\n",
+						"        # get the frame from camera\n",
+						"        # You can skip first N frames to fast forward video. change 'skip_first_frames'\n",
+						"        player = utils.VideoPlayer(source, flip=flip, fps=30, skip_first_frames=skip_frames)\n",
+						"        # start capturing\n",
+						"        player.start()\n",
+						"\n",
+						"        input_image = player.next()\n",
+						"        # set the window size\n",
+						"        resize_scale = 450 / input_image.shape[1]\n",
+						"        windows_width = int(input_image.shape[1] * resize_scale)\n",
+						"        windows_height = int(input_image.shape[0] * resize_scale)\n",
+						"\n",
+						"        # use visualization library\n",
+						"        engine3D = engine.Engine3js(grid=True, axis=True, view_width=windows_width, view_height=windows_height)\n",
+						"\n",
+						"        if use_popup:\n",
+						"            # display the 3D human pose in this notebook, and origin frame in popup window\n",
+						"            display(engine3D.renderer)\n",
+						"            title = \"Press ESC to Exit\"\n",
+						"            cv2.namedWindow(title, cv2.WINDOW_KEEPRATIO | cv2.WINDOW_AUTOSIZE)\n",
+						"        else:\n",
+						"            # set the 2D image box, show both human pose and image in the notebook\n",
+						"            imgbox = widgets.Image(format=\"jpg\", height=windows_height, width=windows_width)\n",
+						"            display(widgets.HBox([engine3D.renderer, imgbox]))\n",
+						"\n",
+						"        skeleton = engine.Skeleton(body_edges=body_edges)\n",
+						"\n",
+						"        processing_times = collections.deque()\n",
+						"\n",
+						"        while True:\n",
+						"            # grab the frame\n",
+						"            frame = player.next()\n",
+						"            if frame is None:\n",
+						"                print(\"Source ended\")\n",
+						"                break\n",
+						"\n",
+						"            # resize image and change dims to fit neural network input\n",
+						"            # (see https://github.com/openvinotoolkit/open_model_zoo/tree/master/models/public/human-pose-estimation-3d-0001)\n",
+						"            scaled_img = cv2.resize(frame, dsize=(model.inputs[0].shape[3], model.inputs[0].shape[2]))\n",
+						"\n",
+						"            if focal_length < 0:  # Focal length is unknown\n",
+						"                focal_length = np.float32(0.8 * scaled_img.shape[1])\n",
+						"\n",
+						"            # inference start\n",
+						"            start_time = time.time()\n",
+						"            # get results\n",
+						"            inference_result = model_infer(scaled_img, stride)\n",
+						"\n",
+						"            # inference stop\n",
+						"            stop_time = time.time()\n",
+						"            processing_times.append(stop_time - start_time)\n",
+						"            # Process the point to point coordinates of the data\n",
+						"            poses_3d, poses_2d = engine.parse_poses(inference_result, 1, stride, focal_length, True)\n",
+						"\n",
+						"            # use processing times from last 200 frames\n",
+						"            if len(processing_times) > 200:\n",
+						"                processing_times.popleft()\n",
+						"\n",
+						"            processing_time = np.mean(processing_times) * 1000\n",
+						"            fps = 1000 / processing_time\n",
+						"\n",
+						"            if len(poses_3d) > 0:\n",
+						"                # From here, you can rotate the 3D point positions using the function \"draw_poses\",\n",
+						"                # or you can directly make the correct mapping below to properly display the object image on the screen\n",
+						"                poses_3d_copy = poses_3d.copy()\n",
+						"                x = poses_3d_copy[:, 0::4]\n",
+						"                y = poses_3d_copy[:, 1::4]\n",
+						"                z = poses_3d_copy[:, 2::4]\n",
+						"                poses_3d[:, 0::4], poses_3d[:, 1::4], poses_3d[:, 2::4] = (\n",
+						"                    -z + np.ones(poses_3d[:, 2::4].shape) * 200,\n",
+						"                    -y + np.ones(poses_3d[:, 2::4].shape) * 100,\n",
+						"                    -x,\n",
+						"                )\n",
+						"\n",
+						"                poses_3d = poses_3d.reshape(poses_3d.shape[0], 19, -1)[:, :, 0:3]\n",
+						"                people = skeleton(poses_3d=poses_3d)\n",
+						"\n",
+						"                try:\n",
+						"                    engine3D.scene_remove(skeleton_set)\n",
+						"                except Exception:\n",
+						"                    pass\n",
+						"\n",
+						"                engine3D.scene_add(people)\n",
+						"                skeleton_set = people\n",
+						"\n",
+						"                # draw 2D\n",
+						"                frame = draw_poses(frame, poses_2d, scaled_img, use_popup)\n",
+						"\n",
+						"            else:\n",
+						"                try:\n",
+						"                    engine3D.scene_remove(skeleton_set)\n",
+						"                    skeleton_set = None\n",
+						"                except Exception:\n",
+						"                    pass\n",
+						"\n",
+						"            cv2.putText(\n",
+						"                frame,\n",
+						"                f\"Inference time: {processing_time:.1f}ms ({fps:.1f} FPS)\",\n",
+						"                (10, 30),\n",
+						"                cv2.FONT_HERSHEY_COMPLEX,\n",
+						"                0.7,\n",
+						"                (0, 0, 255),\n",
+						"                1,\n",
+						"                cv2.LINE_AA,\n",
+						"            )\n",
+						"\n",
+						"            if use_popup:\n",
+						"                cv2.imshow(title, frame)\n",
+						"                key = cv2.waitKey(1)\n",
+						"                # escape = 27, use ESC to exit\n",
+						"                if key == 27:\n",
+						"                    break\n",
+						"            else:\n",
+						"                # encode numpy array to jpg\n",
+						"                imgbox.value = cv2.imencode(\n",
+						"                    \".jpg\",\n",
+						"                    frame,\n",
+						"                    params=[cv2.IMWRITE_JPEG_QUALITY, 90],\n",
+						"                )[1].tobytes()\n",
+						"\n",
+						"            engine3D.renderer.render(engine3D.scene, engine3D.cam)\n",
+						"\n",
+						"    except KeyboardInterrupt:\n",
+						"        print(\"Interrupted\")\n",
+						"    except RuntimeError as e:\n",
+						"        print(e)\n",
+						"    finally:\n",
+						"        clear_output()\n",
+						"        if player is not None:\n",
+						"            # stop capturing\n",
+						"            player.stop()\n",
+						"        if use_popup:\n",
+						"            cv2.destroyAllWindows()\n",
+						"        if skeleton_set:\n",
+						"            engine3D.scene_remove(skeleton_set)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Run\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Run, using a webcam as the video input. By default, the primary webcam is set with `source=0`. If you have multiple webcams, each one will be assigned a consecutive number starting at 0. Set `flip=True` when using a front-facing camera. Some web browsers, especially Mozilla Firefox, may cause flickering. If you experience flickering, set `use_popup=True`.\n",
+						"\n",
+						"> **NOTE**:\n",
+						">\n",
+						"> *1. To use this notebook with a webcam, you need to run the notebook on a computer with a webcam. If you run the notebook on a server (e.g. Binder), the webcam will not work.*\n",
+						">\n",
+						"> *2. Popup mode may not work if you run this notebook on a remote computer (e.g. Binder).*\n",
+						"\n",
+						"If you do not have a webcam, you can still run this demo with a video file. Any [format supported by OpenCV](https://docs.opencv.org/4.5.1/dd/d43/tutorial_py_video_display.html) will work."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Using the following method, you can click and move your mouse over the picture on the left to interact."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"USE_WEBCAM = False\n",
+						"\n",
+						"cam_id = 0\n",
+						"video_path = \"https://github.com/intel-iot-devkit/sample-videos/raw/master/face-demographics-walking.mp4\"\n",
+						"\n",
+						"source = cam_id if USE_WEBCAM else video_path\n",
+						"\n",
+						"run_pose_estimation(source=source, flip=isinstance(source, int), use_popup=False)"
+					]
+				}
+			].map(fromJupyterCell)
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: 4 },
+			{ modified: 5, original: 5 },
+			{ modified: 6, original: 6 },
+			{ modified: 7, original: 7 },
+			{ modified: 8, original: 8 },
+			{ modified: 9, original: 9 },
+			{ modified: 10, original: 10 },
+			{ modified: 11, original: 11 },
+			{ modified: 12, original: 12 },
+			{ modified: 13, original: 13 },
+			{ modified: 14, original: 14 },
+			{ modified: 15, original: 15 },
+			{ modified: 16, original: 16 },
+			{ modified: 17, original: 17 },
+			{ modified: 18, original: 18 },
+			{ modified: 19, original: 19 },
+			{ modified: 20, original: 20 },
+			{ modified: 21, original: 21 },
+			{ modified: 22, original: 22 },
+			{ modified: 23, original: 23 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 1, originalLength: 1, modifiedStart: 1, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 4, originalLength: 1, modifiedStart: 4, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 20, originalLength: 1, modifiedStart: 20, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+
+	});
+	test('Detect modification in multiple cells', async () => {
+		const { mapping, diff } = await mapCells(
+			[
+				{
+					"cell_type": "markdown",
+					"source": [
+						"# Live 3D Human Pose Estimation with OpenVINO\n",
+						"\n",
+						"This notebook demonstrates live 3D Human Pose Estimation with OpenVINO via a webcam. We utilize the model [human-pose-estimation-3d-0001](https://github.com/openvinotoolkit/open_model_zoo/tree/master/models/public/human-pose-estimation-3d-0001) from [Open Model Zoo](https://github.com/openvinotoolkit/open_model_zoo/). At the end of this notebook, you will see live inference results from your webcam (if available). Alternatively, you can also upload a video file to test out the algorithms.\n",
+						"**Make sure you have properly installed the [Jupyter extension](https://github.com/jupyter-widgets/pythreejs#jupyterlab) and been using JupyterLab to run the demo as suggested in the `README.md`**\n",
+						"\n",
+						"> **NOTE**: _To use a webcam, you must run this Jupyter notebook on a computer with a webcam. If you run on a remote server, the webcam will not work. However, you can still do inference on a video file in the final step. This demo utilizes the Python interface in `Three.js` integrated with WebGL to process data from the model inference. These results are processed and displayed in the notebook._\n",
+						"\n",
+						"_To ensure that the results are displayed correctly, run the code in a recommended browser on one of the following operating systems:_\n",
+						"_Ubuntu, Windows: Chrome_\n",
+						"_macOS: Safari_\n",
+						"\n",
+						"\n",
+						"#### Table of contents:\n",
+						"\n",
+						"- [Prerequisites](#Prerequisites)\n",
+						"- [Imports](#Imports)\n",
+						"- [The model](#The-model)\n",
+						"    - [Download the model](#Download-the-model)\n",
+						"    - [Convert Model to OpenVINO IR format](#Convert-Model-to-OpenVINO-IR-format)\n",
+						"    - [Select inference device](#Select-inference-device)\n",
+						"    - [Load the model](#Load-the-model)\n",
+						"- [Processing](#Processing)\n",
+						"    - [Model Inference](#Model-Inference)\n",
+						"    - [Draw 2D Pose Overlays](#Draw-2D-Pose-Overlays)\n",
+						"    - [Main Processing Function](#Main-Processing-Function)\n",
+						"- [Run](#Run)\n",
+						"\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Prerequisites\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"**The `pythreejs` extension may not display properly when using the latest Jupyter Notebook release (2.4.1). Therefore, it is recommended to use Jupyter Lab instead.**"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%pip install pythreejs \"openvino-dev>=2024.0.0\" \"opencv-python\" \"torch\" \"onnx\" --extra-index-url https://download.pytorch.org/whl/cpu"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Imports\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"import collections\n",
+						"import sys\n",
+						"import time\n",
+						"from pathlib import Path\n",
+						"\n",
+						"import cv2\n",
+						"import ipywidgets as widgets\n",
+						"import numpy as np\n",
+						"from IPython.display import clear_output, display\n",
+						"import openvino as ov\n",
+						"\n",
+						"# Fetch `notebook_utils` module\n",
+						"import requests\n",
+						"r = requests.get(\n",
+						"    url='https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/notebook_utils.py',\n",
+						")\n",
+						"open('notebook_utils.py', 'w').write(r.text)\n",
+						"import notebook_utils as utils\n",
+						"\n",
+						"sys.path.append(\"./engine\")\n",
+						"import engine.engine3js as engine\n",
+						"from engine.parse_poses import parse_poses"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## The model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"### Download the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"We use `omz_downloader`, which is a command line tool from the `openvino-dev` package. `omz_downloader` automatically creates a directory structure and downloads the selected model."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# directory where model will be downloaded\n",
+						"base_model_dir = \"model\"\n",
+						"\n",
+						"# model name as named in Open Model Zoo\n",
+						"model_name = \"human-pose-estimation-3d-0001\"\n",
+						"# selected precision (FP32, FP16)\n",
+						"precision = \"FP32\"\n",
+						"\n",
+						"BASE_MODEL_NAME = f\"{base_model_dir}/public/{model_name}/{model_name}\"\n",
+						"model_path = Path(BASE_MODEL_NAME).with_suffix(\".pth\")\n",
+						"onnx_path = Path(BASE_MODEL_NAME).with_suffix(\".onnx\")\n",
+						"\n",
+						"ir_model_path = f\"model/public/{model_name}/{precision}/{model_name}.xml\"\n",
+						"model_weights_path = f\"model/public/{model_name}/{precision}/{model_name}.bin\"\n",
+						"\n",
+						"if not model_path.exists():\n",
+						"    download_command = (\n",
+						"        f\"omz_downloader \" f\"--name {model_name} \" f\"--output_dir {base_model_dir}\"\n",
+						"    )\n",
+						"    ! $download_command"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Convert Model to OpenVINO IR format\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"The selected model comes from the public directory, which means it must be converted into OpenVINO Intermediate Representation (OpenVINO IR). We use `omz_converter` to convert the ONNX format model to the OpenVINO IR format."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"if not onnx_path.exists():\n",
+						"    convert_command = (\n",
+						"        f\"omz_converter \"\n",
+						"        f\"--name {model_name} \"\n",
+						"        f\"--precisions {precision} \"\n",
+						"        f\"--download_dir {base_model_dir} \"\n",
+						"        f\"--output_dir {base_model_dir}\"\n",
+						"    )\n",
+						"    ! $convert_command"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Select inference device\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"select device from dropdown list for running inference using OpenVINO"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"core = ov.Core()\n",
+						"\n",
+						"device = widgets.Dropdown(\n",
+						"    options=core.available_devices + [\"AUTO\"],\n",
+						"    value='AUTO',\n",
+						"    description='Device:',\n",
+						"    disabled=False,\n",
+						")\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Load the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Converted models are located in a fixed structure, which indicates vendor, model name and precision.\n",
+						"\n",
+						"First, initialize the inference engine, OpenVINO Runtime. Then, read the network architecture and model weights from the `.bin` and `.xml` files to compile for the desired device. An inference request is then created to infer the compiled model."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# initialize inference engine\n",
+						"core = ov.Core()\n",
+						"# read the network and corresponding weights from file\n",
+						"model = core.read_model(model=ir_model_path, weights=model_weights_path)\n",
+						"# load the model on the specified device\n",
+						"compiled_model = core.compile_model(model=model, device_name=device.value)\n",
+						"infer_request = compiled_model.create_infer_request()\n",
+						"input_tensor_name = model.inputs[0].get_any_name()\n",
+						"\n",
+						"# get input and output names of nodes\n",
+						"input_layer = compiled_model.input(0)\n",
+						"output_layers = list(compiled_model.outputs)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"The input for the model is data from the input image and the outputs are heat maps, PAF (part affinity fields) and features."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"input_layer.any_name, [o.any_name for o in output_layers]"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Processing\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"### Model Inference\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Frames captured from video files or the live webcam are used as the input for the 3D model. This is how you obtain the output heat maps, PAF (part affinity fields) and features."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"def model_infer(scaled_img, stride):\n",
+						"    \"\"\"\n",
+						"    Run model inference on the input image\n",
+						"\n",
+						"    Parameters:\n",
+						"        scaled_img: resized image according to the input size of the model\n",
+						"        stride: int, the stride of the window\n",
+						"    \"\"\"\n",
+						"\n",
+						"    # Remove excess space from the picture\n",
+						"    img = scaled_img[\n",
+						"        0 : scaled_img.shape[0] - (scaled_img.shape[0] % stride),\n",
+						"        0 : scaled_img.shape[1] - (scaled_img.shape[1] % stride),\n",
+						"    ]\n",
+						"\n",
+						"    img = np.transpose(img, (2, 0, 1))[\n",
+						"        None,\n",
+						"    ]\n",
+						"    infer_request.infer({input_tensor_name: img})\n",
+						"    # A set of three inference results is obtained\n",
+						"    results = {\n",
+						"        name: infer_request.get_tensor(name).data[:]\n",
+						"        for name in {\"features\", \"heatmaps\", \"pafs\"}\n",
+						"    }\n",
+						"    # Get the results\n",
+						"    results = (results[\"features\"][0], results[\"heatmaps\"][0], results[\"pafs\"][0])\n",
+						"\n",
+						"    return results"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Draw 2D Pose Overlays\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"We need to define some connections between the joints in advance, so that we can draw the structure of the human body in the resulting image after obtaining the inference results.\n",
+						"Joints are drawn as circles and limbs are drawn as lines. The code is based on the [3D Human Pose Estimation Demo](https://github.com/openvinotoolkit/open_model_zoo/tree/master/demos/human_pose_estimation_3d_demo/python) from Open Model Zoo."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# 3D edge index array\n",
+						"body_edges = np.array(\n",
+						"    [\n",
+						"        [0, 1], \n",
+						"        [0, 9], [9, 10], [10, 11],    # neck - r_shoulder - r_elbow - r_wrist\n",
+						"        [0, 3], [3, 4], [4, 5],       # neck - l_shoulder - l_elbow - l_wrist\n",
+						"        [1, 15], [15, 16],            # nose - l_eye - l_ear\n",
+						"        [1, 17], [17, 18],            # nose - r_eye - r_ear\n",
+						"        [0, 6], [6, 7], [7, 8],       # neck - l_hip - l_knee - l_ankle\n",
+						"        [0, 12], [12, 13], [13, 14],  # neck - r_hip - r_knee - r_ankle\n",
+						"    ]\n",
+						")\n",
+						"\n",
+						"\n",
+						"body_edges_2d = np.array(\n",
+						"    [\n",
+						"        [0, 1],                       # neck - nose\n",
+						"        [1, 16], [16, 18],            # nose - l_eye - l_ear\n",
+						"        [1, 15], [15, 17],            # nose - r_eye - r_ear\n",
+						"        [0, 3], [3, 4], [4, 5],       # neck - l_shoulder - l_elbow - l_wrist\n",
+						"        [0, 9], [9, 10], [10, 11],    # neck - r_shoulder - r_elbow - r_wrist\n",
+						"        [0, 6], [6, 7], [7, 8],       # neck - l_hip - l_knee - l_ankle\n",
+						"        [0, 12], [12, 13], [13, 14],  # neck - r_hip - r_knee - r_ankle\n",
+						"    ]\n",
+						")  \n",
+						"\n",
+						"\n",
+						"def draw_poses(frame, poses_2d, scaled_img, use_popup):\n",
+						"    \"\"\"\n",
+						"    Draw 2D pose overlays on the image to visualize estimated poses.\n",
+						"    Joints are drawn as circles and limbs are drawn as lines.\n",
+						"\n",
+						"    :param frame: the input image\n",
+						"    :param poses_2d: array of human joint pairs\n",
+						"    \"\"\"\n",
+						"    for pose in poses_2d:\n",
+						"        pose = np.array(pose[0:-1]).reshape((-1, 3)).transpose()\n",
+						"        was_found = pose[2] > 0\n",
+						"\n",
+						"        pose[0], pose[1] = (\n",
+						"            pose[0] * frame.shape[1] / scaled_img.shape[1],\n",
+						"            pose[1] * frame.shape[0] / scaled_img.shape[0],\n",
+						"        )\n",
+						"\n",
+						"        # Draw joints.\n",
+						"        for edge in body_edges_2d:\n",
+						"            if was_found[edge[0]] and was_found[edge[1]]:\n",
+						"                cv2.line(\n",
+						"                    frame,\n",
+						"                    tuple(pose[0:2, edge[0]].astype(np.int32)),\n",
+						"                    tuple(pose[0:2, edge[1]].astype(np.int32)),\n",
+						"                    (255, 255, 0),\n",
+						"                    4,\n",
+						"                    cv2.LINE_AA,\n",
+						"                )\n",
+						"        # Draw limbs.\n",
+						"        for kpt_id in range(pose.shape[1]):\n",
+						"            if pose[2, kpt_id] != -1:\n",
+						"                cv2.circle(\n",
+						"                    frame,\n",
+						"                    tuple(pose[0:2, kpt_id].astype(np.int32)),\n",
+						"                    3,\n",
+						"                    (0, 255, 255),\n",
+						"                    -1,\n",
+						"                    cv2.LINE_AA,\n",
+						"                )\n",
+						"\n",
+						"    return frame"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Main Processing Function\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Run 3D pose estimation on the specified source. It could be either a webcam feed or a video file."
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"tags": []
+					},
+					"source": [
+						"def run_pose_estimation(source=0, flip=False, use_popup=False, skip_frames=0):\n",
+						"    \"\"\"\n",
+						"    2D image as input, using OpenVINO as inference backend,\n",
+						"    get joints 3D coordinates, and draw 3D human skeleton in the scene\n",
+						"\n",
+						"    :param source:      The webcam number to feed the video stream with primary webcam set to \"0\", or the video path.\n",
+						"    :param flip:        To be used by VideoPlayer function for flipping capture image.\n",
+						"    :param use_popup:   False for showing encoded frames over this notebook, True for creating a popup window.\n",
+						"    :param skip_frames: Number of frames to skip at the beginning of the video.\n",
+						"    \"\"\"\n",
+						"\n",
+						"    focal_length = -1  # default\n",
+						"    stride = 8\n",
+						"    player = None\n",
+						"    skeleton_set = None\n",
+						"\n",
+						"    try:\n",
+						"        # create video player to play with target fps  video_path\n",
+						"        # get the frame from camera\n",
+						"        # You can skip first N frames to fast forward video. change 'skip_first_frames'\n",
+						"        player = utils.VideoPlayer(source, flip=flip, fps=30, skip_first_frames=skip_frames)\n",
+						"        # start capturing\n",
+						"        player.start()\n",
+						"\n",
+						"        input_image = player.next()\n",
+						"        # set the window size\n",
+						"        resize_scale = 450 / input_image.shape[1]\n",
+						"        windows_width = int(input_image.shape[1] * resize_scale)\n",
+						"        windows_height = int(input_image.shape[0] * resize_scale)\n",
+						"\n",
+						"        # use visualization library\n",
+						"        engine3D = engine.Engine3js(grid=True, axis=True, view_width=windows_width, view_height=windows_height)\n",
+						"\n",
+						"        if use_popup:\n",
+						"            # display the 3D human pose in this notebook, and origin frame in popup window\n",
+						"            display(engine3D.renderer)\n",
+						"            title = \"Press ESC to Exit\"\n",
+						"            cv2.namedWindow(title, cv2.WINDOW_KEEPRATIO | cv2.WINDOW_AUTOSIZE)\n",
+						"        else:\n",
+						"            # set the 2D image box, show both human pose and image in the notebook\n",
+						"            imgbox = widgets.Image(\n",
+						"                format=\"jpg\", height=windows_height, width=windows_width\n",
+						"            )\n",
+						"            display(widgets.HBox([engine3D.renderer, imgbox]))\n",
+						"\n",
+						"        skeleton = engine.Skeleton(body_edges=body_edges)\n",
+						"\n",
+						"        processing_times = collections.deque()\n",
+						"\n",
+						"        while True:\n",
+						"            # grab the frame\n",
+						"            frame = player.next()\n",
+						"            if frame is None:\n",
+						"                print(\"Source ended\")\n",
+						"                break\n",
+						"\n",
+						"            # resize image and change dims to fit neural network input\n",
+						"            # (see https://github.com/openvinotoolkit/open_model_zoo/tree/master/models/public/human-pose-estimation-3d-0001)\n",
+						"            scaled_img = cv2.resize(frame, dsize=(model.inputs[0].shape[3], model.inputs[0].shape[2]))\n",
+						"\n",
+						"            if focal_length < 0:  # Focal length is unknown\n",
+						"                focal_length = np.float32(0.8 * scaled_img.shape[1])\n",
+						"\n",
+						"            # inference start\n",
+						"            start_time = time.time()\n",
+						"            # get results\n",
+						"            inference_result = model_infer(scaled_img, stride)\n",
+						"\n",
+						"            # inference stop\n",
+						"            stop_time = time.time()\n",
+						"            processing_times.append(stop_time - start_time)\n",
+						"            # Process the point to point coordinates of the data\n",
+						"            poses_3d, poses_2d = parse_poses(inference_result, 1, stride, focal_length, True)\n",
+						"\n",
+						"            # use processing times from last 200 frames\n",
+						"            if len(processing_times) > 200:\n",
+						"                processing_times.popleft()\n",
+						"\n",
+						"            processing_time = np.mean(processing_times) * 1000\n",
+						"            fps = 1000 / processing_time\n",
+						"\n",
+						"            if len(poses_3d) > 0:\n",
+						"                # From here, you can rotate the 3D point positions using the function \"draw_poses\",\n",
+						"                # or you can directly make the correct mapping below to properly display the object image on the screen\n",
+						"                poses_3d_copy = poses_3d.copy()\n",
+						"                x = poses_3d_copy[:, 0::4]\n",
+						"                y = poses_3d_copy[:, 1::4]\n",
+						"                z = poses_3d_copy[:, 2::4]\n",
+						"                poses_3d[:, 0::4], poses_3d[:, 1::4], poses_3d[:, 2::4] = (\n",
+						"                    -z + np.ones(poses_3d[:, 2::4].shape) * 200,\n",
+						"                    -y + np.ones(poses_3d[:, 2::4].shape) * 100,\n",
+						"                    -x,\n",
+						"                )\n",
+						"\n",
+						"                poses_3d = poses_3d.reshape(poses_3d.shape[0], 19, -1)[:, :, 0:3]\n",
+						"                people = skeleton(poses_3d=poses_3d)\n",
+						"\n",
+						"                try:\n",
+						"                    engine3D.scene_remove(skeleton_set)\n",
+						"                except Exception:\n",
+						"                    pass\n",
+						"\n",
+						"                engine3D.scene_add(people)\n",
+						"                skeleton_set = people\n",
+						"\n",
+						"                # draw 2D\n",
+						"                frame = draw_poses(frame, poses_2d, scaled_img, use_popup)\n",
+						"\n",
+						"            else:\n",
+						"                try:\n",
+						"                    engine3D.scene_remove(skeleton_set)\n",
+						"                    skeleton_set = None\n",
+						"                except Exception:\n",
+						"                    pass\n",
+						"\n",
+						"            cv2.putText(\n",
+						"                frame,\n",
+						"                f\"Inference time: {processing_time:.1f}ms ({fps:.1f} FPS)\",\n",
+						"                (10, 30),\n",
+						"                cv2.FONT_HERSHEY_COMPLEX,\n",
+						"                0.7,\n",
+						"                (0, 0, 255),\n",
+						"                1,\n",
+						"                cv2.LINE_AA,\n",
+						"            )\n",
+						"\n",
+						"            if use_popup:\n",
+						"                cv2.imshow(title, frame)\n",
+						"                key = cv2.waitKey(1)\n",
+						"                # escape = 27, use ESC to exit\n",
+						"                if key == 27:\n",
+						"                    break\n",
+						"            else:\n",
+						"                # encode numpy array to jpg\n",
+						"                imgbox.value = cv2.imencode(\n",
+						"                    \".jpg\",\n",
+						"                    frame,\n",
+						"                    params=[cv2.IMWRITE_JPEG_QUALITY, 90],\n",
+						"                )[1].tobytes()\n",
+						"\n",
+						"            engine3D.renderer.render(engine3D.scene, engine3D.cam)\n",
+						"\n",
+						"    except KeyboardInterrupt:\n",
+						"        print(\"Interrupted\")\n",
+						"    except RuntimeError as e:\n",
+						"        print(e)\n",
+						"    finally:\n",
+						"        clear_output()\n",
+						"        if player is not None:\n",
+						"            # stop capturing\n",
+						"            player.stop()\n",
+						"        if use_popup:\n",
+						"            cv2.destroyAllWindows()\n",
+						"        if skeleton_set:\n",
+						"            engine3D.scene_remove(skeleton_set)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Run\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Run, using a webcam as the video input. By default, the primary webcam is set with `source=0`. If you have multiple webcams, each one will be assigned a consecutive number starting at 0. Set `flip=True` when using a front-facing camera. Some web browsers, especially Mozilla Firefox, may cause flickering. If you experience flickering, set `use_popup=True`.\n",
+						"\n",
+						"> **NOTE**:\n",
+						">\n",
+						"> *1. To use this notebook with a webcam, you need to run the notebook on a computer with a webcam. If you run the notebook on a server (e.g. Binder), the webcam will not work.*\n",
+						">\n",
+						"> *2. Popup mode may not work if you run this notebook on a remote computer (e.g. Binder).*\n",
+						"\n",
+						"If you do not have a webcam, you can still run this demo with a video file. Any [format supported by OpenCV](https://docs.opencv.org/4.5.1/dd/d43/tutorial_py_video_display.html) will work."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Using the following method, you can click and move your mouse over the picture on the left to interact."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"USE_WEBCAM = False\n",
+						"\n",
+						"cam_id = 0\n",
+						"video_path = \"https://github.com/intel-iot-devkit/sample-videos/raw/master/face-demographics-walking.mp4\"\n",
+						"\n",
+						"source = cam_id if USE_WEBCAM else video_path\n",
+						"\n",
+						"run_pose_estimation(source=source, flip=isinstance(source, int), use_popup=False)"
+					]
+				}
+			].map(fromJupyterCell)
+			, [
+				{
+					"cell_type": "markdown",
+					"source": [
+						"# Live 3D Human Pose Estimation with OpenVINO\n",
+						"\n",
+						"This notebook demonstrates live 3D Human Pose Estimation with OpenVINO via a webcam. We utilize the model [human-pose-estimation-3d-0001](https://github.com/openvinotoolkit/open_model_zoo/tree/master/models/public/human-pose-estimation-3d-0001) from [Open Model Zoo](https://github.com/openvinotoolkit/open_model_zoo/). At the end of this notebook, you will see live inference results from your webcam (if available). Alternatively, you can also upload a video file to test out the algorithms.\n",
+						"**Make sure you have properly installed the [Jupyter extension](https://github.com/jupyter-widgets/pythreejs#jupyterlab) and been using JupyterLab to run the demo as suggested in the `README.md`**\n",
+						"\n",
+						"> **NOTE**: _To use a webcam, you must run this Jupyter notebook on a computer with a webcam. If you run on a remote server, the webcam will not work. However, you can still do inference on a video file in the final step. This demo utilizes the Python interface in `Three.js` integrated with WebGL to process data from the model inference. These results are processed and displayed in the notebook._\n",
+						"\n",
+						"_To ensure that the results are displayed correctly, run the code in a recommended browser on one of the following operating systems:_\n",
+						"_Ubuntu, Windows: Chrome_\n",
+						"_macOS: Safari_\n",
+						"\n",
+						"\n",
+						"#### Table of contents:\n",
+						"\n",
+						"- [Prerequisites](#Prerequisites)\n",
+						"- [Imports](#Imports)\n",
+						"- [The model](#The-model)\n",
+						"    - [Download the model](#Download-the-model)\n",
+						"    - [Convert Model to OpenVINO IR format](#Convert-Model-to-OpenVINO-IR-format)\n",
+						"    - [Select inference device](#Select-inference-device)\n",
+						"    - [Load the model](#Load-the-model)\n",
+						"- [Processing](#Processing)\n",
+						"    - [Model Inference](#Model-Inference)\n",
+						"    - [Draw 2D Pose Overlays](#Draw-2D-Pose-Overlays)\n",
+						"    - [Main Processing Function](#Main-Processing-Function)\n",
+						"- [Run](#Run)\n",
+						"\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Prerequisites\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"**The `pythreejs` extension may not display properly when using the latest Jupyter Notebook release (2.4.1). Therefore, it is recommended to use Jupyter Lab instead.**"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%pip install pythreejs \"openvino-dev>=2024.0.0\" \"opencv-python\" \"torch\" \"onnx\" --extra-index-url https://download.pytorch.org/whl/cpu"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Imports\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"import collections\n",
+						"import sys\n",
+						"import time\n",
+						"from pathlib import Path\n",
+						"\n",
+						"import cv2\n",
+						"import ipywidgets as widgets\n",
+						"import numpy as np\n",
+						"from IPython.display import clear_output, display\n",
+						"import openvino as ov\n",
+						"\n",
+						"# Fetch `notebook_utils` module\n",
+						"import requests\n",
+						"\n",
+						"r = requests.get(\n",
+						"    url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/notebook_utils.py\",\n",
+						")\n",
+						"open(\"notebook_utils.py\", \"w\").write(r.text)\n",
+						"import notebook_utils as utils\n",
+						"\n",
+						"sys.path.append(\"./engine\")\n",
+						"import engine.engine3js as engine\n",
+						"from engine.parse_poses import parse_poses"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## The model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"### Download the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"We use `omz_downloader`, which is a command line tool from the `openvino-dev` package. `omz_downloader` automatically creates a directory structure and downloads the selected model."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# directory where model will be downloaded\n",
+						"base_model_dir = \"model\"\n",
+						"\n",
+						"# model name as named in Open Model Zoo\n",
+						"model_name = \"human-pose-estimation-3d-0001\"\n",
+						"# selected precision (FP32, FP16)\n",
+						"precision = \"FP32\"\n",
+						"\n",
+						"BASE_MODEL_NAME = f\"{base_model_dir}/public/{model_name}/{model_name}\"\n",
+						"model_path = Path(BASE_MODEL_NAME).with_suffix(\".pth\")\n",
+						"onnx_path = Path(BASE_MODEL_NAME).with_suffix(\".onnx\")\n",
+						"\n",
+						"ir_model_path = f\"model/public/{model_name}/{precision}/{model_name}.xml\"\n",
+						"model_weights_path = f\"model/public/{model_name}/{precision}/{model_name}.bin\"\n",
+						"\n",
+						"if not model_path.exists():\n",
+						"    download_command = (\n",
+						"        f\"omz_downloader \" f\"--name {model_name} \" f\"--output_dir {base_model_dir}\"\n",
+						"    )\n",
+						"    ! $download_command"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Convert Model to OpenVINO IR format\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"The selected model comes from the public directory, which means it must be converted into OpenVINO Intermediate Representation (OpenVINO IR). We use `omz_converter` to convert the ONNX format model to the OpenVINO IR format."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"if not onnx_path.exists():\n",
+						"    convert_command = (\n",
+						"        f\"omz_converter \"\n",
+						"        f\"--name {model_name} \"\n",
+						"        f\"--precisions {precision} \"\n",
+						"        f\"--download_dir {base_model_dir} \"\n",
+						"        f\"--output_dir {base_model_dir}\"\n",
+						"    )\n",
+						"    ! $convert_command"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Select inference device\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"select device from dropdown list for running inference using OpenVINO"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"core = ov.Core()\n",
+						"\n",
+						"device = widgets.Dropdown(\n",
+						"    options=core.available_devices + [\"AUTO\"],\n",
+						"    value=\"AUTO\",\n",
+						"    description=\"Device:\",\n",
+						"    disabled=False,\n",
+						")\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Load the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Converted models are located in a fixed structure, which indicates vendor, model name and precision.\n",
+						"\n",
+						"First, initialize the inference engine, OpenVINO Runtime. Then, read the network architecture and model weights from the `.bin` and `.xml` files to compile for the desired device. An inference request is then created to infer the compiled model."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# initialize inference engine\n",
+						"core = ov.Core()\n",
+						"# read the network and corresponding weights from file\n",
+						"model = core.read_model(model=ir_model_path, weights=model_weights_path)\n",
+						"# load the model on the specified device\n",
+						"compiled_model = core.compile_model(model=model, device_name=device.value)\n",
+						"infer_request = compiled_model.create_infer_request()\n",
+						"input_tensor_name = model.inputs[0].get_any_name()\n",
+						"\n",
+						"# get input and output names of nodes\n",
+						"input_layer = compiled_model.input(0)\n",
+						"output_layers = list(compiled_model.outputs)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"The input for the model is data from the input image and the outputs are heat maps, PAF (part affinity fields) and features."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"input_layer.any_name, [o.any_name for o in output_layers]"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Processing\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"### Model Inference\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Frames captured from video files or the live webcam are used as the input for the 3D model. This is how you obtain the output heat maps, PAF (part affinity fields) and features."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"def model_infer(scaled_img, stride):\n",
+						"    \"\"\"\n",
+						"    Run model inference on the input image\n",
+						"\n",
+						"    Parameters:\n",
+						"        scaled_img: resized image according to the input size of the model\n",
+						"        stride: int, the stride of the window\n",
+						"    \"\"\"\n",
+						"\n",
+						"    # Remove excess space from the picture\n",
+						"    img = scaled_img[\n",
+						"        0 : scaled_img.shape[0] - (scaled_img.shape[0] % stride),\n",
+						"        0 : scaled_img.shape[1] - (scaled_img.shape[1] % stride),\n",
+						"    ]\n",
+						"\n",
+						"    img = np.transpose(img, (2, 0, 1))[None,]\n",
+						"    infer_request.infer({input_tensor_name: img})\n",
+						"    # A set of three inference results is obtained\n",
+						"    results = {\n",
+						"        name: infer_request.get_tensor(name).data[:]\n",
+						"        for name in {\"features\", \"heatmaps\", \"pafs\"}\n",
+						"    }\n",
+						"    # Get the results\n",
+						"    results = (results[\"features\"][0], results[\"heatmaps\"][0], results[\"pafs\"][0])\n",
+						"\n",
+						"    return results"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Draw 2D Pose Overlays\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"We need to define some connections between the joints in advance, so that we can draw the structure of the human body in the resulting image after obtaining the inference results.\n",
+						"Joints are drawn as circles and limbs are drawn as lines. The code is based on the [3D Human Pose Estimation Demo](https://github.com/openvinotoolkit/open_model_zoo/tree/master/demos/human_pose_estimation_3d_demo/python) from Open Model Zoo."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# 3D edge index array\n",
+						"body_edges = np.array(\n",
+						"    [\n",
+						"        [0, 1],\n",
+						"        [0, 9],\n",
+						"        [9, 10],\n",
+						"        [10, 11],  # neck - r_shoulder - r_elbow - r_wrist\n",
+						"        [0, 3],\n",
+						"        [3, 4],\n",
+						"        [4, 5],  # neck - l_shoulder - l_elbow - l_wrist\n",
+						"        [1, 15],\n",
+						"        [15, 16],  # nose - l_eye - l_ear\n",
+						"        [1, 17],\n",
+						"        [17, 18],  # nose - r_eye - r_ear\n",
+						"        [0, 6],\n",
+						"        [6, 7],\n",
+						"        [7, 8],  # neck - l_hip - l_knee - l_ankle\n",
+						"        [0, 12],\n",
+						"        [12, 13],\n",
+						"        [13, 14],  # neck - r_hip - r_knee - r_ankle\n",
+						"    ]\n",
+						")\n",
+						"\n",
+						"\n",
+						"body_edges_2d = np.array(\n",
+						"    [\n",
+						"        [0, 1],  # neck - nose\n",
+						"        [1, 16],\n",
+						"        [16, 18],  # nose - l_eye - l_ear\n",
+						"        [1, 15],\n",
+						"        [15, 17],  # nose - r_eye - r_ear\n",
+						"        [0, 3],\n",
+						"        [3, 4],\n",
+						"        [4, 5],  # neck - l_shoulder - l_elbow - l_wrist\n",
+						"        [0, 9],\n",
+						"        [9, 10],\n",
+						"        [10, 11],  # neck - r_shoulder - r_elbow - r_wrist\n",
+						"        [0, 6],\n",
+						"        [6, 7],\n",
+						"        [7, 8],  # neck - l_hip - l_knee - l_ankle\n",
+						"        [0, 12],\n",
+						"        [12, 13],\n",
+						"        [13, 14],  # neck - r_hip - r_knee - r_ankle\n",
+						"    ]\n",
+						")\n",
+						"\n",
+						"\n",
+						"def draw_poses(frame, poses_2d, scaled_img, use_popup):\n",
+						"    \"\"\"\n",
+						"    Draw 2D pose overlays on the image to visualize estimated poses.\n",
+						"    Joints are drawn as circles and limbs are drawn as lines.\n",
+						"\n",
+						"    :param frame: the input image\n",
+						"    :param poses_2d: array of human joint pairs\n",
+						"    \"\"\"\n",
+						"    for pose in poses_2d:\n",
+						"        pose = np.array(pose[0:-1]).reshape((-1, 3)).transpose()\n",
+						"        was_found = pose[2] > 0\n",
+						"\n",
+						"        pose[0], pose[1] = (\n",
+						"            pose[0] * frame.shape[1] / scaled_img.shape[1],\n",
+						"            pose[1] * frame.shape[0] / scaled_img.shape[0],\n",
+						"        )\n",
+						"\n",
+						"        # Draw joints.\n",
+						"        for edge in body_edges_2d:\n",
+						"            if was_found[edge[0]] and was_found[edge[1]]:\n",
+						"                cv2.line(\n",
+						"                    frame,\n",
+						"                    tuple(pose[0:2, edge[0]].astype(np.int32)),\n",
+						"                    tuple(pose[0:2, edge[1]].astype(np.int32)),\n",
+						"                    (255, 255, 0),\n",
+						"                    4,\n",
+						"                    cv2.LINE_AA,\n",
+						"                )\n",
+						"        # Draw limbs.\n",
+						"        for kpt_id in range(pose.shape[1]):\n",
+						"            if pose[2, kpt_id] != -1:\n",
+						"                cv2.circle(\n",
+						"                    frame,\n",
+						"                    tuple(pose[0:2, kpt_id].astype(np.int32)),\n",
+						"                    3,\n",
+						"                    (0, 255, 255),\n",
+						"                    -1,\n",
+						"                    cv2.LINE_AA,\n",
+						"                )\n",
+						"\n",
+						"    return frame"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Main Processing Function\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Run 3D pose estimation on the specified source. It could be either a webcam feed or a video file."
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"tags": []
+					},
+					"source": [
+						"def run_pose_estimation(source=0, flip=False, use_popup=False, skip_frames=0):\n",
+						"    \"\"\"\n",
+						"    2D image as input, using OpenVINO as inference backend,\n",
+						"    get joints 3D coordinates, and draw 3D human skeleton in the scene\n",
+						"\n",
+						"    :param source:      The webcam number to feed the video stream with primary webcam set to \"0\", or the video path.\n",
+						"    :param flip:        To be used by VideoPlayer function for flipping capture image.\n",
+						"    :param use_popup:   False for showing encoded frames over this notebook, True for creating a popup window.\n",
+						"    :param skip_frames: Number of frames to skip at the beginning of the video.\n",
+						"    \"\"\"\n",
+						"\n",
+						"    focal_length = -1  # default\n",
+						"    stride = 8\n",
+						"    player = None\n",
+						"    skeleton_set = None\n",
+						"\n",
+						"    try:\n",
+						"        # create video player to play with target fps  video_path\n",
+						"        # get the frame from camera\n",
+						"        # You can skip first N frames to fast forward video. change 'skip_first_frames'\n",
+						"        player = utils.VideoPlayer(\n",
+						"            source, flip=flip, fps=30, skip_first_frames=skip_frames\n",
+						"        )\n",
+						"        # start capturing\n",
+						"        player.start()\n",
+						"\n",
+						"        input_image = player.next()\n",
+						"        # set the window size\n",
+						"        resize_scale = 450 / input_image.shape[1]\n",
+						"        windows_width = int(input_image.shape[1] * resize_scale)\n",
+						"        windows_height = int(input_image.shape[0] * resize_scale)\n",
+						"\n",
+						"        # use visualization library\n",
+						"        engine3D = engine.Engine3js(\n",
+						"            grid=True, axis=True, view_width=windows_width, view_height=windows_height\n",
+						"        )\n",
+						"\n",
+						"        if use_popup:\n",
+						"            # display the 3D human pose in this notebook, and origin frame in popup window\n",
+						"            display(engine3D.renderer)\n",
+						"            title = \"Press ESC to Exit\"\n",
+						"            cv2.namedWindow(title, cv2.WINDOW_KEEPRATIO | cv2.WINDOW_AUTOSIZE)\n",
+						"        else:\n",
+						"            # set the 2D image box, show both human pose and image in the notebook\n",
+						"            imgbox = widgets.Image(\n",
+						"                format=\"jpg\", height=windows_height, width=windows_width\n",
+						"            )\n",
+						"            display(widgets.HBox([engine3D.renderer, imgbox]))\n",
+						"\n",
+						"        skeleton = engine.Skeleton(body_edges=body_edges)\n",
+						"\n",
+						"        processing_times = collections.deque()\n",
+						"\n",
+						"        while True:\n",
+						"            # grab the frame\n",
+						"            frame = player.next()\n",
+						"            if frame is None:\n",
+						"                print(\"Source ended\")\n",
+						"                break\n",
+						"\n",
+						"            # resize image and change dims to fit neural network input\n",
+						"            # (see https://github.com/openvinotoolkit/open_model_zoo/tree/master/models/public/human-pose-estimation-3d-0001)\n",
+						"            scaled_img = cv2.resize(\n",
+						"                frame, dsize=(model.inputs[0].shape[3], model.inputs[0].shape[2])\n",
+						"            )\n",
+						"\n",
+						"            if focal_length < 0:  # Focal length is unknown\n",
+						"                focal_length = np.float32(0.8 * scaled_img.shape[1])\n",
+						"\n",
+						"            # inference start\n",
+						"            start_time = time.time()\n",
+						"            # get results\n",
+						"            inference_result = model_infer(scaled_img, stride)\n",
+						"\n",
+						"            # inference stop\n",
+						"            stop_time = time.time()\n",
+						"            processing_times.append(stop_time - start_time)\n",
+						"            # Process the point to point coordinates of the data\n",
+						"            poses_3d, poses_2d = parse_poses(\n",
+						"                inference_result, 1, stride, focal_length, True\n",
+						"            )\n",
+						"\n",
+						"            # use processing times from last 200 frames\n",
+						"            if len(processing_times) > 200:\n",
+						"                processing_times.popleft()\n",
+						"\n",
+						"            processing_time = np.mean(processing_times) * 1000\n",
+						"            fps = 1000 / processing_time\n",
+						"\n",
+						"            if len(poses_3d) > 0:\n",
+						"                # From here, you can rotate the 3D point positions using the function \"draw_poses\",\n",
+						"                # or you can directly make the correct mapping below to properly display the object image on the screen\n",
+						"                poses_3d_copy = poses_3d.copy()\n",
+						"                x = poses_3d_copy[:, 0::4]\n",
+						"                y = poses_3d_copy[:, 1::4]\n",
+						"                z = poses_3d_copy[:, 2::4]\n",
+						"                poses_3d[:, 0::4], poses_3d[:, 1::4], poses_3d[:, 2::4] = (\n",
+						"                    -z + np.ones(poses_3d[:, 2::4].shape) * 200,\n",
+						"                    -y + np.ones(poses_3d[:, 2::4].shape) * 100,\n",
+						"                    -x,\n",
+						"                )\n",
+						"\n",
+						"                poses_3d = poses_3d.reshape(poses_3d.shape[0], 19, -1)[:, :, 0:3]\n",
+						"                people = skeleton(poses_3d=poses_3d)\n",
+						"\n",
+						"                try:\n",
+						"                    engine3D.scene_remove(skeleton_set)\n",
+						"                except Exception:\n",
+						"                    pass\n",
+						"\n",
+						"                engine3D.scene_add(people)\n",
+						"                skeleton_set = people\n",
+						"\n",
+						"                # draw 2D\n",
+						"                frame = draw_poses(frame, poses_2d, scaled_img, use_popup)\n",
+						"\n",
+						"            else:\n",
+						"                try:\n",
+						"                    engine3D.scene_remove(skeleton_set)\n",
+						"                    skeleton_set = None\n",
+						"                except Exception:\n",
+						"                    pass\n",
+						"\n",
+						"            cv2.putText(\n",
+						"                frame,\n",
+						"                f\"Inference time: {processing_time:.1f}ms ({fps:.1f} FPS)\",\n",
+						"                (10, 30),\n",
+						"                cv2.FONT_HERSHEY_COMPLEX,\n",
+						"                0.7,\n",
+						"                (0, 0, 255),\n",
+						"                1,\n",
+						"                cv2.LINE_AA,\n",
+						"            )\n",
+						"\n",
+						"            if use_popup:\n",
+						"                cv2.imshow(title, frame)\n",
+						"                key = cv2.waitKey(1)\n",
+						"                # escape = 27, use ESC to exit\n",
+						"                if key == 27:\n",
+						"                    break\n",
+						"            else:\n",
+						"                # encode numpy array to jpg\n",
+						"                imgbox.value = cv2.imencode(\n",
+						"                    \".jpg\",\n",
+						"                    frame,\n",
+						"                    params=[cv2.IMWRITE_JPEG_QUALITY, 90],\n",
+						"                )[1].tobytes()\n",
+						"\n",
+						"            engine3D.renderer.render(engine3D.scene, engine3D.cam)\n",
+						"\n",
+						"    except KeyboardInterrupt:\n",
+						"        print(\"Interrupted\")\n",
+						"    except RuntimeError as e:\n",
+						"        print(e)\n",
+						"    finally:\n",
+						"        clear_output()\n",
+						"        if player is not None:\n",
+						"            # stop capturing\n",
+						"            player.stop()\n",
+						"        if use_popup:\n",
+						"            cv2.destroyAllWindows()\n",
+						"        if skeleton_set:\n",
+						"            engine3D.scene_remove(skeleton_set)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Run\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Run, using a webcam as the video input. By default, the primary webcam is set with `source=0`. If you have multiple webcams, each one will be assigned a consecutive number starting at 0. Set `flip=True` when using a front-facing camera. Some web browsers, especially Mozilla Firefox, may cause flickering. If you experience flickering, set `use_popup=True`.\n",
+						"\n",
+						"> **NOTE**:\n",
+						">\n",
+						"> *1. To use this notebook with a webcam, you need to run the notebook on a computer with a webcam. If you run the notebook on a server (e.g. Binder), the webcam will not work.*\n",
+						">\n",
+						"> *2. Popup mode may not work if you run this notebook on a remote computer (e.g. Binder).*\n",
+						"\n",
+						"If you do not have a webcam, you can still run this demo with a video file. Any [format supported by OpenCV](https://docs.opencv.org/4.5.1/dd/d43/tutorial_py_video_display.html) will work."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Using the following method, you can click and move your mouse over the picture on the left to interact."
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"tags": []
+					},
+					"source": [
+						"USE_WEBCAM = False\n",
+						"\n",
+						"cam_id = 0\n",
+						"video_path = \"https://github.com/intel-iot-devkit/sample-videos/raw/master/face-demographics-walking.mp4\"\n",
+						"\n",
+						"source = cam_id if USE_WEBCAM else video_path\n",
+						"\n",
+						"run_pose_estimation(source=source, flip=isinstance(source, int), use_popup=False)"
+					]
+				}
+			].map(fromJupyterCell)
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: 4 },
+			{ modified: 5, original: 5 },
+			{ modified: 6, original: 6 },
+			{ modified: 7, original: 7 },
+			{ modified: 8, original: 8 },
+			{ modified: 9, original: 9 },
+			{ modified: 10, original: 10 },
+			{ modified: 11, original: 11 },
+			{ modified: 12, original: 12 },
+			{ modified: 13, original: 13 },
+			{ modified: 14, original: 14 },
+			{ modified: 15, original: 15 },
+			{ modified: 16, original: 16 },
+			{ modified: 17, original: 17 },
+			{ modified: 18, original: 18 },
+			{ modified: 19, original: 19 },
+			{ modified: 20, original: 20 },
+			{ modified: 21, original: 21 },
+			{ modified: 22, original: 22 },
+			{ modified: 23, original: 23 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 4, originalLength: 1, modifiedStart: 4, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 10, originalLength: 1, modifiedStart: 10, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 16, originalLength: 1, modifiedStart: 16, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 18, originalLength: 1, modifiedStart: 18, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 20, originalLength: 1, modifiedStart: 20, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+
+	});
+	test('Modification with Insertion, detected as deletion of a cell', async () => {
+		const { mapping, diff } = await mapCells(
+			[
+				{
+					"cell_type": "markdown",
+					"source": [
+						"# Video generation with ZeroScope and OpenVINO\n",
+						"\n",
+						"#### Table of contents:\n",
+						"\n",
+						"- [Install and import required packages](#Install-and-import-required-packages)\n",
+						"- [Load the model](#Load-the-model)\n",
+						"- [Convert the model](#Convert-the-model)\n",
+						"    - [Define the conversion function](#Define-the-conversion-function)\n",
+						"    - [UNet](#UNet)\n",
+						"    - [VAE](#VAE)\n",
+						"    - [Text encoder](#Text-encoder)\n",
+						"- [Build a pipeline](#Build-a-pipeline)\n",
+						"- [Inference with OpenVINO](#Inference-with-OpenVINO)\n",
+						"    - [Select inference device](#Select-inference-device)\n",
+						"    - [Define a prompt](#Define-a-prompt)\n",
+						"    - [Video generation](#Video-generation)\n",
+						"- [Interactive demo](#Interactive-demo)\n",
+						"\n",
+						"\n",
+						"### Installation Instructions\n",
+						"\n",
+						"This is a self-contained example that relies solely on its own code.\n",
+						"\n",
+						"We recommend  running the notebook in a virtual environment. You only need a Jupyter server to start.\n",
+						"For details, please refer to [Installation Guide](https://github.com/openvinotoolkit/openvino_notebooks/blob/latest/README.md#-installation-guide).\n",
+						"\n",
+						"<img referrerpolicy=\"no-referrer-when-downgrade\" src=\"https://static.scarf.sh/a.png?x-pxid=5b5a4db0-7875-4bfb-bdbd-01698b5b1a77&file=notebooks/zeroscope-text2video/zeroscope-text2video.ipynb\" />\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"The ZeroScope model is a free and open-source text-to-video model that can generate realistic and engaging videos from text descriptions. It is based on the [Modelscope](https://modelscope.cn/models/damo/text-to-video-synthesis/summary) model, but it has been improved to produce higher-quality videos with a 16:9 aspect ratio and no Shutterstock watermark. The ZeroScope model is available in two versions: ZeroScope_v2 576w, which is optimized for rapid content creation at a resolution of 576x320 pixels, and ZeroScope_v2 XL, which upscales videos to a high-definition resolution of 1024x576.\n",
+						"\n",
+						"The ZeroScope model is trained on a dataset of over 9,000 videos and 29,000 tagged frames. It uses a diffusion model to generate videos, which means that it starts with a random noise image and gradually adds detail to it until it matches the text description. The ZeroScope model is still under development, but it has already been used to create some impressive videos. For example, it has been used to create videos of people dancing, playing sports, and even driving cars.\n",
+						"\n",
+						"The ZeroScope model is a powerful tool that can be used to create various videos, from simple animations to complex scenes. It is still under development, but it has the potential to revolutionize the way we create and consume video content.\n",
+						"\n",
+						"Both versions of the ZeroScope model are available on Hugging Face:\n",
+						" - [ZeroScope_v2 576w](https://huggingface.co/cerspense/zeroscope_v2_576w)\n",
+						" - [ZeroScope_v2 XL](https://huggingface.co/cerspense/zeroscope_v2_XL)\n",
+						"\n",
+						"We will use the first one."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"<div class=\"alert alert-block alert-warning\">\n",
+						"    This tutorial requires at least 24GB of free memory to generate a video with a frame size of 432x240 and 16 frames. Increasing either of these values will require more memory and take more time.\n",
+						"</div>"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Install and import required packages\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"To work with text-to-video synthesis model, we will use Hugging Face's [Diffusers](https://github.com/huggingface/diffusers) library. It provides already pretrained model from `cerspense`."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%pip install -q --extra-index-url https://download.pytorch.org/whl/cpu  \"diffusers>=0.18.0\" \"torch>=2.1\" transformers \"openvino>=2023.1.0\" numpy \"gradio>=4.19\""
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"import gc\n",
+						"from typing import Optional, Union, List, Callable\n",
+						"import base64\n",
+						"import tempfile\n",
+						"import warnings\n",
+						"\n",
+						"import diffusers\n",
+						"import transformers\n",
+						"import numpy as np\n",
+						"import IPython\n",
+						"import torch\n",
+						"import PIL\n",
+						"import gradio as gr\n",
+						"\n",
+						"import openvino as ov"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Original 576x320 inference requires a lot of RAM (>100GB), so let's run our example on a smaller frame size, keeping the same aspect ratio. Try reducing values below to reduce the memory consumption."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"WIDTH = 432  # must be divisible by 8\n",
+						"HEIGHT = 240  # must be divisible by 8\n",
+						"NUM_FRAMES = 16"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Load the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"The model is loaded from HuggingFace using `.from_pretrained` method of `diffusers.DiffusionPipeline`."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"pipe = diffusers.DiffusionPipeline.from_pretrained(\"cerspense/zeroscope_v2_576w\")"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"unet = pipe.unet\n",
+						"unet.eval()\n",
+						"vae = pipe.vae\n",
+						"vae.eval()\n",
+						"text_encoder = pipe.text_encoder\n",
+						"text_encoder.eval()\n",
+						"tokenizer = pipe.tokenizer\n",
+						"scheduler = pipe.scheduler\n",
+						"vae_scale_factor = pipe.vae_scale_factor\n",
+						"unet_in_channels = pipe.unet.config.in_channels\n",
+						"sample_width = WIDTH // vae_scale_factor\n",
+						"sample_height = HEIGHT // vae_scale_factor\n",
+						"del pipe\n",
+						"gc.collect();"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Convert the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"The architecture for generating videos from text comprises three distinct sub-networks: one for extracting text features, another for translating text features into the video latent space using a diffusion model, and a final one for mapping the video latent space to the visual space. The collective parameters of the entire model amount to approximately 1.7 billion. It's capable of processing English input. The diffusion model is built upon the Unet3D model and achieves video generation by iteratively denoising a starting point of pure Gaussian noise video."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": []
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Define the conversion function\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Model components are PyTorch modules, that can be converted with `ov.convert_model` function directly. We also use `ov.save_model` function to serialize the result of conversion."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"warnings.filterwarnings(\"ignore\", category=torch.jit.TracerWarning)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"from pathlib import Path\n",
+						"\n",
+						"\n",
+						"def convert(model: torch.nn.Module, xml_path: str, **convert_kwargs) -> Path:\n",
+						"    xml_path = Path(xml_path)\n",
+						"    if not xml_path.exists():\n",
+						"        xml_path.parent.mkdir(parents=True, exist_ok=True)\n",
+						"        with torch.no_grad():\n",
+						"            converted_model = ov.convert_model(model, **convert_kwargs)\n",
+						"        ov.save_model(converted_model, xml_path)\n",
+						"        del converted_model\n",
+						"        gc.collect()\n",
+						"        torch._C._jit_clear_class_registry()\n",
+						"        torch.jit._recursive.concrete_type_store = torch.jit._recursive.ConcreteTypeStore()\n",
+						"        torch.jit._state._clear_class_state()\n",
+						"    return xml_path"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### UNet\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Text-to-video generation pipeline main component is a conditional 3D UNet model that takes a noisy sample, conditional state, and a timestep and returns a sample shaped output."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"unet_xml_path = convert(\n",
+						"    unet,\n",
+						"    \"models/unet.xml\",\n",
+						"    example_input={\n",
+						"        \"sample\": torch.randn(2, 4, 2, int(sample_height // 2), int(sample_width // 2)),\n",
+						"        \"timestep\": torch.tensor(1),\n",
+						"        \"encoder_hidden_states\": torch.randn(2, 77, 1024),\n",
+						"    },\n",
+						"    input=[\n",
+						"        (\"sample\", (2, 4, NUM_FRAMES, sample_height, sample_width)),\n",
+						"        (\"timestep\", ()),\n",
+						"        (\"encoder_hidden_states\", (2, 77, 1024)),\n",
+						"    ],\n",
+						")\n",
+						"del unet\n",
+						"gc.collect();"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### VAE\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Variational autoencoder (VAE) uses UNet output to decode latents to visual representations. Our VAE model has KL loss for encoding images into latents and decoding latent representations into images. For inference, we need only decoder part."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"class VaeDecoderWrapper(torch.nn.Module):\n",
+						"    def __init__(self, vae):\n",
+						"        super().__init__()\n",
+						"        self.vae = vae\n",
+						"\n",
+						"    def forward(self, z: torch.FloatTensor):\n",
+						"        return self.vae.decode(z)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"vae_decoder_xml_path = convert(\n",
+						"    VaeDecoderWrapper(vae),\n",
+						"    \"models/vae.xml\",\n",
+						"    example_input=torch.randn(2, 4, 32, 32),\n",
+						"    input=((NUM_FRAMES, 4, sample_height, sample_width)),\n",
+						")\n",
+						"del vae\n",
+						"gc.collect();"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Text encoder\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Text encoder is used to encode the input prompt to tensor. Default tensor length is 77."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"text_encoder_xml = convert(\n",
+						"    text_encoder,\n",
+						"    \"models/text_encoder.xml\",\n",
+						"    example_input=torch.ones(1, 77, dtype=torch.int64),\n",
+						"    input=((1, 77), ov.Type.i64),\n",
+						")\n",
+						"del text_encoder\n",
+						"gc.collect();"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Build a pipeline\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"def tensor2vid(video: torch.Tensor, mean=[0.5, 0.5, 0.5], std=[0.5, 0.5, 0.5]) -> List[np.ndarray]:\n",
+						"    # This code is copied from https://github.com/modelscope/modelscope/blob/1509fdb973e5871f37148a4b5e5964cafd43e64d/modelscope/pipelines/multi_modal/text_to_video_synthesis_pipeline.py#L78\n",
+						"    # reshape to ncfhw\n",
+						"    mean = torch.tensor(mean, device=video.device).reshape(1, -1, 1, 1, 1)\n",
+						"    std = torch.tensor(std, device=video.device).reshape(1, -1, 1, 1, 1)\n",
+						"    # unnormalize back to [0,1]\n",
+						"    video = video.mul_(std).add_(mean)\n",
+						"    video.clamp_(0, 1)\n",
+						"    # prepare the final outputs\n",
+						"    i, c, f, h, w = video.shape\n",
+						"    images = video.permute(2, 3, 0, 4, 1).reshape(f, h, i * w, c)  # 1st (frames, h, batch_size, w, c) 2nd (frames, h, batch_size * w, c)\n",
+						"    images = images.unbind(dim=0)  # prepare a list of indvidual (consecutive frames)\n",
+						"    images = [(image.cpu().numpy() * 255).astype(\"uint8\") for image in images]  # f h w c\n",
+						"    return images"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"try:\n",
+						"    from diffusers.utils import randn_tensor\n",
+						"except ImportError:\n",
+						"    from diffusers.utils.torch_utils import randn_tensor\n",
+						"\n",
+						"\n",
+						"class OVTextToVideoSDPipeline(diffusers.DiffusionPipeline):\n",
+						"    def __init__(\n",
+						"        self,\n",
+						"        vae_decoder: ov.CompiledModel,\n",
+						"        text_encoder: ov.CompiledModel,\n",
+						"        tokenizer: transformers.CLIPTokenizer,\n",
+						"        unet: ov.CompiledModel,\n",
+						"        scheduler: diffusers.schedulers.DDIMScheduler,\n",
+						"    ):\n",
+						"        super().__init__()\n",
+						"\n",
+						"        self.vae_decoder = vae_decoder\n",
+						"        self.text_encoder = text_encoder\n",
+						"        self.tokenizer = tokenizer\n",
+						"        self.unet = unet\n",
+						"        self.scheduler = scheduler\n",
+						"        self.vae_scale_factor = vae_scale_factor\n",
+						"        self.unet_in_channels = unet_in_channels\n",
+						"        self.width = WIDTH\n",
+						"        self.height = HEIGHT\n",
+						"        self.num_frames = NUM_FRAMES\n",
+						"\n",
+						"    def __call__(\n",
+						"        self,\n",
+						"        prompt: Union[str, List[str]] = None,\n",
+						"        num_inference_steps: int = 50,\n",
+						"        guidance_scale: float = 9.0,\n",
+						"        negative_prompt: Optional[Union[str, List[str]]] = None,\n",
+						"        eta: float = 0.0,\n",
+						"        generator: Optional[Union[torch.Generator, List[torch.Generator]]] = None,\n",
+						"        latents: Optional[torch.FloatTensor] = None,\n",
+						"        prompt_embeds: Optional[torch.FloatTensor] = None,\n",
+						"        negative_prompt_embeds: Optional[torch.FloatTensor] = None,\n",
+						"        output_type: Optional[str] = \"np\",\n",
+						"        return_dict: bool = True,\n",
+						"        callback: Optional[Callable[[int, int, torch.FloatTensor], None]] = None,\n",
+						"        callback_steps: int = 1,\n",
+						"    ):\n",
+						"        r\"\"\"\n",
+						"        Function invoked when calling the pipeline for generation.\n",
+						"\n",
+						"        Args:\n",
+						"            prompt (`str` or `List[str]`, *optional*):\n",
+						"                The prompt or prompts to guide the video generation. If not defined, one has to pass `prompt_embeds`.\n",
+						"                instead.\n",
+						"            num_inference_steps (`int`, *optional*, defaults to 50):\n",
+						"                The number of denoising steps. More denoising steps usually lead to a higher quality videos at the\n",
+						"                expense of slower inference.\n",
+						"            guidance_scale (`float`, *optional*, defaults to 7.5):\n",
+						"                Guidance scale as defined in [Classifier-Free Diffusion Guidance](https://arxiv.org/abs/2207.12598).\n",
+						"                `guidance_scale` is defined as `w` of equation 2. of [Imagen\n",
+						"                Paper](https://arxiv.org/pdf/2205.11487.pdf). Guidance scale is enabled by setting `guidance_scale >\n",
+						"                1`. Higher guidance scale encourages to generate videos that are closely linked to the text `prompt`,\n",
+						"                usually at the expense of lower video quality.\n",
+						"            negative_prompt (`str` or `List[str]`, *optional*):\n",
+						"                The prompt or prompts not to guide the video generation. If not defined, one has to pass\n",
+						"                `negative_prompt_embeds` instead. Ignored when not using guidance (i.e., ignored if `guidance_scale` is\n",
+						"                less than `1`).\n",
+						"            eta (`float`, *optional*, defaults to 0.0):\n",
+						"                Corresponds to parameter eta (η) in the DDIM paper: https://arxiv.org/abs/2010.02502. Only applies to\n",
+						"                [`schedulers.DDIMScheduler`], will be ignored for others.\n",
+						"            generator (`torch.Generator` or `List[torch.Generator]`, *optional*):\n",
+						"                One or a list of [torch generator(s)](https://pytorch.org/docs/stable/generated/torch.Generator.html)\n",
+						"                to make generation deterministic.\n",
+						"            latents (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated noisy latents, sampled from a Gaussian distribution, to be used as inputs for video\n",
+						"                generation. Can be used to tweak the same generation with different prompts. If not provided, a latents\n",
+						"                tensor will ge generated by sampling using the supplied random `generator`. Latents should be of shape\n",
+						"                `(batch_size, num_channel, num_frames, height, width)`.\n",
+						"            prompt_embeds (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt weighting. If not\n",
+						"                provided, text embeddings will be generated from `prompt` input argument.\n",
+						"            negative_prompt_embeds (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated negative text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt\n",
+						"                weighting. If not provided, negative_prompt_embeds will be generated from `negative_prompt` input\n",
+						"                argument.\n",
+						"            output_type (`str`, *optional*, defaults to `\"np\"`):\n",
+						"                The output format of the generate video. Choose between `torch.FloatTensor` or `np.array`.\n",
+						"            return_dict (`bool`, *optional*, defaults to `True`):\n",
+						"                Whether or not to return a [`~pipelines.stable_diffusion.TextToVideoSDPipelineOutput`] instead of a\n",
+						"                plain tuple.\n",
+						"            callback (`Callable`, *optional*):\n",
+						"                A function that will be called every `callback_steps` steps during inference. The function will be\n",
+						"                called with the following arguments: `callback(step: int, timestep: int, latents: torch.FloatTensor)`.\n",
+						"            callback_steps (`int`, *optional*, defaults to 1):\n",
+						"                The frequency at which the `callback` function will be called. If not specified, the callback will be\n",
+						"                called at every step.\n",
+						"\n",
+						"        Returns:\n",
+						"            `List[np.ndarray]`: generated video frames\n",
+						"        \"\"\"\n",
+						"\n",
+						"        num_images_per_prompt = 1\n",
+						"\n",
+						"        # 1. Check inputs. Raise error if not correct\n",
+						"        self.check_inputs(\n",
+						"            prompt,\n",
+						"            callback_steps,\n",
+						"            negative_prompt,\n",
+						"            prompt_embeds,\n",
+						"            negative_prompt_embeds,\n",
+						"        )\n",
+						"\n",
+						"        # 2. Define call parameters\n",
+						"        if prompt is not None and isinstance(prompt, str):\n",
+						"            batch_size = 1\n",
+						"        elif prompt is not None and isinstance(prompt, list):\n",
+						"            batch_size = len(prompt)\n",
+						"        else:\n",
+						"            batch_size = prompt_embeds.shape[0]\n",
+						"\n",
+						"        # here `guidance_scale` is defined analog to the guidance weight `w` of equation (2)\n",
+						"        # of the Imagen paper: https://arxiv.org/pdf/2205.11487.pdf . `guidance_scale = 1`\n",
+						"        # corresponds to doing no classifier free guidance.\n",
+						"        do_classifier_free_guidance = guidance_scale > 1.0\n",
+						"\n",
+						"        # 3. Encode input prompt\n",
+						"        prompt_embeds = self._encode_prompt(\n",
+						"            prompt,\n",
+						"            num_images_per_prompt,\n",
+						"            do_classifier_free_guidance,\n",
+						"            negative_prompt,\n",
+						"            prompt_embeds=prompt_embeds,\n",
+						"            negative_prompt_embeds=negative_prompt_embeds,\n",
+						"        )\n",
+						"\n",
+						"        # 4. Prepare timesteps\n",
+						"        self.scheduler.set_timesteps(num_inference_steps)\n",
+						"        timesteps = self.scheduler.timesteps\n",
+						"\n",
+						"        # 5. Prepare latent variables\n",
+						"        num_channels_latents = self.unet_in_channels\n",
+						"        latents = self.prepare_latents(\n",
+						"            batch_size * num_images_per_prompt,\n",
+						"            num_channels_latents,\n",
+						"            prompt_embeds.dtype,\n",
+						"            generator,\n",
+						"            latents,\n",
+						"        )\n",
+						"\n",
+						"        # 6. Prepare extra step kwargs. TODO: Logic should ideally just be moved out of the pipeline\n",
+						"        extra_step_kwargs = {\"generator\": generator, \"eta\": eta}\n",
+						"\n",
+						"        # 7. Denoising loop\n",
+						"        num_warmup_steps = len(timesteps) - num_inference_steps * self.scheduler.order\n",
+						"        with self.progress_bar(total=num_inference_steps) as progress_bar:\n",
+						"            for i, t in enumerate(timesteps):\n",
+						"                # expand the latents if we are doing classifier free guidance\n",
+						"                latent_model_input = torch.cat([latents] * 2) if do_classifier_free_guidance else latents\n",
+						"                latent_model_input = self.scheduler.scale_model_input(latent_model_input, t)\n",
+						"\n",
+						"                # predict the noise residual\n",
+						"                noise_pred = self.unet(\n",
+						"                    {\n",
+						"                        \"sample\": latent_model_input,\n",
+						"                        \"timestep\": t,\n",
+						"                        \"encoder_hidden_states\": prompt_embeds,\n",
+						"                    }\n",
+						"                )[0]\n",
+						"                noise_pred = torch.tensor(noise_pred)\n",
+						"\n",
+						"                # perform guidance\n",
+						"                if do_classifier_free_guidance:\n",
+						"                    noise_pred_uncond, noise_pred_text = noise_pred.chunk(2)\n",
+						"                    noise_pred = noise_pred_uncond + guidance_scale * (noise_pred_text - noise_pred_uncond)\n",
+						"\n",
+						"                # reshape latents\n",
+						"                bsz, channel, frames, width, height = latents.shape\n",
+						"                latents = latents.permute(0, 2, 1, 3, 4).reshape(bsz * frames, channel, width, height)\n",
+						"                noise_pred = noise_pred.permute(0, 2, 1, 3, 4).reshape(bsz * frames, channel, width, height)\n",
+						"\n",
+						"                # compute the previous noisy sample x_t -> x_t-1\n",
+						"                latents = self.scheduler.step(noise_pred, t, latents, **extra_step_kwargs).prev_sample\n",
+						"\n",
+						"                # reshape latents back\n",
+						"                latents = latents[None, :].reshape(bsz, frames, channel, width, height).permute(0, 2, 1, 3, 4)\n",
+						"\n",
+						"                # call the callback, if provided\n",
+						"                if i == len(timesteps) - 1 or ((i + 1) > num_warmup_steps and (i + 1) % self.scheduler.order == 0):\n",
+						"                    progress_bar.update()\n",
+						"                    if callback is not None and i % callback_steps == 0:\n",
+						"                        callback(i, t, latents)\n",
+						"\n",
+						"        video_tensor = self.decode_latents(latents)\n",
+						"\n",
+						"        if output_type == \"pt\":\n",
+						"            video = video_tensor\n",
+						"        else:\n",
+						"            video = tensor2vid(video_tensor)\n",
+						"\n",
+						"        if not return_dict:\n",
+						"            return (video,)\n",
+						"\n",
+						"        return {\"frames\": video}\n",
+						"\n",
+						"    # Copied from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion.StableDiffusionPipeline._encode_prompt\n",
+						"    def _encode_prompt(\n",
+						"        self,\n",
+						"        prompt,\n",
+						"        num_images_per_prompt,\n",
+						"        do_classifier_free_guidance,\n",
+						"        negative_prompt=None,\n",
+						"        prompt_embeds: Optional[torch.FloatTensor] = None,\n",
+						"        negative_prompt_embeds: Optional[torch.FloatTensor] = None,\n",
+						"    ):\n",
+						"        r\"\"\"\n",
+						"        Encodes the prompt into text encoder hidden states.\n",
+						"\n",
+						"        Args:\n",
+						"             prompt (`str` or `List[str]`, *optional*):\n",
+						"                prompt to be encoded\n",
+						"            num_images_per_prompt (`int`):\n",
+						"                number of images that should be generated per prompt\n",
+						"            do_classifier_free_guidance (`bool`):\n",
+						"                whether to use classifier free guidance or not\n",
+						"            negative_prompt (`str` or `List[str]`, *optional*):\n",
+						"                The prompt or prompts not to guide the image generation. If not defined, one has to pass\n",
+						"                `negative_prompt_embeds` instead. Ignored when not using guidance (i.e., ignored if `guidance_scale` is\n",
+						"                less than `1`).\n",
+						"            prompt_embeds (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt weighting. If not\n",
+						"                provided, text embeddings will be generated from `prompt` input argument.\n",
+						"            negative_prompt_embeds (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated negative text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt\n",
+						"                weighting. If not provided, negative_prompt_embeds will be generated from `negative_prompt` input\n",
+						"                argument.\n",
+						"        \"\"\"\n",
+						"        if prompt is not None and isinstance(prompt, str):\n",
+						"            batch_size = 1\n",
+						"        elif prompt is not None and isinstance(prompt, list):\n",
+						"            batch_size = len(prompt)\n",
+						"        else:\n",
+						"            batch_size = prompt_embeds.shape[0]\n",
+						"\n",
+						"        if prompt_embeds is None:\n",
+						"            text_inputs = self.tokenizer(\n",
+						"                prompt,\n",
+						"                padding=\"max_length\",\n",
+						"                max_length=self.tokenizer.model_max_length,\n",
+						"                truncation=True,\n",
+						"                return_tensors=\"pt\",\n",
+						"            )\n",
+						"            text_input_ids = text_inputs.input_ids\n",
+						"            untruncated_ids = self.tokenizer(prompt, padding=\"longest\", return_tensors=\"pt\").input_ids\n",
+						"\n",
+						"            if untruncated_ids.shape[-1] >= text_input_ids.shape[-1] and not torch.equal(text_input_ids, untruncated_ids):\n",
+						"                removed_text = self.tokenizer.batch_decode(untruncated_ids[:, self.tokenizer.model_max_length - 1 : -1])\n",
+						"                print(\n",
+						"                    \"The following part of your input was truncated because CLIP can only handle sequences up to\"\n",
+						"                    f\" {self.tokenizer.model_max_length} tokens: {removed_text}\"\n",
+						"                )\n",
+						"\n",
+						"            prompt_embeds = self.text_encoder(text_input_ids)\n",
+						"            prompt_embeds = prompt_embeds[0]\n",
+						"            prompt_embeds = torch.tensor(prompt_embeds)\n",
+						"\n",
+						"        bs_embed, seq_len, _ = prompt_embeds.shape\n",
+						"        # duplicate text embeddings for each generation per prompt, using mps friendly method\n",
+						"        prompt_embeds = prompt_embeds.repeat(1, num_images_per_prompt, 1)\n",
+						"        prompt_embeds = prompt_embeds.view(bs_embed * num_images_per_prompt, seq_len, -1)\n",
+						"\n",
+						"        # get unconditional embeddings for classifier free guidance\n",
+						"        if do_classifier_free_guidance and negative_prompt_embeds is None:\n",
+						"            uncond_tokens: List[str]\n",
+						"            if negative_prompt is None:\n",
+						"                uncond_tokens = [\"\"] * batch_size\n",
+						"            elif type(prompt) is not type(negative_prompt):\n",
+						"                raise TypeError(f\"`negative_prompt` should be the same type to `prompt`, but got {type(negative_prompt)} !=\" f\" {type(prompt)}.\")\n",
+						"            elif isinstance(negative_prompt, str):\n",
+						"                uncond_tokens = [negative_prompt]\n",
+						"            elif batch_size != len(negative_prompt):\n",
+						"                raise ValueError(\n",
+						"                    f\"`negative_prompt`: {negative_prompt} has batch size {len(negative_prompt)}, but `prompt`:\"\n",
+						"                    f\" {prompt} has batch size {batch_size}. Please make sure that passed `negative_prompt` matches\"\n",
+						"                    \" the batch size of `prompt`.\"\n",
+						"                )\n",
+						"            else:\n",
+						"                uncond_tokens = negative_prompt\n",
+						"\n",
+						"            max_length = prompt_embeds.shape[1]\n",
+						"            uncond_input = self.tokenizer(\n",
+						"                uncond_tokens,\n",
+						"                padding=\"max_length\",\n",
+						"                max_length=max_length,\n",
+						"                truncation=True,\n",
+						"                return_tensors=\"pt\",\n",
+						"            )\n",
+						"\n",
+						"            negative_prompt_embeds = self.text_encoder(uncond_input.input_ids)\n",
+						"            negative_prompt_embeds = negative_prompt_embeds[0]\n",
+						"            negative_prompt_embeds = torch.tensor(negative_prompt_embeds)\n",
+						"\n",
+						"        if do_classifier_free_guidance:\n",
+						"            # duplicate unconditional embeddings for each generation per prompt, using mps friendly method\n",
+						"            seq_len = negative_prompt_embeds.shape[1]\n",
+						"\n",
+						"            negative_prompt_embeds = negative_prompt_embeds.repeat(1, num_images_per_prompt, 1)\n",
+						"            negative_prompt_embeds = negative_prompt_embeds.view(batch_size * num_images_per_prompt, seq_len, -1)\n",
+						"\n",
+						"            # For classifier free guidance, we need to do two forward passes.\n",
+						"            # Here we concatenate the unconditional and text embeddings into a single batch\n",
+						"            # to avoid doing two forward passes\n",
+						"            prompt_embeds = torch.cat([negative_prompt_embeds, prompt_embeds])\n",
+						"\n",
+						"        return prompt_embeds\n",
+						"\n",
+						"    def prepare_latents(\n",
+						"        self,\n",
+						"        batch_size,\n",
+						"        num_channels_latents,\n",
+						"        dtype,\n",
+						"        generator,\n",
+						"        latents=None,\n",
+						"    ):\n",
+						"        shape = (\n",
+						"            batch_size,\n",
+						"            num_channels_latents,\n",
+						"            self.num_frames,\n",
+						"            self.height // self.vae_scale_factor,\n",
+						"            self.width // self.vae_scale_factor,\n",
+						"        )\n",
+						"        if isinstance(generator, list) and len(generator) != batch_size:\n",
+						"            raise ValueError(\n",
+						"                f\"You have passed a list of generators of length {len(generator)}, but requested an effective batch\"\n",
+						"                f\" size of {batch_size}. Make sure the batch size matches the length of the generators.\"\n",
+						"            )\n",
+						"\n",
+						"        if latents is None:\n",
+						"            latents = randn_tensor(shape, generator=generator, dtype=dtype)\n",
+						"\n",
+						"        # scale the initial noise by the standard deviation required by the scheduler\n",
+						"        latents = latents * self.scheduler.init_noise_sigma\n",
+						"        return latents\n",
+						"\n",
+						"    def check_inputs(\n",
+						"        self,\n",
+						"        prompt,\n",
+						"        callback_steps,\n",
+						"        negative_prompt=None,\n",
+						"        prompt_embeds=None,\n",
+						"        negative_prompt_embeds=None,\n",
+						"    ):\n",
+						"        if self.height % 8 != 0 or self.width % 8 != 0:\n",
+						"            raise ValueError(f\"`height` and `width` have to be divisible by 8 but are {self.height} and {self.width}.\")\n",
+						"\n",
+						"        if (callback_steps is None) or (callback_steps is not None and (not isinstance(callback_steps, int) or callback_steps <= 0)):\n",
+						"            raise ValueError(f\"`callback_steps` has to be a positive integer but is {callback_steps} of type\" f\" {type(callback_steps)}.\")\n",
+						"\n",
+						"        if prompt is not None and prompt_embeds is not None:\n",
+						"            raise ValueError(\n",
+						"                f\"Cannot forward both `prompt`: {prompt} and `prompt_embeds`: {prompt_embeds}. Please make sure to\" \" only forward one of the two.\"\n",
+						"            )\n",
+						"        elif prompt is None and prompt_embeds is None:\n",
+						"            raise ValueError(\"Provide either `prompt` or `prompt_embeds`. Cannot leave both `prompt` and `prompt_embeds` undefined.\")\n",
+						"        elif prompt is not None and (not isinstance(prompt, str) and not isinstance(prompt, list)):\n",
+						"            raise ValueError(f\"`prompt` has to be of type `str` or `list` but is {type(prompt)}\")\n",
+						"\n",
+						"        if negative_prompt is not None and negative_prompt_embeds is not None:\n",
+						"            raise ValueError(\n",
+						"                f\"Cannot forward both `negative_prompt`: {negative_prompt} and `negative_prompt_embeds`:\"\n",
+						"                f\" {negative_prompt_embeds}. Please make sure to only forward one of the two.\"\n",
+						"            )\n",
+						"\n",
+						"        if prompt_embeds is not None and negative_prompt_embeds is not None:\n",
+						"            if prompt_embeds.shape != negative_prompt_embeds.shape:\n",
+						"                raise ValueError(\n",
+						"                    \"`prompt_embeds` and `negative_prompt_embeds` must have the same shape when passed directly, but\"\n",
+						"                    f\" got: `prompt_embeds` {prompt_embeds.shape} != `negative_prompt_embeds`\"\n",
+						"                    f\" {negative_prompt_embeds.shape}.\"\n",
+						"                )\n",
+						"\n",
+						"    def decode_latents(self, latents):\n",
+						"        scale_factor = 0.18215\n",
+						"        latents = 1 / scale_factor * latents\n",
+						"\n",
+						"        batch_size, channels, num_frames, height, width = latents.shape\n",
+						"        latents = latents.permute(0, 2, 1, 3, 4).reshape(batch_size * num_frames, channels, height, width)\n",
+						"        image = self.vae_decoder(latents)[0]\n",
+						"        image = torch.tensor(image)\n",
+						"        video = (\n",
+						"            image[None, :]\n",
+						"            .reshape(\n",
+						"                (\n",
+						"                    batch_size,\n",
+						"                    num_frames,\n",
+						"                    -1,\n",
+						"                )\n",
+						"                + image.shape[2:]\n",
+						"            )\n",
+						"            .permute(0, 2, 1, 3, 4)\n",
+						"        )\n",
+						"        # we always cast to float32 as this does not cause significant overhead and is compatible with bfloat16\n",
+						"        video = video.float()\n",
+						"        return video"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Inference with OpenVINO\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"core = ov.Core()"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Select inference device\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"select device from dropdown list for running inference using OpenVINO"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"import requests\n",
+						"\n",
+						"r = requests.get(\n",
+						"    url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/notebook_utils.py\",\n",
+						")\n",
+						"open(\"notebook_utils.py\", \"w\").write(r.text)\n",
+						"\n",
+						"from notebook_utils import device_widget\n",
+						"\n",
+						"device = device_widget()\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%%time\n",
+						"ov_unet = core.compile_model(unet_xml_path, device_name=device.value)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%%time\n",
+						"ov_vae_decoder = core.compile_model(vae_decoder_xml_path, device_name=device.value)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%%time\n",
+						"ov_text_encoder = core.compile_model(text_encoder_xml, device_name=device.value)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Here we replace the pipeline parts with versions converted to OpenVINO IR and compiled to specific device. Note that we use original pipeline tokenizer and scheduler."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"ov_pipe = OVTextToVideoSDPipeline(ov_vae_decoder, ov_text_encoder, tokenizer, ov_unet, scheduler)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Define a prompt\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"prompt = \"A panda eating bamboo on a rock.\""
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Let's generate a video for our prompt. For full list of arguments, see `__call__` function definition of `OVTextToVideoSDPipeline` class in [Build a pipeline](#Build-a-pipeline) section."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Video generation\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"frames = ov_pipe(prompt, num_inference_steps=25)[\"frames\"]"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"images = [PIL.Image.fromarray(frame) for frame in frames]\n",
+						"images[0].save(\"output.gif\", save_all=True, append_images=images[1:], duration=125, loop=0)\n",
+						"with open(\"output.gif\", \"rb\") as gif_file:\n",
+						"    b64 = f\"data:image/gif;base64,{base64.b64encode(gif_file.read()).decode()}\"\n",
+						"IPython.display.HTML(f'<img src=\"{b64}\" />')"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Interactive demo\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"def generate(prompt, seed, num_inference_steps, _=gr.Progress(track_tqdm=True)):\n",
+						"    generator = torch.Generator().manual_seed(seed)\n",
+						"    frames = ov_pipe(\n",
+						"        prompt,\n",
+						"        num_inference_steps=num_inference_steps,\n",
+						"        generator=generator,\n",
+						"    )[\"frames\"]\n",
+						"    out_file = tempfile.NamedTemporaryFile(suffix=\".gif\", delete=False)\n",
+						"    images = [PIL.Image.fromarray(frame) for frame in frames]\n",
+						"    images[0].save(out_file, save_all=True, append_images=images[1:], duration=125, loop=0)\n",
+						"    return out_file.name\n",
+						"\n",
+						"\n",
+						"demo = gr.Interface(\n",
+						"    generate,\n",
+						"    [\n",
+						"        gr.Textbox(label=\"Prompt\"),\n",
+						"        gr.Slider(0, 1000000, value=42, label=\"Seed\", step=1),\n",
+						"        gr.Slider(10, 50, value=25, label=\"Number of inference steps\", step=1),\n",
+						"    ],\n",
+						"    gr.Image(label=\"Result\"),\n",
+						"    examples=[\n",
+						"        [\"An astronaut riding a horse.\", 0, 25],\n",
+						"        [\"A panda eating bamboo on a rock.\", 0, 25],\n",
+						"        [\"Spiderman is surfing.\", 0, 25],\n",
+						"    ],\n",
+						"    allow_flagging=\"never\",\n",
+						")\n",
+						"\n",
+						"try:\n",
+						"    demo.queue().launch(debug=True)\n",
+						"except Exception:\n",
+						"    demo.queue().launch(share=True, debug=True)\n",
+						"# if you are launching remotely, specify server_name and server_port\n",
+						"# demo.launch(server_name='your server name', server_port='server port in int')\n",
+						"# Read more in the docs: https://gradio.app/docs/"
+					]
+				}
+			].map(fromJupyterCell)
+			,
+			[
+				{
+					"cell_type": "markdown",
+					"source": [
+						"# Video generation with ZeroScope and OpenVINO\n",
+						"\n",
+						"#### Table of contents:\n",
+						"\n",
+						"- [Install and import required packages](#Install-and-import-required-packages)\n",
+						"- [Load the model](#Load-the-model)\n",
+						"- [Convert the model](#Convert-the-model)\n",
+						"    - [Define the conversion function](#Define-the-conversion-function)\n",
+						"    - [UNet](#UNet)\n",
+						"    - [VAE](#VAE)\n",
+						"    - [Text encoder](#Text-encoder)\n",
+						"- [Build a pipeline](#Build-a-pipeline)\n",
+						"- [Inference with OpenVINO](#Inference-with-OpenVINO)\n",
+						"    - [Select inference device](#Select-inference-device)\n",
+						"    - [Define a prompt](#Define-a-prompt)\n",
+						"    - [Video generation](#Video-generation)\n",
+						"- [Interactive demo](#Interactive-demo)\n",
+						"\n",
+						"\n",
+						"### Installation Instructions\n",
+						"\n",
+						"This is a self-contained example that relies solely on its own code.\n",
+						"\n",
+						"We recommend  running the notebook in a virtual environment. You only need a Jupyter server to start.\n",
+						"For details, please refer to [Installation Guide](https://github.com/openvinotoolkit/openvino_notebooks/blob/latest/README.md#-installation-guide).\n",
+						"\n",
+						"<img referrerpolicy=\"no-referrer-when-downgrade\" src=\"https://static.scarf.sh/a.png?x-pxid=5b5a4db0-7875-4bfb-bdbd-01698b5b1a77&file=notebooks/zeroscope-text2video/zeroscope-text2video.ipynb\" />\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"The ZeroScope model is a free and open-source text-to-video model that can generate realistic and engaging videos from text descriptions. It is based on the [Modelscope](https://modelscope.cn/models/damo/text-to-video-synthesis/summary) model, but it has been improved to produce higher-quality videos with a 16:9 aspect ratio and no Shutterstock watermark. The ZeroScope model is available in two versions: ZeroScope_v2 576w, which is optimized for rapid content creation at a resolution of 576x320 pixels, and ZeroScope_v2 XL, which upscales videos to a high-definition resolution of 1024x576.\n",
+						"\n",
+						"The ZeroScope model is trained on a dataset of over 9,000 videos and 29,000 tagged frames. It uses a diffusion model to generate videos, which means that it starts with a random noise image and gradually adds detail to it until it matches the text description. The ZeroScope model is still under development, but it has already been used to create some impressive videos. For example, it has been used to create videos of people dancing, playing sports, and even driving cars.\n",
+						"\n",
+						"The ZeroScope model is a powerful tool that can be used to create various videos, from simple animations to complex scenes. It is still under development, but it has the potential to revolutionize the way we create and consume video content.\n",
+						"\n",
+						"Both versions of the ZeroScope model are available on Hugging Face:\n",
+						" - [ZeroScope_v2 576w](https://huggingface.co/cerspense/zeroscope_v2_576w)\n",
+						" - [ZeroScope_v2 XL](https://huggingface.co/cerspense/zeroscope_v2_XL)\n",
+						"\n",
+						"We will use the first one."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"<div class=\"alert alert-block alert-warning\">\n",
+						"    This tutorial requires at least 24GB of free memory to generate a video with a frame size of 432x240 and 16 frames. Increasing either of these values will require more memory and take more time.\n",
+						"</div>"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Install and import required packages\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"To work with text-to-video synthesis model, we will use Hugging Face's [Diffusers](https://github.com/huggingface/diffusers) library. It provides already pretrained model from `cerspense`."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%pip install -q --extra-index-url https://download.pytorch.org/whl/cpu  \"diffusers>=0.18.0\" \"torch>=2.1\" transformers \"openvino>=2023.1.0\" numpy \"gradio>=4.19\""
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"import gc\n",
+						"from typing import Optional, Union, List, Callable\n",
+						"import base64\n",
+						"import tempfile\n",
+						"import warnings\n",
+						"\n",
+						"import diffusers\n",
+						"import transformers\n",
+						"import numpy as np\n",
+						"import IPython\n",
+						"import torch\n",
+						"import PIL\n",
+						"import gradio as gr\n",
+						"\n",
+						"import openvino as ov"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Original 576x320 inference requires a lot of RAM (>100GB), so let's run our example on a smaller frame size, keeping the same aspect ratio. Try reducing values below to reduce the memory consumption."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"WIDTH = 432  # must be divisible by 8\n",
+						"HEIGHT = 240  # must be divisible by 8\n",
+						"NUM_FRAMES = 16"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Load the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"The model is loaded from HuggingFace using `.from_pretrained` method of `diffusers.DiffusionPipeline`."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"pipe = diffusers.DiffusionPipeline.from_pretrained(\"cerspense/zeroscope_v2_576w\")"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"unet = pipe.unet\n",
+						"unet.eval()\n",
+						"vae = pipe.vae\n",
+						"vae.eval()\n",
+						"text_encoder = pipe.text_encoder\n",
+						"text_encoder.eval()\n",
+						"tokenizer = pipe.tokenizer\n",
+						"scheduler = pipe.scheduler\n",
+						"vae_scale_factor = pipe.vae_scale_factor\n",
+						"unet_in_channels = pipe.unet.config.in_channels\n",
+						"sample_width = WIDTH // vae_scale_factor\n",
+						"sample_height = HEIGHT // vae_scale_factor\n",
+						"del pipe\n",
+						"gc.collect();"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Convert the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"The architecture for generating videos from text comprises three distinct sub-networks: one for extracting text features, another for translating text features into the video latent space using a diffusion model, and a final one for mapping the video latent space to the visual space. The collective parameters of the entire model amount to approximately 1.7 billion. It's capable of processing English input. The diffusion model is built upon the Unet3D model and achieves video generation by iteratively denoising a starting point of pure Gaussian noise video."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": []
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Define the conversion function\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Model components are PyTorch modules, that can be converted with `ov.convert_model` function directly. We also use `ov.save_model` function to serialize the result of conversion."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"warnings.filterwarnings(\"ignore\", category=torch.jit.TracerWarning)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"from pathlib import Path\n",
+						"\n",
+						"\n",
+						"def convert(model: torch.nn.Module, xml_path: str, **convert_kwargs) -> Path:\n",
+						"    xml_path = Path(xml_path)\n",
+						"    if not xml_path.exists():\n",
+						"        xml_path.parent.mkdir(parents=True, exist_ok=True)\n",
+						"        with torch.no_grad():\n",
+						"            converted_model = ov.convert_model(model, **convert_kwargs)\n",
+						"        ov.save_model(converted_model, xml_path)\n",
+						"        del converted_model\n",
+						"        gc.collect()\n",
+						"        torch._C._jit_clear_class_registry()\n",
+						"        torch.jit._recursive.concrete_type_store = torch.jit._recursive.ConcreteTypeStore()\n",
+						"        torch.jit._state._clear_class_state()\n",
+						"    return xml_path"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### UNet\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Text-to-video generation pipeline main component is a conditional 3D UNet model that takes a noisy sample, conditional state, and a timestep and returns a sample shaped output."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"unet_xml_path = convert(\n",
+						"    unet,\n",
+						"    \"models/unet.xml\",\n",
+						"    example_input={\n",
+						"        \"sample\": torch.randn(2, 4, 2, int(sample_height // 2), int(sample_width // 2)),\n",
+						"        \"timestep\": torch.tensor(1),\n",
+						"        \"encoder_hidden_states\": torch.randn(2, 77, 1024),\n",
+						"    },\n",
+						"    input=[\n",
+						"        (\"sample\", (2, 4, NUM_FRAMES, sample_height, sample_width)),\n",
+						"        (\"timestep\", ()),\n",
+						"        (\"encoder_hidden_states\", (2, 77, 1024)),\n",
+						"    ],\n",
+						")\n",
+						"del unet\n",
+						"gc.collect();"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### VAE\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Variational autoencoder (VAE) uses UNet output to decode latents to visual representations. Our VAE model has KL loss for encoding images into latents and decoding latent representations into images. For inference, we need only decoder part."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"class VaeDecoderWrapper(torch.nn.Module):\n",
+						"    def __init__(self, vae):\n",
+						"        super().__init__()\n",
+						"        self.vae = vae\n",
+						"\n",
+						"    def forward(self, z: torch.FloatTensor):\n",
+						"        return self.vae.decode(z)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"vae_decoder_xml_path = convert(\n",
+						"    VaeDecoderWrapper(vae),\n",
+						"    \"models/vae.xml\",\n",
+						"    example_input=torch.randn(2, 4, 32, 32),\n",
+						"    input=((NUM_FRAMES, 4, sample_height, sample_width)),\n",
+						")\n",
+						"del vae\n",
+						"gc.collect();"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Text encoder\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Text encoder is used to encode the input prompt to tensor. Default tensor length is 77."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"text_encoder_xml = convert(\n",
+						"    text_encoder,\n",
+						"    \"models/text_encoder.xml\",\n",
+						"    example_input=torch.ones(1, 77, dtype=torch.int64),\n",
+						"    input=((1, 77), ov.Type.i64),\n",
+						")\n",
+						"del text_encoder\n",
+						"gc.collect();"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Build a pipeline\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"def tensor2vid(video: torch.Tensor, mean=[0.5, 0.5, 0.5], std=[0.5, 0.5, 0.5]) -> List[np.ndarray]:\n",
+						"    # This code is copied from https://github.com/modelscope/modelscope/blob/1509fdb973e5871f37148a4b5e5964cafd43e64d/modelscope/pipelines/multi_modal/text_to_video_synthesis_pipeline.py#L78\n",
+						"    # reshape to ncfhw\n",
+						"    mean = torch.tensor(mean, device=video.device).reshape(1, -1, 1, 1, 1)\n",
+						"    std = torch.tensor(std, device=video.device).reshape(1, -1, 1, 1, 1)\n",
+						"    # unnormalize back to [0,1]\n",
+						"    video = video.mul_(std).add_(mean)\n",
+						"    video.clamp_(0, 1)\n",
+						"    # prepare the final outputs\n",
+						"    i, c, f, h, w = video.shape\n",
+						"    images = video.permute(2, 3, 0, 4, 1).reshape(f, h, i * w, c)  # 1st (frames, h, batch_size, w, c) 2nd (frames, h, batch_size * w, c)\n",
+						"    images = images.unbind(dim=0)  # prepare a list of indvidual (consecutive frames)\n",
+						"    images = [(image.cpu().numpy() * 255).astype(\"uint8\") for image in images]  # f h w c\n",
+						"    return images"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"try:\n",
+						"    from diffusers.utils import randn_tensor\n",
+						"except ImportError:\n",
+						"    from diffusers.utils.torch_utils import randn_tensor\n",
+						"\n",
+						"\n",
+						"class OVTextToVideoSDPipeline(diffusers.DiffusionPipeline):\n",
+						"    def __init__(\n",
+						"        self,\n",
+						"        vae_decoder: ov.CompiledModel,\n",
+						"        text_encoder: ov.CompiledModel,\n",
+						"        tokenizer: transformers.CLIPTokenizer,\n",
+						"        unet: ov.CompiledModel,\n",
+						"        scheduler: diffusers.schedulers.DDIMScheduler,\n",
+						"    ):\n",
+						"        super().__init__()\n",
+						"\n",
+						"        self.vae_decoder = vae_decoder\n",
+						"        self.text_encoder = text_encoder\n",
+						"        self.tokenizer = tokenizer\n",
+						"        self.unet = unet\n",
+						"        self.scheduler = scheduler\n",
+						"        self.vae_scale_factor = vae_scale_factor\n",
+						"        self.unet_in_channels = unet_in_channels\n",
+						"        self.width = WIDTH\n",
+						"        self.height = HEIGHT\n",
+						"        self.num_frames = NUM_FRAMES\n",
+						"\n",
+						"    def __call__(\n",
+						"        self,\n",
+						"        prompt: Union[str, List[str]] = None,\n",
+						"        num_inference_steps: int = 50,\n",
+						"        guidance_scale: float = 9.0,\n",
+						"        negative_prompt: Optional[Union[str, List[str]]] = None,\n",
+						"        eta: float = 0.0,\n",
+						"        generator: Optional[Union[torch.Generator, List[torch.Generator]]] = None,\n",
+						"        latents: Optional[torch.FloatTensor] = None,\n",
+						"        prompt_embeds: Optional[torch.FloatTensor] = None,\n",
+						"        negative_prompt_embeds: Optional[torch.FloatTensor] = None,\n",
+						"        output_type: Optional[str] = \"np\",\n",
+						"        return_dict: bool = True,\n",
+						"        callback: Optional[Callable[[int, int, torch.FloatTensor], None]] = None,\n",
+						"        callback_steps: int = 1,\n",
+						"    ):\n",
+						"        r\"\"\"\n",
+						"        Function invoked when calling the pipeline for generation.\n",
+						"\n",
+						"        Args:\n",
+						"            prompt (`str` or `List[str]`, *optional*):\n",
+						"                The prompt or prompts to guide the video generation. If not defined, one has to pass `prompt_embeds`.\n",
+						"                instead.\n",
+						"            num_inference_steps (`int`, *optional*, defaults to 50):\n",
+						"                The number of denoising steps. More denoising steps usually lead to a higher quality videos at the\n",
+						"                expense of slower inference.\n",
+						"            guidance_scale (`float`, *optional*, defaults to 7.5):\n",
+						"                Guidance scale as defined in [Classifier-Free Diffusion Guidance](https://arxiv.org/abs/2207.12598).\n",
+						"                `guidance_scale` is defined as `w` of equation 2. of [Imagen\n",
+						"                Paper](https://arxiv.org/pdf/2205.11487.pdf). Guidance scale is enabled by setting `guidance_scale >\n",
+						"                1`. Higher guidance scale encourages to generate videos that are closely linked to the text `prompt`,\n",
+						"                usually at the expense of lower video quality.\n",
+						"            negative_prompt (`str` or `List[str]`, *optional*):\n",
+						"                The prompt or prompts not to guide the video generation. If not defined, one has to pass\n",
+						"                `negative_prompt_embeds` instead. Ignored when not using guidance (i.e., ignored if `guidance_scale` is\n",
+						"                less than `1`).\n",
+						"            eta (`float`, *optional*, defaults to 0.0):\n",
+						"                Corresponds to parameter eta (η) in the DDIM paper: https://arxiv.org/abs/2010.02502. Only applies to\n",
+						"                [`schedulers.DDIMScheduler`], will be ignored for others.\n",
+						"            generator (`torch.Generator` or `List[torch.Generator]`, *optional*):\n",
+						"                One or a list of [torch generator(s)](https://pytorch.org/docs/stable/generated/torch.Generator.html)\n",
+						"                to make generation deterministic.\n",
+						"            latents (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated noisy latents, sampled from a Gaussian distribution, to be used as inputs for video\n",
+						"                generation. Can be used to tweak the same generation with different prompts. If not provided, a latents\n",
+						"                tensor will ge generated by sampling using the supplied random `generator`. Latents should be of shape\n",
+						"                `(batch_size, num_channel, num_frames, height, width)`.\n",
+						"            prompt_embeds (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt weighting. If not\n",
+						"                provided, text embeddings will be generated from `prompt` input argument.\n",
+						"            negative_prompt_embeds (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated negative text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt\n",
+						"                weighting. If not provided, negative_prompt_embeds will be generated from `negative_prompt` input\n",
+						"                argument.\n",
+						"            output_type (`str`, *optional*, defaults to `\"np\"`):\n",
+						"                The output format of the generate video. Choose between `torch.FloatTensor` or `np.array`.\n",
+						"            return_dict (`bool`, *optional*, defaults to `True`):\n",
+						"                Whether or not to return a [`~pipelines.stable_diffusion.TextToVideoSDPipelineOutput`] instead of a\n",
+						"                plain tuple.\n",
+						"            callback (`Callable`, *optional*):\n",
+						"                A function that will be called every `callback_steps` steps during inference. The function will be\n",
+						"                called with the following arguments: `callback(step: int, timestep: int, latents: torch.FloatTensor)`.\n",
+						"            callback_steps (`int`, *optional*, defaults to 1):\n",
+						"                The frequency at which the `callback` function will be called. If not specified, the callback will be\n",
+						"                called at every step.\n",
+						"\n",
+						"        Returns:\n",
+						"            `List[np.ndarray]`: generated video frames\n",
+						"        \"\"\"\n",
+						"\n",
+						"        num_images_per_prompt = 1\n",
+						"\n",
+						"        # 1. Check inputs. Raise error if not correct\n",
+						"        self.check_inputs(\n",
+						"            prompt,\n",
+						"            callback_steps,\n",
+						"            negative_prompt,\n",
+						"            prompt_embeds,\n",
+						"            negative_prompt_embeds,\n",
+						"        )\n",
+						"\n",
+						"        # 2. Define call parameters\n",
+						"        if prompt is not None and isinstance(prompt, str):\n",
+						"            batch_size = 1\n",
+						"        elif prompt is not None and isinstance(prompt, list):\n",
+						"            batch_size = len(prompt)\n",
+						"        else:\n",
+						"            batch_size = prompt_embeds.shape[0]\n",
+						"\n",
+						"        # here `guidance_scale` is defined analog to the guidance weight `w` of equation (2)\n",
+						"        # of the Imagen paper: https://arxiv.org/pdf/2205.11487.pdf . `guidance_scale = 1`\n",
+						"        # corresponds to doing no classifier free guidance.\n",
+						"        do_classifier_free_guidance = guidance_scale > 1.0\n",
+						"\n",
+						"        # 3. Encode input prompt\n",
+						"        prompt_embeds = self._encode_prompt(\n",
+						"            prompt,\n",
+						"            num_images_per_prompt,\n",
+						"            do_classifier_free_guidance,\n",
+						"            negative_prompt,\n",
+						"            prompt_embeds=prompt_embeds,\n",
+						"            negative_prompt_embeds=negative_prompt_embeds,\n",
+						"        )\n",
+						"\n",
+						"        # 4. Prepare timesteps\n",
+						"        self.scheduler.set_timesteps(num_inference_steps)\n",
+						"        timesteps = self.scheduler.timesteps\n",
+						"\n",
+						"        # 5. Prepare latent variables\n",
+						"        num_channels_latents = self.unet_in_channels\n",
+						"        latents = self.prepare_latents(\n",
+						"            batch_size * num_images_per_prompt,\n",
+						"            num_channels_latents,\n",
+						"            prompt_embeds.dtype,\n",
+						"            generator,\n",
+						"            latents,\n",
+						"        )\n",
+						"\n",
+						"        # 6. Prepare extra step kwargs. TODO: Logic should ideally just be moved out of the pipeline\n",
+						"        extra_step_kwargs = {\"generator\": generator, \"eta\": eta}\n",
+						"\n",
+						"        # 7. Denoising loop\n",
+						"        num_warmup_steps = len(timesteps) - num_inference_steps * self.scheduler.order\n",
+						"        with self.progress_bar(total=num_inference_steps) as progress_bar:\n",
+						"            for i, t in enumerate(timesteps):\n",
+						"                # expand the latents if we are doing classifier free guidance\n",
+						"                latent_model_input = torch.cat([latents] * 2) if do_classifier_free_guidance else latents\n",
+						"                latent_model_input = self.scheduler.scale_model_input(latent_model_input, t)\n",
+						"\n",
+						"                # predict the noise residual\n",
+						"                noise_pred = self.unet(\n",
+						"                    {\n",
+						"                        \"sample\": latent_model_input,\n",
+						"                        \"timestep\": t,\n",
+						"                        \"encoder_hidden_states\": prompt_embeds,\n",
+						"                    }\n",
+						"                )[0]\n",
+						"                noise_pred = torch.tensor(noise_pred)\n",
+						"\n",
+						"                # perform guidance\n",
+						"                if do_classifier_free_guidance:\n",
+						"                    noise_pred_uncond, noise_pred_text = noise_pred.chunk(2)\n",
+						"                    noise_pred = noise_pred_uncond + guidance_scale * (noise_pred_text - noise_pred_uncond)\n",
+						"\n",
+						"                # reshape latents\n",
+						"                bsz, channel, frames, width, height = latents.shape\n",
+						"                latents = latents.permute(0, 2, 1, 3, 4).reshape(bsz * frames, channel, width, height)\n",
+						"                noise_pred = noise_pred.permute(0, 2, 1, 3, 4).reshape(bsz * frames, channel, width, height)\n",
+						"\n",
+						"                # compute the previous noisy sample x_t -> x_t-1\n",
+						"                latents = self.scheduler.step(noise_pred, t, latents, **extra_step_kwargs).prev_sample\n",
+						"\n",
+						"                # reshape latents back\n",
+						"                latents = latents[None, :].reshape(bsz, frames, channel, width, height).permute(0, 2, 1, 3, 4)\n",
+						"\n",
+						"                # call the callback, if provided\n",
+						"                if i == len(timesteps) - 1 or ((i + 1) > num_warmup_steps and (i + 1) % self.scheduler.order == 0):\n",
+						"                    progress_bar.update()\n",
+						"                    if callback is not None and i % callback_steps == 0:\n",
+						"                        callback(i, t, latents)\n",
+						"\n",
+						"        video_tensor = self.decode_latents(latents)\n",
+						"\n",
+						"        if output_type == \"pt\":\n",
+						"            video = video_tensor\n",
+						"        else:\n",
+						"            video = tensor2vid(video_tensor)\n",
+						"\n",
+						"        if not return_dict:\n",
+						"            return (video,)\n",
+						"\n",
+						"        return {\"frames\": video}\n",
+						"\n",
+						"    # Copied from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion.StableDiffusionPipeline._encode_prompt\n",
+						"    def _encode_prompt(\n",
+						"        self,\n",
+						"        prompt,\n",
+						"        num_images_per_prompt,\n",
+						"        do_classifier_free_guidance,\n",
+						"        negative_prompt=None,\n",
+						"        prompt_embeds: Optional[torch.FloatTensor] = None,\n",
+						"        negative_prompt_embeds: Optional[torch.FloatTensor] = None,\n",
+						"    ):\n",
+						"        r\"\"\"\n",
+						"        Encodes the prompt into text encoder hidden states.\n",
+						"\n",
+						"        Args:\n",
+						"             prompt (`str` or `List[str]`, *optional*):\n",
+						"                prompt to be encoded\n",
+						"            num_images_per_prompt (`int`):\n",
+						"                number of images that should be generated per prompt\n",
+						"            do_classifier_free_guidance (`bool`):\n",
+						"                whether to use classifier free guidance or not\n",
+						"            negative_prompt (`str` or `List[str]`, *optional*):\n",
+						"                The prompt or prompts not to guide the image generation. If not defined, one has to pass\n",
+						"                `negative_prompt_embeds` instead. Ignored when not using guidance (i.e., ignored if `guidance_scale` is\n",
+						"                less than `1`).\n",
+						"            prompt_embeds (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt weighting. If not\n",
+						"                provided, text embeddings will be generated from `prompt` input argument.\n",
+						"            negative_prompt_embeds (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated negative text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt\n",
+						"                weighting. If not provided, negative_prompt_embeds will be generated from `negative_prompt` input\n",
+						"                argument.\n",
+						"        \"\"\"\n",
+						"        if prompt is not None and isinstance(prompt, str):\n",
+						"            batch_size = 1\n",
+						"        elif prompt is not None and isinstance(prompt, list):\n",
+						"            batch_size = len(prompt)\n",
+						"        else:\n",
+						"            batch_size = prompt_embeds.shape[0]\n",
+						"\n",
+						"        if prompt_embeds is None:\n",
+						"            text_inputs = self.tokenizer(\n",
+						"                prompt,\n",
+						"                padding=\"max_length\",\n",
+						"                max_length=self.tokenizer.model_max_length,\n",
+						"                truncation=True,\n",
+						"                return_tensors=\"pt\",\n",
+						"            )\n",
+						"            text_input_ids = text_inputs.input_ids\n",
+						"            untruncated_ids = self.tokenizer(prompt, padding=\"longest\", return_tensors=\"pt\").input_ids\n",
+						"\n",
+						"            if untruncated_ids.shape[-1] >= text_input_ids.shape[-1] and not torch.equal(text_input_ids, untruncated_ids):\n",
+						"                removed_text = self.tokenizer.batch_decode(untruncated_ids[:, self.tokenizer.model_max_length - 1 : -1])\n",
+						"                print(\n",
+						"                    \"The following part of your input was truncated because CLIP can only handle sequences up to\"\n",
+						"                    f\" {self.tokenizer.model_max_length} tokens: {removed_text}\"\n",
+						"                )\n",
+						"\n",
+						"            prompt_embeds = self.text_encoder(text_input_ids)\n",
+						"            prompt_embeds = prompt_embeds[0]\n",
+						"            prompt_embeds = torch.tensor(prompt_embeds)\n",
+						"\n",
+						"        bs_embed, seq_len, _ = prompt_embeds.shape\n",
+						"        # duplicate text embeddings for each generation per prompt, using mps friendly method\n",
+						"        prompt_embeds = prompt_embeds.repeat(1, num_images_per_prompt, 1)\n",
+						"        prompt_embeds = prompt_embeds.view(bs_embed * num_images_per_prompt, seq_len, -1)\n",
+						"\n",
+						"        # get unconditional embeddings for classifier free guidance\n",
+						"        if do_classifier_free_guidance and negative_prompt_embeds is None:\n",
+						"            uncond_tokens: List[str]\n",
+						"            if negative_prompt is None:\n",
+						"                uncond_tokens = [\"\"] * batch_size\n",
+						"            elif type(prompt) is not type(negative_prompt):\n",
+						"                raise TypeError(f\"`negative_prompt` should be the same type to `prompt`, but got {type(negative_prompt)} !=\" f\" {type(prompt)}.\")\n",
+						"            elif isinstance(negative_prompt, str):\n",
+						"                uncond_tokens = [negative_prompt]\n",
+						"            elif batch_size != len(negative_prompt):\n",
+						"                raise ValueError(\n",
+						"                    f\"`negative_prompt`: {negative_prompt} has batch size {len(negative_prompt)}, but `prompt`:\"\n",
+						"                    f\" {prompt} has batch size {batch_size}. Please make sure that passed `negative_prompt` matches\"\n",
+						"                    \" the batch size of `prompt`.\"\n",
+						"                )\n",
+						"            else:\n",
+						"                uncond_tokens = negative_prompt\n",
+						"\n",
+						"            max_length = prompt_embeds.shape[1]\n",
+						"            uncond_input = self.tokenizer(\n",
+						"                uncond_tokens,\n",
+						"                padding=\"max_length\",\n",
+						"                max_length=max_length,\n",
+						"                truncation=True,\n",
+						"                return_tensors=\"pt\",\n",
+						"            )\n",
+						"\n",
+						"            negative_prompt_embeds = self.text_encoder(uncond_input.input_ids)\n",
+						"            negative_prompt_embeds = negative_prompt_embeds[0]\n",
+						"            negative_prompt_embeds = torch.tensor(negative_prompt_embeds)\n",
+						"\n",
+						"        if do_classifier_free_guidance:\n",
+						"            # duplicate unconditional embeddings for each generation per prompt, using mps friendly method\n",
+						"            seq_len = negative_prompt_embeds.shape[1]\n",
+						"\n",
+						"            negative_prompt_embeds = negative_prompt_embeds.repeat(1, num_images_per_prompt, 1)\n",
+						"            negative_prompt_embeds = negative_prompt_embeds.view(batch_size * num_images_per_prompt, seq_len, -1)\n",
+						"\n",
+						"            # For classifier free guidance, we need to do two forward passes.\n",
+						"            # Here we concatenate the unconditional and text embeddings into a single batch\n",
+						"            # to avoid doing two forward passes\n",
+						"            prompt_embeds = torch.cat([negative_prompt_embeds, prompt_embeds])\n",
+						"\n",
+						"        return prompt_embeds\n",
+						"\n",
+						"    def prepare_latents(\n",
+						"        self,\n",
+						"        batch_size,\n",
+						"        num_channels_latents,\n",
+						"        dtype,\n",
+						"        generator,\n",
+						"        latents=None,\n",
+						"    ):\n",
+						"        shape = (\n",
+						"            batch_size,\n",
+						"            num_channels_latents,\n",
+						"            self.num_frames,\n",
+						"            self.height // self.vae_scale_factor,\n",
+						"            self.width // self.vae_scale_factor,\n",
+						"        )\n",
+						"        if isinstance(generator, list) and len(generator) != batch_size:\n",
+						"            raise ValueError(\n",
+						"                f\"You have passed a list of generators of length {len(generator)}, but requested an effective batch\"\n",
+						"                f\" size of {batch_size}. Make sure the batch size matches the length of the generators.\"\n",
+						"            )\n",
+						"\n",
+						"        if latents is None:\n",
+						"            latents = randn_tensor(shape, generator=generator, dtype=dtype)\n",
+						"\n",
+						"        # scale the initial noise by the standard deviation required by the scheduler\n",
+						"        latents = latents * self.scheduler.init_noise_sigma\n",
+						"        return latents\n",
+						"\n",
+						"    def check_inputs(\n",
+						"        self,\n",
+						"        prompt,\n",
+						"        callback_steps,\n",
+						"        negative_prompt=None,\n",
+						"        prompt_embeds=None,\n",
+						"        negative_prompt_embeds=None,\n",
+						"    ):\n",
+						"        if self.height % 8 != 0 or self.width % 8 != 0:\n",
+						"            raise ValueError(f\"`height` and `width` have to be divisible by 8 but are {self.height} and {self.width}.\")\n",
+						"\n",
+						"        if (callback_steps is None) or (callback_steps is not None and (not isinstance(callback_steps, int) or callback_steps <= 0)):\n",
+						"            raise ValueError(f\"`callback_steps` has to be a positive integer but is {callback_steps} of type\" f\" {type(callback_steps)}.\")\n",
+						"\n",
+						"        if prompt is not None and prompt_embeds is not None:\n",
+						"            raise ValueError(\n",
+						"                f\"Cannot forward both `prompt`: {prompt} and `prompt_embeds`: {prompt_embeds}. Please make sure to\" \" only forward one of the two.\"\n",
+						"            )\n",
+						"        elif prompt is None and prompt_embeds is None:\n",
+						"            raise ValueError(\"Provide either `prompt` or `prompt_embeds`. Cannot leave both `prompt` and `prompt_embeds` undefined.\")\n",
+						"        elif prompt is not None and (not isinstance(prompt, str) and not isinstance(prompt, list)):\n",
+						"            raise ValueError(f\"`prompt` has to be of type `str` or `list` but is {type(prompt)}\")\n",
+						"\n",
+						"        if negative_prompt is not None and negative_prompt_embeds is not None:\n",
+						"            raise ValueError(\n",
+						"                f\"Cannot forward both `negative_prompt`: {negative_prompt} and `negative_prompt_embeds`:\"\n",
+						"                f\" {negative_prompt_embeds}. Please make sure to only forward one of the two.\"\n",
+						"            )\n",
+						"\n",
+						"        if prompt_embeds is not None and negative_prompt_embeds is not None:\n",
+						"            if prompt_embeds.shape != negative_prompt_embeds.shape:\n",
+						"                raise ValueError(\n",
+						"                    \"`prompt_embeds` and `negative_prompt_embeds` must have the same shape when passed directly, but\"\n",
+						"                    f\" got: `prompt_embeds` {prompt_embeds.shape} != `negative_prompt_embeds`\"\n",
+						"                    f\" {negative_prompt_embeds.shape}.\"\n",
+						"                )\n",
+						"\n",
+						"    def decode_latents(self, latents):\n",
+						"        scale_factor = 0.18215\n",
+						"        latents = 1 / scale_factor * latents\n",
+						"\n",
+						"        batch_size, channels, num_frames, height, width = latents.shape\n",
+						"        latents = latents.permute(0, 2, 1, 3, 4).reshape(batch_size * num_frames, channels, height, width)\n",
+						"        image = self.vae_decoder(latents)[0]\n",
+						"        image = torch.tensor(image)\n",
+						"        video = (\n",
+						"            image[None, :]\n",
+						"            .reshape(\n",
+						"                (\n",
+						"                    batch_size,\n",
+						"                    num_frames,\n",
+						"                    -1,\n",
+						"                )\n",
+						"                + image.shape[2:]\n",
+						"            )\n",
+						"            .permute(0, 2, 1, 3, 4)\n",
+						"        )\n",
+						"        # we always cast to float32 as this does not cause significant overhead and is compatible with bfloat16\n",
+						"        video = video.float()\n",
+						"        return video"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Inference with OpenVINO\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"core = ov.Core()"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Select inference device\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"select device from dropdown list for running inference using OpenVINO"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"import requests\n",
+						"\n",
+						"r = requests.get(\n",
+						"    url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/notebook_utils.py\",\n",
+						")\n",
+						"open(\"notebook_utils.py\", \"w\").write(r.text)\n",
+						"\n",
+						"from notebook_utils import device_widget\n",
+						"\n",
+						"device = device_widget()\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%%time\n",
+						"ov_unet = core.compile_model(unet_xml_path, device_name=device.value)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%%time\n",
+						"ov_vae_decoder = core.compile_model(vae_decoder_xml_path, device_name=device.value)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%%time\n",
+						"ov_text_encoder = core.compile_model(text_encoder_xml, device_name=device.value)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Here we replace the pipeline parts with versions converted to OpenVINO IR and compiled to specific device. Note that we use original pipeline tokenizer and scheduler."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"ov_pipe = OVTextToVideoSDPipeline(ov_vae_decoder, ov_text_encoder, tokenizer, ov_unet, scheduler)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Define a prompt\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"prompt = \"A panda eating bamboo on a rock.\""
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Let's generate a video for our prompt. For full list of arguments, see `__call__` function definition of `OVTextToVideoSDPipeline` class in [Build a pipeline](#Build-a-pipeline) section."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Video generation\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"frames = ov_pipe(prompt, num_inference_steps=25)[\"frames\"]"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"images = [PIL.Image.fromarray(frame) for frame in frames]\n",
+						"images[0].save(\"output.gif\", save_all=True, append_images=images[1:], duration=125, loop=0)\n",
+						"with open(\"output.gif\", \"rb\") as gif_file:\n",
+						"    b64 = f\"data:image/gif;base64,{base64.b64encode(gif_file.read()).decode()}\"\n",
+						"IPython.display.HTML(f'<img src=\"{b64}\" />')"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Interactive demo\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"test_replace": {
+							"    demo.queue().launch(debug=True)": "    demo.queue.launch()",
+							"    demo.queue().launch(share=True, debug=True)": "    demo.queue().launch(share=True)"
+						}
+					},
+					"source": [
+						"def generate(prompt, seed, num_inference_steps, _=gr.Progress(track_tqdm=True)):\n",
+						"    generator = torch.Generator().manual_seed(seed)\n",
+						"    frames = ov_pipe(\n",
+						"        prompt,\n",
+						"        num_inference_steps=num_inference_steps,\n",
+						"        generator=generator,\n",
+						"    )[\"frames\"]\n",
+						"    out_file = tempfile.NamedTemporaryFile(suffix=\".gif\", delete=False)\n",
+						"    images = [PIL.Image.fromarray(frame) for frame in frames]\n",
+						"    images[0].save(out_file, save_all=True, append_images=images[1:], duration=125, loop=0)\n",
+						"    return out_file.name"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"outputs": [],
+					"source": [
+						"if not Path(\"gradio_helper.py\").exists():\n",
+						"    r = requests.get(url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/notebooks/zeroscope-text2video/gradio_helper.py\")\n",
+						"    open(\"gradio_helper.py\", \"w\").write(r.text)\n",
+						"\n",
+						"from gradio_helper import make_demo\n",
+						"\n",
+						"demo = make_demo(fn=generate)\n",
+						"\n",
+						"try:\n",
+						"    demo.queue().launch(debug=True)\n",
+						"except Exception:\n",
+						"    demo.queue().launch(share=True, debug=True)\n",
+						"# If you are launching remotely, specify server_name and server_port\n",
+						"# EXAMPLE: `demo.launch(server_name='your server name', server_port='server port in int')`\n",
+						"# To learn more please refer to the Gradio docs: https://gradio.app/docs/"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"# please uncomment and run this cell for stopping gradio interface\n",
+						"# demo.close()"
+					]
+				}
+			].map(fromJupyterCell)
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: 4 },
+			{ modified: 5, original: 5 },
+			{ modified: 6, original: 6 },
+			{ modified: 7, original: 7 },
+			{ modified: 8, original: 8 },
+			{ modified: 9, original: 9 },
+			{ modified: 10, original: 10 },
+			{ modified: 11, original: 11 },
+			{ modified: 12, original: 12 },
+			{ modified: 13, original: 13 },
+			{ modified: 14, original: 14 },
+			{ modified: 15, original: 15 },
+			{ modified: 16, original: 16 },
+			{ modified: 17, original: 17 },
+			{ modified: 18, original: 18 },
+			{ modified: 19, original: 19 },
+			{ modified: 20, original: 20 },
+			{ modified: 21, original: 21 },
+			{ modified: 22, original: 22 },
+			{ modified: 23, original: 23 },
+			{ modified: 24, original: 24 },
+			{ modified: 25, original: 25 },
+			{ modified: 26, original: 26 },
+			{ modified: 27, original: 27 },
+			{ modified: 28, original: 28 },
+			{ modified: 29, original: 29 },
+			{ modified: 30, original: 30 },
+			{ modified: 31, original: 31 },
+			{ modified: 32, original: 32 },
+			{ modified: 33, original: 33 },
+			{ modified: 34, original: 34 },
+			{ modified: 35, original: 35 },
+			{ modified: 36, original: 36 },
+			{ modified: 37, original: 37 },
+			{ modified: 38, original: 38 },
+			{ modified: 39, original: 39 },
+			{ modified: 40, original: 40 },
+			{ modified: 41, original: 41 },
+			{ modified: 42, original: 42 },
+			{ modified: 43, original: 43 },
+			{ modified: 44, original: 44 },
+			{ modified: 45, original: 45 },
+			{ modified: 46, original: 46 },
+			{ modified: 47, original: 47 },
+			{ modified: 48, original: 48 },
+			{ modified: 49, original: 49 },
+			{ modified: 50, original: -1 },
+			{ modified: 51, original: -1 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 49, originalLength: 1, modifiedStart: 49, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 50, originalLength: 0, modifiedStart: 50, modifiedLength: 2 } satisfies IDiffChange,
+		]);
+	});
+	test('Modification of three cells', async () => {
+		const { mapping, diff } = await mapCells(
+			[
+				{
+					"cell_type": "markdown",
+					"source": [
+						"# Video generation with ZeroScope and OpenVINO\n",
+						"\n",
+						"#### Table of contents:\n",
+						"\n",
+						"- [Install and import required packages](#Install-and-import-required-packages)\n",
+						"- [Load the model](#Load-the-model)\n",
+						"- [Convert the model](#Convert-the-model)\n",
+						"    - [Define the conversion function](#Define-the-conversion-function)\n",
+						"    - [UNet](#UNet)\n",
+						"    - [VAE](#VAE)\n",
+						"    - [Text encoder](#Text-encoder)\n",
+						"- [Build a pipeline](#Build-a-pipeline)\n",
+						"- [Inference with OpenVINO](#Inference-with-OpenVINO)\n",
+						"    - [Select inference device](#Select-inference-device)\n",
+						"    - [Define a prompt](#Define-a-prompt)\n",
+						"    - [Video generation](#Video-generation)\n",
+						"- [Interactive demo](#Interactive-demo)\n",
+						"\n",
+						"\n",
+						"### Installation Instructions\n",
+						"\n",
+						"This is a self-contained example that relies solely on its own code.\n",
+						"\n",
+						"We recommend  running the notebook in a virtual environment. You only need a Jupyter server to start.\n",
+						"For details, please refer to [Installation Guide](https://github.com/openvinotoolkit/openvino_notebooks/blob/latest/README.md#-installation-guide).\n",
+						"\n",
+						"<img referrerpolicy=\"no-referrer-when-downgrade\" src=\"https://static.scarf.sh/a.png?x-pxid=5b5a4db0-7875-4bfb-bdbd-01698b5b1a77&file=notebooks/zeroscope-text2video/zeroscope-text2video.ipynb\" />\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"The ZeroScope model is a free and open-source text-to-video model that can generate realistic and engaging videos from text descriptions. It is based on the [Modelscope](https://modelscope.cn/models/damo/text-to-video-synthesis/summary) model, but it has been improved to produce higher-quality videos with a 16:9 aspect ratio and no Shutterstock watermark. The ZeroScope model is available in two versions: ZeroScope_v2 576w, which is optimized for rapid content creation at a resolution of 576x320 pixels, and ZeroScope_v2 XL, which upscales videos to a high-definition resolution of 1024x576.\n",
+						"\n",
+						"The ZeroScope model is trained on a dataset of over 9,000 videos and 29,000 tagged frames. It uses a diffusion model to generate videos, which means that it starts with a random noise image and gradually adds detail to it until it matches the text description. The ZeroScope model is still under development, but it has already been used to create some impressive videos. For example, it has been used to create videos of people dancing, playing sports, and even driving cars.\n",
+						"\n",
+						"The ZeroScope model is a powerful tool that can be used to create various videos, from simple animations to complex scenes. It is still under development, but it has the potential to revolutionize the way we create and consume video content.\n",
+						"\n",
+						"Both versions of the ZeroScope model are available on Hugging Face:\n",
+						" - [ZeroScope_v2 576w](https://huggingface.co/cerspense/zeroscope_v2_576w)\n",
+						" - [ZeroScope_v2 XL](https://huggingface.co/cerspense/zeroscope_v2_XL)\n",
+						"\n",
+						"We will use the first one."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"<div class=\"alert alert-block alert-warning\">\n",
+						"    This tutorial requires at least 24GB of free memory to generate a video with a frame size of 432x240 and 16 frames. Increasing either of these values will require more memory and take more time.\n",
+						"</div>"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Install and import required packages\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"To work with text-to-video synthesis model, we will use Hugging Face's [Diffusers](https://github.com/huggingface/diffusers) library. It provides already pretrained model from `cerspense`."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%pip install -q --extra-index-url https://download.pytorch.org/whl/cpu  \"diffusers>=0.18.0\" \"torch>=2.1\" transformers \"openvino>=2023.1.0\" numpy \"gradio>=4.19\""
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"import gc\n",
+						"from typing import Optional, Union, List, Callable\n",
+						"import base64\n",
+						"import tempfile\n",
+						"import warnings\n",
+						"\n",
+						"import diffusers\n",
+						"import transformers\n",
+						"import numpy as np\n",
+						"import IPython\n",
+						"import ipywidgets as widgets\n",
+						"import torch\n",
+						"import PIL\n",
+						"import gradio as gr\n",
+						"\n",
+						"import openvino as ov"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Original 576x320 inference requires a lot of RAM (>100GB), so let's run our example on a smaller frame size, keeping the same aspect ratio. Try reducing values below to reduce the memory consumption."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"WIDTH = 432  # must be divisible by 8\n",
+						"HEIGHT = 240  # must be divisible by 8\n",
+						"NUM_FRAMES = 16"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Load the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"The model is loaded from HuggingFace using `.from_pretrained` method of `diffusers.DiffusionPipeline`."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"pipe = diffusers.DiffusionPipeline.from_pretrained(\"cerspense/zeroscope_v2_576w\")"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"unet = pipe.unet\n",
+						"unet.eval()\n",
+						"vae = pipe.vae\n",
+						"vae.eval()\n",
+						"text_encoder = pipe.text_encoder\n",
+						"text_encoder.eval()\n",
+						"tokenizer = pipe.tokenizer\n",
+						"scheduler = pipe.scheduler\n",
+						"vae_scale_factor = pipe.vae_scale_factor\n",
+						"unet_in_channels = pipe.unet.config.in_channels\n",
+						"sample_width = WIDTH // vae_scale_factor\n",
+						"sample_height = HEIGHT // vae_scale_factor\n",
+						"del pipe\n",
+						"gc.collect();"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Convert the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"The architecture for generating videos from text comprises three distinct sub-networks: one for extracting text features, another for translating text features into the video latent space using a diffusion model, and a final one for mapping the video latent space to the visual space. The collective parameters of the entire model amount to approximately 1.7 billion. It's capable of processing English input. The diffusion model is built upon the Unet3D model and achieves video generation by iteratively denoising a starting point of pure Gaussian noise video."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": []
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Define the conversion function\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Model components are PyTorch modules, that can be converted with `ov.convert_model` function directly. We also use `ov.save_model` function to serialize the result of conversion."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"warnings.filterwarnings(\"ignore\", category=torch.jit.TracerWarning)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"from pathlib import Path\n",
+						"\n",
+						"\n",
+						"def convert(model: torch.nn.Module, xml_path: str, **convert_kwargs) -> Path:\n",
+						"    xml_path = Path(xml_path)\n",
+						"    if not xml_path.exists():\n",
+						"        xml_path.parent.mkdir(parents=True, exist_ok=True)\n",
+						"        with torch.no_grad():\n",
+						"            converted_model = ov.convert_model(model, **convert_kwargs)\n",
+						"        ov.save_model(converted_model, xml_path)\n",
+						"        del converted_model\n",
+						"        gc.collect()\n",
+						"        torch._C._jit_clear_class_registry()\n",
+						"        torch.jit._recursive.concrete_type_store = torch.jit._recursive.ConcreteTypeStore()\n",
+						"        torch.jit._state._clear_class_state()\n",
+						"    return xml_path"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### UNet\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Text-to-video generation pipeline main component is a conditional 3D UNet model that takes a noisy sample, conditional state, and a timestep and returns a sample shaped output."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"unet_xml_path = convert(\n",
+						"    unet,\n",
+						"    \"models/unet.xml\",\n",
+						"    example_input={\n",
+						"        \"sample\": torch.randn(2, 4, 2, int(sample_height // 2), int(sample_width // 2)),\n",
+						"        \"timestep\": torch.tensor(1),\n",
+						"        \"encoder_hidden_states\": torch.randn(2, 77, 1024),\n",
+						"    },\n",
+						"    input=[\n",
+						"        (\"sample\", (2, 4, NUM_FRAMES, sample_height, sample_width)),\n",
+						"        (\"timestep\", ()),\n",
+						"        (\"encoder_hidden_states\", (2, 77, 1024)),\n",
+						"    ],\n",
+						")\n",
+						"del unet\n",
+						"gc.collect();"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### VAE\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Variational autoencoder (VAE) uses UNet output to decode latents to visual representations. Our VAE model has KL loss for encoding images into latents and decoding latent representations into images. For inference, we need only decoder part."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"class VaeDecoderWrapper(torch.nn.Module):\n",
+						"    def __init__(self, vae):\n",
+						"        super().__init__()\n",
+						"        self.vae = vae\n",
+						"\n",
+						"    def forward(self, z: torch.FloatTensor):\n",
+						"        return self.vae.decode(z)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"vae_decoder_xml_path = convert(\n",
+						"    VaeDecoderWrapper(vae),\n",
+						"    \"models/vae.xml\",\n",
+						"    example_input=torch.randn(2, 4, 32, 32),\n",
+						"    input=((NUM_FRAMES, 4, sample_height, sample_width)),\n",
+						")\n",
+						"del vae\n",
+						"gc.collect();"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Text encoder\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Text encoder is used to encode the input prompt to tensor. Default tensor length is 77."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"text_encoder_xml = convert(\n",
+						"    text_encoder,\n",
+						"    \"models/text_encoder.xml\",\n",
+						"    example_input=torch.ones(1, 77, dtype=torch.int64),\n",
+						"    input=((1, 77), ov.Type.i64),\n",
+						")\n",
+						"del text_encoder\n",
+						"gc.collect();"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Build a pipeline\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"def tensor2vid(video: torch.Tensor, mean=[0.5, 0.5, 0.5], std=[0.5, 0.5, 0.5]) -> List[np.ndarray]:\n",
+						"    # This code is copied from https://github.com/modelscope/modelscope/blob/1509fdb973e5871f37148a4b5e5964cafd43e64d/modelscope/pipelines/multi_modal/text_to_video_synthesis_pipeline.py#L78\n",
+						"    # reshape to ncfhw\n",
+						"    mean = torch.tensor(mean, device=video.device).reshape(1, -1, 1, 1, 1)\n",
+						"    std = torch.tensor(std, device=video.device).reshape(1, -1, 1, 1, 1)\n",
+						"    # unnormalize back to [0,1]\n",
+						"    video = video.mul_(std).add_(mean)\n",
+						"    video.clamp_(0, 1)\n",
+						"    # prepare the final outputs\n",
+						"    i, c, f, h, w = video.shape\n",
+						"    images = video.permute(2, 3, 0, 4, 1).reshape(f, h, i * w, c)  # 1st (frames, h, batch_size, w, c) 2nd (frames, h, batch_size * w, c)\n",
+						"    images = images.unbind(dim=0)  # prepare a list of indvidual (consecutive frames)\n",
+						"    images = [(image.cpu().numpy() * 255).astype(\"uint8\") for image in images]  # f h w c\n",
+						"    return images"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"try:\n",
+						"    from diffusers.utils import randn_tensor\n",
+						"except ImportError:\n",
+						"    from diffusers.utils.torch_utils import randn_tensor\n",
+						"\n",
+						"\n",
+						"class OVTextToVideoSDPipeline(diffusers.DiffusionPipeline):\n",
+						"    def __init__(\n",
+						"        self,\n",
+						"        vae_decoder: ov.CompiledModel,\n",
+						"        text_encoder: ov.CompiledModel,\n",
+						"        tokenizer: transformers.CLIPTokenizer,\n",
+						"        unet: ov.CompiledModel,\n",
+						"        scheduler: diffusers.schedulers.DDIMScheduler,\n",
+						"    ):\n",
+						"        super().__init__()\n",
+						"\n",
+						"        self.vae_decoder = vae_decoder\n",
+						"        self.text_encoder = text_encoder\n",
+						"        self.tokenizer = tokenizer\n",
+						"        self.unet = unet\n",
+						"        self.scheduler = scheduler\n",
+						"        self.vae_scale_factor = vae_scale_factor\n",
+						"        self.unet_in_channels = unet_in_channels\n",
+						"        self.width = WIDTH\n",
+						"        self.height = HEIGHT\n",
+						"        self.num_frames = NUM_FRAMES\n",
+						"\n",
+						"    def __call__(\n",
+						"        self,\n",
+						"        prompt: Union[str, List[str]] = None,\n",
+						"        num_inference_steps: int = 50,\n",
+						"        guidance_scale: float = 9.0,\n",
+						"        negative_prompt: Optional[Union[str, List[str]]] = None,\n",
+						"        eta: float = 0.0,\n",
+						"        generator: Optional[Union[torch.Generator, List[torch.Generator]]] = None,\n",
+						"        latents: Optional[torch.FloatTensor] = None,\n",
+						"        prompt_embeds: Optional[torch.FloatTensor] = None,\n",
+						"        negative_prompt_embeds: Optional[torch.FloatTensor] = None,\n",
+						"        output_type: Optional[str] = \"np\",\n",
+						"        return_dict: bool = True,\n",
+						"        callback: Optional[Callable[[int, int, torch.FloatTensor], None]] = None,\n",
+						"        callback_steps: int = 1,\n",
+						"    ):\n",
+						"        r\"\"\"\n",
+						"        Function invoked when calling the pipeline for generation.\n",
+						"\n",
+						"        Args:\n",
+						"            prompt (`str` or `List[str]`, *optional*):\n",
+						"                The prompt or prompts to guide the video generation. If not defined, one has to pass `prompt_embeds`.\n",
+						"                instead.\n",
+						"            num_inference_steps (`int`, *optional*, defaults to 50):\n",
+						"                The number of denoising steps. More denoising steps usually lead to a higher quality videos at the\n",
+						"                expense of slower inference.\n",
+						"            guidance_scale (`float`, *optional*, defaults to 7.5):\n",
+						"                Guidance scale as defined in [Classifier-Free Diffusion Guidance](https://arxiv.org/abs/2207.12598).\n",
+						"                `guidance_scale` is defined as `w` of equation 2. of [Imagen\n",
+						"                Paper](https://arxiv.org/pdf/2205.11487.pdf). Guidance scale is enabled by setting `guidance_scale >\n",
+						"                1`. Higher guidance scale encourages to generate videos that are closely linked to the text `prompt`,\n",
+						"                usually at the expense of lower video quality.\n",
+						"            negative_prompt (`str` or `List[str]`, *optional*):\n",
+						"                The prompt or prompts not to guide the video generation. If not defined, one has to pass\n",
+						"                `negative_prompt_embeds` instead. Ignored when not using guidance (i.e., ignored if `guidance_scale` is\n",
+						"                less than `1`).\n",
+						"            eta (`float`, *optional*, defaults to 0.0):\n",
+						"                Corresponds to parameter eta (η) in the DDIM paper: https://arxiv.org/abs/2010.02502. Only applies to\n",
+						"                [`schedulers.DDIMScheduler`], will be ignored for others.\n",
+						"            generator (`torch.Generator` or `List[torch.Generator]`, *optional*):\n",
+						"                One or a list of [torch generator(s)](https://pytorch.org/docs/stable/generated/torch.Generator.html)\n",
+						"                to make generation deterministic.\n",
+						"            latents (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated noisy latents, sampled from a Gaussian distribution, to be used as inputs for video\n",
+						"                generation. Can be used to tweak the same generation with different prompts. If not provided, a latents\n",
+						"                tensor will ge generated by sampling using the supplied random `generator`. Latents should be of shape\n",
+						"                `(batch_size, num_channel, num_frames, height, width)`.\n",
+						"            prompt_embeds (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt weighting. If not\n",
+						"                provided, text embeddings will be generated from `prompt` input argument.\n",
+						"            negative_prompt_embeds (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated negative text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt\n",
+						"                weighting. If not provided, negative_prompt_embeds will be generated from `negative_prompt` input\n",
+						"                argument.\n",
+						"            output_type (`str`, *optional*, defaults to `\"np\"`):\n",
+						"                The output format of the generate video. Choose between `torch.FloatTensor` or `np.array`.\n",
+						"            return_dict (`bool`, *optional*, defaults to `True`):\n",
+						"                Whether or not to return a [`~pipelines.stable_diffusion.TextToVideoSDPipelineOutput`] instead of a\n",
+						"                plain tuple.\n",
+						"            callback (`Callable`, *optional*):\n",
+						"                A function that will be called every `callback_steps` steps during inference. The function will be\n",
+						"                called with the following arguments: `callback(step: int, timestep: int, latents: torch.FloatTensor)`.\n",
+						"            callback_steps (`int`, *optional*, defaults to 1):\n",
+						"                The frequency at which the `callback` function will be called. If not specified, the callback will be\n",
+						"                called at every step.\n",
+						"\n",
+						"        Returns:\n",
+						"            `List[np.ndarray]`: generated video frames\n",
+						"        \"\"\"\n",
+						"\n",
+						"        num_images_per_prompt = 1\n",
+						"\n",
+						"        # 1. Check inputs. Raise error if not correct\n",
+						"        self.check_inputs(\n",
+						"            prompt,\n",
+						"            callback_steps,\n",
+						"            negative_prompt,\n",
+						"            prompt_embeds,\n",
+						"            negative_prompt_embeds,\n",
+						"        )\n",
+						"\n",
+						"        # 2. Define call parameters\n",
+						"        if prompt is not None and isinstance(prompt, str):\n",
+						"            batch_size = 1\n",
+						"        elif prompt is not None and isinstance(prompt, list):\n",
+						"            batch_size = len(prompt)\n",
+						"        else:\n",
+						"            batch_size = prompt_embeds.shape[0]\n",
+						"\n",
+						"        # here `guidance_scale` is defined analog to the guidance weight `w` of equation (2)\n",
+						"        # of the Imagen paper: https://arxiv.org/pdf/2205.11487.pdf . `guidance_scale = 1`\n",
+						"        # corresponds to doing no classifier free guidance.\n",
+						"        do_classifier_free_guidance = guidance_scale > 1.0\n",
+						"\n",
+						"        # 3. Encode input prompt\n",
+						"        prompt_embeds = self._encode_prompt(\n",
+						"            prompt,\n",
+						"            num_images_per_prompt,\n",
+						"            do_classifier_free_guidance,\n",
+						"            negative_prompt,\n",
+						"            prompt_embeds=prompt_embeds,\n",
+						"            negative_prompt_embeds=negative_prompt_embeds,\n",
+						"        )\n",
+						"\n",
+						"        # 4. Prepare timesteps\n",
+						"        self.scheduler.set_timesteps(num_inference_steps)\n",
+						"        timesteps = self.scheduler.timesteps\n",
+						"\n",
+						"        # 5. Prepare latent variables\n",
+						"        num_channels_latents = self.unet_in_channels\n",
+						"        latents = self.prepare_latents(\n",
+						"            batch_size * num_images_per_prompt,\n",
+						"            num_channels_latents,\n",
+						"            prompt_embeds.dtype,\n",
+						"            generator,\n",
+						"            latents,\n",
+						"        )\n",
+						"\n",
+						"        # 6. Prepare extra step kwargs. TODO: Logic should ideally just be moved out of the pipeline\n",
+						"        extra_step_kwargs = {\"generator\": generator, \"eta\": eta}\n",
+						"\n",
+						"        # 7. Denoising loop\n",
+						"        num_warmup_steps = len(timesteps) - num_inference_steps * self.scheduler.order\n",
+						"        with self.progress_bar(total=num_inference_steps) as progress_bar:\n",
+						"            for i, t in enumerate(timesteps):\n",
+						"                # expand the latents if we are doing classifier free guidance\n",
+						"                latent_model_input = torch.cat([latents] * 2) if do_classifier_free_guidance else latents\n",
+						"                latent_model_input = self.scheduler.scale_model_input(latent_model_input, t)\n",
+						"\n",
+						"                # predict the noise residual\n",
+						"                noise_pred = self.unet(\n",
+						"                    {\n",
+						"                        \"sample\": latent_model_input,\n",
+						"                        \"timestep\": t,\n",
+						"                        \"encoder_hidden_states\": prompt_embeds,\n",
+						"                    }\n",
+						"                )[0]\n",
+						"                noise_pred = torch.tensor(noise_pred)\n",
+						"\n",
+						"                # perform guidance\n",
+						"                if do_classifier_free_guidance:\n",
+						"                    noise_pred_uncond, noise_pred_text = noise_pred.chunk(2)\n",
+						"                    noise_pred = noise_pred_uncond + guidance_scale * (noise_pred_text - noise_pred_uncond)\n",
+						"\n",
+						"                # reshape latents\n",
+						"                bsz, channel, frames, width, height = latents.shape\n",
+						"                latents = latents.permute(0, 2, 1, 3, 4).reshape(bsz * frames, channel, width, height)\n",
+						"                noise_pred = noise_pred.permute(0, 2, 1, 3, 4).reshape(bsz * frames, channel, width, height)\n",
+						"\n",
+						"                # compute the previous noisy sample x_t -> x_t-1\n",
+						"                latents = self.scheduler.step(noise_pred, t, latents, **extra_step_kwargs).prev_sample\n",
+						"\n",
+						"                # reshape latents back\n",
+						"                latents = latents[None, :].reshape(bsz, frames, channel, width, height).permute(0, 2, 1, 3, 4)\n",
+						"\n",
+						"                # call the callback, if provided\n",
+						"                if i == len(timesteps) - 1 or ((i + 1) > num_warmup_steps and (i + 1) % self.scheduler.order == 0):\n",
+						"                    progress_bar.update()\n",
+						"                    if callback is not None and i % callback_steps == 0:\n",
+						"                        callback(i, t, latents)\n",
+						"\n",
+						"        video_tensor = self.decode_latents(latents)\n",
+						"\n",
+						"        if output_type == \"pt\":\n",
+						"            video = video_tensor\n",
+						"        else:\n",
+						"            video = tensor2vid(video_tensor)\n",
+						"\n",
+						"        if not return_dict:\n",
+						"            return (video,)\n",
+						"\n",
+						"        return {\"frames\": video}\n",
+						"\n",
+						"    # Copied from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion.StableDiffusionPipeline._encode_prompt\n",
+						"    def _encode_prompt(\n",
+						"        self,\n",
+						"        prompt,\n",
+						"        num_images_per_prompt,\n",
+						"        do_classifier_free_guidance,\n",
+						"        negative_prompt=None,\n",
+						"        prompt_embeds: Optional[torch.FloatTensor] = None,\n",
+						"        negative_prompt_embeds: Optional[torch.FloatTensor] = None,\n",
+						"    ):\n",
+						"        r\"\"\"\n",
+						"        Encodes the prompt into text encoder hidden states.\n",
+						"\n",
+						"        Args:\n",
+						"             prompt (`str` or `List[str]`, *optional*):\n",
+						"                prompt to be encoded\n",
+						"            num_images_per_prompt (`int`):\n",
+						"                number of images that should be generated per prompt\n",
+						"            do_classifier_free_guidance (`bool`):\n",
+						"                whether to use classifier free guidance or not\n",
+						"            negative_prompt (`str` or `List[str]`, *optional*):\n",
+						"                The prompt or prompts not to guide the image generation. If not defined, one has to pass\n",
+						"                `negative_prompt_embeds` instead. Ignored when not using guidance (i.e., ignored if `guidance_scale` is\n",
+						"                less than `1`).\n",
+						"            prompt_embeds (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt weighting. If not\n",
+						"                provided, text embeddings will be generated from `prompt` input argument.\n",
+						"            negative_prompt_embeds (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated negative text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt\n",
+						"                weighting. If not provided, negative_prompt_embeds will be generated from `negative_prompt` input\n",
+						"                argument.\n",
+						"        \"\"\"\n",
+						"        if prompt is not None and isinstance(prompt, str):\n",
+						"            batch_size = 1\n",
+						"        elif prompt is not None and isinstance(prompt, list):\n",
+						"            batch_size = len(prompt)\n",
+						"        else:\n",
+						"            batch_size = prompt_embeds.shape[0]\n",
+						"\n",
+						"        if prompt_embeds is None:\n",
+						"            text_inputs = self.tokenizer(\n",
+						"                prompt,\n",
+						"                padding=\"max_length\",\n",
+						"                max_length=self.tokenizer.model_max_length,\n",
+						"                truncation=True,\n",
+						"                return_tensors=\"pt\",\n",
+						"            )\n",
+						"            text_input_ids = text_inputs.input_ids\n",
+						"            untruncated_ids = self.tokenizer(prompt, padding=\"longest\", return_tensors=\"pt\").input_ids\n",
+						"\n",
+						"            if untruncated_ids.shape[-1] >= text_input_ids.shape[-1] and not torch.equal(text_input_ids, untruncated_ids):\n",
+						"                removed_text = self.tokenizer.batch_decode(untruncated_ids[:, self.tokenizer.model_max_length - 1 : -1])\n",
+						"                print(\n",
+						"                    \"The following part of your input was truncated because CLIP can only handle sequences up to\"\n",
+						"                    f\" {self.tokenizer.model_max_length} tokens: {removed_text}\"\n",
+						"                )\n",
+						"\n",
+						"            prompt_embeds = self.text_encoder(text_input_ids)\n",
+						"            prompt_embeds = prompt_embeds[0]\n",
+						"            prompt_embeds = torch.tensor(prompt_embeds)\n",
+						"\n",
+						"        bs_embed, seq_len, _ = prompt_embeds.shape\n",
+						"        # duplicate text embeddings for each generation per prompt, using mps friendly method\n",
+						"        prompt_embeds = prompt_embeds.repeat(1, num_images_per_prompt, 1)\n",
+						"        prompt_embeds = prompt_embeds.view(bs_embed * num_images_per_prompt, seq_len, -1)\n",
+						"\n",
+						"        # get unconditional embeddings for classifier free guidance\n",
+						"        if do_classifier_free_guidance and negative_prompt_embeds is None:\n",
+						"            uncond_tokens: List[str]\n",
+						"            if negative_prompt is None:\n",
+						"                uncond_tokens = [\"\"] * batch_size\n",
+						"            elif type(prompt) is not type(negative_prompt):\n",
+						"                raise TypeError(f\"`negative_prompt` should be the same type to `prompt`, but got {type(negative_prompt)} !=\" f\" {type(prompt)}.\")\n",
+						"            elif isinstance(negative_prompt, str):\n",
+						"                uncond_tokens = [negative_prompt]\n",
+						"            elif batch_size != len(negative_prompt):\n",
+						"                raise ValueError(\n",
+						"                    f\"`negative_prompt`: {negative_prompt} has batch size {len(negative_prompt)}, but `prompt`:\"\n",
+						"                    f\" {prompt} has batch size {batch_size}. Please make sure that passed `negative_prompt` matches\"\n",
+						"                    \" the batch size of `prompt`.\"\n",
+						"                )\n",
+						"            else:\n",
+						"                uncond_tokens = negative_prompt\n",
+						"\n",
+						"            max_length = prompt_embeds.shape[1]\n",
+						"            uncond_input = self.tokenizer(\n",
+						"                uncond_tokens,\n",
+						"                padding=\"max_length\",\n",
+						"                max_length=max_length,\n",
+						"                truncation=True,\n",
+						"                return_tensors=\"pt\",\n",
+						"            )\n",
+						"\n",
+						"            negative_prompt_embeds = self.text_encoder(uncond_input.input_ids)\n",
+						"            negative_prompt_embeds = negative_prompt_embeds[0]\n",
+						"            negative_prompt_embeds = torch.tensor(negative_prompt_embeds)\n",
+						"\n",
+						"        if do_classifier_free_guidance:\n",
+						"            # duplicate unconditional embeddings for each generation per prompt, using mps friendly method\n",
+						"            seq_len = negative_prompt_embeds.shape[1]\n",
+						"\n",
+						"            negative_prompt_embeds = negative_prompt_embeds.repeat(1, num_images_per_prompt, 1)\n",
+						"            negative_prompt_embeds = negative_prompt_embeds.view(batch_size * num_images_per_prompt, seq_len, -1)\n",
+						"\n",
+						"            # For classifier free guidance, we need to do two forward passes.\n",
+						"            # Here we concatenate the unconditional and text embeddings into a single batch\n",
+						"            # to avoid doing two forward passes\n",
+						"            prompt_embeds = torch.cat([negative_prompt_embeds, prompt_embeds])\n",
+						"\n",
+						"        return prompt_embeds\n",
+						"\n",
+						"    def prepare_latents(\n",
+						"        self,\n",
+						"        batch_size,\n",
+						"        num_channels_latents,\n",
+						"        dtype,\n",
+						"        generator,\n",
+						"        latents=None,\n",
+						"    ):\n",
+						"        shape = (\n",
+						"            batch_size,\n",
+						"            num_channels_latents,\n",
+						"            self.num_frames,\n",
+						"            self.height // self.vae_scale_factor,\n",
+						"            self.width // self.vae_scale_factor,\n",
+						"        )\n",
+						"        if isinstance(generator, list) and len(generator) != batch_size:\n",
+						"            raise ValueError(\n",
+						"                f\"You have passed a list of generators of length {len(generator)}, but requested an effective batch\"\n",
+						"                f\" size of {batch_size}. Make sure the batch size matches the length of the generators.\"\n",
+						"            )\n",
+						"\n",
+						"        if latents is None:\n",
+						"            latents = randn_tensor(shape, generator=generator, dtype=dtype)\n",
+						"\n",
+						"        # scale the initial noise by the standard deviation required by the scheduler\n",
+						"        latents = latents * self.scheduler.init_noise_sigma\n",
+						"        return latents\n",
+						"\n",
+						"    def check_inputs(\n",
+						"        self,\n",
+						"        prompt,\n",
+						"        callback_steps,\n",
+						"        negative_prompt=None,\n",
+						"        prompt_embeds=None,\n",
+						"        negative_prompt_embeds=None,\n",
+						"    ):\n",
+						"        if self.height % 8 != 0 or self.width % 8 != 0:\n",
+						"            raise ValueError(f\"`height` and `width` have to be divisible by 8 but are {self.height} and {self.width}.\")\n",
+						"\n",
+						"        if (callback_steps is None) or (callback_steps is not None and (not isinstance(callback_steps, int) or callback_steps <= 0)):\n",
+						"            raise ValueError(f\"`callback_steps` has to be a positive integer but is {callback_steps} of type\" f\" {type(callback_steps)}.\")\n",
+						"\n",
+						"        if prompt is not None and prompt_embeds is not None:\n",
+						"            raise ValueError(\n",
+						"                f\"Cannot forward both `prompt`: {prompt} and `prompt_embeds`: {prompt_embeds}. Please make sure to\" \" only forward one of the two.\"\n",
+						"            )\n",
+						"        elif prompt is None and prompt_embeds is None:\n",
+						"            raise ValueError(\"Provide either `prompt` or `prompt_embeds`. Cannot leave both `prompt` and `prompt_embeds` undefined.\")\n",
+						"        elif prompt is not None and (not isinstance(prompt, str) and not isinstance(prompt, list)):\n",
+						"            raise ValueError(f\"`prompt` has to be of type `str` or `list` but is {type(prompt)}\")\n",
+						"\n",
+						"        if negative_prompt is not None and negative_prompt_embeds is not None:\n",
+						"            raise ValueError(\n",
+						"                f\"Cannot forward both `negative_prompt`: {negative_prompt} and `negative_prompt_embeds`:\"\n",
+						"                f\" {negative_prompt_embeds}. Please make sure to only forward one of the two.\"\n",
+						"            )\n",
+						"\n",
+						"        if prompt_embeds is not None and negative_prompt_embeds is not None:\n",
+						"            if prompt_embeds.shape != negative_prompt_embeds.shape:\n",
+						"                raise ValueError(\n",
+						"                    \"`prompt_embeds` and `negative_prompt_embeds` must have the same shape when passed directly, but\"\n",
+						"                    f\" got: `prompt_embeds` {prompt_embeds.shape} != `negative_prompt_embeds`\"\n",
+						"                    f\" {negative_prompt_embeds.shape}.\"\n",
+						"                )\n",
+						"\n",
+						"    def decode_latents(self, latents):\n",
+						"        scale_factor = 0.18215\n",
+						"        latents = 1 / scale_factor * latents\n",
+						"\n",
+						"        batch_size, channels, num_frames, height, width = latents.shape\n",
+						"        latents = latents.permute(0, 2, 1, 3, 4).reshape(batch_size * num_frames, channels, height, width)\n",
+						"        image = self.vae_decoder(latents)[0]\n",
+						"        image = torch.tensor(image)\n",
+						"        video = (\n",
+						"            image[None, :]\n",
+						"            .reshape(\n",
+						"                (\n",
+						"                    batch_size,\n",
+						"                    num_frames,\n",
+						"                    -1,\n",
+						"                )\n",
+						"                + image.shape[2:]\n",
+						"            )\n",
+						"            .permute(0, 2, 1, 3, 4)\n",
+						"        )\n",
+						"        # we always cast to float32 as this does not cause significant overhead and is compatible with bfloat16\n",
+						"        video = video.float()\n",
+						"        return video"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Inference with OpenVINO\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"core = ov.Core()"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Select inference device\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"select device from dropdown list for running inference using OpenVINO"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"device = widgets.Dropdown(\n",
+						"    options=core.available_devices + [\"AUTO\"],\n",
+						"    value=\"AUTO\",\n",
+						"    description=\"Device:\",\n",
+						"    disabled=False,\n",
+						")\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%%time\n",
+						"ov_unet = core.compile_model(unet_xml_path, device_name=device.value)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%%time\n",
+						"ov_vae_decoder = core.compile_model(vae_decoder_xml_path, device_name=device.value)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%%time\n",
+						"ov_text_encoder = core.compile_model(text_encoder_xml, device_name=device.value)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Here we replace the pipeline parts with versions converted to OpenVINO IR and compiled to specific device. Note that we use original pipeline tokenizer and scheduler."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"ov_pipe = OVTextToVideoSDPipeline(ov_vae_decoder, ov_text_encoder, tokenizer, ov_unet, scheduler)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Define a prompt\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"prompt = \"A panda eating bamboo on a rock.\""
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Let's generate a video for our prompt. For full list of arguments, see `__call__` function definition of `OVTextToVideoSDPipeline` class in [Build a pipeline](#Build-a-pipeline) section."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Video generation\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"frames = ov_pipe(prompt, num_inference_steps=25)[\"frames\"]"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"images = [PIL.Image.fromarray(frame) for frame in frames]\n",
+						"images[0].save(\"output.gif\", save_all=True, append_images=images[1:], duration=125, loop=0)\n",
+						"with open(\"output.gif\", \"rb\") as gif_file:\n",
+						"    b64 = f\"data:image/gif;base64,{base64.b64encode(gif_file.read()).decode()}\"\n",
+						"IPython.display.HTML(f'<img src=\"{b64}\" />')"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Interactive demo\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"def generate(prompt, seed, num_inference_steps, _=gr.Progress(track_tqdm=True)):\n",
+						"    generator = torch.Generator().manual_seed(seed)\n",
+						"    frames = ov_pipe(\n",
+						"        prompt,\n",
+						"        num_inference_steps=num_inference_steps,\n",
+						"        generator=generator,\n",
+						"    )[\"frames\"]\n",
+						"    out_file = tempfile.NamedTemporaryFile(suffix=\".gif\", delete=False)\n",
+						"    images = [PIL.Image.fromarray(frame) for frame in frames]\n",
+						"    images[0].save(out_file, save_all=True, append_images=images[1:], duration=125, loop=0)\n",
+						"    return out_file.name\n",
+						"\n",
+						"\n",
+						"demo = gr.Interface(\n",
+						"    generate,\n",
+						"    [\n",
+						"        gr.Textbox(label=\"Prompt\"),\n",
+						"        gr.Slider(0, 1000000, value=42, label=\"Seed\", step=1),\n",
+						"        gr.Slider(10, 50, value=25, label=\"Number of inference steps\", step=1),\n",
+						"    ],\n",
+						"    gr.Image(label=\"Result\"),\n",
+						"    examples=[\n",
+						"        [\"An astronaut riding a horse.\", 0, 25],\n",
+						"        [\"A panda eating bamboo on a rock.\", 0, 25],\n",
+						"        [\"Spiderman is surfing.\", 0, 25],\n",
+						"    ],\n",
+						"    allow_flagging=\"never\",\n",
+						")\n",
+						"\n",
+						"try:\n",
+						"    demo.queue().launch(debug=True)\n",
+						"except Exception:\n",
+						"    demo.queue().launch(share=True, debug=True)\n",
+						"# if you are launching remotely, specify server_name and server_port\n",
+						"# demo.launch(server_name='your server name', server_port='server port in int')\n",
+						"# Read more in the docs: https://gradio.app/docs/"
+					]
+				}
+			]
+				.map(fromJupyterCell)
+			,
+			[
+				{
+					"cell_type": "markdown",
+					"source": [
+						"# Video generation with ZeroScope and OpenVINO\n",
+						"\n",
+						"#### Table of contents:\n",
+						"\n",
+						"- [Install and import required packages](#Install-and-import-required-packages)\n",
+						"- [Load the model](#Load-the-model)\n",
+						"- [Convert the model](#Convert-the-model)\n",
+						"    - [Define the conversion function](#Define-the-conversion-function)\n",
+						"    - [UNet](#UNet)\n",
+						"    - [VAE](#VAE)\n",
+						"    - [Text encoder](#Text-encoder)\n",
+						"- [Build a pipeline](#Build-a-pipeline)\n",
+						"- [Inference with OpenVINO](#Inference-with-OpenVINO)\n",
+						"    - [Select inference device](#Select-inference-device)\n",
+						"    - [Define a prompt](#Define-a-prompt)\n",
+						"    - [Video generation](#Video-generation)\n",
+						"- [Interactive demo](#Interactive-demo)\n",
+						"\n",
+						"\n",
+						"### Installation Instructions\n",
+						"\n",
+						"This is a self-contained example that relies solely on its own code.\n",
+						"\n",
+						"We recommend  running the notebook in a virtual environment. You only need a Jupyter server to start.\n",
+						"For details, please refer to [Installation Guide](https://github.com/openvinotoolkit/openvino_notebooks/blob/latest/README.md#-installation-guide).\n",
+						"\n",
+						"<img referrerpolicy=\"no-referrer-when-downgrade\" src=\"https://static.scarf.sh/a.png?x-pxid=5b5a4db0-7875-4bfb-bdbd-01698b5b1a77&file=notebooks/zeroscope-text2video/zeroscope-text2video.ipynb\" />\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"The ZeroScope model is a free and open-source text-to-video model that can generate realistic and engaging videos from text descriptions. It is based on the [Modelscope](https://modelscope.cn/models/damo/text-to-video-synthesis/summary) model, but it has been improved to produce higher-quality videos with a 16:9 aspect ratio and no Shutterstock watermark. The ZeroScope model is available in two versions: ZeroScope_v2 576w, which is optimized for rapid content creation at a resolution of 576x320 pixels, and ZeroScope_v2 XL, which upscales videos to a high-definition resolution of 1024x576.\n",
+						"\n",
+						"The ZeroScope model is trained on a dataset of over 9,000 videos and 29,000 tagged frames. It uses a diffusion model to generate videos, which means that it starts with a random noise image and gradually adds detail to it until it matches the text description. The ZeroScope model is still under development, but it has already been used to create some impressive videos. For example, it has been used to create videos of people dancing, playing sports, and even driving cars.\n",
+						"\n",
+						"The ZeroScope model is a powerful tool that can be used to create various videos, from simple animations to complex scenes. It is still under development, but it has the potential to revolutionize the way we create and consume video content.\n",
+						"\n",
+						"Both versions of the ZeroScope model are available on Hugging Face:\n",
+						" - [ZeroScope_v2 576w](https://huggingface.co/cerspense/zeroscope_v2_576w)\n",
+						" - [ZeroScope_v2 XL](https://huggingface.co/cerspense/zeroscope_v2_XL)\n",
+						"\n",
+						"We will use the first one."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"<div class=\"alert alert-block alert-warning\">\n",
+						"    This tutorial requires at least 24GB of free memory to generate a video with a frame size of 432x240 and 16 frames. Increasing either of these values will require more memory and take more time.\n",
+						"</div>"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Install and import required packages\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"To work with text-to-video synthesis model, we will use Hugging Face's [Diffusers](https://github.com/huggingface/diffusers) library. It provides already pretrained model from `cerspense`."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%pip install -q --extra-index-url https://download.pytorch.org/whl/cpu  \"diffusers>=0.18.0\" \"torch>=2.1\" transformers \"openvino>=2023.1.0\" numpy \"gradio>=4.19\""
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"import gc\n",
+						"from typing import Optional, Union, List, Callable\n",
+						"import base64\n",
+						"import tempfile\n",
+						"import warnings\n",
+						"\n",
+						"import diffusers\n",
+						"import transformers\n",
+						"import numpy as np\n",
+						"import IPython\n",
+						"import torch\n",
+						"import PIL\n",
+						"import gradio as gr\n",
+						"\n",
+						"import openvino as ov"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Original 576x320 inference requires a lot of RAM (>100GB), so let's run our example on a smaller frame size, keeping the same aspect ratio. Try reducing values below to reduce the memory consumption."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"WIDTH = 432  # must be divisible by 8\n",
+						"HEIGHT = 240  # must be divisible by 8\n",
+						"NUM_FRAMES = 16"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Load the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"The model is loaded from HuggingFace using `.from_pretrained` method of `diffusers.DiffusionPipeline`."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"pipe = diffusers.DiffusionPipeline.from_pretrained(\"cerspense/zeroscope_v2_576w\")"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"unet = pipe.unet\n",
+						"unet.eval()\n",
+						"vae = pipe.vae\n",
+						"vae.eval()\n",
+						"text_encoder = pipe.text_encoder\n",
+						"text_encoder.eval()\n",
+						"tokenizer = pipe.tokenizer\n",
+						"scheduler = pipe.scheduler\n",
+						"vae_scale_factor = pipe.vae_scale_factor\n",
+						"unet_in_channels = pipe.unet.config.in_channels\n",
+						"sample_width = WIDTH // vae_scale_factor\n",
+						"sample_height = HEIGHT // vae_scale_factor\n",
+						"del pipe\n",
+						"gc.collect();"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Convert the model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"The architecture for generating videos from text comprises three distinct sub-networks: one for extracting text features, another for translating text features into the video latent space using a diffusion model, and a final one for mapping the video latent space to the visual space. The collective parameters of the entire model amount to approximately 1.7 billion. It's capable of processing English input. The diffusion model is built upon the Unet3D model and achieves video generation by iteratively denoising a starting point of pure Gaussian noise video."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"![](data:image/png;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/4gHYSUNDX1BST0ZJTEUAAQEAAAHIAAAAAAQwAABtbnRyUkdCIFhZWiAH4AABAAEAAAAAAABhY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAA9tYAAQAAAADTLQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlkZXNjAAAA8AAAACRyWFlaAAABFAAAABRnWFlaAAABKAAAABRiWFlaAAABPAAAABR3dHB0AAABUAAAABRyVFJDAAABZAAAAChnVFJDAAABZAAAAChiVFJDAAABZAAAAChjcHJ0AAABjAAAADxtbHVjAAAAAAAAAAEAAAAMZW5VUwAAAAgAAAAcAHMAUgBHAEJYWVogAAAAAAAAb6IAADj1AAADkFhZWiAAAAAAAABimQAAt4UAABjaWFlaIAAAAAAAACSgAAAPhAAAts9YWVogAAAAAAAA9tYAAQAAAADTLXBhcmEAAAAAAAQAAAACZmYAAPKnAAANWQAAE9AAAApbAAAAAAAAAABtbHVjAAAAAAAAAAEAAAAMZW5VUwAAACAAAAAcAEcAbwBvAGcAbABlACAASQBuAGMALgAgADIAMAAxADb/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/2wBDAQMDAwQDBAgEBAgQCwkLEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBD/wAARCADoA/0DASIAAhEBAxEB/8QAHQABAQACAwEBAQAAAAAAAAAAAAcFBgMECAIJAf/EAFoQAAEDAwICAwsJBAcFBgMHBQIBAwQABQYHERIhCBMYFBUiMUFWWJaX09UWMjhRVXeVtdQXI2FxCTdCUoGRtjM0NnWhJCVidrG0NZTwQ2V0goOS4ZPBw9Hx/8QAGgEBAAMBAQEAAAAAAAAAAAAAAAMEBQECBv/EADwRAQABAgIHBQYDBwQDAAAAAAABAgMEERITITFSkdEUQVFhsQUicYHB0jIz8EJTVJKh4fEjNHKyFTWC/9oADAMBAAIRAxEAPwD1n0ZOjJ0bb/0bdKL7fej5prcblccHsUuZMl4nAefkvuQGScdccJpSMyJVJSVVVVVVWulfcG6OFk1Hj6aB/R3Wy4TZrb8mHNi4tiCRJMVk2wdkCrswHBAVeb8E2xcXfkC7LVY6J30WNG/u/wAe/LmK5M5wXJsh1Zs1+tjKs21nEb7aHZ6Oinc8qS5EVnweJDXk04u4psnDzVFVNw1OzaQ9AvInJzNg0u0DuTlrnhap4Q7JZniiTiPgGM6gAvA8pooo2WxKqbbb1j7vpv0DrLn2P6aTNFdFu/2SOzGIUUccs3H10YANxogUUPj2NNhQVXx77VqOmOiuqdpgP2zIsby+bJiYwxhjD+RXLHkgACvBvIit2thqQ5Ga6vrgKQ4EjdRFGhIjcGl4/hec41kWnEV7FJtwi4tIu9snXVqbHJZDUhoCbuTqOvI6SuEKo6iITnWkSoJAvHQde+aK9BXGLvEsGS6S6EWm6XB5qPEhTrDZ2JEh13i6oG2zbQjI+A+FERVLgLbfZa45uj3QNt0u8wLhpboHFlY7GKbeGHrJZgct0cURSekCobsgiKm5HsibpzrXNVrFkuSav6j4vi+n3fuXk2D2iyJdEfjNhaOtfnKj8hHnANWUVEP9wLjnG2Pgf2kzN90lzJjG8zkwsWC7znc9tmUswFlMAd6jQ24O4iThdWDhLHNAR0gTjAeIgFeKg/svTH+j7t+NRMzn6e9HqNj89kpMW7PWmyBDkNCQiTjbyhwGKEYipIqoikieVK7MPR/oGXHvolv0u0Dk943WWbn1Nksx9wuPbdUD+wfuiPiThQtlLdNt96xeH6TZrMz4dQb7gyWeNc5eR3Ru1Pyozr1qOXGhMNC71TptK871Ehw+pIwRXF3JVXddKzPSXIMO0itUKXhMBqNBwjGMcfg9YwjBzW7syRxSQFVOFeJdyRFDwl2VaDap+J/0esNcUci6V6FXOLmd4csVqlwLHY3o7ssAMjDjRNi2Jvq1QOIkMwFU51Ruyd0WPRp0q9Tbd7mtJhYbqPcsvg6nPaZXCztTM4iXN2wHMt6zocRu1OwTlPq1IKMRKZiai06Z9UI8lP8Adp6LoJV0TvosaN/d/j35cxVVqVdE76LGjf3f49+XMVVaBSlKCL9IrGMazTJdFsTzHHrZfrHcs+kBNtlziNyokkQxq9ugjjLiKBoLjbZpxIuxAJJzRFrJ9k7osejTpV6m273NNZP6xdCfvAmf6Vv1VWglXZO6LHo06Veptu9zTsndFj0adKvU23e5qq0oJV2Tuix6NOlXqbbvc07J3RY9GnSr1Nt3uaqtKCVdk7osejTpV6m273NOyd0WPRp0q9Tbd7mqrSglXZO6LHo06Veptu9zTsndFj0adKvU23e5qq0oJV2Tuix6NOlXqbbvc07J3RY9GnSr1Nt3uaqtKCVdk7osejTpV6m273NOyd0WPRp0q9Tbd7mqrSglXZO6LHo06Veptu9zTsndFj0adKvU23e5qq0oJV2Tuix6NOlXqbbvc07J3RY9GnSr1Nt3uaqtKCVdk7osejTpV6m273NOyd0WPRp0q9Tbd7mqrSglXZO6LHo06Veptu9zTsndFj0adKvU23e5qq0oJV2Tuix6NOlXqbbvc07J3RY9GnSr1Nt3uaqtKCVdk7osejTpV6m273NOyd0WPRp0q9Tbd7mqrSglXZO6LHo06Veptu9zTsndFj0adKvU23e5qq0oJV2Tuix6NOlXqbbvc07J3RY9GnSr1Nt3uaqtKCVdk7osejTpV6m273NOyd0WPRp0q9Tbd7mqrSglXZO6LHo06Veptu9zTsndFj0adKvU23e5qq0oJV2Tuix6NOlXqbbvc07J3RY9GnSr1Nt3uaqtKCVdk7osejTpV6m273NOyd0WPRp0q9Tbd7mqrSglXZO6LHo06Veptu9zTsndFj0adKvU23e5qq0oJV2Tuix6NOlXqbbvc07J3RY9GnSr1Nt3uaqtKCVdk7osejTpV6m273NOyd0WPRp0q9Tbd7mqrSglXZO6LHo06Veptu9zTsndFj0adKvU23e5qq0oJV2Tuix6NOlXqbbvc07J3RY9GnSr1Nt3uaqtKCVdk7osejTpV6m273NOyd0WPRp0q9Tbd7mqrSglXZO6LHo06Veptu9zTsndFj0adKvU23e5qq0oJV2Tuix6NOlXqbbvc07J3RY9GnSr1Nt3uaqtKCVdk7osejTpV6m273NOyd0WPRp0q9Tbd7mqrSglXZO6LHo06Veptu9zTsndFj0adKvU23e5qq0oJV2Tuix6NOlXqbbvc07J3RY9GnSr1Nt3uaqtKCVdk7osejTpV6m273NOyd0WPRp0q9Tbd7mqrSglXZO6LHo06Veptu9zTsndFj0adKvU23e5qq0oJV2Tuix6NOlXqbbvc07J3RY9GnSr1Nt3uaqtKCVdk7osejTpV6m273NOyd0WPRp0q9Tbd7mqrSglXZO6LHo06Veptu9zTsndFj0adKvU23e5qq0oJV2Tuix6NOlXqbbvc07J3RY9GnSr1Nt3uaqtKCVdk7osejTpV6m273NOyd0WPRp0q9Tbd7mqrSglXZO6LHo06Veptu9zTsndFj0adKvU23e5qq0oJV2Tuix6NOlXqbbvc07J3RY9GnSr1Nt3uaqtKCVdk7osejTpV6m273NOyd0WPRp0q9Tbd7mqrSglXZO6LHo06Veptu9zTsndFj0adKvU23e5qq0oJV2Tuix6NOlXqbbvc07J3RY9GnSr1Nt3uaqtKCVdk7osejTpV6m273NOyd0WPRp0q9Tbd7mqrSglXZO6LHo06Veptu9zTsndFj0adKvU23e5qq0oJV2Tuix6NOlXqbbvc07J3RY9GnSr1Nt3uaqtKCVdk7osejTpV6m273NOyd0WPRp0q9Tbd7mqrSglXZO6LHo06Veptu9zTsndFj0adKvU23e5qq0oJV2Tuix6NOlXqbbvc07J3RY9GnSr1Nt3uaqtKCWdFR12R0XtHn33TcdcwHHzMzJVIiW3MKqqq+NVWqnUq6J30WNG/u/x78uYqq0ClKUClKUClKUClKUClKUClKUClKUClKUEq6J30WNG/u/x78uYqq1Kuid9FjRv7v8AHvy5iqrQYIcmORf7vYbfbikHZ4TMh13rOESfd41BhOS8+EEJV8iGHJd60Sw6r6mXPBcgyi9aODYblZ7FFu0aBPvDoNSn3IqvPRie7k4m+qJOrUuqJVXxgPircLLYJtozrI7qMcSgX5qHK67jTiGS0CsmCjvvt1YMqionj49/JXczmxXLKMMveNWi5RLfMusB+E1Klwylssq4ChxGyLjauIiKvgo4O/10Gq2bU/IbZartK1YxCLZZlqjxppM4xKm5GLzD5m22gC3CZkG7xtkitiwXJRVCLdUHsXLXHTu1WK05FLk34o17N1mExHxm5vzDebRVcYKI3HJ9t9EE1Vk2xc8A/B8EttWj9HKz27R57TSw2XTWyyZr4SrkFswYY1huboqibSrWElCeAgEEISkbqoDuvCnBXPgmimVYDbsastnyrEItssF5m3MoVuw8oMdWpDLg9zx2m5nBHEDecJF4T3HgFUUkJwg2XJtZsJx2w229pLmzVvbBP25qLaZ8oiFB362QEaO67FYFVEXHnW0BtSRC2XYV60TW/FGrFid1yFm4xHMrt7U9s7fa51zgRRMQVSenMR1ZYaRTTZ19WhJN15Ii7Ye0aV6qY9ZLYzZNTsZavTPdMa4zHsSfcjSYbkhx4Baj93oTLwK4SI4TrgLuqq0vJB1PLeitdsrs2N2e45VhVzLH7S3bGpl9wZLlIjOMkStSoClLEYTyooI6aCamrYKPVbJsHoilcccXxYbGU4248gIjhtgoCRbc1QVVVFFXxIqrt9a+OuSglXRO+ixo393+PflzFVWpV0TvosaN/d/j35cxVVoFKUoJVrJ/WLoT94Ez/St+qq1KtZP6xdCfvAmf6Vv1VWgVq94zN+PcHbVj9oG5SIqoMlx2T3OwyaoioCmgmSnsqKqIKoiKm6pvtW0VNcf5s3FxeZFebpxL5V2mvCn+SIif4Vje1cTetVUWbNWjNWczOyZyjLZGcTG2ZjfE7InvnONDAWLd2aqrkZxGWz4/D4Mp8r80807J+OO/pafK/NPNOyfjjv6WlKytbjf4irlb+xp9mw37uOdX3HyvzTzTsn447+lp8r80807J+OO/paUprcb/ABFXK39h2bDfu451fcfK/NPNOyfjjv6WnyvzTzTsn447+lpSmtxv8RVyt/Ydmw37uOdX3HyvzTzTsn447+lp8r80807J+OO/paUprcb/ABFXK39h2bDfu451fc/qZvk0ZetuOIRSjjzPuC5k+8ieVUA2W0L+SFv9SLW2wJ0S5wmLjAfF+NJbF1pwfEQqm6LWo13tNuWKoCeILlcwFPqEZz6In8kRESrvs3F4jtXZ7tc1xNMztiImMppj9mI36XfHcp47DWqLWst05bYjv74nxmfBtFY+/X2345bHbrcjNGm1EBBseJx1wlQQbAf7RESoiJ9a1kK0fU/m9iTa8xO+rxJ5F2gSyT/IhRf5olfT2LcXbkUzuYl2uaKJqh11z7NnV442D2oG1+aMq+mDqJ/4hbjGKL/I1/nX8+XWe+Zdg9YXv0dfNK1ez2OCOc9WfrrvF6dH18us98y7B6wvfo6fLrPfMuwesL36OvmlOz2OCOc9TXXeL06Pr5dZ75l2D1he/R0+XWe+Zdg9YXv0dfNKdnscEc56muu8Xp0fXy6z3zLsHrC9+jp8us98y7B6wvfo6+aU7PY4I5z1Ndd4vTo+vl1nvmXYPWF79HT5dZ75l2D1he/R180p2exwRznqa67xenR9fLrPfMuwesL36Ony6z3zLsHrC9+jr5pTs9jgjnPU113i9Oj6+XWe+Zdg9YXv0dPl1nvmXYPWF79HXzSnZ7HBHOeprrvF6dGbxnNu/M4rLeLUVquiNq8211yPNSG0VEImnEQeLhVU3QhEk3Rdtl3raKlx+DmWHGPIiukhtVTyitvlqqfy3EV/wSqjWfjLVNquNDdMZ/1mPouYe5VcpnS7pKUpVRYKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQSronfRY0b+7/Hvy5iqrUq6J30WNG/u/x78uYqq0ClKUClKUClKUClKUClKUClKUClKUClKUEq6J30WNG/u/x78uYqq1Kuid9FjRv7v8e/LmKqtBJNbOk5ppoNcrXac1ltJKubZSeArzaoCsxhLhJ7/vCXHV5EXfwGOtc5fM5pv95X0ltOcQy7EMUuDquBmzDEi13AbnbWWzB4uFrhjvym5j/Eqj/u8d3h4kUuFN1TZ830+n5VLj3TH9R8mwq4tN9zvS7E3b3DlMoqkLbgToslvYSUlRRASTiJOLZVSsPlWix5RcSnjqnmdpGQzFGexb+9whOfjKhMyHCciGYkhCiqDZAyXNCbVCJFDsBqhkrmp8zTxvRfLXbfDGKZZI3NtPcCA8jn7wmymJKQEVtR5MkaqheAg8JFmbLltyueaZBjMvHLjbmbRHjOxnZIRlCeLiuorzJtSXC4N2+DgdaZNFBV8ISRU69607cu+XQ8qYzrJbW002y1OtdvcjNxbojJGbXXmrCyB4ScJdmXmkJPBNDFVFehG0uvsfUV/UBdZs0dZkCjR2E41n739QPWK2yhJASVwiTpEi9fxquyERJyoOrjGt8C/SXhvGB5Vi8IIsuUzPvAQ+pk9ylwyQbGPIdd4m1RV3IBE05tkac67GI6uP5Tlw4dL0uzPHpBwHbmMm7NwUjlGFwQbJCZlOFxOKSqgcPGCAvWi0pAh9WFogyx3kbuWpGWXWNaG7qy7HlhbRC4NzyVXAfVmIBIgIuwK0Ta7fOU151jNIdOdTcey+95NqVkr103ZW22dHLyzPIYXW8Y8Qs22CDKpsnJUfNd14niQR2CvUpSglXRO+ixo393+PflzFVWvL/Rk6MnRtv/AEbdKL7fej5prcblccHsUuZMl4nAefkvuQGScdccJpSMyJVJSVVVVVVWqX2Tuix6NOlXqbbvc0FVpUq7J3RY9GnSr1Nt3uadk7osejTpV6m273NA1k/rF0J+8CZ/pW/VVa8v6sdGTo227PNGIdv6PmmsWPdM4lRJzTOJwACUwmN3p5GnRRrYwR1lpxBLdONsC8YoqUvsndFj0adKvU23e5oNRs/Th0NLWDItB8+uz2BZlYbkcFuNkKgxHuTSqhMSI8hCVvhebNoxBxQNesREEtt63nHVQos8hVFRbzdVRU//ABz9ecbN/RYaF3LWDItWdTYNtuUSdcjes2JWG2hZ7Lb4YKgxwcaYVFecQAAjVFbAjJziA9969D4dAg2q0PWu1w2YkOHc7lHjx2G0BtloJrwiACnIRREREROSIlfP+1/9za/41+tDW9mfhr+X1Zl1HVaNGTEHFFeAiHiFC8iqiKm6fw3T+dQSBqPrHjWV5aOomZ4VPsGFdwLJZsuFzWJ1zKW0qtNMEd0dFs+tVsE4gNC358HjS+1Nck0XZyORm8lzIjjuZaVrkRiCIJLb5MBEJlzwiVHU6wQJRVB5Iqb890q0TEZxUv1xM7YYWV0iYDUm0JcbJMxZW72/a8jgX9ptZdvEYD0pshWK86yfWIDSirZuIqEo7IaKg5S+6+2fHnhauGC5YvcsNq5XtW2Iq94oTrhg0/LHujiVC6sy4GEdcERVTAaxLfR4dvsxq96mZTAyS6SLwd0uaM2ZYsN4O4HYTTDDBvukwgA5x8ZOOEp8SpwoqIOEyzonQsuvFuv94umI3m5s2+NaZ1yyPCIt4mlGjuGTLkVx9zhjyOBxRMzB5syRD6oV3RZIi1ntlH/q5NwLpAWD5aP4g3h+UnHi3sMckXxI0fvezPcjg+02u76PkJi6CIYtECEvCRCtY9rpAS4lqxOfI0xy29Rcp7kZj3a3Ba2GDffJU4EivXFZW4ChGaADiCAkXEqCW2ad0dEzlKGQIAycti5SgpDTwEZaab7n5Gic+q349k24tuHlWsY5ohqhh95s0yxao4rJgWW2x7XFYu+HyJL0Zof94WO61cWhbJ5UTcibMk4RTdRThrkavL/Lv+p+smyQdeManZAdoHHcgbtzj06JAvhssLAuMqGhrJjs8LqvCY9U7srrTYH1ZcBFy32TTjOmdScRgZpDxy72eFdGgkwm7ojCPPRzFCB3hZdcQRJC5ISoaeUUqXY50VMexnPJ+WWwMNYjyHrjLaeZwqIN8J+ZxqaP3RSI3WxJ01FAbac2QRJw0RUKv4ZjvyRxCyYp3Z3X3mt8eB1/V9X1vVNiHHw7rw78O+267b+Na816ER7r1RpzPvMxXe02/wCF1/5pdf8A379dGtNx/o9aBZzEl5Tmuh+n+QXqbdLj3TcbpjMKXKf4JjwBxuuNkZcIAIpuvIRRE5Ild9n/APsaP+Ff/a2hx/8Atf8A6j0qZvpC68WLo44E1qZluOXm548xco8K7P2tttw7Yw9xCMpwDIeJtHeqbVBXi3dRURdtq16NrXpTrlZsOyrSfOrXklv7+r1qxHf3scits1UF5ktnGSVOfC4Irtz2rS+kL0BNGtW8CawbT3T7TjTx2Zco7l0vdtwuF3eMBviM2orjYtk06bgsop8WyB1iKhb7L9af9ETQ/otQ8Wh6W404Fym3hWbhep73Xz5ojb5i7GeyCA7oi8DYgG6IvDvzr7HCfnR8/SXzWJ/Ln5erfNQcvbwPDLtlpwHJxW9jiZiNlwlIeIkBtpC2Xh4jIR325b7+StRcvetuI2i7XXMkxS9MNWabcWn7TAehDbZDLXGDDwOynSlAfhJ1rfVKnBzBOPcd2zLFLXnOLXPEr11qQ7pHJhw2S4XG9+YmBbLsYkiEK7clRFrS2tN9SrxFuELPdVotzYdtMu1w2bXYjt7e77fAsiWJSXu6XRT5vArLaKRrwbqKhqVZ57FCMu927vqFeoGm2K5izFhLNvkmxMyGyA+qEZrzAO8CcW6KiOlw7quyom+/llFw6R2SRswye1NapaXJMsWQu2mFgpW90shubQE2go2aXBF6xxDVRJIhCm26oqIqpv1p0o1Ldxe14fmuo2M3G32R+0vQSteKyID3/YX2nNnScuD4nxi0g+CIcKrvz+bW64RhnyN7/wD/AHl3Z38vkq9f7Hq+p67h/dfOXi24fnct9/Elecqp8nrOmGpa8ZJqrhtii5Lp9f8AFIcdJkG3yYt5x+TPMzlS2mEcBxmawgICO8SioFxKnzh3pb9Yzst4axDLIcy8yYk9mzXXJrRawh2ePcn0EmYysuy3ZIkQuMpxCjjaE4KEYqqom2aj4V+0DGkx3vn3BtcIE/rup63/AHaU1I4OHiH53VcO+/Li32XbZZ1dujJYJ+rTupsZjDUKZcmLvLdnYZFnXhJDTYAIR7i6W7DKo0CqPVGaLx8Dje6cPaoqic6XI0ZjKWQznXoLTg+U3nDsYuFzv2NWuRMm25xI6Lbn2y4RZlIT4IilsRogGqE2CkJKhBx1K0zH7ha4k+VAegvSGAdcjPKCuMkQoqgStkQKqKuy8JEnLkq+OptdNFJ9yseQW5c2cGZl1tlRL7IOGRtyJLg7MyGmld/co0i8CAhLxNoAkW4odUm1sTo1tixrnKYky2mQB95hhWW3HEREIhbIzUBVd1QVIlTxbr467TpZ7XJyy2IBgGu95zHN3bFP150dtklvIZ1qHEDtxrfHGWJLjYihrdEXrTAENF7mVPC+aqVu2OdIbGMgvCQXcWya0210ro3HvVxjxwhSHLc4YSgHgeJ4eHqzJCNsQIUVRJfFXHhmm2rmDTX4Fp1KxB7Gn7zMuhQ5OHyinI3Jkm+40kobkLfEiuKiH1G3i3Fa5w0NhO2u0Wa5X4pES3O3wnxGKgFIbuXXIQIqkvAoI+vPYt+HxJvXmmK4h6nRfY66xBsbt6maa5tEN5+KxZ4bsSKr177pVeoKMQyFaDiQSJRkOMm2KcTggioq9ST0g7S9Z4rlhwrKJ9+krObfsYRo/ddrKGojJKVxPi1wtkbaKjTjhOIYq0jm6VxFo/qLMx+Nbrvqvb359gkwpONPM4yLUaGUZCESlNLIJySbgGQOKDzAqmygDa7qvXj6D5NbkiX20ajRGstecuK3q6yLF10eY1ONsnwYjdeKx+DqWkaUnHUFA8NHd13e+e6+bL0joY4zjtyv2K3ia/JsVuvGRzbRHaWDYhlgnATwuvI8oKXGuzIvEIgpHwpsq71h+okfNL5kFpt2NXmPFx6a5bnbnJ7nGLJkguxtsoLxOrwookpE2IqhJsqqhIkmufRBsU6dj81ZGHznbdaLbZ58u+4TFu00ghpsDkF14+GGZIpISGD4fNVBFUVSsmF4imIM3dkZ/dSXS8S7qn7nq+q64uLq/Gu/Dttvy3+pK7Tp5+85Vo9zKO/8YYZ/zd/8tmVUai2Y4biGe3XEsZzrFLPkdnkXlw3rfdoLUyM4QW+YQqTTokKqhIioqpyVEWsp2Tuix6NOlXqbbvc1S9ofjp+H1lawf4avj9IVWlSrsndFj0adKvU23e5p2Tuix6NOlXqbbvc1QW1VpUq7J3RY9GnSr1Nt3uadk7osejTpV6m273NBVaVBcF0z030y6Tc236b6fY1ikWZgjb0lix2liA284lwJEMxZAUIkTluvPar1QKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQSronfRY0b+7/Hvy5iqrUq6J30WNG/u/x78uYqq0ClKUClKUClKUClKUClKUClKUClKUClKUEo6KKGvRV0dRshE10+x7hUk3RF72sbbpum/+dNLNZ7nlrMCDk+IXiK4+/KtyZAFvCLaZ06O86240w0chyU3/ALA1QnQ6ottgdc3Hd0URU+iro6AmQKWn2PIhDtuP/drHNN90/wA0ruYbogziMiMMjUvM7/bIZPPx7VdXoSx25TqmrklDZjNvcSq65sCuKyHF4DYcIcIYHHelXgWUBmrdos9ykz8ERxy426HcrRPlmy26TZuI3Emu9SqKJL1UhWXl4VRG1JFSmS6+3JvHbtcbTh16x+VZEYlvFfLa1LCSy3Laamx2WocpXVfAXBRC2UOJwOBHuEwTtNdHZxq3zrYutWoDjEm0OWKMJDZ9oEIiBRbZFICCqggcKG4hmqEvGRqgKPcyPQOFkseRFk6k5lECW884+sM4DRmDr0d5xtD7lUgRXIyLxAouD1rnCY7BwBkGtYUS0zH7hpxl1vvkdxtuNjj7cIrhP61T6lWSbklG2PqnV3N8OrQCV3q9q/j2sRDZGpEPTLMJmRnIKM5ijSQBuTBgAOGpuOShhIAg42XGklQXjERUjXhr+s6QPpaZjM7VHL59+kONuRskkBbUuEFG+PqwZAIYxeEUdeTw2DUkcLjUuW3y5o/MWyNRourGYxciGQch3KmmbUtyf4wACA2zhFD4FBpodhjj/sxVNi3JQ3HGsgiZPZmLxEjyYyOKbbseU2gPR3mzUHGnBRVRCExIV2VRXbcVVFRV17MtTCxS6BbIGBZRkysthIub1mbiqFrjkqojzySH2ic5Aa9XHF53YPmeEKFsGM2BnGLKxZ2p8qcTam49Ml9X18p4zU3HnOrEA4iMiJUARFN9hFERETXcy00m5Vd27tadSspxRHGRj3GPZgtxNXJoVVRF5ZcV8w2QjFCZJotjXdVVAUQx9y1qiW7JlsYYDlUu3NLCKRf2Bhd7mGZfJh4lKSLxCp7gqA0RiqcRCgKJrR6nGQ6Lt30b6xG1Gyqzxb03bGW40Bu29XbwhHxAkfrojheH4j61XOXzODx1RQFQAQIyNRREUi23L+K7bJ/klBLOid9FjRv7v8e/LmKqtSronfRY0b+7/Hvy5iqrQKUpQSrWT+sXQn7wJn+lb9VVqVayf1i6E/eBM/0rfqqtAqa49/u9wT6rzdf/AHz9UqtOuuJ3qLcZNxxdyC43NcV5+HMcNoRdVNiMHAElHi23UVFee6oqbrWJ7XsXKqrd+3TNUU5xMRvynKc8u/LR3Rt2tL2feotzVRXOWeX9P8uKlcPenUH7Ex78Zf8A0tO9OoP2Jj34y/8ApaydOrgr/kr+1p6y3xRzjq5qVw96dQfsTHvxl/8AS0706g/YmPfjL/6WmnVwV/yV/aay3xRzjq5qVw96dQfsTHvxl/8AS0706g/YmPfjL/6WmnVwV/yV/aay3xRzjq5qVw96dQfsTHvxl/8AS0706g/YmPfjL/6WmnVwV/yV/aay3xRzjq5q72m3/Cyr9d0uip/8+/WLSwZ9LXqHWrFbgLkUhqY7KME+sWyZbRV+rctv4L4q2+z2mHY7ZHtMASRiMHAKmW5EvjUiXykqqqqvlVVq77MsXa8XGImmYpimqNsTGczNM7Inbs0ds5d8ZZ7cqWPv25s6umc5mYnZt3RPV3a0fU//AHjEF8iX4/y6ZW8ViMoxyPk9qW3uyDjPNuBIiyW0RSYeBdxNEXkqeNFRfGKqnlr6rD1xbuRVVuYd6ia6JphqdK4Vx7UxlerS24xLQeXXd9JEfj/j1fcznD/LjL+dO8Wpv2DjH47I/R1r623xRzhnauvwnk5qVw94tTfsHGPx2R+jp3i1N+wcY/HZH6Omst8Uc4c1dfhPJzUrh7xam/YOMfjsj9HTvFqb9g4x+OyP0dNZb4o5wauvwnk5qVw94tTfsHGPx2R+jp3i1N+wcY/HZH6Omst8Uc4NXX4Tyc1K4e8Wpv2DjH47I/R07xam/YOMfjsj9HTWW+KOcGrr8J5OalcPeLU37Bxj8dkfo6d4tTfsHGPx2R+jprLfFHODV1+E8nNSuHvFqb9g4x+OyP0dO8Wpv2DjH47I/R01lvijnBq6/CeTruf8Y4an/wB7vr/h3umVUa03GMNujF2byLKZEQ5cZs24cWGpEzH49kM1MkQnDVE4d+EURN0ROarXX1b1RkaTY8eUFpvlGU2+M249OcsbluFYbYInhODMlx1JF35I3xryXdE5b52NuU3K40ZzyjL+sz9V7DUVUUzpd8t6pWjWDWDE7hLg4/lL8fDMsuDDstrFb7eLb327mBS3f6qLJeEm1EFLiEyRE+dwqionXzXXvSbA7fa7jes3s5t3mTbY8IWLjHInQnPI1HfFFcTdlV4i403RRA1TfbaqawoNKwGWZ/gmBBAcznNbDjo3SSMKCV2uTMRJUgvE011pDxmvkEd1/hXRvOr2k+OXGTZ8h1PxK1z4bD8mRFmXuMw8yyyKG84YGaEIgJCREqbCioq7ItBq4/Snc+78PzEqqtR8tQ9E2NZ4l8l5/Ai3e741Ag2l6RdYgW66x5Ul5xkYhKXE++pMmuwKqKKjsi89qDF1BwKdk9wwmFm9gkZFaWEkz7Q1cmTmxGV2VHHWELrGxXiTwiRE5p9dBn6VOLd0h9Gbm1fbnH1Fx1LDjzMV6ZkJXeJ3pTr3HWxBJSOKHEJsmJIu2xKic13ROaza56e3a3t3mVeItntjrclwZt0uEOO3szLKKvJXuPYnBVRNB4FRURSQl4aCg0rUn9XdJ4tgtGVSdT8SZsl/dRi03Jy9Rhi3B1UJUCO6p8DpbAS7Aqr4K/UtbPElxZ8VmdBktSY0lsXWXmjQwcAk3EhJOSoqKioqclRaDmpSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlBKuid9FjRv7v8e/LmKqtSronfRY0b+7/Hvy5iqrQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQSronfRY0b+7/Hvy5islrVqdetL8di3PHMWayO5S5SMhb1W4qZNoKqbghboE6QfCvCi7MKKcSKRCnjxvRO+ixo393+PflzFbhmunmMagMxGciG6gUFxXGHrZeZlsfHi24gV2I604TZbDxNkSgXCnEK7JQd/EshYy7F7TlMaK/Gau0JmaDL4qLjaOAhcJIvNFTfZUVEWtUzDONSbNmcfFsU00tt+YmwFnMTHci7j6vqnQGQDzaxyUfAcDqlBXOM1UTRgU62tsxbGLLhmPwsXx2O7Htlub6mKy5JdfVptF5AhukRcKeJEVdhRERNkRErA3zSTEMhzWFqBcJWUt3iA2LTHcWW3aHE4BJC4ShsSQjOISiKkhNqh8I8XFslBjblqPmEW+PyIeBwXsRt0oINyuTt7Vu4NvEoIRMw0YJt1oFcRCIpDZ+A5wAewcfLCzfUa65MCWrTa3ScPOa7A76/KHguDZtOk268UIo/V9QhNnsoyCcXwf3SIqqPeuOkuF3XMGs4mJfUuDbjbyx2cjuLNuedbREBx23tvpEeNNh8Nxoi3AF33Adv4mkOC/LBc3KFdHJ/Xd0jGcvc47aEjffugbcTywxe33LrUZQ+JVLi3VVoNYwTUbIbxl1w0/tEqNlJY/dZzOSXSbMSK/amiMihsC3HidS+8oKP7tSaIWkEzUlMePI4Jius9tfuK57qczdmpNoajRO54UdtY09HpKuSU2YDfdo4ooJcQ7tL4Kbqp5ez6SYTYckj5da2Lw3dI7clrrTv8APcB4H3SdNHmjeVt/YzNQ6wS6vfYOFOVbXOalPQpDMGSEeS40YsvG31gtmqLwko7pxIi7Ltum+3jTx0GF0+yCXlOE2XILgyjUubDbOSA7cKPImzm2yry4kXb+G1bDWLxbHoWJ45bMZtyqse2RW4rZEiIRoAonEu3lVd1X+KrWUoJV0TvosaN/d/j35cxVVqVdE76LGjf3f49+XMVVaBSlKCVayf1i6E/eBM/0rfqqtSrWT+sXQn7wJn+lb9VVoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFanqxidxzvTfIsPtD0Zmbd4DkVhySRC0Jl4lJRQlRP5ItbZSg873jo75S/rTLz2M3AuNsm3aFfwcl5jfIfckmNHbaFlLXGJIUhSVkVSS4vECGqK06goi/T+gmocayyoECVjch6dklmywxdkusBGkR5oPPwGVBglSKLYJ1KqnEhke4ohbj6GrikjJOO4MN1tp9RVGzdbVwBLbkqihCpJ/BFT+aUEL6Q+g2SapZNachsIRZ7LdomWKdb5eXXnH2xZkG2av8drJClInVqJRneETRU2cbVOf8sXR2udov3fJzvA6ymexsp4v3pOHGZs4QhResEiV5DBFTiMthRFVxS5VvsfIswOwXHIZF8sYQmHdocgbM8SyWx3FVRrurfc3NhDwue2+3hJtk4GVXCAlvs2UQlO+zGwcFqCygtObkvGgcbi/wCzFEU1VfKm2+6JQQFzo06pw4T1ltqYVIh3rEYuI3CTImyW3reAzJT7kiMAxiR5UF5rhbImkIx3Ux4E4/pvok5I/fMmizbmyFvuSX5yBe/lbe5EgDuQuIoJaCcGBGUOuJCeBXFcEfmNkSklxn51doFzvrD9hBuNaY7Kx0J9CdlPvOKDSLw7i2JKniXctlRV4fFXGWSZex3ygTJ2PsuWtxoplzOO6MaO0bKuLu0ru5kiog79YnI0XbltQSQNE9Znr+1qNItGBR79a5VnkQ7HGvUvvfL7jjy4xdfKWEhtqoSQcAkYPgUEDYkFHF67fRjzs4+LNypuMCtmlsyZTTLjyNbDkA3JRaFWvEjQqKIu3h7J4vCqwys/u4WyzMR7S0l6nnEGW06hC1FF1xB3VFVCQiTiIQVd0QSUvm7LvdB5I1WwnLdMTG9WuwDk0y+HltuG1xLPdZzIRrrIB8HuOHCfBt4VAAIH1ZaNDL9+KAqr6YwC1TbFgmN2S5No3Lt1ohxJAISEguNsgJJunJeaLzrP0oFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoJV0TvosaN/d/j35cxVVqVdE76LGjf3f49+XMVVaBSlKBUAtPT06J98UEtWqqyCPkIpYrkhL/gsdFq/1+KesOmTFhuS5tYIb7LLRo7KbibgYIvjcHby7eNPFy3+uvFVyKaopnvS2qIrzzfqyPSf0MJpH0zlOrJN+JbbMRNtt+f7rl/jXXl9K3QOCglKzsgEh4kLvTOVNvr3RmvzJxjJX7vDALfd5T4x1QJA9UO7gKiEi7bfxTyb8lTmlby9Ig3Fhph9t3q1bIUJxODfZF2Th2TZE2qOq5VS96ql7yd6YnRyZRCc1DLYvFtZp6/+jFcLXTQ6NLy7BqWKLvw7HaJ4899tubCV+e9utse42xqSsVxVFCBD2Qd9uSePy10XcOOQSvuQkUvGgntsi+LxpXnXVGqpfpH2tuj2qbpqEKptvytc1eX/APRr4Tpd9HgjUB1C3UfH/wB0ztk/x6mvzU+S9yaf4Y7LzCN/N4D4h2/j9X+VdOfFvcM90kSAEt+IwDkqfz8tNdUaql+ojXSj0JfTiaztCTbf/wCGzPdV8F0qtAwRVPPwFEXZeK3S0/8A8VfmTAlZIor3FJMt/GpIm3+PKvgmsk7sKNIktjxoi8PB5f5qnlrutk1VL9Nu1f0f1321CaXblyt0v3VczHSi0JkpuxnYl5P/AIdL91X5oRMGkvL3ZcpchOXgg0fV7/zJOf8AlWSkQQtzCjHcICTmiC8fF/nvuvLbx7010uaul+ko9JPRUy4QzTiXx8rdLXb+f7rlWzYZqVhWoRzgw+8rPW3dV3T/ANleaQOs4uDZXAFC34C+bvttz25V+UjmcyokYo6qSvt7Kil4XLf/ANa9h/0fGQO32LnHXSBdNpbYRbBw8JF3Vun1L82vVNdUzGe55qppiM4WrsndFj0adKvU23e5p2Tuix6NOlXqbbvc1VaVMiSrsndFj0adKvU23e5p2Tuix6NOlXqbbvc1VaUEq7J3RY9GnSr1Nt3uadk7osejTpV6m273NVWlBKuyd0WPRp0q9Tbd7mnZO6LHo06Veptu9zVVpQSrsndFj0adKvU23e5p2Tuix6NOlXqbbvc1VaUHUtNptVgtUKxWK2RLdbbdHbiQ4cRkWWIzDYoLbTbYoggAiiCgoiIiIiJXbpSgUpSglWsn9YuhP3gTP9K36qrUq1k/rF0J+8CZ/pW/VVaBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBXBPiJPgyIJPOspIaJpXGlRDBCRU3FVRURU35cq56UGJexq3PQbZbd3QjWp1l1loFREJWk2BC5c0Rdl5bcxSuBzEYT1/HJXZ845zZj1JKYcLLSCqEyKcPzC33LfclVBXfwR2ztKDTZrOIz8pu2FneJbd+usNi9ONNiqGyw0aNNOtmoKCbOB81VJd91VNlr7k6cRZAxjTJby3IYlHOckf9mcKTIJERHHBcZJvcEREDhEUHbkiLzrWR+lO5934fmJVVaDXZ+AYrdbhBu9ztESVcITgPLLcis9bIMQURVwkBN9t0LZNkRRTZNk2rYqUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFcE2bEtsR6fPktx40cFcddcLhEBTmqqq0mzYltiPT58luPGjgrjrrhcIgKc1VVWpZdrtLziWEuW05Hssc0chQnE4SkEnzX3h/wCoAvi+cXhbIMF69FrZG2ZQ3bsW483ze7nNz17rpSyoVlaXeFGEyZeeLySHFTZRVPGAf2eRL4WyDseG5lJSS3i+UPoU0kVIU1UQRnCib8JbcheRPGniJE4h8qDha68+BGuUYoksFICVCRRJRICRdxISTmJIuyoqc0VKpRNdFWnE7e/z/Xd4c86VNyqmrTz2q3StGw3MpKSmsWyl9CmkipBmqiCM4UTfhLyC8ieNPESJxD5UHea0LV2m7TpU/wCGhRXFyM4KUpUj2UpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSglXRO+ixo393+PflzFVWpV0TvosaN/d/j35cxVVoFKUoFflga3W5icQYjqtOookrgcPJeW3Ov1Pr84QefZbRt+ISOKiqipsibfXvVHGzlo5eazh4zzef2JcmwXSRjc4I0V+E4Iw5UdVQlaVeSKm3PbxKm/k3qmq4l1iEYNCb7OyGyvJd9vHt5UXmqc+dYzLdOrHkTTt0ZmdVMZEndwXZxPq5bfwSufErQ53EiXO+Ic2MAgygRl6x0eHfYiQttk3Xmqf+teaLsVxlO9NXR3viJFOA2IE+/wBSZeC2Qc2yXn5FX+W1ZmI3LbhgicXAm6o2Xi3T6/8ApXbm2ia8rbTLgoKKJoaeF4XPbbmm/wDnXK/EvdsBmPOWOCGm6iCbcv4/Uq/Xzrszmif2KEY4pPSm0aRUXYQTbnWsy91ccZjkHCi7LvzXby/47fzrISbi6GzEx4AH+ym/+WyVE3+kKruo0bB8dxCVcm35SQx7k3KQ66pbbA2KLxc/J41r3bt1XM9FyZyVcmZFtQ223TAC3JCRF5/41in7XBfLrnQ64n0RXFd8Zfwr1BjHRB1Fya0sTb7Pg4+TgoaR3xV10d/7wguyL/Deunm3QgzyDZplwsGWxLjIjMOOjFjxFB99RFVRsEM+HiJUREVSREVaRRVPc5px4oBAHuxeCHG4mGgRslEd9/4In8K/t7ZYgti660fGaoOwJxKP1b/VXjWLrTrzp1k861XkZsF6NKUZ9qnQ1bQDRdlAhVEUa9T47mLWd2aBcnmShFKji/1Zbqgrvso7+PbfxfwqS5YqtRFU7nYnPa+bvY48w1cYFsfBTiUvGqrXrb+jmhJC/aG2hKqKtq238n+9/wCfj8deUbvb2/BZJ0/Gu5NmqL//AMr1t/R4susrqALpCX/wrYkXdV/3vx1233PFe6XselKVOhKUpQKUpQKUpQKUpQKUpQKUpQSrWT+sXQn7wJn+lb9VVqVayf1i6E/eBM/0rfqqtApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlApSlBKh+lO5934fmJVVah+bZZF096RDOU3/AB3MJVpmYWlvbl2PErpem0kDOI1bNYEd7qy4VRfD23TxVm+0tp15uaq+yfKvh1BVaVKu0tp15uaq+yfKvh1O0tp15uaq+yfKvh1BVaVKu0tp15uaq+yfKvh1eTtZ/wCk+k6AdIRzFcmwW7X3Ty9W+LcoCu45cbBe7YioTTwqzcWmu7AVxkzEkFsf3ij1iqCige3smzbvNOGy2e1FdboraPONdcjLUdtVVBJ1xULh4lRdkESJdlXbZN6w3y6z3zLsHrC9+jrUcCzK1ailes5ssa4sQbxKivxm7jCciSQaW3RCQTacRCHmRL4tl33RVRUVcbedQspx7OrXZbvhUNnG71cEtEG5jeUKc5LVk3UJYSNcKMbNmnH16uIqbq0g+EmvRh7NNFOlTnMxHj3x5Szq71yqqdGcss/DuUD5dZ75l2D1he/R0+XWe+Zdg9YXv0dRTF9cs8uNptebZPppZbbht2uCW9ufb8lemzo5HJWOy4/FOEyAtq5woSg8ajxIuxJuqUO/Zn3kzTFsQ729d8pe7v8AtHXcPc/c7SOfN4V4+Lfbxpt4+deos4eYz0P+3V5m5ejZpenRtHy6z3zLsHrC9+jp8us98y7B6wvfo6j2adIVrCn5SysPkS4kDLG8clusStzajrBGY7N4ODckbBS3bRd1QFVF/s1s0zVvHbRPycb6vcltxtm3upMa45JzFliStttMNArhmqiIiAIZGpIgpvsitVh+GOc9XdZe4vTo3v5dZ75l2D1he/R0+XWe+Zdg9YXv0dTCNr9h90yrEcbsMW7zwysrg0kjvROaWA9FQVNqSBsIsc9y2UXlbIeSqnhJWyZVqdheF3SJZ8huchmTMQS/cW+TJbjNkXCLslxlsgitKW4o48QAqoqIvJdmpw/DHOermsvcU8o6Nr+XWe+Zdg9YXv0dPl1nvmXYPWF79HWkRNZdOZ2TzMQjX50rjC7oQyK3yRiumwm77TMom0YfdbT57bRkYbLxCmy7Y6w9IfSDJLbPvFryt1INutrV4ckS7XMiNvQneTciOTzQJJbJdhQmeNFJUH5yolNTh+GOc9TWXuKeUdFI+XWe+Zdg9YXv0dPl1nvmXYPWF79HUds/SPx6+Tru1DtUhqNa7ottFJUeazOkKlrSeqJCWL1zbqD4PVOICqicSKqqIF2cT6ROIX3Dxze9oVkgpZLbd3Y7seaUwClk4AMjHKMBuqRt8DSNcZuqvIE3DjarDT+zHOerusv+M8o6Kz8us98y7B6wvfo6fLrPfMuwesL36OptM6QmlMGzwr07ebq4FwKS2xEj49cX56OR1FH2zhtsFIbNvjFSA2xIR3JU4UVU5brr9pTZwtT8jIpUmPeIke4MSbfaJs1hmK+SCy/JdYaMIjZqvI31bFeE+fgFs1WH4Y5z1c1l7xnlHRRUz7Nml45OD2o20+cMW+mbqp/4RcjAKr/M0/nW4WG+2/I7Y1dbaZq04pAQODwuNOCqibZj/ZISRUVPrSpXieXJlE3I4aQO5ksF3K18fW8fX7MNO9ZtsnD/ALXbbn83ffnsm2aYcnstbTkIX1OFPIm8CIS/5kSr/NVqHE2LUW5rojLL4/VNYu1zXo1Tnm3ilKVmLpXBNmxLbEenz5LceNHBXHXXC4RAU5qqqtJs2JbYj0+fJbjxo4K4664XCICnNVVall2u0vOJgS5bTkeyxzRyFCcThKQSfNfeT/qAL4vnL4WyDBevRa2RtmUN27FuPMu12l5xLCXLacj2WOaOQoTicJSCT5r7w/8AUAXxfOLwtkHnpSqUROec7ZlQmZmc53lKUro68+BGuUYoksFICVCRRJRICRdxISTmJIuyoqc0VK2LDcykpJaxbKX0KaSKkKaqIIzhRN+EtuQvInjHxEicQ+VBwtdefAjXKMUSWCkBKhIokokBIu4kJJzEkXZUVOaKlciaqKtOjf6/r+jtFc250qVbpWjYbmUlJLWLZS+hTSRUhTVRBGcKJvwrtyF5E8Y+IkTiHyoO81oWrtN2nSp/w0aK4uRnBSlKke2lZXqZDwfLbdaMsiMW+w3aK+UW+OS0RsZjIE65GeBRTq92ANwD4lQurcRUFUHj12z9IrDustUDNWJWN3K+ONlEjHElyW4zEhxRhLPkgx3PAefREUWXnBVSJBFTKs/rNp4OqOCuYkUS2SeO5W2bwXFvjZ2jTGXy5cJeFwtkg8vGqc08dS3Ufo33/KNVJuU2tuJMs+RSbbIuSy8zvttGEsTgRUS2QHAjXHiFsVFX3GlAvH1gogIFZsmrmCZFmEzBrTcZ7t0hG82RuWiY1CecaVEebYmG0kaQbarsYNOGQKhISIoltuNSDCdNs+sOq10yWQ3arTYH3ZTpBa8iuL7V060lIFO0vh3Lb3RJVM3o7hE8e5FwoailfoFKUoFda43GFaIEi6XKSEeLFbJ550/EACm6rXZrT9V/+DSD+y5dLS2SfWJXCOhIv8FRVT/GpLNEXLlNE98xDxcq0KJq8IY8tQsslL11qweIMYubffK7FGfVPIqttsOoP8lLdPKiLyr+fLrPfMuwesL36Ovmla/Z7HB/WerO113i9Oj6+XWe+Zdg9YXv0dPl1nvmXYPWF79HXzSnZ7HBHOeprrvF6dH18us98y7B6wvfo6fLrPfMuwesL36OvmlOz2OCOc9TXXeL06Pr5dZ75l2D1he/R0+XWe+Zdg9YXv0dfNKdnscEc56muu8Xp0fXy6z3zLsHrC9+jp8us98y7B6wvfo6+aU7PY4I5z1Ndd4vTo+vl1nvmXYPWF79HT5dZ75l2D1he/R180p2exwRznqa67xenR9fLrPfMuwesL36Ony6z3zLsHrC9+jr5pTs9jgjnPU113i9OjJ2LPZEq5s2bJbINqky1UYjrMrumM+aIpK2hqAEJ8KKqIQIioi7KqptW4VJck8Fm1uDyIL7aOFfKm89gV/zElT+SrVaqhjLNFuYmiMs1vDXKq4mKu5Kuid9FjRv7v8AHvy5iqrUq6J30WNG/u/x78uYqq1TWSlKUCvzalCc0HSbeURRPmKvDxJ9e3j5/V9VfpLX5qXBIxl3WDxNOCKqIkXLdP4VRxkTOj81nDzlm6+Rx+rZCQCohMx1420Hxpty3/j461mCTrrgvvojYgibEhbeTZE/9ay825q62UaUaIsgNhe8a8X1LWs2uNNauT8YpEVGhPdONtURPrTdEqvRRknmrY3RrJVeALeDrZup/syAuSJ/NPF/jX9ekKLqbg7JdNOSCm6Kn/iVa/lujRS4BigAEabO9WRIK/Wv+O1dS63KbZ5bkyK0j0Ydh3PchTbyKmy1NlmhmYfU6NAjtnJkIAPEm3ETfNf8fHtW26Taf6MdE3Bsg6XeWQg763Fs4mPMSVV7jkHxbdSKDxAThCqKXkASXdEVd5qWbddxhIFl1xV38BPB4V8SpvzretQbu1r1oJB07fyW52dzFyQ32oaqrEthF8DrB+aSpy2RV8abpXucRThaZrrzy73mqM4c2A/0vmHxbFbIGpOBX2Xd0bXvhOtjbQMqakqp1bRFvsg7JzXmqKvLetThf0r17sGp9xkPlGy7A58lTiRnLeltuNvaVd0BFRSBxRTkvERcW2+4+KvBWra5Bgl5Wzx7eg2/ZFamE2hE+KpvzVOQr/BK0tu62+5W9tpxpW5QLzJPESfXWrY1WIo1lG6XimKaozh+9OXz9BdaLBZ8gBqwz7hchYlg24DJyDbVEVQdRN99kX+OypXlfXrQeRpvlEe74kKfJ+7ATkcN/wDYHvuTX8UTxp/Bf4V+cOD6g5rp/cRueI5LMgPInCqsuqO47+JfIqV6QhdPvWqfjCYjnTtoyW1HwqKTYTYSWVTxG261wrxeP5yLui7LVK57Pu62a6ZjLwS6WjTot37qmSXCCbHJpxteAwLku6eXf6lr2B/R6vEbuoDKsmIgNpITL+1uszl/NNv+qV5bsFwsuf49GyKwGrgvD4S+JQLygW3iVF5V656BsV+OzmqyWuqdLvchBui8OyytuaeXZf8A651FbmYr0ZeK9tOb1hSlKtIClKUClKUClKUClKUClKUClKUEq1k/rF0J+8CZ/pW/VValWsn9YuhP3gTP9K36qrQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQKUpQK6ki7WuHOiWuXcorE24dZ3JGceEXZHVjxH1YKu58KLuuyLsnNa7dRvWm8piepmmWZT7Fks+021y8NTHbHjs+8OR1diiLam1CZdcFCJFTiUdt/LQWSurbrpbbvHWXabjGmsC64yrsd4XARxs1BwNxVU4hMSFU8aKiovNK8w6g3/OMr1txS74ZbNQ7Zb40qzSlJYGSNRbhbJBoMjrWOJiBENriVHG5TL8lULi4WRbRxJdLw/WTHsetWOY3ddRcYtke65G7HKNYMhvEly7ndnTjqXc0+KqMmwTZA5MJyASqaubLxKoe+CIRFSJURETdVXxIlde3XK3XiBHutonxp0KW2L0eTGdF1p0FTdCAxVUJFTxKi7V5oZxTVCblj14us/P3HZeX3CzyGUuE5mCtmctBEhDGBxWGw7qQeB8dyE14Qc2XZdC03sOpWKXDRWFbYupZMxbVa7dLskoL/AA2IXBxpLfckbuwHBHwxKPcGW3CFAKM+OzYkHt2lKUClKUClKUClKUClKUClKUCpqPRz0cc1cuGulzwyNds1nJHBu53IilLABloW2xiNuKoRuQqSk2KEpGaqq77VSq1+2ag4NestvGBWrLbVKyTH0aK6WhuUCzIgutg42Ztb8aAQOAqFtwrvtvuipQac1/xhmf8Azdj8th1N8twDOMs1Fs12fs+IRYNjnty4eTxpDwXxqKhCTtvFlWFFG3VHhccSSgkK82d0RapDX/GGZ/8AN2Py2HXereiM6KfhHpDJmcqqvjPqgeL6W6xnidm0qyu34hbsZtd0Ce/drbfpUudMaZmrKbaSKcJkGeMkBCLrnOFEJEEt0VKBqViuW3G641meCsWaZesYkSCCBd5bsSNLZkNdU4KyGmniaIfBNF6lxF4eHYeLiHfKUiiIjI0pzzR+1aS5dInW3I8nfsqXGTlzuS3eFGecejMNFbjhjGYcNoSf2Tq1UzBvi3NeEeQrqU7oy5P3my6xxshiyoLlztE/FY6XCXbXWY0HiIIT8qLs8yiKRNg+zuQggKokoqh+jawWdZjatPcOvGcXxqW7b7HDcmyQiNda8TYJuSAG6cRbeJPLXJopy2uxXV3JZgOjmY4hdcYvvcFladYulzlXmOeTXS5uNtSmG2wMJk4XHpjo9Q2i8SRwVC5InD4e0X7FdR7bqNMzDARxuQxkFvhW64FeJUhsrekZx4keZaabJJPEL5IrauMbKCLxrvsmPjdIa2nekstx02zW2E1dItrmyJTEJWYRS+FIjrhNyTUgeUxREaQzDf8Aeg0nOuzF6QWIOXiVDuVlv9qtDZT24V/mx2kgXJyEJFKBhAdJ9FBG3dutabQ0aNW1NERV8xoxGUO+81uFo1qB31iWOfKx5MYsN3u99ts1qS+dwlvzRkILDzJNcDINrLd3cF1xTQQ8AOdf2foPksvHrLbGLlamJFkxCBaGVQ3eqK4RJUeQ3uiCi9QRR+El5FsXza5YHSNfLIrwF+wS+2a1RbNa5tthzIjSXG4SZst9hkG1B82dnFBrhEyAgU163q08Wft2sTt+vWM2uBYJdoen3qZZr1bru0HdkB1mGchB4mHTZVVRGiQgNwFA+S7+JEUSZ1Netmk+pV0y1czy5zGYT8m/99nIdulyJAR2e8xQerR1xltXj60uPiUG04V8W6eFiLZoTqTCxxhSk403e7RbMbZgMpOkORZEm0yHj4XXOpE223QME4kA1AlJeE+BOL0NSvWrhzTlG8O0jzGHmreoWUO2Nq4XB+7TbhDgvuPMxXZLMRhltl02gJ5BbieG4Qtqqmuw7ck0XJOjlqzeMatOIjkEJ6BBxeHam0DLLrbo8OazxK6Sw4oI1cG3v3Y7yFTq0Hk2aKoL6epSbcTsNOWqYLilyxmdlUq4PRjG+XsrlHRkiJQaWMw1se4psXE0Xi3TZU5+RN20x/3nL/8Anwfl0KupWq2bRDRfUq/ZVfdRtIcKyq5MXZqI1MvdgiTn22BgRSFoXHmyJAQjMkFF23Ml8q1HiYys1frvh7sTndj9dzetY9SW9HtMr/qfJxm6X+JjcdJ02Da0bWSsQTHr3QRwhFeqaVx1UUk3RtU33rW9G+lNoLrzjj2S6a6jWye3DYWRPhvOdzzYIJ41eYPYxFF3Tj2UFVF4SKtO1j6EuiGcaZX/AA/TrR7SnEL/AHmOMKPffkNBdO3tmYi860IABdajKudWSGKiagW6bVjuj1/R69HXo725xyx2KTfMjlRijScgurvHKQS+cjAjsEdN/EoJx7bIRltWLVnlOjvaM55bHV1+1ov1tivXSBZ3pUSJZLpebXZziiqzXYgtEL8gjfaQBFXEJGtlVURV3E0Ea/pa8WuJOhQLhhuSCHFAjXme03Fci2SXLEFYYk8MhXCIlcbRVYB4A6wVMhTdU7eqWktwvl2bsuQZAUZt2yXazQJ3cqGkoZjbY7l4QoLzaNbqHicRdxUdlRNNufRegXjN4Ob3J7CJc4zt8i6y5mDxpk8n4oAKdwSZDrncTZo2O4ED6j4SgYEvEmdRlOc1fi7/AI/rczs4mff397bImtiXa1zrpj2lubXgYt2es8ZuIxCQpz7LrjbxATkkQabBWiVTkEyhbigcREg1qt66Rs8X4Ey0YddI1ml4tdr3KlS4sZ123yobzbRMuNDMBTUCUwJG1USJQ4XOHiJMjlfR8TI8MtuJnerJNbt+Qzb4ca/WDvlbJiSXXz6mRD69tHOr7o3AlPkbYlw/2a6AdGd2FilvxC0ZjDiQ4dlvViNEsiIKx5zwuh1QNvADStKAJsiKJCioghy29xokaLbJGt9gh5YuNP49f1hNTY9pkZAkdlLazcXgE24hbu9fxkhtpxi0TSE4Iq4hbonxp/rnZtQb3EtEXDsntDV0t7tytU65MRhj3Blkwbe6vqn3DAgJwUVHQDi8YcQ866ErRG7SMpffDN2m8Tm3mLkcuzpav+1HcWBbQeGWjqILCky0ZNqyRqQl+9QS4UzGI6UfJaRhz/f7ur5J2WXZ9u5eDunrzYLrPnrwbdR83wt+Lxptz57uTnu5Mrc9SsfsF+7w5LFutn6w0GPcJUBxba8i8KCqzAQmGVUy6sQfNtwiTYRVFFS6uoOqDGBTrZaGcOyHJbneGpL0SFZgjdYQsICuqpSX2Wx2E+JNyTfhVE3JREsFdtBIlz1NTVNrUbKItzbdE47HcloltxG+AQcYjuyoLsmO04g+GDTwIqkRJsq71t95w/vtmFmyvvj1XeiFPh9z9Txdb3T1XhcXEnDw9V4tl34vGm3PmxzYnOb6h5fd8Si6hYm3ZGMOW2Q7m0xdoby3G8Pvlu3Fik2+Cw3x8ARIm3lJ1wUEU4dy9AYRmss3WMayo1Gc4G8KWaIKTBRN1AtuQvCnjFORbKQ+VBltl08gYrjOF225XOJKZwZlF7qkMOBxkMY2etFBdQWy2Nfno4myqibKqEm+2fT6JnsVyVntkYlWGS0bbNknxxcblNmKiRymjRUISFVRGiRU2Xck3VEHkTMXI1e/6ef08/mktzVpxofqFRpXnzVDQLoz4PjLU+z9FnSSZdLjcYdot7cjD4AsDIlPC0BuqLCqjY8XEqJsq8PCioqotYBzo/6NaZ49cLlqz0a9E8nMXYzFqcxTTqFAeuMp9zqwhpElOPCBqatojpSkbXjVS6pAUl0mg9RUrx9dI/QytcdEPoS2CRcY0O4T7ta2cGsHdNpaguNBL69ScRo1bR5s9mHHeMV3b415VzZRinRWYyaFjmHdELTydFG+2yz3G+u4NaVt7LkoBdKMKIov9ejJtnxK0rScaCpqe4oHruleIMQtPR0yHKo9mmdE3S2NaJEHGJMe6lp3aUSW5cyfQx6lJBEwmzSIKr1nAoub9YihvsbkToTx4Dl0mdDnF48WQEeRZXDwSyL39ivS2ooyIqCSqII7IZ3GQjLnC4hICpQevKV5Iv1l6HmN6bztSLv0KsQiM2e4PWy8W6ZjWKw37Y80qIXXPyJLcNUXjb4erkGpcacKKu+2x6XaNdFvUifkb0boyaSjaoLlvO2GmEQAeNiTAYk7uorapxbvKnJERERE5+NQsOsepLej2mV/1Pk4zdL/ABMbjpOmwbWjayViCY9e6COEIr1TSuOqikm6Nqm+9TKy9JnRHpF6bpdtJs9gXd1u6WZyVbiLqZ8RO+UZF62Oexim/LjRFBVReEl8ddfWPoS6IZxplf8AD9OtHtKcQv8AeY4wo99+Q0F07e2ZiLzrQgAF1qMq51ZIYqJqBbptWl6cdA3QTos4i1e8QtEm8ZYtxtLL2RXZxHJPCVxj8YsgmzbAruqeCPGorsRlU+F/Po+MeqK/+VV8J9F5pSlbLMYPOrhkVpw29XXEokWVeIUF6RCjyRImnnQFSQCQVRfC225L41StRLVwZt0x9+zhFWxSMaeyq8ynhVTjQ1Ae5xHYk4SMlcXmi+CyabIvNKUqIqbKm6LUTsnRpbtGH5Lh7+bvz2ckubKuPPwA42bG0/xhaB4STdtGyda41XfZ0lUV8virSz2PVOXe4Lxrbm9k0ay/Lr7BsVlyfHEYkIEtpw4LMWSrZsOuj1okSA24QGvWAiuMObcKck2PRrPn84euZ/t00v1CZiC2nDhkFWCiESrzeLvjLRUJE8FNg8S818mDybowYz3Hd7dpQ3jmn8K92tIU2FbccaGM9JbkNvR5RtsOMoRBwuAqeMhc24h4edBw226qQZMk9QszxS9RybRI7dmxmTazbPfmpk7PkoabeRBHbx7r4q5EVZ7XZmnLYnMnP9a3ZGe5VaLjhj2P4RdZMZLG7ZJIz5seOw265tP7t6ptwkMuFVjKO6Ii+NSTZZ2veNQ7xGgM47kE23K5BYuN5issFCtT8wQKM1IQnUfUj61rdWmnBDrBU1BN1TDztFdQpUzL7RG1NssXEM1uL0y4wgxl1bo208022601NWb1QqQt7IaxiVEJdk32VOlkfRZxi8ajMZxBiYaDRPwH5S3TDYt0ujSxBAGwhTnyVIoELYISK06qLxE2rZLxJz343O+7O9t5612Fh+8SpWN5E1j1mamG5kiRW3be65EUkkNAjbhPiQkBiiuNABkKoBGqpvjmukFZkt01bjgmXW6/xnobDGNyGIi3Gasvi7mJpW5BR+E+BzmbwcHVn1nBtXB+xC9PWy/4PJz5scGvKXIwtcazAE1t2aZuOdZLNwwcAHHTJsQYbJNhQzNEVC6h6F5bcEk5Jf8AUeBLzVt63OWu6M2AmYMMYSuK0Jw1kkTvH17/AFqo+Cl1ngdXwpXc6z3XzYukFPfs77tx0/vlyv7t7u0GDj1qZjtz+5YRohuOd0yQYRQQgQlR3YlMerQt0rZ8X1nsGaZNCxzF7DfJzUuzxb4dy6llmLGjSetRpHEddF7jUmTFRFslFdt9k3VNDybost5RaIx3y8YnkF+j3S43NH8lw5u6WxVmqCuikEnwUVAgHqzR7iFE2Lj3LegadaUxNO5xyYNyZdYWx22yhHZtrEJsO5FfVXBbYQWgQ1fXwAbER4eW+/LlOnntJ0ctjfKUpUqNiMl/3a2/8+s35jHqtVGNQbHZcmx9jH8js8K62u4Xi0R5cGdHB+PIaK4R0IHGzRRMVTkqKiotZLsndFj0adKvU23e5qhj91Pz+i5hP2vkdE76LGjf3f49+XMVVa8v9GToydG2/wDRt0ovt96PmmtxuVxwexS5kyXicB5+S+5AZJx1xwmlIzIlUlJVVVVVVapfZO6LHo06Veptu9zWcuKrSpV2Tuix6NOlXqbbvc07J3RY9GnSr1Nt3uaDUdFenHoZrFkUrTyRd3cN1Atsx22zsUyNQjTAltmrbjTRoStPqhiSIIEp7DuoDXg8byisbszDcRP7SDxIi/Xuvjr0/ob/AEW+iWA5S9qZqnHg5plcqedzCHGgDbrBbXicVxAjQG1VFAFJREXCINhHZsVSvE4ZBd7KwEb90/EJUQCaVOHn4t033Tx1BejPJNa728uSpMuAIOuqSC4iqZfOROfP+f8AlX0xc2gRwXZDiltvuYom/LxbVqMe/wA0lJyOTfEo7IAlvt/Fa7trcF8XnZ3huEPEJEu23hIi/wAPLVfLJPk3W15H3BAQyMkVV4fGni8tUrSzS3LtaGnZNojpbbQyatP3GaK9WReUQFOZl4uScufjqVYXjMzL8qt+KWfZ+dcnxYDnugiq81+pERN1X+CLW59L/XDpJ9FHUnFNOdK7PHf0872RSb4bd1hS3kNUko68PMDJefLbkSeOvMxVMe68VRt2b1OsHRPtULISsM2aF4MOJWnldUBVPKitDzQUXlzPfddtk8dda+aBagYzNukCX3W9anWm22Vi29AjCJL80EaMl3Q0aVTVEXYS5LutehdNHWBillT7ZDIubTTnBvv1QcO4tp9SJuq/xVVXy1PdQP6QTSTTjU+LpJcrbeJd6elsRHlZYQWmCd4eBSIlTdNiRfBRaxbNF32jNVNdU/CIzyRV4e5G2qdrxxq1j9hgPyLQzKiSoTa9yNnOEJAyOrHg57j4K8vKqbIvlWvKeT4jgVqvhhndluFjWRJPaTa0AW90RFUUHYgVOaF4gXZU8lfuvqDhukeX2hwdQMQtk0CHr1UoqHIEtvnCYJxoW3lTnX5NdM3G9GXrdNl6T59NmQTnMxe4rzAcZegzUQ16tuQaCpt8KEhCabt8QqpKhbJqYLBXcLMRTXnE78tkx8P7orVNducpnOGq4d0ctG8sIJEHUW6OsOohgIttIaIv1ptuv+Xkrdneg/i1xt6uY5qarksd0QZUdARV35Iuy7pXjTHtQMixkxjJLkpGRV8FtzgIF+sV8W2/jTxL/Dx1VMG6QmpEi5s2q2yu6esJE6wkUVQf4pvslXLlrHWpmabuceeTToqtVbKo2vS2hWjuo+k8/IrbeXrfKtIA2+LjUjiET32UttkVOXjT+CV756IEYmouTvkqkr3cK8W2yFt1/iTdeXOvLWkV/hLZkau8Ga+7cgVuQRtbgakmy78/F9VeruilKGS5lYiv+z7gFE22RB/foiInkTktVcLiK8Tembm/+yPE2otU5Q9A0pStVQKUpQKUpQKUpQKUpQKUpQKUpQSrWT+sXQn7wJn+lb9VVqVayf1i6E/eBM/0rfqqtApSlApSlApSlApSlApSlApSlApSlApSlArhlzIkCM5MnSmY0dkeJx140AAT61JeSJXNWu5BhzN5uUS+x5iMXCCqFHWRHCUwiou6L1Z8wX/xNE2S8tyXZEQOqOqGFuZGGLMXmO9ON8YyI2+2Q9YokW3zt+XBwry+cQp499s9Lvtkt86PbJ95gxpktdo8d6QAOvc9vAFV3Lny5JWnWnT7IY+auZRcsodcZWRIkC02LKqvF1YAK7s7onVBsWxbpy2XmSr2Lvh18uN2ubQ97itt4kRX3pRumkpkGeFUZAOBRVFIN0LjTh6wl4VXxhk7Zn+PXWPd7gw+g26yuE0/OJ9lWTIfncPCakiJ9ZIO+6bbpXzZtRMUu1sbujt2h24XWlkIzMmx0cFrl4ZIDhIKbEPjXdN03RF5Vwji14DT5/GBlx++Upl0Hn+MurU3jInFRduL+2W3L6vFWNuGCXc4s4oaQXXp13GY82sk46uxWwQWW0fFsjaIeES3BN0XiRCTfeg2d3LsTZhM3J7J7S3EkoqsyCmtI24iKgrwkpbLsqonLyqlfS5ZiqRJM9cltSRobvUyHlmN9Wy54uAy32Ev4LzrRIul18W3SGZ8mC5KOJIjMGUh57qikyCJ8+NwVNV6ngFCVVVVRUXku689100uTt0W7W8Iio3LRWYbdxkQASOEZGmtnWB4gMF4/BRFFUNU3Sg3cslxwHYTJ3+2i5ckQoQLKbQpKL4lbTfw0XdPm7+OucLtanLet2bucQoKCpLJF4VaREXZV499tkVFTx+StHYwC9w51uZiN2sILAshJcSS+SvNi4rrjZsPC6Lu7hEQudYJjxeNdtlyDuDTY53G8Q5UOTermCtOKbAxYiCXgqRNtipvKg+JHjPmnJQRVoMxdsst1tdbhxWnbpPddVkYUEmye4kDjXi4zEQ2DYvCJOSptvum/RHUK1yShjarZdLl3TGblu9yMCaxGTLhEnUUkXffi8EEItgJdtk3rBy9Pr43jcGwQQtshyC5JRua9Nkx5CIe6C+rjKIRHsSobfzT5eEicq6iaSO22cx3ojWx1tgYKtT5DzgS46xhTcGkQCEUcUU4jQkVEMtxPZEoN4uOWWC2wDuB3JmQKNK621HcFxx5ONARGxRfC3NRH6t1RFVKxxZ/CFkW+8t0W5lLWElqEWVk9agI4vNHOq4UBUJS49tlRN9+VYiPg1/Ztt5bltWefIvLrUt1tx15psD6xSNlswHjbAd+IHETi41IlHdaxJ6RSwhsvnCtN1nOnNdks3GU+4w24+gIJiZCZvK2jYonGiKS+FuK7UHI/pnneQyHb9C6SeqVjj3Fw5TVrC2Y2gwQNVJGBR60uO7Ai8KcZmWwpuRLuS/H7G9RfSx1V/DcV+DVSrTBK12qHbTlOSSisNsq8585xRFE4l8fNdt67dBKv2N6i+ljqr+G4r8Gp+xvUX0sdVfw3Ffg1VWlB510RxDVrUnRrBdQ770qdSmLlk+OW68S2olrxcWAekRgdMW0K0ESAhGqIikq7bbqvjrdf2N6i+ljqr+G4r8Gp0UPovaRf+R7H/7FqqrQSr9jeovpY6q/huK/Bqfsb1F9LHVX8NxX4NVVpQSr9jeovpY6q/huK/Bq8S68dA7pJa49LNrLMb1QyKx2jF7fChpn97O3sXCS9wk6SwWbUxFU+rR8W+J1AXiBxEdVBEU/S+lBCtNsWvWFJkGM5Fnl4zG4QrjHB68XZuOEmSve6HzJGGwHZPEiqilsnhEZbku5Vkcnw26P3ZzIsWkRAlyWwbmRZikLMjg3QDQxRSbNEXh34SRU2RU5ItYjvFqb9g4x+OyP0dbVu9bqop2xuiNvlDMuWq4qnZ3ualcPeLU37Bxj8dkfo6d4tTfsHGPx2R+jr3rLfFHOHjV1+E8nNWv5/iny5wu8Yh3f3F32iHF7o6rrOq4v7XDuPF/LdKzXeLU37Bxj8dkfo6d4tTfsHGPx2R+jprLc/tRzh2KK47p5NBvekffi5Xi4/KDqe+t4sl24O5OLqu95NF1e/GnF1nVfO5cPF4i256410dnpclyy5LmYXHDIrt1ftVnZtfc8lhy4A6DyPykdIXwAZD6NiLLSihJxq4o7rYe8Wpv2DjH47I/R07xam/YOMfjsj9HXnStT+1HN3K54TyQ+7dGm65jbbpF1Hzq1ZE5Kttst8RpzGGxgt9wSjkMHIjOPOJI41NBdFSASQfARrflm9P8AQKLg44+4xLxuG5Z7vLu70bHcWYs0Bwnopx0baYaMiBBQkJScceMlRU4kThQar3i1N+wcY/HZH6OneLU37Bxj8dkfo65nazz0o5/3dyuTsynk5qVw94tTfsHGPx2R+jp3i1N+wcY/HZH6Ovest8Uc4eNXX4Tyc1K4e8Wpv2DjH47I/R07xam/YOMfjsj9HTWW+KOcGrr8J5Oau3ph/vGXr5Fvwfl0OscmPamPL1a23GIiFy67vpIkcH8er7mb4v5cY/zrcsXxyPjFqS3tSDkvOOHIlSXERCfeNdyNUTkieJERPEKInkqvir1GrmmJzmU+Ht1aelMZRDL0pSspfdG9WW25DbXrVdY6PR3kTdN1QhJF3QhVOYki7KipzRUqYyY1yxi5BYb66rwvKqQJ6oiDKFE34D25C8ieNPESJxD5UGuV0b1ZbbkNtetN2jo9HeRN03VCEkXcSEk5iSLsqKnNFSq96xrPep/F6+U/rYgvWYubY3p1SutJjXLGLkFhvzqvC8qpAnqiIMoUTfgPbkLyJ408RInEPlQezVOJz+KjticpKUpXQrjkyY8OO5LlvA0y0KmZmuwiKeNVWkmTHhx3Jct4GmWhUzM12ERTxqq1kMSxORkMhjI8jim1AaJHbfb3R2IyTmL7wr5fKAL83kS+Fsg821To073aaZrnRpMTxORkMhjI8jim1AaJHbfb3R2IyTmL7wr5fKAL835y+Fsg0elKv2rUWoyjf3y0LduLcZQweaYfaM7x2Rjd5KS0y8bbzT8V1Wn4z7Ro4080afNMHBEkVUVNx5oqboukOaAWy42u4N5PqFl9/wAgm9zdTk0w4LVwgdzO9dG7nbjxWog9W6qnsUckNeTqOCiClTpUqRJovRvw9oJTs3IsjuFwuVnutnuNxkvx+vm98DaKRJcQGRbF39y2go2ANiibI34tvt/o7Y05kwX+PluTxIfd8G7vWZh6KkGRcIrQtBKPdhXuMmgACEXUbXgQkBD3JfPOoWr2UacYO/bsLzOXjt7dv2Y3eJxybdHiXHuW5uqcVe6Ykp+Q+onxBHjNtkQg4pPtIiLXUyLUrP8ABpGfOY7qjAsw3vUNvvper3doVrj2SOdljOsIkpy2zGmBeMUaEpDBoaAgiYmXEoei7R0aMJsk+2TYl9yEgtcSzRAjuPR1bd72G6Ucz/c8XEvXOCfCQiqKmyIqb1wNdF7DOoSHOyrKZ0OEsVuzRpEiNwWaKxMZlpFjqDAkTZOR2UIn1dd4QQUMalcTVXWye4F3n6htxSsVsw+ZIg223NFAuh3Cc7HkqZy4jcpGzbEDDgRhULZU3FeFdJv2pOa6W2q/vWfWx6J1eoORrOhOvWdm5yneuaJiLGGXFSPKNRLj7j66LIdAuJp7weFQ9L5N0dsZyKc1dGcqyO0TW73NvSyIJQyMllsCxJjor8dzq2zbBE42+F4efC6O61sunGl1h0wiSolinXGSMtuE24Uxxsi2ixGoze3AApuoMipcvnKqpsmyJtUF85MKPJcbNs3WgMgMOAhVURVRR3XhX+G67fXXPQK0/Vf/AIORfqu9nVf5d8Y9bhXQvtlg5DaJVluImseW2oEoFwmK+NCFfISKiKi+RUSpbNcW7lNc7omJeLlM10TTHfDS6VxFjGpENe52WseujYchkvTnobhp9ZNiw6KL9exbb+JE8VfzvFqb9g4x+OyP0dbGttzuqjmzdXX4S5qVw94tTfsHGPx2R+jp3i1N+wcY/HZH6Omst8Uc4c1dfhPJzUrh7xam/YOMfjsj9HTvFqb9g4x+OyP0dNZb4o5wauvwnk5qVw94tTfsHGPx2R+jp3i1N+wcY/HZH6Omst8Uc4NXX4Tyc1K4e8Wpv2DjH47I/R07xam/YOMfjsj9HTWW+KOcGrr8J5OalcPeLU37Bxj8dkfo6d4tTfsHGPx2R+jprLfFHODV1+E8nNSuHvFqb9g4x+OyP0dO8Wpv2DjH47I/R01lvijnBq6/CeTHZL/u9sTyrfrP+Yx6rVaJZcJv0u6Rbpl7tvaat7qSI0GC4bwk8iKguOOmIKSDuqoKAnhbKqrslb3WfjbtNcxTTOeS5hqKqYmau9Kuid9FjRv7v8e/LmKqtSronfRY0b+7/Hvy5iqrVJaKUpQK/DqFBkxG0gq0htkqiIqH/ov+FfuLX4kzJzbbqosh0DAtvEuyL5dtk2/hUV2d0JrPe6cWDc0dUWQ4FRdk5f5VttltN1WOL0g3WgQfn9SpIhcXl8m1dSJFclCEjrlFUDi3Xdd03/h5f41szuSvWbHzjJIKK0bRKalvsQfV5fKm9V5qz2QsbkJ1h1MvuE3mAxh17k225QT69ZcRzq3BPybKP+PKvT/Rs6ZVj1pxhzE9dwgTMqtytx4MwgJClMqqKTrm6cCGioKeCvPmuyeX8/M5vZ3a/TZrp8auulweXlv/AJVgoF0WyTQuEJwRlNLxAfCi8K/XzTb/AKVo3cBRfw8W6t/i8UVzTVpP2syHWHGoFoWPByyDBQA2EyeFETl//FeC28TxW5dINvVXJdShu8WNchuBsvGLjzrra7gHEnLq04R22Txcv415aZmTMokG/dL/ACXUFfCJ54i4i/xWu6wrdsdE4F7ECFeQoW/lROaf41Uw3sicLEzRc2zCau/FydsP0u1D6RuSahXJsrODKQnAQVfZmqw4A+JR2FOf1818taTkmmFs1J7hjTIDLgQ0LfrD6xAcPmRJz357Jz/glaH0YAHUPF3p04oDD8B9YxGTnV9Zsm+6Iv8A/avSFrwCwQYvdL8mObyIiogu8aFt4v4f5rWHir12xXNuJymO9ctW7OjFczCJSuh/ibjPCdoYccXkg8Ioip9ac96/sHocYxZrg1cbJEeiSw2VVUCQNvLzXktXRh10VFiOywyaEnVE2W6qvi4U3Ln/AJeWsTd9SZ+N3dm33THn4hcW7qSJZN8ac0RURRTwd/q//ms7/wAtiI2TXsV72MwtmNKqNjJaf4/cLPw2y5w4zrDfgr/ZJdl5KK7qm6V6E6MMFu23rNozQGgmsB9CJd90NZOyJ/LbavNialWGVLauUO+OREf4+7Y4iLvc5j4iHiFUIT28i8lr1D0ZMhh5FEvkmKw62QjD4utDhMkXrtlVE5J4lXZPrqx7JxE1YqKfHP0V72OsYqiaaN8O/aelZpLf7VCvtit+pVxttxjty4cyJpblDzElhwUJt1twbeomBCqEhIqoqKipXb7S2nXm5qr7J8q+HU6J30WNG/u/x78uYqq19YpJV2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8Oqq0oJV2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8Oqq0oJV2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8Oqq0oJV2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8Oqq0oMTieU2LOcVs2a4tO7tsuQW+PdLdJ6o2+vivti405wGgmPEBiuxIhJvsqIvKstUq6J30WNG/u/x78uYqq0ClKUEq1k/rF0J+8CZ/pW/VValWsn9YuhP3gTP9K36qrQKwl/zLHMZdajXe4EMh4VNuMxHdkPkKLtxI00JHw78t9tqzdSaxksuVe7vIXjlSrzPZcNfH1ceS4w0P8AJAaTl4t1JfKtWsLYpvTM1boQX7s2ojR3y2n9q+H/AN2/+rdy9xT9q+H/AN2/+rdy9xWMrrXS5QrNbZd4uT3UxILDkmQ5wqXA2AqRFsKKq7IirsiKtXex2PPnHRV7Td8uU9Wc/avh/wDdv/q3cvcU/avh/wDdv/q3cvcVLsP1y09zm5Q7TZHchjyLkysiCt3xa6WlqYCChL1DsyO0Dy8K8XCBKvDuW2yKtb9XIwmHndnzjo7OJvRvy5T1ZP8Aavh/92/+rdy9xT9q+H/3b/6t3L3FYysXj2TWTKosibYZvdTMSbIt7xdWYcMhhwm3Q2JEVeExJN05LtuiqnOu9jsefOOjnabvlynq2f8Aavh/92/+rdy9xT9q+H/3b/6t3L3FYylOxWPPnHQ7Vd8uU9WT/avh/wDdv/q3cvcU/avh/wDdv/q3cvcVjK68uexCcjNvBIJZTyMN9VGcdRC4VLc1AVRsdhXwi2HfZN91RFdjsefOOh2m75cp6s3+1fD/AO7f/Vu5e4p+1fD/AO7f/Vu5e4rGUp2Kx5846Harvlynqyf7V8P/ALt/9W7l7ivtjVPCnngZdnzofWEgC5PtUuG1xKuyJ1jzQgir/FaxNfLrTT7RsPti424KgYGiKJCqbKiovjSnYrHnzjodqu+XL+6i0rUtLH3nsKitPOm53HKnQGyNVUuqjy3mW0VV8aoDYpvW21l3KNXXNHhOS/RVp0xV4lSrpY/RY1k+7/Ify5+qrUq6WP0WNZPu/wAh/Ln68PSq0pSgUpSgUpSgUpSgUpSgUpSgUpSglXRQ+i9pF/5Hsf8A7FqqrUq6KH0XtIv/ACPY/wD2LVVWgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSg6N6sttyG2vWm7R0ejvIm6bqhCSLuJCScxJF2VFTmipUxkxrljFyCw351XheVUgT1REGUKJvwHtyF5E8aeIkTiHyoNcro3qy23Iba9abtHR6O8ibpuqEJIu4kJJzEkXZUVOaKlV79jWe9T+L18p/WxBesxc2xvTquOTJjw47kqU8DTLQqZma7CIp41Va6ty7rwyUtsyeUKx1Eih3M9hCQApuon5BdFE3VPESJxD5UHNYnicjIZDOR5HFNqA0SO2+3ujsRknMX3hXy+UAXxfOXwtkGlEzXOhTHvenx/W3uUqaaqqtCI2mJ4lIyGQxkeRxTagMkjtvt7o7EZJzF94V8vlAF8Xzl8LZBo9K6N6tEa+2x+1THHgafHhJWj4S/wD9En1iSKKpyJFRVStC1ai1GUb++WhbtxbjKGKv+oWH41wDdb/BBwpKRSbSS3xgfJS4kUk2QUJFX6kVPrTfu2/KLJcMdYypLgwxbX2Uf6990BBsV/vFvwoqLyXnyXlWmZFppkk60wbJZ8ljxolvSSrAtw2Y3M21AOMQbIFXw3d1AW05psO/hJsF2xi5paLNDtclq4O2aU2+jdwJGQkiAkgoRNN7Co8QkKo2vME5eWpUjmlZ9jrVwtFsgTGrm/e1JYqQ5LBIrYrsTm5GKKKKip4PEq8JbIuy18Pah4xGyCXj8i4MMlAaFyXJdlMNsskSKqAXE4h8WwqvIVRE8apXVxXD7pZ727erlJikr7Lxk0wRcDch97rHUFFRPBRBbFC8aqiqqJvtXx8i7jIyMLvcHojjA3R64oCkRKipHFmPyVNtx2Il58l223oM+1lOMSH5MVjI7W49DbV6Q2ExtSZbTxkaIu4om6c15c6+I2X4nMkNRImUWl999wmWmm5rRGbg8yAUQt1JN03ROab1Pw0vyqURhcJMEAdjOxpBBcpDgvK8+2Tzgsq2LTHE2LicADtuSbqvjTLy9NpUs3kbdhQxkXIpSuR0VDaaajq1EEfBT5i8JcO6Ii77LQbY3lOMPBNcZyO1mFt/30hmNqkbmqfvF38Dmi+PbxLXNBvlluitjbLxBlq8z3Q2jEgHONri4eNOFV3HiRU38W/Kp9B01vMS1K0tvtiyG2GIYNlfLi4itASGRNvFv3OvGDZCINltwbKqovLMBp/MutsgQ8muMZVjOHKe7mhsK8cgjVePrybTZeFURTbbbcUk4kIfFQbTIvlliCZSbtEb6twmjQnh3RxA41DbffiQPC28e3OsC3qRZ+5JEuXbbnEVthmTHZdaBXZjbpKDStCBku5EmyCXCSbpuiJXVYxC+jf5t+fW1uLKiOwW47puPA02gojRkqohOGeyo5uqLw8KIq8O5YBvSOU5HdmzIVudld0RFatrtylPxe52EJEaV5wVNEVTJeHgUU4RHhVN1UN9hZRb34rr9yByzusIRvR7ibbbjYCXD1i7EoqCrtsYkorv49+VdMc7tK3QoBxpbcZHnYw3ExBIxvNApuNovFx+Cgl4Sgg7iSIS1rsDT3II7tpJxy1BGs75SmYjRn1ZK67xm1zDwWmk4erREXcwElQdkROKfpbOvd1ny7h3DCaJqckfuSVIMXXpAqHWkya8DKoCrxI2qqZKqqqckoNxxzJ28kEnWbNdIbCtg9HelsiASWi34TBRJdvFvwlwlsqLtzrNVqeCYlIxopz70G3W4ZaMgMK3Om4yPVjsrpGYgpOGq+EqjvsI7qS862ygUpSgUpSgUpSgUpSgUpSgUpSgUpSglXRO+ixo393+PflzFVWpV0TvosaN/d/j35cxVVoFKUoFfhmkeTFaV+OSo1z3Ew3UV8v/ANb1+5lfkJExx2zk8MkWgUU8Eic3b2TyoiePx1Bfq0YiU1mY2tGtOQAywkcWWusXdDJU+d9Sc/8AGqtpNpxD1bzSBhc4lKNNBzugwNVJsEbVfr+vb/OtWvd0s+Pxu7rs+ANIu+3IUVfqRPH/AJVrNn6VuUaezp0/Tqx22NIktdQEyUyTrjQKvPhTdE3VdvHvVaYqqjOiFqMmTv3RKiaUZnIt2Q29Lm6w+rkF8206sgReSbL4Kr/OuV/Q64XiQqxdLMdfjFzRZdrjxQTdd9+MRAtv477VN770o9bsxkORsmzeScR4TQ+52Ua4eS7oJAiEP80VKmzF1yKZLSN3wdleH+7J2Osp8915cKKikS//AFyqhew2NvTNVdyIn5z0ecRcyoiLcZfF6XtPRR01cBxcxj4lZ3VXcAtWSqR7/UrRAqIv8iWuBno3dHazvq/OZudz4C4usN6T1Xj8W4tCn/Va1vG+j30l8rhpJt9muGIWifw8T1wfSE7ITyEY7oa7+NBRET/1qnj0XG9PbA1Ly27yr7JkKpOPJNJG1X+7wq0fJP4Eu/8A0qjGBxtv39fVOfdGf1mYZtVvEVZzFTqNwNGsLjjHxK4x7RHVxTNlHJSt7r499y8a/wAq2PF5c02Fk2+a5OgyjQYwtPyEFUQvCUV3XbdE8RbKnjritFgy6zW5Dxuzuv21tV4e4QkbIvl8IjEd/wCVavk2rOQ2CQ81c7wUcVBQWLPeeJSReXITI0T+C7fyqCvA36ttUzM+e1BXh7lM5zVP6+Ld7jOyNiCpAzM7rBwvB4kAlBU2Q+NERR4V3+tV28fi2m+R354Lpx3W8MSJqOASvS3TRVLbfbkqqqboibl/0rpQ9brmNvba7tgMxkRUQHkMRc5eLiIU4v8ABK7TOcXlIjM2biUF2Gq8QOQn3OE1VV8FEEuFS23XbbflUVWEqtz70fRXrw8XMoqn9fKSDkUezxyDr5pzRcICisbPdUe+4r1ilsgrtuiInNPH9dexP6Oe9ZTendR3sldA0E7V1CNruI791qSIv/7a8b92YvOmpIuWO32C25HVZLbZNm05vz34eAOJUXbwl4v5+NV9m/0dbONMFqIzYrost5py1NSQMFFxjhSVwtn5N0XjTZF5bKmyVc9mWaacXTVlt2/LZL1h7WjciYXbonfRY0b+7/Hvy5it4yPMLZjFxx+2XBmSbmR3FbZFJoRUQdRh1/icVSTYeFg03Tdd1TltuqaP0TvosaN/d/j35cxWa1Jxm93+/wCAzbRC69my5Cc6cXWAPUsLAltIexKil4brabDuvhb7bIqp9a0XctesOkl7kXWJZdUsQuD9ijDMujUW9xnTgRyRFF19BNVaBUVFQi2RUVOddyzakad5FDeuGP57jlzix7glpefh3Vh5tucpIPcxEBKiPcSoPVr4W6om1eYs90iyPF9DYLkzFosVbFphktsuiq8yqNSpKxnEbJQJVJDJt0lUOJN0Xdd1TfZLhg+p16bn59a9KX7SUBzFgh4ws+AEq4N2uWbrzrRtvlGFCbcQGUddbJUbRD6rklBZLvrTprZc+x/TSZllr7/ZI7MYhRRnx+ProwAbjRApofHsabCgqvj32rMXjULAceyO14df84x+2X++b967VMubLMydsuy9QyZIbuy/3UWo3heIamQ9QbPmd80+mRWJmU3+XIZbnwnDt8SZGjpHee2e2LmwoGLSuEhryQg8OsnqNiWdydXIN0xHFr2sS4LbhuUwX7RJscpqO8R7XCPLRJzTjSEZMlBVeIyBXFRB2QKnCz3BbnlU7BLbmlil5LbGhkTbMxcWXJ0VottjdYQusAV4h2UhROafXXBZtTdNsjbvb2PahY1dG8adcZvRwrtHfS2OBvxhJUDXqSHhLdD2VOFd/Etec8S0G1Qh5+Vvu8vNDt9uumRXWFdHp9hCytLce6OBWBZjLdXXdpAobb7gAKgpI45wgi4PE+j3qu5i8223y15e/NsGOwLJFayC446kK6DEmsyCixAt0UHCjOJHURdmmDgo9srSKpkgenNPdWcK1TevfyGurV1hWOUzFK4xX2X4ctXY7b4nHdaMkcDhdFFXl4SEnNE3XcalWitjyaNkWoOX5Fp6eIDll4iXCLCekxXpJgFvjsGcjuU3Gxd42iHZHDThEV4l32Sq0Eq6J30WNG/u/wAe/LmKqteX+jJpPnlx6NulFwh9JvUq1x5WD2J5qDEgY2TEUCgMqLLavWk3VAUVBRXDM9kTiIl3VaX+xvUX0sdVfw3Ffg1BVaVKv2N6i+ljqr+G4r8Gp+xvUX0sdVfw3Ffg1A1k/rF0J+8CZ/pW/VVa8v6saT55FzzRhh/pN6lTDmZxKZZeegY2hwzTG70avNIFpEVNRAm1RxDDgdNUFDQDCl/sb1F9LHVX8NxX4NQbri2oODZxIu8PEMttV4k4/Petd2YhygcdgS2jIHGXgReJs0IS5Eib7bpunOtFxr/drl/z68/mMivD8foB9JjUHpcZZrVF1YyLTqys3VY0bI5DkMb9eW2BBo3wj25tiMLTyskqK4AKoECmDqqSl7YwmM9Cs0mHJnvznWLvdmnJT6Ajr5DPfRXDQBEEIlTdeERHdeSInKtHAbqvl9VLF76fn9GfrXtRYsmdp9k8KFHdkSJFmmtNNNApm4ZMGgiIpzVVVURETx1sNKvztVI2POeHYHn+HXPTq45VkOYZtaRsiMRIM2JEjnYLssTYSPuKIyXVE0rrHG8S9USpuqqe4ybH9P8AJbhZM0ODpudm+UuDzYs9iz4Rc7LKO5de0StSZMl5x25yRRxzhloI8e7hAp7lwe5axGS5hiWFw2bjmOUWixRZEgIjL9znNRW3Hz+Y2JOEiKZbLsKc18lRTbjvlJFcvO+TaV2nFrhkNrt2m7/7PFvdkuV7slssrshi5MdzPhIIYjIr3UvXdzG8AAanwbkJLyXXI+EWeLZ7f8ttHMnuODpcMrODYix+TPdjTZE1DgSFigjhtbtdb1TpAiMcaIpNeJPUEzUfTy3PWWPcM8x2M7kqoNlB66MAVzVdtkjIpfvvnJ8zfxp9dC1G09DKGsILO8dTI3lMW7Qt0Y7tNRFCJBY4usVUFUVdk5IqLSaKSK5ebbno3f73abndM8xS43fKoGOYixFmGDj7zE1p93upyK8Cbi+gmqOOtKhcKpuu21WDS7DWMLi6i47Y8Z7y2bv485aYUeIrEbqnIMdTKO2iIPCTyuqvAmymp+Xetwj6l6cy5d8gRM/xt6TjA8V8ZburBOWsefOSKFuwngl8/bxL9VdORrHpDD7z916qYex8onCZs/WXyKPfFwXEbII+5/viQ1QFQN1QlRPGtdimmJzzJqqnY89WPRy8YphUf9n+Dz7Rf75pa5HvD8WOUSVNuQEx1bb7u4L3Ugm+IKZIYoqoioicu1jGIspf4U7S7TbIsZwQb3bnItrGxvWg2pQW+cMuS3EfbbKOiq5GBXTEQNwd91+ctuha6aUySy5ZWcWS2sYPcBtl6kzrnGZZjOkAEKkaubAKqfB4fCvGBjtyrPPagYHGds7EjNrA05kIiVoA7kyJXFC24VjopfvkXdNuDffdK5FFPdJNVXfDytbsEyANMMusuA4e3AZOVaDuEtdP7jan7iw3J4pbM23OPit2e6lCV6RHMEko4TY8WyCtp6MlhnWDCbkw4yca3SLu8/bIg4o/jcaMwoAijGt8iQ89HZVxDJBc6teIjVAQVFVr9K7Tbimc3JrmYyKUpUjwyelH/B6/83vH5lJrcKh+I6aZpkFsl3e09IXUDGYki73Xq7Xa4Vgcix+Ge+K8BS7Y88vEqKa8bpeES7bDsKZv9jeovpY6q/huK/BqxsV+fX8Z9WnY/Kp+Eeiq1Kulj9FjWT7v8h/Ln6fsb1F9LHVX8NxX4NWMyfo65LmmNXbDss6TuqVysd+gv2y5wjh400MmI+2TbzSm1aBcBCAiHiAhJN90VF2WoEq0UpSgUpSgUpSgUpSgUpSgUpSgUpSglXRQ+i9pF/5Hsf8A7FqqrUq6KH0XtIv/ACPY/wD2LVVWgUpSgUpSgUpSgUpWmZpq9gmAXBm0ZBOuTk55pJBRrVZZ10djMKqoj8gIbLqx2dxJOtdQA3EvC8Fdg3OlcECfCukKPc7ZMZlxJbQvsPsOIbbrZJuJiSciFUVFRU5Ki1z0Cla47n+Mt3C5Wpt64Spdnd6ic1DtUqSrJ9zpIQV6pskXdpUUdt+IlQE3NUGvu2Z5jF5usqyWuXKkzIMxIEsAgSOGM+scZCA6fBwt/ujBdyVE3JA34vBoNgpSlApWNsuR2bISuIWeZ3QtqnOW6WnVmHVyAQVIPCRN9kMeabpz8dZKgUpSgUpSgUpSgUpSgUpSgl3SPkyImntqeiyHGXCzrCmSJs1FVbdyW2tugqp/ZNszAk8SiRIu6KqVUagGQa141mVszqxZZp+8XyDyu39xxnLkTYXRYdxiOMTW3GxQg6mWjSk0SLzAULiBxN6dE1d0/nZs5p7GvTxXltw2E4rfJGI5IAONyO3MVtIzj4BuRMg4rgiiqooiLsy7xuNKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoJV0TvosaN/d/j35cxVVqVdE76LGjf3f49+XMVVaBSlKBX5ExXL6w4L8OX4KLsSSHCUxX+0iKXLbb608lfrtURmdC7o3T2uok4HOVv+4OSXQE/yGSlQ3rWtjLPJ2Mn4s9IHIbo/lr0Xu1QYjIiCDbm47qm6rulSQMjuzKqjU93gVfmkSrtX7rSv6NvoXTXCelaOG6ZruSlkt35r/wDNV8Rv6NPoTRJLUtjRQesYMXA48iuxjxIu6biUpUVOXiVFSrtuu3RRFGSaLsQ/Ovo+dFy95PZLZqJnE2SzbJSJJC3IPBIJj604/BBS8aEqF4K7oiKqKntbA8bxHG8dKbhlht2NsL4Sk00jsh9UXxk54Rnz35kq16Ye0B0lfa6lzFSQNttguEoNk/hs4m1c1t0N0vtMYIdvxx5pkN0Ee+Ustt/H43VqjNnSqmqre7N6mdsvJ2QXVO+TU+Xc1fEEXj6xNtv4oq18zpRXeGiDfElRuJFSM4qKibf3dh32/wA69Vv9H3SCQhi/h4GhookizZOyov8A+pXXh9G7Re3goQsOJoV8g3OZ73lXZtzOyXNZT3PKky6I9HbtkyJHFhjbq21c/d8HlXYUTn9flrUct0+sWQ7Ns2q2k05vtIYFS2/huRKqf5V7XkdGvRSVxK/hilxeP/vKWn/o7XxH6MuiUXnHw1xvflyus331c1U95N2me5+YeYaAtR5yzSkyphgClHYEN12TyIm3/wBb1qV3VuxWqKy2s6NPcfI3nQJwERBXwQJCRN9lRfFy3Wv1zLo76PmvEWJmq8uffOX72sNfeiN0eclVsr3p6klWt0Fe+s0PH49+F5N/8aq3sBrNsShmmic8t78lorvWE26NzluukyTjLZOcBtF9ab8k225cuWyL/Bfb/wDRhwo8B7U2NHHZBGyIqqK8Xim8iVV3VdtvqTn4k3q7ROhD0X4QvDG0yUUfNHC3vdxJUL6xVZC8P/5dq37TfRjTXSJbkWnmNJaVvCsrN2lvv9crXHwKvWmWyp1h7qmyrvz32SmHwddm5FU5IqaNGc2A6J30WNG/u/x78uYqq15q6PWtuL4NoFpphWU4bqrCvWP4fZrXcY37K8nc6iUxCabdb4wgEBcJgSbiqiu26Kqc6oHaW0683NVfZPlXw6tFIqtKlXaW0683NVfZPlXw6naW0683NVfZPlXw6gqtKlXaW0683NVfZPlXw6naW0683NVfZPlXw6gqtKlXaW0683NVfZPlXw6naW0683NVfZPlXw6gqtKlXaW0683NVfZPlXw6naW0683NVfZPlXw6gdE76LGjf3f49+XMVVamnRktN1sHRt0osV9tku3XK3YPYokyHLZJl+M+3AZFxpxskQgMSRRUVRFRUVFql0ClKUEq1k/rF0J+8CZ/pW/VValWsn9YuhP3gTP9K36qrQKkuNf7tcv+fXn8xkVWql1xt1yw65TwO0XCdap0x6fHkQIpySaJ41ccbcbbRXN+sI1QkFUVCRF2VOd/A1RE1UzvnJUxdMzEVQ71KxHyljfYeT+rVx9xT5SxvsPJ/Vq4+4rSylRzhl6iHSDyyw6dZPiWc5NMs70FI1zsyW64XmBAI3JItbPt92Oti6go2QGLak5wOrwga7itY+Usb7Dyf1auPuKfKWN9h5P6tXH3FcqomYyeoqiJzeTWdE9TLli2PdyW/MUgZFg9kscu3WiVZYjEM46uGQzVuUZyQy2nXCQlEEnEUS3bQkFaq56TX4J91nMY+0kibqNAyDunrWVcOI1FjslIVd0XdEbMduRKich2Wq38pY32Hk/q1cfcU+Usb7Dyf1auPuK8RZyepuTLyratANUksF2xm7W/LLi9acRu9ggvXK42ELbLclkC8EMYzAzDA1BDIprraiu3+1VVNNw1z081ayW7XG0YbZrq3ap2PRIjTloSyNMynWTcI49xdmgUvgRFFGUjcIopnxGG/Gl6+Usb7Dyf1auPuKfKWN9h5P6tXH3FNTsy2mt25otecLz+35nOyuLp9Ovca1ZmzkbERiZBE7lHctCQ16jrnhEXmXU4lR4mhVOYmS8qyGkuluUY1lOP5BfbCxCBi033dlqQDg2051yaktw02JeLhbRRUgRQ3BURdlTes/KWN9h5P6tXH3FPlLG+w8n9Wrj7iu6rbm5rM4yZelYj5SxvsPJ/Vq4+4p8pY32Hk/q1cfcV7yl4zhl6ViPlLG+w8n9Wrj7iv6N8lS17ntGLZDKlHyBt60SYbe/1k6+AAKfWu6rt4kXxUymN7u/c2nSj/g9f+b3j8yk1uFYTDbA7jOORbRJfB6QJOvyXARUEn3nSddUd+fDxmW2/k2rN1h4iqK7tVVO6Zn1alqmabdMT4QUpSokhSlKBSlKBSlKBSlKBSlKBSlKBSlKCVdFD6L2kX/kex/8AsWqqtebdAtaMawDQzT3Bcsw/VKHe8dxe12q4xw0uyV8WZLEVtt0EcagE24iGJJxARCu26KqKi1vvaW0683NVfZPlXw6gqtKlXaW0683NVfZPlXw6naW0683NVfZPlXw6gqtKlXaW0683NVfZPlXw6naW0683NVfZPlXw6gqtK1/Cs4suf2p282KFkEWOzIKMQXvHrhZn1NBElUWZzLLpBsabGgqCqhIiqokibBQKkl9bzzAtTL/lmO6Z3TNYGWwYDCLbbjBZct0iMjo7PjMfZRI5C6JIrKuGhI5+75opVulB5jznSbUW/wCcW683fTi3XnIHo1lS05VbpDDUXD3o7ynPRpH3UlNA8K8Kdzg4ryeA9wCiVr7PRtzy3Y467jOJxbPkd3x/JYN7mMymWnrgrtxbehR33myUjQmOuACXiRlHFTwPFXpXU/J5+FacZRmFqZjuzLJaJdwjhIEiaJxpojFDQVRVHdE32VF28qVoWVdJOz4ll8HT244ldTvd3tT0+1GEy2C1PcajG8Tbcc5iTEH92QdaTAs8WyK4m6KoSBdCc2kwr8uIaK/Iq1T5c523WHu23B3K05jZQwHgjvmw1vJXh4WzUU341XZVVMlA0A1Bt2Y5BNxvEo2PyLpd37g1fGHoraKTuOLDB0laNXlIJfFuqhvufGPEiqqZyy9OPTmBB0+teowhZ8ky+z2u4z4/fK2sBbim7CyvUPTEkPgZ7qncwSFAdlc4Kz936U8BbBkk3HNPMoOVbbPfJ9oemtQwi3R+1ukzJaDhlcY8DiCv71GkIF3AiVFRAnVp6PV4vE61RS0OiYxh63e0d+salv291icbLE0J1wcZYdcZdB/r2AVTXrnkFVdbTasZqh0fdSb5pbjmmts0thTYtoj30bW4zHs78iySUlEVsFt2eZBFirH2BSisnIHZpBJlBVateAdJC1ZnmUHTlzDb+zfFtcOdc3gWEceA6/GR8RdZblHKBtUVRF9WVjqfgI8pcqsdBP8AR/GshxqJk6ZFBKM7c8ikXBhCeBxXGTZZFDVQJdlUgJNl58v4pVApSgUpU/ynXDC8PvsrHLtZdQJEuJwdY5a9Pb/c4pcYCacEmJCcZc5EiLwGvCW4rsQqiBQKVKu0tp15uaq+yfKvh1O0tp15uaq+yfKvh1BVaVKu0tp15uaq+yfKvh1O0tp15uaq+yfKvh1BVaVKu0tp15uaq+yfKvh1O0tp15uaq+yfKvh1BVaVKu0tp15uaq+yfKvh1O0tp15uaq+yfKvh1Bgc60EssjFrrHumo4WB66Zq3fWLmbINi2sqZGTvcSG5wuo+YNtJzRVcNtRHjEUXO23RO6Qc6j3l3NGXcXt98mZPAs42vhlt3KS26DvWTOuUXGE690hbRgTQlTdwkThXTNWdV7Dqdjtnw7DsT1Jfub+YYpMFJmnGQwGAYi36DJfcckSYTbLYgyy6aqZong7Juqoi+iaBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKCVdE76LGjf3f49+XMVValXRO+ixo393+PflzFVWgUpSgUpSgVFpmoer93t991Hw1MTHEsckz2Es02BJduV4CEZtvmEwHwbhkptuoALHf3QBVSHj2C01Jblo5mondsbxTU2LZ8JyGTJk3G2nYlfuTCySUpIQZqSAbjgZEZfvY75CTh8JInAgBlGtdcPftM69MQrq5GgTbRBJRZbRXDuQxyYIEU08FElN8W+ypsWyLsm+lYz0m7vKgjHvukGWyb/Pvd/t9rtdpbt5OSmLdI4FJTOb1QFwKm6uOAhGBoKeE2hZDIejxeLhfZSY5n8azYtPnWS5ybR3l659JFtNjqwako+IgwbUcAIFaIkJEJDRNwXDXHRLVuz5lZ5uA5xZ4jcabklxauM2xFJZhjcXmXUjPxxmNHJXiV9RcbNpBUG+IV2VDDd2ukHgsmwXfJYca7PwrLYIeRPqMcBM48lXhFsRI0VHRVhxCEuFEXZN157c+nGpeQ5jkGodru+GzLdGxC9pbre8qx17ua7kZe3TgkGvHu4q+ELacJtptxIe2i3XotXYLS9jWI6oLbLPdMbi49eAnWdJkmT3M6662+08LzSMqRPuo6JA4hCqIHVqnEtRwzB5+JZLl93O+R5cHJ7gzc2oqQibdiujGaYcQnesJHRJGAIURsFHckVS3TYNUuXSExh+xWm6Y+E5Vu1ugXZHDgg+MViTNZig28CPtqLpE44KbEqD1TheFwoJ464dIhx7UDH8fsmJ3JnGpd7uNqn5HcY7Yw5HccSS4+kVQe60VbejoBE8yIGiH1anspD923o2RbZbsut7WYPOpkl+h3SGrsEFS1wo8sZYQAQSRTDrikkhku6dftsqAKV/GOjzdByGKEjO4x4bbbvc7vBsjVm6uSJ3BmSElt2Z16oYIcpwm+FoFFFUSVzwVEO1bek1iMq2T7tdcQy2yMtW4LvahnQ2CO+wnHRZZehiw84u5uOMijb/Uup1oKQCiqqbfp1qTD1Dj3NssbvWN3exy0hXSzXkGElxHCAXG1Io7rzBibZiYk26abLsqoQkKRvDuhdYcTst4s8SXhNsJ+HGh2mbjmAQbVLbWNIB9iROeQnDmvIbLPFwqw0fCS9UhEhDW9MsAv+IOX2+5nlkbIckyWY3Kny4VtK3wwFpoWmWmI5PPE2IgCKqk6akZEu6IqCIbzSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKCVayf1i6E/eBM/wBK36qrUq1k/rF0J+8CZ/pW/VVaBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBStfy6blUOO0WOQgdBVXuh0WkfeaHbxgyTjaF/PjVUVERGz35S3IHr3d8/iQ4kvK5TQFCZFVagNEXCKyT8BwQUV/dtFsQoqLxIqbcIqFypWgZ5k863XR22M5IVlJq3LJgiDLTjtylESiLII4JcSIojuIIhL1ic0RK+cPi8cnJc7u7p93E45F4lBlVjNMAiGLZ8HFwoaHyVVReFFXdd1UNpzDGIGa4peMPur0hqHe4L9vkHHIRdFt0FAlBSRUQtlXbdFTfyLU7Ho04eGZScwbyTImxlXIbw5bGyiBEKakBYJPEQx0fcUo6oOxukIqKKCBz3x+Pv3jG7JcbjGvjsYGIcWZLNYkXifny9y4n3FAf3YI4Cqqqiomy77Jwr27TmeVXJo4KZY31bEuS8/co6sSl7jYjATnAaR22y3cdHhLq+X/AI08Yfdh6N9nxc7ImP6lZ1b49rt0G1zo0adFaC8x4ar3Kkohjo4BAJKClGJgjHwXFNK77fR6wlu1BZluF5OOMa/xfCfa4lC7vdbJ3VG05iS7N/UnzuLx1i3ssz+1QxKTkLLxPQLest+W2zGZt7sgy8PjFouFOANlI0MUM0XhQfBr7l5tkMO0QO7cyYF11x9xtyKrJPy2d0FpWlfjtNSdj4uIWkbIhUFFV38IOzC6O2Os5fiuX3fMMkvh4Y0PemHchgONMSUjdzlJBwYoyGiNvkTTToMKvhdVvzqr1pnfrJIN1lnIeI7FH4ylzp8UIYxlRPC6o1LicEf7KEyqLuv75dtq1aZfp16xZ5/Jr3EjgzOjMnDuQ9zR5MdPDEpBiBK11489lRQTZA4d+JKCuUrz7IG4FbLc1e4tlYtxRpk+2WeYy6bUlx19UaYYbRQXjRtR4OW4daioG/zd0ayedPcvEFjInoNqiQZDkKYjSOk4QtoDgiSCpOBHNd1MfCJVTmqCqkFOpUBZCQdukhCPHbRjcqdBgyZTLxu259G23CedNzZvrEMurAl3FCVOBTXmtVrTsW0xCCbNtZgtuK44DLAmDKirhKhtgaqrYGmxoG+yIWyUGyUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSglXRO+ixo393+PflzFVWpV0TvosaN/d/j35cxVVoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoFKUoJVrJ/WLoT94Ez/St+qq1KtZP6xdCfvAmf6Vv1VWgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgUpSgVrGp2XSMB07yTNolvbnP2O2SJzUZx1WwdNsFJBIkRVFFVE3VEWtnrE5XjFozXGbpiN/Zcdtt4iOwpQNuk0atOColwmKoQrsvJUXdKDz7qRqJ0pNLUx12VkGm2ULee6JD8WDh8+E62xFYWTIBpTujqOOE0DggqoKIaCqoSKqJsma6o6sZTlUGwdHp3FX4DFthXO9XS82x6a3HamGisK2DcuNxKjIOukCkpbE1snhLWzYxog9aMjtWS5bq3mucPWFp5u1MX0LW0zEJ1vqzcRIMKMThq3uP70jREJVRN+dZXTvRzD9K8XuuKYR3bBj3aZKmuPk6LzzTj3IRbUxUUBoEBtoFFRAGwHZUTmEgxvpOZJp/pZF1M6SNyxNuJkTduLGlszTVnSc/IYN12Kq3C4G0JN8Cr1rrzIKn8dt89G6ZemE7T236pW6z3ydjL1zds91uEJ+3SY9jlBtskt5qWTSgSqIi6wbzaqY7km6VtS6AWFNO8TwNrL8lal4QTTthyNs4iXSI6AE2jn+79zGqtGbZCbBAQku4qvOsHk/Rdt2c2GDjOeawag5LbGri7c7lEujtsej3l0tkbCUz3EjSMtIicDLAtN8ScZCZ+FQdbJukPnEG26cXqw9HzOXQza4uMSLZMK0M3CMykZ51sFE7iDbbx9WJohESCAuCfA5wivV1TzjpMW3LrREwRnDbJaL88xAt8e/2J24zHJZQZUl0ScjXNlsOEo4NbcKjuakjhImy7aGhJDp/juEHq3nT8/FJQS7Tk8g7c9dmSFs2kElOGsZ1OqcNvdxgiVF3UlNEKszctKYtzTCetzTJhLCJ6XFlwpDD7lyd6lxle6zeZMiRRdc/wBkraopclREREDVpGvzttZS33bDL4LtvGNb8iyOHFjyLLYrs80Cqy8HdQynQA3W0ImQcAENON0OEyHEBrNqGeCtY8i42mqx5QuIm13vf72hIQutKX3OkjrVZ7h/7Rw9fvzQVJF322u+6CWO+5FLuZZllUOyXac3c7xjEWTHS2XSUCBs46pMlJBF6tpSbZfbbc4PDAuI0POBpPhwapO6wBFfTIXrWlqIut/cICFv1qN7bdco7Ap+PgFB8VBjcM1PmXa8Zxb8ts02wBh5sk53fGjNocYmiLukXI8yQhtn1ZmKGjTgDsJAq86m7nSvftuf9bmWH3bDNPAw+bk/fTIIEcHJLbDzIi8y5HmuqgEDyKrD0dp4VUN+ZKI7tZdBHYGU37I77rDm2Sxcnj9yXazXSPZhhSmEbNsG17ngNPCgC4SJwuoq8uJSrEXDoq45fupj5ZqXnd+t0a3TLKxAlyoTTTVukI1/2YTYitup1ZMNGD/Wd0IQJxOknKgxmDdNrRzUCJfO8Sy3bpZViIFpi3G1XKTcFlOK1GFg4Ex9jiNxODgddbIPnOIALxVlcx6QFxiabZBkdqxG9Y1fsclx414g32zFc3bLHdVCWc7GtjzndjKM7ubRn132VCIFA0HKM6ALJt0qJlusmomUSSGKtum3CZCYctTsdzrGn47cOKwwrqHsqm826pInAXECkC9iJoasK1SgZ1azxMinzguEzJ0kwhuEk22jaZbNoYqQ+pbE/BZSOjakKEQkSkpBPLNrFq9qKzhEnSvUzSK6QcrG7OBc49jn3CM+EUWiaTYZzJxXS4yRxokcVouW5KK79XM+kbmkKx4FkEjOtNNLYl/lXW0Xx7MIjk+LFuMJXBIWJKT4Qk2TjLgjxChEiiWwruFbnK6MrByLZcrXrRqDaLrCenyplzhd6O6LnImC2L7z/WQDACUGgAUYFkRQdxRF51nI2gmPWefgz+K5TkVhgYH3QsS2RXIr7M8nxVHjluymHZDpnxGpGLokRGRKqku9Bi7DrNlcxNMmr/hc+3rmiuNTJzcNooaPiw+YtCjkpuUx1iM9cJLHeHgVAJRJeJEjpK2aDe73bbjprm0W3YvdktN9vZsQSg20jFsmXj4JSvONOC82u7TbhNou7otJWW1J0ZueouR2jIWdZ84xdLE8kqDCszFmKO3JRt1tX1WXAfcIlbeMVFTUPEqCi860Kw9H/P7vqBmk7UPIHIeIZFdGbgVus2Qi+N7FphhkAnsuW1s2N0Y4ySLJAT41bMTBOYd6N01tC5mq7WksPIGH5r91KxBOau1sNvviKkJR1ipK7vTYxUOtWKjO/wD9psqLW8YBk2czM5znEsxn2O4N2J2G/bHbXa3YRJGkg4YtPI7JeRxweBEVwVbEt1XgHxVj7doHDseRJccc1Oziz4+t3cvjmKwZURq2OS3DVxxVc7m7sRs3SVwmRko0pKqKHAqgv3jGil5xnNrvnBa557dHr2Aty4U2NZEjEgAYs7dTbm3E6pDVR8PmqJx8flDrW3XB9nCs9zbJMLyCP8h577UuzpGhBObYbYae3QgnOsPL1bnWcSOtqqLw9WhJsvRvHSowDEscvuRahWe9YaNm7jNqNfTgsOXBmWZBEdZMZJNNi6bZjtIcZJvgJXRaFOKuKP0Z5g2vMrPcekBqTco2csPN3UZDFgFetcabZJ9tWrYHCfVNCCJzDZVXg4tiTtZD0abHlFykXe9ai5m7LO3WuHFdacgMlAkW9wnY05km4or16OG4RCamyaOEJNKC8FBltDOkDgHSBstzu+DyFRyyze4LjEKdBmFHdUEMP38F+RGcEgJFRW3j25iWxCQpS61XAsHnYWxPW7ah5VmE24vC67Nvz0bibQRQRbaZissR2hRE3XgaFSVVUlJdttqoJV0TvosaN/d/j35cxVVqVdE76LGjf3f49+XMVVaBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKBSlKCRa+y3rJfdJcxcst9uNsxvNn5t0WzWWXdZEeO5j94ig4seI248Q9fJYBVEF26xFXZN1TsdpbTrzc1V9k+VfDqUoHaW0683NVfZPlXw6naW0683NVfZPlXw6lKB2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8OpSgdpbTrzc1V9k+VfDqdpbTrzc1V9k+VfDqUoHaW0683NVfZPlXw6naW0683NVfZPlXw6lKB2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8OpSgdpbTrzc1V9k+VfDqdpbTrzc1V9k+VfDqUoHaW0683NVfZPlXw6naW0683NVfZPlXw6lKB2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8OpSgdpbTrzc1V9k+VfDqdpbTrzc1V9k+VfDqUoHaW0683NVfZPlXw6naW0683NVfZPlXw6lKB2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8OpSgdpbTrzc1V9k+VfDqdpbTrzc1V9k+VfDqUoHaW0683NVfZPlXw6naW0683NVfZPlXw6lKB2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8OpSgdpbTrzc1V9k+VfDqdpbTrzc1V9k+VfDqUoHaW0683NVfZPlXw6naW0683NVfZPlXw6lKB2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8OpSgdpbTrzc1V9k+VfDqdpbTrzc1V9k+VfDqUoHaW0683NVfZPlXw6naW0683NVfZPlXw6lKB2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8OpSgdpbTrzc1V9k+VfDqdpbTrzc1V9k+VfDqUoHaW0683NVfZPlXw6naW0683NVfZPlXw6lKB2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8OpSgdpbTrzc1V9k+VfDqdpbTrzc1V9k+VfDqUoHaW0683NVfZPlXw6naW0683NVfZPlXw6lKB2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8OpSgdpbTrzc1V9k+VfDqdpbTrzc1V9k+VfDqUoHaW0683NVfZPlXw6naW0683NVfZPlXw6lKB2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8OpSgdpbTrzc1V9k+VfDqdpbTrzc1V9k+VfDqUoHaW0683NVfZPlXw6naW0683NVfZPlXw6lKB2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8OpSgdpbTrzc1V9k+VfDqdpbTrzc1V9k+VfDqUoHaW0683NVfZPlXw6naW0683NVfZPlXw6lKB2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8OpSgdpbTrzc1V9k+VfDqdpbTrzc1V9k+VfDqUoHaW0683NVfZPlXw6naW0683NVfZPlXw6lKB2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8OpSgdpbTrzc1V9k+VfDqdpbTrzc1V9k+VfDqUoHaW0683NVfZPlXw6naW0683NVfZPlXw6lKB2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8OpSgdpbTrzc1V9k+VfDqdpbTrzc1V9k+VfDqUoHaW0683NVfZPlXw6naW0683NVfZPlXw6lKB2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8OpSgdpbTrzc1V9k+VfDqdpbTrzc1V9k+VfDqUoHaW0683NVfZPlXw6naW0683NVfZPlXw6lKB2ltOvNzVX2T5V8Op2ltOvNzVX2T5V8OpSg7vRqsl3xro5aV45kFtkW+6WrCbHCnQ5Dag7HkNQGQcbMV5iQkKoqL4lRapFKUClKUClKUClKUClKUClKUClKUClKUClKUH//2Q==)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Define the conversion function\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Model components are PyTorch modules, that can be converted with `ov.convert_model` function directly. We also use `ov.save_model` function to serialize the result of conversion."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"warnings.filterwarnings(\"ignore\", category=torch.jit.TracerWarning)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"from pathlib import Path\n",
+						"\n",
+						"\n",
+						"def convert(model: torch.nn.Module, xml_path: str, **convert_kwargs) -> Path:\n",
+						"    xml_path = Path(xml_path)\n",
+						"    if not xml_path.exists():\n",
+						"        xml_path.parent.mkdir(parents=True, exist_ok=True)\n",
+						"        with torch.no_grad():\n",
+						"            converted_model = ov.convert_model(model, **convert_kwargs)\n",
+						"        ov.save_model(converted_model, xml_path)\n",
+						"        del converted_model\n",
+						"        gc.collect()\n",
+						"        torch._C._jit_clear_class_registry()\n",
+						"        torch.jit._recursive.concrete_type_store = torch.jit._recursive.ConcreteTypeStore()\n",
+						"        torch.jit._state._clear_class_state()\n",
+						"    return xml_path"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### UNet\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Text-to-video generation pipeline main component is a conditional 3D UNet model that takes a noisy sample, conditional state, and a timestep and returns a sample shaped output."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"unet_xml_path = convert(\n",
+						"    unet,\n",
+						"    \"models/unet.xml\",\n",
+						"    example_input={\n",
+						"        \"sample\": torch.randn(2, 4, 2, int(sample_height // 2), int(sample_width // 2)),\n",
+						"        \"timestep\": torch.tensor(1),\n",
+						"        \"encoder_hidden_states\": torch.randn(2, 77, 1024),\n",
+						"    },\n",
+						"    input=[\n",
+						"        (\"sample\", (2, 4, NUM_FRAMES, sample_height, sample_width)),\n",
+						"        (\"timestep\", ()),\n",
+						"        (\"encoder_hidden_states\", (2, 77, 1024)),\n",
+						"    ],\n",
+						")\n",
+						"del unet\n",
+						"gc.collect();"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### VAE\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Variational autoencoder (VAE) uses UNet output to decode latents to visual representations. Our VAE model has KL loss for encoding images into latents and decoding latent representations into images. For inference, we need only decoder part."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"class VaeDecoderWrapper(torch.nn.Module):\n",
+						"    def __init__(self, vae):\n",
+						"        super().__init__()\n",
+						"        self.vae = vae\n",
+						"\n",
+						"    def forward(self, z: torch.FloatTensor):\n",
+						"        return self.vae.decode(z)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"vae_decoder_xml_path = convert(\n",
+						"    VaeDecoderWrapper(vae),\n",
+						"    \"models/vae.xml\",\n",
+						"    example_input=torch.randn(2, 4, 32, 32),\n",
+						"    input=((NUM_FRAMES, 4, sample_height, sample_width)),\n",
+						")\n",
+						"del vae\n",
+						"gc.collect();"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Text encoder\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Text encoder is used to encode the input prompt to tensor. Default tensor length is 77."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"text_encoder_xml = convert(\n",
+						"    text_encoder,\n",
+						"    \"models/text_encoder.xml\",\n",
+						"    example_input=torch.ones(1, 77, dtype=torch.int64),\n",
+						"    input=((1, 77), ov.Type.i64),\n",
+						")\n",
+						"del text_encoder\n",
+						"gc.collect();"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Build a pipeline\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"def tensor2vid(video: torch.Tensor, mean=[0.5, 0.5, 0.5], std=[0.5, 0.5, 0.5]) -> List[np.ndarray]:\n",
+						"    # This code is copied from https://github.com/modelscope/modelscope/blob/1509fdb973e5871f37148a4b5e5964cafd43e64d/modelscope/pipelines/multi_modal/text_to_video_synthesis_pipeline.py#L78\n",
+						"    # reshape to ncfhw\n",
+						"    mean = torch.tensor(mean, device=video.device).reshape(1, -1, 1, 1, 1)\n",
+						"    std = torch.tensor(std, device=video.device).reshape(1, -1, 1, 1, 1)\n",
+						"    # unnormalize back to [0,1]\n",
+						"    video = video.mul_(std).add_(mean)\n",
+						"    video.clamp_(0, 1)\n",
+						"    # prepare the final outputs\n",
+						"    i, c, f, h, w = video.shape\n",
+						"    images = video.permute(2, 3, 0, 4, 1).reshape(f, h, i * w, c)  # 1st (frames, h, batch_size, w, c) 2nd (frames, h, batch_size * w, c)\n",
+						"    images = images.unbind(dim=0)  # prepare a list of indvidual (consecutive frames)\n",
+						"    images = [(image.cpu().numpy() * 255).astype(\"uint8\") for image in images]  # f h w c\n",
+						"    return images"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"try:\n",
+						"    from diffusers.utils import randn_tensor\n",
+						"except ImportError:\n",
+						"    from diffusers.utils.torch_utils import randn_tensor\n",
+						"\n",
+						"\n",
+						"class OVTextToVideoSDPipeline(diffusers.DiffusionPipeline):\n",
+						"    def __init__(\n",
+						"        self,\n",
+						"        vae_decoder: ov.CompiledModel,\n",
+						"        text_encoder: ov.CompiledModel,\n",
+						"        tokenizer: transformers.CLIPTokenizer,\n",
+						"        unet: ov.CompiledModel,\n",
+						"        scheduler: diffusers.schedulers.DDIMScheduler,\n",
+						"    ):\n",
+						"        super().__init__()\n",
+						"\n",
+						"        self.vae_decoder = vae_decoder\n",
+						"        self.text_encoder = text_encoder\n",
+						"        self.tokenizer = tokenizer\n",
+						"        self.unet = unet\n",
+						"        self.scheduler = scheduler\n",
+						"        self.vae_scale_factor = vae_scale_factor\n",
+						"        self.unet_in_channels = unet_in_channels\n",
+						"        self.width = WIDTH\n",
+						"        self.height = HEIGHT\n",
+						"        self.num_frames = NUM_FRAMES\n",
+						"\n",
+						"    def __call__(\n",
+						"        self,\n",
+						"        prompt: Union[str, List[str]] = None,\n",
+						"        num_inference_steps: int = 50,\n",
+						"        guidance_scale: float = 9.0,\n",
+						"        negative_prompt: Optional[Union[str, List[str]]] = None,\n",
+						"        eta: float = 0.0,\n",
+						"        generator: Optional[Union[torch.Generator, List[torch.Generator]]] = None,\n",
+						"        latents: Optional[torch.FloatTensor] = None,\n",
+						"        prompt_embeds: Optional[torch.FloatTensor] = None,\n",
+						"        negative_prompt_embeds: Optional[torch.FloatTensor] = None,\n",
+						"        output_type: Optional[str] = \"np\",\n",
+						"        return_dict: bool = True,\n",
+						"        callback: Optional[Callable[[int, int, torch.FloatTensor], None]] = None,\n",
+						"        callback_steps: int = 1,\n",
+						"    ):\n",
+						"        r\"\"\"\n",
+						"        Function invoked when calling the pipeline for generation.\n",
+						"\n",
+						"        Args:\n",
+						"            prompt (`str` or `List[str]`, *optional*):\n",
+						"                The prompt or prompts to guide the video generation. If not defined, one has to pass `prompt_embeds`.\n",
+						"                instead.\n",
+						"            num_inference_steps (`int`, *optional*, defaults to 50):\n",
+						"                The number of denoising steps. More denoising steps usually lead to a higher quality videos at the\n",
+						"                expense of slower inference.\n",
+						"            guidance_scale (`float`, *optional*, defaults to 7.5):\n",
+						"                Guidance scale as defined in [Classifier-Free Diffusion Guidance](https://arxiv.org/abs/2207.12598).\n",
+						"                `guidance_scale` is defined as `w` of equation 2. of [Imagen\n",
+						"                Paper](https://arxiv.org/pdf/2205.11487.pdf). Guidance scale is enabled by setting `guidance_scale >\n",
+						"                1`. Higher guidance scale encourages to generate videos that are closely linked to the text `prompt`,\n",
+						"                usually at the expense of lower video quality.\n",
+						"            negative_prompt (`str` or `List[str]`, *optional*):\n",
+						"                The prompt or prompts not to guide the video generation. If not defined, one has to pass\n",
+						"                `negative_prompt_embeds` instead. Ignored when not using guidance (i.e., ignored if `guidance_scale` is\n",
+						"                less than `1`).\n",
+						"            eta (`float`, *optional*, defaults to 0.0):\n",
+						"                Corresponds to parameter eta (η) in the DDIM paper: https://arxiv.org/abs/2010.02502. Only applies to\n",
+						"                [`schedulers.DDIMScheduler`], will be ignored for others.\n",
+						"            generator (`torch.Generator` or `List[torch.Generator]`, *optional*):\n",
+						"                One or a list of [torch generator(s)](https://pytorch.org/docs/stable/generated/torch.Generator.html)\n",
+						"                to make generation deterministic.\n",
+						"            latents (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated noisy latents, sampled from a Gaussian distribution, to be used as inputs for video\n",
+						"                generation. Can be used to tweak the same generation with different prompts. If not provided, a latents\n",
+						"                tensor will ge generated by sampling using the supplied random `generator`. Latents should be of shape\n",
+						"                `(batch_size, num_channel, num_frames, height, width)`.\n",
+						"            prompt_embeds (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt weighting. If not\n",
+						"                provided, text embeddings will be generated from `prompt` input argument.\n",
+						"            negative_prompt_embeds (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated negative text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt\n",
+						"                weighting. If not provided, negative_prompt_embeds will be generated from `negative_prompt` input\n",
+						"                argument.\n",
+						"            output_type (`str`, *optional*, defaults to `\"np\"`):\n",
+						"                The output format of the generate video. Choose between `torch.FloatTensor` or `np.array`.\n",
+						"            return_dict (`bool`, *optional*, defaults to `True`):\n",
+						"                Whether or not to return a [`~pipelines.stable_diffusion.TextToVideoSDPipelineOutput`] instead of a\n",
+						"                plain tuple.\n",
+						"            callback (`Callable`, *optional*):\n",
+						"                A function that will be called every `callback_steps` steps during inference. The function will be\n",
+						"                called with the following arguments: `callback(step: int, timestep: int, latents: torch.FloatTensor)`.\n",
+						"            callback_steps (`int`, *optional*, defaults to 1):\n",
+						"                The frequency at which the `callback` function will be called. If not specified, the callback will be\n",
+						"                called at every step.\n",
+						"\n",
+						"        Returns:\n",
+						"            `List[np.ndarray]`: generated video frames\n",
+						"        \"\"\"\n",
+						"\n",
+						"        num_images_per_prompt = 1\n",
+						"\n",
+						"        # 1. Check inputs. Raise error if not correct\n",
+						"        self.check_inputs(\n",
+						"            prompt,\n",
+						"            callback_steps,\n",
+						"            negative_prompt,\n",
+						"            prompt_embeds,\n",
+						"            negative_prompt_embeds,\n",
+						"        )\n",
+						"\n",
+						"        # 2. Define call parameters\n",
+						"        if prompt is not None and isinstance(prompt, str):\n",
+						"            batch_size = 1\n",
+						"        elif prompt is not None and isinstance(prompt, list):\n",
+						"            batch_size = len(prompt)\n",
+						"        else:\n",
+						"            batch_size = prompt_embeds.shape[0]\n",
+						"\n",
+						"        # here `guidance_scale` is defined analog to the guidance weight `w` of equation (2)\n",
+						"        # of the Imagen paper: https://arxiv.org/pdf/2205.11487.pdf . `guidance_scale = 1`\n",
+						"        # corresponds to doing no classifier free guidance.\n",
+						"        do_classifier_free_guidance = guidance_scale > 1.0\n",
+						"\n",
+						"        # 3. Encode input prompt\n",
+						"        prompt_embeds = self._encode_prompt(\n",
+						"            prompt,\n",
+						"            num_images_per_prompt,\n",
+						"            do_classifier_free_guidance,\n",
+						"            negative_prompt,\n",
+						"            prompt_embeds=prompt_embeds,\n",
+						"            negative_prompt_embeds=negative_prompt_embeds,\n",
+						"        )\n",
+						"\n",
+						"        # 4. Prepare timesteps\n",
+						"        self.scheduler.set_timesteps(num_inference_steps)\n",
+						"        timesteps = self.scheduler.timesteps\n",
+						"\n",
+						"        # 5. Prepare latent variables\n",
+						"        num_channels_latents = self.unet_in_channels\n",
+						"        latents = self.prepare_latents(\n",
+						"            batch_size * num_images_per_prompt,\n",
+						"            num_channels_latents,\n",
+						"            prompt_embeds.dtype,\n",
+						"            generator,\n",
+						"            latents,\n",
+						"        )\n",
+						"\n",
+						"        # 6. Prepare extra step kwargs. TODO: Logic should ideally just be moved out of the pipeline\n",
+						"        extra_step_kwargs = {\"generator\": generator, \"eta\": eta}\n",
+						"\n",
+						"        # 7. Denoising loop\n",
+						"        num_warmup_steps = len(timesteps) - num_inference_steps * self.scheduler.order\n",
+						"        with self.progress_bar(total=num_inference_steps) as progress_bar:\n",
+						"            for i, t in enumerate(timesteps):\n",
+						"                # expand the latents if we are doing classifier free guidance\n",
+						"                latent_model_input = torch.cat([latents] * 2) if do_classifier_free_guidance else latents\n",
+						"                latent_model_input = self.scheduler.scale_model_input(latent_model_input, t)\n",
+						"\n",
+						"                # predict the noise residual\n",
+						"                noise_pred = self.unet(\n",
+						"                    {\n",
+						"                        \"sample\": latent_model_input,\n",
+						"                        \"timestep\": t,\n",
+						"                        \"encoder_hidden_states\": prompt_embeds,\n",
+						"                    }\n",
+						"                )[0]\n",
+						"                noise_pred = torch.tensor(noise_pred)\n",
+						"\n",
+						"                # perform guidance\n",
+						"                if do_classifier_free_guidance:\n",
+						"                    noise_pred_uncond, noise_pred_text = noise_pred.chunk(2)\n",
+						"                    noise_pred = noise_pred_uncond + guidance_scale * (noise_pred_text - noise_pred_uncond)\n",
+						"\n",
+						"                # reshape latents\n",
+						"                bsz, channel, frames, width, height = latents.shape\n",
+						"                latents = latents.permute(0, 2, 1, 3, 4).reshape(bsz * frames, channel, width, height)\n",
+						"                noise_pred = noise_pred.permute(0, 2, 1, 3, 4).reshape(bsz * frames, channel, width, height)\n",
+						"\n",
+						"                # compute the previous noisy sample x_t -> x_t-1\n",
+						"                latents = self.scheduler.step(noise_pred, t, latents, **extra_step_kwargs).prev_sample\n",
+						"\n",
+						"                # reshape latents back\n",
+						"                latents = latents[None, :].reshape(bsz, frames, channel, width, height).permute(0, 2, 1, 3, 4)\n",
+						"\n",
+						"                # call the callback, if provided\n",
+						"                if i == len(timesteps) - 1 or ((i + 1) > num_warmup_steps and (i + 1) % self.scheduler.order == 0):\n",
+						"                    progress_bar.update()\n",
+						"                    if callback is not None and i % callback_steps == 0:\n",
+						"                        callback(i, t, latents)\n",
+						"\n",
+						"        video_tensor = self.decode_latents(latents)\n",
+						"\n",
+						"        if output_type == \"pt\":\n",
+						"            video = video_tensor\n",
+						"        else:\n",
+						"            video = tensor2vid(video_tensor)\n",
+						"\n",
+						"        if not return_dict:\n",
+						"            return (video,)\n",
+						"\n",
+						"        return {\"frames\": video}\n",
+						"\n",
+						"    # Copied from diffusers.pipelines.stable_diffusion.pipeline_stable_diffusion.StableDiffusionPipeline._encode_prompt\n",
+						"    def _encode_prompt(\n",
+						"        self,\n",
+						"        prompt,\n",
+						"        num_images_per_prompt,\n",
+						"        do_classifier_free_guidance,\n",
+						"        negative_prompt=None,\n",
+						"        prompt_embeds: Optional[torch.FloatTensor] = None,\n",
+						"        negative_prompt_embeds: Optional[torch.FloatTensor] = None,\n",
+						"    ):\n",
+						"        r\"\"\"\n",
+						"        Encodes the prompt into text encoder hidden states.\n",
+						"\n",
+						"        Args:\n",
+						"             prompt (`str` or `List[str]`, *optional*):\n",
+						"                prompt to be encoded\n",
+						"            num_images_per_prompt (`int`):\n",
+						"                number of images that should be generated per prompt\n",
+						"            do_classifier_free_guidance (`bool`):\n",
+						"                whether to use classifier free guidance or not\n",
+						"            negative_prompt (`str` or `List[str]`, *optional*):\n",
+						"                The prompt or prompts not to guide the image generation. If not defined, one has to pass\n",
+						"                `negative_prompt_embeds` instead. Ignored when not using guidance (i.e., ignored if `guidance_scale` is\n",
+						"                less than `1`).\n",
+						"            prompt_embeds (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt weighting. If not\n",
+						"                provided, text embeddings will be generated from `prompt` input argument.\n",
+						"            negative_prompt_embeds (`torch.FloatTensor`, *optional*):\n",
+						"                Pre-generated negative text embeddings. Can be used to easily tweak text inputs, *e.g.* prompt\n",
+						"                weighting. If not provided, negative_prompt_embeds will be generated from `negative_prompt` input\n",
+						"                argument.\n",
+						"        \"\"\"\n",
+						"        if prompt is not None and isinstance(prompt, str):\n",
+						"            batch_size = 1\n",
+						"        elif prompt is not None and isinstance(prompt, list):\n",
+						"            batch_size = len(prompt)\n",
+						"        else:\n",
+						"            batch_size = prompt_embeds.shape[0]\n",
+						"\n",
+						"        if prompt_embeds is None:\n",
+						"            text_inputs = self.tokenizer(\n",
+						"                prompt,\n",
+						"                padding=\"max_length\",\n",
+						"                max_length=self.tokenizer.model_max_length,\n",
+						"                truncation=True,\n",
+						"                return_tensors=\"pt\",\n",
+						"            )\n",
+						"            text_input_ids = text_inputs.input_ids\n",
+						"            untruncated_ids = self.tokenizer(prompt, padding=\"longest\", return_tensors=\"pt\").input_ids\n",
+						"\n",
+						"            if untruncated_ids.shape[-1] >= text_input_ids.shape[-1] and not torch.equal(text_input_ids, untruncated_ids):\n",
+						"                removed_text = self.tokenizer.batch_decode(untruncated_ids[:, self.tokenizer.model_max_length - 1 : -1])\n",
+						"                print(\n",
+						"                    \"The following part of your input was truncated because CLIP can only handle sequences up to\"\n",
+						"                    f\" {self.tokenizer.model_max_length} tokens: {removed_text}\"\n",
+						"                )\n",
+						"\n",
+						"            prompt_embeds = self.text_encoder(text_input_ids)\n",
+						"            prompt_embeds = prompt_embeds[0]\n",
+						"            prompt_embeds = torch.tensor(prompt_embeds)\n",
+						"\n",
+						"        bs_embed, seq_len, _ = prompt_embeds.shape\n",
+						"        # duplicate text embeddings for each generation per prompt, using mps friendly method\n",
+						"        prompt_embeds = prompt_embeds.repeat(1, num_images_per_prompt, 1)\n",
+						"        prompt_embeds = prompt_embeds.view(bs_embed * num_images_per_prompt, seq_len, -1)\n",
+						"\n",
+						"        # get unconditional embeddings for classifier free guidance\n",
+						"        if do_classifier_free_guidance and negative_prompt_embeds is None:\n",
+						"            uncond_tokens: List[str]\n",
+						"            if negative_prompt is None:\n",
+						"                uncond_tokens = [\"\"] * batch_size\n",
+						"            elif type(prompt) is not type(negative_prompt):\n",
+						"                raise TypeError(f\"`negative_prompt` should be the same type to `prompt`, but got {type(negative_prompt)} !=\" f\" {type(prompt)}.\")\n",
+						"            elif isinstance(negative_prompt, str):\n",
+						"                uncond_tokens = [negative_prompt]\n",
+						"            elif batch_size != len(negative_prompt):\n",
+						"                raise ValueError(\n",
+						"                    f\"`negative_prompt`: {negative_prompt} has batch size {len(negative_prompt)}, but `prompt`:\"\n",
+						"                    f\" {prompt} has batch size {batch_size}. Please make sure that passed `negative_prompt` matches\"\n",
+						"                    \" the batch size of `prompt`.\"\n",
+						"                )\n",
+						"            else:\n",
+						"                uncond_tokens = negative_prompt\n",
+						"\n",
+						"            max_length = prompt_embeds.shape[1]\n",
+						"            uncond_input = self.tokenizer(\n",
+						"                uncond_tokens,\n",
+						"                padding=\"max_length\",\n",
+						"                max_length=max_length,\n",
+						"                truncation=True,\n",
+						"                return_tensors=\"pt\",\n",
+						"            )\n",
+						"\n",
+						"            negative_prompt_embeds = self.text_encoder(uncond_input.input_ids)\n",
+						"            negative_prompt_embeds = negative_prompt_embeds[0]\n",
+						"            negative_prompt_embeds = torch.tensor(negative_prompt_embeds)\n",
+						"\n",
+						"        if do_classifier_free_guidance:\n",
+						"            # duplicate unconditional embeddings for each generation per prompt, using mps friendly method\n",
+						"            seq_len = negative_prompt_embeds.shape[1]\n",
+						"\n",
+						"            negative_prompt_embeds = negative_prompt_embeds.repeat(1, num_images_per_prompt, 1)\n",
+						"            negative_prompt_embeds = negative_prompt_embeds.view(batch_size * num_images_per_prompt, seq_len, -1)\n",
+						"\n",
+						"            # For classifier free guidance, we need to do two forward passes.\n",
+						"            # Here we concatenate the unconditional and text embeddings into a single batch\n",
+						"            # to avoid doing two forward passes\n",
+						"            prompt_embeds = torch.cat([negative_prompt_embeds, prompt_embeds])\n",
+						"\n",
+						"        return prompt_embeds\n",
+						"\n",
+						"    def prepare_latents(\n",
+						"        self,\n",
+						"        batch_size,\n",
+						"        num_channels_latents,\n",
+						"        dtype,\n",
+						"        generator,\n",
+						"        latents=None,\n",
+						"    ):\n",
+						"        shape = (\n",
+						"            batch_size,\n",
+						"            num_channels_latents,\n",
+						"            self.num_frames,\n",
+						"            self.height // self.vae_scale_factor,\n",
+						"            self.width // self.vae_scale_factor,\n",
+						"        )\n",
+						"        if isinstance(generator, list) and len(generator) != batch_size:\n",
+						"            raise ValueError(\n",
+						"                f\"You have passed a list of generators of length {len(generator)}, but requested an effective batch\"\n",
+						"                f\" size of {batch_size}. Make sure the batch size matches the length of the generators.\"\n",
+						"            )\n",
+						"\n",
+						"        if latents is None:\n",
+						"            latents = randn_tensor(shape, generator=generator, dtype=dtype)\n",
+						"\n",
+						"        # scale the initial noise by the standard deviation required by the scheduler\n",
+						"        latents = latents * self.scheduler.init_noise_sigma\n",
+						"        return latents\n",
+						"\n",
+						"    def check_inputs(\n",
+						"        self,\n",
+						"        prompt,\n",
+						"        callback_steps,\n",
+						"        negative_prompt=None,\n",
+						"        prompt_embeds=None,\n",
+						"        negative_prompt_embeds=None,\n",
+						"    ):\n",
+						"        if self.height % 8 != 0 or self.width % 8 != 0:\n",
+						"            raise ValueError(f\"`height` and `width` have to be divisible by 8 but are {self.height} and {self.width}.\")\n",
+						"\n",
+						"        if (callback_steps is None) or (callback_steps is not None and (not isinstance(callback_steps, int) or callback_steps <= 0)):\n",
+						"            raise ValueError(f\"`callback_steps` has to be a positive integer but is {callback_steps} of type\" f\" {type(callback_steps)}.\")\n",
+						"\n",
+						"        if prompt is not None and prompt_embeds is not None:\n",
+						"            raise ValueError(\n",
+						"                f\"Cannot forward both `prompt`: {prompt} and `prompt_embeds`: {prompt_embeds}. Please make sure to\" \" only forward one of the two.\"\n",
+						"            )\n",
+						"        elif prompt is None and prompt_embeds is None:\n",
+						"            raise ValueError(\"Provide either `prompt` or `prompt_embeds`. Cannot leave both `prompt` and `prompt_embeds` undefined.\")\n",
+						"        elif prompt is not None and (not isinstance(prompt, str) and not isinstance(prompt, list)):\n",
+						"            raise ValueError(f\"`prompt` has to be of type `str` or `list` but is {type(prompt)}\")\n",
+						"\n",
+						"        if negative_prompt is not None and negative_prompt_embeds is not None:\n",
+						"            raise ValueError(\n",
+						"                f\"Cannot forward both `negative_prompt`: {negative_prompt} and `negative_prompt_embeds`:\"\n",
+						"                f\" {negative_prompt_embeds}. Please make sure to only forward one of the two.\"\n",
+						"            )\n",
+						"\n",
+						"        if prompt_embeds is not None and negative_prompt_embeds is not None:\n",
+						"            if prompt_embeds.shape != negative_prompt_embeds.shape:\n",
+						"                raise ValueError(\n",
+						"                    \"`prompt_embeds` and `negative_prompt_embeds` must have the same shape when passed directly, but\"\n",
+						"                    f\" got: `prompt_embeds` {prompt_embeds.shape} != `negative_prompt_embeds`\"\n",
+						"                    f\" {negative_prompt_embeds.shape}.\"\n",
+						"                )\n",
+						"\n",
+						"    def decode_latents(self, latents):\n",
+						"        scale_factor = 0.18215\n",
+						"        latents = 1 / scale_factor * latents\n",
+						"\n",
+						"        batch_size, channels, num_frames, height, width = latents.shape\n",
+						"        latents = latents.permute(0, 2, 1, 3, 4).reshape(batch_size * num_frames, channels, height, width)\n",
+						"        image = self.vae_decoder(latents)[0]\n",
+						"        image = torch.tensor(image)\n",
+						"        video = (\n",
+						"            image[None, :]\n",
+						"            .reshape(\n",
+						"                (\n",
+						"                    batch_size,\n",
+						"                    num_frames,\n",
+						"                    -1,\n",
+						"                )\n",
+						"                + image.shape[2:]\n",
+						"            )\n",
+						"            .permute(0, 2, 1, 3, 4)\n",
+						"        )\n",
+						"        # we always cast to float32 as this does not cause significant overhead and is compatible with bfloat16\n",
+						"        video = video.float()\n",
+						"        return video"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Inference with OpenVINO\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"core = ov.Core()"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Select inference device\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"select device from dropdown list for running inference using OpenVINO"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"import requests\n",
+						"\n",
+						"r = requests.get(\n",
+						"    url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/notebook_utils.py\",\n",
+						")\n",
+						"open(\"notebook_utils.py\", \"w\").write(r.text)\n",
+						"\n",
+						"from notebook_utils import device_widget\n",
+						"\n",
+						"device = device_widget()\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%%time\n",
+						"ov_unet = core.compile_model(unet_xml_path, device_name=device.value)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%%time\n",
+						"ov_vae_decoder = core.compile_model(vae_decoder_xml_path, device_name=device.value)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"%%time\n",
+						"ov_text_encoder = core.compile_model(text_encoder_xml, device_name=device.value)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Here we replace the pipeline parts with versions converted to OpenVINO IR and compiled to specific device. Note that we use original pipeline tokenizer and scheduler."
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"ov_pipe = OVTextToVideoSDPipeline(ov_vae_decoder, ov_text_encoder, tokenizer, ov_unet, scheduler)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Define a prompt\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"prompt = \"A panda eating bamboo on a rock.\""
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"Let's generate a video for our prompt. For full list of arguments, see `__call__` function definition of `OVTextToVideoSDPipeline` class in [Build a pipeline](#Build-a-pipeline) section."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"### Video generation\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"frames = ov_pipe(prompt, num_inference_steps=25)[\"frames\"]"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"images = [PIL.Image.fromarray(frame) for frame in frames]\n",
+						"images[0].save(\"output.gif\", save_all=True, append_images=images[1:], duration=125, loop=0)\n",
+						"with open(\"output.gif\", \"rb\") as gif_file:\n",
+						"    b64 = f\"data:image/gif;base64,{base64.b64encode(gif_file.read()).decode()}\"\n",
+						"IPython.display.HTML(f'<img src=\"{b64}\" />')"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"source": [
+						"## Interactive demo\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"source": [
+						"def generate(prompt, seed, num_inference_steps, _=gr.Progress(track_tqdm=True)):\n",
+						"    generator = torch.Generator().manual_seed(seed)\n",
+						"    frames = ov_pipe(\n",
+						"        prompt,\n",
+						"        num_inference_steps=num_inference_steps,\n",
+						"        generator=generator,\n",
+						"    )[\"frames\"]\n",
+						"    out_file = tempfile.NamedTemporaryFile(suffix=\".gif\", delete=False)\n",
+						"    images = [PIL.Image.fromarray(frame) for frame in frames]\n",
+						"    images[0].save(out_file, save_all=True, append_images=images[1:], duration=125, loop=0)\n",
+						"    return out_file.name\n",
+						"\n",
+						"\n",
+						"demo = gr.Interface(\n",
+						"    generate,\n",
+						"    [\n",
+						"        gr.Textbox(label=\"Prompt\"),\n",
+						"        gr.Slider(0, 1000000, value=42, label=\"Seed\", step=1),\n",
+						"        gr.Slider(10, 50, value=25, label=\"Number of inference steps\", step=1),\n",
+						"    ],\n",
+						"    gr.Image(label=\"Result\"),\n",
+						"    examples=[\n",
+						"        [\"An astronaut riding a horse.\", 0, 25],\n",
+						"        [\"A panda eating bamboo on a rock.\", 0, 25],\n",
+						"        [\"Spiderman is surfing.\", 0, 25],\n",
+						"    ],\n",
+						"    allow_flagging=\"never\",\n",
+						")\n",
+						"\n",
+						"try:\n",
+						"    demo.queue().launch(debug=True)\n",
+						"except Exception:\n",
+						"    demo.queue().launch(share=True, debug=True)\n",
+						"# if you are launching remotely, specify server_name and server_port\n",
+						"# demo.launch(server_name='your server name', server_port='server port in int')\n",
+						"# Read more in the docs: https://gradio.app/docs/"
+					]
+				}
+			].map(fromJupyterCell)
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: 4 },
+			{ modified: 5, original: 5 },
+			{ modified: 6, original: 6 },
+			{ modified: 7, original: 7 },
+			{ modified: 8, original: 8 },
+			{ modified: 9, original: 9 },
+			{ modified: 10, original: 10 },
+			{ modified: 11, original: 11 },
+			{ modified: 12, original: 12 },
+			{ modified: 13, original: 13 },
+			{ modified: 14, original: 14 },
+			{ modified: 15, original: 15 },
+			{ modified: 16, original: 16 },
+			{ modified: 17, original: 17 },
+			{ modified: 18, original: 18 },
+			{ modified: 19, original: 19 },
+			{ modified: 20, original: 20 },
+			{ modified: 21, original: 21 },
+			{ modified: 22, original: 22 },
+			{ modified: 23, original: 23 },
+			{ modified: 24, original: 24 },
+			{ modified: 25, original: 25 },
+			{ modified: 26, original: 26 },
+			{ modified: 27, original: 27 },
+			{ modified: 28, original: 28 },
+			{ modified: 29, original: 29 },
+			{ modified: 30, original: 30 },
+			{ modified: 31, original: 31 },
+			{ modified: 32, original: 32 },
+			{ modified: 33, original: 33 },
+			{ modified: 34, original: 34 },
+			{ modified: 35, original: 35 },
+			{ modified: 36, original: 36 },
+			{ modified: 37, original: 37 },
+			{ modified: 38, original: 38 },
+			{ modified: 39, original: 39 },
+			{ modified: 40, original: 40 },
+			{ modified: 41, original: 41 },
+			{ modified: 42, original: 42 },
+			{ modified: 43, original: 43 },
+			{ modified: 44, original: 44 },
+			{ modified: 45, original: 45 },
+			{ modified: 46, original: 46 },
+			{ modified: 47, original: 47 },
+			{ modified: 48, original: 48 },
+			{ modified: 49, original: 49 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 6, originalLength: 1, modifiedStart: 6, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 15, originalLength: 1, modifiedStart: 15, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 36, originalLength: 1, modifiedStart: 36, modifiedLength: 1 } satisfies IDiffChange,
+			// { originalStart: 50, originalLength: 0, modifiedStart: 50, modifiedLength: 2 } satisfies IDiffChange,
+		]);
+
+	});
+	test('Modification of multiple cells', async () => {
+		const { mapping, diff } = await mapCells(
+			[
+				{
+					"cell_type": "markdown",
+					"id": "a2e7d62b-5779-4211-822c-457c77321f8b",
+					"source": [
+						"# Convert and Optimize YOLOv11 instance segmentation model with OpenVINO™\n",
+						"\n",
+						"Instance segmentation goes a step further than object detection and involves identifying individual objects in an image and segmenting them from the rest of the image. Instance segmentation as an object detection are often used as key components in computer vision systems. \n",
+						"Applications that use real-time instance segmentation models include video analytics, robotics, autonomous vehicles, multi-object tracking and object counting, medical image analysis, and many others.\n",
+						"\n",
+						"\n",
+						"This tutorial demonstrates step-by-step instructions on how to run and optimize PyTorch YOLOv11 with OpenVINO. We consider the steps required for instance segmentation scenario.  You can find more details about model on [model page](https://docs.ultralytics.com/models/yolo11/) in Ultralytics documentation.\n",
+						"\n",
+						"The tutorial consists of the following steps:\n",
+						"- Prepare the PyTorch model.\n",
+						"- Download and prepare a dataset.\n",
+						"- Validate the original model.\n",
+						"- Convert the PyTorch model to OpenVINO IR.\n",
+						"- Validate the converted model.\n",
+						"- Prepare and run optimization pipeline.\n",
+						"- Compare performance of the FP32 and quantized models.\n",
+						"- Compare accuracy of the FP32 and quantized models.\n",
+						"- Live demo\n",
+						"\n",
+						"\n",
+						"#### Table of contents:\n",
+						"\n",
+						"- [Get PyTorch model](#Get-PyTorch-model)\n",
+						"    - [Prerequisites](#Prerequisites)\n",
+						"- [Instantiate model](#Instantiate-model)\n",
+						"    - [Convert model to OpenVINO IR](#Convert-model-to-OpenVINO-IR)\n",
+						"    - [Verify model inference](#Verify-model-inference)\n",
+						"    - [Select inference device](#Select-inference-device)\n",
+						"    - [Test on single image](#Test-on-single-image)\n",
+						"- [Optimize model using NNCF Post-training Quantization API](#Optimize-model-using-NNCF-Post-training-Quantization-API)\n",
+						"    - [Validate Quantized model inference](#Validate-Quantized-model-inference)\n",
+						"- [Compare the Original and Quantized Models](#Compare-the-Original-and-Quantized-Models)\n",
+						"    - [Compare performance of the Original and Quantized Models](#Compare-performance-of-the-Original-and-Quantized-Models)\n",
+						"- [Other ways to optimize model](#Other-ways-to-optimize-model)\n",
+						"- [Live demo](#Live-demo)\n",
+						"    - [Run Live Object Detection and Segmentation](#Run-Live-Object-Detection-and-Segmentation)\n",
+						"\n",
+						"\n",
+						"### Installation Instructions\n",
+						"\n",
+						"This is a self-contained example that relies solely on its own code.\n",
+						"\n",
+						"We recommend  running the notebook in a virtual environment. You only need a Jupyter server to start.\n",
+						"For details, please refer to [Installation Guide](https://github.com/openvinotoolkit/openvino_notebooks/blob/latest/README.md#-installation-guide).\n",
+						"\n",
+						"<img referrerpolicy=\"no-referrer-when-downgrade\" src=\"https://static.scarf.sh/a.png?x-pxid=5b5a4db0-7875-4bfb-bdbd-01698b5b1a77&file=notebooks/yolov11-optimization/yolov11-instance-segmentation.ipynb\" />\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "d7a12678-b12f-48d1-9735-398855733e46",
+					"source": [
+						"## Get PyTorch model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Generally, PyTorch models represent an instance of the [`torch.nn.Module`](https://pytorch.org/docs/stable/generated/torch.nn.Module.html) class, initialized by a state dictionary with model weights.\n",
+						"We will use the YOLOv11 nano model (also known as `yolo11n-seg`) pre-trained on a COCO dataset, which is available in this [repo](https://github.com/ultralytics/ultralytics). Similar steps are also applicable to other YOLOv11 models.\n",
+						"Typical steps to obtain a pre-trained model:\n",
+						"1. Create an instance of a model class.\n",
+						"2. Load a checkpoint state dict, which contains the pre-trained model weights.\n",
+						"3. Turn the model to evaluation for switching some operations to inference mode.\n",
+						"\n",
+						"In this case, the creators of the model provide an API that enables converting the YOLOv11 model to OpenVINO IR. Therefore, we do not need to do these steps manually."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "e2267760-cbfe-41c6-958d-cad9f845d5bb",
+					"source": [
+						"#### Prerequisites\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Install necessary packages."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "30d04872-6916-454c-9211-6c644b50dc04",
+					"source": [
+						"%pip install -q \"openvino>=2024.0.0\" \"nncf>=2.9.0\"\n",
+						"%pip install -q \"torch>=2.1\" \"torchvision>=0.16\" \"ultralytics==8.3.0\" opencv-python tqdm --extra-index-url https://download.pytorch.org/whl/cpu"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "1bbe319c",
+					"source": [
+						"Import required utility functions.\n",
+						"The lower cell will download the `notebook_utils` Python module from GitHub."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "a2f6cd89",
+					"source": [
+						"from pathlib import Path\n",
+						"\n",
+						"# Fetch `notebook_utils` module\n",
+						"import requests\n",
+						"\n",
+						"r = requests.get(\n",
+						"    url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/notebook_utils.py\",\n",
+						")\n",
+						"\n",
+						"open(\"notebook_utils.py\", \"w\").write(r.text)\n",
+						"from notebook_utils import download_file, VideoPlayer, device_widget"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "373658bd-7e64-4479-914e-f2742d330afd",
+					"source": [
+						"# Download a test sample\n",
+						"IMAGE_PATH = Path(\"./data/coco_bike.jpg\")\n",
+						"download_file(\n",
+						"    url=\"https://storage.openvinotoolkit.org/repositories/openvino_notebooks/data/data/image/coco_bike.jpg\",\n",
+						"    filename=IMAGE_PATH.name,\n",
+						"    directory=IMAGE_PATH.parent,\n",
+						")"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "ee32fd08-650c-4751-bb41-d8afccb2495e",
+					"source": [
+						"## Instantiate model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"For loading the model, required to specify a path to the model checkpoint. It can be some local path or name available on models hub (in this case model checkpoint will be downloaded automatically). \n",
+						"You can select model using widget bellow:"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "7c3963a5-b50b-4ffe-b710-ccd1f4a65380",
+					"source": [
+						"import ipywidgets as widgets\n",
+						"\n",
+						"model_id = [\n",
+						"    \"yolo11n-seg\",\n",
+						"    \"yolo11s-seg\",\n",
+						"    \"yolo11m-seg\",\n",
+						"    \"yolo11l-seg\",\n",
+						"    \"yolo11x-seg\",\n",
+						"    \"yolov8n-seg\",\n",
+						"    \"yolov8s-seg\",\n",
+						"    \"yolov8m-seg\",\n",
+						"    \"yolov8l-seg\",\n",
+						"    \"yolov8x-seg\",\n",
+						"]\n",
+						"\n",
+						"model_name = widgets.Dropdown(options=model_id, value=model_id[0], description=\"Model\")\n",
+						"\n",
+						"model_name"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "60105d86-d7e0-47a9-ad88-4fff014ba3d8",
+					"source": [
+						"Making prediction, the model accepts a path to input image and returns list with Results class object. Results contains boxes for object detection model and boxes and masks for segmentation model. Also it contains utilities for processing results, for example, `plot()` method for drawing.\n",
+						"\n",
+						"Let us consider the examples:"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "d4994e1e-a3ee-4620-bc8b-237a55c47742",
+					"source": [
+						"from PIL import Image\n",
+						"from ultralytics import YOLO\n",
+						"\n",
+						"SEG_MODEL_NAME = model_name.value\n",
+						"\n",
+						"seg_model = YOLO(f\"{SEG_MODEL_NAME}.pt\")\n",
+						"label_map = seg_model.model.names\n",
+						"\n",
+						"res = seg_model(IMAGE_PATH)\n",
+						"Image.fromarray(res[0].plot()[:, :, ::-1])"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "e345ffcc-c4b8-44ba-8b03-f37e63a060da",
+					"source": [
+						"### Convert model to OpenVINO IR\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Ultralytics provides API for convenient model exporting to different formats including OpenVINO IR. `model.export` is responsible for model conversion. We need to specify the format, and additionally, we can preserve dynamic shapes in the model."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "5c3ef363-f6a1-4fe5-b7ff-eb5a9c0789f1",
+					"source": [
+						"# instance segmentation model\n",
+						"seg_model_path = Path(f\"{SEG_MODEL_NAME}_openvino_model/{SEG_MODEL_NAME}.xml\")\n",
+						"if not seg_model_path.exists():\n",
+						"    seg_model.export(format=\"openvino\", dynamic=True, half=True)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "713cd45f-2b19-4a1e-bc9d-5e69bd95d896",
+					"source": [
+						"### Verify model inference\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"We can reuse the base model pipeline for pre- and postprocessing just replacing the inference method where we will use the IR model for inference."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "f9b9c472",
+					"source": [
+						"### Select inference device\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Select device from dropdown list for running inference using OpenVINO"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "4e0652b2",
+					"source": [
+						"device = device_widget()\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "cd163eab-e803-4ae8-96da-22c3bf303630",
+					"source": [
+						"### Test on single image\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "34a65afa-4201-428b-af11-b35e0d206e93",
+					"source": [
+						"import openvino as ov\n",
+						"\n",
+						"core = ov.Core()\n",
+						"seg_ov_model = core.read_model(seg_model_path)\n",
+						"\n",
+						"ov_config = {}\n",
+						"if device.value != \"CPU\":\n",
+						"    seg_ov_model.reshape({0: [1, 3, 640, 640]})\n",
+						"if \"GPU\" in device.value or (\"AUTO\" in device.value and \"GPU\" in core.available_devices):\n",
+						"    ov_config = {\"GPU_DISABLE_WINOGRAD_CONVOLUTION\": \"YES\"}\n",
+						"seg_compiled_model = core.compile_model(seg_ov_model, device.value, ov_config)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "389a4698-b7fc-4aa2-9833-9681f575d88b",
+					"source": [
+						"seg_model = YOLO(seg_model_path.parent, task=\"segment\")\n",
+						"\n",
+						"if seg_model.predictor is None:\n",
+						"    custom = {\"conf\": 0.25, \"batch\": 1, \"save\": False, \"mode\": \"predict\"}  # method defaults\n",
+						"    args = {**seg_model.overrides, **custom}\n",
+						"    seg_model.predictor = seg_model._smart_load(\"predictor\")(overrides=args, _callbacks=seg_model.callbacks)\n",
+						"    seg_model.predictor.setup_model(model=seg_model.model)\n",
+						"\n",
+						"seg_model.predictor.model.ov_compiled_model = seg_compiled_model"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "12d2522f-e939-4512-b74a-3e20baf1edc8",
+					"source": [
+						"res = seg_model(IMAGE_PATH)\n",
+						"Image.fromarray(res[0].plot()[:, :, ::-1])"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "7e918cf6-cdce-4e90-a6d7-c435a3c08d93",
+					"source": [
+						"Great! The result is the same, as produced by original models."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "13b69e12-2e22-44c1-bfed-fdc88f6c424d",
+					"source": [
+						"## Optimize model using NNCF Post-training Quantization API\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"[NNCF](https://github.com/openvinotoolkit/nncf) provides a suite of advanced algorithms for Neural Networks inference optimization in OpenVINO with minimal accuracy drop.\n",
+						"We will use 8-bit quantization in post-training mode (without the fine-tuning pipeline) to optimize YOLOv11.\n",
+						"\n",
+						"The optimization process contains the following steps:\n",
+						"\n",
+						"1. Create a Dataset for quantization.\n",
+						"2. Run `nncf.quantize` for getting an optimized model.\n",
+						"3. Serialize OpenVINO IR model, using the `openvino.runtime.serialize` function."
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "7d7eeae8-f3f4-4e95-b1a6-a23085f03ebc",
+					"source": [
+						"Please select below whether you would like to run quantization to improve model inference speed."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "4690b9fc-c49f-4882-b8a5-c82f842a9126",
+					"source": [
+						"import ipywidgets as widgets\n",
+						"\n",
+						"int8_model_seg_path = Path(f\"{SEG_MODEL_NAME}_openvino_int8_model/{SEG_MODEL_NAME}.xml\")\n",
+						"quantized_seg_model = None\n",
+						"\n",
+						"to_quantize = widgets.Checkbox(\n",
+						"    value=True,\n",
+						"    description=\"Quantization\",\n",
+						"    disabled=False,\n",
+						")\n",
+						"\n",
+						"to_quantize"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "73cfdbd4-3b65-49e0-b8ab-ceb1d0362481",
+					"source": [
+						"Let's load `skip magic` extension to skip quantization if `to_quantize` is not selected"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "bc6121aa-3a07-4066-a123-fe0ed0e72478",
+					"source": [
+						"# Fetch skip_kernel_extension module\n",
+						"import requests\n",
+						"\n",
+						"r = requests.get(\n",
+						"    url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/skip_kernel_extension.py\",\n",
+						")\n",
+						"open(\"skip_kernel_extension.py\", \"w\").write(r.text)\n",
+						"\n",
+						"%load_ext skip_kernel_extension"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "94fb2515-3645-4798-bc7c-082129ac86c0",
+					"source": [
+						"Reuse validation dataloader in accuracy testing for quantization. \n",
+						"For that, it should be wrapped into the `nncf.Dataset` object and define a transformation function for getting only input tensors."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "fd994958-6988-4a1d-ac7f-3efbd97135cc",
+					"source": [
+						"# %%skip not $to_quantize.value\n",
+						"\n",
+						"\n",
+						"import nncf\n",
+						"from typing import Dict\n",
+						"\n",
+						"from zipfile import ZipFile\n",
+						"\n",
+						"from ultralytics.data.utils import DATASETS_DIR\n",
+						"from ultralytics.utils import DEFAULT_CFG\n",
+						"from ultralytics.cfg import get_cfg\n",
+						"from ultralytics.data.converter import coco80_to_coco91_class\n",
+						"from ultralytics.data.utils import check_det_dataset\n",
+						"from ultralytics.utils import ops\n",
+						"\n",
+						"\n",
+						"if not int8_model_seg_path.exists():\n",
+						"    DATA_URL = \"http://images.cocodataset.org/zips/val2017.zip\"\n",
+						"    LABELS_URL = \"https://github.com/ultralytics/yolov5/releases/download/v1.0/coco2017labels-segments.zip\"\n",
+						"    CFG_URL = \"https://raw.githubusercontent.com/ultralytics/ultralytics/v8.1.0/ultralytics/cfg/datasets/coco.yaml\"\n",
+						"\n",
+						"    OUT_DIR = DATASETS_DIR\n",
+						"\n",
+						"    DATA_PATH = OUT_DIR / \"val2017.zip\"\n",
+						"    LABELS_PATH = OUT_DIR / \"coco2017labels-segments.zip\"\n",
+						"    CFG_PATH = OUT_DIR / \"coco.yaml\"\n",
+						"\n",
+						"    download_file(DATA_URL, DATA_PATH.name, DATA_PATH.parent)\n",
+						"    download_file(LABELS_URL, LABELS_PATH.name, LABELS_PATH.parent)\n",
+						"    download_file(CFG_URL, CFG_PATH.name, CFG_PATH.parent)\n",
+						"\n",
+						"    if not (OUT_DIR / \"coco/labels\").exists():\n",
+						"        with ZipFile(LABELS_PATH, \"r\") as zip_ref:\n",
+						"            zip_ref.extractall(OUT_DIR)\n",
+						"        with ZipFile(DATA_PATH, \"r\") as zip_ref:\n",
+						"            zip_ref.extractall(OUT_DIR / \"coco/images\")\n",
+						"\n",
+						"    args = get_cfg(cfg=DEFAULT_CFG)\n",
+						"    args.data = str(CFG_PATH)\n",
+						"    seg_validator = seg_model.task_map[seg_model.task][\"validator\"](args=args)\n",
+						"    seg_validator.data = check_det_dataset(args.data)\n",
+						"    seg_validator.stride = 32\n",
+						"    seg_data_loader = seg_validator.get_dataloader(OUT_DIR / \"coco/\", 1)\n",
+						"\n",
+						"    seg_validator.is_coco = True\n",
+						"    seg_validator.class_map = coco80_to_coco91_class()\n",
+						"    seg_validator.names = label_map\n",
+						"    seg_validator.metrics.names = seg_validator.names\n",
+						"    seg_validator.nc = 80\n",
+						"    seg_validator.nm = 32\n",
+						"    seg_validator.process = ops.process_mask\n",
+						"    seg_validator.plot_masks = []\n",
+						"\n",
+						"    def transform_fn(data_item: Dict):\n",
+						"        \"\"\"\n",
+						"        Quantization transform function. Extracts and preprocess input data from dataloader item for quantization.\n",
+						"        Parameters:\n",
+						"           data_item: Dict with data item produced by DataLoader during iteration\n",
+						"        Returns:\n",
+						"            input_tensor: Input data for quantization\n",
+						"        \"\"\"\n",
+						"        input_tensor = seg_validator.preprocess(data_item)[\"img\"].numpy()\n",
+						"        return input_tensor\n",
+						"\n",
+						"    quantization_dataset = nncf.Dataset(seg_data_loader, transform_fn)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "91629284-e261-494d-9464-146ed7190084",
+					"source": [
+						"The `nncf.quantize` function provides an interface for model quantization. It requires an instance of the OpenVINO Model and quantization dataset. \n",
+						"Optionally, some additional parameters for the configuration quantization process (number of samples for quantization, preset, ignored scope, etc.) can be provided. Ultralytics models contain non-ReLU activation functions, which require asymmetric quantization of activations. To achieve a better result, we will use a `mixed` quantization preset. It provides symmetric quantization of weights and asymmetric quantization of activations. For more accurate results, we should keep the operation in the postprocessing subgraph in floating point precision, using the `ignored_scope` parameter.\n",
+						"\n",
+						">**Note**: Model post-training quantization is time-consuming process. Be patient, it can take several minutes depending on your hardware."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "b2e8cec4-d0b3-4da0-b54c-7964e7bcbfe2",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"if not int8_model_seg_path.exists():\n",
+						"    ignored_scope = nncf.IgnoredScope(  # post-processing\n",
+						"        subgraphs=[\n",
+						"            nncf.Subgraph(inputs=[f\"__module.model.{22 if 'v8' in SEG_MODEL_NAME else 23}/aten::cat/Concat\",\n",
+						"                                  f\"__module.model.{22 if 'v8' in SEG_MODEL_NAME else 23}/aten::cat/Concat_1\",\n",
+						"                                  f\"__module.model.{22 if 'v8' in SEG_MODEL_NAME else 23}/aten::cat/Concat_2\",\n",
+						"                                 f\"__module.model.{22 if 'v8' in SEG_MODEL_NAME else 23}/aten::cat/Concat_7\"],\n",
+						"                          outputs=[f\"__module.model.{22 if 'v8' in SEG_MODEL_NAME else 23}/aten::cat/Concat_8\"])\n",
+						"        ]\n",
+						"    )\n",
+						"\n",
+						"    # Segmentation model\n",
+						"    quantized_seg_model = nncf.quantize(\n",
+						"        seg_ov_model,\n",
+						"        quantization_dataset,\n",
+						"        preset=nncf.QuantizationPreset.MIXED,\n",
+						"        ignored_scope=ignored_scope\n",
+						"    )\n",
+						"\n",
+						"    print(f\"Quantized segmentation model will be saved to {int8_model_seg_path}\")\n",
+						"    ov.save_model(quantized_seg_model, str(int8_model_seg_path))"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "c8c92a68-3eb8-4ea5-9e35-d496f45b3cc3",
+					"source": [
+						"### Validate Quantized model inference\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"`nncf.quantize` returns the OpenVINO Model class instance, which is suitable for loading on a device for making predictions. `INT8` model input data and output result formats have no difference from the floating point model representation. Therefore, we can reuse the same `detect` function defined above for getting the `INT8` model result on the image."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "4003a3ae",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "711200ec-2f26-47cc-b62d-3802961d5711",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"if quantized_seg_model is None:\n",
+						"    quantized_seg_model = core.read_model(int8_model_seg_path)\n",
+						"\n",
+						"ov_config = {}\n",
+						"if device.value != \"CPU\":\n",
+						"    quantized_seg_model.reshape({0: [1, 3, 640, 640]})\n",
+						"if \"GPU\" in device.value or (\"AUTO\" in device.value and \"GPU\" in core.available_devices):\n",
+						"    ov_config = {\"GPU_DISABLE_WINOGRAD_CONVOLUTION\": \"YES\"}\n",
+						"\n",
+						"quantized_seg_compiled_model = core.compile_model(quantized_seg_model, device.value, ov_config)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "b2e3ea3b-5935-4474-9f08-f51fc688b9c0",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"\n",
+						"if seg_model.predictor is None:\n",
+						"    custom = {\"conf\": 0.25, \"batch\": 1, \"save\": False, \"mode\": \"predict\"}  # method defaults\n",
+						"    args = {**seg_model.overrides, **custom}\n",
+						"    seg_model.predictor = seg_model._smart_load(\"predictor\")(overrides=args, _callbacks=seg_model.callbacks)\n",
+						"    seg_model.predictor.setup_model(model=seg_model.model)\n",
+						"\n",
+						"seg_model.predictor.model.ov_compiled_model = quantized_seg_compiled_model"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "bef2ed5d-5762-41a6-af2e-ee4f9fd56557",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"res = seg_model(IMAGE_PATH)\n",
+						"display(Image.fromarray(res[0].plot()[:, :, ::-1]))"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "b289f057",
+					"source": [
+						"## Compare the Original and Quantized Models\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "59081cae-9c92-46f0-8117-ed8c6fa6ff19",
+					"source": [
+						"### Compare performance of the Original and Quantized Models\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"Finally, use the OpenVINO [Benchmark Tool](https://docs.openvino.ai/2024/learn-openvino/openvino-samples/benchmark-tool.html) to measure the inference performance of the `FP32` and `INT8` models.\n",
+						"\n",
+						"> **Note**: For more accurate performance, it is recommended to run `benchmark_app` in a terminal/command prompt after closing other applications. Run `benchmark_app -m <model_path> -d CPU -shape \"<input_shape>\"` to benchmark async inference on CPU on specific input data shape for one minute. Change `CPU` to `GPU` to benchmark on GPU. Run `benchmark_app --help` to see an overview of all command-line options."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "b8677df4",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "546828d2",
+					"source": [
+						"if int8_model_seg_path.exists():\n",
+						"    !benchmark_app -m $seg_model_path -d $device.value -api async -shape \"[1,3,640,640]\" -t 15"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "1d43554b",
+					"source": [
+						"if int8_model_seg_path.exists():\n",
+						"    !benchmark_app -m $int8_model_seg_path -d $device.value -api async -shape \"[1,3,640,640]\" -t 15"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "184bcebd-588d-4b4d-a60a-0fa753a07ef9",
+					"source": [
+						"## Other ways to optimize model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"The performance could be also improved by another OpenVINO method such as async inference pipeline or preprocessing API.\n",
+						"\n",
+						"Async Inference pipeline help to utilize the device more optimal. The key advantage of the Async API is that when a device is busy with inference, the application can perform other tasks in parallel (for example, populating inputs or scheduling other requests) rather than wait for the current inference to complete first. To understand how to perform async inference using openvino, refer to [Async API tutorial](../async-api/async-api.ipynb)\n",
+						"\n",
+						"Preprocessing API enables making preprocessing a part of the model reducing application code and dependency on additional image processing libraries. \n",
+						"The main advantage of Preprocessing API is that preprocessing steps will be integrated into the execution graph and will be performed on a selected device (CPU/GPU etc.) rather than always being executed on CPU as part of an application. This will also improve selected device utilization. For more information, refer to the overview of [Preprocessing API tutorial](../optimize-preprocessing/optimize-preprocessing.ipynb). To see, how it could be used with YOLOV8 object detection model, please, see [Convert and Optimize YOLOv8 real-time object detection with OpenVINO tutorial](./yolov8-object-detection.ipynb)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "2e3b4862-c182-4ce4-a473-9f38d98deab8",
+					"source": [
+						"## Live demo\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"The following code runs model inference on a video:"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "4c7bb92e-e301-45a9-b5ff-f7953fad298f",
+					"source": [
+						"import collections\n",
+						"import time\n",
+						"import cv2\n",
+						"from IPython import display\n",
+						"import numpy as np\n",
+						"\n",
+						"\n",
+						"def run_instance_segmentation(\n",
+						"    source=0,\n",
+						"    flip=False,\n",
+						"    use_popup=False,\n",
+						"    skip_first_frames=0,\n",
+						"    model=seg_model,\n",
+						"    device=device.value,\n",
+						"):\n",
+						"    player = None\n",
+						"\n",
+						"    ov_config = {}\n",
+						"    if device != \"CPU\":\n",
+						"        model.reshape({0: [1, 3, 640, 640]})\n",
+						"    if \"GPU\" in device or (\"AUTO\" in device and \"GPU\" in core.available_devices):\n",
+						"        ov_config = {\"GPU_DISABLE_WINOGRAD_CONVOLUTION\": \"YES\"}\n",
+						"    compiled_model = core.compile_model(model, device, ov_config)\n",
+						"\n",
+						"    if seg_model.predictor is None:\n",
+						"        custom = {\"conf\": 0.25, \"batch\": 1, \"save\": False, \"mode\": \"predict\"}  # method defaults\n",
+						"        args = {**seg_model.overrides, **custom}\n",
+						"        seg_model.predictor = seg_model._smart_load(\"predictor\")(overrides=args, _callbacks=seg_model.callbacks)\n",
+						"        seg_model.predictor.setup_model(model=seg_model.model)\n",
+						"\n",
+						"    seg_model.predictor.model.ov_compiled_model = compiled_model\n",
+						"\n",
+						"    try:\n",
+						"        # Create a video player to play with target fps.\n",
+						"        player = VideoPlayer(source=source, flip=flip, fps=30, skip_first_frames=skip_first_frames)\n",
+						"        # Start capturing.\n",
+						"        player.start()\n",
+						"        if use_popup:\n",
+						"            title = \"Press ESC to Exit\"\n",
+						"            cv2.namedWindow(winname=title, flags=cv2.WINDOW_GUI_NORMAL | cv2.WINDOW_AUTOSIZE)\n",
+						"\n",
+						"        processing_times = collections.deque()\n",
+						"        while True:\n",
+						"            # Grab the frame.\n",
+						"            frame = player.next()\n",
+						"            if frame is None:\n",
+						"                print(\"Source ended\")\n",
+						"                break\n",
+						"            # If the frame is larger than full HD, reduce size to improve the performance.\n",
+						"            scale = 1280 / max(frame.shape)\n",
+						"            if scale < 1:\n",
+						"                frame = cv2.resize(\n",
+						"                    src=frame,\n",
+						"                    dsize=None,\n",
+						"                    fx=scale,\n",
+						"                    fy=scale,\n",
+						"                    interpolation=cv2.INTER_AREA,\n",
+						"                )\n",
+						"            # Get the results.\n",
+						"            input_image = np.array(frame)\n",
+						"\n",
+						"            start_time = time.time()\n",
+						"            detections = seg_model(input_image)\n",
+						"            stop_time = time.time()\n",
+						"            frame = detections[0].plot()\n",
+						"\n",
+						"            processing_times.append(stop_time - start_time)\n",
+						"            # Use processing times from last 200 frames.\n",
+						"            if len(processing_times) > 200:\n",
+						"                processing_times.popleft()\n",
+						"\n",
+						"            _, f_width = frame.shape[:2]\n",
+						"            # Mean processing time [ms].\n",
+						"            processing_time = np.mean(processing_times) * 1000\n",
+						"            fps = 1000 / processing_time\n",
+						"            cv2.putText(\n",
+						"                img=frame,\n",
+						"                text=f\"Inference time: {processing_time:.1f}ms ({fps:.1f} FPS)\",\n",
+						"                org=(20, 40),\n",
+						"                fontFace=cv2.FONT_HERSHEY_COMPLEX,\n",
+						"                fontScale=f_width / 1000,\n",
+						"                color=(0, 0, 255),\n",
+						"                thickness=1,\n",
+						"                lineType=cv2.LINE_AA,\n",
+						"            )\n",
+						"            # Use this workaround if there is flickering.\n",
+						"            if use_popup:\n",
+						"                cv2.imshow(winname=title, mat=frame)\n",
+						"                key = cv2.waitKey(1)\n",
+						"                # escape = 27\n",
+						"                if key == 27:\n",
+						"                    break\n",
+						"            else:\n",
+						"                # Encode numpy array to jpg.\n",
+						"                _, encoded_img = cv2.imencode(ext=\".jpg\", img=frame, params=[cv2.IMWRITE_JPEG_QUALITY, 100])\n",
+						"                # Create an IPython image.\n",
+						"                i = display.Image(data=encoded_img)\n",
+						"                # Display the image in this notebook.\n",
+						"                display.clear_output(wait=True)\n",
+						"                display.display(i)\n",
+						"    # ctrl-c\n",
+						"    except KeyboardInterrupt:\n",
+						"        print(\"Interrupted\")\n",
+						"    # any different error\n",
+						"    except RuntimeError as e:\n",
+						"        print(e)\n",
+						"    finally:\n",
+						"        if player is not None:\n",
+						"            # Stop capturing.\n",
+						"            player.stop()\n",
+						"        if use_popup:\n",
+						"            cv2.destroyAllWindows()"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "cc5b4ba6-f478-4417-b09d-93fee5adca41",
+					"source": [
+						"### Run Live Object Detection and Segmentation\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Use a webcam as the video input. By default, the primary webcam is set with `source=0`. If you have multiple webcams, each one will be assigned a consecutive number starting at 0. Set `flip=True` when using a front-facing camera. Some web browsers, especially Mozilla Firefox, may cause flickering. If you experience flickering, set `use_popup=True`.\n",
+						"\n",
+						">**NOTE**: To use this notebook with a webcam, you need to run the notebook on a computer with a webcam. If you run the notebook on a remote server (for example, in Binder or Google Colab service), the webcam will not work. By default, the lower cell will run model inference on a video file. If you want to try live inference on your webcam set `WEBCAM_INFERENCE = True`"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "90708017",
+					"source": [
+						"WEBCAM_INFERENCE = False\n",
+						"\n",
+						"if WEBCAM_INFERENCE:\n",
+						"    VIDEO_SOURCE = 0  # Webcam\n",
+						"else:\n",
+						"    VIDEO_SOURCE = \"https://storage.openvinotoolkit.org/repositories/openvino_notebooks/data/data/video/people.mp4\""
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "e8f1239c",
+					"source": [
+						"device"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "440f2d0e",
+					"source": [
+						"run_instance_segmentation(\n",
+						"    source=VIDEO_SOURCE,\n",
+						"    flip=True,\n",
+						"    use_popup=False,\n",
+						"    model=seg_ov_model,\n",
+						"    device=device.value,\n",
+						")"
+					]
+				}
+			]
+				.map(fromJupyterCell)
+			,
+			[
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "a2e7d62b-5779-4211-822c-457c77321f8b",
+					"metadata": {},
+					"source": [
+						"# Convert and Optimize YOLOv11 instance segmentation model with OpenVINO™\n",
+						"\n",
+						"Instance segmentation goes a step further than object detection and involves identifying individual objects in an image and segmenting them from the rest of the image. Instance segmentation as an object detection are often used as key components in computer vision systems. \n",
+						"Applications that use real-time instance segmentation models include video analytics, robotics, autonomous vehicles, multi-object tracking and object counting, medical image analysis, and many others.\n",
+						"\n",
+						"\n",
+						"This tutorial demonstrates step-by-step instructions on how to run and optimize PyTorch YOLOv11 with OpenVINO. We consider the steps required for instance segmentation scenario.  You can find more details about model on [model page](https://docs.ultralytics.com/models/yolo11/) in Ultralytics documentation.\n",
+						"\n",
+						"The tutorial consists of the following steps:\n",
+						"- Prepare the PyTorch model.\n",
+						"- Download and prepare a dataset.\n",
+						"- Validate the original model.\n",
+						"- Convert the PyTorch model to OpenVINO IR.\n",
+						"- Validate the converted model.\n",
+						"- Prepare and run optimization pipeline.\n",
+						"- Compare performance of the FP32 and quantized models.\n",
+						"- Compare accuracy of the FP32 and quantized models.\n",
+						"- Live demo\n",
+						"\n",
+						"\n",
+						"#### Table of contents:\n",
+						"\n",
+						"- [Get PyTorch model](#Get-PyTorch-model)\n",
+						"    - [Prerequisites](#Prerequisites)\n",
+						"- [Instantiate model](#Instantiate-model)\n",
+						"    - [Convert model to OpenVINO IR](#Convert-model-to-OpenVINO-IR)\n",
+						"    - [Verify model inference](#Verify-model-inference)\n",
+						"    - [Select inference device](#Select-inference-device)\n",
+						"    - [Test on single image](#Test-on-single-image)\n",
+						"- [Optimize model using NNCF Post-training Quantization API](#Optimize-model-using-NNCF-Post-training-Quantization-API)\n",
+						"    - [Validate Quantized model inference](#Validate-Quantized-model-inference)\n",
+						"- [Compare the Original and Quantized Models](#Compare-the-Original-and-Quantized-Models)\n",
+						"    - [Compare performance of the Original and Quantized Models](#Compare-performance-of-the-Original-and-Quantized-Models)\n",
+						"- [Other ways to optimize model](#Other-ways-to-optimize-model)\n",
+						"- [Live demo](#Live-demo)\n",
+						"    - [Run Live Object Detection and Segmentation](#Run-Live-Object-Detection-and-Segmentation)\n",
+						"\n",
+						"\n",
+						"### Installation Instructions\n",
+						"\n",
+						"This is a self-contained example that relies solely on its own code.\n",
+						"\n",
+						"We recommend  running the notebook in a virtual environment. You only need a Jupyter server to start.\n",
+						"For details, please refer to [Installation Guide](https://github.com/openvinotoolkit/openvino_notebooks/blob/latest/README.md#-installation-guide).\n",
+						"\n",
+						"<img referrerpolicy=\"no-referrer-when-downgrade\" src=\"https://static.scarf.sh/a.png?x-pxid=5b5a4db0-7875-4bfb-bdbd-01698b5b1a77&file=notebooks/yolov11-optimization/yolov11-instance-segmentation.ipynb\" />\n"
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "d7a12678-b12f-48d1-9735-398855733e46",
+					"metadata": {},
+					"source": [
+						"## Get PyTorch model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Generally, PyTorch models represent an instance of the [`torch.nn.Module`](https://pytorch.org/docs/stable/generated/torch.nn.Module.html) class, initialized by a state dictionary with model weights.\n",
+						"We will use the YOLOv11 nano model (also known as `yolo11n-seg`) pre-trained on a COCO dataset, which is available in this [repo](https://github.com/ultralytics/ultralytics). Similar steps are also applicable to other YOLOv11 models.\n",
+						"Typical steps to obtain a pre-trained model:\n",
+						"1. Create an instance of a model class.\n",
+						"2. Load a checkpoint state dict, which contains the pre-trained model weights.\n",
+						"3. Turn the model to evaluation for switching some operations to inference mode.\n",
+						"\n",
+						"In this case, the creators of the model provide an API that enables converting the YOLOv11 model to OpenVINO IR. Therefore, we do not need to do these steps manually."
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "e2267760-cbfe-41c6-958d-cad9f845d5bb",
+					"metadata": {},
+					"source": [
+						"#### Prerequisites\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Install necessary packages."
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "30d04872-6916-454c-9211-6c644b50dc04",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"%pip install -q \"openvino>=2024.0.0\" \"nncf>=2.9.0\"\n",
+						"%pip install -q \"torch>=2.1\" \"torchvision>=0.16\" \"ultralytics==8.3.0\" opencv-python tqdm --extra-index-url https://download.pytorch.org/whl/cpu"
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "1bbe319c",
+					"metadata": {},
+					"source": [
+						"Import required utility functions.\n",
+						"The lower cell will download the `notebook_utils` Python module from GitHub."
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "a2f6cd89",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"from pathlib import Path\n",
+						"import requests\n",
+						"\n",
+						"if not Path(\"notebook_utils.py\").exists():\n",
+						"    r = requests.get(\n",
+						"        url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/notebook_utils.py\",\n",
+						"    )\n",
+						"\n",
+						"    open(\"notebook_utils.py\", \"w\").write(r.text)\n",
+						"\n",
+						"\n",
+						"from notebook_utils import download_file, VideoPlayer, device_widget"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "373658bd-7e64-4479-914e-f2742d330afd",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"# Download a test sample\n",
+						"IMAGE_PATH = Path(\"./data/coco_bike.jpg\")\n",
+						"\n",
+						"if not IMAGE_PATH.exists():\n",
+						"    download_file(\n",
+						"        url=\"https://storage.openvinotoolkit.org/repositories/openvino_notebooks/data/data/image/coco_bike.jpg\",\n",
+						"        filename=IMAGE_PATH.name,\n",
+						"        directory=IMAGE_PATH.parent,\n",
+						"    )"
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "ee32fd08-650c-4751-bb41-d8afccb2495e",
+					"metadata": {},
+					"source": [
+						"## Instantiate model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"For loading the model, required to specify a path to the model checkpoint. It can be some local path or name available on models hub (in this case model checkpoint will be downloaded automatically). \n",
+						"You can select model using widget bellow:"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "7c3963a5-b50b-4ffe-b710-ccd1f4a65380",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"import ipywidgets as widgets\n",
+						"\n",
+						"model_id = [\n",
+						"    \"yolo11n-seg\",\n",
+						"    \"yolo11s-seg\",\n",
+						"    \"yolo11m-seg\",\n",
+						"    \"yolo11l-seg\",\n",
+						"    \"yolo11x-seg\",\n",
+						"    \"yolov8n-seg\",\n",
+						"    \"yolov8s-seg\",\n",
+						"    \"yolov8m-seg\",\n",
+						"    \"yolov8l-seg\",\n",
+						"    \"yolov8x-seg\",\n",
+						"]\n",
+						"\n",
+						"model_name = widgets.Dropdown(options=model_id, value=model_id[0], description=\"Model\")\n",
+						"\n",
+						"model_name"
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "60105d86-d7e0-47a9-ad88-4fff014ba3d8",
+					"metadata": {},
+					"source": [
+						"Making prediction, the model accepts a path to input image and returns list with Results class object. Results contains boxes for object detection model and boxes and masks for segmentation model. Also it contains utilities for processing results, for example, `plot()` method for drawing.\n",
+						"\n",
+						"Let us consider the examples:"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "d4994e1e-a3ee-4620-bc8b-237a55c47742",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"from PIL import Image\n",
+						"from ultralytics import YOLO\n",
+						"\n",
+						"SEG_MODEL_NAME = model_name.value\n",
+						"\n",
+						"seg_model = YOLO(f\"{SEG_MODEL_NAME}.pt\")\n",
+						"label_map = seg_model.model.names\n",
+						"\n",
+						"res = seg_model(IMAGE_PATH)\n",
+						"Image.fromarray(res[0].plot()[:, :, ::-1])"
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "e345ffcc-c4b8-44ba-8b03-f37e63a060da",
+					"metadata": {},
+					"source": [
+						"### Convert model to OpenVINO IR\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Ultralytics provides API for convenient model exporting to different formats including OpenVINO IR. `model.export` is responsible for model conversion. We need to specify the format, and additionally, we can preserve dynamic shapes in the model."
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "5c3ef363-f6a1-4fe5-b7ff-eb5a9c0789f1",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"# instance segmentation model\n",
+						"seg_model_path = Path(f\"{SEG_MODEL_NAME}_openvino_model/{SEG_MODEL_NAME}.xml\")\n",
+						"if not seg_model_path.exists():\n",
+						"    seg_model.export(format=\"openvino\", dynamic=True, half=True)"
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "713cd45f-2b19-4a1e-bc9d-5e69bd95d896",
+					"metadata": {},
+					"source": [
+						"### Verify model inference\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"We can reuse the base model pipeline for pre- and postprocessing just replacing the inference method where we will use the IR model for inference."
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "f9b9c472",
+					"metadata": {},
+					"source": [
+						"### Select inference device\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Select device from dropdown list for running inference using OpenVINO"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "4e0652b2",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"device = device_widget()\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "cd163eab-e803-4ae8-96da-22c3bf303630",
+					"metadata": {},
+					"source": [
+						"### Test on single image\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "34a65afa-4201-428b-af11-b35e0d206e93",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"import openvino as ov\n",
+						"\n",
+						"core = ov.Core()\n",
+						"seg_ov_model = core.read_model(seg_model_path)\n",
+						"\n",
+						"ov_config = {}\n",
+						"if device.value != \"CPU\":\n",
+						"    seg_ov_model.reshape({0: [1, 3, 640, 640]})\n",
+						"if \"GPU\" in device.value or (\"AUTO\" in device.value and \"GPU\" in core.available_devices):\n",
+						"    ov_config = {\"GPU_DISABLE_WINOGRAD_CONVOLUTION\": \"YES\"}\n",
+						"seg_compiled_model = core.compile_model(seg_ov_model, device.value, ov_config)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "389a4698-b7fc-4aa2-9833-9681f575d88b",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"seg_model = YOLO(seg_model_path.parent, task=\"segment\")\n",
+						"\n",
+						"if seg_model.predictor is None:\n",
+						"    custom = {\"conf\": 0.25, \"batch\": 1, \"save\": False, \"mode\": \"predict\"}  # method defaults\n",
+						"    args = {**seg_model.overrides, **custom}\n",
+						"    seg_model.predictor = seg_model._smart_load(\"predictor\")(overrides=args, _callbacks=seg_model.callbacks)\n",
+						"    seg_model.predictor.setup_model(model=seg_model.model)\n",
+						"\n",
+						"seg_model.predictor.model.ov_compiled_model = seg_compiled_model"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "12d2522f-e939-4512-b74a-3e20baf1edc8",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"res = seg_model(IMAGE_PATH)\n",
+						"Image.fromarray(res[0].plot()[:, :, ::-1])"
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "7e918cf6-cdce-4e90-a6d7-c435a3c08d93",
+					"metadata": {},
+					"source": [
+						"Great! The result is the same, as produced by original models."
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "13b69e12-2e22-44c1-bfed-fdc88f6c424d",
+					"metadata": {},
+					"source": [
+						"## Optimize model using NNCF Post-training Quantization API\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"[NNCF](https://github.com/openvinotoolkit/nncf) provides a suite of advanced algorithms for Neural Networks inference optimization in OpenVINO with minimal accuracy drop.\n",
+						"We will use 8-bit quantization in post-training mode (without the fine-tuning pipeline) to optimize YOLOv11.\n",
+						"\n",
+						"The optimization process contains the following steps:\n",
+						"\n",
+						"1. Create a Dataset for quantization.\n",
+						"2. Run `nncf.quantize` for getting an optimized model.\n",
+						"3. Serialize OpenVINO IR model, using the `openvino.runtime.serialize` function."
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "7d7eeae8-f3f4-4e95-b1a6-a23085f03ebc",
+					"metadata": {},
+					"source": [
+						"Please select below whether you would like to run quantization to improve model inference speed."
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "4690b9fc-c49f-4882-b8a5-c82f842a9126",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"import ipywidgets as widgets\n",
+						"\n",
+						"int8_model_seg_path = Path(f\"{SEG_MODEL_NAME}_openvino_int8_model/{SEG_MODEL_NAME}.xml\")\n",
+						"quantized_seg_model = None\n",
+						"\n",
+						"to_quantize = widgets.Checkbox(\n",
+						"    value=True,\n",
+						"    description=\"Quantization\",\n",
+						"    disabled=False,\n",
+						")\n",
+						"\n",
+						"to_quantize"
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "73cfdbd4-3b65-49e0-b8ab-ceb1d0362481",
+					"metadata": {},
+					"source": [
+						"Let's load `skip magic` extension to skip quantization if `to_quantize` is not selected"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "bc6121aa-3a07-4066-a123-fe0ed0e72478",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"# Fetch skip_kernel_extension module\n",
+						"import requests\n",
+						"\n",
+						"\n",
+						"if not Path(\"skip_kernel_extension.py\").exists():\n",
+						"    r = requests.get(\n",
+						"        url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/skip_kernel_extension.py\",\n",
+						"    )\n",
+						"    open(\"skip_kernel_extension.py\", \"w\").write(r.text)\n",
+						"\n",
+						"%load_ext skip_kernel_extension"
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "94fb2515-3645-4798-bc7c-082129ac86c0",
+					"metadata": {},
+					"source": [
+						"Reuse validation dataloader in accuracy testing for quantization. \n",
+						"For that, it should be wrapped into the `nncf.Dataset` object and define a transformation function for getting only input tensors."
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "fd994958-6988-4a1d-ac7f-3efbd97135cc",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"# %%skip not $to_quantize.value\n",
+						"\n",
+						"\n",
+						"import nncf\n",
+						"from typing import Dict\n",
+						"\n",
+						"from zipfile import ZipFile\n",
+						"\n",
+						"from ultralytics.data.utils import DATASETS_DIR\n",
+						"from ultralytics.utils import DEFAULT_CFG\n",
+						"from ultralytics.cfg import get_cfg\n",
+						"from ultralytics.data.converter import coco80_to_coco91_class\n",
+						"from ultralytics.data.utils import check_det_dataset\n",
+						"from ultralytics.utils import ops\n",
+						"\n",
+						"\n",
+						"if not int8_model_seg_path.exists():\n",
+						"    DATA_URL = \"http://images.cocodataset.org/zips/val2017.zip\"\n",
+						"    LABELS_URL = \"https://github.com/ultralytics/yolov5/releases/download/v1.0/coco2017labels-segments.zip\"\n",
+						"    CFG_URL = \"https://raw.githubusercontent.com/ultralytics/ultralytics/v8.1.0/ultralytics/cfg/datasets/coco.yaml\"\n",
+						"\n",
+						"    OUT_DIR = DATASETS_DIR\n",
+						"\n",
+						"    DATA_PATH = OUT_DIR / \"val2017.zip\"\n",
+						"    LABELS_PATH = OUT_DIR / \"coco2017labels-segments.zip\"\n",
+						"    CFG_PATH = OUT_DIR / \"coco.yaml\"\n",
+						"\n",
+						"    download_file(DATA_URL, DATA_PATH.name, DATA_PATH.parent)\n",
+						"    download_file(LABELS_URL, LABELS_PATH.name, LABELS_PATH.parent)\n",
+						"    download_file(CFG_URL, CFG_PATH.name, CFG_PATH.parent)\n",
+						"\n",
+						"    if not (OUT_DIR / \"coco/labels\").exists():\n",
+						"        with ZipFile(LABELS_PATH, \"r\") as zip_ref:\n",
+						"            zip_ref.extractall(OUT_DIR)\n",
+						"        with ZipFile(DATA_PATH, \"r\") as zip_ref:\n",
+						"            zip_ref.extractall(OUT_DIR / \"coco/images\")\n",
+						"\n",
+						"    args = get_cfg(cfg=DEFAULT_CFG)\n",
+						"    args.data = str(CFG_PATH)\n",
+						"    seg_validator = seg_model.task_map[seg_model.task][\"validator\"](args=args)\n",
+						"    seg_validator.data = check_det_dataset(args.data)\n",
+						"    seg_validator.stride = 32\n",
+						"    seg_data_loader = seg_validator.get_dataloader(OUT_DIR / \"coco/\", 1)\n",
+						"\n",
+						"    seg_validator.is_coco = True\n",
+						"    seg_validator.class_map = coco80_to_coco91_class()\n",
+						"    seg_validator.names = label_map\n",
+						"    seg_validator.metrics.names = seg_validator.names\n",
+						"    seg_validator.nc = 80\n",
+						"    seg_validator.nm = 32\n",
+						"    seg_validator.process = ops.process_mask\n",
+						"    seg_validator.plot_masks = []\n",
+						"\n",
+						"    def transform_fn(data_item: Dict):\n",
+						"        \"\"\"\n",
+						"        Quantization transform function. Extracts and preprocess input data from dataloader item for quantization.\n",
+						"        Parameters:\n",
+						"           data_item: Dict with data item produced by DataLoader during iteration\n",
+						"        Returns:\n",
+						"            input_tensor: Input data for quantization\n",
+						"        \"\"\"\n",
+						"        input_tensor = seg_validator.preprocess(data_item)[\"img\"].numpy()\n",
+						"        return input_tensor\n",
+						"\n",
+						"    quantization_dataset = nncf.Dataset(seg_data_loader, transform_fn)"
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "91629284-e261-494d-9464-146ed7190084",
+					"metadata": {},
+					"source": [
+						"The `nncf.quantize` function provides an interface for model quantization. It requires an instance of the OpenVINO Model and quantization dataset. \n",
+						"Optionally, some additional parameters for the configuration quantization process (number of samples for quantization, preset, ignored scope, etc.) can be provided. Ultralytics models contain non-ReLU activation functions, which require asymmetric quantization of activations. To achieve a better result, we will use a `mixed` quantization preset. It provides symmetric quantization of weights and asymmetric quantization of activations. For more accurate results, we should keep the operation in the postprocessing subgraph in floating point precision, using the `ignored_scope` parameter.\n",
+						"\n",
+						">**Note**: Model post-training quantization is time-consuming process. Be patient, it can take several minutes depending on your hardware."
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "b2e8cec4-d0b3-4da0-b54c-7964e7bcbfe2",
+					"metadata": {
+						"test_replace": {
+							"ignored_scope=ignored_scope\n": "ignored_scope=ignored_scope, subset_size=10\n"
+						}
+					},
+					"outputs": [],
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"if not int8_model_seg_path.exists():\n",
+						"    ignored_scope = nncf.IgnoredScope(  # post-processing\n",
+						"        subgraphs=[\n",
+						"            nncf.Subgraph(inputs=[f\"__module.model.{22 if 'v8' in SEG_MODEL_NAME else 23}/aten::cat/Concat\",\n",
+						"                                  f\"__module.model.{22 if 'v8' in SEG_MODEL_NAME else 23}/aten::cat/Concat_1\",\n",
+						"                                  f\"__module.model.{22 if 'v8' in SEG_MODEL_NAME else 23}/aten::cat/Concat_2\",\n",
+						"                                 f\"__module.model.{22 if 'v8' in SEG_MODEL_NAME else 23}/aten::cat/Concat_7\"],\n",
+						"                          outputs=[f\"__module.model.{22 if 'v8' in SEG_MODEL_NAME else 23}/aten::cat/Concat_8\"])\n",
+						"        ]\n",
+						"    )\n",
+						"\n",
+						"    # Segmentation model\n",
+						"    quantized_seg_model = nncf.quantize(\n",
+						"        seg_ov_model,\n",
+						"        quantization_dataset,\n",
+						"        preset=nncf.QuantizationPreset.MIXED,\n",
+						"        ignored_scope=ignored_scope\n",
+						"    )\n",
+						"\n",
+						"    print(f\"Quantized segmentation model will be saved to {int8_model_seg_path}\")\n",
+						"    ov.save_model(quantized_seg_model, str(int8_model_seg_path))"
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "c8c92a68-3eb8-4ea5-9e35-d496f45b3cc3",
+					"metadata": {},
+					"source": [
+						"### Validate Quantized model inference\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"`nncf.quantize` returns the OpenVINO Model class instance, which is suitable for loading on a device for making predictions. `INT8` model input data and output result formats have no difference from the floating point model representation. Therefore, we can reuse the same `detect` function defined above for getting the `INT8` model result on the image."
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "4003a3ae",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "711200ec-2f26-47cc-b62d-3802961d5711",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"if quantized_seg_model is None:\n",
+						"    quantized_seg_model = core.read_model(int8_model_seg_path)\n",
+						"\n",
+						"ov_config = {}\n",
+						"if device.value != \"CPU\":\n",
+						"    quantized_seg_model.reshape({0: [1, 3, 640, 640]})\n",
+						"if \"GPU\" in device.value or (\"AUTO\" in device.value and \"GPU\" in core.available_devices):\n",
+						"    ov_config = {\"GPU_DISABLE_WINOGRAD_CONVOLUTION\": \"YES\"}\n",
+						"\n",
+						"quantized_seg_compiled_model = core.compile_model(quantized_seg_model, device.value, ov_config)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "b2e3ea3b-5935-4474-9f08-f51fc688b9c0",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"\n",
+						"if seg_model.predictor is None:\n",
+						"    custom = {\"conf\": 0.25, \"batch\": 1, \"save\": False, \"mode\": \"predict\"}  # method defaults\n",
+						"    args = {**seg_model.overrides, **custom}\n",
+						"    seg_model.predictor = seg_model._smart_load(\"predictor\")(overrides=args, _callbacks=seg_model.callbacks)\n",
+						"    seg_model.predictor.setup_model(model=seg_model.model)\n",
+						"\n",
+						"seg_model.predictor.model.ov_compiled_model = quantized_seg_compiled_model"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "bef2ed5d-5762-41a6-af2e-ee4f9fd56557",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"res = seg_model(IMAGE_PATH)\n",
+						"display(Image.fromarray(res[0].plot()[:, :, ::-1]))"
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "b289f057",
+					"metadata": {},
+					"source": [
+						"## Compare the Original and Quantized Models\n",
+						"[back to top ⬆️](#Table-of-contents:)\n"
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "59081cae-9c92-46f0-8117-ed8c6fa6ff19",
+					"metadata": {},
+					"source": [
+						"### Compare performance of the Original and Quantized Models\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"Finally, use the OpenVINO [Benchmark Tool](https://docs.openvino.ai/2024/learn-openvino/openvino-samples/benchmark-tool.html) to measure the inference performance of the `FP32` and `INT8` models.\n",
+						"\n",
+						"> **Note**: For more accurate performance, it is recommended to run `benchmark_app` in a terminal/command prompt after closing other applications. Run `benchmark_app -m <model_path> -d CPU -shape \"<input_shape>\"` to benchmark async inference on CPU on specific input data shape for one minute. Change `CPU` to `GPU` to benchmark on GPU. Run `benchmark_app --help` to see an overview of all command-line options."
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "b8677df4",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "546828d2",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"if int8_model_seg_path.exists():\n",
+						"    !benchmark_app -m $seg_model_path -d $device.value -api async -shape \"[1,3,640,640]\" -t 15"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "1d43554b",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"if int8_model_seg_path.exists():\n",
+						"    !benchmark_app -m $int8_model_seg_path -d $device.value -api async -shape \"[1,3,640,640]\" -t 15"
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "184bcebd-588d-4b4d-a60a-0fa753a07ef9",
+					"metadata": {},
+					"source": [
+						"## Other ways to optimize model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"The performance could be also improved by another OpenVINO method such as async inference pipeline or preprocessing API.\n",
+						"\n",
+						"Async Inference pipeline help to utilize the device more optimal. The key advantage of the Async API is that when a device is busy with inference, the application can perform other tasks in parallel (for example, populating inputs or scheduling other requests) rather than wait for the current inference to complete first. To understand how to perform async inference using openvino, refer to [Async API tutorial](../async-api/async-api.ipynb)\n",
+						"\n",
+						"Preprocessing API enables making preprocessing a part of the model reducing application code and dependency on additional image processing libraries. \n",
+						"The main advantage of Preprocessing API is that preprocessing steps will be integrated into the execution graph and will be performed on a selected device (CPU/GPU etc.) rather than always being executed on CPU as part of an application. This will also improve selected device utilization. For more information, refer to the overview of [Preprocessing API tutorial](../optimize-preprocessing/optimize-preprocessing.ipynb). To see, how it could be used with YOLOV8 object detection model, please, see [Convert and Optimize YOLOv8 real-time object detection with OpenVINO tutorial](./yolov8-object-detection.ipynb)"
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "2e3b4862-c182-4ce4-a473-9f38d98deab8",
+					"metadata": {
+						"tags": []
+					},
+					"source": [
+						"## Live demo\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"The following code runs model inference on a video:"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "4c7bb92e-e301-45a9-b5ff-f7953fad298f",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"import collections\n",
+						"import time\n",
+						"import cv2\n",
+						"from IPython import display\n",
+						"import numpy as np\n",
+						"\n",
+						"\n",
+						"def run_instance_segmentation(\n",
+						"    source=0,\n",
+						"    flip=False,\n",
+						"    use_popup=False,\n",
+						"    skip_first_frames=0,\n",
+						"    model=seg_model,\n",
+						"    device=device.value,\n",
+						"    video_width=1280,\n",
+						"):\n",
+						"    player = None\n",
+						"\n",
+						"    ov_config = {}\n",
+						"    if device != \"CPU\":\n",
+						"        model.reshape({0: [1, 3, 640, 640]})\n",
+						"    if \"GPU\" in device or (\"AUTO\" in device and \"GPU\" in core.available_devices):\n",
+						"        ov_config = {\"GPU_DISABLE_WINOGRAD_CONVOLUTION\": \"YES\"}\n",
+						"    compiled_model = core.compile_model(model, device, ov_config)\n",
+						"\n",
+						"    if seg_model.predictor is None:\n",
+						"        custom = {\"conf\": 0.25, \"batch\": 1, \"save\": False, \"mode\": \"predict\"}  # method defaults\n",
+						"        args = {**seg_model.overrides, **custom}\n",
+						"        seg_model.predictor = seg_model._smart_load(\"predictor\")(overrides=args, _callbacks=seg_model.callbacks)\n",
+						"        seg_model.predictor.setup_model(model=seg_model.model)\n",
+						"\n",
+						"    seg_model.predictor.model.ov_compiled_model = compiled_model\n",
+						"\n",
+						"    try:\n",
+						"        # Create a video player to play with target fps.\n",
+						"        player = VideoPlayer(source=source, flip=flip, fps=30, skip_first_frames=skip_first_frames, width=video_width)\n",
+						"        # Start capturing.\n",
+						"        player.start()\n",
+						"        if use_popup:\n",
+						"            title = \"Press ESC to Exit\"\n",
+						"            cv2.namedWindow(winname=title, flags=cv2.WINDOW_GUI_NORMAL | cv2.WINDOW_AUTOSIZE)\n",
+						"\n",
+						"        processing_times = collections.deque()\n",
+						"        while True:\n",
+						"            # Grab the frame.\n",
+						"            frame = player.next()\n",
+						"            if frame is None:\n",
+						"                print(\"Source ended\")\n",
+						"                break\n",
+						"            # If the frame is larger than video_width, reduce size to improve the performance.\n",
+						"            # If more, increase size for better demo expirience.\n",
+						"            scale = video_width / max(frame.shape)\n",
+						"            frame = cv2.resize(\n",
+						"                src=frame,\n",
+						"                dsize=None,\n",
+						"                fx=scale,\n",
+						"                fy=scale,\n",
+						"                interpolation=cv2.INTER_AREA,\n",
+						"            )\n",
+						"            # Get the results.\n",
+						"            input_image = np.array(frame)\n",
+						"\n",
+						"            start_time = time.time()\n",
+						"            detections = seg_model(input_image)\n",
+						"            stop_time = time.time()\n",
+						"            frame = detections[0].plot()\n",
+						"\n",
+						"            processing_times.append(stop_time - start_time)\n",
+						"            # Use processing times from last 200 frames.\n",
+						"            if len(processing_times) > 200:\n",
+						"                processing_times.popleft()\n",
+						"\n",
+						"            _, f_width = frame.shape[:2]\n",
+						"            # Mean processing time [ms].\n",
+						"            processing_time = np.mean(processing_times) * 1000\n",
+						"            fps = 1000 / processing_time\n",
+						"            cv2.putText(\n",
+						"                img=frame,\n",
+						"                text=f\"Inference time: {processing_time:.1f}ms ({fps:.1f} FPS)\",\n",
+						"                org=(20, 40),\n",
+						"                fontFace=cv2.FONT_HERSHEY_COMPLEX,\n",
+						"                fontScale=f_width / 1000,\n",
+						"                color=(0, 0, 255),\n",
+						"                thickness=1,\n",
+						"                lineType=cv2.LINE_AA,\n",
+						"            )\n",
+						"            # Use this workaround if there is flickering.\n",
+						"            if use_popup:\n",
+						"                cv2.imshow(winname=title, mat=frame)\n",
+						"                key = cv2.waitKey(1)\n",
+						"                # escape = 27\n",
+						"                if key == 27:\n",
+						"                    break\n",
+						"            else:\n",
+						"                # Encode numpy array to jpg.\n",
+						"                _, encoded_img = cv2.imencode(ext=\".jpg\", img=frame, params=[cv2.IMWRITE_JPEG_QUALITY, 100])\n",
+						"                # Create an IPython image.\n",
+						"                i = display.Image(data=encoded_img)\n",
+						"                # Display the image in this notebook.\n",
+						"                display.clear_output(wait=True)\n",
+						"                display.display(i)\n",
+						"    # ctrl-c\n",
+						"    except KeyboardInterrupt:\n",
+						"        print(\"Interrupted\")\n",
+						"    # any different error\n",
+						"    except RuntimeError as e:\n",
+						"        print(e)\n",
+						"    finally:\n",
+						"        if player is not None:\n",
+						"            # Stop capturing.\n",
+						"            player.stop()\n",
+						"        if use_popup:\n",
+						"            cv2.destroyAllWindows()"
+					]
+				},
+				{
+					"attachments": {},
+					"cell_type": "markdown",
+					"id": "cc5b4ba6-f478-4417-b09d-93fee5adca41",
+					"metadata": {},
+					"source": [
+						"### Run Live Object Detection and Segmentation\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"Use a webcam as the video input. By default, the primary webcam is set with `source=0`. If you have multiple webcams, each one will be assigned a consecutive number starting at 0. Set `flip=True` when using a front-facing camera. Some web browsers, especially Mozilla Firefox, may cause flickering. If you experience flickering, set `use_popup=True`.\n",
+						"\n",
+						">**NOTE**: To use this notebook with a webcam, you need to run the notebook on a computer with a webcam. If you run the notebook on a remote server (for example, in Binder or Google Colab service), the webcam will not work. By default, the lower cell will run model inference on a video file. If you want to try live inference on your webcam set `WEBCAM_INFERENCE = True`"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "90708017",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"WEBCAM_INFERENCE = False\n",
+						"\n",
+						"if WEBCAM_INFERENCE:\n",
+						"    VIDEO_SOURCE = 0  # Webcam\n",
+						"else:\n",
+						"    if not Path(\"people.mp4\").exists():\n",
+						"        download_file(\n",
+						"            \"https://storage.openvinotoolkit.org/repositories/openvino_notebooks/data/data/video/people.mp4\",\n",
+						"            \"people.mp4\",\n",
+						"        )\n",
+						"    VIDEO_SOURCE = \"people.mp4\""
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "e8f1239c",
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"device"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"id": "440f2d0e",
+					"metadata": {
+						"tags": []
+					},
+					"outputs": [],
+					"source": [
+						"run_instance_segmentation(\n",
+						"    source=VIDEO_SOURCE,\n",
+						"    flip=True,\n",
+						"    use_popup=False,\n",
+						"    model=seg_ov_model,\n",
+						"    device=device.value,\n",
+						"    video_width=1280,\n",
+						")"
+					]
+				}
+			].map(fromJupyterCell)
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: 4 },
+			{ modified: 5, original: 5 },
+			{ modified: 6, original: 6 },
+			{ modified: 7, original: 7 },
+			{ modified: 8, original: 8 },
+			{ modified: 9, original: 9 },
+			{ modified: 10, original: 10 },
+			{ modified: 11, original: 11 },
+			{ modified: 12, original: 12 },
+			{ modified: 13, original: 13 },
+			{ modified: 14, original: 14 },
+			{ modified: 15, original: 15 },
+			{ modified: 16, original: 16 },
+			{ modified: 17, original: 17 },
+			{ modified: 18, original: 18 },
+			{ modified: 19, original: 19 },
+			{ modified: 20, original: 20 },
+			{ modified: 21, original: 21 },
+			{ modified: 22, original: 22 },
+			{ modified: 23, original: 23 },
+			{ modified: 24, original: 24 },
+			{ modified: 25, original: 25 },
+			{ modified: 26, original: 26 },
+			{ modified: 27, original: 27 },
+			{ modified: 28, original: 28 },
+			{ modified: 29, original: 29 },
+			{ modified: 30, original: 30 },
+			{ modified: 31, original: 31 },
+			{ modified: 32, original: 32 },
+			{ modified: 33, original: 33 },
+			{ modified: 34, original: 34 },
+			{ modified: 35, original: 35 },
+			{ modified: 36, original: 36 },
+			{ modified: 37, original: 37 },
+			{ modified: 38, original: 38 },
+			{ modified: 39, original: 39 },
+			{ modified: 40, original: 40 },
+			{ modified: 41, original: 41 },
+			{ modified: 42, original: 42 },
+			{ modified: 43, original: 43 },
+			{ modified: 44, original: 44 },
+			{ modified: 45, original: 45 },
+			{ modified: 46, original: 46 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 5, originalLength: 1, modifiedStart: 5, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 6, originalLength: 1, modifiedStart: 6, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 25, originalLength: 1, modifiedStart: 25, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 42, originalLength: 1, modifiedStart: 42, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 44, originalLength: 1, modifiedStart: 44, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 46, originalLength: 1, modifiedStart: 46, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+
+	});
+	test('Modification of a large cell and insert a new cell', async () => {
+		const { mapping, diff } = await mapCells(
+			[
+				{
+					"cell_type": "markdown",
+					"id": "e9d010ff-85ba-4e69-b439-ba89e4a3a715",
+					"source": [
+						"# Convert and Optimize YOLOv10 with OpenVINO\n",
+						"\n",
+						"Real-time object detection aims to accurately predict object categories and positions in images with low latency. The YOLO series has been at the forefront of this research due to its balance between performance and efficiency. However, reliance on NMS and architectural inefficiencies have hindered optimal performance. YOLOv10 addresses these issues by introducing consistent dual assignments for NMS-free training and a holistic efficiency-accuracy driven model design strategy.\n",
+						"\n",
+						"YOLOv10, built on the [Ultralytics Python package](https://pypi.org/project/ultralytics/) by researchers at [Tsinghua University](https://www.tsinghua.edu.cn/en/), introduces a new approach to real-time object detection, addressing both the post-processing and model architecture deficiencies found in previous YOLO versions. By eliminating non-maximum suppression (NMS) and optimizing various model components, YOLOv10 achieves state-of-the-art performance with significantly reduced computational overhead. Extensive experiments demonstrate its superior accuracy-latency trade-offs across multiple model scales.\n",
+						"\n",
+						"![yolov10-approach.png](https://github.com/ultralytics/ultralytics/assets/26833433/f9b1bec0-928e-41ce-a205-e12db3c4929a)\n",
+						"\n",
+						"More details about model architecture you can find in original [repo](https://github.com/THU-MIG/yolov10), [paper](https://arxiv.org/abs/2405.14458) and [Ultralytics documentation](https://docs.ultralytics.com/models/yolov10/).\n",
+						"\n",
+						"This tutorial demonstrates step-by-step instructions on how to run and optimize PyTorch YOLO V10 with OpenVINO.\n",
+						"\n",
+						"The tutorial consists of the following steps:\n",
+						"\n",
+						"- Prepare PyTorch model\n",
+						"- Convert PyTorch model to OpenVINO IR\n",
+						"- Run model inference with OpenVINO\n",
+						"- Prepare and run optimization pipeline using NNCF\n",
+						"- Compare performance of the FP16 and quantized models.\n",
+						"- Run optimized model inference on video\n",
+						"- Launch interactive Gradio demo\n",
+						"\n",
+						"#### Table of contents:\n",
+						"\n",
+						"- [Prerequisites](#Prerequisites)\n",
+						"- [Download PyTorch model](#Download-PyTorch-model)\n",
+						"- [Export PyTorch model to OpenVINO IR Format](#Export-PyTorch-model-to-OpenVINO-IR-Format)\n",
+						"- [Run OpenVINO Inference on AUTO device using Ultralytics API](#Run-OpenVINO-Inference-on-AUTO-device-using-Ultralytics-API)\n",
+						"- [Run OpenVINO Inference on selected device using Ultralytics API](#Run-OpenVINO-Inference-on-selected-device-using-Ultralytics-API)\n",
+						"- [Optimize model using NNCF Post-training Quantization API](#Optimize-model-using-NNCF-Post-training-Quantization-API)\n",
+						"    - [Prepare Quantization Dataset](#Prepare-Quantization-Dataset)\n",
+						"    - [Quantize and Save INT8 model](#Quantize-and-Save-INT8-model)\n",
+						"- [Run Optimized Model Inference](#Run-Optimized-Model-Inference)\n",
+						"    - [Run Optimized Model on AUTO device](#Run-Optimized-Model-on-AUTO-device)\n",
+						"    - [Run Optimized Model Inference on selected device](#Run-Optimized-Model-Inference-on-selected-device)\n",
+						"- [Compare the Original and Quantized Models](#Compare-the-Original-and-Quantized-Models)\n",
+						"    - [Model size](#Model-size)\n",
+						"    - [Performance](#Performance)\n",
+						"    - [FP16 model performance](#FP16-model-performance)\n",
+						"    - [Int8 model performance](#Int8-model-performance)\n",
+						"- [Live demo](#Live-demo)\n",
+						"    - [Gradio Interactive Demo](#Gradio-Interactive-Demo)\n",
+						"\n",
+						"\n",
+						"### Installation Instructions\n",
+						"\n",
+						"This is a self-contained example that relies solely on its own code.\n",
+						"\n",
+						"We recommend  running the notebook in a virtual environment. You only need a Jupyter server to start.\n",
+						"For details, please refer to [Installation Guide](https://github.com/openvinotoolkit/openvino_notebooks/blob/latest/README.md#-installation-guide).\n",
+						"\n",
+						"<img referrerpolicy=\"no-referrer-when-downgrade\" src=\"https://static.scarf.sh/a.png?x-pxid=5b5a4db0-7875-4bfb-bdbd-01698b5b1a77&file=notebooks/yolov10-optimization/yolov10-optimization.ipynb\" />\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "144e86a1-c220-4e3b-a8b2-8eda443faf2d",
+					"source": [
+						"## Prerequisites\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "bf76580b-860a-4dcd-8b01-f494cdffe37e",
+					"source": [
+						"import os\n",
+						"\n",
+						"os.environ[\"GIT_CLONE_PROTECTION_ACTIVE\"] = \"false\"\n",
+						"\n",
+						"%pip install -q \"nncf>=2.11.0\"\n",
+						"%pip install -Uq \"openvino>=2024.3.0\"\n",
+						"%pip install -q \"git+https://github.com/THU-MIG/yolov10.git\" --extra-index-url https://download.pytorch.org/whl/cpu\n",
+						"%pip install -q \"torch>=2.1\" \"torchvision>=0.16\" tqdm opencv-python \"gradio>=4.19\" --extra-index-url https://download.pytorch.org/whl/cpu"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "75772eac-565b-4234-82bf-f305e0c1ceda",
+					"source": [
+						"from pathlib import Path\n",
+						"\n",
+						"# Fetch `notebook_utils` module\n",
+						"import requests\n",
+						"\n",
+						"r = requests.get(\n",
+						"    url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/notebook_utils.py\",\n",
+						")\n",
+						"\n",
+						"open(\"notebook_utils.py\", \"w\").write(r.text)\n",
+						"\n",
+						"from notebook_utils import download_file, VideoPlayer, device_widget"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "2888d8b4-44f6-4418-bae4-f433ff28010b",
+					"source": [
+						"## Download PyTorch model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"There are several version of [YOLO V10](https://github.com/THU-MIG/yolov10/tree/main?tab=readme-ov-file#performance) models provided by model authors. Each of them has different characteristics depends on number of training parameters, performance and accuracy. For demonstration purposes we will use `yolov10n`, but the same steps are also applicable to other models in YOLO V10 series."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "aea6315b-6a29-4f2a-96a9-eb3c1646a3a4",
+					"source": [
+						"models_dir = Path(\"./models\")\n",
+						"models_dir.mkdir(exist_ok=True)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "d828401e-b6bd-4796-a7b8-681957a159d4",
+					"source": [
+						"model_weights_url = \"https://github.com/jameslahm/yolov10/releases/download/v1.0/yolov10n.pt\"\n",
+						"file_name = model_weights_url.split(\"/\")[-1]\n",
+						"model_name = file_name.replace(\".pt\", \"\")\n",
+						"\n",
+						"download_file(model_weights_url, directory=models_dir)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "dc21487d-dd79-4b56-b8e2-5b28c8d92ac8",
+					"source": [
+						"## Export PyTorch model to OpenVINO IR Format\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "8cfec0d6-fb55-4611-861b-326e892fcf09",
+					"source": [
+						"As it was discussed before, YOLO V10 code is designed on top of [Ultralytics](https://docs.ultralytics.com/) library and has similar interface with YOLO V8 (You can check [YOLO V8 notebooks](https://github.com/openvinotoolkit/openvino_notebooks/tree/latest/notebooks/yolov8-optimization) for more detailed instruction how to work with Ultralytics API). Ultralytics support OpenVINO model export using [export](https://docs.ultralytics.com/modes/export/) method of model class. Additionally, we can specify parameters responsible for target input size, static or dynamic input shapes and model precision (FP32/FP16/INT8). INT8 quantization can be additionally performed on export stage, but for making approach more flexible, we consider how to perform quantization using [NNCF](https://github.com/openvinotoolkit/nncf)."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "d488f564-c1d5-4c6a-9b4a-353a3ab749e6",
+					"source": [
+						"import types\n",
+						"from ultralytics.utils import ops, yaml_load, yaml_save\n",
+						"from ultralytics import YOLOv10\n",
+						"import torch\n",
+						"\n",
+						"detection_labels = {\n",
+						"    0: \"person\",\n",
+						"    1: \"bicycle\",\n",
+						"    2: \"car\",\n",
+						"    3: \"motorcycle\",\n",
+						"    4: \"airplane\",\n",
+						"    5: \"bus\",\n",
+						"    6: \"train\",\n",
+						"    7: \"truck\",\n",
+						"    8: \"boat\",\n",
+						"    9: \"traffic light\",\n",
+						"    10: \"fire hydrant\",\n",
+						"    11: \"stop sign\",\n",
+						"    12: \"parking meter\",\n",
+						"    13: \"bench\",\n",
+						"    14: \"bird\",\n",
+						"    15: \"cat\",\n",
+						"    16: \"dog\",\n",
+						"    17: \"horse\",\n",
+						"    18: \"sheep\",\n",
+						"    19: \"cow\",\n",
+						"    20: \"elephant\",\n",
+						"    21: \"bear\",\n",
+						"    22: \"zebra\",\n",
+						"    23: \"giraffe\",\n",
+						"    24: \"backpack\",\n",
+						"    25: \"umbrella\",\n",
+						"    26: \"handbag\",\n",
+						"    27: \"tie\",\n",
+						"    28: \"suitcase\",\n",
+						"    29: \"frisbee\",\n",
+						"    30: \"skis\",\n",
+						"    31: \"snowboard\",\n",
+						"    32: \"sports ball\",\n",
+						"    33: \"kite\",\n",
+						"    34: \"baseball bat\",\n",
+						"    35: \"baseball glove\",\n",
+						"    36: \"skateboard\",\n",
+						"    37: \"surfboard\",\n",
+						"    38: \"tennis racket\",\n",
+						"    39: \"bottle\",\n",
+						"    40: \"wine glass\",\n",
+						"    41: \"cup\",\n",
+						"    42: \"fork\",\n",
+						"    43: \"knife\",\n",
+						"    44: \"spoon\",\n",
+						"    45: \"bowl\",\n",
+						"    46: \"banana\",\n",
+						"    47: \"apple\",\n",
+						"    48: \"sandwich\",\n",
+						"    49: \"orange\",\n",
+						"    50: \"broccoli\",\n",
+						"    51: \"carrot\",\n",
+						"    52: \"hot dog\",\n",
+						"    53: \"pizza\",\n",
+						"    54: \"donut\",\n",
+						"    55: \"cake\",\n",
+						"    56: \"chair\",\n",
+						"    57: \"couch\",\n",
+						"    58: \"potted plant\",\n",
+						"    59: \"bed\",\n",
+						"    60: \"dining table\",\n",
+						"    61: \"toilet\",\n",
+						"    62: \"tv\",\n",
+						"    63: \"laptop\",\n",
+						"    64: \"mouse\",\n",
+						"    65: \"remote\",\n",
+						"    66: \"keyboard\",\n",
+						"    67: \"cell phone\",\n",
+						"    68: \"microwave\",\n",
+						"    69: \"oven\",\n",
+						"    70: \"toaster\",\n",
+						"    71: \"sink\",\n",
+						"    72: \"refrigerator\",\n",
+						"    73: \"book\",\n",
+						"    74: \"clock\",\n",
+						"    75: \"vase\",\n",
+						"    76: \"scissors\",\n",
+						"    77: \"teddy bear\",\n",
+						"    78: \"hair drier\",\n",
+						"    79: \"toothbrush\",\n",
+						"}\n",
+						"\n",
+						"\n",
+						"def v10_det_head_forward(self, x):\n",
+						"    one2one = self.forward_feat([xi.detach() for xi in x], self.one2one_cv2, self.one2one_cv3)\n",
+						"    if not self.export:\n",
+						"        one2many = super().forward(x)\n",
+						"\n",
+						"    if not self.training:\n",
+						"        one2one = self.inference(one2one)\n",
+						"        if not self.export:\n",
+						"            return {\"one2many\": one2many, \"one2one\": one2one}\n",
+						"        else:\n",
+						"            assert self.max_det != -1\n",
+						"            boxes, scores, labels = ops.v10postprocess(one2one.permute(0, 2, 1), self.max_det, self.nc)\n",
+						"            return torch.cat(\n",
+						"                [boxes, scores.unsqueeze(-1), labels.unsqueeze(-1).to(boxes.dtype)],\n",
+						"                dim=-1,\n",
+						"            )\n",
+						"    else:\n",
+						"        return {\"one2many\": one2many, \"one2one\": one2one}\n",
+						"\n",
+						"\n",
+						"ov_model_path = models_dir / f\"{model_name}_openvino_model/{model_name}.xml\"\n",
+						"if not ov_model_path.exists():\n",
+						"    model = YOLOv10(models_dir / file_name)\n",
+						"    model.model.model[-1].forward = types.MethodType(v10_det_head_forward, model.model.model[-1])\n",
+						"    model.export(format=\"openvino\", dynamic=True, half=True)\n",
+						"    config = yaml_load(ov_model_path.parent / \"metadata.yaml\")\n",
+						"    config[\"names\"] = detection_labels\n",
+						"    yaml_save(ov_model_path.parent / \"metadata.yaml\", config)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "8a23f621-f6cd-4bfd-8b98-24b8c0392761",
+					"source": [
+						"## Run OpenVINO Inference on AUTO device using Ultralytics API\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"Now, when we exported model to OpenVINO, we can load it directly into YOLOv10 class, where automatic inference backend will provide easy-to-use user experience to run OpenVINO YOLOv10 model on the similar level like for original PyTorch model. The code bellow demonstrates how to run inference OpenVINO exported model with Ultralytics API on single image. [AUTO device](https://github.com/openvinotoolkit/openvino_notebooks/tree/latest/notebooks/auto-device) will be used for launching model."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "7e8ed361-bf09-4398-ba15-e6c5dda73cd3",
+					"source": [
+						"ov_yolo_model = YOLOv10(ov_model_path.parent, task=\"detect\")"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "8a473286-59b8-498f-8541-df84f041e119",
+					"source": [
+						"from PIL import Image\n",
+						"\n",
+						"IMAGE_PATH = Path(\"./data/coco_bike.jpg\")\n",
+						"download_file(\n",
+						"    url=\"https://storage.openvinotoolkit.org/repositories/openvino_notebooks/data/data/image/coco_bike.jpg\",\n",
+						"    filename=IMAGE_PATH.name,\n",
+						"    directory=IMAGE_PATH.parent,\n",
+						")"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "7e116e81-0ad4-4b9e-9f5c-58680fd8f0c6",
+					"source": [
+						"res = ov_yolo_model(IMAGE_PATH, iou=0.45, conf=0.2)\n",
+						"Image.fromarray(res[0].plot()[:, :, ::-1])"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "943b9b04-4b97-4395-99d1-695465de1140",
+					"source": [
+						"## Run OpenVINO Inference on selected device using Ultralytics API\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"In this part of notebook you can select inference device for running model inference to compare results with AUTO."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "41655bec-b006-4376-abbb-d6c8c09e89fb",
+					"source": [
+						"device = device_widget(\"CPU\")\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "f284d5fd-12ba-4c08-afce-d8131ef7ad4d",
+					"source": [
+						"import openvino as ov\n",
+						"\n",
+						"core = ov.Core()\n",
+						"\n",
+						"ov_model = core.read_model(ov_model_path)\n",
+						"\n",
+						"# load model on selected device\n",
+						"if \"GPU\" in device.value or \"NPU\" in device.value:\n",
+						"    ov_model.reshape({0: [1, 3, 640, 640]})\n",
+						"ov_config = {}\n",
+						"if \"GPU\" in device.value:\n",
+						"    ov_config = {\"GPU_DISABLE_WINOGRAD_CONVOLUTION\": \"YES\"}\n",
+						"det_compiled_model = core.compile_model(ov_model, device.value, ov_config)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "12164d21-948a-4ef7-9e1c-b0d41c53cf91",
+					"source": [
+						"ov_yolo_model.predictor.model.ov_compiled_model = det_compiled_model"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "ecb9d396-ab1e-4398-a110-18c08b00ab14",
+					"source": [
+						"res = ov_yolo_model(IMAGE_PATH, iou=0.45, conf=0.2)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "a4abf758-3a72-4ee0-afde-38076602f1c7",
+					"source": [
+						"Image.fromarray(res[0].plot()[:, :, ::-1])"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "992b6ac3-4248-4848-8fd6-f9c1b9fc2051",
+					"source": [
+						"## Optimize model using NNCF Post-training Quantization API\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"[NNCF](https://github.com/openvinotoolkit/nncf) provides a suite of advanced algorithms for Neural Networks inference optimization in OpenVINO with minimal accuracy drop.\n",
+						"We will use 8-bit quantization in post-training mode (without the fine-tuning pipeline) to optimize YOLOv10.\n",
+						"\n",
+						"The optimization process contains the following steps:\n",
+						"\n",
+						"1. Create a Dataset for quantization.\n",
+						"2. Run `nncf.quantize` for getting an optimized model.\n",
+						"3. Serialize OpenVINO IR model, using the `openvino.save_model` function.\n",
+						"\n",
+						"Quantization is time and memory consuming process, you can skip this step using checkbox bellow:"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "ed9d9ce5-8df9-4803-ae85-bf0744de914c",
+					"source": [
+						"import ipywidgets as widgets\n",
+						"\n",
+						"int8_model_det_path = models_dir / \"int8\" / f\"{model_name}_openvino_model/{model_name}.xml\"\n",
+						"ov_yolo_int8_model = None\n",
+						"\n",
+						"to_quantize = widgets.Checkbox(\n",
+						"    value=True,\n",
+						"    description=\"Quantization\",\n",
+						"    disabled=False,\n",
+						")\n",
+						"\n",
+						"to_quantize"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "52287a23-b5ef-4c34-873a-32b398d26d1a",
+					"source": [
+						"# Fetch skip_kernel_extension module\n",
+						"r = requests.get(\n",
+						"    url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/skip_kernel_extension.py\",\n",
+						")\n",
+						"open(\"skip_kernel_extension.py\", \"w\").write(r.text)\n",
+						"\n",
+						"%load_ext skip_kernel_extension"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "89ba64af-aa73-4ed9-a2f9-527bd9ae8221",
+					"source": [
+						"### Prepare Quantization Dataset\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"For starting quantization, we need to prepare dataset. We will use validation subset from [MS COCO dataset](https://cocodataset.org/) for model quantization and Ultralytics validation data loader for preparing input data."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "5e10435e-9cd6-4f29-a865-721d6209314d",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"from zipfile import ZipFile\n",
+						"\n",
+						"from ultralytics.data.utils import DATASETS_DIR\n",
+						"\n",
+						"if not int8_model_det_path.exists():\n",
+						"\n",
+						"    DATA_URL = \"http://images.cocodataset.org/zips/val2017.zip\"\n",
+						"    LABELS_URL = \"https://github.com/ultralytics/yolov5/releases/download/v1.0/coco2017labels-segments.zip\"\n",
+						"    CFG_URL = \"https://raw.githubusercontent.com/ultralytics/ultralytics/v8.1.0/ultralytics/cfg/datasets/coco.yaml\"\n",
+						"\n",
+						"    OUT_DIR = DATASETS_DIR\n",
+						"\n",
+						"    DATA_PATH = OUT_DIR / \"val2017.zip\"\n",
+						"    LABELS_PATH = OUT_DIR / \"coco2017labels-segments.zip\"\n",
+						"    CFG_PATH = OUT_DIR / \"coco.yaml\"\n",
+						"\n",
+						"    download_file(DATA_URL, DATA_PATH.name, DATA_PATH.parent)\n",
+						"    download_file(LABELS_URL, LABELS_PATH.name, LABELS_PATH.parent)\n",
+						"    download_file(CFG_URL, CFG_PATH.name, CFG_PATH.parent)\n",
+						"\n",
+						"    if not (OUT_DIR / \"coco/labels\").exists():\n",
+						"        with ZipFile(LABELS_PATH, \"r\") as zip_ref:\n",
+						"            zip_ref.extractall(OUT_DIR)\n",
+						"        with ZipFile(DATA_PATH, \"r\") as zip_ref:\n",
+						"            zip_ref.extractall(OUT_DIR / \"coco/images\")"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "b0a14818-21fd-4c71-8e58-2297dfafaadd",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"from ultralytics.utils import DEFAULT_CFG\n",
+						"from ultralytics.cfg import get_cfg\n",
+						"from ultralytics.data.converter import coco80_to_coco91_class\n",
+						"from ultralytics.data.utils import check_det_dataset\n",
+						"\n",
+						"if not int8_model_det_path.exists():\n",
+						"    args = get_cfg(cfg=DEFAULT_CFG)\n",
+						"    args.data = str(CFG_PATH)\n",
+						"    det_validator = ov_yolo_model.task_map[ov_yolo_model.task][\"validator\"](args=args)\n",
+						"\n",
+						"    det_validator.data = check_det_dataset(args.data)\n",
+						"    det_validator.stride = 32\n",
+						"    det_data_loader = det_validator.get_dataloader(OUT_DIR / \"coco\", 1)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "83fa49f4-e40c-48c7-82a6-8ef56e20b343",
+					"source": [
+						"NNCF provides `nncf.Dataset` wrapper for using native framework dataloaders in quantization pipeline. Additionally, we specify transform function that will be responsible for preparing input data in model expected format."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "253f0e0f-131e-43b9-b1be-639d4b3d1fe5",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"import nncf\n",
+						"from typing import Dict\n",
+						"\n",
+						"\n",
+						"def transform_fn(data_item:Dict):\n",
+						"    \"\"\"\n",
+						"    Quantization transform function. Extracts and preprocess input data from dataloader item for quantization.\n",
+						"    Parameters:\n",
+						"       data_item: Dict with data item produced by DataLoader during iteration\n",
+						"    Returns:\n",
+						"        input_tensor: Input data for quantization\n",
+						"    \"\"\"\n",
+						"    input_tensor = det_validator.preprocess(data_item)['img'].numpy()\n",
+						"    return input_tensor\n",
+						"\n",
+						"if not int8_model_det_path.exists():\n",
+						"    quantization_dataset = nncf.Dataset(det_data_loader, transform_fn)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "ff8a6372-2097-4308-a4e5-e4651242a8df",
+					"source": [
+						"### Quantize and Save INT8 model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"The `nncf.quantize` function provides an interface for model quantization. It requires an instance of the OpenVINO Model and quantization dataset. \n",
+						"Optionally, some additional parameters for the configuration quantization process (number of samples for quantization, preset, ignored scope, etc.) can be provided. YOLOv10 model contains non-ReLU activation functions, which require asymmetric quantization of activations. To achieve a better result, we will use a `mixed` quantization preset. It provides symmetric quantization of weights and asymmetric quantization of activations.\n",
+						"\n",
+						">**Note**: Model post-training quantization is time-consuming process. Be patient, it can take several minutes depending on your hardware."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "4c12ae38-239e-4fe1-8296-47567f98538c",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"import shutil\n",
+						"\n",
+						"if not int8_model_det_path.exists():\n",
+						"    quantized_det_model = nncf.quantize(\n",
+						"        ov_model,\n",
+						"        quantization_dataset,\n",
+						"        preset=nncf.QuantizationPreset.MIXED,\n",
+						"    )\n",
+						"\n",
+						"    ov.save_model(quantized_det_model,  int8_model_det_path)\n",
+						"    shutil.copy(ov_model_path.parent / \"metadata.yaml\", int8_model_det_path.parent / \"metadata.yaml\")"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "41b8a3eb-adb8-40cf-8602-311ff8d75a76",
+					"source": [
+						"## Run Optimized Model Inference\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"The way of usage INT8 quantized model is the same like for model before quantization. Let's check inference result of quantized model on single image"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "f438df41-d614-4cca-a746-a173d92dddf5",
+					"source": [
+						"### Run Optimized Model on AUTO device\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "af61303b-16bd-4206-b926-2c28b3a859a4",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"ov_yolo_int8_model = YOLOv10(int8_model_det_path.parent, task=\"detect\")"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "db13b8dd-49a1-4046-8a1a-491eee095a1b",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"res = ov_yolo_int8_model(IMAGE_PATH, iou=0.45, conf=0.2)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "0423ba31-f0ee-4bfc-a18a-f7b870a9683d",
+					"source": [
+						"Image.fromarray(res[0].plot()[:, :, ::-1])"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "4b4f7118-e046-4f87-b403-87053f2b0ac3",
+					"source": [
+						"### Run Optimized Model Inference on selected device\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "142f22ae-6a8d-4578-b97f-4d9c77123418",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "2f43767a-1994-4202-a411-4738c92223da",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"ov_config = {}\n",
+						"if \"GPU\" in device.value or \"NPU\" in device.value:\n",
+						"    ov_model.reshape({0: [1, 3, 640, 640]})\n",
+						"ov_config = {}\n",
+						"if \"GPU\" in device.value:\n",
+						"    ov_config = {\"GPU_DISABLE_WINOGRAD_CONVOLUTION\": \"YES\"}\n",
+						"\n",
+						"quantized_det_model = core.read_model(int8_model_det_path)\n",
+						"quantized_det_compiled_model = core.compile_model(quantized_det_model, device.value, ov_config)\n",
+						"\n",
+						"ov_yolo_int8_model.predictor.model.ov_compiled_model = quantized_det_compiled_model\n",
+						"\n",
+						"res = ov_yolo_int8_model(IMAGE_PATH,  iou=0.45, conf=0.2)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "51d64c7b-7595-41ca-87dd-4c85308f84d6",
+					"source": [
+						"Image.fromarray(res[0].plot()[:, :, ::-1])"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "c7b70f75-a706-4f24-a487-88a3ad645dd5",
+					"source": [
+						"## Compare the Original and Quantized Models\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "d6561246-a9e0-4cdf-8207-7e2f919d8582",
+					"source": [
+						"### Model size\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "43d84d15-75be-4430-a58b-61cfd8e08dd0",
+					"source": [
+						"ov_model_weights = ov_model_path.with_suffix(\".bin\")\n",
+						"print(f\"Size of FP16 model is {ov_model_weights.stat().st_size / 1024 / 1024:.2f} MB\")\n",
+						"if int8_model_det_path.exists():\n",
+						"    ov_int8_weights = int8_model_det_path.with_suffix(\".bin\")\n",
+						"    print(f\"Size of model with INT8 compressed weights is {ov_int8_weights.stat().st_size / 1024 / 1024:.2f} MB\")\n",
+						"    print(f\"Compression rate for INT8 model: {ov_model_weights.stat().st_size / ov_int8_weights.stat().st_size:.3f}\")"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "f72b3d84-91f3-493c-8f4e-46598ffbd6d1",
+					"source": [
+						"### Performance\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"### FP16 model performance\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "909ea508-e007-4313-ab0f-bfa0e3906176",
+					"source": [
+						"!benchmark_app -m $ov_model_path -d $device.value -api async -shape \"[1,3,640,640]\" -t 15"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "9852a8ef-4c45-43dd-a9ef-53ca6f13c99e",
+					"source": [
+						"### Int8 model performance\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "8254626d-6c4f-4ca3-936f-a7c47e402e03",
+					"source": [
+						"if int8_model_det_path.exists():\n",
+						"    !benchmark_app -m $int8_model_det_path -d $device.value -api async -shape \"[1,3,640,640]\" -t 15"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "12d35bc1-8101-45ea-8bd7-53720b98f5e5",
+					"source": [
+						"## Live demo\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"The following code runs model inference on a video:"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "246bd379-b1d5-4eb2-928f-97c7c2455a92",
+					"source": [
+						"import collections\n",
+						"import time\n",
+						"from IPython import display\n",
+						"import cv2\n",
+						"import numpy as np\n",
+						"\n",
+						"\n",
+						"# Main processing function to run object detection.\n",
+						"def run_object_detection(\n",
+						"    source=0,\n",
+						"    flip=False,\n",
+						"    use_popup=False,\n",
+						"    skip_first_frames=0,\n",
+						"    det_model=ov_yolo_int8_model,\n",
+						"    device=device.value,\n",
+						"):\n",
+						"    player = None\n",
+						"    try:\n",
+						"        # Create a video player to play with target fps.\n",
+						"        player = VideoPlayer(source=source, flip=flip, fps=30, skip_first_frames=skip_first_frames)\n",
+						"        # Start capturing.\n",
+						"        player.start()\n",
+						"        if use_popup:\n",
+						"            title = \"Press ESC to Exit\"\n",
+						"            cv2.namedWindow(winname=title, flags=cv2.WINDOW_GUI_NORMAL | cv2.WINDOW_AUTOSIZE)\n",
+						"\n",
+						"        processing_times = collections.deque()\n",
+						"        while True:\n",
+						"            # Grab the frame.\n",
+						"            frame = player.next()\n",
+						"            if frame is None:\n",
+						"                print(\"Source ended\")\n",
+						"                break\n",
+						"            # If the frame is larger than full HD, reduce size to improve the performance.\n",
+						"            scale = 1280 / max(frame.shape)\n",
+						"            if scale < 1:\n",
+						"                frame = cv2.resize(\n",
+						"                    src=frame,\n",
+						"                    dsize=None,\n",
+						"                    fx=scale,\n",
+						"                    fy=scale,\n",
+						"                    interpolation=cv2.INTER_AREA,\n",
+						"                )\n",
+						"            # Get the results.\n",
+						"            input_image = np.array(frame)\n",
+						"\n",
+						"            start_time = time.time()\n",
+						"            detections = det_model(input_image, iou=0.45, conf=0.2, verbose=False)\n",
+						"            stop_time = time.time()\n",
+						"            frame = detections[0].plot()\n",
+						"\n",
+						"            processing_times.append(stop_time - start_time)\n",
+						"            # Use processing times from last 200 frames.\n",
+						"            if len(processing_times) > 200:\n",
+						"                processing_times.popleft()\n",
+						"\n",
+						"            _, f_width = frame.shape[:2]\n",
+						"            # Mean processing time [ms].\n",
+						"            processing_time = np.mean(processing_times) * 1000\n",
+						"            fps = 1000 / processing_time\n",
+						"            cv2.putText(\n",
+						"                img=frame,\n",
+						"                text=f\"Inference time: {processing_time:.1f}ms ({fps:.1f} FPS)\",\n",
+						"                org=(20, 40),\n",
+						"                fontFace=cv2.FONT_HERSHEY_COMPLEX,\n",
+						"                fontScale=f_width / 1000,\n",
+						"                color=(0, 0, 255),\n",
+						"                thickness=1,\n",
+						"                lineType=cv2.LINE_AA,\n",
+						"            )\n",
+						"            # Use this workaround if there is flickering.\n",
+						"            if use_popup:\n",
+						"                cv2.imshow(winname=title, mat=frame)\n",
+						"                key = cv2.waitKey(1)\n",
+						"                # escape = 27\n",
+						"                if key == 27:\n",
+						"                    break\n",
+						"            else:\n",
+						"                # Encode numpy array to jpg.\n",
+						"                _, encoded_img = cv2.imencode(ext=\".jpg\", img=frame, params=[cv2.IMWRITE_JPEG_QUALITY, 100])\n",
+						"                # Create an IPython image.\n",
+						"                i = display.Image(data=encoded_img)\n",
+						"                # Display the image in this notebook.\n",
+						"                display.clear_output(wait=True)\n",
+						"                display.display(i)\n",
+						"    # ctrl-c\n",
+						"    except KeyboardInterrupt:\n",
+						"        print(\"Interrupted\")\n",
+						"    # any different error\n",
+						"    except RuntimeError as e:\n",
+						"        print(e)\n",
+						"    finally:\n",
+						"        if player is not None:\n",
+						"            # Stop capturing.\n",
+						"            player.stop()\n",
+						"        if use_popup:\n",
+						"            cv2.destroyAllWindows()"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "8db930f4-fc41-4635-9248-deab2b6cfcb8",
+					"source": [
+						"use_int8 = widgets.Checkbox(\n",
+						"    value=ov_yolo_int8_model is not None,\n",
+						"    description=\"Use int8 model\",\n",
+						"    disabled=ov_yolo_int8_model is None,\n",
+						")\n",
+						"\n",
+						"use_int8"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "59e37135-1bdc-40ff-8789-b5b4491cab84",
+					"source": [
+						"WEBCAM_INFERENCE = False\n",
+						"\n",
+						"if WEBCAM_INFERENCE:\n",
+						"    VIDEO_SOURCE = 0  # Webcam\n",
+						"else:\n",
+						"    download_file(\n",
+						"        \"https://storage.openvinotoolkit.org/repositories/openvino_notebooks/data/data/video/people.mp4\",\n",
+						"        directory=\"data\",\n",
+						"    )\n",
+						"    VIDEO_SOURCE = \"data/people.mp4\""
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "88c6f47c-1c47-451d-89ba-0a29760f5ec4",
+					"source": [
+						"run_object_detection(\n",
+						"    det_model=ov_yolo_model if not use_int8.value else ov_yolo_int8_model,\n",
+						"    source=VIDEO_SOURCE,\n",
+						"    flip=True,\n",
+						"    use_popup=False,\n",
+						")"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "9f612d80-68e2-45f8-aa62-9f3a05ca9de8",
+					"source": [
+						"### Gradio Interactive Demo\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "ffdbe248-7086-4804-b4b9-c3dd454bf80c",
+					"source": [
+						"import gradio as gr\n",
+						"\n",
+						"\n",
+						"def yolov10_inference(image, int8, conf_threshold, iou_threshold):\n",
+						"    model = ov_yolo_model if not int8 else ov_yolo_int8_model\n",
+						"    results = model(source=image, iou=iou_threshold, conf=conf_threshold, verbose=False)[0]\n",
+						"    annotated_image = Image.fromarray(results.plot())\n",
+						"\n",
+						"    return annotated_image\n",
+						"\n",
+						"\n",
+						"with gr.Blocks() as demo:\n",
+						"    gr.HTML(\n",
+						"        \"\"\"\n",
+						"    <h1 style='text-align: center'>\n",
+						"    YOLOv10: Real-Time End-to-End Object Detection using OpenVINO\n",
+						"    </h1>\n",
+						"    \"\"\"\n",
+						"    )\n",
+						"    with gr.Row():\n",
+						"        with gr.Column():\n",
+						"            image = gr.Image(type=\"numpy\", label=\"Image\")\n",
+						"            conf_threshold = gr.Slider(\n",
+						"                label=\"Confidence Threshold\",\n",
+						"                minimum=0.1,\n",
+						"                maximum=1.0,\n",
+						"                step=0.1,\n",
+						"                value=0.2,\n",
+						"            )\n",
+						"            iou_threshold = gr.Slider(\n",
+						"                label=\"IoU Threshold\",\n",
+						"                minimum=0.1,\n",
+						"                maximum=1.0,\n",
+						"                step=0.1,\n",
+						"                value=0.45,\n",
+						"            )\n",
+						"            use_int8 = gr.Checkbox(\n",
+						"                value=ov_yolo_int8_model is not None,\n",
+						"                visible=ov_yolo_int8_model is not None,\n",
+						"                label=\"Use INT8 model\",\n",
+						"            )\n",
+						"            yolov10_infer = gr.Button(value=\"Detect Objects\")\n",
+						"\n",
+						"        with gr.Column():\n",
+						"            output_image = gr.Image(type=\"pil\", label=\"Annotated Image\")\n",
+						"\n",
+						"        yolov10_infer.click(\n",
+						"            fn=yolov10_inference,\n",
+						"            inputs=[\n",
+						"                image,\n",
+						"                use_int8,\n",
+						"                conf_threshold,\n",
+						"                iou_threshold,\n",
+						"            ],\n",
+						"            outputs=[output_image],\n",
+						"        )\n",
+						"    examples = gr.Examples(\n",
+						"        [\n",
+						"            \"data/coco_bike.jpg\",\n",
+						"        ],\n",
+						"        inputs=[\n",
+						"            image,\n",
+						"        ],\n",
+						"    )\n",
+						"\n",
+						"\n",
+						"try:\n",
+						"    demo.launch(debug=True)\n",
+						"except Exception:\n",
+						"    demo.launch(debug=True, share=True)"
+					]
+				}
+			]
+				.map(fromJupyterCell)
+			,
+			[
+				{
+					"cell_type": "markdown",
+					"id": "e9d010ff-85ba-4e69-b439-ba89e4a3a715",
+					"source": [
+						"# Convert and Optimize YOLOv10 with OpenVINO\n",
+						"\n",
+						"Real-time object detection aims to accurately predict object categories and positions in images with low latency. The YOLO series has been at the forefront of this research due to its balance between performance and efficiency. However, reliance on NMS and architectural inefficiencies have hindered optimal performance. YOLOv10 addresses these issues by introducing consistent dual assignments for NMS-free training and a holistic efficiency-accuracy driven model design strategy.\n",
+						"\n",
+						"YOLOv10, built on the [Ultralytics Python package](https://pypi.org/project/ultralytics/) by researchers at [Tsinghua University](https://www.tsinghua.edu.cn/en/), introduces a new approach to real-time object detection, addressing both the post-processing and model architecture deficiencies found in previous YOLO versions. By eliminating non-maximum suppression (NMS) and optimizing various model components, YOLOv10 achieves state-of-the-art performance with significantly reduced computational overhead. Extensive experiments demonstrate its superior accuracy-latency trade-offs across multiple model scales.\n",
+						"\n",
+						"![yolov10-approach.png](https://github.com/ultralytics/ultralytics/assets/26833433/f9b1bec0-928e-41ce-a205-e12db3c4929a)\n",
+						"\n",
+						"More details about model architecture you can find in original [repo](https://github.com/THU-MIG/yolov10), [paper](https://arxiv.org/abs/2405.14458) and [Ultralytics documentation](https://docs.ultralytics.com/models/yolov10/).\n",
+						"\n",
+						"This tutorial demonstrates step-by-step instructions on how to run and optimize PyTorch YOLO V10 with OpenVINO.\n",
+						"\n",
+						"The tutorial consists of the following steps:\n",
+						"\n",
+						"- Prepare PyTorch model\n",
+						"- Convert PyTorch model to OpenVINO IR\n",
+						"- Run model inference with OpenVINO\n",
+						"- Prepare and run optimization pipeline using NNCF\n",
+						"- Compare performance of the FP16 and quantized models.\n",
+						"- Run optimized model inference on video\n",
+						"- Launch interactive Gradio demo\n",
+						"\n",
+						"#### Table of contents:\n",
+						"\n",
+						"- [Prerequisites](#Prerequisites)\n",
+						"- [Download PyTorch model](#Download-PyTorch-model)\n",
+						"- [Export PyTorch model to OpenVINO IR Format](#Export-PyTorch-model-to-OpenVINO-IR-Format)\n",
+						"- [Run OpenVINO Inference on AUTO device using Ultralytics API](#Run-OpenVINO-Inference-on-AUTO-device-using-Ultralytics-API)\n",
+						"- [Run OpenVINO Inference on selected device using Ultralytics API](#Run-OpenVINO-Inference-on-selected-device-using-Ultralytics-API)\n",
+						"- [Optimize model using NNCF Post-training Quantization API](#Optimize-model-using-NNCF-Post-training-Quantization-API)\n",
+						"    - [Prepare Quantization Dataset](#Prepare-Quantization-Dataset)\n",
+						"    - [Quantize and Save INT8 model](#Quantize-and-Save-INT8-model)\n",
+						"- [Run Optimized Model Inference](#Run-Optimized-Model-Inference)\n",
+						"    - [Run Optimized Model on AUTO device](#Run-Optimized-Model-on-AUTO-device)\n",
+						"    - [Run Optimized Model Inference on selected device](#Run-Optimized-Model-Inference-on-selected-device)\n",
+						"- [Compare the Original and Quantized Models](#Compare-the-Original-and-Quantized-Models)\n",
+						"    - [Model size](#Model-size)\n",
+						"    - [Performance](#Performance)\n",
+						"    - [FP16 model performance](#FP16-model-performance)\n",
+						"    - [Int8 model performance](#Int8-model-performance)\n",
+						"- [Live demo](#Live-demo)\n",
+						"    - [Gradio Interactive Demo](#Gradio-Interactive-Demo)\n",
+						"\n",
+						"\n",
+						"### Installation Instructions\n",
+						"\n",
+						"This is a self-contained example that relies solely on its own code.\n",
+						"\n",
+						"We recommend  running the notebook in a virtual environment. You only need a Jupyter server to start.\n",
+						"For details, please refer to [Installation Guide](https://github.com/openvinotoolkit/openvino_notebooks/blob/latest/README.md#-installation-guide).\n",
+						"\n",
+						"<img referrerpolicy=\"no-referrer-when-downgrade\" src=\"https://static.scarf.sh/a.png?x-pxid=5b5a4db0-7875-4bfb-bdbd-01698b5b1a77&file=notebooks/yolov10-optimization/yolov10-optimization.ipynb\" />\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "144e86a1-c220-4e3b-a8b2-8eda443faf2d",
+					"source": [
+						"## Prerequisites\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "bf76580b-860a-4dcd-8b01-f494cdffe37e",
+					"source": [
+						"import os\n",
+						"\n",
+						"os.environ[\"GIT_CLONE_PROTECTION_ACTIVE\"] = \"false\"\n",
+						"\n",
+						"%pip install -q \"nncf>=2.11.0\"\n",
+						"%pip install -Uq \"openvino>=2024.3.0\"\n",
+						"%pip install -q \"git+https://github.com/THU-MIG/yolov10.git\" --extra-index-url https://download.pytorch.org/whl/cpu\n",
+						"%pip install -q \"torch>=2.1\" \"torchvision>=0.16\" tqdm opencv-python \"gradio>=4.19\" --extra-index-url https://download.pytorch.org/whl/cpu"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "75772eac-565b-4234-82bf-f305e0c1ceda",
+					"source": [
+						"from pathlib import Path\n",
+						"\n",
+						"# Fetch `notebook_utils` module\n",
+						"import requests\n",
+						"\n",
+						"r = requests.get(\n",
+						"    url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/notebook_utils.py\",\n",
+						")\n",
+						"\n",
+						"open(\"notebook_utils.py\", \"w\").write(r.text)\n",
+						"\n",
+						"from notebook_utils import download_file, VideoPlayer, device_widget"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "2888d8b4-44f6-4418-bae4-f433ff28010b",
+					"source": [
+						"## Download PyTorch model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"There are several version of [YOLO V10](https://github.com/THU-MIG/yolov10/tree/main?tab=readme-ov-file#performance) models provided by model authors. Each of them has different characteristics depends on number of training parameters, performance and accuracy. For demonstration purposes we will use `yolov10n`, but the same steps are also applicable to other models in YOLO V10 series."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "aea6315b-6a29-4f2a-96a9-eb3c1646a3a4",
+					"source": [
+						"models_dir = Path(\"./models\")\n",
+						"models_dir.mkdir(exist_ok=True)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "d828401e-b6bd-4796-a7b8-681957a159d4",
+					"source": [
+						"model_weights_url = \"https://github.com/jameslahm/yolov10/releases/download/v1.0/yolov10n.pt\"\n",
+						"file_name = model_weights_url.split(\"/\")[-1]\n",
+						"model_name = file_name.replace(\".pt\", \"\")\n",
+						"\n",
+						"download_file(model_weights_url, directory=models_dir)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "dc21487d-dd79-4b56-b8e2-5b28c8d92ac8",
+					"source": [
+						"## Export PyTorch model to OpenVINO IR Format\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "8cfec0d6-fb55-4611-861b-326e892fcf09",
+					"source": [
+						"As it was discussed before, YOLO V10 code is designed on top of [Ultralytics](https://docs.ultralytics.com/) library and has similar interface with YOLO V8 (You can check [YOLO V8 notebooks](https://github.com/openvinotoolkit/openvino_notebooks/tree/latest/notebooks/yolov8-optimization) for more detailed instruction how to work with Ultralytics API). Ultralytics support OpenVINO model export using [export](https://docs.ultralytics.com/modes/export/) method of model class. Additionally, we can specify parameters responsible for target input size, static or dynamic input shapes and model precision (FP32/FP16/INT8). INT8 quantization can be additionally performed on export stage, but for making approach more flexible, we consider how to perform quantization using [NNCF](https://github.com/openvinotoolkit/nncf)."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "d488f564-c1d5-4c6a-9b4a-353a3ab749e6",
+					"source": [
+						"import types\n",
+						"from ultralytics.utils import ops, yaml_load, yaml_save\n",
+						"from ultralytics import YOLOv10\n",
+						"import torch\n",
+						"\n",
+						"detection_labels = {\n",
+						"    0: \"person\",\n",
+						"    1: \"bicycle\",\n",
+						"    2: \"car\",\n",
+						"    3: \"motorcycle\",\n",
+						"    4: \"airplane\",\n",
+						"    5: \"bus\",\n",
+						"    6: \"train\",\n",
+						"    7: \"truck\",\n",
+						"    8: \"boat\",\n",
+						"    9: \"traffic light\",\n",
+						"    10: \"fire hydrant\",\n",
+						"    11: \"stop sign\",\n",
+						"    12: \"parking meter\",\n",
+						"    13: \"bench\",\n",
+						"    14: \"bird\",\n",
+						"    15: \"cat\",\n",
+						"    16: \"dog\",\n",
+						"    17: \"horse\",\n",
+						"    18: \"sheep\",\n",
+						"    19: \"cow\",\n",
+						"    20: \"elephant\",\n",
+						"    21: \"bear\",\n",
+						"    22: \"zebra\",\n",
+						"    23: \"giraffe\",\n",
+						"    24: \"backpack\",\n",
+						"    25: \"umbrella\",\n",
+						"    26: \"handbag\",\n",
+						"    27: \"tie\",\n",
+						"    28: \"suitcase\",\n",
+						"    29: \"frisbee\",\n",
+						"    30: \"skis\",\n",
+						"    31: \"snowboard\",\n",
+						"    32: \"sports ball\",\n",
+						"    33: \"kite\",\n",
+						"    34: \"baseball bat\",\n",
+						"    35: \"baseball glove\",\n",
+						"    36: \"skateboard\",\n",
+						"    37: \"surfboard\",\n",
+						"    38: \"tennis racket\",\n",
+						"    39: \"bottle\",\n",
+						"    40: \"wine glass\",\n",
+						"    41: \"cup\",\n",
+						"    42: \"fork\",\n",
+						"    43: \"knife\",\n",
+						"    44: \"spoon\",\n",
+						"    45: \"bowl\",\n",
+						"    46: \"banana\",\n",
+						"    47: \"apple\",\n",
+						"    48: \"sandwich\",\n",
+						"    49: \"orange\",\n",
+						"    50: \"broccoli\",\n",
+						"    51: \"carrot\",\n",
+						"    52: \"hot dog\",\n",
+						"    53: \"pizza\",\n",
+						"    54: \"donut\",\n",
+						"    55: \"cake\",\n",
+						"    56: \"chair\",\n",
+						"    57: \"couch\",\n",
+						"    58: \"potted plant\",\n",
+						"    59: \"bed\",\n",
+						"    60: \"dining table\",\n",
+						"    61: \"toilet\",\n",
+						"    62: \"tv\",\n",
+						"    63: \"laptop\",\n",
+						"    64: \"mouse\",\n",
+						"    65: \"remote\",\n",
+						"    66: \"keyboard\",\n",
+						"    67: \"cell phone\",\n",
+						"    68: \"microwave\",\n",
+						"    69: \"oven\",\n",
+						"    70: \"toaster\",\n",
+						"    71: \"sink\",\n",
+						"    72: \"refrigerator\",\n",
+						"    73: \"book\",\n",
+						"    74: \"clock\",\n",
+						"    75: \"vase\",\n",
+						"    76: \"scissors\",\n",
+						"    77: \"teddy bear\",\n",
+						"    78: \"hair drier\",\n",
+						"    79: \"toothbrush\",\n",
+						"}\n",
+						"\n",
+						"\n",
+						"def v10_det_head_forward(self, x):\n",
+						"    one2one = self.forward_feat([xi.detach() for xi in x], self.one2one_cv2, self.one2one_cv3)\n",
+						"    if not self.export:\n",
+						"        one2many = super().forward(x)\n",
+						"\n",
+						"    if not self.training:\n",
+						"        one2one = self.inference(one2one)\n",
+						"        if not self.export:\n",
+						"            return {\"one2many\": one2many, \"one2one\": one2one}\n",
+						"        else:\n",
+						"            assert self.max_det != -1\n",
+						"            boxes, scores, labels = ops.v10postprocess(one2one.permute(0, 2, 1), self.max_det, self.nc)\n",
+						"            return torch.cat(\n",
+						"                [boxes, scores.unsqueeze(-1), labels.unsqueeze(-1).to(boxes.dtype)],\n",
+						"                dim=-1,\n",
+						"            )\n",
+						"    else:\n",
+						"        return {\"one2many\": one2many, \"one2one\": one2one}\n",
+						"\n",
+						"\n",
+						"ov_model_path = models_dir / f\"{model_name}_openvino_model/{model_name}.xml\"\n",
+						"if not ov_model_path.exists():\n",
+						"    model = YOLOv10(models_dir / file_name)\n",
+						"    model.model.model[-1].forward = types.MethodType(v10_det_head_forward, model.model.model[-1])\n",
+						"    model.export(format=\"openvino\", dynamic=True, half=True)\n",
+						"    config = yaml_load(ov_model_path.parent / \"metadata.yaml\")\n",
+						"    config[\"names\"] = detection_labels\n",
+						"    yaml_save(ov_model_path.parent / \"metadata.yaml\", config)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "8a23f621-f6cd-4bfd-8b98-24b8c0392761",
+					"source": [
+						"## Run OpenVINO Inference on AUTO device using Ultralytics API\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"Now, when we exported model to OpenVINO, we can load it directly into YOLOv10 class, where automatic inference backend will provide easy-to-use user experience to run OpenVINO YOLOv10 model on the similar level like for original PyTorch model. The code bellow demonstrates how to run inference OpenVINO exported model with Ultralytics API on single image. [AUTO device](https://github.com/openvinotoolkit/openvino_notebooks/tree/latest/notebooks/auto-device) will be used for launching model."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "7e8ed361-bf09-4398-ba15-e6c5dda73cd3",
+					"source": [
+						"ov_yolo_model = YOLOv10(ov_model_path.parent, task=\"detect\")"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "8a473286-59b8-498f-8541-df84f041e119",
+					"source": [
+						"from PIL import Image\n",
+						"\n",
+						"IMAGE_PATH = Path(\"./data/coco_bike.jpg\")\n",
+						"download_file(\n",
+						"    url=\"https://storage.openvinotoolkit.org/repositories/openvino_notebooks/data/data/image/coco_bike.jpg\",\n",
+						"    filename=IMAGE_PATH.name,\n",
+						"    directory=IMAGE_PATH.parent,\n",
+						")"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "7e116e81-0ad4-4b9e-9f5c-58680fd8f0c6",
+					"source": [
+						"res = ov_yolo_model(IMAGE_PATH, iou=0.45, conf=0.2)\n",
+						"Image.fromarray(res[0].plot()[:, :, ::-1])"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "943b9b04-4b97-4395-99d1-695465de1140",
+					"source": [
+						"## Run OpenVINO Inference on selected device using Ultralytics API\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"In this part of notebook you can select inference device for running model inference to compare results with AUTO."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "41655bec-b006-4376-abbb-d6c8c09e89fb",
+					"source": [
+						"device = device_widget(\"CPU\")\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "f284d5fd-12ba-4c08-afce-d8131ef7ad4d",
+					"source": [
+						"import openvino as ov\n",
+						"\n",
+						"core = ov.Core()\n",
+						"\n",
+						"ov_model = core.read_model(ov_model_path)\n",
+						"\n",
+						"# load model on selected device\n",
+						"if \"GPU\" in device.value or \"NPU\" in device.value:\n",
+						"    ov_model.reshape({0: [1, 3, 640, 640]})\n",
+						"ov_config = {}\n",
+						"if \"GPU\" in device.value:\n",
+						"    ov_config = {\"GPU_DISABLE_WINOGRAD_CONVOLUTION\": \"YES\"}\n",
+						"det_compiled_model = core.compile_model(ov_model, device.value, ov_config)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "12164d21-948a-4ef7-9e1c-b0d41c53cf91",
+					"source": [
+						"ov_yolo_model.predictor.model.ov_compiled_model = det_compiled_model"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "ecb9d396-ab1e-4398-a110-18c08b00ab14",
+					"source": [
+						"res = ov_yolo_model(IMAGE_PATH, iou=0.45, conf=0.2)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "a4abf758-3a72-4ee0-afde-38076602f1c7",
+					"source": [
+						"Image.fromarray(res[0].plot()[:, :, ::-1])"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "992b6ac3-4248-4848-8fd6-f9c1b9fc2051",
+					"source": [
+						"## Optimize model using NNCF Post-training Quantization API\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"[NNCF](https://github.com/openvinotoolkit/nncf) provides a suite of advanced algorithms for Neural Networks inference optimization in OpenVINO with minimal accuracy drop.\n",
+						"We will use 8-bit quantization in post-training mode (without the fine-tuning pipeline) to optimize YOLOv10.\n",
+						"\n",
+						"The optimization process contains the following steps:\n",
+						"\n",
+						"1. Create a Dataset for quantization.\n",
+						"2. Run `nncf.quantize` for getting an optimized model.\n",
+						"3. Serialize OpenVINO IR model, using the `openvino.save_model` function.\n",
+						"\n",
+						"Quantization is time and memory consuming process, you can skip this step using checkbox bellow:"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "ed9d9ce5-8df9-4803-ae85-bf0744de914c",
+					"source": [
+						"import ipywidgets as widgets\n",
+						"\n",
+						"int8_model_det_path = models_dir / \"int8\" / f\"{model_name}_openvino_model/{model_name}.xml\"\n",
+						"ov_yolo_int8_model = None\n",
+						"\n",
+						"to_quantize = widgets.Checkbox(\n",
+						"    value=True,\n",
+						"    description=\"Quantization\",\n",
+						"    disabled=False,\n",
+						")\n",
+						"\n",
+						"to_quantize"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "52287a23-b5ef-4c34-873a-32b398d26d1a",
+					"source": [
+						"# Fetch skip_kernel_extension module\n",
+						"r = requests.get(\n",
+						"    url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/utils/skip_kernel_extension.py\",\n",
+						")\n",
+						"open(\"skip_kernel_extension.py\", \"w\").write(r.text)\n",
+						"\n",
+						"%load_ext skip_kernel_extension"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "89ba64af-aa73-4ed9-a2f9-527bd9ae8221",
+					"source": [
+						"### Prepare Quantization Dataset\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"For starting quantization, we need to prepare dataset. We will use validation subset from [MS COCO dataset](https://cocodataset.org/) for model quantization and Ultralytics validation data loader for preparing input data."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "5e10435e-9cd6-4f29-a865-721d6209314d",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"from zipfile import ZipFile\n",
+						"\n",
+						"from ultralytics.data.utils import DATASETS_DIR\n",
+						"\n",
+						"if not int8_model_det_path.exists():\n",
+						"\n",
+						"    DATA_URL = \"http://images.cocodataset.org/zips/val2017.zip\"\n",
+						"    LABELS_URL = \"https://github.com/ultralytics/yolov5/releases/download/v1.0/coco2017labels-segments.zip\"\n",
+						"    CFG_URL = \"https://raw.githubusercontent.com/ultralytics/ultralytics/v8.1.0/ultralytics/cfg/datasets/coco.yaml\"\n",
+						"\n",
+						"    OUT_DIR = DATASETS_DIR\n",
+						"\n",
+						"    DATA_PATH = OUT_DIR / \"val2017.zip\"\n",
+						"    LABELS_PATH = OUT_DIR / \"coco2017labels-segments.zip\"\n",
+						"    CFG_PATH = OUT_DIR / \"coco.yaml\"\n",
+						"\n",
+						"    download_file(DATA_URL, DATA_PATH.name, DATA_PATH.parent)\n",
+						"    download_file(LABELS_URL, LABELS_PATH.name, LABELS_PATH.parent)\n",
+						"    download_file(CFG_URL, CFG_PATH.name, CFG_PATH.parent)\n",
+						"\n",
+						"    if not (OUT_DIR / \"coco/labels\").exists():\n",
+						"        with ZipFile(LABELS_PATH, \"r\") as zip_ref:\n",
+						"            zip_ref.extractall(OUT_DIR)\n",
+						"        with ZipFile(DATA_PATH, \"r\") as zip_ref:\n",
+						"            zip_ref.extractall(OUT_DIR / \"coco/images\")"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "b0a14818-21fd-4c71-8e58-2297dfafaadd",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"from ultralytics.utils import DEFAULT_CFG\n",
+						"from ultralytics.cfg import get_cfg\n",
+						"from ultralytics.data.converter import coco80_to_coco91_class\n",
+						"from ultralytics.data.utils import check_det_dataset\n",
+						"\n",
+						"if not int8_model_det_path.exists():\n",
+						"    args = get_cfg(cfg=DEFAULT_CFG)\n",
+						"    args.data = str(CFG_PATH)\n",
+						"    det_validator = ov_yolo_model.task_map[ov_yolo_model.task][\"validator\"](args=args)\n",
+						"\n",
+						"    det_validator.data = check_det_dataset(args.data)\n",
+						"    det_validator.stride = 32\n",
+						"    det_data_loader = det_validator.get_dataloader(OUT_DIR / \"coco\", 1)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "83fa49f4-e40c-48c7-82a6-8ef56e20b343",
+					"source": [
+						"NNCF provides `nncf.Dataset` wrapper for using native framework dataloaders in quantization pipeline. Additionally, we specify transform function that will be responsible for preparing input data in model expected format."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "253f0e0f-131e-43b9-b1be-639d4b3d1fe5",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"import nncf\n",
+						"from typing import Dict\n",
+						"\n",
+						"\n",
+						"def transform_fn(data_item:Dict):\n",
+						"    \"\"\"\n",
+						"    Quantization transform function. Extracts and preprocess input data from dataloader item for quantization.\n",
+						"    Parameters:\n",
+						"       data_item: Dict with data item produced by DataLoader during iteration\n",
+						"    Returns:\n",
+						"        input_tensor: Input data for quantization\n",
+						"    \"\"\"\n",
+						"    input_tensor = det_validator.preprocess(data_item)['img'].numpy()\n",
+						"    return input_tensor\n",
+						"\n",
+						"if not int8_model_det_path.exists():\n",
+						"    quantization_dataset = nncf.Dataset(det_data_loader, transform_fn)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "ff8a6372-2097-4308-a4e5-e4651242a8df",
+					"source": [
+						"### Quantize and Save INT8 model\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"The `nncf.quantize` function provides an interface for model quantization. It requires an instance of the OpenVINO Model and quantization dataset. \n",
+						"Optionally, some additional parameters for the configuration quantization process (number of samples for quantization, preset, ignored scope, etc.) can be provided. YOLOv10 model contains non-ReLU activation functions, which require asymmetric quantization of activations. To achieve a better result, we will use a `mixed` quantization preset. It provides symmetric quantization of weights and asymmetric quantization of activations.\n",
+						"\n",
+						">**Note**: Model post-training quantization is time-consuming process. Be patient, it can take several minutes depending on your hardware."
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "4c12ae38-239e-4fe1-8296-47567f98538c",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"import shutil\n",
+						"\n",
+						"if not int8_model_det_path.exists():\n",
+						"    quantized_det_model = nncf.quantize(\n",
+						"        ov_model,\n",
+						"        quantization_dataset,\n",
+						"        preset=nncf.QuantizationPreset.MIXED,\n",
+						"    )\n",
+						"\n",
+						"    ov.save_model(quantized_det_model,  int8_model_det_path)\n",
+						"    shutil.copy(ov_model_path.parent / \"metadata.yaml\", int8_model_det_path.parent / \"metadata.yaml\")"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "41b8a3eb-adb8-40cf-8602-311ff8d75a76",
+					"source": [
+						"## Run Optimized Model Inference\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"The way of usage INT8 quantized model is the same like for model before quantization. Let's check inference result of quantized model on single image"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "f438df41-d614-4cca-a746-a173d92dddf5",
+					"source": [
+						"### Run Optimized Model on AUTO device\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "af61303b-16bd-4206-b926-2c28b3a859a4",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"ov_yolo_int8_model = YOLOv10(int8_model_det_path.parent, task=\"detect\")"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "db13b8dd-49a1-4046-8a1a-491eee095a1b",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"res = ov_yolo_int8_model(IMAGE_PATH, iou=0.45, conf=0.2)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "0423ba31-f0ee-4bfc-a18a-f7b870a9683d",
+					"source": [
+						"Image.fromarray(res[0].plot()[:, :, ::-1])"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "4b4f7118-e046-4f87-b403-87053f2b0ac3",
+					"source": [
+						"### Run Optimized Model Inference on selected device\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "142f22ae-6a8d-4578-b97f-4d9c77123418",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"device"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "2f43767a-1994-4202-a411-4738c92223da",
+					"source": [
+						"%%skip not $to_quantize.value\n",
+						"\n",
+						"ov_config = {}\n",
+						"if \"GPU\" in device.value or \"NPU\" in device.value:\n",
+						"    ov_model.reshape({0: [1, 3, 640, 640]})\n",
+						"ov_config = {}\n",
+						"if \"GPU\" in device.value:\n",
+						"    ov_config = {\"GPU_DISABLE_WINOGRAD_CONVOLUTION\": \"YES\"}\n",
+						"\n",
+						"quantized_det_model = core.read_model(int8_model_det_path)\n",
+						"quantized_det_compiled_model = core.compile_model(quantized_det_model, device.value, ov_config)\n",
+						"\n",
+						"ov_yolo_int8_model.predictor.model.ov_compiled_model = quantized_det_compiled_model\n",
+						"\n",
+						"res = ov_yolo_int8_model(IMAGE_PATH,  iou=0.45, conf=0.2)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "51d64c7b-7595-41ca-87dd-4c85308f84d6",
+					"source": [
+						"Image.fromarray(res[0].plot()[:, :, ::-1])"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "c7b70f75-a706-4f24-a487-88a3ad645dd5",
+					"source": [
+						"## Compare the Original and Quantized Models\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "d6561246-a9e0-4cdf-8207-7e2f919d8582",
+					"source": [
+						"### Model size\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "43d84d15-75be-4430-a58b-61cfd8e08dd0",
+					"source": [
+						"ov_model_weights = ov_model_path.with_suffix(\".bin\")\n",
+						"print(f\"Size of FP16 model is {ov_model_weights.stat().st_size / 1024 / 1024:.2f} MB\")\n",
+						"if int8_model_det_path.exists():\n",
+						"    ov_int8_weights = int8_model_det_path.with_suffix(\".bin\")\n",
+						"    print(f\"Size of model with INT8 compressed weights is {ov_int8_weights.stat().st_size / 1024 / 1024:.2f} MB\")\n",
+						"    print(f\"Compression rate for INT8 model: {ov_model_weights.stat().st_size / ov_int8_weights.stat().st_size:.3f}\")"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "f72b3d84-91f3-493c-8f4e-46598ffbd6d1",
+					"source": [
+						"### Performance\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"### FP16 model performance\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "909ea508-e007-4313-ab0f-bfa0e3906176",
+					"source": [
+						"!benchmark_app -m $ov_model_path -d $device.value -api async -shape \"[1,3,640,640]\" -t 15"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "9852a8ef-4c45-43dd-a9ef-53ca6f13c99e",
+					"source": [
+						"### Int8 model performance\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "8254626d-6c4f-4ca3-936f-a7c47e402e03",
+					"source": [
+						"if int8_model_det_path.exists():\n",
+						"    !benchmark_app -m $int8_model_det_path -d $device.value -api async -shape \"[1,3,640,640]\" -t 15"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "12d35bc1-8101-45ea-8bd7-53720b98f5e5",
+					"source": [
+						"## Live demo\n",
+						"[back to top ⬆️](#Table-of-contents:)\n",
+						"\n",
+						"\n",
+						"The following code runs model inference on a video:"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "246bd379-b1d5-4eb2-928f-97c7c2455a92",
+					"source": [
+						"import collections\n",
+						"import time\n",
+						"from IPython import display\n",
+						"import cv2\n",
+						"import numpy as np\n",
+						"\n",
+						"\n",
+						"# Main processing function to run object detection.\n",
+						"def run_object_detection(\n",
+						"    source=0,\n",
+						"    flip=False,\n",
+						"    use_popup=False,\n",
+						"    skip_first_frames=0,\n",
+						"    det_model=ov_yolo_int8_model,\n",
+						"    device=device.value,\n",
+						"):\n",
+						"    player = None\n",
+						"    try:\n",
+						"        # Create a video player to play with target fps.\n",
+						"        player = VideoPlayer(source=source, flip=flip, fps=30, skip_first_frames=skip_first_frames)\n",
+						"        # Start capturing.\n",
+						"        player.start()\n",
+						"        if use_popup:\n",
+						"            title = \"Press ESC to Exit\"\n",
+						"            cv2.namedWindow(winname=title, flags=cv2.WINDOW_GUI_NORMAL | cv2.WINDOW_AUTOSIZE)\n",
+						"\n",
+						"        processing_times = collections.deque()\n",
+						"        while True:\n",
+						"            # Grab the frame.\n",
+						"            frame = player.next()\n",
+						"            if frame is None:\n",
+						"                print(\"Source ended\")\n",
+						"                break\n",
+						"            # If the frame is larger than full HD, reduce size to improve the performance.\n",
+						"            scale = 1280 / max(frame.shape)\n",
+						"            if scale < 1:\n",
+						"                frame = cv2.resize(\n",
+						"                    src=frame,\n",
+						"                    dsize=None,\n",
+						"                    fx=scale,\n",
+						"                    fy=scale,\n",
+						"                    interpolation=cv2.INTER_AREA,\n",
+						"                )\n",
+						"            # Get the results.\n",
+						"            input_image = np.array(frame)\n",
+						"\n",
+						"            start_time = time.time()\n",
+						"            detections = det_model(input_image, iou=0.45, conf=0.2, verbose=False)\n",
+						"            stop_time = time.time()\n",
+						"            frame = detections[0].plot()\n",
+						"\n",
+						"            processing_times.append(stop_time - start_time)\n",
+						"            # Use processing times from last 200 frames.\n",
+						"            if len(processing_times) > 200:\n",
+						"                processing_times.popleft()\n",
+						"\n",
+						"            _, f_width = frame.shape[:2]\n",
+						"            # Mean processing time [ms].\n",
+						"            processing_time = np.mean(processing_times) * 1000\n",
+						"            fps = 1000 / processing_time\n",
+						"            cv2.putText(\n",
+						"                img=frame,\n",
+						"                text=f\"Inference time: {processing_time:.1f}ms ({fps:.1f} FPS)\",\n",
+						"                org=(20, 40),\n",
+						"                fontFace=cv2.FONT_HERSHEY_COMPLEX,\n",
+						"                fontScale=f_width / 1000,\n",
+						"                color=(0, 0, 255),\n",
+						"                thickness=1,\n",
+						"                lineType=cv2.LINE_AA,\n",
+						"            )\n",
+						"            # Use this workaround if there is flickering.\n",
+						"            if use_popup:\n",
+						"                cv2.imshow(winname=title, mat=frame)\n",
+						"                key = cv2.waitKey(1)\n",
+						"                # escape = 27\n",
+						"                if key == 27:\n",
+						"                    break\n",
+						"            else:\n",
+						"                # Encode numpy array to jpg.\n",
+						"                _, encoded_img = cv2.imencode(ext=\".jpg\", img=frame, params=[cv2.IMWRITE_JPEG_QUALITY, 100])\n",
+						"                # Create an IPython image.\n",
+						"                i = display.Image(data=encoded_img)\n",
+						"                # Display the image in this notebook.\n",
+						"                display.clear_output(wait=True)\n",
+						"                display.display(i)\n",
+						"    # ctrl-c\n",
+						"    except KeyboardInterrupt:\n",
+						"        print(\"Interrupted\")\n",
+						"    # any different error\n",
+						"    except RuntimeError as e:\n",
+						"        print(e)\n",
+						"    finally:\n",
+						"        if player is not None:\n",
+						"            # Stop capturing.\n",
+						"            player.stop()\n",
+						"        if use_popup:\n",
+						"            cv2.destroyAllWindows()"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "8db930f4-fc41-4635-9248-deab2b6cfcb8",
+					"source": [
+						"use_int8 = widgets.Checkbox(\n",
+						"    value=ov_yolo_int8_model is not None,\n",
+						"    description=\"Use int8 model\",\n",
+						"    disabled=ov_yolo_int8_model is None,\n",
+						")\n",
+						"\n",
+						"use_int8"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "59e37135-1bdc-40ff-8789-b5b4491cab84",
+					"source": [
+						"WEBCAM_INFERENCE = False\n",
+						"\n",
+						"if WEBCAM_INFERENCE:\n",
+						"    VIDEO_SOURCE = 0  # Webcam\n",
+						"else:\n",
+						"    download_file(\n",
+						"        \"https://storage.openvinotoolkit.org/repositories/openvino_notebooks/data/data/video/people.mp4\",\n",
+						"        directory=\"data\",\n",
+						"    )\n",
+						"    VIDEO_SOURCE = \"data/people.mp4\""
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "88c6f47c-1c47-451d-89ba-0a29760f5ec4",
+					"source": [
+						"run_object_detection(\n",
+						"    det_model=ov_yolo_model if not use_int8.value else ov_yolo_int8_model,\n",
+						"    source=VIDEO_SOURCE,\n",
+						"    flip=True,\n",
+						"    use_popup=False,\n",
+						")"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"id": "9f612d80-68e2-45f8-aa62-9f3a05ca9de8",
+					"source": [
+						"### Gradio Interactive Demo\n",
+						"[back to top ⬆️](#Table-of-contents:)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "2e5a6249",
+					"source": [
+						"def yolov10_inference(image, int8, conf_threshold, iou_threshold):\n",
+						"    model = ov_yolo_model if not int8 else ov_yolo_int8_model\n",
+						"    results = model(source=image, iou=iou_threshold, conf=conf_threshold, verbose=False)[0]\n",
+						"    annotated_image = Image.fromarray(results.plot())\n",
+						"\n",
+						"    return annotated_image"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "ffdbe248-7086-4804-b4b9-c3dd454bf80c",
+					"source": [
+						"if not Path(\"gradio_helper.py\").exists():\n",
+						"    r = requests.get(url=\"https://raw.githubusercontent.com/openvinotoolkit/openvino_notebooks/latest/notebooks/yolov10-optimization/gradio_helper.py\")\n",
+						"    open(\"gradio_helper.py\", \"w\").write(r.text)\n",
+						"\n",
+						"from gradio_helper import make_demo\n",
+						"\n",
+						"demo = make_demo(fn=yolov10_inference, quantized=ov_yolo_int8_model is not None)\n",
+						"\n",
+						"try:\n",
+						"    demo.launch(debug=True)\n",
+						"except Exception:\n",
+						"    demo.launch(debug=True, share=True)\n",
+						"# If you are launching remotely, specify server_name and server_port\n",
+						"# EXAMPLE: `demo.launch(server_name='your server name', server_port='server port in int')`\n",
+						"# To learn more please refer to the Gradio docs: https://gradio.app/docs/"
+					]
+				},
+				{
+					"cell_type": "code",
+					"id": "4b123c5e",
+					"source": [
+						"# please uncomment and run this cell for stopping gradio interface\n",
+						"# demo.close()"
+					]
+				}
+			].map(fromJupyterCell)
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: 4 },
+			{ modified: 5, original: 5 },
+			{ modified: 6, original: 6 },
+			{ modified: 7, original: 7 },
+			{ modified: 8, original: 8 },
+			{ modified: 9, original: 9 },
+			{ modified: 10, original: 10 },
+			{ modified: 11, original: 11 },
+			{ modified: 12, original: 12 },
+			{ modified: 13, original: 13 },
+			{ modified: 14, original: 14 },
+			{ modified: 15, original: 15 },
+			{ modified: 16, original: 16 },
+			{ modified: 17, original: 17 },
+			{ modified: 18, original: 18 },
+			{ modified: 19, original: 19 },
+			{ modified: 20, original: 20 },
+			{ modified: 21, original: 21 },
+			{ modified: 22, original: 22 },
+			{ modified: 23, original: 23 },
+			{ modified: 24, original: 24 },
+			{ modified: 25, original: 25 },
+			{ modified: 26, original: 26 },
+			{ modified: 27, original: 27 },
+			{ modified: 28, original: 28 },
+			{ modified: 29, original: 29 },
+			{ modified: 30, original: 30 },
+			{ modified: 31, original: 31 },
+			{ modified: 32, original: 32 },
+			{ modified: 33, original: 33 },
+			{ modified: 34, original: 34 },
+			{ modified: 35, original: 35 },
+			{ modified: 36, original: 36 },
+			{ modified: 37, original: 37 },
+			{ modified: 38, original: 38 },
+			{ modified: 39, original: 39 },
+			{ modified: 40, original: 40 },
+			{ modified: 41, original: 41 },
+			{ modified: 42, original: 42 },
+			{ modified: 43, original: 43 },
+			{ modified: 44, original: 44 },
+			{ modified: 45, original: 45 },
+			{ modified: 46, original: 46 },
+			{ modified: 47, original: 47 },
+			{ modified: 48, original: 48 },
+			{ modified: 49, original: 49 },
+			{ modified: 50, original: 50 },
+			{ modified: 51, original: 51 },
+			{ modified: 52, original: 52 },
+			{ modified: 53, original: -1 },
+			{ modified: 54, original: -1 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 52, originalLength: 1, modifiedStart: 52, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 53, originalLength: 0, modifiedStart: 53, modifiedLength: 2 } satisfies IDiffChange,
+		]);
+
+	});
+	test('Misalignment due to 2 deleted cells', async () => {
+		const { mapping, diff } = await mapCells(
+			[
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "F0Wut2G5kz2Z"
+					},
+					"source": [
+						"[![Roboflow Notebooks](https://ik.imagekit.io/roboflow/notebooks/template/bannertest2-2.png?ik-sdk-version=javascript-1.4.3&updatedAt=1672932710194)](https://github.com/roboflow/notebooks)\n",
+						"\n",
+						"# Fast Segment Anything Model (FastSAM)\n",
+						"\n",
+						"---\n",
+						"\n",
+						"[![GitHub](https://badges.aleen42.com/src/github.svg)](https://github.com/CASIA-IVA-Lab/FastSAM)\n",
+						"[![arXiv](https://img.shields.io/badge/arXiv-2306.12156-b31b1b.svg)](https://arxiv.org/pdf/2306.12156.pdf)\n",
+						"[![YouTube](https://badges.aleen42.com/src/youtube.svg)](https://youtu.be/yHNPyqazYYU)\n",
+						"[![Roboflow](https://raw.githubusercontent.com/roboflow-ai/notebooks/main/assets/badges/roboflow-blogpost.svg)](https://blog.roboflow.com/how-to-use-fastsam)\n",
+						"\n",
+						"The Fast Segment Anything Model (FastSAM) is a CNN Segment Anything Model trained by only 2% of the SA-1B dataset published by SAM authors.\n",
+						"\n",
+						"![fast-segment-anything-model-figure-1](https://media.roboflow.com/notebooks/examples/fast-sam-figure-1.png)\n",
+						"\n",
+						"The FastSAM authors claim it achieves comparable performance to the SAM method at 50 times the speed.\n",
+						"\n",
+						"![fast-segment-anything-model-figure-2](https://media.roboflow.com/notebooks/examples/fast-sam-figure-2.png)\n",
+						"\n",
+						"## Complementary Materials Covering SAM\n",
+						"\n",
+						"---\n",
+						"\n",
+						"[![GitHub](https://badges.aleen42.com/src/github.svg)](https://github.com/facebookresearch/segment-anything)\n",
+						"[![arXiv](https://img.shields.io/badge/arXiv-2304.02643-b31b1b.svg)](https://arxiv.org/abs/2304.02643)\n",
+						"[![Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/roboflow-ai/notebooks/blob/main/notebooks/how-to-segment-anything-with-sam.ipynb)\n",
+						"[![YouTube](https://badges.aleen42.com/src/youtube.svg)](https://youtu.be/D-D6ZmadzPE)\n",
+						"[![Roboflow](https://raw.githubusercontent.com/roboflow-ai/notebooks/main/assets/badges/roboflow-blogpost.svg)](https://blog.roboflow.com/how-to-use-segment-anything-model-sam)\n",
+						"\n",
+						"## Steps in this Tutorial\n",
+						"\n",
+						"In this tutorial, we are going to cover:\n",
+						"\n",
+						"- Before you start\n",
+						"- Install FastSAM, SAM, and other dependencies\n",
+						"- Download FastSAM and SAM weights\n",
+						"- Download example data\n",
+						"- Imports\n",
+						"- Load FastSAM\n",
+						"- FastSAM inference\n",
+						"- FastSAM box prompt inference\n",
+						"- FastSAM point prompt inference\n",
+						"- FastSAM text prompt inference\n",
+						"- SAM vs FastSAM\n",
+						"- Roboflow benchmark dataset\n",
+						"\n",
+						"## 🔥 Let's begin!"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "W4u6KjiVdNZM"
+					},
+					"source": [
+						"## Before you start\n",
+						"\n",
+						"Let's make sure that we have access to GPU. We can use `nvidia-smi` command to do that. In case of any problems navigate to `Edit` -> `Notebook settings` -> `Hardware accelerator`, set it to `GPU`, and then click `Save`."
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "Frcrk09FhJeV",
+						"outputId": "683a378e-4a8f-4239-901b-037279e92e2b"
+					},
+					"outputs": [],
+					"source": [
+						"!nvidia-smi"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "PUACTM2zdmJI"
+					},
+					"source": [
+						"**NOTE:** To make it easier for us to manage datasets, images and models we create a `HOME` constant."
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "PRtHQpTNdnm7",
+						"outputId": "2824c70d-dcf9-4006-b32d-adc6797fd708"
+					},
+					"outputs": [],
+					"source": [
+						"import os\n",
+						"HOME = os.getcwd()\n",
+						"print(\"HOME:\", HOME)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "YN3DPGZSn57p"
+					},
+					"source": [
+						"## Install FastSAM, SAM, and other dependencies"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "Vr3kcq1KfFir",
+						"outputId": "234e5336-ba28-4114-d9e7-efd7f2752ca8"
+					},
+					"outputs": [],
+					"source": [
+						"%cd {HOME}\n",
+						"\n",
+						"# install FastSAM\n",
+						"!git clone https://github.com/CASIA-IVA-Lab/FastSAM.git\n",
+						"!pip -q install -r FastSAM/requirements.txt\n",
+						"# install CLIP\n",
+						"!pip -q install git+https://github.com/openai/CLIP.git\n",
+						"# install SAM\n",
+						"!pip -q install git+https://github.com/facebookresearch/segment-anything.git\n",
+						"# install other dependencies\n",
+						"!pip -q install roboflow supervision jupyter_bbox_widget"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "BMmgSfDWfFis"
+					},
+					"source": [
+						"## Download FastSAM and SAM weights"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "ADpOBElSfFis",
+						"outputId": "b3d89d4c-e2ad-4f5e-a910-b52695263151"
+					},
+					"outputs": [],
+					"source": [
+						"!mkdir -p {HOME}/weights\n",
+						"!wget -P {HOME}/weights -q https://huggingface.co/spaces/An-619/FastSAM/resolve/main/weights/FastSAM.pt\n",
+						"!wget -P {HOME}/weights -q https://dl.fbaipublicfiles.com/segment_anything/sam_vit_h_4b8939.pth\n",
+						"!ls -lh {HOME}/weights"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"id": "W6w1ck4z72sn"
+					},
+					"outputs": [],
+					"source": [
+						"FAST_SAM_CHECKPOINT_PATH = f\"{HOME}/weights/FastSAM.pt\"\n",
+						"SAM_SAM_CHECKPOINT_PATH = f\"{HOME}/weights/sam_vit_h_4b8939.pth\""
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "t1ef2h1R9WMb"
+					},
+					"source": [
+						"## Download example data\n",
+						"\n",
+						"**NONE:** Let's download few example images. Feel free to use your images or videos."
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "CL4gVrnl9dmR",
+						"outputId": "db8f78d2-eaf4-41de-9d1f-e5fd6b588a87"
+					},
+					"outputs": [],
+					"source": [
+						"!mkdir -p {HOME}/data\n",
+						"!wget -P {HOME}/data -q https://media.roboflow.com/notebooks/examples/dog.jpeg\n",
+						"!wget -P {HOME}/data -q https://media.roboflow.com/notebooks/examples/robot.jpeg\n",
+						"!ls -lh {HOME}/data"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "J_a_icikYiVN"
+					},
+					"source": [
+						"## Imports\n",
+						"\n",
+						"**NOTE:** `FastSAM` code is not distributed via `pip` not it is packaged. Make sure to run code below from `{HOME}/FastSAM` directory. ⚠️"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "u_NVTXOwYppS",
+						"outputId": "b86184de-5827-4b9c-eb5c-959539abe699"
+					},
+					"outputs": [],
+					"source": [
+						"%cd {HOME}/FastSAM\n",
+						"\n",
+						"import os\n",
+						"import cv2\n",
+						"import torch\n",
+						"import roboflow\n",
+						"import base64\n",
+						"\n",
+						"import supervision as sv\n",
+						"import numpy as np\n",
+						"\n",
+						"from roboflow import Roboflow\n",
+						"from fastsam import FastSAM, FastSAMPrompt\n",
+						"from segment_anything import sam_model_registry, SamAutomaticMaskGenerator, SamPredictor"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "a_Iizsy07pb7"
+					},
+					"source": [
+						"## Load FastSAM"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"id": "ao8tVDVq7ebG"
+					},
+					"outputs": [],
+					"source": [
+						"DEVICE = torch.device('cuda:0' if torch.cuda.is_available() else 'cpu')\n",
+						"print(f\"DEVICE = {DEVICE}\")\n",
+						"fast_sam = FastSAM(FAST_SAM_CHECKPOINT_PATH)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "SvsRFtw_--Nn"
+					},
+					"source": [
+						"## FastSAM inference\n",
+						"\n",
+						"* `retina_masks=True` determines whether the model uses retina masks for generating segmentation masks.\n",
+						"* `imgsz=1024` sets the input image size to 1024x1024 pixels for processing by the model.\n",
+						"* `conf=0.4` sets the minimum confidence threshold for object detection.\n",
+						"* `iou=0.9` sets the minimum intersection over union threshold for non-maximum suppression to filter out duplicate detections."
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"id": "L49P5e-0Iaea"
+					},
+					"outputs": [],
+					"source": [
+						"IMAGE_PATH = f\"{HOME}/data/dog.jpeg\""
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"os.makedirs(f\"{HOME}/output\", exist_ok=True)\n",
+						"output_image_path = f\"{HOME}/output/output-{os.path.basename(IMAGE_PATH)}\""
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "KV4XzCg1_fAS",
+						"outputId": "1df75d90-cf73-4d78-feed-01911a81f6e4"
+					},
+					"outputs": [],
+					"source": [
+						"results = fast_sam(\n",
+						"    source=IMAGE_PATH,\n",
+						"    device=DEVICE,\n",
+						"    retina_masks=True,\n",
+						"    imgsz=1024,\n",
+						"    conf=0.4,\n",
+						"    iou=0.9)\n",
+						"prompt_process = FastSAMPrompt(IMAGE_PATH, results, device=DEVICE)\n",
+						"masks = prompt_process.everything_prompt()\n",
+						"prompt_process.plot(annotations=masks, output=f\"{HOME}/output\")"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "uPrxqbaBOBMw"
+					},
+					"source": [
+						"**NOTE:** `prompt_process.everything_prompt` returns `torch.Tensor` when DEVICE = 'cuda:0'. `prompt_process.everything_prompt` returns `numpy.ndarray` when DEVICE = 'cpu'."
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"# Convert masks to boolean (True/False)\n",
+						"def masks_to_bool(masks):\n",
+						"    if type(masks) == np.ndarray:\n",
+						"        masks = masks.astype(bool)\n",
+						"    else:\n",
+						"        masks = masks.cpu().numpy().astype(bool)\n",
+						"    return masks"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"id": "PUJkojNiKBQa"
+					},
+					"outputs": [],
+					"source": [
+						"def annotate_image(image_path: str, masks: np.ndarray) -> np.ndarray:\n",
+						"    image = cv2.imread(image_path)\n",
+						"\n",
+						"    xyxy = sv.mask_to_xyxy(masks=masks)\n",
+						"    detections = sv.Detections(xyxy=xyxy, mask=masks)\n",
+						"\n",
+						"    mask_annotator = sv.MaskAnnotator(color_lookup = sv.ColorLookup.INDEX)\n",
+						"    return mask_annotator.annotate(scene=image.copy(), detections=detections)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 653
+						},
+						"id": "wwtmiH6pLA8N",
+						"outputId": "17948850-f051-4a1f-b2b8-d01c2a1f4f20"
+					},
+					"outputs": [],
+					"source": [
+						"masks = masks_to_bool(masks)\n",
+						"annotated_image=annotate_image(image_path=IMAGE_PATH, masks=masks)\n",
+						"sv.plot_image(image=annotated_image, size=(8, 8))"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "jYkdczKoRUVB"
+					},
+					"source": [
+						"**NOTE:** The quality of the generated masks is quite poor. Let's see if we can improve it by manipulating the parameters."
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "dDFGi6EhO2ul",
+						"outputId": "f5a03357-eb37-446e-dce7-0659e4c2a368"
+					},
+					"outputs": [],
+					"source": [
+						"results = fast_sam(\n",
+						"    source=IMAGE_PATH,\n",
+						"    device=DEVICE,\n",
+						"    retina_masks=True,\n",
+						"    imgsz=1024,\n",
+						"    conf=0.5,\n",
+						"    iou=0.6)\n",
+						"prompt_process = FastSAMPrompt(IMAGE_PATH, results, device=DEVICE)\n",
+						"masks = prompt_process.everything_prompt()"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 653
+						},
+						"id": "OiBPjQW-O59c",
+						"outputId": "afb011fc-933e-4d69-b4dd-e5e2713f407b"
+					},
+					"outputs": [],
+					"source": [
+						"masks = masks_to_bool(masks)\n",
+						"annotated_image=annotate_image(image_path=IMAGE_PATH, masks=masks)\n",
+						"sv.plot_image(image=annotated_image, size=(8, 8))"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "GoymBQ16KJbv"
+					},
+					"source": [
+						"## FastSAM box prompt inference"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "w1_T5SXpMNku"
+					},
+					"source": [
+						"### Draw Box"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"id": "04-1G1WrMJUm"
+					},
+					"outputs": [],
+					"source": [
+						"# helper function that loads an image before adding it to the widget\n",
+						"\n",
+						"def encode_image(filepath):\n",
+						"    with open(filepath, 'rb') as f:\n",
+						"        image_bytes = f.read()\n",
+						"    encoded = str(base64.b64encode(image_bytes), 'utf-8')\n",
+						"    return \"data:image/jpg;base64,\"+encoded"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "xrxd-Ug9MSWG"
+					},
+					"source": [
+						"**NOTE:** Execute cell below and use your mouse to draw bounding box on the image 👇"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 1000,
+							"referenced_widgets": [
+								"a747e095e21448f29d8697fb6b1a7a74",
+								"6401ca8c2f574ba5ab62f0f06b9e0d06"
+							]
+						},
+						"id": "nLA7xmDIMTfx",
+						"outputId": "06b51195-d54f-44ed-9236-258e94d624c5"
+					},
+					"outputs": [],
+					"source": [
+						"IS_COLAB = True\n",
+						"\n",
+						"if IS_COLAB:\n",
+						"    from google.colab import output\n",
+						"    output.enable_custom_widget_manager()\n",
+						"\n",
+						"from jupyter_bbox_widget import BBoxWidget\n",
+						"\n",
+						"widget = BBoxWidget()\n",
+						"widget.image = encode_image(IMAGE_PATH)\n",
+						"widget"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "td6tYT4INOyD",
+						"outputId": "73a4e886-dcb8-447c-d3f7-1b3a6496e44d"
+					},
+					"outputs": [],
+					"source": [
+						"widget.bboxes"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "XfUvm9bwNUAe"
+					},
+					"source": [
+						"### Generate mask with FastSAM"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"id": "bI6kPDSROBI-"
+					},
+					"outputs": [],
+					"source": [
+						"# default_box is going to be used if you will not draw any box on image above\n",
+						"default_box = {'x': 68, 'y': 247, 'width': 555, 'height': 678, 'label': ''}\n",
+						"\n",
+						"box = widget.bboxes[0] if widget.bboxes else default_box\n",
+						"box = [\n",
+						"    box['x'],\n",
+						"    box['y'],\n",
+						"    box['x'] + box['width'],\n",
+						"    box['y'] + box['height']\n",
+						"]"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "LF879hDqO5iB",
+						"outputId": "4e7498c4-4007-4614-d46c-0e35608a04a2"
+					},
+					"outputs": [],
+					"source": [
+						"results = fast_sam(\n",
+						"    source=IMAGE_PATH,\n",
+						"    device=DEVICE,\n",
+						"    retina_masks=True,\n",
+						"    imgsz=1024,\n",
+						"    conf=0.5,\n",
+						"    iou=0.6)\n",
+						"prompt_process = FastSAMPrompt(IMAGE_PATH, results, device=DEVICE)\n",
+						"masks = prompt_process.box_prompt(bbox=box)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "yt6i2sNJPEdk"
+					},
+					"source": [
+						"**NOTE:** `prompt_process.box_prompt` returns `numy.ndarray`"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 653
+						},
+						"id": "EJThTct_PA68",
+						"outputId": "f6eddd24-f603-4702-8325-6cff7925fe0f"
+					},
+					"outputs": [],
+					"source": [
+						"masks = masks_to_bool(masks)\n",
+						"annotated_image=annotate_image(image_path=IMAGE_PATH, masks=masks)\n",
+						"sv.plot_image(image=annotated_image, size=(8, 8))"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "vR-THJthhWH5"
+					},
+					"source": [
+						"## FastSAM point prompt inference"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "xyfpOPPwhpMy"
+					},
+					"source": [
+						"### Select point"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"id": "OC7d3pZ3hop9"
+					},
+					"outputs": [],
+					"source": [
+						"point = [405, 505]"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "rE5tV4e3h6nG"
+					},
+					"source": [
+						"### Generate mask with FastSAM"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "31FIby6Zh-Wa",
+						"outputId": "a12c4d1c-837b-4b1b-9240-664797442413"
+					},
+					"outputs": [],
+					"source": [
+						"results = fast_sam(\n",
+						"    source=IMAGE_PATH,\n",
+						"    device=DEVICE,\n",
+						"    retina_masks=True,\n",
+						"    imgsz=1024,\n",
+						"    conf=0.5,\n",
+						"    iou=0.6)\n",
+						"prompt_process = FastSAMPrompt(IMAGE_PATH, results, device=DEVICE)\n",
+						"masks = prompt_process.point_prompt(points=[point], pointlabel=[1])"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "d7tpVo8CiM3s"
+					},
+					"source": [
+						"**NOTE:** `prompt_process.point_prompt` returns `numy.ndarray`"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 653
+						},
+						"id": "lMVpGxShiPky",
+						"outputId": "224d84ee-e664-400b-c0df-49507d229f62"
+					},
+					"outputs": [],
+					"source": [
+						"masks = masks_to_bool(masks)\n",
+						"annotated_image=annotate_image(image_path=IMAGE_PATH, masks=masks)\n",
+						"sv.plot_image(image=annotated_image, size=(8, 8))"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "HOC7v6ATHEr6"
+					},
+					"source": [
+						"## FastSAM text prompt inference"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "4CzLLtXOHeGk",
+						"outputId": "cecc50d8-e2be-4b33-850a-a2442e3e30b6"
+					},
+					"outputs": [],
+					"source": [
+						"results = fast_sam(\n",
+						"    source=IMAGE_PATH,\n",
+						"    device=DEVICE,\n",
+						"    retina_masks=True,\n",
+						"    imgsz=1024,\n",
+						"    conf=0.5,\n",
+						"    iou=0.6)\n",
+						"prompt_process = FastSAMPrompt(IMAGE_PATH, results, device=DEVICE)\n",
+						"masks = prompt_process.text_prompt(text='cap')"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "KYW79zD0OKsv"
+					},
+					"source": [
+						"**NOTE:** `prompt_process.text_prompt` returns `numy.ndarray`"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 653
+						},
+						"id": "zODY5xU1LMCb",
+						"outputId": "a01540a7-deb3-4555-916c-2ac59928e0f3"
+					},
+					"outputs": [],
+					"source": [
+						"masks = masks_to_bool(masks)\n",
+						"annotated_image=annotate_image(image_path=IMAGE_PATH, masks=masks)\n",
+						"sv.plot_image(image=annotated_image, size=(8, 8))"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "XFOUWUMZEk7m"
+					},
+					"source": [
+						"##  SAM vs FastSAM"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"id": "7PKBZ7Hhahhw"
+					},
+					"outputs": [],
+					"source": [
+						"IMAGE_PATH = f\"{HOME}/data/robot.jpeg\""
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "c48hRY7dVJeL"
+					},
+					"source": [
+						"### Load SAM"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"id": "PdKpFCCmaETG"
+					},
+					"outputs": [],
+					"source": [
+						"MODEL_TYPE = \"vit_h\"\n",
+						"\n",
+						"sam = sam_model_registry[MODEL_TYPE](checkpoint=SAM_SAM_CHECKPOINT_PATH).to(device=DEVICE)\n",
+						"mask_generator = SamAutomaticMaskGenerator(sam)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "V5bPGvtBaewO"
+					},
+					"source": [
+						"### SAM inference"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"id": "0HgWsk1yalow"
+					},
+					"outputs": [],
+					"source": [
+						"image_bgr = cv2.imread(IMAGE_PATH)\n",
+						"image_rgb = cv2.cvtColor(image_bgr, cv2.COLOR_BGR2RGB)\n",
+						"\n",
+						"sam_result = mask_generator.generate(image_rgb)\n",
+						"sam_detections = sv.Detections.from_sam(sam_result=sam_result)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "t03RrSzMasN6"
+					},
+					"source": [
+						"### FastSAM inference"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "xuFGLw8MavQI",
+						"outputId": "b0118973-1e29-419d-b7c0-2933b97d7ce5"
+					},
+					"outputs": [],
+					"source": [
+						"results = fast_sam(\n",
+						"    source=IMAGE_PATH,\n",
+						"    device=DEVICE,\n",
+						"    retina_masks=True,\n",
+						"    imgsz=1024,\n",
+						"    conf=0.5,\n",
+						"    iou=0.6)\n",
+						"prompt_process = FastSAMPrompt(IMAGE_PATH, results, device=DEVICE)\n",
+						"masks = prompt_process.everything_prompt()\n",
+						"masks = masks_to_bool(masks)\n",
+						"xyxy = sv.mask_to_xyxy(masks=masks)\n",
+						"fast_sam_detections = sv.Detections(xyxy=xyxy, mask=masks)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "IYn8xKySbBnc"
+					},
+					"source": [
+						"### FastSAM vs. SAM"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 321
+						},
+						"id": "c2Qj7sLjbDvo",
+						"outputId": "e85e3ed3-8b90-409d-cf95-877a6a9b2034"
+					},
+					"outputs": [],
+					"source": [
+						"mask_annotator = sv.MaskAnnotator(color_lookup = sv.ColorLookup.INDEX)\n",
+						"\n",
+						"sam_result = mask_annotator.annotate(scene=image_bgr.copy(), detections=sam_detections)\n",
+						"fast_sam_result = mask_annotator.annotate(scene=image_bgr.copy(), detections=fast_sam_detections)\n",
+						"\n",
+						"sv.plot_images_grid(\n",
+						"    images=[sam_result, fast_sam_result],\n",
+						"    grid_size=(1, 2),\n",
+						"    titles=['SAM', 'FastSAM']\n",
+						")"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "MfU4NQiGWQMC"
+					},
+					"source": [
+						"**NOTE:** There is a lot going on in our test image. Let's plot our masks against a blank background."
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 321
+						},
+						"id": "PIrywlF5QRPz",
+						"outputId": "8e7c84ae-7869-4523-847a-0678fd1aea53"
+					},
+					"outputs": [],
+					"source": [
+						"mask_annotator = sv.MaskAnnotator(color_lookup = sv.ColorLookup.INDEX)\n",
+						"\n",
+						"sam_result = mask_annotator.annotate(scene=np.zeros_like(image_bgr), detections=sam_detections)\n",
+						"fast_sam_result = mask_annotator.annotate(scene=np.zeros_like(image_bgr), detections=fast_sam_detections)\n",
+						"\n",
+						"sv.plot_images_grid(\n",
+						"    images=[sam_result, fast_sam_result],\n",
+						"    grid_size=(1, 2),\n",
+						"    titles=['SAM', 'FastSAM']\n",
+						")"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "51Fs3sDGQmIt"
+					},
+					"source": [
+						"### Mask diff\n",
+						"\n",
+						"**NOTE:** Let's try to understand which masks generated by SAM were not generated by FastSAM."
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"id": "O5bIUAhYQrqZ"
+					},
+					"outputs": [],
+					"source": [
+						"def compute_iou(mask1, mask2):\n",
+						"    intersection = np.logical_and(mask1, mask2)\n",
+						"    union = np.logical_or(mask1, mask2)\n",
+						"    return np.sum(intersection) / np.sum(union)\n",
+						"\n",
+						"def filter_masks(mask_array1, mask_array2, threshold):\n",
+						"    return np.array([mask1 for mask1 in mask_array1 if max(compute_iou(mask1, mask2) for mask2 in mask_array2) < threshold])"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 420
+						},
+						"id": "1GM4bL9sRbOm",
+						"outputId": "421fb4f5-7a42-461b-ba1e-7cd46d2d7bd7"
+					},
+					"outputs": [],
+					"source": [
+						"diff_masks = filter_masks(sam_detections.mask, fast_sam_detections.mask, 0.5)\n",
+						"diff_xyxy = sv.mask_to_xyxy(masks=diff_masks)\n",
+						"diff_detections = sv.Detections(xyxy=diff_xyxy, mask=diff_masks)\n",
+						"\n",
+						"mask_annotator = sv.MaskAnnotator(color_lookup = sv.ColorLookup.INDEX)\n",
+						"diff_result = mask_annotator.annotate(scene=np.zeros_like(image_bgr), detections=diff_detections)\n",
+						"sv.plot_image(image=diff_result, size=(8, 8))"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "0lPZAZZulhF8"
+					},
+					"source": [
+						"## Roboflow Benchmark Dataset"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "LWN6XwPuSZBY",
+						"outputId": "86b18c0e-f6d6-486b-eee6-d004f13f531e"
+					},
+					"outputs": [],
+					"source": [
+						"%cd {HOME}\n",
+						"\n",
+						"roboflow.login()\n",
+						"rf = Roboflow()\n",
+						"\n",
+						"project = rf.workspace(\"roboticfish\").project(\"underwater_object_detection\")\n",
+						"dataset = project.version(10).download(\"yolov8\")"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"id": "T6-PaxWXTZ69"
+					},
+					"outputs": [],
+					"source": [
+						"IMAGE_PATH = os.path.join(dataset.location, 'train', 'images', 'IMG_2311_jpeg_jpg.rf.09ae6820eaff21dc838b1f9b6b20342b.jpg')"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "p-gY5jf1Tife",
+						"outputId": "630d35d8-26f4-4342-8d82-c7b61be26fe8"
+					},
+					"outputs": [],
+					"source": [
+						"results = fast_sam(\n",
+						"    source=IMAGE_PATH,\n",
+						"    device=DEVICE,\n",
+						"    retina_masks=True,\n",
+						"    imgsz=1024,\n",
+						"    conf=0.5,\n",
+						"    iou=0.6)\n",
+						"prompt_process = FastSAMPrompt(IMAGE_PATH, results, device=DEVICE)\n",
+						"masks = prompt_process.text_prompt(text='Penguin')"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 653
+						},
+						"id": "3tBIH0yubHsW",
+						"outputId": "fc4d0a6a-53c1-4a2b-91f0-75c8f78e10fd"
+					},
+					"outputs": [],
+					"source": [
+						"masks = masks_to_bool(masks)\n",
+						"annotated_image=annotate_image(image_path=IMAGE_PATH, masks=masks)\n",
+						"sv.plot_image(image=annotated_image, size=(8, 8))"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "gP9gEw9Tp8GJ"
+					},
+					"source": [
+						"## 🏆 Congratulations\n",
+						"\n",
+						"### Learning Resources\n",
+						"\n",
+						"Roboflow has produced many resources that you may find interesting as you advance your knowledge of computer vision:\n",
+						"\n",
+						"- [Roboflow Notebooks](https://github.com/roboflow/notebooks): A repository of over 20 notebooks that walk through how to train custom models with a range of model types, from YOLOv7 to SegFormer.\n",
+						"- [Roboflow YouTube](https://www.youtube.com/c/Roboflow): Our library of videos featuring deep dives into the latest in computer vision, detailed tutorials that accompany our notebooks, and more.\n",
+						"- [Roboflow Discuss](https://discuss.roboflow.com/): Have a question about how to do something on Roboflow? Ask your question on our discussion forum.\n",
+						"- [Roboflow Models](https://roboflow.com): Learn about state-of-the-art models and their performance. Find links and tutorials to guide your learning.\n",
+						"\n",
+						"### Convert data formats\n",
+						"\n",
+						"Roboflow provides free utilities to convert data between dozens of popular computer vision formats. Check out [Roboflow Formats](https://roboflow.com/formats) to find tutorials on how to convert data between formats in a few clicks.\n",
+						"\n",
+						"### Connect computer vision to your project logic\n",
+						"\n",
+						"[Roboflow Templates](https://roboflow.com/templates) is a public gallery of code snippets that you can use to connect computer vision to your project logic. Code snippets range from sending emails after inference to measuring object distance between detections."
+					]
+				}
+			]
+				.map(fromJupyterCell)
+			,
+			[
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "F0Wut2G5kz2Z"
+					},
+					"source": [
+						"[![Roboflow Notebooks](https://ik.imagekit.io/roboflow/notebooks/template/bannertest2-2.png?ik-sdk-version=javascript-1.4.3&updatedAt=1672932710194)](https://github.com/roboflow/notebooks)\n",
+						"\n",
+						"# Fast Segment Anything Model (FastSAM)\n",
+						"\n",
+						"---\n",
+						"\n",
+						"[![GitHub](https://badges.aleen42.com/src/github.svg)](https://github.com/CASIA-IVA-Lab/FastSAM)\n",
+						"[![arXiv](https://img.shields.io/badge/arXiv-2306.12156-b31b1b.svg)](https://arxiv.org/pdf/2306.12156.pdf)\n",
+						"[![YouTube](https://badges.aleen42.com/src/youtube.svg)](https://youtu.be/yHNPyqazYYU)\n",
+						"[![Roboflow](https://raw.githubusercontent.com/roboflow-ai/notebooks/main/assets/badges/roboflow-blogpost.svg)](https://blog.roboflow.com/how-to-use-fastsam)\n",
+						"\n",
+						"The Fast Segment Anything Model (FastSAM) is a CNN Segment Anything Model trained by only 2% of the SA-1B dataset published by SAM authors.\n",
+						"\n",
+						"![fast-segment-anything-model-figure-1](https://media.roboflow.com/notebooks/examples/fast-sam-figure-1.png)\n",
+						"\n",
+						"The FastSAM authors claim it achieves comparable performance to the SAM method at 50 times the speed.\n",
+						"\n",
+						"![fast-segment-anything-model-figure-2](https://media.roboflow.com/notebooks/examples/fast-sam-figure-2.png)\n",
+						"\n",
+						"## Complementary Materials Covering SAM\n",
+						"\n",
+						"---\n",
+						"\n",
+						"[![GitHub](https://badges.aleen42.com/src/github.svg)](https://github.com/facebookresearch/segment-anything)\n",
+						"[![arXiv](https://img.shields.io/badge/arXiv-2304.02643-b31b1b.svg)](https://arxiv.org/abs/2304.02643)\n",
+						"[![Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/roboflow-ai/notebooks/blob/main/notebooks/how-to-segment-anything-with-sam.ipynb)\n",
+						"[![YouTube](https://badges.aleen42.com/src/youtube.svg)](https://youtu.be/D-D6ZmadzPE)\n",
+						"[![Roboflow](https://raw.githubusercontent.com/roboflow-ai/notebooks/main/assets/badges/roboflow-blogpost.svg)](https://blog.roboflow.com/how-to-use-segment-anything-model-sam)\n",
+						"\n",
+						"## Steps in this Tutorial\n",
+						"\n",
+						"In this tutorial, we are going to cover:\n",
+						"\n",
+						"- Before you start\n",
+						"- Install FastSAM, SAM, and other dependencies\n",
+						"- Download FastSAM and SAM weights\n",
+						"- Download example data\n",
+						"- Imports\n",
+						"- Load FastSAM\n",
+						"- FastSAM inference\n",
+						"- FastSAM box prompt inference\n",
+						"- FastSAM point prompt inference\n",
+						"- FastSAM text prompt inference\n",
+						"- SAM vs FastSAM\n",
+						"- Roboflow benchmark dataset\n",
+						"\n",
+						"## 🔥 Let's begin!"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "W4u6KjiVdNZM"
+					},
+					"source": [
+						"## Before you start\n",
+						"\n",
+						"Let's make sure that we have access to GPU. We can use `nvidia-smi` command to do that. In case of any problems navigate to `Edit` -> `Notebook settings` -> `Hardware accelerator`, set it to `GPU`, and then click `Save`."
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "Frcrk09FhJeV",
+						"outputId": "683a378e-4a8f-4239-901b-037279e92e2b"
+					},
+					"source": [
+						"!nvidia-smi"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "PUACTM2zdmJI"
+					},
+					"source": [
+						"**NOTE:** To make it easier for us to manage datasets, images and models we create a `HOME` constant."
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "PRtHQpTNdnm7",
+						"outputId": "2824c70d-dcf9-4006-b32d-adc6797fd708"
+					},
+					"source": [
+						"import os\n",
+						"HOME = os.getcwd()\n",
+						"print(\"HOME:\", HOME)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "YN3DPGZSn57p"
+					},
+					"source": [
+						"## Install FastSAM, SAM, and other dependencies"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "Vr3kcq1KfFir",
+						"outputId": "234e5336-ba28-4114-d9e7-efd7f2752ca8"
+					},
+					"source": [
+						"%cd {HOME}\n",
+						"\n",
+						"# install FastSAM\n",
+						"!git clone https://github.com/CASIA-IVA-Lab/FastSAM.git\n",
+						"!pip -q install -r FastSAM/requirements.txt\n",
+						"# install CLIP\n",
+						"!pip -q install git+https://github.com/openai/CLIP.git\n",
+						"# install SAM\n",
+						"!pip -q install git+https://github.com/facebookresearch/segment-anything.git\n",
+						"# install other dependencies\n",
+						"!pip -q install roboflow supervision jupyter_bbox_widget"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "BMmgSfDWfFis"
+					},
+					"source": [
+						"## Download FastSAM and SAM weights"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "ADpOBElSfFis",
+						"outputId": "b3d89d4c-e2ad-4f5e-a910-b52695263151"
+					},
+					"source": [
+						"!mkdir -p {HOME}/weights\n",
+						"!wget -P {HOME}/weights -q https://huggingface.co/spaces/An-619/FastSAM/resolve/main/weights/FastSAM.pt\n",
+						"!wget -P {HOME}/weights -q https://dl.fbaipublicfiles.com/segment_anything/sam_vit_h_4b8939.pth\n",
+						"!ls -lh {HOME}/weights"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"id": "W6w1ck4z72sn"
+					},
+					"source": [
+						"FAST_SAM_CHECKPOINT_PATH = f\"{HOME}/weights/FastSAM.pt\"\n",
+						"SAM_SAM_CHECKPOINT_PATH = f\"{HOME}/weights/sam_vit_h_4b8939.pth\""
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "t1ef2h1R9WMb"
+					},
+					"source": [
+						"## Download example data\n",
+						"\n",
+						"**NONE:** Let's download few example images. Feel free to use your images or videos."
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "CL4gVrnl9dmR",
+						"outputId": "db8f78d2-eaf4-41de-9d1f-e5fd6b588a87"
+					},
+					"source": [
+						"!mkdir -p {HOME}/data\n",
+						"!wget -P {HOME}/data -q https://media.roboflow.com/notebooks/examples/dog.jpeg\n",
+						"!wget -P {HOME}/data -q https://media.roboflow.com/notebooks/examples/robot.jpeg\n",
+						"!ls -lh {HOME}/data"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "J_a_icikYiVN"
+					},
+					"source": [
+						"## Imports\n",
+						"\n",
+						"**NOTE:** `FastSAM` code is not distributed via `pip` not it is packaged. Make sure to run code balow from `{HOME}/FastSAM` directory. ⚠️"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "u_NVTXOwYppS",
+						"outputId": "b86184de-5827-4b9c-eb5c-959539abe699"
+					},
+					"source": [
+						"%cd {HOME}/FastSAM\n",
+						"\n",
+						"import os\n",
+						"import cv2\n",
+						"import torch\n",
+						"import roboflow\n",
+						"import base64\n",
+						"\n",
+						"import supervision as sv\n",
+						"import numpy as np\n",
+						"\n",
+						"from roboflow import Roboflow\n",
+						"from fastsam import FastSAM, FastSAMPrompt\n",
+						"from segment_anything import sam_model_registry, SamAutomaticMaskGenerator, SamPredictor"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "a_Iizsy07pb7"
+					},
+					"source": [
+						"## Load FastSAM"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"id": "ao8tVDVq7ebG"
+					},
+					"source": [
+						"DEVICE = torch.device('cuda:0' if torch.cuda.is_available() else 'cpu')\n",
+						"\n",
+						"fast_sam = FastSAM(FAST_SAM_CHECKPOINT_PATH)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "SvsRFtw_--Nn"
+					},
+					"source": [
+						"## FastSAM inference\n",
+						"\n",
+						"* `retina_masks=True` determines whether the model uses retina masks for generating segmentation masks.\n",
+						"* `imgsz=1024` sets the input image size to 1024x1024 pixels for processing by the model.\n",
+						"* `conf=0.4` sets the minimum confidence threshold for object detection.\n",
+						"* `iou=0.9` sets the minimum intersection over union threshold for non-maximum suppression to filter out duplicate detections."
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"id": "L49P5e-0Iaea"
+					},
+					"source": [
+						"IMAGE_PATH = f\"{HOME}/data/dog.jpeg\""
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "KV4XzCg1_fAS",
+						"outputId": "1df75d90-cf73-4d78-feed-01911a81f6e4"
+					},
+					"source": [
+						"results = fast_sam(\n",
+						"    source=IMAGE_PATH,\n",
+						"    device=DEVICE,\n",
+						"    retina_masks=True,\n",
+						"    imgsz=1024,\n",
+						"    conf=0.4,\n",
+						"    iou=0.9)\n",
+						"prompt_process = FastSAMPrompt(IMAGE_PATH, results, device=DEVICE)\n",
+						"masks = prompt_process.everything_prompt()\n",
+						"prompt_process.plot(annotations=masks, output=f\"{HOME}/output\")"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "uPrxqbaBOBMw"
+					},
+					"source": [
+						"**NOTE:** `prompt_process.everything_prompt` returns `torch.Tensor`"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"id": "PUJkojNiKBQa"
+					},
+					"source": [
+						"def annotate_image(image_path: str, masks: np.ndarray) -> np.ndarray:\n",
+						"    image = cv2.imread(image_path)\n",
+						"\n",
+						"    xyxy = sv.mask_to_xyxy(masks=masks)\n",
+						"    detections = sv.Detections(xyxy=xyxy, mask=masks)\n",
+						"\n",
+						"    mask_annotator = sv.MaskAnnotator()\n",
+						"    return mask_annotator.annotate(scene=image.copy(), detections=detections)"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 653
+						},
+						"id": "wwtmiH6pLA8N",
+						"outputId": "17948850-f051-4a1f-b2b8-d01c2a1f4f20"
+					},
+					"source": [
+						"masks = masks.cpu().numpy().astype(bool)\n",
+						"annotated_image=annotate_image(image_path=IMAGE_PATH, masks=masks)\n",
+						"sv.plot_image(image=annotated_image, size=(8, 8))"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "jYkdczKoRUVB"
+					},
+					"source": [
+						"**NOTE:** The quality of the generated masks is quite poor. Let's see if we can improve it by manipulating the parameters."
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "dDFGi6EhO2ul",
+						"outputId": "f5a03357-eb37-446e-dce7-0659e4c2a368"
+					},
+					"source": [
+						"results = fast_sam(\n",
+						"    source=IMAGE_PATH,\n",
+						"    device=DEVICE,\n",
+						"    retina_masks=True,\n",
+						"    imgsz=1024,\n",
+						"    conf=0.5,\n",
+						"    iou=0.6)\n",
+						"prompt_process = FastSAMPrompt(IMAGE_PATH, results, device=DEVICE)\n",
+						"masks = prompt_process.everything_prompt()"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 653
+						},
+						"id": "OiBPjQW-O59c",
+						"outputId": "afb011fc-933e-4d69-b4dd-e5e2713f407b"
+					},
+					"source": [
+						"masks = masks.cpu().numpy().astype(bool)\n",
+						"annotated_image=annotate_image(image_path=IMAGE_PATH, masks=masks)\n",
+						"sv.plot_image(image=annotated_image, size=(8, 8))"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "GoymBQ16KJbv"
+					},
+					"source": [
+						"## FastSAM box prompt inference"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "w1_T5SXpMNku"
+					},
+					"source": [
+						"### Draw Box"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"id": "04-1G1WrMJUm"
+					},
+					"source": [
+						"# helper function that loads an image before adding it to the widget\n",
+						"\n",
+						"def encode_image(filepath):\n",
+						"    with open(filepath, 'rb') as f:\n",
+						"        image_bytes = f.read()\n",
+						"    encoded = str(base64.b64encode(image_bytes), 'utf-8')\n",
+						"    return \"data:image/jpg;base64,\"+encoded"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "xrxd-Ug9MSWG"
+					},
+					"source": [
+						"**NOTE:** Execute cell below and use your mouse to draw bounding box on the image 👇"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 1000,
+							"referenced_widgets": [
+								"a747e095e21448f29d8697fb6b1a7a74",
+								"6401ca8c2f574ba5ab62f0f06b9e0d06"
+							]
+						},
+						"id": "nLA7xmDIMTfx",
+						"outputId": "06b51195-d54f-44ed-9236-258e94d624c5"
+					},
+					"source": [
+						"IS_COLAB = True\n",
+						"\n",
+						"if IS_COLAB:\n",
+						"    from google.colab import output\n",
+						"    output.enable_custom_widget_manager()\n",
+						"\n",
+						"from jupyter_bbox_widget import BBoxWidget\n",
+						"\n",
+						"widget = BBoxWidget()\n",
+						"widget.image = encode_image(IMAGE_PATH)\n",
+						"widget"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "td6tYT4INOyD",
+						"outputId": "73a4e886-dcb8-447c-d3f7-1b3a6496e44d"
+					},
+					"source": [
+						"widget.bboxes"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "XfUvm9bwNUAe"
+					},
+					"source": [
+						"### Generate mask with FastSAM"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"id": "bI6kPDSROBI-"
+					},
+					"source": [
+						"# default_box is going to be used if you will not draw any box on image above\n",
+						"default_box = {'x': 68, 'y': 247, 'width': 555, 'height': 678, 'label': ''}\n",
+						"\n",
+						"box = widget.bboxes[0] if widget.bboxes else default_box\n",
+						"box = [\n",
+						"    box['x'],\n",
+						"    box['y'],\n",
+						"    box['x'] + box['width'],\n",
+						"    box['y'] + box['height']\n",
+						"]"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "LF879hDqO5iB",
+						"outputId": "4e7498c4-4007-4614-d46c-0e35608a04a2"
+					},
+					"source": [
+						"results = fast_sam(\n",
+						"    source=IMAGE_PATH,\n",
+						"    device=DEVICE,\n",
+						"    retina_masks=True,\n",
+						"    imgsz=1024,\n",
+						"    conf=0.5,\n",
+						"    iou=0.6)\n",
+						"prompt_process = FastSAMPrompt(IMAGE_PATH, results, device=DEVICE)\n",
+						"masks = prompt_process.box_prompt(bbox=box)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "yt6i2sNJPEdk"
+					},
+					"source": [
+						"**NOTE:** `prompt_process.box_prompt` returns `numy.ndarray`"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 653
+						},
+						"id": "EJThTct_PA68",
+						"outputId": "f6eddd24-f603-4702-8325-6cff7925fe0f"
+					},
+					"source": [
+						"annotated_image=annotate_image(image_path=IMAGE_PATH, masks=masks)\n",
+						"sv.plot_image(image=annotated_image, size=(8, 8))"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "vR-THJthhWH5"
+					},
+					"source": [
+						"## FastSAM point prompt inference"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "xyfpOPPwhpMy"
+					},
+					"source": [
+						"### Select point"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"id": "OC7d3pZ3hop9"
+					},
+					"source": [
+						"point = [405, 505]"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "rE5tV4e3h6nG"
+					},
+					"source": [
+						"### Generate mask with FastSAM"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "31FIby6Zh-Wa",
+						"outputId": "a12c4d1c-837b-4b1b-9240-664797442413"
+					},
+					"source": [
+						"results = fast_sam(\n",
+						"    source=IMAGE_PATH,\n",
+						"    device=DEVICE,\n",
+						"    retina_masks=True,\n",
+						"    imgsz=1024,\n",
+						"    conf=0.5,\n",
+						"    iou=0.6)\n",
+						"prompt_process = FastSAMPrompt(IMAGE_PATH, results, device=DEVICE)\n",
+						"masks = prompt_process.point_prompt(points=[point], pointlabel=[1])"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "d7tpVo8CiM3s"
+					},
+					"source": [
+						"**NOTE:** `prompt_process.point_prompt` returns `numy.ndarray`"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 653
+						},
+						"id": "lMVpGxShiPky",
+						"outputId": "224d84ee-e664-400b-c0df-49507d229f62"
+					},
+					"source": [
+						"annotated_image=annotate_image(image_path=IMAGE_PATH, masks=masks)\n",
+						"sv.plot_image(image=annotated_image, size=(8, 8))"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "HOC7v6ATHEr6"
+					},
+					"source": [
+						"## FastSAM text prompt inference"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "4CzLLtXOHeGk",
+						"outputId": "cecc50d8-e2be-4b33-850a-a2442e3e30b6"
+					},
+					"source": [
+						"results = fast_sam(\n",
+						"    source=IMAGE_PATH,\n",
+						"    device=DEVICE,\n",
+						"    retina_masks=True,\n",
+						"    imgsz=1024,\n",
+						"    conf=0.5,\n",
+						"    iou=0.6)\n",
+						"prompt_process = FastSAMPrompt(IMAGE_PATH, results, device=DEVICE)\n",
+						"masks = prompt_process.text_prompt(text='cap')"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "KYW79zD0OKsv"
+					},
+					"source": [
+						"**NOTE:** `prompt_process.text_prompt` returns `numy.ndarray`"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 653
+						},
+						"id": "zODY5xU1LMCb",
+						"outputId": "a01540a7-deb3-4555-916c-2ac59928e0f3"
+					},
+					"source": [
+						"annotated_image=annotate_image(image_path=IMAGE_PATH, masks=masks)\n",
+						"sv.plot_image(image=annotated_image, size=(8, 8))"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "XFOUWUMZEk7m"
+					},
+					"source": [
+						"##  SAM vs FastSAM"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"id": "7PKBZ7Hhahhw"
+					},
+					"source": [
+						"IMAGE_PATH = f\"{HOME}/data/robot.jpeg\""
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "c48hRY7dVJeL"
+					},
+					"source": [
+						"### Load SAM"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"id": "PdKpFCCmaETG"
+					},
+					"source": [
+						"MODEL_TYPE = \"vit_h\"\n",
+						"\n",
+						"sam = sam_model_registry[MODEL_TYPE](checkpoint=SAM_SAM_CHECKPOINT_PATH).to(device=DEVICE)\n",
+						"mask_generator = SamAutomaticMaskGenerator(sam)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "V5bPGvtBaewO"
+					},
+					"source": [
+						"### SAM inference"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"id": "0HgWsk1yalow"
+					},
+					"source": [
+						"image_bgr = cv2.imread(IMAGE_PATH)\n",
+						"image_rgb = cv2.cvtColor(image_bgr, cv2.COLOR_BGR2RGB)\n",
+						"\n",
+						"sam_result = mask_generator.generate(image_rgb)\n",
+						"sam_detections = sv.Detections.from_sam(sam_result=sam_result)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "t03RrSzMasN6"
+					},
+					"source": [
+						"### FastSAM inference"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "xuFGLw8MavQI",
+						"outputId": "b0118973-1e29-419d-b7c0-2933b97d7ce5"
+					},
+					"source": [
+						"results = fast_sam(\n",
+						"    source=IMAGE_PATH,\n",
+						"    device=DEVICE,\n",
+						"    retina_masks=True,\n",
+						"    imgsz=1024,\n",
+						"    conf=0.5,\n",
+						"    iou=0.6)\n",
+						"prompt_process = FastSAMPrompt(IMAGE_PATH, results, device=DEVICE)\n",
+						"masks = prompt_process.everything_prompt()\n",
+						"masks = masks.cpu().numpy().astype(bool)\n",
+						"xyxy = sv.mask_to_xyxy(masks=masks)\n",
+						"fast_sam_detections = sv.Detections(xyxy=xyxy, mask=masks)"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "IYn8xKySbBnc"
+					},
+					"source": [
+						"### FastSAM vs. SAM"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 321
+						},
+						"id": "c2Qj7sLjbDvo",
+						"outputId": "e85e3ed3-8b90-409d-cf95-877a6a9b2034"
+					},
+					"source": [
+						"mask_annotator = sv.MaskAnnotator()\n",
+						"\n",
+						"sam_result = mask_annotator.annotate(scene=image_bgr.copy(), detections=sam_detections)\n",
+						"fast_sam_result = mask_annotator.annotate(scene=image_bgr.copy(), detections=fast_sam_detections)\n",
+						"\n",
+						"sv.plot_images_grid(\n",
+						"    images=[sam_result, fast_sam_result],\n",
+						"    grid_size=(1, 2),\n",
+						"    titles=['SAM', 'FastSAM']\n",
+						")"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "MfU4NQiGWQMC"
+					},
+					"source": [
+						"**NOTE:** There is a lot going on in our test image. Let's plot our masks against a blank background."
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 321
+						},
+						"id": "PIrywlF5QRPz",
+						"outputId": "8e7c84ae-7869-4523-847a-0678fd1aea53"
+					},
+					"source": [
+						"mask_annotator = sv.MaskAnnotator()\n",
+						"\n",
+						"sam_result = mask_annotator.annotate(scene=np.zeros_like(image_bgr), detections=sam_detections)\n",
+						"fast_sam_result = mask_annotator.annotate(scene=np.zeros_like(image_bgr), detections=fast_sam_detections)\n",
+						"\n",
+						"sv.plot_images_grid(\n",
+						"    images=[sam_result, fast_sam_result],\n",
+						"    grid_size=(1, 2),\n",
+						"    titles=['SAM', 'FastSAM']\n",
+						")"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "51Fs3sDGQmIt"
+					},
+					"source": [
+						"### Mask diff\n",
+						"\n",
+						"**NOTE:** Let's try to understand which masks generated by SAM were not generated by FastSAM."
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"id": "O5bIUAhYQrqZ"
+					},
+					"source": [
+						"def compute_iou(mask1, mask2):\n",
+						"    intersection = np.logical_and(mask1, mask2)\n",
+						"    union = np.logical_or(mask1, mask2)\n",
+						"    return np.sum(intersection) / np.sum(union)\n",
+						"\n",
+						"def filter_masks(mask_array1, mask_array2, threshold):\n",
+						"    return np.array([mask1 for mask1 in mask_array1 if max(compute_iou(mask1, mask2) for mask2 in mask_array2) < threshold])"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 420
+						},
+						"id": "1GM4bL9sRbOm",
+						"outputId": "421fb4f5-7a42-461b-ba1e-7cd46d2d7bd7"
+					},
+					"source": [
+						"diff_masks = filter_masks(sam_detections.mask, fast_sam_detections.mask, 0.5)\n",
+						"diff_xyxy = sv.mask_to_xyxy(masks=diff_masks)\n",
+						"diff_detections = sv.Detections(xyxy=diff_xyxy, mask=diff_masks)\n",
+						"\n",
+						"mask_annotator = sv.MaskAnnotator()\n",
+						"diff_result = mask_annotator.annotate(scene=np.zeros_like(image_bgr), detections=diff_detections)\n",
+						"sv.plot_image(image=diff_result, size=(8, 8))"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "0lPZAZZulhF8"
+					},
+					"source": [
+						"## Roboflow Benchmark Dataset"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "LWN6XwPuSZBY",
+						"outputId": "86b18c0e-f6d6-486b-eee6-d004f13f531e"
+					},
+					"source": [
+						"%cd {HOME}\n",
+						"\n",
+						"roboflow.login()\n",
+						"rf = Roboflow()\n",
+						"\n",
+						"project = rf.workspace(\"roboticfish\").project(\"underwater_object_detection\")\n",
+						"dataset = project.version(10).download(\"yolov8\")"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"id": "T6-PaxWXTZ69"
+					},
+					"source": [
+						"IMAGE_PATH = os.path.join(dataset.location, 'train', 'images', 'IMG_2311_jpeg_jpg.rf.09ae6820eaff21dc838b1f9b6b20342b.jpg')"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/"
+						},
+						"id": "p-gY5jf1Tife",
+						"outputId": "630d35d8-26f4-4342-8d82-c7b61be26fe8"
+					},
+					"source": [
+						"results = fast_sam(\n",
+						"    source=IMAGE_PATH,\n",
+						"    device=DEVICE,\n",
+						"    retina_masks=True,\n",
+						"    imgsz=1024,\n",
+						"    conf=0.5,\n",
+						"    iou=0.6)\n",
+						"prompt_process = FastSAMPrompt(IMAGE_PATH, results, device=DEVICE)\n",
+						"masks = prompt_process.text_prompt(text='Penguin')"
+					]
+				},
+				{
+					"cell_type": "code",
+					"metadata": {
+						"colab": {
+							"base_uri": "https://localhost:8080/",
+							"height": 653
+						},
+						"id": "3tBIH0yubHsW",
+						"outputId": "fc4d0a6a-53c1-4a2b-91f0-75c8f78e10fd"
+					},
+					"source": [
+						"annotated_image=annotate_image(image_path=IMAGE_PATH, masks=masks)\n",
+						"sv.plot_image(image=annotated_image, size=(8, 8))"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {
+						"id": "gP9gEw9Tp8GJ"
+					},
+					"source": [
+						"## 🏆 Congratulations\n",
+						"\n",
+						"### Learning Resources\n",
+						"\n",
+						"Roboflow has produced many resources that you may find interesting as you advance your knowledge of computer vision:\n",
+						"\n",
+						"- [Roboflow Notebooks](https://github.com/roboflow/notebooks): A repository of over 20 notebooks that walk through how to train custom models with a range of model types, from YOLOv7 to SegFormer.\n",
+						"- [Roboflow YouTube](https://www.youtube.com/c/Roboflow): Our library of videos featuring deep dives into the latest in computer vision, detailed tutorials that accompany our notebooks, and more.\n",
+						"- [Roboflow Discuss](https://discuss.roboflow.com/): Have a question about how to do something on Roboflow? Ask your question on our discussion forum.\n",
+						"- [Roboflow Models](https://roboflow.com): Learn about state-of-the-art models and their performance. Find links and tutorials to guide your learning.\n",
+						"\n",
+						"### Convert data formats\n",
+						"\n",
+						"Roboflow provides free utilities to convert data between dozens of popular computer vision formats. Check out [Roboflow Formats](https://roboflow.com/formats) to find tutorials on how to convert data between formats in a few clicks.\n",
+						"\n",
+						"### Connect computer vision to your project logic\n",
+						"\n",
+						"[Roboflow Templates](https://roboflow.com/templates) is a public gallery of code snippets that you can use to connect computer vision to your project logic. Code snippets range from sending emails after inference to measuring object distance between detections."
+					]
+				}
+			].map(fromJupyterCell)
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: 0 },
+			{ modified: 1, original: 1 },
+			{ modified: 2, original: 2 },
+			{ modified: 3, original: 3 },
+			{ modified: 4, original: 4 },
+			{ modified: 5, original: 5 },
+			{ modified: 6, original: 6 },
+			{ modified: 7, original: 7 },
+			{ modified: 8, original: 8 },
+			{ modified: 9, original: 9 },
+			{ modified: 10, original: 10 },
+			{ modified: 11, original: 11 },
+			{ modified: 12, original: 12 },
+			{ modified: 13, original: 13 },
+			{ modified: 14, original: 14 },
+			{ modified: 15, original: 15 },
+			{ modified: 16, original: 16 },
+			{ modified: 17, original: 17 },
+			{ modified: 18, original: 19 },
+			{ modified: 19, original: 20 },
+			{ modified: 20, original: 22 },
+			{ modified: 21, original: 23 },
+			{ modified: 22, original: 24 },
+			{ modified: 23, original: 25 },
+			{ modified: 24, original: 26 },
+			{ modified: 25, original: 27 },
+			{ modified: 26, original: 28 },
+			{ modified: 27, original: 29 },
+			{ modified: 28, original: 30 },
+			{ modified: 29, original: 31 },
+			{ modified: 30, original: 32 },
+			{ modified: 31, original: 33 },
+			{ modified: 32, original: 34 },
+			{ modified: 33, original: 35 },
+			{ modified: 34, original: 36 },
+			{ modified: 35, original: 37 },
+			{ modified: 36, original: 38 },
+			{ modified: 37, original: 39 },
+			{ modified: 38, original: 40 },
+			{ modified: 39, original: 41 },
+			{ modified: 40, original: 42 },
+			{ modified: 41, original: 43 },
+			{ modified: 42, original: 44 },
+			{ modified: 43, original: 45 },
+			{ modified: 44, original: 46 },
+			{ modified: 45, original: 47 },
+			{ modified: 46, original: 48 },
+			{ modified: 47, original: 49 },
+			{ modified: 48, original: 50 },
+			{ modified: 49, original: 51 },
+			{ modified: 50, original: 52 },
+			{ modified: 51, original: 53 },
+			{ modified: 52, original: 54 },
+			{ modified: 53, original: 55 },
+			{ modified: 54, original: 56 },
+			{ modified: 55, original: 57 },
+			{ modified: 56, original: 58 },
+			{ modified: 57, original: 59 },
+			{ modified: 58, original: 60 },
+			{ modified: 59, original: 61 },
+			{ modified: 60, original: 62 },
+			{ modified: 61, original: 63 },
+			{ modified: 62, original: 64 },
+			{ modified: 63, original: 65 },
+			{ modified: 64, original: 66 },
+			{ modified: 65, original: 67 },
+			{ modified: 66, original: 68 },
+			{ modified: 67, original: 69 },
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 12, originalLength: 1, modifiedStart: 12, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 15, originalLength: 1, modifiedStart: 15, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 18, originalLength: 1, modifiedStart: 18, modifiedLength: 0 } satisfies IDiffChange,
+			{ originalStart: 20, originalLength: 1, modifiedStart: 19, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 21, originalLength: 1, modifiedStart: 20, modifiedLength: 0 } satisfies IDiffChange,
+			{ originalStart: 22, originalLength: 1, modifiedStart: 20, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 23, originalLength: 1, modifiedStart: 21, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 26, originalLength: 1, modifiedStart: 24, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 37, originalLength: 1, modifiedStart: 35, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 44, originalLength: 1, modifiedStart: 42, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 48, originalLength: 1, modifiedStart: 46, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 56, originalLength: 1, modifiedStart: 54, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 58, originalLength: 1, modifiedStart: 56, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 60, originalLength: 1, modifiedStart: 58, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 63, originalLength: 1, modifiedStart: 61, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 68, originalLength: 1, modifiedStart: 66, modifiedLength: 1 } satisfies IDiffChange,
+			// { originalStart: 53, originalLength: 0, modifiedStart: 53, modifiedLength: 2 } satisfies IDiffChange,
+		]);
+
+	});
+	test('Insert a few cells (one on top), modify a few and completely misaligned', async () => {
+		const { mapping, diff } = await mapCells(
+			[
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"import requests\n",
+						"import pandas as pd\n",
+						"import matplotlib.pyplot as plt\n",
+						"from cachetools import cached, TTLCache\n",
+						"from dotenv import load_dotenv"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"import os\n",
+						"\n",
+						"GITHUB_API_URL = \"https://api.github.com\"\n",
+						"REPO_OWNER = \"microsoft\"\n",
+						"ISSUE = 123  # Replace with your milestone number\n",
+						"load_dotenv()\n",
+						"TOKEN = os.getenv(\"GH\")\n",
+						"\n",
+						"headers = {\n",
+						"    \"Authorization\": f\"Bearer {TOKEN}\",\n",
+						"    \"Accept\": \"application/vnd.github+json\"\n",
+						"}"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"import csv\n",
+						"from datetime import datetime\n",
+						"import os\n",
+						"\n",
+						"def append_information(repo, open_issues_count, ):\n",
+						"    file_exists = os.path.isfile(filename)\n",
+						"    timestamp = datetime.utcnow().isoformat()\n",
+						"\n",
+						"    # Open the file in append mode\n",
+						"    with open(filename, 'a', newline='', encoding='utf-8') as csvfile:\n",
+						"        writer = csv.writer(csvfile)\n",
+						"\n",
+						"        # If the file didn't exist before, write the header row\n",
+						"        if not file_exists:\n",
+						"            writer.writerow([\n",
+						"                \"timestamp\",\n",
+						"                \"repo\",\n",
+						"                \"open_issues_count\",\n",
+						"                \"open_prs_count\",\n",
+						"                \"bug_issues_count\",\n",
+						"                \"feature_request_issues_count\",\n",
+						"                \"invalid_issues_count\"\n",
+						"            ])\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"def get_repo_issue_stats(owner, repo, token):\n",
+						"    # Common GitHub GraphQL endpoint\n",
+						"    url = \"https://api.github.com/graphql\"\n",
+						"    headers = {\n",
+						"        \"Authorization\": f\"Bearer {token}\",\n",
+						"        \"Accept\": \"application/vnd.github.v4+json\"\n",
+						"    }\n",
+						"\n",
+						"    # First query: Get various issue/PR counts from the repository object\n",
+						"    query_repo = \"\"\"\n",
+						"    query ($owner: String!, $name: String!) {\n",
+						"      repository(owner: $owner, name: $name) {\n",
+						"        issues(states: OPEN) {\n",
+						"          totalCount\n",
+						"        }\n",
+						"        pullRequests(states: OPEN) {\n",
+						"          totalCount\n",
+						"        }\n",
+						"        bugIssues: issues(states: OPEN, labels: [\"bug\"]) {\n",
+						"          totalCount\n",
+						"        }\n",
+						"        featureRequestIssues: issues(states: OPEN, labels: [\"feature-request\"]) {\n",
+						"          totalCount\n",
+						"        }\n",
+						"      }\n",
+						"    }\n",
+						"    \"\"\"\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"for REPO in REPOS:\n",
+						"    stats = get_repo_issue_stats(OWNER, REPO, TOKEN)\n",
+						"    print(stats)\n",
+						"\n",
+						"    append_metrics_to_csv(\n",
+						"        filename=\"repo_metrics.csv\",\n",
+						"        repo=f\"{OWNER}/{REPO}\",\n",
+						"        open_issues_count=stats['open_issues_count'],\n",
+						"        open_prs_count=stats['open_prs_count'],\n",
+						"        bug_issues_count=stats['bug_issues_count'],\n",
+						"        feature_request_issues_count=stats['feature_request_issues_count'],\n",
+						"        invalid_issues_count=stats['invalid_issues_count']\n",
+						"    )"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {},
+					"source": [
+						"# Plot"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"import pandas as pd\n",
+						"import plotly.graph_objs as go\n",
+						"from plotly.subplots import make_subplots\n",
+						"\n",
+						"def plot_repo_metrics(repo, csv_filename=\"repo_metrics.csv\"):\n",
+						"    # Load the CSV data\n",
+						"    df = pd.read_csv(csv_filename)\n",
+						"\n",
+						"    fig.add_trace(go.Scatter(\n",
+						"        x=df_repo['timestamp'],\n",
+						"        y=df_repo['open_issues_count'],\n",
+						"        mode='lines+markers',\n",
+						"        name='Open Issues',\n",
+						"        hovertemplate='Open Issues: %{y}<br>Time: %{x}<extra></extra>'\n",
+						"    ))\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"for REPO in REPOS:\n",
+						"    plot_repo_metrics(f\"{OWNER}/{REPO}\")"
+					]
+				}
+			]
+				.map(fromJupyterCell)
+			,
+			[
+				{
+					"cell_type": "markdown",
+					"metadata": {},
+					"source": [
+						"# Fetch Data"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"import requests\n",
+						"import sys\n",
+						"import pandas as pd\n",
+						"import matplotlib.pyplot as plt\n",
+						"from cachetools import cached, TTLCache\n",
+						"from dotenv import load_dotenv"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"import os\n",
+						"\n",
+						"GITHUB_API_URL = \"https://api.github.com\"\n",
+						"REPO_OWNER = \"microsoft\"\n",
+						"ISSUE = 123\n",
+						"load_dotenv()\n",
+						"TOKEN = os.getenv(\"GH\")\n",
+						"\n",
+						"headers = {\n",
+						"    \"Authorization\": f\"Bearer {TOKEN}\",\n",
+						"    \"Accept\": \"application/vnd.github+json\"\n",
+						"}"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"import csv\n",
+						"from datetime import datetime\n",
+						"import os\n",
+						"\n",
+						"def append_information(repo, open_issues_count, ):\n",
+						"    file_exists = os.path.isfile(filename)\n",
+						"    timestamp = datetime.utcnow().isoformat()\n",
+						"\n",
+						"    # Open the file in append mode\n",
+						"    with open(filename, 'a', newline='', encoding='utf-8') as csvfile:\n",
+						"        writer = csv.writer(csvfile)\n",
+						"\n",
+						"        # If the file didn't exist before, write the header row\n",
+						"        if not file_exists:\n",
+						"            writer.writerow([\n",
+						"                \"timestamp\",\n",
+						"                \"repo\",\n",
+						"                \"open_issues_count\",\n",
+						"                \"open_prs_count\",\n",
+						"                \"bug_issues_count\",\n",
+						"                \"feature_request_issues_count\",\n",
+						"                \"invalid_issues_count\"\n",
+						"            ])\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"def get_repo_issue_stats(owner, repo, token):\n",
+						"    # Common GitHub GraphQL endpoint\n",
+						"    url = \"https://api.github.com/graphql\"\n",
+						"    headers = {\n",
+						"        \"Authorization\": f\"Bearer {token}\",\n",
+						"        \"Accept\": \"application/vnd.github.v4+json\"\n",
+						"    }\n",
+						"\n",
+						"    # First query: Get various issue/PR counts from the repository object\n",
+						"    query_repo = \"\"\"\n",
+						"    query ($owner: String!, $name: String!) {\n",
+						"      repository(owner: $owner, name: $name) {\n",
+						"        issues(states: OPEN) {\n",
+						"          totalCount\n",
+						"        }\n",
+						"        pullRequests(states: OPEN) {\n",
+						"          totalCount\n",
+						"        }\n",
+						"        bugIssues: issues(states: OPEN, labels: [\"bug\"]) {\n",
+						"          totalCount\n",
+						"        }\n",
+						"        featureRequestIssues: issues(states: OPEN, labels: [\"feature-request\"]) {\n",
+						"          totalCount\n",
+						"        }\n",
+						"      }\n",
+						"    }\n",
+						"    \"\"\"\n"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"for REPO in REPOS:\n",
+						"    stats = get_repo_issue_stats(OWNER, REPO, TOKEN)\n",
+						"    print(stats)\n",
+						"\n",
+						"    append_metrics_to_csv(\n",
+						"        filename=\"repo_metrics.csv\",\n",
+						"        repo=f\"{OWNER}/{REPO}\",\n",
+						"        open_issues_count=stats['open_issues_count'],\n",
+						"        open_prs_count=stats['open_prs_count'],\n",
+						"        bug_issues_count=stats['bug_issues_count'],\n",
+						"        feature_request_issues_count=stats['feature_request_issues_count'],\n",
+						"        invalid_issues_count=stats['invalid_issues_count']\n",
+						"    )"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {},
+					"source": [
+						"# Plot"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"import pandas as pd\n",
+						"import plotly.graph_objs as go\n",
+						"from plotly.subplots import make_subplots\n",
+						"\n",
+						"def plot_repo_metrics(repo, csv_filename=\"repo_metrics.csv\"):\n",
+						"    # Load the CSV data\n",
+						"    df = pd.read_csv(csv_filename)\n",
+						"\n",
+						"    fig.add_trace(go.Scatter(\n",
+						"        x=df_repo['timestamp'],\n",
+						"        y=df_repo['open_issues_count'],\n",
+						"        mode='lines+markers',\n",
+						"        name='Open Issues',\n",
+						"        hovertemplate='Open Issues: %{y}<br>Time: %{x}<extra></extra>'\n",
+						"    ))\n"
+					]
+				},
+				{
+					"cell_type": "markdown",
+					"metadata": {},
+					"source": [
+						"## Header"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"for REPO in REPOS:\n",
+						"    plot_repo_metrics(f\"{OWNER}/{REPO}\")"
+					]
+				},
+				{
+					"cell_type": "code",
+					"execution_count": null,
+					"metadata": {},
+					"outputs": [],
+					"source": [
+						"plot_repo_metrics(f\"{OWNER}/vscode\")"
+					]
+				}
+			].map(fromJupyterCell)
+		);
+
+		assert.deepStrictEqual(mapping, [
+			{ modified: 0, original: -1 },
+			{ modified: 1, original: 0 },
+			{ modified: 2, original: 1 },
+			{ modified: 3, original: 2 },
+			{ modified: 4, original: 3 },
+			{ modified: 5, original: 4 },
+			{ modified: 6, original: 5 },
+			{ modified: 7, original: 6 },
+			{ modified: 8, original: -1 },
+			{ modified: 9, original: 7 },
+			{ modified: 10, original: -1 }
+		]);
+		assert.deepStrictEqual(diff.cellsDiff.changes, [
+			{ originalStart: 0, originalLength: 0, modifiedStart: 0, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 0, originalLength: 1, modifiedStart: 1, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 1, originalLength: 1, modifiedStart: 2, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 7, originalLength: 0, modifiedStart: 8, modifiedLength: 1 } satisfies IDiffChange,
+			{ originalStart: 8, originalLength: 0, modifiedStart: 10, modifiedLength: 1 } satisfies IDiffChange,
+		]);
+
+
+	});
+
+	let uriCounter = 0;
+	async function mapCells(original: MockNotebookCell[], modified: MockNotebookCell[]) {
+		const mapping = matchCellBasedOnSimilarties(modified.map(cellToDto), original.map(cellToDto)).map(mapping => ({ modified: mapping.modified, original: mapping.original }));
+		const originalUri = URI.parse(`file://original${uriCounter++}.ipynb`);
+		const modifiedUri = URI.parse(`file://modified${uriCounter++}.ipynb`);
+		worker.$acceptNewModel(originalUri.toString(), {}, {}, original.map((cell, index) => cellToMainCellTdo(originalUri, cell, index)));
+		worker.$acceptNewModel(modifiedUri.toString(), {}, {}, modified.map((cell, index) => cellToMainCellTdo(modifiedUri, cell, index)));
+		const diff = await worker.$computeDiff(originalUri.toString(), modifiedUri.toString());
+		diff.cellsDiff.changes = diff.cellsDiff.changes.map(change => {
+			return {
+				originalStart: change.originalStart,
+				originalLength: change.originalLength,
+				modifiedStart: change.modifiedStart,
+				modifiedLength: change.modifiedLength,
+			};
+		});
+		return { mapping, diff };
+	}
+
+
+	function cellToDto(cell: MockNotebookCell): { getValue(): string; getLinesContent(): string[]; cellKind: CellKind } {
+		return {
+			cellKind: cell[2],
+			getValue: () => cell[0].join('\n'),
+			getLinesContent: () => cell[0]
+		};
+	}
+
+	function cellToMainCellTdo(notebookUri: URI, cell: MockNotebookCell, index: number): IMainCellDto {
+		return {
+			source: cell[0],
+			language: cell[1],
+			cellKind: cell[2],
+			outputs: cell[3] || [],
+			metadata: cell[4],
+			eol: '\n',
+			handle: index,
+			url: URI.from({ scheme: 'file', path: notebookUri.path, fragment: `cell/${index}` }).toString(),
+			versionId: 0,
+			internalMetadata: undefined
+		} satisfies IMainCellDto;
+
+	}
+	type MockNotebookCell = [
+		lines: string[],
+		lang: string,
+		kind: CellKind,
+		output?: IOutputDto[],
+		metadata?: NotebookCellMetadata,
+	];
+
+	function fromJupyterCell(cell: { cell_type: string; source: string[] }): MockNotebookCell {
+		return [
+			cell.source,
+			cell.cell_type === 'code' ? 'python' : 'markdown',
+			cell.cell_type === 'code' ? CellKind.Code : CellKind.Markup,
+		];
+	}
+});
+
+

From f6f7a1a198a07fd1d00479b25982324708bacb27 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sun, 2 Mar 2025 22:21:00 -0800
Subject: [PATCH 0562/1815] Bump distro (#242441)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3abe2f26aeba..aac35268f7bd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.99.0",
-  "distro": "aee970faa436e6fdd88d579c1409364c3fdab6a8",
+  "distro": "81a3bde4792a4d73d1d99f1307c1d0078f79296b",
   "author": {
     "name": "Microsoft Corporation"
   },

From e5717971c5e414582bbb9ccb30105adf47fbf360 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Mon, 3 Mar 2025 17:24:42 +1100
Subject: [PATCH 0563/1815] Modify notebook chat entry to handle lazy loading
 of cell models (#242432)

* Modify to handle lazy loading cell models

* Updates

* Misc

* Fixes

* Fixes to snapshot diffing
---
 .../chatEditingModifiedNotebookEntry.ts       | 705 +++++++++++-------
 .../chatEditingModifiedNotebookSnapshot.ts    | 119 ++-
 .../chatEditingNotebookEditorIntegration.ts   | 109 ++-
 .../browser/chatEditing/chatEditingSession.ts |   4 +-
 4 files changed, 601 insertions(+), 336 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 52281971d8f7..be444c3fc02f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -9,7 +9,7 @@ import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { DisposableStore, IReference, toDisposable } 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 } from '../../../../../base/common/observable.js';
+import { ITransaction, IObservable, observableValue, autorun, transaction, ObservablePromise } from '../../../../../base/common/observable.js';
 import { ObservableDisposable } from '../../../../../base/common/observableDisposable.js';
 import { isEqual } from '../../../../../base/common/resources.js';
 import { themeColorFromId } from '../../../../../base/common/themables.js';
@@ -48,7 +48,7 @@ import { CellEditState, getNotebookEditorFromEditorPane } from '../../../noteboo
 import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
 import { NotebookCellTextModel } from '../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
-import { CellEditType, ICellDto2, ICellEditOperation, ICellReplaceEdit, IResolvedNotebookEditorModel, NotebookSetting, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
+import { CellEditType, ICellDto2, ICellEditOperation, ICellReplaceEdit, IResolvedNotebookEditorModel, NotebookCellsChangeType, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
 import { computeDiff } from '../../../notebook/common/notebookDiff.js';
 import { INotebookEditorModelResolverService } from '../../../notebook/common/notebookEditorModelResolverService.js';
 import { INotebookLoggingService } from '../../../notebook/common/notebookLoggingService.js';
@@ -57,15 +57,12 @@ import { INotebookEditorWorkerService } from '../../../notebook/common/services/
 import { ChatEditKind, IModifiedFileEntryEditorIntegration, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { IChatResponseModel } from '../../common/chatModel.js';
 import { IChatService } from '../../common/chatService.js';
-import { IDocumentDiff2 } from './chatEditingCodeEditorIntegration.js';
 import { AbstractChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISnapshotEntry, pendingRewriteMinimap } from './chatEditingModifiedFileEntry.js';
-import { createSnapshot, deserializeSnapshot, getNotebookSnapshotFileURI, restoreSnapshot } from './chatEditingModifiedNotebookSnapshot.js';
+import { createSnapshot, deserializeSnapshot, getNotebookSnapshotFileURI, restoreSnapshot, SnapshotComparer } from './chatEditingModifiedNotebookSnapshot.js';
 import { ChatEditingNotebookDiffEditorIntegration, ChatEditingNotebookEditorIntegration, countChanges, ICellDiffInfo, sortCellChanges } from './chatEditingNotebookEditorIntegration.js';
 import { ChatEditingNotebookFileSystemProvider } from './chatEditingNotebookFileSystemProvider.js';
 
 
-const noopKeep = () => Promise.resolve(true);
-const noopUndo = () => Promise.resolve(true);
 const SnapshotLanguageId = 'VSCodeChatNotebookSnapshotLanguage';
 
 export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifiedFileEntry {
@@ -88,20 +85,20 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	private readonly _changesCount = observableValue<number>(this, 0);
 	override changesCount: IObservable<number> = this._changesCount;
 
-	private readonly cellEntryMap = new Map<NotebookCellTextModel, ChatEditingNotebookCellEntry>();
-	private readonly _entries = observableValue<ChatEditingNotebookCellEntry[]>('cellEntries', []);
-	private modifiedToOriginalCellMap = new ResourceMap<ITextModel>();
-	private readonly _cellDiffInfo = observableValue<ICellDiffInfo[]>('diffInfo', []);
+	private readonly cellEntryMap = new ResourceMap<ChatEditingNotebookCellEntry>();
+	private modifiedToOriginalCell = new ResourceMap<URI>();
+	private readonly _cellsDiffInfo = observableValue<ICellDiffInfo[]>('diffInfo', []);
 	private readonly _maxModifiedLineNumbers = observableValue<number[]>('changedMaxLineNumber', []);
 
-	get cellDiffInfo(): IObservable<ICellDiffInfo[]> {
-		return this._cellDiffInfo;
+	get cellsDiffInfo(): IObservable<ICellDiffInfo[]> {
+		return this._cellsDiffInfo;
 	}
 
 	/**
 	 * List of Cell URIs that are edited,
 	 * Will be cleared once all edits have been accepted.
-	 * I.e. this will only contain URIS will acceptAgentEdits are being called before `isLastEdit` is sent.
+	 * I.e. this will only contain URIS while acceptAgentEdits is being called & before `isLastEdit` is sent.
+	 * I.e. this is populated only when edits are being streamed.
 	 */
 	private readonly editedCells = new ResourceSet();
 
@@ -110,9 +107,6 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			const notebookService = accessor.get(INotebookService);
 			const resolver = accessor.get(INotebookEditorModelResolverService);
 			const configurationServie = accessor.get(IConfigurationService);
-			const textModelService = accessor.get(ITextModelService);
-			const notebookEditorWorkerService = accessor.get(INotebookEditorWorkerService);
-			const loggingService = accessor.get(INotebookLoggingService);
 			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);
@@ -124,32 +118,23 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			// Register so that we can load this from file system.
 			disposables.add(ChatEditingNotebookFileSystemProvider.registerFile(originalUri, buffer));
 			const originalRef = await resolver.resolve(originalUri, notebook.viewType);
-			const modifiedCells = new ResourceMap<ITextModel>();
-			const originalCells = new ResourceMap<ITextModel>();
-			await Promise.all(resourceRef.object.notebook.cells.map(async cell => {
-				modifiedCells.set(cell.uri, disposables.add(await textModelService.createModelReference(cell.uri)).object.textEditorModel);
-			}).concat(originalRef.object.notebook.cells.map(async cell => {
-				originalCells.set(cell.uri, disposables.add(await textModelService.createModelReference(cell.uri)).object.textEditorModel);
-			})));
-			const cellDiffInfo: CellDiffInfo[] = [];
 			if (initialContent) {
 				restoreSnapshot(originalRef.object.notebook, initialContent);
-				try {
-					const notebookDiff = await notebookEditorWorkerService.computeDiff(originalRef.object.resource, resourceRef.object.resource);
-					const result = computeDiff(originalRef.object.notebook, resourceRef.object.notebook, notebookDiff);
-					if (result.cellDiffInfo.length) {
-						cellDiffInfo.push(...result.cellDiffInfo);
-					}
-				} catch (ex) {
-					loggingService.error('Notebook Chat', 'Error computing diff:\n' + ex);
-				}
 			} else {
-				originalRef.object.notebook.cells.forEach((_, index) => {
-					cellDiffInfo.push({ type: 'unchanged', originalCellIndex: index, modifiedCellIndex: index });
+				// Both models are the same, ensure the cell ids are the same, this way we get a perfect diffing.
+				// No need to generate edits for this.
+				const edits: ICellEditOperation[] = [];
+				notebook.cells.forEach((cell, index) => {
+					const cellId = cell.internalMetadata?.cellId;
+					if (cellId) {
+						edits.push({ editType: CellEditType.PartialInternalMetadata, index, internalMetadata: { cellId } });
+					}
 				});
+				originalRef.object.notebook.applyEdits(edits, true, undefined, () => undefined, undefined, false);
+
 			}
 			initialContent = initialContent || createSnapshot(originalRef.object.notebook, options.serializer.options, configurationServie);
-			const instance = instantiationService.createInstance(ChatEditingModifiedNotebookEntry, resourceRef, originalRef, modifiedCells, originalCells, _multiDiffEntryDelegate, options.serializer.options, telemetryInfo, chatKind, initialContent, cellDiffInfo);
+			const instance = instantiationService.createInstance(ChatEditingModifiedNotebookEntry, resourceRef, originalRef, _multiDiffEntryDelegate, options.serializer.options, telemetryInfo, chatKind, initialContent);
 			instance._register(disposables);
 			return instance;
 		});
@@ -176,17 +161,16 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		return false;
 	}
 
+	private readonly initialContentComparer: SnapshotComparer;
+
 	constructor(
 		private readonly modifiedResourceRef: IReference<IResolvedNotebookEditorModel>,
 		originalResourceRef: IReference<IResolvedNotebookEditorModel>,
-		private readonly modifiedCellModels: ResourceMap<ITextModel>,
-		private readonly originalCellModels: ResourceMap<ITextModel>,
 		private readonly _multiDiffEntryDelegate: { collapse: (transaction: ITransaction | undefined) => void },
 		private readonly transientOptions: TransientOptions | undefined,
 		telemetryInfo: IModifiedEntryTelemetryInfo,
 		kind: ChatEditKind,
 		initialContent: string,
-		cellDiffInfo: CellDiffInfo[],
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IFilesConfigurationService fileConfigService: IFilesConfigurationService,
 		@IChatService chatService: IChatService,
@@ -194,108 +178,235 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ITextModelService private readonly textModelService: ITextModelService,
 		@IModelService private readonly modelService: IModelService,
-		@IUndoRedoService undoRedoService: IUndoRedoService
+		@IUndoRedoService undoRedoService: IUndoRedoService,
+		@INotebookEditorWorkerService private readonly notebookEditorWorkerService: INotebookEditorWorkerService,
+		@INotebookLoggingService private readonly loggingService: INotebookLoggingService,
 	) {
 		super(modifiedResourceRef.object.notebook.uri, telemetryInfo, kind, configurationService, fileConfigService, chatService, fileService, undoRedoService, instantiationService);
-		this._register(modifiedResourceRef);
-		this._register(originalResourceRef);
-		this.modifiedModel = modifiedResourceRef.object.notebook;
-		this.originalModel = originalResourceRef.object.notebook;
+		this.initialContentComparer = new SnapshotComparer(initialContent);
+		this.modifiedModel = this._register(modifiedResourceRef).object.notebook;
+		this.originalModel = this._register(originalResourceRef).object.notebook;
 		this.originalURI = this.originalModel.uri;
 		this.initialContent = initialContent;
-		this._register(this.modifiedModel.onDidChangeContent(this.mirrorNotebookEdits, this));
 		this._maxModifiedLineNumbers.set(this.modifiedModel.cells.map(() => 0), undefined);
-		const diffs = cellDiffInfo.map((diff, i) => {
-			switch (diff.type) {
-				case 'unchanged': {
-					const modifiedCell = this.modifiedModel.cells[diff.modifiedCellIndex];
-					const originalCell = this.originalModel.cells[diff.originalCellIndex];
-					const originalCellModel = this.originalCellModels.get(originalCell.uri)!;
-					this.modifiedToOriginalCellMap.set(modifiedCell.uri, originalCellModel);
-					this.getOrCreateModifiedTextFileEntryForCell(modifiedCell);
-					return this.createUnchangedCellDiffInfo(diff.originalCellIndex, diff.modifiedCellIndex);
-				}
+		this.initializeModelsFromDiff();
+		this._register(this.modifiedModel.onDidChangeContent(this.mirrorNotebookEdits, this));
+	}
+
+	initializeModelsFromDiffImpl(cellsDiffInfo: CellDiffInfo[]) {
+		this.cellEntryMap.forEach(entry => entry.dispose());
+		this.cellEntryMap.clear();
+		const diffs = cellsDiffInfo.map((cellDiff, i) => {
+			switch (cellDiff.type) {
 				case 'delete':
-					return this.createDeleteCellDiffInfo(diff.originalCellIndex);
+					return this.createDeleteCellDiffInfo(cellDiff.originalCellIndex);
 				case 'insert': {
-					const cell = this.modifiedModel.cells[diff.modifiedCellIndex];
-					return this.createInsertedCellDiffInfo(diff.modifiedCellIndex, this.modifiedCellModels.get(cell.uri)!);
-				}
-				default: {
-					const modifiedCell = this.modifiedModel.cells[diff.modifiedCellIndex];
-					const originalCell = this.originalModel.cells[diff.originalCellIndex];
-					const orgiginalCellModel = this.originalCellModels.get(originalCell.uri)!;
-					this.modifiedToOriginalCellMap.set(modifiedCell.uri, orgiginalCellModel);
-					this.getOrCreateModifiedTextFileEntryForCell(modifiedCell);
-
-					const entry = this.cellEntryMap.get(modifiedCell);
-					const diff2: IDocumentDiff2 = {
-						...(entry?.diffInfo.get() ?? nullDocumentDiff),
-						keep: noopKeep,
-						undo: noopUndo,
-						modifiedModel: this.modifiedCellModels.get(modifiedCell.uri)!,
-						originalModel: this.originalCellModels.get(originalCell.uri)!,
-					};
-					return {
-						modifiedCellIndex: diff.modifiedCellIndex,
-						originalCellIndex: diff.originalCellIndex,
-						diff: diff2,
-						type: 'modified'
-					} satisfies ICellDiffInfo;
+					return this.createInsertedCellDiffInfo(cellDiff.modifiedCellIndex);
 				}
+				default:
+					return this.createModifiedCellDiffInfo(cellDiff.modifiedCellIndex, cellDiff.originalCellIndex);
 			}
 		});
-		this._cellDiffInfo.set(diffs, undefined);
+		this._cellsDiffInfo.set(diffs, undefined);
 		this._changesCount.set(countChanges(diffs), undefined);
 	}
 
-	createEmptyDiffs() {
-		this._cellDiffInfo.set(this.modifiedModel.cells.map((_, i) => this.createUnchangedCellDiffInfo(i, i)), undefined);
+	private computeRequestId: number = 0;
+	async initializeModelsFromDiff() {
+		if (this._areOriginalAndModifiedIdenticalImpl()) {
+			const cellsDiffInfo: CellDiffInfo[] = this.modifiedModel.cells.map((_, index) => {
+				return { type: 'unchanged', originalCellIndex: index, modifiedCellIndex: index } satisfies CellDiffInfo;
+			});
+			this.initializeModelsFromDiffImpl(cellsDiffInfo);
+			return;
+		}
+		const id = ++this.computeRequestId;
+		const cellsDiffInfo: CellDiffInfo[] = [];
+		try {
+			const notebookDiff = await this.notebookEditorWorkerService.computeDiff(this.originalURI, this.modifiedURI);
+			if (id !== this.computeRequestId) {
+				return;
+			}
+			const result = computeDiff(this.originalModel, this.modifiedModel, notebookDiff);
+			if (result.cellDiffInfo.length) {
+				cellsDiffInfo.push(...result.cellDiffInfo);
+			}
+		} catch (ex) {
+			this.loggingService.error('Notebook Chat', 'Error computing diff:\n' + ex);
+		}
+		this.initializeModelsFromDiffImpl(cellsDiffInfo);
 	}
+	updateCellDiffInfo(cellsDiffInfo: ICellDiffInfo[], transcation: ITransaction | undefined) {
+		this._cellsDiffInfo.set(sortCellChanges(cellsDiffInfo), transcation);
+		this._changesCount.set(countChanges(cellsDiffInfo), transcation);
 
-	getDiffForUnchangedCell(cell: NotebookCellTextModel): IDocumentDiff2 {
-		return {
-			...nullDocumentDiff,
-			keep: noopKeep,
-			undo: noopUndo,
-			originalModel: this.modifiedToOriginalCellMap.get(cell.uri)!,
-			modifiedModel: this.modifiedCellModels.get(cell.uri)!,
-		};
 	}
 
 	mirrorNotebookEdits(e: NotebookTextModelChangedEvent) {
+		/**
+		 * TODO@DonJayamanne
+		 * If user deletes cells, invoke this.disposeDeletedCellEntries();
+		 * If user makes any changes, invoke this.computeStateAfterAcceptingRejectingChanges(true);
+		 * If user deletes/inserts cells manually, do we need to apply those to the original snapshot? Unlikely, double check.
+		 */
 		if (this._isEditFromUs || Array.from(this.cellEntryMap.values()).some(entry => entry.isEditFromUs)) {
 			// TODO@DonJayamanne Apply this same edit to the original notebook.
 			return;
 		}
 
-		// TODO@DonJayamanne We need a way to undo this operation.
-		this._allEditsAreFromUs = this._allEditsAreFromUs || e.rawEvents.length > 0;
-
-		const didResetToOriginalContent = createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService) === this.initialContent;
+		// Possible user reverted the changes from SCM or the like.
+		// Or user just reverted the changes made via edits (e.g. edit made a change in a cell and user undid that change either by typing over or other).
+		// Computing snapshot is too slow, as this event gets triggered for every key stroke in a cell,
+		// const didResetToOriginalContent = createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService) === this.initialContent;
+		const didResetToOriginalContent = this.initialContentComparer.isEqual(this.modifiedModel);
 		const currentState = this._stateObs.get();
-		switch (currentState) {
-			case WorkingSetEntryState.Modified:
-				if (didResetToOriginalContent) {
-					this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
+		if (currentState === WorkingSetEntryState.Rejected) {
+			return;
+		}
+		if (currentState === WorkingSetEntryState.Modified && didResetToOriginalContent) {
+			this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
+			this.updateCellDiffInfo([], undefined);
+			return;
+		}
+
+		if (!e.rawEvents.length) {
+			return;
+		}
+
+		this._allEditsAreFromUs = false;
+
+		// Changes to cell text is sync'ed and handled separately.
+		// See ChatEditingNotebookCellEntry._mirrorEdits
+		for (const event of e.rawEvents.filter(event => event.kind !== NotebookCellsChangeType.ChangeCellContent)) {
+			switch (event.kind) {
+				case NotebookCellsChangeType.ChangeDocumentMetadata: {
+					const edit: ICellEditOperation = {
+						editType: CellEditType.DocumentMetadata,
+						metadata: this.modifiedModel.metadata
+					};
+					this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+					break;
+				}
+				case NotebookCellsChangeType.ModelChange: {
+					event.changes.forEach(change => {
+						const cells = change[2].map(cell => {
+							return {
+								cellKind: cell.cellKind,
+								language: cell.language,
+								metadata: cell.metadata,
+								outputs: cell.outputs,
+								source: cell.getValue(),
+								mime: undefined,
+								internalMetadata: cell.internalMetadata
+							} satisfies ICellDto2;
+						});
+						const cellDiffs = sortCellChanges(this._cellsDiffInfo.get()).slice();
+						const wasInsertedAsFirstCell = change[0] === 0;
+						const wasInsertedAsLastCell = change[0] === this.modifiedModel.cells.length - 1;
+						const diffEntryIndex = wasInsertedAsFirstCell ? 0 : (wasInsertedAsLastCell ? this.originalModel.cells.length : (cellDiffs.findIndex(d => d.modifiedCellIndex === change[0])));
+						const indexToInsertInOriginalModel = (wasInsertedAsFirstCell || diffEntryIndex === -1) ? 0 : (wasInsertedAsLastCell ? this.originalModel.cells.length : (((cellDiffs.slice(0, diffEntryIndex).reverse().find(c => typeof c.originalCellIndex === 'number')?.originalCellIndex ?? -1) + 1)));
+						const edit: ICellEditOperation = {
+							editType: CellEditType.Replace,
+							cells,
+							index: indexToInsertInOriginalModel,
+							count: change[1]
+						};
+						this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+						// If cells were deleted we handled that with this.disposeDeletedCellEntries();
+						if (diffEntryIndex >= 0) {
+							cellDiffs.splice(diffEntryIndex, change[1]);
+						}
+						// For inserted cells, we need to ensure that we create a corresponding CellEntry.
+						// So that any edits to the inserted cell is handled and mirrored over to the corresponding cell in original model.
+						cells.forEach((_, i) => {
+							const originalCellIndex = i + indexToInsertInOriginalModel;
+							const modifiedCellIndex = change[0] + i;
+							const unchangedCell = this.createModifiedCellDiffInfo(modifiedCellIndex, originalCellIndex);
+							cellDiffs.splice(diffEntryIndex === -1 ? 0 : diffEntryIndex, 0, unchangedCell);
+							this.updateCellDiffInfo(cellDiffs, undefined);
+						});
+					});
+					this.disposeDeletedCellEntries();
+					break;
+				}
+				case NotebookCellsChangeType.ChangeCellLanguage: {
+					const edit: ICellEditOperation = {
+						editType: CellEditType.CellLanguage,
+						index: event.index,
+						language: event.language
+					};
+					this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+					break;
+				}
+				case NotebookCellsChangeType.ChangeCellMetadata: {
+					const edit: ICellEditOperation = {
+						editType: CellEditType.Metadata,
+						index: event.index,
+						metadata: event.metadata
+					};
+					this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+					break;
+				}
+				case NotebookCellsChangeType.ChangeCellMime:
+					break;
+				case NotebookCellsChangeType.ChangeCellInternalMetadata: {
+					const edit: ICellEditOperation = {
+						editType: CellEditType.PartialInternalMetadata,
+						index: event.index,
+						internalMetadata: event.internalMetadata
+					};
+					this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+					break;
+				}
+				case NotebookCellsChangeType.Output: {
+					const edit: ICellEditOperation = {
+						editType: CellEditType.Output,
+						index: event.index,
+						append: event.append,
+						outputs: event.outputs
+					};
+					this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+					break;
+				}
+				case NotebookCellsChangeType.OutputItem: {
+					const edit: ICellEditOperation = {
+						editType: CellEditType.OutputItems,
+						outputId: event.outputId,
+						append: event.append,
+						items: event.outputItems
+					};
+					this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+					break;
+				}
+				case NotebookCellsChangeType.Move: {
+					const edit: ICellEditOperation = {
+						editType: CellEditType.Move,
+						index: event.index,
+						length: event.length,
+						newIdx: event.newIdx
+					};
+					this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+					// TODO@DonJayamanne
+					// We need to update the entries in _cellDiffInfo.
+					break;
+				}
+				default: {
 					break;
 				}
+			}
 		}
-
 	}
 
 	protected override async _doAccept(tx: ITransaction | undefined): Promise<void> {
-		const outputSizeLimit = this.configurationService.getValue<number>(NotebookSetting.outputBackupSizeLimit) * 1024;
-		const snapshot = this.modifiedModel.createSnapshot({ context: SnapshotContext.Backup, outputSizeLimit, transientOptions: this.transientOptions });
-		this.originalModel.restoreSnapshot(snapshot, this.transientOptions);
-		this._changesCount.set(0, tx);
-		this.createEmptyDiffs();
-
+		const snapshot = createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService);
+		restoreSnapshot(this.originalModel, snapshot);
+		this.updateCellDiffInfo([], tx);
+		this.initializeModelsFromDiff();
 		await this._collapse(tx);
 	}
 
 	protected override async _doReject(tx: ITransaction | undefined): Promise<void> {
-		this._cellDiffInfo.set([], undefined);
+		this.updateCellDiffInfo([], tx);
 		if (this.createdInRequestId === this._telemetryInfo.requestId) {
 			await this._applyEdits(async () => {
 				await this.modifiedResourceRef.object.revert({ soft: true });
@@ -304,19 +415,19 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			this._onDidDelete.fire();
 		} else {
 			await this._applyEdits(async () => {
-				const outputSizeLimit = this.configurationService.getValue<number>(NotebookSetting.outputBackupSizeLimit) * 1024;
-				const snapshot = this.originalModel.createSnapshot({ context: SnapshotContext.Backup, outputSizeLimit, transientOptions: this.transientOptions });
-				this.modifiedModel.restoreSnapshot(snapshot, this.transientOptions);
-				if (this._allEditsAreFromUs && this._entries.get().every(entry => entry.allEditsAreFromUs)) {
+				const snapshot = createSnapshot(this.originalModel, this.transientOptions, this.configurationService);
+				this.restoreSnapshotInModifiedModel(snapshot);
+				if (this._allEditsAreFromUs && Array.from(this.cellEntryMap.values()).every(entry => entry.allEditsAreFromUs)) {
 					// save the file after discarding so that the dirty indicator goes away
 					// and so that an intermediate saved state gets reverted
 					await this.modifiedResourceRef.object.save({ reason: SaveReason.EXPLICIT, skipSaveParticipants: true });
 				}
 			});
+			this.initializeModelsFromDiff();
 			await this._collapse(tx);
 		}
-		this.createEmptyDiffs();
 	}
+
 	private async _collapse(transaction: ITransaction | undefined): Promise<void> {
 		this._multiDiffEntryDelegate.collapse(transaction);
 	}
@@ -325,10 +436,10 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		const notebookEditor = getNotebookEditorFromEditorPane(editor);
 		if (!notebookEditor && editor.getId() === NotebookTextDiffEditor.ID) {
 			const diffEditor = (editor.getControl() as INotebookTextDiffEditor);
-			return this._instantiationService.createInstance(ChatEditingNotebookDiffEditorIntegration, diffEditor, this._cellDiffInfo);
+			return this._instantiationService.createInstance(ChatEditingNotebookDiffEditorIntegration, diffEditor, this._cellsDiffInfo);
 		}
 		assertType(notebookEditor);
-		return this._instantiationService.createInstance(ChatEditingNotebookEditorIntegration, this, notebookEditor, this.modifiedModel, this.originalModel, this._cellDiffInfo);
+		return this._instantiationService.createInstance(ChatEditingNotebookEditorIntegration, this, notebookEditor, this.modifiedModel, this.originalModel, this._cellsDiffInfo);
 	}
 
 	protected override _resetEditsState(tx: ITransaction): void {
@@ -342,21 +453,38 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	}
 
 	protected override async _areOriginalAndModifiedIdentical(): Promise<boolean> {
-		return createSnapshot(this.originalModel, this.transientOptions, this.configurationService) === createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService);
+		return this._areOriginalAndModifiedIdenticalImpl();
+	}
+
+	private _areOriginalAndModifiedIdenticalImpl(): boolean {
+		const snapshot = createSnapshot(this.originalModel, this.transientOptions, this.configurationService);
+		return new SnapshotComparer(snapshot).isEqual(this.modifiedModel);
 	}
 
 	override async acceptAgentEdits(resource: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void> {
 		const isCellUri = resource.scheme === Schemas.vscodeNotebookCell;
 		const cell = isCellUri && this.modifiedModel.cells.find(cell => isEqual(cell.uri, resource));
-		const cellEntry = cell ? this.cellEntryMap.get(cell) : undefined;
+		let cellEntry: ChatEditingNotebookCellEntry | undefined;
+		if (cell) {
+			const index = this.modifiedModel.cells.indexOf(cell);
+			const entry = this._cellsDiffInfo.get().slice().find(entry => entry.modifiedCellIndex === index);
+			if (!entry) {
+				// Not possible.
+				console.error('Original cell model not found');
+				return;
+			}
+
+			cellEntry = this.getOrCreateModifiedTextFileEntryForCell(cell, await entry.modifiedModel.promise, await entry.originalModel.promise);
+		}
 
 		// For all cells that were edited, send the `isLastEdits` flag.
 		const finishPreviousCells = () => {
 			this.editedCells.forEach(uri => {
 				const cell = this.modifiedModel.cells.find(cell => isEqual(cell.uri, uri));
-				const cellEntry = cell && this.cellEntryMap.get(cell);
+				const cellEntry = cell && this.cellEntryMap.get(cell.uri);
 				cellEntry?.acceptAgentEdits([], true, responseModel);
 			});
+			this.editedCells.clear();
 		};
 
 		await this._applyEdits(async () => {
@@ -368,15 +496,14 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 					}
 					cellEntry?.acceptAgentEdits([edit], isLastEdits, responseModel);
 				} else {
-					await this.acceptNotebookEdit(edit);
+					this.acceptNotebookEdit(edit);
 				}
 			}));
 		});
 
 		// If the last edit for a cell was sent, then handle it
 		if (isCellUri && isLastEdits) {
-			this.editedCells.delete(resource);
-			cellEntry?.acceptAgentEdits([], isLastEdits, responseModel);
+			finishPreviousCells();
 		}
 
 		// isLastEdits can be true for cell Uris, but when its true for Cells edits.
@@ -393,39 +520,45 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				finishPreviousCells();
 				this.editedCells.clear();
 				this._resetEditsState(tx);
-				// this._updateDiffInfoSeq();
 				this._rewriteRatioObs.set(1, tx);
-				// this._editDecorationClear.schedule();
 			}
 		});
 	}
 
-	async acceptNotebookEdit(edit: ICellEditOperation): Promise<void> {
+	private disposeDeletedCellEntries() {
+		const cellsUris = new ResourceSet(this.modifiedModel.cells.map(cell => cell.uri));
+		Array.from(this.cellEntryMap.keys()).forEach(uri => {
+			if (cellsUris.has(uri)) {
+				return;
+			}
+			this.cellEntryMap.get(uri)?.dispose();
+			this.cellEntryMap.delete(uri);
+		});
+	}
+
+	acceptNotebookEdit(edit: ICellEditOperation): void {
 		// make the actual edit
 		this.modifiedModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
-		// Ensure the models have been resolved for the new cells inserted.
+		this.disposeDeletedCellEntries();
+
 		if (edit.editType !== CellEditType.Replace) {
 			return;
 		}
 		if (edit.count === 0) {
-			const diff = sortCellChanges(this._cellDiffInfo.get()).slice();
 			// All existing indexes are shifted by number of cells added.
+			const diff = sortCellChanges(this._cellsDiffInfo.get()).slice();
 			diff.forEach(d => {
 				if (d.type !== 'delete' && d.modifiedCellIndex >= edit.index) {
 					d.modifiedCellIndex += edit.cells.length;
 				}
 			});
-			const diffInsert = await Promise.all(edit.cells.map(async (c, i) => {
-				const cell = this.modifiedModel.cells[edit.index + i];
-				const modifiedCellModel: ITextModel = cell.textModel ?? this._register((await this.textModelService.createModelReference(cell.uri))).object.textEditorModel;
-				return this.createInsertedCellDiffInfo(edit.index + i, modifiedCellModel);
-			}));
+			const diffInsert = edit.cells.map((_, i) => this.createInsertedCellDiffInfo(edit.index + i));
 			diff.splice(edit.index + 1, 0, ...diffInsert);
-			this._cellDiffInfo.set(sortCellChanges(diff), undefined);
+			this.updateCellDiffInfo(diff, undefined);
 		} else {
 			// All existing indexes are shifted by number of cells removed.
 			// And unchanged cells should be converted to deleted cells.
-			const diff = sortCellChanges(this._cellDiffInfo.get()).slice().map(d => {
+			const diff = sortCellChanges(this._cellsDiffInfo.get()).slice().map((d) => {
 				if (d.type === 'unchanged' && d.modifiedCellIndex >= edit.index && d.modifiedCellIndex <= (edit.index + edit.count - 1)) {
 					return this.createDeleteCellDiffInfo(d.originalCellIndex);
 				}
@@ -435,16 +568,53 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				}
 				return d;
 			});
-			this._cellDiffInfo.set(diff, undefined);
-			this._changesCount.set(countChanges(this._cellDiffInfo.get()), undefined);
+			this.updateCellDiffInfo(diff, undefined);
 		}
 	}
 
-	createUnchangedCellDiffInfo(originalCellIndex: number, modifiedCellIndex: number): ICellDiffInfo {
-		const cell = this.modifiedModel.cells[modifiedCellIndex];
-		return { modifiedCellIndex, originalCellIndex, diff: this.getDiffForUnchangedCell(cell), type: 'unchanged' };
+	private computeStateAfterAcceptingRejectingChanges(accepted: boolean) {
+		const currentSnapshot = createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService);
+		if (new SnapshotComparer(currentSnapshot).isEqual(this.originalModel)) {
+			const state = accepted ? WorkingSetEntryState.Accepted : WorkingSetEntryState.Rejected;
+			this._stateObs.set(state, undefined);
+		}
+	}
+
+	createModifiedCellDiffInfo(modifiedCellIndex: number, originalCellIndex: number): ICellDiffInfo {
+		const modifiedCell = this.modifiedModel.cells[modifiedCellIndex];
+		const originalCell = this.originalModel.cells[originalCellIndex];
+		this.modifiedToOriginalCell.set(modifiedCell.uri, originalCell.uri);
+		const modifiedCellModelPromise = this.resolveCellModel(modifiedCell.uri);
+		const originalCellModelPromise = this.resolveCellModel(originalCell.uri);
+
+		Promise.all([modifiedCellModelPromise, originalCellModelPromise]).then(([modifiedCellModel, originalCellModel]) => {
+			this.getOrCreateModifiedTextFileEntryForCell(modifiedCell, modifiedCellModel, originalCellModel);
+		});
+
+		const diff = observableValue('diff', nullDocumentDiff);
+		const unchangedCell: ICellDiffInfo = {
+			type: 'unchanged',
+			modifiedCellIndex,
+			originalCellIndex,
+			keep: async (changes: DetailedLineRangeMapping) => {
+				const [modifiedCellModel, originalCellModel] = await Promise.all([modifiedCellModelPromise, originalCellModelPromise]);
+				const entry = this.getOrCreateModifiedTextFileEntryForCell(modifiedCell, modifiedCellModel, originalCellModel);
+				return entry ? entry.keep(changes) : false;
+			},
+			undo: async (changes: DetailedLineRangeMapping) => {
+				const [modifiedCellModel, originalCellModel] = await Promise.all([modifiedCellModelPromise, originalCellModelPromise]);
+				const entry = this.getOrCreateModifiedTextFileEntryForCell(modifiedCell, modifiedCellModel, originalCellModel);
+				return entry ? entry.undo(changes) : false;
+			},
+			modifiedModel: new ObservablePromise(modifiedCellModelPromise),
+			originalModel: new ObservablePromise(originalCellModelPromise),
+			diff
+		};
+
+		return unchangedCell;
+
 	}
-	createInsertedCellDiffInfo(modifiedCellIndex: number, modifiedCellModel: ITextModel): ICellDiffInfo {
+	createInsertedCellDiffInfo(modifiedCellIndex: number): ICellDiffInfo {
 		const cell = this.modifiedModel.cells[modifiedCellIndex];
 		const lines = cell.getValue().split(/\r?\n/);
 		const originalRange = new Range(1, 0, 1, 0);
@@ -457,8 +627,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		// For inserted cells there's no original model, so we create a new empty text model and pass that as the original.
 		const originalModelUri = this.modifiedModel.uri.with({ query: (ChatEditingModifiedNotebookEntry.NewModelCounter++).toString(), scheme: 'emptyCell' });
 		const originalModel = this.modelService.getModel(originalModelUri) || this._register(this.modelService.createModel('', null, originalModelUri));
-		this.modifiedCellModels.set(cell.uri, modifiedCellModel);
-		this.modifiedToOriginalCellMap.set(cell.uri, originalModel);
+		this.modifiedToOriginalCell.set(cell.uri, originalModelUri);
 		const keep = async () => {
 			await this._applyEdits(async () => this.keepPreviouslyInsertedCell(cell));
 			this.computeStateAfterAcceptingRejectingChanges(true);
@@ -469,31 +638,27 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			this.computeStateAfterAcceptingRejectingChanges(false);
 			return true;
 		};
-		this.getOrCreateModifiedTextFileEntryForCell(cell, keep, undo);
+		this.resolveCellModel(cell.uri).then(modifiedModel => {
+			// We want decorators for the cell just as we display decorators for modified cells.
+			// This way we have the ability to accept/reject the entire cell.
+			this.getOrCreateModifiedTextFileEntryForCell(cell, modifiedModel, originalModel);
+		});
 		return {
 			type: 'insert' as const,
 			originalCellIndex: undefined,
 			modifiedCellIndex: modifiedCellIndex,
-			diff: {
+			keep,
+			undo,
+			modifiedModel: new ObservablePromise(this.resolveCellModel(cell.uri)),
+			originalModel: new ObservablePromise(Promise.resolve(originalModel)),
+			diff: observableValue('deletedCellDiff', {
 				changes,
 				identical: false,
 				moves: [],
 				quitEarly: false,
-				keep,
-				undo,
-				modifiedModel: modifiedCellModel,
-				originalModel,
-			}
+			})
 		} satisfies ICellDiffInfo;
 	}
-	private computeStateAfterAcceptingRejectingChanges(accepted: boolean) {
-		const currentSnapshot = createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService);
-		const originalSnapshot = createSnapshot(this.originalModel, this.transientOptions, this.configurationService);
-		if (currentSnapshot === originalSnapshot) {
-			const state = accepted ? WorkingSetEntryState.Accepted : WorkingSetEntryState.Rejected;
-			this._stateObs.set(state, undefined);
-		}
-	}
 	createDeleteCellDiffInfo(originalCellIndex: number): ICellDiffInfo {
 		const originalCell = this.originalModel.cells[originalCellIndex];
 		const lines = new Array(originalCell.textBuffer.getLineCount()).fill(0).map((_, i) => originalCell.textBuffer.getLineContent(i + 1));
@@ -519,21 +684,22 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			type: 'delete' as const,
 			modifiedCellIndex: undefined,
 			originalCellIndex,
-			diff: {
+			originalModel: new ObservablePromise(this.resolveCellModel(originalCell.uri)),
+			modifiedModel: new ObservablePromise(Promise.resolve(modifiedModel)),
+			keep,
+			undo,
+			diff: observableValue('cellDiff', {
 				changes,
 				identical: false,
 				moves: [],
 				quitEarly: false,
-				originalModel: originalCell.textModel!,
-				modifiedModel: modifiedModel,
-				keep,
-				undo,
-			}
+			})
 		} satisfies ICellDiffInfo;
 	}
+
 	private undoPreviouslyInsertedCell(cell: NotebookCellTextModel) {
 		const index = this.modifiedModel.cells.indexOf(cell);
-		const diff = sortCellChanges(this._cellDiffInfo.get()).slice().map(d => {
+		const diff = sortCellChanges(this._cellsDiffInfo.get()).slice().map(d => {
 			if (d.type === 'insert' && d.modifiedCellIndex === index) {
 				return d;
 			}
@@ -547,66 +713,56 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		}).filter(d => !(d.type === 'insert' && d.modifiedCellIndex === index));
 		const edit: ICellReplaceEdit = { cells: [], count: 1, editType: CellEditType.Replace, index, };
 		this.modifiedModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
-		this._cellDiffInfo.set(diff, undefined);
-		this._changesCount.set(countChanges(this._cellDiffInfo.get()), undefined);
+		this.disposeDeletedCellEntries();
+		this.updateCellDiffInfo(diff, undefined);
 	}
 
-	private async keepPreviouslyInsertedCell(cell: NotebookCellTextModel) {
+	private keepPreviouslyInsertedCell(cell: NotebookCellTextModel) {
 		const modifiedCellIndex = this.modifiedModel.cells.indexOf(cell);
 		if (modifiedCellIndex === -1) {
 			// Not possible.
 			return;
 		}
 		// Find where we should insert this cell in the original notebook.
-		let diff = sortCellChanges(this._cellDiffInfo.get()).slice();
-		const entryIndex = diff.findIndex(d => d.type === 'insert' && d.modifiedCellIndex === modifiedCellIndex);
+		const cellDiffs = sortCellChanges(this._cellsDiffInfo.get()).slice();
+		const entryIndex = cellDiffs.findIndex(d => d.type === 'insert' && d.modifiedCellIndex === modifiedCellIndex);
 		if (entryIndex === -1) {
 			// Not possible.
 			return;
 		}
-		diff = diff.slice(0, entryIndex);
-		const index = diff.reduce((prev, d) => Math.max(prev, d.type === 'insert' ? -1 : d.originalCellIndex), 0);
+		// Find the index in original notebook where this cell must be inserted..
+		// If there are cells before this then insert just after that else start at index 0.
+		const index = (cellDiffs.slice(0, entryIndex).reverse().find(c => typeof c.originalCellIndex === 'number')?.originalCellIndex ?? -1) + 1;
 		const cellToInsert: ICellDto2 = {
 			cellKind: cell.cellKind,
 			language: cell.language,
 			metadata: cell.metadata,
 			outputs: cell.outputs,
 			source: cell.getValue(),
-			mime: cell.mime
+			mime: cell.mime,
+			internalMetadata: {
+				cellId: cell.internalMetadata.cellId
+			}
 		};
 		const edit: ICellReplaceEdit = { cells: [cellToInsert], count: 0, editType: CellEditType.Replace, index, };
 		this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
-		const originalCell = this.originalModel.cells[index];
-		const originalModel = originalCell.textModel ?? this._register((await this.textModelService.createModelReference(originalCell.uri))).object.textEditorModel;
-		this.originalCellModels.set(originalCell.uri, originalModel);
-		this.modifiedToOriginalCellMap.set(cell.uri, originalCell.textModel!);
-		const unchangedCell: ICellDiffInfo = {
-			type: 'unchanged',
-			modifiedCellIndex,
-			originalCellIndex: index,
-			diff: this.getDiffForUnchangedCell(cell)
-		};
-		diff.push(unchangedCell);
-		this._cellDiffInfo.set(sortCellChanges(diff), undefined);
-		this._changesCount.set(countChanges(this._cellDiffInfo.get()), undefined);
+		this.cellEntryMap.get(cell.uri)?.dispose();
+		this.cellEntryMap.delete(cell.uri);
+		const unchangedCell: ICellDiffInfo = this.createModifiedCellDiffInfo(modifiedCellIndex, index);
+		cellDiffs.splice(entryIndex, 1, unchangedCell);
+		this.updateCellDiffInfo(cellDiffs, undefined);
 	}
 
-	private async undoPreviouslyDeletedCell(deletedOriginalIndex: number, originalCell: NotebookCellTextModel) {
+	private undoPreviouslyDeletedCell(deletedOriginalIndex: number, originalCell: NotebookCellTextModel) {
+		let cellDiffs = sortCellChanges(this._cellsDiffInfo.get()).slice();
 		// Find where we should insert this cell.
-		const index = sortCellChanges(this._cellDiffInfo.get()).reverse().reduce((previous, curr) => {
-			if (curr.type === 'delete' || curr.type === 'insert') {
-				return previous;
-			}
-			if (curr.originalCellIndex <= deletedOriginalIndex) {
-				return previous;
-			}
-			if (curr.modifiedCellIndex < previous) {
-				return curr.modifiedCellIndex;
-			}
-			return previous;
-		}, this.modifiedModel.cells.length - 1);
-
-		const diff = sortCellChanges(this._cellDiffInfo.get()).slice()
+		const cellDiffInfoIndex = cellDiffs.findIndex(d => d.type === 'delete' && d.originalCellIndex === deletedOriginalIndex);
+		if (cellDiffInfoIndex === -1) {
+			return;
+		}
+		// If there are no more cells, then start at index 0, else start at the previous cell.
+		const index = (cellDiffs.slice(0, cellDiffInfoIndex).reverse().find(c => c.type !== 'delete')?.modifiedCellIndex ?? -1) + 1;
+		cellDiffs = cellDiffs
 			.map(d => {
 				if (d.type !== 'delete' && d.modifiedCellIndex >= index) {
 					return {
@@ -615,7 +771,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 					};
 				}
 				return d;
-			}).filter(d => !(d.type === 'delete' && d.originalCellIndex === deletedOriginalIndex));
+			});
 
 		const cellToInsert: ICellDto2 = {
 			cellKind: originalCell.cellKind,
@@ -623,23 +779,16 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			metadata: originalCell.metadata,
 			outputs: originalCell.outputs,
 			source: originalCell.getValue(),
-			mime: originalCell.mime
+			mime: originalCell.mime,
+			internalMetadata: {
+				cellId: originalCell.internalMetadata.cellId
+			}
 		};
 		const edit: ICellReplaceEdit = { cells: [cellToInsert], count: 0, editType: CellEditType.Replace, index, };
 		this.modifiedModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
-		const newCell = this.modifiedModel.cells[index];
-		const modifiedModel = newCell.textModel ?? this._register((await this.textModelService.createModelReference(newCell.uri))).object.textEditorModel;
-		this.modifiedCellModels.set(newCell.uri, modifiedModel);
-		this.modifiedToOriginalCellMap.set(newCell.uri, originalCell.textModel!);
-		const unchangedCell: ICellDiffInfo = {
-			type: 'unchanged',
-			modifiedCellIndex: index,
-			originalCellIndex: deletedOriginalIndex,
-			diff: this.getDiffForUnchangedCell(newCell)
-		};
-		diff.push(unchangedCell);
-		this._cellDiffInfo.set(sortCellChanges(diff), undefined);
-		this._changesCount.set(countChanges(this._cellDiffInfo.get()), undefined);
+		const unchangedCell = this.createModifiedCellDiffInfo(index, deletedOriginalIndex);
+		cellDiffs.splice(cellDiffInfoIndex, 1, unchangedCell);
+		this.updateCellDiffInfo(cellDiffs, undefined);
 	}
 
 
@@ -647,7 +796,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		// Delete this cell from original as well.
 		const edit: ICellReplaceEdit = { cells: [], count: 1, editType: CellEditType.Replace, index: deletedOriginalIndex, };
 		this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
-		const diffs = sortCellChanges(this._cellDiffInfo.get()).slice()
+		const diffs = sortCellChanges(this._cellsDiffInfo.get()).slice()
 			.filter(d => !(d.type === 'delete' && d.originalCellIndex === deletedOriginalIndex))
 			.map(diff => {
 				if (diff.type !== 'insert' && diff.originalCellIndex > deletedOriginalIndex) {
@@ -658,8 +807,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				}
 				return diff;
 			});
-		this._cellDiffInfo.set(diffs, undefined);
-		this._changesCount.set(countChanges(this._cellDiffInfo.get()), undefined);
+		this.updateCellDiffInfo(diffs, undefined);
 	}
 
 	private async _applyEdits(operation: () => Promise<void>) {
@@ -673,7 +821,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	}
 
 	calculateRewriteRadio() {
-		const cellChanges = this._cellDiffInfo.get();
+		const cellChanges = this._cellsDiffInfo.get();
 		const totalNumberOfUpdatedLines = cellChanges.reduce((totalUpdatedLines, value) => {
 			const getUpadtedLineCount = () => {
 				if (value.type === 'unchanged') {
@@ -685,7 +833,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				if (value.type === 'insert') {
 					return this.modifiedModel.cells[value.modifiedCellIndex].textModel?.getLineCount() ?? 0;
 				}
-				return value.diff.changes.reduce((maxLineNumber, change) => {
+				return value.diff.get().changes.reduce((maxLineNumber, change) => {
 					return Math.max(maxLineNumber, change.modified.endLineNumberExclusive);
 				}, 0);
 			};
@@ -715,64 +863,85 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		return !!snapshot &&
 			this.modifiedURI.toString() === snapshot.resource.toString() &&
 			this.state.get() === snapshot.state &&
-			createSnapshot(this.originalModel, this.transientOptions, this.configurationService) === snapshot.original &&
-			createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService) === snapshot.current;
+			new SnapshotComparer(snapshot.original).isEqual(this.originalModel) &&
+			new SnapshotComparer(snapshot.current).isEqual(this.modifiedModel);
 
 	}
 
 	override restoreFromSnapshot(snapshot: ISnapshotEntry): void {
 		this._stateObs.set(snapshot.state, undefined);
 		restoreSnapshot(this.originalModel, snapshot.original);
-		restoreSnapshot(this.modifiedModel, snapshot.current);
+		this.restoreSnapshotInModifiedModel(snapshot.current);
+		this.updateCellDiffInfo([], undefined);
+		this.initializeModelsFromDiff();
 	}
 
 	override resetToInitialContent(): void {
-		restoreSnapshot(this.modifiedModel, this.initialContent);
+		this.restoreSnapshotInModifiedModel(this.initialContent);
+		this.initializeModelsFromDiff();
+	}
+
+	private restoreSnapshotInModifiedModel(snapshot: string) {
+		if (snapshot === createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService)) {
+			return;
+		}
+
+		this._applyEdits(async () => {
+			// See private _setDocValue in chatEditingModifiedDocumentEntry.ts
+			this.modifiedModel.pushStackElement();
+			restoreSnapshot(this.modifiedModel, snapshot);
+			this.modifiedModel.pushStackElement();
+		});
+	}
+
+	private async resolveCellModel(cellURI: URI): Promise<ITextModel> {
+		const cell = this.originalModel.cells.concat(this.modifiedModel.cells).find(cell => isEqual(cell.uri, cellURI));
+		if (!cell) {
+			throw new Error('Cell not found');
+		}
+		if (cell.textModel) {
+			return cell.textModel;
+		}
+		return this._register(await this.textModelService.createModelReference(cell.uri)).object.textEditorModel;
 	}
 
-	getOrCreateModifiedTextFileEntryForCell(cell: NotebookCellTextModel, accept?: () => Promise<boolean>, reject?: () => Promise<boolean>): ChatEditingNotebookCellEntry | undefined {
-		let cellEntry = this.cellEntryMap.get(cell);
+	getOrCreateModifiedTextFileEntryForCell(cell: NotebookCellTextModel, modifiedCellModel: ITextModel, originalCellModel: ITextModel): ChatEditingNotebookCellEntry | undefined {
+		let cellEntry = this.cellEntryMap.get(cell.uri);
 		if (cellEntry) {
 			return cellEntry;
 		}
-		const originalCellModel = this.modifiedToOriginalCellMap.get(cell.uri);
-		const modifiedCellModel = this.modifiedCellModels.get(cell.uri);
-		if (!modifiedCellModel || !originalCellModel) {
-			return;
-		}
-		cellEntry = this._register(this._instantiationService.createInstance(ChatEditingNotebookCellEntry, this.modifiedResourceRef.object.resource, cell, modifiedCellModel, originalCellModel, this._telemetryInfo, accept, reject));
-		this.cellEntryMap.set(cell, cellEntry);
 
-		this._register(autorun(r => {
-			const cellDiff = cellEntry.diffInfo.read(r);
-			let diffs = this.cellDiffInfo.get().slice();
+		const disposables = this._register(new DisposableStore());
+		cellEntry = this._register(this._instantiationService.createInstance(ChatEditingNotebookCellEntry, this.modifiedResourceRef.object.resource, cell, modifiedCellModel, originalCellModel, this._telemetryInfo, disposables));
+		this.cellEntryMap.set(cell.uri, cellEntry);
+		disposables.add(autorun(r => {
+			if (this.modifiedModel.cells.indexOf(cell) === -1) {
+				return;
+			}
+			const diffs = this.cellsDiffInfo.get().slice();
 			const index = this.modifiedModel.cells.indexOf(cell);
 			const entry = diffs.find(entry => entry.modifiedCellIndex === index);
 			if (!entry) {
 				// Not possible.
 				return;
 			}
-			entry.diff = { ...entry.diff, ...cellDiff };
-			if (cellDiff.identical) {
-				entry.diff = { ...entry.diff, ...nullDocumentDiff };
-			}
-			if (entry.type === 'unchanged' || entry.type === 'modified') {
-				entry.type = cellDiff.identical ? 'unchanged' : 'modified';
-			}
-			diffs = diffs.filter(entry => entry.modifiedCellIndex !== index).concat({ ...entry });
+			entry.diff.set(cellEntry.diffInfo.read(r), undefined);
+			diffs.splice(diffs.indexOf(entry), 1, { ...entry });
 			const maxModifiedLineNumber = cellEntry.maxModifiedLineNumber.read(r);
-			const changeCount = countChanges(diffs);
 			const maxModifiedLineNumbers = this._maxModifiedLineNumbers.get().slice();
 			maxModifiedLineNumbers[index] = maxModifiedLineNumber;
 
 			transaction(tx => {
-				this._cellDiffInfo.set(sortCellChanges(diffs), tx);
-				this._changesCount.set(changeCount, tx);
+				this.updateCellDiffInfo(diffs, tx);
 				this._maxModifiedLineNumbers.set(maxModifiedLineNumbers, tx);
 			});
 		}));
 
-		this._register(autorun(r => {
+		disposables.add(autorun(r => {
+			if (this.modifiedModel.cells.indexOf(cell) === -1) {
+				return;
+			}
+
 			const cellState = cellEntry.state.read(r);
 			if (cellState === WorkingSetEntryState.Accepted) {
 				this.computeStateAfterAcceptingRejectingChanges(true);
@@ -781,9 +950,6 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			}
 		}));
 
-		const entries = this.modifiedModel.cells.map(cell => this.cellEntryMap.get(cell)).filter(entry => !!entry);
-		this._entries.set(entries, undefined);
-
 		return cellEntry;
 	}
 }
@@ -830,7 +996,9 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 
 	private readonly _diffInfo = observableValue<IDocumentDiff>(this, nullDocumentDiff);
 	public readonly changesCount: IObservable<number>;
-	public readonly diffInfo: IObservable<IDocumentDiff2>;
+	public get diffInfo(): IObservable<IDocumentDiff> {
+		return this._diffInfo;
+	}
 	private readonly _maxModifiedLineNumber = observableValue<number>(this, 0);
 	readonly maxModifiedLineNumber = this._maxModifiedLineNumber;
 
@@ -842,6 +1010,7 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 	readonly state: IObservable<WorkingSetEntryState> = this._stateObs;
 	protected readonly _isCurrentlyBeingModifiedByObs = observableValue<IChatResponseModel | undefined>(this, undefined);
 	readonly isCurrentlyBeingModifiedBy: IObservable<IChatResponseModel | undefined> = this._isCurrentlyBeingModifiedByObs;
+	private readonly initialContent: string;
 
 	constructor(
 		public readonly notebookUri: URI,
@@ -849,8 +1018,7 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 		private readonly modifiedModel: ITextModel,
 		private readonly originalModel: ITextModel,
 		private readonly _telemetryInfo: IModifiedEntryTelemetryInfo,
-		acceptChange: (() => Promise<boolean>) | undefined,
-		undoChange: (() => Promise<boolean>) | undefined,
+		disposables: DisposableStore,
 		@IConfigurationService configService: IConfigurationService,
 		@IChatService private readonly _chatService: IChatService,
 		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
@@ -858,20 +1026,10 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 		@INotebookEditorService private readonly notebookEditorService: INotebookEditorService
 	) {
 		super();
-		this.diffInfo = this._diffInfo.map(value => {
-			return {
-				...value,
-				originalModel: this.originalModel,
-				modifiedModel: this.modifiedModel,
-				keep: changes => acceptChange ? acceptChange() : this._acceptHunk(changes),
-				undo: changes => undoChange ? undoChange() : this._rejectHunk(changes)
-			} satisfies IDocumentDiff2;
-		});
+		this.initialContent = this.originalModel.getValue();
+		this._register(disposables);
 		this.changesCount = this._diffInfo.map(diff => diff.changes.length);
 		this._register(this.modifiedModel.onDidChangeContent(e => {
-			if (this.disposed) {
-				return;
-			}
 			this._mirrorEdits(e);
 
 		}));
@@ -935,6 +1093,17 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 
 			this._allEditsAreFromUs = false;
 			this._updateDiffInfoSeq();
+
+			const didResetToOriginalContent = this.modifiedModel.getValue() === this.initialContent;
+			const currentState = this._stateObs.get();
+			switch (currentState) {
+				case WorkingSetEntryState.Modified:
+					if (didResetToOriginalContent) {
+						this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
+						break;
+					}
+			}
+
 		}
 	}
 
@@ -1001,6 +1170,10 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 		this._maxModifiedLineNumber.set(0, tx);
 	}
 
+	public async keep(change: DetailedLineRangeMapping): Promise<boolean> {
+		return this._acceptHunk(change);
+	}
+
 	private async _acceptHunk(change: DetailedLineRangeMapping): Promise<boolean> {
 		this._isEditFromUs = true;
 		try {
@@ -1025,6 +1198,10 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 		return true;
 	}
 
+	public async undo(change: DetailedLineRangeMapping): Promise<boolean> {
+		return this._rejectHunk(change);
+	}
+
 	private async _rejectHunk(change: DetailedLineRangeMapping): Promise<boolean> {
 		this._isEditFromUs = true;
 		try {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookSnapshot.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookSnapshot.ts
index 68e96412c6d2..52acc037e778 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookSnapshot.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookSnapshot.ts
@@ -7,8 +7,9 @@ import { decodeBase64, encodeBase64, VSBuffer } from '../../../../../base/common
 import { URI } 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';
 import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
-import { ICellDto2, IOutputItemDto, NotebookData, NotebookSetting, TransientOptions } from '../../../notebook/common/notebookCommon.js';
+import { CellEditType, ICellDto2, ICellEditOperation, IOutputItemDto, NotebookData, NotebookSetting, TransientOptions } from '../../../notebook/common/notebookCommon.js';
 
 const BufferMarker = 'ArrayBuffer-4f56482b-5a03-49ba-8356-210d3b0c1c3d';
 
@@ -37,46 +38,106 @@ export function restoreSnapshot(notebook: NotebookTextModel, snapshot: string):
 	try {
 		const { transientOptions, data } = deserializeSnapshot(snapshot);
 		notebook.restoreSnapshot(data, transientOptions);
+		const edits: ICellEditOperation[] = [];
+		data.cells.forEach((cell, index) => {
+			const cellId = cell.internalMetadata?.cellId;
+			if (cellId) {
+				edits.push({ editType: CellEditType.PartialInternalMetadata, index, internalMetadata: { cellId } });
+			}
+		});
+		notebook.applyEdits(edits, true, undefined, () => undefined, undefined, false);
 	}
 	catch (ex) {
 		console.error('Error restoring Notebook snapshot', ex);
 	}
 }
 
-export function serializeSnapshot(data: NotebookData, transientOptions: TransientOptions | undefined): string {
-	data.cells.forEach(cell => {
-		const outputs = cell.outputs.map(output => {
-			// Ensure we're in full control of the data being stored.
-			// Possible we have classes instead of plain objects.
-			return {
-				outputId: output.outputId,
-				metadata: output.metadata,
-				outputs: output.outputs.map(item => {
-					return {
-						data: item.data,
-						mime: item.mime,
-					} satisfies IOutputItemDto;
-				}),
-			};
-		});
+export class SnapshotComparer {
+	private readonly data: NotebookData;
+	constructor(initialCotent: string) {
+		this.data = deserializeSnapshot(initialCotent).data;
+	}
+
+	isEqual(notebook: NotebookData | NotebookTextModel): boolean {
+		if (notebook.cells.length !== this.data.cells.length) {
+			return false;
+		}
+		if (JSON.stringify(notebook.metadata) !== JSON.stringify(this.data.metadata)) {
+			return false;
+		}
+		for (let i = 0; i < notebook.cells.length; i++) {
+			const notebookCell = notebook.cells[i];
+			const comparerCell = this.data.cells[i];
+			if (notebookCell instanceof NotebookCellTextModel) {
+				if (!notebookCell.fastEqual(comparerCell, true)) {
+					return false;
+				}
+			} else {
+				if (notebookCell.cellKind !== comparerCell.cellKind) {
+					return false;
+				}
+				if (notebookCell.language !== comparerCell.language) {
+					return false;
+				}
+				if (notebookCell.mime !== comparerCell.mime) {
+					return false;
+				}
+				if (notebookCell.source !== comparerCell.source) {
+					return false;
+				}
+				if (notebookCell.outputs.length !== comparerCell.outputs.length) {
+					return false;
+				}
+				if (JSON.stringify(notebookCell.metadata) !== JSON.stringify(comparerCell.metadata)) {
+					return false;
+				}
+				if (JSON.stringify(sanitizeCellDto2(notebookCell, true)) !== JSON.stringify(sanitizeCellDto2(comparerCell, true))) {
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+}
+
+function sanitizeCellDto2(cell: ICellDto2, ignoreInternalMetadata?: boolean): ICellDto2 {
+	const outputs = cell.outputs.map(output => {
 		// Ensure we're in full control of the data being stored.
 		// Possible we have classes instead of plain objects.
 		return {
-			cellKind: cell.cellKind,
-			language: cell.language,
-			metadata: cell.metadata,
-			outputs,
-			mime: cell.mime,
-			source: cell.source,
-			collapseState: cell.collapseState,
-			// No need to store the internal metadata, as this can contain unique information such as cell ids.
-			// Also its not something that can be persisted, hence no need to try to restore that either.
-			internalMetadata: undefined
-		} satisfies ICellDto2;
+			outputId: output.outputId,
+			metadata: output.metadata,
+			outputs: output.outputs.map(item => {
+				return {
+					data: item.data,
+					mime: item.mime,
+				} satisfies IOutputItemDto;
+			}),
+		};
 	});
+	// Ensure we're in full control of the data being stored.
+	// Possible we have classes instead of plain objects.
+	return {
+		cellKind: cell.cellKind,
+		language: cell.language,
+		metadata: cell.metadata,
+		outputs,
+		mime: cell.mime,
+		source: cell.source,
+		collapseState: cell.collapseState,
+		internalMetadata: ignoreInternalMetadata ? undefined : cell.internalMetadata
+	} satisfies ICellDto2;
+}
+
+function serializeSnapshot(data: NotebookData, transientOptions: TransientOptions | undefined): string {
+	const dataDto: NotebookData = {
+		cells: data.cells.map(cell => sanitizeCellDto2(cell)),
+		metadata: data.metadata,
+	};
 	return JSON.stringify([
 		JSON.stringify(transientOptions)
-		, JSON.stringify(data, (_key, value) => {
+		, JSON.stringify(dataDto, (_key, value) => {
 			if (value instanceof VSBuffer) {
 				return {
 					type: BufferMarker,
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
index 7306e57148ea..774012a01bfd 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
@@ -4,10 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { autorun, derivedWithStore, IObservable, ISettableObservable, observableFromEvent, observableValue } from '../../../../../base/common/observable.js';
+import { autorun, derivedWithStore, IObservable, ISettableObservable, observableFromEvent, ObservablePromise, observableValue } from '../../../../../base/common/observable.js';
 import { debouncedObservable } from '../../../../../base/common/observableInternal/utils.js';
 import { basename } from '../../../../../base/common/resources.js';
-import { nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
+import { IDocumentDiff, nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
+import { DetailedLineRangeMapping } from '../../../../../editor/common/diff/rangeMapping.js';
+import { ITextModel } from '../../../../../editor/common/model.js';
 import { localize } from '../../../../../nls.js';
 import { MenuId } from '../../../../../platform/actions/common/actions.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
@@ -24,6 +26,25 @@ import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js
 import { IModifiedFileEntry, IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from '../../common/chatEditingService.js';
 import { ChatEditingCodeEditorIntegration, IDocumentDiff2 } from './chatEditingCodeEditorIntegration.js';
 
+interface IDocumentDiffWithModelsAndActions {
+	/**
+	 * The changes between the original and modified document.
+	 */
+	diff: ISettableObservable<IDocumentDiff>;
+	/**
+	 * The original model.
+	 * Cell text models load asynchronously, so this is an observable promise.
+	 */
+	originalModel: ObservablePromise<ITextModel>;
+	/**
+	 * The modified model.
+	 * Cell text models load asynchronously, so this is an observable promise.
+	 */
+	modifiedModel: ObservablePromise<ITextModel>;
+	keep(changes: DetailedLineRangeMapping): Promise<boolean>;
+	undo(changes: DetailedLineRangeMapping): Promise<boolean>;
+}
+
 /**
  * All entries will contain a IDocumentDiff
  * Even when there are no changes, diff will contain the number of lines in the document.
@@ -33,25 +54,21 @@ export type ICellDiffInfo = {
 	originalCellIndex: number;
 	modifiedCellIndex: number;
 	type: 'unchanged';
-	diff: IDocumentDiff2; // Null diff Change (property to be consistent with others, also we have a list of all line numbers)
-} | {
+} & IDocumentDiffWithModelsAndActions | {
 	originalCellIndex: number;
 	modifiedCellIndex: number;
 	type: 'modified';
-	diff: IDocumentDiff2; // List of the changes.
-} |
-{
-	modifiedCellIndex: undefined;
-	originalCellIndex: number;
-	type: 'delete';
-	diff: IDocumentDiff2; // List of all the lines deleted.
-} |
-{
-	modifiedCellIndex: number;
-	originalCellIndex: undefined;
-	type: 'insert';
-	diff: IDocumentDiff2; // List of all the new lines.
-};
+} & IDocumentDiffWithModelsAndActions |
+	{
+		modifiedCellIndex: undefined;
+		originalCellIndex: number;
+		type: 'delete';
+	} & IDocumentDiffWithModelsAndActions |
+	{
+		modifiedCellIndex: number;
+		originalCellIndex: undefined;
+		type: 'insert';
+	} & IDocumentDiffWithModelsAndActions;
 
 
 export class ChatEditingNotebookEditorIntegration extends Disposable implements IModifiedFileEntryEditorIntegration {
@@ -91,12 +108,12 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 
 			if (!_entry.isCurrentlyBeingModifiedBy.read(r)
 				&& lastModifyingRequestId !== _entry.lastModifyingRequestId
-				&& cellChanges.read(r).some(c => c.type !== 'unchanged' && c.type !== 'delete' && !c.diff.identical && !c.diff.identical)
+				&& cellChanges.read(r).some(c => c.type !== 'unchanged' && c.type !== 'delete' && !c.diff.read(r).identical)
 			) {
 				lastModifyingRequestId = _entry.lastModifyingRequestId;
 				const firstModifiedCell = cellChanges.read(r).
 					filter(c => c.type !== 'unchanged' && c.type !== 'delete').
-					filter(c => !c.diff.identical).
+					filter(c => !c.diff.read(r).identical).
 					reduce((prev, curr) => curr.modifiedCellIndex < prev ? curr.modifiedCellIndex : prev, Number.MAX_SAFE_INTEGER);
 				if (typeof firstModifiedCell !== 'number' || firstModifiedCell === Number.MAX_SAFE_INTEGER) {
 					return;
@@ -110,7 +127,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 		this._register(autorun(r => {
 			const sortedCellChanges = sortCellChanges(cellChanges.read(r));
 
-			const changes = sortedCellChanges.filter(c => c.type !== 'unchanged' && c.type !== 'delete' && !c.diff.identical);
+			const changes = sortedCellChanges.filter(c => c.type !== 'modified' && c.type !== 'delete' && !c.diff.read(r).identical);
 			onDidChangeVisibleRanges.read(r);
 			if (!changes.length) {
 				this.cellEditorIntegrations.forEach(({ diff }) => {
@@ -120,20 +137,29 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 			}
 
 			const validCells = new Set<NotebookCellTextModel>();
-			changes.forEach((diff) => {
-				if (diff.modifiedCellIndex === undefined) {
+			changes.forEach((change) => {
+				if (change.modifiedCellIndex === undefined || change.modifiedCellIndex >= notebookModel.cells.length) {
 					return;
 				}
-				const cell = notebookModel.cells[diff.modifiedCellIndex];
-				const editor = notebookEditor.codeEditors.find(([vm,]) => vm.handle === notebookModel.cells[diff.modifiedCellIndex].handle)?.[1];
-				if (!editor || !cell) {
+				const cell = notebookModel.cells[change.modifiedCellIndex];
+				const editor = notebookEditor.codeEditors.find(([vm,]) => vm.handle === notebookModel.cells[change.modifiedCellIndex].handle)?.[1];
+				const modifiedModel = change.modifiedModel.promiseResult.read(r)?.data;
+				const originalModel = change.originalModel.promiseResult.read(r)?.data;
+				if (!editor || !cell || !originalModel || !modifiedModel) {
 					return;
 				}
+				const diff = {
+					...change.diff.read(r),
+					modifiedModel,
+					originalModel,
+					keep: change.keep,
+					undo: change.undo
+				} satisfies IDocumentDiff2;
 				validCells.add(cell);
 				if (this.cellEditorIntegrations.has(cell)) {
-					this.cellEditorIntegrations.get(cell)!.diff.set(diff.diff, undefined);
+					this.cellEditorIntegrations.get(cell)!.diff.set(diff, undefined);
 				} else {
-					const diff2 = observableValue(`diff${cell.handle}`, diff.diff);
+					const diff2 = observableValue(`diff${cell.handle}`, diff);
 					const integration = this.instantiationService.createInstance(ChatEditingCodeEditorIntegration, _entry, editor, diff2);
 					this.cellEditorIntegrations.set(cell, { integration, diff: diff2 });
 					this._register(integration);
@@ -167,7 +193,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 				if (currentChange) {
 					const change = currentChange.change;
 					const indexInChange = currentChange.index;
-					const diffChangeIndex = sortCellChanges(this.cellChanges.get().filter(c => c.type !== 'unchanged' && !c.diff.identical)).findIndex(c => c === change);
+					const diffChangeIndex = sortCellChanges(this.cellChanges.get().filter(c => c.type !== 'unchanged' && !c.diff.read(r).identical)).findIndex(c => c === change);
 
 					if (diffChangeIndex !== -1) {
 						this._currentIndex.set(diffChangeIndex + indexInChange, undefined);
@@ -192,16 +218,16 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 				argFactory: (deletedCellIndex: number) => {
 					return {
 						accept() {
-							const entry = cellChanges.get().find(c => c.type === 'delete' && c.originalCellIndex === deletedCellIndex)?.diff;
+							const entry = cellChanges.get().find(c => c.type === 'delete' && c.originalCellIndex === deletedCellIndex);
 							if (entry) {
-								return entry.keep(entry.changes[0]);
+								return entry.keep(entry.diff.get().changes[0]);
 							}
 							return Promise.resolve(true);
 						},
 						reject() {
-							const entry = cellChanges.get().find(c => c.type === 'delete' && c.originalCellIndex === deletedCellIndex)?.diff;
+							const entry = cellChanges.get().find(c => c.type === 'delete' && c.originalCellIndex === deletedCellIndex);
 							if (entry) {
-								return entry.undo(entry.changes[0]);
+								return entry.undo(entry.diff.get().changes[0]);
 							}
 							return Promise.resolve(true);
 						},
@@ -218,7 +244,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 
 		this._register(autorun(r => {
 			// We can have inserted cells that have been accepted, in those cases we do not wany any decorators on them.
-			const changes = cellChanges.read(r).filter(c => c.type === 'insert' ? !c.diff.identical : true);
+			const changes = cellChanges.read(r).filter(c => c.type === 'insert' ? !c.diff.read(r).identical : true);
 			const decorators = this.insertDeleteDecorators.read(r);
 			if (decorators) {
 				decorators.insertedCellDecorator.apply(changes);
@@ -471,7 +497,7 @@ export class ChatEditingNotebookDiffEditorIntegration extends Disposable impleme
 
 		this._store.add(autorun(r => {
 			const index = notebookDiffEditor.currentChangedIndex.read(r);
-			const numberOfCellChanges = cellChanges.read(r).filter(c => !c.diff.identical);
+			const numberOfCellChanges = cellChanges.read(r).filter(c => !c.diff.read(r).identical);
 			if (numberOfCellChanges.length && index >= 0 && index < numberOfCellChanges.length) {
 				// Notebook Diff editor only supports navigating through changes to cells.
 				// However in chat we take changes to lines in the cells into account.
@@ -497,7 +523,7 @@ export class ChatEditingNotebookDiffEditorIntegration extends Disposable impleme
 	}
 
 	next(_wrap: boolean): boolean {
-		const changes = this.cellChanges.get().filter(c => !c.diff.identical).length;
+		const changes = this.cellChanges.get().filter(c => !c.diff.get().identical).length;
 		if (this.notebookDiffEditor.currentChangedIndex.get() === changes - 1) {
 			return false;
 		}
@@ -506,7 +532,7 @@ export class ChatEditingNotebookDiffEditorIntegration extends Disposable impleme
 	}
 
 	previous(_wrap: boolean): boolean {
-		const changes = this.cellChanges.get().filter(c => !c.diff.identical).length;
+		const changes = this.cellChanges.get().filter(c => !c.diff.get().identical).length;
 		if (this.notebookDiffEditor.currentChangedIndex.get() === changes - 1) {
 			return false;
 		}
@@ -531,18 +557,19 @@ export class ChatEditingNotebookDiffEditorIntegration extends Disposable impleme
 }
 
 export function countChanges(changes: ICellDiffInfo[]): number {
-	return changes.reduce((count, diff) => {
+	return changes.reduce((count, change) => {
+		const diff = change.diff.get();
 		// When we accept some of the cell insert/delete the items might still be in the list.
-		if (diff.diff.identical) {
+		if (diff.identical) {
 			return count;
 		}
-		switch (diff.type) {
+		switch (change.type) {
 			case 'delete':
 				return count + 1; // We want to see 1 deleted entry in the pill for navigation
 			case 'insert':
 				return count + 1; // We want to see 1 new entry in the pill for navigation
 			case 'modified':
-				return count + diff.diff.changes.length;
+				return count + diff.changes.length;
 			default:
 				return count;
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index ef4b0fb5a39b..5f5d69c44dbd 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -1051,7 +1051,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		try {
 			// If a notebook isn't open, then use the old synchronization approach.
 			if (this._notebookService.hasSupportedNotebooks(notebookUri) && (this._notebookService.getNotebookTextModel(notebookUri) || ChatEditingModifiedNotebookEntry.canHandleSnapshotContent(initialContent))) {
-				return ChatEditingModifiedNotebookEntry.create(notebookUri, multiDiffEntryDelegate, telemetryInfo, chatKind, initialContent, this._instantiationService);
+				return await ChatEditingModifiedNotebookEntry.create(notebookUri, multiDiffEntryDelegate, telemetryInfo, chatKind, initialContent, this._instantiationService);
 			} else {
 				const ref = await this._textModelService.createModelReference(resource);
 				return this._instantiationService.createInstance(ChatEditingModifiedDocumentEntry, ref, multiDiffEntryDelegate, telemetryInfo, chatKind, initialContent);
@@ -1064,7 +1064,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			await this._bulkEditService.apply({ edits: [{ newResource: resource }] });
 			this._editorService.openEditor({ resource, options: { inactive: true, preserveFocus: true, pinned: true } });
 			if (this._notebookService.hasSupportedNotebooks(notebookUri)) {
-				return ChatEditingModifiedNotebookEntry.create(resource, multiDiffEntryDelegate, telemetryInfo, chatKind, initialContent, this._instantiationService);
+				return await ChatEditingModifiedNotebookEntry.create(resource, multiDiffEntryDelegate, telemetryInfo, ChatEditKind.Created, initialContent, this._instantiationService);
 			} else {
 				return this._createModifiedFileEntry(resource, telemetryInfo, true, initialContent);
 			}

From 3f73ea5fc01bc9291dd126c9323429fa3744d4c7 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Mon, 3 Mar 2025 18:30:43 +1100
Subject: [PATCH 0564/1815] Clear nb cell diff info before updating notebook
 models (#242443)

---
 .../browser/chatEditing/chatEditingModifiedNotebookEntry.ts  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index be444c3fc02f..21069ff486f0 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -398,9 +398,9 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	}
 
 	protected override async _doAccept(tx: ITransaction | undefined): Promise<void> {
+		this.updateCellDiffInfo([], tx);
 		const snapshot = createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService);
 		restoreSnapshot(this.originalModel, snapshot);
-		this.updateCellDiffInfo([], tx);
 		this.initializeModelsFromDiff();
 		await this._collapse(tx);
 	}
@@ -869,14 +869,15 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	}
 
 	override restoreFromSnapshot(snapshot: ISnapshotEntry): void {
+		this.updateCellDiffInfo([], undefined);
 		this._stateObs.set(snapshot.state, undefined);
 		restoreSnapshot(this.originalModel, snapshot.original);
 		this.restoreSnapshotInModifiedModel(snapshot.current);
-		this.updateCellDiffInfo([], undefined);
 		this.initializeModelsFromDiff();
 	}
 
 	override resetToInitialContent(): void {
+		this.updateCellDiffInfo([], undefined);
 		this.restoreSnapshotInModifiedModel(this.initialContent);
 		this.initializeModelsFromDiff();
 	}

From 14499bff92b30def1d0593e2b6cd0a2c7fd60038 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 3 Mar 2025 10:35:15 +0100
Subject: [PATCH 0565/1815] pause problems during edits generating, not just
 hiding squiggles (#242350)

* pause problems during edits generating, not just hiding squiggles

fixes https://github.com/microsoft/vscode-copilot/issues/13744

* update unit test
---
 src/vs/platform/markers/common/markerService.ts   |  8 +++-----
 .../markers/test/common/markerService.test.ts     |  2 +-
 .../chatEditingCodeEditorIntegration.ts           |  2 --
 .../chatEditingModifiedDocumentEntry.ts           | 15 ++++++++++++++-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/vs/platform/markers/common/markerService.ts b/src/vs/platform/markers/common/markerService.ts
index c1be33ca9668..68e6d0391bdf 100644
--- a/src/vs/platform/markers/common/markerService.ts
+++ b/src/vs/platform/markers/common/markerService.ts
@@ -310,11 +310,9 @@ export class MarkerService implements IMarkerService {
 	 * Creates an information marker for filtered resources
 	 */
 	private _createFilteredMarker(resource: URI, reasons: string[]): IMarker {
-		// Join all reasons with a comma or use the first reason if there's only one
-
-		const message = reasons.length > 1
-			? localize('filter.n', "{0} filters active", reasons.length)
-			: localize('filter.1', "Filtered: {0}", reasons[0]);
+		const message = reasons.length === 1
+			? localize('filtered', "Problems are paused because: \"{0}\"", reasons[0])
+			: localize('filtered.network', "Problems are paused because: \"{0}\" and {1} more", reasons[0], reasons.length - 1);
 
 		return {
 			owner: 'markersFilter',
diff --git a/src/vs/platform/markers/test/common/markerService.test.ts b/src/vs/platform/markers/test/common/markerService.test.ts
index 2a543ed5b7b6..4ccdd62b50e9 100644
--- a/src/vs/platform/markers/test/common/markerService.test.ts
+++ b/src/vs/platform/markers/test/common/markerService.test.ts
@@ -412,7 +412,7 @@ suite('Marker Service', () => {
 
 		// Check if message contains the correct count of filters
 		const markers = service.read({ resource });
-		assert.ok(markers[0].message.includes('2 filters active'));
+		assert.ok(markers[0].message.includes('Problems are paused because'));
 
 		// Remove remaining filters in any order
 		filter3.dispose();
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
index 5cbf3e713427..7814f58ead9a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
@@ -230,13 +230,11 @@ export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEdito
 
 				actualOptions ??= {
 					readOnly: this._editor.getOption(EditorOption.readOnly),
-					renderValidationDecorations: this._editor.getOption(EditorOption.renderValidationDecorations),
 					stickyScroll: this._editor.getOption(EditorOption.stickyScroll)
 				};
 
 				this._editor.updateOptions({
 					readOnly: true,
-					renderValidationDecorations: 'off',
 					stickyScroll: { enabled: false }
 				});
 			} else {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
index 1c0e47fb8946..cd89a9c4a70e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts
@@ -5,7 +5,7 @@
 
 import { assert } from '../../../../../base/common/assert.js';
 import { RunOnceScheduler } from '../../../../../base/common/async.js';
-import { IReference, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { IReference, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { observableValue, IObservable, ITransaction, autorun, transaction } from '../../../../../base/common/observable.js';
 import { isEqual } from '../../../../../base/common/resources.js';
 import { themeColorFromId } from '../../../../../base/common/themables.js';
@@ -31,6 +31,7 @@ import { localize } from '../../../../../nls.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IMarkerService } from '../../../../../platform/markers/common/markers.js';
 import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
 import { editorSelectionBackground } from '../../../../../platform/theme/common/colorRegistry.js';
 import { IUndoRedoElement, IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
@@ -100,6 +101,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		telemetryInfo: IModifiedEntryTelemetryInfo,
 		kind: ChatEditKind,
 		initialContent: string | undefined,
+		@IMarkerService markerService: IMarkerService,
 		@IModelService modelService: IModelService,
 		@ITextModelService textModelService: ITextModelService,
 		@ILanguageService languageService: ILanguageService,
@@ -159,6 +161,17 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 			this._diffTrimWhitespace.read(r);
 			this._updateDiffInfoSeq();
 		}));
+
+		const resourceFilter = this._register(new MutableDisposable());
+		this._register(autorun(r => {
+			const res = this.isCurrentlyBeingModifiedBy.read(r);
+			if (res) {
+				const req = res.session.getRequests().find(value => value.id === res.requestId);
+				resourceFilter.value = markerService.installResourceFilter(this.modifiedURI, req?.message.text || localize('default', "Chat Edits"));
+			} else {
+				resourceFilter.clear();
+			}
+		}));
 	}
 
 	private _clearCurrentEditLineDecoration() {

From bc9dcf3f1cbbf24c76f5a74c6168fbb99758a9ca Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 3 Mar 2025 11:23:45 +0100
Subject: [PATCH 0566/1815] Fix scrollbar visibility issue in tab editing
 (#242452)

fix https://github.com/microsoft/vscode/issues/236110
---
 .../browser/parts/editor/media/multieditortabscontrol.css   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
index 05e14022e489..f36a39511215 100644
--- a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
@@ -359,6 +359,12 @@
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-fit .monaco-icon-label,
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-fit .monaco-icon-label > .monaco-icon-label-container {
 	overflow-x: visible; /* fixes https://github.com/microsoft/vscode/issues/20182 by ensuring the horizontal overflow is visible */
+
+	scrollbar-width: none; /* Firefox */
+	-ms-overflow-style: none; /* Internet Explorer 10+ */
+	&::-webkit-scrollbar {
+		display: none; /* Chrome, Safari, and Opera */
+	}
 }
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink > .monaco-icon-label > .monaco-icon-label-container,

From a385480325d73339730307c5c828731dbd75e13c Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 3 Mar 2025 12:01:35 +0100
Subject: [PATCH 0567/1815] Add folder action support (#242454)

add folder action support
---
 .../browser/actions/chatContextActions.ts     | 66 +++++++++++++++++--
 .../chat/browser/chatAttachmentModel.ts       | 10 +++
 .../contrib/chat/browser/chatVariables.ts     |  5 ++
 3 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index 4f18fc10e5fd..95a4a73965e4 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -68,8 +68,10 @@ import { ATTACH_PROMPT_ACTION_ID, AttachPromptAction, IChatAttachPromptActionOpt
 export function registerChatContextActions() {
 	registerAction2(AttachContextAction);
 	registerAction2(AttachFileToChatAction);
+	registerAction2(AttachFolderToChatAction);
 	registerAction2(AttachSelectionToChatAction);
 	registerAction2(AttachFileToEditingSessionAction);
+	registerAction2(AttachFolderToEditingSessionAction);
 	registerAction2(AttachSelectionToEditingSessionAction);
 }
 
@@ -253,8 +255,8 @@ interface IReusablePromptQuickPickItem extends IQuickPickItem {
 	keybinding?: ResolvedKeybinding;
 }
 
-abstract class AttachFileAction extends Action2 {
-	getFiles(accessor: ServicesAccessor, ...args: any[]): URI[] {
+abstract class AttachResourceAction extends Action2 {
+	getResources(accessor: ServicesAccessor, ...args: any[]): URI[] {
 		const editorService = accessor.get(IEditorService);
 
 		const contexts = Array.isArray(args[1]) ? args[1] : [args[0]];
@@ -280,7 +282,7 @@ abstract class AttachFileAction extends Action2 {
 	}
 }
 
-class AttachFileToChatAction extends AttachFileAction {
+class AttachFileToChatAction extends AttachResourceAction {
 
 	static readonly ID = 'workbench.action.chat.attachFile';
 
@@ -301,7 +303,7 @@ class AttachFileToChatAction extends AttachFileAction {
 
 	override async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
 		const variablesService = accessor.get(IChatVariablesService);
-		const files = this.getFiles(accessor, ...args);
+		const files = this.getResources(accessor, ...args);
 
 		if (files.length) {
 			(await showChatView(accessor.get(IViewsService)))?.focusInput();
@@ -312,6 +314,32 @@ class AttachFileToChatAction extends AttachFileAction {
 	}
 }
 
+class AttachFolderToChatAction extends AttachResourceAction {
+
+	static readonly ID = 'workbench.action.chat.attachFolder';
+
+	constructor() {
+		super({
+			id: AttachFolderToChatAction.ID,
+			title: localize2('workbench.action.chat.attachFolder.label', "Add Folder to Chat"),
+			category: CHAT_CATEGORY,
+			f1: false,
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const variablesService = accessor.get(IChatVariablesService);
+		const folders = this.getResources(accessor, ...args);
+
+		if (folders.length) {
+			(await showChatView(accessor.get(IViewsService)))?.focusInput();
+			for (const folder of folders) {
+				variablesService.attachContext('folder', folder, ChatAgentLocation.Panel);
+			}
+		}
+	}
+}
+
 class AttachSelectionToChatAction extends Action2 {
 
 	static readonly ID = 'workbench.action.chat.attachSelection';
@@ -373,7 +401,7 @@ class AttachSelectionToChatAction extends Action2 {
 	}
 }
 
-class AttachFileToEditingSessionAction extends AttachFileAction {
+class AttachFileToEditingSessionAction extends AttachResourceAction {
 
 	static readonly ID = 'workbench.action.edits.attachFile';
 
@@ -394,7 +422,7 @@ class AttachFileToEditingSessionAction extends AttachFileAction {
 
 	override async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
 		const variablesService = accessor.get(IChatVariablesService);
-		const files = this.getFiles(accessor, ...args);
+		const files = this.getResources(accessor, ...args);
 
 		if (files.length) {
 			(await showEditsView(accessor.get(IViewsService)))?.focusInput();
@@ -405,6 +433,32 @@ class AttachFileToEditingSessionAction extends AttachFileAction {
 	}
 }
 
+class AttachFolderToEditingSessionAction extends AttachResourceAction {
+
+	static readonly ID = 'workbench.action.edits.attachFolder';
+
+	constructor() {
+		super({
+			id: AttachFolderToEditingSessionAction.ID,
+			title: localize2('workbench.action.edits.attachFolder.label', "Add Folder to {0}", 'Copilot Edits'),
+			category: CHAT_CATEGORY,
+			f1: false,
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+		const variablesService = accessor.get(IChatVariablesService);
+		const folders = this.getResources(accessor, ...args);
+
+		if (folders.length) {
+			(await showEditsView(accessor.get(IViewsService)))?.focusInput();
+			for (const folder of folders) {
+				variablesService.attachContext('folder', folder, ChatAgentLocation.EditingSession);
+			}
+		}
+	}
+}
+
 class AttachSelectionToEditingSessionAction extends Action2 {
 
 	static readonly ID = 'workbench.action.edits.attachSelection';
diff --git a/src/vs/workbench/contrib/chat/browser/chatAttachmentModel.ts b/src/vs/workbench/contrib/chat/browser/chatAttachmentModel.ts
index 30b1bd350d8d..41c3f3e105af 100644
--- a/src/vs/workbench/contrib/chat/browser/chatAttachmentModel.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatAttachmentModel.ts
@@ -71,6 +71,16 @@ export class ChatAttachmentModel extends Disposable {
 		this.addContext(this.asVariableEntry(uri, range));
 	}
 
+	addFolder(uri: URI) {
+		this.addContext({
+			value: uri,
+			id: uri.toString(),
+			name: basename(uri),
+			isFile: false,
+			isDirectory: true,
+		});
+	}
+
 	asVariableEntry(uri: URI, range?: IRange, isMarkedReadonly?: boolean): IChatRequestVariableEntry {
 		return {
 			value: range ? { uri, range } : uri,
diff --git a/src/vs/workbench/contrib/chat/browser/chatVariables.ts b/src/vs/workbench/contrib/chat/browser/chatVariables.ts
index 68bae12a4a8c..815db7821e75 100644
--- a/src/vs/workbench/contrib/chat/browser/chatVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatVariables.ts
@@ -87,5 +87,10 @@ export class ChatVariablesService implements IChatVariablesService {
 			widget.attachmentModel.addFile(uri, range);
 			return;
 		}
+
+		if (key === 'folder' && URI.isUri(value)) {
+			widget.attachmentModel.addFolder(value);
+			return;
+		}
 	}
 }

From 6ef179a793701116035ae225fcedb7676e3149b4 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 3 Mar 2025 13:03:12 +0100
Subject: [PATCH 0568/1815] Git - improve git blame rendering efficiency
 (#242456)

---
 extensions/git/src/blame.ts | 63 ++++++++++++++++++++++++++++++++-----
 1 file changed, 55 insertions(+), 8 deletions(-)

diff --git a/extensions/git/src/blame.ts b/extensions/git/src/blame.ts
index f29212c51a84..e6a76fcf7526 100644
--- a/extensions/git/src/blame.ts
+++ b/extensions/git/src/blame.ts
@@ -69,6 +69,41 @@ function isResourceSchemeSupported(uri: Uri): boolean {
 	return uri.scheme === 'file' || isGitUri(uri);
 }
 
+function isResourceBlameInformationEqual(a: ResourceBlameInformation | undefined, b: ResourceBlameInformation | undefined): boolean {
+	if (a === b) {
+		return true;
+	}
+
+	if (!a || !b ||
+		a.resource.toString() !== b.resource.toString() ||
+		a.blameInformation.length !== b.blameInformation.length) {
+		return false;
+	}
+
+	for (let index = 0; index < a.blameInformation.length; index++) {
+		if (a.blameInformation[index].lineNumber !== b.blameInformation[index].lineNumber) {
+			return false;
+		}
+
+		const aBlameInformation = a.blameInformation[index].blameInformation;
+		const bBlameInformation = b.blameInformation[index].blameInformation;
+
+		if (typeof aBlameInformation === 'string' && typeof bBlameInformation === 'string') {
+			if (aBlameInformation !== bBlameInformation) {
+				return false;
+			}
+		} else if (typeof aBlameInformation !== 'string' && typeof bBlameInformation !== 'string') {
+			if (aBlameInformation.hash !== bBlameInformation.hash) {
+				return false;
+			}
+		} else {
+			return false;
+		}
+	}
+
+	return true;
+}
+
 type BlameInformationTemplateTokens = {
 	readonly hash: string;
 	readonly hashShort: string;
@@ -79,6 +114,11 @@ type BlameInformationTemplateTokens = {
 	readonly authorDateAgo: string;
 };
 
+interface ResourceBlameInformation {
+	readonly resource: Uri;
+	readonly blameInformation: readonly LineBlameInformation[];
+}
+
 interface LineBlameInformation {
 	readonly lineNumber: number;
 	readonly blameInformation: BlameInformation | string;
@@ -116,11 +156,15 @@ export class GitBlameController {
 	private readonly _onDidChangeBlameInformation = new EventEmitter<void>();
 	public readonly onDidChangeBlameInformation = this._onDidChangeBlameInformation.event;
 
-	private _textEditorBlameInformation: LineBlameInformation[] | undefined;
-	get textEditorBlameInformation(): readonly LineBlameInformation[] | undefined {
+	private _textEditorBlameInformation: ResourceBlameInformation | undefined;
+	get textEditorBlameInformation(): ResourceBlameInformation | undefined {
 		return this._textEditorBlameInformation;
 	}
-	private set textEditorBlameInformation(blameInformation: LineBlameInformation[] | undefined) {
+	private set textEditorBlameInformation(blameInformation: ResourceBlameInformation | undefined) {
+		if (isResourceBlameInformationEqual(this._textEditorBlameInformation, blameInformation)) {
+			return;
+		}
+
 		this._textEditorBlameInformation = blameInformation;
 		this._onDidChangeBlameInformation.fire();
 	}
@@ -505,7 +549,10 @@ export class GitBlameController {
 			}
 		}
 
-		this.textEditorBlameInformation = lineBlameInformation;
+		this.textEditorBlameInformation = {
+			resource: textEditor.document.uri,
+			blameInformation: lineBlameInformation
+		};
 	}
 
 	dispose() {
@@ -555,7 +602,7 @@ class GitBlameEditorDecoration implements HoverProvider {
 		}
 
 		// Get blame information
-		const blameInformation = this._controller.textEditorBlameInformation;
+		const blameInformation = this._controller.textEditorBlameInformation?.blameInformation;
 		const lineBlameInformation = blameInformation?.find(blame => blame.lineNumber === position.line);
 
 		if (!lineBlameInformation || typeof lineBlameInformation.blameInformation === 'string') {
@@ -601,8 +648,8 @@ class GitBlameEditorDecoration implements HoverProvider {
 		}
 
 		// Get blame information
-		const blameInformation = this._controller.textEditorBlameInformation;
-		if (!blameInformation) {
+		const blameInformation = this._controller.textEditorBlameInformation?.blameInformation;
+		if (!blameInformation || blameInformation.length === 0) {
 			textEditor.setDecorations(this._decoration, []);
 			return;
 		}
@@ -680,7 +727,7 @@ class GitBlameStatusBarItem {
 			return;
 		}
 
-		const blameInformation = this._controller.textEditorBlameInformation;
+		const blameInformation = this._controller.textEditorBlameInformation?.blameInformation;
 		if (!blameInformation || blameInformation.length === 0) {
 			this._statusBarItem.hide();
 			return;

From 77a3d00427d070e6f1bf7a6b564bb3e1c212af56 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 3 Mar 2025 13:06:36 +0100
Subject: [PATCH 0569/1815] Fix ghost text clickable bug (#242457)

fix ghost text clickable bug
---
 .../browser/view/ghostText/ghostTextView.ts          | 12 ++++++++----
 .../inlineEditsViews/originalEditorInlineDiffView.ts |  9 ++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

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 06d68f717821..9cf69b838666 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
@@ -81,7 +81,7 @@ export class GhostTextView extends Disposable {
 					return;
 				}
 				const a = e.target.detail.injectedText?.options.attachedData;
-				if (a instanceof GhostTextAttachedData) {
+				if (a instanceof GhostTextAttachedData && a.owner === this) {
 					this._onDidClick.fire(e.event);
 				}
 			}));
@@ -229,7 +229,7 @@ export class GhostTextView extends Disposable {
 							+ extraClassNames
 							+ p.lineDecorations.map(d => ' ' + d.className).join(' '), // TODO: take the ranges into account for line decorations
 						cursorStops: InjectedTextCursorStops.Left,
-						attachedData: new GhostTextAttachedData(),
+						attachedData: new GhostTextAttachedData(this),
 					},
 					showIfCollapsed: true,
 				}
@@ -258,7 +258,9 @@ export class GhostTextView extends Disposable {
 	);
 
 	private readonly _isInlineTextHovered = this._editorObs.isTargetHovered(
-		p => p.target.type === MouseTargetType.CONTENT_TEXT && p.target.detail.injectedText?.options.attachedData instanceof GhostTextAttachedData,
+		p => p.target.type === MouseTargetType.CONTENT_TEXT &&
+			p.target.detail.injectedText?.options.attachedData instanceof GhostTextAttachedData &&
+			p.target.detail.injectedText.options.attachedData.owner === this,
 		this._store
 	);
 
@@ -277,7 +279,9 @@ export class GhostTextView extends Disposable {
 	}
 }
 
-class GhostTextAttachedData { }
+class GhostTextAttachedData {
+	constructor(public readonly owner: GhostTextView) { }
+}
 
 interface WidgetDomElement {
 	ghostTextViewWarningWidgetData?: {
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 414f455553d7..1ca0f662e92e 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
@@ -41,7 +41,9 @@ export class OriginalEditorInlineDiffView extends Disposable implements IInlineE
 	readonly onDidClick = this._onDidClick.event;
 
 	readonly isHovered = observableCodeEditor(this._originalEditor).isTargetHovered(
-		p => p.target.type === MouseTargetType.CONTENT_TEXT && p.target.detail.injectedText?.options.attachedData instanceof InlineEditAttachedData,
+		p => p.target.type === MouseTargetType.CONTENT_TEXT &&
+			p.target.detail.injectedText?.options.attachedData instanceof InlineEditAttachedData &&
+			p.target.detail.injectedText.options.attachedData.owner === this,
 		this._store
 	);
 
@@ -71,7 +73,7 @@ export class OriginalEditorInlineDiffView extends Disposable implements IInlineE
 				return;
 			}
 			const a = e.target.detail.injectedText?.options.attachedData;
-			if (a instanceof InlineEditAttachedData) {
+			if (a instanceof InlineEditAttachedData && a.owner === this) {
 				this._onDidClick.fire(e.event);
 			}
 		}));
@@ -263,7 +265,7 @@ export class OriginalEditorInlineDiffView extends Disposable implements IInlineE
 											...extraClasses // include extraClasses for additional styling if provided
 										),
 										cursorStops: InjectedTextCursorStops.None,
-										attachedData: new InlineEditAttachedData(),
+										attachedData: new InlineEditAttachedData(this),
 									},
 									zIndex: 2,
 									showIfCollapsed: true,
@@ -280,6 +282,7 @@ export class OriginalEditorInlineDiffView extends Disposable implements IInlineE
 }
 
 class InlineEditAttachedData {
+	constructor(public readonly owner: OriginalEditorInlineDiffView) { }
 }
 
 function allowsTrueInlineDiffRendering(mapping: DetailedLineRangeMapping): boolean {

From bd478b78754d76a37412ca87e841ac5caab55385 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 3 Mar 2025 14:03:31 +0100
Subject: [PATCH 0570/1815] Only accept next edits after being shown 350ms
 (#242460)

Only accept nes after been shown 350ms
---
 .../view/inlineEdits/inlineEditsView.ts       | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

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 fe29ffa062be..f9479e66980d 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { equalsIfDefined, itemEquals } from '../../../../../../base/common/equals.js';
+import { BugIndicatingError } from '../../../../../../base/common/errors.js';
 import { Event } from '../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { autorunWithStore, derived, derivedObservableWithCache, derivedOpts, derivedWithStore, IObservable, IReader, ISettableObservable, mapObservableArrayCached, observableValue } from '../../../../../../base/common/observable.js';
@@ -48,6 +49,7 @@ export class InlineEditsView extends Disposable {
 		view: ReturnType<typeof InlineEditsView.prototype.determineView>;
 		userJumpedToIt: boolean;
 		editorWidth: number;
+		timestamp: number;
 	} | undefined;
 
 	constructor(
@@ -69,8 +71,10 @@ export class InlineEditsView extends Disposable {
 					...this._wordReplacementViews.read(reader).map(w => w.onDidClick),
 					this._inlineDiffView.onDidClick,
 				)(e => {
-					e.preventDefault();
-					this._host.accept();
+					if (this._viewHasBeenShownLongThan(350)) {
+						e.preventDefault();
+						this._host.accept();
+					}
 				})
 			);
 		}));
@@ -393,7 +397,7 @@ export class InlineEditsView extends Disposable {
 
 		const view = this.determineView(edit, reader, diff, newText, originalDisplayRange);
 
-		this._previousView = { id: this.getCacheId(edit), view, userJumpedToIt: edit.userJumpedToIt, editorWidth: this._editor.getLayoutInfo().width };
+		this._previousView = { id: this.getCacheId(edit), view, userJumpedToIt: edit.userJumpedToIt, editorWidth: this._editor.getLayoutInfo().width, timestamp: Date.now() };
 
 		switch (view) {
 			case 'insertionInline': return { kind: 'insertionInline' as const };
@@ -453,6 +457,16 @@ export class InlineEditsView extends Disposable {
 
 		return undefined;
 	}
+
+	private _viewHasBeenShownLongThan(durationMs: number): boolean {
+		const viewCreationTime = this._previousView?.timestamp;
+		if (!viewCreationTime) {
+			throw new BugIndicatingError('viewHasBeenShownLongThan called before a view has been shown');
+		}
+
+		const currentTime = Date.now();
+		return (currentTime - viewCreationTime) >= durationMs;
+	}
 }
 
 function isSingleLineInsertionAfterPosition(diff: DetailedLineRangeMapping[], position: Position | null) {

From f909b15f531e6e6f9a591da9b773bd48edda3372 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 3 Mar 2025 15:36:07 +0100
Subject: [PATCH 0571/1815] status - consistent casing for language entries
 (#242466)

* status - consistent casing for language entries

* more
---
 .../client/src/languageStatus.ts                       |  6 +++---
 .../src/ui/intellisenseStatus.ts                       | 10 +++++-----
 .../src/ui/versionStatus.ts                            |  2 +-
 .../inlineCompletionLanguageStatusBarContribution.ts   |  2 +-
 .../browser/limitIndicator.contribution.ts             |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/extensions/json-language-features/client/src/languageStatus.ts b/extensions/json-language-features/client/src/languageStatus.ts
index 6f3d7468b2ef..1064a0b59561 100644
--- a/extensions/json-language-features/client/src/languageStatus.ts
+++ b/extensions/json-language-features/client/src/languageStatus.ts
@@ -185,13 +185,13 @@ export function createLanguageStatusItem(documentSelector: DocumentSelector, sta
 				const schemas = (await statusRequest(document.uri.toString())).schemas;
 				statusItem.detail = undefined;
 				if (schemas.length === 0) {
-					statusItem.text = l10n.t('No Schema Validation');
+					statusItem.text = l10n.t('No schema validation');
 					statusItem.detail = l10n.t('no JSON schema configured');
 				} else if (schemas.length === 1) {
-					statusItem.text = l10n.t('Schema Validated');
+					statusItem.text = l10n.t('Schema validated');
 					statusItem.detail = l10n.t('JSON schema configured');
 				} else {
-					statusItem.text = l10n.t('Schema Validated');
+					statusItem.text = l10n.t('Schema validated');
 					statusItem.detail = l10n.t('multiple JSON schemas configured');
 				}
 				statusItem.command = {
diff --git a/extensions/typescript-language-features/src/ui/intellisenseStatus.ts b/extensions/typescript-language-features/src/ui/intellisenseStatus.ts
index e26e2b3719f4..2c3ffb783c85 100644
--- a/extensions/typescript-language-features/src/ui/intellisenseStatus.ts
+++ b/extensions/typescript-language-features/src/ui/intellisenseStatus.ts
@@ -182,8 +182,8 @@ export class IntellisenseStatus extends Disposable {
 					statusItem.command = {
 						command: this.createOrOpenConfigCommandId,
 						title: this._state.projectType === ProjectType.TypeScript
-							? vscode.l10n.t("Configure tsconfig")
-							: vscode.l10n.t("Configure jsconfig"),
+							? vscode.l10n.t("Configure TSConfig")
+							: vscode.l10n.t("Configure JSConfig"),
 						arguments: [rootPath, this._state.projectType] satisfies CreateOrOpenConfigCommandArgs,
 					};
 				} else {
@@ -191,7 +191,7 @@ export class IntellisenseStatus extends Disposable {
 					statusItem.detail = undefined;
 					statusItem.command = {
 						command: this.openOpenConfigCommandId,
-						title: vscode.l10n.t("Open config file"),
+						title: vscode.l10n.t("Open Config File"),
 						arguments: [rootPath, this._state.projectType] satisfies CreateOrOpenConfigCommandArgs,
 					};
 				}
@@ -200,8 +200,8 @@ export class IntellisenseStatus extends Disposable {
 			case IntellisenseState.Type.SyntaxOnly: {
 				const statusItem = this.ensureStatusItem();
 				statusItem.severity = vscode.LanguageStatusSeverity.Warning;
-				statusItem.text = vscode.l10n.t("Partial Mode");
-				statusItem.detail = vscode.l10n.t("Project Wide IntelliSense not available");
+				statusItem.text = vscode.l10n.t("Partial mode");
+				statusItem.detail = vscode.l10n.t("Project wide IntelliSense not available");
 				statusItem.busy = false;
 				statusItem.command = {
 					title: vscode.l10n.t("Learn More"),
diff --git a/extensions/typescript-language-features/src/ui/versionStatus.ts b/extensions/typescript-language-features/src/ui/versionStatus.ts
index a4f377782a8f..901e548f4a8d 100644
--- a/extensions/typescript-language-features/src/ui/versionStatus.ts
+++ b/extensions/typescript-language-features/src/ui/versionStatus.ts
@@ -23,7 +23,7 @@ export class VersionStatus extends Disposable {
 		this._statusItem = this._register(vscode.languages.createLanguageStatusItem('typescript.version', jsTsLanguageModes));
 
 		this._statusItem.name = vscode.l10n.t("TypeScript Version");
-		this._statusItem.detail = vscode.l10n.t("TypeScript Version");
+		this._statusItem.detail = vscode.l10n.t("TypeScript version");
 
 		this._register(this._client.onTsServerStarted(({ version }) => this.onDidChangeTypeScriptVersion(version)));
 	}
diff --git a/src/vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts b/src/vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts
index 4f8c7c4799ef..75930b380dd8 100644
--- a/src/vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts
+++ b/src/vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts
@@ -69,7 +69,7 @@ export class InlineCompletionLanguageStatusBarContribution extends Disposable {
 				accessibilityInfo: undefined,
 				busy: statusMap[status].loading,
 				command: undefined,
-				detail: localize('inlineSuggestions', "Inline Suggestions"),
+				detail: localize('inlineSuggestionsSmall', "Inline suggestions"),
 				id: 'inlineSuggestions',
 				label: { value: statusMap[status].label, shortValue: statusMap[status].shortLabel },
 				name: localize('inlineSuggestions', "Inline Suggestions"),
diff --git a/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.ts b/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.ts
index 538e67d5f0fb..0640e07026d3 100644
--- a/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.ts
+++ b/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.ts
@@ -75,7 +75,7 @@ interface LanguageFeatureAccessor {
 class ColorDecorationAccessor implements LanguageFeatureAccessor {
 	readonly id = 'decoratorsLimitInfo';
 	readonly name = nls.localize('colorDecoratorsStatusItem.name', 'Color Decorator Status');
-	readonly label = nls.localize('status.limitedColorDecorators.short', 'Color Decorators');
+	readonly label = nls.localize('status.limitedColorDecorators.short', 'Color decorators');
 	readonly source = nls.localize('colorDecoratorsStatusItem.source', 'Color Decorators');
 	readonly settingsId = 'editor.colorDecoratorsLimit';
 
@@ -87,7 +87,7 @@ class ColorDecorationAccessor implements LanguageFeatureAccessor {
 class FoldingRangeAccessor implements LanguageFeatureAccessor {
 	readonly id = 'foldingLimitInfo';
 	readonly name = nls.localize('foldingRangesStatusItem.name', 'Folding Status');
-	readonly label = nls.localize('status.limitedFoldingRanges.short', 'Folding Ranges');
+	readonly label = nls.localize('status.limitedFoldingRanges.short', 'Folding ranges');
 	readonly source = nls.localize('foldingRangesStatusItem.source', 'Folding');
 	readonly settingsId = 'editor.foldingMaximumRegions';
 

From f11a86a05f8fd6a788b31d9b48c5cdf44d38f90f Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 3 Mar 2025 16:00:53 +0100
Subject: [PATCH 0572/1815] Revert "Git - remove jschardet (#241256)" (#242469)

This reverts commit 6fdb41922c2ff82748ab95c2dc484bd78cd2b8f2.
---
 extensions/git/package-lock.json |  10 ++++
 extensions/git/package.json      |   2 +-
 extensions/git/src/commands.ts   |  19 ++----
 extensions/git/src/encoding.ts   | 100 +++++++++++++++++++++++++++++++
 extensions/git/src/git.ts        |  13 ++++
 extensions/git/src/repository.ts |  26 ++++++--
 extensions/git/tsconfig.json     |   1 -
 7 files changed, 148 insertions(+), 23 deletions(-)
 create mode 100644 extensions/git/src/encoding.ts

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index 7a9cb2aded86..bc150555c70c 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -14,6 +14,7 @@
         "@vscode/iconv-lite-umd": "0.7.0",
         "byline": "^5.0.0",
         "file-type": "16.5.4",
+        "jschardet": "3.1.4",
         "picomatch": "2.3.1",
         "vscode-uri": "^2.0.0",
         "which": "4.0.0"
@@ -278,6 +279,15 @@
         "node": ">=16"
       }
     },
+    "node_modules/jschardet": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-3.1.4.tgz",
+      "integrity": "sha512-/kmVISmrwVwtyYU40iQUOp3SUPk2dhNCMsZBQX0R1/jZ8maaXJ/oZIzUOiyOqcgtLnETFKYChbJ5iDC/eWmFHg==",
+      "license": "LGPL-2.1+",
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
     "node_modules/peek-readable": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz",
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 23feced6ea1b..1e5edbb05ba3 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -35,7 +35,6 @@
     "statusBarItemTooltip",
     "tabInputMultiDiff",
     "tabInputTextMerge",
-    "textDocumentEncoding",
     "textEditorDiffInformation",
     "timeline"
   ],
@@ -3567,6 +3566,7 @@
     "@vscode/iconv-lite-umd": "0.7.0",
     "byline": "^5.0.0",
     "file-type": "16.5.4",
+    "jschardet": "3.1.4",
     "picomatch": "2.3.1",
     "vscode-uri": "^2.0.0",
     "which": "4.0.0"
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index fa566adbeadd..e61e8dc3e5a2 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -1628,29 +1628,19 @@ export class CommandCenter {
 		}
 
 		let modifiedUri = changes.modifiedUri;
-		let modifiedDocument: TextDocument | undefined;
-
 		if (!modifiedUri) {
 			const textEditor = window.activeTextEditor;
 			if (!textEditor) {
 				return;
 			}
-
-			modifiedDocument = textEditor.document;
+			const modifiedDocument = textEditor.document;
 			modifiedUri = modifiedDocument.uri;
 		}
-
 		if (modifiedUri.scheme !== 'file') {
 			return;
 		}
-
-		if (!modifiedDocument) {
-			modifiedDocument = await workspace.openTextDocument(modifiedUri);
-		}
-
 		const result = changes.originalWithModifiedChanges;
-		await this.runByRepository(modifiedUri, async (repository, resource) =>
-			await repository.stage(resource, result, modifiedDocument.encoding));
+		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
 	}
 
 	@command('git.stageSelectedRanges', { diff: true })
@@ -1827,8 +1817,7 @@ export class CommandCenter {
 		const originalDocument = await workspace.openTextDocument(originalUri);
 		const result = applyLineChanges(originalDocument, modifiedDocument, changes);
 
-		await this.runByRepository(modifiedUri, async (repository, resource) =>
-			await repository.stage(resource, result, modifiedDocument.encoding));
+		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
 	}
 
 	@command('git.revertChange')
@@ -2000,7 +1989,7 @@ export class CommandCenter {
 		this.logger.trace(`[CommandCenter][unstageSelectedRanges] invertedDiffs: ${JSON.stringify(invertedDiffs)}`);
 
 		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
-		await repository.stage(modifiedUri, result, modifiedDocument.encoding);
+		await repository.stage(modifiedUri, result);
 	}
 
 	@command('git.unstageFile')
diff --git a/extensions/git/src/encoding.ts b/extensions/git/src/encoding.ts
new file mode 100644
index 000000000000..c80fb6ee6d5e
--- /dev/null
+++ b/extensions/git/src/encoding.ts
@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as jschardet from 'jschardet';
+
+function detectEncodingByBOM(buffer: Buffer): string | null {
+	if (!buffer || buffer.length < 2) {
+		return null;
+	}
+
+	const b0 = buffer.readUInt8(0);
+	const b1 = buffer.readUInt8(1);
+
+	// UTF-16 BE
+	if (b0 === 0xFE && b1 === 0xFF) {
+		return 'utf16be';
+	}
+
+	// UTF-16 LE
+	if (b0 === 0xFF && b1 === 0xFE) {
+		return 'utf16le';
+	}
+
+	if (buffer.length < 3) {
+		return null;
+	}
+
+	const b2 = buffer.readUInt8(2);
+
+	// UTF-8
+	if (b0 === 0xEF && b1 === 0xBB && b2 === 0xBF) {
+		return 'utf8';
+	}
+
+	return null;
+}
+
+const IGNORE_ENCODINGS = [
+	'ascii',
+	'utf-8',
+	'utf-16',
+	'utf-32'
+];
+
+const JSCHARDET_TO_ICONV_ENCODINGS: { [name: string]: string } = {
+	'ibm866': 'cp866',
+	'big5': 'cp950'
+};
+
+const MAP_CANDIDATE_GUESS_ENCODING_TO_JSCHARDET: { [key: string]: string } = {
+	utf8: 'UTF-8',
+	utf16le: 'UTF-16LE',
+	utf16be: 'UTF-16BE',
+	windows1252: 'windows-1252',
+	windows1250: 'windows-1250',
+	iso88592: 'ISO-8859-2',
+	windows1251: 'windows-1251',
+	cp866: 'IBM866',
+	iso88595: 'ISO-8859-5',
+	koi8r: 'KOI8-R',
+	windows1253: 'windows-1253',
+	iso88597: 'ISO-8859-7',
+	windows1255: 'windows-1255',
+	iso88598: 'ISO-8859-8',
+	cp950: 'Big5',
+	shiftjis: 'SHIFT_JIS',
+	eucjp: 'EUC-JP',
+	euckr: 'EUC-KR',
+	gb2312: 'GB2312'
+};
+
+export function detectEncoding(buffer: Buffer, candidateGuessEncodings: string[]): string | null {
+	const result = detectEncodingByBOM(buffer);
+
+	if (result) {
+		return result;
+	}
+
+	candidateGuessEncodings = candidateGuessEncodings.map(e => MAP_CANDIDATE_GUESS_ENCODING_TO_JSCHARDET[e]).filter(e => !!e);
+
+	const detected = jschardet.detect(buffer, candidateGuessEncodings.length > 0 ? { detectEncodings: candidateGuessEncodings } : undefined);
+	if (!detected || !detected.encoding) {
+		return null;
+	}
+
+	const encoding = detected.encoding;
+
+	// Ignore encodings that cannot guess correctly
+	// (http://chardet.readthedocs.io/en/latest/supported-encodings.html)
+	if (0 <= IGNORE_ENCODINGS.indexOf(encoding.toLowerCase())) {
+		return null;
+	}
+
+	const normalizedEncodingName = encoding.replace(/[^a-zA-Z0-9]/g, '').toLowerCase();
+	const mapped = JSCHARDET_TO_ICONV_ENCODINGS[normalizedEncodingName];
+
+	return mapped || normalizedEncodingName;
+}
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 29fc38abfed1..2f0d11bd4884 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -14,6 +14,7 @@ import * as iconv from '@vscode/iconv-lite-umd';
 import * as filetype from 'file-type';
 import { assign, groupBy, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent, splitInChunks, Limiter, Versions, isWindows, pathEquals, isMacintosh, isDescendant } from './util';
 import { CancellationError, CancellationToken, ConfigurationChangeEvent, LogOutputChannel, Progress, Uri, workspace } from 'vscode';
+import { detectEncoding } from './encoding';
 import { Ref, RefType, Branch, Remote, ForcePushMode, GitErrorCodes, LogOptions, Change, Status, CommitOptions, RefQuery, InitOptions } from './api/git';
 import * as byline from 'byline';
 import { StringDecoder } from 'string_decoder';
@@ -1329,6 +1330,18 @@ export class Repository {
 			.filter(entry => !!entry);
 	}
 
+	async bufferString(object: string, encoding: string = 'utf8', autoGuessEncoding = false, candidateGuessEncodings: string[] = []): Promise<string> {
+		const stdout = await this.buffer(object);
+
+		if (autoGuessEncoding) {
+			encoding = detectEncoding(stdout, candidateGuessEncodings) || encoding;
+		}
+
+		encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';
+
+		return iconv.decode(stdout, encoding);
+	}
+
 	async buffer(object: string): Promise<Buffer> {
 		const child = this.stream(['show', '--textconv', object]);
 
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 25445d2668c8..d483d9b1766f 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -7,6 +7,7 @@ import TelemetryReporter from '@vscode/extension-telemetry';
 import * as fs from 'fs';
 import * as path from 'path';
 import picomatch from 'picomatch';
+import * as iconv from '@vscode/iconv-lite-umd';
 import { CancellationError, CancellationToken, CancellationTokenSource, Command, commands, Disposable, Event, EventEmitter, FileDecoration, l10n, LogLevel, LogOutputChannel, Memento, ProgressLocation, ProgressOptions, QuickDiffProvider, RelativePattern, scm, SourceControl, SourceControlInputBox, SourceControlInputBoxValidation, SourceControlInputBoxValidationType, SourceControlResourceDecorations, SourceControlResourceGroup, SourceControlResourceState, TabInputNotebookDiff, TabInputTextDiff, TabInputTextMultiDiff, ThemeColor, Uri, window, workspace, WorkspaceEdit } from 'vscode';
 import { ActionButton } from './actionButton';
 import { ApiRepository } from './api/api1';
@@ -24,6 +25,7 @@ import { StatusBarCommands } from './statusbar';
 import { toGitUri } from './uri';
 import { anyEvent, combinedDisposable, debounceEvent, dispose, EmptyDisposable, eventToPromise, filterEvent, find, getCommitShortHash, IDisposable, isDescendant, isLinuxSnap, isRemote, Limiter, onceEvent, pathEquals, relativePath } from './util';
 import { IFileWatcher, watch } from './watch';
+import { detectEncoding } from './encoding';
 import { ISourceControlHistoryItemDetailsProviderRegistry } from './historyItemDetailsProvider';
 
 const timeout = (millis: number) => new Promise(c => setTimeout(c, millis));
@@ -1220,9 +1222,19 @@ export class Repository implements Disposable {
 		await this.run(Operation.Remove, () => this.repository.rm(resources.map(r => r.fsPath)));
 	}
 
-	async stage(resource: Uri, contents: string, encoding: string): Promise<void> {
+	async stage(resource: Uri, contents: string): Promise<void> {
+		const path = relativePath(this.repository.root, resource.fsPath).replace(/\\/g, '/');
 		await this.run(Operation.Stage, async () => {
-			const path = relativePath(this.repository.root, resource.fsPath).replace(/\\/g, '/');
+			const configFiles = workspace.getConfiguration('files', Uri.file(resource.fsPath));
+			let encoding = configFiles.get<string>('encoding') ?? 'utf8';
+			const autoGuessEncoding = configFiles.get<boolean>('autoGuessEncoding') === true;
+			const candidateGuessEncodings = configFiles.get<string[]>('candidateGuessEncodings') ?? [];
+
+			if (autoGuessEncoding) {
+				encoding = detectEncoding(Buffer.from(contents), candidateGuessEncodings) ?? encoding;
+			}
+
+			encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';
 			await this.repository.stage(path, contents, encoding);
 
 			this._onDidChangeOriginalResource.fire(resource);
@@ -1968,15 +1980,17 @@ export class Repository implements Disposable {
 	async show(ref: string, filePath: string): Promise<string> {
 		return await this.run(Operation.Show, async () => {
 			const path = relativePath(this.repository.root, filePath).replace(/\\/g, '/');
+			const configFiles = workspace.getConfiguration('files', Uri.file(filePath));
+			const defaultEncoding = configFiles.get<string>('encoding');
+			const autoGuessEncoding = configFiles.get<boolean>('autoGuessEncoding');
+			const candidateGuessEncodings = configFiles.get<string[]>('candidateGuessEncodings');
 
 			try {
-				const content = await this.repository.buffer(`${ref}:${path}`);
-				return await workspace.decode(content, Uri.file(filePath));
+				return await this.repository.bufferString(`${ref}:${path}`, defaultEncoding, autoGuessEncoding, candidateGuessEncodings);
 			} catch (err) {
 				if (err.gitErrorCode === GitErrorCodes.WrongCase) {
 					const gitRelativePath = await this.repository.getGitRelativePath(ref, path);
-					const content = await this.repository.buffer(`${ref}:${gitRelativePath}`);
-					return await workspace.decode(content, Uri.file(filePath));
+					return await this.repository.bufferString(`${ref}:${gitRelativePath}`, defaultEncoding, autoGuessEncoding, candidateGuessEncodings);
 				}
 
 				throw err;
diff --git a/extensions/git/tsconfig.json b/extensions/git/tsconfig.json
index 1d330ea2516c..42218d8decb0 100644
--- a/extensions/git/tsconfig.json
+++ b/extensions/git/tsconfig.json
@@ -25,7 +25,6 @@
 		"../../src/vscode-dts/vscode.proposed.statusBarItemTooltip.d.ts",
 		"../../src/vscode-dts/vscode.proposed.tabInputMultiDiff.d.ts",
 		"../../src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts",
-		"../../src/vscode-dts/vscode.proposed.textDocumentEncoding.d.ts",
 		"../../src/vscode-dts/vscode.proposed.textEditorDiffInformation.d.ts",
 		"../../src/vscode-dts/vscode.proposed.timeline.d.ts",
 		"../types/lib.textEncoder.d.ts"

From b855f87c027300d8ac1c7ae1d13b249107583ef5 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Mon, 3 Mar 2025 16:24:42 +0100
Subject: [PATCH 0573/1815] Update edit context on primary selection change
 (#242471)

update edit context on primary selection change
---
 .../browser/controller/editContext/native/nativeEditContext.ts   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
index 75acb7c2c8d7..76a5bd52fe5f 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
@@ -208,6 +208,7 @@ export class NativeEditContext extends AbstractEditContext {
 	public override onCursorStateChanged(e: ViewCursorStateChangedEvent): boolean {
 		this._primarySelection = e.modelSelections[0] ?? new Selection(1, 1, 1, 1);
 		this._screenReaderSupport.onCursorStateChanged(e);
+		this._updateEditContext();
 		return true;
 	}
 

From 4aaac0af825cdd0f6725994b924a804fc58f0ab6 Mon Sep 17 00:00:00 2001
From: Logan Ramos <lramos15@gmail.com>
Date: Mon, 3 Mar 2025 08:46:39 -0700
Subject: [PATCH 0574/1815] Remove telemetry events (#242473)

---
 .../contrib/files/browser/explorerService.ts  | 44 +------------------
 .../editor/browser/editorResolverService.ts   | 17 -------
 2 files changed, 1 insertion(+), 60 deletions(-)

diff --git a/src/vs/workbench/contrib/files/browser/explorerService.ts b/src/vs/workbench/contrib/files/browser/explorerService.ts
index cb60e6d4a34b..61f0ac0a8ffa 100644
--- a/src/vs/workbench/contrib/files/browser/explorerService.ts
+++ b/src/vs/workbench/contrib/files/browser/explorerService.ts
@@ -26,7 +26,6 @@ import { IHostService } from '../../../services/host/browser/host.js';
 import { IExpression } from '../../../../base/common/glob.js';
 import { ResourceGlobMatcher } from '../../../common/resources.js';
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 
 export const UNDO_REDO_SOURCE = new UndoRedoSource();
 
@@ -55,8 +54,7 @@ export class ExplorerService implements IExplorerService {
 		@IBulkEditService private readonly bulkEditService: IBulkEditService,
 		@IProgressService private readonly progressService: IProgressService,
 		@IHostService hostService: IHostService,
-		@IFilesConfigurationService private readonly filesConfigurationService: IFilesConfigurationService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService
+		@IFilesConfigurationService private readonly filesConfigurationService: IFilesConfigurationService
 	) {
 		this.config = this.configurationService.getValue('explorer');
 
@@ -245,46 +243,6 @@ export class ExplorerService implements IExplorerService {
 		try {
 			await this.view.setEditable(stat, isEditing);
 		} catch {
-			const parent = stat.parent;
-			type ExplorerViewEditableErrorData = {
-				parentIsDirectory: boolean | undefined;
-				isDirectory: boolean | undefined;
-				isReadonly: boolean | undefined;
-				parentIsReadonly: boolean | undefined;
-				parentIsExcluded: boolean | undefined;
-				isExcluded: boolean | undefined;
-				parentIsRoot: boolean | undefined;
-				isRoot: boolean | undefined;
-				parentHasNests: boolean | undefined;
-				hasNests: boolean | undefined;
-			};
-			type ExplorerViewEditableErrorClassification = {
-				owner: 'lramos15';
-				comment: 'Helps gain a broard understanding of why users are unable to edit files in the explorer';
-				parentIsDirectory: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Whether the parent of the editable element is a directory' };
-				isDirectory: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Whether the editable element is a directory' };
-				isReadonly: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Whether the editable element is readonly' };
-				parentIsReadonly: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Whether the parent of the editable element is readonly' };
-				parentIsExcluded: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Whether the parent of the editable element is excluded from being shown in the explorer' };
-				isExcluded: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Whether the editable element is excluded from being shown in the explorer' };
-				parentIsRoot: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Whether the parent of the editable element is a root' };
-				isRoot: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Whether the editable element is a root' };
-				parentHasNests: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Whether the parent of the editable element has nested children' };
-				hasNests: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Whether the editable element has nested children' };
-			};
-			const errorData = {
-				parentIsDirectory: parent?.isDirectory,
-				isDirectory: stat.isDirectory,
-				isReadonly: !!stat.isReadonly,
-				parentIsReadonly: !!parent?.isReadonly,
-				parentIsExcluded: parent?.isExcluded,
-				isExcluded: stat.isExcluded,
-				parentIsRoot: parent?.isRoot,
-				isRoot: stat.isRoot,
-				parentHasNests: parent?.hasNests,
-				hasNests: stat.hasNests,
-			};
-			this.telemetryService.publicLogError2<ExplorerViewEditableErrorData, ExplorerViewEditableErrorClassification>('explorerView.setEditableError', errorData);
 			return;
 		}
 
diff --git a/src/vs/workbench/services/editor/browser/editorResolverService.ts b/src/vs/workbench/services/editor/browser/editorResolverService.ts
index ffb05607ac86..3a8ec5b71a3e 100644
--- a/src/vs/workbench/services/editor/browser/editorResolverService.ts
+++ b/src/vs/workbench/services/editor/browser/editorResolverService.ts
@@ -18,7 +18,6 @@ import { RegisteredEditorInfo, RegisteredEditorPriority, RegisteredEditorOptions
 import { QuickPickItem, IKeyMods, IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
 import { localize } from '../../../../nls.js';
 import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IExtensionService } from '../../extensions/common/extensions.js';
@@ -62,7 +61,6 @@ export class EditorResolverService extends Disposable implements IEditorResolver
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IQuickInputService private readonly quickInputService: IQuickInputService,
 		@INotificationService private readonly notificationService: INotificationService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IStorageService private readonly storageService: IStorageService,
 		@IExtensionService private readonly extensionService: IExtensionService,
 		@ILogService private readonly logService: ILogService
@@ -195,7 +193,6 @@ export class EditorResolverService extends Disposable implements IEditorResolver
 		}
 
 		if (input) {
-			this.sendEditorResolutionTelemetry(input.editor);
 			if (input.editor.editorId !== selectedEditor.editorInfo.id) {
 				this.logService.warn(`Editor ID Mismatch: ${input.editor.editorId} !== ${selectedEditor.editorInfo.id}. This will cause bugs. Please ensure editorInput.editorId matches the registered id`);
 			}
@@ -795,20 +792,6 @@ export class EditorResolverService extends Disposable implements IEditorResolver
 		return undefined;
 	}
 
-	private sendEditorResolutionTelemetry(chosenInput: EditorInput): void {
-		type editorResolutionClassification = {
-			viewType: { classification: 'PublicNonPersonalData'; purpose: 'FeatureInsight'; comment: 'The id of the editor opened. Used to gain an understanding of what editors are most popular' };
-			owner: 'lramos15';
-			comment: 'An event that fires when an editor type is picked';
-		};
-		type editorResolutionEvent = {
-			viewType: string;
-		};
-		if (chosenInput.editorId) {
-			this.telemetryService.publicLog2<editorResolutionEvent, editorResolutionClassification>('override.viewType', { viewType: chosenInput.editorId });
-		}
-	}
-
 	private cacheEditors() {
 		// Create a set to store glob patterns
 		const cacheStorage: Set<string> = new Set<string>();

From 07c9c0551efc4e1508e7fd7ff5c380d2e4bf503b Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Mon, 3 Mar 2025 17:13:55 +0100
Subject: [PATCH 0575/1815] Tree sitter: Tokenization fails to update on
 character change (#242458)

Fixes #242168
---
 .../common/services/treeSitter/cursorUtils.ts |  84 +++++++
 .../treeSitter/treeSitterParserService.ts     | 237 +++++++-----------
 .../services/treeSitterParserService.ts       |   1 -
 .../browser/treeSitterTokenizationFeature.ts  |   9 +-
 .../treeSitterTokenizationFeature.test.ts     |   1 -
 5 files changed, 183 insertions(+), 149 deletions(-)
 create mode 100644 src/vs/editor/common/services/treeSitter/cursorUtils.ts

diff --git a/src/vs/editor/common/services/treeSitter/cursorUtils.ts b/src/vs/editor/common/services/treeSitter/cursorUtils.ts
new file mode 100644
index 000000000000..b5b6e701dd3f
--- /dev/null
+++ b/src/vs/editor/common/services/treeSitter/cursorUtils.ts
@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import type * as Parser from '@vscode/tree-sitter-wasm';
+
+export function gotoNextSibling(newCursor: Parser.TreeCursor, oldCursor: Parser.TreeCursor) {
+	const n = newCursor.gotoNextSibling();
+	const o = oldCursor.gotoNextSibling();
+	if (n !== o) {
+		throw new Error('Trees are out of sync');
+	}
+	return n && o;
+}
+
+export function gotoParent(newCursor: Parser.TreeCursor, oldCursor: Parser.TreeCursor) {
+	const n = newCursor.gotoParent();
+	const o = oldCursor.gotoParent();
+	if (n !== o) {
+		throw new Error('Trees are out of sync');
+	}
+	return n && o;
+}
+
+export function gotoNthChild(newCursor: Parser.TreeCursor, oldCursor: Parser.TreeCursor, index: number) {
+	const n = newCursor.gotoFirstChild();
+	const o = oldCursor.gotoFirstChild();
+	if (n !== o) {
+		throw new Error('Trees are out of sync');
+	}
+	if (index === 0) {
+		return n && o;
+	}
+	for (let i = 1; i <= index; i++) {
+		const nn = newCursor.gotoNextSibling();
+		const oo = oldCursor.gotoNextSibling();
+		if (nn !== oo) {
+			throw new Error('Trees are out of sync');
+		}
+		if (!nn || !oo) {
+			return false;
+		}
+	}
+	return n && o;
+}
+
+export function nextSiblingOrParentSibling(newCursor: Parser.TreeCursor, oldCursor: Parser.TreeCursor) {
+	do {
+		if (newCursor.currentNode.nextSibling) {
+			return gotoNextSibling(newCursor, oldCursor);
+		}
+		if (newCursor.currentNode.parent) {
+			gotoParent(newCursor, oldCursor);
+		}
+	} while (newCursor.currentNode.nextSibling || newCursor.currentNode.parent);
+	return false;
+}
+
+export function getClosestPreviousNodes(cursor: Parser.TreeCursor, tree: Parser.Tree): Parser.Node | undefined {
+	// Go up parents until the end of the parent is before the start of the current.
+	const findPrev = tree.walk();
+	findPrev.resetTo(cursor);
+
+	const startingNode = cursor.currentNode;
+	do {
+		if (findPrev.currentNode.previousSibling && ((findPrev.currentNode.endIndex - findPrev.currentNode.startIndex) !== 0)) {
+			findPrev.gotoPreviousSibling();
+		} else {
+			while (!findPrev.currentNode.previousSibling && findPrev.currentNode.parent) {
+				findPrev.gotoParent();
+			}
+			findPrev.gotoPreviousSibling();
+		}
+	} while ((findPrev.currentNode.endIndex > startingNode.startIndex)
+	&& (findPrev.currentNode.parent || findPrev.currentNode.previousSibling)
+
+		&& (findPrev.currentNode.id !== startingNode.id));
+
+	if ((findPrev.currentNode.id !== startingNode.id) && findPrev.currentNode.endIndex <= startingNode.startIndex) {
+		return findPrev.currentNode;
+	} else {
+		return undefined;
+	}
+}
diff --git a/src/vs/editor/common/services/treeSitter/treeSitterParserService.ts b/src/vs/editor/common/services/treeSitter/treeSitterParserService.ts
index 49c61dd249b7..985207918cd5 100644
--- a/src/vs/editor/common/services/treeSitter/treeSitterParserService.ts
+++ b/src/vs/editor/common/services/treeSitter/treeSitterParserService.ts
@@ -22,9 +22,9 @@ import { IEnvironmentService } from '../../../../platform/environment/common/env
 import { CancellationError, isCancellationError } from '../../../../base/common/errors.js';
 import { PromiseResult } from '../../../../base/common/observable.js';
 import { Range } from '../../core/range.js';
-import { Position } from '../../core/position.js';
 import { LimitedQueue } from '../../../../base/common/async.js';
 import { TextLength } from '../../core/textLength.js';
+import { getClosestPreviousNodes, gotoNthChild, gotoParent, nextSiblingOrParentSibling } from './cursorUtils.js';
 
 const EDITOR_TREESITTER_TELEMETRY = 'editor.experimental.treeSitterTelemetry';
 const MODULE_LOCATION_SUBPATH = `@vscode/tree-sitter-wasm/wasm`;
@@ -133,16 +133,6 @@ const enum TelemetryParseType {
 	Incremental = 'incrementalParse'
 }
 
-interface ChangedRange {
-	newNodeId: number;
-	newStartPosition: Position;
-	newEndPosition: Position;
-	newStartIndex: number;
-	newEndIndex: number;
-	oldStartIndex: number;
-	oldEndIndex: number;
-}
-
 export class TreeSitterParseResult implements IDisposable, ITreeSitterParseResult {
 	private _tree: Parser.Tree | undefined;
 	private _lastFullyParsed: Parser.Tree | undefined;
@@ -172,91 +162,13 @@ export class TreeSitterParseResult implements IDisposable, ITreeSitterParseResul
 	get tree() { return this._lastFullyParsed; }
 	get isDisposed() { return this._isDisposed; }
 
-	private findChangedNodes(newTree: Parser.Tree, oldTree: Parser.Tree): ChangedRange[] {
+	private findChangedNodes(newTree: Parser.Tree, oldTree: Parser.Tree): Parser.Node[] {
 		const newCursor = newTree.walk();
 		const oldCursor = oldTree.walk();
-		const gotoNextSibling = () => {
-			const n = newCursor.gotoNextSibling();
-			const o = oldCursor.gotoNextSibling();
-			if (n !== o) {
-				throw new Error('Trees are out of sync');
-			}
-			return n && o;
-		};
-		const gotoParent = () => {
-			const n = newCursor.gotoParent();
-			const o = oldCursor.gotoParent();
-			if (n !== o) {
-				throw new Error('Trees are out of sync');
-			}
-			return n && o;
-		};
-		const gotoNthChild = (index: number) => {
-			const n = newCursor.gotoFirstChild();
-			const o = oldCursor.gotoFirstChild();
-			if (n !== o) {
-				throw new Error('Trees are out of sync');
-			}
-			if (index === 0) {
-				return n && o;
-			}
-			for (let i = 1; i <= index; i++) {
-				const nn = newCursor.gotoNextSibling();
-				const oo = oldCursor.gotoNextSibling();
-				if (nn !== oo) {
-					throw new Error('Trees are out of sync');
-				}
-				if (!nn || !oo) {
-					return false;
-				}
-			}
-			return n && o;
-		};
 
-		const changedRanges: ChangedRange[] = [];
+		const nodes: Parser.Node[] = [];
 		let next = true;
-		const nextSiblingOrParentSibling = () => {
-			do {
-				if (newCursor.currentNode.nextSibling) {
-					return gotoNextSibling();
-				}
-				if (newCursor.currentNode.parent) {
-					gotoParent();
-				}
-			} while (newCursor.currentNode.nextSibling || newCursor.currentNode.parent);
-			return false;
-		};
 
-		const getClosestPreviousNodes = (): { old: Parser.Node; new: Parser.Node } | undefined => {
-			// Go up parents until the end of the parent is before the start of the current.
-			const newFindPrev = newTree.walk();
-			newFindPrev.resetTo(newCursor);
-			const oldFindPrev = oldTree.walk();
-			oldFindPrev.resetTo(oldCursor);
-			const startingNode = newCursor.currentNode;
-			do {
-				if (newFindPrev.currentNode.previousSibling && ((newFindPrev.currentNode.endIndex - newFindPrev.currentNode.startIndex) !== 0)) {
-					newFindPrev.gotoPreviousSibling();
-					oldFindPrev.gotoPreviousSibling();
-				} else {
-					while (!newFindPrev.currentNode.previousSibling && newFindPrev.currentNode.parent) {
-						newFindPrev.gotoParent();
-						oldFindPrev.gotoParent();
-					}
-					newFindPrev.gotoPreviousSibling();
-					oldFindPrev.gotoPreviousSibling();
-				}
-			} while ((newFindPrev.currentNode.endIndex > startingNode.startIndex)
-			&& (newFindPrev.currentNode.parent || newFindPrev.currentNode.previousSibling)
-
-				&& (newFindPrev.currentNode.id !== startingNode.id));
-
-			if ((newFindPrev.currentNode.id !== startingNode.id) && newFindPrev.currentNode.endIndex <= startingNode.startIndex) {
-				return { old: oldFindPrev.currentNode, new: newFindPrev.currentNode };
-			} else {
-				return undefined;
-			}
-		};
 		do {
 			if (newCursor.currentNode.hasChanges) {
 				// Check if only one of the children has changes.
@@ -272,71 +184,110 @@ export class TreeSitterParseResult implements IDisposable, ITreeSitterParseResul
 					return c?.hasChanges;
 				});
 				// If we have changes and we *had* an error, the whole node should be refreshed.
-				if ((changedChildren.length === 0) || oldCursor.currentNode.hasError) {
+				if ((changedChildren.length === 0)) {
 					// walk up again until we get to the first one that's named as unnamed nodes can be too granular
 					while (newCursor.currentNode.parent && !newCursor.currentNode.isNamed && next) {
-						next = gotoParent();
+						next = gotoParent(newCursor, oldCursor);
 					}
 
 					const newNode = newCursor.currentNode;
-					const oldNode = oldCursor.currentNode;
-
-					const newEndPosition = new Position(newNode.endPosition.row + 1, newNode.endPosition.column + 1);
-					const oldEndIndex = oldNode.endIndex;
-
-					// Fill holes between nodes.
-					const closestPrev = getClosestPreviousNodes();
-					const newStartPosition = new Position(closestPrev ? closestPrev.new.endPosition.row + 1 : newNode.startPosition.row + 1, closestPrev ? closestPrev.new.endPosition.column + 1 : newNode.startPosition.column + 1);
-					const newStartIndex = closestPrev ? closestPrev.new.endIndex : newNode.startIndex;
-					const oldStartIndex = closestPrev ? closestPrev.old.endIndex : oldNode.startIndex;
-
-					changedRanges.push({ newStartPosition, newEndPosition, oldStartIndex, oldEndIndex, newNodeId: newNode.id, newStartIndex, newEndIndex: newNode.endIndex });
-					next = nextSiblingOrParentSibling();
+					nodes.push(newNode);
+					next = nextSiblingOrParentSibling(newCursor, oldCursor);
 				} else if (changedChildren.length >= 1) {
-					next = gotoNthChild(indexChangedChildren[0]);
+					next = gotoNthChild(newCursor, oldCursor, indexChangedChildren[0]);
 				}
 			} else {
-				next = nextSiblingOrParentSibling();
+				next = nextSiblingOrParentSibling(newCursor, oldCursor);
 			}
 		} while (next);
 
-		if (changedRanges.length === 0 && newTree.rootNode.hasChanges) {
-			return [{ newStartPosition: new Position(newTree.rootNode.startPosition.row + 1, newTree.rootNode.startPosition.column + 1), newEndPosition: new Position(newTree.rootNode.endPosition.row + 1, newTree.rootNode.endPosition.column + 1), oldStartIndex: oldTree.rootNode.startIndex, oldEndIndex: oldTree.rootNode.endIndex, newStartIndex: newTree.rootNode.startIndex, newEndIndex: newTree.rootNode.endIndex, newNodeId: newTree.rootNode.id }];
-		} else {
-			return changedRanges;
-		}
+		return nodes;
 	}
 
-	private calculateRangeChange(model: ITextModel, changedNodes: ChangedRange[] | undefined): RangeChange[] | undefined {
-		if (!changedNodes) {
-			return undefined;
-		}
+	private findTreeChanges(newTree: Parser.Tree, changedNodes: Parser.Node[]): RangeChange[] {
+		const mergedChanges: RangeChange[] = [];
+
+		// Find the parent in the new tree of the changed node
+		for (let nodeIndex = 0; nodeIndex < changedNodes.length; nodeIndex++) {
+			const node = changedNodes[nodeIndex];
+
+			if (mergedChanges.length > 0) {
+				if ((node.startIndex > mergedChanges[mergedChanges.length - 1].newRangeStartOffset) && (node.endIndex < mergedChanges[mergedChanges.length - 1].newRangeEndOffset)) {
+					// This node is within the previous range, skip it
+					continue;
+				}
+			}
 
-		// Collapse conginguous ranges
-		const ranges: RangeChange[] = [];
-		for (let i = 0; i < changedNodes.length; i++) {
-			const node = changedNodes[i];
-
-			// Check if contiguous with previous
-			const prevNode = changedNodes[i - 1];
-			if ((i > 0) && prevNode.newEndPosition.equals(node.newStartPosition)) {
-				const prevRangeChange = ranges[ranges.length - 1];
-				prevRangeChange.newRange = new Range(prevRangeChange.newRange.startLineNumber, prevRangeChange.newRange.startColumn, node.newEndPosition.lineNumber, node.newEndPosition.column);
-				prevRangeChange.oldRangeLength = node.oldEndIndex - prevNode.oldStartIndex;
-				prevRangeChange.newRangeEndOffset = node.newEndIndex;
+			const cursor = newTree.walk();
+			const cursorContainersNode = () => cursor.startIndex <= node.startIndex && cursor.endIndex >= node.endIndex;
+
+			while (cursorContainersNode()) {
+				// See if we can go to a child
+				let child = cursor.gotoFirstChild();
+				let foundChild = false;
+				while (child) {
+					if (cursorContainersNode()) {
+						foundChild = true;
+						break;
+					} else {
+						child = cursor.gotoNextSibling();
+					}
+				}
+				if (!foundChild) {
+					cursor.gotoParent();
+					break;
+				}
+				if (cursor.currentNode.childCount === 0) {
+					break;
+				}
+			}
+
+			let nodesInRange: Parser.Node[];
+			// It's possible we end up with a really large range if the parent node is big
+			// Try to avoid this large range by finding several smaller nodes that together encompass the range of the changed node.
+			const foundNodeSize = cursor.endIndex - cursor.startIndex;
+			if (foundNodeSize > 5000) {
+				// Try to find 3 consecutive nodes that together encompass the changed node.
+				let child = cursor.gotoFirstChild();
+				nodesInRange = [];
+				while (child) {
+					if (cursor.startIndex <= node.startIndex && cursor.endIndex > node.startIndex) {
+						// Found the starting point of our nodes
+						nodesInRange.push(cursor.currentNode);
+						do {
+							child = cursor.gotoNextSibling();
+						} while (child && (cursor.endIndex < node.endIndex));
+
+						nodesInRange.push(cursor.currentNode);
+						break;
+					}
+					child = cursor.gotoNextSibling();
+				}
 			} else {
-				ranges.push({ newRange: Range.fromPositions(node.newStartPosition, node.newEndPosition), oldRangeLength: node.oldEndIndex - node.oldStartIndex, newRangeStartOffset: node.newStartIndex, newRangeEndOffset: node.newEndIndex });
+				nodesInRange = [cursor.currentNode];
 			}
-		}
 
-		if (ranges.length > 0) {
-			const lastRange = ranges[ranges.length - 1];
-			const maxLine = model.getLineCount();
-			if (lastRange.newRange.endLineNumber > maxLine) {
-				lastRange.newRange = new Range(lastRange.newRange.startLineNumber, lastRange.newRange.startColumn, maxLine, model.getLineMaxColumn(maxLine));
+			// Fill in gaps between nodes
+			// Reset the cursor to the first node in the range;
+			while (cursor.currentNode.id !== nodesInRange[0].id) {
+				cursor.gotoPreviousSibling();
+			}
+			const previousNode = getClosestPreviousNodes(cursor, newTree);
+			const startingPosition = previousNode ? previousNode.endPosition : nodesInRange[0].startPosition;
+			const startingIndex = previousNode ? previousNode.endIndex : nodesInRange[0].startIndex;
+			const endingPosition = nodesInRange[nodesInRange.length - 1].endPosition;
+			const endingIndex = nodesInRange[nodesInRange.length - 1].endIndex;
+
+			const newChange = { newRange: new Range(startingPosition.row + 1, startingPosition.column + 1, endingPosition.row + 1, endingPosition.column + 1), newRangeStartOffset: startingIndex, newRangeEndOffset: endingIndex };
+			if ((mergedChanges.length > 0) && (mergedChanges[mergedChanges.length - 1].newRangeEndOffset >= newChange.newRangeStartOffset)) {
+				// Merge the changes
+				mergedChanges[mergedChanges.length - 1].newRange = Range.fromPositions(mergedChanges[mergedChanges.length - 1].newRange.getStartPosition(), newChange.newRange.getEndPosition());
+				mergedChanges[mergedChanges.length - 1].newRangeEndOffset = newChange.newRangeEndOffset;
+			} else {
+				mergedChanges.push(newChange);
 			}
 		}
-		return ranges;
+		return mergedChanges;
 	}
 
 	private _onDidChangeContentQueue: LimitedQueue = new LimitedQueue();
@@ -354,15 +305,19 @@ export class TreeSitterParseResult implements IDisposable, ITreeSitterParseResul
 				return;
 			}
 
-			let ranges: RangeChange[] | undefined;
+			const oldTree = this._lastFullyParsed;
+			let changedNodes: Parser.Node[] | undefined;
 			if (this._lastFullyParsedWithEdits && this._lastFullyParsed) {
-				ranges = this.calculateRangeChange(model, this.findChangedNodes(this._lastFullyParsedWithEdits, this._lastFullyParsed));
+				changedNodes = this.findChangedNodes(this._lastFullyParsedWithEdits, this._lastFullyParsed);
 			}
 
 			const completed = await this._parseAndUpdateTree(model, version);
 			if (completed) {
-				if (!ranges) {
-					ranges = [{ newRange: model.getFullModelRange(), oldRangeLength: model.getValueLength(), newRangeStartOffset: 0, newRangeEndOffset: model.getValueLength() }];
+				let ranges: RangeChange[] | undefined;
+				if (!changedNodes) {
+					ranges = [{ newRange: model.getFullModelRange(), newRangeStartOffset: 0, newRangeEndOffset: model.getValueLength() }];
+				} else if (oldTree && changedNodes) {
+					ranges = this.findTreeChanges(completed, changedNodes);
 				}
 				this._onDidUpdate.fire({ ranges, versionId: version });
 			}
diff --git a/src/vs/editor/common/services/treeSitterParserService.ts b/src/vs/editor/common/services/treeSitterParserService.ts
index 5e96ebd1617e..64e5a870d8fd 100644
--- a/src/vs/editor/common/services/treeSitterParserService.ts
+++ b/src/vs/editor/common/services/treeSitterParserService.ts
@@ -23,7 +23,6 @@ export interface RangeWithOffsets {
 
 export interface RangeChange {
 	newRange: Range;
-	oldRangeLength: number;
 	newRangeStartOffset: number;
 	newRangeEndOffset: number;
 }
diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
index c623dde498d4..bbaa9de12056 100644
--- a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
@@ -259,12 +259,11 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 					newRange: range,
 					newRangeStartOffset,
 					newRangeEndOffset,
-					oldRangeLength: newRangeEndOffset - newRangeStartOffset
 				};
 			}
 		} else {
 			const valueLength = textModel.getValueLength();
-			rangeChanges = [{ newRange: new Range(1, 1, maxLine, textModel.getLineMaxColumn(maxLine)), newRangeStartOffset: 0, newRangeEndOffset: valueLength, oldRangeLength: valueLength }];
+			rangeChanges = [{ newRange: new Range(1, 1, maxLine, textModel.getLineMaxColumn(maxLine)), newRangeStartOffset: 0, newRangeEndOffset: valueLength }];
 		}
 		return this._handleTreeUpdate({ ranges: rangeChanges, textModel, versionId });
 	}
@@ -377,8 +376,7 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 			rangeChanges[i] = {
 				newRange: range.range,
 				newRangeStartOffset: range.startOffset,
-				newRangeEndOffset: range.endOffset,
-				oldRangeLength: range.endOffset - range.startOffset
+				newRangeEndOffset: range.endOffset
 			};
 		}
 		this._handleTreeUpdate({ ranges: rangeChanges, textModel, versionId });
@@ -447,8 +445,7 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 						ranges: [{
 							newRange: modelRange,
 							newRangeStartOffset: 0,
-							newRangeEndOffset: model.getValueLength(),
-							oldRangeLength: model.getValueLength()
+							newRangeEndOffset: model.getValueLength()
 						}],
 						textModel: model,
 						versionId: model.getVersionId()
diff --git a/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts b/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts
index bb85bcff128c..54b2e1c28f65 100644
--- a/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts
+++ b/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts
@@ -384,7 +384,6 @@ class y {
 		assert.strictEqual(change.ranges[0].newRangeEndOffset, 32);
 		assert.strictEqual(change.ranges[0].newRange.startLineNumber, 2);
 		assert.strictEqual(change.ranges[0].newRange.endLineNumber, 7);
-		assert.strictEqual(change.ranges[0].oldRangeLength, 28);
 
 		updateListener?.dispose();
 		modelService.destroyModel(model.uri);

From 54b12e5ec877a5f45ebc927b055fed259a195f1f Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Mon, 3 Mar 2025 09:29:59 -0800
Subject: [PATCH 0576/1815] Copy UUID impl (#231347)

---
 extensions/ipynb/src/helper.ts  | 18 ++++++++++--------
 test/automation/src/profiler.ts | 21 +++++++++++++--------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/extensions/ipynb/src/helper.ts b/extensions/ipynb/src/helper.ts
index beab091f5c69..bd0310e7bb0d 100644
--- a/extensions/ipynb/src/helper.ts
+++ b/extensions/ipynb/src/helper.ts
@@ -147,13 +147,15 @@ export interface ITask<T> {
 /**
  * Copied from src/vs/base/common/uuid.ts
  */
-export function generateUuid() {
-	// use `randomValues` if possible
-	function getRandomValues(bucket: Uint8Array): Uint8Array {
-		for (let i = 0; i < bucket.length; i++) {
-			bucket[i] = Math.floor(Math.random() * 256);
-		}
-		return bucket;
+export function generateUuid(): string {
+	// use `randomUUID` if possible
+	if (typeof crypto.randomUUID === 'function') {
+		// see https://developer.mozilla.org/en-US/docs/Web/API/Window/crypto
+		// > Although crypto is available on all windows, the returned Crypto object only has one
+		// > usable feature in insecure contexts: the getRandomValues() method.
+		// > In general, you should use this API only in secure contexts.
+
+		return crypto.randomUUID.bind(crypto).toString();
 	}
 
 	// prep-work
@@ -164,7 +166,7 @@ export function generateUuid() {
 	}
 
 	// get data
-	getRandomValues(_data);
+	crypto.getRandomValues(_data);
 
 	// set version bits
 	_data[6] = (_data[6] & 0x0f) | 0x40;
diff --git a/test/automation/src/profiler.ts b/test/automation/src/profiler.ts
index 9b3a0107d5eb..281a8b9bcd58 100644
--- a/test/automation/src/profiler.ts
+++ b/test/automation/src/profiler.ts
@@ -55,13 +55,18 @@ export class Profiler {
 	}
 }
 
-function generateUuid() {
-	// use `randomValues` if possible
-	function getRandomValues(bucket: Uint8Array): Uint8Array {
-		for (let i = 0; i < bucket.length; i++) {
-			bucket[i] = Math.floor(Math.random() * 256);
-		}
-		return bucket;
+/**
+ * Copied from src/vs/base/common/uuid.ts
+ */
+export function generateUuid(): string {
+	// use `randomUUID` if possible
+	if (typeof crypto.randomUUID === 'function') {
+		// see https://developer.mozilla.org/en-US/docs/Web/API/Window/crypto
+		// > Although crypto is available on all windows, the returned Crypto object only has one
+		// > usable feature in insecure contexts: the getRandomValues() method.
+		// > In general, you should use this API only in secure contexts.
+
+		return crypto.randomUUID.bind(crypto).toString();
 	}
 
 	// prep-work
@@ -72,7 +77,7 @@ function generateUuid() {
 	}
 
 	// get data
-	getRandomValues(_data);
+	crypto.getRandomValues(_data);
 
 	// set version bits
 	_data[6] = (_data[6] & 0x0f) | 0x40;

From 32951d0c3acbd87ed67fe62f90b6b3448191f0b3 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Mon, 3 Mar 2025 11:16:57 -0800
Subject: [PATCH 0577/1815] chat: fix downgrade to old version versions
 (#242498)

Fixes https://github.com/microsoft/vscode-copilot/issues/13858
---
 .../contrib/chat/browser/chatEditing/chatEditingSession.ts   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 5f5d69c44dbd..8bff1b50d81a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -1159,7 +1159,7 @@ class ChatEditingSessionStorage {
 			this._logService.debug(`chatEditingSession: Restoring editing session at ${stateFilePath.toString()}`);
 			const stateFileContent = await this._fileService.readFile(stateFilePath);
 			const data = JSON.parse(stateFileContent.value.toString()) as IChatEditingSessionDTO;
-			if (data.version !== STORAGE_VERSION) {
+			if (!COMPATIBLE_STORAGE_VERSIONS.includes(data.version)) {
 				return undefined;
 			}
 
@@ -1356,7 +1356,8 @@ interface IModifiedEntryTelemetryInfoDTO {
 
 type ResourceMapDTO<T> = [string, T][];
 
-const STORAGE_VERSION = 1;
+const COMPATIBLE_STORAGE_VERSIONS = [1, 2];
+const STORAGE_VERSION = 2;
 
 /** Old history uses IChatEditingSessionSnapshotDTO, new history uses IChatEditingSessionSnapshotDTO. */
 interface IChatEditingSessionDTO {

From 0c8f327396baea51ef6e3435a52b8c10268e5f6f Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Mon, 3 Mar 2025 11:19:46 -0800
Subject: [PATCH 0578/1815] fix: avoid extra padding in chat input part from
 related files (#242495)

* fix: avoid extra padding in chat input part from related files

* Also handle extra padding on empty attachments
---
 src/vs/workbench/contrib/chat/browser/chatInputPart.ts | 3 +++
 src/vs/workbench/contrib/chat/browser/media/chat.css   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 8944f97fc43f..16d8c42b2419 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -991,6 +991,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 		const attachments = [...this.attachmentModel.attachments.entries()];
 		dom.setVisibility(Boolean(attachments.length) || (this.addFilesToolbar && !this.addFilesToolbar.isEmpty()) || Boolean(this.implicitContext?.value) || !this.instructionAttachmentsPart.empty, this.attachmentsContainer);
+		dom.setVisibility(Boolean(attachments.length), this.attachedContextContainer);
 		if (!attachments.length) {
 			this._indexOfLastAttachedContextDeletedWithKeyboard = -1;
 		}
@@ -1409,6 +1410,8 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 	async renderChatRelatedFiles(chatEditingSession: IChatEditingSession, anchor: HTMLElement) {
 		dom.clearNode(anchor);
+		dom.setVisibility(Boolean(chatEditingSession.workingSet.size), anchor);
+
 		const hoverDelegate = getDefaultHoverDelegate('element');
 		for (const [uri, metadata] of chatEditingSession.workingSet) {
 			if (metadata.state !== WorkingSetEntryState.Suggested) {
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index da52cbb6ca98..727fe8694c08 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -700,6 +700,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	flex-wrap: wrap;
 	align-items: center;
 	gap: 4px;
+	max-width: 100%;
 }
 
 .chat-related-files .monaco-button-dropdown .monaco-text-button {
@@ -1195,7 +1196,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	flex-wrap: wrap;
 	cursor: default;
 	gap: 4px;
-	width: 100%;
+	max-width: 100%;
 }
 
 .interactive-session .interactive-input-part.compact .chat-attached-context {

From 3acb58a530cc079709ab13fcc6aca90ed0e0d9c2 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Mon, 3 Mar 2025 11:28:45 -0800
Subject: [PATCH 0579/1815] Update tab variable descriptions to match docs

Part of microsoft/vscode-docs#8015
---
 .../terminal/common/terminalConfiguration.ts  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index 22c9690746d4..215512fd81d7 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -16,19 +16,19 @@ import { terminalContribConfiguration, TerminalContribSettingId } from '../termi
 import { DEFAULT_COMMANDS_TO_SKIP_SHELL, DEFAULT_LETTER_SPACING, DEFAULT_LINE_HEIGHT, MAXIMUM_FONT_WEIGHT, MINIMUM_FONT_WEIGHT, SUGGESTIONS_FONT_WEIGHT } from './terminal.js';
 
 const terminalDescriptors = '\n- ' + [
-	'`\${cwd}`: ' + localize("cwd", "the terminal's current working directory"),
+	'`\${cwd}`: ' + localize("cwd", "the terminal's current working directory."),
 	'`\${cwdFolder}`: ' + localize('cwdFolder', "the terminal's current working directory, displayed for multi-root workspaces or in a single root workspace when the value differs from the initial working directory. On Windows, this will only be displayed when shell integration is enabled."),
-	'`\${workspaceFolder}`: ' + localize('workspaceFolder', "the workspace in which the terminal was launched"),
-	'`\${workspaceFolderName}`: ' + localize('workspaceFolderName', "the `name` of the workspace in which the terminal was launched"),
-	'`\${local}`: ' + localize('local', "indicates a local terminal in a remote workspace"),
-	'`\${process}`: ' + localize('process', "the name of the terminal process"),
-	'`\${progress}`: ' + localize('progress', "the progress state as reported by the `OSC 9;4` sequence"),
-	'`\${separator}`: ' + localize('separator', "a conditional separator {0} that only shows when surrounded by variables with values or static text.", '(` - `)'),
-	'`\${sequence}`: ' + localize('sequence', "the name provided to the terminal by the process"),
-	'`\${task}`: ' + localize('task', "indicates this terminal is associated with a task"),
-	'`\${shellType}`: ' + localize('shellType', "the detected shell type"),
-	'`\${shellCommand}`: ' + localize('shellCommand', "the command being executed according to shell integration. This also requires high confidence in the detected command line which may not work in some prompt frameworks."),
-	'`\${shellPromptInput}`: ' + localize('shellPromptInput', "the shell's full prompt input according to shell integration"),
+	'`\${workspaceFolder}`: ' + localize('workspaceFolder', "the workspace in which the terminal was launched."),
+	'`\${workspaceFolderName}`: ' + localize('workspaceFolderName', "the `name` of the workspace in which the terminal was launched."),
+	'`\${local}`: ' + localize('local', "indicates a local terminal in a remote workspace."),
+	'`\${process}`: ' + localize('process', "the name of the terminal process."),
+	'`\${progress}`: ' + localize('progress', "the progress state as reported by the `OSC 9;4` sequence."),
+	'`\${separator}`: ' + localize('separator', "a conditional separator {0} that only shows when it's surrounded by variables with values or static text.", '(` - `)'),
+	'`\${sequence}`: ' + localize('sequence', "the name provided to the terminal by the process."),
+	'`\${task}`: ' + localize('task', "indicates this terminal is associated with a task."),
+	'`\${shellType}`: ' + localize('shellType', "the detected shell type."),
+	'`\${shellCommand}`: ' + localize('shellCommand', "the command being executed according to shell integration. This also requires high confidence in the detected command line, which may not work in some prompt frameworks."),
+	'`\${shellPromptInput}`: ' + localize('shellPromptInput', "the shell's full prompt input according to shell integration."),
 ].join('\n- '); // intentionally concatenated to not produce a string that is too long for translations
 
 let terminalTitle = localize('terminalTitle', "Controls the terminal title. Variables are substituted based on the context:");

From 1e1dabdbb9edc1df2fcf34fde86264a7d3a8a690 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Mon, 3 Mar 2025 12:25:32 -0800
Subject: [PATCH 0580/1815] Add option to hide ToC entries (#242506)

Fixes #242011
---
 .../contrib/preferences/browser/settingsLayout.ts         | 8 ++++++--
 .../workbench/contrib/preferences/browser/settingsTree.ts | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
index 8408d9a11a93..c0b28234b7a1 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsLayout.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { isWeb, isWindows } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.js';
 import { ExtensionToggleData } from '../common/preferences.js';
 
@@ -12,6 +13,7 @@ export interface ITOCEntry<T> {
 	order?: number;
 	children?: ITOCEntry<T>[];
 	settings?: Array<T>;
+	hide?: boolean;
 }
 
 const defaultCommonlyUsedSettings: string[] = [
@@ -239,7 +241,8 @@ export const tocData: ITOCEntry<string> = {
 				{
 					id: 'features/issueReporter',
 					label: localize('issueReporter', 'Issue Reporter'),
-					settings: ['issueReporter.*']
+					settings: ['issueReporter.*'],
+					hide: !isWeb
 				}
 			]
 		},
@@ -280,7 +283,8 @@ export const tocData: ITOCEntry<string> = {
 				{
 					id: 'application/other',
 					label: localize('other', "Other"),
-					settings: ['application.*']
+					settings: ['application.*'],
+					hide: isWindows
 				}
 			]
 		},
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
index be9840d7bc11..e4d0236dc2c5 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -568,6 +568,7 @@ function _resolveSettingsTree(tocData: ITOCEntry<string>, allSettings: Set<ISett
 	let children: ITOCEntry<ISetting>[] | undefined;
 	if (tocData.children) {
 		children = tocData.children
+			.filter(child => child.hide !== true)
 			.map(child => _resolveSettingsTree(child, allSettings, logService))
 			.filter(child => child.children?.length || child.settings?.length);
 	}

From 3f7b72a3dce01786c82733e759d98f60d8e92645 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Mon, 3 Mar 2025 15:30:04 -0600
Subject: [PATCH 0581/1815] when showing suggestions due to a backspace, ensure
 cursor index > 0 (#242509)

fix #241765
---
 .../terminalContrib/suggest/browser/terminalSuggestAddon.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index 693bfefc3bbe..76e8ae7d88f7 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -426,7 +426,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			}
 
 			// If the cursor moved to the left
-			if (this._mostRecentPromptInputState && promptInputState.cursorIndex < this._mostRecentPromptInputState.cursorIndex) {
+			if (this._mostRecentPromptInputState && promptInputState.cursorIndex < this._mostRecentPromptInputState.cursorIndex && promptInputState.cursorIndex > 0) {
 				// Backspace or left past a trigger character
 				if (config.suggestOnTriggerCharacters && !sent && this._mostRecentPromptInputState.cursorIndex > 0) {
 					const char = this._mostRecentPromptInputState.value[this._mostRecentPromptInputState.cursorIndex - 1];

From f1f5327a744647edd7a28c3205842d66298f0399 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 3 Mar 2025 23:28:52 +0100
Subject: [PATCH 0582/1815] Git - do not show "Not Committed Yet" while typing
 (#242508)

---
 extensions/git/src/blame.ts | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/extensions/git/src/blame.ts b/extensions/git/src/blame.ts
index e6a76fcf7526..12182f1de8d8 100644
--- a/extensions/git/src/blame.ts
+++ b/extensions/git/src/blame.ts
@@ -362,7 +362,7 @@ export class GitBlameController {
 				}
 
 				window.onDidChangeActiveTextEditor(e => this._updateTextEditorBlameInformation(e), this, this._enablementDisposables);
-				window.onDidChangeTextEditorSelection(e => this._updateTextEditorBlameInformation(e.textEditor, true), this, this._enablementDisposables);
+				window.onDidChangeTextEditorSelection(e => this._updateTextEditorBlameInformation(e.textEditor, 'selection'), this, this._enablementDisposables);
 				window.onDidChangeTextEditorDiffInformation(e => this._updateTextEditorBlameInformation(e.textEditor), this, this._enablementDisposables);
 			}
 		} else {
@@ -421,7 +421,7 @@ export class GitBlameController {
 	}
 
 	@throttle
-	private async _updateTextEditorBlameInformation(textEditor: TextEditor | undefined, showBlameInformationForPositionZero = false): Promise<void> {
+	private async _updateTextEditorBlameInformation(textEditor: TextEditor | undefined, reason?: 'selection'): Promise<void> {
 		if (textEditor) {
 			if (!textEditor.diffInformation || textEditor !== window.activeTextEditor) {
 				return;
@@ -445,7 +445,7 @@ export class GitBlameController {
 		// Do not show blame information when there is a single selection and it is at the beginning
 		// of the file [0, 0, 0, 0] unless the user explicitly navigates the cursor there. We do this
 		// to avoid showing blame information when the editor is not focused.
-		if (!showBlameInformationForPositionZero && textEditor.selections.length === 1 &&
+		if (reason !== 'selection' && textEditor.selections.length === 1 &&
 			textEditor.selections[0].start.line === 0 && textEditor.selections[0].start.character === 0 &&
 			textEditor.selections[0].end.line === 0 && textEditor.selections[0].end.character === 0) {
 			this.textEditorBlameInformation = undefined;
@@ -470,8 +470,11 @@ export class GitBlameController {
 				// Resource on the right-hand side of the diff editor when viewing a resource from the index.
 				const diffInformationWorkingTreeAndIndex = getWorkingTreeAndIndexDiffInformation(textEditor);
 
-				// Working tree + index diff information is present and it is stale
+				// Working tree + index diff information is present and it is stale. Diff information
+				// may be stale when the selection changes because of a content change and the diff
+				// information is not yet updated.
 				if (diffInformationWorkingTreeAndIndex && diffInformationWorkingTreeAndIndex.isStale) {
+					this.textEditorBlameInformation = undefined;
 					return;
 				}
 
@@ -484,16 +487,22 @@ export class GitBlameController {
 			// Working tree diff information. Diff Editor (Working Tree) -> Text Editor
 			const diffInformationWorkingTree = getWorkingTreeDiffInformation(textEditor);
 
-			// Working tree diff information is not present or it is stale
+			// Working tree diff information is not present or it is stale. Diff information
+			// may be stale when the selection changes because of a content change and the diff
+			// information is not yet updated.
 			if (!diffInformationWorkingTree || diffInformationWorkingTree.isStale) {
+				this.textEditorBlameInformation = undefined;
 				return;
 			}
 
 			// Working tree + index diff information
 			const diffInformationWorkingTreeAndIndex = getWorkingTreeAndIndexDiffInformation(textEditor);
 
-			// Working tree + index diff information is present and it is stale
+			// Working tree + index diff information is present and it is stale. Diff information
+			// may be stale when the selection changes because of a content change and the diff
+			// information is not yet updated.
 			if (diffInformationWorkingTreeAndIndex && diffInformationWorkingTreeAndIndex.isStale) {
+				this.textEditorBlameInformation = undefined;
 				return;
 			}
 
@@ -526,7 +535,10 @@ export class GitBlameController {
 		for (const lineNumber of new Set(textEditor.selections.map(s => s.active.line))) {
 			// Check if the line is contained in the working tree diff information
 			if (lineRangesContainLine(workingTreeChanges, lineNumber + 1)) {
-				lineBlameInformation.push({ lineNumber, blameInformation: l10n.t('Not Committed Yet') });
+				if (reason === 'selection') {
+					// Only show the `Not Committed Yet` message upon selection change due to navigation
+					lineBlameInformation.push({ lineNumber, blameInformation: l10n.t('Not Committed Yet') });
+				}
 				continue;
 			}
 

From dbfd94fde3b722387b65a75267e5248fbb81c93d Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Mon, 3 Mar 2025 14:38:33 -0800
Subject: [PATCH 0583/1815] debug: potential overlapping line fix (#242515)

This fixes some errors in list view rendering that I think might have caused the issue.

Fixes #237332
---
 src/vs/base/browser/ui/list/listView.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
index 4c8af3e908e6..67bad0de33f1 100644
--- a/src/vs/base/browser/ui/list/listView.ts
+++ b/src/vs/base/browser/ui/list/listView.ts
@@ -1243,7 +1243,11 @@ export class ListView<T> implements IListView<T> {
 			}));
 			selectionStore.add(addDisposableListener(doc, 'selectionchange', () => {
 				const selection = doc.getSelection();
-				if (!selection) {
+				// if the selection changed _after_ mouseup, it's from clearing the list or similar, so teardown
+				if (!selection || selection.isCollapsed) {
+					if (movementStore.isDisposed) {
+						selectionStore.dispose();
+					}
 					return;
 				}
 
@@ -1527,8 +1531,9 @@ export class ListView<T> implements IListView<T> {
 	protected getRenderRange(renderTop: number, renderHeight: number): IRange {
 		const range = this.getVisibleRange(renderTop, renderHeight);
 		if (this.currentSelectionBounds) {
-			range.start = Math.min(range.start, this.currentSelectionBounds.start);
-			range.end = Math.max(range.end, this.currentSelectionBounds.end + 1);
+			const max = this.rangeMap.count;
+			range.start = Math.min(range.start, this.currentSelectionBounds.start, max);
+			range.end = Math.min(Math.max(range.end, this.currentSelectionBounds.end + 1), max);
 		}
 
 		return range;

From 12dafaf7b50b1b5fef6df1a1793874d4fad2efb1 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Mon, 3 Mar 2025 16:56:30 -0600
Subject: [PATCH 0584/1815] fix terminal suggest bug where unexpected
 completions are returned (#242363)

---
 extensions/terminal-suggest/src/fig/figInterface.ts    | 10 ++++------
 .../suggest/browser/terminalSuggestAddon.ts            |  1 +
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/extensions/terminal-suggest/src/fig/figInterface.ts b/extensions/terminal-suggest/src/fig/figInterface.ts
index 7e09c8b6b34a..6e351a8952e4 100644
--- a/extensions/terminal-suggest/src/fig/figInterface.ts
+++ b/extensions/terminal-suggest/src/fig/figInterface.ts
@@ -52,11 +52,10 @@ export async function getFigSuggestions(
 		if (!specLabels) {
 			continue;
 		}
-
 		for (const specLabel of specLabels) {
 			const availableCommand = (osIsWindows()
-				? availableCommands.find(command => (typeof command.label === 'string' ? command.label : command.label.label).match(new RegExp(`${specLabel}(\\.[^ ]+)?$`)))
-				: availableCommands.find(command => (typeof command.label === 'string' ? command.label : command.label.label).startsWith(specLabel)));
+				? availableCommands.find(command => (command.definitionCommand ?? (typeof command.label === 'string' ? command.label : command.label.label)).match(new RegExp(`${specLabel}(\\.[^ ]+)?$`)))
+				: availableCommands.find(command => (command.definitionCommand ?? (typeof command.label === 'string' ? command.label : command.label.label) === (specLabel))));
 			if (!availableCommand || (token && token.isCancellationRequested)) {
 				continue;
 			}
@@ -81,13 +80,12 @@ export async function getFigSuggestions(
 
 			const commandAndAliases = (osIsWindows()
 				? availableCommands.filter(command => specLabel === removeAnyFileExtension(command.definitionCommand ?? (typeof command.label === 'string' ? command.label : command.label.label)))
-				: availableCommands.filter(command => specLabel === (command.definitionCommand ?? command.label)));
+				: availableCommands.filter(command => specLabel === (command.definitionCommand ?? (typeof command.label === 'string' ? command.label : command.label.label))));
 			if (
 				!(osIsWindows()
 					? commandAndAliases.some(e => precedingText.startsWith(`${removeAnyFileExtension((typeof e.label === 'string' ? e.label : e.label.label))} `))
-					: commandAndAliases.some(e => precedingText.startsWith(`${e.label} `)))
+					: commandAndAliases.some(e => precedingText.startsWith(`${typeof e.label === 'string' ? e.label : e.label.label} `)))
 			) {
-				// the spec label is not the first word in the command line, so do not provide options or args
 				continue;
 			}
 
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index 76e8ae7d88f7..eba26bd6fa22 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -257,6 +257,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 
 		const completions = providedCompletions?.flat() || [];
 		if (!explicitlyInvoked && !completions.length) {
+			this.hideSuggestWidget(true);
 			return;
 		}
 

From 94e7fe385c366bd10b45b7e496e5d6a41f4ba10a Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Mon, 3 Mar 2025 17:00:44 -0600
Subject: [PATCH 0585/1815] add terminal completion debug logs (#242517)

fix #242076
---
 extensions/terminal-suggest/src/terminalSuggestMain.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 3f181bcd5876..d59c9a7623ae 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -94,17 +94,20 @@ export async function activate(context: vscode.ExtensionContext) {
 		id: 'terminal-suggest',
 		async provideTerminalCompletions(terminal: vscode.Terminal, terminalContext: vscode.TerminalCompletionContext, token: vscode.CancellationToken): Promise<vscode.TerminalCompletionItem[] | vscode.TerminalCompletionList | undefined> {
 			if (token.isCancellationRequested) {
+				console.debug('#terminalCompletions token cancellation requested');
 				return;
 			}
 
 			const shellType: TerminalShellType | undefined = 'shellType' in terminal.state ? terminal.state.shellType as TerminalShellType : undefined;
 			if (!shellType) {
+				console.debug('#terminalCompletions No shell type found for terminal');
 				return;
 			}
 
 			const commandsInPath = await pathExecutableCache.getExecutablesInPath(terminal.shellIntegration?.env?.value);
 			const shellGlobals = await getShellGlobals(shellType, commandsInPath?.labels) ?? [];
 			if (!commandsInPath?.completionResources) {
+				console.debug('#terminalCompletions No commands found in path');
 				return;
 			}
 			// Order is important here, add shell globals first so they are prioritized over path commands

From 6204af729e21c385e5932563f686176c2c81e2e3 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Mon, 3 Mar 2025 15:03:43 -0800
Subject: [PATCH 0586/1815] debug: fix stopDebugging needing to be called twice
 for test-init debug sessions (#242518)

Fixes #242124
---
 .../workbench/contrib/debug/browser/debugService.ts |  2 +-
 .../workbench/contrib/debug/browser/debugSession.ts | 13 +++++++++++--
 src/vs/workbench/contrib/debug/common/debug.ts      |  2 ++
 .../contrib/debug/test/common/mockDebug.ts          |  4 ++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/debug/browser/debugService.ts b/src/vs/workbench/contrib/debug/browser/debugService.ts
index 879fc9155249..9a359f4f9d8a 100644
--- a/src/vs/workbench/contrib/debug/browser/debugService.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugService.ts
@@ -867,7 +867,7 @@ export class DebugService implements IDebugService {
 		// the session, then start the test run again; tests have no notion of restarts.
 		if (session.correlatedTestRun) {
 			if (!session.correlatedTestRun.completedAt) {
-				this.testService.cancelTestRun(session.correlatedTestRun.id);
+				session.cancelCorrelatedTestRun();
 				await Event.toPromise(session.correlatedTestRun.onComplete);
 				// todo@connor4312 is there any reason to wait for the debug session to
 				// terminate? I don't think so, test extension should already handle any
diff --git a/src/vs/workbench/contrib/debug/browser/debugSession.ts b/src/vs/workbench/contrib/debug/browser/debugSession.ts
index 107ead5e51a0..3e63e4891679 100644
--- a/src/vs/workbench/contrib/debug/browser/debugSession.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugSession.ts
@@ -402,6 +402,16 @@ export class DebugSession implements IDebugSession, IDisposable {
 		}
 	}
 
+	/**
+	 * Terminate any linked test run.
+	 */
+	cancelCorrelatedTestRun() {
+		if (this.correlatedTestRun && !this.correlatedTestRun.completedAt) {
+			this.didTerminateTestRun = true;
+			this.testService.cancelTestRun(this.correlatedTestRun.id);
+		}
+	}
+
 	/**
 	 * terminate the current debug adapter session
 	 */
@@ -415,8 +425,7 @@ export class DebugSession implements IDebugSession, IDisposable {
 		if (this._options.lifecycleManagedByParent && this.parentSession) {
 			await this.parentSession.terminate(restart);
 		} else if (this.correlatedTestRun && !this.correlatedTestRun.completedAt && !this.didTerminateTestRun) {
-			this.didTerminateTestRun = true;
-			this.testService.cancelTestRun(this.correlatedTestRun.id);
+			this.cancelCorrelatedTestRun();
 		} else if (this.raw) {
 			if (this.raw.capabilities.supportsTerminateRequest && this._configuration.resolved.request === 'launch') {
 				await this.raw.terminate(restart);
diff --git a/src/vs/workbench/contrib/debug/common/debug.ts b/src/vs/workbench/contrib/debug/common/debug.ts
index 8df2579316ae..6ce5e3e38a93 100644
--- a/src/vs/workbench/contrib/debug/common/debug.ts
+++ b/src/vs/workbench/contrib/debug/common/debug.ts
@@ -412,6 +412,8 @@ export interface IDebugSession extends ITreeElement {
 	removeReplExpressions(): void;
 	addReplExpression(stackFrame: IStackFrame | undefined, name: string): Promise<void>;
 	appendToRepl(data: INewReplElementData): void;
+	/** Cancel any associated test run set through the DebugSessionOptions */
+	cancelCorrelatedTestRun(): void;
 
 	// session events
 	readonly onDidEndAdapter: Event<AdapterEndEvent | undefined>;
diff --git a/src/vs/workbench/contrib/debug/test/common/mockDebug.ts b/src/vs/workbench/contrib/debug/test/common/mockDebug.ts
index add32108f5f7..8d3c433daac5 100644
--- a/src/vs/workbench/contrib/debug/test/common/mockDebug.ts
+++ b/src/vs/workbench/contrib/debug/test/common/mockDebug.ts
@@ -195,6 +195,10 @@ export class MockSession implements IDebugSession {
 		throw new Error('Method not implemented.');
 	}
 
+	cancelCorrelatedTestRun(): void {
+
+	}
+
 	get compoundRoot(): DebugCompoundRoot | undefined {
 		return undefined;
 	}

From e03dd9ad93b871ca0d6e859be757513ba5c71678 Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Mon, 3 Mar 2025 15:14:37 -0800
Subject: [PATCH 0587/1815] dispose 3 leaked disposables (#242519)

* dispose 3 leaked disposables

* better name

---------

Co-authored-by: amunger <>
---
 .../contrib/notebook/browser/notebookEditorWidget.ts  |  2 ++
 .../notebook/browser/view/renderers/cellRenderer.ts   | 11 ++++++-----
 .../notebook/browser/viewParts/notebookKernelView.ts  |  4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
index 1c6d1eed11b5..2c7a92be7212 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -2375,6 +2375,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 				return;
 			}
 
+			const pendingLayout = this._pendingLayouts?.get(cell);
 			this._pendingLayouts?.delete(cell);
 
 			if (!this.hasEditorFocus()) {
@@ -2393,6 +2394,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 
 			this._list.updateElementHeight2(cell, height);
 			deferred.complete(undefined);
+			pendingLayout?.dispose();
 		};
 
 		if (this._list.inRenderingTransaction) {
diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
index 6c0a4f516d37..826b7d3d53b1 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
@@ -84,7 +84,7 @@ export class NotebookCellListDelegate extends Disposable implements IListVirtual
 	}
 }
 
-abstract class AbstractCellRenderer {
+abstract class AbstractCellRenderer extends Disposable {
 	protected readonly editorOptions: CellEditorOptions;
 
 	constructor(
@@ -99,11 +99,12 @@ abstract class AbstractCellRenderer {
 		language: string,
 		protected dndController: CellDragAndDropController | undefined
 	) {
-		this.editorOptions = new CellEditorOptions(this.notebookEditor.getBaseCellEditorOptions(language), this.notebookEditor.notebookOptions, configurationService);
+		super();
+		this.editorOptions = this._register(new CellEditorOptions(this.notebookEditor.getBaseCellEditorOptions(language), this.notebookEditor.notebookOptions, configurationService));
 	}
 
-	dispose() {
-		this.editorOptions.dispose();
+	override dispose() {
+		super.dispose();
 		this.dndController = undefined;
 	}
 }
@@ -366,7 +367,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 			outputShowMoreContainer,
 			editor,
 			templateDisposables,
-			elementDisposables: new DisposableStore(),
+			elementDisposables: this._register(new DisposableStore()),
 			cellParts,
 			toJSON: () => { return {}; }
 		};
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.ts
index 2b2bd8bd7440..b4c6ca0c38eb 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.ts
@@ -140,11 +140,13 @@ export class NotebooKernelActionViewItem extends ActionViewItem {
 		@INotebookKernelService private readonly _notebookKernelService: INotebookKernelService,
 		@INotebookKernelHistoryService private readonly _notebookKernelHistoryService: INotebookKernelHistoryService,
 	) {
+		const action = new Action('fakeAction', undefined, ThemeIcon.asClassName(selectKernelIcon), true, (event) => actualAction.run(event));
 		super(
 			undefined,
-			new Action('fakeAction', undefined, ThemeIcon.asClassName(selectKernelIcon), true, (event) => actualAction.run(event)),
+			action,
 			{ ...options, label: false, icon: true }
 		);
+		this._register(action);
 		this._register(_editor.onDidChangeModel(this._update, this));
 		this._register(_notebookKernelService.onDidAddKernel(this._update, this));
 		this._register(_notebookKernelService.onDidRemoveKernel(this._update, this));

From 8d7af779576b94555e7b997fc8a65dbae79263ac Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Mon, 3 Mar 2025 17:16:30 -0600
Subject: [PATCH 0588/1815] add advanced explain mode details, provide prompt
 input mode for terminal suggest (#242520)

fix #242211
---
 .../suggest/browser/terminalSuggestAddon.ts                | 7 ++++++-
 .../services/suggest/browser/simpleSuggestWidget.ts        | 3 ++-
 .../services/suggest/browser/simpleSuggestWidgetDetails.ts | 7 +++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index eba26bd6fa22..d54e7c977e2c 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -593,6 +593,10 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		return fontInfo;
 	}
 
+	private _getAdvancedExplainModeDetails(): string | undefined {
+		return `promptInputModel: ${this._promptInputModel?.getCombinedString()}`;
+	}
+
 	private _showCompletions(model: TerminalCompletionModel, explicitlyInvoked?: boolean): void {
 		if (!this._terminal?.element) {
 			return;
@@ -629,7 +633,8 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 					showStatusBarSettingId: TerminalSuggestSettingId.ShowStatusBar
 				},
 				this._getFontInfo.bind(this),
-				this._onDidFontConfigurationChange.event.bind(this)
+				this._onDidFontConfigurationChange.event.bind(this),
+				this._getAdvancedExplainModeDetails.bind(this)
 			)) as any as SimpleSuggestWidget<TerminalCompletionModel, TerminalCompletionItem>;
 			this._suggestWidget.list.style(getListStyles({
 				listInactiveFocusBackground: editorSuggestWidgetSelectedBackground,
diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
index 294fccfd2e87..0b6151ec1e96 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
@@ -117,6 +117,7 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 		private readonly _options: IWorkbenchSuggestWidgetOptions,
 		private readonly _getFontInfo: () => ISimpleSuggestWidgetFontInfo,
 		private readonly _onDidFontConfigurationChange: Event<void>,
+		private readonly _getAdvancedExplainModeDetails: () => string | undefined,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IStorageService private readonly _storageService: IStorageService,
@@ -220,7 +221,7 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 
 		this._messageElement = dom.append(this.element.domNode, dom.$('.message'));
 
-		const details: SimpleSuggestDetailsWidget = this._register(instantiationService.createInstance(SimpleSuggestDetailsWidget, this._getFontInfo.bind(this), this._onDidFontConfigurationChange.bind(this)));
+		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._register(dom.addDisposableListener(this._details.widget.domNode, 'blur', (e) => this._onDidBlurDetails.fire(e)));
diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetDetails.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetDetails.ts
index a0727fd9a93b..2d264df09a89 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetDetails.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetDetails.ts
@@ -50,6 +50,7 @@ export class SimpleSuggestDetailsWidget {
 	constructor(
 		private readonly _getFontInfo: () => ISimpleSuggestWidgetFontInfo,
 		onDidFontInfoChange: Event<void>,
+		private readonly _getAdvancedExplainModeDetails: () => string | undefined,
 		@IInstantiationService instaService: IInstantiationService
 	) {
 		this.domNode = dom.$('.suggest-details');
@@ -139,6 +140,12 @@ export class SimpleSuggestDetailsWidget {
 			md += `replacementIndex: ${item.completion.replacementIndex}\n`;
 			md += `replacementLength: ${item.completion.replacementLength}\n`;
 			md += `index: ${item.idx}\n`;
+			if (this._getAdvancedExplainModeDetails) {
+				const advancedDetails = this._getAdvancedExplainModeDetails();
+				if (advancedDetails) {
+					md += `${advancedDetails}\n`;
+				}
+			}
 			detail = `Provider: ${item.completion.provider}`;
 			documentation = new MarkdownString().appendCodeblock('empty', md);
 		}

From 2f30ffde1e7d820ccdf81afce1f70d0e79f9c88c Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Mon, 3 Mar 2025 15:27:44 -0800
Subject: [PATCH 0589/1815] Fix configured deprecated settings not showing up
 (#242521)

---
 .../contrib/preferences/browser/settingsEditor2.ts       | 4 +++-
 .../contrib/preferences/browser/settingsTreeModels.ts    | 9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
index ca7251acf19d..12e38d9ad7fb 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -1540,7 +1540,9 @@ export class SettingsEditor2 extends EditorPane {
 
 	private refreshSingleElement(element: SettingsTreeSettingElement): void {
 		if (this.isVisible()) {
-			this.settingsTree.rerender(element);
+			if (!element.setting.deprecationMessage || element.isConfigured) {
+				this.settingsTree.rerender(element);
+			}
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
index d48eb5628836..c63771737892 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
@@ -596,10 +596,15 @@ export class SettingsTreeModel implements IDisposable {
 		if (tocEntry.settings) {
 			const settingChildren = tocEntry.settings.map(s => this.createSettingsTreeSettingElement(s, element));
 			for (const child of settingChildren) {
-				if (!child.setting.deprecationMessage || child.isConfigured) {
+				if (!child.setting.deprecationMessage) {
 					children.push(child);
 				} else {
-					child.dispose();
+					child.inspectSelf();
+					if (child.isConfigured) {
+						children.push(child);
+					} else {
+						child.dispose();
+					}
 				}
 			}
 		}

From 8f2e1b22ed3620e81d2c2fa1aea343ef12580d5c Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 4 Mar 2025 00:43:29 +0100
Subject: [PATCH 0590/1815] tests - enable API tests with test runner (#241149)

* Revert "Revert "tests - enable API tests with test runner" (#241146)"

This reverts commit 105d4af21c11ed9f13e65feba4ce4b41217e2024.

* update

* try to fix

* fix: set extension development path for API tests

---------

Co-authored-by: Connor Peet <connor@peet.io>
---
 .vscode-test.js              |  25 +++-
 scripts/test-integration.bat | 248 +++++++++++++++++------------------
 scripts/test-integration.sh  |   6 +-
 3 files changed, 148 insertions(+), 131 deletions(-)

diff --git a/.vscode-test.js b/.vscode-test.js
index 917413ede2ac..823ef615f4f7 100644
--- a/.vscode-test.js
+++ b/.vscode-test.js
@@ -19,7 +19,7 @@ const { defineConfig } = require('@vscode/test-cli');
  * A list of extension folders who have opted into tests, or configuration objects.
  * Edit me to add more!
  *
- * @type {Array<string | (Partial<import("@vscode/test-cli").TestConfiguration> & { label: string })>}
+ * @type {Array<Partial<import("@vscode/test-cli").TestConfiguration> & { label: string }>}
  */
 const extensions = [
 	{
@@ -65,6 +65,20 @@ const extensions = [
 	{
 		label: 'microsoft-authentication',
 		mocha: { timeout: 60_000 }
+	},
+	{
+		label: 'vscode-api-tests-folder',
+		extensionDevelopmentPath: `extensions/vscode-api-tests`,
+		workspaceFolder: `extensions/vscode-api-tests/testWorkspace`,
+		mocha: { timeout: 60_000 },
+		files: 'extensions/vscode-api-tests/out/singlefolder-tests/**/*.test.js',
+	},
+	{
+		label: 'vscode-api-tests-workspace',
+		extensionDevelopmentPath: `extensions/vscode-api-tests`,
+		workspaceFolder: `extensions/vscode-api-tests/testworkspace.code-workspace`,
+		mocha: { timeout: 60_000 },
+		files: 'extensions/vscode-api-tests/out/workspace-tests/**/*.test.js',
 	}
 ];
 
@@ -75,9 +89,12 @@ const defaultLaunchArgs = process.env.API_TESTS_EXTRA_ARGS?.split(' ') || [
 
 const config = defineConfig(extensions.map(extension => {
 	/** @type {import('@vscode/test-cli').TestConfiguration} */
-	const config = typeof extension === 'object'
-		? { files: `extensions/${extension.label}/out/**/*.test.js`, ...extension }
-		: { files: `extensions/${extension}/out/**/*.test.js`, label: extension };
+	const config = {
+		platform: 'desktop',
+		files: `extensions/${extension.label}/out/**/*.test.js`,
+		extensionDevelopmentPath: `extensions/${extension.label}`,
+		...extension,
+	};
 
 	config.mocha ??= {};
 	if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat
index b59cceada070..24a754d3b293 100644
--- a/scripts/test-integration.bat
+++ b/scripts/test-integration.bat
@@ -1,124 +1,124 @@
-@echo off
-setlocal
-
-pushd %~dp0\..
-
-set VSCODEUSERDATADIR=%TEMP%\vscodeuserfolder-%RANDOM%-%TIME:~6,2%
-set VSCODECRASHDIR=%~dp0\..\.build\crashes
-set VSCODELOGSDIR=%~dp0\..\.build\logs\integration-tests
-
-:: Figure out which Electron to use for running tests
-if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
-	chcp 65001
-	set INTEGRATION_TEST_ELECTRON_PATH=.\scripts\code.bat
-	set VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE=1
-
-	echo Running integration tests out of sources.
-) else (
-	set VSCODE_CLI=1
-	set ELECTRON_ENABLE_LOGGING=1
-
-	echo Running integration tests with '%INTEGRATION_TEST_ELECTRON_PATH%' as build.
-)
-
-echo Storing crash reports into '%VSCODECRASHDIR%'.
-echo Storing log files into '%VSCODELOGSDIR%'.
-
-
-:: Unit tests
-
-echo.
-echo ### node.js integration tests
-call .\scripts\test.bat --runGlob **\*.integrationTest.js %*
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-
-:: Tests in the extension host
-
-set API_TESTS_EXTRA_ARGS=--disable-telemetry --skip-welcome --skip-release-notes --crash-reporter-directory=%VSCODECRASHDIR% --logsPath=%VSCODELOGSDIR% --no-cached-data --disable-updates --use-inmemory-secretstorage --disable-extensions --disable-workspace-trust --user-data-dir=%VSCODEUSERDATADIR%
-
-echo.
-echo ### API tests (folder)
-call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-api-tests\testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-api-tests --extensionTestsPath=%~dp0\..\extensions\vscode-api-tests\out\singlefolder-tests %API_TESTS_EXTRA_ARGS%
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### API tests (workspace)
-call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-api-tests\testworkspace.code-workspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-api-tests --extensionTestsPath=%~dp0\..\extensions\vscode-api-tests\out\workspace-tests %API_TESTS_EXTRA_ARGS%
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### Colorize tests
-call npm run test-extension -- -l vscode-colorize-tests
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### Terminal Suggest tests
-call npm run test-extension -- -l terminal-suggest --enable-proposed-api=vscode.vscode-api-tests
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### TypeScript tests
-call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\typescript-language-features\test-workspace --extensionDevelopmentPath=%~dp0\..\extensions\typescript-language-features --extensionTestsPath=%~dp0\..\extensions\typescript-language-features\out\test\unit %API_TESTS_EXTRA_ARGS%
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### Markdown tests
-call npm run test-extension -- -l markdown-language-features
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### Emmet tests
-call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\emmet\test-workspace --extensionDevelopmentPath=%~dp0\..\extensions\emmet --extensionTestsPath=%~dp0\..\extensions\emmet\out\test %API_TESTS_EXTRA_ARGS%
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### Git tests
-for /f "delims=" %%i in ('node -p "require('fs').realpathSync.native(require('os').tmpdir())"') do set TEMPDIR=%%i
-set GITWORKSPACE=%TEMPDIR%\git-%RANDOM%
-mkdir %GITWORKSPACE%
-call "%INTEGRATION_TEST_ELECTRON_PATH%" %GITWORKSPACE% --extensionDevelopmentPath=%~dp0\..\extensions\git --extensionTestsPath=%~dp0\..\extensions\git\out\test %API_TESTS_EXTRA_ARGS%
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### Ipynb tests
-call npm run test-extension -- -l ipynb
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### Notebook Output tests
-call npm run test-extension -- -l notebook-renderers
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### Configuration editing tests
-set CFWORKSPACE=%TEMPDIR%\cf-%RANDOM%
-mkdir %CFWORKSPACE%
-call npm run test-extension -- -l configuration-editing
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### GitHub Authentication tests
-call npm run test-extension -- -l github-authentication
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-:: Tests standalone (CommonJS)
-
-echo.
-echo ### CSS tests
-call %~dp0\node-electron.bat %~dp0\..\extensions\css-language-features/server/test/index.js
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### HTML tests
-call %~dp0\node-electron.bat %~dp0\..\extensions\html-language-features/server/test/index.js
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-
-:: Cleanup
-
-rmdir /s /q %VSCODEUSERDATADIR%
-
-popd
-
-endlocal
+@echo off
+setlocal
+
+pushd %~dp0\..
+
+set VSCODEUSERDATADIR=%TEMP%\vscodeuserfolder-%RANDOM%-%TIME:~6,2%
+set VSCODECRASHDIR=%~dp0\..\.build\crashes
+set VSCODELOGSDIR=%~dp0\..\.build\logs\integration-tests
+
+:: Figure out which Electron to use for running tests
+if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
+	chcp 65001
+	set INTEGRATION_TEST_ELECTRON_PATH=.\scripts\code.bat
+	set VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE=1
+
+	echo Running integration tests out of sources.
+) else (
+	set VSCODE_CLI=1
+	set ELECTRON_ENABLE_LOGGING=1
+
+	echo Running integration tests with '%INTEGRATION_TEST_ELECTRON_PATH%' as build.
+)
+
+echo Storing crash reports into '%VSCODECRASHDIR%'.
+echo Storing log files into '%VSCODELOGSDIR%'.
+
+
+:: Unit tests
+
+echo.
+echo ### node.js integration tests
+call .\scripts\test.bat --runGlob **\*.integrationTest.js %*
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+
+:: Tests in the extension host
+
+set API_TESTS_EXTRA_ARGS=--disable-telemetry --skip-welcome --skip-release-notes --crash-reporter-directory=%VSCODECRASHDIR% --logsPath=%VSCODELOGSDIR% --no-cached-data --disable-updates --use-inmemory-secretstorage --disable-extensions --disable-workspace-trust --user-data-dir=%VSCODEUSERDATADIR%
+
+echo.
+echo ### API tests (folder)
+call npm run test-extension -- -l vscode-api-tests-folder --enable-proposed-api=vscode.vscode-api-tests %API_TESTS_EXTRA_ARGS%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### API tests (workspace)
+call npm run test-extension -- -l vscode-api-tests-workspace --enable-proposed-api=vscode.vscode-api-tests %API_TESTS_EXTRA_ARGS%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Colorize tests
+call npm run test-extension -- -l vscode-colorize-tests
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Terminal Suggest tests
+call npm run test-extension -- -l terminal-suggest --enable-proposed-api=vscode.vscode-api-tests
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### TypeScript tests
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\typescript-language-features\test-workspace --extensionDevelopmentPath=%~dp0\..\extensions\typescript-language-features --extensionTestsPath=%~dp0\..\extensions\typescript-language-features\out\test\unit %API_TESTS_EXTRA_ARGS%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Markdown tests
+call npm run test-extension -- -l markdown-language-features
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Emmet tests
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\emmet\test-workspace --extensionDevelopmentPath=%~dp0\..\extensions\emmet --extensionTestsPath=%~dp0\..\extensions\emmet\out\test %API_TESTS_EXTRA_ARGS%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Git tests
+for /f "delims=" %%i in ('node -p "require('fs').realpathSync.native(require('os').tmpdir())"') do set TEMPDIR=%%i
+set GITWORKSPACE=%TEMPDIR%\git-%RANDOM%
+mkdir %GITWORKSPACE%
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %GITWORKSPACE% --extensionDevelopmentPath=%~dp0\..\extensions\git --extensionTestsPath=%~dp0\..\extensions\git\out\test %API_TESTS_EXTRA_ARGS%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Ipynb tests
+call npm run test-extension -- -l ipynb
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Notebook Output tests
+call npm run test-extension -- -l notebook-renderers
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Configuration editing tests
+set CFWORKSPACE=%TEMPDIR%\cf-%RANDOM%
+mkdir %CFWORKSPACE%
+call npm run test-extension -- -l configuration-editing
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### GitHub Authentication tests
+call npm run test-extension -- -l github-authentication
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+:: Tests standalone (CommonJS)
+
+echo.
+echo ### CSS tests
+call %~dp0\node-electron.bat %~dp0\..\extensions\css-language-features/server/test/index.js
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### HTML tests
+call %~dp0\node-electron.bat %~dp0\..\extensions\html-language-features/server/test/index.js
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+
+:: Cleanup
+
+rmdir /s /q %VSCODEUSERDATADIR%
+
+popd
+
+endlocal
diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh
index 890064803089..01c002fe07bf 100755
--- a/scripts/test-integration.sh
+++ b/scripts/test-integration.sh
@@ -55,13 +55,13 @@ fi
 echo
 echo "### API tests (folder)"
 echo
-"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/vscode-api-tests/testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/singlefolder-tests $API_TESTS_EXTRA_ARGS
+npm run test-extension -- -l vscode-api-tests-folder --enable-proposed-api=vscode.vscode-api-tests $API_TESTS_EXTRA_ARGS
 kill_app
 
 echo
 echo "### API tests (workspace)"
 echo
-"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/vscode-api-tests/testworkspace.code-workspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/workspace-tests $API_TESTS_EXTRA_ARGS
+npm run test-extension -- -l vscode-api-tests-workspace --enable-proposed-api=vscode.vscode-api-tests $API_TESTS_EXTRA_ARGS
 kill_app
 
 echo
@@ -71,7 +71,7 @@ npm run test-extension -- -l vscode-colorize-tests
 kill_app
 
 echo
-echo "### Terminal Suggest tests" 
+echo "### Terminal Suggest tests"
 echo
 npm run test-extension -- -l terminal-suggest --enable-proposed-api=vscode.vscode-api-tests
 kill_app

From baa547933162b57486accec819e9166da75cc40a Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Mon, 3 Mar 2025 16:55:08 -0800
Subject: [PATCH 0591/1815] Fix another Settings editor leak (#242525)

Fixes #242451
---
 .../preferences/browser/settingsEditor2.ts    |  1 +
 .../preferences/browser/preferencesService.ts | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
index 12e38d9ad7fb..5b1143c5dbfb 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -413,6 +413,7 @@ export class SettingsEditor2 extends EditorPane {
 
 		// Don't block setInput on render (which can trigger an async search)
 		this.onConfigUpdate(undefined, true).then(() => {
+			// This event runs when the editor closes.
 			this.inputChangeListener.value = input.onWillDispose(() => {
 				this.searchWidget.setValue('');
 			});
diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts
index f0bb2cb9f25b..c657835f97fe 100644
--- a/src/vs/workbench/services/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts
@@ -70,6 +70,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 	private readonly _requestedDefaultSettings = new ResourceSet();
 
 	private _settingsGroups: ISettingsGroup[] | undefined = undefined;
+	private _cachedSettingsEditor2Input: SettingsEditor2Input | undefined = undefined;
 
 	constructor(
 		@IEditorService private readonly editorService: IEditorService,
@@ -122,8 +123,13 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return workspace.configuration || workspace.folders[0].toResource(FOLDER_SETTINGS_PATH);
 	}
 
-	createSettingsEditor2Input(): SettingsEditor2Input {
-		return new SettingsEditor2Input(this);
+	createOrGetCachedSettingsEditor2Input(): SettingsEditor2Input {
+		if (!this._cachedSettingsEditor2Input || this._cachedSettingsEditor2Input.isDisposed()) {
+			// Recreate the input if the user never opened the Settings editor,
+			// or if they closed it and want to reopen it.
+			this._cachedSettingsEditor2Input = new SettingsEditor2Input(this);
+		}
+		return this._cachedSettingsEditor2Input;
 	}
 
 	getFolderSettingsResource(resource: URI): URI | null {
@@ -243,14 +249,14 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			this.openSettings2(options);
 	}
 
-	private async openSettings2(options: IOpenSettingsOptions): Promise<IEditorPane> {
-		const input = this.createSettingsEditor2Input();
+	private async openSettings2(options: IOpenSettingsOptions): Promise<IEditorPane | undefined> {
+		const input = this.createOrGetCachedSettingsEditor2Input();
 		options = {
 			...options,
 			focusSearch: true
 		};
 		const group = await this.getEditorGroupFromOptions(options);
-		return (await group.openEditor(input, validateSettingsEditorOptions(options)))!;
+		return group.openEditor(input, validateSettingsEditorOptions(options));
 	}
 
 	openApplicationSettings(options: IOpenSettingsOptions = {}): Promise<IEditorPane | undefined> {
@@ -665,6 +671,9 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 	}
 
 	public override dispose(): void {
+		if (this._cachedSettingsEditor2Input && !this._cachedSettingsEditor2Input.isDisposed()) {
+			this._cachedSettingsEditor2Input.dispose();
+		}
 		this._onDispose.fire();
 		super.dispose();
 	}

From dd06b66a21e70a8768583bc0f65287735a35d7ae Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Mon, 3 Mar 2025 17:19:35 -0800
Subject: [PATCH 0592/1815] Fix action flickering during settings JSON to UI
 transition (#242526)

---
 .../browser/preferences.contribution.ts       | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts b/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
index 9bdbebe0a017..d69acc0a6771 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
@@ -24,7 +24,7 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
 import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from '../../../browser/actions/workspaceCommands.js';
 import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
-import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
 import { EditorExtensions, IEditorFactoryRegistry, IEditorSerializer } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { ResourceContextKey, RemoteNameContext, WorkbenchStateContext } from '../../../common/contextkeys.js';
@@ -39,7 +39,6 @@ import { PreferencesContribution } from '../common/preferencesContribution.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 import { KeybindingsEditorInput } from '../../../services/preferences/browser/keybindingsEditorInput.js';
 import { DEFINE_KEYBINDING_EDITOR_CONTRIB_ID, IDefineKeybindingEditorContribution, IPreferencesService } from '../../../services/preferences/common/preferences.js';
 import { SettingsEditor2Input } from '../../../services/preferences/common/preferencesEditorInput.js';
@@ -1239,6 +1238,9 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 }
 
 class SettingsEditorTitleContribution extends Disposable implements IWorkbenchContribution {
+
+	static readonly ID = 'workbench.contrib.settingsEditorTitleBarActions';
+
 	constructor(
 		@IUserDataProfileService private readonly userDataProfileService: IUserDataProfileService,
 		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
@@ -1249,13 +1251,13 @@ class SettingsEditorTitleContribution extends Disposable implements IWorkbenchCo
 
 	private registerSettingsEditorTitleActions() {
 		const registerOpenUserSettingsEditorFromJsonActionDisposables = this._register(new MutableDisposable());
-		const openUserSettingsEditorWhen = ContextKeyExpr.and(
-			ContextKeyExpr.or(
-				ResourceContextKey.Resource.isEqualTo(this.userDataProfileService.currentProfile.settingsResource.toString()),
-				ResourceContextKey.Resource.isEqualTo(this.userDataProfilesService.defaultProfile.settingsResource.toString())),
-			ContextKeyExpr.not('isInDiffEditor'));
 		const registerOpenUserSettingsEditorFromJsonAction = () => {
-			registerOpenUserSettingsEditorFromJsonActionDisposables.value = undefined;
+			const openUserSettingsEditorWhen = ContextKeyExpr.and(
+				CONTEXT_SETTINGS_EDITOR.toNegated(),
+				ContextKeyExpr.or(
+					ResourceContextKey.Resource.isEqualTo(this.userDataProfileService.currentProfile.settingsResource.toString()),
+					ResourceContextKey.Resource.isEqualTo(this.userDataProfilesService.defaultProfile.settingsResource.toString())),
+				ContextKeyExpr.not('isInDiffEditor'));
 			registerOpenUserSettingsEditorFromJsonActionDisposables.value = registerAction2(class extends Action2 {
 				constructor() {
 					super({
@@ -1271,9 +1273,9 @@ class SettingsEditorTitleContribution extends Disposable implements IWorkbenchCo
 					});
 				}
 				run(accessor: ServicesAccessor, ...args: unknown[]) {
-					const sanatizedArgs = sanitizeOpenSettingsArgs(args[0]);
+					const sanitizedArgs = sanitizeOpenSettingsArgs(args[0]);
 					const groupId = getEditorGroupFromArguments(accessor, args)?.id;
-					return accessor.get(IPreferencesService).openUserSettings({ jsonEditor: false, ...sanatizedArgs, groupId });
+					return accessor.get(IPreferencesService).openUserSettings({ jsonEditor: false, ...sanitizedArgs, groupId });
 				}
 			});
 		};
@@ -1284,7 +1286,7 @@ class SettingsEditorTitleContribution extends Disposable implements IWorkbenchCo
 			registerOpenUserSettingsEditorFromJsonAction();
 		}));
 
-		const openSettingsJsonWhen = ContextKeyExpr.and(CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_JSON_EDITOR.toNegated());
+		const openSettingsJsonWhen = ContextKeyExpr.and(CONTEXT_SETTINGS_JSON_EDITOR.toNegated(), CONTEXT_SETTINGS_EDITOR);
 		this._register(registerAction2(class extends Action2 {
 			constructor() {
 				super({
@@ -1316,10 +1318,9 @@ function getEditorGroupFromArguments(accessor: ServicesAccessor, args: unknown[]
 	return context.groupedEditors[0]?.group;
 }
 
-const workbenchContributionsRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 registerWorkbenchContribution2(PreferencesActionsContribution.ID, PreferencesActionsContribution, WorkbenchPhase.BlockStartup);
 registerWorkbenchContribution2(PreferencesContribution.ID, PreferencesContribution, WorkbenchPhase.BlockStartup);
-workbenchContributionsRegistry.registerWorkbenchContribution(SettingsEditorTitleContribution, LifecyclePhase.Restored);
+registerWorkbenchContribution2(SettingsEditorTitleContribution.ID, SettingsEditorTitleContribution, WorkbenchPhase.AfterRestored);
 
 registerEditorContribution(SettingsEditorContribution.ID, SettingsEditorContribution, EditorContributionInstantiation.AfterFirstRender);
 

From 3df8270693ec0f4f83da5966b833a95a9be09ae7 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Mon, 3 Mar 2025 19:21:18 -0800
Subject: [PATCH 0593/1815] add setting to configure what up arrow does when
 focus is on first suggestion for terminal completions (#242516)

fix #241833
---
 .../browser/terminal.suggest.contribution.ts  | 20 ++++++++++++++++++-
 .../suggest/common/terminal.suggest.ts        |  1 +
 .../common/terminalSuggestConfiguration.ts    | 10 +++++++++-
 .../suggest/browser/simpleSuggestWidget.ts    |  9 ++++++++-
 4 files changed, 37 insertions(+), 3 deletions(-)

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 51ca3fed8680..81ffd8935a35 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
@@ -228,7 +228,8 @@ registerActiveInstanceAction({
 	keybinding: {
 		// Up is bound to other workbench keybindings that this needs to beat
 		primary: KeyCode.UpArrow,
-		weight: KeybindingWeight.WorkbenchContrib + 1
+		weight: KeybindingWeight.WorkbenchContrib + 1,
+		when: ContextKeyExpr.or(SimpleSuggestContext.HasNavigated, ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.UpArrowNavigatesHistory}`, false))
 	},
 	run: (activeInstance) => TerminalSuggestContribution.get(activeInstance)?.addon?.selectPreviousSuggestion()
 });
@@ -359,6 +360,23 @@ registerActiveInstanceAction({
 	run: (activeInstance) => TerminalSuggestContribution.get(activeInstance)?.addon?.hideSuggestWidget(true)
 });
 
+registerActiveInstanceAction({
+	id: TerminalSuggestCommandId.HideSuggestWidgetAndNavigateHistory,
+	title: localize2('workbench.action.terminal.hideSuggestWidgetAndNavigateHistory', 'Hide Suggest Widget and Navigate History'),
+	f1: false,
+	precondition: ContextKeyExpr.and(ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated), TerminalContextKeys.focus, TerminalContextKeys.isOpen, TerminalContextKeys.suggestWidgetVisible),
+	keybinding:
+	{
+		primary: KeyCode.UpArrow,
+		when: ContextKeyExpr.and(SimpleSuggestContext.HasNavigated.negate(), ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.UpArrowNavigatesHistory}`, true)),
+		weight: KeybindingWeight.WorkbenchContrib + 2
+	},
+	run: (activeInstance) => {
+		TerminalSuggestContribution.get(activeInstance)?.addon?.hideSuggestWidget(true);
+		activeInstance.sendText('\u001b[A', false); // Up arrow
+	}
+});
+
 registerActiveInstanceAction({
 	id: TerminalSuggestCommandId.ConfigureSettings,
 	title: localize2('workbench.action.terminal.configureSuggestSettings', 'Configure'),
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 30d9c86ae469..f472ffd7673d 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest.ts
@@ -11,6 +11,7 @@ export const enum TerminalSuggestCommandId {
 	AcceptSelectedSuggestion = 'workbench.action.terminal.acceptSelectedSuggestion',
 	AcceptSelectedSuggestionEnter = 'workbench.action.terminal.acceptSelectedSuggestionEnter',
 	HideSuggestWidget = 'workbench.action.terminal.hideSuggestWidget',
+	HideSuggestWidgetAndNavigateHistory = 'workbench.action.terminal.hideSuggestWidgetAndNavigateHistory',
 	ClearSuggestCache = 'workbench.action.terminal.clearSuggestCache',
 	RequestCompletions = 'workbench.action.terminal.requestCompletions',
 	ResetWidgetSize = 'workbench.action.terminal.resetSuggestWidgetSize',
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
index db600bb842b6..e4e4e73ca3fe 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts
@@ -18,6 +18,7 @@ export const enum TerminalSuggestSettingId {
 	ShowStatusBar = 'terminal.integrated.suggest.showStatusBar',
 	CdPath = 'terminal.integrated.suggest.cdPath',
 	InlineSuggestion = 'terminal.integrated.suggest.inlineSuggestion',
+	UpArrowNavigatesHistory = 'terminal.integrated.suggest.upArrowNavigatesHistory',
 }
 
 export const windowsDefaultExecutableExtensions: string[] = [
@@ -169,7 +170,14 @@ export const terminalSuggestConfiguration: IStringDictionary<IConfigurationPrope
 		],
 		default: 'alwaysOnTop',
 		tags: ['preview']
-	}
+	},
+	[TerminalSuggestSettingId.UpArrowNavigatesHistory]: {
+		restricted: true,
+		markdownDescription: localize('suggest.upArrowNavigatesHistory', "Determines whether the up arrow key navigates the command history when focus is on the first suggestion and navigation has not yet occurred. When set to false, the up arrow will move focus to the last suggestion instead."),
+		type: 'boolean',
+		default: true,
+		tags: ['preview']
+	},
 };
 
 
diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
index 0b6151ec1e96..c60674c1ddf8 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
@@ -55,6 +55,7 @@ const enum WidgetPositionPreference {
 
 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")),
 };
 
 export interface IWorkbenchSuggestWidgetOptions {
@@ -110,6 +111,7 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 	get list(): List<TItem> { return this._list; }
 
 	private readonly _ctxSuggestWidgetHasFocusedSuggestion: IContextKey<boolean>;
+	private readonly _ctxSuggestWidgetHasBeenNavigated: IContextKey<boolean>;
 
 	constructor(
 		private readonly _container: HTMLElement,
@@ -129,6 +131,7 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 		this.element.domNode.classList.add('workbench-suggest-widget');
 		this._container.appendChild(this.element.domNode);
 		this._ctxSuggestWidgetHasFocusedSuggestion = SimpleSuggestContext.HasFocusedSuggestion.bindTo(_contextKeyService);
+		this._ctxSuggestWidgetHasBeenNavigated = SimpleSuggestContext.HasNavigated.bindTo(_contextKeyService);
 
 		class ResizeState {
 			constructor(
@@ -218,7 +221,11 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 				},
 			}
 		}));
-
+		this._register(this._list.onDidChangeFocus(e => {
+			if (e.indexes.length && e.indexes[0] !== 0) {
+				this._ctxSuggestWidgetHasBeenNavigated.set(true);
+			}
+		}));
 		this._messageElement = dom.append(this.element.domNode, dom.$('.message'));
 
 		const details: SimpleSuggestDetailsWidget = this._register(instantiationService.createInstance(SimpleSuggestDetailsWidget, this._getFontInfo.bind(this), this._onDidFontConfigurationChange.bind(this), this._getAdvancedExplainModeDetails.bind(this)));

From 5d93bf37d9bb02c7fcafed89746ffd2e8e849649 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 4 Mar 2025 09:46:29 +0100
Subject: [PATCH 0594/1815] debt - adopt more `$` over `createElement`
 (#242533)

---
 .../parts/activitybar/activitybarPart.ts      |  3 +-
 .../parts/editor/auxiliaryEditorPart.ts       |  8 ++---
 .../browser/parts/editor/editorDropTarget.ts  |  8 ++---
 .../browser/parts/editor/editorGroupView.ts   | 13 +++-----
 .../browser/parts/editor/editorPanes.ts       |  5 ++-
 .../browser/parts/editor/editorPart.ts        |  6 ++--
 .../browser/parts/editor/editorPlaceholder.ts |  8 ++---
 .../browser/parts/editor/editorTabsControl.ts |  4 +--
 .../parts/editor/editorTitleControl.ts        |  5 ++-
 .../parts/editor/multiEditorTabsControl.ts    | 33 ++++++++-----------
 .../parts/editor/singleEditorTabsControl.ts   |  5 ++-
 .../browser/parts/globalCompositeBar.ts       |  2 +-
 .../notifications/notificationsCenter.ts      | 14 +++-----
 .../parts/notifications/notificationsList.ts  |  5 ++-
 .../notifications/notificationsToasts.ts      | 11 +++----
 .../notifications/notificationsViewer.ts      | 33 ++++++-------------
 .../browser/parts/paneCompositePart.ts        |  6 ++--
 .../browser/parts/statusbar/statusbarItem.ts  | 13 ++++----
 .../browser/parts/statusbar/statusbarPart.ts  | 22 +++++--------
 .../browser/parts/titlebar/titlebarPart.ts    |  4 +--
 .../browser/parts/views/viewPaneContainer.ts  |  9 +++--
 src/vs/workbench/electron-sandbox/window.ts   | 11 +++----
 .../browser/auxiliaryWindowService.ts         |  5 ++-
 23 files changed, 90 insertions(+), 143 deletions(-)

diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index f2af5fb3a2f2..ed629878cddd 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -280,8 +280,7 @@ export class ActivityBarCompositeBar extends PaneCompositeBar {
 			return; // prevent menu bar from installing twice #110720
 		}
 
-		this.menuBarContainer = document.createElement('div');
-		this.menuBarContainer.classList.add('menubar');
+		this.menuBarContainer = $('.menubar');
 
 		const content = assertIsDefined(this.element);
 		content.prepend(this.menuBarContainer);
diff --git a/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.ts b/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.ts
index 220bdf1cc65a..4a001a815ecd 100644
--- a/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { onDidChangeFullscreen } from '../../../../base/browser/browser.js';
-import { hide, show } from '../../../../base/browser/dom.js';
+import { $, hide, show } from '../../../../base/browser/dom.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { isNative } from '../../../../base/common/platform.js';
@@ -105,9 +105,7 @@ export class AuxiliaryEditorPart {
 		const auxiliaryWindow = disposables.add(await this.auxiliaryWindowService.open(options));
 
 		// Editor Part
-		const editorPartContainer = document.createElement('div');
-		editorPartContainer.classList.add('part', 'editor');
-		editorPartContainer.setAttribute('role', 'main');
+		const editorPartContainer = $('.part.editor', { role: 'main' });
 		editorPartContainer.style.position = 'relative';
 		auxiliaryWindow.container.appendChild(editorPartContainer);
 
@@ -315,7 +313,7 @@ class AuxiliaryEditorPartImpl extends EditorPart implements IAuxiliaryEditorPart
 		const result = this.mergeAllGroups(targetGroup, {
 			// Try to reduce the impact of closing the auxiliary window
 			// as much as possible by not changing existing editors
-			// in the main window. 
+			// in the main window.
 			preserveExistingIndex: true
 		});
 		targetGroup.focus();
diff --git a/src/vs/workbench/browser/parts/editor/editorDropTarget.ts b/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
index 244ef9cb8906..9f0b51ba1c27 100644
--- a/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
+++ b/src/vs/workbench/browser/parts/editor/editorDropTarget.ts
@@ -5,7 +5,7 @@
 
 import './media/editordroptarget.css';
 import { DataTransfers } from '../../../../base/browser/dnd.js';
-import { addDisposableListener, DragAndDropObserver, EventHelper, EventType, getWindow, isAncestor } from '../../../../base/browser/dom.js';
+import { $, addDisposableListener, DragAndDropObserver, EventHelper, EventType, getWindow, isAncestor } from '../../../../base/browser/dom.js';
 import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { toDisposable } from '../../../../base/common/lifecycle.js';
@@ -84,8 +84,7 @@ class DropOverlay extends Themable {
 		const overlayOffsetHeight = this.getOverlayOffsetHeight();
 
 		// Container
-		const container = this.container = document.createElement('div');
-		container.id = DropOverlay.OVERLAY_ID;
+		const container = this.container = $('div', { id: DropOverlay.OVERLAY_ID });
 		container.style.top = `${overlayOffsetHeight}px`;
 
 		// Parent
@@ -97,8 +96,7 @@ class DropOverlay extends Themable {
 		}));
 
 		// Overlay
-		this.overlay = document.createElement('div');
-		this.overlay.classList.add('editor-group-overlay-indicator');
+		this.overlay = $('.editor-group-overlay-indicator');
 		container.appendChild(this.overlay);
 
 		if (this.enableDropIntoEditor) {
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
index 15012e7e7238..ceb003699c0c 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
@@ -11,7 +11,7 @@ import { EditorInput } from '../../../common/editor/editorInput.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { Emitter, Relay } from '../../../../base/common/event.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { Dimension, trackFocus, addDisposableListener, EventType, EventHelper, findParentWithClass, isAncestor, IDomNodePagePosition, isMouseEvent, isActiveElement, getWindow, getActiveElement } from '../../../../base/browser/dom.js';
+import { Dimension, trackFocus, addDisposableListener, EventType, EventHelper, findParentWithClass, isAncestor, IDomNodePagePosition, isMouseEvent, isActiveElement, getWindow, getActiveElement, $ } from '../../../../base/browser/dom.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
@@ -208,16 +208,14 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 			this.handleGroupContextKeys();
 
 			// Title container
-			this.titleContainer = document.createElement('div');
-			this.titleContainer.classList.add('title');
+			this.titleContainer = $('.title');
 			this.element.appendChild(this.titleContainer);
 
 			// Title control
 			this.titleControl = this._register(this.scopedInstantiationService.createInstance(EditorTitleControl, this.titleContainer, this.editorPartsView, this.groupsView, this, this.model));
 
 			// Editor container
-			this.editorContainer = document.createElement('div');
-			this.editorContainer.classList.add('editor-container');
+			this.editorContainer = $('.editor-container');
 			this.element.appendChild(this.editorContainer);
 
 			// Editor pane
@@ -406,8 +404,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 	private createContainerToolbar(): void {
 
 		// Toolbar Container
-		const toolbarContainer = document.createElement('div');
-		toolbarContainer.classList.add('editor-group-container-toolbar');
+		const toolbarContainer = $('.editor-group-container-toolbar');
 		this.element.appendChild(toolbarContainer);
 
 		// Toolbar
@@ -2151,7 +2148,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 
 	//#region ISerializableView
 
-	readonly element: HTMLElement = document.createElement('div');
+	readonly element: HTMLElement = $('div');
 
 	get minimumWidth(): number { return this.editorPane.minimumWidth; }
 	get minimumHeight(): number { return this.editorPane.minimumHeight; }
diff --git a/src/vs/workbench/browser/parts/editor/editorPanes.ts b/src/vs/workbench/browser/parts/editor/editorPanes.ts
index 68b73d9a5888..89c9f8c92437 100644
--- a/src/vs/workbench/browser/parts/editor/editorPanes.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPanes.ts
@@ -10,7 +10,7 @@ import Severity from '../../../../base/common/severity.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { EditorExtensions, EditorInputCapabilities, IEditorOpenContext, IVisibleEditorPane, isEditorOpenError } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
-import { Dimension, show, hide, IDomNodePagePosition, isAncestor, getActiveElement, getWindowById, isEditableElement } from '../../../../base/browser/dom.js';
+import { Dimension, show, hide, IDomNodePagePosition, isAncestor, getActiveElement, getWindowById, isEditableElement, $ } from '../../../../base/browser/dom.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IEditorPaneRegistry, IEditorPaneDescriptor } from '../../editor.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
@@ -360,8 +360,7 @@ export class EditorPanes extends Disposable {
 
 		// Create editor container as needed
 		if (!editorPane.getContainer()) {
-			const editorPaneContainer = document.createElement('div');
-			editorPaneContainer.classList.add('editor-instance');
+			const editorPaneContainer = $('.editor-instance');
 
 			// It is cruicial to append the container to its parent before
 			// passing on to the create() method of the pane so that the
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index 90254ef45be5..0875886e68bf 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -993,8 +993,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 
 		// Container
 		this.element = parent;
-		this.container = document.createElement('div');
-		this.container.classList.add('content');
+		this.container = $('.content');
 		if (this.windowId !== mainWindow.vscodeWindowId) {
 			this.container.classList.add('auxiliary');
 		}
@@ -1067,8 +1066,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 		this._register(this.createEditorDropTarget(container, Object.create(null)));
 
 		// No drop in the editor
-		const overlay = document.createElement('div');
-		overlay.classList.add('drop-block-overlay');
+		const overlay = $('.drop-block-overlay');
 		parent.appendChild(overlay);
 
 		// Hide the block if a mouse down event occurs #99065
diff --git a/src/vs/workbench/browser/parts/editor/editorPlaceholder.ts b/src/vs/workbench/browser/parts/editor/editorPlaceholder.ts
index 15d87f9ad15d..4b3ef8b4dc7d 100644
--- a/src/vs/workbench/browser/parts/editor/editorPlaceholder.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPlaceholder.ts
@@ -67,10 +67,10 @@ export abstract class EditorPlaceholder extends EditorPane {
 	protected createEditor(parent: HTMLElement): void {
 
 		// Container
-		this.container = document.createElement('div');
-		this.container.className = 'monaco-editor-pane-placeholder';
+		this.container = $('.monaco-editor-pane-placeholder', {
+			tabIndex: 0 // enable focus support from the editor part (do not remove)
+		});
 		this.container.style.outline = 'none';
-		this.container.tabIndex = 0; // enable focus support from the editor part (do not remove)
 
 		// Custom Scrollbars
 		this.scrollbar = this._register(new DomScrollableElement(this.container, { horizontal: ScrollbarVisibility.Auto, vertical: ScrollbarVisibility.Auto }));
@@ -107,7 +107,7 @@ export abstract class EditorPlaceholder extends EditorPane {
 
 		// Label
 		const labelContainer = container.appendChild($('.editor-placeholder-label-container'));
-		const labelWidget = document.createElement('span');
+		const labelWidget = $('span');
 		labelWidget.textContent = truncatedLabel;
 		labelContainer.appendChild(labelWidget);
 
diff --git a/src/vs/workbench/browser/parts/editor/editorTabsControl.ts b/src/vs/workbench/browser/parts/editor/editorTabsControl.ts
index 7306519d4f79..51e7736fe03d 100644
--- a/src/vs/workbench/browser/parts/editor/editorTabsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/editorTabsControl.ts
@@ -6,7 +6,7 @@
 import './media/editortabscontrol.css';
 import { localize } from '../../../../nls.js';
 import { applyDragImage, DataTransfers } from '../../../../base/browser/dnd.js';
-import { Dimension, getActiveWindow, getWindow, isMouseEvent } from '../../../../base/browser/dom.js';
+import { $, Dimension, getActiveWindow, getWindow, isMouseEvent } from '../../../../base/browser/dom.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { ActionsOrientation, IActionViewItem, prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { IAction, ActionRunner } from '../../../../base/common/actions.js';
@@ -177,7 +177,7 @@ export abstract class EditorTabsControl extends Themable implements IEditorTabsC
 	}
 
 	protected createEditorActionsToolBar(parent: HTMLElement, classes: string[]): void {
-		this.editorActionsToolbarContainer = document.createElement('div');
+		this.editorActionsToolbarContainer = $('div');
 		this.editorActionsToolbarContainer.classList.add(...classes);
 		parent.appendChild(this.editorActionsToolbarContainer);
 
diff --git a/src/vs/workbench/browser/parts/editor/editorTitleControl.ts b/src/vs/workbench/browser/parts/editor/editorTitleControl.ts
index 65ef9fca411f..00f7bf67590d 100644
--- a/src/vs/workbench/browser/parts/editor/editorTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/editorTitleControl.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import './media/editortitlecontrol.css';
-import { Dimension, clearNode } from '../../../../base/browser/dom.js';
+import { $, Dimension, clearNode } from '../../../../base/browser/dom.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
 import { BreadcrumbsControl, BreadcrumbsControlFactory } from './breadcrumbsControl.js';
@@ -82,8 +82,7 @@ export class EditorTitleControl extends Themable {
 		}
 
 		// Breadcrumbs container
-		const breadcrumbsContainer = document.createElement('div');
-		breadcrumbsContainer.classList.add('breadcrumbs-below-tabs');
+		const breadcrumbsContainer = $('.breadcrumbs-below-tabs');
 		this.parent.appendChild(breadcrumbsContainer);
 
 		const breadcrumbsControlFactory = this.breadcrumbsControlDisposables.add(this.instantiationService.createInstance(BreadcrumbsControlFactory, breadcrumbsContainer, this.groupView, {
diff --git a/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts b/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
index 978c3f94059d..b6cbb625b7a3 100644
--- a/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
@@ -32,7 +32,7 @@ import { ResourcesDropHandler, DraggedEditorIdentifier, DraggedEditorGroupIdenti
 import { Color } from '../../../../base/common/color.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { MergeGroupMode, IMergeGroupOptions } from '../../../services/editor/common/editorGroupsService.js';
-import { addDisposableListener, EventType, EventHelper, Dimension, scheduleAtNextAnimationFrame, findParentWithClass, clearNode, DragAndDropObserver, isMouseEvent, getWindow } from '../../../../base/browser/dom.js';
+import { addDisposableListener, EventType, EventHelper, Dimension, scheduleAtNextAnimationFrame, findParentWithClass, clearNode, DragAndDropObserver, isMouseEvent, getWindow, $ } from '../../../../base/browser/dom.js';
 import { localize } from '../../../../nls.js';
 import { IEditorGroupsView, EditorServiceImpl, IEditorGroupView, IInternalEditorOpenOptions, IEditorPartsView, prepareMoveCopyEditors } from './editor.js';
 import { CloseEditorTabAction, UnpinEditorAction } from './editorActions.js';
@@ -170,15 +170,14 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 		this.titleContainer = parent;
 
 		// Tabs and Actions Container (are on a single row with flex side-by-side)
-		this.tabsAndActionsContainer = document.createElement('div');
-		this.tabsAndActionsContainer.classList.add('tabs-and-actions-container');
+		this.tabsAndActionsContainer = $('.tabs-and-actions-container');
 		this.titleContainer.appendChild(this.tabsAndActionsContainer);
 
 		// Tabs Container
-		this.tabsContainer = document.createElement('div');
-		this.tabsContainer.setAttribute('role', 'tablist');
-		this.tabsContainer.draggable = true;
-		this.tabsContainer.classList.add('tabs-container');
+		this.tabsContainer = $('.tabs-container', {
+			role: 'tablist',
+			draggable: true
+		});
 		this._register(Gesture.addTarget(this.tabsContainer));
 
 		this.tabSizingFixedDisposables = this._register(new DisposableStore());
@@ -803,25 +802,23 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 	private createTab(tabIndex: number, tabsContainer: HTMLElement, tabsScrollbar: ScrollableElement): HTMLElement {
 
 		// Tab Container
-		const tabContainer = document.createElement('div');
-		tabContainer.draggable = true;
-		tabContainer.setAttribute('role', 'tab');
-		tabContainer.classList.add('tab');
+		const tabContainer = $('.tab', {
+			draggable: true,
+			role: 'tab'
+		});
 
 		// Gesture Support
 		this._register(Gesture.addTarget(tabContainer));
 
 		// Tab Border Top
-		const tabBorderTopContainer = document.createElement('div');
-		tabBorderTopContainer.classList.add('tab-border-top-container');
+		const tabBorderTopContainer = $('.tab-border-top-container');
 		tabContainer.appendChild(tabBorderTopContainer);
 
 		// Tab Editor Label
 		const editorLabel = this.tabResourceLabels.create(tabContainer, { hoverTargetOverride: tabContainer });
 
 		// Tab Actions
-		const tabActionsContainer = document.createElement('div');
-		tabActionsContainer.classList.add('tab-actions');
+		const tabActionsContainer = $('.tab-actions');
 		tabContainer.appendChild(tabActionsContainer);
 
 		const that = this;
@@ -841,13 +838,11 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 
 		// Tab Fade Hider
 		// Hides the tab fade to the right when tab action left and sizing shrink/fixed, ::after, ::before are already used
-		const tabShadowHider = document.createElement('div');
-		tabShadowHider.classList.add('tab-fade-hider');
+		const tabShadowHider = $('.tab-fade-hider');
 		tabContainer.appendChild(tabShadowHider);
 
 		// Tab Border Bottom
-		const tabBorderBottomContainer = document.createElement('div');
-		tabBorderBottomContainer.classList.add('tab-border-bottom-container');
+		const tabBorderBottomContainer = $('.tab-border-bottom-container');
 		tabContainer.appendChild(tabBorderBottomContainer);
 
 		// Eventing
diff --git a/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.ts b/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.ts
index a3b16b2d7fcc..d8620a08abd8 100644
--- a/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.ts
@@ -10,7 +10,7 @@ import { EditorTabsControl } from './editorTabsControl.js';
 import { ResourceLabel, IResourceLabel } from '../../labels.js';
 import { TAB_ACTIVE_FOREGROUND, TAB_UNFOCUSED_ACTIVE_FOREGROUND } from '../../../common/theme.js';
 import { EventType as TouchEventType, GestureEvent, Gesture } from '../../../../base/browser/touch.js';
-import { addDisposableListener, EventType, EventHelper, Dimension, isAncestor, DragAndDropObserver, isHTMLElement } from '../../../../base/browser/dom.js';
+import { addDisposableListener, EventType, EventHelper, Dimension, isAncestor, DragAndDropObserver, isHTMLElement, $ } from '../../../../base/browser/dom.js';
 import { CLOSE_EDITOR_COMMAND_ID, UNLOCK_GROUP_COMMAND_ID } from './editorCommands.js';
 import { Color } from '../../../../base/common/color.js';
 import { assertIsDefined, assertAllDefined } from '../../../../base/common/types.js';
@@ -46,8 +46,7 @@ export class SingleEditorTabsControl extends EditorTabsControl {
 		// Gesture Support
 		this._register(Gesture.addTarget(titleContainer));
 
-		const labelContainer = document.createElement('div');
-		labelContainer.classList.add('label-container');
+		const labelContainer = $('.label-container');
 		titleContainer.appendChild(labelContainer);
 
 		// Editor Label
diff --git a/src/vs/workbench/browser/parts/globalCompositeBar.ts b/src/vs/workbench/browser/parts/globalCompositeBar.ts
index c026e1581721..e927fbca8e3e 100644
--- a/src/vs/workbench/browser/parts/globalCompositeBar.ts
+++ b/src/vs/workbench/browser/parts/globalCompositeBar.ts
@@ -67,7 +67,7 @@ export class GlobalCompositeBar extends Disposable {
 	) {
 		super();
 
-		this.element = document.createElement('div');
+		this.element = $('div');
 		const contextMenuAlignmentOptions = () => ({
 			anchorAlignment: configurationService.getValue('workbench.sideBar.location') === 'left' ? AnchorAlignment.RIGHT : AnchorAlignment.LEFT,
 			anchorAxisAlignment: AnchorAxisAlignment.HORIZONTAL
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
index 85356ca85d9d..d0ad9d533b81 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
@@ -14,7 +14,7 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { INotificationsCenterController, NotificationActionRunner } from './notificationsCommands.js';
 import { NotificationsList } from './notificationsList.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { Dimension, isAncestorOfActiveElement } from '../../../../base/browser/dom.js';
+import { $, Dimension, isAncestorOfActiveElement } from '../../../../base/browser/dom.js';
 import { widgetShadow } from '../../../../platform/theme/common/colorRegistry.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { localize } from '../../../../nls.js';
@@ -149,22 +149,18 @@ export class NotificationsCenter extends Themable implements INotificationsCente
 	private create(): void {
 
 		// Container
-		this.notificationsCenterContainer = document.createElement('div');
-		this.notificationsCenterContainer.classList.add('notifications-center');
+		this.notificationsCenterContainer = $('.notifications-center');
 
 		// Header
-		this.notificationsCenterHeader = document.createElement('div');
-		this.notificationsCenterHeader.classList.add('notifications-center-header');
+		this.notificationsCenterHeader = $('.notifications-center-header');
 		this.notificationsCenterContainer.appendChild(this.notificationsCenterHeader);
 
 		// Header Title
-		this.notificationsCenterTitle = document.createElement('span');
-		this.notificationsCenterTitle.classList.add('notifications-center-header-title');
+		this.notificationsCenterTitle = $('span.notifications-center-header-title');
 		this.notificationsCenterHeader.appendChild(this.notificationsCenterTitle);
 
 		// Header Toolbar
-		const toolbarContainer = document.createElement('div');
-		toolbarContainer.classList.add('notifications-center-header-toolbar');
+		const toolbarContainer = $('.notifications-center-header-toolbar');
 		this.notificationsCenterHeader.appendChild(toolbarContainer);
 
 		const actionRunner = this._register(this.instantiationService.createInstance(NotificationActionRunner));
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsList.ts b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
index d0893c26d1d7..edb6062b7175 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsList.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsList.ts
@@ -5,7 +5,7 @@
 
 import './media/notificationsList.css';
 import { localize } from '../../../../nls.js';
-import { getWindow, isAncestorOfActiveElement, trackFocus } from '../../../../base/browser/dom.js';
+import { $, getWindow, isAncestorOfActiveElement, trackFocus } from '../../../../base/browser/dom.js';
 import { WorkbenchList } from '../../../../platform/list/browser/listService.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IListAccessibilityProvider, IListOptions } from '../../../../base/browser/ui/list/listWidget.js';
@@ -60,8 +60,7 @@ export class NotificationsList extends Disposable {
 	private createNotificationsList(): void {
 
 		// List Container
-		this.listContainer = document.createElement('div');
-		this.listContainer.classList.add('notifications-list-container');
+		this.listContainer = $('.notifications-list-container');
 
 		const actionRunner = this._register(this.instantiationService.createInstance(NotificationActionRunner));
 
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
index f0dda3b44cbc..aa20ba8de9e6 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
@@ -7,7 +7,7 @@ import './media/notificationsToasts.css';
 import { localize } from '../../../../nls.js';
 import { INotificationsModel, NotificationChangeType, INotificationChangeEvent, INotificationViewItem, NotificationViewItemContentChangeKind } from '../../../common/notifications.js';
 import { IDisposable, dispose, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { addDisposableListener, EventType, Dimension, scheduleAtNextAnimationFrame, isAncestorOfActiveElement, getWindow } from '../../../../base/browser/dom.js';
+import { addDisposableListener, EventType, Dimension, scheduleAtNextAnimationFrame, isAncestorOfActiveElement, getWindow, $ } from '../../../../base/browser/dom.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { NotificationsList } from './notificationsList.js';
 import { Event, Emitter } from '../../../../base/common/event.js';
@@ -165,8 +165,7 @@ export class NotificationsToasts extends Themable implements INotificationsToast
 		// Lazily create toasts containers
 		let notificationsToastsContainer = this.notificationsToastsContainer;
 		if (!notificationsToastsContainer) {
-			notificationsToastsContainer = this.notificationsToastsContainer = document.createElement('div');
-			notificationsToastsContainer.classList.add('notifications-toasts');
+			notificationsToastsContainer = this.notificationsToastsContainer = $('.notifications-toasts');
 
 			this.container.appendChild(notificationsToastsContainer);
 		}
@@ -175,8 +174,7 @@ export class NotificationsToasts extends Themable implements INotificationsToast
 		notificationsToastsContainer.classList.add('visible');
 
 		// Container
-		const notificationToastContainer = document.createElement('div');
-		notificationToastContainer.classList.add('notification-toast-container');
+		const notificationToastContainer = $('.notification-toast-container');
 
 		const firstToast = notificationsToastsContainer.firstChild;
 		if (firstToast) {
@@ -186,8 +184,7 @@ export class NotificationsToasts extends Themable implements INotificationsToast
 		}
 
 		// Toast
-		const notificationToast = document.createElement('div');
-		notificationToast.classList.add('notification-toast');
+		const notificationToast = $('.notification-toast');
 		notificationToastContainer.appendChild(notificationToast);
 
 		// Create toast with item and show
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
index 389569cf5a7c..ab770c9580bb 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
@@ -45,12 +45,7 @@ export class NotificationsListDelegate implements IListVirtualDelegate<INotifica
 	}
 
 	private createOffsetHelper(container: HTMLElement): HTMLElement {
-		const offsetHelper = document.createElement('div');
-		offsetHelper.classList.add('notification-offset-helper');
-
-		container.appendChild(offsetHelper);
-
-		return offsetHelper;
+		return container.appendChild($('.notification-offset-helper'));
 	}
 
 	getHeight(notification: INotificationViewItem): number {
@@ -146,7 +141,7 @@ interface IMessageActionHandler {
 class NotificationMessageRenderer {
 
 	static render(message: INotificationMessage, actionHandler?: IMessageActionHandler): HTMLElement {
-		const messageContainer = document.createElement('span');
+		const messageContainer = $('span');
 
 		for (const node of message.linkedText.nodes) {
 			if (typeof node === 'string') {
@@ -215,25 +210,20 @@ export class NotificationRenderer implements IListRenderer<INotificationViewItem
 		data.toDispose = new DisposableStore();
 
 		// Container
-		data.container = document.createElement('div');
-		data.container.classList.add('notification-list-item');
+		data.container = $('.notification-list-item');
 
 		// Main Row
-		data.mainRow = document.createElement('div');
-		data.mainRow.classList.add('notification-list-item-main-row');
+		data.mainRow = $('.notification-list-item-main-row');
 
 		// Icon
-		data.icon = document.createElement('div');
-		data.icon.classList.add('notification-list-item-icon', 'codicon');
+		data.icon = $('.notification-list-item-icon.codicon');
 
 		// Message
-		data.message = document.createElement('div');
-		data.message.classList.add('notification-list-item-message');
+		data.message = $('.notification-list-item-message');
 
 		// Toolbar
 		const that = this;
-		const toolbarContainer = document.createElement('div');
-		toolbarContainer.classList.add('notification-list-item-toolbar-container');
+		const toolbarContainer = $('.notification-list-item-toolbar-container');
 		data.toolbar = new ActionBar(
 			toolbarContainer,
 			{
@@ -279,16 +269,13 @@ export class NotificationRenderer implements IListRenderer<INotificationViewItem
 		data.toDispose.add(data.toolbar);
 
 		// Details Row
-		data.detailsRow = document.createElement('div');
-		data.detailsRow.classList.add('notification-list-item-details-row');
+		data.detailsRow = $('.notification-list-item-details-row');
 
 		// Source
-		data.source = document.createElement('div');
-		data.source.classList.add('notification-list-item-source');
+		data.source = $('.notification-list-item-source');
 
 		// Buttons Container
-		data.buttonsContainer = document.createElement('div');
-		data.buttonsContainer.classList.add('notification-list-item-buttons-container');
+		data.buttonsContainer = $('.notification-list-item-buttons-container');
 
 		container.appendChild(data.container);
 
diff --git a/src/vs/workbench/browser/parts/paneCompositePart.ts b/src/vs/workbench/browser/parts/paneCompositePart.ts
index c8780871219d..d1d67e1ebef8 100644
--- a/src/vs/workbench/browser/parts/paneCompositePart.ts
+++ b/src/vs/workbench/browser/parts/paneCompositePart.ts
@@ -265,11 +265,9 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos
 	}
 
 	private createEmptyPaneMessage(parent: HTMLElement): void {
-		this.emptyPaneMessageElement = document.createElement('div');
-		this.emptyPaneMessageElement.classList.add('empty-pane-message-area');
+		this.emptyPaneMessageElement = $('.empty-pane-message-area');
 
-		const messageElement = document.createElement('div');
-		messageElement.classList.add('empty-pane-message');
+		const messageElement = $('.empty-pane-message');
 		messageElement.innerText = localize('pane.emptyMessage', "Drag a view here to display.");
 
 		this.emptyPaneMessageElement.appendChild(messageElement);
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts b/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
index 198e34c731b8..26078d8b0b0f 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarItem.ts
@@ -13,7 +13,7 @@ import { WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } f
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { ThemeColor } from '../../../../base/common/themables.js';
 import { isThemeColor } from '../../../../editor/common/editorCommon.js';
-import { addDisposableListener, EventType, hide, show, append, EventHelper } from '../../../../base/browser/dom.js';
+import { addDisposableListener, EventType, hide, show, append, EventHelper, $ } from '../../../../base/browser/dom.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
 import { Command } from '../../../../editor/common/languages.js';
@@ -66,10 +66,10 @@ export class StatusbarEntryItem extends Disposable {
 		super();
 
 		// Label Container
-		this.labelContainer = document.createElement('a');
-		this.labelContainer.tabIndex = -1; // allows screen readers to read title, but still prevents tab focus.
-		this.labelContainer.setAttribute('role', 'button');
-		this.labelContainer.className = 'statusbar-item-label';
+		this.labelContainer = $('a.statusbar-item-label', {
+			role: 'button',
+			tabIndex: -1 // allows screen readers to read title, but still prevents tab focus.
+		});
 		this._register(Gesture.addTarget(this.labelContainer)); // enable touch
 
 		// Label (with support for progress)
@@ -77,8 +77,7 @@ export class StatusbarEntryItem extends Disposable {
 		this.container.appendChild(this.labelContainer);
 
 		// Beak Container
-		this.beakContainer = document.createElement('div');
-		this.beakContainer.className = 'status-bar-item-beak-container';
+		this.beakContainer = $('.status-bar-item-beak-container');
 		this.container.appendChild(this.beakContainer);
 
 		this.update(entry);
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index ba3d0d62c8cd..357bf1d39776 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -16,7 +16,7 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.js
 import { STATUS_BAR_BACKGROUND, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_BACKGROUND, STATUS_BAR_ITEM_HOVER_BACKGROUND, STATUS_BAR_BORDER, STATUS_BAR_NO_FOLDER_FOREGROUND, STATUS_BAR_NO_FOLDER_BORDER, STATUS_BAR_ITEM_COMPACT_HOVER_BACKGROUND, STATUS_BAR_ITEM_FOCUS_BORDER, STATUS_BAR_FOCUS_BORDER } from '../../../common/theme.js';
 import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
 import { contrastBorder, activeContrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
-import { EventHelper, addDisposableListener, EventType, clearNode, getWindow, isHTMLElement } from '../../../../base/browser/dom.js';
+import { EventHelper, addDisposableListener, EventType, clearNode, getWindow, isHTMLElement, $ } from '../../../../base/browser/dom.js';
 import { createStyleSheet } from '../../../../base/browser/domStylesheets.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { Parts, IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
@@ -324,10 +324,8 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 	}
 
 	private doCreateStatusItem(id: string, alignment: StatusbarAlignment, ...extraClasses: string[]): HTMLElement {
-		const itemContainer = document.createElement('div');
-		itemContainer.id = id;
+		const itemContainer = $('.statusbar-item', { id });
 
-		itemContainer.classList.add('statusbar-item');
 		if (extraClasses) {
 			itemContainer.classList.add(...extraClasses);
 		}
@@ -405,14 +403,12 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 		StatusBarFocused.bindTo(scopedContextKeyService).set(true);
 
 		// Left items container
-		this.leftItemsContainer = document.createElement('div');
-		this.leftItemsContainer.classList.add('left-items', 'items-container');
+		this.leftItemsContainer = $('.left-items.items-container');
 		this.element.appendChild(this.leftItemsContainer);
 		this.element.tabIndex = 0;
 
 		// Right items container
-		this.rightItemsContainer = document.createElement('div');
-		this.rightItemsContainer.classList.add('right-items', 'items-container');
+		this.rightItemsContainer = $('.right-items.items-container');
 		this.element.appendChild(this.rightItemsContainer);
 
 		// Context menu support
@@ -772,12 +768,12 @@ export class StatusbarService extends MultiWindowParts<StatusbarPart> implements
 	createAuxiliaryStatusbarPart(container: HTMLElement): IAuxiliaryStatusbarPart {
 
 		// Container
-		const statusbarPartContainer = document.createElement('footer');
-		statusbarPartContainer.classList.add('part', 'statusbar');
-		statusbarPartContainer.setAttribute('role', 'status');
+		const statusbarPartContainer = $('footer.part.statusbar', {
+			'role': 'status',
+			'aria-live': 'off',
+			'tabIndex': '0'
+		});
 		statusbarPartContainer.style.position = 'relative';
-		statusbarPartContainer.setAttribute('aria-live', 'off');
-		statusbarPartContainer.setAttribute('tabindex', '0');
 		container.appendChild(statusbarPartContainer);
 
 		// Statusbar Part
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 718037ce3e67..14cdd2393761 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -149,9 +149,7 @@ export class BrowserTitleService extends MultiWindowParts<BrowserTitlebarPart> i
 	//#region Auxiliary Titlebar Parts
 
 	createAuxiliaryTitlebarPart(container: HTMLElement, editorGroupsContainer: IEditorGroupsContainer): IAuxiliaryTitlebarPart {
-		const titlebarPartContainer = document.createElement('div');
-		titlebarPartContainer.classList.add('part', 'titlebar');
-		titlebarPartContainer.setAttribute('role', 'none');
+		const titlebarPartContainer = $('.part.titlebar', { role: 'none' });
 		titlebarPartContainer.style.position = 'relative';
 		container.insertBefore(titlebarPartContainer, container.firstChild); // ensure we are first element
 
diff --git a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
index b4f069c65f6c..eaa4e9aae1ac 100644
--- a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
+++ b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, Dimension, DragAndDropObserver, EventType, getWindow, isAncestor } from '../../../../base/browser/dom.js';
+import { $, addDisposableListener, Dimension, DragAndDropObserver, EventType, getWindow, isAncestor } from '../../../../base/browser/dom.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { EventType as TouchEventType, Gesture } from '../../../../base/browser/touch.js';
 import { IActionViewItem } from '../../../../base/browser/ui/actionbar/actionbar.js';
@@ -104,9 +104,9 @@ class ViewPaneDropOverlay extends Themable {
 	}
 
 	private create(): void {
+
 		// Container
-		this.container = document.createElement('div');
-		this.container.id = ViewPaneDropOverlay.OVERLAY_ID;
+		this.container = $('div', { id: ViewPaneDropOverlay.OVERLAY_ID });
 		this.container.style.top = '0px';
 
 		// Parent
@@ -118,8 +118,7 @@ class ViewPaneDropOverlay extends Themable {
 		}));
 
 		// Overlay
-		this.overlay = document.createElement('div');
-		this.overlay.classList.add('pane-overlay-indicator');
+		this.overlay = $('.pane-overlay-indicator');
 		this.container.appendChild(this.overlay);
 
 		// Overlay Event Handling
diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-sandbox/window.ts
index 4babd90fe708..810be457095b 100644
--- a/src/vs/workbench/electron-sandbox/window.ts
+++ b/src/vs/workbench/electron-sandbox/window.ts
@@ -8,7 +8,7 @@ import { localize } from '../../nls.js';
 import { URI } from '../../base/common/uri.js';
 import { onUnexpectedError } from '../../base/common/errors.js';
 import { equals } from '../../base/common/objects.js';
-import { EventType, EventHelper, addDisposableListener, ModifierKeyEmitter, getActiveElement, hasWindow, getWindowById, getWindows } from '../../base/browser/dom.js';
+import { EventType, EventHelper, addDisposableListener, ModifierKeyEmitter, getActiveElement, hasWindow, getWindowById, getWindows, $ } from '../../base/browser/dom.js';
 import { Action, Separator, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../base/common/actions.js';
 import { IFileService } from '../../platform/files/common/files.js';
 import { EditorResourceAccessor, IUntitledTextResourceEditorInput, SideBySideEditor, pathsToEditors, IResourceDiffEditorInput, IUntypedEditorInput, IEditorPane, isResourceEditorInput, IResourceMergeEditorInput } from '../common/editor.js';
@@ -1173,11 +1173,9 @@ class ZoomStatusEntry extends Disposable {
 		const disposables = new DisposableStore();
 		this.disposable.value = disposables;
 
-		const container = document.createElement('div');
-		container.classList.add('zoom-status');
+		const container = $('.zoom-status');
 
-		const left = document.createElement('div');
-		left.classList.add('zoom-status-left');
+		const left = $('.zoom-status-left');
 		container.appendChild(left);
 
 		const zoomOutAction: Action = disposables.add(new Action('workbench.action.zoomOut', localize('zoomOut', "Zoom Out"), ThemeIcon.asClassName(Codicon.remove), true, () => this.commandService.executeCommand(zoomOutAction.id)));
@@ -1195,8 +1193,7 @@ class ZoomStatusEntry extends Disposable {
 		actionBarLeft.push(this.zoomLevelLabel, { icon: false, label: true });
 		actionBarLeft.push(zoomInAction, { icon: true, label: false, keybinding: this.keybindingService.lookupKeybinding(zoomInAction.id)?.getLabel() });
 
-		const right = document.createElement('div');
-		right.classList.add('zoom-status-right');
+		const right = $('.zoom-status-right');
 		container.appendChild(right);
 
 		const actionBarRight = disposables.add(new ActionBar(right, { hoverDelegate: nativeHoverDelegate }));
diff --git a/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts b/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts
index aab43037968a..276e603077fe 100644
--- a/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts
+++ b/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { getZoomLevel } from '../../../../base/browser/browser.js';
-import { Dimension, EventHelper, EventType, ModifierKeyEmitter, addDisposableListener, copyAttributes, createLinkElement, createMetaElement, getActiveWindow, getClientArea, getWindowId, isHTMLElement, position, registerWindow, sharedMutationObserver, trackAttributes } from '../../../../base/browser/dom.js';
+import { $, Dimension, EventHelper, EventType, ModifierKeyEmitter, addDisposableListener, copyAttributes, createLinkElement, createMetaElement, getActiveWindow, getClientArea, getWindowId, isHTMLElement, position, registerWindow, sharedMutationObserver, trackAttributes } from '../../../../base/browser/dom.js';
 import { cloneGlobalStylesheets, isGlobalStylesheet } from '../../../../base/browser/domStylesheets.js';
 import { CodeWindow, ensureCodeWindow, mainWindow } from '../../../../base/browser/window.js';
 import { coalesce } from '../../../../base/common/arrays.js';
@@ -504,8 +504,7 @@ export class BrowserAuxiliaryWindowService extends Disposable implements IAuxili
 		mark('code/auxiliaryWindow/willApplyHTML');
 
 		// Create workbench container and apply classes
-		const container = document.createElement('div');
-		container.setAttribute('role', 'application');
+		const container = $('div', { role: 'application' });
 		position(container, 0, 0, 0, 0, 'relative');
 		container.style.display = 'flex';
 		container.style.height = '100%';

From 956a11e83d8631449d1c6e66425612381f447793 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Tue, 4 Mar 2025 10:16:39 +0100
Subject: [PATCH 0595/1815] fix #242349 (#242537)

---
 .../markers/browser/markersTreeViewer.ts      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
index 6e639a98c133..cce84bf3c89c 100644
--- a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
@@ -26,7 +26,7 @@ import { Event, Emitter } from '../../../../base/common/event.js';
 import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
 import { isUndefinedOrNull } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
-import { Action, IAction } from '../../../../base/common/actions.js';
+import { Action, IAction, toAction } from '../../../../base/common/actions.js';
 import { localize } from '../../../../nls.js';
 import { CancelablePromise, createCancelablePromise, Delayer } from '../../../../base/common/async.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
@@ -645,15 +645,15 @@ export class MarkerViewModel extends Disposable {
 	}
 
 	private toActions(codeActions: CodeActionSet): IAction[] {
-		return codeActions.validActions.map(item => new Action(
-			item.action.command ? item.action.command.id : item.action.title,
-			item.action.title,
-			undefined,
-			true,
-			() => {
-				return this.openFileAtMarker(this.marker)
-					.then(() => this.instantiationService.invokeFunction(applyCodeAction, item, ApplyCodeActionReason.FromProblemsView));
-			}));
+		return codeActions.validActions.map(item => toAction({
+			id: item.action.command ? item.action.command.id : item.action.title,
+			label: item.action.title,
+			enabled: true,
+			run: async () => {
+				await this.openFileAtMarker(this.marker);
+				return await this.instantiationService.invokeFunction(applyCodeAction, item, ApplyCodeActionReason.FromProblemsView);
+			}
+		}));
 	}
 
 	private openFileAtMarker(element: Marker): Promise<void> {

From 3b55994f24eda954daf965c0d457c9dec3e30a33 Mon Sep 17 00:00:00 2001
From: Tushar Sadhwani <tushar.sadhwani000@gmail.com>
Date: Tue, 4 Mar 2025 14:58:33 +0530
Subject: [PATCH 0596/1815] Make `git show` ref argument unambiguous (#242483)

make `git show` ref argument unambiguous
---
 extensions/git/src/git.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 2f0d11bd4884..3acc8c68fdc5 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -2853,7 +2853,7 @@ export class Repository {
 	}
 
 	async getCommit(ref: string): Promise<Commit> {
-		const result = await this.exec(['show', '-s', '--decorate=full', '--shortstat', `--format=${COMMIT_FORMAT}`, '-z', ref]);
+		const result = await this.exec(['show', '-s', '--decorate=full', '--shortstat', `--format=${COMMIT_FORMAT}`, '-z', ref, '--']);
 		const commits = parseGitCommits(result.stdout);
 		if (commits.length === 0) {
 			return Promise.reject<Commit>('bad commit format');

From 22d9406e584f6b730191041bb31fac7c8ce0b74e Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Tue, 4 Mar 2025 21:12:53 +1100
Subject: [PATCH 0597/1815] Support moving notebook cells during chat edits
 (#242534)

* Support moving a nb cell whilst in chat edits

* Fix tests

* Fixes to insert/delete of cells

* More fixes
---
 .../chatEditingModifiedNotebookEntry.ts       |  267 ++++-
 .../chatEditingNotebookEditorIntegration.ts   |    8 +
 .../chatEditingModifiedNotebookEntry.test.ts  | 1037 +++++++++++++++++
 3 files changed, 1259 insertions(+), 53 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 21069ff486f0..ad28059c6a1a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -48,7 +48,7 @@ import { CellEditState, getNotebookEditorFromEditorPane } from '../../../noteboo
 import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
 import { NotebookCellTextModel } from '../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
-import { CellEditType, ICellDto2, ICellEditOperation, ICellReplaceEdit, IResolvedNotebookEditorModel, NotebookCellsChangeType, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
+import { CellEditType, ICell, ICellDto2, ICellEditOperation, ICellReplaceEdit, IResolvedNotebookEditorModel, NotebookCellsChangeType, NotebookCellsModelMoveEvent, NotebookCellTextModelSplice, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
 import { computeDiff } from '../../../notebook/common/notebookDiff.js';
 import { INotebookEditorModelResolverService } from '../../../notebook/common/notebookEditorModelResolverService.js';
 import { INotebookLoggingService } from '../../../notebook/common/notebookLoggingService.js';
@@ -243,14 +243,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	}
 
 	mirrorNotebookEdits(e: NotebookTextModelChangedEvent) {
-		/**
-		 * TODO@DonJayamanne
-		 * If user deletes cells, invoke this.disposeDeletedCellEntries();
-		 * If user makes any changes, invoke this.computeStateAfterAcceptingRejectingChanges(true);
-		 * If user deletes/inserts cells manually, do we need to apply those to the original snapshot? Unlikely, double check.
-		 */
 		if (this._isEditFromUs || Array.from(this.cellEntryMap.values()).some(entry => entry.isEditFromUs)) {
-			// TODO@DonJayamanne Apply this same edit to the original notebook.
 			return;
 		}
 
@@ -288,44 +281,16 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 					break;
 				}
 				case NotebookCellsChangeType.ModelChange: {
+					let cellDiffs = sortCellChanges(this._cellsDiffInfo.get()).slice();
 					event.changes.forEach(change => {
-						const cells = change[2].map(cell => {
-							return {
-								cellKind: cell.cellKind,
-								language: cell.language,
-								metadata: cell.metadata,
-								outputs: cell.outputs,
-								source: cell.getValue(),
-								mime: undefined,
-								internalMetadata: cell.internalMetadata
-							} satisfies ICellDto2;
-						});
-						const cellDiffs = sortCellChanges(this._cellsDiffInfo.get()).slice();
-						const wasInsertedAsFirstCell = change[0] === 0;
-						const wasInsertedAsLastCell = change[0] === this.modifiedModel.cells.length - 1;
-						const diffEntryIndex = wasInsertedAsFirstCell ? 0 : (wasInsertedAsLastCell ? this.originalModel.cells.length : (cellDiffs.findIndex(d => d.modifiedCellIndex === change[0])));
-						const indexToInsertInOriginalModel = (wasInsertedAsFirstCell || diffEntryIndex === -1) ? 0 : (wasInsertedAsLastCell ? this.originalModel.cells.length : (((cellDiffs.slice(0, diffEntryIndex).reverse().find(c => typeof c.originalCellIndex === 'number')?.originalCellIndex ?? -1) + 1)));
-						const edit: ICellEditOperation = {
-							editType: CellEditType.Replace,
-							cells,
-							index: indexToInsertInOriginalModel,
-							count: change[1]
-						};
-						this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
-						// If cells were deleted we handled that with this.disposeDeletedCellEntries();
-						if (diffEntryIndex >= 0) {
-							cellDiffs.splice(diffEntryIndex, change[1]);
-						}
-						// For inserted cells, we need to ensure that we create a corresponding CellEntry.
-						// So that any edits to the inserted cell is handled and mirrored over to the corresponding cell in original model.
-						cells.forEach((_, i) => {
-							const originalCellIndex = i + indexToInsertInOriginalModel;
-							const modifiedCellIndex = change[0] + i;
-							const unchangedCell = this.createModifiedCellDiffInfo(modifiedCellIndex, originalCellIndex);
-							cellDiffs.splice(diffEntryIndex === -1 ? 0 : diffEntryIndex, 0, unchangedCell);
-							this.updateCellDiffInfo(cellDiffs, undefined);
-						});
+						cellDiffs = adjustCellDiffAndOriginalModelBasedOnCellAddDelete(change,
+							cellDiffs,
+							this.modifiedModel.cells.length,
+							this.originalModel.cells.length,
+							this.originalModel.applyEdits.bind(this.originalModel),
+							this.createModifiedCellDiffInfo.bind(this));
 					});
+					this.updateCellDiffInfo(cellDiffs, undefined);
 					this.disposeDeletedCellEntries();
 					break;
 				}
@@ -379,15 +344,11 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 					break;
 				}
 				case NotebookCellsChangeType.Move: {
-					const edit: ICellEditOperation = {
-						editType: CellEditType.Move,
-						index: event.index,
-						length: event.length,
-						newIdx: event.newIdx
-					};
-					this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
-					// TODO@DonJayamanne
-					// We need to update the entries in _cellDiffInfo.
+					const result = adjustCellDiffAndOriginalModelBasedOnCellMovements(event, this._cellsDiffInfo.get().slice());
+					if (result) {
+						this.originalModel.applyEdits(result[1], true, undefined, () => undefined, undefined, true);
+						this._cellsDiffInfo.set(result[0], undefined);
+					}
 					break;
 				}
 				default: {
@@ -1280,3 +1241,203 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 		}
 	}
 }
+
+export function adjustCellDiffAndOriginalModelBasedOnCellAddDelete(change: NotebookCellTextModelSplice<ICell>,
+	cellDiffInfo: ICellDiffInfo[],
+	modifiedModelCellCount: number,
+	originalModelCellCount: number,
+	applyEdits: typeof NotebookTextModel.prototype.applyEdits,
+	createModifiedCellDiffInfo: (modifiedCellIndex: number, originalCellIndex: number) => ICellDiffInfo,
+): ICellDiffInfo[] {
+	cellDiffInfo = sortCellChanges(cellDiffInfo).slice();
+	const numberOfCellsInserted = change[2].length;
+	const numberOfCellsDeleted = change[1];
+	const cells = change[2].map(cell => {
+		return {
+			cellKind: cell.cellKind,
+			language: cell.language,
+			metadata: cell.metadata,
+			outputs: cell.outputs,
+			source: cell.getValue(),
+			mime: undefined,
+			internalMetadata: cell.internalMetadata
+		} satisfies ICellDto2;
+	});
+	const wasInsertedAsFirstCell = change[0] === 0;
+	const wasInsertedAsLastCell = change[0] === modifiedModelCellCount - 1;
+	const diffEntryIndex = wasInsertedAsFirstCell ? 0 : (wasInsertedAsLastCell ? cellDiffInfo.length - 1 : (cellDiffInfo.findIndex(d => d.modifiedCellIndex === change[0])));
+	const indexToInsertInOriginalModel = (wasInsertedAsFirstCell || diffEntryIndex === -1) ? 0 : (wasInsertedAsLastCell ? originalModelCellCount : (((cellDiffInfo.slice(0, diffEntryIndex).reverse().find(c => typeof c.originalCellIndex === 'number')?.originalCellIndex ?? -1) + 1)));
+	if (cells.length) {
+		const edit: ICellEditOperation = {
+			editType: CellEditType.Replace,
+			cells,
+			index: indexToInsertInOriginalModel,
+			count: change[1]
+		};
+		applyEdits([edit], true, undefined, () => undefined, undefined, true);
+	}
+	// If cells were deleted we handled that with this.disposeDeletedCellEntries();
+	if (numberOfCellsDeleted) {
+		// Adjust the indexes.
+		let numberOfOriginalCellsRemovedSoFar = 0;
+		let numberOfModifiedCellsRemovedSoFar = 0;
+		const modifiedIndexesToRemove = new Set<number>();
+		for (let i = 0; i < numberOfCellsDeleted; i++) {
+			modifiedIndexesToRemove.add(change[0] + i);
+		}
+		const itemsToRemove = new Set<ICellDiffInfo>();
+		for (let i = 0; i < cellDiffInfo.length; i++) {
+			const diff = cellDiffInfo[i];
+			if (i < diffEntryIndex) {
+				continue;
+			}
+
+			let changed = false;
+			if (typeof diff.modifiedCellIndex === 'number' && modifiedIndexesToRemove.has(diff.modifiedCellIndex)) {
+				// This will be removed.
+				numberOfModifiedCellsRemovedSoFar++;
+				if (typeof diff.originalCellIndex === 'number') {
+					numberOfOriginalCellsRemovedSoFar++;
+				}
+				itemsToRemove.add(diff);
+				continue;
+			}
+			if (typeof diff.modifiedCellIndex === 'number' && numberOfModifiedCellsRemovedSoFar) {
+				diff.modifiedCellIndex -= numberOfModifiedCellsRemovedSoFar;
+				changed = true;
+			}
+			if (typeof diff.originalCellIndex === 'number' && numberOfOriginalCellsRemovedSoFar) {
+				diff.originalCellIndex -= numberOfOriginalCellsRemovedSoFar;
+				changed = true;
+			}
+			if (changed) {
+				cellDiffInfo[i] = { ...diff };
+			}
+		}
+		cellDiffInfo = cellDiffInfo.filter(d => !itemsToRemove.has(d));
+	}
+
+	if (numberOfCellsInserted) {
+		for (let i = 0; i < cellDiffInfo.length; i++) {
+			const diff = cellDiffInfo[i];
+			if (i < diffEntryIndex) {
+				continue;
+			}
+			let changed = false;
+			if (typeof diff.modifiedCellIndex === 'number') {
+				diff.modifiedCellIndex += numberOfCellsInserted;
+				changed = true;
+			}
+			if (typeof diff.originalCellIndex === 'number') {
+				diff.originalCellIndex += numberOfCellsInserted;
+				changed = true;
+			}
+			if (changed) {
+				cellDiffInfo[i] = { ...diff };
+			}
+		}
+	}
+
+	// For inserted cells, we need to ensure that we create a corresponding CellEntry.
+	// So that any edits to the inserted cell is handled and mirrored over to the corresponding cell in original model.
+	cells.forEach((_, i) => {
+		const originalCellIndex = i + indexToInsertInOriginalModel;
+		const modifiedCellIndex = change[0] + i;
+		const unchangedCell = createModifiedCellDiffInfo(modifiedCellIndex, originalCellIndex);
+		cellDiffInfo.splice((diffEntryIndex === -1 ? 0 : diffEntryIndex) + i, 0, unchangedCell);
+	});
+	return cellDiffInfo;
+}
+/**
+ * Given the movements of cells in modified notebook, adjust the ICellDiffInfo[] array
+ * and generate edits for the old notebook (if required).
+ * TODO@DonJayamanne Handle bulk moves (movements of more than 1 cell).
+ */
+export function adjustCellDiffAndOriginalModelBasedOnCellMovements(event: NotebookCellsModelMoveEvent<ICell>, cellDiffInfo: ICellDiffInfo[]): [ICellDiffInfo[], ICellEditOperation[]] | undefined {
+	const minimumIndex = Math.min(event.index, event.newIdx);
+	const maximumIndex = Math.max(event.index, event.newIdx);
+	const cellDiffs = cellDiffInfo.slice();
+	const indexOfEntry = cellDiffs.findIndex(d => d.modifiedCellIndex === event.index);
+	const indexOfEntryToPlaceBelow = cellDiffs.findIndex(d => d.modifiedCellIndex === event.newIdx);
+	if (indexOfEntry === -1 || indexOfEntryToPlaceBelow === -1) {
+		return undefined;
+	}
+	// Create a new object so that the observable value is triggered.
+	// Besides we'll be updating the values of this object in place.
+	const entryToBeMoved = { ...cellDiffs[indexOfEntry] };
+	const moveDirection = event.newIdx > event.index ? 'down' : 'up';
+
+
+	const startIndex = cellDiffs.findIndex(d => d.modifiedCellIndex === minimumIndex);
+	const endIndex = cellDiffs.findIndex(d => d.modifiedCellIndex === maximumIndex);
+	const movingExistingCell = typeof entryToBeMoved.originalCellIndex === 'number';
+	let originalCellsWereEffected = false;
+	for (let i = 0; i < cellDiffs.length; i++) {
+		const diff = cellDiffs[i];
+		let changed = false;
+		if (moveDirection === 'down') {
+			if (i > startIndex && i <= endIndex) {
+				if (typeof diff.modifiedCellIndex === 'number') {
+					changed = true;
+					diff.modifiedCellIndex = diff.modifiedCellIndex - 1;
+				}
+				if (typeof diff.originalCellIndex === 'number' && movingExistingCell) {
+					diff.originalCellIndex = diff.originalCellIndex - 1;
+					originalCellsWereEffected = true;
+					changed = true;
+				}
+			}
+		} else {
+			if (i >= startIndex && i < endIndex) {
+				if (typeof diff.modifiedCellIndex === 'number') {
+					changed = true;
+					diff.modifiedCellIndex = diff.modifiedCellIndex + 1;
+				}
+				if (typeof diff.originalCellIndex === 'number' && movingExistingCell) {
+					diff.originalCellIndex = diff.originalCellIndex + 1;
+					originalCellsWereEffected = true;
+					changed = true;
+				}
+			}
+		}
+		// Create a new object so that the observable value is triggered.
+		// Do only if there's a change.
+		if (changed) {
+			cellDiffs[i] = { ...diff };
+		}
+	}
+	entryToBeMoved.modifiedCellIndex = event.newIdx;
+	const originalCellIndex = entryToBeMoved.originalCellIndex;
+	if (moveDirection === 'down') {
+		cellDiffs.splice(endIndex + 1, 0, entryToBeMoved);
+		cellDiffs.splice(startIndex, 1);
+		// If we're moving a new cell up/down, then we need just adjust just the modified indexes of the cells in between.
+		// If we're moving an existing up/down, then we need to adjust the original indexes as well.
+		if (typeof entryToBeMoved.originalCellIndex === 'number') {
+			entryToBeMoved.originalCellIndex = cellDiffs.slice(0, endIndex).reduce((lastOriginalIndex, diff) => typeof diff.originalCellIndex === 'number' ? Math.max(lastOriginalIndex, diff.originalCellIndex) : lastOriginalIndex, -1) + 1;
+		}
+	} else {
+		cellDiffs.splice(endIndex, 1);
+		cellDiffs.splice(startIndex, 0, entryToBeMoved);
+		// If we're moving a new cell up/down, then we need just adjust just the modified indexes of the cells in between.
+		// If we're moving an existing up/down, then we need to adjust the original indexes as well.
+		if (typeof entryToBeMoved.originalCellIndex === 'number') {
+			entryToBeMoved.originalCellIndex = cellDiffs.slice(0, startIndex).reduce((lastOriginalIndex, diff) => typeof diff.originalCellIndex === 'number' ? Math.max(lastOriginalIndex, diff.originalCellIndex) : lastOriginalIndex, -1) + 1;
+		}
+	}
+
+	// If this is a new cell that we're moving, and there are no existing cells in between, then we can just move the new cell.
+	// I.e. no need to update the original notebook model.
+	if (typeof entryToBeMoved.originalCellIndex === 'number' && originalCellsWereEffected && typeof originalCellIndex === 'number' && entryToBeMoved.originalCellIndex !== originalCellIndex) {
+		const edit: ICellEditOperation = {
+			editType: CellEditType.Move,
+			index: originalCellIndex,
+			length: event.length,
+			newIdx: entryToBeMoved.originalCellIndex
+		};
+
+		return [cellDiffs, [edit]];
+	}
+
+	return [cellDiffs, []];
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
index 774012a01bfd..459490d53695 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
@@ -595,9 +595,17 @@ export function sortCellChanges(changes: ICellDiffInfo[]): ICellDiffInfo[] {
 			return a.modifiedCellIndex - b.modifiedCellIndex;
 		}
 
+		if (a.type === 'delete' && b.type === 'insert') {
+			return -1;
+		}
+		if (a.type === 'insert' && b.type === 'delete') {
+			return 1;
+		}
+
 		if ((a.type === 'delete' && b.type !== 'insert') || (a.type !== 'insert' && b.type === 'delete')) {
 			return a.originalCellIndex - b.originalCellIndex;
 		}
+
 		// Mixed types: compare based on available indices
 		const aIndex = a.type === 'delete' ? a.originalCellIndex :
 			(a.type === 'insert' ? a.modifiedCellIndex : a.modifiedCellIndex);
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts
new file mode 100644
index 000000000000..17201568d182
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts
@@ -0,0 +1,1037 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { adjustCellDiffAndOriginalModelBasedOnCellAddDelete, adjustCellDiffAndOriginalModelBasedOnCellMovements } from '../../browser/chatEditing/chatEditingModifiedNotebookEntry.js';
+import { ICellDiffInfo } from '../../browser/chatEditing/chatEditingNotebookEditorIntegration.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 Cell Addition', function () {
+
+	const keep = () => Promise.resolve(true);
+	const undo = () => Promise.resolve(true);
+	const diff = observableValue('cell1', nullDocumentDiff);
+	const appliedEdits: ICellEditOperation[] = [];
+	setup(() => {
+		appliedEdits.length = 0;
+	});
+	ensureNoDisposablesAreLeakedInTestSuite();
+	function createModifiedModel(id: string): ObservablePromise<ITextModel> {
+		return `Modified:${id}` as any;
+
+	}
+	function createOriginalModel(id: string): ObservablePromise<ITextModel> {
+		return `Original:${id}` as any;
+
+	}
+	function applyEdits(edits: ICellEditOperation[]): boolean {
+		appliedEdits.push(...edits);
+		return true;
+	}
+
+	function createICell(cellKind: CellKind, source: string): ICell {
+		const handle = hash(generateUuid());
+		return {
+			uri: URI.parse(`file:///path/${handle}`),
+			handle,
+			cellKind,
+			language: cellKind === CellKind.Markup ? 'markdown' : 'python',
+			outputs: [],
+			metadata: {},
+			getHashValue: () => {
+				return hash(`${handle}=>${cellKind}=>${source}`);
+			},
+			getValue: () => {
+				return source;
+			},
+			internalMetadata: {},
+		} as any;
+	}
+	function createModifiedCellDiffInfo(modifiedCellIndex: number, originalCellIndex: number): ICellDiffInfo {
+		return {
+			diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel(`InsertedOriginal:${originalCellIndex}`), originalCellIndex,
+			modifiedCellIndex, modifiedModel: createModifiedModel(`InsertedModified:${modifiedCellIndex}`),
+		};
+	}
+	test('Insert a new cell into an unchanged notebook', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+			},
+		];
+
+		const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([0, 0, [createICell(CellKind.Code, 'print("Hello World")')]],
+			cellsDiffInfo, 2, 2, applyEdits, createModifiedCellDiffInfo);
+
+		assert.deepStrictEqual(result, [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel(`InsertedOriginal:0`), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel(`InsertedModified:0`),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 1,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 2,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+			},
+		]);
+	});
+	test('Insert a new cell into an notebook with 3 cells deleted', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('5'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
+			},
+		];
+
+		const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([2, 0, [createICell(CellKind.Code, 'print("Hello World")')]],
+			cellsDiffInfo, 4, 6, applyEdits, createModifiedCellDiffInfo);
+
+		assert.deepStrictEqual(result, [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel(`InsertedOriginal:4`), originalCellIndex: 4,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel(`InsertedModified:2`),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('5'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 6,
+				modifiedCellIndex: 4, modifiedModel: createModifiedModel('1'),
+			},
+		]);
+	});
+	test('Insert 2 new cells into an notebook with 3 cells deleted', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('5'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
+			},
+		];
+
+		const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([2, 0, [createICell(CellKind.Code, 'print("Hello World")'), createICell(CellKind.Code, 'print("Foo Bar")')]],
+			cellsDiffInfo, 4, 6, applyEdits, createModifiedCellDiffInfo);
+
+		assert.deepStrictEqual(result, [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel(`InsertedOriginal:4`), originalCellIndex: 4,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel(`InsertedModified:2`),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel(`InsertedOriginal:5`), originalCellIndex: 5,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel(`InsertedModified:3`),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 6,
+				modifiedCellIndex: 4, modifiedModel: createModifiedModel('5'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 7,
+				modifiedCellIndex: 5, modifiedModel: createModifiedModel('1'),
+			},
+		]);
+	});
+	test('Delete a cell from an unchanged notebook', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+			},
+		];
+
+		const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([0, 1, []],
+			cellsDiffInfo, 2, 2, applyEdits, createModifiedCellDiffInfo);
+
+		assert.deepStrictEqual(result, [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('1'),
+			},
+		]);
+	});
+	test('Delete last cell from an unchanged notebook', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+			},
+		];
+
+		const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([1, 1, []],
+			cellsDiffInfo, 2, 2, applyEdits, createModifiedCellDiffInfo);
+
+		assert.deepStrictEqual(result, [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+		]);
+	});
+	test('Delete a new cell from a notebook with 3 cells deleted', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('5'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
+			},
+		];
+
+		const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([1, 1, [
+			// createICell(CellKind.Code, 'print("Hello World")')
+		]],
+			cellsDiffInfo, 4, 6, applyEdits, createModifiedCellDiffInfo);
+
+		assert.deepStrictEqual(result, [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('5'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+			},
+		]);
+	});
+	test('Delete 2 cells from a notebook with 3 cells deleted', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('5'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
+			},
+		];
+
+		const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([1, 2, [
+		]],
+			cellsDiffInfo, 4, 6, applyEdits, createModifiedCellDiffInfo);
+
+		assert.deepStrictEqual(result, [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 4,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+			},
+		]);
+	});
+	test('Delete 3 cells from a notebook with 3 cells deleted', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'modified', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 4,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('New1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('5'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('6'), originalCellIndex: 6,
+				modifiedCellIndex: 4, modifiedModel: createModifiedModel('6'),
+			},
+		];
+
+		const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([1, 3, [
+		]],
+			cellsDiffInfo, 5, 7, applyEdits, createModifiedCellDiffInfo);
+
+		assert.deepStrictEqual(result, [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('6'), originalCellIndex: 4,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('6'),
+			},
+		]);
+	});
+});
+
+suite('ChatEditingModifiedNotebookEntry Cell Movements', function () {
+
+	const keep = () => Promise.resolve(true);
+	const undo = () => Promise.resolve(true);
+	const diff = observableValue('cell1', nullDocumentDiff);
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+	function createModifiedModel(id: string): ObservablePromise<ITextModel> {
+		return `Modified:${id}` as any;
+
+	}
+	function createOriginalModel(id: string): ObservablePromise<ITextModel> {
+		return `Original:${id}` as any;
+
+	}
+	test('Swap first two inserted cells in a previously empty notebook', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+			}
+		];
+		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+			cells: [], kind: NotebookCellsChangeType.Move,
+			index: 0, length: 1, newIdx: 1
+		}, cellsDiffInfo);
+
+		assert.ok(result);
+		assert.strictEqual(result[1].length, 0);
+		assert.deepStrictEqual(result[0], [
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('1'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+			},
+		]);
+	});
+	test('Swap first two inserted cells in a notebook that had 2 cells', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
+			}
+		];
+		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+			cells: [], kind: NotebookCellsChangeType.Move,
+			index: 0, length: 1, newIdx: 1
+		}, cellsDiffInfo);
+
+		assert.ok(result);
+		assert.strictEqual(result[1].length, 0);
+		assert.deepStrictEqual(result[0], [
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('1'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
+			}
+		]);
+	});
+	test('Move first inserted cell to the very bottom of notebook that had 2 cells', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
+			}
+		];
+		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+			cells: [], kind: NotebookCellsChangeType.Move,
+			index: 0, length: 1, newIdx: 3
+		}, cellsDiffInfo);
+
+		assert.ok(result);
+		assert.strictEqual(result[1].length, 0);
+		assert.deepStrictEqual(result[0], [
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('2'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('3'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('0'),
+			},
+		]);
+	});
+	test('Move last cell to top of notebook after 2 cells were inserted', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
+			}
+		];
+		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+			cells: [], kind: NotebookCellsChangeType.Move,
+			index: 3, length: 1, newIdx: 0
+		}, cellsDiffInfo);
+
+		assert.ok(result);
+		assert.deepStrictEqual(result[1], [
+			{
+				editType: CellEditType.Move,
+				index: 1,
+				length: 1,
+				newIdx: 0
+			}
+		]);
+		assert.deepStrictEqual(result[0], [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('3'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 1,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('2'),
+			},
+		]);
+	});
+
+	test('Move second inserted cell to the very bottom of notebook that had 2 cells', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
+			}
+		];
+		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+			cells: [], kind: NotebookCellsChangeType.Move,
+			index: 1, length: 1, newIdx: 3
+		}, cellsDiffInfo);
+
+		assert.ok(result);
+		assert.strictEqual(result[1].length, 0);
+		assert.deepStrictEqual(result[0], [
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('2'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('3'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
+			},
+		]);
+	});
+	test('Move second inserted cell to the second last position of notebook that had 2 cells', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
+			}
+		];
+		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+			cells: [], kind: NotebookCellsChangeType.Move,
+			index: 1, length: 1, newIdx: 2
+		}, cellsDiffInfo);
+
+		assert.ok(result);
+		assert.strictEqual(result[1].length, 0);
+		assert.deepStrictEqual(result[0], [
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('2'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
+			}
+		]);
+	});
+	test('Move first cell to the last position of notebook that had 3 cells deleted from the middle', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 4,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+			},
+		];
+		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+			cells: [], kind: NotebookCellsChangeType.Move,
+			index: 0, length: 1, newIdx: 2
+		}, cellsDiffInfo);
+
+		assert.ok(result);
+		assert.deepStrictEqual(result[1], [
+			{
+				editType: CellEditType.Move,
+				index: 0,
+				length: 1,
+				newIdx: 5
+			}
+		]);
+		assert.deepStrictEqual(result[0], [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('1'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('2'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 5,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('0'),
+			},
+		]);
+	});
+	test('Move second cell to the last position of notebook that had 3 cells deleted from the middle', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 4,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+			},
+		];
+		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+			cells: [], kind: NotebookCellsChangeType.Move,
+			index: 1, length: 1, newIdx: 2
+		}, cellsDiffInfo);
+
+		assert.ok(result);
+		assert.deepStrictEqual(result[1], [
+			{
+				editType: CellEditType.Move,
+				index: 1,
+				length: 1,
+				newIdx: 5
+			}
+		]);
+		assert.deepStrictEqual(result[0], [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('2'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+			},
+		]);
+	});
+
+	test('Move second cell to the last position of notebook that had 3 cells deleted from middle and 1 inserted in the middle', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 4,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('New1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('5'),
+			},
+		];
+		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+			cells: [], kind: NotebookCellsChangeType.Move,
+			index: 1, length: 1, newIdx: 3
+		}, cellsDiffInfo);
+
+		assert.ok(result);
+		assert.deepStrictEqual(result[1], [
+			{
+				editType: CellEditType.Move,
+				index: 1,
+				length: 1,
+				newIdx: 5
+			}
+		]);
+		assert.deepStrictEqual(result[0], [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('5'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
+			},
+		]);
+	});
+	test('Move last cell to the second position of notebook that had 3 cells deleted from middle and 1 inserted in the middle', async function () {
+		const cellsDiffInfo: ICellDiffInfo[] = [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 4,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('New1'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('5'),
+			},
+		];
+		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+			cells: [], kind: NotebookCellsChangeType.Move,
+			index: 3, length: 1, newIdx: 1
+		}, cellsDiffInfo);
+
+		assert.ok(result);
+		assert.deepStrictEqual(result[1], [
+			{
+				editType: CellEditType.Move,
+				index: 5,
+				length: 1,
+				newIdx: 1
+			}
+		]);
+		assert.deepStrictEqual(result[0], [
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 1,
+				modifiedCellIndex: 1, modifiedModel: createModifiedModel('5'),
+			},
+			{
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 2,
+				modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 3,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 4,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 5,
+				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+			},
+			{
+				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+				modifiedCellIndex: 3, modifiedModel: createModifiedModel('New1'),
+			},
+		]);
+	});
+});

From 56a04994d4188beadc5f7b64eb8b30befbca6cec Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Tue, 4 Mar 2025 11:18:37 +0100
Subject: [PATCH 0598/1815] fix #241886 (#242541)

---
 .../markers/browser/markersTreeViewer.ts      |  1 -
 .../contrib/update/browser/update.ts          |  8 ++-
 .../browser/userDataProfilesEditor.ts         | 31 +++++---
 .../browser/userDataProfilesEditorModel.ts    | 32 +++++----
 .../browser/userDataSync.contribution.ts      | 20 ++++--
 .../userDataSync/browser/userDataSync.ts      | 70 +++++++++++++++----
 .../userDataSync/browser/userDataSyncViews.ts |  8 ++-
 7 files changed, 123 insertions(+), 47 deletions(-)

diff --git a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
index cce84bf3c89c..609416de96aa 100644
--- a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
@@ -648,7 +648,6 @@ export class MarkerViewModel extends Disposable {
 		return codeActions.validActions.map(item => toAction({
 			id: item.action.command ? item.action.command.id : item.action.title,
 			label: item.action.title,
-			enabled: true,
 			run: async () => {
 				await this.openFileAtMarker(this.marker);
 				return await this.instantiationService.invokeFunction(applyCodeAction, item, ApplyCodeActionReason.FromProblemsView);
diff --git a/src/vs/workbench/contrib/update/browser/update.ts b/src/vs/workbench/contrib/update/browser/update.ts
index fd3452f5f02d..3def92a93365 100644
--- a/src/vs/workbench/contrib/update/browser/update.ts
+++ b/src/vs/workbench/contrib/update/browser/update.ts
@@ -29,7 +29,7 @@ import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys
 import { Promises } from '../../../../base/common/async.js';
 import { IUserDataSyncWorkbenchService } from '../../../services/userDataSync/common/userDataSync.js';
 import { Event } from '../../../../base/common/event.js';
-import { Action } from '../../../../base/common/actions.js';
+import { toAction } from '../../../../base/common/actions.js';
 
 export const CONTEXT_UPDATE_STATE = new RawContextKey<string>('updateState', StateType.Uninitialized);
 export const MAJOR_MINOR_UPDATE_AVAILABLE = new RawContextKey<boolean>('majorMinorUpdateAvailable', false);
@@ -215,8 +215,10 @@ export class UpdateContribution extends Disposable implements IWorkbenchContribu
 						message: nls.localize('update service disabled', "Updates are disabled because you are running the user-scope installation of {0} as Administrator.", this.productService.nameLong),
 						actions: {
 							primary: [
-								new Action('', nls.localize('learn more', "Learn More"), undefined, undefined, () => {
-									this.openerService.open('https://aka.ms/vscode-windows-setup');
+								toAction({
+									id: '',
+									label: nls.localize('learn more', "Learn More"),
+									run: () => this.openerService.open('https://aka.ms/vscode-windows-setup')
 								})
 							]
 						},
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
index c4a03276d860..f4127ee477f6 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
@@ -5,7 +5,7 @@
 
 import './media/userDataProfilesEditor.css';
 import { $, addDisposableListener, append, clearNode, Dimension, EventHelper, EventType, IDomPosition, trackFocus } from '../../../../base/browser/dom.js';
-import { Action, IAction, IActionChangeEvent, Separator, SubmenuAction } from '../../../../base/common/actions.js';
+import { Action, IAction, IActionChangeEvent, Separator, SubmenuAction, toAction } from '../../../../base/common/actions.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { localize } from '../../../../nls.js';
@@ -225,7 +225,11 @@ export class UserDataProfilesEditor extends EditorPane implements IUserDataProfi
 						actions.push(new SubmenuAction('from.template', localize('from template', "From Template"), this.getCreateFromTemplateActions()));
 						actions.push(new Separator());
 					}
-					actions.push(new Action('importProfile', localize('importProfile', "Import Profile..."), undefined, true, () => this.importProfile()));
+					actions.push(toAction({
+						id: 'importProfile',
+						label: localize('importProfile', "Import Profile..."),
+						run: () => this.importProfile()
+					}));
 					return actions;
 				}
 			},
@@ -240,12 +244,11 @@ export class UserDataProfilesEditor extends EditorPane implements IUserDataProfi
 
 	private getCreateFromTemplateActions(): IAction[] {
 		return this.templates.map(template =>
-			new Action(
-				`template:${template.url}`,
-				template.name,
-				undefined,
-				true,
-				() => this.createNewProfile(URI.parse(template.url))));
+			toAction({
+				id: `template:${template.url}`,
+				label: template.name,
+				run: () => this.createNewProfile(URI.parse(template.url))
+			}));
 	}
 
 	private registerListeners(): void {
@@ -282,13 +285,21 @@ export class UserDataProfilesEditor extends EditorPane implements IUserDataProfi
 
 	private getTreeContextMenuActions(): IAction[] {
 		const actions: IAction[] = [];
-		actions.push(new Action('newProfile', localize('newProfile', "New Profile"), undefined, true, () => this.createNewProfile()));
+		actions.push(toAction({
+			id: 'newProfile',
+			label: localize('newProfile', "New Profile"),
+			run: () => this.createNewProfile()
+		}));
 		const templateActions = this.getCreateFromTemplateActions();
 		if (templateActions.length) {
 			actions.push(new SubmenuAction('from.template', localize('new from template', "New Profile From Template"), templateActions));
 		}
 		actions.push(new Separator());
-		actions.push(new Action('importProfile', localize('importProfile', "Import Profile..."), undefined, true, () => this.importProfile()));
+		actions.push(toAction({
+			id: 'importProfile',
+			label: localize('importProfile', "Import Profile..."),
+			run: () => this.importProfile()
+		}));
 		return actions;
 	}
 
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditorModel.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditorModel.ts
index 6cd4321ee424..5ef8a898c175 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditorModel.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditorModel.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action, IAction, Separator } from '../../../../base/common/actions.js';
+import { Action, IAction, Separator, toAction } from '../../../../base/common/actions.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { localize } from '../../../../nls.js';
@@ -262,11 +262,12 @@ export abstract class AbstractUserDataProfileElement extends Disposable {
 					checkbox: undefined,
 					resourceType: r,
 					openAction: children.length
-						? new Action('_open',
-							localize('open', "Open to the Side"),
-							ThemeIcon.asClassName(Codicon.goToFile),
-							true,
-							() => children[0]?.openAction?.run())
+						? toAction({
+							id: '_open',
+							label: localize('open', "Open to the Side"),
+							class: ThemeIcon.asClassName(Codicon.goToFile),
+							run: () => children[0]?.openAction?.run()
+						})
 						: undefined
 				};
 			}));
@@ -309,11 +310,16 @@ export abstract class AbstractUserDataProfileElement extends Disposable {
 			description: isString(child.description) ? child.description : undefined,
 			resource: URI.revive(child.resourceUri),
 			icon: child.themeIcon,
-			openAction: new Action('_openChild', localize('open', "Open to the Side"), ThemeIcon.asClassName(Codicon.goToFile), true, async () => {
-				if (child.parent.type === ProfileResourceType.Extensions) {
-					await this.commandService.executeCommand('extension.open', child.handle, undefined, true, undefined, true);
-				} else if (child.resourceUri) {
-					await this.commandService.executeCommand(API_OPEN_EDITOR_COMMAND_ID, child.resourceUri, [SIDE_GROUP], undefined);
+			openAction: toAction({
+				id: '_openChild',
+				label: localize('open', "Open to the Side"),
+				class: ThemeIcon.asClassName(Codicon.goToFile),
+				run: async () => {
+					if (child.parent.type === ProfileResourceType.Extensions) {
+						await this.commandService.executeCommand('extension.open', child.handle, undefined, true, undefined, true);
+					} else if (child.resourceUri) {
+						await this.commandService.executeCommand(API_OPEN_EDITOR_COMMAND_ID, child.resourceUri, [SIDE_GROUP], undefined);
+					}
 				}
 			}),
 			actions: {
@@ -1036,13 +1042,13 @@ export class UserDataProfilesEditorModel extends EditorModel {
 			));
 			primaryActions.push(createAction);
 			if (isWeb && copyFrom instanceof URI && isProfileURL(copyFrom)) {
-				primaryActions.push(new Action(
+				primaryActions.push(disposables.add(new Action(
 					'userDataProfile.createInDesktop',
 					localize('import in desktop', "Create in {0}", this.productService.nameLong),
 					undefined,
 					true,
 					() => this.openerService.open(copyFrom, { openExternal: true })
-				));
+				)));
 			}
 			const cancelAction = disposables.add(new Action(
 				'userDataProfile.cancel',
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts
index 3da71ce186d9..10d8716cd839 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.ts
@@ -13,7 +13,7 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import { localize } from '../../../../nls.js';
 import { isWeb } from '../../../../base/common/platform.js';
 import { UserDataSyncTrigger } from './userDataSyncTrigger.js';
-import { Action } from '../../../../base/common/actions.js';
+import { toAction } from '../../../../base/common/actions.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IHostService } from '../../../services/host/browser/host.js';
@@ -42,8 +42,16 @@ class UserDataSyncReportIssueContribution extends Disposable implements IWorkben
 					message,
 					actions: {
 						primary: [
-							new Action('Show Sync Logs', localize('show sync logs', "Show Log"), undefined, true, () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)),
-							new Action('Restart', isWeb ? localize('reload', "Reload") : localize('restart', "Restart"), undefined, true, () => this.hostService.restart())
+							toAction({
+								id: 'Show Sync Logs',
+								label: localize('show sync logs', "Show Log"),
+								run: () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)
+							}),
+							toAction({
+								id: 'Restart',
+								label: isWeb ? localize('reload', "Reload") : localize('restart', "Restart"),
+								run: () => this.hostService.restart()
+							})
 						]
 					}
 				});
@@ -58,7 +66,11 @@ class UserDataSyncReportIssueContribution extends Disposable implements IWorkben
 					source: error.operationId ? localize('settings sync', "Settings Sync. Operation Id: {0}", error.operationId) : undefined,
 					actions: {
 						primary: [
-							new Action('Show Sync Logs', localize('show sync logs', "Show Log"), undefined, true, () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)),
+							toAction({
+								id: 'Show Sync Logs',
+								label: localize('show sync logs', "Show Log"),
+								run: () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)
+							})
 						]
 					}
 				});
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
index 8f2a4d379fae..43279e692769 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action } from '../../../../base/common/actions.js';
+import { toAction } from '../../../../base/common/actions.js';
 import { getErrorMessage, isCancellationError } from '../../../../base/common/errors.js';
 import { Event } from '../../../../base/common/event.js';
 import { Disposable, DisposableStore, MutableDisposable, toDisposable, IDisposable } from '../../../../base/common/lifecycle.js';
@@ -249,7 +249,11 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					severity: Severity.Info,
 					message: localize('session expired', "Settings sync was turned off because current session is expired, please sign in again to turn on sync."),
 					actions: {
-						primary: [new Action('turn on sync', localize('turn on sync', "Turn on Settings Sync..."), undefined, true, () => this.turnOn())]
+						primary: [toAction({
+							id: 'turn on sync',
+							label: localize('turn on sync', "Turn on Settings Sync..."),
+							run: () => this.turnOn()
+						})]
 					}
 				});
 				break;
@@ -258,7 +262,11 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					severity: Severity.Info,
 					message: localize('turned off', "Settings sync was turned off from another device, please turn on sync again."),
 					actions: {
-						primary: [new Action('turn on sync', localize('turn on sync', "Turn on Settings Sync..."), undefined, true, () => this.turnOn())]
+						primary: [toAction({
+							id: 'turn on sync',
+							label: localize('turn on sync', "Turn on Settings Sync..."),
+							run: () => this.turnOn()
+						})]
 					}
 				});
 				break;
@@ -292,8 +300,16 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					message: operationId ? `${message} ${operationId}` : message,
 					actions: {
 						primary: [
-							new Action('Show Sync Logs', localize('show sync logs', "Show Log"), undefined, true, () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)),
-							new Action('Report Issue', localize('report issue', "Report Issue"), undefined, true, () => this.workbenchIssueService.openReporter())
+							toAction({
+								id: 'Show Sync Logs',
+								label: localize('show sync logs', "Show Log"),
+								run: () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)
+							}),
+							toAction({
+								id: 'Report Issue',
+								label: localize('report issue', "Report Issue"),
+								run: () => this.workbenchIssueService.openReporter()
+							})
 						]
 					}
 				});
@@ -305,8 +321,16 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 					message: localize('error reset required', "Settings sync is disabled because your data in the cloud is older than that of the client. Please clear your data in the cloud before turning on sync."),
 					actions: {
 						primary: [
-							new Action('reset', localize('reset', "Clear Data in Cloud..."), undefined, true, () => this.userDataSyncWorkbenchService.resetSyncedData()),
-							new Action('show synced data', localize('show synced data action', "Show Synced Data"), undefined, true, () => this.userDataSyncWorkbenchService.showSyncActivity())
+							toAction({
+								id: 'reset',
+								label: localize('reset', "Clear Data in Cloud..."),
+								run: () => this.userDataSyncWorkbenchService.resetSyncedData()
+							}),
+							toAction({
+								id: 'show synced data',
+								label: localize('show synced data action', "Show Synced Data"),
+								run: () => this.userDataSyncWorkbenchService.showSyncActivity()
+							})
 						]
 					}
 				});
@@ -337,7 +361,11 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 						severity: Severity.Info,
 						message: localize('service changed and turned off', "Settings sync was turned off because {0} now uses a separate service. Please turn on sync again.", this.productService.nameLong),
 						actions: {
-							primary: [new Action('turn on sync', localize('turn on sync', "Turn on Settings Sync..."), undefined, true, () => this.turnOn())]
+							primary: [toAction({
+								id: 'turn on sync',
+								label: localize('turn on sync', "Turn on Settings Sync..."),
+								run: () => this.turnOn()
+							})]
 						}
 					});
 				}
@@ -351,8 +379,11 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 			severity: Severity.Error,
 			message: operationId ? `${message} ${operationId}` : message,
 			actions: {
-				primary: [new Action('open sync file', localize('open file', "Open {0} File", getSyncAreaLabel(resource)), undefined, true,
-					() => resource === SyncResource.Settings ? this.preferencesService.openUserSettings({ jsonEditor: true }) : this.preferencesService.openGlobalKeybindingSettings(true))]
+				primary: [toAction({
+					id: 'open sync file',
+					label: localize('open file', "Open {0} File", getSyncAreaLabel(resource)),
+					run: () => resource === SyncResource.Settings ? this.preferencesService.openUserSettings({ jsonEditor: true }) : this.preferencesService.openGlobalKeybindingSettings(true)
+				})]
 			}
 		});
 	}
@@ -408,8 +439,11 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 			severity: Severity.Error,
 			message: localize('errorInvalidConfiguration', "Unable to sync {0} because the content in the file is not valid. Please open the file and correct it.", errorArea.toLowerCase()),
 			actions: {
-				primary: [new Action('open sync file', localize('open file', "Open {0} File", errorArea), undefined, true,
-					() => source === SyncResource.Settings ? this.preferencesService.openUserSettings({ jsonEditor: true }) : this.preferencesService.openGlobalKeybindingSettings(true))]
+				primary: [toAction({
+					id: 'open sync file',
+					label: localize('open file', "Open {0} File", errorArea),
+					run: () => source === SyncResource.Settings ? this.preferencesService.openUserSettings({ jsonEditor: true }) : this.preferencesService.openGlobalKeybindingSettings(true)
+				})]
 			}
 		});
 		this.invalidContentErrorDisposables.set(key, toDisposable(() => {
@@ -494,8 +528,16 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 							message: localize('error reset required while starting sync', "Settings sync cannot be turned on because your data in the cloud is older than that of the client. Please clear your data in the cloud before turning on sync."),
 							actions: {
 								primary: [
-									new Action('reset', localize('reset', "Clear Data in Cloud..."), undefined, true, () => this.userDataSyncWorkbenchService.resetSyncedData()),
-									new Action('show synced data', localize('show synced data action', "Show Synced Data"), undefined, true, () => this.userDataSyncWorkbenchService.showSyncActivity())
+									toAction({
+										id: 'reset',
+										label: localize('reset', "Clear Data in Cloud..."),
+										run: () => this.userDataSyncWorkbenchService.resetSyncedData()
+									}),
+									toAction({
+										id: 'show synced data',
+										label: localize('show synced data action', "Show Synced Data"),
+										run: () => this.userDataSyncWorkbenchService.showSyncActivity()
+									})
 								]
 							}
 						});
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
index 8ced2a6fa5df..eb5f2a8eb147 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
@@ -20,7 +20,7 @@ import { IDialogService, IFileDialogService } from '../../../../platform/dialogs
 import { Event } from '../../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { Action } from '../../../../base/common/actions.js';
+import { toAction } from '../../../../base/common/actions.js';
 import { IUserDataSyncWorkbenchService, CONTEXT_SYNC_STATE, getSyncAreaLabel, CONTEXT_ACCOUNT_STATE, AccountStatus, CONTEXT_ENABLE_ACTIVITY_VIEWS, SYNC_TITLE, SYNC_CONFLICTS_VIEW_ID, CONTEXT_ENABLE_SYNC_CONFLICTS_VIEW, CONTEXT_HAS_CONFLICTS } from '../../../services/userDataSync/common/userDataSync.js';
 import { IUserDataSyncMachinesService, IUserDataSyncMachine, isWebPlatform } from '../../../../platform/userDataSync/common/userDataSyncMachines.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
@@ -380,7 +380,11 @@ abstract class UserDataSyncActivityViewDataProvider<T = Profile> implements ITre
 					message: error.message,
 					actions: {
 						primary: [
-							new Action('reset', localize('reset', "Reset Synced Data"), undefined, true, () => this.userDataSyncWorkbenchService.resetSyncedData()),
+							toAction({
+								id: 'reset',
+								label: localize('reset', "Reset Synced Data"),
+								run: () => this.userDataSyncWorkbenchService.resetSyncedData()
+							}),
 						]
 					}
 				});

From e4e03ebce9711b3f89d7b0c7c59b3551e4c51081 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Tue, 4 Mar 2025 12:16:09 +0100
Subject: [PATCH 0599/1815] Git - fix data shape issue for the merge base
 (#242544)

---
 extensions/git/src/historyProvider.ts | 2 +-
 extensions/git/src/repository.ts      | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/extensions/git/src/historyProvider.ts b/extensions/git/src/historyProvider.ts
index db316c81d0b3..8e5a8f9d2f14 100644
--- a/extensions/git/src/historyProvider.ts
+++ b/extensions/git/src/historyProvider.ts
@@ -163,7 +163,7 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 						// Compute base if the branch has changed
 						const mergeBase = await this.resolveHEADMergeBase();
 
-						this._currentHistoryItemBaseRef = mergeBase &&
+						this._currentHistoryItemBaseRef = mergeBase && mergeBase.name && mergeBase.remote &&
 							(mergeBase.remote !== this.repository.HEAD.upstream?.remote ||
 								mergeBase.name !== this.repository.HEAD.upstream?.name) ? {
 							id: `refs/remotes/${mergeBase.remote}/${mergeBase.name}`,
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index d483d9b1766f..6185ce6f6018 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -1533,7 +1533,11 @@ export class Repository implements Disposable {
 		try {
 			const mergeBase = await this.getConfig(mergeBaseConfigKey);
 			const branchFromConfig = mergeBase !== '' ? await this.getBranch(mergeBase) : undefined;
-			if (branchFromConfig) {
+
+			// There was a brief period of time when we would consider local branches as a valid
+			// merge base. Since then we have fixed the issue and only remote branches can be used
+			// as a merge base so we are adding an additional check.
+			if (branchFromConfig && branchFromConfig.remote) {
 				return branchFromConfig;
 			}
 		} catch (err) { }

From f64aa5122e5fb6efa9d8dedae364a5c143c08e7d Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Tue, 4 Mar 2025 12:50:05 +0100
Subject: [PATCH 0600/1815] Comments panel appears without having GHPR
 installed (#242550)

Fixes #241832
---
 .../api/browser/mainThreadComments.ts         | 20 +++++++++++--------
 .../comments/browser/commentService.ts        | 14 +++++++++++++
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadComments.ts b/src/vs/workbench/api/browser/mainThreadComments.ts
index 5e7d48721cef..35799eeb566a 100644
--- a/src/vs/workbench/api/browser/mainThreadComments.ts
+++ b/src/vs/workbench/api/browser/mainThreadComments.ts
@@ -577,11 +577,14 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 		this._commentService.registerCommentController(providerId, provider);
 		this._commentControllers.set(handle, provider);
 
-		const commentsPanelAlreadyConstructed = !!this._viewDescriptorService.getViewDescriptorById(COMMENTS_VIEW_ID);
-		if (!commentsPanelAlreadyConstructed) {
-			this.registerView(commentsPanelAlreadyConstructed);
-		}
-		this.registerViewListeners(commentsPanelAlreadyConstructed);
+		this._register(this._commentService.onResourceHasCommentingRanges(e => {
+			this.registerView();
+		}));
+
+		this._register(this._commentService.onDidUpdateCommentThreads(e => {
+			this.registerView();
+		}));
+
 		this._commentService.setWorkspaceComments(String(handle), []);
 	}
 
@@ -693,8 +696,9 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 		thread.collapsibleState = languages.CommentThreadCollapsibleState.Collapsed;
 	}
 
-	private registerView(commentsViewAlreadyRegistered: boolean) {
-		if (!commentsViewAlreadyRegistered) {
+	private registerView() {
+		const commentsPanelAlreadyConstructed = !!this._viewDescriptorService.getViewDescriptorById(COMMENTS_VIEW_ID);
+		if (!commentsPanelAlreadyConstructed) {
 			const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({
 				id: COMMENTS_VIEW_ID,
 				title: COMMENTS_VIEW_TITLE,
@@ -717,6 +721,7 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 				}
 			}], VIEW_CONTAINER);
 		}
+		this.registerViewListeners(commentsPanelAlreadyConstructed);
 	}
 
 	private setComments() {
@@ -737,7 +742,6 @@ export class MainThreadComments extends Disposable implements MainThreadComments
 					this.setComments();
 					if (this._openViewListener) {
 						this._openViewListener.dispose();
-						this._openViewListener = null;
 					}
 				}
 			});
diff --git a/src/vs/workbench/contrib/comments/browser/commentService.ts b/src/vs/workbench/contrib/comments/browser/commentService.ts
index 309745ca99d2..550288cb0de9 100644
--- a/src/vs/workbench/contrib/comments/browser/commentService.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentService.ts
@@ -22,6 +22,7 @@ import { CommentContextKeys } from '../common/commentContextKeys.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { CommentsModel, ICommentsModel } from './commentsModel.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
+import { Schemas } from '../../../../base/common/network.js';
 
 export const ICommentService = createDecorator<ICommentService>('commentService');
 
@@ -90,6 +91,7 @@ export interface ICommentService {
 	readonly onDidSetDataProvider: Event<void>;
 	readonly onDidDeleteDataProvider: Event<string | undefined>;
 	readonly onDidChangeCommentingEnabled: Event<boolean>;
+	readonly onResourceHasCommentingRanges: Event<void>;
 	readonly isCommentingEnabled: boolean;
 	readonly commentsModel: ICommentsModel;
 	readonly lastActiveCommentcontroller: ICommentController | undefined;
@@ -154,6 +156,9 @@ export class CommentService extends Disposable implements ICommentService {
 	private readonly _onDidChangeCommentingEnabled = this._register(new Emitter<boolean>());
 	readonly onDidChangeCommentingEnabled = this._onDidChangeCommentingEnabled.event;
 
+	private readonly _onResourceHasCommentingRanges = this._register(new Emitter<void>());
+	readonly onResourceHasCommentingRanges = this._onResourceHasCommentingRanges.event;
+
 	private readonly _onDidChangeActiveCommentingRange: Emitter<{
 		range: Range; commentingRangesInfo:
 		CommentingRanges;
@@ -232,6 +237,10 @@ export class CommentService extends Disposable implements ICommentService {
 		}));
 
 		this._register(this.modelService.onModelAdded(model => {
+			// Excluded schemes
+			if ((model.uri.scheme === Schemas.vscodeSourceControl)) {
+				return;
+			}
 			// Allows comment providers to cause their commenting ranges to be prefetched by opening text documents in the background.
 			if (!this._commentingRangeResources.has(model.uri.toString())) {
 				this.getDocumentComments(model.uri);
@@ -240,11 +249,16 @@ export class CommentService extends Disposable implements ICommentService {
 	}
 
 	private _updateResourcesWithCommentingRanges(resource: URI, commentInfos: (ICommentInfo | null)[]) {
+		let addedResources = false;
 		for (const comments of commentInfos) {
 			if (comments && (comments.commentingRanges.ranges.length > 0 || comments.threads.length > 0)) {
 				this._commentingRangeResources.add(resource.toString());
+				addedResources = true;
 			}
 		}
+		if (addedResources) {
+			this._onResourceHasCommentingRanges.fire();
+		}
 	}
 
 	private _handleConfiguration() {

From 56e32199a149c57e60382a7600d1e2aef2f1d573 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 4 Mar 2025 12:53:39 +0100
Subject: [PATCH 0601/1815] chat - better flow from status when signed out
 (#242548) (#242551)

---
 .../contrib/chat/browser/chatSetup.ts         | 10 ++------
 .../contrib/chat/browser/chatStatus.ts        | 24 ++++++++++++++-----
 .../chat/common/chatEntitlementService.ts     | 18 ++++++++++++--
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index c0c4a49447e8..7189ecfdf0b8 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -35,7 +35,7 @@ import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultS
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
 import { IActivityService, ProgressBadge } from '../../../services/activity/common/activity.js';
-import { AuthenticationSession, IAuthenticationExtensionsService, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
+import { AuthenticationSession, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
 import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
@@ -325,7 +325,6 @@ class ChatSetupController extends Disposable {
 		private readonly requests: ChatSetupRequests,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
-		@IAuthenticationExtensionsService private readonly authenticationExtensionsService: IAuthenticationExtensionsService,
 		@IViewsService private readonly viewsService: IViewsService,
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IProductService private readonly productService: IProductService,
@@ -431,12 +430,7 @@ class ChatSetupController extends Disposable {
 		try {
 			showCopilotView(this.viewsService, this.layoutService);
 
-			session = await this.authenticationService.createSession(providerId, defaultChat.providerScopes[0]);
-
-			this.authenticationExtensionsService.updateAccountPreference(defaultChat.extensionId, providerId, session.account);
-			this.authenticationExtensionsService.updateAccountPreference(defaultChat.chatExtensionId, providerId, session.account);
-
-			entitlements = await this.requests.forceResolveEntitlement(session);
+			({ session, entitlements } = await this.requests.signIn());
 		} catch (e) {
 			this.logService.error(`[chat setup] signIn: error ${e}`);
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index ced0ce0fd3ea..f50bf3164f3b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -15,14 +15,14 @@ import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowToolti
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { quotaToButtonMessage, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, TOGGLE_CHAT_ACTION_ID, CHAT_OPEN_ACTION_ID } from './actions/chatActions.js';
 import { $, addDisposableListener, append, clearNode, EventHelper, EventLike, EventType } from '../../../../base/browser/dom.js';
-import { ChatEntitlement, IChatEntitlementService } from '../common/chatEntitlementService.js';
+import { ChatEntitlement, ChatEntitlementService, IChatEntitlementService } from '../common/chatEntitlementService.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { defaultCheckboxStyles, defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { Checkbox } from '../../../../base/browser/ui/toggle/toggle.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { Command } from '../../../../editor/common/languages.js';
-import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { CommandsRegistry, 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 } from '../../../../platform/hover/browser/hover.js';
@@ -98,13 +98,15 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 	private static readonly SETTING = 'chat.experimental.statusIndicator.enabled';
 
+	private static readonly SIGN_IN_COMMAND_ID = 'workbench.action.chat.signIn';
+
 	private entry: IStatusbarEntryAccessor | undefined = undefined;
 
 	private dashboard = new Lazy<ChatStatusDashboard>(() => this.instantiationService.createInstance(ChatStatusDashboard));
 
 	constructor(
 		@IStatusbarService private readonly statusbarService: IStatusbarService,
-		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
+		@IChatEntitlementService private readonly chatEntitlementService: ChatEntitlementService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IProductService private readonly productService: IProductService,
@@ -114,6 +116,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 		this.create();
 		this.registerListeners();
+		this.registerCommands();
 	}
 
 	private async create(): Promise<void> {
@@ -148,6 +151,12 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		this._register(this.chatEntitlementService.onDidChangeEntitlement(() => this.entry?.update(this.getEntryProps())));
 	}
 
+	private registerCommands(): void {
+		CommandsRegistry.registerCommand(ChatStatusBarEntry.SIGN_IN_COMMAND_ID, () => {
+			this.chatEntitlementService.requests?.value.signIn();
+		});
+	}
+
 	private getEntryProps(): IStatusbarEntry {
 		let text = '$(copilot)';
 		let ariaLabel = localize('chatStatus', "Copilot Status");
@@ -185,10 +194,13 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 		// Signed out
 		else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
-			text = '$(copilot-not-connected)';
+			text = '$(copilot-not-connected) Sign In to Use Copilot';
 			ariaLabel = localize('signInToUseCopilot', "Sign in to Use Copilot...");
-			tooltip = localize('signInToUseCopilot', "Sign in to Use Copilot...");
-			command = TOGGLE_CHAT_ACTION_ID;
+			tooltip = {
+				element: token => this.dashboard.value.show(token)
+			};
+			command = ChatStatusBarEntry.SIGN_IN_COMMAND_ID;
+			kind = 'prominent';
 		}
 
 		// Any other User
diff --git a/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts b/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
index 2c9711944bbd..cdfdedd10653 100644
--- a/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
@@ -22,7 +22,7 @@ import { asText, IRequestService } from '../../../../platform/request/common/req
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { ITelemetryService, TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
-import { AuthenticationSession, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
+import { AuthenticationSession, IAuthenticationExtensionsService, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
 import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { IExtension, IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
 import { ChatContextKeys } from './chatContextKeys.js';
@@ -81,6 +81,7 @@ export interface IChatEntitlementService {
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
+	chatExtensionId: product.defaultChatAgent?.chatExtensionId ?? '',
 	upgradePlanUrl: product.defaultChatAgent?.upgradePlanUrl ?? '',
 	providerId: product.defaultChatAgent?.providerId ?? '',
 	enterpriseProviderId: product.defaultChatAgent?.enterpriseProviderId ?? '',
@@ -325,7 +326,8 @@ export class ChatSetupRequests extends Disposable {
 		@IRequestService private readonly requestService: IRequestService,
 		@IDialogService private readonly dialogService: IDialogService,
 		@IOpenerService private readonly openerService: IOpenerService,
-		@IConfigurationService private readonly configurationService: IConfigurationService
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IAuthenticationExtensionsService private readonly authenticationExtensionsService: IAuthenticationExtensionsService,
 	) {
 		super();
 
@@ -667,6 +669,18 @@ export class ChatSetupRequests extends Disposable {
 		});
 	}
 
+	async signIn() {
+		const providerId = ChatSetupRequests.providerId(this.configurationService);
+		const session = await this.authenticationService.createSession(providerId, defaultChat.providerScopes[0]);
+
+		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 };
+	}
+
 	override dispose(): void {
 		this.pendingResolveCts.dispose(true);
 

From f7bc839df9b60995ec730c15b2599c8ffe9df97f Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Tue, 4 Mar 2025 13:04:14 +0100
Subject: [PATCH 0602/1815] =?UTF-8?q?Git=20-=20=F0=9F=92=84=20add=20path?=
 =?UTF-8?q?=20delimiter=20when=20calling=20git=20blame=20(#242553)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extensions/git/src/git.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 3acc8c68fdc5..f5ef1b894da8 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -2222,7 +2222,7 @@ export class Repository {
 
 	async blame(path: string): Promise<string> {
 		try {
-			const args = ['blame', sanitizePath(path)];
+			const args = ['blame', '--', sanitizePath(path)];
 			const result = await this.exec(args);
 			return result.stdout.trim();
 		} catch (err) {

From d8e9c15fa3a6d0fda0fe4795fd183f29e700ef5b Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Tue, 4 Mar 2025 23:22:32 +1100
Subject: [PATCH 0603/1815] Fixes to insert/delete in nb cells when in chat
 edit (#242554)

---
 .../chatEditingModifiedNotebookEntry.ts       |  208 +-
 .../chatEditingModifiedNotebookEntry.test.ts  | 2798 +++++++++++------
 2 files changed, 1943 insertions(+), 1063 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index ad28059c6a1a..2c73b2b2a32e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -660,22 +660,11 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 
 	private undoPreviouslyInsertedCell(cell: NotebookCellTextModel) {
 		const index = this.modifiedModel.cells.indexOf(cell);
-		const diff = sortCellChanges(this._cellsDiffInfo.get()).slice().map(d => {
-			if (d.type === 'insert' && d.modifiedCellIndex === index) {
-				return d;
-			}
-			if (d.type !== 'delete' && d.modifiedCellIndex > index) {
-				return {
-					...d,
-					modifiedCellIndex: d.modifiedCellIndex - 1,
-				};
-			}
-			return d;
-		}).filter(d => !(d.type === 'insert' && d.modifiedCellIndex === index));
-		const edit: ICellReplaceEdit = { cells: [], count: 1, editType: CellEditType.Replace, index, };
-		this.modifiedModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+		const diffs = adjustCellDiffForRevertingAnInsertedCell(index,
+			this._cellsDiffInfo.get(),
+			this.modifiedModel.applyEdits.bind(this.modifiedModel));
 		this.disposeDeletedCellEntries();
-		this.updateCellDiffInfo(diff, undefined);
+		this.updateCellDiffInfo(diffs, undefined);
 	}
 
 	private keepPreviouslyInsertedCell(cell: NotebookCellTextModel) {
@@ -684,16 +673,6 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			// Not possible.
 			return;
 		}
-		// Find where we should insert this cell in the original notebook.
-		const cellDiffs = sortCellChanges(this._cellsDiffInfo.get()).slice();
-		const entryIndex = cellDiffs.findIndex(d => d.type === 'insert' && d.modifiedCellIndex === modifiedCellIndex);
-		if (entryIndex === -1) {
-			// Not possible.
-			return;
-		}
-		// Find the index in original notebook where this cell must be inserted..
-		// If there are cells before this then insert just after that else start at index 0.
-		const index = (cellDiffs.slice(0, entryIndex).reverse().find(c => typeof c.originalCellIndex === 'number')?.originalCellIndex ?? -1) + 1;
 		const cellToInsert: ICellDto2 = {
 			cellKind: cell.cellKind,
 			language: cell.language,
@@ -705,35 +684,19 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				cellId: cell.internalMetadata.cellId
 			}
 		};
-		const edit: ICellReplaceEdit = { cells: [cellToInsert], count: 0, editType: CellEditType.Replace, index, };
-		this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
 		this.cellEntryMap.get(cell.uri)?.dispose();
 		this.cellEntryMap.delete(cell.uri);
-		const unchangedCell: ICellDiffInfo = this.createModifiedCellDiffInfo(modifiedCellIndex, index);
-		cellDiffs.splice(entryIndex, 1, unchangedCell);
+		const cellDiffs = adjustCellDiffForKeepingAnInsertedCell(
+			modifiedCellIndex,
+			this._cellsDiffInfo.get().slice(),
+			cellToInsert,
+			this.originalModel.applyEdits.bind(this.originalModel),
+			this.createModifiedCellDiffInfo.bind(this)
+		);
 		this.updateCellDiffInfo(cellDiffs, undefined);
 	}
 
 	private undoPreviouslyDeletedCell(deletedOriginalIndex: number, originalCell: NotebookCellTextModel) {
-		let cellDiffs = sortCellChanges(this._cellsDiffInfo.get()).slice();
-		// Find where we should insert this cell.
-		const cellDiffInfoIndex = cellDiffs.findIndex(d => d.type === 'delete' && d.originalCellIndex === deletedOriginalIndex);
-		if (cellDiffInfoIndex === -1) {
-			return;
-		}
-		// If there are no more cells, then start at index 0, else start at the previous cell.
-		const index = (cellDiffs.slice(0, cellDiffInfoIndex).reverse().find(c => c.type !== 'delete')?.modifiedCellIndex ?? -1) + 1;
-		cellDiffs = cellDiffs
-			.map(d => {
-				if (d.type !== 'delete' && d.modifiedCellIndex >= index) {
-					return {
-						...d,
-						modifiedCellIndex: d.modifiedCellIndex + 1,
-					};
-				}
-				return d;
-			});
-
 		const cellToInsert: ICellDto2 = {
 			cellKind: originalCell.cellKind,
 			language: originalCell.language,
@@ -745,10 +708,13 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				cellId: originalCell.internalMetadata.cellId
 			}
 		};
-		const edit: ICellReplaceEdit = { cells: [cellToInsert], count: 0, editType: CellEditType.Replace, index, };
-		this.modifiedModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
-		const unchangedCell = this.createModifiedCellDiffInfo(index, deletedOriginalIndex);
-		cellDiffs.splice(cellDiffInfoIndex, 1, unchangedCell);
+		const cellDiffs = adjustCellDiffForRevertingADeletedCell(
+			deletedOriginalIndex,
+			this._cellsDiffInfo.get(),
+			cellToInsert,
+			this.modifiedModel.applyEdits.bind(this.modifiedModel),
+			this.createModifiedCellDiffInfo.bind(this)
+		);
 		this.updateCellDiffInfo(cellDiffs, undefined);
 	}
 
@@ -1242,6 +1208,128 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 	}
 }
 
+export function adjustCellDiffForKeepingADeletedCell(originalCellIndex: number,
+	cellDiffInfo: ICellDiffInfo[],
+	applyEdits: typeof NotebookTextModel.prototype.applyEdits,
+): ICellDiffInfo[] {
+	// Delete this cell from original as well.
+	const edit: ICellReplaceEdit = { cells: [], count: 1, editType: CellEditType.Replace, index: originalCellIndex, };
+	applyEdits([edit], true, undefined, () => undefined, undefined, true);
+	const diffs = sortCellChanges(cellDiffInfo)
+		.filter(d => !(d.type === 'delete' && d.originalCellIndex === originalCellIndex))
+		.map(diff => {
+			if (diff.type !== 'insert' && diff.originalCellIndex > originalCellIndex) {
+				return {
+					...diff,
+					originalCellIndex: diff.originalCellIndex - 1,
+				};
+			}
+			return diff;
+		});
+	return diffs;
+}
+
+export function adjustCellDiffForRevertingADeletedCell(originalCellIndex: number,
+	cellDiffInfo: ICellDiffInfo[],
+	cellToInsert: ICellDto2,
+	applyEdits: typeof NotebookTextModel.prototype.applyEdits,
+	createModifiedCellDiffInfo: (modifiedCellIndex: number, originalCellIndex: number) => ICellDiffInfo,
+): ICellDiffInfo[] {
+	cellDiffInfo = sortCellChanges(cellDiffInfo);
+	const indexOfEntry = cellDiffInfo.findIndex(d => d.originalCellIndex === originalCellIndex);
+	if (indexOfEntry === -1) {
+		// Not possible.
+		return cellDiffInfo;
+	}
+
+	let modifiedCellIndex = -1;
+	for (let i = 0; i < cellDiffInfo.length; i++) {
+		const diff = cellDiffInfo[i];
+		if (i < indexOfEntry) {
+			modifiedCellIndex = Math.max(modifiedCellIndex, diff.modifiedCellIndex ?? modifiedCellIndex);
+			continue;
+		}
+		if (i === indexOfEntry) {
+			const edit: ICellReplaceEdit = { cells: [cellToInsert], count: 0, editType: CellEditType.Replace, index: modifiedCellIndex + 1, };
+			applyEdits([edit], true, undefined, () => undefined, undefined, true);
+			cellDiffInfo[i] = createModifiedCellDiffInfo(modifiedCellIndex + 1, originalCellIndex);
+			continue;
+		} else {
+			// Increase the original index for all entries after this.
+			if (typeof diff.modifiedCellIndex === 'number') {
+				diff.modifiedCellIndex++;
+				cellDiffInfo[i] = { ...diff };
+			}
+		}
+	}
+
+	return cellDiffInfo;
+}
+
+export function adjustCellDiffForRevertingAnInsertedCell(modifiedCellIndex: number,
+	cellDiffInfo: ICellDiffInfo[],
+	applyEdits: typeof NotebookTextModel.prototype.applyEdits,
+): ICellDiffInfo[] {
+	if (modifiedCellIndex === -1) {
+		// Not possible.
+		return cellDiffInfo;
+	}
+	cellDiffInfo = sortCellChanges(cellDiffInfo).map(d => {
+		if (d.type === 'insert' && d.modifiedCellIndex === modifiedCellIndex) {
+			return d;
+		}
+		if (d.type !== 'delete' && d.modifiedCellIndex > modifiedCellIndex) {
+			return {
+				...d,
+				modifiedCellIndex: d.modifiedCellIndex - 1,
+			};
+		}
+		return d;
+	}).filter(d => !(d.type === 'insert' && d.modifiedCellIndex === modifiedCellIndex));
+	const edit: ICellReplaceEdit = { cells: [], count: 1, editType: CellEditType.Replace, index: modifiedCellIndex, };
+	applyEdits([edit], true, undefined, () => undefined, undefined, true);
+	return cellDiffInfo;
+}
+
+export function adjustCellDiffForKeepingAnInsertedCell(modifiedCellIndex: number,
+	cellDiffInfo: ICellDiffInfo[],
+	cellToInsert: ICellDto2,
+	applyEdits: typeof NotebookTextModel.prototype.applyEdits,
+	createModifiedCellDiffInfo: (modifiedCellIndex: number, originalCellIndex: number) => ICellDiffInfo,
+): ICellDiffInfo[] {
+	cellDiffInfo = sortCellChanges(cellDiffInfo);
+	if (modifiedCellIndex === -1) {
+		// Not possible.
+		return cellDiffInfo;
+	}
+	const indexOfEntry = cellDiffInfo.findIndex(d => d.modifiedCellIndex === modifiedCellIndex);
+	if (indexOfEntry === -1) {
+		// Not possible.
+		return cellDiffInfo;
+	}
+	let originalCellIndex = -1;
+	for (let i = 0; i < cellDiffInfo.length; i++) {
+		const diff = cellDiffInfo[i];
+		if (i < indexOfEntry) {
+			originalCellIndex = Math.max(originalCellIndex, diff.originalCellIndex ?? originalCellIndex);
+			continue;
+		}
+		if (i === indexOfEntry) {
+			const edit: ICellReplaceEdit = { cells: [cellToInsert], count: 0, editType: CellEditType.Replace, index: originalCellIndex + 1 };
+			applyEdits([edit], true, undefined, () => undefined, undefined, true);
+			cellDiffInfo[i] = createModifiedCellDiffInfo(modifiedCellIndex, originalCellIndex + 1);
+			continue;
+		} else {
+			// Increase the original index for all entries after this.
+			if (typeof diff.originalCellIndex === 'number') {
+				diff.originalCellIndex++;
+				cellDiffInfo[i] = { ...diff };
+			}
+		}
+	}
+	return cellDiffInfo;
+}
+
 export function adjustCellDiffAndOriginalModelBasedOnCellAddDelete(change: NotebookCellTextModelSplice<ICell>,
 	cellDiffInfo: ICellDiffInfo[],
 	modifiedModelCellCount: number,
@@ -1249,7 +1337,7 @@ export function adjustCellDiffAndOriginalModelBasedOnCellAddDelete(change: Noteb
 	applyEdits: typeof NotebookTextModel.prototype.applyEdits,
 	createModifiedCellDiffInfo: (modifiedCellIndex: number, originalCellIndex: number) => ICellDiffInfo,
 ): ICellDiffInfo[] {
-	cellDiffInfo = sortCellChanges(cellDiffInfo).slice();
+	cellDiffInfo = sortCellChanges(cellDiffInfo);
 	const numberOfCellsInserted = change[2].length;
 	const numberOfCellsDeleted = change[1];
 	const cells = change[2].map(cell => {
@@ -1314,6 +1402,19 @@ export function adjustCellDiffAndOriginalModelBasedOnCellAddDelete(change: Noteb
 				cellDiffInfo[i] = { ...diff };
 			}
 		}
+		if (itemsToRemove.size) {
+			Array.from(itemsToRemove)
+				.filter(diff => typeof diff.originalCellIndex === 'number')
+				.forEach(diff => {
+					const edit: ICellEditOperation = {
+						editType: CellEditType.Replace,
+						cells: [],
+						index: diff.originalCellIndex,
+						count: 1
+					};
+					applyEdits([edit], true, undefined, () => undefined, undefined, true);
+				});
+		}
 		cellDiffInfo = cellDiffInfo.filter(d => !itemsToRemove.has(d));
 	}
 
@@ -1348,6 +1449,7 @@ export function adjustCellDiffAndOriginalModelBasedOnCellAddDelete(change: Noteb
 	});
 	return cellDiffInfo;
 }
+
 /**
  * Given the movements of cells in modified notebook, adjust the ICellDiffInfo[] array
  * and generate edits for the old notebook (if required).
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts
index 17201568d182..b35621346edc 100644
--- a/src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts
@@ -5,7 +5,7 @@
 
 import assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { adjustCellDiffAndOriginalModelBasedOnCellAddDelete, adjustCellDiffAndOriginalModelBasedOnCellMovements } from '../../browser/chatEditing/chatEditingModifiedNotebookEntry.js';
+import { adjustCellDiffAndOriginalModelBasedOnCellAddDelete, adjustCellDiffAndOriginalModelBasedOnCellMovements, adjustCellDiffForKeepingADeletedCell, adjustCellDiffForKeepingAnInsertedCell, adjustCellDiffForRevertingADeletedCell, adjustCellDiffForRevertingAnInsertedCell } from '../../browser/chatEditing/chatEditingModifiedNotebookEntry.js';
 import { ICellDiffInfo } from '../../browser/chatEditing/chatEditingNotebookEditorIntegration.js';
 import { nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
 import { ObservablePromise, observableValue } from '../../../../../base/common/observable.js';
@@ -15,1023 +15,1801 @@ import { URI } from '../../../../../base/common/uri.js';
 import { hash } from '../../../../../base/common/hash.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
 
-suite('ChatEditingModifiedNotebookEntry Cell Addition', function () {
+suite('ChatEditingModifiedNotebookEntry', function () {
+	suite('Keep Inserted Cell', function () {
 
-	const keep = () => Promise.resolve(true);
-	const undo = () => Promise.resolve(true);
-	const diff = observableValue('cell1', nullDocumentDiff);
-	const appliedEdits: ICellEditOperation[] = [];
-	setup(() => {
-		appliedEdits.length = 0;
-	});
-	ensureNoDisposablesAreLeakedInTestSuite();
-	function createModifiedModel(id: string): ObservablePromise<ITextModel> {
-		return `Modified:${id}` as any;
-
-	}
-	function createOriginalModel(id: string): ObservablePromise<ITextModel> {
-		return `Original:${id}` as any;
-
-	}
-	function applyEdits(edits: ICellEditOperation[]): boolean {
-		appliedEdits.push(...edits);
-		return true;
-	}
-
-	function createICell(cellKind: CellKind, source: string): ICell {
-		const handle = hash(generateUuid());
-		return {
-			uri: URI.parse(`file:///path/${handle}`),
-			handle,
-			cellKind,
-			language: cellKind === CellKind.Markup ? 'markdown' : 'python',
-			outputs: [],
-			metadata: {},
-			getHashValue: () => {
-				return hash(`${handle}=>${cellKind}=>${source}`);
-			},
-			getValue: () => {
-				return source;
-			},
-			internalMetadata: {},
-		} as any;
-	}
-	function createModifiedCellDiffInfo(modifiedCellIndex: number, originalCellIndex: number): ICellDiffInfo {
-		return {
-			diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel(`InsertedOriginal:${originalCellIndex}`), originalCellIndex,
-			modifiedCellIndex, modifiedModel: createModifiedModel(`InsertedModified:${modifiedCellIndex}`),
-		};
-	}
-	test('Insert a new cell into an unchanged notebook', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
-			},
-		];
-
-		const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([0, 0, [createICell(CellKind.Code, 'print("Hello World")')]],
-			cellsDiffInfo, 2, 2, applyEdits, createModifiedCellDiffInfo);
-
-		assert.deepStrictEqual(result, [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel(`InsertedOriginal:0`), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel(`InsertedModified:0`),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 1,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 2,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
-			},
-		]);
-	});
-	test('Insert a new cell into an notebook with 3 cells deleted', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('5'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
-			},
-		];
-
-		const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([2, 0, [createICell(CellKind.Code, 'print("Hello World")')]],
-			cellsDiffInfo, 4, 6, applyEdits, createModifiedCellDiffInfo);
-
-		assert.deepStrictEqual(result, [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel(`InsertedOriginal:4`), originalCellIndex: 4,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel(`InsertedModified:2`),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('5'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 6,
-				modifiedCellIndex: 4, modifiedModel: createModifiedModel('1'),
-			},
-		]);
-	});
-	test('Insert 2 new cells into an notebook with 3 cells deleted', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('5'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
-			},
-		];
-
-		const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([2, 0, [createICell(CellKind.Code, 'print("Hello World")'), createICell(CellKind.Code, 'print("Foo Bar")')]],
-			cellsDiffInfo, 4, 6, applyEdits, createModifiedCellDiffInfo);
-
-		assert.deepStrictEqual(result, [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel(`InsertedOriginal:4`), originalCellIndex: 4,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel(`InsertedModified:2`),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel(`InsertedOriginal:5`), originalCellIndex: 5,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel(`InsertedModified:3`),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 6,
-				modifiedCellIndex: 4, modifiedModel: createModifiedModel('5'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 7,
-				modifiedCellIndex: 5, modifiedModel: createModifiedModel('1'),
-			},
-		]);
-	});
-	test('Delete a cell from an unchanged notebook', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
-			},
-		];
-
-		const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([0, 1, []],
-			cellsDiffInfo, 2, 2, applyEdits, createModifiedCellDiffInfo);
-
-		assert.deepStrictEqual(result, [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('1'),
-			},
-		]);
-	});
-	test('Delete last cell from an unchanged notebook', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
-			},
-		];
-
-		const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([1, 1, []],
-			cellsDiffInfo, 2, 2, applyEdits, createModifiedCellDiffInfo);
-
-		assert.deepStrictEqual(result, [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-		]);
-	});
-	test('Delete a new cell from a notebook with 3 cells deleted', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('5'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
-			},
-		];
-
-		const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([1, 1, [
-			// createICell(CellKind.Code, 'print("Hello World")')
-		]],
-			cellsDiffInfo, 4, 6, applyEdits, createModifiedCellDiffInfo);
-
-		assert.deepStrictEqual(result, [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('5'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
-			},
-		]);
-	});
-	test('Delete 2 cells from a notebook with 3 cells deleted', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('5'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
-			},
-		];
-
-		const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([1, 2, [
-		]],
-			cellsDiffInfo, 4, 6, applyEdits, createModifiedCellDiffInfo);
-
-		assert.deepStrictEqual(result, [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 4,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
-			},
-		]);
-	});
-	test('Delete 3 cells from a notebook with 3 cells deleted', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'modified', originalModel: createOriginalModel('1'), originalCellIndex: 1,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 2,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 4,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('New1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('5'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('6'), originalCellIndex: 6,
-				modifiedCellIndex: 4, modifiedModel: createModifiedModel('6'),
-			},
-		];
-
-		const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([1, 3, [
-		]],
-			cellsDiffInfo, 5, 7, applyEdits, createModifiedCellDiffInfo);
-
-		assert.deepStrictEqual(result, [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('6'), originalCellIndex: 4,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('6'),
-			},
-		]);
-	});
-});
+		const keep = () => Promise.resolve(true);
+		const undo = () => Promise.resolve(true);
+		const diff = observableValue('cell1', nullDocumentDiff);
+		const appliedEdits: ICellEditOperation[] = [];
+		setup(() => {
+			appliedEdits.length = 0;
+		});
+		ensureNoDisposablesAreLeakedInTestSuite();
+		function createModifiedModel(id: string): ObservablePromise<ITextModel> {
+			return `Modified:${id}` as any;
 
-suite('ChatEditingModifiedNotebookEntry Cell Movements', function () {
-
-	const keep = () => Promise.resolve(true);
-	const undo = () => Promise.resolve(true);
-	const diff = observableValue('cell1', nullDocumentDiff);
-
-	ensureNoDisposablesAreLeakedInTestSuite();
-	function createModifiedModel(id: string): ObservablePromise<ITextModel> {
-		return `Modified:${id}` as any;
-
-	}
-	function createOriginalModel(id: string): ObservablePromise<ITextModel> {
-		return `Original:${id}` as any;
-
-	}
-	test('Swap first two inserted cells in a previously empty notebook', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
-			}
-		];
-		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
-			cells: [], kind: NotebookCellsChangeType.Move,
-			index: 0, length: 1, newIdx: 1
-		}, cellsDiffInfo);
-
-		assert.ok(result);
-		assert.strictEqual(result[1].length, 0);
-		assert.deepStrictEqual(result[0], [
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('1'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
-			},
-		]);
-	});
-	test('Swap first two inserted cells in a notebook that had 2 cells', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
-			}
-		];
-		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
-			cells: [], kind: NotebookCellsChangeType.Move,
-			index: 0, length: 1, newIdx: 1
-		}, cellsDiffInfo);
-
-		assert.ok(result);
-		assert.strictEqual(result[1].length, 0);
-		assert.deepStrictEqual(result[0], [
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('1'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
-			}
-		]);
-	});
-	test('Move first inserted cell to the very bottom of notebook that had 2 cells', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
-			}
-		];
-		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
-			cells: [], kind: NotebookCellsChangeType.Move,
-			index: 0, length: 1, newIdx: 3
-		}, cellsDiffInfo);
-
-		assert.ok(result);
-		assert.strictEqual(result[1].length, 0);
-		assert.deepStrictEqual(result[0], [
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('2'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('3'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('0'),
-			},
-		]);
-	});
-	test('Move last cell to top of notebook after 2 cells were inserted', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
-			}
-		];
-		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
-			cells: [], kind: NotebookCellsChangeType.Move,
-			index: 3, length: 1, newIdx: 0
-		}, cellsDiffInfo);
-
-		assert.ok(result);
-		assert.deepStrictEqual(result[1], [
-			{
-				editType: CellEditType.Move,
-				index: 1,
-				length: 1,
-				newIdx: 0
-			}
-		]);
-		assert.deepStrictEqual(result[0], [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('3'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 1,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('2'),
-			},
-		]);
-	});
+		}
+		function createOriginalModel(id: string): ObservablePromise<ITextModel> {
+			return `Original:${id}` as any;
+
+		}
+		function applyEdits(edits: ICellEditOperation[]): boolean {
+			appliedEdits.push(...edits);
+			return true;
+		}
+
+		function createModifiedCellDiffInfo(modifiedCellIndex: number, originalCellIndex: number): ICellDiffInfo {
+			return {
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel(`InsertedOriginal:${originalCellIndex}`), originalCellIndex,
+				modifiedCellIndex, modifiedModel: createModifiedModel(`InsertedModified:${modifiedCellIndex}`),
+			};
+		}
+		test('Keep first inserted', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+			];
+
+			const result = adjustCellDiffForKeepingAnInsertedCell(0,
+				cellsDiffInfo, {} as any,
+				applyEdits, createModifiedCellDiffInfo);
+
+			assert.deepStrictEqual(appliedEdits, [
+				{ editType: CellEditType.Replace, index: 0, cells: [{}], count: 0 },
+			]);
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel(`InsertedOriginal:0`), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel(`InsertedModified:0`),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 1,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+			]);
+		});
+		test('Keep first inserted with multiple cells', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('2'),
+				},
+			];
+
+			const result = adjustCellDiffForKeepingAnInsertedCell(0,
+				cellsDiffInfo, {} as any,
+				applyEdits, createModifiedCellDiffInfo);
 
-	test('Move second inserted cell to the very bottom of notebook that had 2 cells', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
-			}
-		];
-		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
-			cells: [], kind: NotebookCellsChangeType.Move,
-			index: 1, length: 1, newIdx: 3
-		}, cellsDiffInfo);
-
-		assert.ok(result);
-		assert.strictEqual(result[1].length, 0);
-		assert.deepStrictEqual(result[0], [
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('2'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('3'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
-			},
-		]);
+			assert.deepStrictEqual(appliedEdits, [
+				{ editType: CellEditType.Replace, index: 0, cells: [{}], count: 0 },
+			]);
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('InsertedOriginal:0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('InsertedModified:0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 1,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 3,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('2'),
+				},
+			]);
+		});
+		test('Keep second inserted with multiple cells', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('2'),
+				},
+			];
+
+			const result = adjustCellDiffForKeepingAnInsertedCell(2,
+				cellsDiffInfo, {} as any,
+				applyEdits, createModifiedCellDiffInfo);
+
+			assert.deepStrictEqual(appliedEdits, [
+				{ editType: CellEditType.Replace, index: 2, cells: [{}], count: 0 },
+			]);
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('InsertedOriginal:2'), originalCellIndex: 2,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('InsertedModified:2'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 3,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('2'),
+				},
+			]);
+		});
 	});
-	test('Move second inserted cell to the second last position of notebook that had 2 cells', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
-			}
-		];
-		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
-			cells: [], kind: NotebookCellsChangeType.Move,
-			index: 1, length: 1, newIdx: 2
-		}, cellsDiffInfo);
-
-		assert.ok(result);
-		assert.strictEqual(result[1].length, 0);
-		assert.deepStrictEqual(result[0], [
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('2'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
-			}
-		]);
+
+	suite('Revert Inserted Cell', function () {
+
+		const keep = () => Promise.resolve(true);
+		const undo = () => Promise.resolve(true);
+		const diff = observableValue('cell1', nullDocumentDiff);
+		const appliedEdits: ICellEditOperation[] = [];
+		setup(() => {
+			appliedEdits.length = 0;
+		});
+		ensureNoDisposablesAreLeakedInTestSuite();
+		function createModifiedModel(id: string): ObservablePromise<ITextModel> {
+			return `Modified:${id}` as any;
+
+		}
+		function createOriginalModel(id: string): ObservablePromise<ITextModel> {
+			return `Original:${id}` as any;
+
+		}
+		function applyEdits(edits: ICellEditOperation[]): boolean {
+			appliedEdits.push(...edits);
+			return true;
+		}
+
+		test('Delete first inserted', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+			];
+
+			const result = adjustCellDiffForRevertingAnInsertedCell(0,
+				cellsDiffInfo,
+				applyEdits);
+
+			assert.deepStrictEqual(appliedEdits, [
+				{ editType: CellEditType.Replace, index: 0, cells: [], count: 1 },
+			]);
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+			]);
+		});
+		test('Delete first inserted with multiple cells', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('2'),
+				},
+			];
+
+			const result = adjustCellDiffForRevertingAnInsertedCell(0,
+				cellsDiffInfo,
+				applyEdits);
+
+			assert.deepStrictEqual(appliedEdits, [
+				{ editType: CellEditType.Replace, index: 0, cells: [], count: 1 },
+			]);
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+				},
+			]);
+		});
+		test('Delete second inserted with multiple cells', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('2'),
+				},
+			];
+
+			const result = adjustCellDiffForRevertingAnInsertedCell(2,
+				cellsDiffInfo,
+				applyEdits);
+
+			assert.deepStrictEqual(appliedEdits, [
+				{ editType: CellEditType.Replace, index: 2, cells: [], count: 1 },
+			]);
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+				},
+			]);
+		});
 	});
-	test('Move first cell to the last position of notebook that had 3 cells deleted from the middle', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 2,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 4,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
-			},
-		];
-		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
-			cells: [], kind: NotebookCellsChangeType.Move,
-			index: 0, length: 1, newIdx: 2
-		}, cellsDiffInfo);
-
-		assert.ok(result);
-		assert.deepStrictEqual(result[1], [
-			{
-				editType: CellEditType.Move,
-				index: 0,
-				length: 1,
-				newIdx: 5
-			}
-		]);
-		assert.deepStrictEqual(result[0], [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('1'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('2'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 5,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('0'),
-			},
-		]);
+
+	suite('Keep Deleted Cell', function () {
+
+		const keep = () => Promise.resolve(true);
+		const undo = () => Promise.resolve(true);
+		const diff = observableValue('cell1', nullDocumentDiff);
+		const appliedEdits: ICellEditOperation[] = [];
+		setup(() => {
+			appliedEdits.length = 0;
+		});
+		ensureNoDisposablesAreLeakedInTestSuite();
+		function createModifiedModel(id: string): ObservablePromise<ITextModel> {
+			return `Modified:${id}` as any;
+
+		}
+		function createOriginalModel(id: string): ObservablePromise<ITextModel> {
+			return `Original:${id}` as any;
+
+		}
+		function applyEdits(edits: ICellEditOperation[]): boolean {
+			appliedEdits.push(...edits);
+			return true;
+		}
+
+		test('Keep first deleted cell', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+			];
+
+			const result = adjustCellDiffForKeepingADeletedCell(0,
+				cellsDiffInfo,
+				applyEdits);
+
+			assert.deepStrictEqual(appliedEdits, [
+				{ editType: CellEditType.Replace, index: 0, cells: [], count: 1 },
+			]);
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 0,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+			]);
+		});
+		test('Keep second deleted cell', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+			];
+
+			const result = adjustCellDiffForKeepingADeletedCell(1,
+				cellsDiffInfo,
+				applyEdits);
+
+			assert.deepStrictEqual(appliedEdits, [
+				{ editType: CellEditType.Replace, index: 1, cells: [], count: 1 },
+			]);
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+			]);
+		});
+
+		test('Keep first deleted with multiple cells', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('2'),
+				},
+			];
+
+			const result = adjustCellDiffForKeepingADeletedCell(1,
+				cellsDiffInfo,
+				applyEdits);
+
+			assert.deepStrictEqual(appliedEdits, [
+				{ editType: CellEditType.Replace, index: 1, cells: [], count: 1 },
+			]);
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('2'),
+				},
+			]);
+		});
 	});
-	test('Move second cell to the last position of notebook that had 3 cells deleted from the middle', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 2,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 4,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
-			},
-		];
-		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
-			cells: [], kind: NotebookCellsChangeType.Move,
-			index: 1, length: 1, newIdx: 2
-		}, cellsDiffInfo);
-
-		assert.ok(result);
-		assert.deepStrictEqual(result[1], [
-			{
-				editType: CellEditType.Move,
-				index: 1,
-				length: 1,
-				newIdx: 5
-			}
-		]);
-		assert.deepStrictEqual(result[0], [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('2'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
-			},
-		]);
+
+	suite('Revert Deleted Cell', function () {
+
+		const keep = () => Promise.resolve(true);
+		const undo = () => Promise.resolve(true);
+		const diff = observableValue('cell1', nullDocumentDiff);
+		const appliedEdits: ICellEditOperation[] = [];
+		setup(() => {
+			appliedEdits.length = 0;
+		});
+		ensureNoDisposablesAreLeakedInTestSuite();
+		function createModifiedModel(id: string): ObservablePromise<ITextModel> {
+			return `Modified:${id}` as any;
+
+		}
+		function createOriginalModel(id: string): ObservablePromise<ITextModel> {
+			return `Original:${id}` as any;
+
+		}
+		function applyEdits(edits: ICellEditOperation[]): boolean {
+			appliedEdits.push(...edits);
+			return true;
+		}
+		function createModifiedCellDiffInfo(modifiedCellIndex: number, originalCellIndex: number): ICellDiffInfo {
+			return {
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel(`InsertedOriginal:${originalCellIndex}`), originalCellIndex,
+				modifiedCellIndex, modifiedModel: createModifiedModel(`InsertedModified:${modifiedCellIndex}`),
+			};
+		}
+
+		test('Revert first deleted cell', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+			];
+
+			const result = adjustCellDiffForRevertingADeletedCell(0,
+				cellsDiffInfo,
+				{} as any,
+				applyEdits,
+				createModifiedCellDiffInfo);
+
+			assert.deepStrictEqual(appliedEdits, [
+				{ editType: CellEditType.Replace, index: 0, cells: [{}], count: 0 },
+			]);
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('InsertedOriginal:0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('InsertedModified:0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('0'),
+				},
+			]);
+		});
+		test('Revert second deleted cell', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+			];
+
+			const result = adjustCellDiffForRevertingADeletedCell(1,
+				cellsDiffInfo,
+				{} as any,
+				applyEdits,
+				createModifiedCellDiffInfo);
+
+			assert.deepStrictEqual(appliedEdits, [
+				{ editType: CellEditType.Replace, index: 0, cells: [{}], count: 0 },
+			]);
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('InsertedOriginal:1'), originalCellIndex: 1,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('InsertedModified:0'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('0'),
+				},
+			]);
+		});
+
+		test('Revert first deleted with multiple cells', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: 4, modifiedModel: createModifiedModel('2'),
+				},
+			];
+
+			const result = adjustCellDiffForRevertingADeletedCell(1,
+				cellsDiffInfo,
+				{} as any,
+				applyEdits,
+				createModifiedCellDiffInfo);
+
+			assert.deepStrictEqual(appliedEdits, [
+				{ editType: CellEditType.Replace, index: 3, cells: [{}], count: 0 },
+			]);
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('InsertedOriginal:1'), originalCellIndex: 1,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('InsertedModified:3'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 4, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: 5, modifiedModel: createModifiedModel('2'),
+				},
+			]);
+		});
 	});
 
-	test('Move second cell to the last position of notebook that had 3 cells deleted from middle and 1 inserted in the middle', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 2,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 4,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('New1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('5'),
-			},
-		];
-		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
-			cells: [], kind: NotebookCellsChangeType.Move,
-			index: 1, length: 1, newIdx: 3
-		}, cellsDiffInfo);
-
-		assert.ok(result);
-		assert.deepStrictEqual(result[1], [
-			{
-				editType: CellEditType.Move,
-				index: 1,
-				length: 1,
-				newIdx: 5
-			}
-		]);
-		assert.deepStrictEqual(result[0], [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('5'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
-			},
-		]);
+	suite('Cell Addition', function () {
+
+		const keep = () => Promise.resolve(true);
+		const undo = () => Promise.resolve(true);
+		const diff = observableValue('cell1', nullDocumentDiff);
+		const appliedEdits: ICellEditOperation[] = [];
+		setup(() => {
+			appliedEdits.length = 0;
+		});
+		ensureNoDisposablesAreLeakedInTestSuite();
+		function createModifiedModel(id: string): ObservablePromise<ITextModel> {
+			return `Modified:${id}` as any;
+
+		}
+		function createOriginalModel(id: string): ObservablePromise<ITextModel> {
+			return `Original:${id}` as any;
+
+		}
+		function applyEdits(edits: ICellEditOperation[]): boolean {
+			appliedEdits.push(...edits);
+			return true;
+		}
+
+		function createICell(cellKind: CellKind, source: string): ICell {
+			const handle = hash(generateUuid());
+			return {
+				uri: URI.parse(`file:///path/${handle}`),
+				handle,
+				cellKind,
+				language: cellKind === CellKind.Markup ? 'markdown' : 'python',
+				outputs: [],
+				metadata: {},
+				getHashValue: () => {
+					return hash(`${handle}=>${cellKind}=>${source}`);
+				},
+				getValue: () => {
+					return source;
+				},
+				internalMetadata: {},
+			} as any;
+		}
+		function createModifiedCellDiffInfo(modifiedCellIndex: number, originalCellIndex: number): ICellDiffInfo {
+			return {
+				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel(`InsertedOriginal:${originalCellIndex}`), originalCellIndex,
+				modifiedCellIndex, modifiedModel: createModifiedModel(`InsertedModified:${modifiedCellIndex}`),
+			};
+		}
+		test('Insert a new cell into an unchanged notebook', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+				},
+			];
+
+			const cell = createICell(CellKind.Code, 'print("Hello World")');
+			const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([0, 0, [cell]],
+				cellsDiffInfo, 2, 2, applyEdits, createModifiedCellDiffInfo);
+			assert.deepStrictEqual(appliedEdits, [
+				{
+					editType: CellEditType.Replace,
+					index: 0,
+					cells: [{
+						cellKind: CellKind.Code,
+						language: 'python',
+						outputs: [],
+						mime: undefined,
+						metadata: {},
+						internalMetadata: {},
+						source: cell.getValue(),
+					}], count: 0
+				}
+			]);
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel(`InsertedOriginal:0`), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel(`InsertedModified:0`),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 1,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 2,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+				},
+			]);
+		});
+		test('Insert a new cell into an notebook with 3 cells deleted', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('4'), originalCellIndex: 4,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('4'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('5'),
+				},
+				{
+					diff, keep, undo, type: 'modified', originalModel: createOriginalModel('6'), originalCellIndex: 6,
+					modifiedCellIndex: 4, modifiedModel: createModifiedModel('6'),
+				},
+			];
+			const cell = createICell(CellKind.Code, 'print("Hello World")');
+			const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([2, 0, [cell]],
+				cellsDiffInfo, 5, 7, applyEdits, createModifiedCellDiffInfo);
+
+			assert.deepStrictEqual(appliedEdits, [
+				{
+					editType: CellEditType.Replace,
+					index: 4,
+					cells: [{
+						cellKind: CellKind.Code,
+						language: 'python',
+						outputs: [],
+						mime: undefined,
+						metadata: {},
+						internalMetadata: {},
+						source: cell.getValue(),
+					}], count: 0
+				}
+			]);
+
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('InsertedOriginal:4'), originalCellIndex: 4,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('InsertedModified:2'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('4'), originalCellIndex: 5,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('4'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 6,
+					modifiedCellIndex: 4, modifiedModel: createModifiedModel('5'),
+				},
+				{
+					diff, keep, undo, type: 'modified', originalModel: createOriginalModel('6'), originalCellIndex: 7,
+					modifiedCellIndex: 5, modifiedModel: createModifiedModel('6'),
+				},
+			]);
+		});
+		test('Insert 2 new cells into an notebook with 3 cells deleted', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('5'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
+				},
+			];
+			const cell1 = createICell(CellKind.Code, 'print("Hello World")');
+			const cell2 = createICell(CellKind.Code, 'print("Foo Bar")');
+			const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([2, 0, [cell1, cell2]],
+				cellsDiffInfo, 4, 6, applyEdits, createModifiedCellDiffInfo);
+
+			assert.deepStrictEqual(appliedEdits, [
+				{
+					editType: CellEditType.Replace,
+					index: 4,
+					cells: [{
+						cellKind: CellKind.Code,
+						language: 'python',
+						outputs: [],
+						mime: undefined,
+						metadata: {},
+						internalMetadata: {},
+						source: cell1.getValue(),
+					}, {
+						cellKind: CellKind.Code,
+						language: 'python',
+						outputs: [],
+						mime: undefined,
+						metadata: {},
+						internalMetadata: {},
+						source: cell2.getValue(),
+					}], count: 0
+				}
+			]);
+
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel(`InsertedOriginal:4`), originalCellIndex: 4,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel(`InsertedModified:2`),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel(`InsertedOriginal:5`), originalCellIndex: 5,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel(`InsertedModified:3`),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 6,
+					modifiedCellIndex: 4, modifiedModel: createModifiedModel('5'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 7,
+					modifiedCellIndex: 5, modifiedModel: createModifiedModel('1'),
+				},
+			]);
+		});
+		test('Delete a cell from an unchanged notebook', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+				},
+			];
+
+			const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([0, 1, []],
+				cellsDiffInfo, 2, 2, applyEdits, createModifiedCellDiffInfo);
+
+			assert.deepStrictEqual(appliedEdits, [
+				{
+					editType: CellEditType.Replace,
+					index: 0,
+					cells: [], count: 1
+				}
+			]);
+
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('1'),
+				},
+			]);
+		});
+		test('Delete last cell from an unchanged notebook', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+				},
+			];
+
+			const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([1, 1, []],
+				cellsDiffInfo, 2, 2, applyEdits, createModifiedCellDiffInfo);
+			assert.deepStrictEqual(appliedEdits, [
+				{
+					editType: CellEditType.Replace,
+					index: 1,
+					cells: [], count: 1
+				}
+			]);
+
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+			]);
+		});
+		test('Delete a new cell from a notebook with 3 cells deleted', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('5'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
+				},
+			];
+
+			const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([1, 1, [
+				// createICell(CellKind.Code, 'print("Hello World")')
+			]],
+				cellsDiffInfo, 4, 6, applyEdits, createModifiedCellDiffInfo);
+
+			assert.deepStrictEqual(appliedEdits, [
+			]);
+
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('5'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+				},
+			]);
+		});
+		test('Delete 2 cells from a notebook with 3 cells deleted', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('5'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
+				},
+			];
+
+			const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([1, 2, [
+			]],
+				cellsDiffInfo, 4, 6, applyEdits, createModifiedCellDiffInfo);
+
+			assert.deepStrictEqual(appliedEdits, [
+				{
+					editType: CellEditType.Replace,
+					index: 4,
+					cells: [], count: 1
+				}
+			]);
+
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 4,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+				},
+			]);
+		});
+		test('Delete 3 cells from a notebook with 3 cells deleted', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'modified', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 4,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('New1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('5'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('6'), originalCellIndex: 6,
+					modifiedCellIndex: 4, modifiedModel: createModifiedModel('6'),
+				},
+			];
+
+			const result = adjustCellDiffAndOriginalModelBasedOnCellAddDelete([1, 3, [
+			]],
+				cellsDiffInfo, 5, 7, applyEdits, createModifiedCellDiffInfo);
+
+			assert.deepStrictEqual(appliedEdits, [
+				{
+					editType: CellEditType.Replace,
+					index: 1,
+					cells: [], count: 1
+				},
+				{
+					editType: CellEditType.Replace,
+					index: 5,
+					cells: [], count: 1
+				}
+			]);
+
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('6'), originalCellIndex: 4,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('6'),
+				},
+			]);
+		});
 	});
-	test('Move last cell to the second position of notebook that had 3 cells deleted from middle and 1 inserted in the middle', async function () {
-		const cellsDiffInfo: ICellDiffInfo[] = [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 2,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 4,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('New1'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('5'),
-			},
-		];
-		const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
-			cells: [], kind: NotebookCellsChangeType.Move,
-			index: 3, length: 1, newIdx: 1
-		}, cellsDiffInfo);
-
-		assert.ok(result);
-		assert.deepStrictEqual(result[1], [
-			{
-				editType: CellEditType.Move,
-				index: 5,
-				length: 1,
-				newIdx: 1
-			}
-		]);
-		assert.deepStrictEqual(result[0], [
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
-				modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 1,
-				modifiedCellIndex: 1, modifiedModel: createModifiedModel('5'),
-			},
-			{
-				diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 2,
-				modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 3,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 4,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 5,
-				modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
-			},
-			{
-				diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
-				modifiedCellIndex: 3, modifiedModel: createModifiedModel('New1'),
-			},
-		]);
+
+	suite('Cell Movements', function () {
+
+		const keep = () => Promise.resolve(true);
+		const undo = () => Promise.resolve(true);
+		const diff = observableValue('cell1', nullDocumentDiff);
+
+		ensureNoDisposablesAreLeakedInTestSuite();
+		function createModifiedModel(id: string): ObservablePromise<ITextModel> {
+			return `Modified:${id}` as any;
+
+		}
+		function createOriginalModel(id: string): ObservablePromise<ITextModel> {
+			return `Original:${id}` as any;
+
+		}
+		test('Swap first two inserted cells in a previously empty notebook', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+				}
+			];
+			const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+				cells: [], kind: NotebookCellsChangeType.Move,
+				index: 0, length: 1, newIdx: 1
+			}, cellsDiffInfo);
+
+			assert.ok(result);
+			assert.strictEqual(result[1].length, 0);
+			assert.deepStrictEqual(result[0], [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+			]);
+		});
+		test('Swap first two inserted cells in a notebook that had 2 cells', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
+				}
+			];
+			const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+				cells: [], kind: NotebookCellsChangeType.Move,
+				index: 0, length: 1, newIdx: 1
+			}, cellsDiffInfo);
+
+			assert.ok(result);
+			assert.strictEqual(result[1].length, 0);
+			assert.deepStrictEqual(result[0], [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
+				}
+			]);
+		});
+		test('Move first inserted cell to the very bottom of notebook that had 2 cells', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
+				}
+			];
+			const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+				cells: [], kind: NotebookCellsChangeType.Move,
+				index: 0, length: 1, newIdx: 3
+			}, cellsDiffInfo);
+
+			assert.ok(result);
+			assert.strictEqual(result[1].length, 0);
+			assert.deepStrictEqual(result[0], [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('2'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('3'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('0'),
+				},
+			]);
+		});
+		test('Move last cell to top of notebook after 2 cells were inserted', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
+				}
+			];
+			const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+				cells: [], kind: NotebookCellsChangeType.Move,
+				index: 3, length: 1, newIdx: 0
+			}, cellsDiffInfo);
+
+			assert.ok(result);
+			assert.deepStrictEqual(result[1], [
+				{
+					editType: CellEditType.Move,
+					index: 1,
+					length: 1,
+					newIdx: 0
+				}
+			]);
+			assert.deepStrictEqual(result[0], [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('3'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 1,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('2'),
+				},
+			]);
+		});
+
+		test('Move second inserted cell to the very bottom of notebook that had 2 cells', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
+				}
+			];
+			const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+				cells: [], kind: NotebookCellsChangeType.Move,
+				index: 1, length: 1, newIdx: 3
+			}, cellsDiffInfo);
+
+			assert.ok(result);
+			assert.strictEqual(result[1].length, 0);
+			assert.deepStrictEqual(result[0], [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('2'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('3'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
+				},
+			]);
+		});
+		test('Move second inserted cell to the second last position of notebook that had 2 cells', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
+				}
+			];
+			const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+				cells: [], kind: NotebookCellsChangeType.Move,
+				index: 1, length: 1, newIdx: 2
+			}, cellsDiffInfo);
+
+			assert.ok(result);
+			assert.strictEqual(result[1].length, 0);
+			assert.deepStrictEqual(result[0], [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('2'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
+				}
+			]);
+		});
+		test('Move first cell to the last position of notebook that had 3 cells deleted from the middle', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 4,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+				},
+			];
+			const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+				cells: [], kind: NotebookCellsChangeType.Move,
+				index: 0, length: 1, newIdx: 2
+			}, cellsDiffInfo);
+
+			assert.ok(result);
+			assert.deepStrictEqual(result[1], [
+				{
+					editType: CellEditType.Move,
+					index: 0,
+					length: 1,
+					newIdx: 5
+				}
+			]);
+			assert.deepStrictEqual(result[0], [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('2'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 5,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('0'),
+				},
+			]);
+		});
+		test('Move second cell to the last position of notebook that had 3 cells deleted from the middle', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 4,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('2'),
+				},
+			];
+			const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+				cells: [], kind: NotebookCellsChangeType.Move,
+				index: 1, length: 1, newIdx: 2
+			}, cellsDiffInfo);
+
+			assert.ok(result);
+			assert.deepStrictEqual(result[1], [
+				{
+					editType: CellEditType.Move,
+					index: 1,
+					length: 1,
+					newIdx: 5
+				}
+			]);
+			assert.deepStrictEqual(result[0], [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('2'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+				},
+			]);
+		});
+
+		test('Move second cell to the last position of notebook that had 3 cells deleted from middle and 1 inserted in the middle', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 4,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('New1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('5'),
+				},
+			];
+			const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+				cells: [], kind: NotebookCellsChangeType.Move,
+				index: 1, length: 1, newIdx: 3
+			}, cellsDiffInfo);
+
+			assert.ok(result);
+			assert.deepStrictEqual(result[1], [
+				{
+					editType: CellEditType.Move,
+					index: 1,
+					length: 1,
+					newIdx: 5
+				}
+			]);
+			assert.deepStrictEqual(result[0], [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('New1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 4,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('5'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 5,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('1'),
+				},
+			]);
+		});
+		test('Move last cell to the second position of notebook that had 3 cells deleted from middle and 1 inserted in the middle', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 4,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('New1'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 5,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('5'),
+				},
+			];
+			const result = adjustCellDiffAndOriginalModelBasedOnCellMovements({
+				cells: [], kind: NotebookCellsChangeType.Move,
+				index: 3, length: 1, newIdx: 1
+			}, cellsDiffInfo);
+
+			assert.ok(result);
+			assert.deepStrictEqual(result[1], [
+				{
+					editType: CellEditType.Move,
+					index: 5,
+					length: 1,
+					newIdx: 1
+				}
+			]);
+			assert.deepStrictEqual(result[0], [
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('5'), originalCellIndex: 1,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('5'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('1'), originalCellIndex: 2,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('2'), originalCellIndex: 3,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('3'), originalCellIndex: 4,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('4'), originalCellIndex: 5,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('New1'),
+				},
+			]);
+		});
 	});
+
 });

From 3bf4028bbde5d717e33bc9daf441388cbfbfc580 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Tue, 4 Mar 2025 13:50:36 +0100
Subject: [PATCH 0604/1815] Cleanup inline edits view (#242557)

---
 src/vs/editor/common/config/editorOptions.ts  |   6 -
 .../browser/model/inlineCompletionsModel.ts   |   2 +-
 .../browser/view/inlineCompletionsView.ts     |   2 +-
 .../components/gutterIndicatorMenu.ts         | 102 ++++++---
 .../components/gutterIndicatorView.ts         |  32 ++-
 .../view/inlineEdits/inlineEditsModel.ts      |  87 ++++++++
 .../view/inlineEdits/inlineEditsView.ts       | 209 ++++++++----------
 .../inlineEdits/inlineEditsViewInterface.ts   |  23 +-
 ...Producer.ts => inlineEditsViewProducer.ts} |  45 +++-
 .../inlineEditsDeletionView.ts                |   6 +-
 .../inlineEditsInsertionView.ts               |   6 +-
 .../inlineEditsLineReplacementView.ts         |   6 +-
 .../inlineEditsSideBySideView.ts              |  10 +-
 .../inlineEditsWordInsertView.ts              |   4 +-
 .../inlineEditsWordReplacementView.ts         |   8 +-
 .../browser/view/inlineEdits/theme.ts         |   2 +-
 .../browser/view/inlineEdits/utils/utils.ts   |   6 -
 17 files changed, 357 insertions(+), 199 deletions(-)
 create mode 100644 src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts
 rename src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/{viewAndDiffProducer.ts => inlineEditsViewProducer.ts} (61%)

diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 3fdecc8717e1..e49033996e00 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -4278,10 +4278,6 @@ export interface IInlineSuggestOptions {
 		* @internal
 		*/
 		useMultiLineGhostText?: boolean;
-		/**
-		* @internal
-		*/
-		useGutterIndicator?: boolean;
 	};
 }
 
@@ -4313,7 +4309,6 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 				useMixedLinesDiff: 'forStableInsertions',
 				useInterleavedLinesDiff: 'never',
 				renderSideBySide: 'auto',
-				useGutterIndicator: true,
 				codeShifting: true,
 				useMultiLineGhostText: true
 			},
@@ -4422,7 +4417,6 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 				codeShifting: boolean(input.edits?.codeShifting, this.defaultValue.edits.codeShifting),
 				renderSideBySide: stringSet(input.edits?.renderSideBySide, this.defaultValue.edits.renderSideBySide, ['never', 'auto']),
 				useInterleavedLinesDiff: stringSet(input.edits?.useInterleavedLinesDiff, this.defaultValue.edits.useInterleavedLinesDiff, ['never', 'always', 'afterJump']),
-				useGutterIndicator: boolean(input.edits?.useGutterIndicator, this.defaultValue.edits.useGutterIndicator),
 				useMultiLineGhostText: boolean(input.edits?.useMultiLineGhostText, this.defaultValue.edits.useMultiLineGhostText),
 			},
 		};
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
index e31394a52013..551e9138567a 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -771,7 +771,7 @@ export class InlineCompletionsModel extends Disposable {
 
 	// TODO: clean this up if we keep it
 	private readonly _inAcceptPartialFlow = observableValue(this, false);
-	public readonly inAcceptPartialFlow: IObservable<boolean> = this._inAcceptPartialFlow;
+	public readonly inPartialAcceptFlow: IObservable<boolean> = this._inAcceptPartialFlow;
 	public async acceptNextInlineEditPart(editor: ICodeEditor): Promise<void> {
 		if (editor.getModel() !== this.textModel) {
 			throw new BugIndicatingError();
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts
index 04afc6a88f39..bcf120f49964 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts
@@ -14,7 +14,7 @@ import { InlineCompletionsHintsWidget } from '../hintsWidget/inlineCompletionsHi
 import { InlineCompletionsModel } from '../model/inlineCompletionsModel.js';
 import { convertItemsToStableObservables } from '../utils.js';
 import { GhostTextView } from './ghostText/ghostTextView.js';
-import { InlineEditsViewAndDiffProducer } from './inlineEdits/viewAndDiffProducer.js';
+import { InlineEditsViewAndDiffProducer } from './inlineEdits/inlineEditsViewProducer.js';
 
 export class InlineCompletionsView extends Disposable {
 	private readonly _ghostTexts = derived(this, (reader) => {
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 6624abea5fa5..5a5b7aaa1d35 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
@@ -22,15 +22,15 @@ import { asCssVariable, descriptionForeground, editorActionListForeground, edito
 import { ObservableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
 import { hideInlineCompletionId, inlineSuggestCommitId, jumpToNextInlineEditId, toggleShowCollapsedId } from '../../../controller/commandIds.js';
-import { IInlineEditsViewHost } from '../inlineEditsViewInterface.js';
-import { FirstFnArg, InlineEditTabAction } from '../utils/utils.js';
+import { IInlineEditModel, InlineEditTabAction } from '../inlineEditsViewInterface.js';
+import { FirstFnArg, } from '../utils/utils.js';
 
 export class GutterIndicatorMenuContent {
 
 	private readonly _inlineEditsShowCollapsed = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.showCollapsed);
 
 	constructor(
-		private readonly _host: IInlineEditsViewHost,
+		private readonly _model: IInlineEditModel,
 		private readonly _close: (focusEditor: boolean) => void,
 		private readonly _editorObs: ObservableCodeEditor,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
@@ -60,39 +60,74 @@ export class GutterIndicatorMenuContent {
 			};
 		};
 
-		// TODO make this menu contributable!
-		return hoverContent([
-			header(this._host.displayName),
+		const title = header(this._model.displayName);
+
+		const gotoAndAccept = option(createOptionArgs({
+			id: 'gotoAndAccept',
+			title: `${localize('goto', "Go To")} / ${localize('accept', "Accept")}`,
+			icon: this._model.tabAction.map(action => action === InlineEditTabAction.Accept ? Codicon.check : Codicon.arrowRight),
+			commandId: this._model.tabAction.map(action => action === InlineEditTabAction.Accept ? inlineSuggestCommitId : jumpToNextInlineEditId)
+		}));
+
+		const reject = option(createOptionArgs({
+			id: 'reject',
+			title: localize('reject', "Reject"),
+			icon: Codicon.close,
+			commandId: hideInlineCompletionId
+		}));
+
+		const extensionCommands = this._model.extensionCommands.map((c, idx) => option(createOptionArgs({ id: c.id + '_' + idx, title: c.title, icon: Codicon.symbolEvent, commandId: c.id, commandArgs: c.arguments })));
+
+		const toggleCollapsedMode = this._inlineEditsShowCollapsed.map(showCollapsed => showCollapsed ?
 			option(createOptionArgs({
-				id: 'gotoAndAccept', title: `${localize('goto', "Go To")} / ${localize('accept', "Accept")}`,
-				icon: this._host.tabAction.map(action => action === InlineEditTabAction.Accept ? Codicon.check : Codicon.arrowRight),
-				commandId: this._host.tabAction.map(action => action === InlineEditTabAction.Accept ? inlineSuggestCommitId : jumpToNextInlineEditId)
+				id: 'showExpanded',
+				title: localize('showExpanded', "Show Expanded"),
+				icon: Codicon.expandAll,
+				commandId: toggleShowCollapsedId
+			}))
+			: option(createOptionArgs({
+				id: 'showCollapsed',
+				title: localize('showCollapsed', "Show Collapsed"),
+				icon: Codicon.collapseAll,
+				commandId: toggleShowCollapsedId
+			}))
+		);
+
+		const settings = option(createOptionArgs({
+			id: 'settings',
+			title: localize('settings', "Settings"),
+			icon: Codicon.gear,
+			commandId: 'workbench.action.openSettings',
+			commandArgs: ['@tag:nextEditSuggestions']
+		}));
+
+		const actions = this._model.action ? [this._model.action] : [];
+		const actionBarFooter = actions.length > 0 ? actionBar(
+			actions.map(action => ({
+				id: action.id,
+				label: action.title,
+				enabled: true,
+				run: () => this._commandService.executeCommand(action.id, ...(action.arguments ?? [])),
+				class: undefined,
+				tooltip: action.tooltip ?? action.title
 			})),
-			option(createOptionArgs({ id: 'reject', title: localize('reject', "Reject"), icon: Codicon.close, commandId: hideInlineCompletionId })),
+			{ hoverDelegate: nativeHoverDelegate /* unable to show hover inside another hover */ }
+		) : undefined;
+
+		return hoverContent([
+			title,
+			gotoAndAccept,
+			reject,
 			separator(),
-			this._host.extensionCommands?.map(c => c && c.length > 0 ? [
-				...c.map((c, idx) => option(createOptionArgs({ id: c.id + '_' + idx, title: c.title, icon: Codicon.symbolEvent, commandId: c.id, commandArgs: c.arguments }))),
-				separator()
-			] : []),
-			this._inlineEditsShowCollapsed.map(showCollapsed => showCollapsed ?
-				option(createOptionArgs({ id: 'showExpanded', title: localize('showExpanded', "Show Expanded"), icon: Codicon.expandAll, commandId: toggleShowCollapsedId })) :
-				option(createOptionArgs({ id: 'showCollapsed', title: localize('showCollapsed', "Show Collapsed"), icon: Codicon.collapseAll, commandId: toggleShowCollapsedId }))
-			),
-			option(createOptionArgs({ id: 'settings', title: localize('settings', "Settings"), icon: Codicon.gear, commandId: 'workbench.action.openSettings', commandArgs: ['@tag:nextEditSuggestions'] })),
-			this._host.action.map(action => action ? [
-				separator(),
-				actionBar(
-					[{
-						id: action.id,
-						label: action.title,
-						enabled: true,
-						run: () => this._commandService.executeCommand(action.id, ...(action.arguments ?? [])),
-						class: undefined,
-						tooltip: action.tooltip ?? action.title
-					}],
-					{ hoverDelegate: nativeHoverDelegate /* unable to show hover inside another hover */ }
-				)
-			] : [])
+
+			...extensionCommands,
+			extensionCommands.length ? separator() : undefined,
+
+			toggleCollapsedMode,
+			settings,
+
+			actionBarFooter ? separator() : undefined,
+			actionBarFooter
 		]);
 	}
 
@@ -188,6 +223,7 @@ function actionBar(actions: IAction[], options: IActionBarOptions) {
 
 function separator() {
 	return n.div({
+		id: 'inline-edit-gutter-indicator-menu-separator',
 		class: 'menu-separator',
 		style: {
 			color: asCssVariable(editorActionListForeground),
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 e737ff7aa25f..8ec842d9fc59 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
@@ -6,6 +6,7 @@
 import { 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';
 import { Disposable, DisposableStore, toDisposable } from '../../../../../../../base/common/lifecycle.js';
 import { IObservable, ISettableObservable, constObservable, derived, observableFromEvent, observableValue, runOnChange } from '../../../../../../../base/common/observable.js';
 import { debouncedObservable } from '../../../../../../../base/common/observableInternal/utils.js';
@@ -21,17 +22,24 @@ import { EditorOption } from '../../../../../../common/config/editorOptions.js';
 import { LineRange } from '../../../../../../common/core/lineRange.js';
 import { OffsetRange } from '../../../../../../common/core/offsetRange.js';
 import { StickyScrollController } from '../../../../../stickyScroll/browser/stickyScrollController.js';
-import { IInlineEditsViewHost } from '../inlineEditsViewInterface.js';
+import { IInlineEditModel, InlineEditTabAction } from '../inlineEditsViewInterface.js';
 import { inlineEditIndicatorBackground, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorPrimaryForeground, inlineEditIndicatorSecondaryBackground, inlineEditIndicatorSecondaryForeground, inlineEditIndicatorsuccessfulBackground, inlineEditIndicatorsuccessfulForeground } from '../theme.js';
-import { InlineEditTabAction, mapOutFalsy, rectToProps } from '../utils/utils.js';
+import { mapOutFalsy, rectToProps } from '../utils/utils.js';
 import { GutterIndicatorMenuContent } from './gutterIndicatorMenu.js';
 
 export class InlineEditsGutterIndicator extends Disposable {
+
+	private get model() {
+		const model = this._model.get();
+		if (!model) { throw new BugIndicatingError('Inline Edit Model not available'); }
+		return model;
+	}
+
 	constructor(
 		private readonly _editorObs: ObservableCodeEditor,
 		private readonly _originalRange: IObservable<LineRange | undefined>,
 		private readonly _verticalOffset: IObservable<number>,
-		private readonly _host: IInlineEditsViewHost,
+		private readonly _model: IObservable<IInlineEditModel | undefined>,
 		private readonly _isHoveringOverInlineEdit: IObservable<boolean>,
 		private readonly _focusIsInMenu: ISettableObservable<boolean>,
 		@IHoverService private readonly _hoverService: HoverService,
@@ -131,7 +139,7 @@ export class InlineEditsGutterIndicator extends Disposable {
 		const disposableStore = new DisposableStore();
 		const content = disposableStore.add(this._instantiationService.createInstance(
 			GutterIndicatorMenuContent,
-			this._host,
+			this.model,
 			(focusEditor) => {
 				if (focusEditor) {
 					this._editorObs.editor.focus();
@@ -161,15 +169,21 @@ export class InlineEditsGutterIndicator extends Disposable {
 		}
 	}
 
+	private readonly _tabAction = derived(this, reader => {
+		const model = this._model.read(reader);
+		if (!model) { return InlineEditTabAction.Inactive; }
+		return model.tabAction.read(reader);
+	});
+
 	private readonly _indicator = n.div({
 		class: 'inline-edits-view-gutter-indicator',
 		onclick: () => {
 			const docked = this._layout.map(l => l && l.docked).get();
 			this._editorObs.editor.focus();
 			if (docked) {
-				this._host.accept();
+				this.model.accept();
 			} else {
-				this._host.jump();
+				this.model.jump();
 			}
 		},
 		tabIndex: 0,
@@ -199,14 +213,14 @@ export class InlineEditsGutterIndicator extends Disposable {
 				cursor: 'pointer',
 				zIndex: '1000',
 				position: 'absolute',
-				backgroundColor: this._host.tabAction.map(v => {
+				backgroundColor: this._tabAction.map(v => {
 					switch (v) {
 						case InlineEditTabAction.Inactive: return asCssVariable(inlineEditIndicatorSecondaryBackground);
 						case InlineEditTabAction.Jump: return asCssVariable(inlineEditIndicatorPrimaryBackground);
 						case InlineEditTabAction.Accept: return asCssVariable(inlineEditIndicatorsuccessfulBackground);
 					}
 				}),
-				['--vscodeIconForeground' as any]: this._host.tabAction.map(v => {
+				['--vscodeIconForeground' as any]: this._tabAction.map(v => {
 					switch (v) {
 						case InlineEditTabAction.Inactive: return asCssVariable(inlineEditIndicatorSecondaryForeground);
 						case InlineEditTabAction.Jump: return asCssVariable(inlineEditIndicatorPrimaryForeground);
@@ -235,7 +249,7 @@ export class InlineEditsGutterIndicator extends Disposable {
 					justifyContent: 'center',
 				}
 			}, [
-				this._host.tabAction.map(v => v === InlineEditTabAction.Accept ? renderIcon(Codicon.keyboardTab) : renderIcon(Codicon.arrowRight))
+				this._tabAction.map(v => v === InlineEditTabAction.Accept ? renderIcon(Codicon.keyboardTab) : renderIcon(Codicon.arrowRight))
 			])
 		]),
 	])).keepUpdated(this._store);
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts
new file mode 100644
index 000000000000..56db7d9f1b3d
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts
@@ -0,0 +1,87 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { 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/lineRange.js';
+import { StringText, TextEdit } from '../../../../../common/core/textEdit.js';
+import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
+import { InlineCompletionWithUpdatedRange } from '../../model/inlineCompletionsSource.js';
+import { IInlineEditModel, InlineEditTabAction } from './inlineEditsViewInterface.js';
+import { InlineEditWithChanges } from './inlineEditWithChanges.js';
+
+export class InlineEditModel implements IInlineEditModel {
+
+	readonly action = this.inlineEdit.inlineCompletion.action;
+	readonly displayName = this.inlineEdit.inlineCompletion.source.provider.displayName ?? localize('inlineEdit', "Inline Edit");
+	readonly extensionCommands = this.inlineEdit.inlineCompletion.source.inlineCompletions.commands ?? [];
+
+	readonly inAcceptFlow = this._model.inAcceptFlow;
+	readonly inPartialAcceptFlow = this._model.inPartialAcceptFlow;
+
+	constructor(
+		private readonly _model: InlineCompletionsModel,
+		readonly inlineEdit: InlineEditWithChanges,
+		readonly tabAction: IObservable<InlineEditTabAction>,
+	) { }
+
+	accept() {
+		this._model.accept();
+	}
+
+	jump() {
+		this._model.jump();
+	}
+
+	abort(reason: string) {
+		console.error(reason); // TODO: add logs/telemetry
+		this._model.stop();
+	}
+
+	handleInlineEditShown() {
+		this._model.handleInlineEditShown(this.inlineEdit.inlineCompletion);
+	}
+}
+
+
+export class GhostTextIndicator {
+
+	readonly model: InlineEditModel;
+
+	private readonly _editorObs = observableCodeEditor(this._editor);
+
+	constructor(
+		private _editor: ICodeEditor,
+		model: InlineCompletionsModel,
+		readonly lineRange: LineRange,
+		inlineCompletion: InlineCompletionWithUpdatedRange,
+		renderExplicitly: boolean,
+	) {
+
+		const tabAction = derived<InlineEditTabAction>(this, reader => {
+			if (this._editorObs.isFocused.read(reader)) {
+				if (model.inlineCompletionState.read(reader)?.inlineCompletion?.sourceInlineCompletion.showInlineEditMenu) {
+					return InlineEditTabAction.Accept;
+				}
+			}
+			return InlineEditTabAction.Inactive;
+		});
+
+		this.model = new InlineEditModel(
+			model,
+			new InlineEditWithChanges(
+				new StringText(''),
+				new TextEdit([]),
+				model.primaryPosition.get(),
+				renderExplicitly,
+				inlineCompletion.source.inlineCompletions.commands ?? [],
+				inlineCompletion.inlineCompletion
+			),
+			tabAction,
+		);
+	}
+}
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 f9479e66980d..7f16b9652fb5 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
@@ -7,8 +7,7 @@ import { equalsIfDefined, itemEquals } from '../../../../../../base/common/equal
 import { BugIndicatingError } from '../../../../../../base/common/errors.js';
 import { Event } from '../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { autorunWithStore, derived, derivedObservableWithCache, derivedOpts, derivedWithStore, IObservable, IReader, ISettableObservable, mapObservableArrayCached, observableValue } from '../../../../../../base/common/observable.js';
-import { localize } from '../../../../../../nls.js';
+import { autorunWithStore, derived, derivedOpts, derivedWithStore, IObservable, IReader, ISettableObservable, mapObservableArrayCached, 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';
@@ -20,18 +19,18 @@ import { AbstractText, SingleTextEdit, StringText } from '../../../../../common/
 import { TextLength } from '../../../../../common/core/textLength.js';
 import { DetailedLineRangeMapping, lineRangeMappingFromRangeMappings, RangeMapping } from '../../../../../common/diff/rangeMapping.js';
 import { TextModel } from '../../../../../common/model/textModel.js';
-import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
 import { InlineEditsGutterIndicator } from './components/gutterIndicatorView.js';
-import { IInlineEditsIndicatorState, InlineEditsIndicator } from './components/indicatorView.js';
+import { InlineEditsIndicator } from './components/indicatorView.js';
 import { InlineEditWithChanges } from './inlineEditWithChanges.js';
-import { IInlineEditsViewHost } from './inlineEditsViewInterface.js';
+import { GhostTextIndicator, InlineEditModel } from './inlineEditsModel.js';
+import { IInlineEditModel, InlineEditTabAction } from './inlineEditsViewInterface.js';
 import { InlineEditsDeletionView } from './inlineEditsViews/inlineEditsDeletionView.js';
 import { InlineEditsInsertionView } from './inlineEditsViews/inlineEditsInsertionView.js';
 import { InlineEditsLineReplacementView } from './inlineEditsViews/inlineEditsLineReplacementView.js';
 import { InlineEditsSideBySideView } from './inlineEditsViews/inlineEditsSideBySideView.js';
 import { InlineEditsWordReplacementView } from './inlineEditsViews/inlineEditsWordReplacementView.js';
 import { IOriginalEditorInlineDiffViewState, OriginalEditorInlineDiffView } from './inlineEditsViews/originalEditorInlineDiffView.js';
-import { applyEditToModifiedRangeMappings, createReindentEdit, InlineEditTabAction } from './utils/utils.js';
+import { applyEditToModifiedRangeMappings, createReindentEdit } from './utils/utils.js';
 import './view.css';
 
 export class InlineEditsView extends Disposable {
@@ -44,6 +43,8 @@ export class InlineEditsView extends Disposable {
 	private readonly _showCollapsed = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.showCollapsed);
 	private readonly _useMultiLineGhostText = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.useMultiLineGhostText);
 
+	private readonly _tabAction = derived<InlineEditTabAction>(reader => this._model.read(reader)?.tabAction.read(reader) ?? InlineEditTabAction.Inactive);
+
 	private _previousView: {
 		id: string;
 		view: ReturnType<typeof InlineEditsView.prototype.determineView>;
@@ -54,14 +55,19 @@ export class InlineEditsView extends Disposable {
 
 	constructor(
 		private readonly _editor: ICodeEditor,
-		private readonly _edit: IObservable<InlineEditWithChanges | undefined>,
-		private readonly _model: IObservable<InlineCompletionsModel | undefined>,
+		private readonly _model: IObservable<InlineEditModel | undefined>,
+		private readonly _ghostTextIndicator: IObservable<GhostTextIndicator | undefined>,
 		private readonly _focusIsInMenu: ISettableObservable<boolean>,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
 		super();
 
 		this._register(autorunWithStore((reader, store) => {
+			const model = this._model.read(reader);
+			if (!model) {
+				return;
+			}
+
 			store.add(
 				Event.any(
 					this._sideBySide.onDidClick,
@@ -71,9 +77,9 @@ export class InlineEditsView extends Disposable {
 					...this._wordReplacementViews.read(reader).map(w => w.onDidClick),
 					this._inlineDiffView.onDidClick,
 				)(e => {
-					if (this._viewHasBeenShownLongThan(350)) {
+					if (this._viewHasBeenShownLongerThan(350)) {
 						e.preventDefault();
-						this._host.accept();
+						model.accept();
 					}
 				})
 			);
@@ -93,35 +99,36 @@ export class InlineEditsView extends Disposable {
 		newTextLineCount: number;
 		originalDisplayRange: LineRange;
 	} | undefined>(this, reader => {
-		const edit = this._edit.read(reader);
-		if (!edit) {
+		const model = this._model.read(reader);
+		if (!model) {
 			return undefined;
 		}
 
-		this._model.get()?.handleInlineEditShown(edit.inlineCompletion);
+		model.handleInlineEditShown();
 
-		let mappings = RangeMapping.fromEdit(edit.edit);
-		let newText = edit.edit.apply(edit.originalText);
-		let diff = lineRangeMappingFromRangeMappings(mappings, edit.originalText, new StringText(newText));
+		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));
 
-		const originalDisplayRange = edit.originalText.lineRange.intersect(
-			edit.originalLineRange.join(
-				LineRange.ofLength(edit.originalLineRange.startLineNumber, edit.lineEdit.newLines.length)
+		const originalDisplayRange = inlineEdit.originalText.lineRange.intersect(
+			inlineEdit.originalLineRange.join(
+				LineRange.ofLength(inlineEdit.originalLineRange.startLineNumber, inlineEdit.lineEdit.newLines.length)
 			)
 		)!;
 
-		let state = this.determineRenderState(edit, reader, diff, new StringText(newText), originalDisplayRange);
+		let state = this.determineRenderState(model, reader, diff, new StringText(newText), originalDisplayRange);
 		if (!state) {
-			this._model.get()?.stop();
+			model.abort(`unable to determine view: tried to render ${this._previousView?.view}`);
 			return undefined;
 		}
 
 		if (state.kind === 'sideBySide') {
-			const indentationAdjustmentEdit = createReindentEdit(newText, edit.modifiedLineRange);
+			const indentationAdjustmentEdit = createReindentEdit(newText, inlineEdit.modifiedLineRange);
 			newText = indentationAdjustmentEdit.applyToString(newText);
 
 			mappings = applyEditToModifiedRangeMappings(mappings, indentationAdjustmentEdit);
-			diff = lineRangeMappingFromRangeMappings(mappings, edit.originalText, new StringText(newText));
+			diff = lineRangeMappingFromRangeMappings(mappings, inlineEdit.originalText, new StringText(newText));
 		}
 
 		this._previewTextModel.setLanguage(this._editor.getModel()!.getLanguageId());
@@ -132,16 +139,16 @@ export class InlineEditsView extends Disposable {
 			this._previewTextModel.setValue(newText);
 		}
 
-		if (this._showCollapsed.read(reader) && this._host.tabAction.read(reader) !== InlineEditTabAction.Accept && !this._indicator.read(reader)?.isHoverVisible.read(reader) && !this._model.get()!.inAcceptFlow.read(reader)) {
+		if (this._showCollapsed.read(reader) && model.tabAction.read(reader) !== InlineEditTabAction.Accept && !this._indicator.read(reader)?.isHoverVisible.read(reader) && !model.inAcceptFlow.read(reader)) {
 			state = { kind: 'hidden' };
 		}
 
 		return {
 			state,
 			diff,
-			edit,
+			edit: inlineEdit,
 			newText,
-			newTextLineCount: edit.modifiedLineRange.length,
+			newTextLineCount: inlineEdit.modifiedLineRange.length,
 			originalDisplayRange: originalDisplayRange,
 		};
 	});
@@ -154,37 +161,6 @@ export class InlineEditsView extends Disposable {
 		null
 	));
 
-	// TODO: This has become messy, should it be passed in to the InlineEditsView? Maybe include in accept flow?
-	private readonly _host: IInlineEditsViewHost = {
-		displayName: derivedObservableWithCache<string>(this, (reader, previousDisplayName) => {
-			const state = this._model.read(reader)?.inlineEditState;
-			const item = state?.read(reader);
-			const completionSource = item?.inlineCompletion?.source;
-			// TODO: expose the provider (typed) and expose the provider the edit belongs to typing and get correct edit
-			return (completionSource?.inlineCompletions as any)?.edits?.[0]?.provider?.displayName ?? previousDisplayName
-				?? completionSource?.provider.displayName ?? localize('inlineEdit', "Inline Edit");
-		}),
-		tabAction: derived<InlineEditTabAction>(this, reader => {
-			const m = this._model.read(reader);
-			if (this._editorObs.isFocused.read(reader)) {
-				if (m && m.tabShouldJumpToInlineEdit.read(reader)) { return InlineEditTabAction.Jump; }
-				if (m && m.tabShouldAcceptInlineEdit.read(reader)) { return InlineEditTabAction.Accept; }
-				if (m && m.inlineCompletionState.read(reader)?.inlineCompletion?.sourceInlineCompletion.showInlineEditMenu) { return InlineEditTabAction.Accept; }
-			}
-			return InlineEditTabAction.Inactive;
-		}),
-		action: this._model.map((m, r) => m?.state.read(r)?.inlineCompletion?.inlineCompletion.action),
-		extensionCommands: this._model.map((m, r) => m?.state.read(r)?.inlineCompletion?.source.inlineCompletions.commands ?? []),
-		accept: () => {
-			this._model.get()?.accept();
-		},
-		jump: () => {
-			this._model.get()?.jump();
-		}
-	};
-
-	private readonly _useGutterIndicator = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.useGutterIndicator);
-
 	private readonly _indicatorCyclicDependencyCircuitBreaker = observableValue(this, false);
 
 	protected readonly _indicator = derivedWithStore<InlineEditsGutterIndicator | InlineEditsIndicator | undefined>(this, (reader, store) => {
@@ -193,9 +169,9 @@ export class InlineEditsView extends Disposable {
 		}
 
 		const indicatorDisplayRange = derivedOpts({ owner: this, equalsFn: equalsIfDefined(itemEquals()) }, reader => {
-			const s = this._model.read(reader)?.inlineCompletionState.read(reader);
-			if (s && s.inlineCompletion?.sourceInlineCompletion.showInlineEditMenu) {
-				return LineRange.ofLength(s.primaryGhostText.lineNumber, 1);
+			const ghostTextIndicator = this._ghostTextIndicator.read(reader);
+			if (ghostTextIndicator) {
+				return ghostTextIndicator.lineRange;
 			}
 
 			const state = this._uiState.read(reader);
@@ -205,29 +181,29 @@ export class InlineEditsView extends Disposable {
 			return state?.originalDisplayRange;
 		});
 
-		if (this._useGutterIndicator.read(reader)) {
-			return store.add(this._instantiationService.createInstance(
-				InlineEditsGutterIndicator,
-				this._editorObs,
-				indicatorDisplayRange,
-				this._gutterIndicatorOffset,
-				this._host,
-				this._inlineEditsIsHovered,
-				this._focusIsInMenu,
-			));
-		} else {
-			return store.add(new InlineEditsIndicator(
-				this._editorObs,
-				derived<IInlineEditsIndicatorState | undefined>(reader => {
-					const state = this._uiState.read(reader);
-					const range = indicatorDisplayRange.read(reader);
-					if (!state || !state.state || !range) { return undefined; }
-					const top = this._editor.getTopForLineNumber(range.startLineNumber) - this._editorObs.scrollTop.read(reader) + this._gutterIndicatorOffset.read(reader);
-					return { editTop: top, showAlways: state.state.kind !== 'sideBySide' };
-				}),
-				this._model,
-			));
-		}
+		const modelWithGhostTextSupport = derived<InlineEditModel | undefined>(this, reader => {
+			const model = this._model.read(reader);
+			if (model) {
+				return model;
+			}
+
+			const ghostTextIndicator = this._ghostTextIndicator.read(reader);
+			if (ghostTextIndicator) {
+				return ghostTextIndicator.model;
+			}
+
+			return model;
+		});
+
+		return store.add(this._instantiationService.createInstance(
+			InlineEditsGutterIndicator,
+			this._editorObs,
+			indicatorDisplayRange,
+			this._gutterIndicatorOffset,
+			modelWithGhostTextSupport,
+			this._inlineEditsIsHovered,
+			this._focusIsInMenu,
+		));
 	});
 
 	private readonly _inlineEditsIsHovered = derived(this, reader => {
@@ -249,24 +225,24 @@ export class InlineEditsView extends Disposable {
 
 	private readonly _sideBySide = this._register(this._instantiationService.createInstance(InlineEditsSideBySideView,
 		this._editor,
-		this._edit,
+		this._model.map(m => m?.inlineEdit),
 		this._previewTextModel,
 		this._uiState.map(s => s && s.state?.kind === 'sideBySide' ? ({
 			edit: s.edit,
 			newTextLineCount: s.newTextLineCount,
 			originalDisplayRange: s.originalDisplayRange,
 		}) : undefined),
-		this._host,
+		this._tabAction,
 	));
 
 	protected readonly _deletion = this._register(this._instantiationService.createInstance(InlineEditsDeletionView,
 		this._editor,
-		this._edit,
+		this._model.map(m => m?.inlineEdit),
 		this._uiState.map(s => s && s.state?.kind === 'deletion' ? ({
 			originalRange: s.state.originalRange,
 			deletions: s.state.deletions,
 		}) : undefined),
-		this._host,
+		this._tabAction,
 	));
 
 	protected readonly _insertion = this._register(this._instantiationService.createInstance(InlineEditsInsertionView,
@@ -276,7 +252,7 @@ export class InlineEditsView extends Disposable {
 			startColumn: s.state.column,
 			text: s.state.text,
 		}) : undefined),
-		this._host,
+		this._tabAction,
 	));
 
 	private readonly _inlineDiffViewState = derived<IOriginalEditorInlineDiffViewState | undefined>(this, reader => {
@@ -296,7 +272,7 @@ export class InlineEditsView extends Disposable {
 	protected readonly _inlineDiffView = this._register(new OriginalEditorInlineDiffView(this._editor, this._inlineDiffViewState, this._previewTextModel));
 
 	protected readonly _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, [e], this._host));
+		return store.add(this._instantiationService.createInstance(InlineEditsWordReplacementView, this._editorObs, e, [e], this._tabAction));
 	});
 
 	protected readonly _lineReplacementView = this._register(this._instantiationService.createInstance(InlineEditsLineReplacementView,
@@ -307,21 +283,23 @@ export class InlineEditsView extends Disposable {
 			modifiedLines: s.state.modifiedLines,
 			replacements: s.state.replacements,
 		}) : undefined),
-		this._host
+		this._tabAction,
 	));
 
-	private getCacheId(edit: InlineEditWithChanges) {
-		if (this._model.get()?.inAcceptPartialFlow.get()) {
-			return `${edit.inlineCompletion.id}_${edit.edit.edits.map(edit => edit.range.toString() + edit.text).join(',')}`;
+	private getCacheId(model: IInlineEditModel) {
+		const inlineEdit = model.inlineEdit;
+		if (model.inPartialAcceptFlow.get()) {
+			return `${inlineEdit.inlineCompletion.id}_${inlineEdit.edit.edits.map(innerEdit => innerEdit.range.toString() + innerEdit.text).join(',')}`;
 		}
 
-		return edit.inlineCompletion.id;
+		return inlineEdit.inlineCompletion.id;
 	}
 
-	private determineView(edit: InlineEditWithChanges, reader: IReader, diff: DetailedLineRangeMapping[], newText: StringText, originalDisplayRange: LineRange): string {
+	private determineView(model: IInlineEditModel, reader: IReader, diff: DetailedLineRangeMapping[], newText: StringText, originalDisplayRange: LineRange): string {
 		// Check if we can use the previous view if it is the same InlineCompletion as previously shown
-		const canUseCache = this._previousView?.id === this.getCacheId(edit);
-		const reconsiderViewAfterJump = edit.userJumpedToIt !== this._previousView?.userJumpedToIt &&
+		const inlineEdit = model.inlineEdit;
+		const canUseCache = this._previousView?.id === this.getCacheId(model);
+		const reconsiderViewAfterJump = inlineEdit.userJumpedToIt !== this._previousView?.userJumpedToIt &&
 			(
 				(this._useMixedLinesDiff.read(reader) === 'afterJumpWhenPossible' && this._previousView?.view !== 'mixedLines') ||
 				(this._useInterleavedLinesDiff.read(reader) === 'afterJump' && this._previousView?.view !== 'interleavedLines')
@@ -344,13 +322,13 @@ export class InlineEditsView extends Disposable {
 			isSingleInnerEdit && (
 				this._useMixedLinesDiff.read(reader) === 'forStableInsertions'
 				&& this._useCodeShifting.read(reader)
-				&& isSingleLineInsertionAfterPosition(diff, edit.cursorPosition)
+				&& isSingleLineInsertionAfterPosition(diff, inlineEdit.cursorPosition)
 			)
 		) {
 			return 'insertionInline';
 		}
 
-		const innerValues = inner.map(m => ({ original: edit.originalText.getValueOfRange(m.originalRange), modified: newText.getValueOfRange(m.modifiedRange) }));
+		const innerValues = inner.map(m => ({ original: inlineEdit.originalText.getValueOfRange(m.originalRange), modified: newText.getValueOfRange(m.modifiedRange) }));
 		if (innerValues.every(({ original, modified }) => modified.trim() === '' && original.length > 0 && (original.length > modified.length || original.trim() !== ''))) {
 			return 'deletion';
 		}
@@ -359,20 +337,20 @@ export class InlineEditsView extends Disposable {
 			return 'insertionMultiLine';
 		}
 
-		const numOriginalLines = edit.originalLineRange.length;
-		const numModifiedLines = edit.modifiedLineRange.length;
+		const numOriginalLines = inlineEdit.originalLineRange.length;
+		const numModifiedLines = inlineEdit.modifiedLineRange.length;
 		const allInnerChangesNotTooLong = inner.every(m => TextLength.ofRange(m.originalRange).columnCount < InlineEditsWordReplacementView.MAX_LENGTH && TextLength.ofRange(m.modifiedRange).columnCount < InlineEditsWordReplacementView.MAX_LENGTH);
 		if (allInnerChangesNotTooLong && isSingleInnerEdit && numOriginalLines === 1 && numModifiedLines === 1) {
 			// Make sure there is no insertion, even if we grow them
 			if (
 				!inner.some(m => m.originalRange.isEmpty()) ||
-				!growEditsUntilWhitespace(inner.map(m => new SingleTextEdit(m.originalRange, '')), edit.originalText).some(e => e.range.isEmpty() && TextLength.ofRange(e.range).columnCount < InlineEditsWordReplacementView.MAX_LENGTH)
+				!growEditsUntilWhitespace(inner.map(m => new SingleTextEdit(m.originalRange, '')), inlineEdit.originalText).some(e => e.range.isEmpty() && TextLength.ofRange(e.range).columnCount < InlineEditsWordReplacementView.MAX_LENGTH)
 			) {
 				return 'wordReplacements';
 			}
 		}
 		if (numOriginalLines > 0 && numModifiedLines > 0) {
-			if (this._renderSideBySide.read(reader) !== 'never' && InlineEditsSideBySideView.fitsInsideViewport(this._editor, edit, originalDisplayRange, reader)) {
+			if (this._renderSideBySide.read(reader) !== 'never' && InlineEditsSideBySideView.fitsInsideViewport(this._editor, inlineEdit, originalDisplayRange, reader)) {
 				return 'sideBySide';
 			}
 
@@ -380,24 +358,25 @@ export class InlineEditsView extends Disposable {
 		}
 
 		if (
-			(this._useMixedLinesDiff.read(reader) === 'whenPossible' || (edit.userJumpedToIt && this._useMixedLinesDiff.read(reader) === 'afterJumpWhenPossible'))
+			(this._useMixedLinesDiff.read(reader) === 'whenPossible' || (inlineEdit.userJumpedToIt && this._useMixedLinesDiff.read(reader) === 'afterJumpWhenPossible'))
 			&& diff.every(m => OriginalEditorInlineDiffView.supportsInlineDiffRendering(m))
 		) {
 			return 'mixedLines';
 		}
 
-		if (this._useInterleavedLinesDiff.read(reader) === 'always' || (edit.userJumpedToIt && this._useInterleavedLinesDiff.read(reader) === 'afterJump')) {
+		if (this._useInterleavedLinesDiff.read(reader) === 'always' || (inlineEdit.userJumpedToIt && this._useInterleavedLinesDiff.read(reader) === 'afterJump')) {
 			return 'interleavedLines';
 		}
 
 		return 'sideBySide';
 	}
 
-	private determineRenderState(edit: InlineEditWithChanges, reader: IReader, diff: DetailedLineRangeMapping[], newText: StringText, originalDisplayRange: LineRange) {
+	private determineRenderState(model: IInlineEditModel, reader: IReader, diff: DetailedLineRangeMapping[], newText: StringText, originalDisplayRange: LineRange) {
+		const inlineEdit = model.inlineEdit;
 
-		const view = this.determineView(edit, reader, diff, newText, originalDisplayRange);
+		const view = this.determineView(model, reader, diff, newText, originalDisplayRange);
 
-		this._previousView = { id: this.getCacheId(edit), view, userJumpedToIt: edit.userJumpedToIt, editorWidth: this._editor.getLayoutInfo().width, timestamp: Date.now() };
+		this._previousView = { id: this.getCacheId(model), view, userJumpedToIt: inlineEdit.userJumpedToIt, editorWidth: this._editor.getLayoutInfo().width, timestamp: Date.now() };
 
 		switch (view) {
 			case 'insertionInline': return { kind: 'insertionInline' as const };
@@ -412,7 +391,7 @@ export class InlineEditsView extends Disposable {
 		if (view === 'deletion') {
 			return {
 				kind: 'deletion' as const,
-				originalRange: edit.originalLineRange,
+				originalRange: inlineEdit.originalLineRange,
 				deletions: inner.map(m => m.originalRange),
 			};
 		}
@@ -433,10 +412,10 @@ export class InlineEditsView extends Disposable {
 		}
 
 		if (view === 'wordReplacements') {
-			let grownEdits = growEditsToEntireWord(replacements, edit.originalText);
+			let grownEdits = growEditsToEntireWord(replacements, inlineEdit.originalText);
 
 			if (grownEdits.some(e => e.range.isEmpty())) {
-				grownEdits = growEditsUntilWhitespace(replacements, edit.originalText);
+				grownEdits = growEditsUntilWhitespace(replacements, inlineEdit.originalText);
 			}
 
 			return {
@@ -448,9 +427,9 @@ export class InlineEditsView extends Disposable {
 		if (view === 'lineReplacement') {
 			return {
 				kind: 'lineReplacement' as const,
-				originalRange: edit.originalLineRange,
-				modifiedRange: edit.modifiedLineRange,
-				modifiedLines: edit.modifiedLineRange.mapToLineArray(line => newText.getLineAt(line)),
+				originalRange: inlineEdit.originalLineRange,
+				modifiedRange: inlineEdit.modifiedLineRange,
+				modifiedLines: inlineEdit.modifiedLineRange.mapToLineArray(line => newText.getLineAt(line)),
 				replacements: inner.map(m => ({ originalRange: m.originalRange, modifiedRange: m.modifiedRange })),
 			};
 		}
@@ -458,7 +437,7 @@ export class InlineEditsView extends Disposable {
 		return undefined;
 	}
 
-	private _viewHasBeenShownLongThan(durationMs: number): boolean {
+	private _viewHasBeenShownLongerThan(durationMs: number): boolean {
 		const viewCreationTime = this._previousView?.timestamp;
 		if (!viewCreationTime) {
 			throw new BugIndicatingError('viewHasBeenShownLongThan called before a view has been shown');
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 ffa4cdbaffff..a00fc94d390b 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.ts
@@ -7,18 +7,31 @@ import { IMouseEvent } from '../../../../../../base/browser/mouseEvent.js';
 import { Event } from '../../../../../../base/common/event.js';
 import { IObservable } from '../../../../../../base/common/observable.js';
 import { Command } from '../../../../../common/languages.js';
-import { InlineEditTabAction } from './utils/utils.js';
+import { InlineEditWithChanges } from './inlineEditWithChanges.js';
+
+export enum InlineEditTabAction {
+	Jump = 'jump',
+	Accept = 'accept',
+	Inactive = 'inactive'
+}
 
 export interface IInlineEditsView {
 	isHovered: IObservable<boolean>;
 	onDidClick: Event<IMouseEvent>;
 }
 
-export interface IInlineEditsViewHost {
-	displayName: IObservable<string>;
-	action: IObservable<Command | undefined>;
+export interface IInlineEditModel {
+	displayName: string;
+	action: Command | undefined;
+	extensionCommands: Command[];
+	inlineEdit: InlineEditWithChanges;
+
 	tabAction: IObservable<InlineEditTabAction>;
-	extensionCommands: IObservable<readonly Command[] | undefined>;
+	inAcceptFlow: IObservable<boolean>;
+	inPartialAcceptFlow: IObservable<boolean>;
+
+	handleInlineEditShown(): void;
 	accept(): void;
 	jump(): void;
+	abort(reason: string): void;
 }
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts
similarity index 61%
rename from src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts
index 9b5fcbb5159b..cd93ce8a60aa 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts
@@ -8,17 +8,23 @@ import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { derived, 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 { LineRange } from '../../../../../common/core/lineRange.js';
 import { Range } from '../../../../../common/core/range.js';
 import { SingleTextEdit, TextEdit } from '../../../../../common/core/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, InlineEditModel } from './inlineEditsModel.js';
 import { InlineEditsView } from './inlineEditsView.js';
+import { InlineEditTabAction } from './inlineEditsViewInterface.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(InlineEditsViewAndDiffProducer);
 
+	private readonly _editorObs = observableCodeEditor(this._editor);
+
 	private readonly _inlineEdit = derived<InlineEditWithChanges | undefined>(this, (reader) => {
 		const model = this._model.read(reader);
 		if (!model) { return undefined; }
@@ -30,7 +36,7 @@ export class InlineEditsViewAndDiffProducer extends Disposable { // TODO: This c
 		const editOffset = model.inlineEditState.get()?.inlineCompletion.updatedEdit.read(reader);
 		if (!editOffset) { return undefined; }
 
-		const offsetEdits = model.inAcceptPartialFlow.read(reader) ? [editOffset.edits[0]] : editOffset.edits;
+		const offsetEdits = model.inPartialAcceptFlow.read(reader) ? [editOffset.edits[0]] : editOffset.edits;
 		const edits = offsetEdits.map(e => {
 			const innerEditRange = Range.fromPositions(
 				textModel.getPositionAt(e.replaceRange.start),
@@ -45,6 +51,41 @@ export class InlineEditsViewAndDiffProducer extends Disposable { // TODO: This c
 		return new InlineEditWithChanges(text, diffEdits, model.primaryPosition.get(), inlineEdit.renderExplicitly, inlineEdit.commands, inlineEdit.inlineCompletion);
 	});
 
+	private readonly _inlineEditModel = derived<InlineEditModel | undefined>(this, reader => {
+		const model = this._model.read(reader);
+		if (!model) { return undefined; }
+		const edit = this._inlineEdit.read(reader);
+		if (!edit) { return undefined; }
+
+		const tabAction = derived<InlineEditTabAction>(this, 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;
+		});
+
+		return new InlineEditModel(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.sourceInlineCompletion.showInlineEditMenu) {
+			return undefined;
+		}
+
+		const lineRange = LineRange.ofLength(state.primaryGhostText.lineNumber, 1);
+		const renderExplicitly = false;
+
+		return new GhostTextIndicator(this._editor, model, lineRange, inlineCompletion, renderExplicitly);
+	});
+
 	constructor(
 		private readonly _editor: ICodeEditor,
 		private readonly _edit: IObservable<InlineEdit | undefined>,
@@ -54,6 +95,6 @@ export class InlineEditsViewAndDiffProducer extends Disposable { // TODO: This c
 	) {
 		super();
 
-		this._register(this._instantiationService.createInstance(InlineEditsView, this._editor, this._inlineEdit, this._model, this._focusIsInMenu));
+		this._register(this._instantiationService.createInstance(InlineEditsView, this._editor, this._inlineEditModel, this._ghostTextIndicator, this._focusIsInMenu));
 	}
 }
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 f8c6bcf39345..2881fb21196a 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
@@ -14,7 +14,7 @@ import { Point } from '../../../../../../browser/point.js';
 import { LineRange } from '../../../../../../common/core/lineRange.js';
 import { Position } from '../../../../../../common/core/position.js';
 import { Range } from '../../../../../../common/core/range.js';
-import { IInlineEditsView, IInlineEditsViewHost } from '../inlineEditsViewInterface.js';
+import { IInlineEditsView, InlineEditTabAction } from '../inlineEditsViewInterface.js';
 import { InlineEditWithChanges } from '../inlineEditWithChanges.js';
 import { getOriginalBorderColor, originalBackgroundColor } from '../theme.js';
 import { createRectangle, getPrefixTrim, mapOutFalsy, maxContentWidthInRange } from '../utils/utils.js';
@@ -32,7 +32,7 @@ export class InlineEditsDeletionView extends Disposable implements IInlineEditsV
 			originalRange: LineRange;
 			deletions: Range[];
 		} | undefined>,
-		private readonly _host: IInlineEditsViewHost,
+		private readonly _tabAction: IObservable<InlineEditTabAction>,
 	) {
 		super();
 
@@ -151,7 +151,7 @@ export class InlineEditsDeletionView extends Disposable implements IInlineEditsV
 			{ hideLeft: layoutInfo.horizontalScrollOffset !== 0 }
 		);
 
-		const originalBorderColor = getOriginalBorderColor(this._host.tabAction).read(reader);
+		const originalBorderColor = getOriginalBorderColor(this._tabAction).read(reader);
 
 		return [
 			n.svgElem('path', {
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 38fe0c00ee0c..2f631455e497 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
@@ -23,7 +23,7 @@ import { TokenArray } from '../../../../../../common/tokens/tokenArray.js';
 import { InlineDecoration, InlineDecorationType } from '../../../../../../common/viewModel.js';
 import { GhostText, GhostTextPart } from '../../../model/ghostText.js';
 import { GhostTextView } from '../../ghostText/ghostTextView.js';
-import { IInlineEditsView, IInlineEditsViewHost } from '../inlineEditsViewInterface.js';
+import { IInlineEditsView, InlineEditTabAction } from '../inlineEditsViewInterface.js';
 import { getModifiedBorderColor, modifiedChangedLineBackgroundColor } from '../theme.js';
 import { createRectangle, getPrefixTrim, mapOutFalsy } from '../utils/utils.js';
 
@@ -106,7 +106,7 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 			startColumn: number;
 			text: string;
 		} | undefined>,
-		private readonly _host: IInlineEditsViewHost,
+		private readonly _tabAction: IObservable<InlineEditTabAction>,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@ILanguageService private readonly _languageService: ILanguageService,
 	) {
@@ -255,7 +255,7 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 			{ hideLeft: croppedOverlay.left !== overlay.left }
 		);
 
-		const modifiedBorderColor = getModifiedBorderColor(this._host.tabAction).read(reader);
+		const modifiedBorderColor = getModifiedBorderColor(this._tabAction).read(reader);
 
 		return [
 			n.svgElem('path', {
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 123fb77cd78a..c2fb53db63b8 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
@@ -25,7 +25,7 @@ import { IModelDecorationOptions, TrackedRangeStickiness } from '../../../../../
 import { LineTokens } from '../../../../../../common/tokens/lineTokens.js';
 import { TokenArray } from '../../../../../../common/tokens/tokenArray.js';
 import { InlineDecoration, InlineDecorationType } from '../../../../../../common/viewModel.js';
-import { IInlineEditsView, IInlineEditsViewHost } from '../inlineEditsViewInterface.js';
+import { IInlineEditsView, InlineEditTabAction } from '../inlineEditsViewInterface.js';
 import { getModifiedBorderColor, modifiedChangedLineBackgroundColor } from '../theme.js';
 import { getPrefixTrim, mapOutFalsy, rectToProps } from '../utils/utils.js';
 import { rangesToBubbleRanges, Replacement } from './inlineEditsWordReplacementView.js';
@@ -197,7 +197,7 @@ export class InlineEditsLineReplacementView extends Disposable implements IInlin
 				l.style.position = 'relative';
 			});
 
-			const modifiedBorderColor = getModifiedBorderColor(this._host.tabAction).read(reader);
+			const modifiedBorderColor = getModifiedBorderColor(this._tabAction).read(reader);
 
 			return [
 				n.div({
@@ -287,7 +287,7 @@ export class InlineEditsLineReplacementView extends Disposable implements IInlin
 			modifiedLines: string[];
 			replacements: Replacement[];
 		} | undefined>,
-		private readonly _host: IInlineEditsViewHost,
+		private readonly _tabAction: IObservable<InlineEditTabAction>,
 		@ILanguageService private readonly _languageService: ILanguageService
 	) {
 		super();
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 a2e6f5fa2337..41ff1f50b230 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
@@ -23,7 +23,7 @@ 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, IInlineEditsViewHost } from '../inlineEditsViewInterface.js';
+import { IInlineEditsView, InlineEditTabAction } from '../inlineEditsViewInterface.js';
 import { InlineEditWithChanges } from '../inlineEditWithChanges.js';
 import { getModifiedBorderColor, getOriginalBorderColor, modifiedBackgroundColor, originalBackgroundColor } from '../theme.js';
 import { PathBuilder, createRectangle, getOffsetForPos, mapOutFalsy, maxContentWidthInRange } from '../utils/utils.js';
@@ -64,7 +64,7 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 			newTextLineCount: number;
 			originalDisplayRange: LineRange;
 		} | undefined>,
-		private readonly _host: IInlineEditsViewHost,
+		private readonly _tabAction: IObservable<InlineEditTabAction>,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IThemeService private readonly _themeService: IThemeService,
 	) {
@@ -123,7 +123,7 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 	private readonly previewRef = n.ref<HTMLDivElement>();
 
 	private readonly _editorContainer = n.div({
-		class: ['editorContainer', this._editorObs.getOption(EditorOption.inlineSuggest).map(v => !v.edits.useGutterIndicator && 'showHover')],
+		class: ['editorContainer'],
 		style: { position: 'absolute', overflow: 'hidden', cursor: 'pointer' },
 		onmousedown: e => {
 			e.preventDefault(); // This prevents that the editor loses focus
@@ -508,8 +508,8 @@ export class InlineEditsSideBySideView extends Disposable implements IInlineEdit
 		const layoutInfoObs = mapOutFalsy(this._previewEditorLayoutInfo).read(reader);
 		if (!layoutInfoObs) { return undefined; }
 
-		const modifiedBorderColor = getModifiedBorderColor(this._host.tabAction).read(reader);
-		const originalBorderColor = getOriginalBorderColor(this._host.tabAction).read(reader);
+		const modifiedBorderColor = getModifiedBorderColor(this._tabAction).read(reader);
+		const originalBorderColor = getOriginalBorderColor(this._tabAction).read(reader);
 
 		return [
 			n.svgElem('path', {
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 d3ee68c60cc3..d18dad373c37 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
@@ -14,9 +14,9 @@ import { Rect } from '../../../../../../browser/rect.js';
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
 import { OffsetRange } from '../../../../../../common/core/offsetRange.js';
 import { SingleTextEdit } from '../../../../../../common/core/textEdit.js';
-import { IInlineEditsView } from '../inlineEditsViewInterface.js';
+import { IInlineEditsView, InlineEditTabAction } from '../inlineEditsViewInterface.js';
 import { getModifiedBorderColor } from '../theme.js';
-import { InlineEditTabAction, mapOutFalsy, rectToProps } from '../utils/utils.js';
+import { mapOutFalsy, rectToProps } from '../utils/utils.js';
 
 export class InlineEditsWordInsertView extends Disposable implements IInlineEditsView {
 
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 86d42cb4de31..f7272f15052c 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
@@ -7,7 +7,7 @@ import { getWindow, n, ObserverNodeWithElement } from '../../../../../../../base
 import { IMouseEvent, StandardMouseEvent } from '../../../../../../../base/browser/mouseEvent.js';
 import { Emitter } from '../../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../../base/common/lifecycle.js';
-import { constObservable, derived, observableValue } from '../../../../../../../base/common/observable.js';
+import { constObservable, derived, IObservable, observableValue } from '../../../../../../../base/common/observable.js';
 import { editorBackground, editorHoverForeground, scrollbarShadow } from '../../../../../../../platform/theme/common/colorRegistry.js';
 import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
 import { ObservableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
@@ -22,7 +22,7 @@ import { SingleTextEdit } from '../../../../../../common/core/textEdit.js';
 import { ILanguageService } from '../../../../../../common/languages/language.js';
 import { LineTokens } from '../../../../../../common/tokens/lineTokens.js';
 import { TokenArray } from '../../../../../../common/tokens/tokenArray.js';
-import { IInlineEditsView, IInlineEditsViewHost } from '../inlineEditsViewInterface.js';
+import { IInlineEditsView, InlineEditTabAction } from '../inlineEditsViewInterface.js';
 import { getModifiedBorderColor, modifiedChangedTextOverlayColor, originalChangedTextOverlayColor, replacementViewBackground } from '../theme.js';
 import { mapOutFalsy, rectToProps } from '../utils/utils.js';
 
@@ -47,7 +47,7 @@ export class InlineEditsWordReplacementView extends Disposable implements IInlin
 		/** Must be single-line in both sides */
 		private readonly _edit: SingleTextEdit,
 		private readonly _innerEdits: SingleTextEdit[],
-		private readonly _host: IInlineEditsViewHost,
+		private readonly _tabAction: IObservable<InlineEditTabAction>,
 		@ILanguageService private readonly _languageService: ILanguageService,
 	) {
 		super();
@@ -162,7 +162,7 @@ export class InlineEditsWordReplacementView extends Disposable implements IInlin
 
 			const edits = layoutProps.innerEdits.map(edit => ({ modified: edit.modified.translateX(-contentLeft), original: edit.original.translateX(-contentLeft) }));
 
-			const modifiedBorderColor = getModifiedBorderColor(this._host.tabAction).read(reader);
+			const modifiedBorderColor = getModifiedBorderColor(this._tabAction).read(reader);
 
 			return [
 				n.div({
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 85cc06a8a271..056fbf695d18 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/theme.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/theme.ts
@@ -8,7 +8,7 @@ import { IObservable } from '../../../../../../base/common/observable.js';
 import { localize } from '../../../../../../nls.js';
 import { diffRemoved, diffInsertedLine, diffInserted, editorHoverBorder, editorHoverStatusBarBackground, buttonBackground, buttonForeground, buttonSecondaryBackground, buttonSecondaryForeground } from '../../../../../../platform/theme/common/colorRegistry.js';
 import { registerColor, transparent, asCssVariable, lighten, darken } from '../../../../../../platform/theme/common/colorUtils.js';
-import { InlineEditTabAction } from './utils/utils.js';
+import { InlineEditTabAction } from './inlineEditsViewInterface.js';
 
 export const originalBackgroundColor = registerColor(
 	'inlineEdit.originalBackground',
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 9427e0b23a09..a393e04e241b 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
@@ -26,12 +26,6 @@ import { SingleTextEdit, TextEdit } from '../../../../../../common/core/textEdit
 import { RangeMapping } from '../../../../../../common/diff/rangeMapping.js';
 import { indentOfLine } from '../../../../../../common/model/textModel.js';
 
-export enum InlineEditTabAction {
-	Jump = 'jump',
-	Accept = 'accept',
-	Inactive = 'inactive'
-}
-
 export function maxContentWidthInRange(editor: ObservableCodeEditor, range: LineRange, reader: IReader | undefined): number {
 	editor.layoutInfo.read(reader);
 	editor.value.read(reader);

From 1a7a159d91520e05d4ff9fb2bb1c60dd9a0fec28 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 4 Mar 2025 14:19:02 +0100
Subject: [PATCH 0605/1815] chat - better flow from status when reaching quota
 (#242548) (#242560)

---
 .../chat/browser/actions/chatActions.ts       | 18 ++--
 .../contrib/chat/browser/chatStatus.ts        | 84 ++++++++-----------
 .../contrib/chat/browser/media/chatStatus.css | 14 ++--
 3 files changed, 51 insertions(+), 65 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index 43a4a2646fd1..9ea0054f433d 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -726,7 +726,13 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 					primaryActionIcon = Codicon.copilotNotConnected;
 				} else if (chatQuotaExceeded || completionsQuotaExceeded) {
 					primaryActionId = OPEN_CHAT_QUOTA_EXCEEDED_DIALOG;
-					primaryActionTitle = quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded });
+					if (chatQuotaExceeded && !completionsQuotaExceeded) {
+						primaryActionTitle = localize('chatQuotaExceededButton', "Monthly chat messages limit reached. Click for details.");
+					} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
+						primaryActionTitle = localize('completionsQuotaExceededButton', "Monthly code completions limit reached. Click for details.");
+					} else {
+						primaryActionTitle = localize('chatAndCompletionsQuotaExceededButton', "Copilot Free plan limit reached. Click for details.");
+					}
 					primaryActionIcon = Codicon.copilotWarning;
 				} else {
 					primaryActionId = TOGGLE_CHAT_ACTION_ID;
@@ -749,13 +755,3 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 		markAsSingleton(disposable);
 	}
 }
-
-export function quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded }: { chatQuotaExceeded: boolean; completionsQuotaExceeded: boolean }): string {
-	if (chatQuotaExceeded && !completionsQuotaExceeded) {
-		return localize('chatQuotaExceededButton', "Monthly chat messages limit reached. Click for details.");
-	} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-		return localize('completionsQuotaExceededButton', "Monthly code completions limit reached. Click for details.");
-	} else {
-		return localize('chatAndCompletionsQuotaExceededButton', "Copilot Free plan limit reached. Click for details.");
-	}
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index f50bf3164f3b..eae9aa7f39b5 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -6,19 +6,18 @@
 import './media/chatStatus.css';
 import { safeIntl } from '../../../../base/common/date.js';
 import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { language, OS } from '../../../../base/common/platform.js';
+import { language } from '../../../../base/common/platform.js';
 import { localize } from '../../../../nls.js';
 import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowTooltipCommand, StatusbarAlignment, StatusbarEntryKind, TooltipContent } from '../../../services/statusbar/browser/statusbar.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { quotaToButtonMessage, OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, TOGGLE_CHAT_ACTION_ID, CHAT_OPEN_ACTION_ID } from './actions/chatActions.js';
+import { OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, TOGGLE_CHAT_ACTION_ID, CHAT_OPEN_ACTION_ID } from './actions/chatActions.js';
 import { $, addDisposableListener, append, clearNode, EventHelper, EventLike, EventType } from '../../../../base/browser/dom.js';
 import { ChatEntitlement, ChatEntitlementService, IChatEntitlementService } from '../common/chatEntitlementService.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
-import { defaultCheckboxStyles, defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.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 { Command } from '../../../../editor/common/languages.js';
@@ -38,6 +37,7 @@ import { IProductService } from '../../../../platform/product/common/productServ
 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';
 
 //#region --- colors
 
@@ -160,55 +160,46 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	private getEntryProps(): IStatusbarEntry {
 		let text = '$(copilot)';
 		let ariaLabel = localize('chatStatus', "Copilot Status");
-		let command: string | Command;
-		let tooltip: TooltipContent;
+		let command: string | Command = ShowTooltipCommand;
+		let tooltip: TooltipContent = { element: token => this.dashboard.value.show(token) };
 		let kind: StatusbarEntryKind | undefined;
 
-		// Quota Exceeded
 		const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatEntitlementService.quotas;
-		if (chatQuotaExceeded || completionsQuotaExceeded) {
-			let quotaWarning: string;
-			if (chatQuotaExceeded && !completionsQuotaExceeded) {
-				quotaWarning = localize('chatQuotaExceededStatus', "Chat limit reached");
-			} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-				quotaWarning = localize('completionsQuotaExceededStatus', "Completions limit reached");
-			} else {
-				quotaWarning = localize('chatAndCompletionsQuotaExceededStatus', "Limit reached");
-			}
-
-			text = `$(copilot-warning) ${quotaWarning}`;
-			ariaLabel = quotaWarning;
-			command = OPEN_CHAT_QUOTA_EXCEEDED_DIALOG;
-			tooltip = quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded });
-			kind = 'prominent';
-		}
 
 		// Copilot Not Installed
-		else if (
+		if (
 			this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.installed.key) === false ||
 			this.chatEntitlementService.entitlement === ChatEntitlement.Available
 		) {
 			tooltip = CHAT_SETUP_ACTION_LABEL.value;
+			ariaLabel = tooltip;
 			command = TOGGLE_CHAT_ACTION_ID;
 		}
 
 		// Signed out
 		else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
-			text = '$(copilot-not-connected) Sign In to Use Copilot';
-			ariaLabel = localize('signInToUseCopilot', "Sign in to Use Copilot...");
-			tooltip = {
-				element: token => this.dashboard.value.show(token)
-			};
+			const signInWarning = localize('signInToUseCopilot', "Sign in to Use Copilot...");
+			text = `$(copilot-warning) ${signInWarning}`;
+			ariaLabel = signInWarning;
 			command = ChatStatusBarEntry.SIGN_IN_COMMAND_ID;
 			kind = 'prominent';
 		}
 
-		// Any other User
-		else {
-			tooltip = {
-				element: token => this.dashboard.value.show(token)
-			};
-			command = ShowTooltipCommand;
+		// Quota Exceeded
+		else if (chatQuotaExceeded || completionsQuotaExceeded) {
+			let quotaWarning: string;
+			if (chatQuotaExceeded && !completionsQuotaExceeded) {
+				quotaWarning = localize('chatQuotaExceededStatus', "Chat limit reached");
+			} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
+				quotaWarning = localize('completionsQuotaExceededStatus', "Completions limit reached");
+			} else {
+				quotaWarning = localize('chatAndCompletionsQuotaExceededStatus', "Limit reached");
+			}
+
+			text = `$(copilot-warning) ${quotaWarning}`;
+			ariaLabel = quotaWarning;
+			command = OPEN_CHAT_QUOTA_EXCEEDED_DIALOG;
+			kind = 'prominent';
 		}
 
 		return {
@@ -258,7 +249,7 @@ class ChatStatusDashboard extends Disposable {
 
 		// Quota Indicator
 		if (this.chatEntitlementService.entitlement === ChatEntitlement.Limited) {
-			const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate } = this.chatEntitlementService.quotas;
+			const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate, chatQuotaExceeded, completionsQuotaExceeded } = this.chatEntitlementService.quotas;
 
 			this.element.appendChild($('div.header', undefined, localize('usageTitle', "Copilot Free Usage")));
 
@@ -267,6 +258,12 @@ class ChatStatusDashboard extends Disposable {
 
 			this.element.appendChild($('div.description', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.value.format(quotaResetDate))));
 
+			if (chatQuotaExceeded || completionsQuotaExceeded) {
+				const upgradePlanButton = disposables.add(new Button(this.element, { ...defaultButtonStyles }));
+				upgradePlanButton.label = localize('upgradeToCopilotPro', "Upgrade to Copilot Pro");
+				disposables.add(upgradePlanButton.onDidClick(() => this.commandService.executeCommand('workbench.action.chat.upgradePlan')));
+			}
+
 			(async () => {
 				await this.chatEntitlementService.update(token);
 				if (token.isCancellationRequested) {
@@ -430,17 +427,10 @@ class ChatStatusDashboard extends Disposable {
 		};
 
 		for (const entry of entries) {
-			const keys = this.keybindingService.lookupKeybinding(entry.id);
-			if (!keys) {
-				continue;
-			}
-
-			const shortcut = append(shortcuts, $('div.shortcut', { tabIndex: 0, role: 'button', 'aria-label': entry.text }));
-
-			append(shortcut, $('span.shortcut-label', undefined, entry.text));
-
-			const shortcutKey = disposables.add(new KeybindingLabel(shortcut, OS, { ...defaultKeybindingLabelStyles }));
-			shortcutKey.set(keys);
+			const shortcut = append(shortcuts, $('div.shortcut', { tabIndex: 0, role: 'button', 'aria-label': entry.text },
+				$('span.shortcut-label', undefined, entry.text),
+				$('span.shortcut-value', undefined, this.keybindingService.lookupKeybinding(entry.id)?.getLabel() ?? '')
+			));
 
 			disposables.add(Gesture.addTarget(shortcut));
 			[EventType.CLICK, TouchEventType.Tap].forEach(eventType => {
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
index aecbe61a4b17..dfa1fc08335e 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
@@ -25,6 +25,11 @@
 	color: var(--vscode-descriptionForeground);
 }
 
+.chat-status-bar-entry-tooltip .monaco-button {
+	margin-top: 4px;
+	margin-bottom: 4px;
+}
+
 /* Settings */
 
 .chat-status-bar-entry-tooltip .settings {
@@ -87,13 +92,8 @@
 	cursor: pointer;
 }
 
-.chat-status-bar-entry-tooltip .shortcuts .shortcut .monaco-keybinding {
-	cursor: pointer;
-}
-
-.chat-status-bar-entry-tooltip .shortcuts .shortcut .monaco-keybinding > .monaco-keybinding-key {
-	padding: 2px 4px;
-	font-size: 10px;
+.chat-status-bar-entry-tooltip .shortcuts .shortcut .shortcut-value {
+	color: var(--vscode-descriptionForeground);
 }
 
 /* Quota Indicator */

From 6d941ed1c25fdf01c2fc0a29a4f80acdc1973b41 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Tue, 4 Mar 2025 15:49:56 +0100
Subject: [PATCH 0606/1815] Adresses #242555 in main (#242556)

---
 .../inlineCompletions/browser/model/inlineCompletionsModel.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
index 551e9138567a..63deb8574a4d 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -282,7 +282,7 @@ export class InlineCompletionsModel extends Disposable {
 		let inlineEdit: InlineCompletionWithUpdatedRange | undefined = undefined;
 		const visibleCompletions: InlineCompletionWithUpdatedRange[] = [];
 		for (const completion of c.inlineCompletions) {
-			if (!(completion.sourceInlineCompletion.isInlineEdit || completion.sourceInlineCompletion.showInlineEditMenu)) {
+			if (!completion.sourceInlineCompletion.isInlineEdit) {
 				if (completion.isVisible(this.textModel, cursorPosition, reader)) {
 					visibleCompletions.push(completion);
 				}

From ba2edd30162c9cf9c911e665fd78e56e216b777b Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Tue, 4 Mar 2025 16:12:51 +0100
Subject: [PATCH 0607/1815] Fix italic text cutoff in tabs and settings
 (#242564)

fixes https://github.com/microsoft/vscode/issues/207409
---
 .../browser/parts/editor/media/multieditortabscontrol.css     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
index f36a39511215..1452d6ef5451 100644
--- a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
@@ -367,6 +367,10 @@
 	}
 }
 
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-fit .monaco-icon-label.italic {
+	padding-right: 3px; /* https://github.com/microsoft/vscode/issues/207409 */
+}
+
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink > .monaco-icon-label > .monaco-icon-label-container,
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-fixed > .monaco-icon-label > .monaco-icon-label-container {
 	text-overflow: clip;

From 4537390895ad644093b255b5f8f66f10b294b324 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Tue, 4 Mar 2025 17:18:57 +0100
Subject: [PATCH 0608/1815] Add a workaround for browser bug (#242459)

* Add a workaround for browser bug exposed by the steps at #12384

* refresh focus state before returning whether focused or not

---------

Co-authored-by: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
---
 .../editContext/native/nativeEditContext.ts   |  3 ++-
 .../native/nativeEditContextUtils.ts          | 26 +++++++++++++------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
index 76a5bd52fe5f..cee5e3f9df9a 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
@@ -258,7 +258,8 @@ export class NativeEditContext extends AbstractEditContext {
 	}
 
 	public isFocused(): boolean {
-		return this._focusTracker.isFocused || (getActiveWindow().document.activeElement === this.textArea.domNode);
+		this.refreshFocusState();
+		return this._focusTracker.isFocused;
 	}
 
 	public focus(): void {
diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
index b3166de0437a..4c4667b613ca 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, getActiveWindow } from '../../../../../base/browser/dom.js';
+import { addDisposableListener, getActiveElement, getShadowRoot } from '../../../../../base/browser/dom.js';
 import { IDisposable, Disposable } from '../../../../../base/common/lifecycle.js';
 
 export interface ITypeData {
@@ -21,8 +21,12 @@ export class FocusTracker extends Disposable {
 		private readonly _onFocusChange: (newFocusValue: boolean) => void,
 	) {
 		super();
-		this._register(addDisposableListener(this._domNode, 'focus', () => this._handleFocusedChanged(true)));
-		this._register(addDisposableListener(this._domNode, 'blur', () => this._handleFocusedChanged(false)));
+		this._register(addDisposableListener(this._domNode, 'focus', () => {
+			this.refreshFocusState();
+		}));
+		this._register(addDisposableListener(this._domNode, 'blur', () => {
+			this._handleFocusedChanged(false);
+		}));
 	}
 
 	private _handleFocusedChanged(focused: boolean): void {
@@ -34,15 +38,21 @@ export class FocusTracker extends Disposable {
 	}
 
 	public focus(): void {
-		// fixes: https://github.com/microsoft/vscode/issues/228147
-		// Immediately call this method in order to directly set the field isFocused to true so the textInputFocus context key is evaluated correctly
-		this._handleFocusedChanged(true);
 		this._domNode.focus();
+		this.refreshFocusState();
 	}
 
 	public refreshFocusState(): void {
-		const focused = this._domNode === getActiveWindow().document.activeElement;
-		this._handleFocusedChanged(focused);
+
+		let activeElement: Element | null = null;
+		const shadowRoot = getShadowRoot(this._domNode);
+		if (shadowRoot) {
+			activeElement = shadowRoot.activeElement;
+		} else {
+			activeElement = getActiveElement();
+		}
+
+		this._handleFocusedChanged(activeElement === this._domNode);
 	}
 
 	get isFocused(): boolean {

From 74b7fdfbf94f870f26afcb7b1393c853c5aee705 Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Tue, 4 Mar 2025 08:32:22 -0800
Subject: [PATCH 0609/1815] fix: render chat implicit context widget even if
 there are no real attachments (#242573)

---
 src/vs/workbench/contrib/chat/browser/chatInputPart.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 16d8c42b2419..d7cc421a206d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -990,8 +990,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		const hoverDelegate = store.add(createInstantHoverDelegate());
 
 		const attachments = [...this.attachmentModel.attachments.entries()];
-		dom.setVisibility(Boolean(attachments.length) || (this.addFilesToolbar && !this.addFilesToolbar.isEmpty()) || Boolean(this.implicitContext?.value) || !this.instructionAttachmentsPart.empty, this.attachmentsContainer);
-		dom.setVisibility(Boolean(attachments.length), this.attachedContextContainer);
+		const hasAttachments = Boolean(attachments.length) || Boolean(this.implicitContext?.value) || !this.instructionAttachmentsPart.empty;
+		dom.setVisibility(Boolean(hasAttachments || (this.addFilesToolbar && !this.addFilesToolbar.isEmpty())), this.attachmentsContainer);
+		dom.setVisibility(hasAttachments, this.attachedContextContainer);
 		if (!attachments.length) {
 			this._indexOfLastAttachedContextDeletedWithKeyboard = -1;
 		}

From 4164ded960163e48bbff6735bb5de8f4bed28478 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 4 Mar 2025 18:26:56 +0100
Subject: [PATCH 0610/1815] search editor - fix leak (#242579)

---
 src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
index 2ef0de41b46f..06c660a0325b 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
@@ -201,7 +201,7 @@ export class SearchEditor extends AbstractTextCodeEditor<SearchEditorViewState>
 			ariaLabel: localize('label.includes', 'Search Include Patterns'),
 			inputBoxStyles: searchEditorInputboxStyles
 		}));
-		this.inputPatternIncludes.onSubmit(triggeredOnType => this.triggerSearch({ resetCursor: false, delay: triggeredOnType ? this.searchConfig.searchOnTypeDebouncePeriod : 0 }));
+		this._register(this.inputPatternIncludes.onSubmit(triggeredOnType => this.triggerSearch({ resetCursor: false, delay: triggeredOnType ? this.searchConfig.searchOnTypeDebouncePeriod : 0 })));
 		this._register(this.inputPatternIncludes.onChangeSearchInEditorsBox(() => this.triggerSearch()));
 
 		// Excludes

From a23f8ead79a1708adecbaf910a84fa8590aa00c7 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Tue, 4 Mar 2025 10:17:24 -0800
Subject: [PATCH 0611/1815] require 'prompt files' synchronization to be
 explicitly enabled by users (#242586)

Co-authored-by: Martin Aeschlimann <martinae@microsoft.com>
---
 src/vs/platform/userDataSync/common/userDataSync.ts         | 2 +-
 .../userDataSync/common/userDataSyncEnablementService.ts    | 6 ++++--
 .../platform/userDataSync/test/common/userDataSyncClient.ts | 5 +++++
 .../workbench/contrib/userDataSync/browser/userDataSync.ts  | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/vs/platform/userDataSync/common/userDataSync.ts b/src/vs/platform/userDataSync/common/userDataSync.ts
index 51b6957d2f03..b8f7b5c506e6 100644
--- a/src/vs/platform/userDataSync/common/userDataSync.ts
+++ b/src/vs/platform/userDataSync/common/userDataSync.ts
@@ -532,7 +532,7 @@ export interface IUserDataSyncEnablementService {
 	setEnablement(enabled: boolean): void;
 
 	readonly onDidChangeResourceEnablement: Event<[SyncResource, boolean]>;
-	isResourceEnabled(resource: SyncResource): boolean;
+	isResourceEnabled(resource: SyncResource, defaultValue?: boolean): boolean;
 	setResourceEnablement(resource: SyncResource, enabled: boolean): void;
 
 	getResourceSyncStateVersion(resource: SyncResource): string | undefined;
diff --git a/src/vs/platform/userDataSync/common/userDataSyncEnablementService.ts b/src/vs/platform/userDataSync/common/userDataSyncEnablementService.ts
index 163f805c7309..978ef5416f96 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncEnablementService.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncEnablementService.ts
@@ -52,8 +52,10 @@ export class UserDataSyncEnablementService extends Disposable implements IUserDa
 		this.storageService.store(enablementKey, enabled, StorageScope.APPLICATION, StorageTarget.MACHINE);
 	}
 
-	isResourceEnabled(resource: SyncResource): boolean {
-		return this.storageService.getBoolean(getEnablementKey(resource), StorageScope.APPLICATION, true);
+	isResourceEnabled(resource: SyncResource, defaultValue?: boolean): boolean {
+		const storedValue = this.storageService.getBoolean(getEnablementKey(resource), StorageScope.APPLICATION);
+		defaultValue = defaultValue ?? resource !== SyncResource.Prompts;
+		return storedValue ?? defaultValue;
 	}
 
 	setResourceEnablement(resource: SyncResource, enabled: boolean): void {
diff --git a/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts b/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
index 7d2891cea1d5..2cf0fb06ade0 100644
--- a/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
+++ b/src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
@@ -141,6 +141,11 @@ export class UserDataSyncClient extends Disposable {
 			await fileService.writeFile(environmentService.argvResource, VSBuffer.fromString(JSON.stringify({ 'locale': 'en' })));
 		}
 		await configurationService.reloadConfiguration();
+
+		// `prompts` resource is disabled by default, so enable it for tests
+		this.instantiationService
+			.get(IUserDataSyncEnablementService)
+			.setResourceEnablement(SyncResource.Prompts, true);
 	}
 
 	async sync(): Promise<void> {
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
index 43279e692769..b5761e089f34 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -571,7 +571,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 
 			const items = this.getConfigureSyncQuickPickItems();
 			quickPick.items = items;
-			quickPick.selectedItems = items.filter(item => this.userDataSyncEnablementService.isResourceEnabled(item.id));
+			quickPick.selectedItems = items.filter(item => this.userDataSyncEnablementService.isResourceEnabled(item.id, true));
 			let accepted: boolean = false;
 			disposables.add(Event.any(quickPick.onDidAccept, quickPick.onDidCustom)(() => {
 				accepted = true;

From 72a7b5988438a3a41b3f6723d563111de626444e Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Tue, 4 Mar 2025 09:44:08 -0800
Subject: [PATCH 0612/1815] disable user prompts synchronization in stable

---
 .../workbench/contrib/userDataSync/browser/userDataSync.ts  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
index b5761e089f34..c8fdf9f404b8 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -617,8 +617,10 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 			label: getSyncAreaLabel(SyncResource.Profiles),
 		}];
 
-		// if the `reusable prompt` feature is enabled, add appropriate item to the list
-		if (PromptsConfig.enabled(this.configService)) {
+		// if the `reusable prompt` feature is enabled and in vscode
+		// insiders, add the `Prompts` resource item to the list
+		const isInsiders = (this.productService.quality !== 'stable');
+		if (PromptsConfig.enabled(this.configService) && isInsiders) {
 			result.push({
 				id: SyncResource.Prompts,
 				label: getSyncAreaLabel(SyncResource.Prompts)

From 49fcfcc8b3bca1f8cab21bbf969f092d6b0a11e8 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Tue, 4 Mar 2025 14:10:55 -0500
Subject: [PATCH 0613/1815] on widget hide, reset context key (#242584)

fix #242582
---
 .../workbench/services/suggest/browser/simpleSuggestWidget.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
index c60674c1ddf8..7109812270b0 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
@@ -612,7 +612,7 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 		this._pendingLayout.clear();
 		this._pendingShowDetails.clear();
 		// this._loadingTimeout?.dispose();
-
+		this._ctxSuggestWidgetHasBeenNavigated.reset();
 		this._setState(State.Hidden);
 		this._onDidHide.fire(this);
 		dom.hide(this.element.domNode);

From 59d408f89ef872b37a71d8dd7f88c2425855fefa Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 4 Mar 2025 11:11:59 -0800
Subject: [PATCH 0614/1815] Prevent using an invalid model with agent mode
 (#242598)

Fix #242118
---
 .../contrib/chat/browser/chatInputPart.ts         | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index d7cc421a206d..a35da7d08ad9 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -413,6 +413,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			if (model) {
 				this._currentLanguageModel = { metadata: model, identifier: persistedSelection };
 				this._onDidChangeCurrentLanguageModel.fire(this._currentLanguageModel);
+				this.checkModelSupported();
 			} else {
 				this._waitForPersistedLanguageModel.value = this.languageModelsService.onDidChangeLanguageModels(e => {
 					const persistedModel = e.added?.find(m => m.identifier === persistedSelection);
@@ -422,6 +423,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 						if (persistedModel.metadata.isUserSelectable) {
 							this._currentLanguageModel = { metadata: persistedModel.metadata, identifier: persistedSelection };
 							this._onDidChangeCurrentLanguageModel.fire(this._currentLanguageModel!);
+							this.checkModelSupported();
 						}
 					}
 				});
@@ -429,12 +431,16 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}
 
 		this._register(this.chatAgentService.onDidChangeToolsAgentModeEnabled(() => {
-			if (this._currentLanguageModel && !this.modelSupportedForDefaultAgent(this._currentLanguageModel)) {
-				this.setCurrentLanguageModelToDefault();
-			}
+			this.checkModelSupported();
 		}));
 	}
 
+	private checkModelSupported(): void {
+		if (this._currentLanguageModel && !this.modelSupportedForDefaultAgent(this._currentLanguageModel)) {
+			this.setCurrentLanguageModelToDefault();
+		}
+	}
+
 	private supportsVision(): boolean {
 		return this._currentLanguageModel?.metadata.capabilities?.vision ?? false;
 	}
@@ -473,6 +479,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		this._currentLanguageModel = hasUserSelectableLanguageModels && defaultLanguageModelId ?
 			{ metadata: this.languageModelsService.lookupLanguageModel(defaultLanguageModelId)!, identifier: defaultLanguageModelId } :
 			undefined;
+		if (this._currentLanguageModel) {
+			this._onDidChangeCurrentLanguageModel.fire(this._currentLanguageModel);
+		}
 	}
 
 	private setCurrentLanguageModelByUser(model: ILanguageModelChatMetadataAndIdentifier) {

From ced4aa86fcceaa78c621c4b4ff1ce9a5ece8b296 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Tue, 4 Mar 2025 11:14:58 -0800
Subject: [PATCH 0615/1815] Use setupDelayedHover instead of setupManagedHover
 (#242599)

---
 .../preferences/browser/settingsTree.ts       | 31 ++++++++--------
 .../preferences/browser/settingsWidgets.ts    | 36 +++++++++----------
 .../contrib/preferences/browser/tocTree.ts    |  7 ++--
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
index e4d0236dc2c5..2f49546c8e43 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -33,8 +33,9 @@ import { Disposable, DisposableStore, isDisposable, toDisposable } from '../../.
 import { isIOS } from '../../../../base/common/platform.js';
 import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
 import { isDefined, isUndefinedOrNull } from '../../../../base/common/types.js';
-import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { URI } from '../../../../base/common/uri.js';
 import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { localize } from '../../../../nls.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
@@ -42,6 +43,7 @@ import { ConfigurationTarget, IConfigurationService, getLanguageTagSettingPlainK
 import { ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { IListService, WorkbenchObjectTree } from '../../../../platform/list/browser/listService.js';
@@ -55,23 +57,20 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.js
 import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
 import { getIgnoredSettings } from '../../../../platform/userDataSync/common/settingsMerge.js';
 import { IUserDataSyncEnablementService, getDefaultIgnoredSettings } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { APPLICATION_SCOPES, APPLY_ALL_PROFILES_SETTING, IWorkbenchConfigurationService } from '../../../services/configuration/common/configuration.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { ISetting, ISettingsGroup, SETTINGS_AUTHORITY, SettingValueType } from '../../../services/preferences/common/preferences.js';
+import { getInvalidTypeError } from '../../../services/preferences/common/preferencesValidation.js';
 import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
+import { LANGUAGE_SETTING_TAG, SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU, compareTwoNullableNumbers } from '../common/preferences.js';
+import { settingsNumberInputBackground, settingsNumberInputBorder, settingsNumberInputForeground, settingsSelectBackground, settingsSelectBorder, settingsSelectForeground, settingsSelectListBorder, settingsTextInputBackground, settingsTextInputBorder, settingsTextInputForeground } from '../common/settingsEditorColorRegistry.js';
 import { settingsMoreActionIcon } from './preferencesIcons.js';
 import { SettingsTarget } from './preferencesWidgets.js';
 import { ISettingOverrideClickEvent, SettingsTreeIndicatorsLabel, getIndicatorsLabelAriaLabel } from './settingsEditorSettingIndicators.js';
 import { ITOCEntry } from './settingsLayout.js';
 import { ISettingsEditorViewState, SettingsTreeElement, SettingsTreeGroupChild, SettingsTreeGroupElement, SettingsTreeNewExtensionsElement, SettingsTreeSettingElement, inspectSetting, objectSettingSupportsRemoveDefaultValue, settingKeyToDisplayFormat } from './settingsTreeModels.js';
 import { ExcludeSettingWidget, IBoolObjectDataItem, IIncludeExcludeDataItem, IListDataItem, IObjectDataItem, IObjectEnumOption, IObjectKeySuggester, IObjectValueSuggester, IncludeSettingWidget, ListSettingWidget, ObjectSettingCheckboxWidget, ObjectSettingDropdownWidget, ObjectValue, SettingListEvent } from './settingsWidgets.js';
-import { LANGUAGE_SETTING_TAG, SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU, compareTwoNullableNumbers } from '../common/preferences.js';
-import { settingsNumberInputBackground, settingsNumberInputBorder, settingsNumberInputForeground, settingsSelectBackground, settingsSelectBorder, settingsSelectForeground, settingsSelectListBorder, settingsTextInputBackground, settingsTextInputBorder, settingsTextInputForeground } from '../common/settingsEditorColorRegistry.js';
-import { APPLICATION_SCOPES, APPLY_ALL_PROFILES_SETTING, IWorkbenchConfigurationService } from '../../../services/configuration/common/configuration.js';
-import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
-import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { ISetting, ISettingsGroup, SETTINGS_AUTHORITY, SettingValueType } from '../../../services/preferences/common/preferences.js';
-import { getInvalidTypeError } from '../../../services/preferences/common/preferencesValidation.js';
-import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
-import { IHoverService } from '../../../../platform/hover/browser/hover.js';
-import { URI } from '../../../../base/common/uri.js';
 
 const $ = DOM.$;
 
@@ -875,7 +874,9 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
 
 		const descriptionElement = DOM.append(container, $('.setting-item-description'));
 		const modifiedIndicatorElement = DOM.append(container, $('.setting-item-modified-indicator'));
-		toDispose.add(this._hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), modifiedIndicatorElement, () => localize('modified', "The setting has been configured in the current scope.")));
+		toDispose.add(this._hoverService.setupDelayedHover(modifiedIndicatorElement, {
+			content: localize('modified', "The setting has been configured in the current scope.")
+		}));
 
 		const valueElement = DOM.append(container, $('.setting-item-value'));
 		const controlElement = DOM.append(valueElement, $('div.setting-item-control'));
@@ -962,7 +963,7 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
 
 		const titleTooltip = setting.key + (element.isConfigured ? ' - Modified' : '');
 		template.categoryElement.textContent = element.displayCategory ? (element.displayCategory + ': ') : '';
-		template.elementDisposables.add(this._hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), template.categoryElement, titleTooltip));
+		template.elementDisposables.add(this._hoverService.setupDelayedHover(template.categoryElement, { content: titleTooltip }));
 
 		template.labelElement.text = element.displayLabel;
 		template.labelElement.title = titleTooltip;
@@ -1994,7 +1995,9 @@ class SettingBoolRenderer extends AbstractSettingRenderer implements ITreeRender
 		const controlElement = DOM.append(descriptionAndValueElement, $('.setting-item-bool-control'));
 		const descriptionElement = DOM.append(descriptionAndValueElement, $('.setting-item-description'));
 		const modifiedIndicatorElement = DOM.append(container, $('.setting-item-modified-indicator'));
-		toDispose.add(this._hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), modifiedIndicatorElement, localize('modified', "The setting has been configured in the current scope.")));
+		toDispose.add(this._hoverService.setupDelayedHover(modifiedIndicatorElement, {
+			content: localize('modified', "The setting has been configured in the current scope.")
+		}));
 
 		const deprecationWarningElement = DOM.append(container, $('.setting-item-deprecation-message'));
 
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts b/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
index 258984d755f4..98702b1b4a78 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
@@ -8,30 +8,28 @@ import * as DOM from '../../../../base/browser/dom.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { Button } from '../../../../base/browser/ui/button/button.js';
-import { Toggle, unthemedToggleStyles } from '../../../../base/browser/ui/toggle/toggle.js';
 import { InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
 import { SelectBox } from '../../../../base/browser/ui/selectBox/selectBox.js';
+import { Toggle, unthemedToggleStyles } from '../../../../base/browser/ui/toggle/toggle.js';
 import { IAction } from '../../../../base/common/actions.js';
 import { disposableTimeout } from '../../../../base/common/async.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { isIOS } from '../../../../base/common/platform.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 import { isDefined, isUndefinedOrNull } from '../../../../base/common/types.js';
-import './media/settingsWidgets.css';
 import { localize } from '../../../../nls.js';
 import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { settingsDiscardIcon, settingsEditIcon, settingsRemoveIcon } from './preferencesIcons.js';
-import { settingsSelectBackground, settingsSelectBorder, settingsSelectForeground, settingsSelectListBorder, settingsTextInputBackground, settingsTextInputBorder, settingsTextInputForeground } from '../common/settingsEditorColorRegistry.js';
-import { defaultButtonStyles, getInputBoxStyle, getSelectBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
-import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { IManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
+import { defaultButtonStyles, getInputBoxStyle, getSelectBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { SettingValueType } from '../../../services/preferences/common/preferences.js';
+import { settingsSelectBackground, settingsSelectBorder, settingsSelectForeground, settingsSelectListBorder, settingsTextInputBackground, settingsTextInputBorder, settingsTextInputForeground } from '../common/settingsEditorColorRegistry.js';
+import './media/settingsWidgets.css';
+import { settingsDiscardIcon, settingsEditIcon, settingsRemoveIcon } from './preferencesIcons.js';
 
 const $ = DOM.$;
 
@@ -736,7 +734,7 @@ export class ListSettingWidget<TListDataItem extends IListDataItem> extends Abst
 			: localize('listSiblingHintLabel', "List item `{0}` with sibling `${1}`", value.data, sibling);
 
 		const { rowElement } = rowElementGroup;
-		this.listDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), rowElement, title));
+		this.listDisposables.add(this.hoverService.setupDelayedHover(rowElement, { content: title }));
 		rowElement.setAttribute('aria-label', title);
 	}
 
@@ -802,7 +800,7 @@ export class ExcludeSettingWidget extends ListSettingWidget<IIncludeExcludeDataI
 		const markdownTitle = new MarkdownString().appendMarkdown(title);
 
 		const { rowElement } = rowElementGroup;
-		this.listDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), rowElement, { markdown: markdownTitle, markdownNotSupportedFallback: title }));
+		this.listDisposables.add(this.hoverService.setupDelayedHover(rowElement, { content: markdownTitle }));
 		rowElement.setAttribute('aria-label', title);
 	}
 
@@ -838,7 +836,7 @@ export class IncludeSettingWidget extends ListSettingWidget<IIncludeExcludeDataI
 		const markdownTitle = new MarkdownString().appendMarkdown(title);
 
 		const { rowElement } = rowElementGroup;
-		this.listDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), rowElement, { markdown: markdownTitle, markdownNotSupportedFallback: title }));
+		this.listDisposables.add(this.hoverService.setupDelayedHover(rowElement, { content: markdownTitle }));
 		rowElement.setAttribute('aria-label', title);
 	}
 
@@ -1276,13 +1274,13 @@ export class ObjectSettingDropdownWidget extends AbstractListSettingWidget<IObje
 			accessibleDescription = localize('objectPairHintLabel', "The property `{0}` is set to `{1}`.", item.key.data, item.value.data);
 		}
 
-		const markdownString = { markdown: new MarkdownString().appendMarkdown(accessibleDescription), markdownNotSupportedFallback: accessibleDescription };
+		const markdownString = new MarkdownString().appendMarkdown(accessibleDescription);
 
-		const keyDescription: string | IManagedHoverTooltipMarkdownString = this.getEnumDescription(item.key) ?? item.keyDescription ?? markdownString;
-		this.listDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), keyElement, keyDescription));
+		const keyDescription: string | MarkdownString = this.getEnumDescription(item.key) ?? item.keyDescription ?? markdownString;
+		this.listDisposables.add(this.hoverService.setupDelayedHover(keyElement, { content: keyDescription }));
 
-		const valueDescription: string | IManagedHoverTooltipMarkdownString = this.getEnumDescription(item.value) ?? markdownString;
-		this.listDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), valueElement!, valueDescription));
+		const valueDescription: string | MarkdownString = this.getEnumDescription(item.value) ?? markdownString;
+		this.listDisposables.add(this.hoverService.setupDelayedHover(valueElement!, { content: valueDescription }));
 
 		rowElement.setAttribute('aria-label', accessibleDescription);
 	}
@@ -1452,7 +1450,7 @@ export class ObjectSettingCheckboxWidget extends AbstractListSettingWidget<IBool
 		const title = item.keyDescription ?? accessibleDescription;
 		const { rowElement, keyElement, valueElement } = rowElementGroup;
 
-		this.listDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), keyElement, title));
+		this.listDisposables.add(this.hoverService.setupDelayedHover(keyElement, { content: title }));
 		valueElement!.setAttribute('aria-label', accessibleDescription);
 		rowElement.setAttribute('aria-label', accessibleDescription);
 	}
diff --git a/src/vs/workbench/contrib/preferences/browser/tocTree.ts b/src/vs/workbench/contrib/preferences/browser/tocTree.ts
index 891d8ca7e736..ab382331d3ed 100644
--- a/src/vs/workbench/contrib/preferences/browser/tocTree.ts
+++ b/src/vs/workbench/contrib/preferences/browser/tocTree.ts
@@ -5,7 +5,6 @@
 
 import * as DOM from '../../../../base/browser/dom.js';
 import * as domStylesheetsJs from '../../../../base/browser/domStylesheets.js';
-import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
 import { DefaultStyleController, IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
 import { RenderIndentGuides } from '../../../../base/browser/ui/tree/abstractTree.js';
@@ -20,10 +19,10 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { IListService, IWorkbenchObjectTreeOptions, WorkbenchObjectTree } from '../../../../platform/list/browser/listService.js';
 import { getListStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { editorBackground, focusBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { settingsHeaderForeground, settingsHeaderHoverForeground } from '../common/settingsEditorColorRegistry.js';
 import { SettingsTreeFilter } from './settingsTree.js';
 import { ISettingsEditorViewState, SearchResultModel, SettingsTreeElement, SettingsTreeGroupElement, SettingsTreeSettingElement } from './settingsTreeModels.js';
-import { settingsHeaderForeground, settingsHeaderHoverForeground } from '../common/settingsEditorColorRegistry.js';
-import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 
 const $ = DOM.$;
 
@@ -132,7 +131,7 @@ export class TOCRenderer implements ITreeRenderer<SettingsTreeGroupElement, neve
 		const label = element.label;
 
 		template.labelElement.textContent = label;
-		template.elementDisposables.add(this._hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), template.labelElement, label));
+		template.elementDisposables.add(this._hoverService.setupDelayedHover(template.labelElement, { content: label }));
 
 		if (count) {
 			template.countElement.textContent = ` (${count})`;

From 04a1f0815a92ff53d2a682a88b12e144e43b8e7e Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Tue, 4 Mar 2025 14:16:49 -0500
Subject: [PATCH 0616/1815] get aliases via login shell for mac (#242588)

fixes #241824
---
 extensions/terminal-suggest/src/shell/bash.ts | 3 ++-
 extensions/terminal-suggest/src/shell/zsh.ts  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/extensions/terminal-suggest/src/shell/bash.ts b/extensions/terminal-suggest/src/shell/bash.ts
index 8db683af892e..157449089715 100644
--- a/extensions/terminal-suggest/src/shell/bash.ts
+++ b/extensions/terminal-suggest/src/shell/bash.ts
@@ -16,7 +16,8 @@ export async function getBashGlobals(options: ExecOptionsWithStringEncoding, exi
 }
 
 async function getAliases(options: ExecOptionsWithStringEncoding): Promise<ICompletionResource[]> {
-	return getAliasesHelper('bash', ['-ic', 'alias'], /^alias (?<alias>[a-zA-Z0-9\.:-]+)='(?<resolved>.+)'$/, options);
+	const args = process.platform === 'darwin' ? ['-icl', 'alias'] : ['-ic', 'alias'];
+	return getAliasesHelper('bash', args, /^alias (?<alias>[a-zA-Z0-9\.:-]+)='(?<resolved>.+)'$/, options);
 }
 
 export async function getBuiltins(
diff --git a/extensions/terminal-suggest/src/shell/zsh.ts b/extensions/terminal-suggest/src/shell/zsh.ts
index 989d49a51fe3..64ba4ed3d42c 100644
--- a/extensions/terminal-suggest/src/shell/zsh.ts
+++ b/extensions/terminal-suggest/src/shell/zsh.ts
@@ -19,7 +19,8 @@ export async function getZshGlobals(options: ExecOptionsWithStringEncoding, exis
 }
 
 async function getAliases(options: ExecOptionsWithStringEncoding): Promise<ICompletionResource[]> {
-	return getAliasesHelper('zsh', ['-ic', 'alias'], /^(?<alias>[a-zA-Z0-9\._:-]+)=(?<quote>['"]?)(?<resolved>.+?)\k<quote>$/, options);
+	const args = process.platform === 'darwin' ? ['-icl', 'alias'] : ['-ic', 'alias'];
+	return getAliasesHelper('zsh', args, /^(?<alias>[a-zA-Z0-9\._:-]+)=(?<quote>['"]?)(?<resolved>.+?)\k<quote>$/, options);
 }
 
 async function getBuiltins(

From 73072ae20b61ef4a8cfb1db074503e4bdb807987 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Tue, 4 Mar 2025 20:47:56 +0100
Subject: [PATCH 0617/1815] Adds debug methods to observables (#242600)

---
 .../base/common/observableInternal/autorun.ts |  67 ++++--
 src/vs/base/common/observableInternal/base.ts |  22 +-
 .../base/common/observableInternal/derived.ts |  63 +++--
 .../logging/debugger/debuggerApi.d.ts         |   7 +
 .../logging/debugger/devToolsLogger.ts        | 218 +++++++++++-------
 .../base/common/observableInternal/utils.ts   |  40 ++--
 6 files changed, 265 insertions(+), 152 deletions(-)

diff --git a/src/vs/base/common/observableInternal/autorun.ts b/src/vs/base/common/observableInternal/autorun.ts
index b1f8f4e95301..03c37aa6c199 100644
--- a/src/vs/base/common/observableInternal/autorun.ts
+++ b/src/vs/base/common/observableInternal/autorun.ts
@@ -168,13 +168,13 @@ export const enum AutorunState {
 }
 
 export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader, IDisposable {
-	public _state = AutorunState.stale;
-	private updateCount = 0;
-	private disposed = false;
-	public _dependencies = new Set<IObservable<any>>();
-	private dependenciesToBeRemoved = new Set<IObservable<any>>();
-	private changeSummary: TChangeSummary | undefined;
-	public _isRunning = false;
+	private _state = AutorunState.stale;
+	private _updateCount = 0;
+	private _disposed = false;
+	private _dependencies = new Set<IObservable<any>>();
+	private _dependenciesToBeRemoved = new Set<IObservable<any>>();
+	private _changeSummary: TChangeSummary | undefined;
+	private _isRunning = false;
 
 	public get debugName(): string {
 		return this._debugNameData.getDebugName(this) ?? '(anonymous)';
@@ -186,7 +186,7 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 		private readonly createChangeSummary: (() => TChangeSummary) | undefined,
 		private readonly _handleChange: ((context: IChangeContext, summary: TChangeSummary) => boolean) | undefined,
 	) {
-		this.changeSummary = this.createChangeSummary?.();
+		this._changeSummary = this.createChangeSummary?.();
 		getLogger()?.handleAutorunCreated(this);
 		this._run();
 
@@ -194,7 +194,7 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 	}
 
 	public dispose(): void {
-		this.disposed = true;
+		this._disposed = true;
 		for (const o of this._dependencies) {
 			o.removeObserver(this); // Warning: external call!
 		}
@@ -205,18 +205,18 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 	}
 
 	private _run() {
-		const emptySet = this.dependenciesToBeRemoved;
-		this.dependenciesToBeRemoved = this._dependencies;
+		const emptySet = this._dependenciesToBeRemoved;
+		this._dependenciesToBeRemoved = this._dependencies;
 		this._dependencies = emptySet;
 
 		this._state = AutorunState.upToDate;
 
 		try {
-			if (!this.disposed) {
+			if (!this._disposed) {
 				getLogger()?.handleAutorunStarted(this);
-				const changeSummary = this.changeSummary!;
+				const changeSummary = this._changeSummary!;
 				try {
-					this.changeSummary = this.createChangeSummary?.(); // Warning: external call!
+					this._changeSummary = this.createChangeSummary?.(); // Warning: external call!
 					this._isRunning = true;
 					this._runFn(this, changeSummary); // Warning: external call!
 				} catch (e) {
@@ -226,15 +226,15 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 				}
 			}
 		} finally {
-			if (!this.disposed) {
+			if (!this._disposed) {
 				getLogger()?.handleAutorunFinished(this);
 			}
 			// We don't want our observed observables to think that they are (not even temporarily) not being observed.
 			// Thus, we only unsubscribe from observables that are definitely not read anymore.
-			for (const o of this.dependenciesToBeRemoved) {
+			for (const o of this._dependenciesToBeRemoved) {
 				o.removeObserver(this); // Warning: external call!
 			}
-			this.dependenciesToBeRemoved.clear();
+			this._dependenciesToBeRemoved.clear();
 		}
 	}
 
@@ -247,12 +247,12 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 		if (this._state === AutorunState.upToDate) {
 			this._state = AutorunState.dependenciesMightHaveChanged;
 		}
-		this.updateCount++;
+		this._updateCount++;
 	}
 
 	public endUpdate(_observable: IObservable<any>): void {
 		try {
-			if (this.updateCount === 1) {
+			if (this._updateCount === 1) {
 				do {
 					if (this._state === AutorunState.dependenciesMightHaveChanged) {
 						this._state = AutorunState.upToDate;
@@ -271,10 +271,10 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 				} while (this._state !== AutorunState.upToDate);
 			}
 		} finally {
-			this.updateCount--;
+			this._updateCount--;
 		}
 
-		assertFn(() => this.updateCount >= 0);
+		assertFn(() => this._updateCount >= 0);
 	}
 
 	public handlePossibleChange(observable: IObservable<any>): void {
@@ -292,7 +292,7 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 					changedObservable: observable,
 					change,
 					didChange: (o): this is any => o === observable as any,
-				}, this.changeSummary!) : true;
+				}, this._changeSummary!) : true;
 				if (shouldReact) {
 					this._state = AutorunState.stale;
 				}
@@ -303,7 +303,7 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 	}
 
 	private _isDependency(observable: IObservableWithChange<any, any>): boolean {
-		return this._dependencies.has(observable) && !this.dependenciesToBeRemoved.has(observable);
+		return this._dependencies.has(observable) && !this._dependenciesToBeRemoved.has(observable);
 	}
 
 	// IReader implementation
@@ -312,16 +312,33 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 		if (!this._isRunning) { throw new BugIndicatingError('The reader object cannot be used outside its compute function!'); }
 
 		// In case the run action disposes the autorun
-		if (this.disposed) {
+		if (this._disposed) {
 			return observable.get(); // warning: external call!
 		}
 
 		observable.addObserver(this); // warning: external call!
 		const value = observable.get(); // warning: external call!
 		this._dependencies.add(observable);
-		this.dependenciesToBeRemoved.delete(observable);
+		this._dependenciesToBeRemoved.delete(observable);
 		return value;
 	}
+
+	public debugGetState() {
+		return {
+			isRunning: this._isRunning,
+			updateCount: this._updateCount,
+			dependencies: this._dependencies,
+			state: this._state,
+		};
+	}
+
+	public debugRerun(): void {
+		if (!this._isRunning) {
+			this._run();
+		} else {
+			this._state = AutorunState.stale;
+		}
+	}
 }
 
 export namespace autorun {
diff --git a/src/vs/base/common/observableInternal/base.ts b/src/vs/base/common/observableInternal/base.ts
index 31ce4988a13b..4d7d4ea9e198 100644
--- a/src/vs/base/common/observableInternal/base.ts
+++ b/src/vs/base/common/observableInternal/base.ts
@@ -290,7 +290,7 @@ export abstract class ConvenientObservable<T, TChange> implements IObservableWit
 }
 
 export abstract class BaseObservable<T, TChange = void> extends ConvenientObservable<T, TChange> {
-	public readonly _observers = new Set<IObserver>();
+	protected readonly _observers = new Set<IObserver>();
 
 	constructor() {
 		super();
@@ -329,6 +329,10 @@ export abstract class BaseObservable<T, TChange = void> extends ConvenientObserv
 		}
 		return this;
 	}
+
+	public debugGetObservers() {
+		return this._observers;
+	}
 }
 
 /**
@@ -385,7 +389,7 @@ export function subtransaction(tx: ITransaction | undefined, fn: (tx: ITransacti
 }
 
 export class TransactionImpl implements ITransaction {
-	public _updatingObservers: { observer: IObserver; observable: IObservable<any> }[] | null = [];
+	private _updatingObservers: { observer: IObserver; observable: IObservable<any> }[] | null = [];
 
 	constructor(public readonly _fn: Function, private readonly _getDebugName?: () => string) {
 		getLogger()?.handleBeginTransaction(this);
@@ -414,6 +418,10 @@ export class TransactionImpl implements ITransaction {
 		this._updatingObservers = null;
 		getLogger()?.handleEndTransaction(this);
 	}
+
+	public debugGetUpdatingObservers() {
+		return this._updatingObservers;
+	}
 }
 
 /**
@@ -495,6 +503,16 @@ export class ObservableValue<T, TChange = void>
 	protected _setValue(newValue: T): void {
 		this._value = newValue;
 	}
+
+	public debugGetState() {
+		return {
+			value: this._value,
+		};
+	}
+
+	public debugSetValue(value: unknown) {
+		this._value = value as T;
+	}
 }
 
 /**
diff --git a/src/vs/base/common/observableInternal/derived.ts b/src/vs/base/common/observableInternal/derived.ts
index 0735be62c234..59d8dc725a72 100644
--- a/src/vs/base/common/observableInternal/derived.ts
+++ b/src/vs/base/common/observableInternal/derived.ts
@@ -194,14 +194,14 @@ export const enum DerivedState {
 }
 
 export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> implements IReader, IObserver {
-	public _state = DerivedState.initial;
-	private value: T | undefined = undefined;
-	public _updateCount = 0;
-	public _dependencies = new Set<IObservable<any>>();
-	private dependenciesToBeRemoved = new Set<IObservable<any>>();
-	private changeSummary: TChangeSummary | undefined = undefined;
+	private _state = DerivedState.initial;
+	private _value: T | undefined = undefined;
+	private _updateCount = 0;
+	private _dependencies = new Set<IObservable<any>>();
+	private _dependenciesToBeRemoved = new Set<IObservable<any>>();
+	private _changeSummary: TChangeSummary | undefined = undefined;
 	private _isUpdating = false;
-	public _isComputing = false;
+	private _isComputing = false;
 
 	public override get debugName(): string {
 		return this._debugNameData.getDebugName(this) ?? '(anonymous)';
@@ -216,7 +216,7 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 		private readonly _equalityComparator: EqualityComparer<T>,
 	) {
 		super();
-		this.changeSummary = this.createChangeSummary?.();
+		this._changeSummary = this.createChangeSummary?.();
 	}
 
 	protected override onLastObserverRemoved(): void {
@@ -225,7 +225,7 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 		 * that our cache is invalid.
 		 */
 		this._state = DerivedState.initial;
-		this.value = undefined;
+		this._value = undefined;
 		getLogger()?.handleDerivedCleared(this);
 		for (const d of this._dependencies) {
 			d.removeObserver(this);
@@ -283,17 +283,17 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 				}
 				// In case recomputation changed one of our dependencies, we need to recompute again.
 			} while (this._state !== DerivedState.upToDate);
-			return this.value!;
+			return this._value!;
 		}
 	}
 
 	private _recompute() {
-		const emptySet = this.dependenciesToBeRemoved;
-		this.dependenciesToBeRemoved = this._dependencies;
+		const emptySet = this._dependenciesToBeRemoved;
+		this._dependenciesToBeRemoved = this._dependencies;
 		this._dependencies = emptySet;
 
 		const hadValue = this._state !== DerivedState.initial;
-		const oldValue = this.value;
+		const oldValue = this._value;
 		this._state = DerivedState.upToDate;
 
 		let didChange = false;
@@ -301,27 +301,27 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 		this._isComputing = true;
 
 		try {
-			const changeSummary = this.changeSummary!;
-			this.changeSummary = this.createChangeSummary?.();
+			const changeSummary = this._changeSummary!;
+			this._changeSummary = this.createChangeSummary?.();
 			try {
 				this._isReaderValid = true;
 				/** might call {@link handleChange} indirectly, which could invalidate us */
-				this.value = this._computeFn(this, changeSummary);
+				this._value = this._computeFn(this, changeSummary);
 			} finally {
 				this._isReaderValid = false;
 				// We don't want our observed observables to think that they are (not even temporarily) not being observed.
 				// Thus, we only unsubscribe from observables that are definitely not read anymore.
-				for (const o of this.dependenciesToBeRemoved) {
+				for (const o of this._dependenciesToBeRemoved) {
 					o.removeObserver(this);
 				}
-				this.dependenciesToBeRemoved.clear();
+				this._dependenciesToBeRemoved.clear();
 			}
 
-			didChange = hadValue && !(this._equalityComparator(oldValue!, this.value));
+			didChange = hadValue && !(this._equalityComparator(oldValue!, this._value));
 
 			getLogger()?.handleObservableUpdated(this, {
 				oldValue,
-				newValue: this.value,
+				newValue: this._value,
 				change: undefined,
 				didChange,
 				hadValue,
@@ -396,7 +396,7 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 
 	public handlePossibleChange<T>(observable: IObservable<T>): void {
 		// In all other states, observers already know that we might have changed.
-		if (this._state === DerivedState.upToDate && this._dependencies.has(observable) && !this.dependenciesToBeRemoved.has(observable)) {
+		if (this._state === DerivedState.upToDate && this._dependencies.has(observable) && !this._dependenciesToBeRemoved.has(observable)) {
 			this._state = DerivedState.dependenciesMightHaveChanged;
 			for (const r of this._observers) {
 				r.handlePossibleChange(this);
@@ -405,7 +405,7 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 	}
 
 	public handleChange<T, TChange>(observable: IObservableWithChange<T, TChange>, change: TChange): void {
-		if (this._dependencies.has(observable) && !this.dependenciesToBeRemoved.has(observable)) {
+		if (this._dependencies.has(observable) && !this._dependenciesToBeRemoved.has(observable)) {
 			getLogger()?.handleDerivedDependencyChanged(this, observable, change);
 
 			let shouldReact = false;
@@ -414,7 +414,7 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 					changedObservable: observable,
 					change,
 					didChange: (o): this is any => o === observable as any,
-				}, this.changeSummary!) : true;
+				}, this._changeSummary!) : true;
 			} catch (e) {
 				onBugIndicatingError(e);
 			}
@@ -443,7 +443,7 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 		const value = observable.get();
 		// Which is why we only add the observable to the dependencies now.
 		this._dependencies.add(observable);
-		this.dependenciesToBeRemoved.delete(observable);
+		this._dependenciesToBeRemoved.delete(observable);
 		return value;
 	}
 
@@ -469,6 +469,21 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 		}
 		super.removeObserver(observer);
 	}
+
+	public debugGetState() {
+		return {
+			state: this._state,
+			updateCount: this._updateCount,
+			isComputing: this._isComputing,
+			dependencies: this._dependencies,
+			value: this._value,
+		};
+	}
+
+	public debugSetValue(newValue: unknown) {
+		this._value = newValue as any;
+	}
+
 }
 
 
diff --git a/src/vs/base/common/observableInternal/logging/debugger/debuggerApi.d.ts b/src/vs/base/common/observableInternal/logging/debugger/debuggerApi.d.ts
index e0b5fae18200..138732f44b21 100644
--- a/src/vs/base/common/observableInternal/logging/debugger/debuggerApi.d.ts
+++ b/src/vs/base/common/observableInternal/logging/debugger/debuggerApi.d.ts
@@ -23,6 +23,9 @@ export type ObsDebuggerApi = {
 			getSummarizedInstances(): IObsPushState;
 			getDerivedInfo(instanceId: ObsInstanceId): IDerivedObservableDetailedInfo;
 			getAutorunInfo(instanceId: ObsInstanceId): IAutorunDetailedInfo;
+			getObservableValueInfo(instanceId: ObsInstanceId): IObservableValueInfo;
+			setValue(instanceId: ObsInstanceId, jsonValue: unknown): void;
+			getValue(instanceId: ObsInstanceId): unknown;
 
 			getTransactionState(): ITransactionState | undefined;
 		}
@@ -94,6 +97,10 @@ export type ObsStateUpdate = Partial<IObsDeclarations> & DeepPartial<IObsPushSta
 
 type DeepPartial<T> = { [TKey in keyof T]?: DeepPartial<T[TKey]> };
 
+export interface IObservableValueInfo {
+	observers: IObsInstanceRef[];
+}
+
 export interface IDerivedObservableDetailedInfo {
 	dependencies: IObsInstanceRef[];
 	observers: IObsInstanceRef[];
diff --git a/src/vs/base/common/observableInternal/logging/debugger/devToolsLogger.ts b/src/vs/base/common/observableInternal/logging/debugger/devToolsLogger.ts
index a85329ca8c98..a09e2f2683a0 100644
--- a/src/vs/base/common/observableInternal/logging/debugger/devToolsLogger.ts
+++ b/src/vs/base/common/observableInternal/logging/debugger/devToolsLogger.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { AutorunObserver, AutorunState } from '../../autorun.js';
-import { IObservable, IObserver, TransactionImpl } from '../../base.js';
+import { BaseObservable, IObservable, IObserver, ObservableValue, TransactionImpl } from '../../base.js';
 import { Derived, DerivedState } from '../../derived.js';
 import { IChangeInformation, IObservableLogger } from '../logging.js';
 import { formatValue } from '../consoleObservableLogger.js';
@@ -12,6 +12,8 @@ import { ObsDebuggerApi, IObsDeclaration, ObsInstanceId, ObsStateUpdate, ITransa
 import { registerDebugChannel } from './debuggerRpc.js';
 import { deepAssign, deepAssignDeleteNulls, getFirstStackFrameOutsideOf, ILocation, Throttler } from './utils.js';
 import { isDefined } from '../../../types.js';
+import { FromEventObservable } from '../../utils.js';
+import { BugIndicatingError, onUnexpectedError } from '../../../errors.js';
 
 interface IInstanceInfo {
 	declarationId: number;
@@ -75,21 +77,61 @@ export class DevToolsLogger implements IObservableLogger {
 				getSummarizedInstances: () => {
 					return null!;
 				},
+				getObservableValueInfo: instanceId => {
+					const obs = this._aliveInstances.get(instanceId) as BaseObservable<any>;
+					return {
+						observers: [...obs.debugGetObservers()].map(d => this._formatObserver(d)).filter(isDefined),
+					};
+				},
 				getDerivedInfo: instanceId => {
 					const d = this._aliveInstances.get(instanceId) as Derived<any>;
 					return {
-						dependencies: [...d._dependencies].map(d => this._formatObservable(d)),
-						observers: [...d._observers].map(d => this._formatObserver(d)).filter(isDefined),
+						dependencies: [...d.debugGetState().dependencies].map(d => this._formatObservable(d)).filter(isDefined),
+						observers: [...d.debugGetObservers()].map(d => this._formatObserver(d)).filter(isDefined),
 					};
 				},
 				getAutorunInfo: instanceId => {
 					const obs = this._aliveInstances.get(instanceId) as AutorunObserver;
 					return {
-						dependencies: [...obs._dependencies].map(d => this._formatObservable(d)),
+						dependencies: [...obs.debugGetState().dependencies].map(d => this._formatObservable(d)).filter(isDefined),
 					};
 				},
 				getTransactionState: () => {
 					return this.getTransactionState();
+				},
+				setValue: (instanceId, jsonValue) => {
+					const obs = this._aliveInstances.get(instanceId) as BaseObservable<any>;
+
+					if (obs instanceof Derived) {
+						obs.debugSetValue(jsonValue);
+					} else if (obs instanceof ObservableValue) {
+						obs.debugSetValue(jsonValue);
+					} else if (obs instanceof FromEventObservable) {
+						obs.debugSetValue(jsonValue);
+					} else {
+						throw new BugIndicatingError('Observable is not supported');
+					}
+
+					const observers = [...obs.debugGetObservers()];
+					for (const d of observers) {
+						d.beginUpdate(obs);
+					}
+					for (const d of observers) {
+						d.handleChange(obs, undefined);
+					}
+					for (const d of observers) {
+						d.endUpdate(obs);
+					}
+				},
+				getValue: instanceId => {
+					const obs = this._aliveInstances.get(instanceId) as BaseObservable<any>;
+					if (obs instanceof Derived) {
+						return formatValue(obs.debugGetState().value, 200);
+					} else if (obs instanceof ObservableValue) {
+						return formatValue(obs.debugGetState().value, 200);
+					}
+
+					return undefined;
 				}
 			}
 		};
@@ -101,7 +143,7 @@ export class DevToolsLogger implements IObservableLogger {
 		if (txs.length === 0) {
 			return undefined;
 		}
-		const observerQueue = txs.flatMap(t => t._updatingObservers ?? []).map(o => o.observer);
+		const observerQueue = txs.flatMap(t => t.debugGetUpdatingObservers() ?? []).map(o => o.observer);
 		const processedObservers = new Set<IObserver>();
 		while (observerQueue.length > 0) {
 			const observer = observerQueue.shift()!;
@@ -124,36 +166,42 @@ export class DevToolsLogger implements IObservableLogger {
 		return { names: txs.map(t => t.getDebugName() ?? 'tx'), affected };
 	}
 
-	private _getObservableInfo(observable: IObservable<any>): IObservableInfo {
+	private _getObservableInfo(observable: IObservable<any>): IObservableInfo | undefined {
 		const info = this._instanceInfos.get(observable);
 		if (!info) {
-			throw new Error('No info found');
+			onUnexpectedError(new BugIndicatingError('No info found'));
+			return undefined;
 		}
 		return info as IObservableInfo;
 	}
 
-	private _getAutorunInfo(autorun: AutorunObserver): IAutorunInfo {
+	private _getAutorunInfo(autorun: AutorunObserver): IAutorunInfo | undefined {
 		const info = this._instanceInfos.get(autorun);
 		if (!info) {
-			throw new Error('No info found');
+			onUnexpectedError(new BugIndicatingError('No info found'));
+			return undefined;
 		}
 		return info as IAutorunInfo;
 	}
 
 	private _getInfo(observer: IObserver, queue: (observer: IObserver) => void): ObserverInstanceState | undefined {
 		if (observer instanceof Derived) {
-			const observersToUpdate = [...observer._observers];
+			const observersToUpdate = [...observer.debugGetObservers()];
 			for (const o of observersToUpdate) {
 				queue(o);
 			}
 
-			const info = this._getObservableInfo(observer)!;
-			const base = { name: observer.debugName, instanceId: info.instanceId, updateCount: observer._updateCount };
-			const changedDependencies = [...info.changedObservables].map(o => this._instanceInfos.get(o)!.instanceId);
-			if (observer._isComputing) {
+			const info = this._getObservableInfo(observer);
+			if (!info) { return; }
+
+			const observerState = observer.debugGetState();
+
+			const base = { name: observer.debugName, instanceId: info.instanceId, updateCount: observerState.updateCount };
+			const changedDependencies = [...info.changedObservables].map(o => this._instanceInfos.get(o)?.instanceId).filter(isDefined);
+			if (observerState.isComputing) {
 				return { ...base, type: 'observable/derived', state: 'updating', changedDependencies, initialComputation: false };
 			}
-			switch (observer._state) {
+			switch (observerState.state) {
 				case DerivedState.initial:
 					return { ...base, type: 'observable/derived', state: 'noValue' };
 				case DerivedState.upToDate:
@@ -164,13 +212,15 @@ export class DevToolsLogger implements IObservableLogger {
 					return { ...base, type: 'observable/derived', state: 'possiblyStale' };
 			}
 		} else if (observer instanceof AutorunObserver) {
-			const info = this._getAutorunInfo(observer)!;
+			const info = this._getAutorunInfo(observer);
+			if (!info) { return undefined; }
+
 			const base = { name: observer.debugName, instanceId: info.instanceId, updateCount: info.updateCount };
 			const changedDependencies = [...info.changedObservables].map(o => this._instanceInfos.get(o)!.instanceId);
-			if (observer._isRunning) {
+			if (observer.debugGetState().isRunning) {
 				return { ...base, type: 'autorun', state: 'updating', changedDependencies };
 			}
-			switch (observer._state) {
+			switch (observer.debugGetState().state) {
 				case AutorunState.upToDate:
 					return { ...base, type: 'autorun', state: 'upToDate' };
 				case AutorunState.stale:
@@ -183,8 +233,10 @@ export class DevToolsLogger implements IObservableLogger {
 		return undefined;
 	}
 
-	private _formatObservable(obs: IObservable<any>): { name: string; instanceId: ObsInstanceId } {
-		return { name: obs.debugName, instanceId: this._getObservableInfo(obs)?.instanceId! };
+	private _formatObservable(obs: IObservable<any>): { name: string; instanceId: ObsInstanceId } | undefined {
+		const info = this._getObservableInfo(obs);
+		if (!info) { return undefined; }
+		return { name: obs.debugName, instanceId: info.instanceId };
 	}
 
 	private _formatObserver(obs: IObserver): { name: string; instanceId: ObsInstanceId } | undefined {
@@ -236,10 +288,10 @@ export class DevToolsLogger implements IObservableLogger {
 			const stack = new Error().stack!;
 			Error.stackTraceLimit = l;
 
-			let result = getFirstStackFrameOutsideOf(stack, /[/\\]observableInternal[/\\]|[/\\]util(s)?\./);
+			let result = getFirstStackFrameOutsideOf(stack, /[/\\]observableInternal[/\\]|\.observe|[/\\]util(s)?\./);
 
 			if (!shallow && !result) {
-				result = getFirstStackFrameOutsideOf(stack, /[/\\]observableInternal[/\\]/)!;
+				result = getFirstStackFrameOutsideOf(stack, /[/\\]observableInternal[/\\]|\.observe/)!;
 			}
 			if (result) {
 				loc = result;
@@ -284,30 +336,30 @@ export class DevToolsLogger implements IObservableLogger {
 
 	handleOnListenerCountChanged(observable: IObservable<any>, newCount: number): void {
 		const info = this._getObservableInfo(observable);
-		if (info) {
-			if (info.listenerCount === 0 && newCount > 0) {
-				const type: IObsDeclaration['type'] =
-					observable instanceof Derived ? 'observable/derived' : 'observable/value';
-				this._aliveInstances.set(info.instanceId, observable);
-				this._handleChange({
-					instances: {
-						[info.instanceId]: {
-							instanceId: info.instanceId,
-							declarationId: info.declarationId,
-							formattedValue: info.lastValue,
-							type,
-							name: observable.debugName,
-						}
+		if (!info) { return; }
+
+		if (info.listenerCount === 0 && newCount > 0) {
+			const type: IObsDeclaration['type'] =
+				observable instanceof Derived ? 'observable/derived' : 'observable/value';
+			this._aliveInstances.set(info.instanceId, observable);
+			this._handleChange({
+				instances: {
+					[info.instanceId]: {
+						instanceId: info.instanceId,
+						declarationId: info.declarationId,
+						formattedValue: info.lastValue,
+						type,
+						name: observable.debugName,
 					}
-				});
-			} else if (info.listenerCount > 0 && newCount === 0) {
-				this._handleChange({
-					instances: { [info.instanceId]: null }
-				});
-				this._aliveInstances.delete(info.instanceId);
-			}
-			info.listenerCount = newCount;
+				}
+			});
+		} else if (info.listenerCount > 0 && newCount === 0) {
+			this._handleChange({
+				instances: { [info.instanceId]: null }
+			});
+			this._aliveInstances.delete(info.instanceId);
 		}
+		info.listenerCount = newCount;
 	}
 
 	handleObservableUpdated(observable: IObservable<any>, changeInfo: IChangeInformation): void {
@@ -355,32 +407,32 @@ export class DevToolsLogger implements IObservableLogger {
 	}
 	handleAutorunDisposed(autorun: AutorunObserver): void {
 		const info = this._getAutorunInfo(autorun);
-		if (info) {
-			this._handleChange({
-				instances: { [info.instanceId]: null }
-			});
-			this._instanceInfos.delete(autorun);
-			this._aliveInstances.delete(info.instanceId);
-		}
+		if (!info) { return; }
+
+		this._handleChange({
+			instances: { [info.instanceId]: null }
+		});
+		this._instanceInfos.delete(autorun);
+		this._aliveInstances.delete(info.instanceId);
 	}
 	handleAutorunDependencyChanged(autorun: AutorunObserver, observable: IObservable<any>, change: unknown): void {
 		const info = this._getAutorunInfo(autorun);
-		if (info) {
-			info.changedObservables.add(observable);
-		}
+		if (!info) { return; }
+
+		info.changedObservables.add(observable);
 	}
 	handleAutorunStarted(autorun: AutorunObserver): void {
 
 	}
 	handleAutorunFinished(autorun: AutorunObserver): void {
 		const info = this._getAutorunInfo(autorun);
-		if (info) {
-			info.changedObservables.clear();
-			info.updateCount++;
-			this._handleChange({
-				instances: { [info.instanceId]: { runCount: info.updateCount } }
-			});
-		}
+		if (!info) { return; }
+
+		info.changedObservables.clear();
+		info.updateCount++;
+		this._handleChange({
+			instances: { [info.instanceId]: { runCount: info.updateCount } }
+		});
 	}
 
 	handleDerivedDependencyChanged(derived: Derived<any>, observable: IObservable<any>, change: unknown): void {
@@ -391,33 +443,33 @@ export class DevToolsLogger implements IObservableLogger {
 	}
 	_handleDerivedRecomputed(observable: Derived<any>, changeInfo: IChangeInformation): void {
 		const info = this._getObservableInfo(observable);
-		if (info) {
-			const formattedValue = formatValue(changeInfo.newValue, 30);
-			info.updateCount++;
-			info.changedObservables.clear();
-
-			info.lastValue = formattedValue;
-			if (info.listenerCount > 0) {
-				this._handleChange({
-					instances: { [info.instanceId]: { formattedValue: formattedValue, recomputationCount: info.updateCount } }
-				});
-			}
+		if (!info) { return; }
+
+		const formattedValue = formatValue(changeInfo.newValue, 30);
+		info.updateCount++;
+		info.changedObservables.clear();
+
+		info.lastValue = formattedValue;
+		if (info.listenerCount > 0) {
+			this._handleChange({
+				instances: { [info.instanceId]: { formattedValue: formattedValue, recomputationCount: info.updateCount } }
+			});
 		}
 	}
 	handleDerivedCleared(observable: Derived<any>): void {
 		const info = this._getObservableInfo(observable);
-		if (info) {
-			info.lastValue = undefined;
-			info.changedObservables.clear();
-			if (info.listenerCount > 0) {
-				this._handleChange({
-					instances: {
-						[info.instanceId]: {
-							formattedValue: undefined,
-						}
+		if (!info) { return; }
+
+		info.lastValue = undefined;
+		info.changedObservables.clear();
+		if (info.listenerCount > 0) {
+			this._handleChange({
+				instances: {
+					[info.instanceId]: {
+						formattedValue: undefined,
 					}
-				});
-			}
+				}
+			});
 		}
 	}
 	handleBeginTransaction(transaction: TransactionImpl): void {
diff --git a/src/vs/base/common/observableInternal/utils.ts b/src/vs/base/common/observableInternal/utils.ts
index 3b5bf7d35bfe..530474b334ea 100644
--- a/src/vs/base/common/observableInternal/utils.ts
+++ b/src/vs/base/common/observableInternal/utils.ts
@@ -102,9 +102,9 @@ export function observableFromEventOpts<T, TArgs = unknown>(
 export class FromEventObservable<TArgs, T> extends BaseObservable<T> {
 	public static globalTransaction: ITransaction | undefined;
 
-	private value: T | undefined;
-	private hasValue = false;
-	private subscription: IDisposable | undefined;
+	private _value: T | undefined;
+	private _hasValue = false;
+	private _subscription: IDisposable | undefined;
 
 	constructor(
 		private readonly _debugNameData: DebugNameData,
@@ -126,25 +126,25 @@ export class FromEventObservable<TArgs, T> extends BaseObservable<T> {
 	}
 
 	protected override onFirstObserverAdded(): void {
-		this.subscription = this.event(this.handleEvent);
+		this._subscription = this.event(this.handleEvent);
 	}
 
 	private readonly handleEvent = (args: TArgs | undefined) => {
 		const newValue = this._getValue(args);
-		const oldValue = this.value;
+		const oldValue = this._value;
 
-		const didChange = !this.hasValue || !(this._equalityComparator(oldValue!, newValue));
+		const didChange = !this._hasValue || !(this._equalityComparator(oldValue!, newValue));
 		let didRunTransaction = false;
 
 		if (didChange) {
-			this.value = newValue;
+			this._value = newValue;
 
-			if (this.hasValue) {
+			if (this._hasValue) {
 				didRunTransaction = true;
 				subtransaction(
 					this._getTransaction(),
 					(tx) => {
-						getLogger()?.handleObservableUpdated(this, { oldValue, newValue, change: undefined, didChange, hadValue: this.hasValue });
+						getLogger()?.handleObservableUpdated(this, { oldValue, newValue, change: undefined, didChange, hadValue: this._hasValue });
 
 						for (const o of this._observers) {
 							tx.updateObserver(o, this);
@@ -157,33 +157,37 @@ export class FromEventObservable<TArgs, T> extends BaseObservable<T> {
 					}
 				);
 			}
-			this.hasValue = true;
+			this._hasValue = true;
 		}
 
 		if (!didRunTransaction) {
-			getLogger()?.handleObservableUpdated(this, { oldValue, newValue, change: undefined, didChange, hadValue: this.hasValue });
+			getLogger()?.handleObservableUpdated(this, { oldValue, newValue, change: undefined, didChange, hadValue: this._hasValue });
 		}
 	};
 
 	protected override onLastObserverRemoved(): void {
-		this.subscription!.dispose();
-		this.subscription = undefined;
-		this.hasValue = false;
-		this.value = undefined;
+		this._subscription!.dispose();
+		this._subscription = undefined;
+		this._hasValue = false;
+		this._value = undefined;
 	}
 
 	public get(): T {
-		if (this.subscription) {
-			if (!this.hasValue) {
+		if (this._subscription) {
+			if (!this._hasValue) {
 				this.handleEvent(undefined);
 			}
-			return this.value!;
+			return this._value!;
 		} else {
 			// no cache, as there are no subscribers to keep it updated
 			const value = this._getValue(undefined);
 			return value;
 		}
 	}
+
+	public debugSetValue(value: unknown) {
+		this._value = value as any;
+	}
 }
 
 export namespace observableFromEvent {

From 2c076f5582e95f3e142e510a2465e5b197f1e82d Mon Sep 17 00:00:00 2001
From: Justin Chen <54879025+justschen@users.noreply.github.com>
Date: Tue, 4 Mar 2025 12:16:25 -0800
Subject: [PATCH 0618/1815] issue reporter update banner, better messaging,
 leaked disposables (#242602)

* various issue reporter debt

* remove border
---
 .../issue/browser/baseIssueReporterService.ts    |  8 ++++----
 .../contrib/issue/browser/issueFormService.ts    |  2 ++
 .../contrib/issue/browser/issueReporterPage.ts   |  7 ++++++-
 .../issue/browser/media/issueReporter.css        | 10 ++++++++--
 .../electron-sandbox/issueReporterService.ts     | 16 +++++++++++++++-
 .../electron-sandbox/nativeIssueFormService.ts   | 13 +++++++++----
 6 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
index 38da042c4095..805dcd0205b0 100644
--- a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
+++ b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
@@ -103,7 +103,7 @@ export class BaseIssueReporterService extends Disposable {
 		//TODO: Handle case where extension is not activated
 		const issueReporterElement = this.getElementById('issue-reporter');
 		if (issueReporterElement) {
-			this.previewButton = new Button(issueReporterElement, unthemedButtonStyles);
+			this.previewButton = this._register(new Button(issueReporterElement, unthemedButtonStyles));
 			const issueRepoName = document.createElement('a');
 			issueReporterElement.appendChild(issueRepoName);
 			issueRepoName.id = 'show-repo-name';
@@ -141,7 +141,7 @@ export class BaseIssueReporterService extends Disposable {
 		}
 
 		const delayer = new RunOnceScheduler(updateAll, 0);
-		iconsStyleSheet.onDidChange(() => delayer.schedule());
+		this._register(iconsStyleSheet.onDidChange(() => delayer.schedule()));
 		delayer.schedule();
 
 		this.handleExtensionData(data.enabledExtensions);
@@ -490,11 +490,11 @@ export class BaseIssueReporterService extends Disposable {
 			this.searchIssues(title, fileOnExtension, fileOnMarketplace);
 		});
 
-		this.previewButton.onDidClick(async () => {
+		this._register(this.previewButton.onDidClick(async () => {
 			this.delayedSubmit.trigger(async () => {
 				this.createIssue();
 			});
-		});
+		}));
 
 		this.addEventListener('disableExtensions', 'click', () => {
 			this.issueFormService.reloadWithExtensionsDisabled();
diff --git a/src/vs/workbench/contrib/issue/browser/issueFormService.ts b/src/vs/workbench/contrib/issue/browser/issueFormService.ts
index bf42337b69e5..c587880a09c6 100644
--- a/src/vs/workbench/contrib/issue/browser/issueFormService.ts
+++ b/src/vs/workbench/contrib/issue/browser/issueFormService.ts
@@ -98,11 +98,13 @@ export class IssueFormService implements IIssueFormService {
 			this.issueReporterWindow = auxiliaryWindow.window;
 		} else {
 			console.error('Failed to open auxiliary window');
+			disposables.dispose();
 		}
 
 		// handle closing issue reporter
 		this.issueReporterWindow?.addEventListener('beforeunload', () => {
 			auxiliaryWindow.window.close();
+			disposables.dispose();
 			this.issueReporterWindow = null;
 		});
 	}
diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
index fbd7fbb3fb8d..558d283efec2 100644
--- a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
+++ b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
@@ -20,10 +20,15 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
 			'{Locked="</a>"}'
 		]
 	},
-	'Before you report an issue here please <a href="https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions" target="_blank">review the guidance we provide</a>.'
+	'Before you report an issue here please <a href="https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions" target="_blank">review the guidance we provide</a>. Please complete the form in English.'
 );
 
 export default (): string => `
+<div id="update-banner" class="issue-reporter-update-banner hidden">
+	<span class="update-banner-text" id="update-banner-text">
+		<!-- To be dynamically filled -->
+	</span>
+</div>
 <div class="issue-reporter" id="issue-reporter">
 	<div id="english" class="input-group hidden">${escape(localize('completeInEnglish', "Please complete the form in English."))}</div>
 
diff --git a/src/vs/workbench/contrib/issue/browser/media/issueReporter.css b/src/vs/workbench/contrib/issue/browser/media/issueReporter.css
index 14ee09bebd1c..0aaffebc45e8 100644
--- a/src/vs/workbench/contrib/issue/browser/media/issueReporter.css
+++ b/src/vs/workbench/contrib/issue/browser/media/issueReporter.css
@@ -97,7 +97,6 @@
 	line-height: 1.5;
 	color: #495057;
 	background-color: #fff;
-	border: none;
 }
 
 .issue-reporter * {
@@ -320,7 +319,6 @@
 .issue-reporter select,
 .issue-reporter textarea {
 	background-color: #3c3c3c;
-	border: none;
 	color: #cccccc;
 }
 
@@ -456,3 +454,11 @@
 .issue-reporter a {
 	color: var(--vscode-textLink-foreground);
 }
+
+.issue-reporter-update-banner {
+	color: var(--vscode-button-foreground);
+	background-color: var(--vscode-button-background);
+	padding: 10px;
+	text-align: center;
+	border-radius: 4px;
+}
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
index e6be6f94d322..0dc796aa7d26 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
@@ -16,6 +16,7 @@ import { IFileService } from '../../../../platform/files/common/files.js';
 import { INativeHostService } from '../../../../platform/native/common/native.js';
 import { IProcessMainService } from '../../../../platform/process/common/process.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IUpdateService, StateType } from '../../../../platform/update/common/update.js';
 import { applyZoom } from '../../../../platform/window/electron-sandbox/window.js';
 import { BaseIssueReporterService } from '../browser/baseIssueReporterService.js';
 import { IssueReporterData as IssueReporterModelData } from '../browser/issueReporterModel.js';
@@ -47,7 +48,8 @@ export class IssueReporter extends BaseIssueReporterService {
 		@IProcessMainService processMainService: IProcessMainService,
 		@IThemeService themeService: IThemeService,
 		@IFileService fileService: IFileService,
-		@IFileDialogService fileDialogService: IFileDialogService
+		@IFileDialogService fileDialogService: IFileDialogService,
+		@IUpdateService private readonly updateService: IUpdateService
 	) {
 		super(disableExtensions, data, os, product, window, false, issueFormService, themeService, fileService, fileDialogService);
 		this.processMainService = processMainService;
@@ -64,6 +66,7 @@ export class IssueReporter extends BaseIssueReporterService {
 			});
 		}
 
+		this.checkForUpdates();
 		this.setEventHandlers();
 		applyZoom(this.data.zoomLevel, this.window);
 		this.updateExperimentsInfo(this.data.experiments);
@@ -71,6 +74,17 @@ export class IssueReporter extends BaseIssueReporterService {
 		this.updateUnsupportedMode(this.data.isUnsupported);
 	}
 
+	private async checkForUpdates(): Promise<void> {
+		const updateState = this.updateService.state;
+		if (updateState.type === StateType.Ready || updateState.type === StateType.Downloaded) {
+			const updateBanner = this.getElementById('update-banner');
+			if (updateBanner) {
+				updateBanner.classList.remove('hidden');
+				updateBanner.textContent = localize('updateAvailable', "A new version of {0} is available.", this.product.nameLong);
+			}
+		}
+	}
+
 	public override setEventHandlers(): void {
 		super.setEventHandlers();
 
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/nativeIssueFormService.ts b/src/vs/workbench/contrib/issue/electron-sandbox/nativeIssueFormService.ts
index c202234088a8..f6ae15199b8b 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/nativeIssueFormService.ts
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/nativeIssueFormService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import './media/issueReporter.css';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
@@ -12,13 +12,16 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { INativeHostService } from '../../../../platform/native/common/native.js';
 import product from '../../../../platform/product/common/product.js';
+import { IAuxiliaryWindowService } from '../../../services/auxiliaryWindow/browser/auxiliaryWindowService.js';
+import { IHostService } from '../../../services/host/browser/host.js';
 import { IssueFormService } from '../browser/issueFormService.js';
 import { IIssueFormService, IssueReporterData } from '../common/issue.js';
 import { IssueReporter } from './issueReporterService.js';
-import { IAuxiliaryWindowService } from '../../../services/auxiliaryWindow/browser/auxiliaryWindowService.js';
-import { IHostService } from '../../../services/host/browser/host.js';
+import './media/issueReporter.css';
 
 export class NativeIssueFormService extends IssueFormService implements IIssueFormService {
+	private readonly store = new DisposableStore();
+
 	constructor(
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IAuxiliaryWindowService auxiliaryWindowService: IAuxiliaryWindowService,
@@ -53,8 +56,10 @@ export class NativeIssueFormService extends IssueFormService implements IIssueFo
 
 		// create issue reporter and instantiate
 		if (this.issueReporterWindow) {
-			const issueReporter = this.instantiationService.createInstance(IssueReporter, !!this.environmentService.disableExtensions, data, { type: this.type, arch: this.arch, release: this.release }, product, this.issueReporterWindow);
+			const issueReporter = this.store.add(this.instantiationService.createInstance(IssueReporter, !!this.environmentService.disableExtensions, data, { type: this.type, arch: this.arch, release: this.release }, product, this.issueReporterWindow));
 			issueReporter.render();
+		} else {
+			this.store.dispose();
 		}
 	}
 }

From 7933f529143fc63a9e8de63d9d076665d14c1c54 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Wed, 5 Mar 2025 05:19:05 +0900
Subject: [PATCH 0619/1815] fix: clang variable for native module installs from
 build dir (#242601)

---
 build/.npmrc             | 1 +
 build/npm/postinstall.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/.npmrc b/build/.npmrc
index 1b073e71a832..551822f79cd6 100644
--- a/build/.npmrc
+++ b/build/.npmrc
@@ -2,4 +2,5 @@ disturl="https://nodejs.org/dist"
 runtime="node"
 build_from_source="true"
 legacy-peer-deps="true"
+force_process_config="true"
 timeout=180000
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index c1f22aa50024..458847afac58 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -85,7 +85,7 @@ function setNpmrcConfig(dir, env) {
 	// 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' && process.platform === 'darwin') {
+	if ((dir === 'remote' || dir === 'build') && process.platform === 'darwin') {
 		env['npm_config_force_process_config'] = 'true';
 	} else {
 		delete env['npm_config_force_process_config'];

From 3331d2d87dbae52e1cac98b56f7116b46349b776 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 4 Mar 2025 12:58:23 -0800
Subject: [PATCH 0620/1815] chore: update to rust 1.85 (#242609)

---
 build/azure-pipelines/cli/install-rust-posix.yml | 2 +-
 build/azure-pipelines/cli/install-rust-win32.yml | 2 +-
 cli/src/auth.rs                                  | 4 ++--
 cli/src/log.rs                                   | 2 +-
 cli/src/tunnels/singleton_server.rs              | 2 +-
 cli/src/util/io.rs                               | 3 +++
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build/azure-pipelines/cli/install-rust-posix.yml b/build/azure-pipelines/cli/install-rust-posix.yml
index fee56e028f72..0607cde33e56 100644
--- a/build/azure-pipelines/cli/install-rust-posix.yml
+++ b/build/azure-pipelines/cli/install-rust-posix.yml
@@ -1,7 +1,7 @@
 parameters:
   - name: channel
     type: string
-    default: 1.81
+    default: 1.85
   - name: targets
     default: []
     type: object
diff --git a/build/azure-pipelines/cli/install-rust-win32.yml b/build/azure-pipelines/cli/install-rust-win32.yml
index 45a1cfd188e1..bff114fccd07 100644
--- a/build/azure-pipelines/cli/install-rust-win32.yml
+++ b/build/azure-pipelines/cli/install-rust-win32.yml
@@ -1,7 +1,7 @@
 parameters:
   - name: channel
     type: string
-    default: 1.81
+    default: 1.85
   - name: targets
     default: []
     type: object
diff --git a/cli/src/auth.rs b/cli/src/auth.rs
index 9116e48339f3..d4d62a8bf104 100644
--- a/cli/src/auth.rs
+++ b/cli/src/auth.rs
@@ -665,12 +665,12 @@ impl Auth {
 			.into();
 		}
 
-		return StatusError {
+		StatusError {
 			body: String::from_utf8_lossy(&body).to_string(),
 			status_code,
 			url: url.to_string(),
 		}
-		.into();
+		.into()
 	}
 	/// Implements the device code flow, returning the credentials upon success.
 	async fn do_device_code_flow(&self) -> Result<StoredCredential, AnyError> {
diff --git a/cli/src/log.rs b/cli/src/log.rs
index 538827ed1242..f58f49b21764 100644
--- a/cli/src/log.rs
+++ b/cli/src/log.rs
@@ -282,7 +282,7 @@ pub struct DownloadLogger<'a> {
 	logger: &'a Logger,
 }
 
-impl<'a> crate::util::io::ReportCopyProgress for DownloadLogger<'a> {
+impl crate::util::io::ReportCopyProgress for DownloadLogger<'_> {
 	fn report_progress(&mut self, bytes_so_far: u64, total_bytes: u64) {
 		if total_bytes > 0 {
 			self.logger.emit(
diff --git a/cli/src/tunnels/singleton_server.rs b/cli/src/tunnels/singleton_server.rs
index 7fbd00d04d34..f183f935ce30 100644
--- a/cli/src/tunnels/singleton_server.rs
+++ b/cli/src/tunnels/singleton_server.rs
@@ -142,7 +142,7 @@ pub fn make_singleton_server(
 	}
 }
 
-pub async fn start_singleton_server<'a>(
+pub async fn start_singleton_server(
 	args: SingletonServerArgs<'_>,
 ) -> Result<ServerTermination, AnyError> {
 	let shutdown_rx = ShutdownRequest::create_rx([
diff --git a/cli/src/util/io.rs b/cli/src/util/io.rs
index c5816ae55adb..4b8118a219f8 100644
--- a/cli/src/util/io.rs
+++ b/cli/src/util/io.rs
@@ -235,6 +235,7 @@ mod tests {
 			.write(true)
 			.read(true)
 			.create(true)
+			.truncate(true)
 			.open(&file_path)
 			.unwrap();
 
@@ -271,6 +272,7 @@ mod tests {
 			.write(true)
 			.read(true)
 			.create(true)
+			.truncate(true)
 			.open(&file_path)
 			.unwrap();
 
@@ -305,6 +307,7 @@ mod tests {
 			.write(true)
 			.read(true)
 			.create(true)
+			.truncate(true)
 			.open(&file_path)
 			.unwrap();
 		let mut rng = rand::thread_rng();

From f9e071530c54ea073c9ad1985db63f72a3817fc1 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 4 Mar 2025 13:07:55 -0800
Subject: [PATCH 0621/1815] chat: remove chatReadonlyPromptReference proposal
 (#242610)

We haven't found a use case that resonates here, and this got a bit broken with recent working set refactors.
---
 .../common/extensionsApiProposals.ts          |  3 --
 .../api/common/extHostChatAgents2.ts          |  7 ++---
 .../api/common/extHostTypeConverters.ts       |  7 ++---
 .../chat/browser/chatAttachmentModel.ts       |  3 +-
 .../chatPromptAttachmentsCollection.ts        |  1 -
 .../chatReferencesContentPart.ts              |  4 +--
 .../browser/chatEditing/chatEditingActions.ts | 31 +------------------
 .../browser/chatEditing/chatEditingSession.ts |  4 +--
 .../contrib/chat/browser/chatInputPart.ts     |  2 --
 .../contrib/chat/browser/chatWidget.ts        |  2 +-
 .../contrib/chat/common/chatEditingService.ts |  2 --
 .../contrib/chat/common/chatModel.ts          |  1 -
 ....proposed.chatReadonlyPromptReference.d.ts | 17 ----------
 13 files changed, 11 insertions(+), 73 deletions(-)
 delete mode 100644 src/vscode-dts/vscode.proposed.chatReadonlyPromptReference.d.ts

diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index d006ee0201ab..e065c9faa394 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -38,9 +38,6 @@ const _allApiProposals = {
 	chatProvider: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatProvider.d.ts',
 	},
-	chatReadonlyPromptReference: {
-		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatReadonlyPromptReference.d.ts',
-	},
 	chatReferenceBinaryData: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatReferenceBinaryData.d.ts',
 	},
diff --git a/src/vs/workbench/api/common/extHostChatAgents2.ts b/src/vs/workbench/api/common/extHostChatAgents2.ts
index d053ad5e5ea8..b95655d118a8 100644
--- a/src/vs/workbench/api/common/extHostChatAgents2.ts
+++ b/src/vs/workbench/api/common/extHostChatAgents2.ts
@@ -404,7 +404,7 @@ 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 extRequest = typeConvert.ChatAgentRequest.to(request, location, model, isProposedApiEnabled(detector.extension, 'chatReadonlyPromptReference'), this.getDiagnosticsWhenEnabled(detector.extension));
+		const extRequest = typeConvert.ChatAgentRequest.to(request, location, model, this.getDiagnosticsWhenEnabled(detector.extension));
 
 		return detector.provider.provideParticipantDetection(
 			extRequest,
@@ -488,7 +488,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 			stream = new ChatAgentResponseStream(agent.extension, request, this._proxy, this._commands.converter, sessionDisposables);
 
 			const model = await this.getModelForRequest(request, agent.extension);
-			const extRequest = typeConvert.ChatAgentRequest.to(request, location, model, isProposedApiEnabled(agent.extension, 'chatReadonlyPromptReference'), this.getDiagnosticsWhenEnabled(agent.extension));
+			const extRequest = typeConvert.ChatAgentRequest.to(request, location, model, this.getDiagnosticsWhenEnabled(agent.extension));
 			inFlightRequest = { requestId: requestDto.requestId, extRequest };
 			this._inFlightRequests.add(inFlightRequest);
 
@@ -557,10 +557,9 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 				{ ...ehResult, metadata: undefined };
 
 			// REQUEST turn
-			const hasReadonlyProposal = isProposedApiEnabled(extension, 'chatReadonlyPromptReference');
 			const varsWithoutTools = h.request.variables.variables
 				.filter(v => !v.isTool)
-				.map(v => typeConvert.ChatPromptReference.to(v, hasReadonlyProposal, this.getDiagnosticsWhenEnabled(extension)));
+				.map(v => typeConvert.ChatPromptReference.to(v, this.getDiagnosticsWhenEnabled(extension)));
 			const toolReferences = h.request.variables.variables
 				.filter(v => v.isTool)
 				.map(typeConvert.ChatLanguageModelToolReference.to);
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
index d5344f435217..8f4a1d6533df 100644
--- a/src/vs/workbench/api/common/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -2765,7 +2765,7 @@ export namespace ChatResponsePart {
 }
 
 export namespace ChatAgentRequest {
-	export function to(request: IChatAgentRequest, location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined, model: vscode.LanguageModelChat, hasReadonlyProposal: boolean, diagnostics: readonly [vscode.Uri, readonly vscode.Diagnostic[]][]): vscode.ChatRequest {
+	export function to(request: IChatAgentRequest, location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined, model: vscode.LanguageModelChat, diagnostics: readonly [vscode.Uri, readonly vscode.Diagnostic[]][]): vscode.ChatRequest {
 		const toolReferences = request.variables.variables.filter(v => v.isTool);
 		const variableReferences = request.variables.variables.filter(v => !v.isTool);
 		return {
@@ -2774,7 +2774,7 @@ export namespace ChatAgentRequest {
 			attempt: request.attempt ?? 0,
 			enableCommandDetection: request.enableCommandDetection ?? true,
 			isParticipantDetected: request.isParticipantDetected ?? false,
-			references: variableReferences.map(v => ChatPromptReference.to(v, hasReadonlyProposal, diagnostics)),
+			references: variableReferences.map(v => ChatPromptReference.to(v, diagnostics)),
 			toolReferences: toolReferences.map(ChatLanguageModelToolReference.to),
 			location: ChatLocation.to(request.location),
 			acceptedConfirmationData: request.acceptedConfirmationData,
@@ -2818,7 +2818,7 @@ export namespace ChatLocation {
 }
 
 export namespace ChatPromptReference {
-	export function to(variable: IChatRequestVariableEntry, hasReadonlyProposal: boolean, diagnostics: readonly [vscode.Uri, readonly vscode.Diagnostic[]][]): vscode.ChatPromptReference {
+	export function to(variable: IChatRequestVariableEntry, diagnostics: readonly [vscode.Uri, readonly vscode.Diagnostic[]][]): vscode.ChatPromptReference {
 		let value: vscode.ChatPromptReference['value'] = variable.value;
 		if (!value) {
 			throw new Error('Invalid value reference');
@@ -2861,7 +2861,6 @@ export namespace ChatPromptReference {
 			range: variable.range && [variable.range.start, variable.range.endExclusive],
 			value,
 			modelDescription: variable.modelDescription,
-			isReadonly: hasReadonlyProposal ? variable.isMarkedReadonly : undefined,
 		};
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatAttachmentModel.ts b/src/vs/workbench/contrib/chat/browser/chatAttachmentModel.ts
index 41c3f3e105af..24317550c93a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatAttachmentModel.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatAttachmentModel.ts
@@ -81,13 +81,12 @@ export class ChatAttachmentModel extends Disposable {
 		});
 	}
 
-	asVariableEntry(uri: URI, range?: IRange, isMarkedReadonly?: boolean): IChatRequestVariableEntry {
+	asVariableEntry(uri: URI, range?: IRange): IChatRequestVariableEntry {
 		return {
 			value: range ? { uri, range } : uri,
 			id: uri.toString() + (range?.toString() ?? ''),
 			name: basename(uri),
 			isFile: true,
-			isMarkedReadonly,
 		};
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatPromptAttachmentsCollection.ts b/src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatPromptAttachmentsCollection.ts
index 047a6a80fc06..a659cb8080b1 100644
--- a/src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatPromptAttachmentsCollection.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatAttachmentModel/chatPromptAttachmentsCollection.ts
@@ -55,7 +55,6 @@ export const toChatVariable = (
 		isSelection: false,
 		enabled: true,
 		isFile: true,
-		isMarkedReadonly: isPromptSnippet,
 	};
 };
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts
index 427e7b2fca6b..2d53ebef93aa 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts
@@ -38,7 +38,7 @@ 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 { chatEditingWidgetFileReadonlyContextKey, chatEditingWidgetFileStateContextKey, WorkingSetEntryState } from '../../common/chatEditingService.js';
+import { chatEditingWidgetFileStateContextKey, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { ChatResponseReferencePartStatusKind, IChatContentReference, IChatWarningMessage } from '../../common/chatService.js';
 import { IChatVariablesService } from '../../common/chatVariables.js';
 import { IChatRendererContent, IChatResponseViewModel } from '../../common/chatViewModel.js';
@@ -53,7 +53,6 @@ export interface IChatReferenceListItem extends IChatContentReference {
 	description?: string;
 	state?: WorkingSetEntryState;
 	excluded?: boolean;
-	isMarkedReadonly?: boolean;
 }
 
 export type IChatCollapsibleListItem = IChatReferenceListItem | IChatWarningMessage;
@@ -475,7 +474,6 @@ class CollapsibleListRenderer implements IListRenderer<IChatCollapsibleListItem,
 				if (data.state !== undefined) {
 					chatEditingWidgetFileStateContextKey.bindTo(templateData.contextKeyService).set(data.state);
 				}
-				chatEditingWidgetFileReadonlyContextKey.bindTo(templateData.contextKeyService).set(!!data.isMarkedReadonly);
 			}
 		}
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
index cc9c752977f5..41a35be31a97 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
@@ -28,7 +28,7 @@ import { GroupsOrder, IEditorGroupsService } from '../../../../services/editor/c
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { ChatAgentLocation } from '../../common/chatAgents.js';
 import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { applyingChatEditsFailedContextKey, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, chatEditingAgentSupportsReadonlyReferencesContextKey, chatEditingResourceContextKey, chatEditingWidgetFileReadonlyContextKey, chatEditingWidgetFileStateContextKey, decidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, IChatEditingService, IChatEditingSession, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../../common/chatEditingService.js';
+import { applyingChatEditsFailedContextKey, CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, chatEditingResourceContextKey, chatEditingWidgetFileStateContextKey, decidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, IChatEditingService, IChatEditingSession, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { IChatService } from '../../common/chatService.js';
 import { isRequestVM, isResponseVM } from '../../common/chatViewModel.js';
 import { CHAT_CATEGORY } from '../actions/chatActions.js';
@@ -91,35 +91,6 @@ abstract class WorkingSetAction extends EditingSessionAction {
 	abstract runWorkingSetAction(accessor: ServicesAccessor, editingSession: IChatEditingSession, chatWidget: IChatWidget | undefined, ...uris: URI[]): any;
 }
 
-registerAction2(class MarkFileAsReadonly extends WorkingSetAction {
-	constructor() {
-		super({
-			id: 'chatEditing.markFileAsReadonly',
-			title: localize2('markFileAsReadonly', 'Mark as read-only'),
-			icon: Codicon.lock,
-			toggled: chatEditingWidgetFileReadonlyContextKey,
-			menu: [{
-				id: MenuId.ChatEditingWidgetModifiedFilesToolbar,
-				when: ContextKeyExpr.and(
-					chatEditingAgentSupportsReadonlyReferencesContextKey,
-					ContextKeyExpr.or(
-						ContextKeyExpr.equals(chatEditingWidgetFileReadonlyContextKey.key, true),
-						ContextKeyExpr.equals(chatEditingWidgetFileReadonlyContextKey.key, false),
-					)
-				),
-				order: 10,
-				group: 'navigation'
-			}],
-		});
-	}
-
-	async runWorkingSetAction(_accessor: ServicesAccessor, currentEditingSession: IChatEditingSession, _chatWidget: IChatWidget, ...uris: URI[]): Promise<void> {
-		for (const uri of uris) {
-			currentEditingSession.markIsReadonly(uri);
-		}
-	}
-});
-
 registerAction2(class AddFileToWorkingSet extends WorkingSetAction {
 	constructor() {
 		super({
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 8bff1b50d81a..3fdd1e54203c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -433,7 +433,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		const snapshot = this._createSnapshot(requestId, undoStop);
 		for (const [uri, data] of this._workingSet) {
 			if (data.state !== WorkingSetEntryState.Suggested) {
-				this._workingSet.set(uri, { state: WorkingSetEntryState.Sent, isMarkedReadonly: data.isMarkedReadonly });
+				this._workingSet.set(uri, { state: WorkingSetEntryState.Sent });
 			}
 		}
 
@@ -581,11 +581,9 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			if (entry.state === WorkingSetEntryState.Suggested) {
 				entry.state = WorkingSetEntryState.Attached;
 			}
-			entry.isMarkedReadonly = isReadonly ?? !entry.isMarkedReadonly;
 		} else {
 			this._workingSet.set(resource, {
 				state: WorkingSetEntryState.Attached,
-				isMarkedReadonly: isReadonly ?? true
 			});
 		}
 		this._onDidChange.fire(ChatEditingSessionChangeType.WorkingSet);
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index a35da7d08ad9..72d27bf4d439 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -126,7 +126,6 @@ interface IChatInputPartOptions {
 
 export interface IWorkingSetEntry {
 	uri: URI;
-	isMarkedReadonly?: boolean;
 }
 
 export class ChatInputPart extends Disposable implements IHistoryNavigationWidget {
@@ -1314,7 +1313,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 					state: metadata.state,
 					description: metadata.description,
 					kind: 'reference',
-					isMarkedReadonly: metadata.isMarkedReadonly,
 				});
 				seenEntries.add(file);
 			}
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index 65c48bcdd25e..2b3136322e5c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -1115,7 +1115,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 						unconfirmedSuggestions.add(uri);
 					} else {
 						uniqueWorkingSetEntries.add(uri);
-						editingSessionAttachedContext.unshift(this.attachmentModel.asVariableEntry(uri, undefined, state.isMarkedReadonly));
+						editingSessionAttachedContext.unshift(this.attachmentModel.asVariableEntry(uri, undefined));
 					}
 				}
 
diff --git a/src/vs/workbench/contrib/chat/common/chatEditingService.ts b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
index 48431090b77c..a4af996def4b 100644
--- a/src/vs/workbench/contrib/chat/common/chatEditingService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
@@ -68,7 +68,6 @@ export interface IChatRelatedFilesProvider {
 export interface WorkingSetDisplayMetadata {
 	state: WorkingSetEntryState;
 	description?: string;
-	isMarkedReadonly?: boolean;
 }
 
 export interface IStreamingEdits {
@@ -262,7 +261,6 @@ export const enum ChatEditingSessionState {
 export const CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME = 'chat-editing-multi-diff-source';
 
 export const chatEditingWidgetFileStateContextKey = new RawContextKey<WorkingSetEntryState>('chatEditingWidgetFileState', undefined, localize('chatEditingWidgetFileState', "The current state of the file in the chat editing widget"));
-export const chatEditingWidgetFileReadonlyContextKey = new RawContextKey<boolean>('chatEditingWidgetFileReadonly', undefined, localize('chatEditingWidgetFileReadonly', "Whether the file has been marked as read-only 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);
diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index abd866eea893..5fcbad47af10 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -34,7 +34,6 @@ export interface IBaseChatRequestVariableEntry {
 	fullName?: string;
 	icon?: ThemeIcon;
 	name: string;
-	isMarkedReadonly?: boolean;
 	modelDescription?: string;
 	range?: IOffsetRange;
 	value: IChatRequestVariableValue;
diff --git a/src/vscode-dts/vscode.proposed.chatReadonlyPromptReference.d.ts b/src/vscode-dts/vscode.proposed.chatReadonlyPromptReference.d.ts
deleted file mode 100644
index 0d91b3ed4e79..000000000000
--- a/src/vscode-dts/vscode.proposed.chatReadonlyPromptReference.d.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.
- *--------------------------------------------------------------------------------------------*/
-
-
-declare module 'vscode' {
-
-	export interface ChatPromptReference {
-		/**
-		 * When true, the user has indicated at the reference is informational only.
-		 * The model should avoid changing or suggesting changes to the reference.
-		 */
-		readonly isReadonly?: boolean;
-	}
-
-}

From b77dce455dfd4268fa99d69534691e6a86c00745 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Wed, 5 Mar 2025 08:10:35 +1100
Subject: [PATCH 0622/1815] Ignore metadata when comparing nb changes (#242612)

* Ignore metadata when comparing nb changes

* misc
---
 .../chatEditingModifiedNotebookEntry.ts       | 136 +++++++++---------
 .../chatEditingModifiedNotebookSnapshot.ts    |  32 ++++-
 2 files changed, 97 insertions(+), 71 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 2c73b2b2a32e..f5e4f441600b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -24,14 +24,12 @@ import { IDocumentDiff, nullDocumentDiff } from '../../../../../editor/common/di
 import { DetailedLineRangeMapping, RangeMapping } from '../../../../../editor/common/diff/rangeMapping.js';
 import { TextEdit } from '../../../../../editor/common/languages.js';
 import { IModelDeltaDecoration, ITextModel, MinimapPosition, OverviewRulerLane } from '../../../../../editor/common/model.js';
-import { SingleModelEditStackElement } from '../../../../../editor/common/model/editStack.js';
 import { ModelDecorationOptions } from '../../../../../editor/common/model/textModel.js';
 import { OffsetEdits } from '../../../../../editor/common/model/textModelOffsetEdit.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 { IModelContentChangedEvent } from '../../../../../editor/common/textModelEvents.js';
-import { localize } from '../../../../../nls.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
@@ -121,6 +119,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			if (initialContent) {
 				restoreSnapshot(originalRef.object.notebook, initialContent);
 			} else {
+				initialContent = createSnapshot(notebook, options.serializer.options, configurationServie);
 				// Both models are the same, ensure the cell ids are the same, this way we get a perfect diffing.
 				// No need to generate edits for this.
 				const edits: ICellEditOperation[] = [];
@@ -131,9 +130,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 					}
 				});
 				originalRef.object.notebook.applyEdits(edits, true, undefined, () => undefined, undefined, false);
-
 			}
-			initialContent = initialContent || createSnapshot(originalRef.object.notebook, options.serializer.options, configurationServie);
 			const instance = instantiationService.createInstance(ChatEditingModifiedNotebookEntry, resourceRef, originalRef, _multiDiffEntryDelegate, options.serializer.options, telemetryInfo, chatKind, initialContent);
 			instance._register(disposables);
 			return instance;
@@ -251,7 +248,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		// Or user just reverted the changes made via edits (e.g. edit made a change in a cell and user undid that change either by typing over or other).
 		// Computing snapshot is too slow, as this event gets triggered for every key stroke in a cell,
 		// const didResetToOriginalContent = createSnapshot(this.modifiedModel, this.transientOptions, this.configurationService) === this.initialContent;
-		const didResetToOriginalContent = this.initialContentComparer.isEqual(this.modifiedModel);
+		let didResetToOriginalContent = this.initialContentComparer.isEqual(this.modifiedModel);
 		const currentState = this._stateObs.get();
 		if (currentState === WorkingSetEntryState.Rejected) {
 			return;
@@ -281,7 +278,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 					break;
 				}
 				case NotebookCellsChangeType.ModelChange: {
-					let cellDiffs = sortCellChanges(this._cellsDiffInfo.get()).slice();
+					let cellDiffs = sortCellChanges(this._cellsDiffInfo.get());
 					event.changes.forEach(change => {
 						cellDiffs = adjustCellDiffAndOriginalModelBasedOnCellAddDelete(change,
 							cellDiffs,
@@ -295,52 +292,69 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 					break;
 				}
 				case NotebookCellsChangeType.ChangeCellLanguage: {
-					const edit: ICellEditOperation = {
-						editType: CellEditType.CellLanguage,
-						index: event.index,
-						language: event.language
-					};
-					this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+					const index = getCorrespondingOriginalCellIndex(event.index, this._cellsDiffInfo.get());
+					if (typeof index === 'number') {
+						const edit: ICellEditOperation = {
+							editType: CellEditType.CellLanguage,
+							index,
+							language: event.language
+						};
+						this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+					}
 					break;
 				}
 				case NotebookCellsChangeType.ChangeCellMetadata: {
-					const edit: ICellEditOperation = {
-						editType: CellEditType.Metadata,
-						index: event.index,
-						metadata: event.metadata
-					};
-					this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+					// ipynb and other extensions can alter metadata, ensure we update the original model in the corresponding cell.
+					const index = getCorrespondingOriginalCellIndex(event.index, this._cellsDiffInfo.get());
+					if (typeof index === 'number') {
+						const edit: ICellEditOperation = {
+							editType: CellEditType.Metadata,
+							index,
+							metadata: event.metadata
+						};
+						this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+					}
 					break;
 				}
 				case NotebookCellsChangeType.ChangeCellMime:
 					break;
 				case NotebookCellsChangeType.ChangeCellInternalMetadata: {
-					const edit: ICellEditOperation = {
-						editType: CellEditType.PartialInternalMetadata,
-						index: event.index,
-						internalMetadata: event.internalMetadata
-					};
-					this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+					const index = getCorrespondingOriginalCellIndex(event.index, this._cellsDiffInfo.get());
+					if (typeof index === 'number') {
+						const edit: ICellEditOperation = {
+							editType: CellEditType.PartialInternalMetadata,
+							index,
+							internalMetadata: event.internalMetadata
+						};
+						this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+					}
 					break;
 				}
 				case NotebookCellsChangeType.Output: {
-					const edit: ICellEditOperation = {
-						editType: CellEditType.Output,
-						index: event.index,
-						append: event.append,
-						outputs: event.outputs
-					};
-					this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+					// User can run cells.
+					const index = getCorrespondingOriginalCellIndex(event.index, this._cellsDiffInfo.get());
+					if (typeof index === 'number') {
+						const edit: ICellEditOperation = {
+							editType: CellEditType.Output,
+							index,
+							append: event.append,
+							outputs: event.outputs
+						};
+						this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+					}
 					break;
 				}
 				case NotebookCellsChangeType.OutputItem: {
-					const edit: ICellEditOperation = {
-						editType: CellEditType.OutputItems,
-						outputId: event.outputId,
-						append: event.append,
-						items: event.outputItems
-					};
-					this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
+					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, true);
+					}
 					break;
 				}
 				case NotebookCellsChangeType.Move: {
@@ -356,6 +370,13 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				}
 			}
 		}
+
+		didResetToOriginalContent = this.initialContentComparer.isEqual(this.modifiedModel);
+		if (currentState === WorkingSetEntryState.Modified && didResetToOriginalContent) {
+			this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
+			this.updateCellDiffInfo([], undefined);
+			return;
+		}
 	}
 
 	protected override async _doAccept(tx: ITransaction | undefined): Promise<void> {
@@ -449,7 +470,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		};
 
 		await this._applyEdits(async () => {
-			await Promise.all(edits.map(async edit => {
+			edits.map(edit => {
 				if (TextEdit.isTextEdit(edit)) {
 					if (!this.editedCells.has(resource)) {
 						finishPreviousCells();
@@ -459,7 +480,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				} else {
 					this.acceptNotebookEdit(edit);
 				}
-			}));
+			});
 		});
 
 		// If the last edit for a cell was sent, then handle it
@@ -507,19 +528,19 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		}
 		if (edit.count === 0) {
 			// All existing indexes are shifted by number of cells added.
-			const diff = sortCellChanges(this._cellsDiffInfo.get()).slice();
+			const diff = sortCellChanges(this._cellsDiffInfo.get());
 			diff.forEach(d => {
 				if (d.type !== 'delete' && d.modifiedCellIndex >= edit.index) {
 					d.modifiedCellIndex += edit.cells.length;
 				}
 			});
 			const diffInsert = edit.cells.map((_, i) => this.createInsertedCellDiffInfo(edit.index + i));
-			diff.splice(edit.index + 1, 0, ...diffInsert);
+			diff.splice(edit.index, 0, ...diffInsert);
 			this.updateCellDiffInfo(diff, undefined);
 		} else {
 			// All existing indexes are shifted by number of cells removed.
 			// And unchanged cells should be converted to deleted cells.
-			const diff = sortCellChanges(this._cellsDiffInfo.get()).slice().map((d) => {
+			const diff = sortCellChanges(this._cellsDiffInfo.get()).map((d) => {
 				if (d.type === 'unchanged' && d.modifiedCellIndex >= edit.index && d.modifiedCellIndex <= (edit.index + edit.count - 1)) {
 					return this.createDeleteCellDiffInfo(d.originalCellIndex);
 				}
@@ -723,7 +744,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		// Delete this cell from original as well.
 		const edit: ICellReplaceEdit = { cells: [], count: 1, editType: CellEditType.Replace, index: deletedOriginalIndex, };
 		this.originalModel.applyEdits([edit], true, undefined, () => undefined, undefined, true);
-		const diffs = sortCellChanges(this._cellsDiffInfo.get()).slice()
+		const diffs = sortCellChanges(this._cellsDiffInfo.get())
 			.filter(d => !(d.type === 'delete' && d.originalCellIndex === deletedOriginalIndex))
 			.map(diff => {
 				if (diff.type !== 'insert' && diff.originalCellIndex > deletedOriginalIndex) {
@@ -773,7 +794,6 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	}
 
 	override createSnapshot(requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry {
-		this.cellEntryMap.forEach(entry => entry.isFirstEditAfterStartOrSnapshot = true);
 		return {
 			resource: this.modifiedURI,
 			languageId: SnapshotLanguageId,
@@ -839,8 +859,8 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			return cellEntry;
 		}
 
-		const disposables = this._register(new DisposableStore());
-		cellEntry = this._register(this._instantiationService.createInstance(ChatEditingNotebookCellEntry, this.modifiedResourceRef.object.resource, cell, modifiedCellModel, originalCellModel, this._telemetryInfo, disposables));
+		const disposables = new DisposableStore();
+		cellEntry = this._register(this._instantiationService.createInstance(ChatEditingNotebookCellEntry, this.modifiedResourceRef.object.resource, cell, modifiedCellModel, originalCellModel, disposables));
 		this.cellEntryMap.set(cell.uri, cellEntry);
 		disposables.add(autorun(r => {
 			if (this.modifiedModel.cells.indexOf(cell) === -1) {
@@ -905,10 +925,6 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 	});
 
 
-	private _isFirstEditAfterStartOrSnapshot: boolean = true;
-	public set isFirstEditAfterStartOrSnapshot(value: boolean) {
-		this._isFirstEditAfterStartOrSnapshot = value;
-	}
 	private _edit: OffsetEdit = OffsetEdit.empty;
 	private _isEditFromUs: boolean = false;
 	public get isEditFromUs(): boolean {
@@ -923,7 +939,6 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 	private _diffOperationIds: number = 0;
 
 	private readonly _diffInfo = observableValue<IDocumentDiff>(this, nullDocumentDiff);
-	public readonly changesCount: IObservable<number>;
 	public get diffInfo(): IObservable<IDocumentDiff> {
 		return this._diffInfo;
 	}
@@ -945,18 +960,14 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 		public readonly cell: NotebookCellTextModel,
 		private readonly modifiedModel: ITextModel,
 		private readonly originalModel: ITextModel,
-		private readonly _telemetryInfo: IModifiedEntryTelemetryInfo,
 		disposables: DisposableStore,
 		@IConfigurationService configService: IConfigurationService,
-		@IChatService private readonly _chatService: IChatService,
 		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
-		@IUndoRedoService private readonly _undoRedoService: IUndoRedoService,
 		@INotebookEditorService private readonly notebookEditorService: INotebookEditorService
 	) {
 		super();
 		this.initialContent = this.originalModel.getValue();
 		this._register(disposables);
-		this.changesCount = this._diffInfo.map(diff => diff.changes.length);
 		this._register(this.modifiedModel.onDidChangeContent(e => {
 			this._mirrorEdits(e);
 
@@ -1042,14 +1053,6 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 			vm?.updateEditState(CellEditState.Editing, 'chatEdit');
 		}
 
-		// push stack element for the first edit
-		if (this._isFirstEditAfterStartOrSnapshot) {
-			this._isFirstEditAfterStartOrSnapshot = false;
-			const request = this._chatService.getSession(this._telemetryInfo.sessionId)?.getRequests().at(-1);
-			const label = request?.message.text ? localize('chatEditing1', "Chat Edit: '{0}'", request.message.text) : localize('chatEditing2', "Chat Edit");
-			this._undoRedoService.pushElement(new SingleModelEditStackElement(label, 'chat.edit', this.modifiedModel, null));
-		}
-
 		const ops = textEdits.map(TextEdit.asEditOperation);
 		const undoEdits = this._applyEdits(ops);
 
@@ -1543,3 +1546,8 @@ export function adjustCellDiffAndOriginalModelBasedOnCellMovements(event: Notebo
 
 	return [cellDiffs, []];
 }
+
+function getCorrespondingOriginalCellIndex(modifiedCellIndex: number, cellDiffInfo: ICellDiffInfo[]): number | undefined {
+	const entry = cellDiffInfo.find(d => d.modifiedCellIndex === modifiedCellIndex);
+	return entry?.originalCellIndex;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookSnapshot.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookSnapshot.ts
index 52acc037e778..b9c467af7023 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookSnapshot.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookSnapshot.ts
@@ -4,6 +4,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 { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { SnapshotContext } from '../../../../services/workingCopy/common/fileWorkingCopy.js';
@@ -54,7 +55,9 @@ export function restoreSnapshot(notebook: NotebookTextModel, snapshot: string):
 
 export class SnapshotComparer {
 	private readonly data: NotebookData;
+	private readonly transientOptions: TransientOptions | undefined;
 	constructor(initialCotent: string) {
+		this.transientOptions = deserializeSnapshot(initialCotent).transientOptions;
 		this.data = deserializeSnapshot(initialCotent).data;
 	}
 
@@ -62,9 +65,14 @@ export class SnapshotComparer {
 		if (notebook.cells.length !== this.data.cells.length) {
 			return false;
 		}
-		if (JSON.stringify(notebook.metadata) !== JSON.stringify(this.data.metadata)) {
+		const transientDocumentMetadata = this.transientOptions?.transientDocumentMetadata || {};
+		const notebookMetadata = filter(notebook.metadata || {}, key => !transientDocumentMetadata[key]);
+		const comparerMetadata = filter(this.data.metadata || {}, key => !transientDocumentMetadata[key]);
+		// When comparing ignore transient items.
+		if (JSON.stringify(notebookMetadata) !== JSON.stringify(comparerMetadata)) {
 			return false;
 		}
+		const transientCellMetadata = this.transientOptions?.transientCellMetadata || {};
 		for (let i = 0; i < notebook.cells.length; i++) {
 			const notebookCell = notebook.cells[i];
 			const comparerCell = this.data.cells[i];
@@ -85,13 +93,18 @@ export class SnapshotComparer {
 				if (notebookCell.source !== comparerCell.source) {
 					return false;
 				}
-				if (notebookCell.outputs.length !== comparerCell.outputs.length) {
+				if (!this.transientOptions?.transientOutputs && notebookCell.outputs.length !== comparerCell.outputs.length) {
 					return false;
 				}
-				if (JSON.stringify(notebookCell.metadata) !== JSON.stringify(comparerCell.metadata)) {
+				// When comparing ignore transient items.
+				const cellMetadata = filter(notebookCell.metadata || {}, key => !transientCellMetadata[key]);
+				const comparerCellMetadata = filter(comparerCell.metadata || {}, key => !transientCellMetadata[key]);
+				if (JSON.stringify(cellMetadata) !== JSON.stringify(comparerCellMetadata)) {
 					return false;
 				}
-				if (JSON.stringify(sanitizeCellDto2(notebookCell, true)) !== JSON.stringify(sanitizeCellDto2(comparerCell, true))) {
+
+				// When comparing ignore transient items.
+				if (JSON.stringify(sanitizeCellDto2(notebookCell, true, this.transientOptions)) !== JSON.stringify(sanitizeCellDto2(comparerCell, true, this.transientOptions))) {
 					return false;
 				}
 			}
@@ -101,8 +114,9 @@ export class SnapshotComparer {
 	}
 }
 
-function sanitizeCellDto2(cell: ICellDto2, ignoreInternalMetadata?: boolean): ICellDto2 {
-	const outputs = cell.outputs.map(output => {
+function sanitizeCellDto2(cell: ICellDto2, ignoreInternalMetadata?: boolean, transientOptions?: TransientOptions): ICellDto2 {
+	const transientCellMetadata = transientOptions?.transientCellMetadata || {};
+	const outputs = transientOptions?.transientOutputs ? [] : cell.outputs.map(output => {
 		// Ensure we're in full control of the data being stored.
 		// Possible we have classes instead of plain objects.
 		return {
@@ -121,7 +135,7 @@ function sanitizeCellDto2(cell: ICellDto2, ignoreInternalMetadata?: boolean): IC
 	return {
 		cellKind: cell.cellKind,
 		language: cell.language,
-		metadata: cell.metadata,
+		metadata: cell.metadata ? filter(cell.metadata, key => !transientCellMetadata[key]) : cell.metadata,
 		outputs,
 		mime: cell.mime,
 		source: cell.source,
@@ -132,6 +146,10 @@ function sanitizeCellDto2(cell: ICellDto2, ignoreInternalMetadata?: boolean): IC
 
 function serializeSnapshot(data: NotebookData, transientOptions: TransientOptions | undefined): string {
 	const dataDto: NotebookData = {
+		// Never pass transient options, as we're after a backup here.
+		// Else we end up stripping outputs from backups.
+		// Whether its persisted or not is up to the serializer.
+		// However when reloading/restoring we need to preserve outputs.
 		cells: data.cells.map(cell => sanitizeCellDto2(cell)),
 		metadata: data.metadata,
 	};

From e1a96932fc42521e680262291d5d43e51d28d172 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Tue, 4 Mar 2025 22:33:18 +0100
Subject: [PATCH 0623/1815] Marks workerMain as potentially dead code.
 (#242614)

---
 src/vs/base/worker/workerMain.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/vs/base/worker/workerMain.ts b/src/vs/base/worker/workerMain.ts
index a094636cc84e..bd1880e77a7e 100644
--- a/src/vs/base/worker/workerMain.ts
+++ b/src/vs/base/worker/workerMain.ts
@@ -3,6 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+// TODO @hediet @alexdima check where this code is used or remove this file
+// (code oss runs fine without this file, but is probably needed by the monaco-editor).
+
 (function () {
 
 	function loadCode(moduleId: string): Promise<SimpleWorkerModule> {

From 2c11910830343ebeeed840ba249604b802bc0bb5 Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Tue, 4 Mar 2025 13:38:26 -0800
Subject: [PATCH 0624/1815] fix: resolve selected related files to attachments
 (#242615)

---
 .../contrib/chat/browser/actions/chatContextActions.ts    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index 95a4a73965e4..0162dc6b1486 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -662,7 +662,13 @@ export class AttachContextAction extends Action2 {
 					}, []));
 				const selectedFiles = await quickInputService.pick(itemsPromise, { placeHolder: localize('relatedFiles', 'Add related files to your working set'), canPickMany: true });
 				for (const file of selectedFiles ?? []) {
-					chatEditingService.getEditingSession(chatSessionId)?.addFileToWorkingSet(file.value);
+					toAttach.push({
+						id: this._getFileContextId({ resource: file.value }),
+						value: file.value,
+						name: file.label,
+						isFile: true,
+						isOmitted: false
+					});
 				}
 			} else if (isScreenshotQuickPickItem(pick)) {
 				const blob = await hostService.getScreenshot();

From b3724264d6120c8770f3ebc63ac37407e565a93b Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Tue, 4 Mar 2025 14:13:55 -0800
Subject: [PATCH 0625/1815] only expand bottom selection indicator for
 multi-select (#242618)

Co-authored-by: amunger <>
---
 .../workbench/contrib/notebook/browser/notebookEditorWidget.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
index 2c7a92be7212..ce6e26483036 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -856,7 +856,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		styleSheets.push(`.notebookOverlay .monaco-list .monaco-list-row .cell-shadow-container-bottom { top: ${cellBottomMargin}px; }`);
 
 		styleSheets.push(`
-			.notebookOverlay .monaco-list .monaco-list-row:has(+ .monaco-list-row.selected) .cell-focus-indicator-bottom {
+			.notebookOverlay .monaco-list.selection-multiple .monaco-list-row:has(+ .monaco-list-row.selected) .cell-focus-indicator-bottom {
 				height: ${bottomToolbarGap + cellBottomMargin}px;
 			}
 		`);

From 33898b60575b89890961535da164bf0a76a505d4 Mon Sep 17 00:00:00 2001
From: Michael Lively <michaellively00@gmail.com>
Date: Tue, 4 Mar 2025 14:25:37 -0800
Subject: [PATCH 0626/1815] Fix notebook sticky scroll leak (#242619)

fix sticky line leaks if maps are the same
---
 .../viewParts/notebookEditorStickyScroll.ts   | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts
index d59ee4f47e5c..ea8227a1a690 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.ts
@@ -47,7 +47,6 @@ export class NotebookStickyLine extends Disposable {
 				this.toggleFoldRange(currentFoldingState);
 			}
 		}));
-
 	}
 
 	private toggleFoldRange(currentState: CellFoldingState) {
@@ -212,13 +211,17 @@ export class NotebookStickyScroll extends Disposable {
 		await notebookCellOutline.computeFullSymbols(CancellationToken.None);
 
 		// Initial content update
-		this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, notebookCellOutline.entries, this.getCurrentStickyHeight()));
+		const computed = computeContent(this.notebookEditor, this.notebookCellList, notebookCellOutline.entries, this.getCurrentStickyHeight());
+		this.updateContent(computed);
 
 		// Set up outline change listener
 		this._disposables.add(notebookCellOutline.onDidChange(() => {
-			const recompute = computeContent(this.notebookEditor, this.notebookCellList, notebookCellOutline.entries, this.getCurrentStickyHeight());
-			if (!this.compareStickyLineMaps(recompute, this.currentStickyLines)) {
-				this.updateContent(recompute);
+			const computed = computeContent(this.notebookEditor, this.notebookCellList, notebookCellOutline.entries, this.getCurrentStickyHeight());
+			if (!this.compareStickyLineMaps(computed, this.currentStickyLines)) {
+				this.updateContent(computed);
+			} else {
+				// if we don't end up updating the content, we need to avoid leaking the map
+				this.disposeStickyLineMap(computed);
 			}
 		}));
 
@@ -226,21 +229,36 @@ export class NotebookStickyScroll extends Disposable {
 		this._disposables.add(this.notebookEditor.onDidAttachViewModel(async () => {
 			// ensure recompute symbols when view model changes -- could be missed if outline is closed
 			await notebookCellOutline.computeFullSymbols(CancellationToken.None);
-			this.updateContent(computeContent(this.notebookEditor, this.notebookCellList, notebookCellOutline.entries, this.getCurrentStickyHeight()));
+
+			const computed = computeContent(this.notebookEditor, this.notebookCellList, notebookCellOutline.entries, this.getCurrentStickyHeight());
+			this.updateContent(computed);
 		}));
 
 		this._disposables.add(this.notebookEditor.onDidScroll(() => {
 			const d = new Delayer(100);
 			d.trigger(() => {
 				d.dispose();
-				const recompute = computeContent(this.notebookEditor, this.notebookCellList, notebookCellOutline.entries, this.getCurrentStickyHeight());
-				if (!this.compareStickyLineMaps(recompute, this.currentStickyLines)) {
-					this.updateContent(recompute);
+
+				const computed = computeContent(this.notebookEditor, this.notebookCellList, notebookCellOutline.entries, this.getCurrentStickyHeight());
+				if (!this.compareStickyLineMaps(computed, this.currentStickyLines)) {
+					this.updateContent(computed);
+				} else {
+					// if we don't end up updating the content, we need to avoid leaking the map
+					this.disposeStickyLineMap(computed);
 				}
 			});
 		}));
 	}
 
+	// Add helper method to dispose a map of sticky lines
+	private disposeStickyLineMap(map: Map<OutlineEntry, { line: NotebookStickyLine; rendered: boolean }>) {
+		map.forEach(value => {
+			if (value.line) {
+				value.line.dispose();
+			}
+		});
+	}
+
 	// take in an cell index, and get the corresponding outline entry
 	static getVisibleOutlineEntry(visibleIndex: number, notebookOutlineEntries: OutlineEntry[]): OutlineEntry | undefined {
 		let left = 0;

From 4a632c07665692cf186a6246f5bc53aa14fb59a3 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Tue, 4 Mar 2025 23:38:01 +0100
Subject: [PATCH 0627/1815] EditContext: Take into account word wrap and
 position the screen reader content correctly (#241189)

* taking into account word wrap and positioning the screen reader content correctly

* adding code

* cleaning

* adding one more setting to control the activation of the edit context when the accessibility mode is enabled

* Revert "adding one more setting to control the activation of the edit context when the accessibility mode is enabled"

This reverts commit 3c28b671e8b39538991235661848db682e76c977.
---
 .../editContext/native/nativeEditContext.css  |  4 +--
 .../editContext/native/screenReaderSupport.ts | 32 +++++++++----------
 src/vs/editor/common/config/editorOptions.ts  |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.css b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.css
index 792c15feec2b..5ca36c59620d 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.css
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.css
@@ -7,10 +7,10 @@
 	margin: 0;
 	padding: 0;
 	position: absolute;
-	overflow: hidden;
+	overflow-y: scroll;
+	scrollbar-width: none;
 	z-index: -10;
 	white-space: pre-wrap;
-	text-wrap: nowrap;
 }
 
 .monaco-editor .native-edit-context-textarea {
diff --git a/src/vs/editor/browser/controller/editContext/native/screenReaderSupport.ts b/src/vs/editor/browser/controller/editContext/native/screenReaderSupport.ts
index 769bb020d728..93a038232201 100644
--- a/src/vs/editor/browser/controller/editContext/native/screenReaderSupport.ts
+++ b/src/vs/editor/browser/controller/editContext/native/screenReaderSupport.ts
@@ -19,7 +19,7 @@ import { ViewContext } from '../../../../common/viewModel/viewContext.js';
 import { applyFontInfo } from '../../../config/domFontInfo.js';
 import { IEditorAriaOptions } from '../../../editorBrowser.js';
 import { RestrictedRenderingContext, RenderingContext, HorizontalPosition } from '../../../view/renderingContext.js';
-import { ariaLabelForScreenReaderContent, ISimpleModel, newlinecount, PagedScreenReaderStrategy, ScreenReaderContentState } from '../screenReaderUtils.js';
+import { ariaLabelForScreenReaderContent, ISimpleModel, PagedScreenReaderStrategy, ScreenReaderContentState } from '../screenReaderUtils.js';
 
 export class ScreenReaderSupport {
 
@@ -27,6 +27,7 @@ export class ScreenReaderSupport {
 	private _contentLeft: number = 1;
 	private _contentWidth: number = 1;
 	private _contentHeight: number = 1;
+	private _divWidth: number = 1;
 	private _lineHeight: number = 1;
 	private _fontInfo!: FontInfo;
 	private _accessibilityPageSize: number = 1;
@@ -69,12 +70,14 @@ export class ScreenReaderSupport {
 	private _updateConfigurationSettings(): void {
 		const options = this._context.configuration.options;
 		const layoutInfo = options.get(EditorOption.layoutInfo);
+		const wrappingColumn = layoutInfo.wrappingColumn;
 		this._contentLeft = layoutInfo.contentLeft;
 		this._contentWidth = layoutInfo.contentWidth;
 		this._contentHeight = layoutInfo.height;
 		this._fontInfo = options.get(EditorOption.fontInfo);
 		this._lineHeight = options.get(EditorOption.lineHeight);
 		this._accessibilityPageSize = options.get(EditorOption.accessibilityPageSize);
+		this._divWidth = Math.round(wrappingColumn * this._fontInfo.typicalHalfwidthCharacterWidth);
 	}
 
 	private _updateDomAttributes(): void {
@@ -88,6 +91,9 @@ export class ScreenReaderSupport {
 		const tabSize = this._context.viewModel.model.getOptions().tabSize;
 		const spaceWidth = options.get(EditorOption.fontInfo).spaceWidth;
 		this._domNode.domNode.style.tabSize = `${tabSize * spaceWidth}px`;
+		const wordWrapOverride2 = options.get(EditorOption.wordWrapOverride2);
+		const wordWrapValue = wordWrapOverride2 !== 'inherit' ? wordWrapOverride2 : options.get(EditorOption.wordWrap);
+		this._domNode.domNode.style.textWrap = wordWrapValue === 'off' ? 'nowrap' : 'wrap';
 	}
 
 	public onCursorStateChanged(e: ViewCursorStateChangedEvent): void {
@@ -119,22 +125,25 @@ export class ScreenReaderSupport {
 		}
 
 		const editorScrollTop = this._context.viewLayout.getCurrentScrollTop();
-		const top = this._context.viewLayout.getVerticalOffsetForLineNumber(this._primarySelection.positionLineNumber) - editorScrollTop;
+		const positionLineNumber = this._primarySelection.positionLineNumber;
+		const top = this._context.viewLayout.getVerticalOffsetForLineNumber(positionLineNumber) - editorScrollTop;
 		if (top < 0 || top > this._contentHeight) {
 			// cursor is outside the viewport
 			this._renderAtTopLeft();
 			return;
 		}
 
-		this._doRender(top, this._contentLeft, this._contentWidth, this._lineHeight);
-		this._setScrollTop();
+		const offsetForStartPositionWithinEditor = this._context.viewLayout.getVerticalOffsetForLineNumber(this._screenReaderContentState.startPositionWithinEditor.lineNumber);
+		const offsetForPositionLineNumber = this._context.viewLayout.getVerticalOffsetForLineNumber(positionLineNumber);
+		const scrollTop = offsetForPositionLineNumber - offsetForStartPositionWithinEditor;
+		this._doRender(scrollTop, top, this._contentLeft, this._divWidth, this._lineHeight);
 	}
 
 	private _renderAtTopLeft(): void {
-		this._doRender(0, 0, this._contentWidth, 1);
+		this._doRender(0, 0, 0, this._contentWidth, 1);
 	}
 
-	private _doRender(top: number, left: number, width: number, height: number): void {
+	private _doRender(scrollTop: number, top: number, left: number, width: number, height: number): void {
 		// For correct alignment of the screen reader content, we need to apply the correct font
 		applyFontInfo(this._domNode, this._fontInfo);
 
@@ -142,16 +151,7 @@ export class ScreenReaderSupport {
 		this._domNode.setLeft(left);
 		this._domNode.setWidth(width);
 		this._domNode.setHeight(height);
-	}
-
-	private _setScrollTop(): void {
-		if (!this._screenReaderContentState) {
-			return;
-		}
-		// Setting position within the screen reader content by modifying scroll position
-		const textContentBeforeSelection = this._screenReaderContentState.value.substring(0, this._screenReaderContentState.selectionStart);
-		const numberOfLinesOfContentBeforeSelection = newlinecount(textContentBeforeSelection);
-		this._domNode.domNode.scrollTop = numberOfLinesOfContentBeforeSelection * this._lineHeight;
+		this._domNode.domNode.scrollTop = scrollTop;
 	}
 
 	public setAriaOptions(options: IEditorAriaOptions): void {
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index e49033996e00..31a120da6ca9 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -1944,7 +1944,7 @@ class EffectiveExperimentalEditContextEnabled extends ComputedEditorOption<Edito
 
 	public compute(env: IEnvironmentalOptions, options: IComputedEditorOptions): boolean {
 		const editContextSupported = typeof (globalThis as any).EditContext === 'function';
-		return editContextSupported && env.accessibilitySupport !== AccessibilitySupport.Enabled && options.get(EditorOption.experimentalEditContextEnabled);
+		return editContextSupported && options.get(EditorOption.experimentalEditContextEnabled);
 	}
 }
 

From 3a1ac1d883ef330f01e0060b4f68bd2c4ba9ad20 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Wed, 5 Mar 2025 09:44:57 +1100
Subject: [PATCH 0628/1815] Support editing notebooks via edit tool (#242542)

---
 .../contrib/chat/common/tools/editFileTool.ts | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/common/tools/editFileTool.ts b/src/vs/workbench/contrib/chat/common/tools/editFileTool.ts
index 27b3a2b81208..b6384cf0ad54 100644
--- a/src/vs/workbench/contrib/chat/common/tools/editFileTool.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/editFileTool.ts
@@ -13,6 +13,8 @@ import { localize } from '../../../../../nls.js';
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
 import { SaveReason } from '../../../../common/editor.js';
 import { ITextFileService } from '../../../../services/textfile/common/textfiles.js';
+import { CellUri } from '../../../notebook/common/notebookCommon.js';
+import { INotebookService } from '../../../notebook/common/notebookService.js';
 import { ICodeMapperService } from '../../common/chatCodeMapperService.js';
 import { IChatEditingService } from '../../common/chatEditingService.js';
 import { ChatModel } from '../../common/chatModel.js';
@@ -76,6 +78,7 @@ export class EditTool implements IToolImpl {
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
 		@ILanguageModelIgnoredFilesService private readonly ignoredFilesService: ILanguageModelIgnoredFilesService,
 		@ITextFileService private readonly textFileService: ITextFileService,
+		@INotebookService private readonly notebookService: INotebookService,
 	) { }
 
 	async invoke(invocation: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult> {
@@ -118,11 +121,21 @@ export class EditTool implements IToolImpl {
 			kind: 'markdownContent',
 			content: new MarkdownString(parameters.code + '\n````\n')
 		});
-		model.acceptResponseProgress(request, {
-			kind: 'textEdit',
-			edits: [],
-			uri
-		});
+		const notebookUri = CellUri.parse(uri)?.notebook || uri;
+		// Signal start.
+		if (this.notebookService.hasSupportedNotebooks(notebookUri) && (this.notebookService.getNotebookTextModel(notebookUri))) {
+			model.acceptResponseProgress(request, {
+				kind: 'notebookEdit',
+				edits: [],
+				uri: notebookUri
+			});
+		} else {
+			model.acceptResponseProgress(request, {
+				kind: 'textEdit',
+				edits: [],
+				uri
+			});
+		}
 
 		const editSession = this.chatEditingService.getEditingSession(model.sessionId);
 		if (!editSession) {
@@ -142,7 +155,12 @@ export class EditTool implements IToolImpl {
 			},
 		}, token);
 
-		model.acceptResponseProgress(request, { kind: 'textEdit', uri, edits: [], done: true });
+		// Signal end.
+		if (this.notebookService.hasSupportedNotebooks(notebookUri) && (this.notebookService.getNotebookTextModel(notebookUri))) {
+			model.acceptResponseProgress(request, { kind: 'notebookEdit', uri: notebookUri, edits: [], done: true });
+		} else {
+			model.acceptResponseProgress(request, { kind: 'textEdit', uri, edits: [], done: true });
+		}
 
 		if (result?.errorMessage) {
 			throw new Error(result.errorMessage);

From c47b24903914af590adcd4e90a04caa43ba198af Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Tue, 4 Mar 2025 14:51:00 -0800
Subject: [PATCH 0629/1815] fix more disposable leaks in notebooks (#242624)

* register disposable stores

* dispose disposable store

---------

Co-authored-by: amunger <>
---
 .../contrib/notebook/browser/view/renderers/cellRenderer.ts | 6 +++---
 .../browser/viewParts/notebookEditorWidgetContextKeys.ts    | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
index 826b7d3d53b1..14fdeaef5f7a 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
@@ -138,7 +138,7 @@ export class MarkupCellRenderer extends AbstractCellRenderer implements IListRen
 	renderTemplate(rootContainer: HTMLElement): MarkdownCellRenderTemplate {
 		rootContainer.classList.add('markdown-cell-row');
 		const container = DOM.append(rootContainer, DOM.$('.cell-inner-container'));
-		const templateDisposables = new DisposableStore();
+		const templateDisposables = this._register(new DisposableStore());
 		const contextKeyService = templateDisposables.add(this.contextKeyServiceProvider(container));
 		const decorationContainer = DOM.append(rootContainer, $('.cell-decoration'));
 		const titleToolbarContainer = DOM.append(container, $('.cell-title-toolbar'));
@@ -200,7 +200,7 @@ export class MarkupCellRenderer extends AbstractCellRenderer implements IListRen
 			editorContainer,
 			foldingIndicator,
 			templateDisposables,
-			elementDisposables: new DisposableStore(),
+			elementDisposables: this._register(new DisposableStore()),
 			cellParts,
 			toJSON: () => { return {}; }
 		};
@@ -261,7 +261,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 	renderTemplate(rootContainer: HTMLElement): CodeCellRenderTemplate {
 		rootContainer.classList.add('code-cell-row');
 		const container = DOM.append(rootContainer, DOM.$('.cell-inner-container'));
-		const templateDisposables = new DisposableStore();
+		const templateDisposables = this._register(new DisposableStore());
 		const contextKeyService = templateDisposables.add(this.contextKeyServiceProvider(container));
 		const decorationContainer = DOM.append(rootContainer, $('.cell-decoration'));
 		const focusIndicatorTop = new FastDomNode(DOM.append(container, $('.cell-focus-indicator.cell-focus-indicator-top')));
diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorWidgetContextKeys.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorWidgetContextKeys.ts
index d2467be2d7eb..0cee65351d0d 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorWidgetContextKeys.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorWidgetContextKeys.ts
@@ -72,6 +72,7 @@ export class NotebookEditorContextKeys {
 	dispose(): void {
 		this._disposables.dispose();
 		this._viewModelDisposables.dispose();
+		this._selectedKernelDisposables.dispose();
 		this._notebookKernelCount.reset();
 		this._notebookKernelSourceCount.reset();
 		this._interruptibleKernel.reset();

From 9244daf4fefc69981f8abfb16db0c32cf217a2cc Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Tue, 4 Mar 2025 15:30:26 -0800
Subject: [PATCH 0630/1815] use the disposable store param (#242627)

Co-authored-by: amunger <>
---
 .../contrib/cellStatusBar/executionStatusBarItemController.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.ts b/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.ts
index 992fcddbbaaf..184c94dbaac8 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.ts
@@ -288,7 +288,7 @@ class TimerCellStatusBarItem extends Disposable {
 				this._deferredUpdate = disposableTimeout(() => {
 					this._deferredUpdate = undefined;
 					this._currentItemIds = this._notebookViewModel.deltaCellStatusBarItems(this._currentItemIds, [{ handle: this._cell.handle, items }]);
-				}, UPDATE_TIMER_GRACE_PERIOD);
+				}, UPDATE_TIMER_GRACE_PERIOD, this._store);
 			}
 		} else {
 			this._deferredUpdate?.dispose();

From ad05d15e38162b24a829692306d595fb61dd83af Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Tue, 4 Mar 2025 15:32:36 -0800
Subject: [PATCH 0631/1815] track pending layouts and dispose them (#242626)

Co-authored-by: amunger <>
---
 .../notebook/browser/notebookEditorWidget.ts       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
index ce6e26483036..9e0b6f8cf18b 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
@@ -2343,6 +2343,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 
 	//#region Cell operations/layout API
 	private _pendingLayouts: WeakMap<ICellViewModel, IDisposable> | null = new WeakMap<ICellViewModel, IDisposable>();
+	private _layoutDisposables: Set<IDisposable> = new Set<IDisposable>();
 	async layoutNotebookCell(cell: ICellViewModel, height: number, context?: CellLayoutContext): Promise<void> {
 		this._debug('layout cell', cell.handle, height);
 		const viewIndex = this._list.getViewIndex(cell);
@@ -2394,16 +2395,21 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 
 			this._list.updateElementHeight2(cell, height);
 			deferred.complete(undefined);
-			pendingLayout?.dispose();
+			if (pendingLayout) {
+				pendingLayout.dispose();
+				this._layoutDisposables.delete(pendingLayout);
+			}
 		};
 
 		if (this._list.inRenderingTransaction) {
 			const layoutDisposable = DOM.scheduleAtNextAnimationFrame(DOM.getWindow(this.getDomNode()), doLayout);
 
-			this._pendingLayouts?.set(cell, toDisposable(() => {
+			const disposable = toDisposable(() => {
 				layoutDisposable.dispose();
 				deferred.complete(undefined);
-			}));
+			});
+			this._pendingLayouts?.set(cell, disposable);
+			this._layoutDisposables.add(disposable);
 		} else {
 			doLayout();
 		}
@@ -3269,6 +3275,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditorD
 		this._webview?.dispose();
 		this._webview = null;
 
+		this._layoutDisposables.forEach(d => d.dispose());
+
 		this.notebookEditorService.removeNotebookEditor(this);
 		dispose(this._contributions.values());
 		this._contributions.clear();

From 978a5ae961d8b66551c4a9b3ae093917f19042ea Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Wed, 5 Mar 2025 11:31:02 +1100
Subject: [PATCH 0632/1815] Fix issues with nb chat edit changes (#242629)

---
 .../chatEditingModifiedNotebookEntry.ts       | 47 +++++++++------
 .../chatEditingNotebookEditorIntegration.ts   |  2 +-
 .../chatEditingModifiedNotebookEntry.test.ts  | 58 +++++++++++++++++++
 3 files changed, 89 insertions(+), 18 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index f5e4f441600b..f805a703c630 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -484,7 +484,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		});
 
 		// If the last edit for a cell was sent, then handle it
-		if (isCellUri && isLastEdits) {
+		if (isLastEdits) {
 			finishPreviousCells();
 		}
 
@@ -769,8 +769,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	}
 
 	calculateRewriteRadio() {
-		const cellChanges = this._cellsDiffInfo.get();
-		const totalNumberOfUpdatedLines = cellChanges.reduce((totalUpdatedLines, value) => {
+		const totalNumberOfUpdatedLines = this._cellsDiffInfo.get().reduce((totalUpdatedLines, value) => {
 			const getUpadtedLineCount = () => {
 				if (value.type === 'unchanged') {
 					return 0;
@@ -868,13 +867,26 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			}
 			const diffs = this.cellsDiffInfo.get().slice();
 			const index = this.modifiedModel.cells.indexOf(cell);
-			const entry = diffs.find(entry => entry.modifiedCellIndex === index);
+			let entry = diffs.find(entry => entry.modifiedCellIndex === index);
 			if (!entry) {
 				// Not possible.
 				return;
 			}
+			const entryIndex = diffs.indexOf(entry);
 			entry.diff.set(cellEntry.diffInfo.read(r), undefined);
-			diffs.splice(diffs.indexOf(entry), 1, { ...entry });
+			if (cellEntry.diffInfo.get().identical && entry.type === 'modified') {
+				entry = {
+					...entry,
+					type: 'unchanged',
+				};
+			}
+			if (!cellEntry.diffInfo.get().identical && entry.type === 'unchanged') {
+				entry = {
+					...entry,
+					type: 'modified',
+				};
+			}
+			diffs.splice(entryIndex, 1, { ...entry });
 			const maxModifiedLineNumber = cellEntry.maxModifiedLineNumber.read(r);
 			const maxModifiedLineNumbers = this._maxModifiedLineNumbers.get().slice();
 			maxModifiedLineNumbers[index] = maxModifiedLineNumber;
@@ -970,7 +982,6 @@ class ChatEditingNotebookCellEntry extends ObservableDisposable {
 		this._register(disposables);
 		this._register(this.modifiedModel.onDidChangeContent(e => {
 			this._mirrorEdits(e);
-
 		}));
 		this._register(toDisposable(() => {
 			this.clearCurrentEditLineDecoration();
@@ -1277,18 +1288,20 @@ export function adjustCellDiffForRevertingAnInsertedCell(modifiedCellIndex: numb
 		// Not possible.
 		return cellDiffInfo;
 	}
-	cellDiffInfo = sortCellChanges(cellDiffInfo).map(d => {
-		if (d.type === 'insert' && d.modifiedCellIndex === modifiedCellIndex) {
+	cellDiffInfo = sortCellChanges(cellDiffInfo)
+		.filter(d => !(d.type === 'insert' && d.modifiedCellIndex === modifiedCellIndex))
+		.map(d => {
+			if (d.type === 'insert' && d.modifiedCellIndex === modifiedCellIndex) {
+				return d;
+			}
+			if (d.type !== 'delete' && d.modifiedCellIndex > modifiedCellIndex) {
+				return {
+					...d,
+					modifiedCellIndex: d.modifiedCellIndex - 1,
+				};
+			}
 			return d;
-		}
-		if (d.type !== 'delete' && d.modifiedCellIndex > modifiedCellIndex) {
-			return {
-				...d,
-				modifiedCellIndex: d.modifiedCellIndex - 1,
-			};
-		}
-		return d;
-	}).filter(d => !(d.type === 'insert' && d.modifiedCellIndex === modifiedCellIndex));
+		});
 	const edit: ICellReplaceEdit = { cells: [], count: 1, editType: CellEditType.Replace, index: modifiedCellIndex, };
 	applyEdits([edit], true, undefined, () => undefined, undefined, true);
 	return cellDiffInfo;
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
index 459490d53695..9cc68666c17a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
@@ -127,7 +127,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 		this._register(autorun(r => {
 			const sortedCellChanges = sortCellChanges(cellChanges.read(r));
 
-			const changes = sortedCellChanges.filter(c => c.type !== 'modified' && c.type !== 'delete' && !c.diff.read(r).identical);
+			const changes = sortedCellChanges.filter(c => c.type !== 'unchanged' && c.type !== 'delete' && !c.diff.read(r).identical);
 			onDidChangeVisibleRanges.read(r);
 			if (!changes.length) {
 				this.cellEditorIntegrations.forEach(({ diff }) => {
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts
index b35621346edc..a532f1414f5d 100644
--- a/src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts
@@ -334,6 +334,64 @@ suite('ChatEditingModifiedNotebookEntry', function () {
 				},
 			]);
 		});
+		test('Delete second inserted with multiple cells (subsequent inserts)', async function () {
+			const cellsDiffInfo: ICellDiffInfo[] = [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('1'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('3'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: 4, modifiedModel: createModifiedModel('4'),
+				},
+			];
+
+			const result = adjustCellDiffForRevertingAnInsertedCell(2,
+				cellsDiffInfo,
+				applyEdits);
+
+			assert.deepStrictEqual(appliedEdits, [
+				{ editType: CellEditType.Replace, index: 2, cells: [], count: 1 },
+			]);
+			assert.deepStrictEqual(result, [
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 0, modifiedModel: createModifiedModel('New0'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('0'), originalCellIndex: 0,
+					modifiedCellIndex: 1, modifiedModel: createModifiedModel('0'),
+				},
+				{
+					diff, keep, undo, type: 'delete', originalModel: createOriginalModel('1'), originalCellIndex: 1,
+					modifiedCellIndex: undefined, modifiedModel: createModifiedModel('null'),
+				},
+				{
+					diff, keep, undo, type: 'insert', originalModel: createOriginalModel('null'), originalCellIndex: undefined,
+					modifiedCellIndex: 2, modifiedModel: createModifiedModel('3'),
+				},
+				{
+					diff, keep, undo, type: 'unchanged', originalModel: createOriginalModel('2'), originalCellIndex: 2,
+					modifiedCellIndex: 3, modifiedModel: createModifiedModel('4'),
+				},
+			]);
+		});
 	});
 
 	suite('Keep Deleted Cell', function () {

From a82cb134776649a3678f4fc21be007653c1f964a Mon Sep 17 00:00:00 2001
From: Justin Chen <54879025+justschen@users.noreply.github.com>
Date: Tue, 4 Mar 2025 17:09:01 -0800
Subject: [PATCH 0633/1815] issue reporter acknowledgements and banner css
 (#242636)

acknowledgements and css fix
---
 .../issue/browser/baseIssueReporterService.ts | 21 +++++++++++++++++-
 .../issue/browser/issueReporterPage.ts        |  7 ++++++
 .../issue/browser/media/issueReporter.css     | 17 +++++---------
 .../electron-sandbox/issueReporterService.ts  |  5 ++++-
 .../electron-sandbox/media/issueReporter.css  | 22 ++++++++++++++-----
 5 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
index 805dcd0205b0..c5074ca006ae 100644
--- a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
+++ b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
@@ -65,6 +65,8 @@ export class BaseIssueReporterService extends Disposable {
 	public delayedSubmit = new Delayer<void>(300);
 	public previewButton!: Button;
 	public nonGitHubIssueUrl = false;
+	public needsUpdate = false;
+	public acknowledged = false;
 
 	constructor(
 		public disableExtensions: boolean,
@@ -387,6 +389,14 @@ export class BaseIssueReporterService extends Disposable {
 		}
 	}
 
+	private updateAcknowledgementState() {
+		const acknowledgementCheckbox = this.getElementById<HTMLInputElement>('includeAcknowledgement');
+		if (acknowledgementCheckbox) {
+			this.acknowledged = acknowledgementCheckbox.checked;
+			this.updatePreviewButtonState();
+		}
+	}
+
 	public setEventHandlers(): void {
 		(['includeSystemInfo', 'includeProcessInfo', 'includeWorkspaceInfo', 'includeExtensions', 'includeExperiments', 'includeExtensionData'] as const).forEach(elementId => {
 			this.addEventListener(elementId, 'click', (event: Event) => {
@@ -395,6 +405,11 @@ export class BaseIssueReporterService extends Disposable {
 			});
 		});
 
+		this.addEventListener('includeAcknowledgement', 'click', (event: Event) => {
+			event.stopPropagation();
+			this.updateAcknowledgementState();
+		});
+
 		const showInfoElements = this.window.document.getElementsByClassName('showInfo');
 		for (let i = 0; i < showInfoElements.length; i++) {
 			const showInfo = showInfoElements.item(i)!;
@@ -561,7 +576,11 @@ export class BaseIssueReporterService extends Disposable {
 	}
 
 	public updatePreviewButtonState() {
-		if (this.isPreviewEnabled()) {
+
+		if (!this.acknowledged && this.needsUpdate) {
+			this.previewButton.label = localize('acknowledge', "Confirm Version Acknowledgement");
+			this.previewButton.enabled = false;
+		} else if (this.isPreviewEnabled()) {
 			if (this.data.githubAccessToken) {
 				this.previewButton.label = localize('createOnGitHub', "Create on GitHub");
 			} else {
diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
index 558d283efec2..e739f44817f7 100644
--- a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
+++ b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
@@ -12,6 +12,7 @@ const sendWorkspaceInfoLabel = escape(localize('sendWorkspaceInfo', "Include my
 const sendExtensionsLabel = escape(localize('sendExtensions', "Include my enabled extensions"));
 const sendExperimentsLabel = escape(localize('sendExperiments', "Include A/B experiment info"));
 const sendExtensionData = escape(localize('sendExtensionData', "Include additional extension info"));
+const acknowledgementsLabel = escape(localize('acknowledgements', "I acknowledge that my VS Code version is not updated and this issue may be closed."));
 const reviewGuidanceLabel = localize( // intentionally not escaped because of its embedded tags
 	{
 		key: 'reviewGuidanceLabel',
@@ -159,5 +160,11 @@ export default (): string => `
 				<!-- To be dynamically filled -->
 			</pre>
 		</div>
+		<div class="block block-acknowledgements hidden" id="version-acknowledgements">
+			<input class="sendData" aria-label="${acknowledgementsLabel}" type="checkbox" id="includeAcknowledgement"/>
+			<label class="caption" for="includeAcknowledgement">
+				${acknowledgementsLabel}
+			</label>
+		</div>
 	</div>
 </div>`;
diff --git a/src/vs/workbench/contrib/issue/browser/media/issueReporter.css b/src/vs/workbench/contrib/issue/browser/media/issueReporter.css
index 0aaffebc45e8..23f3be9ab74b 100644
--- a/src/vs/workbench/contrib/issue/browser/media/issueReporter.css
+++ b/src/vs/workbench/contrib/issue/browser/media/issueReporter.css
@@ -183,7 +183,7 @@
 
 .issue-reporter body {
 	margin: 0;
-	overflow-y: scroll;
+	overflow-y: auto;
 	height: 100%;
 }
 
@@ -212,12 +212,11 @@
 	padding-bottom: 2em;
 	display: flex;
 	flex-direction: column;
-	min-height: 100%;
 	overflow: visible;
 }
 
 .issue-reporter .description-section {
-	flex-grow: 1;
+	flex-grow: 0;
 	display: flex;
 	flex-direction: column;
 	flex-shrink: 0;
@@ -225,12 +224,13 @@
 
 .issue-reporter textarea {
 	flex-grow: 1;
-	min-height: 150px;
+	height: 200px;
 }
 
 .issue-reporter .block-info-text {
 	display: flex;
-	flex-grow: 1;
+	flex-grow: 0;
+	flex-direction: column;
 }
 
 .issue-reporter #github-submit-btn {
@@ -455,10 +455,3 @@
 	color: var(--vscode-textLink-foreground);
 }
 
-.issue-reporter-update-banner {
-	color: var(--vscode-button-foreground);
-	background-color: var(--vscode-button-background);
-	padding: 10px;
-	text-align: center;
-	border-radius: 4px;
-}
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
index 0dc796aa7d26..bb27e35e45dd 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
@@ -77,8 +77,11 @@ export class IssueReporter extends BaseIssueReporterService {
 	private async checkForUpdates(): Promise<void> {
 		const updateState = this.updateService.state;
 		if (updateState.type === StateType.Ready || updateState.type === StateType.Downloaded) {
+			this.needsUpdate = true;
+			const includeAcknowledgement = this.getElementById('version-acknowledgements');
 			const updateBanner = this.getElementById('update-banner');
-			if (updateBanner) {
+			if (updateBanner && includeAcknowledgement) {
+				includeAcknowledgement.classList.remove('hidden');
 				updateBanner.classList.remove('hidden');
 				updateBanner.textContent = localize('updateAvailable', "A new version of {0} is available.", this.product.nameLong);
 			}
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/media/issueReporter.css b/src/vs/workbench/contrib/issue/electron-sandbox/media/issueReporter.css
index c88a95a95e02..aebbe9804280 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/media/issueReporter.css
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/media/issueReporter.css
@@ -175,7 +175,7 @@
 
 body.issue-reporter-body {
 	margin: 0 !important;
-	overflow-y: scroll !important;
+	overflow-y: auto !important;
 	height: 100% !important;
 }
 
@@ -204,25 +204,25 @@ body.issue-reporter-body {
 	padding-bottom: 2em;
 	display: flex;
 	flex-direction: column;
-	min-height: 100%;
 	overflow: visible;
 }
 
 .issue-reporter-body .description-section {
-	flex-grow: 1;
+	flex-grow: 0;
 	display: flex;
 	flex-direction: column;
 	flex-shrink: 0;
 }
 
 .issue-reporter-body textarea {
-	flex-grow: 1;
-	min-height: 150px;
+	flex-grow: 0;
+	height: 200px;
 }
 
 .issue-reporter-body .block-info-text {
 	display: flex;
-	flex-grow: 1;
+	flex-grow: 0;
+	flex-direction: column;
 }
 
 .issue-reporter-body #github-submit-btn {
@@ -468,3 +468,13 @@ body.issue-reporter-body {
 .issue-reporter-body .issues-container > .issue .issue-icon {
 	padding-top: 2px;
 }
+
+.issue-reporter-update-banner {
+	color: var(--vscode-button-foreground);
+	background-color: var(--vscode-button-background);
+	padding: 10px;
+	text-align: center;
+	position: sticky;
+	top: 0;
+	z-index: 1000;
+}

From 02f564355dee9a738c4cbab274e32dda2eb6f3b7 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Wed, 5 Mar 2025 13:48:23 +1100
Subject: [PATCH 0634/1815] Exit handling nb chat diff resutls when a new
 request is sent (#242644)

---
 .../browser/chatEditing/chatEditingModifiedNotebookEntry.ts  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index f805a703c630..4fb9cb3f0895 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -197,9 +197,8 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			switch (cellDiff.type) {
 				case 'delete':
 					return this.createDeleteCellDiffInfo(cellDiff.originalCellIndex);
-				case 'insert': {
+				case 'insert':
 					return this.createInsertedCellDiffInfo(cellDiff.modifiedCellIndex);
-				}
 				default:
 					return this.createModifiedCellDiffInfo(cellDiff.modifiedCellIndex, cellDiff.originalCellIndex);
 			}
@@ -210,6 +209,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 
 	private computeRequestId: number = 0;
 	async initializeModelsFromDiff() {
+		const id = ++this.computeRequestId;
 		if (this._areOriginalAndModifiedIdenticalImpl()) {
 			const cellsDiffInfo: CellDiffInfo[] = this.modifiedModel.cells.map((_, index) => {
 				return { type: 'unchanged', originalCellIndex: index, modifiedCellIndex: index } satisfies CellDiffInfo;
@@ -217,7 +217,6 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			this.initializeModelsFromDiffImpl(cellsDiffInfo);
 			return;
 		}
-		const id = ++this.computeRequestId;
 		const cellsDiffInfo: CellDiffInfo[] = [];
 		try {
 			const notebookDiff = await this.notebookEditorWorkerService.computeDiff(this.originalURI, this.modifiedURI);

From f5510b857541590608e6de4f9cad46f839f98cc1 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Wed, 5 Mar 2025 14:49:52 +1100
Subject: [PATCH 0635/1815] Handle ipynb serializer edge cases (#242647)

---
 .../browser/chatEditing/chatEditingModifiedNotebookEntry.ts   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 4fb9cb3f0895..798db21afaaf 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -122,6 +122,10 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				initialContent = createSnapshot(notebook, options.serializer.options, configurationServie);
 				// Both models are the same, ensure the cell ids are the same, this way we get a perfect diffing.
 				// No need to generate edits for this.
+				// We want to ensure they are identitcal, possible original notebook was open and got modified.
+				// Or something gets changed between serialization & deserialization of the snapshot into the original.
+				// E.g. in jupyter notebooks the metadata contains transient data that gets updated after deserialization.
+				restoreSnapshot(originalRef.object.notebook, initialContent);
 				const edits: ICellEditOperation[] = [];
 				notebook.cells.forEach((cell, index) => {
 					const cellId = cell.internalMetadata?.cellId;

From 201df9b990f871fad842dc9a6211bfa84c663e53 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Wed, 5 Mar 2025 15:08:37 +1100
Subject: [PATCH 0636/1815] Handle ipynb edge cases for notebook edits
 (#242649)

---
 .../chatEditingModifiedNotebookEntry.ts       | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 798db21afaaf..aeb7e108e744 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -265,6 +265,14 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		if (!e.rawEvents.length) {
 			return;
 		}
+		// This isn't great, but necessary.
+		// ipynb extension updates metadata when new cells are inserted (to ensure the metadata is correct)
+		// Details of why thats required is in ipynb extension, but its necessary.
+		// However as a result of this, those edits appear here and are assumed to be user edits.
+		// As a result `_allEditsAreFromUs` is set to false.
+		if (isTransientIPyNbExtensionEvent(this.modifiedModel.notebookType, e)) {
+			return;
+		}
 
 		this._allEditsAreFromUs = false;
 
@@ -1567,3 +1575,23 @@ function getCorrespondingOriginalCellIndex(modifiedCellIndex: number, cellDiffIn
 	const entry = cellDiffInfo.find(d => d.modifiedCellIndex === modifiedCellIndex);
 	return entry?.originalCellIndex;
 }
+
+function isTransientIPyNbExtensionEvent(notebookKind: string, e: NotebookTextModelChangedEvent) {
+	if (notebookKind !== 'jupyter-notebook') {
+		return false;
+	}
+	if (e.rawEvents.every(event => {
+		if (event.kind !== NotebookCellsChangeType.ChangeCellMetadata) {
+			return false;
+		}
+		if (JSON.stringify(event.metadata || {}) === JSON.stringify({ execution_count: null, metadata: {} })) {
+			return true;
+		}
+		return true;
+
+	})) {
+		return true;
+	}
+
+	return false;
+}

From 09898482b9409f391bce878a3194fe084f653945 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Wed, 5 Mar 2025 14:05:52 +0900
Subject: [PATCH 0637/1815] Revert "debt - adopt `system-context-menu`
 (#242224)" (#242652)

This reverts commit 478646b7b6700c2ee0570d8833e57a682836ad03.
---
 .../windows/electron-main/windowImpl.ts       | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/vs/platform/windows/electron-main/windowImpl.ts b/src/vs/platform/windows/electron-main/windowImpl.ts
index fd18c9f8da05..7ea47d522f8e 100644
--- a/src/vs/platform/windows/electron-main/windowImpl.ts
+++ b/src/vs/platform/windows/electron-main/windowImpl.ts
@@ -146,13 +146,23 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 			}
 		}
 
-		// Setup windows system context menu so it only is allowed in certain cases
+		// Windows Custom System Context Menu
+		// See https://github.com/electron/electron/issues/24893
+		//
+		// The purpose of this is to allow for the context menu in the Windows Title Bar
+		//
+		// Currently, all mouse events in the title bar are captured by the OS
+		// thus we need to capture them here with a window hook specific to Windows
+		// and then forward them to the correct window.
 		if (isWindows && useCustomTitleStyle) {
-			this._register(Event.fromNodeEventEmitter(win, 'system-context-menu', (event: Electron.Event, point: Electron.Point) => ({ event, point }))((e) => {
+			const WM_INITMENU = 0x0116; // https://docs.microsoft.com/en-us/windows/win32/menurc/wm-initmenu
+
+			// This sets up a listener for the window hook. This is a Windows-only API provided by electron.
+			win.hookWindowMessage(WM_INITMENU, () => {
 				const [x, y] = win.getPosition();
-				const cursorPos = electron.screen.screenToDipPoint(e.point);
-				const cx = Math.floor(cursorPos.x) - x;
-				const cy = Math.floor(cursorPos.y) - y;
+				const cursorPos = electron.screen.getCursorScreenPoint();
+				const cx = cursorPos.x - x;
+				const cy = cursorPos.y - y;
 
 				// In some cases, show the default system context menu
 				// 1) The mouse position is not within the title bar
@@ -170,11 +180,16 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 				};
 
 				if (!shouldTriggerDefaultSystemContextMenu()) {
-					e.event.preventDefault();
+
+					// This is necessary to make sure the native system context menu does not show up.
+					win.setEnabled(false);
+					win.setEnabled(true);
 
 					this._onDidTriggerSystemContextMenu.fire({ x: cx, y: cy });
 				}
-			}));
+
+				return 0;
+			});
 		}
 
 		// Open devtools if instructed from command line args

From b18bbc791b98965675ad1a99e0f27fbc56d5e337 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Wed, 5 Mar 2025 16:34:55 +1100
Subject: [PATCH 0638/1815] Fix nb chat edit scroll issue (#242653)

Fix issue with scroll in nb with edits
---
 .../chatEditingModifiedNotebookEntry.ts       | 20 ++++++++++----
 .../chatEditingNotebookEditorIntegration.ts   | 26 ++++++++++++++++---
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index aeb7e108e744..d60525370e8f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -622,12 +622,12 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		const originalModel = this.modelService.getModel(originalModelUri) || this._register(this.modelService.createModel('', null, originalModelUri));
 		this.modifiedToOriginalCell.set(cell.uri, originalModelUri);
 		const keep = async () => {
-			await this._applyEdits(async () => this.keepPreviouslyInsertedCell(cell));
+			this._applyEditsSync(() => this.keepPreviouslyInsertedCell(cell));
 			this.computeStateAfterAcceptingRejectingChanges(true);
 			return true;
 		};
 		const undo = async () => {
-			await this._applyEdits(async () => this.undoPreviouslyInsertedCell(cell));
+			this._applyEditsSync(() => this.undoPreviouslyInsertedCell(cell));
 			this.computeStateAfterAcceptingRejectingChanges(false);
 			return true;
 		};
@@ -662,12 +662,12 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		const modifiedModelUri = this.modifiedModel.uri.with({ query: (ChatEditingModifiedNotebookEntry.NewModelCounter++).toString(), scheme: 'emptyCell' });
 		const modifiedModel = this.modelService.getModel(modifiedModelUri) || this._register(this.modelService.createModel('', null, modifiedModelUri));
 		const keep = async () => {
-			await this._applyEdits(async () => this.keepPreviouslyDeletedCell(this.originalModel.cells.indexOf(originalCell)));
+			this._applyEditsSync(() => this.keepPreviouslyDeletedCell(this.originalModel.cells.indexOf(originalCell)));
 			this.computeStateAfterAcceptingRejectingChanges(true);
 			return true;
 		};
 		const undo = async () => {
-			await this._applyEdits(async () => this.undoPreviouslyDeletedCell(this.originalModel.cells.indexOf(originalCell), originalCell));
+			this._applyEditsSync(() => this.undoPreviouslyDeletedCell(this.originalModel.cells.indexOf(originalCell), originalCell));
 			this.computeStateAfterAcceptingRejectingChanges(false);
 			return true;
 		};
@@ -779,6 +779,16 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		}
 	}
 
+	private _applyEditsSync(operation: () => void) {
+		// make the actual edit
+		this._isEditFromUs = true;
+		try {
+			operation();
+		} finally {
+			this._isEditFromUs = false;
+		}
+	}
+
 	calculateRewriteRadio() {
 		const totalNumberOfUpdatedLines = this._cellsDiffInfo.get().reduce((totalUpdatedLines, value) => {
 			const getUpadtedLineCount = () => {
@@ -844,7 +854,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			return;
 		}
 
-		this._applyEdits(async () => {
+		this._applyEditsSync(() => {
 			// See private _setDocValue in chatEditingModifiedDocumentEntry.ts
 			this.modifiedModel.pushStackElement();
 			restoreSnapshot(this.modifiedModel, snapshot);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
index 9cc68666c17a..db4aab5a2b4a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
@@ -124,6 +124,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 			}
 		}));
 
+		// Build cell integrations (responsible for navigating changes within a cell and decorating cell text changes)
 		this._register(autorun(r => {
 			const sortedCellChanges = sortCellChanges(cellChanges.read(r));
 
@@ -156,8 +157,10 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 					undo: change.undo
 				} satisfies IDocumentDiff2;
 				validCells.add(cell);
-				if (this.cellEditorIntegrations.has(cell)) {
-					this.cellEditorIntegrations.get(cell)!.diff.set(diff, undefined);
+				const currentDiff = this.cellEditorIntegrations.get(cell);
+				if (currentDiff) {
+					// Do not unnecessarily trigger a change event
+					currentDiff.diff.set(diff, undefined);
 				} else {
 					const diff2 = observableValue(`diff${cell.handle}`, diff);
 					const integration = this.instantiationService.createInstance(ChatEditingCodeEditorIntegration, _entry, editor, diff2);
@@ -183,6 +186,18 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 					this.cellEditorIntegrations.delete(cell);
 				}
 			});
+		}));
+
+		const cellsAreVisible = onDidChangeVisibleRanges.map(v => v.length > 0);
+
+		// Focus
+		this._register(autorun(r => {
+			const sortedCellChanges = sortCellChanges(cellChanges.read(r));
+
+			const changes = sortedCellChanges.filter(c => c.type !== 'unchanged' && c.type !== 'delete' && !c.diff.read(r).identical);
+			if (!changes.length || !cellsAreVisible.read(r)) {
+				return;
+			}
 
 			// set initial index
 			this._currentIndex.set(0, undefined);
@@ -243,9 +258,12 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 		});
 
 		this._register(autorun(r => {
+			if (!cellsAreVisible.read(r)) {
+				return;
+			}
 			// We can have inserted cells that have been accepted, in those cases we do not wany any decorators on them.
-			const changes = cellChanges.read(r).filter(c => c.type === 'insert' ? !c.diff.read(r).identical : true);
-			const decorators = this.insertDeleteDecorators.read(r);
+			const changes = debouncedObservable(cellChanges, 10).read(r).filter(c => c.type === 'insert' ? !c.diff.read(r).identical : true);
+			const decorators = debouncedObservable(this.insertDeleteDecorators, 10).read(r);
 			if (decorators) {
 				decorators.insertedCellDecorator.apply(changes);
 				decorators.modifiedCellDecorator.apply(changes);

From f19672f96d22f97b26c40f4a605821990c4287d7 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 5 Mar 2025 08:42:25 +0100
Subject: [PATCH 0639/1815] Incorrect read-only warning in Merge Editor (fix
 #242480) (#242657)

---
 .../common/editor/resourceEditorInput.ts      |  1 +
 .../customEditor/browser/customEditorInput.ts |  1 +
 .../mergeEditor/browser/view/mergeEditor.ts   | 33 +++++++------------
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/vs/workbench/common/editor/resourceEditorInput.ts b/src/vs/workbench/common/editor/resourceEditorInput.ts
index 778f956ad627..360b534bdc9f 100644
--- a/src/vs/workbench/common/editor/resourceEditorInput.ts
+++ b/src/vs/workbench/common/editor/resourceEditorInput.ts
@@ -64,6 +64,7 @@ export abstract class AbstractResourceEditorInput extends EditorInput implements
 		this._register(this.fileService.onDidChangeFileSystemProviderRegistrations(e => this.onLabelEvent(e.scheme)));
 		this._register(this.fileService.onDidChangeFileSystemProviderCapabilities(e => this.onLabelEvent(e.scheme)));
 		this._register(this.customEditorLabelService.onDidChange(() => this.updateLabel()));
+		this._register(this.filesConfigurationService.onDidChangeReadonly(() => this._onDidChangeCapabilities.fire()));
 	}
 
 	private onLabelEvent(scheme: string): void {
diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts b/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
index f3b3fb7f8d75..d246fb9fddae 100644
--- a/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
+++ b/src/vs/workbench/contrib/customEditor/browser/customEditorInput.ts
@@ -113,6 +113,7 @@ export class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
 		this._register(this.fileService.onDidChangeFileSystemProviderRegistrations(e => this.onLabelEvent(e.scheme)));
 		this._register(this.fileService.onDidChangeFileSystemProviderCapabilities(e => this.onLabelEvent(e.scheme)));
 		this._register(this.customEditorLabelService.onDidChange(() => this.updateLabel()));
+		this._register(this.filesConfigurationService.onDidChangeReadonly(() => this._onDidChangeCapabilities.fire()));
 	}
 
 	private onLabelEvent(scheme: string): void {
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts
index d011172bcb13..666ad3f373ee 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts
@@ -23,7 +23,6 @@ import { ICodeEditorViewState, ScrollType } from '../../../../../editor/common/e
 import { ITextModel } from '../../../../../editor/common/model.js';
 import { ITextResourceConfigurationService } from '../../../../../editor/common/services/textResourceConfiguration.js';
 import { localize } from '../../../../../nls.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IEditorOptions, ITextEditorOptions, ITextResourceEditorInput } from '../../../../../platform/editor/common/editor.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
@@ -40,7 +39,6 @@ import { MergeEditorInput } from '../mergeEditorInput.js';
 import { IMergeEditorInputModel } from '../mergeEditorInputModel.js';
 import { MergeEditorModel } from '../model/mergeEditorModel.js';
 import { deepMerge, PersistentStore } from '../utils.js';
-import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
 import { BaseCodeEditorView } from './editors/baseCodeEditorView.js';
 import { ScrollSynchronizer } from './scrollSynchronizer.js';
 import { MergeEditorViewModel } from './viewModel.js';
@@ -90,22 +88,12 @@ export class MergeEditor extends AbstractTextEditor<IMergeEditorViewState> {
 		return this.inputModel.get()?.model;
 	}
 
-	private get inputsWritable(): boolean {
-		return !!this._configurationService.getValue<boolean>('mergeEditor.writableInputs');
-	}
-
 	private readonly viewZoneComputer = new ViewZoneComputer(
 		this.input1View.editor,
 		this.input2View.editor,
 		this.inputResultView.editor,
 	);
 
-	protected readonly codeLensesVisible = observableConfigValue<boolean>(
-		'mergeEditor.showCodeLenses',
-		true,
-		this.configurationService,
-	);
-
 	private readonly scrollSynchronizer = this._register(new ScrollSynchronizer(this._viewModel, this.input1View, this.input2View, this.baseView, this.inputResultView, this._layoutModeObs));
 
 	constructor(
@@ -116,12 +104,10 @@ export class MergeEditor extends AbstractTextEditor<IMergeEditorViewState> {
 		@IStorageService storageService: IStorageService,
 		@IThemeService themeService: IThemeService,
 		@ITextResourceConfigurationService textResourceConfigurationService: ITextResourceConfigurationService,
-		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IEditorService editorService: IEditorService,
 		@IEditorGroupsService editorGroupService: IEditorGroupsService,
 		@IFileService fileService: IFileService,
-		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
-		@IConfigurationService private readonly configurationService: IConfigurationService
+		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService
 	) {
 		super(MergeEditor.ID, group, telemetryService, instantiation, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService, fileService);
 	}
@@ -170,14 +156,18 @@ export class MergeEditor extends AbstractTextEditor<IMergeEditorViewState> {
 		const inputOptions: ICodeEditorOptions = deepMerge<ICodeEditorOptions>(options, {
 			minimap: { enabled: false },
 			glyphMargin: false,
-			lineNumbersMinChars: 2,
-			readOnly: !this.inputsWritable
+			lineNumbersMinChars: 2
 		});
 
-		this.input1View.updateOptions(inputOptions);
-		this.input2View.updateOptions(inputOptions);
+		const readOnlyInputOptions: ICodeEditorOptions = deepMerge<ICodeEditorOptions>(inputOptions, {
+			readOnly: true,
+			readOnlyMessage: undefined
+		});
+
+		this.input1View.updateOptions(readOnlyInputOptions);
+		this.input2View.updateOptions(readOnlyInputOptions);
 		this.baseViewOptions.set({ ...this.input2View.editor.getRawOptions() }, undefined);
-		this.inputResultView.updateOptions(options);
+		this.inputResultView.updateOptions(inputOptions);
 	}
 
 	protected getMainControl(): ICodeEditor | undefined {
@@ -213,7 +203,6 @@ export class MergeEditor extends AbstractTextEditor<IMergeEditorViewState> {
 			this.showNonConflictingChanges,
 		);
 
-
 		model.telemetry.reportMergeEditorOpened({
 			combinableConflictCount: model.combinableConflictCount,
 			conflictCount: model.conflictCount,
@@ -382,7 +371,7 @@ export class MergeEditor extends AbstractTextEditor<IMergeEditorViewState> {
 		const resultViewZoneIds: string[] = [];
 
 		const viewZones = this.viewZoneComputer.computeViewZones(reader, viewModel, {
-			codeLensesVisible: this.codeLensesVisible.read(reader),
+			codeLensesVisible: true,
 			showNonConflictingChanges: this.showNonConflictingChanges.read(reader),
 			shouldAlignBase,
 			shouldAlignResult,

From 6d73a37b03b304ce4c4c0155daeda48a4a789137 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 5 Mar 2025 09:57:38 +0100
Subject: [PATCH 0640/1815] Italic text is cut off at the end in tabs and
 settings (fix #207409) (#242663)

* Italic text is cut off at the end in tabs and settings (fix #207409)

Also remove the italic font style from label decorations: since decorations are typically icons, italic font style does not really apply well to them. For example, a square turns into a parallelogram.

* add issue ref
---
 src/vs/base/browser/ui/iconLabel/iconlabel.css   |  5 -----
 .../editor/media/multieditortabscontrol.css      | 16 ++++++++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/vs/base/browser/ui/iconLabel/iconlabel.css b/src/vs/base/browser/ui/iconLabel/iconlabel.css
index ad3a358bc5a2..ed9278d7087d 100644
--- a/src/vs/base/browser/ui/iconLabel/iconlabel.css
+++ b/src/vs/base/browser/ui/iconLabel/iconlabel.css
@@ -89,11 +89,6 @@
 	opacity: 0.66;
 }
 
-/* make sure apply italic font style to decorations as well */
-.monaco-icon-label.italic::after {
-	font-style: italic;
-}
-
 .monaco-icon-label.strikethrough > .monaco-icon-label-container > .monaco-icon-name-container > .label-name,
 .monaco-icon-label.strikethrough > .monaco-icon-label-container > .monaco-icon-description-container > .label-description {
 	text-decoration: line-through;
diff --git a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
index 1452d6ef5451..b9375b27dc2c 100644
--- a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
@@ -367,10 +367,6 @@
 	}
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-fit .monaco-icon-label.italic {
-	padding-right: 3px; /* https://github.com/microsoft/vscode/issues/207409 */
-}
-
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink > .monaco-icon-label > .monaco-icon-label-container,
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-fixed > .monaco-icon-label > .monaco-icon-label-container {
 	text-overflow: clip;
@@ -384,6 +380,18 @@
 	text-overflow: ellipsis;
 }
 
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab > .monaco-icon-label.italic > .monaco-icon-label-container {
+	/**
+	 * Browser rendering engines seem to have trouble to render italic labels
+	 * fully without clipping in case the parent container has `overflow: hidden`
+	 * and/or `flex: none`. We added those styles to fix other issues so a pragmatic
+	 * solution is to give the label container a bit more room to fully render.
+	 * 
+	 * Refs: https://github.com/microsoft/vscode/issues/207409
+	 */
+	padding-right: 1px;
+}
+
 /* Tab Actions */
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab > .tab-actions {

From 9fbff868fdd517b18ae9b5008489073d60964899 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Wed, 5 Mar 2025 10:08:45 +0100
Subject: [PATCH 0641/1815] Git - use `editorInlayHint.foreground` for the git
 blame editor decoration as it is lighter than `editorCodeLens.foreground`
 (#242665)

---
 extensions/git/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/git/package.json b/extensions/git/package.json
index 1e5edbb05ba3..f772659c8a1b 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3434,10 +3434,10 @@
         "id": "git.blame.editorDecorationForeground",
         "description": "%colors.blameEditorDecoration%",
         "defaults": {
-          "dark": "editorCodeLens.foreground",
-          "light": "editorCodeLens.foreground",
-          "highContrast": "editorCodeLens.foreground",
-          "highContrastLight": "editorCodeLens.foreground"
+          "dark": "editorInlayHint.foreground",
+          "light": "editorInlayHint.foreground",
+          "highContrast": "editorInlayHint.foreground",
+          "highContrastLight": "editorInlayHint.foreground"
         }
       }
     ],

From b23a7b5628ca35a54bf3fb55f01ee040fea6de3a Mon Sep 17 00:00:00 2001
From: isidorn <inikolic@microsoft.com>
Date: Wed, 5 Mar 2025 10:19:18 +0100
Subject: [PATCH 0642/1815] update distro pointer

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index aac35268f7bd..f678af10fa74 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.99.0",
-  "distro": "81a3bde4792a4d73d1d99f1307c1d0078f79296b",
+  "distro": "bddc23b1d673eab2bb0ebe3a6d40b92fb3c42c22",
   "author": {
     "name": "Microsoft Corporation"
   },

From 8be43d27f780d09d2d6245e2e4689110c3a88ce0 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Wed, 5 Mar 2025 10:20:20 +0100
Subject: [PATCH 0643/1815] keybinding for disabling a11y verbosity on comments
 doesn't do it's job (#242587)

---
 src/vs/platform/accessibility/browser/accessibleView.ts   | 4 ++++
 .../contrib/accessibility/browser/accessibleView.ts       | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/vs/platform/accessibility/browser/accessibleView.ts b/src/vs/platform/accessibility/browser/accessibleView.ts
index b438dedc42e3..3f2f137d048a 100644
--- a/src/vs/platform/accessibility/browser/accessibleView.ts
+++ b/src/vs/platform/accessibility/browser/accessibleView.ts
@@ -169,6 +169,10 @@ 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 class ExtensionContentProvider extends Disposable implements IBasicContentProvider {
 
 	constructor(
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
index fde082ed5d56..6e000778220c 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
@@ -24,7 +24,7 @@ import { IModelService } from '../../../../editor/common/services/model.js';
 import { AccessibilityHelpNLS } from '../../../../editor/common/standaloneStrings.js';
 import { CodeActionController } from '../../../../editor/contrib/codeAction/browser/codeActionController.js';
 import { localize } from '../../../../nls.js';
-import { AccessibleViewProviderId, AccessibleViewType, AccessibleContentProvider, ExtensionContentProvider, IAccessibleViewService, IAccessibleViewSymbol } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { AccessibleViewProviderId, AccessibleViewType, AccessibleContentProvider, ExtensionContentProvider, IAccessibleViewService, IAccessibleViewSymbol, isIAccessibleViewContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
 import { ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX, IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
 import { getFlatActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
@@ -170,7 +170,7 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 			}
 		}));
 		this._register(this._configurationService.onDidChangeConfiguration(e => {
-			if (this._currentProvider instanceof AccessibleContentProvider && e.affectsConfiguration(this._currentProvider.verbositySettingKey)) {
+			if (isIAccessibleViewContentProvider(this._currentProvider) && e.affectsConfiguration(this._currentProvider.verbositySettingKey)) {
 				if (this._accessiblityHelpIsShown.get()) {
 					this.show(this._currentProvider);
 				}
@@ -345,7 +345,7 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 		if (!this._currentProvider) {
 			return false;
 		}
-		return this._currentProvider instanceof AccessibleContentProvider ? this._configurationService.getValue(this._currentProvider.verbositySettingKey) === true : this._storageService.getBoolean(`${ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX}${this._currentProvider.id}`, StorageScope.APPLICATION, false);
+		return isIAccessibleViewContentProvider(this._currentProvider) ? this._configurationService.getValue(this._currentProvider.verbositySettingKey) === true : this._storageService.getBoolean(`${ACCESSIBLE_VIEW_SHOWN_STORAGE_PREFIX}${this._currentProvider.id}`, StorageScope.APPLICATION, false);
 	}
 
 	goToSymbol(): void {
@@ -502,7 +502,7 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 	}
 
 	disableHint(): void {
-		if (!(this._currentProvider instanceof AccessibleContentProvider)) {
+		if (!isIAccessibleViewContentProvider(this._currentProvider)) {
 			return;
 		}
 		this._configurationService.updateValue(this._currentProvider?.verbositySettingKey, false);

From 85460c37d4febc5c28839dd30b75d9f79f4d8d43 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Wed, 5 Mar 2025 11:14:15 +0100
Subject: [PATCH 0644/1815] Revert "Add a workaround for browser bug" (#242672)

Revert "Add a workaround for browser bug (#242459)"

This reverts commit 4537390895ad644093b255b5f8f66f10b294b324.
---
 .../editContext/native/nativeEditContext.ts   |  3 +--
 .../native/nativeEditContextUtils.ts          | 26 ++++++-------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
index cee5e3f9df9a..76a5bd52fe5f 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
@@ -258,8 +258,7 @@ export class NativeEditContext extends AbstractEditContext {
 	}
 
 	public isFocused(): boolean {
-		this.refreshFocusState();
-		return this._focusTracker.isFocused;
+		return this._focusTracker.isFocused || (getActiveWindow().document.activeElement === this.textArea.domNode);
 	}
 
 	public focus(): void {
diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
index 4c4667b613ca..b3166de0437a 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, getActiveElement, getShadowRoot } from '../../../../../base/browser/dom.js';
+import { addDisposableListener, getActiveWindow } from '../../../../../base/browser/dom.js';
 import { IDisposable, Disposable } from '../../../../../base/common/lifecycle.js';
 
 export interface ITypeData {
@@ -21,12 +21,8 @@ export class FocusTracker extends Disposable {
 		private readonly _onFocusChange: (newFocusValue: boolean) => void,
 	) {
 		super();
-		this._register(addDisposableListener(this._domNode, 'focus', () => {
-			this.refreshFocusState();
-		}));
-		this._register(addDisposableListener(this._domNode, 'blur', () => {
-			this._handleFocusedChanged(false);
-		}));
+		this._register(addDisposableListener(this._domNode, 'focus', () => this._handleFocusedChanged(true)));
+		this._register(addDisposableListener(this._domNode, 'blur', () => this._handleFocusedChanged(false)));
 	}
 
 	private _handleFocusedChanged(focused: boolean): void {
@@ -38,21 +34,15 @@ export class FocusTracker extends Disposable {
 	}
 
 	public focus(): void {
+		// fixes: https://github.com/microsoft/vscode/issues/228147
+		// Immediately call this method in order to directly set the field isFocused to true so the textInputFocus context key is evaluated correctly
+		this._handleFocusedChanged(true);
 		this._domNode.focus();
-		this.refreshFocusState();
 	}
 
 	public refreshFocusState(): void {
-
-		let activeElement: Element | null = null;
-		const shadowRoot = getShadowRoot(this._domNode);
-		if (shadowRoot) {
-			activeElement = shadowRoot.activeElement;
-		} else {
-			activeElement = getActiveElement();
-		}
-
-		this._handleFocusedChanged(activeElement === this._domNode);
+		const focused = this._domNode === getActiveWindow().document.activeElement;
+		this._handleFocusedChanged(focused);
 	}
 
 	get isFocused(): boolean {

From fa548237beab078e757122a5cb5b2e915b43b766 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Wed, 5 Mar 2025 11:38:48 +0100
Subject: [PATCH 0645/1815] Adding `acceptance` condition to dispatchKeybinding
 in smoketests (#242570)

* adding code for smoke tests

* adding awaits

* changing wait code

* renaming dispatch to send

* moving comment

* update to send
---
 test/automation/src/code.ts                   |  4 +--
 test/automation/src/debug.ts                  | 21 ++++++++-----
 test/automation/src/editor.ts                 |  2 +-
 test/automation/src/editors.ts                | 14 ++++-----
 test/automation/src/explorer.ts               |  4 +--
 test/automation/src/keybindings.ts            | 14 ++++-----
 test/automation/src/notebook.ts               |  4 +--
 test/automation/src/peek.ts                   |  3 +-
 test/automation/src/playwrightDriver.ts       | 12 +++++--
 test/automation/src/quickaccess.ts            | 31 +++++++++----------
 test/automation/src/quickinput.ts             | 14 ++++-----
 test/automation/src/scm.ts                    |  3 +-
 test/automation/src/search.ts                 | 15 ++++-----
 test/automation/src/settings.ts               | 22 +++++++------
 test/automation/src/task.ts                   | 13 ++++++--
 test/automation/src/terminal.ts               | 17 +++++++---
 .../src/areas/preferences/preferences.test.ts |  8 ++---
 test/smoke/src/areas/search/search.test.ts    | 10 +++---
 18 files changed, 116 insertions(+), 95 deletions(-)

diff --git a/test/automation/src/code.ts b/test/automation/src/code.ts
index b297dd50a651..75b8a4980ec1 100644
--- a/test/automation/src/code.ts
+++ b/test/automation/src/code.ts
@@ -129,8 +129,8 @@ export class Code {
 		return await this.driver.stopTracing(name, persist);
 	}
 
-	async dispatchKeybinding(keybinding: string): Promise<void> {
-		await this.driver.dispatchKeybinding(keybinding);
+	async sendKeybinding(keybinding: string, accept?: () => Promise<void> | void): Promise<void> {
+		await this.driver.sendKeybinding(keybinding, accept);
 	}
 
 	async didFinishLoad(): Promise<void> {
diff --git a/test/automation/src/debug.ts b/test/automation/src/debug.ts
index e2e227fc35e1..43f974ebec9a 100644
--- a/test/automation/src/debug.ts
+++ b/test/automation/src/debug.ts
@@ -58,10 +58,13 @@ export class Debug extends Viewlet {
 	}
 
 	async openDebugViewlet(): Promise<any> {
+		const accept = async () => {
+			await this.code.waitForElement(DEBUG_VIEW);
+		};
 		if (process.platform === 'darwin') {
-			await this.code.dispatchKeybinding('cmd+shift+d');
+			await this.code.sendKeybinding('cmd+shift+d', accept);
 		} else {
-			await this.code.dispatchKeybinding('ctrl+shift+d');
+			await this.code.sendKeybinding('ctrl+shift+d', accept);
 		}
 
 		await this.code.waitForElement(DEBUG_VIEW);
@@ -79,9 +82,10 @@ export class Debug extends Viewlet {
 	}
 
 	async startDebugging(): Promise<number> {
-		await this.code.dispatchKeybinding('f5');
-		await this.code.waitForElement(PAUSE);
-		await this.code.waitForElement(DEBUG_STATUS_BAR);
+		await this.code.sendKeybinding('f5', async () => {
+			await this.code.waitForElement(PAUSE);
+			await this.code.waitForElement(DEBUG_STATUS_BAR);
+		});
 		const portPrefix = 'Port: ';
 
 		const output = await this.waitForOutput(output => output.some(line => line.indexOf(portPrefix) >= 0));
@@ -135,9 +139,10 @@ export class Debug extends Viewlet {
 
 		// Wait for the keys to be picked up by the editor model such that repl evaluates what just got typed
 		await this.editor.waitForEditorContents('debug:replinput', s => s.indexOf(text) >= 0);
-		await this.code.dispatchKeybinding('enter');
-		await this.code.waitForElements(CONSOLE_EVALUATION_RESULT, false,
-			elements => !!elements.length && accept(elements[elements.length - 1].textContent));
+		await this.code.sendKeybinding('enter', async () => {
+			await this.code.waitForElements(CONSOLE_EVALUATION_RESULT, false,
+				elements => !!elements.length && accept(elements[elements.length - 1].textContent));
+		});
 	}
 
 	// Different node versions give different number of variables. As a workaround be more relaxed when checking for variable count
diff --git a/test/automation/src/editor.ts b/test/automation/src/editor.ts
index 9f5a9c901708..6587b28edafa 100644
--- a/test/automation/src/editor.ts
+++ b/test/automation/src/editor.ts
@@ -36,7 +36,7 @@ export class Editor {
 		await this.code.waitForActiveElement(RENAME_INPUT);
 		await this.code.waitForSetValue(RENAME_INPUT, to);
 
-		await this.code.dispatchKeybinding('enter');
+		await this.code.sendKeybinding('enter');
 	}
 
 	async gotoDefinition(filename: string, term: string, line: number): Promise<void> {
diff --git a/test/automation/src/editors.ts b/test/automation/src/editors.ts
index 472385c8534d..e147d3b69eca 100644
--- a/test/automation/src/editors.ts
+++ b/test/automation/src/editors.ts
@@ -12,9 +12,9 @@ export class Editors {
 
 	async saveOpenedFile(): Promise<any> {
 		if (process.platform === 'darwin') {
-			await this.code.dispatchKeybinding('cmd+s');
+			await this.code.sendKeybinding('cmd+s');
 		} else {
-			await this.code.dispatchKeybinding('ctrl+s');
+			await this.code.sendKeybinding('ctrl+s');
 		}
 	}
 
@@ -29,10 +29,9 @@ export class Editors {
 		let retries = 0;
 		while (retries < 10) {
 			await this.code.waitAndClick(`.tabs-container div.tab[data-resource-name$="${fileName}"]`);
-			await this.code.dispatchKeybinding(process.platform === 'darwin' ? 'cmd+1' : 'ctrl+1'); // make editor really active if click failed somehow
 
 			try {
-				await this.waitForEditorFocus(fileName, 50 /* 50 retries * 100ms delay = 5s */);
+				await this.code.sendKeybinding(process.platform === 'darwin' ? 'cmd+1' : 'ctrl+1', () => this.waitForEditorFocus(fileName, 50 /* 50 retries * 100ms delay = 5s */));
 				return;
 			} catch (e) {
 				error = e;
@@ -63,12 +62,11 @@ export class Editors {
 	}
 
 	async newUntitledFile(): Promise<void> {
+		const accept = () => this.waitForEditorFocus('Untitled-1');
 		if (process.platform === 'darwin') {
-			await this.code.dispatchKeybinding('cmd+n');
+			await this.code.sendKeybinding('cmd+n', accept);
 		} else {
-			await this.code.dispatchKeybinding('ctrl+n');
+			await this.code.sendKeybinding('ctrl+n', accept);
 		}
-
-		await this.waitForEditorFocus('Untitled-1');
 	}
 }
diff --git a/test/automation/src/explorer.ts b/test/automation/src/explorer.ts
index 2c1e2eeec28f..48cca3f02deb 100644
--- a/test/automation/src/explorer.ts
+++ b/test/automation/src/explorer.ts
@@ -17,9 +17,9 @@ export class Explorer extends Viewlet {
 
 	async openExplorerView(): Promise<any> {
 		if (process.platform === 'darwin') {
-			await this.code.dispatchKeybinding('cmd+shift+e');
+			await this.code.sendKeybinding('cmd+shift+e');
 		} else {
-			await this.code.dispatchKeybinding('ctrl+shift+e');
+			await this.code.sendKeybinding('ctrl+shift+e');
 		}
 	}
 
diff --git a/test/automation/src/keybindings.ts b/test/automation/src/keybindings.ts
index 9b7babfac4f7..82bfcdd1fe38 100644
--- a/test/automation/src/keybindings.ts
+++ b/test/automation/src/keybindings.ts
@@ -12,10 +12,11 @@ export class KeybindingsEditor {
 	constructor(private code: Code) { }
 
 	async updateKeybinding(command: string, commandName: string | undefined, keybinding: string, keybindingTitle: string): Promise<any> {
+		const accept = () => this.code.waitForActiveElement(SEARCH_INPUT);
 		if (process.platform === 'darwin') {
-			await this.code.dispatchKeybinding('cmd+k cmd+s');
+			await this.code.sendKeybinding('cmd+k cmd+s', accept);
 		} else {
-			await this.code.dispatchKeybinding('ctrl+k ctrl+s');
+			await this.code.sendKeybinding('ctrl+k ctrl+s', accept);
 		}
 
 		await this.code.waitForActiveElement(SEARCH_INPUT);
@@ -24,11 +25,8 @@ export class KeybindingsEditor {
 		const commandTitle = commandName ? `${commandName} (${command})` : command;
 		await this.code.waitAndClick(`.keybindings-table-container .monaco-list-row .command[aria-label="${commandTitle}"]`);
 		await this.code.waitForElement(`.keybindings-table-container .monaco-list-row.focused.selected .command[aria-label="${commandTitle}"]`);
-		await this.code.dispatchKeybinding('enter');
-
-		await this.code.waitForActiveElement('.defineKeybindingWidget .monaco-inputbox input');
-		await this.code.dispatchKeybinding(keybinding);
-		await this.code.dispatchKeybinding('enter');
-		await this.code.waitForElement(`.keybindings-table-container .keybinding-label div[aria-label="${keybindingTitle}"]`);
+		await this.code.sendKeybinding('enter', () => this.code.waitForActiveElement('.defineKeybindingWidget .monaco-inputbox input'));
+		await this.code.sendKeybinding(keybinding);
+		await this.code.sendKeybinding('enter', async () => { await this.code.waitForElement(`.keybindings-table-container .keybinding-label div[aria-label="${keybindingTitle}"]`); });
 	}
 }
diff --git a/test/automation/src/notebook.ts b/test/automation/src/notebook.ts
index cd46cbdb0dd4..3ba9101a1de6 100644
--- a/test/automation/src/notebook.ts
+++ b/test/automation/src/notebook.ts
@@ -27,7 +27,7 @@ export class Notebook {
 	}
 
 	async focusNextCell() {
-		await this.code.dispatchKeybinding('down');
+		await this.code.sendKeybinding('down');
 	}
 
 	async focusFirstCell() {
@@ -35,7 +35,7 @@ export class Notebook {
 	}
 
 	async editCell() {
-		await this.code.dispatchKeybinding('enter');
+		await this.code.sendKeybinding('enter');
 	}
 
 	async stopEditingCell() {
diff --git a/test/automation/src/peek.ts b/test/automation/src/peek.ts
index 2c9f00c56597..59c613613c8f 100644
--- a/test/automation/src/peek.ts
+++ b/test/automation/src/peek.ts
@@ -37,10 +37,9 @@ export class References {
 		// Sometimes someone else eats up the `Escape` key
 		let count = 0;
 		while (true) {
-			await this.code.dispatchKeybinding('escape');
 
 			try {
-				await this.code.waitForElement(References.REFERENCES_WIDGET, el => !el, 10);
+				await this.code.sendKeybinding('escape', async () => { await this.code.waitForElement(References.REFERENCES_WIDGET, el => !el, 10); });
 				return;
 			} catch (err) {
 				if (++count > 5) {
diff --git a/test/automation/src/playwrightDriver.ts b/test/automation/src/playwrightDriver.ts
index dbde9955766e..018fe7c351aa 100644
--- a/test/automation/src/playwrightDriver.ts
+++ b/test/automation/src/playwrightDriver.ts
@@ -229,7 +229,7 @@ export class PlaywrightDriver {
 		}
 	}
 
-	async dispatchKeybinding(keybinding: string) {
+	async sendKeybinding(keybinding: string, accept?: () => Promise<void> | void) {
 		const chords = keybinding.split(' ');
 		for (let i = 0; i < chords.length; i++) {
 			const chord = chords[i];
@@ -256,7 +256,9 @@ export class PlaywrightDriver {
 			}
 		}
 
-		await this.wait(100);
+		if (accept) {
+			await accept();
+		}
 	}
 
 	async click(selector: string, xoffset?: number | undefined, yoffset?: number | undefined) {
@@ -317,7 +319,7 @@ export class PlaywrightDriver {
 	}
 
 	wait(ms: number): Promise<void> {
-		return new Promise<void>(resolve => setTimeout(resolve, ms));
+		return wait(ms);
 	}
 
 	whenWorkbenchRestored(): Promise<void> {
@@ -328,3 +330,7 @@ export class PlaywrightDriver {
 		return this.page.evaluateHandle('window.driver');
 	}
 }
+
+export function wait(ms: number): Promise<void> {
+	return new Promise<void>(resolve => setTimeout(resolve, ms));
+}
diff --git a/test/automation/src/quickaccess.ts b/test/automation/src/quickaccess.ts
index 5d94a96f1c4a..da838493d6b3 100644
--- a/test/automation/src/quickaccess.ts
+++ b/test/automation/src/quickaccess.ts
@@ -137,22 +137,21 @@ export class QuickAccess {
 		// Other parts of code might steal focus away from quickinput :(
 		while (retries < 5) {
 
-			// Open via keybinding
-			switch (kind) {
-				case QuickAccessKind.Files:
-					await this.code.dispatchKeybinding(process.platform === 'darwin' ? 'cmd+p' : 'ctrl+p');
-					break;
-				case QuickAccessKind.Symbols:
-					await this.code.dispatchKeybinding(process.platform === 'darwin' ? 'cmd+shift+o' : 'ctrl+shift+o');
-					break;
-				case QuickAccessKind.Commands:
-					await this.code.dispatchKeybinding(process.platform === 'darwin' ? 'cmd+shift+p' : 'ctrl+shift+p');
-					break;
-			}
-
-			// Await for quick input widget opened
 			try {
-				await this.quickInput.waitForQuickInputOpened(10);
+				// Await for quick input widget opened
+				const accept = () => this.quickInput.waitForQuickInputOpened(10);
+				// Open via keybinding
+				switch (kind) {
+					case QuickAccessKind.Files:
+						await this.code.sendKeybinding(process.platform === 'darwin' ? 'cmd+p' : 'ctrl+p', accept);
+						break;
+					case QuickAccessKind.Symbols:
+						await this.code.sendKeybinding(process.platform === 'darwin' ? 'cmd+shift+o' : 'ctrl+shift+o', accept);
+						break;
+					case QuickAccessKind.Commands:
+						await this.code.sendKeybinding(process.platform === 'darwin' ? 'cmd+shift+p' : 'ctrl+shift+p', accept);
+						break;
+				}
 				break;
 			} catch (err) {
 				if (++retries > 5) {
@@ -160,7 +159,7 @@ export class QuickAccess {
 				}
 
 				// Retry
-				await this.code.dispatchKeybinding('escape');
+				await this.code.sendKeybinding('escape');
 			}
 		}
 
diff --git a/test/automation/src/quickinput.ts b/test/automation/src/quickinput.ts
index 2fc3db3a9c6f..b83703f72d6f 100644
--- a/test/automation/src/quickinput.ts
+++ b/test/automation/src/quickinput.ts
@@ -34,8 +34,7 @@ export class QuickInput {
 	}
 
 	async closeQuickInput(): Promise<void> {
-		await this.code.dispatchKeybinding('escape');
-		await this.waitForQuickInputClosed();
+		await this.code.sendKeybinding('escape', () => this.waitForQuickInputClosed());
 	}
 
 	async waitForQuickInputElements(accept: (names: string[]) => boolean): Promise<void> {
@@ -49,11 +48,12 @@ export class QuickInput {
 	async selectQuickInputElement(index: number, keepOpen?: boolean): Promise<void> {
 		await this.waitForQuickInputOpened();
 		for (let from = 0; from < index; from++) {
-			await this.code.dispatchKeybinding('down');
-		}
-		await this.code.dispatchKeybinding('enter');
-		if (!keepOpen) {
-			await this.waitForQuickInputClosed();
+			await this.code.sendKeybinding('down');
 		}
+		await this.code.sendKeybinding('enter', async () => {
+			if (!keepOpen) {
+				await this.waitForQuickInputClosed();
+			}
+		});
 	}
 }
diff --git a/test/automation/src/scm.ts b/test/automation/src/scm.ts
index 6489badbe8a4..2277bcb2875e 100644
--- a/test/automation/src/scm.ts
+++ b/test/automation/src/scm.ts
@@ -45,8 +45,7 @@ export class SCM extends Viewlet {
 	}
 
 	async openSCMViewlet(): Promise<any> {
-		await this.code.dispatchKeybinding('ctrl+shift+g');
-		await this.code.waitForElement(this._editContextSelector());
+		await this.code.sendKeybinding('ctrl+shift+g', async () => { await this.code.waitForElement(this._editContextSelector()); });
 	}
 
 	async waitForChange(name: string, type?: string): Promise<void> {
diff --git a/test/automation/src/search.ts b/test/automation/src/search.ts
index 5cf6018b72a1..b4f205d8f82d 100644
--- a/test/automation/src/search.ts
+++ b/test/automation/src/search.ts
@@ -40,13 +40,12 @@ export class Search extends Viewlet {
 	}
 
 	async openSearchViewlet(): Promise<any> {
+		const accept = () => this.waitForInputFocus(INPUT);
 		if (process.platform === 'darwin') {
-			await this.code.dispatchKeybinding('cmd+shift+f');
+			await this.code.sendKeybinding('cmd+shift+f', accept);
 		} else {
-			await this.code.dispatchKeybinding('ctrl+shift+f');
+			await this.code.sendKeybinding('ctrl+shift+f', accept);
 		}
-
-		await this.waitForInputFocus(INPUT);
 	}
 
 	async getSearchTooltip(): Promise<any> {
@@ -69,18 +68,16 @@ export class Search extends Viewlet {
 	}
 
 	async waitForPageUp(): Promise<void> {
-		await this.code.dispatchKeybinding('PageUp');
+		await this.code.sendKeybinding('PageUp');
 	}
 
 	async waitForPageDown(): Promise<void> {
-		await this.code.dispatchKeybinding('PageDown');
+		await this.code.sendKeybinding('PageDown');
 	}
 
 	async submitSearch(): Promise<void> {
 		await this.waitForInputFocus(INPUT);
-
-		await this.code.dispatchKeybinding('enter');
-		await this.code.waitForElement(`${VIEWLET} .messages`);
+		await this.code.sendKeybinding('enter', async () => { await this.code.waitForElement(`${VIEWLET} .messages`); });
 	}
 
 	async setFilesToIncludeText(text: string): Promise<void> {
diff --git a/test/automation/src/settings.ts b/test/automation/src/settings.ts
index 2ade8b4a9afa..319f4b0b236b 100644
--- a/test/automation/src/settings.ts
+++ b/test/automation/src/settings.ts
@@ -24,8 +24,8 @@ export class SettingsEditor {
 	async addUserSetting(setting: string, value: string): Promise<void> {
 		await this.openUserSettingsFile();
 
-		await this.code.dispatchKeybinding('right');
-		await this.editor.waitForEditorSelection('settings.json', (s) => this._acceptEditorSelection(this.code.quality, s));
+		await this.code.sendKeybinding('right', () =>
+			this.editor.waitForEditorSelection('settings.json', (s) => this._acceptEditorSelection(this.code.quality, s)));
 		await this.editor.waitForTypeInEditor('settings.json', `"${setting}": ${value},`);
 		await this.editors.saveOpenedFile();
 	}
@@ -39,8 +39,8 @@ export class SettingsEditor {
 	async addUserSettings(settings: [key: string, value: string][]): Promise<void> {
 		await this.openUserSettingsFile();
 
-		await this.code.dispatchKeybinding('right');
-		await this.editor.waitForEditorSelection('settings.json', (s) => this._acceptEditorSelection(this.code.quality, s));
+		await this.code.sendKeybinding('right', () =>
+			this.editor.waitForEditorSelection('settings.json', (s) => this._acceptEditorSelection(this.code.quality, s)));
 		await this.editor.waitForTypeInEditor('settings.json', settings.map(v => `"${v[0]}": ${v[1]},`).join(''));
 		await this.editors.saveOpenedFile();
 	}
@@ -48,8 +48,9 @@ export class SettingsEditor {
 	async clearUserSettings(): Promise<void> {
 		await this.openUserSettingsFile();
 		await this.quickaccess.runCommand('editor.action.selectAll');
-		await this.code.dispatchKeybinding('Delete');
-		await this.editor.waitForEditorContents('settings.json', contents => contents === '');
+		await this.code.sendKeybinding('Delete', async () => {
+			await this.editor.waitForEditorContents('settings.json', contents => contents === '');
+		});
 		await this.editor.waitForTypeInEditor('settings.json', `{`); // will auto close }
 		await this.editors.saveOpenedFile();
 		await this.quickaccess.runCommand('workbench.action.closeActiveEditor');
@@ -70,12 +71,13 @@ export class SettingsEditor {
 
 		await this.code.waitAndClick(this._editContextSelector());
 		if (process.platform === 'darwin') {
-			await this.code.dispatchKeybinding('cmd+a');
+			await this.code.sendKeybinding('cmd+a');
 		} else {
-			await this.code.dispatchKeybinding('ctrl+a');
+			await this.code.sendKeybinding('ctrl+a');
 		}
-		await this.code.dispatchKeybinding('Delete');
-		await this.code.waitForElements('.settings-editor .settings-count-widget', false, results => !results || (results?.length === 1 && !results[0].textContent));
+		await this.code.sendKeybinding('Delete', async () => {
+			await this.code.waitForElements('.settings-editor .settings-count-widget', false, results => !results || (results?.length === 1 && !results[0].textContent));
+		});
 		await this.code.waitForTypeInEditor(this._editContextSelector(), query);
 		await this.code.waitForElements('.settings-editor .settings-count-widget', false, results => results?.length === 1 && results[0].textContent.includes('Found'));
 	}
diff --git a/test/automation/src/task.ts b/test/automation/src/task.ts
index ab95e9947d55..74ffa3f5ff0d 100644
--- a/test/automation/src/task.ts
+++ b/test/automation/src/task.ts
@@ -9,6 +9,7 @@ import { QuickAccess } from './quickaccess';
 import { Editors } from './editors';
 import { QuickInput } from './quickinput';
 import { Terminal } from './terminal';
+import { wait } from './playwrightDriver';
 
 interface ITaskConfigurationProperties {
 	label?: string;
@@ -33,7 +34,9 @@ export class Task {
 	}
 
 	async assertTasks(filter: string, expected: ITaskConfigurationProperties[], type: 'run' | 'configure') {
-		await this.code.dispatchKeybinding('right');
+		await this.code.sendKeybinding('right');
+		// TODO https://github.com/microsoft/vscode/issues/242535
+		await wait(100);
 		await this.editors.saveOpenedFile();
 		type === 'run' ? await this.quickaccess.runCommand('workbench.action.tasks.runTask', { keepOpen: true }) : await this.quickaccess.runCommand('workbench.action.tasks.configureTask', { keepOpen: true });
 		if (expected.length === 0) {
@@ -57,7 +60,9 @@ export class Task {
 		await this.quickaccess.openFileQuickAccessAndWait('tasks.json', 'tasks.json');
 		await this.quickinput.selectQuickInputElement(0);
 		await this.quickaccess.runCommand('editor.action.selectAll');
-		await this.code.dispatchKeybinding('Delete');
+		await this.code.sendKeybinding('Delete');
+		// TODO https://github.com/microsoft/vscode/issues/242535
+		await wait(100);
 		const taskStringLines: string[] = [
 			'{', // Brackets auto close
 			'"version": "2.0.0",',
@@ -78,7 +83,9 @@ export class Task {
 		for (const [i, line] of taskStringLines.entries()) {
 			await this.editor.waitForTypeInEditor('tasks.json', `${line}`);
 			if (i !== taskStringLines.length - 1) {
-				await this.code.dispatchKeybinding('Enter');
+				await this.code.sendKeybinding('Enter');
+				// TODO https://github.com/microsoft/vscode/issues/242535
+				await wait(100);
 			}
 		}
 		await this.editors.saveOpenedFile();
diff --git a/test/automation/src/terminal.ts b/test/automation/src/terminal.ts
index 1b3ecc7cdfaa..214ca824f7cd 100644
--- a/test/automation/src/terminal.ts
+++ b/test/automation/src/terminal.ts
@@ -7,6 +7,7 @@ import { QuickInput } from './quickinput';
 import { Code } from './code';
 import { QuickAccess } from './quickaccess';
 import { IElement } from './driver';
+import { wait } from './playwrightDriver';
 
 export enum Selector {
 	TerminalView = `#terminal`,
@@ -82,7 +83,9 @@ export class Terminal {
 		const keepOpen = commandId === TerminalCommandId.Join;
 		await this.quickaccess.runCommand(commandId, { keepOpen });
 		if (keepOpen) {
-			await this.code.dispatchKeybinding('enter');
+			await this.code.sendKeybinding('enter');
+			// TODO https://github.com/microsoft/vscode/issues/242535
+			await wait(100);
 			await this.quickinput.waitForQuickInputClosed();
 		}
 		switch (commandId) {
@@ -117,10 +120,14 @@ export class Terminal {
 			await this.quickinput.type(value);
 		} else if (commandId === TerminalCommandIdWithValue.Rename) {
 			// Reset
-			await this.code.dispatchKeybinding('Backspace');
+			await this.code.sendKeybinding('Backspace');
+			// TODO https://github.com/microsoft/vscode/issues/242535
+			await wait(100);
 		}
 		await this.code.wait(100);
-		await this.code.dispatchKeybinding(altKey ? 'Alt+Enter' : 'enter');
+		await this.code.sendKeybinding(altKey ? 'Alt+Enter' : 'enter');
+		// TODO https://github.com/microsoft/vscode/issues/242535
+		await wait(100);
 		await this.quickinput.waitForQuickInputClosed();
 		if (commandId === TerminalCommandIdWithValue.NewWithProfile) {
 			await this._waitForTerminal();
@@ -130,7 +137,9 @@ export class Terminal {
 	async runCommandInTerminal(commandText: string, skipEnter?: boolean): Promise<void> {
 		await this.code.writeInTerminal(Selector.Xterm, commandText);
 		if (!skipEnter) {
-			await this.code.dispatchKeybinding('enter');
+			await this.code.sendKeybinding('enter');
+			// TODO https://github.com/microsoft/vscode/issues/242535
+			await wait(100);
 		}
 	}
 
diff --git a/test/smoke/src/areas/preferences/preferences.test.ts b/test/smoke/src/areas/preferences/preferences.test.ts
index 02d5cdeac052..a8f620e71967 100644
--- a/test/smoke/src/areas/preferences/preferences.test.ts
+++ b/test/smoke/src/areas/preferences/preferences.test.ts
@@ -29,8 +29,7 @@ export function setup(logger: Logger) {
 
 			await app.workbench.keybindingsEditor.updateKeybinding('workbench.action.toggleSidebarPosition', 'View: Toggle Primary Side Bar Position', 'ctrl+u', 'Control+U');
 
-			await app.code.dispatchKeybinding('ctrl+u');
-			await app.workbench.activitybar.waitForActivityBar(ActivityBarPosition.RIGHT);
+			await app.code.sendKeybinding('ctrl+u', () => app.workbench.activitybar.waitForActivityBar(ActivityBarPosition.RIGHT));
 		});
 	});
 
@@ -53,8 +52,9 @@ export function setup(logger: Logger) {
 			const app = this.app as Application;
 
 			await app.workbench.editors.newUntitledFile();
-			await app.code.dispatchKeybinding('enter');
-			await app.code.waitForElements('.line-numbers', false, elements => !!elements.length);
+			await app.code.sendKeybinding('enter', async () => {
+				await app.code.waitForElements('.line-numbers', false, elements => !!elements.length);
+			});
 
 			// Turn off line numbers
 			await app.workbench.settingsEditor.searchSettingsUI('editor.lineNumbers');
diff --git a/test/smoke/src/areas/search/search.test.ts b/test/smoke/src/areas/search/search.test.ts
index 78f79b61838f..d0768f7b0872 100644
--- a/test/smoke/src/areas/search/search.test.ts
+++ b/test/smoke/src/areas/search/search.test.ts
@@ -23,11 +23,13 @@ export function setup(logger: Logger) {
 			const app = this.app as Application;
 			await app.workbench.search.openSearchViewlet();
 
-			await app.code.dispatchKeybinding('PageUp');
-			await app.workbench.search.hasActivityBarMoved();
+			await app.code.sendKeybinding('PageUp', async () => {
+				await app.workbench.search.hasActivityBarMoved();
+			});
 
-			await app.code.dispatchKeybinding('PageUp');
-			await app.workbench.search.hasActivityBarMoved();
+			await app.code.sendKeybinding('PageUp', async () => {
+				await app.workbench.search.hasActivityBarMoved();
+			});
 		});
 
 		it('searches for body & checks for correct result number', async function () {

From 6dc103659bc4d11f097db31bef9e472d16de7784 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Wed, 5 Mar 2025 11:40:50 +0100
Subject: [PATCH 0646/1815] Porting attributes from text area to edit context
 (#242674)

porting attributes from text area edit context
---
 .../controller/editContext/native/nativeEditContext.ts        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
index 76a5bd52fe5f..a6f5d41ad094 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
@@ -77,6 +77,10 @@ export class NativeEditContext extends AbstractEditContext {
 		this.textArea = new FastDomNode(document.createElement('textarea'));
 		this.textArea.setClassName('native-edit-context-textarea');
 		this.textArea.setAttribute('tabindex', '-1');
+		this.domNode.setAttribute('autocorrect', 'off');
+		this.domNode.setAttribute('autocapitalize', 'off');
+		this.domNode.setAttribute('autocomplete', 'off');
+		this.domNode.setAttribute('spellcheck', 'false');
 
 		this._updateDomAttributes();
 

From d234a62e3984a780314eb3bc4c8f2e2e9b6468c2 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Wed, 5 Mar 2025 10:44:12 +0000
Subject: [PATCH 0647/1815] Git - remove `diffCommand` proposal (#242675)

---
 extensions/git/package.json    |  1 -
 extensions/git/src/commands.ts | 27 +++++++++------------------
 extensions/git/src/staging.ts  |  9 ++++++++-
 extensions/git/tsconfig.json   |  1 -
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/extensions/git/package.json b/extensions/git/package.json
index f772659c8a1b..a117e45d0259 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -21,7 +21,6 @@
     "contribSourceControlInputBoxMenu",
     "contribSourceControlTitleMenu",
     "contribViewsWelcome",
-    "diffCommand",
     "editSessionIdentityProvider",
     "quickDiffProvider",
     "quickInputButtonLocation",
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index e61e8dc3e5a2..d94649559396 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -5,14 +5,14 @@
 
 import * as os from 'os';
 import * as path from 'path';
-import { Command, commands, Disposable, LineChange, MessageOptions, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env, Selection, TextDocumentContentProvider, InputBoxValidationSeverity, TabInputText, TabInputTextMerge, QuickPickItemKind, TextDocument, LogOutputChannel, l10n, Memento, UIKind, QuickInputButton, ThemeIcon, SourceControlHistoryItem, SourceControl, InputBoxValidationMessage, Tab, TabInputNotebook, QuickInputButtonLocation, languages } from 'vscode';
+import { Command, commands, Disposable, MessageOptions, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env, Selection, TextDocumentContentProvider, InputBoxValidationSeverity, TabInputText, TabInputTextMerge, QuickPickItemKind, TextDocument, LogOutputChannel, l10n, Memento, UIKind, QuickInputButton, ThemeIcon, SourceControlHistoryItem, SourceControl, InputBoxValidationMessage, Tab, TabInputNotebook, QuickInputButtonLocation, languages } from 'vscode';
 import TelemetryReporter from '@vscode/extension-telemetry';
 import { uniqueNamesGenerator, adjectives, animals, colors, NumberDictionary } from '@joaomoreno/unique-names-generator';
 import { ForcePushMode, GitErrorCodes, Ref, RefType, Status, CommitOptions, RemoteSourcePublisher, Remote } from './api/git';
 import { Git, Stash } from './git';
 import { Model } from './model';
 import { GitResourceGroup, Repository, Resource, ResourceGroupType } from './repository';
-import { DiffEditorSelectionHunkToolbarContext, applyLineChanges, getIndexDiffInformation, getModifiedRange, getWorkingTreeDiffInformation, intersectDiffWithRange, invertLineChange, toLineChanges, toLineRanges } from './staging';
+import { DiffEditorSelectionHunkToolbarContext, LineChange, applyLineChanges, getIndexDiffInformation, getModifiedRange, getWorkingTreeDiffInformation, intersectDiffWithRange, invertLineChange, toLineChanges, toLineRanges } from './staging';
 import { fromGitUri, toGitUri, isGitUri, toMergeUris, toMultiFileDiffEditorUris } from './uri';
 import { DiagnosticSeverityConfig, dispose, getCommitShortHash, grep, isDefined, isDescendant, isLinuxSnap, isRemote, isWindows, pathEquals, relativePath, toDiagnosticSeverity, truncate } from './util';
 import { GitTimelineItem } from './timelineProvider';
@@ -275,7 +275,6 @@ class StashItem implements QuickPickItem {
 
 interface ScmCommandOptions {
 	repository?: boolean;
-	diff?: boolean;
 }
 
 interface ScmCommand {
@@ -712,12 +711,7 @@ export class CommandCenter {
 	) {
 		this.disposables = Commands.map(({ commandId, key, method, options }) => {
 			const command = this.createCommand(commandId, key, method, options);
-
-			if (options.diff) {
-				return commands.registerDiffInformationCommand(commandId, command);
-			} else {
-				return commands.registerCommand(commandId, command);
-			}
+			return commands.registerCommand(commandId, command);
 		});
 
 		this.disposables.push(workspace.registerTextDocumentContentProvider('git-output', this.commandErrors));
@@ -1643,8 +1637,8 @@ export class CommandCenter {
 		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
 	}
 
-	@command('git.stageSelectedRanges', { diff: true })
-	async stageSelectedChanges(changes: LineChange[]): Promise<void> {
+	@command('git.stageSelectedRanges')
+	async stageSelectedChanges(): Promise<void> {
 		const textEditor = window.activeTextEditor;
 
 		if (!textEditor) {
@@ -1658,7 +1652,6 @@ export class CommandCenter {
 
 		const workingTreeLineChanges = toLineChanges(workingTreeDiffInformation);
 
-		this.logger.trace(`[CommandCenter][stageSelectedChanges] changes: ${JSON.stringify(changes)}`);
 		this.logger.trace(`[CommandCenter][stageSelectedChanges] diffInformation: ${JSON.stringify(workingTreeDiffInformation)}`);
 		this.logger.trace(`[CommandCenter][stageSelectedChanges] diffInformation changes: ${JSON.stringify(workingTreeLineChanges)}`);
 
@@ -1838,8 +1831,8 @@ export class CommandCenter {
 		textEditor.selections = [new Selection(firstStagedLine, 0, firstStagedLine, 0)];
 	}
 
-	@command('git.revertSelectedRanges', { diff: true })
-	async revertSelectedRanges(changes: LineChange[]): Promise<void> {
+	@command('git.revertSelectedRanges')
+	async revertSelectedRanges(): Promise<void> {
 		const textEditor = window.activeTextEditor;
 
 		if (!textEditor) {
@@ -1853,7 +1846,6 @@ export class CommandCenter {
 
 		const workingTreeLineChanges = toLineChanges(workingTreeDiffInformation);
 
-		this.logger.trace(`[CommandCenter][revertSelectedRanges] changes: ${JSON.stringify(changes)}`);
 		this.logger.trace(`[CommandCenter][revertSelectedRanges] diffInformation: ${JSON.stringify(workingTreeDiffInformation)}`);
 		this.logger.trace(`[CommandCenter][revertSelectedRanges] diffInformation changes: ${JSON.stringify(workingTreeLineChanges)}`);
 
@@ -1928,8 +1920,8 @@ export class CommandCenter {
 		await repository.revert([]);
 	}
 
-	@command('git.unstageSelectedRanges', { diff: true })
-	async unstageSelectedRanges(changes: LineChange[]): Promise<void> {
+	@command('git.unstageSelectedRanges')
+	async unstageSelectedRanges(): Promise<void> {
 		const textEditor = window.activeTextEditor;
 
 		if (!textEditor) {
@@ -1967,7 +1959,6 @@ export class CommandCenter {
 
 		const indexLineChanges = toLineChanges(indexDiffInformation);
 
-		this.logger.trace(`[CommandCenter][unstageSelectedRanges] changes: ${JSON.stringify(changes)}`);
 		this.logger.trace(`[CommandCenter][unstageSelectedRanges] diffInformation: ${JSON.stringify(indexDiffInformation)}`);
 		this.logger.trace(`[CommandCenter][unstageSelectedRanges] diffInformation changes: ${JSON.stringify(indexLineChanges)}`);
 
diff --git a/extensions/git/src/staging.ts b/extensions/git/src/staging.ts
index 14e4e379e478..ec7232bec44a 100644
--- a/extensions/git/src/staging.ts
+++ b/extensions/git/src/staging.ts
@@ -3,9 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { TextDocument, Range, LineChange, Selection, Uri, TextEditor, TextEditorDiffInformation } from 'vscode';
+import { TextDocument, Range, Selection, Uri, TextEditor, TextEditorDiffInformation } from 'vscode';
 import { fromGitUri, isGitUri } from './uri';
 
+export interface LineChange {
+	readonly originalStartLineNumber: number;
+	readonly originalEndLineNumber: number;
+	readonly modifiedStartLineNumber: number;
+	readonly modifiedEndLineNumber: number;
+}
+
 export function applyLineChanges(original: TextDocument, modified: TextDocument, diffs: LineChange[]): string {
 	const result: string[] = [];
 	let currentLine = 0;
diff --git a/extensions/git/tsconfig.json b/extensions/git/tsconfig.json
index 42218d8decb0..c79be520be97 100644
--- a/extensions/git/tsconfig.json
+++ b/extensions/git/tsconfig.json
@@ -11,7 +11,6 @@
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
 		"../../src/vscode-dts/vscode.proposed.canonicalUriProvider.d.ts",
-		"../../src/vscode-dts/vscode.proposed.diffCommand.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",

From 5ff58539b431a007f7839d91d986cbc4a8e6a715 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Wed, 5 Mar 2025 12:07:56 +0100
Subject: [PATCH 0648/1815] Support targeting multiple scopes in a theme with
 tree sitter (#241703)

* Support targeting multiple scopes in a theme with tree sitter

* Fix tests

* Respond to PR feedback

* Fix tests
---
 .../test-241001_ts.json                       | 110 +++----
 .../test-function-inv_ts.json                 |  22 +-
 .../test-issue11_ts.json                      |  40 +--
 .../test-issue5431_ts.json                    |  32 +-
 .../test-issue5566_ts.json                    |   8 +-
 .../test-keywords_ts.json                     |  14 +-
 .../test-members_ts.json                      |  12 +-
 .../test-strings_ts.json                      |  50 +--
 .../test-this_ts.json                         |   2 +-
 .../colorize-tree-sitter-results/test_ts.json | 294 +++++++++---------
 .../languages/highlights/typescript.scm       |  21 +-
 .../inspectEditorTokens.ts                    |   4 +-
 .../browser/themes.test.contribution.ts       |   2 +-
 .../services/themes/common/colorThemeData.ts  |   8 +-
 .../browser/treeSitterTokenizationFeature.ts  | 105 +++----
 15 files changed, 363 insertions(+), 361 deletions(-)

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 8180a2388eaa..95914c5db4ef 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
@@ -281,12 +281,12 @@
 	},
 	{
 		"c": "null",
-		"t": "support.type.builtin",
+		"t": "constant.language.null support.type.builtin",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
@@ -295,7 +295,7 @@
 	},
 	{
 		"c": "|",
-		"t": "keyword.operator.type",
+		"t": "keyword.operator keyword.operator.type",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": "unknown",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -323,7 +323,7 @@
 	},
 	{
 		"c": "|",
-		"t": "keyword.operator.type",
+		"t": "keyword.operator keyword.operator.type",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -337,12 +337,12 @@
 	},
 	{
 		"c": "undefined",
-		"t": "support.type.builtin",
+		"t": "constant.language.undefined support.type.builtin",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
@@ -351,7 +351,7 @@
 	},
 	{
 		"c": "|",
-		"t": "keyword.operator.type",
+		"t": "keyword.operator keyword.operator.type",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -365,12 +365,12 @@
 	},
 	{
 		"c": "true",
-		"t": "support.type.builtin",
+		"t": "constant.language.boolean.true support.type.builtin",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
@@ -379,7 +379,7 @@
 	},
 	{
 		"c": "|",
-		"t": "keyword.operator.type",
+		"t": "keyword.operator keyword.operator.type",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -393,12 +393,12 @@
 	},
 	{
 		"c": "false",
-		"t": "support.type.builtin",
+		"t": "constant.language.boolean.false support.type.builtin",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
 			"hc_black": "support.type: #4EC9B0",
 			"dark_modern": "support.type: #4EC9B0",
 			"hc_light": "support.type: #185E73",
@@ -435,7 +435,7 @@
 	},
 	{
 		"c": "bar",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -463,7 +463,7 @@
 	},
 	{
 		"c": "a",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -477,7 +477,7 @@
 	},
 	{
 		"c": "?",
-		"t": "keyword.operator.optional",
+		"t": "punctuation.delimiter keyword.operator.optional",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -491,7 +491,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -505,7 +505,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -533,7 +533,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -547,7 +547,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -687,7 +687,7 @@
 	},
 	{
 		"c": "?",
-		"t": "keyword.operator.optional",
+		"t": "punctuation.delimiter keyword.operator.optional",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -701,7 +701,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -757,7 +757,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1163,7 +1163,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1191,7 +1191,7 @@
 	},
 	{
 		"c": "param",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1205,7 +1205,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1219,7 +1219,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1345,7 +1345,7 @@
 	},
 	{
 		"c": "NaN",
-		"t": "constant.language.nan",
+		"t": "variable constant.language.nan",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -1359,7 +1359,7 @@
 	},
 	{
 		"c": "Infinity",
-		"t": "constant.language.infinity",
+		"t": "variable constant.language.infinity",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -1555,7 +1555,7 @@
 	},
 	{
 		"c": "|",
-		"t": "keyword.operator.type",
+		"t": "keyword.operator keyword.operator.type",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1611,7 +1611,7 @@
 	},
 	{
 		"c": "&",
-		"t": "keyword.operator.type",
+		"t": "keyword.operator keyword.operator.type",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1877,7 +1877,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1905,7 +1905,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1947,7 +1947,7 @@
 	},
 	{
 		"c": "new",
-		"t": "keyword.operator.new",
+		"t": "new.expr keyword.operator.new",
 		"r": {
 			"dark_plus": "keyword.operator.new: #569CD6",
 			"light_plus": "keyword.operator.new: #0000FF",
@@ -1961,21 +1961,21 @@
 	},
 	{
 		"c": "URL",
-		"t": "variable.other.constant",
+		"t": "new.expr variable entity.name.function",
 		"r": {
-			"dark_plus": "variable.other.constant: #4FC1FF",
-			"light_plus": "variable.other.constant: #0070C1",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE",
-			"dark_modern": "variable.other.constant: #4FC1FF",
-			"hc_light": "variable.other.constant: #02715D",
-			"light_modern": "variable.other.constant: #0070C1"
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
 		}
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "new.expr punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1989,7 +1989,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "new.expr string",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -2003,7 +2003,7 @@
 	},
 	{
 		"c": "./../../renderer/dist/index.html",
-		"t": "string",
+		"t": "new.expr string",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -2017,7 +2017,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "new.expr string",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -2031,7 +2031,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "new.expr punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2045,7 +2045,7 @@
 	},
 	{
 		"c": "import",
-		"t": "keyword.control",
+		"t": "new.expr keyword.control",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -2059,7 +2059,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "new.expr punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2087,7 +2087,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "new.expr punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2101,7 +2101,7 @@
 	},
 	{
 		"c": "url",
-		"t": "variable",
+		"t": "new.expr variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2115,7 +2115,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "new.expr punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json
index e2bc3557ae5c..cffeb46fdca8 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "push",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": "callback",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "new",
-		"t": "keyword.operator.new",
+		"t": "new.expr keyword.operator.new",
 		"r": {
 			"dark_plus": "keyword.operator.new: #569CD6",
 			"light_plus": "keyword.operator.new: #0000FF",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "entity.name.function",
+		"t": "new.expr variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "new.expr punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "new.expr variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "new.expr punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "new.expr variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "new.expr punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "false",
-		"t": "constant.language.boolean.false",
+		"t": "new.expr constant.language.boolean.false",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "new.expr punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
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 9ffdc10c74cc..45691a1ce198 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
@@ -1541,7 +1541,7 @@
 	},
 	{
 		"c": "?",
-		"t": "keyword.operator.ternary",
+		"t": "punctuation.delimiter keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1569,7 +1569,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.ternary",
+		"t": "punctuation.delimiter keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1639,7 +1639,7 @@
 	},
 	{
 		"c": "?",
-		"t": "keyword.operator.ternary",
+		"t": "punctuation.delimiter keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1667,7 +1667,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.ternary",
+		"t": "punctuation.delimiter keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1947,7 +1947,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2003,7 +2003,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -2199,7 +2199,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2381,7 +2381,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2437,7 +2437,7 @@
 	},
 	{
 		"c": "param",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2451,7 +2451,7 @@
 	},
 	{
 		"c": "?",
-		"t": "keyword.operator.optional",
+		"t": "punctuation.delimiter keyword.operator.optional",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2465,7 +2465,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2479,7 +2479,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -2521,7 +2521,7 @@
 	},
 	{
 		"c": "void",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -2619,7 +2619,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2675,7 +2675,7 @@
 	},
 	{
 		"c": "|",
-		"t": "keyword.operator.type",
+		"t": "keyword.operator keyword.operator.type",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2731,7 +2731,7 @@
 	},
 	{
 		"c": "&",
-		"t": "keyword.operator.type",
+		"t": "keyword.operator keyword.operator.type",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2913,7 +2913,7 @@
 	},
 	{
 		"c": "?",
-		"t": "keyword.operator.ternary",
+		"t": "punctuation.delimiter keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2941,7 +2941,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.ternary",
+		"t": "punctuation.delimiter keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -3067,7 +3067,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3095,7 +3095,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
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 4e5c11e475e1..bcbec84c6672 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
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "isAll",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "startTime",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "endTime",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": "?",
-		"t": "keyword.operator.ternary",
+		"t": "punctuation.delimiter keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -253,7 +253,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.ternary",
+		"t": "punctuation.delimiter keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -281,7 +281,7 @@
 	},
 	{
 		"c": "${",
-		"t": "punctuation.definition.template-expression.begin",
+		"t": "string punctuation.definition.template-expression.begin",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
@@ -295,12 +295,12 @@
 	},
 	{
 		"c": "startTime",
-		"t": "variable",
+		"t": "string variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation.definition.template-expression.end",
+		"t": "string punctuation punctuation.definition.template-expression.end",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
@@ -337,7 +337,7 @@
 	},
 	{
 		"c": "${",
-		"t": "punctuation.definition.template-expression.begin",
+		"t": "string punctuation.definition.template-expression.begin",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
@@ -351,12 +351,12 @@
 	},
 	{
 		"c": "endTime",
-		"t": "variable",
+		"t": "string variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -365,7 +365,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation.definition.template-expression.end",
+		"t": "string punctuation punctuation.definition.template-expression.end",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json
index 0f1813112792..5df07bab772e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "foo3",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "any",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
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 005ae69ef887..f484d1f7efc1 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
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "new",
-		"t": "keyword.operator.new",
+		"t": "new.expr keyword.operator.new",
 		"r": {
 			"dark_plus": "keyword.operator.new: #569CD6",
 			"light_plus": "keyword.operator.new: #0000FF",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "RegExp",
-		"t": "entity.name.function",
+		"t": "new.expr variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "new.expr punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "new.expr string",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "new.expr string",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "new.expr punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json
index a34e098b59d0..67fd0d52eb3d 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "B1",
-		"t": "entity.other.inherited-class",
+		"t": "variable entity.other.inherited-class",
 		"r": {
 			"dark_plus": "entity.other.inherited-class: #4EC9B0",
 			"light_plus": "entity.other.inherited-class: #267F99",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "resolveNextGeneration",
-		"t": "entity.name.function",
+		"t": "variable meta.definition.method entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -225,7 +225,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json
index 58210899070d..c7fd2b14cfaf 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "${",
-		"t": "punctuation.definition.template-expression.begin",
+		"t": "string punctuation.definition.template-expression.begin",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
@@ -85,12 +85,12 @@
 	},
 	{
 		"c": "foo",
-		"t": "variable",
+		"t": "string variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation.definition.template-expression.end",
+		"t": "string punctuation punctuation.definition.template-expression.end",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "log",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": "tag",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -351,7 +351,7 @@
 	},
 	{
 		"c": "${",
-		"t": "punctuation.definition.template-expression.begin",
+		"t": "string punctuation.definition.template-expression.begin",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
@@ -365,12 +365,12 @@
 	},
 	{
 		"c": "a",
-		"t": "variable",
+		"t": "string variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -379,7 +379,7 @@
 	},
 	{
 		"c": "+",
-		"t": "keyword.operator.arithmetic",
+		"t": "string keyword.operator.arithmetic",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -393,12 +393,12 @@
 	},
 	{
 		"c": "b",
-		"t": "variable",
+		"t": "string variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -407,7 +407,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation.definition.template-expression.end",
+		"t": "string punctuation punctuation.definition.template-expression.end",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
@@ -435,7 +435,7 @@
 	},
 	{
 		"c": "${",
-		"t": "punctuation.definition.template-expression.begin",
+		"t": "string punctuation.definition.template-expression.begin",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
@@ -449,12 +449,12 @@
 	},
 	{
 		"c": "a",
-		"t": "variable",
+		"t": "string variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -463,7 +463,7 @@
 	},
 	{
 		"c": "*",
-		"t": "keyword.operator.arithmetic",
+		"t": "string keyword.operator.arithmetic",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -477,12 +477,12 @@
 	},
 	{
 		"c": "b",
-		"t": "variable",
+		"t": "string variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -491,7 +491,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation.definition.template-expression.end",
+		"t": "string punctuation punctuation.definition.template-expression.end",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json
index 4583b6573635..f496120fdbad 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
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 70b287ec2c16..39a4948db68c 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
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -225,7 +225,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -281,7 +281,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -295,7 +295,7 @@
 	},
 	{
 		"c": "boolean",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -323,7 +323,7 @@
 	},
 	{
 		"c": "constructor",
-		"t": "storage.type",
+		"t": "variable meta.definition.method storage.type",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -351,7 +351,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -365,7 +365,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -379,7 +379,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -407,7 +407,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -421,7 +421,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -435,7 +435,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -463,7 +463,7 @@
 	},
 	{
 		"c": "live",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -477,7 +477,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -491,7 +491,7 @@
 	},
 	{
 		"c": "boolean",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -561,7 +561,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -645,7 +645,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -729,7 +729,7 @@
 	},
 	{
 		"c": "live",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -883,7 +883,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -897,7 +897,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -953,7 +953,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -967,7 +967,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1023,7 +1023,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1037,7 +1037,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1093,7 +1093,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1107,7 +1107,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1163,7 +1163,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1177,7 +1177,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1233,7 +1233,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1247,7 +1247,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1303,7 +1303,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1317,7 +1317,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1373,7 +1373,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1387,7 +1387,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1457,7 +1457,7 @@
 	},
 	{
 		"c": "constructor",
-		"t": "storage.type",
+		"t": "variable meta.definition.method storage.type",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1541,7 +1541,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1625,7 +1625,7 @@
 	},
 	{
 		"c": "canvasSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1709,7 +1709,7 @@
 	},
 	{
 		"c": "lineColor",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1821,7 +1821,7 @@
 	},
 	{
 		"c": "liveColor",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1933,7 +1933,7 @@
 	},
 	{
 		"c": "deadColor",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2045,7 +2045,7 @@
 	},
 	{
 		"c": "initialLifeProbability",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2129,7 +2129,7 @@
 	},
 	{
 		"c": "animationRate",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2213,7 +2213,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2297,7 +2297,7 @@
 	},
 	{
 		"c": "world",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2353,7 +2353,7 @@
 	},
 	{
 		"c": "createWorld",
-		"t": "entity.name.function",
+		"t": "variable variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2437,7 +2437,7 @@
 	},
 	{
 		"c": "circleOfLife",
-		"t": "entity.name.function",
+		"t": "variable variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2521,7 +2521,7 @@
 	},
 	{
 		"c": "createWorld",
-		"t": "entity.name.function",
+		"t": "variable meta.definition.method entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2619,7 +2619,7 @@
 	},
 	{
 		"c": "travelWorld",
-		"t": "entity.name.function",
+		"t": "variable variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2661,7 +2661,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2675,7 +2675,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2829,7 +2829,7 @@
 	},
 	{
 		"c": "random",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2913,7 +2913,7 @@
 	},
 	{
 		"c": "initialLifeProbability",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3053,7 +3053,7 @@
 	},
 	{
 		"c": "circleOfLife",
-		"t": "entity.name.function",
+		"t": "variable meta.definition.method entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3095,7 +3095,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -3109,7 +3109,7 @@
 	},
 	{
 		"c": "void",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -3165,7 +3165,7 @@
 	},
 	{
 		"c": "world",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3221,7 +3221,7 @@
 	},
 	{
 		"c": "travelWorld",
-		"t": "entity.name.function",
+		"t": "variable variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3263,7 +3263,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3277,7 +3277,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -3403,7 +3403,7 @@
 	},
 	{
 		"c": "world",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3599,7 +3599,7 @@
 	},
 	{
 		"c": "draw",
-		"t": "entity.name.function",
+		"t": "variable variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3711,7 +3711,7 @@
 	},
 	{
 		"c": "resolveNextGeneration",
-		"t": "entity.name.function",
+		"t": "variable variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3823,7 +3823,7 @@
 	},
 	{
 		"c": "setTimeout",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3935,7 +3935,7 @@
 	},
 	{
 		"c": "circleOfLife",
-		"t": "entity.name.function",
+		"t": "variable variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -4033,7 +4033,7 @@
 	},
 	{
 		"c": "animationRate",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4103,7 +4103,7 @@
 	},
 	{
 		"c": "resolveNextGeneration",
-		"t": "entity.name.function",
+		"t": "variable meta.definition.method entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -4131,7 +4131,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4145,7 +4145,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -4271,7 +4271,7 @@
 	},
 	{
 		"c": "countNeighbors",
-		"t": "entity.name.function",
+		"t": "variable variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -4383,7 +4383,7 @@
 	},
 	{
 		"c": "new",
-		"t": "keyword.operator.new",
+		"t": "new.expr keyword.operator.new",
 		"r": {
 			"dark_plus": "keyword.operator.new: #569CD6",
 			"light_plus": "keyword.operator.new: #0000FF",
@@ -4397,7 +4397,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "entity.name.function",
+		"t": "new.expr variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -4411,7 +4411,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "new.expr punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4425,7 +4425,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "new.expr variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4439,7 +4439,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "new.expr punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4453,7 +4453,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "new.expr variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4467,7 +4467,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "new.expr punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4481,7 +4481,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "new.expr variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4495,7 +4495,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "new.expr punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4509,7 +4509,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "new.expr variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4523,7 +4523,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "new.expr punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4537,7 +4537,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "new.expr variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4551,7 +4551,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "new.expr punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4565,7 +4565,7 @@
 	},
 	{
 		"c": "live",
-		"t": "variable",
+		"t": "new.expr variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4579,7 +4579,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "new.expr punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5083,7 +5083,7 @@
 	},
 	{
 		"c": "countNeighbors",
-		"t": "entity.name.function",
+		"t": "variable meta.definition.method entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -5111,7 +5111,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -5125,7 +5125,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -5923,7 +5923,7 @@
 	},
 	{
 		"c": "isAlive",
-		"t": "entity.name.function",
+		"t": "variable variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -6301,7 +6301,7 @@
 	},
 	{
 		"c": "isAlive",
-		"t": "entity.name.function",
+		"t": "variable meta.definition.method entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -6329,7 +6329,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6343,7 +6343,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -6357,7 +6357,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -6385,7 +6385,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6399,7 +6399,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -6413,7 +6413,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type.primitive",
+		"t": "support.type support.type.primitive",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -6651,7 +6651,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6735,7 +6735,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6847,7 +6847,7 @@
 	},
 	{
 		"c": "world",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7015,7 +7015,7 @@
 	},
 	{
 		"c": "travelWorld",
-		"t": "entity.name.function",
+		"t": "variable meta.definition.method entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -7043,7 +7043,7 @@
 	},
 	{
 		"c": "callback",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7323,7 +7323,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7645,7 +7645,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7757,7 +7757,7 @@
 	},
 	{
 		"c": "push",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -7785,7 +7785,7 @@
 	},
 	{
 		"c": "callback",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -7813,7 +7813,7 @@
 	},
 	{
 		"c": "new",
-		"t": "keyword.operator.new",
+		"t": "new.expr keyword.operator.new",
 		"r": {
 			"dark_plus": "keyword.operator.new: #569CD6",
 			"light_plus": "keyword.operator.new: #0000FF",
@@ -7827,7 +7827,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "entity.name.function",
+		"t": "new.expr variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -7841,7 +7841,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "new.expr punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7855,7 +7855,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "new.expr variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7869,7 +7869,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "new.expr punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7883,7 +7883,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "new.expr variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7897,7 +7897,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "new.expr punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7911,7 +7911,7 @@
 	},
 	{
 		"c": "false",
-		"t": "constant.language.boolean.false",
+		"t": "new.expr constant.language.boolean.false",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -7925,7 +7925,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "new.expr punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8023,7 +8023,7 @@
 	},
 	{
 		"c": "push",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -8177,7 +8177,7 @@
 	},
 	{
 		"c": "draw",
-		"t": "entity.name.function",
+		"t": "variable meta.definition.method entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -8205,7 +8205,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable.parameter",
+		"t": "variable variable.parameter",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8219,7 +8219,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.type.annotation",
+		"t": "punctuation.delimiter keyword.operator.type.annotation",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -8331,7 +8331,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8415,7 +8415,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8471,7 +8471,7 @@
 	},
 	{
 		"c": "canvasSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8527,7 +8527,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8583,7 +8583,7 @@
 	},
 	{
 		"c": "context",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8667,7 +8667,7 @@
 	},
 	{
 		"c": "lineColor",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8723,7 +8723,7 @@
 	},
 	{
 		"c": "context",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8751,7 +8751,7 @@
 	},
 	{
 		"c": "strokeRect",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -8863,7 +8863,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8975,7 +8975,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9031,7 +9031,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9087,7 +9087,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9157,7 +9157,7 @@
 	},
 	{
 		"c": "context",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9255,7 +9255,7 @@
 	},
 	{
 		"c": "?",
-		"t": "keyword.operator.ternary",
+		"t": "punctuation.delimiter keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -9297,7 +9297,7 @@
 	},
 	{
 		"c": "liveColor",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9311,7 +9311,7 @@
 	},
 	{
 		"c": ":",
-		"t": "keyword.operator.ternary",
+		"t": "punctuation.delimiter keyword.operator.ternary",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -9353,7 +9353,7 @@
 	},
 	{
 		"c": "deadColor",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9409,7 +9409,7 @@
 	},
 	{
 		"c": "context",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9437,7 +9437,7 @@
 	},
 	{
 		"c": "fillRect",
-		"t": "entity.name.function",
+		"t": "variable entity.name.function",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -9549,7 +9549,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9661,7 +9661,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9717,7 +9717,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9773,7 +9773,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable",
+		"t": "variable variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9899,7 +9899,7 @@
 	},
 	{
 		"c": "new",
-		"t": "keyword.operator.new",
+		"t": "new.expr keyword.operator.new",
 		"r": {
 			"dark_plus": "keyword.operator.new: #569CD6",
 			"light_plus": "keyword.operator.new: #0000FF",
@@ -9913,7 +9913,7 @@
 	},
 	{
 		"c": "Conway",
-		"t": "variable",
+		"t": "new.expr variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9927,7 +9927,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "new.expr punctuation.delimiter",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9941,7 +9941,7 @@
 	},
 	{
 		"c": "GameOfLife",
-		"t": "variable",
+		"t": "new.expr variable",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9955,7 +9955,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "new.expr punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9969,7 +9969,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "new.expr punctuation",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/src/vs/editor/common/languages/highlights/typescript.scm b/src/vs/editor/common/languages/highlights/typescript.scm
index c536c7160cbf..2203e09fa6a6 100644
--- a/src/vs/editor/common/languages/highlights/typescript.scm
+++ b/src/vs/editor/common/languages/highlights/typescript.scm
@@ -113,10 +113,12 @@
 (internal_module
   name: (identifier) @entity.name.type.ts)
 
-([
-  (identifier)
-  (shorthand_property_identifier)
-  (shorthand_property_identifier_pattern)] @variable.other.constant
+(
+  [
+    (_ name: (identifier))
+    (shorthand_property_identifier)
+    (shorthand_property_identifier_pattern)
+  ] @variable.other.constant
   (#match? @variable.other.constant "^[A-Z][A-Z_]+$"))
 
 (extends_clause
@@ -347,7 +349,8 @@
 (optional_chain
   ("?.") @punctuation.accessor.optional)
 
-(rest_pattern) @keyword.operator.rest
+(rest_pattern
+  ("...") @keyword.operator.rest)
 
 (spread_element
   ("...") @keyword.operator.spread)
@@ -362,11 +365,11 @@
   (undefined)
 ] @constant.language.undefined
 
- ((identifier) @constant.language.nan
-   (#eq? @constant.language.nan "NaN"))
+((identifier) @constant.language.nan
+  (#eq? @constant.language.nan "NaN"))
 
- ((identifier) @constant.language.infinity
-   (#eq? @constant.language.infinity "Infinity"))
+((identifier) @constant.language.infinity
+  (#eq? @constant.language.infinity "Infinity"))
 
 [
   (true)
diff --git a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
index ff2710dcd2b2..a896a8019fdc 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.ts
@@ -419,7 +419,7 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 			}
 
 			dom.append(tbody, $('tr', undefined,
-				$('td.tiw-metadata-key', undefined, 'tree-sitter scopes' as string),
+				$('td.tiw-metadata-key', undefined, 'tree-sitter tree' as string),
 				$('td.tiw-metadata-value.tiw-metadata-scopes', undefined, ...scopes),
 			));
 
@@ -428,7 +428,7 @@ class InspectEditorTokensWidget extends Disposable implements IContentWidget {
 			if (captures && captures.length > 0) {
 				dom.append(tbody, $('tr', undefined,
 					$('td.tiw-metadata-key', undefined, 'foreground'),
-					$('td.tiw-metadata-value', undefined, captures[captures.length - 1].name),
+					$('td.tiw-metadata-value', undefined, captures.map(cap => cap.name).join(' ')),
 				));
 			}
 		}
diff --git a/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts
index a5806666f08e..fd1cd59d4697 100644
--- a/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts
+++ b/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts
@@ -286,7 +286,7 @@ class Snapper {
 				const capture = tokenizationSupport?.captureAtPositionTree(cursor.currentNode.startPosition.row + 1, cursor.currentNode.startPosition.column + 1, tree);
 				tokens.push({
 					c: cursor.currentNode.text.replace(/\r/g, ''),
-					t: capture && capture.length > 0 ? capture[capture.length - 1].name : '',
+					t: capture?.map(cap => cap.name).join(' ') ?? '',
 					r: {
 						dark_plus: undefined,
 						light_plus: undefined,
diff --git a/src/vs/workbench/services/themes/common/colorThemeData.ts b/src/vs/workbench/services/themes/common/colorThemeData.ts
index 4d879061713b..3697ec383196 100644
--- a/src/vs/workbench/services/themes/common/colorThemeData.ts
+++ b/src/vs/workbench/services/themes/common/colorThemeData.ts
@@ -821,13 +821,11 @@ function nameMatcher(identifiers: string[], scopes: ProbeScope): number {
 		return -1;
 	}
 
-	let lastIndex = 0;
 	let score: number | undefined = undefined;
-	const every = identifiers.every((identifier, identifierIndex) => {
-		for (let i = lastIndex; i < scopes.length; i++) {
+	const every = identifiers.every((identifier) => {
+		for (let i = scopes.length - 1; i >= 0; i--) {
 			if (scopesAreMatching(scopes[i], identifier)) {
-				score = (identifierIndex + 1) * 0x10000 + identifier.length;
-				lastIndex = i + 1;
+				score = (i + 1) * 0x10000 + identifier.length;
 				return true;
 			}
 		}
diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
index bbaa9de12056..ef5a6bf40c24 100644
--- a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
@@ -547,6 +547,53 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 			endOffsetsAndScopes.push({ endOffset: 0, scopes: [] });
 		};
 
+		const brackets = (capture: QueryCapture, startOffset: number): number[] | undefined => {
+			return (capture.name.includes('punctuation') && capture.text) ? Array.from(capture.text.matchAll(BRACKETS)).map(match => startOffset + match.index) : undefined;
+		};
+
+		const addCurrentTokenToArray = (capture: QueryCapture, startOffset: number, endOffset: number, position?: number) => {
+			if (position !== undefined) {
+				const oldScopes = endOffsetsAndScopes[position].scopes;
+				let oldBracket = endOffsetsAndScopes[position].bracket;
+				// Check that the previous token ends at the same point that the current token starts
+				const prevEndOffset = position > 0 ? endOffsetsAndScopes[position - 1].endOffset : 0;
+				if (prevEndOffset !== startOffset) {
+					let preInsertBracket: number[] | undefined = undefined;
+					if (oldBracket && oldBracket.length > 0) {
+						preInsertBracket = [];
+						const postInsertBracket: number[] = [];
+						for (let i = 0; i < oldBracket.length; i++) {
+							const bracket = oldBracket[i];
+							if (bracket < startOffset) {
+								preInsertBracket.push(bracket);
+							} else if (bracket > endOffset) {
+								postInsertBracket.push(bracket);
+							}
+						}
+						if (preInsertBracket.length === 0) {
+							preInsertBracket = undefined;
+						}
+						if (postInsertBracket.length === 0) {
+							oldBracket = undefined;
+						} else {
+							oldBracket = postInsertBracket;
+						}
+					}
+					// We need to add some of the position token to cover the space
+					endOffsetsAndScopes.splice(position, 0, { endOffset: startOffset, scopes: [...oldScopes], bracket: preInsertBracket });
+					position++;
+					increaseSizeOfTokensByOneToken();
+					tokenIndex++;
+				}
+
+				endOffsetsAndScopes.splice(position, 0, { endOffset: endOffset, scopes: [...oldScopes, capture.name], bracket: brackets(capture, startOffset) });
+				endOffsetsAndScopes[tokenIndex].bracket = oldBracket;
+			} else {
+				endOffsetsAndScopes[tokenIndex] = { endOffset: endOffset, scopes: [capture.name], bracket: brackets(capture, startOffset) };
+			}
+			tokenIndex++;
+		};
+
 		for (let captureIndex = 0; captureIndex < captures.length; captureIndex++) {
 			const capture = captures[captureIndex];
 			const tokenEndIndex = capture.node.endIndex < rangeEndOffset ? ((capture.node.endIndex < rangeStartOffset) ? rangeStartOffset : capture.node.endIndex) : rangeEndOffset;
@@ -577,52 +624,6 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 				continue;
 			}
 
-			const brackets = (): number[] | undefined => {
-				return (capture.name.includes('punctuation') && capture.text) ? Array.from(capture.text.matchAll(BRACKETS)).map(match => startOffset + match.index) : undefined;
-			};
-
-			const addCurrentTokenToArray = (position?: number) => {
-				if (position !== undefined) {
-					let oldBracket = endOffsetsAndScopes[position].bracket;
-					// Check that the previous token ends at the same point that the current token starts
-					const prevEndOffset = position > 0 ? endOffsetsAndScopes[position - 1].endOffset : 0;
-					if (prevEndOffset !== startOffset) {
-						let preInsertBracket: number[] | undefined = undefined;
-						if (oldBracket && oldBracket.length > 0) {
-							preInsertBracket = [];
-							const postInsertBracket: number[] = [];
-							for (let i = 0; i < oldBracket.length; i++) {
-								const bracket = oldBracket[i];
-								if (bracket < startOffset) {
-									preInsertBracket.push(bracket);
-								} else if (bracket > endOffset) {
-									postInsertBracket.push(bracket);
-								}
-							}
-							if (preInsertBracket.length === 0) {
-								preInsertBracket = undefined;
-							}
-							if (postInsertBracket.length === 0) {
-								oldBracket = undefined;
-							} else {
-								oldBracket = postInsertBracket;
-							}
-						}
-						// We need to add some of the position token to cover the space
-						endOffsetsAndScopes.splice(position, 0, { endOffset: startOffset, scopes: [...endOffsetsAndScopes[position].scopes], bracket: preInsertBracket });
-						position++;
-						increaseSizeOfTokensByOneToken();
-						tokenIndex++;
-					}
-
-					endOffsetsAndScopes.splice(position, 0, { endOffset: endOffset, scopes: [capture.name], bracket: brackets() });
-					endOffsetsAndScopes[tokenIndex].bracket = oldBracket;
-				} else {
-					endOffsetsAndScopes[tokenIndex] = { endOffset: endOffset, scopes: [capture.name], bracket: brackets() };
-				}
-				tokenIndex++;
-			};
-
 			if (previousEndOffset >= endOffset) {
 				// walk back through the tokens until we find the one that contains the current token
 				let withinTokenIndex = tokenIndex - 1;
@@ -634,13 +635,13 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 					// Check that the current token doesn't just replace the last token
 					if ((previousTokenStartOffset + currentTokenLength) === previousTokenEndOffset) {
 						if (previousTokenStartOffset === startOffset) {
-							// Current token and previous token span the exact same characters, replace the last scope
-							endOffsetsAndScopes[withinTokenIndex].scopes[endOffsetsAndScopes[withinTokenIndex].scopes.length - 1] = capture.name;
-							endOffsetsAndScopes[withinTokenIndex].bracket = brackets();
+							// Current token and previous token span the exact same characters, add the scopes to the previous token
+							endOffsetsAndScopes[withinTokenIndex].scopes.push(capture.name);
+							const oldBracket = endOffsetsAndScopes[withinTokenIndex].bracket;
+							endOffsetsAndScopes[withinTokenIndex].bracket = ((oldBracket && (oldBracket.length > 0)) ? oldBracket : brackets(capture, startOffset));
 						}
 					} else if (previousTokenStartOffset <= startOffset) {
-						// The current token is within the previous token. Adjust the end of the previous token
-						addCurrentTokenToArray(withinTokenIndex);
+						addCurrentTokenToArray(capture, startOffset, endOffset, withinTokenIndex);
 						break;
 					}
 					withinTokenIndex--;
@@ -649,7 +650,7 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 				} while (previousTokenEndOffset > startOffset);
 			} else {
 				// Just add the token to the array
-				addCurrentTokenToArray();
+				addCurrentTokenToArray(capture, startOffset, endOffset);
 			}
 		}
 

From fb3a36133e2ac9d0e3a0f7451007c35f3ecd8e20 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Wed, 5 Mar 2025 12:28:46 +0100
Subject: [PATCH 0649/1815] Removing double slash from wtihin regex in onEnter
 rule (#242679)

removing double slash from wtihin regex in onEnter rule
---
 extensions/javascript/javascript-language-configuration.json | 2 +-
 extensions/typescript-basics/language-configuration.json     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/javascript/javascript-language-configuration.json b/extensions/javascript/javascript-language-configuration.json
index c2444c453b2b..20827982072c 100644
--- a/extensions/javascript/javascript-language-configuration.json
+++ b/extensions/javascript/javascript-language-configuration.json
@@ -231,7 +231,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "(?<!\\w:)\/\/.*"
+				"pattern": "(?<!\\\\)(?<!\\w:)\/\/.*"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/typescript-basics/language-configuration.json b/extensions/typescript-basics/language-configuration.json
index e7fadc46b723..844c8189d9f5 100644
--- a/extensions/typescript-basics/language-configuration.json
+++ b/extensions/typescript-basics/language-configuration.json
@@ -249,7 +249,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "(?<!\\w:)\/\/.*"
+				"pattern": "(?<!\\\\)(?<!\\w:)\/\/.*"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"

From 8bd5b18f436f059512dc969c2bad6a529ad3ed06 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Wed, 5 Mar 2025 12:35:49 +0100
Subject: [PATCH 0650/1815] Treesitter makes window stop responding when chat
 emits codeblocks (#242678)

Fixes #242583
---
 .../model/treeSitterTokenStoreService.ts      | 66 ++++++++++---------
 .../editor/common/model/treeSitterTokens.ts   |  2 +
 .../treeSitterTokenizationFeature.test.ts     |  3 +
 3 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/src/vs/editor/common/model/treeSitterTokenStoreService.ts b/src/vs/editor/common/model/treeSitterTokenStoreService.ts
index d0fa8b42c6d4..2af45e39bd3f 100644
--- a/src/vs/editor/common/model/treeSitterTokenStoreService.ts
+++ b/src/vs/editor/common/model/treeSitterTokenStoreService.ts
@@ -9,10 +9,12 @@ import { TokenQuality, TokenStore, TokenUpdate } from './tokenStore.js';
 import { InstantiationType, registerSingleton } from '../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { IModelContentChangedEvent } from '../textModelEvents.js';
 
 export interface ITreeSitterTokenizationStoreService {
 	readonly _serviceBrand: undefined;
 	setTokens(model: ITextModel, tokens: TokenUpdate[], tokenQuality: TokenQuality): void;
+	handleContentChanged(model: ITextModel, e: IModelContentChangedEvent): void;
 	getTokens(model: ITextModel, line: number): Uint32Array | undefined;
 	updateTokens(model: ITextModel, version: number, updates: { oldRangeLength?: number; newTokens: TokenUpdate[] }[], tokenQuality: TokenQuality): void;
 	markForRefresh(model: ITextModel, range: Range): void;
@@ -42,37 +44,6 @@ class TreeSitterTokenizationStoreService implements ITreeSitterTokenizationStore
 		this.tokens.set(model, { store: store, accurateVersion: model.getVersionId(), disposables, guessVersion: model.getVersionId() });
 
 		store.buildStore(tokens, tokenQuality);
-		disposables.add(model.onDidChangeContent(e => {
-			const storeInfo = this.tokens.get(model);
-			if (!storeInfo) {
-				return;
-			}
-
-			storeInfo.guessVersion = e.versionId;
-			for (const change of e.changes) {
-				if (change.text.length > change.rangeLength) {
-					// If possible, use the token before the change as the starting point for the new token.
-					// This is more likely to let the new text be the correct color as typeing is usually at the end of the token.
-					const offset = change.rangeOffset > 0 ? change.rangeOffset - 1 : change.rangeOffset;
-					const oldToken = storeInfo.store.getTokenAt(offset);
-					let newToken: TokenUpdate;
-					if (oldToken) {
-						// Insert. Just grow the token at this position to include the insert.
-						newToken = { startOffsetInclusive: oldToken.startOffsetInclusive, length: oldToken.length + change.text.length - change.rangeLength, token: oldToken.token };
-					} else {
-						// The document got larger and the change is at the end of the document.
-						newToken = { startOffsetInclusive: offset, length: change.text.length + 1, token: 0 };
-					}
-					storeInfo.store.update(oldToken?.length ?? 0, [newToken], TokenQuality.EditGuess);
-				} else if (change.text.length < change.rangeLength) {
-					// Delete. Delete the tokens at the corresponding range.
-					const deletedCharCount = change.rangeLength - change.text.length;
-					storeInfo.store.delete(deletedCharCount, change.rangeOffset);
-				}
-				const refreshLength = change.rangeLength > change.text.length ? change.rangeLength : change.text.length;
-				storeInfo.store.markForRefresh(change.rangeOffset, change.rangeOffset + refreshLength);
-			}
-		}));
 		disposables.add(model.onWillDispose(() => {
 			const storeInfo = this.tokens.get(model);
 			if (storeInfo) {
@@ -82,6 +53,39 @@ class TreeSitterTokenizationStoreService implements ITreeSitterTokenizationStore
 		}));
 	}
 
+	handleContentChanged(model: ITextModel, e: IModelContentChangedEvent): void {
+		const storeInfo = this.tokens.get(model);
+		if (!storeInfo) {
+			return;
+		}
+
+		storeInfo.guessVersion = e.versionId;
+		for (const change of e.changes) {
+			if (change.text.length > change.rangeLength) {
+				// If possible, use the token before the change as the starting point for the new token.
+				// This is more likely to let the new text be the correct color as typeing is usually at the end of the token.
+				const offset = change.rangeOffset > 0 ? change.rangeOffset - 1 : change.rangeOffset;
+				const oldToken = storeInfo.store.getTokenAt(offset);
+				let newToken: TokenUpdate;
+				if (oldToken) {
+					// Insert. Just grow the token at this position to include the insert.
+					newToken = { startOffsetInclusive: oldToken.startOffsetInclusive, length: oldToken.length + change.text.length - change.rangeLength, token: oldToken.token };
+				} else {
+					// The document got larger and the change is at the end of the document.
+					newToken = { startOffsetInclusive: offset, length: change.text.length + 1, token: 0 };
+				}
+				storeInfo.store.update(oldToken?.length ?? 0, [newToken], TokenQuality.EditGuess);
+			} else if (change.text.length < change.rangeLength) {
+				// Delete. Delete the tokens at the corresponding range.
+				const deletedCharCount = change.rangeLength - change.text.length;
+				storeInfo.store.delete(deletedCharCount, change.rangeOffset);
+			}
+			const refreshLength = change.rangeLength > change.text.length ? change.rangeLength : change.text.length;
+			storeInfo.store.markForRefresh(change.rangeOffset, change.rangeOffset + refreshLength);
+		}
+
+	}
+
 	rangeHasTokens(model: ITextModel, range: Range, minimumTokenQuality: TokenQuality): boolean {
 		const tokens = this.tokens.get(model);
 		if (!tokens) {
diff --git a/src/vs/editor/common/model/treeSitterTokens.ts b/src/vs/editor/common/model/treeSitterTokens.ts
index 1fe9c3cbb05c..321ee8d41f4a 100644
--- a/src/vs/editor/common/model/treeSitterTokens.ts
+++ b/src/vs/editor/common/model/treeSitterTokens.ts
@@ -88,6 +88,8 @@ export class TreeSitterTokens extends AbstractTokens {
 		if (e.isFlush) {
 			// Don't fire the event, as the view might not have got the text change event yet
 			this.resetTokenization(false);
+		} else {
+			this._tokenStore.handleContentChanged(this._textModel, e);
 		}
 	}
 
diff --git a/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts b/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts
index 54b2e1c28f65..5d59475c9186 100644
--- a/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts
+++ b/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts
@@ -49,6 +49,7 @@ import { TokenQuality, TokenUpdate } from '../../../editor/common/model/tokenSto
 import { ICodeEditorService } from '../../../editor/browser/services/codeEditorService.js';
 // eslint-disable-next-line local/code-layering, local/code-import-patterns
 import { TestCodeEditorService } from '../../../editor/test/browser/editorTestServices.js';
+import { IModelContentChangedEvent } from '../../../editor/common/textModelEvents.js';
 
 class MockTelemetryService implements ITelemetryService {
 	_serviceBrand: undefined;
@@ -75,6 +76,8 @@ class MockTokenStoreService implements ITreeSitterTokenizationStoreService {
 	delete(model: ITextModel): void {
 		throw new Error('Method not implemented.');
 	}
+	handleContentChanged(model: ITextModel, e: IModelContentChangedEvent): void {
+	}
 	rangeHasTokens(model: ITextModel, range: Range, minimumTokenQuality: TokenQuality): boolean {
 		return true;
 	}

From 5096b20241b60a6fee4357ed9cc3ffdb1cacbbd9 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Wed, 5 Mar 2025 13:27:58 +0100
Subject: [PATCH 0651/1815] NES insertion view cursor position fix (#242681)

fix https://github.com/microsoft/vscode-copilot/issues/13861
---
 .../browser/model/inlineCompletionsSource.ts  | 49 ++++++++++++++++---
 .../browser/view/ghostText/ghostTextView.ts   | 12 ++++-
 2 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
index d9d9f0e09912..2ba418658729 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
@@ -397,14 +397,11 @@ export class InlineCompletionWithUpdatedRange extends Disposable {
 				const endOffset = this._textModel.getOffsetAt(range.getEndPosition());
 				const originalRange = OffsetRange.ofStartAndLength(startOffset, endOffset - startOffset);
 
-				// TODO: EOL are not properly trimmed by the diffAlgorithm #12680
 				const replaceText = modifiedText.getValueOfRange(c.modifiedRange);
-				const oldText = this._textModel.getValueInRange(range);
-				if (replaceText.endsWith(eol) && oldText.endsWith(eol)) {
-					return new SingleOffsetEdit(originalRange.deltaEnd(-eol.length), replaceText.slice(0, -eol.length));
-				}
+				const originalText = this._textModel.getValueInRange(range);
+				const edit = new SingleOffsetEdit(originalRange, replaceText);
 
-				return new SingleOffsetEdit(originalRange, replaceText);
+				return reshapeEdit(edit, originalText, innerChanges.length, this._textModel);
 			})
 		);
 
@@ -784,3 +781,43 @@ export class StructuredLogger<T extends IRecordableLogEntry> extends Disposable
 export function observableContextKey<T>(key: string, contextKeyService: IContextKeyService): IObservable<T | undefined> {
 	return observableFromEvent(contextKeyService.onDidChangeContext, () => contextKeyService.getContextKeyValue<T>(key));
 }
+
+function reshapeEdit(edit: SingleOffsetEdit, originalText: string, totalInnerEdits: number, textModel: ITextModel): SingleOffsetEdit {
+	// TODO: EOL are not properly trimmed by the diffAlgorithm #12680
+	const eol = textModel.getEOL();
+	if (edit.newText.endsWith(eol) && originalText.endsWith(eol)) {
+		edit = new SingleOffsetEdit(edit.replaceRange.deltaEnd(-eol.length), edit.newText.slice(0, -eol.length));
+	}
+
+	// INSERTION
+	// 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)) {
+		edit = reshapeMultiLineInsertion(edit, textModel);
+	}
+
+	return edit;
+}
+
+function reshapeMultiLineInsertion(edit: SingleOffsetEdit, textModel: ITextModel): SingleOffsetEdit {
+	if (!edit.replaceRange.isEmpty) {
+		throw new BugIndicatingError('Unexpected original range');
+	}
+
+	if (edit.replaceRange.start === 0) {
+		return edit;
+	}
+
+	const eol = textModel.getEOL();
+	const startPosition = textModel.getPositionAt(edit.replaceRange.start);
+	const startColumn = startPosition.column;
+	const startLineNumber = startPosition.lineNumber;
+
+	// 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 (startColumn === 1 && startLineNumber > 1 && textModel.getLineLength(startLineNumber) !== 0 && edit.newText.endsWith(eol) && !edit.newText.startsWith(eol)) {
+		return new SingleOffsetEdit(edit.replaceRange.delta(-1), eol + edit.newText.slice(0, -eol.length));
+	}
+
+	return edit;
+}
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 9cf69b838666..d592eca09ea4 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
@@ -31,6 +31,7 @@ import { ColumnRange } from '../../utils.js';
 import { addDisposableListener, getWindow, isHTMLElement, n } from '../../../../../../base/browser/dom.js';
 import './ghostTextView.css';
 import { IMouseEvent, StandardMouseEvent } from '../../../../../../base/browser/mouseEvent.js';
+import { CodeEditorWidget } from '../../../../../browser/widget/codeEditor/codeEditorWidget.js';
 
 export interface IGhostTextWidgetModel {
 	readonly targetTextModel: IObservable<ITextModel | undefined>;
@@ -384,6 +385,8 @@ export class AdditionalLinesWidget extends Disposable {
 		this._store
 	);
 
+	private hasBeenAccepted = false;
+
 	constructor(
 		private readonly _editor: ICodeEditor,
 		private readonly _lines: IObservable<{
@@ -397,12 +400,17 @@ export class AdditionalLinesWidget extends Disposable {
 	) {
 		super();
 
+		if (this._editor instanceof CodeEditorWidget && this._shouldKeepCursorStable) {
+			this._register(this._editor.onBeforeExecuteEdit(e => this.hasBeenAccepted = e.source === 'inlineSuggestion.accept'));
+		}
+
 		this._register(autorun(reader => {
 			/** @description update view zone */
 			const lines = this._lines.read(reader);
 			this.editorOptionsChanged.read(reader);
 
 			if (lines) {
+				this.hasBeenAccepted = false;
 				this.updateLines(lines.lineNumber, lines.additionalLines, lines.minReservedLineCount);
 			} else {
 				this.clear();
@@ -479,7 +487,9 @@ export class AdditionalLinesWidget extends Disposable {
 		if (this._viewZoneInfo) {
 			changeAccessor.removeZone(this._viewZoneInfo.viewZoneId);
 
-			this.keepCursorStable(this._viewZoneInfo.lineNumber, -this._viewZoneInfo.heightInLines);
+			if (!this.hasBeenAccepted) {
+				this.keepCursorStable(this._viewZoneInfo.lineNumber, -this._viewZoneInfo.heightInLines);
+			}
 
 			this._viewZoneInfo = undefined;
 			this._viewZoneHeight.set(undefined, undefined);

From 4e83af859d0e328e2c03855bb0792cc916657577 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Wed, 5 Mar 2025 13:54:35 +0100
Subject: [PATCH 0652/1815] using promise in set has focus method

---
 .../editContext/native/nativeEditContext.ts   |  3 ++-
 .../native/nativeEditContextUtils.ts          | 24 ++++++++++++-------
 .../editor/common/viewModel/viewModelImpl.ts  | 16 +++++++++----
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
index a6f5d41ad094..217b7318f8ae 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
@@ -262,7 +262,8 @@ export class NativeEditContext extends AbstractEditContext {
 	}
 
 	public isFocused(): boolean {
-		return this._focusTracker.isFocused || (getActiveWindow().document.activeElement === this.textArea.domNode);
+		this.refreshFocusState();
+		return this._focusTracker.isFocused;
 	}
 
 	public focus(): void {
diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
index b3166de0437a..4189ae9c7584 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, getActiveWindow } from '../../../../../base/browser/dom.js';
+import { addDisposableListener, getActiveElement, getShadowRoot } from '../../../../../base/browser/dom.js';
 import { IDisposable, Disposable } from '../../../../../base/common/lifecycle.js';
 
 export interface ITypeData {
@@ -21,8 +21,12 @@ export class FocusTracker extends Disposable {
 		private readonly _onFocusChange: (newFocusValue: boolean) => void,
 	) {
 		super();
-		this._register(addDisposableListener(this._domNode, 'focus', () => this._handleFocusedChanged(true)));
-		this._register(addDisposableListener(this._domNode, 'blur', () => this._handleFocusedChanged(false)));
+		this._register(addDisposableListener(this._domNode, 'focus', () => {
+			this.refreshFocusState();
+		}));
+		this._register(addDisposableListener(this._domNode, 'blur', () => {
+			this._handleFocusedChanged(false);
+		}));
 	}
 
 	private _handleFocusedChanged(focused: boolean): void {
@@ -34,15 +38,19 @@ export class FocusTracker extends Disposable {
 	}
 
 	public focus(): void {
-		// fixes: https://github.com/microsoft/vscode/issues/228147
-		// Immediately call this method in order to directly set the field isFocused to true so the textInputFocus context key is evaluated correctly
-		this._handleFocusedChanged(true);
 		this._domNode.focus();
+		this.refreshFocusState();
 	}
 
 	public refreshFocusState(): void {
-		const focused = this._domNode === getActiveWindow().document.activeElement;
-		this._handleFocusedChanged(focused);
+		let activeElement: Element | null = null;
+		const shadowRoot = getShadowRoot(this._domNode);
+		if (shadowRoot) {
+			activeElement = shadowRoot.activeElement;
+		} else {
+			activeElement = getActiveElement();
+		}
+		this._handleFocusedChanged(activeElement === this._domNode);
 	}
 
 	get isFocused(): boolean {
diff --git a/src/vs/editor/common/viewModel/viewModelImpl.ts b/src/vs/editor/common/viewModel/viewModelImpl.ts
index 1db590850902..c9d642fc8af0 100644
--- a/src/vs/editor/common/viewModel/viewModelImpl.ts
+++ b/src/vs/editor/common/viewModel/viewModelImpl.ts
@@ -61,6 +61,8 @@ export class ViewModel extends Disposable implements IViewModel {
 	private readonly _decorations: ViewModelDecorations;
 	public readonly glyphLanes: IGlyphMarginLanesModel;
 
+	private _setHasFocusPromise: Promise<void> = Promise.resolve();
+
 	constructor(
 		editorId: number,
 		configuration: IEditorConfiguration,
@@ -209,11 +211,15 @@ export class ViewModel extends Disposable implements IViewModel {
 		this._attachedView.setVisibleLines(modelVisibleRanges, false);
 	}
 
-	public setHasFocus(hasFocus: boolean): void {
-		this._hasFocus = hasFocus;
-		this._cursor.setHasFocus(hasFocus);
-		this._eventDispatcher.emitSingleViewEvent(new viewEvents.ViewFocusChangedEvent(hasFocus));
-		this._eventDispatcher.emitOutgoingEvent(new FocusChangedEvent(!hasFocus, hasFocus));
+	public async setHasFocus(hasFocus: boolean): Promise<void> {
+		await this._setHasFocusPromise;
+		this._setHasFocusPromise = new Promise((resolve) => {
+			this._hasFocus = hasFocus;
+			this._cursor.setHasFocus(hasFocus);
+			this._eventDispatcher.emitSingleViewEvent(new viewEvents.ViewFocusChangedEvent(hasFocus));
+			this._eventDispatcher.emitOutgoingEvent(new FocusChangedEvent(!hasFocus, hasFocus));
+			resolve();
+		});
 	}
 
 	public onCompositionStart(): void {

From 9a834e6edfb188a397b247e546c6b7d765974f48 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Wed, 5 Mar 2025 15:37:28 +0100
Subject: [PATCH 0653/1815] only refreshing when isFocused is directly called

---
 .../browser/controller/editContext/native/nativeEditContext.ts   | 1 -
 src/vs/editor/browser/view.ts                                    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
index 217b7318f8ae..9666b4275384 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
@@ -262,7 +262,6 @@ export class NativeEditContext extends AbstractEditContext {
 	}
 
 	public isFocused(): boolean {
-		this.refreshFocusState();
 		return this._focusTracker.isFocused;
 	}
 
diff --git a/src/vs/editor/browser/view.ts b/src/vs/editor/browser/view.ts
index e2a992cd339a..e5fab9186f52 100644
--- a/src/vs/editor/browser/view.ts
+++ b/src/vs/editor/browser/view.ts
@@ -681,6 +681,7 @@ export class View extends ViewEventHandler {
 	}
 
 	public isFocused(): boolean {
+		this._editContext.refreshFocusState();
 		return this._editContext.isFocused();
 	}
 

From e4f9b0951d51c3c5b5c298ca9f3aa358c3fabc9a Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Wed, 5 Mar 2025 15:37:43 +0100
Subject: [PATCH 0654/1815] removing the promise

---
 src/vs/editor/common/viewModel/viewModelImpl.ts | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/vs/editor/common/viewModel/viewModelImpl.ts b/src/vs/editor/common/viewModel/viewModelImpl.ts
index c9d642fc8af0..1db590850902 100644
--- a/src/vs/editor/common/viewModel/viewModelImpl.ts
+++ b/src/vs/editor/common/viewModel/viewModelImpl.ts
@@ -61,8 +61,6 @@ export class ViewModel extends Disposable implements IViewModel {
 	private readonly _decorations: ViewModelDecorations;
 	public readonly glyphLanes: IGlyphMarginLanesModel;
 
-	private _setHasFocusPromise: Promise<void> = Promise.resolve();
-
 	constructor(
 		editorId: number,
 		configuration: IEditorConfiguration,
@@ -211,15 +209,11 @@ export class ViewModel extends Disposable implements IViewModel {
 		this._attachedView.setVisibleLines(modelVisibleRanges, false);
 	}
 
-	public async setHasFocus(hasFocus: boolean): Promise<void> {
-		await this._setHasFocusPromise;
-		this._setHasFocusPromise = new Promise((resolve) => {
-			this._hasFocus = hasFocus;
-			this._cursor.setHasFocus(hasFocus);
-			this._eventDispatcher.emitSingleViewEvent(new viewEvents.ViewFocusChangedEvent(hasFocus));
-			this._eventDispatcher.emitOutgoingEvent(new FocusChangedEvent(!hasFocus, hasFocus));
-			resolve();
-		});
+	public setHasFocus(hasFocus: boolean): void {
+		this._hasFocus = hasFocus;
+		this._cursor.setHasFocus(hasFocus);
+		this._eventDispatcher.emitSingleViewEvent(new viewEvents.ViewFocusChangedEvent(hasFocus));
+		this._eventDispatcher.emitOutgoingEvent(new FocusChangedEvent(!hasFocus, hasFocus));
 	}
 
 	public onCompositionStart(): void {

From 2368e6dc367c7210fde397a4eb73fcca499044df Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 5 Mar 2025 15:39:39 +0100
Subject: [PATCH 0655/1815] Revert "tests - enable API tests with test runner"
 (#242688)

Revert "tests - enable API tests with test runner (#241149)"

This reverts commit 8f2e1b22ed3620e81d2c2fa1aea343ef12580d5c.
---
 .vscode-test.js              |  25 +---
 scripts/test-integration.bat | 248 +++++++++++++++++------------------
 scripts/test-integration.sh  |   6 +-
 3 files changed, 131 insertions(+), 148 deletions(-)

diff --git a/.vscode-test.js b/.vscode-test.js
index 823ef615f4f7..917413ede2ac 100644
--- a/.vscode-test.js
+++ b/.vscode-test.js
@@ -19,7 +19,7 @@ const { defineConfig } = require('@vscode/test-cli');
  * A list of extension folders who have opted into tests, or configuration objects.
  * Edit me to add more!
  *
- * @type {Array<Partial<import("@vscode/test-cli").TestConfiguration> & { label: string }>}
+ * @type {Array<string | (Partial<import("@vscode/test-cli").TestConfiguration> & { label: string })>}
  */
 const extensions = [
 	{
@@ -65,20 +65,6 @@ const extensions = [
 	{
 		label: 'microsoft-authentication',
 		mocha: { timeout: 60_000 }
-	},
-	{
-		label: 'vscode-api-tests-folder',
-		extensionDevelopmentPath: `extensions/vscode-api-tests`,
-		workspaceFolder: `extensions/vscode-api-tests/testWorkspace`,
-		mocha: { timeout: 60_000 },
-		files: 'extensions/vscode-api-tests/out/singlefolder-tests/**/*.test.js',
-	},
-	{
-		label: 'vscode-api-tests-workspace',
-		extensionDevelopmentPath: `extensions/vscode-api-tests`,
-		workspaceFolder: `extensions/vscode-api-tests/testworkspace.code-workspace`,
-		mocha: { timeout: 60_000 },
-		files: 'extensions/vscode-api-tests/out/workspace-tests/**/*.test.js',
 	}
 ];
 
@@ -89,12 +75,9 @@ const defaultLaunchArgs = process.env.API_TESTS_EXTRA_ARGS?.split(' ') || [
 
 const config = defineConfig(extensions.map(extension => {
 	/** @type {import('@vscode/test-cli').TestConfiguration} */
-	const config = {
-		platform: 'desktop',
-		files: `extensions/${extension.label}/out/**/*.test.js`,
-		extensionDevelopmentPath: `extensions/${extension.label}`,
-		...extension,
-	};
+	const config = typeof extension === 'object'
+		? { files: `extensions/${extension.label}/out/**/*.test.js`, ...extension }
+		: { files: `extensions/${extension}/out/**/*.test.js`, label: extension };
 
 	config.mocha ??= {};
 	if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat
index 24a754d3b293..b59cceada070 100644
--- a/scripts/test-integration.bat
+++ b/scripts/test-integration.bat
@@ -1,124 +1,124 @@
-@echo off
-setlocal
-
-pushd %~dp0\..
-
-set VSCODEUSERDATADIR=%TEMP%\vscodeuserfolder-%RANDOM%-%TIME:~6,2%
-set VSCODECRASHDIR=%~dp0\..\.build\crashes
-set VSCODELOGSDIR=%~dp0\..\.build\logs\integration-tests
-
-:: Figure out which Electron to use for running tests
-if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
-	chcp 65001
-	set INTEGRATION_TEST_ELECTRON_PATH=.\scripts\code.bat
-	set VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE=1
-
-	echo Running integration tests out of sources.
-) else (
-	set VSCODE_CLI=1
-	set ELECTRON_ENABLE_LOGGING=1
-
-	echo Running integration tests with '%INTEGRATION_TEST_ELECTRON_PATH%' as build.
-)
-
-echo Storing crash reports into '%VSCODECRASHDIR%'.
-echo Storing log files into '%VSCODELOGSDIR%'.
-
-
-:: Unit tests
-
-echo.
-echo ### node.js integration tests
-call .\scripts\test.bat --runGlob **\*.integrationTest.js %*
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-
-:: Tests in the extension host
-
-set API_TESTS_EXTRA_ARGS=--disable-telemetry --skip-welcome --skip-release-notes --crash-reporter-directory=%VSCODECRASHDIR% --logsPath=%VSCODELOGSDIR% --no-cached-data --disable-updates --use-inmemory-secretstorage --disable-extensions --disable-workspace-trust --user-data-dir=%VSCODEUSERDATADIR%
-
-echo.
-echo ### API tests (folder)
-call npm run test-extension -- -l vscode-api-tests-folder --enable-proposed-api=vscode.vscode-api-tests %API_TESTS_EXTRA_ARGS%
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### API tests (workspace)
-call npm run test-extension -- -l vscode-api-tests-workspace --enable-proposed-api=vscode.vscode-api-tests %API_TESTS_EXTRA_ARGS%
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### Colorize tests
-call npm run test-extension -- -l vscode-colorize-tests
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### Terminal Suggest tests
-call npm run test-extension -- -l terminal-suggest --enable-proposed-api=vscode.vscode-api-tests
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### TypeScript tests
-call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\typescript-language-features\test-workspace --extensionDevelopmentPath=%~dp0\..\extensions\typescript-language-features --extensionTestsPath=%~dp0\..\extensions\typescript-language-features\out\test\unit %API_TESTS_EXTRA_ARGS%
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### Markdown tests
-call npm run test-extension -- -l markdown-language-features
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### Emmet tests
-call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\emmet\test-workspace --extensionDevelopmentPath=%~dp0\..\extensions\emmet --extensionTestsPath=%~dp0\..\extensions\emmet\out\test %API_TESTS_EXTRA_ARGS%
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### Git tests
-for /f "delims=" %%i in ('node -p "require('fs').realpathSync.native(require('os').tmpdir())"') do set TEMPDIR=%%i
-set GITWORKSPACE=%TEMPDIR%\git-%RANDOM%
-mkdir %GITWORKSPACE%
-call "%INTEGRATION_TEST_ELECTRON_PATH%" %GITWORKSPACE% --extensionDevelopmentPath=%~dp0\..\extensions\git --extensionTestsPath=%~dp0\..\extensions\git\out\test %API_TESTS_EXTRA_ARGS%
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### Ipynb tests
-call npm run test-extension -- -l ipynb
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### Notebook Output tests
-call npm run test-extension -- -l notebook-renderers
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### Configuration editing tests
-set CFWORKSPACE=%TEMPDIR%\cf-%RANDOM%
-mkdir %CFWORKSPACE%
-call npm run test-extension -- -l configuration-editing
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### GitHub Authentication tests
-call npm run test-extension -- -l github-authentication
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-:: Tests standalone (CommonJS)
-
-echo.
-echo ### CSS tests
-call %~dp0\node-electron.bat %~dp0\..\extensions\css-language-features/server/test/index.js
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo.
-echo ### HTML tests
-call %~dp0\node-electron.bat %~dp0\..\extensions\html-language-features/server/test/index.js
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-
-:: Cleanup
-
-rmdir /s /q %VSCODEUSERDATADIR%
-
-popd
-
-endlocal
+@echo off
+setlocal
+
+pushd %~dp0\..
+
+set VSCODEUSERDATADIR=%TEMP%\vscodeuserfolder-%RANDOM%-%TIME:~6,2%
+set VSCODECRASHDIR=%~dp0\..\.build\crashes
+set VSCODELOGSDIR=%~dp0\..\.build\logs\integration-tests
+
+:: Figure out which Electron to use for running tests
+if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" (
+	chcp 65001
+	set INTEGRATION_TEST_ELECTRON_PATH=.\scripts\code.bat
+	set VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE=1
+
+	echo Running integration tests out of sources.
+) else (
+	set VSCODE_CLI=1
+	set ELECTRON_ENABLE_LOGGING=1
+
+	echo Running integration tests with '%INTEGRATION_TEST_ELECTRON_PATH%' as build.
+)
+
+echo Storing crash reports into '%VSCODECRASHDIR%'.
+echo Storing log files into '%VSCODELOGSDIR%'.
+
+
+:: Unit tests
+
+echo.
+echo ### node.js integration tests
+call .\scripts\test.bat --runGlob **\*.integrationTest.js %*
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+
+:: Tests in the extension host
+
+set API_TESTS_EXTRA_ARGS=--disable-telemetry --skip-welcome --skip-release-notes --crash-reporter-directory=%VSCODECRASHDIR% --logsPath=%VSCODELOGSDIR% --no-cached-data --disable-updates --use-inmemory-secretstorage --disable-extensions --disable-workspace-trust --user-data-dir=%VSCODEUSERDATADIR%
+
+echo.
+echo ### API tests (folder)
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-api-tests\testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-api-tests --extensionTestsPath=%~dp0\..\extensions\vscode-api-tests\out\singlefolder-tests %API_TESTS_EXTRA_ARGS%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### API tests (workspace)
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-api-tests\testworkspace.code-workspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=%~dp0\..\extensions\vscode-api-tests --extensionTestsPath=%~dp0\..\extensions\vscode-api-tests\out\workspace-tests %API_TESTS_EXTRA_ARGS%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Colorize tests
+call npm run test-extension -- -l vscode-colorize-tests
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Terminal Suggest tests
+call npm run test-extension -- -l terminal-suggest --enable-proposed-api=vscode.vscode-api-tests
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### TypeScript tests
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\typescript-language-features\test-workspace --extensionDevelopmentPath=%~dp0\..\extensions\typescript-language-features --extensionTestsPath=%~dp0\..\extensions\typescript-language-features\out\test\unit %API_TESTS_EXTRA_ARGS%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Markdown tests
+call npm run test-extension -- -l markdown-language-features
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Emmet tests
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\emmet\test-workspace --extensionDevelopmentPath=%~dp0\..\extensions\emmet --extensionTestsPath=%~dp0\..\extensions\emmet\out\test %API_TESTS_EXTRA_ARGS%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Git tests
+for /f "delims=" %%i in ('node -p "require('fs').realpathSync.native(require('os').tmpdir())"') do set TEMPDIR=%%i
+set GITWORKSPACE=%TEMPDIR%\git-%RANDOM%
+mkdir %GITWORKSPACE%
+call "%INTEGRATION_TEST_ELECTRON_PATH%" %GITWORKSPACE% --extensionDevelopmentPath=%~dp0\..\extensions\git --extensionTestsPath=%~dp0\..\extensions\git\out\test %API_TESTS_EXTRA_ARGS%
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Ipynb tests
+call npm run test-extension -- -l ipynb
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Notebook Output tests
+call npm run test-extension -- -l notebook-renderers
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### Configuration editing tests
+set CFWORKSPACE=%TEMPDIR%\cf-%RANDOM%
+mkdir %CFWORKSPACE%
+call npm run test-extension -- -l configuration-editing
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### GitHub Authentication tests
+call npm run test-extension -- -l github-authentication
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+:: Tests standalone (CommonJS)
+
+echo.
+echo ### CSS tests
+call %~dp0\node-electron.bat %~dp0\..\extensions\css-language-features/server/test/index.js
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo.
+echo ### HTML tests
+call %~dp0\node-electron.bat %~dp0\..\extensions\html-language-features/server/test/index.js
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+
+:: Cleanup
+
+rmdir /s /q %VSCODEUSERDATADIR%
+
+popd
+
+endlocal
diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh
index 01c002fe07bf..890064803089 100755
--- a/scripts/test-integration.sh
+++ b/scripts/test-integration.sh
@@ -55,13 +55,13 @@ fi
 echo
 echo "### API tests (folder)"
 echo
-npm run test-extension -- -l vscode-api-tests-folder --enable-proposed-api=vscode.vscode-api-tests $API_TESTS_EXTRA_ARGS
+"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/vscode-api-tests/testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/singlefolder-tests $API_TESTS_EXTRA_ARGS
 kill_app
 
 echo
 echo "### API tests (workspace)"
 echo
-npm run test-extension -- -l vscode-api-tests-workspace --enable-proposed-api=vscode.vscode-api-tests $API_TESTS_EXTRA_ARGS
+"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/vscode-api-tests/testworkspace.code-workspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/workspace-tests $API_TESTS_EXTRA_ARGS
 kill_app
 
 echo
@@ -71,7 +71,7 @@ npm run test-extension -- -l vscode-colorize-tests
 kill_app
 
 echo
-echo "### Terminal Suggest tests"
+echo "### Terminal Suggest tests" 
 echo
 npm run test-extension -- -l terminal-suggest --enable-proposed-api=vscode.vscode-api-tests
 kill_app

From bfafb935b257843b38e8fff96799d47a0a943995 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Wed, 5 Mar 2025 09:41:49 -0500
Subject: [PATCH 0656/1815] Merge pull request #242585 from
 microsoft/embarrassing-snail

ensure alias value is used for spec when generating completions
---
 extensions/terminal-suggest/src/fig/figInterface.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/extensions/terminal-suggest/src/fig/figInterface.ts b/extensions/terminal-suggest/src/fig/figInterface.ts
index 6e351a8952e4..524b29f7413d 100644
--- a/extensions/terminal-suggest/src/fig/figInterface.ts
+++ b/extensions/terminal-suggest/src/fig/figInterface.ts
@@ -16,7 +16,7 @@ import type { ICompletionResource } from '../types';
 import { osIsWindows } from '../helpers/os';
 import { removeAnyFileExtension } from '../helpers/file';
 import type { EnvironmentVariable } from './api-bindings/types';
-import { asArray } from '../terminalSuggestMain';
+import { asArray, availableSpecs } from '../terminalSuggestMain';
 import { IFigExecuteExternals } from './execute';
 
 export interface IFigSpecSuggestionsResult {
@@ -54,8 +54,8 @@ export async function getFigSuggestions(
 		}
 		for (const specLabel of specLabels) {
 			const availableCommand = (osIsWindows()
-				? availableCommands.find(command => (command.definitionCommand ?? (typeof command.label === 'string' ? command.label : command.label.label)).match(new RegExp(`${specLabel}(\\.[^ ]+)?$`)))
-				: availableCommands.find(command => (command.definitionCommand ?? (typeof command.label === 'string' ? command.label : command.label.label) === (specLabel))));
+				? availableCommands.find(command => (typeof command.label === 'string' ? command.label : command.label.label).match(new RegExp(`${specLabel}(\\.[^ ]+)?$`)))
+				: availableCommands.find(command => (typeof command.label === 'string' ? command.label : command.label.label) === (specLabel)));
 			if (!availableCommand || (token && token.isCancellationRequested)) {
 				continue;
 			}
@@ -89,7 +89,11 @@ export async function getFigSuggestions(
 				continue;
 			}
 
-			const completionItemResult = await getFigSpecSuggestions(spec, terminalContext, prefix, shellIntegrationCwd, env, name, executeExternals, token);
+			const actualSpec = availableCommand.definitionCommand ? availableSpecs.find(s => s.name === availableCommand.definitionCommand) : spec;
+			if (!actualSpec) {
+				continue;
+			}
+			const completionItemResult = await getFigSpecSuggestions(actualSpec, terminalContext, prefix, shellIntegrationCwd, env, name, executeExternals, token);
 			result.hasCurrentArg ||= !!completionItemResult?.hasCurrentArg;
 			if (completionItemResult) {
 				result.filesRequested ||= completionItemResult.filesRequested;

From 9e4fa923f46f28722ce4bf42fe689f4cb10487b5 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 5 Mar 2025 16:00:09 +0100
Subject: [PATCH 0657/1815] quick pick - fix leak (#242690)

---
 .../quickAccess/browser/gotoSymbolQuickAccess.ts       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts b/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
index a6e7a7434589..b4f95f7158ef 100644
--- a/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
+++ b/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.ts
@@ -9,7 +9,7 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { IMatch } from '../../../../base/common/filters.js';
 import { IPreparedQuery, pieceToQuery, prepareQuery, scoreFuzzy2 } from '../../../../base/common/fuzzyScorer.js';
-import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { format, trim } from '../../../../base/common/strings.js';
 import { IRange, Range } from '../../../common/core/range.js';
 import { ScrollType } from '../../../common/editorCommon.js';
@@ -169,21 +169,21 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 		const symbolsPromise = this.getDocumentSymbols(model, token);
 
 		// Set initial picks and update on type
-		let picksCts: CancellationTokenSource | undefined = undefined;
+		const picksCts = disposables.add(new MutableDisposable<CancellationTokenSource>());
 		const updatePickerItems = async (positionToEnclose: Position | undefined) => {
 
 			// Cancel any previous ask for picks and busy
-			picksCts?.dispose(true);
+			picksCts?.value?.cancel();
 			picker.busy = false;
 
 			// Create new cancellation source for this run
-			picksCts = new CancellationTokenSource(token);
+			picksCts.value = new CancellationTokenSource();
 
 			// Collect symbol picks
 			picker.busy = true;
 			try {
 				const query = prepareQuery(picker.value.substr(AbstractGotoSymbolQuickAccessProvider.PREFIX.length).trim());
-				const items = await this.doGetSymbolPicks(symbolsPromise, query, undefined, picksCts.token, model);
+				const items = await this.doGetSymbolPicks(symbolsPromise, query, undefined, picksCts.value.token, model);
 				if (token.isCancellationRequested) {
 					return;
 				}

From 6d98db08819f07a8541bfb396be1b0e6819f5d71 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 5 Mar 2025 17:40:46 +0100
Subject: [PATCH 0658/1815] Copilot status: further polish the experience (fix
 #242548) (#242705)

* Copilot status: further polish the experience (fix #242548)

* remove redundancy
---
 .../contrib/chat/browser/chatSetup.ts         | 53 +++++------
 .../contrib/chat/browser/chatStatus.ts        | 71 ++++++++++----
 .../contrib/chat/browser/media/chatStatus.css | 93 ++++++++++---------
 3 files changed, 126 insertions(+), 91 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 7189ecfdf0b8..67221131bb5c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -561,37 +561,31 @@ class ChatSetupWelcomeContent extends Disposable {
 		// Header
 		{
 			const header = localize({ key: 'header', comment: ['{Locked="[Copilot]({0})"}'] }, "[Copilot]({0}) is your AI pair programmer.", this.context.state.installed ? 'command:github.copilot.open.walkthrough' : defaultChat.documentationUrl);
-			this.element.appendChild($('p')).appendChild(this._register(markdown.render(new MarkdownString(header, { isTrusted: true }))).element);
-
-			const featuresParent = this.element.appendChild($('div.chat-features-container'));
-			this.element.appendChild(featuresParent);
-
-			const featuresContainer = this.element.appendChild($('div'));
-			featuresParent.appendChild(featuresContainer);
-
-			const featureChatContainer = featuresContainer.appendChild($('div.chat-feature-container'));
-			featureChatContainer.appendChild(renderIcon(Codicon.code));
-
-			const featureChatLabel = featureChatContainer.appendChild($('span'));
-			featureChatLabel.textContent = localize('featureChat', "Code faster with Completions");
-
-			const featureEditsContainer = featuresContainer.appendChild($('div.chat-feature-container'));
-			featureEditsContainer.appendChild(renderIcon(Codicon.editSession));
-
-			const featureEditsLabel = featureEditsContainer.appendChild($('span'));
-			featureEditsLabel.textContent = localize('featureEdits', "Build features with Copilot Edits");
-
-			const featureExploreContainer = featuresContainer.appendChild($('div.chat-feature-container'));
-			featureExploreContainer.appendChild(renderIcon(Codicon.commentDiscussion));
-
-			const featureExploreLabel = featureExploreContainer.appendChild($('span'));
-			featureExploreLabel.textContent = localize('featureExplore', "Explore your codebase with Chat");
+			this.element.appendChild($('p', undefined, this._register(markdown.render(new MarkdownString(header, { isTrusted: true }))).element));
+
+			this.element.appendChild(
+				$('div.chat-features-container', undefined,
+					$('div', undefined,
+						$('div.chat-feature-container', undefined,
+							renderIcon(Codicon.code),
+							$('span', undefined, localize('featureChat', "Code faster with Completions"))
+						),
+						$('div.chat-feature-container', undefined,
+							renderIcon(Codicon.editSession),
+							$('span', undefined, localize('featureEdits', "Build features with Copilot Edits"))
+						),
+						$('div.chat-feature-container', undefined,
+							renderIcon(Codicon.commentDiscussion),
+							$('span', undefined, localize('featureExplore', "Explore your codebase with Chat"))
+						)
+					)
+				)
+			);
 		}
 
 		// Limited SKU
 		const free = localize({ key: 'free', comment: ['{Locked="[]({0})"}'] }, "$(sparkle-filled) We now offer [Copilot for free]({0}).", defaultChat.skusDocumentationUrl);
-		const freeContainer = this.element.appendChild($('p'));
-		freeContainer.appendChild(this._register(markdown.render(new MarkdownString(free, { isTrusted: true, supportThemeIcons: true }))).element);
+		const freeContainer = this.element.appendChild($('p', undefined, this._register(markdown.render(new MarkdownString(free, { isTrusted: true, supportThemeIcons: true }))).element));
 
 		// Setup Button
 		const buttonContainer = this.element.appendChild($('p'));
@@ -610,12 +604,11 @@ class ChatSetupWelcomeContent extends Disposable {
 
 		// Terms
 		const terms = localize({ key: 'terms', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "By continuing, you agree to the [Terms]({0}) and [Privacy Policy]({1}).", defaultChat.termsStatementUrl, defaultChat.privacyStatementUrl);
-		this.element.appendChild($('p')).appendChild(this._register(markdown.render(new MarkdownString(terms, { isTrusted: true }))).element);
+		this.element.appendChild($('p', undefined, this._register(markdown.render(new MarkdownString(terms, { isTrusted: true }))).element));
 
 		// SKU Settings
 		const settings = localize({ key: 'settings', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "Copilot Free and Pro may show [public code]({0}) suggestions and we may use your data for product improvement. You can change these [settings]({1}) at any time.", defaultChat.publicCodeMatchesUrl, defaultChat.manageSettingsUrl);
-		const settingsContainer = this.element.appendChild($('p'));
-		settingsContainer.appendChild(this._register(markdown.render(new MarkdownString(settings, { isTrusted: true }))).element);
+		const settingsContainer = this.element.appendChild($('p', undefined, this._register(markdown.render(new MarkdownString(settings, { isTrusted: true }))).element));
 
 		// Update based on model state
 		this._register(Event.runAndSubscribe(this.controller.onDidChange, () => this.update(freeContainer, settingsContainer, button)));
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index eae9aa7f39b5..2187eea59e6b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -11,9 +11,9 @@ import { localize } from '../../../../nls.js';
 import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowTooltipCommand, StatusbarAlignment, StatusbarEntryKind, TooltipContent } from '../../../services/statusbar/browser/statusbar.js';
+import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowTooltipCommand, StatusbarAlignment, StatusbarEntryKind } from '../../../services/statusbar/browser/statusbar.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, TOGGLE_CHAT_ACTION_ID, CHAT_OPEN_ACTION_ID } from './actions/chatActions.js';
+import { OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, CHAT_OPEN_ACTION_ID } from './actions/chatActions.js';
 import { $, addDisposableListener, append, clearNode, EventHelper, EventLike, EventType } from '../../../../base/browser/dom.js';
 import { ChatEntitlement, ChatEntitlementService, IChatEntitlementService } from '../common/chatEntitlementService.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
@@ -38,6 +38,8 @@ 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 { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Codicon } from '../../../../base/common/codicons.js';
 
 //#region --- colors
 
@@ -161,19 +163,13 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		let text = '$(copilot)';
 		let ariaLabel = localize('chatStatus', "Copilot Status");
 		let command: string | Command = ShowTooltipCommand;
-		let tooltip: TooltipContent = { element: token => this.dashboard.value.show(token) };
 		let kind: StatusbarEntryKind | undefined;
 
 		const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatEntitlementService.quotas;
 
-		// Copilot Not Installed
-		if (
-			this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.installed.key) === false ||
-			this.chatEntitlementService.entitlement === ChatEntitlement.Available
-		) {
-			tooltip = CHAT_SETUP_ACTION_LABEL.value;
-			ariaLabel = tooltip;
-			command = TOGGLE_CHAT_ACTION_ID;
+		// New User
+		if (isNewUser(this.contextKeyService, this.chatEntitlementService)) {
+			ariaLabel = CHAT_SETUP_ACTION_LABEL.value;
 		}
 
 		// Signed out
@@ -209,7 +205,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			command,
 			showInAllWindows: true,
 			kind,
-			tooltip
+			tooltip: { element: token => this.dashboard.value.show(token) }
 		};
 	}
 
@@ -221,6 +217,11 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	}
 }
 
+function isNewUser(contextKeyService: IContextKeyService, chatEntitlementService: IChatEntitlementService): boolean {
+	return contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.installed.key) === false ||	// copilot not installed
+		chatEntitlementService.entitlement === ChatEntitlement.Available;								// not yet signed up to copilot
+}
+
 class ChatStatusDashboard extends Disposable {
 
 	private readonly element = $('div.chat-status-bar-entry-tooltip');
@@ -247,8 +248,36 @@ class ChatStatusDashboard extends Disposable {
 		const disposables = this.entryDisposables.value = new DisposableStore();
 		disposables.add(token.onCancellationRequested(() => disposables.dispose()));
 
+		// New to Copilot
+		if (isNewUser(this.contextKeyService, this.chatEntitlementService)) {
+			this.element.appendChild($('div.header', undefined, localize('setupCopilotForFreeHeader', "Use AI Features with Copilot")));
+
+			this.element.appendChild(
+				$('div', undefined,
+					$('div.chat-feature-container', undefined,
+						renderIcon(Codicon.code),
+						$('span', undefined, localize('featureChat', "Code faster with Completions"))
+					),
+					$('div.chat-feature-container', undefined,
+						renderIcon(Codicon.editSession),
+						$('span', undefined, localize('featureEdits', "Build features with Copilot Edits"))
+					),
+					$('div.chat-feature-container', undefined,
+						renderIcon(Codicon.commentDiscussion),
+						$('span', undefined, localize('featureExplore', "Explore your codebase with Chat"))
+					)
+				)
+			);
+
+			const setupCopilotButton = disposables.add(new Button(this.element, { ...defaultButtonStyles }));
+			setupCopilotButton.label = localize('setupCopilotForFreeButton', "Setup Copilot for Free");
+			disposables.add(setupCopilotButton.onDidClick(() => this.runCommandAndClose('workbench.action.chat.triggerSetup')));
+
+			this.element.appendChild($('hr'));
+		}
+
 		// Quota Indicator
-		if (this.chatEntitlementService.entitlement === ChatEntitlement.Limited) {
+		else if (this.chatEntitlementService.entitlement === ChatEntitlement.Limited) {
 			const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate, chatQuotaExceeded, completionsQuotaExceeded } = this.chatEntitlementService.quotas;
 
 			this.element.appendChild($('div.header', undefined, localize('usageTitle', "Copilot Free Usage")));
@@ -261,7 +290,7 @@ class ChatStatusDashboard extends Disposable {
 			if (chatQuotaExceeded || completionsQuotaExceeded) {
 				const upgradePlanButton = disposables.add(new Button(this.element, { ...defaultButtonStyles }));
 				upgradePlanButton.label = localize('upgradeToCopilotPro', "Upgrade to Copilot Pro");
-				disposables.add(upgradePlanButton.onDidClick(() => this.commandService.executeCommand('workbench.action.chat.upgradePlan')));
+				disposables.add(upgradePlanButton.onDidClick(() => this.runCommandAndClose('workbench.action.chat.upgradePlan')));
 			}
 
 			(async () => {
@@ -280,14 +309,14 @@ class ChatStatusDashboard extends Disposable {
 		}
 
 		// Settings
-		{
+		if (!isNewUser(this.contextKeyService, this.chatEntitlementService)) {
 			this.element.appendChild($('div.header', undefined, localize('settingsTitle', "Settings")));
 			this.createSettings(this.element, disposables);
+			this.element.appendChild($('hr'));
 		}
 
 		// Shortcuts
 		{
-			this.element.appendChild($('hr'));
 			this.element.appendChild($('div.header', undefined, localize('keybindingsTitle', "Keybindings")));
 			this.createShortcuts(this.element, disposables);
 		}
@@ -295,6 +324,11 @@ class ChatStatusDashboard extends Disposable {
 		return this.element;
 	}
 
+	private runCommandAndClose(commandId: string): void {
+		this.commandService.executeCommand(commandId);
+		this.hoverService.hideHover(true);
+	}
+
 	private createQuotaIndicator(container: HTMLElement, total: number | undefined, remaining: number | undefined, label: string): (total: number | undefined, remaining: number | undefined) => void {
 		const quotaText = $('span');
 		const quotaBit = $('div.quota-bit');
@@ -416,14 +450,13 @@ class ChatStatusDashboard extends Disposable {
 				EditorContextKeys.writable,
 				EditorContextKeys.editorSimpleInput.negate()
 			)) ? { text: localize('shortcuts.inlineChat', "Inline Chat"), id: 'inlineChat.start' } : undefined,
-			{ text: localize('shortcuts.quickChat', "Quick Chat"), id: 'workbench.action.quickchat.toggle' },
+			!isNewUser(this.contextKeyService, this.chatEntitlementService) ? { text: localize('shortcuts.quickChat', "Quick Chat"), id: 'workbench.action.quickchat.toggle' } : undefined,
 		]);
 
 		const onTrigger = (commandId: string, e: EventLike) => {
 			EventHelper.stop(e, true);
 
-			this.hoverService.hideHover(true);
-			this.commandService.executeCommand(commandId);
+			this.runCommandAndClose(commandId);
 		};
 
 		for (const entry of entries) {
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
index dfa1fc08335e..738856913cf0 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
@@ -30,6 +30,57 @@
 	margin-bottom: 4px;
 }
 
+/* Setup for New User */
+
+.chat-feature-container {
+	display: flex;
+	align-items: center;
+	gap: 5px;
+	padding: 4px;
+}
+
+/* Quota Indicator */
+
+.chat-status-bar-entry-tooltip .quota-indicator {
+	margin-bottom: 6px;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator .quota-label {
+	display: flex;
+	justify-content: space-between;
+	margin-bottom: 3px;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator .quota-bar {
+	width: 100%;
+	height: 4px;
+	background-color: var(--vscode-gauge-foreground);
+	border-radius: 4px;
+	border: 1px solid var(--vscode-gauge-border);
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator .quota-bar .quota-bit {
+	height: 100%;
+	background-color: var(--vscode-gauge-background);
+	border-radius: 4px;
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.warning .quota-bar {
+	background-color: var(--vscode-gauge-warningForeground);
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.warning .quota-bar .quota-bit {
+	background-color: var(--vscode-gauge-warningBackground);
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.error .quota-bar {
+	background-color: var(--vscode-gauge-errorForeground);
+}
+
+.chat-status-bar-entry-tooltip .quota-indicator.error .quota-bar .quota-bit {
+	background-color: var(--vscode-gauge-errorBackground);
+}
+
 /* Settings */
 
 .chat-status-bar-entry-tooltip .settings {
@@ -95,45 +146,3 @@
 .chat-status-bar-entry-tooltip .shortcuts .shortcut .shortcut-value {
 	color: var(--vscode-descriptionForeground);
 }
-
-/* Quota Indicator */
-
-.chat-status-bar-entry-tooltip .quota-indicator {
-	margin-bottom: 6px;
-}
-
-.chat-status-bar-entry-tooltip .quota-indicator .quota-label {
-	display: flex;
-	justify-content: space-between;
-	margin-bottom: 3px;
-}
-
-.chat-status-bar-entry-tooltip .quota-indicator .quota-bar {
-	width: 100%;
-	height: 4px;
-	background-color: var(--vscode-gauge-foreground);
-	border-radius: 4px;
-	border: 1px solid var(--vscode-gauge-border);
-}
-
-.chat-status-bar-entry-tooltip .quota-indicator .quota-bar .quota-bit {
-	height: 100%;
-	background-color: var(--vscode-gauge-background);
-	border-radius: 4px;
-}
-
-.chat-status-bar-entry-tooltip .quota-indicator.warning .quota-bar {
-	background-color: var(--vscode-gauge-warningForeground);
-}
-
-.chat-status-bar-entry-tooltip .quota-indicator.warning .quota-bar .quota-bit {
-	background-color: var(--vscode-gauge-warningBackground);
-}
-
-.chat-status-bar-entry-tooltip .quota-indicator.error .quota-bar {
-	background-color: var(--vscode-gauge-errorForeground);
-}
-
-.chat-status-bar-entry-tooltip .quota-indicator.error .quota-bar .quota-bit {
-	background-color: var(--vscode-gauge-errorBackground);
-}

From dfcb5f367c9ba990170d1709ecd662c1da8cf9d2 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Wed, 5 Mar 2025 18:37:10 +0100
Subject: [PATCH 0659/1815] Night Owl Light appears much more blue with Tree
 Sitter highlighting (#242058)

* Night Owl Light appears much more blue with Tree Sitter highlighting
Fixes #241887

* Fix template strings

* Fix tests

* Fix tests
---
 .../test-241001_ts.json                       |  306 ++--
 .../test-function-inv_ts.json                 |   36 +-
 .../test-issue11_ts.json                      |  440 ++---
 .../test-issue5431_ts.json                    |   66 +-
 .../test-issue5465_ts.json                    |   36 +-
 .../test-issue5566_ts.json                    |   50 +-
 .../test-jsdoc-multiline-type_ts.json         |   36 +-
 .../test-keywords_ts.json                     |   28 +-
 .../test-members_ts.json                      |   44 +-
 .../test-object-literals_ts.json              |   34 +-
 .../test-strings_ts.json                      |   76 +-
 .../test-this_ts.json                         |   16 +-
 .../colorize-tree-sitter-results/test_ts.json | 1422 ++++++++---------
 .../languages/highlights/typescript.scm       |  204 +--
 .../browser/treeSitterTokenizationFeature.ts  |    2 +-
 .../treeSitterTokenizationFeature.test.ts     |  125 +-
 16 files changed, 1474 insertions(+), 1447 deletions(-)

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 95914c5db4ef..296cc9092daa 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
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "const",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "n",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "null",
-		"t": "constant.language.null",
+		"t": "constant.language.null.ts",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "const",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "u",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "undefined",
-		"t": "constant.language.undefined",
+		"t": "constant.language.undefined.ts",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": "const",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "a",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "true",
-		"t": "constant.language.boolean.true",
+		"t": "constant.language.boolean.true.ts",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": "||",
-		"t": "keyword.operator.logical",
+		"t": "keyword.operator.logical.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": "false",
-		"t": "constant.language.boolean.false",
+		"t": "constant.language.boolean.false.ts",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -225,7 +225,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -239,7 +239,7 @@
 	},
 	{
 		"c": "type",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -253,7 +253,7 @@
 	},
 	{
 		"c": "T",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -267,7 +267,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -281,7 +281,7 @@
 	},
 	{
 		"c": "null",
-		"t": "constant.language.null support.type.builtin",
+		"t": "constant.language.null.ts support.type.builtin.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -295,7 +295,7 @@
 	},
 	{
 		"c": "|",
-		"t": "keyword.operator keyword.operator.type",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": "unknown",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -323,7 +323,7 @@
 	},
 	{
 		"c": "|",
-		"t": "keyword.operator keyword.operator.type",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -337,7 +337,7 @@
 	},
 	{
 		"c": "undefined",
-		"t": "constant.language.undefined support.type.builtin",
+		"t": "constant.language.undefined.ts support.type.builtin.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -351,7 +351,7 @@
 	},
 	{
 		"c": "|",
-		"t": "keyword.operator keyword.operator.type",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -365,7 +365,7 @@
 	},
 	{
 		"c": "true",
-		"t": "constant.language.boolean.true support.type.builtin",
+		"t": "constant.language.boolean.true.ts support.type.builtin.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -379,7 +379,7 @@
 	},
 	{
 		"c": "|",
-		"t": "keyword.operator keyword.operator.type",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -393,7 +393,7 @@
 	},
 	{
 		"c": "false",
-		"t": "constant.language.boolean.false support.type.builtin",
+		"t": "constant.language.boolean.false.ts support.type.builtin.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -407,7 +407,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -421,7 +421,7 @@
 	},
 	{
 		"c": "function",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -435,7 +435,7 @@
 	},
 	{
 		"c": "bar",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -449,7 +449,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -463,7 +463,7 @@
 	},
 	{
 		"c": "a",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -477,7 +477,7 @@
 	},
 	{
 		"c": "?",
-		"t": "punctuation.delimiter keyword.operator.optional",
+		"t": "punctuation.delimiter.ts keyword.operator.optional.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -491,7 +491,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -505,7 +505,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -519,7 +519,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -533,7 +533,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -547,7 +547,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -561,7 +561,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -575,7 +575,7 @@
 	},
 	{
 		"c": "return",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -589,7 +589,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts punctuation.definition.string.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -603,7 +603,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts punctuation.definition.string.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -617,7 +617,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -631,7 +631,7 @@
 	},
 	{
 		"c": "interface",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -645,7 +645,7 @@
 	},
 	{
 		"c": "A",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -659,7 +659,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -673,7 +673,7 @@
 	},
 	{
 		"c": "b",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -687,7 +687,7 @@
 	},
 	{
 		"c": "?",
-		"t": "punctuation.delimiter keyword.operator.optional",
+		"t": "punctuation.delimiter.ts keyword.operator.optional.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -701,7 +701,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -715,7 +715,7 @@
 	},
 	{
 		"c": "2",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -729,7 +729,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -743,7 +743,7 @@
 	},
 	{
 		"c": "a",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -757,7 +757,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -771,7 +771,7 @@
 	},
 	{
 		"c": "1",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -785,7 +785,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -799,7 +799,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -813,7 +813,7 @@
 	},
 	{
 		"c": "const",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -827,7 +827,7 @@
 	},
 	{
 		"c": "obj",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -841,7 +841,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -855,7 +855,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -869,7 +869,7 @@
 	},
 	{
 		"c": "a",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -883,7 +883,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -897,7 +897,7 @@
 	},
 	{
 		"c": "1",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -911,7 +911,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -925,7 +925,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -939,7 +939,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -953,7 +953,7 @@
 	},
 	{
 		"c": "const",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -967,7 +967,7 @@
 	},
 	{
 		"c": "obj1",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -981,7 +981,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -995,7 +995,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1009,7 +1009,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1023,7 +1023,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1037,7 +1037,7 @@
 	},
 	{
 		"c": "const",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1051,7 +1051,7 @@
 	},
 	{
 		"c": "obj2",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1065,7 +1065,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1079,7 +1079,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1093,7 +1093,7 @@
 	},
 	{
 		"c": "...",
-		"t": "keyword.operator.spread",
+		"t": "keyword.operator.spread.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1107,7 +1107,7 @@
 	},
 	{
 		"c": "obj1",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1121,7 +1121,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1135,7 +1135,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1149,7 +1149,7 @@
 	},
 	{
 		"c": "function",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1163,7 +1163,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1177,7 +1177,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1191,7 +1191,7 @@
 	},
 	{
 		"c": "param",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1205,7 +1205,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1219,7 +1219,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1233,7 +1233,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1247,7 +1247,7 @@
 	},
 	{
 		"c": "...",
-		"t": "keyword.operator.rest",
+		"t": "keyword.operator.rest.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1261,7 +1261,7 @@
 	},
 	{
 		"c": "rest",
-		"t": "variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1275,7 +1275,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1289,7 +1289,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1303,7 +1303,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1317,7 +1317,7 @@
 	},
 	{
 		"c": "undefined",
-		"t": "constant.language.undefined",
+		"t": "constant.language.undefined.ts",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -1331,7 +1331,7 @@
 	},
 	{
 		"c": "null",
-		"t": "constant.language.null",
+		"t": "constant.language.null.ts",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -1345,7 +1345,7 @@
 	},
 	{
 		"c": "NaN",
-		"t": "variable constant.language.nan",
+		"t": "variable.ts constant.language.nan.ts",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -1359,7 +1359,7 @@
 	},
 	{
 		"c": "Infinity",
-		"t": "variable constant.language.infinity",
+		"t": "variable.ts constant.language.infinity.ts",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -1373,7 +1373,7 @@
 	},
 	{
 		"c": "type",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1387,7 +1387,7 @@
 	},
 	{
 		"c": "One",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1401,7 +1401,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1415,7 +1415,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1429,7 +1429,7 @@
 	},
 	{
 		"c": "zcxvf",
-		"t": "string",
+		"t": "string.quoted.single.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1443,7 +1443,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1457,7 +1457,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1471,7 +1471,7 @@
 	},
 	{
 		"c": "type",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1485,7 +1485,7 @@
 	},
 	{
 		"c": "Two",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1499,7 +1499,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1513,7 +1513,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1527,7 +1527,7 @@
 	},
 	{
 		"c": "one",
-		"t": "string",
+		"t": "string.quoted.single.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1541,7 +1541,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1555,7 +1555,7 @@
 	},
 	{
 		"c": "|",
-		"t": "keyword.operator keyword.operator.type",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1569,7 +1569,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1583,7 +1583,7 @@
 	},
 	{
 		"c": "two",
-		"t": "string",
+		"t": "string.quoted.single.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1597,7 +1597,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1611,7 +1611,7 @@
 	},
 	{
 		"c": "&",
-		"t": "keyword.operator keyword.operator.type",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1625,7 +1625,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1639,7 +1639,7 @@
 	},
 	{
 		"c": "three",
-		"t": "string",
+		"t": "string.quoted.single.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1653,7 +1653,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1667,7 +1667,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1681,7 +1681,7 @@
 	},
 	{
 		"c": "const",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1695,7 +1695,7 @@
 	},
 	{
 		"c": "obj",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1709,7 +1709,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1723,7 +1723,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1737,7 +1737,7 @@
 	},
 	{
 		"c": "one",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1751,7 +1751,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1765,7 +1765,7 @@
 	},
 	{
 		"c": "1",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -1779,7 +1779,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1793,7 +1793,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1807,7 +1807,7 @@
 	},
 	{
 		"c": "type",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1821,7 +1821,7 @@
 	},
 	{
 		"c": "Rec",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1835,7 +1835,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1849,7 +1849,7 @@
 	},
 	{
 		"c": "Record",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1863,7 +1863,7 @@
 	},
 	{
 		"c": "<",
-		"t": "punctuation.definition.typeparameters",
+		"t": "punctuation.definition.typeparameters.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1877,7 +1877,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1891,7 +1891,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1905,7 +1905,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1919,7 +1919,7 @@
 	},
 	{
 		"c": ">",
-		"t": "punctuation.definition.typeparameters",
+		"t": "punctuation.definition.typeparameters.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1933,7 +1933,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1947,7 +1947,7 @@
 	},
 	{
 		"c": "new",
-		"t": "new.expr keyword.operator.new",
+		"t": "new.expr.ts keyword.operator.new.ts",
 		"r": {
 			"dark_plus": "keyword.operator.new: #569CD6",
 			"light_plus": "keyword.operator.new: #0000FF",
@@ -1961,7 +1961,7 @@
 	},
 	{
 		"c": "URL",
-		"t": "new.expr variable entity.name.function",
+		"t": "new.expr.ts variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1975,7 +1975,7 @@
 	},
 	{
 		"c": "(",
-		"t": "new.expr punctuation",
+		"t": "new.expr.ts punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1989,7 +1989,7 @@
 	},
 	{
 		"c": "'",
-		"t": "new.expr string",
+		"t": "new.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -2003,7 +2003,7 @@
 	},
 	{
 		"c": "./../../renderer/dist/index.html",
-		"t": "new.expr string",
+		"t": "new.expr.ts string.quoted.single.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -2017,7 +2017,7 @@
 	},
 	{
 		"c": "'",
-		"t": "new.expr string",
+		"t": "new.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -2031,7 +2031,7 @@
 	},
 	{
 		"c": ",",
-		"t": "new.expr punctuation.delimiter",
+		"t": "new.expr.ts punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2045,7 +2045,7 @@
 	},
 	{
 		"c": "import",
-		"t": "new.expr keyword.control",
+		"t": "new.expr.ts keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -2059,7 +2059,7 @@
 	},
 	{
 		"c": ".",
-		"t": "new.expr punctuation.delimiter",
+		"t": "new.expr.ts punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2073,7 +2073,7 @@
 	},
 	{
 		"c": "meta",
-		"t": "new.expr",
+		"t": "new.expr.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2087,7 +2087,7 @@
 	},
 	{
 		"c": ".",
-		"t": "new.expr punctuation.delimiter",
+		"t": "new.expr.ts punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2101,7 +2101,7 @@
 	},
 	{
 		"c": "url",
-		"t": "new.expr variable",
+		"t": "new.expr.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2115,7 +2115,7 @@
 	},
 	{
 		"c": ")",
-		"t": "new.expr punctuation",
+		"t": "new.expr.ts punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2129,7 +2129,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json
index cffeb46fdca8..046a20d140a9 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "rowData",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "push",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": "callback",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "new",
-		"t": "new.expr keyword.operator.new",
+		"t": "new.expr.ts keyword.operator.new.ts",
 		"r": {
 			"dark_plus": "keyword.operator.new: #569CD6",
 			"light_plus": "keyword.operator.new: #0000FF",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "new.expr variable entity.name.function",
+		"t": "new.expr.ts variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "(",
-		"t": "new.expr punctuation",
+		"t": "new.expr.ts punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "row",
-		"t": "new.expr variable",
+		"t": "new.expr.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": ",",
-		"t": "new.expr punctuation.delimiter",
+		"t": "new.expr.ts punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "col",
-		"t": "new.expr variable",
+		"t": "new.expr.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": ",",
-		"t": "new.expr punctuation.delimiter",
+		"t": "new.expr.ts punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "false",
-		"t": "new.expr constant.language.boolean.false",
+		"t": "new.expr.ts constant.language.boolean.false.ts",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": ")",
-		"t": "new.expr punctuation",
+		"t": "new.expr.ts punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -225,7 +225,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -239,7 +239,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
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 45691a1ce198..f34090b7b826 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
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "let",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "keyCode",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "0",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "if",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "!",
-		"t": "keyword.operator.logical",
+		"t": "keyword.operator.logical.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "keyCode",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": "===",
-		"t": "keyword.operator.logical",
+		"t": "keyword.operator.logical.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "8",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": "||",
-		"t": "keyword.operator.logical",
+		"t": "keyword.operator.logical.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": "keyCode",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": ">=",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -225,7 +225,7 @@
 	},
 	{
 		"c": "48",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -239,7 +239,7 @@
 	},
 	{
 		"c": "&&",
-		"t": "keyword.operator.logical",
+		"t": "keyword.operator.logical.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -253,7 +253,7 @@
 	},
 	{
 		"c": "keyCode",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -267,7 +267,7 @@
 	},
 	{
 		"c": "<=",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -281,7 +281,7 @@
 	},
 	{
 		"c": "57",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -295,7 +295,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -323,7 +323,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -337,7 +337,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -351,7 +351,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -365,7 +365,7 @@
 	},
 	{
 		"c": "for",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -379,7 +379,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -393,7 +393,7 @@
 	},
 	{
 		"c": "let",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -407,7 +407,7 @@
 	},
 	{
 		"c": "i",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -421,7 +421,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -435,7 +435,7 @@
 	},
 	{
 		"c": "0",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -449,7 +449,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -463,7 +463,7 @@
 	},
 	{
 		"c": "i",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -477,7 +477,7 @@
 	},
 	{
 		"c": "<",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -491,7 +491,7 @@
 	},
 	{
 		"c": "5",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -505,7 +505,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -519,7 +519,7 @@
 	},
 	{
 		"c": "i",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -533,7 +533,7 @@
 	},
 	{
 		"c": "++",
-		"t": "keyword.operator.increment",
+		"t": "keyword.operator.increment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -547,7 +547,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -561,7 +561,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -575,7 +575,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -589,7 +589,7 @@
 	},
 	{
 		"c": "for",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -603,7 +603,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -617,7 +617,7 @@
 	},
 	{
 		"c": "var",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -631,7 +631,7 @@
 	},
 	{
 		"c": "i",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -645,7 +645,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -659,7 +659,7 @@
 	},
 	{
 		"c": "0",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -673,7 +673,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -687,7 +687,7 @@
 	},
 	{
 		"c": "i",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -701,7 +701,7 @@
 	},
 	{
 		"c": "<",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -715,7 +715,7 @@
 	},
 	{
 		"c": "5",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -729,7 +729,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -743,7 +743,7 @@
 	},
 	{
 		"c": "i",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -757,7 +757,7 @@
 	},
 	{
 		"c": "++",
-		"t": "keyword.operator.increment",
+		"t": "keyword.operator.increment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -771,7 +771,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -785,7 +785,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -799,7 +799,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -813,7 +813,7 @@
 	},
 	{
 		"c": "for",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -827,7 +827,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -841,7 +841,7 @@
 	},
 	{
 		"c": "let",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -855,7 +855,7 @@
 	},
 	{
 		"c": "i",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -869,7 +869,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -883,7 +883,7 @@
 	},
 	{
 		"c": "0",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -897,7 +897,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -911,7 +911,7 @@
 	},
 	{
 		"c": "i",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -925,7 +925,7 @@
 	},
 	{
 		"c": "<",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -939,7 +939,7 @@
 	},
 	{
 		"c": "5",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -953,7 +953,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -967,7 +967,7 @@
 	},
 	{
 		"c": "i",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -981,7 +981,7 @@
 	},
 	{
 		"c": "++",
-		"t": "keyword.operator.increment",
+		"t": "keyword.operator.increment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -995,7 +995,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1009,7 +1009,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1023,7 +1023,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1037,7 +1037,7 @@
 	},
 	{
 		"c": "for",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1051,7 +1051,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1065,7 +1065,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1079,7 +1079,7 @@
 	},
 	{
 		"c": "i",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1093,7 +1093,7 @@
 	},
 	{
 		"c": "<",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1107,7 +1107,7 @@
 	},
 	{
 		"c": "5",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -1121,7 +1121,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1135,7 +1135,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1149,7 +1149,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1163,7 +1163,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1177,7 +1177,7 @@
 	},
 	{
 		"c": "for",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1191,7 +1191,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1205,7 +1205,7 @@
 	},
 	{
 		"c": "let",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1219,7 +1219,7 @@
 	},
 	{
 		"c": "i",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1233,7 +1233,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1247,7 +1247,7 @@
 	},
 	{
 		"c": "0",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -1261,7 +1261,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1275,7 +1275,7 @@
 	},
 	{
 		"c": "1",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -1289,7 +1289,7 @@
 	},
 	{
 		"c": "+",
-		"t": "keyword.operator.arithmetic",
+		"t": "keyword.operator.arithmetic.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1303,7 +1303,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1317,7 +1317,7 @@
 	},
 	{
 		"c": "i",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1331,7 +1331,7 @@
 	},
 	{
 		"c": "<<",
-		"t": "keyword.operator",
+		"t": "keyword.operator.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1345,7 +1345,7 @@
 	},
 	{
 		"c": "5",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -1359,7 +1359,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1373,7 +1373,7 @@
 	},
 	{
 		"c": "<",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1387,7 +1387,7 @@
 	},
 	{
 		"c": "5",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -1401,7 +1401,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1415,7 +1415,7 @@
 	},
 	{
 		"c": "i",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1429,7 +1429,7 @@
 	},
 	{
 		"c": "++",
-		"t": "keyword.operator.increment",
+		"t": "keyword.operator.increment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1443,7 +1443,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1457,7 +1457,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1471,7 +1471,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1485,7 +1485,7 @@
 	},
 	{
 		"c": "var",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1499,7 +1499,7 @@
 	},
 	{
 		"c": "p",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1513,7 +1513,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1527,7 +1527,7 @@
 	},
 	{
 		"c": "1",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -1541,7 +1541,7 @@
 	},
 	{
 		"c": "?",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "punctuation.delimiter.ts keyword.operator.ternary.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1555,7 +1555,7 @@
 	},
 	{
 		"c": "2",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -1569,7 +1569,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "punctuation.delimiter.ts keyword.operator.ternary.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1583,7 +1583,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1597,7 +1597,7 @@
 	},
 	{
 		"c": "3",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -1611,7 +1611,7 @@
 	},
 	{
 		"c": "<",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1625,7 +1625,7 @@
 	},
 	{
 		"c": "4",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -1639,7 +1639,7 @@
 	},
 	{
 		"c": "?",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "punctuation.delimiter.ts keyword.operator.ternary.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1653,7 +1653,7 @@
 	},
 	{
 		"c": "5",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -1667,7 +1667,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "punctuation.delimiter.ts keyword.operator.ternary.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1681,7 +1681,7 @@
 	},
 	{
 		"c": "6",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -1695,7 +1695,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1709,7 +1709,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1723,7 +1723,7 @@
 	},
 	{
 		"c": "class",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1737,7 +1737,7 @@
 	},
 	{
 		"c": "A",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1765,7 +1765,7 @@
 	},
 	{
 		"c": "X",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1779,7 +1779,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1793,7 +1793,7 @@
 	},
 	{
 		"c": "Y",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1821,7 +1821,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1835,7 +1835,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1849,7 +1849,7 @@
 	},
 	{
 		"c": "class",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1863,7 +1863,7 @@
 	},
 	{
 		"c": "A1",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1891,7 +1891,7 @@
 	},
 	{
 		"c": "T",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1905,7 +1905,7 @@
 	},
 	{
 		"c": "extends",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -1919,7 +1919,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1933,7 +1933,7 @@
 	},
 	{
 		"c": "a",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1947,7 +1947,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1961,7 +1961,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1975,7 +1975,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1989,7 +1989,7 @@
 	},
 	{
 		"c": "=>",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -2003,7 +2003,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -2017,7 +2017,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2045,7 +2045,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2059,7 +2059,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2073,7 +2073,7 @@
 	},
 	{
 		"c": "class",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -2087,7 +2087,7 @@
 	},
 	{
 		"c": "B",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -2101,7 +2101,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2115,7 +2115,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2129,7 +2129,7 @@
 	},
 	{
 		"c": "class",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -2143,7 +2143,7 @@
 	},
 	{
 		"c": "C",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -2157,7 +2157,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2171,7 +2171,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2185,7 +2185,7 @@
 	},
 	{
 		"c": "function",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -2199,7 +2199,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2227,7 +2227,7 @@
 	},
 	{
 		"c": "T",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -2255,7 +2255,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2269,7 +2269,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2283,7 +2283,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2297,7 +2297,7 @@
 	},
 	{
 		"c": "return",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -2311,7 +2311,7 @@
 	},
 	{
 		"c": "1",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -2325,7 +2325,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2339,7 +2339,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2353,7 +2353,7 @@
 	},
 	{
 		"c": "let",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -2367,7 +2367,7 @@
 	},
 	{
 		"c": "x1",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2381,7 +2381,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2395,7 +2395,7 @@
 	},
 	{
 		"c": "A",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -2409,7 +2409,7 @@
 	},
 	{
 		"c": "<",
-		"t": "punctuation.definition.typeparameters",
+		"t": "punctuation.definition.typeparameters.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2423,7 +2423,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2437,7 +2437,7 @@
 	},
 	{
 		"c": "param",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2451,7 +2451,7 @@
 	},
 	{
 		"c": "?",
-		"t": "punctuation.delimiter keyword.operator.optional",
+		"t": "punctuation.delimiter.ts keyword.operator.optional.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2465,7 +2465,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2479,7 +2479,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -2493,7 +2493,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2507,7 +2507,7 @@
 	},
 	{
 		"c": "=>",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -2521,7 +2521,7 @@
 	},
 	{
 		"c": "void",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -2535,7 +2535,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2549,7 +2549,7 @@
 	},
 	{
 		"c": "B",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -2563,7 +2563,7 @@
 	},
 	{
 		"c": ">",
-		"t": "punctuation.definition.typeparameters",
+		"t": "punctuation.definition.typeparameters.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2577,7 +2577,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2591,7 +2591,7 @@
 	},
 	{
 		"c": "let",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -2605,7 +2605,7 @@
 	},
 	{
 		"c": "x2",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2619,7 +2619,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2633,7 +2633,7 @@
 	},
 	{
 		"c": "A",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -2647,7 +2647,7 @@
 	},
 	{
 		"c": "<",
-		"t": "punctuation.definition.typeparameters",
+		"t": "punctuation.definition.typeparameters.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2661,7 +2661,7 @@
 	},
 	{
 		"c": "C",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -2675,7 +2675,7 @@
 	},
 	{
 		"c": "|",
-		"t": "keyword.operator keyword.operator.type",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2689,7 +2689,7 @@
 	},
 	{
 		"c": "B",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -2703,7 +2703,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2717,7 +2717,7 @@
 	},
 	{
 		"c": "C",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -2731,7 +2731,7 @@
 	},
 	{
 		"c": "&",
-		"t": "keyword.operator keyword.operator.type",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2745,7 +2745,7 @@
 	},
 	{
 		"c": "B",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -2759,7 +2759,7 @@
 	},
 	{
 		"c": ">",
-		"t": "punctuation.definition.typeparameters",
+		"t": "punctuation.definition.typeparameters.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2773,7 +2773,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2787,7 +2787,7 @@
 	},
 	{
 		"c": "const",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -2801,7 +2801,7 @@
 	},
 	{
 		"c": "t",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2815,7 +2815,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2829,7 +2829,7 @@
 	},
 	{
 		"c": "1",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -2843,7 +2843,7 @@
 	},
 	{
 		"c": "<",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2857,7 +2857,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2871,7 +2871,7 @@
 	},
 	{
 		"c": "5",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -2885,7 +2885,7 @@
 	},
 	{
 		"c": ">",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2899,7 +2899,7 @@
 	},
 	{
 		"c": "10",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -2913,7 +2913,7 @@
 	},
 	{
 		"c": "?",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "punctuation.delimiter.ts keyword.operator.ternary.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2927,7 +2927,7 @@
 	},
 	{
 		"c": "1",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -2941,7 +2941,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "punctuation.delimiter.ts keyword.operator.ternary.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2955,7 +2955,7 @@
 	},
 	{
 		"c": "2",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -2969,7 +2969,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2983,7 +2983,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2997,7 +2997,7 @@
 	},
 	{
 		"c": "var",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -3011,7 +3011,7 @@
 	},
 	{
 		"c": "f6",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3025,7 +3025,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -3039,7 +3039,7 @@
 	},
 	{
 		"c": "1",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -3053,7 +3053,7 @@
 	},
 	{
 		"c": "<",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -3067,7 +3067,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3081,7 +3081,7 @@
 	},
 	{
 		"c": "<",
-		"t": "punctuation.definition.typeparameters",
+		"t": "punctuation.definition.typeparameters.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3095,7 +3095,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -3109,7 +3109,7 @@
 	},
 	{
 		"c": ">",
-		"t": "punctuation.definition.typeparameters",
+		"t": "punctuation.definition.typeparameters.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3123,7 +3123,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3137,7 +3137,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3151,7 +3151,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
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 bcbec84c6672..a3ed92081038 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
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "function",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "isAll",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "startTime",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "endTime",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": "const",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "timeRange",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "isAll",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": "?",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "punctuation.delimiter.ts keyword.operator.ternary.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -225,7 +225,7 @@
 	},
 	{
 		"c": "所有时间",
-		"t": "string",
+		"t": "string.quoted.single.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -239,7 +239,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -253,7 +253,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "punctuation.delimiter.ts keyword.operator.ternary.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -267,7 +267,7 @@
 	},
 	{
 		"c": "`",
-		"t": "string",
+		"t": "string.template.ts punctuation.definition.string.template.begin.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -281,7 +281,7 @@
 	},
 	{
 		"c": "${",
-		"t": "string punctuation.definition.template-expression.begin",
+		"t": "string.template.ts punctuation.definition.template-expression.begin.ts",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
@@ -295,7 +295,7 @@
 	},
 	{
 		"c": "startTime",
-		"t": "string variable",
+		"t": "string.template.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": "}",
-		"t": "string punctuation punctuation.definition.template-expression.end",
+		"t": "string.template.ts punctuation.ts punctuation.definition.template-expression.end.ts",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
@@ -323,7 +323,7 @@
 	},
 	{
 		"c": " - ",
-		"t": "string",
+		"t": "string.template.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -337,7 +337,7 @@
 	},
 	{
 		"c": "${",
-		"t": "string punctuation.definition.template-expression.begin",
+		"t": "string.template.ts punctuation.definition.template-expression.begin.ts",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
@@ -351,7 +351,7 @@
 	},
 	{
 		"c": "endTime",
-		"t": "string variable",
+		"t": "string.template.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -365,7 +365,7 @@
 	},
 	{
 		"c": "}",
-		"t": "string punctuation punctuation.definition.template-expression.end",
+		"t": "string.template.ts punctuation.ts punctuation.definition.template-expression.end.ts",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
@@ -379,7 +379,7 @@
 	},
 	{
 		"c": "`",
-		"t": "string",
+		"t": "string.template.ts punctuation.definition.string.template.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -393,7 +393,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -407,7 +407,7 @@
 	},
 	{
 		"c": "return",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -421,7 +421,7 @@
 	},
 	{
 		"c": "true",
-		"t": "constant.language.boolean.true",
+		"t": "constant.language.boolean.true.ts",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -435,7 +435,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -449,7 +449,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
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 a7feac02ad5a..d89c57d852ab 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
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "function",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "foo2",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "yield",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "bar",
-		"t": "string",
+		"t": "string.quoted.single.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "yield",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "[",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": "bar",
-		"t": "string",
+		"t": "string.quoted.single.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -225,7 +225,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -239,7 +239,7 @@
 	},
 	{
 		"c": "]",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -253,7 +253,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -267,7 +267,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json
index 5df07bab772e..c1a632297c20 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "function",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "foo3",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "const",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "any",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": "=>",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -225,7 +225,7 @@
 	},
 	{
 		"c": "bar",
-		"t": "string",
+		"t": "string.quoted.single.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -239,7 +239,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -253,7 +253,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -267,7 +267,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -281,7 +281,7 @@
 	},
 	{
 		"c": "baz",
-		"t": "string",
+		"t": "string.quoted.single.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -295,7 +295,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -323,7 +323,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -337,7 +337,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-jsdoc-multiline-type_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-jsdoc-multiline-type_ts.json
index c10c6d0f46ec..32a1169366fb 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-jsdoc-multiline-type_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-jsdoc-multiline-type_ts.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "/**\n * @typedef {{\n *   id: number,\n *   fn: !Function,\n *   context: (!Object|undefined)\n * }}\n * @private\n */",
-		"t": "comment",
+		"t": "comment.ts",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "goog",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "dom",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "animationFrame",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "Task_",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "/**\n * @typedef {{\n *   measureTask: goog.dom.animationFrame.Task_,\n *   mutateTask: goog.dom.animationFrame.Task_,\n *   state: (!Object|undefined),\n *   args: (!Array|undefined),\n *   isScheduled: boolean\n * }}\n * @private\n */",
-		"t": "comment",
+		"t": "comment.ts",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": "goog",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": "dom",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": "animationFrame",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -225,7 +225,7 @@
 	},
 	{
 		"c": "TaskSet_",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -239,7 +239,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
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 f484d1f7efc1..6753ae3fa4c2 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
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "export",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "var",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "=>",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "new",
-		"t": "new.expr keyword.operator.new",
+		"t": "new.expr.ts keyword.operator.new.ts",
 		"r": {
 			"dark_plus": "keyword.operator.new: #569CD6",
 			"light_plus": "keyword.operator.new: #0000FF",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "RegExp",
-		"t": "new.expr variable entity.name.function",
+		"t": "new.expr.ts variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "(",
-		"t": "new.expr punctuation",
+		"t": "new.expr.ts punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": "'",
-		"t": "new.expr string",
+		"t": "new.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts punctuation.definition.string.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "'",
-		"t": "new.expr string",
+		"t": "new.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts punctuation.definition.string.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": ")",
-		"t": "new.expr punctuation",
+		"t": "new.expr.ts punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json
index 67fd0d52eb3d..c48a54b4fc3e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "class",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "A2",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "extends",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "B1",
-		"t": "variable entity.other.inherited-class",
+		"t": "variable.ts entity.other.inherited-class.ts",
 		"r": {
 			"dark_plus": "entity.other.inherited-class: #4EC9B0",
 			"light_plus": "entity.other.inherited-class: #267F99",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "public",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "count",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": "9",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": "public",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "resolveNextGeneration",
-		"t": "variable meta.definition.method entity.name.function",
+		"t": "variable.ts meta.definition.method.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -225,7 +225,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -239,7 +239,7 @@
 	},
 	{
 		"c": "A2",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -253,7 +253,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -267,7 +267,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -281,7 +281,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -295,7 +295,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-object-literals_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-object-literals_ts.json
index 27671c9cc248..ecc84c7516eb 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-object-literals_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-object-literals_ts.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "let",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "s1",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": "k",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "k1",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "s",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "k2",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "1",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -225,7 +225,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json
index c7fd2b14cfaf..15d340449e4a 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "var",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "x",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "`",
-		"t": "string",
+		"t": "string.template.ts punctuation.definition.string.template.begin.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": "Hello ",
-		"t": "string",
+		"t": "string.template.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "${",
-		"t": "string punctuation.definition.template-expression.begin",
+		"t": "string.template.ts punctuation.definition.template-expression.begin.ts",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "string variable",
+		"t": "string.template.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "}",
-		"t": "string punctuation punctuation.definition.template-expression.end",
+		"t": "string.template.ts punctuation.ts punctuation.definition.template-expression.end.ts",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "!",
-		"t": "string",
+		"t": "string.template.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "`",
-		"t": "string",
+		"t": "string.template.ts punctuation.definition.string.template.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "console",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "log",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": "`",
-		"t": "string",
+		"t": "string.template.ts punctuation.definition.string.template.begin.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -225,7 +225,7 @@
 	},
 	{
 		"c": "string text line 1\nstring text line 2",
-		"t": "string",
+		"t": "string.template.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -239,7 +239,7 @@
 	},
 	{
 		"c": "`",
-		"t": "string",
+		"t": "string.template.ts punctuation.definition.string.template.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -253,7 +253,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -267,7 +267,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -281,7 +281,7 @@
 	},
 	{
 		"c": "x",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -295,7 +295,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": "tag",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -323,7 +323,7 @@
 	},
 	{
 		"c": "`",
-		"t": "string",
+		"t": "string.template.ts punctuation.definition.string.template.begin.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -337,7 +337,7 @@
 	},
 	{
 		"c": "Hello ",
-		"t": "string",
+		"t": "string.template.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -351,7 +351,7 @@
 	},
 	{
 		"c": "${",
-		"t": "string punctuation.definition.template-expression.begin",
+		"t": "string.template.ts punctuation.definition.template-expression.begin.ts",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
@@ -365,7 +365,7 @@
 	},
 	{
 		"c": "a",
-		"t": "string variable",
+		"t": "string.template.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -379,7 +379,7 @@
 	},
 	{
 		"c": "+",
-		"t": "string keyword.operator.arithmetic",
+		"t": "string.template.ts keyword.operator.arithmetic.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -393,7 +393,7 @@
 	},
 	{
 		"c": "b",
-		"t": "string variable",
+		"t": "string.template.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -407,7 +407,7 @@
 	},
 	{
 		"c": "}",
-		"t": "string punctuation punctuation.definition.template-expression.end",
+		"t": "string.template.ts punctuation.ts punctuation.definition.template-expression.end.ts",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
@@ -421,7 +421,7 @@
 	},
 	{
 		"c": " world ",
-		"t": "string",
+		"t": "string.template.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -435,7 +435,7 @@
 	},
 	{
 		"c": "${",
-		"t": "string punctuation.definition.template-expression.begin",
+		"t": "string.template.ts punctuation.definition.template-expression.begin.ts",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.begin: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.begin: #0000FF",
@@ -449,7 +449,7 @@
 	},
 	{
 		"c": "a",
-		"t": "string variable",
+		"t": "string.template.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -463,7 +463,7 @@
 	},
 	{
 		"c": "*",
-		"t": "string keyword.operator.arithmetic",
+		"t": "string.template.ts keyword.operator.arithmetic.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -477,7 +477,7 @@
 	},
 	{
 		"c": "b",
-		"t": "string variable",
+		"t": "string.template.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -491,7 +491,7 @@
 	},
 	{
 		"c": "}",
-		"t": "string punctuation punctuation.definition.template-expression.end",
+		"t": "string.template.ts punctuation.ts punctuation.definition.template-expression.end.ts",
 		"r": {
 			"dark_plus": "punctuation.definition.template-expression.end: #569CD6",
 			"light_plus": "punctuation.definition.template-expression.end: #0000FF",
@@ -505,7 +505,7 @@
 	},
 	{
 		"c": "`",
-		"t": "string",
+		"t": "string.template.ts punctuation.definition.string.template.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -519,7 +519,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json
index f496120fdbad..aa495a54f95e 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-this_ts.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "9",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
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 39a4948db68c..d10dc8e4d44e 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
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "/* Game of Life\n * Implemented in TypeScript\n * To learn more about TypeScript, please visit http://www.typescriptlang.org/\n */",
-		"t": "comment",
+		"t": "comment.ts",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "Conway",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": "export",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "class",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "public",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "public",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -225,7 +225,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -239,7 +239,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -253,7 +253,7 @@
 	},
 	{
 		"c": "public",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -267,7 +267,7 @@
 	},
 	{
 		"c": "live",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -281,7 +281,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -295,7 +295,7 @@
 	},
 	{
 		"c": "boolean",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -323,7 +323,7 @@
 	},
 	{
 		"c": "constructor",
-		"t": "variable meta.definition.method storage.type",
+		"t": "variable.ts meta.definition.method.ts storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -337,7 +337,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -351,7 +351,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -365,7 +365,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -379,7 +379,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -393,7 +393,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -407,7 +407,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -421,7 +421,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -435,7 +435,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -449,7 +449,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -463,7 +463,7 @@
 	},
 	{
 		"c": "live",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -477,7 +477,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -491,7 +491,7 @@
 	},
 	{
 		"c": "boolean",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -505,7 +505,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -519,7 +519,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -533,7 +533,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -547,7 +547,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -561,7 +561,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -575,7 +575,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -589,7 +589,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -603,7 +603,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -617,7 +617,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -631,7 +631,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -645,7 +645,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -659,7 +659,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -673,7 +673,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -687,7 +687,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -701,7 +701,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -715,7 +715,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -729,7 +729,7 @@
 	},
 	{
 		"c": "live",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -743,7 +743,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -757,7 +757,7 @@
 	},
 	{
 		"c": "live",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -771,7 +771,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -785,7 +785,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -799,7 +799,7 @@
 	},
 	{
 		"c": "export",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -813,7 +813,7 @@
 	},
 	{
 		"c": "class",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -827,7 +827,7 @@
 	},
 	{
 		"c": "GameOfLife",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -841,7 +841,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -855,7 +855,7 @@
 	},
 	{
 		"c": "private",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -869,7 +869,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -883,7 +883,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -897,7 +897,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -911,7 +911,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -925,7 +925,7 @@
 	},
 	{
 		"c": "private",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -939,7 +939,7 @@
 	},
 	{
 		"c": "canvasSize",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -953,7 +953,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -967,7 +967,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -981,7 +981,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -995,7 +995,7 @@
 	},
 	{
 		"c": "private",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -1009,7 +1009,7 @@
 	},
 	{
 		"c": "lineColor",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1023,7 +1023,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1037,7 +1037,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1051,7 +1051,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1065,7 +1065,7 @@
 	},
 	{
 		"c": "private",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -1079,7 +1079,7 @@
 	},
 	{
 		"c": "liveColor",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1093,7 +1093,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1107,7 +1107,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1121,7 +1121,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1135,7 +1135,7 @@
 	},
 	{
 		"c": "private",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -1149,7 +1149,7 @@
 	},
 	{
 		"c": "deadColor",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1163,7 +1163,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1177,7 +1177,7 @@
 	},
 	{
 		"c": "string",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1191,7 +1191,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1205,7 +1205,7 @@
 	},
 	{
 		"c": "private",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -1219,7 +1219,7 @@
 	},
 	{
 		"c": "initialLifeProbability",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1233,7 +1233,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1247,7 +1247,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1261,7 +1261,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1275,7 +1275,7 @@
 	},
 	{
 		"c": "private",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -1289,7 +1289,7 @@
 	},
 	{
 		"c": "animationRate",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1303,7 +1303,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1317,7 +1317,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1331,7 +1331,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1345,7 +1345,7 @@
 	},
 	{
 		"c": "private",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -1359,7 +1359,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1373,7 +1373,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1387,7 +1387,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -1401,7 +1401,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1415,7 +1415,7 @@
 	},
 	{
 		"c": "private",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -1429,7 +1429,7 @@
 	},
 	{
 		"c": "world",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1443,7 +1443,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1457,7 +1457,7 @@
 	},
 	{
 		"c": "constructor",
-		"t": "variable meta.definition.method storage.type",
+		"t": "variable.ts meta.definition.method.ts storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1471,7 +1471,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1485,7 +1485,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1499,7 +1499,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1513,7 +1513,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -1527,7 +1527,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1541,7 +1541,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1555,7 +1555,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1569,7 +1569,7 @@
 	},
 	{
 		"c": "50",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -1583,7 +1583,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1597,7 +1597,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -1611,7 +1611,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1625,7 +1625,7 @@
 	},
 	{
 		"c": "canvasSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1639,7 +1639,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1653,7 +1653,7 @@
 	},
 	{
 		"c": "600",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -1667,7 +1667,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1681,7 +1681,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -1695,7 +1695,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1709,7 +1709,7 @@
 	},
 	{
 		"c": "lineColor",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1723,7 +1723,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1737,7 +1737,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1751,7 +1751,7 @@
 	},
 	{
 		"c": "#cdcdcd",
-		"t": "string",
+		"t": "string.quoted.single.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1765,7 +1765,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1779,7 +1779,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1793,7 +1793,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -1807,7 +1807,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1821,7 +1821,7 @@
 	},
 	{
 		"c": "liveColor",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1835,7 +1835,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1849,7 +1849,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1863,7 +1863,7 @@
 	},
 	{
 		"c": "#666",
-		"t": "string",
+		"t": "string.quoted.single.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1877,7 +1877,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1891,7 +1891,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1905,7 +1905,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -1919,7 +1919,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1933,7 +1933,7 @@
 	},
 	{
 		"c": "deadColor",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1947,7 +1947,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1961,7 +1961,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1975,7 +1975,7 @@
 	},
 	{
 		"c": "#eee",
-		"t": "string",
+		"t": "string.quoted.single.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1989,7 +1989,7 @@
 	},
 	{
 		"c": "'",
-		"t": "string",
+		"t": "string.quoted.single.ts punctuation.definition.string.end.ts",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -2003,7 +2003,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2017,7 +2017,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -2031,7 +2031,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2045,7 +2045,7 @@
 	},
 	{
 		"c": "initialLifeProbability",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2059,7 +2059,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2073,7 +2073,7 @@
 	},
 	{
 		"c": "0.5",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -2087,7 +2087,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2101,7 +2101,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -2115,7 +2115,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2129,7 +2129,7 @@
 	},
 	{
 		"c": "animationRate",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2143,7 +2143,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2157,7 +2157,7 @@
 	},
 	{
 		"c": "60",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -2171,7 +2171,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2185,7 +2185,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -2199,7 +2199,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2213,7 +2213,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2227,7 +2227,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2241,7 +2241,7 @@
 	},
 	{
 		"c": "0",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -2255,7 +2255,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2269,7 +2269,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -2283,7 +2283,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2297,7 +2297,7 @@
 	},
 	{
 		"c": "world",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2311,7 +2311,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2325,7 +2325,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -2339,7 +2339,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2353,7 +2353,7 @@
 	},
 	{
 		"c": "createWorld",
-		"t": "variable variable entity.name.function",
+		"t": "variable.ts variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2367,7 +2367,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2381,7 +2381,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2395,7 +2395,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2409,7 +2409,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -2423,7 +2423,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2437,7 +2437,7 @@
 	},
 	{
 		"c": "circleOfLife",
-		"t": "variable variable entity.name.function",
+		"t": "variable.ts variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2451,7 +2451,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2465,7 +2465,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2479,7 +2479,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2493,7 +2493,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2507,7 +2507,7 @@
 	},
 	{
 		"c": "public",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -2521,7 +2521,7 @@
 	},
 	{
 		"c": "createWorld",
-		"t": "variable meta.definition.method entity.name.function",
+		"t": "variable.ts meta.definition.method.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2535,7 +2535,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2549,7 +2549,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2563,7 +2563,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2577,7 +2577,7 @@
 	},
 	{
 		"c": "return",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -2591,7 +2591,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -2605,7 +2605,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2619,7 +2619,7 @@
 	},
 	{
 		"c": "travelWorld",
-		"t": "variable variable entity.name.function",
+		"t": "variable.ts variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2633,7 +2633,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2647,7 +2647,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2661,7 +2661,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2675,7 +2675,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2689,7 +2689,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -2703,7 +2703,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2717,7 +2717,7 @@
 	},
 	{
 		"c": "=>",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -2731,7 +2731,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2745,7 +2745,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2759,7 +2759,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2773,7 +2773,7 @@
 	},
 	{
 		"c": "live",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2787,7 +2787,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2801,7 +2801,7 @@
 	},
 	{
 		"c": "Math",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2815,7 +2815,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2829,7 +2829,7 @@
 	},
 	{
 		"c": "random",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -2843,7 +2843,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2857,7 +2857,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2871,7 +2871,7 @@
 	},
 	{
 		"c": "<",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2885,7 +2885,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -2899,7 +2899,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2913,7 +2913,7 @@
 	},
 	{
 		"c": "initialLifeProbability",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2927,7 +2927,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2941,7 +2941,7 @@
 	},
 	{
 		"c": "return",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -2955,7 +2955,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -2969,7 +2969,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2983,7 +2983,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2997,7 +2997,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3011,7 +3011,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3025,7 +3025,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3039,7 +3039,7 @@
 	},
 	{
 		"c": "public",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -3053,7 +3053,7 @@
 	},
 	{
 		"c": "circleOfLife",
-		"t": "variable meta.definition.method entity.name.function",
+		"t": "variable.ts meta.definition.method.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3067,7 +3067,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3081,7 +3081,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3095,7 +3095,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -3109,7 +3109,7 @@
 	},
 	{
 		"c": "void",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -3123,7 +3123,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3137,7 +3137,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -3151,7 +3151,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3165,7 +3165,7 @@
 	},
 	{
 		"c": "world",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3179,7 +3179,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -3193,7 +3193,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -3207,7 +3207,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3221,7 +3221,7 @@
 	},
 	{
 		"c": "travelWorld",
-		"t": "variable variable entity.name.function",
+		"t": "variable.ts variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3235,7 +3235,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3249,7 +3249,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3263,7 +3263,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3277,7 +3277,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -3291,7 +3291,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -3305,7 +3305,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3319,7 +3319,7 @@
 	},
 	{
 		"c": "=>",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -3333,7 +3333,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3347,7 +3347,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3361,7 +3361,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -3375,7 +3375,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -3389,7 +3389,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3403,7 +3403,7 @@
 	},
 	{
 		"c": "world",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3417,7 +3417,7 @@
 	},
 	{
 		"c": "[",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3431,7 +3431,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3445,7 +3445,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3459,7 +3459,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3473,7 +3473,7 @@
 	},
 	{
 		"c": "]",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3487,7 +3487,7 @@
 	},
 	{
 		"c": "[",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3501,7 +3501,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3515,7 +3515,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3529,7 +3529,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3543,7 +3543,7 @@
 	},
 	{
 		"c": "]",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3557,7 +3557,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3571,7 +3571,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -3585,7 +3585,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3599,7 +3599,7 @@
 	},
 	{
 		"c": "draw",
-		"t": "variable variable entity.name.function",
+		"t": "variable.ts variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3613,7 +3613,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3627,7 +3627,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3641,7 +3641,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3655,7 +3655,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3669,7 +3669,7 @@
 	},
 	{
 		"c": "return",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -3683,7 +3683,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -3697,7 +3697,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3711,7 +3711,7 @@
 	},
 	{
 		"c": "resolveNextGeneration",
-		"t": "variable variable entity.name.function",
+		"t": "variable.ts variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3725,7 +3725,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3739,7 +3739,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -3753,7 +3753,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3767,7 +3767,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3781,7 +3781,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3795,7 +3795,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3809,7 +3809,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3823,7 +3823,7 @@
 	},
 	{
 		"c": "setTimeout",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3837,7 +3837,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3851,7 +3851,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3865,7 +3865,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3879,7 +3879,7 @@
 	},
 	{
 		"c": "=>",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -3893,7 +3893,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3907,7 +3907,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -3921,7 +3921,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3935,7 +3935,7 @@
 	},
 	{
 		"c": "circleOfLife",
-		"t": "variable variable entity.name.function",
+		"t": "variable.ts variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -3949,7 +3949,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3963,7 +3963,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3977,7 +3977,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3991,7 +3991,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4005,7 +4005,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -4019,7 +4019,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4033,7 +4033,7 @@
 	},
 	{
 		"c": "animationRate",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4047,7 +4047,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4061,7 +4061,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4075,7 +4075,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4089,7 +4089,7 @@
 	},
 	{
 		"c": "public",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -4103,7 +4103,7 @@
 	},
 	{
 		"c": "resolveNextGeneration",
-		"t": "variable meta.definition.method entity.name.function",
+		"t": "variable.ts meta.definition.method.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -4117,7 +4117,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4131,7 +4131,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4145,7 +4145,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -4159,7 +4159,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -4173,7 +4173,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4187,7 +4187,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4201,7 +4201,7 @@
 	},
 	{
 		"c": "var",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -4215,7 +4215,7 @@
 	},
 	{
 		"c": "count",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4229,7 +4229,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -4243,7 +4243,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -4257,7 +4257,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4271,7 +4271,7 @@
 	},
 	{
 		"c": "countNeighbors",
-		"t": "variable variable entity.name.function",
+		"t": "variable.ts variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -4285,7 +4285,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4299,7 +4299,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4313,7 +4313,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4327,7 +4327,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4341,7 +4341,7 @@
 	},
 	{
 		"c": "var",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -4355,7 +4355,7 @@
 	},
 	{
 		"c": "newCell",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4369,7 +4369,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -4383,7 +4383,7 @@
 	},
 	{
 		"c": "new",
-		"t": "new.expr keyword.operator.new",
+		"t": "new.expr.ts keyword.operator.new.ts",
 		"r": {
 			"dark_plus": "keyword.operator.new: #569CD6",
 			"light_plus": "keyword.operator.new: #0000FF",
@@ -4397,7 +4397,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "new.expr variable entity.name.function",
+		"t": "new.expr.ts variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -4411,7 +4411,7 @@
 	},
 	{
 		"c": "(",
-		"t": "new.expr punctuation",
+		"t": "new.expr.ts punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4425,7 +4425,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "new.expr variable",
+		"t": "new.expr.ts variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4439,7 +4439,7 @@
 	},
 	{
 		"c": ".",
-		"t": "new.expr punctuation.delimiter",
+		"t": "new.expr.ts punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4453,7 +4453,7 @@
 	},
 	{
 		"c": "row",
-		"t": "new.expr variable",
+		"t": "new.expr.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4467,7 +4467,7 @@
 	},
 	{
 		"c": ",",
-		"t": "new.expr punctuation.delimiter",
+		"t": "new.expr.ts punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4481,7 +4481,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "new.expr variable",
+		"t": "new.expr.ts variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4495,7 +4495,7 @@
 	},
 	{
 		"c": ".",
-		"t": "new.expr punctuation.delimiter",
+		"t": "new.expr.ts punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4509,7 +4509,7 @@
 	},
 	{
 		"c": "col",
-		"t": "new.expr variable",
+		"t": "new.expr.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4523,7 +4523,7 @@
 	},
 	{
 		"c": ",",
-		"t": "new.expr punctuation.delimiter",
+		"t": "new.expr.ts punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4537,7 +4537,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "new.expr variable",
+		"t": "new.expr.ts variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4551,7 +4551,7 @@
 	},
 	{
 		"c": ".",
-		"t": "new.expr punctuation.delimiter",
+		"t": "new.expr.ts punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4565,7 +4565,7 @@
 	},
 	{
 		"c": "live",
-		"t": "new.expr variable",
+		"t": "new.expr.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4579,7 +4579,7 @@
 	},
 	{
 		"c": ")",
-		"t": "new.expr punctuation",
+		"t": "new.expr.ts punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4593,7 +4593,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4607,7 +4607,7 @@
 	},
 	{
 		"c": "if",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -4621,7 +4621,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4635,7 +4635,7 @@
 	},
 	{
 		"c": "count",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4649,7 +4649,7 @@
 	},
 	{
 		"c": "<",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -4663,7 +4663,7 @@
 	},
 	{
 		"c": "2",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -4677,7 +4677,7 @@
 	},
 	{
 		"c": "||",
-		"t": "keyword.operator.logical",
+		"t": "keyword.operator.logical.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -4691,7 +4691,7 @@
 	},
 	{
 		"c": "count",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4705,7 +4705,7 @@
 	},
 	{
 		"c": ">",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -4719,7 +4719,7 @@
 	},
 	{
 		"c": "3",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -4733,7 +4733,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4747,7 +4747,7 @@
 	},
 	{
 		"c": "newCell",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4761,7 +4761,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4775,7 +4775,7 @@
 	},
 	{
 		"c": "live",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4789,7 +4789,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -4803,7 +4803,7 @@
 	},
 	{
 		"c": "false",
-		"t": "constant.language.boolean.false",
+		"t": "constant.language.boolean.false.ts",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -4817,7 +4817,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4831,7 +4831,7 @@
 	},
 	{
 		"c": "else",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -4845,7 +4845,7 @@
 	},
 	{
 		"c": "if",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -4859,7 +4859,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4873,7 +4873,7 @@
 	},
 	{
 		"c": "count",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4887,7 +4887,7 @@
 	},
 	{
 		"c": "==",
-		"t": "keyword.operator",
+		"t": "keyword.operator.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -4901,7 +4901,7 @@
 	},
 	{
 		"c": "3",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -4915,7 +4915,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4929,7 +4929,7 @@
 	},
 	{
 		"c": "newCell",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4943,7 +4943,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -4957,7 +4957,7 @@
 	},
 	{
 		"c": "live",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -4971,7 +4971,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -4985,7 +4985,7 @@
 	},
 	{
 		"c": "true",
-		"t": "constant.language.boolean.true",
+		"t": "constant.language.boolean.true.ts",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -4999,7 +4999,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5013,7 +5013,7 @@
 	},
 	{
 		"c": "return",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -5027,7 +5027,7 @@
 	},
 	{
 		"c": "newCell",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -5041,7 +5041,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5055,7 +5055,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5069,7 +5069,7 @@
 	},
 	{
 		"c": "public",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -5083,7 +5083,7 @@
 	},
 	{
 		"c": "countNeighbors",
-		"t": "variable meta.definition.method entity.name.function",
+		"t": "variable.ts meta.definition.method.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -5097,7 +5097,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5111,7 +5111,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -5125,7 +5125,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -5139,7 +5139,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -5153,7 +5153,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5167,7 +5167,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5181,7 +5181,7 @@
 	},
 	{
 		"c": "var",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -5195,7 +5195,7 @@
 	},
 	{
 		"c": "neighbors",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -5209,7 +5209,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -5223,7 +5223,7 @@
 	},
 	{
 		"c": "0",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -5237,7 +5237,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5251,7 +5251,7 @@
 	},
 	{
 		"c": "for",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -5265,7 +5265,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5279,7 +5279,7 @@
 	},
 	{
 		"c": "var",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -5293,7 +5293,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -5307,7 +5307,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -5335,7 +5335,7 @@
 	},
 	{
 		"c": "1",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -5349,7 +5349,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5363,7 +5363,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -5377,7 +5377,7 @@
 	},
 	{
 		"c": "<=",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -5391,7 +5391,7 @@
 	},
 	{
 		"c": "1",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -5405,7 +5405,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5419,7 +5419,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -5433,7 +5433,7 @@
 	},
 	{
 		"c": "++",
-		"t": "keyword.operator.increment",
+		"t": "keyword.operator.increment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -5447,7 +5447,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5461,7 +5461,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5475,7 +5475,7 @@
 	},
 	{
 		"c": "for",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -5489,7 +5489,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5503,7 +5503,7 @@
 	},
 	{
 		"c": "var",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -5517,7 +5517,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -5531,7 +5531,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -5559,7 +5559,7 @@
 	},
 	{
 		"c": "1",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -5573,7 +5573,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5587,7 +5587,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -5601,7 +5601,7 @@
 	},
 	{
 		"c": "<=",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -5615,7 +5615,7 @@
 	},
 	{
 		"c": "1",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -5629,7 +5629,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5643,7 +5643,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -5657,7 +5657,7 @@
 	},
 	{
 		"c": "++",
-		"t": "keyword.operator.increment",
+		"t": "keyword.operator.increment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -5671,7 +5671,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5685,7 +5685,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5699,7 +5699,7 @@
 	},
 	{
 		"c": "if",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -5713,7 +5713,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5727,7 +5727,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -5741,7 +5741,7 @@
 	},
 	{
 		"c": "==",
-		"t": "keyword.operator",
+		"t": "keyword.operator.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -5755,7 +5755,7 @@
 	},
 	{
 		"c": "0",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -5769,7 +5769,7 @@
 	},
 	{
 		"c": "&&",
-		"t": "keyword.operator.logical",
+		"t": "keyword.operator.logical.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -5783,7 +5783,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -5797,7 +5797,7 @@
 	},
 	{
 		"c": "==",
-		"t": "keyword.operator",
+		"t": "keyword.operator.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -5811,7 +5811,7 @@
 	},
 	{
 		"c": "0",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -5825,7 +5825,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5839,7 +5839,7 @@
 	},
 	{
 		"c": "continue",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -5853,7 +5853,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5867,7 +5867,7 @@
 	},
 	{
 		"c": "if",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -5881,7 +5881,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5895,7 +5895,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -5909,7 +5909,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5923,7 +5923,7 @@
 	},
 	{
 		"c": "isAlive",
-		"t": "variable variable entity.name.function",
+		"t": "variable.ts variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -5937,7 +5937,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5951,7 +5951,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -5965,7 +5965,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -5979,7 +5979,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -5993,7 +5993,7 @@
 	},
 	{
 		"c": "+",
-		"t": "keyword.operator.arithmetic",
+		"t": "keyword.operator.arithmetic.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -6007,7 +6007,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6021,7 +6021,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6035,7 +6035,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6049,7 +6049,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6063,7 +6063,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6077,7 +6077,7 @@
 	},
 	{
 		"c": "+",
-		"t": "keyword.operator.arithmetic",
+		"t": "keyword.operator.arithmetic.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -6091,7 +6091,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6105,7 +6105,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6119,7 +6119,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6133,7 +6133,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6147,7 +6147,7 @@
 	},
 	{
 		"c": "neighbors",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6161,7 +6161,7 @@
 	},
 	{
 		"c": "++",
-		"t": "keyword.operator.increment",
+		"t": "keyword.operator.increment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -6175,7 +6175,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6189,7 +6189,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6203,7 +6203,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6217,7 +6217,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6231,7 +6231,7 @@
 	},
 	{
 		"c": "return",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -6245,7 +6245,7 @@
 	},
 	{
 		"c": "neighbors",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6259,7 +6259,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6273,7 +6273,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6287,7 +6287,7 @@
 	},
 	{
 		"c": "public",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -6301,7 +6301,7 @@
 	},
 	{
 		"c": "isAlive",
-		"t": "variable meta.definition.method entity.name.function",
+		"t": "variable.ts meta.definition.method.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -6315,7 +6315,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6329,7 +6329,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6343,7 +6343,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -6357,7 +6357,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -6371,7 +6371,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6385,7 +6385,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6399,7 +6399,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -6413,7 +6413,7 @@
 	},
 	{
 		"c": "number",
-		"t": "support.type support.type.primitive",
+		"t": "support.type.ts support.type.primitive.ts",
 		"r": {
 			"dark_plus": "support.type: #4EC9B0",
 			"light_plus": "support.type: #267F99",
@@ -6427,7 +6427,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6441,7 +6441,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6455,7 +6455,7 @@
 	},
 	{
 		"c": "if",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -6469,7 +6469,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6483,7 +6483,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6497,7 +6497,7 @@
 	},
 	{
 		"c": "<",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -6511,7 +6511,7 @@
 	},
 	{
 		"c": "0",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -6525,7 +6525,7 @@
 	},
 	{
 		"c": "||",
-		"t": "keyword.operator.logical",
+		"t": "keyword.operator.logical.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -6539,7 +6539,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6553,7 +6553,7 @@
 	},
 	{
 		"c": "<",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -6567,7 +6567,7 @@
 	},
 	{
 		"c": "0",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -6581,7 +6581,7 @@
 	},
 	{
 		"c": "||",
-		"t": "keyword.operator.logical",
+		"t": "keyword.operator.logical.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -6595,7 +6595,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6609,7 +6609,7 @@
 	},
 	{
 		"c": ">=",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -6623,7 +6623,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -6637,7 +6637,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6651,7 +6651,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6665,7 +6665,7 @@
 	},
 	{
 		"c": "||",
-		"t": "keyword.operator.logical",
+		"t": "keyword.operator.logical.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -6679,7 +6679,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6693,7 +6693,7 @@
 	},
 	{
 		"c": ">=",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -6707,7 +6707,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -6721,7 +6721,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6735,7 +6735,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6749,7 +6749,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6763,7 +6763,7 @@
 	},
 	{
 		"c": "return",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -6777,7 +6777,7 @@
 	},
 	{
 		"c": "false",
-		"t": "constant.language.boolean.false",
+		"t": "constant.language.boolean.false.ts",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -6791,7 +6791,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6805,7 +6805,7 @@
 	},
 	{
 		"c": "return",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -6819,7 +6819,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -6833,7 +6833,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6847,7 +6847,7 @@
 	},
 	{
 		"c": "world",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6861,7 +6861,7 @@
 	},
 	{
 		"c": "[",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6875,7 +6875,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6889,7 +6889,7 @@
 	},
 	{
 		"c": "]",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6903,7 +6903,7 @@
 	},
 	{
 		"c": "[",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6917,7 +6917,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6931,7 +6931,7 @@
 	},
 	{
 		"c": "]",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6945,7 +6945,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6959,7 +6959,7 @@
 	},
 	{
 		"c": "live",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -6973,7 +6973,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -6987,7 +6987,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7001,7 +7001,7 @@
 	},
 	{
 		"c": "public",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -7015,7 +7015,7 @@
 	},
 	{
 		"c": "travelWorld",
-		"t": "variable meta.definition.method entity.name.function",
+		"t": "variable.ts meta.definition.method.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -7029,7 +7029,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7043,7 +7043,7 @@
 	},
 	{
 		"c": "callback",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7057,7 +7057,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7071,7 +7071,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7085,7 +7085,7 @@
 	},
 	{
 		"c": "var",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -7099,7 +7099,7 @@
 	},
 	{
 		"c": "result",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7113,7 +7113,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -7127,7 +7127,7 @@
 	},
 	{
 		"c": "[",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7141,7 +7141,7 @@
 	},
 	{
 		"c": "]",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7155,7 +7155,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7169,7 +7169,7 @@
 	},
 	{
 		"c": "for",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -7183,7 +7183,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7197,7 +7197,7 @@
 	},
 	{
 		"c": "var",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -7211,7 +7211,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7225,7 +7225,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -7239,7 +7239,7 @@
 	},
 	{
 		"c": "0",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -7253,7 +7253,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7267,7 +7267,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7281,7 +7281,7 @@
 	},
 	{
 		"c": "<",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -7295,7 +7295,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -7309,7 +7309,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7323,7 +7323,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7337,7 +7337,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7351,7 +7351,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7365,7 +7365,7 @@
 	},
 	{
 		"c": "++",
-		"t": "keyword.operator.increment",
+		"t": "keyword.operator.increment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -7379,7 +7379,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7393,7 +7393,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7407,7 +7407,7 @@
 	},
 	{
 		"c": "var",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -7421,7 +7421,7 @@
 	},
 	{
 		"c": "rowData",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7435,7 +7435,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -7449,7 +7449,7 @@
 	},
 	{
 		"c": "[",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7463,7 +7463,7 @@
 	},
 	{
 		"c": "]",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7477,7 +7477,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7491,7 +7491,7 @@
 	},
 	{
 		"c": "for",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -7505,7 +7505,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7519,7 +7519,7 @@
 	},
 	{
 		"c": "var",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -7533,7 +7533,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7547,7 +7547,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -7561,7 +7561,7 @@
 	},
 	{
 		"c": "0",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -7575,7 +7575,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7589,7 +7589,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7603,7 +7603,7 @@
 	},
 	{
 		"c": "<",
-		"t": "keyword.operator.relational",
+		"t": "keyword.operator.relational.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -7617,7 +7617,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -7631,7 +7631,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7645,7 +7645,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7659,7 +7659,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7673,7 +7673,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7687,7 +7687,7 @@
 	},
 	{
 		"c": "++",
-		"t": "keyword.operator.increment",
+		"t": "keyword.operator.increment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -7701,7 +7701,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7715,7 +7715,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7729,7 +7729,7 @@
 	},
 	{
 		"c": "rowData",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7743,7 +7743,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7757,7 +7757,7 @@
 	},
 	{
 		"c": "push",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -7771,7 +7771,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7785,7 +7785,7 @@
 	},
 	{
 		"c": "callback",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -7799,7 +7799,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7813,7 +7813,7 @@
 	},
 	{
 		"c": "new",
-		"t": "new.expr keyword.operator.new",
+		"t": "new.expr.ts keyword.operator.new.ts",
 		"r": {
 			"dark_plus": "keyword.operator.new: #569CD6",
 			"light_plus": "keyword.operator.new: #0000FF",
@@ -7827,7 +7827,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "new.expr variable entity.name.function",
+		"t": "new.expr.ts variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -7841,7 +7841,7 @@
 	},
 	{
 		"c": "(",
-		"t": "new.expr punctuation",
+		"t": "new.expr.ts punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7855,7 +7855,7 @@
 	},
 	{
 		"c": "row",
-		"t": "new.expr variable",
+		"t": "new.expr.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7869,7 +7869,7 @@
 	},
 	{
 		"c": ",",
-		"t": "new.expr punctuation.delimiter",
+		"t": "new.expr.ts punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7883,7 +7883,7 @@
 	},
 	{
 		"c": "col",
-		"t": "new.expr variable",
+		"t": "new.expr.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -7897,7 +7897,7 @@
 	},
 	{
 		"c": ",",
-		"t": "new.expr punctuation.delimiter",
+		"t": "new.expr.ts punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7911,7 +7911,7 @@
 	},
 	{
 		"c": "false",
-		"t": "new.expr constant.language.boolean.false",
+		"t": "new.expr.ts constant.language.boolean.false.ts",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -7925,7 +7925,7 @@
 	},
 	{
 		"c": ")",
-		"t": "new.expr punctuation",
+		"t": "new.expr.ts punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7939,7 +7939,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7953,7 +7953,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7967,7 +7967,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7981,7 +7981,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -7995,7 +7995,7 @@
 	},
 	{
 		"c": "result",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8009,7 +8009,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8023,7 +8023,7 @@
 	},
 	{
 		"c": "push",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -8037,7 +8037,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8051,7 +8051,7 @@
 	},
 	{
 		"c": "rowData",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8065,7 +8065,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8079,7 +8079,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8093,7 +8093,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8107,7 +8107,7 @@
 	},
 	{
 		"c": "return",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -8121,7 +8121,7 @@
 	},
 	{
 		"c": "result",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8135,7 +8135,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8149,7 +8149,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8163,7 +8163,7 @@
 	},
 	{
 		"c": "public",
-		"t": "storage.modifier",
+		"t": "storage.modifier.ts",
 		"r": {
 			"dark_plus": "storage.modifier: #569CD6",
 			"light_plus": "storage.modifier: #0000FF",
@@ -8177,7 +8177,7 @@
 	},
 	{
 		"c": "draw",
-		"t": "variable meta.definition.method entity.name.function",
+		"t": "variable.ts meta.definition.method.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -8191,7 +8191,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8205,7 +8205,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable variable.parameter",
+		"t": "variable.ts variable.parameter.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8219,7 +8219,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.type.annotation",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -8233,7 +8233,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "entity.name.type",
+		"t": "entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -8247,7 +8247,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8261,7 +8261,7 @@
 	},
 	{
 		"c": "{",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8275,7 +8275,7 @@
 	},
 	{
 		"c": "if",
-		"t": "keyword.control",
+		"t": "keyword.control.ts",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -8289,7 +8289,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8303,7 +8303,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -8317,7 +8317,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8331,7 +8331,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8345,7 +8345,7 @@
 	},
 	{
 		"c": "==",
-		"t": "keyword.operator",
+		"t": "keyword.operator.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -8359,7 +8359,7 @@
 	},
 	{
 		"c": "0",
-		"t": "constant.numeric",
+		"t": "constant.numeric.ts",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -8373,7 +8373,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8387,7 +8387,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -8401,7 +8401,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8415,7 +8415,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8429,7 +8429,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -8443,7 +8443,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -8457,7 +8457,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8471,7 +8471,7 @@
 	},
 	{
 		"c": "canvasSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8485,7 +8485,7 @@
 	},
 	{
 		"c": "/",
-		"t": "keyword.operator.arithmetic",
+		"t": "keyword.operator.arithmetic.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -8499,7 +8499,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -8513,7 +8513,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8527,7 +8527,7 @@
 	},
 	{
 		"c": "gridSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8541,7 +8541,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8555,7 +8555,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -8569,7 +8569,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8583,7 +8583,7 @@
 	},
 	{
 		"c": "context",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8597,7 +8597,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8611,7 +8611,7 @@
 	},
 	{
 		"c": "strokeStyle",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8625,7 +8625,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -8639,7 +8639,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -8653,7 +8653,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8667,7 +8667,7 @@
 	},
 	{
 		"c": "lineColor",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8681,7 +8681,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8695,7 +8695,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -8709,7 +8709,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8723,7 +8723,7 @@
 	},
 	{
 		"c": "context",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8737,7 +8737,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8751,7 +8751,7 @@
 	},
 	{
 		"c": "strokeRect",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -8765,7 +8765,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8779,7 +8779,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8793,7 +8793,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8807,7 +8807,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8821,7 +8821,7 @@
 	},
 	{
 		"c": "*",
-		"t": "keyword.operator.arithmetic",
+		"t": "keyword.operator.arithmetic.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -8835,7 +8835,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -8849,7 +8849,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8863,7 +8863,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8877,7 +8877,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8891,7 +8891,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8905,7 +8905,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8919,7 +8919,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8933,7 +8933,7 @@
 	},
 	{
 		"c": "*",
-		"t": "keyword.operator.arithmetic",
+		"t": "keyword.operator.arithmetic.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -8947,7 +8947,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -8961,7 +8961,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -8975,7 +8975,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -8989,7 +8989,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9003,7 +9003,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -9017,7 +9017,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9031,7 +9031,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9045,7 +9045,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9059,7 +9059,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -9073,7 +9073,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9087,7 +9087,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9101,7 +9101,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9115,7 +9115,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9129,7 +9129,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -9143,7 +9143,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9157,7 +9157,7 @@
 	},
 	{
 		"c": "context",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9171,7 +9171,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9185,7 +9185,7 @@
 	},
 	{
 		"c": "fillStyle",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9199,7 +9199,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -9213,7 +9213,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9227,7 +9227,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9241,7 +9241,7 @@
 	},
 	{
 		"c": "live",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9255,7 +9255,7 @@
 	},
 	{
 		"c": "?",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "punctuation.delimiter.ts keyword.operator.ternary.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -9269,7 +9269,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -9283,7 +9283,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9297,7 +9297,7 @@
 	},
 	{
 		"c": "liveColor",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9311,7 +9311,7 @@
 	},
 	{
 		"c": ":",
-		"t": "punctuation.delimiter keyword.operator.ternary",
+		"t": "punctuation.delimiter.ts keyword.operator.ternary.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -9325,7 +9325,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -9339,7 +9339,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9353,7 +9353,7 @@
 	},
 	{
 		"c": "deadColor",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9367,7 +9367,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9381,7 +9381,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -9395,7 +9395,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9409,7 +9409,7 @@
 	},
 	{
 		"c": "context",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9423,7 +9423,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9437,7 +9437,7 @@
 	},
 	{
 		"c": "fillRect",
-		"t": "variable entity.name.function",
+		"t": "variable.ts entity.name.function.ts",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -9451,7 +9451,7 @@
 	},
 	{
 		"c": "(",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9465,7 +9465,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9479,7 +9479,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9493,7 +9493,7 @@
 	},
 	{
 		"c": "row",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9507,7 +9507,7 @@
 	},
 	{
 		"c": "*",
-		"t": "keyword.operator.arithmetic",
+		"t": "keyword.operator.arithmetic.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -9521,7 +9521,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -9535,7 +9535,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9549,7 +9549,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9563,7 +9563,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9577,7 +9577,7 @@
 	},
 	{
 		"c": "cell",
-		"t": "variable",
+		"t": "variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9591,7 +9591,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9605,7 +9605,7 @@
 	},
 	{
 		"c": "col",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9619,7 +9619,7 @@
 	},
 	{
 		"c": "*",
-		"t": "keyword.operator.arithmetic",
+		"t": "keyword.operator.arithmetic.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -9633,7 +9633,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -9647,7 +9647,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9661,7 +9661,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9675,7 +9675,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9689,7 +9689,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -9703,7 +9703,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9717,7 +9717,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9731,7 +9731,7 @@
 	},
 	{
 		"c": ",",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9745,7 +9745,7 @@
 	},
 	{
 		"c": "this",
-		"t": "variable.language.this",
+		"t": "variable.language.this.ts",
 		"r": {
 			"dark_plus": "variable.language: #569CD6",
 			"light_plus": "variable.language: #0000FF",
@@ -9759,7 +9759,7 @@
 	},
 	{
 		"c": ".",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9773,7 +9773,7 @@
 	},
 	{
 		"c": "cellSize",
-		"t": "variable variable",
+		"t": "variable.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9787,7 +9787,7 @@
 	},
 	{
 		"c": ")",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9801,7 +9801,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9815,7 +9815,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9829,7 +9829,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9843,7 +9843,7 @@
 	},
 	{
 		"c": "}",
-		"t": "punctuation",
+		"t": "punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9857,7 +9857,7 @@
 	},
 	{
 		"c": "var",
-		"t": "storage.type",
+		"t": "storage.type.ts",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -9871,7 +9871,7 @@
 	},
 	{
 		"c": "game",
-		"t": "variable",
+		"t": "variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9885,7 +9885,7 @@
 	},
 	{
 		"c": "=",
-		"t": "keyword.operator.assignment",
+		"t": "keyword.operator.assignment.ts",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -9899,7 +9899,7 @@
 	},
 	{
 		"c": "new",
-		"t": "new.expr keyword.operator.new",
+		"t": "new.expr.ts keyword.operator.new.ts",
 		"r": {
 			"dark_plus": "keyword.operator.new: #569CD6",
 			"light_plus": "keyword.operator.new: #0000FF",
@@ -9913,7 +9913,7 @@
 	},
 	{
 		"c": "Conway",
-		"t": "new.expr variable",
+		"t": "new.expr.ts variable.ts variable.other.object.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9927,7 +9927,7 @@
 	},
 	{
 		"c": ".",
-		"t": "new.expr punctuation.delimiter",
+		"t": "new.expr.ts punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9941,7 +9941,7 @@
 	},
 	{
 		"c": "GameOfLife",
-		"t": "new.expr variable",
+		"t": "new.expr.ts variable.ts",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -9955,7 +9955,7 @@
 	},
 	{
 		"c": "(",
-		"t": "new.expr punctuation",
+		"t": "new.expr.ts punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9969,7 +9969,7 @@
 	},
 	{
 		"c": ")",
-		"t": "new.expr punctuation",
+		"t": "new.expr.ts punctuation.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -9983,7 +9983,7 @@
 	},
 	{
 		"c": ";",
-		"t": "punctuation.delimiter",
+		"t": "punctuation.delimiter.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/src/vs/editor/common/languages/highlights/typescript.scm b/src/vs/editor/common/languages/highlights/typescript.scm
index 2203e09fa6a6..bcd5f9fe5813 100644
--- a/src/vs/editor/common/languages/highlights/typescript.scm
+++ b/src/vs/editor/common/languages/highlights/typescript.scm
@@ -3,113 +3,137 @@
 
 ; Variables
 
-(identifier) @variable
+(identifier) @variable.ts
+
+(_
+  object: (identifier) @variable.other.object.ts)
 
 ; Literals
 
-(this) @variable.language.this
-(super) @variable.language.super
+(this) @variable.language.this.ts
+(super) @variable.language.super.ts
 
-(comment) @comment
+(comment) @comment.ts
 
 ; TODO: This doesn't seem to be working
-(escape_sequence) @constant.character.escape
+(escape_sequence) @constant.character.escape.ts
 
-[
-  (string)
+((string) @string.quoted.single.ts
+  (#match? @string.quoted.single.ts "^'[^']*'$"))
+
+((string) @string.quoted.double.ts
+  (#match? @string.quoted.double.ts "^\"[^\"]*\"$"))
+
+([
   (template_string)
   (template_literal_type)
-] @string
+] @string.template.ts)
+
+(string .
+  ([
+    "\""
+    "'"
+  ]) @punctuation.definition.string.begin.ts)
+
+(string
+  ([
+    "\""
+    "'"
+  ]) @punctuation.definition.string.end.ts .)
+
+(template_string . ("`") @punctuation.definition.string.template.begin.ts)
+
+(template_string ("`") @punctuation.definition.string.template.end.ts .)
 
 ; NOTE: the typescript grammar doesn't break regex into nice parts so as to capture parts of it separately
-(regex) @string.regexp
-(number) @constant.numeric
+(regex) @string.regexp.ts
+(number) @constant.numeric.ts
 
 ; Properties
 
 (member_expression
   object: (this)
-  property: (property_identifier) @variable)
+  property: (property_identifier) @variable.ts)
 
 (member_expression
-  property: (property_identifier) @variable.other.constant
-  (#match? @variable.other.constant "^[A-Z][A-Z_]+$"))
+  property: (property_identifier) @variable.other.constant.ts
+  (#match? @variable.other.constant.ts "^[A-Z][A-Z_]+$"))
 
 [
   (property_identifier)
   (shorthand_property_identifier)
-  (shorthand_property_identifier_pattern)] @variable
+  (shorthand_property_identifier_pattern)] @variable.ts
 
 ; Function and method definitions
 
 (function_expression
-  name: (identifier) @entity.name.function)
+  name: (identifier) @entity.name.function.ts)
 (function_declaration
-  name: (identifier) @entity.name.function)
+  name: (identifier) @entity.name.function.ts)
 (method_definition
-  name: (property_identifier) @meta.definition.method @entity.name.function
-  (#not-eq? @entity.name.function "constructor"))
+  name: (property_identifier) @meta.definition.method.ts @entity.name.function.ts
+  (#not-eq? @entity.name.function.ts "constructor"))
 (method_definition
-  name: (property_identifier) @meta.definition.method @storage.type
-  (#eq? @storage.type "constructor"))
+  name: (property_identifier) @meta.definition.method.ts @storage.type.ts
+  (#eq? @storage.type.ts "constructor"))
 (method_signature
-  name: (property_identifier) @meta.definition.method @entity.name.function)
+  name: (property_identifier) @meta.definition.method.ts @entity.name.function.ts)
 
 (pair
-  key: (property_identifier) @entity.name.function
+  key: (property_identifier) @entity.name.function.ts
   value: [(function_expression) (arrow_function)])
 
 (assignment_expression
   left: (member_expression
-    property: (property_identifier) @entity.name.function)
+    property: (property_identifier) @entity.name.function.ts)
   right: [(function_expression) (arrow_function)])
 
 (variable_declarator
-  name: (identifier) @entity.name.function
+  name: (identifier) @entity.name.function.ts
   value: [(function_expression) (arrow_function)])
 
 (assignment_expression
-  left: (identifier) @entity.name.function
+  left: (identifier) @entity.name.function.ts
   right: [(function_expression) (arrow_function)])
 
 (required_parameter
-  (identifier) @variable.parameter)
+  (identifier) @variable.parameter.ts)
 
 (required_parameter
   (rest_pattern
-    (identifier) @variable.parameter))
+    (identifier) @variable.parameter.ts))
 
 (optional_parameter
-  (identifier) @variable.parameter)
+  (identifier) @variable.parameter.ts)
 
 (catch_clause
-  parameter: (identifier) @variable.parameter)
+  parameter: (identifier) @variable.parameter.ts)
 
 ; Function and method calls
 
 (call_expression
-  function: (identifier) @entity.name.function)
+  function: (identifier) @entity.name.function.ts)
 
 (call_expression
   function: (member_expression
-  	object: (identifier) @support.class.promise)
-    (#eq? @support.class.promise "Promise"))
+  	object: (identifier) @support.class.promise.ts)
+    (#eq? @support.class.promise.ts "Promise"))
 
 (call_expression
   function: (member_expression
-    property: (property_identifier) @entity.name.function))
+    property: (property_identifier) @entity.name.function.ts))
 
-(new_expression) @new.expr
+(new_expression) @new.expr.ts
 
 (new_expression
-  constructor: (identifier) @entity.name.function)
+  constructor: (identifier) @entity.name.function.ts)
 
 
 ; Special identifiers
 
-(predefined_type) @support.type
-(predefined_type (["string" "boolean" "number" "any" "unknown"])) @support.type.primitive
-(type_identifier) @entity.name.type
+(predefined_type) @support.type.ts
+(predefined_type (["string" "boolean" "number" "any" "unknown"])) @support.type.primitive.ts
+(type_identifier) @entity.name.type.ts
 (internal_module
   name: (identifier) @entity.name.type.ts)
 
@@ -118,14 +142,14 @@
     (_ name: (identifier))
     (shorthand_property_identifier)
     (shorthand_property_identifier_pattern)
-  ] @variable.other.constant
-  (#match? @variable.other.constant "^[A-Z][A-Z_]+$"))
+  ] @variable.other.constant.ts
+  (#match? @variable.other.constant.ts "^[A-Z][A-Z_]+$"))
 
 (extends_clause
-  value: (identifier) @entity.other.inherited-class)
+  value: (identifier) @entity.other.inherited-class.ts)
 
 (implements_clause
-  (type_identifier) @entity.other.inherited-class)
+  (type_identifier) @entity.other.inherited-class.ts)
 
 ; Tokens
 
@@ -136,7 +160,7 @@
   ","
   ":"
   "?"
-] @punctuation.delimiter
+] @punctuation.delimiter.ts
 
 [
   "!"
@@ -146,7 +170,7 @@
   "&&"
   "||"
   "??"
-] @keyword.operator.logical
+] @keyword.operator.logical.ts
 
 (binary_expression ([
   "-"
@@ -155,18 +179,18 @@
   "/"
   "%"
   "^"
-]) @keyword.operator.arithmetic)
+]) @keyword.operator.arithmetic.ts)
 
 (binary_expression ([
   "<"
   "<="
   ">"
   ">="
-]) @keyword.operator.relational)
+]) @keyword.operator.relational.ts)
 
 [
   "="
-] @keyword.operator.assignment
+] @keyword.operator.assignment.ts
 
 (augmented_assignment_expression ([
   "-="
@@ -180,15 +204,15 @@
   "&&="
   "||="
   "??="
-]) @keyword.operator.assignment.compound)
+]) @keyword.operator.assignment.compound.ts)
 
 [
   "++"
-] @keyword.operator.increment
+] @keyword.operator.increment.ts
 
 [
   "--"
-] @keyword.operator.decrement
+] @keyword.operator.decrement.ts
 
 [
   "**"
@@ -204,16 +228,16 @@
   "~"
   "&"
   "|"
-] @keyword.operator
+] @keyword.operator.ts
 
 (union_type
-  ("|") @keyword.operator.type)
+  ("|") @keyword.operator.type.ts)
 
 (intersection_type
-  ("&") @keyword.operator.type)
+  ("&") @keyword.operator.type.ts)
 
 (type_annotation
-  (":") @keyword.operator.type.annotation)
+  (":") @keyword.operator.type.annotation.ts)
 
 [
   "{"
@@ -222,36 +246,36 @@
   ")"
   "["
   "]"
-] @punctuation
+] @punctuation.ts
 
 (template_substitution
-  "${" @punctuation.definition.template-expression.begin
-  "}" @punctuation.definition.template-expression.end)
+  "${" @punctuation.definition.template-expression.begin.ts
+  "}" @punctuation.definition.template-expression.end.ts)
 
 (template_type
-  "${" @punctuation.definition.template-expression.begin
-  "}" @punctuation.definition.template-expression.end)
+  "${" @punctuation.definition.template-expression.begin.ts
+  "}" @punctuation.definition.template-expression.end.ts)
 
 (type_arguments
-  "<" @punctuation.definition.typeparameters
-  ">" @punctuation.definition.typeparameters)
+  "<" @punctuation.definition.typeparameters.ts
+  ">" @punctuation.definition.typeparameters.ts)
 
 ; Keywords
 
-("typeof") @keyword.operator.expression.typeof
+("typeof") @keyword.operator.expression.typeof.ts
 
-(binary_expression "instanceof" @keyword.operator.expression.instanceof)
+(binary_expression "instanceof" @keyword.operator.expression.instanceof.ts)
 
-("of") @keyword.operator.expression.of
+("of") @keyword.operator.expression.of.ts
 
-("is") @keyword.operator.expression.is
+("is") @keyword.operator.expression.is.ts
 
 [
   "delete"
   "in"
   "infer"
   "keyof"
-] @keyword.operator.expression
+] @keyword.operator.expression.ts
 
 [
   "as"
@@ -278,7 +302,7 @@
   "type"
   "while"
   "yield"
-] @keyword.control
+] @keyword.control.ts
 
 [
   "abstract"
@@ -292,7 +316,7 @@
   "public"
   "readonly"
   "static"
-] @storage.modifier
+] @storage.modifier.ts
 
 [
   "=>"
@@ -306,7 +330,7 @@
   "namespace"
   "set"
   "var"
-] @storage.type
+] @storage.type.ts
 
 [
   "module"
@@ -316,68 +340,68 @@
   "debugger"
   "target"
   "with"
-] @keyword
+] @keyword.ts
 
-(regex_flags) @keyword
+(regex_flags) @keyword.ts
 
 [
   "void"
-] @support.type.primitive
+] @support.type.primitive.ts
 
 [
   "new"
-] @keyword.operator.new
+] @keyword.operator.new.ts
 
 (public_field_definition
-  ("?") @keyword.operator.optional)
+  ("?") @keyword.operator.optional.ts)
 
 (property_signature
-  ("?") @keyword.operator.optional)
+  ("?") @keyword.operator.optional.ts)
 
 (optional_parameter
   ([
     "?"
     ":"
-  ]) @keyword.operator.optional)
+  ]) @keyword.operator.optional.ts)
 
 (ternary_expression
   ([
     "?"
     ":"
-  ]) @keyword.operator.ternary)
+  ]) @keyword.operator.ternary.ts)
 
 (optional_chain
-  ("?.") @punctuation.accessor.optional)
+  ("?.") @punctuation.accessor.optional.ts)
 
 (rest_pattern
-  ("...") @keyword.operator.rest)
+  ("...") @keyword.operator.rest.ts)
 
 (spread_element
-  ("...") @keyword.operator.spread)
+  ("...") @keyword.operator.spread.ts)
 
 ; Language constants
 
 [
   (null)
-] @constant.language.null
+] @constant.language.null.ts
 
 [
   (undefined)
-] @constant.language.undefined
+] @constant.language.undefined.ts
 
-((identifier) @constant.language.nan
-  (#eq? @constant.language.nan "NaN"))
+((identifier) @constant.language.nan.ts
+  (#eq? @constant.language.nan.ts "NaN"))
 
-((identifier) @constant.language.infinity
-  (#eq? @constant.language.infinity "Infinity"))
+((identifier) @constant.language.infinity.ts
+  (#eq? @constant.language.infinity.ts "Infinity"))
 
 [
   (true)
-] @constant.language.boolean.true
+] @constant.language.boolean.true.ts
 
 [
   (false)
-] @constant.language.boolean.false
+] @constant.language.boolean.false.ts
 
 (literal_type
   [
@@ -385,7 +409,7 @@
     (undefined)
     (true)
     (false)
-  ] @support.type.builtin)
+  ] @support.type.builtin.ts)
 
 (namespace_import
-  "*" @constant.language)
+  "*" @constant.language.ts)
diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
index ef5a6bf40c24..2ebaae84c0a9 100644
--- a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
@@ -338,7 +338,7 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 		let tokenUpdate: { newTokens: TokenUpdate[] } | undefined;
 
 		for (let i = 0; i < rangeChanges.length; i++) {
-			if (versionId !== textModel.getVersionId()) {
+			if (!textModel.isDisposed() && versionId !== textModel.getVersionId()) {
 				// Our captures have become invalid and we need to re-capture
 				break;
 			}
diff --git a/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts b/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts
index 5d59475c9186..126a837bba1e 100644
--- a/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts
+++ b/src/vs/workbench/test/electron-main/treeSitterTokenizationFeature.test.ts
@@ -85,7 +85,7 @@ class MockTokenStoreService implements ITreeSitterTokenizationStoreService {
 		return true;
 	}
 	getNeedsRefresh(model: ITextModel): { range: Range; startOffset: number; endOffset: number }[] {
-		throw new Error('Method not implemented.');
+		return [];
 	}
 
 	_serviceBrand: undefined;
@@ -212,12 +212,64 @@ suite('Tree Sitter TokenizationFeature', function () {
 		}
 	}
 
+	test('Three changes come back to back ', async () => {
+		const content = `/**
+**/
+class x {
+}
+
+
+
+
+class y {
+}`;
+		const model = await getModelAndPrepTree(content);
+
+		let updateListener: IDisposable | undefined;
+		let change: TreeUpdateEvent | undefined;
+
+		const updatePromise = new Promise<void>(resolve => {
+			updateListener = treeSitterParserService.onDidUpdateTree(async e => {
+				if (e.textModel === model) {
+					change = e;
+					resolve();
+				}
+			});
+		});
+
+		const edit1 = new Promise<void>(resolve => {
+			model.applyEdits([{ range: new Range(7, 1, 8, 1), text: '' }]);
+			resolve();
+		});
+		const edit2 = new Promise<void>(resolve => {
+			model.applyEdits([{ range: new Range(6, 1, 7, 1), text: '' }]);
+			resolve();
+		});
+		const edit3 = new Promise<void>(resolve => {
+			model.applyEdits([{ range: new Range(5, 1, 6, 1), text: '' }]);
+			resolve();
+		});
+		const edits = Promise.all([edit1, edit2, edit3]);
+		await updatePromise;
+		await edits;
+		assert.ok(change);
+
+		assert.strictEqual(change.versionId, 4);
+		assert.strictEqual(change.ranges[0].newRangeStartOffset, 7);
+		assert.strictEqual(change.ranges[0].newRangeEndOffset, 32);
+		assert.strictEqual(change.ranges[0].newRange.startLineNumber, 2);
+		assert.strictEqual(change.ranges[0].newRange.endLineNumber, 7);
+
+		updateListener?.dispose();
+		modelService.destroyModel(model.uri);
+	});
+
 	test('File single line file', async () => {
 		const content = `console.log('x');`;
 		const model = await getModelAndPrepTree(content);
 		const tokens = treeSitterTokenizationSupport.getTokensInRange(model, new Range(1, 1, 1, 18), 0, 17);
 		verifyTokens(tokens);
-		assert.deepStrictEqual(tokens?.length, 7);
+		assert.deepStrictEqual(tokens?.length, 9);
 		assert.deepStrictEqual(tokensContentSize(tokens), content.length);
 		modelService.destroyModel(model.uri);
 	});
@@ -229,7 +281,7 @@ console.log('x');
 		const model = await getModelAndPrepTree(content);
 		const tokens = treeSitterTokenizationSupport.getTokensInRange(model, new Range(1, 1, 3, 1), 0, 19);
 		verifyTokens(tokens);
-		assert.deepStrictEqual(tokens?.length, 9);
+		assert.deepStrictEqual(tokens?.length, 11);
 		assert.deepStrictEqual(tokensContentSize(tokens), content.length);
 		modelService.destroyModel(model.uri);
 	});
@@ -239,7 +291,7 @@ console.log('x');
 		const model = await getModelAndPrepTree(content);
 		const tokens = treeSitterTokenizationSupport.getTokensInRange(model, new Range(1, 1, 3, 1), 0, 21);
 		verifyTokens(tokens);
-		assert.deepStrictEqual(tokens?.length, 9);
+		assert.deepStrictEqual(tokens?.length, 11);
 		assert.deepStrictEqual(tokensContentSize(tokens), content.length);
 		modelService.destroyModel(model.uri);
 	});
@@ -253,7 +305,7 @@ console.log('7');
 		const model = await getModelAndPrepTree(content);
 		const tokens = treeSitterTokenizationSupport.getTokensInRange(model, new Range(1, 1, 5, 1), 0, 38);
 		verifyTokens(tokens);
-		assert.deepStrictEqual(tokens?.length, 17);
+		assert.deepStrictEqual(tokens?.length, 21);
 		assert.deepStrictEqual(tokensContentSize(tokens), content.length);
 		modelService.destroyModel(model.uri);
 	});
@@ -263,7 +315,7 @@ console.log('7');
 		const model = await getModelAndPrepTree(content);
 		const tokens = treeSitterTokenizationSupport.getTokensInRange(model, new Range(1, 1, 5, 1), 0, 42);
 		verifyTokens(tokens);
-		assert.deepStrictEqual(tokens?.length, 17);
+		assert.deepStrictEqual(tokens?.length, 21);
 		assert.deepStrictEqual(tokensContentSize(tokens), content.length);
 		modelService.destroyModel(model.uri);
 	});
@@ -277,7 +329,7 @@ console.log('7');
 		const model = await getModelAndPrepTree(content);
 		const tokens = treeSitterTokenizationSupport.getTokensInRange(model, new Range(1, 1, 5, 1), 0, 24);
 		verifyTokens(tokens);
-		assert.deepStrictEqual(tokens?.length, 14);
+		assert.deepStrictEqual(tokens?.length, 16);
 		assert.deepStrictEqual(tokensContentSize(tokens), content.length);
 		modelService.destroyModel(model.uri);
 	});
@@ -287,7 +339,7 @@ console.log('7');
 		const model = await getModelAndPrepTree(content);
 		const tokens = treeSitterTokenizationSupport.getTokensInRange(model, new Range(1, 1, 5, 1), 0, 28);
 		verifyTokens(tokens);
-		assert.deepStrictEqual(tokens?.length, 14);
+		assert.deepStrictEqual(tokens?.length, 16);
 		assert.deepStrictEqual(tokensContentSize(tokens), content.length);
 		modelService.destroyModel(model.uri);
 	});
@@ -302,7 +354,7 @@ console.log('x');
 		const model = await getModelAndPrepTree(content);
 		const tokens = treeSitterTokenizationSupport.getTokensInRange(model, new Range(1, 1, 6, 1), 0, 28);
 		verifyTokens(tokens);
-		assert.deepStrictEqual(tokens?.length, 10);
+		assert.deepStrictEqual(tokens?.length, 12);
 		assert.deepStrictEqual(tokensContentSize(tokens), content.length);
 		modelService.destroyModel(model.uri);
 	});
@@ -312,7 +364,7 @@ console.log('x');
 		const model = await getModelAndPrepTree(content);
 		const tokens = treeSitterTokenizationSupport.getTokensInRange(model, new Range(1, 1, 6, 1), 0, 33);
 		verifyTokens(tokens);
-		assert.deepStrictEqual(tokens?.length, 10);
+		assert.deepStrictEqual(tokens?.length, 12);
 		assert.deepStrictEqual(tokensContentSize(tokens), content.length);
 		modelService.destroyModel(model.uri);
 	});
@@ -343,61 +395,12 @@ class Y {
 		modelService.destroyModel(model.uri);
 	});
 
-	test('Three changes come back to back ', async () => {
-		const content = `/**
-**/
-class x {
-}
-
-
-
-
-class y {
-}`;
-		const model = await getModelAndPrepTree(content);
-
-		let updateListener: IDisposable | undefined;
-		let change: TreeUpdateEvent | undefined;
-
-		const updatePromise = new Promise<void>(resolve => {
-			updateListener = treeSitterParserService.onDidUpdateTree(async e => {
-				change = e;
-				resolve();
-			});
-		});
-
-		const edit1 = new Promise<void>(resolve => {
-			model.applyEdits([{ range: new Range(7, 1, 8, 1), text: '' }]);
-			resolve();
-		});
-		const edit2 = new Promise<void>(resolve => {
-			model.applyEdits([{ range: new Range(6, 1, 7, 1), text: '' }]);
-			resolve();
-		});
-		const edit3 = new Promise<void>(resolve => {
-			model.applyEdits([{ range: new Range(5, 1, 6, 1), text: '' }]);
-			resolve();
-		});
-		Promise.all([edit1, edit2, edit3]);
-		await updatePromise;
-		assert.ok(change);
-
-		assert.strictEqual(change.versionId, 4);
-		assert.strictEqual(change.ranges[0].newRangeStartOffset, 7);
-		assert.strictEqual(change.ranges[0].newRangeEndOffset, 32);
-		assert.strictEqual(change.ranges[0].newRange.startLineNumber, 2);
-		assert.strictEqual(change.ranges[0].newRange.endLineNumber, 7);
-
-		updateListener?.dispose();
-		modelService.destroyModel(model.uri);
-	});
-
 	test('Template string', async () => {
 		const content = '`t ${6}`';
 		const model = await getModelAndPrepTree(content);
 		const tokens = treeSitterTokenizationSupport.getTokensInRange(model, new Range(1, 1, 1, 8), 0, 8);
 		verifyTokens(tokens);
-		assert.deepStrictEqual(tokens?.length, 5);
+		assert.deepStrictEqual(tokens?.length, 6);
 		assert.deepStrictEqual(tokensContentSize(tokens), content.length);
 		modelService.destroyModel(model.uri);
 	});
@@ -412,7 +415,7 @@ class y {
 		const model = await getModelAndPrepTree(content);
 		const tokens = treeSitterTokenizationSupport.getTokensInRange(model, new Range(1, 1, 6, 5), 0, 238);
 		verifyTokens(tokens);
-		assert.deepStrictEqual(tokens?.length, 56);
+		assert.deepStrictEqual(tokens?.length, 65);
 		assert.deepStrictEqual(tokensContentSize(tokens), content.length);
 		modelService.destroyModel(model.uri);
 	});

From dd93ced4803d133743fc4f5d9bb49a21bf9b0961 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Wed, 5 Mar 2025 19:35:32 +0100
Subject: [PATCH 0660/1815] Fixes potential endless loop in observable stack
 trace computation (#242716)

---
 .../common/observableInternal/logging/debugger/devToolsLogger.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/base/common/observableInternal/logging/debugger/devToolsLogger.ts b/src/vs/base/common/observableInternal/logging/debugger/devToolsLogger.ts
index a09e2f2683a0..4aa717b62d15 100644
--- a/src/vs/base/common/observableInternal/logging/debugger/devToolsLogger.ts
+++ b/src/vs/base/common/observableInternal/logging/debugger/devToolsLogger.ts
@@ -300,6 +300,7 @@ export class DevToolsLogger implements IObservableLogger {
 			if (!shallow) {
 				console.error('Could not find location for declaration', new Error().stack);
 				loc = { fileName: 'unknown', line: 0, column: 0, id: 'unknown' };
+				break;
 			}
 			shallow = false;
 		}

From e49e9aee0317a3e7ef99e0b48c0c78b4495b3d5f Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Wed, 5 Mar 2025 19:36:26 +0100
Subject: [PATCH 0661/1815] Turns on hot reload when VSCODE_DEV_DEBUG is set
 (#242717)

---
 src/vs/base/common/hotReload.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/vs/base/common/hotReload.ts b/src/vs/base/common/hotReload.ts
index 80901b470f0d..4f0e1341681c 100644
--- a/src/vs/base/common/hotReload.ts
+++ b/src/vs/base/common/hotReload.ts
@@ -6,12 +6,8 @@
 import { IDisposable } from './lifecycle.js';
 import { env } from './process.js';
 
-function hotReloadDisabled() {
-	return true; // TODO@hediet fix hot reload.
-}
-
 export function isHotReloadEnabled(): boolean {
-	return !hotReloadDisabled() && env && !!env['VSCODE_DEV'];
+	return env && !!env['VSCODE_DEV_DEBUG'];
 }
 export function registerHotReloadHandler(handler: HotReloadHandler): IDisposable {
 	if (!isHotReloadEnabled()) {

From 0b257aaeb4e0a3cb9a37262c34757c9727e197b1 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Wed, 5 Mar 2025 13:41:09 -0500
Subject: [PATCH 0662/1815] add `--locate-shell-integration-path` to `code`
 spec with suggestions (#242708)

fix #242467
---
 .../terminal-suggest/src/completions/code.ts     | 16 ++++++++++++++++
 .../src/test/completions/code.test.ts            |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/extensions/terminal-suggest/src/completions/code.ts b/extensions/terminal-suggest/src/completions/code.ts
index c514a32e2e19..9830d6cff422 100644
--- a/extensions/terminal-suggest/src/completions/code.ts
+++ b/extensions/terminal-suggest/src/completions/code.ts
@@ -135,6 +135,22 @@ const commonOptions: Fig.Option[] = [
 		name: ['-h', '--help'],
 		description: 'Print usage',
 	},
+	{
+		name: '--locate-shell-integration-path',
+		description:
+			'Print the path to the shell integration script for the provided shell',
+		args: {
+			isOptional: false,
+			name: 'shell',
+			description: 'The shell to locate the integration script for',
+			suggestions: [
+				'bash',
+				'fish',
+				'pwsh',
+				'zsh',
+			]
+		}
+	}
 ];
 
 const extensionManagementOptions: Fig.Option[] = [
diff --git a/extensions/terminal-suggest/src/test/completions/code.test.ts b/extensions/terminal-suggest/src/test/completions/code.test.ts
index e90d3120ff4e..c6823d19a997 100644
--- a/extensions/terminal-suggest/src/test/completions/code.test.ts
+++ b/extensions/terminal-suggest/src/test/completions/code.test.ts
@@ -8,7 +8,7 @@ import codeCompletionSpec from '../../completions/code';
 import { testPaths, type ISuiteSpec, type ITestSpec } from '../helpers';
 import codeInsidersCompletionSpec from '../../completions/code-insiders';
 
-export const codeSpecOptions = ['-', '--add', '--category', '--diff', '--disable-extension', '--disable-extensions', '--disable-gpu', '--enable-proposed-api', '--extensions-dir', '--goto', '--help', '--inspect-brk-extensions', '--inspect-extensions', '--install-extension', '--list-extensions', '--locale', '--log', '--max-memory', '--merge', '--new-window', '--pre-release', '--prof-startup', '--profile', '--reuse-window', '--show-versions', '--status', '--sync', '--telemetry', '--uninstall-extension', '--user-data-dir', '--verbose', '--version', '--wait', '-a', '-d', '-g', '-h', '-m', '-n', '-r', '-s', '-v', '-w'];
+export const codeSpecOptions = ['-', '--add', '--category', '--diff', '--disable-extension', '--disable-extensions', '--disable-gpu', '--enable-proposed-api', '--extensions-dir', '--goto', '--help', '--inspect-brk-extensions', '--inspect-extensions', '--install-extension', '--list-extensions', '--locale', '--locate-shell-integration-path', '--log', '--max-memory', '--merge', '--new-window', '--pre-release', '--prof-startup', '--profile', '--reuse-window', '--show-versions', '--status', '--sync', '--telemetry', '--uninstall-extension', '--user-data-dir', '--verbose', '--version', '--wait', '-a', '-d', '-g', '-h', '-m', '-n', '-r', '-s', '-v', '-w'];
 
 
 export function createCodeTestSpecs(executable: string): ITestSpec[] {

From c790f5e7773ad465e9a825728e86d0a4a14a3d60 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Wed, 5 Mar 2025 19:43:12 +0100
Subject: [PATCH 0663/1815] Adds VSCODE_DEV_DEBUG to turn on extension-based
 observable logging (#242695)

* Adds VSCODE_DEV_DEBUG to turn on extension-based observable logging

* Fixes CI

* Fixes CI
---
 .vscode/launch.json                           | 61 ++++++++++++++++++-
 .../base/common/observableInternal/index.ts   |  7 +++
 .../logging/debugger/devToolsLogger.ts        |  8 ++-
 3 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index afd57934304f..f922b5d9c803 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -251,7 +251,51 @@
 			"timeout": 0,
 			"env": {
 				"VSCODE_EXTHOST_WILL_SEND_SOCKET": null,
-				"VSCODE_SKIP_PRELAUNCH": "1"
+				"VSCODE_SKIP_PRELAUNCH": "1",
+			},
+			"cleanUp": "wholeBrowser",
+			"runtimeArgs": [
+				"--inspect-brk=5875",
+				"--no-cached-data",
+				"--crash-reporter-directory=${workspaceFolder}/.profile-oss/crashes",
+				// for general runtime freezes: https://github.com/microsoft/vscode/issues/127861#issuecomment-904144910
+				"--disable-features=CalculateNativeWinOcclusion",
+				"--disable-extension=vscode.vscode-api-tests"
+			],
+			"userDataDir": "${userHome}/.vscode-oss-dev",
+			"webRoot": "${workspaceFolder}",
+			"cascadeTerminateToConfigurations": [
+				"Attach to Extension Host"
+			],
+			"pauseForSourceMap": false,
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
+			],
+			"browserLaunchLocation": "workspace",
+			"presentation": {
+				"hidden": true,
+			},
+		},
+		{
+			// To debug observables you also need the extension "ms-vscode.debug-value-editor"
+			"type": "chrome",
+			"request": "launch",
+			"name": "Launch VS Code Internal (Dev Debug)",
+			"windows": {
+				"runtimeExecutable": "${workspaceFolder}/scripts/code.bat"
+			},
+			"osx": {
+				"runtimeExecutable": "${workspaceFolder}/scripts/code.sh"
+			},
+			"linux": {
+				"runtimeExecutable": "${workspaceFolder}/scripts/code.sh"
+			},
+			"port": 9222,
+			"timeout": 0,
+			"env": {
+				"VSCODE_EXTHOST_WILL_SEND_SOCKET": null,
+				"VSCODE_SKIP_PRELAUNCH": "1",
+				"VSCODE_DEV_DEBUG": "1",
 			},
 			"cleanUp": "wholeBrowser",
 			"runtimeArgs": [
@@ -568,6 +612,21 @@
 				"order": 1
 			}
 		},
+		{
+			"name": "VS Code (Debug Observables)",
+			"stopAll": true,
+			"configurations": [
+				"Launch VS Code Internal (Dev Debug)",
+				"Attach to Main Process",
+				"Attach to Extension Host",
+				"Attach to Shared Process",
+			],
+			"preLaunchTask": "Ensure Prelaunch Dependencies",
+			"presentation": {
+				"group": "0_vscode",
+				"order": 1
+			}
+		},
 		{
 			"name": "Search, Renderer, and Main processes",
 			"configurations": [
diff --git a/src/vs/base/common/observableInternal/index.ts b/src/vs/base/common/observableInternal/index.ts
index 8fe37f4c48ac..c86501e702aa 100644
--- a/src/vs/base/common/observableInternal/index.ts
+++ b/src/vs/base/common/observableInternal/index.ts
@@ -16,6 +16,8 @@ export { type DebugOwner } from './debugName.js';
 
 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';
 
 setLogObservableFn(logObservableToConsole);
 
@@ -27,3 +29,8 @@ const enableLogging = false
 if (enableLogging) {
 	addLogger(new ConsoleObservableLogger());
 }
+
+if (env && env['VSCODE_DEV_DEBUG']) {
+	// To debug observables you also need the extension "ms-vscode.debug-value-editor"
+	addLogger(DevToolsLogger.getInstance());
+}
diff --git a/src/vs/base/common/observableInternal/logging/debugger/devToolsLogger.ts b/src/vs/base/common/observableInternal/logging/debugger/devToolsLogger.ts
index 4aa717b62d15..208c623cf7e4 100644
--- a/src/vs/base/common/observableInternal/logging/debugger/devToolsLogger.ts
+++ b/src/vs/base/common/observableInternal/logging/debugger/devToolsLogger.ts
@@ -282,11 +282,13 @@ export class DevToolsLogger implements IObservableLogger {
 		let shallow = true;
 		let loc!: ILocation;
 
+		const Err = Error as any as { stackTraceLimit: number }; // For the monaco editor checks, which don't have the nodejs types.
+
 		while (true) {
-			const l = Error.stackTraceLimit;
-			Error.stackTraceLimit = shallow ? 6 : 20;
+			const l = Err.stackTraceLimit;
+			Err.stackTraceLimit = shallow ? 6 : 20;
 			const stack = new Error().stack!;
-			Error.stackTraceLimit = l;
+			Err.stackTraceLimit = l;
 
 			let result = getFirstStackFrameOutsideOf(stack, /[/\\]observableInternal[/\\]|\.observe|[/\\]util(s)?\./);
 

From 95ab795ff0f0a650f2f6fbbb0af1deec4ca552ed Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <2644648+TylerLeonhardt@users.noreply.github.com>
Date: Wed, 5 Mar 2025 10:55:10 -0800
Subject: [PATCH 0664/1815] Detach authority/tenant from the PublicClientApp
 (#242719)

everything
---
 .../src/common/accountAccess.ts               |  54 +++++--
 .../src/common/publicClientCache.ts           |   6 +-
 .../src/common/scopeData.ts                   |  10 +-
 .../src/node/authProvider.ts                  |  86 +++++++++---
 .../src/node/cachedPublicClientApplication.ts |  67 +++++----
 .../src/node/flows.ts                         |   7 +-
 .../src/node/publicClientCache.ts             | 132 ++++++++++++------
 7 files changed, 251 insertions(+), 111 deletions(-)

diff --git a/extensions/microsoft-authentication/src/common/accountAccess.ts b/extensions/microsoft-authentication/src/common/accountAccess.ts
index a8fdeefef987..98d998c47b72 100644
--- a/extensions/microsoft-authentication/src/common/accountAccess.ts
+++ b/extensions/microsoft-authentication/src/common/accountAccess.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, Event, EventEmitter, SecretStorage } from 'vscode';
+import { Disposable, Event, EventEmitter, LogOutputChannel, SecretStorage } from 'vscode';
 import { AccountInfo } from '@azure/msal-node';
 
 interface IAccountAccess {
@@ -21,17 +21,19 @@ export class ScopedAccountAccess implements IAccountAccess {
 	private value = new Array<string>();
 
 	constructor(
-		private readonly _secretStorage: SecretStorage,
-		private readonly _cloudName: string,
-		private readonly _clientId: string,
-		private readonly _authority: string
+		secretStorage: SecretStorage,
+		cloudName: string,
+		clientId: string,
+		logger: LogOutputChannel,
+		authoritiesToMigrate?: string[],
 	) {
-		this._accountAccessSecretStorage = new AccountAccessSecretStorage(this._secretStorage, this._cloudName, this._clientId, this._authority);
+		this._accountAccessSecretStorage = new AccountAccessSecretStorage(secretStorage, cloudName, clientId, logger, authoritiesToMigrate);
 		this._accountAccessSecretStorage.onDidChange(() => this.update());
 	}
 
-	initialize() {
-		return this.update();
+	async initialize() {
+		await this._accountAccessSecretStorage.initialize();
+		await this.update();
 	}
 
 	isAllowedAccess(account: AccountInfo): boolean {
@@ -66,13 +68,14 @@ export class AccountAccessSecretStorage {
 	private readonly _onDidChangeEmitter = new EventEmitter<void>;
 	readonly onDidChange: Event<void> = this._onDidChangeEmitter.event;
 
-	private readonly _key = `accounts-${this._cloudName}-${this._clientId}-${this._authority}`;
+	private readonly _key = `accounts-${this._cloudName}`;
 
 	constructor(
 		private readonly _secretStorage: SecretStorage,
 		private readonly _cloudName: string,
 		private readonly _clientId: string,
-		private readonly _authority: string
+		private readonly _logger: LogOutputChannel,
+		private readonly _authoritiesToMigrate?: string[]
 	) {
 		this._disposable = Disposable.from(
 			this._onDidChangeEmitter,
@@ -84,6 +87,37 @@ export class AccountAccessSecretStorage {
 		);
 	}
 
+	/**
+	 * TODO: Remove this method after a release with the migration
+	 */
+	async initialize(): Promise<void> {
+		if (!this._authoritiesToMigrate) {
+			return;
+		}
+		const current = await this.get();
+		// If the secret storage already has the new key, we have already run the migration
+		if (current) {
+			return;
+		}
+		try {
+			const allValues = new Set<string>();
+			for (const authority of this._authoritiesToMigrate) {
+				const oldKey = `accounts-${this._cloudName}-${this._clientId}-${authority}`;
+				const value = await this._secretStorage.get(oldKey);
+				if (value) {
+					const parsed = JSON.parse(value) as string[];
+					parsed.forEach(v => allValues.add(v));
+				}
+			}
+			if (allValues.size > 0) {
+				await this.store(Array.from(allValues));
+			}
+		} catch (e) {
+			// Migration is best effort
+			this._logger.error(`Failed to migrate account access secret storage: ${e}`);
+		}
+	}
+
 	async get(): Promise<string[] | undefined> {
 		const value = await this._secretStorage.get(this._key);
 		if (!value) {
diff --git a/extensions/microsoft-authentication/src/common/publicClientCache.ts b/extensions/microsoft-authentication/src/common/publicClientCache.ts
index 925a4d1a88c3..9e54e0a2aadc 100644
--- a/extensions/microsoft-authentication/src/common/publicClientCache.ts
+++ b/extensions/microsoft-authentication/src/common/publicClientCache.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 type { AccountInfo, AuthenticationResult, InteractiveRequest, SilentFlowRequest } from '@azure/msal-node';
+import type { AccountInfo, AuthenticationResult, InteractiveRequest, RefreshTokenRequest, SilentFlowRequest } from '@azure/msal-node';
 import type { Disposable, Event } from 'vscode';
 
 export interface ICachedPublicClientApplication extends Disposable {
@@ -11,14 +11,14 @@ export interface ICachedPublicClientApplication extends Disposable {
 	onDidRemoveLastAccount: Event<void>;
 	acquireTokenSilent(request: SilentFlowRequest): Promise<AuthenticationResult>;
 	acquireTokenInteractive(request: InteractiveRequest): Promise<AuthenticationResult>;
+	acquireTokenByRefreshToken(request: RefreshTokenRequest): Promise<AuthenticationResult | null>;
 	removeAccount(account: AccountInfo): Promise<void>;
 	accounts: AccountInfo[];
 	clientId: string;
-	authority: string;
 }
 
 export interface ICachedPublicClientApplicationManager {
 	onDidAccountsChange: Event<{ added: AccountInfo[]; changed: AccountInfo[]; deleted: AccountInfo[] }>;
-	getOrCreate(clientId: string, authority: string): Promise<ICachedPublicClientApplication>;
+	getOrCreate(clientId: string, refreshTokensToMigrate?: string[]): Promise<ICachedPublicClientApplication>;
 	getAll(): ICachedPublicClientApplication[];
 }
diff --git a/extensions/microsoft-authentication/src/common/scopeData.ts b/extensions/microsoft-authentication/src/common/scopeData.ts
index a43f2c431dd4..f6baf20d7ac2 100644
--- a/extensions/microsoft-authentication/src/common/scopeData.ts
+++ b/extensions/microsoft-authentication/src/common/scopeData.ts
@@ -46,6 +46,11 @@ export class ScopeData {
 	 */
 	readonly tenant: string;
 
+	/**
+	 * The tenant ID to use for the token request. This is the value of the `VSCODE_TENANT:...` scope if present, otherwise undefined.
+	 */
+	readonly tenantId: string | undefined;
+
 	constructor(readonly originalScopes: readonly string[] = []) {
 		if (workspace.getConfiguration('microsoft-authentication').get<'v1' | 'v2'>('clientIdVersion') === 'v2') {
 			this._defaultClientId = DEFAULT_CLIENT_ID_V2;
@@ -61,7 +66,8 @@ export class ScopeData {
 		this.scopeStr = modifiedScopes.join(' ');
 		this.scopesToSend = this.getScopesToSend(modifiedScopes);
 		this.clientId = this.getClientId(this.allScopes);
-		this.tenant = this.getTenantId(this.allScopes);
+		this.tenantId = this.getTenantId(this.allScopes);
+		this.tenant = this.tenantId ?? this._defaultTenant;
 	}
 
 	private getClientId(scopes: string[]) {
@@ -79,7 +85,7 @@ export class ScopeData {
 				return current.split('VSCODE_TENANT:')[1];
 			}
 			return prev;
-		}, undefined) ?? this._defaultTenant;
+		}, undefined);
 	}
 
 	private getScopesToSend(scopes: string[]) {
diff --git a/extensions/microsoft-authentication/src/node/authProvider.ts b/extensions/microsoft-authentication/src/node/authProvider.ts
index 40000e086200..1956def085c5 100644
--- a/extensions/microsoft-authentication/src/node/authProvider.ts
+++ b/extensions/microsoft-authentication/src/node/authProvider.ts
@@ -51,12 +51,7 @@ export class MsalAuthProvider implements AuthenticationProvider {
 		private readonly _env: Environment = Environment.AzureCloud
 	) {
 		this._disposables = _context.subscriptions;
-		this._publicClientManager = new CachedPublicClientApplicationManager(
-			_context.globalState,
-			_context.secrets,
-			this._logger,
-			this._env.name
-		);
+		this._publicClientManager = new CachedPublicClientApplicationManager(_context.secrets, this._logger, this._env.name);
 		const accountChangeEvent = this._eventBufferer.wrapEvent(
 			this._publicClientManager.onDidAccountsChange,
 			(last, newEvent) => {
@@ -109,8 +104,8 @@ export class MsalAuthProvider implements AuthenticationProvider {
 			clientTenantMap.get(key)!.refreshTokens.push(session.refreshToken);
 		}
 
-		for (const { clientId, tenant, refreshTokens } of clientTenantMap.values()) {
-			await this.getOrCreatePublicClientApplication(clientId, tenant, refreshTokens);
+		for (const { clientId, refreshTokens } of clientTenantMap.values()) {
+			await this._publicClientManager.getOrCreate(clientId, refreshTokens);
 		}
 	}
 
@@ -173,8 +168,8 @@ export class MsalAuthProvider implements AuthenticationProvider {
 			return allSessions;
 		}
 
-		const cachedPca = await this.getOrCreatePublicClientApplication(scopeData.clientId, scopeData.tenant);
-		const sessions = await this.getAllSessionsForPca(cachedPca, scopeData.originalScopes, scopeData.scopesToSend, options?.account);
+		const cachedPca = await this._publicClientManager.getOrCreate(scopeData.clientId);
+		const sessions = await this.getAllSessionsForPca(cachedPca, scopeData, options?.account);
 		this._logger.info(`[getSessions] [${scopeData.scopeStr}] returned ${sessions.length} session(s)`);
 		return sessions;
 
@@ -185,7 +180,7 @@ export class MsalAuthProvider implements AuthenticationProvider {
 		// Do NOT use `scopes` beyond this place in the code. Use `scopeData` instead.
 
 		this._logger.info('[createSession]', `[${scopeData.scopeStr}]`, 'starting');
-		const cachedPca = await this.getOrCreatePublicClientApplication(scopeData.clientId, scopeData.tenant);
+		const cachedPca = await this._publicClientManager.getOrCreate(scopeData.clientId);
 
 		// Used for showing a friendlier message to the user when the explicitly cancel a flow.
 		let userCancelled: boolean | undefined;
@@ -211,6 +206,7 @@ export class MsalAuthProvider implements AuthenticationProvider {
 				: ExtensionHost.WebWorker,
 		});
 
+		const authority = new URL(scopeData.tenant, this._env.activeDirectoryEndpointUrl).toString();
 		let lastError: Error | undefined;
 		for (const flow of flows) {
 			if (flow !== flows[0]) {
@@ -223,6 +219,7 @@ export class MsalAuthProvider implements AuthenticationProvider {
 			try {
 				const result = await flow.trigger({
 					cachedPca,
+					authority,
 					scopes: scopeData.scopesToSend,
 					loginHint: options.account?.label,
 					windowHandle: window.nativeHandle ? Buffer.from(window.nativeHandle) : undefined,
@@ -260,7 +257,7 @@ export class MsalAuthProvider implements AuthenticationProvider {
 				if (account.homeAccountId === sessionId) {
 					this._telemetryReporter.sendLogoutEvent();
 					promises.push(cachedPca.removeAccount(account));
-					this._logger.info(`[removeSession] [${sessionId}] [${cachedPca.clientId}] [${cachedPca.authority}] removing session...`);
+					this._logger.info(`[removeSession] [${sessionId}] [${cachedPca.clientId}] removing session...`);
 				}
 			}
 		}
@@ -281,26 +278,69 @@ export class MsalAuthProvider implements AuthenticationProvider {
 
 	//#endregion
 
-	private async getOrCreatePublicClientApplication(clientId: string, tenant: string, refreshTokensToMigrate?: string[]): Promise<ICachedPublicClientApplication> {
-		const authority = new URL(tenant, this._env.activeDirectoryEndpointUrl).toString();
-		return await this._publicClientManager.getOrCreate(clientId, authority, refreshTokensToMigrate);
-	}
-
 	private async getAllSessionsForPca(
 		cachedPca: ICachedPublicClientApplication,
-		originalScopes: readonly string[],
-		scopesToSend: string[],
+		scopeData: ScopeData,
 		accountFilter?: AuthenticationSessionAccountInformation
 	): Promise<AuthenticationSession[]> {
-		const accounts = accountFilter
+		let filteredAccounts = accountFilter
 			? cachedPca.accounts.filter(a => a.homeAccountId === accountFilter.id)
 			: cachedPca.accounts;
+
+		// Group accounts by homeAccountId
+		const accountGroups = new Map<string, AccountInfo[]>();
+		for (const account of filteredAccounts) {
+			const existing = accountGroups.get(account.homeAccountId) || [];
+			existing.push(account);
+			accountGroups.set(account.homeAccountId, existing);
+		}
+
+		// Filter to one account per homeAccountId
+		filteredAccounts = Array.from(accountGroups.values()).map(accounts => {
+			if (accounts.length === 1) {
+				return accounts[0];
+			}
+
+			// If we have a specific tenant to target, prefer that one
+			if (scopeData.tenantId) {
+				const matchingTenant = accounts.find(a => a.tenantId === scopeData.tenantId);
+				if (matchingTenant) {
+					return matchingTenant;
+				}
+			}
+
+			// Otherwise prefer the home tenant
+			return accounts.find(a => a.tenantId === a.idTokenClaims?.tid) || accounts[0];
+		});
+
+		const authority = new URL(scopeData.tenant, this._env.activeDirectoryEndpointUrl).toString();
 		const sessions: AuthenticationSession[] = [];
 		return this._eventBufferer.bufferEventsAsync(async () => {
-			for (const account of accounts) {
+			for (const account of filteredAccounts) {
 				try {
-					const result = await cachedPca.acquireTokenSilent({ account, scopes: scopesToSend, redirectUri });
-					sessions.push(this.sessionFromAuthenticationResult(result, originalScopes));
+					let forceRefresh: true | undefined;
+					if (scopeData.tenantId) {
+						// If the tenants do not match, then we need to skip the cache
+						// to get a new token for the new tenant
+						if (account.tenantId !== scopeData.tenantId) {
+							forceRefresh = true;
+						}
+					} else {
+						// If we are requesting the home tenant and we don't yet have
+						// a token for the home tenant, we need to skip the cache
+						// to get a new token for the home tenant
+						if (account.tenantId !== account.idTokenClaims?.tid) {
+							forceRefresh = true;
+						}
+					}
+					const result = await cachedPca.acquireTokenSilent({
+						account,
+						authority,
+						scopes: scopeData.scopesToSend,
+						redirectUri,
+						forceRefresh
+					});
+					sessions.push(this.sessionFromAuthenticationResult(result, scopeData.originalScopes));
 				} catch (e) {
 					// If we can't get a token silently, the account is probably in a bad state so we should skip it
 					// MSAL will log this already, so we don't need to log it again
diff --git a/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts b/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
index 8d081f1a825b..556c8a1b4e4f 100644
--- a/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
+++ b/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { PublicClientApplication, AccountInfo, Configuration, SilentFlowRequest, AuthenticationResult, InteractiveRequest, LogLevel, RefreshTokenRequest } from '@azure/msal-node';
+import { PublicClientApplication, AccountInfo, SilentFlowRequest, AuthenticationResult, InteractiveRequest, LogLevel, RefreshTokenRequest } from '@azure/msal-node';
 import { NativeBrokerPlugin } from '@azure/msal-node-extensions';
-import { Disposable, Memento, SecretStorage, LogOutputChannel, window, ProgressLocation, l10n, EventEmitter } from 'vscode';
+import { Disposable, SecretStorage, LogOutputChannel, window, ProgressLocation, l10n, EventEmitter } from 'vscode';
 import { raceCancellationAndTimeoutError } from '../common/async';
 import { SecretStorageCachePlugin } from '../common/cachePlugin';
 import { MsalLoggerOptions } from '../common/loggerOptions';
@@ -23,11 +23,11 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 	private readonly _secretStorageCachePlugin = new SecretStorageCachePlugin(
 		this._secretStorage,
 		// Include the prefix as a differentiator to other secrets
-		`pca:${JSON.stringify({ clientId: this._clientId, authority: this._authority })}`
+		`pca:${this._clientId}`
 	);
 
 	// Broker properties
-	private readonly _accountAccess = new ScopedAccountAccess(this._secretStorage, this._cloudName, this._clientId, this._authority);
+	private readonly _accountAccess = new ScopedAccountAccess(this._secretStorage, this._cloudName, this.clientId, this._logger, this._authoritiesToMigrate);
 	private readonly _isBrokerAvailable: boolean;
 
 	//#region Events
@@ -42,22 +42,19 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 
 	constructor(
 		private readonly _clientId: string,
-		private readonly _authority: string,
 		private readonly _cloudName: string,
-		private readonly _globalMemento: Memento,
 		private readonly _secretStorage: SecretStorage,
-		private readonly _logger: LogOutputChannel
+		private readonly _logger: LogOutputChannel,
+		private readonly _authoritiesToMigrate?: string[],
 	) {
-		// TODO:@TylerLeonhardt clean up old use of memento. Remove this in an iteration
-		this._globalMemento.update(`lastRemoval:${this._clientId}:${this._authority}`, undefined);
 		const loggerOptions = new MsalLoggerOptions(_logger);
 		const nativeBrokerPlugin = new NativeBrokerPlugin();
 		this._isBrokerAvailable = nativeBrokerPlugin.isBrokerAvailable ?? false;
 		this._pca = new PublicClientApplication({
-			auth: { clientId: _clientId, authority: _authority },
+			auth: { clientId: _clientId },
 			system: {
 				loggerOptions: {
-					correlationId: `${_clientId}] [${_authority}`,
+					correlationId: _clientId,
 					loggerCallback: (level, message, containsPii) => loggerOptions.loggerCallback(level, message, containsPii),
 					logLevel: LogLevel.Trace
 				}
@@ -74,7 +71,6 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 
 	get accounts(): AccountInfo[] { return this._accounts; }
 	get clientId(): string { return this._clientId; }
-	get authority(): string { return this._authority; }
 
 	async initialize(): Promise<void> {
 		if (this._isBrokerAvailable) {
@@ -88,9 +84,9 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 	}
 
 	async acquireTokenSilent(request: SilentFlowRequest): Promise<AuthenticationResult> {
-		this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] starting...`);
+		this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${request.authority}] [${request.scopes.join(' ')}] [${request.account.username}] starting...`);
 		let result = await this._sequencer.queue(() => this._pca.acquireTokenSilent(request));
-		this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] got result`);
+		this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${request.authority}] [${request.scopes.join(' ')}] [${request.account.username}] got result`);
 		// Check expiration of id token and if it's 5min before expiration, force a refresh.
 		// this is what MSAL does for access tokens already so we're just adding it for id tokens since we care about those.
 		// NOTE: Once we stop depending on id tokens for some things we can remove all of this.
@@ -101,13 +97,13 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 				* 1000 // convert to milliseconds
 			);
 			if (fiveMinutesBefore < new Date()) {
-				this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] id token is expired or about to expire. Forcing refresh...`);
+				this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${request.authority}] [${request.scopes.join(' ')}] [${request.account.username}] id token is expired or about to expire. Forcing refresh...`);
 				const newRequest = this._isBrokerAvailable
 					// HACK: Broker doesn't support forceRefresh so we need to pass in claims which will force a refresh
 					? { ...request, claims: '{ "id_token": {}}' }
 					: { ...request, forceRefresh: true };
 				result = await this._sequencer.queue(() => this._pca.acquireTokenSilent(newRequest));
-				this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] got forced result`);
+				this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${request.authority}] [${request.scopes.join(' ')}] [${request.account.username}] got forced result`);
 			}
 			const newIdTokenExpirationInSecs = (result.idTokenClaims as { exp?: number }).exp;
 			if (newIdTokenExpirationInSecs) {
@@ -116,15 +112,15 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 					* 1000 // convert to milliseconds
 				);
 				if (fiveMinutesBefore < new Date()) {
-					this._logger.error(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] id token is still expired.`);
+					this._logger.error(`[acquireTokenSilent] [${this._clientId}] [${request.authority}] [${request.scopes.join(' ')}] [${request.account.username}] id token is still expired.`);
 
 					// HACK: Only for the Broker we try one more time with different claims to force a refresh. Why? We've seen the Broker caching tokens by the claims requested, thus
 					// there has been a situation where both tokens are expired.
 					if (this._isBrokerAvailable) {
-						this._logger.error(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] forcing refresh with different claims...`);
+						this._logger.error(`[acquireTokenSilent] [${this._clientId}] [${request.authority}] [${request.scopes.join(' ')}] [${request.account.username}] forcing refresh with different claims...`);
 						const newRequest = { ...request, claims: '{ "access_token": {}}' };
 						result = await this._sequencer.queue(() => this._pca.acquireTokenSilent(newRequest));
-						this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] got forced result with different claims`);
+						this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${request.authority}] [${request.scopes.join(' ')}] [${request.account.username}] got forced result with different claims`);
 						const newIdTokenExpirationInSecs = (result.idTokenClaims as { exp?: number }).exp;
 						if (newIdTokenExpirationInSecs) {
 							const fiveMinutesBefore = new Date(
@@ -132,7 +128,7 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 								* 1000 // convert to milliseconds
 							);
 							if (fiveMinutesBefore < new Date()) {
-								this._logger.error(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] id token is still expired.`);
+								this._logger.error(`[acquireTokenSilent] [${this._clientId}] [${request.authority}] [${request.scopes.join(' ')}] [${request.account.username}] id token is still expired.`);
 							}
 						}
 					}
@@ -140,15 +136,17 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 			}
 		}
 
-		if (result.account && !result.fromCache && this._verifyIfUsingBroker(result)) {
-			this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] firing event due to change`);
+		if (!result.account) {
+			this._logger.error(`[acquireTokenSilent] [${this._clientId}] [${request.authority}] [${request.scopes.join(' ')}] [${request.account.username}] no account found in result`);
+		} else if (!result.fromCache && this._verifyIfUsingBroker(result)) {
+			this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${request.authority}] [${request.scopes.join(' ')}] [${request.account.username}] firing event due to change`);
 			this._onDidAccountsChangeEmitter.fire({ added: [], changed: [result.account], deleted: [] });
 		}
 		return result;
 	}
 
 	async acquireTokenInteractive(request: InteractiveRequest): Promise<AuthenticationResult> {
-		this._logger.debug(`[acquireTokenInteractive] [${this._clientId}] [${this._authority}] [${request.scopes?.join(' ')}] loopbackClientOverride: ${request.loopbackClient ? 'true' : 'false'}`);
+		this._logger.debug(`[acquireTokenInteractive] [${this._clientId}] [${request.authority}] [${request.scopes?.join(' ')}] loopbackClientOverride: ${request.loopbackClient ? 'true' : 'false'}`);
 		return await window.withProgress(
 			{
 				location: ProgressLocation.Notification,
@@ -180,8 +178,8 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 	 * @param request a {@link RefreshTokenRequest} object that contains the refresh token and other parameters.
 	 * @returns an {@link AuthenticationResult} object that contains the result of the token acquisition operation.
 	 */
-	async acquireTokenByRefreshToken(request: RefreshTokenRequest) {
-		this._logger.debug(`[acquireTokenByRefreshToken] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}]`);
+	async acquireTokenByRefreshToken(request: RefreshTokenRequest): Promise<AuthenticationResult | null> {
+		this._logger.debug(`[acquireTokenByRefreshToken] [${this._clientId}] [${request.authority}] [${request.scopes.join(' ')}]`);
 		const result = await this._sequencer.queue(() => this._pca.acquireTokenByRefreshToken(request));
 		if (result) {
 			// this._setupRefresh(result);
@@ -213,7 +211,14 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 		if (!result.fromNativeBroker) {
 			return true;
 		}
-		const key = result.account!.homeAccountId;
+		// The nativeAccountId is what the broker uses to differenciate all
+		// types of accounts. Even if the "account" is a duplicate of another because
+		// it's actaully a guest account in another tenant.
+		let key = result.account!.nativeAccountId;
+		if (!key) {
+			this._logger.error(`[verifyIfUsingBroker] [${this._clientId}] [${result.account!.username}] no nativeAccountId found. Using homeAccountId instead.`);
+			key = result.account!.homeAccountId;
+		}
 		const lastSeen = this._lastSeen.get(key);
 		const lastTimeAuthed = result.account!.idTokenClaims!.iat!;
 		if (!lastSeen) {
@@ -229,7 +234,7 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 
 	private async _update() {
 		const before = this._accounts;
-		this._logger.debug(`[update] [${this._clientId}] [${this._authority}] CachedPublicClientApplication update before: ${before.length}`);
+		this._logger.debug(`[update] [${this._clientId}] CachedPublicClientApplication update before: ${before.length}`);
 		// Clear in-memory cache so we know we're getting account data from the SecretStorage
 		this._pca.clearCache();
 		let after = await this._pca.getAllAccounts();
@@ -237,7 +242,7 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 			after = after.filter(a => this._accountAccess.isAllowedAccess(a));
 		}
 		this._accounts = after;
-		this._logger.debug(`[update] [${this._clientId}] [${this._authority}] CachedPublicClientApplication update after: ${after.length}`);
+		this._logger.debug(`[update] [${this._clientId}] CachedPublicClientApplication update after: ${after.length}`);
 
 		const beforeSet = new Set(before.map(b => b.homeAccountId));
 		const afterSet = new Set(after.map(a => a.homeAccountId));
@@ -246,13 +251,13 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 		const deleted = before.filter(b => !afterSet.has(b.homeAccountId));
 		if (added.length > 0 || deleted.length > 0) {
 			this._onDidAccountsChangeEmitter.fire({ added, changed: [], deleted });
-			this._logger.debug(`[update] [${this._clientId}] [${this._authority}] CachedPublicClientApplication accounts changed. added: ${added.length}, deleted: ${deleted.length}`);
+			this._logger.debug(`[update] [${this._clientId}] CachedPublicClientApplication accounts changed. added: ${added.length}, deleted: ${deleted.length}`);
 			if (!after.length) {
-				this._logger.debug(`[update] [${this._clientId}] [${this._authority}] CachedPublicClientApplication final account deleted. Firing event.`);
+				this._logger.debug(`[update] [${this._clientId}] CachedPublicClientApplication final account deleted. Firing event.`);
 				this._onDidRemoveLastAccountEmitter.fire();
 			}
 		}
-		this._logger.debug(`[update] [${this._clientId}] [${this._authority}] CachedPublicClientApplication update complete`);
+		this._logger.debug(`[update] [${this._clientId}] CachedPublicClientApplication update complete`);
 	}
 }
 
diff --git a/extensions/microsoft-authentication/src/node/flows.ts b/extensions/microsoft-authentication/src/node/flows.ts
index c6f40a943f61..ac678d8313dc 100644
--- a/extensions/microsoft-authentication/src/node/flows.ts
+++ b/extensions/microsoft-authentication/src/node/flows.ts
@@ -25,6 +25,7 @@ interface IMsalFlowOptions {
 
 interface IMsalFlowTriggerOptions {
 	cachedPca: ICachedPublicClientApplication;
+	authority: string;
 	scopes: string[];
 	loginHint?: string;
 	windowHandle?: Buffer;
@@ -45,11 +46,12 @@ class DefaultLoopbackFlow implements IMsalFlow {
 		supportsWebWorkerExtensionHost: false
 	};
 
-	async trigger({ cachedPca, scopes, loginHint, windowHandle, logger }: IMsalFlowTriggerOptions): Promise<AuthenticationResult> {
+	async trigger({ cachedPca, authority, scopes, loginHint, windowHandle, logger }: IMsalFlowTriggerOptions): Promise<AuthenticationResult> {
 		logger.info('Trying default msal flow...');
 		return await cachedPca.acquireTokenInteractive({
 			openBrowser: async (url: string) => { await env.openExternal(Uri.parse(url)); },
 			scopes,
+			authority,
 			successTemplate: loopbackTemplate,
 			errorTemplate: loopbackTemplate,
 			loginHint,
@@ -66,12 +68,13 @@ class UrlHandlerFlow implements IMsalFlow {
 		supportsWebWorkerExtensionHost: false
 	};
 
-	async trigger({ cachedPca, scopes, loginHint, windowHandle, logger, uriHandler }: IMsalFlowTriggerOptions): Promise<AuthenticationResult> {
+	async trigger({ cachedPca, authority, scopes, loginHint, windowHandle, logger, uriHandler }: IMsalFlowTriggerOptions): Promise<AuthenticationResult> {
 		logger.info('Trying protocol handler flow...');
 		const loopbackClient = new UriHandlerLoopbackClient(uriHandler, redirectUri, logger);
 		return await cachedPca.acquireTokenInteractive({
 			openBrowser: (url: string) => loopbackClient.openBrowser(url),
 			scopes,
+			authority,
 			loopbackClient,
 			loginHint,
 			prompt: loginHint ? undefined : 'select_account',
diff --git a/extensions/microsoft-authentication/src/node/publicClientCache.ts b/extensions/microsoft-authentication/src/node/publicClientCache.ts
index f4f19ff8df53..d8b5ebc610bd 100644
--- a/extensions/microsoft-authentication/src/node/publicClientCache.ts
+++ b/extensions/microsoft-authentication/src/node/publicClientCache.ts
@@ -14,8 +14,8 @@ export interface IPublicClientApplicationInfo {
 }
 
 export class CachedPublicClientApplicationManager implements ICachedPublicClientApplicationManager {
-	// The key is the clientId and authority JSON stringified
-	private readonly _pcas = new Map<string, CachedPublicClientApplication>();
+	// The key is the clientId
+	private readonly _pcas = new Map<string, ICachedPublicClientApplication>();
 	private readonly _pcaDisposables = new Map<string, Disposable>();
 
 	private _disposable: Disposable;
@@ -25,7 +25,6 @@ export class CachedPublicClientApplicationManager implements ICachedPublicClient
 	readonly onDidAccountsChange = this._onDidAccountsChangeEmitter.event;
 
 	constructor(
-		private readonly _globalMemento: Memento,
 		private readonly _secretStorage: SecretStorage,
 		private readonly _logger: LogOutputChannel,
 		private readonly _cloudName: string
@@ -44,26 +43,27 @@ export class CachedPublicClientApplicationManager implements ICachedPublicClient
 
 	async initialize() {
 		this._logger.debug('[initialize] Initializing PublicClientApplicationManager');
-		let keys: string[] | undefined;
+		let clientIds: string[] | undefined;
+		let migrations: Map<string, string[]> | undefined;
 		try {
-			keys = await this._pcasSecretStorage.get();
+			migrations = await this._getMigrationsPerClientId();
+			clientIds = await this._pcasSecretStorage.get();
 		} catch (e) {
 			// data is corrupted
 			this._logger.error('[initialize] Error initializing PublicClientApplicationManager:', e);
 			await this._pcasSecretStorage.delete();
 		}
-		if (!keys) {
+		if (!clientIds) {
 			return;
 		}
 
 		const promises = new Array<Promise<ICachedPublicClientApplication>>();
-		for (const key of keys) {
+		for (const clientId of clientIds) {
 			try {
-				const { clientId, authority } = JSON.parse(key) as IPublicClientApplicationInfo;
 				// Load the PCA in memory
-				promises.push(this._doCreatePublicClientApplication(clientId, authority, key));
+				promises.push(this._doCreatePublicClientApplication(clientId));
 			} catch (e) {
-				this._logger.error('[initialize] Error intitializing PCA:', key);
+				this._logger.error('[initialize] Error intitializing PCA:', clientId);
 			}
 		}
 
@@ -75,11 +75,11 @@ export class CachedPublicClientApplicationManager implements ICachedPublicClient
 			} else {
 				if (!result.value.accounts.length) {
 					pcasChanged = true;
-					const pcaKey = JSON.stringify({ clientId: result.value.clientId, authority: result.value.authority });
-					this._pcaDisposables.get(pcaKey)?.dispose();
-					this._pcaDisposables.delete(pcaKey);
-					this._pcas.delete(pcaKey);
-					this._logger.debug(`[initialize] [${result.value.clientId}] [${result.value.authority}] PCA disposed because it's empty.`);
+					const clientId = result.value.clientId;
+					this._pcaDisposables.get(clientId)?.dispose();
+					this._pcaDisposables.delete(clientId);
+					this._pcas.delete(clientId);
+					this._logger.debug(`[initialize] [${clientId}] PCA disposed because it's empty.`);
 				}
 			}
 		}
@@ -89,37 +89,52 @@ export class CachedPublicClientApplicationManager implements ICachedPublicClient
 		this._logger.debug('[initialize] PublicClientApplicationManager initialized');
 	}
 
+	private async _getMigrationsPerClientId(): Promise<Map<string, string[]> | undefined> {
+		await this._pcasSecretStorage.initialize();
+		const oldValue = await this._pcasSecretStorage.getOldValue();
+		// returns a map of clientIds to the authorities found in the old value
+		if (!oldValue) {
+			return undefined;
+		}
+		const result = new Map<string, string[]>();
+		for (const { clientId, authority } of oldValue) {
+			if (!result.has(clientId)) {
+				result.set(clientId, []);
+			}
+			result.get(clientId)?.push(authority);
+		}
+		return result;
+	}
+
 	dispose() {
 		this._disposable.dispose();
 		Disposable.from(...this._pcaDisposables.values()).dispose();
 	}
 
-	async getOrCreate(clientId: string, authority: string, refreshTokensToMigrate?: string[]): Promise<ICachedPublicClientApplication> {
-		// Use the clientId and authority as the key
-		const pcasKey = JSON.stringify({ clientId, authority });
-		let pca = this._pcas.get(pcasKey);
+	async getOrCreate(clientId: string, refreshTokensToMigrate?: string[]): Promise<ICachedPublicClientApplication> {
+		let pca = this._pcas.get(clientId);
 		if (pca) {
-			this._logger.debug(`[getOrCreate] [${clientId}] [${authority}] PublicClientApplicationManager cache hit`);
+			this._logger.debug(`[getOrCreate] [${clientId}] PublicClientApplicationManager cache hit`);
 		} else {
-			this._logger.debug(`[getOrCreate] [${clientId}] [${authority}] PublicClientApplicationManager cache miss, creating new PCA...`);
-			pca = await this._doCreatePublicClientApplication(clientId, authority, pcasKey);
+			this._logger.debug(`[getOrCreate] [${clientId}] PublicClientApplicationManager cache miss, creating new PCA...`);
+			pca = await this._doCreatePublicClientApplication(clientId, refreshTokensToMigrate);
 			await this._storePublicClientApplications();
-			this._logger.debug(`[getOrCreate] [${clientId}] [${authority}] PCA created.`);
+			this._logger.debug(`[getOrCreate] [${clientId}] PCA created.`);
 		}
 
 		// TODO: MSAL Migration. Remove this when we remove the old flow.
 		if (refreshTokensToMigrate?.length) {
-			this._logger.debug(`[getOrCreate] [${clientId}] [${authority}] Migrating refresh tokens to PCA...`);
+			this._logger.debug(`[getOrCreate] [${clientId}] Migrating refresh tokens to PCA...`);
 			for (const refreshToken of refreshTokensToMigrate) {
 				try {
 					// Use the refresh token to acquire a result. This will cache the refresh token for future operations.
 					// The scopes don't matter here since we can create any token from the refresh token.
 					const result = await pca.acquireTokenByRefreshToken({ refreshToken, forceCache: true, scopes: [] });
 					if (result?.account) {
-						this._logger.debug(`[getOrCreate] [${clientId}] [${authority}] Refresh token migrated to PCA.`);
+						this._logger.debug(`[getOrCreate] [${clientId}] Refresh token migrated to PCA.`);
 					}
 				} catch (e) {
-					this._logger.error(`[getOrCreate] [${clientId}] [${authority}] Error migrating refresh token:`, e);
+					this._logger.error(`[getOrCreate] [${clientId}] Error migrating refresh token:`, e);
 				}
 			}
 			// reinitialize the PCA so the account is properly cached
@@ -128,9 +143,9 @@ export class CachedPublicClientApplicationManager implements ICachedPublicClient
 		return pca;
 	}
 
-	private async _doCreatePublicClientApplication(clientId: string, authority: string, pcasKey: string) {
-		const pca = new CachedPublicClientApplication(clientId, authority, this._cloudName, this._globalMemento, this._secretStorage, this._logger);
-		this._pcas.set(pcasKey, pca);
+	private async _doCreatePublicClientApplication(clientId: string, authoritiesToMigrate?: string[]): Promise<ICachedPublicClientApplication> {
+		const pca = new CachedPublicClientApplication(clientId, this._cloudName, this._secretStorage, this._logger, authoritiesToMigrate);
+		this._pcas.set(clientId, pca);
 		const disposable = Disposable.from(
 			pca,
 			pca.onDidAccountsChange(e => this._onDidAccountsChangeEmitter.fire(e)),
@@ -138,13 +153,13 @@ export class CachedPublicClientApplicationManager implements ICachedPublicClient
 				// The PCA has no more accounts, so we can dispose it so we're not keeping it
 				// around forever.
 				disposable.dispose();
-				this._pcaDisposables.delete(pcasKey);
-				this._pcas.delete(pcasKey);
-				this._logger.debug(`[_doCreatePublicClientApplication] [${clientId}] [${authority}] PCA disposed. Firing off storing of PCAs...`);
+				this._pcaDisposables.delete(clientId);
+				this._pcas.delete(clientId);
+				this._logger.debug(`[_doCreatePublicClientApplication] [${clientId}] PCA disposed. Firing off storing of PCAs...`);
 				void this._storePublicClientApplications();
 			})
 		);
-		this._pcaDisposables.set(pcasKey, disposable);
+		this._pcaDisposables.set(clientId, disposable);
 		// Intialize the PCA after the `onDidAccountsChange` is set so we get initial state.
 		await pca.initialize();
 		return pca;
@@ -183,15 +198,14 @@ export class CachedPublicClientApplicationManager implements ICachedPublicClient
 		}
 
 		// Handle the new ones
-		for (const newPca of pcaKeysFromStorage) {
+		for (const clientId of pcaKeysFromStorage) {
 			try {
-				const { clientId, authority } = JSON.parse(newPca);
-				this._logger.debug(`[_handleSecretStorageChange] [${clientId}] [${authority}] Creating new PCA that was created in another window...`);
-				await this._doCreatePublicClientApplication(clientId, authority, newPca);
-				this._logger.debug(`[_handleSecretStorageChange] [${clientId}] [${authority}] PCA created.`);
+				this._logger.debug(`[_handleSecretStorageChange] [${clientId}] Creating new PCA that was created in another window...`);
+				await this._doCreatePublicClientApplication(clientId);
+				this._logger.debug(`[_handleSecretStorageChange] [${clientId}] PCA created.`);
 			} catch (_e) {
 				// This really shouldn't happen, but should we do something about this?
-				this._logger.error(`Failed to parse new PublicClientApplication: ${newPca}`);
+				this._logger.error(`Failed to create new PublicClientApplication: ${clientId}`);
 				continue;
 			}
 		}
@@ -210,7 +224,8 @@ class PublicClientApplicationsSecretStorage {
 	private readonly _onDidChangeEmitter = new EventEmitter<void>;
 	readonly onDidChange: Event<void> = this._onDidChangeEmitter.event;
 
-	private readonly _key = `publicClientApplications-${this._cloudName}`;
+	private readonly _oldKey = `publicClientApplications-${this._cloudName}`;
+	private readonly _key = `publicClients-${this._cloudName}`;
 
 	constructor(private readonly _secretStorage: SecretStorage, private readonly _cloudName: string) {
 		this._disposable = Disposable.from(
@@ -223,6 +238,24 @@ class PublicClientApplicationsSecretStorage {
 		);
 	}
 
+	/**
+	 * Runs the migration.
+	 * TODO: Remove this after a version.
+	 */
+	async initialize() {
+		const oldValue = await this.getOldValue();
+		if (!oldValue) {
+			return;
+		}
+		const newValue = await this.get() ?? [];
+		for (const { clientId } of oldValue) {
+			if (!newValue.includes(clientId)) {
+				newValue.push(clientId);
+			}
+		}
+		await this.store(newValue);
+	}
+
 	async get(): Promise<string[] | undefined> {
 		const value = await this._secretStorage.get(this._key);
 		if (!value) {
@@ -231,6 +264,25 @@ class PublicClientApplicationsSecretStorage {
 		return JSON.parse(value);
 	}
 
+	/**
+	 * Old representation of data that included the authority. This should be removed in a version or 2.
+	 * @returns An array of objects with clientId and authority
+	 */
+	async getOldValue(): Promise<{ clientId: string; authority: string }[] | undefined> {
+		const value = await this._secretStorage.get(this._oldKey);
+		if (!value) {
+			return undefined;
+		}
+		const result: { clientId: string; authority: string }[] = [];
+		for (const stringifiedObj of JSON.parse(value)) {
+			const obj = JSON.parse(stringifiedObj);
+			if (obj.clientId && obj.authority) {
+				result.push(obj);
+			}
+		}
+		return result;
+	}
+
 	store(value: string[]): Thenable<void> {
 		return this._secretStorage.store(this._key, JSON.stringify(value));
 	}

From 9e0461087bd48a91d6576bec219138d7d8170a56 Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <2644648+TylerLeonhardt@users.noreply.github.com>
Date: Wed, 5 Mar 2025 11:58:49 -0800
Subject: [PATCH 0665/1815] Make account access cross client ids (#242721)

The point here is that the user already allowed access to the account for one client id, so that should just apply to any client id that is being used since:
* If we don't actually _have_ an auth token, the user will be asked to log in - so they will see a prompt as expected
* If we _do_ have an auth token, then we rely on extension auth access to gate access to the account

Fixes https://github.com/microsoft/vscode/issues/241526
---
 .../src/common/accountAccess.ts               | 19 ++++++------
 .../src/node/cachedPublicClientApplication.ts |  6 ++--
 .../src/node/publicClientCache.ts             | 31 ++++++-------------
 3 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/extensions/microsoft-authentication/src/common/accountAccess.ts b/extensions/microsoft-authentication/src/common/accountAccess.ts
index 98d998c47b72..ced053110422 100644
--- a/extensions/microsoft-authentication/src/common/accountAccess.ts
+++ b/extensions/microsoft-authentication/src/common/accountAccess.ts
@@ -6,10 +6,11 @@
 import { Disposable, Event, EventEmitter, LogOutputChannel, SecretStorage } from 'vscode';
 import { AccountInfo } from '@azure/msal-node';
 
-interface IAccountAccess {
+export interface IAccountAccess {
+	initialize(): Promise<void>;
 	onDidAccountAccessChange: Event<void>;
 	isAllowedAccess(account: AccountInfo): boolean;
-	setAllowedAccess(account: AccountInfo, allowed: boolean): void;
+	setAllowedAccess(account: AccountInfo, allowed: boolean): Promise<void>;
 }
 
 export class ScopedAccountAccess implements IAccountAccess {
@@ -23,11 +24,10 @@ export class ScopedAccountAccess implements IAccountAccess {
 	constructor(
 		secretStorage: SecretStorage,
 		cloudName: string,
-		clientId: string,
 		logger: LogOutputChannel,
-		authoritiesToMigrate?: string[],
+		migrations?: { clientId: string; authority: string }[],
 	) {
-		this._accountAccessSecretStorage = new AccountAccessSecretStorage(secretStorage, cloudName, clientId, logger, authoritiesToMigrate);
+		this._accountAccessSecretStorage = new AccountAccessSecretStorage(secretStorage, cloudName, logger, migrations);
 		this._accountAccessSecretStorage.onDidChange(() => this.update());
 	}
 
@@ -73,9 +73,8 @@ export class AccountAccessSecretStorage {
 	constructor(
 		private readonly _secretStorage: SecretStorage,
 		private readonly _cloudName: string,
-		private readonly _clientId: string,
 		private readonly _logger: LogOutputChannel,
-		private readonly _authoritiesToMigrate?: string[]
+		private readonly _migrations?: { clientId: string; authority: string }[],
 	) {
 		this._disposable = Disposable.from(
 			this._onDidChangeEmitter,
@@ -91,7 +90,7 @@ export class AccountAccessSecretStorage {
 	 * TODO: Remove this method after a release with the migration
 	 */
 	async initialize(): Promise<void> {
-		if (!this._authoritiesToMigrate) {
+		if (!this._migrations) {
 			return;
 		}
 		const current = await this.get();
@@ -101,8 +100,8 @@ export class AccountAccessSecretStorage {
 		}
 		try {
 			const allValues = new Set<string>();
-			for (const authority of this._authoritiesToMigrate) {
-				const oldKey = `accounts-${this._cloudName}-${this._clientId}-${authority}`;
+			for (const { clientId, authority } of this._migrations) {
+				const oldKey = `accounts-${this._cloudName}-${clientId}-${authority}`;
 				const value = await this._secretStorage.get(oldKey);
 				if (value) {
 					const parsed = JSON.parse(value) as string[];
diff --git a/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts b/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
index 556c8a1b4e4f..7eb74baac5f6 100644
--- a/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
+++ b/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
@@ -10,7 +10,7 @@ import { raceCancellationAndTimeoutError } from '../common/async';
 import { SecretStorageCachePlugin } from '../common/cachePlugin';
 import { MsalLoggerOptions } from '../common/loggerOptions';
 import { ICachedPublicClientApplication } from '../common/publicClientCache';
-import { ScopedAccountAccess } from '../common/accountAccess';
+import { IAccountAccess } from '../common/accountAccess';
 
 export class CachedPublicClientApplication implements ICachedPublicClientApplication {
 	// Core properties
@@ -27,7 +27,6 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 	);
 
 	// Broker properties
-	private readonly _accountAccess = new ScopedAccountAccess(this._secretStorage, this._cloudName, this.clientId, this._logger, this._authoritiesToMigrate);
 	private readonly _isBrokerAvailable: boolean;
 
 	//#region Events
@@ -42,10 +41,9 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 
 	constructor(
 		private readonly _clientId: string,
-		private readonly _cloudName: string,
 		private readonly _secretStorage: SecretStorage,
+		private readonly _accountAccess: IAccountAccess,
 		private readonly _logger: LogOutputChannel,
-		private readonly _authoritiesToMigrate?: string[],
 	) {
 		const loggerOptions = new MsalLoggerOptions(_logger);
 		const nativeBrokerPlugin = new NativeBrokerPlugin();
diff --git a/extensions/microsoft-authentication/src/node/publicClientCache.ts b/extensions/microsoft-authentication/src/node/publicClientCache.ts
index d8b5ebc610bd..7b46406c16e6 100644
--- a/extensions/microsoft-authentication/src/node/publicClientCache.ts
+++ b/extensions/microsoft-authentication/src/node/publicClientCache.ts
@@ -7,6 +7,7 @@ import { AccountInfo } from '@azure/msal-node';
 import { SecretStorage, LogOutputChannel, Disposable, EventEmitter, Memento, Event } from 'vscode';
 import { ICachedPublicClientApplication, ICachedPublicClientApplicationManager } from '../common/publicClientCache';
 import { CachedPublicClientApplication } from './cachedPublicClientApplication';
+import { IAccountAccess, ScopedAccountAccess } from '../common/accountAccess';
 
 export interface IPublicClientApplicationInfo {
 	clientId: string;
@@ -20,6 +21,7 @@ export class CachedPublicClientApplicationManager implements ICachedPublicClient
 
 	private _disposable: Disposable;
 	private _pcasSecretStorage: PublicClientApplicationsSecretStorage;
+	private _accountAccess: IAccountAccess | undefined;
 
 	private readonly _onDidAccountsChangeEmitter = new EventEmitter<{ added: AccountInfo[]; changed: AccountInfo[]; deleted: AccountInfo[] }>();
 	readonly onDidAccountsChange = this._onDidAccountsChangeEmitter.event;
@@ -44,9 +46,11 @@ export class CachedPublicClientApplicationManager implements ICachedPublicClient
 	async initialize() {
 		this._logger.debug('[initialize] Initializing PublicClientApplicationManager');
 		let clientIds: string[] | undefined;
-		let migrations: Map<string, string[]> | undefined;
 		try {
-			migrations = await this._getMigrationsPerClientId();
+			await this._pcasSecretStorage.initialize();
+			//TODO: Remove this in a version
+			const migrations = await this._pcasSecretStorage.getOldValue();
+			this._accountAccess = new ScopedAccountAccess(this._secretStorage, this._cloudName, this._logger, migrations);
 			clientIds = await this._pcasSecretStorage.get();
 		} catch (e) {
 			// data is corrupted
@@ -89,23 +93,6 @@ export class CachedPublicClientApplicationManager implements ICachedPublicClient
 		this._logger.debug('[initialize] PublicClientApplicationManager initialized');
 	}
 
-	private async _getMigrationsPerClientId(): Promise<Map<string, string[]> | undefined> {
-		await this._pcasSecretStorage.initialize();
-		const oldValue = await this._pcasSecretStorage.getOldValue();
-		// returns a map of clientIds to the authorities found in the old value
-		if (!oldValue) {
-			return undefined;
-		}
-		const result = new Map<string, string[]>();
-		for (const { clientId, authority } of oldValue) {
-			if (!result.has(clientId)) {
-				result.set(clientId, []);
-			}
-			result.get(clientId)?.push(authority);
-		}
-		return result;
-	}
-
 	dispose() {
 		this._disposable.dispose();
 		Disposable.from(...this._pcaDisposables.values()).dispose();
@@ -117,7 +104,7 @@ export class CachedPublicClientApplicationManager implements ICachedPublicClient
 			this._logger.debug(`[getOrCreate] [${clientId}] PublicClientApplicationManager cache hit`);
 		} else {
 			this._logger.debug(`[getOrCreate] [${clientId}] PublicClientApplicationManager cache miss, creating new PCA...`);
-			pca = await this._doCreatePublicClientApplication(clientId, refreshTokensToMigrate);
+			pca = await this._doCreatePublicClientApplication(clientId);
 			await this._storePublicClientApplications();
 			this._logger.debug(`[getOrCreate] [${clientId}] PCA created.`);
 		}
@@ -143,8 +130,8 @@ export class CachedPublicClientApplicationManager implements ICachedPublicClient
 		return pca;
 	}
 
-	private async _doCreatePublicClientApplication(clientId: string, authoritiesToMigrate?: string[]): Promise<ICachedPublicClientApplication> {
-		const pca = new CachedPublicClientApplication(clientId, this._cloudName, this._secretStorage, this._logger, authoritiesToMigrate);
+	private async _doCreatePublicClientApplication(clientId: string): Promise<ICachedPublicClientApplication> {
+		const pca = new CachedPublicClientApplication(clientId, this._secretStorage, this._accountAccess!, this._logger);
 		this._pcas.set(clientId, pca);
 		const disposable = Disposable.from(
 			pca,

From b346138cb4f32069712b5c8df6b0862246a85868 Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Wed, 5 Mar 2025 12:52:21 -0800
Subject: [PATCH 0666/1815] more leaked disposable patches (#242727)

Co-authored-by: amunger <>
---
 src/vs/workbench/api/browser/mainThreadNotebookDocuments.ts    | 3 ++-
 .../contrib/notebook/browser/services/notebookServiceImpl.ts   | 2 +-
 .../workbench/contrib/notebook/common/notebookEditorModel.ts   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadNotebookDocuments.ts b/src/vs/workbench/api/browser/mainThreadNotebookDocuments.ts
index c2d1234aa836..72630519cca6 100644
--- a/src/vs/workbench/api/browser/mainThreadNotebookDocuments.ts
+++ b/src/vs/workbench/api/browser/mainThreadNotebookDocuments.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Event } from '../../../base/common/event.js';
 import { DisposableStore, dispose } from '../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../base/common/map.js';
 import { URI, UriComponents } from '../../../base/common/uri.js';
@@ -131,7 +132,7 @@ export class MainThreadNotebookDocuments implements MainThreadNotebookDocumentsS
 
 			// untitled notebooks are disposed when they get saved. we should not hold a reference
 			// to such a disposed notebook and therefore dispose the reference as well
-			ref.object.notebook.onWillDispose(() => {
+			Event.once(ref.object.notebook.onWillDispose)(() => {
 				ref.dispose();
 			});
 
diff --git a/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts b/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
index 1bc15e00ae32..f2925b1b8c87 100644
--- a/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts
@@ -212,7 +212,7 @@ export class NotebookProviderInfoStore extends Disposable {
 
 				// untitled notebooks are disposed when they get saved. we should not hold a reference
 				// to such a disposed notebook and therefore dispose the reference as well
-				ref.object.notebook.onWillDispose(() => {
+				Event.once(ref.object.notebook.onWillDispose)(() => {
 					ref.dispose();
 				});
 
diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
index 68b112f2238a..7b3fc131e99f 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
@@ -141,7 +141,7 @@ export class SimpleNotebookEditorModel extends EditorModel implements INotebookE
 				} else {
 					this._workingCopy = await this._workingCopyManager.resolve({ untitledResource: this.resource, isScratchpad: this.scratchPad });
 				}
-				this._workingCopy.onDidRevert(() => this._onDidRevertUntitled.fire());
+				this._register(this._workingCopy.onDidRevert(() => this._onDidRevertUntitled.fire()));
 			} else {
 				this._workingCopy = await this._workingCopyManager.resolve(this.resource, {
 					limits: options?.limits,

From 5320354418605a50a43b901e1d0258fd52a89f26 Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Wed, 5 Mar 2025 15:55:58 -0800
Subject: [PATCH 0667/1815] track and dispose correctly (#242747)

* track and dispose correctly

* also for markdown cells

---------

Co-authored-by: amunger <>
---
 .../notebook/browser/view/renderers/cellRenderer.ts   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
index 14fdeaef5f7a..84589a5ea0b7 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts
@@ -138,7 +138,7 @@ export class MarkupCellRenderer extends AbstractCellRenderer implements IListRen
 	renderTemplate(rootContainer: HTMLElement): MarkdownCellRenderTemplate {
 		rootContainer.classList.add('markdown-cell-row');
 		const container = DOM.append(rootContainer, DOM.$('.cell-inner-container'));
-		const templateDisposables = this._register(new DisposableStore());
+		const templateDisposables = new DisposableStore();
 		const contextKeyService = templateDisposables.add(this.contextKeyServiceProvider(container));
 		const decorationContainer = DOM.append(rootContainer, $('.cell-decoration'));
 		const titleToolbarContainer = DOM.append(container, $('.cell-title-toolbar'));
@@ -200,7 +200,7 @@ export class MarkupCellRenderer extends AbstractCellRenderer implements IListRen
 			editorContainer,
 			foldingIndicator,
 			templateDisposables,
-			elementDisposables: this._register(new DisposableStore()),
+			elementDisposables: templateDisposables.add(new DisposableStore()),
 			cellParts,
 			toJSON: () => { return {}; }
 		};
@@ -226,7 +226,6 @@ export class MarkupCellRenderer extends AbstractCellRenderer implements IListRen
 	}
 
 	disposeTemplate(templateData: MarkdownCellRenderTemplate): void {
-		templateData.elementDisposables.dispose();
 		templateData.templateDisposables.dispose();
 	}
 
@@ -261,7 +260,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 	renderTemplate(rootContainer: HTMLElement): CodeCellRenderTemplate {
 		rootContainer.classList.add('code-cell-row');
 		const container = DOM.append(rootContainer, DOM.$('.cell-inner-container'));
-		const templateDisposables = this._register(new DisposableStore());
+		const templateDisposables = new DisposableStore();
 		const contextKeyService = templateDisposables.add(this.contextKeyServiceProvider(container));
 		const decorationContainer = DOM.append(rootContainer, $('.cell-decoration'));
 		const focusIndicatorTop = new FastDomNode(DOM.append(container, $('.cell-focus-indicator.cell-focus-indicator-top')));
@@ -367,7 +366,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 			outputShowMoreContainer,
 			editor,
 			templateDisposables,
-			elementDisposables: this._register(new DisposableStore()),
+			elementDisposables: templateDisposables.add(new DisposableStore()),
 			cellParts,
 			toJSON: () => { return {}; }
 		};
@@ -398,7 +397,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
 	}
 
 	disposeTemplate(templateData: CodeCellRenderTemplate): void {
-		templateData.templateDisposables.clear();
+		templateData.templateDisposables.dispose();
 	}
 
 	disposeElement(element: ICellViewModel, index: number, templateData: CodeCellRenderTemplate, height: number | undefined): void {

From 0664c2e14255947653132216d4ffec7a9bfa5878 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 5 Mar 2025 16:06:19 -0800
Subject: [PATCH 0668/1815] eng: add MSRUSTUP_LOG to diagnose CLI build flakes
 (#242749)

---
 build/azure-pipelines/product-build.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 0e5faf242961..3e49db44c2c8 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -279,6 +279,10 @@ extends:
                   name: Azure Pipelines
                   image: macOS-13
                   os: macOS
+                variables:
+                  # todo@connor4312 to diagnose build flakes
+                  - name: MSRUSTUP_LOG
+                    value: debug
                 steps:
                   - template: build/azure-pipelines/darwin/cli-build-darwin.yml@self
                     parameters:
@@ -292,6 +296,10 @@ extends:
                   name: Azure Pipelines
                   image: macOS-13
                   os: macOS
+                variables:
+                  # todo@connor4312 to diagnose build flakes
+                  - name: MSRUSTUP_LOG
+                    value: debug
                 steps:
                   - template: build/azure-pipelines/darwin/cli-build-darwin.yml@self
                     parameters:

From eab6f90c72520928256dfde94792a272e082f0a0 Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <2644648+TylerLeonhardt@users.noreply.github.com>
Date: Wed, 5 Mar 2025 17:50:14 -0800
Subject: [PATCH 0669/1815] Better lifecycle handling (#242758)

I moved to a factory model because there was just so much that needed to be async.

I think the amount of async code will be reduced in the future as we remove some migration logic, but this makes sure we don't accidentally create instances without awaiting their initialization.
---
 .../src/common/accountAccess.ts               | 63 ++++++++++++++-----
 .../src/common/cachePlugin.ts                 |  2 +-
 .../src/common/publicClientCache.ts           |  3 +-
 .../src/extensionV2.ts                        |  6 +-
 .../src/node/authProvider.ts                  | 26 +++++---
 .../src/node/cachedPublicClientApplication.ts | 33 +++++++---
 .../src/node/publicClientCache.ts             | 61 ++++++++++++------
 7 files changed, 137 insertions(+), 57 deletions(-)

diff --git a/extensions/microsoft-authentication/src/common/accountAccess.ts b/extensions/microsoft-authentication/src/common/accountAccess.ts
index ced053110422..27d56b0bc1b7 100644
--- a/extensions/microsoft-authentication/src/common/accountAccess.ts
+++ b/extensions/microsoft-authentication/src/common/accountAccess.ts
@@ -7,32 +7,47 @@ import { Disposable, Event, EventEmitter, LogOutputChannel, SecretStorage } from
 import { AccountInfo } from '@azure/msal-node';
 
 export interface IAccountAccess {
-	initialize(): Promise<void>;
 	onDidAccountAccessChange: Event<void>;
 	isAllowedAccess(account: AccountInfo): boolean;
 	setAllowedAccess(account: AccountInfo, allowed: boolean): Promise<void>;
 }
 
-export class ScopedAccountAccess implements IAccountAccess {
+export class ScopedAccountAccess implements IAccountAccess, Disposable {
 	private readonly _onDidAccountAccessChangeEmitter = new EventEmitter<void>();
 	readonly onDidAccountAccessChange = this._onDidAccountAccessChangeEmitter.event;
 
-	private readonly _accountAccessSecretStorage: AccountAccessSecretStorage;
-
 	private value = new Array<string>();
 
-	constructor(
+	private readonly _disposable: Disposable;
+
+	private constructor(
+		private readonly _accountAccessSecretStorage: IAccountAccessSecretStorage,
+		disposables: Disposable[] = []
+	) {
+		this._disposable = Disposable.from(
+			...disposables,
+			this._onDidAccountAccessChangeEmitter,
+			this._accountAccessSecretStorage.onDidChange(() => this.update())
+		);
+	}
+
+	static async create(
 		secretStorage: SecretStorage,
 		cloudName: string,
 		logger: LogOutputChannel,
-		migrations?: { clientId: string; authority: string }[],
-	) {
-		this._accountAccessSecretStorage = new AccountAccessSecretStorage(secretStorage, cloudName, logger, migrations);
-		this._accountAccessSecretStorage.onDidChange(() => this.update());
+		migrations: { clientId: string; authority: string }[] | undefined,
+	): Promise<ScopedAccountAccess> {
+		const storage = await AccountAccessSecretStorage.create(secretStorage, cloudName, logger, migrations);
+		const access = new ScopedAccountAccess(storage, [storage]);
+		await access.initialize();
+		return access;
 	}
 
-	async initialize() {
-		await this._accountAccessSecretStorage.initialize();
+	dispose() {
+		this._disposable.dispose();
+	}
+
+	private async initialize(): Promise<void> {
 		await this.update();
 	}
 
@@ -62,15 +77,22 @@ export class ScopedAccountAccess implements IAccountAccess {
 	}
 }
 
-export class AccountAccessSecretStorage {
+interface IAccountAccessSecretStorage {
+	get(): Promise<string[] | undefined>;
+	store(value: string[]): Thenable<void>;
+	delete(): Thenable<void>;
+	onDidChange: Event<void>;
+}
+
+class AccountAccessSecretStorage implements IAccountAccessSecretStorage, Disposable {
 	private _disposable: Disposable;
 
-	private readonly _onDidChangeEmitter = new EventEmitter<void>;
+	private readonly _onDidChangeEmitter = new EventEmitter<void>();
 	readonly onDidChange: Event<void> = this._onDidChangeEmitter.event;
 
 	private readonly _key = `accounts-${this._cloudName}`;
 
-	constructor(
+	private constructor(
 		private readonly _secretStorage: SecretStorage,
 		private readonly _cloudName: string,
 		private readonly _logger: LogOutputChannel,
@@ -86,10 +108,21 @@ export class AccountAccessSecretStorage {
 		);
 	}
 
+	static async create(
+		secretStorage: SecretStorage,
+		cloudName: string,
+		logger: LogOutputChannel,
+		migrations?: { clientId: string; authority: string }[],
+	): Promise<AccountAccessSecretStorage> {
+		const storage = new AccountAccessSecretStorage(secretStorage, cloudName, logger, migrations);
+		await storage.initialize();
+		return storage;
+	}
+
 	/**
 	 * TODO: Remove this method after a release with the migration
 	 */
-	async initialize(): Promise<void> {
+	private async initialize(): Promise<void> {
 		if (!this._migrations) {
 			return;
 		}
diff --git a/extensions/microsoft-authentication/src/common/cachePlugin.ts b/extensions/microsoft-authentication/src/common/cachePlugin.ts
index 91b4f0ee6a8e..b87fdb78d9b5 100644
--- a/extensions/microsoft-authentication/src/common/cachePlugin.ts
+++ b/extensions/microsoft-authentication/src/common/cachePlugin.ts
@@ -6,7 +6,7 @@
 import { ICachePlugin, TokenCacheContext } from '@azure/msal-node';
 import { Disposable, EventEmitter, SecretStorage } from 'vscode';
 
-export class SecretStorageCachePlugin implements ICachePlugin {
+export class SecretStorageCachePlugin implements ICachePlugin, Disposable {
 	private readonly _onDidChange: EventEmitter<void> = new EventEmitter<void>();
 	readonly onDidChange = this._onDidChange.event;
 
diff --git a/extensions/microsoft-authentication/src/common/publicClientCache.ts b/extensions/microsoft-authentication/src/common/publicClientCache.ts
index 9e54e0a2aadc..acc8ba0d3077 100644
--- a/extensions/microsoft-authentication/src/common/publicClientCache.ts
+++ b/extensions/microsoft-authentication/src/common/publicClientCache.ts
@@ -5,8 +5,7 @@
 import type { AccountInfo, AuthenticationResult, InteractiveRequest, RefreshTokenRequest, SilentFlowRequest } from '@azure/msal-node';
 import type { Disposable, Event } from 'vscode';
 
-export interface ICachedPublicClientApplication extends Disposable {
-	initialize(): Promise<void>;
+export interface ICachedPublicClientApplication {
 	onDidAccountsChange: Event<{ added: AccountInfo[]; changed: AccountInfo[]; deleted: AccountInfo[] }>;
 	onDidRemoveLastAccount: Event<void>;
 	acquireTokenSilent(request: SilentFlowRequest): Promise<AuthenticationResult>;
diff --git a/extensions/microsoft-authentication/src/extensionV2.ts b/extensions/microsoft-authentication/src/extensionV2.ts
index 9610af37977c..978603ad1322 100644
--- a/extensions/microsoft-authentication/src/extensionV2.ts
+++ b/extensions/microsoft-authentication/src/extensionV2.ts
@@ -49,14 +49,13 @@ async function initMicrosoftSovereignCloudAuthProvider(
 		return undefined;
 	}
 
-	const authProvider = new MsalAuthProvider(
+	const authProvider = await MsalAuthProvider.create(
 		context,
 		new MicrosoftSovereignCloudAuthenticationTelemetryReporter(context.extension.packageJSON.aiKey),
 		window.createOutputChannel(l10n.t('Microsoft Sovereign Cloud Authentication'), { log: true }),
 		uriHandler,
 		env
 	);
-	await authProvider.initialize();
 	const disposable = authentication.registerAuthenticationProvider(
 		'microsoft-sovereign-cloud',
 		authProviderName,
@@ -70,13 +69,12 @@ async function initMicrosoftSovereignCloudAuthProvider(
 export async function activate(context: ExtensionContext, mainTelemetryReporter: MicrosoftAuthenticationTelemetryReporter) {
 	const uriHandler = new UriEventHandler();
 	context.subscriptions.push(uriHandler);
-	const authProvider = new MsalAuthProvider(
+	const authProvider = await MsalAuthProvider.create(
 		context,
 		mainTelemetryReporter,
 		Logger,
 		uriHandler
 	);
-	await authProvider.initialize();
 	context.subscriptions.push(authentication.registerAuthenticationProvider(
 		'microsoft',
 		'Microsoft',
diff --git a/extensions/microsoft-authentication/src/node/authProvider.ts b/extensions/microsoft-authentication/src/node/authProvider.ts
index 1956def085c5..a26008fb7802 100644
--- a/extensions/microsoft-authentication/src/node/authProvider.ts
+++ b/extensions/microsoft-authentication/src/node/authProvider.ts
@@ -7,7 +7,7 @@ import { AuthenticationGetSessionOptions, AuthenticationProvider, Authentication
 import { Environment } from '@azure/ms-rest-azure-env';
 import { CachedPublicClientApplicationManager } from './publicClientCache';
 import { UriEventHandler } from '../UriEventHandler';
-import { ICachedPublicClientApplication } from '../common/publicClientCache';
+import { ICachedPublicClientApplication, ICachedPublicClientApplicationManager } from '../common/publicClientCache';
 import { MicrosoftAccountType, MicrosoftAuthenticationTelemetryReporter } from '../common/telemetryReporter';
 import { ScopeData } from '../common/scopeData';
 import { EventBufferer } from '../common/event';
@@ -22,7 +22,6 @@ const MSA_PASSTHRU_TID = 'f8cdef31-a31e-4b4a-93e4-5f571e91255a';
 export class MsalAuthProvider implements AuthenticationProvider {
 
 	private readonly _disposables: { dispose(): void }[];
-	private readonly _publicClientManager: CachedPublicClientApplicationManager;
 	private readonly _eventBufferer = new EventBufferer();
 
 	/**
@@ -43,15 +42,15 @@ export class MsalAuthProvider implements AuthenticationProvider {
 	 */
 	onDidChangeSessions = this._onDidChangeSessionsEmitter.event;
 
-	constructor(
+	private constructor(
 		private readonly _context: ExtensionContext,
 		private readonly _telemetryReporter: MicrosoftAuthenticationTelemetryReporter,
 		private readonly _logger: LogOutputChannel,
 		private readonly _uriHandler: UriEventHandler,
+		private readonly _publicClientManager: ICachedPublicClientApplicationManager,
 		private readonly _env: Environment = Environment.AzureCloud
 	) {
 		this._disposables = _context.subscriptions;
-		this._publicClientManager = new CachedPublicClientApplicationManager(_context.secrets, this._logger, this._env.name);
 		const accountChangeEvent = this._eventBufferer.wrapEvent(
 			this._publicClientManager.onDidAccountsChange,
 			(last, newEvent) => {
@@ -76,11 +75,24 @@ export class MsalAuthProvider implements AuthenticationProvider {
 		)(e => this._handleAccountChange(e));
 		this._disposables.push(
 			this._onDidChangeSessionsEmitter,
-			this._publicClientManager,
 			accountChangeEvent
 		);
 	}
 
+	static async create(
+		context: ExtensionContext,
+		telemetryReporter: MicrosoftAuthenticationTelemetryReporter,
+		logger: LogOutputChannel,
+		uriHandler: UriEventHandler,
+		env: Environment = Environment.AzureCloud
+	): Promise<MsalAuthProvider> {
+		const publicClientManager = await CachedPublicClientApplicationManager.create(context.secrets, logger, env.name);
+		context.subscriptions.push(publicClientManager);
+		const authProvider = new MsalAuthProvider(context, telemetryReporter, logger, uriHandler, publicClientManager, env);
+		await authProvider.initialize();
+		return authProvider;
+	}
+
 	/**
 	 * Migrate sessions from the old secret storage to MSAL.
 	 * TODO: MSAL Migration. Remove this when we remove the old flow.
@@ -109,9 +121,7 @@ export class MsalAuthProvider implements AuthenticationProvider {
 		}
 	}
 
-	async initialize(): Promise<void> {
-		await this._eventBufferer.bufferEventsAsync(() => this._publicClientManager.initialize());
-
+	private async initialize(): Promise<void> {
 		if (!this._context.globalState.get('msalMigration', false)) {
 			await this._migrateSessions();
 		}
diff --git a/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts b/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
index 7eb74baac5f6..f0f4eb7b9bcd 100644
--- a/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
+++ b/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
@@ -39,7 +39,7 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 
 	//#endregion
 
-	constructor(
+	private constructor(
 		private readonly _clientId: string,
 		private readonly _secretStorage: SecretStorage,
 		private readonly _accountAccess: IAccountAccess,
@@ -47,7 +47,7 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 	) {
 		const loggerOptions = new MsalLoggerOptions(_logger);
 		const nativeBrokerPlugin = new NativeBrokerPlugin();
-		this._isBrokerAvailable = nativeBrokerPlugin.isBrokerAvailable ?? false;
+		this._isBrokerAvailable = nativeBrokerPlugin.isBrokerAvailable;
 		this._pca = new PublicClientApplication({
 			auth: { clientId: _clientId },
 			system: {
@@ -63,17 +63,26 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 		this._disposable = Disposable.from(
 			this._registerOnSecretStorageChanged(),
 			this._onDidAccountsChangeEmitter,
-			this._onDidRemoveLastAccountEmitter
+			this._onDidRemoveLastAccountEmitter,
+			this._secretStorageCachePlugin
 		);
 	}
 
 	get accounts(): AccountInfo[] { return this._accounts; }
 	get clientId(): string { return this._clientId; }
 
-	async initialize(): Promise<void> {
-		if (this._isBrokerAvailable) {
-			await this._accountAccess.initialize();
-		}
+	static async create(
+		clientId: string,
+		secretStorage: SecretStorage,
+		accountAccess: IAccountAccess,
+		logger: LogOutputChannel
+	): Promise<CachedPublicClientApplication> {
+		const app = new CachedPublicClientApplication(clientId, secretStorage, accountAccess, logger);
+		await app.initialize();
+		return app;
+	}
+
+	private async initialize(): Promise<void> {
 		await this._sequencer.queue(() => this._update());
 	}
 
@@ -178,7 +187,15 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 	 */
 	async acquireTokenByRefreshToken(request: RefreshTokenRequest): Promise<AuthenticationResult | null> {
 		this._logger.debug(`[acquireTokenByRefreshToken] [${this._clientId}] [${request.authority}] [${request.scopes.join(' ')}]`);
-		const result = await this._sequencer.queue(() => this._pca.acquireTokenByRefreshToken(request));
+		const result = await this._sequencer.queue(async () => {
+			const result = await this._pca.acquireTokenByRefreshToken(request);
+			// Force an update so that the account cache is updated.
+			// TODO:@TylerLeonhardt The problem is, we use the sequencer for
+			// change events but we _don't_ use it for the accounts cache.
+			// We should probably use it for the accounts cache as well.
+			await this._update();
+			return result;
+		});
 		if (result) {
 			// this._setupRefresh(result);
 			if (this._isBrokerAvailable && result.account) {
diff --git a/extensions/microsoft-authentication/src/node/publicClientCache.ts b/extensions/microsoft-authentication/src/node/publicClientCache.ts
index 7b46406c16e6..16ccb80321fd 100644
--- a/extensions/microsoft-authentication/src/node/publicClientCache.ts
+++ b/extensions/microsoft-authentication/src/node/publicClientCache.ts
@@ -20,37 +20,46 @@ export class CachedPublicClientApplicationManager implements ICachedPublicClient
 	private readonly _pcaDisposables = new Map<string, Disposable>();
 
 	private _disposable: Disposable;
-	private _pcasSecretStorage: PublicClientApplicationsSecretStorage;
-	private _accountAccess: IAccountAccess | undefined;
 
 	private readonly _onDidAccountsChangeEmitter = new EventEmitter<{ added: AccountInfo[]; changed: AccountInfo[]; deleted: AccountInfo[] }>();
 	readonly onDidAccountsChange = this._onDidAccountsChangeEmitter.event;
 
-	constructor(
+	private constructor(
+		private readonly _pcasSecretStorage: IPublicClientApplicationSecretStorage,
+		private readonly _accountAccess: IAccountAccess,
 		private readonly _secretStorage: SecretStorage,
 		private readonly _logger: LogOutputChannel,
-		private readonly _cloudName: string
+		disposables: Disposable[]
 	) {
-		this._pcasSecretStorage = new PublicClientApplicationsSecretStorage(_secretStorage, _cloudName);
 		this._disposable = Disposable.from(
-			this._pcasSecretStorage,
+			...disposables,
 			this._registerSecretStorageHandler(),
 			this._onDidAccountsChangeEmitter
 		);
 	}
 
+	static async create(
+		secretStorage: SecretStorage,
+		logger: LogOutputChannel,
+		cloudName: string
+	): Promise<CachedPublicClientApplicationManager> {
+		const pcasSecretStorage = await PublicClientApplicationsSecretStorage.create(secretStorage, cloudName);
+		// TODO: Remove the migrations in a version
+		const migrations = await pcasSecretStorage.getOldValue();
+		const accountAccess = await ScopedAccountAccess.create(secretStorage, cloudName, logger, migrations);
+		const manager = new CachedPublicClientApplicationManager(pcasSecretStorage, accountAccess, secretStorage, logger, [pcasSecretStorage, accountAccess]);
+		await manager.initialize();
+		return manager;
+	}
+
 	private _registerSecretStorageHandler() {
 		return this._pcasSecretStorage.onDidChange(() => this._handleSecretStorageChange());
 	}
 
-	async initialize() {
+	private async initialize() {
 		this._logger.debug('[initialize] Initializing PublicClientApplicationManager');
 		let clientIds: string[] | undefined;
 		try {
-			await this._pcasSecretStorage.initialize();
-			//TODO: Remove this in a version
-			const migrations = await this._pcasSecretStorage.getOldValue();
-			this._accountAccess = new ScopedAccountAccess(this._secretStorage, this._cloudName, this._logger, migrations);
 			clientIds = await this._pcasSecretStorage.get();
 		} catch (e) {
 			// data is corrupted
@@ -124,14 +133,12 @@ export class CachedPublicClientApplicationManager implements ICachedPublicClient
 					this._logger.error(`[getOrCreate] [${clientId}] Error migrating refresh token:`, e);
 				}
 			}
-			// reinitialize the PCA so the account is properly cached
-			await pca.initialize();
 		}
 		return pca;
 	}
 
 	private async _doCreatePublicClientApplication(clientId: string): Promise<ICachedPublicClientApplication> {
-		const pca = new CachedPublicClientApplication(clientId, this._secretStorage, this._accountAccess!, this._logger);
+		const pca = await CachedPublicClientApplication.create(clientId, this._secretStorage, this._accountAccess, this._logger);
 		this._pcas.set(clientId, pca);
 		const disposable = Disposable.from(
 			pca,
@@ -147,8 +154,10 @@ export class CachedPublicClientApplicationManager implements ICachedPublicClient
 			})
 		);
 		this._pcaDisposables.set(clientId, disposable);
-		// Intialize the PCA after the `onDidAccountsChange` is set so we get initial state.
-		await pca.initialize();
+		// Fire for the initial state and only if accounts exist
+		if (pca.accounts.length > 0) {
+			this._onDidAccountsChangeEmitter.fire({ added: pca.accounts, changed: [], deleted: [] });
+		}
 		return pca;
 	}
 
@@ -205,7 +214,15 @@ export class CachedPublicClientApplicationManager implements ICachedPublicClient
 	}
 }
 
-class PublicClientApplicationsSecretStorage {
+interface IPublicClientApplicationSecretStorage {
+	get(): Promise<string[] | undefined>;
+	getOldValue(): Promise<{ clientId: string; authority: string }[] | undefined>;
+	store(value: string[]): Thenable<void>;
+	delete(): Thenable<void>;
+	onDidChange: Event<void>;
+}
+
+class PublicClientApplicationsSecretStorage implements IPublicClientApplicationSecretStorage, Disposable {
 	private _disposable: Disposable;
 
 	private readonly _onDidChangeEmitter = new EventEmitter<void>;
@@ -214,7 +231,7 @@ class PublicClientApplicationsSecretStorage {
 	private readonly _oldKey = `publicClientApplications-${this._cloudName}`;
 	private readonly _key = `publicClients-${this._cloudName}`;
 
-	constructor(private readonly _secretStorage: SecretStorage, private readonly _cloudName: string) {
+	private constructor(private readonly _secretStorage: SecretStorage, private readonly _cloudName: string) {
 		this._disposable = Disposable.from(
 			this._onDidChangeEmitter,
 			this._secretStorage.onDidChange(e => {
@@ -225,11 +242,17 @@ class PublicClientApplicationsSecretStorage {
 		);
 	}
 
+	static async create(secretStorage: SecretStorage, cloudName: string): Promise<PublicClientApplicationsSecretStorage> {
+		const storage = new PublicClientApplicationsSecretStorage(secretStorage, cloudName);
+		await storage.initialize();
+		return storage;
+	}
+
 	/**
 	 * Runs the migration.
 	 * TODO: Remove this after a version.
 	 */
-	async initialize() {
+	private async initialize() {
 		const oldValue = await this.getOldValue();
 		if (!oldValue) {
 			return;

From 14324bbbc2cca2ddb998d6ab577f02efe00efe0c Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <2644648+TylerLeonhardt@users.noreply.github.com>
Date: Wed, 5 Mar 2025 18:56:44 -0800
Subject: [PATCH 0670/1815] Remove old client id versioning code (#242760)

We're not doing this anymore and our default client id will be "upgraded" by the identity team.
---
 .../microsoft-authentication/package.json     | 17 -------------
 .../microsoft-authentication/package.nls.json |  3 ---
 .../src/common/scopeData.ts                   | 24 ++++---------------
 3 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 4170a7787cfa..928ffa688899 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -115,23 +115,6 @@
             "tags": [
               "onExP"
             ]
-          },
-          "microsoft-authentication.clientIdVersion": {
-            "type": "string",
-            "default": "v1",
-            "enum": [
-              "v2",
-              "v1"
-            ],
-            "enumDescriptions": [
-              "%microsoft-authentication.clientIdVersion.enumDescriptions.v2%",
-              "%microsoft-authentication.clientIdVersion.enumDescriptions.v1%"
-            ],
-            "markdownDescription": "%microsoft-authentication.clientIdVersion.description%",
-            "tags": [
-              "onExP",
-              "experimental"
-            ]
           }
         }
       }
diff --git a/extensions/microsoft-authentication/package.nls.json b/extensions/microsoft-authentication/package.nls.json
index ece95ac75c30..c8e0189c08f9 100644
--- a/extensions/microsoft-authentication/package.nls.json
+++ b/extensions/microsoft-authentication/package.nls.json
@@ -12,9 +12,6 @@
 	},
 	"microsoft-authentication.implementation.enumDescriptions.msal": "Use the Microsoft Authentication Library (MSAL) to sign in with a Microsoft account.",
 	"microsoft-authentication.implementation.enumDescriptions.classic": "(deprecated) Use the classic authentication flow to sign in with a Microsoft account.",
-	"microsoft-authentication.clientIdVersion.description": "The version of the Microsoft Account client ID to use for signing in with a Microsoft account. Only change this if you have been asked to. The default is `v1`.",
-	"microsoft-authentication.clientIdVersion.enumDescriptions.v1": "Use the v1 Microsoft Account client ID to sign in with a Microsoft account.",
-	"microsoft-authentication.clientIdVersion.enumDescriptions.v2": "Use the v2 Microsoft Account client ID 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/common/scopeData.ts b/extensions/microsoft-authentication/src/common/scopeData.ts
index f6baf20d7ac2..cee462d40571 100644
--- a/extensions/microsoft-authentication/src/common/scopeData.ts
+++ b/extensions/microsoft-authentication/src/common/scopeData.ts
@@ -3,21 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { workspace } from 'vscode';
-
-const DEFAULT_CLIENT_ID_V1 = 'aebc6443-996d-45c2-90f0-388ff96faa56';
-const DEFAULT_TENANT_V1 = 'organizations';
-const DEFAULT_CLIENT_ID_V2 = 'c27c220f-ce2f-4904-927d-333864217eeb';
-const DEFAULT_TENANT_V2 = 'common';
+const DEFAULT_CLIENT_ID = 'aebc6443-996d-45c2-90f0-388ff96faa56';
+const DEFAULT_TENANT = 'organizations';
 
 const OIDC_SCOPES = ['openid', 'email', 'profile', 'offline_access'];
 const GRAPH_TACK_ON_SCOPE = 'User.Read';
 
 export class ScopeData {
-
-	private readonly _defaultClientId: string;
-	private readonly _defaultTenant: string;
-
 	/**
 	 * The full list of scopes including:
 	 * * the original scopes passed to the constructor
@@ -52,14 +44,6 @@ export class ScopeData {
 	readonly tenantId: string | undefined;
 
 	constructor(readonly originalScopes: readonly string[] = []) {
-		if (workspace.getConfiguration('microsoft-authentication').get<'v1' | 'v2'>('clientIdVersion') === 'v2') {
-			this._defaultClientId = DEFAULT_CLIENT_ID_V2;
-			this._defaultTenant = DEFAULT_TENANT_V2;
-		} else {
-			this._defaultClientId = DEFAULT_CLIENT_ID_V1;
-			this._defaultTenant = DEFAULT_TENANT_V1;
-		}
-
 		const modifiedScopes = [...originalScopes];
 		modifiedScopes.sort();
 		this.allScopes = modifiedScopes;
@@ -67,7 +51,7 @@ export class ScopeData {
 		this.scopesToSend = this.getScopesToSend(modifiedScopes);
 		this.clientId = this.getClientId(this.allScopes);
 		this.tenantId = this.getTenantId(this.allScopes);
-		this.tenant = this.tenantId ?? this._defaultTenant;
+		this.tenant = this.tenantId ?? DEFAULT_TENANT;
 	}
 
 	private getClientId(scopes: string[]) {
@@ -76,7 +60,7 @@ export class ScopeData {
 				return current.split('VSCODE_CLIENT_ID:')[1];
 			}
 			return prev;
-		}, undefined) ?? this._defaultClientId;
+		}, undefined) ?? DEFAULT_CLIENT_ID;
 	}
 
 	private getTenantId(scopes: string[]) {

From 24a50e1a0807c38e72c74d491424200f95a5ce7f Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 6 Mar 2025 03:16:30 -0800
Subject: [PATCH 0671/1815] Add border radius to terminal suggest

Fixes #242759
---
 src/vs/workbench/services/suggest/browser/media/suggest.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/services/suggest/browser/media/suggest.css b/src/vs/workbench/services/suggest/browser/media/suggest.css
index 1bcec527a44c..fd7a2d9c676b 100644
--- a/src/vs/workbench/services/suggest/browser/media/suggest.css
+++ b/src/vs/workbench/services/suggest/browser/media/suggest.css
@@ -32,6 +32,7 @@
 	z-index: 40;
 	display: flex;
 	flex-direction: column;
+	border-radius: 3px;
 }
 
 .workbench-suggest-widget.message {

From 40b7dc0f5729dc4970f89d690ed238c82fee16aa Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Thu, 6 Mar 2025 22:39:12 +1100
Subject: [PATCH 0672/1815] Remove notebook sync in chat edits (#242642)

* Remove chat edit sync

* remove

* remove contrib
---
 .../chatEditing/chatEditingEditorActions.ts   |   3 +-
 .../browser/contrib/chatEdit/contribution.ts  |  17 -
 .../chatEdit/notebookCellDecorators.ts        | 361 -------------
 .../chatEdit/notebookChatActionsOverlay.ts    | 323 -----------
 .../chatEdit/notebookChatEditContext.ts       |   9 -
 .../chatEdit/notebookChatEditController.ts    | 211 --------
 .../contrib/chatEdit/notebookSynchronizer.ts  | 501 ------------------
 .../chatEdit/notebookSynchronizerService.ts   |  94 ----
 .../inlineDiff/notebookCellDiffDecorator.ts   |   2 +-
 .../diff/inlineDiff/notebookInlineDiff.ts     |   5 +
 .../notebookOriginalCellModelFactory.ts       |   0
 .../notebookOriginalModelRefFactory.ts        |   0
 .../notebook/browser/notebook.contribution.ts |   6 -
 .../notebook/common/notebookEditorModel.ts    |   5 -
 .../common/notebookSynchronizerService.ts     |  16 -
 15 files changed, 7 insertions(+), 1546 deletions(-)
 delete mode 100644 src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/contribution.ts
 delete mode 100644 src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookCellDecorators.ts
 delete mode 100644 src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts
 delete mode 100644 src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditContext.ts
 delete mode 100644 src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts
 delete mode 100644 src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts
 delete mode 100644 src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizerService.ts
 rename src/vs/workbench/contrib/notebook/browser/{contrib/chatEdit => diff/inlineDiff}/notebookOriginalCellModelFactory.ts (100%)
 rename src/vs/workbench/contrib/notebook/browser/{contrib/chatEdit => diff/inlineDiff}/notebookOriginalModelRefFactory.ts (100%)
 delete mode 100644 src/vs/workbench/contrib/notebook/common/notebookSynchronizerService.ts

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts
index 2bf35d04e94c..bd4d875cfd82 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts
@@ -14,7 +14,6 @@ import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contex
 import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
 import { ACTIVE_GROUP, IEditorService } from '../../../../services/editor/common/editorService.js';
 import { CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, IChatEditingService, IChatEditingSession, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, WorkingSetEntryState } from '../../common/chatEditingService.js';
-import { ctxNotebookHasEditorModification } from '../../../notebook/browser/contrib/chatEdit/notebookChatEditContext.js';
 import { resolveCommandsContext } from '../../../../browser/parts/editor/editorCommandsContext.js';
 import { IListService } from '../../../../../platform/list/browser/listService.js';
 import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
@@ -79,7 +78,7 @@ abstract class NavigateAction extends ChatEditingEditorAction {
 					: KeyMod.Alt | KeyMod.Shift | KeyCode.F5,
 				weight: KeybindingWeight.WorkbenchContrib,
 				when: ContextKeyExpr.and(
-					ContextKeyExpr.or(ctxHasEditorModification, ctxNotebookHasEditorModification),
+					ctxHasEditorModification,
 					EditorContextKeys.focus
 				),
 			},
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/contribution.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/contribution.ts
deleted file mode 100644
index 6b8387bd9086..000000000000
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/contribution.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.
- *--------------------------------------------------------------------------------------------*/
-
-import { INotebookModelSynchronizerFactory, NotebookModelSynchronizerFactory } from './notebookSynchronizer.js';
-import { INotebookOriginalModelReferenceFactory, NotebookOriginalModelReferenceFactory } from './notebookOriginalModelRefFactory.js';
-import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
-import { InstantiationType, registerSingleton } from '../../../../../../platform/instantiation/common/extensions.js';
-import { INotebookOriginalCellModelFactory, OriginalNotebookCellModelFactory } from './notebookOriginalCellModelFactory.js';
-import { NotebookChatEditorControllerContrib } from './notebookChatEditController.js';
-
-
-registerNotebookContribution(NotebookChatEditorControllerContrib.ID, NotebookChatEditorControllerContrib);
-registerSingleton(INotebookOriginalModelReferenceFactory, NotebookOriginalModelReferenceFactory, InstantiationType.Delayed);
-registerSingleton(INotebookModelSynchronizerFactory, NotebookModelSynchronizerFactory, InstantiationType.Delayed);
-registerSingleton(INotebookOriginalCellModelFactory, OriginalNotebookCellModelFactory, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookCellDecorators.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookCellDecorators.ts
deleted file mode 100644
index ec0d2f435115..000000000000
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookCellDecorators.ts
+++ /dev/null
@@ -1,361 +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 { autorun, autorunWithStore, derived, observableFromEvent } from '../../../../../../base/common/observable.js';
-import { IChatEditingService, ChatEditingSessionState } from '../../../../chat/common/chatEditingService.js';
-import { INotebookEditor } from '../../notebookBrowser.js';
-import { ThrottledDelayer } from '../../../../../../base/common/async.js';
-import { ICodeEditor, IViewZone } from '../../../../../../editor/browser/editorBrowser.js';
-import { IEditorWorkerService } from '../../../../../../editor/common/services/editorWorker.js';
-import { EditorOption } from '../../../../../../editor/common/config/editorOptions.js';
-import { themeColorFromId } from '../../../../../../base/common/themables.js';
-import { RenderOptions, LineSource, renderLines } from '../../../../../../editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
-import { diffAddDecoration, diffWholeLineAddDecoration, diffDeleteDecoration } from '../../../../../../editor/browser/widget/diffEditor/registrations.contribution.js';
-import { IDocumentDiff } from '../../../../../../editor/common/diff/documentDiffProvider.js';
-import { ITextModel, TrackedRangeStickiness, MinimapPosition, IModelDeltaDecoration, OverviewRulerLane } from '../../../../../../editor/common/model.js';
-import { ModelDecorationOptions } from '../../../../../../editor/common/model/textModel.js';
-import { InlineDecoration, InlineDecorationType } from '../../../../../../editor/common/viewModel.js';
-import { Range } from '../../../../../../editor/common/core/range.js';
-import { NotebookCellTextModel } from '../../../common/model/notebookCellTextModel.js';
-import { INotebookOriginalCellModelFactory } from './notebookOriginalCellModelFactory.js';
-import { DetailedLineRangeMapping } from '../../../../../../editor/common/diff/rangeMapping.js';
-import { isEqual } from '../../../../../../base/common/resources.js';
-import { minimapGutterAddedBackground, minimapGutterDeletedBackground, minimapGutterModifiedBackground, overviewRulerAddedForeground, overviewRulerDeletedForeground, overviewRulerModifiedForeground } from '../../../../scm/common/quickDiff.js';
-
-
-export class NotebookCellDiffDecorator extends DisposableStore {
-	private _viewZones: string[] = [];
-	private readonly throttledDecorator = new ThrottledDelayer(50);
-	private diffForPreviouslyAppliedDecorators?: IDocumentDiff;
-
-	private readonly perEditorDisposables = this.add(new DisposableStore());
-	constructor(
-		notebookEditor: INotebookEditor,
-		public readonly modifiedCell: NotebookCellTextModel,
-		public readonly originalCell: NotebookCellTextModel,
-		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
-		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
-		@INotebookOriginalCellModelFactory private readonly originalCellModelFactory: INotebookOriginalCellModelFactory,
-
-	) {
-		super();
-
-		const onDidChangeVisibleRanges = observableFromEvent(notebookEditor.onDidChangeVisibleRanges, () => notebookEditor.visibleRanges);
-		const editorObs = derived((r) => {
-			const visibleRanges = onDidChangeVisibleRanges.read(r);
-			const visibleCellHandles = visibleRanges.map(range => notebookEditor.getCellsInRange(range)).flat().map(c => c.handle);
-			if (!visibleCellHandles.includes(modifiedCell.handle)) {
-				return;
-			}
-			const editor = notebookEditor.codeEditors.find(item => item[0].handle === modifiedCell.handle)?.[1];
-			if (editor?.getModel() !== this.modifiedCell.textModel) {
-				return;
-			}
-			return editor;
-		});
-
-		this.add(autorunWithStore((r, store) => {
-			const editor = editorObs.read(r);
-			this.perEditorDisposables.clear();
-
-			if (editor) {
-				store.add(editor.onDidChangeModel(() => {
-					this.perEditorDisposables.clear();
-				}));
-				store.add(editor.onDidChangeModelContent(() => {
-					this.update(editor);
-				}));
-				store.add(editor.onDidChangeConfiguration((e) => {
-					if (e.hasChanged(EditorOption.fontInfo) || e.hasChanged(EditorOption.lineHeight)) {
-						this.update(editor);
-					}
-				}));
-				this.update(editor);
-			}
-		}));
-
-		const shouldBeReadOnly = derived(this, r => {
-			const editorUri = editorObs.read(r)?.getModel()?.uri;
-			if (!editorUri) {
-				return false;
-			}
-			const sessions = this._chatEditingService.editingSessionsObs.read(r);
-			const session = sessions.find(s => s.entries.read(r).some(e => isEqual(e.modifiedURI, editorUri)));
-			return session?.state.read(r) === ChatEditingSessionState.StreamingEdits;
-		});
-
-
-		let actualReadonly: boolean | undefined;
-		let actualDeco: 'off' | 'editable' | 'on' | undefined;
-
-		this.add(autorun((r) => {
-			const editor = editorObs.read(r);
-			if (!editor) {
-				return;
-			}
-			const value = shouldBeReadOnly.read(r);
-			if (value) {
-				actualReadonly ??= editor.getOption(EditorOption.readOnly);
-				actualDeco ??= editor.getOption(EditorOption.renderValidationDecorations);
-
-				editor.updateOptions({
-					readOnly: true,
-					renderValidationDecorations: 'off'
-				});
-			} else {
-				if (actualReadonly !== undefined && actualDeco !== undefined) {
-					editor.updateOptions({
-						readOnly: actualReadonly,
-						renderValidationDecorations: actualDeco
-					});
-					actualReadonly = undefined;
-					actualDeco = undefined;
-				}
-			}
-		}));
-	}
-
-	public update(editor: ICodeEditor): void {
-		this.throttledDecorator.trigger(() => this._updateImpl(editor));
-	}
-
-	private async _updateImpl(editor: ICodeEditor) {
-		if (this.isDisposed) {
-			return;
-		}
-		if (editor.getOption(EditorOption.inDiffEditor)) {
-			this.perEditorDisposables.clear();
-			return;
-		}
-		const model = editor.getModel();
-		if (!model || model !== this.modifiedCell.textModel) {
-			this.perEditorDisposables.clear();
-			return;
-		}
-
-		const originalModel = this.getOrCreateOriginalModel(editor);
-		if (!originalModel) {
-			this.perEditorDisposables.clear();
-			return;
-		}
-		const version = model.getVersionId();
-		const diff = await this._editorWorkerService.computeDiff(
-			originalModel.uri,
-			model.uri,
-			{ computeMoves: true, ignoreTrimWhitespace: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER },
-			'advanced'
-		);
-
-
-		if (this.isDisposed) {
-			return;
-		}
-
-
-		if (diff && !diff.identical && originalModel && model === editor.getModel() && editor.getModel()?.getVersionId() === version) {
-			this._updateWithDiff(editor, originalModel, diff);
-		} else {
-			this.perEditorDisposables.clear();
-		}
-	}
-
-	private _originalModel?: ITextModel;
-	private getOrCreateOriginalModel(editor: ICodeEditor) {
-		if (!this._originalModel) {
-			const model = editor.getModel();
-			if (!model) {
-				return;
-			}
-			this._originalModel = this.add(this.originalCellModelFactory.getOrCreate(model.uri, this.originalCell.getValue(), model.getLanguageId(), this.modifiedCell.cellKind)).object;
-		}
-		return this._originalModel;
-	}
-
-	private _updateWithDiff(editor: ICodeEditor, originalModel: ITextModel | undefined, diff: IDocumentDiff): void {
-		if (areDiffsEqual(diff, this.diffForPreviouslyAppliedDecorators)) {
-			return;
-		}
-		this.perEditorDisposables.clear();
-		const decorations = editor.createDecorationsCollection();
-		this.perEditorDisposables.add(toDisposable(() => {
-			editor.changeViewZones((viewZoneChangeAccessor) => {
-				for (const id of this._viewZones) {
-					viewZoneChangeAccessor.removeZone(id);
-				}
-			});
-			this._viewZones = [];
-			decorations.clear();
-			this.diffForPreviouslyAppliedDecorators = undefined;
-		}));
-
-		this.diffForPreviouslyAppliedDecorators = diff;
-
-		const chatDiffAddDecoration = ModelDecorationOptions.createDynamic({
-			...diffAddDecoration,
-			stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges
-		});
-		const chatDiffWholeLineAddDecoration = ModelDecorationOptions.createDynamic({
-			...diffWholeLineAddDecoration,
-			stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-		});
-		const createOverviewDecoration = (overviewRulerColor: string, minimapColor: string) => {
-			return ModelDecorationOptions.createDynamic({
-				description: 'chat-editing-decoration',
-				overviewRuler: { color: themeColorFromId(overviewRulerColor), position: OverviewRulerLane.Left },
-				minimap: { color: themeColorFromId(minimapColor), position: MinimapPosition.Gutter },
-			});
-		};
-		const modifiedDecoration = createOverviewDecoration(overviewRulerModifiedForeground, minimapGutterModifiedBackground);
-		const addedDecoration = createOverviewDecoration(overviewRulerAddedForeground, minimapGutterAddedBackground);
-		const deletedDecoration = createOverviewDecoration(overviewRulerDeletedForeground, minimapGutterDeletedBackground);
-
-		editor.changeViewZones((viewZoneChangeAccessor) => {
-			for (const id of this._viewZones) {
-				viewZoneChangeAccessor.removeZone(id);
-			}
-			this._viewZones = [];
-			const modifiedDecorations: IModelDeltaDecoration[] = [];
-			const mightContainNonBasicASCII = originalModel?.mightContainNonBasicASCII();
-			const mightContainRTL = originalModel?.mightContainRTL();
-			const renderOptions = RenderOptions.fromEditor(editor);
-
-			for (const diffEntry of diff.changes) {
-				const originalRange = diffEntry.original;
-				if (originalModel) {
-					originalModel.tokenization.forceTokenization(Math.max(1, originalRange.endLineNumberExclusive - 1));
-				}
-				const source = new LineSource(
-					(originalRange.length && originalModel) ? originalRange.mapToLineArray(l => originalModel.tokenization.getLineTokens(l)) : [],
-					[],
-					mightContainNonBasicASCII,
-					mightContainRTL,
-				);
-				const decorations: InlineDecoration[] = [];
-				for (const i of diffEntry.innerChanges || []) {
-					decorations.push(new InlineDecoration(
-						i.originalRange.delta(-(diffEntry.original.startLineNumber - 1)),
-						diffDeleteDecoration.className!,
-						InlineDecorationType.Regular
-					));
-					modifiedDecorations.push({
-						range: i.modifiedRange, options: chatDiffAddDecoration
-					});
-				}
-				if (!diffEntry.modified.isEmpty) {
-					modifiedDecorations.push({
-						range: diffEntry.modified.toInclusiveRange()!, options: chatDiffWholeLineAddDecoration
-					});
-				}
-
-				if (diffEntry.original.isEmpty) {
-					// insertion
-					modifiedDecorations.push({
-						range: diffEntry.modified.toInclusiveRange()!,
-						options: addedDecoration
-					});
-				} else if (diffEntry.modified.isEmpty) {
-					// deletion
-					modifiedDecorations.push({
-						range: new Range(diffEntry.modified.startLineNumber - 1, 1, diffEntry.modified.startLineNumber, 1),
-						options: deletedDecoration
-					});
-				} else {
-					// modification
-					modifiedDecorations.push({
-						range: diffEntry.modified.toInclusiveRange()!,
-						options: modifiedDecoration
-					});
-				}
-				const domNode = document.createElement('div');
-				domNode.className = 'chat-editing-original-zone view-lines line-delete monaco-mouse-cursor-text';
-				const result = renderLines(source, renderOptions, decorations, domNode);
-
-				const isCreatedContent = decorations.length === 1 && decorations[0].range.isEmpty() && decorations[0].range.startLineNumber === 1;
-				if (!isCreatedContent) {
-					const viewZoneData: IViewZone = {
-						afterLineNumber: diffEntry.modified.startLineNumber - 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
-					};
-
-					this._viewZones.push(viewZoneChangeAccessor.addZone(viewZoneData));
-				}
-			}
-
-			decorations.set(modifiedDecorations);
-		});
-	}
-}
-
-function areDiffsEqual(a: IDocumentDiff | undefined, b: IDocumentDiff | undefined): boolean {
-	if (a && b) {
-		if (a.changes.length !== b.changes.length) {
-			return false;
-		}
-		if (a.moves.length !== b.moves.length) {
-			return false;
-		}
-		if (!areLineRangeMappinsEqual(a.changes, b.changes)) {
-			return false;
-		}
-		if (!a.moves.some((move, i) => {
-			const bMove = b.moves[i];
-			if (!areLineRangeMappinsEqual(move.changes, bMove.changes)) {
-				return true;
-			}
-			if (move.lineRangeMapping.changedLineCount !== bMove.lineRangeMapping.changedLineCount) {
-				return true;
-			}
-			if (!move.lineRangeMapping.modified.equals(bMove.lineRangeMapping.modified)) {
-				return true;
-			}
-			if (!move.lineRangeMapping.original.equals(bMove.lineRangeMapping.original)) {
-				return true;
-			}
-			return false;
-		})) {
-			return false;
-		}
-		return true;
-	} else if (!a && !b) {
-		return true;
-	} else {
-		return false;
-	}
-}
-
-function areLineRangeMappinsEqual(a: readonly DetailedLineRangeMapping[], b: readonly DetailedLineRangeMapping[]): boolean {
-	if (a.length !== b.length) {
-		return false;
-	}
-	if (a.some((c, i) => {
-		const bChange = b[i];
-		if (c.changedLineCount !== bChange.changedLineCount) {
-			return true;
-		}
-		if ((c.innerChanges || []).length !== (bChange.innerChanges || []).length) {
-			return true;
-		}
-		if ((c.innerChanges || []).some((innerC, innerIdx) => {
-			const bInnerC = bChange.innerChanges![innerIdx];
-			if (!innerC.modifiedRange.equalsRange(bInnerC.modifiedRange)) {
-				return true;
-			}
-			if (!innerC.originalRange.equalsRange(bInnerC.originalRange)) {
-				return true;
-			}
-			return false;
-		})) {
-			return true;
-		}
-
-		return false;
-	})) {
-		return false;
-	}
-	return true;
-}
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts
deleted file mode 100644
index 5669e5b1ed97..000000000000
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts
+++ /dev/null
@@ -1,323 +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, DisposableStore, MutableDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
-import { CellEditState, getNotebookEditorFromEditorPane, INotebookEditor, INotebookViewModel } from '../../notebookBrowser.js';
-import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../../../platform/actions/browser/toolbar.js';
-import { MenuId } from '../../../../../../platform/actions/common/actions.js';
-import { ActionViewItem } from '../../../../../../base/browser/ui/actionbar/actionViewItems.js';
-import { ActionRunner, IAction, IActionRunner } from '../../../../../../base/common/actions.js';
-import { $ } from '../../../../../../base/browser/dom.js';
-import { IChatEditingService, IModifiedFileEntry } from '../../../../chat/common/chatEditingService.js';
-import { ACTIVE_GROUP, IEditorService } from '../../../../../services/editor/common/editorService.js';
-import { autorun, autorunWithStore, IObservable, ISettableObservable, observableFromEvent, observableValue } from '../../../../../../base/common/observable.js';
-import { isEqual } from '../../../../../../base/common/resources.js';
-import { CellDiffInfo } from '../../diff/notebookDiffViewModel.js';
-import { AcceptAction, navigationBearingFakeActionId, RejectAction } from '../../../../chat/browser/chatEditing/chatEditingEditorActions.js';
-import { INotebookDeletedCellDecorator } from '../../diff/inlineDiff/notebookDeletedCellDecorator.js';
-import { ChatEditingModifiedDocumentEntry } from '../../../../chat/browser/chatEditing/chatEditingModifiedDocumentEntry.js';
-
-export class NotebookChatActionsOverlayController extends Disposable {
-	constructor(
-		private readonly notebookEditor: INotebookEditor,
-		cellDiffInfo: IObservable<CellDiffInfo[] | undefined>,
-		deletedCellDecorator: INotebookDeletedCellDecorator,
-		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
-		@IInstantiationService instantiationService: IInstantiationService,
-	) {
-		super();
-
-		const notebookModel = observableFromEvent(this.notebookEditor.onDidChangeModel, e => e);
-
-		this._register(autorunWithStore((r, store) => {
-			const model = notebookModel.read(r);
-			if (!model) {
-				return;
-			}
-			const sessions = this._chatEditingService.editingSessionsObs.read(r);
-			const session = sessions.find(s => s.readEntry(model.uri, r));
-			const entry = session?.readEntry(model.uri, r);
-			if (!session || !entry || !(entry instanceof ChatEditingModifiedDocumentEntry)) {
-				return;
-			}
-
-			const entries = session.entries.read(r);
-			const idx = entries.findIndex(e => isEqual(e.modifiedURI, model.uri));
-			if (idx >= 0) {
-				const entry = entries[idx];
-				const nextEntry = entries[(idx + 1) % entries.length];
-				const previousEntry = entries[(idx - 1 + entries.length) % entries.length];
-				store.add(instantiationService.createInstance(NotebookChatActionsOverlay, notebookEditor, entry, cellDiffInfo, nextEntry, previousEntry, deletedCellDecorator));
-			}
-		}));
-	}
-}
-
-// Copied from src/vs/workbench/contrib/chat/browser/chatEditorOverlay.ts (until we unify these)
-export class NotebookChatActionsOverlay extends Disposable {
-	private readonly focusedDiff = observableValue<CellDiffInfo | undefined>('focusedDiff', undefined);
-	private readonly toolbarNode: HTMLElement;
-	private added: boolean = false;
-	constructor(
-		private readonly notebookEditor: INotebookEditor,
-		entry: IModifiedFileEntry,
-		cellDiffInfo: IObservable<CellDiffInfo[] | undefined>,
-		nextEntry: IModifiedFileEntry,
-		previousEntry: IModifiedFileEntry,
-		deletedCellDecorator: INotebookDeletedCellDecorator,
-		@IEditorService _editorService: IEditorService,
-		@IInstantiationService instaService: IInstantiationService,
-	) {
-		super();
-
-		this._register(notebookEditor.onDidBlurWidget(() => {
-			if (getNotebookEditorFromEditorPane(_editorService.activeEditorPane) !== notebookEditor) {
-				this.focusedDiff.set(undefined, undefined);
-			}
-		}));
-		this._register(notebookEditor.onDidChangeActiveEditor(e => {
-			if (e !== notebookEditor) {
-				this.focusedDiff.set(undefined, undefined);
-			}
-		}));
-
-		this.toolbarNode = $('div');
-		this.toolbarNode.classList.add('notebook-chat-editor-overlay-widget');
-		this._register(toDisposable(() => this.hide()));
-
-		this._register(autorun(r => {
-			const diffs = cellDiffInfo.read(r);
-			if (diffs?.some(d => d.type !== 'unchanged')) {
-				this.show();
-			} else {
-				this.hide();
-			}
-		}));
-
-		const focusedDiff = this.focusedDiff;
-		const _toolbar = instaService.createInstance(MenuWorkbenchToolBar, this.toolbarNode, MenuId.ChatEditingEditorContent, {
-			telemetrySource: 'chatEditor.overlayToolbar',
-			hiddenItemStrategy: HiddenItemStrategy.Ignore,
-			toolbarOptions: {
-				primaryGroup: () => true,
-				useSeparatorsInPrimaryActions: true
-			},
-			menuOptions: { renderShortTitle: true },
-			actionViewItemProvider: (action, options) => {
-
-				if (action.id === navigationBearingFakeActionId) {
-					return this._register(new class extends ActionViewItem {
-						constructor() {
-							super(undefined, action, { ...options, icon: false, label: false, keybindingNotRenderedWithLabel: true });
-						}
-					});
-				}
-
-				if (action.id === AcceptAction.ID || action.id === RejectAction.ID) {
-					return this._register(new class extends ActionViewItem {
-						private readonly _reveal = this._store.add(new MutableDisposable());
-						constructor() {
-							super(undefined, action, { ...options, icon: false, label: true, keybindingNotRenderedWithLabel: true });
-						}
-						override set actionRunner(actionRunner: IActionRunner) {
-							super.actionRunner = actionRunner;
-
-							const store = new DisposableStore();
-
-							store.add(actionRunner.onWillRun(_e => {
-								notebookEditor.focus();
-							}));
-							store.add(actionRunner.onDidRun(e => {
-								if (e.action !== this.action) {
-									return;
-								}
-								if (entry === nextEntry) {
-									return;
-								}
-
-							}));
-
-							this._reveal.value = store;
-						}
-						override get actionRunner(): IActionRunner {
-							return super.actionRunner;
-						}
-					});
-				}
-				// Override next/previous with our implementation.
-				if (action.id === 'chatEditor.action.navigateNext' || action.id === 'chatEditor.action.navigatePrevious') {
-					return this._register(new class extends ActionViewItem {
-						constructor() {
-							super(undefined, action, { ...options, icon: true, label: false, keybindingNotRenderedWithLabel: true });
-						}
-						override set actionRunner(_: IActionRunner) {
-							const next = action.id === 'chatEditor.action.navigateNext' ? nextEntry : previousEntry;
-							const direction = action.id === 'chatEditor.action.navigateNext' ? 'next' : 'previous';
-							super.actionRunner = this._register(new NextPreviousChangeActionRunner(notebookEditor, cellDiffInfo, entry, next, direction, _editorService, deletedCellDecorator, focusedDiff));
-						}
-						override get actionRunner(): IActionRunner {
-							return super.actionRunner;
-						}
-					});
-				}
-				return undefined;
-			}
-
-		});
-
-		this._register(_toolbar);
-	}
-
-	private show() {
-		if (!this.added) {
-			this.notebookEditor.getDomNode().appendChild(this.toolbarNode);
-			this.added = true;
-		}
-	}
-
-	private hide() {
-		if (this.added) {
-			this.notebookEditor.getDomNode().removeChild(this.toolbarNode);
-			this.added = false;
-		}
-	}
-
-
-}
-
-class NextPreviousChangeActionRunner extends ActionRunner {
-	constructor(
-		private readonly notebookEditor: INotebookEditor,
-		private readonly cellDiffInfo: IObservable<CellDiffInfo[] | undefined>,
-		private readonly entry: IModifiedFileEntry,
-		private readonly next: IModifiedFileEntry,
-		private readonly direction: 'next' | 'previous',
-		private readonly editorService: IEditorService,
-		private readonly deletedCellDecorator: INotebookDeletedCellDecorator,
-		private readonly focusedDiff: ISettableObservable<CellDiffInfo | undefined>
-	) {
-		super();
-	}
-	protected override async runAction(_action: IAction, _context?: unknown): Promise<void> {
-		const viewModel = this.notebookEditor.getViewModel();
-		const activeCell = this.notebookEditor.activeCellAndCodeEditor;
-		const cellDiff = this.cellDiffInfo.read(undefined);
-		if (!viewModel || !cellDiff?.length || (!activeCell && this.focusedDiff.read(undefined))) {
-			return this.goToNextEntry();
-		}
-
-		const nextDiff = this.getNextCellDiff(cellDiff, viewModel);
-		if (nextDiff && (await this.focusDiff(nextDiff, viewModel))) {
-			return;
-		}
-
-		return this.goToNextEntry();
-	}
-
-	/**
-	 * @returns `true` if focused to the next diff
-	 */
-	private async focusDiff(diff: CellDiffInfo, viewModel: INotebookViewModel) {
-		if (diff.type === 'delete') {
-			const top = this.deletedCellDecorator.getTop(diff.originalCellIndex);
-			if (typeof top === 'number') {
-				this.focusedDiff.set(diff, undefined);
-				this.notebookEditor.setScrollTop(top);
-				return true;
-			}
-		} else {
-			const index = diff.modifiedCellIndex;
-			this.focusedDiff.set(diff, undefined);
-			await this.notebookEditor.focusNotebookCell(viewModel.viewCells[index], 'container');
-			this.notebookEditor.revealInViewAtTop(viewModel.viewCells[index]);
-			viewModel.viewCells[index].updateEditState(CellEditState.Editing, 'chatEdit');
-			return true;
-		}
-		return false;
-	}
-
-	private getNextCellDiff(cellDiffInfo: CellDiffInfo[], viewModel: INotebookViewModel) {
-		const activeCell = this.notebookEditor.activeCellAndCodeEditor;
-		const currentCellIndex = activeCell ? viewModel.viewCells.findIndex(c => c.handle === activeCell[0].handle) : (this.direction === 'next' ? 0 : viewModel.viewCells.length - 1);
-		if (this.focusedDiff.read(undefined)) {
-			const changes = cellDiffInfo.filter(d => d.type !== 'unchanged');
-			const idx = changes.findIndex(d => d === this.focusedDiff.read(undefined));
-			if (idx >= 0) {
-				const next = this.direction === 'next' ? idx + 1 : idx - 1;
-				if (next >= 0 && next < changes.length) {
-					return changes[next];
-				}
-			}
-		} else if (this.direction === 'next') {
-			let currentIndex = 0;
-			let next: CellDiffInfo | undefined;
-			cellDiffInfo
-				.forEach((d, i) => {
-					if (next) {
-						return;
-					}
-					if (d.type === 'insert' || d.type === 'modified') {
-						if (d.modifiedCellIndex > currentCellIndex) {
-							next = d;
-						}
-						currentIndex = d.modifiedCellIndex;
-					} else if (d.type === 'unchanged') {
-						currentIndex = d.modifiedCellIndex;
-					} else if (currentIndex >= currentCellIndex) {
-						next = d;
-					}
-				});
-			if (next) {
-				return next;
-			}
-		} else {
-			let currentIndex = 0;
-			let previous: CellDiffInfo | undefined;
-			cellDiffInfo
-				.forEach((d, i) => {
-					if (d.type === 'insert' || d.type === 'modified') {
-						if (d.modifiedCellIndex < currentCellIndex) {
-							previous = d;
-						}
-						currentIndex = d.modifiedCellIndex;
-					} else if (d.type === 'unchanged') {
-						currentIndex = d.modifiedCellIndex;
-					} else if (currentIndex <= currentCellIndex) {
-						previous = d;
-					}
-				});
-			if (previous) {
-				return previous;
-			}
-		}
-
-		if (this.canGoToNextEntry()) {
-			return;
-		}
-
-		return this.direction === 'next' ? cellDiffInfo[0] : cellDiffInfo[cellDiffInfo.length - 1];
-	}
-
-
-	private canGoToNextEntry() {
-		return this.entry !== this.next;
-	}
-
-	private async goToNextEntry() {
-		if (!this.canGoToNextEntry()) {
-			return;
-		}
-		// For now just go to next/previous file.
-		this.focusedDiff.set(undefined, undefined);
-		await this.editorService.openEditor({
-			resource: this.next.modifiedURI,
-			options: {
-				revealIfOpened: false,
-				revealIfVisible: false,
-			}
-		}, ACTIVE_GROUP);
-	}
-}
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditContext.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditContext.ts
deleted file mode 100644
index ff706d889be3..000000000000
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditContext.ts
+++ /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 { localize } from '../../../../../../nls.js';
-import { RawContextKey } from '../../../../../../platform/contextkey/common/contextkey.js';
-
-export const ctxNotebookHasEditorModification = new RawContextKey<boolean>('chat.hasNotebookEditorModifications', undefined, localize('chat.hasNotebookEditorModifications', "The current Notebook editor contains chat modifications"));
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts
deleted file mode 100644
index 32cce7d96854..000000000000
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts
+++ /dev/null
@@ -1,211 +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, dispose, IReference, toDisposable } from '../../../../../../base/common/lifecycle.js';
-import { autorun, derived, derivedWithStore, observableFromEvent, observableValue } from '../../../../../../base/common/observable.js';
-import { IChatEditingService, WorkingSetEntryState } from '../../../../chat/common/chatEditingService.js';
-import { NotebookTextModel } from '../../../common/model/notebookTextModel.js';
-import { INotebookEditor, INotebookEditorContribution } from '../../notebookBrowser.js';
-import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { NotebookCellTextModel } from '../../../common/model/notebookCellTextModel.js';
-import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
-import { NotebookCellDiffDecorator } from './notebookCellDecorators.js';
-import { INotebookModelSynchronizerFactory, NotebookModelSynchronizer } from './notebookSynchronizer.js';
-import { INotebookOriginalModelReferenceFactory } from './notebookOriginalModelRefFactory.js';
-import { debouncedObservable } from '../../../../../../base/common/observableInternal/utils.js';
-import { CellDiffInfo } from '../../diff/notebookDiffViewModel.js';
-import { NotebookChatActionsOverlayController } from './notebookChatActionsOverlay.js';
-import { IContextKey, IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
-import { Event } from '../../../../../../base/common/event.js';
-import { ctxNotebookHasEditorModification } from './notebookChatEditContext.js';
-import { NotebookDeletedCellDecorator } from '../../diff/inlineDiff/notebookDeletedCellDecorator.js';
-import { NotebookInsertedCellDecorator } from '../../diff/inlineDiff/notebookInsertedCellDecorator.js';
-import { ChatEditingModifiedDocumentEntry } from '../../../../chat/browser/chatEditing/chatEditingModifiedDocumentEntry.js';
-
-export class NotebookChatEditorControllerContrib extends Disposable implements INotebookEditorContribution {
-
-	public static readonly ID: string = 'workbench.notebook.chatEditorController';
-	readonly _serviceBrand: undefined;
-	constructor(
-		notebookEditor: INotebookEditor,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IConfigurationService configurationService: IConfigurationService,
-
-	) {
-		super();
-		this._register(instantiationService.createInstance(NotebookChatEditorController, notebookEditor));
-	}
-}
-
-
-class NotebookChatEditorController extends Disposable {
-	private readonly deletedCellDecorator: NotebookDeletedCellDecorator;
-	private readonly insertedCellDecorator: NotebookInsertedCellDecorator;
-	private readonly _ctxHasEditorModification: IContextKey<boolean>;
-	constructor(
-		private readonly notebookEditor: INotebookEditor,
-		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
-		@INotebookOriginalModelReferenceFactory private readonly originalModelRefFactory: INotebookOriginalModelReferenceFactory,
-		@INotebookModelSynchronizerFactory private readonly synchronizerFactory: INotebookModelSynchronizerFactory,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-	) {
-		super();
-		this._ctxHasEditorModification = ctxNotebookHasEditorModification.bindTo(contextKeyService);
-		this.deletedCellDecorator = this._register(instantiationService.createInstance(NotebookDeletedCellDecorator, notebookEditor, undefined));
-		this.insertedCellDecorator = this._register(instantiationService.createInstance(NotebookInsertedCellDecorator, notebookEditor));
-		const notebookModel = observableFromEvent(this.notebookEditor.onDidChangeModel, e => e);
-		const originalModel = observableValue<NotebookTextModel | undefined>('originalModel', undefined);
-		// We need to render viewzones only when the viewmodel is attached (i.e. list view is ready).
-		// https://github.com/microsoft/vscode/issues/234718
-		const readyToRenderViewzones = observableValue<boolean>('viewModelAttached', false);
-		this._register(Event.once(this.notebookEditor.onDidAttachViewModel)(() => readyToRenderViewzones.set(true, undefined)));
-		const onDidChangeVisibleRanges = debouncedObservable(observableFromEvent(this.notebookEditor.onDidChangeVisibleRanges, () => this.notebookEditor.visibleRanges), 50);
-		const decorators = new Map<NotebookCellTextModel, NotebookCellDiffDecorator>();
-
-		let updatedCellDecoratorsOnceBefore = false;
-		let updatedDeletedInsertedDecoratorsOnceBefore = false;
-
-
-		const clearDecorators = () => {
-			dispose(Array.from(decorators.values()));
-			decorators.clear();
-			this.deletedCellDecorator.clear();
-			this.insertedCellDecorator.clear();
-		};
-
-		this._register(toDisposable(() => clearDecorators()));
-
-		let notebookSynchronizer: IReference<NotebookModelSynchronizer>;
-		const entryObs = derived((r) => {
-			const model = notebookModel.read(r);
-			if (!model) {
-				return;
-			}
-			const sessions = this._chatEditingService.editingSessionsObs.read(r);
-			const entry = sessions.map(s => s.readEntry(model.uri, r)).find(r => !!r);
-			return entry instanceof ChatEditingModifiedDocumentEntry ? entry : undefined;
-		}).recomputeInitiallyAndOnChange(this._store);
-
-
-		this._register(autorun(r => {
-			const entry = entryObs.read(r);
-			const model = notebookModel.read(r);
-			if (!entry || !model || entry.state.read(r) !== WorkingSetEntryState.Modified) {
-				clearDecorators();
-			}
-		}));
-
-		const notebookDiffInfo = derivedWithStore(this, (r, store) => {
-			const entry = entryObs.read(r);
-			const model = notebookModel.read(r);
-			if (!entry || !model) {
-				// If entry is undefined, then revert the changes to the notebook.
-				if (notebookSynchronizer && model) {
-					notebookSynchronizer.object.revert();
-				}
-				return observableValue<{
-					cellDiff: CellDiffInfo[];
-					modelVersion: number;
-				} | undefined>('DefaultDiffIno', undefined);
-			}
-
-			notebookSynchronizer = notebookSynchronizer || this._register(this.synchronizerFactory.getOrCreate(model));
-			this.originalModelRefFactory.getOrCreate(entry, model.viewType).then(ref => originalModel.set(this._register(ref).object, undefined));
-
-			return notebookSynchronizer.object.diffInfo;
-		}).recomputeInitiallyAndOnChange(this._store).flatten();
-
-		const notebookCellDiffInfo = notebookDiffInfo.map(d => d?.cellDiff);
-		this._register(instantiationService.createInstance(NotebookChatActionsOverlayController, notebookEditor, notebookCellDiffInfo, this.deletedCellDecorator));
-
-		this._register(autorun(r => {
-			// If we have a new entry for the file, then clear old decorators.
-			// User could be cycling through different edit sessions (Undo Last Edit / Redo Last Edit).
-			entryObs.read(r);
-			clearDecorators();
-		}));
-
-		this._register(autorun(r => {
-			// If there's no diff info, then we either accepted or rejected everything.
-			const diffs = notebookDiffInfo.read(r);
-			if (!diffs || !diffs.cellDiff.length) {
-				clearDecorators();
-				this._ctxHasEditorModification.reset();
-			} else {
-				this._ctxHasEditorModification.set(true);
-			}
-		}));
-
-		this._register(autorun(r => {
-			const entry = entryObs.read(r);
-			const diffInfo = notebookDiffInfo.read(r);
-			const modified = notebookModel.read(r);
-			const original = originalModel.read(r);
-			onDidChangeVisibleRanges.read(r);
-
-			if (!entry || !modified || !original || !diffInfo) {
-				return;
-			}
-			if (diffInfo && updatedCellDecoratorsOnceBefore && (diffInfo.modelVersion !== modified.versionId)) {
-				return;
-			}
-
-			updatedCellDecoratorsOnceBefore = true;
-			const validDiffDecorators = new Set<NotebookCellDiffDecorator>();
-			diffInfo.cellDiff.forEach((diff) => {
-				if (diff.type === 'modified') {
-					const modifiedCell = modified.cells[diff.modifiedCellIndex];
-					const originalCell = original.cells[diff.originalCellIndex];
-					const editor = this.notebookEditor.codeEditors.find(([vm,]) => vm.handle === modifiedCell.handle)?.[1];
-
-					if (editor) {
-						const currentDecorator = decorators.get(modifiedCell);
-						if ((currentDecorator?.modifiedCell !== modifiedCell || currentDecorator?.originalCell !== originalCell)) {
-							currentDecorator?.dispose();
-							const decorator = this.instantiationService.createInstance(NotebookCellDiffDecorator, notebookEditor, modifiedCell, originalCell);
-							decorators.set(modifiedCell, decorator);
-							validDiffDecorators.add(decorator);
-							this._register(editor.onDidDispose(() => {
-								decorator.dispose();
-								if (decorators.get(modifiedCell) === decorator) {
-									decorators.delete(modifiedCell);
-								}
-							}));
-						} else if (currentDecorator) {
-							validDiffDecorators.add(currentDecorator);
-						}
-					}
-				}
-			});
-
-			// Dispose old decorators
-			decorators.forEach((v, cell) => {
-				if (!validDiffDecorators.has(v)) {
-					v.dispose();
-					decorators.delete(cell);
-				}
-			});
-		}));
-
-		this._register(autorun(r => {
-			const entry = entryObs.read(r);
-			const diffInfo = notebookDiffInfo.read(r);
-			const modified = notebookModel.read(r);
-			const original = originalModel.read(r);
-			const ready = readyToRenderViewzones.read(r);
-			if (!ready || !entry || !modified || !original || !diffInfo) {
-				return;
-			}
-			if (diffInfo && updatedDeletedInsertedDecoratorsOnceBefore && (diffInfo.modelVersion !== modified.versionId)) {
-				return;
-			}
-			updatedDeletedInsertedDecoratorsOnceBefore = true;
-			this.insertedCellDecorator.apply(diffInfo.cellDiff);
-			this.deletedCellDecorator.apply(diffInfo.cellDiff, original);
-		}));
-	}
-
-}
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts
deleted file mode 100644
index 56be90aafa6b..000000000000
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts
+++ /dev/null
@@ -1,501 +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 { isEqual } from '../../../../../../base/common/resources.js';
-import { Disposable, IReference, ReferenceCollection } from '../../../../../../base/common/lifecycle.js';
-import { IChatEditingService, IModifiedFileEntry } from '../../../../chat/common/chatEditingService.js';
-import { INotebookService } from '../../../common/notebookService.js';
-import { bufferToStream, streamToBuffer, VSBuffer } from '../../../../../../base/common/buffer.js';
-import { NotebookTextModel } from '../../../common/model/notebookTextModel.js';
-import { raceCancellation, ThrottledDelayer } from '../../../../../../base/common/async.js';
-import { CellDiffInfo, prettyChanges } from '../../diff/notebookDiffViewModel.js';
-import { CancellationToken, CancellationTokenSource } from '../../../../../../base/common/cancellation.js';
-import { INotebookEditorWorkerService } from '../../../common/services/notebookWorkerService.js';
-import { CellEditType, ICellDto2, ICellEditOperation, ICellReplaceEdit, NotebookData, NotebookSetting } from '../../../common/notebookCommon.js';
-import { URI } from '../../../../../../base/common/uri.js';
-import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
-import { EditOperation } from '../../../../../../editor/common/core/editOperation.js';
-import { INotebookLoggingService } from '../../../common/notebookLoggingService.js';
-import { filter } from '../../../../../../base/common/objects.js';
-import { INotebookEditorModelResolverService } from '../../../common/notebookEditorModelResolverService.js';
-import { IChatService } from '../../../../chat/common/chatService.js';
-import { createDecorator, IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { INotebookOriginalModelReferenceFactory } from './notebookOriginalModelRefFactory.js';
-import { autorunWithStore, derived, IObservable, observableValue } from '../../../../../../base/common/observable.js';
-import { SaveReason } from '../../../../../common/editor.js';
-import { ITextModelService } from '../../../../../../editor/common/services/resolverService.js';
-import { SnapshotContext } from '../../../../../services/workingCopy/common/fileWorkingCopy.js';
-import { INotebookEditorService } from '../../services/notebookEditorService.js';
-import { CellEditState } from '../../notebookBrowser.js';
-import { IModelService } from '../../../../../../editor/common/services/model.js';
-import { ChatEditingModifiedDocumentEntry } from '../../../../chat/browser/chatEditing/chatEditingModifiedDocumentEntry.js';
-import { computeDiff } from '../../../common/notebookDiff.js';
-
-
-export const INotebookModelSynchronizerFactory = createDecorator<INotebookModelSynchronizerFactory>('INotebookModelSynchronizerFactory');
-
-export interface INotebookModelSynchronizerFactory {
-	readonly _serviceBrand: undefined;
-	getOrCreate(model: NotebookTextModel): IReference<NotebookModelSynchronizer>;
-}
-
-class NotebookModelSynchronizerReferenceCollection extends ReferenceCollection<NotebookModelSynchronizer> {
-	constructor(@IInstantiationService private readonly instantiationService: IInstantiationService) {
-		super();
-	}
-	protected override createReferencedObject(_key: string, model: NotebookTextModel): NotebookModelSynchronizer {
-		return this.instantiationService.createInstance(NotebookModelSynchronizer, model);
-	}
-	protected override destroyReferencedObject(_key: string, object: NotebookModelSynchronizer): void {
-		object.dispose();
-	}
-}
-
-export class NotebookModelSynchronizerFactory implements INotebookModelSynchronizerFactory {
-	readonly _serviceBrand: undefined;
-	private readonly _data: NotebookModelSynchronizerReferenceCollection;
-	constructor(@IInstantiationService instantiationService: IInstantiationService) {
-		this._data = instantiationService.createInstance(NotebookModelSynchronizerReferenceCollection);
-	}
-
-	getOrCreate(model: NotebookTextModel): IReference<NotebookModelSynchronizer> {
-		return this._data.acquire(model.uri.toString(), model);
-	}
-}
-
-
-export class NotebookModelSynchronizer extends Disposable {
-	private readonly throttledUpdateNotebookModel = new ThrottledDelayer(200);
-	private _diffInfo = observableValue<{ cellDiff: CellDiffInfo[]; modelVersion: number } | undefined>('diffInfo', undefined);
-	public get diffInfo(): IObservable<{ cellDiff: CellDiffInfo[]; modelVersion: number } | undefined> {
-		return this._diffInfo;
-	}
-	private snapshot?: { bytes: VSBuffer; dirty: boolean };
-	private isEditFromUs: boolean = false;
-	private isTextEditFromUs: boolean = false;
-	private isReverting = false;
-	private throttledTextModelUpdate = new ThrottledDelayer<void>(100);
-	constructor(
-		private readonly model: NotebookTextModel,
-		@IChatEditingService _chatEditingService: IChatEditingService,
-		@INotebookService private readonly notebookService: INotebookService,
-		@INotebookEditorService private readonly notebookEditorService: INotebookEditorService,
-		@IChatService chatService: IChatService,
-		@IModelService private readonly modelService: IModelService,
-		@ITextModelService private readonly textModelService: ITextModelService,
-		@INotebookLoggingService private readonly logService: INotebookLoggingService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@INotebookEditorWorkerService private readonly notebookEditorWorkerService: INotebookEditorWorkerService,
-		@INotebookEditorModelResolverService private readonly notebookModelResolverService: INotebookEditorModelResolverService,
-		@INotebookOriginalModelReferenceFactory private readonly originalModelRefFactory: INotebookOriginalModelReferenceFactory,
-	) {
-		super();
-
-		const entryObs = derived((r) => {
-			const sessions = _chatEditingService.editingSessionsObs.read(r);
-			const entry = sessions.map(s => s.readEntry(model.uri, r)).find(r => !!r);
-			return entry instanceof ChatEditingModifiedDocumentEntry ? entry : undefined;
-		}).recomputeInitiallyAndOnChange(this._store);
-
-
-		this._register(chatService.onDidPerformUserAction(async e => {
-			const entry = entryObs.read(undefined);
-			if (!entry) {
-				return;
-			}
-			if (e.action.kind === 'chatEditingSessionAction' && !e.action.hasRemainingEdits && isEqual(e.action.uri, entry.modifiedURI)) {
-				if (e.action.outcome === 'accepted') {
-					await this.accept(entry);
-					await this.createSnapshot();
-					this._diffInfo.set(undefined, undefined);
-				}
-				else if (e.action.outcome === 'rejected') {
-					await this.revertImpl();
-				}
-			}
-		}));
-
-		const updateNotebookModel = (entry: IModifiedFileEntry, token: CancellationToken) => {
-			this.throttledUpdateNotebookModel.trigger(() => this.updateNotebookModel(entry, token));
-		};
-
-		let snapshotCreated = false;
-		this._register(autorunWithStore((r, store) => {
-			const entry = entryObs.read(r);
-			if (!entry) {
-				return;
-			}
-			if (!snapshotCreated) {
-				this.createSnapshot();
-				snapshotCreated = true;
-			}
-
-			const modifiedModel = this.modelService.getModel(entry.modifiedURI);
-			if (!modifiedModel) {
-				return;
-			}
-			let cancellationToken = store.add(new CancellationTokenSource());
-			store.add(modifiedModel.onDidChangeContent(async () => {
-				const originalModel = this.modelService.getModel(entry.originalURI);
-				if (originalModel && !this.isTextEditFromUs && !modifiedModel.isDisposed() && !originalModel.isDisposed() && modifiedModel.getValue() !== originalModel.getValue()) {
-					cancellationToken = store.add(new CancellationTokenSource());
-					updateNotebookModel(entry, cancellationToken.token);
-				}
-			}));
-
-			updateNotebookModel(entry, cancellationToken.token);
-		}));
-
-		this._register(model.onDidChangeContent(() => {
-			// Track changes from the user.
-			if (!this.isEditFromUs && this.snapshot) {
-				this.snapshot.dirty = true;
-				const entry = entryObs.get();
-				if (entry) {
-					this.throttledTextModelUpdate.trigger(() => this.updateTextDocumentModel(entry));
-				}
-			}
-		}));
-	}
-
-	private async createSnapshot() {
-		const [serializer, ref] = await Promise.all([
-			this.getNotebookSerializer(),
-			this.notebookModelResolverService.resolve(this.model.uri)
-		]);
-
-		try {
-			const data: NotebookData = {
-				metadata: filter(this.model.metadata, key => !serializer.options.transientDocumentMetadata[key]),
-				cells: [],
-			};
-
-			const indentAmount = this.model.metadata.indentAmount || ref.object.notebook.metadata.indentAmount || undefined;
-			if (typeof indentAmount === 'string' && indentAmount) {
-				// This is required for ipynb serializer to preserve the whitespace in the notebook.
-				data.metadata.indentAmount = indentAmount;
-			}
-
-			let outputSize = 0;
-			for (const cell of this.model.cells) {
-				const cellData: ICellDto2 = {
-					cellKind: cell.cellKind,
-					language: cell.language,
-					mime: cell.mime,
-					source: cell.getValue(),
-					outputs: [],
-					internalMetadata: cell.internalMetadata
-				};
-
-				const outputSizeLimit = this.configurationService.getValue<number>(NotebookSetting.outputBackupSizeLimit) * 1024;
-				if (outputSizeLimit > 0) {
-					cell.outputs.forEach(output => {
-						output.outputs.forEach(item => {
-							outputSize += item.data.byteLength;
-						});
-					});
-					if (outputSize > outputSizeLimit) {
-						return;
-					}
-				}
-
-				cellData.outputs = !serializer.options.transientOutputs ? cell.outputs : [];
-				cellData.metadata = filter(cell.metadata, key => !serializer.options.transientCellMetadata[key]);
-
-				data.cells.push(cellData);
-			}
-
-			const bytes = await serializer.notebookToData(data);
-			this.snapshot = { bytes, dirty: ref.object.isDirty() };
-		} finally {
-			ref.dispose();
-		}
-	}
-
-	public async revert() {
-		await this.revertImpl();
-	}
-
-	private async revertImpl(): Promise<void> {
-		if (!this.snapshot || this.isReverting) {
-			return;
-		}
-		this.isReverting = true;
-		try {
-			// NOTE: We must save if the notebook model was not already dirty.
-			// Today ModifiedFileEntry class will save the text model to get rid of dirty indicator.
-			// If we do not save the notebook model, then ipynb json text document will get saved in ModifiedFileEntry class,
-			// and that results in ipynb being saved without going to serializer.
-			// Serializer is responsible for adding new line to ipynb files, and that new line will not be added when saving ipynb text document.
-			// As a result of this, reverting (creating new edit sessions), result in ipynb files without new line at the end meaning we still end up with a saved ipynb file with changes.
-			// Hence we must ensure ipynb notebooks are always saved through serializer.
-			// But do this only if the notebook model was not already dirty.
-			await this.updateNotebook(this.snapshot.bytes, !this.snapshot.dirty);
-		}
-		finally {
-			this.isReverting = false;
-			this._diffInfo.set(undefined, undefined);
-		}
-	}
-
-	private async updateNotebook(bytes: VSBuffer, saveForRevert: boolean) {
-		const oldEditIsFromus = this.isEditFromUs;
-		this.isEditFromUs = true;
-		const ref = await this.notebookModelResolverService.resolve(this.model.uri);
-		try {
-			const serializer = await this.getNotebookSerializer();
-			const data = await serializer.dataToNotebook(bytes);
-			this.model.reset(data.cells, data.metadata, serializer.options);
-			if (saveForRevert) {
-				// When reverting/creating a new session ModifiedFileEntry will revert and save changes to ipynb text document first, and save the file.
-				// This happens in the NotebookSyncrhonizerService which is called from SimpleNotebookEditorModel (NotebookEditorModel.ts).
-				// However when creating new sessions, the modified File entry will not exist as its a whole new session,
-				// As a result we aren't able to save the ipynb text document and match the last modified date time.
-				// Hence the work around implemented in SimpleNotebookEditorModel does not work.
-				// Thus we must save the file here igorning the modified since time, but only when reverting.
-				await ref.object.save({ reason: SaveReason.EXPLICIT, force: true, ignoreModifiedSince: true } as any);
-			}
-		} finally {
-			ref.dispose();
-			this.isEditFromUs = oldEditIsFromus;
-		}
-	}
-
-	private async accept(entry: IModifiedFileEntry) {
-		const modifiedModel = this.modelService.getModel(entry.modifiedURI);
-		if (!modifiedModel) {
-			return;
-		}
-		const content = modifiedModel.getValue();
-		await this.updateNotebook(VSBuffer.fromString(content), false);
-		this._diffInfo.set(undefined, undefined);
-
-		// The original notebook model needs to be updated with the latest content.
-		const stream = await this.notebookService.createNotebookTextDocumentSnapshot(this.model.uri, SnapshotContext.Save, CancellationToken.None);
-		const originalModel = await this.getOriginalModel(entry);
-		await this.notebookService.restoreNotebookTextModelFromSnapshot(originalModel.uri, originalModel.viewType, stream);
-	}
-
-	private async updateTextDocumentModel(entry: IModifiedFileEntry) {
-		const modifiedModel = this.modelService.getModel(entry.modifiedURI);
-		if (!modifiedModel) {
-			return;
-		}
-		const stream = await this.notebookService.createNotebookTextDocumentSnapshot(this.model.uri, SnapshotContext.Save, CancellationToken.None);
-		const buffer = await streamToBuffer(stream);
-		const text = new TextDecoder().decode(buffer.buffer);
-		this.isTextEditFromUs = true;
-		modifiedModel.pushEditOperations(null, [{ range: modifiedModel.getFullModelRange(), text }], () => null);
-		this.isTextEditFromUs = false;
-	}
-
-	async getNotebookSerializer() {
-		const info = await this.notebookService.withNotebookDataProvider(this.model.viewType);
-		return info.serializer;
-	}
-
-	private _originalModel?: Promise<NotebookTextModel>;
-	private async getOriginalModel(entry: IModifiedFileEntry): Promise<NotebookTextModel> {
-		if (!this._originalModel) {
-			this._originalModel = this.originalModelRefFactory.getOrCreate(entry, this.model.viewType).then(ref => {
-				if (this._store.isDisposed) {
-					ref.dispose();
-					return ref.object;
-				} else {
-					return this._register(ref).object;
-				}
-			});
-		}
-		return this._originalModel;
-	}
-
-	private async updateNotebookModel(entry: IModifiedFileEntry, token: CancellationToken) {
-		const modifiedModel = this.modelService.getModel(entry.modifiedURI);
-		if (!modifiedModel) {
-			return;
-		}
-
-		const modifiedModelVersion = modifiedModel.getVersionId();
-		const currentModel = this.model;
-		const modelVersion = currentModel?.versionId ?? 0;
-		const modelWithChatEdits = await this.getModifiedModelForDiff(entry, token);
-		if (!modelWithChatEdits || token.isCancellationRequested || !currentModel) {
-			return;
-		}
-		const originalModel = await this.getOriginalModel(entry);
-		// This is the total diff from the original model to the model with chat edits.
-		const cellDiffInfo = (await this.computeDiff(originalModel, modelWithChatEdits, token))?.cellDiffInfo;
-		// This is the diff from the current model to the model with chat edits.
-		const cellDiffInfoToApplyEdits = (await this.computeDiff(currentModel, modelWithChatEdits, token))?.cellDiffInfo;
-		const currentVersion = modifiedModel.getVersionId();
-		if (!cellDiffInfo || !cellDiffInfoToApplyEdits || token.isCancellationRequested || currentVersion !== modifiedModelVersion || modelVersion !== currentModel.versionId) {
-			return;
-		}
-		if (cellDiffInfoToApplyEdits.every(d => d.type === 'unchanged')) {
-			return;
-		}
-
-		// All edits from here on are from us.
-		this.isEditFromUs = true;
-		try {
-			const edits: ICellReplaceEdit[] = [];
-			const mappings = new Map<number, number>();
-
-			// First Delete.
-			const deletedIndexes: number[] = [];
-			await Promise.all(cellDiffInfoToApplyEdits.reverse().map(async diff => {
-				if (diff.type === 'delete') {
-					deletedIndexes.push(diff.originalCellIndex);
-					edits.push({
-						editType: CellEditType.Replace,
-						index: diff.originalCellIndex,
-						cells: [],
-						count: 1
-					});
-				}
-			}));
-			if (edits.length) {
-				currentModel.applyEdits(edits, true, undefined, () => undefined, undefined, false);
-				edits.length = 0;
-			}
-
-			const notebookEditor = this.notebookEditorService.retrieveExistingWidgetFromURI(this.model.uri)?.value;
-
-			// Next insert.
-			cellDiffInfoToApplyEdits.reverse().forEach(diff => {
-				if (diff.type === 'modified' || diff.type === 'unchanged') {
-					mappings.set(diff.modifiedCellIndex, diff.originalCellIndex);
-				}
-				if (diff.type === 'insert') {
-					const originalIndex = mappings.get(diff.modifiedCellIndex - 1) ?? 0;
-					mappings.set(diff.modifiedCellIndex, originalIndex);
-					const index = currentModel.cells.length ? originalIndex + 1 : originalIndex;
-					const cell = modelWithChatEdits.cells[diff.modifiedCellIndex];
-					const newCell: ICellDto2 =
-					{
-						source: cell.getValue(),
-						cellKind: cell.cellKind,
-						language: cell.language,
-						outputs: cell.outputs.map(output => output.asDto()),
-						mime: cell.mime,
-						metadata: cell.metadata,
-						collapseState: cell.collapseState,
-						internalMetadata: cell.internalMetadata
-					};
-					edits.push({
-						editType: CellEditType.Replace,
-						index,
-						cells: [newCell],
-						count: 0
-					});
-				}
-			});
-			if (edits.length) {
-				currentModel.applyEdits(edits, true, undefined, () => undefined, undefined, false);
-				for (const edit of edits.filter(e => e.editType === CellEditType.Replace)) {
-					const cell = currentModel.cells[edit.index];
-					if (cell) {
-						const cellViewModel = notebookEditor?.getCellByHandle(cell.handle);
-						cellViewModel?.updateEditState(CellEditState.Editing, 'chatEdit');
-					}
-				}
-				edits.length = 0;
-			}
-
-			// Finally update
-			await Promise.all(cellDiffInfoToApplyEdits.map(async diff => {
-				if (diff.type === 'modified') {
-					const cell = currentModel.cells[diff.originalCellIndex];
-					// Ensure the models of these cells have been loaded before we update them.
-					const cellModelRef = await this.textModelService.createModelReference(cell.uri);
-					try {
-						const modifiedCell = modelWithChatEdits.cells[diff.modifiedCellIndex];
-						if (modifiedCell.cellKind === cell.cellKind) {
-							const cellViewModel = notebookEditor?.getCellByHandle(cell.handle);
-							cellViewModel?.updateEditState(CellEditState.Editing, 'chatEdit');
-							const textModel = cellModelRef.object.textEditorModel;
-							textModel.pushEditOperations(null, [
-								EditOperation.replace(textModel.getFullModelRange(), modifiedCell.getValue())
-							], () => null);
-						} else {
-							const newCellDto: ICellDto2 =
-							{
-								source: modifiedCell.getValue(),
-								cellKind: modifiedCell.cellKind,
-								language: modifiedCell.language,
-								outputs: modifiedCell.outputs.map(output => output.asDto()),
-								mime: modifiedCell.mime,
-								metadata: modifiedCell.metadata,
-								collapseState: modifiedCell.collapseState,
-								internalMetadata: modifiedCell.internalMetadata
-							};
-							const edit: ICellEditOperation = {
-								editType: CellEditType.Replace,
-								index: diff.originalCellIndex,
-								cells: [newCellDto],
-								count: 1
-							};
-							currentModel.applyEdits([edit], true, undefined, () => undefined, undefined, false);
-							const newCell = currentModel.cells[diff.originalCellIndex];
-							const cellViewModel = notebookEditor?.getCellByHandle(newCell.handle);
-							cellViewModel?.updateEditState(CellEditState.Editing, 'chatEdit');
-						}
-					} finally {
-						cellModelRef.dispose();
-					}
-				}
-			}));
-
-			if (edits.length) {
-				currentModel.applyEdits(edits, true, undefined, () => undefined, undefined, false);
-			}
-			this._diffInfo.set({ cellDiff: cellDiffInfo, modelVersion: currentModel.versionId }, undefined);
-		}
-		finally {
-			this.isEditFromUs = false;
-		}
-	}
-	private previousUriOfModelForDiff?: URI;
-
-	private async getModifiedModelForDiff(entry: IModifiedFileEntry, token: CancellationToken): Promise<NotebookTextModel | undefined> {
-		const modifiedModel = this.modelService.getModel(entry.modifiedURI);
-		if (!modifiedModel) {
-			return;
-		}
-		const text = modifiedModel.getValue();
-		const bytes = VSBuffer.fromString(text);
-		const uri = entry.modifiedURI.with({ scheme: `NotebookChatEditorController.modifiedScheme${Date.now().toString()}` });
-		const stream = bufferToStream(bytes);
-		if (this.previousUriOfModelForDiff) {
-			this.notebookService.getNotebookTextModel(this.previousUriOfModelForDiff)?.dispose();
-		}
-		this.previousUriOfModelForDiff = uri;
-		try {
-			const model = await this.notebookService.createNotebookTextModel(this.model.viewType, uri, stream);
-			if (token.isCancellationRequested) {
-				model.dispose();
-				return;
-			}
-			this._register(model);
-			return model;
-		} catch (ex) {
-			this.logService.warn('NotebookChatEdit', `Failed to deserialize Notebook for ${uri.toString}, ${ex.message}`);
-			this.logService.debug('NotebookChatEdit', ex.toString());
-			return;
-		}
-	}
-
-	async computeDiff(original: NotebookTextModel, modified: NotebookTextModel, token: CancellationToken) {
-		const diffResult = await raceCancellation(this.notebookEditorWorkerService.computeDiff(original.uri, modified.uri), token);
-		if (!diffResult || token.isCancellationRequested) {
-			// after await the editor might be disposed.
-			return;
-		}
-
-		prettyChanges(original, modified, diffResult.cellsDiff);
-
-		return computeDiff(original, modified, diffResult);
-	}
-}
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizerService.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizerService.ts
deleted file mode 100644
index 5d788c4c0b49..000000000000
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizerService.ts
+++ /dev/null
@@ -1,94 +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 { IFileService } from '../../../../../../platform/files/common/files.js';
-import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel, StoredFileWorkingCopy } from '../../../../../services/workingCopy/common/storedFileWorkingCopy.js';
-import { IUntitledFileWorkingCopy } from '../../../../../services/workingCopy/common/untitledFileWorkingCopy.js';
-import { IStoredFileWorkingCopySaveParticipantContext, IWorkingCopyFileService } from '../../../../../services/workingCopy/common/workingCopyFileService.js';
-import { IChatEditingService } from '../../../../chat/common/chatEditingService.js';
-import { NotebookFileWorkingCopyModel } from '../../../common/notebookEditorModel.js';
-import { INotebookSynchronizerService } from '../../../common/notebookSynchronizerService.js';
-import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { NotebookSaveParticipant } from '../saveParticipants/saveParticipants.js';
-import { CancellationToken } from '../../../../../../base/common/cancellation.js';
-import { IProgress, IProgressStep } from '../../../../../../platform/progress/common/progress.js';
-import { IEditorService } from '../../../../../services/editor/common/editorService.js';
-import { INotebookService } from '../../../common/notebookService.js';
-import { ChatEditingModifiedDocumentEntry } from '../../../../chat/browser/chatEditing/chatEditingModifiedDocumentEntry.js';
-import { SaveReason } from '../../../../../common/editor.js';
-
-class NotebookSynchronizerSaveParticipant extends NotebookSaveParticipant {
-	constructor(
-		@IEditorService editorService: IEditorService,
-		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
-		@IFileService protected readonly _fileService: IFileService,
-		@INotebookService private readonly _notebookService: INotebookService,
-	) {
-		super(editorService);
-	}
-
-	override async participate(workingCopy: IStoredFileWorkingCopy<IStoredFileWorkingCopyModel>, context: IStoredFileWorkingCopySaveParticipantContext, progress: IProgress<IProgressStep>, token: CancellationToken): Promise<void> {
-		const sessions = this._chatEditingService.editingSessionsObs.get();
-		const session = sessions.find(s => s.getEntry(workingCopy.resource));
-		if (!session) {
-			return;
-		}
-
-		if (!this._notebookService.hasSupportedNotebooks(workingCopy.resource)) {
-			return;
-		}
-
-		const entry = session.getEntry(workingCopy.resource);
-
-		if (entry && entry instanceof ChatEditingModifiedDocumentEntry) {
-			await entry.docFileEditorModel.save({ reason: SaveReason.EXPLICIT, ignoreModifiedSince: true });
-		}
-
-		const inWorkingSet = session.workingSet.has(workingCopy.resource);
-
-		if (!(entry && entry instanceof ChatEditingModifiedDocumentEntry) && !inWorkingSet) {
-			// file not in working set, no need to continue
-			return;
-		}
-
-		if (workingCopy instanceof StoredFileWorkingCopy) {
-			const metadata = await this._fileService.stat(workingCopy.resource);
-			if (workingCopy.lastResolvedFileStat) {
-				workingCopy.lastResolvedFileStat = {
-					...workingCopy.lastResolvedFileStat,
-					...metadata
-				};
-			}
-		}
-	}
-}
-
-export class NotebookSynchronizerService extends Disposable implements INotebookSynchronizerService {
-	_serviceBrand: undefined;
-
-	constructor(
-		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
-		@IFileService protected readonly _fileService: IFileService,
-		@INotebookService private readonly _notebookService: INotebookService,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IWorkingCopyFileService private readonly _workingCopyFileService: IWorkingCopyFileService) {
-		super();
-		this._register(this._workingCopyFileService.addSaveParticipant(this._instantiationService.createInstance(NotebookSynchronizerSaveParticipant)));
-	}
-
-	async revert(workingCopy: IStoredFileWorkingCopy<NotebookFileWorkingCopyModel> | IUntitledFileWorkingCopy<NotebookFileWorkingCopyModel>) {
-		// check if we have mirror document
-		const resource = workingCopy.resource;
-		if (!this._notebookService.hasSupportedNotebooks(workingCopy.resource)) {
-			return;
-		}
-		const sessions = this._chatEditingService.editingSessionsObs.get();
-		const entry = sessions.map(s => s.getEntry(resource)).find(r => !!r);
-		if (entry instanceof ChatEditingModifiedDocumentEntry) {
-			await entry.docFileEditorModel.revert({ soft: true });
-		}
-	}
-}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookCellDiffDecorator.ts b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookCellDiffDecorator.ts
index 1a31b09e0e76..8da4d2c230de 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookCellDiffDecorator.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookCellDiffDecorator.ts
@@ -21,7 +21,7 @@ import { Range } from '../../../../../../editor/common/core/range.js';
 import { NotebookCellTextModel } from '../../../common/model/notebookCellTextModel.js';
 import { DetailedLineRangeMapping } from '../../../../../../editor/common/diff/rangeMapping.js';
 import { minimapGutterAddedBackground, minimapGutterDeletedBackground, minimapGutterModifiedBackground, overviewRulerAddedForeground, overviewRulerDeletedForeground, overviewRulerModifiedForeground } from '../../../../scm/common/quickDiff.js';
-import { INotebookOriginalCellModelFactory } from '../../contrib/chatEdit/notebookOriginalCellModelFactory.js';
+import { INotebookOriginalCellModelFactory } from './notebookOriginalCellModelFactory.js';
 
 //TODO: allow client to set read-only - chateditsession should set read-only while making changes
 export class NotebookCellDiffDecorator extends DisposableStore {
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInlineDiff.ts b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInlineDiff.ts
index 974b5acb0033..c0973dd6f860 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInlineDiff.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInlineDiff.ts
@@ -18,6 +18,9 @@ import { NotebookDeletedCellDecorator } from './notebookDeletedCellDecorator.js'
 import { NotebookInsertedCellDecorator } from './notebookInsertedCellDecorator.js';
 import { INotebookLoggingService } from '../../../common/notebookLoggingService.js';
 import { computeDiff } from '../../../common/notebookDiff.js';
+import { InstantiationType, registerSingleton } from '../../../../../../platform/instantiation/common/extensions.js';
+import { INotebookOriginalModelReferenceFactory, NotebookOriginalModelReferenceFactory } from './notebookOriginalModelRefFactory.js';
+import { INotebookOriginalCellModelFactory, OriginalNotebookCellModelFactory } from './notebookOriginalCellModelFactory.js';
 
 export class NotebookInlineDiffDecorationContribution extends Disposable implements INotebookEditorContribution {
 	static ID: string = 'workbench.notebook.inlineDiffDecoration';
@@ -163,3 +166,5 @@ export class NotebookInlineDiffDecorationContribution extends Disposable impleme
 }
 
 registerNotebookContribution(NotebookInlineDiffDecorationContribution.ID, NotebookInlineDiffDecorationContribution);
+registerSingleton(INotebookOriginalModelReferenceFactory, NotebookOriginalModelReferenceFactory, InstantiationType.Delayed);
+registerSingleton(INotebookOriginalCellModelFactory, OriginalNotebookCellModelFactory, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalCellModelFactory.ts b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalCellModelFactory.ts
similarity index 100%
rename from src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalCellModelFactory.ts
rename to src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalCellModelFactory.ts
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalModelRefFactory.ts b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory.ts
similarity index 100%
rename from src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalModelRefFactory.ts
rename to src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory.ts
diff --git a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
index c1cb89476ffc..10a50d99cdf5 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
@@ -105,9 +105,6 @@ import './contrib/notebookVariables/notebookInlineVariables.js';
 // Diff Editor Contribution
 import './diff/notebookDiffActions.js';
 
-// Chat Edit Contributions
-import './contrib/chatEdit/contribution.js';
-
 // Services
 import { editorOptionsRegistry } from '../../../../editor/common/config/editorOptions.js';
 import { NotebookExecutionStateService } from './services/notebookExecutionStateServiceImpl.js';
@@ -135,8 +132,6 @@ import { NotebookMultiDiffEditorInput } from './diff/notebookMultiDiffEditorInpu
 import { getFormattedMetadataJSON } from '../common/model/notebookCellTextModel.js';
 import { INotebookOutlineEntryFactory, NotebookOutlineEntryFactory } from './viewModel/notebookOutlineEntryFactory.js';
 import { getFormattedNotebookMetadataJSON } from '../common/model/notebookMetadataTextModel.js';
-import { INotebookSynchronizerService } from '../common/notebookSynchronizerService.js';
-import { NotebookSynchronizerService } from './contrib/chatEdit/notebookSynchronizerService.js';
 
 /*--------------------------------------------------------------------------------------------- */
 
@@ -882,7 +877,6 @@ registerSingleton(INotebookKeymapService, NotebookKeymapService, InstantiationTy
 registerSingleton(INotebookLoggingService, NotebookLoggingService, InstantiationType.Delayed);
 registerSingleton(INotebookCellOutlineDataSourceFactory, NotebookCellOutlineDataSourceFactory, InstantiationType.Delayed);
 registerSingleton(INotebookOutlineEntryFactory, NotebookOutlineEntryFactory, InstantiationType.Delayed);
-registerSingleton(INotebookSynchronizerService, NotebookSynchronizerService, InstantiationType.Delayed);
 
 const schemas: IJSONSchemaMap = {};
 function isConfigurationPropertySchema(x: IConfigurationPropertySchema | { [path: string]: IConfigurationPropertySchema }): x is IConfigurationPropertySchema {
diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
index 7b3fc131e99f..d0e9724f4dfc 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookEditorModel.ts
@@ -27,7 +27,6 @@ import { IFileWorkingCopyManager } from '../../../services/workingCopy/common/fi
 import { IStoredFileWorkingCopy, IStoredFileWorkingCopyModel, IStoredFileWorkingCopyModelContentChangedEvent, IStoredFileWorkingCopyModelFactory, IStoredFileWorkingCopySaveEvent, StoredFileWorkingCopyState } from '../../../services/workingCopy/common/storedFileWorkingCopy.js';
 import { IUntitledFileWorkingCopy, IUntitledFileWorkingCopyModel, IUntitledFileWorkingCopyModelContentChangedEvent, IUntitledFileWorkingCopyModelFactory } from '../../../services/workingCopy/common/untitledFileWorkingCopy.js';
 import { WorkingCopyCapabilities } from '../../../services/workingCopy/common/workingCopy.js';
-import { INotebookSynchronizerService } from './notebookSynchronizerService.js';
 
 //#region --- simple content provider
 
@@ -56,7 +55,6 @@ export class SimpleNotebookEditorModel extends EditorModel implements INotebookE
 		private readonly _workingCopyManager: IFileWorkingCopyManager<NotebookFileWorkingCopyModel, NotebookFileWorkingCopyModel>,
 		scratchpad: boolean,
 		@IFilesConfigurationService private readonly _filesConfigurationService: IFilesConfigurationService,
-		@INotebookSynchronizerService private readonly _notebookSynchronizerService: INotebookSynchronizerService
 	) {
 		super();
 
@@ -122,9 +120,6 @@ export class SimpleNotebookEditorModel extends EditorModel implements INotebookE
 
 	async revert(options?: IRevertOptions): Promise<void> {
 		assertType(this.isResolved());
-		if (this._workingCopy) {
-			await this._notebookSynchronizerService.revert(this._workingCopy);
-		}
 		return this._workingCopy!.revert(options);
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/common/notebookSynchronizerService.ts b/src/vs/workbench/contrib/notebook/common/notebookSynchronizerService.ts
deleted file mode 100644
index 4fc504655f5e..000000000000
--- a/src/vs/workbench/contrib/notebook/common/notebookSynchronizerService.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 { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { IStoredFileWorkingCopy } from '../../../services/workingCopy/common/storedFileWorkingCopy.js';
-import { IUntitledFileWorkingCopy } from '../../../services/workingCopy/common/untitledFileWorkingCopy.js';
-import { NotebookFileWorkingCopyModel } from './notebookEditorModel.js';
-
-export const INotebookSynchronizerService = createDecorator<INotebookSynchronizerService>('notebookSynchronizerService');
-
-export interface INotebookSynchronizerService {
-	readonly _serviceBrand: undefined;
-	revert(workingCopy: IStoredFileWorkingCopy<NotebookFileWorkingCopyModel> | IUntitledFileWorkingCopy<NotebookFileWorkingCopyModel>): Promise<void>;
-}

From 4d9c7a94f4ff67cb6a7fc64fae03773f929756b5 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Thu, 6 Mar 2025 22:39:33 +1100
Subject: [PATCH 0673/1815] Move notebook chat code to a separate folder
 (#242768)

---
 .../contrib/chat/browser/chat.contribution.ts |   2 +-
 .../chatEditingModifiedNotebookEntry.ts       | 736 +-----------------
 .../browser/chatEditing/chatEditingSession.ts |   2 +-
 .../chatEditingModifiedNotebookDiff.ts        |  14 +-
 .../chatEditingModifiedNotebookSnapshot.ts    |  16 +-
 .../notebook/chatEditingNotebookCellEntry.ts  | 345 ++++++++
 .../chatEditingNotebookEditorIntegration.ts   | 149 +---
 .../chatEditingNotebookFileSystemProvider.ts  |  26 +-
 .../browser/chatEditing/notebook/helpers.ts   | 405 ++++++++++
 .../notebook/notebookCellChanges.ts           | 122 +++
 .../chatEditingModifiedNotebookEntry.test.ts  |   4 +-
 11 files changed, 940 insertions(+), 881 deletions(-)
 rename src/vs/workbench/contrib/chat/browser/chatEditing/{ => notebook}/chatEditingModifiedNotebookDiff.ts (76%)
 rename src/vs/workbench/contrib/chat/browser/chatEditing/{ => notebook}/chatEditingModifiedNotebookSnapshot.ts (92%)
 create mode 100644 src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookCellEntry.ts
 rename src/vs/workbench/contrib/chat/browser/chatEditing/{ => notebook}/chatEditingNotebookEditorIntegration.ts (78%)
 rename src/vs/workbench/contrib/chat/browser/chatEditing/{ => notebook}/chatEditingNotebookFileSystemProvider.ts (83%)
 create mode 100644 src/vs/workbench/contrib/chat/browser/chatEditing/notebook/helpers.ts
 create mode 100644 src/vs/workbench/contrib/chat/browser/chatEditing/notebook/notebookCellChanges.ts

diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index fd5e161458f4..e951101ecb3f 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -98,8 +98,8 @@ import { DOCUMENTATION_URL } from '../common/promptSyntax/constants.js';
 import { registerChatToolActions } from './actions/chatToolActions.js';
 import { ChatStatusBarEntry } from './chatStatus.js';
 import product from '../../../../platform/product/common/product.js';
-import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditing/chatEditingNotebookFileSystemProvider.js';
 import { Event } from '../../../../base/common/event.js';
+import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditing/notebook/chatEditingNotebookFileSystemProvider.js';
 
 // Register configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index d60525370e8f..72149a29c116 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -3,38 +3,28 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RunOnceScheduler } from '../../../../../base/common/async.js';
 import { streamToBuffer } from '../../../../../base/common/buffer.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { DisposableStore, IReference, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { DisposableStore, IReference } 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 { ObservableDisposable } from '../../../../../base/common/observableDisposable.js';
 import { isEqual } from '../../../../../base/common/resources.js';
-import { themeColorFromId } 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 { EditOperation, ISingleEditOperation } from '../../../../../editor/common/core/editOperation.js';
 import { LineRange } from '../../../../../editor/common/core/lineRange.js';
 import { OffsetEdit } from '../../../../../editor/common/core/offsetEdit.js';
 import { Range } from '../../../../../editor/common/core/range.js';
-import { IDocumentDiff, nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
+import { nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
 import { DetailedLineRangeMapping, RangeMapping } from '../../../../../editor/common/diff/rangeMapping.js';
 import { TextEdit } from '../../../../../editor/common/languages.js';
-import { IModelDeltaDecoration, ITextModel, MinimapPosition, OverviewRulerLane } from '../../../../../editor/common/model.js';
-import { ModelDecorationOptions } from '../../../../../editor/common/model/textModel.js';
-import { OffsetEdits } from '../../../../../editor/common/model/textModelOffsetEdit.js';
-import { IEditorWorkerService } from '../../../../../editor/common/services/editorWorker.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 { IModelContentChangedEvent } from '../../../../../editor/common/textModelEvents.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 { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
-import { editorSelectionBackground } from '../../../../../platform/theme/common/colorRegistry.js';
 import { IUndoRedoElement, IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.js';
 import { IEditorPane, SaveReason } from '../../../../common/editor.js';
 import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.js';
@@ -42,11 +32,10 @@ import { SnapshotContext } from '../../../../services/workingCopy/common/fileWor
 import { NotebookTextDiffEditor } from '../../../notebook/browser/diff/notebookDiffEditor.js';
 import { INotebookTextDiffEditor } from '../../../notebook/browser/diff/notebookDiffEditorBrowser.js';
 import { CellDiffInfo } from '../../../notebook/browser/diff/notebookDiffViewModel.js';
-import { CellEditState, getNotebookEditorFromEditorPane } from '../../../notebook/browser/notebookBrowser.js';
-import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
+import { getNotebookEditorFromEditorPane } from '../../../notebook/browser/notebookBrowser.js';
 import { NotebookCellTextModel } from '../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
-import { CellEditType, ICell, ICellDto2, ICellEditOperation, ICellReplaceEdit, IResolvedNotebookEditorModel, NotebookCellsChangeType, NotebookCellsModelMoveEvent, NotebookCellTextModelSplice, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
+import { CellEditType, ICellDto2, ICellEditOperation, ICellReplaceEdit, IResolvedNotebookEditorModel, NotebookCellsChangeType, NotebookTextModelChangedEvent, TransientOptions } from '../../../notebook/common/notebookCommon.js';
 import { computeDiff } from '../../../notebook/common/notebookDiff.js';
 import { INotebookEditorModelResolverService } from '../../../notebook/common/notebookEditorModelResolverService.js';
 import { INotebookLoggingService } from '../../../notebook/common/notebookLoggingService.js';
@@ -55,10 +44,13 @@ import { INotebookEditorWorkerService } from '../../../notebook/common/services/
 import { ChatEditKind, IModifiedFileEntryEditorIntegration, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { IChatResponseModel } from '../../common/chatModel.js';
 import { IChatService } from '../../common/chatService.js';
-import { AbstractChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISnapshotEntry, pendingRewriteMinimap } from './chatEditingModifiedFileEntry.js';
-import { createSnapshot, deserializeSnapshot, getNotebookSnapshotFileURI, restoreSnapshot, SnapshotComparer } from './chatEditingModifiedNotebookSnapshot.js';
-import { ChatEditingNotebookDiffEditorIntegration, ChatEditingNotebookEditorIntegration, countChanges, ICellDiffInfo, sortCellChanges } from './chatEditingNotebookEditorIntegration.js';
-import { ChatEditingNotebookFileSystemProvider } from './chatEditingNotebookFileSystemProvider.js';
+import { AbstractChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISnapshotEntry } from './chatEditingModifiedFileEntry.js';
+import { createSnapshot, deserializeSnapshot, getNotebookSnapshotFileURI, restoreSnapshot, SnapshotComparer } from './notebook/chatEditingModifiedNotebookSnapshot.js';
+import { ChatEditingNotebookCellEntry } from './notebook/chatEditingNotebookCellEntry.js';
+import { ChatEditingNotebookDiffEditorIntegration, ChatEditingNotebookEditorIntegration } from './notebook/chatEditingNotebookEditorIntegration.js';
+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';
 
 
 const SnapshotLanguageId = 'VSCodeChatNotebookSnapshotLanguage';
@@ -265,11 +257,6 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		if (!e.rawEvents.length) {
 			return;
 		}
-		// This isn't great, but necessary.
-		// ipynb extension updates metadata when new cells are inserted (to ensure the metadata is correct)
-		// Details of why thats required is in ipynb extension, but its necessary.
-		// However as a result of this, those edits appear here and are assumed to be user edits.
-		// As a result `_allEditsAreFromUs` is set to false.
 		if (isTransientIPyNbExtensionEvent(this.modifiedModel.notebookType, e)) {
 			return;
 		}
@@ -507,7 +494,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			if (!isLastEdits) {
 				this._stateObs.set(WorkingSetEntryState.Modified, tx);
 				this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
-				this._rewriteRatioObs.set(Math.min(1, this.calculateRewriteRadio()), tx);
+				this._rewriteRatioObs.set(Math.min(1, calculateNotebookRewriteRatio(this._cellsDiffInfo.get(), this.originalModel, this.modifiedModel)), tx);
 
 			} else {
 				finishPreviousCells();
@@ -789,30 +776,6 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		}
 	}
 
-	calculateRewriteRadio() {
-		const totalNumberOfUpdatedLines = this._cellsDiffInfo.get().reduce((totalUpdatedLines, value) => {
-			const getUpadtedLineCount = () => {
-				if (value.type === 'unchanged') {
-					return 0;
-				}
-				if (value.type === 'delete') {
-					return this.originalModel.cells[value.originalCellIndex].textModel?.getLineCount() ?? 0;
-				}
-				if (value.type === 'insert') {
-					return this.modifiedModel.cells[value.modifiedCellIndex].textModel?.getLineCount() ?? 0;
-				}
-				return value.diff.get().changes.reduce((maxLineNumber, change) => {
-					return Math.max(maxLineNumber, change.modified.endLineNumberExclusive);
-				}, 0);
-			};
-
-			return totalUpdatedLines + getUpadtedLineCount();
-		}, 0);
-
-		const totalNumberOfLines = this.modifiedModel.cells.reduce((totalLines, cell) => totalLines + (cell.textModel?.getLineCount() ?? 0), 0);
-		return totalNumberOfLines === 0 ? 0 : Math.min(1, totalNumberOfUpdatedLines / totalNumberOfLines);
-	}
-
 	override createSnapshot(requestId: string | undefined, undoStop: string | undefined): ISnapshotEntry {
 		return {
 			resource: this.modifiedURI,
@@ -828,7 +791,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 
 	override equalsSnapshot(snapshot: ISnapshotEntry | undefined): boolean {
 		return !!snapshot &&
-			this.modifiedURI.toString() === snapshot.resource.toString() &&
+			isEqual(this.modifiedURI, snapshot.resource) &&
 			this.state.get() === snapshot.state &&
 			new SnapshotComparer(snapshot.original).isEqual(this.originalModel) &&
 			new SnapshotComparer(snapshot.current).isEqual(this.modifiedModel);
@@ -934,674 +897,3 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		return cellEntry;
 	}
 }
-
-class ChatEditingNotebookCellEntry extends ObservableDisposable {
-	private static readonly _lastEditDecorationOptions = ModelDecorationOptions.register({
-		isWholeLine: true,
-		description: 'chat-last-edit',
-		className: 'chat-editing-last-edit-line',
-		marginClassName: 'chat-editing-last-edit',
-		overviewRuler: {
-			position: OverviewRulerLane.Full,
-			color: themeColorFromId(editorSelectionBackground)
-		},
-	});
-
-	private static readonly _pendingEditDecorationOptions = ModelDecorationOptions.register({
-		isWholeLine: true,
-		description: 'chat-pending-edit',
-		className: 'chat-editing-pending-edit',
-		minimap: {
-			position: MinimapPosition.Inline,
-			color: themeColorFromId(pendingRewriteMinimap)
-		}
-	});
-
-
-	private _edit: OffsetEdit = OffsetEdit.empty;
-	private _isEditFromUs: boolean = false;
-	public get isEditFromUs(): boolean {
-		return this._isEditFromUs;
-	}
-
-	private _allEditsAreFromUs: boolean = true;
-	public get allEditsAreFromUs(): boolean {
-		return this._allEditsAreFromUs;
-	}
-	private _diffOperation: Promise<any> | undefined;
-	private _diffOperationIds: number = 0;
-
-	private readonly _diffInfo = observableValue<IDocumentDiff>(this, nullDocumentDiff);
-	public get diffInfo(): IObservable<IDocumentDiff> {
-		return this._diffInfo;
-	}
-	private readonly _maxModifiedLineNumber = observableValue<number>(this, 0);
-	readonly maxModifiedLineNumber = this._maxModifiedLineNumber;
-
-	private readonly _editDecorationClear = this._register(new RunOnceScheduler(() => { this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []); }, 500));
-	private _editDecorations: string[] = [];
-
-	private readonly _diffTrimWhitespace: IObservable<boolean>;
-	protected readonly _stateObs = observableValue<WorkingSetEntryState>(this, WorkingSetEntryState.Modified);
-	readonly state: IObservable<WorkingSetEntryState> = this._stateObs;
-	protected readonly _isCurrentlyBeingModifiedByObs = observableValue<IChatResponseModel | undefined>(this, undefined);
-	readonly isCurrentlyBeingModifiedBy: IObservable<IChatResponseModel | undefined> = this._isCurrentlyBeingModifiedByObs;
-	private readonly initialContent: string;
-
-	constructor(
-		public readonly notebookUri: URI,
-		public readonly cell: NotebookCellTextModel,
-		private readonly modifiedModel: ITextModel,
-		private readonly originalModel: ITextModel,
-		disposables: DisposableStore,
-		@IConfigurationService configService: IConfigurationService,
-		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
-		@INotebookEditorService private readonly notebookEditorService: INotebookEditorService
-	) {
-		super();
-		this.initialContent = this.originalModel.getValue();
-		this._register(disposables);
-		this._register(this.modifiedModel.onDidChangeContent(e => {
-			this._mirrorEdits(e);
-		}));
-		this._register(toDisposable(() => {
-			this.clearCurrentEditLineDecoration();
-		}));
-
-		this._diffTrimWhitespace = observableConfigValue('diffEditor.ignoreTrimWhitespace', true, configService);
-		this._register(autorun(r => {
-			this._diffTrimWhitespace.read(r);
-			this._updateDiffInfoSeq();
-		}));
-	}
-
-	public clearCurrentEditLineDecoration() {
-		if (this.modifiedModel.isDisposed()) {
-			return;
-		}
-		this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []);
-	}
-
-
-	private _mirrorEdits(event: IModelContentChangedEvent) {
-		const edit = OffsetEdits.fromContentChanges(event.changes);
-
-		if (this._isEditFromUs) {
-			const e_sum = this._edit;
-			const e_ai = edit;
-			this._edit = e_sum.compose(e_ai);
-
-		} else {
-
-			//           e_ai
-			//   d0 ---------------> s0
-			//   |                   |
-			//   |                   |
-			//   | e_user_r          | e_user
-			//   |                   |
-			//   |                   |
-			//   v       e_ai_r      v
-			///  d1 ---------------> s1
-			//
-			// d0 - document snapshot
-			// s0 - document
-			// e_ai - ai edits
-			// e_user - user edits
-			//
-			const e_ai = this._edit;
-			const e_user = edit;
-
-			const e_user_r = e_user.tryRebase(e_ai.inverse(this.originalModel.getValue()), true);
-
-			if (e_user_r === undefined) {
-				// user edits overlaps/conflicts with AI edits
-				this._edit = e_ai.compose(e_user);
-			} else {
-				const edits = OffsetEdits.asEditOperations(e_user_r, this.originalModel);
-				this.originalModel.applyEdits(edits);
-				this._edit = e_ai.tryRebase(e_user_r);
-			}
-
-			this._allEditsAreFromUs = false;
-			this._updateDiffInfoSeq();
-
-			const didResetToOriginalContent = this.modifiedModel.getValue() === this.initialContent;
-			const currentState = this._stateObs.get();
-			switch (currentState) {
-				case WorkingSetEntryState.Modified:
-					if (didResetToOriginalContent) {
-						this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
-						break;
-					}
-			}
-
-		}
-	}
-
-	acceptAgentEdits(textEdits: TextEdit[], isLastEdits: boolean, responseModel: IChatResponseModel): void {
-		const notebookEditor = this.notebookEditorService.retrieveExistingWidgetFromURI(this.notebookUri)?.value;
-		if (notebookEditor) {
-			const vm = notebookEditor.getCellByHandle(this.cell.handle);
-			vm?.updateEditState(CellEditState.Editing, 'chatEdit');
-		}
-
-		const ops = textEdits.map(TextEdit.asEditOperation);
-		const undoEdits = this._applyEdits(ops);
-
-		const maxLineNumber = undoEdits.reduce((max, op) => Math.max(max, op.range.startLineNumber), 0);
-
-		const newDecorations: IModelDeltaDecoration[] = [
-			// decorate pending edit (region)
-			{
-				options: ChatEditingNotebookCellEntry._pendingEditDecorationOptions,
-				range: new Range(maxLineNumber + 1, 1, Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER)
-			}
-		];
-
-		if (maxLineNumber > 0) {
-			// decorate last edit
-			newDecorations.push({
-				options: ChatEditingNotebookCellEntry._lastEditDecorationOptions,
-				range: new Range(maxLineNumber, 1, maxLineNumber, Number.MAX_SAFE_INTEGER)
-			});
-		}
-
-		this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, newDecorations);
-
-
-		transaction((tx) => {
-			if (!isLastEdits) {
-				this._stateObs.set(WorkingSetEntryState.Modified, tx);
-				this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
-				this._maxModifiedLineNumber.set(maxLineNumber, tx);
-
-			} else {
-				this._resetEditsState(tx);
-				this._updateDiffInfoSeq();
-				this._maxModifiedLineNumber.set(0, tx);
-				this._editDecorationClear.schedule();
-			}
-		});
-	}
-
-	scheduleEditDecorations() {
-		this._editDecorationClear.schedule();
-	}
-
-	protected _resetEditsState(tx: ITransaction): void {
-		this._isCurrentlyBeingModifiedByObs.set(undefined, tx);
-		this._maxModifiedLineNumber.set(0, tx);
-	}
-
-	public async keep(change: DetailedLineRangeMapping): Promise<boolean> {
-		return this._acceptHunk(change);
-	}
-
-	private async _acceptHunk(change: DetailedLineRangeMapping): Promise<boolean> {
-		this._isEditFromUs = true;
-		try {
-			if (!this._diffInfo.get().changes.includes(change)) {
-				// diffInfo should have model version ids and check them (instead of the caller doing that)
-				return false;
-			}
-			const edits: ISingleEditOperation[] = [];
-			for (const edit of change.innerChanges ?? []) {
-				const newText = this.modifiedModel.getValueInRange(edit.modifiedRange);
-				edits.push(EditOperation.replace(edit.originalRange, newText));
-			}
-			this.originalModel.pushEditOperations(null, edits, _ => null);
-		}
-		finally {
-			this._isEditFromUs = false;
-		}
-		await this._updateDiffInfoSeq();
-		if (this._diffInfo.get().identical) {
-			this._stateObs.set(WorkingSetEntryState.Accepted, undefined);
-		}
-		return true;
-	}
-
-	public async undo(change: DetailedLineRangeMapping): Promise<boolean> {
-		return this._rejectHunk(change);
-	}
-
-	private async _rejectHunk(change: DetailedLineRangeMapping): Promise<boolean> {
-		this._isEditFromUs = true;
-		try {
-			if (!this._diffInfo.get().changes.includes(change)) {
-				return false;
-			}
-			const edits: ISingleEditOperation[] = [];
-			for (const edit of change.innerChanges ?? []) {
-				const newText = this.originalModel.getValueInRange(edit.originalRange);
-				edits.push(EditOperation.replace(edit.modifiedRange, newText));
-			}
-			this.modifiedModel.pushEditOperations(null, edits, _ => null);
-		} finally {
-			this._isEditFromUs = false;
-		}
-		await this._updateDiffInfoSeq();
-		if (this._diffInfo.get().identical) {
-			this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
-		}
-		return true;
-	}
-
-	private _applyEdits(edits: ISingleEditOperation[]) {
-		// make the actual edit
-		this._isEditFromUs = true;
-		try {
-			let result: ISingleEditOperation[] = [];
-			this.modifiedModel.pushEditOperations(null, edits, (undoEdits) => {
-				result = undoEdits;
-				return null;
-			});
-			return result;
-		} finally {
-			this._isEditFromUs = false;
-		}
-	}
-
-	private async _updateDiffInfoSeq() {
-		const myDiffOperationId = ++this._diffOperationIds;
-		await Promise.resolve(this._diffOperation);
-		if (this._diffOperationIds === myDiffOperationId) {
-			const thisDiffOperation = this._updateDiffInfo();
-			this._diffOperation = thisDiffOperation;
-			await thisDiffOperation;
-		}
-	}
-
-	private async _updateDiffInfo(): Promise<void> {
-
-		if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed()) {
-			return;
-		}
-
-		const docVersionNow = this.modifiedModel.getVersionId();
-		const snapshotVersionNow = this.originalModel.getVersionId();
-
-		const ignoreTrimWhitespace = this._diffTrimWhitespace.get();
-
-		const diff = await this._editorWorkerService.computeDiff(
-			this.originalModel.uri,
-			this.modifiedModel.uri,
-			{ ignoreTrimWhitespace, computeMoves: false, maxComputationTimeMs: 3000 },
-			'advanced'
-		);
-
-		if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed()) {
-			return;
-		}
-
-		// only update the diff if the documents didn't change in the meantime
-		if (this.modifiedModel.getVersionId() === docVersionNow && this.originalModel.getVersionId() === snapshotVersionNow) {
-			const diff2 = diff ?? nullDocumentDiff;
-			this._diffInfo.set(diff2, undefined);
-			this._edit = OffsetEdits.fromLineRangeMapping(this.originalModel, this.modifiedModel, diff2.changes);
-		}
-	}
-}
-
-export function adjustCellDiffForKeepingADeletedCell(originalCellIndex: number,
-	cellDiffInfo: ICellDiffInfo[],
-	applyEdits: typeof NotebookTextModel.prototype.applyEdits,
-): ICellDiffInfo[] {
-	// Delete this cell from original as well.
-	const edit: ICellReplaceEdit = { cells: [], count: 1, editType: CellEditType.Replace, index: originalCellIndex, };
-	applyEdits([edit], true, undefined, () => undefined, undefined, true);
-	const diffs = sortCellChanges(cellDiffInfo)
-		.filter(d => !(d.type === 'delete' && d.originalCellIndex === originalCellIndex))
-		.map(diff => {
-			if (diff.type !== 'insert' && diff.originalCellIndex > originalCellIndex) {
-				return {
-					...diff,
-					originalCellIndex: diff.originalCellIndex - 1,
-				};
-			}
-			return diff;
-		});
-	return diffs;
-}
-
-export function adjustCellDiffForRevertingADeletedCell(originalCellIndex: number,
-	cellDiffInfo: ICellDiffInfo[],
-	cellToInsert: ICellDto2,
-	applyEdits: typeof NotebookTextModel.prototype.applyEdits,
-	createModifiedCellDiffInfo: (modifiedCellIndex: number, originalCellIndex: number) => ICellDiffInfo,
-): ICellDiffInfo[] {
-	cellDiffInfo = sortCellChanges(cellDiffInfo);
-	const indexOfEntry = cellDiffInfo.findIndex(d => d.originalCellIndex === originalCellIndex);
-	if (indexOfEntry === -1) {
-		// Not possible.
-		return cellDiffInfo;
-	}
-
-	let modifiedCellIndex = -1;
-	for (let i = 0; i < cellDiffInfo.length; i++) {
-		const diff = cellDiffInfo[i];
-		if (i < indexOfEntry) {
-			modifiedCellIndex = Math.max(modifiedCellIndex, diff.modifiedCellIndex ?? modifiedCellIndex);
-			continue;
-		}
-		if (i === indexOfEntry) {
-			const edit: ICellReplaceEdit = { cells: [cellToInsert], count: 0, editType: CellEditType.Replace, index: modifiedCellIndex + 1, };
-			applyEdits([edit], true, undefined, () => undefined, undefined, true);
-			cellDiffInfo[i] = createModifiedCellDiffInfo(modifiedCellIndex + 1, originalCellIndex);
-			continue;
-		} else {
-			// Increase the original index for all entries after this.
-			if (typeof diff.modifiedCellIndex === 'number') {
-				diff.modifiedCellIndex++;
-				cellDiffInfo[i] = { ...diff };
-			}
-		}
-	}
-
-	return cellDiffInfo;
-}
-
-export function adjustCellDiffForRevertingAnInsertedCell(modifiedCellIndex: number,
-	cellDiffInfo: ICellDiffInfo[],
-	applyEdits: typeof NotebookTextModel.prototype.applyEdits,
-): ICellDiffInfo[] {
-	if (modifiedCellIndex === -1) {
-		// Not possible.
-		return cellDiffInfo;
-	}
-	cellDiffInfo = sortCellChanges(cellDiffInfo)
-		.filter(d => !(d.type === 'insert' && d.modifiedCellIndex === modifiedCellIndex))
-		.map(d => {
-			if (d.type === 'insert' && d.modifiedCellIndex === modifiedCellIndex) {
-				return d;
-			}
-			if (d.type !== 'delete' && d.modifiedCellIndex > modifiedCellIndex) {
-				return {
-					...d,
-					modifiedCellIndex: d.modifiedCellIndex - 1,
-				};
-			}
-			return d;
-		});
-	const edit: ICellReplaceEdit = { cells: [], count: 1, editType: CellEditType.Replace, index: modifiedCellIndex, };
-	applyEdits([edit], true, undefined, () => undefined, undefined, true);
-	return cellDiffInfo;
-}
-
-export function adjustCellDiffForKeepingAnInsertedCell(modifiedCellIndex: number,
-	cellDiffInfo: ICellDiffInfo[],
-	cellToInsert: ICellDto2,
-	applyEdits: typeof NotebookTextModel.prototype.applyEdits,
-	createModifiedCellDiffInfo: (modifiedCellIndex: number, originalCellIndex: number) => ICellDiffInfo,
-): ICellDiffInfo[] {
-	cellDiffInfo = sortCellChanges(cellDiffInfo);
-	if (modifiedCellIndex === -1) {
-		// Not possible.
-		return cellDiffInfo;
-	}
-	const indexOfEntry = cellDiffInfo.findIndex(d => d.modifiedCellIndex === modifiedCellIndex);
-	if (indexOfEntry === -1) {
-		// Not possible.
-		return cellDiffInfo;
-	}
-	let originalCellIndex = -1;
-	for (let i = 0; i < cellDiffInfo.length; i++) {
-		const diff = cellDiffInfo[i];
-		if (i < indexOfEntry) {
-			originalCellIndex = Math.max(originalCellIndex, diff.originalCellIndex ?? originalCellIndex);
-			continue;
-		}
-		if (i === indexOfEntry) {
-			const edit: ICellReplaceEdit = { cells: [cellToInsert], count: 0, editType: CellEditType.Replace, index: originalCellIndex + 1 };
-			applyEdits([edit], true, undefined, () => undefined, undefined, true);
-			cellDiffInfo[i] = createModifiedCellDiffInfo(modifiedCellIndex, originalCellIndex + 1);
-			continue;
-		} else {
-			// Increase the original index for all entries after this.
-			if (typeof diff.originalCellIndex === 'number') {
-				diff.originalCellIndex++;
-				cellDiffInfo[i] = { ...diff };
-			}
-		}
-	}
-	return cellDiffInfo;
-}
-
-export function adjustCellDiffAndOriginalModelBasedOnCellAddDelete(change: NotebookCellTextModelSplice<ICell>,
-	cellDiffInfo: ICellDiffInfo[],
-	modifiedModelCellCount: number,
-	originalModelCellCount: number,
-	applyEdits: typeof NotebookTextModel.prototype.applyEdits,
-	createModifiedCellDiffInfo: (modifiedCellIndex: number, originalCellIndex: number) => ICellDiffInfo,
-): ICellDiffInfo[] {
-	cellDiffInfo = sortCellChanges(cellDiffInfo);
-	const numberOfCellsInserted = change[2].length;
-	const numberOfCellsDeleted = change[1];
-	const cells = change[2].map(cell => {
-		return {
-			cellKind: cell.cellKind,
-			language: cell.language,
-			metadata: cell.metadata,
-			outputs: cell.outputs,
-			source: cell.getValue(),
-			mime: undefined,
-			internalMetadata: cell.internalMetadata
-		} satisfies ICellDto2;
-	});
-	const wasInsertedAsFirstCell = change[0] === 0;
-	const wasInsertedAsLastCell = change[0] === modifiedModelCellCount - 1;
-	const diffEntryIndex = wasInsertedAsFirstCell ? 0 : (wasInsertedAsLastCell ? cellDiffInfo.length - 1 : (cellDiffInfo.findIndex(d => d.modifiedCellIndex === change[0])));
-	const indexToInsertInOriginalModel = (wasInsertedAsFirstCell || diffEntryIndex === -1) ? 0 : (wasInsertedAsLastCell ? originalModelCellCount : (((cellDiffInfo.slice(0, diffEntryIndex).reverse().find(c => typeof c.originalCellIndex === 'number')?.originalCellIndex ?? -1) + 1)));
-	if (cells.length) {
-		const edit: ICellEditOperation = {
-			editType: CellEditType.Replace,
-			cells,
-			index: indexToInsertInOriginalModel,
-			count: change[1]
-		};
-		applyEdits([edit], true, undefined, () => undefined, undefined, true);
-	}
-	// If cells were deleted we handled that with this.disposeDeletedCellEntries();
-	if (numberOfCellsDeleted) {
-		// Adjust the indexes.
-		let numberOfOriginalCellsRemovedSoFar = 0;
-		let numberOfModifiedCellsRemovedSoFar = 0;
-		const modifiedIndexesToRemove = new Set<number>();
-		for (let i = 0; i < numberOfCellsDeleted; i++) {
-			modifiedIndexesToRemove.add(change[0] + i);
-		}
-		const itemsToRemove = new Set<ICellDiffInfo>();
-		for (let i = 0; i < cellDiffInfo.length; i++) {
-			const diff = cellDiffInfo[i];
-			if (i < diffEntryIndex) {
-				continue;
-			}
-
-			let changed = false;
-			if (typeof diff.modifiedCellIndex === 'number' && modifiedIndexesToRemove.has(diff.modifiedCellIndex)) {
-				// This will be removed.
-				numberOfModifiedCellsRemovedSoFar++;
-				if (typeof diff.originalCellIndex === 'number') {
-					numberOfOriginalCellsRemovedSoFar++;
-				}
-				itemsToRemove.add(diff);
-				continue;
-			}
-			if (typeof diff.modifiedCellIndex === 'number' && numberOfModifiedCellsRemovedSoFar) {
-				diff.modifiedCellIndex -= numberOfModifiedCellsRemovedSoFar;
-				changed = true;
-			}
-			if (typeof diff.originalCellIndex === 'number' && numberOfOriginalCellsRemovedSoFar) {
-				diff.originalCellIndex -= numberOfOriginalCellsRemovedSoFar;
-				changed = true;
-			}
-			if (changed) {
-				cellDiffInfo[i] = { ...diff };
-			}
-		}
-		if (itemsToRemove.size) {
-			Array.from(itemsToRemove)
-				.filter(diff => typeof diff.originalCellIndex === 'number')
-				.forEach(diff => {
-					const edit: ICellEditOperation = {
-						editType: CellEditType.Replace,
-						cells: [],
-						index: diff.originalCellIndex,
-						count: 1
-					};
-					applyEdits([edit], true, undefined, () => undefined, undefined, true);
-				});
-		}
-		cellDiffInfo = cellDiffInfo.filter(d => !itemsToRemove.has(d));
-	}
-
-	if (numberOfCellsInserted) {
-		for (let i = 0; i < cellDiffInfo.length; i++) {
-			const diff = cellDiffInfo[i];
-			if (i < diffEntryIndex) {
-				continue;
-			}
-			let changed = false;
-			if (typeof diff.modifiedCellIndex === 'number') {
-				diff.modifiedCellIndex += numberOfCellsInserted;
-				changed = true;
-			}
-			if (typeof diff.originalCellIndex === 'number') {
-				diff.originalCellIndex += numberOfCellsInserted;
-				changed = true;
-			}
-			if (changed) {
-				cellDiffInfo[i] = { ...diff };
-			}
-		}
-	}
-
-	// For inserted cells, we need to ensure that we create a corresponding CellEntry.
-	// So that any edits to the inserted cell is handled and mirrored over to the corresponding cell in original model.
-	cells.forEach((_, i) => {
-		const originalCellIndex = i + indexToInsertInOriginalModel;
-		const modifiedCellIndex = change[0] + i;
-		const unchangedCell = createModifiedCellDiffInfo(modifiedCellIndex, originalCellIndex);
-		cellDiffInfo.splice((diffEntryIndex === -1 ? 0 : diffEntryIndex) + i, 0, unchangedCell);
-	});
-	return cellDiffInfo;
-}
-
-/**
- * Given the movements of cells in modified notebook, adjust the ICellDiffInfo[] array
- * and generate edits for the old notebook (if required).
- * TODO@DonJayamanne Handle bulk moves (movements of more than 1 cell).
- */
-export function adjustCellDiffAndOriginalModelBasedOnCellMovements(event: NotebookCellsModelMoveEvent<ICell>, cellDiffInfo: ICellDiffInfo[]): [ICellDiffInfo[], ICellEditOperation[]] | undefined {
-	const minimumIndex = Math.min(event.index, event.newIdx);
-	const maximumIndex = Math.max(event.index, event.newIdx);
-	const cellDiffs = cellDiffInfo.slice();
-	const indexOfEntry = cellDiffs.findIndex(d => d.modifiedCellIndex === event.index);
-	const indexOfEntryToPlaceBelow = cellDiffs.findIndex(d => d.modifiedCellIndex === event.newIdx);
-	if (indexOfEntry === -1 || indexOfEntryToPlaceBelow === -1) {
-		return undefined;
-	}
-	// Create a new object so that the observable value is triggered.
-	// Besides we'll be updating the values of this object in place.
-	const entryToBeMoved = { ...cellDiffs[indexOfEntry] };
-	const moveDirection = event.newIdx > event.index ? 'down' : 'up';
-
-
-	const startIndex = cellDiffs.findIndex(d => d.modifiedCellIndex === minimumIndex);
-	const endIndex = cellDiffs.findIndex(d => d.modifiedCellIndex === maximumIndex);
-	const movingExistingCell = typeof entryToBeMoved.originalCellIndex === 'number';
-	let originalCellsWereEffected = false;
-	for (let i = 0; i < cellDiffs.length; i++) {
-		const diff = cellDiffs[i];
-		let changed = false;
-		if (moveDirection === 'down') {
-			if (i > startIndex && i <= endIndex) {
-				if (typeof diff.modifiedCellIndex === 'number') {
-					changed = true;
-					diff.modifiedCellIndex = diff.modifiedCellIndex - 1;
-				}
-				if (typeof diff.originalCellIndex === 'number' && movingExistingCell) {
-					diff.originalCellIndex = diff.originalCellIndex - 1;
-					originalCellsWereEffected = true;
-					changed = true;
-				}
-			}
-		} else {
-			if (i >= startIndex && i < endIndex) {
-				if (typeof diff.modifiedCellIndex === 'number') {
-					changed = true;
-					diff.modifiedCellIndex = diff.modifiedCellIndex + 1;
-				}
-				if (typeof diff.originalCellIndex === 'number' && movingExistingCell) {
-					diff.originalCellIndex = diff.originalCellIndex + 1;
-					originalCellsWereEffected = true;
-					changed = true;
-				}
-			}
-		}
-		// Create a new object so that the observable value is triggered.
-		// Do only if there's a change.
-		if (changed) {
-			cellDiffs[i] = { ...diff };
-		}
-	}
-	entryToBeMoved.modifiedCellIndex = event.newIdx;
-	const originalCellIndex = entryToBeMoved.originalCellIndex;
-	if (moveDirection === 'down') {
-		cellDiffs.splice(endIndex + 1, 0, entryToBeMoved);
-		cellDiffs.splice(startIndex, 1);
-		// If we're moving a new cell up/down, then we need just adjust just the modified indexes of the cells in between.
-		// If we're moving an existing up/down, then we need to adjust the original indexes as well.
-		if (typeof entryToBeMoved.originalCellIndex === 'number') {
-			entryToBeMoved.originalCellIndex = cellDiffs.slice(0, endIndex).reduce((lastOriginalIndex, diff) => typeof diff.originalCellIndex === 'number' ? Math.max(lastOriginalIndex, diff.originalCellIndex) : lastOriginalIndex, -1) + 1;
-		}
-	} else {
-		cellDiffs.splice(endIndex, 1);
-		cellDiffs.splice(startIndex, 0, entryToBeMoved);
-		// If we're moving a new cell up/down, then we need just adjust just the modified indexes of the cells in between.
-		// If we're moving an existing up/down, then we need to adjust the original indexes as well.
-		if (typeof entryToBeMoved.originalCellIndex === 'number') {
-			entryToBeMoved.originalCellIndex = cellDiffs.slice(0, startIndex).reduce((lastOriginalIndex, diff) => typeof diff.originalCellIndex === 'number' ? Math.max(lastOriginalIndex, diff.originalCellIndex) : lastOriginalIndex, -1) + 1;
-		}
-	}
-
-	// If this is a new cell that we're moving, and there are no existing cells in between, then we can just move the new cell.
-	// I.e. no need to update the original notebook model.
-	if (typeof entryToBeMoved.originalCellIndex === 'number' && originalCellsWereEffected && typeof originalCellIndex === 'number' && entryToBeMoved.originalCellIndex !== originalCellIndex) {
-		const edit: ICellEditOperation = {
-			editType: CellEditType.Move,
-			index: originalCellIndex,
-			length: event.length,
-			newIdx: entryToBeMoved.originalCellIndex
-		};
-
-		return [cellDiffs, [edit]];
-	}
-
-	return [cellDiffs, []];
-}
-
-function getCorrespondingOriginalCellIndex(modifiedCellIndex: number, cellDiffInfo: ICellDiffInfo[]): number | undefined {
-	const entry = cellDiffInfo.find(d => d.modifiedCellIndex === modifiedCellIndex);
-	return entry?.originalCellIndex;
-}
-
-function isTransientIPyNbExtensionEvent(notebookKind: string, e: NotebookTextModelChangedEvent) {
-	if (notebookKind !== 'jupyter-notebook') {
-		return false;
-	}
-	if (e.rawEvents.every(event => {
-		if (event.kind !== NotebookCellsChangeType.ChangeCellMetadata) {
-			return false;
-		}
-		if (JSON.stringify(event.metadata || {}) === JSON.stringify({ execution_count: null, metadata: {} })) {
-			return true;
-		}
-		return true;
-
-	})) {
-		return true;
-	}
-
-	return false;
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 3fdd1e54203c..7c862c98e143 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -51,7 +51,7 @@ import { ChatEditingTextModelContentProvider } from './chatEditingTextModelConte
 import { CellUri, ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
 import { ChatEditingModifiedNotebookEntry } from './chatEditingModifiedNotebookEntry.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { ChatEditingModifiedNotebookDiff } from './chatEditingModifiedNotebookDiff.js';
+import { ChatEditingModifiedNotebookDiff } from './notebook/chatEditingModifiedNotebookDiff.js';
 
 const STORAGE_CONTENTS_FOLDER = 'contents';
 const STORAGE_STATE_FILE = 'state.json';
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookDiff.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingModifiedNotebookDiff.ts
similarity index 76%
rename from src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookDiff.ts
rename to src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingModifiedNotebookDiff.ts
index c55960ee1f03..5521a1533185 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookDiff.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingModifiedNotebookDiff.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DisposableStore } from '../../../../../base/common/lifecycle.js';
-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 } from '../../common/chatEditingService.js';
-import { ISnapshotEntry } from './chatEditingModifiedFileEntry.js';
+import { DisposableStore } from '../../../../../../base/common/lifecycle.js';
+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 } from '../../../common/chatEditingService.js';
+import { ISnapshotEntry } from '../chatEditingModifiedFileEntry.js';
 
 export class ChatEditingModifiedNotebookDiff {
 	static NewModelCounter: number = 0;
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookSnapshot.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingModifiedNotebookSnapshot.ts
similarity index 92%
rename from src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookSnapshot.ts
rename to src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingModifiedNotebookSnapshot.ts
index b9c467af7023..5066d63b7c18 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookSnapshot.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingModifiedNotebookSnapshot.ts
@@ -3,14 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { decodeBase64, encodeBase64, VSBuffer } from '../../../../../base/common/buffer.js';
-import { filter } from '../../../../../base/common/objects.js';
-import { URI } 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';
-import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
-import { CellEditType, ICellDto2, ICellEditOperation, IOutputItemDto, NotebookData, NotebookSetting, TransientOptions } from '../../../notebook/common/notebookCommon.js';
+import { decodeBase64, encodeBase64, VSBuffer } from '../../../../../../base/common/buffer.js';
+import { filter } from '../../../../../../base/common/objects.js';
+import { URI } 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';
+import { NotebookTextModel } from '../../../../notebook/common/model/notebookTextModel.js';
+import { CellEditType, ICellDto2, ICellEditOperation, IOutputItemDto, NotebookData, NotebookSetting, TransientOptions } from '../../../../notebook/common/notebookCommon.js';
 
 const BufferMarker = 'ArrayBuffer-4f56482b-5a03-49ba-8356-210d3b0c1c3d';
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookCellEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookCellEntry.ts
new file mode 100644
index 000000000000..9418dc7c6bd0
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookCellEntry.ts
@@ -0,0 +1,345 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { RunOnceScheduler } from '../../../../../../base/common/async.js';
+import { DisposableStore, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { ITransaction, IObservable, observableValue, autorun, transaction } from '../../../../../../base/common/observable.js';
+import { ObservableDisposable } from '../../../../../../base/common/observableDisposable.js';
+import { themeColorFromId } from '../../../../../../base/common/themables.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { EditOperation, ISingleEditOperation } from '../../../../../../editor/common/core/editOperation.js';
+import { OffsetEdit } from '../../../../../../editor/common/core/offsetEdit.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { IDocumentDiff, nullDocumentDiff } from '../../../../../../editor/common/diff/documentDiffProvider.js';
+import { DetailedLineRangeMapping } from '../../../../../../editor/common/diff/rangeMapping.js';
+import { TextEdit } from '../../../../../../editor/common/languages.js';
+import { IModelDeltaDecoration, ITextModel, MinimapPosition, OverviewRulerLane } from '../../../../../../editor/common/model.js';
+import { ModelDecorationOptions } from '../../../../../../editor/common/model/textModel.js';
+import { OffsetEdits } from '../../../../../../editor/common/model/textModelOffsetEdit.js';
+import { IEditorWorkerService } from '../../../../../../editor/common/services/editorWorker.js';
+import { IModelContentChangedEvent } from '../../../../../../editor/common/textModelEvents.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { observableConfigValue } from '../../../../../../platform/observable/common/platformObservableUtils.js';
+import { editorSelectionBackground } from '../../../../../../platform/theme/common/colorRegistry.js';
+import { CellEditState } from '../../../../notebook/browser/notebookBrowser.js';
+import { INotebookEditorService } from '../../../../notebook/browser/services/notebookEditorService.js';
+import { NotebookCellTextModel } from '../../../../notebook/common/model/notebookCellTextModel.js';
+import { WorkingSetEntryState } from '../../../common/chatEditingService.js';
+import { IChatResponseModel } from '../../../common/chatModel.js';
+import { pendingRewriteMinimap } from '../chatEditingModifiedFileEntry.js';
+
+
+/**
+ * This is very closely similar to the ChatEditingModifiedDocumentEntry class.
+ * Most of the code has been borrowed from there, as a cell is effectively a document.
+ * Hence most of the same functionality applies.
+ */
+export class ChatEditingNotebookCellEntry extends ObservableDisposable {
+	private static readonly _lastEditDecorationOptions = ModelDecorationOptions.register({
+		isWholeLine: true,
+		description: 'chat-last-edit',
+		className: 'chat-editing-last-edit-line',
+		marginClassName: 'chat-editing-last-edit',
+		overviewRuler: {
+			position: OverviewRulerLane.Full,
+			color: themeColorFromId(editorSelectionBackground)
+		},
+	});
+
+	private static readonly _pendingEditDecorationOptions = ModelDecorationOptions.register({
+		isWholeLine: true,
+		description: 'chat-pending-edit',
+		className: 'chat-editing-pending-edit',
+		minimap: {
+			position: MinimapPosition.Inline,
+			color: themeColorFromId(pendingRewriteMinimap)
+		}
+	});
+
+
+	private _edit: OffsetEdit = OffsetEdit.empty;
+	private _isEditFromUs: boolean = false;
+	public get isEditFromUs(): boolean {
+		return this._isEditFromUs;
+	}
+
+	private _allEditsAreFromUs: boolean = true;
+	public get allEditsAreFromUs(): boolean {
+		return this._allEditsAreFromUs;
+	}
+	private _diffOperation: Promise<any> | undefined;
+	private _diffOperationIds: number = 0;
+
+	private readonly _diffInfo = observableValue<IDocumentDiff>(this, nullDocumentDiff);
+	public get diffInfo(): IObservable<IDocumentDiff> {
+		return this._diffInfo;
+	}
+	private readonly _maxModifiedLineNumber = observableValue<number>(this, 0);
+	readonly maxModifiedLineNumber = this._maxModifiedLineNumber;
+
+	private readonly _editDecorationClear = this._register(new RunOnceScheduler(() => { this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []); }, 500));
+	private _editDecorations: string[] = [];
+
+	private readonly _diffTrimWhitespace: IObservable<boolean>;
+	protected readonly _stateObs = observableValue<WorkingSetEntryState>(this, WorkingSetEntryState.Modified);
+	readonly state: IObservable<WorkingSetEntryState> = this._stateObs;
+	protected readonly _isCurrentlyBeingModifiedByObs = observableValue<IChatResponseModel | undefined>(this, undefined);
+	readonly isCurrentlyBeingModifiedBy: IObservable<IChatResponseModel | undefined> = this._isCurrentlyBeingModifiedByObs;
+	private readonly initialContent: string;
+
+	constructor(
+		public readonly notebookUri: URI,
+		public readonly cell: NotebookCellTextModel,
+		private readonly modifiedModel: ITextModel,
+		private readonly originalModel: ITextModel,
+		disposables: DisposableStore,
+		@IConfigurationService configService: IConfigurationService,
+		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
+		@INotebookEditorService private readonly notebookEditorService: INotebookEditorService
+	) {
+		super();
+		this.initialContent = this.originalModel.getValue();
+		this._register(disposables);
+		this._register(this.modifiedModel.onDidChangeContent(e => {
+			this._mirrorEdits(e);
+		}));
+		this._register(toDisposable(() => {
+			this.clearCurrentEditLineDecoration();
+		}));
+
+		this._diffTrimWhitespace = observableConfigValue('diffEditor.ignoreTrimWhitespace', true, configService);
+		this._register(autorun(r => {
+			this._diffTrimWhitespace.read(r);
+			this._updateDiffInfoSeq();
+		}));
+	}
+
+	public clearCurrentEditLineDecoration() {
+		if (this.modifiedModel.isDisposed()) {
+			return;
+		}
+		this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, []);
+	}
+
+
+	private _mirrorEdits(event: IModelContentChangedEvent) {
+		const edit = OffsetEdits.fromContentChanges(event.changes);
+
+		if (this._isEditFromUs) {
+			const e_sum = this._edit;
+			const e_ai = edit;
+			this._edit = e_sum.compose(e_ai);
+
+		} else {
+
+			//           e_ai
+			//   d0 ---------------> s0
+			//   |                   |
+			//   |                   |
+			//   | e_user_r          | e_user
+			//   |                   |
+			//   |                   |
+			//   v       e_ai_r      v
+			///  d1 ---------------> s1
+			//
+			// d0 - document snapshot
+			// s0 - document
+			// e_ai - ai edits
+			// e_user - user edits
+			//
+			const e_ai = this._edit;
+			const e_user = edit;
+
+			const e_user_r = e_user.tryRebase(e_ai.inverse(this.originalModel.getValue()), true);
+
+			if (e_user_r === undefined) {
+				// user edits overlaps/conflicts with AI edits
+				this._edit = e_ai.compose(e_user);
+			} else {
+				const edits = OffsetEdits.asEditOperations(e_user_r, this.originalModel);
+				this.originalModel.applyEdits(edits);
+				this._edit = e_ai.tryRebase(e_user_r);
+			}
+
+			this._allEditsAreFromUs = false;
+			this._updateDiffInfoSeq();
+
+			const didResetToOriginalContent = this.modifiedModel.getValue() === this.initialContent;
+			const currentState = this._stateObs.get();
+			switch (currentState) {
+				case WorkingSetEntryState.Modified:
+					if (didResetToOriginalContent) {
+						this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
+						break;
+					}
+			}
+
+		}
+	}
+
+	acceptAgentEdits(textEdits: TextEdit[], isLastEdits: boolean, responseModel: IChatResponseModel): void {
+		const notebookEditor = this.notebookEditorService.retrieveExistingWidgetFromURI(this.notebookUri)?.value;
+		if (notebookEditor) {
+			const vm = notebookEditor.getCellByHandle(this.cell.handle);
+			vm?.updateEditState(CellEditState.Editing, 'chatEdit');
+		}
+
+		const ops = textEdits.map(TextEdit.asEditOperation);
+		const undoEdits = this._applyEdits(ops);
+
+		const maxLineNumber = undoEdits.reduce((max, op) => Math.max(max, op.range.startLineNumber), 0);
+
+		const newDecorations: IModelDeltaDecoration[] = [
+			// decorate pending edit (region)
+			{
+				options: ChatEditingNotebookCellEntry._pendingEditDecorationOptions,
+				range: new Range(maxLineNumber + 1, 1, Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER)
+			}
+		];
+
+		if (maxLineNumber > 0) {
+			// decorate last edit
+			newDecorations.push({
+				options: ChatEditingNotebookCellEntry._lastEditDecorationOptions,
+				range: new Range(maxLineNumber, 1, maxLineNumber, Number.MAX_SAFE_INTEGER)
+			});
+		}
+
+		this._editDecorations = this.modifiedModel.deltaDecorations(this._editDecorations, newDecorations);
+
+
+		transaction((tx) => {
+			if (!isLastEdits) {
+				this._stateObs.set(WorkingSetEntryState.Modified, tx);
+				this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
+				this._maxModifiedLineNumber.set(maxLineNumber, tx);
+
+			} else {
+				this._resetEditsState(tx);
+				this._updateDiffInfoSeq();
+				this._maxModifiedLineNumber.set(0, tx);
+				this._editDecorationClear.schedule();
+			}
+		});
+	}
+
+	scheduleEditDecorations() {
+		this._editDecorationClear.schedule();
+	}
+
+	protected _resetEditsState(tx: ITransaction): void {
+		this._isCurrentlyBeingModifiedByObs.set(undefined, tx);
+		this._maxModifiedLineNumber.set(0, tx);
+	}
+
+	public async keep(change: DetailedLineRangeMapping): Promise<boolean> {
+		return this._acceptHunk(change);
+	}
+
+	private async _acceptHunk(change: DetailedLineRangeMapping): Promise<boolean> {
+		this._isEditFromUs = true;
+		try {
+			if (!this._diffInfo.get().changes.includes(change)) {
+				// diffInfo should have model version ids and check them (instead of the caller doing that)
+				return false;
+			}
+			const edits: ISingleEditOperation[] = [];
+			for (const edit of change.innerChanges ?? []) {
+				const newText = this.modifiedModel.getValueInRange(edit.modifiedRange);
+				edits.push(EditOperation.replace(edit.originalRange, newText));
+			}
+			this.originalModel.pushEditOperations(null, edits, _ => null);
+		}
+		finally {
+			this._isEditFromUs = false;
+		}
+		await this._updateDiffInfoSeq();
+		if (this._diffInfo.get().identical) {
+			this._stateObs.set(WorkingSetEntryState.Accepted, undefined);
+		}
+		return true;
+	}
+
+	public async undo(change: DetailedLineRangeMapping): Promise<boolean> {
+		return this._rejectHunk(change);
+	}
+
+	private async _rejectHunk(change: DetailedLineRangeMapping): Promise<boolean> {
+		this._isEditFromUs = true;
+		try {
+			if (!this._diffInfo.get().changes.includes(change)) {
+				return false;
+			}
+			const edits: ISingleEditOperation[] = [];
+			for (const edit of change.innerChanges ?? []) {
+				const newText = this.originalModel.getValueInRange(edit.originalRange);
+				edits.push(EditOperation.replace(edit.modifiedRange, newText));
+			}
+			this.modifiedModel.pushEditOperations(null, edits, _ => null);
+		} finally {
+			this._isEditFromUs = false;
+		}
+		await this._updateDiffInfoSeq();
+		if (this._diffInfo.get().identical) {
+			this._stateObs.set(WorkingSetEntryState.Rejected, undefined);
+		}
+		return true;
+	}
+
+	private _applyEdits(edits: ISingleEditOperation[]) {
+		// make the actual edit
+		this._isEditFromUs = true;
+		try {
+			let result: ISingleEditOperation[] = [];
+			this.modifiedModel.pushEditOperations(null, edits, (undoEdits) => {
+				result = undoEdits;
+				return null;
+			});
+			return result;
+		} finally {
+			this._isEditFromUs = false;
+		}
+	}
+
+	private async _updateDiffInfoSeq() {
+		const myDiffOperationId = ++this._diffOperationIds;
+		await Promise.resolve(this._diffOperation);
+		if (this._diffOperationIds === myDiffOperationId) {
+			const thisDiffOperation = this._updateDiffInfo();
+			this._diffOperation = thisDiffOperation;
+			await thisDiffOperation;
+		}
+	}
+
+	private async _updateDiffInfo(): Promise<void> {
+
+		if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed()) {
+			return;
+		}
+
+		const docVersionNow = this.modifiedModel.getVersionId();
+		const snapshotVersionNow = this.originalModel.getVersionId();
+
+		const ignoreTrimWhitespace = this._diffTrimWhitespace.get();
+
+		const diff = await this._editorWorkerService.computeDiff(
+			this.originalModel.uri,
+			this.modifiedModel.uri,
+			{ ignoreTrimWhitespace, computeMoves: false, maxComputationTimeMs: 3000 },
+			'advanced'
+		);
+
+		if (this.originalModel.isDisposed() || this.modifiedModel.isDisposed()) {
+			return;
+		}
+
+		// only update the diff if the documents didn't change in the meantime
+		if (this.modifiedModel.getVersionId() === docVersionNow && this.originalModel.getVersionId() === snapshotVersionNow) {
+			const diff2 = diff ?? nullDocumentDiff;
+			this._diffInfo.set(diff2, undefined);
+			this._edit = OffsetEdits.fromLineRangeMapping(this.originalModel, this.modifiedModel, diff2.changes);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
similarity index 78%
rename from src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
rename to src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
index db4aab5a2b4a..ebb8ccbf4b48 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
@@ -3,73 +3,27 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { autorun, derivedWithStore, IObservable, ISettableObservable, observableFromEvent, ObservablePromise, observableValue } from '../../../../../base/common/observable.js';
-import { debouncedObservable } from '../../../../../base/common/observableInternal/utils.js';
-import { basename } from '../../../../../base/common/resources.js';
-import { IDocumentDiff, nullDocumentDiff } from '../../../../../editor/common/diff/documentDiffProvider.js';
-import { DetailedLineRangeMapping } from '../../../../../editor/common/diff/rangeMapping.js';
-import { ITextModel } from '../../../../../editor/common/model.js';
-import { localize } from '../../../../../nls.js';
-import { MenuId } from '../../../../../platform/actions/common/actions.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IResourceDiffEditorInput } from '../../../../common/editor.js';
-import { IEditorService } from '../../../../services/editor/common/editorService.js';
-import { NotebookDeletedCellDecorator } from '../../../notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.js';
-import { NotebookInsertedCellDecorator } from '../../../notebook/browser/diff/inlineDiff/notebookInsertedCellDecorator.js';
-import { NotebookModifiedCellDecorator } from '../../../notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.js';
-import { INotebookTextDiffEditor } from '../../../notebook/browser/diff/notebookDiffEditorBrowser.js';
-import { INotebookEditor } from '../../../notebook/browser/notebookBrowser.js';
-import { NotebookCellTextModel } from '../../../notebook/common/model/notebookCellTextModel.js';
-import { NotebookTextModel } from '../../../notebook/common/model/notebookTextModel.js';
-import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
-import { IModifiedFileEntry, IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from '../../common/chatEditingService.js';
-import { ChatEditingCodeEditorIntegration, IDocumentDiff2 } from './chatEditingCodeEditorIntegration.js';
-
-interface IDocumentDiffWithModelsAndActions {
-	/**
-	 * The changes between the original and modified document.
-	 */
-	diff: ISettableObservable<IDocumentDiff>;
-	/**
-	 * The original model.
-	 * Cell text models load asynchronously, so this is an observable promise.
-	 */
-	originalModel: ObservablePromise<ITextModel>;
-	/**
-	 * The modified model.
-	 * Cell text models load asynchronously, so this is an observable promise.
-	 */
-	modifiedModel: ObservablePromise<ITextModel>;
-	keep(changes: DetailedLineRangeMapping): Promise<boolean>;
-	undo(changes: DetailedLineRangeMapping): Promise<boolean>;
-}
-
-/**
- * All entries will contain a IDocumentDiff
- * Even when there are no changes, diff will contain the number of lines in the document.
- * This way we can always calculate the total number of lines in the document.
- */
-export type ICellDiffInfo = {
-	originalCellIndex: number;
-	modifiedCellIndex: number;
-	type: 'unchanged';
-} & IDocumentDiffWithModelsAndActions | {
-	originalCellIndex: number;
-	modifiedCellIndex: number;
-	type: 'modified';
-} & IDocumentDiffWithModelsAndActions |
-	{
-		modifiedCellIndex: undefined;
-		originalCellIndex: number;
-		type: 'delete';
-	} & IDocumentDiffWithModelsAndActions |
-	{
-		modifiedCellIndex: number;
-		originalCellIndex: undefined;
-		type: 'insert';
-	} & IDocumentDiffWithModelsAndActions;
-
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { autorun, derivedWithStore, IObservable, ISettableObservable, observableFromEvent, observableValue } from '../../../../../../base/common/observable.js';
+import { debouncedObservable } from '../../../../../../base/common/observableInternal/utils.js';
+import { basename } from '../../../../../../base/common/resources.js';
+import { nullDocumentDiff } from '../../../../../../editor/common/diff/documentDiffProvider.js';
+import { localize } from '../../../../../../nls.js';
+import { MenuId } from '../../../../../../platform/actions/common/actions.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IResourceDiffEditorInput } from '../../../../../common/editor.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { NotebookDeletedCellDecorator } from '../../../../notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.js';
+import { NotebookInsertedCellDecorator } from '../../../../notebook/browser/diff/inlineDiff/notebookInsertedCellDecorator.js';
+import { NotebookModifiedCellDecorator } from '../../../../notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.js';
+import { INotebookTextDiffEditor } from '../../../../notebook/browser/diff/notebookDiffEditorBrowser.js';
+import { INotebookEditor } from '../../../../notebook/browser/notebookBrowser.js';
+import { NotebookCellTextModel } from '../../../../notebook/common/model/notebookCellTextModel.js';
+import { NotebookTextModel } from '../../../../notebook/common/model/notebookTextModel.js';
+import { ChatAgentLocation, IChatAgentService } from '../../../common/chatAgents.js';
+import { IModifiedFileEntry, IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from '../../../common/chatEditingService.js';
+import { ChatEditingCodeEditorIntegration, IDocumentDiff2 } from '../chatEditingCodeEditorIntegration.js';
+import { countChanges, ICellDiffInfo, sortCellChanges } from './notebookCellChanges.js';
 
 export class ChatEditingNotebookEditorIntegration extends Disposable implements IModifiedFileEntryEditorIntegration {
 	private readonly _currentIndex = observableValue(this, -1);
@@ -503,6 +457,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 
 	}
 }
+
 export class ChatEditingNotebookDiffEditorIntegration extends Disposable implements IModifiedFileEntryEditorIntegration {
 	private readonly _currentIndex = observableValue(this, -1);
 	readonly currentIndex: IObservable<number> = this._currentIndex;
@@ -573,63 +528,3 @@ export class ChatEditingNotebookDiffEditorIntegration extends Disposable impleme
 		//
 	}
 }
-
-export function countChanges(changes: ICellDiffInfo[]): number {
-	return changes.reduce((count, change) => {
-		const diff = change.diff.get();
-		// When we accept some of the cell insert/delete the items might still be in the list.
-		if (diff.identical) {
-			return count;
-		}
-		switch (change.type) {
-			case 'delete':
-				return count + 1; // We want to see 1 deleted entry in the pill for navigation
-			case 'insert':
-				return count + 1; // We want to see 1 new entry in the pill for navigation
-			case 'modified':
-				return count + diff.changes.length;
-			default:
-				return count;
-		}
-	}, 0);
-
-}
-
-export function sortCellChanges(changes: ICellDiffInfo[]): ICellDiffInfo[] {
-	return [...changes].sort((a, b) => {
-		// For unchanged and modified, use modifiedCellIndex
-		if ((a.type === 'unchanged' || a.type === 'modified') &&
-			(b.type === 'unchanged' || b.type === 'modified')) {
-			return a.modifiedCellIndex - b.modifiedCellIndex;
-		}
-
-		// For delete entries, use originalCellIndex
-		if (a.type === 'delete' && b.type === 'delete') {
-			return a.originalCellIndex - b.originalCellIndex;
-		}
-
-		// For insert entries, use modifiedCellIndex
-		if (a.type === 'insert' && b.type === 'insert') {
-			return a.modifiedCellIndex - b.modifiedCellIndex;
-		}
-
-		if (a.type === 'delete' && b.type === 'insert') {
-			return -1;
-		}
-		if (a.type === 'insert' && b.type === 'delete') {
-			return 1;
-		}
-
-		if ((a.type === 'delete' && b.type !== 'insert') || (a.type !== 'insert' && b.type === 'delete')) {
-			return a.originalCellIndex - b.originalCellIndex;
-		}
-
-		// Mixed types: compare based on available indices
-		const aIndex = a.type === 'delete' ? a.originalCellIndex :
-			(a.type === 'insert' ? a.modifiedCellIndex : a.modifiedCellIndex);
-		const bIndex = b.type === 'delete' ? b.originalCellIndex :
-			(b.type === 'insert' ? b.modifiedCellIndex : b.modifiedCellIndex);
-
-		return aIndex - bIndex;
-	});
-}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookFileSystemProvider.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookFileSystemProvider.ts
similarity index 83%
rename from src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookFileSystemProvider.ts
rename to src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookFileSystemProvider.ts
index 05716980af0f..b79dd102d43b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingNotebookFileSystemProvider.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookFileSystemProvider.ts
@@ -3,20 +3,20 @@
  *  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 { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
-import { ResourceMap } from '../../../../../base/common/map.js';
-import { ReadableStreamEvents } from '../../../../../base/common/stream.js';
-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 { INotebookService } from '../../../notebook/common/notebookService.js';
-import { IChatEditingService } from '../../common/chatEditingService.js';
+import { VSBuffer } from '../../../../../../base/common/buffer.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { Event } from '../../../../../../base/common/event.js';
+import { Disposable, IDisposable } from '../../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../../base/common/map.js';
+import { ReadableStreamEvents } from '../../../../../../base/common/stream.js';
+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 { INotebookService } from '../../../../notebook/common/notebookService.js';
+import { IChatEditingService } from '../../../common/chatEditingService.js';
 import { ChatEditingNotebookSnapshotScheme, deserializeSnapshot } from './chatEditingModifiedNotebookSnapshot.js';
-import { ChatEditingSession } from './chatEditingSession.js';
+import { ChatEditingSession } from '../chatEditingSession.js';
 
 
 export class ChatEditingNotebookFileSystemProviderContrib extends Disposable implements IWorkbenchContribution {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/helpers.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/helpers.ts
new file mode 100644
index 000000000000..23a647019cb9
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/helpers.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 { NotebookTextModel } from '../../../../notebook/common/model/notebookTextModel.js';
+import { CellEditType, ICell, ICellDto2, ICellEditOperation, ICellReplaceEdit, NotebookCellsChangeType, NotebookCellsModelMoveEvent, NotebookCellTextModelSplice, NotebookTextModelChangedEvent } from '../../../../notebook/common/notebookCommon.js';
+import { ICellDiffInfo, sortCellChanges } from './notebookCellChanges.js';
+
+
+export function adjustCellDiffForKeepingADeletedCell(originalCellIndex: number,
+	cellDiffInfo: ICellDiffInfo[],
+	applyEdits: typeof NotebookTextModel.prototype.applyEdits,
+): ICellDiffInfo[] {
+	// Delete this cell from original as well.
+	const edit: ICellReplaceEdit = { cells: [], count: 1, editType: CellEditType.Replace, index: originalCellIndex, };
+	applyEdits([edit], true, undefined, () => undefined, undefined, true);
+	const diffs = sortCellChanges(cellDiffInfo)
+		.filter(d => !(d.type === 'delete' && d.originalCellIndex === originalCellIndex))
+		.map(diff => {
+			if (diff.type !== 'insert' && diff.originalCellIndex > originalCellIndex) {
+				return {
+					...diff,
+					originalCellIndex: diff.originalCellIndex - 1,
+				};
+			}
+			return diff;
+		});
+	return diffs;
+}
+
+export function adjustCellDiffForRevertingADeletedCell(originalCellIndex: number,
+	cellDiffInfo: ICellDiffInfo[],
+	cellToInsert: ICellDto2,
+	applyEdits: typeof NotebookTextModel.prototype.applyEdits,
+	createModifiedCellDiffInfo: (modifiedCellIndex: number, originalCellIndex: number) => ICellDiffInfo,
+): ICellDiffInfo[] {
+	cellDiffInfo = sortCellChanges(cellDiffInfo);
+	const indexOfEntry = cellDiffInfo.findIndex(d => d.originalCellIndex === originalCellIndex);
+	if (indexOfEntry === -1) {
+		// Not possible.
+		return cellDiffInfo;
+	}
+
+	let modifiedCellIndex = -1;
+	for (let i = 0; i < cellDiffInfo.length; i++) {
+		const diff = cellDiffInfo[i];
+		if (i < indexOfEntry) {
+			modifiedCellIndex = Math.max(modifiedCellIndex, diff.modifiedCellIndex ?? modifiedCellIndex);
+			continue;
+		}
+		if (i === indexOfEntry) {
+			const edit: ICellReplaceEdit = { cells: [cellToInsert], count: 0, editType: CellEditType.Replace, index: modifiedCellIndex + 1, };
+			applyEdits([edit], true, undefined, () => undefined, undefined, true);
+			cellDiffInfo[i] = createModifiedCellDiffInfo(modifiedCellIndex + 1, originalCellIndex);
+			continue;
+		} else {
+			// Increase the original index for all entries after this.
+			if (typeof diff.modifiedCellIndex === 'number') {
+				diff.modifiedCellIndex++;
+				cellDiffInfo[i] = { ...diff };
+			}
+		}
+	}
+
+	return cellDiffInfo;
+}
+
+export function adjustCellDiffForRevertingAnInsertedCell(modifiedCellIndex: number,
+	cellDiffInfo: ICellDiffInfo[],
+	applyEdits: typeof NotebookTextModel.prototype.applyEdits,
+): ICellDiffInfo[] {
+	if (modifiedCellIndex === -1) {
+		// Not possible.
+		return cellDiffInfo;
+	}
+	cellDiffInfo = sortCellChanges(cellDiffInfo)
+		.filter(d => !(d.type === 'insert' && d.modifiedCellIndex === modifiedCellIndex))
+		.map(d => {
+			if (d.type === 'insert' && d.modifiedCellIndex === modifiedCellIndex) {
+				return d;
+			}
+			if (d.type !== 'delete' && d.modifiedCellIndex > modifiedCellIndex) {
+				return {
+					...d,
+					modifiedCellIndex: d.modifiedCellIndex - 1,
+				};
+			}
+			return d;
+		});
+	const edit: ICellReplaceEdit = { cells: [], count: 1, editType: CellEditType.Replace, index: modifiedCellIndex, };
+	applyEdits([edit], true, undefined, () => undefined, undefined, true);
+	return cellDiffInfo;
+}
+
+export function adjustCellDiffForKeepingAnInsertedCell(modifiedCellIndex: number,
+	cellDiffInfo: ICellDiffInfo[],
+	cellToInsert: ICellDto2,
+	applyEdits: typeof NotebookTextModel.prototype.applyEdits,
+	createModifiedCellDiffInfo: (modifiedCellIndex: number, originalCellIndex: number) => ICellDiffInfo,
+): ICellDiffInfo[] {
+	cellDiffInfo = sortCellChanges(cellDiffInfo);
+	if (modifiedCellIndex === -1) {
+		// Not possible.
+		return cellDiffInfo;
+	}
+	const indexOfEntry = cellDiffInfo.findIndex(d => d.modifiedCellIndex === modifiedCellIndex);
+	if (indexOfEntry === -1) {
+		// Not possible.
+		return cellDiffInfo;
+	}
+	let originalCellIndex = -1;
+	for (let i = 0; i < cellDiffInfo.length; i++) {
+		const diff = cellDiffInfo[i];
+		if (i < indexOfEntry) {
+			originalCellIndex = Math.max(originalCellIndex, diff.originalCellIndex ?? originalCellIndex);
+			continue;
+		}
+		if (i === indexOfEntry) {
+			const edit: ICellReplaceEdit = { cells: [cellToInsert], count: 0, editType: CellEditType.Replace, index: originalCellIndex + 1 };
+			applyEdits([edit], true, undefined, () => undefined, undefined, true);
+			cellDiffInfo[i] = createModifiedCellDiffInfo(modifiedCellIndex, originalCellIndex + 1);
+			continue;
+		} else {
+			// Increase the original index for all entries after this.
+			if (typeof diff.originalCellIndex === 'number') {
+				diff.originalCellIndex++;
+				cellDiffInfo[i] = { ...diff };
+			}
+		}
+	}
+	return cellDiffInfo;
+}
+
+export function adjustCellDiffAndOriginalModelBasedOnCellAddDelete(change: NotebookCellTextModelSplice<ICell>,
+	cellDiffInfo: ICellDiffInfo[],
+	modifiedModelCellCount: number,
+	originalModelCellCount: number,
+	applyEdits: typeof NotebookTextModel.prototype.applyEdits,
+	createModifiedCellDiffInfo: (modifiedCellIndex: number, originalCellIndex: number) => ICellDiffInfo,
+): ICellDiffInfo[] {
+	cellDiffInfo = sortCellChanges(cellDiffInfo);
+	const numberOfCellsInserted = change[2].length;
+	const numberOfCellsDeleted = change[1];
+	const cells = change[2].map(cell => {
+		return {
+			cellKind: cell.cellKind,
+			language: cell.language,
+			metadata: cell.metadata,
+			outputs: cell.outputs,
+			source: cell.getValue(),
+			mime: undefined,
+			internalMetadata: cell.internalMetadata
+		} satisfies ICellDto2;
+	});
+	const wasInsertedAsFirstCell = change[0] === 0;
+	const wasInsertedAsLastCell = change[0] === modifiedModelCellCount - 1;
+	const diffEntryIndex = wasInsertedAsFirstCell ? 0 : (wasInsertedAsLastCell ? cellDiffInfo.length - 1 : (cellDiffInfo.findIndex(d => d.modifiedCellIndex === change[0])));
+	const indexToInsertInOriginalModel = (wasInsertedAsFirstCell || diffEntryIndex === -1) ? 0 : (wasInsertedAsLastCell ? originalModelCellCount : (((cellDiffInfo.slice(0, diffEntryIndex).reverse().find(c => typeof c.originalCellIndex === 'number')?.originalCellIndex ?? -1) + 1)));
+	if (cells.length) {
+		const edit: ICellEditOperation = {
+			editType: CellEditType.Replace,
+			cells,
+			index: indexToInsertInOriginalModel,
+			count: change[1]
+		};
+		applyEdits([edit], true, undefined, () => undefined, undefined, true);
+	}
+	// If cells were deleted we handled that with this.disposeDeletedCellEntries();
+	if (numberOfCellsDeleted) {
+		// Adjust the indexes.
+		let numberOfOriginalCellsRemovedSoFar = 0;
+		let numberOfModifiedCellsRemovedSoFar = 0;
+		const modifiedIndexesToRemove = new Set<number>();
+		for (let i = 0; i < numberOfCellsDeleted; i++) {
+			modifiedIndexesToRemove.add(change[0] + i);
+		}
+		const itemsToRemove = new Set<ICellDiffInfo>();
+		for (let i = 0; i < cellDiffInfo.length; i++) {
+			const diff = cellDiffInfo[i];
+			if (i < diffEntryIndex) {
+				continue;
+			}
+
+			let changed = false;
+			if (typeof diff.modifiedCellIndex === 'number' && modifiedIndexesToRemove.has(diff.modifiedCellIndex)) {
+				// This will be removed.
+				numberOfModifiedCellsRemovedSoFar++;
+				if (typeof diff.originalCellIndex === 'number') {
+					numberOfOriginalCellsRemovedSoFar++;
+				}
+				itemsToRemove.add(diff);
+				continue;
+			}
+			if (typeof diff.modifiedCellIndex === 'number' && numberOfModifiedCellsRemovedSoFar) {
+				diff.modifiedCellIndex -= numberOfModifiedCellsRemovedSoFar;
+				changed = true;
+			}
+			if (typeof diff.originalCellIndex === 'number' && numberOfOriginalCellsRemovedSoFar) {
+				diff.originalCellIndex -= numberOfOriginalCellsRemovedSoFar;
+				changed = true;
+			}
+			if (changed) {
+				cellDiffInfo[i] = { ...diff };
+			}
+		}
+		if (itemsToRemove.size) {
+			Array.from(itemsToRemove)
+				.filter(diff => typeof diff.originalCellIndex === 'number')
+				.forEach(diff => {
+					const edit: ICellEditOperation = {
+						editType: CellEditType.Replace,
+						cells: [],
+						index: diff.originalCellIndex,
+						count: 1
+					};
+					applyEdits([edit], true, undefined, () => undefined, undefined, true);
+				});
+		}
+		cellDiffInfo = cellDiffInfo.filter(d => !itemsToRemove.has(d));
+	}
+
+	if (numberOfCellsInserted) {
+		for (let i = 0; i < cellDiffInfo.length; i++) {
+			const diff = cellDiffInfo[i];
+			if (i < diffEntryIndex) {
+				continue;
+			}
+			let changed = false;
+			if (typeof diff.modifiedCellIndex === 'number') {
+				diff.modifiedCellIndex += numberOfCellsInserted;
+				changed = true;
+			}
+			if (typeof diff.originalCellIndex === 'number') {
+				diff.originalCellIndex += numberOfCellsInserted;
+				changed = true;
+			}
+			if (changed) {
+				cellDiffInfo[i] = { ...diff };
+			}
+		}
+	}
+
+	// For inserted cells, we need to ensure that we create a corresponding CellEntry.
+	// So that any edits to the inserted cell is handled and mirrored over to the corresponding cell in original model.
+	cells.forEach((_, i) => {
+		const originalCellIndex = i + indexToInsertInOriginalModel;
+		const modifiedCellIndex = change[0] + i;
+		const unchangedCell = createModifiedCellDiffInfo(modifiedCellIndex, originalCellIndex);
+		cellDiffInfo.splice((diffEntryIndex === -1 ? 0 : diffEntryIndex) + i, 0, unchangedCell);
+	});
+	return cellDiffInfo;
+}
+
+/**
+ * Given the movements of cells in modified notebook, adjust the ICellDiffInfo[] array
+ * and generate edits for the old notebook (if required).
+ * TODO@DonJayamanne Handle bulk moves (movements of more than 1 cell).
+ */
+export function adjustCellDiffAndOriginalModelBasedOnCellMovements(event: NotebookCellsModelMoveEvent<ICell>, cellDiffInfo: ICellDiffInfo[]): [ICellDiffInfo[], ICellEditOperation[]] | undefined {
+	const minimumIndex = Math.min(event.index, event.newIdx);
+	const maximumIndex = Math.max(event.index, event.newIdx);
+	const cellDiffs = cellDiffInfo.slice();
+	const indexOfEntry = cellDiffs.findIndex(d => d.modifiedCellIndex === event.index);
+	const indexOfEntryToPlaceBelow = cellDiffs.findIndex(d => d.modifiedCellIndex === event.newIdx);
+	if (indexOfEntry === -1 || indexOfEntryToPlaceBelow === -1) {
+		return undefined;
+	}
+	// Create a new object so that the observable value is triggered.
+	// Besides we'll be updating the values of this object in place.
+	const entryToBeMoved = { ...cellDiffs[indexOfEntry] };
+	const moveDirection = event.newIdx > event.index ? 'down' : 'up';
+
+
+	const startIndex = cellDiffs.findIndex(d => d.modifiedCellIndex === minimumIndex);
+	const endIndex = cellDiffs.findIndex(d => d.modifiedCellIndex === maximumIndex);
+	const movingExistingCell = typeof entryToBeMoved.originalCellIndex === 'number';
+	let originalCellsWereEffected = false;
+	for (let i = 0; i < cellDiffs.length; i++) {
+		const diff = cellDiffs[i];
+		let changed = false;
+		if (moveDirection === 'down') {
+			if (i > startIndex && i <= endIndex) {
+				if (typeof diff.modifiedCellIndex === 'number') {
+					changed = true;
+					diff.modifiedCellIndex = diff.modifiedCellIndex - 1;
+				}
+				if (typeof diff.originalCellIndex === 'number' && movingExistingCell) {
+					diff.originalCellIndex = diff.originalCellIndex - 1;
+					originalCellsWereEffected = true;
+					changed = true;
+				}
+			}
+		} else {
+			if (i >= startIndex && i < endIndex) {
+				if (typeof diff.modifiedCellIndex === 'number') {
+					changed = true;
+					diff.modifiedCellIndex = diff.modifiedCellIndex + 1;
+				}
+				if (typeof diff.originalCellIndex === 'number' && movingExistingCell) {
+					diff.originalCellIndex = diff.originalCellIndex + 1;
+					originalCellsWereEffected = true;
+					changed = true;
+				}
+			}
+		}
+		// Create a new object so that the observable value is triggered.
+		// Do only if there's a change.
+		if (changed) {
+			cellDiffs[i] = { ...diff };
+		}
+	}
+	entryToBeMoved.modifiedCellIndex = event.newIdx;
+	const originalCellIndex = entryToBeMoved.originalCellIndex;
+	if (moveDirection === 'down') {
+		cellDiffs.splice(endIndex + 1, 0, entryToBeMoved);
+		cellDiffs.splice(startIndex, 1);
+		// If we're moving a new cell up/down, then we need just adjust just the modified indexes of the cells in between.
+		// If we're moving an existing up/down, then we need to adjust the original indexes as well.
+		if (typeof entryToBeMoved.originalCellIndex === 'number') {
+			entryToBeMoved.originalCellIndex = cellDiffs.slice(0, endIndex).reduce((lastOriginalIndex, diff) => typeof diff.originalCellIndex === 'number' ? Math.max(lastOriginalIndex, diff.originalCellIndex) : lastOriginalIndex, -1) + 1;
+		}
+	} else {
+		cellDiffs.splice(endIndex, 1);
+		cellDiffs.splice(startIndex, 0, entryToBeMoved);
+		// If we're moving a new cell up/down, then we need just adjust just the modified indexes of the cells in between.
+		// If we're moving an existing up/down, then we need to adjust the original indexes as well.
+		if (typeof entryToBeMoved.originalCellIndex === 'number') {
+			entryToBeMoved.originalCellIndex = cellDiffs.slice(0, startIndex).reduce((lastOriginalIndex, diff) => typeof diff.originalCellIndex === 'number' ? Math.max(lastOriginalIndex, diff.originalCellIndex) : lastOriginalIndex, -1) + 1;
+		}
+	}
+
+	// If this is a new cell that we're moving, and there are no existing cells in between, then we can just move the new cell.
+	// I.e. no need to update the original notebook model.
+	if (typeof entryToBeMoved.originalCellIndex === 'number' && originalCellsWereEffected && typeof originalCellIndex === 'number' && entryToBeMoved.originalCellIndex !== originalCellIndex) {
+		const edit: ICellEditOperation = {
+			editType: CellEditType.Move,
+			index: originalCellIndex,
+			length: event.length,
+			newIdx: entryToBeMoved.originalCellIndex
+		};
+
+		return [cellDiffs, [edit]];
+	}
+
+	return [cellDiffs, []];
+}
+
+export function getCorrespondingOriginalCellIndex(modifiedCellIndex: number, cellDiffInfo: ICellDiffInfo[]): number | undefined {
+	const entry = cellDiffInfo.find(d => d.modifiedCellIndex === modifiedCellIndex);
+	return entry?.originalCellIndex;
+}
+
+/**
+ *
+ * This isn't great, but necessary.
+ * ipynb extension updates metadata when new cells are inserted (to ensure the metadata is correct)
+ * Details of why thats required is in ipynb extension, but its necessary.
+ * However as a result of this, those edits appear here and are assumed to be user edits.
+ * As a result `_allEditsAreFromUs` is set to false.
+ */
+export function isTransientIPyNbExtensionEvent(notebookKind: string, e: NotebookTextModelChangedEvent) {
+	if (notebookKind !== 'jupyter-notebook') {
+		return false;
+	}
+	if (e.rawEvents.every(event => {
+		if (event.kind !== NotebookCellsChangeType.ChangeCellMetadata) {
+			return false;
+		}
+		if (JSON.stringify(event.metadata || {}) === JSON.stringify({ execution_count: null, metadata: {} })) {
+			return true;
+		}
+		return true;
+
+	})) {
+		return true;
+	}
+
+	return false;
+}
+
+export function calculateNotebookRewriteRatio(cellsDiff: ICellDiffInfo[], originalModel: NotebookTextModel, modifiedModel: NotebookTextModel): number {
+	const totalNumberOfUpdatedLines = cellsDiff.reduce((totalUpdatedLines, value) => {
+		const getUpadtedLineCount = () => {
+			if (value.type === 'unchanged') {
+				return 0;
+			}
+			if (value.type === 'delete') {
+				return originalModel.cells[value.originalCellIndex].textModel?.getLineCount() ?? 0;
+			}
+			if (value.type === 'insert') {
+				return modifiedModel.cells[value.modifiedCellIndex].textModel?.getLineCount() ?? 0;
+			}
+			return value.diff.get().changes.reduce((maxLineNumber, change) => {
+				return Math.max(maxLineNumber, change.modified.endLineNumberExclusive);
+			}, 0);
+		};
+
+		return totalUpdatedLines + getUpadtedLineCount();
+	}, 0);
+
+	const totalNumberOfLines = modifiedModel.cells.reduce((totalLines, cell) => totalLines + (cell.textModel?.getLineCount() ?? 0), 0);
+	return totalNumberOfLines === 0 ? 0 : Math.min(1, totalNumberOfUpdatedLines / totalNumberOfLines);
+
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/notebookCellChanges.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/notebookCellChanges.ts
new file mode 100644
index 000000000000..376d0ed8d5f2
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/notebookCellChanges.ts
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ISettableObservable, ObservablePromise } from '../../../../../../base/common/observable.js';
+import { IDocumentDiff } from '../../../../../../editor/common/diff/documentDiffProvider.js';
+import { DetailedLineRangeMapping } from '../../../../../../editor/common/diff/rangeMapping.js';
+import { ITextModel } from '../../../../../../editor/common/model.js';
+
+
+/**
+ * This structure is used to represent the state of a Notebook document compared to the original.
+ * Its similar to the IDocumentDiff object, that tells us what cells are unmodified, modified, inserted or deleted.
+ *
+ * All entries will contain a IDocumentDiff
+ * Even when there are no changes, diff will contain the number of lines in the document.
+ * This way we can always calculate the total number of lines in the document.
+ */
+export type ICellDiffInfo = |
+	{
+		originalCellIndex: number;
+		modifiedCellIndex: number;
+		type: 'unchanged';
+	} & IDocumentDiffWithModelsAndActions |
+	{
+		originalCellIndex: number;
+		modifiedCellIndex: number;
+		type: 'modified';
+	} & IDocumentDiffWithModelsAndActions |
+	{
+		modifiedCellIndex: undefined;
+		originalCellIndex: number;
+		type: 'delete';
+	} & IDocumentDiffWithModelsAndActions |
+	{
+		modifiedCellIndex: number;
+		originalCellIndex: undefined;
+		type: 'insert';
+	} & IDocumentDiffWithModelsAndActions;
+
+
+
+interface IDocumentDiffWithModelsAndActions {
+	/**
+	 * The changes between the original and modified document.
+	 */
+	diff: ISettableObservable<IDocumentDiff>;
+	/**
+	 * The original model.
+	 * Cell text models load asynchronously, so this is an observable promise.
+	 */
+	originalModel: ObservablePromise<ITextModel>;
+	/**
+	 * The modified model.
+	 * Cell text models load asynchronously, so this is an observable promise.
+	 */
+	modifiedModel: ObservablePromise<ITextModel>;
+	keep(changes: DetailedLineRangeMapping): Promise<boolean>;
+	undo(changes: DetailedLineRangeMapping): Promise<boolean>;
+}
+
+
+export function countChanges(changes: ICellDiffInfo[]): number {
+	return changes.reduce((count, change) => {
+		const diff = change.diff.get();
+		// When we accept some of the cell insert/delete the items might still be in the list.
+		if (diff.identical) {
+			return count;
+		}
+		switch (change.type) {
+			case 'delete':
+				return count + 1; // We want to see 1 deleted entry in the pill for navigation
+			case 'insert':
+				return count + 1; // We want to see 1 new entry in the pill for navigation
+			case 'modified':
+				return count + diff.changes.length;
+			default:
+				return count;
+		}
+	}, 0);
+
+}
+
+export function sortCellChanges(changes: ICellDiffInfo[]): ICellDiffInfo[] {
+	return [...changes].sort((a, b) => {
+		// For unchanged and modified, use modifiedCellIndex
+		if ((a.type === 'unchanged' || a.type === 'modified') &&
+			(b.type === 'unchanged' || b.type === 'modified')) {
+			return a.modifiedCellIndex - b.modifiedCellIndex;
+		}
+
+		// For delete entries, use originalCellIndex
+		if (a.type === 'delete' && b.type === 'delete') {
+			return a.originalCellIndex - b.originalCellIndex;
+		}
+
+		// For insert entries, use modifiedCellIndex
+		if (a.type === 'insert' && b.type === 'insert') {
+			return a.modifiedCellIndex - b.modifiedCellIndex;
+		}
+
+		if (a.type === 'delete' && b.type === 'insert') {
+			return -1;
+		}
+		if (a.type === 'insert' && b.type === 'delete') {
+			return 1;
+		}
+
+		if ((a.type === 'delete' && b.type !== 'insert') || (a.type !== 'insert' && b.type === 'delete')) {
+			return a.originalCellIndex - b.originalCellIndex;
+		}
+
+		// Mixed types: compare based on available indices
+		const aIndex = a.type === 'delete' ? a.originalCellIndex :
+			(a.type === 'insert' ? a.modifiedCellIndex : a.modifiedCellIndex);
+		const bIndex = b.type === 'delete' ? b.originalCellIndex :
+			(b.type === 'insert' ? b.modifiedCellIndex : b.modifiedCellIndex);
+
+		return aIndex - bIndex;
+	});
+}
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts
index a532f1414f5d..0ac36cbdb452 100644
--- a/src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/chatEditingModifiedNotebookEntry.test.ts
@@ -5,8 +5,8 @@
 
 import assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { adjustCellDiffAndOriginalModelBasedOnCellAddDelete, adjustCellDiffAndOriginalModelBasedOnCellMovements, adjustCellDiffForKeepingADeletedCell, adjustCellDiffForKeepingAnInsertedCell, adjustCellDiffForRevertingADeletedCell, adjustCellDiffForRevertingAnInsertedCell } from '../../browser/chatEditing/chatEditingModifiedNotebookEntry.js';
-import { ICellDiffInfo } from '../../browser/chatEditing/chatEditingNotebookEditorIntegration.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';

From 2c3b0074052d3e57ba06df8972cc682eaceb94af Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 6 Mar 2025 04:25:33 -0800
Subject: [PATCH 0674/1815] Move all upstream fig spec modifications into
 scripts

Part of #242798
---
 .../terminal-suggest/scripts/update-specs.js  |    76 +-
 .../terminal-suggest/src/completions/npx.ts   |   145 +
 .../src/completions/upstream/apt.ts           |   661 +-
 .../src/completions/upstream/git.ts           | 19434 ++++++++--------
 .../src/completions/upstream/kill.ts          |   108 +-
 .../src/completions/upstream/ls.ts            |   442 +-
 .../src/completions/upstream/node.ts          |   996 +-
 .../src/completions/upstream/npm.ts           |  3054 +--
 .../src/completions/upstream/npx.ts           |   317 -
 .../src/completions/upstream/nvm.ts           |   556 +-
 .../src/completions/upstream/pnpm.ts          |  1838 +-
 .../src/completions/upstream/python.ts        |   323 +-
 .../src/completions/upstream/python3.ts       |   326 +-
 .../src/completions/upstream/ssh.ts           |   842 +-
 .../src/completions/upstream/yarn.ts          |  3244 +--
 extensions/terminal-suggest/src/constants.ts  |     1 -
 .../src/terminalSuggestMain.ts                |     2 +
 extensions/terminal-suggest/tsconfig.json     |     4 +-
 18 files changed, 16130 insertions(+), 16239 deletions(-)
 create mode 100644 extensions/terminal-suggest/src/completions/npx.ts
 delete mode 100644 extensions/terminal-suggest/src/completions/upstream/npx.ts

diff --git a/extensions/terminal-suggest/scripts/update-specs.js b/extensions/terminal-suggest/scripts/update-specs.js
index 5f6e0ec5717a..866079cd3c43 100644
--- a/extensions/terminal-suggest/scripts/update-specs.js
+++ b/extensions/terminal-suggest/scripts/update-specs.js
@@ -14,8 +14,70 @@ const replaceStrings = [
 	[
 		'import { filepaths } from "@fig/autocomplete-generators";',
 		'import { filepaths } from \'../../helpers/filepaths\';'
-	]
-]
+	],
+];
+const indentSearch = [20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1].map(e => new RegExp('^' + ' '.repeat(e * 2), 'g'));
+const indentReplaceValue = [20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1].map(e => '\t'.repeat(e));
+
+const specSpecificReplaceStrings = new Map([
+	['git', [
+		[
+			'import { ai } from "@fig/autocomplete-generators";',
+			'function ai(...args: any[]): undefined { return undefined; }'
+		], [
+			'const remoteURLs = out.split("\\n").reduce((dict, line) => {',
+			'const remoteURLs = out.split("\\n").reduce<Record<string, string>>((dict, line) => {',
+		], [
+			'prompt: async ({ executeCommand }) => {',
+			'prompt: async ({ executeCommand }: any) => {'
+		], [
+			'message: async ({ executeCommand }) =>',
+			'message: async ({ executeCommand }: any) =>'
+		]
+	]],
+	['kill', [[
+		'out.match(/\\w+/g)',
+		'out.match(/\\w+/g)?'
+	]]],
+	['node', [[
+		'const isAdonisJsonPresentCommand = "test -f .adonisrc.json";',
+		''
+	]]],
+	['npm', [
+		[
+			'keywords?.length > 0 ? `+keywords:${keywords.join(",")}` : "";',
+			'keywords && keywords.length > 0 ? `+keywords:${keywords.join(",")}` : "";'
+		], [
+			'return results.map((item) => ({',
+			'return results.map((item: any) => ({'
+		], [
+			'const suggestions = [];',
+			'const suggestions: Fig.Suggestion[] = [];'
+		]
+	]],
+	['nvm', [[
+		'const pattern: Fig.Arg = {\n\tname: "pattern",\n};',
+		''
+	]]],
+	['pnpm', [
+		[
+			'if (parts.length > 1) {',
+			'if (parts && parts.length > 1) {'
+		],
+		[
+			'const packages = postProcess(',
+			'const packages = postProcess?.('
+		]
+	]],
+	['ssh', [[
+		'const includeLines = await Promise.all(',
+		'const includeLines: any = await Promise.all('
+	]]],
+	['yarn', [[
+		'(item) =>',
+		'(item: any) =>'
+	]]],
+]);
 
 for (const spec of upstreamSpecs) {
 	const source = path.join(extRoot, `third_party/autocomplete/src/${spec}.ts`);
@@ -26,5 +88,15 @@ for (const spec of upstreamSpecs) {
 	for (const replaceString of replaceStrings) {
 		content = content.replaceAll(replaceString[0], replaceString[1]);
 	}
+	for (let i = 0; i < indentSearch.length; i++) {
+		content = content.replaceAll(indentSearch[i], indentReplaceValue[i]);
+	}
+	const thisSpecReplaceStrings = specSpecificReplaceStrings.get(spec);
+	if (thisSpecReplaceStrings) {
+		for (const replaceString of thisSpecReplaceStrings) {
+			content = content.replaceAll(replaceString[0], replaceString[1]);
+		}
+	}
+
 	fs.writeFileSync(destination, content);
 }
diff --git a/extensions/terminal-suggest/src/completions/npx.ts b/extensions/terminal-suggest/src/completions/npx.ts
new file mode 100644
index 000000000000..360103911d6b
--- /dev/null
+++ b/extensions/terminal-suggest/src/completions/npx.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.
+ *--------------------------------------------------------------------------------------------*/
+
+const completionSpec: Fig.Spec = {
+	name: 'npx',
+	description: 'Execute binaries from npm packages',
+	args: {
+		name: 'command',
+		isCommand: true,
+		generators: {
+			script: [
+				'bash',
+				'-c',
+				'until [[ -d node_modules/ ]] || [[ $PWD = \'/\' ]]; do cd ..; done; ls -1 node_modules/.bin/',
+			],
+			postProcess: function (out) {
+				return out
+					.split('\n')
+					.map((name) => ({
+						name,
+						icon: 'fig://icon?type=command',
+						loadSpec: name,
+					}));
+			},
+		},
+		isOptional: true,
+	},
+
+	options: [
+		{
+			name: ['--package', '-p'],
+			description: 'Package to be installed',
+			args: {
+				name: 'package',
+			},
+		},
+		{
+			name: '--cache',
+			args: {
+				name: 'path',
+				template: 'filepaths',
+			},
+			description: 'Location of the npm cache',
+		},
+		{
+			name: '--always-spawn',
+			description: 'Always spawn a child process to execute the command',
+		},
+		{
+			name: '-y',
+			description: 'Execute npx command without prompting for confirmation',
+		},
+		{
+			description: 'Skip installation if a package is missing',
+			name: '--no-install',
+		},
+		{
+			args: {
+				name: 'path',
+				template: 'filepaths',
+			},
+			description: 'Path to user npmrc',
+			name: '--userconfig',
+		},
+		{
+			name: ['--call', '-c'],
+			args: {
+				name: 'script',
+			},
+			description: 'Execute string as if inside `npm run-script`',
+		},
+		{
+			name: ['--shell', '-s'],
+			description: 'Shell to execute the command with, if any',
+			args: {
+				name: 'shell',
+				suggestions: [
+					{
+						name: 'bash',
+					},
+					{
+						name: 'fish',
+					},
+					{
+						name: 'zsh',
+					},
+				],
+			},
+		},
+		{
+			args: {
+				name: 'shell-fallback',
+				suggestions: [
+					{
+						name: 'bash',
+					},
+					{
+						name: 'fish',
+					},
+					{
+						name: 'zsh',
+					},
+				],
+			},
+			name: '--shell-auto-fallback',
+			description:
+				'Generate shell code to use npx as the "command not found" fallback',
+		},
+		{
+			name: '--ignore-existing',
+			description:
+				'Ignores existing binaries in $PATH, or in the localproject. This forces npx to do a temporary install and use the latest version',
+		},
+		{
+			name: ['--quiet', '-q'],
+			description:
+				'Suppress output from npx itself. Subcommands will not be affected',
+		},
+		{
+			name: '--npm',
+			args: {
+				name: 'path to binary',
+				template: 'filepaths',
+			},
+			description: 'Npm binary to use for internal operations',
+		},
+		{
+			args: {},
+			description: 'Extra node argument when calling a node binary',
+			name: ['--node-arg', '-n'],
+		},
+		{
+			description: 'Show version number',
+			name: ['--version', '-v'],
+		},
+		{
+			description: 'Show help',
+			name: ['--help', '-h'],
+		},
+	],
+};
+
+export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/apt.ts b/extensions/terminal-suggest/src/completions/upstream/apt.ts
index e3ebbb89a0d4..b2fe29efd719 100644
--- a/extensions/terminal-suggest/src/completions/upstream/apt.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/apt.ts
@@ -1,358 +1,355 @@
 import { filepaths } from '../../helpers/filepaths';
 
 const packages: Fig.Generator = {
-	// only trigger when the token length transitions to or from 0
-	trigger: (current, previous) =>
-		current.length === 0 || (previous.length === 0 && current.length > 0),
+  // only trigger when the token length transitions to or from 0
+  trigger: (current, previous) =>
+    current.length === 0 || (previous.length === 0 && current.length > 0),
 
-	// have to use `custom` to skip running the script when length is 0
-	custom: async (tokens, executeShellCommand) => {
-		const finalToken = tokens[tokens.length - 1];
-		if (finalToken.length === 0) {
-			return [];
-		}
-		const { stdout } = await executeShellCommand({
-			command: "apt",
-			// eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
-			args: ["list"],
-		});
+  // have to use `custom` to skip running the script when length is 0
+  custom: async (tokens, executeShellCommand) => {
+    const finalToken = tokens[tokens.length - 1];
+    if (finalToken.length === 0) {
+      return [];
+    }
+    const { stdout } = await executeShellCommand({
+      command: "apt",
+      // eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
+      args: ["list"],
+    });
 
-		// Only lines matching the first character, delete characters after '/'
-		return stdout
-			.trim()
-			.split("\n")
-			.filter((name) => name.startsWith(finalToken))
-			.map((name) => name.replace(/\/.*/, ""))
-			.map((name) => ({
-				name,
-				description: "Package",
-				icon: "📦",
-				// make the suggestions... actually show up
-				// see https://github.com/withfig/autocomplete/pull/1429#discussion_r950688126
-				priority: 50,
-			}));
-	},
+    // Only lines matching the first character, delete characters after '/'
+    return stdout
+      .trim()
+      .split("\n")
+      .filter((name) => name.startsWith(finalToken))
+      .map((name) => name.replace(/\/.*/, ""))
+      .map((name) => ({
+        name,
+        description: "Package",
+        icon: "📦",
+        // make the suggestions... actually show up
+        // see https://github.com/withfig/autocomplete/pull/1429#discussion_r950688126
+        priority: 50,
+      }));
+  },
 };
 
 const installedPackages: Fig.Generator = {
-	script: ["apt", "list", "--installed"],
-	postProcess: function (a) {
-		return a
-			.trim()
-			.split("\n")
-			.map((b) => {
-				return {
-					name: b.substring(0, b.indexOf("/")),
-					description: "Package",
-					icon: "📦",
-				};
-			});
-	},
+  script: ["apt", "list", "--installed"],
+  postProcess: function (a) {
+    return a
+      .trim()
+      .split("\n")
+      .map((b) => {
+        return {
+          name: b.substring(0, b.indexOf("/")),
+          description: "Package",
+          icon: "📦",
+        };
+      });
+  },
 };
 
 const upgradablePackages: Fig.Generator = {
-	script: ["apt", "list", "--upgradable"],
-	postProcess: function (a) {
-		return a
-			.trim()
-			.split("\n")
-			.map((b) => {
-				return {
-					name: b.substring(0, b.indexOf("/")),
-					description: "Package",
-					icon: "📦",
-				};
-			});
-	},
+  script: ["apt", "list", "--upgradable"],
+  postProcess: function (a) {
+    return a
+      .trim()
+      .split("\n")
+      .map((b) => {
+        return {
+          name: b.substring(0, b.indexOf("/")),
+          description: "Package",
+          icon: "📦",
+        };
+      });
+  },
 };
 
 const yesNoOptions: Fig.Option[] = [
-	{
-		name: "-y",
-		description: "Assume yes to all prompts",
-		exclusiveOn: ["--assume-no"],
-	},
-	{
-		name: "--assume-no",
-		description: "Assume no to all prompts",
-		exclusiveOn: ["-y"],
-	},
+  {
+    name: "-y",
+    description: "Assume yes to all prompts",
+    exclusiveOn: ["--assume-no"],
+  },
+  {
+    name: "--assume-no",
+    description: "Assume no to all prompts",
+    exclusiveOn: ["-y"],
+  },
 ];
 
 const installationOptions: Fig.Option[] = [
-	{
-		name: ["-d", "--download-only"],
-		description:
-			"For any operation that would download packages, download them, but do nothing else",
-	},
-	{
-		name: "--no-download",
-		description:
-			"Do not download packages, attempt to use already downloaded packages",
-	},
+  {
+    name: ["-d", "--download-only"],
+    description:
+      "For any operation that would download packages, download them, but do nothing else",
+  },
+  {
+    name: "--no-download",
+    description:
+      "Do not download packages, attempt to use already downloaded packages",
+  },
 ];
 
 const simulate: Fig.Option[] = [
-	{
-		name: ["-s", "--simulate"],
-		description:
-			"Simulate running this command and show it's output, without actually changing anything",
-	},
+  {
+    name: ["-s", "--simulate"],
+    description:
+      "Simulate running this command and show it's output, without actually changing anything",
+  },
 ];
 
 const completionSpec: Fig.Spec = {
-	name: "apt",
-	description: "Package manager for Debian-based Linux distributions",
-	subcommands: [
-		{
-			name: "update",
-			description: "Update the package database",
-			options: [...yesNoOptions],
-		},
-		{
-			name: "upgrade",
-			description: "Install all available upgrades",
-			args: {
-				name: "package",
-				description: "Package(s) to upgrade",
-				isVariadic: true,
-				isOptional: true,
-				generators: upgradablePackages,
-			},
-			options: [...installationOptions, ...yesNoOptions, ...simulate],
-		},
-		{
-			name: "full-upgrade",
-			description:
-				"Install available upgrades, removing currently installed packages if needed to upgrade the system as a whole",
-			options: [...installationOptions, ...yesNoOptions, ...simulate],
-		},
-		{
-			name: "install",
-			description: "Install package(s)",
-			args: {
-				name: "package",
-				description: "The package you want to install",
-				isVariadic: true,
-				generators: [
-					packages,
-					filepaths({ extensions: ["deb"] })
-				],
-			},
-			options: [
-				...installationOptions,
-				...yesNoOptions,
-				...simulate,
-				{
-					name: "--reinstall",
-					description: "Reinstall the package if it is already installed",
-				},
-				{
-					name: ["-f", "--fix-broken"],
-					description: "Attempt to fix broken packages",
-				},
-			],
-		},
-		{
-			name: "reinstall",
-			description: "Reinstall package(s)",
-			args: {
-				name: "package",
-				description: "The package you want to reinstall",
-				isVariadic: true,
-				generators: installedPackages,
-			},
-			options: [...yesNoOptions, ...simulate],
-		},
-		{
-			name: "remove",
-			description: "Remove package(s)",
-			args: {
-				name: "package",
-				description: "The package you want to remove",
-				isVariadic: true,
-				generators: installedPackages,
-			},
-			options: [
-				...yesNoOptions,
-				...simulate,
-				{
-					name: ["-f", "--fix-broken"],
-					description: "Attempt to fix broken packages",
-				},
-			],
-		},
-		{
-			name: "purge",
-			description: "Remove package(s) and their configuration files",
-			args: {
-				name: "package",
-				description: "The package you want to purge",
-				isVariadic: true,
-				generators: installedPackages,
-			},
-			options: [...yesNoOptions, ...simulate],
-		},
-		{
-			name: ["autoremove", "auto-remove"],
-			description: "Remove unused packages",
-			options: [...yesNoOptions, ...simulate],
-		},
-		{
-			name: "list",
-			description: "List packages",
-			options: [
-				{
-					name: "--installed",
-					description: "List installed packages",
-				},
-				{
-					name: "--upgradable",
-					description: "List upgradable packages",
-				},
-			],
-		},
-		{
-			name: "search",
-			description: "Search for packages",
-			args: {
-				name: "query",
-				description: "The query to search for",
-			},
-			options: [...yesNoOptions],
-		},
-		{
-			name: "show",
-			description: "Show package details",
-			args: {
-				name: "package",
-				description: "The package you want to show",
-				generators: packages,
-			},
-		},
-		{
-			name: "satisfy",
-			description: "Satisfy package dependencies",
-			args: {
-				name: "package",
-				description: "The package you want to satisfy",
-				isVariadic: true,
-				generators: packages,
-			},
-			options: [...installationOptions, ...yesNoOptions, ...simulate],
-		},
-		{
-			name: "clean",
-			description: "Remove downloaded package files",
-			options: [...yesNoOptions, ...simulate],
-		},
-		{
-			name: "edit-sources",
-			description: "Edit the list of package sources",
-			options: [...yesNoOptions],
-		},
-		{
-			// docs for this weren't the greatest, some descriptions might be slightly (or very) wrong.
-			name: "source",
-			description: "Fetch package source files",
-			args: {
-				name: "package",
-				description: "The package you want to get source files for",
-				isVariadic: true,
-				generators: packages,
-			},
-			options: [
-				...installationOptions,
-				...yesNoOptions,
-				...simulate,
-				{
-					name: "--compile",
-					description:
-						"Compile the package to a binary using dpkg-buildpackage",
-				},
-				{
-					name: "--only-source",
-					// no idea how this works
-				},
-				{
-					name: "--host-architecture",
-					description: "The architecture to build for",
-					args: {
-						name: "architecture",
-						description: "The architecture to build for",
-					},
-				},
-			],
-		},
-		{
-			// I don't understand this either
-			name: "build-dep",
-			description:
-				"Install/remove packages in an attempt to satisfy the build dependencies for a source package",
-			args: {
-				name: "package",
-				description: "The package you want to build dependencies for",
-				generators: packages,
-			},
-			options: [
-				...installationOptions,
-				...yesNoOptions,
-				...simulate,
-				{
-					name: "--host-architecture",
-					description: "The architecture to build for",
-					args: {
-						name: "architecture",
-						description: "The architecture to build for",
-					},
-				},
-				{
-					name: "--only-source",
-				},
-			],
-		},
-		{
-			name: "download",
-			description: "Download package binary into the current directory",
-			args: {
-				name: "package",
-				description: "The package you want to download",
-				generators: packages,
-			},
-			options: [...installationOptions, ...yesNoOptions],
-		},
-		{
-			name: ["autoclean", "auto-clean"],
-			description:
-				"Like clean, but only removes package files that can no longer be downloaded",
-			options: [...installationOptions, ...yesNoOptions, ...simulate],
-		},
-		{
-			name: "changelog",
-			description: "Show the changelog for a package",
-			args: {
-				name: "package",
-				description: "The package you want to show the changelog for",
-				generators: packages,
-				isVariadic: true,
-			},
-			options: [...installationOptions, ...yesNoOptions],
-		},
-	],
-	options: [
-		{
-			name: ["-h", "--help"],
-			description: "Print help message and exit",
-			isPersistent: true,
-			priority: 40,
-		},
-		{
-			name: ["-v", "--version"],
-			description: "Print version information and exit",
-			isPersistent: true,
-			priority: 40,
-		},
-	],
+  name: "apt",
+  description: "Package manager for Debian-based Linux distributions",
+  subcommands: [
+    {
+      name: "update",
+      description: "Update the package database",
+      options: [...yesNoOptions],
+    },
+    {
+      name: "upgrade",
+      description: "Install all available upgrades",
+      args: {
+        name: "package",
+        description: "Package(s) to upgrade",
+        isVariadic: true,
+        isOptional: true,
+        generators: upgradablePackages,
+      },
+      options: [...installationOptions, ...yesNoOptions, ...simulate],
+    },
+    {
+      name: "full-upgrade",
+      description:
+        "Install available upgrades, removing currently installed packages if needed to upgrade the system as a whole",
+      options: [...installationOptions, ...yesNoOptions, ...simulate],
+    },
+    {
+      name: "install",
+      description: "Install package(s)",
+      args: {
+        name: "package",
+        description: "The package you want to install",
+        isVariadic: true,
+        generators: [packages, filepaths({ extensions: ["deb"] })],
+      },
+      options: [
+        ...installationOptions,
+        ...yesNoOptions,
+        ...simulate,
+        {
+          name: "--reinstall",
+          description: "Reinstall the package if it is already installed",
+        },
+        {
+          name: ["-f", "--fix-broken"],
+          description: "Attempt to fix broken packages",
+        },
+      ],
+    },
+    {
+      name: "reinstall",
+      description: "Reinstall package(s)",
+      args: {
+        name: "package",
+        description: "The package you want to reinstall",
+        isVariadic: true,
+        generators: installedPackages,
+      },
+      options: [...yesNoOptions, ...simulate],
+    },
+    {
+      name: "remove",
+      description: "Remove package(s)",
+      args: {
+        name: "package",
+        description: "The package you want to remove",
+        isVariadic: true,
+        generators: installedPackages,
+      },
+      options: [
+        ...yesNoOptions,
+        ...simulate,
+        {
+          name: ["-f", "--fix-broken"],
+          description: "Attempt to fix broken packages",
+        },
+      ],
+    },
+    {
+      name: "purge",
+      description: "Remove package(s) and their configuration files",
+      args: {
+        name: "package",
+        description: "The package you want to purge",
+        isVariadic: true,
+        generators: installedPackages,
+      },
+      options: [...yesNoOptions, ...simulate],
+    },
+    {
+      name: ["autoremove", "auto-remove"],
+      description: "Remove unused packages",
+      options: [...yesNoOptions, ...simulate],
+    },
+    {
+      name: "list",
+      description: "List packages",
+      options: [
+        {
+          name: "--installed",
+          description: "List installed packages",
+        },
+        {
+          name: "--upgradable",
+          description: "List upgradable packages",
+        },
+      ],
+    },
+    {
+      name: "search",
+      description: "Search for packages",
+      args: {
+        name: "query",
+        description: "The query to search for",
+      },
+      options: [...yesNoOptions],
+    },
+    {
+      name: "show",
+      description: "Show package details",
+      args: {
+        name: "package",
+        description: "The package you want to show",
+        generators: packages,
+      },
+    },
+    {
+      name: "satisfy",
+      description: "Satisfy package dependencies",
+      args: {
+        name: "package",
+        description: "The package you want to satisfy",
+        isVariadic: true,
+        generators: packages,
+      },
+      options: [...installationOptions, ...yesNoOptions, ...simulate],
+    },
+    {
+      name: "clean",
+      description: "Remove downloaded package files",
+      options: [...yesNoOptions, ...simulate],
+    },
+    {
+      name: "edit-sources",
+      description: "Edit the list of package sources",
+      options: [...yesNoOptions],
+    },
+    {
+      // docs for this weren't the greatest, some descriptions might be slightly (or very) wrong.
+      name: "source",
+      description: "Fetch package source files",
+      args: {
+        name: "package",
+        description: "The package you want to get source files for",
+        isVariadic: true,
+        generators: packages,
+      },
+      options: [
+        ...installationOptions,
+        ...yesNoOptions,
+        ...simulate,
+        {
+          name: "--compile",
+          description:
+            "Compile the package to a binary using dpkg-buildpackage",
+        },
+        {
+          name: "--only-source",
+          // no idea how this works
+        },
+        {
+          name: "--host-architecture",
+          description: "The architecture to build for",
+          args: {
+            name: "architecture",
+            description: "The architecture to build for",
+          },
+        },
+      ],
+    },
+    {
+      // I don't understand this either
+      name: "build-dep",
+      description:
+        "Install/remove packages in an attempt to satisfy the build dependencies for a source package",
+      args: {
+        name: "package",
+        description: "The package you want to build dependencies for",
+        generators: packages,
+      },
+      options: [
+        ...installationOptions,
+        ...yesNoOptions,
+        ...simulate,
+        {
+          name: "--host-architecture",
+          description: "The architecture to build for",
+          args: {
+            name: "architecture",
+            description: "The architecture to build for",
+          },
+        },
+        {
+          name: "--only-source",
+        },
+      ],
+    },
+    {
+      name: "download",
+      description: "Download package binary into the current directory",
+      args: {
+        name: "package",
+        description: "The package you want to download",
+        generators: packages,
+      },
+      options: [...installationOptions, ...yesNoOptions],
+    },
+    {
+      name: ["autoclean", "auto-clean"],
+      description:
+        "Like clean, but only removes package files that can no longer be downloaded",
+      options: [...installationOptions, ...yesNoOptions, ...simulate],
+    },
+    {
+      name: "changelog",
+      description: "Show the changelog for a package",
+      args: {
+        name: "package",
+        description: "The package you want to show the changelog for",
+        generators: packages,
+        isVariadic: true,
+      },
+      options: [...installationOptions, ...yesNoOptions],
+    },
+  ],
+  options: [
+    {
+      name: ["-h", "--help"],
+      description: "Print help message and exit",
+      isPersistent: true,
+      priority: 40,
+    },
+    {
+      name: ["-v", "--version"],
+      description: "Print version information and exit",
+      isPersistent: true,
+      priority: 40,
+    },
+  ],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/git.ts b/extensions/terminal-suggest/src/completions/upstream/git.ts
index 62d90d636b47..6fd565707b1c 100644
--- a/extensions/terminal-suggest/src/completions/upstream/git.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/git.ts
@@ -1,9813 +1,9809 @@
-// import { ai } from "../../fig/ai/ai";
+function ai(...args: any[]): undefined { return undefined; }
 
 const filterMessages = (out: string): string => {
-	return out.startsWith("warning:") || out.startsWith("error:")
-		? out.split("\n").slice(1).join("\n")
-		: out;
+  return out.startsWith("warning:") || out.startsWith("error:")
+    ? out.split("\n").slice(1).join("\n")
+    : out;
 };
 
 const postProcessTrackedFiles: Fig.Generator["postProcess"] = (
-	out,
-	context
+  out,
+  context
 ) => {
-	const output = filterMessages(out);
+  const output = filterMessages(out);
 
-	if (output.startsWith("fatal:")) {
-		return [];
-	}
+  if (output.startsWith("fatal:")) {
+    return [];
+  }
 
-	const files = output.split("\n").map((file) => {
-		const arr = file.trim().split(" ");
+  const files = output.split("\n").map((file) => {
+    const arr = file.trim().split(" ");
 
-		return { working: arr[0], file: arr.slice(1).join(" ").trim() };
-	});
+    return { working: arr[0], file: arr.slice(1).join(" ").trim() };
+  });
 
-	return [
-		...files.map((item) => {
-			const file = item.file.replace(/^"|"$/g, "");
-			let ext = "";
+  return [
+    ...files.map((item) => {
+      const file = item.file.replace(/^"|"$/g, "");
+      let ext = "";
 
-			try {
-				ext = file.split(".").slice(-1)[0];
-			} catch (e) { }
+      try {
+        ext = file.split(".").slice(-1)[0];
+      } catch (e) {}
 
-			if (file.endsWith("/")) {
-				ext = "folder";
-			}
+      if (file.endsWith("/")) {
+        ext = "folder";
+      }
 
-			return {
-				name: file,
-				icon: `fig://icon?type=${ext}&color=ff0000&badge=${item.working}`,
-				description: "Changed tracked files",
-				// If the current file already is already added
-				// we want to lower the priority
-				priority: context.some((ctx) => ctx.includes(file)) ? 50 : 100,
-			};
-		}),
-	];
+      return {
+        name: file,
+        icon: `fig://icon?type=${ext}&color=ff0000&badge=${item.working}`,
+        description: "Changed tracked files",
+        // If the current file already is already added
+        // we want to lower the priority
+        priority: context.some((ctx) => ctx.includes(file)) ? 50 : 100,
+      };
+    }),
+  ];
 };
 
 interface PostProcessBranchesOptions {
-	insertWithoutRemotes?: true;
+  insertWithoutRemotes?: true;
 }
 
 const postProcessBranches =
-	(options: PostProcessBranchesOptions = {}): Fig.Generator["postProcess"] =>
-		(out): (Fig.Suggestion | null)[] => {
-			const { insertWithoutRemotes = false } = options;
+  (options: PostProcessBranchesOptions = {}): Fig.Generator["postProcess"] =>
+  (out) => {
+    const { insertWithoutRemotes = false } = options;
 
-			const output = filterMessages(out);
+    const output = filterMessages(out);
 
-			if (output.startsWith("fatal:")) {
-				return [];
-			}
+    if (output.startsWith("fatal:")) {
+      return [];
+    }
 
-			const seen = new Set<string>();
-			return output
-				.split("\n")
-				.filter((line) => !line.trim().startsWith("HEAD"))
-				.map((branch) => {
-					let name = branch.trim();
-					const parts = branch.match(/\S+/g);
-					if (!parts) {
-						return null;
-					}
-					if (parts.length > 1) {
-						if (parts[0] === "*") {
-							// We are in a detached HEAD state
-							if (branch.includes("HEAD detached")) {
-								return null;
-							}
-							// Current branch
-							return {
-								name: branch.replace("*", "").trim(),
-								description: "Current branch",
-								priority: 100,
-								icon: "⭐️",
-							};
-						} else if (parts[0] === "+") {
-							// Branch checked out in another worktree.
-							name = branch.replace("+", "").trim();
-						}
-					}
+    const seen = new Set<string>();
+    return output
+      .split("\n")
+      .filter((line) => !line.trim().startsWith("HEAD"))
+      .map((branch) => {
+        let name = branch.trim();
+        const parts = branch.match(/\S+/g);
+        if (parts.length > 1) {
+          if (parts[0] === "*") {
+            // We are in a detached HEAD state
+            if (branch.includes("HEAD detached")) {
+              return null;
+            }
+            // Current branch
+            return {
+              name: branch.replace("*", "").trim(),
+              description: "Current branch",
+              priority: 100,
+              icon: "⭐️",
+            };
+          } else if (parts[0] === "+") {
+            // Branch checked out in another worktree.
+            name = branch.replace("+", "").trim();
+          }
+        }
 
-					let description = "Branch";
+        let description = "Branch";
 
-					if (insertWithoutRemotes && name.startsWith("remotes/")) {
-						name = name.slice(name.indexOf("/", 8) + 1);
-						description = "Remote branch";
-					}
+        if (insertWithoutRemotes && name.startsWith("remotes/")) {
+          name = name.slice(name.indexOf("/", 8) + 1);
+          description = "Remote branch";
+        }
 
-					const space = name.indexOf(" ");
-					if (space !== -1) {
-						name = name.slice(0, space);
-					}
+        const space = name.indexOf(" ");
+        if (space !== -1) {
+          name = name.slice(0, space);
+        }
 
-					return {
-						name,
-						description,
-						icon: "fig://icon?type=git",
-						priority: 75,
-					};
-				})
-				.filter((suggestion) => {
-					if (!suggestion || seen.has(suggestion.name)) return false;
-					seen.add(suggestion.name);
-					return true;
-				});
-		};
+        return {
+          name,
+          description,
+          icon: "fig://icon?type=git",
+          priority: 75,
+        };
+      })
+      .filter((suggestion) => {
+        if (seen.has(suggestion.name)) return false;
+        seen.add(suggestion.name);
+        return true;
+      });
+  };
 
 export const gitGenerators: Record<string, Fig.Generator> = {
-	// Commit history
-	commits: {
-		script: ["git", "--no-optional-locks", "log", "--oneline"],
-		postProcess: function (out) {
-			const output = filterMessages(out);
+  // Commit history
+  commits: {
+    script: ["git", "--no-optional-locks", "log", "--oneline"],
+    postProcess: function (out) {
+      const output = filterMessages(out);
 
-			if (output.startsWith("fatal:")) {
-				return [];
-			}
+      if (output.startsWith("fatal:")) {
+        return [];
+      }
 
-			return output.split("\n").map((line) => {
-				return {
-					name: line.substring(0, 7),
-					icon: "fig://icon?type=node",
-					description: line.substring(7),
-				};
-			});
-		},
-	},
+      return output.split("\n").map((line) => {
+        return {
+          name: line.substring(0, 7),
+          icon: "fig://icon?type=node",
+          description: line.substring(7),
+        };
+      });
+    },
+  },
 
-	// user aliases
-	aliases: {
-		script: ["git", "--no-optional-locks", "config", "--get-regexp", "^alias."],
-		cache: {
-			strategy: "stale-while-revalidate",
-		},
-		postProcess: (out) => {
-			const suggestions = out.split("\n").map((aliasLine) => {
-				const [name, ...parts] = aliasLine.slice("alias.".length).split(" ");
-				const value = parts.join(" ");
-				return {
-					name,
-					description: `Alias for '${value}'`,
-					icon: "fig://icon?type=commandkey",
-				};
-			});
-			const seen = new Set();
-			return suggestions.filter((suggestion) => {
-				if (seen.has(suggestion.name)) {
-					return false;
-				}
-				seen.add(suggestion.name);
-				return true;
-			});
-		},
-	},
+  // user aliases
+  aliases: {
+    script: ["git", "--no-optional-locks", "config", "--get-regexp", "^alias."],
+    cache: {
+      strategy: "stale-while-revalidate",
+    },
+    postProcess: (out) => {
+      const suggestions = out.split("\n").map((aliasLine) => {
+        const [name, ...parts] = aliasLine.slice("alias.".length).split(" ");
+        const value = parts.join(" ");
+        return {
+          name,
+          description: `Alias for '${value}'`,
+          icon: "fig://icon?type=commandkey",
+        };
+      });
+      const seen = new Set();
+      return suggestions.filter((suggestion) => {
+        if (seen.has(suggestion.name)) {
+          return false;
+        }
+        seen.add(suggestion.name);
+        return true;
+      });
+    },
+  },
 
-	revs: {
-		script: ["git", "rev-list", "--all", "--oneline"],
-		postProcess: function (out) {
-			const output = filterMessages(out);
+  revs: {
+    script: ["git", "rev-list", "--all", "--oneline"],
+    postProcess: function (out) {
+      const output = filterMessages(out);
 
-			if (output.startsWith("fatal:")) {
-				return [];
-			}
+      if (output.startsWith("fatal:")) {
+        return [];
+      }
 
-			return output.split("\n").map((line) => {
-				return {
-					name: line.substring(0, 7),
-					icon: "fig://icon?type=node",
-					description: line.substring(7),
-				};
-			});
-		},
-	},
+      return output.split("\n").map((line) => {
+        return {
+          name: line.substring(0, 7),
+          icon: "fig://icon?type=node",
+          description: line.substring(7),
+        };
+      });
+    },
+  },
 
-	// Saved stashes
-	// TODO: maybe only print names of stashes
-	stashes: {
-		script: ["git", "--no-optional-locks", "stash", "list"],
-		postProcess: function (out) {
-			const output = filterMessages(out);
+  // Saved stashes
+  // TODO: maybe only print names of stashes
+  stashes: {
+    script: ["git", "--no-optional-locks", "stash", "list"],
+    postProcess: function (out) {
+      const output = filterMessages(out);
 
-			if (output.startsWith("fatal:")) {
-				return [];
-			}
+      if (output.startsWith("fatal:")) {
+        return [];
+      }
 
-			return output.split("\n").map((file) => {
-				return {
-					// account for conventional commit messages
-					name: file.split(":").slice(2).join(":"),
-					insertValue: file.split(":")[0],
-					icon: `fig://icon?type=node`,
-				};
-			});
-		},
-	},
+      return output.split("\n").map((file) => {
+        return {
+          // account for conventional commit messages
+          name: file.split(":").slice(2).join(":"),
+          insertValue: file.split(":")[0],
+          icon: `fig://icon?type=node`,
+        };
+      });
+    },
+  },
 
-	// Tree-ish
-	// This needs to be fleshed out properly....
-	// e.g. what is difference to commit-ish?
-	// Refer to this:https://stackoverflow.com/questions/23303549/what-are-commit-ish-and-tree-ish-in-git/40910185
-	// https://mirrors.edge.kernel.org/pub/software/scm/git/docs/#_identifier_terminology
+  // Tree-ish
+  // This needs to be fleshed out properly....
+  // e.g. what is difference to commit-ish?
+  // Refer to this:https://stackoverflow.com/questions/23303549/what-are-commit-ish-and-tree-ish-in-git/40910185
+  // https://mirrors.edge.kernel.org/pub/software/scm/git/docs/#_identifier_terminology
 
-	treeish: {
-		script: ["git", "--no-optional-locks", "diff", "--cached", "--name-only"],
-		postProcess: function (out, tokens) {
-			const output = filterMessages(out);
+  treeish: {
+    script: ["git", "--no-optional-locks", "diff", "--cached", "--name-only"],
+    postProcess: function (out, tokens) {
+      const output = filterMessages(out);
 
-			if (output.startsWith("fatal:")) {
-				return [];
-			}
+      if (output.startsWith("fatal:")) {
+        return [];
+      }
 
-			return output.split("\n").map((file) => {
-				return {
-					name: file,
-					insertValue: (!tokens.includes("--") ? "-- " : "") + file,
-					icon: `fig://icon?type=file`,
-					description: "Staged file",
-				};
-			});
-		},
-	},
+      return output.split("\n").map((file) => {
+        return {
+          name: file,
+          insertValue: (!tokens.includes("--") ? "-- " : "") + file,
+          icon: `fig://icon?type=file`,
+          description: "Staged file",
+        };
+      });
+    },
+  },
 
-	// All branches
-	remoteLocalBranches: {
-		script: [
-			"git",
-			"--no-optional-locks",
-			"branch",
-			"-a",
-			"--no-color",
-			"--sort=-committerdate",
-		],
-		postProcess: postProcessBranches({ insertWithoutRemotes: true }),
-	},
+  // All branches
+  remoteLocalBranches: {
+    script: [
+      "git",
+      "--no-optional-locks",
+      "branch",
+      "-a",
+      "--no-color",
+      "--sort=-committerdate",
+    ],
+    postProcess: postProcessBranches({ insertWithoutRemotes: true }),
+  },
 
-	localBranches: {
-		script: [
-			"git",
-			"--no-optional-locks",
-			"branch",
-			"--no-color",
-			"--sort=-committerdate",
-		],
-		postProcess: postProcessBranches({ insertWithoutRemotes: true }),
-	},
+  localBranches: {
+    script: [
+      "git",
+      "--no-optional-locks",
+      "branch",
+      "--no-color",
+      "--sort=-committerdate",
+    ],
+    postProcess: postProcessBranches({ insertWithoutRemotes: true }),
+  },
 
-	// 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 });
-			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
-				);
-			}
-		},
-	},
+  // 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 });
+      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
+        );
+      }
+    },
+  },
 
-	remotes: {
-		script: ["git", "--no-optional-locks", "remote", "-v"],
-		postProcess: function (out) {
-			const remoteURLs = out.split("\n").reduce<Record<string, string>>((dict, line) => {
-				const pair = line.split("\t");
-				const remote = pair[0];
-				const url = pair[1].split(" ")[0];
+  remotes: {
+    script: ["git", "--no-optional-locks", "remote", "-v"],
+    postProcess: function (out) {
+      const remoteURLs = out.split("\n").reduce<Record<string, string>>((dict, line) => {
+        const pair = line.split("\t");
+        const remote = pair[0];
+        const url = pair[1].split(" ")[0];
 
-				dict[remote] = url;
-				return dict;
-			}, {});
+        dict[remote] = url;
+        return dict;
+      }, {});
 
-			return Object.keys(remoteURLs).map((remote) => {
-				const url = remoteURLs[remote];
-				let icon = "box";
-				if (url.includes("github.com")) {
-					icon = "github";
-				}
+      return Object.keys(remoteURLs).map((remote) => {
+        const url = remoteURLs[remote];
+        let icon = "box";
+        if (url.includes("github.com")) {
+          icon = "github";
+        }
 
-				if (url.includes("gitlab.com")) {
-					icon = "gitlab";
-				}
+        if (url.includes("gitlab.com")) {
+          icon = "gitlab";
+        }
 
-				if (url.includes("heroku.com")) {
-					icon = "heroku";
-				}
-				return {
-					name: remote,
-					icon: `fig://icon?type=${icon}`,
-					description: "Remote",
-				};
-			});
-		},
-	},
+        if (url.includes("heroku.com")) {
+          icon = "heroku";
+        }
+        return {
+          name: remote,
+          icon: `fig://icon?type=${icon}`,
+          description: "Remote",
+        };
+      });
+    },
+  },
 
-	tags: {
-		script: [
-			"git",
-			"--no-optional-locks",
-			"tag",
-			"--list",
-			"--sort=-committerdate",
-		],
-		postProcess: function (output) {
-			return output.split("\n").map((tag) => ({
-				name: tag,
-				icon: "🏷️",
-			}));
-		},
-	},
+  tags: {
+    script: [
+      "git",
+      "--no-optional-locks",
+      "tag",
+      "--list",
+      "--sort=-committerdate",
+    ],
+    postProcess: function (output) {
+      return output.split("\n").map((tag) => ({
+        name: tag,
+        icon: "🏷️",
+      }));
+    },
+  },
 
-	// Files for staging
-	files_for_staging: {
-		script: ["git", "--no-optional-locks", "status", "--short"],
-		postProcess: (out, context) => {
-			// This whole function is a mess
+  // Files for staging
+  files_for_staging: {
+    script: ["git", "--no-optional-locks", "status", "--short"],
+    postProcess: (out, context) => {
+      // This whole function is a mess
 
-			const output = filterMessages(out);
+      const output = filterMessages(out);
 
-			if (output.startsWith("fatal:")) {
-				return [];
-			}
-			let files = output.split("\n").map((file) => {
-				// From "git --no-optional-locks status --short"
-				// M  dev/github.ts // test file that was added
-				//  M dev/kubectl.ts // test file that was not added
-				// A  test2.txt // new added and tracked file
-				// ?? test.txt // new untracked file
-				const alreadyAdded = ["M", "A"].includes(file.charAt(0));
+      if (output.startsWith("fatal:")) {
+        return [];
+      }
+      let files = output.split("\n").map((file) => {
+        // From "git --no-optional-locks status --short"
+        // M  dev/github.ts // test file that was added
+        //  M dev/kubectl.ts // test file that was not added
+        // A  test2.txt // new added and tracked file
+        // ?? test.txt // new untracked file
+        const alreadyAdded = ["M", "A"].includes(file.charAt(0));
 
-				file = file.trim();
-				const arr = file.split(" ");
+        file = file.trim();
+        const arr = file.split(" ");
 
-				return {
-					working: arr[0],
-					file: arr.slice(1).join(" ").trim(),
-					alreadyAdded,
-				};
-			});
+        return {
+          working: arr[0],
+          file: arr.slice(1).join(" ").trim(),
+          alreadyAdded,
+        };
+      });
 
-			const paths = output.split("\n").map((file) => {
-				const arr = file
-					.slice(0, file.lastIndexOf("/") + 1)
-					.trim()
-					.split(" ");
-				return arr.slice(1).join(" ").trim();
-			});
+      const paths = output.split("\n").map((file) => {
+        const arr = file
+          .slice(0, file.lastIndexOf("/") + 1)
+          .trim()
+          .split(" ");
+        return arr.slice(1).join(" ").trim();
+      });
 
-			const dirArr = [];
-			if (paths.length >= 2) {
-				let currentDir = paths[0];
-				let count = 1;
-				for (let i = 1; i < paths.length; i++) {
-					if (paths[i].includes(currentDir) && i + 1 !== paths.length) {
-						count++;
-					} else {
-						if (count >= 2) {
-							dirArr.push(currentDir);
-						}
-						count = 1;
-					}
-					currentDir = paths[i];
-				}
-			}
+      const dirArr = [];
+      if (paths.length >= 2) {
+        let currentDir = paths[0];
+        let count = 1;
+        for (let i = 1; i < paths.length; i++) {
+          if (paths[i].includes(currentDir) && i + 1 !== paths.length) {
+            count++;
+          } else {
+            if (count >= 2) {
+              dirArr.push(currentDir);
+            }
+            count = 1;
+          }
+          currentDir = paths[i];
+        }
+      }
 
-			// Filter out the files that the user has already input in the current edit buffer
-			files = files.filter((item) => {
-				const file = item.file.replace(/^"|"$/g, "");
-				return !context.some((ctx) => {
-					return (
-						ctx === file ||
-						// Need to add support for proper globbing one day
-						(ctx.endsWith("*") && file.startsWith(ctx.slice(0, -1))) ||
-						(ctx.startsWith("*") && file.endsWith(ctx.slice(1)))
-					);
-				});
-			});
+      // Filter out the files that the user has already input in the current edit buffer
+      files = files.filter((item) => {
+        const file = item.file.replace(/^"|"$/g, "");
+        return !context.some((ctx) => {
+          return (
+            ctx === file ||
+            // Need to add support for proper globbing one day
+            (ctx.endsWith("*") && file.startsWith(ctx.slice(0, -1))) ||
+            (ctx.startsWith("*") && file.endsWith(ctx.slice(1)))
+          );
+        });
+      });
 
-			return [
-				...dirArr.map((name) => {
-					return {
-						name: name + "*",
-						description: "Wildcard",
-						icon: "fig://icon?type=asterisk",
-					};
-				}),
-				...files.map((item) => {
-					const file = item.file.replace(/^"|"$/g, "");
-					let ext = "";
-					try {
-						ext = file.split(".").slice(-1)[0];
-					} catch (e) { }
+      return [
+        ...dirArr.map((name) => {
+          return {
+            name: name + "*",
+            description: "Wildcard",
+            icon: "fig://icon?type=asterisk",
+          };
+        }),
+        ...files.map((item) => {
+          const file = item.file.replace(/^"|"$/g, "");
+          let ext = "";
+          try {
+            ext = file.split(".").slice(-1)[0];
+          } catch (e) {}
 
-					if (file.endsWith("/")) {
-						ext = "folder";
-					}
+          if (file.endsWith("/")) {
+            ext = "folder";
+          }
 
-					// If the current file is already added
-					// we want to lower the priority
-					const priority = item.alreadyAdded ? 50 : 100;
-					return {
-						name: file,
-						icon: `fig://icon?type=${ext}&color=ff0000&badge=${item.working}`,
-						description: "Changed file",
-						priority,
-					};
-				}),
-			];
-		},
-	},
+          // If the current file is already added
+          // we want to lower the priority
+          const priority = item.alreadyAdded ? 50 : 100;
+          return {
+            name: file,
+            icon: `fig://icon?type=${ext}&color=ff0000&badge=${item.working}`,
+            description: "Changed file",
+            priority,
+          };
+        }),
+      ];
+    },
+  },
 
-	getStagedFiles: {
-		script: [
-			"bash",
-			"-c",
-			"git --no-optional-locks status --short | sed -ne '/^M /p' -e '/A /p'",
-		],
-		postProcess: postProcessTrackedFiles,
-	},
+  getStagedFiles: {
+    script: [
+      "bash",
+      "-c",
+      "git --no-optional-locks status --short | sed -ne '/^M /p' -e '/A /p'",
+    ],
+    postProcess: postProcessTrackedFiles,
+  },
 
-	getUnstagedFiles: {
-		script: ["git", "--no-optional-locks", "diff", "--name-only"],
-		splitOn: "\n",
-	},
+  getUnstagedFiles: {
+    script: ["git", "--no-optional-locks", "diff", "--name-only"],
+    splitOn: "\n",
+  },
 
-	getChangedTrackedFiles: {
-		script: function (context) {
-			if (context.includes("--staged") || context.includes("--cached")) {
-				return [
-					"bash",
-					"-c",
-					`git --no-optional-locks status --short | sed -ne '/^M /p' -e '/A /p'`,
-				];
-			} else {
-				return [
-					"bash",
-					"-c",
-					`git --no-optional-locks status --short | sed -ne '/M /p' -e '/A /p'`,
-				];
-			}
-		},
-		postProcess: postProcessTrackedFiles,
-	},
+  getChangedTrackedFiles: {
+    script: function (context) {
+      if (context.includes("--staged") || context.includes("--cached")) {
+        return [
+          "bash",
+          "-c",
+          `git --no-optional-locks status --short | sed -ne '/^M /p' -e '/A /p'`,
+        ];
+      } else {
+        return [
+          "bash",
+          "-c",
+          `git --no-optional-locks status --short | sed -ne '/M /p' -e '/A /p'`,
+        ];
+      }
+    },
+    postProcess: postProcessTrackedFiles,
+  },
 };
 
 const configSuggestions: Fig.Suggestion[] = [
-	{
-		name: "add.ignore-errors",
-		description:
-			"Tells 'git add' to continue adding files when some files cannot be added due to indexing errors. Equivalent to the `--ignore-errors` option of git-add[1]. `add.ignore-errors` is deprecated, as it does not follow the usual naming convention for configuration variables",
-		deprecated: true,
-		hidden: true,
-	},
-	{
-		name: "add.interactive.useBuiltin",
-		description:
-			"Set to `false` to fall back to the original Perl implementation of the interactive version of git-add[1] instead of the built-in version. Is `true` by default",
-	},
-	{
-		name: "advice.addEmbeddedRepo",
-		description:
-			"Advice on what to do when you've accidentally added one git repo inside of another",
-	},
-	{
-		name: "advice.addEmptyPathspec",
-		description:
-			"Advice shown if a user runs the add command without providing the pathspec parameter",
-	},
-	{
-		name: "advice.addIgnoredFile",
-		description:
-			"Advice shown if a user attempts to add an ignored file to the index",
-	},
-	{
-		name: "advice.ambiguousFetchRefspec",
-		description:
-			"Advice shown when fetch refspec for multiple remotes map to the same remote-tracking branch namespace and causes branch tracking set-up to fail",
-	},
-	{
-		name: "advice.amWorkDir",
-		description:
-			"Advice that shows the location of the patch file when git-am[1] fails to apply it",
-	},
-	{
-		name: "advice.checkoutAmbiguousRemoteBranchName",
-		description:
-			"Advice shown when the argument to git-checkout[1] and git-switch[1] ambiguously resolves to a remote tracking branch on more than one remote in situations where an unambiguous argument would have otherwise caused a remote-tracking branch to be checked out. See the `checkout.defaultRemote` configuration variable for how to set a given remote to used by default in some situations where this advice would be printed",
-	},
-	{
-		name: "advice.commitBeforeMerge",
-		description:
-			"Advice shown when git-merge[1] refuses to merge to avoid overwriting local changes",
-	},
-	{
-		name: "advice.detachedHead",
-		description:
-			"Advice shown when you used git-switch[1] or git-checkout[1] to move to the detach HEAD state, to instruct how to create a local branch after the fact",
-	},
-	{
-		name: "advice.fetchShowForcedUpdates",
-		description:
-			"Advice shown when git-fetch[1] takes a long time to calculate forced updates after ref updates, or to warn that the check is disabled",
-	},
-	{
-		name: "advice.ignoredHook",
-		description:
-			"Advice shown if a hook is ignored because the hook is not set as executable",
-	},
-	{
-		name: "advice.implicitIdentity",
-		description:
-			"Advice on how to set your identity configuration when your information is guessed from the system username and domain name",
-	},
-	{
-		name: "advice.nestedTag",
-		description:
-			"Advice shown if a user attempts to recursively tag a tag object",
-	},
-	{
-		name: "advice.pushAlreadyExists",
-		description:
-			"Shown when git-push[1] rejects an update that does not qualify for fast-forwarding (e.g., a tag.)",
-	},
-	{
-		name: "advice.pushFetchFirst",
-		description:
-			"Shown when git-push[1] rejects an update that tries to overwrite a remote ref that points at an object we do not have",
-	},
-	{
-		name: "advice.pushNeedsForce",
-		description:
-			"Shown when git-push[1] rejects an update that tries to overwrite a remote ref that points at an object that is not a commit-ish, or make the remote ref point at an object that is not a commit-ish",
-	},
-	{
-		name: "advice.pushNonFFCurrent",
-		description:
-			"Advice shown when git-push[1] fails due to a non-fast-forward update to the current branch",
-	},
-	{
-		name: "advice.pushNonFFMatching",
-		description:
-			"Advice shown when you ran git-push[1] and pushed 'matching refs' explicitly (i.e. you used ':', or specified a refspec that isn't your current branch) and it resulted in a non-fast-forward error",
-	},
-	{
-		name: "advice.pushRefNeedsUpdate",
-		description:
-			"Shown when git-push[1] rejects a forced update of a branch when its remote-tracking ref has updates that we do not have locally",
-	},
-	{
-		name: "advice.pushUnqualifiedRefname",
-		description:
-			"Shown when git-push[1] gives up trying to guess based on the source and destination refs what remote ref namespace the source belongs in, but where we can still suggest that the user push to either refs/heads/* or refs/tags/* based on the type of the source object",
-	},
-	{
-		name: "advice.pushUpdateRejected",
-		description:
-			"Set this variable to 'false' if you want to disable 'pushNonFFCurrent', 'pushNonFFMatching', 'pushAlreadyExists', 'pushFetchFirst', 'pushNeedsForce', and 'pushRefNeedsUpdate' simultaneously",
-	},
-	{
-		name: "advice.resetNoRefresh",
-		description:
-			"Advice to consider using the `--no-refresh` option to git-reset[1] when the command takes more than 2 seconds to refresh the index after reset",
-	},
-	{
-		name: "advice.resolveConflict",
-		description:
-			"Advice shown by various commands when conflicts prevent the operation from being performed",
-	},
-	{
-		name: "advice.rmHints",
-		description:
-			"In case of failure in the output of git-rm[1], show directions on how to proceed from the current state",
-	},
-	{
-		name: "advice.sequencerInUse",
-		description: "Advice shown when a sequencer command is already in progress",
-	},
-	{
-		name: "advice.skippedCherryPicks",
-		description:
-			"Shown when git-rebase[1] skips a commit that has already been cherry-picked onto the upstream branch",
-	},
-	{
-		name: "advice.statusAheadBehind",
-		description:
-			"Shown when git-status[1] computes the ahead/behind counts for a local ref compared to its remote tracking ref, and that calculation takes longer than expected. Will not appear if `status.aheadBehind` is false or the option `--no-ahead-behind` is given",
-	},
-	{
-		name: "advice.statusHints",
-		description:
-			"Show directions on how to proceed from the current state in the output of git-status[1], in the template shown when writing commit messages in git-commit[1], and in the help message shown by git-switch[1] or git-checkout[1] when switching branch",
-	},
-	{
-		name: "advice.statusUoption",
-		description:
-			"Advise to consider using the `-u` option to git-status[1] when the command takes more than 2 seconds to enumerate untracked files",
-	},
-	{
-		name: "advice.submoduleAlternateErrorStrategyDie",
-		description:
-			'Advice shown when a submodule.alternateErrorStrategy option configured to "die" causes a fatal error',
-	},
-	{
-		name: "advice.submodulesNotUpdated",
-		description:
-			"Advice shown when a user runs a submodule command that fails because `git submodule update --init` was not run",
-	},
-	{
-		name: "advice.suggestDetachingHead",
-		description:
-			"Advice shown when git-switch[1] refuses to detach HEAD without the explicit `--detach` option",
-	},
-	{
-		name: "advice.updateSparsePath",
-		description:
-			"Advice shown when either git-add[1] or git-rm[1] is asked to update index entries outside the current sparse checkout",
-	},
-	{
-		name: "advice.waitingForEditor",
-		description:
-			"Print a message to the terminal whenever Git is waiting for editor input from the user",
-	},
-	{
-		name: "alias.*",
-		insertValue: "alias.{cursor}",
-		description:
-			"Command aliases for the git[1] command wrapper - e.g. after defining `alias.last = cat-file commit HEAD`, the invocation `git last` is equivalent to `git cat-file commit HEAD`. To avoid confusion and troubles with script usage, aliases that hide existing Git commands are ignored. Arguments are split by spaces, the usual shell quoting and escaping is supported. A quote pair or a backslash can be used to quote them",
-	},
-	{
-		name: "am.keepcr",
-		description:
-			"If true, git-am will call git-mailsplit for patches in mbox format with parameter `--keep-cr`. In this case git-mailsplit will not remove `\\r` from lines ending with `\\r\\n`. Can be overridden by giving `--no-keep-cr` from the command line. See git-am[1], git-mailsplit[1]",
-	},
-	{
-		name: "am.threeWay",
-		description:
-			"By default, `git am` will fail if the patch does not apply cleanly. When set to true, this setting tells `git am` to fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally (equivalent to giving the `--3way` option from the command line). Defaults to `false`. See git-am[1]",
-	},
-	{
-		name: "apply.ignoreWhitespace",
-		description:
-			"When set to 'change', tells 'git apply' to ignore changes in whitespace, in the same way as the `--ignore-space-change` option. When set to one of: no, none, never, false tells 'git apply' to respect all whitespace differences. See git-apply[1]",
-	},
-	{
-		name: "apply.whitespace",
-		description:
-			"Tells 'git apply' how to handle whitespaces, in the same way as the `--whitespace` option. See git-apply[1]",
-	},
-	{
-		name: "blame.blankBoundary",
-		description:
-			"Show blank commit object name for boundary commits in git-blame[1]. This option defaults to false",
-	},
-	{
-		name: "blame.coloring",
-		description:
-			"This determines the coloring scheme to be applied to blame output. It can be 'repeatedLines', 'highlightRecent', or 'none' which is the default",
-	},
-	{
-		name: "blame.date",
-		description:
-			"Specifies the format used to output dates in git-blame[1]. If unset the iso format is used. For supported values, see the discussion of the `--date` option at git-log[1]",
-	},
-	{
-		name: "blame.ignoreRevsFile",
-		description:
-			"Ignore revisions listed in the file, one unabbreviated object name per line, in git-blame[1]. Whitespace and comments beginning with `#` are ignored. This option may be repeated multiple times. Empty file names will reset the list of ignored revisions. This option will be handled before the command line option `--ignore-revs-file`",
-	},
-	{
-		name: "blame.markIgnoredLines",
-		description:
-			"Mark lines that were changed by an ignored revision that we attributed to another commit with a '?' in the output of git-blame[1]",
-	},
-	{
-		name: "blame.markUnblamableLines",
-		description:
-			"Mark lines that were changed by an ignored revision that we could not attribute to another commit with a '*' in the output of git-blame[1]",
-	},
-	{
-		name: "blame.showEmail",
-		description:
-			"Show the author email instead of author name in git-blame[1]. This option defaults to false",
-	},
-	{
-		name: "blame.showRoot",
-		description:
-			"Do not treat root commits as boundaries in git-blame[1]. This option defaults to false",
-	},
-	{
-		name: "branch.<name>.description",
-		insertValue: "branch.{cursor}.description",
-		description:
-			"Branch description, can be edited with `git branch --edit-description`. Branch description is automatically added in the format-patch cover letter or request-pull summary",
-	},
-	{
-		name: "branch.<name>.merge",
-		insertValue: "branch.{cursor}.merge",
-		description:
-			"Defines, together with branch.<name>.remote, the upstream branch for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which branch to merge and can also affect 'git push' (see push.default). When in branch <name>, it tells 'git fetch' the default refspec to be marked for merging in FETCH_HEAD. The value is handled like the remote part of a refspec, and must match a ref which is fetched from the remote given by \"branch.<name>.remote\". The merge information is used by 'git pull' (which at first calls 'git fetch') to lookup the default branch for merging. Without this option, 'git pull' defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. If you wish to setup 'git pull' so that it merges into <name> from another branch in the local repository, you can point branch.<name>.merge to the desired branch, and use the relative path setting `.` (a period) for branch.<name>.remote",
-	},
-	{
-		name: "branch.<name>.mergeOptions",
-		insertValue: "branch.{cursor}.mergeOptions",
-		description:
-			"Sets default options for merging into branch <name>. The syntax and supported options are the same as those of git-merge[1], but option values containing whitespace characters are currently not supported",
-	},
-	{
-		name: "branch.<name>.pushRemote",
-		insertValue: "branch.{cursor}.pushRemote",
-		description:
-			"When on branch <name>, it overrides `branch.<name>.remote` for pushing. It also overrides `remote.pushDefault` for pushing from branch <name>. When you pull from one place (e.g. your upstream) and push to another place (e.g. your own publishing repository), you would want to set `remote.pushDefault` to specify the remote to push to for all branches, and use this option to override it for a specific branch",
-	},
-	{
-		name: "branch.<name>.rebase",
-		insertValue: "branch.{cursor}.rebase",
-		description:
-			'When true, rebase the branch <name> on top of the fetched branch, instead of merging the default branch from the default remote when "git pull" is run. See "pull.rebase" for doing this in a non branch-specific manner',
-	},
-	{
-		name: "branch.<name>.remote",
-		insertValue: "branch.{cursor}.remote",
-		description:
-			"When on branch <name>, it tells 'git fetch' and 'git push' which remote to fetch from/push to. The remote to push to may be overridden with `remote.pushDefault` (for all branches). The remote to push to, for the current branch, may be further overridden by `branch.<name>.pushRemote`. If no remote is configured, or if you are not on any branch and there is more than one remote defined in the repository, it defaults to `origin` for fetching and `remote.pushDefault` for pushing. Additionally, `.` (a period) is the current local repository (a dot-repository), see `branch.<name>.merge`'s final note below",
-	},
-	{
-		name: "branch.autoSetupMerge",
-		description:
-			"Tells 'git branch', 'git switch' and 'git checkout' to set up new branches so that git-pull[1] will appropriately merge from the starting point branch. Note that even if this option is not set, this behavior can be chosen per-branch using the `--track` and `--no-track` options. The valid settings are: `false` -- no automatic setup is done; `true` -- automatic setup is done when the starting point is a remote-tracking branch; `always` -- automatic setup is done when the starting point is either a local branch or remote-tracking branch; `inherit` -- if the starting point has a tracking configuration, it is copied to the new branch; `simple` -- automatic setup is done only when the starting point is a remote-tracking branch and the new branch has the same name as the remote branch. This option defaults to true",
-	},
-	{
-		name: "branch.autoSetupRebase",
-		description:
-			"When a new branch is created with 'git branch', 'git switch' or 'git checkout' that tracks another branch, this variable tells Git to set up pull to rebase instead of merge (see \"branch.<name>.rebase\"). When `never`, rebase is never automatically set to true. When `local`, rebase is set to true for tracked branches of other local branches. When `remote`, rebase is set to true for tracked branches of remote-tracking branches. When `always`, rebase will be set to true for all tracking branches. See \"branch.autoSetupMerge\" for details on how to set up a branch to track another branch. This option defaults to never",
-	},
-	{
-		name: "branch.sort",
-		description:
-			'This variable controls the sort ordering of branches when displayed by git-branch[1]. Without the "--sort=<value>" option provided, the value of this variable will be used as the default. See git-for-each-ref[1] field names for valid values',
-	},
-	{
-		name: "browser.<tool>.cmd",
-		insertValue: "browser.{cursor}.cmd",
-		description:
-			"Specify the command to invoke the specified browser. The specified command is evaluated in shell with the URLs passed as arguments. (See git-web{litdd}browse[1].)",
-	},
-	{
-		name: "browser.<tool>.path",
-		insertValue: "browser.{cursor}.path",
-		description:
-			"Override the path for the given tool that may be used to browse HTML help (see `-w` option in git-help[1]) or a working repository in gitweb (see git-instaweb[1])",
-	},
-	{
-		name: "checkout.defaultRemote",
-		description:
-			"When you run `git checkout <something>` or `git switch <something>` and only have one remote, it may implicitly fall back on checking out and tracking e.g. `origin/<something>`. This stops working as soon as you have more than one remote with a `<something>` reference. This setting allows for setting the name of a preferred remote that should always win when it comes to disambiguation. The typical use-case is to set this to `origin`",
-	},
-	{
-		name: "checkout.guess",
-		description:
-			"Provides the default value for the `--guess` or `--no-guess` option in `git checkout` and `git switch`. See git-switch[1] and git-checkout[1]",
-	},
-	{
-		name: "checkout.thresholdForParallelism",
-		description:
-			"When running parallel checkout with a small number of files, the cost of subprocess spawning and inter-process communication might outweigh the parallelization gains. This setting allows to define the minimum number of files for which parallel checkout should be attempted. The default is 100",
-	},
-	{
-		name: "checkout.workers",
-		description:
-			"The number of parallel workers to use when updating the working tree. The default is one, i.e. sequential execution. If set to a value less than one, Git will use as many workers as the number of logical cores available. This setting and `checkout.thresholdForParallelism` affect all commands that perform checkout. E.g. checkout, clone, reset, sparse-checkout, etc",
-	},
-	{
-		name: "clean.requireForce",
-		description:
-			"A boolean to make git-clean do nothing unless given -f, -i or -n. Defaults to true",
-	},
-	{
-		name: "clone.defaultRemoteName",
-		description:
-			"The name of the remote to create when cloning a repository. Defaults to `origin`, and can be overridden by passing the `--origin` command-line option to git-clone[1]",
-	},
-	{
-		name: "clone.filterSubmodules",
-		description:
-			"If a partial clone filter is provided (see `--filter` in git-rev-list[1]) and `--recurse-submodules` is used, also apply the filter to submodules",
-	},
-	{
-		name: "clone.rejectShallow",
-		description:
-			"Reject to clone a repository if it is a shallow one, can be overridden by passing option `--reject-shallow` in command line. See git-clone[1]",
-	},
-	{
-		name: "color.advice",
-		description:
-			"A boolean to enable/disable color in hints (e.g. when a push failed, see `advice.*` for a list). May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the error output goes to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
-	},
-	{
-		name: "color.advice.hint",
-		description: "Use customized color for hints",
-	},
-	{
-		name: "color.blame.highlightRecent",
-		description:
-			"Specify the line annotation color for `git blame --color-by-age` depending upon the age of the line",
-	},
-	{
-		name: "color.blame.repeatedLines",
-		description:
-			"Use the specified color to colorize line annotations for `git blame --color-lines`, if they come from the same commit as the preceding line. Defaults to cyan",
-	},
-	{
-		name: "color.branch",
-		description:
-			"A boolean to enable/disable color in the output of git-branch[1]. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the output is to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
-	},
-	{
-		name: "color.branch.<slot>",
-		insertValue: "color.branch.{cursor}",
-		description:
-			"Use customized color for branch coloration. `<slot>` is one of `current` (the current branch), `local` (a local branch), `remote` (a remote-tracking branch in refs/remotes/), `upstream` (upstream tracking branch), `plain` (other refs)",
-	},
-	{
-		name: "color.decorate.<slot>",
-		insertValue: "color.decorate.{cursor}",
-		description:
-			"Use customized color for 'git log --decorate' output. `<slot>` is one of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local branches, remote-tracking branches, tags, stash and HEAD, respectively and `grafted` for grafted commits",
-	},
-	{
-		name: "color.diff",
-		description:
-			"Whether to use ANSI escape sequences to add color to patches. If this is set to `always`, git-diff[1], git-log[1], and git-show[1] will use color for all patches. If it is set to `true` or `auto`, those commands will only use color when output is to the terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
-	},
-	{
-		name: "color.diff.<slot>",
-		insertValue: "color.diff.{cursor}",
-		description:
-			"Use customized color for diff colorization. `<slot>` specifies which part of the patch to use the specified color, and is one of `context` (context text - `plain` is a historical synonym), `meta` (metainformation), `frag` (hunk header), 'func' (function in hunk header), `old` (removed lines), `new` (added lines), `commit` (commit headers), `whitespace` (highlighting whitespace errors), `oldMoved` (deleted lines), `newMoved` (added lines), `oldMovedDimmed`, `oldMovedAlternative`, `oldMovedAlternativeDimmed`, `newMovedDimmed`, `newMovedAlternative` `newMovedAlternativeDimmed` (See the '<mode>' setting of '--color-moved' in git-diff[1] for details), `contextDimmed`, `oldDimmed`, `newDimmed`, `contextBold`, `oldBold`, and `newBold` (see git-range-diff[1] for details)",
-	},
-	{
-		name: "color.grep",
-		description:
-			"When set to `always`, always highlight matches. When `false` (or `never`), never. When set to `true` or `auto`, use color only when the output is written to the terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
-	},
-	{
-		name: "color.grep.<slot>",
-		insertValue: "color.grep.{cursor}",
-		description:
-			"Use customized color for grep colorization. `<slot>` specifies which part of the line to use the specified color, and is one of",
-	},
-	{
-		name: "color.interactive",
-		description:
-			'When set to `always`, always use colors for interactive prompts and displays (such as those used by "git-add --interactive" and "git-clean --interactive"). When false (or `never`), never. When set to `true` or `auto`, use colors only when the output is to the terminal. If unset, then the value of `color.ui` is used (`auto` by default)',
-	},
-	{
-		name: "color.interactive.<slot>",
-		insertValue: "color.interactive.{cursor}",
-		description:
-			"Use customized color for 'git add --interactive' and 'git clean --interactive' output. `<slot>` may be `prompt`, `header`, `help` or `error`, for four distinct types of normal output from interactive commands",
-	},
-	{
-		name: "color.pager",
-		description:
-			"A boolean to specify whether `auto` color modes should colorize output going to the pager. Defaults to true; set this to false if your pager does not understand ANSI color codes",
-	},
-	{
-		name: "color.push",
-		description:
-			"A boolean to enable/disable color in push errors. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the error output goes to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
-	},
-	{
-		name: "color.push.error",
-		description: "Use customized color for push errors",
-	},
-	{
-		name: "color.remote",
-		description:
-			'If set, keywords at the start of the line are highlighted. The keywords are "error", "warning", "hint" and "success", and are matched case-insensitively. May be set to `always`, `false` (or `never`) or `auto` (or `true`). If unset, then the value of `color.ui` is used (`auto` by default)',
-	},
-	{
-		name: "color.remote.<slot>",
-		insertValue: "color.remote.{cursor}",
-		description:
-			"Use customized color for each remote keyword. `<slot>` may be `hint`, `warning`, `success` or `error` which match the corresponding keyword",
-	},
-	{
-		name: "color.showBranch",
-		description:
-			"A boolean to enable/disable color in the output of git-show-branch[1]. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the output is to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
-	},
-	{
-		name: "color.status",
-		description:
-			"A boolean to enable/disable color in the output of git-status[1]. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the output is to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
-	},
-	{
-		name: "color.status.<slot>",
-		insertValue: "color.status.{cursor}",
-		description:
-			"Use customized color for status colorization. `<slot>` is one of `header` (the header text of the status message), `added` or `updated` (files which are added but not committed), `changed` (files which are changed but not added in the index), `untracked` (files which are not tracked by Git), `branch` (the current branch), `nobranch` (the color the 'no branch' warning is shown in, defaulting to red), `localBranch` or `remoteBranch` (the local and remote branch names, respectively, when branch and tracking information is displayed in the status short-format), or `unmerged` (files which have unmerged changes)",
-	},
-	{
-		name: "color.transport",
-		description:
-			"A boolean to enable/disable color when pushes are rejected. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the error output goes to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
-	},
-	{
-		name: "color.transport.rejected",
-		description: "Use customized color when a push was rejected",
-	},
-	{
-		name: "color.ui",
-		description:
-			"This variable determines the default value for variables such as `color.diff` and `color.grep` that control the use of color per command family. Its scope will expand as more commands learn configuration to set a default for the `--color` option. Set it to `false` or `never` if you prefer Git commands not to use color unless enabled explicitly with some other configuration or the `--color` option. Set it to `always` if you want all output not intended for machine consumption to use color, to `true` or `auto` (this is the default since Git 1.8.4) if you want such output to use color when written to the terminal",
-	},
-	{
-		name: "column.branch",
-		description:
-			"Specify whether to output branch listing in `git branch` in columns. See `column.ui` for details",
-	},
-	{
-		name: "column.clean",
-		description:
-			"Specify the layout when list items in `git clean -i`, which always shows files and directories in columns. See `column.ui` for details",
-	},
-	{
-		name: "column.status",
-		description:
-			"Specify whether to output untracked files in `git status` in columns. See `column.ui` for details",
-	},
-	{
-		name: "column.tag",
-		description:
-			"Specify whether to output tag listing in `git tag` in columns. See `column.ui` for details",
-	},
-	{
-		name: "column.ui",
-		description:
-			"Specify whether supported commands should output in columns. This variable consists of a list of tokens separated by spaces or commas:",
-	},
-	{
-		name: "commit.cleanup",
-		description:
-			"This setting overrides the default of the `--cleanup` option in `git commit`. See git-commit[1] for details. Changing the default can be useful when you always want to keep lines that begin with comment character `#` in your log message, in which case you would do `git config commit.cleanup whitespace` (note that you will have to remove the help lines that begin with `#` in the commit log template yourself, if you do this)",
-	},
-	{
-		name: "commit.status",
-		description:
-			"A boolean to enable/disable inclusion of status information in the commit message template when using an editor to prepare the commit message. Defaults to true",
-	},
-	{
-		name: "commit.template",
-		description:
-			"Specify the pathname of a file to use as the template for new commit messages",
-	},
-	{
-		name: "commit.verbose",
-		description:
-			"A boolean or int to specify the level of verbose with `git commit`. See git-commit[1]",
-	},
-	{
-		name: "commitGraph.generationVersion",
-		description:
-			"Specifies the type of generation number version to use when writing or reading the commit-graph file. If version 1 is specified, then the corrected commit dates will not be written or read. Defaults to 2",
-	},
-	{
-		name: "commitGraph.maxNewFilters",
-		description:
-			"Specifies the default value for the `--max-new-filters` option of `git commit-graph write` (c.f., git-commit-graph[1])",
-	},
-	{
-		name: "commitGraph.readChangedPaths",
-		description:
-			"If true, then git will use the changed-path Bloom filters in the commit-graph file (if it exists, and they are present). Defaults to true. See git-commit-graph[1] for more information",
-	},
-	{
-		name: "committer.email",
-		description:
-			"The `user.name` and `user.email` variables determine what ends up in the `author` and `committer` field of commit objects. If you need the `author` or `committer` to be different, the `author.name`, `author.email`, `committer.name` or `committer.email` variables can be set. Also, all of these can be overridden by the `GIT_AUTHOR_NAME`, `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_NAME`, `GIT_COMMITTER_EMAIL` and `EMAIL` environment variables",
-	},
-	{
-		name: "completion.commands",
-		description:
-			"This is only used by git-completion.bash to add or remove commands from the list of completed commands. Normally only porcelain commands and a few select others are completed. You can add more commands, separated by space, in this variable. Prefixing the command with '-' will remove it from the existing list",
-	},
-	{
-		name: "core.abbrev",
-		description:
-			'Set the length object names are abbreviated to. If unspecified or set to "auto", an appropriate value is computed based on the approximate number of packed objects in your repository, which hopefully is enough for abbreviated object names to stay unique for some time. If set to "no", no abbreviation is made and the object names are shown in their full length. The minimum length is 4',
-	},
-	{
-		name: "core.alternateRefsCommand",
-		description:
-			"When advertising tips of available history from an alternate, use the shell to execute the specified command instead of git-for-each-ref[1]. The first argument is the absolute path of the alternate. Output must contain one hex object id per line (i.e., the same as produced by `git for-each-ref --format='%(objectname)'`)",
-	},
-	{
-		name: "core.alternateRefsPrefixes",
-		description:
-			"When listing references from an alternate, list only references that begin with the given prefix. Prefixes match as if they were given as arguments to git-for-each-ref[1]. To list multiple prefixes, separate them with whitespace. If `core.alternateRefsCommand` is set, setting `core.alternateRefsPrefixes` has no effect",
-	},
-	{
-		name: "core.askPass",
-		description:
-			"Some commands (e.g. svn and http interfaces) that interactively ask for a password can be told to use an external program given via the value of this variable. Can be overridden by the `GIT_ASKPASS` environment variable. If not set, fall back to the value of the `SSH_ASKPASS` environment variable or, failing that, a simple password prompt. The external program shall be given a suitable prompt as command-line argument and write the password on its STDOUT",
-	},
-	{
-		name: "core.attributesFile",
-		description:
-			"In addition to `.gitattributes` (per-directory) and `.git/info/attributes`, Git looks into this file for attributes (see gitattributes[5]). Path expansions are made the same way as for `core.excludesFile`. Its default value is `$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either not set or empty, `$HOME/.config/git/attributes` is used instead",
-	},
-	{
-		name: "core.autocrlf",
-		description:
-			'Setting this variable to "true" is the same as setting the `text` attribute to "auto" on all files and core.eol to "crlf". Set to true if you want to have `CRLF` line endings in your working directory and the repository has LF line endings. This variable can be set to \'input\', in which case no output conversion is performed',
-	},
-	{
-		name: "core.bare",
-		description:
-			"If true this repository is assumed to be 'bare' and has no working directory associated with it. If this is the case a number of commands that require a working directory will be disabled, such as git-add[1] or git-merge[1]",
-	},
-	{
-		name: "core.bigFileThreshold",
-		description:
-			"The size of files considered \"big\", which as discussed below changes the behavior of numerous git commands, as well as how such files are stored within the repository. The default is 512 MiB. Common unit suffixes of 'k', 'm', or 'g' are supported",
-	},
-	{
-		name: "core.checkRoundtripEncoding",
-		description:
-			"A comma and/or whitespace separated list of encodings that Git performs UTF-8 round trip checks on if they are used in an `working-tree-encoding` attribute (see gitattributes[5]). The default value is `SHIFT-JIS`",
-	},
-	{
-		name: "core.checkStat",
-		description:
-			"When missing or is set to `default`, many fields in the stat structure are checked to detect if a file has been modified since Git looked at it. When this configuration variable is set to `minimal`, sub-second part of mtime and ctime, the uid and gid of the owner of the file, the inode number (and the device number, if Git was compiled to use it), are excluded from the check among these fields, leaving only the whole-second part of mtime (and ctime, if `core.trustCtime` is set) and the filesize to be checked",
-	},
-	{
-		name: "core.commentChar",
-		description:
-			"Commands such as `commit` and `tag` that let you edit messages consider a line that begins with this character commented, and removes them after the editor returns (default '#')",
-	},
-	{
-		name: "core.commitGraph",
-		description:
-			"If true, then git will read the commit-graph file (if it exists) to parse the graph structure of commits. Defaults to true. See git-commit-graph[1] for more information",
-	},
-	{
-		name: "core.compression",
-		description:
-			"An integer -1..9, indicating a default compression level. -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If set, this provides a default to other compression variables, such as `core.looseCompression` and `pack.compression`",
-	},
-	{
-		name: "core.createObject",
-		description:
-			"You can set this to 'link', in which case a hardlink followed by a delete of the source are used to make sure that object creation will not overwrite existing objects",
-	},
-	{
-		name: "core.deltaBaseCacheLimit",
-		description:
-			"Maximum number of bytes per thread to reserve for caching base objects that may be referenced by multiple deltified objects. By storing the entire decompressed base objects in a cache Git is able to avoid unpacking and decompressing frequently used base objects multiple times",
-	},
-	{
-		name: "core.editor",
-		description:
-			"Commands such as `commit` and `tag` that let you edit messages by launching an editor use the value of this variable when it is set, and the environment variable `GIT_EDITOR` is not set. See git-var[1]",
-	},
-	{
-		name: "core.eol",
-		description:
-			"Sets the line ending type to use in the working directory for files that are marked as text (either by having the `text` attribute set, or by having `text=auto` and Git auto-detecting the contents as text). Alternatives are 'lf', 'crlf' and 'native', which uses the platform's native line ending. The default value is `native`. See gitattributes[5] for more information on end-of-line conversion. Note that this value is ignored if `core.autocrlf` is set to `true` or `input`",
-	},
-	{
-		name: "core.excludesFile",
-		description:
-			"Specifies the pathname to the file that contains patterns to describe paths that are not meant to be tracked, in addition to `.gitignore` (per-directory) and `.git/info/exclude`. Defaults to `$XDG_CONFIG_HOME/git/ignore`. If `$XDG_CONFIG_HOME` is either not set or empty, `$HOME/.config/git/ignore` is used instead. See gitignore[5]",
-	},
-	{
-		name: "core.fileMode",
-		description:
-			"Tells Git if the executable bit of files in the working tree is to be honored",
-	},
-	{
-		name: "core.filesRefLockTimeout",
-		description:
-			"The length of time, in milliseconds, to retry when trying to lock an individual reference. Value 0 means not to retry at all; -1 means to try indefinitely. Default is 100 (i.e., retry for 100ms)",
-	},
-	{
-		name: "core.fsmonitor",
-		description:
-			"If set to true, enable the built-in file system monitor daemon for this working directory (git-fsmonitor{litdd}daemon[1])",
-	},
-	{
-		name: "core.fsmonitorHookVersion",
-		description:
-			'Sets the protocol version to be used when invoking the "fsmonitor" hook',
-	},
-	{
-		name: "core.fsync",
-		description:
-			"A comma-separated list of components of the repository that should be hardened via the core.fsyncMethod when created or modified. You can disable hardening of any component by prefixing it with a '-'. Items that are not hardened may be lost in the event of an unclean system shutdown. Unless you have special requirements, it is recommended that you leave this option empty or pick one of `committed`, `added`, or `all`",
-	},
-	{
-		name: "core.fsyncMethod",
-		description:
-			"A value indicating the strategy Git will use to harden repository data using fsync and related primitives",
-	},
-	{
-		name: "core.fsyncObjectFiles",
-		description:
-			"This boolean will enable 'fsync()' when writing object files. This setting is deprecated. Use core.fsync instead",
-	},
-	{
-		name: "core.gitProxy",
-		description:
-			'A "proxy command" to execute (as \'command host port\') instead of establishing direct connection to the remote server when using the Git protocol for fetching. If the variable value is in the "COMMAND for DOMAIN" format, the command is applied only on hostnames ending with the specified domain string. This variable may be set multiple times and is matched in the given order; the first match wins',
-	},
-	{
-		name: "core.hideDotFiles",
-		description:
-			"(Windows-only) If true, mark newly-created directories and files whose name starts with a dot as hidden. If 'dotGitOnly', only the `.git/` directory is hidden, but no other files starting with a dot. The default mode is 'dotGitOnly'",
-	},
-	{
-		name: "core.hooksPath",
-		description:
-			"By default Git will look for your hooks in the `$GIT_DIR/hooks` directory. Set this to different path, e.g. `/etc/git/hooks`, and Git will try to find your hooks in that directory, e.g. `/etc/git/hooks/pre-receive` instead of in `$GIT_DIR/hooks/pre-receive`",
-	},
-	{
-		name: "core.ignoreCase",
-		description:
-			'Internal variable which enables various workarounds to enable Git to work better on filesystems that are not case sensitive, like APFS, HFS+, FAT, NTFS, etc. For example, if a directory listing finds "makefile" when Git expects "Makefile", Git will assume it is really the same file, and continue to remember it as "Makefile"',
-	},
-	{
-		name: "core.ignoreStat",
-		description:
-			'If true, Git will avoid using lstat() calls to detect if files have changed by setting the "assume-unchanged" bit for those tracked files which it has updated identically in both the index and working tree',
-	},
-	{
-		name: "core.logAllRefUpdates",
-		description:
-			'Enable the reflog. Updates to a ref <ref> is logged to the file "`$GIT_DIR/logs/<ref>`", by appending the new and old SHA-1, the date/time and the reason of the update, but only when the file exists. If this configuration variable is set to `true`, missing "`$GIT_DIR/logs/<ref>`" file is automatically created for branch heads (i.e. under `refs/heads/`), remote refs (i.e. under `refs/remotes/`), note refs (i.e. under `refs/notes/`), and the symbolic ref `HEAD`. If it is set to `always`, then a missing reflog is automatically created for any ref under `refs/`',
-	},
-	{
-		name: "core.looseCompression",
-		description:
-			"An integer -1..9, indicating the compression level for objects that are not in a pack file. -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If not set, defaults to core.compression. If that is not set, defaults to 1 (best speed)",
-	},
-	{
-		name: "core.multiPackIndex",
-		description:
-			"Use the multi-pack-index file to track multiple packfiles using a single index. See git-multi-pack-index[1] for more information. Defaults to true",
-	},
-	{
-		name: "core.notesRef",
-		description:
-			"When showing commit messages, also show notes which are stored in the given ref. The ref must be fully qualified. If the given ref does not exist, it is not an error but means that no notes should be printed",
-	},
-	{
-		name: "core.packedGitLimit",
-		description:
-			"Maximum number of bytes to map simultaneously into memory from pack files. If Git needs to access more than this many bytes at once to complete an operation it will unmap existing regions to reclaim virtual address space within the process",
-	},
-	{
-		name: "core.packedGitWindowSize",
-		description:
-			"Number of bytes of a pack file to map into memory in a single mapping operation. Larger window sizes may allow your system to process a smaller number of large pack files more quickly. Smaller window sizes will negatively affect performance due to increased calls to the operating system's memory manager, but may improve performance when accessing a large number of large pack files",
-	},
-	{
-		name: "core.packedRefsTimeout",
-		description:
-			"The length of time, in milliseconds, to retry when trying to lock the `packed-refs` file. Value 0 means not to retry at all; -1 means to try indefinitely. Default is 1000 (i.e., retry for 1 second)",
-	},
-	{
-		name: "core.pager",
-		description:
-			"Text viewer for use by Git commands (e.g., 'less'). The value is meant to be interpreted by the shell. The order of preference is the `$GIT_PAGER` environment variable, then `core.pager` configuration, then `$PAGER`, and then the default chosen at compile time (usually 'less')",
-	},
-	{
-		name: "core.precomposeUnicode",
-		description:
-			"This option is only used by Mac OS implementation of Git. When core.precomposeUnicode=true, Git reverts the unicode decomposition of filenames done by Mac OS. This is useful when sharing a repository between Mac OS and Linux or Windows. (Git for Windows 1.7.10 or higher is needed, or Git under cygwin 1.7). When false, file names are handled fully transparent by Git, which is backward compatible with older versions of Git",
-	},
-	{
-		name: "core.preferSymlinkRefs",
-		description:
-			'Instead of the default "symref" format for HEAD and other symbolic reference files, use symbolic links. This is sometimes needed to work with old scripts that expect HEAD to be a symbolic link',
-	},
-	{
-		name: "core.preloadIndex",
-		description: "Enable parallel index preload for operations like 'git diff'",
-	},
-	{
-		name: "core.protectHFS",
-		description:
-			"If set to true, do not allow checkout of paths that would be considered equivalent to `.git` on an HFS+ filesystem. Defaults to `true` on Mac OS, and `false` elsewhere",
-	},
-	{
-		name: "core.protectNTFS",
-		description:
-			'If set to true, do not allow checkout of paths that would cause problems with the NTFS filesystem, e.g. conflict with 8.3 "short" names. Defaults to `true` on Windows, and `false` elsewhere',
-	},
-	{
-		name: "core.quotePath",
-		description:
-			'Commands that output paths (e.g. \'ls-files\', \'diff\'), will quote "unusual" characters in the pathname by enclosing the pathname in double-quotes and escaping those characters with backslashes in the same way C escapes control characters (e.g. `\\t` for TAB, `\\n` for LF, `\\\\` for backslash) or bytes with values larger than 0x80 (e.g. octal `\\302\\265` for "micro" in UTF-8). If this variable is set to false, bytes higher than 0x80 are not considered "unusual" any more. Double-quotes, backslash and control characters are always escaped regardless of the setting of this variable. A simple space character is not considered "unusual". Many commands can output pathnames completely verbatim using the `-z` option. The default value is true',
-	},
-	{
-		name: "core.repositoryFormatVersion",
-		description:
-			"Internal variable identifying the repository format and layout version",
-	},
-	{
-		name: "core.restrictinheritedhandles",
-		description:
-			"Windows-only: override whether spawned processes inherit only standard file handles (`stdin`, `stdout` and `stderr`) or all handles. Can be `auto`, `true` or `false`. Defaults to `auto`, which means `true` on Windows 7 and later, and `false` on older Windows versions",
-	},
-	{
-		name: "core.safecrlf",
-		description:
-			'If true, makes Git check if converting `CRLF` is reversible when end-of-line conversion is active. Git will verify if a command modifies a file in the work tree either directly or indirectly. For example, committing a file followed by checking out the same file should yield the original file in the work tree. If this is not the case for the current setting of `core.autocrlf`, Git will reject the file. The variable can be set to "warn", in which case Git will only warn about an irreversible conversion but continue the operation',
-	},
-	{
-		name: "core.sharedRepository",
-		description:
-			"When 'group' (or 'true'), the repository is made shareable between several users in a group (making sure all the files and objects are group-writable). When 'all' (or 'world' or 'everybody'), the repository will be readable by all users, additionally to being group-shareable. When 'umask' (or 'false'), Git will use permissions reported by umask(2). When '0xxx', where '0xxx' is an octal number, files in the repository will have this mode value. '0xxx' will override user's umask value (whereas the other options will only override requested parts of the user's umask value). Examples: '0660' will make the repo read/write-able for the owner and group, but inaccessible to others (equivalent to 'group' unless umask is e.g. '0022'). '0640' is a repository that is group-readable but not group-writable. See git-init[1]. False by default",
-	},
-	{
-		name: "core.sparseCheckout",
-		description:
-			'Enable "sparse checkout" feature. See git-sparse-checkout[1] for more information',
-	},
-	{
-		name: "core.sparseCheckoutCone",
-		description:
-			'Enables the "cone mode" of the sparse checkout feature. When the sparse-checkout file contains a limited set of patterns, this mode provides significant performance advantages. The "non-cone mode" can be requested to allow specifying more flexible patterns by setting this variable to \'false\'. See git-sparse-checkout[1] for more information',
-	},
-	{
-		name: "core.splitIndex",
-		description:
-			"If true, the split-index feature of the index will be used. See git-update-index[1]. False by default",
-	},
-	{
-		name: "core.sshCommand",
-		description:
-			"If this variable is set, `git fetch` and `git push` will use the specified command instead of `ssh` when they need to connect to a remote system. The command is in the same form as the `GIT_SSH_COMMAND` environment variable and is overridden when the environment variable is set",
-	},
-	{
-		name: "core.symlinks",
-		description:
-			"If false, symbolic links are checked out as small plain files that contain the link text. git-update-index[1] and git-add[1] will not change the recorded type to regular file. Useful on filesystems like FAT that do not support symbolic links",
-	},
-	{
-		name: "core.trustctime",
-		description:
-			"If false, the ctime differences between the index and the working tree are ignored; useful when the inode change time is regularly modified by something outside Git (file system crawlers and some backup systems). See git-update-index[1]. True by default",
-	},
-	{
-		name: "core.unsetenvvars",
-		description:
-			"Windows-only: comma-separated list of environment variables' names that need to be unset before spawning any other process. Defaults to `PERL5LIB` to account for the fact that Git for Windows insists on using its own Perl interpreter",
-	},
-	{
-		name: "core.untrackedCache",
-		description:
-			"Determines what to do about the untracked cache feature of the index. It will be kept, if this variable is unset or set to `keep`. It will automatically be added if set to `true`. And it will automatically be removed, if set to `false`. Before setting it to `true`, you should check that mtime is working properly on your system. See git-update-index[1]. `keep` by default, unless `feature.manyFiles` is enabled which sets this setting to `true` by default",
-	},
-	{
-		name: "core.useReplaceRefs",
-		description:
-			"If set to `false`, behave as if the `--no-replace-objects` option was given on the command line. See git[1] and git-replace[1] for more information",
-	},
-	{
-		name: "core.warnAmbiguousRefs",
-		description:
-			"If true, Git will warn you if the ref name you passed it is ambiguous and might match multiple refs in the repository. True by default",
-	},
-	{
-		name: "core.whitespace",
-		description:
-			"A comma separated list of common whitespace problems to notice. 'git diff' will use `color.diff.whitespace` to highlight them, and 'git apply --whitespace=error' will consider them as errors. You can prefix `-` to disable any of them (e.g. `-trailing-space`):",
-	},
-	{
-		name: "core.worktree",
-		description:
-			"Set the path to the root of the working tree. If `GIT_COMMON_DIR` environment variable is set, core.worktree is ignored and not used for determining the root of working tree. This can be overridden by the `GIT_WORK_TREE` environment variable and the `--work-tree` command-line option. The value can be an absolute path or relative to the path to the .git directory, which is either specified by --git-dir or GIT_DIR, or automatically discovered. If --git-dir or GIT_DIR is specified but none of --work-tree, GIT_WORK_TREE and core.worktree is specified, the current working directory is regarded as the top level of your working tree",
-	},
-	{
-		name: "credential.helper",
-		description:
-			"Specify an external helper to be called when a username or password credential is needed; the helper may consult external storage to avoid prompting the user for the credentials. This is normally the name of a credential helper with possible arguments, but may also be an absolute path with arguments or, if preceded by `!`, shell commands",
-	},
-	{
-		name: "credential.useHttpPath",
-		description:
-			'When acquiring credentials, consider the "path" component of an http or https URL to be important. Defaults to false. See gitcredentials[7] for more information',
-	},
-	{
-		name: "credential.username",
-		description:
-			"If no username is set for a network authentication, use this username by default. See credential.<context>.* below, and gitcredentials[7]",
-	},
-	{
-		name: "credentialCache.ignoreSIGHUP",
-		description:
-			"Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting",
-	},
-	{
-		name: "credentialStore.lockTimeoutMS",
-		description:
-			"The length of time, in milliseconds, for git-credential-store to retry when trying to lock the credentials file. Value 0 means not to retry at all; -1 means to try indefinitely. Default is 1000 (i.e., retry for 1s)",
-	},
-	{
-		name: "credential.<url>.helper",
-		insertValue: "credential.{cursor}.helper",
-		description:
-			"Specify an external helper to be called when a username or password credential is needed; the helper may consult external storage to avoid prompting the user for the credentials. This is normally the name of a credential helper with possible arguments, but may also be an absolute path with arguments or, if preceded by `!`, shell commands",
-	},
-	{
-		name: "credential.<url>.useHttpPath",
-		insertValue: "credential.{cursor}.useHttpPath",
-		description:
-			'When acquiring credentials, consider the "path" component of an http or https URL to be important. Defaults to false. See gitcredentials[7] for more information',
-	},
-	{
-		name: "credential.<url>.username",
-		insertValue: "credential.{cursor}.username",
-		description:
-			"If no username is set for a network authentication, use this username by default. See credential.<context>.* below, and gitcredentials[7]",
-	},
-	{
-		name: "credentialCache.<url>.ignoreSIGHUP",
-		insertValue: "credentialCache.{cursor}.ignoreSIGHUP",
-		description:
-			"Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting",
-	},
-	{
-		name: "credentialStore.<url>.lockTimeoutMS",
-		insertValue: "credentialStore.{cursor}.lockTimeoutMS",
-		description:
-			"The length of time, in milliseconds, for git-credential-store to retry when trying to lock the credentials file. Value 0 means not to retry at all; -1 means to try indefinitely. Default is 1000 (i.e., retry for 1s)",
-	},
-	{
-		name: "diff.<driver>.binary",
-		insertValue: "diff.{cursor}.binary",
-		description:
-			"Set this option to true to make the diff driver treat files as binary. See gitattributes[5] for details",
-	},
-	{
-		name: "diff.<driver>.cachetextconv",
-		insertValue: "diff.{cursor}.cachetextconv",
-		description:
-			"Set this option to true to make the diff driver cache the text conversion outputs. See gitattributes[5] for details",
-	},
-	{
-		name: "diff.<driver>.command",
-		insertValue: "diff.{cursor}.command",
-		description:
-			"The custom diff driver command. See gitattributes[5] for details",
-	},
-	{
-		name: "diff.<driver>.textconv",
-		insertValue: "diff.{cursor}.textconv",
-		description:
-			"The command that the diff driver should call to generate the text-converted version of a file. The result of the conversion is used to generate a human-readable diff. See gitattributes[5] for details",
-	},
-	{
-		name: "diff.<driver>.wordRegex",
-		insertValue: "diff.{cursor}.wordRegex",
-		description:
-			"The regular expression that the diff driver should use to split words in a line. See gitattributes[5] for details",
-	},
-	{
-		name: "diff.<driver>.xfuncname",
-		insertValue: "diff.{cursor}.xfuncname",
-		description:
-			"The regular expression that the diff driver should use to recognize the hunk header. A built-in pattern may also be used. See gitattributes[5] for details",
-	},
-	{
-		name: "diff.algorithm",
-		description: "Choose a diff algorithm",
-	},
-	{
-		name: "diff.autoRefreshIndex",
-		description:
-			"When using 'git diff' to compare with work tree files, do not consider stat-only change as changed. Instead, silently run `git update-index --refresh` to update the cached stat information for paths whose contents in the work tree match the contents in the index. This option defaults to true. Note that this affects only 'git diff' Porcelain, and not lower level 'diff' commands such as 'git diff-files'",
-	},
-	{
-		name: "diff.colorMoved",
-		description:
-			"If set to either a valid `<mode>` or a true value, moved lines in a diff are colored differently, for details of valid modes see '--color-moved' in git-diff[1]. If simply set to true the default color mode will be used. When set to false, moved lines are not colored",
-	},
-	{
-		name: "diff.colorMovedWS",
-		description:
-			"When moved lines are colored using e.g. the `diff.colorMoved` setting, this option controls the `<mode>` how spaces are treated for details of valid modes see '--color-moved-ws' in git-diff[1]",
-	},
-	{
-		name: "diff.context",
-		description:
-			"Generate diffs with <n> lines of context instead of the default of 3. This value is overridden by the -U option",
-	},
-	{
-		name: "diff.dirstat",
-		description:
-			"A comma separated list of `--dirstat` parameters specifying the default behavior of the `--dirstat` option to git-diff[1] and friends. The defaults can be overridden on the command line (using `--dirstat=<param1,param2,...>`). The fallback defaults (when not changed by `diff.dirstat`) are `changes,noncumulative,3`. The following parameters are available:",
-	},
-	{
-		name: "diff.external",
-		description:
-			'If this config variable is set, diff generation is not performed using the internal diff machinery, but using the given command. Can be overridden with the `GIT_EXTERNAL_DIFF\' environment variable. The command is called with parameters as described under "git Diffs" in git[1]. Note: if you want to use an external diff program only on a subset of your files, you might want to use gitattributes[5] instead',
-	},
-	{
-		name: "diff.guitool",
-		description:
-			"Controls which diff tool is used by git-difftool[1] when the -g/--gui flag is specified. This variable overrides the value configured in `merge.guitool`. The list below shows the valid built-in values. Any other value is treated as a custom diff tool and requires that a corresponding difftool.<guitool>.cmd variable is defined",
-	},
-	{
-		name: "diff.ignoreSubmodules",
-		description:
-			"Sets the default value of --ignore-submodules. Note that this affects only 'git diff' Porcelain, and not lower level 'diff' commands such as 'git diff-files'. 'git checkout' and 'git switch' also honor this setting when reporting uncommitted changes. Setting it to 'all' disables the submodule summary normally shown by 'git commit' and 'git status' when `status.submoduleSummary` is set unless it is overridden by using the --ignore-submodules command-line option. The 'git submodule' commands are not affected by this setting. By default this is set to untracked so that any untracked submodules are ignored",
-	},
-	{
-		name: "diff.indentHeuristic",
-		description:
-			"Set this option to `false` to disable the default heuristics that shift diff hunk boundaries to make patches easier to read",
-	},
-	{
-		name: "diff.interHunkContext",
-		description:
-			"Show the context between diff hunks, up to the specified number of lines, thereby fusing the hunks that are close to each other. This value serves as the default for the `--inter-hunk-context` command line option",
-	},
-	{
-		name: "diff.mnemonicPrefix",
-		description:
-			'If set, \'git diff\' uses a prefix pair that is different from the standard "a/" and "b/" depending on what is being compared. When this configuration is in effect, reverse diff output also swaps the order of the prefixes:',
-	},
-	{
-		name: "diff.noprefix",
-		description:
-			"If set, 'git diff' does not show any source or destination prefix",
-	},
-	{
-		name: "diff.orderFile",
-		description:
-			"File indicating how to order files within a diff. See the '-O' option to git-diff[1] for details. If `diff.orderFile` is a relative pathname, it is treated as relative to the top of the working tree",
-	},
-	{
-		name: "diff.relative",
-		description:
-			"If set to 'true', 'git diff' does not show changes outside of the directory and show pathnames relative to the current directory",
-	},
-	{
-		name: "diff.renameLimit",
-		description:
-			"The number of files to consider in the exhaustive portion of copy/rename detection; equivalent to the 'git diff' option `-l`. If not set, the default value is currently 1000. This setting has no effect if rename detection is turned off",
-	},
-	{
-		name: "diff.renames",
-		description:
-			'Whether and how Git detects renames. If set to "false", rename detection is disabled. If set to "true", basic rename detection is enabled. If set to "copies" or "copy", Git will detect copies, as well. Defaults to true. Note that this affects only \'git diff\' Porcelain like git-diff[1] and git-log[1], and not lower level commands such as git-diff-files[1]',
-	},
-	{
-		name: "diff.statGraphWidth",
-		description:
-			"Limit the width of the graph part in --stat output. If set, applies to all commands generating --stat output except format-patch",
-	},
-	{
-		name: "diff.submodule",
-		description:
-			'Specify the format in which differences in submodules are shown. The "short" format just shows the names of the commits at the beginning and end of the range. The "log" format lists the commits in the range like git-submodule[1] `summary` does. The "diff" format shows an inline diff of the changed contents of the submodule. Defaults to "short"',
-	},
-	{
-		name: "diff.suppressBlankEmpty",
-		description:
-			"A boolean to inhibit the standard behavior of printing a space before each empty output line. Defaults to false",
-	},
-	{
-		name: "diff.tool",
-		description:
-			"Controls which diff tool is used by git-difftool[1]. This variable overrides the value configured in `merge.tool`. The list below shows the valid built-in values. Any other value is treated as a custom diff tool and requires that a corresponding difftool.<tool>.cmd variable is defined",
-	},
-	{
-		name: "diff.wordRegex",
-		description:
-			'A POSIX Extended Regular Expression used to determine what is a "word" when performing word-by-word difference calculations. Character sequences that match the regular expression are "words", all other characters are *ignorable* whitespace',
-	},
-	{
-		name: "diff.wsErrorHighlight",
-		description:
-			"Highlight whitespace errors in the `context`, `old` or `new` lines of the diff. Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`. The whitespace errors are colored with `color.diff.whitespace`. The command line option `--ws-error-highlight=<kind>` overrides this setting",
-	},
-	{
-		name: "difftool.<tool>.cmd",
-		insertValue: "difftool.{cursor}.cmd",
-		description:
-			"Specify the command to invoke the specified diff tool. The specified command is evaluated in shell with the following variables available: 'LOCAL' is set to the name of the temporary file containing the contents of the diff pre-image and 'REMOTE' is set to the name of the temporary file containing the contents of the diff post-image",
-	},
-	{
-		name: "difftool.<tool>.path",
-		insertValue: "difftool.{cursor}.path",
-		description:
-			"Override the path for the given tool. This is useful in case your tool is not in the PATH",
-	},
-	{
-		name: "difftool.prompt",
-		description: "Prompt before each invocation of the diff tool",
-	},
-	{
-		name: "extensions.objectFormat",
-		description:
-			"Specify the hash algorithm to use. The acceptable values are `sha1` and `sha256`. If not specified, `sha1` is assumed. It is an error to specify this key unless `core.repositoryFormatVersion` is 1",
-	},
-	{
-		name: "extensions.worktreeConfig",
-		description:
-			"If enabled, then worktrees will load config settings from the `$GIT_DIR/config.worktree` file in addition to the `$GIT_COMMON_DIR/config` file. Note that `$GIT_COMMON_DIR` and `$GIT_DIR` are the same for the main working tree, while other working trees have `$GIT_DIR` equal to `$GIT_COMMON_DIR/worktrees/<id>/`. The settings in the `config.worktree` file will override settings from any other config files",
-	},
-	{
-		name: "fastimport.unpackLimit",
-		description:
-			"If the number of objects imported by git-fast-import[1] is below this limit, then the objects will be unpacked into loose object files. However if the number of imported objects equals or exceeds this limit then the pack will be stored as a pack. Storing the pack from a fast-import can make the import operation complete faster, especially on slow filesystems. If not set, the value of `transfer.unpackLimit` is used instead",
-	},
-	{
-		name: "feature.*",
-		insertValue: "feature.{cursor}",
-		description:
-			"The config settings that start with `feature.` modify the defaults of a group of other config settings. These groups are created by the Git developer community as recommended defaults and are subject to change. In particular, new config options may be added with different defaults",
-	},
-	{
-		name: "feature.experimental",
-		description:
-			"Enable config options that are new to Git, and are being considered for future defaults. Config settings included here may be added or removed with each release, including minor version updates. These settings may have unintended interactions since they are so new. Please enable this setting if you are interested in providing feedback on experimental features. The new default values are:",
-	},
-	{
-		name: "feature.manyFiles",
-		description:
-			"Enable config options that optimize for repos with many files in the working directory. With many files, commands such as `git status` and `git checkout` may be slow and these new defaults improve performance:",
-	},
-	{
-		name: "fetch.fsck.<msg-id>",
-		insertValue: "fetch.fsck.{cursor}",
-		description:
-			"Acts like `fsck.<msg-id>`, but is used by git-fetch-pack[1] instead of git-fsck[1]. See the `fsck.<msg-id>` documentation for details",
-	},
-	{
-		name: "fetch.fsck.skipList",
-		description:
-			"Acts like `fsck.skipList`, but is used by git-fetch-pack[1] instead of git-fsck[1]. See the `fsck.skipList` documentation for details",
-	},
-	{
-		name: "fetch.fsckObjects",
-		description:
-			"If it is set to true, git-fetch-pack will check all fetched objects. See `transfer.fsckObjects` for what's checked. Defaults to false. If not set, the value of `transfer.fsckObjects` is used instead",
-	},
-	{
-		name: "fetch.negotiationAlgorithm",
-		description:
-			'Control how information about the commits in the local repository is sent when negotiating the contents of the packfile to be sent by the server. Set to "consecutive" to use an algorithm that walks over consecutive commits checking each one. Set to "skipping" to use an algorithm that skips commits in an effort to converge faster, but may result in a larger-than-necessary packfile; or set to "noop" to not send any information at all, which will almost certainly result in a larger-than-necessary packfile, but will skip the negotiation step. Set to "default" to override settings made previously and use the default behaviour. The default is normally "consecutive", but if `feature.experimental` is true, then the default is "skipping". Unknown values will cause \'git fetch\' to error out',
-	},
-	{
-		name: "fetch.output",
-		description:
-			"Control how ref update status is printed. Valid values are `full` and `compact`. Default value is `full`. See section OUTPUT in git-fetch[1] for detail",
-	},
-	{
-		name: "fetch.parallel",
-		description:
-			"Specifies the maximal number of fetch operations to be run in parallel at a time (submodules, or remotes when the `--multiple` option of git-fetch[1] is in effect)",
-	},
-	{
-		name: "fetch.prune",
-		description:
-			"If true, fetch will automatically behave as if the `--prune` option was given on the command line. See also `remote.<name>.prune` and the PRUNING section of git-fetch[1]",
-	},
-	{
-		name: "fetch.pruneTags",
-		description:
-			"If true, fetch will automatically behave as if the `refs/tags/*:refs/tags/*` refspec was provided when pruning, if not set already. This allows for setting both this option and `fetch.prune` to maintain a 1=1 mapping to upstream refs. See also `remote.<name>.pruneTags` and the PRUNING section of git-fetch[1]",
-	},
-	{
-		name: "fetch.recurseSubmodules",
-		description:
-			"This option controls whether `git fetch` (and the underlying fetch in `git pull`) will recursively fetch into populated submodules. This option can be set either to a boolean value or to 'on-demand'. Setting it to a boolean changes the behavior of fetch and pull to recurse unconditionally into submodules when set to true or to not recurse at all when set to false. When set to 'on-demand', fetch and pull will only recurse into a populated submodule when its superproject retrieves a commit that updates the submodule's reference. Defaults to 'on-demand', or to the value of 'submodule.recurse' if set",
-	},
-	{
-		name: "fetch.showForcedUpdates",
-		description:
-			"Set to false to enable `--no-show-forced-updates` in git-fetch[1] and git-pull[1] commands. Defaults to true",
-	},
-	{
-		name: "fetch.unpackLimit",
-		description:
-			"If the number of objects fetched over the Git native transfer is below this limit, then the objects will be unpacked into loose object files. However if the number of received objects equals or exceeds this limit then the received pack will be stored as a pack, after adding any missing delta bases. Storing the pack from a push can make the push operation complete faster, especially on slow filesystems. If not set, the value of `transfer.unpackLimit` is used instead",
-	},
-	{
-		name: "fetch.writeCommitGraph",
-		description:
-			"Set to true to write a commit-graph after every `git fetch` command that downloads a pack-file from a remote. Using the `--split` option, most executions will create a very small commit-graph file on top of the existing commit-graph file(s). Occasionally, these files will merge and the write may take longer. Having an updated commit-graph file helps performance of many Git commands, including `git merge-base`, `git push -f`, and `git log --graph`. Defaults to false",
-	},
-	{
-		name: "filter.<driver>.clean",
-		insertValue: "filter.{cursor}.clean",
-		description:
-			"The command which is used to convert the content of a worktree file to a blob upon checkin. See gitattributes[5] for details",
-	},
-	{
-		name: "filter.<driver>.smudge",
-		insertValue: "filter.{cursor}.smudge",
-		description:
-			"The command which is used to convert the content of a blob object to a worktree file upon checkout. See gitattributes[5] for details",
-	},
-	{
-		name: "format.attach",
-		description:
-			"Enable multipart/mixed attachments as the default for 'format-patch'. The value can also be a double quoted string which will enable attachments as the default and set the value as the boundary. See the --attach option in git-format-patch[1]",
-	},
-	{
-		name: "format.cc",
-		description:
-			"Additional recipients to include in a patch to be submitted by mail. See the --to and --cc options in git-format-patch[1]",
-	},
-	{
-		name: "format.coverFromDescription",
-		description:
-			"The default mode for format-patch to determine which parts of the cover letter will be populated using the branch's description. See the `--cover-from-description` option in git-format-patch[1]",
-	},
-	{
-		name: "format.coverLetter",
-		description:
-			'A boolean that controls whether to generate a cover-letter when format-patch is invoked, but in addition can be set to "auto", to generate a cover-letter only when there\'s more than one patch. Default is false',
-	},
-	{
-		name: "format.encodeEmailHeaders",
-		description:
-			'Encode email headers that have non-ASCII characters with "Q-encoding" (described in RFC 2047) for email transmission. Defaults to true',
-	},
-	{
-		name: "format.filenameMaxLength",
-		description:
-			"The maximum length of the output filenames generated by the `format-patch` command; defaults to 64. Can be overridden by the `--filename-max-length=<n>` command line option",
-	},
-	{
-		name: "format.from",
-		description:
-			'Provides the default value for the `--from` option to format-patch. Accepts a boolean value, or a name and email address. If false, format-patch defaults to `--no-from`, using commit authors directly in the "From:" field of patch mails. If true, format-patch defaults to `--from`, using your committer identity in the "From:" field of patch mails and including a "From:" field in the body of the patch mail if different. If set to a non-boolean value, format-patch uses that value instead of your committer identity. Defaults to false',
-	},
-	{
-		name: "format.headers",
-		description:
-			"Additional email headers to include in a patch to be submitted by mail. See git-format-patch[1]",
-	},
-	{
-		name: "format.notes",
-		description:
-			"Provides the default value for the `--notes` option to format-patch. Accepts a boolean value, or a ref which specifies where to get notes. If false, format-patch defaults to `--no-notes`. If true, format-patch defaults to `--notes`. If set to a non-boolean value, format-patch defaults to `--notes=<ref>`, where `ref` is the non-boolean value. Defaults to false",
-	},
-	{
-		name: "format.numbered",
-		description:
-			'A boolean which can enable or disable sequence numbers in patch subjects. It defaults to "auto" which enables it only if there is more than one patch. It can be enabled or disabled for all messages by setting it to "true" or "false". See --numbered option in git-format-patch[1]',
-	},
-	{
-		name: "format.outputDirectory",
-		description:
-			"Set a custom directory to store the resulting files instead of the current working directory. All directory components will be created",
-	},
-	{
-		name: "format.pretty",
-		description:
-			"The default pretty format for log/show/whatchanged command, See git-log[1], git-show[1], git-whatchanged[1]",
-	},
-	{
-		name: "format.signature",
-		description:
-			'The default for format-patch is to output a signature containing the Git version number. Use this variable to change that default. Set this variable to the empty string ("") to suppress signature generation',
-	},
-	{
-		name: "format.signatureFile",
-		description:
-			"Works just like format.signature except the contents of the file specified by this variable will be used as the signature",
-	},
-	{
-		name: "format.signOff",
-		description:
-			"A boolean value which lets you enable the `-s/--signoff` option of format-patch by default. *Note:* Adding the `Signed-off-by` trailer to a patch should be a conscious act and means that you certify you have the rights to submit this work under the same open source license. Please see the 'SubmittingPatches' document for further discussion",
-	},
-	{
-		name: "format.subjectPrefix",
-		description:
-			"The default for format-patch is to output files with the '[PATCH]' subject prefix. Use this variable to change that prefix",
-	},
-	{
-		name: "format.suffix",
-		description:
-			"The default for format-patch is to output files with the suffix `.patch`. Use this variable to change that suffix (make sure to include the dot if you want it)",
-	},
-	{
-		name: "format.thread",
-		description:
-			"The default threading style for 'git format-patch'. Can be a boolean value, or `shallow` or `deep`. `shallow` threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. `deep` threading makes every mail a reply to the previous one. A true boolean value is the same as `shallow`, and a false value disables threading",
-	},
-	{
-		name: "format.useAutoBase",
-		description:
-			'A boolean value which lets you enable the `--base=auto` option of format-patch by default. Can also be set to "whenAble" to allow enabling `--base=auto` if a suitable base is available, but to skip adding base info otherwise without the format dying',
-	},
-	{
-		name: "fsck.<msg-id>",
-		insertValue: "fsck.{cursor}",
-		description:
-			"During fsck git may find issues with legacy data which wouldn't be generated by current versions of git, and which wouldn't be sent over the wire if `transfer.fsckObjects` was set. This feature is intended to support working with legacy repositories containing such data",
-	},
-	{
-		name: "fsck.skipList",
-		description:
-			"The path to a list of object names (i.e. one unabbreviated SHA-1 per line) that are known to be broken in a non-fatal way and should be ignored. On versions of Git 2.20 and later comments ('#'), empty lines, and any leading and trailing whitespace is ignored. Everything but a SHA-1 per line will error out on older versions",
-	},
-	{
-		name: "gc.<pattern>.reflogExpire",
-		insertValue: "gc.{cursor}.reflogExpire",
-		description:
-			'\'git reflog expire\' removes reflog entries older than this time; defaults to 90 days. The value "now" expires all entries immediately, and "never" suppresses expiration altogether. With "<pattern>" (e.g. "refs/stash") in the middle the setting applies only to the refs that match the <pattern>',
-	},
-	{
-		name: "gc.<pattern>.reflogExpireUnreachable",
-		insertValue: "gc.{cursor}.reflogExpireUnreachable",
-		description:
-			'\'git reflog expire\' removes reflog entries older than this time and are not reachable from the current tip; defaults to 30 days. The value "now" expires all entries immediately, and "never" suppresses expiration altogether. With "<pattern>" (e.g. "refs/stash") in the middle, the setting applies only to the refs that match the <pattern>',
-	},
-	{
-		name: "gc.aggressiveDepth",
-		description:
-			"The depth parameter used in the delta compression algorithm used by 'git gc --aggressive'. This defaults to 50, which is the default for the `--depth` option when `--aggressive` isn't in use",
-	},
-	{
-		name: "gc.aggressiveWindow",
-		description:
-			"The window size parameter used in the delta compression algorithm used by 'git gc --aggressive'. This defaults to 250, which is a much more aggressive window size than the default `--window` of 10",
-	},
-	{
-		name: "gc.auto",
-		description:
-			"When there are approximately more than this many loose objects in the repository, `git gc --auto` will pack them. Some Porcelain commands use this command to perform a light-weight garbage collection from time to time. The default value is 6700",
-	},
-	{
-		name: "gc.autoDetach",
-		description:
-			"Make `git gc --auto` return immediately and run in background if the system supports it. Default is true",
-	},
-	{
-		name: "gc.autoPackLimit",
-		description:
-			"When there are more than this many packs that are not marked with `*.keep` file in the repository, `git gc --auto` consolidates them into one larger pack. The default value is 50. Setting this to 0 disables it. Setting `gc.auto` to 0 will also disable this",
-	},
-	{
-		name: "gc.bigPackThreshold",
-		description:
-			"If non-zero, all packs larger than this limit are kept when `git gc` is run. This is very similar to `--keep-largest-pack` except that all packs that meet the threshold are kept, not just the largest pack. Defaults to zero. Common unit suffixes of 'k', 'm', or 'g' are supported",
-	},
-	{
-		name: "gc.cruftPacks",
-		description:
-			"Store unreachable objects in a cruft pack (see git-repack[1]) instead of as loose objects. The default is `false`",
-	},
-	{
-		name: "gc.logExpiry",
-		description:
-			"If the file gc.log exists, then `git gc --auto` will print its content and exit with status zero instead of running unless that file is more than 'gc.logExpiry' old. Default is \"1.day\". See `gc.pruneExpire` for more ways to specify its value",
-	},
-	{
-		name: "gc.packRefs",
-		description:
-			"Running `git pack-refs` in a repository renders it unclonable by Git versions prior to 1.5.1.2 over dumb transports such as HTTP. This variable determines whether 'git gc' runs `git pack-refs`. This can be set to `notbare` to enable it within all non-bare repos or it can be set to a boolean value. The default is `true`",
-	},
-	{
-		name: "gc.pruneExpire",
-		description:
-			"When 'git gc' is run, it will call 'prune --expire 2.weeks.ago' (and 'repack --cruft --cruft-expiration 2.weeks.ago' if using cruft packs via `gc.cruftPacks` or `--cruft`). Override the grace period with this config variable. The value \"now\" may be used to disable this grace period and always prune unreachable objects immediately, or \"never\" may be used to suppress pruning. This feature helps prevent corruption when 'git gc' runs concurrently with another process writing to the repository; see the \"NOTES\" section of git-gc[1]",
-	},
-	{
-		name: "gc.rerereResolved",
-		description:
-			"Records of conflicted merge you resolved earlier are kept for this many days when 'git rerere gc' is run. You can also use more human-readable \"1.month.ago\", etc. The default is 60 days. See git-rerere[1]",
-	},
-	{
-		name: "gc.rerereUnresolved",
-		description:
-			"Records of conflicted merge you have not resolved are kept for this many days when 'git rerere gc' is run. You can also use more human-readable \"1.month.ago\", etc. The default is 15 days. See git-rerere[1]",
-	},
-	{
-		name: "gc.worktreePruneExpire",
-		description:
-			"When 'git gc' is run, it calls 'git worktree prune --expire 3.months.ago'. This config variable can be used to set a different grace period. The value \"now\" may be used to disable the grace period and prune `$GIT_DIR/worktrees` immediately, or \"never\" may be used to suppress pruning",
-	},
-	{
-		name: "gc.writeCommitGraph",
-		description:
-			"If true, then gc will rewrite the commit-graph file when git-gc[1] is run. When using `git gc --auto` the commit-graph will be updated if housekeeping is required. Default is true. See git-commit-graph[1] for details",
-	},
-	{
-		name: "gitcvs.allBinary",
-		description:
-			"This is used if `gitcvs.usecrlfattr` does not resolve the correct '-kb' mode to use. If true, all unresolved files are sent to the client in mode '-kb'. This causes the client to treat them as binary files, which suppresses any newline munging it otherwise might do. Alternatively, if it is set to \"guess\", then the contents of the file are examined to decide if it is binary, similar to `core.autocrlf`",
-	},
-	{
-		name: "gitcvs.commitMsgAnnotation",
-		description:
-			'Append this string to each commit message. Set to empty string to disable this feature. Defaults to "via git-CVS emulator"',
-	},
-	{
-		name: "gitcvs.dbDriver",
-		description:
-			"Used Perl DBI driver. You can specify any available driver for this here, but it might not work. git-cvsserver is tested with 'DBD::SQLite', reported to work with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Experimental feature. May not contain double colons (`:`). Default: 'SQLite'. See git-cvsserver[1]",
-	},
-	{
-		name: "gitcvs.dbName",
-		description:
-			"Database used by git-cvsserver to cache revision information derived from the Git repository. The exact meaning depends on the used database driver, for SQLite (which is the default driver) this is a filename. Supports variable substitution (see git-cvsserver[1] for details). May not contain semicolons (`;`). Default: '%Ggitcvs.%m.sqlite'",
-	},
-	{
-		name: "gitcvs.dbTableNamePrefix",
-		description:
-			"Database table name prefix. Prepended to the names of any database tables used, allowing a single database to be used for several repositories. Supports variable substitution (see git-cvsserver[1] for details). Any non-alphabetic characters will be replaced with underscores",
-	},
-	{
-		name: "gitcvs.dbUser",
-		description:
-			"Database user and password. Only useful if setting `gitcvs.dbDriver`, since SQLite has no concept of database users and/or passwords. 'gitcvs.dbUser' supports variable substitution (see git-cvsserver[1] for details)",
-	},
-	{
-		name: "gitcvs.enabled",
-		description:
-			"Whether the CVS server interface is enabled for this repository. See git-cvsserver[1]",
-	},
-	{
-		name: "gitcvs.logFile",
-		description:
-			"Path to a log file where the CVS server interface well... logs various stuff. See git-cvsserver[1]",
-	},
-	{
-		name: "gitcvs.usecrlfattr",
-		description:
-			"If true, the server will look up the end-of-line conversion attributes for files to determine the `-k` modes to use. If the attributes force Git to treat a file as text, the `-k` mode will be left blank so CVS clients will treat it as text. If they suppress text conversion, the file will be set with '-kb' mode, which suppresses any newline munging the client might otherwise do. If the attributes do not allow the file type to be determined, then `gitcvs.allBinary` is used. See gitattributes[5]",
-	},
-	{
-		name: "gitweb.snapshot",
-		description: "See gitweb.conf[5] for description",
-	},
-	{
-		name: "gitweb.url",
-		description: "See gitweb[1] for description",
-	},
-	{
-		name: "gpg.<format>.program",
-		insertValue: "gpg.{cursor}.program",
-		description:
-			'Use this to customize the program used for the signing format you chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still be used as a legacy synonym for `gpg.openpgp.program`. The default value for `gpg.x509.program` is "gpgsm" and `gpg.ssh.program` is "ssh-keygen"',
-	},
-	{
-		name: "gpg.format",
-		description:
-			'Specifies which key format to use when signing with `--gpg-sign`. Default is "openpgp". Other possible values are "x509", "ssh"',
-	},
-	{
-		name: "gpg.minTrustLevel",
-		description:
-			"Specifies a minimum trust level for signature verification. If this option is unset, then signature verification for merge operations require a key with at least `marginal` trust. Other operations that perform signature verification require a key with at least `undefined` trust. Setting this option overrides the required trust-level for all operations. Supported values, in increasing order of significance:",
-	},
-	{
-		name: "gpg.program",
-		description:
-			'Use this custom program instead of "`gpg`" found on `$PATH` when making or verifying a PGP signature. The program must support the same command-line interface as GPG, namely, to verify a detached signature, "`gpg --verify $signature - <$file`" is run, and the program is expected to signal a good signature by exiting with code 0, and to generate an ASCII-armored detached signature, the standard input of "`gpg -bsau $key`" is fed with the contents to be signed, and the program is expected to send the result to its standard output',
-	},
-	{
-		name: "gpg.ssh.allowedSignersFile",
-		description:
-			'A file containing ssh public keys which you are willing to trust. The file consists of one or more lines of principals followed by an ssh public key. e.g.: `user1@example.com,user2@example.com ssh-rsa AAAAX1...` See ssh-keygen(1) "ALLOWED SIGNERS" for details. The principal is only used to identify the key and is available when verifying a signature',
-	},
-	{
-		name: "gpg.ssh.defaultKeyCommand",
-		description:
-			"This command that will be run when user.signingkey is not set and a ssh signature is requested. On successful exit a valid ssh public key prefixed with `key::` is expected in the first line of its output. This allows for a script doing a dynamic lookup of the correct public key when it is impractical to statically configure `user.signingKey`. For example when keys or SSH Certificates are rotated frequently or selection of the right key depends on external factors unknown to git",
-	},
-	{
-		name: "gpg.ssh.revocationFile",
-		description:
-			'Either a SSH KRL or a list of revoked public keys (without the principal prefix). See ssh-keygen(1) for details. If a public key is found in this file then it will always be treated as having trust level "never" and signatures will show as invalid',
-	},
-	{
-		name: "grep.column",
-		description: "If set to true, enable the `--column` option by default",
-	},
-	{
-		name: "grep.extendedRegexp",
-		description:
-			"If set to true, enable `--extended-regexp` option by default. This option is ignored when the `grep.patternType` option is set to a value other than 'default'",
-	},
-	{
-		name: "grep.fallbackToNoIndex",
-		description:
-			"If set to true, fall back to git grep --no-index if git grep is executed outside of a git repository. Defaults to false",
-	},
-	{
-		name: "grep.lineNumber",
-		description: "If set to true, enable `-n` option by default",
-	},
-	{
-		name: "grep.patternType",
-		description:
-			"Set the default matching behavior. Using a value of 'basic', 'extended', 'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, `--fixed-strings`, or `--perl-regexp` option accordingly, while the value 'default' will use the `grep.extendedRegexp` option to choose between 'basic' and 'extended'",
-	},
-	{
-		name: "grep.threads",
-		description:
-			"Number of grep worker threads to use. See `grep.threads` in git-grep[1] for more information",
-	},
-	{
-		name: "gui.blamehistoryctx",
-		description:
-			"Specifies the radius of history context in days to show in gitk[1] for the selected commit, when the `Show History Context` menu item is invoked from 'git gui blame'. If this variable is set to zero, the whole history is shown",
-	},
-	{
-		name: "gui.commitMsgWidth",
-		description:
-			'Defines how wide the commit message window is in the git-gui[1]. "75" is the default',
-	},
-	{
-		name: "gui.copyBlameThreshold",
-		description:
-			"Specifies the threshold to use in 'git gui blame' original location detection, measured in alphanumeric characters. See the git-blame[1] manual for more information on copy detection",
-	},
-	{
-		name: "gui.diffContext",
-		description:
-			'Specifies how many context lines should be used in calls to diff made by the git-gui[1]. The default is "5"',
-	},
-	{
-		name: "gui.displayUntracked",
-		description:
-			'Determines if git-gui[1] shows untracked files in the file list. The default is "true"',
-	},
-	{
-		name: "gui.encoding",
-		description:
-			"Specifies the default character encoding to use for displaying of file contents in git-gui[1] and gitk[1]. It can be overridden by setting the 'encoding' attribute for relevant files (see gitattributes[5]). If this option is not set, the tools default to the locale encoding",
-	},
-	{
-		name: "gui.fastCopyBlame",
-		description:
-			"If true, 'git gui blame' uses `-C` instead of `-C -C` for original location detection. It makes blame significantly faster on huge repositories at the expense of less thorough copy detection",
-	},
-	{
-		name: "gui.matchTrackingBranch",
-		description:
-			'Determines if new branches created with git-gui[1] should default to tracking remote branches with matching names or not. Default: "false"',
-	},
-	{
-		name: "gui.newBranchTemplate",
-		description:
-			"Is used as suggested name when creating new branches using the git-gui[1]",
-	},
-	{
-		name: "gui.pruneDuringFetch",
-		description:
-			'"true" if git-gui[1] should prune remote-tracking branches when performing a fetch. The default value is "false"',
-	},
-	{
-		name: "gui.spellingDictionary",
-		description:
-			'Specifies the dictionary used for spell checking commit messages in the git-gui[1]. When set to "none" spell checking is turned off',
-	},
-	{
-		name: "gui.trustmtime",
-		description:
-			"Determines if git-gui[1] should trust the file modification timestamp or not. By default the timestamps are not trusted",
-	},
-	{
-		name: "guitool.<name>.argPrompt",
-		insertValue: "guitool.{cursor}.argPrompt",
-		description:
-			"Request a string argument from the user, and pass it to the tool through the `ARGS` environment variable. Since requesting an argument implies confirmation, the 'confirm' option has no effect if this is enabled. If the option is set to 'true', 'yes', or '1', the dialog uses a built-in generic prompt; otherwise the exact value of the variable is used",
-	},
-	{
-		name: "guitool.<name>.cmd",
-		insertValue: "guitool.{cursor}.cmd",
-		description:
-			"Specifies the shell command line to execute when the corresponding item of the git-gui[1] `Tools` menu is invoked. This option is mandatory for every tool. The command is executed from the root of the working directory, and in the environment it receives the name of the tool as `GIT_GUITOOL`, the name of the currently selected file as 'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if the head is detached, 'CUR_BRANCH' is empty)",
-	},
-	{
-		name: "guitool.<name>.confirm",
-		insertValue: "guitool.{cursor}.confirm",
-		description: "Show a confirmation dialog before actually running the tool",
-	},
-	{
-		name: "guitool.<name>.needsFile",
-		insertValue: "guitool.{cursor}.needsFile",
-		description:
-			"Run the tool only if a diff is selected in the GUI. It guarantees that 'FILENAME' is not empty",
-	},
-	{
-		name: "guitool.<name>.noConsole",
-		insertValue: "guitool.{cursor}.noConsole",
-		description:
-			"Run the command silently, without creating a window to display its output",
-	},
-	{
-		name: "guitool.<name>.noRescan",
-		insertValue: "guitool.{cursor}.noRescan",
-		description:
-			"Don't rescan the working directory for changes after the tool finishes execution",
-	},
-	{
-		name: "guitool.<name>.prompt",
-		insertValue: "guitool.{cursor}.prompt",
-		description:
-			"Specifies the general prompt string to display at the top of the dialog, before subsections for 'argPrompt' and 'revPrompt'. The default value includes the actual command",
-	},
-	{
-		name: "guitool.<name>.revPrompt",
-		insertValue: "guitool.{cursor}.revPrompt",
-		description:
-			"Request a single valid revision from the user, and set the `REVISION` environment variable. In other aspects this option is similar to 'argPrompt', and can be used together with it",
-	},
-	{
-		name: "guitool.<name>.revUnmerged",
-		insertValue: "guitool.{cursor}.revUnmerged",
-		description:
-			"Show only unmerged branches in the 'revPrompt' subdialog. This is useful for tools similar to merge or rebase, but not for things like checkout or reset",
-	},
-	{
-		name: "guitool.<name>.title",
-		insertValue: "guitool.{cursor}.title",
-		description:
-			"Specifies the title to use for the prompt dialog. The default is the tool name",
-	},
-	{
-		name: "help.autoCorrect",
-		description:
-			"If git detects typos and can identify exactly one valid command similar to the error, git will try to suggest the correct command or even run the suggestion automatically. Possible config values are: - 0 (default): show the suggested command. - positive number: run the suggested command after specified",
-	},
-	{
-		name: "help.browser",
-		description:
-			"Specify the browser that will be used to display help in the 'web' format. See git-help[1]",
-	},
-	{
-		name: "help.format",
-		description:
-			"Override the default help format used by git-help[1]. Values 'man', 'info', 'web' and 'html' are supported. 'man' is the default. 'web' and 'html' are the same",
-	},
-	{
-		name: "help.htmlPath",
-		description:
-			"Specify the path where the HTML documentation resides. File system paths and URLs are supported. HTML pages will be prefixed with this path when help is displayed in the 'web' format. This defaults to the documentation path of your Git installation",
-	},
-	{
-		name: "http.cookieFile",
-		description:
-			"The pathname of a file containing previously stored cookie lines, which should be used in the Git http session, if they match the server. The file format of the file to read cookies from should be plain HTTP headers or the Netscape/Mozilla cookie file format (see `curl(1)`). NOTE that the file specified with http.cookieFile is used only as input unless http.saveCookies is set",
-	},
-	{
-		name: "http.curloptResolve",
-		description:
-			"Hostname resolution information that will be used first by libcurl when sending HTTP requests. This information should be in one of the following formats:",
-	},
-	{
-		name: "http.delegation",
-		description:
-			"Control GSSAPI credential delegation. The delegation is disabled by default in libcurl since version 7.21.7. Set parameter to tell the server what it is allowed to delegate when it comes to user credentials. Used with GSS/kerberos. Possible values are:",
-	},
-	{
-		name: "http.emptyAuth",
-		description:
-			"Attempt authentication without seeking a username or password. This can be used to attempt GSS-Negotiate authentication without specifying a username in the URL, as libcurl normally requires a username for authentication",
-	},
-	{
-		name: "http.extraHeader",
-		description:
-			"Pass an additional HTTP header when communicating with a server. If more than one such entry exists, all of them are added as extra headers. To allow overriding the settings inherited from the system config, an empty value will reset the extra headers to the empty list",
-	},
-	{
-		name: "http.followRedirects",
-		description:
-			"Whether git should follow HTTP redirects. If set to `true`, git will transparently follow any redirect issued by a server it encounters. If set to `false`, git will treat all redirects as errors. If set to `initial`, git will follow redirects only for the initial request to a remote, but not for subsequent follow-up HTTP requests. Since git uses the redirected URL as the base for the follow-up requests, this is generally sufficient. The default is `initial`",
-	},
-	{
-		name: "http.lowSpeedLimit",
-		description:
-			"If the HTTP transfer speed is less than 'http.lowSpeedLimit' for longer than 'http.lowSpeedTime' seconds, the transfer is aborted. Can be overridden by the `GIT_HTTP_LOW_SPEED_LIMIT` and `GIT_HTTP_LOW_SPEED_TIME` environment variables",
-	},
-	{
-		name: "http.maxRequests",
-		description:
-			"How many HTTP requests to launch in parallel. Can be overridden by the `GIT_HTTP_MAX_REQUESTS` environment variable. Default is 5",
-	},
-	{
-		name: "http.minSessions",
-		description:
-			"The number of curl sessions (counted across slots) to be kept across requests. They will not be ended with curl_easy_cleanup() until http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this value will be capped at 1. Defaults to 1",
-	},
-	{
-		name: "http.noEPSV",
-		description:
-			'A boolean which disables using of EPSV ftp command by curl. This can helpful with some "poor" ftp servers which don\'t support EPSV mode. Can be overridden by the `GIT_CURL_FTP_NO_EPSV` environment variable. Default is false (curl will use EPSV)',
-	},
-	{
-		name: "http.pinnedPubkey",
-		description:
-			"Public key of the https service. It may either be the filename of a PEM or DER encoded public key file or a string starting with 'sha256//' followed by the base64 encoded sha256 hash of the public key. See also libcurl 'CURLOPT_PINNEDPUBLICKEY'. git will exit with an error if this option is set but not supported by cURL",
-	},
-	{
-		name: "http.postBuffer",
-		description:
-			"Maximum size in bytes of the buffer used by smart HTTP transports when POSTing data to the remote system. For requests larger than this buffer size, HTTP/1.1 and Transfer-Encoding: chunked is used to avoid creating a massive pack file locally. Default is 1 MiB, which is sufficient for most requests",
-	},
-	{
-		name: "http.proxy",
-		description:
-			"Override the HTTP proxy, normally configured using the 'http_proxy', 'https_proxy', and 'all_proxy' environment variables (see `curl(1)`). In addition to the syntax understood by curl, it is possible to specify a proxy string with a user name but no password, in which case git will attempt to acquire one in the same way it does for other credentials. See gitcredentials[7] for more information. The syntax thus is '[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden on a per-remote basis; see remote.<name>.proxy",
-	},
-	{
-		name: "http.proxyAuthMethod",
-		description:
-			"Set the method with which to authenticate against the HTTP proxy. This only takes effect if the configured proxy string contains a user name part (i.e. is of the form 'user@host' or 'user@host:port'). This can be overridden on a per-remote basis; see `remote.<name>.proxyAuthMethod`. Both can be overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment variable. Possible values are:",
-	},
-	{
-		name: "http.proxySSLCAInfo",
-		description:
-			"Pathname to the file containing the certificate bundle that should be used to verify the proxy with when using an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CAINFO` environment variable",
-	},
-	{
-		name: "http.proxySSLCert",
-		description:
-			"The pathname of a file that stores a client certificate to use to authenticate with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CERT` environment variable",
-	},
-	{
-		name: "http.proxySSLCertPasswordProtected",
-		description:
-			"Enable Git's password prompt for the proxy SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED` environment variable",
-	},
-	{
-		name: "http.proxySSLKey",
-		description:
-			"The pathname of a file that stores a private key to use to authenticate with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_KEY` environment variable",
-	},
-	{
-		name: "http.saveCookies",
-		description:
-			"If set, store cookies received during requests to the file specified by http.cookieFile. Has no effect if http.cookieFile is unset",
-	},
-	{
-		name: "http.schannelCheckRevoke",
-		description:
-			'Used to enforce or disable certificate revocation checks in cURL when http.sslBackend is set to "schannel". Defaults to `true` if unset. Only necessary to disable this if Git consistently errors and the message is about checking the revocation status of a certificate. This option is ignored if cURL lacks support for setting the relevant SSL option at runtime',
-	},
-	{
-		name: "http.schannelUseSSLCAInfo",
-		description:
-			"As of cURL v7.60.0, the Secure Channel backend can use the certificate bundle provided via `http.sslCAInfo`, but that would override the Windows Certificate Store. Since this is not desirable by default, Git will tell cURL not to use that bundle by default when the `schannel` backend was configured via `http.sslBackend`, unless `http.schannelUseSSLCAInfo` overrides this behavior",
-	},
-	{
-		name: "http.sslBackend",
-		description:
-			'Name of the SSL backend to use (e.g. "openssl" or "schannel"). This option is ignored if cURL lacks support for choosing the SSL backend at runtime',
-	},
-	{
-		name: "http.sslCAInfo",
-		description:
-			"File containing the certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAINFO` environment variable",
-	},
-	{
-		name: "http.sslCAPath",
-		description:
-			"Path containing files with the CA certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAPATH` environment variable",
-	},
-	{
-		name: "http.sslCert",
-		description:
-			"File containing the SSL certificate when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CERT` environment variable",
-	},
-	{
-		name: "http.sslCertPasswordProtected",
-		description:
-			"Enable Git's password prompt for the SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the `GIT_SSL_CERT_PASSWORD_PROTECTED` environment variable",
-	},
-	{
-		name: "http.sslKey",
-		description:
-			"File containing the SSL private key when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_KEY` environment variable",
-	},
-	{
-		name: "http.sslTry",
-		description:
-			"Attempt to use AUTH SSL/TLS and encrypted data transfers when connecting via regular FTP protocol. This might be needed if the FTP server requires it for security reasons or you wish to connect securely whenever remote FTP server supports it. Default is false since it might trigger certificate verification errors on misconfigured servers",
-	},
-	{
-		name: "http.sslVerify",
-		description:
-			"Whether to verify the SSL certificate when fetching or pushing over HTTPS. Defaults to true. Can be overridden by the `GIT_SSL_NO_VERIFY` environment variable",
-	},
-	{
-		name: "http.sslVersion",
-		description:
-			"The SSL version to use when negotiating an SSL connection, if you want to force the default. The available and default version depend on whether libcurl was built against NSS or OpenSSL and the particular configuration of the crypto library in use. Internally this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl documentation for more details on the format of this option and for the ssl version supported. Currently the possible values of this option are:",
-	},
-	{
-		name: "http.userAgent",
-		description:
-			"The HTTP USER_AGENT string presented to an HTTP server. The default value represents the version of the client Git such as git/1.7.1. This option allows you to override this value to a more common value such as Mozilla/4.0. This may be necessary, for instance, if connecting through a firewall that restricts HTTP connections to a set of common USER_AGENT strings (but not including those like git/1.7.1). Can be overridden by the `GIT_HTTP_USER_AGENT` environment variable",
-	},
-	{
-		name: "http.version",
-		description:
-			"Use the specified HTTP protocol version when communicating with a server. If you want to force the default. The available and default version depend on libcurl. Currently the possible values of this option are:",
-	},
-	{
-		name: "http.<url>.cookieFile",
-		insertValue: "http.{cursor}.cookieFile",
-		description:
-			"The pathname of a file containing previously stored cookie lines, which should be used in the Git http session, if they match the server. The file format of the file to read cookies from should be plain HTTP headers or the Netscape/Mozilla cookie file format (see `curl(1)`). NOTE that the file specified with http.cookieFile is used only as input unless http.saveCookies is set",
-	},
-	{
-		name: "http.<url>.curloptResolve",
-		insertValue: "http.{cursor}.curloptResolve",
-		description:
-			"Hostname resolution information that will be used first by libcurl when sending HTTP requests. This information should be in one of the following formats:",
-	},
-	{
-		name: "http.<url>.delegation",
-		insertValue: "http.{cursor}.delegation",
-		description:
-			"Control GSSAPI credential delegation. The delegation is disabled by default in libcurl since version 7.21.7. Set parameter to tell the server what it is allowed to delegate when it comes to user credentials. Used with GSS/kerberos. Possible values are:",
-	},
-	{
-		name: "http.<url>.emptyAuth",
-		insertValue: "http.{cursor}.emptyAuth",
-		description:
-			"Attempt authentication without seeking a username or password. This can be used to attempt GSS-Negotiate authentication without specifying a username in the URL, as libcurl normally requires a username for authentication",
-	},
-	{
-		name: "http.<url>.extraHeader",
-		insertValue: "http.{cursor}.extraHeader",
-		description:
-			"Pass an additional HTTP header when communicating with a server. If more than one such entry exists, all of them are added as extra headers. To allow overriding the settings inherited from the system config, an empty value will reset the extra headers to the empty list",
-	},
-	{
-		name: "http.<url>.followRedirects",
-		insertValue: "http.{cursor}.followRedirects",
-		description:
-			"Whether git should follow HTTP redirects. If set to `true`, git will transparently follow any redirect issued by a server it encounters. If set to `false`, git will treat all redirects as errors. If set to `initial`, git will follow redirects only for the initial request to a remote, but not for subsequent follow-up HTTP requests. Since git uses the redirected URL as the base for the follow-up requests, this is generally sufficient. The default is `initial`",
-	},
-	{
-		name: "http.<url>.lowSpeedLimit",
-		insertValue: "http.{cursor}.lowSpeedLimit",
-		description:
-			"If the HTTP transfer speed is less than 'http.lowSpeedLimit' for longer than 'http.lowSpeedTime' seconds, the transfer is aborted. Can be overridden by the `GIT_HTTP_LOW_SPEED_LIMIT` and `GIT_HTTP_LOW_SPEED_TIME` environment variables",
-	},
-	{
-		name: "http.<url>.maxRequests",
-		insertValue: "http.{cursor}.maxRequests",
-		description:
-			"How many HTTP requests to launch in parallel. Can be overridden by the `GIT_HTTP_MAX_REQUESTS` environment variable. Default is 5",
-	},
-	{
-		name: "http.<url>.minSessions",
-		insertValue: "http.{cursor}.minSessions",
-		description:
-			"The number of curl sessions (counted across slots) to be kept across requests. They will not be ended with curl_easy_cleanup() until http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this value will be capped at 1. Defaults to 1",
-	},
-	{
-		name: "http.<url>.noEPSV",
-		insertValue: "http.{cursor}.noEPSV",
-		description:
-			'A boolean which disables using of EPSV ftp command by curl. This can helpful with some "poor" ftp servers which don\'t support EPSV mode. Can be overridden by the `GIT_CURL_FTP_NO_EPSV` environment variable. Default is false (curl will use EPSV)',
-	},
-	{
-		name: "http.<url>.pinnedPubkey",
-		insertValue: "http.{cursor}.pinnedPubkey",
-		description:
-			"Public key of the https service. It may either be the filename of a PEM or DER encoded public key file or a string starting with 'sha256//' followed by the base64 encoded sha256 hash of the public key. See also libcurl 'CURLOPT_PINNEDPUBLICKEY'. git will exit with an error if this option is set but not supported by cURL",
-	},
-	{
-		name: "http.<url>.postBuffer",
-		insertValue: "http.{cursor}.postBuffer",
-		description:
-			"Maximum size in bytes of the buffer used by smart HTTP transports when POSTing data to the remote system. For requests larger than this buffer size, HTTP/1.1 and Transfer-Encoding: chunked is used to avoid creating a massive pack file locally. Default is 1 MiB, which is sufficient for most requests",
-	},
-	{
-		name: "http.<url>.proxy",
-		insertValue: "http.{cursor}.proxy",
-		description:
-			"Override the HTTP proxy, normally configured using the 'http_proxy', 'https_proxy', and 'all_proxy' environment variables (see `curl(1)`). In addition to the syntax understood by curl, it is possible to specify a proxy string with a user name but no password, in which case git will attempt to acquire one in the same way it does for other credentials. See gitcredentials[7] for more information. The syntax thus is '[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden on a per-remote basis; see remote.<name>.proxy",
-	},
-	{
-		name: "http.<url>.proxyAuthMethod",
-		insertValue: "http.{cursor}.proxyAuthMethod",
-		description:
-			"Set the method with which to authenticate against the HTTP proxy. This only takes effect if the configured proxy string contains a user name part (i.e. is of the form 'user@host' or 'user@host:port'). This can be overridden on a per-remote basis; see `remote.<name>.proxyAuthMethod`. Both can be overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment variable. Possible values are:",
-	},
-	{
-		name: "http.<url>.proxySSLCAInfo",
-		insertValue: "http.{cursor}.proxySSLCAInfo",
-		description:
-			"Pathname to the file containing the certificate bundle that should be used to verify the proxy with when using an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CAINFO` environment variable",
-	},
-	{
-		name: "http.<url>.proxySSLCert",
-		insertValue: "http.{cursor}.proxySSLCert",
-		description:
-			"The pathname of a file that stores a client certificate to use to authenticate with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CERT` environment variable",
-	},
-	{
-		name: "http.<url>.proxySSLCertPasswordProtected",
-		insertValue: "http.{cursor}.proxySSLCertPasswordProtected",
-		description:
-			"Enable Git's password prompt for the proxy SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED` environment variable",
-	},
-	{
-		name: "http.<url>.proxySSLKey",
-		insertValue: "http.{cursor}.proxySSLKey",
-		description:
-			"The pathname of a file that stores a private key to use to authenticate with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_KEY` environment variable",
-	},
-	{
-		name: "http.<url>.saveCookies",
-		insertValue: "http.{cursor}.saveCookies",
-		description:
-			"If set, store cookies received during requests to the file specified by http.cookieFile. Has no effect if http.cookieFile is unset",
-	},
-	{
-		name: "http.<url>.schannelCheckRevoke",
-		insertValue: "http.{cursor}.schannelCheckRevoke",
-		description:
-			'Used to enforce or disable certificate revocation checks in cURL when http.sslBackend is set to "schannel". Defaults to `true` if unset. Only necessary to disable this if Git consistently errors and the message is about checking the revocation status of a certificate. This option is ignored if cURL lacks support for setting the relevant SSL option at runtime',
-	},
-	{
-		name: "http.<url>.schannelUseSSLCAInfo",
-		insertValue: "http.{cursor}.schannelUseSSLCAInfo",
-		description:
-			"As of cURL v7.60.0, the Secure Channel backend can use the certificate bundle provided via `http.sslCAInfo`, but that would override the Windows Certificate Store. Since this is not desirable by default, Git will tell cURL not to use that bundle by default when the `schannel` backend was configured via `http.sslBackend`, unless `http.schannelUseSSLCAInfo` overrides this behavior",
-	},
-	{
-		name: "http.<url>.sslBackend",
-		insertValue: "http.{cursor}.sslBackend",
-		description:
-			'Name of the SSL backend to use (e.g. "openssl" or "schannel"). This option is ignored if cURL lacks support for choosing the SSL backend at runtime',
-	},
-	{
-		name: "http.<url>.sslCAInfo",
-		insertValue: "http.{cursor}.sslCAInfo",
-		description:
-			"File containing the certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAINFO` environment variable",
-	},
-	{
-		name: "http.<url>.sslCAPath",
-		insertValue: "http.{cursor}.sslCAPath",
-		description:
-			"Path containing files with the CA certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAPATH` environment variable",
-	},
-	{
-		name: "http.<url>.sslCert",
-		insertValue: "http.{cursor}.sslCert",
-		description:
-			"File containing the SSL certificate when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CERT` environment variable",
-	},
-	{
-		name: "http.<url>.sslCertPasswordProtected",
-		insertValue: "http.{cursor}.sslCertPasswordProtected",
-		description:
-			"Enable Git's password prompt for the SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the `GIT_SSL_CERT_PASSWORD_PROTECTED` environment variable",
-	},
-	{
-		name: "http.<url>.sslKey",
-		insertValue: "http.{cursor}.sslKey",
-		description:
-			"File containing the SSL private key when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_KEY` environment variable",
-	},
-	{
-		name: "http.<url>.sslTry",
-		insertValue: "http.{cursor}.sslTry",
-		description:
-			"Attempt to use AUTH SSL/TLS and encrypted data transfers when connecting via regular FTP protocol. This might be needed if the FTP server requires it for security reasons or you wish to connect securely whenever remote FTP server supports it. Default is false since it might trigger certificate verification errors on misconfigured servers",
-	},
-	{
-		name: "http.<url>.sslVerify",
-		insertValue: "http.{cursor}.sslVerify",
-		description:
-			"Whether to verify the SSL certificate when fetching or pushing over HTTPS. Defaults to true. Can be overridden by the `GIT_SSL_NO_VERIFY` environment variable",
-	},
-	{
-		name: "http.<url>.sslVersion",
-		insertValue: "http.{cursor}.sslVersion",
-		description:
-			"The SSL version to use when negotiating an SSL connection, if you want to force the default. The available and default version depend on whether libcurl was built against NSS or OpenSSL and the particular configuration of the crypto library in use. Internally this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl documentation for more details on the format of this option and for the ssl version supported. Currently the possible values of this option are:",
-	},
-	{
-		name: "http.<url>.userAgent",
-		insertValue: "http.{cursor}.userAgent",
-		description:
-			"The HTTP USER_AGENT string presented to an HTTP server. The default value represents the version of the client Git such as git/1.7.1. This option allows you to override this value to a more common value such as Mozilla/4.0. This may be necessary, for instance, if connecting through a firewall that restricts HTTP connections to a set of common USER_AGENT strings (but not including those like git/1.7.1). Can be overridden by the `GIT_HTTP_USER_AGENT` environment variable",
-	},
-	{
-		name: "http.<url>.version",
-		insertValue: "http.{cursor}.version",
-		description:
-			"Use the specified HTTP protocol version when communicating with a server. If you want to force the default. The available and default version depend on libcurl. Currently the possible values of this option are:",
-	},
-	{
-		name: "i18n.commitEncoding",
-		description:
-			"Character encoding the commit messages are stored in; Git itself does not care per se, but this information is necessary e.g. when importing commits from emails or in the gitk graphical history browser (and possibly at other places in the future or in other porcelains). See e.g. git-mailinfo[1]. Defaults to 'utf-8'",
-	},
-	{
-		name: "i18n.logOutputEncoding",
-		description:
-			"Character encoding the commit messages are converted to when running 'git log' and friends",
-	},
-	{
-		name: "imap.authMethod",
-		description:
-			"Specify authenticate method for authentication with IMAP server. If Git was built with the NO_CURL option, or if your curl version is older than 7.34.0, or if you're running git-imap-send with the `--no-curl` option, the only supported method is 'CRAM-MD5'. If this is not set then 'git imap-send' uses the basic IMAP plaintext LOGIN command",
-	},
-	{
-		name: "imap.folder",
-		description:
-			'The folder to drop the mails into, which is typically the Drafts folder. For example: "INBOX.Drafts", "INBOX/Drafts" or "[Gmail]/Drafts". Required',
-	},
-	{
-		name: "imap.host",
-		description:
-			"A URL identifying the server. Use an `imap://` prefix for non-secure connections and an `imaps://` prefix for secure connections. Ignored when imap.tunnel is set, but required otherwise",
-	},
-	{
-		name: "imap.pass",
-		description: "The password to use when logging in to the server",
-	},
-	{
-		name: "imap.port",
-		description:
-			"An integer port number to connect to on the server. Defaults to 143 for imap:// hosts and 993 for imaps:// hosts. Ignored when imap.tunnel is set",
-	},
-	{
-		name: "imap.preformattedHTML",
-		description:
-			"A boolean to enable/disable the use of html encoding when sending a patch. An html encoded patch will be bracketed with <pre> and have a content type of text/html. Ironically, enabling this option causes Thunderbird to send the patch as a plain/text, format=fixed email. Default is `false`",
-	},
-	{
-		name: "imap.sslverify",
-		description:
-			"A boolean to enable/disable verification of the server certificate used by the SSL/TLS connection. Default is `true`. Ignored when imap.tunnel is set",
-	},
-	{
-		name: "imap.tunnel",
-		description:
-			"Command used to setup a tunnel to the IMAP server through which commands will be piped instead of using a direct network connection to the server. Required when imap.host is not set",
-	},
-	{
-		name: "imap.user",
-		description: "The username to use when logging in to the server",
-	},
-	{
-		name: "includeIf.<condition>.path",
-		insertValue: "includeIf.{cursor}.path",
-		description:
-			'Special variables to include other configuration files. See the "CONFIGURATION FILE" section in the main git-config[1] documentation, specifically the "Includes" and "Conditional Includes" subsections',
-	},
-	{
-		name: "index.recordEndOfIndexEntries",
-		description:
-			"Specifies whether the index file should include an \"End Of Index Entry\" section. This reduces index load time on multiprocessor machines but produces a message \"ignoring EOIE extension\" when reading the index using Git versions before 2.20. Defaults to 'true' if index.threads has been explicitly enabled, 'false' otherwise",
-	},
-	{
-		name: "index.recordOffsetTable",
-		description:
-			"Specifies whether the index file should include an \"Index Entry Offset Table\" section. This reduces index load time on multiprocessor machines but produces a message \"ignoring IEOT extension\" when reading the index using Git versions before 2.20. Defaults to 'true' if index.threads has been explicitly enabled, 'false' otherwise",
-	},
-	{
-		name: "index.sparse",
-		description:
-			"When enabled, write the index using sparse-directory entries. This has no effect unless `core.sparseCheckout` and `core.sparseCheckoutCone` are both enabled. Defaults to 'false'",
-	},
-	{
-		name: "index.threads",
-		description:
-			"Specifies the number of threads to spawn when loading the index. This is meant to reduce index load time on multiprocessor machines. Specifying 0 or 'true' will cause Git to auto-detect the number of CPU's and set the number of threads accordingly. Specifying 1 or 'false' will disable multithreading. Defaults to 'true'",
-	},
-	{
-		name: "index.version",
-		description:
-			"Specify the version with which new index files should be initialized. This does not affect existing repositories. If `feature.manyFiles` is enabled, then the default is 4",
-	},
-	{
-		name: "init.defaultBranch",
-		description:
-			"Allows overriding the default branch name e.g. when initializing a new repository",
-	},
-	{
-		name: "init.templateDir",
-		description:
-			'Specify the directory from which templates will be copied. (See the "TEMPLATE DIRECTORY" section of git-init[1].)',
-	},
-	{
-		name: "instaweb.browser",
-		description:
-			"Specify the program that will be used to browse your working repository in gitweb. See git-instaweb[1]",
-	},
-	{
-		name: "instaweb.httpd",
-		description:
-			"The HTTP daemon command-line to start gitweb on your working repository. See git-instaweb[1]",
-	},
-	{
-		name: "instaweb.local",
-		description:
-			"If true the web server started by git-instaweb[1] will be bound to the local IP (127.0.0.1)",
-	},
-	{
-		name: "instaweb.modulePath",
-		description:
-			"The default module path for git-instaweb[1] to use instead of /usr/lib/apache2/modules. Only used if httpd is Apache",
-	},
-	{
-		name: "instaweb.port",
-		description:
-			"The port number to bind the gitweb httpd to. See git-instaweb[1]",
-	},
-	{
-		name: "interactive.diffFilter",
-		description:
-			"When an interactive command (such as `git add --patch`) shows a colorized diff, git will pipe the diff through the shell command defined by this configuration variable. The command may mark up the diff further for human consumption, provided that it retains a one-to-one correspondence with the lines in the original diff. Defaults to disabled (no filtering)",
-	},
-	{
-		name: "interactive.singleKey",
-		description:
-			"In interactive commands, allow the user to provide one-letter input with a single key (i.e., without hitting enter). Currently this is used by the `--patch` mode of git-add[1], git-checkout[1], git-restore[1], git-commit[1], git-reset[1], and git-stash[1]. Note that this setting is silently ignored if portable keystroke input is not available; requires the Perl module Term::ReadKey",
-	},
-	{
-		name: "log.abbrevCommit",
-		description:
-			"If true, makes git-log[1], git-show[1], and git-whatchanged[1] assume `--abbrev-commit`. You may override this option with `--no-abbrev-commit`",
-	},
-	{
-		name: "log.date",
-		description:
-			"Set the default date-time mode for the 'log' command. Setting a value for log.date is similar to using 'git log''s `--date` option. See git-log[1] for details",
-	},
-	{
-		name: "log.decorate",
-		description:
-			"Print out the ref names of any commits that are shown by the log command. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. This is the same as the `--decorate` option of the `git log`",
-	},
-	{
-		name: "log.diffMerges",
-		description:
-			"Set default diff format to be used for merge commits. See `--diff-merges` in git-log[1] for details. Defaults to `separate`",
-	},
-	{
-		name: "log.excludeDecoration",
-		description:
-			"Exclude the specified patterns from the log decorations. This is similar to the `--decorate-refs-exclude` command-line option, but the config option can be overridden by the `--decorate-refs` option",
-	},
-	{
-		name: "log.follow",
-		description:
-			"If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given. This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history",
-	},
-	{
-		name: "log.graphColors",
-		description:
-			"A list of colors, separated by commas, that can be used to draw history lines in `git log --graph`",
-	},
-	{
-		name: "log.initialDecorationSet",
-		description:
-			"By default, `git log` only shows decorations for certain known ref namespaces. If 'all' is specified, then show all refs as decorations",
-	},
-	{
-		name: "log.mailmap",
-		description:
-			"If true, makes git-log[1], git-show[1], and git-whatchanged[1] assume `--use-mailmap`, otherwise assume `--no-use-mailmap`. True by default",
-	},
-	{
-		name: "log.showRoot",
-		description:
-			"If true, the initial commit will be shown as a big creation event. This is equivalent to a diff against an empty tree. Tools like git-log[1] or git-whatchanged[1], which normally hide the root commit will now show it. True by default",
-	},
-	{
-		name: "log.showSignature",
-		description:
-			"If true, makes git-log[1], git-show[1], and git-whatchanged[1] assume `--show-signature`",
-	},
-	{
-		name: "lsrefs.unborn",
-		description:
-			'May be "advertise" (the default), "allow", or "ignore". If "advertise", the server will respond to the client sending "unborn" (as described in gitprotocol-v2[5]) and will advertise support for this feature during the protocol v2 capability advertisement. "allow" is the same as "advertise" except that the server will not advertise support for this feature; this is useful for load-balanced servers that cannot be updated atomically (for example), since the administrator could configure "allow", then after a delay, configure "advertise"',
-	},
-	{
-		name: "mailinfo.scissors",
-		description:
-			'If true, makes git-mailinfo[1] (and therefore git-am[1]) act by default as if the --scissors option was provided on the command-line. When active, this features removes everything from the message body before a scissors line (i.e. consisting mainly of ">8", "8<" and "-")',
-	},
-	{
-		name: "mailmap.blob",
-		description:
-			"Like `mailmap.file`, but consider the value as a reference to a blob in the repository. If both `mailmap.file` and `mailmap.blob` are given, both are parsed, with entries from `mailmap.file` taking precedence. In a bare repository, this defaults to `HEAD:.mailmap`. In a non-bare repository, it defaults to empty",
-	},
-	{
-		name: "mailmap.file",
-		description:
-			"The location of an augmenting mailmap file. The default mailmap, located in the root of the repository, is loaded first, then the mailmap file pointed to by this variable. The location of the mailmap file may be in a repository subdirectory, or somewhere outside of the repository itself. See git-shortlog[1] and git-blame[1]",
-	},
-	{
-		name: "maintenance.<task>.enabled",
-		insertValue: "maintenance.{cursor}.enabled",
-		description:
-			"This boolean config option controls whether the maintenance task with name `<task>` is run when no `--task` option is specified to `git maintenance run`. These config values are ignored if a `--task` option exists. By default, only `maintenance.gc.enabled` is true",
-	},
-	{
-		name: "maintenance.<task>.schedule",
-		insertValue: "maintenance.{cursor}.schedule",
-		description:
-			'This config option controls whether or not the given `<task>` runs during a `git maintenance run --schedule=<frequency>` command. The value must be one of "hourly", "daily", or "weekly"',
-	},
-	{
-		name: "maintenance.auto",
-		description:
-			"This boolean config option controls whether some commands run `git maintenance run --auto` after doing their normal work. Defaults to true",
-	},
-	{
-		name: "maintenance.commit-graph.auto",
-		description:
-			"This integer config option controls how often the `commit-graph` task should be run as part of `git maintenance run --auto`. If zero, then the `commit-graph` task will not run with the `--auto` option. A negative value will force the task to run every time. Otherwise, a positive value implies the command should run when the number of reachable commits that are not in the commit-graph file is at least the value of `maintenance.commit-graph.auto`. The default value is 100",
-	},
-	{
-		name: "maintenance.incremental-repack.auto",
-		description:
-			"This integer config option controls how often the `incremental-repack` task should be run as part of `git maintenance run --auto`. If zero, then the `incremental-repack` task will not run with the `--auto` option. A negative value will force the task to run every time. Otherwise, a positive value implies the command should run when the number of pack-files not in the multi-pack-index is at least the value of `maintenance.incremental-repack.auto`. The default value is 10",
-	},
-	{
-		name: "maintenance.loose-objects.auto",
-		description:
-			"This integer config option controls how often the `loose-objects` task should be run as part of `git maintenance run --auto`. If zero, then the `loose-objects` task will not run with the `--auto` option. A negative value will force the task to run every time. Otherwise, a positive value implies the command should run when the number of loose objects is at least the value of `maintenance.loose-objects.auto`. The default value is 100",
-	},
-	{
-		name: "maintenance.strategy",
-		description:
-			"This string config option provides a way to specify one of a few recommended schedules for background maintenance. This only affects which tasks are run during `git maintenance run --schedule=X` commands, provided no `--task=<task>` arguments are provided. Further, if a `maintenance.<task>.schedule` config value is set, then that value is used instead of the one provided by `maintenance.strategy`. The possible strategy strings are:",
-	},
-	{
-		name: "man.<tool>.cmd",
-		insertValue: "man.{cursor}.cmd",
-		description:
-			"Specify the command to invoke the specified man viewer. The specified command is evaluated in shell with the man page passed as argument. (See git-help[1].)",
-	},
-	{
-		name: "man.<tool>.path",
-		insertValue: "man.{cursor}.path",
-		description:
-			"Override the path for the given tool that may be used to display help in the 'man' format. See git-help[1]",
-	},
-	{
-		name: "man.viewer",
-		description:
-			"Specify the programs that may be used to display help in the 'man' format. See git-help[1]",
-	},
-	{
-		name: "merge.<driver>.driver",
-		insertValue: "merge.{cursor}.driver",
-		description:
-			"Defines the command that implements a custom low-level merge driver. See gitattributes[5] for details",
-	},
-	{
-		name: "merge.<driver>.name",
-		insertValue: "merge.{cursor}.name",
-		description:
-			"Defines a human-readable name for a custom low-level merge driver. See gitattributes[5] for details",
-	},
-	{
-		name: "merge.<driver>.recursive",
-		insertValue: "merge.{cursor}.recursive",
-		description:
-			"Names a low-level merge driver to be used when performing an internal merge between common ancestors. See gitattributes[5] for details",
-	},
-	{
-		name: "merge.autoStash",
-		description:
-			"When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run merge on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts. This option can be overridden by the `--no-autostash` and `--autostash` options of git-merge[1]. Defaults to false",
-	},
-	{
-		name: "merge.branchdesc",
-		description:
-			"In addition to branch names, populate the log message with the branch description text associated with them. Defaults to false",
-	},
-	{
-		name: "merge.conflictStyle",
-		description:
-			'Specify the style in which conflicted hunks are written out to working tree files upon merge. The default is "merge", which shows a `<<<<<<<` conflict marker, changes made by one side, a `=======` marker, changes made by the other side, and then a `>>>>>>>` marker. An alternate style, "diff3", adds a `|||||||` marker and the original text before the `=======` marker. The "merge" style tends to produce smaller conflict regions than diff3, both because of the exclusion of the original text, and because when a subset of lines match on the two sides they are just pulled out of the conflict region. Another alternate style, "zdiff3", is similar to diff3 but removes matching lines on the two sides from the conflict region when those matching lines appear near either the beginning or end of a conflict region',
-	},
-	{
-		name: "merge.defaultToUpstream",
-		description:
-			"If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last observed values stored in their remote-tracking branches. The values of the `branch.<current branch>.merge` that name the branches at the remote named by `branch.<current branch>.remote` are consulted, and then they are mapped via `remote.<remote>.fetch` to their corresponding remote-tracking branches, and the tips of these tracking branches are merged. Defaults to true",
-	},
-	{
-		name: "merge.directoryRenames",
-		description:
-			'Whether Git detects directory renames, affecting what happens at merge time to new files added to a directory on one side of history when that directory was renamed on the other side of history. If merge.directoryRenames is set to "false", directory rename detection is disabled, meaning that such new files will be left behind in the old directory. If set to "true", directory rename detection is enabled, meaning that such new files will be moved into the new directory. If set to "conflict", a conflict will be reported for such paths. If merge.renames is false, merge.directoryRenames is ignored and treated as false. Defaults to "conflict"',
-	},
-	{
-		name: "merge.ff",
-		description:
-			"By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to `false`, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the `--no-ff` option from the command line). When set to `only`, only such fast-forward merges are allowed (equivalent to giving the `--ff-only` option from the command line)",
-	},
-	{
-		name: "merge.guitool",
-		description:
-			"Controls which merge tool is used by git-mergetool[1] when the -g/--gui flag is specified. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<guitool>.cmd variable is defined",
-	},
-	{
-		name: "merge.log",
-		description:
-			"In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20",
-	},
-	{
-		name: "merge.renameLimit",
-		description:
-			"The number of files to consider in the exhaustive portion of rename detection during a merge. If not specified, defaults to the value of diff.renameLimit. If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000. This setting has no effect if rename detection is turned off",
-	},
-	{
-		name: "merge.renames",
-		description:
-			'Whether Git detects renames. If set to "false", rename detection is disabled. If set to "true", basic rename detection is enabled. Defaults to the value of diff.renames',
-	},
-	{
-		name: "merge.renormalize",
-		description:
-			'Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line endings). In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section "Merging branches with differing checkin/checkout attributes" in gitattributes[5]',
-	},
-	{
-		name: "merge.stat",
-		description:
-			"Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default",
-	},
-	{
-		name: "merge.suppressDest",
-		description:
-			'By adding a glob that matches the names of integration branches to this multi-valued configuration variable, the default merge message computed for merges into these integration branches will omit "into <branch name>" from its title',
-	},
-	{
-		name: "merge.tool",
-		description:
-			"Controls which merge tool is used by git-mergetool[1]. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<tool>.cmd variable is defined",
-	},
-	{
-		name: "merge.verbosity",
-		description:
-			"Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable",
-	},
-	{
-		name: "merge.verifySignatures",
-		description:
-			"If true, this is equivalent to the --verify-signatures command line option. See git-merge[1] for details",
-	},
-	{
-		name: "mergetool.<tool>.cmd",
-		insertValue: "mergetool.{cursor}.cmd",
-		description:
-			"Specify the command to invoke the specified merge tool. The specified command is evaluated in shell with the following variables available: 'BASE' is the name of a temporary file containing the common base of the files to be merged, if available; 'LOCAL' is the name of a temporary file containing the contents of the file on the current branch; 'REMOTE' is the name of a temporary file containing the contents of the file from the branch being merged; 'MERGED' contains the name of the file to which the merge tool should write the results of a successful merge",
-	},
-	{
-		name: "mergetool.<tool>.hideResolved",
-		insertValue: "mergetool.{cursor}.hideResolved",
-		description:
-			"Allows the user to override the global `mergetool.hideResolved` value for a specific tool. See `mergetool.hideResolved` for the full description",
-	},
-	{
-		name: "mergetool.<tool>.path",
-		insertValue: "mergetool.{cursor}.path",
-		description:
-			"Override the path for the given tool. This is useful in case your tool is not in the PATH",
-	},
-	{
-		name: "mergetool.<tool>.trustExitCode",
-		insertValue: "mergetool.{cursor}.trustExitCode",
-		description:
-			"For a custom merge command, specify whether the exit code of the merge command can be used to determine whether the merge was successful. If this is not set to true then the merge target file timestamp is checked and the merge assumed to have been successful if the file has been updated, otherwise the user is prompted to indicate the success of the merge",
-	},
-	{
-		name: "mergetool.hideResolved",
-		description:
-			"During a merge Git will automatically resolve as many conflicts as possible and write the 'MERGED' file containing conflict markers around any conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally represent the versions of the file from before Git's conflict resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so that only the unresolved conflicts are presented to the merge tool. Can be configured per-tool via the `mergetool.<tool>.hideResolved` configuration variable. Defaults to `false`",
-	},
-	{
-		name: "mergetool.keepBackup",
-		description:
-			"After performing a merge, the original file with conflict markers can be saved as a file with a `.orig` extension. If this variable is set to `false` then this file is not preserved. Defaults to `true` (i.e. keep the backup files)",
-	},
-	{
-		name: "mergetool.keepTemporaries",
-		description:
-			"When invoking a custom merge tool, Git uses a set of temporary files to pass to the tool. If the tool returns an error and this variable is set to `true`, then these temporary files will be preserved, otherwise they will be removed after the tool has exited. Defaults to `false`",
-	},
-	{
-		name: "mergetool.meld.hasOutput",
-		description:
-			"Older versions of `meld` do not support the `--output` option. Git will attempt to detect whether `meld` supports `--output` by inspecting the output of `meld --help`. Configuring `mergetool.meld.hasOutput` will make Git skip these checks and use the configured value instead. Setting `mergetool.meld.hasOutput` to `true` tells Git to unconditionally use the `--output` option, and `false` avoids using `--output`",
-	},
-	{
-		name: "mergetool.meld.useAutoMerge",
-		description:
-			"When the `--auto-merge` is given, meld will merge all non-conflicting parts automatically, highlight the conflicting parts and wait for user decision. Setting `mergetool.meld.useAutoMerge` to `true` tells Git to unconditionally use the `--auto-merge` option with `meld`. Setting this value to `auto` makes git detect whether `--auto-merge` is supported and will only use `--auto-merge` when available. A value of `false` avoids using `--auto-merge` altogether, and is the default value",
-	},
-	{
-		name: "mergetool.prompt",
-		description:
-			"Prompt before each invocation of the merge resolution program",
-	},
-	{
-		name: "mergetool.vimdiff.layout",
-		description:
-			"The vimdiff backend uses this variable to control how its split windows look like. Applies even if you are using Neovim (`nvim`) or gVim (`gvim`) as the merge tool. See BACKEND SPECIFIC HINTS section",
-	},
-	{
-		name: "mergetool.writeToTemp",
-		description:
-			"Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of conflicting files in the worktree by default. Git will attempt to use a temporary directory for these files when set `true`. Defaults to `false`",
-	},
-	{
-		name: "notes.<name>.mergeStrategy",
-		insertValue: "notes.{cursor}.mergeStrategy",
-		description:
-			'Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in git-notes[1] for more information on the available strategies',
-	},
-	{
-		name: "notes.displayRef",
-		description:
-			"The (fully qualified) refname from which to show notes when showing commit messages. The value of this variable can be set to a glob, in which case notes from all matching refs will be shown. You may also specify this configuration variable several times. A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored",
-	},
-	{
-		name: "notes.mergeStrategy",
-		description:
-			'Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See "NOTES MERGE STRATEGIES" section of git-notes[1] for more information on each strategy',
-	},
-	{
-		name: "notes.rewrite.<command>",
-		insertValue: "notes.rewrite.{cursor}",
-		description:
-			'When rewriting commits with <command> (currently `amend` or `rebase`) and this variable is set to `true`, Git automatically copies your notes from the original to the rewritten commit. Defaults to `true`, but see "notes.rewriteRef" below',
-	},
-	{
-		name: "notes.rewriteMode",
-		description:
-			'When copying notes during a rewrite (see the "notes.rewrite.<command>" option), determines what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`',
-	},
-	{
-		name: "notes.rewriteRef",
-		description:
-			"When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. The ref may be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times",
-	},
-	{
-		name: "pack.allowPackReuse",
-		description:
-			"When true, and when reachability bitmaps are enabled, pack-objects will try to send parts of the bitmapped packfile verbatim. This can reduce memory and CPU usage to serve fetches, but might result in sending a slightly larger pack. Defaults to true",
-	},
-	{
-		name: "pack.compression",
-		description:
-			'An integer -1..9, indicating the compression level for objects in a pack file. -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If not set, defaults to core.compression. If that is not set, defaults to -1, the zlib default, which is "a default compromise between speed and compression (currently equivalent to level 6)"',
-	},
-	{
-		name: "pack.deltaCacheLimit",
-		description:
-			"The maximum size of a delta, that is cached in git-pack-objects[1]. This cache is used to speed up the writing object phase by not having to recompute the final delta result once the best match for all objects is found. Defaults to 1000. Maximum value is 65535",
-	},
-	{
-		name: "pack.deltaCacheSize",
-		description:
-			"The maximum memory in bytes used for caching deltas in git-pack-objects[1] before writing them out to a pack. This cache is used to speed up the writing object phase by not having to recompute the final delta result once the best match for all objects is found. Repacking large repositories on machines which are tight with memory might be badly impacted by this though, especially if this cache pushes the system into swapping. A value of 0 means no limit. The smallest size of 1 byte may be used to virtually disable this cache. Defaults to 256 MiB",
-	},
-	{
-		name: "pack.depth",
-		description:
-			"The maximum delta depth used by git-pack-objects[1] when no maximum depth is given on the command line. Defaults to 50. Maximum value is 4095",
-	},
-	{
-		name: "pack.indexVersion",
-		description:
-			"Specify the default pack index version. Valid values are 1 for legacy pack index used by Git versions prior to 1.5.2, and 2 for the new pack index with capabilities for packs larger than 4 GB as well as proper protection against the repacking of corrupted packs. Version 2 is the default. Note that version 2 is enforced and this config option ignored whenever the corresponding pack is larger than 2 GB",
-	},
-	{
-		name: "pack.island",
-		description:
-			'An extended regular expression configuring a set of delta islands. See "DELTA ISLANDS" in git-pack-objects[1] for details',
-	},
-	{
-		name: "pack.islandCore",
-		description:
-			'Specify an island name which gets to have its objects be packed first. This creates a kind of pseudo-pack at the front of one pack, so that the objects from the specified island are hopefully faster to copy into any pack that should be served to a user requesting these objects. In practice this means that the island specified should likely correspond to what is the most commonly cloned in the repo. See also "DELTA ISLANDS" in git-pack-objects[1]',
-	},
-	{
-		name: "pack.packSizeLimit",
-		description:
-			"The maximum size of a pack. This setting only affects packing to a file when repacking, i.e. the git:// protocol is unaffected. It can be overridden by the `--max-pack-size` option of git-repack[1]. Reaching this limit results in the creation of multiple packfiles",
-	},
-	{
-		name: "pack.preferBitmapTips",
-		description:
-			'When selecting which commits will receive bitmaps, prefer a commit at the tip of any reference that is a suffix of any value of this configuration over any other commits in the "selection window"',
-	},
-	{
-		name: "pack.threads",
-		description:
-			"Specifies the number of threads to spawn when searching for best delta matches. This requires that git-pack-objects[1] be compiled with pthreads otherwise this option is ignored with a warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. Specifying 0 will cause Git to auto-detect the number of CPU's and set the number of threads accordingly",
-	},
-	{
-		name: "pack.useBitmaps",
-		description:
-			"When true, git will use pack bitmaps (if available) when packing to stdout (e.g., during the server side of a fetch). Defaults to true. You should not generally need to turn this off unless you are debugging pack bitmaps",
-	},
-	{
-		name: "pack.useSparse",
-		description:
-			"When true, git will default to using the '--sparse' option in 'git pack-objects' when the '--revs' option is present. This algorithm only walks trees that appear in paths that introduce new objects. This can have significant performance benefits when computing a pack to send a small change. However, it is possible that extra objects are added to the pack-file if the included commits contain certain types of direct renames. Default is `true`",
-	},
-	{
-		name: "pack.window",
-		description:
-			"The size of the window used by git-pack-objects[1] when no window size is given on the command line. Defaults to 10",
-	},
-	{
-		name: "pack.windowMemory",
-		description:
-			'The maximum size of memory that is consumed by each thread in git-pack-objects[1] for pack window memory when no limit is given on the command line. The value can be suffixed with "k", "m", or "g". When left unconfigured (or set explicitly to 0), there will be no limit',
-	},
-	{
-		name: "pack.writeBitmapHashCache",
-		description:
-			'When true, git will include a "hash cache" section in the bitmap index (if one is written). This cache can be used to feed git\'s delta heuristics, potentially leading to better deltas between bitmapped and non-bitmapped objects (e.g., when serving a fetch between an older, bitmapped pack and objects that have been pushed since the last gc). The downside is that it consumes 4 bytes per object of disk space. Defaults to true',
-	},
-	{
-		name: "pack.writeBitmapLookupTable",
-		description:
-			'When true, Git will include a "lookup table" section in the bitmap index (if one is written). This table is used to defer loading individual bitmaps as late as possible. This can be beneficial in repositories that have relatively large bitmap indexes. Defaults to false',
-	},
-	{
-		name: "pack.writeBitmaps",
-		description: "This is a deprecated synonym for `repack.writeBitmaps`",
-		deprecated: true,
-		hidden: true,
-	},
-	{
-		name: "pack.writeReverseIndex",
-		description:
-			"When true, git will write a corresponding .rev file (see: gitformat-pack[5]) for each new packfile that it writes in all places except for git-fast-import[1] and in the bulk checkin mechanism. Defaults to false",
-	},
-	{
-		name: "pager.<cmd>",
-		insertValue: "pager.{cursor}",
-		description:
-			"If the value is boolean, turns on or off pagination of the output of a particular Git subcommand when writing to a tty. Otherwise, turns on pagination for the subcommand using the pager specified by the value of `pager.<cmd>`. If `--paginate` or `--no-pager` is specified on the command line, it takes precedence over this option. To disable pagination for all commands, set `core.pager` or `GIT_PAGER` to `cat`",
-	},
-	{
-		name: "pretty.<name>",
-		insertValue: "pretty.{cursor}",
-		description:
-			'Alias for a --pretty= format string, as specified in git-log[1]. Any aliases defined here can be used just as the built-in pretty formats could. For example, running `git config pretty.changelog "format:* %H %s"` would cause the invocation `git log --pretty=changelog` to be equivalent to running `git log "--pretty=format:* %H %s"`. Note that an alias with the same name as a built-in format will be silently ignored',
-	},
-	{
-		name: "protocol.<name>.allow",
-		insertValue: "protocol.{cursor}.allow",
-		description:
-			"Set a policy to be used by protocol `<name>` with clone/fetch/push commands. See `protocol.allow` above for the available policies",
-	},
-	{
-		name: "protocol.allow",
-		description:
-			"If set, provide a user defined default policy for all protocols which don't explicitly have a policy (`protocol.<name>.allow`). By default, if unset, known-safe protocols (http, https, git, ssh, file) have a default policy of `always`, known-dangerous protocols (ext) have a default policy of `never`, and all other protocols have a default policy of `user`. Supported policies:",
-	},
-	{
-		name: "protocol.version",
-		description:
-			"If set, clients will attempt to communicate with a server using the specified protocol version. If the server does not support it, communication falls back to version 0. If unset, the default is `2`. Supported versions:",
-	},
-	{
-		name: "pull.ff",
-		description:
-			"By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to `false`, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the `--no-ff` option from the command line). When set to `only`, only such fast-forward merges are allowed (equivalent to giving the `--ff-only` option from the command line). This setting overrides `merge.ff` when pulling",
-	},
-	{
-		name: "pull.octopus",
-		description:
-			"The default merge strategy to use when pulling multiple branches at once",
-	},
-	{
-		name: "pull.rebase",
-		description:
-			'When true, rebase branches on top of the fetched branch, instead of merging the default branch from the default remote when "git pull" is run. See "branch.<name>.rebase" for setting this on a per-branch basis',
-	},
-	{
-		name: "pull.twohead",
-		description:
-			"The default merge strategy to use when pulling a single branch",
-	},
-	{
-		name: "push.autoSetupRemote",
-		description:
-			"If set to \"true\" assume `--set-upstream` on default push when no upstream tracking exists for the current branch; this option takes effect with push.default options 'simple', 'upstream', and 'current'. It is useful if by default you want new branches to be pushed to the default remote (like the behavior of 'push.default=current') and you also want the upstream tracking to be set. Workflows most likely to benefit from this option are 'simple' central workflows where all branches are expected to have the same name on the remote",
-	},
-	{
-		name: "push.default",
-		description:
-			"Defines the action `git push` should take if no refspec is given (whether from the command-line, config, or elsewhere). Different values are well-suited for specific workflows; for instance, in a purely central workflow (i.e. the fetch source is equal to the push destination), `upstream` is probably what you want. Possible values are:",
-	},
-	{
-		name: "push.followTags",
-		description:
-			"If set to true enable `--follow-tags` option by default. You may override this configuration at time of push by specifying `--no-follow-tags`",
-	},
-	{
-		name: "push.gpgSign",
-		description:
-			"May be set to a boolean value, or the string 'if-asked'. A true value causes all pushes to be GPG signed, as if `--signed` is passed to git-push[1]. The string 'if-asked' causes pushes to be signed if the server supports it, as if `--signed=if-asked` is passed to 'git push'. A false value may override a value from a lower-priority config file. An explicit command-line flag always overrides this config option",
-	},
-	{
-		name: "push.negotiate",
-		description:
-			'If set to "true", attempt to reduce the size of the packfile sent by rounds of negotiation in which the client and the server attempt to find commits in common. If "false", Git will rely solely on the server\'s ref advertisement to find commits in common',
-	},
-	{
-		name: "push.pushOption",
-		description:
-			"When no `--push-option=<option>` argument is given from the command line, `git push` behaves as if each <value> of this variable is given as `--push-option=<value>`",
-	},
-	{
-		name: "push.recurseSubmodules",
-		description:
-			"Make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If the value is 'check' then Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing, the push will be aborted and exit with non-zero status. If the value is 'on-demand' then all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If the value is 'no' then default behavior of ignoring submodules when pushing is retained. You may override this configuration at time of push by specifying '--recurse-submodules=check|on-demand|no'. If not set, 'no' is used by default, unless 'submodule.recurse' is set (in which case a 'true' value means 'on-demand')",
-	},
-	{
-		name: "push.useBitmaps",
-		description:
-			'If set to "false", disable use of bitmaps for "git push" even if `pack.useBitmaps` is "true", without preventing other git operations from using bitmaps. Default is true',
-	},
-	{
-		name: "push.useForceIfIncludes",
-		description:
-			'If set to "true", it is equivalent to specifying `--force-if-includes` as an option to git-push[1] in the command line. Adding `--no-force-if-includes` at the time of push overrides this configuration setting',
-	},
-	{
-		name: "rebase.abbreviateCommands",
-		description:
-			"If set to true, `git rebase` will use abbreviated command names in the todo list resulting in something like this:",
-	},
-	{
-		name: "rebase.autoSquash",
-		description: "If set to true enable `--autosquash` option by default",
-	},
-	{
-		name: "rebase.autoStash",
-		description:
-			"When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts. This option can be overridden by the `--no-autostash` and `--autostash` options of git-rebase[1]. Defaults to false",
-	},
-	{
-		name: "rebase.backend",
-		description:
-			"Default backend to use for rebasing. Possible choices are 'apply' or 'merge'. In the future, if the merge backend gains all remaining capabilities of the apply backend, this setting may become unused",
-	},
-	{
-		name: "rebase.forkPoint",
-		description: "If set to false set `--no-fork-point` option by default",
-	},
-	{
-		name: "rebase.instructionFormat",
-		description:
-			"A format string, as specified in git-log[1], to be used for the todo list during an interactive rebase. The format will automatically have the long commit hash prepended to the format",
-	},
-	{
-		name: "rebase.missingCommitsCheck",
-		description:
-			'If set to "warn", git rebase -i will print a warning if some commits are removed (e.g. a line was deleted), however the rebase will still proceed. If set to "error", it will print the previous warning and stop the rebase, \'git rebase --edit-todo\' can then be used to correct the error. If set to "ignore", no checking is done. To drop a commit without warning or error, use the `drop` command in the todo list. Defaults to "ignore"',
-	},
-	{
-		name: "rebase.rescheduleFailedExec",
-		description:
-			"Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided). This is the same as specifying the `--reschedule-failed-exec` option",
-	},
-	{
-		name: "rebase.stat",
-		description:
-			"Whether to show a diffstat of what changed upstream since the last rebase. False by default",
-	},
-	{
-		name: "rebase.updateRefs",
-		description: "If set to true enable `--update-refs` option by default",
-	},
-	{
-		name: "receive.advertiseAtomic",
-		description:
-			"By default, git-receive-pack will advertise the atomic push capability to its clients. If you don't want to advertise this capability, set this variable to false",
-	},
-	{
-		name: "receive.advertisePushOptions",
-		description:
-			"When set to true, git-receive-pack will advertise the push options capability to its clients. False by default",
-	},
-	{
-		name: "receive.autogc",
-		description:
-			'By default, git-receive-pack will run "git-gc --auto" after receiving data from git-push and updating refs. You can stop it by setting this variable to false',
-	},
-	{
-		name: "receive.certNonceSeed",
-		description:
-			'By setting this variable to a string, `git receive-pack` will accept a `git push --signed` and verifies it by using a "nonce" protected by HMAC using this string as a secret key',
-	},
-	{
-		name: "receive.certNonceSlop",
-		description:
-			'When a `git push --signed` sent a push certificate with a "nonce" that was issued by a receive-pack serving the same repository within this many seconds, export the "nonce" found in the certificate to `GIT_PUSH_CERT_NONCE` to the hooks (instead of what the receive-pack asked the sending side to include). This may allow writing checks in `pre-receive` and `post-receive` a bit easier. Instead of checking `GIT_PUSH_CERT_NONCE_SLOP` environment variable that records by how many seconds the nonce is stale to decide if they want to accept the certificate, they only can check `GIT_PUSH_CERT_NONCE_STATUS` is `OK`',
-	},
-	{
-		name: "receive.denyCurrentBranch",
-		description:
-			'If set to true or "refuse", git-receive-pack will deny a ref update to the currently checked out branch of a non-bare repository. Such a push is potentially dangerous because it brings the HEAD out of sync with the index and working tree. If set to "warn", print a warning of such a push to stderr, but allow the push to proceed. If set to false or "ignore", allow such pushes with no message. Defaults to "refuse"',
-	},
-	{
-		name: "receive.denyDeleteCurrent",
-		description:
-			"If set to true, git-receive-pack will deny a ref update that deletes the currently checked out branch of a non-bare repository",
-	},
-	{
-		name: "receive.denyDeletes",
-		description:
-			"If set to true, git-receive-pack will deny a ref update that deletes the ref. Use this to prevent such a ref deletion via a push",
-	},
-	{
-		name: "receive.denyNonFastForwards",
-		description:
-			"If set to true, git-receive-pack will deny a ref update which is not a fast-forward. Use this to prevent such an update via a push, even if that push is forced. This configuration variable is set when initializing a shared repository",
-	},
-	{
-		name: "receive.fsck.<msg-id>",
-		insertValue: "receive.fsck.{cursor}",
-		description:
-			"Acts like `fsck.<msg-id>`, but is used by git-receive-pack[1] instead of git-fsck[1]. See the `fsck.<msg-id>` documentation for details",
-	},
-	{
-		name: "receive.fsck.skipList",
-		description:
-			"Acts like `fsck.skipList`, but is used by git-receive-pack[1] instead of git-fsck[1]. See the `fsck.skipList` documentation for details",
-	},
-	{
-		name: "receive.fsckObjects",
-		description:
-			"If it is set to true, git-receive-pack will check all received objects. See `transfer.fsckObjects` for what's checked. Defaults to false. If not set, the value of `transfer.fsckObjects` is used instead",
-	},
-	{
-		name: "receive.hideRefs",
-		description:
-			"This variable is the same as `transfer.hideRefs`, but applies only to `receive-pack` (and so affects pushes, but not fetches). An attempt to update or delete a hidden ref by `git push` is rejected",
-	},
-	{
-		name: "receive.keepAlive",
-		description:
-			"After receiving the pack from the client, `receive-pack` may produce no output (if `--quiet` was specified) while processing the pack, causing some networks to drop the TCP connection. With this option set, if `receive-pack` does not transmit any data in this phase for `receive.keepAlive` seconds, it will send a short keepalive packet. The default is 5 seconds; set to 0 to disable keepalives entirely",
-	},
-	{
-		name: "receive.maxInputSize",
-		description:
-			"If the size of the incoming pack stream is larger than this limit, then git-receive-pack will error out, instead of accepting the pack file. If not set or set to 0, then the size is unlimited",
-	},
-	{
-		name: "receive.procReceiveRefs",
-		description:
-			'This is a multi-valued variable that defines reference prefixes to match the commands in `receive-pack`. Commands matching the prefixes will be executed by an external hook "proc-receive", instead of the internal `execute_commands` function. If this variable is not defined, the "proc-receive" hook will never be used, and all commands will be executed by the internal `execute_commands` function',
-	},
-	{
-		name: "receive.shallowUpdate",
-		description:
-			"If set to true, .git/shallow can be updated when new refs require new shallow roots. Otherwise those refs are rejected",
-	},
-	{
-		name: "receive.unpackLimit",
-		description:
-			"If the number of objects received in a push is below this limit then the objects will be unpacked into loose object files. However if the number of received objects equals or exceeds this limit then the received pack will be stored as a pack, after adding any missing delta bases. Storing the pack from a push can make the push operation complete faster, especially on slow filesystems. If not set, the value of `transfer.unpackLimit` is used instead",
-	},
-	{
-		name: "receive.updateServerInfo",
-		description:
-			"If set to true, git-receive-pack will run git-update-server-info after receiving data from git-push and updating refs",
-	},
-	{
-		name: "remote.<name>.fetch",
-		insertValue: "remote.{cursor}.fetch",
-		description:
-			'The default set of "refspec" for git-fetch[1]. See git-fetch[1]',
-	},
-	{
-		name: "remote.<name>.mirror",
-		insertValue: "remote.{cursor}.mirror",
-		description:
-			"If true, pushing to this remote will automatically behave as if the `--mirror` option was given on the command line",
-	},
-	{
-		name: "remote.<name>.partialclonefilter",
-		insertValue: "remote.{cursor}.partialclonefilter",
-		description:
-			"The filter that will be applied when fetching from this promisor remote. Changing or clearing this value will only affect fetches for new commits. To fetch associated objects for commits already present in the local object database, use the `--refetch` option of git-fetch[1]",
-	},
-	{
-		name: "remote.<name>.promisor",
-		insertValue: "remote.{cursor}.promisor",
-		description:
-			"When set to true, this remote will be used to fetch promisor objects",
-	},
-	{
-		name: "remote.<name>.proxy",
-		insertValue: "remote.{cursor}.proxy",
-		description:
-			"For remotes that require curl (http, https and ftp), the URL to the proxy to use for that remote. Set to the empty string to disable proxying for that remote",
-	},
-	{
-		name: "remote.<name>.proxyAuthMethod",
-		insertValue: "remote.{cursor}.proxyAuthMethod",
-		description:
-			"For remotes that require curl (http, https and ftp), the method to use for authenticating against the proxy in use (probably set in `remote.<name>.proxy`). See `http.proxyAuthMethod`",
-	},
-	{
-		name: "remote.<name>.prune",
-		insertValue: "remote.{cursor}.prune",
-		description:
-			"When set to true, fetching from this remote by default will also remove any remote-tracking references that no longer exist on the remote (as if the `--prune` option was given on the command line). Overrides `fetch.prune` settings, if any",
-	},
-	{
-		name: "remote.<name>.pruneTags",
-		insertValue: "remote.{cursor}.pruneTags",
-		description:
-			"When set to true, fetching from this remote by default will also remove any local tags that no longer exist on the remote if pruning is activated in general via `remote.<name>.prune`, `fetch.prune` or `--prune`. Overrides `fetch.pruneTags` settings, if any",
-	},
-	{
-		name: "remote.<name>.push",
-		insertValue: "remote.{cursor}.push",
-		description:
-			'The default set of "refspec" for git-push[1]. See git-push[1]',
-	},
-	{
-		name: "remote.<name>.pushurl",
-		insertValue: "remote.{cursor}.pushurl",
-		description: "The push URL of a remote repository. See git-push[1]",
-	},
-	{
-		name: "remote.<name>.receivepack",
-		insertValue: "remote.{cursor}.receivepack",
-		description:
-			"The default program to execute on the remote side when pushing. See option --receive-pack of git-push[1]",
-	},
-	{
-		name: "remote.<name>.skipDefaultUpdate",
-		insertValue: "remote.{cursor}.skipDefaultUpdate",
-		description:
-			"If true, this remote will be skipped by default when updating using git-fetch[1] or the `update` subcommand of git-remote[1]",
-	},
-	{
-		name: "remote.<name>.skipFetchAll",
-		insertValue: "remote.{cursor}.skipFetchAll",
-		description:
-			"If true, this remote will be skipped by default when updating using git-fetch[1] or the `update` subcommand of git-remote[1]",
-	},
-	{
-		name: "remote.<name>.tagOpt",
-		insertValue: "remote.{cursor}.tagOpt",
-		description:
-			"Setting this value to --no-tags disables automatic tag following when fetching from remote <name>. Setting it to --tags will fetch every tag from remote <name>, even if they are not reachable from remote branch heads. Passing these flags directly to git-fetch[1] can override this setting. See options --tags and --no-tags of git-fetch[1]",
-	},
-	{
-		name: "remote.<name>.uploadpack",
-		insertValue: "remote.{cursor}.uploadpack",
-		description:
-			"The default program to execute on the remote side when fetching. See option --upload-pack of git-fetch-pack[1]",
-	},
-	{
-		name: "remote.<name>.url",
-		insertValue: "remote.{cursor}.url",
-		description:
-			"The URL of a remote repository. See git-fetch[1] or git-push[1]",
-	},
-	{
-		name: "remote.<name>.vcs",
-		insertValue: "remote.{cursor}.vcs",
-		description:
-			"Setting this to a value <vcs> will cause Git to interact with the remote with the git-remote-<vcs> helper",
-	},
-	{
-		name: "remote.pushDefault",
-		description:
-			"The remote to push to by default. Overrides `branch.<name>.remote` for all branches, and is overridden by `branch.<name>.pushRemote` for specific branches",
-	},
-	{
-		name: "remotes.<group>",
-		insertValue: "remotes.{cursor}",
-		description:
-			'The list of remotes which are fetched by "git remote update <group>". See git-remote[1]',
-	},
-	{
-		name: "repack.cruftThreads",
-		description:
-			"Parameters used by git-pack-objects[1] when generating a cruft pack and the respective parameters are not given over the command line. See similarly named `pack.*` configuration variables for defaults and meaning",
-	},
-	{
-		name: "repack.packKeptObjects",
-		description:
-			"If set to true, makes `git repack` act as if `--pack-kept-objects` was passed. See git-repack[1] for details. Defaults to `false` normally, but `true` if a bitmap index is being written (either via `--write-bitmap-index` or `repack.writeBitmaps`)",
-	},
-	{
-		name: "repack.updateServerInfo",
-		description:
-			"If set to false, git-repack[1] will not run git-update-server-info[1]. Defaults to true. Can be overridden when true by the `-n` option of git-repack[1]",
-	},
-	{
-		name: "repack.useDeltaBaseOffset",
-		description:
-			'By default, git-repack[1] creates packs that use delta-base offset. If you need to share your repository with Git older than version 1.4.4, either directly or via a dumb protocol such as http, then you need to set this option to "false" and repack. Access from old Git versions over the native protocol are unaffected by this option',
-	},
-	{
-		name: "repack.useDeltaIslands",
-		description:
-			"If set to true, makes `git repack` act as if `--delta-islands` was passed. Defaults to `false`",
-	},
-	{
-		name: "repack.writeBitmaps",
-		description:
-			'When true, git will write a bitmap index when packing all objects to disk (e.g., when `git repack -a` is run). This index can speed up the "counting objects" phase of subsequent packs created for clones and fetches, at the cost of some disk space and extra time spent on the initial repack. This has no effect if multiple packfiles are created. Defaults to true on bare repos, false otherwise',
-	},
-	{
-		name: "rerere.autoUpdate",
-		description:
-			"When set to true, `git-rerere` updates the index with the resulting contents after it cleanly resolves conflicts using previously recorded resolution. Defaults to false",
-	},
-	{
-		name: "rerere.enabled",
-		description:
-			'Activate recording of resolved conflicts, so that identical conflict hunks can be resolved automatically, should they be encountered again. By default, git-rerere[1] is enabled if there is an `rr-cache` directory under the `$GIT_DIR`, e.g. if "rerere" was previously used in the repository',
-	},
-	{
-		name: "revert.reference",
-		description:
-			"Setting this variable to true makes `git revert` behave as if the `--reference` option is given",
-	},
-	{
-		name: "safe.bareRepository",
-		description:
-			"Specifies which bare repositories Git will work with. The currently supported values are:",
-	},
-	{
-		name: "safe.directory",
-		description:
-			"These config entries specify Git-tracked directories that are considered safe even if they are owned by someone other than the current user. By default, Git will refuse to even parse a Git config of a repository owned by someone else, let alone run its hooks, and this config setting allows users to specify exceptions, e.g. for intentionally shared repositories (see the `--shared` option in git-init[1])",
-	},
-	{
-		name: "sendemail.forbidSendmailVariables",
-		description:
-			'To avoid common misconfiguration mistakes, git-send-email[1] will abort with a warning if any configuration options for "sendmail" exist. Set this variable to bypass the check',
-	},
-	{
-		name: "sendemail.identity",
-		description:
-			"A configuration identity. When given, causes values in the 'sendemail.<identity>' subsection to take precedence over values in the 'sendemail' section. The default identity is the value of `sendemail.identity`",
-	},
-	{
-		name: "sendemail.signedoffcc",
-		description: "Deprecated alias for `sendemail.signedoffbycc`",
-		deprecated: true,
-		hidden: true,
-	},
-	{
-		name: "sendemail.smtpBatchSize",
-		description:
-			"Number of messages to be sent per connection, after that a relogin will happen. If the value is 0 or undefined, send all messages in one connection. See also the `--batch-size` option of git-send-email[1]",
-	},
-	{
-		name: "sendemail.smtpEncryption",
-		description:
-			"See git-send-email[1] for description. Note that this setting is not subject to the 'identity' mechanism",
-	},
-	{
-		name: "sendemail.smtpReloginDelay",
-		description:
-			"Seconds wait before reconnecting to smtp server. See also the `--relogin-delay` option of git-send-email[1]",
-	},
-	{
-		name: "sendemail.smtpsslcertpath",
-		description:
-			"Path to ca-certificates (either a directory or a single file). Set it to an empty string to disable certificate verification",
-	},
-	{
-		name: "sendemail.xmailer",
-		description: "See git-send-email[1] for description",
-	},
-	{
-		name: "sequence.editor",
-		description:
-			"Text editor used by `git rebase -i` for editing the rebase instruction file. The value is meant to be interpreted by the shell when it is used. It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. When not configured the default commit message editor is used instead",
-	},
-	{
-		name: "sendemail.<identity>.forbidSendmailVariables",
-		insertValue: "sendemail.{cursor}.forbidSendmailVariables",
-		description:
-			'To avoid common misconfiguration mistakes, git-send-email[1] will abort with a warning if any configuration options for "sendmail" exist. Set this variable to bypass the check',
-	},
-	{
-		name: "sendemail.<identity>.signedoffcc",
-		insertValue: "sendemail.{cursor}.signedoffcc",
-		description: "Deprecated alias for `sendemail.signedoffbycc`",
-		deprecated: true,
-		hidden: true,
-	},
-	{
-		name: "sendemail.<identity>.smtpBatchSize",
-		insertValue: "sendemail.{cursor}.smtpBatchSize",
-		description:
-			"Number of messages to be sent per connection, after that a relogin will happen. If the value is 0 or undefined, send all messages in one connection. See also the `--batch-size` option of git-send-email[1]",
-	},
-	{
-		name: "sendemail.<identity>.smtpEncryption",
-		insertValue: "sendemail.{cursor}.smtpEncryption",
-		description:
-			"See git-send-email[1] for description. Note that this setting is not subject to the 'identity' mechanism",
-	},
-	{
-		name: "sendemail.<identity>.smtpReloginDelay",
-		insertValue: "sendemail.{cursor}.smtpReloginDelay",
-		description:
-			"Seconds wait before reconnecting to smtp server. See also the `--relogin-delay` option of git-send-email[1]",
-	},
-	{
-		name: "sendemail.<identity>.smtpsslcertpath",
-		insertValue: "sendemail.{cursor}.smtpsslcertpath",
-		description:
-			"Path to ca-certificates (either a directory or a single file). Set it to an empty string to disable certificate verification",
-	},
-	{
-		name: "sendemail.<identity>.xmailer",
-		insertValue: "sendemail.{cursor}.xmailer",
-		description: "See git-send-email[1] for description",
-	},
-	{
-		name: "sequence.<identity>.editor",
-		insertValue: "sequence.{cursor}.editor",
-		description:
-			"Text editor used by `git rebase -i` for editing the rebase instruction file. The value is meant to be interpreted by the shell when it is used. It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. When not configured the default commit message editor is used instead",
-	},
-	{
-		name: "showBranch.default",
-		description:
-			"The default set of branches for git-show-branch[1]. See git-show-branch[1]",
-	},
-	{
-		name: "sparse.expectFilesOutsideOfPatterns",
-		description:
-			"Typically with sparse checkouts, files not matching any sparsity patterns are marked with a SKIP_WORKTREE bit in the index and are missing from the working tree. Accordingly, Git will ordinarily check whether files with the SKIP_WORKTREE bit are in fact present in the working tree contrary to expectations. If Git finds any, it marks those paths as present by clearing the relevant SKIP_WORKTREE bits. This option can be used to tell Git that such present-despite-skipped files are expected and to stop checking for them",
-	},
-	{
-		name: "splitIndex.maxPercentChange",
-		description:
-			"When the split index feature is used, this specifies the percent of entries the split index can contain compared to the total number of entries in both the split index and the shared index before a new shared index is written. The value should be between 0 and 100. If the value is 0 then a new shared index is always written, if it is 100 a new shared index is never written. By default the value is 20, so a new shared index is written if the number of entries in the split index would be greater than 20 percent of the total number of entries. See git-update-index[1]",
-	},
-	{
-		name: "splitIndex.sharedIndexExpire",
-		description:
-			'When the split index feature is used, shared index files that were not modified since the time this variable specifies will be removed when a new shared index file is created. The value "now" expires all entries immediately, and "never" suppresses expiration altogether. The default value is "2.weeks.ago". Note that a shared index file is considered modified (for the purpose of expiration) each time a new split-index file is either created based on it or read from it. See git-update-index[1]',
-	},
-	{
-		name: "ssh.variant",
-		description:
-			"By default, Git determines the command line arguments to use based on the basename of the configured SSH command (configured using the environment variable `GIT_SSH` or `GIT_SSH_COMMAND` or the config setting `core.sshCommand`). If the basename is unrecognized, Git will attempt to detect support of OpenSSH options by first invoking the configured SSH command with the `-G` (print configuration) option and will subsequently use OpenSSH options (if that is successful) or no options besides the host and remote command (if it fails)",
-	},
-	{
-		name: "stash.showIncludeUntracked",
-		description:
-			"If this is set to true, the `git stash show` command will show the untracked files of a stash entry. Defaults to false. See description of 'show' command in git-stash[1]",
-	},
-	{
-		name: "stash.showPatch",
-		description:
-			"If this is set to true, the `git stash show` command without an option will show the stash entry in patch form. Defaults to false. See description of 'show' command in git-stash[1]",
-	},
-	{
-		name: "stash.showStat",
-		description:
-			"If this is set to true, the `git stash show` command without an option will show diffstat of the stash entry. Defaults to true. See description of 'show' command in git-stash[1]",
-	},
-	{
-		name: "status.aheadBehind",
-		description:
-			"Set to true to enable `--ahead-behind` and false to enable `--no-ahead-behind` by default in git-status[1] for non-porcelain status formats. Defaults to true",
-	},
-	{
-		name: "status.branch",
-		description:
-			"Set to true to enable --branch by default in git-status[1]. The option --no-branch takes precedence over this variable",
-	},
-	{
-		name: "status.displayCommentPrefix",
-		description:
-			"If set to true, git-status[1] will insert a comment prefix before each output line (starting with `core.commentChar`, i.e. `#` by default). This was the behavior of git-status[1] in Git 1.8.4 and previous. Defaults to false",
-	},
-	{
-		name: "status.relativePaths",
-		description:
-			"By default, git-status[1] shows paths relative to the current directory. Setting this variable to `false` shows paths relative to the repository root (this was the default for Git prior to v1.5.4)",
-	},
-	{
-		name: "status.renameLimit",
-		description:
-			"The number of files to consider when performing rename detection in git-status[1] and git-commit[1]. Defaults to the value of diff.renameLimit",
-	},
-	{
-		name: "status.renames",
-		description:
-			'Whether and how Git detects renames in git-status[1] and git-commit[1] . If set to "false", rename detection is disabled. If set to "true", basic rename detection is enabled. If set to "copies" or "copy", Git will detect copies, as well. Defaults to the value of diff.renames',
-	},
-	{
-		name: "status.short",
-		description:
-			"Set to true to enable --short by default in git-status[1]. The option --no-short takes precedence over this variable",
-	},
-	{
-		name: "status.showStash",
-		description:
-			"If set to true, git-status[1] will display the number of entries currently stashed away. Defaults to false",
-	},
-	{
-		name: "status.showUntrackedFiles",
-		description:
-			"By default, git-status[1] and git-commit[1] show files which are not currently tracked by Git. Directories which contain only untracked files, are shown with the directory name only. Showing untracked files means that Git needs to lstat() all the files in the whole repository, which might be slow on some systems. So, this variable controls how the commands displays the untracked files. Possible values are:",
-	},
-	{
-		name: "status.submoduleSummary",
-		description:
-			"Defaults to false. If this is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled and a summary of commits for modified submodules will be shown (see --summary-limit option of git-submodule[1]). Please note that the summary output command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. The only exception to that rule is that status and commit will show staged submodule changes. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command-line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings",
-	},
-	{
-		name: "submodule.<name>.active",
-		insertValue: "submodule.{cursor}.active",
-		description:
-			"Boolean value indicating if the submodule is of interest to git commands. This config option takes precedence over the submodule.active config option. See gitsubmodules[7] for details",
-	},
-	{
-		name: "submodule.<name>.branch",
-		insertValue: "submodule.{cursor}.branch",
-		description:
-			"The remote branch name for a submodule, used by `git submodule update --remote`. Set this option to override the value found in the `.gitmodules` file. See git-submodule[1] and gitmodules[5] for details",
-	},
-	{
-		name: "submodule.<name>.fetchRecurseSubmodules",
-		insertValue: "submodule.{cursor}.fetchRecurseSubmodules",
-		description:
-			'This option can be used to control recursive fetching of this submodule. It can be overridden by using the --[no-]recurse-submodules command-line option to "git fetch" and "git pull". This setting will override that from in the gitmodules[5] file',
-	},
-	{
-		name: "submodule.<name>.ignore",
-		insertValue: "submodule.{cursor}.ignore",
-		description:
-			'Defines under what circumstances "git status" and the diff family show a submodule as modified. When set to "all", it will never be considered modified (but it will nonetheless show up in the output of status and commit when it has been staged), "dirty" will ignore all changes to the submodules work tree and takes only differences between the HEAD of the submodule and the commit recorded in the superproject into account. "untracked" will additionally let submodules with modified tracked files in their work tree show up. Using "none" (the default when this option is not set) also shows submodules that have untracked files in their work tree as changed. This setting overrides any setting made in .gitmodules for this submodule, both settings can be overridden on the command line by using the "--ignore-submodules" option. The \'git submodule\' commands are not affected by this setting',
-	},
-	{
-		name: "submodule.<name>.update",
-		insertValue: "submodule.{cursor}.update",
-		description:
-			"The method by which a submodule is updated by 'git submodule update', which is the only affected command, others such as 'git checkout --recurse-submodules' are unaffected. It exists for historical reasons, when 'git submodule' was the only command to interact with submodules; settings like `submodule.active` and `pull.rebase` are more specific. It is populated by `git submodule init` from the gitmodules[5] file. See description of 'update' command in git-submodule[1]",
-	},
-	{
-		name: "submodule.<name>.url",
-		insertValue: "submodule.{cursor}.url",
-		description:
-			"The URL for a submodule. This variable is copied from the .gitmodules file to the git config via 'git submodule init'. The user can change the configured URL before obtaining the submodule via 'git submodule update'. If neither submodule.<name>.active or submodule.active are set, the presence of this variable is used as a fallback to indicate whether the submodule is of interest to git commands. See git-submodule[1] and gitmodules[5] for details",
-	},
-	{
-		name: "submodule.active",
-		description:
-			"A repeated field which contains a pathspec used to match against a submodule's path to determine if the submodule is of interest to git commands. See gitsubmodules[7] for details",
-	},
-	{
-		name: "submodule.alternateErrorStrategy",
-		description:
-			"Specifies how to treat errors with the alternates for a submodule as computed via `submodule.alternateLocation`. Possible values are `ignore`, `info`, `die`. Default is `die`. Note that if set to `ignore` or `info`, and if there is an error with the computed alternate, the clone proceeds as if no alternate was specified",
-	},
-	{
-		name: "submodule.alternateLocation",
-		description:
-			"Specifies how the submodules obtain alternates when submodules are cloned. Possible values are `no`, `superproject`. By default `no` is assumed, which doesn't add references. When the value is set to `superproject` the submodule to be cloned computes its alternates location relative to the superprojects alternate",
-	},
-	{
-		name: "submodule.fetchJobs",
-		description:
-			"Specifies how many submodules are fetched/cloned at the same time. A positive integer allows up to that number of submodules fetched in parallel. A value of 0 will give some reasonable default. If unset, it defaults to 1",
-	},
-	{
-		name: "submodule.propagateBranches",
-		description:
-			"[EXPERIMENTAL] A boolean that enables branching support when using `--recurse-submodules` or `submodule.recurse=true`. Enabling this will allow certain commands to accept `--recurse-submodules` and certain commands that already accept `--recurse-submodules` will now consider branches. Defaults to false",
-	},
-	{
-		name: "submodule.recurse",
-		description:
-			"A boolean indicating if commands should enable the `--recurse-submodules` option by default. Defaults to false",
-	},
-	{
-		name: "tag.forceSignAnnotated",
-		description:
-			"A boolean to specify whether annotated tags created should be GPG signed. If `--annotate` is specified on the command line, it takes precedence over this option",
-	},
-	{
-		name: "tag.gpgSign",
-		description:
-			'A boolean to specify whether all tags should be GPG signed. Use of this option when running in an automated script can result in a large number of tags being signed. It is therefore convenient to use an agent to avoid typing your gpg passphrase several times. Note that this option doesn\'t affect tag signing behavior enabled by "-u <keyid>" or "--local-user=<keyid>" options',
-	},
-	{
-		name: "tag.sort",
-		description:
-			'This variable controls the sort ordering of tags when displayed by git-tag[1]. Without the "--sort=<value>" option provided, the value of this variable will be used as the default',
-	},
-	{
-		name: "tar.umask",
-		description:
-			'This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the world write bit. The special value "user" indicates that the archiving user\'s umask will be used instead. See umask(2) and git-archive[1]',
-	},
-	{
-		name: "trace2.configParams",
-		description:
-			'A comma-separated list of patterns of "important" config settings that should be recorded in the trace2 output. For example, `core.*,remote.*.url` would cause the trace2 output to contain events listing each configured remote. May be overridden by the `GIT_TRACE2_CONFIG_PARAMS` environment variable. Unset by default',
-	},
-	{
-		name: "trace2.destinationDebug",
-		description:
-			"Boolean. When true Git will print error messages when a trace target destination cannot be opened for writing. By default, these errors are suppressed and tracing is silently disabled. May be overridden by the `GIT_TRACE2_DST_DEBUG` environment variable",
-	},
-	{
-		name: "trace2.envVars",
-		description:
-			'A comma-separated list of "important" environment variables that should be recorded in the trace2 output. For example, `GIT_HTTP_USER_AGENT,GIT_CONFIG` would cause the trace2 output to contain events listing the overrides for HTTP user agent and the location of the Git configuration file (assuming any are set). May be overridden by the `GIT_TRACE2_ENV_VARS` environment variable. Unset by default',
-	},
-	{
-		name: "trace2.eventBrief",
-		description:
-			"Boolean. When true `time`, `filename`, and `line` fields are omitted from event output. May be overridden by the `GIT_TRACE2_EVENT_BRIEF` environment variable. Defaults to false",
-	},
-	{
-		name: "trace2.eventNesting",
-		description:
-			"Integer. Specifies desired depth of nested regions in the event output. Regions deeper than this value will be omitted. May be overridden by the `GIT_TRACE2_EVENT_NESTING` environment variable. Defaults to 2",
-	},
-	{
-		name: "trace2.eventTarget",
-		description:
-			"This variable controls the event target destination. It may be overridden by the `GIT_TRACE2_EVENT` environment variable. The following table shows possible values",
-	},
-	{
-		name: "trace2.maxFiles",
-		description:
-			"Integer. When writing trace files to a target directory, do not write additional traces if we would exceed this many files. Instead, write a sentinel file that will block further tracing to this directory. Defaults to 0, which disables this check",
-	},
-	{
-		name: "trace2.normalBrief",
-		description:
-			"Boolean. When true `time`, `filename`, and `line` fields are omitted from normal output. May be overridden by the `GIT_TRACE2_BRIEF` environment variable. Defaults to false",
-	},
-	{
-		name: "trace2.normalTarget",
-		description:
-			"This variable controls the normal target destination. It may be overridden by the `GIT_TRACE2` environment variable. The following table shows possible values",
-	},
-	{
-		name: "trace2.perfBrief",
-		description:
-			"Boolean. When true `time`, `filename`, and `line` fields are omitted from PERF output. May be overridden by the `GIT_TRACE2_PERF_BRIEF` environment variable. Defaults to false",
-	},
-	{
-		name: "trace2.perfTarget",
-		description:
-			"This variable controls the performance target destination. It may be overridden by the `GIT_TRACE2_PERF` environment variable. The following table shows possible values",
-	},
-	{
-		name: "transfer.advertiseSID",
-		description:
-			"Boolean. When true, client and server processes will advertise their unique session IDs to their remote counterpart. Defaults to false",
-	},
-	{
-		name: "transfer.credentialsInUrl",
-		description:
-			"A configured URL can contain plaintext credentials in the form `<protocol>://<user>:<password>@<domain>/<path>`. You may want to warn or forbid the use of such configuration (in favor of using git-credential[1]). This will be used on git-clone[1], git-fetch[1], git-push[1], and any other direct use of the configured URL",
-	},
-	{
-		name: "transfer.fsckObjects",
-		description:
-			"When `fetch.fsckObjects` or `receive.fsckObjects` are not set, the value of this variable is used instead. Defaults to false",
-	},
-	{
-		name: "transfer.hideRefs",
-		description:
-			"String(s) `receive-pack` and `upload-pack` use to decide which refs to omit from their initial advertisements. Use more than one definition to specify multiple prefix strings. A ref that is under the hierarchies listed in the value of this variable is excluded, and is hidden when responding to `git push` or `git fetch`. See `receive.hideRefs` and `uploadpack.hideRefs` for program-specific versions of this config",
-	},
-	{
-		name: "transfer.unpackLimit",
-		description:
-			"When `fetch.unpackLimit` or `receive.unpackLimit` are not set, the value of this variable is used instead. The default value is 100",
-	},
-	{
-		name: "uploadarchive.allowUnreachable",
-		description:
-			'If true, allow clients to use `git archive --remote` to request any tree, whether reachable from the ref tips or not. See the discussion in the "SECURITY" section of git-upload-archive[1] for more details. Defaults to `false`',
-	},
-	{
-		name: "uploadpack.allowAnySHA1InWant",
-		description:
-			"Allow `upload-pack` to accept a fetch request that asks for any object at all. Defaults to `false`",
-	},
-	{
-		name: "uploadpack.allowFilter",
-		description:
-			"If this option is set, `upload-pack` will support partial clone and partial fetch object filtering",
-	},
-	{
-		name: "uploadpack.allowReachableSHA1InWant",
-		description:
-			'Allow `upload-pack` to accept a fetch request that asks for an object that is reachable from any ref tip. However, note that calculating object reachability is computationally expensive. Defaults to `false`. Even if this is false, a client may be able to steal objects via the techniques described in the "SECURITY" section of the gitnamespaces[7] man page; it\'s best to keep private data in a separate repository',
-	},
-	{
-		name: "uploadpack.allowRefInWant",
-		description:
-			"If this option is set, `upload-pack` will support the `ref-in-want` feature of the protocol version 2 `fetch` command. This feature is intended for the benefit of load-balanced servers which may not have the same view of what OIDs their refs point to due to replication delay",
-	},
-	{
-		name: "uploadpack.allowTipSHA1InWant",
-		description:
-			'When `uploadpack.hideRefs` is in effect, allow `upload-pack` to accept a fetch request that asks for an object at the tip of a hidden ref (by default, such a request is rejected). See also `uploadpack.hideRefs`. Even if this is false, a client may be able to steal objects via the techniques described in the "SECURITY" section of the gitnamespaces[7] man page; it\'s best to keep private data in a separate repository',
-	},
-	{
-		name: "uploadpack.hideRefs",
-		description:
-			"This variable is the same as `transfer.hideRefs`, but applies only to `upload-pack` (and so affects only fetches, not pushes). An attempt to fetch a hidden ref by `git fetch` will fail. See also `uploadpack.allowTipSHA1InWant`",
-	},
-	{
-		name: "uploadpack.keepAlive",
-		description:
-			"When `upload-pack` has started `pack-objects`, there may be a quiet period while `pack-objects` prepares the pack. Normally it would output progress information, but if `--quiet` was used for the fetch, `pack-objects` will output nothing at all until the pack data begins. Some clients and networks may consider the server to be hung and give up. Setting this option instructs `upload-pack` to send an empty keepalive packet every `uploadpack.keepAlive` seconds. Setting this option to 0 disables keepalive packets entirely. The default is 5 seconds",
-	},
-	{
-		name: "uploadpack.packObjectsHook",
-		description:
-			"If this option is set, when `upload-pack` would run `git pack-objects` to create a packfile for a client, it will run this shell command instead. The `pack-objects` command and arguments it _would_ have run (including the `git pack-objects` at the beginning) are appended to the shell command. The stdin and stdout of the hook are treated as if `pack-objects` itself was run. I.e., `upload-pack` will feed input intended for `pack-objects` to the hook, and expects a completed packfile on stdout",
-	},
-	{
-		name: "uploadpackfilter.<filter>.allow",
-		insertValue: "uploadpackfilter.{cursor}.allow",
-		description:
-			"Explicitly allow or ban the object filter corresponding to `<filter>`, where `<filter>` may be one of: `blob:none`, `blob:limit`, `object:type`, `tree`, `sparse:oid`, or `combine`. If using combined filters, both `combine` and all of the nested filter kinds must be allowed. Defaults to `uploadpackfilter.allow`",
-	},
-	{
-		name: "uploadpackfilter.allow",
-		description:
-			"Provides a default value for unspecified object filters (see: the below configuration variable). If set to `true`, this will also enable all filters which get added in the future. Defaults to `true`",
-	},
-	{
-		name: "uploadpackfilter.tree.maxDepth",
-		description:
-			"Only allow `--filter=tree:<n>` when `<n>` is no more than the value of `uploadpackfilter.tree.maxDepth`. If set, this also implies `uploadpackfilter.tree.allow=true`, unless this configuration variable had already been set. Has no effect if unset",
-	},
-	{
-		name: "url.<base>.insteadOf",
-		insertValue: "url.{cursor}.insteadOf",
-		description:
-			"Any URL that starts with this value will be rewritten to start, instead, with <base>. In cases where some site serves a large number of repositories, and serves them with multiple access methods, and some users need to use different access methods, this feature allows people to specify any of the equivalent URLs and have Git automatically rewrite the URL to the best alternative for the particular user, even for a never-before-seen repository on the site. When more than one insteadOf strings match a given URL, the longest match is used",
-	},
-	{
-		name: "url.<base>.pushInsteadOf",
-		insertValue: "url.{cursor}.pushInsteadOf",
-		description:
-			"Any URL that starts with this value will not be pushed to; instead, it will be rewritten to start with <base>, and the resulting URL will be pushed to. In cases where some site serves a large number of repositories, and serves them with multiple access methods, some of which do not allow push, this feature allows people to specify a pull-only URL and have Git automatically use an appropriate URL to push, even for a never-before-seen repository on the site. When more than one pushInsteadOf strings match a given URL, the longest match is used. If a remote has an explicit pushurl, Git will ignore this setting for that remote",
-	},
-	{
-		name: "user.signingKey",
-		description:
-			'If git-tag[1] or git-commit[1] is not selecting the key you want it to automatically when creating a signed tag or commit, you can override the default selection with this variable. This option is passed unchanged to gpg\'s --local-user parameter, so you may specify a key using any method that gpg supports. If gpg.format is set to `ssh` this can contain the path to either your private ssh key or the public key when ssh-agent is used. Alternatively it can contain a public key prefixed with `key::` directly (e.g.: "key::ssh-rsa XXXXXX identifier"). The private key needs to be available via ssh-agent. If not set git will call gpg.ssh.defaultKeyCommand (e.g.: "ssh-add -L") and try to use the first key available. For backward compatibility, a raw key which begins with "ssh-", such as "ssh-rsa XXXXXX identifier", is treated as "key::ssh-rsa XXXXXX identifier", but this form is deprecated; use the `key::` form instead',
-	},
-	{
-		name: "user.useConfigOnly",
-		description:
-			"Instruct Git to avoid trying to guess defaults for `user.email` and `user.name`, and instead retrieve the values only from the configuration. For example, if you have multiple email addresses and would like to use a different one for each repository, then with this configuration option set to `true` in the global config along with a name, Git will prompt you to set up an email before making new commits in a newly cloned repository. Defaults to `false`",
-	},
-	{
-		name: "versionsort.prereleaseSuffix",
-		description:
-			"Deprecated alias for `versionsort.suffix`. Ignored if `versionsort.suffix` is set",
-		deprecated: true,
-		hidden: true,
-	},
-	{
-		name: "versionsort.suffix",
-		description:
-			'Even when version sort is used in git-tag[1], tagnames with the same base version but different suffixes are still sorted lexicographically, resulting e.g. in prerelease tags appearing after the main release (e.g. "1.0-rc1" after "1.0"). This variable can be specified to determine the sorting order of tags with different suffixes',
-	},
-	{
-		name: "web.browser",
-		description:
-			"Specify a web browser that may be used by some commands. Currently only git-instaweb[1] and git-help[1] may use it",
-	},
-	{
-		name: "worktree.guessRemote",
-		description:
-			'If no branch is specified and neither `-b` nor `-B` nor `--detach` is used, then `git worktree add` defaults to creating a new branch from HEAD. If `worktree.guessRemote` is set to true, `worktree add` tries to find a remote-tracking branch whose name uniquely matches the new branch name. If such a branch exists, it is checked out and set as "upstream" for the new branch. If no such match can be found, it falls back to creating a new branch from the current HEAD',
-	},
+  {
+    name: "add.ignore-errors",
+    description:
+      "Tells 'git add' to continue adding files when some files cannot be added due to indexing errors. Equivalent to the `--ignore-errors` option of git-add[1]. `add.ignore-errors` is deprecated, as it does not follow the usual naming convention for configuration variables",
+    deprecated: true,
+    hidden: true,
+  },
+  {
+    name: "add.interactive.useBuiltin",
+    description:
+      "Set to `false` to fall back to the original Perl implementation of the interactive version of git-add[1] instead of the built-in version. Is `true` by default",
+  },
+  {
+    name: "advice.addEmbeddedRepo",
+    description:
+      "Advice on what to do when you've accidentally added one git repo inside of another",
+  },
+  {
+    name: "advice.addEmptyPathspec",
+    description:
+      "Advice shown if a user runs the add command without providing the pathspec parameter",
+  },
+  {
+    name: "advice.addIgnoredFile",
+    description:
+      "Advice shown if a user attempts to add an ignored file to the index",
+  },
+  {
+    name: "advice.ambiguousFetchRefspec",
+    description:
+      "Advice shown when fetch refspec for multiple remotes map to the same remote-tracking branch namespace and causes branch tracking set-up to fail",
+  },
+  {
+    name: "advice.amWorkDir",
+    description:
+      "Advice that shows the location of the patch file when git-am[1] fails to apply it",
+  },
+  {
+    name: "advice.checkoutAmbiguousRemoteBranchName",
+    description:
+      "Advice shown when the argument to git-checkout[1] and git-switch[1] ambiguously resolves to a remote tracking branch on more than one remote in situations where an unambiguous argument would have otherwise caused a remote-tracking branch to be checked out. See the `checkout.defaultRemote` configuration variable for how to set a given remote to used by default in some situations where this advice would be printed",
+  },
+  {
+    name: "advice.commitBeforeMerge",
+    description:
+      "Advice shown when git-merge[1] refuses to merge to avoid overwriting local changes",
+  },
+  {
+    name: "advice.detachedHead",
+    description:
+      "Advice shown when you used git-switch[1] or git-checkout[1] to move to the detach HEAD state, to instruct how to create a local branch after the fact",
+  },
+  {
+    name: "advice.fetchShowForcedUpdates",
+    description:
+      "Advice shown when git-fetch[1] takes a long time to calculate forced updates after ref updates, or to warn that the check is disabled",
+  },
+  {
+    name: "advice.ignoredHook",
+    description:
+      "Advice shown if a hook is ignored because the hook is not set as executable",
+  },
+  {
+    name: "advice.implicitIdentity",
+    description:
+      "Advice on how to set your identity configuration when your information is guessed from the system username and domain name",
+  },
+  {
+    name: "advice.nestedTag",
+    description:
+      "Advice shown if a user attempts to recursively tag a tag object",
+  },
+  {
+    name: "advice.pushAlreadyExists",
+    description:
+      "Shown when git-push[1] rejects an update that does not qualify for fast-forwarding (e.g., a tag.)",
+  },
+  {
+    name: "advice.pushFetchFirst",
+    description:
+      "Shown when git-push[1] rejects an update that tries to overwrite a remote ref that points at an object we do not have",
+  },
+  {
+    name: "advice.pushNeedsForce",
+    description:
+      "Shown when git-push[1] rejects an update that tries to overwrite a remote ref that points at an object that is not a commit-ish, or make the remote ref point at an object that is not a commit-ish",
+  },
+  {
+    name: "advice.pushNonFFCurrent",
+    description:
+      "Advice shown when git-push[1] fails due to a non-fast-forward update to the current branch",
+  },
+  {
+    name: "advice.pushNonFFMatching",
+    description:
+      "Advice shown when you ran git-push[1] and pushed 'matching refs' explicitly (i.e. you used ':', or specified a refspec that isn't your current branch) and it resulted in a non-fast-forward error",
+  },
+  {
+    name: "advice.pushRefNeedsUpdate",
+    description:
+      "Shown when git-push[1] rejects a forced update of a branch when its remote-tracking ref has updates that we do not have locally",
+  },
+  {
+    name: "advice.pushUnqualifiedRefname",
+    description:
+      "Shown when git-push[1] gives up trying to guess based on the source and destination refs what remote ref namespace the source belongs in, but where we can still suggest that the user push to either refs/heads/* or refs/tags/* based on the type of the source object",
+  },
+  {
+    name: "advice.pushUpdateRejected",
+    description:
+      "Set this variable to 'false' if you want to disable 'pushNonFFCurrent', 'pushNonFFMatching', 'pushAlreadyExists', 'pushFetchFirst', 'pushNeedsForce', and 'pushRefNeedsUpdate' simultaneously",
+  },
+  {
+    name: "advice.resetNoRefresh",
+    description:
+      "Advice to consider using the `--no-refresh` option to git-reset[1] when the command takes more than 2 seconds to refresh the index after reset",
+  },
+  {
+    name: "advice.resolveConflict",
+    description:
+      "Advice shown by various commands when conflicts prevent the operation from being performed",
+  },
+  {
+    name: "advice.rmHints",
+    description:
+      "In case of failure in the output of git-rm[1], show directions on how to proceed from the current state",
+  },
+  {
+    name: "advice.sequencerInUse",
+    description: "Advice shown when a sequencer command is already in progress",
+  },
+  {
+    name: "advice.skippedCherryPicks",
+    description:
+      "Shown when git-rebase[1] skips a commit that has already been cherry-picked onto the upstream branch",
+  },
+  {
+    name: "advice.statusAheadBehind",
+    description:
+      "Shown when git-status[1] computes the ahead/behind counts for a local ref compared to its remote tracking ref, and that calculation takes longer than expected. Will not appear if `status.aheadBehind` is false or the option `--no-ahead-behind` is given",
+  },
+  {
+    name: "advice.statusHints",
+    description:
+      "Show directions on how to proceed from the current state in the output of git-status[1], in the template shown when writing commit messages in git-commit[1], and in the help message shown by git-switch[1] or git-checkout[1] when switching branch",
+  },
+  {
+    name: "advice.statusUoption",
+    description:
+      "Advise to consider using the `-u` option to git-status[1] when the command takes more than 2 seconds to enumerate untracked files",
+  },
+  {
+    name: "advice.submoduleAlternateErrorStrategyDie",
+    description:
+      'Advice shown when a submodule.alternateErrorStrategy option configured to "die" causes a fatal error',
+  },
+  {
+    name: "advice.submodulesNotUpdated",
+    description:
+      "Advice shown when a user runs a submodule command that fails because `git submodule update --init` was not run",
+  },
+  {
+    name: "advice.suggestDetachingHead",
+    description:
+      "Advice shown when git-switch[1] refuses to detach HEAD without the explicit `--detach` option",
+  },
+  {
+    name: "advice.updateSparsePath",
+    description:
+      "Advice shown when either git-add[1] or git-rm[1] is asked to update index entries outside the current sparse checkout",
+  },
+  {
+    name: "advice.waitingForEditor",
+    description:
+      "Print a message to the terminal whenever Git is waiting for editor input from the user",
+  },
+  {
+    name: "alias.*",
+    insertValue: "alias.{cursor}",
+    description:
+      "Command aliases for the git[1] command wrapper - e.g. after defining `alias.last = cat-file commit HEAD`, the invocation `git last` is equivalent to `git cat-file commit HEAD`. To avoid confusion and troubles with script usage, aliases that hide existing Git commands are ignored. Arguments are split by spaces, the usual shell quoting and escaping is supported. A quote pair or a backslash can be used to quote them",
+  },
+  {
+    name: "am.keepcr",
+    description:
+      "If true, git-am will call git-mailsplit for patches in mbox format with parameter `--keep-cr`. In this case git-mailsplit will not remove `\\r` from lines ending with `\\r\\n`. Can be overridden by giving `--no-keep-cr` from the command line. See git-am[1], git-mailsplit[1]",
+  },
+  {
+    name: "am.threeWay",
+    description:
+      "By default, `git am` will fail if the patch does not apply cleanly. When set to true, this setting tells `git am` to fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally (equivalent to giving the `--3way` option from the command line). Defaults to `false`. See git-am[1]",
+  },
+  {
+    name: "apply.ignoreWhitespace",
+    description:
+      "When set to 'change', tells 'git apply' to ignore changes in whitespace, in the same way as the `--ignore-space-change` option. When set to one of: no, none, never, false tells 'git apply' to respect all whitespace differences. See git-apply[1]",
+  },
+  {
+    name: "apply.whitespace",
+    description:
+      "Tells 'git apply' how to handle whitespaces, in the same way as the `--whitespace` option. See git-apply[1]",
+  },
+  {
+    name: "blame.blankBoundary",
+    description:
+      "Show blank commit object name for boundary commits in git-blame[1]. This option defaults to false",
+  },
+  {
+    name: "blame.coloring",
+    description:
+      "This determines the coloring scheme to be applied to blame output. It can be 'repeatedLines', 'highlightRecent', or 'none' which is the default",
+  },
+  {
+    name: "blame.date",
+    description:
+      "Specifies the format used to output dates in git-blame[1]. If unset the iso format is used. For supported values, see the discussion of the `--date` option at git-log[1]",
+  },
+  {
+    name: "blame.ignoreRevsFile",
+    description:
+      "Ignore revisions listed in the file, one unabbreviated object name per line, in git-blame[1]. Whitespace and comments beginning with `#` are ignored. This option may be repeated multiple times. Empty file names will reset the list of ignored revisions. This option will be handled before the command line option `--ignore-revs-file`",
+  },
+  {
+    name: "blame.markIgnoredLines",
+    description:
+      "Mark lines that were changed by an ignored revision that we attributed to another commit with a '?' in the output of git-blame[1]",
+  },
+  {
+    name: "blame.markUnblamableLines",
+    description:
+      "Mark lines that were changed by an ignored revision that we could not attribute to another commit with a '*' in the output of git-blame[1]",
+  },
+  {
+    name: "blame.showEmail",
+    description:
+      "Show the author email instead of author name in git-blame[1]. This option defaults to false",
+  },
+  {
+    name: "blame.showRoot",
+    description:
+      "Do not treat root commits as boundaries in git-blame[1]. This option defaults to false",
+  },
+  {
+    name: "branch.<name>.description",
+    insertValue: "branch.{cursor}.description",
+    description:
+      "Branch description, can be edited with `git branch --edit-description`. Branch description is automatically added in the format-patch cover letter or request-pull summary",
+  },
+  {
+    name: "branch.<name>.merge",
+    insertValue: "branch.{cursor}.merge",
+    description:
+      "Defines, together with branch.<name>.remote, the upstream branch for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which branch to merge and can also affect 'git push' (see push.default). When in branch <name>, it tells 'git fetch' the default refspec to be marked for merging in FETCH_HEAD. The value is handled like the remote part of a refspec, and must match a ref which is fetched from the remote given by \"branch.<name>.remote\". The merge information is used by 'git pull' (which at first calls 'git fetch') to lookup the default branch for merging. Without this option, 'git pull' defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. If you wish to setup 'git pull' so that it merges into <name> from another branch in the local repository, you can point branch.<name>.merge to the desired branch, and use the relative path setting `.` (a period) for branch.<name>.remote",
+  },
+  {
+    name: "branch.<name>.mergeOptions",
+    insertValue: "branch.{cursor}.mergeOptions",
+    description:
+      "Sets default options for merging into branch <name>. The syntax and supported options are the same as those of git-merge[1], but option values containing whitespace characters are currently not supported",
+  },
+  {
+    name: "branch.<name>.pushRemote",
+    insertValue: "branch.{cursor}.pushRemote",
+    description:
+      "When on branch <name>, it overrides `branch.<name>.remote` for pushing. It also overrides `remote.pushDefault` for pushing from branch <name>. When you pull from one place (e.g. your upstream) and push to another place (e.g. your own publishing repository), you would want to set `remote.pushDefault` to specify the remote to push to for all branches, and use this option to override it for a specific branch",
+  },
+  {
+    name: "branch.<name>.rebase",
+    insertValue: "branch.{cursor}.rebase",
+    description:
+      'When true, rebase the branch <name> on top of the fetched branch, instead of merging the default branch from the default remote when "git pull" is run. See "pull.rebase" for doing this in a non branch-specific manner',
+  },
+  {
+    name: "branch.<name>.remote",
+    insertValue: "branch.{cursor}.remote",
+    description:
+      "When on branch <name>, it tells 'git fetch' and 'git push' which remote to fetch from/push to. The remote to push to may be overridden with `remote.pushDefault` (for all branches). The remote to push to, for the current branch, may be further overridden by `branch.<name>.pushRemote`. If no remote is configured, or if you are not on any branch and there is more than one remote defined in the repository, it defaults to `origin` for fetching and `remote.pushDefault` for pushing. Additionally, `.` (a period) is the current local repository (a dot-repository), see `branch.<name>.merge`'s final note below",
+  },
+  {
+    name: "branch.autoSetupMerge",
+    description:
+      "Tells 'git branch', 'git switch' and 'git checkout' to set up new branches so that git-pull[1] will appropriately merge from the starting point branch. Note that even if this option is not set, this behavior can be chosen per-branch using the `--track` and `--no-track` options. The valid settings are: `false` -- no automatic setup is done; `true` -- automatic setup is done when the starting point is a remote-tracking branch; `always` -- automatic setup is done when the starting point is either a local branch or remote-tracking branch; `inherit` -- if the starting point has a tracking configuration, it is copied to the new branch; `simple` -- automatic setup is done only when the starting point is a remote-tracking branch and the new branch has the same name as the remote branch. This option defaults to true",
+  },
+  {
+    name: "branch.autoSetupRebase",
+    description:
+      "When a new branch is created with 'git branch', 'git switch' or 'git checkout' that tracks another branch, this variable tells Git to set up pull to rebase instead of merge (see \"branch.<name>.rebase\"). When `never`, rebase is never automatically set to true. When `local`, rebase is set to true for tracked branches of other local branches. When `remote`, rebase is set to true for tracked branches of remote-tracking branches. When `always`, rebase will be set to true for all tracking branches. See \"branch.autoSetupMerge\" for details on how to set up a branch to track another branch. This option defaults to never",
+  },
+  {
+    name: "branch.sort",
+    description:
+      'This variable controls the sort ordering of branches when displayed by git-branch[1]. Without the "--sort=<value>" option provided, the value of this variable will be used as the default. See git-for-each-ref[1] field names for valid values',
+  },
+  {
+    name: "browser.<tool>.cmd",
+    insertValue: "browser.{cursor}.cmd",
+    description:
+      "Specify the command to invoke the specified browser. The specified command is evaluated in shell with the URLs passed as arguments. (See git-web{litdd}browse[1].)",
+  },
+  {
+    name: "browser.<tool>.path",
+    insertValue: "browser.{cursor}.path",
+    description:
+      "Override the path for the given tool that may be used to browse HTML help (see `-w` option in git-help[1]) or a working repository in gitweb (see git-instaweb[1])",
+  },
+  {
+    name: "checkout.defaultRemote",
+    description:
+      "When you run `git checkout <something>` or `git switch <something>` and only have one remote, it may implicitly fall back on checking out and tracking e.g. `origin/<something>`. This stops working as soon as you have more than one remote with a `<something>` reference. This setting allows for setting the name of a preferred remote that should always win when it comes to disambiguation. The typical use-case is to set this to `origin`",
+  },
+  {
+    name: "checkout.guess",
+    description:
+      "Provides the default value for the `--guess` or `--no-guess` option in `git checkout` and `git switch`. See git-switch[1] and git-checkout[1]",
+  },
+  {
+    name: "checkout.thresholdForParallelism",
+    description:
+      "When running parallel checkout with a small number of files, the cost of subprocess spawning and inter-process communication might outweigh the parallelization gains. This setting allows to define the minimum number of files for which parallel checkout should be attempted. The default is 100",
+  },
+  {
+    name: "checkout.workers",
+    description:
+      "The number of parallel workers to use when updating the working tree. The default is one, i.e. sequential execution. If set to a value less than one, Git will use as many workers as the number of logical cores available. This setting and `checkout.thresholdForParallelism` affect all commands that perform checkout. E.g. checkout, clone, reset, sparse-checkout, etc",
+  },
+  {
+    name: "clean.requireForce",
+    description:
+      "A boolean to make git-clean do nothing unless given -f, -i or -n. Defaults to true",
+  },
+  {
+    name: "clone.defaultRemoteName",
+    description:
+      "The name of the remote to create when cloning a repository. Defaults to `origin`, and can be overridden by passing the `--origin` command-line option to git-clone[1]",
+  },
+  {
+    name: "clone.filterSubmodules",
+    description:
+      "If a partial clone filter is provided (see `--filter` in git-rev-list[1]) and `--recurse-submodules` is used, also apply the filter to submodules",
+  },
+  {
+    name: "clone.rejectShallow",
+    description:
+      "Reject to clone a repository if it is a shallow one, can be overridden by passing option `--reject-shallow` in command line. See git-clone[1]",
+  },
+  {
+    name: "color.advice",
+    description:
+      "A boolean to enable/disable color in hints (e.g. when a push failed, see `advice.*` for a list). May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the error output goes to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
+  },
+  {
+    name: "color.advice.hint",
+    description: "Use customized color for hints",
+  },
+  {
+    name: "color.blame.highlightRecent",
+    description:
+      "Specify the line annotation color for `git blame --color-by-age` depending upon the age of the line",
+  },
+  {
+    name: "color.blame.repeatedLines",
+    description:
+      "Use the specified color to colorize line annotations for `git blame --color-lines`, if they come from the same commit as the preceding line. Defaults to cyan",
+  },
+  {
+    name: "color.branch",
+    description:
+      "A boolean to enable/disable color in the output of git-branch[1]. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the output is to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
+  },
+  {
+    name: "color.branch.<slot>",
+    insertValue: "color.branch.{cursor}",
+    description:
+      "Use customized color for branch coloration. `<slot>` is one of `current` (the current branch), `local` (a local branch), `remote` (a remote-tracking branch in refs/remotes/), `upstream` (upstream tracking branch), `plain` (other refs)",
+  },
+  {
+    name: "color.decorate.<slot>",
+    insertValue: "color.decorate.{cursor}",
+    description:
+      "Use customized color for 'git log --decorate' output. `<slot>` is one of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local branches, remote-tracking branches, tags, stash and HEAD, respectively and `grafted` for grafted commits",
+  },
+  {
+    name: "color.diff",
+    description:
+      "Whether to use ANSI escape sequences to add color to patches. If this is set to `always`, git-diff[1], git-log[1], and git-show[1] will use color for all patches. If it is set to `true` or `auto`, those commands will only use color when output is to the terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
+  },
+  {
+    name: "color.diff.<slot>",
+    insertValue: "color.diff.{cursor}",
+    description:
+      "Use customized color for diff colorization. `<slot>` specifies which part of the patch to use the specified color, and is one of `context` (context text - `plain` is a historical synonym), `meta` (metainformation), `frag` (hunk header), 'func' (function in hunk header), `old` (removed lines), `new` (added lines), `commit` (commit headers), `whitespace` (highlighting whitespace errors), `oldMoved` (deleted lines), `newMoved` (added lines), `oldMovedDimmed`, `oldMovedAlternative`, `oldMovedAlternativeDimmed`, `newMovedDimmed`, `newMovedAlternative` `newMovedAlternativeDimmed` (See the '<mode>' setting of '--color-moved' in git-diff[1] for details), `contextDimmed`, `oldDimmed`, `newDimmed`, `contextBold`, `oldBold`, and `newBold` (see git-range-diff[1] for details)",
+  },
+  {
+    name: "color.grep",
+    description:
+      "When set to `always`, always highlight matches. When `false` (or `never`), never. When set to `true` or `auto`, use color only when the output is written to the terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
+  },
+  {
+    name: "color.grep.<slot>",
+    insertValue: "color.grep.{cursor}",
+    description:
+      "Use customized color for grep colorization. `<slot>` specifies which part of the line to use the specified color, and is one of",
+  },
+  {
+    name: "color.interactive",
+    description:
+      'When set to `always`, always use colors for interactive prompts and displays (such as those used by "git-add --interactive" and "git-clean --interactive"). When false (or `never`), never. When set to `true` or `auto`, use colors only when the output is to the terminal. If unset, then the value of `color.ui` is used (`auto` by default)',
+  },
+  {
+    name: "color.interactive.<slot>",
+    insertValue: "color.interactive.{cursor}",
+    description:
+      "Use customized color for 'git add --interactive' and 'git clean --interactive' output. `<slot>` may be `prompt`, `header`, `help` or `error`, for four distinct types of normal output from interactive commands",
+  },
+  {
+    name: "color.pager",
+    description:
+      "A boolean to specify whether `auto` color modes should colorize output going to the pager. Defaults to true; set this to false if your pager does not understand ANSI color codes",
+  },
+  {
+    name: "color.push",
+    description:
+      "A boolean to enable/disable color in push errors. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the error output goes to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
+  },
+  {
+    name: "color.push.error",
+    description: "Use customized color for push errors",
+  },
+  {
+    name: "color.remote",
+    description:
+      'If set, keywords at the start of the line are highlighted. The keywords are "error", "warning", "hint" and "success", and are matched case-insensitively. May be set to `always`, `false` (or `never`) or `auto` (or `true`). If unset, then the value of `color.ui` is used (`auto` by default)',
+  },
+  {
+    name: "color.remote.<slot>",
+    insertValue: "color.remote.{cursor}",
+    description:
+      "Use customized color for each remote keyword. `<slot>` may be `hint`, `warning`, `success` or `error` which match the corresponding keyword",
+  },
+  {
+    name: "color.showBranch",
+    description:
+      "A boolean to enable/disable color in the output of git-show-branch[1]. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the output is to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
+  },
+  {
+    name: "color.status",
+    description:
+      "A boolean to enable/disable color in the output of git-status[1]. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the output is to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
+  },
+  {
+    name: "color.status.<slot>",
+    insertValue: "color.status.{cursor}",
+    description:
+      "Use customized color for status colorization. `<slot>` is one of `header` (the header text of the status message), `added` or `updated` (files which are added but not committed), `changed` (files which are changed but not added in the index), `untracked` (files which are not tracked by Git), `branch` (the current branch), `nobranch` (the color the 'no branch' warning is shown in, defaulting to red), `localBranch` or `remoteBranch` (the local and remote branch names, respectively, when branch and tracking information is displayed in the status short-format), or `unmerged` (files which have unmerged changes)",
+  },
+  {
+    name: "color.transport",
+    description:
+      "A boolean to enable/disable color when pushes are rejected. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the error output goes to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
+  },
+  {
+    name: "color.transport.rejected",
+    description: "Use customized color when a push was rejected",
+  },
+  {
+    name: "color.ui",
+    description:
+      "This variable determines the default value for variables such as `color.diff` and `color.grep` that control the use of color per command family. Its scope will expand as more commands learn configuration to set a default for the `--color` option. Set it to `false` or `never` if you prefer Git commands not to use color unless enabled explicitly with some other configuration or the `--color` option. Set it to `always` if you want all output not intended for machine consumption to use color, to `true` or `auto` (this is the default since Git 1.8.4) if you want such output to use color when written to the terminal",
+  },
+  {
+    name: "column.branch",
+    description:
+      "Specify whether to output branch listing in `git branch` in columns. See `column.ui` for details",
+  },
+  {
+    name: "column.clean",
+    description:
+      "Specify the layout when list items in `git clean -i`, which always shows files and directories in columns. See `column.ui` for details",
+  },
+  {
+    name: "column.status",
+    description:
+      "Specify whether to output untracked files in `git status` in columns. See `column.ui` for details",
+  },
+  {
+    name: "column.tag",
+    description:
+      "Specify whether to output tag listing in `git tag` in columns. See `column.ui` for details",
+  },
+  {
+    name: "column.ui",
+    description:
+      "Specify whether supported commands should output in columns. This variable consists of a list of tokens separated by spaces or commas:",
+  },
+  {
+    name: "commit.cleanup",
+    description:
+      "This setting overrides the default of the `--cleanup` option in `git commit`. See git-commit[1] for details. Changing the default can be useful when you always want to keep lines that begin with comment character `#` in your log message, in which case you would do `git config commit.cleanup whitespace` (note that you will have to remove the help lines that begin with `#` in the commit log template yourself, if you do this)",
+  },
+  {
+    name: "commit.status",
+    description:
+      "A boolean to enable/disable inclusion of status information in the commit message template when using an editor to prepare the commit message. Defaults to true",
+  },
+  {
+    name: "commit.template",
+    description:
+      "Specify the pathname of a file to use as the template for new commit messages",
+  },
+  {
+    name: "commit.verbose",
+    description:
+      "A boolean or int to specify the level of verbose with `git commit`. See git-commit[1]",
+  },
+  {
+    name: "commitGraph.generationVersion",
+    description:
+      "Specifies the type of generation number version to use when writing or reading the commit-graph file. If version 1 is specified, then the corrected commit dates will not be written or read. Defaults to 2",
+  },
+  {
+    name: "commitGraph.maxNewFilters",
+    description:
+      "Specifies the default value for the `--max-new-filters` option of `git commit-graph write` (c.f., git-commit-graph[1])",
+  },
+  {
+    name: "commitGraph.readChangedPaths",
+    description:
+      "If true, then git will use the changed-path Bloom filters in the commit-graph file (if it exists, and they are present). Defaults to true. See git-commit-graph[1] for more information",
+  },
+  {
+    name: "committer.email",
+    description:
+      "The `user.name` and `user.email` variables determine what ends up in the `author` and `committer` field of commit objects. If you need the `author` or `committer` to be different, the `author.name`, `author.email`, `committer.name` or `committer.email` variables can be set. Also, all of these can be overridden by the `GIT_AUTHOR_NAME`, `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_NAME`, `GIT_COMMITTER_EMAIL` and `EMAIL` environment variables",
+  },
+  {
+    name: "completion.commands",
+    description:
+      "This is only used by git-completion.bash to add or remove commands from the list of completed commands. Normally only porcelain commands and a few select others are completed. You can add more commands, separated by space, in this variable. Prefixing the command with '-' will remove it from the existing list",
+  },
+  {
+    name: "core.abbrev",
+    description:
+      'Set the length object names are abbreviated to. If unspecified or set to "auto", an appropriate value is computed based on the approximate number of packed objects in your repository, which hopefully is enough for abbreviated object names to stay unique for some time. If set to "no", no abbreviation is made and the object names are shown in their full length. The minimum length is 4',
+  },
+  {
+    name: "core.alternateRefsCommand",
+    description:
+      "When advertising tips of available history from an alternate, use the shell to execute the specified command instead of git-for-each-ref[1]. The first argument is the absolute path of the alternate. Output must contain one hex object id per line (i.e., the same as produced by `git for-each-ref --format='%(objectname)'`)",
+  },
+  {
+    name: "core.alternateRefsPrefixes",
+    description:
+      "When listing references from an alternate, list only references that begin with the given prefix. Prefixes match as if they were given as arguments to git-for-each-ref[1]. To list multiple prefixes, separate them with whitespace. If `core.alternateRefsCommand` is set, setting `core.alternateRefsPrefixes` has no effect",
+  },
+  {
+    name: "core.askPass",
+    description:
+      "Some commands (e.g. svn and http interfaces) that interactively ask for a password can be told to use an external program given via the value of this variable. Can be overridden by the `GIT_ASKPASS` environment variable. If not set, fall back to the value of the `SSH_ASKPASS` environment variable or, failing that, a simple password prompt. The external program shall be given a suitable prompt as command-line argument and write the password on its STDOUT",
+  },
+  {
+    name: "core.attributesFile",
+    description:
+      "In addition to `.gitattributes` (per-directory) and `.git/info/attributes`, Git looks into this file for attributes (see gitattributes[5]). Path expansions are made the same way as for `core.excludesFile`. Its default value is `$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either not set or empty, `$HOME/.config/git/attributes` is used instead",
+  },
+  {
+    name: "core.autocrlf",
+    description:
+      'Setting this variable to "true" is the same as setting the `text` attribute to "auto" on all files and core.eol to "crlf". Set to true if you want to have `CRLF` line endings in your working directory and the repository has LF line endings. This variable can be set to \'input\', in which case no output conversion is performed',
+  },
+  {
+    name: "core.bare",
+    description:
+      "If true this repository is assumed to be 'bare' and has no working directory associated with it. If this is the case a number of commands that require a working directory will be disabled, such as git-add[1] or git-merge[1]",
+  },
+  {
+    name: "core.bigFileThreshold",
+    description:
+      "The size of files considered \"big\", which as discussed below changes the behavior of numerous git commands, as well as how such files are stored within the repository. The default is 512 MiB. Common unit suffixes of 'k', 'm', or 'g' are supported",
+  },
+  {
+    name: "core.checkRoundtripEncoding",
+    description:
+      "A comma and/or whitespace separated list of encodings that Git performs UTF-8 round trip checks on if they are used in an `working-tree-encoding` attribute (see gitattributes[5]). The default value is `SHIFT-JIS`",
+  },
+  {
+    name: "core.checkStat",
+    description:
+      "When missing or is set to `default`, many fields in the stat structure are checked to detect if a file has been modified since Git looked at it. When this configuration variable is set to `minimal`, sub-second part of mtime and ctime, the uid and gid of the owner of the file, the inode number (and the device number, if Git was compiled to use it), are excluded from the check among these fields, leaving only the whole-second part of mtime (and ctime, if `core.trustCtime` is set) and the filesize to be checked",
+  },
+  {
+    name: "core.commentChar",
+    description:
+      "Commands such as `commit` and `tag` that let you edit messages consider a line that begins with this character commented, and removes them after the editor returns (default '#')",
+  },
+  {
+    name: "core.commitGraph",
+    description:
+      "If true, then git will read the commit-graph file (if it exists) to parse the graph structure of commits. Defaults to true. See git-commit-graph[1] for more information",
+  },
+  {
+    name: "core.compression",
+    description:
+      "An integer -1..9, indicating a default compression level. -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If set, this provides a default to other compression variables, such as `core.looseCompression` and `pack.compression`",
+  },
+  {
+    name: "core.createObject",
+    description:
+      "You can set this to 'link', in which case a hardlink followed by a delete of the source are used to make sure that object creation will not overwrite existing objects",
+  },
+  {
+    name: "core.deltaBaseCacheLimit",
+    description:
+      "Maximum number of bytes per thread to reserve for caching base objects that may be referenced by multiple deltified objects. By storing the entire decompressed base objects in a cache Git is able to avoid unpacking and decompressing frequently used base objects multiple times",
+  },
+  {
+    name: "core.editor",
+    description:
+      "Commands such as `commit` and `tag` that let you edit messages by launching an editor use the value of this variable when it is set, and the environment variable `GIT_EDITOR` is not set. See git-var[1]",
+  },
+  {
+    name: "core.eol",
+    description:
+      "Sets the line ending type to use in the working directory for files that are marked as text (either by having the `text` attribute set, or by having `text=auto` and Git auto-detecting the contents as text). Alternatives are 'lf', 'crlf' and 'native', which uses the platform's native line ending. The default value is `native`. See gitattributes[5] for more information on end-of-line conversion. Note that this value is ignored if `core.autocrlf` is set to `true` or `input`",
+  },
+  {
+    name: "core.excludesFile",
+    description:
+      "Specifies the pathname to the file that contains patterns to describe paths that are not meant to be tracked, in addition to `.gitignore` (per-directory) and `.git/info/exclude`. Defaults to `$XDG_CONFIG_HOME/git/ignore`. If `$XDG_CONFIG_HOME` is either not set or empty, `$HOME/.config/git/ignore` is used instead. See gitignore[5]",
+  },
+  {
+    name: "core.fileMode",
+    description:
+      "Tells Git if the executable bit of files in the working tree is to be honored",
+  },
+  {
+    name: "core.filesRefLockTimeout",
+    description:
+      "The length of time, in milliseconds, to retry when trying to lock an individual reference. Value 0 means not to retry at all; -1 means to try indefinitely. Default is 100 (i.e., retry for 100ms)",
+  },
+  {
+    name: "core.fsmonitor",
+    description:
+      "If set to true, enable the built-in file system monitor daemon for this working directory (git-fsmonitor{litdd}daemon[1])",
+  },
+  {
+    name: "core.fsmonitorHookVersion",
+    description:
+      'Sets the protocol version to be used when invoking the "fsmonitor" hook',
+  },
+  {
+    name: "core.fsync",
+    description:
+      "A comma-separated list of components of the repository that should be hardened via the core.fsyncMethod when created or modified. You can disable hardening of any component by prefixing it with a '-'. Items that are not hardened may be lost in the event of an unclean system shutdown. Unless you have special requirements, it is recommended that you leave this option empty or pick one of `committed`, `added`, or `all`",
+  },
+  {
+    name: "core.fsyncMethod",
+    description:
+      "A value indicating the strategy Git will use to harden repository data using fsync and related primitives",
+  },
+  {
+    name: "core.fsyncObjectFiles",
+    description:
+      "This boolean will enable 'fsync()' when writing object files. This setting is deprecated. Use core.fsync instead",
+  },
+  {
+    name: "core.gitProxy",
+    description:
+      'A "proxy command" to execute (as \'command host port\') instead of establishing direct connection to the remote server when using the Git protocol for fetching. If the variable value is in the "COMMAND for DOMAIN" format, the command is applied only on hostnames ending with the specified domain string. This variable may be set multiple times and is matched in the given order; the first match wins',
+  },
+  {
+    name: "core.hideDotFiles",
+    description:
+      "(Windows-only) If true, mark newly-created directories and files whose name starts with a dot as hidden. If 'dotGitOnly', only the `.git/` directory is hidden, but no other files starting with a dot. The default mode is 'dotGitOnly'",
+  },
+  {
+    name: "core.hooksPath",
+    description:
+      "By default Git will look for your hooks in the `$GIT_DIR/hooks` directory. Set this to different path, e.g. `/etc/git/hooks`, and Git will try to find your hooks in that directory, e.g. `/etc/git/hooks/pre-receive` instead of in `$GIT_DIR/hooks/pre-receive`",
+  },
+  {
+    name: "core.ignoreCase",
+    description:
+      'Internal variable which enables various workarounds to enable Git to work better on filesystems that are not case sensitive, like APFS, HFS+, FAT, NTFS, etc. For example, if a directory listing finds "makefile" when Git expects "Makefile", Git will assume it is really the same file, and continue to remember it as "Makefile"',
+  },
+  {
+    name: "core.ignoreStat",
+    description:
+      'If true, Git will avoid using lstat() calls to detect if files have changed by setting the "assume-unchanged" bit for those tracked files which it has updated identically in both the index and working tree',
+  },
+  {
+    name: "core.logAllRefUpdates",
+    description:
+      'Enable the reflog. Updates to a ref <ref> is logged to the file "`$GIT_DIR/logs/<ref>`", by appending the new and old SHA-1, the date/time and the reason of the update, but only when the file exists. If this configuration variable is set to `true`, missing "`$GIT_DIR/logs/<ref>`" file is automatically created for branch heads (i.e. under `refs/heads/`), remote refs (i.e. under `refs/remotes/`), note refs (i.e. under `refs/notes/`), and the symbolic ref `HEAD`. If it is set to `always`, then a missing reflog is automatically created for any ref under `refs/`',
+  },
+  {
+    name: "core.looseCompression",
+    description:
+      "An integer -1..9, indicating the compression level for objects that are not in a pack file. -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If not set, defaults to core.compression. If that is not set, defaults to 1 (best speed)",
+  },
+  {
+    name: "core.multiPackIndex",
+    description:
+      "Use the multi-pack-index file to track multiple packfiles using a single index. See git-multi-pack-index[1] for more information. Defaults to true",
+  },
+  {
+    name: "core.notesRef",
+    description:
+      "When showing commit messages, also show notes which are stored in the given ref. The ref must be fully qualified. If the given ref does not exist, it is not an error but means that no notes should be printed",
+  },
+  {
+    name: "core.packedGitLimit",
+    description:
+      "Maximum number of bytes to map simultaneously into memory from pack files. If Git needs to access more than this many bytes at once to complete an operation it will unmap existing regions to reclaim virtual address space within the process",
+  },
+  {
+    name: "core.packedGitWindowSize",
+    description:
+      "Number of bytes of a pack file to map into memory in a single mapping operation. Larger window sizes may allow your system to process a smaller number of large pack files more quickly. Smaller window sizes will negatively affect performance due to increased calls to the operating system's memory manager, but may improve performance when accessing a large number of large pack files",
+  },
+  {
+    name: "core.packedRefsTimeout",
+    description:
+      "The length of time, in milliseconds, to retry when trying to lock the `packed-refs` file. Value 0 means not to retry at all; -1 means to try indefinitely. Default is 1000 (i.e., retry for 1 second)",
+  },
+  {
+    name: "core.pager",
+    description:
+      "Text viewer for use by Git commands (e.g., 'less'). The value is meant to be interpreted by the shell. The order of preference is the `$GIT_PAGER` environment variable, then `core.pager` configuration, then `$PAGER`, and then the default chosen at compile time (usually 'less')",
+  },
+  {
+    name: "core.precomposeUnicode",
+    description:
+      "This option is only used by Mac OS implementation of Git. When core.precomposeUnicode=true, Git reverts the unicode decomposition of filenames done by Mac OS. This is useful when sharing a repository between Mac OS and Linux or Windows. (Git for Windows 1.7.10 or higher is needed, or Git under cygwin 1.7). When false, file names are handled fully transparent by Git, which is backward compatible with older versions of Git",
+  },
+  {
+    name: "core.preferSymlinkRefs",
+    description:
+      'Instead of the default "symref" format for HEAD and other symbolic reference files, use symbolic links. This is sometimes needed to work with old scripts that expect HEAD to be a symbolic link',
+  },
+  {
+    name: "core.preloadIndex",
+    description: "Enable parallel index preload for operations like 'git diff'",
+  },
+  {
+    name: "core.protectHFS",
+    description:
+      "If set to true, do not allow checkout of paths that would be considered equivalent to `.git` on an HFS+ filesystem. Defaults to `true` on Mac OS, and `false` elsewhere",
+  },
+  {
+    name: "core.protectNTFS",
+    description:
+      'If set to true, do not allow checkout of paths that would cause problems with the NTFS filesystem, e.g. conflict with 8.3 "short" names. Defaults to `true` on Windows, and `false` elsewhere',
+  },
+  {
+    name: "core.quotePath",
+    description:
+      'Commands that output paths (e.g. \'ls-files\', \'diff\'), will quote "unusual" characters in the pathname by enclosing the pathname in double-quotes and escaping those characters with backslashes in the same way C escapes control characters (e.g. `\\t` for TAB, `\\n` for LF, `\\\\` for backslash) or bytes with values larger than 0x80 (e.g. octal `\\302\\265` for "micro" in UTF-8). If this variable is set to false, bytes higher than 0x80 are not considered "unusual" any more. Double-quotes, backslash and control characters are always escaped regardless of the setting of this variable. A simple space character is not considered "unusual". Many commands can output pathnames completely verbatim using the `-z` option. The default value is true',
+  },
+  {
+    name: "core.repositoryFormatVersion",
+    description:
+      "Internal variable identifying the repository format and layout version",
+  },
+  {
+    name: "core.restrictinheritedhandles",
+    description:
+      "Windows-only: override whether spawned processes inherit only standard file handles (`stdin`, `stdout` and `stderr`) or all handles. Can be `auto`, `true` or `false`. Defaults to `auto`, which means `true` on Windows 7 and later, and `false` on older Windows versions",
+  },
+  {
+    name: "core.safecrlf",
+    description:
+      'If true, makes Git check if converting `CRLF` is reversible when end-of-line conversion is active. Git will verify if a command modifies a file in the work tree either directly or indirectly. For example, committing a file followed by checking out the same file should yield the original file in the work tree. If this is not the case for the current setting of `core.autocrlf`, Git will reject the file. The variable can be set to "warn", in which case Git will only warn about an irreversible conversion but continue the operation',
+  },
+  {
+    name: "core.sharedRepository",
+    description:
+      "When 'group' (or 'true'), the repository is made shareable between several users in a group (making sure all the files and objects are group-writable). When 'all' (or 'world' or 'everybody'), the repository will be readable by all users, additionally to being group-shareable. When 'umask' (or 'false'), Git will use permissions reported by umask(2). When '0xxx', where '0xxx' is an octal number, files in the repository will have this mode value. '0xxx' will override user's umask value (whereas the other options will only override requested parts of the user's umask value). Examples: '0660' will make the repo read/write-able for the owner and group, but inaccessible to others (equivalent to 'group' unless umask is e.g. '0022'). '0640' is a repository that is group-readable but not group-writable. See git-init[1]. False by default",
+  },
+  {
+    name: "core.sparseCheckout",
+    description:
+      'Enable "sparse checkout" feature. See git-sparse-checkout[1] for more information',
+  },
+  {
+    name: "core.sparseCheckoutCone",
+    description:
+      'Enables the "cone mode" of the sparse checkout feature. When the sparse-checkout file contains a limited set of patterns, this mode provides significant performance advantages. The "non-cone mode" can be requested to allow specifying more flexible patterns by setting this variable to \'false\'. See git-sparse-checkout[1] for more information',
+  },
+  {
+    name: "core.splitIndex",
+    description:
+      "If true, the split-index feature of the index will be used. See git-update-index[1]. False by default",
+  },
+  {
+    name: "core.sshCommand",
+    description:
+      "If this variable is set, `git fetch` and `git push` will use the specified command instead of `ssh` when they need to connect to a remote system. The command is in the same form as the `GIT_SSH_COMMAND` environment variable and is overridden when the environment variable is set",
+  },
+  {
+    name: "core.symlinks",
+    description:
+      "If false, symbolic links are checked out as small plain files that contain the link text. git-update-index[1] and git-add[1] will not change the recorded type to regular file. Useful on filesystems like FAT that do not support symbolic links",
+  },
+  {
+    name: "core.trustctime",
+    description:
+      "If false, the ctime differences between the index and the working tree are ignored; useful when the inode change time is regularly modified by something outside Git (file system crawlers and some backup systems). See git-update-index[1]. True by default",
+  },
+  {
+    name: "core.unsetenvvars",
+    description:
+      "Windows-only: comma-separated list of environment variables' names that need to be unset before spawning any other process. Defaults to `PERL5LIB` to account for the fact that Git for Windows insists on using its own Perl interpreter",
+  },
+  {
+    name: "core.untrackedCache",
+    description:
+      "Determines what to do about the untracked cache feature of the index. It will be kept, if this variable is unset or set to `keep`. It will automatically be added if set to `true`. And it will automatically be removed, if set to `false`. Before setting it to `true`, you should check that mtime is working properly on your system. See git-update-index[1]. `keep` by default, unless `feature.manyFiles` is enabled which sets this setting to `true` by default",
+  },
+  {
+    name: "core.useReplaceRefs",
+    description:
+      "If set to `false`, behave as if the `--no-replace-objects` option was given on the command line. See git[1] and git-replace[1] for more information",
+  },
+  {
+    name: "core.warnAmbiguousRefs",
+    description:
+      "If true, Git will warn you if the ref name you passed it is ambiguous and might match multiple refs in the repository. True by default",
+  },
+  {
+    name: "core.whitespace",
+    description:
+      "A comma separated list of common whitespace problems to notice. 'git diff' will use `color.diff.whitespace` to highlight them, and 'git apply --whitespace=error' will consider them as errors. You can prefix `-` to disable any of them (e.g. `-trailing-space`):",
+  },
+  {
+    name: "core.worktree",
+    description:
+      "Set the path to the root of the working tree. If `GIT_COMMON_DIR` environment variable is set, core.worktree is ignored and not used for determining the root of working tree. This can be overridden by the `GIT_WORK_TREE` environment variable and the `--work-tree` command-line option. The value can be an absolute path or relative to the path to the .git directory, which is either specified by --git-dir or GIT_DIR, or automatically discovered. If --git-dir or GIT_DIR is specified but none of --work-tree, GIT_WORK_TREE and core.worktree is specified, the current working directory is regarded as the top level of your working tree",
+  },
+  {
+    name: "credential.helper",
+    description:
+      "Specify an external helper to be called when a username or password credential is needed; the helper may consult external storage to avoid prompting the user for the credentials. This is normally the name of a credential helper with possible arguments, but may also be an absolute path with arguments or, if preceded by `!`, shell commands",
+  },
+  {
+    name: "credential.useHttpPath",
+    description:
+      'When acquiring credentials, consider the "path" component of an http or https URL to be important. Defaults to false. See gitcredentials[7] for more information',
+  },
+  {
+    name: "credential.username",
+    description:
+      "If no username is set for a network authentication, use this username by default. See credential.<context>.* below, and gitcredentials[7]",
+  },
+  {
+    name: "credentialCache.ignoreSIGHUP",
+    description:
+      "Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting",
+  },
+  {
+    name: "credentialStore.lockTimeoutMS",
+    description:
+      "The length of time, in milliseconds, for git-credential-store to retry when trying to lock the credentials file. Value 0 means not to retry at all; -1 means to try indefinitely. Default is 1000 (i.e., retry for 1s)",
+  },
+  {
+    name: "credential.<url>.helper",
+    insertValue: "credential.{cursor}.helper",
+    description:
+      "Specify an external helper to be called when a username or password credential is needed; the helper may consult external storage to avoid prompting the user for the credentials. This is normally the name of a credential helper with possible arguments, but may also be an absolute path with arguments or, if preceded by `!`, shell commands",
+  },
+  {
+    name: "credential.<url>.useHttpPath",
+    insertValue: "credential.{cursor}.useHttpPath",
+    description:
+      'When acquiring credentials, consider the "path" component of an http or https URL to be important. Defaults to false. See gitcredentials[7] for more information',
+  },
+  {
+    name: "credential.<url>.username",
+    insertValue: "credential.{cursor}.username",
+    description:
+      "If no username is set for a network authentication, use this username by default. See credential.<context>.* below, and gitcredentials[7]",
+  },
+  {
+    name: "credentialCache.<url>.ignoreSIGHUP",
+    insertValue: "credentialCache.{cursor}.ignoreSIGHUP",
+    description:
+      "Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting",
+  },
+  {
+    name: "credentialStore.<url>.lockTimeoutMS",
+    insertValue: "credentialStore.{cursor}.lockTimeoutMS",
+    description:
+      "The length of time, in milliseconds, for git-credential-store to retry when trying to lock the credentials file. Value 0 means not to retry at all; -1 means to try indefinitely. Default is 1000 (i.e., retry for 1s)",
+  },
+  {
+    name: "diff.<driver>.binary",
+    insertValue: "diff.{cursor}.binary",
+    description:
+      "Set this option to true to make the diff driver treat files as binary. See gitattributes[5] for details",
+  },
+  {
+    name: "diff.<driver>.cachetextconv",
+    insertValue: "diff.{cursor}.cachetextconv",
+    description:
+      "Set this option to true to make the diff driver cache the text conversion outputs. See gitattributes[5] for details",
+  },
+  {
+    name: "diff.<driver>.command",
+    insertValue: "diff.{cursor}.command",
+    description:
+      "The custom diff driver command. See gitattributes[5] for details",
+  },
+  {
+    name: "diff.<driver>.textconv",
+    insertValue: "diff.{cursor}.textconv",
+    description:
+      "The command that the diff driver should call to generate the text-converted version of a file. The result of the conversion is used to generate a human-readable diff. See gitattributes[5] for details",
+  },
+  {
+    name: "diff.<driver>.wordRegex",
+    insertValue: "diff.{cursor}.wordRegex",
+    description:
+      "The regular expression that the diff driver should use to split words in a line. See gitattributes[5] for details",
+  },
+  {
+    name: "diff.<driver>.xfuncname",
+    insertValue: "diff.{cursor}.xfuncname",
+    description:
+      "The regular expression that the diff driver should use to recognize the hunk header. A built-in pattern may also be used. See gitattributes[5] for details",
+  },
+  {
+    name: "diff.algorithm",
+    description: "Choose a diff algorithm",
+  },
+  {
+    name: "diff.autoRefreshIndex",
+    description:
+      "When using 'git diff' to compare with work tree files, do not consider stat-only change as changed. Instead, silently run `git update-index --refresh` to update the cached stat information for paths whose contents in the work tree match the contents in the index. This option defaults to true. Note that this affects only 'git diff' Porcelain, and not lower level 'diff' commands such as 'git diff-files'",
+  },
+  {
+    name: "diff.colorMoved",
+    description:
+      "If set to either a valid `<mode>` or a true value, moved lines in a diff are colored differently, for details of valid modes see '--color-moved' in git-diff[1]. If simply set to true the default color mode will be used. When set to false, moved lines are not colored",
+  },
+  {
+    name: "diff.colorMovedWS",
+    description:
+      "When moved lines are colored using e.g. the `diff.colorMoved` setting, this option controls the `<mode>` how spaces are treated for details of valid modes see '--color-moved-ws' in git-diff[1]",
+  },
+  {
+    name: "diff.context",
+    description:
+      "Generate diffs with <n> lines of context instead of the default of 3. This value is overridden by the -U option",
+  },
+  {
+    name: "diff.dirstat",
+    description:
+      "A comma separated list of `--dirstat` parameters specifying the default behavior of the `--dirstat` option to git-diff[1] and friends. The defaults can be overridden on the command line (using `--dirstat=<param1,param2,...>`). The fallback defaults (when not changed by `diff.dirstat`) are `changes,noncumulative,3`. The following parameters are available:",
+  },
+  {
+    name: "diff.external",
+    description:
+      'If this config variable is set, diff generation is not performed using the internal diff machinery, but using the given command. Can be overridden with the `GIT_EXTERNAL_DIFF\' environment variable. The command is called with parameters as described under "git Diffs" in git[1]. Note: if you want to use an external diff program only on a subset of your files, you might want to use gitattributes[5] instead',
+  },
+  {
+    name: "diff.guitool",
+    description:
+      "Controls which diff tool is used by git-difftool[1] when the -g/--gui flag is specified. This variable overrides the value configured in `merge.guitool`. The list below shows the valid built-in values. Any other value is treated as a custom diff tool and requires that a corresponding difftool.<guitool>.cmd variable is defined",
+  },
+  {
+    name: "diff.ignoreSubmodules",
+    description:
+      "Sets the default value of --ignore-submodules. Note that this affects only 'git diff' Porcelain, and not lower level 'diff' commands such as 'git diff-files'. 'git checkout' and 'git switch' also honor this setting when reporting uncommitted changes. Setting it to 'all' disables the submodule summary normally shown by 'git commit' and 'git status' when `status.submoduleSummary` is set unless it is overridden by using the --ignore-submodules command-line option. The 'git submodule' commands are not affected by this setting. By default this is set to untracked so that any untracked submodules are ignored",
+  },
+  {
+    name: "diff.indentHeuristic",
+    description:
+      "Set this option to `false` to disable the default heuristics that shift diff hunk boundaries to make patches easier to read",
+  },
+  {
+    name: "diff.interHunkContext",
+    description:
+      "Show the context between diff hunks, up to the specified number of lines, thereby fusing the hunks that are close to each other. This value serves as the default for the `--inter-hunk-context` command line option",
+  },
+  {
+    name: "diff.mnemonicPrefix",
+    description:
+      'If set, \'git diff\' uses a prefix pair that is different from the standard "a/" and "b/" depending on what is being compared. When this configuration is in effect, reverse diff output also swaps the order of the prefixes:',
+  },
+  {
+    name: "diff.noprefix",
+    description:
+      "If set, 'git diff' does not show any source or destination prefix",
+  },
+  {
+    name: "diff.orderFile",
+    description:
+      "File indicating how to order files within a diff. See the '-O' option to git-diff[1] for details. If `diff.orderFile` is a relative pathname, it is treated as relative to the top of the working tree",
+  },
+  {
+    name: "diff.relative",
+    description:
+      "If set to 'true', 'git diff' does not show changes outside of the directory and show pathnames relative to the current directory",
+  },
+  {
+    name: "diff.renameLimit",
+    description:
+      "The number of files to consider in the exhaustive portion of copy/rename detection; equivalent to the 'git diff' option `-l`. If not set, the default value is currently 1000. This setting has no effect if rename detection is turned off",
+  },
+  {
+    name: "diff.renames",
+    description:
+      'Whether and how Git detects renames. If set to "false", rename detection is disabled. If set to "true", basic rename detection is enabled. If set to "copies" or "copy", Git will detect copies, as well. Defaults to true. Note that this affects only \'git diff\' Porcelain like git-diff[1] and git-log[1], and not lower level commands such as git-diff-files[1]',
+  },
+  {
+    name: "diff.statGraphWidth",
+    description:
+      "Limit the width of the graph part in --stat output. If set, applies to all commands generating --stat output except format-patch",
+  },
+  {
+    name: "diff.submodule",
+    description:
+      'Specify the format in which differences in submodules are shown. The "short" format just shows the names of the commits at the beginning and end of the range. The "log" format lists the commits in the range like git-submodule[1] `summary` does. The "diff" format shows an inline diff of the changed contents of the submodule. Defaults to "short"',
+  },
+  {
+    name: "diff.suppressBlankEmpty",
+    description:
+      "A boolean to inhibit the standard behavior of printing a space before each empty output line. Defaults to false",
+  },
+  {
+    name: "diff.tool",
+    description:
+      "Controls which diff tool is used by git-difftool[1]. This variable overrides the value configured in `merge.tool`. The list below shows the valid built-in values. Any other value is treated as a custom diff tool and requires that a corresponding difftool.<tool>.cmd variable is defined",
+  },
+  {
+    name: "diff.wordRegex",
+    description:
+      'A POSIX Extended Regular Expression used to determine what is a "word" when performing word-by-word difference calculations. Character sequences that match the regular expression are "words", all other characters are *ignorable* whitespace',
+  },
+  {
+    name: "diff.wsErrorHighlight",
+    description:
+      "Highlight whitespace errors in the `context`, `old` or `new` lines of the diff. Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`. The whitespace errors are colored with `color.diff.whitespace`. The command line option `--ws-error-highlight=<kind>` overrides this setting",
+  },
+  {
+    name: "difftool.<tool>.cmd",
+    insertValue: "difftool.{cursor}.cmd",
+    description:
+      "Specify the command to invoke the specified diff tool. The specified command is evaluated in shell with the following variables available: 'LOCAL' is set to the name of the temporary file containing the contents of the diff pre-image and 'REMOTE' is set to the name of the temporary file containing the contents of the diff post-image",
+  },
+  {
+    name: "difftool.<tool>.path",
+    insertValue: "difftool.{cursor}.path",
+    description:
+      "Override the path for the given tool. This is useful in case your tool is not in the PATH",
+  },
+  {
+    name: "difftool.prompt",
+    description: "Prompt before each invocation of the diff tool",
+  },
+  {
+    name: "extensions.objectFormat",
+    description:
+      "Specify the hash algorithm to use. The acceptable values are `sha1` and `sha256`. If not specified, `sha1` is assumed. It is an error to specify this key unless `core.repositoryFormatVersion` is 1",
+  },
+  {
+    name: "extensions.worktreeConfig",
+    description:
+      "If enabled, then worktrees will load config settings from the `$GIT_DIR/config.worktree` file in addition to the `$GIT_COMMON_DIR/config` file. Note that `$GIT_COMMON_DIR` and `$GIT_DIR` are the same for the main working tree, while other working trees have `$GIT_DIR` equal to `$GIT_COMMON_DIR/worktrees/<id>/`. The settings in the `config.worktree` file will override settings from any other config files",
+  },
+  {
+    name: "fastimport.unpackLimit",
+    description:
+      "If the number of objects imported by git-fast-import[1] is below this limit, then the objects will be unpacked into loose object files. However if the number of imported objects equals or exceeds this limit then the pack will be stored as a pack. Storing the pack from a fast-import can make the import operation complete faster, especially on slow filesystems. If not set, the value of `transfer.unpackLimit` is used instead",
+  },
+  {
+    name: "feature.*",
+    insertValue: "feature.{cursor}",
+    description:
+      "The config settings that start with `feature.` modify the defaults of a group of other config settings. These groups are created by the Git developer community as recommended defaults and are subject to change. In particular, new config options may be added with different defaults",
+  },
+  {
+    name: "feature.experimental",
+    description:
+      "Enable config options that are new to Git, and are being considered for future defaults. Config settings included here may be added or removed with each release, including minor version updates. These settings may have unintended interactions since they are so new. Please enable this setting if you are interested in providing feedback on experimental features. The new default values are:",
+  },
+  {
+    name: "feature.manyFiles",
+    description:
+      "Enable config options that optimize for repos with many files in the working directory. With many files, commands such as `git status` and `git checkout` may be slow and these new defaults improve performance:",
+  },
+  {
+    name: "fetch.fsck.<msg-id>",
+    insertValue: "fetch.fsck.{cursor}",
+    description:
+      "Acts like `fsck.<msg-id>`, but is used by git-fetch-pack[1] instead of git-fsck[1]. See the `fsck.<msg-id>` documentation for details",
+  },
+  {
+    name: "fetch.fsck.skipList",
+    description:
+      "Acts like `fsck.skipList`, but is used by git-fetch-pack[1] instead of git-fsck[1]. See the `fsck.skipList` documentation for details",
+  },
+  {
+    name: "fetch.fsckObjects",
+    description:
+      "If it is set to true, git-fetch-pack will check all fetched objects. See `transfer.fsckObjects` for what's checked. Defaults to false. If not set, the value of `transfer.fsckObjects` is used instead",
+  },
+  {
+    name: "fetch.negotiationAlgorithm",
+    description:
+      'Control how information about the commits in the local repository is sent when negotiating the contents of the packfile to be sent by the server. Set to "consecutive" to use an algorithm that walks over consecutive commits checking each one. Set to "skipping" to use an algorithm that skips commits in an effort to converge faster, but may result in a larger-than-necessary packfile; or set to "noop" to not send any information at all, which will almost certainly result in a larger-than-necessary packfile, but will skip the negotiation step. Set to "default" to override settings made previously and use the default behaviour. The default is normally "consecutive", but if `feature.experimental` is true, then the default is "skipping". Unknown values will cause \'git fetch\' to error out',
+  },
+  {
+    name: "fetch.output",
+    description:
+      "Control how ref update status is printed. Valid values are `full` and `compact`. Default value is `full`. See section OUTPUT in git-fetch[1] for detail",
+  },
+  {
+    name: "fetch.parallel",
+    description:
+      "Specifies the maximal number of fetch operations to be run in parallel at a time (submodules, or remotes when the `--multiple` option of git-fetch[1] is in effect)",
+  },
+  {
+    name: "fetch.prune",
+    description:
+      "If true, fetch will automatically behave as if the `--prune` option was given on the command line. See also `remote.<name>.prune` and the PRUNING section of git-fetch[1]",
+  },
+  {
+    name: "fetch.pruneTags",
+    description:
+      "If true, fetch will automatically behave as if the `refs/tags/*:refs/tags/*` refspec was provided when pruning, if not set already. This allows for setting both this option and `fetch.prune` to maintain a 1=1 mapping to upstream refs. See also `remote.<name>.pruneTags` and the PRUNING section of git-fetch[1]",
+  },
+  {
+    name: "fetch.recurseSubmodules",
+    description:
+      "This option controls whether `git fetch` (and the underlying fetch in `git pull`) will recursively fetch into populated submodules. This option can be set either to a boolean value or to 'on-demand'. Setting it to a boolean changes the behavior of fetch and pull to recurse unconditionally into submodules when set to true or to not recurse at all when set to false. When set to 'on-demand', fetch and pull will only recurse into a populated submodule when its superproject retrieves a commit that updates the submodule's reference. Defaults to 'on-demand', or to the value of 'submodule.recurse' if set",
+  },
+  {
+    name: "fetch.showForcedUpdates",
+    description:
+      "Set to false to enable `--no-show-forced-updates` in git-fetch[1] and git-pull[1] commands. Defaults to true",
+  },
+  {
+    name: "fetch.unpackLimit",
+    description:
+      "If the number of objects fetched over the Git native transfer is below this limit, then the objects will be unpacked into loose object files. However if the number of received objects equals or exceeds this limit then the received pack will be stored as a pack, after adding any missing delta bases. Storing the pack from a push can make the push operation complete faster, especially on slow filesystems. If not set, the value of `transfer.unpackLimit` is used instead",
+  },
+  {
+    name: "fetch.writeCommitGraph",
+    description:
+      "Set to true to write a commit-graph after every `git fetch` command that downloads a pack-file from a remote. Using the `--split` option, most executions will create a very small commit-graph file on top of the existing commit-graph file(s). Occasionally, these files will merge and the write may take longer. Having an updated commit-graph file helps performance of many Git commands, including `git merge-base`, `git push -f`, and `git log --graph`. Defaults to false",
+  },
+  {
+    name: "filter.<driver>.clean",
+    insertValue: "filter.{cursor}.clean",
+    description:
+      "The command which is used to convert the content of a worktree file to a blob upon checkin. See gitattributes[5] for details",
+  },
+  {
+    name: "filter.<driver>.smudge",
+    insertValue: "filter.{cursor}.smudge",
+    description:
+      "The command which is used to convert the content of a blob object to a worktree file upon checkout. See gitattributes[5] for details",
+  },
+  {
+    name: "format.attach",
+    description:
+      "Enable multipart/mixed attachments as the default for 'format-patch'. The value can also be a double quoted string which will enable attachments as the default and set the value as the boundary. See the --attach option in git-format-patch[1]",
+  },
+  {
+    name: "format.cc",
+    description:
+      "Additional recipients to include in a patch to be submitted by mail. See the --to and --cc options in git-format-patch[1]",
+  },
+  {
+    name: "format.coverFromDescription",
+    description:
+      "The default mode for format-patch to determine which parts of the cover letter will be populated using the branch's description. See the `--cover-from-description` option in git-format-patch[1]",
+  },
+  {
+    name: "format.coverLetter",
+    description:
+      'A boolean that controls whether to generate a cover-letter when format-patch is invoked, but in addition can be set to "auto", to generate a cover-letter only when there\'s more than one patch. Default is false',
+  },
+  {
+    name: "format.encodeEmailHeaders",
+    description:
+      'Encode email headers that have non-ASCII characters with "Q-encoding" (described in RFC 2047) for email transmission. Defaults to true',
+  },
+  {
+    name: "format.filenameMaxLength",
+    description:
+      "The maximum length of the output filenames generated by the `format-patch` command; defaults to 64. Can be overridden by the `--filename-max-length=<n>` command line option",
+  },
+  {
+    name: "format.from",
+    description:
+      'Provides the default value for the `--from` option to format-patch. Accepts a boolean value, or a name and email address. If false, format-patch defaults to `--no-from`, using commit authors directly in the "From:" field of patch mails. If true, format-patch defaults to `--from`, using your committer identity in the "From:" field of patch mails and including a "From:" field in the body of the patch mail if different. If set to a non-boolean value, format-patch uses that value instead of your committer identity. Defaults to false',
+  },
+  {
+    name: "format.headers",
+    description:
+      "Additional email headers to include in a patch to be submitted by mail. See git-format-patch[1]",
+  },
+  {
+    name: "format.notes",
+    description:
+      "Provides the default value for the `--notes` option to format-patch. Accepts a boolean value, or a ref which specifies where to get notes. If false, format-patch defaults to `--no-notes`. If true, format-patch defaults to `--notes`. If set to a non-boolean value, format-patch defaults to `--notes=<ref>`, where `ref` is the non-boolean value. Defaults to false",
+  },
+  {
+    name: "format.numbered",
+    description:
+      'A boolean which can enable or disable sequence numbers in patch subjects. It defaults to "auto" which enables it only if there is more than one patch. It can be enabled or disabled for all messages by setting it to "true" or "false". See --numbered option in git-format-patch[1]',
+  },
+  {
+    name: "format.outputDirectory",
+    description:
+      "Set a custom directory to store the resulting files instead of the current working directory. All directory components will be created",
+  },
+  {
+    name: "format.pretty",
+    description:
+      "The default pretty format for log/show/whatchanged command, See git-log[1], git-show[1], git-whatchanged[1]",
+  },
+  {
+    name: "format.signature",
+    description:
+      'The default for format-patch is to output a signature containing the Git version number. Use this variable to change that default. Set this variable to the empty string ("") to suppress signature generation',
+  },
+  {
+    name: "format.signatureFile",
+    description:
+      "Works just like format.signature except the contents of the file specified by this variable will be used as the signature",
+  },
+  {
+    name: "format.signOff",
+    description:
+      "A boolean value which lets you enable the `-s/--signoff` option of format-patch by default. *Note:* Adding the `Signed-off-by` trailer to a patch should be a conscious act and means that you certify you have the rights to submit this work under the same open source license. Please see the 'SubmittingPatches' document for further discussion",
+  },
+  {
+    name: "format.subjectPrefix",
+    description:
+      "The default for format-patch is to output files with the '[PATCH]' subject prefix. Use this variable to change that prefix",
+  },
+  {
+    name: "format.suffix",
+    description:
+      "The default for format-patch is to output files with the suffix `.patch`. Use this variable to change that suffix (make sure to include the dot if you want it)",
+  },
+  {
+    name: "format.thread",
+    description:
+      "The default threading style for 'git format-patch'. Can be a boolean value, or `shallow` or `deep`. `shallow` threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. `deep` threading makes every mail a reply to the previous one. A true boolean value is the same as `shallow`, and a false value disables threading",
+  },
+  {
+    name: "format.useAutoBase",
+    description:
+      'A boolean value which lets you enable the `--base=auto` option of format-patch by default. Can also be set to "whenAble" to allow enabling `--base=auto` if a suitable base is available, but to skip adding base info otherwise without the format dying',
+  },
+  {
+    name: "fsck.<msg-id>",
+    insertValue: "fsck.{cursor}",
+    description:
+      "During fsck git may find issues with legacy data which wouldn't be generated by current versions of git, and which wouldn't be sent over the wire if `transfer.fsckObjects` was set. This feature is intended to support working with legacy repositories containing such data",
+  },
+  {
+    name: "fsck.skipList",
+    description:
+      "The path to a list of object names (i.e. one unabbreviated SHA-1 per line) that are known to be broken in a non-fatal way and should be ignored. On versions of Git 2.20 and later comments ('#'), empty lines, and any leading and trailing whitespace is ignored. Everything but a SHA-1 per line will error out on older versions",
+  },
+  {
+    name: "gc.<pattern>.reflogExpire",
+    insertValue: "gc.{cursor}.reflogExpire",
+    description:
+      '\'git reflog expire\' removes reflog entries older than this time; defaults to 90 days. The value "now" expires all entries immediately, and "never" suppresses expiration altogether. With "<pattern>" (e.g. "refs/stash") in the middle the setting applies only to the refs that match the <pattern>',
+  },
+  {
+    name: "gc.<pattern>.reflogExpireUnreachable",
+    insertValue: "gc.{cursor}.reflogExpireUnreachable",
+    description:
+      '\'git reflog expire\' removes reflog entries older than this time and are not reachable from the current tip; defaults to 30 days. The value "now" expires all entries immediately, and "never" suppresses expiration altogether. With "<pattern>" (e.g. "refs/stash") in the middle, the setting applies only to the refs that match the <pattern>',
+  },
+  {
+    name: "gc.aggressiveDepth",
+    description:
+      "The depth parameter used in the delta compression algorithm used by 'git gc --aggressive'. This defaults to 50, which is the default for the `--depth` option when `--aggressive` isn't in use",
+  },
+  {
+    name: "gc.aggressiveWindow",
+    description:
+      "The window size parameter used in the delta compression algorithm used by 'git gc --aggressive'. This defaults to 250, which is a much more aggressive window size than the default `--window` of 10",
+  },
+  {
+    name: "gc.auto",
+    description:
+      "When there are approximately more than this many loose objects in the repository, `git gc --auto` will pack them. Some Porcelain commands use this command to perform a light-weight garbage collection from time to time. The default value is 6700",
+  },
+  {
+    name: "gc.autoDetach",
+    description:
+      "Make `git gc --auto` return immediately and run in background if the system supports it. Default is true",
+  },
+  {
+    name: "gc.autoPackLimit",
+    description:
+      "When there are more than this many packs that are not marked with `*.keep` file in the repository, `git gc --auto` consolidates them into one larger pack. The default value is 50. Setting this to 0 disables it. Setting `gc.auto` to 0 will also disable this",
+  },
+  {
+    name: "gc.bigPackThreshold",
+    description:
+      "If non-zero, all packs larger than this limit are kept when `git gc` is run. This is very similar to `--keep-largest-pack` except that all packs that meet the threshold are kept, not just the largest pack. Defaults to zero. Common unit suffixes of 'k', 'm', or 'g' are supported",
+  },
+  {
+    name: "gc.cruftPacks",
+    description:
+      "Store unreachable objects in a cruft pack (see git-repack[1]) instead of as loose objects. The default is `false`",
+  },
+  {
+    name: "gc.logExpiry",
+    description:
+      "If the file gc.log exists, then `git gc --auto` will print its content and exit with status zero instead of running unless that file is more than 'gc.logExpiry' old. Default is \"1.day\". See `gc.pruneExpire` for more ways to specify its value",
+  },
+  {
+    name: "gc.packRefs",
+    description:
+      "Running `git pack-refs` in a repository renders it unclonable by Git versions prior to 1.5.1.2 over dumb transports such as HTTP. This variable determines whether 'git gc' runs `git pack-refs`. This can be set to `notbare` to enable it within all non-bare repos or it can be set to a boolean value. The default is `true`",
+  },
+  {
+    name: "gc.pruneExpire",
+    description:
+      "When 'git gc' is run, it will call 'prune --expire 2.weeks.ago' (and 'repack --cruft --cruft-expiration 2.weeks.ago' if using cruft packs via `gc.cruftPacks` or `--cruft`). Override the grace period with this config variable. The value \"now\" may be used to disable this grace period and always prune unreachable objects immediately, or \"never\" may be used to suppress pruning. This feature helps prevent corruption when 'git gc' runs concurrently with another process writing to the repository; see the \"NOTES\" section of git-gc[1]",
+  },
+  {
+    name: "gc.rerereResolved",
+    description:
+      "Records of conflicted merge you resolved earlier are kept for this many days when 'git rerere gc' is run. You can also use more human-readable \"1.month.ago\", etc. The default is 60 days. See git-rerere[1]",
+  },
+  {
+    name: "gc.rerereUnresolved",
+    description:
+      "Records of conflicted merge you have not resolved are kept for this many days when 'git rerere gc' is run. You can also use more human-readable \"1.month.ago\", etc. The default is 15 days. See git-rerere[1]",
+  },
+  {
+    name: "gc.worktreePruneExpire",
+    description:
+      "When 'git gc' is run, it calls 'git worktree prune --expire 3.months.ago'. This config variable can be used to set a different grace period. The value \"now\" may be used to disable the grace period and prune `$GIT_DIR/worktrees` immediately, or \"never\" may be used to suppress pruning",
+  },
+  {
+    name: "gc.writeCommitGraph",
+    description:
+      "If true, then gc will rewrite the commit-graph file when git-gc[1] is run. When using `git gc --auto` the commit-graph will be updated if housekeeping is required. Default is true. See git-commit-graph[1] for details",
+  },
+  {
+    name: "gitcvs.allBinary",
+    description:
+      "This is used if `gitcvs.usecrlfattr` does not resolve the correct '-kb' mode to use. If true, all unresolved files are sent to the client in mode '-kb'. This causes the client to treat them as binary files, which suppresses any newline munging it otherwise might do. Alternatively, if it is set to \"guess\", then the contents of the file are examined to decide if it is binary, similar to `core.autocrlf`",
+  },
+  {
+    name: "gitcvs.commitMsgAnnotation",
+    description:
+      'Append this string to each commit message. Set to empty string to disable this feature. Defaults to "via git-CVS emulator"',
+  },
+  {
+    name: "gitcvs.dbDriver",
+    description:
+      "Used Perl DBI driver. You can specify any available driver for this here, but it might not work. git-cvsserver is tested with 'DBD::SQLite', reported to work with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Experimental feature. May not contain double colons (`:`). Default: 'SQLite'. See git-cvsserver[1]",
+  },
+  {
+    name: "gitcvs.dbName",
+    description:
+      "Database used by git-cvsserver to cache revision information derived from the Git repository. The exact meaning depends on the used database driver, for SQLite (which is the default driver) this is a filename. Supports variable substitution (see git-cvsserver[1] for details). May not contain semicolons (`;`). Default: '%Ggitcvs.%m.sqlite'",
+  },
+  {
+    name: "gitcvs.dbTableNamePrefix",
+    description:
+      "Database table name prefix. Prepended to the names of any database tables used, allowing a single database to be used for several repositories. Supports variable substitution (see git-cvsserver[1] for details). Any non-alphabetic characters will be replaced with underscores",
+  },
+  {
+    name: "gitcvs.dbUser",
+    description:
+      "Database user and password. Only useful if setting `gitcvs.dbDriver`, since SQLite has no concept of database users and/or passwords. 'gitcvs.dbUser' supports variable substitution (see git-cvsserver[1] for details)",
+  },
+  {
+    name: "gitcvs.enabled",
+    description:
+      "Whether the CVS server interface is enabled for this repository. See git-cvsserver[1]",
+  },
+  {
+    name: "gitcvs.logFile",
+    description:
+      "Path to a log file where the CVS server interface well... logs various stuff. See git-cvsserver[1]",
+  },
+  {
+    name: "gitcvs.usecrlfattr",
+    description:
+      "If true, the server will look up the end-of-line conversion attributes for files to determine the `-k` modes to use. If the attributes force Git to treat a file as text, the `-k` mode will be left blank so CVS clients will treat it as text. If they suppress text conversion, the file will be set with '-kb' mode, which suppresses any newline munging the client might otherwise do. If the attributes do not allow the file type to be determined, then `gitcvs.allBinary` is used. See gitattributes[5]",
+  },
+  {
+    name: "gitweb.snapshot",
+    description: "See gitweb.conf[5] for description",
+  },
+  {
+    name: "gitweb.url",
+    description: "See gitweb[1] for description",
+  },
+  {
+    name: "gpg.<format>.program",
+    insertValue: "gpg.{cursor}.program",
+    description:
+      'Use this to customize the program used for the signing format you chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still be used as a legacy synonym for `gpg.openpgp.program`. The default value for `gpg.x509.program` is "gpgsm" and `gpg.ssh.program` is "ssh-keygen"',
+  },
+  {
+    name: "gpg.format",
+    description:
+      'Specifies which key format to use when signing with `--gpg-sign`. Default is "openpgp". Other possible values are "x509", "ssh"',
+  },
+  {
+    name: "gpg.minTrustLevel",
+    description:
+      "Specifies a minimum trust level for signature verification. If this option is unset, then signature verification for merge operations require a key with at least `marginal` trust. Other operations that perform signature verification require a key with at least `undefined` trust. Setting this option overrides the required trust-level for all operations. Supported values, in increasing order of significance:",
+  },
+  {
+    name: "gpg.program",
+    description:
+      'Use this custom program instead of "`gpg`" found on `$PATH` when making or verifying a PGP signature. The program must support the same command-line interface as GPG, namely, to verify a detached signature, "`gpg --verify $signature - <$file`" is run, and the program is expected to signal a good signature by exiting with code 0, and to generate an ASCII-armored detached signature, the standard input of "`gpg -bsau $key`" is fed with the contents to be signed, and the program is expected to send the result to its standard output',
+  },
+  {
+    name: "gpg.ssh.allowedSignersFile",
+    description:
+      'A file containing ssh public keys which you are willing to trust. The file consists of one or more lines of principals followed by an ssh public key. e.g.: `user1@example.com,user2@example.com ssh-rsa AAAAX1...` See ssh-keygen(1) "ALLOWED SIGNERS" for details. The principal is only used to identify the key and is available when verifying a signature',
+  },
+  {
+    name: "gpg.ssh.defaultKeyCommand",
+    description:
+      "This command that will be run when user.signingkey is not set and a ssh signature is requested. On successful exit a valid ssh public key prefixed with `key::` is expected in the first line of its output. This allows for a script doing a dynamic lookup of the correct public key when it is impractical to statically configure `user.signingKey`. For example when keys or SSH Certificates are rotated frequently or selection of the right key depends on external factors unknown to git",
+  },
+  {
+    name: "gpg.ssh.revocationFile",
+    description:
+      'Either a SSH KRL or a list of revoked public keys (without the principal prefix). See ssh-keygen(1) for details. If a public key is found in this file then it will always be treated as having trust level "never" and signatures will show as invalid',
+  },
+  {
+    name: "grep.column",
+    description: "If set to true, enable the `--column` option by default",
+  },
+  {
+    name: "grep.extendedRegexp",
+    description:
+      "If set to true, enable `--extended-regexp` option by default. This option is ignored when the `grep.patternType` option is set to a value other than 'default'",
+  },
+  {
+    name: "grep.fallbackToNoIndex",
+    description:
+      "If set to true, fall back to git grep --no-index if git grep is executed outside of a git repository. Defaults to false",
+  },
+  {
+    name: "grep.lineNumber",
+    description: "If set to true, enable `-n` option by default",
+  },
+  {
+    name: "grep.patternType",
+    description:
+      "Set the default matching behavior. Using a value of 'basic', 'extended', 'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, `--fixed-strings`, or `--perl-regexp` option accordingly, while the value 'default' will use the `grep.extendedRegexp` option to choose between 'basic' and 'extended'",
+  },
+  {
+    name: "grep.threads",
+    description:
+      "Number of grep worker threads to use. See `grep.threads` in git-grep[1] for more information",
+  },
+  {
+    name: "gui.blamehistoryctx",
+    description:
+      "Specifies the radius of history context in days to show in gitk[1] for the selected commit, when the `Show History Context` menu item is invoked from 'git gui blame'. If this variable is set to zero, the whole history is shown",
+  },
+  {
+    name: "gui.commitMsgWidth",
+    description:
+      'Defines how wide the commit message window is in the git-gui[1]. "75" is the default',
+  },
+  {
+    name: "gui.copyBlameThreshold",
+    description:
+      "Specifies the threshold to use in 'git gui blame' original location detection, measured in alphanumeric characters. See the git-blame[1] manual for more information on copy detection",
+  },
+  {
+    name: "gui.diffContext",
+    description:
+      'Specifies how many context lines should be used in calls to diff made by the git-gui[1]. The default is "5"',
+  },
+  {
+    name: "gui.displayUntracked",
+    description:
+      'Determines if git-gui[1] shows untracked files in the file list. The default is "true"',
+  },
+  {
+    name: "gui.encoding",
+    description:
+      "Specifies the default character encoding to use for displaying of file contents in git-gui[1] and gitk[1]. It can be overridden by setting the 'encoding' attribute for relevant files (see gitattributes[5]). If this option is not set, the tools default to the locale encoding",
+  },
+  {
+    name: "gui.fastCopyBlame",
+    description:
+      "If true, 'git gui blame' uses `-C` instead of `-C -C` for original location detection. It makes blame significantly faster on huge repositories at the expense of less thorough copy detection",
+  },
+  {
+    name: "gui.matchTrackingBranch",
+    description:
+      'Determines if new branches created with git-gui[1] should default to tracking remote branches with matching names or not. Default: "false"',
+  },
+  {
+    name: "gui.newBranchTemplate",
+    description:
+      "Is used as suggested name when creating new branches using the git-gui[1]",
+  },
+  {
+    name: "gui.pruneDuringFetch",
+    description:
+      '"true" if git-gui[1] should prune remote-tracking branches when performing a fetch. The default value is "false"',
+  },
+  {
+    name: "gui.spellingDictionary",
+    description:
+      'Specifies the dictionary used for spell checking commit messages in the git-gui[1]. When set to "none" spell checking is turned off',
+  },
+  {
+    name: "gui.trustmtime",
+    description:
+      "Determines if git-gui[1] should trust the file modification timestamp or not. By default the timestamps are not trusted",
+  },
+  {
+    name: "guitool.<name>.argPrompt",
+    insertValue: "guitool.{cursor}.argPrompt",
+    description:
+      "Request a string argument from the user, and pass it to the tool through the `ARGS` environment variable. Since requesting an argument implies confirmation, the 'confirm' option has no effect if this is enabled. If the option is set to 'true', 'yes', or '1', the dialog uses a built-in generic prompt; otherwise the exact value of the variable is used",
+  },
+  {
+    name: "guitool.<name>.cmd",
+    insertValue: "guitool.{cursor}.cmd",
+    description:
+      "Specifies the shell command line to execute when the corresponding item of the git-gui[1] `Tools` menu is invoked. This option is mandatory for every tool. The command is executed from the root of the working directory, and in the environment it receives the name of the tool as `GIT_GUITOOL`, the name of the currently selected file as 'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if the head is detached, 'CUR_BRANCH' is empty)",
+  },
+  {
+    name: "guitool.<name>.confirm",
+    insertValue: "guitool.{cursor}.confirm",
+    description: "Show a confirmation dialog before actually running the tool",
+  },
+  {
+    name: "guitool.<name>.needsFile",
+    insertValue: "guitool.{cursor}.needsFile",
+    description:
+      "Run the tool only if a diff is selected in the GUI. It guarantees that 'FILENAME' is not empty",
+  },
+  {
+    name: "guitool.<name>.noConsole",
+    insertValue: "guitool.{cursor}.noConsole",
+    description:
+      "Run the command silently, without creating a window to display its output",
+  },
+  {
+    name: "guitool.<name>.noRescan",
+    insertValue: "guitool.{cursor}.noRescan",
+    description:
+      "Don't rescan the working directory for changes after the tool finishes execution",
+  },
+  {
+    name: "guitool.<name>.prompt",
+    insertValue: "guitool.{cursor}.prompt",
+    description:
+      "Specifies the general prompt string to display at the top of the dialog, before subsections for 'argPrompt' and 'revPrompt'. The default value includes the actual command",
+  },
+  {
+    name: "guitool.<name>.revPrompt",
+    insertValue: "guitool.{cursor}.revPrompt",
+    description:
+      "Request a single valid revision from the user, and set the `REVISION` environment variable. In other aspects this option is similar to 'argPrompt', and can be used together with it",
+  },
+  {
+    name: "guitool.<name>.revUnmerged",
+    insertValue: "guitool.{cursor}.revUnmerged",
+    description:
+      "Show only unmerged branches in the 'revPrompt' subdialog. This is useful for tools similar to merge or rebase, but not for things like checkout or reset",
+  },
+  {
+    name: "guitool.<name>.title",
+    insertValue: "guitool.{cursor}.title",
+    description:
+      "Specifies the title to use for the prompt dialog. The default is the tool name",
+  },
+  {
+    name: "help.autoCorrect",
+    description:
+      "If git detects typos and can identify exactly one valid command similar to the error, git will try to suggest the correct command or even run the suggestion automatically. Possible config values are: - 0 (default): show the suggested command. - positive number: run the suggested command after specified",
+  },
+  {
+    name: "help.browser",
+    description:
+      "Specify the browser that will be used to display help in the 'web' format. See git-help[1]",
+  },
+  {
+    name: "help.format",
+    description:
+      "Override the default help format used by git-help[1]. Values 'man', 'info', 'web' and 'html' are supported. 'man' is the default. 'web' and 'html' are the same",
+  },
+  {
+    name: "help.htmlPath",
+    description:
+      "Specify the path where the HTML documentation resides. File system paths and URLs are supported. HTML pages will be prefixed with this path when help is displayed in the 'web' format. This defaults to the documentation path of your Git installation",
+  },
+  {
+    name: "http.cookieFile",
+    description:
+      "The pathname of a file containing previously stored cookie lines, which should be used in the Git http session, if they match the server. The file format of the file to read cookies from should be plain HTTP headers or the Netscape/Mozilla cookie file format (see `curl(1)`). NOTE that the file specified with http.cookieFile is used only as input unless http.saveCookies is set",
+  },
+  {
+    name: "http.curloptResolve",
+    description:
+      "Hostname resolution information that will be used first by libcurl when sending HTTP requests. This information should be in one of the following formats:",
+  },
+  {
+    name: "http.delegation",
+    description:
+      "Control GSSAPI credential delegation. The delegation is disabled by default in libcurl since version 7.21.7. Set parameter to tell the server what it is allowed to delegate when it comes to user credentials. Used with GSS/kerberos. Possible values are:",
+  },
+  {
+    name: "http.emptyAuth",
+    description:
+      "Attempt authentication without seeking a username or password. This can be used to attempt GSS-Negotiate authentication without specifying a username in the URL, as libcurl normally requires a username for authentication",
+  },
+  {
+    name: "http.extraHeader",
+    description:
+      "Pass an additional HTTP header when communicating with a server. If more than one such entry exists, all of them are added as extra headers. To allow overriding the settings inherited from the system config, an empty value will reset the extra headers to the empty list",
+  },
+  {
+    name: "http.followRedirects",
+    description:
+      "Whether git should follow HTTP redirects. If set to `true`, git will transparently follow any redirect issued by a server it encounters. If set to `false`, git will treat all redirects as errors. If set to `initial`, git will follow redirects only for the initial request to a remote, but not for subsequent follow-up HTTP requests. Since git uses the redirected URL as the base for the follow-up requests, this is generally sufficient. The default is `initial`",
+  },
+  {
+    name: "http.lowSpeedLimit",
+    description:
+      "If the HTTP transfer speed is less than 'http.lowSpeedLimit' for longer than 'http.lowSpeedTime' seconds, the transfer is aborted. Can be overridden by the `GIT_HTTP_LOW_SPEED_LIMIT` and `GIT_HTTP_LOW_SPEED_TIME` environment variables",
+  },
+  {
+    name: "http.maxRequests",
+    description:
+      "How many HTTP requests to launch in parallel. Can be overridden by the `GIT_HTTP_MAX_REQUESTS` environment variable. Default is 5",
+  },
+  {
+    name: "http.minSessions",
+    description:
+      "The number of curl sessions (counted across slots) to be kept across requests. They will not be ended with curl_easy_cleanup() until http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this value will be capped at 1. Defaults to 1",
+  },
+  {
+    name: "http.noEPSV",
+    description:
+      'A boolean which disables using of EPSV ftp command by curl. This can helpful with some "poor" ftp servers which don\'t support EPSV mode. Can be overridden by the `GIT_CURL_FTP_NO_EPSV` environment variable. Default is false (curl will use EPSV)',
+  },
+  {
+    name: "http.pinnedPubkey",
+    description:
+      "Public key of the https service. It may either be the filename of a PEM or DER encoded public key file or a string starting with 'sha256//' followed by the base64 encoded sha256 hash of the public key. See also libcurl 'CURLOPT_PINNEDPUBLICKEY'. git will exit with an error if this option is set but not supported by cURL",
+  },
+  {
+    name: "http.postBuffer",
+    description:
+      "Maximum size in bytes of the buffer used by smart HTTP transports when POSTing data to the remote system. For requests larger than this buffer size, HTTP/1.1 and Transfer-Encoding: chunked is used to avoid creating a massive pack file locally. Default is 1 MiB, which is sufficient for most requests",
+  },
+  {
+    name: "http.proxy",
+    description:
+      "Override the HTTP proxy, normally configured using the 'http_proxy', 'https_proxy', and 'all_proxy' environment variables (see `curl(1)`). In addition to the syntax understood by curl, it is possible to specify a proxy string with a user name but no password, in which case git will attempt to acquire one in the same way it does for other credentials. See gitcredentials[7] for more information. The syntax thus is '[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden on a per-remote basis; see remote.<name>.proxy",
+  },
+  {
+    name: "http.proxyAuthMethod",
+    description:
+      "Set the method with which to authenticate against the HTTP proxy. This only takes effect if the configured proxy string contains a user name part (i.e. is of the form 'user@host' or 'user@host:port'). This can be overridden on a per-remote basis; see `remote.<name>.proxyAuthMethod`. Both can be overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment variable. Possible values are:",
+  },
+  {
+    name: "http.proxySSLCAInfo",
+    description:
+      "Pathname to the file containing the certificate bundle that should be used to verify the proxy with when using an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CAINFO` environment variable",
+  },
+  {
+    name: "http.proxySSLCert",
+    description:
+      "The pathname of a file that stores a client certificate to use to authenticate with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CERT` environment variable",
+  },
+  {
+    name: "http.proxySSLCertPasswordProtected",
+    description:
+      "Enable Git's password prompt for the proxy SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED` environment variable",
+  },
+  {
+    name: "http.proxySSLKey",
+    description:
+      "The pathname of a file that stores a private key to use to authenticate with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_KEY` environment variable",
+  },
+  {
+    name: "http.saveCookies",
+    description:
+      "If set, store cookies received during requests to the file specified by http.cookieFile. Has no effect if http.cookieFile is unset",
+  },
+  {
+    name: "http.schannelCheckRevoke",
+    description:
+      'Used to enforce or disable certificate revocation checks in cURL when http.sslBackend is set to "schannel". Defaults to `true` if unset. Only necessary to disable this if Git consistently errors and the message is about checking the revocation status of a certificate. This option is ignored if cURL lacks support for setting the relevant SSL option at runtime',
+  },
+  {
+    name: "http.schannelUseSSLCAInfo",
+    description:
+      "As of cURL v7.60.0, the Secure Channel backend can use the certificate bundle provided via `http.sslCAInfo`, but that would override the Windows Certificate Store. Since this is not desirable by default, Git will tell cURL not to use that bundle by default when the `schannel` backend was configured via `http.sslBackend`, unless `http.schannelUseSSLCAInfo` overrides this behavior",
+  },
+  {
+    name: "http.sslBackend",
+    description:
+      'Name of the SSL backend to use (e.g. "openssl" or "schannel"). This option is ignored if cURL lacks support for choosing the SSL backend at runtime',
+  },
+  {
+    name: "http.sslCAInfo",
+    description:
+      "File containing the certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAINFO` environment variable",
+  },
+  {
+    name: "http.sslCAPath",
+    description:
+      "Path containing files with the CA certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAPATH` environment variable",
+  },
+  {
+    name: "http.sslCert",
+    description:
+      "File containing the SSL certificate when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CERT` environment variable",
+  },
+  {
+    name: "http.sslCertPasswordProtected",
+    description:
+      "Enable Git's password prompt for the SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the `GIT_SSL_CERT_PASSWORD_PROTECTED` environment variable",
+  },
+  {
+    name: "http.sslKey",
+    description:
+      "File containing the SSL private key when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_KEY` environment variable",
+  },
+  {
+    name: "http.sslTry",
+    description:
+      "Attempt to use AUTH SSL/TLS and encrypted data transfers when connecting via regular FTP protocol. This might be needed if the FTP server requires it for security reasons or you wish to connect securely whenever remote FTP server supports it. Default is false since it might trigger certificate verification errors on misconfigured servers",
+  },
+  {
+    name: "http.sslVerify",
+    description:
+      "Whether to verify the SSL certificate when fetching or pushing over HTTPS. Defaults to true. Can be overridden by the `GIT_SSL_NO_VERIFY` environment variable",
+  },
+  {
+    name: "http.sslVersion",
+    description:
+      "The SSL version to use when negotiating an SSL connection, if you want to force the default. The available and default version depend on whether libcurl was built against NSS or OpenSSL and the particular configuration of the crypto library in use. Internally this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl documentation for more details on the format of this option and for the ssl version supported. Currently the possible values of this option are:",
+  },
+  {
+    name: "http.userAgent",
+    description:
+      "The HTTP USER_AGENT string presented to an HTTP server. The default value represents the version of the client Git such as git/1.7.1. This option allows you to override this value to a more common value such as Mozilla/4.0. This may be necessary, for instance, if connecting through a firewall that restricts HTTP connections to a set of common USER_AGENT strings (but not including those like git/1.7.1). Can be overridden by the `GIT_HTTP_USER_AGENT` environment variable",
+  },
+  {
+    name: "http.version",
+    description:
+      "Use the specified HTTP protocol version when communicating with a server. If you want to force the default. The available and default version depend on libcurl. Currently the possible values of this option are:",
+  },
+  {
+    name: "http.<url>.cookieFile",
+    insertValue: "http.{cursor}.cookieFile",
+    description:
+      "The pathname of a file containing previously stored cookie lines, which should be used in the Git http session, if they match the server. The file format of the file to read cookies from should be plain HTTP headers or the Netscape/Mozilla cookie file format (see `curl(1)`). NOTE that the file specified with http.cookieFile is used only as input unless http.saveCookies is set",
+  },
+  {
+    name: "http.<url>.curloptResolve",
+    insertValue: "http.{cursor}.curloptResolve",
+    description:
+      "Hostname resolution information that will be used first by libcurl when sending HTTP requests. This information should be in one of the following formats:",
+  },
+  {
+    name: "http.<url>.delegation",
+    insertValue: "http.{cursor}.delegation",
+    description:
+      "Control GSSAPI credential delegation. The delegation is disabled by default in libcurl since version 7.21.7. Set parameter to tell the server what it is allowed to delegate when it comes to user credentials. Used with GSS/kerberos. Possible values are:",
+  },
+  {
+    name: "http.<url>.emptyAuth",
+    insertValue: "http.{cursor}.emptyAuth",
+    description:
+      "Attempt authentication without seeking a username or password. This can be used to attempt GSS-Negotiate authentication without specifying a username in the URL, as libcurl normally requires a username for authentication",
+  },
+  {
+    name: "http.<url>.extraHeader",
+    insertValue: "http.{cursor}.extraHeader",
+    description:
+      "Pass an additional HTTP header when communicating with a server. If more than one such entry exists, all of them are added as extra headers. To allow overriding the settings inherited from the system config, an empty value will reset the extra headers to the empty list",
+  },
+  {
+    name: "http.<url>.followRedirects",
+    insertValue: "http.{cursor}.followRedirects",
+    description:
+      "Whether git should follow HTTP redirects. If set to `true`, git will transparently follow any redirect issued by a server it encounters. If set to `false`, git will treat all redirects as errors. If set to `initial`, git will follow redirects only for the initial request to a remote, but not for subsequent follow-up HTTP requests. Since git uses the redirected URL as the base for the follow-up requests, this is generally sufficient. The default is `initial`",
+  },
+  {
+    name: "http.<url>.lowSpeedLimit",
+    insertValue: "http.{cursor}.lowSpeedLimit",
+    description:
+      "If the HTTP transfer speed is less than 'http.lowSpeedLimit' for longer than 'http.lowSpeedTime' seconds, the transfer is aborted. Can be overridden by the `GIT_HTTP_LOW_SPEED_LIMIT` and `GIT_HTTP_LOW_SPEED_TIME` environment variables",
+  },
+  {
+    name: "http.<url>.maxRequests",
+    insertValue: "http.{cursor}.maxRequests",
+    description:
+      "How many HTTP requests to launch in parallel. Can be overridden by the `GIT_HTTP_MAX_REQUESTS` environment variable. Default is 5",
+  },
+  {
+    name: "http.<url>.minSessions",
+    insertValue: "http.{cursor}.minSessions",
+    description:
+      "The number of curl sessions (counted across slots) to be kept across requests. They will not be ended with curl_easy_cleanup() until http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this value will be capped at 1. Defaults to 1",
+  },
+  {
+    name: "http.<url>.noEPSV",
+    insertValue: "http.{cursor}.noEPSV",
+    description:
+      'A boolean which disables using of EPSV ftp command by curl. This can helpful with some "poor" ftp servers which don\'t support EPSV mode. Can be overridden by the `GIT_CURL_FTP_NO_EPSV` environment variable. Default is false (curl will use EPSV)',
+  },
+  {
+    name: "http.<url>.pinnedPubkey",
+    insertValue: "http.{cursor}.pinnedPubkey",
+    description:
+      "Public key of the https service. It may either be the filename of a PEM or DER encoded public key file or a string starting with 'sha256//' followed by the base64 encoded sha256 hash of the public key. See also libcurl 'CURLOPT_PINNEDPUBLICKEY'. git will exit with an error if this option is set but not supported by cURL",
+  },
+  {
+    name: "http.<url>.postBuffer",
+    insertValue: "http.{cursor}.postBuffer",
+    description:
+      "Maximum size in bytes of the buffer used by smart HTTP transports when POSTing data to the remote system. For requests larger than this buffer size, HTTP/1.1 and Transfer-Encoding: chunked is used to avoid creating a massive pack file locally. Default is 1 MiB, which is sufficient for most requests",
+  },
+  {
+    name: "http.<url>.proxy",
+    insertValue: "http.{cursor}.proxy",
+    description:
+      "Override the HTTP proxy, normally configured using the 'http_proxy', 'https_proxy', and 'all_proxy' environment variables (see `curl(1)`). In addition to the syntax understood by curl, it is possible to specify a proxy string with a user name but no password, in which case git will attempt to acquire one in the same way it does for other credentials. See gitcredentials[7] for more information. The syntax thus is '[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden on a per-remote basis; see remote.<name>.proxy",
+  },
+  {
+    name: "http.<url>.proxyAuthMethod",
+    insertValue: "http.{cursor}.proxyAuthMethod",
+    description:
+      "Set the method with which to authenticate against the HTTP proxy. This only takes effect if the configured proxy string contains a user name part (i.e. is of the form 'user@host' or 'user@host:port'). This can be overridden on a per-remote basis; see `remote.<name>.proxyAuthMethod`. Both can be overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment variable. Possible values are:",
+  },
+  {
+    name: "http.<url>.proxySSLCAInfo",
+    insertValue: "http.{cursor}.proxySSLCAInfo",
+    description:
+      "Pathname to the file containing the certificate bundle that should be used to verify the proxy with when using an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CAINFO` environment variable",
+  },
+  {
+    name: "http.<url>.proxySSLCert",
+    insertValue: "http.{cursor}.proxySSLCert",
+    description:
+      "The pathname of a file that stores a client certificate to use to authenticate with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CERT` environment variable",
+  },
+  {
+    name: "http.<url>.proxySSLCertPasswordProtected",
+    insertValue: "http.{cursor}.proxySSLCertPasswordProtected",
+    description:
+      "Enable Git's password prompt for the proxy SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED` environment variable",
+  },
+  {
+    name: "http.<url>.proxySSLKey",
+    insertValue: "http.{cursor}.proxySSLKey",
+    description:
+      "The pathname of a file that stores a private key to use to authenticate with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_KEY` environment variable",
+  },
+  {
+    name: "http.<url>.saveCookies",
+    insertValue: "http.{cursor}.saveCookies",
+    description:
+      "If set, store cookies received during requests to the file specified by http.cookieFile. Has no effect if http.cookieFile is unset",
+  },
+  {
+    name: "http.<url>.schannelCheckRevoke",
+    insertValue: "http.{cursor}.schannelCheckRevoke",
+    description:
+      'Used to enforce or disable certificate revocation checks in cURL when http.sslBackend is set to "schannel". Defaults to `true` if unset. Only necessary to disable this if Git consistently errors and the message is about checking the revocation status of a certificate. This option is ignored if cURL lacks support for setting the relevant SSL option at runtime',
+  },
+  {
+    name: "http.<url>.schannelUseSSLCAInfo",
+    insertValue: "http.{cursor}.schannelUseSSLCAInfo",
+    description:
+      "As of cURL v7.60.0, the Secure Channel backend can use the certificate bundle provided via `http.sslCAInfo`, but that would override the Windows Certificate Store. Since this is not desirable by default, Git will tell cURL not to use that bundle by default when the `schannel` backend was configured via `http.sslBackend`, unless `http.schannelUseSSLCAInfo` overrides this behavior",
+  },
+  {
+    name: "http.<url>.sslBackend",
+    insertValue: "http.{cursor}.sslBackend",
+    description:
+      'Name of the SSL backend to use (e.g. "openssl" or "schannel"). This option is ignored if cURL lacks support for choosing the SSL backend at runtime',
+  },
+  {
+    name: "http.<url>.sslCAInfo",
+    insertValue: "http.{cursor}.sslCAInfo",
+    description:
+      "File containing the certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAINFO` environment variable",
+  },
+  {
+    name: "http.<url>.sslCAPath",
+    insertValue: "http.{cursor}.sslCAPath",
+    description:
+      "Path containing files with the CA certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAPATH` environment variable",
+  },
+  {
+    name: "http.<url>.sslCert",
+    insertValue: "http.{cursor}.sslCert",
+    description:
+      "File containing the SSL certificate when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CERT` environment variable",
+  },
+  {
+    name: "http.<url>.sslCertPasswordProtected",
+    insertValue: "http.{cursor}.sslCertPasswordProtected",
+    description:
+      "Enable Git's password prompt for the SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the `GIT_SSL_CERT_PASSWORD_PROTECTED` environment variable",
+  },
+  {
+    name: "http.<url>.sslKey",
+    insertValue: "http.{cursor}.sslKey",
+    description:
+      "File containing the SSL private key when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_KEY` environment variable",
+  },
+  {
+    name: "http.<url>.sslTry",
+    insertValue: "http.{cursor}.sslTry",
+    description:
+      "Attempt to use AUTH SSL/TLS and encrypted data transfers when connecting via regular FTP protocol. This might be needed if the FTP server requires it for security reasons or you wish to connect securely whenever remote FTP server supports it. Default is false since it might trigger certificate verification errors on misconfigured servers",
+  },
+  {
+    name: "http.<url>.sslVerify",
+    insertValue: "http.{cursor}.sslVerify",
+    description:
+      "Whether to verify the SSL certificate when fetching or pushing over HTTPS. Defaults to true. Can be overridden by the `GIT_SSL_NO_VERIFY` environment variable",
+  },
+  {
+    name: "http.<url>.sslVersion",
+    insertValue: "http.{cursor}.sslVersion",
+    description:
+      "The SSL version to use when negotiating an SSL connection, if you want to force the default. The available and default version depend on whether libcurl was built against NSS or OpenSSL and the particular configuration of the crypto library in use. Internally this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl documentation for more details on the format of this option and for the ssl version supported. Currently the possible values of this option are:",
+  },
+  {
+    name: "http.<url>.userAgent",
+    insertValue: "http.{cursor}.userAgent",
+    description:
+      "The HTTP USER_AGENT string presented to an HTTP server. The default value represents the version of the client Git such as git/1.7.1. This option allows you to override this value to a more common value such as Mozilla/4.0. This may be necessary, for instance, if connecting through a firewall that restricts HTTP connections to a set of common USER_AGENT strings (but not including those like git/1.7.1). Can be overridden by the `GIT_HTTP_USER_AGENT` environment variable",
+  },
+  {
+    name: "http.<url>.version",
+    insertValue: "http.{cursor}.version",
+    description:
+      "Use the specified HTTP protocol version when communicating with a server. If you want to force the default. The available and default version depend on libcurl. Currently the possible values of this option are:",
+  },
+  {
+    name: "i18n.commitEncoding",
+    description:
+      "Character encoding the commit messages are stored in; Git itself does not care per se, but this information is necessary e.g. when importing commits from emails or in the gitk graphical history browser (and possibly at other places in the future or in other porcelains). See e.g. git-mailinfo[1]. Defaults to 'utf-8'",
+  },
+  {
+    name: "i18n.logOutputEncoding",
+    description:
+      "Character encoding the commit messages are converted to when running 'git log' and friends",
+  },
+  {
+    name: "imap.authMethod",
+    description:
+      "Specify authenticate method for authentication with IMAP server. If Git was built with the NO_CURL option, or if your curl version is older than 7.34.0, or if you're running git-imap-send with the `--no-curl` option, the only supported method is 'CRAM-MD5'. If this is not set then 'git imap-send' uses the basic IMAP plaintext LOGIN command",
+  },
+  {
+    name: "imap.folder",
+    description:
+      'The folder to drop the mails into, which is typically the Drafts folder. For example: "INBOX.Drafts", "INBOX/Drafts" or "[Gmail]/Drafts". Required',
+  },
+  {
+    name: "imap.host",
+    description:
+      "A URL identifying the server. Use an `imap://` prefix for non-secure connections and an `imaps://` prefix for secure connections. Ignored when imap.tunnel is set, but required otherwise",
+  },
+  {
+    name: "imap.pass",
+    description: "The password to use when logging in to the server",
+  },
+  {
+    name: "imap.port",
+    description:
+      "An integer port number to connect to on the server. Defaults to 143 for imap:// hosts and 993 for imaps:// hosts. Ignored when imap.tunnel is set",
+  },
+  {
+    name: "imap.preformattedHTML",
+    description:
+      "A boolean to enable/disable the use of html encoding when sending a patch. An html encoded patch will be bracketed with <pre> and have a content type of text/html. Ironically, enabling this option causes Thunderbird to send the patch as a plain/text, format=fixed email. Default is `false`",
+  },
+  {
+    name: "imap.sslverify",
+    description:
+      "A boolean to enable/disable verification of the server certificate used by the SSL/TLS connection. Default is `true`. Ignored when imap.tunnel is set",
+  },
+  {
+    name: "imap.tunnel",
+    description:
+      "Command used to setup a tunnel to the IMAP server through which commands will be piped instead of using a direct network connection to the server. Required when imap.host is not set",
+  },
+  {
+    name: "imap.user",
+    description: "The username to use when logging in to the server",
+  },
+  {
+    name: "includeIf.<condition>.path",
+    insertValue: "includeIf.{cursor}.path",
+    description:
+      'Special variables to include other configuration files. See the "CONFIGURATION FILE" section in the main git-config[1] documentation, specifically the "Includes" and "Conditional Includes" subsections',
+  },
+  {
+    name: "index.recordEndOfIndexEntries",
+    description:
+      "Specifies whether the index file should include an \"End Of Index Entry\" section. This reduces index load time on multiprocessor machines but produces a message \"ignoring EOIE extension\" when reading the index using Git versions before 2.20. Defaults to 'true' if index.threads has been explicitly enabled, 'false' otherwise",
+  },
+  {
+    name: "index.recordOffsetTable",
+    description:
+      "Specifies whether the index file should include an \"Index Entry Offset Table\" section. This reduces index load time on multiprocessor machines but produces a message \"ignoring IEOT extension\" when reading the index using Git versions before 2.20. Defaults to 'true' if index.threads has been explicitly enabled, 'false' otherwise",
+  },
+  {
+    name: "index.sparse",
+    description:
+      "When enabled, write the index using sparse-directory entries. This has no effect unless `core.sparseCheckout` and `core.sparseCheckoutCone` are both enabled. Defaults to 'false'",
+  },
+  {
+    name: "index.threads",
+    description:
+      "Specifies the number of threads to spawn when loading the index. This is meant to reduce index load time on multiprocessor machines. Specifying 0 or 'true' will cause Git to auto-detect the number of CPU's and set the number of threads accordingly. Specifying 1 or 'false' will disable multithreading. Defaults to 'true'",
+  },
+  {
+    name: "index.version",
+    description:
+      "Specify the version with which new index files should be initialized. This does not affect existing repositories. If `feature.manyFiles` is enabled, then the default is 4",
+  },
+  {
+    name: "init.defaultBranch",
+    description:
+      "Allows overriding the default branch name e.g. when initializing a new repository",
+  },
+  {
+    name: "init.templateDir",
+    description:
+      'Specify the directory from which templates will be copied. (See the "TEMPLATE DIRECTORY" section of git-init[1].)',
+  },
+  {
+    name: "instaweb.browser",
+    description:
+      "Specify the program that will be used to browse your working repository in gitweb. See git-instaweb[1]",
+  },
+  {
+    name: "instaweb.httpd",
+    description:
+      "The HTTP daemon command-line to start gitweb on your working repository. See git-instaweb[1]",
+  },
+  {
+    name: "instaweb.local",
+    description:
+      "If true the web server started by git-instaweb[1] will be bound to the local IP (127.0.0.1)",
+  },
+  {
+    name: "instaweb.modulePath",
+    description:
+      "The default module path for git-instaweb[1] to use instead of /usr/lib/apache2/modules. Only used if httpd is Apache",
+  },
+  {
+    name: "instaweb.port",
+    description:
+      "The port number to bind the gitweb httpd to. See git-instaweb[1]",
+  },
+  {
+    name: "interactive.diffFilter",
+    description:
+      "When an interactive command (such as `git add --patch`) shows a colorized diff, git will pipe the diff through the shell command defined by this configuration variable. The command may mark up the diff further for human consumption, provided that it retains a one-to-one correspondence with the lines in the original diff. Defaults to disabled (no filtering)",
+  },
+  {
+    name: "interactive.singleKey",
+    description:
+      "In interactive commands, allow the user to provide one-letter input with a single key (i.e., without hitting enter). Currently this is used by the `--patch` mode of git-add[1], git-checkout[1], git-restore[1], git-commit[1], git-reset[1], and git-stash[1]. Note that this setting is silently ignored if portable keystroke input is not available; requires the Perl module Term::ReadKey",
+  },
+  {
+    name: "log.abbrevCommit",
+    description:
+      "If true, makes git-log[1], git-show[1], and git-whatchanged[1] assume `--abbrev-commit`. You may override this option with `--no-abbrev-commit`",
+  },
+  {
+    name: "log.date",
+    description:
+      "Set the default date-time mode for the 'log' command. Setting a value for log.date is similar to using 'git log''s `--date` option. See git-log[1] for details",
+  },
+  {
+    name: "log.decorate",
+    description:
+      "Print out the ref names of any commits that are shown by the log command. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. This is the same as the `--decorate` option of the `git log`",
+  },
+  {
+    name: "log.diffMerges",
+    description:
+      "Set default diff format to be used for merge commits. See `--diff-merges` in git-log[1] for details. Defaults to `separate`",
+  },
+  {
+    name: "log.excludeDecoration",
+    description:
+      "Exclude the specified patterns from the log decorations. This is similar to the `--decorate-refs-exclude` command-line option, but the config option can be overridden by the `--decorate-refs` option",
+  },
+  {
+    name: "log.follow",
+    description:
+      "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given. This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history",
+  },
+  {
+    name: "log.graphColors",
+    description:
+      "A list of colors, separated by commas, that can be used to draw history lines in `git log --graph`",
+  },
+  {
+    name: "log.initialDecorationSet",
+    description:
+      "By default, `git log` only shows decorations for certain known ref namespaces. If 'all' is specified, then show all refs as decorations",
+  },
+  {
+    name: "log.mailmap",
+    description:
+      "If true, makes git-log[1], git-show[1], and git-whatchanged[1] assume `--use-mailmap`, otherwise assume `--no-use-mailmap`. True by default",
+  },
+  {
+    name: "log.showRoot",
+    description:
+      "If true, the initial commit will be shown as a big creation event. This is equivalent to a diff against an empty tree. Tools like git-log[1] or git-whatchanged[1], which normally hide the root commit will now show it. True by default",
+  },
+  {
+    name: "log.showSignature",
+    description:
+      "If true, makes git-log[1], git-show[1], and git-whatchanged[1] assume `--show-signature`",
+  },
+  {
+    name: "lsrefs.unborn",
+    description:
+      'May be "advertise" (the default), "allow", or "ignore". If "advertise", the server will respond to the client sending "unborn" (as described in gitprotocol-v2[5]) and will advertise support for this feature during the protocol v2 capability advertisement. "allow" is the same as "advertise" except that the server will not advertise support for this feature; this is useful for load-balanced servers that cannot be updated atomically (for example), since the administrator could configure "allow", then after a delay, configure "advertise"',
+  },
+  {
+    name: "mailinfo.scissors",
+    description:
+      'If true, makes git-mailinfo[1] (and therefore git-am[1]) act by default as if the --scissors option was provided on the command-line. When active, this features removes everything from the message body before a scissors line (i.e. consisting mainly of ">8", "8<" and "-")',
+  },
+  {
+    name: "mailmap.blob",
+    description:
+      "Like `mailmap.file`, but consider the value as a reference to a blob in the repository. If both `mailmap.file` and `mailmap.blob` are given, both are parsed, with entries from `mailmap.file` taking precedence. In a bare repository, this defaults to `HEAD:.mailmap`. In a non-bare repository, it defaults to empty",
+  },
+  {
+    name: "mailmap.file",
+    description:
+      "The location of an augmenting mailmap file. The default mailmap, located in the root of the repository, is loaded first, then the mailmap file pointed to by this variable. The location of the mailmap file may be in a repository subdirectory, or somewhere outside of the repository itself. See git-shortlog[1] and git-blame[1]",
+  },
+  {
+    name: "maintenance.<task>.enabled",
+    insertValue: "maintenance.{cursor}.enabled",
+    description:
+      "This boolean config option controls whether the maintenance task with name `<task>` is run when no `--task` option is specified to `git maintenance run`. These config values are ignored if a `--task` option exists. By default, only `maintenance.gc.enabled` is true",
+  },
+  {
+    name: "maintenance.<task>.schedule",
+    insertValue: "maintenance.{cursor}.schedule",
+    description:
+      'This config option controls whether or not the given `<task>` runs during a `git maintenance run --schedule=<frequency>` command. The value must be one of "hourly", "daily", or "weekly"',
+  },
+  {
+    name: "maintenance.auto",
+    description:
+      "This boolean config option controls whether some commands run `git maintenance run --auto` after doing their normal work. Defaults to true",
+  },
+  {
+    name: "maintenance.commit-graph.auto",
+    description:
+      "This integer config option controls how often the `commit-graph` task should be run as part of `git maintenance run --auto`. If zero, then the `commit-graph` task will not run with the `--auto` option. A negative value will force the task to run every time. Otherwise, a positive value implies the command should run when the number of reachable commits that are not in the commit-graph file is at least the value of `maintenance.commit-graph.auto`. The default value is 100",
+  },
+  {
+    name: "maintenance.incremental-repack.auto",
+    description:
+      "This integer config option controls how often the `incremental-repack` task should be run as part of `git maintenance run --auto`. If zero, then the `incremental-repack` task will not run with the `--auto` option. A negative value will force the task to run every time. Otherwise, a positive value implies the command should run when the number of pack-files not in the multi-pack-index is at least the value of `maintenance.incremental-repack.auto`. The default value is 10",
+  },
+  {
+    name: "maintenance.loose-objects.auto",
+    description:
+      "This integer config option controls how often the `loose-objects` task should be run as part of `git maintenance run --auto`. If zero, then the `loose-objects` task will not run with the `--auto` option. A negative value will force the task to run every time. Otherwise, a positive value implies the command should run when the number of loose objects is at least the value of `maintenance.loose-objects.auto`. The default value is 100",
+  },
+  {
+    name: "maintenance.strategy",
+    description:
+      "This string config option provides a way to specify one of a few recommended schedules for background maintenance. This only affects which tasks are run during `git maintenance run --schedule=X` commands, provided no `--task=<task>` arguments are provided. Further, if a `maintenance.<task>.schedule` config value is set, then that value is used instead of the one provided by `maintenance.strategy`. The possible strategy strings are:",
+  },
+  {
+    name: "man.<tool>.cmd",
+    insertValue: "man.{cursor}.cmd",
+    description:
+      "Specify the command to invoke the specified man viewer. The specified command is evaluated in shell with the man page passed as argument. (See git-help[1].)",
+  },
+  {
+    name: "man.<tool>.path",
+    insertValue: "man.{cursor}.path",
+    description:
+      "Override the path for the given tool that may be used to display help in the 'man' format. See git-help[1]",
+  },
+  {
+    name: "man.viewer",
+    description:
+      "Specify the programs that may be used to display help in the 'man' format. See git-help[1]",
+  },
+  {
+    name: "merge.<driver>.driver",
+    insertValue: "merge.{cursor}.driver",
+    description:
+      "Defines the command that implements a custom low-level merge driver. See gitattributes[5] for details",
+  },
+  {
+    name: "merge.<driver>.name",
+    insertValue: "merge.{cursor}.name",
+    description:
+      "Defines a human-readable name for a custom low-level merge driver. See gitattributes[5] for details",
+  },
+  {
+    name: "merge.<driver>.recursive",
+    insertValue: "merge.{cursor}.recursive",
+    description:
+      "Names a low-level merge driver to be used when performing an internal merge between common ancestors. See gitattributes[5] for details",
+  },
+  {
+    name: "merge.autoStash",
+    description:
+      "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run merge on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts. This option can be overridden by the `--no-autostash` and `--autostash` options of git-merge[1]. Defaults to false",
+  },
+  {
+    name: "merge.branchdesc",
+    description:
+      "In addition to branch names, populate the log message with the branch description text associated with them. Defaults to false",
+  },
+  {
+    name: "merge.conflictStyle",
+    description:
+      'Specify the style in which conflicted hunks are written out to working tree files upon merge. The default is "merge", which shows a `<<<<<<<` conflict marker, changes made by one side, a `=======` marker, changes made by the other side, and then a `>>>>>>>` marker. An alternate style, "diff3", adds a `|||||||` marker and the original text before the `=======` marker. The "merge" style tends to produce smaller conflict regions than diff3, both because of the exclusion of the original text, and because when a subset of lines match on the two sides they are just pulled out of the conflict region. Another alternate style, "zdiff3", is similar to diff3 but removes matching lines on the two sides from the conflict region when those matching lines appear near either the beginning or end of a conflict region',
+  },
+  {
+    name: "merge.defaultToUpstream",
+    description:
+      "If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last observed values stored in their remote-tracking branches. The values of the `branch.<current branch>.merge` that name the branches at the remote named by `branch.<current branch>.remote` are consulted, and then they are mapped via `remote.<remote>.fetch` to their corresponding remote-tracking branches, and the tips of these tracking branches are merged. Defaults to true",
+  },
+  {
+    name: "merge.directoryRenames",
+    description:
+      'Whether Git detects directory renames, affecting what happens at merge time to new files added to a directory on one side of history when that directory was renamed on the other side of history. If merge.directoryRenames is set to "false", directory rename detection is disabled, meaning that such new files will be left behind in the old directory. If set to "true", directory rename detection is enabled, meaning that such new files will be moved into the new directory. If set to "conflict", a conflict will be reported for such paths. If merge.renames is false, merge.directoryRenames is ignored and treated as false. Defaults to "conflict"',
+  },
+  {
+    name: "merge.ff",
+    description:
+      "By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to `false`, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the `--no-ff` option from the command line). When set to `only`, only such fast-forward merges are allowed (equivalent to giving the `--ff-only` option from the command line)",
+  },
+  {
+    name: "merge.guitool",
+    description:
+      "Controls which merge tool is used by git-mergetool[1] when the -g/--gui flag is specified. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<guitool>.cmd variable is defined",
+  },
+  {
+    name: "merge.log",
+    description:
+      "In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20",
+  },
+  {
+    name: "merge.renameLimit",
+    description:
+      "The number of files to consider in the exhaustive portion of rename detection during a merge. If not specified, defaults to the value of diff.renameLimit. If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000. This setting has no effect if rename detection is turned off",
+  },
+  {
+    name: "merge.renames",
+    description:
+      'Whether Git detects renames. If set to "false", rename detection is disabled. If set to "true", basic rename detection is enabled. Defaults to the value of diff.renames',
+  },
+  {
+    name: "merge.renormalize",
+    description:
+      'Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line endings). In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section "Merging branches with differing checkin/checkout attributes" in gitattributes[5]',
+  },
+  {
+    name: "merge.stat",
+    description:
+      "Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default",
+  },
+  {
+    name: "merge.suppressDest",
+    description:
+      'By adding a glob that matches the names of integration branches to this multi-valued configuration variable, the default merge message computed for merges into these integration branches will omit "into <branch name>" from its title',
+  },
+  {
+    name: "merge.tool",
+    description:
+      "Controls which merge tool is used by git-mergetool[1]. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<tool>.cmd variable is defined",
+  },
+  {
+    name: "merge.verbosity",
+    description:
+      "Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable",
+  },
+  {
+    name: "merge.verifySignatures",
+    description:
+      "If true, this is equivalent to the --verify-signatures command line option. See git-merge[1] for details",
+  },
+  {
+    name: "mergetool.<tool>.cmd",
+    insertValue: "mergetool.{cursor}.cmd",
+    description:
+      "Specify the command to invoke the specified merge tool. The specified command is evaluated in shell with the following variables available: 'BASE' is the name of a temporary file containing the common base of the files to be merged, if available; 'LOCAL' is the name of a temporary file containing the contents of the file on the current branch; 'REMOTE' is the name of a temporary file containing the contents of the file from the branch being merged; 'MERGED' contains the name of the file to which the merge tool should write the results of a successful merge",
+  },
+  {
+    name: "mergetool.<tool>.hideResolved",
+    insertValue: "mergetool.{cursor}.hideResolved",
+    description:
+      "Allows the user to override the global `mergetool.hideResolved` value for a specific tool. See `mergetool.hideResolved` for the full description",
+  },
+  {
+    name: "mergetool.<tool>.path",
+    insertValue: "mergetool.{cursor}.path",
+    description:
+      "Override the path for the given tool. This is useful in case your tool is not in the PATH",
+  },
+  {
+    name: "mergetool.<tool>.trustExitCode",
+    insertValue: "mergetool.{cursor}.trustExitCode",
+    description:
+      "For a custom merge command, specify whether the exit code of the merge command can be used to determine whether the merge was successful. If this is not set to true then the merge target file timestamp is checked and the merge assumed to have been successful if the file has been updated, otherwise the user is prompted to indicate the success of the merge",
+  },
+  {
+    name: "mergetool.hideResolved",
+    description:
+      "During a merge Git will automatically resolve as many conflicts as possible and write the 'MERGED' file containing conflict markers around any conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally represent the versions of the file from before Git's conflict resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so that only the unresolved conflicts are presented to the merge tool. Can be configured per-tool via the `mergetool.<tool>.hideResolved` configuration variable. Defaults to `false`",
+  },
+  {
+    name: "mergetool.keepBackup",
+    description:
+      "After performing a merge, the original file with conflict markers can be saved as a file with a `.orig` extension. If this variable is set to `false` then this file is not preserved. Defaults to `true` (i.e. keep the backup files)",
+  },
+  {
+    name: "mergetool.keepTemporaries",
+    description:
+      "When invoking a custom merge tool, Git uses a set of temporary files to pass to the tool. If the tool returns an error and this variable is set to `true`, then these temporary files will be preserved, otherwise they will be removed after the tool has exited. Defaults to `false`",
+  },
+  {
+    name: "mergetool.meld.hasOutput",
+    description:
+      "Older versions of `meld` do not support the `--output` option. Git will attempt to detect whether `meld` supports `--output` by inspecting the output of `meld --help`. Configuring `mergetool.meld.hasOutput` will make Git skip these checks and use the configured value instead. Setting `mergetool.meld.hasOutput` to `true` tells Git to unconditionally use the `--output` option, and `false` avoids using `--output`",
+  },
+  {
+    name: "mergetool.meld.useAutoMerge",
+    description:
+      "When the `--auto-merge` is given, meld will merge all non-conflicting parts automatically, highlight the conflicting parts and wait for user decision. Setting `mergetool.meld.useAutoMerge` to `true` tells Git to unconditionally use the `--auto-merge` option with `meld`. Setting this value to `auto` makes git detect whether `--auto-merge` is supported and will only use `--auto-merge` when available. A value of `false` avoids using `--auto-merge` altogether, and is the default value",
+  },
+  {
+    name: "mergetool.prompt",
+    description:
+      "Prompt before each invocation of the merge resolution program",
+  },
+  {
+    name: "mergetool.vimdiff.layout",
+    description:
+      "The vimdiff backend uses this variable to control how its split windows look like. Applies even if you are using Neovim (`nvim`) or gVim (`gvim`) as the merge tool. See BACKEND SPECIFIC HINTS section",
+  },
+  {
+    name: "mergetool.writeToTemp",
+    description:
+      "Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of conflicting files in the worktree by default. Git will attempt to use a temporary directory for these files when set `true`. Defaults to `false`",
+  },
+  {
+    name: "notes.<name>.mergeStrategy",
+    insertValue: "notes.{cursor}.mergeStrategy",
+    description:
+      'Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in git-notes[1] for more information on the available strategies',
+  },
+  {
+    name: "notes.displayRef",
+    description:
+      "The (fully qualified) refname from which to show notes when showing commit messages. The value of this variable can be set to a glob, in which case notes from all matching refs will be shown. You may also specify this configuration variable several times. A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored",
+  },
+  {
+    name: "notes.mergeStrategy",
+    description:
+      'Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See "NOTES MERGE STRATEGIES" section of git-notes[1] for more information on each strategy',
+  },
+  {
+    name: "notes.rewrite.<command>",
+    insertValue: "notes.rewrite.{cursor}",
+    description:
+      'When rewriting commits with <command> (currently `amend` or `rebase`) and this variable is set to `true`, Git automatically copies your notes from the original to the rewritten commit. Defaults to `true`, but see "notes.rewriteRef" below',
+  },
+  {
+    name: "notes.rewriteMode",
+    description:
+      'When copying notes during a rewrite (see the "notes.rewrite.<command>" option), determines what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`',
+  },
+  {
+    name: "notes.rewriteRef",
+    description:
+      "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. The ref may be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times",
+  },
+  {
+    name: "pack.allowPackReuse",
+    description:
+      "When true, and when reachability bitmaps are enabled, pack-objects will try to send parts of the bitmapped packfile verbatim. This can reduce memory and CPU usage to serve fetches, but might result in sending a slightly larger pack. Defaults to true",
+  },
+  {
+    name: "pack.compression",
+    description:
+      'An integer -1..9, indicating the compression level for objects in a pack file. -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If not set, defaults to core.compression. If that is not set, defaults to -1, the zlib default, which is "a default compromise between speed and compression (currently equivalent to level 6)"',
+  },
+  {
+    name: "pack.deltaCacheLimit",
+    description:
+      "The maximum size of a delta, that is cached in git-pack-objects[1]. This cache is used to speed up the writing object phase by not having to recompute the final delta result once the best match for all objects is found. Defaults to 1000. Maximum value is 65535",
+  },
+  {
+    name: "pack.deltaCacheSize",
+    description:
+      "The maximum memory in bytes used for caching deltas in git-pack-objects[1] before writing them out to a pack. This cache is used to speed up the writing object phase by not having to recompute the final delta result once the best match for all objects is found. Repacking large repositories on machines which are tight with memory might be badly impacted by this though, especially if this cache pushes the system into swapping. A value of 0 means no limit. The smallest size of 1 byte may be used to virtually disable this cache. Defaults to 256 MiB",
+  },
+  {
+    name: "pack.depth",
+    description:
+      "The maximum delta depth used by git-pack-objects[1] when no maximum depth is given on the command line. Defaults to 50. Maximum value is 4095",
+  },
+  {
+    name: "pack.indexVersion",
+    description:
+      "Specify the default pack index version. Valid values are 1 for legacy pack index used by Git versions prior to 1.5.2, and 2 for the new pack index with capabilities for packs larger than 4 GB as well as proper protection against the repacking of corrupted packs. Version 2 is the default. Note that version 2 is enforced and this config option ignored whenever the corresponding pack is larger than 2 GB",
+  },
+  {
+    name: "pack.island",
+    description:
+      'An extended regular expression configuring a set of delta islands. See "DELTA ISLANDS" in git-pack-objects[1] for details',
+  },
+  {
+    name: "pack.islandCore",
+    description:
+      'Specify an island name which gets to have its objects be packed first. This creates a kind of pseudo-pack at the front of one pack, so that the objects from the specified island are hopefully faster to copy into any pack that should be served to a user requesting these objects. In practice this means that the island specified should likely correspond to what is the most commonly cloned in the repo. See also "DELTA ISLANDS" in git-pack-objects[1]',
+  },
+  {
+    name: "pack.packSizeLimit",
+    description:
+      "The maximum size of a pack. This setting only affects packing to a file when repacking, i.e. the git:// protocol is unaffected. It can be overridden by the `--max-pack-size` option of git-repack[1]. Reaching this limit results in the creation of multiple packfiles",
+  },
+  {
+    name: "pack.preferBitmapTips",
+    description:
+      'When selecting which commits will receive bitmaps, prefer a commit at the tip of any reference that is a suffix of any value of this configuration over any other commits in the "selection window"',
+  },
+  {
+    name: "pack.threads",
+    description:
+      "Specifies the number of threads to spawn when searching for best delta matches. This requires that git-pack-objects[1] be compiled with pthreads otherwise this option is ignored with a warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. Specifying 0 will cause Git to auto-detect the number of CPU's and set the number of threads accordingly",
+  },
+  {
+    name: "pack.useBitmaps",
+    description:
+      "When true, git will use pack bitmaps (if available) when packing to stdout (e.g., during the server side of a fetch). Defaults to true. You should not generally need to turn this off unless you are debugging pack bitmaps",
+  },
+  {
+    name: "pack.useSparse",
+    description:
+      "When true, git will default to using the '--sparse' option in 'git pack-objects' when the '--revs' option is present. This algorithm only walks trees that appear in paths that introduce new objects. This can have significant performance benefits when computing a pack to send a small change. However, it is possible that extra objects are added to the pack-file if the included commits contain certain types of direct renames. Default is `true`",
+  },
+  {
+    name: "pack.window",
+    description:
+      "The size of the window used by git-pack-objects[1] when no window size is given on the command line. Defaults to 10",
+  },
+  {
+    name: "pack.windowMemory",
+    description:
+      'The maximum size of memory that is consumed by each thread in git-pack-objects[1] for pack window memory when no limit is given on the command line. The value can be suffixed with "k", "m", or "g". When left unconfigured (or set explicitly to 0), there will be no limit',
+  },
+  {
+    name: "pack.writeBitmapHashCache",
+    description:
+      'When true, git will include a "hash cache" section in the bitmap index (if one is written). This cache can be used to feed git\'s delta heuristics, potentially leading to better deltas between bitmapped and non-bitmapped objects (e.g., when serving a fetch between an older, bitmapped pack and objects that have been pushed since the last gc). The downside is that it consumes 4 bytes per object of disk space. Defaults to true',
+  },
+  {
+    name: "pack.writeBitmapLookupTable",
+    description:
+      'When true, Git will include a "lookup table" section in the bitmap index (if one is written). This table is used to defer loading individual bitmaps as late as possible. This can be beneficial in repositories that have relatively large bitmap indexes. Defaults to false',
+  },
+  {
+    name: "pack.writeBitmaps",
+    description: "This is a deprecated synonym for `repack.writeBitmaps`",
+    deprecated: true,
+    hidden: true,
+  },
+  {
+    name: "pack.writeReverseIndex",
+    description:
+      "When true, git will write a corresponding .rev file (see: gitformat-pack[5]) for each new packfile that it writes in all places except for git-fast-import[1] and in the bulk checkin mechanism. Defaults to false",
+  },
+  {
+    name: "pager.<cmd>",
+    insertValue: "pager.{cursor}",
+    description:
+      "If the value is boolean, turns on or off pagination of the output of a particular Git subcommand when writing to a tty. Otherwise, turns on pagination for the subcommand using the pager specified by the value of `pager.<cmd>`. If `--paginate` or `--no-pager` is specified on the command line, it takes precedence over this option. To disable pagination for all commands, set `core.pager` or `GIT_PAGER` to `cat`",
+  },
+  {
+    name: "pretty.<name>",
+    insertValue: "pretty.{cursor}",
+    description:
+      'Alias for a --pretty= format string, as specified in git-log[1]. Any aliases defined here can be used just as the built-in pretty formats could. For example, running `git config pretty.changelog "format:* %H %s"` would cause the invocation `git log --pretty=changelog` to be equivalent to running `git log "--pretty=format:* %H %s"`. Note that an alias with the same name as a built-in format will be silently ignored',
+  },
+  {
+    name: "protocol.<name>.allow",
+    insertValue: "protocol.{cursor}.allow",
+    description:
+      "Set a policy to be used by protocol `<name>` with clone/fetch/push commands. See `protocol.allow` above for the available policies",
+  },
+  {
+    name: "protocol.allow",
+    description:
+      "If set, provide a user defined default policy for all protocols which don't explicitly have a policy (`protocol.<name>.allow`). By default, if unset, known-safe protocols (http, https, git, ssh, file) have a default policy of `always`, known-dangerous protocols (ext) have a default policy of `never`, and all other protocols have a default policy of `user`. Supported policies:",
+  },
+  {
+    name: "protocol.version",
+    description:
+      "If set, clients will attempt to communicate with a server using the specified protocol version. If the server does not support it, communication falls back to version 0. If unset, the default is `2`. Supported versions:",
+  },
+  {
+    name: "pull.ff",
+    description:
+      "By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to `false`, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the `--no-ff` option from the command line). When set to `only`, only such fast-forward merges are allowed (equivalent to giving the `--ff-only` option from the command line). This setting overrides `merge.ff` when pulling",
+  },
+  {
+    name: "pull.octopus",
+    description:
+      "The default merge strategy to use when pulling multiple branches at once",
+  },
+  {
+    name: "pull.rebase",
+    description:
+      'When true, rebase branches on top of the fetched branch, instead of merging the default branch from the default remote when "git pull" is run. See "branch.<name>.rebase" for setting this on a per-branch basis',
+  },
+  {
+    name: "pull.twohead",
+    description:
+      "The default merge strategy to use when pulling a single branch",
+  },
+  {
+    name: "push.autoSetupRemote",
+    description:
+      "If set to \"true\" assume `--set-upstream` on default push when no upstream tracking exists for the current branch; this option takes effect with push.default options 'simple', 'upstream', and 'current'. It is useful if by default you want new branches to be pushed to the default remote (like the behavior of 'push.default=current') and you also want the upstream tracking to be set. Workflows most likely to benefit from this option are 'simple' central workflows where all branches are expected to have the same name on the remote",
+  },
+  {
+    name: "push.default",
+    description:
+      "Defines the action `git push` should take if no refspec is given (whether from the command-line, config, or elsewhere). Different values are well-suited for specific workflows; for instance, in a purely central workflow (i.e. the fetch source is equal to the push destination), `upstream` is probably what you want. Possible values are:",
+  },
+  {
+    name: "push.followTags",
+    description:
+      "If set to true enable `--follow-tags` option by default. You may override this configuration at time of push by specifying `--no-follow-tags`",
+  },
+  {
+    name: "push.gpgSign",
+    description:
+      "May be set to a boolean value, or the string 'if-asked'. A true value causes all pushes to be GPG signed, as if `--signed` is passed to git-push[1]. The string 'if-asked' causes pushes to be signed if the server supports it, as if `--signed=if-asked` is passed to 'git push'. A false value may override a value from a lower-priority config file. An explicit command-line flag always overrides this config option",
+  },
+  {
+    name: "push.negotiate",
+    description:
+      'If set to "true", attempt to reduce the size of the packfile sent by rounds of negotiation in which the client and the server attempt to find commits in common. If "false", Git will rely solely on the server\'s ref advertisement to find commits in common',
+  },
+  {
+    name: "push.pushOption",
+    description:
+      "When no `--push-option=<option>` argument is given from the command line, `git push` behaves as if each <value> of this variable is given as `--push-option=<value>`",
+  },
+  {
+    name: "push.recurseSubmodules",
+    description:
+      "Make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If the value is 'check' then Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing, the push will be aborted and exit with non-zero status. If the value is 'on-demand' then all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If the value is 'no' then default behavior of ignoring submodules when pushing is retained. You may override this configuration at time of push by specifying '--recurse-submodules=check|on-demand|no'. If not set, 'no' is used by default, unless 'submodule.recurse' is set (in which case a 'true' value means 'on-demand')",
+  },
+  {
+    name: "push.useBitmaps",
+    description:
+      'If set to "false", disable use of bitmaps for "git push" even if `pack.useBitmaps` is "true", without preventing other git operations from using bitmaps. Default is true',
+  },
+  {
+    name: "push.useForceIfIncludes",
+    description:
+      'If set to "true", it is equivalent to specifying `--force-if-includes` as an option to git-push[1] in the command line. Adding `--no-force-if-includes` at the time of push overrides this configuration setting',
+  },
+  {
+    name: "rebase.abbreviateCommands",
+    description:
+      "If set to true, `git rebase` will use abbreviated command names in the todo list resulting in something like this:",
+  },
+  {
+    name: "rebase.autoSquash",
+    description: "If set to true enable `--autosquash` option by default",
+  },
+  {
+    name: "rebase.autoStash",
+    description:
+      "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts. This option can be overridden by the `--no-autostash` and `--autostash` options of git-rebase[1]. Defaults to false",
+  },
+  {
+    name: "rebase.backend",
+    description:
+      "Default backend to use for rebasing. Possible choices are 'apply' or 'merge'. In the future, if the merge backend gains all remaining capabilities of the apply backend, this setting may become unused",
+  },
+  {
+    name: "rebase.forkPoint",
+    description: "If set to false set `--no-fork-point` option by default",
+  },
+  {
+    name: "rebase.instructionFormat",
+    description:
+      "A format string, as specified in git-log[1], to be used for the todo list during an interactive rebase. The format will automatically have the long commit hash prepended to the format",
+  },
+  {
+    name: "rebase.missingCommitsCheck",
+    description:
+      'If set to "warn", git rebase -i will print a warning if some commits are removed (e.g. a line was deleted), however the rebase will still proceed. If set to "error", it will print the previous warning and stop the rebase, \'git rebase --edit-todo\' can then be used to correct the error. If set to "ignore", no checking is done. To drop a commit without warning or error, use the `drop` command in the todo list. Defaults to "ignore"',
+  },
+  {
+    name: "rebase.rescheduleFailedExec",
+    description:
+      "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided). This is the same as specifying the `--reschedule-failed-exec` option",
+  },
+  {
+    name: "rebase.stat",
+    description:
+      "Whether to show a diffstat of what changed upstream since the last rebase. False by default",
+  },
+  {
+    name: "rebase.updateRefs",
+    description: "If set to true enable `--update-refs` option by default",
+  },
+  {
+    name: "receive.advertiseAtomic",
+    description:
+      "By default, git-receive-pack will advertise the atomic push capability to its clients. If you don't want to advertise this capability, set this variable to false",
+  },
+  {
+    name: "receive.advertisePushOptions",
+    description:
+      "When set to true, git-receive-pack will advertise the push options capability to its clients. False by default",
+  },
+  {
+    name: "receive.autogc",
+    description:
+      'By default, git-receive-pack will run "git-gc --auto" after receiving data from git-push and updating refs. You can stop it by setting this variable to false',
+  },
+  {
+    name: "receive.certNonceSeed",
+    description:
+      'By setting this variable to a string, `git receive-pack` will accept a `git push --signed` and verifies it by using a "nonce" protected by HMAC using this string as a secret key',
+  },
+  {
+    name: "receive.certNonceSlop",
+    description:
+      'When a `git push --signed` sent a push certificate with a "nonce" that was issued by a receive-pack serving the same repository within this many seconds, export the "nonce" found in the certificate to `GIT_PUSH_CERT_NONCE` to the hooks (instead of what the receive-pack asked the sending side to include). This may allow writing checks in `pre-receive` and `post-receive` a bit easier. Instead of checking `GIT_PUSH_CERT_NONCE_SLOP` environment variable that records by how many seconds the nonce is stale to decide if they want to accept the certificate, they only can check `GIT_PUSH_CERT_NONCE_STATUS` is `OK`',
+  },
+  {
+    name: "receive.denyCurrentBranch",
+    description:
+      'If set to true or "refuse", git-receive-pack will deny a ref update to the currently checked out branch of a non-bare repository. Such a push is potentially dangerous because it brings the HEAD out of sync with the index and working tree. If set to "warn", print a warning of such a push to stderr, but allow the push to proceed. If set to false or "ignore", allow such pushes with no message. Defaults to "refuse"',
+  },
+  {
+    name: "receive.denyDeleteCurrent",
+    description:
+      "If set to true, git-receive-pack will deny a ref update that deletes the currently checked out branch of a non-bare repository",
+  },
+  {
+    name: "receive.denyDeletes",
+    description:
+      "If set to true, git-receive-pack will deny a ref update that deletes the ref. Use this to prevent such a ref deletion via a push",
+  },
+  {
+    name: "receive.denyNonFastForwards",
+    description:
+      "If set to true, git-receive-pack will deny a ref update which is not a fast-forward. Use this to prevent such an update via a push, even if that push is forced. This configuration variable is set when initializing a shared repository",
+  },
+  {
+    name: "receive.fsck.<msg-id>",
+    insertValue: "receive.fsck.{cursor}",
+    description:
+      "Acts like `fsck.<msg-id>`, but is used by git-receive-pack[1] instead of git-fsck[1]. See the `fsck.<msg-id>` documentation for details",
+  },
+  {
+    name: "receive.fsck.skipList",
+    description:
+      "Acts like `fsck.skipList`, but is used by git-receive-pack[1] instead of git-fsck[1]. See the `fsck.skipList` documentation for details",
+  },
+  {
+    name: "receive.fsckObjects",
+    description:
+      "If it is set to true, git-receive-pack will check all received objects. See `transfer.fsckObjects` for what's checked. Defaults to false. If not set, the value of `transfer.fsckObjects` is used instead",
+  },
+  {
+    name: "receive.hideRefs",
+    description:
+      "This variable is the same as `transfer.hideRefs`, but applies only to `receive-pack` (and so affects pushes, but not fetches). An attempt to update or delete a hidden ref by `git push` is rejected",
+  },
+  {
+    name: "receive.keepAlive",
+    description:
+      "After receiving the pack from the client, `receive-pack` may produce no output (if `--quiet` was specified) while processing the pack, causing some networks to drop the TCP connection. With this option set, if `receive-pack` does not transmit any data in this phase for `receive.keepAlive` seconds, it will send a short keepalive packet. The default is 5 seconds; set to 0 to disable keepalives entirely",
+  },
+  {
+    name: "receive.maxInputSize",
+    description:
+      "If the size of the incoming pack stream is larger than this limit, then git-receive-pack will error out, instead of accepting the pack file. If not set or set to 0, then the size is unlimited",
+  },
+  {
+    name: "receive.procReceiveRefs",
+    description:
+      'This is a multi-valued variable that defines reference prefixes to match the commands in `receive-pack`. Commands matching the prefixes will be executed by an external hook "proc-receive", instead of the internal `execute_commands` function. If this variable is not defined, the "proc-receive" hook will never be used, and all commands will be executed by the internal `execute_commands` function',
+  },
+  {
+    name: "receive.shallowUpdate",
+    description:
+      "If set to true, .git/shallow can be updated when new refs require new shallow roots. Otherwise those refs are rejected",
+  },
+  {
+    name: "receive.unpackLimit",
+    description:
+      "If the number of objects received in a push is below this limit then the objects will be unpacked into loose object files. However if the number of received objects equals or exceeds this limit then the received pack will be stored as a pack, after adding any missing delta bases. Storing the pack from a push can make the push operation complete faster, especially on slow filesystems. If not set, the value of `transfer.unpackLimit` is used instead",
+  },
+  {
+    name: "receive.updateServerInfo",
+    description:
+      "If set to true, git-receive-pack will run git-update-server-info after receiving data from git-push and updating refs",
+  },
+  {
+    name: "remote.<name>.fetch",
+    insertValue: "remote.{cursor}.fetch",
+    description:
+      'The default set of "refspec" for git-fetch[1]. See git-fetch[1]',
+  },
+  {
+    name: "remote.<name>.mirror",
+    insertValue: "remote.{cursor}.mirror",
+    description:
+      "If true, pushing to this remote will automatically behave as if the `--mirror` option was given on the command line",
+  },
+  {
+    name: "remote.<name>.partialclonefilter",
+    insertValue: "remote.{cursor}.partialclonefilter",
+    description:
+      "The filter that will be applied when fetching from this promisor remote. Changing or clearing this value will only affect fetches for new commits. To fetch associated objects for commits already present in the local object database, use the `--refetch` option of git-fetch[1]",
+  },
+  {
+    name: "remote.<name>.promisor",
+    insertValue: "remote.{cursor}.promisor",
+    description:
+      "When set to true, this remote will be used to fetch promisor objects",
+  },
+  {
+    name: "remote.<name>.proxy",
+    insertValue: "remote.{cursor}.proxy",
+    description:
+      "For remotes that require curl (http, https and ftp), the URL to the proxy to use for that remote. Set to the empty string to disable proxying for that remote",
+  },
+  {
+    name: "remote.<name>.proxyAuthMethod",
+    insertValue: "remote.{cursor}.proxyAuthMethod",
+    description:
+      "For remotes that require curl (http, https and ftp), the method to use for authenticating against the proxy in use (probably set in `remote.<name>.proxy`). See `http.proxyAuthMethod`",
+  },
+  {
+    name: "remote.<name>.prune",
+    insertValue: "remote.{cursor}.prune",
+    description:
+      "When set to true, fetching from this remote by default will also remove any remote-tracking references that no longer exist on the remote (as if the `--prune` option was given on the command line). Overrides `fetch.prune` settings, if any",
+  },
+  {
+    name: "remote.<name>.pruneTags",
+    insertValue: "remote.{cursor}.pruneTags",
+    description:
+      "When set to true, fetching from this remote by default will also remove any local tags that no longer exist on the remote if pruning is activated in general via `remote.<name>.prune`, `fetch.prune` or `--prune`. Overrides `fetch.pruneTags` settings, if any",
+  },
+  {
+    name: "remote.<name>.push",
+    insertValue: "remote.{cursor}.push",
+    description:
+      'The default set of "refspec" for git-push[1]. See git-push[1]',
+  },
+  {
+    name: "remote.<name>.pushurl",
+    insertValue: "remote.{cursor}.pushurl",
+    description: "The push URL of a remote repository. See git-push[1]",
+  },
+  {
+    name: "remote.<name>.receivepack",
+    insertValue: "remote.{cursor}.receivepack",
+    description:
+      "The default program to execute on the remote side when pushing. See option --receive-pack of git-push[1]",
+  },
+  {
+    name: "remote.<name>.skipDefaultUpdate",
+    insertValue: "remote.{cursor}.skipDefaultUpdate",
+    description:
+      "If true, this remote will be skipped by default when updating using git-fetch[1] or the `update` subcommand of git-remote[1]",
+  },
+  {
+    name: "remote.<name>.skipFetchAll",
+    insertValue: "remote.{cursor}.skipFetchAll",
+    description:
+      "If true, this remote will be skipped by default when updating using git-fetch[1] or the `update` subcommand of git-remote[1]",
+  },
+  {
+    name: "remote.<name>.tagOpt",
+    insertValue: "remote.{cursor}.tagOpt",
+    description:
+      "Setting this value to --no-tags disables automatic tag following when fetching from remote <name>. Setting it to --tags will fetch every tag from remote <name>, even if they are not reachable from remote branch heads. Passing these flags directly to git-fetch[1] can override this setting. See options --tags and --no-tags of git-fetch[1]",
+  },
+  {
+    name: "remote.<name>.uploadpack",
+    insertValue: "remote.{cursor}.uploadpack",
+    description:
+      "The default program to execute on the remote side when fetching. See option --upload-pack of git-fetch-pack[1]",
+  },
+  {
+    name: "remote.<name>.url",
+    insertValue: "remote.{cursor}.url",
+    description:
+      "The URL of a remote repository. See git-fetch[1] or git-push[1]",
+  },
+  {
+    name: "remote.<name>.vcs",
+    insertValue: "remote.{cursor}.vcs",
+    description:
+      "Setting this to a value <vcs> will cause Git to interact with the remote with the git-remote-<vcs> helper",
+  },
+  {
+    name: "remote.pushDefault",
+    description:
+      "The remote to push to by default. Overrides `branch.<name>.remote` for all branches, and is overridden by `branch.<name>.pushRemote` for specific branches",
+  },
+  {
+    name: "remotes.<group>",
+    insertValue: "remotes.{cursor}",
+    description:
+      'The list of remotes which are fetched by "git remote update <group>". See git-remote[1]',
+  },
+  {
+    name: "repack.cruftThreads",
+    description:
+      "Parameters used by git-pack-objects[1] when generating a cruft pack and the respective parameters are not given over the command line. See similarly named `pack.*` configuration variables for defaults and meaning",
+  },
+  {
+    name: "repack.packKeptObjects",
+    description:
+      "If set to true, makes `git repack` act as if `--pack-kept-objects` was passed. See git-repack[1] for details. Defaults to `false` normally, but `true` if a bitmap index is being written (either via `--write-bitmap-index` or `repack.writeBitmaps`)",
+  },
+  {
+    name: "repack.updateServerInfo",
+    description:
+      "If set to false, git-repack[1] will not run git-update-server-info[1]. Defaults to true. Can be overridden when true by the `-n` option of git-repack[1]",
+  },
+  {
+    name: "repack.useDeltaBaseOffset",
+    description:
+      'By default, git-repack[1] creates packs that use delta-base offset. If you need to share your repository with Git older than version 1.4.4, either directly or via a dumb protocol such as http, then you need to set this option to "false" and repack. Access from old Git versions over the native protocol are unaffected by this option',
+  },
+  {
+    name: "repack.useDeltaIslands",
+    description:
+      "If set to true, makes `git repack` act as if `--delta-islands` was passed. Defaults to `false`",
+  },
+  {
+    name: "repack.writeBitmaps",
+    description:
+      'When true, git will write a bitmap index when packing all objects to disk (e.g., when `git repack -a` is run). This index can speed up the "counting objects" phase of subsequent packs created for clones and fetches, at the cost of some disk space and extra time spent on the initial repack. This has no effect if multiple packfiles are created. Defaults to true on bare repos, false otherwise',
+  },
+  {
+    name: "rerere.autoUpdate",
+    description:
+      "When set to true, `git-rerere` updates the index with the resulting contents after it cleanly resolves conflicts using previously recorded resolution. Defaults to false",
+  },
+  {
+    name: "rerere.enabled",
+    description:
+      'Activate recording of resolved conflicts, so that identical conflict hunks can be resolved automatically, should they be encountered again. By default, git-rerere[1] is enabled if there is an `rr-cache` directory under the `$GIT_DIR`, e.g. if "rerere" was previously used in the repository',
+  },
+  {
+    name: "revert.reference",
+    description:
+      "Setting this variable to true makes `git revert` behave as if the `--reference` option is given",
+  },
+  {
+    name: "safe.bareRepository",
+    description:
+      "Specifies which bare repositories Git will work with. The currently supported values are:",
+  },
+  {
+    name: "safe.directory",
+    description:
+      "These config entries specify Git-tracked directories that are considered safe even if they are owned by someone other than the current user. By default, Git will refuse to even parse a Git config of a repository owned by someone else, let alone run its hooks, and this config setting allows users to specify exceptions, e.g. for intentionally shared repositories (see the `--shared` option in git-init[1])",
+  },
+  {
+    name: "sendemail.forbidSendmailVariables",
+    description:
+      'To avoid common misconfiguration mistakes, git-send-email[1] will abort with a warning if any configuration options for "sendmail" exist. Set this variable to bypass the check',
+  },
+  {
+    name: "sendemail.identity",
+    description:
+      "A configuration identity. When given, causes values in the 'sendemail.<identity>' subsection to take precedence over values in the 'sendemail' section. The default identity is the value of `sendemail.identity`",
+  },
+  {
+    name: "sendemail.signedoffcc",
+    description: "Deprecated alias for `sendemail.signedoffbycc`",
+    deprecated: true,
+    hidden: true,
+  },
+  {
+    name: "sendemail.smtpBatchSize",
+    description:
+      "Number of messages to be sent per connection, after that a relogin will happen. If the value is 0 or undefined, send all messages in one connection. See also the `--batch-size` option of git-send-email[1]",
+  },
+  {
+    name: "sendemail.smtpEncryption",
+    description:
+      "See git-send-email[1] for description. Note that this setting is not subject to the 'identity' mechanism",
+  },
+  {
+    name: "sendemail.smtpReloginDelay",
+    description:
+      "Seconds wait before reconnecting to smtp server. See also the `--relogin-delay` option of git-send-email[1]",
+  },
+  {
+    name: "sendemail.smtpsslcertpath",
+    description:
+      "Path to ca-certificates (either a directory or a single file). Set it to an empty string to disable certificate verification",
+  },
+  {
+    name: "sendemail.xmailer",
+    description: "See git-send-email[1] for description",
+  },
+  {
+    name: "sequence.editor",
+    description:
+      "Text editor used by `git rebase -i` for editing the rebase instruction file. The value is meant to be interpreted by the shell when it is used. It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. When not configured the default commit message editor is used instead",
+  },
+  {
+    name: "sendemail.<identity>.forbidSendmailVariables",
+    insertValue: "sendemail.{cursor}.forbidSendmailVariables",
+    description:
+      'To avoid common misconfiguration mistakes, git-send-email[1] will abort with a warning if any configuration options for "sendmail" exist. Set this variable to bypass the check',
+  },
+  {
+    name: "sendemail.<identity>.signedoffcc",
+    insertValue: "sendemail.{cursor}.signedoffcc",
+    description: "Deprecated alias for `sendemail.signedoffbycc`",
+    deprecated: true,
+    hidden: true,
+  },
+  {
+    name: "sendemail.<identity>.smtpBatchSize",
+    insertValue: "sendemail.{cursor}.smtpBatchSize",
+    description:
+      "Number of messages to be sent per connection, after that a relogin will happen. If the value is 0 or undefined, send all messages in one connection. See also the `--batch-size` option of git-send-email[1]",
+  },
+  {
+    name: "sendemail.<identity>.smtpEncryption",
+    insertValue: "sendemail.{cursor}.smtpEncryption",
+    description:
+      "See git-send-email[1] for description. Note that this setting is not subject to the 'identity' mechanism",
+  },
+  {
+    name: "sendemail.<identity>.smtpReloginDelay",
+    insertValue: "sendemail.{cursor}.smtpReloginDelay",
+    description:
+      "Seconds wait before reconnecting to smtp server. See also the `--relogin-delay` option of git-send-email[1]",
+  },
+  {
+    name: "sendemail.<identity>.smtpsslcertpath",
+    insertValue: "sendemail.{cursor}.smtpsslcertpath",
+    description:
+      "Path to ca-certificates (either a directory or a single file). Set it to an empty string to disable certificate verification",
+  },
+  {
+    name: "sendemail.<identity>.xmailer",
+    insertValue: "sendemail.{cursor}.xmailer",
+    description: "See git-send-email[1] for description",
+  },
+  {
+    name: "sequence.<identity>.editor",
+    insertValue: "sequence.{cursor}.editor",
+    description:
+      "Text editor used by `git rebase -i` for editing the rebase instruction file. The value is meant to be interpreted by the shell when it is used. It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. When not configured the default commit message editor is used instead",
+  },
+  {
+    name: "showBranch.default",
+    description:
+      "The default set of branches for git-show-branch[1]. See git-show-branch[1]",
+  },
+  {
+    name: "sparse.expectFilesOutsideOfPatterns",
+    description:
+      "Typically with sparse checkouts, files not matching any sparsity patterns are marked with a SKIP_WORKTREE bit in the index and are missing from the working tree. Accordingly, Git will ordinarily check whether files with the SKIP_WORKTREE bit are in fact present in the working tree contrary to expectations. If Git finds any, it marks those paths as present by clearing the relevant SKIP_WORKTREE bits. This option can be used to tell Git that such present-despite-skipped files are expected and to stop checking for them",
+  },
+  {
+    name: "splitIndex.maxPercentChange",
+    description:
+      "When the split index feature is used, this specifies the percent of entries the split index can contain compared to the total number of entries in both the split index and the shared index before a new shared index is written. The value should be between 0 and 100. If the value is 0 then a new shared index is always written, if it is 100 a new shared index is never written. By default the value is 20, so a new shared index is written if the number of entries in the split index would be greater than 20 percent of the total number of entries. See git-update-index[1]",
+  },
+  {
+    name: "splitIndex.sharedIndexExpire",
+    description:
+      'When the split index feature is used, shared index files that were not modified since the time this variable specifies will be removed when a new shared index file is created. The value "now" expires all entries immediately, and "never" suppresses expiration altogether. The default value is "2.weeks.ago". Note that a shared index file is considered modified (for the purpose of expiration) each time a new split-index file is either created based on it or read from it. See git-update-index[1]',
+  },
+  {
+    name: "ssh.variant",
+    description:
+      "By default, Git determines the command line arguments to use based on the basename of the configured SSH command (configured using the environment variable `GIT_SSH` or `GIT_SSH_COMMAND` or the config setting `core.sshCommand`). If the basename is unrecognized, Git will attempt to detect support of OpenSSH options by first invoking the configured SSH command with the `-G` (print configuration) option and will subsequently use OpenSSH options (if that is successful) or no options besides the host and remote command (if it fails)",
+  },
+  {
+    name: "stash.showIncludeUntracked",
+    description:
+      "If this is set to true, the `git stash show` command will show the untracked files of a stash entry. Defaults to false. See description of 'show' command in git-stash[1]",
+  },
+  {
+    name: "stash.showPatch",
+    description:
+      "If this is set to true, the `git stash show` command without an option will show the stash entry in patch form. Defaults to false. See description of 'show' command in git-stash[1]",
+  },
+  {
+    name: "stash.showStat",
+    description:
+      "If this is set to true, the `git stash show` command without an option will show diffstat of the stash entry. Defaults to true. See description of 'show' command in git-stash[1]",
+  },
+  {
+    name: "status.aheadBehind",
+    description:
+      "Set to true to enable `--ahead-behind` and false to enable `--no-ahead-behind` by default in git-status[1] for non-porcelain status formats. Defaults to true",
+  },
+  {
+    name: "status.branch",
+    description:
+      "Set to true to enable --branch by default in git-status[1]. The option --no-branch takes precedence over this variable",
+  },
+  {
+    name: "status.displayCommentPrefix",
+    description:
+      "If set to true, git-status[1] will insert a comment prefix before each output line (starting with `core.commentChar`, i.e. `#` by default). This was the behavior of git-status[1] in Git 1.8.4 and previous. Defaults to false",
+  },
+  {
+    name: "status.relativePaths",
+    description:
+      "By default, git-status[1] shows paths relative to the current directory. Setting this variable to `false` shows paths relative to the repository root (this was the default for Git prior to v1.5.4)",
+  },
+  {
+    name: "status.renameLimit",
+    description:
+      "The number of files to consider when performing rename detection in git-status[1] and git-commit[1]. Defaults to the value of diff.renameLimit",
+  },
+  {
+    name: "status.renames",
+    description:
+      'Whether and how Git detects renames in git-status[1] and git-commit[1] . If set to "false", rename detection is disabled. If set to "true", basic rename detection is enabled. If set to "copies" or "copy", Git will detect copies, as well. Defaults to the value of diff.renames',
+  },
+  {
+    name: "status.short",
+    description:
+      "Set to true to enable --short by default in git-status[1]. The option --no-short takes precedence over this variable",
+  },
+  {
+    name: "status.showStash",
+    description:
+      "If set to true, git-status[1] will display the number of entries currently stashed away. Defaults to false",
+  },
+  {
+    name: "status.showUntrackedFiles",
+    description:
+      "By default, git-status[1] and git-commit[1] show files which are not currently tracked by Git. Directories which contain only untracked files, are shown with the directory name only. Showing untracked files means that Git needs to lstat() all the files in the whole repository, which might be slow on some systems. So, this variable controls how the commands displays the untracked files. Possible values are:",
+  },
+  {
+    name: "status.submoduleSummary",
+    description:
+      "Defaults to false. If this is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled and a summary of commits for modified submodules will be shown (see --summary-limit option of git-submodule[1]). Please note that the summary output command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. The only exception to that rule is that status and commit will show staged submodule changes. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command-line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings",
+  },
+  {
+    name: "submodule.<name>.active",
+    insertValue: "submodule.{cursor}.active",
+    description:
+      "Boolean value indicating if the submodule is of interest to git commands. This config option takes precedence over the submodule.active config option. See gitsubmodules[7] for details",
+  },
+  {
+    name: "submodule.<name>.branch",
+    insertValue: "submodule.{cursor}.branch",
+    description:
+      "The remote branch name for a submodule, used by `git submodule update --remote`. Set this option to override the value found in the `.gitmodules` file. See git-submodule[1] and gitmodules[5] for details",
+  },
+  {
+    name: "submodule.<name>.fetchRecurseSubmodules",
+    insertValue: "submodule.{cursor}.fetchRecurseSubmodules",
+    description:
+      'This option can be used to control recursive fetching of this submodule. It can be overridden by using the --[no-]recurse-submodules command-line option to "git fetch" and "git pull". This setting will override that from in the gitmodules[5] file',
+  },
+  {
+    name: "submodule.<name>.ignore",
+    insertValue: "submodule.{cursor}.ignore",
+    description:
+      'Defines under what circumstances "git status" and the diff family show a submodule as modified. When set to "all", it will never be considered modified (but it will nonetheless show up in the output of status and commit when it has been staged), "dirty" will ignore all changes to the submodules work tree and takes only differences between the HEAD of the submodule and the commit recorded in the superproject into account. "untracked" will additionally let submodules with modified tracked files in their work tree show up. Using "none" (the default when this option is not set) also shows submodules that have untracked files in their work tree as changed. This setting overrides any setting made in .gitmodules for this submodule, both settings can be overridden on the command line by using the "--ignore-submodules" option. The \'git submodule\' commands are not affected by this setting',
+  },
+  {
+    name: "submodule.<name>.update",
+    insertValue: "submodule.{cursor}.update",
+    description:
+      "The method by which a submodule is updated by 'git submodule update', which is the only affected command, others such as 'git checkout --recurse-submodules' are unaffected. It exists for historical reasons, when 'git submodule' was the only command to interact with submodules; settings like `submodule.active` and `pull.rebase` are more specific. It is populated by `git submodule init` from the gitmodules[5] file. See description of 'update' command in git-submodule[1]",
+  },
+  {
+    name: "submodule.<name>.url",
+    insertValue: "submodule.{cursor}.url",
+    description:
+      "The URL for a submodule. This variable is copied from the .gitmodules file to the git config via 'git submodule init'. The user can change the configured URL before obtaining the submodule via 'git submodule update'. If neither submodule.<name>.active or submodule.active are set, the presence of this variable is used as a fallback to indicate whether the submodule is of interest to git commands. See git-submodule[1] and gitmodules[5] for details",
+  },
+  {
+    name: "submodule.active",
+    description:
+      "A repeated field which contains a pathspec used to match against a submodule's path to determine if the submodule is of interest to git commands. See gitsubmodules[7] for details",
+  },
+  {
+    name: "submodule.alternateErrorStrategy",
+    description:
+      "Specifies how to treat errors with the alternates for a submodule as computed via `submodule.alternateLocation`. Possible values are `ignore`, `info`, `die`. Default is `die`. Note that if set to `ignore` or `info`, and if there is an error with the computed alternate, the clone proceeds as if no alternate was specified",
+  },
+  {
+    name: "submodule.alternateLocation",
+    description:
+      "Specifies how the submodules obtain alternates when submodules are cloned. Possible values are `no`, `superproject`. By default `no` is assumed, which doesn't add references. When the value is set to `superproject` the submodule to be cloned computes its alternates location relative to the superprojects alternate",
+  },
+  {
+    name: "submodule.fetchJobs",
+    description:
+      "Specifies how many submodules are fetched/cloned at the same time. A positive integer allows up to that number of submodules fetched in parallel. A value of 0 will give some reasonable default. If unset, it defaults to 1",
+  },
+  {
+    name: "submodule.propagateBranches",
+    description:
+      "[EXPERIMENTAL] A boolean that enables branching support when using `--recurse-submodules` or `submodule.recurse=true`. Enabling this will allow certain commands to accept `--recurse-submodules` and certain commands that already accept `--recurse-submodules` will now consider branches. Defaults to false",
+  },
+  {
+    name: "submodule.recurse",
+    description:
+      "A boolean indicating if commands should enable the `--recurse-submodules` option by default. Defaults to false",
+  },
+  {
+    name: "tag.forceSignAnnotated",
+    description:
+      "A boolean to specify whether annotated tags created should be GPG signed. If `--annotate` is specified on the command line, it takes precedence over this option",
+  },
+  {
+    name: "tag.gpgSign",
+    description:
+      'A boolean to specify whether all tags should be GPG signed. Use of this option when running in an automated script can result in a large number of tags being signed. It is therefore convenient to use an agent to avoid typing your gpg passphrase several times. Note that this option doesn\'t affect tag signing behavior enabled by "-u <keyid>" or "--local-user=<keyid>" options',
+  },
+  {
+    name: "tag.sort",
+    description:
+      'This variable controls the sort ordering of tags when displayed by git-tag[1]. Without the "--sort=<value>" option provided, the value of this variable will be used as the default',
+  },
+  {
+    name: "tar.umask",
+    description:
+      'This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the world write bit. The special value "user" indicates that the archiving user\'s umask will be used instead. See umask(2) and git-archive[1]',
+  },
+  {
+    name: "trace2.configParams",
+    description:
+      'A comma-separated list of patterns of "important" config settings that should be recorded in the trace2 output. For example, `core.*,remote.*.url` would cause the trace2 output to contain events listing each configured remote. May be overridden by the `GIT_TRACE2_CONFIG_PARAMS` environment variable. Unset by default',
+  },
+  {
+    name: "trace2.destinationDebug",
+    description:
+      "Boolean. When true Git will print error messages when a trace target destination cannot be opened for writing. By default, these errors are suppressed and tracing is silently disabled. May be overridden by the `GIT_TRACE2_DST_DEBUG` environment variable",
+  },
+  {
+    name: "trace2.envVars",
+    description:
+      'A comma-separated list of "important" environment variables that should be recorded in the trace2 output. For example, `GIT_HTTP_USER_AGENT,GIT_CONFIG` would cause the trace2 output to contain events listing the overrides for HTTP user agent and the location of the Git configuration file (assuming any are set). May be overridden by the `GIT_TRACE2_ENV_VARS` environment variable. Unset by default',
+  },
+  {
+    name: "trace2.eventBrief",
+    description:
+      "Boolean. When true `time`, `filename`, and `line` fields are omitted from event output. May be overridden by the `GIT_TRACE2_EVENT_BRIEF` environment variable. Defaults to false",
+  },
+  {
+    name: "trace2.eventNesting",
+    description:
+      "Integer. Specifies desired depth of nested regions in the event output. Regions deeper than this value will be omitted. May be overridden by the `GIT_TRACE2_EVENT_NESTING` environment variable. Defaults to 2",
+  },
+  {
+    name: "trace2.eventTarget",
+    description:
+      "This variable controls the event target destination. It may be overridden by the `GIT_TRACE2_EVENT` environment variable. The following table shows possible values",
+  },
+  {
+    name: "trace2.maxFiles",
+    description:
+      "Integer. When writing trace files to a target directory, do not write additional traces if we would exceed this many files. Instead, write a sentinel file that will block further tracing to this directory. Defaults to 0, which disables this check",
+  },
+  {
+    name: "trace2.normalBrief",
+    description:
+      "Boolean. When true `time`, `filename`, and `line` fields are omitted from normal output. May be overridden by the `GIT_TRACE2_BRIEF` environment variable. Defaults to false",
+  },
+  {
+    name: "trace2.normalTarget",
+    description:
+      "This variable controls the normal target destination. It may be overridden by the `GIT_TRACE2` environment variable. The following table shows possible values",
+  },
+  {
+    name: "trace2.perfBrief",
+    description:
+      "Boolean. When true `time`, `filename`, and `line` fields are omitted from PERF output. May be overridden by the `GIT_TRACE2_PERF_BRIEF` environment variable. Defaults to false",
+  },
+  {
+    name: "trace2.perfTarget",
+    description:
+      "This variable controls the performance target destination. It may be overridden by the `GIT_TRACE2_PERF` environment variable. The following table shows possible values",
+  },
+  {
+    name: "transfer.advertiseSID",
+    description:
+      "Boolean. When true, client and server processes will advertise their unique session IDs to their remote counterpart. Defaults to false",
+  },
+  {
+    name: "transfer.credentialsInUrl",
+    description:
+      "A configured URL can contain plaintext credentials in the form `<protocol>://<user>:<password>@<domain>/<path>`. You may want to warn or forbid the use of such configuration (in favor of using git-credential[1]). This will be used on git-clone[1], git-fetch[1], git-push[1], and any other direct use of the configured URL",
+  },
+  {
+    name: "transfer.fsckObjects",
+    description:
+      "When `fetch.fsckObjects` or `receive.fsckObjects` are not set, the value of this variable is used instead. Defaults to false",
+  },
+  {
+    name: "transfer.hideRefs",
+    description:
+      "String(s) `receive-pack` and `upload-pack` use to decide which refs to omit from their initial advertisements. Use more than one definition to specify multiple prefix strings. A ref that is under the hierarchies listed in the value of this variable is excluded, and is hidden when responding to `git push` or `git fetch`. See `receive.hideRefs` and `uploadpack.hideRefs` for program-specific versions of this config",
+  },
+  {
+    name: "transfer.unpackLimit",
+    description:
+      "When `fetch.unpackLimit` or `receive.unpackLimit` are not set, the value of this variable is used instead. The default value is 100",
+  },
+  {
+    name: "uploadarchive.allowUnreachable",
+    description:
+      'If true, allow clients to use `git archive --remote` to request any tree, whether reachable from the ref tips or not. See the discussion in the "SECURITY" section of git-upload-archive[1] for more details. Defaults to `false`',
+  },
+  {
+    name: "uploadpack.allowAnySHA1InWant",
+    description:
+      "Allow `upload-pack` to accept a fetch request that asks for any object at all. Defaults to `false`",
+  },
+  {
+    name: "uploadpack.allowFilter",
+    description:
+      "If this option is set, `upload-pack` will support partial clone and partial fetch object filtering",
+  },
+  {
+    name: "uploadpack.allowReachableSHA1InWant",
+    description:
+      'Allow `upload-pack` to accept a fetch request that asks for an object that is reachable from any ref tip. However, note that calculating object reachability is computationally expensive. Defaults to `false`. Even if this is false, a client may be able to steal objects via the techniques described in the "SECURITY" section of the gitnamespaces[7] man page; it\'s best to keep private data in a separate repository',
+  },
+  {
+    name: "uploadpack.allowRefInWant",
+    description:
+      "If this option is set, `upload-pack` will support the `ref-in-want` feature of the protocol version 2 `fetch` command. This feature is intended for the benefit of load-balanced servers which may not have the same view of what OIDs their refs point to due to replication delay",
+  },
+  {
+    name: "uploadpack.allowTipSHA1InWant",
+    description:
+      'When `uploadpack.hideRefs` is in effect, allow `upload-pack` to accept a fetch request that asks for an object at the tip of a hidden ref (by default, such a request is rejected). See also `uploadpack.hideRefs`. Even if this is false, a client may be able to steal objects via the techniques described in the "SECURITY" section of the gitnamespaces[7] man page; it\'s best to keep private data in a separate repository',
+  },
+  {
+    name: "uploadpack.hideRefs",
+    description:
+      "This variable is the same as `transfer.hideRefs`, but applies only to `upload-pack` (and so affects only fetches, not pushes). An attempt to fetch a hidden ref by `git fetch` will fail. See also `uploadpack.allowTipSHA1InWant`",
+  },
+  {
+    name: "uploadpack.keepAlive",
+    description:
+      "When `upload-pack` has started `pack-objects`, there may be a quiet period while `pack-objects` prepares the pack. Normally it would output progress information, but if `--quiet` was used for the fetch, `pack-objects` will output nothing at all until the pack data begins. Some clients and networks may consider the server to be hung and give up. Setting this option instructs `upload-pack` to send an empty keepalive packet every `uploadpack.keepAlive` seconds. Setting this option to 0 disables keepalive packets entirely. The default is 5 seconds",
+  },
+  {
+    name: "uploadpack.packObjectsHook",
+    description:
+      "If this option is set, when `upload-pack` would run `git pack-objects` to create a packfile for a client, it will run this shell command instead. The `pack-objects` command and arguments it _would_ have run (including the `git pack-objects` at the beginning) are appended to the shell command. The stdin and stdout of the hook are treated as if `pack-objects` itself was run. I.e., `upload-pack` will feed input intended for `pack-objects` to the hook, and expects a completed packfile on stdout",
+  },
+  {
+    name: "uploadpackfilter.<filter>.allow",
+    insertValue: "uploadpackfilter.{cursor}.allow",
+    description:
+      "Explicitly allow or ban the object filter corresponding to `<filter>`, where `<filter>` may be one of: `blob:none`, `blob:limit`, `object:type`, `tree`, `sparse:oid`, or `combine`. If using combined filters, both `combine` and all of the nested filter kinds must be allowed. Defaults to `uploadpackfilter.allow`",
+  },
+  {
+    name: "uploadpackfilter.allow",
+    description:
+      "Provides a default value for unspecified object filters (see: the below configuration variable). If set to `true`, this will also enable all filters which get added in the future. Defaults to `true`",
+  },
+  {
+    name: "uploadpackfilter.tree.maxDepth",
+    description:
+      "Only allow `--filter=tree:<n>` when `<n>` is no more than the value of `uploadpackfilter.tree.maxDepth`. If set, this also implies `uploadpackfilter.tree.allow=true`, unless this configuration variable had already been set. Has no effect if unset",
+  },
+  {
+    name: "url.<base>.insteadOf",
+    insertValue: "url.{cursor}.insteadOf",
+    description:
+      "Any URL that starts with this value will be rewritten to start, instead, with <base>. In cases where some site serves a large number of repositories, and serves them with multiple access methods, and some users need to use different access methods, this feature allows people to specify any of the equivalent URLs and have Git automatically rewrite the URL to the best alternative for the particular user, even for a never-before-seen repository on the site. When more than one insteadOf strings match a given URL, the longest match is used",
+  },
+  {
+    name: "url.<base>.pushInsteadOf",
+    insertValue: "url.{cursor}.pushInsteadOf",
+    description:
+      "Any URL that starts with this value will not be pushed to; instead, it will be rewritten to start with <base>, and the resulting URL will be pushed to. In cases where some site serves a large number of repositories, and serves them with multiple access methods, some of which do not allow push, this feature allows people to specify a pull-only URL and have Git automatically use an appropriate URL to push, even for a never-before-seen repository on the site. When more than one pushInsteadOf strings match a given URL, the longest match is used. If a remote has an explicit pushurl, Git will ignore this setting for that remote",
+  },
+  {
+    name: "user.signingKey",
+    description:
+      'If git-tag[1] or git-commit[1] is not selecting the key you want it to automatically when creating a signed tag or commit, you can override the default selection with this variable. This option is passed unchanged to gpg\'s --local-user parameter, so you may specify a key using any method that gpg supports. If gpg.format is set to `ssh` this can contain the path to either your private ssh key or the public key when ssh-agent is used. Alternatively it can contain a public key prefixed with `key::` directly (e.g.: "key::ssh-rsa XXXXXX identifier"). The private key needs to be available via ssh-agent. If not set git will call gpg.ssh.defaultKeyCommand (e.g.: "ssh-add -L") and try to use the first key available. For backward compatibility, a raw key which begins with "ssh-", such as "ssh-rsa XXXXXX identifier", is treated as "key::ssh-rsa XXXXXX identifier", but this form is deprecated; use the `key::` form instead',
+  },
+  {
+    name: "user.useConfigOnly",
+    description:
+      "Instruct Git to avoid trying to guess defaults for `user.email` and `user.name`, and instead retrieve the values only from the configuration. For example, if you have multiple email addresses and would like to use a different one for each repository, then with this configuration option set to `true` in the global config along with a name, Git will prompt you to set up an email before making new commits in a newly cloned repository. Defaults to `false`",
+  },
+  {
+    name: "versionsort.prereleaseSuffix",
+    description:
+      "Deprecated alias for `versionsort.suffix`. Ignored if `versionsort.suffix` is set",
+    deprecated: true,
+    hidden: true,
+  },
+  {
+    name: "versionsort.suffix",
+    description:
+      'Even when version sort is used in git-tag[1], tagnames with the same base version but different suffixes are still sorted lexicographically, resulting e.g. in prerelease tags appearing after the main release (e.g. "1.0-rc1" after "1.0"). This variable can be specified to determine the sorting order of tags with different suffixes',
+  },
+  {
+    name: "web.browser",
+    description:
+      "Specify a web browser that may be used by some commands. Currently only git-instaweb[1] and git-help[1] may use it",
+  },
+  {
+    name: "worktree.guessRemote",
+    description:
+      'If no branch is specified and neither `-b` nor `-B` nor `--detach` is used, then `git worktree add` defaults to creating a new branch from HEAD. If `worktree.guessRemote` is set to true, `worktree add` tries to find a remote-tracking branch whose name uniquely matches the new branch name. If such a branch exists, it is checked out and set as "upstream" for the new branch. If no such match can be found, it falls back to creating a new branch from the current HEAD',
+  },
 ];
 
 const addOptions: Fig.Option[] = [
-	{
-		name: ["-n", "--dry-run"],
-		description:
-			"Don’t actually add the file(s), just show if they exist and/or will be ignored",
-	},
-	{ name: ["-v", "--verbose"], description: "Be verbose" },
-	{
-		name: ["-f", "--force"],
-		description: "Allow adding otherwise ignored files",
-	},
-	{
-		name: ["-i", "--interactive"],
-		description:
-			"Add modified contents in the working tree interactively to the index. Optional path arguments may be supplied to limit operation to a subset of the working tree. See “Interactive mode” for details",
-	},
-	{
-		name: ["-p", "--patch"],
-		description:
-			"Interactively choose hunks of patch between the index and the work tree and add them to the index. This gives the user a chance to review the difference before adding modified contents to the index",
-	},
-	{
-		name: ["-e", "--edit"],
-		description:
-			"Open the diff vs. the index in an editor and let the user edit it. After the editor was closed, adjust the hunk headers and apply the patch to the index",
-	},
-	{
-		name: ["-u", "--update"],
-		description:
-			"Update the index just where it already has an entry matching <pathspec>. This removes as well as modifies index entries to match the working tree, but adds no new files",
-	},
-	{
-		name: ["-A", "--all", "--no-ignore-removal"],
-		description:
-			"Update the index not only where the working tree has a file matching <pathspec> but also where the index already has an entry. This adds, modifies, and removes index entries to match the working tree",
-	},
-	{
-		name: ["--no-all", "--ignore-removal"],
-		description:
-			"Update the index by adding new files that are unknown to the index and files modified in the working tree, but ignore files that have been removed from the working tree. This option is a no-op when no <pathspec> is used",
-	},
-	{
-		name: ["-N", "--intent-to-add"],
-		description:
-			"Record only the fact that the path will be added later. An entry for the path is placed in the index with no content. This is useful for, among other things, showing the unstaged content of such files with git diff and committing them with git commit -a",
-	},
-	{
-		name: "--refresh",
-		description:
-			"Don’t add the file(s), but only refresh their stat() information in the index",
-	},
-	{
-		name: "--ignore-errors",
-		description:
-			"If some files could not be added because of errors indexing them, do not abort the operation, but continue adding the others. The command shall still exit with non-zero status. The configuration variable add.ignoreErrors can be set to true to make this the default behaviour",
-	},
-	{
-		name: "--ignore-missing",
-		description:
-			"This option can only be used together with --dry-run. By using this option the user can check if any of the given files would be ignored, no matter if they are already present in the work tree or not",
-	},
-	{
-		name: "--no-warn-embedded-repo",
-		description:
-			"By default, git add will warn when adding an embedded repository to the index without using git submodule add to create an entry in .gitmodules. This option will suppress the warning (e.g., if you are manually performing operations on submodules)",
-	},
-	{
-		name: "--renormalize",
-		description:
-			"Apply the 'clean' process freshly to all tracked files to forcibly add them again to the index. This is useful after changing core.autocrlf configuration or the text attribute in order to correct files added with wrong CRLF/LF line endings. This option implies -u",
-	},
-	{
-		name: "--chmod",
-		description:
-			"Override the executable bit of the added files. The executable bit is only changed in the index, the files on disk are left unchanged",
-		requiresSeparator: true,
-		args: {
-			suggestions: ["+x", "-x"],
-		},
-	},
-	{
-		name: "--pathspec-from-file",
-		description:
-			"Pathspec is passed in <file> instead of commandline args. If <file> is exactly - then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable core.quotePath (see git-config[1]). See also --pathspec-file-nul and global --literal-pathspecs",
-		args: {
-			name: "File",
-			description: "File with pathspec",
-			template: "filepaths",
-		},
-	},
-	{
-		name: "--pathspec-file-nul",
-		description:
-			"Only meaningful with --pathspec-from-file. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)",
-	},
-	{
-		name: "--",
-		description:
-			"This option can be used to separate command-line options from the list of files",
-	},
+  {
+    name: ["-n", "--dry-run"],
+    description:
+      "Don’t actually add the file(s), just show if they exist and/or will be ignored",
+  },
+  { name: ["-v", "--verbose"], description: "Be verbose" },
+  {
+    name: ["-f", "--force"],
+    description: "Allow adding otherwise ignored files",
+  },
+  {
+    name: ["-i", "--interactive"],
+    description:
+      "Add modified contents in the working tree interactively to the index. Optional path arguments may be supplied to limit operation to a subset of the working tree. See “Interactive mode” for details",
+  },
+  {
+    name: ["-p", "--patch"],
+    description:
+      "Interactively choose hunks of patch between the index and the work tree and add them to the index. This gives the user a chance to review the difference before adding modified contents to the index",
+  },
+  {
+    name: ["-e", "--edit"],
+    description:
+      "Open the diff vs. the index in an editor and let the user edit it. After the editor was closed, adjust the hunk headers and apply the patch to the index",
+  },
+  {
+    name: ["-u", "--update"],
+    description:
+      "Update the index just where it already has an entry matching <pathspec>. This removes as well as modifies index entries to match the working tree, but adds no new files",
+  },
+  {
+    name: ["-A", "--all", "--no-ignore-removal"],
+    description:
+      "Update the index not only where the working tree has a file matching <pathspec> but also where the index already has an entry. This adds, modifies, and removes index entries to match the working tree",
+  },
+  {
+    name: ["--no-all", "--ignore-removal"],
+    description:
+      "Update the index by adding new files that are unknown to the index and files modified in the working tree, but ignore files that have been removed from the working tree. This option is a no-op when no <pathspec> is used",
+  },
+  {
+    name: ["-N", "--intent-to-add"],
+    description:
+      "Record only the fact that the path will be added later. An entry for the path is placed in the index with no content. This is useful for, among other things, showing the unstaged content of such files with git diff and committing them with git commit -a",
+  },
+  {
+    name: "--refresh",
+    description:
+      "Don’t add the file(s), but only refresh their stat() information in the index",
+  },
+  {
+    name: "--ignore-errors",
+    description:
+      "If some files could not be added because of errors indexing them, do not abort the operation, but continue adding the others. The command shall still exit with non-zero status. The configuration variable add.ignoreErrors can be set to true to make this the default behaviour",
+  },
+  {
+    name: "--ignore-missing",
+    description:
+      "This option can only be used together with --dry-run. By using this option the user can check if any of the given files would be ignored, no matter if they are already present in the work tree or not",
+  },
+  {
+    name: "--no-warn-embedded-repo",
+    description:
+      "By default, git add will warn when adding an embedded repository to the index without using git submodule add to create an entry in .gitmodules. This option will suppress the warning (e.g., if you are manually performing operations on submodules)",
+  },
+  {
+    name: "--renormalize",
+    description:
+      "Apply the 'clean' process freshly to all tracked files to forcibly add them again to the index. This is useful after changing core.autocrlf configuration or the text attribute in order to correct files added with wrong CRLF/LF line endings. This option implies -u",
+  },
+  {
+    name: "--chmod",
+    description:
+      "Override the executable bit of the added files. The executable bit is only changed in the index, the files on disk are left unchanged",
+    requiresSeparator: true,
+    args: {
+      suggestions: ["+x", "-x"],
+    },
+  },
+  {
+    name: "--pathspec-from-file",
+    description:
+      "Pathspec is passed in <file> instead of commandline args. If <file> is exactly - then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable core.quotePath (see git-config[1]). See also --pathspec-file-nul and global --literal-pathspecs",
+    args: {
+      name: "File",
+      description: "File with pathspec",
+      template: "filepaths",
+    },
+  },
+  {
+    name: "--pathspec-file-nul",
+    description:
+      "Only meaningful with --pathspec-from-file. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)",
+  },
+  {
+    name: "--",
+    description:
+      "This option can be used to separate command-line options from the list of files",
+  },
 ];
 
 const headSuggestions = [
-	{
-		name: "HEAD",
-		icon: "🔻",
-		description: "The most recent commit",
-	},
-	{
-		name: "HEAD~<N>",
-		description: "A specific number of commits",
-		insertValue: "HEAD~",
-	},
+  {
+    name: "HEAD",
+    icon: "🔻",
+    description: "The most recent commit",
+  },
+  {
+    name: "HEAD~<N>",
+    description: "A specific number of commits",
+    insertValue: "HEAD~",
+  },
 ];
 
 /** Git finds these commands as "git-<name>" on your PATH */
 const optionalCommands: Record<string, Omit<Fig.Subcommand, "name">> = {
-	open: {
-		description: "Open in your browser",
-		options: [
-			{
-				name: ["-c", "--commit"],
-				description: "Open current commit",
-			},
-			{
-				name: ["-i", "--issue"],
-				description: "Open issues page",
-			},
-			{
-				name: ["-s", "--suffix"],
-				description: "Append this suffix",
-				args: {
-					name: "string",
-				},
-			},
-			{
-				name: ["-p", "--print"],
-				description: "Just print the URL",
-			},
-		],
-	},
-	recent: {
-		description: "Show recent local branches",
-		options: [
-			{
-				name: "-n",
-				description: "Specify a number of branches to show",
-				args: {
-					name: "int",
-				},
-			},
-		],
-	},
-	flow: {
-		description: "Extensions to follow Vincent Driessen's branching model",
-		loadSpec: "git-flow",
-	},
+  open: {
+    description: "Open in your browser",
+    options: [
+      {
+        name: ["-c", "--commit"],
+        description: "Open current commit",
+      },
+      {
+        name: ["-i", "--issue"],
+        description: "Open issues page",
+      },
+      {
+        name: ["-s", "--suffix"],
+        description: "Append this suffix",
+        args: {
+          name: "string",
+        },
+      },
+      {
+        name: ["-p", "--print"],
+        description: "Just print the URL",
+      },
+    ],
+  },
+  recent: {
+    description: "Show recent local branches",
+    options: [
+      {
+        name: "-n",
+        description: "Specify a number of branches to show",
+        args: {
+          name: "int",
+        },
+      },
+    ],
+  },
+  flow: {
+    description: "Extensions to follow Vincent Driessen's branching model",
+    loadSpec: "git-flow",
+  },
 };
 
 const daemonServices: Fig.Suggestion[] = [
-	{
-		name: "upload-pack",
-		description:
-			"This serves git fetch-pack and git ls-remote clients. It is enabled by default, but a repository can disable it by setting daemon.uploadpack configuration item to false",
-	},
-	{
-		name: "upload-archive",
-		description:
-			"This serves git archive --remote. It is disabled by default, but a repository can enable it by setting daemon.uploadarch configuration item to true",
-	},
-	{
-		name: "receive-pack",
-		description:
-			"This serves git send-pack clients, allowing anonymous push. It is disabled by default, as there is no authentication in the protocol (in other words, anybody can push anything into the repository, including removal of refs). This is solely meant for a closed LAN setting where everybody is friendly. This service can be enabled by setting daemon.receivepack configuration item to true",
-	},
+  {
+    name: "upload-pack",
+    description:
+      "This serves git fetch-pack and git ls-remote clients. It is enabled by default, but a repository can disable it by setting daemon.uploadpack configuration item to false",
+  },
+  {
+    name: "upload-archive",
+    description:
+      "This serves git archive --remote. It is disabled by default, but a repository can enable it by setting daemon.uploadarch configuration item to true",
+  },
+  {
+    name: "receive-pack",
+    description:
+      "This serves git send-pack clients, allowing anonymous push. It is disabled by default, as there is no authentication in the protocol (in other words, anybody can push anything into the repository, including removal of refs). This is solely meant for a closed LAN setting where everybody is friendly. This service can be enabled by setting daemon.receivepack configuration item to true",
+  },
 ];
 
 const completionSpec: Fig.Spec = {
-	name: "git",
-	description: "Distributed version control system",
-	generateSpec: async (_, executeShellCommand) => {
-		const { stdout } = await executeShellCommand({
-			command: "git",
-			args: ["help", "-a"],
-		});
-		const lines = stdout.trim().split("\n");
-		const start = lines.findIndex((val) => val.match(/external commands/i));
-		const commands: string[] = [];
-		for (let i = start + 1; i < lines.length; i += 1) {
-			const line = lines[i].trim();
-			if (!line) {
-				break;
-			}
-			const command = line.split(/\s+/)[0];
-			commands.push(command);
-		}
-		return {
-			name: "git",
-			subcommands: commands.map((name) => ({
-				name,
-				...(optionalCommands[name] ?? { description: `Run git-${name}` }),
-			})),
-		};
-	},
-	args: {
-		name: "alias",
-		description: "Custom user defined git alias",
-		parserDirectives: {
-			alias: async (token, exec) => {
-				const { stdout, status } = await exec({
-					command: "git",
-					args: ["config", "--get", `alias.${token}`],
-				});
-				if (status !== 0) {
-					throw new Error("Failed parsing alias");
-				}
-				return stdout;
-			},
-		},
-		isOptional: true,
-		generators: gitGenerators.aliases,
-	},
-	options: [
-		{
-			name: "--version",
-			description: "Output version",
-		},
-		{
-			name: "--help",
-			description: "Output help",
-		},
-		{
-			name: "-C",
-			args: {
-				name: "path",
-				template: "folders",
-			},
-			description: "Run as if git was started in <path>",
-		},
-		{
-			name: "-c",
-			insertValue: "-c {cursor}",
-			description: "Pass a config parameter to the command",
-			args: {
-				name: "name=value",
-			},
-		},
-		{
-			name: "--exec-path",
-			args: {
-				name: "path",
-				isOptional: true,
-				template: "folders",
-			},
-			description: "Get or set GIT_EXEC_PATH for core Git programs",
-		},
-		{
-			name: "--html-path",
-			description: "Print Git’s HTML documentation path",
-		},
-		{
-			name: "--man-path",
-			description: "Print the manpath for this version of Git",
-		},
-		{
-			name: "--info-path",
-			description: "Print the info path documenting this version of Git",
-		},
-		{
-			name: ["-p", "--paginate"],
-			description: "Pipe output into `less` or custom $PAGER",
-		},
-		{
-			name: "--no-pager",
-			description: "Do not pipe Git output into a pager",
-		},
-		{
-			name: "--no-replace-objects",
-			description: "Do not use replacement refs",
-		},
-		{
-			name: "--no-optional-locks",
-			description: "Do not perform optional operations that require lock files",
-		},
-		{
-			name: "--bare",
-			description: "Treat the repository as a bare repository",
-		},
-		{
-			name: "--git-dir",
-			args: {
-				name: "path",
-				template: "folders",
-			},
-			description: "Set the path to the repository dir (`.git`)",
-		},
-		{
-			name: "--work-tree",
-			args: {
-				name: "path",
-				template: "folders",
-			},
-			description: "Set working tree path",
-		},
-		{
-			name: "--namespace",
-			args: {
-				name: "name",
-			},
-			description: "Set the Git namespace",
-		},
-	],
-	subcommands: [
-		{
-			name: "archive",
-			description: "Create an archive of files from a named tree",
-			args: [
-				{
-					name: "tree-ish",
-					generators: gitGenerators.treeish,
-				},
-				{
-					name: "path",
-					template: "filepaths",
-					isVariadic: true,
-					isOptional: true,
-				},
-			],
-			options: [
-				{
-					name: "--format",
-					description: "Archive format",
-					args: {
-						name: "fmt",
-						suggestions: ["tar", "zip"],
-					},
-				},
-				{
-					name: "--prefix",
-					description: "Prepend prefix to each pathname in the archive",
-					args: {
-						name: "prefix",
-					},
-				},
-				{
-					name: "--add-file",
-					description: "Add untracked file to archive",
-					args: {
-						name: "file",
-						template: "filepaths",
-					},
-				},
-				{
-					name: ["-o", "--output"],
-					description: "Write the archive to this file",
-					args: {
-						name: "file",
-						template: "filepaths",
-					},
-				},
-				{
-					name: "--worktree-attributes",
-					description: "Read .gitattributes in working directory",
-				},
-				{
-					name: ["-v", "--verbose"],
-					description: "Report archived files on stderr",
-				},
-				{
-					name: "-NUM",
-					insertValue: "-",
-					description: "Set compression level",
-				},
-				{
-					name: ["-l", "--list"],
-					description: "List supported archive formats",
-				},
-				{
-					name: "--remote",
-					description: "Retrieve the archive from remote repository <repo>",
-					args: {
-						name: "repo",
-					},
-				},
-				{
-					name: "--exec",
-					description: "Path to the remote git-upload-archive command",
-					args: {
-						name: "command",
-					},
-				},
-			],
-		},
-		{
-			name: "blame",
-			args: {
-				name: "file",
-				template: "filepaths",
-			},
-			options: [
-				{
-					name: "--incremental",
-					description: "Show blame entries as we find them, incrementally",
-				},
-				{
-					name: "-b",
-					description:
-						"Do not show object names of boundary commits (Default: off)",
-				},
-				{
-					name: "--root",
-					description: "Do not treat root commits as boundaries (Default: off)",
-				},
-				{
-					name: "--show-stats",
-					description: "Show work cost statistics",
-				},
-				{
-					name: "--progress",
-					description: "Force progress reporting",
-				},
-				{
-					name: "--score-debug",
-					description: "Show output score for blame entries",
-				},
-				{
-					name: ["-f", "--show-name"],
-					description: "Show original filename (Default: auto)",
-				},
-				{
-					name: ["-n", "--show-number"],
-					description: "Show original linenumber (Default: off)",
-				},
-				{
-					name: ["-p", "--porcelain"],
-					description: "Show in a format designed for machine consumption",
-				},
-				{
-					name: "--line-porcelain",
-					description: "Show porcelain format with per-line commit information",
-				},
-				{
-					name: "-c",
-					description:
-						"Use the same output mode as git-annotate (Default: off)",
-				},
-				{
-					name: "-t",
-					description: "Show raw timestamp (Default: off)",
-				},
-				{
-					name: "-l",
-					description: "Show long commit SHA1 (Default: off)",
-				},
-				{
-					name: "-s",
-					description: "Suppress author name and timestamp (Default: off)",
-				},
-				{
-					name: ["-e", "--show-email"],
-					description: "Show author email instead of name (Default: off)",
-				},
-				{
-					name: "-w",
-					description: "Ignore whitespace differences",
-				},
-				{
-					name: "--ignore-rev",
-					description: "Ignore <rev> when blaming",
-					args: {
-						name: "rev",
-						generators: gitGenerators.revs,
-					},
-				},
-				{
-					name: "--ignore-revs-file",
-					description: "Ignore revisions from <file>",
-					args: {
-						name: "file",
-						template: "filepaths",
-					},
-				},
-				{
-					name: "--color-lines",
-					description:
-						"Color redundant metadata from previous line differently",
-				},
-				{ name: "--color-by-age", description: "Color lines by age" },
-				{
-					name: "--minimal",
-					description: "Spend extra cycles to find better match",
-				},
-				{
-					name: "-S",
-					description:
-						"Use revisions from <file> instead of calling git-rev-list",
-					args: {
-						name: "file",
-						template: "filepaths",
-					},
-				},
-				{
-					name: "--contents",
-					description: "Use <file>'s contents as the final image",
-					args: {
-						name: "file",
-						template: "filepaths",
-					},
-				},
-				{
-					name: "-C",
-					insertValue: "-C{cursor}",
-					description: "Find line copies within and across files",
-				},
-				{
-					name: "-M",
-					insertValue: "-M{cursor}",
-					description: "Find line movements within and across files",
-				},
-				{
-					name: "-L",
-					description:
-						"Process only line range <start>,<end> or function :<funcname>",
-					args: {
-						name: "start,end",
-					},
-				},
-				{
-					name: "--abbrev",
-					requiresSeparator: true,
-					description: "Use <n> digits to display object names",
-					args: {
-						name: "n",
-						isOptional: true,
-					},
-				},
-			],
-		},
-		{
-			name: "commit",
-			description: "Record changes to the repository",
-			args: {
-				name: "pathspec",
-				isOptional: true,
-				isVariadic: true,
-				template: "filepaths",
-			},
-			options: [
-				{
-					name: ["-m", "--message"],
-					// insertValue: "-m '{cursor}'",
-					description: "Use the given message as the commit message",
-					args: {
-						name: "message",
-						// 		generators: ai({
-						// 			name: "git commit -m",
-						// 			prompt: async ({ executeCommand }) => {
-						// 				const { stdout } = await executeCommand({
-						// 					command: "git",
-						// 					args: [
-						// 						"log",
-						// 						"--pretty=format:%s",
-						// 						"--abbrev-commit",
-						// 						"--max-count=20",
-						// 					],
-						// 				});
+  name: "git",
+  description: "The stupid content tracker",
+  generateSpec: async (_, executeShellCommand) => {
+    const { stdout } = await executeShellCommand({
+      command: "git",
+      args: ["help", "-a"],
+    });
+    const lines = stdout.trim().split("\n");
+    const start = lines.findIndex((val) => val.match(/external commands/i));
+    const commands: string[] = [];
+    for (let i = start + 1; i < lines.length; i += 1) {
+      const line = lines[i].trim();
+      if (!line) {
+        break;
+      }
+      const command = line.split(/\s+/)[0];
+      commands.push(command);
+    }
+    return {
+      name: "git",
+      subcommands: commands.map((name) => ({
+        name,
+        ...(optionalCommands[name] ?? { description: `Run git-${name}` }),
+      })),
+    };
+  },
+  args: {
+    name: "alias",
+    description: "Custom user defined git alias",
+    parserDirectives: {
+      alias: async (token, exec) => {
+        const { stdout, status } = await exec({
+          command: "git",
+          args: ["config", "--get", `alias.${token}`],
+        });
+        if (status !== 0) {
+          throw new Error("Failed parsing alias");
+        }
+        return stdout;
+      },
+    },
+    isOptional: true,
+    generators: gitGenerators.aliases,
+  },
+  options: [
+    {
+      name: "--version",
+      description: "Output version",
+    },
+    {
+      name: "--help",
+      description: "Output help",
+    },
+    {
+      name: "-C",
+      args: {
+        name: "path",
+        template: "folders",
+      },
+      description: "Run as if git was started in <path>",
+    },
+    {
+      name: "-c",
+      insertValue: "-c {cursor}",
+      description: "Pass a config parameter to the command",
+      args: {
+        name: "name=value",
+      },
+    },
+    {
+      name: "--exec-path",
+      args: {
+        name: "path",
+        isOptional: true,
+        template: "folders",
+      },
+      description: "Get or set GIT_EXEC_PATH for core Git programs",
+    },
+    {
+      name: "--html-path",
+      description: "Print Git’s HTML documentation path",
+    },
+    {
+      name: "--man-path",
+      description: "Print the manpath for this version of Git",
+    },
+    {
+      name: "--info-path",
+      description: "Print the info path documenting this version of Git",
+    },
+    {
+      name: ["-p", "--paginate"],
+      description: "Pipe output into `less` or custom $PAGER",
+    },
+    {
+      name: "--no-pager",
+      description: "Do not pipe Git output into a pager",
+    },
+    {
+      name: "--no-replace-objects",
+      description: "Do not use replacement refs",
+    },
+    {
+      name: "--no-optional-locks",
+      description: "Do not perform optional operations that require lock files",
+    },
+    {
+      name: "--bare",
+      description: "Treat the repository as a bare repository",
+    },
+    {
+      name: "--git-dir",
+      args: {
+        name: "path",
+        template: "folders",
+      },
+      description: "Set the path to the repository dir (`.git`)",
+    },
+    {
+      name: "--work-tree",
+      args: {
+        name: "path",
+        template: "folders",
+      },
+      description: "Set working tree path",
+    },
+    {
+      name: "--namespace",
+      args: {
+        name: "name",
+      },
+      description: "Set the Git namespace",
+    },
+  ],
+  subcommands: [
+    {
+      name: "archive",
+      description: "Create an archive of files from a named tree",
+      args: [
+        {
+          name: "tree-ish",
+          generators: gitGenerators.treeish,
+        },
+        {
+          name: "path",
+          template: "filepaths",
+          isVariadic: true,
+          isOptional: true,
+        },
+      ],
+      options: [
+        {
+          name: "--format",
+          description: "Archive format",
+          args: {
+            name: "fmt",
+            suggestions: ["tar", "zip"],
+          },
+        },
+        {
+          name: "--prefix",
+          description: "Prepend prefix to each pathname in the archive",
+          args: {
+            name: "prefix",
+          },
+        },
+        {
+          name: "--add-file",
+          description: "Add untracked file to archive",
+          args: {
+            name: "file",
+            template: "filepaths",
+          },
+        },
+        {
+          name: ["-o", "--output"],
+          description: "Write the archive to this file",
+          args: {
+            name: "file",
+            template: "filepaths",
+          },
+        },
+        {
+          name: "--worktree-attributes",
+          description: "Read .gitattributes in working directory",
+        },
+        {
+          name: ["-v", "--verbose"],
+          description: "Report archived files on stderr",
+        },
+        {
+          name: "-NUM",
+          insertValue: "-",
+          description: "Set compression level",
+        },
+        {
+          name: ["-l", "--list"],
+          description: "List supported archive formats",
+        },
+        {
+          name: "--remote",
+          description: "Retrieve the archive from remote repository <repo>",
+          args: {
+            name: "repo",
+          },
+        },
+        {
+          name: "--exec",
+          description: "Path to the remote git-upload-archive command",
+          args: {
+            name: "command",
+          },
+        },
+      ],
+    },
+    {
+      name: "blame",
+      args: {
+        name: "file",
+        template: "filepaths",
+      },
+      options: [
+        {
+          name: "--incremental",
+          description: "Show blame entries as we find them, incrementally",
+        },
+        {
+          name: "-b",
+          description:
+            "Do not show object names of boundary commits (Default: off)",
+        },
+        {
+          name: "--root",
+          description: "Do not treat root commits as boundaries (Default: off)",
+        },
+        {
+          name: "--show-stats",
+          description: "Show work cost statistics",
+        },
+        {
+          name: "--progress",
+          description: "Force progress reporting",
+        },
+        {
+          name: "--score-debug",
+          description: "Show output score for blame entries",
+        },
+        {
+          name: ["-f", "--show-name"],
+          description: "Show original filename (Default: auto)",
+        },
+        {
+          name: ["-n", "--show-number"],
+          description: "Show original linenumber (Default: off)",
+        },
+        {
+          name: ["-p", "--porcelain"],
+          description: "Show in a format designed for machine consumption",
+        },
+        {
+          name: "--line-porcelain",
+          description: "Show porcelain format with per-line commit information",
+        },
+        {
+          name: "-c",
+          description:
+            "Use the same output mode as git-annotate (Default: off)",
+        },
+        {
+          name: "-t",
+          description: "Show raw timestamp (Default: off)",
+        },
+        {
+          name: "-l",
+          description: "Show long commit SHA1 (Default: off)",
+        },
+        {
+          name: "-s",
+          description: "Suppress author name and timestamp (Default: off)",
+        },
+        {
+          name: ["-e", "--show-email"],
+          description: "Show author email instead of name (Default: off)",
+        },
+        {
+          name: "-w",
+          description: "Ignore whitespace differences",
+        },
+        {
+          name: "--ignore-rev",
+          description: "Ignore <rev> when blaming",
+          args: {
+            name: "rev",
+            generators: gitGenerators.revs,
+          },
+        },
+        {
+          name: "--ignore-revs-file",
+          description: "Ignore revisions from <file>",
+          args: {
+            name: "file",
+            template: "filepaths",
+          },
+        },
+        {
+          name: "--color-lines",
+          description:
+            "Color redundant metadata from previous line differently",
+        },
+        { name: "--color-by-age", description: "Color lines by age" },
+        {
+          name: "--minimal",
+          description: "Spend extra cycles to find better match",
+        },
+        {
+          name: "-S",
+          description:
+            "Use revisions from <file> instead of calling git-rev-list",
+          args: {
+            name: "file",
+            template: "filepaths",
+          },
+        },
+        {
+          name: "--contents",
+          description: "Use <file>'s contents as the final image",
+          args: {
+            name: "file",
+            template: "filepaths",
+          },
+        },
+        {
+          name: "-C",
+          insertValue: "-C{cursor}",
+          description: "Find line copies within and across files",
+        },
+        {
+          name: "-M",
+          insertValue: "-M{cursor}",
+          description: "Find line movements within and across files",
+        },
+        {
+          name: "-L",
+          description:
+            "Process only line range <start>,<end> or function :<funcname>",
+          args: {
+            name: "start,end",
+          },
+        },
+        {
+          name: "--abbrev",
+          requiresSeparator: true,
+          description: "Use <n> digits to display object names",
+          args: {
+            name: "n",
+            isOptional: true,
+          },
+        },
+      ],
+    },
+    {
+      name: "commit",
+      description: "Record changes to the repository",
+      args: {
+        name: "pathspec",
+        isOptional: true,
+        isVariadic: true,
+        template: "filepaths",
+      },
+      options: [
+        {
+          name: ["-m", "--message"],
+          // insertValue: "-m '{cursor}'",
+          description: "Use the given message as the commit message",
+          args: {
+            name: "message",
+            generators: ai({
+              name: "git commit -m",
+              prompt: async ({ executeCommand }: any) => {
+                const { stdout } = await executeCommand({
+                  command: "git",
+                  args: [
+                    "log",
+                    "--pretty=format:%s",
+                    "--abbrev-commit",
+                    "--max-count=20",
+                  ],
+                });
 
-						// 				return (
-						// 					'Generate a git commit message summary based on this git diff, the "summary" must be no more ' +
-						// 					"than 70-75 characters, and it must describe both what the patch changes, as well as why the " +
-						// 					`patch might be necessary.\n\nHere are some examples from the repo:\n${stdout}`
-						// 				);
-						// 			},
-						// 			message: async ({ executeCommand }) =>
-						// 				(
-						// 					await executeCommand({
-						// 						command: "git",
-						// 						args: ["diff", "--staged"],
-						// 					})
-						// 				).stdout,
-						// 			splitOn: "\n",
-						// 		}),
-						// 	},
-					},
-				},
-				{
-					name: ["-a", "--all"],
-					description: "Stage all modified and deleted paths",
-				},
-				{
-					name: "-am",
-					insertValue: "-am '{cursor}'",
-					description: "Stage all and use given text as commit message",
-					args: {
-						name: "message",
-					},
-				},
-				{
-					name: ["-v", "--verbose"],
-					description: "Show unified diff of all file changes",
-				},
-				{
-					name: ["-p", "--patch"],
-					description:
-						"Use the interactive patch selection interface to chose which changes to commi",
-				},
-				{
-					name: ["-C", "--reuse-message"],
-					description:
-						"Take an existing commit object, and reuse the log message and the authorship",
-					args: {
-						name: "commit",
-						generators: gitGenerators.commits,
-					},
-				},
-				{
-					name: ["-c", "--reedit-message"],
-					description:
-						"Like -C, but with -c the editor is invoked, so that the user can further edit",
-					args: {
-						name: "commit",
-						generators: gitGenerators.commits,
-					},
-				},
-				{
-					name: "--fixup",
-					description:
-						"Construct a commit message for use with rebase --autosquash. The commit messa",
-					args: {
-						name: "commit",
-						generators: gitGenerators.commits,
-					},
-				},
-				{
-					name: "--squash",
-					description:
-						"Construct a commit message for use with rebase --autosquash. The commit messa",
-					args: {
-						name: "commit",
-						generators: gitGenerators.commits,
-					},
-				},
-				{
-					name: "--reset-author",
-					description:
-						"When used with -C/-c/--amend options, or when committing after a conflicting",
-				},
-				{
-					name: "--short",
-					description:
-						"When doing a dry-run, give the output in the short-format. See git-status[1]",
-				},
-				{
-					name: "--branch",
-					description: "Show the branch and tracking info even in short-format",
-				},
-				{
-					name: "--porcelain",
-					description:
-						"When doing a dry-run, give the output in a porcelain-ready format. See git-st",
-				},
-				{
-					name: "--long",
-					description:
-						"When doing a dry-run, give the output in the long-format. Implies --dry-run",
-				},
-				{
-					name: ["-z", "--null"],
-					description:
-						"When showing short or porcelain status output, print the filename verbatim an",
-				},
-				{
-					name: ["-F", "--file"],
-					description:
-						"Take the commit message from the given file. Use - to read the message from t",
-					args: {
-						name: "file",
-						template: "filepaths",
-					},
-				},
-				{
-					name: "--author",
-					description:
-						"Override the commit author. Specify an explicit author using the standard A U",
-					args: {
-						name: "author",
-					},
-				},
-				{
-					name: "--date",
-					description: "Override the author date used in the commit",
-					args: {
-						name: "date",
-					},
-				},
-				{
-					name: ["-t", "--template"],
-					description:
-						"When editing the commit message, start the editor with the contents in the gi",
-					args: {
-						name: "file",
-						template: "filepaths",
-					},
-				},
-				{
-					name: ["-s", "--signoff"],
-					description:
-						"Add a Signed-off-by trailer by the committer at the end of the commit log mes",
-				},
-				{
-					name: "--no-signoff",
-					description:
-						"Don't add a Signed-off-by trailer by the committer at the end of the commit l",
-				},
-				{
-					name: ["-n", "--no-verify"],
-					description:
-						"This option bypasses the pre-commit and commit-msg hooks. See also githooks[5]",
-				},
-				{
-					name: "--allow-empty",
-					description:
-						"Usually recording a commit that has the exact same tree as its sole parent co",
-				},
-				{
-					name: "--allow-empty-message",
-					description:
-						"Like --allow-empty this command is primarily for use by foreign SCM interface",
-				},
-				{
-					name: "--cleanup",
-					description:
-						"This option determines how the supplied commit message should be cleaned up b",
-					args: {
-						name: "mode",
-						description:
-							"Determines how the supplied commit messaged should be cleaned up before committing",
-						suggestions: [
-							{
-								name: "strip",
-								description:
-									"Strip leading and trailing empty lines, trailing whitepace, commentary and collapse consecutive empty lines",
-							},
-							{
-								name: "whitespace",
-								description: "Same as strip except #commentary is not removed",
-							},
-							{
-								name: "verbatim",
-								description: "Do not change the message at all",
-							},
-							{
-								name: "scissors",
-								description:
-									"Same as whitespace except that everything from (and including) the line found below is truncated",
-							},
-							{
-								name: "default",
-								description:
-									"Same as strip if the message is to be edited. Otherwise whitespace",
-							},
-						],
-					},
-				},
-				{
-					name: ["-e", "--edit"],
-					description:
-						"The message taken from file with -F, command line with -m, and from commit ob",
-				},
-				{
-					name: "--no-edit",
-					description:
-						"Use the selected commit message without launching an editor. For example, git",
-				},
-				{
-					name: "--amend",
-					description:
-						"Replace the tip of the current branch by creating a new commit. The recorded",
-				},
-				{
-					name: "--no-post-rewrite",
-					description: "Bypass the post-rewrite hook",
-				},
-				{
-					name: ["-i", "--include"],
-					description:
-						"Before making a commit out of staged contents so far, stage the contents of p",
-				},
-				{
-					name: ["-o", "--only"],
-					description:
-						"Make a commit by taking the updated working tree contents of the paths specif",
-				},
-				{
-					name: "--pathspec-from-file",
-					description:
-						"Pathspec is passed in instead of commandline args. If is exactly - then stand",
-					args: {
-						name: "file",
-						template: "filepaths",
-					},
-				},
-				{
-					name: "--pathspec-file-nul",
-					description:
-						"Only meaningful with --pathspec-from-file. Pathspec elements are separated wi",
-				},
-				{
-					name: ["-u", "--untracked-files"],
-					description:
-						"Show untracked files. The mode parameter is optional (defaults to all), and i",
-					args: {
-						name: "mode",
-						suggestions: ["no", "normal", "all"],
-						isOptional: true,
-					},
-				},
-				{
-					name: ["-q", "--quiet"],
-					description: "Suppress commit summary message",
-				},
-				{
-					name: "--dry-run",
-					description:
-						"Do not create a commit, but show a list of paths that are to be committed, pa",
-				},
-				{
-					name: "--status",
-					description:
-						"Include the output of git-status[1] in the commit message template when using",
-				},
-				{
-					name: "--no-status",
-					description:
-						"Do not include the output of git-status[1] in the commit message template whe",
-				},
-				{
-					name: ["-S", "--gpg-sign"],
-					description:
-						"GPG-sign commits. The keyid argument is optional and defaults to the committe",
-					args: {
-						name: "keyid",
-						isOptional: true,
-					},
-				},
-				{
-					name: "--no-gpg-sign",
-					description: "Dont GPG-sign commits",
-				},
-				{
-					name: "--",
-					description: "Do not interpret any more arguments as options",
-				},
-			],
-		},
-		{
-			name: "config",
-			description: "Change Git configuration",
-			options: [
-				{
-					name: "--local",
-					description: "Default: write to the repository .git/config file",
-					args: {
-						isVariadic: true,
-						suggestions: [
-							{
-								name: "user.name",
-								description: "Set config for username",
-								insertValue: "user.name '{cursor}'",
-							},
-							{
-								name: "user.email",
-								description: "Set config for email",
-								insertValue: "user.email '{cursor}'",
-							},
-						],
-					},
-				},
-				{
-					name: "--global",
-					description:
-						"For writing options: write to global ~/.gitconfig file rather than the repository .git/config",
-				},
-				{
-					name: "--replace-all",
-					description:
-						"Default behavior is to replace at most one line. This replaces all lines matc",
-				},
-				{
-					name: "--add",
-					description:
-						"Adds a new line to the option without altering any existing values. This is t",
-				},
-				{
-					name: "--get",
-					description:
-						"Get the value for a given key (optionally filtered by a regex matching the va",
-				},
-				{
-					name: "--get-all",
-					description:
-						"Like get, but returns all values for a multi-valued key",
-				},
-				{
-					name: "--get-regexp",
-					description:
-						"Like --get-all, but interprets the name as a regular expression and writes ou",
-					args: {
-						name: "regexp",
-					},
-				},
-				{
-					name: "--get-urlmatch",
-					description:
-						"When given a two-part name section.key, the value for section..key whose part",
-					args: [
-						{
-							name: "name",
-						},
-						{
-							name: "url",
-						},
-					],
-				},
-				{
-					name: "--system",
-					description:
-						"For writing options: write to system-wide $(prefix)/etc/gitconfig rather than",
-				},
-				{
-					name: "--worktree",
-					description:
-						"Similar to --local except that.git/config.worktree is read from or written to",
-				},
-				{
-					name: ["-f", "--file"],
-					description:
-						"Use the given config file instead of the one specified by GIT_CONFIG",
-					args: {
-						name: "config-file",
-						template: "filepaths",
-					},
-				},
-				{
-					name: "--blob",
-					description:
-						"Similar to --file but use the given blob instead of a file. E.g. you can use",
-					args: {
-						name: "blob",
-					},
-				},
-				{
-					name: "--remove-section",
-					description: "Remove the given section from the configuration file",
-				},
-				{
-					name: "--rename-section",
-					description: "Rename the given section to a new name",
-				},
-				{
-					name: "--unset",
-					description: "Remove the line matching the key from config file",
-				},
-				{
-					name: "--unset-all",
-					description: "Remove all lines matching the key from config file",
-				},
-				{
-					name: ["-l", "--list"],
-					description:
-						"List all variables set in config file, along with their values",
-				},
-				{
-					name: "--fixed-value",
-					description:
-						"When used with the value-pattern argument, treat value-pattern as an exact st",
-				},
-				{
-					name: "--type",
-					description:
-						"Git config will ensure that any input or output is valid under the given type",
-					args: {
-						name: "type",
-						suggestions: [
-							"bool",
-							"int",
-							"bool-or-int",
-							"path",
-							"expiry-date",
-							"color",
-						],
-					},
-				},
-				{
-					name: "--no-type",
-					description:
-						"Un-sets the previously set type specifier (if one was previously set). This o",
-				},
-				{
-					name: ["-z", "--null"],
-					description:
-						"For all options that output values and/or keys, always end values with the nu",
-				},
-				{
-					name: "--name-only",
-					description:
-						"Output only the names of config variables for --list or --get-regexp",
-				},
-				{
-					name: "--show-origin",
-					description:
-						"Augment the output of all queried config options with the origin type (file",
-				},
-				{
-					name: "--show-scope",
-					description:
-						"Similar to --show-origin in that it augments the output of all queried config",
-				},
-				{
-					name: "--get-colorbool",
-					description:
-						'Find the color setting for name (e.g. color.diff) and output "true" or "false',
-					args: {
-						name: "name",
-					},
-				},
-				{
-					name: "--get-color",
-					description:
-						"Find the color configured for name (e.g. color.diff.new) and output it as the",
-					args: [
-						{
-							name: "name",
-						},
-						{
-							name: "default",
-							isOptional: true,
-						},
-					],
-				},
-				{
-					name: ["-e", "--edit"],
-					description:
-						"Opens an editor to modify the specified config file; either --system, --globa",
-				},
-				{
-					name: "--includes",
-					description:
-						"Respect include.* directives in config files when looking up values. Defaults",
-				},
-				{
-					name: "--no-includes",
-					description:
-						"Respect include.* directives in config files when looking up values. Defaults",
-				},
-				{
-					name: "--default",
-					description:
-						"When using --get, and the requested variable is not found, behave as if were",
-					args: {
-						name: "value",
-						isOptional: true,
-					},
-				},
-			],
-			args: [
-				{
-					name: "setting",
-					// All git config keys are valid
-					suggestCurrentToken: true,
-					suggestions: configSuggestions.map((suggestion) => ({
-						...suggestion,
-						icon: "⚙️",
-					})),
-					generators: {
-						script: ["git", "config", "--get-regexp", ".*"],
-						// This is inefficient but it doesn't need to be faster - most
-						// of the time, you don't need to run `git config` commands,
-						// and when you do it's typically one or two at most.
-						postProcess: (out) =>
-							out
-								.trim()
-								.split("\n")
-								.map((line) => line.slice(0, line.indexOf(" ")))
-								.filter(
-									(line) =>
-										line.startsWith("alias.") ||
-										line.startsWith("branch.") ||
-										line.startsWith("remote.") ||
-										!configSuggestions.find(({ name }) => line === name)
-								)
-								.map((name) => ({ name, icon: "⚙️" })),
-					},
-				},
-				{
-					name: "value",
-				},
-			],
-		},
-		{
-			name: "rebase",
-			description: "Reapply commits on top of another base tip",
-			options: [
-				{
-					name: "--onto",
-					description:
-						"Starting point at which to create the new commits. If the --onto option is not specified, the starting point is <upstream>. May be any valid commit, and not just an existing branch name. As a special case, you may use 'A...B' as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD",
-					args: {
-						name: "newbase",
-						generators: gitGenerators.commits,
-					},
-				},
-				{
-					name: "--keep-base",
-					description:
-						"Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running git rebase --keep-base <upstream> <branch> is equivalent to running git rebase --onto <upstream>…​ <upstream>. This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is. Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the starting point on which new commits will be created, whereas --fork-point uses the merge base to determine the set of commits which will be rebased",
-				},
-				{
-					name: "--continue",
-					description:
-						"Restart the rebasing process after having resolved a merge conflict",
-				},
-				{
-					name: "--abort",
-					description:
-						"Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started",
-				},
-				{
-					name: "--quit",
-					description:
-						"Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result. If a temporary stash entry was created using --autostash, it will be saved to the stash list",
-				},
-				{
-					name: "--apply",
-					description:
-						"Use applying strategies to rebase (calling git-am internally). This option may become a no-op in the future once the merge backend handles everything the apply one does",
-				},
-				{
-					name: "--empty",
-					description:
-						"How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified. Note that commits which start empty are kept (unless --no-keep-empty is specified), and commits which are clean cherry-picks (as determined by git log --cherry-mark ...) are detected and dropped as a preliminary step (unless --reapply-cherry-picks is passed)",
-					args: {
-						isOptional: true,
-						suggestions: ["drop", "keep", "ask"],
-					},
-				},
-				{
-					name: "--no-keep-empty",
-					description:
-						"Do not keep commits that start empty before the rebase (i.e. that do not change anything from its parent) in the result. The default is to keep commits which start empty, since creating such commits requires passing the --allow-empty override flag to git commit, signifying that a user is very intentionally creating such a commit and thus wants to keep it. Usage of this flag will probably be rare, since you can get rid of commits that start empty by just firing up an interactive rebase and removing the lines corresponding to the commits you don’t want. This flag exists as a convenient shortcut, such as for cases where external tools generate many empty commits and you want them all removed. For commits which do not start empty but become empty after rebasing, see the --empty flag",
-				},
-				{
-					name: "--keep-empty",
-					description:
-						"Keep commits that start empty before the rebase (i.e. that do not change anything from its parent) in the result. The default is to keep commits which start empty, since creating such commits requires passing the --allow-empty override flag to git commit, signifying that a user is very intentionally creating such a commit and thus wants to keep it. Usage of this flag will probably be rare, since you can get rid of commits that start empty by just firing up an interactive rebase and removing the lines corresponding to the commits you don’t want. This flag exists as a convenient shortcut, such as for cases where external tools generate many empty commits and you want them all removed. For commits which do not start empty but become empty after rebasing, see the --empty flag",
-				},
-				{
-					name: "--reapply-cherry-picks",
-					description:
-						"Reapply all clean cherry-picks of any upstream commit instead of preemptively dropping them. (If these commits then become empty after rebasing, because they contain a subset of already upstream changes, the behavior towards them is controlled by the --empty flag). By default (or if --no-reapply-cherry-picks is given), these commits will be automatically dropped. Because this necessitates reading all upstream commits, this can be expensive in repos with a large number of upstream commits that need to be read. --reapply-cherry-picks allows rebase to forgo reading all upstream commits, potentially improving performance",
-				},
-				{
-					name: "--no-reapply-cherry-picks",
-					description:
-						"Do not reapply all clean cherry-picks of any upstream commit instead of preemptively dropping them",
-				},
-				{
-					name: "--allow-empty-message",
-					description:
-						"No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt",
-				},
-				{
-					name: "--skip",
-					description:
-						"Restart the rebasing process by skipping the current patch",
-				},
-				{
-					name: "--edit-todo",
-					description: "Edit the todo list during an interactive rebase",
-				},
-				{
-					name: "--show-current-patch",
-					description:
-						"Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of git show REBASE_HEAD",
-				},
-				{
-					name: ["-m", "--merge"],
-					description:
-						"Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default. Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as ours is the so-far rebased series, starting with <upstream>, and theirs is the working branch. In other words, the sides are swapped",
-				},
-				{
-					name: ["-s", "--strategy"],
-					isRepeatable: true,
-					description:
-						"Use the given merge strategy. If there is no -s option git merge-recursive is used instead. This implies --merge. Because git rebase replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the ours strategy simply empties all patches from the <branch>, which makes little sense",
-					args: {
-						name: "strategy",
-						isVariadic: true,
-						suggestions: ["resolve", "recursive", "octopus", "ours", "subtree"],
-					},
-				},
-				{
-					name: ["-X", "--strategy-option"],
-					description:
-						"Pass the <strategy-option> through to the merge strategy. This implies --merge and, if no strategy has been specified, -s recursive. Note the reversal of ours and theirs as noted above for the -m option",
-					args: {
-						name: "option",
-						suggestions: [
-							"ours",
-							"theirs",
-							"patience",
-							"diff-algorithm",
-							"diff-algorithm=patience",
-							"diff-algorithm=minimal",
-							"diff-algorithm=histogram",
-							"diff-algorithm=myers",
-							"ignore-space-change",
-							"ignore-all-space",
-							"ignore-space-at-eol",
-							"ignore-cr-at-eol",
-							"renormalize",
-							"no-renormalize",
-							"no-renames",
-							"find-renames",
-							"subtree",
-						],
-					},
-				},
-				{
-					name: "--rerere-autoupdate",
-					description:
-						"Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
-				},
-				{
-					name: "--no-rerere-autoupdate",
-					description:
-						"Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
-				},
-				{
-					name: ["-S", "--gpg-sign"],
-					description:
-						"GPG-sign commits. The keyid argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. --no-gpg-sign is useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
-					args: {
-						name: "keyid",
-						isOptional: true,
-					},
-				},
-				{
-					name: "--no-gpg-sign",
-					description:
-						"Do not GPG-sign commits.--no-gpg-sign is useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
-				},
-				{
-					name: ["-q", "--quiet"],
-					description: "Be quiet. Implies --no-stat",
-				},
-				{
-					name: ["-v", "--verbose"],
-					description: "Be verbose. Implies --stat",
-				},
-				{
-					name: "--stat",
-					description:
-						"Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat",
-				},
-				{
-					name: ["-n", "--no-stat"],
-					description: "Do not show a diffstat as part of the rebase process",
-				},
-				{
-					name: "--no-verify",
-					description:
-						"This option bypasses the pre-rebase hook. See also githooks[5]",
-				},
-				{
-					name: "--verify",
-					description:
-						"Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also githooks[5]",
-				},
-				{
-					name: "-C",
-					description:
-						"Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply",
-					args: {
-						name: "n",
-					},
-				},
-				{
-					name: ["--no-ff", "--force-rebase", "-f"],
-					description:
-						"Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits. You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to 'revert the reversion' (see the revert-a-faulty-merge How-To for details)",
-				},
-				{
-					name: "--fork-point",
-					description:
-						"Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>. When --fork-point is active, fork_point will be used instead of <upstream> to calculate the set of commits to rebase, where fork_point is the result of git merge-base --fork-point <upstream> <branch> command (see git-merge-base[1]). If fork_point ends up being empty, the <upstream> will be used as a fallback. If <upstream> is given on the command line, then the default is --no-fork-point, otherwise the default is --fork-point. If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with --keep-base in order to drop those commits from your branch",
-				},
-				{
-					name: "--no-fork-point",
-					description:
-						"Do not use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>. When --fork-point is active, fork_point will be used instead of <upstream> to calculate the set of commits to rebase, where fork_point is the result of git merge-base --fork-point <upstream> <branch> command (see git-merge-base[1]). If fork_point ends up being empty, the <upstream> will be used as a fallback. If <upstream> is given on the command line, then the default is --no-fork-point, otherwise the default is --fork-point. If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with --keep-base in order to drop those commits from your branch",
-				},
-				{
-					name: "--ignore-whitespace",
-					description:
-						"Ignore whitespace differences when trying to reconcile differences. Currently, each backend implements an approximation of this behavior: apply backend: When applying a patch, ignore changes in whitespace in context lines. Unfortunately, this means that if the 'old' lines being replaced by the patch differ only in whitespace from the existing file, you will get a merge conflict instead of a successful patch application. merge backend: Treat lines with only whitespace changes as unchanged when merging. Unfortunately, this means that any patch hunks that were intended to modify whitespace and nothing else will be dropped, even if the other side had no changes that conflicted",
-				},
-				{
-					name: "--whitespace",
-					description:
-						"This flag is passed to the git apply program (see git-apply[1]) that applies the patch. Implies --apply",
-					args: {
-						name: "option",
-					},
-				},
-				{
-					name: "--committer-date-is-author-date",
-					description:
-						"Instead of using the current time as the committer date, use the author date of the commit being rebased as the committer date. This option implies --force-rebase",
-				},
-				{
-					name: ["--ignore-date", "--reset-author-date"],
-					description:
-						"Instead of using the author date of the original commit, use the current time as the author date of the rebased commit. This option implies --force-rebase",
-				},
-				{
-					name: "--signoff",
-					description:
-						"Add a Signed-off-by trailer to all the rebased commits. Note that if --interactive is given then only commits marked to be picked, edited or reworded will have the trailer added",
-				},
-				{
-					name: ["-i", "--interactive"],
-					description:
-						"Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below). The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format",
-				},
-				{
-					name: ["-r", "--rebase-merges"],
-					description:
-						"By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With --rebase-merges, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually. By default, or when no-rebase-cousins was specified, commits which do not have <upstream> as direct ancestor will keep their original branch point, i.e. commits that would be excluded by git-log[1]'s --ancestry-path option will keep their original ancestry by default. If the rebase-cousins mode is turned on, such commits are instead rebased onto <upstream> (or <onto>, if specified). The --rebase-merges mode is similar in spirit to the deprecated --preserve-merges but works with interactive rebases, where commits can be reordered, inserted and dropped at will. It is currently only possible to recreate the merge commits using the recursive merge strategy; Different merge strategies can be used only via explicit exec git merge -s <strategy> [...] commands",
-					args: {
-						name: "mode",
-						isOptional: true,
-						suggestions: ["rebase-cousins", "no-rebase-cousins"],
-					},
-				},
-				{
-					name: ["-x", "--exec"],
-					insertValue: "-x '{cursor}'",
-					description:
-						"Append 'exec <cmd>' after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1. You may execute several commands by either using one instance of --exec with several commands: git rebase -i --exec 'cmd1 && cmd2 && ...' or by giving more than one --exec: git rebase -i --exec 'cmd1' --exec 'cmd2' --exec ... If --autosquash is used, 'exec' lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series. This uses the --interactive machinery internally, but it can be run without an explicit --interactive",
-					args: {
-						name: "cmd",
-					},
-				},
-				{
-					name: "--root",
-					description:
-						"Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, all root commits will be rewritten to have <newbase> as parent instead",
-				},
-				{
-					name: "--autosquash",
-					description:
-						"When the commit log message begins with 'squash! …​' (or 'fixup! …​'), and there is already a commit in the todo list that matches the same ..., automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from pick to squash (or fixup). A commit matches the ... if the commit subject matches, or if the ... refers to the commit’s hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the --fixup/--squash options of git-commit[1]",
-				},
-				{
-					name: "--no-autosquash",
-					description:
-						"When the commit log message begins with 'squash! …' (or 'fixup! …'), and there is already a commit in the todo list that matches the same ..., automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from pick to squash (or fixup). A commit matches the ... if the commit subject matches, or if the ... refers to the commit’s hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the --fixup/--squash options of git-commit[1]",
-				},
-				{
-					name: "--autostash",
-					description:
-						"Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts",
-				},
-				{
-					name: "--no-autostash",
-					description:
-						"Do not automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts",
-				},
-				{
-					name: "--reschedule-failed-exec",
-					description:
-						"Automatically reschedule exec commands that failed. This only makes sense in interactive mode (or when an --exec option was provided)",
-				},
-				{
-					name: "--no-reschedule-failed-exec",
-					description:
-						"Do not automatically reschedule exec commands that failed. This only makes sense in interactive mode (or when an --exec option was provided)",
-				},
-			],
-			args: [
-				{
-					name: "base",
-					generators: gitGenerators.localBranches,
-					suggestions: [
-						{
-							name: "-",
-							description: "Use the last ref as the base",
-						},
-					],
-					filterStrategy: "fuzzy",
-					isOptional: true,
-				},
-				{
-					name: "new base",
-					generators: gitGenerators.localBranches,
-					filterStrategy: "fuzzy",
-					isOptional: true,
-				},
-			],
-		},
-		{
-			name: "add",
-			description: "Add file contents to the index",
-			options: addOptions,
-			args: {
-				name: "pathspec",
-				isVariadic: true,
-				isOptional: true,
+                return (
+                  'Generate a git commit message summary based on this git diff, the "summary" must be no more ' +
+                  "than 70-75 characters, and it must describe both what the patch changes, as well as why the " +
+                  `patch might be necessary.\n\nHere are some examples from the repo:\n${stdout}`
+                );
+              },
+              message: async ({ executeCommand }: any) =>
+                (
+                  await executeCommand({
+                    command: "git",
+                    args: ["diff", "--staged"],
+                  })
+                ).stdout,
+              splitOn: "\n",
+            }),
+          },
+        },
+        {
+          name: ["-a", "--all"],
+          description: "Stage all modified and deleted paths",
+        },
+        {
+          name: "-am",
+          insertValue: "-am '{cursor}'",
+          description: "Stage all and use given text as commit message",
+          args: {
+            name: "message",
+          },
+        },
+        {
+          name: ["-v", "--verbose"],
+          description: "Show unified diff of all file changes",
+        },
+        {
+          name: ["-p", "--patch"],
+          description:
+            "Use the interactive patch selection interface to chose which changes to commi",
+        },
+        {
+          name: ["-C", "--reuse-message"],
+          description:
+            "Take an existing commit object, and reuse the log message and the authorship",
+          args: {
+            name: "commit",
+            generators: gitGenerators.commits,
+          },
+        },
+        {
+          name: ["-c", "--reedit-message"],
+          description:
+            "Like -C, but with -c the editor is invoked, so that the user can further edit",
+          args: {
+            name: "commit",
+            generators: gitGenerators.commits,
+          },
+        },
+        {
+          name: "--fixup",
+          description:
+            "Construct a commit message for use with rebase --autosquash. The commit messa",
+          args: {
+            name: "commit",
+            generators: gitGenerators.commits,
+          },
+        },
+        {
+          name: "--squash",
+          description:
+            "Construct a commit message for use with rebase --autosquash. The commit messa",
+          args: {
+            name: "commit",
+            generators: gitGenerators.commits,
+          },
+        },
+        {
+          name: "--reset-author",
+          description:
+            "When used with -C/-c/--amend options, or when committing after a conflicting",
+        },
+        {
+          name: "--short",
+          description:
+            "When doing a dry-run, give the output in the short-format. See git-status[1]",
+        },
+        {
+          name: "--branch",
+          description: "Show the branch and tracking info even in short-format",
+        },
+        {
+          name: "--porcelain",
+          description:
+            "When doing a dry-run, give the output in a porcelain-ready format. See git-st",
+        },
+        {
+          name: "--long",
+          description:
+            "When doing a dry-run, give the output in the long-format. Implies --dry-run",
+        },
+        {
+          name: ["-z", "--null"],
+          description:
+            "When showing short or porcelain status output, print the filename verbatim an",
+        },
+        {
+          name: ["-F", "--file"],
+          description:
+            "Take the commit message from the given file. Use - to read the message from t",
+          args: {
+            name: "file",
+            template: "filepaths",
+          },
+        },
+        {
+          name: "--author",
+          description:
+            "Override the commit author. Specify an explicit author using the standard A U",
+          args: {
+            name: "author",
+          },
+        },
+        {
+          name: "--date",
+          description: "Override the author date used in the commit",
+          args: {
+            name: "date",
+          },
+        },
+        {
+          name: ["-t", "--template"],
+          description:
+            "When editing the commit message, start the editor with the contents in the gi",
+          args: {
+            name: "file",
+            template: "filepaths",
+          },
+        },
+        {
+          name: ["-s", "--signoff"],
+          description:
+            "Add a Signed-off-by trailer by the committer at the end of the commit log mes",
+        },
+        {
+          name: "--no-signoff",
+          description:
+            "Don't add a Signed-off-by trailer by the committer at the end of the commit l",
+        },
+        {
+          name: ["-n", "--no-verify"],
+          description:
+            "This option bypasses the pre-commit and commit-msg hooks. See also githooks[5]",
+        },
+        {
+          name: "--allow-empty",
+          description:
+            "Usually recording a commit that has the exact same tree as its sole parent co",
+        },
+        {
+          name: "--allow-empty-message",
+          description:
+            "Like --allow-empty this command is primarily for use by foreign SCM interface",
+        },
+        {
+          name: "--cleanup",
+          description:
+            "This option determines how the supplied commit message should be cleaned up b",
+          args: {
+            name: "mode",
+            description:
+              "Determines how the supplied commit messaged should be cleaned up before committing",
+            suggestions: [
+              {
+                name: "strip",
+                description:
+                  "Strip leading and trailing empty lines, trailing whitepace, commentary and collapse consecutive empty lines",
+              },
+              {
+                name: "whitespace",
+                description: "Same as strip except #commentary is not removed",
+              },
+              {
+                name: "verbatim",
+                description: "Do not change the message at all",
+              },
+              {
+                name: "scissors",
+                description:
+                  "Same as whitespace except that everything from (and including) the line found below is truncated",
+              },
+              {
+                name: "default",
+                description:
+                  "Same as strip if the message is to be edited. Otherwise whitespace",
+              },
+            ],
+          },
+        },
+        {
+          name: ["-e", "--edit"],
+          description:
+            "The message taken from file with -F, command line with -m, and from commit ob",
+        },
+        {
+          name: "--no-edit",
+          description:
+            "Use the selected commit message without launching an editor. For example, git",
+        },
+        {
+          name: "--amend",
+          description:
+            "Replace the tip of the current branch by creating a new commit. The recorded",
+        },
+        {
+          name: "--no-post-rewrite",
+          description: "Bypass the post-rewrite hook",
+        },
+        {
+          name: ["-i", "--include"],
+          description:
+            "Before making a commit out of staged contents so far, stage the contents of p",
+        },
+        {
+          name: ["-o", "--only"],
+          description:
+            "Make a commit by taking the updated working tree contents of the paths specif",
+        },
+        {
+          name: "--pathspec-from-file",
+          description:
+            "Pathspec is passed in instead of commandline args. If is exactly - then stand",
+          args: {
+            name: "file",
+            template: "filepaths",
+          },
+        },
+        {
+          name: "--pathspec-file-nul",
+          description:
+            "Only meaningful with --pathspec-from-file. Pathspec elements are separated wi",
+        },
+        {
+          name: ["-u", "--untracked-files"],
+          description:
+            "Show untracked files. The mode parameter is optional (defaults to all), and i",
+          args: {
+            name: "mode",
+            suggestions: ["no", "normal", "all"],
+            isOptional: true,
+          },
+        },
+        {
+          name: ["-q", "--quiet"],
+          description: "Suppress commit summary message",
+        },
+        {
+          name: "--dry-run",
+          description:
+            "Do not create a commit, but show a list of paths that are to be committed, pa",
+        },
+        {
+          name: "--status",
+          description:
+            "Include the output of git-status[1] in the commit message template when using",
+        },
+        {
+          name: "--no-status",
+          description:
+            "Do not include the output of git-status[1] in the commit message template whe",
+        },
+        {
+          name: ["-S", "--gpg-sign"],
+          description:
+            "GPG-sign commits. The keyid argument is optional and defaults to the committe",
+          args: {
+            name: "keyid",
+            isOptional: true,
+          },
+        },
+        {
+          name: "--no-gpg-sign",
+          description: "Dont GPG-sign commits",
+        },
+        {
+          name: "--",
+          description: "Do not interpret any more arguments as options",
+        },
+      ],
+    },
+    {
+      name: "config",
+      description: "Change Git configuration",
+      options: [
+        {
+          name: "--local",
+          description: "Default: write to the repository .git/config file",
+          args: {
+            isVariadic: true,
+            suggestions: [
+              {
+                name: "user.name",
+                description: "Set config for username",
+                insertValue: "user.name '{cursor}'",
+              },
+              {
+                name: "user.email",
+                description: "Set config for email",
+                insertValue: "user.email '{cursor}'",
+              },
+            ],
+          },
+        },
+        {
+          name: "--global",
+          description:
+            "For writing options: write to global ~/.gitconfig file rather than the repository .git/config",
+        },
+        {
+          name: "--replace-all",
+          description:
+            "Default behavior is to replace at most one line. This replaces all lines matc",
+        },
+        {
+          name: "--add",
+          description:
+            "Adds a new line to the option without altering any existing values. This is t",
+        },
+        {
+          name: "--get",
+          description:
+            "Get the value for a given key (optionally filtered by a regex matching the va",
+        },
+        {
+          name: "--get-all",
+          description:
+            "Like get, but returns all values for a multi-valued key",
+        },
+        {
+          name: "--get-regexp",
+          description:
+            "Like --get-all, but interprets the name as a regular expression and writes ou",
+          args: {
+            name: "regexp",
+          },
+        },
+        {
+          name: "--get-urlmatch",
+          description:
+            "When given a two-part name section.key, the value for section..key whose part",
+          args: [
+            {
+              name: "name",
+            },
+            {
+              name: "url",
+            },
+          ],
+        },
+        {
+          name: "--system",
+          description:
+            "For writing options: write to system-wide $(prefix)/etc/gitconfig rather than",
+        },
+        {
+          name: "--worktree",
+          description:
+            "Similar to --local except that.git/config.worktree is read from or written to",
+        },
+        {
+          name: ["-f", "--file"],
+          description:
+            "Use the given config file instead of the one specified by GIT_CONFIG",
+          args: {
+            name: "config-file",
+            template: "filepaths",
+          },
+        },
+        {
+          name: "--blob",
+          description:
+            "Similar to --file but use the given blob instead of a file. E.g. you can use",
+          args: {
+            name: "blob",
+          },
+        },
+        {
+          name: "--remove-section",
+          description: "Remove the given section from the configuration file",
+        },
+        {
+          name: "--rename-section",
+          description: "Rename the given section to a new name",
+        },
+        {
+          name: "--unset",
+          description: "Remove the line matching the key from config file",
+        },
+        {
+          name: "--unset-all",
+          description: "Remove all lines matching the key from config file",
+        },
+        {
+          name: ["-l", "--list"],
+          description:
+            "List all variables set in config file, along with their values",
+        },
+        {
+          name: "--fixed-value",
+          description:
+            "When used with the value-pattern argument, treat value-pattern as an exact st",
+        },
+        {
+          name: "--type",
+          description:
+            "Git config will ensure that any input or output is valid under the given type",
+          args: {
+            name: "type",
+            suggestions: [
+              "bool",
+              "int",
+              "bool-or-int",
+              "path",
+              "expiry-date",
+              "color",
+            ],
+          },
+        },
+        {
+          name: "--no-type",
+          description:
+            "Un-sets the previously set type specifier (if one was previously set). This o",
+        },
+        {
+          name: ["-z", "--null"],
+          description:
+            "For all options that output values and/or keys, always end values with the nu",
+        },
+        {
+          name: "--name-only",
+          description:
+            "Output only the names of config variables for --list or --get-regexp",
+        },
+        {
+          name: "--show-origin",
+          description:
+            "Augment the output of all queried config options with the origin type (file",
+        },
+        {
+          name: "--show-scope",
+          description:
+            "Similar to --show-origin in that it augments the output of all queried config",
+        },
+        {
+          name: "--get-colorbool",
+          description:
+            'Find the color setting for name (e.g. color.diff) and output "true" or "false',
+          args: {
+            name: "name",
+          },
+        },
+        {
+          name: "--get-color",
+          description:
+            "Find the color configured for name (e.g. color.diff.new) and output it as the",
+          args: [
+            {
+              name: "name",
+            },
+            {
+              name: "default",
+              isOptional: true,
+            },
+          ],
+        },
+        {
+          name: ["-e", "--edit"],
+          description:
+            "Opens an editor to modify the specified config file; either --system, --globa",
+        },
+        {
+          name: "--includes",
+          description:
+            "Respect include.* directives in config files when looking up values. Defaults",
+        },
+        {
+          name: "--no-includes",
+          description:
+            "Respect include.* directives in config files when looking up values. Defaults",
+        },
+        {
+          name: "--default",
+          description:
+            "When using --get, and the requested variable is not found, behave as if were",
+          args: {
+            name: "value",
+            isOptional: true,
+          },
+        },
+      ],
+      args: [
+        {
+          name: "setting",
+          // All git config keys are valid
+          suggestCurrentToken: true,
+          suggestions: configSuggestions.map((suggestion) => ({
+            ...suggestion,
+            icon: "⚙️",
+          })),
+          generators: {
+            script: ["git", "config", "--get-regexp", ".*"],
+            // This is inefficient but it doesn't need to be faster - most
+            // of the time, you don't need to run `git config` commands,
+            // and when you do it's typically one or two at most.
+            postProcess: (out) =>
+              out
+                .trim()
+                .split("\n")
+                .map((line) => line.slice(0, line.indexOf(" ")))
+                .filter(
+                  (line) =>
+                    line.startsWith("alias.") ||
+                    line.startsWith("branch.") ||
+                    line.startsWith("remote.") ||
+                    !configSuggestions.find(({ name }) => line === name)
+                )
+                .map((name) => ({ name, icon: "⚙️" })),
+          },
+        },
+        {
+          name: "value",
+        },
+      ],
+    },
+    {
+      name: "rebase",
+      description: "Reapply commits on top of another base tip",
+      options: [
+        {
+          name: "--onto",
+          description:
+            "Starting point at which to create the new commits. If the --onto option is not specified, the starting point is <upstream>. May be any valid commit, and not just an existing branch name. As a special case, you may use 'A...B' as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD",
+          args: {
+            name: "newbase",
+            generators: gitGenerators.commits,
+          },
+        },
+        {
+          name: "--keep-base",
+          description:
+            "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running git rebase --keep-base <upstream> <branch> is equivalent to running git rebase --onto <upstream>…​ <upstream>. This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is. Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the starting point on which new commits will be created, whereas --fork-point uses the merge base to determine the set of commits which will be rebased",
+        },
+        {
+          name: "--continue",
+          description:
+            "Restart the rebasing process after having resolved a merge conflict",
+        },
+        {
+          name: "--abort",
+          description:
+            "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started",
+        },
+        {
+          name: "--quit",
+          description:
+            "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result. If a temporary stash entry was created using --autostash, it will be saved to the stash list",
+        },
+        {
+          name: "--apply",
+          description:
+            "Use applying strategies to rebase (calling git-am internally). This option may become a no-op in the future once the merge backend handles everything the apply one does",
+        },
+        {
+          name: "--empty",
+          description:
+            "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified. Note that commits which start empty are kept (unless --no-keep-empty is specified), and commits which are clean cherry-picks (as determined by git log --cherry-mark ...) are detected and dropped as a preliminary step (unless --reapply-cherry-picks is passed)",
+          args: {
+            isOptional: true,
+            suggestions: ["drop", "keep", "ask"],
+          },
+        },
+        {
+          name: "--no-keep-empty",
+          description:
+            "Do not keep commits that start empty before the rebase (i.e. that do not change anything from its parent) in the result. The default is to keep commits which start empty, since creating such commits requires passing the --allow-empty override flag to git commit, signifying that a user is very intentionally creating such a commit and thus wants to keep it. Usage of this flag will probably be rare, since you can get rid of commits that start empty by just firing up an interactive rebase and removing the lines corresponding to the commits you don’t want. This flag exists as a convenient shortcut, such as for cases where external tools generate many empty commits and you want them all removed. For commits which do not start empty but become empty after rebasing, see the --empty flag",
+        },
+        {
+          name: "--keep-empty",
+          description:
+            "Keep commits that start empty before the rebase (i.e. that do not change anything from its parent) in the result. The default is to keep commits which start empty, since creating such commits requires passing the --allow-empty override flag to git commit, signifying that a user is very intentionally creating such a commit and thus wants to keep it. Usage of this flag will probably be rare, since you can get rid of commits that start empty by just firing up an interactive rebase and removing the lines corresponding to the commits you don’t want. This flag exists as a convenient shortcut, such as for cases where external tools generate many empty commits and you want them all removed. For commits which do not start empty but become empty after rebasing, see the --empty flag",
+        },
+        {
+          name: "--reapply-cherry-picks",
+          description:
+            "Reapply all clean cherry-picks of any upstream commit instead of preemptively dropping them. (If these commits then become empty after rebasing, because they contain a subset of already upstream changes, the behavior towards them is controlled by the --empty flag). By default (or if --no-reapply-cherry-picks is given), these commits will be automatically dropped. Because this necessitates reading all upstream commits, this can be expensive in repos with a large number of upstream commits that need to be read. --reapply-cherry-picks allows rebase to forgo reading all upstream commits, potentially improving performance",
+        },
+        {
+          name: "--no-reapply-cherry-picks",
+          description:
+            "Do not reapply all clean cherry-picks of any upstream commit instead of preemptively dropping them",
+        },
+        {
+          name: "--allow-empty-message",
+          description:
+            "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt",
+        },
+        {
+          name: "--skip",
+          description:
+            "Restart the rebasing process by skipping the current patch",
+        },
+        {
+          name: "--edit-todo",
+          description: "Edit the todo list during an interactive rebase",
+        },
+        {
+          name: "--show-current-patch",
+          description:
+            "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of git show REBASE_HEAD",
+        },
+        {
+          name: ["-m", "--merge"],
+          description:
+            "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default. Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as ours is the so-far rebased series, starting with <upstream>, and theirs is the working branch. In other words, the sides are swapped",
+        },
+        {
+          name: ["-s", "--strategy"],
+          isRepeatable: true,
+          description:
+            "Use the given merge strategy. If there is no -s option git merge-recursive is used instead. This implies --merge. Because git rebase replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the ours strategy simply empties all patches from the <branch>, which makes little sense",
+          args: {
+            name: "strategy",
+            isVariadic: true,
+            suggestions: ["resolve", "recursive", "octopus", "ours", "subtree"],
+          },
+        },
+        {
+          name: ["-X", "--strategy-option"],
+          description:
+            "Pass the <strategy-option> through to the merge strategy. This implies --merge and, if no strategy has been specified, -s recursive. Note the reversal of ours and theirs as noted above for the -m option",
+          args: {
+            name: "option",
+            suggestions: [
+              "ours",
+              "theirs",
+              "patience",
+              "diff-algorithm",
+              "diff-algorithm=patience",
+              "diff-algorithm=minimal",
+              "diff-algorithm=histogram",
+              "diff-algorithm=myers",
+              "ignore-space-change",
+              "ignore-all-space",
+              "ignore-space-at-eol",
+              "ignore-cr-at-eol",
+              "renormalize",
+              "no-renormalize",
+              "no-renames",
+              "find-renames",
+              "subtree",
+            ],
+          },
+        },
+        {
+          name: "--rerere-autoupdate",
+          description:
+            "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
+        },
+        {
+          name: "--no-rerere-autoupdate",
+          description:
+            "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
+        },
+        {
+          name: ["-S", "--gpg-sign"],
+          description:
+            "GPG-sign commits. The keyid argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. --no-gpg-sign is useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
+          args: {
+            name: "keyid",
+            isOptional: true,
+          },
+        },
+        {
+          name: "--no-gpg-sign",
+          description:
+            "Do not GPG-sign commits.--no-gpg-sign is useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
+        },
+        {
+          name: ["-q", "--quiet"],
+          description: "Be quiet. Implies --no-stat",
+        },
+        {
+          name: ["-v", "--verbose"],
+          description: "Be verbose. Implies --stat",
+        },
+        {
+          name: "--stat",
+          description:
+            "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat",
+        },
+        {
+          name: ["-n", "--no-stat"],
+          description: "Do not show a diffstat as part of the rebase process",
+        },
+        {
+          name: "--no-verify",
+          description:
+            "This option bypasses the pre-rebase hook. See also githooks[5]",
+        },
+        {
+          name: "--verify",
+          description:
+            "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also githooks[5]",
+        },
+        {
+          name: "-C",
+          description:
+            "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply",
+          args: {
+            name: "n",
+          },
+        },
+        {
+          name: ["--no-ff", "--force-rebase", "-f"],
+          description:
+            "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits. You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to 'revert the reversion' (see the revert-a-faulty-merge How-To for details)",
+        },
+        {
+          name: "--fork-point",
+          description:
+            "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>. When --fork-point is active, fork_point will be used instead of <upstream> to calculate the set of commits to rebase, where fork_point is the result of git merge-base --fork-point <upstream> <branch> command (see git-merge-base[1]). If fork_point ends up being empty, the <upstream> will be used as a fallback. If <upstream> is given on the command line, then the default is --no-fork-point, otherwise the default is --fork-point. If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with --keep-base in order to drop those commits from your branch",
+        },
+        {
+          name: "--no-fork-point",
+          description:
+            "Do not use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>. When --fork-point is active, fork_point will be used instead of <upstream> to calculate the set of commits to rebase, where fork_point is the result of git merge-base --fork-point <upstream> <branch> command (see git-merge-base[1]). If fork_point ends up being empty, the <upstream> will be used as a fallback. If <upstream> is given on the command line, then the default is --no-fork-point, otherwise the default is --fork-point. If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with --keep-base in order to drop those commits from your branch",
+        },
+        {
+          name: "--ignore-whitespace",
+          description:
+            "Ignore whitespace differences when trying to reconcile differences. Currently, each backend implements an approximation of this behavior: apply backend: When applying a patch, ignore changes in whitespace in context lines. Unfortunately, this means that if the 'old' lines being replaced by the patch differ only in whitespace from the existing file, you will get a merge conflict instead of a successful patch application. merge backend: Treat lines with only whitespace changes as unchanged when merging. Unfortunately, this means that any patch hunks that were intended to modify whitespace and nothing else will be dropped, even if the other side had no changes that conflicted",
+        },
+        {
+          name: "--whitespace",
+          description:
+            "This flag is passed to the git apply program (see git-apply[1]) that applies the patch. Implies --apply",
+          args: {
+            name: "option",
+          },
+        },
+        {
+          name: "--committer-date-is-author-date",
+          description:
+            "Instead of using the current time as the committer date, use the author date of the commit being rebased as the committer date. This option implies --force-rebase",
+        },
+        {
+          name: ["--ignore-date", "--reset-author-date"],
+          description:
+            "Instead of using the author date of the original commit, use the current time as the author date of the rebased commit. This option implies --force-rebase",
+        },
+        {
+          name: "--signoff",
+          description:
+            "Add a Signed-off-by trailer to all the rebased commits. Note that if --interactive is given then only commits marked to be picked, edited or reworded will have the trailer added",
+        },
+        {
+          name: ["-i", "--interactive"],
+          description:
+            "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below). The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format",
+        },
+        {
+          name: ["-r", "--rebase-merges"],
+          description:
+            "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With --rebase-merges, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually. By default, or when no-rebase-cousins was specified, commits which do not have <upstream> as direct ancestor will keep their original branch point, i.e. commits that would be excluded by git-log[1]'s --ancestry-path option will keep their original ancestry by default. If the rebase-cousins mode is turned on, such commits are instead rebased onto <upstream> (or <onto>, if specified). The --rebase-merges mode is similar in spirit to the deprecated --preserve-merges but works with interactive rebases, where commits can be reordered, inserted and dropped at will. It is currently only possible to recreate the merge commits using the recursive merge strategy; Different merge strategies can be used only via explicit exec git merge -s <strategy> [...] commands",
+          args: {
+            name: "mode",
+            isOptional: true,
+            suggestions: ["rebase-cousins", "no-rebase-cousins"],
+          },
+        },
+        {
+          name: ["-x", "--exec"],
+          insertValue: "-x '{cursor}'",
+          description:
+            "Append 'exec <cmd>' after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1. You may execute several commands by either using one instance of --exec with several commands: git rebase -i --exec 'cmd1 && cmd2 && ...' or by giving more than one --exec: git rebase -i --exec 'cmd1' --exec 'cmd2' --exec ... If --autosquash is used, 'exec' lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series. This uses the --interactive machinery internally, but it can be run without an explicit --interactive",
+          args: {
+            name: "cmd",
+          },
+        },
+        {
+          name: "--root",
+          description:
+            "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, all root commits will be rewritten to have <newbase> as parent instead",
+        },
+        {
+          name: "--autosquash",
+          description:
+            "When the commit log message begins with 'squash! …​' (or 'fixup! …​'), and there is already a commit in the todo list that matches the same ..., automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from pick to squash (or fixup). A commit matches the ... if the commit subject matches, or if the ... refers to the commit’s hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the --fixup/--squash options of git-commit[1]",
+        },
+        {
+          name: "--no-autosquash",
+          description:
+            "When the commit log message begins with 'squash! …' (or 'fixup! …'), and there is already a commit in the todo list that matches the same ..., automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from pick to squash (or fixup). A commit matches the ... if the commit subject matches, or if the ... refers to the commit’s hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the --fixup/--squash options of git-commit[1]",
+        },
+        {
+          name: "--autostash",
+          description:
+            "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts",
+        },
+        {
+          name: "--no-autostash",
+          description:
+            "Do not automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts",
+        },
+        {
+          name: "--reschedule-failed-exec",
+          description:
+            "Automatically reschedule exec commands that failed. This only makes sense in interactive mode (or when an --exec option was provided)",
+        },
+        {
+          name: "--no-reschedule-failed-exec",
+          description:
+            "Do not automatically reschedule exec commands that failed. This only makes sense in interactive mode (or when an --exec option was provided)",
+        },
+      ],
+      args: [
+        {
+          name: "base",
+          generators: gitGenerators.localBranches,
+          suggestions: [
+            {
+              name: "-",
+              description: "Use the last ref as the base",
+            },
+          ],
+          filterStrategy: "fuzzy",
+          isOptional: true,
+        },
+        {
+          name: "new base",
+          generators: gitGenerators.localBranches,
+          filterStrategy: "fuzzy",
+          isOptional: true,
+        },
+      ],
+    },
+    {
+      name: "add",
+      description: "Add file contents to the index",
+      options: addOptions,
+      args: {
+        name: "pathspec",
+        isVariadic: true,
+        isOptional: true,
 
-				// We have a special setting for dot in the vuejs app
+        // We have a special setting for dot in the vuejs app
 
-				// suggestions: [
-				//     {
-				//         name: ".",
-				//         description: "current directory",
-				//         insertValue: ".",
-				//         icon: "fig://icon?type=folder"
-				//     }
-				// ],
-				generators: [gitGenerators.files_for_staging, { template: "folders" }],
-			},
-		},
-		{
-			name: "stage",
-			description: "Add file contents to the staging area",
-			options: addOptions,
-			args: {
-				name: "pathspec",
-				isVariadic: true,
-				isOptional: true,
+        // suggestions: [
+        //     {
+        //         name: ".",
+        //         description: "current directory",
+        //         insertValue: ".",
+        //         icon: "fig://icon?type=folder"
+        //     }
+        // ],
+        generators: [gitGenerators.files_for_staging, { template: "folders" }],
+      },
+    },
+    {
+      name: "stage",
+      description: "Add file contents to the staging area",
+      options: addOptions,
+      args: {
+        name: "pathspec",
+        isVariadic: true,
+        isOptional: true,
 
-				// We have a special setting for dot in the vuejs app
+        // We have a special setting for dot in the vuejs app
 
-				// suggestions: [
-				//     {
-				//         name: ".",
-				//         description: "current directory",
-				//         insertValue: ".",
-				//         icon: "fig://icon?type=folder"
-				//     }
-				// ],
-				generators: gitGenerators.files_for_staging,
-			},
-		},
-		{
-			name: "status",
-			description: "Show the working tree status",
-			options: [
-				{
-					name: ["-s", "--short"],
-					description: "Give the output in the short-format",
-				},
-				{
-					name: ["-v", "--verbose"],
-					description: "Be verbose",
-				},
-				{
-					name: ["-b", "--branch"],
-					description: "Show branch information",
-				},
-				{
-					name: "--show-stash",
-					description: "Show stash information",
-				},
-				{
-					name: "--porcelain",
-					description: "Give the output in the short-format",
-					args: {
-						name: "version",
-						isOptional: true,
-					},
-				},
-				{
-					name: "--ahead-behind",
-					description: "Display full ahead/behind values",
-				},
-				{
-					name: "--no-ahead-behind",
-					description: "Do not display full ahead/behind values",
-				},
-				{
-					name: "--column",
-					description: "Display full ahead/behind values",
-					args: {
-						name: "options",
-						description: "Defaults to always",
-						isOptional: true,
-					},
-				},
-				{
-					name: "--no-column",
-					description: "Do not display untracked files in columns",
-					args: {
-						name: "options",
-						description: "Defaults to never",
-						isOptional: true,
-					},
-				},
-				{
-					name: "--long",
-					description: "Show status in long format (default)",
-				},
-				{
-					name: ["-z", "--null"],
-					description: "Terminate entries with NUL",
-				},
-				{
-					name: ["-u", "--untracked-files"],
-					description: "Show untracked files",
-					args: {
-						isOptional: true,
-						suggestions: [
-							{
-								name: "all",
-								description: "(Default)",
-							},
-							{
-								name: "normal",
-							},
-							{
-								name: "no",
-							},
-						],
-					},
-				},
-				{
-					name: "--ignore-submodules",
-					description: "Ignore changes to submodules when looking for changes",
-					args: {
-						name: "when",
-						isOptional: true,
-						suggestions: [
-							{
-								name: "all",
-								description: "(Default)",
-							},
-							{
-								name: "dirty",
-							},
-							{
-								name: "untracked",
-							},
-							{
-								name: "none",
-							},
-						],
-					},
-				},
-				{
-					name: "--ignored",
-					description: "Show ignored files",
-					args: {
-						isOptional: true,
-						suggestions: [
-							{
-								name: "traditional",
-								description: "(Default)",
-							},
-							{
-								name: "matching",
-							},
-							{
-								name: "no",
-							},
-						],
-					},
-				},
-				{
-					name: "--no-renames",
-					description: "Do not detect renames",
-				},
-				{
-					name: "--renames",
-					description:
-						"Turn on rename detection regardless of user configuration",
-				},
-				{
-					name: "--find-renames",
-					description:
-						"Turn on rename detection, optionally setting the similarity threshold",
-					args: {
-						name: "n",
-						isOptional: true,
-					},
-				},
-			],
-			args: {
-				name: "pathspec",
-				isVariadic: true,
-				isOptional: true,
+        // suggestions: [
+        //     {
+        //         name: ".",
+        //         description: "current directory",
+        //         insertValue: ".",
+        //         icon: "fig://icon?type=folder"
+        //     }
+        // ],
+        generators: gitGenerators.files_for_staging,
+      },
+    },
+    {
+      name: "status",
+      description: "Show the working tree status",
+      options: [
+        {
+          name: ["-s", "--short"],
+          description: "Give the output in the short-format",
+        },
+        {
+          name: ["-v", "--verbose"],
+          description: "Be verbose",
+        },
+        {
+          name: ["-b", "--branch"],
+          description: "Show branch information",
+        },
+        {
+          name: "--show-stash",
+          description: "Show stash information",
+        },
+        {
+          name: "--porcelain",
+          description: "Give the output in the short-format",
+          args: {
+            name: "version",
+            isOptional: true,
+          },
+        },
+        {
+          name: "--ahead-behind",
+          description: "Display full ahead/behind values",
+        },
+        {
+          name: "--no-ahead-behind",
+          description: "Do not display full ahead/behind values",
+        },
+        {
+          name: "--column",
+          description: "Display full ahead/behind values",
+          args: {
+            name: "options",
+            description: "Defaults to always",
+            isOptional: true,
+          },
+        },
+        {
+          name: "--no-column",
+          description: "Do not display untracked files in columns",
+          args: {
+            name: "options",
+            description: "Defaults to never",
+            isOptional: true,
+          },
+        },
+        {
+          name: "--long",
+          description: "Show status in long format (default)",
+        },
+        {
+          name: ["-z", "--null"],
+          description: "Terminate entries with NUL",
+        },
+        {
+          name: ["-u", "--untracked-files"],
+          description: "Show untracked files",
+          args: {
+            isOptional: true,
+            suggestions: [
+              {
+                name: "all",
+                description: "(Default)",
+              },
+              {
+                name: "normal",
+              },
+              {
+                name: "no",
+              },
+            ],
+          },
+        },
+        {
+          name: "--ignore-submodules",
+          description: "Ignore changes to submodules when looking for changes",
+          args: {
+            name: "when",
+            isOptional: true,
+            suggestions: [
+              {
+                name: "all",
+                description: "(Default)",
+              },
+              {
+                name: "dirty",
+              },
+              {
+                name: "untracked",
+              },
+              {
+                name: "none",
+              },
+            ],
+          },
+        },
+        {
+          name: "--ignored",
+          description: "Show ignored files",
+          args: {
+            isOptional: true,
+            suggestions: [
+              {
+                name: "traditional",
+                description: "(Default)",
+              },
+              {
+                name: "matching",
+              },
+              {
+                name: "no",
+              },
+            ],
+          },
+        },
+        {
+          name: "--no-renames",
+          description: "Do not detect renames",
+        },
+        {
+          name: "--renames",
+          description:
+            "Turn on rename detection regardless of user configuration",
+        },
+        {
+          name: "--find-renames",
+          description:
+            "Turn on rename detection, optionally setting the similarity threshold",
+          args: {
+            name: "n",
+            isOptional: true,
+          },
+        },
+      ],
+      args: {
+        name: "pathspec",
+        isVariadic: true,
+        isOptional: true,
 
-				// We have a special setting for dot in the vuejs app
+        // We have a special setting for dot in the vuejs app
 
-				// suggestions: [
-				//     {
-				//         name: ".",
-				//         description: "current directory",
-				//         insertValue: ".",
-				//         icon: "fig://icon?type=folder"
-				//     }
-				// ],
-				generators: gitGenerators.files_for_staging,
-			},
-		},
-		{
-			name: "clean",
-			description: "Shows which files would be removed from working directory",
-			options: [
-				{
-					name: "-d",
-					description:
-						"Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under --force) will be removed",
-				},
-				{
-					name: ["-f", "--force"],
-					description:
-						"If the Git configuration variable clean.requireForce is not set to false, git clean will refuse to delete files or directories unless given -f or -i",
-				},
-				{
-					name: ["-i", "--interactive"],
-					description: "Show what would be done and clean files interactively",
-				},
-				{
-					name: ["-n", "--dry-run"],
-					description:
-						"Don’t actually remove anything, just show what would be done",
-				},
-				{
-					name: ["-q", "--quiet"],
-					description:
-						"Be quiet, only report errors, but not the files that are successfully removed",
-				},
-				{
-					name: ["-e", "--exclude"],
-					description:
-						"Use the given exclude pattern in addition to the standard ignore rules",
-					args: {
-						name: "pattern",
-					},
-				},
-				{
-					name: "-x",
-					description:
-						"Don’t use the standard ignore rules (see gitignore(5)), but still use the ignore rules given with -e options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with git restore or git reset) to create a pristine working directory to test a clean build",
-				},
-				{
-					name: "-X",
-					description:
-						"Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files",
-				},
-			],
-			args: {
-				name: "path",
-				template: "filepaths",
-			},
-		},
-		{
-			name: "revert",
-			description:
-				"Create new commit that undoes all of the changes made in <commit>, then apply it to the current branch",
-			args: {
-				name: "commit",
-				isOptional: true,
-				generators: gitGenerators.commits,
-			},
-		},
-		{
-			name: "ls-remote",
-			description: "List references in a remote repository",
-		},
-		{
-			name: "push",
-			description: "Update remote refs",
-			options: [
-				{
-					name: "--all",
-					description:
-						"Push all branches (i.e. refs under refs/heads/); cannot be used with other <refspec>",
-				},
-				{
-					name: "--prune",
-					description:
-						"Remove remote branches that don't have a local counterpart",
-				},
-				{
-					name: "--mirror",
-					description:
-						"Instead of naming each ref to push, specifies that all refs under refs/ be mirrored to the remote repository",
-				},
-				{
-					name: ["-n", "--dry-run"],
-					description: "Do everything except actually send the updates",
-				},
-				{
-					name: "--porcelain",
-					description:
-						"Produce machine-readable output. The output status line for each ref will be tab-separated and sent to stdout instead of stderr",
-				},
-				{
-					name: ["-d", "--delete"],
-					description:
-						"All listed refs are deleted from the remote repository. This is the same as prefixing all refs with a colon",
-				},
-				{
-					name: "--tags",
-					description:
-						"All refs under refs/tags are pushed, in addition to refspecs explicitly listed on the command line",
-				},
-				{
-					name: "--follow-tags",
-					description:
-						"Push all the refs that would be pushed without this option, and also push annotated tags in refs/tags that are missing from the remote but are pointing at commit-ish that are reachable from the refs being pushed. This can also be specified with configuration variable push.followTags",
-				},
-				{
-					name: "--signed",
-					description:
-						"GPG-sign the push request to update refs on the receiving side, to allow it to be checked by the hooks and/or be logged. If false or --no-signed, no signing will be attempted. If true or --signed, the push will fail if the server does not support signed pushes. If set to if-asked, sign if and only if the server supports signed pushes. The push will also fail if the actual call to gpg --sign fails. See git-receive-pack(1) for the details on the receiving end",
-					args: {
-						isOptional: true,
-						suggestions: ["true", "false", "if-asked"],
-					},
-				},
-				{
-					name: "--no-signed",
-					description:
-						"GPG-sign the push request to update refs on the receiving side, to allow it to be checked by the hooks and/or be logged. If false or --no-signed, no signing will be attempted. If true or --signed, the push will fail if the server does not support signed pushes. If set to if-asked, sign if and only if the server supports signed pushes. The push will also fail if the actual call to gpg --sign fails. See git-receive-pack(1) for the details on the receiving end",
-				},
-				{
-					name: "--atomic",
-					description:
-						"Use an atomic transaction on the remote side if available. Either all refs are updated, or on error, no refs are updated. If the server does not support atomic pushes the push will fail",
-				},
-				{
-					name: "--no-atomic",
-					description:
-						"Use an atomic transaction on the remote side if available. Either all refs are updated, or on error, no refs are updated. If the server does not support atomic pushes the push will fail",
-				},
-				{
-					name: ["-f", "--force"],
-					description:
-						"Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. Also, when --force-with-lease option is used, the command refuses to update a remote ref whose current value does not match what is expected. This flag disables these checks, and can cause the remote repository to lose commits; use it with care",
-				},
-				{
-					name: "--repo",
-					requiresSeparator: true,
-					description:
-						"This option is equivalent to the <repository> argument. If both are specified, the command-line argument takes precedence",
-					args: {
-						name: "repository",
-					},
-				},
-				{
-					name: ["-u", "--set-upstream"],
-					description:
-						"For every branch that is up to date or successfully pushed, add upstream (tracking) reference, used by argument-less git-pull(1) and other commands",
-				},
-				{
-					name: "--thin",
-					description:
-						"These options are passed to git-send-pack(1). A thin transfer significantly reduces the amount of sent data when the sender and receiver share many of the same objects in common. The default is --thin",
-				},
-				{
-					name: "--no-thin",
-					description:
-						"These options are passed to git-send-pack(1). A thin transfer significantly reduces the amount of sent data when the sender and receiver share many of the same objects in common. The default is --thin",
-				},
-				{
-					name: ["-q", "--quiet"],
-					description:
-						"Suppress all output, including the listing of updated refs, unless an error occurs. Progress is not reported to the standard error stream",
-				},
-				{ name: ["-v", "--verbose"], description: "Run verbosely" },
-				{
-					name: "--progress",
-					description:
-						"Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal",
-				},
-				{
-					name: "--no-recurse-submodules",
-					description:
-						"May be used to make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If check is used Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing the push will be aborted and exit with non-zero status. If on-demand is used all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If only is used all submodules will be recursively pushed while the superproject is left unpushed. A value of no or using --no-recurse-submodules can be used to override the push.recurseSubmodules configuration variable when no submodule recursion is required",
-				},
-				{
-					name: "--recurse-submodules",
-					requiresSeparator: true,
-					description:
-						"May be used to make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If check is used Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing the push will be aborted and exit with non-zero status. If on-demand is used all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If only is used all submodules will be recursively pushed while the superproject is left unpushed. A value of no or using --no-recurse-submodules can be used to override the push.recurseSubmodules configuration variable when no submodule recursion is required",
-					args: {
-						suggestions: ["check", "on-demand", "only", "no"],
-					},
-				},
-				{
-					name: "--verify",
-					description:
-						"Turn on the pre-push hook. The default is --verify, giving the hook a chance to prevent the push. With",
-				},
-				{
-					name: "--no-verify",
-					description:
-						"Turn off the pre-push hook. The default is --verify, giving the hook a chance to prevent the push. With",
-				},
-				{
-					name: ["-4", "--ipv4"],
-					description: "Use IPv4 addresses only, ignoring IPv6 addresses",
-				},
-				{
-					name: ["-6", "--ipv6"],
-					description: "Use IPv6 addresses only, ignoring IPv4 addresses",
-				},
-				{
-					name: ["-o", "--push-option"],
+        // suggestions: [
+        //     {
+        //         name: ".",
+        //         description: "current directory",
+        //         insertValue: ".",
+        //         icon: "fig://icon?type=folder"
+        //     }
+        // ],
+        generators: gitGenerators.files_for_staging,
+      },
+    },
+    {
+      name: "clean",
+      description: "Shows which files would be removed from working directory",
+      options: [
+        {
+          name: "-d",
+          description:
+            "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under --force) will be removed",
+        },
+        {
+          name: ["-f", "--force"],
+          description:
+            "If the Git configuration variable clean.requireForce is not set to false, git clean will refuse to delete files or directories unless given -f or -i",
+        },
+        {
+          name: ["-i", "--interactive"],
+          description: "Show what would be done and clean files interactively",
+        },
+        {
+          name: ["-n", "--dry-run"],
+          description:
+            "Don’t actually remove anything, just show what would be done",
+        },
+        {
+          name: ["-q", "--quiet"],
+          description:
+            "Be quiet, only report errors, but not the files that are successfully removed",
+        },
+        {
+          name: ["-e", "--exclude"],
+          description:
+            "Use the given exclude pattern in addition to the standard ignore rules",
+          args: {
+            name: "pattern",
+          },
+        },
+        {
+          name: "-x",
+          description:
+            "Don’t use the standard ignore rules (see gitignore(5)), but still use the ignore rules given with -e options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with git restore or git reset) to create a pristine working directory to test a clean build",
+        },
+        {
+          name: "-X",
+          description:
+            "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files",
+        },
+      ],
+      args: {
+        name: "path",
+        template: "filepaths",
+      },
+    },
+    {
+      name: "revert",
+      description:
+        "Create new commit that undoes all of the changes made in <commit>, then apply it to the current branch",
+      args: {
+        name: "commit",
+        isOptional: true,
+        generators: gitGenerators.commits,
+      },
+    },
+    {
+      name: "ls-remote",
+      description: "List references in a remote repository",
+    },
+    {
+      name: "push",
+      description: "Update remote refs",
+      options: [
+        {
+          name: "--all",
+          description:
+            "Push all branches (i.e. refs under refs/heads/); cannot be used with other <refspec>",
+        },
+        {
+          name: "--prune",
+          description:
+            "Remove remote branches that don't have a local counterpart",
+        },
+        {
+          name: "--mirror",
+          description:
+            "Instead of naming each ref to push, specifies that all refs under refs/ be mirrored to the remote repository",
+        },
+        {
+          name: ["-n", "--dry-run"],
+          description: "Do everything except actually send the updates",
+        },
+        {
+          name: "--porcelain",
+          description:
+            "Produce machine-readable output. The output status line for each ref will be tab-separated and sent to stdout instead of stderr",
+        },
+        {
+          name: ["-d", "--delete"],
+          description:
+            "All listed refs are deleted from the remote repository. This is the same as prefixing all refs with a colon",
+        },
+        {
+          name: "--tags",
+          description:
+            "All refs under refs/tags are pushed, in addition to refspecs explicitly listed on the command line",
+        },
+        {
+          name: "--follow-tags",
+          description:
+            "Push all the refs that would be pushed without this option, and also push annotated tags in refs/tags that are missing from the remote but are pointing at commit-ish that are reachable from the refs being pushed. This can also be specified with configuration variable push.followTags",
+        },
+        {
+          name: "--signed",
+          description:
+            "GPG-sign the push request to update refs on the receiving side, to allow it to be checked by the hooks and/or be logged. If false or --no-signed, no signing will be attempted. If true or --signed, the push will fail if the server does not support signed pushes. If set to if-asked, sign if and only if the server supports signed pushes. The push will also fail if the actual call to gpg --sign fails. See git-receive-pack(1) for the details on the receiving end",
+          args: {
+            isOptional: true,
+            suggestions: ["true", "false", "if-asked"],
+          },
+        },
+        {
+          name: "--no-signed",
+          description:
+            "GPG-sign the push request to update refs on the receiving side, to allow it to be checked by the hooks and/or be logged. If false or --no-signed, no signing will be attempted. If true or --signed, the push will fail if the server does not support signed pushes. If set to if-asked, sign if and only if the server supports signed pushes. The push will also fail if the actual call to gpg --sign fails. See git-receive-pack(1) for the details on the receiving end",
+        },
+        {
+          name: "--atomic",
+          description:
+            "Use an atomic transaction on the remote side if available. Either all refs are updated, or on error, no refs are updated. If the server does not support atomic pushes the push will fail",
+        },
+        {
+          name: "--no-atomic",
+          description:
+            "Use an atomic transaction on the remote side if available. Either all refs are updated, or on error, no refs are updated. If the server does not support atomic pushes the push will fail",
+        },
+        {
+          name: ["-f", "--force"],
+          description:
+            "Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. Also, when --force-with-lease option is used, the command refuses to update a remote ref whose current value does not match what is expected. This flag disables these checks, and can cause the remote repository to lose commits; use it with care",
+        },
+        {
+          name: "--repo",
+          requiresSeparator: true,
+          description:
+            "This option is equivalent to the <repository> argument. If both are specified, the command-line argument takes precedence",
+          args: {
+            name: "repository",
+          },
+        },
+        {
+          name: ["-u", "--set-upstream"],
+          description:
+            "For every branch that is up to date or successfully pushed, add upstream (tracking) reference, used by argument-less git-pull(1) and other commands",
+        },
+        {
+          name: "--thin",
+          description:
+            "These options are passed to git-send-pack(1). A thin transfer significantly reduces the amount of sent data when the sender and receiver share many of the same objects in common. The default is --thin",
+        },
+        {
+          name: "--no-thin",
+          description:
+            "These options are passed to git-send-pack(1). A thin transfer significantly reduces the amount of sent data when the sender and receiver share many of the same objects in common. The default is --thin",
+        },
+        {
+          name: ["-q", "--quiet"],
+          description:
+            "Suppress all output, including the listing of updated refs, unless an error occurs. Progress is not reported to the standard error stream",
+        },
+        { name: ["-v", "--verbose"], description: "Run verbosely" },
+        {
+          name: "--progress",
+          description:
+            "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal",
+        },
+        {
+          name: "--no-recurse-submodules",
+          description:
+            "May be used to make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If check is used Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing the push will be aborted and exit with non-zero status. If on-demand is used all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If only is used all submodules will be recursively pushed while the superproject is left unpushed. A value of no or using --no-recurse-submodules can be used to override the push.recurseSubmodules configuration variable when no submodule recursion is required",
+        },
+        {
+          name: "--recurse-submodules",
+          requiresSeparator: true,
+          description:
+            "May be used to make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If check is used Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing the push will be aborted and exit with non-zero status. If on-demand is used all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If only is used all submodules will be recursively pushed while the superproject is left unpushed. A value of no or using --no-recurse-submodules can be used to override the push.recurseSubmodules configuration variable when no submodule recursion is required",
+          args: {
+            suggestions: ["check", "on-demand", "only", "no"],
+          },
+        },
+        {
+          name: "--verify",
+          description:
+            "Turn on the pre-push hook. The default is --verify, giving the hook a chance to prevent the push. With",
+        },
+        {
+          name: "--no-verify",
+          description:
+            "Turn off the pre-push hook. The default is --verify, giving the hook a chance to prevent the push. With",
+        },
+        {
+          name: ["-4", "--ipv4"],
+          description: "Use IPv4 addresses only, ignoring IPv6 addresses",
+        },
+        {
+          name: ["-6", "--ipv6"],
+          description: "Use IPv6 addresses only, ignoring IPv4 addresses",
+        },
+        {
+          name: ["-o", "--push-option"],
 
-					description:
-						"Transmit the given string to the server, which passes them to the pre-receive as well as the post-receive hook. The given string must not contain a NUL or LF character. When multiple --push-option=<option> are given, they are all sent to the other side in the order listed on the command line. When no --push-option=<option> is given from the command line, the values of configuration variable push.pushOption are used instead",
-					args: {
-						name: "option",
-					},
-				},
-				{
-					name: ["--receive-pack", "--exec"],
-					description:
-						"Path to the git-receive-pack program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH",
-					args: {
-						name: "git-receive-pack",
-					},
-				},
-				{
-					name: "--no-force-with-lease",
-					description:
-						"Cancel all the previous --force-with-lease on the command line",
-				},
-				{
-					name: "--force-with-lease",
-					description:
-						"Protect the named ref (alone), if it is going to be updated, by requiring its current value to be the same as the specified value <expect> (which is allowed to be different from the remote-tracking branch we have for the refname, or we do not even have to have such a remote-tracking branch when this form is used). If <expect> is the empty string, then the named ref must not already exist",
-					args: {
-						name: "refname[:expect]",
-						isOptional: true,
-					},
-				},
-			],
-			args: [
-				{
-					name: "remote",
-					isOptional: true,
-					generators: gitGenerators.remotes,
-					filterStrategy: "fuzzy",
-				},
-				{
-					name: "branch",
-					isOptional: true,
-					generators: gitGenerators.localBranches,
-					filterStrategy: "fuzzy",
-				},
-			],
-		},
-		{
-			name: "pull",
-			description: "Integrate with another repository",
-			options: [
-				{
-					name: ["--rebase", "-r"],
-					isDangerous: true,
-					description:
-						"Fetch the remote’s copy of current branch and rebases it into the local copy",
-					args: {
-						isOptional: true,
-						name: "remote",
-						generators: gitGenerators.remotes,
-						filterStrategy: "fuzzy",
-						suggestions: ["false", "true", "merges", "preserve", "interactive"],
-					},
-				},
-				{ name: "--no-rebase", description: "Override earlier --rebase" },
-				{
-					name: "--commit",
-					description:
-						"Perform the merge and commit the result. This option can be used to override --no-commit",
-				},
-				{
-					name: "--no-commit",
-					description:
-						"Perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing",
-				},
-				{
-					name: ["--edit", "-e"],
-					description:
-						"Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge",
-				},
-				{
-					name: "--no-edit",
-					description:
-						"The --no-edit option can be used to accept the auto-generated message (this is generally discouraged). The --edit (or -e) option is still useful if you are giving a draft message with the -m option from the command line and want to edit it in the editor",
-				},
-				{
-					name: "--cleanup",
-					description:
-						"This option determines how the merge message will be cleaned up before committing. See git-commit[1] for more details. In addition, if the <mode> is given a value of scissors, scissors will be appended to MERGE_MSG before being passed on to the commit machinery in the case of a merge conflict",
-					requiresSeparator: true,
-					args: {
-						name: "mode",
-						suggestions: [
-							"strip",
-							"whitespace",
-							"verbatim",
-							"scissors",
-							"default",
-						],
-					},
-				},
-				{
-					name: "--ff",
-					description:
-						"When possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit",
-				},
-				{
-					name: "--no-ff",
-					description:
-						"Create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward",
-				},
-				{
-					name: "--ff-only",
-					description:
-						"Resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status",
-				},
-				{
-					name: ["-S", "--gpg-sign"],
-					description:
-						"GPG-sign the resulting merge commit. The keyid argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space",
-					args: {
-						name: "keyid",
-						isOptional: true,
-					},
-				},
-				{
-					name: "--no-gpg-sign",
-					description:
-						"Is useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
-				},
-				{
-					name: "--log",
-					description:
-						"In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also git-fmt-merge-msg[1]",
-					args: {
-						name: "n",
-						isOptional: true,
-					},
-				},
-				{
-					name: "--no-log",
-					description:
-						"Do not list one-line descriptions from the actual commits being merged",
-				},
-				{
-					name: "--signoff",
-					description:
-						"Add a Signed-off-by trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you’re committing. For example, it may certify that the committer has the rights to submit the work under the project’s license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you’re contributing to understand how the signoffs are used in that project",
-				},
-				{
-					name: "--no-signoff",
-					description:
-						"Can be used to countermand an earlier --signoff option on the command line",
-				},
-				{
-					name: "--stat",
-					description:
-						"Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat",
-				},
-				{
-					name: ["-n", "--no-stat"],
-					description: "Do not show a diffstat at the end of the merge",
-				},
-				{
-					name: "--squash",
-					description:
-						"With --squash, --commit is not allowed, and will fail. Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the HEAD, or record $GIT_DIR/MERGE_HEAD (to cause the next git commit command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)",
-				},
-				{
-					name: "--no-squash",
-					description:
-						"Perform the merge and commit the result. This option can be used to override --squash",
-				},
-				{
-					name: "--no-verify",
-					description:
-						"This option bypasses the pre-merge and commit-msg hooks. See also githooks[5]",
-				},
-				{
-					name: ["-s", "--strategy"],
-					description:
-						"Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no -s option, a built-in list of strategies is used instead (git merge-recursive when merging a single head, git merge-octopus otherwise)",
-					args: {
-						name: "strategy",
-						isVariadic: true,
-						suggestions: ["resolve", "recursive", "octopus", "ours", "subtree"],
-					},
-				},
-				{
-					name: ["-X", "--strategy-option"],
-					description:
-						"Pass merge strategy specific option through to the merge strategy",
-					args: {
-						name: "option",
-						suggestions: [
-							"ours",
-							"theirs",
-							"patience",
-							"diff-algorithm",
-							"diff-algorithm=patience",
-							"diff-algorithm=minimal",
-							"diff-algorithm=histogram",
-							"diff-algorithm=myers",
-							"ignore-space-change",
-							"ignore-all-space",
-							"ignore-space-at-eol",
-							"ignore-cr-at-eol",
-							"renormalize",
-							"no-renormalize",
-							"no-renames",
-							"find-renames",
-							"subtree",
-						],
-					},
-				},
-				{
-					name: "--verify-signatures",
-					description:
-						"Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted",
-				},
-				{
-					name: "--no-verify-signatures",
-					description:
-						"Do not verify that the tip commit of the side branch being merged is signed with a valid key",
-				},
-				{
-					name: "--summary",
-					description:
-						"Synonym to --stat ; this is deprecated and will be removed in the future",
-				},
-				{
-					name: "--no-summary",
-					description:
-						"Synonym to --no-stat ; this is deprecated and will be removed in the future",
-				},
-				{
-					name: ["-q", "--quiet"],
-					description: "Operate quietly. Implies --no-progress",
-				},
-				{ name: ["-v", "--verbose"], description: "Be verbose" },
-				{
-					name: "--autostash",
-					description:
-						"Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run the operation on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts",
-				},
-				{
-					name: "--no-autostash",
-					description:
-						"Do not automatically create a temporary stash entry before the operation begins, and apply it after the operation ends",
-				},
-				{
-					name: "--allow-unrelated-histories",
-					description:
-						"By default, git merge command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added",
-				},
-				{
-					name: "--all",
-					description: "Fetch all remotes",
-				},
-				{
-					name: ["-a", "--append"],
-					description:
-						"Append ref names and object names of fetched refs to the existing contents of .git/FETCH_HEAD",
-				},
-				{
-					name: "--atomic",
-					description:
-						"Use an atomic transaction to update local refs. Either all refs are updated, or on error, no refs are updated",
-				},
-				{
-					name: "--depth",
-					requiresSeparator: true,
-					args: {
-						name: "depth",
-					},
-					description:
-						"Limit fetching to the specified number of commits from the tip of each remote branch history",
-				},
-				{
-					name: "--deepen",
-					requiresSeparator: true,
-					args: {
-						name: "depth",
-					},
-					description:
-						"Similar to --depth, except it specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history",
-				},
-				{
-					name: "--shallow-since",
-					requiresSeparator: true,
-					args: {
-						name: "date",
-					},
-					description:
-						"Deepen or shorten the history of a shallow repository to include all reachable commits after <date>",
-				},
-				{
-					name: "--shallow-exclude",
-					requiresSeparator: true,
-					args: {
-						name: "revision",
-					},
-					description:
-						"Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag. This option can be specified multiple times",
-				},
-				{
-					name: "--unshallow",
-					description:
-						"If the source repository is shallow, fetch as much as possible so that the current repository has the same history as the source repository",
-				},
-				{
-					name: "--update-shallow",
-					description:
-						"By default when fetching from a shallow repository, git fetch refuses refs that require updating .git/shallow",
-				},
-				{
-					name: "--negotiation-tip",
-					requiresSeparator: true,
-					args: {
-						name: "commit|glob",
-						generators: gitGenerators.commits,
-					},
-					description:
-						"By default, Git will report, to the server, commits reachable from all local refs to find common commits in an attempt to reduce the size of the to-be-received packfile",
-				},
-				{
-					name: "--dry-run",
-					description: "Show what would be done, without making any changes",
-				},
-				{
-					name: ["-f", "--force"],
-					description: "This option overrides that check",
-				},
-				{
-					name: ["-k", "--keep"],
-					description: "Keep downloaded pack",
-				},
-				{
-					name: ["-p", "--prune"],
-					description:
-						"Before fetching, remove any remote-tracking references that no longer exist on the remote",
-				},
-				{
-					name: ["-P", "--prune-tags"],
-					description:
-						"Before fetching, remove any local tags that no longer exist on the remote if --prune is enabled",
-				},
-				{
-					name: "--no-tags",
-					description:
-						"By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following",
-				},
-				{
-					name: "--refmap",
-					requiresSeparator: true,
-					args: {
-						name: "refspec",
-					},
-					description:
-						"When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository",
-				},
-				{
-					name: ["-t", "--tags"],
-					description:
-						"By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following",
-				},
-				{
-					name: "--recurse-submodules",
-					requiresSeparator: true,
-					args: {
-						name: "mode",
-						isOptional: true,
-						suggestions: ["yes", "on-demand", "no"],
-					},
-					description:
-						"When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository",
-				},
-				{
-					name: "--no-recurse-submodules",
-					description:
-						"Disable recursive fetching of submodules (this has the same effect as using the --recurse-submodules=no option)",
-				},
-				{
-					name: ["-j", "--jobs"],
-					args: {
-						name: "n",
-					},
-					description:
-						"Number of parallel children to be used for all forms of fetching",
-				},
-				{
-					name: "--set-upstream",
-					description:
-						"If the remote is fetched successfully, add upstream (tracking) reference, used by argument-less git-pull[1] and other commands",
-				},
-				{
-					name: "--upload-pack",
-					args: {
-						name: "upload-pack",
-					},
-					description:
-						"When given, and the repository to fetch from is handled by git fetch-pack, --exec=<upload-pack> is passed to the command to specify non-default path for the command run on the other end",
-				},
-				{
-					name: "--progress",
-					description:
-						"Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified",
-				},
-				{
-					name: ["-o", "--server-option"],
-					args: {
-						name: "option",
-					},
-					description:
-						"Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character",
-				},
-				{
-					name: "--show-forced-updates",
-					description:
-						"By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs",
-				},
-				{
-					name: "--no-show-forced-updates",
-					description:
-						"By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons",
-				},
-				{
-					name: ["-4", "--ipv4"],
-					description: "Use IPv4 addresses only, ignoring IPv6 addresses",
-				},
-				{
-					name: ["-6", "--ipv6"],
-					description: "Use IPv6 addresses only, ignoring IPv4 addresses",
-				},
-			],
-			args: [
-				{
-					name: "remote",
-					isOptional: true,
-					generators: gitGenerators.remotes,
-					filterStrategy: "fuzzy",
-				},
-				{
-					name: "branch",
-					isOptional: true,
-					generators: gitGenerators.localBranches,
-					filterStrategy: "fuzzy",
-				},
-			],
-		},
-		{
-			name: "diff",
-			description: "Show changes between commits, commit and working tree, etc",
-			options: [
-				{
-					name: "--staged",
-					description:
-						"Show difference between the files in the staging area and the latest version",
-				},
-				{
-					name: "--cached",
-					description: "Show difference between staged changes and last commit",
-				},
-				{
-					name: "--help",
-					description: "Shows different options",
-				},
-				{
-					name: "--numstat",
-					description:
-						"Shows number of added and deleted lines in decimal notation",
-				},
-				{
-					name: "--name-only",
-					description: "Show only names of changed files",
-				},
-				{
-					name: "--shortstat",
-					description:
-						"Output only the last line of the --stat format containing total number of modified files",
-				},
-				{
-					name: "--stat",
-					description: "Generate a diffstat",
-					requiresSeparator: true,
-					args: {
-						isOptional: true,
-						name: "[=< width >[,< name-width >[,< count >]]]",
-					},
-				},
-				{
-					name: "--",
-					description:
-						"Separates paths from options for disambiguation purposes",
-					args: {
-						isVariadic: true,
-						optionsCanBreakVariadicArg: false,
-						template: "filepaths",
-						name: "[< path >...]",
-					},
-				},
-			],
-			args: {
-				name: "commit or file",
-				isOptional: true,
-				isVariadic: true,
-				suggestions: headSuggestions,
-				generators: [
-					gitGenerators.commits,
-					gitGenerators.remoteLocalBranches,
-					gitGenerators.getChangedTrackedFiles,
-				],
-			},
-		},
-		{
-			name: "reset",
-			description: "Reset current HEAD to the specified state",
-			options: [
-				{
-					name: "--keep",
-					description:
-						"Safe: files which are different between the current HEAD and the given commit. Will abort if there are uncommitted changes",
-				},
-				{
-					name: "--soft",
-					description:
-						"Remove the last commit from the current branch, but the file changes will stay in your working tree",
-				},
-				{
-					name: "--hard",
-					description:
-						"⚠️WARNING: you will lose all uncommitted changes in addition to the changes introduced in the last commit",
-				},
-				{
-					name: "--mixed",
-					description:
-						"Keep the changes in your working tree but not on the index",
-				},
-				{
-					name: "-N",
-					description: "Mark removed paths as intent-to-add",
-					dependsOn: ["--mixed"],
-				},
-				{
-					name: "--merge",
-					description:
-						"Resets the index and updates the files in the working tree that are different" +
-						" between 'commit' and HEAD",
-				},
-				{
-					name: ["-q", "--quiet"],
-					description: "Be quiet, only report errors",
-					exclusiveOn: ["--no-quiet"],
-				},
-				{
-					name: "--no-quiet",
-					description: "Inverse of --quiet",
-					exclusiveOn: ["-q", "--quiet"],
-				},
-				{
-					name: "--pathspec-from-file",
-					requiresSeparator: true,
-					description:
-						"Pathspec is passed in file <file> instead of commandline args",
-					args: {
-						name: "file",
-						template: ["folders", "filepaths"],
-						suggestions: ["-"],
-					},
-				},
-				{
-					name: "--pathspec-file-nul",
-					description: "Pathspec elements are separated with NUL character",
-					dependsOn: ["--pathspec-from-file"],
-				},
-				{
-					name: ["-p", "--patch"],
-					description:
-						"Interactively select hunks in the difference between the index and <tree-ish>",
-				},
-			],
-			args: {
-				isOptional: true,
-				isVariadic: true,
-				suggestions: headSuggestions,
-				generators: [
-					gitGenerators.treeish,
-					gitGenerators.commits,
-					gitGenerators.remoteLocalBranches,
-				],
-			},
-		},
-		{
-			name: "log",
-			description: "Show commit logs",
-			options: [
-				{
-					name: "--follow",
-					description: "Show history of given file",
-					args: {
-						name: "file",
-						template: "filepaths",
-					},
-				},
-				{
-					name: ["-q", "--quiet"],
-					description: "Suppress diff output",
-				},
-				{
-					name: "--show-signature",
-					description: "Check the validity of a signed commit",
-				},
-				{
-					name: "--source",
-					description: "Show source",
-				},
-				{
-					name: "--oneline",
-					description: "Show each commit as a single line",
-				},
-				{
-					name: ["-p", "-u", "--patch"],
-					description: "Display the full diff of each commit",
-				},
-				{
-					name: "--stat",
-					description:
-						"Include which files were altered and the relative number of lines that were added or deleted from each of them",
-				},
-				{
-					name: "--grep",
-					description:
-						"Search for commits with a commit message that matches <pattern>",
-					requiresSeparator: true,
-					args: {
-						name: "pattern",
-					},
-				},
-				{
-					name: "--author",
-					description: "Search for commits by a particular author",
-					requiresSeparator: true,
-					args: {
-						name: "pattern",
-					},
-				},
-			],
-			args: [
-				{
-					name: "since",
-					isOptional: true,
-					description: "Commit ID, branch name, HEAD, or revision reference",
-					generators: gitGenerators.commits,
-					suggestions: headSuggestions,
-				},
-				{
-					name: "until",
-					isOptional: true,
-					description: "Commit ID, branch name, HEAD, or revision reference",
-					generators: gitGenerators.commits,
-					suggestions: headSuggestions,
-				},
-			],
-		},
-		{
-			name: "remote",
-			description: "Manage remote repository",
-			subcommands: [
-				{
-					name: "add",
-					description: "Add a remote named <name> for the repository at <url>",
-					args: [{ name: "name" }, { name: "repository url" }],
-					options: [
-						{
-							name: "-t",
-							description: "A refspec to track only <branch> is created",
-							args: {
-								name: "branch",
-							},
-						},
-						{
-							name: "-m",
-							description:
-								"A symbolic-ref refs/remotes/<name>/HEAD is set up to point at remote’s <master> branch",
-							args: {
-								name: "master",
-							},
-						},
-						{
-							name: "-f",
-							description:
-								"Git fetch <name> is run immediately after the remote information is set up",
-						},
-						{
-							name: "--tags",
-							description:
-								"Git fetch <name> imports every tag from the remote repository",
-						},
-						{
-							name: "--no-tags",
-							description:
-								"Git fetch <name> does not import tags from the remote repository",
-						},
-						{
-							name: "--mirror",
-							requiresSeparator: true,
-							description: "Create fetch or push mirror",
-							args: {
-								suggestions: ["fetch", "push"],
-							},
-						},
-					],
-				},
-				{
-					name: "set-head",
-					description: "Sets or deletes the default branch",
-					args: [
-						{
-							name: "name",
-							generators: gitGenerators.remotes,
-							filterStrategy: "fuzzy",
-						},
-						{
-							name: "branch",
-							isOptional: true,
-						},
-					],
-					options: [
-						{
-							name: ["--auto", "-a"],
-							description:
-								"The remote is queried to determine its HEAD, then the symbolic-ref refs/remotes/<name>/HEAD is set to the same branch",
-						},
-						{
-							name: ["--delete", "-d"],
-							description:
-								"The symbolic ref refs/remotes/<name>/HEAD is deleted",
-						},
-					],
-				},
-				{
-					name: "set-branches",
-					description:
-						"Changes the list of branches tracked by the named remote. This can be used to track a subset of the available remote branches after the initial setup for a remote",
-					options: [
-						{
-							name: "--add",
-							description:
-								"Instead of replacing the list of currently tracked branches, adds to that list",
-						},
-					],
-					args: [
-						{
-							name: "name",
-							generators: gitGenerators.remotes,
-							filterStrategy: "fuzzy",
-						},
-						{
-							name: "branch",
-							isVariadic: true,
-						},
-					],
-				},
-				{
-					name: ["rm", "remove"],
-					description: "Removes given remote [name]",
-					args: {
-						name: "remote",
-						generators: gitGenerators.remotes,
-						filterStrategy: "fuzzy",
-					},
-				},
-				{
-					name: "rename",
-					description: "Removes given remote [name]",
-					args: [
-						{
-							name: "old remote",
-							generators: gitGenerators.remotes,
-							filterStrategy: "fuzzy",
-						},
-						{
-							name: "new remote name",
-						},
-					],
-				},
-				{
-					name: "get-url",
-					description: "Retrieves the URLs for a remote",
-					options: [
-						{
-							name: "--push",
-							description: "Push URLs are queried rather than fetch URLs",
-						},
-						{
-							name: "--all",
-							description: "All URLs for the remote will be listed",
-						},
-					],
-					args: {
-						name: "name",
-						generators: gitGenerators.remotes,
-						filterStrategy: "fuzzy",
-					},
-				},
-				{
-					name: "set-url",
-					description: "Changes the URLs for the remote",
-					args: [
-						{
-							name: "name",
-							generators: gitGenerators.remotes,
-							filterStrategy: "fuzzy",
-						},
-						{
-							name: "newurl",
-						},
-						{
-							name: "oldurl",
-							isOptional: true,
-						},
-					],
-					options: [
-						{
-							name: "--push",
-							description: "Push URLs are manipulated instead of fetch URLs",
-						},
-						{
-							name: "--add",
-							description:
-								"Instead of changing existing URLs, new URL is added",
-						},
-						{
-							name: "--delete",
-							description:
-								"Instead of changing existing URLs, all URLs matching regex <url> are deleted for remote <name>",
-						},
-					],
-				},
-				{
-					name: "show",
-					description: "Gives some information about the remote [name]",
-					args: {
-						name: "name",
-						isVariadic: true,
-						generators: gitGenerators.remotes,
-						filterStrategy: "fuzzy",
-					},
-					options: [
-						{
-							name: "-n",
-							description:
-								"The remote heads are not queried first with git ls-remote <name>; cached information is used instead",
-						},
-					],
-				},
-				{
-					name: "prune",
-					description:
-						"Equivalent to git fetch --prune [name], except that no new references will be fetched",
-					args: {
-						name: "name",
-						isVariadic: true,
-						generators: gitGenerators.remotes,
-						filterStrategy: "fuzzy",
-					},
-					options: [
-						{
-							name: "-n",
-						},
-						{
-							name: "--dry-run",
-							description:
-								"Report what branches would be pruned, but do not actually prune them",
-						},
-					],
-				},
-				{
-					name: "update",
-					description:
-						"Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>",
-					options: [
-						{
-							name: ["-p", "--prune"],
-							description: "",
-						},
-					],
-					args: [
-						{
-							name: "group",
-							isOptional: true,
-							isVariadic: true,
-						},
-						{
-							name: "remote",
-							isOptional: true,
-							isVariadic: true,
-						},
-					],
-				},
-			],
-			options: [
-				{
-					name: ["-v", "--verbose"],
-					description:
-						"Be a little more verbose and show remote url after name. NOTE: This must be placed between remote and subcommand",
-				},
-			],
-		},
-		{
-			name: "fetch",
-			description: "Download objects and refs from another repository",
-			args: [
-				{
-					name: "remote",
-					isOptional: true,
-					generators: gitGenerators.remotes,
-					filterStrategy: "fuzzy",
-				},
-				{
-					name: "branch",
-					isOptional: true,
-					generators: gitGenerators.localBranches,
-					filterStrategy: "fuzzy",
-				},
-				{
-					name: "refspec",
-					isOptional: true,
-				},
-			],
-			options: [
-				{
-					name: "--all",
-					description: "Fetch all remotes",
-				},
-				{
-					name: ["-a", "--append"],
-					description:
-						"Append ref names and object names of fetched refs to the existing contents of .git/FETCH_HEAD",
-				},
-				{
-					name: "--atomic",
-					description:
-						"Use an atomic transaction to update local refs. Either all refs are updated, or on error, no refs are updated",
-				},
-				{
-					name: "--depth",
-					requiresSeparator: true,
-					args: {
-						name: "depth",
-					},
-					description:
-						"Limit fetching to the specified number of commits from the tip of each remote branch history",
-				},
-				{
-					name: "--deepen",
-					requiresSeparator: true,
-					args: {
-						name: "depth",
-					},
-					description:
-						"Similar to --depth, except it specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history",
-				},
-				{
-					name: "--shallow-since",
-					requiresSeparator: true,
-					args: {
-						name: "date",
-					},
-					description:
-						"Deepen or shorten the history of a shallow repository to include all reachable commits after <date>",
-				},
-				{
-					name: "--shallow-exclude",
-					requiresSeparator: true,
-					args: {
-						name: "revision",
-					},
-					description:
-						"Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag. This option can be specified multiple times",
-				},
-				{
-					name: "--unshallow",
-					description:
-						"If the source repository is shallow, fetch as much as possible so that the current repository has the same history as the source repository",
-				},
-				{
-					name: "--update-shallow",
-					description:
-						"By default when fetching from a shallow repository, git fetch refuses refs that require updating .git/shallow",
-				},
-				{
-					name: "--negotiation-tip",
-					requiresSeparator: true,
-					args: {
-						name: "commit|glob",
-						generators: gitGenerators.commits,
-					},
-					description:
-						"By default, Git will report, to the server, commits reachable from all local refs to find common commits in an attempt to reduce the size of the to-be-received packfile",
-				},
-				{
-					name: "--dry-run",
-					description: "Show what would be done, without making any changes",
-				},
-				{
-					name: "--write-fetch-head",
-					description:
-						"Write the list of remote refs fetched in the FETCH_HEAD file directly under $GIT_DIR. This is the default",
-				},
-				{
-					name: "--no-write-fetch-head",
-					description: "Tells Git not to write the file",
-				},
-				{
-					name: ["-f", "--force"],
-					description: "This option overrides that check",
-				},
-				{
-					name: ["-k", "--keep"],
-					description: "Keep downloaded pack",
-				},
-				{
-					name: "--multiple",
-					description:
-						"Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified",
-				},
-				{
-					name: ["--auto-maintenance", "--auto-gc"],
-					description:
-						"Run git maintenance run --auto at the end to perform automatic repository maintenance if",
-				},
-				{
-					name: ["--no-auto-maintenance", "--no-auto-gc"],
-					description:
-						"Don't run git maintenance run --auto at the end to perform automatic repository maintenance",
-				},
-				{
-					name: "--write-commit-graph",
-					description:
-						"Write a commit-graph after fetching. This overrides the config setting fetch.writeCommitGraph",
-				},
-				{
-					name: "--no-write-commit-graph",
-					description:
-						"Don't write a commit-graph after fetching. This overrides the config setting fetch.writeCommitGraph",
-				},
-				{
-					name: ["-p", "--prune"],
-					description:
-						"Before fetching, remove any remote-tracking references that no longer exist on the remote",
-				},
-				{
-					name: ["-P", "--prune-tags"],
-					description:
-						"Before fetching, remove any local tags that no longer exist on the remote if --prune is enabled",
-				},
-				{
-					name: ["-n", "--no-tags"],
-					description:
-						"By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following",
-				},
-				{
-					name: "--refmap",
-					requiresSeparator: true,
-					args: {
-						name: "refspec",
-					},
-					description:
-						"When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository",
-				},
-				{
-					name: ["-t", "--tags"],
-					description:
-						"By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following",
-				},
-				{
-					name: "--recurse-submodules",
-					requiresSeparator: true,
-					args: {
-						name: "mode",
-						isOptional: true,
-						suggestions: ["yes", "on-demand", "no"],
-					},
-					description:
-						"When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository",
-				},
-				{
-					name: ["-j", "--jobs"],
-					args: {
-						name: "n",
-					},
-					description:
-						"Number of parallel children to be used for all forms of fetching",
-				},
-				{
-					name: "--no-recurse-submodules",
-					description:
-						"Disable recursive fetching of submodules (this has the same effect as using the --recurse-submodules=no option)",
-				},
-				{
-					name: "--set-upstream",
-					description:
-						"If the remote is fetched successfully, add upstream (tracking) reference, used by argument-less git-pull[1] and other commands",
-				},
-				{
-					name: "--submodule-prefix",
-					requiresSeparator: true,
-					args: {
-						name: "path",
-					},
-					description:
-						'Prepend <path> to paths printed in informative messages such as ”Fetching submodule foo". This option is used internally when recursing over submodules',
-				},
-				{
-					name: "--recurse-submodules-default",
-					requiresSeparator: true,
-					args: {
-						name: "mode",
-						isOptional: true,
-						suggestions: ["yes", "on-demand"],
-					},
-					description:
-						"This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option",
-				},
-				{
-					name: ["-u", "--update-head-ok"],
-					description:
-						"By default git fetch refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for git pull to communicate with git fetch, and unless you are implementing your own Porcelain you are not supposed to use it",
-				},
-				{
-					name: "--upload-pack",
-					args: {
-						name: "upload-pack",
-					},
-					description:
-						"When given, and the repository to fetch from is handled by git fetch-pack, --exec=<upload-pack> is passed to the command to specify non-default path for the command run on the other end",
-				},
-				{
-					name: ["-q", "--quiet"],
-					description:
-						"Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream",
-				},
-				{
-					name: ["-v", "--verbose"],
-					description: "Be verbose",
-				},
-				{
-					name: "--progress",
-					description:
-						"Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified",
-				},
-				{
-					name: ["-o", "--server-option"],
-					args: {
-						name: "option",
-					},
-					description:
-						"Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character",
-				},
-				{
-					name: "--show-forced-updates",
-					description:
-						"By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs",
-				},
-				{
-					name: "--no-show-forced-updates",
-					description:
-						"By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons",
-				},
-				{
-					name: ["-4", "--ipv4"],
-					description: "Use IPv4 addresses only, ignoring IPv6 addresses",
-				},
-				{
-					name: ["-6", "--ipv6"],
-					description: "Use IPv6 addresses only, ignoring IPv4 addresses",
-				},
-				{
-					name: "--stdin",
-					description:
-						'Read refspecs, one per line, from stdin in addition to those provided as arguments. The "tag <name>" format is not supported',
-				},
-			],
-		},
-		{
-			name: "stash",
-			description: "Temporarily stores all the modified tracked files",
-			requiresSubcommand: false,
-			subcommands: [
-				{
-					name: "push", // TODO: support for no subcommand is missing
-					description:
-						"Save your local modifications to a new stash entry and roll them back to HEAD",
-					options: [
-						{
-							name: ["-p", "--patch"],
-							description:
-								"Interactively select hunks from the diff between HEAD and the working tree to be stashed",
-						},
-						{
-							name: ["-k", "--keep-index"],
-							description:
-								"All changed already added to the index are left intact",
-						},
-						{
-							name: ["-u", "--include-untracked"],
-							description:
-								"All untracked files are also stashed and then cleaned up",
-						},
-						{
-							name: ["-a", "--all"],
-							description: "All ignored and untracked files are also stashed",
-						},
-						{
-							name: ["-q", "--quiet"],
-							description: "Quiet, suppress feedback messages",
-						},
-						{
-							name: ["-m", "--message"],
-							insertValue: "-m {cursor}",
-							description: "Use the given <msg> as the stash message",
-							args: {
-								name: "message",
-							},
-						},
-						{ name: "--pathspec-from-file", description: "" }, // TODO: pathspec file nul and add description
-						{
-							name: "--",
-							description:
-								"Separates pathsec from options for disambiguation purposes",
-						},
-						// TODO: pathspec
-					],
-				},
-				{
-					name: "show",
-					description: "Show the changes recorded in the stash entry as a diff",
-					args: {
-						name: "stash",
-						isOptional: true,
-						generators: gitGenerators.stashes,
-						filterStrategy: "fuzzy",
-					},
-				},
-				{
-					name: "save",
-					description: "Temporarily stores all the modified tracked files",
-					options: [
-						{
-							name: ["-p", "--patch"],
-							description:
-								"Interactively select hunks from the diff between HEAD and the working tree to be stashed",
-						},
-						{
-							name: ["-k", "--keep-index"],
-							description:
-								"All changed already added to the index are left intact",
-						},
-						{
-							name: ["-u", "--include-untracked"],
-							description:
-								"All untracked files are also stashed and then cleaned up",
-						},
-						{
-							name: ["-a", "--all"],
-							description: "All ignored and untracked files are also stashed",
-						},
-						{
-							name: ["-q", "--quiet"],
-							description: "Quiet, suppress feedback messages",
-						},
-					],
-					args: {
-						name: "message",
-						isOptional: true,
-					},
-				},
-				{
-					name: "pop",
-					description: "Restores the most recently stashed files",
-					options: [
-						{
-							name: "--index",
-							description:
-								"Tries to reinstate not only the working tree's changes, but also the index's ones",
-						},
-						{
-							name: ["-q", "--quiet"],
-							description: "Quiet, suppress feedback messages",
-						},
-					],
-					args: {
-						name: "stash",
-						isOptional: true,
-						generators: gitGenerators.stashes,
-						filterStrategy: "fuzzy",
-					},
-				},
-				{
-					name: "list",
-					description: "Lists all stashed changesets",
-				},
-				{
-					name: "drop",
-					description: "Discards the most recently stashed changeset",
-					options: [
-						{
-							name: ["-q", "--quiet"],
-							description: "Quiet, suppress feedback messages",
-						},
-					],
-					args: {
-						name: "stash",
-						isOptional: true,
-						generators: gitGenerators.stashes,
-						filterStrategy: "fuzzy",
-					},
-				},
-				{
-					name: "clear",
-					description: "Remove all the stash entries",
-				},
-				{
-					name: "apply",
-					description:
-						"Like pop, but do not remove the state from the stash list",
-					options: [
-						{
-							name: "--index",
-							description:
-								"Tries to reinstate not only the working tree's changes, but also the index's ones",
-						},
-						{
-							name: ["-q", "--quiet"],
-							description: "Quiet, suppress feedback messages",
-						},
-					],
-					args: {
-						name: "stash",
-						isOptional: true,
-						generators: gitGenerators.stashes,
-						filterStrategy: "fuzzy",
-					},
-				},
-				{
-					name: "branch",
-					description: "Creates and checks out a new branch named",
-					insertValue: "branch {cursor}",
-					args: [
-						{
-							name: "branch",
-							generators: gitGenerators.localBranches,
-							filterStrategy: "fuzzy",
-						},
-						{
-							name: "stash",
-							isOptional: true,
-							generators: gitGenerators.stashes,
-							filterStrategy: "fuzzy",
-						},
-					],
-				},
-				{
-					name: "create",
-					description: "Creates a stash entry",
-					args: {
-						name: "message",
-						isOptional: true,
-					},
-				},
-				{
-					name: "store",
-					description:
-						"Store a given stash in the stash ref, updating the stash reflog",
-					options: [
-						{
-							name: ["-m", "--message"],
-							insertValue: "-m {cursor}",
-							description: "Use the given <msg> as the stash message",
-							args: {
-								name: "message",
-							},
-						},
-						{
-							name: ["-q", "--quiet"],
-							description: "Quiet, suppress feedback messages",
-						},
-					],
-					args: [
-						{
-							name: "message",
-						},
-						{
-							name: "commit",
-							generators: gitGenerators.commits,
-						},
-					],
-				},
-			],
-		},
-		{
-			name: "reflog",
-			description: "Show history of events with hashes",
-			options: [
-				{
-					name: "--relative-date",
-					description: "Show date info",
-				},
-				{
-					name: "--all",
-					description: "Show all refs",
-				},
-			],
-		},
-		{
-			name: "clone",
-			description: "Clone a repository into a new directory",
-			args: [
-				{
-					name: "repository",
-					description: "Git library to be cloned",
-				},
-				{
-					name: "directory",
-					description: "Specify the new directory name or target folder",
-					template: "folders",
-					isOptional: true,
-				},
-			],
-			options: [
-				{
-					name: ["-l", "--local"],
-					description: "Bypasses the normal git aware transport mechanism",
-				},
-				{
-					name: "--no-hardlinks",
-					description:
-						"Force the cloning process from a repository on a local filesystem to copy the files under the .git/objects directory instead of using hardlinks",
-				},
-				{
-					name: ["-s", "--shared"],
-					isDangerous: true,
-					description:
-						"Automatically setup .git/objects/info/alternates to share the objects with the source repository",
-				},
-				{
-					name: "--dry-run",
-					description: "Do nothing; only show what would happen",
-				},
-				{
-					name: "--reference",
-					description:
-						"If the reference repository is on the local machine, automatically setup",
-					args: {
-						name: "repository",
-					},
-				},
-				{
-					name: "--reference-if-able",
-					description:
-						"If the reference repository is on the local machine, automatically setup. Non existing directory is skipped with a warning",
-					args: {
-						name: "repository",
-					},
-				},
-				{
-					name: "--dissociate",
-					description:
-						"Borrow the objects from reference repositories specified with the --reference options only to reduce network transfer, and stop borrowing from them after a clone is made by making necessary local copies of borrowed objects",
-				},
-				{
-					name: ["-q", "--quiet"],
-					description:
-						"Operate quietly. Progress is not reported to the standard error stream",
-				},
-				{
-					name: ["-v", "--verbose"],
-					description:
-						"Run verbosely. Does not affect the reporting of progress status to the standard error stream",
-				},
-				{
-					name: "--progress",
-					description:
-						"Progress status is reported on the standard error stream by default when it is attached to a terminal, unless --quiet is specified. This flag forces progress status even if the standard error stream is not directed to a terminal",
-				},
-				{
-					name: "--server-option",
-					description:
-						"Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server’s handling of server options, including unknown ones, is server-specific. When multiple --server-option=<option> are given, they are all sent to the other side in the order listed on the command line",
-					requiresSeparator: true,
-					args: {
-						name: "option",
-					},
-				},
-				{
-					name: ["-n", "--no-checkout"],
-					description:
-						"No checkout of HEAD is performed after the clone is complete",
-				},
-				{
-					name: "--bare",
-					description:
-						"Make a bare Git repository. That is, instead of creating <directory> and placing the administrative files in <directory>/.git, make the <directory> itself the $GIT_DIR. This obviously implies the --no-checkout because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to refs/remotes/origin/. When this option is used, neither remote-tracking branches nor the related configuration variables are created",
-				},
-				{
-					name: "--sparse",
-					description:
-						"Initialize the sparse-checkout file so the working directory starts with only the files in the root of the repository. The sparse-checkout file can be modified to grow the working directory as needed",
-				},
-				{
-					name: "--filter",
-					description:
-						"Use the partial clone feature and request that the server sends a subset of reachable objects according to a given object filter. When using --filter, the supplied <filter-spec> is used for the partial clone filter. For example, --filter=blob:none will filter out all blobs (file contents) until needed by Git. Also, --filter=blob:limit=<size> will filter out all blobs of size at least <size>. For more details on filter specifications, see the --filter option in git-rev-list[1]",
-					requiresSeparator: true,
-					args: { name: "filter spec" },
-				},
-				{
-					name: "--mirror",
-					description:
-						"Set up a mirror of the source repository. This implies --bare. Compared to --bare, --mirror not only maps local branches of the source to local branches of the target, it maps all refs (including remote-tracking branches, notes etc.) and sets up a refspec configuration such that all these refs are overwritten by a git remote update in the target repository",
-				},
-				{
-					name: ["-o", "--origin"],
-					description:
-						"Instead of using the remote name origin to keep track of the upstream repository, use <name>. Overrides clone.defaultRemoteName from the config",
-					args: { name: "name" },
-				},
-				{
-					name: ["-b", "--branch"],
-					description:
-						"Instead of pointing the newly created HEAD to the branch pointed to by the cloned repository’s HEAD, point to <name> branch instead. In a non-bare repository, this is the branch that will be checked out. --branch can also take tags and detaches the HEAD at that commit in the resulting repository",
-					args: { name: "branch name" },
-				},
-				{
-					name: ["-u", "--upload-pack"],
-					description:
-						"When given, and the repository to clone from is accessed via ssh, this specifies a non-default path for the command run on the other end",
-					args: {
-						name: "upload pack",
-					},
-				},
-				{
-					name: "--template",
-					description:
-						"Specify the directory from which templates will be used",
-					requiresSeparator: true,
-					args: {
-						name: "template directory",
-					},
-				},
-				{
-					name: ["-c", "--config"],
-					description:
-						"Set a configuration variable in the newly-created repository; this takes effect immediately after the repository is initialized, but before the remote history is fetched or any files checked out. The key is in the same format as expected by git-config[1] (e.g., core.eol=true). If multiple values are given for the same key, each value will be written to the config file. This makes it safe, for example, to add additional fetch refspecs to the origin remote. Due to limitations of the current implementation, some configuration variables do not take effect until after the initial fetch and checkout. Configuration variables known to not take effect are: remote.<name>.mirror and remote.<name>.tagOpt. Use the corresponding --mirror and --no-tags options instead",
-					args: { name: "key=value" },
-				},
-				{
-					name: "--depth",
-					description:
-						"Create a shallow clone with a history truncated to the specified number of commits. Implies --single-branch unless --no-single-branch is given to fetch the histories near the tips of all branches. If you want to clone submodules shallowly, also pass --shallow-submodules",
-					args: {
-						name: "depth",
-					},
-				},
-				{
-					name: "--shallow-since",
-					description:
-						"Create a shallow clone with a history after the specified time",
-					requiresSeparator: true,
-					args: {
-						name: "date",
-					},
-				},
-				{
-					name: "--shallow-exclude",
-					description:
-						"Create a shallow clone with a history, excluding commits reachable from a specified remote branch or tag. This option can be specified multiple times",
-					requiresSeparator: true,
-					args: {
-						name: "revision",
-					},
-				},
-				{
-					name: "--single-branch",
-					description:
-						"Clone only the history leading to the tip of a single branch, either specified by the --branch option or the primary branch remote’s HEAD points at. Further fetches into the resulting repository will only update the remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any branch when --single-branch clone was made, no remote-tracking branch is created",
-				},
-				{
-					name: "--no-single-branch",
-					description:
-						"Do not clone only the history leading to the tip of a single branch, either specified by the --branch option or the primary branch remote’s HEAD points at. Further fetches into the resulting repository will only update the remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any branch when --single-branch clone was made, no remote-tracking branch is created",
-				},
-				{
-					name: "--no-tags",
-					description:
-						"Don’t clone any tags, and set remote.<remote>.tagOpt=--no-tags in the config, ensuring that future git pull and git fetch operations won’t follow any tags. Subsequent explicit tag fetches will still work, (see git-fetch[1])",
-				},
-				{
-					name: "--recurse-submodules",
-					description:
-						"After the clone is created, initialize and clone submodules within based on the provided pathspec. If no pathspec is provided, all submodules are initialized and cloned. This option can be given multiple times for pathspecs consisting of multiple entries",
-					args: {
-						isOptional: true,
-						name: "pathspec",
-					},
-				},
-				{
-					name: "--shallow-submodules",
-					description:
-						"All submodules which are cloned will be shallow with a depth of 1",
-				},
-				{
-					name: "--no-shallow-submodules",
-					description: "Disable --shallow-submodules",
-				},
-				{
-					name: "--remote-submodules",
-					description:
-						"All submodules which are cloned will use the status of the submodule’s remote-tracking branch to update the submodule, rather than the superproject’s recorded SHA-1. Equivalent to passing --remote to git submodule update",
-				},
-				{
-					name: "--no-remote-submodules",
-					description: "Disable --remote-submodules",
-				},
-				{
-					name: ["-j", "--jobs"],
-					description:
-						"The number of submodules fetched at the same time. Defaults to the submodule.fetchJobs option",
-					args: {
-						name: "n",
-						isOptional: true,
-					},
-				},
-				{
-					name: "--separate-git-dir",
-					description:
-						"Instead of placing the cloned repository where it is supposed to be, place the cloned repository at the specified directory, then make a filesystem-agnostic Git symbolic link to there. The result is Git repository can be separated from working tree",
-					requiresSeparator: true,
-					args: {
-						name: "git dir",
-					},
-				},
-			],
-		},
-		{
-			name: "init",
-			description:
-				"Create an empty Git repository or reinitialize an existing one",
-			args: {
-				name: "directory",
-				isOptional: true,
-			},
-			options: [
-				{
-					name: ["-q", "--quiet"],
-					description: "Only print error and warning messages",
-				},
-				{
-					name: "--bare",
-					description: "Create a bare repository",
-				},
-				{
-					name: "--object-format",
-					description: "Specify the given object format",
-					args: {
-						name: "format",
-						suggestions: ["sha1", "sha256"],
-					},
-				},
-				{
-					name: "--template",
-					description:
-						"Specify the directory from which templates will be used",
-					args: {
-						name: "template_directory",
-						template: "folders",
-					},
-				},
-				{
-					name: "--separate-git-dir",
-					description:
-						"Instead of initializing the repository as a directory to either $GIT_DIR or ./.git/, create a text file there containing the path to the actual repository. This file acts as filesystem-agnostic Git symbolic link to the repository",
-					args: {
-						name: "git dir",
-					},
-				},
-				{
-					name: ["-b", "--initial-branch"],
-					description: "Initial branch for new repo",
-					args: {
-						isOptional: true,
-						name: "branch-name",
-					},
-				},
-				{
-					name: "--shared",
-					description:
-						"Specify that the Git repository is to be shared amongst several users. This allows users belonging to the same group to push into that repository",
-					args: {
-						isOptional: true,
-						suggestions: [
-							{
-								name: "false",
-								description: "Use permissions reported by umask(2)",
-							},
-							{
-								name: "true",
-								description: "Make the repository group-writable",
-							},
-							{
-								name: "umask",
-								description: "Use permissions reported by umask(2)",
-							},
-							{
-								name: "group",
-								description: "Make the repository group-writable",
-							},
-							{
-								name: "all",
-								description:
-									"Same as group, but make the repository readable by all users",
-							},
-							{
-								name: "world",
-								description:
-									"Same as group, but make the repository readable by all users",
-							},
-							{
-								name: "everybody",
-								description:
-									"Same as group, but make the repository readable by all users",
-							},
-							{
-								name: "0xxx",
-								description:
-									"0xxx is an octal number and each file will have mode 0xxx. 0xxx will override users' umask(2) value (and not only loosen permissions as group and all does)",
-							},
-						],
-					},
-				},
-			],
-		},
-		{
-			name: "mv",
-			description: "Move or rename a file, a directory, or a symlink",
-			args: [
-				{
-					name: "source",
-					description: "File to move",
-					template: "filepaths",
-				},
-				{
-					name: "destination",
-					description: "Location to move to",
-					template: "folders",
-				},
-			],
-			options: [
-				{
-					name: ["-f", "--force"],
-					description:
-						"Force renaming or moving of a file even if the target exists",
-				},
-				{
-					name: "-k",
-					description:
-						"Skip move or rename actions which would lead to an error condition",
-				},
-				{
-					name: ["-n", "--dry-run"],
-					description: "Do nothing; only show what would happen",
-				},
-				{
-					name: ["-v", "--verbose"],
-					description: "Report the names of files as they are moved",
-				},
-			],
-		},
-		{
-			name: "rm",
-			description: "Remove files from the working tree and from the index",
-			args: {
-				isVariadic: true,
-				suggestions: [
-					{
-						name: ".",
-						description: "Current directory",
-						icon: "fig://icon?type=folder",
-					},
-				],
-				generators: gitGenerators.files_for_staging,
-			},
-			options: [
-				{
-					name: "--",
-					description:
-						"Used to separate command-line options from the list of files",
-				},
-				{ name: "--cached", description: "Only remove from the index" },
-				{
-					name: ["-f", "--force"],
-					description: "Override the up-to-date check",
-				},
-				{
-					name: ["-n", "--dry-run"],
-					description:
-						"Don’t actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command",
-				},
-				{ name: "-r", description: "Allow recursive removal" },
-			],
-		},
-		{
-			name: "bisect",
-			description: "Use binary search to find the commit that introduced a bug",
-			subcommands: [
-				{
-					name: "start",
-					description: "Reset bisect state and start bisection",
-					args: [
-						{
-							name: "bad",
-							isOptional: true,
-							generators: gitGenerators.revs,
-							suggestions: headSuggestions,
-						},
-						{
-							name: "good",
-							isOptional: true,
-							generators: [gitGenerators.revs, gitGenerators.revs],
-							suggestions: headSuggestions,
-							isVariadic: true,
-						},
-					],
-					options: [
-						{
-							name: "--term-new",
-							description:
-								"Specify the alias to mark commits as new during the bisect process",
-							args: {
-								name: "term",
-								description:
-									"Specifying: fixed, would require using git bisect fixed instead of git bisect new",
-							},
-						},
-						{
-							name: "--term-bad",
-							description:
-								"Specify the alias to mark commits as bad during the bisect process",
-							args: {
-								name: "term",
-								description:
-									"Specifying: broken, would require using git bisect broken instead of git bisect bad",
-							},
-						},
-						{
-							name: "--term-good",
-							description:
-								"Specify the alias to mark commits as good during the bisect process",
-							args: {
-								name: "term",
-								description:
-									"Specifying: fixed, would require using git bisect fixed instead of git bisect good",
-							},
-						},
-						{
-							name: "--term-old",
-							description:
-								"Specify the alias to mark commits as old during the bisect process",
-							args: {
-								name: "term",
-								description:
-									"Specifying: broken, would require using git bisect broken instead of git bisect old",
-							},
-						},
-						{
-							name: "--no-checkout",
-							description:
-								"Do not checkout the new working tree at each iteration of the bisection process. Instead just update a special reference named BISECT_HEAD to make it point to the commit that should be tested",
-						},
-						{
-							name: "--first-parent",
-							description:
-								"Follow only the first parent commit upon seeing a merge commit. In detecting regressions introduced through the merging of a branch, the merge commit will be identified as introduction of the bug and its ancestors will be ignored",
-						},
-						{
-							name: "--",
-							description:
-								"Stop taking subcommand arguments and options. Starts taking paths to bisect",
-						},
-					],
-				},
-				{
-					name: "bad",
-					description: "Mark commits as bad",
-					args: {
-						name: "rev",
-						isOptional: true,
-						generators: gitGenerators.revs,
-						suggestions: headSuggestions,
-					},
-				},
-				{
-					name: "new",
-					description: "Mark commits as new",
-					args: {
-						name: "rev",
-						isOptional: true,
-						generators: gitGenerators.revs,
-						suggestions: headSuggestions,
-					},
-				},
-				{
-					name: "old",
-					description: "Mark commits as old",
-					args: {
-						name: "rev",
-						isOptional: true,
-						generators: gitGenerators.revs,
-						suggestions: headSuggestions,
-						isVariadic: true,
-					},
-				},
-				{
-					name: "good",
-					description: "Mark commits as good",
-					args: {
-						name: "rev",
-						isOptional: true,
-						generators: gitGenerators.revs,
-						suggestions: headSuggestions,
-						isVariadic: true,
-					},
-				},
-				{
-					name: "next",
-					description: "Find next bisection to test and check it out",
-				},
-				{
-					name: "terms",
-					description:
-						"Show the terms used for old and new commits (default: bad, good)",
-					options: [
-						{
-							name: "--term-old",
-							description: "You can get just the old (respectively new) term",
-						},
-						{
-							name: "--term-good",
-							description: "You can get just the old (respectively new) term",
-						},
-					],
-				},
-				{
-					name: "skip",
-					description: "Mark <rev>... untestable revisions",
-					args: {
-						name: "rev | range",
-						isVariadic: true,
-						isOptional: true,
-						generators: gitGenerators.revs,
-						suggestions: headSuggestions,
-					},
-				},
-				{
-					name: "reset",
-					description: "Finish bisection search and go back to commit",
-					args: {
-						name: "commit",
-						isOptional: true,
-						generators: gitGenerators.commits,
-						suggestions: headSuggestions,
-					},
-				},
-				{
-					name: ["visualize", "view"],
-					description: "See the currently remaining suspects in gitk",
-				},
-				{
-					name: "replay",
-					description: "Replay bisection log",
-					args: {
-						name: "logfile",
-						template: "filepaths",
-					},
-				},
-				{
-					name: "log",
-					description: "Show bisect log",
-				},
-				{
-					name: "run",
-					description: "Use <cmd>... to automatically bisect",
-					args: {
-						name: "cmd",
-						isVariadic: true,
-						isCommand: true,
-					},
-				},
-				{
-					name: "help",
-					args: {
-						name: "Get help text",
-					},
-				},
-			],
-			args: {
-				name: "paths",
-				template: ["filepaths", "folders"],
-			},
-		},
-		{ name: "grep", description: "Print lines matching a pattern" },
-		{ name: "show", description: "Show various types of objects" },
-		{
-			name: "branch",
-			description: "List, create, or delete branches",
-			options: [
-				{
-					name: ["-a", "--all"],
-					exclusiveOn: ["-r", "--remotes"],
-					description: "List both remote-tracking and local branches",
-				},
-				{
-					name: ["-d", "--delete"],
-					description: "Delete fully merged branch",
-					args: {
-						generators: gitGenerators.localOrRemoteBranches,
-						isVariadic: true,
-						suggestions: [
-							{
-								name: ["-r", "--remotes"],
-								description: "Deletes the remote-tracking branches",
-							},
-						],
-					},
-				},
-				{
-					name: "-D",
-					description: "Delete branch (even if not merged)",
-					args: {
-						generators: gitGenerators.localOrRemoteBranches,
-						isVariadic: true,
-						suggestions: [
-							{
-								name: ["-r", "--remotes"],
-								description: "Deletes the remote-tracking branches",
-							},
-						],
-					},
-				},
-				{
-					name: ["-m", "--move"],
-					description: "Move/rename a branch and its reflog",
-					args: [
-						{
-							generators: gitGenerators.localBranches,
-							filterStrategy: "fuzzy",
-						},
-						{
-							generators: gitGenerators.localBranches,
-							filterStrategy: "fuzzy",
-						},
-					],
-				},
-				{
-					name: "-M",
-					description: "Move/rename a branch, even if target exists",
-					args: [
-						{
-							generators: gitGenerators.localBranches,
-							filterStrategy: "fuzzy",
-						},
-						{
-							generators: gitGenerators.localBranches,
-							filterStrategy: "fuzzy",
-						},
-					],
-				},
-				{ name: ["-c", "--copy"], description: "Copy a branch and its reflog" },
-				{ name: "-C", description: "Copy a branch, even if target exists" },
-				{ name: ["-l", "--list"], description: "List branch names" },
-				{
-					name: "--create-reflog",
-					description: "Create the branch's reflog",
-				},
-				{
-					name: "--edit-description",
-					description: "Edit the description for the branch",
-					args: {
-						generators: gitGenerators.localBranches,
-						filterStrategy: "fuzzy",
-					},
-				},
-				{
-					name: ["-f", "--force"],
-					description: "Force creation, move/rename, deletion",
-				},
-				{
-					name: "--merged",
-					description: "Print only branches that are merged",
-					args: { name: "commit" },
-				},
-				{
-					name: "--no-merged",
-					description: "Print only branches that are not merged",
-					args: { name: "commit" },
-				},
-				{
-					name: "--column",
-					exclusiveOn: ["--no-column"],
-					description: "List branches in columns [=<style>]",
-				},
-				{
-					name: "--no-column",
-					exclusiveOn: ["--column"],
-					description: "Doesn't display branch listing in columns",
-				},
-				{
-					name: "--sort",
-					description: "Field name to sort on",
-					args: { name: "key" },
-				},
-				{
-					name: "--points-at",
-					description: "Print only branches of the object",
-					args: { name: "object" },
-				},
-				{
-					name: ["-i", "--ignore-case"],
-					description: "Sorting and filtering are case insensitive",
-				},
-				{
-					name: "--format",
-					description: "Format to use for the output",
-					args: { name: "format" },
-				},
-				{
-					name: ["-r", "--remotes"],
-					exclusiveOn: ["-a", "--all"],
-					description:
-						"Lists or deletes (if used with -d) the remote-tracking branches",
-				},
-				{
-					name: "--show-current",
-					description: "Prints the name of the current branch",
-				},
-				{
-					name: ["-v", "--verbose"],
-					isRepeatable: 2,
-					description:
-						"Shows sha1 and commit subject line for each head, along with relationship to upstream branch when in list mode. If given twice, prints the path of the linked worktree and the name of the upstream branch",
-				},
-				{
-					name: ["-q", "--quiet"],
-					description: "Suppress non-error messages",
-				},
-				{
-					name: "--abbrev",
-					description:
-						"Shows the shortest prefix that is at least <n> hexdigits long that uniquely refers the object",
-					exclusiveOn: ["--no-abbrev"],
-					args: {
-						name: "Number",
-					},
-				},
-				{
-					name: "--no-abbrev",
-					exclusiveOn: ["--abbrev"],
-					description: "Displays the full sha1s in the output listing",
-				},
-				{
-					name: ["-t", "--track"],
-					exclusiveOn: ["--no-track"],
-					description:
-						"When creating a new branch, set up 'upstream' configuration",
-					args: [
-						{
-							name: "branch",
-							generators: gitGenerators.localBranches,
-							filterStrategy: "fuzzy",
-						},
-						{
-							name: "start point",
-							isOptional: true,
-							generators: gitGenerators.commits,
-						},
-					],
-				},
-				{
-					name: "--no-track",
-					exclusiveOn: ["--track", "-t"],
-					description:
-						"Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true",
-					args: [
-						{
-							generators: gitGenerators.localBranches,
-							filterStrategy: "fuzzy",
-						},
-						{
-							isOptional: true,
-							generators: gitGenerators.localBranches,
-							filterStrategy: "fuzzy",
-						},
-					],
-				},
-				{
-					name: ["-u", "--set-upstream-to"],
-					description: "Sets branch to upstream provided",
-					args: {
-						name: "upstream",
-						isOptional: true,
-						generators: gitGenerators.localBranches,
-						filterStrategy: "fuzzy",
-					},
-				},
-				{
-					name: "--unset-upstream",
-					description: "Removes the upstream information",
-					args: {
-						name: "upstream",
-						isOptional: true,
-						generators: gitGenerators.localBranches,
-						filterStrategy: "fuzzy",
-					},
-				},
-				{
-					name: "--contains",
-					description: "Only lists branches which contain the specified commit",
-					args: {
-						name: "commit",
-						isOptional: true,
-						generators: gitGenerators.commits,
-					},
-				},
-				{
-					name: "--no-contains",
-					description:
-						"Only lists branches which don't contain the specified commit",
-					args: {
-						name: "commit",
-						isOptional: true,
-						generators: gitGenerators.commits,
-					},
-				},
-				{
-					name: "--color",
-					description:
-						"Color branches to highlight current, local, and remote-tracking branches",
-					exclusiveOn: ["--no-color"],
-					args: {
-						name: "when",
-						isOptional: true,
-						suggestions: ["always", "never", "auto"],
-					},
-				},
-				{
-					name: "--no-color",
-					description: "Turns off branch colors",
-					exclusiveOn: ["--color"],
-				},
-			],
-		},
-		{
-			name: "checkout",
-			description: "Switch branches or restore working tree files",
-			options: [
-				{
-					name: ["-q", "--quiet"],
-					description: "Quiet, suppress feedback messages",
-				},
-				{
-					name: "--progress",
-					description:
-						"Progress status is reported on the standard error stream by default when it is attached to a terminal, unless --quiet is specified. This flag enables progress reporting even if not attached to a terminal, regardless of --quiet",
-				},
-				{
-					name: "--no-progress",
-					description: "Disable progress status reporting",
-				},
-				{
-					name: ["-f", "--force"],
-					description:
-						"When switching branches, proceed even if the index or the working tree differs from HEAD. This is used to throw away local changes",
-				},
-				{
-					name: ["-2", "--ours"],
-					description:
-						"When checking out paths from the index, check out stage #2 (ours) for unmerged paths",
-				},
-				{
-					name: ["-3", "--theirs"],
-					description:
-						"When checking out paths from the index, check out stage #3 (theirs) for unmerged paths",
-				},
-				{
-					name: "-b",
-					description:
-						"Create a new branch named <new_branch> and start it at <start_point>; see git-branch[1] for details",
-					args: {
-						name: "New Branch",
-					},
-				},
-				{
-					name: "-B",
-					description:
-						"Creates the branch <new_branch> and start it at <start_point>; if it already exists, then reset it to <start_point>. This is equivalent to running 'git branch' with '-f'; see git-branch[1] for details",
-					args: {
-						name: "New Branch",
-					},
-				},
-				{
-					name: ["-t", "--track"],
-					description:
-						"When creating a new branch, set up 'upstream' configuration",
-				},
-				{
-					name: "--no-track",
-					description:
-						"Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true",
-				},
-				{
-					name: "--guess",
-					description:
-						"If <branch> is not found but there does exist a tracking branch in exactly one remote (call it <remote>) with a matching name, treat as equivalent to $ git checkout -b <branch> --track <remote>/<branch>",
-				},
-				{ name: "--no-guess", description: "Disable --guess" },
-				{
-					name: "-l",
-					description:
-						"Create the new branch’s reflog; see git-branch[1] for details",
-				},
-				{
-					name: ["-d", "--detach"],
-					description:
-						"Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments. This is the default behavior of git checkout <commit> when <commit> is not a branch name",
-				},
-				{
-					name: "--orphan",
-					description:
-						"Create a new orphan branch, named <new_branch>, started from <start_point> and switch to it",
-					args: {
-						name: "New Branch",
-					},
-				},
-				{
-					name: "--ignore-skip-worktree-bits",
-					description:
-						"In sparse checkout mode, git checkout -- <paths> would update only entries matched by <paths> and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and adds back any files in <paths>",
-				},
-				{
-					name: ["-m", "--merge"],
-					description:
-						"When switching branches, if you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context",
-				},
-				{
-					name: "--conflict",
-					description:
-						"The same as --merge option above, but changes the way the conflicting hunks are presented, overriding the merge.conflictStyle configuration variable. Possible values are 'merge' (default) and 'diff3' (in addition to what is shown by 'merge' style, shows the original contents)",
-					requiresSeparator: true,
-					args: {
-						isOptional: true,
-						suggestions: ["merge", "diff3"],
-					},
-				},
-				{
-					name: ["-p", "--patch"],
-					description:
-						"Interactively select hunks in the difference between the <tree-ish> (or the index, if unspecified) and the working tree",
-				},
-				{
-					name: "--ignore-other-worktrees",
-					description:
-						"Git checkout refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree",
-				},
-				{
-					name: "--overwrite-ignore",
-					description:
-						"Silently overwrite ignored files when switching branches. This is the default behavior",
-				},
-				{
-					name: "--no-overwrite-ignore",
-					description:
-						"Use --no-overwrite-ignore to abort the operation when the new branch contains ignored files",
-				},
-				{
-					name: "--recurse-submodules",
-					description:
-						"Using --recurse-submodules will update the content of all active submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless -f is used. If nothing (or --no-recurse-submodules) is used, submodules working trees will not be updated. Just like git-submodule[1], this will detach HEAD of the submodule",
-				},
-				{
-					name: "--no-recurse-submodules",
-					description: "Submodules working trees will not be updated",
-				},
-				{
-					name: "--overlay",
-					description:
-						"In the default overlay mode, git checkout never removes files from the index or the working tree",
-				},
-				{
-					name: "--no-overlay",
-					description:
-						"When specifying --no-overlay, files that appear in the index and working tree, but not in <tree-ish> are removed, to make them match <tree-ish> exactly",
-				},
-				{
-					name: "--pathspec-from-file",
-					description:
-						"Pathspec is passed in <file> instead of commandline args",
-					args: {
-						name: "file",
-						template: "filepaths",
-					},
-				},
-				{
-					name: "--pathspec-file-nul",
-					description: "Only meaningful with --pathspec-from-file",
-				},
-			],
-			args: [
-				{
-					name: "branch, file, tag or commit",
-					description: "Branch, file, tag or commit to switch to",
-					isOptional: true,
-					filterStrategy: "fuzzy",
-					generators: [
-						gitGenerators.remoteLocalBranches,
-						gitGenerators.tags,
-						{ template: ["filepaths", "folders"] },
-					],
-					suggestions: [
-						{
-							name: "-",
-							description: "Switch to the last used branch",
-							icon: "fig://icon?type=git",
-						},
-						{
-							name: "--",
-							description: "Do not interpret more arguments as options",
-							hidden: true,
-						},
-					],
-				},
-				{
-					name: "pathspec",
-					description: "Limits the paths affected by the operation",
-					isOptional: true,
-					isVariadic: true,
-					template: "filepaths",
-				},
-			],
-		},
-		{
-			name: "cherry-pick",
-			description: "Apply the changes introduced by some existing commits",
-			args: {
-				name: "commit",
-				description: "Commits to cherry-pick",
-				isVariadic: true,
-				generators: gitGenerators.commits,
-			},
-			options: [
-				{
-					name: "--continue",
-					description:
-						"Continue the operation in progress using the information in .git/sequencer",
-				},
-				{
-					name: "--skip",
-					description:
-						"Skip the current commit and continue with the rest of the sequence",
-				},
-				{
-					name: "--quit",
-					description: "Forget about the current operation in progress",
-				},
-				{
-					name: "--abort",
-					description:
-						"Cancel the operation and return to the pre-sequence state",
-				},
-				{
-					name: ["-e", "--edit"],
-					description:
-						"With this option, git cherry-pick will let you edit the commit message prior to committing",
-				},
-				{
-					name: "--cleanup",
-					description:
-						"This option determines how the commit message will be cleaned up before being passed on to the commit machinery",
-					args: {
-						name: "mode",
-						description:
-							"Determines how the supplied commit messaged should be cleaned up before committing",
-						suggestions: [
-							{
-								name: "strip",
-								description:
-									"Strip leading and trailing empty lines, trailing whitepace, commentary and collapse consecutive empty lines",
-							},
-							{
-								name: "whitespace",
-								description: "Same as strip except #commentary is not removed",
-							},
-							{
-								name: "verbatim",
-								description: "Do not change the message at all",
-							},
-							{
-								name: "scissors",
-								description:
-									"Same as whitespace except that everything from (and including) the line found below is truncated",
-							},
-							{
-								name: "default",
-								description:
-									"Same as strip if the message is to be edited. Otherwise whitespace",
-							},
-						],
-					},
-				},
-				{
-					name: "-x",
-					description:
-						'When recording the commit, append a line that says "(cherry picked from commit ...)" to the original commit message in order to indicate which commit this change was cherry-picked from',
-				},
-				{
-					name: ["-m", "--mainline"],
-					description:
-						"Specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent",
-					args: {
-						name: "parent-number",
-					},
-				},
-				{
-					name: ["-n", "--no-commit"],
-					description:
-						"Applies changes necessary to cherry-pick each named commit to your working tree and the index without making any commit",
-				},
-				{
-					name: ["-s", "--signoff"],
-					description:
-						"Add a Signed-off-by trailer at the end of the commit message",
-				},
-				{
-					name: ["-S", "--gpg-sign"],
-					exclusiveOn: ["--no-gpg-sign"],
-					description: "GPG-sign commits",
-					args: {
-						name: "keyid",
-						description: "Must be stuck to the option without a space",
-						isOptional: true,
-					},
-				},
-				{
-					name: "--no-gpg-sign",
-					exclusiveOn: ["-S", "--gpg-sign"],
-					description:
-						"Useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
-				},
-				{
-					name: "--ff",
-					description:
-						"If the current HEAD is the same as the parent of the cherry-pick'ed commit, the a fast forward to this commit will be performed",
-				},
-				{
-					name: "--allow-empty",
-					description:
-						"Allow empty commits to be preserved automatically in a cherry-pick",
-				},
-				{
-					name: "--allow-empty-message",
-					description: "Allow commits with empty messages to be cherry picked",
-				},
-				{
-					name: "--keep-redundant-commits",
-					description: "Creates an empty commit object. Implies --allow-empty",
-				},
-				{
-					name: "--strategy",
-					description: "Use the given merge strategy. Should only be used once",
-					args: {
-						name: "strategy",
-						suggestions: ["resolve", "recursive", "octopus", "ours", "subtree"],
-					},
-				},
-				{
-					name: ["-X", "--strategy-option"],
-					description:
-						"Pass the merge strategy-specific option through to the merge strategy",
-					args: {
-						name: "option",
-						suggestions: [
-							"ours",
-							"theirs",
-							"patience",
-							"diff-algorithm",
-							"diff-algorithm=patience",
-							"diff-algorithm=minimal",
-							"diff-algorithm=histogram",
-							"diff-algorithm=myers",
-							"ignore-space-change",
-							"ignore-all-space",
-							"ignore-space-at-eol",
-							"ignore-cr-at-eol",
-							"renormalize",
-							"no-renormalize",
-							"no-renames",
-							"find-renames",
-							"subtree",
-						],
-					},
-				},
-				{
-					name: "--rerere-autoupdate",
-					exclusiveOn: ["--no-rerere-autoupdate"],
-					description:
-						"Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
-				},
-				{
-					name: "--no-rerere-autoupdate",
-					exclusiveOn: ["--rerere-autoupdate"],
-					description:
-						"Do not allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
-				},
-			],
-		},
-		{
-			name: "submodule",
-			description: "Initialize, update or inspect submodules",
-			subcommands: [
-				{
-					name: "add",
-					description:
-						"Add the given repository as a submodule at the given path to the changeset to be committed next to the current project",
-					options: [
-						{
-							name: "-b",
-							description: "Branch of repository to add as submodule",
-							args: {
-								name: "branch",
-							},
-						},
-						{
-							name: ["-f", "--force"],
-							description: "Allow adding an otherwise ignored submodule path",
-						},
-						{
-							name: "--name",
-							description:
-								"It sets the submodule’s name to the given string instead of defaulting to its path",
-							insertValue: "--name '{cursor}'",
-							args: {
-								name: "name",
-								description: "Directory name",
-							},
-						},
-						{
-							name: "--reference",
-							description: "Remote repository to be cloned",
-							args: {
-								name: "repository",
-								description: "Remote repository to be cloned",
-							},
-						},
-						{
-							name: "--depth",
-							description:
-								"Create a shallow clone with a history truncated to the specified number of revisions",
-							args: {
-								name: "depth",
-								description: "Specified number of revisions",
-							},
-						},
-						{
-							name: "--",
-							description: "End of subcommand options",
-						},
-					],
-					args: [
-						{
-							name: "repository",
-						},
-						{
-							name: "path",
-							isOptional: true,
-							template: "filepaths",
-						},
-					],
-				},
-				{
-					name: "status",
-					description: "Show the status of the submodules",
-					options: [
-						{
-							name: "--cached",
-							description:
-								"Will instead print the SHA-1 recorded in the superproject for each submodule",
-						},
-						{
-							name: "--recursive",
-							description:
-								"Will recurse into nested submodules, and show their status as well",
-						},
-						{
-							name: "--",
-							description: "End of subcommand options",
-						},
-					],
-					args: {
-						name: "path",
-						isOptional: true,
-						isVariadic: true,
-						template: "filepaths",
-					},
-				},
-				{
-					name: "init",
-					description: "Initialize the submodules recorded in the index",
-					options: [
-						{
-							name: "--",
-							description: "End of subcommand options",
-						},
-					],
-					args: {
-						name: "path",
-						isOptional: true,
-						isVariadic: true,
-						template: "filepaths",
-					},
-				},
-				{
-					name: "deinit",
-					description: "Unregister the given submodules",
-					options: [
-						{
-							name: ["-f", "--force"],
-							description:
-								"The submodule’s working tree will be removed even if it contains local modifications",
-						},
-						{
-							name: "--all",
-							description: "Unregister all submodules in the working tree",
-						},
-						{
-							name: "--",
-							description: "End of subcommand options",
-						},
-					],
-					args: {
-						name: "path",
-						isOptional: true,
-						isVariadic: true,
-						template: "filepaths",
-					},
-				},
-				{
-					name: "update",
-					description:
-						"Update the registered submodules to match what the superproject expects by cloning missing submodules, fetching missing commits in submodules and updating the working tree of the submodules",
-					options: [
-						{
-							name: "--init",
-							description:
-								"Initialize all submodules for which 'git submodule init' has not been called so far before updating",
-						},
-						{
-							name: "--remote",
-							description:
-								"Instead of using the superproject’s recorded SHA-1 to update the submodule, use the status of the submodule’s remote-tracking branch",
-						},
-						{
-							name: ["-N", "--no-fetch"],
-							description: "Don’t fetch new objects from the remote site",
-						},
-						{
-							name: "--no-recommend-shallow",
-							description: "Ignore the suggestions",
-						},
-						{
-							name: "--recommend-shallow",
-							description:
-								"The initial clone of a submodule will use the recommended submodule.<name>.shallow as provided by the .gitmodules file",
-						},
-						{
-							name: ["-f", "--force"],
-							description:
-								"Throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule",
-						},
-						{
-							name: "--checkout",
-							description:
-								"The commit recorded in the superproject will be checked out in the submodule on a detached HEAD",
-						},
-						{
-							name: "--rebase",
-							description:
-								"The current branch of the submodule will be rebased onto the commit recorded in the superproject",
-						},
-						{
-							name: "--merge",
-							description:
-								"The commit recorded in the superproject will be merged into the current branch in the submodule",
-						},
-						{
-							name: "--reference",
-							description: "Remote repository",
-							args: {
-								name: "repository",
-							},
-						},
-						{
-							name: "--depth",
-							description:
-								"Create a shallow clone with a history truncated to the specified number of revisions",
-							args: {
-								name: "depth",
-							},
-						},
-						{
-							name: "--recursive",
-							description: "Traverse submodules recursively",
-						},
-						{
-							name: "--jobs",
-							description: "Clone new submodules in parallel with as many jobs",
-							args: {
-								name: "n",
-							},
-						},
-						{
-							name: "--single-branch",
-							description:
-								"Clone only one branch during update: HEAD or one specified by --branch",
-						},
-						{
-							name: "--no-single-branch",
-							description:
-								"Don't clone only one branch during update: HEAD or one specified by --branch",
-						},
-						{ name: "--", description: "End of subcommand options" },
-					],
-					args: {
-						name: "path",
-						isOptional: true,
-						isVariadic: true,
-						template: "filepaths",
-					},
-				},
-				{
-					name: "set-branch",
-					description:
-						"Sets the default remote tracking branch for the submodule",
-					options: [
-						{
-							name: ["-b", "--branch"],
-							description: "Branch of repository to add as submodule",
-							args: {
-								name: "branch",
-								description: "Remote branch to be specified",
-							},
-						},
-						{
-							name: ["-d", "--default"],
-							description:
-								"Removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote HEAD",
-						},
-						{
-							name: "--",
-							description: "End of subcommand options",
-						},
-					],
-					args: {
-						name: "path",
-						description: "Path to submodule",
-						template: "filepaths",
-					},
-				},
-				{
-					name: "set-url",
-					description: "Sets the URL of the specified submodule to <newurl>",
-					options: [
-						{
-							name: "--",
-							description: "End of command options",
-						},
-					],
-					args: [
-						{
-							name: "path",
-							description: "Path to specified submodule",
-							template: "filepaths",
-						},
-						{
-							name: "newurl",
-							description: "New url of submodule",
-						},
-					],
-				},
-				{
-					name: "summary",
-					description:
-						"Show commit summary between the given commit (defaults to HEAD) and working tree/index",
-					options: [
-						{
-							name: "--cached",
-							description:
-								"This command will recurse into the registered submodules, and sync any nested submodules within",
-						},
-						{
-							name: "--files",
-							description:
-								"Show the series of commits in the submodule between the index of the super project and the working tree of the submodule",
-						},
-						{
-							name: "-n",
-							description:
-								"Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules",
-							args: {
-								name: "n",
-							},
-						},
-						{
-							name: "--summary-limit",
-							description:
-								"Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules",
-							args: {
-								name: "n",
-							},
-						},
-						{
-							name: "--",
-							description: "Everything after this is an argument",
-						},
-					],
-					args: [
-						{
-							name: "commit",
-							isOptional: true,
-						},
-						{
-							name: "path",
-							isOptional: true,
-							isVariadic: true,
-							template: "filepaths",
-						},
-					],
-				},
-				{
-					name: "foreach",
-					description:
-						"Evaluates an arbitrary shell command in each checked out submodule",
-					options: [
-						{
-							name: "--recursive",
-							description:
-								"This command will recurse into the registered submodules, and sync any nested submodules within",
-						},
-					],
-					args: {
-						name: "command",
-					},
-				},
-				{
-					name: "sync",
-					description:
-						"Synchronizes submodules' remote URL configuration setting to the value specified in .gitmodules",
-					options: [
-						{
-							name: "--recursive",
-							description:
-								"This command will recurse into the registered submodules, and sync any nested submodules within",
-						},
-						{
-							name: "--",
-							description: "Everything after this is an argument",
-						},
-					],
-					args: {
-						name: "path",
-						isOptional: true,
-						isVariadic: true,
-						template: "filepaths",
-					},
-				},
-				{
-					name: "absorbgitdirs",
-					description:
-						"If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superproject’s $GIT_DIR/modules path and then connect the git directory and its working directory by setting the core.worktree and adding a .git file pointing to the git directory embedded in the superprojects git directory",
-				},
-			],
-			options: [
-				{
-					name: ["-q", "--quiet"],
-					description: "Only print error messages",
-				},
-				{
-					name: "--cached",
-					description: "The commit stored in the index is used instead",
-				},
-			],
-		},
-		{
-			name: "merge",
-			description: "Join two or more development histories together",
-			args: {
-				name: "branch",
-				filterStrategy: "fuzzy",
-				generators: gitGenerators.remoteLocalBranches,
-				isVariadic: true,
-				isOptional: true,
-				// A single dash can be used as arg to merge as short hand for the previous branch
-				// https://github.com/git/git/blob/master/Documentation/RelNotes/1.7.6.txt#L84
-				suggestions: [
-					{ name: "-", description: "Shorthand for the previous branch" },
-				],
-			},
-			options: [
-				{
-					name: "--commit",
-					description:
-						"Perform the merge and commit the result. This option can be used to override --no-commit",
-				},
-				{
-					name: "--no-commit",
-					description:
-						"Perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing",
-				},
-				{
-					name: ["--edit", "-e"],
-					description:
-						"Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge",
-				},
-				{
-					name: "--no-edit",
-					description:
-						"The --no-edit option can be used to accept the auto-generated message (this is generally discouraged). The --edit (or -e) option is still useful if you are giving a draft message with the -m option from the command line and want to edit it in the editor",
-				},
-				{
-					name: "--cleanup",
-					description:
-						"This option determines how the merge message will be cleaned up before committing. See git-commit[1] for more details. In addition, if the <mode> is given a value of scissors, scissors will be appended to MERGE_MSG before being passed on to the commit machinery in the case of a merge conflict",
-					requiresSeparator: true,
-					args: {
-						name: "mode",
-						suggestions: [
-							"strip",
-							"whitespace",
-							"verbatim",
-							"scissors",
-							"default",
-						],
-					},
-				},
-				{
-					name: "--ff",
-					description:
-						"When possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit",
-				},
-				{
-					name: "--no-ff",
-					description:
-						"Create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward",
-				},
-				{
-					name: "--ff-only",
-					description:
-						"Resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status",
-				},
-				{
-					name: ["-S", "--gpg-sign"],
-					description:
-						"GPG-sign the resulting merge commit. The keyid argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space",
-					args: {
-						name: "keyid",
-						isOptional: true,
-					},
-				},
-				{
-					name: "--no-gpg-sign",
-					description:
-						"Is useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
-				},
-				{
-					name: "--log",
-					description:
-						"In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also git-fmt-merge-msg[1]",
-					args: {
-						name: "n",
-						isOptional: true,
-					},
-				},
-				{
-					name: "--no-log",
-					description:
-						"Do not list one-line descriptions from the actual commits being merged",
-				},
-				{
-					name: "--signoff",
-					description:
-						"Add a Signed-off-by trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you’re committing. For example, it may certify that the committer has the rights to submit the work under the project’s license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you’re contributing to understand how the signoffs are used in that project",
-				},
-				{
-					name: "--no-signoff",
-					description:
-						"Can be used to countermand an earlier --signoff option on the command line",
-				},
-				{
-					name: "--stat",
-					description:
-						"Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat",
-				},
-				{
-					name: ["-n", "--no-stat"],
-					description: "Do not show a diffstat at the end of the merge",
-				},
-				{
-					name: "--squash",
-					description:
-						"With --squash, --commit is not allowed, and will fail. Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the HEAD, or record $GIT_DIR/MERGE_HEAD (to cause the next git commit command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)",
-				},
-				{
-					name: "--no-squash",
-					description:
-						"Perform the merge and commit the result. This option can be used to override --squash",
-				},
-				{
-					name: "--no-verify",
-					description:
-						"This option bypasses the pre-merge and commit-msg hooks. See also githooks[5]",
-				},
-				{
-					name: ["-s", "--strategy"],
-					description:
-						"Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no -s option, a built-in list of strategies is used instead (git merge-recursive when merging a single head, git merge-octopus otherwise)",
-					args: {
-						name: "strategy",
-						isVariadic: true,
-						suggestions: ["resolve", "recursive", "octopus", "ours", "subtree"],
-					},
-				},
-				{
-					name: ["-X", "--strategy-option"],
-					description:
-						"Pass merge strategy specific option through to the merge strategy",
-					args: {
-						name: "option",
-						suggestions: [
-							"ours",
-							"theirs",
-							"patience",
-							"diff-algorithm",
-							"diff-algorithm=patience",
-							"diff-algorithm=minimal",
-							"diff-algorithm=histogram",
-							"diff-algorithm=myers",
-							"ignore-space-change",
-							"ignore-all-space",
-							"ignore-space-at-eol",
-							"ignore-cr-at-eol",
-							"renormalize",
-							"no-renormalize",
-							"no-renames",
-							"find-renames",
-							"subtree",
-						],
-					},
-				},
-				{
-					name: "--verify-signatures",
-					description:
-						"Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted",
-				},
-				{
-					name: "--no-verify-signatures",
-					description:
-						"Do not verify that the tip commit of the side branch being merged is signed with a valid key",
-				},
-				{
-					name: "--summary",
-					description:
-						"Synonym to --stat ; this is deprecated and will be removed in the future",
-				},
-				{
-					name: "--no-summary",
-					description:
-						"Synonym to --no-stat ; this is deprecated and will be removed in the future",
-				},
-				{
-					name: ["-q", "--quiet"],
-					description: "Operate quietly. Implies --no-progress",
-				},
-				{ name: ["-v", "--verbose"], description: "Be verbose" },
-				{
-					name: "--progress",
-					description:
-						"Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting",
-				},
-				{
-					name: "--no-progress",
-					description:
-						"Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting",
-				},
-				{
-					name: "--autostash",
-					description:
-						"Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run the operation on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts",
-				},
-				{
-					name: "--no-autostash",
-					description:
-						"Do not automatically create a temporary stash entry before the operation begins, and apply it after the operation ends",
-				},
-				{
-					name: "--allow-unrelated-histories",
-					description:
-						"By default, git merge command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added",
-				},
-				{
-					name: "-m",
-					description:
-						"Set the commit message to be used for the merge commit (in case one is created). If --log is specified, a shortlog of the commits being merged will be appended to the specified message. The git fmt-merge-msg command can be used to give a good default for automated git merge invocations. The automated message can include the branch description",
-					args: {
-						name: "message",
-					},
-				},
-				{
-					name: ["-F", "--file"],
-					description:
-						"Read the commit message to be used for the merge commit (in case one is created). If --log is specified, a shortlog of the commits being merged will be appended to the specified message",
-					args: {
-						name: "file",
-						template: "filepaths",
-					},
-				},
-				{
-					name: "--rerere-autoupdate",
-					description:
-						"Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
-				},
-				{
-					name: "--no-rerere-autoupdate",
-					description:
-						"Do not allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
-				},
-				{
-					name: "--overwrite-ignore",
-					description:
-						"Silently overwrite ignored files from the merge result. This is the default behavior. Use --no-overwrite-ignore to abort",
-				},
-				{
-					name: "--no-overwrite-ignore",
-					description:
-						"Do not silently overwrite ignored files from the merge result",
-				},
-				{
-					name: "--abort",
-					description:
-						"Abort the current conflict resolution process, and try to reconstruct the pre-merge state. If an autostash entry is present, apply it to the worktree. If there were uncommitted worktree changes present when the merge started, git merge --abort will in some cases be unable to reconstruct these changes. It is therefore recommended to always commit or stash your changes before running git merge. git merge --abort is equivalent to git reset --merge when MERGE_HEAD is present unless MERGE_AUTOSTASH is also present in which case git merge --abort applies the stash entry to the worktree whereas git reset --merge will save the stashed changes in the stash list",
-				},
-				{
-					name: "--quit",
-					description:
-						"Forget about the current merge in progress. Leave the index and the working tree as-is. If MERGE_AUTOSTASH is present, the stash entry will be saved to the stash list",
-				},
-				{
-					name: "--continue",
-					description:
-						"After a git merge stops due to conflicts you can conclude the merge by running git merge --continue (see 'HOW TO RESOLVE CONFLICTS' section below)",
-				},
-			],
-		},
-		{
-			name: "mergetool",
-			description: "Open the git tool to fix conflicts",
-		},
-		{
-			name: "tag",
-			description:
-				"Create, list, delete or verify a tag object signed with GPG",
-			options: [
-				{ name: ["-l", "--list"], description: "List tag names" },
-				{
-					name: "-n",
-					description: "Print <n> lines of each tag message",
-					args: {
-						name: "n",
-						suggestions: [{ name: "1" }, { name: "2" }, { name: "3" }],
-					},
-				},
-				{ name: ["-d", "--delete"], description: "Delete tags" },
-				{ name: ["-v", "--verify"], description: "Verify tags" },
-				{
-					name: ["-a", "--annotate"],
-					description: "Annotated tag, needs a message",
-				},
-				{
-					name: ["-m", "--message"],
-					insertValue: "-m '{cursor}'",
-					description: "Tag message",
-					args: { name: "message" },
-				},
-				{
-					name: "--points-at",
-					description: "List tags of the given object",
-					args: {
-						name: "object",
-						generators: gitGenerators.commits,
-						suggestions: headSuggestions,
-					},
-				},
-			],
-			args: {
-				name: "tagname",
-				description: "Select a tag",
-				generators: gitGenerators.tags,
-				isOptional: true,
-			},
-		},
-		{
-			name: "restore",
-			description: "Restore working tree files",
-			options: [
-				{
-					name: ["-s", "--source"],
-					description:
-						"Restore the working tree files with the content from the given tree",
-					args: {
-						name: "tree",
-					},
-				},
-				{
-					name: ["-p", "--patch"],
-					description:
-						"Interactively select hunks in the difference between the restore source and the restore location",
-				},
-				{
-					name: ["-W", "--worktree"],
-					description: "Use the worktree as the restore location",
-				},
-				{
-					name: ["-S", "--staged"],
-					description: "Use staging as the restore location",
-				},
-				{
-					name: ["-q", "--quiet"],
-					description: "Quiet, suppress feedback messages",
-				},
-				{
-					name: "--progress",
-					description:
-						"Progress status is reported on the standard error stream by default when it is attached to a terminal",
-				},
-				{
-					name: "--no-progress",
-					description: "Disable progress status reporting",
-				},
-				{
-					name: ["-2", "--ours"],
-					description:
-						"When restoring paths from the index, check out stage #2 (ours) for unmerged paths",
-					exclusiveOn: ["--theirs"],
-				},
-				{
-					name: ["-3", "--theirs"],
-					description:
-						"When re out paths from the index, check out stage #3 (theirs) for unmerged paths",
-					exclusiveOn: ["--ours"],
-				},
-				{
-					name: ["-m", "--merge"],
-					description:
-						"When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths",
-				},
-				{
-					name: "--conflict",
-					description:
-						"The same as --merge option, but changes the way the conflicting hunks are presented",
-					args: {
-						name: "style",
-						suggestions: ["merge", "diff3"],
-					},
-				},
-				{
-					name: "--ignore-unmerged",
-					description:
-						"When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries",
-					exclusiveOn: ["--ours", "--theirs", "--merge", "--conflict"],
-				},
-				{
-					name: "--ignore-skip-worktree-bits",
-					description:
-						"In sparse checkout mode, by default is to only update entries matched by <pathspec> and sparse patterns in $GIT_DIR/info/sparse-checkout",
-				},
-				{
-					name: "--recurse-submodules",
-					description:
-						"If <pathspec> names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten",
-					exclusiveOn: ["--no-recurse-submodules"],
-				},
-				{
-					name: "--no-recurse-submodules",
-					description: "Submodules working trees will not be updated",
-					exclusiveOn: ["--recurse-submodules"],
-				},
-				{
-					name: "--overlay",
-					description:
-						"In overlay mode, the command never removes files when restoring",
-					exclusiveOn: ["--no-overlay"],
-				},
-				{
-					name: "--no-overlay",
-					description:
-						"In no-overlay mode, tracked files that do not appear in the --source tree are removed, to make them match <tree> exactly",
-					exclusiveOn: ["--overlay"],
-				},
-				{
-					name: "--pathspec-from-file",
-					description:
-						"Pathspec is passed in <file> instead of commandline args. If <file> is exactly - then standard input is used",
-					args: {
-						name: "file",
-						template: "filepaths",
-					},
-				},
-				{
-					name: "--pathspec-file-nul",
-					description:
-						"Only meaningful with --pathspec-from-file. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)",
-				},
-				{
-					name: "--",
-					description: "Do not interpret any more arguments as options",
-				},
-			],
-			args: {
-				name: "pathspec",
-				isOptional: true,
-				isVariadic: true,
-				generators: gitGenerators.files_for_staging,
-			},
-		},
-		{
-			name: "switch",
-			description: "Switch branches",
-			options: [
-				{
-					name: ["-c", "--create"],
-					description:
-						"Create a new branch named <new-branch> starting at <start-point> before switching to the branch",
-					args: [
-						{
-							name: "new branch",
-						},
-						{
-							name: "start point",
-							isOptional: true,
-							generators: gitGenerators.commits,
-						},
-					],
-				},
-				{
-					name: ["-C", "--force-create"],
-					description:
-						"Similar to --create except that if <new-branch> already exists it will be reset to <start-point>",
-					args: [
-						{
-							name: "new branch",
-						},
-						{
-							name: "start point",
-							isOptional: true,
-							generators: gitGenerators.commits,
-						},
-					],
-				},
-				{
-					name: ["-d", "--detach"],
-					description:
-						"Switch to a commit for inspection and discardable experiments",
-				},
-				{
-					name: "--guess",
-					description:
-						"If <branch> is not found but there does exist a tracking branch in exactly one remote (call it <remote>) with a matching name",
-				},
-				{
-					name: "--no-guess",
-					description: "Disable --guess",
-				},
-				{
-					name: ["-f", "--force"],
-					description: "An alias for --discard-changes",
-					isDangerous: true,
-				},
-				{
-					name: "--discard-changes",
-					description:
-						"Proceed even if the index or the working tree differs from HEAD. Both the index and working tree are restored to match the switching target",
-					isDangerous: true,
-				},
-				{
-					name: ["-m", "--merge"],
-					description:
-						"If you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context",
-				},
-				{
-					name: "--conflict",
-					description:
-						"The same as --merge option above, but changes the way the conflicting hunks are presented, overriding the merge.conflictStyle configuration variable",
-					args: {
-						name: "style",
-						suggestions: ["merge", "diff3"],
-						default: "merge",
-					},
-				},
-				{
-					name: ["-q", "--quiet"],
-					description: "Quiet, suppress feedback messages",
-				},
-				{
-					name: "--progress",
-					description:
-						"Progress status is reported on the standard error stream by default when it is attached to a terminal",
-				},
-				{
-					name: "--no-progress",
-					description: "Disable progress status reporting",
-				},
-				{
-					name: ["-t", "--track"],
-					exclusiveOn: ["--no-track"],
-					description:
-						"When creating a new branch, set up 'upstream' configuration",
-					args: [
-						{
-							name: "branch",
-							generators: gitGenerators.localBranches,
-							filterStrategy: "fuzzy",
-						},
-						{
-							name: "start point",
-							isOptional: true,
-							generators: gitGenerators.commits,
-						},
-					],
-				},
-				{
-					name: "--no-track",
-					exclusiveOn: ["--track", "-t"],
-					description:
-						"Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true",
-					args: [
-						{
-							generators: gitGenerators.localBranches,
-							filterStrategy: "fuzzy",
-						},
-						{
-							isOptional: true,
-							generators: gitGenerators.localBranches,
-							filterStrategy: "fuzzy",
-						},
-					],
-				},
-				{
-					name: "--orphan",
-					description: "Create a new orphan branch, named <new-branch>",
-					args: {
-						name: "new branch",
-					},
-				},
-				{
-					name: "--ignore-other-worktrees",
-					description:
-						"Git switch refuses when the wanted ref is already checked out by another worktree",
-				},
-				{
-					name: "--recurse-submodules",
-					exclusiveOn: ["--no-recurse-submodules"],
-					description:
-						"Updates the content of all active submodules according to the commit recorded in the superproject",
-				},
-				{
-					name: "--no-recurse-submodules",
-					exclusiveOn: ["--recurse-submodules"],
-					description: "Submodules working trees will not be updated",
-				},
-			],
-			args: [
-				{
-					name: "branch name",
-					description: "Branch or commit to switch to",
-					generators: gitGenerators.localBranches,
-					filterStrategy: "fuzzy",
-					suggestions: [
-						{
-							name: "-",
-							description: "Switch to the last used branch",
-							icon: "fig://icon?type=git",
-						},
-					],
-				},
-				{
-					name: "start point",
-					isOptional: true,
-					generators: gitGenerators.commits,
-				},
-			],
-		},
-		{
-			name: "worktree",
-			description: "Manage multiple working trees",
-			subcommands: [
-				{
-					name: "add",
-					description: "Create <path> and checkout <commit-ish> into it",
-					options: [
-						{
-							name: ["-f", "--force"],
-							description:
-								"By default, add refuses to create a new working tree when <commit-ish> is a branch name and is already checked out by another working tree, or if <path> is already assigned to some working tree but is missing (for instance, if <path> was deleted manually). This option overrides these safeguards. To add a missing but locked working tree path, specify --force twice",
-						},
-						{
-							name: ["-d", "--detach"],
-							description:
-								'With add, detach HEAD in the new working tree. See "DETACHED HEAD" in git-checkout[1]',
-						},
-						{
-							name: "--checkout",
-							description:
-								'By default, add checks out <commit-ish>, however, --no-checkout can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See "Sparse checkout" in git-read-tree[1]',
-						},
-						{
-							name: "--lock",
-							description:
-								"Keep the working tree locked after creation. This is the equivalent of git worktree lock after git worktree add, but without a race condition",
-						},
-						{
-							name: ["-b", "-B"],
-							description:
-								"With add, create a new branch named <new-branch> starting at <commit-ish>, and check out <new-branch> into the new working tree. If <commit-ish> is omitted, it defaults to HEAD. By default, -b refuses to create a new branch if it already exists. -B overrides this safeguard, resetting <new-branch> to <commit-ish>",
-							args: {
-								name: "new-branch",
-							},
-						},
-					],
-				},
-				{
-					name: "list",
-					description: "List details of each working tree",
-					options: [
-						{
-							name: "--porcelain",
-							description:
-								"With list, output in an easy-to-parse format for scripts. This format will remain stable across Git versions and regardless of user configuration. See below for details",
-						},
-						{
-							name: ["-v", "--verbose"],
-							description:
-								"With list, output additional information about worktrees (see below)",
-						},
-						{
-							name: "--expire",
-							description:
-								"With list, annotate missing working trees as prunable if they are older than <time>",
-							args: {
-								name: "time",
-							},
-						},
-					],
-				},
-				{
-					name: "lock",
-					description:
-						"If a working tree is on a portable device or network share which is not always mounted, lock it to prevent its administrative files from being pruned automatically",
-					args: {
-						name: "worktree",
-						description:
-							"Working trees can be identified by path, either relative or absolute",
-					},
-					options: [
-						{
-							name: "--reason",
-							description:
-								"With lock or with add --lock, an explanation <reason> why the working tree is locked",
-							args: {
-								name: "reason",
-							},
-						},
-					],
-				},
-				{
-					name: "move",
-					description: "Move a working tree to a new location",
-					args: [
-						{
-							name: "worktree",
-							description:
-								"Working trees can be identified by path, either relative or absolute",
-						},
-						{
-							name: "new-path",
-							template: "filepaths",
-						},
-					],
-					options: [
-						{
-							name: ["-f", "--force"],
-							description:
-								"Move refuses to move a locked working tree unless --force is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if <new-path> was deleted manually), then --force allows the move to proceed; use --force twice if the destination is locked",
-						},
-					],
-				},
-				{
-					name: "prune",
-					description: "Prune working tree information in $GIT_DIR/worktrees",
-					options: [
-						{
-							name: ["-n", "--dry-run"],
-							description:
-								"With prune, do not remove anything; just report what it would remove",
-						},
-						{
-							name: ["-v", "--verbose"],
-							description: "With prune, report all removals",
-						},
-						{
-							name: "--expire",
-							description:
-								"With prune, only expire unused working trees older than <time>",
-							args: {
-								name: "time",
-							},
-						},
-					],
-				},
-				{
-					name: "remove",
-					description: "Remove a working tree",
-					args: {
-						name: "worktree",
-						description:
-							"Working trees can be identified by path, either relative or absolute",
-					},
-					options: [
-						{
-							name: ["-f", "--force"],
-							description:
-								"Remove refuses to remove an unclean working tree unless --force is used. To remove a locked working tree, specify --force twice",
-						},
-					],
-				},
-				{
-					name: "repair",
-					description:
-						"Repair working tree administrative files, if possible, if they have become corrupted or outdated due to external factors",
-					args: {
-						name: "path",
-						template: "filepaths",
-					},
-				},
-				{
-					name: "unlock",
-					description:
-						"Unlock a working tree, allowing it to be pruned, moved or deleted",
-					args: {
-						name: "worktree",
-						description:
-							"Working trees can be identified by path, either relative or absolute",
-					},
-				},
-			],
-		},
-		{
-			name: "apply",
-			description: "Apply a patch to files and/or to the index",
-			options: [
-				{
-					name: "--exclude",
-					description: "Don't apply changes matching the given path",
-					args: {
-						name: "path",
-					},
-				},
-				{
-					name: "--include",
-					description: "Apply changes matching the given path",
-					args: {
-						name: "path",
-					},
-				},
-				{
-					name: "-p",
-					description:
-						"Remove <num> leading slashes from traditional diff paths",
-					args: {
-						name: "num",
-					},
-				},
-				{
-					name: "--no-add",
-					description: "Ignore additions made by the patch",
-				},
-				{
-					name: "--stat",
-					description:
-						"Instead of applying the patch, output diffstat for the input",
-				},
-				{
-					name: "--numstat",
-					description:
-						"Show number of added and deleted lines in decimal notation",
-				},
-				{
-					name: "--summary",
-					description:
-						"Instead of applying the patch, output a summary for the input",
-				},
-				{
-					name: "--check",
-					description:
-						"Instead of applying the patch, see if the patch is applicable",
-				},
-				{
-					name: "--index",
-					description: "Make sure the patch is applicable to the current index",
-				},
-				{
-					name: ["-N", "--intent-to-add"],
-					description: "Mark new files with `git add --intent-to-add`",
-				},
-				{
-					name: "--cached",
-					description: "Apply a patch without touching the working tree",
-				},
-				{
-					name: "--unsafe-paths",
-					description: "Accept a patch that touches outside the working area",
-				},
-				{
-					name: "--apply",
-					description:
-						"Also apply the patch (use with --stat/--summary/--check)",
-				},
-				{
-					name: ["-3", "--3way"],
-					description: "Attempt three-way merge if a patch does not apply",
-				},
-				{
-					name: "--build-fake-ancestor",
-					description:
-						"Build a temporary index based on embedded index information",
-					args: {
-						name: "file",
-					},
-				},
-				{
-					name: "-z",
-					description: "Paths are separated with NUL character",
-				},
-				{
-					name: "-C",
-					description: "Ensure at least <n> lines of context match",
-					args: {
-						name: "n",
-					},
-				},
-				{
-					name: "--whitespace",
-					description:
-						"Detect new or modified lines that have whitespace errors",
-					args: {
-						name: "action",
-						suggestions: [
-							{
-								name: "nowarn",
-								description: "Turns off the trailing whitespace warning",
-							},
-							{
-								name: "warn",
-								description:
-									"Outputs warnings for a few such errors, but applies the patch as-is (default)",
-							},
-							{
-								name: "fix",
-								description:
-									"Outputs warnings for a few such errors, and applies the patch after fixing them",
-							},
-							{
-								name: "error",
-								description:
-									"Outputs warnings for a few such errors, and refuses to apply the patch",
-							},
-							{
-								name: "error-all",
-								description: "Similar to `error` but shows all errors",
-							},
-						],
-					},
-				},
-				{
-					name: ["--ignore-space-change", "--ignore-whitespace"],
-					description: "Ignore changes in whitespace when finding context",
-				},
-				{
-					name: ["-R", "--reverse"],
-					description: "Apply the patch in reverse",
-				},
-				{
-					name: "--unidiff-zero",
-					description: "Don't expect at least one line of context",
-				},
-				{
-					name: "--reject",
-					description: "Leave the rejected hunks in corresponding *.rej files",
-				},
-				{
-					name: "--allow-overlap",
-					description: "Allow overlapping hunks",
-				},
-				{
-					name: ["-v", "--verbose"],
-					description: "Be verbose",
-				},
-				{
-					name: "--inaccurate-eof",
-					description:
-						"Tolerate incorrectly detected missing new-line at the end of file",
-				},
-				{
-					name: "--recount",
-					description: "Do not trust the line counts in the hunk headers",
-				},
-				{
-					name: "--directory",
-					description: "Prepend <root> to all filenames",
-					args: {
-						name: "root",
-					},
-				},
-			],
-			args: {
-				name: "patch",
-				isVariadic: true,
-			},
-		},
-		{
-			name: "daemon",
-			description: "A really simple server for Git repositories",
-			args: {
-				name: "directory",
-				description:
-					"A directory to add to the whitelist of allowed directories. Unless --strict-paths is specified this will also include subdirectories of each named directory",
-				isVariadic: true,
-			},
-			options: [
-				{
-					name: "--strict-paths",
-					description:
-						'Match paths exactly (i.e. don’t allow "/foo/repo" when the real path is "/foo/repo.git" or "/foo/repo/.git") and don’t do user-relative paths.  git daemon will refuse to start when this option is enabled and no whitelist is specified',
-				},
-				{
-					name: "--base-path",
-					description:
-						"Remap all the path requests as relative to the given path",
-					requiresSeparator: true,
-					args: { name: "path", template: "folders" },
-				},
-				{
-					name: "--base-path-relaxed",
-					description:
-						"If --base-path is enabled and repo lookup fails, with this option git daemon will attempt to lookup without prefixing the base path. This is useful for switching to --base-path usage, while still allowing the old paths",
-				},
-				{
-					name: "--interpolated-path",
-					requiresSeparator: true,
-					description:
-						"To support virtual hosting, an interpolated path template can be used to dynamically construct alternate paths. The template supports %H for the target hostname as supplied by the client but converted to all lowercase, %CH for the canonical hostname, %IP for the server’s IP address, %P for the port number, and %D for the absolute path of the named repository. After interpolation, the path is validated against the directory whitelist",
-					args: { name: "path-template" },
-				},
-				{
-					name: "--export-all",
-					description:
-						"Allow pulling from all directories that look like Git repositories (have the objects and refs subdirectories), even if they do not have the git-daemon-export-ok file",
-				},
-				{
-					name: "--inetd",
-					description: "Have the server run as an inetd service",
-					exclusiveOn: ["--pid-file", "--user", "--group"],
-				},
-				{
-					name: "--listen",
-					description:
-						"Listen on a specific IP address or hostname. IP addresses can be either an IPv4 address or an IPv6 address if supported. If IPv6 is not supported, then --listen=hostname is also not supported and --listen must be given an IPv4 address. Can be given more than once. Incompatible with --inetd option",
-					requiresSeparator: true,
-					args: { name: "host_or_ipaddr" },
-				},
-				{
-					name: "--port",
-					description:
-						"Listen on an alternative port. Incompatible with --inetd option",
-					requiresSeparator: true,
-					args: { name: "port" },
-				},
-				{
-					name: "--init-timeout",
-					description:
-						"Timeout (in seconds) between the moment the connection is established and the client request is received (typically a rather low value, since that should be basically immediate)",
-					requiresSeparator: true,
-					args: { name: "timeout" },
-				},
-				{
-					name: "--max-connections",
-					description:
-						"Maximum number of concurrent clients, defaults to 32. Set it to zero for no limit",
-					requiresSeparator: true,
-					args: { name: "maximum" },
-				},
-				{
-					name: "--syslog",
-					description: "Short for --log-destination=syslog",
-				},
-				{
-					name: "--log-destination",
-					description:
-						"Send log messages to the specified destination. Note that this option does not imply --verbose, thus by default only error conditions will be logged. The default destination is syslog if --inetd or --detach is specified, otherwise stderr",
-					requiresSeparator: true,
-					args: {
-						name: "destination",
-						suggestions: [
-							{
-								name: "stderr",
-								description:
-									"Write to standard error. Note that if --detach is specified, the process disconnects from the real standard error, making this destination effectively equivalent to none",
-							},
-							{
-								name: "syslog",
-								description: "Write to syslog, using the git-daemon identifier",
-							},
-							{ name: "none", description: "Disable all logging" },
-						],
-					},
-				},
-				{
-					name: "--user-path",
-					description:
-						"Allow ~user notation to be used in requests. When specified with no parameter, requests to git://host/~alice/foo is taken as a request to access foo repository in the home directory of user alice. If --user-path=some-path is specified, the same request is taken as a request to access the some-path/foo repository in the home directory of user alice",
-					requiresSeparator: true,
-					args: {
-						name: "path",
-						template: "folders",
-					},
-				},
-				{
-					name: "--verbose",
-					description:
-						"Log details about the incoming connections and requested files",
-				},
-				{
-					name: "--detach",
-					description: "Detach from the shell. Implies --syslog",
-				},
-				{
-					name: "--pid-file",
-					description: "Save the process id in the provided file",
-					requiresSeparator: true,
-					args: { name: "file", template: "filepaths" },
-					exclusiveOn: ["--inetd"],
-				},
-				{
-					name: "--user",
-					description:
-						"Change daemon’s uid and gid before entering the service loop. When only --user is given without --group, the primary group ID for the user is used. The values of the option are given to getpwnam(3) and getgrnam(3) and numeric IDs are not supported",
-					requiresSeparator: true,
-					exclusiveOn: ["--inetd"],
-					args: { name: "user" },
-				},
-				{
-					name: "--group",
-					description:
-						"Change daemon’s gid before entering the service loop. The value of this option is given to getgrnam(3) and numeric IDs are not supported",
-					exclusiveOn: ["--inetd"],
-				},
-				{
-					name: "--enable",
-					description: "Enable the service site-wide per default",
-					requiresSeparator: true,
-					args: { name: "service", suggestions: daemonServices },
-				},
-				{
-					name: "--disable",
-					description:
-						"Disable the service site-wide per default. Note that a service disabled site-wide can still be enabled per repository if it is marked overridable and the repository enables the service with a configuration item",
-					requiresSeparator: true,
-					args: { name: "service", suggestions: daemonServices },
-				},
-				{
-					name: "--allow-override",
-					description:
-						"Allow overriding the site-wide default with per repository configuration. By default, all the services may be overridden",
-					requiresSeparator: true,
-					args: { name: "service", suggestions: daemonServices },
-				},
-				{
-					name: "--forbid-override",
-					description:
-						"Forbid overriding the site-wide default with per repository configuration. By default, all the services may be overridden",
-					requiresSeparator: true,
-					args: { name: "service", suggestions: daemonServices },
-				},
-				{
-					name: "--informative-errors",
-					description:
-						'When informative errors are turned on, git-daemon will report more verbose errors to the client, differentiating conditions like "no such repository" from "repository not exported". This is more convenient for clients, but may leak information about the existence of unexported repositories. When informative errors are not enabled, all errors report "access denied" to the client',
-					exclusiveOn: ["--no-informative-errors"],
-				},
-				{
-					name: "--no-informative-errors",
-					description:
-						"Turn off informative errors. This option is the default. See --informative-errors for more information",
-					exclusiveOn: ["--informative-errors"],
-				},
-				{
-					name: "--access-hook",
-					description:
-						'Every time a client connects, first run an external command specified by the <path> with service name (e.g. "upload-pack"), path to the repository, hostname (%H), canonical hostname (%CH), IP address (%IP), and TCP port (%P) as its command-line arguments. The external command can decide to decline the service by exiting with a non-zero status (or to allow it by exiting with a zero status). It can also look at the $REMOTE_ADDR and $REMOTE_PORT environment variables to learn about the requestor when making this decision.\n\nThe external command can optionally write a single line to its standard output to be sent to the requestor as an error message when it declines the service',
-					requiresSeparator: true,
-					args: { name: "path", template: "filepaths" },
-				},
-			],
-		},
-	],
-	additionalSuggestions: [
-		{
-			name: "commit -m 'msg'",
-			description: "Git commit shortcut",
-			insertValue: "commit -m '{cursor}'",
-			icon: "fig://template?color=2ecc71&badge=🔥",
-			// type: "shortcut",
-		},
-	],
+          description:
+            "Transmit the given string to the server, which passes them to the pre-receive as well as the post-receive hook. The given string must not contain a NUL or LF character. When multiple --push-option=<option> are given, they are all sent to the other side in the order listed on the command line. When no --push-option=<option> is given from the command line, the values of configuration variable push.pushOption are used instead",
+          args: {
+            name: "option",
+          },
+        },
+        {
+          name: ["--receive-pack", "--exec"],
+          description:
+            "Path to the git-receive-pack program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH",
+          args: {
+            name: "git-receive-pack",
+          },
+        },
+        {
+          name: "--no-force-with-lease",
+          description:
+            "Cancel all the previous --force-with-lease on the command line",
+        },
+        {
+          name: "--force-with-lease",
+          description:
+            "Protect the named ref (alone), if it is going to be updated, by requiring its current value to be the same as the specified value <expect> (which is allowed to be different from the remote-tracking branch we have for the refname, or we do not even have to have such a remote-tracking branch when this form is used). If <expect> is the empty string, then the named ref must not already exist",
+          args: {
+            name: "refname[:expect]",
+            isOptional: true,
+          },
+        },
+      ],
+      args: [
+        {
+          name: "remote",
+          isOptional: true,
+          generators: gitGenerators.remotes,
+          filterStrategy: "fuzzy",
+        },
+        {
+          name: "branch",
+          isOptional: true,
+          generators: gitGenerators.localBranches,
+          filterStrategy: "fuzzy",
+        },
+      ],
+    },
+    {
+      name: "pull",
+      description: "Integrate with another repository",
+      options: [
+        {
+          name: ["--rebase", "-r"],
+          isDangerous: true,
+          description:
+            "Fetch the remote’s copy of current branch and rebases it into the local copy",
+          args: {
+            isOptional: true,
+            name: "remote",
+            generators: gitGenerators.remotes,
+            filterStrategy: "fuzzy",
+            suggestions: ["false", "true", "merges", "preserve", "interactive"],
+          },
+        },
+        { name: "--no-rebase", description: "Override earlier --rebase" },
+        {
+          name: "--commit",
+          description:
+            "Perform the merge and commit the result. This option can be used to override --no-commit",
+        },
+        {
+          name: "--no-commit",
+          description:
+            "Perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing",
+        },
+        {
+          name: ["--edit", "-e"],
+          description:
+            "Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge",
+        },
+        {
+          name: "--no-edit",
+          description:
+            "The --no-edit option can be used to accept the auto-generated message (this is generally discouraged). The --edit (or -e) option is still useful if you are giving a draft message with the -m option from the command line and want to edit it in the editor",
+        },
+        {
+          name: "--cleanup",
+          description:
+            "This option determines how the merge message will be cleaned up before committing. See git-commit[1] for more details. In addition, if the <mode> is given a value of scissors, scissors will be appended to MERGE_MSG before being passed on to the commit machinery in the case of a merge conflict",
+          requiresSeparator: true,
+          args: {
+            name: "mode",
+            suggestions: [
+              "strip",
+              "whitespace",
+              "verbatim",
+              "scissors",
+              "default",
+            ],
+          },
+        },
+        {
+          name: "--ff",
+          description:
+            "When possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit",
+        },
+        {
+          name: "--no-ff",
+          description:
+            "Create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward",
+        },
+        {
+          name: "--ff-only",
+          description:
+            "Resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status",
+        },
+        {
+          name: ["-S", "--gpg-sign"],
+          description:
+            "GPG-sign the resulting merge commit. The keyid argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space",
+          args: {
+            name: "keyid",
+            isOptional: true,
+          },
+        },
+        {
+          name: "--no-gpg-sign",
+          description:
+            "Is useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
+        },
+        {
+          name: "--log",
+          description:
+            "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also git-fmt-merge-msg[1]",
+          args: {
+            name: "n",
+            isOptional: true,
+          },
+        },
+        {
+          name: "--no-log",
+          description:
+            "Do not list one-line descriptions from the actual commits being merged",
+        },
+        {
+          name: "--signoff",
+          description:
+            "Add a Signed-off-by trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you’re committing. For example, it may certify that the committer has the rights to submit the work under the project’s license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you’re contributing to understand how the signoffs are used in that project",
+        },
+        {
+          name: "--no-signoff",
+          description:
+            "Can be used to countermand an earlier --signoff option on the command line",
+        },
+        {
+          name: "--stat",
+          description:
+            "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat",
+        },
+        {
+          name: ["-n", "--no-stat"],
+          description: "Do not show a diffstat at the end of the merge",
+        },
+        {
+          name: "--squash",
+          description:
+            "With --squash, --commit is not allowed, and will fail. Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the HEAD, or record $GIT_DIR/MERGE_HEAD (to cause the next git commit command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)",
+        },
+        {
+          name: "--no-squash",
+          description:
+            "Perform the merge and commit the result. This option can be used to override --squash",
+        },
+        {
+          name: "--no-verify",
+          description:
+            "This option bypasses the pre-merge and commit-msg hooks. See also githooks[5]",
+        },
+        {
+          name: ["-s", "--strategy"],
+          description:
+            "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no -s option, a built-in list of strategies is used instead (git merge-recursive when merging a single head, git merge-octopus otherwise)",
+          args: {
+            name: "strategy",
+            isVariadic: true,
+            suggestions: ["resolve", "recursive", "octopus", "ours", "subtree"],
+          },
+        },
+        {
+          name: ["-X", "--strategy-option"],
+          description:
+            "Pass merge strategy specific option through to the merge strategy",
+          args: {
+            name: "option",
+            suggestions: [
+              "ours",
+              "theirs",
+              "patience",
+              "diff-algorithm",
+              "diff-algorithm=patience",
+              "diff-algorithm=minimal",
+              "diff-algorithm=histogram",
+              "diff-algorithm=myers",
+              "ignore-space-change",
+              "ignore-all-space",
+              "ignore-space-at-eol",
+              "ignore-cr-at-eol",
+              "renormalize",
+              "no-renormalize",
+              "no-renames",
+              "find-renames",
+              "subtree",
+            ],
+          },
+        },
+        {
+          name: "--verify-signatures",
+          description:
+            "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted",
+        },
+        {
+          name: "--no-verify-signatures",
+          description:
+            "Do not verify that the tip commit of the side branch being merged is signed with a valid key",
+        },
+        {
+          name: "--summary",
+          description:
+            "Synonym to --stat ; this is deprecated and will be removed in the future",
+        },
+        {
+          name: "--no-summary",
+          description:
+            "Synonym to --no-stat ; this is deprecated and will be removed in the future",
+        },
+        {
+          name: ["-q", "--quiet"],
+          description: "Operate quietly. Implies --no-progress",
+        },
+        { name: ["-v", "--verbose"], description: "Be verbose" },
+        {
+          name: "--autostash",
+          description:
+            "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run the operation on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts",
+        },
+        {
+          name: "--no-autostash",
+          description:
+            "Do not automatically create a temporary stash entry before the operation begins, and apply it after the operation ends",
+        },
+        {
+          name: "--allow-unrelated-histories",
+          description:
+            "By default, git merge command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added",
+        },
+        {
+          name: "--all",
+          description: "Fetch all remotes",
+        },
+        {
+          name: ["-a", "--append"],
+          description:
+            "Append ref names and object names of fetched refs to the existing contents of .git/FETCH_HEAD",
+        },
+        {
+          name: "--atomic",
+          description:
+            "Use an atomic transaction to update local refs. Either all refs are updated, or on error, no refs are updated",
+        },
+        {
+          name: "--depth",
+          requiresSeparator: true,
+          args: {
+            name: "depth",
+          },
+          description:
+            "Limit fetching to the specified number of commits from the tip of each remote branch history",
+        },
+        {
+          name: "--deepen",
+          requiresSeparator: true,
+          args: {
+            name: "depth",
+          },
+          description:
+            "Similar to --depth, except it specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history",
+        },
+        {
+          name: "--shallow-since",
+          requiresSeparator: true,
+          args: {
+            name: "date",
+          },
+          description:
+            "Deepen or shorten the history of a shallow repository to include all reachable commits after <date>",
+        },
+        {
+          name: "--shallow-exclude",
+          requiresSeparator: true,
+          args: {
+            name: "revision",
+          },
+          description:
+            "Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag. This option can be specified multiple times",
+        },
+        {
+          name: "--unshallow",
+          description:
+            "If the source repository is shallow, fetch as much as possible so that the current repository has the same history as the source repository",
+        },
+        {
+          name: "--update-shallow",
+          description:
+            "By default when fetching from a shallow repository, git fetch refuses refs that require updating .git/shallow",
+        },
+        {
+          name: "--negotiation-tip",
+          requiresSeparator: true,
+          args: {
+            name: "commit|glob",
+            generators: gitGenerators.commits,
+          },
+          description:
+            "By default, Git will report, to the server, commits reachable from all local refs to find common commits in an attempt to reduce the size of the to-be-received packfile",
+        },
+        {
+          name: "--dry-run",
+          description: "Show what would be done, without making any changes",
+        },
+        {
+          name: ["-f", "--force"],
+          description: "This option overrides that check",
+        },
+        {
+          name: ["-k", "--keep"],
+          description: "Keep downloaded pack",
+        },
+        {
+          name: ["-p", "--prune"],
+          description:
+            "Before fetching, remove any remote-tracking references that no longer exist on the remote",
+        },
+        {
+          name: ["-P", "--prune-tags"],
+          description:
+            "Before fetching, remove any local tags that no longer exist on the remote if --prune is enabled",
+        },
+        {
+          name: "--no-tags",
+          description:
+            "By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following",
+        },
+        {
+          name: "--refmap",
+          requiresSeparator: true,
+          args: {
+            name: "refspec",
+          },
+          description:
+            "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository",
+        },
+        {
+          name: ["-t", "--tags"],
+          description:
+            "By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following",
+        },
+        {
+          name: "--recurse-submodules",
+          requiresSeparator: true,
+          args: {
+            name: "mode",
+            isOptional: true,
+            suggestions: ["yes", "on-demand", "no"],
+          },
+          description:
+            "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository",
+        },
+        {
+          name: "--no-recurse-submodules",
+          description:
+            "Disable recursive fetching of submodules (this has the same effect as using the --recurse-submodules=no option)",
+        },
+        {
+          name: ["-j", "--jobs"],
+          args: {
+            name: "n",
+          },
+          description:
+            "Number of parallel children to be used for all forms of fetching",
+        },
+        {
+          name: "--set-upstream",
+          description:
+            "If the remote is fetched successfully, add upstream (tracking) reference, used by argument-less git-pull[1] and other commands",
+        },
+        {
+          name: "--upload-pack",
+          args: {
+            name: "upload-pack",
+          },
+          description:
+            "When given, and the repository to fetch from is handled by git fetch-pack, --exec=<upload-pack> is passed to the command to specify non-default path for the command run on the other end",
+        },
+        {
+          name: "--progress",
+          description:
+            "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified",
+        },
+        {
+          name: ["-o", "--server-option"],
+          args: {
+            name: "option",
+          },
+          description:
+            "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character",
+        },
+        {
+          name: "--show-forced-updates",
+          description:
+            "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs",
+        },
+        {
+          name: "--no-show-forced-updates",
+          description:
+            "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons",
+        },
+        {
+          name: ["-4", "--ipv4"],
+          description: "Use IPv4 addresses only, ignoring IPv6 addresses",
+        },
+        {
+          name: ["-6", "--ipv6"],
+          description: "Use IPv6 addresses only, ignoring IPv4 addresses",
+        },
+      ],
+      args: [
+        {
+          name: "remote",
+          isOptional: true,
+          generators: gitGenerators.remotes,
+          filterStrategy: "fuzzy",
+        },
+        {
+          name: "branch",
+          isOptional: true,
+          generators: gitGenerators.localBranches,
+          filterStrategy: "fuzzy",
+        },
+      ],
+    },
+    {
+      name: "diff",
+      description: "Show changes between commits, commit and working tree, etc",
+      options: [
+        {
+          name: "--staged",
+          description:
+            "Show difference between the files in the staging area and the latest version",
+        },
+        {
+          name: "--cached",
+          description: "Show difference between staged changes and last commit",
+        },
+        {
+          name: "--help",
+          description: "Shows different options",
+        },
+        {
+          name: "--numstat",
+          description:
+            "Shows number of added and deleted lines in decimal notation",
+        },
+        {
+          name: "--name-only",
+          description: "Show only names of changed files",
+        },
+        {
+          name: "--shortstat",
+          description:
+            "Output only the last line of the --stat format containing total number of modified files",
+        },
+        {
+          name: "--stat",
+          description: "Generate a diffstat",
+          requiresSeparator: true,
+          args: {
+            isOptional: true,
+            name: "[=< width >[,< name-width >[,< count >]]]",
+          },
+        },
+        {
+          name: "--",
+          description:
+            "Separates paths from options for disambiguation purposes",
+          args: {
+            isVariadic: true,
+            optionsCanBreakVariadicArg: false,
+            template: "filepaths",
+            name: "[< path >...]",
+          },
+        },
+      ],
+      args: {
+        name: "commit or file",
+        isOptional: true,
+        isVariadic: true,
+        suggestions: headSuggestions,
+        generators: [
+          gitGenerators.commits,
+          gitGenerators.remoteLocalBranches,
+          gitGenerators.getChangedTrackedFiles,
+        ],
+      },
+    },
+    {
+      name: "reset",
+      description: "Reset current HEAD to the specified state",
+      options: [
+        {
+          name: "--keep",
+          description:
+            "Safe: files which are different between the current HEAD and the given commit. Will abort if there are uncommitted changes",
+        },
+        {
+          name: "--soft",
+          description:
+            "Remove the last commit from the current branch, but the file changes will stay in your working tree",
+        },
+        {
+          name: "--hard",
+          description:
+            "⚠️WARNING: you will lose all uncommitted changes in addition to the changes introduced in the last commit",
+        },
+        {
+          name: "--mixed",
+          description:
+            "Keep the changes in your working tree but not on the index",
+        },
+        {
+          name: "-N",
+          description: "Mark removed paths as intent-to-add",
+          dependsOn: ["--mixed"],
+        },
+        {
+          name: "--merge",
+          description:
+            "Resets the index and updates the files in the working tree that are different" +
+            " between 'commit' and HEAD",
+        },
+        {
+          name: ["-q", "--quiet"],
+          description: "Be quiet, only report errors",
+          exclusiveOn: ["--no-quiet"],
+        },
+        {
+          name: "--no-quiet",
+          description: "Inverse of --quiet",
+          exclusiveOn: ["-q", "--quiet"],
+        },
+        {
+          name: "--pathspec-from-file",
+          requiresSeparator: true,
+          description:
+            "Pathspec is passed in file <file> instead of commandline args",
+          args: {
+            name: "file",
+            template: ["folders", "filepaths"],
+            suggestions: ["-"],
+          },
+        },
+        {
+          name: "--pathspec-file-nul",
+          description: "Pathspec elements are separated with NUL character",
+          dependsOn: ["--pathspec-from-file"],
+        },
+        {
+          name: ["-p", "--patch"],
+          description:
+            "Interactively select hunks in the difference between the index and <tree-ish>",
+        },
+      ],
+      args: {
+        isOptional: true,
+        isVariadic: true,
+        suggestions: headSuggestions,
+        generators: [
+          gitGenerators.treeish,
+          gitGenerators.commits,
+          gitGenerators.remoteLocalBranches,
+        ],
+      },
+    },
+    {
+      name: "log",
+      description: "Show commit logs",
+      options: [
+        {
+          name: "--follow",
+          description: "Show history of given file",
+          args: {
+            name: "file",
+            template: "filepaths",
+          },
+        },
+        {
+          name: ["-q", "--quiet"],
+          description: "Suppress diff output",
+        },
+        {
+          name: "--show-signature",
+          description: "Check the validity of a signed commit",
+        },
+        {
+          name: "--source",
+          description: "Show source",
+        },
+        {
+          name: "--oneline",
+          description: "Show each commit as a single line",
+        },
+        {
+          name: ["-p", "-u", "--patch"],
+          description: "Display the full diff of each commit",
+        },
+        {
+          name: "--stat",
+          description:
+            "Include which files were altered and the relative number of lines that were added or deleted from each of them",
+        },
+        {
+          name: "--grep",
+          description:
+            "Search for commits with a commit message that matches <pattern>",
+          requiresSeparator: true,
+          args: {
+            name: "pattern",
+          },
+        },
+        {
+          name: "--author",
+          description: "Search for commits by a particular author",
+          requiresSeparator: true,
+          args: {
+            name: "pattern",
+          },
+        },
+      ],
+      args: [
+        {
+          name: "since",
+          isOptional: true,
+          description: "Commit ID, branch name, HEAD, or revision reference",
+          generators: gitGenerators.commits,
+          suggestions: headSuggestions,
+        },
+        {
+          name: "until",
+          isOptional: true,
+          description: "Commit ID, branch name, HEAD, or revision reference",
+          generators: gitGenerators.commits,
+          suggestions: headSuggestions,
+        },
+      ],
+    },
+    {
+      name: "remote",
+      description: "Manage remote repository",
+      subcommands: [
+        {
+          name: "add",
+          description: "Add a remote named <name> for the repository at <url>",
+          args: [{ name: "name" }, { name: "repository url" }],
+          options: [
+            {
+              name: "-t",
+              description: "A refspec to track only <branch> is created",
+              args: {
+                name: "branch",
+              },
+            },
+            {
+              name: "-m",
+              description:
+                "A symbolic-ref refs/remotes/<name>/HEAD is set up to point at remote’s <master> branch",
+              args: {
+                name: "master",
+              },
+            },
+            {
+              name: "-f",
+              description:
+                "Git fetch <name> is run immediately after the remote information is set up",
+            },
+            {
+              name: "--tags",
+              description:
+                "Git fetch <name> imports every tag from the remote repository",
+            },
+            {
+              name: "--no-tags",
+              description:
+                "Git fetch <name> does not import tags from the remote repository",
+            },
+            {
+              name: "--mirror",
+              requiresSeparator: true,
+              description: "Create fetch or push mirror",
+              args: {
+                suggestions: ["fetch", "push"],
+              },
+            },
+          ],
+        },
+        {
+          name: "set-head",
+          description: "Sets or deletes the default branch",
+          args: [
+            {
+              name: "name",
+              generators: gitGenerators.remotes,
+              filterStrategy: "fuzzy",
+            },
+            {
+              name: "branch",
+              isOptional: true,
+            },
+          ],
+          options: [
+            {
+              name: ["--auto", "-a"],
+              description:
+                "The remote is queried to determine its HEAD, then the symbolic-ref refs/remotes/<name>/HEAD is set to the same branch",
+            },
+            {
+              name: ["--delete", "-d"],
+              description:
+                "The symbolic ref refs/remotes/<name>/HEAD is deleted",
+            },
+          ],
+        },
+        {
+          name: "set-branches",
+          description:
+            "Changes the list of branches tracked by the named remote. This can be used to track a subset of the available remote branches after the initial setup for a remote",
+          options: [
+            {
+              name: "--add",
+              description:
+                "Instead of replacing the list of currently tracked branches, adds to that list",
+            },
+          ],
+          args: [
+            {
+              name: "name",
+              generators: gitGenerators.remotes,
+              filterStrategy: "fuzzy",
+            },
+            {
+              name: "branch",
+              isVariadic: true,
+            },
+          ],
+        },
+        {
+          name: ["rm", "remove"],
+          description: "Removes given remote [name]",
+          args: {
+            name: "remote",
+            generators: gitGenerators.remotes,
+            filterStrategy: "fuzzy",
+          },
+        },
+        {
+          name: "rename",
+          description: "Removes given remote [name]",
+          args: [
+            {
+              name: "old remote",
+              generators: gitGenerators.remotes,
+              filterStrategy: "fuzzy",
+            },
+            {
+              name: "new remote name",
+            },
+          ],
+        },
+        {
+          name: "get-url",
+          description: "Retrieves the URLs for a remote",
+          options: [
+            {
+              name: "--push",
+              description: "Push URLs are queried rather than fetch URLs",
+            },
+            {
+              name: "--all",
+              description: "All URLs for the remote will be listed",
+            },
+          ],
+          args: {
+            name: "name",
+            generators: gitGenerators.remotes,
+            filterStrategy: "fuzzy",
+          },
+        },
+        {
+          name: "set-url",
+          description: "Changes the URLs for the remote",
+          args: [
+            {
+              name: "name",
+              generators: gitGenerators.remotes,
+              filterStrategy: "fuzzy",
+            },
+            {
+              name: "newurl",
+            },
+            {
+              name: "oldurl",
+              isOptional: true,
+            },
+          ],
+          options: [
+            {
+              name: "--push",
+              description: "Push URLs are manipulated instead of fetch URLs",
+            },
+            {
+              name: "--add",
+              description:
+                "Instead of changing existing URLs, new URL is added",
+            },
+            {
+              name: "--delete",
+              description:
+                "Instead of changing existing URLs, all URLs matching regex <url> are deleted for remote <name>",
+            },
+          ],
+        },
+        {
+          name: "show",
+          description: "Gives some information about the remote [name]",
+          args: {
+            name: "name",
+            isVariadic: true,
+            generators: gitGenerators.remotes,
+            filterStrategy: "fuzzy",
+          },
+          options: [
+            {
+              name: "-n",
+              description:
+                "The remote heads are not queried first with git ls-remote <name>; cached information is used instead",
+            },
+          ],
+        },
+        {
+          name: "prune",
+          description:
+            "Equivalent to git fetch --prune [name], except that no new references will be fetched",
+          args: {
+            name: "name",
+            isVariadic: true,
+            generators: gitGenerators.remotes,
+            filterStrategy: "fuzzy",
+          },
+          options: [
+            {
+              name: "-n",
+            },
+            {
+              name: "--dry-run",
+              description:
+                "Report what branches would be pruned, but do not actually prune them",
+            },
+          ],
+        },
+        {
+          name: "update",
+          description:
+            "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>",
+          options: [
+            {
+              name: ["-p", "--prune"],
+              description: "",
+            },
+          ],
+          args: [
+            {
+              name: "group",
+              isOptional: true,
+              isVariadic: true,
+            },
+            {
+              name: "remote",
+              isOptional: true,
+              isVariadic: true,
+            },
+          ],
+        },
+      ],
+      options: [
+        {
+          name: ["-v", "--verbose"],
+          description:
+            "Be a little more verbose and show remote url after name. NOTE: This must be placed between remote and subcommand",
+        },
+      ],
+    },
+    {
+      name: "fetch",
+      description: "Download objects and refs from another repository",
+      args: [
+        {
+          name: "remote",
+          isOptional: true,
+          generators: gitGenerators.remotes,
+          filterStrategy: "fuzzy",
+        },
+        {
+          name: "branch",
+          isOptional: true,
+          generators: gitGenerators.localBranches,
+          filterStrategy: "fuzzy",
+        },
+        {
+          name: "refspec",
+          isOptional: true,
+        },
+      ],
+      options: [
+        {
+          name: "--all",
+          description: "Fetch all remotes",
+        },
+        {
+          name: ["-a", "--append"],
+          description:
+            "Append ref names and object names of fetched refs to the existing contents of .git/FETCH_HEAD",
+        },
+        {
+          name: "--atomic",
+          description:
+            "Use an atomic transaction to update local refs. Either all refs are updated, or on error, no refs are updated",
+        },
+        {
+          name: "--depth",
+          requiresSeparator: true,
+          args: {
+            name: "depth",
+          },
+          description:
+            "Limit fetching to the specified number of commits from the tip of each remote branch history",
+        },
+        {
+          name: "--deepen",
+          requiresSeparator: true,
+          args: {
+            name: "depth",
+          },
+          description:
+            "Similar to --depth, except it specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history",
+        },
+        {
+          name: "--shallow-since",
+          requiresSeparator: true,
+          args: {
+            name: "date",
+          },
+          description:
+            "Deepen or shorten the history of a shallow repository to include all reachable commits after <date>",
+        },
+        {
+          name: "--shallow-exclude",
+          requiresSeparator: true,
+          args: {
+            name: "revision",
+          },
+          description:
+            "Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag. This option can be specified multiple times",
+        },
+        {
+          name: "--unshallow",
+          description:
+            "If the source repository is shallow, fetch as much as possible so that the current repository has the same history as the source repository",
+        },
+        {
+          name: "--update-shallow",
+          description:
+            "By default when fetching from a shallow repository, git fetch refuses refs that require updating .git/shallow",
+        },
+        {
+          name: "--negotiation-tip",
+          requiresSeparator: true,
+          args: {
+            name: "commit|glob",
+            generators: gitGenerators.commits,
+          },
+          description:
+            "By default, Git will report, to the server, commits reachable from all local refs to find common commits in an attempt to reduce the size of the to-be-received packfile",
+        },
+        {
+          name: "--dry-run",
+          description: "Show what would be done, without making any changes",
+        },
+        {
+          name: "--write-fetch-head",
+          description:
+            "Write the list of remote refs fetched in the FETCH_HEAD file directly under $GIT_DIR. This is the default",
+        },
+        {
+          name: "--no-write-fetch-head",
+          description: "Tells Git not to write the file",
+        },
+        {
+          name: ["-f", "--force"],
+          description: "This option overrides that check",
+        },
+        {
+          name: ["-k", "--keep"],
+          description: "Keep downloaded pack",
+        },
+        {
+          name: "--multiple",
+          description:
+            "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified",
+        },
+        {
+          name: ["--auto-maintenance", "--auto-gc"],
+          description:
+            "Run git maintenance run --auto at the end to perform automatic repository maintenance if",
+        },
+        {
+          name: ["--no-auto-maintenance", "--no-auto-gc"],
+          description:
+            "Don't run git maintenance run --auto at the end to perform automatic repository maintenance",
+        },
+        {
+          name: "--write-commit-graph",
+          description:
+            "Write a commit-graph after fetching. This overrides the config setting fetch.writeCommitGraph",
+        },
+        {
+          name: "--no-write-commit-graph",
+          description:
+            "Don't write a commit-graph after fetching. This overrides the config setting fetch.writeCommitGraph",
+        },
+        {
+          name: ["-p", "--prune"],
+          description:
+            "Before fetching, remove any remote-tracking references that no longer exist on the remote",
+        },
+        {
+          name: ["-P", "--prune-tags"],
+          description:
+            "Before fetching, remove any local tags that no longer exist on the remote if --prune is enabled",
+        },
+        {
+          name: ["-n", "--no-tags"],
+          description:
+            "By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following",
+        },
+        {
+          name: "--refmap",
+          requiresSeparator: true,
+          args: {
+            name: "refspec",
+          },
+          description:
+            "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository",
+        },
+        {
+          name: ["-t", "--tags"],
+          description:
+            "By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following",
+        },
+        {
+          name: "--recurse-submodules",
+          requiresSeparator: true,
+          args: {
+            name: "mode",
+            isOptional: true,
+            suggestions: ["yes", "on-demand", "no"],
+          },
+          description:
+            "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository",
+        },
+        {
+          name: ["-j", "--jobs"],
+          args: {
+            name: "n",
+          },
+          description:
+            "Number of parallel children to be used for all forms of fetching",
+        },
+        {
+          name: "--no-recurse-submodules",
+          description:
+            "Disable recursive fetching of submodules (this has the same effect as using the --recurse-submodules=no option)",
+        },
+        {
+          name: "--set-upstream",
+          description:
+            "If the remote is fetched successfully, add upstream (tracking) reference, used by argument-less git-pull[1] and other commands",
+        },
+        {
+          name: "--submodule-prefix",
+          requiresSeparator: true,
+          args: {
+            name: "path",
+          },
+          description:
+            'Prepend <path> to paths printed in informative messages such as ”Fetching submodule foo". This option is used internally when recursing over submodules',
+        },
+        {
+          name: "--recurse-submodules-default",
+          requiresSeparator: true,
+          args: {
+            name: "mode",
+            isOptional: true,
+            suggestions: ["yes", "on-demand"],
+          },
+          description:
+            "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option",
+        },
+        {
+          name: ["-u", "--update-head-ok"],
+          description:
+            "By default git fetch refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for git pull to communicate with git fetch, and unless you are implementing your own Porcelain you are not supposed to use it",
+        },
+        {
+          name: "--upload-pack",
+          args: {
+            name: "upload-pack",
+          },
+          description:
+            "When given, and the repository to fetch from is handled by git fetch-pack, --exec=<upload-pack> is passed to the command to specify non-default path for the command run on the other end",
+        },
+        {
+          name: ["-q", "--quiet"],
+          description:
+            "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream",
+        },
+        {
+          name: ["-v", "--verbose"],
+          description: "Be verbose",
+        },
+        {
+          name: "--progress",
+          description:
+            "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified",
+        },
+        {
+          name: ["-o", "--server-option"],
+          args: {
+            name: "option",
+          },
+          description:
+            "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character",
+        },
+        {
+          name: "--show-forced-updates",
+          description:
+            "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs",
+        },
+        {
+          name: "--no-show-forced-updates",
+          description:
+            "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons",
+        },
+        {
+          name: ["-4", "--ipv4"],
+          description: "Use IPv4 addresses only, ignoring IPv6 addresses",
+        },
+        {
+          name: ["-6", "--ipv6"],
+          description: "Use IPv6 addresses only, ignoring IPv4 addresses",
+        },
+        {
+          name: "--stdin",
+          description:
+            'Read refspecs, one per line, from stdin in addition to those provided as arguments. The "tag <name>" format is not supported',
+        },
+      ],
+    },
+    {
+      name: "stash",
+      description: "Temporarily stores all the modified tracked files",
+      requiresSubcommand: false,
+      subcommands: [
+        {
+          name: "push", // TODO: support for no subcommand is missing
+          description:
+            "Save your local modifications to a new stash entry and roll them back to HEAD",
+          options: [
+            {
+              name: ["-p", "--patch"],
+              description:
+                "Interactively select hunks from the diff between HEAD and the working tree to be stashed",
+            },
+            {
+              name: ["-k", "--keep-index"],
+              description:
+                "All changed already added to the index are left intact",
+            },
+            {
+              name: ["-u", "--include-untracked"],
+              description:
+                "All untracked files are also stashed and then cleaned up",
+            },
+            {
+              name: ["-a", "--all"],
+              description: "All ignored and untracked files are also stashed",
+            },
+            {
+              name: ["-q", "--quiet"],
+              description: "Quiet, suppress feedback messages",
+            },
+            {
+              name: ["-m", "--message"],
+              insertValue: "-m {cursor}",
+              description: "Use the given <msg> as the stash message",
+              args: {
+                name: "message",
+              },
+            },
+            { name: "--pathspec-from-file", description: "" }, // TODO: pathspec file nul and add description
+            {
+              name: "--",
+              description:
+                "Separates pathsec from options for disambiguation purposes",
+            },
+            // TODO: pathspec
+          ],
+        },
+        {
+          name: "show",
+          description: "Show the changes recorded in the stash entry as a diff",
+          args: {
+            name: "stash",
+            isOptional: true,
+            generators: gitGenerators.stashes,
+            filterStrategy: "fuzzy",
+          },
+        },
+        {
+          name: "save",
+          description: "Temporarily stores all the modified tracked files",
+          options: [
+            {
+              name: ["-p", "--patch"],
+              description:
+                "Interactively select hunks from the diff between HEAD and the working tree to be stashed",
+            },
+            {
+              name: ["-k", "--keep-index"],
+              description:
+                "All changed already added to the index are left intact",
+            },
+            {
+              name: ["-u", "--include-untracked"],
+              description:
+                "All untracked files are also stashed and then cleaned up",
+            },
+            {
+              name: ["-a", "--all"],
+              description: "All ignored and untracked files are also stashed",
+            },
+            {
+              name: ["-q", "--quiet"],
+              description: "Quiet, suppress feedback messages",
+            },
+          ],
+          args: {
+            name: "message",
+            isOptional: true,
+          },
+        },
+        {
+          name: "pop",
+          description: "Restores the most recently stashed files",
+          options: [
+            {
+              name: "--index",
+              description:
+                "Tries to reinstate not only the working tree's changes, but also the index's ones",
+            },
+            {
+              name: ["-q", "--quiet"],
+              description: "Quiet, suppress feedback messages",
+            },
+          ],
+          args: {
+            name: "stash",
+            isOptional: true,
+            generators: gitGenerators.stashes,
+            filterStrategy: "fuzzy",
+          },
+        },
+        {
+          name: "list",
+          description: "Lists all stashed changesets",
+        },
+        {
+          name: "drop",
+          description: "Discards the most recently stashed changeset",
+          options: [
+            {
+              name: ["-q", "--quiet"],
+              description: "Quiet, suppress feedback messages",
+            },
+          ],
+          args: {
+            name: "stash",
+            isOptional: true,
+            generators: gitGenerators.stashes,
+            filterStrategy: "fuzzy",
+          },
+        },
+        {
+          name: "clear",
+          description: "Remove all the stash entries",
+        },
+        {
+          name: "apply",
+          description:
+            "Like pop, but do not remove the state from the stash list",
+          options: [
+            {
+              name: "--index",
+              description:
+                "Tries to reinstate not only the working tree's changes, but also the index's ones",
+            },
+            {
+              name: ["-q", "--quiet"],
+              description: "Quiet, suppress feedback messages",
+            },
+          ],
+          args: {
+            name: "stash",
+            isOptional: true,
+            generators: gitGenerators.stashes,
+            filterStrategy: "fuzzy",
+          },
+        },
+        {
+          name: "branch",
+          description: "Creates and checks out a new branch named",
+          insertValue: "branch {cursor}",
+          args: [
+            {
+              name: "branch",
+              generators: gitGenerators.localBranches,
+              filterStrategy: "fuzzy",
+            },
+            {
+              name: "stash",
+              isOptional: true,
+              generators: gitGenerators.stashes,
+              filterStrategy: "fuzzy",
+            },
+          ],
+        },
+        {
+          name: "create",
+          description: "Creates a stash entry",
+          args: {
+            name: "message",
+            isOptional: true,
+          },
+        },
+        {
+          name: "store",
+          description:
+            "Store a given stash in the stash ref, updating the stash reflog",
+          options: [
+            {
+              name: ["-m", "--message"],
+              insertValue: "-m {cursor}",
+              description: "Use the given <msg> as the stash message",
+              args: {
+                name: "message",
+              },
+            },
+            {
+              name: ["-q", "--quiet"],
+              description: "Quiet, suppress feedback messages",
+            },
+          ],
+          args: [
+            {
+              name: "message",
+            },
+            {
+              name: "commit",
+              generators: gitGenerators.commits,
+            },
+          ],
+        },
+      ],
+    },
+    {
+      name: "reflog",
+      description: "Show history of events with hashes",
+      options: [
+        {
+          name: "--relative-date",
+          description: "Show date info",
+        },
+        {
+          name: "--all",
+          description: "Show all refs",
+        },
+      ],
+    },
+    {
+      name: "clone",
+      description: "Clone a repository into a new directory",
+      args: [
+        {
+          name: "repository",
+          description: "Git library to be cloned",
+        },
+        {
+          name: "directory",
+          description: "Specify the new directory name or target folder",
+          template: "folders",
+          isOptional: true,
+        },
+      ],
+      options: [
+        {
+          name: ["-l", "--local"],
+          description: "Bypasses the normal git aware transport mechanism",
+        },
+        {
+          name: "--no-hardlinks",
+          description:
+            "Force the cloning process from a repository on a local filesystem to copy the files under the .git/objects directory instead of using hardlinks",
+        },
+        {
+          name: ["-s", "--shared"],
+          isDangerous: true,
+          description:
+            "Automatically setup .git/objects/info/alternates to share the objects with the source repository",
+        },
+        {
+          name: "--dry-run",
+          description: "Do nothing; only show what would happen",
+        },
+        {
+          name: "--reference",
+          description:
+            "If the reference repository is on the local machine, automatically setup",
+          args: {
+            name: "repository",
+          },
+        },
+        {
+          name: "--reference-if-able",
+          description:
+            "If the reference repository is on the local machine, automatically setup. Non existing directory is skipped with a warning",
+          args: {
+            name: "repository",
+          },
+        },
+        {
+          name: "--dissociate",
+          description:
+            "Borrow the objects from reference repositories specified with the --reference options only to reduce network transfer, and stop borrowing from them after a clone is made by making necessary local copies of borrowed objects",
+        },
+        {
+          name: ["-q", "--quiet"],
+          description:
+            "Operate quietly. Progress is not reported to the standard error stream",
+        },
+        {
+          name: ["-v", "--verbose"],
+          description:
+            "Run verbosely. Does not affect the reporting of progress status to the standard error stream",
+        },
+        {
+          name: "--progress",
+          description:
+            "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless --quiet is specified. This flag forces progress status even if the standard error stream is not directed to a terminal",
+        },
+        {
+          name: "--server-option",
+          description:
+            "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server’s handling of server options, including unknown ones, is server-specific. When multiple --server-option=<option> are given, they are all sent to the other side in the order listed on the command line",
+          requiresSeparator: true,
+          args: {
+            name: "option",
+          },
+        },
+        {
+          name: ["-n", "--no-checkout"],
+          description:
+            "No checkout of HEAD is performed after the clone is complete",
+        },
+        {
+          name: "--bare",
+          description:
+            "Make a bare Git repository. That is, instead of creating <directory> and placing the administrative files in <directory>/.git, make the <directory> itself the $GIT_DIR. This obviously implies the --no-checkout because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to refs/remotes/origin/. When this option is used, neither remote-tracking branches nor the related configuration variables are created",
+        },
+        {
+          name: "--sparse",
+          description:
+            "Initialize the sparse-checkout file so the working directory starts with only the files in the root of the repository. The sparse-checkout file can be modified to grow the working directory as needed",
+        },
+        {
+          name: "--filter",
+          description:
+            "Use the partial clone feature and request that the server sends a subset of reachable objects according to a given object filter. When using --filter, the supplied <filter-spec> is used for the partial clone filter. For example, --filter=blob:none will filter out all blobs (file contents) until needed by Git. Also, --filter=blob:limit=<size> will filter out all blobs of size at least <size>. For more details on filter specifications, see the --filter option in git-rev-list[1]",
+          requiresSeparator: true,
+          args: { name: "filter spec" },
+        },
+        {
+          name: "--mirror",
+          description:
+            "Set up a mirror of the source repository. This implies --bare. Compared to --bare, --mirror not only maps local branches of the source to local branches of the target, it maps all refs (including remote-tracking branches, notes etc.) and sets up a refspec configuration such that all these refs are overwritten by a git remote update in the target repository",
+        },
+        {
+          name: ["-o", "--origin"],
+          description:
+            "Instead of using the remote name origin to keep track of the upstream repository, use <name>. Overrides clone.defaultRemoteName from the config",
+          args: { name: "name" },
+        },
+        {
+          name: ["-b", "--branch"],
+          description:
+            "Instead of pointing the newly created HEAD to the branch pointed to by the cloned repository’s HEAD, point to <name> branch instead. In a non-bare repository, this is the branch that will be checked out. --branch can also take tags and detaches the HEAD at that commit in the resulting repository",
+          args: { name: "branch name" },
+        },
+        {
+          name: ["-u", "--upload-pack"],
+          description:
+            "When given, and the repository to clone from is accessed via ssh, this specifies a non-default path for the command run on the other end",
+          args: {
+            name: "upload pack",
+          },
+        },
+        {
+          name: "--template",
+          description:
+            "Specify the directory from which templates will be used",
+          requiresSeparator: true,
+          args: {
+            name: "template directory",
+          },
+        },
+        {
+          name: ["-c", "--config"],
+          description:
+            "Set a configuration variable in the newly-created repository; this takes effect immediately after the repository is initialized, but before the remote history is fetched or any files checked out. The key is in the same format as expected by git-config[1] (e.g., core.eol=true). If multiple values are given for the same key, each value will be written to the config file. This makes it safe, for example, to add additional fetch refspecs to the origin remote. Due to limitations of the current implementation, some configuration variables do not take effect until after the initial fetch and checkout. Configuration variables known to not take effect are: remote.<name>.mirror and remote.<name>.tagOpt. Use the corresponding --mirror and --no-tags options instead",
+          args: { name: "key=value" },
+        },
+        {
+          name: "--depth",
+          description:
+            "Create a shallow clone with a history truncated to the specified number of commits. Implies --single-branch unless --no-single-branch is given to fetch the histories near the tips of all branches. If you want to clone submodules shallowly, also pass --shallow-submodules",
+          args: {
+            name: "depth",
+          },
+        },
+        {
+          name: "--shallow-since",
+          description:
+            "Create a shallow clone with a history after the specified time",
+          requiresSeparator: true,
+          args: {
+            name: "date",
+          },
+        },
+        {
+          name: "--shallow-exclude",
+          description:
+            "Create a shallow clone with a history, excluding commits reachable from a specified remote branch or tag. This option can be specified multiple times",
+          requiresSeparator: true,
+          args: {
+            name: "revision",
+          },
+        },
+        {
+          name: "--single-branch",
+          description:
+            "Clone only the history leading to the tip of a single branch, either specified by the --branch option or the primary branch remote’s HEAD points at. Further fetches into the resulting repository will only update the remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any branch when --single-branch clone was made, no remote-tracking branch is created",
+        },
+        {
+          name: "--no-single-branch",
+          description:
+            "Do not clone only the history leading to the tip of a single branch, either specified by the --branch option or the primary branch remote’s HEAD points at. Further fetches into the resulting repository will only update the remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any branch when --single-branch clone was made, no remote-tracking branch is created",
+        },
+        {
+          name: "--no-tags",
+          description:
+            "Don’t clone any tags, and set remote.<remote>.tagOpt=--no-tags in the config, ensuring that future git pull and git fetch operations won’t follow any tags. Subsequent explicit tag fetches will still work, (see git-fetch[1])",
+        },
+        {
+          name: "--recurse-submodules",
+          description:
+            "After the clone is created, initialize and clone submodules within based on the provided pathspec. If no pathspec is provided, all submodules are initialized and cloned. This option can be given multiple times for pathspecs consisting of multiple entries",
+          args: {
+            isOptional: true,
+            name: "pathspec",
+          },
+        },
+        {
+          name: "--shallow-submodules",
+          description:
+            "All submodules which are cloned will be shallow with a depth of 1",
+        },
+        {
+          name: "--no-shallow-submodules",
+          description: "Disable --shallow-submodules",
+        },
+        {
+          name: "--remote-submodules",
+          description:
+            "All submodules which are cloned will use the status of the submodule’s remote-tracking branch to update the submodule, rather than the superproject’s recorded SHA-1. Equivalent to passing --remote to git submodule update",
+        },
+        {
+          name: "--no-remote-submodules",
+          description: "Disable --remote-submodules",
+        },
+        {
+          name: ["-j", "--jobs"],
+          description:
+            "The number of submodules fetched at the same time. Defaults to the submodule.fetchJobs option",
+          args: {
+            name: "n",
+            isOptional: true,
+          },
+        },
+        {
+          name: "--separate-git-dir",
+          description:
+            "Instead of placing the cloned repository where it is supposed to be, place the cloned repository at the specified directory, then make a filesystem-agnostic Git symbolic link to there. The result is Git repository can be separated from working tree",
+          requiresSeparator: true,
+          args: {
+            name: "git dir",
+          },
+        },
+      ],
+    },
+    {
+      name: "init",
+      description:
+        "Create an empty Git repository or reinitialize an existing one",
+      args: {
+        name: "directory",
+        isOptional: true,
+      },
+      options: [
+        {
+          name: ["-q", "--quiet"],
+          description: "Only print error and warning messages",
+        },
+        {
+          name: "--bare",
+          description: "Create a bare repository",
+        },
+        {
+          name: "--object-format",
+          description: "Specify the given object format",
+          args: {
+            name: "format",
+            suggestions: ["sha1", "sha256"],
+          },
+        },
+        {
+          name: "--template",
+          description:
+            "Specify the directory from which templates will be used",
+          args: {
+            name: "template_directory",
+            template: "folders",
+          },
+        },
+        {
+          name: "--separate-git-dir",
+          description:
+            "Instead of initializing the repository as a directory to either $GIT_DIR or ./.git/, create a text file there containing the path to the actual repository. This file acts as filesystem-agnostic Git symbolic link to the repository",
+          args: {
+            name: "git dir",
+          },
+        },
+        {
+          name: ["-b", "--initial-branch"],
+          description: "Initial branch for new repo",
+          args: {
+            isOptional: true,
+            name: "branch-name",
+          },
+        },
+        {
+          name: "--shared",
+          description:
+            "Specify that the Git repository is to be shared amongst several users. This allows users belonging to the same group to push into that repository",
+          args: {
+            isOptional: true,
+            suggestions: [
+              {
+                name: "false",
+                description: "Use permissions reported by umask(2)",
+              },
+              {
+                name: "true",
+                description: "Make the repository group-writable",
+              },
+              {
+                name: "umask",
+                description: "Use permissions reported by umask(2)",
+              },
+              {
+                name: "group",
+                description: "Make the repository group-writable",
+              },
+              {
+                name: "all",
+                description:
+                  "Same as group, but make the repository readable by all users",
+              },
+              {
+                name: "world",
+                description:
+                  "Same as group, but make the repository readable by all users",
+              },
+              {
+                name: "everybody",
+                description:
+                  "Same as group, but make the repository readable by all users",
+              },
+              {
+                name: "0xxx",
+                description:
+                  "0xxx is an octal number and each file will have mode 0xxx. 0xxx will override users' umask(2) value (and not only loosen permissions as group and all does)",
+              },
+            ],
+          },
+        },
+      ],
+    },
+    {
+      name: "mv",
+      description: "Move or rename a file, a directory, or a symlink",
+      args: [
+        {
+          name: "source",
+          description: "File to move",
+          template: "filepaths",
+        },
+        {
+          name: "destination",
+          description: "Location to move to",
+          template: "folders",
+        },
+      ],
+      options: [
+        {
+          name: ["-f", "--force"],
+          description:
+            "Force renaming or moving of a file even if the target exists",
+        },
+        {
+          name: "-k",
+          description:
+            "Skip move or rename actions which would lead to an error condition",
+        },
+        {
+          name: ["-n", "--dry-run"],
+          description: "Do nothing; only show what would happen",
+        },
+        {
+          name: ["-v", "--verbose"],
+          description: "Report the names of files as they are moved",
+        },
+      ],
+    },
+    {
+      name: "rm",
+      description: "Remove files from the working tree and from the index",
+      args: {
+        isVariadic: true,
+        suggestions: [
+          {
+            name: ".",
+            description: "Current directory",
+            icon: "fig://icon?type=folder",
+          },
+        ],
+        generators: gitGenerators.files_for_staging,
+      },
+      options: [
+        {
+          name: "--",
+          description:
+            "Used to separate command-line options from the list of files",
+        },
+        { name: "--cached", description: "Only remove from the index" },
+        {
+          name: ["-f", "--force"],
+          description: "Override the up-to-date check",
+        },
+        {
+          name: ["-n", "--dry-run"],
+          description:
+            "Don’t actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command",
+        },
+        { name: "-r", description: "Allow recursive removal" },
+      ],
+    },
+    {
+      name: "bisect",
+      description: "Use binary search to find the commit that introduced a bug",
+      subcommands: [
+        {
+          name: "start",
+          description: "Reset bisect state and start bisection",
+          args: [
+            {
+              name: "bad",
+              isOptional: true,
+              generators: gitGenerators.revs,
+              suggestions: headSuggestions,
+            },
+            {
+              name: "good",
+              isOptional: true,
+              generators: [gitGenerators.revs, gitGenerators.revs],
+              suggestions: headSuggestions,
+              isVariadic: true,
+            },
+          ],
+          options: [
+            {
+              name: "--term-new",
+              description:
+                "Specify the alias to mark commits as new during the bisect process",
+              args: {
+                name: "term",
+                description:
+                  "Specifying: fixed, would require using git bisect fixed instead of git bisect new",
+              },
+            },
+            {
+              name: "--term-bad",
+              description:
+                "Specify the alias to mark commits as bad during the bisect process",
+              args: {
+                name: "term",
+                description:
+                  "Specifying: broken, would require using git bisect broken instead of git bisect bad",
+              },
+            },
+            {
+              name: "--term-good",
+              description:
+                "Specify the alias to mark commits as good during the bisect process",
+              args: {
+                name: "term",
+                description:
+                  "Specifying: fixed, would require using git bisect fixed instead of git bisect good",
+              },
+            },
+            {
+              name: "--term-old",
+              description:
+                "Specify the alias to mark commits as old during the bisect process",
+              args: {
+                name: "term",
+                description:
+                  "Specifying: broken, would require using git bisect broken instead of git bisect old",
+              },
+            },
+            {
+              name: "--no-checkout",
+              description:
+                "Do not checkout the new working tree at each iteration of the bisection process. Instead just update a special reference named BISECT_HEAD to make it point to the commit that should be tested",
+            },
+            {
+              name: "--first-parent",
+              description:
+                "Follow only the first parent commit upon seeing a merge commit. In detecting regressions introduced through the merging of a branch, the merge commit will be identified as introduction of the bug and its ancestors will be ignored",
+            },
+            {
+              name: "--",
+              description:
+                "Stop taking subcommand arguments and options. Starts taking paths to bisect",
+            },
+          ],
+        },
+        {
+          name: "bad",
+          description: "Mark commits as bad",
+          args: {
+            name: "rev",
+            isOptional: true,
+            generators: gitGenerators.revs,
+            suggestions: headSuggestions,
+          },
+        },
+        {
+          name: "new",
+          description: "Mark commits as new",
+          args: {
+            name: "rev",
+            isOptional: true,
+            generators: gitGenerators.revs,
+            suggestions: headSuggestions,
+          },
+        },
+        {
+          name: "old",
+          description: "Mark commits as old",
+          args: {
+            name: "rev",
+            isOptional: true,
+            generators: gitGenerators.revs,
+            suggestions: headSuggestions,
+            isVariadic: true,
+          },
+        },
+        {
+          name: "good",
+          description: "Mark commits as good",
+          args: {
+            name: "rev",
+            isOptional: true,
+            generators: gitGenerators.revs,
+            suggestions: headSuggestions,
+            isVariadic: true,
+          },
+        },
+        {
+          name: "next",
+          description: "Find next bisection to test and check it out",
+        },
+        {
+          name: "terms",
+          description:
+            "Show the terms used for old and new commits (default: bad, good)",
+          options: [
+            {
+              name: "--term-old",
+              description: "You can get just the old (respectively new) term",
+            },
+            {
+              name: "--term-good",
+              description: "You can get just the old (respectively new) term",
+            },
+          ],
+        },
+        {
+          name: "skip",
+          description: "Mark <rev>... untestable revisions",
+          args: {
+            name: "rev | range",
+            isVariadic: true,
+            isOptional: true,
+            generators: gitGenerators.revs,
+            suggestions: headSuggestions,
+          },
+        },
+        {
+          name: "reset",
+          description: "Finish bisection search and go back to commit",
+          args: {
+            name: "commit",
+            isOptional: true,
+            generators: gitGenerators.commits,
+            suggestions: headSuggestions,
+          },
+        },
+        {
+          name: ["visualize", "view"],
+          description: "See the currently remaining suspects in gitk",
+        },
+        {
+          name: "replay",
+          description: "Replay bisection log",
+          args: {
+            name: "logfile",
+            template: "filepaths",
+          },
+        },
+        {
+          name: "log",
+          description: "Show bisect log",
+        },
+        {
+          name: "run",
+          description: "Use <cmd>... to automatically bisect",
+          args: {
+            name: "cmd",
+            isVariadic: true,
+            isCommand: true,
+          },
+        },
+        {
+          name: "help",
+          args: {
+            name: "Get help text",
+          },
+        },
+      ],
+      args: {
+        name: "paths",
+        template: ["filepaths", "folders"],
+      },
+    },
+    { name: "grep", description: "Print lines matching a pattern" },
+    { name: "show", description: "Show various types of objects" },
+    {
+      name: "branch",
+      description: "List, create, or delete branches",
+      options: [
+        {
+          name: ["-a", "--all"],
+          exclusiveOn: ["-r", "--remotes"],
+          description: "List both remote-tracking and local branches",
+        },
+        {
+          name: ["-d", "--delete"],
+          description: "Delete fully merged branch",
+          args: {
+            generators: gitGenerators.localOrRemoteBranches,
+            isVariadic: true,
+            suggestions: [
+              {
+                name: ["-r", "--remotes"],
+                description: "Deletes the remote-tracking branches",
+              },
+            ],
+          },
+        },
+        {
+          name: "-D",
+          description: "Delete branch (even if not merged)",
+          args: {
+            generators: gitGenerators.localOrRemoteBranches,
+            isVariadic: true,
+            suggestions: [
+              {
+                name: ["-r", "--remotes"],
+                description: "Deletes the remote-tracking branches",
+              },
+            ],
+          },
+        },
+        {
+          name: ["-m", "--move"],
+          description: "Move/rename a branch and its reflog",
+          args: [
+            {
+              generators: gitGenerators.localBranches,
+              filterStrategy: "fuzzy",
+            },
+            {
+              generators: gitGenerators.localBranches,
+              filterStrategy: "fuzzy",
+            },
+          ],
+        },
+        {
+          name: "-M",
+          description: "Move/rename a branch, even if target exists",
+          args: [
+            {
+              generators: gitGenerators.localBranches,
+              filterStrategy: "fuzzy",
+            },
+            {
+              generators: gitGenerators.localBranches,
+              filterStrategy: "fuzzy",
+            },
+          ],
+        },
+        { name: ["-c", "--copy"], description: "Copy a branch and its reflog" },
+        { name: "-C", description: "Copy a branch, even if target exists" },
+        { name: ["-l", "--list"], description: "List branch names" },
+        {
+          name: "--create-reflog",
+          description: "Create the branch's reflog",
+        },
+        {
+          name: "--edit-description",
+          description: "Edit the description for the branch",
+          args: {
+            generators: gitGenerators.localBranches,
+            filterStrategy: "fuzzy",
+          },
+        },
+        {
+          name: ["-f", "--force"],
+          description: "Force creation, move/rename, deletion",
+        },
+        {
+          name: "--merged",
+          description: "Print only branches that are merged",
+          args: { name: "commit" },
+        },
+        {
+          name: "--no-merged",
+          description: "Print only branches that are not merged",
+          args: { name: "commit" },
+        },
+        {
+          name: "--column",
+          exclusiveOn: ["--no-column"],
+          description: "List branches in columns [=<style>]",
+        },
+        {
+          name: "--no-column",
+          exclusiveOn: ["--column"],
+          description: "Doesn't display branch listing in columns",
+        },
+        {
+          name: "--sort",
+          description: "Field name to sort on",
+          args: { name: "key" },
+        },
+        {
+          name: "--points-at",
+          description: "Print only branches of the object",
+          args: { name: "object" },
+        },
+        {
+          name: ["-i", "--ignore-case"],
+          description: "Sorting and filtering are case insensitive",
+        },
+        {
+          name: "--format",
+          description: "Format to use for the output",
+          args: { name: "format" },
+        },
+        {
+          name: ["-r", "--remotes"],
+          exclusiveOn: ["-a", "--all"],
+          description:
+            "Lists or deletes (if used with -d) the remote-tracking branches",
+        },
+        {
+          name: "--show-current",
+          description: "Prints the name of the current branch",
+        },
+        {
+          name: ["-v", "--verbose"],
+          isRepeatable: 2,
+          description:
+            "Shows sha1 and commit subject line for each head, along with relationship to upstream branch when in list mode. If given twice, prints the path of the linked worktree and the name of the upstream branch",
+        },
+        {
+          name: ["-q", "--quiet"],
+          description: "Suppress non-error messages",
+        },
+        {
+          name: "--abbrev",
+          description:
+            "Shows the shortest prefix that is at least <n> hexdigits long that uniquely refers the object",
+          exclusiveOn: ["--no-abbrev"],
+          args: {
+            name: "Number",
+          },
+        },
+        {
+          name: "--no-abbrev",
+          exclusiveOn: ["--abbrev"],
+          description: "Displays the full sha1s in the output listing",
+        },
+        {
+          name: ["-t", "--track"],
+          exclusiveOn: ["--no-track"],
+          description:
+            "When creating a new branch, set up 'upstream' configuration",
+          args: [
+            {
+              name: "branch",
+              generators: gitGenerators.localBranches,
+              filterStrategy: "fuzzy",
+            },
+            {
+              name: "start point",
+              isOptional: true,
+              generators: gitGenerators.commits,
+            },
+          ],
+        },
+        {
+          name: "--no-track",
+          exclusiveOn: ["--track", "-t"],
+          description:
+            "Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true",
+          args: [
+            {
+              generators: gitGenerators.localBranches,
+              filterStrategy: "fuzzy",
+            },
+            {
+              isOptional: true,
+              generators: gitGenerators.localBranches,
+              filterStrategy: "fuzzy",
+            },
+          ],
+        },
+        {
+          name: ["-u", "--set-upstream-to"],
+          description: "Sets branch to upstream provided",
+          args: {
+            name: "upstream",
+            isOptional: true,
+            generators: gitGenerators.localBranches,
+            filterStrategy: "fuzzy",
+          },
+        },
+        {
+          name: "--unset-upstream",
+          description: "Removes the upstream information",
+          args: {
+            name: "upstream",
+            isOptional: true,
+            generators: gitGenerators.localBranches,
+            filterStrategy: "fuzzy",
+          },
+        },
+        {
+          name: "--contains",
+          description: "Only lists branches which contain the specified commit",
+          args: {
+            name: "commit",
+            isOptional: true,
+            generators: gitGenerators.commits,
+          },
+        },
+        {
+          name: "--no-contains",
+          description:
+            "Only lists branches which don't contain the specified commit",
+          args: {
+            name: "commit",
+            isOptional: true,
+            generators: gitGenerators.commits,
+          },
+        },
+        {
+          name: "--color",
+          description:
+            "Color branches to highlight current, local, and remote-tracking branches",
+          exclusiveOn: ["--no-color"],
+          args: {
+            name: "when",
+            isOptional: true,
+            suggestions: ["always", "never", "auto"],
+          },
+        },
+        {
+          name: "--no-color",
+          description: "Turns off branch colors",
+          exclusiveOn: ["--color"],
+        },
+      ],
+    },
+    {
+      name: "checkout",
+      description: "Switch branches or restore working tree files",
+      options: [
+        {
+          name: ["-q", "--quiet"],
+          description: "Quiet, suppress feedback messages",
+        },
+        {
+          name: "--progress",
+          description:
+            "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless --quiet is specified. This flag enables progress reporting even if not attached to a terminal, regardless of --quiet",
+        },
+        {
+          name: "--no-progress",
+          description: "Disable progress status reporting",
+        },
+        {
+          name: ["-f", "--force"],
+          description:
+            "When switching branches, proceed even if the index or the working tree differs from HEAD. This is used to throw away local changes",
+        },
+        {
+          name: ["-2", "--ours"],
+          description:
+            "When checking out paths from the index, check out stage #2 (ours) for unmerged paths",
+        },
+        {
+          name: ["-3", "--theirs"],
+          description:
+            "When checking out paths from the index, check out stage #3 (theirs) for unmerged paths",
+        },
+        {
+          name: "-b",
+          description:
+            "Create a new branch named <new_branch> and start it at <start_point>; see git-branch[1] for details",
+          args: {
+            name: "New Branch",
+          },
+        },
+        {
+          name: "-B",
+          description:
+            "Creates the branch <new_branch> and start it at <start_point>; if it already exists, then reset it to <start_point>. This is equivalent to running 'git branch' with '-f'; see git-branch[1] for details",
+          args: {
+            name: "New Branch",
+          },
+        },
+        {
+          name: ["-t", "--track"],
+          description:
+            "When creating a new branch, set up 'upstream' configuration",
+        },
+        {
+          name: "--no-track",
+          description:
+            "Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true",
+        },
+        {
+          name: "--guess",
+          description:
+            "If <branch> is not found but there does exist a tracking branch in exactly one remote (call it <remote>) with a matching name, treat as equivalent to $ git checkout -b <branch> --track <remote>/<branch>",
+        },
+        { name: "--no-guess", description: "Disable --guess" },
+        {
+          name: "-l",
+          description:
+            "Create the new branch’s reflog; see git-branch[1] for details",
+        },
+        {
+          name: ["-d", "--detach"],
+          description:
+            "Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments. This is the default behavior of git checkout <commit> when <commit> is not a branch name",
+        },
+        {
+          name: "--orphan",
+          description:
+            "Create a new orphan branch, named <new_branch>, started from <start_point> and switch to it",
+          args: {
+            name: "New Branch",
+          },
+        },
+        {
+          name: "--ignore-skip-worktree-bits",
+          description:
+            "In sparse checkout mode, git checkout -- <paths> would update only entries matched by <paths> and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and adds back any files in <paths>",
+        },
+        {
+          name: ["-m", "--merge"],
+          description:
+            "When switching branches, if you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context",
+        },
+        {
+          name: "--conflict",
+          description:
+            "The same as --merge option above, but changes the way the conflicting hunks are presented, overriding the merge.conflictStyle configuration variable. Possible values are 'merge' (default) and 'diff3' (in addition to what is shown by 'merge' style, shows the original contents)",
+          requiresSeparator: true,
+          args: {
+            isOptional: true,
+            suggestions: ["merge", "diff3"],
+          },
+        },
+        {
+          name: ["-p", "--patch"],
+          description:
+            "Interactively select hunks in the difference between the <tree-ish> (or the index, if unspecified) and the working tree",
+        },
+        {
+          name: "--ignore-other-worktrees",
+          description:
+            "Git checkout refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree",
+        },
+        {
+          name: "--overwrite-ignore",
+          description:
+            "Silently overwrite ignored files when switching branches. This is the default behavior",
+        },
+        {
+          name: "--no-overwrite-ignore",
+          description:
+            "Use --no-overwrite-ignore to abort the operation when the new branch contains ignored files",
+        },
+        {
+          name: "--recurse-submodules",
+          description:
+            "Using --recurse-submodules will update the content of all active submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless -f is used. If nothing (or --no-recurse-submodules) is used, submodules working trees will not be updated. Just like git-submodule[1], this will detach HEAD of the submodule",
+        },
+        {
+          name: "--no-recurse-submodules",
+          description: "Submodules working trees will not be updated",
+        },
+        {
+          name: "--overlay",
+          description:
+            "In the default overlay mode, git checkout never removes files from the index or the working tree",
+        },
+        {
+          name: "--no-overlay",
+          description:
+            "When specifying --no-overlay, files that appear in the index and working tree, but not in <tree-ish> are removed, to make them match <tree-ish> exactly",
+        },
+        {
+          name: "--pathspec-from-file",
+          description:
+            "Pathspec is passed in <file> instead of commandline args",
+          args: {
+            name: "file",
+            template: "filepaths",
+          },
+        },
+        {
+          name: "--pathspec-file-nul",
+          description: "Only meaningful with --pathspec-from-file",
+        },
+      ],
+      args: [
+        {
+          name: "branch, file, tag or commit",
+          description: "Branch, file, tag or commit to switch to",
+          isOptional: true,
+          filterStrategy: "fuzzy",
+          generators: [
+            gitGenerators.remoteLocalBranches,
+            gitGenerators.tags,
+            { template: ["filepaths", "folders"] },
+          ],
+          suggestions: [
+            {
+              name: "-",
+              description: "Switch to the last used branch",
+              icon: "fig://icon?type=git",
+            },
+            {
+              name: "--",
+              description: "Do not interpret more arguments as options",
+              hidden: true,
+            },
+          ],
+        },
+        {
+          name: "pathspec",
+          description: "Limits the paths affected by the operation",
+          isOptional: true,
+          isVariadic: true,
+          template: "filepaths",
+        },
+      ],
+    },
+    {
+      name: "cherry-pick",
+      description: "Apply the changes introduced by some existing commits",
+      args: {
+        name: "commit",
+        description: "Commits to cherry-pick",
+        isVariadic: true,
+        generators: gitGenerators.commits,
+      },
+      options: [
+        {
+          name: "--continue",
+          description:
+            "Continue the operation in progress using the information in .git/sequencer",
+        },
+        {
+          name: "--skip",
+          description:
+            "Skip the current commit and continue with the rest of the sequence",
+        },
+        {
+          name: "--quit",
+          description: "Forget about the current operation in progress",
+        },
+        {
+          name: "--abort",
+          description:
+            "Cancel the operation and return to the pre-sequence state",
+        },
+        {
+          name: ["-e", "--edit"],
+          description:
+            "With this option, git cherry-pick will let you edit the commit message prior to committing",
+        },
+        {
+          name: "--cleanup",
+          description:
+            "This option determines how the commit message will be cleaned up before being passed on to the commit machinery",
+          args: {
+            name: "mode",
+            description:
+              "Determines how the supplied commit messaged should be cleaned up before committing",
+            suggestions: [
+              {
+                name: "strip",
+                description:
+                  "Strip leading and trailing empty lines, trailing whitepace, commentary and collapse consecutive empty lines",
+              },
+              {
+                name: "whitespace",
+                description: "Same as strip except #commentary is not removed",
+              },
+              {
+                name: "verbatim",
+                description: "Do not change the message at all",
+              },
+              {
+                name: "scissors",
+                description:
+                  "Same as whitespace except that everything from (and including) the line found below is truncated",
+              },
+              {
+                name: "default",
+                description:
+                  "Same as strip if the message is to be edited. Otherwise whitespace",
+              },
+            ],
+          },
+        },
+        {
+          name: "-x",
+          description:
+            'When recording the commit, append a line that says "(cherry picked from commit ...)" to the original commit message in order to indicate which commit this change was cherry-picked from',
+        },
+        {
+          name: ["-m", "--mainline"],
+          description:
+            "Specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent",
+          args: {
+            name: "parent-number",
+          },
+        },
+        {
+          name: ["-n", "--no-commit"],
+          description:
+            "Applies changes necessary to cherry-pick each named commit to your working tree and the index without making any commit",
+        },
+        {
+          name: ["-s", "--signoff"],
+          description:
+            "Add a Signed-off-by trailer at the end of the commit message",
+        },
+        {
+          name: ["-S", "--gpg-sign"],
+          exclusiveOn: ["--no-gpg-sign"],
+          description: "GPG-sign commits",
+          args: {
+            name: "keyid",
+            description: "Must be stuck to the option without a space",
+            isOptional: true,
+          },
+        },
+        {
+          name: "--no-gpg-sign",
+          exclusiveOn: ["-S", "--gpg-sign"],
+          description:
+            "Useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
+        },
+        {
+          name: "--ff",
+          description:
+            "If the current HEAD is the same as the parent of the cherry-pick'ed commit, the a fast forward to this commit will be performed",
+        },
+        {
+          name: "--allow-empty",
+          description:
+            "Allow empty commits to be preserved automatically in a cherry-pick",
+        },
+        {
+          name: "--allow-empty-message",
+          description: "Allow commits with empty messages to be cherry picked",
+        },
+        {
+          name: "--keep-redundant-commits",
+          description: "Creates an empty commit object. Implies --allow-empty",
+        },
+        {
+          name: "--strategy",
+          description: "Use the given merge strategy. Should only be used once",
+          args: {
+            name: "strategy",
+            suggestions: ["resolve", "recursive", "octopus", "ours", "subtree"],
+          },
+        },
+        {
+          name: ["-X", "--strategy-option"],
+          description:
+            "Pass the merge strategy-specific option through to the merge strategy",
+          args: {
+            name: "option",
+            suggestions: [
+              "ours",
+              "theirs",
+              "patience",
+              "diff-algorithm",
+              "diff-algorithm=patience",
+              "diff-algorithm=minimal",
+              "diff-algorithm=histogram",
+              "diff-algorithm=myers",
+              "ignore-space-change",
+              "ignore-all-space",
+              "ignore-space-at-eol",
+              "ignore-cr-at-eol",
+              "renormalize",
+              "no-renormalize",
+              "no-renames",
+              "find-renames",
+              "subtree",
+            ],
+          },
+        },
+        {
+          name: "--rerere-autoupdate",
+          exclusiveOn: ["--no-rerere-autoupdate"],
+          description:
+            "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
+        },
+        {
+          name: "--no-rerere-autoupdate",
+          exclusiveOn: ["--rerere-autoupdate"],
+          description:
+            "Do not allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
+        },
+      ],
+    },
+    {
+      name: "submodule",
+      description: "Initialize, update or inspect submodules",
+      subcommands: [
+        {
+          name: "add",
+          description:
+            "Add the given repository as a submodule at the given path to the changeset to be committed next to the current project",
+          options: [
+            {
+              name: "-b",
+              description: "Branch of repository to add as submodule",
+              args: {
+                name: "branch",
+              },
+            },
+            {
+              name: ["-f", "--force"],
+              description: "Allow adding an otherwise ignored submodule path",
+            },
+            {
+              name: "--name",
+              description:
+                "It sets the submodule’s name to the given string instead of defaulting to its path",
+              insertValue: "--name '{cursor}'",
+              args: {
+                name: "name",
+                description: "Directory name",
+              },
+            },
+            {
+              name: "--reference",
+              description: "Remote repository to be cloned",
+              args: {
+                name: "repository",
+                description: "Remote repository to be cloned",
+              },
+            },
+            {
+              name: "--depth",
+              description:
+                "Create a shallow clone with a history truncated to the specified number of revisions",
+              args: {
+                name: "depth",
+                description: "Specified number of revisions",
+              },
+            },
+            {
+              name: "--",
+              description: "End of subcommand options",
+            },
+          ],
+          args: [
+            {
+              name: "repository",
+            },
+            {
+              name: "path",
+              isOptional: true,
+              template: "filepaths",
+            },
+          ],
+        },
+        {
+          name: "status",
+          description: "Show the status of the submodules",
+          options: [
+            {
+              name: "--cached",
+              description:
+                "Will instead print the SHA-1 recorded in the superproject for each submodule",
+            },
+            {
+              name: "--recursive",
+              description:
+                "Will recurse into nested submodules, and show their status as well",
+            },
+            {
+              name: "--",
+              description: "End of subcommand options",
+            },
+          ],
+          args: {
+            name: "path",
+            isOptional: true,
+            isVariadic: true,
+            template: "filepaths",
+          },
+        },
+        {
+          name: "init",
+          description: "Initialize the submodules recorded in the index",
+          options: [
+            {
+              name: "--",
+              description: "End of subcommand options",
+            },
+          ],
+          args: {
+            name: "path",
+            isOptional: true,
+            isVariadic: true,
+            template: "filepaths",
+          },
+        },
+        {
+          name: "deinit",
+          description: "Unregister the given submodules",
+          options: [
+            {
+              name: ["-f", "--force"],
+              description:
+                "The submodule’s working tree will be removed even if it contains local modifications",
+            },
+            {
+              name: "--all",
+              description: "Unregister all submodules in the working tree",
+            },
+            {
+              name: "--",
+              description: "End of subcommand options",
+            },
+          ],
+          args: {
+            name: "path",
+            isOptional: true,
+            isVariadic: true,
+            template: "filepaths",
+          },
+        },
+        {
+          name: "update",
+          description:
+            "Update the registered submodules to match what the superproject expects by cloning missing submodules, fetching missing commits in submodules and updating the working tree of the submodules",
+          options: [
+            {
+              name: "--init",
+              description:
+                "Initialize all submodules for which 'git submodule init' has not been called so far before updating",
+            },
+            {
+              name: "--remote",
+              description:
+                "Instead of using the superproject’s recorded SHA-1 to update the submodule, use the status of the submodule’s remote-tracking branch",
+            },
+            {
+              name: ["-N", "--no-fetch"],
+              description: "Don’t fetch new objects from the remote site",
+            },
+            {
+              name: "--no-recommend-shallow",
+              description: "Ignore the suggestions",
+            },
+            {
+              name: "--recommend-shallow",
+              description:
+                "The initial clone of a submodule will use the recommended submodule.<name>.shallow as provided by the .gitmodules file",
+            },
+            {
+              name: ["-f", "--force"],
+              description:
+                "Throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule",
+            },
+            {
+              name: "--checkout",
+              description:
+                "The commit recorded in the superproject will be checked out in the submodule on a detached HEAD",
+            },
+            {
+              name: "--rebase",
+              description:
+                "The current branch of the submodule will be rebased onto the commit recorded in the superproject",
+            },
+            {
+              name: "--merge",
+              description:
+                "The commit recorded in the superproject will be merged into the current branch in the submodule",
+            },
+            {
+              name: "--reference",
+              description: "Remote repository",
+              args: {
+                name: "repository",
+              },
+            },
+            {
+              name: "--depth",
+              description:
+                "Create a shallow clone with a history truncated to the specified number of revisions",
+              args: {
+                name: "depth",
+              },
+            },
+            {
+              name: "--recursive",
+              description: "Traverse submodules recursively",
+            },
+            {
+              name: "--jobs",
+              description: "Clone new submodules in parallel with as many jobs",
+              args: {
+                name: "n",
+              },
+            },
+            {
+              name: "--single-branch",
+              description:
+                "Clone only one branch during update: HEAD or one specified by --branch",
+            },
+            {
+              name: "--no-single-branch",
+              description:
+                "Don't clone only one branch during update: HEAD or one specified by --branch",
+            },
+            { name: "--", description: "End of subcommand options" },
+          ],
+          args: {
+            name: "path",
+            isOptional: true,
+            isVariadic: true,
+            template: "filepaths",
+          },
+        },
+        {
+          name: "set-branch",
+          description:
+            "Sets the default remote tracking branch for the submodule",
+          options: [
+            {
+              name: ["-b", "--branch"],
+              description: "Branch of repository to add as submodule",
+              args: {
+                name: "branch",
+                description: "Remote branch to be specified",
+              },
+            },
+            {
+              name: ["-d", "--default"],
+              description:
+                "Removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote HEAD",
+            },
+            {
+              name: "--",
+              description: "End of subcommand options",
+            },
+          ],
+          args: {
+            name: "path",
+            description: "Path to submodule",
+            template: "filepaths",
+          },
+        },
+        {
+          name: "set-url",
+          description: "Sets the URL of the specified submodule to <newurl>",
+          options: [
+            {
+              name: "--",
+              description: "End of command options",
+            },
+          ],
+          args: [
+            {
+              name: "path",
+              description: "Path to specified submodule",
+              template: "filepaths",
+            },
+            {
+              name: "newurl",
+              description: "New url of submodule",
+            },
+          ],
+        },
+        {
+          name: "summary",
+          description:
+            "Show commit summary between the given commit (defaults to HEAD) and working tree/index",
+          options: [
+            {
+              name: "--cached",
+              description:
+                "This command will recurse into the registered submodules, and sync any nested submodules within",
+            },
+            {
+              name: "--files",
+              description:
+                "Show the series of commits in the submodule between the index of the super project and the working tree of the submodule",
+            },
+            {
+              name: "-n",
+              description:
+                "Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules",
+              args: {
+                name: "n",
+              },
+            },
+            {
+              name: "--summary-limit",
+              description:
+                "Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules",
+              args: {
+                name: "n",
+              },
+            },
+            {
+              name: "--",
+              description: "Everything after this is an argument",
+            },
+          ],
+          args: [
+            {
+              name: "commit",
+              isOptional: true,
+            },
+            {
+              name: "path",
+              isOptional: true,
+              isVariadic: true,
+              template: "filepaths",
+            },
+          ],
+        },
+        {
+          name: "foreach",
+          description:
+            "Evaluates an arbitrary shell command in each checked out submodule",
+          options: [
+            {
+              name: "--recursive",
+              description:
+                "This command will recurse into the registered submodules, and sync any nested submodules within",
+            },
+          ],
+          args: {
+            name: "command",
+          },
+        },
+        {
+          name: "sync",
+          description:
+            "Synchronizes submodules' remote URL configuration setting to the value specified in .gitmodules",
+          options: [
+            {
+              name: "--recursive",
+              description:
+                "This command will recurse into the registered submodules, and sync any nested submodules within",
+            },
+            {
+              name: "--",
+              description: "Everything after this is an argument",
+            },
+          ],
+          args: {
+            name: "path",
+            isOptional: true,
+            isVariadic: true,
+            template: "filepaths",
+          },
+        },
+        {
+          name: "absorbgitdirs",
+          description:
+            "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superproject’s $GIT_DIR/modules path and then connect the git directory and its working directory by setting the core.worktree and adding a .git file pointing to the git directory embedded in the superprojects git directory",
+        },
+      ],
+      options: [
+        {
+          name: ["-q", "--quiet"],
+          description: "Only print error messages",
+        },
+        {
+          name: "--cached",
+          description: "The commit stored in the index is used instead",
+        },
+      ],
+    },
+    {
+      name: "merge",
+      description: "Join two or more development histories together",
+      args: {
+        name: "branch",
+        filterStrategy: "fuzzy",
+        generators: gitGenerators.remoteLocalBranches,
+        isVariadic: true,
+        isOptional: true,
+        // A single dash can be used as arg to merge as short hand for the previous branch
+        // https://github.com/git/git/blob/master/Documentation/RelNotes/1.7.6.txt#L84
+        suggestions: [
+          { name: "-", description: "Shorthand for the previous branch" },
+        ],
+      },
+      options: [
+        {
+          name: "--commit",
+          description:
+            "Perform the merge and commit the result. This option can be used to override --no-commit",
+        },
+        {
+          name: "--no-commit",
+          description:
+            "Perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing",
+        },
+        {
+          name: ["--edit", "-e"],
+          description:
+            "Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge",
+        },
+        {
+          name: "--no-edit",
+          description:
+            "The --no-edit option can be used to accept the auto-generated message (this is generally discouraged). The --edit (or -e) option is still useful if you are giving a draft message with the -m option from the command line and want to edit it in the editor",
+        },
+        {
+          name: "--cleanup",
+          description:
+            "This option determines how the merge message will be cleaned up before committing. See git-commit[1] for more details. In addition, if the <mode> is given a value of scissors, scissors will be appended to MERGE_MSG before being passed on to the commit machinery in the case of a merge conflict",
+          requiresSeparator: true,
+          args: {
+            name: "mode",
+            suggestions: [
+              "strip",
+              "whitespace",
+              "verbatim",
+              "scissors",
+              "default",
+            ],
+          },
+        },
+        {
+          name: "--ff",
+          description:
+            "When possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit",
+        },
+        {
+          name: "--no-ff",
+          description:
+            "Create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward",
+        },
+        {
+          name: "--ff-only",
+          description:
+            "Resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status",
+        },
+        {
+          name: ["-S", "--gpg-sign"],
+          description:
+            "GPG-sign the resulting merge commit. The keyid argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space",
+          args: {
+            name: "keyid",
+            isOptional: true,
+          },
+        },
+        {
+          name: "--no-gpg-sign",
+          description:
+            "Is useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
+        },
+        {
+          name: "--log",
+          description:
+            "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also git-fmt-merge-msg[1]",
+          args: {
+            name: "n",
+            isOptional: true,
+          },
+        },
+        {
+          name: "--no-log",
+          description:
+            "Do not list one-line descriptions from the actual commits being merged",
+        },
+        {
+          name: "--signoff",
+          description:
+            "Add a Signed-off-by trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you’re committing. For example, it may certify that the committer has the rights to submit the work under the project’s license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you’re contributing to understand how the signoffs are used in that project",
+        },
+        {
+          name: "--no-signoff",
+          description:
+            "Can be used to countermand an earlier --signoff option on the command line",
+        },
+        {
+          name: "--stat",
+          description:
+            "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat",
+        },
+        {
+          name: ["-n", "--no-stat"],
+          description: "Do not show a diffstat at the end of the merge",
+        },
+        {
+          name: "--squash",
+          description:
+            "With --squash, --commit is not allowed, and will fail. Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the HEAD, or record $GIT_DIR/MERGE_HEAD (to cause the next git commit command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)",
+        },
+        {
+          name: "--no-squash",
+          description:
+            "Perform the merge and commit the result. This option can be used to override --squash",
+        },
+        {
+          name: "--no-verify",
+          description:
+            "This option bypasses the pre-merge and commit-msg hooks. See also githooks[5]",
+        },
+        {
+          name: ["-s", "--strategy"],
+          description:
+            "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no -s option, a built-in list of strategies is used instead (git merge-recursive when merging a single head, git merge-octopus otherwise)",
+          args: {
+            name: "strategy",
+            isVariadic: true,
+            suggestions: ["resolve", "recursive", "octopus", "ours", "subtree"],
+          },
+        },
+        {
+          name: ["-X", "--strategy-option"],
+          description:
+            "Pass merge strategy specific option through to the merge strategy",
+          args: {
+            name: "option",
+            suggestions: [
+              "ours",
+              "theirs",
+              "patience",
+              "diff-algorithm",
+              "diff-algorithm=patience",
+              "diff-algorithm=minimal",
+              "diff-algorithm=histogram",
+              "diff-algorithm=myers",
+              "ignore-space-change",
+              "ignore-all-space",
+              "ignore-space-at-eol",
+              "ignore-cr-at-eol",
+              "renormalize",
+              "no-renormalize",
+              "no-renames",
+              "find-renames",
+              "subtree",
+            ],
+          },
+        },
+        {
+          name: "--verify-signatures",
+          description:
+            "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted",
+        },
+        {
+          name: "--no-verify-signatures",
+          description:
+            "Do not verify that the tip commit of the side branch being merged is signed with a valid key",
+        },
+        {
+          name: "--summary",
+          description:
+            "Synonym to --stat ; this is deprecated and will be removed in the future",
+        },
+        {
+          name: "--no-summary",
+          description:
+            "Synonym to --no-stat ; this is deprecated and will be removed in the future",
+        },
+        {
+          name: ["-q", "--quiet"],
+          description: "Operate quietly. Implies --no-progress",
+        },
+        { name: ["-v", "--verbose"], description: "Be verbose" },
+        {
+          name: "--progress",
+          description:
+            "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting",
+        },
+        {
+          name: "--no-progress",
+          description:
+            "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting",
+        },
+        {
+          name: "--autostash",
+          description:
+            "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run the operation on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts",
+        },
+        {
+          name: "--no-autostash",
+          description:
+            "Do not automatically create a temporary stash entry before the operation begins, and apply it after the operation ends",
+        },
+        {
+          name: "--allow-unrelated-histories",
+          description:
+            "By default, git merge command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added",
+        },
+        {
+          name: "-m",
+          description:
+            "Set the commit message to be used for the merge commit (in case one is created). If --log is specified, a shortlog of the commits being merged will be appended to the specified message. The git fmt-merge-msg command can be used to give a good default for automated git merge invocations. The automated message can include the branch description",
+          args: {
+            name: "message",
+          },
+        },
+        {
+          name: ["-F", "--file"],
+          description:
+            "Read the commit message to be used for the merge commit (in case one is created). If --log is specified, a shortlog of the commits being merged will be appended to the specified message",
+          args: {
+            name: "file",
+            template: "filepaths",
+          },
+        },
+        {
+          name: "--rerere-autoupdate",
+          description:
+            "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
+        },
+        {
+          name: "--no-rerere-autoupdate",
+          description:
+            "Do not allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
+        },
+        {
+          name: "--overwrite-ignore",
+          description:
+            "Silently overwrite ignored files from the merge result. This is the default behavior. Use --no-overwrite-ignore to abort",
+        },
+        {
+          name: "--no-overwrite-ignore",
+          description:
+            "Do not silently overwrite ignored files from the merge result",
+        },
+        {
+          name: "--abort",
+          description:
+            "Abort the current conflict resolution process, and try to reconstruct the pre-merge state. If an autostash entry is present, apply it to the worktree. If there were uncommitted worktree changes present when the merge started, git merge --abort will in some cases be unable to reconstruct these changes. It is therefore recommended to always commit or stash your changes before running git merge. git merge --abort is equivalent to git reset --merge when MERGE_HEAD is present unless MERGE_AUTOSTASH is also present in which case git merge --abort applies the stash entry to the worktree whereas git reset --merge will save the stashed changes in the stash list",
+        },
+        {
+          name: "--quit",
+          description:
+            "Forget about the current merge in progress. Leave the index and the working tree as-is. If MERGE_AUTOSTASH is present, the stash entry will be saved to the stash list",
+        },
+        {
+          name: "--continue",
+          description:
+            "After a git merge stops due to conflicts you can conclude the merge by running git merge --continue (see 'HOW TO RESOLVE CONFLICTS' section below)",
+        },
+      ],
+    },
+    {
+      name: "mergetool",
+      description: "Open the git tool to fix conflicts",
+    },
+    {
+      name: "tag",
+      description:
+        "Create, list, delete or verify a tag object signed with GPG",
+      options: [
+        { name: ["-l", "--list"], description: "List tag names" },
+        {
+          name: "-n",
+          description: "Print <n> lines of each tag message",
+          args: {
+            name: "n",
+            suggestions: [{ name: "1" }, { name: "2" }, { name: "3" }],
+          },
+        },
+        { name: ["-d", "--delete"], description: "Delete tags" },
+        { name: ["-v", "--verify"], description: "Verify tags" },
+        {
+          name: ["-a", "--annotate"],
+          description: "Annotated tag, needs a message",
+        },
+        {
+          name: ["-m", "--message"],
+          insertValue: "-m '{cursor}'",
+          description: "Tag message",
+          args: { name: "message" },
+        },
+        {
+          name: "--points-at",
+          description: "List tags of the given object",
+          args: {
+            name: "object",
+            generators: gitGenerators.commits,
+            suggestions: headSuggestions,
+          },
+        },
+      ],
+      args: {
+        name: "tagname",
+        description: "Select a tag",
+        generators: gitGenerators.tags,
+        isOptional: true,
+      },
+    },
+    {
+      name: "restore",
+      description: "Restore working tree files",
+      options: [
+        {
+          name: ["-s", "--source"],
+          description:
+            "Restore the working tree files with the content from the given tree",
+          args: {
+            name: "tree",
+          },
+        },
+        {
+          name: ["-p", "--patch"],
+          description:
+            "Interactively select hunks in the difference between the restore source and the restore location",
+        },
+        {
+          name: ["-W", "--worktree"],
+          description: "Use the worktree as the restore location",
+        },
+        {
+          name: ["-S", "--staged"],
+          description: "Use staging as the restore location",
+        },
+        {
+          name: ["-q", "--quiet"],
+          description: "Quiet, suppress feedback messages",
+        },
+        {
+          name: "--progress",
+          description:
+            "Progress status is reported on the standard error stream by default when it is attached to a terminal",
+        },
+        {
+          name: "--no-progress",
+          description: "Disable progress status reporting",
+        },
+        {
+          name: ["-2", "--ours"],
+          description:
+            "When restoring paths from the index, check out stage #2 (ours) for unmerged paths",
+          exclusiveOn: ["--theirs"],
+        },
+        {
+          name: ["-3", "--theirs"],
+          description:
+            "When re out paths from the index, check out stage #3 (theirs) for unmerged paths",
+          exclusiveOn: ["--ours"],
+        },
+        {
+          name: ["-m", "--merge"],
+          description:
+            "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths",
+        },
+        {
+          name: "--conflict",
+          description:
+            "The same as --merge option, but changes the way the conflicting hunks are presented",
+          args: {
+            name: "style",
+            suggestions: ["merge", "diff3"],
+          },
+        },
+        {
+          name: "--ignore-unmerged",
+          description:
+            "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries",
+          exclusiveOn: ["--ours", "--theirs", "--merge", "--conflict"],
+        },
+        {
+          name: "--ignore-skip-worktree-bits",
+          description:
+            "In sparse checkout mode, by default is to only update entries matched by <pathspec> and sparse patterns in $GIT_DIR/info/sparse-checkout",
+        },
+        {
+          name: "--recurse-submodules",
+          description:
+            "If <pathspec> names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten",
+          exclusiveOn: ["--no-recurse-submodules"],
+        },
+        {
+          name: "--no-recurse-submodules",
+          description: "Submodules working trees will not be updated",
+          exclusiveOn: ["--recurse-submodules"],
+        },
+        {
+          name: "--overlay",
+          description:
+            "In overlay mode, the command never removes files when restoring",
+          exclusiveOn: ["--no-overlay"],
+        },
+        {
+          name: "--no-overlay",
+          description:
+            "In no-overlay mode, tracked files that do not appear in the --source tree are removed, to make them match <tree> exactly",
+          exclusiveOn: ["--overlay"],
+        },
+        {
+          name: "--pathspec-from-file",
+          description:
+            "Pathspec is passed in <file> instead of commandline args. If <file> is exactly - then standard input is used",
+          args: {
+            name: "file",
+            template: "filepaths",
+          },
+        },
+        {
+          name: "--pathspec-file-nul",
+          description:
+            "Only meaningful with --pathspec-from-file. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)",
+        },
+        {
+          name: "--",
+          description: "Do not interpret any more arguments as options",
+        },
+      ],
+      args: {
+        name: "pathspec",
+        isOptional: true,
+        isVariadic: true,
+        generators: gitGenerators.files_for_staging,
+      },
+    },
+    {
+      name: "switch",
+      description: "Switch branches",
+      options: [
+        {
+          name: ["-c", "--create"],
+          description:
+            "Create a new branch named <new-branch> starting at <start-point> before switching to the branch",
+          args: [
+            {
+              name: "new branch",
+            },
+            {
+              name: "start point",
+              isOptional: true,
+              generators: gitGenerators.commits,
+            },
+          ],
+        },
+        {
+          name: ["-C", "--force-create"],
+          description:
+            "Similar to --create except that if <new-branch> already exists it will be reset to <start-point>",
+          args: [
+            {
+              name: "new branch",
+            },
+            {
+              name: "start point",
+              isOptional: true,
+              generators: gitGenerators.commits,
+            },
+          ],
+        },
+        {
+          name: ["-d", "--detach"],
+          description:
+            "Switch to a commit for inspection and discardable experiments",
+        },
+        {
+          name: "--guess",
+          description:
+            "If <branch> is not found but there does exist a tracking branch in exactly one remote (call it <remote>) with a matching name",
+        },
+        {
+          name: "--no-guess",
+          description: "Disable --guess",
+        },
+        {
+          name: ["-f", "--force"],
+          description: "An alias for --discard-changes",
+          isDangerous: true,
+        },
+        {
+          name: "--discard-changes",
+          description:
+            "Proceed even if the index or the working tree differs from HEAD. Both the index and working tree are restored to match the switching target",
+          isDangerous: true,
+        },
+        {
+          name: ["-m", "--merge"],
+          description:
+            "If you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context",
+        },
+        {
+          name: "--conflict",
+          description:
+            "The same as --merge option above, but changes the way the conflicting hunks are presented, overriding the merge.conflictStyle configuration variable",
+          args: {
+            name: "style",
+            suggestions: ["merge", "diff3"],
+            default: "merge",
+          },
+        },
+        {
+          name: ["-q", "--quiet"],
+          description: "Quiet, suppress feedback messages",
+        },
+        {
+          name: "--progress",
+          description:
+            "Progress status is reported on the standard error stream by default when it is attached to a terminal",
+        },
+        {
+          name: "--no-progress",
+          description: "Disable progress status reporting",
+        },
+        {
+          name: ["-t", "--track"],
+          exclusiveOn: ["--no-track"],
+          description:
+            "When creating a new branch, set up 'upstream' configuration",
+          args: [
+            {
+              name: "branch",
+              generators: gitGenerators.localBranches,
+              filterStrategy: "fuzzy",
+            },
+            {
+              name: "start point",
+              isOptional: true,
+              generators: gitGenerators.commits,
+            },
+          ],
+        },
+        {
+          name: "--no-track",
+          exclusiveOn: ["--track", "-t"],
+          description:
+            "Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true",
+          args: [
+            {
+              generators: gitGenerators.localBranches,
+              filterStrategy: "fuzzy",
+            },
+            {
+              isOptional: true,
+              generators: gitGenerators.localBranches,
+              filterStrategy: "fuzzy",
+            },
+          ],
+        },
+        {
+          name: "--orphan",
+          description: "Create a new orphan branch, named <new-branch>",
+          args: {
+            name: "new branch",
+          },
+        },
+        {
+          name: "--ignore-other-worktrees",
+          description:
+            "Git switch refuses when the wanted ref is already checked out by another worktree",
+        },
+        {
+          name: "--recurse-submodules",
+          exclusiveOn: ["--no-recurse-submodules"],
+          description:
+            "Updates the content of all active submodules according to the commit recorded in the superproject",
+        },
+        {
+          name: "--no-recurse-submodules",
+          exclusiveOn: ["--recurse-submodules"],
+          description: "Submodules working trees will not be updated",
+        },
+      ],
+      args: [
+        {
+          name: "branch name",
+          description: "Branch or commit to switch to",
+          generators: gitGenerators.localBranches,
+          filterStrategy: "fuzzy",
+          suggestions: [
+            {
+              name: "-",
+              description: "Switch to the last used branch",
+              icon: "fig://icon?type=git",
+            },
+          ],
+        },
+        {
+          name: "start point",
+          isOptional: true,
+          generators: gitGenerators.commits,
+        },
+      ],
+    },
+    {
+      name: "worktree",
+      description: "Manage multiple working trees",
+      subcommands: [
+        {
+          name: "add",
+          description: "Create <path> and checkout <commit-ish> into it",
+          options: [
+            {
+              name: ["-f", "--force"],
+              description:
+                "By default, add refuses to create a new working tree when <commit-ish> is a branch name and is already checked out by another working tree, or if <path> is already assigned to some working tree but is missing (for instance, if <path> was deleted manually). This option overrides these safeguards. To add a missing but locked working tree path, specify --force twice",
+            },
+            {
+              name: ["-d", "--detach"],
+              description:
+                'With add, detach HEAD in the new working tree. See "DETACHED HEAD" in git-checkout[1]',
+            },
+            {
+              name: "--checkout",
+              description:
+                'By default, add checks out <commit-ish>, however, --no-checkout can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See "Sparse checkout" in git-read-tree[1]',
+            },
+            {
+              name: "--lock",
+              description:
+                "Keep the working tree locked after creation. This is the equivalent of git worktree lock after git worktree add, but without a race condition",
+            },
+            {
+              name: ["-b", "-B"],
+              description:
+                "With add, create a new branch named <new-branch> starting at <commit-ish>, and check out <new-branch> into the new working tree. If <commit-ish> is omitted, it defaults to HEAD. By default, -b refuses to create a new branch if it already exists. -B overrides this safeguard, resetting <new-branch> to <commit-ish>",
+              args: {
+                name: "new-branch",
+              },
+            },
+          ],
+        },
+        {
+          name: "list",
+          description: "List details of each working tree",
+          options: [
+            {
+              name: "--porcelain",
+              description:
+                "With list, output in an easy-to-parse format for scripts. This format will remain stable across Git versions and regardless of user configuration. See below for details",
+            },
+            {
+              name: ["-v", "--verbose"],
+              description:
+                "With list, output additional information about worktrees (see below)",
+            },
+            {
+              name: "--expire",
+              description:
+                "With list, annotate missing working trees as prunable if they are older than <time>",
+              args: {
+                name: "time",
+              },
+            },
+          ],
+        },
+        {
+          name: "lock",
+          description:
+            "If a working tree is on a portable device or network share which is not always mounted, lock it to prevent its administrative files from being pruned automatically",
+          args: {
+            name: "worktree",
+            description:
+              "Working trees can be identified by path, either relative or absolute",
+          },
+          options: [
+            {
+              name: "--reason",
+              description:
+                "With lock or with add --lock, an explanation <reason> why the working tree is locked",
+              args: {
+                name: "reason",
+              },
+            },
+          ],
+        },
+        {
+          name: "move",
+          description: "Move a working tree to a new location",
+          args: [
+            {
+              name: "worktree",
+              description:
+                "Working trees can be identified by path, either relative or absolute",
+            },
+            {
+              name: "new-path",
+              template: "filepaths",
+            },
+          ],
+          options: [
+            {
+              name: ["-f", "--force"],
+              description:
+                "Move refuses to move a locked working tree unless --force is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if <new-path> was deleted manually), then --force allows the move to proceed; use --force twice if the destination is locked",
+            },
+          ],
+        },
+        {
+          name: "prune",
+          description: "Prune working tree information in $GIT_DIR/worktrees",
+          options: [
+            {
+              name: ["-n", "--dry-run"],
+              description:
+                "With prune, do not remove anything; just report what it would remove",
+            },
+            {
+              name: ["-v", "--verbose"],
+              description: "With prune, report all removals",
+            },
+            {
+              name: "--expire",
+              description:
+                "With prune, only expire unused working trees older than <time>",
+              args: {
+                name: "time",
+              },
+            },
+          ],
+        },
+        {
+          name: "remove",
+          description: "Remove a working tree",
+          args: {
+            name: "worktree",
+            description:
+              "Working trees can be identified by path, either relative or absolute",
+          },
+          options: [
+            {
+              name: ["-f", "--force"],
+              description:
+                "Remove refuses to remove an unclean working tree unless --force is used. To remove a locked working tree, specify --force twice",
+            },
+          ],
+        },
+        {
+          name: "repair",
+          description:
+            "Repair working tree administrative files, if possible, if they have become corrupted or outdated due to external factors",
+          args: {
+            name: "path",
+            template: "filepaths",
+          },
+        },
+        {
+          name: "unlock",
+          description:
+            "Unlock a working tree, allowing it to be pruned, moved or deleted",
+          args: {
+            name: "worktree",
+            description:
+              "Working trees can be identified by path, either relative or absolute",
+          },
+        },
+      ],
+    },
+    {
+      name: "apply",
+      description: "Apply a patch to files and/or to the index",
+      options: [
+        {
+          name: "--exclude",
+          description: "Don't apply changes matching the given path",
+          args: {
+            name: "path",
+          },
+        },
+        {
+          name: "--include",
+          description: "Apply changes matching the given path",
+          args: {
+            name: "path",
+          },
+        },
+        {
+          name: "-p",
+          description:
+            "Remove <num> leading slashes from traditional diff paths",
+          args: {
+            name: "num",
+          },
+        },
+        {
+          name: "--no-add",
+          description: "Ignore additions made by the patch",
+        },
+        {
+          name: "--stat",
+          description:
+            "Instead of applying the patch, output diffstat for the input",
+        },
+        {
+          name: "--numstat",
+          description:
+            "Show number of added and deleted lines in decimal notation",
+        },
+        {
+          name: "--summary",
+          description:
+            "Instead of applying the patch, output a summary for the input",
+        },
+        {
+          name: "--check",
+          description:
+            "Instead of applying the patch, see if the patch is applicable",
+        },
+        {
+          name: "--index",
+          description: "Make sure the patch is applicable to the current index",
+        },
+        {
+          name: ["-N", "--intent-to-add"],
+          description: "Mark new files with `git add --intent-to-add`",
+        },
+        {
+          name: "--cached",
+          description: "Apply a patch without touching the working tree",
+        },
+        {
+          name: "--unsafe-paths",
+          description: "Accept a patch that touches outside the working area",
+        },
+        {
+          name: "--apply",
+          description:
+            "Also apply the patch (use with --stat/--summary/--check)",
+        },
+        {
+          name: ["-3", "--3way"],
+          description: "Attempt three-way merge if a patch does not apply",
+        },
+        {
+          name: "--build-fake-ancestor",
+          description:
+            "Build a temporary index based on embedded index information",
+          args: {
+            name: "file",
+          },
+        },
+        {
+          name: "-z",
+          description: "Paths are separated with NUL character",
+        },
+        {
+          name: "-C",
+          description: "Ensure at least <n> lines of context match",
+          args: {
+            name: "n",
+          },
+        },
+        {
+          name: "--whitespace",
+          description:
+            "Detect new or modified lines that have whitespace errors",
+          args: {
+            name: "action",
+            suggestions: [
+              {
+                name: "nowarn",
+                description: "Turns off the trailing whitespace warning",
+              },
+              {
+                name: "warn",
+                description:
+                  "Outputs warnings for a few such errors, but applies the patch as-is (default)",
+              },
+              {
+                name: "fix",
+                description:
+                  "Outputs warnings for a few such errors, and applies the patch after fixing them",
+              },
+              {
+                name: "error",
+                description:
+                  "Outputs warnings for a few such errors, and refuses to apply the patch",
+              },
+              {
+                name: "error-all",
+                description: "Similar to `error` but shows all errors",
+              },
+            ],
+          },
+        },
+        {
+          name: ["--ignore-space-change", "--ignore-whitespace"],
+          description: "Ignore changes in whitespace when finding context",
+        },
+        {
+          name: ["-R", "--reverse"],
+          description: "Apply the patch in reverse",
+        },
+        {
+          name: "--unidiff-zero",
+          description: "Don't expect at least one line of context",
+        },
+        {
+          name: "--reject",
+          description: "Leave the rejected hunks in corresponding *.rej files",
+        },
+        {
+          name: "--allow-overlap",
+          description: "Allow overlapping hunks",
+        },
+        {
+          name: ["-v", "--verbose"],
+          description: "Be verbose",
+        },
+        {
+          name: "--inaccurate-eof",
+          description:
+            "Tolerate incorrectly detected missing new-line at the end of file",
+        },
+        {
+          name: "--recount",
+          description: "Do not trust the line counts in the hunk headers",
+        },
+        {
+          name: "--directory",
+          description: "Prepend <root> to all filenames",
+          args: {
+            name: "root",
+          },
+        },
+      ],
+      args: {
+        name: "patch",
+        isVariadic: true,
+      },
+    },
+    {
+      name: "daemon",
+      description: "A really simple server for Git repositories",
+      args: {
+        name: "directory",
+        description:
+          "A directory to add to the whitelist of allowed directories. Unless --strict-paths is specified this will also include subdirectories of each named directory",
+        isVariadic: true,
+      },
+      options: [
+        {
+          name: "--strict-paths",
+          description:
+            'Match paths exactly (i.e. don’t allow "/foo/repo" when the real path is "/foo/repo.git" or "/foo/repo/.git") and don’t do user-relative paths.  git daemon will refuse to start when this option is enabled and no whitelist is specified',
+        },
+        {
+          name: "--base-path",
+          description:
+            "Remap all the path requests as relative to the given path",
+          requiresSeparator: true,
+          args: { name: "path", template: "folders" },
+        },
+        {
+          name: "--base-path-relaxed",
+          description:
+            "If --base-path is enabled and repo lookup fails, with this option git daemon will attempt to lookup without prefixing the base path. This is useful for switching to --base-path usage, while still allowing the old paths",
+        },
+        {
+          name: "--interpolated-path",
+          requiresSeparator: true,
+          description:
+            "To support virtual hosting, an interpolated path template can be used to dynamically construct alternate paths. The template supports %H for the target hostname as supplied by the client but converted to all lowercase, %CH for the canonical hostname, %IP for the server’s IP address, %P for the port number, and %D for the absolute path of the named repository. After interpolation, the path is validated against the directory whitelist",
+          args: { name: "path-template" },
+        },
+        {
+          name: "--export-all",
+          description:
+            "Allow pulling from all directories that look like Git repositories (have the objects and refs subdirectories), even if they do not have the git-daemon-export-ok file",
+        },
+        {
+          name: "--inetd",
+          description: "Have the server run as an inetd service",
+          exclusiveOn: ["--pid-file", "--user", "--group"],
+        },
+        {
+          name: "--listen",
+          description:
+            "Listen on a specific IP address or hostname. IP addresses can be either an IPv4 address or an IPv6 address if supported. If IPv6 is not supported, then --listen=hostname is also not supported and --listen must be given an IPv4 address. Can be given more than once. Incompatible with --inetd option",
+          requiresSeparator: true,
+          args: { name: "host_or_ipaddr" },
+        },
+        {
+          name: "--port",
+          description:
+            "Listen on an alternative port. Incompatible with --inetd option",
+          requiresSeparator: true,
+          args: { name: "port" },
+        },
+        {
+          name: "--init-timeout",
+          description:
+            "Timeout (in seconds) between the moment the connection is established and the client request is received (typically a rather low value, since that should be basically immediate)",
+          requiresSeparator: true,
+          args: { name: "timeout" },
+        },
+        {
+          name: "--max-connections",
+          description:
+            "Maximum number of concurrent clients, defaults to 32. Set it to zero for no limit",
+          requiresSeparator: true,
+          args: { name: "maximum" },
+        },
+        {
+          name: "--syslog",
+          description: "Short for --log-destination=syslog",
+        },
+        {
+          name: "--log-destination",
+          description:
+            "Send log messages to the specified destination. Note that this option does not imply --verbose, thus by default only error conditions will be logged. The default destination is syslog if --inetd or --detach is specified, otherwise stderr",
+          requiresSeparator: true,
+          args: {
+            name: "destination",
+            suggestions: [
+              {
+                name: "stderr",
+                description:
+                  "Write to standard error. Note that if --detach is specified, the process disconnects from the real standard error, making this destination effectively equivalent to none",
+              },
+              {
+                name: "syslog",
+                description: "Write to syslog, using the git-daemon identifier",
+              },
+              { name: "none", description: "Disable all logging" },
+            ],
+          },
+        },
+        {
+          name: "--user-path",
+          description:
+            "Allow ~user notation to be used in requests. When specified with no parameter, requests to git://host/~alice/foo is taken as a request to access foo repository in the home directory of user alice. If --user-path=some-path is specified, the same request is taken as a request to access the some-path/foo repository in the home directory of user alice",
+          requiresSeparator: true,
+          args: {
+            name: "path",
+            template: "folders",
+          },
+        },
+        {
+          name: "--verbose",
+          description:
+            "Log details about the incoming connections and requested files",
+        },
+        {
+          name: "--detach",
+          description: "Detach from the shell. Implies --syslog",
+        },
+        {
+          name: "--pid-file",
+          description: "Save the process id in the provided file",
+          requiresSeparator: true,
+          args: { name: "file", template: "filepaths" },
+          exclusiveOn: ["--inetd"],
+        },
+        {
+          name: "--user",
+          description:
+            "Change daemon’s uid and gid before entering the service loop. When only --user is given without --group, the primary group ID for the user is used. The values of the option are given to getpwnam(3) and getgrnam(3) and numeric IDs are not supported",
+          requiresSeparator: true,
+          exclusiveOn: ["--inetd"],
+          args: { name: "user" },
+        },
+        {
+          name: "--group",
+          description:
+            "Change daemon’s gid before entering the service loop. The value of this option is given to getgrnam(3) and numeric IDs are not supported",
+          exclusiveOn: ["--inetd"],
+        },
+        {
+          name: "--enable",
+          description: "Enable the service site-wide per default",
+          requiresSeparator: true,
+          args: { name: "service", suggestions: daemonServices },
+        },
+        {
+          name: "--disable",
+          description:
+            "Disable the service site-wide per default. Note that a service disabled site-wide can still be enabled per repository if it is marked overridable and the repository enables the service with a configuration item",
+          requiresSeparator: true,
+          args: { name: "service", suggestions: daemonServices },
+        },
+        {
+          name: "--allow-override",
+          description:
+            "Allow overriding the site-wide default with per repository configuration. By default, all the services may be overridden",
+          requiresSeparator: true,
+          args: { name: "service", suggestions: daemonServices },
+        },
+        {
+          name: "--forbid-override",
+          description:
+            "Forbid overriding the site-wide default with per repository configuration. By default, all the services may be overridden",
+          requiresSeparator: true,
+          args: { name: "service", suggestions: daemonServices },
+        },
+        {
+          name: "--informative-errors",
+          description:
+            'When informative errors are turned on, git-daemon will report more verbose errors to the client, differentiating conditions like "no such repository" from "repository not exported". This is more convenient for clients, but may leak information about the existence of unexported repositories. When informative errors are not enabled, all errors report "access denied" to the client',
+          exclusiveOn: ["--no-informative-errors"],
+        },
+        {
+          name: "--no-informative-errors",
+          description:
+            "Turn off informative errors. This option is the default. See --informative-errors for more information",
+          exclusiveOn: ["--informative-errors"],
+        },
+        {
+          name: "--access-hook",
+          description:
+            'Every time a client connects, first run an external command specified by the <path> with service name (e.g. "upload-pack"), path to the repository, hostname (%H), canonical hostname (%CH), IP address (%IP), and TCP port (%P) as its command-line arguments. The external command can decide to decline the service by exiting with a non-zero status (or to allow it by exiting with a zero status). It can also look at the $REMOTE_ADDR and $REMOTE_PORT environment variables to learn about the requestor when making this decision.\n\nThe external command can optionally write a single line to its standard output to be sent to the requestor as an error message when it declines the service',
+          requiresSeparator: true,
+          args: { name: "path", template: "filepaths" },
+        },
+      ],
+    },
+  ],
+  additionalSuggestions: [
+    {
+      name: "commit -m 'msg'",
+      description: "Git commit shortcut",
+      insertValue: "commit -m '{cursor}'",
+      icon: "fig://template?color=2ecc71&badge=🔥",
+      // type: "shortcut",
+    },
+  ],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/kill.ts b/extensions/terminal-suggest/src/completions/upstream/kill.ts
index 5df83c453e19..abdb87ffdb6e 100644
--- a/extensions/terminal-suggest/src/completions/upstream/kill.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/kill.ts
@@ -1,63 +1,63 @@
 // Compatibility: macOS
 
 function processIcon(path: string): string {
-	const idx = path.indexOf(".app/");
-	if (idx === -1) {
-		return "fig://icon?type=gear";
-	}
-	return "fig://" + path.slice(0, idx + 4);
+  const idx = path.indexOf(".app/");
+  if (idx === -1) {
+    return "fig://icon?type=gear";
+  }
+  return "fig://" + path.slice(0, idx + 4);
 }
 
 const completionSpec: Fig.Spec = {
-	name: "kill",
-	description: "Terminate or signal a process",
-	args: {
-		name: "pid",
-		isVariadic: true,
-		generators: {
-			script: ["bash", "-c", "ps axo pid,comm | sed 1d"],
-			postProcess: (result: string) => {
-				return result.split("\n").map((line) => {
-					const [pid, path] = line.trim().split(/\s+/);
-					const name = path.slice(path.lastIndexOf("/") + 1);
-					return {
-						name: pid,
-						description: path,
-						displayName: `${pid} (${name})`,
-						icon: processIcon(path),
-					};
-				});
-			},
-		},
-	},
-	options: [
-		{
-			name: "-s",
-			description: "A symbolic signal name specifying the signal to be sent",
-			args: {
-				name: "signal_name",
-				generators: {
-					// Bash's `kill` builtin has different output to /bin/kill
-					script: ["env", "kill", "-l"],
-					postProcess: (out) =>
-						out.match(/\w+/g)?.map((name) => ({
-							name,
-							description: `Send ${name} instead of TERM`,
-							icon: "fig://icon?type=string",
-						})),
-				},
-			},
-		},
-		{
-			name: "-l",
-			description:
-				"If no operand is given, list the signal names; otherwise, write the signal name corresponding to exit_status",
-			args: {
-				name: "exit_status",
-				isOptional: true,
-			},
-		},
-	],
+  name: "kill",
+  description: "Terminate or signal a process",
+  args: {
+    name: "pid",
+    isVariadic: true,
+    generators: {
+      script: ["bash", "-c", "ps axo pid,comm | sed 1d"],
+      postProcess: (result: string) => {
+        return result.split("\n").map((line) => {
+          const [pid, path] = line.trim().split(/\s+/);
+          const name = path.slice(path.lastIndexOf("/") + 1);
+          return {
+            name: pid,
+            description: path,
+            displayName: `${pid} (${name})`,
+            icon: processIcon(path),
+          };
+        });
+      },
+    },
+  },
+  options: [
+    {
+      name: "-s",
+      description: "A symbolic signal name specifying the signal to be sent",
+      args: {
+        name: "signal_name",
+        generators: {
+          // Bash's `kill` builtin has different output to /bin/kill
+          script: ["env", "kill", "-l"],
+          postProcess: (out) =>
+            out.match(/\w+/g)?.map((name) => ({
+              name,
+              description: `Send ${name} instead of TERM`,
+              icon: "fig://icon?type=string",
+            })),
+        },
+      },
+    },
+    {
+      name: "-l",
+      description:
+        "If no operand is given, list the signal names; otherwise, write the signal name corresponding to exit_status",
+      args: {
+        name: "exit_status",
+        isOptional: true,
+      },
+    },
+  ],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/ls.ts b/extensions/terminal-suggest/src/completions/upstream/ls.ts
index 9e1471da3e9a..91afc0b75ed9 100644
--- a/extensions/terminal-suggest/src/completions/upstream/ls.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/ls.ts
@@ -1,227 +1,227 @@
 const completionSpec: Fig.Spec = {
-	name: "ls",
-	description: "List directory contents",
-	args: {
-		isVariadic: true,
-		template: ["filepaths", "folders"],
-		filterStrategy: "fuzzy",
-	},
-	options: [
-		{
-			name: "-@",
-			description:
-				"Display extended attribute keys and sizes in long (-l) output",
-		},
-		{
-			name: "-1",
-			description:
-				"(The numeric digit ``one''.)  Force output to be one entry per line.  This is the default when output is not to a terminal",
-		},
-		{
-			name: "-A",
-			description:
-				"List all entries except for . and ...  Always set for the super-user",
-		},
-		{
-			name: "-a",
-			description: "Include directory entries whose names begin with a dot (.)",
-		},
-		{
-			name: "-B",
-			description:
-				"Force printing of non-printable characters (as defined by ctype(3) and current locale settings) in file names as xxx, where xxx is the numeric value of the character in octal",
-		},
-		{
-			name: "-b",
-			description: "As -B, but use C escape codes whenever possible",
-		},
-		{
-			name: "-C",
-			description:
-				"Force multi-column output; this is the default when output is to a terminal",
-		},
-		{
-			name: "-c",
-			description:
-				"Use time when file status was last changed for sorting (-t) or long printing (-l)",
-		},
-		{
-			name: "-d",
-			description:
-				"Directories are listed as plain files (not searched recursively)",
-		},
-		{
-			name: "-e",
-			description:
-				"Print the Access Control List (ACL) associated with the file, if present, in long (-l) output",
-		},
-		{
-			name: "-F",
-			description:
-				"Display a slash (/) immediately after each pathname that is a directory, an asterisk (*) after each that is executable, an at sign (@) after each symbolic link, an equals sign (=) after each socket, a percent sign (%) after each whiteout, and a vertical bar (|) after each that is a FIFO",
-		},
-		{
-			name: "-f",
-			description: "Output is not sorted.  This option turns on the -a option",
-		},
-		{
-			name: "-G",
-			description:
-				"Enable colorized output.  This option is equivalent to defining CLICOLOR in the environment.  (See below.)",
-		},
-		{
-			name: "-g",
-			description:
-				"This option is only available for compatibility with POSIX; it is used to display the group name in the long (-l) format output (the owner name is suppressed)",
-		},
-		{
-			name: "-H",
-			description:
-				"Symbolic links on the command line are followed.  This option is assumed if none of the -F, -d, or -l options are specified",
-		},
-		{
-			name: "-h",
-			description:
-				"When used with the -l option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of digits to three or less using base 2 for sizes",
-		},
-		{
-			name: "-i",
-			description:
-				"For each file, print the file's file serial number (inode number)",
-		},
-		{
-			name: "-k",
-			description:
-				"If the -s option is specified, print the file size allocation in kilobytes, not blocks.  This option overrides the environment variable BLOCKSIZE",
-		},
-		{
-			name: "-L",
-			description:
-				"Follow all symbolic links to final target and list the file or directory the link references rather than the link itself.  This option cancels the -P option",
-		},
-		{
-			name: "-l",
-			description:
-				"(The lowercase letter ``ell''.)  List in long format.  (See below.)  A total sum for all the file sizes is output on a line before the long listing",
-		},
-		{
-			name: "-m",
-			description:
-				"Stream output format; list files across the page, separated by commas",
-		},
-		{
-			name: "-n",
-			description:
-				"Display user and group IDs numerically, rather than converting to a user or group name in a long (-l) output.  This option turns on the -l option",
-		},
-		{
-			name: "-O",
-			description: "Include the file flags in a long (-l) output",
-		},
-		{ name: "-o", description: "List in long format, but omit the group id" },
-		{
-			name: "-P",
-			description:
-				"If argument is a symbolic link, list the link itself rather than the object the link references.  This option cancels the -H and -L options",
-		},
-		{
-			name: "-p",
-			description:
-				"Write a slash (`/') after each filename if that file is a directory",
-		},
-		{
-			name: "-q",
-			description:
-				"Force printing of non-graphic characters in file names as the character `?'; this is the default when output is to a terminal",
-		},
-		{ name: "-R", description: "Recursively list subdirectories encountered" },
-		{
-			name: "-r",
-			description:
-				"Reverse the order of the sort to get reverse lexicographical order or the oldest entries first (or largest files last, if combined with sort by size",
-		},
-		{ name: "-S", description: "Sort files by size" },
-		{
-			name: "-s",
-			description:
-				"Display the number of file system blocks actually used by each file, in units of 512 bytes, where partial units are rounded up to the next integer value.  If the output is to a terminal, a total sum for all the file sizes is output on a line before the listing.  The environment variable BLOCKSIZE overrides the unit size of 512 bytes",
-		},
-		{
-			name: "-T",
-			description:
-				"When used with the -l (lowercase letter ``ell'') option, display complete time information for the file, including month, day, hour, minute, second, and year",
-		},
-		{
-			name: "-t",
-			description:
-				"Sort by time modified (most recently modified first) before sorting the operands by lexicographical order",
-		},
-		{
-			name: "-u",
-			description:
-				"Use time of last access, instead of last modification of the file for sorting (-t) or long printing (-l)",
-		},
-		{
-			name: "-U",
-			description:
-				"Use time of file creation, instead of last modification for sorting (-t) or long output (-l)",
-		},
-		{
-			name: "-v",
-			description:
-				"Force unedited printing of non-graphic characters; this is the default when output is not to a terminal",
-		},
-		{
-			name: "-W",
-			description: "Display whiteouts when scanning directories.  (-S) flag)",
-		},
-		{
-			name: "-w",
-			description:
-				"Force raw printing of non-printable characters.  This is the default when output is not to a terminal",
-		},
-		{
-			name: "-x",
-			description:
-				"The same as -C, except that the multi-column output is produced with entries sorted across, rather than down, the columns",
-		},
-		{
-			name: "-%",
-			description:
-				"Distinguish dataless files and directories with a '%' character in long (-l) output, and don't materialize dataless directories when listing them",
-		},
-		{
-			name: "-,",
-			description: `When the -l option is set, print file sizes grouped and separated by thousands using the non-monetary separator returned
+  name: "ls",
+  description: "List directory contents",
+  args: {
+    isVariadic: true,
+    template: ["filepaths", "folders"],
+    filterStrategy: "fuzzy",
+  },
+  options: [
+    {
+      name: "-@",
+      description:
+        "Display extended attribute keys and sizes in long (-l) output",
+    },
+    {
+      name: "-1",
+      description:
+        "(The numeric digit ``one''.)  Force output to be one entry per line.  This is the default when output is not to a terminal",
+    },
+    {
+      name: "-A",
+      description:
+        "List all entries except for . and ...  Always set for the super-user",
+    },
+    {
+      name: "-a",
+      description: "Include directory entries whose names begin with a dot (.)",
+    },
+    {
+      name: "-B",
+      description:
+        "Force printing of non-printable characters (as defined by ctype(3) and current locale settings) in file names as xxx, where xxx is the numeric value of the character in octal",
+    },
+    {
+      name: "-b",
+      description: "As -B, but use C escape codes whenever possible",
+    },
+    {
+      name: "-C",
+      description:
+        "Force multi-column output; this is the default when output is to a terminal",
+    },
+    {
+      name: "-c",
+      description:
+        "Use time when file status was last changed for sorting (-t) or long printing (-l)",
+    },
+    {
+      name: "-d",
+      description:
+        "Directories are listed as plain files (not searched recursively)",
+    },
+    {
+      name: "-e",
+      description:
+        "Print the Access Control List (ACL) associated with the file, if present, in long (-l) output",
+    },
+    {
+      name: "-F",
+      description:
+        "Display a slash (/) immediately after each pathname that is a directory, an asterisk (*) after each that is executable, an at sign (@) after each symbolic link, an equals sign (=) after each socket, a percent sign (%) after each whiteout, and a vertical bar (|) after each that is a FIFO",
+    },
+    {
+      name: "-f",
+      description: "Output is not sorted.  This option turns on the -a option",
+    },
+    {
+      name: "-G",
+      description:
+        "Enable colorized output.  This option is equivalent to defining CLICOLOR in the environment.  (See below.)",
+    },
+    {
+      name: "-g",
+      description:
+        "This option is only available for compatibility with POSIX; it is used to display the group name in the long (-l) format output (the owner name is suppressed)",
+    },
+    {
+      name: "-H",
+      description:
+        "Symbolic links on the command line are followed.  This option is assumed if none of the -F, -d, or -l options are specified",
+    },
+    {
+      name: "-h",
+      description:
+        "When used with the -l option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of digits to three or less using base 2 for sizes",
+    },
+    {
+      name: "-i",
+      description:
+        "For each file, print the file's file serial number (inode number)",
+    },
+    {
+      name: "-k",
+      description:
+        "If the -s option is specified, print the file size allocation in kilobytes, not blocks.  This option overrides the environment variable BLOCKSIZE",
+    },
+    {
+      name: "-L",
+      description:
+        "Follow all symbolic links to final target and list the file or directory the link references rather than the link itself.  This option cancels the -P option",
+    },
+    {
+      name: "-l",
+      description:
+        "(The lowercase letter ``ell''.)  List in long format.  (See below.)  A total sum for all the file sizes is output on a line before the long listing",
+    },
+    {
+      name: "-m",
+      description:
+        "Stream output format; list files across the page, separated by commas",
+    },
+    {
+      name: "-n",
+      description:
+        "Display user and group IDs numerically, rather than converting to a user or group name in a long (-l) output.  This option turns on the -l option",
+    },
+    {
+      name: "-O",
+      description: "Include the file flags in a long (-l) output",
+    },
+    { name: "-o", description: "List in long format, but omit the group id" },
+    {
+      name: "-P",
+      description:
+        "If argument is a symbolic link, list the link itself rather than the object the link references.  This option cancels the -H and -L options",
+    },
+    {
+      name: "-p",
+      description:
+        "Write a slash (`/') after each filename if that file is a directory",
+    },
+    {
+      name: "-q",
+      description:
+        "Force printing of non-graphic characters in file names as the character `?'; this is the default when output is to a terminal",
+    },
+    { name: "-R", description: "Recursively list subdirectories encountered" },
+    {
+      name: "-r",
+      description:
+        "Reverse the order of the sort to get reverse lexicographical order or the oldest entries first (or largest files last, if combined with sort by size",
+    },
+    { name: "-S", description: "Sort files by size" },
+    {
+      name: "-s",
+      description:
+        "Display the number of file system blocks actually used by each file, in units of 512 bytes, where partial units are rounded up to the next integer value.  If the output is to a terminal, a total sum for all the file sizes is output on a line before the listing.  The environment variable BLOCKSIZE overrides the unit size of 512 bytes",
+    },
+    {
+      name: "-T",
+      description:
+        "When used with the -l (lowercase letter ``ell'') option, display complete time information for the file, including month, day, hour, minute, second, and year",
+    },
+    {
+      name: "-t",
+      description:
+        "Sort by time modified (most recently modified first) before sorting the operands by lexicographical order",
+    },
+    {
+      name: "-u",
+      description:
+        "Use time of last access, instead of last modification of the file for sorting (-t) or long printing (-l)",
+    },
+    {
+      name: "-U",
+      description:
+        "Use time of file creation, instead of last modification for sorting (-t) or long output (-l)",
+    },
+    {
+      name: "-v",
+      description:
+        "Force unedited printing of non-graphic characters; this is the default when output is not to a terminal",
+    },
+    {
+      name: "-W",
+      description: "Display whiteouts when scanning directories.  (-S) flag)",
+    },
+    {
+      name: "-w",
+      description:
+        "Force raw printing of non-printable characters.  This is the default when output is not to a terminal",
+    },
+    {
+      name: "-x",
+      description:
+        "The same as -C, except that the multi-column output is produced with entries sorted across, rather than down, the columns",
+    },
+    {
+      name: "-%",
+      description:
+        "Distinguish dataless files and directories with a '%' character in long (-l) output, and don't materialize dataless directories when listing them",
+    },
+    {
+      name: "-,",
+      description: `When the -l option is set, print file sizes grouped and separated by thousands using the non-monetary separator returned
 by localeconv(3), typically a comma or period.  If no locale is set, or the locale does not have a non-monetary separator, this
 option has no effect.  This option is not defined in IEEE Std 1003.1-2001 (“POSIX.1”)`,
-			dependsOn: ["-l"],
-		},
-		{
-			name: "--color",
-			description: `Output colored escape sequences based on when, which may be set to either always, auto, or never`,
-			requiresSeparator: true,
-			args: {
-				name: "when",
-				suggestions: [
-					{
-						name: ["always", "yes", "force"],
-						description: "Will make ls always output color",
-					},
-					{
-						name: "auto",
-						description:
-							"Will make ls output escape sequences based on termcap(5), but only if stdout is a tty and either the -G flag is specified or the COLORTERM environment variable is set and not empty",
-					},
-					{
-						name: ["never", "no", "none"],
-						description:
-							"Will disable color regardless of environment variables",
-					},
-				],
-			},
-		},
-	],
+      dependsOn: ["-l"],
+    },
+    {
+      name: "--color",
+      description: `Output colored escape sequences based on when, which may be set to either always, auto, or never`,
+      requiresSeparator: true,
+      args: {
+        name: "when",
+        suggestions: [
+          {
+            name: ["always", "yes", "force"],
+            description: "Will make ls always output color",
+          },
+          {
+            name: "auto",
+            description:
+              "Will make ls output escape sequences based on termcap(5), but only if stdout is a tty and either the -G flag is specified or the COLORTERM environment variable is set and not empty",
+          },
+          {
+            name: ["never", "no", "none"],
+            description:
+              "Will disable color regardless of environment variables",
+          },
+        ],
+      },
+    },
+  ],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/node.ts b/extensions/terminal-suggest/src/completions/upstream/node.ts
index b967b8545732..97db1f76f22c 100644
--- a/extensions/terminal-suggest/src/completions/upstream/node.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/node.ts
@@ -1,504 +1,504 @@
 import { filepaths } from '../../helpers/filepaths';
 
 const completionSpec: Fig.Subcommand = {
-	name: "node",
-	description: "Run the node interpreter",
-	args: {
-		name: "node script",
-		isScript: true,
-		generators: filepaths({
-			extensions: ["mjs", "js", "cjs"],
-			editFileSuggestions: { priority: 76 },
-		}),
-	},
-	options: [
-		{
-			name: ["-e", "--eval=..."],
-			insertValue: "-e '{cursor}'",
-			description: "Evaluate script",
-			args: {},
-		},
-		{
-			name: "--watch",
-			description: "Watch input files",
-		},
-		{
-			name: "--watch-path",
-			description: "Specify a watch directory or file",
-			args: {
-				name: "path",
-				template: "filepaths",
-			},
-			isRepeatable: true,
-		},
-		{
-			name: "--watch-preserve-output",
-			description:
-				"Disable the clearing of the console when watch mode restarts the process",
-			dependsOn: ["--watch", "--watch-path"],
-		},
-		{
-			name: "--env-file",
-			description: "Specify a file containing environment variables",
-			args: {
-				name: "path",
-				template: "filepaths",
-			},
-			isRepeatable: true,
-		},
-		{
-			name: ["-p", "--print"],
-			description: "Evaluate script and print result",
-		},
-		{
-			name: ["-c", "--check"],
-			description: "Syntax check script without executing",
-		},
-		{
-			name: ["-v", "--version"],
-			description: "Print Node.js version",
-		},
-		{
-			name: ["-i", "--interactive"],
-			description:
-				"Always enter the REPL even if stdin does not appear to be a terminal",
-		},
-		{
-			name: ["-h", "--help"],
-			description: "Print node command line options (currently set)",
-		},
-		{
-			name: "--inspect",
-			requiresSeparator: true,
-			args: {
-				name: "[host:]port",
-				isOptional: true,
-			},
-			description: "Activate inspector on host:port (default: 127.0.0.1:9229)",
-		},
-		{
-			name: "--preserve-symlinks",
-			description:
-				"Follows symlinks to directories when examining source code and templates for translation strings",
-		},
-	],
-	// generateSpec: async (tokens, executeShellCommand) => {
-	//   const isAdonisJsonPresentCommand = "test -f .adonisrc.json";
-	//   if (
-	//     (
-	//       await executeShellCommand({
-	//         command: "bash",
-	//         args: ["-c", "isAdonisJsonPresentCommand"],
-	//       })
-	//     ).status === 0
-	//   ) {
-	//     return {
-	//       name: "node",
-	//       subcommands: [
-	//         {
-	//           name: "ace",
-	//           description: "Run AdonisJS command-line",
-	//           options: [
-	//             {
-	//               name: ["-h", "--help"],
-	//               description: "Display AdonisJS Ace help",
-	//             },
-	//             {
-	//               name: ["-v", "--version"],
-	//               description: "Display AdonisJS version",
-	//             },
-	//           ],
-	//           subcommands: [
-	//             {
-	//               name: "build",
-	//               description:
-	//                 "Compile project from Typescript to Javascript. Also compiles the frontend assets if using webpack encore",
-	//               options: [
-	//                 {
-	//                   name: ["-prod", "--production"],
-	//                   description: "Build for production",
-	//                 },
-	//                 {
-	//                   name: "--assets",
-	//                   description:
-	//                     "Build frontend assets when webpack encore is installed",
-	//                 },
-	//                 {
-	//                   name: "--no-assets",
-	//                   description: "Disable building assets",
-	//                 },
-	//                 {
-	//                   name: "--ignore-ts-errors",
-	//                   description:
-	//                     "Ignore typescript errors and complete the build process",
-	//                 },
-	//                 {
-	//                   name: "--tsconfig",
-	//                   description:
-	//                     "Path to the TypeScript project configuration file",
-	//                   args: {
-	//                     name: "path",
-	//                     description: "Path to tsconfig.json",
-	//                   },
-	//                 },
-	//                 {
-	//                   name: "--encore-args",
-	//                   requiresSeparator: true,
-	//                   insertValue: "--encore-args='{cursor}'",
-	//                   description:
-	//                     "CLI options to pass to the encore command line",
-	//                 },
-	//                 {
-	//                   name: "--client",
-	//                   args: {
-	//                     name: "name",
-	//                   },
-	//                   description:
-	//                     "Select the package manager to decide which lock file to copy to the build folder",
-	//                 },
-	//               ],
-	//             },
-	//             {
-	//               name: ["configure", "invoke"],
-	//               description: "Configure a given AdonisJS package",
-	//               args: {
-	//                 name: "name",
-	//                 description: "Name of the package you want to configure",
-	//               },
-	//               subcommands: [
-	//                 {
-	//                   name: "@adonisjs/auth",
-	//                   description: "Trigger auto configuring auth package",
-	//                 },
-	//                 {
-	//                   name: "@adonisjs/shield",
-	//                   description: "Trigger auto configuring shield package",
-	//                 },
-	//                 {
-	//                   name: "@adonisjs/redis",
-	//                   description: "Trigger auto configuring redis package",
-	//                 },
-	//                 {
-	//                   name: "@adonisjs/mail",
-	//                   description: "Trigger auto configuring mail package",
-	//                 },
-	//               ],
-	//             },
-	//             {
-	//               name: "repl",
-	//               description: "Start a new REPL session",
-	//             },
-	//             {
-	//               name: "serve",
-	//               description:
-	//                 "Start the AdonisJS HTTP server, along with the file watcher. Also starts the webpack dev server when webpack encore is installed",
-	//               options: [
-	//                 {
-	//                   name: "--assets",
-	//                   description:
-	//                     "Start webpack dev server when encore is installed",
-	//                 },
-	//                 {
-	//                   name: "--no-assets",
-	//                   description: "Disable webpack dev server",
-	//                 },
-	//                 {
-	//                   name: ["-w", "--watch"],
-	//                   description:
-	//                     "Watch for file changes and re-start the HTTP server on change",
-	//                 },
-	//                 {
-	//                   name: ["-p", "--poll"],
-	//                   description:
-	//                     "Detect file changes by polling files instead of listening to filesystem events",
-	//                 },
-	//                 {
-	//                   name: "--node-args",
-	//                   requiresSeparator: true,
-	//                   insertValue: "--node-args='{cursor}'",
-	//                   description: "CLI options to pass to the node command line",
-	//                 },
-	//                 {
-	//                   name: "--encore-args",
-	//                   requiresSeparator: true,
-	//                   insertValue: "--encore-args='{cursor}'",
-	//                   description:
-	//                     "CLI options to pass to the encore command line",
-	//                 },
-	//               ],
-	//             },
-	//             {
-	//               name: "db:seed",
-	//               description: "Execute database seeder files",
-	//               options: [
-	//                 {
-	//                   name: ["-c", "--connection"],
-	//                   description:
-	//                     "Define a custom database connection for the seeders",
-	//                   args: {
-	//                     name: "name",
-	//                   },
-	//                 },
-	//                 {
-	//                   name: ["-i", "--interactive"],
-	//                   description: "Run seeders in interactive mode",
-	//                 },
-	//                 {
-	//                   name: ["-f", "--files"],
-	//                   args: {
-	//                     name: "file",
-	//                     isVariadic: true,
-	//                     template: "filepaths",
-	//                   },
-	//                   description:
-	//                     "Define a custom set of seeders files names to run",
-	//                 },
-	//               ],
-	//             },
-	//             {
-	//               name: "dump:rcfile",
-	//               description:
-	//                 "Dump contents of .adonisrc.json file along with defaults",
-	//             },
-	//             {
-	//               name: "generate:key",
-	//               description: "Generate a new APP_KEY secret",
-	//             },
-	//             {
-	//               name: "generate:manifest",
-	//               description:
-	//                 "Generate ace commands manifest file. Manifest file speeds up commands lookup",
-	//             },
-	//             {
-	//               name: "list:routes",
-	//               description: "List application routes",
-	//             },
-	//             {
-	//               name: "make:command",
-	//               description: "Make a new ace command",
-	//             },
-	//             {
-	//               name: "make:controller",
-	//               description: "Make a new HTTP controller",
-	//               args: {
-	//                 name: "name",
-	//                 description: "Name of the controller class",
-	//               },
-	//               options: [
-	//                 {
-	//                   name: ["-r", "--resource"],
-	//                   description:
-	//                     "Add resourceful methods to the controller class",
-	//                 },
-	//                 {
-	//                   name: ["-e", "--exact"],
-	//                   description:
-	//                     "Create the controller with the exact name as provided",
-	//                 },
-	//               ],
-	//             },
-	//             {
-	//               name: "make:exception",
-	//               description: "Make a new custom exception class",
-	//             },
-	//             {
-	//               name: "make:listener",
-	//               description: "Make a new event listener class",
-	//             },
-	//             {
-	//               name: "make:mailer",
-	//               description: "Make a new mailer class",
-	//               args: {
-	//                 name: "name",
-	//                 description: "Mailer class name",
-	//               },
-	//             },
-	//             {
-	//               name: "make:middleware",
-	//               description: "Make a new middleware",
-	//               args: {
-	//                 name: "name",
-	//                 description: "Middleware class name",
-	//               },
-	//             },
-	//             {
-	//               name: "make:migration",
-	//               description: "Make a new migration file",
-	//               args: {
-	//                 name: "name",
-	//                 description: "Name of the migration file",
-	//               },
-	//               options: [
-	//                 {
-	//                   name: "--connection",
-	//                   description:
-	//                     "The connection flag is used to lookup the directory for the migration file",
-	//                   args: {
-	//                     name: "name",
-	//                   },
-	//                 },
-	//                 {
-	//                   name: "--folder",
-	//                   description: "Pre-select a migration directory",
-	//                   args: {
-	//                     name: "name",
-	//                     template: "filepaths",
-	//                   },
-	//                 },
-	//                 {
-	//                   name: "--create",
-	//                   description:
-	//                     "Define the table name for creating a new table",
-	//                   args: {
-	//                     name: "name",
-	//                   },
-	//                 },
-	//                 {
-	//                   name: "--table",
-	//                   description:
-	//                     "Define the table name for altering an existing table",
-	//                   args: {
-	//                     name: "name",
-	//                   },
-	//                 },
-	//               ],
-	//             },
-	//             {
-	//               name: "make:model",
-	//               description: "Make a new Lucid model",
-	//               args: {
-	//                 name: "name",
-	//                 description: "Name of the model class",
-	//               },
-	//               options: [
-	//                 {
-	//                   name: ["-m", "--migration"],
-	//                   description: "Generate the migration for the model",
-	//                 },
-	//                 {
-	//                   name: ["-c", "--controller"],
-	//                   description: "Generate the controller for the model",
-	//                 },
-	//               ],
-	//             },
-	//             {
-	//               name: "make:prldfile",
-	//               description: "Make a new preload file",
-	//               subcommands: [
-	//                 {
-	//                   name: "events",
-	//                   description: "Make events preload file",
-	//                 },
-	//               ],
-	//             },
-	//             {
-	//               name: "make:provider",
-	//               description: "Make a new provider class",
-	//             },
-	//             {
-	//               name: "make:seeder",
-	//               description: "Make a new Seeder file",
-	//               args: {
-	//                 name: "name",
-	//                 description: "Name of the seeder class",
-	//               },
-	//             },
-	//             {
-	//               name: "make:validator",
-	//               description: "Make a new validator",
-	//               args: {
-	//                 name: "name",
-	//                 description: "Name of the validator class",
-	//               },
-	//               options: [
-	//                 {
-	//                   name: ["-e", "--exact"],
-	//                   description:
-	//                     "Create the validator with the exact name as provided",
-	//                 },
-	//               ],
-	//             },
-	//             {
-	//               name: "make:view",
-	//               description: "Make a new view template",
-	//               args: {
-	//                 name: "name",
-	//                 description: "Name of the view",
-	//               },
-	//               options: [
-	//                 {
-	//                   name: ["-e", "--exact"],
-	//                   description:
-	//                     "Create the template file with the exact name as provided",
-	//                 },
-	//               ],
-	//             },
-	//             {
-	//               name: "migration:rollback",
-	//               description: "Rollback migrations to a given batch number",
-	//               options: [
-	//                 {
-	//                   name: ["-c", "--connection"],
-	//                   description: "Define a custom database connection",
-	//                   args: {
-	//                     name: "name",
-	//                   },
-	//                 },
-	//                 {
-	//                   name: "--force",
-	//                   description:
-	//                     "Explicitly force to run migrations in production",
-	//                   isDangerous: true,
-	//                 },
-	//                 {
-	//                   name: "--dry-run",
-	//                   description:
-	//                     "Print SQL queries, instead of running the migrations",
-	//                 },
-	//                 {
-	//                   name: "--batch",
-	//                   args: {
-	//                     name: "number",
-	//                     description: "Use 0 to rollback to initial state",
-	//                   },
-	//                   description: "Define custom batch number for rollback",
-	//                 },
-	//               ],
-	//             },
-	//             {
-	//               name: "migration:run",
-	//               description: "Run pending migrations",
-	//               options: [
-	//                 {
-	//                   name: ["-c", "--connection"],
-	//                   description: "Define a custom database connection",
-	//                   args: {
-	//                     name: "name",
-	//                   },
-	//                 },
-	//                 {
-	//                   name: "--force",
-	//                   description:
-	//                     "Explicitly force to run migrations in production",
-	//                   isDangerous: true,
-	//                 },
-	//                 {
-	//                   name: "--dry-run",
-	//                   description:
-	//                     "Print SQL queries, instead of running the migrations",
-	//                 },
-	//               ],
-	//             },
-	//             {
-	//               name: "migration:status",
-	//               description: "Check migrations current status",
-	//             },
-	//           ],
-	//         },
-	//       ],
-	//     };
-	//   }
-	// },
+  name: "node",
+  description: "Run the node interpreter",
+  args: {
+    name: "node script",
+    isScript: true,
+    generators: filepaths({
+      extensions: ["mjs", "js", "cjs"],
+      editFileSuggestions: { priority: 76 },
+    }),
+  },
+  options: [
+    {
+      name: ["-e", "--eval=..."],
+      insertValue: "-e '{cursor}'",
+      description: "Evaluate script",
+      args: {},
+    },
+    {
+      name: "--watch",
+      description: "Watch input files",
+    },
+    {
+      name: "--watch-path",
+      description: "Specify a watch directory or file",
+      args: {
+        name: "path",
+        template: "filepaths",
+      },
+      isRepeatable: true,
+    },
+    {
+      name: "--watch-preserve-output",
+      description:
+        "Disable the clearing of the console when watch mode restarts the process",
+      dependsOn: ["--watch", "--watch-path"],
+    },
+    {
+      name: "--env-file",
+      description: "Specify a file containing environment variables",
+      args: {
+        name: "path",
+        template: "filepaths",
+      },
+      isRepeatable: true,
+    },
+    {
+      name: ["-p", "--print"],
+      description: "Evaluate script and print result",
+    },
+    {
+      name: ["-c", "--check"],
+      description: "Syntax check script without executing",
+    },
+    {
+      name: ["-v", "--version"],
+      description: "Print Node.js version",
+    },
+    {
+      name: ["-i", "--interactive"],
+      description:
+        "Always enter the REPL even if stdin does not appear to be a terminal",
+    },
+    {
+      name: ["-h", "--help"],
+      description: "Print node command line options (currently set)",
+    },
+    {
+      name: "--inspect",
+      requiresSeparator: true,
+      args: {
+        name: "[host:]port",
+        isOptional: true,
+      },
+      description: "Activate inspector on host:port (default: 127.0.0.1:9229)",
+    },
+    {
+      name: "--preserve-symlinks",
+      description:
+        "Follows symlinks to directories when examining source code and templates for translation strings",
+    },
+  ],
+  generateSpec: async (tokens, executeShellCommand) => {
+    
+    if (
+      (
+        await executeShellCommand({
+          command: "bash",
+          args: ["-c", "isAdonisJsonPresentCommand"],
+        })
+      ).status === 0
+    ) {
+      return {
+        name: "node",
+        subcommands: [
+          {
+            name: "ace",
+            description: "Run AdonisJS command-line",
+            options: [
+              {
+                name: ["-h", "--help"],
+                description: "Display AdonisJS Ace help",
+              },
+              {
+                name: ["-v", "--version"],
+                description: "Display AdonisJS version",
+              },
+            ],
+            subcommands: [
+              {
+                name: "build",
+                description:
+                  "Compile project from Typescript to Javascript. Also compiles the frontend assets if using webpack encore",
+                options: [
+                  {
+                    name: ["-prod", "--production"],
+                    description: "Build for production",
+                  },
+                  {
+                    name: "--assets",
+                    description:
+                      "Build frontend assets when webpack encore is installed",
+                  },
+                  {
+                    name: "--no-assets",
+                    description: "Disable building assets",
+                  },
+                  {
+                    name: "--ignore-ts-errors",
+                    description:
+                      "Ignore typescript errors and complete the build process",
+                  },
+                  {
+                    name: "--tsconfig",
+                    description:
+                      "Path to the TypeScript project configuration file",
+                    args: {
+                      name: "path",
+                      description: "Path to tsconfig.json",
+                    },
+                  },
+                  {
+                    name: "--encore-args",
+                    requiresSeparator: true,
+                    insertValue: "--encore-args='{cursor}'",
+                    description:
+                      "CLI options to pass to the encore command line",
+                  },
+                  {
+                    name: "--client",
+                    args: {
+                      name: "name",
+                    },
+                    description:
+                      "Select the package manager to decide which lock file to copy to the build folder",
+                  },
+                ],
+              },
+              {
+                name: ["configure", "invoke"],
+                description: "Configure a given AdonisJS package",
+                args: {
+                  name: "name",
+                  description: "Name of the package you want to configure",
+                },
+                subcommands: [
+                  {
+                    name: "@adonisjs/auth",
+                    description: "Trigger auto configuring auth package",
+                  },
+                  {
+                    name: "@adonisjs/shield",
+                    description: "Trigger auto configuring shield package",
+                  },
+                  {
+                    name: "@adonisjs/redis",
+                    description: "Trigger auto configuring redis package",
+                  },
+                  {
+                    name: "@adonisjs/mail",
+                    description: "Trigger auto configuring mail package",
+                  },
+                ],
+              },
+              {
+                name: "repl",
+                description: "Start a new REPL session",
+              },
+              {
+                name: "serve",
+                description:
+                  "Start the AdonisJS HTTP server, along with the file watcher. Also starts the webpack dev server when webpack encore is installed",
+                options: [
+                  {
+                    name: "--assets",
+                    description:
+                      "Start webpack dev server when encore is installed",
+                  },
+                  {
+                    name: "--no-assets",
+                    description: "Disable webpack dev server",
+                  },
+                  {
+                    name: ["-w", "--watch"],
+                    description:
+                      "Watch for file changes and re-start the HTTP server on change",
+                  },
+                  {
+                    name: ["-p", "--poll"],
+                    description:
+                      "Detect file changes by polling files instead of listening to filesystem events",
+                  },
+                  {
+                    name: "--node-args",
+                    requiresSeparator: true,
+                    insertValue: "--node-args='{cursor}'",
+                    description: "CLI options to pass to the node command line",
+                  },
+                  {
+                    name: "--encore-args",
+                    requiresSeparator: true,
+                    insertValue: "--encore-args='{cursor}'",
+                    description:
+                      "CLI options to pass to the encore command line",
+                  },
+                ],
+              },
+              {
+                name: "db:seed",
+                description: "Execute database seeder files",
+                options: [
+                  {
+                    name: ["-c", "--connection"],
+                    description:
+                      "Define a custom database connection for the seeders",
+                    args: {
+                      name: "name",
+                    },
+                  },
+                  {
+                    name: ["-i", "--interactive"],
+                    description: "Run seeders in interactive mode",
+                  },
+                  {
+                    name: ["-f", "--files"],
+                    args: {
+                      name: "file",
+                      isVariadic: true,
+                      template: "filepaths",
+                    },
+                    description:
+                      "Define a custom set of seeders files names to run",
+                  },
+                ],
+              },
+              {
+                name: "dump:rcfile",
+                description:
+                  "Dump contents of .adonisrc.json file along with defaults",
+              },
+              {
+                name: "generate:key",
+                description: "Generate a new APP_KEY secret",
+              },
+              {
+                name: "generate:manifest",
+                description:
+                  "Generate ace commands manifest file. Manifest file speeds up commands lookup",
+              },
+              {
+                name: "list:routes",
+                description: "List application routes",
+              },
+              {
+                name: "make:command",
+                description: "Make a new ace command",
+              },
+              {
+                name: "make:controller",
+                description: "Make a new HTTP controller",
+                args: {
+                  name: "name",
+                  description: "Name of the controller class",
+                },
+                options: [
+                  {
+                    name: ["-r", "--resource"],
+                    description:
+                      "Add resourceful methods to the controller class",
+                  },
+                  {
+                    name: ["-e", "--exact"],
+                    description:
+                      "Create the controller with the exact name as provided",
+                  },
+                ],
+              },
+              {
+                name: "make:exception",
+                description: "Make a new custom exception class",
+              },
+              {
+                name: "make:listener",
+                description: "Make a new event listener class",
+              },
+              {
+                name: "make:mailer",
+                description: "Make a new mailer class",
+                args: {
+                  name: "name",
+                  description: "Mailer class name",
+                },
+              },
+              {
+                name: "make:middleware",
+                description: "Make a new middleware",
+                args: {
+                  name: "name",
+                  description: "Middleware class name",
+                },
+              },
+              {
+                name: "make:migration",
+                description: "Make a new migration file",
+                args: {
+                  name: "name",
+                  description: "Name of the migration file",
+                },
+                options: [
+                  {
+                    name: "--connection",
+                    description:
+                      "The connection flag is used to lookup the directory for the migration file",
+                    args: {
+                      name: "name",
+                    },
+                  },
+                  {
+                    name: "--folder",
+                    description: "Pre-select a migration directory",
+                    args: {
+                      name: "name",
+                      template: "filepaths",
+                    },
+                  },
+                  {
+                    name: "--create",
+                    description:
+                      "Define the table name for creating a new table",
+                    args: {
+                      name: "name",
+                    },
+                  },
+                  {
+                    name: "--table",
+                    description:
+                      "Define the table name for altering an existing table",
+                    args: {
+                      name: "name",
+                    },
+                  },
+                ],
+              },
+              {
+                name: "make:model",
+                description: "Make a new Lucid model",
+                args: {
+                  name: "name",
+                  description: "Name of the model class",
+                },
+                options: [
+                  {
+                    name: ["-m", "--migration"],
+                    description: "Generate the migration for the model",
+                  },
+                  {
+                    name: ["-c", "--controller"],
+                    description: "Generate the controller for the model",
+                  },
+                ],
+              },
+              {
+                name: "make:prldfile",
+                description: "Make a new preload file",
+                subcommands: [
+                  {
+                    name: "events",
+                    description: "Make events preload file",
+                  },
+                ],
+              },
+              {
+                name: "make:provider",
+                description: "Make a new provider class",
+              },
+              {
+                name: "make:seeder",
+                description: "Make a new Seeder file",
+                args: {
+                  name: "name",
+                  description: "Name of the seeder class",
+                },
+              },
+              {
+                name: "make:validator",
+                description: "Make a new validator",
+                args: {
+                  name: "name",
+                  description: "Name of the validator class",
+                },
+                options: [
+                  {
+                    name: ["-e", "--exact"],
+                    description:
+                      "Create the validator with the exact name as provided",
+                  },
+                ],
+              },
+              {
+                name: "make:view",
+                description: "Make a new view template",
+                args: {
+                  name: "name",
+                  description: "Name of the view",
+                },
+                options: [
+                  {
+                    name: ["-e", "--exact"],
+                    description:
+                      "Create the template file with the exact name as provided",
+                  },
+                ],
+              },
+              {
+                name: "migration:rollback",
+                description: "Rollback migrations to a given batch number",
+                options: [
+                  {
+                    name: ["-c", "--connection"],
+                    description: "Define a custom database connection",
+                    args: {
+                      name: "name",
+                    },
+                  },
+                  {
+                    name: "--force",
+                    description:
+                      "Explicitly force to run migrations in production",
+                    isDangerous: true,
+                  },
+                  {
+                    name: "--dry-run",
+                    description:
+                      "Print SQL queries, instead of running the migrations",
+                  },
+                  {
+                    name: "--batch",
+                    args: {
+                      name: "number",
+                      description: "Use 0 to rollback to initial state",
+                    },
+                    description: "Define custom batch number for rollback",
+                  },
+                ],
+              },
+              {
+                name: "migration:run",
+                description: "Run pending migrations",
+                options: [
+                  {
+                    name: ["-c", "--connection"],
+                    description: "Define a custom database connection",
+                    args: {
+                      name: "name",
+                    },
+                  },
+                  {
+                    name: "--force",
+                    description:
+                      "Explicitly force to run migrations in production",
+                    isDangerous: true,
+                  },
+                  {
+                    name: "--dry-run",
+                    description:
+                      "Print SQL queries, instead of running the migrations",
+                  },
+                ],
+              },
+              {
+                name: "migration:status",
+                description: "Check migrations current status",
+              },
+            ],
+          },
+        ],
+      };
+    }
+  },
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/npm.ts b/extensions/terminal-suggest/src/completions/upstream/npm.ts
index b48d8126444c..2c782c412627 100644
--- a/extensions/terminal-suggest/src/completions/upstream/npm.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/npm.ts
@@ -1,1608 +1,1608 @@
 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,
-	};
+  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(",")}` : "";
+  (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`;
+    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("@");
+    // 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;
-				}
+    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: any) => ({
-					name: item.package.name,
-					description: item.package.description,
-				})) as Fig.Suggestion[];
-			} catch (error) {
-				console.error({ error });
-				return [];
-			}
-		};
+      const results = keywordParameter ? data.results : data;
+      return results.map((item: any) => ({
+        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);
-		}
+  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(),
+    // 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"],
-		});
+  // 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 { 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 suggestions: Fig.Suggestion[] = [];
+    try {
+      if (out.trim() == "") {
+        return suggestions;
+      }
 
-			const packageContent = JSON.parse(out);
-			const workspaces = packageContent["workspaces"];
+      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;
-	},
+      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);
+  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",
-			}));
-		}
-	},
+      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 [];
-		}
+  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"] || {};
+    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);
-		}
+      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 [];
-	},
+    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",
+  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",
+  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,
+  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",
+  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",
+  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",
-	},
+  {
+    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,
+  {
+    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,
+  {
+    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" },
+  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" },
+  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" },
+  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",
+  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" },
+  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",
+  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],
-		},
-	],
+  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/npx.ts b/extensions/terminal-suggest/src/completions/upstream/npx.ts
deleted file mode 100644
index 4143ed790d1b..000000000000
--- a/extensions/terminal-suggest/src/completions/upstream/npx.ts
+++ /dev/null
@@ -1,317 +0,0 @@
-// import autocannon from "./autocannon";
-
-export const npxSuggestions: Fig.Suggestion[] = [
-	// {
-	//   name: autocannon.name,
-	//   ...("icon" in autocannon && { icon: autocannon.icon }),
-	// },
-	{
-		name: "vite",
-		icon: "https://vitejs.dev/logo.svg",
-	},
-	{
-		name: "babel",
-		icon: "https://raw.githubusercontent.com/babel/logo/master/babel.png",
-	},
-	{
-		name: "create-react-native-app",
-		icon: "https://reactnative.dev/img/pwa/manifest-icon-512.png",
-	},
-	{
-		name: "react-native",
-		icon: "https://reactnative.dev/img/pwa/manifest-icon-512.png",
-	},
-	{
-		name: "tailwindcss",
-		icon: "https://tailwindcss.com/favicons/favicon-32x32.png",
-	},
-	{
-		name: "next",
-		icon: "https://nextjs.org/static/favicon/favicon-16x16.png",
-	},
-	{
-		name: "nuxi",
-		icon: "https://raw.githubusercontent.com/nuxt/framework/main/docs/public/icon.png",
-	},
-	{
-		name: "gltfjsx",
-		icon: "https://raw.githubusercontent.com/pmndrs/branding/master/logo.svg",
-	},
-	{
-		name: "prisma",
-		icon: "https://raw.githubusercontent.com/prisma/docs/main/src/images/favicon-16x16.png",
-	},
-	{
-		name: "eslint",
-		icon: "https://raw.githubusercontent.com/eslint/eslint.org/main/src/static/icon-512.png",
-	},
-	{
-		name: "prettier",
-		icon: "https://prettier.io/icon.png",
-	},
-	{
-		name: "tsc",
-		icon: "https://upload.wikimedia.org/wikipedia/commons/thumb/4/4c/Typescript_logo_2020.svg/240px-Typescript_logo_2020.svg.png",
-	},
-	{
-		name: "typeorm",
-		icon: "https://avatars.githubusercontent.com/u/20165699?s=200&v=4",
-	},
-	// {
-	//   name: "fig-teams",
-	//   icon: "https://fig.io/icons/fig-light.png",
-	// },
-	{
-		name: "@withfig/autocomplete-tools",
-		icon: "https://fig.io/icons/fig-light.png",
-	},
-	{
-		name: "create-completion-spec",
-		icon: "https://fig.io/icons/fig-light.png",
-	},
-	{
-		name: "@fig/publish-spec-to-team",
-		icon: "https://fig.io/icons/fig-light.png",
-	},
-	{
-		name: "fig-teams@latest",
-		icon: "https://fig.io/icons/fig-light.png",
-	},
-	{
-		name: "create-next-app",
-		icon: "https://nextjs.org/static/favicon/favicon-16x16.png",
-	},
-	{
-		name: "create-t3-app",
-		icon: "https://create.t3.gg/favicon.svg",
-	},
-	{
-		name: "create-discord-bot",
-		icon: "https://discordjs.dev/favicon-32x32.png",
-	},
-	{
-		name: "create-video",
-		icon: "https://raw.githubusercontent.com/remotion-dev/remotion/main/packages/docs/static/img/logo-small.png",
-	},
-	{
-		name: "remotion",
-		icon: "https://raw.githubusercontent.com/remotion-dev/remotion/main/packages/docs/static/img/logo-small.png",
-	},
-	{
-		name: "create-remix",
-		icon: "https://remix.run/favicon-light.1.png",
-	},
-	{
-		name: "remix",
-		icon: "https://remix.run/favicon-light.1.png",
-	},
-	{
-		name: "playwright",
-		icon: "https://playwright.dev/img/playwright-logo.svg",
-	},
-	{
-		name: "ignite-cli",
-		icon: "🔥",
-	},
-	{
-		name: "vsce",
-	},
-	{
-		name: "degit",
-		icon: "fig://icon?type=git",
-	},
-	{
-		name: "@preset/cli",
-		icon: "https://raw.githubusercontent.com/preset/preset/main/.github/assets/logo.svg",
-	},
-	{
-		name: "mikro-orm",
-		icon: "https://raw.githubusercontent.com/mikro-orm/mikro-orm/master/docs/static/img/favicon.ico",
-	},
-	{
-		name: "pod-install",
-	},
-	{
-		name: "capacitor",
-		icon: "https://capacitorjs.com/docs/img/meta/favicon.png",
-	},
-	{
-		name: "cap",
-		icon: "https://capacitorjs.com/docs/img/meta/favicon.png",
-	},
-	{
-		name: "@magnolia/cli",
-		icon: "https://avatars.githubusercontent.com/u/25686615?s=200&v=4",
-	},
-	{
-		name: "stencil",
-		icon: "https://stenciljs.com/assets/icon/favicon.ico",
-	},
-	{
-		name: "swagger-typescript-api",
-		icon: "https://static1.smartbear.co/swagger/media/assets/swagger_fav.png",
-	},
-	{
-		name: "sta",
-		icon: "https://static1.smartbear.co/swagger/media/assets/swagger_fav.png",
-	},
-	{
-		name: "@wordpress/create-block",
-		icon: "https://s1.wp.com/i/webclip.png",
-	},
-	{
-		name: "astro",
-		icon: "https://astro.build/favicon.svg",
-	},
-	{
-		name: "ampx",
-		icon: "https://raw.githubusercontent.com/aws-amplify/docs/refs/heads/main/public/favicon.ico",
-	},
-];
-
-const completionSpec: Fig.Spec = {
-	name: "npx",
-	description: "Execute binaries from npm packages",
-	args: {
-		name: "command",
-		isCommand: true,
-		generators: {
-			script: [
-				"bash",
-				"-c",
-				"until [[ -d node_modules/ ]] || [[ $PWD = '/' ]]; do cd ..; done; ls -1 node_modules/.bin/",
-			],
-			postProcess: function (out) {
-				const cli = [...npxSuggestions].reduce(
-					(acc: any, { name }) => [...acc, name],
-					[]
-				);
-				return out
-					.split("\n")
-					.filter((name) => !cli.includes(name))
-					.map((name) => ({
-						name,
-						icon: "fig://icon?type=command",
-						loadSpec: name,
-					}));
-			},
-		},
-		suggestions: [...npxSuggestions],
-		isOptional: true,
-	},
-
-	options: [
-		{
-			name: ["--package", "-p"],
-			description: "Package to be installed",
-			args: {
-				name: "package",
-			},
-		},
-		{
-			name: "--cache",
-			args: {
-				name: "path",
-				template: "filepaths",
-			},
-			description: "Location of the npm cache",
-		},
-		{
-			name: "--always-spawn",
-			description: "Always spawn a child process to execute the command",
-		},
-		{
-			name: "-y",
-			description: "Execute npx command without prompting for confirmation",
-		},
-		{
-			description: "Skip installation if a package is missing",
-			name: "--no-install",
-		},
-		{
-			args: {
-				name: "path",
-				template: "filepaths",
-			},
-			description: "Path to user npmrc",
-			name: "--userconfig",
-		},
-		{
-			name: ["--call", "-c"],
-			args: {
-				name: "script",
-			},
-			description: "Execute string as if inside `npm run-script`",
-		},
-		{
-			name: ["--shell", "-s"],
-			description: "Shell to execute the command with, if any",
-			args: {
-				name: "shell",
-				suggestions: [
-					{
-						name: "bash",
-					},
-					{
-						name: "fish",
-					},
-					{
-						name: "zsh",
-					},
-				],
-			},
-		},
-		{
-			args: {
-				name: "shell-fallback",
-				suggestions: [
-					{
-						name: "bash",
-					},
-					{
-						name: "fish",
-					},
-					{
-						name: "zsh",
-					},
-				],
-			},
-			name: "--shell-auto-fallback",
-			description:
-				'Generate shell code to use npx as the "command not found" fallback',
-		},
-		{
-			name: "--ignore-existing",
-			description:
-				"Ignores existing binaries in $PATH, or in the localproject. This forces npx to do a temporary install and use the latest version",
-		},
-		{
-			name: ["--quiet", "-q"],
-			description:
-				"Suppress output from npx itself. Subcommands will not be affected",
-		},
-		{
-			name: "--npm",
-			args: {
-				name: "path to binary",
-				template: "filepaths",
-			},
-			description: "Npm binary to use for internal operations",
-		},
-		{
-			args: {},
-			description: "Extra node argument when calling a node binary",
-			name: ["--node-arg", "-n"],
-		},
-		{
-			description: "Show version number",
-			name: ["--version", "-v"],
-		},
-		{
-			description: "Show help",
-			name: ["--help", "-h"],
-		},
-	],
-};
-
-export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/nvm.ts b/extensions/terminal-suggest/src/completions/upstream/nvm.ts
index 843ffef57de6..aeeba4629e99 100644
--- a/extensions/terminal-suggest/src/completions/upstream/nvm.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/nvm.ts
@@ -1,318 +1,318 @@
 // args
 const version: Fig.Arg = {
-	name: "version",
-	description: "Node version",
-	suggestions: [
-		{
-			name: "node",
-			description: "The latest version of node",
-		},
-		{
-			name: "iojs",
-			description: "The latest version of io.js",
-		},
-		{
-			name: "system",
-			description: "System-installed version of node",
-		},
-	],
+  name: "version",
+  description: "Node version",
+  suggestions: [
+    {
+      name: "node",
+      description: "The latest version of node",
+    },
+    {
+      name: "iojs",
+      description: "The latest version of io.js",
+    },
+    {
+      name: "system",
+      description: "System-installed version of node",
+    },
+  ],
 };
 
 const command: Fig.Arg = {
-	name: "command",
-	isVariadic: true,
+  name: "command",
+  isVariadic: true,
 };
 
 const args: Fig.Arg = {
-	name: "args",
-	isVariadic: true,
+  name: "args",
+  isVariadic: true,
 };
 
-// const pattern: Fig.Arg = {
-//   name: "pattern",
-// };
+const pattern: Fig.Arg = {
+  name: "pattern",
+};
 
 const name: Fig.Arg = {
-	name: "name",
+  name: "name",
 };
 
 const ltsName: Fig.Arg = {
-	name: "LTS name",
+  name: "LTS name",
 };
 
 const colorCodes: Fig.Arg = {
-	name: "color codes",
-	description: 'Using format "yMeBg"',
+  name: "color codes",
+  description: 'Using format "yMeBg"',
 };
 
 // options
 const noColors: Fig.Option = {
-	name: "--no-colors",
-	description: "Suppress colored output",
+  name: "--no-colors",
+  description: "Suppress colored output",
 };
 
 const noAlias: Fig.Option = {
-	name: "--no-alias",
-	description: "Suppress `nvm alias` output",
+  name: "--no-alias",
+  description: "Suppress `nvm alias` output",
 };
 
 const silent: Fig.Option = {
-	name: "--silent",
-	description: "Silences stdout/stderr output",
+  name: "--silent",
+  description: "Silences stdout/stderr output",
 };
 
 const lts: Fig.Option = {
-	name: "--lts",
-	description:
-		"Uses automatic LTS (long-term support) alias `lts/*`, if available",
+  name: "--lts",
+  description:
+    "Uses automatic LTS (long-term support) alias `lts/*`, if available",
 };
 
 const ltsWithName: Fig.Option = {
-	name: "--lts",
-	description: "Uses automatic alias for provided LTS line, if available",
-	args: ltsName,
+  name: "--lts",
+  description: "Uses automatic alias for provided LTS line, if available",
+  args: ltsName,
 };
 
 const completionSpec: Fig.Spec = {
-	name: "nvm",
-	description: "Node Package Manager",
-	subcommands: [
-		{
-			name: "install",
-			description:
-				"Download and install a <version>. Uses .nvmrc if available and version is omitted",
-			args: { ...version, isOptional: true },
-			options: [
-				{
-					name: "-s",
-					description: "Skip binary download, install from source only",
-				},
-				{
-					name: "--reinstall-packages-from",
-					description:
-						"When installing, reinstall packages installed in <version>",
-					args: version,
-				},
-				{
-					...lts,
-					description:
-						"When installing, only select from LTS (long-term support) versions",
-				},
-				{
-					...ltsWithName,
-					description:
-						"When installing, only select from versions for a specific LTS line",
-				},
-				{
-					name: "--skip-default-packages",
-					description:
-						"When installing, skip the default-packages file if it exists",
-				},
-				{
-					name: "--latest-npm",
-					description:
-						"After installing, attempt to upgrade to the latest working npm on the given node version",
-				},
-				{
-					name: "--no-progress",
-					description: "Disable the progress bar on any downloads",
-				},
-				{
-					name: "--alias",
-					description:
-						"After installing, set the alias specified to the version specified. (same as: nvm alias <name> <version>)",
-					args: name,
-				},
-				{
-					name: "--default",
-					description:
-						"After installing, set default alias to the version specified. (same as: nvm alias default <version>)",
-				},
-			],
-		},
-		{
-			name: "uninstall",
-			description: "Uninstall a version",
-			args: version,
-			options: [
-				{
-					...lts,
-					description:
-						"Uninstall using automatic LTS (long-term support) alias `lts/*`, if available",
-				},
-				{
-					...ltsWithName,
-					description:
-						"Uninstall using automatic alias for provided LTS line, if available",
-				},
-			],
-		},
-		{
-			name: "use",
-			description:
-				"Modify PATH to use <version>. Uses .nvmrc if available and version is omitted",
-			args: { ...version, isOptional: true },
-			options: [silent, lts, ltsWithName],
-		},
-		{
-			name: "exec",
-			description:
-				"Run <command> on <version>. Uses .nvmrc if available and version is omitted",
-			args: [{ ...version, isOptional: true }, command],
-			options: [silent, lts, ltsWithName],
-		},
-		{
-			name: "run",
-			description:
-				"Run `node` on <version> with <args> as arguments. Uses .nvmrc if available and version is omitted",
-			args: [{ ...version, isOptional: true }, args],
-			options: [silent, lts, ltsWithName],
-		},
-		{
-			name: "current",
-			description: "Display currently activated version of Node",
-		},
-		{
-			name: "ls",
-			description:
-				"List installed versions, matching a given <version> if provided",
-			args: version,
-			options: [noColors, noAlias],
-		},
-		{
-			name: "ls-remote",
-			description:
-				"List remote versions available for install, matching a given <version> if provided",
-			args: version,
-			options: [
-				{
-					...lts,
-					description:
-						"When listing, only show LTS (long-term support) versions",
-				},
-				{
-					...ltsWithName,
-					description:
-						"When listing, only show versions for a specific LTS line",
-				},
-				noColors,
-			],
-		},
-		{
-			name: "version",
-			description: "Resolve the given description to a single local version",
-			args: version,
-		},
-		{
-			name: "version-remote",
-			description: "Resolve the given description to a single remote version",
-			args: version,
-			options: [
-				{
-					...lts,
-					description:
-						"When listing, only show LTS (long-term support) versions",
-				},
-				{
-					...ltsWithName,
-					description:
-						"When listing, only show versions for a specific LTS line",
-				},
-			],
-		},
-		{
-			name: "deactivate",
-			description: "Undo effects of `nvm` on current shell",
-			options: [silent],
-		},
-		{
-			name: "alias",
-			description:
-				"Show all aliases beginning with <pattern> or Set an alias named <name> pointing to <version>",
-			args: [
-				{
-					name: "pattern or name",
-					description: "Pattern or name",
-				},
-				{
-					name: "version",
-					isOptional: true,
-				},
-			],
-		},
-		{
-			name: "unalias",
-			description: "Deletes the alias named <name>",
-			args: name,
-		},
-		{
-			name: "install-latest-npm",
-			description:
-				"Attempt to upgrade to the latest working `npm` on the current node version",
-		},
-		{
-			name: "reinstall-packages",
-			description:
-				"Reinstall global `npm` packages contained in <version> to current version",
-			args: version,
-		},
-		{
-			name: "unload",
-			description: "Unload `nvm` from shell",
-		},
-		{
-			name: "which",
-			description:
-				"Display path to installed node version. Uses .nvmrc if available and version is omitted",
-			args: { ...version, isOptional: true },
-			subcommands: [
-				{
-					name: "current",
-				},
-			],
-			options: [
-				{
-					...silent,
-					description:
-						"Silences stdout/stderr output when a version is omitted",
-				},
-			],
-		},
-		{
-			name: "cache",
-			args: {
-				suggestions: [
-					{
-						name: "dir",
-						description: "Display path to the cache directory for nvm",
-						type: "subcommand",
-					},
-					{
-						name: "clear",
-						description: "Empty cache directory for nvm",
-						type: "subcommand",
-					},
-				],
-			},
-		},
-		{
-			name: "set-colors",
-			description:
-				'Set five text colors using format "yMeBg". Available when supported',
-			args: colorCodes,
-		},
-	],
-	options: [
-		{
-			name: "--help",
-			description: "Show help page",
-		},
-		{
-			name: "--version",
-			description: "Print out the installed version of nvm",
-		},
-		noColors,
-	],
+  name: "nvm",
+  description: "Node Package Manager",
+  subcommands: [
+    {
+      name: "install",
+      description:
+        "Download and install a <version>. Uses .nvmrc if available and version is omitted",
+      args: { ...version, isOptional: true },
+      options: [
+        {
+          name: "-s",
+          description: "Skip binary download, install from source only",
+        },
+        {
+          name: "--reinstall-packages-from",
+          description:
+            "When installing, reinstall packages installed in <version>",
+          args: version,
+        },
+        {
+          ...lts,
+          description:
+            "When installing, only select from LTS (long-term support) versions",
+        },
+        {
+          ...ltsWithName,
+          description:
+            "When installing, only select from versions for a specific LTS line",
+        },
+        {
+          name: "--skip-default-packages",
+          description:
+            "When installing, skip the default-packages file if it exists",
+        },
+        {
+          name: "--latest-npm",
+          description:
+            "After installing, attempt to upgrade to the latest working npm on the given node version",
+        },
+        {
+          name: "--no-progress",
+          description: "Disable the progress bar on any downloads",
+        },
+        {
+          name: "--alias",
+          description:
+            "After installing, set the alias specified to the version specified. (same as: nvm alias <name> <version>)",
+          args: name,
+        },
+        {
+          name: "--default",
+          description:
+            "After installing, set default alias to the version specified. (same as: nvm alias default <version>)",
+        },
+      ],
+    },
+    {
+      name: "uninstall",
+      description: "Uninstall a version",
+      args: version,
+      options: [
+        {
+          ...lts,
+          description:
+            "Uninstall using automatic LTS (long-term support) alias `lts/*`, if available",
+        },
+        {
+          ...ltsWithName,
+          description:
+            "Uninstall using automatic alias for provided LTS line, if available",
+        },
+      ],
+    },
+    {
+      name: "use",
+      description:
+        "Modify PATH to use <version>. Uses .nvmrc if available and version is omitted",
+      args: { ...version, isOptional: true },
+      options: [silent, lts, ltsWithName],
+    },
+    {
+      name: "exec",
+      description:
+        "Run <command> on <version>. Uses .nvmrc if available and version is omitted",
+      args: [{ ...version, isOptional: true }, command],
+      options: [silent, lts, ltsWithName],
+    },
+    {
+      name: "run",
+      description:
+        "Run `node` on <version> with <args> as arguments. Uses .nvmrc if available and version is omitted",
+      args: [{ ...version, isOptional: true }, args],
+      options: [silent, lts, ltsWithName],
+    },
+    {
+      name: "current",
+      description: "Display currently activated version of Node",
+    },
+    {
+      name: "ls",
+      description:
+        "List installed versions, matching a given <version> if provided",
+      args: version,
+      options: [noColors, noAlias],
+    },
+    {
+      name: "ls-remote",
+      description:
+        "List remote versions available for install, matching a given <version> if provided",
+      args: version,
+      options: [
+        {
+          ...lts,
+          description:
+            "When listing, only show LTS (long-term support) versions",
+        },
+        {
+          ...ltsWithName,
+          description:
+            "When listing, only show versions for a specific LTS line",
+        },
+        noColors,
+      ],
+    },
+    {
+      name: "version",
+      description: "Resolve the given description to a single local version",
+      args: version,
+    },
+    {
+      name: "version-remote",
+      description: "Resolve the given description to a single remote version",
+      args: version,
+      options: [
+        {
+          ...lts,
+          description:
+            "When listing, only show LTS (long-term support) versions",
+        },
+        {
+          ...ltsWithName,
+          description:
+            "When listing, only show versions for a specific LTS line",
+        },
+      ],
+    },
+    {
+      name: "deactivate",
+      description: "Undo effects of `nvm` on current shell",
+      options: [silent],
+    },
+    {
+      name: "alias",
+      description:
+        "Show all aliases beginning with <pattern> or Set an alias named <name> pointing to <version>",
+      args: [
+        {
+          name: "pattern or name",
+          description: "Pattern or name",
+        },
+        {
+          name: "version",
+          isOptional: true,
+        },
+      ],
+    },
+    {
+      name: "unalias",
+      description: "Deletes the alias named <name>",
+      args: name,
+    },
+    {
+      name: "install-latest-npm",
+      description:
+        "Attempt to upgrade to the latest working `npm` on the current node version",
+    },
+    {
+      name: "reinstall-packages",
+      description:
+        "Reinstall global `npm` packages contained in <version> to current version",
+      args: version,
+    },
+    {
+      name: "unload",
+      description: "Unload `nvm` from shell",
+    },
+    {
+      name: "which",
+      description:
+        "Display path to installed node version. Uses .nvmrc if available and version is omitted",
+      args: { ...version, isOptional: true },
+      subcommands: [
+        {
+          name: "current",
+        },
+      ],
+      options: [
+        {
+          ...silent,
+          description:
+            "Silences stdout/stderr output when a version is omitted",
+        },
+      ],
+    },
+    {
+      name: "cache",
+      args: {
+        suggestions: [
+          {
+            name: "dir",
+            description: "Display path to the cache directory for nvm",
+            type: "subcommand",
+          },
+          {
+            name: "clear",
+            description: "Empty cache directory for nvm",
+            type: "subcommand",
+          },
+        ],
+      },
+    },
+    {
+      name: "set-colors",
+      description:
+        'Set five text colors using format "yMeBg". Available when supported',
+      args: colorCodes,
+    },
+  ],
+  options: [
+    {
+      name: "--help",
+      description: "Show help page",
+    },
+    {
+      name: "--version",
+      description: "Print out the installed version of nvm",
+    },
+    noColors,
+  ],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/pnpm.ts b/extensions/terminal-suggest/src/completions/upstream/pnpm.ts
index 1710549572f1..47ac1acecd2b 100644
--- a/extensions/terminal-suggest/src/completions/upstream/pnpm.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/pnpm.ts
@@ -4,940 +4,940 @@ 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;
+  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);
+  script: ["git", "branch", "--no-color"],
+  postProcess: function (out) {
+    const output = filterMessages(out);
 
-		if (output.startsWith("fatal:")) {
-			return [];
-		}
+    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 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",
-			};
-		});
-	},
+      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 [];
-		}
+  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
+    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",
-			};
-		});
-	},
+    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.
+  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"],
-		},
-	},
+  {
+    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.
+  {
+    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",
-	},
+  },
+  {
+    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.
+  {
+    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,
+  },
+  {
+    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.
+  {
+    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;
+    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.
+      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.
+    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.
+      },
+      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).
+      },
+      {
+        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
-		},
-	},
+    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.
+  {
+    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.
+    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.
+      },
+      {
+        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.
+  },
+  {
+    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.
+  {
+    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.
+    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.
+    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,
-		],
-	},
+        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.
+  {
+    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.
+    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.
+        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,
+      },
+      {
+        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.
+      },
+      {
+        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",
-	},
+      },
+      {
+        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,
+  ...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",
+  "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);
+  if (Array.isArray(subcommand.name)) {
+    return subcommand.name.some((name) =>
+      recursiveSubcommandsNames.includes(name)
+    );
+  }
+  return recursiveSubcommandsNames.includes(subcommand.name);
 });
 
 // RECURSIVE SUBCOMMAND INDEX
@@ -945,83 +945,77 @@ 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",
-	},
+  {
+    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) {
-			return undefined;
-		}
+  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[];
+    };
 
-		const packages = postProcess(
-			(
-				await executeShellCommand({
-					command: script[0],
-					args: script.slice(1),
-				})
-			).stdout,
-			tokens
-		)?.map((e: any) => e.name as string);
-		if (!packages) {
-			return undefined;
-		}
+    const packages = postProcess?.(
+      (
+        await executeShellCommand({
+          command: script[0],
+          args: script.slice(1),
+        })
+      ).stdout,
+      tokens
+    ).map(({ name }) => name as string);
 
-		const subcommands = packages
-			.filter((name) => nodeClis.has(name))
-			.map((name) => ({
-				name,
-				loadSpec: name,
-				icon: "fig://icon?type=package",
-			}));
+    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,
+    return {
+      name: "pnpm",
+      subcommands,
+    } as Fig.Spec;
+  },
+  subcommands,
+  options: COMMON_OPTIONS,
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/python.ts b/extensions/terminal-suggest/src/completions/upstream/python.ts
index 2374ee6b5e89..8362ef135e0c 100644
--- a/extensions/terminal-suggest/src/completions/upstream/python.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/python.ts
@@ -1,167 +1,168 @@
 import { filepaths } from '../../helpers/filepaths';
 
 const completionSpec: Fig.Spec = {
-	name: "python",
-	description: "Run the python interpreter",
-	generateSpec: async (tokens, executeShellCommand) => {
-		const isDjangoManagePyFilePresentCommand = "cat manage.py | grep -q django";
-		if (
-			(
-				await executeShellCommand({
-					command: "bash",
-					args: ["-c", isDjangoManagePyFilePresentCommand],
-				})
-			).status === 0
-		) {
-			return {
-				name: "python",
-				subcommands: [{ name: "manage.py", loadSpec: "django-admin" }],
-			};
-		}
-	},
-	args: {
-		name: "python script",
-		generators: filepaths({
-			extensions: ["py"],
-			editFileSuggestions: { priority: 76 },
-		}),
-	},
-	options: [
-		{
-			name: "-c",
-			insertValue: "-c '{cursor}'",
-			description:
-				"Execute the Python code in command. command can be one or more statements separated by newlines, with significant leading whitespace as in normal module code",
-			args: {
-				name: "command",
-				isCommand: true,
-			},
-		},
-		{
-			name: "-m",
-			description: "Module",
-			args: {
-				name: "python module",
-				isModule: "python/",
-				suggestions: ["http.server"],
-			},
-		},
-		{
-			name: ["-?", "-h", "--help"],
-			description: "Print a short description of all command line options",
-		},
-		{
-			name: ["-V", "--version"],
-			description: "Print the Python version number and exit",
-		},
-		{
-			name: "-b",
-			description:
-				"Issue a warning when comparing bytes or bytearray with str or bytes with int. Issue an error when the option is given twice (-bb)",
-		},
-		{
-			name: "-B",
-			description:
-				"If given, Python won’t try to write .pyc files on the import of source modules",
-		},
-		{
-			name: "--check-hash-based-pycs",
-			description:
-				"Control the validation behavior of hash-based .pyc files. See Cached bytecode invalidation",
-			args: {
-				suggestions: [
-					{ name: "default" },
-					{ name: "always" },
-					{ name: "never" },
-				],
-			},
-		},
-		{
-			name: "-d",
-			description:
-				"Turn on parser debugging output (for expert only, depending on compilation options)",
-		},
-		{
-			name: "-E",
-			description:
-				"Ignore all PYTHON* environment variables, e.g. PYTHONPATH and PYTHONHOME, that might be set",
-		},
-		{
-			name: "-i",
-			description:
-				"When a script is passed as first argument or the -c option is used, enter interactive mode after executing the script or the command, even when sys.stdin does not appear to be a terminal",
-		},
-		{
-			name: "-I",
-			description:
-				"Run Python in isolated mode. This also implies -E and -s. In isolated mode sys.path contains neither the script’s directory nor the user’s site-packages directory",
-		},
-		{
-			name: "-O",
-			description:
-				"Remove assert statements and any code conditional on the value of __debug__",
-		},
-		{
-			name: "-OO",
-			description: "Do -O and also discard docstrings",
-		},
-		{
-			name: "-g",
-			description:
-				"Don’t display the copyright and version messages even in interactive mode",
-		},
-		{
-			name: "-R",
-			description:
-				"Turn on hash randomization. This option only has an effect if the PYTHONHASHSEED environment variable is set to 0, since hash randomization is enabled by default",
-		},
-		{
-			name: "-s",
-			description: "Don’t add the user site-packages directory to sys.path",
-		},
-		{
-			name: "-S",
-			description:
-				"Disable the import of the module site and the site-dependent manipulations of sys.path that it entails",
-		},
-		{
-			name: "-u",
-			description:
-				"Force the stdout and stderr streams to be unbuffered. This option has no effect on the stdin stream",
-		},
-		{
-			name: "-v",
-			description:
-				"Print a message each time a module is initialized, showing the place (filename or built-in module) from which it is loaded",
-		},
-		{
-			name: "-W",
-			description:
-				"Warning control. Python’s warning machinery by default prints warning messages to sys.stderr",
-			args: {},
-		},
-		{
-			name: "-x",
-			description:
-				"Skip the first line of the source, allowing use of non-Unix forms of #!cmd. This is intended for a DOS specific hack only",
-		},
-		{
-			name: "-X",
-			description: "Reserved for various implementation-specific options",
-			args: {
-				suggestions: [
-					{ name: "faulthandler" },
-					{ name: "showrefcount" },
-					{ name: "tracemalloc" },
-					{ name: "showalloccount" },
-					{ name: "importtime" },
-					{ name: "dev" },
-					{ name: "utf8" },
-					{ name: "pycache_prefix=PATH" },
-				],
-			},
-		},
-	],
+  name: "python",
+  description: "Run the python interpreter",
+  generateSpec: async (tokens, executeShellCommand) => {
+    const isDjangoManagePyFilePresentCommand = "cat manage.py | grep -q django";
+    if (
+      (
+        await executeShellCommand({
+          command: "bash",
+          args: ["-c", isDjangoManagePyFilePresentCommand],
+        })
+      ).status === 0
+    ) {
+      return {
+        name: "python",
+        subcommands: [{ name: "manage.py", loadSpec: "django-admin" }],
+      };
+    }
+  },
+  args: {
+    name: "python script",
+    isScript: true,
+    generators: filepaths({
+      extensions: ["py"],
+      editFileSuggestions: { priority: 76 },
+    }),
+  },
+  options: [
+    {
+      name: "-c",
+      insertValue: "-c '{cursor}'",
+      description:
+        "Execute the Python code in command. command can be one or more statements separated by newlines, with significant leading whitespace as in normal module code",
+      args: {
+        name: "command",
+        isCommand: true,
+      },
+    },
+    {
+      name: "-m",
+      description: "Module",
+      args: {
+        name: "python module",
+        isModule: "python/",
+        suggestions: ["http.server"],
+      },
+    },
+    {
+      name: ["-?", "-h", "--help"],
+      description: "Print a short description of all command line options",
+    },
+    {
+      name: ["-V", "--version"],
+      description: "Print the Python version number and exit",
+    },
+    {
+      name: "-b",
+      description:
+        "Issue a warning when comparing bytes or bytearray with str or bytes with int. Issue an error when the option is given twice (-bb)",
+    },
+    {
+      name: "-B",
+      description:
+        "If given, Python won’t try to write .pyc files on the import of source modules",
+    },
+    {
+      name: "--check-hash-based-pycs",
+      description:
+        "Control the validation behavior of hash-based .pyc files. See Cached bytecode invalidation",
+      args: {
+        suggestions: [
+          { name: "default" },
+          { name: "always" },
+          { name: "never" },
+        ],
+      },
+    },
+    {
+      name: "-d",
+      description:
+        "Turn on parser debugging output (for expert only, depending on compilation options)",
+    },
+    {
+      name: "-E",
+      description:
+        "Ignore all PYTHON* environment variables, e.g. PYTHONPATH and PYTHONHOME, that might be set",
+    },
+    {
+      name: "-i",
+      description:
+        "When a script is passed as first argument or the -c option is used, enter interactive mode after executing the script or the command, even when sys.stdin does not appear to be a terminal",
+    },
+    {
+      name: "-I",
+      description:
+        "Run Python in isolated mode. This also implies -E and -s. In isolated mode sys.path contains neither the script’s directory nor the user’s site-packages directory",
+    },
+    {
+      name: "-O",
+      description:
+        "Remove assert statements and any code conditional on the value of __debug__",
+    },
+    {
+      name: "-OO",
+      description: "Do -O and also discard docstrings",
+    },
+    {
+      name: "-g",
+      description:
+        "Don’t display the copyright and version messages even in interactive mode",
+    },
+    {
+      name: "-R",
+      description:
+        "Turn on hash randomization. This option only has an effect if the PYTHONHASHSEED environment variable is set to 0, since hash randomization is enabled by default",
+    },
+    {
+      name: "-s",
+      description: "Don’t add the user site-packages directory to sys.path",
+    },
+    {
+      name: "-S",
+      description:
+        "Disable the import of the module site and the site-dependent manipulations of sys.path that it entails",
+    },
+    {
+      name: "-u",
+      description:
+        "Force the stdout and stderr streams to be unbuffered. This option has no effect on the stdin stream",
+    },
+    {
+      name: "-v",
+      description:
+        "Print a message each time a module is initialized, showing the place (filename or built-in module) from which it is loaded",
+    },
+    {
+      name: "-W",
+      description:
+        "Warning control. Python’s warning machinery by default prints warning messages to sys.stderr",
+      args: {},
+    },
+    {
+      name: "-x",
+      description:
+        "Skip the first line of the source, allowing use of non-Unix forms of #!cmd. This is intended for a DOS specific hack only",
+    },
+    {
+      name: "-X",
+      description: "Reserved for various implementation-specific options",
+      args: {
+        suggestions: [
+          { name: "faulthandler" },
+          { name: "showrefcount" },
+          { name: "tracemalloc" },
+          { name: "showalloccount" },
+          { name: "importtime" },
+          { name: "dev" },
+          { name: "utf8" },
+          { name: "pycache_prefix=PATH" },
+        ],
+      },
+    },
+  ],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/python3.ts b/extensions/terminal-suggest/src/completions/upstream/python3.ts
index 7e08e0a20f90..37aab70947d2 100644
--- a/extensions/terminal-suggest/src/completions/upstream/python3.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/python3.ts
@@ -1,170 +1,170 @@
 import { filepaths } from '../../helpers/filepaths';
 
 const completionSpec: Fig.Spec = {
-	name: "python3",
-	description: "Run the python interpreter",
-	generateSpec: async (tokens, executeShellCommand) => {
-		const isDjangoManagePyFilePresentCommand = "cat manage.py | grep -q django";
+  name: "python3",
+  description: "Run the python interpreter",
+  generateSpec: async (tokens, executeShellCommand) => {
+    const isDjangoManagePyFilePresentCommand = "cat manage.py | grep -q django";
 
-		if (
-			(
-				await executeShellCommand({
-					command: "bash",
-					args: ["-c", isDjangoManagePyFilePresentCommand],
-				})
-			).status === 0
-		) {
-			return {
-				name: "python3",
-				subcommands: [{ name: "manage.py", loadSpec: "django-admin" }],
-			};
-		}
-	},
-	args: {
-		name: "python script",
-		isScript: true,
-		generators: filepaths({
-			extensions: ["py"],
-			editFileSuggestions: { priority: 76 },
-		}),
-	},
-	options: [
-		{
-			name: "-c",
-			insertValue: "-c '{cursor}'",
-			description:
-				"Execute the Python code in command. command can be one or more statements separated by newlines, with significant leading whitespace as in normal module code",
-			args: {
-				name: "command",
-				isCommand: true,
-			},
-		},
-		{
-			name: "-m",
-			insertValue: "-m '{cursor}'",
-			description:
-				"Search sys.path for the named module and execute its contents as the __main__ module",
-			args: {
-				name: "command",
-				isCommand: true,
-			},
-		},
-		{
-			name: ["-?", "-h", "--help"],
-			description: "Print a short description of all command line options",
-		},
-		{
-			name: ["-V", "--version"],
-			description: "Print the Python version number and exit",
-		},
-		{
-			name: "-b",
-			description:
-				"Issue a warning when comparing bytes or bytearray with str or bytes with int. Issue an error when the option is given twice (-bb)",
-		},
-		{
-			name: "-B",
-			description:
-				"If given, Python won’t try to write .pyc files on the import of source modules",
-		},
-		{
-			name: "--check-hash-based-pycs",
-			description:
-				"Control the validation behavior of hash-based .pyc files. See Cached bytecode invalidation",
-			args: {
-				suggestions: [
-					{ name: "default" },
-					{ name: "always" },
-					{ name: "never" },
-				],
-			},
-		},
-		{
-			name: "-d",
-			description:
-				"Turn on parser debugging output (for expert only, depending on compilation options)",
-		},
-		{
-			name: "-E",
-			description:
-				"Ignore all PYTHON* environment variables, e.g. PYTHONPATH and PYTHONHOME, that might be set",
-		},
-		{
-			name: "-i",
-			description:
-				"When a script is passed as first argument or the -c option is used, enter interactive mode after executing the script or the command, even when sys.stdin does not appear to be a terminal",
-		},
-		{
-			name: "-I",
-			description:
-				"Run Python in isolated mode. This also implies -E and -s. In isolated mode sys.path contains neither the script’s directory nor the user’s site-packages directory",
-		},
-		{
-			name: "-O",
-			description:
-				"Remove assert statements and any code conditional on the value of __debug__",
-		},
-		{
-			name: "-OO",
-			description: "Do -O and also discard docstrings",
-		},
-		{
-			name: "-g",
-			description:
-				"Don’t display the copyright and version messages even in interactive mode",
-		},
-		{
-			name: "-R",
-			description:
-				"Turn on hash randomization. This option only has an effect if the PYTHONHASHSEED environment variable is set to 0, since hash randomization is enabled by default",
-		},
-		{
-			name: "-s",
-			description: "Don’t add the user site-packages directory to sys.path",
-		},
-		{
-			name: "-S",
-			description:
-				"Disable the import of the module site and the site-dependent manipulations of sys.path that it entails",
-		},
-		{
-			name: "-u",
-			description:
-				"Force the stdout and stderr streams to be unbuffered. This option has no effect on the stdin stream",
-		},
-		{
-			name: "-v",
-			description:
-				"Print a message each time a module is initialized, showing the place (filename or built-in module) from which it is loaded",
-		},
-		{
-			name: "-W",
-			description:
-				"Warning control. Python’s warning machinery by default prints warning messages to sys.stderr",
-			args: {},
-		},
-		{
-			name: "-x",
-			description:
-				"Skip the first line of the source, allowing use of non-Unix forms of #!cmd. This is intended for a DOS specific hack only",
-		},
-		{
-			name: "-X",
-			description: "Reserved for various implementation-specific options",
-			args: {
-				suggestions: [
-					{ name: "faulthandler" },
-					{ name: "showrefcount" },
-					{ name: "tracemalloc" },
-					{ name: "showalloccount" },
-					{ name: "importtime" },
-					{ name: "dev" },
-					{ name: "utf8" },
-					{ name: "pycache_prefix=PATH" },
-				],
-			},
-		},
-	],
+    if (
+      (
+        await executeShellCommand({
+          command: "bash",
+          args: ["-c", isDjangoManagePyFilePresentCommand],
+        })
+      ).status === 0
+    ) {
+      return {
+        name: "python3",
+        subcommands: [{ name: "manage.py", loadSpec: "django-admin" }],
+      };
+    }
+  },
+  args: {
+    name: "python script",
+    isScript: true,
+    generators: filepaths({
+      extensions: ["py"],
+      editFileSuggestions: { priority: 76 },
+    }),
+  },
+  options: [
+    {
+      name: "-c",
+      insertValue: "-c '{cursor}'",
+      description:
+        "Execute the Python code in command. command can be one or more statements separated by newlines, with significant leading whitespace as in normal module code",
+      args: {
+        name: "command",
+        isCommand: true,
+      },
+    },
+    {
+      name: "-m",
+      insertValue: "-m '{cursor}'",
+      description:
+        "Search sys.path for the named module and execute its contents as the __main__ module",
+      args: {
+        name: "command",
+        isCommand: true,
+      },
+    },
+    {
+      name: ["-?", "-h", "--help"],
+      description: "Print a short description of all command line options",
+    },
+    {
+      name: ["-V", "--version"],
+      description: "Print the Python version number and exit",
+    },
+    {
+      name: "-b",
+      description:
+        "Issue a warning when comparing bytes or bytearray with str or bytes with int. Issue an error when the option is given twice (-bb)",
+    },
+    {
+      name: "-B",
+      description:
+        "If given, Python won’t try to write .pyc files on the import of source modules",
+    },
+    {
+      name: "--check-hash-based-pycs",
+      description:
+        "Control the validation behavior of hash-based .pyc files. See Cached bytecode invalidation",
+      args: {
+        suggestions: [
+          { name: "default" },
+          { name: "always" },
+          { name: "never" },
+        ],
+      },
+    },
+    {
+      name: "-d",
+      description:
+        "Turn on parser debugging output (for expert only, depending on compilation options)",
+    },
+    {
+      name: "-E",
+      description:
+        "Ignore all PYTHON* environment variables, e.g. PYTHONPATH and PYTHONHOME, that might be set",
+    },
+    {
+      name: "-i",
+      description:
+        "When a script is passed as first argument or the -c option is used, enter interactive mode after executing the script or the command, even when sys.stdin does not appear to be a terminal",
+    },
+    {
+      name: "-I",
+      description:
+        "Run Python in isolated mode. This also implies -E and -s. In isolated mode sys.path contains neither the script’s directory nor the user’s site-packages directory",
+    },
+    {
+      name: "-O",
+      description:
+        "Remove assert statements and any code conditional on the value of __debug__",
+    },
+    {
+      name: "-OO",
+      description: "Do -O and also discard docstrings",
+    },
+    {
+      name: "-g",
+      description:
+        "Don’t display the copyright and version messages even in interactive mode",
+    },
+    {
+      name: "-R",
+      description:
+        "Turn on hash randomization. This option only has an effect if the PYTHONHASHSEED environment variable is set to 0, since hash randomization is enabled by default",
+    },
+    {
+      name: "-s",
+      description: "Don’t add the user site-packages directory to sys.path",
+    },
+    {
+      name: "-S",
+      description:
+        "Disable the import of the module site and the site-dependent manipulations of sys.path that it entails",
+    },
+    {
+      name: "-u",
+      description:
+        "Force the stdout and stderr streams to be unbuffered. This option has no effect on the stdin stream",
+    },
+    {
+      name: "-v",
+      description:
+        "Print a message each time a module is initialized, showing the place (filename or built-in module) from which it is loaded",
+    },
+    {
+      name: "-W",
+      description:
+        "Warning control. Python’s warning machinery by default prints warning messages to sys.stderr",
+      args: {},
+    },
+    {
+      name: "-x",
+      description:
+        "Skip the first line of the source, allowing use of non-Unix forms of #!cmd. This is intended for a DOS specific hack only",
+    },
+    {
+      name: "-X",
+      description: "Reserved for various implementation-specific options",
+      args: {
+        suggestions: [
+          { name: "faulthandler" },
+          { name: "showrefcount" },
+          { name: "tracemalloc" },
+          { name: "showalloccount" },
+          { name: "importtime" },
+          { name: "dev" },
+          { name: "utf8" },
+          { name: "pycache_prefix=PATH" },
+        ],
+      },
+    },
+  ],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/ssh.ts b/extensions/terminal-suggest/src/completions/upstream/ssh.ts
index 9b0f5bd4e772..9e7c9b6f0e0e 100644
--- a/extensions/terminal-suggest/src/completions/upstream/ssh.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/ssh.ts
@@ -1,447 +1,447 @@
 const knownHostRegex = /(?:[a-zA-Z0-9-]+\.)+[a-zA-Z0-9]+/; // will match numerical IPs as well as domains/subdomains
 
 const resolveAbsolutePath = (
-	path: string,
-	basePath: string,
-	home: string
+  path: string,
+  basePath: string,
+  home: string
 ): string => {
-	if (path.startsWith("/") || path.startsWith("~/") || path === "~") {
-		return path.replace("~", home);
-	}
-	if (
-		basePath.startsWith("/") ||
-		basePath.startsWith("~/") ||
-		basePath === "~"
-	) {
-		return (
-			basePath.replace("~", home) +
-			(basePath.replace("~", home).endsWith("/") ? "" : "/") +
-			path
-		);
-	}
-	return basePath + (basePath.endsWith("/") ? "" : "/") + path;
+  if (path.startsWith("/") || path.startsWith("~/") || path === "~") {
+    return path.replace("~", home);
+  }
+  if (
+    basePath.startsWith("/") ||
+    basePath.startsWith("~/") ||
+    basePath === "~"
+  ) {
+    return (
+      basePath.replace("~", home) +
+      (basePath.replace("~", home).endsWith("/") ? "" : "/") +
+      path
+    );
+  }
+  return basePath + (basePath.endsWith("/") ? "" : "/") + path;
 };
 
 const getConfigLines = async (
-	file: string,
-	executeShellCommand: Fig.ExecuteCommandFunction,
-	home: string,
-	basePath: string
+  file: string,
+  executeShellCommand: Fig.ExecuteCommandFunction,
+  home: string,
+  basePath: string
 ) => {
-	const absolutePath = resolveAbsolutePath(file, basePath, home);
+  const absolutePath = resolveAbsolutePath(file, basePath, home);
 
-	const { stdout } = await executeShellCommand({
-		command: "cat",
-		// eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
-		args: [absolutePath],
-	});
-	const configLines = stdout.split("\n").map((line) => line.trim());
+  const { stdout } = await executeShellCommand({
+    command: "cat",
+    // eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
+    args: [absolutePath],
+  });
+  const configLines = stdout.split("\n").map((line) => line.trim());
 
-	// Get list of includes in the config file
-	const includes = configLines
-		.filter((line) => line.toLowerCase().startsWith("include "))
-		.map((line) => line.split(" ")[1]);
+  // Get list of includes in the config file
+  const includes = configLines
+    .filter((line) => line.toLowerCase().startsWith("include "))
+    .map((line) => line.split(" ")[1]);
 
-	// Get the lines of every include file
-	const includeLines: any = await Promise.all(
-		includes.map((file) =>
-			getConfigLines(file, executeShellCommand, home, basePath)
-		)
-	);
+  // Get the lines of every include file
+  const includeLines: any = await Promise.all(
+    includes.map((file) =>
+      getConfigLines(file, executeShellCommand, home, basePath)
+    )
+  );
 
-	// Combine config lines with includes config lines
-	return [...configLines, ...includeLines.flat()];
+  // Combine config lines with includes config lines
+  return [...configLines, ...includeLines.flat()];
 };
 
 export const knownHosts: Fig.Generator = {
-	custom: async (tokens, executeCommand, context) => {
-		const { stdout } = await executeCommand({
-			command: "cat",
-			// eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
-			args: [`${context.environmentVariables["HOME"]}/.ssh/known_hosts`],
-		});
+  custom: async (tokens, executeCommand, context) => {
+    const { stdout } = await executeCommand({
+      command: "cat",
+      // eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
+      args: [`${context.environmentVariables["HOME"]}/.ssh/known_hosts`],
+    });
 
-		return stdout
-			.split("\n")
-			.map((line) => {
-				const match = knownHostRegex.exec(line);
-				if (match) {
-					return String(match);
-				}
-			})
-			.filter((value, index, self) => value && self.indexOf(value) === index)
-			.map((knownHost) => ({
-				name: (tokens[1].endsWith("@") ? tokens[1] : "") + knownHost, // also suggest when user@ is provided
-				description: "SSH host",
-			}));
-	},
-	trigger: "@",
+    return stdout
+      .split("\n")
+      .map((line) => {
+        const match = knownHostRegex.exec(line);
+        if (match) {
+          return String(match);
+        }
+      })
+      .filter((value, index, self) => value && self.indexOf(value) === index)
+      .map((knownHost) => ({
+        name: (tokens[1].endsWith("@") ? tokens[1] : "") + knownHost, // also suggest when user@ is provided
+        description: "SSH host",
+      }));
+  },
+  trigger: "@",
 };
 
 export const configHosts: Fig.Generator = {
-	custom: async (tokens, executeShellCommand, context) => {
-		const configLines = await getConfigLines(
-			"config",
-			executeShellCommand,
-			context.environmentVariables["HOME"],
-			"~/.ssh"
-		);
+  custom: async (tokens, executeShellCommand, context) => {
+    const configLines = await getConfigLines(
+      "config",
+      executeShellCommand,
+      context.environmentVariables["HOME"],
+      "~/.ssh"
+    );
 
-		return configLines
-			.filter(
-				(line: any) =>
-					line.trim().toLowerCase().startsWith("host ") && !line.includes("*")
-			)
-			.map((host: any) => ({
-				name: host.split(" ")[1],
-				description: "SSH host",
-				priority: 90,
-			}));
-	},
+    return configLines
+      .filter(
+        (line) =>
+          line.trim().toLowerCase().startsWith("host ") && !line.includes("*")
+      )
+      .map((host) => ({
+        name: host.split(" ")[1],
+        description: "SSH host",
+        priority: 90,
+      }));
+  },
 };
 
 const completionSpec: Fig.Spec = {
-	name: "ssh",
-	description: "Log into a remote machine",
-	args: {
-		name: "user@hostname",
-		description: "Address of remote machine to log into",
-		generators: [knownHosts, configHosts, { template: "history" }],
-	},
-	options: [
-		{
-			name: "-1",
-			description: "Forces ssh to try protocol version 1 only",
-		},
-		{
-			name: "-2",
-			description: "Forces ssh to try protocol version 2 only",
-		},
-		{
-			name: "-4",
-			description: "Forces ssh to use IPv4 addresses only",
-		},
-		{
-			name: "-6",
-			description: "Forces ssh to use IPv6 addresses only",
-		},
-		{
-			name: "-A",
-			description: "Enables forwarding of the authentication agent connection",
-		},
-		{
-			name: "-a",
-			description: "Disables forwarding of the authentication agent connection",
-		},
-		{
-			name: "-b",
-			description:
-				"Use bind_address on the local machine as the source address of the connection",
-			args: {
-				name: "bind address",
-				description: "Source address of the connection",
-			},
-		},
-		{
-			name: "-C",
-			description:
-				"Requests compression of all data (including stdin, stdout, stderr, and data for forwarded X11 and TCP connections)",
-		},
-		{
-			name: "-c",
-			description:
-				"Selects the cipher specification for encrypting the session",
-			args: {
-				name: "cipher spec",
-				description: "The selected cipher specification",
-			},
-		},
-		{
-			name: "-D",
-			description:
-				"Specifies a local 'dynamic' application-level port forwarding",
-			args: {
-				name: "port",
-				description: "Port of the bind address",
-			},
-		},
-		{
-			name: "-e",
-			description:
-				"Sets the escape character for sessions with a pty (default: '~')",
-			args: {
-				name: "escape char",
-				description: "Specified escape character",
-			},
-		},
-		{
-			name: "-F",
-			description: "Specifies an alternative per-user configuration file",
-			args: {
-				name: "configfile",
-				description: "Path to alternative config file",
-				template: "filepaths",
-			},
-		},
-		{
-			name: "-f",
-			description:
-				"Requests ssh to go to background just before command execution",
-		},
-		{
-			name: "-g",
-			description: "Allows remote hosts to connect to local forwarded ports",
-		},
-		{
-			name: "-I",
-			description:
-				"Specify the PKCS#11 shared library ssh should use to communicate with a PKCS#11 token providing the user's private RSA key",
-			args: {
-				name: "pkcs11",
-			},
-		},
-		{
-			name: "-i",
-			description:
-				"Selects a file from which the identity (private key) for public key authentication is read",
-			isRepeatable: true,
-			args: {
-				name: "identity file",
-				description: "Path to identity (private key)",
-				template: "filepaths",
-			},
-		},
-		{
-			name: "-K",
-			description:
-				"Enables GSSAPI-based authentication and forwarding (delegation) of GSSAPI credentials to the server",
-		},
-		{
-			name: "-k",
-			description:
-				"Disables forwarding (delegation) of GSSAPI credentials to the server",
-		},
-		{
-			name: "-L",
-			description:
-				"Specifies that the given port on the local (client) host is to be forwarded to the given host and port on the remote side",
-			args: {
-				name: "port:host:hostport",
-				description: "Local port, followed by host and host port to forward to",
-			},
-		},
-		{
-			name: "-l",
-			description: "Specifies the user to log in as on the remote machine",
-			args: {
-				name: "login name",
-				description: "Name of user logging into remote machine",
-			},
-		},
-		{
-			name: "-M",
-			description:
-				"Places the ssh client into ``master'' mode for connection sharing",
-			isRepeatable: true,
-		},
-		{
-			name: "-m",
-			description:
-				"Additionally, for protocol version 2 a comma-separated list of MAC (message authentication code) algorithms can be specified in order of preference",
-			args: {
-				name: "mac spec",
-			},
-		},
-		{
-			name: "-N",
-			description: "Do not execute a remote command",
-		},
-		{
-			name: "-n",
-			description:
-				"Redirects stdin from /dev/null (actually, prevents reading from stdin)",
-		},
-		{
-			name: "-O",
-			description: "Control an active connection multiplexing master process",
-			args: {
-				name: "ctl cmd",
-				description: "Command that's passed to the master process",
-			},
-		},
-		{
-			name: "-o",
-			description:
-				"Can be used to give options in the format used in the configuration file",
-			isRepeatable: true,
-			args: {
-				name: "option",
-				description:
-					"Options that can be specified in the format of the config file",
-				suggestions: [
-					{ name: "AddressFamily" },
-					{ name: "BatchMode" },
-					{ name: "BindAddress" },
-					{ name: "ChallengeResponseAuthentication" },
-					{ name: "CheckHostIP" },
-					{ name: "Cipher" },
-					{ name: "Ciphers" },
-					{ name: "ClearAllForwardings" },
-					{ name: "Compression" },
-					{ name: "CompressionLevel" },
-					{ name: "ConnectionAttempts" },
-					{ name: "ConnectTimeout" },
-					{ name: "ControlMaster" },
-					{ name: "ControlPath" },
-					{ name: "ControlPersist" },
-					{ name: "DynamicForward" },
-					{ name: "EscapeChar" },
-					{ name: "ExitOnForwardFailure" },
-					{ name: "ForwardAgent" },
-					{ name: "ForwardX11" },
-					{ name: "ForwardX11Timeout" },
-					{ name: "ForwardX11Trusted" },
-					{ name: "GatewayPorts" },
-					{ name: "GlobalKnownHostsFile" },
-					{ name: "GSSAPIAuthentication" },
-					{ name: "GSSAPIDelegateCredentials" },
-					{ name: "HashKnownHosts" },
-					{ name: "Host" },
-					{ name: "HostbasedAuthentication" },
-					{ name: "HostKeyAlgorithms" },
-					{ name: "HostKeyAlias" },
-					{ name: "HostName" },
-					{ name: "IdentityFile" },
-					{ name: "IdentitiesOnly" },
-					{ name: "IPQoS" },
-					{ name: "KbdInteractiveAuthentication" },
-					{ name: "KbdInteractiveDevices" },
-					{ name: "KexAlgorithms" },
-					{ name: "LocalCommand" },
-					{ name: "LocalForward" },
-					{ name: "LogLevel" },
-					{ name: "MACs" },
-					{ name: "NoHostAuthenticationForLocalhost" },
-					{ name: "NumberOfPasswordPrompts" },
-					{ name: "PasswordAuthentication" },
-					{ name: "PermitLocalCommand" },
-					{ name: "PKCS11Provider" },
-					{ name: "Port" },
-					{ name: "PreferredAuthentications" },
-					{ name: "Protocol" },
-					{ name: "ProxyCommand" },
-					{ name: "PubkeyAuthentication" },
-					{ name: "RekeyLimit" },
-					{ name: "RequestTTY" },
-					{ name: "RhostsRSAAuthentication" },
-					{ name: "RSAAuthentication" },
-					{ name: "SendEnv" },
-					{ name: "ServerAliveInterval" },
-					{ name: "ServerAliveCountMax" },
-					{ name: "StrictHostKeyChecking" },
-					{ name: "TCPKeepAlive" },
-					{ name: "Tunnel" },
-					{ name: "TunnelDevice" },
-					{ name: "UsePrivilegedPort" },
-					{ name: "User" },
-					{ name: "UserKnownHostsFile" },
-					{ name: "VerifyHostKeyDNS" },
-					{ name: "VisualHostKey" },
-					{ name: "XAuthLocation" },
-				],
-			},
-		},
-		{
-			name: "-p",
-			description: "Port to connect to on the remote host",
-			args: {
-				name: "port",
-				description: "Port to connect to",
-			},
-		},
-		{
-			name: "-q",
-			description:
-				"Quiet mode.  Causes most warning and diagnostic messages to be suppressed",
-		},
-		{
-			name: "-R",
-			description:
-				"Specifies that the given port on the remote (server) host is to be forwarded to the given host and port on the local side",
-			args: {
-				name: "port:host:hostport",
-				description: "Local port, followed by host and host port to forward to",
-			},
-		},
-		{
-			name: "-S",
-			description:
-				"Specifies the location of a control socket for connection sharing, or the string 'none' to disable connection sharing",
-			args: {
-				name: "ctl_path",
-				description: "Location of the control socket",
-				template: "filepaths",
-			},
-		},
-		{
-			name: "-s",
-			description:
-				"May be used to request invocation of a subsystem on the remote system",
-		},
-		{
-			name: "-T",
-			description: "Disable pseudo-tty allocation",
-		},
-		{
-			name: "-t",
-			description: "Force pseudo-tty allocation",
-			isRepeatable: true,
-		},
-		{
-			name: "-V",
-			description: "Display the version number and exit",
-		},
-		{
-			name: "-v",
-			description:
-				"Verbose mode.  Causes ssh to print debugging messages about its progress",
-			isRepeatable: 3,
-		},
-		{
-			name: "-W",
-			description:
-				"Requests that standard input and output on the client be forwarded to host on port over the secure channel",
-			args: {
-				name: "host:port",
-				description: "Host and port to forward to",
-			},
-		},
-		{
-			name: "-w",
-			description:
-				"Requests tunnel device forwarding with the specified tun(4) devices between the client (local_tun) and the server (remote_tun)",
-			args: {
-				name: "local tun",
-				description: "Local device to forward to",
-			},
-		},
-		{
-			name: "-X",
-			description: "Enables X11 forwarding",
-		},
-		{
-			name: "-x",
-			description: "Disables X11 forwarding",
-		},
-		{
-			name: "-Y",
-			description: "Enables trusted X11 forwarding",
-		},
-		{
-			name: "-y",
-			description: "Send log information using the syslog(3) system module",
-		},
-	],
+  name: "ssh",
+  description: "Log into a remote machine",
+  args: {
+    name: "user@hostname",
+    description: "Address of remote machine to log into",
+    generators: [knownHosts, configHosts, { template: "history" }],
+  },
+  options: [
+    {
+      name: "-1",
+      description: "Forces ssh to try protocol version 1 only",
+    },
+    {
+      name: "-2",
+      description: "Forces ssh to try protocol version 2 only",
+    },
+    {
+      name: "-4",
+      description: "Forces ssh to use IPv4 addresses only",
+    },
+    {
+      name: "-6",
+      description: "Forces ssh to use IPv6 addresses only",
+    },
+    {
+      name: "-A",
+      description: "Enables forwarding of the authentication agent connection",
+    },
+    {
+      name: "-a",
+      description: "Disables forwarding of the authentication agent connection",
+    },
+    {
+      name: "-b",
+      description:
+        "Use bind_address on the local machine as the source address of the connection",
+      args: {
+        name: "bind address",
+        description: "Source address of the connection",
+      },
+    },
+    {
+      name: "-C",
+      description:
+        "Requests compression of all data (including stdin, stdout, stderr, and data for forwarded X11 and TCP connections)",
+    },
+    {
+      name: "-c",
+      description:
+        "Selects the cipher specification for encrypting the session",
+      args: {
+        name: "cipher spec",
+        description: "The selected cipher specification",
+      },
+    },
+    {
+      name: "-D",
+      description:
+        "Specifies a local 'dynamic' application-level port forwarding",
+      args: {
+        name: "port",
+        description: "Port of the bind address",
+      },
+    },
+    {
+      name: "-e",
+      description:
+        "Sets the escape character for sessions with a pty (default: '~')",
+      args: {
+        name: "escape char",
+        description: "Specified escape character",
+      },
+    },
+    {
+      name: "-F",
+      description: "Specifies an alternative per-user configuration file",
+      args: {
+        name: "configfile",
+        description: "Path to alternative config file",
+        template: "filepaths",
+      },
+    },
+    {
+      name: "-f",
+      description:
+        "Requests ssh to go to background just before command execution",
+    },
+    {
+      name: "-g",
+      description: "Allows remote hosts to connect to local forwarded ports",
+    },
+    {
+      name: "-I",
+      description:
+        "Specify the PKCS#11 shared library ssh should use to communicate with a PKCS#11 token providing the user's private RSA key",
+      args: {
+        name: "pkcs11",
+      },
+    },
+    {
+      name: "-i",
+      description:
+        "Selects a file from which the identity (private key) for public key authentication is read",
+      isRepeatable: true,
+      args: {
+        name: "identity file",
+        description: "Path to identity (private key)",
+        template: "filepaths",
+      },
+    },
+    {
+      name: "-K",
+      description:
+        "Enables GSSAPI-based authentication and forwarding (delegation) of GSSAPI credentials to the server",
+    },
+    {
+      name: "-k",
+      description:
+        "Disables forwarding (delegation) of GSSAPI credentials to the server",
+    },
+    {
+      name: "-L",
+      description:
+        "Specifies that the given port on the local (client) host is to be forwarded to the given host and port on the remote side",
+      args: {
+        name: "port:host:hostport",
+        description: "Local port, followed by host and host port to forward to",
+      },
+    },
+    {
+      name: "-l",
+      description: "Specifies the user to log in as on the remote machine",
+      args: {
+        name: "login name",
+        description: "Name of user logging into remote machine",
+      },
+    },
+    {
+      name: "-M",
+      description:
+        "Places the ssh client into ``master'' mode for connection sharing",
+      isRepeatable: true,
+    },
+    {
+      name: "-m",
+      description:
+        "Additionally, for protocol version 2 a comma-separated list of MAC (message authentication code) algorithms can be specified in order of preference",
+      args: {
+        name: "mac spec",
+      },
+    },
+    {
+      name: "-N",
+      description: "Do not execute a remote command",
+    },
+    {
+      name: "-n",
+      description:
+        "Redirects stdin from /dev/null (actually, prevents reading from stdin)",
+    },
+    {
+      name: "-O",
+      description: "Control an active connection multiplexing master process",
+      args: {
+        name: "ctl cmd",
+        description: "Command that's passed to the master process",
+      },
+    },
+    {
+      name: "-o",
+      description:
+        "Can be used to give options in the format used in the configuration file",
+      isRepeatable: true,
+      args: {
+        name: "option",
+        description:
+          "Options that can be specified in the format of the config file",
+        suggestions: [
+          { name: "AddressFamily" },
+          { name: "BatchMode" },
+          { name: "BindAddress" },
+          { name: "ChallengeResponseAuthentication" },
+          { name: "CheckHostIP" },
+          { name: "Cipher" },
+          { name: "Ciphers" },
+          { name: "ClearAllForwardings" },
+          { name: "Compression" },
+          { name: "CompressionLevel" },
+          { name: "ConnectionAttempts" },
+          { name: "ConnectTimeout" },
+          { name: "ControlMaster" },
+          { name: "ControlPath" },
+          { name: "ControlPersist" },
+          { name: "DynamicForward" },
+          { name: "EscapeChar" },
+          { name: "ExitOnForwardFailure" },
+          { name: "ForwardAgent" },
+          { name: "ForwardX11" },
+          { name: "ForwardX11Timeout" },
+          { name: "ForwardX11Trusted" },
+          { name: "GatewayPorts" },
+          { name: "GlobalKnownHostsFile" },
+          { name: "GSSAPIAuthentication" },
+          { name: "GSSAPIDelegateCredentials" },
+          { name: "HashKnownHosts" },
+          { name: "Host" },
+          { name: "HostbasedAuthentication" },
+          { name: "HostKeyAlgorithms" },
+          { name: "HostKeyAlias" },
+          { name: "HostName" },
+          { name: "IdentityFile" },
+          { name: "IdentitiesOnly" },
+          { name: "IPQoS" },
+          { name: "KbdInteractiveAuthentication" },
+          { name: "KbdInteractiveDevices" },
+          { name: "KexAlgorithms" },
+          { name: "LocalCommand" },
+          { name: "LocalForward" },
+          { name: "LogLevel" },
+          { name: "MACs" },
+          { name: "NoHostAuthenticationForLocalhost" },
+          { name: "NumberOfPasswordPrompts" },
+          { name: "PasswordAuthentication" },
+          { name: "PermitLocalCommand" },
+          { name: "PKCS11Provider" },
+          { name: "Port" },
+          { name: "PreferredAuthentications" },
+          { name: "Protocol" },
+          { name: "ProxyCommand" },
+          { name: "PubkeyAuthentication" },
+          { name: "RekeyLimit" },
+          { name: "RequestTTY" },
+          { name: "RhostsRSAAuthentication" },
+          { name: "RSAAuthentication" },
+          { name: "SendEnv" },
+          { name: "ServerAliveInterval" },
+          { name: "ServerAliveCountMax" },
+          { name: "StrictHostKeyChecking" },
+          { name: "TCPKeepAlive" },
+          { name: "Tunnel" },
+          { name: "TunnelDevice" },
+          { name: "UsePrivilegedPort" },
+          { name: "User" },
+          { name: "UserKnownHostsFile" },
+          { name: "VerifyHostKeyDNS" },
+          { name: "VisualHostKey" },
+          { name: "XAuthLocation" },
+        ],
+      },
+    },
+    {
+      name: "-p",
+      description: "Port to connect to on the remote host",
+      args: {
+        name: "port",
+        description: "Port to connect to",
+      },
+    },
+    {
+      name: "-q",
+      description:
+        "Quiet mode.  Causes most warning and diagnostic messages to be suppressed",
+    },
+    {
+      name: "-R",
+      description:
+        "Specifies that the given port on the remote (server) host is to be forwarded to the given host and port on the local side",
+      args: {
+        name: "port:host:hostport",
+        description: "Local port, followed by host and host port to forward to",
+      },
+    },
+    {
+      name: "-S",
+      description:
+        "Specifies the location of a control socket for connection sharing, or the string 'none' to disable connection sharing",
+      args: {
+        name: "ctl_path",
+        description: "Location of the control socket",
+        template: "filepaths",
+      },
+    },
+    {
+      name: "-s",
+      description:
+        "May be used to request invocation of a subsystem on the remote system",
+    },
+    {
+      name: "-T",
+      description: "Disable pseudo-tty allocation",
+    },
+    {
+      name: "-t",
+      description: "Force pseudo-tty allocation",
+      isRepeatable: true,
+    },
+    {
+      name: "-V",
+      description: "Display the version number and exit",
+    },
+    {
+      name: "-v",
+      description:
+        "Verbose mode.  Causes ssh to print debugging messages about its progress",
+      isRepeatable: 3,
+    },
+    {
+      name: "-W",
+      description:
+        "Requests that standard input and output on the client be forwarded to host on port over the secure channel",
+      args: {
+        name: "host:port",
+        description: "Host and port to forward to",
+      },
+    },
+    {
+      name: "-w",
+      description:
+        "Requests tunnel device forwarding with the specified tun(4) devices between the client (local_tun) and the server (remote_tun)",
+      args: {
+        name: "local tun",
+        description: "Local device to forward to",
+      },
+    },
+    {
+      name: "-X",
+      description: "Enables X11 forwarding",
+    },
+    {
+      name: "-x",
+      description: "Disables X11 forwarding",
+    },
+    {
+      name: "-Y",
+      description: "Enables trusted X11 forwarding",
+    },
+    {
+      name: "-y",
+      description: "Send log information using the syslog(3) system module",
+    },
+  ],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/yarn.ts b/extensions/terminal-suggest/src/completions/upstream/yarn.ts
index a3de493a1b3b..f3f7a81d90f8 100644
--- a/extensions/terminal-suggest/src/completions/upstream/yarn.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/yarn.ts
@@ -1,1674 +1,1674 @@
 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;
-	},
+  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",
+  "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"],
-		});
+  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`],
-		});
+    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 [];
+    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),
-			];
+    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)
-			);
+      const filteredDependencies = dependencies.filter(
+        (dependency) => !tokens.includes(dependency)
+      );
 
-			return filteredDependencies.map((dependencyName) => ({
-				name: dependencyName,
-				icon: "📦",
-			}));
-		} catch (e) { }
+      return filteredDependencies.map((dependencyName) => ({
+        name: dependencyName,
+        icon: "📦",
+      }));
+    } catch (e) {}
 
-		return [];
-	},
+    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 [];
+  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 [];
-	},
+    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 [];
-		}
+  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) { }
+    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 [];
-	},
+    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 [];
-		}
+  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);
+    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 [];
-		}
-	},
+      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" },
-	},
+  { 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: any) =>
-					({
-						name: item.package.name.substring(7),
-						description: item.package.description,
-					}) as Fig.Suggestion
-			) as Fig.Suggestion[];
-		} catch (e) {
-			return [];
-		}
-	},
+  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: any) =>
+          ({
+            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");
+  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",
-			}));
+    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.");
+    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 getWorkspacesDefinitionsV1 = async () => {
+          const { stdout } = await executeShellCommand({
+            command: "yarn",
+            args: ["workspaces", "info"],
+          });
 
-					const startJson = stdout.indexOf("{");
-					const endJson = stdout.lastIndexOf("}");
+          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,
-					}));
-				};
+          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()));
-				};
+        // 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();
+        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 [];
-									},
-								},
-							},
-						})
-					);
+          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",
-						},
-					],
-				},
-			],
-		},
-	],
+          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 91e0dfa107a3..25ada5a06aa2 100644
--- a/extensions/terminal-suggest/src/constants.ts
+++ b/extensions/terminal-suggest/src/constants.ts
@@ -46,7 +46,6 @@ export const upstreamSpecs = [
 	'pnpm',
 	'node',
 	'nvm',
-	'npx',
 ];
 
 
diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index d7e8647cca44..02046d680ed3 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -10,6 +10,7 @@ import * as vscode from 'vscode';
 import cdSpec from './completions/cd';
 import codeCompletionSpec from './completions/code';
 import codeInsidersCompletionSpec from './completions/code-insiders';
+import npxCompletionSpec from './completions/npx';
 import setLocationSpec from './completions/set-location';
 import { upstreamSpecs } from './constants';
 import { PathExecutableCache } from './env/pathExecutableCache';
@@ -50,6 +51,7 @@ export const availableSpecs: Fig.Spec[] = [
 	cdSpec,
 	codeInsidersCompletionSpec,
 	codeCompletionSpec,
+	npxCompletionSpec,
 	setLocationSpec,
 ];
 for (const spec of upstreamSpecs) {
diff --git a/extensions/terminal-suggest/tsconfig.json b/extensions/terminal-suggest/tsconfig.json
index a61b7c784693..27bfe671c9e4 100644
--- a/extensions/terminal-suggest/tsconfig.json
+++ b/extensions/terminal-suggest/tsconfig.json
@@ -10,7 +10,9 @@
 
 		// Needed to suppress warnings in upstream completions
 		"noImplicitReturns": false,
-		"noUnusedParameters": false
+		"noUnusedParameters": false,
+		"strictNullChecks": false,
+		"noUnusedLocals": false
 	},
 	"include": [
 		"src/**/*",

From 6a4e4d3db279caa7ad6a825a5fdb31840e55cbd5 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 6 Mar 2025 04:26:35 -0800
Subject: [PATCH 0675/1815] Make upstream specs readonly

---
 .vscode/settings.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 59a78245c83b..f3e04c8f8934 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -49,6 +49,7 @@
 		"out-vscode-reh/**": true,
 		"extensions/**/dist/**": true,
 		"extensions/**/out/**": true,
+		"extensions/terminal-suggest/src/completions/upstream/**": true,
 		"test/smoke/out/**": true,
 		"test/automation/out/**": true,
 		"test/integration/browser/out/**": true

From 4215782c25727720f62abcf88a3f1d0f6309003f Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 6 Mar 2025 04:31:53 -0800
Subject: [PATCH 0676/1815] Fix indentation mapping

---
 .../terminal-suggest/scripts/update-specs.js  |     2 +-
 .../src/completions/upstream/apt.ts           |   658 +-
 .../src/completions/upstream/brew.ts          |  3292 +--
 .../src/completions/upstream/cat.ts           |    92 +-
 .../src/completions/upstream/chmod.ts         |   166 +-
 .../src/completions/upstream/chown.ts         |   218 +-
 .../src/completions/upstream/cp.ts            |   150 +-
 .../src/completions/upstream/curl.ts          |  1820 +-
 .../src/completions/upstream/df.ts            |   122 +-
 .../src/completions/upstream/du.ts            |   180 +-
 .../src/completions/upstream/echo.ts          |    70 +-
 .../src/completions/upstream/find.ts          |   134 +-
 .../src/completions/upstream/git.ts           | 19428 ++++++++--------
 .../src/completions/upstream/grep.ts          |   680 +-
 .../src/completions/upstream/head.ts          |    62 +-
 .../src/completions/upstream/kill.ts          |   108 +-
 .../src/completions/upstream/killall.ts       |   290 +-
 .../src/completions/upstream/less.ts          |   560 +-
 .../src/completions/upstream/ls.ts            |   442 +-
 .../src/completions/upstream/mkdir.ts         |    66 +-
 .../src/completions/upstream/more.ts          |   102 +-
 .../src/completions/upstream/mv.ts            |    72 +-
 .../src/completions/upstream/nano.ts          |    10 +-
 .../src/completions/upstream/node.ts          |   996 +-
 .../src/completions/upstream/npm.ts           |  3054 +--
 .../src/completions/upstream/nvm.ts           |   554 +-
 .../src/completions/upstream/pnpm.ts          |  1832 +-
 .../src/completions/upstream/ps.ts            |   298 +-
 .../src/completions/upstream/pwd.ts           |    24 +-
 .../src/completions/upstream/python.ts        |   324 +-
 .../src/completions/upstream/python3.ts       |   326 +-
 .../src/completions/upstream/rm.ts            |    76 +-
 .../src/completions/upstream/rmdir.ts         |    26 +-
 .../src/completions/upstream/scp.ts           |   424 +-
 .../src/completions/upstream/ssh.ts           |   842 +-
 .../src/completions/upstream/tail.ts          |    32 +-
 .../src/completions/upstream/top.ts           |    90 +-
 .../src/completions/upstream/touch.ts         |   110 +-
 .../src/completions/upstream/uname.ts         |    64 +-
 .../src/completions/upstream/vim.ts           |   480 +-
 .../src/completions/upstream/wget.ts          |   790 +-
 .../src/completions/upstream/yarn.ts          |  3244 +--
 42 files changed, 21154 insertions(+), 21156 deletions(-)

diff --git a/extensions/terminal-suggest/scripts/update-specs.js b/extensions/terminal-suggest/scripts/update-specs.js
index 866079cd3c43..7fbac83d6c16 100644
--- a/extensions/terminal-suggest/scripts/update-specs.js
+++ b/extensions/terminal-suggest/scripts/update-specs.js
@@ -16,7 +16,7 @@ const replaceStrings = [
 		'import { filepaths } from \'../../helpers/filepaths\';'
 	],
 ];
-const indentSearch = [20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1].map(e => new RegExp('^' + ' '.repeat(e * 2), 'g'));
+const indentSearch = [20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1].map(e => new RegExp('^' + ' '.repeat(e * 2), 'gm'));
 const indentReplaceValue = [20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1].map(e => '\t'.repeat(e));
 
 const specSpecificReplaceStrings = new Map([
diff --git a/extensions/terminal-suggest/src/completions/upstream/apt.ts b/extensions/terminal-suggest/src/completions/upstream/apt.ts
index b2fe29efd719..2d44332b492d 100644
--- a/extensions/terminal-suggest/src/completions/upstream/apt.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/apt.ts
@@ -1,355 +1,355 @@
 import { filepaths } from '../../helpers/filepaths';
 
 const packages: Fig.Generator = {
-  // only trigger when the token length transitions to or from 0
-  trigger: (current, previous) =>
-    current.length === 0 || (previous.length === 0 && current.length > 0),
+	// only trigger when the token length transitions to or from 0
+	trigger: (current, previous) =>
+		current.length === 0 || (previous.length === 0 && current.length > 0),
 
-  // have to use `custom` to skip running the script when length is 0
-  custom: async (tokens, executeShellCommand) => {
-    const finalToken = tokens[tokens.length - 1];
-    if (finalToken.length === 0) {
-      return [];
-    }
-    const { stdout } = await executeShellCommand({
-      command: "apt",
-      // eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
-      args: ["list"],
-    });
+	// have to use `custom` to skip running the script when length is 0
+	custom: async (tokens, executeShellCommand) => {
+		const finalToken = tokens[tokens.length - 1];
+		if (finalToken.length === 0) {
+			return [];
+		}
+		const { stdout } = await executeShellCommand({
+			command: "apt",
+			// eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
+			args: ["list"],
+		});
 
-    // Only lines matching the first character, delete characters after '/'
-    return stdout
-      .trim()
-      .split("\n")
-      .filter((name) => name.startsWith(finalToken))
-      .map((name) => name.replace(/\/.*/, ""))
-      .map((name) => ({
-        name,
-        description: "Package",
-        icon: "📦",
-        // make the suggestions... actually show up
-        // see https://github.com/withfig/autocomplete/pull/1429#discussion_r950688126
-        priority: 50,
-      }));
-  },
+		// Only lines matching the first character, delete characters after '/'
+		return stdout
+			.trim()
+			.split("\n")
+			.filter((name) => name.startsWith(finalToken))
+			.map((name) => name.replace(/\/.*/, ""))
+			.map((name) => ({
+				name,
+				description: "Package",
+				icon: "📦",
+				// make the suggestions... actually show up
+				// see https://github.com/withfig/autocomplete/pull/1429#discussion_r950688126
+				priority: 50,
+			}));
+	},
 };
 
 const installedPackages: Fig.Generator = {
-  script: ["apt", "list", "--installed"],
-  postProcess: function (a) {
-    return a
-      .trim()
-      .split("\n")
-      .map((b) => {
-        return {
-          name: b.substring(0, b.indexOf("/")),
-          description: "Package",
-          icon: "📦",
-        };
-      });
-  },
+	script: ["apt", "list", "--installed"],
+	postProcess: function (a) {
+		return a
+			.trim()
+			.split("\n")
+			.map((b) => {
+				return {
+					name: b.substring(0, b.indexOf("/")),
+					description: "Package",
+					icon: "📦",
+				};
+			});
+	},
 };
 
 const upgradablePackages: Fig.Generator = {
-  script: ["apt", "list", "--upgradable"],
-  postProcess: function (a) {
-    return a
-      .trim()
-      .split("\n")
-      .map((b) => {
-        return {
-          name: b.substring(0, b.indexOf("/")),
-          description: "Package",
-          icon: "📦",
-        };
-      });
-  },
+	script: ["apt", "list", "--upgradable"],
+	postProcess: function (a) {
+		return a
+			.trim()
+			.split("\n")
+			.map((b) => {
+				return {
+					name: b.substring(0, b.indexOf("/")),
+					description: "Package",
+					icon: "📦",
+				};
+			});
+	},
 };
 
 const yesNoOptions: Fig.Option[] = [
-  {
-    name: "-y",
-    description: "Assume yes to all prompts",
-    exclusiveOn: ["--assume-no"],
-  },
-  {
-    name: "--assume-no",
-    description: "Assume no to all prompts",
-    exclusiveOn: ["-y"],
-  },
+	{
+		name: "-y",
+		description: "Assume yes to all prompts",
+		exclusiveOn: ["--assume-no"],
+	},
+	{
+		name: "--assume-no",
+		description: "Assume no to all prompts",
+		exclusiveOn: ["-y"],
+	},
 ];
 
 const installationOptions: Fig.Option[] = [
-  {
-    name: ["-d", "--download-only"],
-    description:
-      "For any operation that would download packages, download them, but do nothing else",
-  },
-  {
-    name: "--no-download",
-    description:
-      "Do not download packages, attempt to use already downloaded packages",
-  },
+	{
+		name: ["-d", "--download-only"],
+		description:
+			"For any operation that would download packages, download them, but do nothing else",
+	},
+	{
+		name: "--no-download",
+		description:
+			"Do not download packages, attempt to use already downloaded packages",
+	},
 ];
 
 const simulate: Fig.Option[] = [
-  {
-    name: ["-s", "--simulate"],
-    description:
-      "Simulate running this command and show it's output, without actually changing anything",
-  },
+	{
+		name: ["-s", "--simulate"],
+		description:
+			"Simulate running this command and show it's output, without actually changing anything",
+	},
 ];
 
 const completionSpec: Fig.Spec = {
-  name: "apt",
-  description: "Package manager for Debian-based Linux distributions",
-  subcommands: [
-    {
-      name: "update",
-      description: "Update the package database",
-      options: [...yesNoOptions],
-    },
-    {
-      name: "upgrade",
-      description: "Install all available upgrades",
-      args: {
-        name: "package",
-        description: "Package(s) to upgrade",
-        isVariadic: true,
-        isOptional: true,
-        generators: upgradablePackages,
-      },
-      options: [...installationOptions, ...yesNoOptions, ...simulate],
-    },
-    {
-      name: "full-upgrade",
-      description:
-        "Install available upgrades, removing currently installed packages if needed to upgrade the system as a whole",
-      options: [...installationOptions, ...yesNoOptions, ...simulate],
-    },
-    {
-      name: "install",
-      description: "Install package(s)",
-      args: {
-        name: "package",
-        description: "The package you want to install",
-        isVariadic: true,
-        generators: [packages, filepaths({ extensions: ["deb"] })],
-      },
-      options: [
-        ...installationOptions,
-        ...yesNoOptions,
-        ...simulate,
-        {
-          name: "--reinstall",
-          description: "Reinstall the package if it is already installed",
-        },
-        {
-          name: ["-f", "--fix-broken"],
-          description: "Attempt to fix broken packages",
-        },
-      ],
-    },
-    {
-      name: "reinstall",
-      description: "Reinstall package(s)",
-      args: {
-        name: "package",
-        description: "The package you want to reinstall",
-        isVariadic: true,
-        generators: installedPackages,
-      },
-      options: [...yesNoOptions, ...simulate],
-    },
-    {
-      name: "remove",
-      description: "Remove package(s)",
-      args: {
-        name: "package",
-        description: "The package you want to remove",
-        isVariadic: true,
-        generators: installedPackages,
-      },
-      options: [
-        ...yesNoOptions,
-        ...simulate,
-        {
-          name: ["-f", "--fix-broken"],
-          description: "Attempt to fix broken packages",
-        },
-      ],
-    },
-    {
-      name: "purge",
-      description: "Remove package(s) and their configuration files",
-      args: {
-        name: "package",
-        description: "The package you want to purge",
-        isVariadic: true,
-        generators: installedPackages,
-      },
-      options: [...yesNoOptions, ...simulate],
-    },
-    {
-      name: ["autoremove", "auto-remove"],
-      description: "Remove unused packages",
-      options: [...yesNoOptions, ...simulate],
-    },
-    {
-      name: "list",
-      description: "List packages",
-      options: [
-        {
-          name: "--installed",
-          description: "List installed packages",
-        },
-        {
-          name: "--upgradable",
-          description: "List upgradable packages",
-        },
-      ],
-    },
-    {
-      name: "search",
-      description: "Search for packages",
-      args: {
-        name: "query",
-        description: "The query to search for",
-      },
-      options: [...yesNoOptions],
-    },
-    {
-      name: "show",
-      description: "Show package details",
-      args: {
-        name: "package",
-        description: "The package you want to show",
-        generators: packages,
-      },
-    },
-    {
-      name: "satisfy",
-      description: "Satisfy package dependencies",
-      args: {
-        name: "package",
-        description: "The package you want to satisfy",
-        isVariadic: true,
-        generators: packages,
-      },
-      options: [...installationOptions, ...yesNoOptions, ...simulate],
-    },
-    {
-      name: "clean",
-      description: "Remove downloaded package files",
-      options: [...yesNoOptions, ...simulate],
-    },
-    {
-      name: "edit-sources",
-      description: "Edit the list of package sources",
-      options: [...yesNoOptions],
-    },
-    {
-      // docs for this weren't the greatest, some descriptions might be slightly (or very) wrong.
-      name: "source",
-      description: "Fetch package source files",
-      args: {
-        name: "package",
-        description: "The package you want to get source files for",
-        isVariadic: true,
-        generators: packages,
-      },
-      options: [
-        ...installationOptions,
-        ...yesNoOptions,
-        ...simulate,
-        {
-          name: "--compile",
-          description:
-            "Compile the package to a binary using dpkg-buildpackage",
-        },
-        {
-          name: "--only-source",
-          // no idea how this works
-        },
-        {
-          name: "--host-architecture",
-          description: "The architecture to build for",
-          args: {
-            name: "architecture",
-            description: "The architecture to build for",
-          },
-        },
-      ],
-    },
-    {
-      // I don't understand this either
-      name: "build-dep",
-      description:
-        "Install/remove packages in an attempt to satisfy the build dependencies for a source package",
-      args: {
-        name: "package",
-        description: "The package you want to build dependencies for",
-        generators: packages,
-      },
-      options: [
-        ...installationOptions,
-        ...yesNoOptions,
-        ...simulate,
-        {
-          name: "--host-architecture",
-          description: "The architecture to build for",
-          args: {
-            name: "architecture",
-            description: "The architecture to build for",
-          },
-        },
-        {
-          name: "--only-source",
-        },
-      ],
-    },
-    {
-      name: "download",
-      description: "Download package binary into the current directory",
-      args: {
-        name: "package",
-        description: "The package you want to download",
-        generators: packages,
-      },
-      options: [...installationOptions, ...yesNoOptions],
-    },
-    {
-      name: ["autoclean", "auto-clean"],
-      description:
-        "Like clean, but only removes package files that can no longer be downloaded",
-      options: [...installationOptions, ...yesNoOptions, ...simulate],
-    },
-    {
-      name: "changelog",
-      description: "Show the changelog for a package",
-      args: {
-        name: "package",
-        description: "The package you want to show the changelog for",
-        generators: packages,
-        isVariadic: true,
-      },
-      options: [...installationOptions, ...yesNoOptions],
-    },
-  ],
-  options: [
-    {
-      name: ["-h", "--help"],
-      description: "Print help message and exit",
-      isPersistent: true,
-      priority: 40,
-    },
-    {
-      name: ["-v", "--version"],
-      description: "Print version information and exit",
-      isPersistent: true,
-      priority: 40,
-    },
-  ],
+	name: "apt",
+	description: "Package manager for Debian-based Linux distributions",
+	subcommands: [
+		{
+			name: "update",
+			description: "Update the package database",
+			options: [...yesNoOptions],
+		},
+		{
+			name: "upgrade",
+			description: "Install all available upgrades",
+			args: {
+				name: "package",
+				description: "Package(s) to upgrade",
+				isVariadic: true,
+				isOptional: true,
+				generators: upgradablePackages,
+			},
+			options: [...installationOptions, ...yesNoOptions, ...simulate],
+		},
+		{
+			name: "full-upgrade",
+			description:
+				"Install available upgrades, removing currently installed packages if needed to upgrade the system as a whole",
+			options: [...installationOptions, ...yesNoOptions, ...simulate],
+		},
+		{
+			name: "install",
+			description: "Install package(s)",
+			args: {
+				name: "package",
+				description: "The package you want to install",
+				isVariadic: true,
+				generators: [packages, filepaths({ extensions: ["deb"] })],
+			},
+			options: [
+				...installationOptions,
+				...yesNoOptions,
+				...simulate,
+				{
+					name: "--reinstall",
+					description: "Reinstall the package if it is already installed",
+				},
+				{
+					name: ["-f", "--fix-broken"],
+					description: "Attempt to fix broken packages",
+				},
+			],
+		},
+		{
+			name: "reinstall",
+			description: "Reinstall package(s)",
+			args: {
+				name: "package",
+				description: "The package you want to reinstall",
+				isVariadic: true,
+				generators: installedPackages,
+			},
+			options: [...yesNoOptions, ...simulate],
+		},
+		{
+			name: "remove",
+			description: "Remove package(s)",
+			args: {
+				name: "package",
+				description: "The package you want to remove",
+				isVariadic: true,
+				generators: installedPackages,
+			},
+			options: [
+				...yesNoOptions,
+				...simulate,
+				{
+					name: ["-f", "--fix-broken"],
+					description: "Attempt to fix broken packages",
+				},
+			],
+		},
+		{
+			name: "purge",
+			description: "Remove package(s) and their configuration files",
+			args: {
+				name: "package",
+				description: "The package you want to purge",
+				isVariadic: true,
+				generators: installedPackages,
+			},
+			options: [...yesNoOptions, ...simulate],
+		},
+		{
+			name: ["autoremove", "auto-remove"],
+			description: "Remove unused packages",
+			options: [...yesNoOptions, ...simulate],
+		},
+		{
+			name: "list",
+			description: "List packages",
+			options: [
+				{
+					name: "--installed",
+					description: "List installed packages",
+				},
+				{
+					name: "--upgradable",
+					description: "List upgradable packages",
+				},
+			],
+		},
+		{
+			name: "search",
+			description: "Search for packages",
+			args: {
+				name: "query",
+				description: "The query to search for",
+			},
+			options: [...yesNoOptions],
+		},
+		{
+			name: "show",
+			description: "Show package details",
+			args: {
+				name: "package",
+				description: "The package you want to show",
+				generators: packages,
+			},
+		},
+		{
+			name: "satisfy",
+			description: "Satisfy package dependencies",
+			args: {
+				name: "package",
+				description: "The package you want to satisfy",
+				isVariadic: true,
+				generators: packages,
+			},
+			options: [...installationOptions, ...yesNoOptions, ...simulate],
+		},
+		{
+			name: "clean",
+			description: "Remove downloaded package files",
+			options: [...yesNoOptions, ...simulate],
+		},
+		{
+			name: "edit-sources",
+			description: "Edit the list of package sources",
+			options: [...yesNoOptions],
+		},
+		{
+			// docs for this weren't the greatest, some descriptions might be slightly (or very) wrong.
+			name: "source",
+			description: "Fetch package source files",
+			args: {
+				name: "package",
+				description: "The package you want to get source files for",
+				isVariadic: true,
+				generators: packages,
+			},
+			options: [
+				...installationOptions,
+				...yesNoOptions,
+				...simulate,
+				{
+					name: "--compile",
+					description:
+						"Compile the package to a binary using dpkg-buildpackage",
+				},
+				{
+					name: "--only-source",
+					// no idea how this works
+				},
+				{
+					name: "--host-architecture",
+					description: "The architecture to build for",
+					args: {
+						name: "architecture",
+						description: "The architecture to build for",
+					},
+				},
+			],
+		},
+		{
+			// I don't understand this either
+			name: "build-dep",
+			description:
+				"Install/remove packages in an attempt to satisfy the build dependencies for a source package",
+			args: {
+				name: "package",
+				description: "The package you want to build dependencies for",
+				generators: packages,
+			},
+			options: [
+				...installationOptions,
+				...yesNoOptions,
+				...simulate,
+				{
+					name: "--host-architecture",
+					description: "The architecture to build for",
+					args: {
+						name: "architecture",
+						description: "The architecture to build for",
+					},
+				},
+				{
+					name: "--only-source",
+				},
+			],
+		},
+		{
+			name: "download",
+			description: "Download package binary into the current directory",
+			args: {
+				name: "package",
+				description: "The package you want to download",
+				generators: packages,
+			},
+			options: [...installationOptions, ...yesNoOptions],
+		},
+		{
+			name: ["autoclean", "auto-clean"],
+			description:
+				"Like clean, but only removes package files that can no longer be downloaded",
+			options: [...installationOptions, ...yesNoOptions, ...simulate],
+		},
+		{
+			name: "changelog",
+			description: "Show the changelog for a package",
+			args: {
+				name: "package",
+				description: "The package you want to show the changelog for",
+				generators: packages,
+				isVariadic: true,
+			},
+			options: [...installationOptions, ...yesNoOptions],
+		},
+	],
+	options: [
+		{
+			name: ["-h", "--help"],
+			description: "Print help message and exit",
+			isPersistent: true,
+			priority: 40,
+		},
+		{
+			name: ["-v", "--version"],
+			description: "Print version information and exit",
+			isPersistent: true,
+			priority: 40,
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/brew.ts b/extensions/terminal-suggest/src/completions/upstream/brew.ts
index 99b87c45ca9a..4e0f0cbe2bb8 100644
--- a/extensions/terminal-suggest/src/completions/upstream/brew.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/brew.ts
@@ -1,1675 +1,1675 @@
 const servicesGenerator = (action: string): Fig.Generator => ({
-  script: ["bash", "-c", "brew services list | sed -e 's/ .*//' | tail -n +2"],
-  postProcess: function (out) {
-    return out
-      .split("\n")
-      .filter((line) => !line.includes("unbound"))
-      .map((line) => ({
-        name: line,
-        icon: "fig://icon?type=package",
-        description: `${action} ${line}`,
-      }));
-  },
+	script: ["bash", "-c", "brew services list | sed -e 's/ .*//' | tail -n +2"],
+	postProcess: function (out) {
+		return out
+			.split("\n")
+			.filter((line) => !line.includes("unbound"))
+			.map((line) => ({
+				name: line,
+				icon: "fig://icon?type=package",
+				description: `${action} ${line}`,
+			}));
+	},
 });
 
 const repositoriesGenerator = (): Fig.Generator => ({
-  script: ["brew", "tap"],
-  postProcess: (out) => {
-    return out.split("\n").map((line) => ({ name: line }));
-  },
+	script: ["brew", "tap"],
+	postProcess: (out) => {
+		return out.split("\n").map((line) => ({ name: line }));
+	},
 });
 
 const formulaeGenerator: Fig.Generator = {
-  script: ["brew", "list", "-1"],
-  postProcess: function (out) {
-    return out
-      .split("\n")
-      .filter((line) => !line.includes("="))
-      .map((formula) => ({
-        name: formula,
-        icon: "🍺",
-        description: "Installed formula",
-      }));
-  },
+	script: ["brew", "list", "-1"],
+	postProcess: function (out) {
+		return out
+			.split("\n")
+			.filter((line) => !line.includes("="))
+			.map((formula) => ({
+				name: formula,
+				icon: "🍺",
+				description: "Installed formula",
+			}));
+	},
 };
 
 const outdatedformulaeGenerator: Fig.Generator = {
-  script: ["brew", "outdated", "-q"],
-  postProcess: function (out) {
-    return out.split("\n").map((formula) => ({
-      name: formula,
-      icon: "🍺",
-      description: "Outdated formula",
-    }));
-  },
+	script: ["brew", "outdated", "-q"],
+	postProcess: function (out) {
+		return out.split("\n").map((formula) => ({
+			name: formula,
+			icon: "🍺",
+			description: "Outdated formula",
+		}));
+	},
 };
 
 const generateAllFormulae: Fig.Generator = {
-  script: ["brew", "formulae"],
-  postProcess: function (out) {
-    return out.split("\n").map((formula) => ({
-      name: formula,
-      icon: "🍺",
-      description: "Formula",
-      priority: 51,
-    }));
-  },
+	script: ["brew", "formulae"],
+	postProcess: function (out) {
+		return out.split("\n").map((formula) => ({
+			name: formula,
+			icon: "🍺",
+			description: "Formula",
+			priority: 51,
+		}));
+	},
 };
 
 const generateAllCasks: Fig.Generator = {
-  script: ["brew", "casks"],
-  postProcess: function (out) {
-    return out.split("\n").map((cask) => ({
-      name: cask,
-      icon: "🍺",
-      description: "Cask",
-      priority: 52,
-    }));
-  },
+	script: ["brew", "casks"],
+	postProcess: function (out) {
+		return out.split("\n").map((cask) => ({
+			name: cask,
+			icon: "🍺",
+			description: "Cask",
+			priority: 52,
+		}));
+	},
 };
 const generateAliases: Fig.Generator = {
-  script: [
-    "bash",
-    "-c",
-    'find ~/.brew-aliases/ -type f ! -name "*.*" -d 1 | sed "s/.*\\///"',
-  ],
-  postProcess: function (out) {
-    return out
-      .split("\n")
-      .filter((line) => line && line.trim() !== "")
-      .map((line) => ({
-        name: line,
-        icon: "fig://icon?type=command",
-        description: `Execute alias ${line}`,
-      }));
-  },
+	script: [
+		"bash",
+		"-c",
+		'find ~/.brew-aliases/ -type f ! -name "*.*" -d 1 | sed "s/.*\\///"',
+	],
+	postProcess: function (out) {
+		return out
+			.split("\n")
+			.filter((line) => line && line.trim() !== "")
+			.map((line) => ({
+				name: line,
+				icon: "fig://icon?type=command",
+				description: `Execute alias ${line}`,
+			}));
+	},
 };
 
 const commonOptions: Fig.Option[] = [
-  {
-    name: ["-d", "--debug"],
-    description: "Display any debugging information",
-  },
-  {
-    name: ["-q", "--quiet"],
-    description: "Make some output more quiet",
-  },
-  {
-    name: ["-v", "--verbose"],
-    description: "Make some output more verbose",
-  },
-  { name: ["-h", "--help"], description: "Show help message" },
+	{
+		name: ["-d", "--debug"],
+		description: "Display any debugging information",
+	},
+	{
+		name: ["-q", "--quiet"],
+		description: "Make some output more quiet",
+	},
+	{
+		name: ["-v", "--verbose"],
+		description: "Make some output more verbose",
+	},
+	{ name: ["-h", "--help"], description: "Show help message" },
 ];
 
 const completionSpec: Fig.Spec = {
-  name: "brew",
-  description: "Package manager for macOS",
-  subcommands: [
-    {
-      name: "list",
-      description: "List all installed formulae",
-      options: [
-        ...commonOptions,
-        {
-          name: ["--formula", "--formulae"],
-          description:
-            "List only formulae, or treat all named arguments as formulae",
-        },
-        {
-          name: ["--cask", "--casks"],
-          description: "List only casks, or treat all named arguments as casks",
-        },
-        {
-          name: "--unbrewed",
-          description:
-            "List files in Homebrew's prefix not installed by Homebrew. (disabled; replaced by brew --prefix --unbrewed)",
-        },
-        {
-          name: "--full-name",
-          description:
-            "Print formulae with fully-qualified names. Unless --full-name, --versions or",
-        },
-        {
-          name: "--pinned",
-          description:
-            "List only pinned formulae, or only the specified (pinned) formulae if formula are provided",
-        },
-        {
-          name: "--versions",
-          description:
-            "Show the version number for installed formulae, or only the specified formulae if formula are provided",
-        },
-        {
-          name: "--multiple",
-          description: "Only show formulae with multiple versions installed",
-        },
-        {
-          name: "--pinned",
-          description:
-            "List only pinned formulae, or only the specified (pinned) formulae if formula are provided. See also pin, unpin",
-        },
-        {
-          name: "-1",
-          description:
-            "Force output to be one entry per line. This is the default when output is not to a terminal",
-        },
-        {
-          name: "-l",
-          description:
-            "List formulae and/or casks in long format. Has no effect when a formula or cask name is passed as an argument",
-        },
-        {
-          name: "-r",
-          description:
-            "Reverse the order of the formulae and/or casks sort to list the oldest entries first. Has no effect when a formula or cask name is passed as an argument",
-        },
-        {
-          name: "-t",
-          description:
-            "Sort formulae and/or casks by time modified, listing most recently modified first. Has no effect when a formula or cask name is passed as an argument",
-        },
-      ],
-      args: {
-        isOptional: true,
-        isVariadic: true,
-        name: "formula",
-        generators: formulaeGenerator,
-      },
-    },
-    {
-      name: "ls",
-      description: "List all installed formulae",
-      options: [
-        ...commonOptions,
-        {
-          name: "--formula",
-          description:
-            "List only formulae, or treat all named arguments as formulae",
-        },
-        {
-          name: "--cask",
-          description: "List only casks, or treat all named arguments as casks",
-        },
-        {
-          name: "--unbrewed",
-          description:
-            "List files in Homebrew's prefix not installed by Homebrew. (disabled; replaced by brew --prefix --unbrewed)",
-        },
-        {
-          name: "--full-name",
-          description:
-            "Print formulae with fully-qualified names. Unless --full-name, --versions or",
-        },
-        {
-          name: "--pinned",
-          description:
-            "List only pinned formulae, or only the specified (pinned) formulae if formula are provided",
-        },
-        {
-          name: "--versions",
-          description:
-            "Show the version number for installed formulae, or only the specified formulae if formula are provided",
-        },
-        {
-          name: "--multiple",
-          description: "Only show formulae with multiple versions installed",
-        },
-        {
-          name: "--pinned",
-          description:
-            "List only pinned formulae, or only the specified (pinned) formulae if formula are provided",
-        },
-        {
-          name: "-1",
-          description:
-            "Force output to be one entry per line. This is the default when output is not to a terminal",
-        },
-        {
-          name: "-l",
-          description:
-            "List formulae and/or casks in long format. Has no effect when a formula or cask name is passed as an argument",
-        },
-        {
-          name: "-r",
-          description:
-            "Reverse the order of the formulae and/or casks sort to list the oldest entries first. Has no effect when a formula or cask name is passed as an argument",
-        },
-        {
-          name: "-t",
-          description:
-            "Sort formulae and/or casks by time modified, listing most recently modified first. Has no effect when a formula or cask name is passed as an argument",
-        },
-      ],
-      args: {
-        isOptional: true,
-        isVariadic: true,
-        name: "formula",
-        generators: formulaeGenerator,
-      },
-    },
-    {
-      name: "leaves",
-      description:
-        "List installed formulae that are not dependencies of another installed formula",
-      options: [
-        {
-          name: ["-r", "--installed-on-request"],
-          description: "Show manually installed formula",
-        },
-        {
-          name: ["-p", "--installed-as-dependency"],
-          description: "Show installed formula as dependencies",
-        },
-      ],
-    },
-    {
-      name: "doctor",
-      description: "Check your system for potential problems",
-      options: [
-        ...commonOptions,
-        {
-          name: "--list-checks",
-          description: "List all audit methods",
-        },
-        {
-          name: ["-D", "--audit-debug"],
-          description: "Enable debugging and profiling of audit methods",
-        },
-      ],
-    },
-    {
-      name: ["abv", "info"],
-      description: "Display brief statistics for your Homebrew installation",
-      args: {
-        isVariadic: true,
-        isOptional: true,
-        name: "formula",
-        description: "Formula or cask to summarize",
-        generators: [generateAllFormulae, generateAllCasks],
-      },
-      options: [
-        {
-          name: ["--cask", "--casks"],
-          description: "List only casks, or treat all named arguments as casks",
-        },
-        {
-          name: "--analytics",
-          description:
-            "List global Homebrew analytics data or, if specified, installation and build error data for formula",
-        },
-        {
-          name: "--days",
-          description: "How many days of analytics data to retrieve",
-          exclusiveOn: ["--analytics"],
-          args: {
-            name: "days",
-            description: "Number of days of data to retrieve",
-            suggestions: ["30", "90", "365"],
-          },
-        },
-        {
-          name: "--category",
-          description: "Which type of analytics data to retrieve",
-          exclusiveOn: ["--analytics"],
-          args: {
-            generators: {
-              custom: async (ctx) => {
-                // if anything provided after the subcommand does not begin with '-'
-                // then a formula has been provided and we should provide info on it
-                if (
-                  ctx.slice(2, ctx.length - 1).some((token) => token[0] !== "-")
-                ) {
-                  return ["install", "install-on-request", "build-error"].map(
-                    (sugg) => ({
-                      name: sugg,
-                    })
-                  );
-                }
+	name: "brew",
+	description: "Package manager for macOS",
+	subcommands: [
+		{
+			name: "list",
+			description: "List all installed formulae",
+			options: [
+				...commonOptions,
+				{
+					name: ["--formula", "--formulae"],
+					description:
+						"List only formulae, or treat all named arguments as formulae",
+				},
+				{
+					name: ["--cask", "--casks"],
+					description: "List only casks, or treat all named arguments as casks",
+				},
+				{
+					name: "--unbrewed",
+					description:
+						"List files in Homebrew's prefix not installed by Homebrew. (disabled; replaced by brew --prefix --unbrewed)",
+				},
+				{
+					name: "--full-name",
+					description:
+						"Print formulae with fully-qualified names. Unless --full-name, --versions or",
+				},
+				{
+					name: "--pinned",
+					description:
+						"List only pinned formulae, or only the specified (pinned) formulae if formula are provided",
+				},
+				{
+					name: "--versions",
+					description:
+						"Show the version number for installed formulae, or only the specified formulae if formula are provided",
+				},
+				{
+					name: "--multiple",
+					description: "Only show formulae with multiple versions installed",
+				},
+				{
+					name: "--pinned",
+					description:
+						"List only pinned formulae, or only the specified (pinned) formulae if formula are provided. See also pin, unpin",
+				},
+				{
+					name: "-1",
+					description:
+						"Force output to be one entry per line. This is the default when output is not to a terminal",
+				},
+				{
+					name: "-l",
+					description:
+						"List formulae and/or casks in long format. Has no effect when a formula or cask name is passed as an argument",
+				},
+				{
+					name: "-r",
+					description:
+						"Reverse the order of the formulae and/or casks sort to list the oldest entries first. Has no effect when a formula or cask name is passed as an argument",
+				},
+				{
+					name: "-t",
+					description:
+						"Sort formulae and/or casks by time modified, listing most recently modified first. Has no effect when a formula or cask name is passed as an argument",
+				},
+			],
+			args: {
+				isOptional: true,
+				isVariadic: true,
+				name: "formula",
+				generators: formulaeGenerator,
+			},
+		},
+		{
+			name: "ls",
+			description: "List all installed formulae",
+			options: [
+				...commonOptions,
+				{
+					name: "--formula",
+					description:
+						"List only formulae, or treat all named arguments as formulae",
+				},
+				{
+					name: "--cask",
+					description: "List only casks, or treat all named arguments as casks",
+				},
+				{
+					name: "--unbrewed",
+					description:
+						"List files in Homebrew's prefix not installed by Homebrew. (disabled; replaced by brew --prefix --unbrewed)",
+				},
+				{
+					name: "--full-name",
+					description:
+						"Print formulae with fully-qualified names. Unless --full-name, --versions or",
+				},
+				{
+					name: "--pinned",
+					description:
+						"List only pinned formulae, or only the specified (pinned) formulae if formula are provided",
+				},
+				{
+					name: "--versions",
+					description:
+						"Show the version number for installed formulae, or only the specified formulae if formula are provided",
+				},
+				{
+					name: "--multiple",
+					description: "Only show formulae with multiple versions installed",
+				},
+				{
+					name: "--pinned",
+					description:
+						"List only pinned formulae, or only the specified (pinned) formulae if formula are provided",
+				},
+				{
+					name: "-1",
+					description:
+						"Force output to be one entry per line. This is the default when output is not to a terminal",
+				},
+				{
+					name: "-l",
+					description:
+						"List formulae and/or casks in long format. Has no effect when a formula or cask name is passed as an argument",
+				},
+				{
+					name: "-r",
+					description:
+						"Reverse the order of the formulae and/or casks sort to list the oldest entries first. Has no effect when a formula or cask name is passed as an argument",
+				},
+				{
+					name: "-t",
+					description:
+						"Sort formulae and/or casks by time modified, listing most recently modified first. Has no effect when a formula or cask name is passed as an argument",
+				},
+			],
+			args: {
+				isOptional: true,
+				isVariadic: true,
+				name: "formula",
+				generators: formulaeGenerator,
+			},
+		},
+		{
+			name: "leaves",
+			description:
+				"List installed formulae that are not dependencies of another installed formula",
+			options: [
+				{
+					name: ["-r", "--installed-on-request"],
+					description: "Show manually installed formula",
+				},
+				{
+					name: ["-p", "--installed-as-dependency"],
+					description: "Show installed formula as dependencies",
+				},
+			],
+		},
+		{
+			name: "doctor",
+			description: "Check your system for potential problems",
+			options: [
+				...commonOptions,
+				{
+					name: "--list-checks",
+					description: "List all audit methods",
+				},
+				{
+					name: ["-D", "--audit-debug"],
+					description: "Enable debugging and profiling of audit methods",
+				},
+			],
+		},
+		{
+			name: ["abv", "info"],
+			description: "Display brief statistics for your Homebrew installation",
+			args: {
+				isVariadic: true,
+				isOptional: true,
+				name: "formula",
+				description: "Formula or cask to summarize",
+				generators: [generateAllFormulae, generateAllCasks],
+			},
+			options: [
+				{
+					name: ["--cask", "--casks"],
+					description: "List only casks, or treat all named arguments as casks",
+				},
+				{
+					name: "--analytics",
+					description:
+						"List global Homebrew analytics data or, if specified, installation and build error data for formula",
+				},
+				{
+					name: "--days",
+					description: "How many days of analytics data to retrieve",
+					exclusiveOn: ["--analytics"],
+					args: {
+						name: "days",
+						description: "Number of days of data to retrieve",
+						suggestions: ["30", "90", "365"],
+					},
+				},
+				{
+					name: "--category",
+					description: "Which type of analytics data to retrieve",
+					exclusiveOn: ["--analytics"],
+					args: {
+						generators: {
+							custom: async (ctx) => {
+								// if anything provided after the subcommand does not begin with '-'
+								// then a formula has been provided and we should provide info on it
+								if (
+									ctx.slice(2, ctx.length - 1).some((token) => token[0] !== "-")
+								) {
+									return ["install", "install-on-request", "build-error"].map(
+										(sugg) => ({
+											name: sugg,
+										})
+									);
+								}
 
-                // if no formulas are specified, then we should provide system info
-                return ["cask-install", "os-version"].map((sugg) => ({
-                  name: sugg,
-                }));
-              },
-            },
-          },
-        },
-        {
-          name: "--github",
-          description: "Open the GitHub source page for formula in a browser",
-        },
-        {
-          name: "--json",
-          description: "Print a JSON representation",
-        },
-        {
-          name: "--installed",
-          exclusiveOn: ["--json"],
-          description: "Print JSON of formulae that are currently installed",
-        },
-        {
-          name: "--all",
-          exclusiveOn: ["--json"],
-          description: "Print JSON of all available formulae",
-        },
-        {
-          name: ["-v", "--verbose"],
-          description: "Show more verbose analytics data for formulae",
-        },
-        {
-          name: "--formula",
-          description: "Treat all named arguments as formulae",
-        },
-        {
-          name: "--cash",
-          description: "Treat all named arguments as casks",
-        },
-        {
-          name: ["-d", "--debug"],
-          description: "Display any debugging information",
-        },
-        {
-          name: ["-q", "--quiet"],
-          description: "List only the names of outdated kegs",
-        },
-        {
-          name: ["-h", "--help"],
-          description: "Get help with services command",
-        },
-      ],
-    },
-    {
-      name: "update",
-      description: "Fetch the newest version of Homebrew and all formulae",
-      options: [
-        {
-          name: ["-f", "--force"],
-          description: "Always do a slower, full update check",
-        },
-        {
-          name: ["-v", "--verbose"],
-          description:
-            "Print the directories checked and git operations performed",
-        },
-        {
-          name: ["-d", "--debug"],
-          description:
-            "Display a trace of all shell commands as they are executed",
-        },
-        { name: ["-h", "--help"], description: "Show help message" },
-        {
-          name: "--merge",
-          description:
-            "Use git merge to apply updates (rather than git rebase)",
-        },
-        {
-          name: "--preinstall",
-          description:
-            "Run on auto-updates (e.g. before brew install). Skips some slower steps",
-        },
-      ],
-    },
-    {
-      name: "outdated",
-      description:
-        "List installed casks and formulae that have an updated version available",
-      options: [
-        {
-          name: ["-d", "--debug"],
-          description: "Display any debugging information",
-        },
-        {
-          name: ["-q", "--quiet"],
-          description: "List only the names of outdated kegs",
-        },
-        {
-          name: ["-v", "--verbose"],
-          description: "Include detailed version information",
-        },
-        {
-          name: ["-h", "--help"],
-          description: "Show help message for the outdated command",
-        },
-        { name: "--cask", description: "List only outdated casks" },
-        {
-          name: "--fetch-HEAD",
-          description:
-            "Fetch the upstream repository to detect if the HEAD installation of the formula is outdated",
-        },
-        { name: "--formula", description: "List only outdated formulae" },
-        {
-          name: "--greedy",
-          description:
-            "Print outdated casks with auto_updates or version :latest",
-        },
-        {
-          name: "--greedy-latest",
-          description:
-            "Print outdated casks including those with version :latest",
-        },
-        {
-          name: "--greedy-auto-updates",
-          description:
-            "Print outdated casks including those with auto_updates true",
-        },
-        { name: "--json", description: "Print output in JSON format" },
-      ],
-    },
-    {
-      name: "pin",
-      description: "Pin formula, preventing them from being upgraded",
-      options: commonOptions,
-      args: {
-        isVariadic: true,
-        name: "formula",
-        generators: formulaeGenerator,
-      },
-    },
-    {
-      name: "unpin",
-      description: "Unpin formula, allowing them to be upgraded",
-      options: commonOptions,
-      args: {
-        isVariadic: true,
-        name: "formula",
-        generators: formulaeGenerator,
-      },
-    },
-    {
-      name: "upgrade",
-      description:
-        "Upgrade outdated casks and outdated, unpinned formulae using the same options they were originally installed with, plus any appended brew formula options",
-      options: [
-        {
-          name: ["-d", "--debug"],
-          description:
-            "If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory",
-        },
-        {
-          name: ["-f", "--force"],
-          description:
-            "Install formulae without checking for previously installed keg-only or non-migrated versions. When installing casks, overwrite existing files (binaries and symlinks are excluded, unless originally from the same cask)",
-        },
-        {
-          name: ["-v", "--verbose"],
-          description: "Print the verification and postinstall steps",
-        },
-        {
-          name: ["-n", "--dry-run"],
-          description:
-            "Show what would be upgraded, but do not actually upgrade anything",
-        },
-        {
-          name: ["-s", "--build-from-source"],
-          description:
-            "Compile formula from source even if a bottle is provided. Dependencies will still be installed from bottles if they are available",
-        },
-        {
-          name: ["-i", "--interactive"],
-          description: "Download and patch formula, then open a shell",
-        },
-        { name: ["-g", "--git"], description: "Create a Git repository" },
-        {
-          name: ["-q", "--quiet"],
-          description: "Make some output more quiet",
-        },
-        { name: ["-h", "--help"], description: "Show this message" },
-        {
-          name: ["--formula", "--formulae"],
-          description:
-            "Treat all named arguments as formulae. If no named arguments are specified, upgrade only outdated formulae",
-        },
-        {
-          name: "--env",
-          description: "Disabled other than for internal Homebrew use",
-        },
-        {
-          name: "--ignore-dependencies",
-          description:
-            "An unsupported Homebrew development flag to skip installing any dependencies of any kind. If the dependencies are not already present, the formula will have issues. If you're not developing Homebrew, consider adjusting your PATH rather than using this flag",
-        },
-        {
-          name: "--only-dependencies",
-          description:
-            "Install the dependencies with specified options but do not install the formula itself",
-        },
-        {
-          name: "--cc",
-          description:
-            "Attempt to compile using the specified compiler, which should be the name of the compiler's executable",
-          args: {
-            name: "compiler",
-            suggestions: ["gcc-7", "llvm_clang", "clang"],
-          },
-        },
-        {
-          name: "--force-bottle",
-          description:
-            "Install from a bottle if it exists for the current or newest version of macOS, even if it would not normally be used for installation",
-        },
-        {
-          name: "--include-test",
-          description:
-            "Install testing dependencies required to run brew test formula",
-        },
-        {
-          name: "--HEAD",
-          description:
-            "If formula defines it, install the HEAD version, aka. main, trunk, unstable, master",
-        },
-        {
-          name: "--fetch-HEAD",
-          description:
-            "Fetch the upstream repository to detect if the HEAD installation of the formula is outdated. Otherwise, the repository's HEAD will only be checked for updates when a new stable or development version has been released",
-        },
-        {
-          name: "--ignore-pinned",
-          description:
-            "Set a successful exit status even if pinned formulae are not upgraded",
-        },
-        {
-          name: "--keep-tmp",
-          description: "Retain the temporary files created during installation",
-        },
-        {
-          name: "--build-bottle",
-          description:
-            "Prepare the formula for eventual bottling during installation, skipping any post-install steps",
-        },
-        {
-          name: "--bottle-arch",
-          description:
-            "Optimise bottles for the specified architecture rather than the oldest architecture supported by the version of macOS the bottles are built on",
-        },
-        {
-          name: "--display-times",
-          description:
-            "Print install times for each formula at the end of the run",
-        },
-        {
-          name: ["--cask", "--casks"],
-          description:
-            "Treat all named arguments as casks. If no named arguments are specified, upgrade only outdated casks",
-        },
-        {
-          name: "--binaries",
-          description:
-            "Disable/enable linking of helper executables (default: enabled)",
-          exclusiveOn: ["--no-binaries"],
-        },
-        {
-          name: "--no-binaries",
-          description:
-            "Disable/enable linking of helper executables (default: enabled)",
-          exclusiveOn: ["--binaries"],
-        },
-        {
-          name: "--require-sha",
-          description: "Require all casks to have a checksum",
-        },
-        {
-          name: "--quarantine",
-          description:
-            "Disable/enable quarantining of downloads (default: enabled)",
-          exclusiveOn: ["--no-quarantine"],
-        },
-        {
-          name: "--no-quarantine",
-          description:
-            "Disable/enable quarantining of downloads (default: enabled)",
-          exclusiveOn: ["--quarantine"],
-        },
-        {
-          name: "--skip-cask-deps",
-          description: "Skip installing cask dependencies",
-        },
-        {
-          name: "--greedy",
-          description:
-            "Also include casks with auto_updates true or version :latest",
-          exclusiveOn: ["--greedy-latest", "--greedy-auto-updates"],
-        },
-        {
-          name: "--greedy-latest",
-          description: "Also include casks with version :latest",
-        },
-        {
-          name: "--greedy-auto-updates",
-          description: "Also include casks with auto_updates true",
-        },
-        {
-          name: "--appdir",
-          description:
-            "Target location for Applications (default: /Applications)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--colorpickerdir",
-          description:
-            "Target location for Color Pickers (default: ~/Library/ColorPickers)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--prefpanedir",
-          description:
-            "Target location for Preference Panes (default: ~/Library/PreferencePanes)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--qlplugindir",
-          description:
-            "Target location for QuickLook Plugins (default: ~/Library/QuickLook)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--mdimporterdir",
-          description:
-            "Target location for Spotlight Plugins (default: ~/Library/Spotlight)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--dictionarydir",
-          description:
-            "Target location for Dictionaries (default: ~/Library/Dictionaries)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--fontdir",
-          description: "Target location for Fonts (default: ~/Library/Fonts)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--servicedir",
-          description:
-            "Target location for Services (default: ~/Library/Services)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--input-methoddir",
-          description:
-            "Target location for Input Methods (default: ~/Library/Input Methods)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--internet-plugindir",
-          description:
-            "Target location for Internet Plugins (default: ~/Library/Internet Plug-Ins)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--audio-unit-plugindir",
-          description:
-            "Target location for Audio Unit Plugins (default: ~/Library/Audio/Plug-Ins/Components)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--vst-plugindir",
-          description:
-            "Target location for VST Plugins (default: ~/Library/Audio/Plug-Ins/VST)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--vst3-plugindir",
-          description:
-            "Target location for VST3 Plugins (default: ~/Library/Audio/Plug-Ins/VST3)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--screen-saverdir",
-          description:
-            "Target location for Screen Savers (default: ~/Library/Screen Savers)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--language",
-          description:
-            "Comma-separated list of language codes to prefer for cask installation. The first matching language is used, otherwise it reverts to the cask's default language. The default value is the language of your system",
-        },
-      ],
-      args: {
-        isVariadic: true,
-        isOptional: true,
-        name: "outdated_formula|outdated_cask",
-        generators: outdatedformulaeGenerator,
-      },
-    },
-    {
-      name: "search",
-      description:
-        "Perform a substring search of cask tokens and formula names",
-      options: [
-        ...commonOptions,
-        {
-          name: "--formula",
-          description: "Search online and locally for formulae",
-        },
-        {
-          name: "--cask",
-          description: "Search online and locally for casks",
-        },
-        {
-          name: "--desc",
-          description:
-            "Search for formulae with a description matching text and casks with a name matching text",
-        },
-        {
-          name: "--pull-request",
-          description: "Search for GitHub pull requests containing text",
-        },
-        {
-          name: "--open",
-          description: "Search for only open GitHub pull requests",
-        },
-        {
-          name: "--closed",
-          description: "Search for only closed GitHub pull requests",
-        },
-        {
-          name: ["--repology", "--macports"],
-          description: "Search for text in the given database",
-        },
-        {
-          name: ["--fink", "--opensuse"],
-          description: "Search for text in the given database",
-        },
-        {
-          name: ["--fedora", "--debian"],
-          description: "Search for text in the given database",
-        },
-        {
-          name: "--ubuntu",
-          description: "Search for text in the given database",
-        },
-      ],
-    },
-    {
-      name: "config",
-      description: "Show Homebrew and system configuration info",
-    },
-    {
-      name: "postinstall",
-      description: "Rerun the post install step for formula",
-      options: [
-        {
-          name: ["-d", "--debug"],
-          description: "Display any debugging information",
-        },
-        {
-          name: ["-v", "--verbose"],
-          description: "Make some output more verbose",
-        },
-        {
-          name: ["-q", "--quiet"],
-          description: "Make some output more quiet",
-        },
-        { name: ["-h", "--help"], description: "Show this message" },
-      ],
-      args: {
-        isVariadic: true,
-        name: "formula",
-        generators: formulaeGenerator,
-      },
-    },
-    {
-      name: "install",
-      description: "Install <formula>",
-      options: [
-        {
-          name: ["-f", "--force"],
-          description:
-            "Install formulae without checking for previously installed keg-only or non-migrated versions. When installing casks",
-        },
-        {
-          name: ["-v", "--verbose"],
-          description: "Print the verification and postinstall steps",
-        },
-        {
-          name: ["-s", "--build-from-source"],
-          description:
-            "Compile formula from source even if a bottle is provided. Dependencies will still be installed from bottles if they are available",
-        },
-        {
-          name: ["-i", "--interactive"],
-          description: "Download and patch formula",
-        },
-        { name: ["-g", "--git"], description: "Create a Git repository" },
-        {
-          name: ["-q", "--quiet"],
-          description: "Make some output more quiet",
-        },
-        { name: ["-h", "--help"], description: "Show this message" },
-        {
-          name: "--formula",
-          description: "Treat all named arguments as formulae",
-        },
-        {
-          name: "--env",
-          description: "Disabled other than for internal Homebrew use",
-        },
-        {
-          name: "--ignore-dependencies",
-          description:
-            "An unsupported Homebrew development flag to skip installing any dependencies of any kind. If the dependencies are not already present, the formula will have issues. If you're not developing Homebrew, consider adjusting your PATH rather than using this flag",
-        },
-        {
-          name: "--only-dependencies",
-          description:
-            "Install the dependencies with specified options but do not install the formula itself",
-        },
-        {
-          name: "--cc",
-          description:
-            "Attempt to compile using the specified compiler, which should be the name of the compiler's executable",
-          args: {
-            name: "compiler",
-            suggestions: ["gcc-7", "llvm_clang", "clang"],
-          },
-        },
-        {
-          name: "--force-bottle",
-          description:
-            "Install from a bottle if it exists for the current or newest version of macOS, even if it would not normally be used for installation",
-        },
-        {
-          name: "--include-test",
-          description:
-            "Install testing dependencies required to run brew test formula",
-        },
-        {
-          name: "--HEAD",
-          description:
-            "If formula defines it, install the HEAD version, aka. main, trunk, unstable, master",
-        },
-        {
-          name: "--fetch-HEAD",
-          description:
-            "Fetch the upstream repository to detect if the HEAD installation of the formula is outdated. Otherwise, the repository's HEAD will only be checked for updates when a new stable or development version has been released",
-        },
-        {
-          name: "--keep-tmp",
-          description: "Retain the temporary files created during installation",
-        },
-        {
-          name: "--build-bottle",
-          description:
-            "Prepare the formula for eventual bottling during installation, skipping any post-install steps",
-        },
-        {
-          name: "--bottle-arch",
-          description:
-            "Optimise bottles for the specified architecture rather than the oldest architecture supported by the version of macOS the bottles are built on",
-        },
-        {
-          name: "--display-times",
-          description:
-            "Print install times for each formula at the end of the run",
-        },
-        {
-          name: "--cask",
-          description: "--casks Treat all named arguments as casks",
-        },
-        {
-          name: "--binaries",
-          description:
-            "Disable/enable linking of helper executables (default: enabled)",
-        },
-        {
-          name: "--no-binaries",
-          description:
-            "Disable/enable linking of helper executables (default: enabled)",
-        },
-        {
-          name: "--require-sha",
-          description: "Require all casks to have a checksum",
-        },
-        {
-          name: "--quarantine",
-          description:
-            "Disable/enable quarantining of downloads (default: enabled)",
-        },
-        {
-          name: "--no-quarantine",
-          description:
-            "Disable/enable quarantining of downloads (default: enabled)",
-        },
-        {
-          name: "--skip-cask-deps",
-          description: "Skip installing cask dependencies",
-        },
-        {
-          name: "--appdir",
-          description:
-            "Target location for Applications (default: /Applications)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--colorpickerdir",
-          description:
-            "Target location for Color Pickers (default: ~/Library/ColorPickers)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--prefpanedir",
-          description:
-            "Target location for Preference Panes (default: ~/Library/PreferencePanes)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--qlplugindir",
-          description:
-            "Target location for QuickLook Plugins (default: ~/Library/QuickLook)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--mdimporterdir",
-          description:
-            "Target location for Spotlight Plugins (default: ~/Library/Spotlight)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--dictionarydir",
-          description:
-            "Target location for Dictionaries (default: ~/Library/Dictionaries)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--fontdir",
-          description: "Target location for Fonts (default: ~/Library/Fonts)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--servicedir",
-          description:
-            "Target location for Services (default: ~/Library/Services)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--input-methoddir",
-          description:
-            "Target location for Input Methods (default: ~/Library/Input Methods)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--internet-plugindir",
-          description:
-            "Target location for Internet Plugins (default: ~/Library/Internet Plug-Ins)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--audio-unit-plugindir",
-          description:
-            "Target location for Audio Unit Plugins (default: ~/Library/Audio/Plug-Ins/Components)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--vst-plugindir",
-          description:
-            "Target location for VST Plugins (default: ~/Library/Audio/Plug-Ins/VST)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--vst3-plugindir",
-          description:
-            "Target location for VST3 Plugins (default: ~/Library/Audio/Plug-Ins/VST3)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--screen-saverdir",
-          description:
-            "Target location for Screen Savers (default: ~/Library/Screen Savers)",
-          args: {
-            name: "location",
-            template: "folders",
-          },
-        },
-        {
-          name: "--language",
-          description:
-            "Comma-separated list of language codes to prefer for cask installation. The first matching language is used, otherwise it reverts to the cask's default language. The default value is the language of your system",
-        },
-      ],
-      args: {
-        isVariadic: true,
-        name: "formula",
-        description: "Formula or cask to install",
-        generators: [generateAllFormulae, generateAllCasks],
-      },
-    },
-    {
-      name: "reinstall",
-      description:
-        "Uninstall and then reinstall a formula or cask using the same options it was originally installed with, plus any appended options specific to a formula",
-      options: [
-        {
-          name: ["-d", "--debug"],
-          description:
-            "If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory",
-        },
-        {
-          name: ["-f", "--force"],
-          description:
-            "Install formulae without checking for previously installed keg-only or non-migrated versions. When installing casks",
-        },
-        {
-          name: ["-v", "--verbose"],
-          description: "Print the verification and postinstall steps",
-        },
-        {
-          name: ["-s", "--build-from-source"],
-          description:
-            "Compile formula from source even if a bottle is provided. Dependencies will still be installed from bottles if they are available",
-        },
-        {
-          name: ["-i", "--interactive"],
-          description: "Download and patch formula",
-        },
-        { name: ["-g", "--git"], description: "Create a Git repository" },
-        {
-          name: "--formula",
-          description: "Treat all named arguments as formulae",
-        },
-        {
-          name: "--force-bottle",
-          description:
-            "Install from a bottle if it exists for the current or newest version of macOS, even if it would not normally be used for installation",
-        },
-        {
-          name: "--keep-tmp",
-          description: "Retain the temporary files created during installation",
-        },
-        {
-          name: "--display-times",
-          description:
-            "Print install times for each formula at the end of the run",
-        },
-        {
-          name: "--cask",
-          description: "--casks Treat all named arguments as casks",
-        },
-        {
-          name: "--binaries",
-          description:
-            "Disable/enable linking of helper executables (default: enabled)",
-          exclusiveOn: ["--no-binaries"],
-        },
-        {
-          name: "--no-binaries",
-          description:
-            "Disable/enable linking of helper executables (default: enabled)",
-          exclusiveOn: ["--binaries"],
-        },
-        {
-          name: "--require-sha",
-          description: "Require all casks to have a checksum",
-        },
-        {
-          name: "--quarantine",
-          description:
-            "Disable/enable quarantining of downloads (default: enabled)",
-          exclusiveOn: ["--no-quarantine"],
-        },
-        {
-          name: "--no-quarantine",
-          description:
-            "Disable/enable quarantining of downloads (default: enabled)",
-          exclusiveOn: ["--quarantine"],
-        },
-        {
-          name: "--skip-cask-deps",
-          description: "Skip installing cask dependencies",
-        },
-      ],
-      args: {
-        isVariadic: true,
-        name: "formula",
-        generators: formulaeGenerator,
-      },
-    },
-    {
-      name: ["uninstall", "remove", "rm"],
-      description: "Uninstall a formula or cask",
-      args: {
-        isVariadic: true,
-        name: "formula",
-        generators: formulaeGenerator,
-      },
-    },
-    {
-      // NOTE: this is actually a command even if it has the double dash in the front
-      name: "--prefix",
-      description: "Prefix of <formula>",
-      args: {
-        isVariadic: true,
-        name: "formula",
-        generators: formulaeGenerator,
-      },
-      options: [
-        {
-          name: "--unbrewed",
-          description:
-            "List files in Homebrew's prefix not installed by Homebrew",
-        },
-        {
-          name: "--installed",
-          description:
-            "Outputs nothing and returns a failing status code if formula is not installed",
-        },
-      ],
-    },
-    {
-      name: "cask",
-      description:
-        "Homebrew Cask provides a friendly CLI workflow for the administration of macOS applications distributed as binaries",
-      subcommands: [
-        {
-          name: "install",
-          description: "Installs the given cask",
-          args: {
-            name: "cask",
-            description: "Cask to install",
-          },
-        },
-        {
-          name: "uninstall",
-          description: "Uninstalls the given cask",
-          options: [
-            ...commonOptions,
-            {
-              name: "--zap",
-              description:
-                "Remove all files associated with a cask. May remove files which are shared between applications",
-            },
-            {
-              name: "--ignore-dependencies",
-              description:
-                "Don't fail uninstall, even if formula is a dependency of any installed formulae",
-            },
-            {
-              name: "--formula",
-              description: "Treat all named arguments as formulae",
-            },
-            {
-              name: "--cask",
-              description: "Treat all named arguments as casks",
-            },
-          ],
-          args: {
-            isVariadic: true,
+								// if no formulas are specified, then we should provide system info
+								return ["cask-install", "os-version"].map((sugg) => ({
+									name: sugg,
+								}));
+							},
+						},
+					},
+				},
+				{
+					name: "--github",
+					description: "Open the GitHub source page for formula in a browser",
+				},
+				{
+					name: "--json",
+					description: "Print a JSON representation",
+				},
+				{
+					name: "--installed",
+					exclusiveOn: ["--json"],
+					description: "Print JSON of formulae that are currently installed",
+				},
+				{
+					name: "--all",
+					exclusiveOn: ["--json"],
+					description: "Print JSON of all available formulae",
+				},
+				{
+					name: ["-v", "--verbose"],
+					description: "Show more verbose analytics data for formulae",
+				},
+				{
+					name: "--formula",
+					description: "Treat all named arguments as formulae",
+				},
+				{
+					name: "--cash",
+					description: "Treat all named arguments as casks",
+				},
+				{
+					name: ["-d", "--debug"],
+					description: "Display any debugging information",
+				},
+				{
+					name: ["-q", "--quiet"],
+					description: "List only the names of outdated kegs",
+				},
+				{
+					name: ["-h", "--help"],
+					description: "Get help with services command",
+				},
+			],
+		},
+		{
+			name: "update",
+			description: "Fetch the newest version of Homebrew and all formulae",
+			options: [
+				{
+					name: ["-f", "--force"],
+					description: "Always do a slower, full update check",
+				},
+				{
+					name: ["-v", "--verbose"],
+					description:
+						"Print the directories checked and git operations performed",
+				},
+				{
+					name: ["-d", "--debug"],
+					description:
+						"Display a trace of all shell commands as they are executed",
+				},
+				{ name: ["-h", "--help"], description: "Show help message" },
+				{
+					name: "--merge",
+					description:
+						"Use git merge to apply updates (rather than git rebase)",
+				},
+				{
+					name: "--preinstall",
+					description:
+						"Run on auto-updates (e.g. before brew install). Skips some slower steps",
+				},
+			],
+		},
+		{
+			name: "outdated",
+			description:
+				"List installed casks and formulae that have an updated version available",
+			options: [
+				{
+					name: ["-d", "--debug"],
+					description: "Display any debugging information",
+				},
+				{
+					name: ["-q", "--quiet"],
+					description: "List only the names of outdated kegs",
+				},
+				{
+					name: ["-v", "--verbose"],
+					description: "Include detailed version information",
+				},
+				{
+					name: ["-h", "--help"],
+					description: "Show help message for the outdated command",
+				},
+				{ name: "--cask", description: "List only outdated casks" },
+				{
+					name: "--fetch-HEAD",
+					description:
+						"Fetch the upstream repository to detect if the HEAD installation of the formula is outdated",
+				},
+				{ name: "--formula", description: "List only outdated formulae" },
+				{
+					name: "--greedy",
+					description:
+						"Print outdated casks with auto_updates or version :latest",
+				},
+				{
+					name: "--greedy-latest",
+					description:
+						"Print outdated casks including those with version :latest",
+				},
+				{
+					name: "--greedy-auto-updates",
+					description:
+						"Print outdated casks including those with auto_updates true",
+				},
+				{ name: "--json", description: "Print output in JSON format" },
+			],
+		},
+		{
+			name: "pin",
+			description: "Pin formula, preventing them from being upgraded",
+			options: commonOptions,
+			args: {
+				isVariadic: true,
+				name: "formula",
+				generators: formulaeGenerator,
+			},
+		},
+		{
+			name: "unpin",
+			description: "Unpin formula, allowing them to be upgraded",
+			options: commonOptions,
+			args: {
+				isVariadic: true,
+				name: "formula",
+				generators: formulaeGenerator,
+			},
+		},
+		{
+			name: "upgrade",
+			description:
+				"Upgrade outdated casks and outdated, unpinned formulae using the same options they were originally installed with, plus any appended brew formula options",
+			options: [
+				{
+					name: ["-d", "--debug"],
+					description:
+						"If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory",
+				},
+				{
+					name: ["-f", "--force"],
+					description:
+						"Install formulae without checking for previously installed keg-only or non-migrated versions. When installing casks, overwrite existing files (binaries and symlinks are excluded, unless originally from the same cask)",
+				},
+				{
+					name: ["-v", "--verbose"],
+					description: "Print the verification and postinstall steps",
+				},
+				{
+					name: ["-n", "--dry-run"],
+					description:
+						"Show what would be upgraded, but do not actually upgrade anything",
+				},
+				{
+					name: ["-s", "--build-from-source"],
+					description:
+						"Compile formula from source even if a bottle is provided. Dependencies will still be installed from bottles if they are available",
+				},
+				{
+					name: ["-i", "--interactive"],
+					description: "Download and patch formula, then open a shell",
+				},
+				{ name: ["-g", "--git"], description: "Create a Git repository" },
+				{
+					name: ["-q", "--quiet"],
+					description: "Make some output more quiet",
+				},
+				{ name: ["-h", "--help"], description: "Show this message" },
+				{
+					name: ["--formula", "--formulae"],
+					description:
+						"Treat all named arguments as formulae. If no named arguments are specified, upgrade only outdated formulae",
+				},
+				{
+					name: "--env",
+					description: "Disabled other than for internal Homebrew use",
+				},
+				{
+					name: "--ignore-dependencies",
+					description:
+						"An unsupported Homebrew development flag to skip installing any dependencies of any kind. If the dependencies are not already present, the formula will have issues. If you're not developing Homebrew, consider adjusting your PATH rather than using this flag",
+				},
+				{
+					name: "--only-dependencies",
+					description:
+						"Install the dependencies with specified options but do not install the formula itself",
+				},
+				{
+					name: "--cc",
+					description:
+						"Attempt to compile using the specified compiler, which should be the name of the compiler's executable",
+					args: {
+						name: "compiler",
+						suggestions: ["gcc-7", "llvm_clang", "clang"],
+					},
+				},
+				{
+					name: "--force-bottle",
+					description:
+						"Install from a bottle if it exists for the current or newest version of macOS, even if it would not normally be used for installation",
+				},
+				{
+					name: "--include-test",
+					description:
+						"Install testing dependencies required to run brew test formula",
+				},
+				{
+					name: "--HEAD",
+					description:
+						"If formula defines it, install the HEAD version, aka. main, trunk, unstable, master",
+				},
+				{
+					name: "--fetch-HEAD",
+					description:
+						"Fetch the upstream repository to detect if the HEAD installation of the formula is outdated. Otherwise, the repository's HEAD will only be checked for updates when a new stable or development version has been released",
+				},
+				{
+					name: "--ignore-pinned",
+					description:
+						"Set a successful exit status even if pinned formulae are not upgraded",
+				},
+				{
+					name: "--keep-tmp",
+					description: "Retain the temporary files created during installation",
+				},
+				{
+					name: "--build-bottle",
+					description:
+						"Prepare the formula for eventual bottling during installation, skipping any post-install steps",
+				},
+				{
+					name: "--bottle-arch",
+					description:
+						"Optimise bottles for the specified architecture rather than the oldest architecture supported by the version of macOS the bottles are built on",
+				},
+				{
+					name: "--display-times",
+					description:
+						"Print install times for each formula at the end of the run",
+				},
+				{
+					name: ["--cask", "--casks"],
+					description:
+						"Treat all named arguments as casks. If no named arguments are specified, upgrade only outdated casks",
+				},
+				{
+					name: "--binaries",
+					description:
+						"Disable/enable linking of helper executables (default: enabled)",
+					exclusiveOn: ["--no-binaries"],
+				},
+				{
+					name: "--no-binaries",
+					description:
+						"Disable/enable linking of helper executables (default: enabled)",
+					exclusiveOn: ["--binaries"],
+				},
+				{
+					name: "--require-sha",
+					description: "Require all casks to have a checksum",
+				},
+				{
+					name: "--quarantine",
+					description:
+						"Disable/enable quarantining of downloads (default: enabled)",
+					exclusiveOn: ["--no-quarantine"],
+				},
+				{
+					name: "--no-quarantine",
+					description:
+						"Disable/enable quarantining of downloads (default: enabled)",
+					exclusiveOn: ["--quarantine"],
+				},
+				{
+					name: "--skip-cask-deps",
+					description: "Skip installing cask dependencies",
+				},
+				{
+					name: "--greedy",
+					description:
+						"Also include casks with auto_updates true or version :latest",
+					exclusiveOn: ["--greedy-latest", "--greedy-auto-updates"],
+				},
+				{
+					name: "--greedy-latest",
+					description: "Also include casks with version :latest",
+				},
+				{
+					name: "--greedy-auto-updates",
+					description: "Also include casks with auto_updates true",
+				},
+				{
+					name: "--appdir",
+					description:
+						"Target location for Applications (default: /Applications)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--colorpickerdir",
+					description:
+						"Target location for Color Pickers (default: ~/Library/ColorPickers)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--prefpanedir",
+					description:
+						"Target location for Preference Panes (default: ~/Library/PreferencePanes)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--qlplugindir",
+					description:
+						"Target location for QuickLook Plugins (default: ~/Library/QuickLook)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--mdimporterdir",
+					description:
+						"Target location for Spotlight Plugins (default: ~/Library/Spotlight)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--dictionarydir",
+					description:
+						"Target location for Dictionaries (default: ~/Library/Dictionaries)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--fontdir",
+					description: "Target location for Fonts (default: ~/Library/Fonts)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--servicedir",
+					description:
+						"Target location for Services (default: ~/Library/Services)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--input-methoddir",
+					description:
+						"Target location for Input Methods (default: ~/Library/Input Methods)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--internet-plugindir",
+					description:
+						"Target location for Internet Plugins (default: ~/Library/Internet Plug-Ins)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--audio-unit-plugindir",
+					description:
+						"Target location for Audio Unit Plugins (default: ~/Library/Audio/Plug-Ins/Components)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--vst-plugindir",
+					description:
+						"Target location for VST Plugins (default: ~/Library/Audio/Plug-Ins/VST)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--vst3-plugindir",
+					description:
+						"Target location for VST3 Plugins (default: ~/Library/Audio/Plug-Ins/VST3)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--screen-saverdir",
+					description:
+						"Target location for Screen Savers (default: ~/Library/Screen Savers)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--language",
+					description:
+						"Comma-separated list of language codes to prefer for cask installation. The first matching language is used, otherwise it reverts to the cask's default language. The default value is the language of your system",
+				},
+			],
+			args: {
+				isVariadic: true,
+				isOptional: true,
+				name: "outdated_formula|outdated_cask",
+				generators: outdatedformulaeGenerator,
+			},
+		},
+		{
+			name: "search",
+			description:
+				"Perform a substring search of cask tokens and formula names",
+			options: [
+				...commonOptions,
+				{
+					name: "--formula",
+					description: "Search online and locally for formulae",
+				},
+				{
+					name: "--cask",
+					description: "Search online and locally for casks",
+				},
+				{
+					name: "--desc",
+					description:
+						"Search for formulae with a description matching text and casks with a name matching text",
+				},
+				{
+					name: "--pull-request",
+					description: "Search for GitHub pull requests containing text",
+				},
+				{
+					name: "--open",
+					description: "Search for only open GitHub pull requests",
+				},
+				{
+					name: "--closed",
+					description: "Search for only closed GitHub pull requests",
+				},
+				{
+					name: ["--repology", "--macports"],
+					description: "Search for text in the given database",
+				},
+				{
+					name: ["--fink", "--opensuse"],
+					description: "Search for text in the given database",
+				},
+				{
+					name: ["--fedora", "--debian"],
+					description: "Search for text in the given database",
+				},
+				{
+					name: "--ubuntu",
+					description: "Search for text in the given database",
+				},
+			],
+		},
+		{
+			name: "config",
+			description: "Show Homebrew and system configuration info",
+		},
+		{
+			name: "postinstall",
+			description: "Rerun the post install step for formula",
+			options: [
+				{
+					name: ["-d", "--debug"],
+					description: "Display any debugging information",
+				},
+				{
+					name: ["-v", "--verbose"],
+					description: "Make some output more verbose",
+				},
+				{
+					name: ["-q", "--quiet"],
+					description: "Make some output more quiet",
+				},
+				{ name: ["-h", "--help"], description: "Show this message" },
+			],
+			args: {
+				isVariadic: true,
+				name: "formula",
+				generators: formulaeGenerator,
+			},
+		},
+		{
+			name: "install",
+			description: "Install <formula>",
+			options: [
+				{
+					name: ["-f", "--force"],
+					description:
+						"Install formulae without checking for previously installed keg-only or non-migrated versions. When installing casks",
+				},
+				{
+					name: ["-v", "--verbose"],
+					description: "Print the verification and postinstall steps",
+				},
+				{
+					name: ["-s", "--build-from-source"],
+					description:
+						"Compile formula from source even if a bottle is provided. Dependencies will still be installed from bottles if they are available",
+				},
+				{
+					name: ["-i", "--interactive"],
+					description: "Download and patch formula",
+				},
+				{ name: ["-g", "--git"], description: "Create a Git repository" },
+				{
+					name: ["-q", "--quiet"],
+					description: "Make some output more quiet",
+				},
+				{ name: ["-h", "--help"], description: "Show this message" },
+				{
+					name: "--formula",
+					description: "Treat all named arguments as formulae",
+				},
+				{
+					name: "--env",
+					description: "Disabled other than for internal Homebrew use",
+				},
+				{
+					name: "--ignore-dependencies",
+					description:
+						"An unsupported Homebrew development flag to skip installing any dependencies of any kind. If the dependencies are not already present, the formula will have issues. If you're not developing Homebrew, consider adjusting your PATH rather than using this flag",
+				},
+				{
+					name: "--only-dependencies",
+					description:
+						"Install the dependencies with specified options but do not install the formula itself",
+				},
+				{
+					name: "--cc",
+					description:
+						"Attempt to compile using the specified compiler, which should be the name of the compiler's executable",
+					args: {
+						name: "compiler",
+						suggestions: ["gcc-7", "llvm_clang", "clang"],
+					},
+				},
+				{
+					name: "--force-bottle",
+					description:
+						"Install from a bottle if it exists for the current or newest version of macOS, even if it would not normally be used for installation",
+				},
+				{
+					name: "--include-test",
+					description:
+						"Install testing dependencies required to run brew test formula",
+				},
+				{
+					name: "--HEAD",
+					description:
+						"If formula defines it, install the HEAD version, aka. main, trunk, unstable, master",
+				},
+				{
+					name: "--fetch-HEAD",
+					description:
+						"Fetch the upstream repository to detect if the HEAD installation of the formula is outdated. Otherwise, the repository's HEAD will only be checked for updates when a new stable or development version has been released",
+				},
+				{
+					name: "--keep-tmp",
+					description: "Retain the temporary files created during installation",
+				},
+				{
+					name: "--build-bottle",
+					description:
+						"Prepare the formula for eventual bottling during installation, skipping any post-install steps",
+				},
+				{
+					name: "--bottle-arch",
+					description:
+						"Optimise bottles for the specified architecture rather than the oldest architecture supported by the version of macOS the bottles are built on",
+				},
+				{
+					name: "--display-times",
+					description:
+						"Print install times for each formula at the end of the run",
+				},
+				{
+					name: "--cask",
+					description: "--casks Treat all named arguments as casks",
+				},
+				{
+					name: "--binaries",
+					description:
+						"Disable/enable linking of helper executables (default: enabled)",
+				},
+				{
+					name: "--no-binaries",
+					description:
+						"Disable/enable linking of helper executables (default: enabled)",
+				},
+				{
+					name: "--require-sha",
+					description: "Require all casks to have a checksum",
+				},
+				{
+					name: "--quarantine",
+					description:
+						"Disable/enable quarantining of downloads (default: enabled)",
+				},
+				{
+					name: "--no-quarantine",
+					description:
+						"Disable/enable quarantining of downloads (default: enabled)",
+				},
+				{
+					name: "--skip-cask-deps",
+					description: "Skip installing cask dependencies",
+				},
+				{
+					name: "--appdir",
+					description:
+						"Target location for Applications (default: /Applications)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--colorpickerdir",
+					description:
+						"Target location for Color Pickers (default: ~/Library/ColorPickers)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--prefpanedir",
+					description:
+						"Target location for Preference Panes (default: ~/Library/PreferencePanes)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--qlplugindir",
+					description:
+						"Target location for QuickLook Plugins (default: ~/Library/QuickLook)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--mdimporterdir",
+					description:
+						"Target location for Spotlight Plugins (default: ~/Library/Spotlight)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--dictionarydir",
+					description:
+						"Target location for Dictionaries (default: ~/Library/Dictionaries)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--fontdir",
+					description: "Target location for Fonts (default: ~/Library/Fonts)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--servicedir",
+					description:
+						"Target location for Services (default: ~/Library/Services)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--input-methoddir",
+					description:
+						"Target location for Input Methods (default: ~/Library/Input Methods)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--internet-plugindir",
+					description:
+						"Target location for Internet Plugins (default: ~/Library/Internet Plug-Ins)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--audio-unit-plugindir",
+					description:
+						"Target location for Audio Unit Plugins (default: ~/Library/Audio/Plug-Ins/Components)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--vst-plugindir",
+					description:
+						"Target location for VST Plugins (default: ~/Library/Audio/Plug-Ins/VST)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--vst3-plugindir",
+					description:
+						"Target location for VST3 Plugins (default: ~/Library/Audio/Plug-Ins/VST3)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--screen-saverdir",
+					description:
+						"Target location for Screen Savers (default: ~/Library/Screen Savers)",
+					args: {
+						name: "location",
+						template: "folders",
+					},
+				},
+				{
+					name: "--language",
+					description:
+						"Comma-separated list of language codes to prefer for cask installation. The first matching language is used, otherwise it reverts to the cask's default language. The default value is the language of your system",
+				},
+			],
+			args: {
+				isVariadic: true,
+				name: "formula",
+				description: "Formula or cask to install",
+				generators: [generateAllFormulae, generateAllCasks],
+			},
+		},
+		{
+			name: "reinstall",
+			description:
+				"Uninstall and then reinstall a formula or cask using the same options it was originally installed with, plus any appended options specific to a formula",
+			options: [
+				{
+					name: ["-d", "--debug"],
+					description:
+						"If brewing fails, open an interactive debugging session with access to IRB or a shell inside the temporary build directory",
+				},
+				{
+					name: ["-f", "--force"],
+					description:
+						"Install formulae without checking for previously installed keg-only or non-migrated versions. When installing casks",
+				},
+				{
+					name: ["-v", "--verbose"],
+					description: "Print the verification and postinstall steps",
+				},
+				{
+					name: ["-s", "--build-from-source"],
+					description:
+						"Compile formula from source even if a bottle is provided. Dependencies will still be installed from bottles if they are available",
+				},
+				{
+					name: ["-i", "--interactive"],
+					description: "Download and patch formula",
+				},
+				{ name: ["-g", "--git"], description: "Create a Git repository" },
+				{
+					name: "--formula",
+					description: "Treat all named arguments as formulae",
+				},
+				{
+					name: "--force-bottle",
+					description:
+						"Install from a bottle if it exists for the current or newest version of macOS, even if it would not normally be used for installation",
+				},
+				{
+					name: "--keep-tmp",
+					description: "Retain the temporary files created during installation",
+				},
+				{
+					name: "--display-times",
+					description:
+						"Print install times for each formula at the end of the run",
+				},
+				{
+					name: "--cask",
+					description: "--casks Treat all named arguments as casks",
+				},
+				{
+					name: "--binaries",
+					description:
+						"Disable/enable linking of helper executables (default: enabled)",
+					exclusiveOn: ["--no-binaries"],
+				},
+				{
+					name: "--no-binaries",
+					description:
+						"Disable/enable linking of helper executables (default: enabled)",
+					exclusiveOn: ["--binaries"],
+				},
+				{
+					name: "--require-sha",
+					description: "Require all casks to have a checksum",
+				},
+				{
+					name: "--quarantine",
+					description:
+						"Disable/enable quarantining of downloads (default: enabled)",
+					exclusiveOn: ["--no-quarantine"],
+				},
+				{
+					name: "--no-quarantine",
+					description:
+						"Disable/enable quarantining of downloads (default: enabled)",
+					exclusiveOn: ["--quarantine"],
+				},
+				{
+					name: "--skip-cask-deps",
+					description: "Skip installing cask dependencies",
+				},
+			],
+			args: {
+				isVariadic: true,
+				name: "formula",
+				generators: formulaeGenerator,
+			},
+		},
+		{
+			name: ["uninstall", "remove", "rm"],
+			description: "Uninstall a formula or cask",
+			args: {
+				isVariadic: true,
+				name: "formula",
+				generators: formulaeGenerator,
+			},
+		},
+		{
+			// NOTE: this is actually a command even if it has the double dash in the front
+			name: "--prefix",
+			description: "Prefix of <formula>",
+			args: {
+				isVariadic: true,
+				name: "formula",
+				generators: formulaeGenerator,
+			},
+			options: [
+				{
+					name: "--unbrewed",
+					description:
+						"List files in Homebrew's prefix not installed by Homebrew",
+				},
+				{
+					name: "--installed",
+					description:
+						"Outputs nothing and returns a failing status code if formula is not installed",
+				},
+			],
+		},
+		{
+			name: "cask",
+			description:
+				"Homebrew Cask provides a friendly CLI workflow for the administration of macOS applications distributed as binaries",
+			subcommands: [
+				{
+					name: "install",
+					description: "Installs the given cask",
+					args: {
+						name: "cask",
+						description: "Cask to install",
+					},
+				},
+				{
+					name: "uninstall",
+					description: "Uninstalls the given cask",
+					options: [
+						...commonOptions,
+						{
+							name: "--zap",
+							description:
+								"Remove all files associated with a cask. May remove files which are shared between applications",
+						},
+						{
+							name: "--ignore-dependencies",
+							description:
+								"Don't fail uninstall, even if formula is a dependency of any installed formulae",
+						},
+						{
+							name: "--formula",
+							description: "Treat all named arguments as formulae",
+						},
+						{
+							name: "--cask",
+							description: "Treat all named arguments as casks",
+						},
+					],
+					args: {
+						isVariadic: true,
 
-            generators: {
-              script: ["brew", "list", "-1", "--cask"],
-              postProcess: function (out) {
-                return out.split("\n").map((formula) => {
-                  return {
-                    name: formula,
-                    icon: "🍺",
-                    description: "Installed formula",
-                  };
-                });
-              },
-            },
-          },
-        },
-      ],
-    },
-    {
-      name: "cleanup",
-      description:
-        "Remove stale lock files and outdated downloads for all formulae and casks and remove old versions of installed formulae",
-      options: [
-        ...commonOptions,
-        {
-          name: ["--prune", "--prune=all"],
-          description: "Remove all cache files older than specified days",
-        },
-        {
-          name: ["-n", "--dry-run"],
-          description:
-            "Show what would be removed, but do not actually remove anything",
-        },
-        {
-          name: "-s",
-          description:
-            "Scrub the cache, including downloads for even the latest versions",
-        },
-        {
-          name: "--prune-prefix",
-          description:
-            "Only prune the symlinks and directories from the prefix and remove no other files",
-        },
-      ],
-      args: {
-        isVariadic: true,
-        isOptional: true,
-        generators: servicesGenerator("Cleanup"),
-      },
-    },
-    {
-      name: "services",
-      description:
-        "Manage background services with macOS' launchctl(1) daemon manager",
-      options: [
-        ...commonOptions,
-        {
-          name: "--file",
-          description:
-            "Use the plist file from this location to start or run the service",
-        },
-        {
-          name: "--all",
-          description: "Run subcommand on all services",
-        },
-        {
-          name: ["-v", "--verbose"],
-          description: "Make some output more verbose",
-        },
-        {
-          name: ["-h", "--help"],
-          description: "Get help with services command",
-        },
-      ],
-      subcommands: [
-        {
-          name: "cleanup",
-          description: "Remove all unused services",
-        },
-        {
-          name: "list",
-          description: "List all services",
-        },
-        {
-          name: "run",
-          description:
-            "Run the service formula without registering to launch at login (or boot)",
-          options: [
-            {
-              name: "--all",
-              description: "Start all services",
-            },
-          ],
-          args: {
-            isVariadic: true,
-            generators: servicesGenerator("Run"),
-          },
-        },
-        {
-          name: "start",
-          description:
-            "Start the service formula immediately and register it to launch at login",
-          options: [
-            {
-              name: "--all",
-              description: "Start all services",
-            },
-          ],
-          args: {
-            isVariadic: true,
-            generators: servicesGenerator("Start"),
-          },
-        },
-        {
-          name: "stop",
-          description:
-            "Stop the service formula immediately and unregister it from launching at",
-          options: [
-            {
-              name: "--all",
-              description: "Start all services",
-            },
-          ],
-          args: {
-            isVariadic: true,
-            generators: servicesGenerator("Stop"),
-          },
-        },
-        {
-          name: "restart",
-          description:
-            "Stop (if necessary) and start the service formula immediately and register it to launch at login (or boot)",
-          options: [
-            {
-              name: "--all",
-              description: "Start all services",
-            },
-          ],
-          args: {
-            isVariadic: true,
-            generators: servicesGenerator("Restart"),
-          },
-        },
-      ],
-    },
-    {
-      name: "analytics",
-      description: "Manages analytics preferences",
-      subcommands: [
-        {
-          name: "on",
-          description: "Turns on analytics",
-        },
-        {
-          name: "off",
-          description: "Turns off analytics",
-        },
-        {
-          name: "regenerate-uuid",
-          description: "Regenerate the UUID used for analytics",
-        },
-      ],
-    },
-    {
-      name: "autoremove",
-      description:
-        "Uninstall formulae that were only installed as a dependency of another formula and are now no longer needed",
-      options: [
-        {
-          name: ["-n", "--dry-run"],
-          description:
-            "List what would be uninstalled, but do not actually uninstall anything",
-        },
-      ],
-    },
-    {
-      name: "tap",
-      description: "Tap a formula repository",
-      options: [
-        ...commonOptions,
-        {
-          name: "--full",
-          description:
-            "Convert a shallow clone to a full clone without untapping",
-        },
-        {
-          name: "--shallow",
-          description: "Fetch tap as a shallow clone rather than a full clone",
-        },
-        {
-          name: "--force-auto-update",
-          description: "Auto-update tap even if it is not hosted on GitHub",
-        },
-        {
-          name: "--repair",
-          description:
-            "Migrate tapped formulae from symlink-based to directory-based structure",
-        },
-        {
-          name: "--list-pinned",
-          description: "List all pinned taps",
-        },
-      ],
-      args: {
-        name: "user/repo or URL",
-      },
-    },
-    {
-      name: "untap",
-      description: "Remove a tapped formula repository",
-      args: {
-        name: "repository",
-        generators: repositoriesGenerator(),
-      },
-      options: [
-        {
-          name: ["-f", "--force"],
-          description:
-            "Untap even if formulae or casks from this tap are currently installed",
-        },
-        {
-          name: ["-d", "--debug"],
-          description: "Display any debugging information",
-        },
-        {
-          name: ["-q", "--quiet"],
-          description: "Make some output more quiet",
-        },
-        {
-          name: ["-v", "--verbose"],
-          description: "Make some output more verbose",
-        },
-        {
-          name: ["-h", "--help"],
-          description: "Show help message",
-        },
-      ],
-    },
-    {
-      name: "link",
-      description:
-        "Symlink all of formula's installed files into Homebrew's prefix",
-      args: {
-        isOptional: true,
-        isVariadic: true,
-        name: "formula",
-        generators: formulaeGenerator,
-      },
-      options: [
-        {
-          name: "--overwrite",
-          description:
-            "Delete files that already exist in the prefix while linking",
-        },
-        {
-          name: ["-n", "--dry-run"],
-          description:
-            "List files which would be linked or deleted by brew link --overwrite without actually linking or deleting any files",
-        },
-        {
-          name: ["-f", "--force"],
-          description: "Allow keg-only formulae to be linked",
-        },
-        {
-          name: "--HEAD",
-          description:
-            "Link the HEAD version of the formula if it is installed",
-        },
-      ],
-    },
-    {
-      name: "unlink",
-      description: "Remove symlinks for formula from Homebrew's prefix",
-      args: {
-        isOptional: true,
-        isVariadic: true,
-        name: "formula",
-        generators: formulaeGenerator,
-      },
-      options: [
-        {
-          name: ["-n", "--dry-run"],
-          description:
-            "List files which would be unlinked without actually unlinking or deleting any files",
-        },
-      ],
-    },
-    {
-      name: "formulae",
-      description: "List all available formulae",
-    },
-    {
-      name: "casks",
-      description: "List all available casks",
-    },
-    {
-      name: "edit",
-      description: "",
-      args: {
-        isVariadic: true,
-        isOptional: true,
-        name: "formula",
-        description: "Formula or cask to install",
-        generators: [generateAllFormulae, generateAllCasks],
-      },
-      options: [
-        ...commonOptions,
-        {
-          name: ["--formula", "--formulae"],
-          description: "Treat all named arguments as formulae",
-        },
-        {
-          name: ["--cask", "--casks"],
-          description: "Treat all named arguments as casks",
-        },
-      ],
-    },
-    {
-      name: ["home", "homepage"],
-      description:
-        "Open a formula, cask's homepage in a browser, or open Homebrew's own homepage if no argument is provided",
-      args: {
-        isVariadic: true,
-        isOptional: true,
-        name: "formula",
-        description: "Formula or cask to open homepage for",
-        generators: [generateAllFormulae, generateAllCasks],
-      },
-      options: [
-        ...commonOptions,
-        {
-          name: ["--formula", "--formulae"],
-          description: "Treat all named arguments as formulae",
-        },
-        {
-          name: ["--cask", "--casks"],
-          description: "Treat all named arguments as casks",
-        },
-      ],
-    },
-    {
-      name: "alias",
-      description: "Manage custom user created brew aliases",
-      options: [
-        {
-          name: "--edit",
-          description: "Edit aliases in a text editor",
-        },
-        {
-          name: ["-d", "--debug"],
-          description: "Display any debugging information",
-        },
-        {
-          name: ["-q", "--quiet"],
-          description: "Make some output more quiet",
-        },
-        {
-          name: ["-v", "--verbose"],
-          description: "Make some output more verbose",
-        },
-        {
-          name: ["-h", "--help"],
-          description: "Show help message",
-        },
-      ],
-      args: {
-        name: "alias",
-        generators: generateAliases,
-        description: "Display the alias command",
-        isOptional: true,
-      },
-    },
-    {
-      name: "developer",
-      description: "Display the current state of Homebrew's developer mode",
-      args: {
-        name: "state",
-        description: "Turn Homebrew's developer mode on or off respectively",
-        suggestions: ["on", "off"],
-        isOptional: true,
-      },
-    },
-  ],
-  options: [
-    {
-      name: "--version",
-      description: "The current Homebrew version",
-    },
-  ],
-  args: {
-    name: "alias",
-    generators: generateAliases,
-    description: "Custom user defined brew alias",
-    isOptional: true,
-  },
+						generators: {
+							script: ["brew", "list", "-1", "--cask"],
+							postProcess: function (out) {
+								return out.split("\n").map((formula) => {
+									return {
+										name: formula,
+										icon: "🍺",
+										description: "Installed formula",
+									};
+								});
+							},
+						},
+					},
+				},
+			],
+		},
+		{
+			name: "cleanup",
+			description:
+				"Remove stale lock files and outdated downloads for all formulae and casks and remove old versions of installed formulae",
+			options: [
+				...commonOptions,
+				{
+					name: ["--prune", "--prune=all"],
+					description: "Remove all cache files older than specified days",
+				},
+				{
+					name: ["-n", "--dry-run"],
+					description:
+						"Show what would be removed, but do not actually remove anything",
+				},
+				{
+					name: "-s",
+					description:
+						"Scrub the cache, including downloads for even the latest versions",
+				},
+				{
+					name: "--prune-prefix",
+					description:
+						"Only prune the symlinks and directories from the prefix and remove no other files",
+				},
+			],
+			args: {
+				isVariadic: true,
+				isOptional: true,
+				generators: servicesGenerator("Cleanup"),
+			},
+		},
+		{
+			name: "services",
+			description:
+				"Manage background services with macOS' launchctl(1) daemon manager",
+			options: [
+				...commonOptions,
+				{
+					name: "--file",
+					description:
+						"Use the plist file from this location to start or run the service",
+				},
+				{
+					name: "--all",
+					description: "Run subcommand on all services",
+				},
+				{
+					name: ["-v", "--verbose"],
+					description: "Make some output more verbose",
+				},
+				{
+					name: ["-h", "--help"],
+					description: "Get help with services command",
+				},
+			],
+			subcommands: [
+				{
+					name: "cleanup",
+					description: "Remove all unused services",
+				},
+				{
+					name: "list",
+					description: "List all services",
+				},
+				{
+					name: "run",
+					description:
+						"Run the service formula without registering to launch at login (or boot)",
+					options: [
+						{
+							name: "--all",
+							description: "Start all services",
+						},
+					],
+					args: {
+						isVariadic: true,
+						generators: servicesGenerator("Run"),
+					},
+				},
+				{
+					name: "start",
+					description:
+						"Start the service formula immediately and register it to launch at login",
+					options: [
+						{
+							name: "--all",
+							description: "Start all services",
+						},
+					],
+					args: {
+						isVariadic: true,
+						generators: servicesGenerator("Start"),
+					},
+				},
+				{
+					name: "stop",
+					description:
+						"Stop the service formula immediately and unregister it from launching at",
+					options: [
+						{
+							name: "--all",
+							description: "Start all services",
+						},
+					],
+					args: {
+						isVariadic: true,
+						generators: servicesGenerator("Stop"),
+					},
+				},
+				{
+					name: "restart",
+					description:
+						"Stop (if necessary) and start the service formula immediately and register it to launch at login (or boot)",
+					options: [
+						{
+							name: "--all",
+							description: "Start all services",
+						},
+					],
+					args: {
+						isVariadic: true,
+						generators: servicesGenerator("Restart"),
+					},
+				},
+			],
+		},
+		{
+			name: "analytics",
+			description: "Manages analytics preferences",
+			subcommands: [
+				{
+					name: "on",
+					description: "Turns on analytics",
+				},
+				{
+					name: "off",
+					description: "Turns off analytics",
+				},
+				{
+					name: "regenerate-uuid",
+					description: "Regenerate the UUID used for analytics",
+				},
+			],
+		},
+		{
+			name: "autoremove",
+			description:
+				"Uninstall formulae that were only installed as a dependency of another formula and are now no longer needed",
+			options: [
+				{
+					name: ["-n", "--dry-run"],
+					description:
+						"List what would be uninstalled, but do not actually uninstall anything",
+				},
+			],
+		},
+		{
+			name: "tap",
+			description: "Tap a formula repository",
+			options: [
+				...commonOptions,
+				{
+					name: "--full",
+					description:
+						"Convert a shallow clone to a full clone without untapping",
+				},
+				{
+					name: "--shallow",
+					description: "Fetch tap as a shallow clone rather than a full clone",
+				},
+				{
+					name: "--force-auto-update",
+					description: "Auto-update tap even if it is not hosted on GitHub",
+				},
+				{
+					name: "--repair",
+					description:
+						"Migrate tapped formulae from symlink-based to directory-based structure",
+				},
+				{
+					name: "--list-pinned",
+					description: "List all pinned taps",
+				},
+			],
+			args: {
+				name: "user/repo or URL",
+			},
+		},
+		{
+			name: "untap",
+			description: "Remove a tapped formula repository",
+			args: {
+				name: "repository",
+				generators: repositoriesGenerator(),
+			},
+			options: [
+				{
+					name: ["-f", "--force"],
+					description:
+						"Untap even if formulae or casks from this tap are currently installed",
+				},
+				{
+					name: ["-d", "--debug"],
+					description: "Display any debugging information",
+				},
+				{
+					name: ["-q", "--quiet"],
+					description: "Make some output more quiet",
+				},
+				{
+					name: ["-v", "--verbose"],
+					description: "Make some output more verbose",
+				},
+				{
+					name: ["-h", "--help"],
+					description: "Show help message",
+				},
+			],
+		},
+		{
+			name: "link",
+			description:
+				"Symlink all of formula's installed files into Homebrew's prefix",
+			args: {
+				isOptional: true,
+				isVariadic: true,
+				name: "formula",
+				generators: formulaeGenerator,
+			},
+			options: [
+				{
+					name: "--overwrite",
+					description:
+						"Delete files that already exist in the prefix while linking",
+				},
+				{
+					name: ["-n", "--dry-run"],
+					description:
+						"List files which would be linked or deleted by brew link --overwrite without actually linking or deleting any files",
+				},
+				{
+					name: ["-f", "--force"],
+					description: "Allow keg-only formulae to be linked",
+				},
+				{
+					name: "--HEAD",
+					description:
+						"Link the HEAD version of the formula if it is installed",
+				},
+			],
+		},
+		{
+			name: "unlink",
+			description: "Remove symlinks for formula from Homebrew's prefix",
+			args: {
+				isOptional: true,
+				isVariadic: true,
+				name: "formula",
+				generators: formulaeGenerator,
+			},
+			options: [
+				{
+					name: ["-n", "--dry-run"],
+					description:
+						"List files which would be unlinked without actually unlinking or deleting any files",
+				},
+			],
+		},
+		{
+			name: "formulae",
+			description: "List all available formulae",
+		},
+		{
+			name: "casks",
+			description: "List all available casks",
+		},
+		{
+			name: "edit",
+			description: "",
+			args: {
+				isVariadic: true,
+				isOptional: true,
+				name: "formula",
+				description: "Formula or cask to install",
+				generators: [generateAllFormulae, generateAllCasks],
+			},
+			options: [
+				...commonOptions,
+				{
+					name: ["--formula", "--formulae"],
+					description: "Treat all named arguments as formulae",
+				},
+				{
+					name: ["--cask", "--casks"],
+					description: "Treat all named arguments as casks",
+				},
+			],
+		},
+		{
+			name: ["home", "homepage"],
+			description:
+				"Open a formula, cask's homepage in a browser, or open Homebrew's own homepage if no argument is provided",
+			args: {
+				isVariadic: true,
+				isOptional: true,
+				name: "formula",
+				description: "Formula or cask to open homepage for",
+				generators: [generateAllFormulae, generateAllCasks],
+			},
+			options: [
+				...commonOptions,
+				{
+					name: ["--formula", "--formulae"],
+					description: "Treat all named arguments as formulae",
+				},
+				{
+					name: ["--cask", "--casks"],
+					description: "Treat all named arguments as casks",
+				},
+			],
+		},
+		{
+			name: "alias",
+			description: "Manage custom user created brew aliases",
+			options: [
+				{
+					name: "--edit",
+					description: "Edit aliases in a text editor",
+				},
+				{
+					name: ["-d", "--debug"],
+					description: "Display any debugging information",
+				},
+				{
+					name: ["-q", "--quiet"],
+					description: "Make some output more quiet",
+				},
+				{
+					name: ["-v", "--verbose"],
+					description: "Make some output more verbose",
+				},
+				{
+					name: ["-h", "--help"],
+					description: "Show help message",
+				},
+			],
+			args: {
+				name: "alias",
+				generators: generateAliases,
+				description: "Display the alias command",
+				isOptional: true,
+			},
+		},
+		{
+			name: "developer",
+			description: "Display the current state of Homebrew's developer mode",
+			args: {
+				name: "state",
+				description: "Turn Homebrew's developer mode on or off respectively",
+				suggestions: ["on", "off"],
+				isOptional: true,
+			},
+		},
+	],
+	options: [
+		{
+			name: "--version",
+			description: "The current Homebrew version",
+		},
+	],
+	args: {
+		name: "alias",
+		generators: generateAliases,
+		description: "Custom user defined brew alias",
+		isOptional: true,
+	},
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/cat.ts b/extensions/terminal-suggest/src/completions/upstream/cat.ts
index 4e06dacd8b47..b67e19b9c59d 100644
--- a/extensions/terminal-suggest/src/completions/upstream/cat.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/cat.ts
@@ -1,50 +1,50 @@
 const completionSpec: Fig.Spec = {
-  name: "cat",
-  description: "Concatenate and print files",
-  args: {
-    isVariadic: true,
-    template: "filepaths",
-  },
-  options: [
-    {
-      name: "-b",
-      description: "Number the non-blank output lines, starting at 1",
-    },
-
-    {
-      name: "-e",
-      description:
-        "Display non-printing characters (see the -v option), and display a dollar sign (‘$’) at the end of each line",
-    },
-
-    {
-      name: "-l",
-      description:
-        "Set an exclusive advisory lock on the standard output file descriptor.  This lock is set using fcntl(2) with the F_SETLKW command. If the output file is already locked, cat will block until the lock is acquired",
-    },
-
-    { name: "-n", description: "Number the output lines, starting at 1" },
-
-    {
-      name: "-s",
-      description:
-        "Squeeze multiple adjacent empty lines, causing the output to be single spaced",
-    },
-
-    {
-      name: "-t",
-      description:
-        "Display non-printing characters (see the -v option), and display tab characters as ‘^I’",
-    },
-
-    { name: "-u", description: "Disable output buffering" },
-
-    {
-      name: "-v",
-      description:
-        "Display non-printing characters so they are visible.  Control characters print as ‘^X’ for control-X; the delete character (octal 0177) prints as ‘^?’.  Non-ASCII characters (with the high bit set) are printed as ‘M-’ (for meta) followed by the character for the low 7 bits",
-    },
-  ],
+	name: "cat",
+	description: "Concatenate and print files",
+	args: {
+		isVariadic: true,
+		template: "filepaths",
+	},
+	options: [
+		{
+			name: "-b",
+			description: "Number the non-blank output lines, starting at 1",
+		},
+
+		{
+			name: "-e",
+			description:
+				"Display non-printing characters (see the -v option), and display a dollar sign (‘$’) at the end of each line",
+		},
+
+		{
+			name: "-l",
+			description:
+				"Set an exclusive advisory lock on the standard output file descriptor.  This lock is set using fcntl(2) with the F_SETLKW command. If the output file is already locked, cat will block until the lock is acquired",
+		},
+
+		{ name: "-n", description: "Number the output lines, starting at 1" },
+
+		{
+			name: "-s",
+			description:
+				"Squeeze multiple adjacent empty lines, causing the output to be single spaced",
+		},
+
+		{
+			name: "-t",
+			description:
+				"Display non-printing characters (see the -v option), and display tab characters as ‘^I’",
+		},
+
+		{ name: "-u", description: "Disable output buffering" },
+
+		{
+			name: "-v",
+			description:
+				"Display non-printing characters so they are visible.  Control characters print as ‘^X’ for control-X; the delete character (octal 0177) prints as ‘^?’.  Non-ASCII characters (with the high bit set) are printed as ‘M-’ (for meta) followed by the character for the low 7 bits",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/chmod.ts b/extensions/terminal-suggest/src/completions/upstream/chmod.ts
index 93bc7264e8bb..c3b72a01a2fe 100644
--- a/extensions/terminal-suggest/src/completions/upstream/chmod.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/chmod.ts
@@ -1,88 +1,88 @@
 const completionSpec: Fig.Spec = {
-  name: "chmod",
-  description: "Change file modes or Access Control Lists",
-  args: [
-    {
-      name: "mode",
-      suggestions: [
-        // Some of the most common chmod's (non-exhaustive)
-        {
-          name: "u+x",
-          type: "arg",
-          description: "Give execute permission for the user",
-          icon: "🔐",
-        },
-        {
-          name: "a+rx",
-          type: "arg",
-          description: "Adds read and execute permissions for all classes",
-          icon: "🔐",
-        },
-        {
-          name: "744",
-          type: "arg",
-          description:
-            "Sets read, write, and execute permissions for user, and sets read permission for Group and Others",
-          icon: "🔐",
-        },
-        {
-          name: "664",
-          type: "arg",
-          description:
-            "Sets read and write permissions for user and Group, and provides read to Others",
-          icon: "🔐",
-        },
-        {
-          name: "777",
-          type: "arg",
-          description: "⚠️ allows all actions for all users",
-          icon: "🔐",
-        },
-      ],
-    },
-    {
-      // Modifying
-      template: "filepaths",
-    },
-  ],
+	name: "chmod",
+	description: "Change file modes or Access Control Lists",
+	args: [
+		{
+			name: "mode",
+			suggestions: [
+				// Some of the most common chmod's (non-exhaustive)
+				{
+					name: "u+x",
+					type: "arg",
+					description: "Give execute permission for the user",
+					icon: "🔐",
+				},
+				{
+					name: "a+rx",
+					type: "arg",
+					description: "Adds read and execute permissions for all classes",
+					icon: "🔐",
+				},
+				{
+					name: "744",
+					type: "arg",
+					description:
+						"Sets read, write, and execute permissions for user, and sets read permission for Group and Others",
+					icon: "🔐",
+				},
+				{
+					name: "664",
+					type: "arg",
+					description:
+						"Sets read and write permissions for user and Group, and provides read to Others",
+					icon: "🔐",
+				},
+				{
+					name: "777",
+					type: "arg",
+					description: "⚠️ allows all actions for all users",
+					icon: "🔐",
+				},
+			],
+		},
+		{
+			// Modifying
+			template: "filepaths",
+		},
+	],
 
-  options: [
-    {
-      name: "-f",
-      description:
-        "Do not display a diagnostic message if chmod could not modify the mode for file, nor modify the exit status to reflect such failures",
-    },
-    {
-      name: "-H",
-      description:
-        "If the -R option is specified, symbolic links on the command line are followed and hence unaffected by the command.  (Symbolic links encountered during tree traversal are not followed.)",
-    },
-    {
-      name: "-h",
-      description:
-        "If the file is a symbolic link, change the mode of the link itself rather than the file that the link points to",
-    },
-    {
-      name: "-L",
-      description:
-        "If the -R option is specified, all symbolic links are followed",
-    },
-    {
-      name: "-P",
-      description:
-        "If the -R option is specified, no symbolic links are followed. This is the default",
-    },
-    {
-      name: "-R",
-      description:
-        "Change the modes of the file hierarchies rooted in the files, instead of just the files themselves. Beware of unintentionally matching the ``..'' hard link to the parent directory when using wildcards like ``.*''",
-    },
-    {
-      name: "-v",
-      description:
-        "Cause chmod to be verbose, showing filenames as the mode is modified. If the -v flag is specified more than once, the old and new modes of the file will also be printed, in both octal and symbolic notation",
-    },
-  ],
+	options: [
+		{
+			name: "-f",
+			description:
+				"Do not display a diagnostic message if chmod could not modify the mode for file, nor modify the exit status to reflect such failures",
+		},
+		{
+			name: "-H",
+			description:
+				"If the -R option is specified, symbolic links on the command line are followed and hence unaffected by the command.  (Symbolic links encountered during tree traversal are not followed.)",
+		},
+		{
+			name: "-h",
+			description:
+				"If the file is a symbolic link, change the mode of the link itself rather than the file that the link points to",
+		},
+		{
+			name: "-L",
+			description:
+				"If the -R option is specified, all symbolic links are followed",
+		},
+		{
+			name: "-P",
+			description:
+				"If the -R option is specified, no symbolic links are followed. This is the default",
+		},
+		{
+			name: "-R",
+			description:
+				"Change the modes of the file hierarchies rooted in the files, instead of just the files themselves. Beware of unintentionally matching the ``..'' hard link to the parent directory when using wildcards like ``.*''",
+		},
+		{
+			name: "-v",
+			description:
+				"Cause chmod to be verbose, showing filenames as the mode is modified. If the -v flag is specified more than once, the old and new modes of the file will also be printed, in both octal and symbolic notation",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/chown.ts b/extensions/terminal-suggest/src/completions/upstream/chown.ts
index c271be0bd401..3ee4f0f0142b 100644
--- a/extensions/terminal-suggest/src/completions/upstream/chown.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/chown.ts
@@ -1,117 +1,117 @@
 export const existingUsersandGroups: Fig.Generator = {
-  custom: async function (tokens, executeShellCommand) {
-    const colonAdded = tokens.find((token) => token.includes(":"));
-    const nFlagUsed = tokens.find((token) => /^-.*n.*/.test(token));
+	custom: async function (tokens, executeShellCommand) {
+		const colonAdded = tokens.find((token) => token.includes(":"));
+		const nFlagUsed = tokens.find((token) => /^-.*n.*/.test(token));
 
-    let shell: string;
-    // Using `:` as a trigger, check to see if a colon is added
-    // in the current command. If it is, get the system groups
-    // else retrieve the list of system users
-    if (colonAdded) {
-      const { stdout } = await executeShellCommand({
-        command: "bash",
-        args: [
-          "-c",
-          "dscl . -list /Groups PrimaryGroupID | tr -s ' '| sort -r",
-        ],
-      });
-      shell = stdout;
-    } else {
-      const { stdout } = await executeShellCommand({
-        command: "bash",
-        args: ["-c", "dscl . -list /Users UniqueID | tr -s ' '| sort -r"],
-      });
-      shell = stdout;
-    }
+		let shell: string;
+		// Using `:` as a trigger, check to see if a colon is added
+		// in the current command. If it is, get the system groups
+		// else retrieve the list of system users
+		if (colonAdded) {
+			const { stdout } = await executeShellCommand({
+				command: "bash",
+				args: [
+					"-c",
+					"dscl . -list /Groups PrimaryGroupID | tr -s ' '| sort -r",
+				],
+			});
+			shell = stdout;
+		} else {
+			const { stdout } = await executeShellCommand({
+				command: "bash",
+				args: ["-c", "dscl . -list /Users UniqueID | tr -s ' '| sort -r"],
+			});
+			shell = stdout;
+		}
 
-    return (
-      shell
-        .split("\n")
-        // The shell command retrieves a table
-        // with rows that look like `user uid`
-        // so each row is split again to get the
-        // user/group and uid/gid
-        .map((line) => line.split(" "))
-        .map((value) => {
-          return {
-            // If the user has entered the option n
-            // suggest the uid/gid instead of user/group
-            name: nFlagUsed ? value[1] : value[0],
-            description: colonAdded
-              ? `Group - ${nFlagUsed ? value[0] : `gid: ${value[1]}`}`
-              : `User - ${nFlagUsed ? value[0] : `uid: ${value[1]}`}`,
-            icon: colonAdded ? "👥" : "👤",
-            priority: 90,
-          };
-        })
-    );
-  },
-  trigger: ":",
-  getQueryTerm: ":",
+		return (
+			shell
+				.split("\n")
+				// The shell command retrieves a table
+				// with rows that look like `user uid`
+				// so each row is split again to get the
+				// user/group and uid/gid
+				.map((line) => line.split(" "))
+				.map((value) => {
+					return {
+						// If the user has entered the option n
+						// suggest the uid/gid instead of user/group
+						name: nFlagUsed ? value[1] : value[0],
+						description: colonAdded
+							? `Group - ${nFlagUsed ? value[0] : `gid: ${value[1]}`}`
+							: `User - ${nFlagUsed ? value[0] : `uid: ${value[1]}`}`,
+						icon: colonAdded ? "👥" : "👤",
+						priority: 90,
+					};
+				})
+		);
+	},
+	trigger: ":",
+	getQueryTerm: ":",
 };
 
 const completionSpec: Fig.Spec = {
-  name: "chown",
-  description:
-    "Change the user and/or group ownership of a given file, directory, or symbolic link",
-  args: [
-    {
-      name: "owner[:group] or :group",
-      generators: existingUsersandGroups,
-    },
-    {
-      name: "file/directory",
-      isVariadic: true,
-      template: ["filepaths", "folders"],
-    },
-  ],
-  options: [
-    {
-      name: "-f",
-      description:
-        "Don't report any failure to change file owner or group, nor modify the exit status to reflect such failures",
-    },
-    {
-      name: "-h",
-      description:
-        "If the file is a symbolic link, change the user ID and/or the group ID of the link itself",
-    },
-    {
-      name: "-n",
-      description:
-        "Interpret user ID and group ID as numeric, avoiding name lookups",
-    },
-    {
-      name: "-v",
-      description:
-        "Cause chown to be verbose, showing files as the owner is modified",
-    },
-    {
-      name: "-R",
-      description:
-        "Change the user ID and/or the group ID for the file hierarchies rooted in the files instead of just the files themselves",
-    },
-    {
-      name: "-H",
-      description:
-        "If the -R option is specified, symbolic links on the command line are followed",
-      exclusiveOn: ["-L", "-P"],
-      dependsOn: ["-R"],
-    },
-    {
-      name: "-L",
-      description:
-        "If the -R option is specified, all symbolic links are followed",
-      exclusiveOn: ["-H", "-P"],
-      dependsOn: ["-R"],
-    },
-    {
-      name: "-P",
-      description:
-        "If the -R option is specified, no symbolic links are followed",
-      exclusiveOn: ["-H", "-L"],
-      dependsOn: ["-R"],
-    },
-  ],
+	name: "chown",
+	description:
+		"Change the user and/or group ownership of a given file, directory, or symbolic link",
+	args: [
+		{
+			name: "owner[:group] or :group",
+			generators: existingUsersandGroups,
+		},
+		{
+			name: "file/directory",
+			isVariadic: true,
+			template: ["filepaths", "folders"],
+		},
+	],
+	options: [
+		{
+			name: "-f",
+			description:
+				"Don't report any failure to change file owner or group, nor modify the exit status to reflect such failures",
+		},
+		{
+			name: "-h",
+			description:
+				"If the file is a symbolic link, change the user ID and/or the group ID of the link itself",
+		},
+		{
+			name: "-n",
+			description:
+				"Interpret user ID and group ID as numeric, avoiding name lookups",
+		},
+		{
+			name: "-v",
+			description:
+				"Cause chown to be verbose, showing files as the owner is modified",
+		},
+		{
+			name: "-R",
+			description:
+				"Change the user ID and/or the group ID for the file hierarchies rooted in the files instead of just the files themselves",
+		},
+		{
+			name: "-H",
+			description:
+				"If the -R option is specified, symbolic links on the command line are followed",
+			exclusiveOn: ["-L", "-P"],
+			dependsOn: ["-R"],
+		},
+		{
+			name: "-L",
+			description:
+				"If the -R option is specified, all symbolic links are followed",
+			exclusiveOn: ["-H", "-P"],
+			dependsOn: ["-R"],
+		},
+		{
+			name: "-P",
+			description:
+				"If the -R option is specified, no symbolic links are followed",
+			exclusiveOn: ["-H", "-L"],
+			dependsOn: ["-R"],
+		},
+	],
 };
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/cp.ts b/extensions/terminal-suggest/src/completions/upstream/cp.ts
index 65d3d065cfda..91a05f48e65f 100644
--- a/extensions/terminal-suggest/src/completions/upstream/cp.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/cp.ts
@@ -1,79 +1,79 @@
 const completionSpec: Fig.Spec = {
-  name: "cp",
-  description: "Copy files and directories",
-  args: [
-    {
-      name: "source",
-      template: ["filepaths", "folders"],
-      isVariadic: true,
-    },
-    {
-      name: "target",
-      template: ["filepaths", "folders"],
-    },
-  ],
-  options: [
-    {
-      name: "-a",
-      description:
-        "Preserves structure and attributes of files but not directory structure",
-    },
-    {
-      name: "-f",
-      description:
-        "If the destination file cannot be opened, remove it and create a new file, without prompting for confirmation",
-      exclusiveOn: ["-n"],
-    },
-    {
-      name: "-H",
-      description:
-        "If the -R option is specified, symbolic links on the command line are followed",
-      exclusiveOn: ["-L", "-P"],
-      dependsOn: ["-R"],
-    },
-    {
-      name: "-i",
-      description:
-        "Cause cp to write a prompt to the standard error output before copying a file that would overwrite an existing file",
-      exclusiveOn: ["-n"],
-    },
-    {
-      name: "-L",
-      description:
-        "If the -R option is specified, all symbolic links are followed",
-      exclusiveOn: ["-H", "-P"],
-      dependsOn: ["-R"],
-    },
-    {
-      name: "-n",
-      description: "Do not overwrite an existing file",
-      exclusiveOn: ["-f", "-i"],
-    },
-    {
-      name: "-P",
-      description:
-        "If the -R option is specified, no symbolic links are followed",
-      exclusiveOn: ["-H", "-L"],
-      dependsOn: ["-R"],
-    },
-    {
-      name: "-R",
-      description:
-        "If source designates a directory, cp copies the directory and the entire subtree connected at that point. If source ends in a /, the contents of the directory are copied rather than the directory itself",
-    },
-    {
-      name: "-v",
-      description: "Cause cp to be verbose, showing files as they are copied",
-    },
-    {
-      name: "-X",
-      description: "Do not copy Extended Attributes (EAs) or resource forks",
-    },
-    {
-      name: "-c",
-      description: "Copy files using clonefile",
-    },
-  ],
+	name: "cp",
+	description: "Copy files and directories",
+	args: [
+		{
+			name: "source",
+			template: ["filepaths", "folders"],
+			isVariadic: true,
+		},
+		{
+			name: "target",
+			template: ["filepaths", "folders"],
+		},
+	],
+	options: [
+		{
+			name: "-a",
+			description:
+				"Preserves structure and attributes of files but not directory structure",
+		},
+		{
+			name: "-f",
+			description:
+				"If the destination file cannot be opened, remove it and create a new file, without prompting for confirmation",
+			exclusiveOn: ["-n"],
+		},
+		{
+			name: "-H",
+			description:
+				"If the -R option is specified, symbolic links on the command line are followed",
+			exclusiveOn: ["-L", "-P"],
+			dependsOn: ["-R"],
+		},
+		{
+			name: "-i",
+			description:
+				"Cause cp to write a prompt to the standard error output before copying a file that would overwrite an existing file",
+			exclusiveOn: ["-n"],
+		},
+		{
+			name: "-L",
+			description:
+				"If the -R option is specified, all symbolic links are followed",
+			exclusiveOn: ["-H", "-P"],
+			dependsOn: ["-R"],
+		},
+		{
+			name: "-n",
+			description: "Do not overwrite an existing file",
+			exclusiveOn: ["-f", "-i"],
+		},
+		{
+			name: "-P",
+			description:
+				"If the -R option is specified, no symbolic links are followed",
+			exclusiveOn: ["-H", "-L"],
+			dependsOn: ["-R"],
+		},
+		{
+			name: "-R",
+			description:
+				"If source designates a directory, cp copies the directory and the entire subtree connected at that point. If source ends in a /, the contents of the directory are copied rather than the directory itself",
+		},
+		{
+			name: "-v",
+			description: "Cause cp to be verbose, showing files as they are copied",
+		},
+		{
+			name: "-X",
+			description: "Do not copy Extended Attributes (EAs) or resource forks",
+		},
+		{
+			name: "-c",
+			description: "Copy files using clonefile",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/curl.ts b/extensions/terminal-suggest/src/completions/upstream/curl.ts
index d47732b64472..eb6cfd319c4e 100644
--- a/extensions/terminal-suggest/src/completions/upstream/curl.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/curl.ts
@@ -1,914 +1,914 @@
 const completionSpec: Fig.Spec = {
-  name: "curl",
-  description: "Transfer a URL",
-  args: { name: "URL", template: "history" },
-  options: [
-    {
-      name: ["-a", "--append"],
-      description: "Append to target file when uploading",
-    },
-    {
-      name: ["-E", "--cert"],
-      description: "Client certificate file and password",
-      args: {
-        name: "certificate[:password]",
-        generators: {
-          getQueryTerm: ":",
-        },
-      },
-    },
-    {
-      name: ["-K", "--config"],
-      description: "Read config from a file",
-      args: { name: "file", template: "filepaths" },
-    },
-    {
-      name: ["-C", "--continue-at"],
-      description: "Resumed transfer offset",
-      args: { name: "offset" },
-    },
-    {
-      name: ["-b", "--cookie"],
-      description: "Send cookies from string/file",
-      args: { name: "data or filename", template: "filepaths" },
-    },
-    {
-      name: ["-c", "--cookie-jar"],
-      description: "Write cookies to <filename> after operation",
-      args: { name: "filename", template: "filepaths" },
-    },
-    {
-      name: ["-d", "--data"],
-      description: "HTTP POST data",
-      insertValue: "-d '{cursor}'",
-      args: { name: "data" },
-      isRepeatable: true,
-    },
-    { name: ["-q", "--disable"], description: "Disable .curlrc" },
-    {
-      name: ["-D", "--dump-header"],
-      description: "Write the received headers to <filename>",
-      args: { name: "filename", template: "filepaths" },
-    },
-    {
-      name: ["-f", "--fail"],
-      description: "Fail silently (no output at all) on HTTP errors",
-    },
-    {
-      name: ["-F", "--form"],
-      description: "Specify multipart MIME data",
-      args: { name: "content" },
-      isRepeatable: true,
-    },
-    {
-      name: ["-P", "--ftp-port"],
-      description: "Use PORT instead of PASV",
-      args: { name: "address" },
-    },
-    {
-      name: ["-G", "--get"],
-      description: "Put the post data in the URL and use GET",
-    },
-    {
-      name: ["-g", "--globoff"],
-      description: "Disable URL sequences and ranges using {} and []",
-    },
-    { name: ["-I", "--head"], description: "Show document info only" },
-    {
-      name: ["-H", "--header"],
-      description: "Pass custom header(s) to server",
-      args: {
-        name: "header/file",
-        suggestions: [
-          { name: "Content-Type: application/json" },
-          { name: "Content-Type: application/x-www-form-urlencoded" },
-        ],
-      },
-    },
-    { name: ["-h", "--help"], description: "This help text" },
-    { name: ["-0", "--http1.0"], description: "Use HTTP 1.0" },
-    {
-      name: ["-i", "--include"],
-      description: "Include protocol response headers in the output",
-    },
-    {
-      name: ["-k", "--insecure"],
-      description: "Allow insecure server connections when using SSL",
-    },
-    { name: ["-4", "--ipv4"], description: "Resolve names to IPv4 addresses" },
-    { name: ["-6", "--ipv6"], description: "Resolve names to IPv6 addresses" },
-    {
-      name: ["-j", "--junk-session-cookies"],
-      description: "Ignore session cookies read from file",
-    },
-    { name: ["-l", "--list-only"], description: "List only mode" },
-    { name: ["-L", "--location"], description: "Follow redirects" },
-    { name: ["-M", "--manual"], description: "Display the full manual" },
-    {
-      name: ["-m", "--max-time"],
-      description: "Maximum time allowed for the transfer",
-      args: { name: "seconds" },
-    },
-    {
-      name: ["-n", "--netrc"],
-      description: "Must read .netrc for user name and password",
-    },
-    {
-      name: ["-:", "--next"],
-      description: "Make next URL use its separate set of options",
-    },
-    {
-      name: ["-N", "--no-buffer"],
-      description: "Disable buffering of the output stream",
-    },
-    {
-      name: ["-o", "--output"],
-      description: "Write to file instead of stdout",
-      args: { name: "file", template: "filepaths" },
-    },
-    {
-      name: ["-#", "--progress-bar"],
-      description: "Display transfer progress as a bar",
-    },
-    {
-      name: ["-x", "--proxy"],
-      description: "[protocol://]host[:port] Use this proxy",
-    },
-    {
-      name: ["-U", "--proxy-user"],
-      description: "Proxy user and password",
-      args: { name: "user:password" },
-    },
-    {
-      name: ["-p", "--proxytunnel"],
-      description: "Operate through an HTTP proxy tunnel (using CONNECT)",
-    },
-    {
-      name: ["-Q", "--quote"],
-      description: "Send command(s) to server before transfer",
-    },
-    {
-      name: ["-r", "--range"],
-      description: "Retrieve only the bytes within RANGE",
-      args: { name: "range" },
-    },
-    {
-      name: ["-e", "--referer"],
-      description: "Referrer URL",
-      args: { name: "URL" },
-    },
-    {
-      name: ["-J", "--remote-header-name"],
-      description: "Use the header-provided filename",
-    },
-    {
-      name: ["-O", "--remote-name"],
-      description: "Write output to a file named as the remote file",
-    },
-    {
-      name: ["-R", "--remote-time"],
-      description: "Set the remote file's time on the local output",
-    },
-    {
-      name: ["-X", "--request"],
-      description: "Specify request command to use",
-      args: {
-        name: "command",
-        suggestions: [
-          { name: "GET" },
-          { name: "HEAD" },
-          { name: "POST" },
-          { name: "PUT" },
-          { name: "DELETE" },
-          { name: "CONNECT" },
-          { name: "OPTIONS" },
-          { name: "TRACE" },
-          { name: "PATCH" },
-        ],
-      },
-    },
-    {
-      name: ["-S", "--show-error"],
-      description: "Show error even when -s is used",
-    },
-    { name: ["-s", "--silent"], description: "Silent mode" },
-    {
-      name: ["-Y", "--speed-limit"],
-      description: "Stop transfers slower than this",
-      args: { name: "speed" },
-    },
-    {
-      name: ["-y", "--speed-time"],
-      description: "Trigger 'speed-limit' abort after this time",
-      args: { name: "seconds" },
-    },
-    { name: ["-2", "--sslv2"], description: "Use SSLv2" },
-    { name: ["-3", "--sslv3"], description: "Use SSLv3" },
-    {
-      name: ["-t", "--telnet-option"],
-      description: "Set telnet option",
-      args: { name: "val" },
-    },
-    {
-      name: ["-z", "--time-cond"],
-      description: "Transfer based on a time condition",
-      args: { name: "time" },
-    },
-    { name: ["-1", "--tlsv1"], description: "Use TLSv1.0 or greater" },
-    {
-      name: ["-T", "--upload-file"],
-      description: "Transfer local FILE to destination",
-      args: { name: "file", template: "filepaths" },
-    },
-    { name: ["-B", "--use-ascii"], description: "Use ASCII/text transfer" },
-    {
-      name: ["-u", "--user"],
-      description: "Server user and password",
-      args: { name: "user:password" },
-    },
-    {
-      name: ["-A", "--user-agent"],
-      description: "Send User-Agent <name> to server",
-      args: { name: "name" },
-    },
-    {
-      name: ["-v", "--verbose"],
-      description: "Make the operation more talkative",
-    },
-    { name: ["-V", "--version"], description: "Show version number and quit" },
-    {
-      name: ["-w", "--write-out"],
-      description: "Use output FORMAT after completion",
-      args: { name: "format" },
-    },
-    {
-      name: "--abstract-unix-socket",
-      description: "Connect via abstract Unix domain socket",
-      args: { name: "path" },
-    },
-    {
-      name: "--alt-svc",
-      description: "Name> Enable alt-svc with this cache file",
-      args: { name: "file", template: "filepaths" },
-    },
-    { name: "--anyauth", description: "Pick any authentication method" },
-    { name: "--basic", description: "Use HTTP Basic Authentication" },
-    {
-      name: "--cacert",
-      description: "CA certificate to verify peer against",
-      args: { name: "file", template: "filepaths" },
-    },
-    {
-      name: "--capath",
-      description: "CA directory to verify peer against",
-      args: { name: "dir", template: "folders" },
-    },
-    {
-      name: "--cert-status",
-      description: "Verify the status of the server certificate",
-    },
-    {
-      name: "--cert-type",
-      description: "Certificate file type",
-      args: {
-        name: "type",
-        suggestions: [{ name: "DER" }, { name: "PEM" }, { name: "ENG" }],
-      },
-    },
-    {
-      name: "--ciphers",
-      description: "Of ciphers> SSL ciphers to use",
-      args: { name: "list" },
-    },
-    { name: "--compressed", description: "Request compressed response" },
-    { name: "--compressed-ssh", description: "Enable SSH compression" },
-    {
-      name: "--connect-timeout",
-      description: "Maximum time allowed for connection",
-      args: { name: "seconds" },
-    },
-    {
-      name: "--connect-to",
-      description: "Connect to host",
-      args: { name: "HOST1:PORT1:HOST2:PORT2" },
-    },
-    {
-      name: "--create-dirs",
-      description: "Create necessary local directory hierarchy",
-    },
-    { name: "--crlf", description: "Convert LF to CRLF in upload" },
-    {
-      name: "--crlfile",
-      description: "Get a CRL list in PEM format from the given file",
-      args: { name: "file", template: "filepaths" },
-    },
-    {
-      name: "--data-ascii",
-      description: "HTTP POST ASCII data",
-      args: { name: "data" },
-    },
-    {
-      name: "--data-binary",
-      description: "HTTP POST binary data",
-      args: { name: "data" },
-    },
-    {
-      name: "--data-raw",
-      description: "HTTP POST data, '@' allowed",
-      args: { name: "data" },
-    },
-    {
-      name: "--data-urlencode",
-      description: "HTTP POST data url encoded",
-      args: { name: "data" },
-    },
-    {
-      name: "--delegation",
-      description: "GSS-API delegation permission",
-      args: { name: "LEVEL" },
-    },
-    { name: "--digest", description: "Use HTTP Digest Authentication" },
-    { name: "--disable-eprt", description: "Inhibit using EPRT or LPRT" },
-    { name: "--disable-epsv", description: "Inhibit using EPSV" },
-    {
-      name: "--disallow-username-in-url",
-      description: "Disallow username in url",
-    },
-    {
-      name: "--dns-interface",
-      description: "Interface to use for DNS requests",
-      args: { name: "interface" },
-    },
-    {
-      name: "--dns-ipv4-addr",
-      description: "IPv4 address to use for DNS requests",
-      args: { name: "address" },
-    },
-    {
-      name: "--dns-ipv6-addr",
-      description: "IPv6 address to use for DNS requests",
-      args: { name: "address" },
-    },
-    {
-      name: "--dns-servers",
-      description: "DNS server addrs to use",
-      args: { name: "addresses" },
-    },
-    {
-      name: "--doh-url",
-      description: "Resolve host names over DOH",
-      args: { name: "URL" },
-    },
-    {
-      name: "--egd-file",
-      description: "EGD socket path for random data",
-      args: { name: "file", template: "filepaths" },
-    },
-    {
-      name: "--engine",
-      description: "Crypto engine to use",
-      args: { name: "name" },
-    },
-    {
-      name: "--etag-compare",
-      description:
-        "Make a conditional HTTP request for the ETag read from the given file",
-      args: { name: "file" },
-    },
-    {
-      name: "--etag-save",
-      description: "Save an HTTP ETag to the specified file",
-      args: { name: "file" },
-    },
-    {
-      name: "--expect100-timeout",
-      description: "How long to wait for 100-continue",
-      args: { name: "seconds" },
-    },
-    {
-      name: "--fail-early",
-      description: "Fail on first transfer error, do not continue",
-    },
-    {
-      name: "--fail-with-body",
-      description:
-        "On HTTP errors, return an error and also output any HTML response",
-    },
-    { name: "--false-start", description: "Enable TLS False Start" },
-    {
-      name: "--form-string",
-      description: "Specify multipart MIME data",
-      args: { name: "string" },
-    },
-    {
-      name: "--ftp-account",
-      description: "Account data string",
-      args: { name: "data" },
-    },
-    {
-      name: "--ftp-alternative-to-user",
-      description: "String to replace USER [name]",
-      args: { name: "command" },
-    },
-    {
-      name: "--ftp-create-dirs",
-      description: "Create the remote dirs if not present",
-    },
-    {
-      name: "--ftp-method",
-      description: "Control CWD usage",
-      args: { name: "method" },
-    },
-    { name: "--ftp-pasv", description: "Use PASV/EPSV instead of PORT" },
-    { name: "--ftp-pret", description: "Send PRET before PASV" },
-    { name: "--ftp-skip-pasv-ip", description: "Skip the IP address for PASV" },
-    { name: "--ftp-ssl-ccc", description: "Send CCC after authenticating" },
-    {
-      name: "--ftp-ssl-ccc-mode",
-      description: "Set CCC mode",
-      args: {
-        name: "mode",
-        suggestions: [{ name: "active" }, { name: "passive" }],
-      },
-    },
-    {
-      name: "--ftp-ssl-control",
-      description: "Require SSL/TLS for FTP login, clear for transfer",
-    },
-    {
-      name: "--happy-eyeballs-timeout-ms",
-      description:
-        "How long to wait in milliseconds for IPv6 before trying IPv4",
-      args: { name: "milliseconds" },
-    },
-    {
-      name: "--haproxy-protocol",
-      description: "Send HAProxy PROXY protocol v1 header",
-    },
-    {
-      name: "--hostpubmd5",
-      description: "Acceptable MD5 hash of the host public key",
-      args: { name: "md5" },
-    },
-    { name: "--http0.9", description: "Allow HTTP 0.9 responses" },
-    { name: "--http1.1", description: "Use HTTP 1.1" },
-    { name: "--http2", description: "Use HTTP 2" },
-    {
-      name: "--http2-prior-knowledge",
-      description: "Use HTTP 2 without HTTP/1.1 Upgrade",
-    },
-    {
-      name: "--ignore-content-length",
-      description: "Ignore the size of the remote resource",
-    },
-    {
-      name: "--interface",
-      description: "Use network INTERFACE (or address)",
-      args: { name: "name" },
-    },
-    {
-      name: "--keepalive-time",
-      description: "Interval time for keepalive probes",
-      args: { name: "seconds" },
-    },
-    {
-      name: "--key",
-      description: "Private key file name",
-      args: { name: "key" },
-    },
-    {
-      name: "--key-type",
-      description: "Private key file type",
-      args: {
-        name: "type",
-        suggestions: [{ name: "DER" }, { name: "PEM" }, { name: "ENG" }],
-      },
-    },
-    {
-      name: "--krb",
-      description: "Enable Kerberos with security <level>",
-      args: { name: "level" },
-    },
-    {
-      name: "--libcurl",
-      description: "Dump libcurl equivalent code of this command line",
-      args: { name: "file", template: "filepaths" },
-    },
-    {
-      name: "--limit-rate",
-      description: "Limit transfer speed to RATE",
-      args: { name: "speed" },
-    },
-    {
-      name: "--local-port",
-      description: "Force use of RANGE for local port numbers",
-      args: { name: "num/range" },
-    },
-    {
-      name: "--location-trusted",
-      description: "Like --location, and send auth to other hosts",
-    },
-    {
-      name: "--login-options",
-      description: "Server login options",
-      args: { name: "options" },
-    },
-    {
-      name: "--mail-auth",
-      description: "Originator address of the original email",
-      args: { name: "address" },
-    },
-    {
-      name: "--mail-from",
-      description: "Mail from this address",
-      args: { name: "address" },
-    },
-    {
-      name: "--mail-rcpt",
-      description: "Mail to this address",
-      args: { name: "address" },
-    },
-    {
-      name: "--max-filesize",
-      description: "Maximum file size to download",
-      args: { name: "bytes" },
-    },
-    {
-      name: "--max-redirs",
-      description: "Maximum number of redirects allowed",
-      args: { name: "num" },
-    },
-    {
-      name: "--metalink",
-      description: "Process given URLs as metalink XML file",
-    },
-    {
-      name: "--negotiate",
-      description: "Use HTTP Negotiate (SPNEGO) authentication",
-    },
-    {
-      name: "--netrc-file",
-      description: "Specify FILE for netrc",
-      args: { name: "filename", template: "filepaths" },
-    },
-    { name: "--netrc-optional", description: "Use either .netrc or URL" },
-    { name: "--no-alpn", description: "Disable the ALPN TLS extension" },
-    {
-      name: "--no-keepalive",
-      description: "Disable TCP keepalive on the connection",
-    },
-    { name: "--no-npn", description: "Disable the NPN TLS extension" },
-    { name: "--no-sessionid", description: "Disable SSL session-ID reusing" },
-    {
-      name: "--noproxy",
-      description: "List of hosts which do not use proxy",
-      args: { name: "no-proxy-list" },
-    },
-    { name: "--ntlm", description: "Use HTTP NTLM authentication" },
-    {
-      name: "--ntlm-wb",
-      description: "Use HTTP NTLM authentication with winbind",
-    },
-    {
-      name: "--oauth2-bearer",
-      description: "OAuth 2 Bearer Token",
-      args: { name: "token" },
-    },
-    {
-      name: "--pass",
-      description: "Pass phrase for the private key",
-      args: { name: "phrase" },
-    },
-    {
-      name: "--path-as-is",
-      description: "Do not squash .. sequences in URL path",
-    },
-    {
-      name: "--pinnedpubkey",
-      description: "FILE/HASHES Public key to verify peer against",
-      args: { name: "hashes" },
-    },
-    {
-      name: "--post301",
-      description: "Do not switch to GET after following a 301",
-    },
-    {
-      name: "--post302",
-      description: "Do not switch to GET after following a 302",
-    },
-    {
-      name: "--post303",
-      description: "Do not switch to GET after following a 303",
-    },
-    {
-      name: "--preproxy",
-      description: "[protocol://]host[:port] Use this proxy first",
-    },
-    {
-      name: "--proto",
-      description: "Enable/disable PROTOCOLS",
-      args: { name: "protocols" },
-    },
-    {
-      name: "--proto-default",
-      description: "Use PROTOCOL for any URL missing a scheme",
-      args: { name: "protocol" },
-    },
-    {
-      name: "--proto-redir",
-      description: "Enable/disable PROTOCOLS on redirect",
-      args: { name: "protocols" },
-    },
-    {
-      name: "--proxy-anyauth",
-      description: "Pick any proxy authentication method",
-    },
-    {
-      name: "--proxy-basic",
-      description: "Use Basic authentication on the proxy",
-    },
-    {
-      name: "--proxy-cacert",
-      description: "CA certificate to verify peer against for proxy",
-      args: { name: "file", template: "filepaths" },
-    },
-    {
-      name: "--proxy-capath",
-      description: "CA directory to verify peer against for proxy",
-      args: { name: "dir", template: "folders" },
-    },
-    {
-      name: "--proxy-cert",
-      description: "Set client certificate for proxy",
-      args: { name: "cert[:passwd]" },
-    },
-    {
-      name: "--proxy-cert-type",
-      description: "Client certificate type for HTTPS proxy",
-      args: { name: "type" },
-    },
-    {
-      name: "--proxy-ciphers",
-      description: "SSL ciphers to use for proxy",
-      args: { name: "list" },
-    },
-    {
-      name: "--proxy-crlfile",
-      description: "Set a CRL list for proxy",
-      args: { name: "file", template: "filepaths" },
-    },
-    {
-      name: "--proxy-digest",
-      description: "Use Digest authentication on the proxy",
-    },
-    {
-      name: "--proxy-header",
-      description: "Pass custom header(s) to proxy",
-      args: {
-        name: "header/file",
-        suggestions: [
-          { name: "Content-Type: application/json" },
-          { name: "Content-Type: application/x-www-form-urlencoded" },
-        ],
-      },
-    },
-    {
-      name: "--proxy-insecure",
-      description: "Do HTTPS proxy connections without verifying the proxy",
-    },
-    {
-      name: "--proxy-key",
-      description: "Private key for HTTPS proxy",
-      args: { name: "key" },
-    },
-    {
-      name: "--proxy-key-type",
-      description: "Private key file type for proxy",
-      args: { name: "type" },
-    },
-    {
-      name: "--proxy-negotiate",
-      description: "Use HTTP Negotiate (SPNEGO) authentication on the proxy",
-    },
-    {
-      name: "--proxy-ntlm",
-      description: "Use NTLM authentication on the proxy",
-    },
-    {
-      name: "--proxy-pass",
-      description: "Pass phrase for the private key for HTTPS proxy",
-      args: { name: "phrase" },
-    },
-    {
-      name: "--proxy-pinnedpubkey",
-      description: "FILE/HASHES public key to verify proxy with",
-      args: { name: "hashes" },
-    },
-    {
-      name: "--proxy-service-name",
-      description: "SPNEGO proxy service name",
-      args: { name: "name" },
-    },
-    {
-      name: "--proxy-ssl-allow-beast",
-      description: "Allow security flaw for interop for HTTPS proxy",
-    },
-    {
-      name: "--proxy-tls13-ciphers",
-      description: "List> TLS 1.3 proxy cipher suites",
-      args: { name: "ciphersuite" },
-    },
-    {
-      name: "--proxy-tlsauthtype",
-      description: "TLS authentication type for HTTPS proxy",
-      args: { name: "type" },
-    },
-    {
-      name: "--proxy-tlspassword",
-      description: "TLS password for HTTPS proxy",
-      args: { name: "string" },
-    },
-    {
-      name: "--proxy-tlsuser",
-      description: "TLS username for HTTPS proxy",
-      args: { name: "name" },
-    },
-    { name: "--proxy-tlsv1", description: "Use TLSv1 for HTTPS proxy" },
-    {
-      name: "--proxy1.0",
-      description: "Use HTTP/1.0 proxy on given port",
-      args: { name: "host[:port]" },
-    },
-    {
-      name: "--pubkey",
-      description: "SSH Public key file name",
-      args: { name: "key", template: "filepaths" },
-    },
-    {
-      name: "--random-file",
-      description: "File for reading random data from",
-      args: { name: "file", template: "filepaths" },
-    },
-    { name: "--raw", description: 'Do HTTP "raw"; no transfer decoding' },
-    {
-      name: "--remote-name-all",
-      description: "Use the remote file name for all URLs",
-    },
-    {
-      name: "--request-target",
-      description: "Specify the target for this request",
-    },
-    {
-      name: "--resolve",
-      description: "Resolve the host+port to this address",
-      args: { name: "host:port:address[,address]..." },
-    },
-    {
-      name: "--retry",
-      description: "Retry request if transient problems occur",
-      args: { name: "num" },
-    },
-    {
-      name: "--retry-connrefused",
-      description: "Retry on connection refused (use with --retry)",
-    },
-    {
-      name: "--retry-delay",
-      description: "Wait time between retries",
-      args: { name: "seconds" },
-    },
-    {
-      name: "--retry-max-time",
-      description: "Retry only within this period",
-      args: { name: "seconds" },
-    },
-    {
-      name: "--sasl-ir",
-      description: "Enable initial response in SASL authentication",
-    },
-    {
-      name: "--service-name",
-      description: "SPNEGO service name",
-      args: { name: "name" },
-    },
-    {
-      name: "--socks4",
-      description: "SOCKS4 proxy on given host + port",
-      args: { name: "host[:port]" },
-    },
-    {
-      name: "--socks4a",
-      description: "SOCKS4a proxy on given host + port",
-      args: { name: "host[:port]" },
-    },
-    {
-      name: "--socks5",
-      description: "SOCKS5 proxy on given host + port",
-      args: { name: "host[:port]" },
-    },
-    {
-      name: "--socks5-basic",
-      description: "Enable username/password auth for SOCKS5 proxies",
-    },
-    {
-      name: "--socks5-gssapi",
-      description: "Enable GSS-API auth for SOCKS5 proxies",
-    },
-    {
-      name: "--socks5-gssapi-nec",
-      description: "Compatibility with NEC SOCKS5 server",
-    },
-    {
-      name: "--socks5-gssapi-service",
-      description: "SOCKS5 proxy service name for GSS-API",
-      args: { name: "name" },
-    },
-    {
-      name: "--socks5-hostname",
-      description: "SOCKS5 proxy, pass host name to proxy",
-      args: { name: "host[:port]" },
-    },
-    { name: "--ssl", description: "Try SSL/TLS" },
-    {
-      name: "--ssl-auto-client-cert",
-      description: "Obtain and use a client certificate automatically",
-    },
-    {
-      name: "--ssl-allow-beast",
-      description: "Allow security flaw to improve interop",
-    },
-    {
-      name: "--ssl-no-revoke",
-      description: "Disable cert revocation checks (Schannel)",
-    },
-    { name: "--ssl-reqd", description: "Require SSL/TLS" },
-    { name: "--stderr", description: "Where to redirect stderr" },
-    {
-      name: "--styled-output",
-      description: "Enable styled output for HTTP headers",
-    },
-    {
-      name: "--suppress-connect-headers",
-      description: "Suppress proxy CONNECT response headers",
-    },
-    { name: "--tcp-fastopen", description: "Use TCP Fast Open" },
-    { name: "--tcp-nodelay", description: "Use the TCP_NODELAY option" },
-    {
-      name: "--tftp-blksize",
-      description: "Set TFTP BLKSIZE option",
-      args: { name: "value" },
-    },
-    { name: "--tftp-no-options", description: "Do not send any TFTP options" },
-    {
-      name: "--tls-max",
-      description: "Set maximum allowed TLS version",
-      args: { name: "VERSION" },
-    },
-    {
-      name: "--tls13-ciphers",
-      description: "Of TLS 1.3 ciphersuites> TLS 1.3 cipher suites to use",
-      args: { name: "list" },
-    },
-    {
-      name: "--tlsauthtype",
-      description: "TLS authentication type",
-      args: { name: "type" },
-    },
-    { name: "--tlspassword", description: "TLS password" },
-    { name: "--tlsuser", description: "TLS user name", args: { name: "name" } },
-    { name: "--tlsv1.0", description: "Use TLSv1.0 or greater" },
-    { name: "--tlsv1.1", description: "Use TLSv1.1 or greater" },
-    { name: "--tlsv1.2", description: "Use TLSv1.2 or greater" },
-    { name: "--tlsv1.3", description: "Use TLSv1.3 or greater" },
-    {
-      name: "--tr-encoding",
-      description: "Request compressed transfer encoding",
-    },
-    {
-      name: "--trace",
-      description: "Write a debug trace to FILE",
-      args: { name: "file", template: "filepaths" },
-    },
-    {
-      name: "--trace-ascii",
-      description: "Like --trace, but without hex output",
-      args: { name: "file", template: "filepaths" },
-    },
-    {
-      name: "--trace-time",
-      description: "Add time stamps to trace/verbose output",
-    },
-    {
-      name: "--unix-socket",
-      description: "Connect through this Unix domain socket",
-      args: { name: "path" },
-    },
-    { name: "--url", description: "URL to work with", args: { name: "url" } },
-    {
-      name: "--xattr",
-      description: "Store metadata in extended file attributes",
-    },
-  ],
+	name: "curl",
+	description: "Transfer a URL",
+	args: { name: "URL", template: "history" },
+	options: [
+		{
+			name: ["-a", "--append"],
+			description: "Append to target file when uploading",
+		},
+		{
+			name: ["-E", "--cert"],
+			description: "Client certificate file and password",
+			args: {
+				name: "certificate[:password]",
+				generators: {
+					getQueryTerm: ":",
+				},
+			},
+		},
+		{
+			name: ["-K", "--config"],
+			description: "Read config from a file",
+			args: { name: "file", template: "filepaths" },
+		},
+		{
+			name: ["-C", "--continue-at"],
+			description: "Resumed transfer offset",
+			args: { name: "offset" },
+		},
+		{
+			name: ["-b", "--cookie"],
+			description: "Send cookies from string/file",
+			args: { name: "data or filename", template: "filepaths" },
+		},
+		{
+			name: ["-c", "--cookie-jar"],
+			description: "Write cookies to <filename> after operation",
+			args: { name: "filename", template: "filepaths" },
+		},
+		{
+			name: ["-d", "--data"],
+			description: "HTTP POST data",
+			insertValue: "-d '{cursor}'",
+			args: { name: "data" },
+			isRepeatable: true,
+		},
+		{ name: ["-q", "--disable"], description: "Disable .curlrc" },
+		{
+			name: ["-D", "--dump-header"],
+			description: "Write the received headers to <filename>",
+			args: { name: "filename", template: "filepaths" },
+		},
+		{
+			name: ["-f", "--fail"],
+			description: "Fail silently (no output at all) on HTTP errors",
+		},
+		{
+			name: ["-F", "--form"],
+			description: "Specify multipart MIME data",
+			args: { name: "content" },
+			isRepeatable: true,
+		},
+		{
+			name: ["-P", "--ftp-port"],
+			description: "Use PORT instead of PASV",
+			args: { name: "address" },
+		},
+		{
+			name: ["-G", "--get"],
+			description: "Put the post data in the URL and use GET",
+		},
+		{
+			name: ["-g", "--globoff"],
+			description: "Disable URL sequences and ranges using {} and []",
+		},
+		{ name: ["-I", "--head"], description: "Show document info only" },
+		{
+			name: ["-H", "--header"],
+			description: "Pass custom header(s) to server",
+			args: {
+				name: "header/file",
+				suggestions: [
+					{ name: "Content-Type: application/json" },
+					{ name: "Content-Type: application/x-www-form-urlencoded" },
+				],
+			},
+		},
+		{ name: ["-h", "--help"], description: "This help text" },
+		{ name: ["-0", "--http1.0"], description: "Use HTTP 1.0" },
+		{
+			name: ["-i", "--include"],
+			description: "Include protocol response headers in the output",
+		},
+		{
+			name: ["-k", "--insecure"],
+			description: "Allow insecure server connections when using SSL",
+		},
+		{ name: ["-4", "--ipv4"], description: "Resolve names to IPv4 addresses" },
+		{ name: ["-6", "--ipv6"], description: "Resolve names to IPv6 addresses" },
+		{
+			name: ["-j", "--junk-session-cookies"],
+			description: "Ignore session cookies read from file",
+		},
+		{ name: ["-l", "--list-only"], description: "List only mode" },
+		{ name: ["-L", "--location"], description: "Follow redirects" },
+		{ name: ["-M", "--manual"], description: "Display the full manual" },
+		{
+			name: ["-m", "--max-time"],
+			description: "Maximum time allowed for the transfer",
+			args: { name: "seconds" },
+		},
+		{
+			name: ["-n", "--netrc"],
+			description: "Must read .netrc for user name and password",
+		},
+		{
+			name: ["-:", "--next"],
+			description: "Make next URL use its separate set of options",
+		},
+		{
+			name: ["-N", "--no-buffer"],
+			description: "Disable buffering of the output stream",
+		},
+		{
+			name: ["-o", "--output"],
+			description: "Write to file instead of stdout",
+			args: { name: "file", template: "filepaths" },
+		},
+		{
+			name: ["-#", "--progress-bar"],
+			description: "Display transfer progress as a bar",
+		},
+		{
+			name: ["-x", "--proxy"],
+			description: "[protocol://]host[:port] Use this proxy",
+		},
+		{
+			name: ["-U", "--proxy-user"],
+			description: "Proxy user and password",
+			args: { name: "user:password" },
+		},
+		{
+			name: ["-p", "--proxytunnel"],
+			description: "Operate through an HTTP proxy tunnel (using CONNECT)",
+		},
+		{
+			name: ["-Q", "--quote"],
+			description: "Send command(s) to server before transfer",
+		},
+		{
+			name: ["-r", "--range"],
+			description: "Retrieve only the bytes within RANGE",
+			args: { name: "range" },
+		},
+		{
+			name: ["-e", "--referer"],
+			description: "Referrer URL",
+			args: { name: "URL" },
+		},
+		{
+			name: ["-J", "--remote-header-name"],
+			description: "Use the header-provided filename",
+		},
+		{
+			name: ["-O", "--remote-name"],
+			description: "Write output to a file named as the remote file",
+		},
+		{
+			name: ["-R", "--remote-time"],
+			description: "Set the remote file's time on the local output",
+		},
+		{
+			name: ["-X", "--request"],
+			description: "Specify request command to use",
+			args: {
+				name: "command",
+				suggestions: [
+					{ name: "GET" },
+					{ name: "HEAD" },
+					{ name: "POST" },
+					{ name: "PUT" },
+					{ name: "DELETE" },
+					{ name: "CONNECT" },
+					{ name: "OPTIONS" },
+					{ name: "TRACE" },
+					{ name: "PATCH" },
+				],
+			},
+		},
+		{
+			name: ["-S", "--show-error"],
+			description: "Show error even when -s is used",
+		},
+		{ name: ["-s", "--silent"], description: "Silent mode" },
+		{
+			name: ["-Y", "--speed-limit"],
+			description: "Stop transfers slower than this",
+			args: { name: "speed" },
+		},
+		{
+			name: ["-y", "--speed-time"],
+			description: "Trigger 'speed-limit' abort after this time",
+			args: { name: "seconds" },
+		},
+		{ name: ["-2", "--sslv2"], description: "Use SSLv2" },
+		{ name: ["-3", "--sslv3"], description: "Use SSLv3" },
+		{
+			name: ["-t", "--telnet-option"],
+			description: "Set telnet option",
+			args: { name: "val" },
+		},
+		{
+			name: ["-z", "--time-cond"],
+			description: "Transfer based on a time condition",
+			args: { name: "time" },
+		},
+		{ name: ["-1", "--tlsv1"], description: "Use TLSv1.0 or greater" },
+		{
+			name: ["-T", "--upload-file"],
+			description: "Transfer local FILE to destination",
+			args: { name: "file", template: "filepaths" },
+		},
+		{ name: ["-B", "--use-ascii"], description: "Use ASCII/text transfer" },
+		{
+			name: ["-u", "--user"],
+			description: "Server user and password",
+			args: { name: "user:password" },
+		},
+		{
+			name: ["-A", "--user-agent"],
+			description: "Send User-Agent <name> to server",
+			args: { name: "name" },
+		},
+		{
+			name: ["-v", "--verbose"],
+			description: "Make the operation more talkative",
+		},
+		{ name: ["-V", "--version"], description: "Show version number and quit" },
+		{
+			name: ["-w", "--write-out"],
+			description: "Use output FORMAT after completion",
+			args: { name: "format" },
+		},
+		{
+			name: "--abstract-unix-socket",
+			description: "Connect via abstract Unix domain socket",
+			args: { name: "path" },
+		},
+		{
+			name: "--alt-svc",
+			description: "Name> Enable alt-svc with this cache file",
+			args: { name: "file", template: "filepaths" },
+		},
+		{ name: "--anyauth", description: "Pick any authentication method" },
+		{ name: "--basic", description: "Use HTTP Basic Authentication" },
+		{
+			name: "--cacert",
+			description: "CA certificate to verify peer against",
+			args: { name: "file", template: "filepaths" },
+		},
+		{
+			name: "--capath",
+			description: "CA directory to verify peer against",
+			args: { name: "dir", template: "folders" },
+		},
+		{
+			name: "--cert-status",
+			description: "Verify the status of the server certificate",
+		},
+		{
+			name: "--cert-type",
+			description: "Certificate file type",
+			args: {
+				name: "type",
+				suggestions: [{ name: "DER" }, { name: "PEM" }, { name: "ENG" }],
+			},
+		},
+		{
+			name: "--ciphers",
+			description: "Of ciphers> SSL ciphers to use",
+			args: { name: "list" },
+		},
+		{ name: "--compressed", description: "Request compressed response" },
+		{ name: "--compressed-ssh", description: "Enable SSH compression" },
+		{
+			name: "--connect-timeout",
+			description: "Maximum time allowed for connection",
+			args: { name: "seconds" },
+		},
+		{
+			name: "--connect-to",
+			description: "Connect to host",
+			args: { name: "HOST1:PORT1:HOST2:PORT2" },
+		},
+		{
+			name: "--create-dirs",
+			description: "Create necessary local directory hierarchy",
+		},
+		{ name: "--crlf", description: "Convert LF to CRLF in upload" },
+		{
+			name: "--crlfile",
+			description: "Get a CRL list in PEM format from the given file",
+			args: { name: "file", template: "filepaths" },
+		},
+		{
+			name: "--data-ascii",
+			description: "HTTP POST ASCII data",
+			args: { name: "data" },
+		},
+		{
+			name: "--data-binary",
+			description: "HTTP POST binary data",
+			args: { name: "data" },
+		},
+		{
+			name: "--data-raw",
+			description: "HTTP POST data, '@' allowed",
+			args: { name: "data" },
+		},
+		{
+			name: "--data-urlencode",
+			description: "HTTP POST data url encoded",
+			args: { name: "data" },
+		},
+		{
+			name: "--delegation",
+			description: "GSS-API delegation permission",
+			args: { name: "LEVEL" },
+		},
+		{ name: "--digest", description: "Use HTTP Digest Authentication" },
+		{ name: "--disable-eprt", description: "Inhibit using EPRT or LPRT" },
+		{ name: "--disable-epsv", description: "Inhibit using EPSV" },
+		{
+			name: "--disallow-username-in-url",
+			description: "Disallow username in url",
+		},
+		{
+			name: "--dns-interface",
+			description: "Interface to use for DNS requests",
+			args: { name: "interface" },
+		},
+		{
+			name: "--dns-ipv4-addr",
+			description: "IPv4 address to use for DNS requests",
+			args: { name: "address" },
+		},
+		{
+			name: "--dns-ipv6-addr",
+			description: "IPv6 address to use for DNS requests",
+			args: { name: "address" },
+		},
+		{
+			name: "--dns-servers",
+			description: "DNS server addrs to use",
+			args: { name: "addresses" },
+		},
+		{
+			name: "--doh-url",
+			description: "Resolve host names over DOH",
+			args: { name: "URL" },
+		},
+		{
+			name: "--egd-file",
+			description: "EGD socket path for random data",
+			args: { name: "file", template: "filepaths" },
+		},
+		{
+			name: "--engine",
+			description: "Crypto engine to use",
+			args: { name: "name" },
+		},
+		{
+			name: "--etag-compare",
+			description:
+				"Make a conditional HTTP request for the ETag read from the given file",
+			args: { name: "file" },
+		},
+		{
+			name: "--etag-save",
+			description: "Save an HTTP ETag to the specified file",
+			args: { name: "file" },
+		},
+		{
+			name: "--expect100-timeout",
+			description: "How long to wait for 100-continue",
+			args: { name: "seconds" },
+		},
+		{
+			name: "--fail-early",
+			description: "Fail on first transfer error, do not continue",
+		},
+		{
+			name: "--fail-with-body",
+			description:
+				"On HTTP errors, return an error and also output any HTML response",
+		},
+		{ name: "--false-start", description: "Enable TLS False Start" },
+		{
+			name: "--form-string",
+			description: "Specify multipart MIME data",
+			args: { name: "string" },
+		},
+		{
+			name: "--ftp-account",
+			description: "Account data string",
+			args: { name: "data" },
+		},
+		{
+			name: "--ftp-alternative-to-user",
+			description: "String to replace USER [name]",
+			args: { name: "command" },
+		},
+		{
+			name: "--ftp-create-dirs",
+			description: "Create the remote dirs if not present",
+		},
+		{
+			name: "--ftp-method",
+			description: "Control CWD usage",
+			args: { name: "method" },
+		},
+		{ name: "--ftp-pasv", description: "Use PASV/EPSV instead of PORT" },
+		{ name: "--ftp-pret", description: "Send PRET before PASV" },
+		{ name: "--ftp-skip-pasv-ip", description: "Skip the IP address for PASV" },
+		{ name: "--ftp-ssl-ccc", description: "Send CCC after authenticating" },
+		{
+			name: "--ftp-ssl-ccc-mode",
+			description: "Set CCC mode",
+			args: {
+				name: "mode",
+				suggestions: [{ name: "active" }, { name: "passive" }],
+			},
+		},
+		{
+			name: "--ftp-ssl-control",
+			description: "Require SSL/TLS for FTP login, clear for transfer",
+		},
+		{
+			name: "--happy-eyeballs-timeout-ms",
+			description:
+				"How long to wait in milliseconds for IPv6 before trying IPv4",
+			args: { name: "milliseconds" },
+		},
+		{
+			name: "--haproxy-protocol",
+			description: "Send HAProxy PROXY protocol v1 header",
+		},
+		{
+			name: "--hostpubmd5",
+			description: "Acceptable MD5 hash of the host public key",
+			args: { name: "md5" },
+		},
+		{ name: "--http0.9", description: "Allow HTTP 0.9 responses" },
+		{ name: "--http1.1", description: "Use HTTP 1.1" },
+		{ name: "--http2", description: "Use HTTP 2" },
+		{
+			name: "--http2-prior-knowledge",
+			description: "Use HTTP 2 without HTTP/1.1 Upgrade",
+		},
+		{
+			name: "--ignore-content-length",
+			description: "Ignore the size of the remote resource",
+		},
+		{
+			name: "--interface",
+			description: "Use network INTERFACE (or address)",
+			args: { name: "name" },
+		},
+		{
+			name: "--keepalive-time",
+			description: "Interval time for keepalive probes",
+			args: { name: "seconds" },
+		},
+		{
+			name: "--key",
+			description: "Private key file name",
+			args: { name: "key" },
+		},
+		{
+			name: "--key-type",
+			description: "Private key file type",
+			args: {
+				name: "type",
+				suggestions: [{ name: "DER" }, { name: "PEM" }, { name: "ENG" }],
+			},
+		},
+		{
+			name: "--krb",
+			description: "Enable Kerberos with security <level>",
+			args: { name: "level" },
+		},
+		{
+			name: "--libcurl",
+			description: "Dump libcurl equivalent code of this command line",
+			args: { name: "file", template: "filepaths" },
+		},
+		{
+			name: "--limit-rate",
+			description: "Limit transfer speed to RATE",
+			args: { name: "speed" },
+		},
+		{
+			name: "--local-port",
+			description: "Force use of RANGE for local port numbers",
+			args: { name: "num/range" },
+		},
+		{
+			name: "--location-trusted",
+			description: "Like --location, and send auth to other hosts",
+		},
+		{
+			name: "--login-options",
+			description: "Server login options",
+			args: { name: "options" },
+		},
+		{
+			name: "--mail-auth",
+			description: "Originator address of the original email",
+			args: { name: "address" },
+		},
+		{
+			name: "--mail-from",
+			description: "Mail from this address",
+			args: { name: "address" },
+		},
+		{
+			name: "--mail-rcpt",
+			description: "Mail to this address",
+			args: { name: "address" },
+		},
+		{
+			name: "--max-filesize",
+			description: "Maximum file size to download",
+			args: { name: "bytes" },
+		},
+		{
+			name: "--max-redirs",
+			description: "Maximum number of redirects allowed",
+			args: { name: "num" },
+		},
+		{
+			name: "--metalink",
+			description: "Process given URLs as metalink XML file",
+		},
+		{
+			name: "--negotiate",
+			description: "Use HTTP Negotiate (SPNEGO) authentication",
+		},
+		{
+			name: "--netrc-file",
+			description: "Specify FILE for netrc",
+			args: { name: "filename", template: "filepaths" },
+		},
+		{ name: "--netrc-optional", description: "Use either .netrc or URL" },
+		{ name: "--no-alpn", description: "Disable the ALPN TLS extension" },
+		{
+			name: "--no-keepalive",
+			description: "Disable TCP keepalive on the connection",
+		},
+		{ name: "--no-npn", description: "Disable the NPN TLS extension" },
+		{ name: "--no-sessionid", description: "Disable SSL session-ID reusing" },
+		{
+			name: "--noproxy",
+			description: "List of hosts which do not use proxy",
+			args: { name: "no-proxy-list" },
+		},
+		{ name: "--ntlm", description: "Use HTTP NTLM authentication" },
+		{
+			name: "--ntlm-wb",
+			description: "Use HTTP NTLM authentication with winbind",
+		},
+		{
+			name: "--oauth2-bearer",
+			description: "OAuth 2 Bearer Token",
+			args: { name: "token" },
+		},
+		{
+			name: "--pass",
+			description: "Pass phrase for the private key",
+			args: { name: "phrase" },
+		},
+		{
+			name: "--path-as-is",
+			description: "Do not squash .. sequences in URL path",
+		},
+		{
+			name: "--pinnedpubkey",
+			description: "FILE/HASHES Public key to verify peer against",
+			args: { name: "hashes" },
+		},
+		{
+			name: "--post301",
+			description: "Do not switch to GET after following a 301",
+		},
+		{
+			name: "--post302",
+			description: "Do not switch to GET after following a 302",
+		},
+		{
+			name: "--post303",
+			description: "Do not switch to GET after following a 303",
+		},
+		{
+			name: "--preproxy",
+			description: "[protocol://]host[:port] Use this proxy first",
+		},
+		{
+			name: "--proto",
+			description: "Enable/disable PROTOCOLS",
+			args: { name: "protocols" },
+		},
+		{
+			name: "--proto-default",
+			description: "Use PROTOCOL for any URL missing a scheme",
+			args: { name: "protocol" },
+		},
+		{
+			name: "--proto-redir",
+			description: "Enable/disable PROTOCOLS on redirect",
+			args: { name: "protocols" },
+		},
+		{
+			name: "--proxy-anyauth",
+			description: "Pick any proxy authentication method",
+		},
+		{
+			name: "--proxy-basic",
+			description: "Use Basic authentication on the proxy",
+		},
+		{
+			name: "--proxy-cacert",
+			description: "CA certificate to verify peer against for proxy",
+			args: { name: "file", template: "filepaths" },
+		},
+		{
+			name: "--proxy-capath",
+			description: "CA directory to verify peer against for proxy",
+			args: { name: "dir", template: "folders" },
+		},
+		{
+			name: "--proxy-cert",
+			description: "Set client certificate for proxy",
+			args: { name: "cert[:passwd]" },
+		},
+		{
+			name: "--proxy-cert-type",
+			description: "Client certificate type for HTTPS proxy",
+			args: { name: "type" },
+		},
+		{
+			name: "--proxy-ciphers",
+			description: "SSL ciphers to use for proxy",
+			args: { name: "list" },
+		},
+		{
+			name: "--proxy-crlfile",
+			description: "Set a CRL list for proxy",
+			args: { name: "file", template: "filepaths" },
+		},
+		{
+			name: "--proxy-digest",
+			description: "Use Digest authentication on the proxy",
+		},
+		{
+			name: "--proxy-header",
+			description: "Pass custom header(s) to proxy",
+			args: {
+				name: "header/file",
+				suggestions: [
+					{ name: "Content-Type: application/json" },
+					{ name: "Content-Type: application/x-www-form-urlencoded" },
+				],
+			},
+		},
+		{
+			name: "--proxy-insecure",
+			description: "Do HTTPS proxy connections without verifying the proxy",
+		},
+		{
+			name: "--proxy-key",
+			description: "Private key for HTTPS proxy",
+			args: { name: "key" },
+		},
+		{
+			name: "--proxy-key-type",
+			description: "Private key file type for proxy",
+			args: { name: "type" },
+		},
+		{
+			name: "--proxy-negotiate",
+			description: "Use HTTP Negotiate (SPNEGO) authentication on the proxy",
+		},
+		{
+			name: "--proxy-ntlm",
+			description: "Use NTLM authentication on the proxy",
+		},
+		{
+			name: "--proxy-pass",
+			description: "Pass phrase for the private key for HTTPS proxy",
+			args: { name: "phrase" },
+		},
+		{
+			name: "--proxy-pinnedpubkey",
+			description: "FILE/HASHES public key to verify proxy with",
+			args: { name: "hashes" },
+		},
+		{
+			name: "--proxy-service-name",
+			description: "SPNEGO proxy service name",
+			args: { name: "name" },
+		},
+		{
+			name: "--proxy-ssl-allow-beast",
+			description: "Allow security flaw for interop for HTTPS proxy",
+		},
+		{
+			name: "--proxy-tls13-ciphers",
+			description: "List> TLS 1.3 proxy cipher suites",
+			args: { name: "ciphersuite" },
+		},
+		{
+			name: "--proxy-tlsauthtype",
+			description: "TLS authentication type for HTTPS proxy",
+			args: { name: "type" },
+		},
+		{
+			name: "--proxy-tlspassword",
+			description: "TLS password for HTTPS proxy",
+			args: { name: "string" },
+		},
+		{
+			name: "--proxy-tlsuser",
+			description: "TLS username for HTTPS proxy",
+			args: { name: "name" },
+		},
+		{ name: "--proxy-tlsv1", description: "Use TLSv1 for HTTPS proxy" },
+		{
+			name: "--proxy1.0",
+			description: "Use HTTP/1.0 proxy on given port",
+			args: { name: "host[:port]" },
+		},
+		{
+			name: "--pubkey",
+			description: "SSH Public key file name",
+			args: { name: "key", template: "filepaths" },
+		},
+		{
+			name: "--random-file",
+			description: "File for reading random data from",
+			args: { name: "file", template: "filepaths" },
+		},
+		{ name: "--raw", description: 'Do HTTP "raw"; no transfer decoding' },
+		{
+			name: "--remote-name-all",
+			description: "Use the remote file name for all URLs",
+		},
+		{
+			name: "--request-target",
+			description: "Specify the target for this request",
+		},
+		{
+			name: "--resolve",
+			description: "Resolve the host+port to this address",
+			args: { name: "host:port:address[,address]..." },
+		},
+		{
+			name: "--retry",
+			description: "Retry request if transient problems occur",
+			args: { name: "num" },
+		},
+		{
+			name: "--retry-connrefused",
+			description: "Retry on connection refused (use with --retry)",
+		},
+		{
+			name: "--retry-delay",
+			description: "Wait time between retries",
+			args: { name: "seconds" },
+		},
+		{
+			name: "--retry-max-time",
+			description: "Retry only within this period",
+			args: { name: "seconds" },
+		},
+		{
+			name: "--sasl-ir",
+			description: "Enable initial response in SASL authentication",
+		},
+		{
+			name: "--service-name",
+			description: "SPNEGO service name",
+			args: { name: "name" },
+		},
+		{
+			name: "--socks4",
+			description: "SOCKS4 proxy on given host + port",
+			args: { name: "host[:port]" },
+		},
+		{
+			name: "--socks4a",
+			description: "SOCKS4a proxy on given host + port",
+			args: { name: "host[:port]" },
+		},
+		{
+			name: "--socks5",
+			description: "SOCKS5 proxy on given host + port",
+			args: { name: "host[:port]" },
+		},
+		{
+			name: "--socks5-basic",
+			description: "Enable username/password auth for SOCKS5 proxies",
+		},
+		{
+			name: "--socks5-gssapi",
+			description: "Enable GSS-API auth for SOCKS5 proxies",
+		},
+		{
+			name: "--socks5-gssapi-nec",
+			description: "Compatibility with NEC SOCKS5 server",
+		},
+		{
+			name: "--socks5-gssapi-service",
+			description: "SOCKS5 proxy service name for GSS-API",
+			args: { name: "name" },
+		},
+		{
+			name: "--socks5-hostname",
+			description: "SOCKS5 proxy, pass host name to proxy",
+			args: { name: "host[:port]" },
+		},
+		{ name: "--ssl", description: "Try SSL/TLS" },
+		{
+			name: "--ssl-auto-client-cert",
+			description: "Obtain and use a client certificate automatically",
+		},
+		{
+			name: "--ssl-allow-beast",
+			description: "Allow security flaw to improve interop",
+		},
+		{
+			name: "--ssl-no-revoke",
+			description: "Disable cert revocation checks (Schannel)",
+		},
+		{ name: "--ssl-reqd", description: "Require SSL/TLS" },
+		{ name: "--stderr", description: "Where to redirect stderr" },
+		{
+			name: "--styled-output",
+			description: "Enable styled output for HTTP headers",
+		},
+		{
+			name: "--suppress-connect-headers",
+			description: "Suppress proxy CONNECT response headers",
+		},
+		{ name: "--tcp-fastopen", description: "Use TCP Fast Open" },
+		{ name: "--tcp-nodelay", description: "Use the TCP_NODELAY option" },
+		{
+			name: "--tftp-blksize",
+			description: "Set TFTP BLKSIZE option",
+			args: { name: "value" },
+		},
+		{ name: "--tftp-no-options", description: "Do not send any TFTP options" },
+		{
+			name: "--tls-max",
+			description: "Set maximum allowed TLS version",
+			args: { name: "VERSION" },
+		},
+		{
+			name: "--tls13-ciphers",
+			description: "Of TLS 1.3 ciphersuites> TLS 1.3 cipher suites to use",
+			args: { name: "list" },
+		},
+		{
+			name: "--tlsauthtype",
+			description: "TLS authentication type",
+			args: { name: "type" },
+		},
+		{ name: "--tlspassword", description: "TLS password" },
+		{ name: "--tlsuser", description: "TLS user name", args: { name: "name" } },
+		{ name: "--tlsv1.0", description: "Use TLSv1.0 or greater" },
+		{ name: "--tlsv1.1", description: "Use TLSv1.1 or greater" },
+		{ name: "--tlsv1.2", description: "Use TLSv1.2 or greater" },
+		{ name: "--tlsv1.3", description: "Use TLSv1.3 or greater" },
+		{
+			name: "--tr-encoding",
+			description: "Request compressed transfer encoding",
+		},
+		{
+			name: "--trace",
+			description: "Write a debug trace to FILE",
+			args: { name: "file", template: "filepaths" },
+		},
+		{
+			name: "--trace-ascii",
+			description: "Like --trace, but without hex output",
+			args: { name: "file", template: "filepaths" },
+		},
+		{
+			name: "--trace-time",
+			description: "Add time stamps to trace/verbose output",
+		},
+		{
+			name: "--unix-socket",
+			description: "Connect through this Unix domain socket",
+			args: { name: "path" },
+		},
+		{ name: "--url", description: "URL to work with", args: { name: "url" } },
+		{
+			name: "--xattr",
+			description: "Store metadata in extended file attributes",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/df.ts b/extensions/terminal-suggest/src/completions/upstream/df.ts
index e7e005464ea9..42f577d89e77 100644
--- a/extensions/terminal-suggest/src/completions/upstream/df.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/df.ts
@@ -1,65 +1,65 @@
 const completionSpec: Fig.Spec = {
-  name: "df",
-  description: "Display free disk space",
-  args: {
-    name: "file or filesystem",
-  },
-  options: [
-    {
-      name: "-a",
-      description: "Show all mount points",
-    },
-    {
-      name: ["-b", "-P"],
-      description: "Use 512-byte blocks (default)",
-      exclusiveOn: ["-g", "-k", "-m"],
-    },
-    {
-      name: "-g",
-      description: "Use 1073741824-byte (1-Gbyte) blocks",
-      exclusiveOn: ["-b", "-P", "-m", "-k"],
-    },
-    {
-      name: "-m",
-      description: "Use 1048576-byte (1-Mbyte) blocks",
-      exclusiveOn: ["-b", "-P", "-g", "-k"],
-    },
-    {
-      name: "-k",
-      description: "Use 1024-byte (1-Kbyte) blocks",
-      exclusiveOn: ["-b", "-P", "-g", "-m"],
-    },
-    {
-      name: "-H",
-      description: '"Human-readable" output, uses base 10 unit suffixes',
-      exclusiveOn: ["-h"],
-    },
-    {
-      name: "-h",
-      description: '"Human-readable" output, uses base 2 unit suffixes',
-      exclusiveOn: ["-H"],
-    },
-    {
-      name: "-i",
-      description: "Include the number of free inodes",
-    },
-    {
-      name: "-l",
-      description: "Only display information about locally-mounted filesystems",
-    },
-    {
-      name: "-n",
-      description: "Print out the previously obtained statistics",
-    },
-    {
-      name: "-T",
-      description:
-        "Only print out statistics for filesystems of the specified types (comma separated)",
-      args: {
-        name: "filesystem",
-      },
-    },
-  ],
+	name: "df",
+	description: "Display free disk space",
+	args: {
+		name: "file or filesystem",
+	},
+	options: [
+		{
+			name: "-a",
+			description: "Show all mount points",
+		},
+		{
+			name: ["-b", "-P"],
+			description: "Use 512-byte blocks (default)",
+			exclusiveOn: ["-g", "-k", "-m"],
+		},
+		{
+			name: "-g",
+			description: "Use 1073741824-byte (1-Gbyte) blocks",
+			exclusiveOn: ["-b", "-P", "-m", "-k"],
+		},
+		{
+			name: "-m",
+			description: "Use 1048576-byte (1-Mbyte) blocks",
+			exclusiveOn: ["-b", "-P", "-g", "-k"],
+		},
+		{
+			name: "-k",
+			description: "Use 1024-byte (1-Kbyte) blocks",
+			exclusiveOn: ["-b", "-P", "-g", "-m"],
+		},
+		{
+			name: "-H",
+			description: '"Human-readable" output, uses base 10 unit suffixes',
+			exclusiveOn: ["-h"],
+		},
+		{
+			name: "-h",
+			description: '"Human-readable" output, uses base 2 unit suffixes',
+			exclusiveOn: ["-H"],
+		},
+		{
+			name: "-i",
+			description: "Include the number of free inodes",
+		},
+		{
+			name: "-l",
+			description: "Only display information about locally-mounted filesystems",
+		},
+		{
+			name: "-n",
+			description: "Print out the previously obtained statistics",
+		},
+		{
+			name: "-T",
+			description:
+				"Only print out statistics for filesystems of the specified types (comma separated)",
+			args: {
+				name: "filesystem",
+			},
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/du.ts b/extensions/terminal-suggest/src/completions/upstream/du.ts
index 833fa52630f7..ff3d6e421d2e 100644
--- a/extensions/terminal-suggest/src/completions/upstream/du.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/du.ts
@@ -1,93 +1,93 @@
 const completionSpec: Fig.Spec = {
-  name: "du",
-  description: "Display disk usage statistics",
-  options: [
-    {
-      name: "-a",
-      description: "Display an entry for each file in a file hierarchy",
-      exclusiveOn: ["-s", "-d"],
-    },
-    {
-      name: "-c",
-      description: "Display a grand total",
-    },
-    {
-      name: "-H",
-      description:
-        "Symbolic links on the command line are followed, symbolic links in file hierarchies are not followed",
-      exclusiveOn: ["-L", "-P"],
-    },
-    {
-      name: "-h",
-      description:
-        '"Human-readable" output.  Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte',
-      exclusiveOn: ["-k", "-m", "-g"],
-    },
-    {
-      name: "-g",
-      description: "Display block counts in 1073741824-byte (1-Gbyte) blocks",
-      exclusiveOn: ["-k", "-m", "-h"],
-    },
-    {
-      name: "-k",
-      description: "Display block counts in 1024-byte (1-Kbyte) blocks",
-      exclusiveOn: ["-g", "-m", "-h"],
-    },
-    {
-      name: "-m",
-      description: "Display block counts in 1048576-byte (1-Mbyte) blocks",
-      exclusiveOn: ["-g", "-k", "-h"],
-    },
-    {
-      name: "-I",
-      description: "Ignore files and directories matching the specified mask",
-      args: {
-        name: "mask",
-      },
-    },
-    {
-      name: "-L",
-      description:
-        "Symbolic links on the command line and in file hierarchies are followed",
-      exclusiveOn: ["-H", "-P"],
-    },
-    {
-      name: "-r",
-      description:
-        "Generate messages about directories that cannot be read, files that cannot be opened, and so on.  This is the default case.  This option exists solely for conformance with X/Open Portability Guide Issue 4 (``XPG4'')",
-    },
-    {
-      name: "-P",
-      description: "No symbolic links are followed.  This is the default",
-      exclusiveOn: ["-H", "-L"],
-    },
-    {
-      name: "-d",
-      description:
-        "Display an entry for all files and directories depth directories deep",
-      exclusiveOn: ["-a", "-s"],
-      args: {
-        name: "depth",
-        suggestions: ["0", "1", "2"],
-      },
-    },
-    {
-      name: "-s",
-      description:
-        "Display an entry for each specified file.  (Equivalent to -d 0)",
-      exclusiveOn: ["-a", "-d"],
-    },
-    {
-      name: "-x",
-      description:
-        "Display an entry for each specified file.  (Equivalent to -d 0)",
-    },
-  ],
-  args: {
-    isOptional: true,
-    name: "files",
-    isVariadic: true,
-    template: ["filepaths", "folders"],
-  },
+	name: "du",
+	description: "Display disk usage statistics",
+	options: [
+		{
+			name: "-a",
+			description: "Display an entry for each file in a file hierarchy",
+			exclusiveOn: ["-s", "-d"],
+		},
+		{
+			name: "-c",
+			description: "Display a grand total",
+		},
+		{
+			name: "-H",
+			description:
+				"Symbolic links on the command line are followed, symbolic links in file hierarchies are not followed",
+			exclusiveOn: ["-L", "-P"],
+		},
+		{
+			name: "-h",
+			description:
+				'"Human-readable" output.  Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte',
+			exclusiveOn: ["-k", "-m", "-g"],
+		},
+		{
+			name: "-g",
+			description: "Display block counts in 1073741824-byte (1-Gbyte) blocks",
+			exclusiveOn: ["-k", "-m", "-h"],
+		},
+		{
+			name: "-k",
+			description: "Display block counts in 1024-byte (1-Kbyte) blocks",
+			exclusiveOn: ["-g", "-m", "-h"],
+		},
+		{
+			name: "-m",
+			description: "Display block counts in 1048576-byte (1-Mbyte) blocks",
+			exclusiveOn: ["-g", "-k", "-h"],
+		},
+		{
+			name: "-I",
+			description: "Ignore files and directories matching the specified mask",
+			args: {
+				name: "mask",
+			},
+		},
+		{
+			name: "-L",
+			description:
+				"Symbolic links on the command line and in file hierarchies are followed",
+			exclusiveOn: ["-H", "-P"],
+		},
+		{
+			name: "-r",
+			description:
+				"Generate messages about directories that cannot be read, files that cannot be opened, and so on.  This is the default case.  This option exists solely for conformance with X/Open Portability Guide Issue 4 (``XPG4'')",
+		},
+		{
+			name: "-P",
+			description: "No symbolic links are followed.  This is the default",
+			exclusiveOn: ["-H", "-L"],
+		},
+		{
+			name: "-d",
+			description:
+				"Display an entry for all files and directories depth directories deep",
+			exclusiveOn: ["-a", "-s"],
+			args: {
+				name: "depth",
+				suggestions: ["0", "1", "2"],
+			},
+		},
+		{
+			name: "-s",
+			description:
+				"Display an entry for each specified file.  (Equivalent to -d 0)",
+			exclusiveOn: ["-a", "-d"],
+		},
+		{
+			name: "-x",
+			description:
+				"Display an entry for each specified file.  (Equivalent to -d 0)",
+		},
+	],
+	args: {
+		isOptional: true,
+		name: "files",
+		isVariadic: true,
+		template: ["filepaths", "folders"],
+	},
 };
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/echo.ts b/extensions/terminal-suggest/src/completions/upstream/echo.ts
index 8ca21b858b39..7b1452e23316 100644
--- a/extensions/terminal-suggest/src/completions/upstream/echo.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/echo.ts
@@ -1,42 +1,42 @@
 const environmentVariableGenerator: Fig.Generator = {
-  custom: async (tokens, _, context) => {
-    if (tokens.length < 3 || tokens[tokens.length - 1].startsWith("$")) {
-      return Object.keys(context.environmentVariables).map((suggestion) => ({
-        name: `$${suggestion}`,
-        type: "arg",
-        description: "Environment Variable",
-      }));
-    } else {
-      return [];
-    }
-  },
-  trigger: "$",
+	custom: async (tokens, _, context) => {
+		if (tokens.length < 3 || tokens[tokens.length - 1].startsWith("$")) {
+			return Object.keys(context.environmentVariables).map((suggestion) => ({
+				name: `$${suggestion}`,
+				type: "arg",
+				description: "Environment Variable",
+			}));
+		} else {
+			return [];
+		}
+	},
+	trigger: "$",
 };
 
 const completionSpec: Fig.Spec = {
-  name: "echo",
-  description: "Write arguments to the standard output",
-  args: {
-    name: "string",
-    isVariadic: true,
-    optionsCanBreakVariadicArg: false,
-    suggestCurrentToken: true,
-    generators: environmentVariableGenerator,
-  },
-  options: [
-    {
-      name: "-n",
-      description: "Do not print the trailing newline character",
-    },
-    {
-      name: "-e",
-      description: "Interpret escape sequences",
-    },
-    {
-      name: "-E",
-      description: "Disable escape sequences",
-    },
-  ],
+	name: "echo",
+	description: "Write arguments to the standard output",
+	args: {
+		name: "string",
+		isVariadic: true,
+		optionsCanBreakVariadicArg: false,
+		suggestCurrentToken: true,
+		generators: environmentVariableGenerator,
+	},
+	options: [
+		{
+			name: "-n",
+			description: "Do not print the trailing newline character",
+		},
+		{
+			name: "-e",
+			description: "Interpret escape sequences",
+		},
+		{
+			name: "-E",
+			description: "Disable escape sequences",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/find.ts b/extensions/terminal-suggest/src/completions/upstream/find.ts
index 5b5245cb5fdd..08b4d6a5393b 100644
--- a/extensions/terminal-suggest/src/completions/upstream/find.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/find.ts
@@ -1,71 +1,71 @@
 const completionSpec: Fig.Spec = {
-  name: "find",
-  description: "Walk a file hierarchy",
-  args: [
-    {
-      name: "path",
-      isOptional: true,
-      isVariadic: true,
-      template: ["folders"],
-    },
-    {
-      // TODO Suggestions for primaries and operands. See `man find`
-      name: "expression",
-      description: "Composition of primaries and operands",
-      isOptional: true,
-      isVariadic: true,
-    },
-  ],
-  options: [
-    {
-      name: "-E",
-      description:
-        "Interpret regular expressions followed by -regex and -iregex primaries as extended",
-    },
-    {
-      name: "-H",
-      description:
-        "Cause the file information and file type returned for each symbolic link specified to be those referenced by the link",
-      exclusiveOn: ["-L", "-P"],
-    },
-    {
-      name: "-L",
-      description:
-        "Cause the file information and file type returned for each symbolic link to be those of the file referenced by the link",
-      exclusiveOn: ["-H", "-P"],
-    },
-    {
-      name: "-P",
-      description:
-        "Cause the file information and file type returned for each symbolic link to be those for the link itself",
-      exclusiveOn: ["-H", "-L"],
-    },
-    {
-      name: "-X",
-      description: "Permit find to be safely used in conjunction with xargs",
-    },
-    {
-      name: "-d",
-      description: "Cause find to perform a depth-first traversal",
-    },
-    {
-      name: "-f",
-      description: "Specify a file hierarch for find to traverse",
-      args: {
-        name: "path",
-      },
-    },
-    {
-      name: "-s",
-      description:
-        "Cause find to traverse the file hierarchies in lexicographical order",
-    },
-    {
-      name: "-x",
-      description:
-        "Prevent find from descending into directories that have a device number different than that of the file from which the descent began",
-    },
-  ],
+	name: "find",
+	description: "Walk a file hierarchy",
+	args: [
+		{
+			name: "path",
+			isOptional: true,
+			isVariadic: true,
+			template: ["folders"],
+		},
+		{
+			// TODO Suggestions for primaries and operands. See `man find`
+			name: "expression",
+			description: "Composition of primaries and operands",
+			isOptional: true,
+			isVariadic: true,
+		},
+	],
+	options: [
+		{
+			name: "-E",
+			description:
+				"Interpret regular expressions followed by -regex and -iregex primaries as extended",
+		},
+		{
+			name: "-H",
+			description:
+				"Cause the file information and file type returned for each symbolic link specified to be those referenced by the link",
+			exclusiveOn: ["-L", "-P"],
+		},
+		{
+			name: "-L",
+			description:
+				"Cause the file information and file type returned for each symbolic link to be those of the file referenced by the link",
+			exclusiveOn: ["-H", "-P"],
+		},
+		{
+			name: "-P",
+			description:
+				"Cause the file information and file type returned for each symbolic link to be those for the link itself",
+			exclusiveOn: ["-H", "-L"],
+		},
+		{
+			name: "-X",
+			description: "Permit find to be safely used in conjunction with xargs",
+		},
+		{
+			name: "-d",
+			description: "Cause find to perform a depth-first traversal",
+		},
+		{
+			name: "-f",
+			description: "Specify a file hierarch for find to traverse",
+			args: {
+				name: "path",
+			},
+		},
+		{
+			name: "-s",
+			description:
+				"Cause find to traverse the file hierarchies in lexicographical order",
+		},
+		{
+			name: "-x",
+			description:
+				"Prevent find from descending into directories that have a device number different than that of the file from which the descent began",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/git.ts b/extensions/terminal-suggest/src/completions/upstream/git.ts
index 6fd565707b1c..63af2af69849 100644
--- a/extensions/terminal-suggest/src/completions/upstream/git.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/git.ts
@@ -1,9809 +1,9809 @@
 function ai(...args: any[]): undefined { return undefined; }
 
 const filterMessages = (out: string): string => {
-  return out.startsWith("warning:") || out.startsWith("error:")
-    ? out.split("\n").slice(1).join("\n")
-    : out;
+	return out.startsWith("warning:") || out.startsWith("error:")
+		? out.split("\n").slice(1).join("\n")
+		: out;
 };
 
 const postProcessTrackedFiles: Fig.Generator["postProcess"] = (
-  out,
-  context
+	out,
+	context
 ) => {
-  const output = filterMessages(out);
+	const output = filterMessages(out);
 
-  if (output.startsWith("fatal:")) {
-    return [];
-  }
+	if (output.startsWith("fatal:")) {
+		return [];
+	}
 
-  const files = output.split("\n").map((file) => {
-    const arr = file.trim().split(" ");
+	const files = output.split("\n").map((file) => {
+		const arr = file.trim().split(" ");
 
-    return { working: arr[0], file: arr.slice(1).join(" ").trim() };
-  });
+		return { working: arr[0], file: arr.slice(1).join(" ").trim() };
+	});
 
-  return [
-    ...files.map((item) => {
-      const file = item.file.replace(/^"|"$/g, "");
-      let ext = "";
+	return [
+		...files.map((item) => {
+			const file = item.file.replace(/^"|"$/g, "");
+			let ext = "";
 
-      try {
-        ext = file.split(".").slice(-1)[0];
-      } catch (e) {}
+			try {
+				ext = file.split(".").slice(-1)[0];
+			} catch (e) {}
 
-      if (file.endsWith("/")) {
-        ext = "folder";
-      }
+			if (file.endsWith("/")) {
+				ext = "folder";
+			}
 
-      return {
-        name: file,
-        icon: `fig://icon?type=${ext}&color=ff0000&badge=${item.working}`,
-        description: "Changed tracked files",
-        // If the current file already is already added
-        // we want to lower the priority
-        priority: context.some((ctx) => ctx.includes(file)) ? 50 : 100,
-      };
-    }),
-  ];
+			return {
+				name: file,
+				icon: `fig://icon?type=${ext}&color=ff0000&badge=${item.working}`,
+				description: "Changed tracked files",
+				// If the current file already is already added
+				// we want to lower the priority
+				priority: context.some((ctx) => ctx.includes(file)) ? 50 : 100,
+			};
+		}),
+	];
 };
 
 interface PostProcessBranchesOptions {
-  insertWithoutRemotes?: true;
+	insertWithoutRemotes?: true;
 }
 
 const postProcessBranches =
-  (options: PostProcessBranchesOptions = {}): Fig.Generator["postProcess"] =>
-  (out) => {
-    const { insertWithoutRemotes = false } = options;
+	(options: PostProcessBranchesOptions = {}): Fig.Generator["postProcess"] =>
+	(out) => {
+		const { insertWithoutRemotes = false } = options;
 
-    const output = filterMessages(out);
+		const output = filterMessages(out);
 
-    if (output.startsWith("fatal:")) {
-      return [];
-    }
+		if (output.startsWith("fatal:")) {
+			return [];
+		}
 
-    const seen = new Set<string>();
-    return output
-      .split("\n")
-      .filter((line) => !line.trim().startsWith("HEAD"))
-      .map((branch) => {
-        let name = branch.trim();
-        const parts = branch.match(/\S+/g);
-        if (parts.length > 1) {
-          if (parts[0] === "*") {
-            // We are in a detached HEAD state
-            if (branch.includes("HEAD detached")) {
-              return null;
-            }
-            // Current branch
-            return {
-              name: branch.replace("*", "").trim(),
-              description: "Current branch",
-              priority: 100,
-              icon: "⭐️",
-            };
-          } else if (parts[0] === "+") {
-            // Branch checked out in another worktree.
-            name = branch.replace("+", "").trim();
-          }
-        }
+		const seen = new Set<string>();
+		return output
+			.split("\n")
+			.filter((line) => !line.trim().startsWith("HEAD"))
+			.map((branch) => {
+				let name = branch.trim();
+				const parts = branch.match(/\S+/g);
+				if (parts.length > 1) {
+					if (parts[0] === "*") {
+						// We are in a detached HEAD state
+						if (branch.includes("HEAD detached")) {
+							return null;
+						}
+						// Current branch
+						return {
+							name: branch.replace("*", "").trim(),
+							description: "Current branch",
+							priority: 100,
+							icon: "⭐️",
+						};
+					} else if (parts[0] === "+") {
+						// Branch checked out in another worktree.
+						name = branch.replace("+", "").trim();
+					}
+				}
 
-        let description = "Branch";
+				let description = "Branch";
 
-        if (insertWithoutRemotes && name.startsWith("remotes/")) {
-          name = name.slice(name.indexOf("/", 8) + 1);
-          description = "Remote branch";
-        }
+				if (insertWithoutRemotes && name.startsWith("remotes/")) {
+					name = name.slice(name.indexOf("/", 8) + 1);
+					description = "Remote branch";
+				}
 
-        const space = name.indexOf(" ");
-        if (space !== -1) {
-          name = name.slice(0, space);
-        }
+				const space = name.indexOf(" ");
+				if (space !== -1) {
+					name = name.slice(0, space);
+				}
 
-        return {
-          name,
-          description,
-          icon: "fig://icon?type=git",
-          priority: 75,
-        };
-      })
-      .filter((suggestion) => {
-        if (seen.has(suggestion.name)) return false;
-        seen.add(suggestion.name);
-        return true;
-      });
-  };
+				return {
+					name,
+					description,
+					icon: "fig://icon?type=git",
+					priority: 75,
+				};
+			})
+			.filter((suggestion) => {
+				if (seen.has(suggestion.name)) return false;
+				seen.add(suggestion.name);
+				return true;
+			});
+	};
 
 export const gitGenerators: Record<string, Fig.Generator> = {
-  // Commit history
-  commits: {
-    script: ["git", "--no-optional-locks", "log", "--oneline"],
-    postProcess: function (out) {
-      const output = filterMessages(out);
+	// Commit history
+	commits: {
+		script: ["git", "--no-optional-locks", "log", "--oneline"],
+		postProcess: function (out) {
+			const output = filterMessages(out);
 
-      if (output.startsWith("fatal:")) {
-        return [];
-      }
+			if (output.startsWith("fatal:")) {
+				return [];
+			}
 
-      return output.split("\n").map((line) => {
-        return {
-          name: line.substring(0, 7),
-          icon: "fig://icon?type=node",
-          description: line.substring(7),
-        };
-      });
-    },
-  },
+			return output.split("\n").map((line) => {
+				return {
+					name: line.substring(0, 7),
+					icon: "fig://icon?type=node",
+					description: line.substring(7),
+				};
+			});
+		},
+	},
 
-  // user aliases
-  aliases: {
-    script: ["git", "--no-optional-locks", "config", "--get-regexp", "^alias."],
-    cache: {
-      strategy: "stale-while-revalidate",
-    },
-    postProcess: (out) => {
-      const suggestions = out.split("\n").map((aliasLine) => {
-        const [name, ...parts] = aliasLine.slice("alias.".length).split(" ");
-        const value = parts.join(" ");
-        return {
-          name,
-          description: `Alias for '${value}'`,
-          icon: "fig://icon?type=commandkey",
-        };
-      });
-      const seen = new Set();
-      return suggestions.filter((suggestion) => {
-        if (seen.has(suggestion.name)) {
-          return false;
-        }
-        seen.add(suggestion.name);
-        return true;
-      });
-    },
-  },
+	// user aliases
+	aliases: {
+		script: ["git", "--no-optional-locks", "config", "--get-regexp", "^alias."],
+		cache: {
+			strategy: "stale-while-revalidate",
+		},
+		postProcess: (out) => {
+			const suggestions = out.split("\n").map((aliasLine) => {
+				const [name, ...parts] = aliasLine.slice("alias.".length).split(" ");
+				const value = parts.join(" ");
+				return {
+					name,
+					description: `Alias for '${value}'`,
+					icon: "fig://icon?type=commandkey",
+				};
+			});
+			const seen = new Set();
+			return suggestions.filter((suggestion) => {
+				if (seen.has(suggestion.name)) {
+					return false;
+				}
+				seen.add(suggestion.name);
+				return true;
+			});
+		},
+	},
 
-  revs: {
-    script: ["git", "rev-list", "--all", "--oneline"],
-    postProcess: function (out) {
-      const output = filterMessages(out);
+	revs: {
+		script: ["git", "rev-list", "--all", "--oneline"],
+		postProcess: function (out) {
+			const output = filterMessages(out);
 
-      if (output.startsWith("fatal:")) {
-        return [];
-      }
+			if (output.startsWith("fatal:")) {
+				return [];
+			}
 
-      return output.split("\n").map((line) => {
-        return {
-          name: line.substring(0, 7),
-          icon: "fig://icon?type=node",
-          description: line.substring(7),
-        };
-      });
-    },
-  },
+			return output.split("\n").map((line) => {
+				return {
+					name: line.substring(0, 7),
+					icon: "fig://icon?type=node",
+					description: line.substring(7),
+				};
+			});
+		},
+	},
 
-  // Saved stashes
-  // TODO: maybe only print names of stashes
-  stashes: {
-    script: ["git", "--no-optional-locks", "stash", "list"],
-    postProcess: function (out) {
-      const output = filterMessages(out);
+	// Saved stashes
+	// TODO: maybe only print names of stashes
+	stashes: {
+		script: ["git", "--no-optional-locks", "stash", "list"],
+		postProcess: function (out) {
+			const output = filterMessages(out);
 
-      if (output.startsWith("fatal:")) {
-        return [];
-      }
+			if (output.startsWith("fatal:")) {
+				return [];
+			}
 
-      return output.split("\n").map((file) => {
-        return {
-          // account for conventional commit messages
-          name: file.split(":").slice(2).join(":"),
-          insertValue: file.split(":")[0],
-          icon: `fig://icon?type=node`,
-        };
-      });
-    },
-  },
+			return output.split("\n").map((file) => {
+				return {
+					// account for conventional commit messages
+					name: file.split(":").slice(2).join(":"),
+					insertValue: file.split(":")[0],
+					icon: `fig://icon?type=node`,
+				};
+			});
+		},
+	},
 
-  // Tree-ish
-  // This needs to be fleshed out properly....
-  // e.g. what is difference to commit-ish?
-  // Refer to this:https://stackoverflow.com/questions/23303549/what-are-commit-ish-and-tree-ish-in-git/40910185
-  // https://mirrors.edge.kernel.org/pub/software/scm/git/docs/#_identifier_terminology
+	// Tree-ish
+	// This needs to be fleshed out properly....
+	// e.g. what is difference to commit-ish?
+	// Refer to this:https://stackoverflow.com/questions/23303549/what-are-commit-ish-and-tree-ish-in-git/40910185
+	// https://mirrors.edge.kernel.org/pub/software/scm/git/docs/#_identifier_terminology
 
-  treeish: {
-    script: ["git", "--no-optional-locks", "diff", "--cached", "--name-only"],
-    postProcess: function (out, tokens) {
-      const output = filterMessages(out);
+	treeish: {
+		script: ["git", "--no-optional-locks", "diff", "--cached", "--name-only"],
+		postProcess: function (out, tokens) {
+			const output = filterMessages(out);
 
-      if (output.startsWith("fatal:")) {
-        return [];
-      }
+			if (output.startsWith("fatal:")) {
+				return [];
+			}
 
-      return output.split("\n").map((file) => {
-        return {
-          name: file,
-          insertValue: (!tokens.includes("--") ? "-- " : "") + file,
-          icon: `fig://icon?type=file`,
-          description: "Staged file",
-        };
-      });
-    },
-  },
+			return output.split("\n").map((file) => {
+				return {
+					name: file,
+					insertValue: (!tokens.includes("--") ? "-- " : "") + file,
+					icon: `fig://icon?type=file`,
+					description: "Staged file",
+				};
+			});
+		},
+	},
 
-  // All branches
-  remoteLocalBranches: {
-    script: [
-      "git",
-      "--no-optional-locks",
-      "branch",
-      "-a",
-      "--no-color",
-      "--sort=-committerdate",
-    ],
-    postProcess: postProcessBranches({ insertWithoutRemotes: true }),
-  },
+	// All branches
+	remoteLocalBranches: {
+		script: [
+			"git",
+			"--no-optional-locks",
+			"branch",
+			"-a",
+			"--no-color",
+			"--sort=-committerdate",
+		],
+		postProcess: postProcessBranches({ insertWithoutRemotes: true }),
+	},
 
-  localBranches: {
-    script: [
-      "git",
-      "--no-optional-locks",
-      "branch",
-      "--no-color",
-      "--sort=-committerdate",
-    ],
-    postProcess: postProcessBranches({ insertWithoutRemotes: true }),
-  },
+	localBranches: {
+		script: [
+			"git",
+			"--no-optional-locks",
+			"branch",
+			"--no-color",
+			"--sort=-committerdate",
+		],
+		postProcess: postProcessBranches({ insertWithoutRemotes: true }),
+	},
 
-  // 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 });
-      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
-        );
-      }
-    },
-  },
+	// 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 });
+			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
+				);
+			}
+		},
+	},
 
-  remotes: {
-    script: ["git", "--no-optional-locks", "remote", "-v"],
-    postProcess: function (out) {
-      const remoteURLs = out.split("\n").reduce<Record<string, string>>((dict, line) => {
-        const pair = line.split("\t");
-        const remote = pair[0];
-        const url = pair[1].split(" ")[0];
+	remotes: {
+		script: ["git", "--no-optional-locks", "remote", "-v"],
+		postProcess: function (out) {
+			const remoteURLs = out.split("\n").reduce<Record<string, string>>((dict, line) => {
+				const pair = line.split("\t");
+				const remote = pair[0];
+				const url = pair[1].split(" ")[0];
 
-        dict[remote] = url;
-        return dict;
-      }, {});
+				dict[remote] = url;
+				return dict;
+			}, {});
 
-      return Object.keys(remoteURLs).map((remote) => {
-        const url = remoteURLs[remote];
-        let icon = "box";
-        if (url.includes("github.com")) {
-          icon = "github";
-        }
+			return Object.keys(remoteURLs).map((remote) => {
+				const url = remoteURLs[remote];
+				let icon = "box";
+				if (url.includes("github.com")) {
+					icon = "github";
+				}
 
-        if (url.includes("gitlab.com")) {
-          icon = "gitlab";
-        }
+				if (url.includes("gitlab.com")) {
+					icon = "gitlab";
+				}
 
-        if (url.includes("heroku.com")) {
-          icon = "heroku";
-        }
-        return {
-          name: remote,
-          icon: `fig://icon?type=${icon}`,
-          description: "Remote",
-        };
-      });
-    },
-  },
+				if (url.includes("heroku.com")) {
+					icon = "heroku";
+				}
+				return {
+					name: remote,
+					icon: `fig://icon?type=${icon}`,
+					description: "Remote",
+				};
+			});
+		},
+	},
 
-  tags: {
-    script: [
-      "git",
-      "--no-optional-locks",
-      "tag",
-      "--list",
-      "--sort=-committerdate",
-    ],
-    postProcess: function (output) {
-      return output.split("\n").map((tag) => ({
-        name: tag,
-        icon: "🏷️",
-      }));
-    },
-  },
+	tags: {
+		script: [
+			"git",
+			"--no-optional-locks",
+			"tag",
+			"--list",
+			"--sort=-committerdate",
+		],
+		postProcess: function (output) {
+			return output.split("\n").map((tag) => ({
+				name: tag,
+				icon: "🏷️",
+			}));
+		},
+	},
 
-  // Files for staging
-  files_for_staging: {
-    script: ["git", "--no-optional-locks", "status", "--short"],
-    postProcess: (out, context) => {
-      // This whole function is a mess
+	// Files for staging
+	files_for_staging: {
+		script: ["git", "--no-optional-locks", "status", "--short"],
+		postProcess: (out, context) => {
+			// This whole function is a mess
 
-      const output = filterMessages(out);
+			const output = filterMessages(out);
 
-      if (output.startsWith("fatal:")) {
-        return [];
-      }
-      let files = output.split("\n").map((file) => {
-        // From "git --no-optional-locks status --short"
-        // M  dev/github.ts // test file that was added
-        //  M dev/kubectl.ts // test file that was not added
-        // A  test2.txt // new added and tracked file
-        // ?? test.txt // new untracked file
-        const alreadyAdded = ["M", "A"].includes(file.charAt(0));
+			if (output.startsWith("fatal:")) {
+				return [];
+			}
+			let files = output.split("\n").map((file) => {
+				// From "git --no-optional-locks status --short"
+				// M  dev/github.ts // test file that was added
+				//  M dev/kubectl.ts // test file that was not added
+				// A  test2.txt // new added and tracked file
+				// ?? test.txt // new untracked file
+				const alreadyAdded = ["M", "A"].includes(file.charAt(0));
 
-        file = file.trim();
-        const arr = file.split(" ");
+				file = file.trim();
+				const arr = file.split(" ");
 
-        return {
-          working: arr[0],
-          file: arr.slice(1).join(" ").trim(),
-          alreadyAdded,
-        };
-      });
+				return {
+					working: arr[0],
+					file: arr.slice(1).join(" ").trim(),
+					alreadyAdded,
+				};
+			});
 
-      const paths = output.split("\n").map((file) => {
-        const arr = file
-          .slice(0, file.lastIndexOf("/") + 1)
-          .trim()
-          .split(" ");
-        return arr.slice(1).join(" ").trim();
-      });
+			const paths = output.split("\n").map((file) => {
+				const arr = file
+					.slice(0, file.lastIndexOf("/") + 1)
+					.trim()
+					.split(" ");
+				return arr.slice(1).join(" ").trim();
+			});
 
-      const dirArr = [];
-      if (paths.length >= 2) {
-        let currentDir = paths[0];
-        let count = 1;
-        for (let i = 1; i < paths.length; i++) {
-          if (paths[i].includes(currentDir) && i + 1 !== paths.length) {
-            count++;
-          } else {
-            if (count >= 2) {
-              dirArr.push(currentDir);
-            }
-            count = 1;
-          }
-          currentDir = paths[i];
-        }
-      }
+			const dirArr = [];
+			if (paths.length >= 2) {
+				let currentDir = paths[0];
+				let count = 1;
+				for (let i = 1; i < paths.length; i++) {
+					if (paths[i].includes(currentDir) && i + 1 !== paths.length) {
+						count++;
+					} else {
+						if (count >= 2) {
+							dirArr.push(currentDir);
+						}
+						count = 1;
+					}
+					currentDir = paths[i];
+				}
+			}
 
-      // Filter out the files that the user has already input in the current edit buffer
-      files = files.filter((item) => {
-        const file = item.file.replace(/^"|"$/g, "");
-        return !context.some((ctx) => {
-          return (
-            ctx === file ||
-            // Need to add support for proper globbing one day
-            (ctx.endsWith("*") && file.startsWith(ctx.slice(0, -1))) ||
-            (ctx.startsWith("*") && file.endsWith(ctx.slice(1)))
-          );
-        });
-      });
+			// Filter out the files that the user has already input in the current edit buffer
+			files = files.filter((item) => {
+				const file = item.file.replace(/^"|"$/g, "");
+				return !context.some((ctx) => {
+					return (
+						ctx === file ||
+						// Need to add support for proper globbing one day
+						(ctx.endsWith("*") && file.startsWith(ctx.slice(0, -1))) ||
+						(ctx.startsWith("*") && file.endsWith(ctx.slice(1)))
+					);
+				});
+			});
 
-      return [
-        ...dirArr.map((name) => {
-          return {
-            name: name + "*",
-            description: "Wildcard",
-            icon: "fig://icon?type=asterisk",
-          };
-        }),
-        ...files.map((item) => {
-          const file = item.file.replace(/^"|"$/g, "");
-          let ext = "";
-          try {
-            ext = file.split(".").slice(-1)[0];
-          } catch (e) {}
+			return [
+				...dirArr.map((name) => {
+					return {
+						name: name + "*",
+						description: "Wildcard",
+						icon: "fig://icon?type=asterisk",
+					};
+				}),
+				...files.map((item) => {
+					const file = item.file.replace(/^"|"$/g, "");
+					let ext = "";
+					try {
+						ext = file.split(".").slice(-1)[0];
+					} catch (e) {}
 
-          if (file.endsWith("/")) {
-            ext = "folder";
-          }
+					if (file.endsWith("/")) {
+						ext = "folder";
+					}
 
-          // If the current file is already added
-          // we want to lower the priority
-          const priority = item.alreadyAdded ? 50 : 100;
-          return {
-            name: file,
-            icon: `fig://icon?type=${ext}&color=ff0000&badge=${item.working}`,
-            description: "Changed file",
-            priority,
-          };
-        }),
-      ];
-    },
-  },
+					// If the current file is already added
+					// we want to lower the priority
+					const priority = item.alreadyAdded ? 50 : 100;
+					return {
+						name: file,
+						icon: `fig://icon?type=${ext}&color=ff0000&badge=${item.working}`,
+						description: "Changed file",
+						priority,
+					};
+				}),
+			];
+		},
+	},
 
-  getStagedFiles: {
-    script: [
-      "bash",
-      "-c",
-      "git --no-optional-locks status --short | sed -ne '/^M /p' -e '/A /p'",
-    ],
-    postProcess: postProcessTrackedFiles,
-  },
+	getStagedFiles: {
+		script: [
+			"bash",
+			"-c",
+			"git --no-optional-locks status --short | sed -ne '/^M /p' -e '/A /p'",
+		],
+		postProcess: postProcessTrackedFiles,
+	},
 
-  getUnstagedFiles: {
-    script: ["git", "--no-optional-locks", "diff", "--name-only"],
-    splitOn: "\n",
-  },
+	getUnstagedFiles: {
+		script: ["git", "--no-optional-locks", "diff", "--name-only"],
+		splitOn: "\n",
+	},
 
-  getChangedTrackedFiles: {
-    script: function (context) {
-      if (context.includes("--staged") || context.includes("--cached")) {
-        return [
-          "bash",
-          "-c",
-          `git --no-optional-locks status --short | sed -ne '/^M /p' -e '/A /p'`,
-        ];
-      } else {
-        return [
-          "bash",
-          "-c",
-          `git --no-optional-locks status --short | sed -ne '/M /p' -e '/A /p'`,
-        ];
-      }
-    },
-    postProcess: postProcessTrackedFiles,
-  },
+	getChangedTrackedFiles: {
+		script: function (context) {
+			if (context.includes("--staged") || context.includes("--cached")) {
+				return [
+					"bash",
+					"-c",
+					`git --no-optional-locks status --short | sed -ne '/^M /p' -e '/A /p'`,
+				];
+			} else {
+				return [
+					"bash",
+					"-c",
+					`git --no-optional-locks status --short | sed -ne '/M /p' -e '/A /p'`,
+				];
+			}
+		},
+		postProcess: postProcessTrackedFiles,
+	},
 };
 
 const configSuggestions: Fig.Suggestion[] = [
-  {
-    name: "add.ignore-errors",
-    description:
-      "Tells 'git add' to continue adding files when some files cannot be added due to indexing errors. Equivalent to the `--ignore-errors` option of git-add[1]. `add.ignore-errors` is deprecated, as it does not follow the usual naming convention for configuration variables",
-    deprecated: true,
-    hidden: true,
-  },
-  {
-    name: "add.interactive.useBuiltin",
-    description:
-      "Set to `false` to fall back to the original Perl implementation of the interactive version of git-add[1] instead of the built-in version. Is `true` by default",
-  },
-  {
-    name: "advice.addEmbeddedRepo",
-    description:
-      "Advice on what to do when you've accidentally added one git repo inside of another",
-  },
-  {
-    name: "advice.addEmptyPathspec",
-    description:
-      "Advice shown if a user runs the add command without providing the pathspec parameter",
-  },
-  {
-    name: "advice.addIgnoredFile",
-    description:
-      "Advice shown if a user attempts to add an ignored file to the index",
-  },
-  {
-    name: "advice.ambiguousFetchRefspec",
-    description:
-      "Advice shown when fetch refspec for multiple remotes map to the same remote-tracking branch namespace and causes branch tracking set-up to fail",
-  },
-  {
-    name: "advice.amWorkDir",
-    description:
-      "Advice that shows the location of the patch file when git-am[1] fails to apply it",
-  },
-  {
-    name: "advice.checkoutAmbiguousRemoteBranchName",
-    description:
-      "Advice shown when the argument to git-checkout[1] and git-switch[1] ambiguously resolves to a remote tracking branch on more than one remote in situations where an unambiguous argument would have otherwise caused a remote-tracking branch to be checked out. See the `checkout.defaultRemote` configuration variable for how to set a given remote to used by default in some situations where this advice would be printed",
-  },
-  {
-    name: "advice.commitBeforeMerge",
-    description:
-      "Advice shown when git-merge[1] refuses to merge to avoid overwriting local changes",
-  },
-  {
-    name: "advice.detachedHead",
-    description:
-      "Advice shown when you used git-switch[1] or git-checkout[1] to move to the detach HEAD state, to instruct how to create a local branch after the fact",
-  },
-  {
-    name: "advice.fetchShowForcedUpdates",
-    description:
-      "Advice shown when git-fetch[1] takes a long time to calculate forced updates after ref updates, or to warn that the check is disabled",
-  },
-  {
-    name: "advice.ignoredHook",
-    description:
-      "Advice shown if a hook is ignored because the hook is not set as executable",
-  },
-  {
-    name: "advice.implicitIdentity",
-    description:
-      "Advice on how to set your identity configuration when your information is guessed from the system username and domain name",
-  },
-  {
-    name: "advice.nestedTag",
-    description:
-      "Advice shown if a user attempts to recursively tag a tag object",
-  },
-  {
-    name: "advice.pushAlreadyExists",
-    description:
-      "Shown when git-push[1] rejects an update that does not qualify for fast-forwarding (e.g., a tag.)",
-  },
-  {
-    name: "advice.pushFetchFirst",
-    description:
-      "Shown when git-push[1] rejects an update that tries to overwrite a remote ref that points at an object we do not have",
-  },
-  {
-    name: "advice.pushNeedsForce",
-    description:
-      "Shown when git-push[1] rejects an update that tries to overwrite a remote ref that points at an object that is not a commit-ish, or make the remote ref point at an object that is not a commit-ish",
-  },
-  {
-    name: "advice.pushNonFFCurrent",
-    description:
-      "Advice shown when git-push[1] fails due to a non-fast-forward update to the current branch",
-  },
-  {
-    name: "advice.pushNonFFMatching",
-    description:
-      "Advice shown when you ran git-push[1] and pushed 'matching refs' explicitly (i.e. you used ':', or specified a refspec that isn't your current branch) and it resulted in a non-fast-forward error",
-  },
-  {
-    name: "advice.pushRefNeedsUpdate",
-    description:
-      "Shown when git-push[1] rejects a forced update of a branch when its remote-tracking ref has updates that we do not have locally",
-  },
-  {
-    name: "advice.pushUnqualifiedRefname",
-    description:
-      "Shown when git-push[1] gives up trying to guess based on the source and destination refs what remote ref namespace the source belongs in, but where we can still suggest that the user push to either refs/heads/* or refs/tags/* based on the type of the source object",
-  },
-  {
-    name: "advice.pushUpdateRejected",
-    description:
-      "Set this variable to 'false' if you want to disable 'pushNonFFCurrent', 'pushNonFFMatching', 'pushAlreadyExists', 'pushFetchFirst', 'pushNeedsForce', and 'pushRefNeedsUpdate' simultaneously",
-  },
-  {
-    name: "advice.resetNoRefresh",
-    description:
-      "Advice to consider using the `--no-refresh` option to git-reset[1] when the command takes more than 2 seconds to refresh the index after reset",
-  },
-  {
-    name: "advice.resolveConflict",
-    description:
-      "Advice shown by various commands when conflicts prevent the operation from being performed",
-  },
-  {
-    name: "advice.rmHints",
-    description:
-      "In case of failure in the output of git-rm[1], show directions on how to proceed from the current state",
-  },
-  {
-    name: "advice.sequencerInUse",
-    description: "Advice shown when a sequencer command is already in progress",
-  },
-  {
-    name: "advice.skippedCherryPicks",
-    description:
-      "Shown when git-rebase[1] skips a commit that has already been cherry-picked onto the upstream branch",
-  },
-  {
-    name: "advice.statusAheadBehind",
-    description:
-      "Shown when git-status[1] computes the ahead/behind counts for a local ref compared to its remote tracking ref, and that calculation takes longer than expected. Will not appear if `status.aheadBehind` is false or the option `--no-ahead-behind` is given",
-  },
-  {
-    name: "advice.statusHints",
-    description:
-      "Show directions on how to proceed from the current state in the output of git-status[1], in the template shown when writing commit messages in git-commit[1], and in the help message shown by git-switch[1] or git-checkout[1] when switching branch",
-  },
-  {
-    name: "advice.statusUoption",
-    description:
-      "Advise to consider using the `-u` option to git-status[1] when the command takes more than 2 seconds to enumerate untracked files",
-  },
-  {
-    name: "advice.submoduleAlternateErrorStrategyDie",
-    description:
-      'Advice shown when a submodule.alternateErrorStrategy option configured to "die" causes a fatal error',
-  },
-  {
-    name: "advice.submodulesNotUpdated",
-    description:
-      "Advice shown when a user runs a submodule command that fails because `git submodule update --init` was not run",
-  },
-  {
-    name: "advice.suggestDetachingHead",
-    description:
-      "Advice shown when git-switch[1] refuses to detach HEAD without the explicit `--detach` option",
-  },
-  {
-    name: "advice.updateSparsePath",
-    description:
-      "Advice shown when either git-add[1] or git-rm[1] is asked to update index entries outside the current sparse checkout",
-  },
-  {
-    name: "advice.waitingForEditor",
-    description:
-      "Print a message to the terminal whenever Git is waiting for editor input from the user",
-  },
-  {
-    name: "alias.*",
-    insertValue: "alias.{cursor}",
-    description:
-      "Command aliases for the git[1] command wrapper - e.g. after defining `alias.last = cat-file commit HEAD`, the invocation `git last` is equivalent to `git cat-file commit HEAD`. To avoid confusion and troubles with script usage, aliases that hide existing Git commands are ignored. Arguments are split by spaces, the usual shell quoting and escaping is supported. A quote pair or a backslash can be used to quote them",
-  },
-  {
-    name: "am.keepcr",
-    description:
-      "If true, git-am will call git-mailsplit for patches in mbox format with parameter `--keep-cr`. In this case git-mailsplit will not remove `\\r` from lines ending with `\\r\\n`. Can be overridden by giving `--no-keep-cr` from the command line. See git-am[1], git-mailsplit[1]",
-  },
-  {
-    name: "am.threeWay",
-    description:
-      "By default, `git am` will fail if the patch does not apply cleanly. When set to true, this setting tells `git am` to fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally (equivalent to giving the `--3way` option from the command line). Defaults to `false`. See git-am[1]",
-  },
-  {
-    name: "apply.ignoreWhitespace",
-    description:
-      "When set to 'change', tells 'git apply' to ignore changes in whitespace, in the same way as the `--ignore-space-change` option. When set to one of: no, none, never, false tells 'git apply' to respect all whitespace differences. See git-apply[1]",
-  },
-  {
-    name: "apply.whitespace",
-    description:
-      "Tells 'git apply' how to handle whitespaces, in the same way as the `--whitespace` option. See git-apply[1]",
-  },
-  {
-    name: "blame.blankBoundary",
-    description:
-      "Show blank commit object name for boundary commits in git-blame[1]. This option defaults to false",
-  },
-  {
-    name: "blame.coloring",
-    description:
-      "This determines the coloring scheme to be applied to blame output. It can be 'repeatedLines', 'highlightRecent', or 'none' which is the default",
-  },
-  {
-    name: "blame.date",
-    description:
-      "Specifies the format used to output dates in git-blame[1]. If unset the iso format is used. For supported values, see the discussion of the `--date` option at git-log[1]",
-  },
-  {
-    name: "blame.ignoreRevsFile",
-    description:
-      "Ignore revisions listed in the file, one unabbreviated object name per line, in git-blame[1]. Whitespace and comments beginning with `#` are ignored. This option may be repeated multiple times. Empty file names will reset the list of ignored revisions. This option will be handled before the command line option `--ignore-revs-file`",
-  },
-  {
-    name: "blame.markIgnoredLines",
-    description:
-      "Mark lines that were changed by an ignored revision that we attributed to another commit with a '?' in the output of git-blame[1]",
-  },
-  {
-    name: "blame.markUnblamableLines",
-    description:
-      "Mark lines that were changed by an ignored revision that we could not attribute to another commit with a '*' in the output of git-blame[1]",
-  },
-  {
-    name: "blame.showEmail",
-    description:
-      "Show the author email instead of author name in git-blame[1]. This option defaults to false",
-  },
-  {
-    name: "blame.showRoot",
-    description:
-      "Do not treat root commits as boundaries in git-blame[1]. This option defaults to false",
-  },
-  {
-    name: "branch.<name>.description",
-    insertValue: "branch.{cursor}.description",
-    description:
-      "Branch description, can be edited with `git branch --edit-description`. Branch description is automatically added in the format-patch cover letter or request-pull summary",
-  },
-  {
-    name: "branch.<name>.merge",
-    insertValue: "branch.{cursor}.merge",
-    description:
-      "Defines, together with branch.<name>.remote, the upstream branch for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which branch to merge and can also affect 'git push' (see push.default). When in branch <name>, it tells 'git fetch' the default refspec to be marked for merging in FETCH_HEAD. The value is handled like the remote part of a refspec, and must match a ref which is fetched from the remote given by \"branch.<name>.remote\". The merge information is used by 'git pull' (which at first calls 'git fetch') to lookup the default branch for merging. Without this option, 'git pull' defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. If you wish to setup 'git pull' so that it merges into <name> from another branch in the local repository, you can point branch.<name>.merge to the desired branch, and use the relative path setting `.` (a period) for branch.<name>.remote",
-  },
-  {
-    name: "branch.<name>.mergeOptions",
-    insertValue: "branch.{cursor}.mergeOptions",
-    description:
-      "Sets default options for merging into branch <name>. The syntax and supported options are the same as those of git-merge[1], but option values containing whitespace characters are currently not supported",
-  },
-  {
-    name: "branch.<name>.pushRemote",
-    insertValue: "branch.{cursor}.pushRemote",
-    description:
-      "When on branch <name>, it overrides `branch.<name>.remote` for pushing. It also overrides `remote.pushDefault` for pushing from branch <name>. When you pull from one place (e.g. your upstream) and push to another place (e.g. your own publishing repository), you would want to set `remote.pushDefault` to specify the remote to push to for all branches, and use this option to override it for a specific branch",
-  },
-  {
-    name: "branch.<name>.rebase",
-    insertValue: "branch.{cursor}.rebase",
-    description:
-      'When true, rebase the branch <name> on top of the fetched branch, instead of merging the default branch from the default remote when "git pull" is run. See "pull.rebase" for doing this in a non branch-specific manner',
-  },
-  {
-    name: "branch.<name>.remote",
-    insertValue: "branch.{cursor}.remote",
-    description:
-      "When on branch <name>, it tells 'git fetch' and 'git push' which remote to fetch from/push to. The remote to push to may be overridden with `remote.pushDefault` (for all branches). The remote to push to, for the current branch, may be further overridden by `branch.<name>.pushRemote`. If no remote is configured, or if you are not on any branch and there is more than one remote defined in the repository, it defaults to `origin` for fetching and `remote.pushDefault` for pushing. Additionally, `.` (a period) is the current local repository (a dot-repository), see `branch.<name>.merge`'s final note below",
-  },
-  {
-    name: "branch.autoSetupMerge",
-    description:
-      "Tells 'git branch', 'git switch' and 'git checkout' to set up new branches so that git-pull[1] will appropriately merge from the starting point branch. Note that even if this option is not set, this behavior can be chosen per-branch using the `--track` and `--no-track` options. The valid settings are: `false` -- no automatic setup is done; `true` -- automatic setup is done when the starting point is a remote-tracking branch; `always` -- automatic setup is done when the starting point is either a local branch or remote-tracking branch; `inherit` -- if the starting point has a tracking configuration, it is copied to the new branch; `simple` -- automatic setup is done only when the starting point is a remote-tracking branch and the new branch has the same name as the remote branch. This option defaults to true",
-  },
-  {
-    name: "branch.autoSetupRebase",
-    description:
-      "When a new branch is created with 'git branch', 'git switch' or 'git checkout' that tracks another branch, this variable tells Git to set up pull to rebase instead of merge (see \"branch.<name>.rebase\"). When `never`, rebase is never automatically set to true. When `local`, rebase is set to true for tracked branches of other local branches. When `remote`, rebase is set to true for tracked branches of remote-tracking branches. When `always`, rebase will be set to true for all tracking branches. See \"branch.autoSetupMerge\" for details on how to set up a branch to track another branch. This option defaults to never",
-  },
-  {
-    name: "branch.sort",
-    description:
-      'This variable controls the sort ordering of branches when displayed by git-branch[1]. Without the "--sort=<value>" option provided, the value of this variable will be used as the default. See git-for-each-ref[1] field names for valid values',
-  },
-  {
-    name: "browser.<tool>.cmd",
-    insertValue: "browser.{cursor}.cmd",
-    description:
-      "Specify the command to invoke the specified browser. The specified command is evaluated in shell with the URLs passed as arguments. (See git-web{litdd}browse[1].)",
-  },
-  {
-    name: "browser.<tool>.path",
-    insertValue: "browser.{cursor}.path",
-    description:
-      "Override the path for the given tool that may be used to browse HTML help (see `-w` option in git-help[1]) or a working repository in gitweb (see git-instaweb[1])",
-  },
-  {
-    name: "checkout.defaultRemote",
-    description:
-      "When you run `git checkout <something>` or `git switch <something>` and only have one remote, it may implicitly fall back on checking out and tracking e.g. `origin/<something>`. This stops working as soon as you have more than one remote with a `<something>` reference. This setting allows for setting the name of a preferred remote that should always win when it comes to disambiguation. The typical use-case is to set this to `origin`",
-  },
-  {
-    name: "checkout.guess",
-    description:
-      "Provides the default value for the `--guess` or `--no-guess` option in `git checkout` and `git switch`. See git-switch[1] and git-checkout[1]",
-  },
-  {
-    name: "checkout.thresholdForParallelism",
-    description:
-      "When running parallel checkout with a small number of files, the cost of subprocess spawning and inter-process communication might outweigh the parallelization gains. This setting allows to define the minimum number of files for which parallel checkout should be attempted. The default is 100",
-  },
-  {
-    name: "checkout.workers",
-    description:
-      "The number of parallel workers to use when updating the working tree. The default is one, i.e. sequential execution. If set to a value less than one, Git will use as many workers as the number of logical cores available. This setting and `checkout.thresholdForParallelism` affect all commands that perform checkout. E.g. checkout, clone, reset, sparse-checkout, etc",
-  },
-  {
-    name: "clean.requireForce",
-    description:
-      "A boolean to make git-clean do nothing unless given -f, -i or -n. Defaults to true",
-  },
-  {
-    name: "clone.defaultRemoteName",
-    description:
-      "The name of the remote to create when cloning a repository. Defaults to `origin`, and can be overridden by passing the `--origin` command-line option to git-clone[1]",
-  },
-  {
-    name: "clone.filterSubmodules",
-    description:
-      "If a partial clone filter is provided (see `--filter` in git-rev-list[1]) and `--recurse-submodules` is used, also apply the filter to submodules",
-  },
-  {
-    name: "clone.rejectShallow",
-    description:
-      "Reject to clone a repository if it is a shallow one, can be overridden by passing option `--reject-shallow` in command line. See git-clone[1]",
-  },
-  {
-    name: "color.advice",
-    description:
-      "A boolean to enable/disable color in hints (e.g. when a push failed, see `advice.*` for a list). May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the error output goes to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
-  },
-  {
-    name: "color.advice.hint",
-    description: "Use customized color for hints",
-  },
-  {
-    name: "color.blame.highlightRecent",
-    description:
-      "Specify the line annotation color for `git blame --color-by-age` depending upon the age of the line",
-  },
-  {
-    name: "color.blame.repeatedLines",
-    description:
-      "Use the specified color to colorize line annotations for `git blame --color-lines`, if they come from the same commit as the preceding line. Defaults to cyan",
-  },
-  {
-    name: "color.branch",
-    description:
-      "A boolean to enable/disable color in the output of git-branch[1]. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the output is to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
-  },
-  {
-    name: "color.branch.<slot>",
-    insertValue: "color.branch.{cursor}",
-    description:
-      "Use customized color for branch coloration. `<slot>` is one of `current` (the current branch), `local` (a local branch), `remote` (a remote-tracking branch in refs/remotes/), `upstream` (upstream tracking branch), `plain` (other refs)",
-  },
-  {
-    name: "color.decorate.<slot>",
-    insertValue: "color.decorate.{cursor}",
-    description:
-      "Use customized color for 'git log --decorate' output. `<slot>` is one of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local branches, remote-tracking branches, tags, stash and HEAD, respectively and `grafted` for grafted commits",
-  },
-  {
-    name: "color.diff",
-    description:
-      "Whether to use ANSI escape sequences to add color to patches. If this is set to `always`, git-diff[1], git-log[1], and git-show[1] will use color for all patches. If it is set to `true` or `auto`, those commands will only use color when output is to the terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
-  },
-  {
-    name: "color.diff.<slot>",
-    insertValue: "color.diff.{cursor}",
-    description:
-      "Use customized color for diff colorization. `<slot>` specifies which part of the patch to use the specified color, and is one of `context` (context text - `plain` is a historical synonym), `meta` (metainformation), `frag` (hunk header), 'func' (function in hunk header), `old` (removed lines), `new` (added lines), `commit` (commit headers), `whitespace` (highlighting whitespace errors), `oldMoved` (deleted lines), `newMoved` (added lines), `oldMovedDimmed`, `oldMovedAlternative`, `oldMovedAlternativeDimmed`, `newMovedDimmed`, `newMovedAlternative` `newMovedAlternativeDimmed` (See the '<mode>' setting of '--color-moved' in git-diff[1] for details), `contextDimmed`, `oldDimmed`, `newDimmed`, `contextBold`, `oldBold`, and `newBold` (see git-range-diff[1] for details)",
-  },
-  {
-    name: "color.grep",
-    description:
-      "When set to `always`, always highlight matches. When `false` (or `never`), never. When set to `true` or `auto`, use color only when the output is written to the terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
-  },
-  {
-    name: "color.grep.<slot>",
-    insertValue: "color.grep.{cursor}",
-    description:
-      "Use customized color for grep colorization. `<slot>` specifies which part of the line to use the specified color, and is one of",
-  },
-  {
-    name: "color.interactive",
-    description:
-      'When set to `always`, always use colors for interactive prompts and displays (such as those used by "git-add --interactive" and "git-clean --interactive"). When false (or `never`), never. When set to `true` or `auto`, use colors only when the output is to the terminal. If unset, then the value of `color.ui` is used (`auto` by default)',
-  },
-  {
-    name: "color.interactive.<slot>",
-    insertValue: "color.interactive.{cursor}",
-    description:
-      "Use customized color for 'git add --interactive' and 'git clean --interactive' output. `<slot>` may be `prompt`, `header`, `help` or `error`, for four distinct types of normal output from interactive commands",
-  },
-  {
-    name: "color.pager",
-    description:
-      "A boolean to specify whether `auto` color modes should colorize output going to the pager. Defaults to true; set this to false if your pager does not understand ANSI color codes",
-  },
-  {
-    name: "color.push",
-    description:
-      "A boolean to enable/disable color in push errors. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the error output goes to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
-  },
-  {
-    name: "color.push.error",
-    description: "Use customized color for push errors",
-  },
-  {
-    name: "color.remote",
-    description:
-      'If set, keywords at the start of the line are highlighted. The keywords are "error", "warning", "hint" and "success", and are matched case-insensitively. May be set to `always`, `false` (or `never`) or `auto` (or `true`). If unset, then the value of `color.ui` is used (`auto` by default)',
-  },
-  {
-    name: "color.remote.<slot>",
-    insertValue: "color.remote.{cursor}",
-    description:
-      "Use customized color for each remote keyword. `<slot>` may be `hint`, `warning`, `success` or `error` which match the corresponding keyword",
-  },
-  {
-    name: "color.showBranch",
-    description:
-      "A boolean to enable/disable color in the output of git-show-branch[1]. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the output is to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
-  },
-  {
-    name: "color.status",
-    description:
-      "A boolean to enable/disable color in the output of git-status[1]. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the output is to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
-  },
-  {
-    name: "color.status.<slot>",
-    insertValue: "color.status.{cursor}",
-    description:
-      "Use customized color for status colorization. `<slot>` is one of `header` (the header text of the status message), `added` or `updated` (files which are added but not committed), `changed` (files which are changed but not added in the index), `untracked` (files which are not tracked by Git), `branch` (the current branch), `nobranch` (the color the 'no branch' warning is shown in, defaulting to red), `localBranch` or `remoteBranch` (the local and remote branch names, respectively, when branch and tracking information is displayed in the status short-format), or `unmerged` (files which have unmerged changes)",
-  },
-  {
-    name: "color.transport",
-    description:
-      "A boolean to enable/disable color when pushes are rejected. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the error output goes to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
-  },
-  {
-    name: "color.transport.rejected",
-    description: "Use customized color when a push was rejected",
-  },
-  {
-    name: "color.ui",
-    description:
-      "This variable determines the default value for variables such as `color.diff` and `color.grep` that control the use of color per command family. Its scope will expand as more commands learn configuration to set a default for the `--color` option. Set it to `false` or `never` if you prefer Git commands not to use color unless enabled explicitly with some other configuration or the `--color` option. Set it to `always` if you want all output not intended for machine consumption to use color, to `true` or `auto` (this is the default since Git 1.8.4) if you want such output to use color when written to the terminal",
-  },
-  {
-    name: "column.branch",
-    description:
-      "Specify whether to output branch listing in `git branch` in columns. See `column.ui` for details",
-  },
-  {
-    name: "column.clean",
-    description:
-      "Specify the layout when list items in `git clean -i`, which always shows files and directories in columns. See `column.ui` for details",
-  },
-  {
-    name: "column.status",
-    description:
-      "Specify whether to output untracked files in `git status` in columns. See `column.ui` for details",
-  },
-  {
-    name: "column.tag",
-    description:
-      "Specify whether to output tag listing in `git tag` in columns. See `column.ui` for details",
-  },
-  {
-    name: "column.ui",
-    description:
-      "Specify whether supported commands should output in columns. This variable consists of a list of tokens separated by spaces or commas:",
-  },
-  {
-    name: "commit.cleanup",
-    description:
-      "This setting overrides the default of the `--cleanup` option in `git commit`. See git-commit[1] for details. Changing the default can be useful when you always want to keep lines that begin with comment character `#` in your log message, in which case you would do `git config commit.cleanup whitespace` (note that you will have to remove the help lines that begin with `#` in the commit log template yourself, if you do this)",
-  },
-  {
-    name: "commit.status",
-    description:
-      "A boolean to enable/disable inclusion of status information in the commit message template when using an editor to prepare the commit message. Defaults to true",
-  },
-  {
-    name: "commit.template",
-    description:
-      "Specify the pathname of a file to use as the template for new commit messages",
-  },
-  {
-    name: "commit.verbose",
-    description:
-      "A boolean or int to specify the level of verbose with `git commit`. See git-commit[1]",
-  },
-  {
-    name: "commitGraph.generationVersion",
-    description:
-      "Specifies the type of generation number version to use when writing or reading the commit-graph file. If version 1 is specified, then the corrected commit dates will not be written or read. Defaults to 2",
-  },
-  {
-    name: "commitGraph.maxNewFilters",
-    description:
-      "Specifies the default value for the `--max-new-filters` option of `git commit-graph write` (c.f., git-commit-graph[1])",
-  },
-  {
-    name: "commitGraph.readChangedPaths",
-    description:
-      "If true, then git will use the changed-path Bloom filters in the commit-graph file (if it exists, and they are present). Defaults to true. See git-commit-graph[1] for more information",
-  },
-  {
-    name: "committer.email",
-    description:
-      "The `user.name` and `user.email` variables determine what ends up in the `author` and `committer` field of commit objects. If you need the `author` or `committer` to be different, the `author.name`, `author.email`, `committer.name` or `committer.email` variables can be set. Also, all of these can be overridden by the `GIT_AUTHOR_NAME`, `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_NAME`, `GIT_COMMITTER_EMAIL` and `EMAIL` environment variables",
-  },
-  {
-    name: "completion.commands",
-    description:
-      "This is only used by git-completion.bash to add or remove commands from the list of completed commands. Normally only porcelain commands and a few select others are completed. You can add more commands, separated by space, in this variable. Prefixing the command with '-' will remove it from the existing list",
-  },
-  {
-    name: "core.abbrev",
-    description:
-      'Set the length object names are abbreviated to. If unspecified or set to "auto", an appropriate value is computed based on the approximate number of packed objects in your repository, which hopefully is enough for abbreviated object names to stay unique for some time. If set to "no", no abbreviation is made and the object names are shown in their full length. The minimum length is 4',
-  },
-  {
-    name: "core.alternateRefsCommand",
-    description:
-      "When advertising tips of available history from an alternate, use the shell to execute the specified command instead of git-for-each-ref[1]. The first argument is the absolute path of the alternate. Output must contain one hex object id per line (i.e., the same as produced by `git for-each-ref --format='%(objectname)'`)",
-  },
-  {
-    name: "core.alternateRefsPrefixes",
-    description:
-      "When listing references from an alternate, list only references that begin with the given prefix. Prefixes match as if they were given as arguments to git-for-each-ref[1]. To list multiple prefixes, separate them with whitespace. If `core.alternateRefsCommand` is set, setting `core.alternateRefsPrefixes` has no effect",
-  },
-  {
-    name: "core.askPass",
-    description:
-      "Some commands (e.g. svn and http interfaces) that interactively ask for a password can be told to use an external program given via the value of this variable. Can be overridden by the `GIT_ASKPASS` environment variable. If not set, fall back to the value of the `SSH_ASKPASS` environment variable or, failing that, a simple password prompt. The external program shall be given a suitable prompt as command-line argument and write the password on its STDOUT",
-  },
-  {
-    name: "core.attributesFile",
-    description:
-      "In addition to `.gitattributes` (per-directory) and `.git/info/attributes`, Git looks into this file for attributes (see gitattributes[5]). Path expansions are made the same way as for `core.excludesFile`. Its default value is `$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either not set or empty, `$HOME/.config/git/attributes` is used instead",
-  },
-  {
-    name: "core.autocrlf",
-    description:
-      'Setting this variable to "true" is the same as setting the `text` attribute to "auto" on all files and core.eol to "crlf". Set to true if you want to have `CRLF` line endings in your working directory and the repository has LF line endings. This variable can be set to \'input\', in which case no output conversion is performed',
-  },
-  {
-    name: "core.bare",
-    description:
-      "If true this repository is assumed to be 'bare' and has no working directory associated with it. If this is the case a number of commands that require a working directory will be disabled, such as git-add[1] or git-merge[1]",
-  },
-  {
-    name: "core.bigFileThreshold",
-    description:
-      "The size of files considered \"big\", which as discussed below changes the behavior of numerous git commands, as well as how such files are stored within the repository. The default is 512 MiB. Common unit suffixes of 'k', 'm', or 'g' are supported",
-  },
-  {
-    name: "core.checkRoundtripEncoding",
-    description:
-      "A comma and/or whitespace separated list of encodings that Git performs UTF-8 round trip checks on if they are used in an `working-tree-encoding` attribute (see gitattributes[5]). The default value is `SHIFT-JIS`",
-  },
-  {
-    name: "core.checkStat",
-    description:
-      "When missing or is set to `default`, many fields in the stat structure are checked to detect if a file has been modified since Git looked at it. When this configuration variable is set to `minimal`, sub-second part of mtime and ctime, the uid and gid of the owner of the file, the inode number (and the device number, if Git was compiled to use it), are excluded from the check among these fields, leaving only the whole-second part of mtime (and ctime, if `core.trustCtime` is set) and the filesize to be checked",
-  },
-  {
-    name: "core.commentChar",
-    description:
-      "Commands such as `commit` and `tag` that let you edit messages consider a line that begins with this character commented, and removes them after the editor returns (default '#')",
-  },
-  {
-    name: "core.commitGraph",
-    description:
-      "If true, then git will read the commit-graph file (if it exists) to parse the graph structure of commits. Defaults to true. See git-commit-graph[1] for more information",
-  },
-  {
-    name: "core.compression",
-    description:
-      "An integer -1..9, indicating a default compression level. -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If set, this provides a default to other compression variables, such as `core.looseCompression` and `pack.compression`",
-  },
-  {
-    name: "core.createObject",
-    description:
-      "You can set this to 'link', in which case a hardlink followed by a delete of the source are used to make sure that object creation will not overwrite existing objects",
-  },
-  {
-    name: "core.deltaBaseCacheLimit",
-    description:
-      "Maximum number of bytes per thread to reserve for caching base objects that may be referenced by multiple deltified objects. By storing the entire decompressed base objects in a cache Git is able to avoid unpacking and decompressing frequently used base objects multiple times",
-  },
-  {
-    name: "core.editor",
-    description:
-      "Commands such as `commit` and `tag` that let you edit messages by launching an editor use the value of this variable when it is set, and the environment variable `GIT_EDITOR` is not set. See git-var[1]",
-  },
-  {
-    name: "core.eol",
-    description:
-      "Sets the line ending type to use in the working directory for files that are marked as text (either by having the `text` attribute set, or by having `text=auto` and Git auto-detecting the contents as text). Alternatives are 'lf', 'crlf' and 'native', which uses the platform's native line ending. The default value is `native`. See gitattributes[5] for more information on end-of-line conversion. Note that this value is ignored if `core.autocrlf` is set to `true` or `input`",
-  },
-  {
-    name: "core.excludesFile",
-    description:
-      "Specifies the pathname to the file that contains patterns to describe paths that are not meant to be tracked, in addition to `.gitignore` (per-directory) and `.git/info/exclude`. Defaults to `$XDG_CONFIG_HOME/git/ignore`. If `$XDG_CONFIG_HOME` is either not set or empty, `$HOME/.config/git/ignore` is used instead. See gitignore[5]",
-  },
-  {
-    name: "core.fileMode",
-    description:
-      "Tells Git if the executable bit of files in the working tree is to be honored",
-  },
-  {
-    name: "core.filesRefLockTimeout",
-    description:
-      "The length of time, in milliseconds, to retry when trying to lock an individual reference. Value 0 means not to retry at all; -1 means to try indefinitely. Default is 100 (i.e., retry for 100ms)",
-  },
-  {
-    name: "core.fsmonitor",
-    description:
-      "If set to true, enable the built-in file system monitor daemon for this working directory (git-fsmonitor{litdd}daemon[1])",
-  },
-  {
-    name: "core.fsmonitorHookVersion",
-    description:
-      'Sets the protocol version to be used when invoking the "fsmonitor" hook',
-  },
-  {
-    name: "core.fsync",
-    description:
-      "A comma-separated list of components of the repository that should be hardened via the core.fsyncMethod when created or modified. You can disable hardening of any component by prefixing it with a '-'. Items that are not hardened may be lost in the event of an unclean system shutdown. Unless you have special requirements, it is recommended that you leave this option empty or pick one of `committed`, `added`, or `all`",
-  },
-  {
-    name: "core.fsyncMethod",
-    description:
-      "A value indicating the strategy Git will use to harden repository data using fsync and related primitives",
-  },
-  {
-    name: "core.fsyncObjectFiles",
-    description:
-      "This boolean will enable 'fsync()' when writing object files. This setting is deprecated. Use core.fsync instead",
-  },
-  {
-    name: "core.gitProxy",
-    description:
-      'A "proxy command" to execute (as \'command host port\') instead of establishing direct connection to the remote server when using the Git protocol for fetching. If the variable value is in the "COMMAND for DOMAIN" format, the command is applied only on hostnames ending with the specified domain string. This variable may be set multiple times and is matched in the given order; the first match wins',
-  },
-  {
-    name: "core.hideDotFiles",
-    description:
-      "(Windows-only) If true, mark newly-created directories and files whose name starts with a dot as hidden. If 'dotGitOnly', only the `.git/` directory is hidden, but no other files starting with a dot. The default mode is 'dotGitOnly'",
-  },
-  {
-    name: "core.hooksPath",
-    description:
-      "By default Git will look for your hooks in the `$GIT_DIR/hooks` directory. Set this to different path, e.g. `/etc/git/hooks`, and Git will try to find your hooks in that directory, e.g. `/etc/git/hooks/pre-receive` instead of in `$GIT_DIR/hooks/pre-receive`",
-  },
-  {
-    name: "core.ignoreCase",
-    description:
-      'Internal variable which enables various workarounds to enable Git to work better on filesystems that are not case sensitive, like APFS, HFS+, FAT, NTFS, etc. For example, if a directory listing finds "makefile" when Git expects "Makefile", Git will assume it is really the same file, and continue to remember it as "Makefile"',
-  },
-  {
-    name: "core.ignoreStat",
-    description:
-      'If true, Git will avoid using lstat() calls to detect if files have changed by setting the "assume-unchanged" bit for those tracked files which it has updated identically in both the index and working tree',
-  },
-  {
-    name: "core.logAllRefUpdates",
-    description:
-      'Enable the reflog. Updates to a ref <ref> is logged to the file "`$GIT_DIR/logs/<ref>`", by appending the new and old SHA-1, the date/time and the reason of the update, but only when the file exists. If this configuration variable is set to `true`, missing "`$GIT_DIR/logs/<ref>`" file is automatically created for branch heads (i.e. under `refs/heads/`), remote refs (i.e. under `refs/remotes/`), note refs (i.e. under `refs/notes/`), and the symbolic ref `HEAD`. If it is set to `always`, then a missing reflog is automatically created for any ref under `refs/`',
-  },
-  {
-    name: "core.looseCompression",
-    description:
-      "An integer -1..9, indicating the compression level for objects that are not in a pack file. -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If not set, defaults to core.compression. If that is not set, defaults to 1 (best speed)",
-  },
-  {
-    name: "core.multiPackIndex",
-    description:
-      "Use the multi-pack-index file to track multiple packfiles using a single index. See git-multi-pack-index[1] for more information. Defaults to true",
-  },
-  {
-    name: "core.notesRef",
-    description:
-      "When showing commit messages, also show notes which are stored in the given ref. The ref must be fully qualified. If the given ref does not exist, it is not an error but means that no notes should be printed",
-  },
-  {
-    name: "core.packedGitLimit",
-    description:
-      "Maximum number of bytes to map simultaneously into memory from pack files. If Git needs to access more than this many bytes at once to complete an operation it will unmap existing regions to reclaim virtual address space within the process",
-  },
-  {
-    name: "core.packedGitWindowSize",
-    description:
-      "Number of bytes of a pack file to map into memory in a single mapping operation. Larger window sizes may allow your system to process a smaller number of large pack files more quickly. Smaller window sizes will negatively affect performance due to increased calls to the operating system's memory manager, but may improve performance when accessing a large number of large pack files",
-  },
-  {
-    name: "core.packedRefsTimeout",
-    description:
-      "The length of time, in milliseconds, to retry when trying to lock the `packed-refs` file. Value 0 means not to retry at all; -1 means to try indefinitely. Default is 1000 (i.e., retry for 1 second)",
-  },
-  {
-    name: "core.pager",
-    description:
-      "Text viewer for use by Git commands (e.g., 'less'). The value is meant to be interpreted by the shell. The order of preference is the `$GIT_PAGER` environment variable, then `core.pager` configuration, then `$PAGER`, and then the default chosen at compile time (usually 'less')",
-  },
-  {
-    name: "core.precomposeUnicode",
-    description:
-      "This option is only used by Mac OS implementation of Git. When core.precomposeUnicode=true, Git reverts the unicode decomposition of filenames done by Mac OS. This is useful when sharing a repository between Mac OS and Linux or Windows. (Git for Windows 1.7.10 or higher is needed, or Git under cygwin 1.7). When false, file names are handled fully transparent by Git, which is backward compatible with older versions of Git",
-  },
-  {
-    name: "core.preferSymlinkRefs",
-    description:
-      'Instead of the default "symref" format for HEAD and other symbolic reference files, use symbolic links. This is sometimes needed to work with old scripts that expect HEAD to be a symbolic link',
-  },
-  {
-    name: "core.preloadIndex",
-    description: "Enable parallel index preload for operations like 'git diff'",
-  },
-  {
-    name: "core.protectHFS",
-    description:
-      "If set to true, do not allow checkout of paths that would be considered equivalent to `.git` on an HFS+ filesystem. Defaults to `true` on Mac OS, and `false` elsewhere",
-  },
-  {
-    name: "core.protectNTFS",
-    description:
-      'If set to true, do not allow checkout of paths that would cause problems with the NTFS filesystem, e.g. conflict with 8.3 "short" names. Defaults to `true` on Windows, and `false` elsewhere',
-  },
-  {
-    name: "core.quotePath",
-    description:
-      'Commands that output paths (e.g. \'ls-files\', \'diff\'), will quote "unusual" characters in the pathname by enclosing the pathname in double-quotes and escaping those characters with backslashes in the same way C escapes control characters (e.g. `\\t` for TAB, `\\n` for LF, `\\\\` for backslash) or bytes with values larger than 0x80 (e.g. octal `\\302\\265` for "micro" in UTF-8). If this variable is set to false, bytes higher than 0x80 are not considered "unusual" any more. Double-quotes, backslash and control characters are always escaped regardless of the setting of this variable. A simple space character is not considered "unusual". Many commands can output pathnames completely verbatim using the `-z` option. The default value is true',
-  },
-  {
-    name: "core.repositoryFormatVersion",
-    description:
-      "Internal variable identifying the repository format and layout version",
-  },
-  {
-    name: "core.restrictinheritedhandles",
-    description:
-      "Windows-only: override whether spawned processes inherit only standard file handles (`stdin`, `stdout` and `stderr`) or all handles. Can be `auto`, `true` or `false`. Defaults to `auto`, which means `true` on Windows 7 and later, and `false` on older Windows versions",
-  },
-  {
-    name: "core.safecrlf",
-    description:
-      'If true, makes Git check if converting `CRLF` is reversible when end-of-line conversion is active. Git will verify if a command modifies a file in the work tree either directly or indirectly. For example, committing a file followed by checking out the same file should yield the original file in the work tree. If this is not the case for the current setting of `core.autocrlf`, Git will reject the file. The variable can be set to "warn", in which case Git will only warn about an irreversible conversion but continue the operation',
-  },
-  {
-    name: "core.sharedRepository",
-    description:
-      "When 'group' (or 'true'), the repository is made shareable between several users in a group (making sure all the files and objects are group-writable). When 'all' (or 'world' or 'everybody'), the repository will be readable by all users, additionally to being group-shareable. When 'umask' (or 'false'), Git will use permissions reported by umask(2). When '0xxx', where '0xxx' is an octal number, files in the repository will have this mode value. '0xxx' will override user's umask value (whereas the other options will only override requested parts of the user's umask value). Examples: '0660' will make the repo read/write-able for the owner and group, but inaccessible to others (equivalent to 'group' unless umask is e.g. '0022'). '0640' is a repository that is group-readable but not group-writable. See git-init[1]. False by default",
-  },
-  {
-    name: "core.sparseCheckout",
-    description:
-      'Enable "sparse checkout" feature. See git-sparse-checkout[1] for more information',
-  },
-  {
-    name: "core.sparseCheckoutCone",
-    description:
-      'Enables the "cone mode" of the sparse checkout feature. When the sparse-checkout file contains a limited set of patterns, this mode provides significant performance advantages. The "non-cone mode" can be requested to allow specifying more flexible patterns by setting this variable to \'false\'. See git-sparse-checkout[1] for more information',
-  },
-  {
-    name: "core.splitIndex",
-    description:
-      "If true, the split-index feature of the index will be used. See git-update-index[1]. False by default",
-  },
-  {
-    name: "core.sshCommand",
-    description:
-      "If this variable is set, `git fetch` and `git push` will use the specified command instead of `ssh` when they need to connect to a remote system. The command is in the same form as the `GIT_SSH_COMMAND` environment variable and is overridden when the environment variable is set",
-  },
-  {
-    name: "core.symlinks",
-    description:
-      "If false, symbolic links are checked out as small plain files that contain the link text. git-update-index[1] and git-add[1] will not change the recorded type to regular file. Useful on filesystems like FAT that do not support symbolic links",
-  },
-  {
-    name: "core.trustctime",
-    description:
-      "If false, the ctime differences between the index and the working tree are ignored; useful when the inode change time is regularly modified by something outside Git (file system crawlers and some backup systems). See git-update-index[1]. True by default",
-  },
-  {
-    name: "core.unsetenvvars",
-    description:
-      "Windows-only: comma-separated list of environment variables' names that need to be unset before spawning any other process. Defaults to `PERL5LIB` to account for the fact that Git for Windows insists on using its own Perl interpreter",
-  },
-  {
-    name: "core.untrackedCache",
-    description:
-      "Determines what to do about the untracked cache feature of the index. It will be kept, if this variable is unset or set to `keep`. It will automatically be added if set to `true`. And it will automatically be removed, if set to `false`. Before setting it to `true`, you should check that mtime is working properly on your system. See git-update-index[1]. `keep` by default, unless `feature.manyFiles` is enabled which sets this setting to `true` by default",
-  },
-  {
-    name: "core.useReplaceRefs",
-    description:
-      "If set to `false`, behave as if the `--no-replace-objects` option was given on the command line. See git[1] and git-replace[1] for more information",
-  },
-  {
-    name: "core.warnAmbiguousRefs",
-    description:
-      "If true, Git will warn you if the ref name you passed it is ambiguous and might match multiple refs in the repository. True by default",
-  },
-  {
-    name: "core.whitespace",
-    description:
-      "A comma separated list of common whitespace problems to notice. 'git diff' will use `color.diff.whitespace` to highlight them, and 'git apply --whitespace=error' will consider them as errors. You can prefix `-` to disable any of them (e.g. `-trailing-space`):",
-  },
-  {
-    name: "core.worktree",
-    description:
-      "Set the path to the root of the working tree. If `GIT_COMMON_DIR` environment variable is set, core.worktree is ignored and not used for determining the root of working tree. This can be overridden by the `GIT_WORK_TREE` environment variable and the `--work-tree` command-line option. The value can be an absolute path or relative to the path to the .git directory, which is either specified by --git-dir or GIT_DIR, or automatically discovered. If --git-dir or GIT_DIR is specified but none of --work-tree, GIT_WORK_TREE and core.worktree is specified, the current working directory is regarded as the top level of your working tree",
-  },
-  {
-    name: "credential.helper",
-    description:
-      "Specify an external helper to be called when a username or password credential is needed; the helper may consult external storage to avoid prompting the user for the credentials. This is normally the name of a credential helper with possible arguments, but may also be an absolute path with arguments or, if preceded by `!`, shell commands",
-  },
-  {
-    name: "credential.useHttpPath",
-    description:
-      'When acquiring credentials, consider the "path" component of an http or https URL to be important. Defaults to false. See gitcredentials[7] for more information',
-  },
-  {
-    name: "credential.username",
-    description:
-      "If no username is set for a network authentication, use this username by default. See credential.<context>.* below, and gitcredentials[7]",
-  },
-  {
-    name: "credentialCache.ignoreSIGHUP",
-    description:
-      "Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting",
-  },
-  {
-    name: "credentialStore.lockTimeoutMS",
-    description:
-      "The length of time, in milliseconds, for git-credential-store to retry when trying to lock the credentials file. Value 0 means not to retry at all; -1 means to try indefinitely. Default is 1000 (i.e., retry for 1s)",
-  },
-  {
-    name: "credential.<url>.helper",
-    insertValue: "credential.{cursor}.helper",
-    description:
-      "Specify an external helper to be called when a username or password credential is needed; the helper may consult external storage to avoid prompting the user for the credentials. This is normally the name of a credential helper with possible arguments, but may also be an absolute path with arguments or, if preceded by `!`, shell commands",
-  },
-  {
-    name: "credential.<url>.useHttpPath",
-    insertValue: "credential.{cursor}.useHttpPath",
-    description:
-      'When acquiring credentials, consider the "path" component of an http or https URL to be important. Defaults to false. See gitcredentials[7] for more information',
-  },
-  {
-    name: "credential.<url>.username",
-    insertValue: "credential.{cursor}.username",
-    description:
-      "If no username is set for a network authentication, use this username by default. See credential.<context>.* below, and gitcredentials[7]",
-  },
-  {
-    name: "credentialCache.<url>.ignoreSIGHUP",
-    insertValue: "credentialCache.{cursor}.ignoreSIGHUP",
-    description:
-      "Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting",
-  },
-  {
-    name: "credentialStore.<url>.lockTimeoutMS",
-    insertValue: "credentialStore.{cursor}.lockTimeoutMS",
-    description:
-      "The length of time, in milliseconds, for git-credential-store to retry when trying to lock the credentials file. Value 0 means not to retry at all; -1 means to try indefinitely. Default is 1000 (i.e., retry for 1s)",
-  },
-  {
-    name: "diff.<driver>.binary",
-    insertValue: "diff.{cursor}.binary",
-    description:
-      "Set this option to true to make the diff driver treat files as binary. See gitattributes[5] for details",
-  },
-  {
-    name: "diff.<driver>.cachetextconv",
-    insertValue: "diff.{cursor}.cachetextconv",
-    description:
-      "Set this option to true to make the diff driver cache the text conversion outputs. See gitattributes[5] for details",
-  },
-  {
-    name: "diff.<driver>.command",
-    insertValue: "diff.{cursor}.command",
-    description:
-      "The custom diff driver command. See gitattributes[5] for details",
-  },
-  {
-    name: "diff.<driver>.textconv",
-    insertValue: "diff.{cursor}.textconv",
-    description:
-      "The command that the diff driver should call to generate the text-converted version of a file. The result of the conversion is used to generate a human-readable diff. See gitattributes[5] for details",
-  },
-  {
-    name: "diff.<driver>.wordRegex",
-    insertValue: "diff.{cursor}.wordRegex",
-    description:
-      "The regular expression that the diff driver should use to split words in a line. See gitattributes[5] for details",
-  },
-  {
-    name: "diff.<driver>.xfuncname",
-    insertValue: "diff.{cursor}.xfuncname",
-    description:
-      "The regular expression that the diff driver should use to recognize the hunk header. A built-in pattern may also be used. See gitattributes[5] for details",
-  },
-  {
-    name: "diff.algorithm",
-    description: "Choose a diff algorithm",
-  },
-  {
-    name: "diff.autoRefreshIndex",
-    description:
-      "When using 'git diff' to compare with work tree files, do not consider stat-only change as changed. Instead, silently run `git update-index --refresh` to update the cached stat information for paths whose contents in the work tree match the contents in the index. This option defaults to true. Note that this affects only 'git diff' Porcelain, and not lower level 'diff' commands such as 'git diff-files'",
-  },
-  {
-    name: "diff.colorMoved",
-    description:
-      "If set to either a valid `<mode>` or a true value, moved lines in a diff are colored differently, for details of valid modes see '--color-moved' in git-diff[1]. If simply set to true the default color mode will be used. When set to false, moved lines are not colored",
-  },
-  {
-    name: "diff.colorMovedWS",
-    description:
-      "When moved lines are colored using e.g. the `diff.colorMoved` setting, this option controls the `<mode>` how spaces are treated for details of valid modes see '--color-moved-ws' in git-diff[1]",
-  },
-  {
-    name: "diff.context",
-    description:
-      "Generate diffs with <n> lines of context instead of the default of 3. This value is overridden by the -U option",
-  },
-  {
-    name: "diff.dirstat",
-    description:
-      "A comma separated list of `--dirstat` parameters specifying the default behavior of the `--dirstat` option to git-diff[1] and friends. The defaults can be overridden on the command line (using `--dirstat=<param1,param2,...>`). The fallback defaults (when not changed by `diff.dirstat`) are `changes,noncumulative,3`. The following parameters are available:",
-  },
-  {
-    name: "diff.external",
-    description:
-      'If this config variable is set, diff generation is not performed using the internal diff machinery, but using the given command. Can be overridden with the `GIT_EXTERNAL_DIFF\' environment variable. The command is called with parameters as described under "git Diffs" in git[1]. Note: if you want to use an external diff program only on a subset of your files, you might want to use gitattributes[5] instead',
-  },
-  {
-    name: "diff.guitool",
-    description:
-      "Controls which diff tool is used by git-difftool[1] when the -g/--gui flag is specified. This variable overrides the value configured in `merge.guitool`. The list below shows the valid built-in values. Any other value is treated as a custom diff tool and requires that a corresponding difftool.<guitool>.cmd variable is defined",
-  },
-  {
-    name: "diff.ignoreSubmodules",
-    description:
-      "Sets the default value of --ignore-submodules. Note that this affects only 'git diff' Porcelain, and not lower level 'diff' commands such as 'git diff-files'. 'git checkout' and 'git switch' also honor this setting when reporting uncommitted changes. Setting it to 'all' disables the submodule summary normally shown by 'git commit' and 'git status' when `status.submoduleSummary` is set unless it is overridden by using the --ignore-submodules command-line option. The 'git submodule' commands are not affected by this setting. By default this is set to untracked so that any untracked submodules are ignored",
-  },
-  {
-    name: "diff.indentHeuristic",
-    description:
-      "Set this option to `false` to disable the default heuristics that shift diff hunk boundaries to make patches easier to read",
-  },
-  {
-    name: "diff.interHunkContext",
-    description:
-      "Show the context between diff hunks, up to the specified number of lines, thereby fusing the hunks that are close to each other. This value serves as the default for the `--inter-hunk-context` command line option",
-  },
-  {
-    name: "diff.mnemonicPrefix",
-    description:
-      'If set, \'git diff\' uses a prefix pair that is different from the standard "a/" and "b/" depending on what is being compared. When this configuration is in effect, reverse diff output also swaps the order of the prefixes:',
-  },
-  {
-    name: "diff.noprefix",
-    description:
-      "If set, 'git diff' does not show any source or destination prefix",
-  },
-  {
-    name: "diff.orderFile",
-    description:
-      "File indicating how to order files within a diff. See the '-O' option to git-diff[1] for details. If `diff.orderFile` is a relative pathname, it is treated as relative to the top of the working tree",
-  },
-  {
-    name: "diff.relative",
-    description:
-      "If set to 'true', 'git diff' does not show changes outside of the directory and show pathnames relative to the current directory",
-  },
-  {
-    name: "diff.renameLimit",
-    description:
-      "The number of files to consider in the exhaustive portion of copy/rename detection; equivalent to the 'git diff' option `-l`. If not set, the default value is currently 1000. This setting has no effect if rename detection is turned off",
-  },
-  {
-    name: "diff.renames",
-    description:
-      'Whether and how Git detects renames. If set to "false", rename detection is disabled. If set to "true", basic rename detection is enabled. If set to "copies" or "copy", Git will detect copies, as well. Defaults to true. Note that this affects only \'git diff\' Porcelain like git-diff[1] and git-log[1], and not lower level commands such as git-diff-files[1]',
-  },
-  {
-    name: "diff.statGraphWidth",
-    description:
-      "Limit the width of the graph part in --stat output. If set, applies to all commands generating --stat output except format-patch",
-  },
-  {
-    name: "diff.submodule",
-    description:
-      'Specify the format in which differences in submodules are shown. The "short" format just shows the names of the commits at the beginning and end of the range. The "log" format lists the commits in the range like git-submodule[1] `summary` does. The "diff" format shows an inline diff of the changed contents of the submodule. Defaults to "short"',
-  },
-  {
-    name: "diff.suppressBlankEmpty",
-    description:
-      "A boolean to inhibit the standard behavior of printing a space before each empty output line. Defaults to false",
-  },
-  {
-    name: "diff.tool",
-    description:
-      "Controls which diff tool is used by git-difftool[1]. This variable overrides the value configured in `merge.tool`. The list below shows the valid built-in values. Any other value is treated as a custom diff tool and requires that a corresponding difftool.<tool>.cmd variable is defined",
-  },
-  {
-    name: "diff.wordRegex",
-    description:
-      'A POSIX Extended Regular Expression used to determine what is a "word" when performing word-by-word difference calculations. Character sequences that match the regular expression are "words", all other characters are *ignorable* whitespace',
-  },
-  {
-    name: "diff.wsErrorHighlight",
-    description:
-      "Highlight whitespace errors in the `context`, `old` or `new` lines of the diff. Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`. The whitespace errors are colored with `color.diff.whitespace`. The command line option `--ws-error-highlight=<kind>` overrides this setting",
-  },
-  {
-    name: "difftool.<tool>.cmd",
-    insertValue: "difftool.{cursor}.cmd",
-    description:
-      "Specify the command to invoke the specified diff tool. The specified command is evaluated in shell with the following variables available: 'LOCAL' is set to the name of the temporary file containing the contents of the diff pre-image and 'REMOTE' is set to the name of the temporary file containing the contents of the diff post-image",
-  },
-  {
-    name: "difftool.<tool>.path",
-    insertValue: "difftool.{cursor}.path",
-    description:
-      "Override the path for the given tool. This is useful in case your tool is not in the PATH",
-  },
-  {
-    name: "difftool.prompt",
-    description: "Prompt before each invocation of the diff tool",
-  },
-  {
-    name: "extensions.objectFormat",
-    description:
-      "Specify the hash algorithm to use. The acceptable values are `sha1` and `sha256`. If not specified, `sha1` is assumed. It is an error to specify this key unless `core.repositoryFormatVersion` is 1",
-  },
-  {
-    name: "extensions.worktreeConfig",
-    description:
-      "If enabled, then worktrees will load config settings from the `$GIT_DIR/config.worktree` file in addition to the `$GIT_COMMON_DIR/config` file. Note that `$GIT_COMMON_DIR` and `$GIT_DIR` are the same for the main working tree, while other working trees have `$GIT_DIR` equal to `$GIT_COMMON_DIR/worktrees/<id>/`. The settings in the `config.worktree` file will override settings from any other config files",
-  },
-  {
-    name: "fastimport.unpackLimit",
-    description:
-      "If the number of objects imported by git-fast-import[1] is below this limit, then the objects will be unpacked into loose object files. However if the number of imported objects equals or exceeds this limit then the pack will be stored as a pack. Storing the pack from a fast-import can make the import operation complete faster, especially on slow filesystems. If not set, the value of `transfer.unpackLimit` is used instead",
-  },
-  {
-    name: "feature.*",
-    insertValue: "feature.{cursor}",
-    description:
-      "The config settings that start with `feature.` modify the defaults of a group of other config settings. These groups are created by the Git developer community as recommended defaults and are subject to change. In particular, new config options may be added with different defaults",
-  },
-  {
-    name: "feature.experimental",
-    description:
-      "Enable config options that are new to Git, and are being considered for future defaults. Config settings included here may be added or removed with each release, including minor version updates. These settings may have unintended interactions since they are so new. Please enable this setting if you are interested in providing feedback on experimental features. The new default values are:",
-  },
-  {
-    name: "feature.manyFiles",
-    description:
-      "Enable config options that optimize for repos with many files in the working directory. With many files, commands such as `git status` and `git checkout` may be slow and these new defaults improve performance:",
-  },
-  {
-    name: "fetch.fsck.<msg-id>",
-    insertValue: "fetch.fsck.{cursor}",
-    description:
-      "Acts like `fsck.<msg-id>`, but is used by git-fetch-pack[1] instead of git-fsck[1]. See the `fsck.<msg-id>` documentation for details",
-  },
-  {
-    name: "fetch.fsck.skipList",
-    description:
-      "Acts like `fsck.skipList`, but is used by git-fetch-pack[1] instead of git-fsck[1]. See the `fsck.skipList` documentation for details",
-  },
-  {
-    name: "fetch.fsckObjects",
-    description:
-      "If it is set to true, git-fetch-pack will check all fetched objects. See `transfer.fsckObjects` for what's checked. Defaults to false. If not set, the value of `transfer.fsckObjects` is used instead",
-  },
-  {
-    name: "fetch.negotiationAlgorithm",
-    description:
-      'Control how information about the commits in the local repository is sent when negotiating the contents of the packfile to be sent by the server. Set to "consecutive" to use an algorithm that walks over consecutive commits checking each one. Set to "skipping" to use an algorithm that skips commits in an effort to converge faster, but may result in a larger-than-necessary packfile; or set to "noop" to not send any information at all, which will almost certainly result in a larger-than-necessary packfile, but will skip the negotiation step. Set to "default" to override settings made previously and use the default behaviour. The default is normally "consecutive", but if `feature.experimental` is true, then the default is "skipping". Unknown values will cause \'git fetch\' to error out',
-  },
-  {
-    name: "fetch.output",
-    description:
-      "Control how ref update status is printed. Valid values are `full` and `compact`. Default value is `full`. See section OUTPUT in git-fetch[1] for detail",
-  },
-  {
-    name: "fetch.parallel",
-    description:
-      "Specifies the maximal number of fetch operations to be run in parallel at a time (submodules, or remotes when the `--multiple` option of git-fetch[1] is in effect)",
-  },
-  {
-    name: "fetch.prune",
-    description:
-      "If true, fetch will automatically behave as if the `--prune` option was given on the command line. See also `remote.<name>.prune` and the PRUNING section of git-fetch[1]",
-  },
-  {
-    name: "fetch.pruneTags",
-    description:
-      "If true, fetch will automatically behave as if the `refs/tags/*:refs/tags/*` refspec was provided when pruning, if not set already. This allows for setting both this option and `fetch.prune` to maintain a 1=1 mapping to upstream refs. See also `remote.<name>.pruneTags` and the PRUNING section of git-fetch[1]",
-  },
-  {
-    name: "fetch.recurseSubmodules",
-    description:
-      "This option controls whether `git fetch` (and the underlying fetch in `git pull`) will recursively fetch into populated submodules. This option can be set either to a boolean value or to 'on-demand'. Setting it to a boolean changes the behavior of fetch and pull to recurse unconditionally into submodules when set to true or to not recurse at all when set to false. When set to 'on-demand', fetch and pull will only recurse into a populated submodule when its superproject retrieves a commit that updates the submodule's reference. Defaults to 'on-demand', or to the value of 'submodule.recurse' if set",
-  },
-  {
-    name: "fetch.showForcedUpdates",
-    description:
-      "Set to false to enable `--no-show-forced-updates` in git-fetch[1] and git-pull[1] commands. Defaults to true",
-  },
-  {
-    name: "fetch.unpackLimit",
-    description:
-      "If the number of objects fetched over the Git native transfer is below this limit, then the objects will be unpacked into loose object files. However if the number of received objects equals or exceeds this limit then the received pack will be stored as a pack, after adding any missing delta bases. Storing the pack from a push can make the push operation complete faster, especially on slow filesystems. If not set, the value of `transfer.unpackLimit` is used instead",
-  },
-  {
-    name: "fetch.writeCommitGraph",
-    description:
-      "Set to true to write a commit-graph after every `git fetch` command that downloads a pack-file from a remote. Using the `--split` option, most executions will create a very small commit-graph file on top of the existing commit-graph file(s). Occasionally, these files will merge and the write may take longer. Having an updated commit-graph file helps performance of many Git commands, including `git merge-base`, `git push -f`, and `git log --graph`. Defaults to false",
-  },
-  {
-    name: "filter.<driver>.clean",
-    insertValue: "filter.{cursor}.clean",
-    description:
-      "The command which is used to convert the content of a worktree file to a blob upon checkin. See gitattributes[5] for details",
-  },
-  {
-    name: "filter.<driver>.smudge",
-    insertValue: "filter.{cursor}.smudge",
-    description:
-      "The command which is used to convert the content of a blob object to a worktree file upon checkout. See gitattributes[5] for details",
-  },
-  {
-    name: "format.attach",
-    description:
-      "Enable multipart/mixed attachments as the default for 'format-patch'. The value can also be a double quoted string which will enable attachments as the default and set the value as the boundary. See the --attach option in git-format-patch[1]",
-  },
-  {
-    name: "format.cc",
-    description:
-      "Additional recipients to include in a patch to be submitted by mail. See the --to and --cc options in git-format-patch[1]",
-  },
-  {
-    name: "format.coverFromDescription",
-    description:
-      "The default mode for format-patch to determine which parts of the cover letter will be populated using the branch's description. See the `--cover-from-description` option in git-format-patch[1]",
-  },
-  {
-    name: "format.coverLetter",
-    description:
-      'A boolean that controls whether to generate a cover-letter when format-patch is invoked, but in addition can be set to "auto", to generate a cover-letter only when there\'s more than one patch. Default is false',
-  },
-  {
-    name: "format.encodeEmailHeaders",
-    description:
-      'Encode email headers that have non-ASCII characters with "Q-encoding" (described in RFC 2047) for email transmission. Defaults to true',
-  },
-  {
-    name: "format.filenameMaxLength",
-    description:
-      "The maximum length of the output filenames generated by the `format-patch` command; defaults to 64. Can be overridden by the `--filename-max-length=<n>` command line option",
-  },
-  {
-    name: "format.from",
-    description:
-      'Provides the default value for the `--from` option to format-patch. Accepts a boolean value, or a name and email address. If false, format-patch defaults to `--no-from`, using commit authors directly in the "From:" field of patch mails. If true, format-patch defaults to `--from`, using your committer identity in the "From:" field of patch mails and including a "From:" field in the body of the patch mail if different. If set to a non-boolean value, format-patch uses that value instead of your committer identity. Defaults to false',
-  },
-  {
-    name: "format.headers",
-    description:
-      "Additional email headers to include in a patch to be submitted by mail. See git-format-patch[1]",
-  },
-  {
-    name: "format.notes",
-    description:
-      "Provides the default value for the `--notes` option to format-patch. Accepts a boolean value, or a ref which specifies where to get notes. If false, format-patch defaults to `--no-notes`. If true, format-patch defaults to `--notes`. If set to a non-boolean value, format-patch defaults to `--notes=<ref>`, where `ref` is the non-boolean value. Defaults to false",
-  },
-  {
-    name: "format.numbered",
-    description:
-      'A boolean which can enable or disable sequence numbers in patch subjects. It defaults to "auto" which enables it only if there is more than one patch. It can be enabled or disabled for all messages by setting it to "true" or "false". See --numbered option in git-format-patch[1]',
-  },
-  {
-    name: "format.outputDirectory",
-    description:
-      "Set a custom directory to store the resulting files instead of the current working directory. All directory components will be created",
-  },
-  {
-    name: "format.pretty",
-    description:
-      "The default pretty format for log/show/whatchanged command, See git-log[1], git-show[1], git-whatchanged[1]",
-  },
-  {
-    name: "format.signature",
-    description:
-      'The default for format-patch is to output a signature containing the Git version number. Use this variable to change that default. Set this variable to the empty string ("") to suppress signature generation',
-  },
-  {
-    name: "format.signatureFile",
-    description:
-      "Works just like format.signature except the contents of the file specified by this variable will be used as the signature",
-  },
-  {
-    name: "format.signOff",
-    description:
-      "A boolean value which lets you enable the `-s/--signoff` option of format-patch by default. *Note:* Adding the `Signed-off-by` trailer to a patch should be a conscious act and means that you certify you have the rights to submit this work under the same open source license. Please see the 'SubmittingPatches' document for further discussion",
-  },
-  {
-    name: "format.subjectPrefix",
-    description:
-      "The default for format-patch is to output files with the '[PATCH]' subject prefix. Use this variable to change that prefix",
-  },
-  {
-    name: "format.suffix",
-    description:
-      "The default for format-patch is to output files with the suffix `.patch`. Use this variable to change that suffix (make sure to include the dot if you want it)",
-  },
-  {
-    name: "format.thread",
-    description:
-      "The default threading style for 'git format-patch'. Can be a boolean value, or `shallow` or `deep`. `shallow` threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. `deep` threading makes every mail a reply to the previous one. A true boolean value is the same as `shallow`, and a false value disables threading",
-  },
-  {
-    name: "format.useAutoBase",
-    description:
-      'A boolean value which lets you enable the `--base=auto` option of format-patch by default. Can also be set to "whenAble" to allow enabling `--base=auto` if a suitable base is available, but to skip adding base info otherwise without the format dying',
-  },
-  {
-    name: "fsck.<msg-id>",
-    insertValue: "fsck.{cursor}",
-    description:
-      "During fsck git may find issues with legacy data which wouldn't be generated by current versions of git, and which wouldn't be sent over the wire if `transfer.fsckObjects` was set. This feature is intended to support working with legacy repositories containing such data",
-  },
-  {
-    name: "fsck.skipList",
-    description:
-      "The path to a list of object names (i.e. one unabbreviated SHA-1 per line) that are known to be broken in a non-fatal way and should be ignored. On versions of Git 2.20 and later comments ('#'), empty lines, and any leading and trailing whitespace is ignored. Everything but a SHA-1 per line will error out on older versions",
-  },
-  {
-    name: "gc.<pattern>.reflogExpire",
-    insertValue: "gc.{cursor}.reflogExpire",
-    description:
-      '\'git reflog expire\' removes reflog entries older than this time; defaults to 90 days. The value "now" expires all entries immediately, and "never" suppresses expiration altogether. With "<pattern>" (e.g. "refs/stash") in the middle the setting applies only to the refs that match the <pattern>',
-  },
-  {
-    name: "gc.<pattern>.reflogExpireUnreachable",
-    insertValue: "gc.{cursor}.reflogExpireUnreachable",
-    description:
-      '\'git reflog expire\' removes reflog entries older than this time and are not reachable from the current tip; defaults to 30 days. The value "now" expires all entries immediately, and "never" suppresses expiration altogether. With "<pattern>" (e.g. "refs/stash") in the middle, the setting applies only to the refs that match the <pattern>',
-  },
-  {
-    name: "gc.aggressiveDepth",
-    description:
-      "The depth parameter used in the delta compression algorithm used by 'git gc --aggressive'. This defaults to 50, which is the default for the `--depth` option when `--aggressive` isn't in use",
-  },
-  {
-    name: "gc.aggressiveWindow",
-    description:
-      "The window size parameter used in the delta compression algorithm used by 'git gc --aggressive'. This defaults to 250, which is a much more aggressive window size than the default `--window` of 10",
-  },
-  {
-    name: "gc.auto",
-    description:
-      "When there are approximately more than this many loose objects in the repository, `git gc --auto` will pack them. Some Porcelain commands use this command to perform a light-weight garbage collection from time to time. The default value is 6700",
-  },
-  {
-    name: "gc.autoDetach",
-    description:
-      "Make `git gc --auto` return immediately and run in background if the system supports it. Default is true",
-  },
-  {
-    name: "gc.autoPackLimit",
-    description:
-      "When there are more than this many packs that are not marked with `*.keep` file in the repository, `git gc --auto` consolidates them into one larger pack. The default value is 50. Setting this to 0 disables it. Setting `gc.auto` to 0 will also disable this",
-  },
-  {
-    name: "gc.bigPackThreshold",
-    description:
-      "If non-zero, all packs larger than this limit are kept when `git gc` is run. This is very similar to `--keep-largest-pack` except that all packs that meet the threshold are kept, not just the largest pack. Defaults to zero. Common unit suffixes of 'k', 'm', or 'g' are supported",
-  },
-  {
-    name: "gc.cruftPacks",
-    description:
-      "Store unreachable objects in a cruft pack (see git-repack[1]) instead of as loose objects. The default is `false`",
-  },
-  {
-    name: "gc.logExpiry",
-    description:
-      "If the file gc.log exists, then `git gc --auto` will print its content and exit with status zero instead of running unless that file is more than 'gc.logExpiry' old. Default is \"1.day\". See `gc.pruneExpire` for more ways to specify its value",
-  },
-  {
-    name: "gc.packRefs",
-    description:
-      "Running `git pack-refs` in a repository renders it unclonable by Git versions prior to 1.5.1.2 over dumb transports such as HTTP. This variable determines whether 'git gc' runs `git pack-refs`. This can be set to `notbare` to enable it within all non-bare repos or it can be set to a boolean value. The default is `true`",
-  },
-  {
-    name: "gc.pruneExpire",
-    description:
-      "When 'git gc' is run, it will call 'prune --expire 2.weeks.ago' (and 'repack --cruft --cruft-expiration 2.weeks.ago' if using cruft packs via `gc.cruftPacks` or `--cruft`). Override the grace period with this config variable. The value \"now\" may be used to disable this grace period and always prune unreachable objects immediately, or \"never\" may be used to suppress pruning. This feature helps prevent corruption when 'git gc' runs concurrently with another process writing to the repository; see the \"NOTES\" section of git-gc[1]",
-  },
-  {
-    name: "gc.rerereResolved",
-    description:
-      "Records of conflicted merge you resolved earlier are kept for this many days when 'git rerere gc' is run. You can also use more human-readable \"1.month.ago\", etc. The default is 60 days. See git-rerere[1]",
-  },
-  {
-    name: "gc.rerereUnresolved",
-    description:
-      "Records of conflicted merge you have not resolved are kept for this many days when 'git rerere gc' is run. You can also use more human-readable \"1.month.ago\", etc. The default is 15 days. See git-rerere[1]",
-  },
-  {
-    name: "gc.worktreePruneExpire",
-    description:
-      "When 'git gc' is run, it calls 'git worktree prune --expire 3.months.ago'. This config variable can be used to set a different grace period. The value \"now\" may be used to disable the grace period and prune `$GIT_DIR/worktrees` immediately, or \"never\" may be used to suppress pruning",
-  },
-  {
-    name: "gc.writeCommitGraph",
-    description:
-      "If true, then gc will rewrite the commit-graph file when git-gc[1] is run. When using `git gc --auto` the commit-graph will be updated if housekeeping is required. Default is true. See git-commit-graph[1] for details",
-  },
-  {
-    name: "gitcvs.allBinary",
-    description:
-      "This is used if `gitcvs.usecrlfattr` does not resolve the correct '-kb' mode to use. If true, all unresolved files are sent to the client in mode '-kb'. This causes the client to treat them as binary files, which suppresses any newline munging it otherwise might do. Alternatively, if it is set to \"guess\", then the contents of the file are examined to decide if it is binary, similar to `core.autocrlf`",
-  },
-  {
-    name: "gitcvs.commitMsgAnnotation",
-    description:
-      'Append this string to each commit message. Set to empty string to disable this feature. Defaults to "via git-CVS emulator"',
-  },
-  {
-    name: "gitcvs.dbDriver",
-    description:
-      "Used Perl DBI driver. You can specify any available driver for this here, but it might not work. git-cvsserver is tested with 'DBD::SQLite', reported to work with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Experimental feature. May not contain double colons (`:`). Default: 'SQLite'. See git-cvsserver[1]",
-  },
-  {
-    name: "gitcvs.dbName",
-    description:
-      "Database used by git-cvsserver to cache revision information derived from the Git repository. The exact meaning depends on the used database driver, for SQLite (which is the default driver) this is a filename. Supports variable substitution (see git-cvsserver[1] for details). May not contain semicolons (`;`). Default: '%Ggitcvs.%m.sqlite'",
-  },
-  {
-    name: "gitcvs.dbTableNamePrefix",
-    description:
-      "Database table name prefix. Prepended to the names of any database tables used, allowing a single database to be used for several repositories. Supports variable substitution (see git-cvsserver[1] for details). Any non-alphabetic characters will be replaced with underscores",
-  },
-  {
-    name: "gitcvs.dbUser",
-    description:
-      "Database user and password. Only useful if setting `gitcvs.dbDriver`, since SQLite has no concept of database users and/or passwords. 'gitcvs.dbUser' supports variable substitution (see git-cvsserver[1] for details)",
-  },
-  {
-    name: "gitcvs.enabled",
-    description:
-      "Whether the CVS server interface is enabled for this repository. See git-cvsserver[1]",
-  },
-  {
-    name: "gitcvs.logFile",
-    description:
-      "Path to a log file where the CVS server interface well... logs various stuff. See git-cvsserver[1]",
-  },
-  {
-    name: "gitcvs.usecrlfattr",
-    description:
-      "If true, the server will look up the end-of-line conversion attributes for files to determine the `-k` modes to use. If the attributes force Git to treat a file as text, the `-k` mode will be left blank so CVS clients will treat it as text. If they suppress text conversion, the file will be set with '-kb' mode, which suppresses any newline munging the client might otherwise do. If the attributes do not allow the file type to be determined, then `gitcvs.allBinary` is used. See gitattributes[5]",
-  },
-  {
-    name: "gitweb.snapshot",
-    description: "See gitweb.conf[5] for description",
-  },
-  {
-    name: "gitweb.url",
-    description: "See gitweb[1] for description",
-  },
-  {
-    name: "gpg.<format>.program",
-    insertValue: "gpg.{cursor}.program",
-    description:
-      'Use this to customize the program used for the signing format you chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still be used as a legacy synonym for `gpg.openpgp.program`. The default value for `gpg.x509.program` is "gpgsm" and `gpg.ssh.program` is "ssh-keygen"',
-  },
-  {
-    name: "gpg.format",
-    description:
-      'Specifies which key format to use when signing with `--gpg-sign`. Default is "openpgp". Other possible values are "x509", "ssh"',
-  },
-  {
-    name: "gpg.minTrustLevel",
-    description:
-      "Specifies a minimum trust level for signature verification. If this option is unset, then signature verification for merge operations require a key with at least `marginal` trust. Other operations that perform signature verification require a key with at least `undefined` trust. Setting this option overrides the required trust-level for all operations. Supported values, in increasing order of significance:",
-  },
-  {
-    name: "gpg.program",
-    description:
-      'Use this custom program instead of "`gpg`" found on `$PATH` when making or verifying a PGP signature. The program must support the same command-line interface as GPG, namely, to verify a detached signature, "`gpg --verify $signature - <$file`" is run, and the program is expected to signal a good signature by exiting with code 0, and to generate an ASCII-armored detached signature, the standard input of "`gpg -bsau $key`" is fed with the contents to be signed, and the program is expected to send the result to its standard output',
-  },
-  {
-    name: "gpg.ssh.allowedSignersFile",
-    description:
-      'A file containing ssh public keys which you are willing to trust. The file consists of one or more lines of principals followed by an ssh public key. e.g.: `user1@example.com,user2@example.com ssh-rsa AAAAX1...` See ssh-keygen(1) "ALLOWED SIGNERS" for details. The principal is only used to identify the key and is available when verifying a signature',
-  },
-  {
-    name: "gpg.ssh.defaultKeyCommand",
-    description:
-      "This command that will be run when user.signingkey is not set and a ssh signature is requested. On successful exit a valid ssh public key prefixed with `key::` is expected in the first line of its output. This allows for a script doing a dynamic lookup of the correct public key when it is impractical to statically configure `user.signingKey`. For example when keys or SSH Certificates are rotated frequently or selection of the right key depends on external factors unknown to git",
-  },
-  {
-    name: "gpg.ssh.revocationFile",
-    description:
-      'Either a SSH KRL or a list of revoked public keys (without the principal prefix). See ssh-keygen(1) for details. If a public key is found in this file then it will always be treated as having trust level "never" and signatures will show as invalid',
-  },
-  {
-    name: "grep.column",
-    description: "If set to true, enable the `--column` option by default",
-  },
-  {
-    name: "grep.extendedRegexp",
-    description:
-      "If set to true, enable `--extended-regexp` option by default. This option is ignored when the `grep.patternType` option is set to a value other than 'default'",
-  },
-  {
-    name: "grep.fallbackToNoIndex",
-    description:
-      "If set to true, fall back to git grep --no-index if git grep is executed outside of a git repository. Defaults to false",
-  },
-  {
-    name: "grep.lineNumber",
-    description: "If set to true, enable `-n` option by default",
-  },
-  {
-    name: "grep.patternType",
-    description:
-      "Set the default matching behavior. Using a value of 'basic', 'extended', 'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, `--fixed-strings`, or `--perl-regexp` option accordingly, while the value 'default' will use the `grep.extendedRegexp` option to choose between 'basic' and 'extended'",
-  },
-  {
-    name: "grep.threads",
-    description:
-      "Number of grep worker threads to use. See `grep.threads` in git-grep[1] for more information",
-  },
-  {
-    name: "gui.blamehistoryctx",
-    description:
-      "Specifies the radius of history context in days to show in gitk[1] for the selected commit, when the `Show History Context` menu item is invoked from 'git gui blame'. If this variable is set to zero, the whole history is shown",
-  },
-  {
-    name: "gui.commitMsgWidth",
-    description:
-      'Defines how wide the commit message window is in the git-gui[1]. "75" is the default',
-  },
-  {
-    name: "gui.copyBlameThreshold",
-    description:
-      "Specifies the threshold to use in 'git gui blame' original location detection, measured in alphanumeric characters. See the git-blame[1] manual for more information on copy detection",
-  },
-  {
-    name: "gui.diffContext",
-    description:
-      'Specifies how many context lines should be used in calls to diff made by the git-gui[1]. The default is "5"',
-  },
-  {
-    name: "gui.displayUntracked",
-    description:
-      'Determines if git-gui[1] shows untracked files in the file list. The default is "true"',
-  },
-  {
-    name: "gui.encoding",
-    description:
-      "Specifies the default character encoding to use for displaying of file contents in git-gui[1] and gitk[1]. It can be overridden by setting the 'encoding' attribute for relevant files (see gitattributes[5]). If this option is not set, the tools default to the locale encoding",
-  },
-  {
-    name: "gui.fastCopyBlame",
-    description:
-      "If true, 'git gui blame' uses `-C` instead of `-C -C` for original location detection. It makes blame significantly faster on huge repositories at the expense of less thorough copy detection",
-  },
-  {
-    name: "gui.matchTrackingBranch",
-    description:
-      'Determines if new branches created with git-gui[1] should default to tracking remote branches with matching names or not. Default: "false"',
-  },
-  {
-    name: "gui.newBranchTemplate",
-    description:
-      "Is used as suggested name when creating new branches using the git-gui[1]",
-  },
-  {
-    name: "gui.pruneDuringFetch",
-    description:
-      '"true" if git-gui[1] should prune remote-tracking branches when performing a fetch. The default value is "false"',
-  },
-  {
-    name: "gui.spellingDictionary",
-    description:
-      'Specifies the dictionary used for spell checking commit messages in the git-gui[1]. When set to "none" spell checking is turned off',
-  },
-  {
-    name: "gui.trustmtime",
-    description:
-      "Determines if git-gui[1] should trust the file modification timestamp or not. By default the timestamps are not trusted",
-  },
-  {
-    name: "guitool.<name>.argPrompt",
-    insertValue: "guitool.{cursor}.argPrompt",
-    description:
-      "Request a string argument from the user, and pass it to the tool through the `ARGS` environment variable. Since requesting an argument implies confirmation, the 'confirm' option has no effect if this is enabled. If the option is set to 'true', 'yes', or '1', the dialog uses a built-in generic prompt; otherwise the exact value of the variable is used",
-  },
-  {
-    name: "guitool.<name>.cmd",
-    insertValue: "guitool.{cursor}.cmd",
-    description:
-      "Specifies the shell command line to execute when the corresponding item of the git-gui[1] `Tools` menu is invoked. This option is mandatory for every tool. The command is executed from the root of the working directory, and in the environment it receives the name of the tool as `GIT_GUITOOL`, the name of the currently selected file as 'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if the head is detached, 'CUR_BRANCH' is empty)",
-  },
-  {
-    name: "guitool.<name>.confirm",
-    insertValue: "guitool.{cursor}.confirm",
-    description: "Show a confirmation dialog before actually running the tool",
-  },
-  {
-    name: "guitool.<name>.needsFile",
-    insertValue: "guitool.{cursor}.needsFile",
-    description:
-      "Run the tool only if a diff is selected in the GUI. It guarantees that 'FILENAME' is not empty",
-  },
-  {
-    name: "guitool.<name>.noConsole",
-    insertValue: "guitool.{cursor}.noConsole",
-    description:
-      "Run the command silently, without creating a window to display its output",
-  },
-  {
-    name: "guitool.<name>.noRescan",
-    insertValue: "guitool.{cursor}.noRescan",
-    description:
-      "Don't rescan the working directory for changes after the tool finishes execution",
-  },
-  {
-    name: "guitool.<name>.prompt",
-    insertValue: "guitool.{cursor}.prompt",
-    description:
-      "Specifies the general prompt string to display at the top of the dialog, before subsections for 'argPrompt' and 'revPrompt'. The default value includes the actual command",
-  },
-  {
-    name: "guitool.<name>.revPrompt",
-    insertValue: "guitool.{cursor}.revPrompt",
-    description:
-      "Request a single valid revision from the user, and set the `REVISION` environment variable. In other aspects this option is similar to 'argPrompt', and can be used together with it",
-  },
-  {
-    name: "guitool.<name>.revUnmerged",
-    insertValue: "guitool.{cursor}.revUnmerged",
-    description:
-      "Show only unmerged branches in the 'revPrompt' subdialog. This is useful for tools similar to merge or rebase, but not for things like checkout or reset",
-  },
-  {
-    name: "guitool.<name>.title",
-    insertValue: "guitool.{cursor}.title",
-    description:
-      "Specifies the title to use for the prompt dialog. The default is the tool name",
-  },
-  {
-    name: "help.autoCorrect",
-    description:
-      "If git detects typos and can identify exactly one valid command similar to the error, git will try to suggest the correct command or even run the suggestion automatically. Possible config values are: - 0 (default): show the suggested command. - positive number: run the suggested command after specified",
-  },
-  {
-    name: "help.browser",
-    description:
-      "Specify the browser that will be used to display help in the 'web' format. See git-help[1]",
-  },
-  {
-    name: "help.format",
-    description:
-      "Override the default help format used by git-help[1]. Values 'man', 'info', 'web' and 'html' are supported. 'man' is the default. 'web' and 'html' are the same",
-  },
-  {
-    name: "help.htmlPath",
-    description:
-      "Specify the path where the HTML documentation resides. File system paths and URLs are supported. HTML pages will be prefixed with this path when help is displayed in the 'web' format. This defaults to the documentation path of your Git installation",
-  },
-  {
-    name: "http.cookieFile",
-    description:
-      "The pathname of a file containing previously stored cookie lines, which should be used in the Git http session, if they match the server. The file format of the file to read cookies from should be plain HTTP headers or the Netscape/Mozilla cookie file format (see `curl(1)`). NOTE that the file specified with http.cookieFile is used only as input unless http.saveCookies is set",
-  },
-  {
-    name: "http.curloptResolve",
-    description:
-      "Hostname resolution information that will be used first by libcurl when sending HTTP requests. This information should be in one of the following formats:",
-  },
-  {
-    name: "http.delegation",
-    description:
-      "Control GSSAPI credential delegation. The delegation is disabled by default in libcurl since version 7.21.7. Set parameter to tell the server what it is allowed to delegate when it comes to user credentials. Used with GSS/kerberos. Possible values are:",
-  },
-  {
-    name: "http.emptyAuth",
-    description:
-      "Attempt authentication without seeking a username or password. This can be used to attempt GSS-Negotiate authentication without specifying a username in the URL, as libcurl normally requires a username for authentication",
-  },
-  {
-    name: "http.extraHeader",
-    description:
-      "Pass an additional HTTP header when communicating with a server. If more than one such entry exists, all of them are added as extra headers. To allow overriding the settings inherited from the system config, an empty value will reset the extra headers to the empty list",
-  },
-  {
-    name: "http.followRedirects",
-    description:
-      "Whether git should follow HTTP redirects. If set to `true`, git will transparently follow any redirect issued by a server it encounters. If set to `false`, git will treat all redirects as errors. If set to `initial`, git will follow redirects only for the initial request to a remote, but not for subsequent follow-up HTTP requests. Since git uses the redirected URL as the base for the follow-up requests, this is generally sufficient. The default is `initial`",
-  },
-  {
-    name: "http.lowSpeedLimit",
-    description:
-      "If the HTTP transfer speed is less than 'http.lowSpeedLimit' for longer than 'http.lowSpeedTime' seconds, the transfer is aborted. Can be overridden by the `GIT_HTTP_LOW_SPEED_LIMIT` and `GIT_HTTP_LOW_SPEED_TIME` environment variables",
-  },
-  {
-    name: "http.maxRequests",
-    description:
-      "How many HTTP requests to launch in parallel. Can be overridden by the `GIT_HTTP_MAX_REQUESTS` environment variable. Default is 5",
-  },
-  {
-    name: "http.minSessions",
-    description:
-      "The number of curl sessions (counted across slots) to be kept across requests. They will not be ended with curl_easy_cleanup() until http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this value will be capped at 1. Defaults to 1",
-  },
-  {
-    name: "http.noEPSV",
-    description:
-      'A boolean which disables using of EPSV ftp command by curl. This can helpful with some "poor" ftp servers which don\'t support EPSV mode. Can be overridden by the `GIT_CURL_FTP_NO_EPSV` environment variable. Default is false (curl will use EPSV)',
-  },
-  {
-    name: "http.pinnedPubkey",
-    description:
-      "Public key of the https service. It may either be the filename of a PEM or DER encoded public key file or a string starting with 'sha256//' followed by the base64 encoded sha256 hash of the public key. See also libcurl 'CURLOPT_PINNEDPUBLICKEY'. git will exit with an error if this option is set but not supported by cURL",
-  },
-  {
-    name: "http.postBuffer",
-    description:
-      "Maximum size in bytes of the buffer used by smart HTTP transports when POSTing data to the remote system. For requests larger than this buffer size, HTTP/1.1 and Transfer-Encoding: chunked is used to avoid creating a massive pack file locally. Default is 1 MiB, which is sufficient for most requests",
-  },
-  {
-    name: "http.proxy",
-    description:
-      "Override the HTTP proxy, normally configured using the 'http_proxy', 'https_proxy', and 'all_proxy' environment variables (see `curl(1)`). In addition to the syntax understood by curl, it is possible to specify a proxy string with a user name but no password, in which case git will attempt to acquire one in the same way it does for other credentials. See gitcredentials[7] for more information. The syntax thus is '[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden on a per-remote basis; see remote.<name>.proxy",
-  },
-  {
-    name: "http.proxyAuthMethod",
-    description:
-      "Set the method with which to authenticate against the HTTP proxy. This only takes effect if the configured proxy string contains a user name part (i.e. is of the form 'user@host' or 'user@host:port'). This can be overridden on a per-remote basis; see `remote.<name>.proxyAuthMethod`. Both can be overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment variable. Possible values are:",
-  },
-  {
-    name: "http.proxySSLCAInfo",
-    description:
-      "Pathname to the file containing the certificate bundle that should be used to verify the proxy with when using an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CAINFO` environment variable",
-  },
-  {
-    name: "http.proxySSLCert",
-    description:
-      "The pathname of a file that stores a client certificate to use to authenticate with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CERT` environment variable",
-  },
-  {
-    name: "http.proxySSLCertPasswordProtected",
-    description:
-      "Enable Git's password prompt for the proxy SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED` environment variable",
-  },
-  {
-    name: "http.proxySSLKey",
-    description:
-      "The pathname of a file that stores a private key to use to authenticate with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_KEY` environment variable",
-  },
-  {
-    name: "http.saveCookies",
-    description:
-      "If set, store cookies received during requests to the file specified by http.cookieFile. Has no effect if http.cookieFile is unset",
-  },
-  {
-    name: "http.schannelCheckRevoke",
-    description:
-      'Used to enforce or disable certificate revocation checks in cURL when http.sslBackend is set to "schannel". Defaults to `true` if unset. Only necessary to disable this if Git consistently errors and the message is about checking the revocation status of a certificate. This option is ignored if cURL lacks support for setting the relevant SSL option at runtime',
-  },
-  {
-    name: "http.schannelUseSSLCAInfo",
-    description:
-      "As of cURL v7.60.0, the Secure Channel backend can use the certificate bundle provided via `http.sslCAInfo`, but that would override the Windows Certificate Store. Since this is not desirable by default, Git will tell cURL not to use that bundle by default when the `schannel` backend was configured via `http.sslBackend`, unless `http.schannelUseSSLCAInfo` overrides this behavior",
-  },
-  {
-    name: "http.sslBackend",
-    description:
-      'Name of the SSL backend to use (e.g. "openssl" or "schannel"). This option is ignored if cURL lacks support for choosing the SSL backend at runtime',
-  },
-  {
-    name: "http.sslCAInfo",
-    description:
-      "File containing the certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAINFO` environment variable",
-  },
-  {
-    name: "http.sslCAPath",
-    description:
-      "Path containing files with the CA certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAPATH` environment variable",
-  },
-  {
-    name: "http.sslCert",
-    description:
-      "File containing the SSL certificate when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CERT` environment variable",
-  },
-  {
-    name: "http.sslCertPasswordProtected",
-    description:
-      "Enable Git's password prompt for the SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the `GIT_SSL_CERT_PASSWORD_PROTECTED` environment variable",
-  },
-  {
-    name: "http.sslKey",
-    description:
-      "File containing the SSL private key when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_KEY` environment variable",
-  },
-  {
-    name: "http.sslTry",
-    description:
-      "Attempt to use AUTH SSL/TLS and encrypted data transfers when connecting via regular FTP protocol. This might be needed if the FTP server requires it for security reasons or you wish to connect securely whenever remote FTP server supports it. Default is false since it might trigger certificate verification errors on misconfigured servers",
-  },
-  {
-    name: "http.sslVerify",
-    description:
-      "Whether to verify the SSL certificate when fetching or pushing over HTTPS. Defaults to true. Can be overridden by the `GIT_SSL_NO_VERIFY` environment variable",
-  },
-  {
-    name: "http.sslVersion",
-    description:
-      "The SSL version to use when negotiating an SSL connection, if you want to force the default. The available and default version depend on whether libcurl was built against NSS or OpenSSL and the particular configuration of the crypto library in use. Internally this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl documentation for more details on the format of this option and for the ssl version supported. Currently the possible values of this option are:",
-  },
-  {
-    name: "http.userAgent",
-    description:
-      "The HTTP USER_AGENT string presented to an HTTP server. The default value represents the version of the client Git such as git/1.7.1. This option allows you to override this value to a more common value such as Mozilla/4.0. This may be necessary, for instance, if connecting through a firewall that restricts HTTP connections to a set of common USER_AGENT strings (but not including those like git/1.7.1). Can be overridden by the `GIT_HTTP_USER_AGENT` environment variable",
-  },
-  {
-    name: "http.version",
-    description:
-      "Use the specified HTTP protocol version when communicating with a server. If you want to force the default. The available and default version depend on libcurl. Currently the possible values of this option are:",
-  },
-  {
-    name: "http.<url>.cookieFile",
-    insertValue: "http.{cursor}.cookieFile",
-    description:
-      "The pathname of a file containing previously stored cookie lines, which should be used in the Git http session, if they match the server. The file format of the file to read cookies from should be plain HTTP headers or the Netscape/Mozilla cookie file format (see `curl(1)`). NOTE that the file specified with http.cookieFile is used only as input unless http.saveCookies is set",
-  },
-  {
-    name: "http.<url>.curloptResolve",
-    insertValue: "http.{cursor}.curloptResolve",
-    description:
-      "Hostname resolution information that will be used first by libcurl when sending HTTP requests. This information should be in one of the following formats:",
-  },
-  {
-    name: "http.<url>.delegation",
-    insertValue: "http.{cursor}.delegation",
-    description:
-      "Control GSSAPI credential delegation. The delegation is disabled by default in libcurl since version 7.21.7. Set parameter to tell the server what it is allowed to delegate when it comes to user credentials. Used with GSS/kerberos. Possible values are:",
-  },
-  {
-    name: "http.<url>.emptyAuth",
-    insertValue: "http.{cursor}.emptyAuth",
-    description:
-      "Attempt authentication without seeking a username or password. This can be used to attempt GSS-Negotiate authentication without specifying a username in the URL, as libcurl normally requires a username for authentication",
-  },
-  {
-    name: "http.<url>.extraHeader",
-    insertValue: "http.{cursor}.extraHeader",
-    description:
-      "Pass an additional HTTP header when communicating with a server. If more than one such entry exists, all of them are added as extra headers. To allow overriding the settings inherited from the system config, an empty value will reset the extra headers to the empty list",
-  },
-  {
-    name: "http.<url>.followRedirects",
-    insertValue: "http.{cursor}.followRedirects",
-    description:
-      "Whether git should follow HTTP redirects. If set to `true`, git will transparently follow any redirect issued by a server it encounters. If set to `false`, git will treat all redirects as errors. If set to `initial`, git will follow redirects only for the initial request to a remote, but not for subsequent follow-up HTTP requests. Since git uses the redirected URL as the base for the follow-up requests, this is generally sufficient. The default is `initial`",
-  },
-  {
-    name: "http.<url>.lowSpeedLimit",
-    insertValue: "http.{cursor}.lowSpeedLimit",
-    description:
-      "If the HTTP transfer speed is less than 'http.lowSpeedLimit' for longer than 'http.lowSpeedTime' seconds, the transfer is aborted. Can be overridden by the `GIT_HTTP_LOW_SPEED_LIMIT` and `GIT_HTTP_LOW_SPEED_TIME` environment variables",
-  },
-  {
-    name: "http.<url>.maxRequests",
-    insertValue: "http.{cursor}.maxRequests",
-    description:
-      "How many HTTP requests to launch in parallel. Can be overridden by the `GIT_HTTP_MAX_REQUESTS` environment variable. Default is 5",
-  },
-  {
-    name: "http.<url>.minSessions",
-    insertValue: "http.{cursor}.minSessions",
-    description:
-      "The number of curl sessions (counted across slots) to be kept across requests. They will not be ended with curl_easy_cleanup() until http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this value will be capped at 1. Defaults to 1",
-  },
-  {
-    name: "http.<url>.noEPSV",
-    insertValue: "http.{cursor}.noEPSV",
-    description:
-      'A boolean which disables using of EPSV ftp command by curl. This can helpful with some "poor" ftp servers which don\'t support EPSV mode. Can be overridden by the `GIT_CURL_FTP_NO_EPSV` environment variable. Default is false (curl will use EPSV)',
-  },
-  {
-    name: "http.<url>.pinnedPubkey",
-    insertValue: "http.{cursor}.pinnedPubkey",
-    description:
-      "Public key of the https service. It may either be the filename of a PEM or DER encoded public key file or a string starting with 'sha256//' followed by the base64 encoded sha256 hash of the public key. See also libcurl 'CURLOPT_PINNEDPUBLICKEY'. git will exit with an error if this option is set but not supported by cURL",
-  },
-  {
-    name: "http.<url>.postBuffer",
-    insertValue: "http.{cursor}.postBuffer",
-    description:
-      "Maximum size in bytes of the buffer used by smart HTTP transports when POSTing data to the remote system. For requests larger than this buffer size, HTTP/1.1 and Transfer-Encoding: chunked is used to avoid creating a massive pack file locally. Default is 1 MiB, which is sufficient for most requests",
-  },
-  {
-    name: "http.<url>.proxy",
-    insertValue: "http.{cursor}.proxy",
-    description:
-      "Override the HTTP proxy, normally configured using the 'http_proxy', 'https_proxy', and 'all_proxy' environment variables (see `curl(1)`). In addition to the syntax understood by curl, it is possible to specify a proxy string with a user name but no password, in which case git will attempt to acquire one in the same way it does for other credentials. See gitcredentials[7] for more information. The syntax thus is '[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden on a per-remote basis; see remote.<name>.proxy",
-  },
-  {
-    name: "http.<url>.proxyAuthMethod",
-    insertValue: "http.{cursor}.proxyAuthMethod",
-    description:
-      "Set the method with which to authenticate against the HTTP proxy. This only takes effect if the configured proxy string contains a user name part (i.e. is of the form 'user@host' or 'user@host:port'). This can be overridden on a per-remote basis; see `remote.<name>.proxyAuthMethod`. Both can be overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment variable. Possible values are:",
-  },
-  {
-    name: "http.<url>.proxySSLCAInfo",
-    insertValue: "http.{cursor}.proxySSLCAInfo",
-    description:
-      "Pathname to the file containing the certificate bundle that should be used to verify the proxy with when using an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CAINFO` environment variable",
-  },
-  {
-    name: "http.<url>.proxySSLCert",
-    insertValue: "http.{cursor}.proxySSLCert",
-    description:
-      "The pathname of a file that stores a client certificate to use to authenticate with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CERT` environment variable",
-  },
-  {
-    name: "http.<url>.proxySSLCertPasswordProtected",
-    insertValue: "http.{cursor}.proxySSLCertPasswordProtected",
-    description:
-      "Enable Git's password prompt for the proxy SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED` environment variable",
-  },
-  {
-    name: "http.<url>.proxySSLKey",
-    insertValue: "http.{cursor}.proxySSLKey",
-    description:
-      "The pathname of a file that stores a private key to use to authenticate with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_KEY` environment variable",
-  },
-  {
-    name: "http.<url>.saveCookies",
-    insertValue: "http.{cursor}.saveCookies",
-    description:
-      "If set, store cookies received during requests to the file specified by http.cookieFile. Has no effect if http.cookieFile is unset",
-  },
-  {
-    name: "http.<url>.schannelCheckRevoke",
-    insertValue: "http.{cursor}.schannelCheckRevoke",
-    description:
-      'Used to enforce or disable certificate revocation checks in cURL when http.sslBackend is set to "schannel". Defaults to `true` if unset. Only necessary to disable this if Git consistently errors and the message is about checking the revocation status of a certificate. This option is ignored if cURL lacks support for setting the relevant SSL option at runtime',
-  },
-  {
-    name: "http.<url>.schannelUseSSLCAInfo",
-    insertValue: "http.{cursor}.schannelUseSSLCAInfo",
-    description:
-      "As of cURL v7.60.0, the Secure Channel backend can use the certificate bundle provided via `http.sslCAInfo`, but that would override the Windows Certificate Store. Since this is not desirable by default, Git will tell cURL not to use that bundle by default when the `schannel` backend was configured via `http.sslBackend`, unless `http.schannelUseSSLCAInfo` overrides this behavior",
-  },
-  {
-    name: "http.<url>.sslBackend",
-    insertValue: "http.{cursor}.sslBackend",
-    description:
-      'Name of the SSL backend to use (e.g. "openssl" or "schannel"). This option is ignored if cURL lacks support for choosing the SSL backend at runtime',
-  },
-  {
-    name: "http.<url>.sslCAInfo",
-    insertValue: "http.{cursor}.sslCAInfo",
-    description:
-      "File containing the certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAINFO` environment variable",
-  },
-  {
-    name: "http.<url>.sslCAPath",
-    insertValue: "http.{cursor}.sslCAPath",
-    description:
-      "Path containing files with the CA certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAPATH` environment variable",
-  },
-  {
-    name: "http.<url>.sslCert",
-    insertValue: "http.{cursor}.sslCert",
-    description:
-      "File containing the SSL certificate when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CERT` environment variable",
-  },
-  {
-    name: "http.<url>.sslCertPasswordProtected",
-    insertValue: "http.{cursor}.sslCertPasswordProtected",
-    description:
-      "Enable Git's password prompt for the SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the `GIT_SSL_CERT_PASSWORD_PROTECTED` environment variable",
-  },
-  {
-    name: "http.<url>.sslKey",
-    insertValue: "http.{cursor}.sslKey",
-    description:
-      "File containing the SSL private key when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_KEY` environment variable",
-  },
-  {
-    name: "http.<url>.sslTry",
-    insertValue: "http.{cursor}.sslTry",
-    description:
-      "Attempt to use AUTH SSL/TLS and encrypted data transfers when connecting via regular FTP protocol. This might be needed if the FTP server requires it for security reasons or you wish to connect securely whenever remote FTP server supports it. Default is false since it might trigger certificate verification errors on misconfigured servers",
-  },
-  {
-    name: "http.<url>.sslVerify",
-    insertValue: "http.{cursor}.sslVerify",
-    description:
-      "Whether to verify the SSL certificate when fetching or pushing over HTTPS. Defaults to true. Can be overridden by the `GIT_SSL_NO_VERIFY` environment variable",
-  },
-  {
-    name: "http.<url>.sslVersion",
-    insertValue: "http.{cursor}.sslVersion",
-    description:
-      "The SSL version to use when negotiating an SSL connection, if you want to force the default. The available and default version depend on whether libcurl was built against NSS or OpenSSL and the particular configuration of the crypto library in use. Internally this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl documentation for more details on the format of this option and for the ssl version supported. Currently the possible values of this option are:",
-  },
-  {
-    name: "http.<url>.userAgent",
-    insertValue: "http.{cursor}.userAgent",
-    description:
-      "The HTTP USER_AGENT string presented to an HTTP server. The default value represents the version of the client Git such as git/1.7.1. This option allows you to override this value to a more common value such as Mozilla/4.0. This may be necessary, for instance, if connecting through a firewall that restricts HTTP connections to a set of common USER_AGENT strings (but not including those like git/1.7.1). Can be overridden by the `GIT_HTTP_USER_AGENT` environment variable",
-  },
-  {
-    name: "http.<url>.version",
-    insertValue: "http.{cursor}.version",
-    description:
-      "Use the specified HTTP protocol version when communicating with a server. If you want to force the default. The available and default version depend on libcurl. Currently the possible values of this option are:",
-  },
-  {
-    name: "i18n.commitEncoding",
-    description:
-      "Character encoding the commit messages are stored in; Git itself does not care per se, but this information is necessary e.g. when importing commits from emails or in the gitk graphical history browser (and possibly at other places in the future or in other porcelains). See e.g. git-mailinfo[1]. Defaults to 'utf-8'",
-  },
-  {
-    name: "i18n.logOutputEncoding",
-    description:
-      "Character encoding the commit messages are converted to when running 'git log' and friends",
-  },
-  {
-    name: "imap.authMethod",
-    description:
-      "Specify authenticate method for authentication with IMAP server. If Git was built with the NO_CURL option, or if your curl version is older than 7.34.0, or if you're running git-imap-send with the `--no-curl` option, the only supported method is 'CRAM-MD5'. If this is not set then 'git imap-send' uses the basic IMAP plaintext LOGIN command",
-  },
-  {
-    name: "imap.folder",
-    description:
-      'The folder to drop the mails into, which is typically the Drafts folder. For example: "INBOX.Drafts", "INBOX/Drafts" or "[Gmail]/Drafts". Required',
-  },
-  {
-    name: "imap.host",
-    description:
-      "A URL identifying the server. Use an `imap://` prefix for non-secure connections and an `imaps://` prefix for secure connections. Ignored when imap.tunnel is set, but required otherwise",
-  },
-  {
-    name: "imap.pass",
-    description: "The password to use when logging in to the server",
-  },
-  {
-    name: "imap.port",
-    description:
-      "An integer port number to connect to on the server. Defaults to 143 for imap:// hosts and 993 for imaps:// hosts. Ignored when imap.tunnel is set",
-  },
-  {
-    name: "imap.preformattedHTML",
-    description:
-      "A boolean to enable/disable the use of html encoding when sending a patch. An html encoded patch will be bracketed with <pre> and have a content type of text/html. Ironically, enabling this option causes Thunderbird to send the patch as a plain/text, format=fixed email. Default is `false`",
-  },
-  {
-    name: "imap.sslverify",
-    description:
-      "A boolean to enable/disable verification of the server certificate used by the SSL/TLS connection. Default is `true`. Ignored when imap.tunnel is set",
-  },
-  {
-    name: "imap.tunnel",
-    description:
-      "Command used to setup a tunnel to the IMAP server through which commands will be piped instead of using a direct network connection to the server. Required when imap.host is not set",
-  },
-  {
-    name: "imap.user",
-    description: "The username to use when logging in to the server",
-  },
-  {
-    name: "includeIf.<condition>.path",
-    insertValue: "includeIf.{cursor}.path",
-    description:
-      'Special variables to include other configuration files. See the "CONFIGURATION FILE" section in the main git-config[1] documentation, specifically the "Includes" and "Conditional Includes" subsections',
-  },
-  {
-    name: "index.recordEndOfIndexEntries",
-    description:
-      "Specifies whether the index file should include an \"End Of Index Entry\" section. This reduces index load time on multiprocessor machines but produces a message \"ignoring EOIE extension\" when reading the index using Git versions before 2.20. Defaults to 'true' if index.threads has been explicitly enabled, 'false' otherwise",
-  },
-  {
-    name: "index.recordOffsetTable",
-    description:
-      "Specifies whether the index file should include an \"Index Entry Offset Table\" section. This reduces index load time on multiprocessor machines but produces a message \"ignoring IEOT extension\" when reading the index using Git versions before 2.20. Defaults to 'true' if index.threads has been explicitly enabled, 'false' otherwise",
-  },
-  {
-    name: "index.sparse",
-    description:
-      "When enabled, write the index using sparse-directory entries. This has no effect unless `core.sparseCheckout` and `core.sparseCheckoutCone` are both enabled. Defaults to 'false'",
-  },
-  {
-    name: "index.threads",
-    description:
-      "Specifies the number of threads to spawn when loading the index. This is meant to reduce index load time on multiprocessor machines. Specifying 0 or 'true' will cause Git to auto-detect the number of CPU's and set the number of threads accordingly. Specifying 1 or 'false' will disable multithreading. Defaults to 'true'",
-  },
-  {
-    name: "index.version",
-    description:
-      "Specify the version with which new index files should be initialized. This does not affect existing repositories. If `feature.manyFiles` is enabled, then the default is 4",
-  },
-  {
-    name: "init.defaultBranch",
-    description:
-      "Allows overriding the default branch name e.g. when initializing a new repository",
-  },
-  {
-    name: "init.templateDir",
-    description:
-      'Specify the directory from which templates will be copied. (See the "TEMPLATE DIRECTORY" section of git-init[1].)',
-  },
-  {
-    name: "instaweb.browser",
-    description:
-      "Specify the program that will be used to browse your working repository in gitweb. See git-instaweb[1]",
-  },
-  {
-    name: "instaweb.httpd",
-    description:
-      "The HTTP daemon command-line to start gitweb on your working repository. See git-instaweb[1]",
-  },
-  {
-    name: "instaweb.local",
-    description:
-      "If true the web server started by git-instaweb[1] will be bound to the local IP (127.0.0.1)",
-  },
-  {
-    name: "instaweb.modulePath",
-    description:
-      "The default module path for git-instaweb[1] to use instead of /usr/lib/apache2/modules. Only used if httpd is Apache",
-  },
-  {
-    name: "instaweb.port",
-    description:
-      "The port number to bind the gitweb httpd to. See git-instaweb[1]",
-  },
-  {
-    name: "interactive.diffFilter",
-    description:
-      "When an interactive command (such as `git add --patch`) shows a colorized diff, git will pipe the diff through the shell command defined by this configuration variable. The command may mark up the diff further for human consumption, provided that it retains a one-to-one correspondence with the lines in the original diff. Defaults to disabled (no filtering)",
-  },
-  {
-    name: "interactive.singleKey",
-    description:
-      "In interactive commands, allow the user to provide one-letter input with a single key (i.e., without hitting enter). Currently this is used by the `--patch` mode of git-add[1], git-checkout[1], git-restore[1], git-commit[1], git-reset[1], and git-stash[1]. Note that this setting is silently ignored if portable keystroke input is not available; requires the Perl module Term::ReadKey",
-  },
-  {
-    name: "log.abbrevCommit",
-    description:
-      "If true, makes git-log[1], git-show[1], and git-whatchanged[1] assume `--abbrev-commit`. You may override this option with `--no-abbrev-commit`",
-  },
-  {
-    name: "log.date",
-    description:
-      "Set the default date-time mode for the 'log' command. Setting a value for log.date is similar to using 'git log''s `--date` option. See git-log[1] for details",
-  },
-  {
-    name: "log.decorate",
-    description:
-      "Print out the ref names of any commits that are shown by the log command. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. This is the same as the `--decorate` option of the `git log`",
-  },
-  {
-    name: "log.diffMerges",
-    description:
-      "Set default diff format to be used for merge commits. See `--diff-merges` in git-log[1] for details. Defaults to `separate`",
-  },
-  {
-    name: "log.excludeDecoration",
-    description:
-      "Exclude the specified patterns from the log decorations. This is similar to the `--decorate-refs-exclude` command-line option, but the config option can be overridden by the `--decorate-refs` option",
-  },
-  {
-    name: "log.follow",
-    description:
-      "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given. This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history",
-  },
-  {
-    name: "log.graphColors",
-    description:
-      "A list of colors, separated by commas, that can be used to draw history lines in `git log --graph`",
-  },
-  {
-    name: "log.initialDecorationSet",
-    description:
-      "By default, `git log` only shows decorations for certain known ref namespaces. If 'all' is specified, then show all refs as decorations",
-  },
-  {
-    name: "log.mailmap",
-    description:
-      "If true, makes git-log[1], git-show[1], and git-whatchanged[1] assume `--use-mailmap`, otherwise assume `--no-use-mailmap`. True by default",
-  },
-  {
-    name: "log.showRoot",
-    description:
-      "If true, the initial commit will be shown as a big creation event. This is equivalent to a diff against an empty tree. Tools like git-log[1] or git-whatchanged[1], which normally hide the root commit will now show it. True by default",
-  },
-  {
-    name: "log.showSignature",
-    description:
-      "If true, makes git-log[1], git-show[1], and git-whatchanged[1] assume `--show-signature`",
-  },
-  {
-    name: "lsrefs.unborn",
-    description:
-      'May be "advertise" (the default), "allow", or "ignore". If "advertise", the server will respond to the client sending "unborn" (as described in gitprotocol-v2[5]) and will advertise support for this feature during the protocol v2 capability advertisement. "allow" is the same as "advertise" except that the server will not advertise support for this feature; this is useful for load-balanced servers that cannot be updated atomically (for example), since the administrator could configure "allow", then after a delay, configure "advertise"',
-  },
-  {
-    name: "mailinfo.scissors",
-    description:
-      'If true, makes git-mailinfo[1] (and therefore git-am[1]) act by default as if the --scissors option was provided on the command-line. When active, this features removes everything from the message body before a scissors line (i.e. consisting mainly of ">8", "8<" and "-")',
-  },
-  {
-    name: "mailmap.blob",
-    description:
-      "Like `mailmap.file`, but consider the value as a reference to a blob in the repository. If both `mailmap.file` and `mailmap.blob` are given, both are parsed, with entries from `mailmap.file` taking precedence. In a bare repository, this defaults to `HEAD:.mailmap`. In a non-bare repository, it defaults to empty",
-  },
-  {
-    name: "mailmap.file",
-    description:
-      "The location of an augmenting mailmap file. The default mailmap, located in the root of the repository, is loaded first, then the mailmap file pointed to by this variable. The location of the mailmap file may be in a repository subdirectory, or somewhere outside of the repository itself. See git-shortlog[1] and git-blame[1]",
-  },
-  {
-    name: "maintenance.<task>.enabled",
-    insertValue: "maintenance.{cursor}.enabled",
-    description:
-      "This boolean config option controls whether the maintenance task with name `<task>` is run when no `--task` option is specified to `git maintenance run`. These config values are ignored if a `--task` option exists. By default, only `maintenance.gc.enabled` is true",
-  },
-  {
-    name: "maintenance.<task>.schedule",
-    insertValue: "maintenance.{cursor}.schedule",
-    description:
-      'This config option controls whether or not the given `<task>` runs during a `git maintenance run --schedule=<frequency>` command. The value must be one of "hourly", "daily", or "weekly"',
-  },
-  {
-    name: "maintenance.auto",
-    description:
-      "This boolean config option controls whether some commands run `git maintenance run --auto` after doing their normal work. Defaults to true",
-  },
-  {
-    name: "maintenance.commit-graph.auto",
-    description:
-      "This integer config option controls how often the `commit-graph` task should be run as part of `git maintenance run --auto`. If zero, then the `commit-graph` task will not run with the `--auto` option. A negative value will force the task to run every time. Otherwise, a positive value implies the command should run when the number of reachable commits that are not in the commit-graph file is at least the value of `maintenance.commit-graph.auto`. The default value is 100",
-  },
-  {
-    name: "maintenance.incremental-repack.auto",
-    description:
-      "This integer config option controls how often the `incremental-repack` task should be run as part of `git maintenance run --auto`. If zero, then the `incremental-repack` task will not run with the `--auto` option. A negative value will force the task to run every time. Otherwise, a positive value implies the command should run when the number of pack-files not in the multi-pack-index is at least the value of `maintenance.incremental-repack.auto`. The default value is 10",
-  },
-  {
-    name: "maintenance.loose-objects.auto",
-    description:
-      "This integer config option controls how often the `loose-objects` task should be run as part of `git maintenance run --auto`. If zero, then the `loose-objects` task will not run with the `--auto` option. A negative value will force the task to run every time. Otherwise, a positive value implies the command should run when the number of loose objects is at least the value of `maintenance.loose-objects.auto`. The default value is 100",
-  },
-  {
-    name: "maintenance.strategy",
-    description:
-      "This string config option provides a way to specify one of a few recommended schedules for background maintenance. This only affects which tasks are run during `git maintenance run --schedule=X` commands, provided no `--task=<task>` arguments are provided. Further, if a `maintenance.<task>.schedule` config value is set, then that value is used instead of the one provided by `maintenance.strategy`. The possible strategy strings are:",
-  },
-  {
-    name: "man.<tool>.cmd",
-    insertValue: "man.{cursor}.cmd",
-    description:
-      "Specify the command to invoke the specified man viewer. The specified command is evaluated in shell with the man page passed as argument. (See git-help[1].)",
-  },
-  {
-    name: "man.<tool>.path",
-    insertValue: "man.{cursor}.path",
-    description:
-      "Override the path for the given tool that may be used to display help in the 'man' format. See git-help[1]",
-  },
-  {
-    name: "man.viewer",
-    description:
-      "Specify the programs that may be used to display help in the 'man' format. See git-help[1]",
-  },
-  {
-    name: "merge.<driver>.driver",
-    insertValue: "merge.{cursor}.driver",
-    description:
-      "Defines the command that implements a custom low-level merge driver. See gitattributes[5] for details",
-  },
-  {
-    name: "merge.<driver>.name",
-    insertValue: "merge.{cursor}.name",
-    description:
-      "Defines a human-readable name for a custom low-level merge driver. See gitattributes[5] for details",
-  },
-  {
-    name: "merge.<driver>.recursive",
-    insertValue: "merge.{cursor}.recursive",
-    description:
-      "Names a low-level merge driver to be used when performing an internal merge between common ancestors. See gitattributes[5] for details",
-  },
-  {
-    name: "merge.autoStash",
-    description:
-      "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run merge on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts. This option can be overridden by the `--no-autostash` and `--autostash` options of git-merge[1]. Defaults to false",
-  },
-  {
-    name: "merge.branchdesc",
-    description:
-      "In addition to branch names, populate the log message with the branch description text associated with them. Defaults to false",
-  },
-  {
-    name: "merge.conflictStyle",
-    description:
-      'Specify the style in which conflicted hunks are written out to working tree files upon merge. The default is "merge", which shows a `<<<<<<<` conflict marker, changes made by one side, a `=======` marker, changes made by the other side, and then a `>>>>>>>` marker. An alternate style, "diff3", adds a `|||||||` marker and the original text before the `=======` marker. The "merge" style tends to produce smaller conflict regions than diff3, both because of the exclusion of the original text, and because when a subset of lines match on the two sides they are just pulled out of the conflict region. Another alternate style, "zdiff3", is similar to diff3 but removes matching lines on the two sides from the conflict region when those matching lines appear near either the beginning or end of a conflict region',
-  },
-  {
-    name: "merge.defaultToUpstream",
-    description:
-      "If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last observed values stored in their remote-tracking branches. The values of the `branch.<current branch>.merge` that name the branches at the remote named by `branch.<current branch>.remote` are consulted, and then they are mapped via `remote.<remote>.fetch` to their corresponding remote-tracking branches, and the tips of these tracking branches are merged. Defaults to true",
-  },
-  {
-    name: "merge.directoryRenames",
-    description:
-      'Whether Git detects directory renames, affecting what happens at merge time to new files added to a directory on one side of history when that directory was renamed on the other side of history. If merge.directoryRenames is set to "false", directory rename detection is disabled, meaning that such new files will be left behind in the old directory. If set to "true", directory rename detection is enabled, meaning that such new files will be moved into the new directory. If set to "conflict", a conflict will be reported for such paths. If merge.renames is false, merge.directoryRenames is ignored and treated as false. Defaults to "conflict"',
-  },
-  {
-    name: "merge.ff",
-    description:
-      "By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to `false`, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the `--no-ff` option from the command line). When set to `only`, only such fast-forward merges are allowed (equivalent to giving the `--ff-only` option from the command line)",
-  },
-  {
-    name: "merge.guitool",
-    description:
-      "Controls which merge tool is used by git-mergetool[1] when the -g/--gui flag is specified. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<guitool>.cmd variable is defined",
-  },
-  {
-    name: "merge.log",
-    description:
-      "In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20",
-  },
-  {
-    name: "merge.renameLimit",
-    description:
-      "The number of files to consider in the exhaustive portion of rename detection during a merge. If not specified, defaults to the value of diff.renameLimit. If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000. This setting has no effect if rename detection is turned off",
-  },
-  {
-    name: "merge.renames",
-    description:
-      'Whether Git detects renames. If set to "false", rename detection is disabled. If set to "true", basic rename detection is enabled. Defaults to the value of diff.renames',
-  },
-  {
-    name: "merge.renormalize",
-    description:
-      'Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line endings). In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section "Merging branches with differing checkin/checkout attributes" in gitattributes[5]',
-  },
-  {
-    name: "merge.stat",
-    description:
-      "Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default",
-  },
-  {
-    name: "merge.suppressDest",
-    description:
-      'By adding a glob that matches the names of integration branches to this multi-valued configuration variable, the default merge message computed for merges into these integration branches will omit "into <branch name>" from its title',
-  },
-  {
-    name: "merge.tool",
-    description:
-      "Controls which merge tool is used by git-mergetool[1]. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<tool>.cmd variable is defined",
-  },
-  {
-    name: "merge.verbosity",
-    description:
-      "Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable",
-  },
-  {
-    name: "merge.verifySignatures",
-    description:
-      "If true, this is equivalent to the --verify-signatures command line option. See git-merge[1] for details",
-  },
-  {
-    name: "mergetool.<tool>.cmd",
-    insertValue: "mergetool.{cursor}.cmd",
-    description:
-      "Specify the command to invoke the specified merge tool. The specified command is evaluated in shell with the following variables available: 'BASE' is the name of a temporary file containing the common base of the files to be merged, if available; 'LOCAL' is the name of a temporary file containing the contents of the file on the current branch; 'REMOTE' is the name of a temporary file containing the contents of the file from the branch being merged; 'MERGED' contains the name of the file to which the merge tool should write the results of a successful merge",
-  },
-  {
-    name: "mergetool.<tool>.hideResolved",
-    insertValue: "mergetool.{cursor}.hideResolved",
-    description:
-      "Allows the user to override the global `mergetool.hideResolved` value for a specific tool. See `mergetool.hideResolved` for the full description",
-  },
-  {
-    name: "mergetool.<tool>.path",
-    insertValue: "mergetool.{cursor}.path",
-    description:
-      "Override the path for the given tool. This is useful in case your tool is not in the PATH",
-  },
-  {
-    name: "mergetool.<tool>.trustExitCode",
-    insertValue: "mergetool.{cursor}.trustExitCode",
-    description:
-      "For a custom merge command, specify whether the exit code of the merge command can be used to determine whether the merge was successful. If this is not set to true then the merge target file timestamp is checked and the merge assumed to have been successful if the file has been updated, otherwise the user is prompted to indicate the success of the merge",
-  },
-  {
-    name: "mergetool.hideResolved",
-    description:
-      "During a merge Git will automatically resolve as many conflicts as possible and write the 'MERGED' file containing conflict markers around any conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally represent the versions of the file from before Git's conflict resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so that only the unresolved conflicts are presented to the merge tool. Can be configured per-tool via the `mergetool.<tool>.hideResolved` configuration variable. Defaults to `false`",
-  },
-  {
-    name: "mergetool.keepBackup",
-    description:
-      "After performing a merge, the original file with conflict markers can be saved as a file with a `.orig` extension. If this variable is set to `false` then this file is not preserved. Defaults to `true` (i.e. keep the backup files)",
-  },
-  {
-    name: "mergetool.keepTemporaries",
-    description:
-      "When invoking a custom merge tool, Git uses a set of temporary files to pass to the tool. If the tool returns an error and this variable is set to `true`, then these temporary files will be preserved, otherwise they will be removed after the tool has exited. Defaults to `false`",
-  },
-  {
-    name: "mergetool.meld.hasOutput",
-    description:
-      "Older versions of `meld` do not support the `--output` option. Git will attempt to detect whether `meld` supports `--output` by inspecting the output of `meld --help`. Configuring `mergetool.meld.hasOutput` will make Git skip these checks and use the configured value instead. Setting `mergetool.meld.hasOutput` to `true` tells Git to unconditionally use the `--output` option, and `false` avoids using `--output`",
-  },
-  {
-    name: "mergetool.meld.useAutoMerge",
-    description:
-      "When the `--auto-merge` is given, meld will merge all non-conflicting parts automatically, highlight the conflicting parts and wait for user decision. Setting `mergetool.meld.useAutoMerge` to `true` tells Git to unconditionally use the `--auto-merge` option with `meld`. Setting this value to `auto` makes git detect whether `--auto-merge` is supported and will only use `--auto-merge` when available. A value of `false` avoids using `--auto-merge` altogether, and is the default value",
-  },
-  {
-    name: "mergetool.prompt",
-    description:
-      "Prompt before each invocation of the merge resolution program",
-  },
-  {
-    name: "mergetool.vimdiff.layout",
-    description:
-      "The vimdiff backend uses this variable to control how its split windows look like. Applies even if you are using Neovim (`nvim`) or gVim (`gvim`) as the merge tool. See BACKEND SPECIFIC HINTS section",
-  },
-  {
-    name: "mergetool.writeToTemp",
-    description:
-      "Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of conflicting files in the worktree by default. Git will attempt to use a temporary directory for these files when set `true`. Defaults to `false`",
-  },
-  {
-    name: "notes.<name>.mergeStrategy",
-    insertValue: "notes.{cursor}.mergeStrategy",
-    description:
-      'Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in git-notes[1] for more information on the available strategies',
-  },
-  {
-    name: "notes.displayRef",
-    description:
-      "The (fully qualified) refname from which to show notes when showing commit messages. The value of this variable can be set to a glob, in which case notes from all matching refs will be shown. You may also specify this configuration variable several times. A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored",
-  },
-  {
-    name: "notes.mergeStrategy",
-    description:
-      'Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See "NOTES MERGE STRATEGIES" section of git-notes[1] for more information on each strategy',
-  },
-  {
-    name: "notes.rewrite.<command>",
-    insertValue: "notes.rewrite.{cursor}",
-    description:
-      'When rewriting commits with <command> (currently `amend` or `rebase`) and this variable is set to `true`, Git automatically copies your notes from the original to the rewritten commit. Defaults to `true`, but see "notes.rewriteRef" below',
-  },
-  {
-    name: "notes.rewriteMode",
-    description:
-      'When copying notes during a rewrite (see the "notes.rewrite.<command>" option), determines what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`',
-  },
-  {
-    name: "notes.rewriteRef",
-    description:
-      "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. The ref may be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times",
-  },
-  {
-    name: "pack.allowPackReuse",
-    description:
-      "When true, and when reachability bitmaps are enabled, pack-objects will try to send parts of the bitmapped packfile verbatim. This can reduce memory and CPU usage to serve fetches, but might result in sending a slightly larger pack. Defaults to true",
-  },
-  {
-    name: "pack.compression",
-    description:
-      'An integer -1..9, indicating the compression level for objects in a pack file. -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If not set, defaults to core.compression. If that is not set, defaults to -1, the zlib default, which is "a default compromise between speed and compression (currently equivalent to level 6)"',
-  },
-  {
-    name: "pack.deltaCacheLimit",
-    description:
-      "The maximum size of a delta, that is cached in git-pack-objects[1]. This cache is used to speed up the writing object phase by not having to recompute the final delta result once the best match for all objects is found. Defaults to 1000. Maximum value is 65535",
-  },
-  {
-    name: "pack.deltaCacheSize",
-    description:
-      "The maximum memory in bytes used for caching deltas in git-pack-objects[1] before writing them out to a pack. This cache is used to speed up the writing object phase by not having to recompute the final delta result once the best match for all objects is found. Repacking large repositories on machines which are tight with memory might be badly impacted by this though, especially if this cache pushes the system into swapping. A value of 0 means no limit. The smallest size of 1 byte may be used to virtually disable this cache. Defaults to 256 MiB",
-  },
-  {
-    name: "pack.depth",
-    description:
-      "The maximum delta depth used by git-pack-objects[1] when no maximum depth is given on the command line. Defaults to 50. Maximum value is 4095",
-  },
-  {
-    name: "pack.indexVersion",
-    description:
-      "Specify the default pack index version. Valid values are 1 for legacy pack index used by Git versions prior to 1.5.2, and 2 for the new pack index with capabilities for packs larger than 4 GB as well as proper protection against the repacking of corrupted packs. Version 2 is the default. Note that version 2 is enforced and this config option ignored whenever the corresponding pack is larger than 2 GB",
-  },
-  {
-    name: "pack.island",
-    description:
-      'An extended regular expression configuring a set of delta islands. See "DELTA ISLANDS" in git-pack-objects[1] for details',
-  },
-  {
-    name: "pack.islandCore",
-    description:
-      'Specify an island name which gets to have its objects be packed first. This creates a kind of pseudo-pack at the front of one pack, so that the objects from the specified island are hopefully faster to copy into any pack that should be served to a user requesting these objects. In practice this means that the island specified should likely correspond to what is the most commonly cloned in the repo. See also "DELTA ISLANDS" in git-pack-objects[1]',
-  },
-  {
-    name: "pack.packSizeLimit",
-    description:
-      "The maximum size of a pack. This setting only affects packing to a file when repacking, i.e. the git:// protocol is unaffected. It can be overridden by the `--max-pack-size` option of git-repack[1]. Reaching this limit results in the creation of multiple packfiles",
-  },
-  {
-    name: "pack.preferBitmapTips",
-    description:
-      'When selecting which commits will receive bitmaps, prefer a commit at the tip of any reference that is a suffix of any value of this configuration over any other commits in the "selection window"',
-  },
-  {
-    name: "pack.threads",
-    description:
-      "Specifies the number of threads to spawn when searching for best delta matches. This requires that git-pack-objects[1] be compiled with pthreads otherwise this option is ignored with a warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. Specifying 0 will cause Git to auto-detect the number of CPU's and set the number of threads accordingly",
-  },
-  {
-    name: "pack.useBitmaps",
-    description:
-      "When true, git will use pack bitmaps (if available) when packing to stdout (e.g., during the server side of a fetch). Defaults to true. You should not generally need to turn this off unless you are debugging pack bitmaps",
-  },
-  {
-    name: "pack.useSparse",
-    description:
-      "When true, git will default to using the '--sparse' option in 'git pack-objects' when the '--revs' option is present. This algorithm only walks trees that appear in paths that introduce new objects. This can have significant performance benefits when computing a pack to send a small change. However, it is possible that extra objects are added to the pack-file if the included commits contain certain types of direct renames. Default is `true`",
-  },
-  {
-    name: "pack.window",
-    description:
-      "The size of the window used by git-pack-objects[1] when no window size is given on the command line. Defaults to 10",
-  },
-  {
-    name: "pack.windowMemory",
-    description:
-      'The maximum size of memory that is consumed by each thread in git-pack-objects[1] for pack window memory when no limit is given on the command line. The value can be suffixed with "k", "m", or "g". When left unconfigured (or set explicitly to 0), there will be no limit',
-  },
-  {
-    name: "pack.writeBitmapHashCache",
-    description:
-      'When true, git will include a "hash cache" section in the bitmap index (if one is written). This cache can be used to feed git\'s delta heuristics, potentially leading to better deltas between bitmapped and non-bitmapped objects (e.g., when serving a fetch between an older, bitmapped pack and objects that have been pushed since the last gc). The downside is that it consumes 4 bytes per object of disk space. Defaults to true',
-  },
-  {
-    name: "pack.writeBitmapLookupTable",
-    description:
-      'When true, Git will include a "lookup table" section in the bitmap index (if one is written). This table is used to defer loading individual bitmaps as late as possible. This can be beneficial in repositories that have relatively large bitmap indexes. Defaults to false',
-  },
-  {
-    name: "pack.writeBitmaps",
-    description: "This is a deprecated synonym for `repack.writeBitmaps`",
-    deprecated: true,
-    hidden: true,
-  },
-  {
-    name: "pack.writeReverseIndex",
-    description:
-      "When true, git will write a corresponding .rev file (see: gitformat-pack[5]) for each new packfile that it writes in all places except for git-fast-import[1] and in the bulk checkin mechanism. Defaults to false",
-  },
-  {
-    name: "pager.<cmd>",
-    insertValue: "pager.{cursor}",
-    description:
-      "If the value is boolean, turns on or off pagination of the output of a particular Git subcommand when writing to a tty. Otherwise, turns on pagination for the subcommand using the pager specified by the value of `pager.<cmd>`. If `--paginate` or `--no-pager` is specified on the command line, it takes precedence over this option. To disable pagination for all commands, set `core.pager` or `GIT_PAGER` to `cat`",
-  },
-  {
-    name: "pretty.<name>",
-    insertValue: "pretty.{cursor}",
-    description:
-      'Alias for a --pretty= format string, as specified in git-log[1]. Any aliases defined here can be used just as the built-in pretty formats could. For example, running `git config pretty.changelog "format:* %H %s"` would cause the invocation `git log --pretty=changelog` to be equivalent to running `git log "--pretty=format:* %H %s"`. Note that an alias with the same name as a built-in format will be silently ignored',
-  },
-  {
-    name: "protocol.<name>.allow",
-    insertValue: "protocol.{cursor}.allow",
-    description:
-      "Set a policy to be used by protocol `<name>` with clone/fetch/push commands. See `protocol.allow` above for the available policies",
-  },
-  {
-    name: "protocol.allow",
-    description:
-      "If set, provide a user defined default policy for all protocols which don't explicitly have a policy (`protocol.<name>.allow`). By default, if unset, known-safe protocols (http, https, git, ssh, file) have a default policy of `always`, known-dangerous protocols (ext) have a default policy of `never`, and all other protocols have a default policy of `user`. Supported policies:",
-  },
-  {
-    name: "protocol.version",
-    description:
-      "If set, clients will attempt to communicate with a server using the specified protocol version. If the server does not support it, communication falls back to version 0. If unset, the default is `2`. Supported versions:",
-  },
-  {
-    name: "pull.ff",
-    description:
-      "By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to `false`, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the `--no-ff` option from the command line). When set to `only`, only such fast-forward merges are allowed (equivalent to giving the `--ff-only` option from the command line). This setting overrides `merge.ff` when pulling",
-  },
-  {
-    name: "pull.octopus",
-    description:
-      "The default merge strategy to use when pulling multiple branches at once",
-  },
-  {
-    name: "pull.rebase",
-    description:
-      'When true, rebase branches on top of the fetched branch, instead of merging the default branch from the default remote when "git pull" is run. See "branch.<name>.rebase" for setting this on a per-branch basis',
-  },
-  {
-    name: "pull.twohead",
-    description:
-      "The default merge strategy to use when pulling a single branch",
-  },
-  {
-    name: "push.autoSetupRemote",
-    description:
-      "If set to \"true\" assume `--set-upstream` on default push when no upstream tracking exists for the current branch; this option takes effect with push.default options 'simple', 'upstream', and 'current'. It is useful if by default you want new branches to be pushed to the default remote (like the behavior of 'push.default=current') and you also want the upstream tracking to be set. Workflows most likely to benefit from this option are 'simple' central workflows where all branches are expected to have the same name on the remote",
-  },
-  {
-    name: "push.default",
-    description:
-      "Defines the action `git push` should take if no refspec is given (whether from the command-line, config, or elsewhere). Different values are well-suited for specific workflows; for instance, in a purely central workflow (i.e. the fetch source is equal to the push destination), `upstream` is probably what you want. Possible values are:",
-  },
-  {
-    name: "push.followTags",
-    description:
-      "If set to true enable `--follow-tags` option by default. You may override this configuration at time of push by specifying `--no-follow-tags`",
-  },
-  {
-    name: "push.gpgSign",
-    description:
-      "May be set to a boolean value, or the string 'if-asked'. A true value causes all pushes to be GPG signed, as if `--signed` is passed to git-push[1]. The string 'if-asked' causes pushes to be signed if the server supports it, as if `--signed=if-asked` is passed to 'git push'. A false value may override a value from a lower-priority config file. An explicit command-line flag always overrides this config option",
-  },
-  {
-    name: "push.negotiate",
-    description:
-      'If set to "true", attempt to reduce the size of the packfile sent by rounds of negotiation in which the client and the server attempt to find commits in common. If "false", Git will rely solely on the server\'s ref advertisement to find commits in common',
-  },
-  {
-    name: "push.pushOption",
-    description:
-      "When no `--push-option=<option>` argument is given from the command line, `git push` behaves as if each <value> of this variable is given as `--push-option=<value>`",
-  },
-  {
-    name: "push.recurseSubmodules",
-    description:
-      "Make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If the value is 'check' then Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing, the push will be aborted and exit with non-zero status. If the value is 'on-demand' then all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If the value is 'no' then default behavior of ignoring submodules when pushing is retained. You may override this configuration at time of push by specifying '--recurse-submodules=check|on-demand|no'. If not set, 'no' is used by default, unless 'submodule.recurse' is set (in which case a 'true' value means 'on-demand')",
-  },
-  {
-    name: "push.useBitmaps",
-    description:
-      'If set to "false", disable use of bitmaps for "git push" even if `pack.useBitmaps` is "true", without preventing other git operations from using bitmaps. Default is true',
-  },
-  {
-    name: "push.useForceIfIncludes",
-    description:
-      'If set to "true", it is equivalent to specifying `--force-if-includes` as an option to git-push[1] in the command line. Adding `--no-force-if-includes` at the time of push overrides this configuration setting',
-  },
-  {
-    name: "rebase.abbreviateCommands",
-    description:
-      "If set to true, `git rebase` will use abbreviated command names in the todo list resulting in something like this:",
-  },
-  {
-    name: "rebase.autoSquash",
-    description: "If set to true enable `--autosquash` option by default",
-  },
-  {
-    name: "rebase.autoStash",
-    description:
-      "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts. This option can be overridden by the `--no-autostash` and `--autostash` options of git-rebase[1]. Defaults to false",
-  },
-  {
-    name: "rebase.backend",
-    description:
-      "Default backend to use for rebasing. Possible choices are 'apply' or 'merge'. In the future, if the merge backend gains all remaining capabilities of the apply backend, this setting may become unused",
-  },
-  {
-    name: "rebase.forkPoint",
-    description: "If set to false set `--no-fork-point` option by default",
-  },
-  {
-    name: "rebase.instructionFormat",
-    description:
-      "A format string, as specified in git-log[1], to be used for the todo list during an interactive rebase. The format will automatically have the long commit hash prepended to the format",
-  },
-  {
-    name: "rebase.missingCommitsCheck",
-    description:
-      'If set to "warn", git rebase -i will print a warning if some commits are removed (e.g. a line was deleted), however the rebase will still proceed. If set to "error", it will print the previous warning and stop the rebase, \'git rebase --edit-todo\' can then be used to correct the error. If set to "ignore", no checking is done. To drop a commit without warning or error, use the `drop` command in the todo list. Defaults to "ignore"',
-  },
-  {
-    name: "rebase.rescheduleFailedExec",
-    description:
-      "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided). This is the same as specifying the `--reschedule-failed-exec` option",
-  },
-  {
-    name: "rebase.stat",
-    description:
-      "Whether to show a diffstat of what changed upstream since the last rebase. False by default",
-  },
-  {
-    name: "rebase.updateRefs",
-    description: "If set to true enable `--update-refs` option by default",
-  },
-  {
-    name: "receive.advertiseAtomic",
-    description:
-      "By default, git-receive-pack will advertise the atomic push capability to its clients. If you don't want to advertise this capability, set this variable to false",
-  },
-  {
-    name: "receive.advertisePushOptions",
-    description:
-      "When set to true, git-receive-pack will advertise the push options capability to its clients. False by default",
-  },
-  {
-    name: "receive.autogc",
-    description:
-      'By default, git-receive-pack will run "git-gc --auto" after receiving data from git-push and updating refs. You can stop it by setting this variable to false',
-  },
-  {
-    name: "receive.certNonceSeed",
-    description:
-      'By setting this variable to a string, `git receive-pack` will accept a `git push --signed` and verifies it by using a "nonce" protected by HMAC using this string as a secret key',
-  },
-  {
-    name: "receive.certNonceSlop",
-    description:
-      'When a `git push --signed` sent a push certificate with a "nonce" that was issued by a receive-pack serving the same repository within this many seconds, export the "nonce" found in the certificate to `GIT_PUSH_CERT_NONCE` to the hooks (instead of what the receive-pack asked the sending side to include). This may allow writing checks in `pre-receive` and `post-receive` a bit easier. Instead of checking `GIT_PUSH_CERT_NONCE_SLOP` environment variable that records by how many seconds the nonce is stale to decide if they want to accept the certificate, they only can check `GIT_PUSH_CERT_NONCE_STATUS` is `OK`',
-  },
-  {
-    name: "receive.denyCurrentBranch",
-    description:
-      'If set to true or "refuse", git-receive-pack will deny a ref update to the currently checked out branch of a non-bare repository. Such a push is potentially dangerous because it brings the HEAD out of sync with the index and working tree. If set to "warn", print a warning of such a push to stderr, but allow the push to proceed. If set to false or "ignore", allow such pushes with no message. Defaults to "refuse"',
-  },
-  {
-    name: "receive.denyDeleteCurrent",
-    description:
-      "If set to true, git-receive-pack will deny a ref update that deletes the currently checked out branch of a non-bare repository",
-  },
-  {
-    name: "receive.denyDeletes",
-    description:
-      "If set to true, git-receive-pack will deny a ref update that deletes the ref. Use this to prevent such a ref deletion via a push",
-  },
-  {
-    name: "receive.denyNonFastForwards",
-    description:
-      "If set to true, git-receive-pack will deny a ref update which is not a fast-forward. Use this to prevent such an update via a push, even if that push is forced. This configuration variable is set when initializing a shared repository",
-  },
-  {
-    name: "receive.fsck.<msg-id>",
-    insertValue: "receive.fsck.{cursor}",
-    description:
-      "Acts like `fsck.<msg-id>`, but is used by git-receive-pack[1] instead of git-fsck[1]. See the `fsck.<msg-id>` documentation for details",
-  },
-  {
-    name: "receive.fsck.skipList",
-    description:
-      "Acts like `fsck.skipList`, but is used by git-receive-pack[1] instead of git-fsck[1]. See the `fsck.skipList` documentation for details",
-  },
-  {
-    name: "receive.fsckObjects",
-    description:
-      "If it is set to true, git-receive-pack will check all received objects. See `transfer.fsckObjects` for what's checked. Defaults to false. If not set, the value of `transfer.fsckObjects` is used instead",
-  },
-  {
-    name: "receive.hideRefs",
-    description:
-      "This variable is the same as `transfer.hideRefs`, but applies only to `receive-pack` (and so affects pushes, but not fetches). An attempt to update or delete a hidden ref by `git push` is rejected",
-  },
-  {
-    name: "receive.keepAlive",
-    description:
-      "After receiving the pack from the client, `receive-pack` may produce no output (if `--quiet` was specified) while processing the pack, causing some networks to drop the TCP connection. With this option set, if `receive-pack` does not transmit any data in this phase for `receive.keepAlive` seconds, it will send a short keepalive packet. The default is 5 seconds; set to 0 to disable keepalives entirely",
-  },
-  {
-    name: "receive.maxInputSize",
-    description:
-      "If the size of the incoming pack stream is larger than this limit, then git-receive-pack will error out, instead of accepting the pack file. If not set or set to 0, then the size is unlimited",
-  },
-  {
-    name: "receive.procReceiveRefs",
-    description:
-      'This is a multi-valued variable that defines reference prefixes to match the commands in `receive-pack`. Commands matching the prefixes will be executed by an external hook "proc-receive", instead of the internal `execute_commands` function. If this variable is not defined, the "proc-receive" hook will never be used, and all commands will be executed by the internal `execute_commands` function',
-  },
-  {
-    name: "receive.shallowUpdate",
-    description:
-      "If set to true, .git/shallow can be updated when new refs require new shallow roots. Otherwise those refs are rejected",
-  },
-  {
-    name: "receive.unpackLimit",
-    description:
-      "If the number of objects received in a push is below this limit then the objects will be unpacked into loose object files. However if the number of received objects equals or exceeds this limit then the received pack will be stored as a pack, after adding any missing delta bases. Storing the pack from a push can make the push operation complete faster, especially on slow filesystems. If not set, the value of `transfer.unpackLimit` is used instead",
-  },
-  {
-    name: "receive.updateServerInfo",
-    description:
-      "If set to true, git-receive-pack will run git-update-server-info after receiving data from git-push and updating refs",
-  },
-  {
-    name: "remote.<name>.fetch",
-    insertValue: "remote.{cursor}.fetch",
-    description:
-      'The default set of "refspec" for git-fetch[1]. See git-fetch[1]',
-  },
-  {
-    name: "remote.<name>.mirror",
-    insertValue: "remote.{cursor}.mirror",
-    description:
-      "If true, pushing to this remote will automatically behave as if the `--mirror` option was given on the command line",
-  },
-  {
-    name: "remote.<name>.partialclonefilter",
-    insertValue: "remote.{cursor}.partialclonefilter",
-    description:
-      "The filter that will be applied when fetching from this promisor remote. Changing or clearing this value will only affect fetches for new commits. To fetch associated objects for commits already present in the local object database, use the `--refetch` option of git-fetch[1]",
-  },
-  {
-    name: "remote.<name>.promisor",
-    insertValue: "remote.{cursor}.promisor",
-    description:
-      "When set to true, this remote will be used to fetch promisor objects",
-  },
-  {
-    name: "remote.<name>.proxy",
-    insertValue: "remote.{cursor}.proxy",
-    description:
-      "For remotes that require curl (http, https and ftp), the URL to the proxy to use for that remote. Set to the empty string to disable proxying for that remote",
-  },
-  {
-    name: "remote.<name>.proxyAuthMethod",
-    insertValue: "remote.{cursor}.proxyAuthMethod",
-    description:
-      "For remotes that require curl (http, https and ftp), the method to use for authenticating against the proxy in use (probably set in `remote.<name>.proxy`). See `http.proxyAuthMethod`",
-  },
-  {
-    name: "remote.<name>.prune",
-    insertValue: "remote.{cursor}.prune",
-    description:
-      "When set to true, fetching from this remote by default will also remove any remote-tracking references that no longer exist on the remote (as if the `--prune` option was given on the command line). Overrides `fetch.prune` settings, if any",
-  },
-  {
-    name: "remote.<name>.pruneTags",
-    insertValue: "remote.{cursor}.pruneTags",
-    description:
-      "When set to true, fetching from this remote by default will also remove any local tags that no longer exist on the remote if pruning is activated in general via `remote.<name>.prune`, `fetch.prune` or `--prune`. Overrides `fetch.pruneTags` settings, if any",
-  },
-  {
-    name: "remote.<name>.push",
-    insertValue: "remote.{cursor}.push",
-    description:
-      'The default set of "refspec" for git-push[1]. See git-push[1]',
-  },
-  {
-    name: "remote.<name>.pushurl",
-    insertValue: "remote.{cursor}.pushurl",
-    description: "The push URL of a remote repository. See git-push[1]",
-  },
-  {
-    name: "remote.<name>.receivepack",
-    insertValue: "remote.{cursor}.receivepack",
-    description:
-      "The default program to execute on the remote side when pushing. See option --receive-pack of git-push[1]",
-  },
-  {
-    name: "remote.<name>.skipDefaultUpdate",
-    insertValue: "remote.{cursor}.skipDefaultUpdate",
-    description:
-      "If true, this remote will be skipped by default when updating using git-fetch[1] or the `update` subcommand of git-remote[1]",
-  },
-  {
-    name: "remote.<name>.skipFetchAll",
-    insertValue: "remote.{cursor}.skipFetchAll",
-    description:
-      "If true, this remote will be skipped by default when updating using git-fetch[1] or the `update` subcommand of git-remote[1]",
-  },
-  {
-    name: "remote.<name>.tagOpt",
-    insertValue: "remote.{cursor}.tagOpt",
-    description:
-      "Setting this value to --no-tags disables automatic tag following when fetching from remote <name>. Setting it to --tags will fetch every tag from remote <name>, even if they are not reachable from remote branch heads. Passing these flags directly to git-fetch[1] can override this setting. See options --tags and --no-tags of git-fetch[1]",
-  },
-  {
-    name: "remote.<name>.uploadpack",
-    insertValue: "remote.{cursor}.uploadpack",
-    description:
-      "The default program to execute on the remote side when fetching. See option --upload-pack of git-fetch-pack[1]",
-  },
-  {
-    name: "remote.<name>.url",
-    insertValue: "remote.{cursor}.url",
-    description:
-      "The URL of a remote repository. See git-fetch[1] or git-push[1]",
-  },
-  {
-    name: "remote.<name>.vcs",
-    insertValue: "remote.{cursor}.vcs",
-    description:
-      "Setting this to a value <vcs> will cause Git to interact with the remote with the git-remote-<vcs> helper",
-  },
-  {
-    name: "remote.pushDefault",
-    description:
-      "The remote to push to by default. Overrides `branch.<name>.remote` for all branches, and is overridden by `branch.<name>.pushRemote` for specific branches",
-  },
-  {
-    name: "remotes.<group>",
-    insertValue: "remotes.{cursor}",
-    description:
-      'The list of remotes which are fetched by "git remote update <group>". See git-remote[1]',
-  },
-  {
-    name: "repack.cruftThreads",
-    description:
-      "Parameters used by git-pack-objects[1] when generating a cruft pack and the respective parameters are not given over the command line. See similarly named `pack.*` configuration variables for defaults and meaning",
-  },
-  {
-    name: "repack.packKeptObjects",
-    description:
-      "If set to true, makes `git repack` act as if `--pack-kept-objects` was passed. See git-repack[1] for details. Defaults to `false` normally, but `true` if a bitmap index is being written (either via `--write-bitmap-index` or `repack.writeBitmaps`)",
-  },
-  {
-    name: "repack.updateServerInfo",
-    description:
-      "If set to false, git-repack[1] will not run git-update-server-info[1]. Defaults to true. Can be overridden when true by the `-n` option of git-repack[1]",
-  },
-  {
-    name: "repack.useDeltaBaseOffset",
-    description:
-      'By default, git-repack[1] creates packs that use delta-base offset. If you need to share your repository with Git older than version 1.4.4, either directly or via a dumb protocol such as http, then you need to set this option to "false" and repack. Access from old Git versions over the native protocol are unaffected by this option',
-  },
-  {
-    name: "repack.useDeltaIslands",
-    description:
-      "If set to true, makes `git repack` act as if `--delta-islands` was passed. Defaults to `false`",
-  },
-  {
-    name: "repack.writeBitmaps",
-    description:
-      'When true, git will write a bitmap index when packing all objects to disk (e.g., when `git repack -a` is run). This index can speed up the "counting objects" phase of subsequent packs created for clones and fetches, at the cost of some disk space and extra time spent on the initial repack. This has no effect if multiple packfiles are created. Defaults to true on bare repos, false otherwise',
-  },
-  {
-    name: "rerere.autoUpdate",
-    description:
-      "When set to true, `git-rerere` updates the index with the resulting contents after it cleanly resolves conflicts using previously recorded resolution. Defaults to false",
-  },
-  {
-    name: "rerere.enabled",
-    description:
-      'Activate recording of resolved conflicts, so that identical conflict hunks can be resolved automatically, should they be encountered again. By default, git-rerere[1] is enabled if there is an `rr-cache` directory under the `$GIT_DIR`, e.g. if "rerere" was previously used in the repository',
-  },
-  {
-    name: "revert.reference",
-    description:
-      "Setting this variable to true makes `git revert` behave as if the `--reference` option is given",
-  },
-  {
-    name: "safe.bareRepository",
-    description:
-      "Specifies which bare repositories Git will work with. The currently supported values are:",
-  },
-  {
-    name: "safe.directory",
-    description:
-      "These config entries specify Git-tracked directories that are considered safe even if they are owned by someone other than the current user. By default, Git will refuse to even parse a Git config of a repository owned by someone else, let alone run its hooks, and this config setting allows users to specify exceptions, e.g. for intentionally shared repositories (see the `--shared` option in git-init[1])",
-  },
-  {
-    name: "sendemail.forbidSendmailVariables",
-    description:
-      'To avoid common misconfiguration mistakes, git-send-email[1] will abort with a warning if any configuration options for "sendmail" exist. Set this variable to bypass the check',
-  },
-  {
-    name: "sendemail.identity",
-    description:
-      "A configuration identity. When given, causes values in the 'sendemail.<identity>' subsection to take precedence over values in the 'sendemail' section. The default identity is the value of `sendemail.identity`",
-  },
-  {
-    name: "sendemail.signedoffcc",
-    description: "Deprecated alias for `sendemail.signedoffbycc`",
-    deprecated: true,
-    hidden: true,
-  },
-  {
-    name: "sendemail.smtpBatchSize",
-    description:
-      "Number of messages to be sent per connection, after that a relogin will happen. If the value is 0 or undefined, send all messages in one connection. See also the `--batch-size` option of git-send-email[1]",
-  },
-  {
-    name: "sendemail.smtpEncryption",
-    description:
-      "See git-send-email[1] for description. Note that this setting is not subject to the 'identity' mechanism",
-  },
-  {
-    name: "sendemail.smtpReloginDelay",
-    description:
-      "Seconds wait before reconnecting to smtp server. See also the `--relogin-delay` option of git-send-email[1]",
-  },
-  {
-    name: "sendemail.smtpsslcertpath",
-    description:
-      "Path to ca-certificates (either a directory or a single file). Set it to an empty string to disable certificate verification",
-  },
-  {
-    name: "sendemail.xmailer",
-    description: "See git-send-email[1] for description",
-  },
-  {
-    name: "sequence.editor",
-    description:
-      "Text editor used by `git rebase -i` for editing the rebase instruction file. The value is meant to be interpreted by the shell when it is used. It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. When not configured the default commit message editor is used instead",
-  },
-  {
-    name: "sendemail.<identity>.forbidSendmailVariables",
-    insertValue: "sendemail.{cursor}.forbidSendmailVariables",
-    description:
-      'To avoid common misconfiguration mistakes, git-send-email[1] will abort with a warning if any configuration options for "sendmail" exist. Set this variable to bypass the check',
-  },
-  {
-    name: "sendemail.<identity>.signedoffcc",
-    insertValue: "sendemail.{cursor}.signedoffcc",
-    description: "Deprecated alias for `sendemail.signedoffbycc`",
-    deprecated: true,
-    hidden: true,
-  },
-  {
-    name: "sendemail.<identity>.smtpBatchSize",
-    insertValue: "sendemail.{cursor}.smtpBatchSize",
-    description:
-      "Number of messages to be sent per connection, after that a relogin will happen. If the value is 0 or undefined, send all messages in one connection. See also the `--batch-size` option of git-send-email[1]",
-  },
-  {
-    name: "sendemail.<identity>.smtpEncryption",
-    insertValue: "sendemail.{cursor}.smtpEncryption",
-    description:
-      "See git-send-email[1] for description. Note that this setting is not subject to the 'identity' mechanism",
-  },
-  {
-    name: "sendemail.<identity>.smtpReloginDelay",
-    insertValue: "sendemail.{cursor}.smtpReloginDelay",
-    description:
-      "Seconds wait before reconnecting to smtp server. See also the `--relogin-delay` option of git-send-email[1]",
-  },
-  {
-    name: "sendemail.<identity>.smtpsslcertpath",
-    insertValue: "sendemail.{cursor}.smtpsslcertpath",
-    description:
-      "Path to ca-certificates (either a directory or a single file). Set it to an empty string to disable certificate verification",
-  },
-  {
-    name: "sendemail.<identity>.xmailer",
-    insertValue: "sendemail.{cursor}.xmailer",
-    description: "See git-send-email[1] for description",
-  },
-  {
-    name: "sequence.<identity>.editor",
-    insertValue: "sequence.{cursor}.editor",
-    description:
-      "Text editor used by `git rebase -i` for editing the rebase instruction file. The value is meant to be interpreted by the shell when it is used. It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. When not configured the default commit message editor is used instead",
-  },
-  {
-    name: "showBranch.default",
-    description:
-      "The default set of branches for git-show-branch[1]. See git-show-branch[1]",
-  },
-  {
-    name: "sparse.expectFilesOutsideOfPatterns",
-    description:
-      "Typically with sparse checkouts, files not matching any sparsity patterns are marked with a SKIP_WORKTREE bit in the index and are missing from the working tree. Accordingly, Git will ordinarily check whether files with the SKIP_WORKTREE bit are in fact present in the working tree contrary to expectations. If Git finds any, it marks those paths as present by clearing the relevant SKIP_WORKTREE bits. This option can be used to tell Git that such present-despite-skipped files are expected and to stop checking for them",
-  },
-  {
-    name: "splitIndex.maxPercentChange",
-    description:
-      "When the split index feature is used, this specifies the percent of entries the split index can contain compared to the total number of entries in both the split index and the shared index before a new shared index is written. The value should be between 0 and 100. If the value is 0 then a new shared index is always written, if it is 100 a new shared index is never written. By default the value is 20, so a new shared index is written if the number of entries in the split index would be greater than 20 percent of the total number of entries. See git-update-index[1]",
-  },
-  {
-    name: "splitIndex.sharedIndexExpire",
-    description:
-      'When the split index feature is used, shared index files that were not modified since the time this variable specifies will be removed when a new shared index file is created. The value "now" expires all entries immediately, and "never" suppresses expiration altogether. The default value is "2.weeks.ago". Note that a shared index file is considered modified (for the purpose of expiration) each time a new split-index file is either created based on it or read from it. See git-update-index[1]',
-  },
-  {
-    name: "ssh.variant",
-    description:
-      "By default, Git determines the command line arguments to use based on the basename of the configured SSH command (configured using the environment variable `GIT_SSH` or `GIT_SSH_COMMAND` or the config setting `core.sshCommand`). If the basename is unrecognized, Git will attempt to detect support of OpenSSH options by first invoking the configured SSH command with the `-G` (print configuration) option and will subsequently use OpenSSH options (if that is successful) or no options besides the host and remote command (if it fails)",
-  },
-  {
-    name: "stash.showIncludeUntracked",
-    description:
-      "If this is set to true, the `git stash show` command will show the untracked files of a stash entry. Defaults to false. See description of 'show' command in git-stash[1]",
-  },
-  {
-    name: "stash.showPatch",
-    description:
-      "If this is set to true, the `git stash show` command without an option will show the stash entry in patch form. Defaults to false. See description of 'show' command in git-stash[1]",
-  },
-  {
-    name: "stash.showStat",
-    description:
-      "If this is set to true, the `git stash show` command without an option will show diffstat of the stash entry. Defaults to true. See description of 'show' command in git-stash[1]",
-  },
-  {
-    name: "status.aheadBehind",
-    description:
-      "Set to true to enable `--ahead-behind` and false to enable `--no-ahead-behind` by default in git-status[1] for non-porcelain status formats. Defaults to true",
-  },
-  {
-    name: "status.branch",
-    description:
-      "Set to true to enable --branch by default in git-status[1]. The option --no-branch takes precedence over this variable",
-  },
-  {
-    name: "status.displayCommentPrefix",
-    description:
-      "If set to true, git-status[1] will insert a comment prefix before each output line (starting with `core.commentChar`, i.e. `#` by default). This was the behavior of git-status[1] in Git 1.8.4 and previous. Defaults to false",
-  },
-  {
-    name: "status.relativePaths",
-    description:
-      "By default, git-status[1] shows paths relative to the current directory. Setting this variable to `false` shows paths relative to the repository root (this was the default for Git prior to v1.5.4)",
-  },
-  {
-    name: "status.renameLimit",
-    description:
-      "The number of files to consider when performing rename detection in git-status[1] and git-commit[1]. Defaults to the value of diff.renameLimit",
-  },
-  {
-    name: "status.renames",
-    description:
-      'Whether and how Git detects renames in git-status[1] and git-commit[1] . If set to "false", rename detection is disabled. If set to "true", basic rename detection is enabled. If set to "copies" or "copy", Git will detect copies, as well. Defaults to the value of diff.renames',
-  },
-  {
-    name: "status.short",
-    description:
-      "Set to true to enable --short by default in git-status[1]. The option --no-short takes precedence over this variable",
-  },
-  {
-    name: "status.showStash",
-    description:
-      "If set to true, git-status[1] will display the number of entries currently stashed away. Defaults to false",
-  },
-  {
-    name: "status.showUntrackedFiles",
-    description:
-      "By default, git-status[1] and git-commit[1] show files which are not currently tracked by Git. Directories which contain only untracked files, are shown with the directory name only. Showing untracked files means that Git needs to lstat() all the files in the whole repository, which might be slow on some systems. So, this variable controls how the commands displays the untracked files. Possible values are:",
-  },
-  {
-    name: "status.submoduleSummary",
-    description:
-      "Defaults to false. If this is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled and a summary of commits for modified submodules will be shown (see --summary-limit option of git-submodule[1]). Please note that the summary output command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. The only exception to that rule is that status and commit will show staged submodule changes. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command-line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings",
-  },
-  {
-    name: "submodule.<name>.active",
-    insertValue: "submodule.{cursor}.active",
-    description:
-      "Boolean value indicating if the submodule is of interest to git commands. This config option takes precedence over the submodule.active config option. See gitsubmodules[7] for details",
-  },
-  {
-    name: "submodule.<name>.branch",
-    insertValue: "submodule.{cursor}.branch",
-    description:
-      "The remote branch name for a submodule, used by `git submodule update --remote`. Set this option to override the value found in the `.gitmodules` file. See git-submodule[1] and gitmodules[5] for details",
-  },
-  {
-    name: "submodule.<name>.fetchRecurseSubmodules",
-    insertValue: "submodule.{cursor}.fetchRecurseSubmodules",
-    description:
-      'This option can be used to control recursive fetching of this submodule. It can be overridden by using the --[no-]recurse-submodules command-line option to "git fetch" and "git pull". This setting will override that from in the gitmodules[5] file',
-  },
-  {
-    name: "submodule.<name>.ignore",
-    insertValue: "submodule.{cursor}.ignore",
-    description:
-      'Defines under what circumstances "git status" and the diff family show a submodule as modified. When set to "all", it will never be considered modified (but it will nonetheless show up in the output of status and commit when it has been staged), "dirty" will ignore all changes to the submodules work tree and takes only differences between the HEAD of the submodule and the commit recorded in the superproject into account. "untracked" will additionally let submodules with modified tracked files in their work tree show up. Using "none" (the default when this option is not set) also shows submodules that have untracked files in their work tree as changed. This setting overrides any setting made in .gitmodules for this submodule, both settings can be overridden on the command line by using the "--ignore-submodules" option. The \'git submodule\' commands are not affected by this setting',
-  },
-  {
-    name: "submodule.<name>.update",
-    insertValue: "submodule.{cursor}.update",
-    description:
-      "The method by which a submodule is updated by 'git submodule update', which is the only affected command, others such as 'git checkout --recurse-submodules' are unaffected. It exists for historical reasons, when 'git submodule' was the only command to interact with submodules; settings like `submodule.active` and `pull.rebase` are more specific. It is populated by `git submodule init` from the gitmodules[5] file. See description of 'update' command in git-submodule[1]",
-  },
-  {
-    name: "submodule.<name>.url",
-    insertValue: "submodule.{cursor}.url",
-    description:
-      "The URL for a submodule. This variable is copied from the .gitmodules file to the git config via 'git submodule init'. The user can change the configured URL before obtaining the submodule via 'git submodule update'. If neither submodule.<name>.active or submodule.active are set, the presence of this variable is used as a fallback to indicate whether the submodule is of interest to git commands. See git-submodule[1] and gitmodules[5] for details",
-  },
-  {
-    name: "submodule.active",
-    description:
-      "A repeated field which contains a pathspec used to match against a submodule's path to determine if the submodule is of interest to git commands. See gitsubmodules[7] for details",
-  },
-  {
-    name: "submodule.alternateErrorStrategy",
-    description:
-      "Specifies how to treat errors with the alternates for a submodule as computed via `submodule.alternateLocation`. Possible values are `ignore`, `info`, `die`. Default is `die`. Note that if set to `ignore` or `info`, and if there is an error with the computed alternate, the clone proceeds as if no alternate was specified",
-  },
-  {
-    name: "submodule.alternateLocation",
-    description:
-      "Specifies how the submodules obtain alternates when submodules are cloned. Possible values are `no`, `superproject`. By default `no` is assumed, which doesn't add references. When the value is set to `superproject` the submodule to be cloned computes its alternates location relative to the superprojects alternate",
-  },
-  {
-    name: "submodule.fetchJobs",
-    description:
-      "Specifies how many submodules are fetched/cloned at the same time. A positive integer allows up to that number of submodules fetched in parallel. A value of 0 will give some reasonable default. If unset, it defaults to 1",
-  },
-  {
-    name: "submodule.propagateBranches",
-    description:
-      "[EXPERIMENTAL] A boolean that enables branching support when using `--recurse-submodules` or `submodule.recurse=true`. Enabling this will allow certain commands to accept `--recurse-submodules` and certain commands that already accept `--recurse-submodules` will now consider branches. Defaults to false",
-  },
-  {
-    name: "submodule.recurse",
-    description:
-      "A boolean indicating if commands should enable the `--recurse-submodules` option by default. Defaults to false",
-  },
-  {
-    name: "tag.forceSignAnnotated",
-    description:
-      "A boolean to specify whether annotated tags created should be GPG signed. If `--annotate` is specified on the command line, it takes precedence over this option",
-  },
-  {
-    name: "tag.gpgSign",
-    description:
-      'A boolean to specify whether all tags should be GPG signed. Use of this option when running in an automated script can result in a large number of tags being signed. It is therefore convenient to use an agent to avoid typing your gpg passphrase several times. Note that this option doesn\'t affect tag signing behavior enabled by "-u <keyid>" or "--local-user=<keyid>" options',
-  },
-  {
-    name: "tag.sort",
-    description:
-      'This variable controls the sort ordering of tags when displayed by git-tag[1]. Without the "--sort=<value>" option provided, the value of this variable will be used as the default',
-  },
-  {
-    name: "tar.umask",
-    description:
-      'This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the world write bit. The special value "user" indicates that the archiving user\'s umask will be used instead. See umask(2) and git-archive[1]',
-  },
-  {
-    name: "trace2.configParams",
-    description:
-      'A comma-separated list of patterns of "important" config settings that should be recorded in the trace2 output. For example, `core.*,remote.*.url` would cause the trace2 output to contain events listing each configured remote. May be overridden by the `GIT_TRACE2_CONFIG_PARAMS` environment variable. Unset by default',
-  },
-  {
-    name: "trace2.destinationDebug",
-    description:
-      "Boolean. When true Git will print error messages when a trace target destination cannot be opened for writing. By default, these errors are suppressed and tracing is silently disabled. May be overridden by the `GIT_TRACE2_DST_DEBUG` environment variable",
-  },
-  {
-    name: "trace2.envVars",
-    description:
-      'A comma-separated list of "important" environment variables that should be recorded in the trace2 output. For example, `GIT_HTTP_USER_AGENT,GIT_CONFIG` would cause the trace2 output to contain events listing the overrides for HTTP user agent and the location of the Git configuration file (assuming any are set). May be overridden by the `GIT_TRACE2_ENV_VARS` environment variable. Unset by default',
-  },
-  {
-    name: "trace2.eventBrief",
-    description:
-      "Boolean. When true `time`, `filename`, and `line` fields are omitted from event output. May be overridden by the `GIT_TRACE2_EVENT_BRIEF` environment variable. Defaults to false",
-  },
-  {
-    name: "trace2.eventNesting",
-    description:
-      "Integer. Specifies desired depth of nested regions in the event output. Regions deeper than this value will be omitted. May be overridden by the `GIT_TRACE2_EVENT_NESTING` environment variable. Defaults to 2",
-  },
-  {
-    name: "trace2.eventTarget",
-    description:
-      "This variable controls the event target destination. It may be overridden by the `GIT_TRACE2_EVENT` environment variable. The following table shows possible values",
-  },
-  {
-    name: "trace2.maxFiles",
-    description:
-      "Integer. When writing trace files to a target directory, do not write additional traces if we would exceed this many files. Instead, write a sentinel file that will block further tracing to this directory. Defaults to 0, which disables this check",
-  },
-  {
-    name: "trace2.normalBrief",
-    description:
-      "Boolean. When true `time`, `filename`, and `line` fields are omitted from normal output. May be overridden by the `GIT_TRACE2_BRIEF` environment variable. Defaults to false",
-  },
-  {
-    name: "trace2.normalTarget",
-    description:
-      "This variable controls the normal target destination. It may be overridden by the `GIT_TRACE2` environment variable. The following table shows possible values",
-  },
-  {
-    name: "trace2.perfBrief",
-    description:
-      "Boolean. When true `time`, `filename`, and `line` fields are omitted from PERF output. May be overridden by the `GIT_TRACE2_PERF_BRIEF` environment variable. Defaults to false",
-  },
-  {
-    name: "trace2.perfTarget",
-    description:
-      "This variable controls the performance target destination. It may be overridden by the `GIT_TRACE2_PERF` environment variable. The following table shows possible values",
-  },
-  {
-    name: "transfer.advertiseSID",
-    description:
-      "Boolean. When true, client and server processes will advertise their unique session IDs to their remote counterpart. Defaults to false",
-  },
-  {
-    name: "transfer.credentialsInUrl",
-    description:
-      "A configured URL can contain plaintext credentials in the form `<protocol>://<user>:<password>@<domain>/<path>`. You may want to warn or forbid the use of such configuration (in favor of using git-credential[1]). This will be used on git-clone[1], git-fetch[1], git-push[1], and any other direct use of the configured URL",
-  },
-  {
-    name: "transfer.fsckObjects",
-    description:
-      "When `fetch.fsckObjects` or `receive.fsckObjects` are not set, the value of this variable is used instead. Defaults to false",
-  },
-  {
-    name: "transfer.hideRefs",
-    description:
-      "String(s) `receive-pack` and `upload-pack` use to decide which refs to omit from their initial advertisements. Use more than one definition to specify multiple prefix strings. A ref that is under the hierarchies listed in the value of this variable is excluded, and is hidden when responding to `git push` or `git fetch`. See `receive.hideRefs` and `uploadpack.hideRefs` for program-specific versions of this config",
-  },
-  {
-    name: "transfer.unpackLimit",
-    description:
-      "When `fetch.unpackLimit` or `receive.unpackLimit` are not set, the value of this variable is used instead. The default value is 100",
-  },
-  {
-    name: "uploadarchive.allowUnreachable",
-    description:
-      'If true, allow clients to use `git archive --remote` to request any tree, whether reachable from the ref tips or not. See the discussion in the "SECURITY" section of git-upload-archive[1] for more details. Defaults to `false`',
-  },
-  {
-    name: "uploadpack.allowAnySHA1InWant",
-    description:
-      "Allow `upload-pack` to accept a fetch request that asks for any object at all. Defaults to `false`",
-  },
-  {
-    name: "uploadpack.allowFilter",
-    description:
-      "If this option is set, `upload-pack` will support partial clone and partial fetch object filtering",
-  },
-  {
-    name: "uploadpack.allowReachableSHA1InWant",
-    description:
-      'Allow `upload-pack` to accept a fetch request that asks for an object that is reachable from any ref tip. However, note that calculating object reachability is computationally expensive. Defaults to `false`. Even if this is false, a client may be able to steal objects via the techniques described in the "SECURITY" section of the gitnamespaces[7] man page; it\'s best to keep private data in a separate repository',
-  },
-  {
-    name: "uploadpack.allowRefInWant",
-    description:
-      "If this option is set, `upload-pack` will support the `ref-in-want` feature of the protocol version 2 `fetch` command. This feature is intended for the benefit of load-balanced servers which may not have the same view of what OIDs their refs point to due to replication delay",
-  },
-  {
-    name: "uploadpack.allowTipSHA1InWant",
-    description:
-      'When `uploadpack.hideRefs` is in effect, allow `upload-pack` to accept a fetch request that asks for an object at the tip of a hidden ref (by default, such a request is rejected). See also `uploadpack.hideRefs`. Even if this is false, a client may be able to steal objects via the techniques described in the "SECURITY" section of the gitnamespaces[7] man page; it\'s best to keep private data in a separate repository',
-  },
-  {
-    name: "uploadpack.hideRefs",
-    description:
-      "This variable is the same as `transfer.hideRefs`, but applies only to `upload-pack` (and so affects only fetches, not pushes). An attempt to fetch a hidden ref by `git fetch` will fail. See also `uploadpack.allowTipSHA1InWant`",
-  },
-  {
-    name: "uploadpack.keepAlive",
-    description:
-      "When `upload-pack` has started `pack-objects`, there may be a quiet period while `pack-objects` prepares the pack. Normally it would output progress information, but if `--quiet` was used for the fetch, `pack-objects` will output nothing at all until the pack data begins. Some clients and networks may consider the server to be hung and give up. Setting this option instructs `upload-pack` to send an empty keepalive packet every `uploadpack.keepAlive` seconds. Setting this option to 0 disables keepalive packets entirely. The default is 5 seconds",
-  },
-  {
-    name: "uploadpack.packObjectsHook",
-    description:
-      "If this option is set, when `upload-pack` would run `git pack-objects` to create a packfile for a client, it will run this shell command instead. The `pack-objects` command and arguments it _would_ have run (including the `git pack-objects` at the beginning) are appended to the shell command. The stdin and stdout of the hook are treated as if `pack-objects` itself was run. I.e., `upload-pack` will feed input intended for `pack-objects` to the hook, and expects a completed packfile on stdout",
-  },
-  {
-    name: "uploadpackfilter.<filter>.allow",
-    insertValue: "uploadpackfilter.{cursor}.allow",
-    description:
-      "Explicitly allow or ban the object filter corresponding to `<filter>`, where `<filter>` may be one of: `blob:none`, `blob:limit`, `object:type`, `tree`, `sparse:oid`, or `combine`. If using combined filters, both `combine` and all of the nested filter kinds must be allowed. Defaults to `uploadpackfilter.allow`",
-  },
-  {
-    name: "uploadpackfilter.allow",
-    description:
-      "Provides a default value for unspecified object filters (see: the below configuration variable). If set to `true`, this will also enable all filters which get added in the future. Defaults to `true`",
-  },
-  {
-    name: "uploadpackfilter.tree.maxDepth",
-    description:
-      "Only allow `--filter=tree:<n>` when `<n>` is no more than the value of `uploadpackfilter.tree.maxDepth`. If set, this also implies `uploadpackfilter.tree.allow=true`, unless this configuration variable had already been set. Has no effect if unset",
-  },
-  {
-    name: "url.<base>.insteadOf",
-    insertValue: "url.{cursor}.insteadOf",
-    description:
-      "Any URL that starts with this value will be rewritten to start, instead, with <base>. In cases where some site serves a large number of repositories, and serves them with multiple access methods, and some users need to use different access methods, this feature allows people to specify any of the equivalent URLs and have Git automatically rewrite the URL to the best alternative for the particular user, even for a never-before-seen repository on the site. When more than one insteadOf strings match a given URL, the longest match is used",
-  },
-  {
-    name: "url.<base>.pushInsteadOf",
-    insertValue: "url.{cursor}.pushInsteadOf",
-    description:
-      "Any URL that starts with this value will not be pushed to; instead, it will be rewritten to start with <base>, and the resulting URL will be pushed to. In cases where some site serves a large number of repositories, and serves them with multiple access methods, some of which do not allow push, this feature allows people to specify a pull-only URL and have Git automatically use an appropriate URL to push, even for a never-before-seen repository on the site. When more than one pushInsteadOf strings match a given URL, the longest match is used. If a remote has an explicit pushurl, Git will ignore this setting for that remote",
-  },
-  {
-    name: "user.signingKey",
-    description:
-      'If git-tag[1] or git-commit[1] is not selecting the key you want it to automatically when creating a signed tag or commit, you can override the default selection with this variable. This option is passed unchanged to gpg\'s --local-user parameter, so you may specify a key using any method that gpg supports. If gpg.format is set to `ssh` this can contain the path to either your private ssh key or the public key when ssh-agent is used. Alternatively it can contain a public key prefixed with `key::` directly (e.g.: "key::ssh-rsa XXXXXX identifier"). The private key needs to be available via ssh-agent. If not set git will call gpg.ssh.defaultKeyCommand (e.g.: "ssh-add -L") and try to use the first key available. For backward compatibility, a raw key which begins with "ssh-", such as "ssh-rsa XXXXXX identifier", is treated as "key::ssh-rsa XXXXXX identifier", but this form is deprecated; use the `key::` form instead',
-  },
-  {
-    name: "user.useConfigOnly",
-    description:
-      "Instruct Git to avoid trying to guess defaults for `user.email` and `user.name`, and instead retrieve the values only from the configuration. For example, if you have multiple email addresses and would like to use a different one for each repository, then with this configuration option set to `true` in the global config along with a name, Git will prompt you to set up an email before making new commits in a newly cloned repository. Defaults to `false`",
-  },
-  {
-    name: "versionsort.prereleaseSuffix",
-    description:
-      "Deprecated alias for `versionsort.suffix`. Ignored if `versionsort.suffix` is set",
-    deprecated: true,
-    hidden: true,
-  },
-  {
-    name: "versionsort.suffix",
-    description:
-      'Even when version sort is used in git-tag[1], tagnames with the same base version but different suffixes are still sorted lexicographically, resulting e.g. in prerelease tags appearing after the main release (e.g. "1.0-rc1" after "1.0"). This variable can be specified to determine the sorting order of tags with different suffixes',
-  },
-  {
-    name: "web.browser",
-    description:
-      "Specify a web browser that may be used by some commands. Currently only git-instaweb[1] and git-help[1] may use it",
-  },
-  {
-    name: "worktree.guessRemote",
-    description:
-      'If no branch is specified and neither `-b` nor `-B` nor `--detach` is used, then `git worktree add` defaults to creating a new branch from HEAD. If `worktree.guessRemote` is set to true, `worktree add` tries to find a remote-tracking branch whose name uniquely matches the new branch name. If such a branch exists, it is checked out and set as "upstream" for the new branch. If no such match can be found, it falls back to creating a new branch from the current HEAD',
-  },
+	{
+		name: "add.ignore-errors",
+		description:
+			"Tells 'git add' to continue adding files when some files cannot be added due to indexing errors. Equivalent to the `--ignore-errors` option of git-add[1]. `add.ignore-errors` is deprecated, as it does not follow the usual naming convention for configuration variables",
+		deprecated: true,
+		hidden: true,
+	},
+	{
+		name: "add.interactive.useBuiltin",
+		description:
+			"Set to `false` to fall back to the original Perl implementation of the interactive version of git-add[1] instead of the built-in version. Is `true` by default",
+	},
+	{
+		name: "advice.addEmbeddedRepo",
+		description:
+			"Advice on what to do when you've accidentally added one git repo inside of another",
+	},
+	{
+		name: "advice.addEmptyPathspec",
+		description:
+			"Advice shown if a user runs the add command without providing the pathspec parameter",
+	},
+	{
+		name: "advice.addIgnoredFile",
+		description:
+			"Advice shown if a user attempts to add an ignored file to the index",
+	},
+	{
+		name: "advice.ambiguousFetchRefspec",
+		description:
+			"Advice shown when fetch refspec for multiple remotes map to the same remote-tracking branch namespace and causes branch tracking set-up to fail",
+	},
+	{
+		name: "advice.amWorkDir",
+		description:
+			"Advice that shows the location of the patch file when git-am[1] fails to apply it",
+	},
+	{
+		name: "advice.checkoutAmbiguousRemoteBranchName",
+		description:
+			"Advice shown when the argument to git-checkout[1] and git-switch[1] ambiguously resolves to a remote tracking branch on more than one remote in situations where an unambiguous argument would have otherwise caused a remote-tracking branch to be checked out. See the `checkout.defaultRemote` configuration variable for how to set a given remote to used by default in some situations where this advice would be printed",
+	},
+	{
+		name: "advice.commitBeforeMerge",
+		description:
+			"Advice shown when git-merge[1] refuses to merge to avoid overwriting local changes",
+	},
+	{
+		name: "advice.detachedHead",
+		description:
+			"Advice shown when you used git-switch[1] or git-checkout[1] to move to the detach HEAD state, to instruct how to create a local branch after the fact",
+	},
+	{
+		name: "advice.fetchShowForcedUpdates",
+		description:
+			"Advice shown when git-fetch[1] takes a long time to calculate forced updates after ref updates, or to warn that the check is disabled",
+	},
+	{
+		name: "advice.ignoredHook",
+		description:
+			"Advice shown if a hook is ignored because the hook is not set as executable",
+	},
+	{
+		name: "advice.implicitIdentity",
+		description:
+			"Advice on how to set your identity configuration when your information is guessed from the system username and domain name",
+	},
+	{
+		name: "advice.nestedTag",
+		description:
+			"Advice shown if a user attempts to recursively tag a tag object",
+	},
+	{
+		name: "advice.pushAlreadyExists",
+		description:
+			"Shown when git-push[1] rejects an update that does not qualify for fast-forwarding (e.g., a tag.)",
+	},
+	{
+		name: "advice.pushFetchFirst",
+		description:
+			"Shown when git-push[1] rejects an update that tries to overwrite a remote ref that points at an object we do not have",
+	},
+	{
+		name: "advice.pushNeedsForce",
+		description:
+			"Shown when git-push[1] rejects an update that tries to overwrite a remote ref that points at an object that is not a commit-ish, or make the remote ref point at an object that is not a commit-ish",
+	},
+	{
+		name: "advice.pushNonFFCurrent",
+		description:
+			"Advice shown when git-push[1] fails due to a non-fast-forward update to the current branch",
+	},
+	{
+		name: "advice.pushNonFFMatching",
+		description:
+			"Advice shown when you ran git-push[1] and pushed 'matching refs' explicitly (i.e. you used ':', or specified a refspec that isn't your current branch) and it resulted in a non-fast-forward error",
+	},
+	{
+		name: "advice.pushRefNeedsUpdate",
+		description:
+			"Shown when git-push[1] rejects a forced update of a branch when its remote-tracking ref has updates that we do not have locally",
+	},
+	{
+		name: "advice.pushUnqualifiedRefname",
+		description:
+			"Shown when git-push[1] gives up trying to guess based on the source and destination refs what remote ref namespace the source belongs in, but where we can still suggest that the user push to either refs/heads/* or refs/tags/* based on the type of the source object",
+	},
+	{
+		name: "advice.pushUpdateRejected",
+		description:
+			"Set this variable to 'false' if you want to disable 'pushNonFFCurrent', 'pushNonFFMatching', 'pushAlreadyExists', 'pushFetchFirst', 'pushNeedsForce', and 'pushRefNeedsUpdate' simultaneously",
+	},
+	{
+		name: "advice.resetNoRefresh",
+		description:
+			"Advice to consider using the `--no-refresh` option to git-reset[1] when the command takes more than 2 seconds to refresh the index after reset",
+	},
+	{
+		name: "advice.resolveConflict",
+		description:
+			"Advice shown by various commands when conflicts prevent the operation from being performed",
+	},
+	{
+		name: "advice.rmHints",
+		description:
+			"In case of failure in the output of git-rm[1], show directions on how to proceed from the current state",
+	},
+	{
+		name: "advice.sequencerInUse",
+		description: "Advice shown when a sequencer command is already in progress",
+	},
+	{
+		name: "advice.skippedCherryPicks",
+		description:
+			"Shown when git-rebase[1] skips a commit that has already been cherry-picked onto the upstream branch",
+	},
+	{
+		name: "advice.statusAheadBehind",
+		description:
+			"Shown when git-status[1] computes the ahead/behind counts for a local ref compared to its remote tracking ref, and that calculation takes longer than expected. Will not appear if `status.aheadBehind` is false or the option `--no-ahead-behind` is given",
+	},
+	{
+		name: "advice.statusHints",
+		description:
+			"Show directions on how to proceed from the current state in the output of git-status[1], in the template shown when writing commit messages in git-commit[1], and in the help message shown by git-switch[1] or git-checkout[1] when switching branch",
+	},
+	{
+		name: "advice.statusUoption",
+		description:
+			"Advise to consider using the `-u` option to git-status[1] when the command takes more than 2 seconds to enumerate untracked files",
+	},
+	{
+		name: "advice.submoduleAlternateErrorStrategyDie",
+		description:
+			'Advice shown when a submodule.alternateErrorStrategy option configured to "die" causes a fatal error',
+	},
+	{
+		name: "advice.submodulesNotUpdated",
+		description:
+			"Advice shown when a user runs a submodule command that fails because `git submodule update --init` was not run",
+	},
+	{
+		name: "advice.suggestDetachingHead",
+		description:
+			"Advice shown when git-switch[1] refuses to detach HEAD without the explicit `--detach` option",
+	},
+	{
+		name: "advice.updateSparsePath",
+		description:
+			"Advice shown when either git-add[1] or git-rm[1] is asked to update index entries outside the current sparse checkout",
+	},
+	{
+		name: "advice.waitingForEditor",
+		description:
+			"Print a message to the terminal whenever Git is waiting for editor input from the user",
+	},
+	{
+		name: "alias.*",
+		insertValue: "alias.{cursor}",
+		description:
+			"Command aliases for the git[1] command wrapper - e.g. after defining `alias.last = cat-file commit HEAD`, the invocation `git last` is equivalent to `git cat-file commit HEAD`. To avoid confusion and troubles with script usage, aliases that hide existing Git commands are ignored. Arguments are split by spaces, the usual shell quoting and escaping is supported. A quote pair or a backslash can be used to quote them",
+	},
+	{
+		name: "am.keepcr",
+		description:
+			"If true, git-am will call git-mailsplit for patches in mbox format with parameter `--keep-cr`. In this case git-mailsplit will not remove `\\r` from lines ending with `\\r\\n`. Can be overridden by giving `--no-keep-cr` from the command line. See git-am[1], git-mailsplit[1]",
+	},
+	{
+		name: "am.threeWay",
+		description:
+			"By default, `git am` will fail if the patch does not apply cleanly. When set to true, this setting tells `git am` to fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally (equivalent to giving the `--3way` option from the command line). Defaults to `false`. See git-am[1]",
+	},
+	{
+		name: "apply.ignoreWhitespace",
+		description:
+			"When set to 'change', tells 'git apply' to ignore changes in whitespace, in the same way as the `--ignore-space-change` option. When set to one of: no, none, never, false tells 'git apply' to respect all whitespace differences. See git-apply[1]",
+	},
+	{
+		name: "apply.whitespace",
+		description:
+			"Tells 'git apply' how to handle whitespaces, in the same way as the `--whitespace` option. See git-apply[1]",
+	},
+	{
+		name: "blame.blankBoundary",
+		description:
+			"Show blank commit object name for boundary commits in git-blame[1]. This option defaults to false",
+	},
+	{
+		name: "blame.coloring",
+		description:
+			"This determines the coloring scheme to be applied to blame output. It can be 'repeatedLines', 'highlightRecent', or 'none' which is the default",
+	},
+	{
+		name: "blame.date",
+		description:
+			"Specifies the format used to output dates in git-blame[1]. If unset the iso format is used. For supported values, see the discussion of the `--date` option at git-log[1]",
+	},
+	{
+		name: "blame.ignoreRevsFile",
+		description:
+			"Ignore revisions listed in the file, one unabbreviated object name per line, in git-blame[1]. Whitespace and comments beginning with `#` are ignored. This option may be repeated multiple times. Empty file names will reset the list of ignored revisions. This option will be handled before the command line option `--ignore-revs-file`",
+	},
+	{
+		name: "blame.markIgnoredLines",
+		description:
+			"Mark lines that were changed by an ignored revision that we attributed to another commit with a '?' in the output of git-blame[1]",
+	},
+	{
+		name: "blame.markUnblamableLines",
+		description:
+			"Mark lines that were changed by an ignored revision that we could not attribute to another commit with a '*' in the output of git-blame[1]",
+	},
+	{
+		name: "blame.showEmail",
+		description:
+			"Show the author email instead of author name in git-blame[1]. This option defaults to false",
+	},
+	{
+		name: "blame.showRoot",
+		description:
+			"Do not treat root commits as boundaries in git-blame[1]. This option defaults to false",
+	},
+	{
+		name: "branch.<name>.description",
+		insertValue: "branch.{cursor}.description",
+		description:
+			"Branch description, can be edited with `git branch --edit-description`. Branch description is automatically added in the format-patch cover letter or request-pull summary",
+	},
+	{
+		name: "branch.<name>.merge",
+		insertValue: "branch.{cursor}.merge",
+		description:
+			"Defines, together with branch.<name>.remote, the upstream branch for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which branch to merge and can also affect 'git push' (see push.default). When in branch <name>, it tells 'git fetch' the default refspec to be marked for merging in FETCH_HEAD. The value is handled like the remote part of a refspec, and must match a ref which is fetched from the remote given by \"branch.<name>.remote\". The merge information is used by 'git pull' (which at first calls 'git fetch') to lookup the default branch for merging. Without this option, 'git pull' defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. If you wish to setup 'git pull' so that it merges into <name> from another branch in the local repository, you can point branch.<name>.merge to the desired branch, and use the relative path setting `.` (a period) for branch.<name>.remote",
+	},
+	{
+		name: "branch.<name>.mergeOptions",
+		insertValue: "branch.{cursor}.mergeOptions",
+		description:
+			"Sets default options for merging into branch <name>. The syntax and supported options are the same as those of git-merge[1], but option values containing whitespace characters are currently not supported",
+	},
+	{
+		name: "branch.<name>.pushRemote",
+		insertValue: "branch.{cursor}.pushRemote",
+		description:
+			"When on branch <name>, it overrides `branch.<name>.remote` for pushing. It also overrides `remote.pushDefault` for pushing from branch <name>. When you pull from one place (e.g. your upstream) and push to another place (e.g. your own publishing repository), you would want to set `remote.pushDefault` to specify the remote to push to for all branches, and use this option to override it for a specific branch",
+	},
+	{
+		name: "branch.<name>.rebase",
+		insertValue: "branch.{cursor}.rebase",
+		description:
+			'When true, rebase the branch <name> on top of the fetched branch, instead of merging the default branch from the default remote when "git pull" is run. See "pull.rebase" for doing this in a non branch-specific manner',
+	},
+	{
+		name: "branch.<name>.remote",
+		insertValue: "branch.{cursor}.remote",
+		description:
+			"When on branch <name>, it tells 'git fetch' and 'git push' which remote to fetch from/push to. The remote to push to may be overridden with `remote.pushDefault` (for all branches). The remote to push to, for the current branch, may be further overridden by `branch.<name>.pushRemote`. If no remote is configured, or if you are not on any branch and there is more than one remote defined in the repository, it defaults to `origin` for fetching and `remote.pushDefault` for pushing. Additionally, `.` (a period) is the current local repository (a dot-repository), see `branch.<name>.merge`'s final note below",
+	},
+	{
+		name: "branch.autoSetupMerge",
+		description:
+			"Tells 'git branch', 'git switch' and 'git checkout' to set up new branches so that git-pull[1] will appropriately merge from the starting point branch. Note that even if this option is not set, this behavior can be chosen per-branch using the `--track` and `--no-track` options. The valid settings are: `false` -- no automatic setup is done; `true` -- automatic setup is done when the starting point is a remote-tracking branch; `always` -- automatic setup is done when the starting point is either a local branch or remote-tracking branch; `inherit` -- if the starting point has a tracking configuration, it is copied to the new branch; `simple` -- automatic setup is done only when the starting point is a remote-tracking branch and the new branch has the same name as the remote branch. This option defaults to true",
+	},
+	{
+		name: "branch.autoSetupRebase",
+		description:
+			"When a new branch is created with 'git branch', 'git switch' or 'git checkout' that tracks another branch, this variable tells Git to set up pull to rebase instead of merge (see \"branch.<name>.rebase\"). When `never`, rebase is never automatically set to true. When `local`, rebase is set to true for tracked branches of other local branches. When `remote`, rebase is set to true for tracked branches of remote-tracking branches. When `always`, rebase will be set to true for all tracking branches. See \"branch.autoSetupMerge\" for details on how to set up a branch to track another branch. This option defaults to never",
+	},
+	{
+		name: "branch.sort",
+		description:
+			'This variable controls the sort ordering of branches when displayed by git-branch[1]. Without the "--sort=<value>" option provided, the value of this variable will be used as the default. See git-for-each-ref[1] field names for valid values',
+	},
+	{
+		name: "browser.<tool>.cmd",
+		insertValue: "browser.{cursor}.cmd",
+		description:
+			"Specify the command to invoke the specified browser. The specified command is evaluated in shell with the URLs passed as arguments. (See git-web{litdd}browse[1].)",
+	},
+	{
+		name: "browser.<tool>.path",
+		insertValue: "browser.{cursor}.path",
+		description:
+			"Override the path for the given tool that may be used to browse HTML help (see `-w` option in git-help[1]) or a working repository in gitweb (see git-instaweb[1])",
+	},
+	{
+		name: "checkout.defaultRemote",
+		description:
+			"When you run `git checkout <something>` or `git switch <something>` and only have one remote, it may implicitly fall back on checking out and tracking e.g. `origin/<something>`. This stops working as soon as you have more than one remote with a `<something>` reference. This setting allows for setting the name of a preferred remote that should always win when it comes to disambiguation. The typical use-case is to set this to `origin`",
+	},
+	{
+		name: "checkout.guess",
+		description:
+			"Provides the default value for the `--guess` or `--no-guess` option in `git checkout` and `git switch`. See git-switch[1] and git-checkout[1]",
+	},
+	{
+		name: "checkout.thresholdForParallelism",
+		description:
+			"When running parallel checkout with a small number of files, the cost of subprocess spawning and inter-process communication might outweigh the parallelization gains. This setting allows to define the minimum number of files for which parallel checkout should be attempted. The default is 100",
+	},
+	{
+		name: "checkout.workers",
+		description:
+			"The number of parallel workers to use when updating the working tree. The default is one, i.e. sequential execution. If set to a value less than one, Git will use as many workers as the number of logical cores available. This setting and `checkout.thresholdForParallelism` affect all commands that perform checkout. E.g. checkout, clone, reset, sparse-checkout, etc",
+	},
+	{
+		name: "clean.requireForce",
+		description:
+			"A boolean to make git-clean do nothing unless given -f, -i or -n. Defaults to true",
+	},
+	{
+		name: "clone.defaultRemoteName",
+		description:
+			"The name of the remote to create when cloning a repository. Defaults to `origin`, and can be overridden by passing the `--origin` command-line option to git-clone[1]",
+	},
+	{
+		name: "clone.filterSubmodules",
+		description:
+			"If a partial clone filter is provided (see `--filter` in git-rev-list[1]) and `--recurse-submodules` is used, also apply the filter to submodules",
+	},
+	{
+		name: "clone.rejectShallow",
+		description:
+			"Reject to clone a repository if it is a shallow one, can be overridden by passing option `--reject-shallow` in command line. See git-clone[1]",
+	},
+	{
+		name: "color.advice",
+		description:
+			"A boolean to enable/disable color in hints (e.g. when a push failed, see `advice.*` for a list). May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the error output goes to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
+	},
+	{
+		name: "color.advice.hint",
+		description: "Use customized color for hints",
+	},
+	{
+		name: "color.blame.highlightRecent",
+		description:
+			"Specify the line annotation color for `git blame --color-by-age` depending upon the age of the line",
+	},
+	{
+		name: "color.blame.repeatedLines",
+		description:
+			"Use the specified color to colorize line annotations for `git blame --color-lines`, if they come from the same commit as the preceding line. Defaults to cyan",
+	},
+	{
+		name: "color.branch",
+		description:
+			"A boolean to enable/disable color in the output of git-branch[1]. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the output is to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
+	},
+	{
+		name: "color.branch.<slot>",
+		insertValue: "color.branch.{cursor}",
+		description:
+			"Use customized color for branch coloration. `<slot>` is one of `current` (the current branch), `local` (a local branch), `remote` (a remote-tracking branch in refs/remotes/), `upstream` (upstream tracking branch), `plain` (other refs)",
+	},
+	{
+		name: "color.decorate.<slot>",
+		insertValue: "color.decorate.{cursor}",
+		description:
+			"Use customized color for 'git log --decorate' output. `<slot>` is one of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local branches, remote-tracking branches, tags, stash and HEAD, respectively and `grafted` for grafted commits",
+	},
+	{
+		name: "color.diff",
+		description:
+			"Whether to use ANSI escape sequences to add color to patches. If this is set to `always`, git-diff[1], git-log[1], and git-show[1] will use color for all patches. If it is set to `true` or `auto`, those commands will only use color when output is to the terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
+	},
+	{
+		name: "color.diff.<slot>",
+		insertValue: "color.diff.{cursor}",
+		description:
+			"Use customized color for diff colorization. `<slot>` specifies which part of the patch to use the specified color, and is one of `context` (context text - `plain` is a historical synonym), `meta` (metainformation), `frag` (hunk header), 'func' (function in hunk header), `old` (removed lines), `new` (added lines), `commit` (commit headers), `whitespace` (highlighting whitespace errors), `oldMoved` (deleted lines), `newMoved` (added lines), `oldMovedDimmed`, `oldMovedAlternative`, `oldMovedAlternativeDimmed`, `newMovedDimmed`, `newMovedAlternative` `newMovedAlternativeDimmed` (See the '<mode>' setting of '--color-moved' in git-diff[1] for details), `contextDimmed`, `oldDimmed`, `newDimmed`, `contextBold`, `oldBold`, and `newBold` (see git-range-diff[1] for details)",
+	},
+	{
+		name: "color.grep",
+		description:
+			"When set to `always`, always highlight matches. When `false` (or `never`), never. When set to `true` or `auto`, use color only when the output is written to the terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
+	},
+	{
+		name: "color.grep.<slot>",
+		insertValue: "color.grep.{cursor}",
+		description:
+			"Use customized color for grep colorization. `<slot>` specifies which part of the line to use the specified color, and is one of",
+	},
+	{
+		name: "color.interactive",
+		description:
+			'When set to `always`, always use colors for interactive prompts and displays (such as those used by "git-add --interactive" and "git-clean --interactive"). When false (or `never`), never. When set to `true` or `auto`, use colors only when the output is to the terminal. If unset, then the value of `color.ui` is used (`auto` by default)',
+	},
+	{
+		name: "color.interactive.<slot>",
+		insertValue: "color.interactive.{cursor}",
+		description:
+			"Use customized color for 'git add --interactive' and 'git clean --interactive' output. `<slot>` may be `prompt`, `header`, `help` or `error`, for four distinct types of normal output from interactive commands",
+	},
+	{
+		name: "color.pager",
+		description:
+			"A boolean to specify whether `auto` color modes should colorize output going to the pager. Defaults to true; set this to false if your pager does not understand ANSI color codes",
+	},
+	{
+		name: "color.push",
+		description:
+			"A boolean to enable/disable color in push errors. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the error output goes to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
+	},
+	{
+		name: "color.push.error",
+		description: "Use customized color for push errors",
+	},
+	{
+		name: "color.remote",
+		description:
+			'If set, keywords at the start of the line are highlighted. The keywords are "error", "warning", "hint" and "success", and are matched case-insensitively. May be set to `always`, `false` (or `never`) or `auto` (or `true`). If unset, then the value of `color.ui` is used (`auto` by default)',
+	},
+	{
+		name: "color.remote.<slot>",
+		insertValue: "color.remote.{cursor}",
+		description:
+			"Use customized color for each remote keyword. `<slot>` may be `hint`, `warning`, `success` or `error` which match the corresponding keyword",
+	},
+	{
+		name: "color.showBranch",
+		description:
+			"A boolean to enable/disable color in the output of git-show-branch[1]. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the output is to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
+	},
+	{
+		name: "color.status",
+		description:
+			"A boolean to enable/disable color in the output of git-status[1]. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the output is to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
+	},
+	{
+		name: "color.status.<slot>",
+		insertValue: "color.status.{cursor}",
+		description:
+			"Use customized color for status colorization. `<slot>` is one of `header` (the header text of the status message), `added` or `updated` (files which are added but not committed), `changed` (files which are changed but not added in the index), `untracked` (files which are not tracked by Git), `branch` (the current branch), `nobranch` (the color the 'no branch' warning is shown in, defaulting to red), `localBranch` or `remoteBranch` (the local and remote branch names, respectively, when branch and tracking information is displayed in the status short-format), or `unmerged` (files which have unmerged changes)",
+	},
+	{
+		name: "color.transport",
+		description:
+			"A boolean to enable/disable color when pushes are rejected. May be set to `always`, `false` (or `never`) or `auto` (or `true`), in which case colors are used only when the error output goes to a terminal. If unset, then the value of `color.ui` is used (`auto` by default)",
+	},
+	{
+		name: "color.transport.rejected",
+		description: "Use customized color when a push was rejected",
+	},
+	{
+		name: "color.ui",
+		description:
+			"This variable determines the default value for variables such as `color.diff` and `color.grep` that control the use of color per command family. Its scope will expand as more commands learn configuration to set a default for the `--color` option. Set it to `false` or `never` if you prefer Git commands not to use color unless enabled explicitly with some other configuration or the `--color` option. Set it to `always` if you want all output not intended for machine consumption to use color, to `true` or `auto` (this is the default since Git 1.8.4) if you want such output to use color when written to the terminal",
+	},
+	{
+		name: "column.branch",
+		description:
+			"Specify whether to output branch listing in `git branch` in columns. See `column.ui` for details",
+	},
+	{
+		name: "column.clean",
+		description:
+			"Specify the layout when list items in `git clean -i`, which always shows files and directories in columns. See `column.ui` for details",
+	},
+	{
+		name: "column.status",
+		description:
+			"Specify whether to output untracked files in `git status` in columns. See `column.ui` for details",
+	},
+	{
+		name: "column.tag",
+		description:
+			"Specify whether to output tag listing in `git tag` in columns. See `column.ui` for details",
+	},
+	{
+		name: "column.ui",
+		description:
+			"Specify whether supported commands should output in columns. This variable consists of a list of tokens separated by spaces or commas:",
+	},
+	{
+		name: "commit.cleanup",
+		description:
+			"This setting overrides the default of the `--cleanup` option in `git commit`. See git-commit[1] for details. Changing the default can be useful when you always want to keep lines that begin with comment character `#` in your log message, in which case you would do `git config commit.cleanup whitespace` (note that you will have to remove the help lines that begin with `#` in the commit log template yourself, if you do this)",
+	},
+	{
+		name: "commit.status",
+		description:
+			"A boolean to enable/disable inclusion of status information in the commit message template when using an editor to prepare the commit message. Defaults to true",
+	},
+	{
+		name: "commit.template",
+		description:
+			"Specify the pathname of a file to use as the template for new commit messages",
+	},
+	{
+		name: "commit.verbose",
+		description:
+			"A boolean or int to specify the level of verbose with `git commit`. See git-commit[1]",
+	},
+	{
+		name: "commitGraph.generationVersion",
+		description:
+			"Specifies the type of generation number version to use when writing or reading the commit-graph file. If version 1 is specified, then the corrected commit dates will not be written or read. Defaults to 2",
+	},
+	{
+		name: "commitGraph.maxNewFilters",
+		description:
+			"Specifies the default value for the `--max-new-filters` option of `git commit-graph write` (c.f., git-commit-graph[1])",
+	},
+	{
+		name: "commitGraph.readChangedPaths",
+		description:
+			"If true, then git will use the changed-path Bloom filters in the commit-graph file (if it exists, and they are present). Defaults to true. See git-commit-graph[1] for more information",
+	},
+	{
+		name: "committer.email",
+		description:
+			"The `user.name` and `user.email` variables determine what ends up in the `author` and `committer` field of commit objects. If you need the `author` or `committer` to be different, the `author.name`, `author.email`, `committer.name` or `committer.email` variables can be set. Also, all of these can be overridden by the `GIT_AUTHOR_NAME`, `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_NAME`, `GIT_COMMITTER_EMAIL` and `EMAIL` environment variables",
+	},
+	{
+		name: "completion.commands",
+		description:
+			"This is only used by git-completion.bash to add or remove commands from the list of completed commands. Normally only porcelain commands and a few select others are completed. You can add more commands, separated by space, in this variable. Prefixing the command with '-' will remove it from the existing list",
+	},
+	{
+		name: "core.abbrev",
+		description:
+			'Set the length object names are abbreviated to. If unspecified or set to "auto", an appropriate value is computed based on the approximate number of packed objects in your repository, which hopefully is enough for abbreviated object names to stay unique for some time. If set to "no", no abbreviation is made and the object names are shown in their full length. The minimum length is 4',
+	},
+	{
+		name: "core.alternateRefsCommand",
+		description:
+			"When advertising tips of available history from an alternate, use the shell to execute the specified command instead of git-for-each-ref[1]. The first argument is the absolute path of the alternate. Output must contain one hex object id per line (i.e., the same as produced by `git for-each-ref --format='%(objectname)'`)",
+	},
+	{
+		name: "core.alternateRefsPrefixes",
+		description:
+			"When listing references from an alternate, list only references that begin with the given prefix. Prefixes match as if they were given as arguments to git-for-each-ref[1]. To list multiple prefixes, separate them with whitespace. If `core.alternateRefsCommand` is set, setting `core.alternateRefsPrefixes` has no effect",
+	},
+	{
+		name: "core.askPass",
+		description:
+			"Some commands (e.g. svn and http interfaces) that interactively ask for a password can be told to use an external program given via the value of this variable. Can be overridden by the `GIT_ASKPASS` environment variable. If not set, fall back to the value of the `SSH_ASKPASS` environment variable or, failing that, a simple password prompt. The external program shall be given a suitable prompt as command-line argument and write the password on its STDOUT",
+	},
+	{
+		name: "core.attributesFile",
+		description:
+			"In addition to `.gitattributes` (per-directory) and `.git/info/attributes`, Git looks into this file for attributes (see gitattributes[5]). Path expansions are made the same way as for `core.excludesFile`. Its default value is `$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either not set or empty, `$HOME/.config/git/attributes` is used instead",
+	},
+	{
+		name: "core.autocrlf",
+		description:
+			'Setting this variable to "true" is the same as setting the `text` attribute to "auto" on all files and core.eol to "crlf". Set to true if you want to have `CRLF` line endings in your working directory and the repository has LF line endings. This variable can be set to \'input\', in which case no output conversion is performed',
+	},
+	{
+		name: "core.bare",
+		description:
+			"If true this repository is assumed to be 'bare' and has no working directory associated with it. If this is the case a number of commands that require a working directory will be disabled, such as git-add[1] or git-merge[1]",
+	},
+	{
+		name: "core.bigFileThreshold",
+		description:
+			"The size of files considered \"big\", which as discussed below changes the behavior of numerous git commands, as well as how such files are stored within the repository. The default is 512 MiB. Common unit suffixes of 'k', 'm', or 'g' are supported",
+	},
+	{
+		name: "core.checkRoundtripEncoding",
+		description:
+			"A comma and/or whitespace separated list of encodings that Git performs UTF-8 round trip checks on if they are used in an `working-tree-encoding` attribute (see gitattributes[5]). The default value is `SHIFT-JIS`",
+	},
+	{
+		name: "core.checkStat",
+		description:
+			"When missing or is set to `default`, many fields in the stat structure are checked to detect if a file has been modified since Git looked at it. When this configuration variable is set to `minimal`, sub-second part of mtime and ctime, the uid and gid of the owner of the file, the inode number (and the device number, if Git was compiled to use it), are excluded from the check among these fields, leaving only the whole-second part of mtime (and ctime, if `core.trustCtime` is set) and the filesize to be checked",
+	},
+	{
+		name: "core.commentChar",
+		description:
+			"Commands such as `commit` and `tag` that let you edit messages consider a line that begins with this character commented, and removes them after the editor returns (default '#')",
+	},
+	{
+		name: "core.commitGraph",
+		description:
+			"If true, then git will read the commit-graph file (if it exists) to parse the graph structure of commits. Defaults to true. See git-commit-graph[1] for more information",
+	},
+	{
+		name: "core.compression",
+		description:
+			"An integer -1..9, indicating a default compression level. -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If set, this provides a default to other compression variables, such as `core.looseCompression` and `pack.compression`",
+	},
+	{
+		name: "core.createObject",
+		description:
+			"You can set this to 'link', in which case a hardlink followed by a delete of the source are used to make sure that object creation will not overwrite existing objects",
+	},
+	{
+		name: "core.deltaBaseCacheLimit",
+		description:
+			"Maximum number of bytes per thread to reserve for caching base objects that may be referenced by multiple deltified objects. By storing the entire decompressed base objects in a cache Git is able to avoid unpacking and decompressing frequently used base objects multiple times",
+	},
+	{
+		name: "core.editor",
+		description:
+			"Commands such as `commit` and `tag` that let you edit messages by launching an editor use the value of this variable when it is set, and the environment variable `GIT_EDITOR` is not set. See git-var[1]",
+	},
+	{
+		name: "core.eol",
+		description:
+			"Sets the line ending type to use in the working directory for files that are marked as text (either by having the `text` attribute set, or by having `text=auto` and Git auto-detecting the contents as text). Alternatives are 'lf', 'crlf' and 'native', which uses the platform's native line ending. The default value is `native`. See gitattributes[5] for more information on end-of-line conversion. Note that this value is ignored if `core.autocrlf` is set to `true` or `input`",
+	},
+	{
+		name: "core.excludesFile",
+		description:
+			"Specifies the pathname to the file that contains patterns to describe paths that are not meant to be tracked, in addition to `.gitignore` (per-directory) and `.git/info/exclude`. Defaults to `$XDG_CONFIG_HOME/git/ignore`. If `$XDG_CONFIG_HOME` is either not set or empty, `$HOME/.config/git/ignore` is used instead. See gitignore[5]",
+	},
+	{
+		name: "core.fileMode",
+		description:
+			"Tells Git if the executable bit of files in the working tree is to be honored",
+	},
+	{
+		name: "core.filesRefLockTimeout",
+		description:
+			"The length of time, in milliseconds, to retry when trying to lock an individual reference. Value 0 means not to retry at all; -1 means to try indefinitely. Default is 100 (i.e., retry for 100ms)",
+	},
+	{
+		name: "core.fsmonitor",
+		description:
+			"If set to true, enable the built-in file system monitor daemon for this working directory (git-fsmonitor{litdd}daemon[1])",
+	},
+	{
+		name: "core.fsmonitorHookVersion",
+		description:
+			'Sets the protocol version to be used when invoking the "fsmonitor" hook',
+	},
+	{
+		name: "core.fsync",
+		description:
+			"A comma-separated list of components of the repository that should be hardened via the core.fsyncMethod when created or modified. You can disable hardening of any component by prefixing it with a '-'. Items that are not hardened may be lost in the event of an unclean system shutdown. Unless you have special requirements, it is recommended that you leave this option empty or pick one of `committed`, `added`, or `all`",
+	},
+	{
+		name: "core.fsyncMethod",
+		description:
+			"A value indicating the strategy Git will use to harden repository data using fsync and related primitives",
+	},
+	{
+		name: "core.fsyncObjectFiles",
+		description:
+			"This boolean will enable 'fsync()' when writing object files. This setting is deprecated. Use core.fsync instead",
+	},
+	{
+		name: "core.gitProxy",
+		description:
+			'A "proxy command" to execute (as \'command host port\') instead of establishing direct connection to the remote server when using the Git protocol for fetching. If the variable value is in the "COMMAND for DOMAIN" format, the command is applied only on hostnames ending with the specified domain string. This variable may be set multiple times and is matched in the given order; the first match wins',
+	},
+	{
+		name: "core.hideDotFiles",
+		description:
+			"(Windows-only) If true, mark newly-created directories and files whose name starts with a dot as hidden. If 'dotGitOnly', only the `.git/` directory is hidden, but no other files starting with a dot. The default mode is 'dotGitOnly'",
+	},
+	{
+		name: "core.hooksPath",
+		description:
+			"By default Git will look for your hooks in the `$GIT_DIR/hooks` directory. Set this to different path, e.g. `/etc/git/hooks`, and Git will try to find your hooks in that directory, e.g. `/etc/git/hooks/pre-receive` instead of in `$GIT_DIR/hooks/pre-receive`",
+	},
+	{
+		name: "core.ignoreCase",
+		description:
+			'Internal variable which enables various workarounds to enable Git to work better on filesystems that are not case sensitive, like APFS, HFS+, FAT, NTFS, etc. For example, if a directory listing finds "makefile" when Git expects "Makefile", Git will assume it is really the same file, and continue to remember it as "Makefile"',
+	},
+	{
+		name: "core.ignoreStat",
+		description:
+			'If true, Git will avoid using lstat() calls to detect if files have changed by setting the "assume-unchanged" bit for those tracked files which it has updated identically in both the index and working tree',
+	},
+	{
+		name: "core.logAllRefUpdates",
+		description:
+			'Enable the reflog. Updates to a ref <ref> is logged to the file "`$GIT_DIR/logs/<ref>`", by appending the new and old SHA-1, the date/time and the reason of the update, but only when the file exists. If this configuration variable is set to `true`, missing "`$GIT_DIR/logs/<ref>`" file is automatically created for branch heads (i.e. under `refs/heads/`), remote refs (i.e. under `refs/remotes/`), note refs (i.e. under `refs/notes/`), and the symbolic ref `HEAD`. If it is set to `always`, then a missing reflog is automatically created for any ref under `refs/`',
+	},
+	{
+		name: "core.looseCompression",
+		description:
+			"An integer -1..9, indicating the compression level for objects that are not in a pack file. -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If not set, defaults to core.compression. If that is not set, defaults to 1 (best speed)",
+	},
+	{
+		name: "core.multiPackIndex",
+		description:
+			"Use the multi-pack-index file to track multiple packfiles using a single index. See git-multi-pack-index[1] for more information. Defaults to true",
+	},
+	{
+		name: "core.notesRef",
+		description:
+			"When showing commit messages, also show notes which are stored in the given ref. The ref must be fully qualified. If the given ref does not exist, it is not an error but means that no notes should be printed",
+	},
+	{
+		name: "core.packedGitLimit",
+		description:
+			"Maximum number of bytes to map simultaneously into memory from pack files. If Git needs to access more than this many bytes at once to complete an operation it will unmap existing regions to reclaim virtual address space within the process",
+	},
+	{
+		name: "core.packedGitWindowSize",
+		description:
+			"Number of bytes of a pack file to map into memory in a single mapping operation. Larger window sizes may allow your system to process a smaller number of large pack files more quickly. Smaller window sizes will negatively affect performance due to increased calls to the operating system's memory manager, but may improve performance when accessing a large number of large pack files",
+	},
+	{
+		name: "core.packedRefsTimeout",
+		description:
+			"The length of time, in milliseconds, to retry when trying to lock the `packed-refs` file. Value 0 means not to retry at all; -1 means to try indefinitely. Default is 1000 (i.e., retry for 1 second)",
+	},
+	{
+		name: "core.pager",
+		description:
+			"Text viewer for use by Git commands (e.g., 'less'). The value is meant to be interpreted by the shell. The order of preference is the `$GIT_PAGER` environment variable, then `core.pager` configuration, then `$PAGER`, and then the default chosen at compile time (usually 'less')",
+	},
+	{
+		name: "core.precomposeUnicode",
+		description:
+			"This option is only used by Mac OS implementation of Git. When core.precomposeUnicode=true, Git reverts the unicode decomposition of filenames done by Mac OS. This is useful when sharing a repository between Mac OS and Linux or Windows. (Git for Windows 1.7.10 or higher is needed, or Git under cygwin 1.7). When false, file names are handled fully transparent by Git, which is backward compatible with older versions of Git",
+	},
+	{
+		name: "core.preferSymlinkRefs",
+		description:
+			'Instead of the default "symref" format for HEAD and other symbolic reference files, use symbolic links. This is sometimes needed to work with old scripts that expect HEAD to be a symbolic link',
+	},
+	{
+		name: "core.preloadIndex",
+		description: "Enable parallel index preload for operations like 'git diff'",
+	},
+	{
+		name: "core.protectHFS",
+		description:
+			"If set to true, do not allow checkout of paths that would be considered equivalent to `.git` on an HFS+ filesystem. Defaults to `true` on Mac OS, and `false` elsewhere",
+	},
+	{
+		name: "core.protectNTFS",
+		description:
+			'If set to true, do not allow checkout of paths that would cause problems with the NTFS filesystem, e.g. conflict with 8.3 "short" names. Defaults to `true` on Windows, and `false` elsewhere',
+	},
+	{
+		name: "core.quotePath",
+		description:
+			'Commands that output paths (e.g. \'ls-files\', \'diff\'), will quote "unusual" characters in the pathname by enclosing the pathname in double-quotes and escaping those characters with backslashes in the same way C escapes control characters (e.g. `\\t` for TAB, `\\n` for LF, `\\\\` for backslash) or bytes with values larger than 0x80 (e.g. octal `\\302\\265` for "micro" in UTF-8). If this variable is set to false, bytes higher than 0x80 are not considered "unusual" any more. Double-quotes, backslash and control characters are always escaped regardless of the setting of this variable. A simple space character is not considered "unusual". Many commands can output pathnames completely verbatim using the `-z` option. The default value is true',
+	},
+	{
+		name: "core.repositoryFormatVersion",
+		description:
+			"Internal variable identifying the repository format and layout version",
+	},
+	{
+		name: "core.restrictinheritedhandles",
+		description:
+			"Windows-only: override whether spawned processes inherit only standard file handles (`stdin`, `stdout` and `stderr`) or all handles. Can be `auto`, `true` or `false`. Defaults to `auto`, which means `true` on Windows 7 and later, and `false` on older Windows versions",
+	},
+	{
+		name: "core.safecrlf",
+		description:
+			'If true, makes Git check if converting `CRLF` is reversible when end-of-line conversion is active. Git will verify if a command modifies a file in the work tree either directly or indirectly. For example, committing a file followed by checking out the same file should yield the original file in the work tree. If this is not the case for the current setting of `core.autocrlf`, Git will reject the file. The variable can be set to "warn", in which case Git will only warn about an irreversible conversion but continue the operation',
+	},
+	{
+		name: "core.sharedRepository",
+		description:
+			"When 'group' (or 'true'), the repository is made shareable between several users in a group (making sure all the files and objects are group-writable). When 'all' (or 'world' or 'everybody'), the repository will be readable by all users, additionally to being group-shareable. When 'umask' (or 'false'), Git will use permissions reported by umask(2). When '0xxx', where '0xxx' is an octal number, files in the repository will have this mode value. '0xxx' will override user's umask value (whereas the other options will only override requested parts of the user's umask value). Examples: '0660' will make the repo read/write-able for the owner and group, but inaccessible to others (equivalent to 'group' unless umask is e.g. '0022'). '0640' is a repository that is group-readable but not group-writable. See git-init[1]. False by default",
+	},
+	{
+		name: "core.sparseCheckout",
+		description:
+			'Enable "sparse checkout" feature. See git-sparse-checkout[1] for more information',
+	},
+	{
+		name: "core.sparseCheckoutCone",
+		description:
+			'Enables the "cone mode" of the sparse checkout feature. When the sparse-checkout file contains a limited set of patterns, this mode provides significant performance advantages. The "non-cone mode" can be requested to allow specifying more flexible patterns by setting this variable to \'false\'. See git-sparse-checkout[1] for more information',
+	},
+	{
+		name: "core.splitIndex",
+		description:
+			"If true, the split-index feature of the index will be used. See git-update-index[1]. False by default",
+	},
+	{
+		name: "core.sshCommand",
+		description:
+			"If this variable is set, `git fetch` and `git push` will use the specified command instead of `ssh` when they need to connect to a remote system. The command is in the same form as the `GIT_SSH_COMMAND` environment variable and is overridden when the environment variable is set",
+	},
+	{
+		name: "core.symlinks",
+		description:
+			"If false, symbolic links are checked out as small plain files that contain the link text. git-update-index[1] and git-add[1] will not change the recorded type to regular file. Useful on filesystems like FAT that do not support symbolic links",
+	},
+	{
+		name: "core.trustctime",
+		description:
+			"If false, the ctime differences between the index and the working tree are ignored; useful when the inode change time is regularly modified by something outside Git (file system crawlers and some backup systems). See git-update-index[1]. True by default",
+	},
+	{
+		name: "core.unsetenvvars",
+		description:
+			"Windows-only: comma-separated list of environment variables' names that need to be unset before spawning any other process. Defaults to `PERL5LIB` to account for the fact that Git for Windows insists on using its own Perl interpreter",
+	},
+	{
+		name: "core.untrackedCache",
+		description:
+			"Determines what to do about the untracked cache feature of the index. It will be kept, if this variable is unset or set to `keep`. It will automatically be added if set to `true`. And it will automatically be removed, if set to `false`. Before setting it to `true`, you should check that mtime is working properly on your system. See git-update-index[1]. `keep` by default, unless `feature.manyFiles` is enabled which sets this setting to `true` by default",
+	},
+	{
+		name: "core.useReplaceRefs",
+		description:
+			"If set to `false`, behave as if the `--no-replace-objects` option was given on the command line. See git[1] and git-replace[1] for more information",
+	},
+	{
+		name: "core.warnAmbiguousRefs",
+		description:
+			"If true, Git will warn you if the ref name you passed it is ambiguous and might match multiple refs in the repository. True by default",
+	},
+	{
+		name: "core.whitespace",
+		description:
+			"A comma separated list of common whitespace problems to notice. 'git diff' will use `color.diff.whitespace` to highlight them, and 'git apply --whitespace=error' will consider them as errors. You can prefix `-` to disable any of them (e.g. `-trailing-space`):",
+	},
+	{
+		name: "core.worktree",
+		description:
+			"Set the path to the root of the working tree. If `GIT_COMMON_DIR` environment variable is set, core.worktree is ignored and not used for determining the root of working tree. This can be overridden by the `GIT_WORK_TREE` environment variable and the `--work-tree` command-line option. The value can be an absolute path or relative to the path to the .git directory, which is either specified by --git-dir or GIT_DIR, or automatically discovered. If --git-dir or GIT_DIR is specified but none of --work-tree, GIT_WORK_TREE and core.worktree is specified, the current working directory is regarded as the top level of your working tree",
+	},
+	{
+		name: "credential.helper",
+		description:
+			"Specify an external helper to be called when a username or password credential is needed; the helper may consult external storage to avoid prompting the user for the credentials. This is normally the name of a credential helper with possible arguments, but may also be an absolute path with arguments or, if preceded by `!`, shell commands",
+	},
+	{
+		name: "credential.useHttpPath",
+		description:
+			'When acquiring credentials, consider the "path" component of an http or https URL to be important. Defaults to false. See gitcredentials[7] for more information',
+	},
+	{
+		name: "credential.username",
+		description:
+			"If no username is set for a network authentication, use this username by default. See credential.<context>.* below, and gitcredentials[7]",
+	},
+	{
+		name: "credentialCache.ignoreSIGHUP",
+		description:
+			"Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting",
+	},
+	{
+		name: "credentialStore.lockTimeoutMS",
+		description:
+			"The length of time, in milliseconds, for git-credential-store to retry when trying to lock the credentials file. Value 0 means not to retry at all; -1 means to try indefinitely. Default is 1000 (i.e., retry for 1s)",
+	},
+	{
+		name: "credential.<url>.helper",
+		insertValue: "credential.{cursor}.helper",
+		description:
+			"Specify an external helper to be called when a username or password credential is needed; the helper may consult external storage to avoid prompting the user for the credentials. This is normally the name of a credential helper with possible arguments, but may also be an absolute path with arguments or, if preceded by `!`, shell commands",
+	},
+	{
+		name: "credential.<url>.useHttpPath",
+		insertValue: "credential.{cursor}.useHttpPath",
+		description:
+			'When acquiring credentials, consider the "path" component of an http or https URL to be important. Defaults to false. See gitcredentials[7] for more information',
+	},
+	{
+		name: "credential.<url>.username",
+		insertValue: "credential.{cursor}.username",
+		description:
+			"If no username is set for a network authentication, use this username by default. See credential.<context>.* below, and gitcredentials[7]",
+	},
+	{
+		name: "credentialCache.<url>.ignoreSIGHUP",
+		insertValue: "credentialCache.{cursor}.ignoreSIGHUP",
+		description:
+			"Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting",
+	},
+	{
+		name: "credentialStore.<url>.lockTimeoutMS",
+		insertValue: "credentialStore.{cursor}.lockTimeoutMS",
+		description:
+			"The length of time, in milliseconds, for git-credential-store to retry when trying to lock the credentials file. Value 0 means not to retry at all; -1 means to try indefinitely. Default is 1000 (i.e., retry for 1s)",
+	},
+	{
+		name: "diff.<driver>.binary",
+		insertValue: "diff.{cursor}.binary",
+		description:
+			"Set this option to true to make the diff driver treat files as binary. See gitattributes[5] for details",
+	},
+	{
+		name: "diff.<driver>.cachetextconv",
+		insertValue: "diff.{cursor}.cachetextconv",
+		description:
+			"Set this option to true to make the diff driver cache the text conversion outputs. See gitattributes[5] for details",
+	},
+	{
+		name: "diff.<driver>.command",
+		insertValue: "diff.{cursor}.command",
+		description:
+			"The custom diff driver command. See gitattributes[5] for details",
+	},
+	{
+		name: "diff.<driver>.textconv",
+		insertValue: "diff.{cursor}.textconv",
+		description:
+			"The command that the diff driver should call to generate the text-converted version of a file. The result of the conversion is used to generate a human-readable diff. See gitattributes[5] for details",
+	},
+	{
+		name: "diff.<driver>.wordRegex",
+		insertValue: "diff.{cursor}.wordRegex",
+		description:
+			"The regular expression that the diff driver should use to split words in a line. See gitattributes[5] for details",
+	},
+	{
+		name: "diff.<driver>.xfuncname",
+		insertValue: "diff.{cursor}.xfuncname",
+		description:
+			"The regular expression that the diff driver should use to recognize the hunk header. A built-in pattern may also be used. See gitattributes[5] for details",
+	},
+	{
+		name: "diff.algorithm",
+		description: "Choose a diff algorithm",
+	},
+	{
+		name: "diff.autoRefreshIndex",
+		description:
+			"When using 'git diff' to compare with work tree files, do not consider stat-only change as changed. Instead, silently run `git update-index --refresh` to update the cached stat information for paths whose contents in the work tree match the contents in the index. This option defaults to true. Note that this affects only 'git diff' Porcelain, and not lower level 'diff' commands such as 'git diff-files'",
+	},
+	{
+		name: "diff.colorMoved",
+		description:
+			"If set to either a valid `<mode>` or a true value, moved lines in a diff are colored differently, for details of valid modes see '--color-moved' in git-diff[1]. If simply set to true the default color mode will be used. When set to false, moved lines are not colored",
+	},
+	{
+		name: "diff.colorMovedWS",
+		description:
+			"When moved lines are colored using e.g. the `diff.colorMoved` setting, this option controls the `<mode>` how spaces are treated for details of valid modes see '--color-moved-ws' in git-diff[1]",
+	},
+	{
+		name: "diff.context",
+		description:
+			"Generate diffs with <n> lines of context instead of the default of 3. This value is overridden by the -U option",
+	},
+	{
+		name: "diff.dirstat",
+		description:
+			"A comma separated list of `--dirstat` parameters specifying the default behavior of the `--dirstat` option to git-diff[1] and friends. The defaults can be overridden on the command line (using `--dirstat=<param1,param2,...>`). The fallback defaults (when not changed by `diff.dirstat`) are `changes,noncumulative,3`. The following parameters are available:",
+	},
+	{
+		name: "diff.external",
+		description:
+			'If this config variable is set, diff generation is not performed using the internal diff machinery, but using the given command. Can be overridden with the `GIT_EXTERNAL_DIFF\' environment variable. The command is called with parameters as described under "git Diffs" in git[1]. Note: if you want to use an external diff program only on a subset of your files, you might want to use gitattributes[5] instead',
+	},
+	{
+		name: "diff.guitool",
+		description:
+			"Controls which diff tool is used by git-difftool[1] when the -g/--gui flag is specified. This variable overrides the value configured in `merge.guitool`. The list below shows the valid built-in values. Any other value is treated as a custom diff tool and requires that a corresponding difftool.<guitool>.cmd variable is defined",
+	},
+	{
+		name: "diff.ignoreSubmodules",
+		description:
+			"Sets the default value of --ignore-submodules. Note that this affects only 'git diff' Porcelain, and not lower level 'diff' commands such as 'git diff-files'. 'git checkout' and 'git switch' also honor this setting when reporting uncommitted changes. Setting it to 'all' disables the submodule summary normally shown by 'git commit' and 'git status' when `status.submoduleSummary` is set unless it is overridden by using the --ignore-submodules command-line option. The 'git submodule' commands are not affected by this setting. By default this is set to untracked so that any untracked submodules are ignored",
+	},
+	{
+		name: "diff.indentHeuristic",
+		description:
+			"Set this option to `false` to disable the default heuristics that shift diff hunk boundaries to make patches easier to read",
+	},
+	{
+		name: "diff.interHunkContext",
+		description:
+			"Show the context between diff hunks, up to the specified number of lines, thereby fusing the hunks that are close to each other. This value serves as the default for the `--inter-hunk-context` command line option",
+	},
+	{
+		name: "diff.mnemonicPrefix",
+		description:
+			'If set, \'git diff\' uses a prefix pair that is different from the standard "a/" and "b/" depending on what is being compared. When this configuration is in effect, reverse diff output also swaps the order of the prefixes:',
+	},
+	{
+		name: "diff.noprefix",
+		description:
+			"If set, 'git diff' does not show any source or destination prefix",
+	},
+	{
+		name: "diff.orderFile",
+		description:
+			"File indicating how to order files within a diff. See the '-O' option to git-diff[1] for details. If `diff.orderFile` is a relative pathname, it is treated as relative to the top of the working tree",
+	},
+	{
+		name: "diff.relative",
+		description:
+			"If set to 'true', 'git diff' does not show changes outside of the directory and show pathnames relative to the current directory",
+	},
+	{
+		name: "diff.renameLimit",
+		description:
+			"The number of files to consider in the exhaustive portion of copy/rename detection; equivalent to the 'git diff' option `-l`. If not set, the default value is currently 1000. This setting has no effect if rename detection is turned off",
+	},
+	{
+		name: "diff.renames",
+		description:
+			'Whether and how Git detects renames. If set to "false", rename detection is disabled. If set to "true", basic rename detection is enabled. If set to "copies" or "copy", Git will detect copies, as well. Defaults to true. Note that this affects only \'git diff\' Porcelain like git-diff[1] and git-log[1], and not lower level commands such as git-diff-files[1]',
+	},
+	{
+		name: "diff.statGraphWidth",
+		description:
+			"Limit the width of the graph part in --stat output. If set, applies to all commands generating --stat output except format-patch",
+	},
+	{
+		name: "diff.submodule",
+		description:
+			'Specify the format in which differences in submodules are shown. The "short" format just shows the names of the commits at the beginning and end of the range. The "log" format lists the commits in the range like git-submodule[1] `summary` does. The "diff" format shows an inline diff of the changed contents of the submodule. Defaults to "short"',
+	},
+	{
+		name: "diff.suppressBlankEmpty",
+		description:
+			"A boolean to inhibit the standard behavior of printing a space before each empty output line. Defaults to false",
+	},
+	{
+		name: "diff.tool",
+		description:
+			"Controls which diff tool is used by git-difftool[1]. This variable overrides the value configured in `merge.tool`. The list below shows the valid built-in values. Any other value is treated as a custom diff tool and requires that a corresponding difftool.<tool>.cmd variable is defined",
+	},
+	{
+		name: "diff.wordRegex",
+		description:
+			'A POSIX Extended Regular Expression used to determine what is a "word" when performing word-by-word difference calculations. Character sequences that match the regular expression are "words", all other characters are *ignorable* whitespace',
+	},
+	{
+		name: "diff.wsErrorHighlight",
+		description:
+			"Highlight whitespace errors in the `context`, `old` or `new` lines of the diff. Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`. The whitespace errors are colored with `color.diff.whitespace`. The command line option `--ws-error-highlight=<kind>` overrides this setting",
+	},
+	{
+		name: "difftool.<tool>.cmd",
+		insertValue: "difftool.{cursor}.cmd",
+		description:
+			"Specify the command to invoke the specified diff tool. The specified command is evaluated in shell with the following variables available: 'LOCAL' is set to the name of the temporary file containing the contents of the diff pre-image and 'REMOTE' is set to the name of the temporary file containing the contents of the diff post-image",
+	},
+	{
+		name: "difftool.<tool>.path",
+		insertValue: "difftool.{cursor}.path",
+		description:
+			"Override the path for the given tool. This is useful in case your tool is not in the PATH",
+	},
+	{
+		name: "difftool.prompt",
+		description: "Prompt before each invocation of the diff tool",
+	},
+	{
+		name: "extensions.objectFormat",
+		description:
+			"Specify the hash algorithm to use. The acceptable values are `sha1` and `sha256`. If not specified, `sha1` is assumed. It is an error to specify this key unless `core.repositoryFormatVersion` is 1",
+	},
+	{
+		name: "extensions.worktreeConfig",
+		description:
+			"If enabled, then worktrees will load config settings from the `$GIT_DIR/config.worktree` file in addition to the `$GIT_COMMON_DIR/config` file. Note that `$GIT_COMMON_DIR` and `$GIT_DIR` are the same for the main working tree, while other working trees have `$GIT_DIR` equal to `$GIT_COMMON_DIR/worktrees/<id>/`. The settings in the `config.worktree` file will override settings from any other config files",
+	},
+	{
+		name: "fastimport.unpackLimit",
+		description:
+			"If the number of objects imported by git-fast-import[1] is below this limit, then the objects will be unpacked into loose object files. However if the number of imported objects equals or exceeds this limit then the pack will be stored as a pack. Storing the pack from a fast-import can make the import operation complete faster, especially on slow filesystems. If not set, the value of `transfer.unpackLimit` is used instead",
+	},
+	{
+		name: "feature.*",
+		insertValue: "feature.{cursor}",
+		description:
+			"The config settings that start with `feature.` modify the defaults of a group of other config settings. These groups are created by the Git developer community as recommended defaults and are subject to change. In particular, new config options may be added with different defaults",
+	},
+	{
+		name: "feature.experimental",
+		description:
+			"Enable config options that are new to Git, and are being considered for future defaults. Config settings included here may be added or removed with each release, including minor version updates. These settings may have unintended interactions since they are so new. Please enable this setting if you are interested in providing feedback on experimental features. The new default values are:",
+	},
+	{
+		name: "feature.manyFiles",
+		description:
+			"Enable config options that optimize for repos with many files in the working directory. With many files, commands such as `git status` and `git checkout` may be slow and these new defaults improve performance:",
+	},
+	{
+		name: "fetch.fsck.<msg-id>",
+		insertValue: "fetch.fsck.{cursor}",
+		description:
+			"Acts like `fsck.<msg-id>`, but is used by git-fetch-pack[1] instead of git-fsck[1]. See the `fsck.<msg-id>` documentation for details",
+	},
+	{
+		name: "fetch.fsck.skipList",
+		description:
+			"Acts like `fsck.skipList`, but is used by git-fetch-pack[1] instead of git-fsck[1]. See the `fsck.skipList` documentation for details",
+	},
+	{
+		name: "fetch.fsckObjects",
+		description:
+			"If it is set to true, git-fetch-pack will check all fetched objects. See `transfer.fsckObjects` for what's checked. Defaults to false. If not set, the value of `transfer.fsckObjects` is used instead",
+	},
+	{
+		name: "fetch.negotiationAlgorithm",
+		description:
+			'Control how information about the commits in the local repository is sent when negotiating the contents of the packfile to be sent by the server. Set to "consecutive" to use an algorithm that walks over consecutive commits checking each one. Set to "skipping" to use an algorithm that skips commits in an effort to converge faster, but may result in a larger-than-necessary packfile; or set to "noop" to not send any information at all, which will almost certainly result in a larger-than-necessary packfile, but will skip the negotiation step. Set to "default" to override settings made previously and use the default behaviour. The default is normally "consecutive", but if `feature.experimental` is true, then the default is "skipping". Unknown values will cause \'git fetch\' to error out',
+	},
+	{
+		name: "fetch.output",
+		description:
+			"Control how ref update status is printed. Valid values are `full` and `compact`. Default value is `full`. See section OUTPUT in git-fetch[1] for detail",
+	},
+	{
+		name: "fetch.parallel",
+		description:
+			"Specifies the maximal number of fetch operations to be run in parallel at a time (submodules, or remotes when the `--multiple` option of git-fetch[1] is in effect)",
+	},
+	{
+		name: "fetch.prune",
+		description:
+			"If true, fetch will automatically behave as if the `--prune` option was given on the command line. See also `remote.<name>.prune` and the PRUNING section of git-fetch[1]",
+	},
+	{
+		name: "fetch.pruneTags",
+		description:
+			"If true, fetch will automatically behave as if the `refs/tags/*:refs/tags/*` refspec was provided when pruning, if not set already. This allows for setting both this option and `fetch.prune` to maintain a 1=1 mapping to upstream refs. See also `remote.<name>.pruneTags` and the PRUNING section of git-fetch[1]",
+	},
+	{
+		name: "fetch.recurseSubmodules",
+		description:
+			"This option controls whether `git fetch` (and the underlying fetch in `git pull`) will recursively fetch into populated submodules. This option can be set either to a boolean value or to 'on-demand'. Setting it to a boolean changes the behavior of fetch and pull to recurse unconditionally into submodules when set to true or to not recurse at all when set to false. When set to 'on-demand', fetch and pull will only recurse into a populated submodule when its superproject retrieves a commit that updates the submodule's reference. Defaults to 'on-demand', or to the value of 'submodule.recurse' if set",
+	},
+	{
+		name: "fetch.showForcedUpdates",
+		description:
+			"Set to false to enable `--no-show-forced-updates` in git-fetch[1] and git-pull[1] commands. Defaults to true",
+	},
+	{
+		name: "fetch.unpackLimit",
+		description:
+			"If the number of objects fetched over the Git native transfer is below this limit, then the objects will be unpacked into loose object files. However if the number of received objects equals or exceeds this limit then the received pack will be stored as a pack, after adding any missing delta bases. Storing the pack from a push can make the push operation complete faster, especially on slow filesystems. If not set, the value of `transfer.unpackLimit` is used instead",
+	},
+	{
+		name: "fetch.writeCommitGraph",
+		description:
+			"Set to true to write a commit-graph after every `git fetch` command that downloads a pack-file from a remote. Using the `--split` option, most executions will create a very small commit-graph file on top of the existing commit-graph file(s). Occasionally, these files will merge and the write may take longer. Having an updated commit-graph file helps performance of many Git commands, including `git merge-base`, `git push -f`, and `git log --graph`. Defaults to false",
+	},
+	{
+		name: "filter.<driver>.clean",
+		insertValue: "filter.{cursor}.clean",
+		description:
+			"The command which is used to convert the content of a worktree file to a blob upon checkin. See gitattributes[5] for details",
+	},
+	{
+		name: "filter.<driver>.smudge",
+		insertValue: "filter.{cursor}.smudge",
+		description:
+			"The command which is used to convert the content of a blob object to a worktree file upon checkout. See gitattributes[5] for details",
+	},
+	{
+		name: "format.attach",
+		description:
+			"Enable multipart/mixed attachments as the default for 'format-patch'. The value can also be a double quoted string which will enable attachments as the default and set the value as the boundary. See the --attach option in git-format-patch[1]",
+	},
+	{
+		name: "format.cc",
+		description:
+			"Additional recipients to include in a patch to be submitted by mail. See the --to and --cc options in git-format-patch[1]",
+	},
+	{
+		name: "format.coverFromDescription",
+		description:
+			"The default mode for format-patch to determine which parts of the cover letter will be populated using the branch's description. See the `--cover-from-description` option in git-format-patch[1]",
+	},
+	{
+		name: "format.coverLetter",
+		description:
+			'A boolean that controls whether to generate a cover-letter when format-patch is invoked, but in addition can be set to "auto", to generate a cover-letter only when there\'s more than one patch. Default is false',
+	},
+	{
+		name: "format.encodeEmailHeaders",
+		description:
+			'Encode email headers that have non-ASCII characters with "Q-encoding" (described in RFC 2047) for email transmission. Defaults to true',
+	},
+	{
+		name: "format.filenameMaxLength",
+		description:
+			"The maximum length of the output filenames generated by the `format-patch` command; defaults to 64. Can be overridden by the `--filename-max-length=<n>` command line option",
+	},
+	{
+		name: "format.from",
+		description:
+			'Provides the default value for the `--from` option to format-patch. Accepts a boolean value, or a name and email address. If false, format-patch defaults to `--no-from`, using commit authors directly in the "From:" field of patch mails. If true, format-patch defaults to `--from`, using your committer identity in the "From:" field of patch mails and including a "From:" field in the body of the patch mail if different. If set to a non-boolean value, format-patch uses that value instead of your committer identity. Defaults to false',
+	},
+	{
+		name: "format.headers",
+		description:
+			"Additional email headers to include in a patch to be submitted by mail. See git-format-patch[1]",
+	},
+	{
+		name: "format.notes",
+		description:
+			"Provides the default value for the `--notes` option to format-patch. Accepts a boolean value, or a ref which specifies where to get notes. If false, format-patch defaults to `--no-notes`. If true, format-patch defaults to `--notes`. If set to a non-boolean value, format-patch defaults to `--notes=<ref>`, where `ref` is the non-boolean value. Defaults to false",
+	},
+	{
+		name: "format.numbered",
+		description:
+			'A boolean which can enable or disable sequence numbers in patch subjects. It defaults to "auto" which enables it only if there is more than one patch. It can be enabled or disabled for all messages by setting it to "true" or "false". See --numbered option in git-format-patch[1]',
+	},
+	{
+		name: "format.outputDirectory",
+		description:
+			"Set a custom directory to store the resulting files instead of the current working directory. All directory components will be created",
+	},
+	{
+		name: "format.pretty",
+		description:
+			"The default pretty format for log/show/whatchanged command, See git-log[1], git-show[1], git-whatchanged[1]",
+	},
+	{
+		name: "format.signature",
+		description:
+			'The default for format-patch is to output a signature containing the Git version number. Use this variable to change that default. Set this variable to the empty string ("") to suppress signature generation',
+	},
+	{
+		name: "format.signatureFile",
+		description:
+			"Works just like format.signature except the contents of the file specified by this variable will be used as the signature",
+	},
+	{
+		name: "format.signOff",
+		description:
+			"A boolean value which lets you enable the `-s/--signoff` option of format-patch by default. *Note:* Adding the `Signed-off-by` trailer to a patch should be a conscious act and means that you certify you have the rights to submit this work under the same open source license. Please see the 'SubmittingPatches' document for further discussion",
+	},
+	{
+		name: "format.subjectPrefix",
+		description:
+			"The default for format-patch is to output files with the '[PATCH]' subject prefix. Use this variable to change that prefix",
+	},
+	{
+		name: "format.suffix",
+		description:
+			"The default for format-patch is to output files with the suffix `.patch`. Use this variable to change that suffix (make sure to include the dot if you want it)",
+	},
+	{
+		name: "format.thread",
+		description:
+			"The default threading style for 'git format-patch'. Can be a boolean value, or `shallow` or `deep`. `shallow` threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. `deep` threading makes every mail a reply to the previous one. A true boolean value is the same as `shallow`, and a false value disables threading",
+	},
+	{
+		name: "format.useAutoBase",
+		description:
+			'A boolean value which lets you enable the `--base=auto` option of format-patch by default. Can also be set to "whenAble" to allow enabling `--base=auto` if a suitable base is available, but to skip adding base info otherwise without the format dying',
+	},
+	{
+		name: "fsck.<msg-id>",
+		insertValue: "fsck.{cursor}",
+		description:
+			"During fsck git may find issues with legacy data which wouldn't be generated by current versions of git, and which wouldn't be sent over the wire if `transfer.fsckObjects` was set. This feature is intended to support working with legacy repositories containing such data",
+	},
+	{
+		name: "fsck.skipList",
+		description:
+			"The path to a list of object names (i.e. one unabbreviated SHA-1 per line) that are known to be broken in a non-fatal way and should be ignored. On versions of Git 2.20 and later comments ('#'), empty lines, and any leading and trailing whitespace is ignored. Everything but a SHA-1 per line will error out on older versions",
+	},
+	{
+		name: "gc.<pattern>.reflogExpire",
+		insertValue: "gc.{cursor}.reflogExpire",
+		description:
+			'\'git reflog expire\' removes reflog entries older than this time; defaults to 90 days. The value "now" expires all entries immediately, and "never" suppresses expiration altogether. With "<pattern>" (e.g. "refs/stash") in the middle the setting applies only to the refs that match the <pattern>',
+	},
+	{
+		name: "gc.<pattern>.reflogExpireUnreachable",
+		insertValue: "gc.{cursor}.reflogExpireUnreachable",
+		description:
+			'\'git reflog expire\' removes reflog entries older than this time and are not reachable from the current tip; defaults to 30 days. The value "now" expires all entries immediately, and "never" suppresses expiration altogether. With "<pattern>" (e.g. "refs/stash") in the middle, the setting applies only to the refs that match the <pattern>',
+	},
+	{
+		name: "gc.aggressiveDepth",
+		description:
+			"The depth parameter used in the delta compression algorithm used by 'git gc --aggressive'. This defaults to 50, which is the default for the `--depth` option when `--aggressive` isn't in use",
+	},
+	{
+		name: "gc.aggressiveWindow",
+		description:
+			"The window size parameter used in the delta compression algorithm used by 'git gc --aggressive'. This defaults to 250, which is a much more aggressive window size than the default `--window` of 10",
+	},
+	{
+		name: "gc.auto",
+		description:
+			"When there are approximately more than this many loose objects in the repository, `git gc --auto` will pack them. Some Porcelain commands use this command to perform a light-weight garbage collection from time to time. The default value is 6700",
+	},
+	{
+		name: "gc.autoDetach",
+		description:
+			"Make `git gc --auto` return immediately and run in background if the system supports it. Default is true",
+	},
+	{
+		name: "gc.autoPackLimit",
+		description:
+			"When there are more than this many packs that are not marked with `*.keep` file in the repository, `git gc --auto` consolidates them into one larger pack. The default value is 50. Setting this to 0 disables it. Setting `gc.auto` to 0 will also disable this",
+	},
+	{
+		name: "gc.bigPackThreshold",
+		description:
+			"If non-zero, all packs larger than this limit are kept when `git gc` is run. This is very similar to `--keep-largest-pack` except that all packs that meet the threshold are kept, not just the largest pack. Defaults to zero. Common unit suffixes of 'k', 'm', or 'g' are supported",
+	},
+	{
+		name: "gc.cruftPacks",
+		description:
+			"Store unreachable objects in a cruft pack (see git-repack[1]) instead of as loose objects. The default is `false`",
+	},
+	{
+		name: "gc.logExpiry",
+		description:
+			"If the file gc.log exists, then `git gc --auto` will print its content and exit with status zero instead of running unless that file is more than 'gc.logExpiry' old. Default is \"1.day\". See `gc.pruneExpire` for more ways to specify its value",
+	},
+	{
+		name: "gc.packRefs",
+		description:
+			"Running `git pack-refs` in a repository renders it unclonable by Git versions prior to 1.5.1.2 over dumb transports such as HTTP. This variable determines whether 'git gc' runs `git pack-refs`. This can be set to `notbare` to enable it within all non-bare repos or it can be set to a boolean value. The default is `true`",
+	},
+	{
+		name: "gc.pruneExpire",
+		description:
+			"When 'git gc' is run, it will call 'prune --expire 2.weeks.ago' (and 'repack --cruft --cruft-expiration 2.weeks.ago' if using cruft packs via `gc.cruftPacks` or `--cruft`). Override the grace period with this config variable. The value \"now\" may be used to disable this grace period and always prune unreachable objects immediately, or \"never\" may be used to suppress pruning. This feature helps prevent corruption when 'git gc' runs concurrently with another process writing to the repository; see the \"NOTES\" section of git-gc[1]",
+	},
+	{
+		name: "gc.rerereResolved",
+		description:
+			"Records of conflicted merge you resolved earlier are kept for this many days when 'git rerere gc' is run. You can also use more human-readable \"1.month.ago\", etc. The default is 60 days. See git-rerere[1]",
+	},
+	{
+		name: "gc.rerereUnresolved",
+		description:
+			"Records of conflicted merge you have not resolved are kept for this many days when 'git rerere gc' is run. You can also use more human-readable \"1.month.ago\", etc. The default is 15 days. See git-rerere[1]",
+	},
+	{
+		name: "gc.worktreePruneExpire",
+		description:
+			"When 'git gc' is run, it calls 'git worktree prune --expire 3.months.ago'. This config variable can be used to set a different grace period. The value \"now\" may be used to disable the grace period and prune `$GIT_DIR/worktrees` immediately, or \"never\" may be used to suppress pruning",
+	},
+	{
+		name: "gc.writeCommitGraph",
+		description:
+			"If true, then gc will rewrite the commit-graph file when git-gc[1] is run. When using `git gc --auto` the commit-graph will be updated if housekeeping is required. Default is true. See git-commit-graph[1] for details",
+	},
+	{
+		name: "gitcvs.allBinary",
+		description:
+			"This is used if `gitcvs.usecrlfattr` does not resolve the correct '-kb' mode to use. If true, all unresolved files are sent to the client in mode '-kb'. This causes the client to treat them as binary files, which suppresses any newline munging it otherwise might do. Alternatively, if it is set to \"guess\", then the contents of the file are examined to decide if it is binary, similar to `core.autocrlf`",
+	},
+	{
+		name: "gitcvs.commitMsgAnnotation",
+		description:
+			'Append this string to each commit message. Set to empty string to disable this feature. Defaults to "via git-CVS emulator"',
+	},
+	{
+		name: "gitcvs.dbDriver",
+		description:
+			"Used Perl DBI driver. You can specify any available driver for this here, but it might not work. git-cvsserver is tested with 'DBD::SQLite', reported to work with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Experimental feature. May not contain double colons (`:`). Default: 'SQLite'. See git-cvsserver[1]",
+	},
+	{
+		name: "gitcvs.dbName",
+		description:
+			"Database used by git-cvsserver to cache revision information derived from the Git repository. The exact meaning depends on the used database driver, for SQLite (which is the default driver) this is a filename. Supports variable substitution (see git-cvsserver[1] for details). May not contain semicolons (`;`). Default: '%Ggitcvs.%m.sqlite'",
+	},
+	{
+		name: "gitcvs.dbTableNamePrefix",
+		description:
+			"Database table name prefix. Prepended to the names of any database tables used, allowing a single database to be used for several repositories. Supports variable substitution (see git-cvsserver[1] for details). Any non-alphabetic characters will be replaced with underscores",
+	},
+	{
+		name: "gitcvs.dbUser",
+		description:
+			"Database user and password. Only useful if setting `gitcvs.dbDriver`, since SQLite has no concept of database users and/or passwords. 'gitcvs.dbUser' supports variable substitution (see git-cvsserver[1] for details)",
+	},
+	{
+		name: "gitcvs.enabled",
+		description:
+			"Whether the CVS server interface is enabled for this repository. See git-cvsserver[1]",
+	},
+	{
+		name: "gitcvs.logFile",
+		description:
+			"Path to a log file where the CVS server interface well... logs various stuff. See git-cvsserver[1]",
+	},
+	{
+		name: "gitcvs.usecrlfattr",
+		description:
+			"If true, the server will look up the end-of-line conversion attributes for files to determine the `-k` modes to use. If the attributes force Git to treat a file as text, the `-k` mode will be left blank so CVS clients will treat it as text. If they suppress text conversion, the file will be set with '-kb' mode, which suppresses any newline munging the client might otherwise do. If the attributes do not allow the file type to be determined, then `gitcvs.allBinary` is used. See gitattributes[5]",
+	},
+	{
+		name: "gitweb.snapshot",
+		description: "See gitweb.conf[5] for description",
+	},
+	{
+		name: "gitweb.url",
+		description: "See gitweb[1] for description",
+	},
+	{
+		name: "gpg.<format>.program",
+		insertValue: "gpg.{cursor}.program",
+		description:
+			'Use this to customize the program used for the signing format you chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still be used as a legacy synonym for `gpg.openpgp.program`. The default value for `gpg.x509.program` is "gpgsm" and `gpg.ssh.program` is "ssh-keygen"',
+	},
+	{
+		name: "gpg.format",
+		description:
+			'Specifies which key format to use when signing with `--gpg-sign`. Default is "openpgp". Other possible values are "x509", "ssh"',
+	},
+	{
+		name: "gpg.minTrustLevel",
+		description:
+			"Specifies a minimum trust level for signature verification. If this option is unset, then signature verification for merge operations require a key with at least `marginal` trust. Other operations that perform signature verification require a key with at least `undefined` trust. Setting this option overrides the required trust-level for all operations. Supported values, in increasing order of significance:",
+	},
+	{
+		name: "gpg.program",
+		description:
+			'Use this custom program instead of "`gpg`" found on `$PATH` when making or verifying a PGP signature. The program must support the same command-line interface as GPG, namely, to verify a detached signature, "`gpg --verify $signature - <$file`" is run, and the program is expected to signal a good signature by exiting with code 0, and to generate an ASCII-armored detached signature, the standard input of "`gpg -bsau $key`" is fed with the contents to be signed, and the program is expected to send the result to its standard output',
+	},
+	{
+		name: "gpg.ssh.allowedSignersFile",
+		description:
+			'A file containing ssh public keys which you are willing to trust. The file consists of one or more lines of principals followed by an ssh public key. e.g.: `user1@example.com,user2@example.com ssh-rsa AAAAX1...` See ssh-keygen(1) "ALLOWED SIGNERS" for details. The principal is only used to identify the key and is available when verifying a signature',
+	},
+	{
+		name: "gpg.ssh.defaultKeyCommand",
+		description:
+			"This command that will be run when user.signingkey is not set and a ssh signature is requested. On successful exit a valid ssh public key prefixed with `key::` is expected in the first line of its output. This allows for a script doing a dynamic lookup of the correct public key when it is impractical to statically configure `user.signingKey`. For example when keys or SSH Certificates are rotated frequently or selection of the right key depends on external factors unknown to git",
+	},
+	{
+		name: "gpg.ssh.revocationFile",
+		description:
+			'Either a SSH KRL or a list of revoked public keys (without the principal prefix). See ssh-keygen(1) for details. If a public key is found in this file then it will always be treated as having trust level "never" and signatures will show as invalid',
+	},
+	{
+		name: "grep.column",
+		description: "If set to true, enable the `--column` option by default",
+	},
+	{
+		name: "grep.extendedRegexp",
+		description:
+			"If set to true, enable `--extended-regexp` option by default. This option is ignored when the `grep.patternType` option is set to a value other than 'default'",
+	},
+	{
+		name: "grep.fallbackToNoIndex",
+		description:
+			"If set to true, fall back to git grep --no-index if git grep is executed outside of a git repository. Defaults to false",
+	},
+	{
+		name: "grep.lineNumber",
+		description: "If set to true, enable `-n` option by default",
+	},
+	{
+		name: "grep.patternType",
+		description:
+			"Set the default matching behavior. Using a value of 'basic', 'extended', 'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, `--fixed-strings`, or `--perl-regexp` option accordingly, while the value 'default' will use the `grep.extendedRegexp` option to choose between 'basic' and 'extended'",
+	},
+	{
+		name: "grep.threads",
+		description:
+			"Number of grep worker threads to use. See `grep.threads` in git-grep[1] for more information",
+	},
+	{
+		name: "gui.blamehistoryctx",
+		description:
+			"Specifies the radius of history context in days to show in gitk[1] for the selected commit, when the `Show History Context` menu item is invoked from 'git gui blame'. If this variable is set to zero, the whole history is shown",
+	},
+	{
+		name: "gui.commitMsgWidth",
+		description:
+			'Defines how wide the commit message window is in the git-gui[1]. "75" is the default',
+	},
+	{
+		name: "gui.copyBlameThreshold",
+		description:
+			"Specifies the threshold to use in 'git gui blame' original location detection, measured in alphanumeric characters. See the git-blame[1] manual for more information on copy detection",
+	},
+	{
+		name: "gui.diffContext",
+		description:
+			'Specifies how many context lines should be used in calls to diff made by the git-gui[1]. The default is "5"',
+	},
+	{
+		name: "gui.displayUntracked",
+		description:
+			'Determines if git-gui[1] shows untracked files in the file list. The default is "true"',
+	},
+	{
+		name: "gui.encoding",
+		description:
+			"Specifies the default character encoding to use for displaying of file contents in git-gui[1] and gitk[1]. It can be overridden by setting the 'encoding' attribute for relevant files (see gitattributes[5]). If this option is not set, the tools default to the locale encoding",
+	},
+	{
+		name: "gui.fastCopyBlame",
+		description:
+			"If true, 'git gui blame' uses `-C` instead of `-C -C` for original location detection. It makes blame significantly faster on huge repositories at the expense of less thorough copy detection",
+	},
+	{
+		name: "gui.matchTrackingBranch",
+		description:
+			'Determines if new branches created with git-gui[1] should default to tracking remote branches with matching names or not. Default: "false"',
+	},
+	{
+		name: "gui.newBranchTemplate",
+		description:
+			"Is used as suggested name when creating new branches using the git-gui[1]",
+	},
+	{
+		name: "gui.pruneDuringFetch",
+		description:
+			'"true" if git-gui[1] should prune remote-tracking branches when performing a fetch. The default value is "false"',
+	},
+	{
+		name: "gui.spellingDictionary",
+		description:
+			'Specifies the dictionary used for spell checking commit messages in the git-gui[1]. When set to "none" spell checking is turned off',
+	},
+	{
+		name: "gui.trustmtime",
+		description:
+			"Determines if git-gui[1] should trust the file modification timestamp or not. By default the timestamps are not trusted",
+	},
+	{
+		name: "guitool.<name>.argPrompt",
+		insertValue: "guitool.{cursor}.argPrompt",
+		description:
+			"Request a string argument from the user, and pass it to the tool through the `ARGS` environment variable. Since requesting an argument implies confirmation, the 'confirm' option has no effect if this is enabled. If the option is set to 'true', 'yes', or '1', the dialog uses a built-in generic prompt; otherwise the exact value of the variable is used",
+	},
+	{
+		name: "guitool.<name>.cmd",
+		insertValue: "guitool.{cursor}.cmd",
+		description:
+			"Specifies the shell command line to execute when the corresponding item of the git-gui[1] `Tools` menu is invoked. This option is mandatory for every tool. The command is executed from the root of the working directory, and in the environment it receives the name of the tool as `GIT_GUITOOL`, the name of the currently selected file as 'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if the head is detached, 'CUR_BRANCH' is empty)",
+	},
+	{
+		name: "guitool.<name>.confirm",
+		insertValue: "guitool.{cursor}.confirm",
+		description: "Show a confirmation dialog before actually running the tool",
+	},
+	{
+		name: "guitool.<name>.needsFile",
+		insertValue: "guitool.{cursor}.needsFile",
+		description:
+			"Run the tool only if a diff is selected in the GUI. It guarantees that 'FILENAME' is not empty",
+	},
+	{
+		name: "guitool.<name>.noConsole",
+		insertValue: "guitool.{cursor}.noConsole",
+		description:
+			"Run the command silently, without creating a window to display its output",
+	},
+	{
+		name: "guitool.<name>.noRescan",
+		insertValue: "guitool.{cursor}.noRescan",
+		description:
+			"Don't rescan the working directory for changes after the tool finishes execution",
+	},
+	{
+		name: "guitool.<name>.prompt",
+		insertValue: "guitool.{cursor}.prompt",
+		description:
+			"Specifies the general prompt string to display at the top of the dialog, before subsections for 'argPrompt' and 'revPrompt'. The default value includes the actual command",
+	},
+	{
+		name: "guitool.<name>.revPrompt",
+		insertValue: "guitool.{cursor}.revPrompt",
+		description:
+			"Request a single valid revision from the user, and set the `REVISION` environment variable. In other aspects this option is similar to 'argPrompt', and can be used together with it",
+	},
+	{
+		name: "guitool.<name>.revUnmerged",
+		insertValue: "guitool.{cursor}.revUnmerged",
+		description:
+			"Show only unmerged branches in the 'revPrompt' subdialog. This is useful for tools similar to merge or rebase, but not for things like checkout or reset",
+	},
+	{
+		name: "guitool.<name>.title",
+		insertValue: "guitool.{cursor}.title",
+		description:
+			"Specifies the title to use for the prompt dialog. The default is the tool name",
+	},
+	{
+		name: "help.autoCorrect",
+		description:
+			"If git detects typos and can identify exactly one valid command similar to the error, git will try to suggest the correct command or even run the suggestion automatically. Possible config values are: - 0 (default): show the suggested command. - positive number: run the suggested command after specified",
+	},
+	{
+		name: "help.browser",
+		description:
+			"Specify the browser that will be used to display help in the 'web' format. See git-help[1]",
+	},
+	{
+		name: "help.format",
+		description:
+			"Override the default help format used by git-help[1]. Values 'man', 'info', 'web' and 'html' are supported. 'man' is the default. 'web' and 'html' are the same",
+	},
+	{
+		name: "help.htmlPath",
+		description:
+			"Specify the path where the HTML documentation resides. File system paths and URLs are supported. HTML pages will be prefixed with this path when help is displayed in the 'web' format. This defaults to the documentation path of your Git installation",
+	},
+	{
+		name: "http.cookieFile",
+		description:
+			"The pathname of a file containing previously stored cookie lines, which should be used in the Git http session, if they match the server. The file format of the file to read cookies from should be plain HTTP headers or the Netscape/Mozilla cookie file format (see `curl(1)`). NOTE that the file specified with http.cookieFile is used only as input unless http.saveCookies is set",
+	},
+	{
+		name: "http.curloptResolve",
+		description:
+			"Hostname resolution information that will be used first by libcurl when sending HTTP requests. This information should be in one of the following formats:",
+	},
+	{
+		name: "http.delegation",
+		description:
+			"Control GSSAPI credential delegation. The delegation is disabled by default in libcurl since version 7.21.7. Set parameter to tell the server what it is allowed to delegate when it comes to user credentials. Used with GSS/kerberos. Possible values are:",
+	},
+	{
+		name: "http.emptyAuth",
+		description:
+			"Attempt authentication without seeking a username or password. This can be used to attempt GSS-Negotiate authentication without specifying a username in the URL, as libcurl normally requires a username for authentication",
+	},
+	{
+		name: "http.extraHeader",
+		description:
+			"Pass an additional HTTP header when communicating with a server. If more than one such entry exists, all of them are added as extra headers. To allow overriding the settings inherited from the system config, an empty value will reset the extra headers to the empty list",
+	},
+	{
+		name: "http.followRedirects",
+		description:
+			"Whether git should follow HTTP redirects. If set to `true`, git will transparently follow any redirect issued by a server it encounters. If set to `false`, git will treat all redirects as errors. If set to `initial`, git will follow redirects only for the initial request to a remote, but not for subsequent follow-up HTTP requests. Since git uses the redirected URL as the base for the follow-up requests, this is generally sufficient. The default is `initial`",
+	},
+	{
+		name: "http.lowSpeedLimit",
+		description:
+			"If the HTTP transfer speed is less than 'http.lowSpeedLimit' for longer than 'http.lowSpeedTime' seconds, the transfer is aborted. Can be overridden by the `GIT_HTTP_LOW_SPEED_LIMIT` and `GIT_HTTP_LOW_SPEED_TIME` environment variables",
+	},
+	{
+		name: "http.maxRequests",
+		description:
+			"How many HTTP requests to launch in parallel. Can be overridden by the `GIT_HTTP_MAX_REQUESTS` environment variable. Default is 5",
+	},
+	{
+		name: "http.minSessions",
+		description:
+			"The number of curl sessions (counted across slots) to be kept across requests. They will not be ended with curl_easy_cleanup() until http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this value will be capped at 1. Defaults to 1",
+	},
+	{
+		name: "http.noEPSV",
+		description:
+			'A boolean which disables using of EPSV ftp command by curl. This can helpful with some "poor" ftp servers which don\'t support EPSV mode. Can be overridden by the `GIT_CURL_FTP_NO_EPSV` environment variable. Default is false (curl will use EPSV)',
+	},
+	{
+		name: "http.pinnedPubkey",
+		description:
+			"Public key of the https service. It may either be the filename of a PEM or DER encoded public key file or a string starting with 'sha256//' followed by the base64 encoded sha256 hash of the public key. See also libcurl 'CURLOPT_PINNEDPUBLICKEY'. git will exit with an error if this option is set but not supported by cURL",
+	},
+	{
+		name: "http.postBuffer",
+		description:
+			"Maximum size in bytes of the buffer used by smart HTTP transports when POSTing data to the remote system. For requests larger than this buffer size, HTTP/1.1 and Transfer-Encoding: chunked is used to avoid creating a massive pack file locally. Default is 1 MiB, which is sufficient for most requests",
+	},
+	{
+		name: "http.proxy",
+		description:
+			"Override the HTTP proxy, normally configured using the 'http_proxy', 'https_proxy', and 'all_proxy' environment variables (see `curl(1)`). In addition to the syntax understood by curl, it is possible to specify a proxy string with a user name but no password, in which case git will attempt to acquire one in the same way it does for other credentials. See gitcredentials[7] for more information. The syntax thus is '[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden on a per-remote basis; see remote.<name>.proxy",
+	},
+	{
+		name: "http.proxyAuthMethod",
+		description:
+			"Set the method with which to authenticate against the HTTP proxy. This only takes effect if the configured proxy string contains a user name part (i.e. is of the form 'user@host' or 'user@host:port'). This can be overridden on a per-remote basis; see `remote.<name>.proxyAuthMethod`. Both can be overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment variable. Possible values are:",
+	},
+	{
+		name: "http.proxySSLCAInfo",
+		description:
+			"Pathname to the file containing the certificate bundle that should be used to verify the proxy with when using an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CAINFO` environment variable",
+	},
+	{
+		name: "http.proxySSLCert",
+		description:
+			"The pathname of a file that stores a client certificate to use to authenticate with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CERT` environment variable",
+	},
+	{
+		name: "http.proxySSLCertPasswordProtected",
+		description:
+			"Enable Git's password prompt for the proxy SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED` environment variable",
+	},
+	{
+		name: "http.proxySSLKey",
+		description:
+			"The pathname of a file that stores a private key to use to authenticate with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_KEY` environment variable",
+	},
+	{
+		name: "http.saveCookies",
+		description:
+			"If set, store cookies received during requests to the file specified by http.cookieFile. Has no effect if http.cookieFile is unset",
+	},
+	{
+		name: "http.schannelCheckRevoke",
+		description:
+			'Used to enforce or disable certificate revocation checks in cURL when http.sslBackend is set to "schannel". Defaults to `true` if unset. Only necessary to disable this if Git consistently errors and the message is about checking the revocation status of a certificate. This option is ignored if cURL lacks support for setting the relevant SSL option at runtime',
+	},
+	{
+		name: "http.schannelUseSSLCAInfo",
+		description:
+			"As of cURL v7.60.0, the Secure Channel backend can use the certificate bundle provided via `http.sslCAInfo`, but that would override the Windows Certificate Store. Since this is not desirable by default, Git will tell cURL not to use that bundle by default when the `schannel` backend was configured via `http.sslBackend`, unless `http.schannelUseSSLCAInfo` overrides this behavior",
+	},
+	{
+		name: "http.sslBackend",
+		description:
+			'Name of the SSL backend to use (e.g. "openssl" or "schannel"). This option is ignored if cURL lacks support for choosing the SSL backend at runtime',
+	},
+	{
+		name: "http.sslCAInfo",
+		description:
+			"File containing the certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAINFO` environment variable",
+	},
+	{
+		name: "http.sslCAPath",
+		description:
+			"Path containing files with the CA certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAPATH` environment variable",
+	},
+	{
+		name: "http.sslCert",
+		description:
+			"File containing the SSL certificate when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CERT` environment variable",
+	},
+	{
+		name: "http.sslCertPasswordProtected",
+		description:
+			"Enable Git's password prompt for the SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the `GIT_SSL_CERT_PASSWORD_PROTECTED` environment variable",
+	},
+	{
+		name: "http.sslKey",
+		description:
+			"File containing the SSL private key when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_KEY` environment variable",
+	},
+	{
+		name: "http.sslTry",
+		description:
+			"Attempt to use AUTH SSL/TLS and encrypted data transfers when connecting via regular FTP protocol. This might be needed if the FTP server requires it for security reasons or you wish to connect securely whenever remote FTP server supports it. Default is false since it might trigger certificate verification errors on misconfigured servers",
+	},
+	{
+		name: "http.sslVerify",
+		description:
+			"Whether to verify the SSL certificate when fetching or pushing over HTTPS. Defaults to true. Can be overridden by the `GIT_SSL_NO_VERIFY` environment variable",
+	},
+	{
+		name: "http.sslVersion",
+		description:
+			"The SSL version to use when negotiating an SSL connection, if you want to force the default. The available and default version depend on whether libcurl was built against NSS or OpenSSL and the particular configuration of the crypto library in use. Internally this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl documentation for more details on the format of this option and for the ssl version supported. Currently the possible values of this option are:",
+	},
+	{
+		name: "http.userAgent",
+		description:
+			"The HTTP USER_AGENT string presented to an HTTP server. The default value represents the version of the client Git such as git/1.7.1. This option allows you to override this value to a more common value such as Mozilla/4.0. This may be necessary, for instance, if connecting through a firewall that restricts HTTP connections to a set of common USER_AGENT strings (but not including those like git/1.7.1). Can be overridden by the `GIT_HTTP_USER_AGENT` environment variable",
+	},
+	{
+		name: "http.version",
+		description:
+			"Use the specified HTTP protocol version when communicating with a server. If you want to force the default. The available and default version depend on libcurl. Currently the possible values of this option are:",
+	},
+	{
+		name: "http.<url>.cookieFile",
+		insertValue: "http.{cursor}.cookieFile",
+		description:
+			"The pathname of a file containing previously stored cookie lines, which should be used in the Git http session, if they match the server. The file format of the file to read cookies from should be plain HTTP headers or the Netscape/Mozilla cookie file format (see `curl(1)`). NOTE that the file specified with http.cookieFile is used only as input unless http.saveCookies is set",
+	},
+	{
+		name: "http.<url>.curloptResolve",
+		insertValue: "http.{cursor}.curloptResolve",
+		description:
+			"Hostname resolution information that will be used first by libcurl when sending HTTP requests. This information should be in one of the following formats:",
+	},
+	{
+		name: "http.<url>.delegation",
+		insertValue: "http.{cursor}.delegation",
+		description:
+			"Control GSSAPI credential delegation. The delegation is disabled by default in libcurl since version 7.21.7. Set parameter to tell the server what it is allowed to delegate when it comes to user credentials. Used with GSS/kerberos. Possible values are:",
+	},
+	{
+		name: "http.<url>.emptyAuth",
+		insertValue: "http.{cursor}.emptyAuth",
+		description:
+			"Attempt authentication without seeking a username or password. This can be used to attempt GSS-Negotiate authentication without specifying a username in the URL, as libcurl normally requires a username for authentication",
+	},
+	{
+		name: "http.<url>.extraHeader",
+		insertValue: "http.{cursor}.extraHeader",
+		description:
+			"Pass an additional HTTP header when communicating with a server. If more than one such entry exists, all of them are added as extra headers. To allow overriding the settings inherited from the system config, an empty value will reset the extra headers to the empty list",
+	},
+	{
+		name: "http.<url>.followRedirects",
+		insertValue: "http.{cursor}.followRedirects",
+		description:
+			"Whether git should follow HTTP redirects. If set to `true`, git will transparently follow any redirect issued by a server it encounters. If set to `false`, git will treat all redirects as errors. If set to `initial`, git will follow redirects only for the initial request to a remote, but not for subsequent follow-up HTTP requests. Since git uses the redirected URL as the base for the follow-up requests, this is generally sufficient. The default is `initial`",
+	},
+	{
+		name: "http.<url>.lowSpeedLimit",
+		insertValue: "http.{cursor}.lowSpeedLimit",
+		description:
+			"If the HTTP transfer speed is less than 'http.lowSpeedLimit' for longer than 'http.lowSpeedTime' seconds, the transfer is aborted. Can be overridden by the `GIT_HTTP_LOW_SPEED_LIMIT` and `GIT_HTTP_LOW_SPEED_TIME` environment variables",
+	},
+	{
+		name: "http.<url>.maxRequests",
+		insertValue: "http.{cursor}.maxRequests",
+		description:
+			"How many HTTP requests to launch in parallel. Can be overridden by the `GIT_HTTP_MAX_REQUESTS` environment variable. Default is 5",
+	},
+	{
+		name: "http.<url>.minSessions",
+		insertValue: "http.{cursor}.minSessions",
+		description:
+			"The number of curl sessions (counted across slots) to be kept across requests. They will not be ended with curl_easy_cleanup() until http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this value will be capped at 1. Defaults to 1",
+	},
+	{
+		name: "http.<url>.noEPSV",
+		insertValue: "http.{cursor}.noEPSV",
+		description:
+			'A boolean which disables using of EPSV ftp command by curl. This can helpful with some "poor" ftp servers which don\'t support EPSV mode. Can be overridden by the `GIT_CURL_FTP_NO_EPSV` environment variable. Default is false (curl will use EPSV)',
+	},
+	{
+		name: "http.<url>.pinnedPubkey",
+		insertValue: "http.{cursor}.pinnedPubkey",
+		description:
+			"Public key of the https service. It may either be the filename of a PEM or DER encoded public key file or a string starting with 'sha256//' followed by the base64 encoded sha256 hash of the public key. See also libcurl 'CURLOPT_PINNEDPUBLICKEY'. git will exit with an error if this option is set but not supported by cURL",
+	},
+	{
+		name: "http.<url>.postBuffer",
+		insertValue: "http.{cursor}.postBuffer",
+		description:
+			"Maximum size in bytes of the buffer used by smart HTTP transports when POSTing data to the remote system. For requests larger than this buffer size, HTTP/1.1 and Transfer-Encoding: chunked is used to avoid creating a massive pack file locally. Default is 1 MiB, which is sufficient for most requests",
+	},
+	{
+		name: "http.<url>.proxy",
+		insertValue: "http.{cursor}.proxy",
+		description:
+			"Override the HTTP proxy, normally configured using the 'http_proxy', 'https_proxy', and 'all_proxy' environment variables (see `curl(1)`). In addition to the syntax understood by curl, it is possible to specify a proxy string with a user name but no password, in which case git will attempt to acquire one in the same way it does for other credentials. See gitcredentials[7] for more information. The syntax thus is '[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden on a per-remote basis; see remote.<name>.proxy",
+	},
+	{
+		name: "http.<url>.proxyAuthMethod",
+		insertValue: "http.{cursor}.proxyAuthMethod",
+		description:
+			"Set the method with which to authenticate against the HTTP proxy. This only takes effect if the configured proxy string contains a user name part (i.e. is of the form 'user@host' or 'user@host:port'). This can be overridden on a per-remote basis; see `remote.<name>.proxyAuthMethod`. Both can be overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment variable. Possible values are:",
+	},
+	{
+		name: "http.<url>.proxySSLCAInfo",
+		insertValue: "http.{cursor}.proxySSLCAInfo",
+		description:
+			"Pathname to the file containing the certificate bundle that should be used to verify the proxy with when using an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CAINFO` environment variable",
+	},
+	{
+		name: "http.<url>.proxySSLCert",
+		insertValue: "http.{cursor}.proxySSLCert",
+		description:
+			"The pathname of a file that stores a client certificate to use to authenticate with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CERT` environment variable",
+	},
+	{
+		name: "http.<url>.proxySSLCertPasswordProtected",
+		insertValue: "http.{cursor}.proxySSLCertPasswordProtected",
+		description:
+			"Enable Git's password prompt for the proxy SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED` environment variable",
+	},
+	{
+		name: "http.<url>.proxySSLKey",
+		insertValue: "http.{cursor}.proxySSLKey",
+		description:
+			"The pathname of a file that stores a private key to use to authenticate with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_KEY` environment variable",
+	},
+	{
+		name: "http.<url>.saveCookies",
+		insertValue: "http.{cursor}.saveCookies",
+		description:
+			"If set, store cookies received during requests to the file specified by http.cookieFile. Has no effect if http.cookieFile is unset",
+	},
+	{
+		name: "http.<url>.schannelCheckRevoke",
+		insertValue: "http.{cursor}.schannelCheckRevoke",
+		description:
+			'Used to enforce or disable certificate revocation checks in cURL when http.sslBackend is set to "schannel". Defaults to `true` if unset. Only necessary to disable this if Git consistently errors and the message is about checking the revocation status of a certificate. This option is ignored if cURL lacks support for setting the relevant SSL option at runtime',
+	},
+	{
+		name: "http.<url>.schannelUseSSLCAInfo",
+		insertValue: "http.{cursor}.schannelUseSSLCAInfo",
+		description:
+			"As of cURL v7.60.0, the Secure Channel backend can use the certificate bundle provided via `http.sslCAInfo`, but that would override the Windows Certificate Store. Since this is not desirable by default, Git will tell cURL not to use that bundle by default when the `schannel` backend was configured via `http.sslBackend`, unless `http.schannelUseSSLCAInfo` overrides this behavior",
+	},
+	{
+		name: "http.<url>.sslBackend",
+		insertValue: "http.{cursor}.sslBackend",
+		description:
+			'Name of the SSL backend to use (e.g. "openssl" or "schannel"). This option is ignored if cURL lacks support for choosing the SSL backend at runtime',
+	},
+	{
+		name: "http.<url>.sslCAInfo",
+		insertValue: "http.{cursor}.sslCAInfo",
+		description:
+			"File containing the certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAINFO` environment variable",
+	},
+	{
+		name: "http.<url>.sslCAPath",
+		insertValue: "http.{cursor}.sslCAPath",
+		description:
+			"Path containing files with the CA certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CAPATH` environment variable",
+	},
+	{
+		name: "http.<url>.sslCert",
+		insertValue: "http.{cursor}.sslCert",
+		description:
+			"File containing the SSL certificate when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_CERT` environment variable",
+	},
+	{
+		name: "http.<url>.sslCertPasswordProtected",
+		insertValue: "http.{cursor}.sslCertPasswordProtected",
+		description:
+			"Enable Git's password prompt for the SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the `GIT_SSL_CERT_PASSWORD_PROTECTED` environment variable",
+	},
+	{
+		name: "http.<url>.sslKey",
+		insertValue: "http.{cursor}.sslKey",
+		description:
+			"File containing the SSL private key when fetching or pushing over HTTPS. Can be overridden by the `GIT_SSL_KEY` environment variable",
+	},
+	{
+		name: "http.<url>.sslTry",
+		insertValue: "http.{cursor}.sslTry",
+		description:
+			"Attempt to use AUTH SSL/TLS and encrypted data transfers when connecting via regular FTP protocol. This might be needed if the FTP server requires it for security reasons or you wish to connect securely whenever remote FTP server supports it. Default is false since it might trigger certificate verification errors on misconfigured servers",
+	},
+	{
+		name: "http.<url>.sslVerify",
+		insertValue: "http.{cursor}.sslVerify",
+		description:
+			"Whether to verify the SSL certificate when fetching or pushing over HTTPS. Defaults to true. Can be overridden by the `GIT_SSL_NO_VERIFY` environment variable",
+	},
+	{
+		name: "http.<url>.sslVersion",
+		insertValue: "http.{cursor}.sslVersion",
+		description:
+			"The SSL version to use when negotiating an SSL connection, if you want to force the default. The available and default version depend on whether libcurl was built against NSS or OpenSSL and the particular configuration of the crypto library in use. Internally this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl documentation for more details on the format of this option and for the ssl version supported. Currently the possible values of this option are:",
+	},
+	{
+		name: "http.<url>.userAgent",
+		insertValue: "http.{cursor}.userAgent",
+		description:
+			"The HTTP USER_AGENT string presented to an HTTP server. The default value represents the version of the client Git such as git/1.7.1. This option allows you to override this value to a more common value such as Mozilla/4.0. This may be necessary, for instance, if connecting through a firewall that restricts HTTP connections to a set of common USER_AGENT strings (but not including those like git/1.7.1). Can be overridden by the `GIT_HTTP_USER_AGENT` environment variable",
+	},
+	{
+		name: "http.<url>.version",
+		insertValue: "http.{cursor}.version",
+		description:
+			"Use the specified HTTP protocol version when communicating with a server. If you want to force the default. The available and default version depend on libcurl. Currently the possible values of this option are:",
+	},
+	{
+		name: "i18n.commitEncoding",
+		description:
+			"Character encoding the commit messages are stored in; Git itself does not care per se, but this information is necessary e.g. when importing commits from emails or in the gitk graphical history browser (and possibly at other places in the future or in other porcelains). See e.g. git-mailinfo[1]. Defaults to 'utf-8'",
+	},
+	{
+		name: "i18n.logOutputEncoding",
+		description:
+			"Character encoding the commit messages are converted to when running 'git log' and friends",
+	},
+	{
+		name: "imap.authMethod",
+		description:
+			"Specify authenticate method for authentication with IMAP server. If Git was built with the NO_CURL option, or if your curl version is older than 7.34.0, or if you're running git-imap-send with the `--no-curl` option, the only supported method is 'CRAM-MD5'. If this is not set then 'git imap-send' uses the basic IMAP plaintext LOGIN command",
+	},
+	{
+		name: "imap.folder",
+		description:
+			'The folder to drop the mails into, which is typically the Drafts folder. For example: "INBOX.Drafts", "INBOX/Drafts" or "[Gmail]/Drafts". Required',
+	},
+	{
+		name: "imap.host",
+		description:
+			"A URL identifying the server. Use an `imap://` prefix for non-secure connections and an `imaps://` prefix for secure connections. Ignored when imap.tunnel is set, but required otherwise",
+	},
+	{
+		name: "imap.pass",
+		description: "The password to use when logging in to the server",
+	},
+	{
+		name: "imap.port",
+		description:
+			"An integer port number to connect to on the server. Defaults to 143 for imap:// hosts and 993 for imaps:// hosts. Ignored when imap.tunnel is set",
+	},
+	{
+		name: "imap.preformattedHTML",
+		description:
+			"A boolean to enable/disable the use of html encoding when sending a patch. An html encoded patch will be bracketed with <pre> and have a content type of text/html. Ironically, enabling this option causes Thunderbird to send the patch as a plain/text, format=fixed email. Default is `false`",
+	},
+	{
+		name: "imap.sslverify",
+		description:
+			"A boolean to enable/disable verification of the server certificate used by the SSL/TLS connection. Default is `true`. Ignored when imap.tunnel is set",
+	},
+	{
+		name: "imap.tunnel",
+		description:
+			"Command used to setup a tunnel to the IMAP server through which commands will be piped instead of using a direct network connection to the server. Required when imap.host is not set",
+	},
+	{
+		name: "imap.user",
+		description: "The username to use when logging in to the server",
+	},
+	{
+		name: "includeIf.<condition>.path",
+		insertValue: "includeIf.{cursor}.path",
+		description:
+			'Special variables to include other configuration files. See the "CONFIGURATION FILE" section in the main git-config[1] documentation, specifically the "Includes" and "Conditional Includes" subsections',
+	},
+	{
+		name: "index.recordEndOfIndexEntries",
+		description:
+			"Specifies whether the index file should include an \"End Of Index Entry\" section. This reduces index load time on multiprocessor machines but produces a message \"ignoring EOIE extension\" when reading the index using Git versions before 2.20. Defaults to 'true' if index.threads has been explicitly enabled, 'false' otherwise",
+	},
+	{
+		name: "index.recordOffsetTable",
+		description:
+			"Specifies whether the index file should include an \"Index Entry Offset Table\" section. This reduces index load time on multiprocessor machines but produces a message \"ignoring IEOT extension\" when reading the index using Git versions before 2.20. Defaults to 'true' if index.threads has been explicitly enabled, 'false' otherwise",
+	},
+	{
+		name: "index.sparse",
+		description:
+			"When enabled, write the index using sparse-directory entries. This has no effect unless `core.sparseCheckout` and `core.sparseCheckoutCone` are both enabled. Defaults to 'false'",
+	},
+	{
+		name: "index.threads",
+		description:
+			"Specifies the number of threads to spawn when loading the index. This is meant to reduce index load time on multiprocessor machines. Specifying 0 or 'true' will cause Git to auto-detect the number of CPU's and set the number of threads accordingly. Specifying 1 or 'false' will disable multithreading. Defaults to 'true'",
+	},
+	{
+		name: "index.version",
+		description:
+			"Specify the version with which new index files should be initialized. This does not affect existing repositories. If `feature.manyFiles` is enabled, then the default is 4",
+	},
+	{
+		name: "init.defaultBranch",
+		description:
+			"Allows overriding the default branch name e.g. when initializing a new repository",
+	},
+	{
+		name: "init.templateDir",
+		description:
+			'Specify the directory from which templates will be copied. (See the "TEMPLATE DIRECTORY" section of git-init[1].)',
+	},
+	{
+		name: "instaweb.browser",
+		description:
+			"Specify the program that will be used to browse your working repository in gitweb. See git-instaweb[1]",
+	},
+	{
+		name: "instaweb.httpd",
+		description:
+			"The HTTP daemon command-line to start gitweb on your working repository. See git-instaweb[1]",
+	},
+	{
+		name: "instaweb.local",
+		description:
+			"If true the web server started by git-instaweb[1] will be bound to the local IP (127.0.0.1)",
+	},
+	{
+		name: "instaweb.modulePath",
+		description:
+			"The default module path for git-instaweb[1] to use instead of /usr/lib/apache2/modules. Only used if httpd is Apache",
+	},
+	{
+		name: "instaweb.port",
+		description:
+			"The port number to bind the gitweb httpd to. See git-instaweb[1]",
+	},
+	{
+		name: "interactive.diffFilter",
+		description:
+			"When an interactive command (such as `git add --patch`) shows a colorized diff, git will pipe the diff through the shell command defined by this configuration variable. The command may mark up the diff further for human consumption, provided that it retains a one-to-one correspondence with the lines in the original diff. Defaults to disabled (no filtering)",
+	},
+	{
+		name: "interactive.singleKey",
+		description:
+			"In interactive commands, allow the user to provide one-letter input with a single key (i.e., without hitting enter). Currently this is used by the `--patch` mode of git-add[1], git-checkout[1], git-restore[1], git-commit[1], git-reset[1], and git-stash[1]. Note that this setting is silently ignored if portable keystroke input is not available; requires the Perl module Term::ReadKey",
+	},
+	{
+		name: "log.abbrevCommit",
+		description:
+			"If true, makes git-log[1], git-show[1], and git-whatchanged[1] assume `--abbrev-commit`. You may override this option with `--no-abbrev-commit`",
+	},
+	{
+		name: "log.date",
+		description:
+			"Set the default date-time mode for the 'log' command. Setting a value for log.date is similar to using 'git log''s `--date` option. See git-log[1] for details",
+	},
+	{
+		name: "log.decorate",
+		description:
+			"Print out the ref names of any commits that are shown by the log command. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. This is the same as the `--decorate` option of the `git log`",
+	},
+	{
+		name: "log.diffMerges",
+		description:
+			"Set default diff format to be used for merge commits. See `--diff-merges` in git-log[1] for details. Defaults to `separate`",
+	},
+	{
+		name: "log.excludeDecoration",
+		description:
+			"Exclude the specified patterns from the log decorations. This is similar to the `--decorate-refs-exclude` command-line option, but the config option can be overridden by the `--decorate-refs` option",
+	},
+	{
+		name: "log.follow",
+		description:
+			"If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given. This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history",
+	},
+	{
+		name: "log.graphColors",
+		description:
+			"A list of colors, separated by commas, that can be used to draw history lines in `git log --graph`",
+	},
+	{
+		name: "log.initialDecorationSet",
+		description:
+			"By default, `git log` only shows decorations for certain known ref namespaces. If 'all' is specified, then show all refs as decorations",
+	},
+	{
+		name: "log.mailmap",
+		description:
+			"If true, makes git-log[1], git-show[1], and git-whatchanged[1] assume `--use-mailmap`, otherwise assume `--no-use-mailmap`. True by default",
+	},
+	{
+		name: "log.showRoot",
+		description:
+			"If true, the initial commit will be shown as a big creation event. This is equivalent to a diff against an empty tree. Tools like git-log[1] or git-whatchanged[1], which normally hide the root commit will now show it. True by default",
+	},
+	{
+		name: "log.showSignature",
+		description:
+			"If true, makes git-log[1], git-show[1], and git-whatchanged[1] assume `--show-signature`",
+	},
+	{
+		name: "lsrefs.unborn",
+		description:
+			'May be "advertise" (the default), "allow", or "ignore". If "advertise", the server will respond to the client sending "unborn" (as described in gitprotocol-v2[5]) and will advertise support for this feature during the protocol v2 capability advertisement. "allow" is the same as "advertise" except that the server will not advertise support for this feature; this is useful for load-balanced servers that cannot be updated atomically (for example), since the administrator could configure "allow", then after a delay, configure "advertise"',
+	},
+	{
+		name: "mailinfo.scissors",
+		description:
+			'If true, makes git-mailinfo[1] (and therefore git-am[1]) act by default as if the --scissors option was provided on the command-line. When active, this features removes everything from the message body before a scissors line (i.e. consisting mainly of ">8", "8<" and "-")',
+	},
+	{
+		name: "mailmap.blob",
+		description:
+			"Like `mailmap.file`, but consider the value as a reference to a blob in the repository. If both `mailmap.file` and `mailmap.blob` are given, both are parsed, with entries from `mailmap.file` taking precedence. In a bare repository, this defaults to `HEAD:.mailmap`. In a non-bare repository, it defaults to empty",
+	},
+	{
+		name: "mailmap.file",
+		description:
+			"The location of an augmenting mailmap file. The default mailmap, located in the root of the repository, is loaded first, then the mailmap file pointed to by this variable. The location of the mailmap file may be in a repository subdirectory, or somewhere outside of the repository itself. See git-shortlog[1] and git-blame[1]",
+	},
+	{
+		name: "maintenance.<task>.enabled",
+		insertValue: "maintenance.{cursor}.enabled",
+		description:
+			"This boolean config option controls whether the maintenance task with name `<task>` is run when no `--task` option is specified to `git maintenance run`. These config values are ignored if a `--task` option exists. By default, only `maintenance.gc.enabled` is true",
+	},
+	{
+		name: "maintenance.<task>.schedule",
+		insertValue: "maintenance.{cursor}.schedule",
+		description:
+			'This config option controls whether or not the given `<task>` runs during a `git maintenance run --schedule=<frequency>` command. The value must be one of "hourly", "daily", or "weekly"',
+	},
+	{
+		name: "maintenance.auto",
+		description:
+			"This boolean config option controls whether some commands run `git maintenance run --auto` after doing their normal work. Defaults to true",
+	},
+	{
+		name: "maintenance.commit-graph.auto",
+		description:
+			"This integer config option controls how often the `commit-graph` task should be run as part of `git maintenance run --auto`. If zero, then the `commit-graph` task will not run with the `--auto` option. A negative value will force the task to run every time. Otherwise, a positive value implies the command should run when the number of reachable commits that are not in the commit-graph file is at least the value of `maintenance.commit-graph.auto`. The default value is 100",
+	},
+	{
+		name: "maintenance.incremental-repack.auto",
+		description:
+			"This integer config option controls how often the `incremental-repack` task should be run as part of `git maintenance run --auto`. If zero, then the `incremental-repack` task will not run with the `--auto` option. A negative value will force the task to run every time. Otherwise, a positive value implies the command should run when the number of pack-files not in the multi-pack-index is at least the value of `maintenance.incremental-repack.auto`. The default value is 10",
+	},
+	{
+		name: "maintenance.loose-objects.auto",
+		description:
+			"This integer config option controls how often the `loose-objects` task should be run as part of `git maintenance run --auto`. If zero, then the `loose-objects` task will not run with the `--auto` option. A negative value will force the task to run every time. Otherwise, a positive value implies the command should run when the number of loose objects is at least the value of `maintenance.loose-objects.auto`. The default value is 100",
+	},
+	{
+		name: "maintenance.strategy",
+		description:
+			"This string config option provides a way to specify one of a few recommended schedules for background maintenance. This only affects which tasks are run during `git maintenance run --schedule=X` commands, provided no `--task=<task>` arguments are provided. Further, if a `maintenance.<task>.schedule` config value is set, then that value is used instead of the one provided by `maintenance.strategy`. The possible strategy strings are:",
+	},
+	{
+		name: "man.<tool>.cmd",
+		insertValue: "man.{cursor}.cmd",
+		description:
+			"Specify the command to invoke the specified man viewer. The specified command is evaluated in shell with the man page passed as argument. (See git-help[1].)",
+	},
+	{
+		name: "man.<tool>.path",
+		insertValue: "man.{cursor}.path",
+		description:
+			"Override the path for the given tool that may be used to display help in the 'man' format. See git-help[1]",
+	},
+	{
+		name: "man.viewer",
+		description:
+			"Specify the programs that may be used to display help in the 'man' format. See git-help[1]",
+	},
+	{
+		name: "merge.<driver>.driver",
+		insertValue: "merge.{cursor}.driver",
+		description:
+			"Defines the command that implements a custom low-level merge driver. See gitattributes[5] for details",
+	},
+	{
+		name: "merge.<driver>.name",
+		insertValue: "merge.{cursor}.name",
+		description:
+			"Defines a human-readable name for a custom low-level merge driver. See gitattributes[5] for details",
+	},
+	{
+		name: "merge.<driver>.recursive",
+		insertValue: "merge.{cursor}.recursive",
+		description:
+			"Names a low-level merge driver to be used when performing an internal merge between common ancestors. See gitattributes[5] for details",
+	},
+	{
+		name: "merge.autoStash",
+		description:
+			"When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run merge on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts. This option can be overridden by the `--no-autostash` and `--autostash` options of git-merge[1]. Defaults to false",
+	},
+	{
+		name: "merge.branchdesc",
+		description:
+			"In addition to branch names, populate the log message with the branch description text associated with them. Defaults to false",
+	},
+	{
+		name: "merge.conflictStyle",
+		description:
+			'Specify the style in which conflicted hunks are written out to working tree files upon merge. The default is "merge", which shows a `<<<<<<<` conflict marker, changes made by one side, a `=======` marker, changes made by the other side, and then a `>>>>>>>` marker. An alternate style, "diff3", adds a `|||||||` marker and the original text before the `=======` marker. The "merge" style tends to produce smaller conflict regions than diff3, both because of the exclusion of the original text, and because when a subset of lines match on the two sides they are just pulled out of the conflict region. Another alternate style, "zdiff3", is similar to diff3 but removes matching lines on the two sides from the conflict region when those matching lines appear near either the beginning or end of a conflict region',
+	},
+	{
+		name: "merge.defaultToUpstream",
+		description:
+			"If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last observed values stored in their remote-tracking branches. The values of the `branch.<current branch>.merge` that name the branches at the remote named by `branch.<current branch>.remote` are consulted, and then they are mapped via `remote.<remote>.fetch` to their corresponding remote-tracking branches, and the tips of these tracking branches are merged. Defaults to true",
+	},
+	{
+		name: "merge.directoryRenames",
+		description:
+			'Whether Git detects directory renames, affecting what happens at merge time to new files added to a directory on one side of history when that directory was renamed on the other side of history. If merge.directoryRenames is set to "false", directory rename detection is disabled, meaning that such new files will be left behind in the old directory. If set to "true", directory rename detection is enabled, meaning that such new files will be moved into the new directory. If set to "conflict", a conflict will be reported for such paths. If merge.renames is false, merge.directoryRenames is ignored and treated as false. Defaults to "conflict"',
+	},
+	{
+		name: "merge.ff",
+		description:
+			"By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to `false`, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the `--no-ff` option from the command line). When set to `only`, only such fast-forward merges are allowed (equivalent to giving the `--ff-only` option from the command line)",
+	},
+	{
+		name: "merge.guitool",
+		description:
+			"Controls which merge tool is used by git-mergetool[1] when the -g/--gui flag is specified. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<guitool>.cmd variable is defined",
+	},
+	{
+		name: "merge.log",
+		description:
+			"In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20",
+	},
+	{
+		name: "merge.renameLimit",
+		description:
+			"The number of files to consider in the exhaustive portion of rename detection during a merge. If not specified, defaults to the value of diff.renameLimit. If neither merge.renameLimit nor diff.renameLimit are specified, currently defaults to 7000. This setting has no effect if rename detection is turned off",
+	},
+	{
+		name: "merge.renames",
+		description:
+			'Whether Git detects renames. If set to "false", rename detection is disabled. If set to "true", basic rename detection is enabled. Defaults to the value of diff.renames',
+	},
+	{
+		name: "merge.renormalize",
+		description:
+			'Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line endings). In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section "Merging branches with differing checkin/checkout attributes" in gitattributes[5]',
+	},
+	{
+		name: "merge.stat",
+		description:
+			"Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default",
+	},
+	{
+		name: "merge.suppressDest",
+		description:
+			'By adding a glob that matches the names of integration branches to this multi-valued configuration variable, the default merge message computed for merges into these integration branches will omit "into <branch name>" from its title',
+	},
+	{
+		name: "merge.tool",
+		description:
+			"Controls which merge tool is used by git-mergetool[1]. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<tool>.cmd variable is defined",
+	},
+	{
+		name: "merge.verbosity",
+		description:
+			"Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable",
+	},
+	{
+		name: "merge.verifySignatures",
+		description:
+			"If true, this is equivalent to the --verify-signatures command line option. See git-merge[1] for details",
+	},
+	{
+		name: "mergetool.<tool>.cmd",
+		insertValue: "mergetool.{cursor}.cmd",
+		description:
+			"Specify the command to invoke the specified merge tool. The specified command is evaluated in shell with the following variables available: 'BASE' is the name of a temporary file containing the common base of the files to be merged, if available; 'LOCAL' is the name of a temporary file containing the contents of the file on the current branch; 'REMOTE' is the name of a temporary file containing the contents of the file from the branch being merged; 'MERGED' contains the name of the file to which the merge tool should write the results of a successful merge",
+	},
+	{
+		name: "mergetool.<tool>.hideResolved",
+		insertValue: "mergetool.{cursor}.hideResolved",
+		description:
+			"Allows the user to override the global `mergetool.hideResolved` value for a specific tool. See `mergetool.hideResolved` for the full description",
+	},
+	{
+		name: "mergetool.<tool>.path",
+		insertValue: "mergetool.{cursor}.path",
+		description:
+			"Override the path for the given tool. This is useful in case your tool is not in the PATH",
+	},
+	{
+		name: "mergetool.<tool>.trustExitCode",
+		insertValue: "mergetool.{cursor}.trustExitCode",
+		description:
+			"For a custom merge command, specify whether the exit code of the merge command can be used to determine whether the merge was successful. If this is not set to true then the merge target file timestamp is checked and the merge assumed to have been successful if the file has been updated, otherwise the user is prompted to indicate the success of the merge",
+	},
+	{
+		name: "mergetool.hideResolved",
+		description:
+			"During a merge Git will automatically resolve as many conflicts as possible and write the 'MERGED' file containing conflict markers around any conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally represent the versions of the file from before Git's conflict resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so that only the unresolved conflicts are presented to the merge tool. Can be configured per-tool via the `mergetool.<tool>.hideResolved` configuration variable. Defaults to `false`",
+	},
+	{
+		name: "mergetool.keepBackup",
+		description:
+			"After performing a merge, the original file with conflict markers can be saved as a file with a `.orig` extension. If this variable is set to `false` then this file is not preserved. Defaults to `true` (i.e. keep the backup files)",
+	},
+	{
+		name: "mergetool.keepTemporaries",
+		description:
+			"When invoking a custom merge tool, Git uses a set of temporary files to pass to the tool. If the tool returns an error and this variable is set to `true`, then these temporary files will be preserved, otherwise they will be removed after the tool has exited. Defaults to `false`",
+	},
+	{
+		name: "mergetool.meld.hasOutput",
+		description:
+			"Older versions of `meld` do not support the `--output` option. Git will attempt to detect whether `meld` supports `--output` by inspecting the output of `meld --help`. Configuring `mergetool.meld.hasOutput` will make Git skip these checks and use the configured value instead. Setting `mergetool.meld.hasOutput` to `true` tells Git to unconditionally use the `--output` option, and `false` avoids using `--output`",
+	},
+	{
+		name: "mergetool.meld.useAutoMerge",
+		description:
+			"When the `--auto-merge` is given, meld will merge all non-conflicting parts automatically, highlight the conflicting parts and wait for user decision. Setting `mergetool.meld.useAutoMerge` to `true` tells Git to unconditionally use the `--auto-merge` option with `meld`. Setting this value to `auto` makes git detect whether `--auto-merge` is supported and will only use `--auto-merge` when available. A value of `false` avoids using `--auto-merge` altogether, and is the default value",
+	},
+	{
+		name: "mergetool.prompt",
+		description:
+			"Prompt before each invocation of the merge resolution program",
+	},
+	{
+		name: "mergetool.vimdiff.layout",
+		description:
+			"The vimdiff backend uses this variable to control how its split windows look like. Applies even if you are using Neovim (`nvim`) or gVim (`gvim`) as the merge tool. See BACKEND SPECIFIC HINTS section",
+	},
+	{
+		name: "mergetool.writeToTemp",
+		description:
+			"Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of conflicting files in the worktree by default. Git will attempt to use a temporary directory for these files when set `true`. Defaults to `false`",
+	},
+	{
+		name: "notes.<name>.mergeStrategy",
+		insertValue: "notes.{cursor}.mergeStrategy",
+		description:
+			'Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in git-notes[1] for more information on the available strategies',
+	},
+	{
+		name: "notes.displayRef",
+		description:
+			"The (fully qualified) refname from which to show notes when showing commit messages. The value of this variable can be set to a glob, in which case notes from all matching refs will be shown. You may also specify this configuration variable several times. A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored",
+	},
+	{
+		name: "notes.mergeStrategy",
+		description:
+			'Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See "NOTES MERGE STRATEGIES" section of git-notes[1] for more information on each strategy',
+	},
+	{
+		name: "notes.rewrite.<command>",
+		insertValue: "notes.rewrite.{cursor}",
+		description:
+			'When rewriting commits with <command> (currently `amend` or `rebase`) and this variable is set to `true`, Git automatically copies your notes from the original to the rewritten commit. Defaults to `true`, but see "notes.rewriteRef" below',
+	},
+	{
+		name: "notes.rewriteMode",
+		description:
+			'When copying notes during a rewrite (see the "notes.rewrite.<command>" option), determines what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`',
+	},
+	{
+		name: "notes.rewriteRef",
+		description:
+			"When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. The ref may be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times",
+	},
+	{
+		name: "pack.allowPackReuse",
+		description:
+			"When true, and when reachability bitmaps are enabled, pack-objects will try to send parts of the bitmapped packfile verbatim. This can reduce memory and CPU usage to serve fetches, but might result in sending a slightly larger pack. Defaults to true",
+	},
+	{
+		name: "pack.compression",
+		description:
+			'An integer -1..9, indicating the compression level for objects in a pack file. -1 is the zlib default. 0 means no compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. If not set, defaults to core.compression. If that is not set, defaults to -1, the zlib default, which is "a default compromise between speed and compression (currently equivalent to level 6)"',
+	},
+	{
+		name: "pack.deltaCacheLimit",
+		description:
+			"The maximum size of a delta, that is cached in git-pack-objects[1]. This cache is used to speed up the writing object phase by not having to recompute the final delta result once the best match for all objects is found. Defaults to 1000. Maximum value is 65535",
+	},
+	{
+		name: "pack.deltaCacheSize",
+		description:
+			"The maximum memory in bytes used for caching deltas in git-pack-objects[1] before writing them out to a pack. This cache is used to speed up the writing object phase by not having to recompute the final delta result once the best match for all objects is found. Repacking large repositories on machines which are tight with memory might be badly impacted by this though, especially if this cache pushes the system into swapping. A value of 0 means no limit. The smallest size of 1 byte may be used to virtually disable this cache. Defaults to 256 MiB",
+	},
+	{
+		name: "pack.depth",
+		description:
+			"The maximum delta depth used by git-pack-objects[1] when no maximum depth is given on the command line. Defaults to 50. Maximum value is 4095",
+	},
+	{
+		name: "pack.indexVersion",
+		description:
+			"Specify the default pack index version. Valid values are 1 for legacy pack index used by Git versions prior to 1.5.2, and 2 for the new pack index with capabilities for packs larger than 4 GB as well as proper protection against the repacking of corrupted packs. Version 2 is the default. Note that version 2 is enforced and this config option ignored whenever the corresponding pack is larger than 2 GB",
+	},
+	{
+		name: "pack.island",
+		description:
+			'An extended regular expression configuring a set of delta islands. See "DELTA ISLANDS" in git-pack-objects[1] for details',
+	},
+	{
+		name: "pack.islandCore",
+		description:
+			'Specify an island name which gets to have its objects be packed first. This creates a kind of pseudo-pack at the front of one pack, so that the objects from the specified island are hopefully faster to copy into any pack that should be served to a user requesting these objects. In practice this means that the island specified should likely correspond to what is the most commonly cloned in the repo. See also "DELTA ISLANDS" in git-pack-objects[1]',
+	},
+	{
+		name: "pack.packSizeLimit",
+		description:
+			"The maximum size of a pack. This setting only affects packing to a file when repacking, i.e. the git:// protocol is unaffected. It can be overridden by the `--max-pack-size` option of git-repack[1]. Reaching this limit results in the creation of multiple packfiles",
+	},
+	{
+		name: "pack.preferBitmapTips",
+		description:
+			'When selecting which commits will receive bitmaps, prefer a commit at the tip of any reference that is a suffix of any value of this configuration over any other commits in the "selection window"',
+	},
+	{
+		name: "pack.threads",
+		description:
+			"Specifies the number of threads to spawn when searching for best delta matches. This requires that git-pack-objects[1] be compiled with pthreads otherwise this option is ignored with a warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. Specifying 0 will cause Git to auto-detect the number of CPU's and set the number of threads accordingly",
+	},
+	{
+		name: "pack.useBitmaps",
+		description:
+			"When true, git will use pack bitmaps (if available) when packing to stdout (e.g., during the server side of a fetch). Defaults to true. You should not generally need to turn this off unless you are debugging pack bitmaps",
+	},
+	{
+		name: "pack.useSparse",
+		description:
+			"When true, git will default to using the '--sparse' option in 'git pack-objects' when the '--revs' option is present. This algorithm only walks trees that appear in paths that introduce new objects. This can have significant performance benefits when computing a pack to send a small change. However, it is possible that extra objects are added to the pack-file if the included commits contain certain types of direct renames. Default is `true`",
+	},
+	{
+		name: "pack.window",
+		description:
+			"The size of the window used by git-pack-objects[1] when no window size is given on the command line. Defaults to 10",
+	},
+	{
+		name: "pack.windowMemory",
+		description:
+			'The maximum size of memory that is consumed by each thread in git-pack-objects[1] for pack window memory when no limit is given on the command line. The value can be suffixed with "k", "m", or "g". When left unconfigured (or set explicitly to 0), there will be no limit',
+	},
+	{
+		name: "pack.writeBitmapHashCache",
+		description:
+			'When true, git will include a "hash cache" section in the bitmap index (if one is written). This cache can be used to feed git\'s delta heuristics, potentially leading to better deltas between bitmapped and non-bitmapped objects (e.g., when serving a fetch between an older, bitmapped pack and objects that have been pushed since the last gc). The downside is that it consumes 4 bytes per object of disk space. Defaults to true',
+	},
+	{
+		name: "pack.writeBitmapLookupTable",
+		description:
+			'When true, Git will include a "lookup table" section in the bitmap index (if one is written). This table is used to defer loading individual bitmaps as late as possible. This can be beneficial in repositories that have relatively large bitmap indexes. Defaults to false',
+	},
+	{
+		name: "pack.writeBitmaps",
+		description: "This is a deprecated synonym for `repack.writeBitmaps`",
+		deprecated: true,
+		hidden: true,
+	},
+	{
+		name: "pack.writeReverseIndex",
+		description:
+			"When true, git will write a corresponding .rev file (see: gitformat-pack[5]) for each new packfile that it writes in all places except for git-fast-import[1] and in the bulk checkin mechanism. Defaults to false",
+	},
+	{
+		name: "pager.<cmd>",
+		insertValue: "pager.{cursor}",
+		description:
+			"If the value is boolean, turns on or off pagination of the output of a particular Git subcommand when writing to a tty. Otherwise, turns on pagination for the subcommand using the pager specified by the value of `pager.<cmd>`. If `--paginate` or `--no-pager` is specified on the command line, it takes precedence over this option. To disable pagination for all commands, set `core.pager` or `GIT_PAGER` to `cat`",
+	},
+	{
+		name: "pretty.<name>",
+		insertValue: "pretty.{cursor}",
+		description:
+			'Alias for a --pretty= format string, as specified in git-log[1]. Any aliases defined here can be used just as the built-in pretty formats could. For example, running `git config pretty.changelog "format:* %H %s"` would cause the invocation `git log --pretty=changelog` to be equivalent to running `git log "--pretty=format:* %H %s"`. Note that an alias with the same name as a built-in format will be silently ignored',
+	},
+	{
+		name: "protocol.<name>.allow",
+		insertValue: "protocol.{cursor}.allow",
+		description:
+			"Set a policy to be used by protocol `<name>` with clone/fetch/push commands. See `protocol.allow` above for the available policies",
+	},
+	{
+		name: "protocol.allow",
+		description:
+			"If set, provide a user defined default policy for all protocols which don't explicitly have a policy (`protocol.<name>.allow`). By default, if unset, known-safe protocols (http, https, git, ssh, file) have a default policy of `always`, known-dangerous protocols (ext) have a default policy of `never`, and all other protocols have a default policy of `user`. Supported policies:",
+	},
+	{
+		name: "protocol.version",
+		description:
+			"If set, clients will attempt to communicate with a server using the specified protocol version. If the server does not support it, communication falls back to version 0. If unset, the default is `2`. Supported versions:",
+	},
+	{
+		name: "pull.ff",
+		description:
+			"By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to `false`, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the `--no-ff` option from the command line). When set to `only`, only such fast-forward merges are allowed (equivalent to giving the `--ff-only` option from the command line). This setting overrides `merge.ff` when pulling",
+	},
+	{
+		name: "pull.octopus",
+		description:
+			"The default merge strategy to use when pulling multiple branches at once",
+	},
+	{
+		name: "pull.rebase",
+		description:
+			'When true, rebase branches on top of the fetched branch, instead of merging the default branch from the default remote when "git pull" is run. See "branch.<name>.rebase" for setting this on a per-branch basis',
+	},
+	{
+		name: "pull.twohead",
+		description:
+			"The default merge strategy to use when pulling a single branch",
+	},
+	{
+		name: "push.autoSetupRemote",
+		description:
+			"If set to \"true\" assume `--set-upstream` on default push when no upstream tracking exists for the current branch; this option takes effect with push.default options 'simple', 'upstream', and 'current'. It is useful if by default you want new branches to be pushed to the default remote (like the behavior of 'push.default=current') and you also want the upstream tracking to be set. Workflows most likely to benefit from this option are 'simple' central workflows where all branches are expected to have the same name on the remote",
+	},
+	{
+		name: "push.default",
+		description:
+			"Defines the action `git push` should take if no refspec is given (whether from the command-line, config, or elsewhere). Different values are well-suited for specific workflows; for instance, in a purely central workflow (i.e. the fetch source is equal to the push destination), `upstream` is probably what you want. Possible values are:",
+	},
+	{
+		name: "push.followTags",
+		description:
+			"If set to true enable `--follow-tags` option by default. You may override this configuration at time of push by specifying `--no-follow-tags`",
+	},
+	{
+		name: "push.gpgSign",
+		description:
+			"May be set to a boolean value, or the string 'if-asked'. A true value causes all pushes to be GPG signed, as if `--signed` is passed to git-push[1]. The string 'if-asked' causes pushes to be signed if the server supports it, as if `--signed=if-asked` is passed to 'git push'. A false value may override a value from a lower-priority config file. An explicit command-line flag always overrides this config option",
+	},
+	{
+		name: "push.negotiate",
+		description:
+			'If set to "true", attempt to reduce the size of the packfile sent by rounds of negotiation in which the client and the server attempt to find commits in common. If "false", Git will rely solely on the server\'s ref advertisement to find commits in common',
+	},
+	{
+		name: "push.pushOption",
+		description:
+			"When no `--push-option=<option>` argument is given from the command line, `git push` behaves as if each <value> of this variable is given as `--push-option=<value>`",
+	},
+	{
+		name: "push.recurseSubmodules",
+		description:
+			"Make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If the value is 'check' then Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing, the push will be aborted and exit with non-zero status. If the value is 'on-demand' then all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If the value is 'no' then default behavior of ignoring submodules when pushing is retained. You may override this configuration at time of push by specifying '--recurse-submodules=check|on-demand|no'. If not set, 'no' is used by default, unless 'submodule.recurse' is set (in which case a 'true' value means 'on-demand')",
+	},
+	{
+		name: "push.useBitmaps",
+		description:
+			'If set to "false", disable use of bitmaps for "git push" even if `pack.useBitmaps` is "true", without preventing other git operations from using bitmaps. Default is true',
+	},
+	{
+		name: "push.useForceIfIncludes",
+		description:
+			'If set to "true", it is equivalent to specifying `--force-if-includes` as an option to git-push[1] in the command line. Adding `--no-force-if-includes` at the time of push overrides this configuration setting',
+	},
+	{
+		name: "rebase.abbreviateCommands",
+		description:
+			"If set to true, `git rebase` will use abbreviated command names in the todo list resulting in something like this:",
+	},
+	{
+		name: "rebase.autoSquash",
+		description: "If set to true enable `--autosquash` option by default",
+	},
+	{
+		name: "rebase.autoStash",
+		description:
+			"When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts. This option can be overridden by the `--no-autostash` and `--autostash` options of git-rebase[1]. Defaults to false",
+	},
+	{
+		name: "rebase.backend",
+		description:
+			"Default backend to use for rebasing. Possible choices are 'apply' or 'merge'. In the future, if the merge backend gains all remaining capabilities of the apply backend, this setting may become unused",
+	},
+	{
+		name: "rebase.forkPoint",
+		description: "If set to false set `--no-fork-point` option by default",
+	},
+	{
+		name: "rebase.instructionFormat",
+		description:
+			"A format string, as specified in git-log[1], to be used for the todo list during an interactive rebase. The format will automatically have the long commit hash prepended to the format",
+	},
+	{
+		name: "rebase.missingCommitsCheck",
+		description:
+			'If set to "warn", git rebase -i will print a warning if some commits are removed (e.g. a line was deleted), however the rebase will still proceed. If set to "error", it will print the previous warning and stop the rebase, \'git rebase --edit-todo\' can then be used to correct the error. If set to "ignore", no checking is done. To drop a commit without warning or error, use the `drop` command in the todo list. Defaults to "ignore"',
+	},
+	{
+		name: "rebase.rescheduleFailedExec",
+		description:
+			"Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided). This is the same as specifying the `--reschedule-failed-exec` option",
+	},
+	{
+		name: "rebase.stat",
+		description:
+			"Whether to show a diffstat of what changed upstream since the last rebase. False by default",
+	},
+	{
+		name: "rebase.updateRefs",
+		description: "If set to true enable `--update-refs` option by default",
+	},
+	{
+		name: "receive.advertiseAtomic",
+		description:
+			"By default, git-receive-pack will advertise the atomic push capability to its clients. If you don't want to advertise this capability, set this variable to false",
+	},
+	{
+		name: "receive.advertisePushOptions",
+		description:
+			"When set to true, git-receive-pack will advertise the push options capability to its clients. False by default",
+	},
+	{
+		name: "receive.autogc",
+		description:
+			'By default, git-receive-pack will run "git-gc --auto" after receiving data from git-push and updating refs. You can stop it by setting this variable to false',
+	},
+	{
+		name: "receive.certNonceSeed",
+		description:
+			'By setting this variable to a string, `git receive-pack` will accept a `git push --signed` and verifies it by using a "nonce" protected by HMAC using this string as a secret key',
+	},
+	{
+		name: "receive.certNonceSlop",
+		description:
+			'When a `git push --signed` sent a push certificate with a "nonce" that was issued by a receive-pack serving the same repository within this many seconds, export the "nonce" found in the certificate to `GIT_PUSH_CERT_NONCE` to the hooks (instead of what the receive-pack asked the sending side to include). This may allow writing checks in `pre-receive` and `post-receive` a bit easier. Instead of checking `GIT_PUSH_CERT_NONCE_SLOP` environment variable that records by how many seconds the nonce is stale to decide if they want to accept the certificate, they only can check `GIT_PUSH_CERT_NONCE_STATUS` is `OK`',
+	},
+	{
+		name: "receive.denyCurrentBranch",
+		description:
+			'If set to true or "refuse", git-receive-pack will deny a ref update to the currently checked out branch of a non-bare repository. Such a push is potentially dangerous because it brings the HEAD out of sync with the index and working tree. If set to "warn", print a warning of such a push to stderr, but allow the push to proceed. If set to false or "ignore", allow such pushes with no message. Defaults to "refuse"',
+	},
+	{
+		name: "receive.denyDeleteCurrent",
+		description:
+			"If set to true, git-receive-pack will deny a ref update that deletes the currently checked out branch of a non-bare repository",
+	},
+	{
+		name: "receive.denyDeletes",
+		description:
+			"If set to true, git-receive-pack will deny a ref update that deletes the ref. Use this to prevent such a ref deletion via a push",
+	},
+	{
+		name: "receive.denyNonFastForwards",
+		description:
+			"If set to true, git-receive-pack will deny a ref update which is not a fast-forward. Use this to prevent such an update via a push, even if that push is forced. This configuration variable is set when initializing a shared repository",
+	},
+	{
+		name: "receive.fsck.<msg-id>",
+		insertValue: "receive.fsck.{cursor}",
+		description:
+			"Acts like `fsck.<msg-id>`, but is used by git-receive-pack[1] instead of git-fsck[1]. See the `fsck.<msg-id>` documentation for details",
+	},
+	{
+		name: "receive.fsck.skipList",
+		description:
+			"Acts like `fsck.skipList`, but is used by git-receive-pack[1] instead of git-fsck[1]. See the `fsck.skipList` documentation for details",
+	},
+	{
+		name: "receive.fsckObjects",
+		description:
+			"If it is set to true, git-receive-pack will check all received objects. See `transfer.fsckObjects` for what's checked. Defaults to false. If not set, the value of `transfer.fsckObjects` is used instead",
+	},
+	{
+		name: "receive.hideRefs",
+		description:
+			"This variable is the same as `transfer.hideRefs`, but applies only to `receive-pack` (and so affects pushes, but not fetches). An attempt to update or delete a hidden ref by `git push` is rejected",
+	},
+	{
+		name: "receive.keepAlive",
+		description:
+			"After receiving the pack from the client, `receive-pack` may produce no output (if `--quiet` was specified) while processing the pack, causing some networks to drop the TCP connection. With this option set, if `receive-pack` does not transmit any data in this phase for `receive.keepAlive` seconds, it will send a short keepalive packet. The default is 5 seconds; set to 0 to disable keepalives entirely",
+	},
+	{
+		name: "receive.maxInputSize",
+		description:
+			"If the size of the incoming pack stream is larger than this limit, then git-receive-pack will error out, instead of accepting the pack file. If not set or set to 0, then the size is unlimited",
+	},
+	{
+		name: "receive.procReceiveRefs",
+		description:
+			'This is a multi-valued variable that defines reference prefixes to match the commands in `receive-pack`. Commands matching the prefixes will be executed by an external hook "proc-receive", instead of the internal `execute_commands` function. If this variable is not defined, the "proc-receive" hook will never be used, and all commands will be executed by the internal `execute_commands` function',
+	},
+	{
+		name: "receive.shallowUpdate",
+		description:
+			"If set to true, .git/shallow can be updated when new refs require new shallow roots. Otherwise those refs are rejected",
+	},
+	{
+		name: "receive.unpackLimit",
+		description:
+			"If the number of objects received in a push is below this limit then the objects will be unpacked into loose object files. However if the number of received objects equals or exceeds this limit then the received pack will be stored as a pack, after adding any missing delta bases. Storing the pack from a push can make the push operation complete faster, especially on slow filesystems. If not set, the value of `transfer.unpackLimit` is used instead",
+	},
+	{
+		name: "receive.updateServerInfo",
+		description:
+			"If set to true, git-receive-pack will run git-update-server-info after receiving data from git-push and updating refs",
+	},
+	{
+		name: "remote.<name>.fetch",
+		insertValue: "remote.{cursor}.fetch",
+		description:
+			'The default set of "refspec" for git-fetch[1]. See git-fetch[1]',
+	},
+	{
+		name: "remote.<name>.mirror",
+		insertValue: "remote.{cursor}.mirror",
+		description:
+			"If true, pushing to this remote will automatically behave as if the `--mirror` option was given on the command line",
+	},
+	{
+		name: "remote.<name>.partialclonefilter",
+		insertValue: "remote.{cursor}.partialclonefilter",
+		description:
+			"The filter that will be applied when fetching from this promisor remote. Changing or clearing this value will only affect fetches for new commits. To fetch associated objects for commits already present in the local object database, use the `--refetch` option of git-fetch[1]",
+	},
+	{
+		name: "remote.<name>.promisor",
+		insertValue: "remote.{cursor}.promisor",
+		description:
+			"When set to true, this remote will be used to fetch promisor objects",
+	},
+	{
+		name: "remote.<name>.proxy",
+		insertValue: "remote.{cursor}.proxy",
+		description:
+			"For remotes that require curl (http, https and ftp), the URL to the proxy to use for that remote. Set to the empty string to disable proxying for that remote",
+	},
+	{
+		name: "remote.<name>.proxyAuthMethod",
+		insertValue: "remote.{cursor}.proxyAuthMethod",
+		description:
+			"For remotes that require curl (http, https and ftp), the method to use for authenticating against the proxy in use (probably set in `remote.<name>.proxy`). See `http.proxyAuthMethod`",
+	},
+	{
+		name: "remote.<name>.prune",
+		insertValue: "remote.{cursor}.prune",
+		description:
+			"When set to true, fetching from this remote by default will also remove any remote-tracking references that no longer exist on the remote (as if the `--prune` option was given on the command line). Overrides `fetch.prune` settings, if any",
+	},
+	{
+		name: "remote.<name>.pruneTags",
+		insertValue: "remote.{cursor}.pruneTags",
+		description:
+			"When set to true, fetching from this remote by default will also remove any local tags that no longer exist on the remote if pruning is activated in general via `remote.<name>.prune`, `fetch.prune` or `--prune`. Overrides `fetch.pruneTags` settings, if any",
+	},
+	{
+		name: "remote.<name>.push",
+		insertValue: "remote.{cursor}.push",
+		description:
+			'The default set of "refspec" for git-push[1]. See git-push[1]',
+	},
+	{
+		name: "remote.<name>.pushurl",
+		insertValue: "remote.{cursor}.pushurl",
+		description: "The push URL of a remote repository. See git-push[1]",
+	},
+	{
+		name: "remote.<name>.receivepack",
+		insertValue: "remote.{cursor}.receivepack",
+		description:
+			"The default program to execute on the remote side when pushing. See option --receive-pack of git-push[1]",
+	},
+	{
+		name: "remote.<name>.skipDefaultUpdate",
+		insertValue: "remote.{cursor}.skipDefaultUpdate",
+		description:
+			"If true, this remote will be skipped by default when updating using git-fetch[1] or the `update` subcommand of git-remote[1]",
+	},
+	{
+		name: "remote.<name>.skipFetchAll",
+		insertValue: "remote.{cursor}.skipFetchAll",
+		description:
+			"If true, this remote will be skipped by default when updating using git-fetch[1] or the `update` subcommand of git-remote[1]",
+	},
+	{
+		name: "remote.<name>.tagOpt",
+		insertValue: "remote.{cursor}.tagOpt",
+		description:
+			"Setting this value to --no-tags disables automatic tag following when fetching from remote <name>. Setting it to --tags will fetch every tag from remote <name>, even if they are not reachable from remote branch heads. Passing these flags directly to git-fetch[1] can override this setting. See options --tags and --no-tags of git-fetch[1]",
+	},
+	{
+		name: "remote.<name>.uploadpack",
+		insertValue: "remote.{cursor}.uploadpack",
+		description:
+			"The default program to execute on the remote side when fetching. See option --upload-pack of git-fetch-pack[1]",
+	},
+	{
+		name: "remote.<name>.url",
+		insertValue: "remote.{cursor}.url",
+		description:
+			"The URL of a remote repository. See git-fetch[1] or git-push[1]",
+	},
+	{
+		name: "remote.<name>.vcs",
+		insertValue: "remote.{cursor}.vcs",
+		description:
+			"Setting this to a value <vcs> will cause Git to interact with the remote with the git-remote-<vcs> helper",
+	},
+	{
+		name: "remote.pushDefault",
+		description:
+			"The remote to push to by default. Overrides `branch.<name>.remote` for all branches, and is overridden by `branch.<name>.pushRemote` for specific branches",
+	},
+	{
+		name: "remotes.<group>",
+		insertValue: "remotes.{cursor}",
+		description:
+			'The list of remotes which are fetched by "git remote update <group>". See git-remote[1]',
+	},
+	{
+		name: "repack.cruftThreads",
+		description:
+			"Parameters used by git-pack-objects[1] when generating a cruft pack and the respective parameters are not given over the command line. See similarly named `pack.*` configuration variables for defaults and meaning",
+	},
+	{
+		name: "repack.packKeptObjects",
+		description:
+			"If set to true, makes `git repack` act as if `--pack-kept-objects` was passed. See git-repack[1] for details. Defaults to `false` normally, but `true` if a bitmap index is being written (either via `--write-bitmap-index` or `repack.writeBitmaps`)",
+	},
+	{
+		name: "repack.updateServerInfo",
+		description:
+			"If set to false, git-repack[1] will not run git-update-server-info[1]. Defaults to true. Can be overridden when true by the `-n` option of git-repack[1]",
+	},
+	{
+		name: "repack.useDeltaBaseOffset",
+		description:
+			'By default, git-repack[1] creates packs that use delta-base offset. If you need to share your repository with Git older than version 1.4.4, either directly or via a dumb protocol such as http, then you need to set this option to "false" and repack. Access from old Git versions over the native protocol are unaffected by this option',
+	},
+	{
+		name: "repack.useDeltaIslands",
+		description:
+			"If set to true, makes `git repack` act as if `--delta-islands` was passed. Defaults to `false`",
+	},
+	{
+		name: "repack.writeBitmaps",
+		description:
+			'When true, git will write a bitmap index when packing all objects to disk (e.g., when `git repack -a` is run). This index can speed up the "counting objects" phase of subsequent packs created for clones and fetches, at the cost of some disk space and extra time spent on the initial repack. This has no effect if multiple packfiles are created. Defaults to true on bare repos, false otherwise',
+	},
+	{
+		name: "rerere.autoUpdate",
+		description:
+			"When set to true, `git-rerere` updates the index with the resulting contents after it cleanly resolves conflicts using previously recorded resolution. Defaults to false",
+	},
+	{
+		name: "rerere.enabled",
+		description:
+			'Activate recording of resolved conflicts, so that identical conflict hunks can be resolved automatically, should they be encountered again. By default, git-rerere[1] is enabled if there is an `rr-cache` directory under the `$GIT_DIR`, e.g. if "rerere" was previously used in the repository',
+	},
+	{
+		name: "revert.reference",
+		description:
+			"Setting this variable to true makes `git revert` behave as if the `--reference` option is given",
+	},
+	{
+		name: "safe.bareRepository",
+		description:
+			"Specifies which bare repositories Git will work with. The currently supported values are:",
+	},
+	{
+		name: "safe.directory",
+		description:
+			"These config entries specify Git-tracked directories that are considered safe even if they are owned by someone other than the current user. By default, Git will refuse to even parse a Git config of a repository owned by someone else, let alone run its hooks, and this config setting allows users to specify exceptions, e.g. for intentionally shared repositories (see the `--shared` option in git-init[1])",
+	},
+	{
+		name: "sendemail.forbidSendmailVariables",
+		description:
+			'To avoid common misconfiguration mistakes, git-send-email[1] will abort with a warning if any configuration options for "sendmail" exist. Set this variable to bypass the check',
+	},
+	{
+		name: "sendemail.identity",
+		description:
+			"A configuration identity. When given, causes values in the 'sendemail.<identity>' subsection to take precedence over values in the 'sendemail' section. The default identity is the value of `sendemail.identity`",
+	},
+	{
+		name: "sendemail.signedoffcc",
+		description: "Deprecated alias for `sendemail.signedoffbycc`",
+		deprecated: true,
+		hidden: true,
+	},
+	{
+		name: "sendemail.smtpBatchSize",
+		description:
+			"Number of messages to be sent per connection, after that a relogin will happen. If the value is 0 or undefined, send all messages in one connection. See also the `--batch-size` option of git-send-email[1]",
+	},
+	{
+		name: "sendemail.smtpEncryption",
+		description:
+			"See git-send-email[1] for description. Note that this setting is not subject to the 'identity' mechanism",
+	},
+	{
+		name: "sendemail.smtpReloginDelay",
+		description:
+			"Seconds wait before reconnecting to smtp server. See also the `--relogin-delay` option of git-send-email[1]",
+	},
+	{
+		name: "sendemail.smtpsslcertpath",
+		description:
+			"Path to ca-certificates (either a directory or a single file). Set it to an empty string to disable certificate verification",
+	},
+	{
+		name: "sendemail.xmailer",
+		description: "See git-send-email[1] for description",
+	},
+	{
+		name: "sequence.editor",
+		description:
+			"Text editor used by `git rebase -i` for editing the rebase instruction file. The value is meant to be interpreted by the shell when it is used. It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. When not configured the default commit message editor is used instead",
+	},
+	{
+		name: "sendemail.<identity>.forbidSendmailVariables",
+		insertValue: "sendemail.{cursor}.forbidSendmailVariables",
+		description:
+			'To avoid common misconfiguration mistakes, git-send-email[1] will abort with a warning if any configuration options for "sendmail" exist. Set this variable to bypass the check',
+	},
+	{
+		name: "sendemail.<identity>.signedoffcc",
+		insertValue: "sendemail.{cursor}.signedoffcc",
+		description: "Deprecated alias for `sendemail.signedoffbycc`",
+		deprecated: true,
+		hidden: true,
+	},
+	{
+		name: "sendemail.<identity>.smtpBatchSize",
+		insertValue: "sendemail.{cursor}.smtpBatchSize",
+		description:
+			"Number of messages to be sent per connection, after that a relogin will happen. If the value is 0 or undefined, send all messages in one connection. See also the `--batch-size` option of git-send-email[1]",
+	},
+	{
+		name: "sendemail.<identity>.smtpEncryption",
+		insertValue: "sendemail.{cursor}.smtpEncryption",
+		description:
+			"See git-send-email[1] for description. Note that this setting is not subject to the 'identity' mechanism",
+	},
+	{
+		name: "sendemail.<identity>.smtpReloginDelay",
+		insertValue: "sendemail.{cursor}.smtpReloginDelay",
+		description:
+			"Seconds wait before reconnecting to smtp server. See also the `--relogin-delay` option of git-send-email[1]",
+	},
+	{
+		name: "sendemail.<identity>.smtpsslcertpath",
+		insertValue: "sendemail.{cursor}.smtpsslcertpath",
+		description:
+			"Path to ca-certificates (either a directory or a single file). Set it to an empty string to disable certificate verification",
+	},
+	{
+		name: "sendemail.<identity>.xmailer",
+		insertValue: "sendemail.{cursor}.xmailer",
+		description: "See git-send-email[1] for description",
+	},
+	{
+		name: "sequence.<identity>.editor",
+		insertValue: "sequence.{cursor}.editor",
+		description:
+			"Text editor used by `git rebase -i` for editing the rebase instruction file. The value is meant to be interpreted by the shell when it is used. It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. When not configured the default commit message editor is used instead",
+	},
+	{
+		name: "showBranch.default",
+		description:
+			"The default set of branches for git-show-branch[1]. See git-show-branch[1]",
+	},
+	{
+		name: "sparse.expectFilesOutsideOfPatterns",
+		description:
+			"Typically with sparse checkouts, files not matching any sparsity patterns are marked with a SKIP_WORKTREE bit in the index and are missing from the working tree. Accordingly, Git will ordinarily check whether files with the SKIP_WORKTREE bit are in fact present in the working tree contrary to expectations. If Git finds any, it marks those paths as present by clearing the relevant SKIP_WORKTREE bits. This option can be used to tell Git that such present-despite-skipped files are expected and to stop checking for them",
+	},
+	{
+		name: "splitIndex.maxPercentChange",
+		description:
+			"When the split index feature is used, this specifies the percent of entries the split index can contain compared to the total number of entries in both the split index and the shared index before a new shared index is written. The value should be between 0 and 100. If the value is 0 then a new shared index is always written, if it is 100 a new shared index is never written. By default the value is 20, so a new shared index is written if the number of entries in the split index would be greater than 20 percent of the total number of entries. See git-update-index[1]",
+	},
+	{
+		name: "splitIndex.sharedIndexExpire",
+		description:
+			'When the split index feature is used, shared index files that were not modified since the time this variable specifies will be removed when a new shared index file is created. The value "now" expires all entries immediately, and "never" suppresses expiration altogether. The default value is "2.weeks.ago". Note that a shared index file is considered modified (for the purpose of expiration) each time a new split-index file is either created based on it or read from it. See git-update-index[1]',
+	},
+	{
+		name: "ssh.variant",
+		description:
+			"By default, Git determines the command line arguments to use based on the basename of the configured SSH command (configured using the environment variable `GIT_SSH` or `GIT_SSH_COMMAND` or the config setting `core.sshCommand`). If the basename is unrecognized, Git will attempt to detect support of OpenSSH options by first invoking the configured SSH command with the `-G` (print configuration) option and will subsequently use OpenSSH options (if that is successful) or no options besides the host and remote command (if it fails)",
+	},
+	{
+		name: "stash.showIncludeUntracked",
+		description:
+			"If this is set to true, the `git stash show` command will show the untracked files of a stash entry. Defaults to false. See description of 'show' command in git-stash[1]",
+	},
+	{
+		name: "stash.showPatch",
+		description:
+			"If this is set to true, the `git stash show` command without an option will show the stash entry in patch form. Defaults to false. See description of 'show' command in git-stash[1]",
+	},
+	{
+		name: "stash.showStat",
+		description:
+			"If this is set to true, the `git stash show` command without an option will show diffstat of the stash entry. Defaults to true. See description of 'show' command in git-stash[1]",
+	},
+	{
+		name: "status.aheadBehind",
+		description:
+			"Set to true to enable `--ahead-behind` and false to enable `--no-ahead-behind` by default in git-status[1] for non-porcelain status formats. Defaults to true",
+	},
+	{
+		name: "status.branch",
+		description:
+			"Set to true to enable --branch by default in git-status[1]. The option --no-branch takes precedence over this variable",
+	},
+	{
+		name: "status.displayCommentPrefix",
+		description:
+			"If set to true, git-status[1] will insert a comment prefix before each output line (starting with `core.commentChar`, i.e. `#` by default). This was the behavior of git-status[1] in Git 1.8.4 and previous. Defaults to false",
+	},
+	{
+		name: "status.relativePaths",
+		description:
+			"By default, git-status[1] shows paths relative to the current directory. Setting this variable to `false` shows paths relative to the repository root (this was the default for Git prior to v1.5.4)",
+	},
+	{
+		name: "status.renameLimit",
+		description:
+			"The number of files to consider when performing rename detection in git-status[1] and git-commit[1]. Defaults to the value of diff.renameLimit",
+	},
+	{
+		name: "status.renames",
+		description:
+			'Whether and how Git detects renames in git-status[1] and git-commit[1] . If set to "false", rename detection is disabled. If set to "true", basic rename detection is enabled. If set to "copies" or "copy", Git will detect copies, as well. Defaults to the value of diff.renames',
+	},
+	{
+		name: "status.short",
+		description:
+			"Set to true to enable --short by default in git-status[1]. The option --no-short takes precedence over this variable",
+	},
+	{
+		name: "status.showStash",
+		description:
+			"If set to true, git-status[1] will display the number of entries currently stashed away. Defaults to false",
+	},
+	{
+		name: "status.showUntrackedFiles",
+		description:
+			"By default, git-status[1] and git-commit[1] show files which are not currently tracked by Git. Directories which contain only untracked files, are shown with the directory name only. Showing untracked files means that Git needs to lstat() all the files in the whole repository, which might be slow on some systems. So, this variable controls how the commands displays the untracked files. Possible values are:",
+	},
+	{
+		name: "status.submoduleSummary",
+		description:
+			"Defaults to false. If this is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled and a summary of commits for modified submodules will be shown (see --summary-limit option of git-submodule[1]). Please note that the summary output command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. The only exception to that rule is that status and commit will show staged submodule changes. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command-line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings",
+	},
+	{
+		name: "submodule.<name>.active",
+		insertValue: "submodule.{cursor}.active",
+		description:
+			"Boolean value indicating if the submodule is of interest to git commands. This config option takes precedence over the submodule.active config option. See gitsubmodules[7] for details",
+	},
+	{
+		name: "submodule.<name>.branch",
+		insertValue: "submodule.{cursor}.branch",
+		description:
+			"The remote branch name for a submodule, used by `git submodule update --remote`. Set this option to override the value found in the `.gitmodules` file. See git-submodule[1] and gitmodules[5] for details",
+	},
+	{
+		name: "submodule.<name>.fetchRecurseSubmodules",
+		insertValue: "submodule.{cursor}.fetchRecurseSubmodules",
+		description:
+			'This option can be used to control recursive fetching of this submodule. It can be overridden by using the --[no-]recurse-submodules command-line option to "git fetch" and "git pull". This setting will override that from in the gitmodules[5] file',
+	},
+	{
+		name: "submodule.<name>.ignore",
+		insertValue: "submodule.{cursor}.ignore",
+		description:
+			'Defines under what circumstances "git status" and the diff family show a submodule as modified. When set to "all", it will never be considered modified (but it will nonetheless show up in the output of status and commit when it has been staged), "dirty" will ignore all changes to the submodules work tree and takes only differences between the HEAD of the submodule and the commit recorded in the superproject into account. "untracked" will additionally let submodules with modified tracked files in their work tree show up. Using "none" (the default when this option is not set) also shows submodules that have untracked files in their work tree as changed. This setting overrides any setting made in .gitmodules for this submodule, both settings can be overridden on the command line by using the "--ignore-submodules" option. The \'git submodule\' commands are not affected by this setting',
+	},
+	{
+		name: "submodule.<name>.update",
+		insertValue: "submodule.{cursor}.update",
+		description:
+			"The method by which a submodule is updated by 'git submodule update', which is the only affected command, others such as 'git checkout --recurse-submodules' are unaffected. It exists for historical reasons, when 'git submodule' was the only command to interact with submodules; settings like `submodule.active` and `pull.rebase` are more specific. It is populated by `git submodule init` from the gitmodules[5] file. See description of 'update' command in git-submodule[1]",
+	},
+	{
+		name: "submodule.<name>.url",
+		insertValue: "submodule.{cursor}.url",
+		description:
+			"The URL for a submodule. This variable is copied from the .gitmodules file to the git config via 'git submodule init'. The user can change the configured URL before obtaining the submodule via 'git submodule update'. If neither submodule.<name>.active or submodule.active are set, the presence of this variable is used as a fallback to indicate whether the submodule is of interest to git commands. See git-submodule[1] and gitmodules[5] for details",
+	},
+	{
+		name: "submodule.active",
+		description:
+			"A repeated field which contains a pathspec used to match against a submodule's path to determine if the submodule is of interest to git commands. See gitsubmodules[7] for details",
+	},
+	{
+		name: "submodule.alternateErrorStrategy",
+		description:
+			"Specifies how to treat errors with the alternates for a submodule as computed via `submodule.alternateLocation`. Possible values are `ignore`, `info`, `die`. Default is `die`. Note that if set to `ignore` or `info`, and if there is an error with the computed alternate, the clone proceeds as if no alternate was specified",
+	},
+	{
+		name: "submodule.alternateLocation",
+		description:
+			"Specifies how the submodules obtain alternates when submodules are cloned. Possible values are `no`, `superproject`. By default `no` is assumed, which doesn't add references. When the value is set to `superproject` the submodule to be cloned computes its alternates location relative to the superprojects alternate",
+	},
+	{
+		name: "submodule.fetchJobs",
+		description:
+			"Specifies how many submodules are fetched/cloned at the same time. A positive integer allows up to that number of submodules fetched in parallel. A value of 0 will give some reasonable default. If unset, it defaults to 1",
+	},
+	{
+		name: "submodule.propagateBranches",
+		description:
+			"[EXPERIMENTAL] A boolean that enables branching support when using `--recurse-submodules` or `submodule.recurse=true`. Enabling this will allow certain commands to accept `--recurse-submodules` and certain commands that already accept `--recurse-submodules` will now consider branches. Defaults to false",
+	},
+	{
+		name: "submodule.recurse",
+		description:
+			"A boolean indicating if commands should enable the `--recurse-submodules` option by default. Defaults to false",
+	},
+	{
+		name: "tag.forceSignAnnotated",
+		description:
+			"A boolean to specify whether annotated tags created should be GPG signed. If `--annotate` is specified on the command line, it takes precedence over this option",
+	},
+	{
+		name: "tag.gpgSign",
+		description:
+			'A boolean to specify whether all tags should be GPG signed. Use of this option when running in an automated script can result in a large number of tags being signed. It is therefore convenient to use an agent to avoid typing your gpg passphrase several times. Note that this option doesn\'t affect tag signing behavior enabled by "-u <keyid>" or "--local-user=<keyid>" options',
+	},
+	{
+		name: "tag.sort",
+		description:
+			'This variable controls the sort ordering of tags when displayed by git-tag[1]. Without the "--sort=<value>" option provided, the value of this variable will be used as the default',
+	},
+	{
+		name: "tar.umask",
+		description:
+			'This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the world write bit. The special value "user" indicates that the archiving user\'s umask will be used instead. See umask(2) and git-archive[1]',
+	},
+	{
+		name: "trace2.configParams",
+		description:
+			'A comma-separated list of patterns of "important" config settings that should be recorded in the trace2 output. For example, `core.*,remote.*.url` would cause the trace2 output to contain events listing each configured remote. May be overridden by the `GIT_TRACE2_CONFIG_PARAMS` environment variable. Unset by default',
+	},
+	{
+		name: "trace2.destinationDebug",
+		description:
+			"Boolean. When true Git will print error messages when a trace target destination cannot be opened for writing. By default, these errors are suppressed and tracing is silently disabled. May be overridden by the `GIT_TRACE2_DST_DEBUG` environment variable",
+	},
+	{
+		name: "trace2.envVars",
+		description:
+			'A comma-separated list of "important" environment variables that should be recorded in the trace2 output. For example, `GIT_HTTP_USER_AGENT,GIT_CONFIG` would cause the trace2 output to contain events listing the overrides for HTTP user agent and the location of the Git configuration file (assuming any are set). May be overridden by the `GIT_TRACE2_ENV_VARS` environment variable. Unset by default',
+	},
+	{
+		name: "trace2.eventBrief",
+		description:
+			"Boolean. When true `time`, `filename`, and `line` fields are omitted from event output. May be overridden by the `GIT_TRACE2_EVENT_BRIEF` environment variable. Defaults to false",
+	},
+	{
+		name: "trace2.eventNesting",
+		description:
+			"Integer. Specifies desired depth of nested regions in the event output. Regions deeper than this value will be omitted. May be overridden by the `GIT_TRACE2_EVENT_NESTING` environment variable. Defaults to 2",
+	},
+	{
+		name: "trace2.eventTarget",
+		description:
+			"This variable controls the event target destination. It may be overridden by the `GIT_TRACE2_EVENT` environment variable. The following table shows possible values",
+	},
+	{
+		name: "trace2.maxFiles",
+		description:
+			"Integer. When writing trace files to a target directory, do not write additional traces if we would exceed this many files. Instead, write a sentinel file that will block further tracing to this directory. Defaults to 0, which disables this check",
+	},
+	{
+		name: "trace2.normalBrief",
+		description:
+			"Boolean. When true `time`, `filename`, and `line` fields are omitted from normal output. May be overridden by the `GIT_TRACE2_BRIEF` environment variable. Defaults to false",
+	},
+	{
+		name: "trace2.normalTarget",
+		description:
+			"This variable controls the normal target destination. It may be overridden by the `GIT_TRACE2` environment variable. The following table shows possible values",
+	},
+	{
+		name: "trace2.perfBrief",
+		description:
+			"Boolean. When true `time`, `filename`, and `line` fields are omitted from PERF output. May be overridden by the `GIT_TRACE2_PERF_BRIEF` environment variable. Defaults to false",
+	},
+	{
+		name: "trace2.perfTarget",
+		description:
+			"This variable controls the performance target destination. It may be overridden by the `GIT_TRACE2_PERF` environment variable. The following table shows possible values",
+	},
+	{
+		name: "transfer.advertiseSID",
+		description:
+			"Boolean. When true, client and server processes will advertise their unique session IDs to their remote counterpart. Defaults to false",
+	},
+	{
+		name: "transfer.credentialsInUrl",
+		description:
+			"A configured URL can contain plaintext credentials in the form `<protocol>://<user>:<password>@<domain>/<path>`. You may want to warn or forbid the use of such configuration (in favor of using git-credential[1]). This will be used on git-clone[1], git-fetch[1], git-push[1], and any other direct use of the configured URL",
+	},
+	{
+		name: "transfer.fsckObjects",
+		description:
+			"When `fetch.fsckObjects` or `receive.fsckObjects` are not set, the value of this variable is used instead. Defaults to false",
+	},
+	{
+		name: "transfer.hideRefs",
+		description:
+			"String(s) `receive-pack` and `upload-pack` use to decide which refs to omit from their initial advertisements. Use more than one definition to specify multiple prefix strings. A ref that is under the hierarchies listed in the value of this variable is excluded, and is hidden when responding to `git push` or `git fetch`. See `receive.hideRefs` and `uploadpack.hideRefs` for program-specific versions of this config",
+	},
+	{
+		name: "transfer.unpackLimit",
+		description:
+			"When `fetch.unpackLimit` or `receive.unpackLimit` are not set, the value of this variable is used instead. The default value is 100",
+	},
+	{
+		name: "uploadarchive.allowUnreachable",
+		description:
+			'If true, allow clients to use `git archive --remote` to request any tree, whether reachable from the ref tips or not. See the discussion in the "SECURITY" section of git-upload-archive[1] for more details. Defaults to `false`',
+	},
+	{
+		name: "uploadpack.allowAnySHA1InWant",
+		description:
+			"Allow `upload-pack` to accept a fetch request that asks for any object at all. Defaults to `false`",
+	},
+	{
+		name: "uploadpack.allowFilter",
+		description:
+			"If this option is set, `upload-pack` will support partial clone and partial fetch object filtering",
+	},
+	{
+		name: "uploadpack.allowReachableSHA1InWant",
+		description:
+			'Allow `upload-pack` to accept a fetch request that asks for an object that is reachable from any ref tip. However, note that calculating object reachability is computationally expensive. Defaults to `false`. Even if this is false, a client may be able to steal objects via the techniques described in the "SECURITY" section of the gitnamespaces[7] man page; it\'s best to keep private data in a separate repository',
+	},
+	{
+		name: "uploadpack.allowRefInWant",
+		description:
+			"If this option is set, `upload-pack` will support the `ref-in-want` feature of the protocol version 2 `fetch` command. This feature is intended for the benefit of load-balanced servers which may not have the same view of what OIDs their refs point to due to replication delay",
+	},
+	{
+		name: "uploadpack.allowTipSHA1InWant",
+		description:
+			'When `uploadpack.hideRefs` is in effect, allow `upload-pack` to accept a fetch request that asks for an object at the tip of a hidden ref (by default, such a request is rejected). See also `uploadpack.hideRefs`. Even if this is false, a client may be able to steal objects via the techniques described in the "SECURITY" section of the gitnamespaces[7] man page; it\'s best to keep private data in a separate repository',
+	},
+	{
+		name: "uploadpack.hideRefs",
+		description:
+			"This variable is the same as `transfer.hideRefs`, but applies only to `upload-pack` (and so affects only fetches, not pushes). An attempt to fetch a hidden ref by `git fetch` will fail. See also `uploadpack.allowTipSHA1InWant`",
+	},
+	{
+		name: "uploadpack.keepAlive",
+		description:
+			"When `upload-pack` has started `pack-objects`, there may be a quiet period while `pack-objects` prepares the pack. Normally it would output progress information, but if `--quiet` was used for the fetch, `pack-objects` will output nothing at all until the pack data begins. Some clients and networks may consider the server to be hung and give up. Setting this option instructs `upload-pack` to send an empty keepalive packet every `uploadpack.keepAlive` seconds. Setting this option to 0 disables keepalive packets entirely. The default is 5 seconds",
+	},
+	{
+		name: "uploadpack.packObjectsHook",
+		description:
+			"If this option is set, when `upload-pack` would run `git pack-objects` to create a packfile for a client, it will run this shell command instead. The `pack-objects` command and arguments it _would_ have run (including the `git pack-objects` at the beginning) are appended to the shell command. The stdin and stdout of the hook are treated as if `pack-objects` itself was run. I.e., `upload-pack` will feed input intended for `pack-objects` to the hook, and expects a completed packfile on stdout",
+	},
+	{
+		name: "uploadpackfilter.<filter>.allow",
+		insertValue: "uploadpackfilter.{cursor}.allow",
+		description:
+			"Explicitly allow or ban the object filter corresponding to `<filter>`, where `<filter>` may be one of: `blob:none`, `blob:limit`, `object:type`, `tree`, `sparse:oid`, or `combine`. If using combined filters, both `combine` and all of the nested filter kinds must be allowed. Defaults to `uploadpackfilter.allow`",
+	},
+	{
+		name: "uploadpackfilter.allow",
+		description:
+			"Provides a default value for unspecified object filters (see: the below configuration variable). If set to `true`, this will also enable all filters which get added in the future. Defaults to `true`",
+	},
+	{
+		name: "uploadpackfilter.tree.maxDepth",
+		description:
+			"Only allow `--filter=tree:<n>` when `<n>` is no more than the value of `uploadpackfilter.tree.maxDepth`. If set, this also implies `uploadpackfilter.tree.allow=true`, unless this configuration variable had already been set. Has no effect if unset",
+	},
+	{
+		name: "url.<base>.insteadOf",
+		insertValue: "url.{cursor}.insteadOf",
+		description:
+			"Any URL that starts with this value will be rewritten to start, instead, with <base>. In cases where some site serves a large number of repositories, and serves them with multiple access methods, and some users need to use different access methods, this feature allows people to specify any of the equivalent URLs and have Git automatically rewrite the URL to the best alternative for the particular user, even for a never-before-seen repository on the site. When more than one insteadOf strings match a given URL, the longest match is used",
+	},
+	{
+		name: "url.<base>.pushInsteadOf",
+		insertValue: "url.{cursor}.pushInsteadOf",
+		description:
+			"Any URL that starts with this value will not be pushed to; instead, it will be rewritten to start with <base>, and the resulting URL will be pushed to. In cases where some site serves a large number of repositories, and serves them with multiple access methods, some of which do not allow push, this feature allows people to specify a pull-only URL and have Git automatically use an appropriate URL to push, even for a never-before-seen repository on the site. When more than one pushInsteadOf strings match a given URL, the longest match is used. If a remote has an explicit pushurl, Git will ignore this setting for that remote",
+	},
+	{
+		name: "user.signingKey",
+		description:
+			'If git-tag[1] or git-commit[1] is not selecting the key you want it to automatically when creating a signed tag or commit, you can override the default selection with this variable. This option is passed unchanged to gpg\'s --local-user parameter, so you may specify a key using any method that gpg supports. If gpg.format is set to `ssh` this can contain the path to either your private ssh key or the public key when ssh-agent is used. Alternatively it can contain a public key prefixed with `key::` directly (e.g.: "key::ssh-rsa XXXXXX identifier"). The private key needs to be available via ssh-agent. If not set git will call gpg.ssh.defaultKeyCommand (e.g.: "ssh-add -L") and try to use the first key available. For backward compatibility, a raw key which begins with "ssh-", such as "ssh-rsa XXXXXX identifier", is treated as "key::ssh-rsa XXXXXX identifier", but this form is deprecated; use the `key::` form instead',
+	},
+	{
+		name: "user.useConfigOnly",
+		description:
+			"Instruct Git to avoid trying to guess defaults for `user.email` and `user.name`, and instead retrieve the values only from the configuration. For example, if you have multiple email addresses and would like to use a different one for each repository, then with this configuration option set to `true` in the global config along with a name, Git will prompt you to set up an email before making new commits in a newly cloned repository. Defaults to `false`",
+	},
+	{
+		name: "versionsort.prereleaseSuffix",
+		description:
+			"Deprecated alias for `versionsort.suffix`. Ignored if `versionsort.suffix` is set",
+		deprecated: true,
+		hidden: true,
+	},
+	{
+		name: "versionsort.suffix",
+		description:
+			'Even when version sort is used in git-tag[1], tagnames with the same base version but different suffixes are still sorted lexicographically, resulting e.g. in prerelease tags appearing after the main release (e.g. "1.0-rc1" after "1.0"). This variable can be specified to determine the sorting order of tags with different suffixes',
+	},
+	{
+		name: "web.browser",
+		description:
+			"Specify a web browser that may be used by some commands. Currently only git-instaweb[1] and git-help[1] may use it",
+	},
+	{
+		name: "worktree.guessRemote",
+		description:
+			'If no branch is specified and neither `-b` nor `-B` nor `--detach` is used, then `git worktree add` defaults to creating a new branch from HEAD. If `worktree.guessRemote` is set to true, `worktree add` tries to find a remote-tracking branch whose name uniquely matches the new branch name. If such a branch exists, it is checked out and set as "upstream" for the new branch. If no such match can be found, it falls back to creating a new branch from the current HEAD',
+	},
 ];
 
 const addOptions: Fig.Option[] = [
-  {
-    name: ["-n", "--dry-run"],
-    description:
-      "Don’t actually add the file(s), just show if they exist and/or will be ignored",
-  },
-  { name: ["-v", "--verbose"], description: "Be verbose" },
-  {
-    name: ["-f", "--force"],
-    description: "Allow adding otherwise ignored files",
-  },
-  {
-    name: ["-i", "--interactive"],
-    description:
-      "Add modified contents in the working tree interactively to the index. Optional path arguments may be supplied to limit operation to a subset of the working tree. See “Interactive mode” for details",
-  },
-  {
-    name: ["-p", "--patch"],
-    description:
-      "Interactively choose hunks of patch between the index and the work tree and add them to the index. This gives the user a chance to review the difference before adding modified contents to the index",
-  },
-  {
-    name: ["-e", "--edit"],
-    description:
-      "Open the diff vs. the index in an editor and let the user edit it. After the editor was closed, adjust the hunk headers and apply the patch to the index",
-  },
-  {
-    name: ["-u", "--update"],
-    description:
-      "Update the index just where it already has an entry matching <pathspec>. This removes as well as modifies index entries to match the working tree, but adds no new files",
-  },
-  {
-    name: ["-A", "--all", "--no-ignore-removal"],
-    description:
-      "Update the index not only where the working tree has a file matching <pathspec> but also where the index already has an entry. This adds, modifies, and removes index entries to match the working tree",
-  },
-  {
-    name: ["--no-all", "--ignore-removal"],
-    description:
-      "Update the index by adding new files that are unknown to the index and files modified in the working tree, but ignore files that have been removed from the working tree. This option is a no-op when no <pathspec> is used",
-  },
-  {
-    name: ["-N", "--intent-to-add"],
-    description:
-      "Record only the fact that the path will be added later. An entry for the path is placed in the index with no content. This is useful for, among other things, showing the unstaged content of such files with git diff and committing them with git commit -a",
-  },
-  {
-    name: "--refresh",
-    description:
-      "Don’t add the file(s), but only refresh their stat() information in the index",
-  },
-  {
-    name: "--ignore-errors",
-    description:
-      "If some files could not be added because of errors indexing them, do not abort the operation, but continue adding the others. The command shall still exit with non-zero status. The configuration variable add.ignoreErrors can be set to true to make this the default behaviour",
-  },
-  {
-    name: "--ignore-missing",
-    description:
-      "This option can only be used together with --dry-run. By using this option the user can check if any of the given files would be ignored, no matter if they are already present in the work tree or not",
-  },
-  {
-    name: "--no-warn-embedded-repo",
-    description:
-      "By default, git add will warn when adding an embedded repository to the index without using git submodule add to create an entry in .gitmodules. This option will suppress the warning (e.g., if you are manually performing operations on submodules)",
-  },
-  {
-    name: "--renormalize",
-    description:
-      "Apply the 'clean' process freshly to all tracked files to forcibly add them again to the index. This is useful after changing core.autocrlf configuration or the text attribute in order to correct files added with wrong CRLF/LF line endings. This option implies -u",
-  },
-  {
-    name: "--chmod",
-    description:
-      "Override the executable bit of the added files. The executable bit is only changed in the index, the files on disk are left unchanged",
-    requiresSeparator: true,
-    args: {
-      suggestions: ["+x", "-x"],
-    },
-  },
-  {
-    name: "--pathspec-from-file",
-    description:
-      "Pathspec is passed in <file> instead of commandline args. If <file> is exactly - then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable core.quotePath (see git-config[1]). See also --pathspec-file-nul and global --literal-pathspecs",
-    args: {
-      name: "File",
-      description: "File with pathspec",
-      template: "filepaths",
-    },
-  },
-  {
-    name: "--pathspec-file-nul",
-    description:
-      "Only meaningful with --pathspec-from-file. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)",
-  },
-  {
-    name: "--",
-    description:
-      "This option can be used to separate command-line options from the list of files",
-  },
+	{
+		name: ["-n", "--dry-run"],
+		description:
+			"Don’t actually add the file(s), just show if they exist and/or will be ignored",
+	},
+	{ name: ["-v", "--verbose"], description: "Be verbose" },
+	{
+		name: ["-f", "--force"],
+		description: "Allow adding otherwise ignored files",
+	},
+	{
+		name: ["-i", "--interactive"],
+		description:
+			"Add modified contents in the working tree interactively to the index. Optional path arguments may be supplied to limit operation to a subset of the working tree. See “Interactive mode” for details",
+	},
+	{
+		name: ["-p", "--patch"],
+		description:
+			"Interactively choose hunks of patch between the index and the work tree and add them to the index. This gives the user a chance to review the difference before adding modified contents to the index",
+	},
+	{
+		name: ["-e", "--edit"],
+		description:
+			"Open the diff vs. the index in an editor and let the user edit it. After the editor was closed, adjust the hunk headers and apply the patch to the index",
+	},
+	{
+		name: ["-u", "--update"],
+		description:
+			"Update the index just where it already has an entry matching <pathspec>. This removes as well as modifies index entries to match the working tree, but adds no new files",
+	},
+	{
+		name: ["-A", "--all", "--no-ignore-removal"],
+		description:
+			"Update the index not only where the working tree has a file matching <pathspec> but also where the index already has an entry. This adds, modifies, and removes index entries to match the working tree",
+	},
+	{
+		name: ["--no-all", "--ignore-removal"],
+		description:
+			"Update the index by adding new files that are unknown to the index and files modified in the working tree, but ignore files that have been removed from the working tree. This option is a no-op when no <pathspec> is used",
+	},
+	{
+		name: ["-N", "--intent-to-add"],
+		description:
+			"Record only the fact that the path will be added later. An entry for the path is placed in the index with no content. This is useful for, among other things, showing the unstaged content of such files with git diff and committing them with git commit -a",
+	},
+	{
+		name: "--refresh",
+		description:
+			"Don’t add the file(s), but only refresh their stat() information in the index",
+	},
+	{
+		name: "--ignore-errors",
+		description:
+			"If some files could not be added because of errors indexing them, do not abort the operation, but continue adding the others. The command shall still exit with non-zero status. The configuration variable add.ignoreErrors can be set to true to make this the default behaviour",
+	},
+	{
+		name: "--ignore-missing",
+		description:
+			"This option can only be used together with --dry-run. By using this option the user can check if any of the given files would be ignored, no matter if they are already present in the work tree or not",
+	},
+	{
+		name: "--no-warn-embedded-repo",
+		description:
+			"By default, git add will warn when adding an embedded repository to the index without using git submodule add to create an entry in .gitmodules. This option will suppress the warning (e.g., if you are manually performing operations on submodules)",
+	},
+	{
+		name: "--renormalize",
+		description:
+			"Apply the 'clean' process freshly to all tracked files to forcibly add them again to the index. This is useful after changing core.autocrlf configuration or the text attribute in order to correct files added with wrong CRLF/LF line endings. This option implies -u",
+	},
+	{
+		name: "--chmod",
+		description:
+			"Override the executable bit of the added files. The executable bit is only changed in the index, the files on disk are left unchanged",
+		requiresSeparator: true,
+		args: {
+			suggestions: ["+x", "-x"],
+		},
+	},
+	{
+		name: "--pathspec-from-file",
+		description:
+			"Pathspec is passed in <file> instead of commandline args. If <file> is exactly - then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable core.quotePath (see git-config[1]). See also --pathspec-file-nul and global --literal-pathspecs",
+		args: {
+			name: "File",
+			description: "File with pathspec",
+			template: "filepaths",
+		},
+	},
+	{
+		name: "--pathspec-file-nul",
+		description:
+			"Only meaningful with --pathspec-from-file. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)",
+	},
+	{
+		name: "--",
+		description:
+			"This option can be used to separate command-line options from the list of files",
+	},
 ];
 
 const headSuggestions = [
-  {
-    name: "HEAD",
-    icon: "🔻",
-    description: "The most recent commit",
-  },
-  {
-    name: "HEAD~<N>",
-    description: "A specific number of commits",
-    insertValue: "HEAD~",
-  },
+	{
+		name: "HEAD",
+		icon: "🔻",
+		description: "The most recent commit",
+	},
+	{
+		name: "HEAD~<N>",
+		description: "A specific number of commits",
+		insertValue: "HEAD~",
+	},
 ];
 
 /** Git finds these commands as "git-<name>" on your PATH */
 const optionalCommands: Record<string, Omit<Fig.Subcommand, "name">> = {
-  open: {
-    description: "Open in your browser",
-    options: [
-      {
-        name: ["-c", "--commit"],
-        description: "Open current commit",
-      },
-      {
-        name: ["-i", "--issue"],
-        description: "Open issues page",
-      },
-      {
-        name: ["-s", "--suffix"],
-        description: "Append this suffix",
-        args: {
-          name: "string",
-        },
-      },
-      {
-        name: ["-p", "--print"],
-        description: "Just print the URL",
-      },
-    ],
-  },
-  recent: {
-    description: "Show recent local branches",
-    options: [
-      {
-        name: "-n",
-        description: "Specify a number of branches to show",
-        args: {
-          name: "int",
-        },
-      },
-    ],
-  },
-  flow: {
-    description: "Extensions to follow Vincent Driessen's branching model",
-    loadSpec: "git-flow",
-  },
+	open: {
+		description: "Open in your browser",
+		options: [
+			{
+				name: ["-c", "--commit"],
+				description: "Open current commit",
+			},
+			{
+				name: ["-i", "--issue"],
+				description: "Open issues page",
+			},
+			{
+				name: ["-s", "--suffix"],
+				description: "Append this suffix",
+				args: {
+					name: "string",
+				},
+			},
+			{
+				name: ["-p", "--print"],
+				description: "Just print the URL",
+			},
+		],
+	},
+	recent: {
+		description: "Show recent local branches",
+		options: [
+			{
+				name: "-n",
+				description: "Specify a number of branches to show",
+				args: {
+					name: "int",
+				},
+			},
+		],
+	},
+	flow: {
+		description: "Extensions to follow Vincent Driessen's branching model",
+		loadSpec: "git-flow",
+	},
 };
 
 const daemonServices: Fig.Suggestion[] = [
-  {
-    name: "upload-pack",
-    description:
-      "This serves git fetch-pack and git ls-remote clients. It is enabled by default, but a repository can disable it by setting daemon.uploadpack configuration item to false",
-  },
-  {
-    name: "upload-archive",
-    description:
-      "This serves git archive --remote. It is disabled by default, but a repository can enable it by setting daemon.uploadarch configuration item to true",
-  },
-  {
-    name: "receive-pack",
-    description:
-      "This serves git send-pack clients, allowing anonymous push. It is disabled by default, as there is no authentication in the protocol (in other words, anybody can push anything into the repository, including removal of refs). This is solely meant for a closed LAN setting where everybody is friendly. This service can be enabled by setting daemon.receivepack configuration item to true",
-  },
+	{
+		name: "upload-pack",
+		description:
+			"This serves git fetch-pack and git ls-remote clients. It is enabled by default, but a repository can disable it by setting daemon.uploadpack configuration item to false",
+	},
+	{
+		name: "upload-archive",
+		description:
+			"This serves git archive --remote. It is disabled by default, but a repository can enable it by setting daemon.uploadarch configuration item to true",
+	},
+	{
+		name: "receive-pack",
+		description:
+			"This serves git send-pack clients, allowing anonymous push. It is disabled by default, as there is no authentication in the protocol (in other words, anybody can push anything into the repository, including removal of refs). This is solely meant for a closed LAN setting where everybody is friendly. This service can be enabled by setting daemon.receivepack configuration item to true",
+	},
 ];
 
 const completionSpec: Fig.Spec = {
-  name: "git",
-  description: "The stupid content tracker",
-  generateSpec: async (_, executeShellCommand) => {
-    const { stdout } = await executeShellCommand({
-      command: "git",
-      args: ["help", "-a"],
-    });
-    const lines = stdout.trim().split("\n");
-    const start = lines.findIndex((val) => val.match(/external commands/i));
-    const commands: string[] = [];
-    for (let i = start + 1; i < lines.length; i += 1) {
-      const line = lines[i].trim();
-      if (!line) {
-        break;
-      }
-      const command = line.split(/\s+/)[0];
-      commands.push(command);
-    }
-    return {
-      name: "git",
-      subcommands: commands.map((name) => ({
-        name,
-        ...(optionalCommands[name] ?? { description: `Run git-${name}` }),
-      })),
-    };
-  },
-  args: {
-    name: "alias",
-    description: "Custom user defined git alias",
-    parserDirectives: {
-      alias: async (token, exec) => {
-        const { stdout, status } = await exec({
-          command: "git",
-          args: ["config", "--get", `alias.${token}`],
-        });
-        if (status !== 0) {
-          throw new Error("Failed parsing alias");
-        }
-        return stdout;
-      },
-    },
-    isOptional: true,
-    generators: gitGenerators.aliases,
-  },
-  options: [
-    {
-      name: "--version",
-      description: "Output version",
-    },
-    {
-      name: "--help",
-      description: "Output help",
-    },
-    {
-      name: "-C",
-      args: {
-        name: "path",
-        template: "folders",
-      },
-      description: "Run as if git was started in <path>",
-    },
-    {
-      name: "-c",
-      insertValue: "-c {cursor}",
-      description: "Pass a config parameter to the command",
-      args: {
-        name: "name=value",
-      },
-    },
-    {
-      name: "--exec-path",
-      args: {
-        name: "path",
-        isOptional: true,
-        template: "folders",
-      },
-      description: "Get or set GIT_EXEC_PATH for core Git programs",
-    },
-    {
-      name: "--html-path",
-      description: "Print Git’s HTML documentation path",
-    },
-    {
-      name: "--man-path",
-      description: "Print the manpath for this version of Git",
-    },
-    {
-      name: "--info-path",
-      description: "Print the info path documenting this version of Git",
-    },
-    {
-      name: ["-p", "--paginate"],
-      description: "Pipe output into `less` or custom $PAGER",
-    },
-    {
-      name: "--no-pager",
-      description: "Do not pipe Git output into a pager",
-    },
-    {
-      name: "--no-replace-objects",
-      description: "Do not use replacement refs",
-    },
-    {
-      name: "--no-optional-locks",
-      description: "Do not perform optional operations that require lock files",
-    },
-    {
-      name: "--bare",
-      description: "Treat the repository as a bare repository",
-    },
-    {
-      name: "--git-dir",
-      args: {
-        name: "path",
-        template: "folders",
-      },
-      description: "Set the path to the repository dir (`.git`)",
-    },
-    {
-      name: "--work-tree",
-      args: {
-        name: "path",
-        template: "folders",
-      },
-      description: "Set working tree path",
-    },
-    {
-      name: "--namespace",
-      args: {
-        name: "name",
-      },
-      description: "Set the Git namespace",
-    },
-  ],
-  subcommands: [
-    {
-      name: "archive",
-      description: "Create an archive of files from a named tree",
-      args: [
-        {
-          name: "tree-ish",
-          generators: gitGenerators.treeish,
-        },
-        {
-          name: "path",
-          template: "filepaths",
-          isVariadic: true,
-          isOptional: true,
-        },
-      ],
-      options: [
-        {
-          name: "--format",
-          description: "Archive format",
-          args: {
-            name: "fmt",
-            suggestions: ["tar", "zip"],
-          },
-        },
-        {
-          name: "--prefix",
-          description: "Prepend prefix to each pathname in the archive",
-          args: {
-            name: "prefix",
-          },
-        },
-        {
-          name: "--add-file",
-          description: "Add untracked file to archive",
-          args: {
-            name: "file",
-            template: "filepaths",
-          },
-        },
-        {
-          name: ["-o", "--output"],
-          description: "Write the archive to this file",
-          args: {
-            name: "file",
-            template: "filepaths",
-          },
-        },
-        {
-          name: "--worktree-attributes",
-          description: "Read .gitattributes in working directory",
-        },
-        {
-          name: ["-v", "--verbose"],
-          description: "Report archived files on stderr",
-        },
-        {
-          name: "-NUM",
-          insertValue: "-",
-          description: "Set compression level",
-        },
-        {
-          name: ["-l", "--list"],
-          description: "List supported archive formats",
-        },
-        {
-          name: "--remote",
-          description: "Retrieve the archive from remote repository <repo>",
-          args: {
-            name: "repo",
-          },
-        },
-        {
-          name: "--exec",
-          description: "Path to the remote git-upload-archive command",
-          args: {
-            name: "command",
-          },
-        },
-      ],
-    },
-    {
-      name: "blame",
-      args: {
-        name: "file",
-        template: "filepaths",
-      },
-      options: [
-        {
-          name: "--incremental",
-          description: "Show blame entries as we find them, incrementally",
-        },
-        {
-          name: "-b",
-          description:
-            "Do not show object names of boundary commits (Default: off)",
-        },
-        {
-          name: "--root",
-          description: "Do not treat root commits as boundaries (Default: off)",
-        },
-        {
-          name: "--show-stats",
-          description: "Show work cost statistics",
-        },
-        {
-          name: "--progress",
-          description: "Force progress reporting",
-        },
-        {
-          name: "--score-debug",
-          description: "Show output score for blame entries",
-        },
-        {
-          name: ["-f", "--show-name"],
-          description: "Show original filename (Default: auto)",
-        },
-        {
-          name: ["-n", "--show-number"],
-          description: "Show original linenumber (Default: off)",
-        },
-        {
-          name: ["-p", "--porcelain"],
-          description: "Show in a format designed for machine consumption",
-        },
-        {
-          name: "--line-porcelain",
-          description: "Show porcelain format with per-line commit information",
-        },
-        {
-          name: "-c",
-          description:
-            "Use the same output mode as git-annotate (Default: off)",
-        },
-        {
-          name: "-t",
-          description: "Show raw timestamp (Default: off)",
-        },
-        {
-          name: "-l",
-          description: "Show long commit SHA1 (Default: off)",
-        },
-        {
-          name: "-s",
-          description: "Suppress author name and timestamp (Default: off)",
-        },
-        {
-          name: ["-e", "--show-email"],
-          description: "Show author email instead of name (Default: off)",
-        },
-        {
-          name: "-w",
-          description: "Ignore whitespace differences",
-        },
-        {
-          name: "--ignore-rev",
-          description: "Ignore <rev> when blaming",
-          args: {
-            name: "rev",
-            generators: gitGenerators.revs,
-          },
-        },
-        {
-          name: "--ignore-revs-file",
-          description: "Ignore revisions from <file>",
-          args: {
-            name: "file",
-            template: "filepaths",
-          },
-        },
-        {
-          name: "--color-lines",
-          description:
-            "Color redundant metadata from previous line differently",
-        },
-        { name: "--color-by-age", description: "Color lines by age" },
-        {
-          name: "--minimal",
-          description: "Spend extra cycles to find better match",
-        },
-        {
-          name: "-S",
-          description:
-            "Use revisions from <file> instead of calling git-rev-list",
-          args: {
-            name: "file",
-            template: "filepaths",
-          },
-        },
-        {
-          name: "--contents",
-          description: "Use <file>'s contents as the final image",
-          args: {
-            name: "file",
-            template: "filepaths",
-          },
-        },
-        {
-          name: "-C",
-          insertValue: "-C{cursor}",
-          description: "Find line copies within and across files",
-        },
-        {
-          name: "-M",
-          insertValue: "-M{cursor}",
-          description: "Find line movements within and across files",
-        },
-        {
-          name: "-L",
-          description:
-            "Process only line range <start>,<end> or function :<funcname>",
-          args: {
-            name: "start,end",
-          },
-        },
-        {
-          name: "--abbrev",
-          requiresSeparator: true,
-          description: "Use <n> digits to display object names",
-          args: {
-            name: "n",
-            isOptional: true,
-          },
-        },
-      ],
-    },
-    {
-      name: "commit",
-      description: "Record changes to the repository",
-      args: {
-        name: "pathspec",
-        isOptional: true,
-        isVariadic: true,
-        template: "filepaths",
-      },
-      options: [
-        {
-          name: ["-m", "--message"],
-          // insertValue: "-m '{cursor}'",
-          description: "Use the given message as the commit message",
-          args: {
-            name: "message",
-            generators: ai({
-              name: "git commit -m",
-              prompt: async ({ executeCommand }: any) => {
-                const { stdout } = await executeCommand({
-                  command: "git",
-                  args: [
-                    "log",
-                    "--pretty=format:%s",
-                    "--abbrev-commit",
-                    "--max-count=20",
-                  ],
-                });
+	name: "git",
+	description: "The stupid content tracker",
+	generateSpec: async (_, executeShellCommand) => {
+		const { stdout } = await executeShellCommand({
+			command: "git",
+			args: ["help", "-a"],
+		});
+		const lines = stdout.trim().split("\n");
+		const start = lines.findIndex((val) => val.match(/external commands/i));
+		const commands: string[] = [];
+		for (let i = start + 1; i < lines.length; i += 1) {
+			const line = lines[i].trim();
+			if (!line) {
+				break;
+			}
+			const command = line.split(/\s+/)[0];
+			commands.push(command);
+		}
+		return {
+			name: "git",
+			subcommands: commands.map((name) => ({
+				name,
+				...(optionalCommands[name] ?? { description: `Run git-${name}` }),
+			})),
+		};
+	},
+	args: {
+		name: "alias",
+		description: "Custom user defined git alias",
+		parserDirectives: {
+			alias: async (token, exec) => {
+				const { stdout, status } = await exec({
+					command: "git",
+					args: ["config", "--get", `alias.${token}`],
+				});
+				if (status !== 0) {
+					throw new Error("Failed parsing alias");
+				}
+				return stdout;
+			},
+		},
+		isOptional: true,
+		generators: gitGenerators.aliases,
+	},
+	options: [
+		{
+			name: "--version",
+			description: "Output version",
+		},
+		{
+			name: "--help",
+			description: "Output help",
+		},
+		{
+			name: "-C",
+			args: {
+				name: "path",
+				template: "folders",
+			},
+			description: "Run as if git was started in <path>",
+		},
+		{
+			name: "-c",
+			insertValue: "-c {cursor}",
+			description: "Pass a config parameter to the command",
+			args: {
+				name: "name=value",
+			},
+		},
+		{
+			name: "--exec-path",
+			args: {
+				name: "path",
+				isOptional: true,
+				template: "folders",
+			},
+			description: "Get or set GIT_EXEC_PATH for core Git programs",
+		},
+		{
+			name: "--html-path",
+			description: "Print Git’s HTML documentation path",
+		},
+		{
+			name: "--man-path",
+			description: "Print the manpath for this version of Git",
+		},
+		{
+			name: "--info-path",
+			description: "Print the info path documenting this version of Git",
+		},
+		{
+			name: ["-p", "--paginate"],
+			description: "Pipe output into `less` or custom $PAGER",
+		},
+		{
+			name: "--no-pager",
+			description: "Do not pipe Git output into a pager",
+		},
+		{
+			name: "--no-replace-objects",
+			description: "Do not use replacement refs",
+		},
+		{
+			name: "--no-optional-locks",
+			description: "Do not perform optional operations that require lock files",
+		},
+		{
+			name: "--bare",
+			description: "Treat the repository as a bare repository",
+		},
+		{
+			name: "--git-dir",
+			args: {
+				name: "path",
+				template: "folders",
+			},
+			description: "Set the path to the repository dir (`.git`)",
+		},
+		{
+			name: "--work-tree",
+			args: {
+				name: "path",
+				template: "folders",
+			},
+			description: "Set working tree path",
+		},
+		{
+			name: "--namespace",
+			args: {
+				name: "name",
+			},
+			description: "Set the Git namespace",
+		},
+	],
+	subcommands: [
+		{
+			name: "archive",
+			description: "Create an archive of files from a named tree",
+			args: [
+				{
+					name: "tree-ish",
+					generators: gitGenerators.treeish,
+				},
+				{
+					name: "path",
+					template: "filepaths",
+					isVariadic: true,
+					isOptional: true,
+				},
+			],
+			options: [
+				{
+					name: "--format",
+					description: "Archive format",
+					args: {
+						name: "fmt",
+						suggestions: ["tar", "zip"],
+					},
+				},
+				{
+					name: "--prefix",
+					description: "Prepend prefix to each pathname in the archive",
+					args: {
+						name: "prefix",
+					},
+				},
+				{
+					name: "--add-file",
+					description: "Add untracked file to archive",
+					args: {
+						name: "file",
+						template: "filepaths",
+					},
+				},
+				{
+					name: ["-o", "--output"],
+					description: "Write the archive to this file",
+					args: {
+						name: "file",
+						template: "filepaths",
+					},
+				},
+				{
+					name: "--worktree-attributes",
+					description: "Read .gitattributes in working directory",
+				},
+				{
+					name: ["-v", "--verbose"],
+					description: "Report archived files on stderr",
+				},
+				{
+					name: "-NUM",
+					insertValue: "-",
+					description: "Set compression level",
+				},
+				{
+					name: ["-l", "--list"],
+					description: "List supported archive formats",
+				},
+				{
+					name: "--remote",
+					description: "Retrieve the archive from remote repository <repo>",
+					args: {
+						name: "repo",
+					},
+				},
+				{
+					name: "--exec",
+					description: "Path to the remote git-upload-archive command",
+					args: {
+						name: "command",
+					},
+				},
+			],
+		},
+		{
+			name: "blame",
+			args: {
+				name: "file",
+				template: "filepaths",
+			},
+			options: [
+				{
+					name: "--incremental",
+					description: "Show blame entries as we find them, incrementally",
+				},
+				{
+					name: "-b",
+					description:
+						"Do not show object names of boundary commits (Default: off)",
+				},
+				{
+					name: "--root",
+					description: "Do not treat root commits as boundaries (Default: off)",
+				},
+				{
+					name: "--show-stats",
+					description: "Show work cost statistics",
+				},
+				{
+					name: "--progress",
+					description: "Force progress reporting",
+				},
+				{
+					name: "--score-debug",
+					description: "Show output score for blame entries",
+				},
+				{
+					name: ["-f", "--show-name"],
+					description: "Show original filename (Default: auto)",
+				},
+				{
+					name: ["-n", "--show-number"],
+					description: "Show original linenumber (Default: off)",
+				},
+				{
+					name: ["-p", "--porcelain"],
+					description: "Show in a format designed for machine consumption",
+				},
+				{
+					name: "--line-porcelain",
+					description: "Show porcelain format with per-line commit information",
+				},
+				{
+					name: "-c",
+					description:
+						"Use the same output mode as git-annotate (Default: off)",
+				},
+				{
+					name: "-t",
+					description: "Show raw timestamp (Default: off)",
+				},
+				{
+					name: "-l",
+					description: "Show long commit SHA1 (Default: off)",
+				},
+				{
+					name: "-s",
+					description: "Suppress author name and timestamp (Default: off)",
+				},
+				{
+					name: ["-e", "--show-email"],
+					description: "Show author email instead of name (Default: off)",
+				},
+				{
+					name: "-w",
+					description: "Ignore whitespace differences",
+				},
+				{
+					name: "--ignore-rev",
+					description: "Ignore <rev> when blaming",
+					args: {
+						name: "rev",
+						generators: gitGenerators.revs,
+					},
+				},
+				{
+					name: "--ignore-revs-file",
+					description: "Ignore revisions from <file>",
+					args: {
+						name: "file",
+						template: "filepaths",
+					},
+				},
+				{
+					name: "--color-lines",
+					description:
+						"Color redundant metadata from previous line differently",
+				},
+				{ name: "--color-by-age", description: "Color lines by age" },
+				{
+					name: "--minimal",
+					description: "Spend extra cycles to find better match",
+				},
+				{
+					name: "-S",
+					description:
+						"Use revisions from <file> instead of calling git-rev-list",
+					args: {
+						name: "file",
+						template: "filepaths",
+					},
+				},
+				{
+					name: "--contents",
+					description: "Use <file>'s contents as the final image",
+					args: {
+						name: "file",
+						template: "filepaths",
+					},
+				},
+				{
+					name: "-C",
+					insertValue: "-C{cursor}",
+					description: "Find line copies within and across files",
+				},
+				{
+					name: "-M",
+					insertValue: "-M{cursor}",
+					description: "Find line movements within and across files",
+				},
+				{
+					name: "-L",
+					description:
+						"Process only line range <start>,<end> or function :<funcname>",
+					args: {
+						name: "start,end",
+					},
+				},
+				{
+					name: "--abbrev",
+					requiresSeparator: true,
+					description: "Use <n> digits to display object names",
+					args: {
+						name: "n",
+						isOptional: true,
+					},
+				},
+			],
+		},
+		{
+			name: "commit",
+			description: "Record changes to the repository",
+			args: {
+				name: "pathspec",
+				isOptional: true,
+				isVariadic: true,
+				template: "filepaths",
+			},
+			options: [
+				{
+					name: ["-m", "--message"],
+					// insertValue: "-m '{cursor}'",
+					description: "Use the given message as the commit message",
+					args: {
+						name: "message",
+						generators: ai({
+							name: "git commit -m",
+							prompt: async ({ executeCommand }: any) => {
+								const { stdout } = await executeCommand({
+									command: "git",
+									args: [
+										"log",
+										"--pretty=format:%s",
+										"--abbrev-commit",
+										"--max-count=20",
+									],
+								});
 
-                return (
-                  'Generate a git commit message summary based on this git diff, the "summary" must be no more ' +
-                  "than 70-75 characters, and it must describe both what the patch changes, as well as why the " +
-                  `patch might be necessary.\n\nHere are some examples from the repo:\n${stdout}`
-                );
-              },
-              message: async ({ executeCommand }: any) =>
-                (
-                  await executeCommand({
-                    command: "git",
-                    args: ["diff", "--staged"],
-                  })
-                ).stdout,
-              splitOn: "\n",
-            }),
-          },
-        },
-        {
-          name: ["-a", "--all"],
-          description: "Stage all modified and deleted paths",
-        },
-        {
-          name: "-am",
-          insertValue: "-am '{cursor}'",
-          description: "Stage all and use given text as commit message",
-          args: {
-            name: "message",
-          },
-        },
-        {
-          name: ["-v", "--verbose"],
-          description: "Show unified diff of all file changes",
-        },
-        {
-          name: ["-p", "--patch"],
-          description:
-            "Use the interactive patch selection interface to chose which changes to commi",
-        },
-        {
-          name: ["-C", "--reuse-message"],
-          description:
-            "Take an existing commit object, and reuse the log message and the authorship",
-          args: {
-            name: "commit",
-            generators: gitGenerators.commits,
-          },
-        },
-        {
-          name: ["-c", "--reedit-message"],
-          description:
-            "Like -C, but with -c the editor is invoked, so that the user can further edit",
-          args: {
-            name: "commit",
-            generators: gitGenerators.commits,
-          },
-        },
-        {
-          name: "--fixup",
-          description:
-            "Construct a commit message for use with rebase --autosquash. The commit messa",
-          args: {
-            name: "commit",
-            generators: gitGenerators.commits,
-          },
-        },
-        {
-          name: "--squash",
-          description:
-            "Construct a commit message for use with rebase --autosquash. The commit messa",
-          args: {
-            name: "commit",
-            generators: gitGenerators.commits,
-          },
-        },
-        {
-          name: "--reset-author",
-          description:
-            "When used with -C/-c/--amend options, or when committing after a conflicting",
-        },
-        {
-          name: "--short",
-          description:
-            "When doing a dry-run, give the output in the short-format. See git-status[1]",
-        },
-        {
-          name: "--branch",
-          description: "Show the branch and tracking info even in short-format",
-        },
-        {
-          name: "--porcelain",
-          description:
-            "When doing a dry-run, give the output in a porcelain-ready format. See git-st",
-        },
-        {
-          name: "--long",
-          description:
-            "When doing a dry-run, give the output in the long-format. Implies --dry-run",
-        },
-        {
-          name: ["-z", "--null"],
-          description:
-            "When showing short or porcelain status output, print the filename verbatim an",
-        },
-        {
-          name: ["-F", "--file"],
-          description:
-            "Take the commit message from the given file. Use - to read the message from t",
-          args: {
-            name: "file",
-            template: "filepaths",
-          },
-        },
-        {
-          name: "--author",
-          description:
-            "Override the commit author. Specify an explicit author using the standard A U",
-          args: {
-            name: "author",
-          },
-        },
-        {
-          name: "--date",
-          description: "Override the author date used in the commit",
-          args: {
-            name: "date",
-          },
-        },
-        {
-          name: ["-t", "--template"],
-          description:
-            "When editing the commit message, start the editor with the contents in the gi",
-          args: {
-            name: "file",
-            template: "filepaths",
-          },
-        },
-        {
-          name: ["-s", "--signoff"],
-          description:
-            "Add a Signed-off-by trailer by the committer at the end of the commit log mes",
-        },
-        {
-          name: "--no-signoff",
-          description:
-            "Don't add a Signed-off-by trailer by the committer at the end of the commit l",
-        },
-        {
-          name: ["-n", "--no-verify"],
-          description:
-            "This option bypasses the pre-commit and commit-msg hooks. See also githooks[5]",
-        },
-        {
-          name: "--allow-empty",
-          description:
-            "Usually recording a commit that has the exact same tree as its sole parent co",
-        },
-        {
-          name: "--allow-empty-message",
-          description:
-            "Like --allow-empty this command is primarily for use by foreign SCM interface",
-        },
-        {
-          name: "--cleanup",
-          description:
-            "This option determines how the supplied commit message should be cleaned up b",
-          args: {
-            name: "mode",
-            description:
-              "Determines how the supplied commit messaged should be cleaned up before committing",
-            suggestions: [
-              {
-                name: "strip",
-                description:
-                  "Strip leading and trailing empty lines, trailing whitepace, commentary and collapse consecutive empty lines",
-              },
-              {
-                name: "whitespace",
-                description: "Same as strip except #commentary is not removed",
-              },
-              {
-                name: "verbatim",
-                description: "Do not change the message at all",
-              },
-              {
-                name: "scissors",
-                description:
-                  "Same as whitespace except that everything from (and including) the line found below is truncated",
-              },
-              {
-                name: "default",
-                description:
-                  "Same as strip if the message is to be edited. Otherwise whitespace",
-              },
-            ],
-          },
-        },
-        {
-          name: ["-e", "--edit"],
-          description:
-            "The message taken from file with -F, command line with -m, and from commit ob",
-        },
-        {
-          name: "--no-edit",
-          description:
-            "Use the selected commit message without launching an editor. For example, git",
-        },
-        {
-          name: "--amend",
-          description:
-            "Replace the tip of the current branch by creating a new commit. The recorded",
-        },
-        {
-          name: "--no-post-rewrite",
-          description: "Bypass the post-rewrite hook",
-        },
-        {
-          name: ["-i", "--include"],
-          description:
-            "Before making a commit out of staged contents so far, stage the contents of p",
-        },
-        {
-          name: ["-o", "--only"],
-          description:
-            "Make a commit by taking the updated working tree contents of the paths specif",
-        },
-        {
-          name: "--pathspec-from-file",
-          description:
-            "Pathspec is passed in instead of commandline args. If is exactly - then stand",
-          args: {
-            name: "file",
-            template: "filepaths",
-          },
-        },
-        {
-          name: "--pathspec-file-nul",
-          description:
-            "Only meaningful with --pathspec-from-file. Pathspec elements are separated wi",
-        },
-        {
-          name: ["-u", "--untracked-files"],
-          description:
-            "Show untracked files. The mode parameter is optional (defaults to all), and i",
-          args: {
-            name: "mode",
-            suggestions: ["no", "normal", "all"],
-            isOptional: true,
-          },
-        },
-        {
-          name: ["-q", "--quiet"],
-          description: "Suppress commit summary message",
-        },
-        {
-          name: "--dry-run",
-          description:
-            "Do not create a commit, but show a list of paths that are to be committed, pa",
-        },
-        {
-          name: "--status",
-          description:
-            "Include the output of git-status[1] in the commit message template when using",
-        },
-        {
-          name: "--no-status",
-          description:
-            "Do not include the output of git-status[1] in the commit message template whe",
-        },
-        {
-          name: ["-S", "--gpg-sign"],
-          description:
-            "GPG-sign commits. The keyid argument is optional and defaults to the committe",
-          args: {
-            name: "keyid",
-            isOptional: true,
-          },
-        },
-        {
-          name: "--no-gpg-sign",
-          description: "Dont GPG-sign commits",
-        },
-        {
-          name: "--",
-          description: "Do not interpret any more arguments as options",
-        },
-      ],
-    },
-    {
-      name: "config",
-      description: "Change Git configuration",
-      options: [
-        {
-          name: "--local",
-          description: "Default: write to the repository .git/config file",
-          args: {
-            isVariadic: true,
-            suggestions: [
-              {
-                name: "user.name",
-                description: "Set config for username",
-                insertValue: "user.name '{cursor}'",
-              },
-              {
-                name: "user.email",
-                description: "Set config for email",
-                insertValue: "user.email '{cursor}'",
-              },
-            ],
-          },
-        },
-        {
-          name: "--global",
-          description:
-            "For writing options: write to global ~/.gitconfig file rather than the repository .git/config",
-        },
-        {
-          name: "--replace-all",
-          description:
-            "Default behavior is to replace at most one line. This replaces all lines matc",
-        },
-        {
-          name: "--add",
-          description:
-            "Adds a new line to the option without altering any existing values. This is t",
-        },
-        {
-          name: "--get",
-          description:
-            "Get the value for a given key (optionally filtered by a regex matching the va",
-        },
-        {
-          name: "--get-all",
-          description:
-            "Like get, but returns all values for a multi-valued key",
-        },
-        {
-          name: "--get-regexp",
-          description:
-            "Like --get-all, but interprets the name as a regular expression and writes ou",
-          args: {
-            name: "regexp",
-          },
-        },
-        {
-          name: "--get-urlmatch",
-          description:
-            "When given a two-part name section.key, the value for section..key whose part",
-          args: [
-            {
-              name: "name",
-            },
-            {
-              name: "url",
-            },
-          ],
-        },
-        {
-          name: "--system",
-          description:
-            "For writing options: write to system-wide $(prefix)/etc/gitconfig rather than",
-        },
-        {
-          name: "--worktree",
-          description:
-            "Similar to --local except that.git/config.worktree is read from or written to",
-        },
-        {
-          name: ["-f", "--file"],
-          description:
-            "Use the given config file instead of the one specified by GIT_CONFIG",
-          args: {
-            name: "config-file",
-            template: "filepaths",
-          },
-        },
-        {
-          name: "--blob",
-          description:
-            "Similar to --file but use the given blob instead of a file. E.g. you can use",
-          args: {
-            name: "blob",
-          },
-        },
-        {
-          name: "--remove-section",
-          description: "Remove the given section from the configuration file",
-        },
-        {
-          name: "--rename-section",
-          description: "Rename the given section to a new name",
-        },
-        {
-          name: "--unset",
-          description: "Remove the line matching the key from config file",
-        },
-        {
-          name: "--unset-all",
-          description: "Remove all lines matching the key from config file",
-        },
-        {
-          name: ["-l", "--list"],
-          description:
-            "List all variables set in config file, along with their values",
-        },
-        {
-          name: "--fixed-value",
-          description:
-            "When used with the value-pattern argument, treat value-pattern as an exact st",
-        },
-        {
-          name: "--type",
-          description:
-            "Git config will ensure that any input or output is valid under the given type",
-          args: {
-            name: "type",
-            suggestions: [
-              "bool",
-              "int",
-              "bool-or-int",
-              "path",
-              "expiry-date",
-              "color",
-            ],
-          },
-        },
-        {
-          name: "--no-type",
-          description:
-            "Un-sets the previously set type specifier (if one was previously set). This o",
-        },
-        {
-          name: ["-z", "--null"],
-          description:
-            "For all options that output values and/or keys, always end values with the nu",
-        },
-        {
-          name: "--name-only",
-          description:
-            "Output only the names of config variables for --list or --get-regexp",
-        },
-        {
-          name: "--show-origin",
-          description:
-            "Augment the output of all queried config options with the origin type (file",
-        },
-        {
-          name: "--show-scope",
-          description:
-            "Similar to --show-origin in that it augments the output of all queried config",
-        },
-        {
-          name: "--get-colorbool",
-          description:
-            'Find the color setting for name (e.g. color.diff) and output "true" or "false',
-          args: {
-            name: "name",
-          },
-        },
-        {
-          name: "--get-color",
-          description:
-            "Find the color configured for name (e.g. color.diff.new) and output it as the",
-          args: [
-            {
-              name: "name",
-            },
-            {
-              name: "default",
-              isOptional: true,
-            },
-          ],
-        },
-        {
-          name: ["-e", "--edit"],
-          description:
-            "Opens an editor to modify the specified config file; either --system, --globa",
-        },
-        {
-          name: "--includes",
-          description:
-            "Respect include.* directives in config files when looking up values. Defaults",
-        },
-        {
-          name: "--no-includes",
-          description:
-            "Respect include.* directives in config files when looking up values. Defaults",
-        },
-        {
-          name: "--default",
-          description:
-            "When using --get, and the requested variable is not found, behave as if were",
-          args: {
-            name: "value",
-            isOptional: true,
-          },
-        },
-      ],
-      args: [
-        {
-          name: "setting",
-          // All git config keys are valid
-          suggestCurrentToken: true,
-          suggestions: configSuggestions.map((suggestion) => ({
-            ...suggestion,
-            icon: "⚙️",
-          })),
-          generators: {
-            script: ["git", "config", "--get-regexp", ".*"],
-            // This is inefficient but it doesn't need to be faster - most
-            // of the time, you don't need to run `git config` commands,
-            // and when you do it's typically one or two at most.
-            postProcess: (out) =>
-              out
-                .trim()
-                .split("\n")
-                .map((line) => line.slice(0, line.indexOf(" ")))
-                .filter(
-                  (line) =>
-                    line.startsWith("alias.") ||
-                    line.startsWith("branch.") ||
-                    line.startsWith("remote.") ||
-                    !configSuggestions.find(({ name }) => line === name)
-                )
-                .map((name) => ({ name, icon: "⚙️" })),
-          },
-        },
-        {
-          name: "value",
-        },
-      ],
-    },
-    {
-      name: "rebase",
-      description: "Reapply commits on top of another base tip",
-      options: [
-        {
-          name: "--onto",
-          description:
-            "Starting point at which to create the new commits. If the --onto option is not specified, the starting point is <upstream>. May be any valid commit, and not just an existing branch name. As a special case, you may use 'A...B' as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD",
-          args: {
-            name: "newbase",
-            generators: gitGenerators.commits,
-          },
-        },
-        {
-          name: "--keep-base",
-          description:
-            "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running git rebase --keep-base <upstream> <branch> is equivalent to running git rebase --onto <upstream>…​ <upstream>. This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is. Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the starting point on which new commits will be created, whereas --fork-point uses the merge base to determine the set of commits which will be rebased",
-        },
-        {
-          name: "--continue",
-          description:
-            "Restart the rebasing process after having resolved a merge conflict",
-        },
-        {
-          name: "--abort",
-          description:
-            "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started",
-        },
-        {
-          name: "--quit",
-          description:
-            "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result. If a temporary stash entry was created using --autostash, it will be saved to the stash list",
-        },
-        {
-          name: "--apply",
-          description:
-            "Use applying strategies to rebase (calling git-am internally). This option may become a no-op in the future once the merge backend handles everything the apply one does",
-        },
-        {
-          name: "--empty",
-          description:
-            "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified. Note that commits which start empty are kept (unless --no-keep-empty is specified), and commits which are clean cherry-picks (as determined by git log --cherry-mark ...) are detected and dropped as a preliminary step (unless --reapply-cherry-picks is passed)",
-          args: {
-            isOptional: true,
-            suggestions: ["drop", "keep", "ask"],
-          },
-        },
-        {
-          name: "--no-keep-empty",
-          description:
-            "Do not keep commits that start empty before the rebase (i.e. that do not change anything from its parent) in the result. The default is to keep commits which start empty, since creating such commits requires passing the --allow-empty override flag to git commit, signifying that a user is very intentionally creating such a commit and thus wants to keep it. Usage of this flag will probably be rare, since you can get rid of commits that start empty by just firing up an interactive rebase and removing the lines corresponding to the commits you don’t want. This flag exists as a convenient shortcut, such as for cases where external tools generate many empty commits and you want them all removed. For commits which do not start empty but become empty after rebasing, see the --empty flag",
-        },
-        {
-          name: "--keep-empty",
-          description:
-            "Keep commits that start empty before the rebase (i.e. that do not change anything from its parent) in the result. The default is to keep commits which start empty, since creating such commits requires passing the --allow-empty override flag to git commit, signifying that a user is very intentionally creating such a commit and thus wants to keep it. Usage of this flag will probably be rare, since you can get rid of commits that start empty by just firing up an interactive rebase and removing the lines corresponding to the commits you don’t want. This flag exists as a convenient shortcut, such as for cases where external tools generate many empty commits and you want them all removed. For commits which do not start empty but become empty after rebasing, see the --empty flag",
-        },
-        {
-          name: "--reapply-cherry-picks",
-          description:
-            "Reapply all clean cherry-picks of any upstream commit instead of preemptively dropping them. (If these commits then become empty after rebasing, because they contain a subset of already upstream changes, the behavior towards them is controlled by the --empty flag). By default (or if --no-reapply-cherry-picks is given), these commits will be automatically dropped. Because this necessitates reading all upstream commits, this can be expensive in repos with a large number of upstream commits that need to be read. --reapply-cherry-picks allows rebase to forgo reading all upstream commits, potentially improving performance",
-        },
-        {
-          name: "--no-reapply-cherry-picks",
-          description:
-            "Do not reapply all clean cherry-picks of any upstream commit instead of preemptively dropping them",
-        },
-        {
-          name: "--allow-empty-message",
-          description:
-            "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt",
-        },
-        {
-          name: "--skip",
-          description:
-            "Restart the rebasing process by skipping the current patch",
-        },
-        {
-          name: "--edit-todo",
-          description: "Edit the todo list during an interactive rebase",
-        },
-        {
-          name: "--show-current-patch",
-          description:
-            "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of git show REBASE_HEAD",
-        },
-        {
-          name: ["-m", "--merge"],
-          description:
-            "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default. Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as ours is the so-far rebased series, starting with <upstream>, and theirs is the working branch. In other words, the sides are swapped",
-        },
-        {
-          name: ["-s", "--strategy"],
-          isRepeatable: true,
-          description:
-            "Use the given merge strategy. If there is no -s option git merge-recursive is used instead. This implies --merge. Because git rebase replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the ours strategy simply empties all patches from the <branch>, which makes little sense",
-          args: {
-            name: "strategy",
-            isVariadic: true,
-            suggestions: ["resolve", "recursive", "octopus", "ours", "subtree"],
-          },
-        },
-        {
-          name: ["-X", "--strategy-option"],
-          description:
-            "Pass the <strategy-option> through to the merge strategy. This implies --merge and, if no strategy has been specified, -s recursive. Note the reversal of ours and theirs as noted above for the -m option",
-          args: {
-            name: "option",
-            suggestions: [
-              "ours",
-              "theirs",
-              "patience",
-              "diff-algorithm",
-              "diff-algorithm=patience",
-              "diff-algorithm=minimal",
-              "diff-algorithm=histogram",
-              "diff-algorithm=myers",
-              "ignore-space-change",
-              "ignore-all-space",
-              "ignore-space-at-eol",
-              "ignore-cr-at-eol",
-              "renormalize",
-              "no-renormalize",
-              "no-renames",
-              "find-renames",
-              "subtree",
-            ],
-          },
-        },
-        {
-          name: "--rerere-autoupdate",
-          description:
-            "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
-        },
-        {
-          name: "--no-rerere-autoupdate",
-          description:
-            "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
-        },
-        {
-          name: ["-S", "--gpg-sign"],
-          description:
-            "GPG-sign commits. The keyid argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. --no-gpg-sign is useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
-          args: {
-            name: "keyid",
-            isOptional: true,
-          },
-        },
-        {
-          name: "--no-gpg-sign",
-          description:
-            "Do not GPG-sign commits.--no-gpg-sign is useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
-        },
-        {
-          name: ["-q", "--quiet"],
-          description: "Be quiet. Implies --no-stat",
-        },
-        {
-          name: ["-v", "--verbose"],
-          description: "Be verbose. Implies --stat",
-        },
-        {
-          name: "--stat",
-          description:
-            "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat",
-        },
-        {
-          name: ["-n", "--no-stat"],
-          description: "Do not show a diffstat as part of the rebase process",
-        },
-        {
-          name: "--no-verify",
-          description:
-            "This option bypasses the pre-rebase hook. See also githooks[5]",
-        },
-        {
-          name: "--verify",
-          description:
-            "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also githooks[5]",
-        },
-        {
-          name: "-C",
-          description:
-            "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply",
-          args: {
-            name: "n",
-          },
-        },
-        {
-          name: ["--no-ff", "--force-rebase", "-f"],
-          description:
-            "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits. You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to 'revert the reversion' (see the revert-a-faulty-merge How-To for details)",
-        },
-        {
-          name: "--fork-point",
-          description:
-            "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>. When --fork-point is active, fork_point will be used instead of <upstream> to calculate the set of commits to rebase, where fork_point is the result of git merge-base --fork-point <upstream> <branch> command (see git-merge-base[1]). If fork_point ends up being empty, the <upstream> will be used as a fallback. If <upstream> is given on the command line, then the default is --no-fork-point, otherwise the default is --fork-point. If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with --keep-base in order to drop those commits from your branch",
-        },
-        {
-          name: "--no-fork-point",
-          description:
-            "Do not use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>. When --fork-point is active, fork_point will be used instead of <upstream> to calculate the set of commits to rebase, where fork_point is the result of git merge-base --fork-point <upstream> <branch> command (see git-merge-base[1]). If fork_point ends up being empty, the <upstream> will be used as a fallback. If <upstream> is given on the command line, then the default is --no-fork-point, otherwise the default is --fork-point. If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with --keep-base in order to drop those commits from your branch",
-        },
-        {
-          name: "--ignore-whitespace",
-          description:
-            "Ignore whitespace differences when trying to reconcile differences. Currently, each backend implements an approximation of this behavior: apply backend: When applying a patch, ignore changes in whitespace in context lines. Unfortunately, this means that if the 'old' lines being replaced by the patch differ only in whitespace from the existing file, you will get a merge conflict instead of a successful patch application. merge backend: Treat lines with only whitespace changes as unchanged when merging. Unfortunately, this means that any patch hunks that were intended to modify whitespace and nothing else will be dropped, even if the other side had no changes that conflicted",
-        },
-        {
-          name: "--whitespace",
-          description:
-            "This flag is passed to the git apply program (see git-apply[1]) that applies the patch. Implies --apply",
-          args: {
-            name: "option",
-          },
-        },
-        {
-          name: "--committer-date-is-author-date",
-          description:
-            "Instead of using the current time as the committer date, use the author date of the commit being rebased as the committer date. This option implies --force-rebase",
-        },
-        {
-          name: ["--ignore-date", "--reset-author-date"],
-          description:
-            "Instead of using the author date of the original commit, use the current time as the author date of the rebased commit. This option implies --force-rebase",
-        },
-        {
-          name: "--signoff",
-          description:
-            "Add a Signed-off-by trailer to all the rebased commits. Note that if --interactive is given then only commits marked to be picked, edited or reworded will have the trailer added",
-        },
-        {
-          name: ["-i", "--interactive"],
-          description:
-            "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below). The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format",
-        },
-        {
-          name: ["-r", "--rebase-merges"],
-          description:
-            "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With --rebase-merges, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually. By default, or when no-rebase-cousins was specified, commits which do not have <upstream> as direct ancestor will keep their original branch point, i.e. commits that would be excluded by git-log[1]'s --ancestry-path option will keep their original ancestry by default. If the rebase-cousins mode is turned on, such commits are instead rebased onto <upstream> (or <onto>, if specified). The --rebase-merges mode is similar in spirit to the deprecated --preserve-merges but works with interactive rebases, where commits can be reordered, inserted and dropped at will. It is currently only possible to recreate the merge commits using the recursive merge strategy; Different merge strategies can be used only via explicit exec git merge -s <strategy> [...] commands",
-          args: {
-            name: "mode",
-            isOptional: true,
-            suggestions: ["rebase-cousins", "no-rebase-cousins"],
-          },
-        },
-        {
-          name: ["-x", "--exec"],
-          insertValue: "-x '{cursor}'",
-          description:
-            "Append 'exec <cmd>' after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1. You may execute several commands by either using one instance of --exec with several commands: git rebase -i --exec 'cmd1 && cmd2 && ...' or by giving more than one --exec: git rebase -i --exec 'cmd1' --exec 'cmd2' --exec ... If --autosquash is used, 'exec' lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series. This uses the --interactive machinery internally, but it can be run without an explicit --interactive",
-          args: {
-            name: "cmd",
-          },
-        },
-        {
-          name: "--root",
-          description:
-            "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, all root commits will be rewritten to have <newbase> as parent instead",
-        },
-        {
-          name: "--autosquash",
-          description:
-            "When the commit log message begins with 'squash! …​' (or 'fixup! …​'), and there is already a commit in the todo list that matches the same ..., automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from pick to squash (or fixup). A commit matches the ... if the commit subject matches, or if the ... refers to the commit’s hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the --fixup/--squash options of git-commit[1]",
-        },
-        {
-          name: "--no-autosquash",
-          description:
-            "When the commit log message begins with 'squash! …' (or 'fixup! …'), and there is already a commit in the todo list that matches the same ..., automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from pick to squash (or fixup). A commit matches the ... if the commit subject matches, or if the ... refers to the commit’s hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the --fixup/--squash options of git-commit[1]",
-        },
-        {
-          name: "--autostash",
-          description:
-            "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts",
-        },
-        {
-          name: "--no-autostash",
-          description:
-            "Do not automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts",
-        },
-        {
-          name: "--reschedule-failed-exec",
-          description:
-            "Automatically reschedule exec commands that failed. This only makes sense in interactive mode (or when an --exec option was provided)",
-        },
-        {
-          name: "--no-reschedule-failed-exec",
-          description:
-            "Do not automatically reschedule exec commands that failed. This only makes sense in interactive mode (or when an --exec option was provided)",
-        },
-      ],
-      args: [
-        {
-          name: "base",
-          generators: gitGenerators.localBranches,
-          suggestions: [
-            {
-              name: "-",
-              description: "Use the last ref as the base",
-            },
-          ],
-          filterStrategy: "fuzzy",
-          isOptional: true,
-        },
-        {
-          name: "new base",
-          generators: gitGenerators.localBranches,
-          filterStrategy: "fuzzy",
-          isOptional: true,
-        },
-      ],
-    },
-    {
-      name: "add",
-      description: "Add file contents to the index",
-      options: addOptions,
-      args: {
-        name: "pathspec",
-        isVariadic: true,
-        isOptional: true,
+								return (
+									'Generate a git commit message summary based on this git diff, the "summary" must be no more ' +
+									"than 70-75 characters, and it must describe both what the patch changes, as well as why the " +
+									`patch might be necessary.\n\nHere are some examples from the repo:\n${stdout}`
+								);
+							},
+							message: async ({ executeCommand }: any) =>
+								(
+									await executeCommand({
+										command: "git",
+										args: ["diff", "--staged"],
+									})
+								).stdout,
+							splitOn: "\n",
+						}),
+					},
+				},
+				{
+					name: ["-a", "--all"],
+					description: "Stage all modified and deleted paths",
+				},
+				{
+					name: "-am",
+					insertValue: "-am '{cursor}'",
+					description: "Stage all and use given text as commit message",
+					args: {
+						name: "message",
+					},
+				},
+				{
+					name: ["-v", "--verbose"],
+					description: "Show unified diff of all file changes",
+				},
+				{
+					name: ["-p", "--patch"],
+					description:
+						"Use the interactive patch selection interface to chose which changes to commi",
+				},
+				{
+					name: ["-C", "--reuse-message"],
+					description:
+						"Take an existing commit object, and reuse the log message and the authorship",
+					args: {
+						name: "commit",
+						generators: gitGenerators.commits,
+					},
+				},
+				{
+					name: ["-c", "--reedit-message"],
+					description:
+						"Like -C, but with -c the editor is invoked, so that the user can further edit",
+					args: {
+						name: "commit",
+						generators: gitGenerators.commits,
+					},
+				},
+				{
+					name: "--fixup",
+					description:
+						"Construct a commit message for use with rebase --autosquash. The commit messa",
+					args: {
+						name: "commit",
+						generators: gitGenerators.commits,
+					},
+				},
+				{
+					name: "--squash",
+					description:
+						"Construct a commit message for use with rebase --autosquash. The commit messa",
+					args: {
+						name: "commit",
+						generators: gitGenerators.commits,
+					},
+				},
+				{
+					name: "--reset-author",
+					description:
+						"When used with -C/-c/--amend options, or when committing after a conflicting",
+				},
+				{
+					name: "--short",
+					description:
+						"When doing a dry-run, give the output in the short-format. See git-status[1]",
+				},
+				{
+					name: "--branch",
+					description: "Show the branch and tracking info even in short-format",
+				},
+				{
+					name: "--porcelain",
+					description:
+						"When doing a dry-run, give the output in a porcelain-ready format. See git-st",
+				},
+				{
+					name: "--long",
+					description:
+						"When doing a dry-run, give the output in the long-format. Implies --dry-run",
+				},
+				{
+					name: ["-z", "--null"],
+					description:
+						"When showing short or porcelain status output, print the filename verbatim an",
+				},
+				{
+					name: ["-F", "--file"],
+					description:
+						"Take the commit message from the given file. Use - to read the message from t",
+					args: {
+						name: "file",
+						template: "filepaths",
+					},
+				},
+				{
+					name: "--author",
+					description:
+						"Override the commit author. Specify an explicit author using the standard A U",
+					args: {
+						name: "author",
+					},
+				},
+				{
+					name: "--date",
+					description: "Override the author date used in the commit",
+					args: {
+						name: "date",
+					},
+				},
+				{
+					name: ["-t", "--template"],
+					description:
+						"When editing the commit message, start the editor with the contents in the gi",
+					args: {
+						name: "file",
+						template: "filepaths",
+					},
+				},
+				{
+					name: ["-s", "--signoff"],
+					description:
+						"Add a Signed-off-by trailer by the committer at the end of the commit log mes",
+				},
+				{
+					name: "--no-signoff",
+					description:
+						"Don't add a Signed-off-by trailer by the committer at the end of the commit l",
+				},
+				{
+					name: ["-n", "--no-verify"],
+					description:
+						"This option bypasses the pre-commit and commit-msg hooks. See also githooks[5]",
+				},
+				{
+					name: "--allow-empty",
+					description:
+						"Usually recording a commit that has the exact same tree as its sole parent co",
+				},
+				{
+					name: "--allow-empty-message",
+					description:
+						"Like --allow-empty this command is primarily for use by foreign SCM interface",
+				},
+				{
+					name: "--cleanup",
+					description:
+						"This option determines how the supplied commit message should be cleaned up b",
+					args: {
+						name: "mode",
+						description:
+							"Determines how the supplied commit messaged should be cleaned up before committing",
+						suggestions: [
+							{
+								name: "strip",
+								description:
+									"Strip leading and trailing empty lines, trailing whitepace, commentary and collapse consecutive empty lines",
+							},
+							{
+								name: "whitespace",
+								description: "Same as strip except #commentary is not removed",
+							},
+							{
+								name: "verbatim",
+								description: "Do not change the message at all",
+							},
+							{
+								name: "scissors",
+								description:
+									"Same as whitespace except that everything from (and including) the line found below is truncated",
+							},
+							{
+								name: "default",
+								description:
+									"Same as strip if the message is to be edited. Otherwise whitespace",
+							},
+						],
+					},
+				},
+				{
+					name: ["-e", "--edit"],
+					description:
+						"The message taken from file with -F, command line with -m, and from commit ob",
+				},
+				{
+					name: "--no-edit",
+					description:
+						"Use the selected commit message without launching an editor. For example, git",
+				},
+				{
+					name: "--amend",
+					description:
+						"Replace the tip of the current branch by creating a new commit. The recorded",
+				},
+				{
+					name: "--no-post-rewrite",
+					description: "Bypass the post-rewrite hook",
+				},
+				{
+					name: ["-i", "--include"],
+					description:
+						"Before making a commit out of staged contents so far, stage the contents of p",
+				},
+				{
+					name: ["-o", "--only"],
+					description:
+						"Make a commit by taking the updated working tree contents of the paths specif",
+				},
+				{
+					name: "--pathspec-from-file",
+					description:
+						"Pathspec is passed in instead of commandline args. If is exactly - then stand",
+					args: {
+						name: "file",
+						template: "filepaths",
+					},
+				},
+				{
+					name: "--pathspec-file-nul",
+					description:
+						"Only meaningful with --pathspec-from-file. Pathspec elements are separated wi",
+				},
+				{
+					name: ["-u", "--untracked-files"],
+					description:
+						"Show untracked files. The mode parameter is optional (defaults to all), and i",
+					args: {
+						name: "mode",
+						suggestions: ["no", "normal", "all"],
+						isOptional: true,
+					},
+				},
+				{
+					name: ["-q", "--quiet"],
+					description: "Suppress commit summary message",
+				},
+				{
+					name: "--dry-run",
+					description:
+						"Do not create a commit, but show a list of paths that are to be committed, pa",
+				},
+				{
+					name: "--status",
+					description:
+						"Include the output of git-status[1] in the commit message template when using",
+				},
+				{
+					name: "--no-status",
+					description:
+						"Do not include the output of git-status[1] in the commit message template whe",
+				},
+				{
+					name: ["-S", "--gpg-sign"],
+					description:
+						"GPG-sign commits. The keyid argument is optional and defaults to the committe",
+					args: {
+						name: "keyid",
+						isOptional: true,
+					},
+				},
+				{
+					name: "--no-gpg-sign",
+					description: "Dont GPG-sign commits",
+				},
+				{
+					name: "--",
+					description: "Do not interpret any more arguments as options",
+				},
+			],
+		},
+		{
+			name: "config",
+			description: "Change Git configuration",
+			options: [
+				{
+					name: "--local",
+					description: "Default: write to the repository .git/config file",
+					args: {
+						isVariadic: true,
+						suggestions: [
+							{
+								name: "user.name",
+								description: "Set config for username",
+								insertValue: "user.name '{cursor}'",
+							},
+							{
+								name: "user.email",
+								description: "Set config for email",
+								insertValue: "user.email '{cursor}'",
+							},
+						],
+					},
+				},
+				{
+					name: "--global",
+					description:
+						"For writing options: write to global ~/.gitconfig file rather than the repository .git/config",
+				},
+				{
+					name: "--replace-all",
+					description:
+						"Default behavior is to replace at most one line. This replaces all lines matc",
+				},
+				{
+					name: "--add",
+					description:
+						"Adds a new line to the option without altering any existing values. This is t",
+				},
+				{
+					name: "--get",
+					description:
+						"Get the value for a given key (optionally filtered by a regex matching the va",
+				},
+				{
+					name: "--get-all",
+					description:
+						"Like get, but returns all values for a multi-valued key",
+				},
+				{
+					name: "--get-regexp",
+					description:
+						"Like --get-all, but interprets the name as a regular expression and writes ou",
+					args: {
+						name: "regexp",
+					},
+				},
+				{
+					name: "--get-urlmatch",
+					description:
+						"When given a two-part name section.key, the value for section..key whose part",
+					args: [
+						{
+							name: "name",
+						},
+						{
+							name: "url",
+						},
+					],
+				},
+				{
+					name: "--system",
+					description:
+						"For writing options: write to system-wide $(prefix)/etc/gitconfig rather than",
+				},
+				{
+					name: "--worktree",
+					description:
+						"Similar to --local except that.git/config.worktree is read from or written to",
+				},
+				{
+					name: ["-f", "--file"],
+					description:
+						"Use the given config file instead of the one specified by GIT_CONFIG",
+					args: {
+						name: "config-file",
+						template: "filepaths",
+					},
+				},
+				{
+					name: "--blob",
+					description:
+						"Similar to --file but use the given blob instead of a file. E.g. you can use",
+					args: {
+						name: "blob",
+					},
+				},
+				{
+					name: "--remove-section",
+					description: "Remove the given section from the configuration file",
+				},
+				{
+					name: "--rename-section",
+					description: "Rename the given section to a new name",
+				},
+				{
+					name: "--unset",
+					description: "Remove the line matching the key from config file",
+				},
+				{
+					name: "--unset-all",
+					description: "Remove all lines matching the key from config file",
+				},
+				{
+					name: ["-l", "--list"],
+					description:
+						"List all variables set in config file, along with their values",
+				},
+				{
+					name: "--fixed-value",
+					description:
+						"When used with the value-pattern argument, treat value-pattern as an exact st",
+				},
+				{
+					name: "--type",
+					description:
+						"Git config will ensure that any input or output is valid under the given type",
+					args: {
+						name: "type",
+						suggestions: [
+							"bool",
+							"int",
+							"bool-or-int",
+							"path",
+							"expiry-date",
+							"color",
+						],
+					},
+				},
+				{
+					name: "--no-type",
+					description:
+						"Un-sets the previously set type specifier (if one was previously set). This o",
+				},
+				{
+					name: ["-z", "--null"],
+					description:
+						"For all options that output values and/or keys, always end values with the nu",
+				},
+				{
+					name: "--name-only",
+					description:
+						"Output only the names of config variables for --list or --get-regexp",
+				},
+				{
+					name: "--show-origin",
+					description:
+						"Augment the output of all queried config options with the origin type (file",
+				},
+				{
+					name: "--show-scope",
+					description:
+						"Similar to --show-origin in that it augments the output of all queried config",
+				},
+				{
+					name: "--get-colorbool",
+					description:
+						'Find the color setting for name (e.g. color.diff) and output "true" or "false',
+					args: {
+						name: "name",
+					},
+				},
+				{
+					name: "--get-color",
+					description:
+						"Find the color configured for name (e.g. color.diff.new) and output it as the",
+					args: [
+						{
+							name: "name",
+						},
+						{
+							name: "default",
+							isOptional: true,
+						},
+					],
+				},
+				{
+					name: ["-e", "--edit"],
+					description:
+						"Opens an editor to modify the specified config file; either --system, --globa",
+				},
+				{
+					name: "--includes",
+					description:
+						"Respect include.* directives in config files when looking up values. Defaults",
+				},
+				{
+					name: "--no-includes",
+					description:
+						"Respect include.* directives in config files when looking up values. Defaults",
+				},
+				{
+					name: "--default",
+					description:
+						"When using --get, and the requested variable is not found, behave as if were",
+					args: {
+						name: "value",
+						isOptional: true,
+					},
+				},
+			],
+			args: [
+				{
+					name: "setting",
+					// All git config keys are valid
+					suggestCurrentToken: true,
+					suggestions: configSuggestions.map((suggestion) => ({
+						...suggestion,
+						icon: "⚙️",
+					})),
+					generators: {
+						script: ["git", "config", "--get-regexp", ".*"],
+						// This is inefficient but it doesn't need to be faster - most
+						// of the time, you don't need to run `git config` commands,
+						// and when you do it's typically one or two at most.
+						postProcess: (out) =>
+							out
+								.trim()
+								.split("\n")
+								.map((line) => line.slice(0, line.indexOf(" ")))
+								.filter(
+									(line) =>
+										line.startsWith("alias.") ||
+										line.startsWith("branch.") ||
+										line.startsWith("remote.") ||
+										!configSuggestions.find(({ name }) => line === name)
+								)
+								.map((name) => ({ name, icon: "⚙️" })),
+					},
+				},
+				{
+					name: "value",
+				},
+			],
+		},
+		{
+			name: "rebase",
+			description: "Reapply commits on top of another base tip",
+			options: [
+				{
+					name: "--onto",
+					description:
+						"Starting point at which to create the new commits. If the --onto option is not specified, the starting point is <upstream>. May be any valid commit, and not just an existing branch name. As a special case, you may use 'A...B' as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD",
+					args: {
+						name: "newbase",
+						generators: gitGenerators.commits,
+					},
+				},
+				{
+					name: "--keep-base",
+					description:
+						"Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running git rebase --keep-base <upstream> <branch> is equivalent to running git rebase --onto <upstream>…​ <upstream>. This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is. Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the starting point on which new commits will be created, whereas --fork-point uses the merge base to determine the set of commits which will be rebased",
+				},
+				{
+					name: "--continue",
+					description:
+						"Restart the rebasing process after having resolved a merge conflict",
+				},
+				{
+					name: "--abort",
+					description:
+						"Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started",
+				},
+				{
+					name: "--quit",
+					description:
+						"Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result. If a temporary stash entry was created using --autostash, it will be saved to the stash list",
+				},
+				{
+					name: "--apply",
+					description:
+						"Use applying strategies to rebase (calling git-am internally). This option may become a no-op in the future once the merge backend handles everything the apply one does",
+				},
+				{
+					name: "--empty",
+					description:
+						"How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified. Note that commits which start empty are kept (unless --no-keep-empty is specified), and commits which are clean cherry-picks (as determined by git log --cherry-mark ...) are detected and dropped as a preliminary step (unless --reapply-cherry-picks is passed)",
+					args: {
+						isOptional: true,
+						suggestions: ["drop", "keep", "ask"],
+					},
+				},
+				{
+					name: "--no-keep-empty",
+					description:
+						"Do not keep commits that start empty before the rebase (i.e. that do not change anything from its parent) in the result. The default is to keep commits which start empty, since creating such commits requires passing the --allow-empty override flag to git commit, signifying that a user is very intentionally creating such a commit and thus wants to keep it. Usage of this flag will probably be rare, since you can get rid of commits that start empty by just firing up an interactive rebase and removing the lines corresponding to the commits you don’t want. This flag exists as a convenient shortcut, such as for cases where external tools generate many empty commits and you want them all removed. For commits which do not start empty but become empty after rebasing, see the --empty flag",
+				},
+				{
+					name: "--keep-empty",
+					description:
+						"Keep commits that start empty before the rebase (i.e. that do not change anything from its parent) in the result. The default is to keep commits which start empty, since creating such commits requires passing the --allow-empty override flag to git commit, signifying that a user is very intentionally creating such a commit and thus wants to keep it. Usage of this flag will probably be rare, since you can get rid of commits that start empty by just firing up an interactive rebase and removing the lines corresponding to the commits you don’t want. This flag exists as a convenient shortcut, such as for cases where external tools generate many empty commits and you want them all removed. For commits which do not start empty but become empty after rebasing, see the --empty flag",
+				},
+				{
+					name: "--reapply-cherry-picks",
+					description:
+						"Reapply all clean cherry-picks of any upstream commit instead of preemptively dropping them. (If these commits then become empty after rebasing, because they contain a subset of already upstream changes, the behavior towards them is controlled by the --empty flag). By default (or if --no-reapply-cherry-picks is given), these commits will be automatically dropped. Because this necessitates reading all upstream commits, this can be expensive in repos with a large number of upstream commits that need to be read. --reapply-cherry-picks allows rebase to forgo reading all upstream commits, potentially improving performance",
+				},
+				{
+					name: "--no-reapply-cherry-picks",
+					description:
+						"Do not reapply all clean cherry-picks of any upstream commit instead of preemptively dropping them",
+				},
+				{
+					name: "--allow-empty-message",
+					description:
+						"No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt",
+				},
+				{
+					name: "--skip",
+					description:
+						"Restart the rebasing process by skipping the current patch",
+				},
+				{
+					name: "--edit-todo",
+					description: "Edit the todo list during an interactive rebase",
+				},
+				{
+					name: "--show-current-patch",
+					description:
+						"Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of git show REBASE_HEAD",
+				},
+				{
+					name: ["-m", "--merge"],
+					description:
+						"Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default. Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as ours is the so-far rebased series, starting with <upstream>, and theirs is the working branch. In other words, the sides are swapped",
+				},
+				{
+					name: ["-s", "--strategy"],
+					isRepeatable: true,
+					description:
+						"Use the given merge strategy. If there is no -s option git merge-recursive is used instead. This implies --merge. Because git rebase replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the ours strategy simply empties all patches from the <branch>, which makes little sense",
+					args: {
+						name: "strategy",
+						isVariadic: true,
+						suggestions: ["resolve", "recursive", "octopus", "ours", "subtree"],
+					},
+				},
+				{
+					name: ["-X", "--strategy-option"],
+					description:
+						"Pass the <strategy-option> through to the merge strategy. This implies --merge and, if no strategy has been specified, -s recursive. Note the reversal of ours and theirs as noted above for the -m option",
+					args: {
+						name: "option",
+						suggestions: [
+							"ours",
+							"theirs",
+							"patience",
+							"diff-algorithm",
+							"diff-algorithm=patience",
+							"diff-algorithm=minimal",
+							"diff-algorithm=histogram",
+							"diff-algorithm=myers",
+							"ignore-space-change",
+							"ignore-all-space",
+							"ignore-space-at-eol",
+							"ignore-cr-at-eol",
+							"renormalize",
+							"no-renormalize",
+							"no-renames",
+							"find-renames",
+							"subtree",
+						],
+					},
+				},
+				{
+					name: "--rerere-autoupdate",
+					description:
+						"Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
+				},
+				{
+					name: "--no-rerere-autoupdate",
+					description:
+						"Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
+				},
+				{
+					name: ["-S", "--gpg-sign"],
+					description:
+						"GPG-sign commits. The keyid argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. --no-gpg-sign is useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
+					args: {
+						name: "keyid",
+						isOptional: true,
+					},
+				},
+				{
+					name: "--no-gpg-sign",
+					description:
+						"Do not GPG-sign commits.--no-gpg-sign is useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
+				},
+				{
+					name: ["-q", "--quiet"],
+					description: "Be quiet. Implies --no-stat",
+				},
+				{
+					name: ["-v", "--verbose"],
+					description: "Be verbose. Implies --stat",
+				},
+				{
+					name: "--stat",
+					description:
+						"Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat",
+				},
+				{
+					name: ["-n", "--no-stat"],
+					description: "Do not show a diffstat as part of the rebase process",
+				},
+				{
+					name: "--no-verify",
+					description:
+						"This option bypasses the pre-rebase hook. See also githooks[5]",
+				},
+				{
+					name: "--verify",
+					description:
+						"Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also githooks[5]",
+				},
+				{
+					name: "-C",
+					description:
+						"Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply",
+					args: {
+						name: "n",
+					},
+				},
+				{
+					name: ["--no-ff", "--force-rebase", "-f"],
+					description:
+						"Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits. You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to 'revert the reversion' (see the revert-a-faulty-merge How-To for details)",
+				},
+				{
+					name: "--fork-point",
+					description:
+						"Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>. When --fork-point is active, fork_point will be used instead of <upstream> to calculate the set of commits to rebase, where fork_point is the result of git merge-base --fork-point <upstream> <branch> command (see git-merge-base[1]). If fork_point ends up being empty, the <upstream> will be used as a fallback. If <upstream> is given on the command line, then the default is --no-fork-point, otherwise the default is --fork-point. If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with --keep-base in order to drop those commits from your branch",
+				},
+				{
+					name: "--no-fork-point",
+					description:
+						"Do not use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>. When --fork-point is active, fork_point will be used instead of <upstream> to calculate the set of commits to rebase, where fork_point is the result of git merge-base --fork-point <upstream> <branch> command (see git-merge-base[1]). If fork_point ends up being empty, the <upstream> will be used as a fallback. If <upstream> is given on the command line, then the default is --no-fork-point, otherwise the default is --fork-point. If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with --keep-base in order to drop those commits from your branch",
+				},
+				{
+					name: "--ignore-whitespace",
+					description:
+						"Ignore whitespace differences when trying to reconcile differences. Currently, each backend implements an approximation of this behavior: apply backend: When applying a patch, ignore changes in whitespace in context lines. Unfortunately, this means that if the 'old' lines being replaced by the patch differ only in whitespace from the existing file, you will get a merge conflict instead of a successful patch application. merge backend: Treat lines with only whitespace changes as unchanged when merging. Unfortunately, this means that any patch hunks that were intended to modify whitespace and nothing else will be dropped, even if the other side had no changes that conflicted",
+				},
+				{
+					name: "--whitespace",
+					description:
+						"This flag is passed to the git apply program (see git-apply[1]) that applies the patch. Implies --apply",
+					args: {
+						name: "option",
+					},
+				},
+				{
+					name: "--committer-date-is-author-date",
+					description:
+						"Instead of using the current time as the committer date, use the author date of the commit being rebased as the committer date. This option implies --force-rebase",
+				},
+				{
+					name: ["--ignore-date", "--reset-author-date"],
+					description:
+						"Instead of using the author date of the original commit, use the current time as the author date of the rebased commit. This option implies --force-rebase",
+				},
+				{
+					name: "--signoff",
+					description:
+						"Add a Signed-off-by trailer to all the rebased commits. Note that if --interactive is given then only commits marked to be picked, edited or reworded will have the trailer added",
+				},
+				{
+					name: ["-i", "--interactive"],
+					description:
+						"Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below). The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format",
+				},
+				{
+					name: ["-r", "--rebase-merges"],
+					description:
+						"By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With --rebase-merges, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually. By default, or when no-rebase-cousins was specified, commits which do not have <upstream> as direct ancestor will keep their original branch point, i.e. commits that would be excluded by git-log[1]'s --ancestry-path option will keep their original ancestry by default. If the rebase-cousins mode is turned on, such commits are instead rebased onto <upstream> (or <onto>, if specified). The --rebase-merges mode is similar in spirit to the deprecated --preserve-merges but works with interactive rebases, where commits can be reordered, inserted and dropped at will. It is currently only possible to recreate the merge commits using the recursive merge strategy; Different merge strategies can be used only via explicit exec git merge -s <strategy> [...] commands",
+					args: {
+						name: "mode",
+						isOptional: true,
+						suggestions: ["rebase-cousins", "no-rebase-cousins"],
+					},
+				},
+				{
+					name: ["-x", "--exec"],
+					insertValue: "-x '{cursor}'",
+					description:
+						"Append 'exec <cmd>' after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1. You may execute several commands by either using one instance of --exec with several commands: git rebase -i --exec 'cmd1 && cmd2 && ...' or by giving more than one --exec: git rebase -i --exec 'cmd1' --exec 'cmd2' --exec ... If --autosquash is used, 'exec' lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series. This uses the --interactive machinery internally, but it can be run without an explicit --interactive",
+					args: {
+						name: "cmd",
+					},
+				},
+				{
+					name: "--root",
+					description:
+						"Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, all root commits will be rewritten to have <newbase> as parent instead",
+				},
+				{
+					name: "--autosquash",
+					description:
+						"When the commit log message begins with 'squash! …​' (or 'fixup! …​'), and there is already a commit in the todo list that matches the same ..., automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from pick to squash (or fixup). A commit matches the ... if the commit subject matches, or if the ... refers to the commit’s hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the --fixup/--squash options of git-commit[1]",
+				},
+				{
+					name: "--no-autosquash",
+					description:
+						"When the commit log message begins with 'squash! …' (or 'fixup! …'), and there is already a commit in the todo list that matches the same ..., automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from pick to squash (or fixup). A commit matches the ... if the commit subject matches, or if the ... refers to the commit’s hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the --fixup/--squash options of git-commit[1]",
+				},
+				{
+					name: "--autostash",
+					description:
+						"Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts",
+				},
+				{
+					name: "--no-autostash",
+					description:
+						"Do not automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts",
+				},
+				{
+					name: "--reschedule-failed-exec",
+					description:
+						"Automatically reschedule exec commands that failed. This only makes sense in interactive mode (or when an --exec option was provided)",
+				},
+				{
+					name: "--no-reschedule-failed-exec",
+					description:
+						"Do not automatically reschedule exec commands that failed. This only makes sense in interactive mode (or when an --exec option was provided)",
+				},
+			],
+			args: [
+				{
+					name: "base",
+					generators: gitGenerators.localBranches,
+					suggestions: [
+						{
+							name: "-",
+							description: "Use the last ref as the base",
+						},
+					],
+					filterStrategy: "fuzzy",
+					isOptional: true,
+				},
+				{
+					name: "new base",
+					generators: gitGenerators.localBranches,
+					filterStrategy: "fuzzy",
+					isOptional: true,
+				},
+			],
+		},
+		{
+			name: "add",
+			description: "Add file contents to the index",
+			options: addOptions,
+			args: {
+				name: "pathspec",
+				isVariadic: true,
+				isOptional: true,
 
-        // We have a special setting for dot in the vuejs app
+				// We have a special setting for dot in the vuejs app
 
-        // suggestions: [
-        //     {
-        //         name: ".",
-        //         description: "current directory",
-        //         insertValue: ".",
-        //         icon: "fig://icon?type=folder"
-        //     }
-        // ],
-        generators: [gitGenerators.files_for_staging, { template: "folders" }],
-      },
-    },
-    {
-      name: "stage",
-      description: "Add file contents to the staging area",
-      options: addOptions,
-      args: {
-        name: "pathspec",
-        isVariadic: true,
-        isOptional: true,
+				// suggestions: [
+				//     {
+				//         name: ".",
+				//         description: "current directory",
+				//         insertValue: ".",
+				//         icon: "fig://icon?type=folder"
+				//     }
+				// ],
+				generators: [gitGenerators.files_for_staging, { template: "folders" }],
+			},
+		},
+		{
+			name: "stage",
+			description: "Add file contents to the staging area",
+			options: addOptions,
+			args: {
+				name: "pathspec",
+				isVariadic: true,
+				isOptional: true,
 
-        // We have a special setting for dot in the vuejs app
+				// We have a special setting for dot in the vuejs app
 
-        // suggestions: [
-        //     {
-        //         name: ".",
-        //         description: "current directory",
-        //         insertValue: ".",
-        //         icon: "fig://icon?type=folder"
-        //     }
-        // ],
-        generators: gitGenerators.files_for_staging,
-      },
-    },
-    {
-      name: "status",
-      description: "Show the working tree status",
-      options: [
-        {
-          name: ["-s", "--short"],
-          description: "Give the output in the short-format",
-        },
-        {
-          name: ["-v", "--verbose"],
-          description: "Be verbose",
-        },
-        {
-          name: ["-b", "--branch"],
-          description: "Show branch information",
-        },
-        {
-          name: "--show-stash",
-          description: "Show stash information",
-        },
-        {
-          name: "--porcelain",
-          description: "Give the output in the short-format",
-          args: {
-            name: "version",
-            isOptional: true,
-          },
-        },
-        {
-          name: "--ahead-behind",
-          description: "Display full ahead/behind values",
-        },
-        {
-          name: "--no-ahead-behind",
-          description: "Do not display full ahead/behind values",
-        },
-        {
-          name: "--column",
-          description: "Display full ahead/behind values",
-          args: {
-            name: "options",
-            description: "Defaults to always",
-            isOptional: true,
-          },
-        },
-        {
-          name: "--no-column",
-          description: "Do not display untracked files in columns",
-          args: {
-            name: "options",
-            description: "Defaults to never",
-            isOptional: true,
-          },
-        },
-        {
-          name: "--long",
-          description: "Show status in long format (default)",
-        },
-        {
-          name: ["-z", "--null"],
-          description: "Terminate entries with NUL",
-        },
-        {
-          name: ["-u", "--untracked-files"],
-          description: "Show untracked files",
-          args: {
-            isOptional: true,
-            suggestions: [
-              {
-                name: "all",
-                description: "(Default)",
-              },
-              {
-                name: "normal",
-              },
-              {
-                name: "no",
-              },
-            ],
-          },
-        },
-        {
-          name: "--ignore-submodules",
-          description: "Ignore changes to submodules when looking for changes",
-          args: {
-            name: "when",
-            isOptional: true,
-            suggestions: [
-              {
-                name: "all",
-                description: "(Default)",
-              },
-              {
-                name: "dirty",
-              },
-              {
-                name: "untracked",
-              },
-              {
-                name: "none",
-              },
-            ],
-          },
-        },
-        {
-          name: "--ignored",
-          description: "Show ignored files",
-          args: {
-            isOptional: true,
-            suggestions: [
-              {
-                name: "traditional",
-                description: "(Default)",
-              },
-              {
-                name: "matching",
-              },
-              {
-                name: "no",
-              },
-            ],
-          },
-        },
-        {
-          name: "--no-renames",
-          description: "Do not detect renames",
-        },
-        {
-          name: "--renames",
-          description:
-            "Turn on rename detection regardless of user configuration",
-        },
-        {
-          name: "--find-renames",
-          description:
-            "Turn on rename detection, optionally setting the similarity threshold",
-          args: {
-            name: "n",
-            isOptional: true,
-          },
-        },
-      ],
-      args: {
-        name: "pathspec",
-        isVariadic: true,
-        isOptional: true,
+				// suggestions: [
+				//     {
+				//         name: ".",
+				//         description: "current directory",
+				//         insertValue: ".",
+				//         icon: "fig://icon?type=folder"
+				//     }
+				// ],
+				generators: gitGenerators.files_for_staging,
+			},
+		},
+		{
+			name: "status",
+			description: "Show the working tree status",
+			options: [
+				{
+					name: ["-s", "--short"],
+					description: "Give the output in the short-format",
+				},
+				{
+					name: ["-v", "--verbose"],
+					description: "Be verbose",
+				},
+				{
+					name: ["-b", "--branch"],
+					description: "Show branch information",
+				},
+				{
+					name: "--show-stash",
+					description: "Show stash information",
+				},
+				{
+					name: "--porcelain",
+					description: "Give the output in the short-format",
+					args: {
+						name: "version",
+						isOptional: true,
+					},
+				},
+				{
+					name: "--ahead-behind",
+					description: "Display full ahead/behind values",
+				},
+				{
+					name: "--no-ahead-behind",
+					description: "Do not display full ahead/behind values",
+				},
+				{
+					name: "--column",
+					description: "Display full ahead/behind values",
+					args: {
+						name: "options",
+						description: "Defaults to always",
+						isOptional: true,
+					},
+				},
+				{
+					name: "--no-column",
+					description: "Do not display untracked files in columns",
+					args: {
+						name: "options",
+						description: "Defaults to never",
+						isOptional: true,
+					},
+				},
+				{
+					name: "--long",
+					description: "Show status in long format (default)",
+				},
+				{
+					name: ["-z", "--null"],
+					description: "Terminate entries with NUL",
+				},
+				{
+					name: ["-u", "--untracked-files"],
+					description: "Show untracked files",
+					args: {
+						isOptional: true,
+						suggestions: [
+							{
+								name: "all",
+								description: "(Default)",
+							},
+							{
+								name: "normal",
+							},
+							{
+								name: "no",
+							},
+						],
+					},
+				},
+				{
+					name: "--ignore-submodules",
+					description: "Ignore changes to submodules when looking for changes",
+					args: {
+						name: "when",
+						isOptional: true,
+						suggestions: [
+							{
+								name: "all",
+								description: "(Default)",
+							},
+							{
+								name: "dirty",
+							},
+							{
+								name: "untracked",
+							},
+							{
+								name: "none",
+							},
+						],
+					},
+				},
+				{
+					name: "--ignored",
+					description: "Show ignored files",
+					args: {
+						isOptional: true,
+						suggestions: [
+							{
+								name: "traditional",
+								description: "(Default)",
+							},
+							{
+								name: "matching",
+							},
+							{
+								name: "no",
+							},
+						],
+					},
+				},
+				{
+					name: "--no-renames",
+					description: "Do not detect renames",
+				},
+				{
+					name: "--renames",
+					description:
+						"Turn on rename detection regardless of user configuration",
+				},
+				{
+					name: "--find-renames",
+					description:
+						"Turn on rename detection, optionally setting the similarity threshold",
+					args: {
+						name: "n",
+						isOptional: true,
+					},
+				},
+			],
+			args: {
+				name: "pathspec",
+				isVariadic: true,
+				isOptional: true,
 
-        // We have a special setting for dot in the vuejs app
+				// We have a special setting for dot in the vuejs app
 
-        // suggestions: [
-        //     {
-        //         name: ".",
-        //         description: "current directory",
-        //         insertValue: ".",
-        //         icon: "fig://icon?type=folder"
-        //     }
-        // ],
-        generators: gitGenerators.files_for_staging,
-      },
-    },
-    {
-      name: "clean",
-      description: "Shows which files would be removed from working directory",
-      options: [
-        {
-          name: "-d",
-          description:
-            "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under --force) will be removed",
-        },
-        {
-          name: ["-f", "--force"],
-          description:
-            "If the Git configuration variable clean.requireForce is not set to false, git clean will refuse to delete files or directories unless given -f or -i",
-        },
-        {
-          name: ["-i", "--interactive"],
-          description: "Show what would be done and clean files interactively",
-        },
-        {
-          name: ["-n", "--dry-run"],
-          description:
-            "Don’t actually remove anything, just show what would be done",
-        },
-        {
-          name: ["-q", "--quiet"],
-          description:
-            "Be quiet, only report errors, but not the files that are successfully removed",
-        },
-        {
-          name: ["-e", "--exclude"],
-          description:
-            "Use the given exclude pattern in addition to the standard ignore rules",
-          args: {
-            name: "pattern",
-          },
-        },
-        {
-          name: "-x",
-          description:
-            "Don’t use the standard ignore rules (see gitignore(5)), but still use the ignore rules given with -e options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with git restore or git reset) to create a pristine working directory to test a clean build",
-        },
-        {
-          name: "-X",
-          description:
-            "Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files",
-        },
-      ],
-      args: {
-        name: "path",
-        template: "filepaths",
-      },
-    },
-    {
-      name: "revert",
-      description:
-        "Create new commit that undoes all of the changes made in <commit>, then apply it to the current branch",
-      args: {
-        name: "commit",
-        isOptional: true,
-        generators: gitGenerators.commits,
-      },
-    },
-    {
-      name: "ls-remote",
-      description: "List references in a remote repository",
-    },
-    {
-      name: "push",
-      description: "Update remote refs",
-      options: [
-        {
-          name: "--all",
-          description:
-            "Push all branches (i.e. refs under refs/heads/); cannot be used with other <refspec>",
-        },
-        {
-          name: "--prune",
-          description:
-            "Remove remote branches that don't have a local counterpart",
-        },
-        {
-          name: "--mirror",
-          description:
-            "Instead of naming each ref to push, specifies that all refs under refs/ be mirrored to the remote repository",
-        },
-        {
-          name: ["-n", "--dry-run"],
-          description: "Do everything except actually send the updates",
-        },
-        {
-          name: "--porcelain",
-          description:
-            "Produce machine-readable output. The output status line for each ref will be tab-separated and sent to stdout instead of stderr",
-        },
-        {
-          name: ["-d", "--delete"],
-          description:
-            "All listed refs are deleted from the remote repository. This is the same as prefixing all refs with a colon",
-        },
-        {
-          name: "--tags",
-          description:
-            "All refs under refs/tags are pushed, in addition to refspecs explicitly listed on the command line",
-        },
-        {
-          name: "--follow-tags",
-          description:
-            "Push all the refs that would be pushed without this option, and also push annotated tags in refs/tags that are missing from the remote but are pointing at commit-ish that are reachable from the refs being pushed. This can also be specified with configuration variable push.followTags",
-        },
-        {
-          name: "--signed",
-          description:
-            "GPG-sign the push request to update refs on the receiving side, to allow it to be checked by the hooks and/or be logged. If false or --no-signed, no signing will be attempted. If true or --signed, the push will fail if the server does not support signed pushes. If set to if-asked, sign if and only if the server supports signed pushes. The push will also fail if the actual call to gpg --sign fails. See git-receive-pack(1) for the details on the receiving end",
-          args: {
-            isOptional: true,
-            suggestions: ["true", "false", "if-asked"],
-          },
-        },
-        {
-          name: "--no-signed",
-          description:
-            "GPG-sign the push request to update refs on the receiving side, to allow it to be checked by the hooks and/or be logged. If false or --no-signed, no signing will be attempted. If true or --signed, the push will fail if the server does not support signed pushes. If set to if-asked, sign if and only if the server supports signed pushes. The push will also fail if the actual call to gpg --sign fails. See git-receive-pack(1) for the details on the receiving end",
-        },
-        {
-          name: "--atomic",
-          description:
-            "Use an atomic transaction on the remote side if available. Either all refs are updated, or on error, no refs are updated. If the server does not support atomic pushes the push will fail",
-        },
-        {
-          name: "--no-atomic",
-          description:
-            "Use an atomic transaction on the remote side if available. Either all refs are updated, or on error, no refs are updated. If the server does not support atomic pushes the push will fail",
-        },
-        {
-          name: ["-f", "--force"],
-          description:
-            "Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. Also, when --force-with-lease option is used, the command refuses to update a remote ref whose current value does not match what is expected. This flag disables these checks, and can cause the remote repository to lose commits; use it with care",
-        },
-        {
-          name: "--repo",
-          requiresSeparator: true,
-          description:
-            "This option is equivalent to the <repository> argument. If both are specified, the command-line argument takes precedence",
-          args: {
-            name: "repository",
-          },
-        },
-        {
-          name: ["-u", "--set-upstream"],
-          description:
-            "For every branch that is up to date or successfully pushed, add upstream (tracking) reference, used by argument-less git-pull(1) and other commands",
-        },
-        {
-          name: "--thin",
-          description:
-            "These options are passed to git-send-pack(1). A thin transfer significantly reduces the amount of sent data when the sender and receiver share many of the same objects in common. The default is --thin",
-        },
-        {
-          name: "--no-thin",
-          description:
-            "These options are passed to git-send-pack(1). A thin transfer significantly reduces the amount of sent data when the sender and receiver share many of the same objects in common. The default is --thin",
-        },
-        {
-          name: ["-q", "--quiet"],
-          description:
-            "Suppress all output, including the listing of updated refs, unless an error occurs. Progress is not reported to the standard error stream",
-        },
-        { name: ["-v", "--verbose"], description: "Run verbosely" },
-        {
-          name: "--progress",
-          description:
-            "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal",
-        },
-        {
-          name: "--no-recurse-submodules",
-          description:
-            "May be used to make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If check is used Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing the push will be aborted and exit with non-zero status. If on-demand is used all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If only is used all submodules will be recursively pushed while the superproject is left unpushed. A value of no or using --no-recurse-submodules can be used to override the push.recurseSubmodules configuration variable when no submodule recursion is required",
-        },
-        {
-          name: "--recurse-submodules",
-          requiresSeparator: true,
-          description:
-            "May be used to make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If check is used Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing the push will be aborted and exit with non-zero status. If on-demand is used all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If only is used all submodules will be recursively pushed while the superproject is left unpushed. A value of no or using --no-recurse-submodules can be used to override the push.recurseSubmodules configuration variable when no submodule recursion is required",
-          args: {
-            suggestions: ["check", "on-demand", "only", "no"],
-          },
-        },
-        {
-          name: "--verify",
-          description:
-            "Turn on the pre-push hook. The default is --verify, giving the hook a chance to prevent the push. With",
-        },
-        {
-          name: "--no-verify",
-          description:
-            "Turn off the pre-push hook. The default is --verify, giving the hook a chance to prevent the push. With",
-        },
-        {
-          name: ["-4", "--ipv4"],
-          description: "Use IPv4 addresses only, ignoring IPv6 addresses",
-        },
-        {
-          name: ["-6", "--ipv6"],
-          description: "Use IPv6 addresses only, ignoring IPv4 addresses",
-        },
-        {
-          name: ["-o", "--push-option"],
+				// suggestions: [
+				//     {
+				//         name: ".",
+				//         description: "current directory",
+				//         insertValue: ".",
+				//         icon: "fig://icon?type=folder"
+				//     }
+				// ],
+				generators: gitGenerators.files_for_staging,
+			},
+		},
+		{
+			name: "clean",
+			description: "Shows which files would be removed from working directory",
+			options: [
+				{
+					name: "-d",
+					description:
+						"Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under --force) will be removed",
+				},
+				{
+					name: ["-f", "--force"],
+					description:
+						"If the Git configuration variable clean.requireForce is not set to false, git clean will refuse to delete files or directories unless given -f or -i",
+				},
+				{
+					name: ["-i", "--interactive"],
+					description: "Show what would be done and clean files interactively",
+				},
+				{
+					name: ["-n", "--dry-run"],
+					description:
+						"Don’t actually remove anything, just show what would be done",
+				},
+				{
+					name: ["-q", "--quiet"],
+					description:
+						"Be quiet, only report errors, but not the files that are successfully removed",
+				},
+				{
+					name: ["-e", "--exclude"],
+					description:
+						"Use the given exclude pattern in addition to the standard ignore rules",
+					args: {
+						name: "pattern",
+					},
+				},
+				{
+					name: "-x",
+					description:
+						"Don’t use the standard ignore rules (see gitignore(5)), but still use the ignore rules given with -e options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with git restore or git reset) to create a pristine working directory to test a clean build",
+				},
+				{
+					name: "-X",
+					description:
+						"Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files",
+				},
+			],
+			args: {
+				name: "path",
+				template: "filepaths",
+			},
+		},
+		{
+			name: "revert",
+			description:
+				"Create new commit that undoes all of the changes made in <commit>, then apply it to the current branch",
+			args: {
+				name: "commit",
+				isOptional: true,
+				generators: gitGenerators.commits,
+			},
+		},
+		{
+			name: "ls-remote",
+			description: "List references in a remote repository",
+		},
+		{
+			name: "push",
+			description: "Update remote refs",
+			options: [
+				{
+					name: "--all",
+					description:
+						"Push all branches (i.e. refs under refs/heads/); cannot be used with other <refspec>",
+				},
+				{
+					name: "--prune",
+					description:
+						"Remove remote branches that don't have a local counterpart",
+				},
+				{
+					name: "--mirror",
+					description:
+						"Instead of naming each ref to push, specifies that all refs under refs/ be mirrored to the remote repository",
+				},
+				{
+					name: ["-n", "--dry-run"],
+					description: "Do everything except actually send the updates",
+				},
+				{
+					name: "--porcelain",
+					description:
+						"Produce machine-readable output. The output status line for each ref will be tab-separated and sent to stdout instead of stderr",
+				},
+				{
+					name: ["-d", "--delete"],
+					description:
+						"All listed refs are deleted from the remote repository. This is the same as prefixing all refs with a colon",
+				},
+				{
+					name: "--tags",
+					description:
+						"All refs under refs/tags are pushed, in addition to refspecs explicitly listed on the command line",
+				},
+				{
+					name: "--follow-tags",
+					description:
+						"Push all the refs that would be pushed without this option, and also push annotated tags in refs/tags that are missing from the remote but are pointing at commit-ish that are reachable from the refs being pushed. This can also be specified with configuration variable push.followTags",
+				},
+				{
+					name: "--signed",
+					description:
+						"GPG-sign the push request to update refs on the receiving side, to allow it to be checked by the hooks and/or be logged. If false or --no-signed, no signing will be attempted. If true or --signed, the push will fail if the server does not support signed pushes. If set to if-asked, sign if and only if the server supports signed pushes. The push will also fail if the actual call to gpg --sign fails. See git-receive-pack(1) for the details on the receiving end",
+					args: {
+						isOptional: true,
+						suggestions: ["true", "false", "if-asked"],
+					},
+				},
+				{
+					name: "--no-signed",
+					description:
+						"GPG-sign the push request to update refs on the receiving side, to allow it to be checked by the hooks and/or be logged. If false or --no-signed, no signing will be attempted. If true or --signed, the push will fail if the server does not support signed pushes. If set to if-asked, sign if and only if the server supports signed pushes. The push will also fail if the actual call to gpg --sign fails. See git-receive-pack(1) for the details on the receiving end",
+				},
+				{
+					name: "--atomic",
+					description:
+						"Use an atomic transaction on the remote side if available. Either all refs are updated, or on error, no refs are updated. If the server does not support atomic pushes the push will fail",
+				},
+				{
+					name: "--no-atomic",
+					description:
+						"Use an atomic transaction on the remote side if available. Either all refs are updated, or on error, no refs are updated. If the server does not support atomic pushes the push will fail",
+				},
+				{
+					name: ["-f", "--force"],
+					description:
+						"Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. Also, when --force-with-lease option is used, the command refuses to update a remote ref whose current value does not match what is expected. This flag disables these checks, and can cause the remote repository to lose commits; use it with care",
+				},
+				{
+					name: "--repo",
+					requiresSeparator: true,
+					description:
+						"This option is equivalent to the <repository> argument. If both are specified, the command-line argument takes precedence",
+					args: {
+						name: "repository",
+					},
+				},
+				{
+					name: ["-u", "--set-upstream"],
+					description:
+						"For every branch that is up to date or successfully pushed, add upstream (tracking) reference, used by argument-less git-pull(1) and other commands",
+				},
+				{
+					name: "--thin",
+					description:
+						"These options are passed to git-send-pack(1). A thin transfer significantly reduces the amount of sent data when the sender and receiver share many of the same objects in common. The default is --thin",
+				},
+				{
+					name: "--no-thin",
+					description:
+						"These options are passed to git-send-pack(1). A thin transfer significantly reduces the amount of sent data when the sender and receiver share many of the same objects in common. The default is --thin",
+				},
+				{
+					name: ["-q", "--quiet"],
+					description:
+						"Suppress all output, including the listing of updated refs, unless an error occurs. Progress is not reported to the standard error stream",
+				},
+				{ name: ["-v", "--verbose"], description: "Run verbosely" },
+				{
+					name: "--progress",
+					description:
+						"Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal",
+				},
+				{
+					name: "--no-recurse-submodules",
+					description:
+						"May be used to make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If check is used Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing the push will be aborted and exit with non-zero status. If on-demand is used all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If only is used all submodules will be recursively pushed while the superproject is left unpushed. A value of no or using --no-recurse-submodules can be used to override the push.recurseSubmodules configuration variable when no submodule recursion is required",
+				},
+				{
+					name: "--recurse-submodules",
+					requiresSeparator: true,
+					description:
+						"May be used to make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If check is used Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing the push will be aborted and exit with non-zero status. If on-demand is used all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If only is used all submodules will be recursively pushed while the superproject is left unpushed. A value of no or using --no-recurse-submodules can be used to override the push.recurseSubmodules configuration variable when no submodule recursion is required",
+					args: {
+						suggestions: ["check", "on-demand", "only", "no"],
+					},
+				},
+				{
+					name: "--verify",
+					description:
+						"Turn on the pre-push hook. The default is --verify, giving the hook a chance to prevent the push. With",
+				},
+				{
+					name: "--no-verify",
+					description:
+						"Turn off the pre-push hook. The default is --verify, giving the hook a chance to prevent the push. With",
+				},
+				{
+					name: ["-4", "--ipv4"],
+					description: "Use IPv4 addresses only, ignoring IPv6 addresses",
+				},
+				{
+					name: ["-6", "--ipv6"],
+					description: "Use IPv6 addresses only, ignoring IPv4 addresses",
+				},
+				{
+					name: ["-o", "--push-option"],
 
-          description:
-            "Transmit the given string to the server, which passes them to the pre-receive as well as the post-receive hook. The given string must not contain a NUL or LF character. When multiple --push-option=<option> are given, they are all sent to the other side in the order listed on the command line. When no --push-option=<option> is given from the command line, the values of configuration variable push.pushOption are used instead",
-          args: {
-            name: "option",
-          },
-        },
-        {
-          name: ["--receive-pack", "--exec"],
-          description:
-            "Path to the git-receive-pack program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH",
-          args: {
-            name: "git-receive-pack",
-          },
-        },
-        {
-          name: "--no-force-with-lease",
-          description:
-            "Cancel all the previous --force-with-lease on the command line",
-        },
-        {
-          name: "--force-with-lease",
-          description:
-            "Protect the named ref (alone), if it is going to be updated, by requiring its current value to be the same as the specified value <expect> (which is allowed to be different from the remote-tracking branch we have for the refname, or we do not even have to have such a remote-tracking branch when this form is used). If <expect> is the empty string, then the named ref must not already exist",
-          args: {
-            name: "refname[:expect]",
-            isOptional: true,
-          },
-        },
-      ],
-      args: [
-        {
-          name: "remote",
-          isOptional: true,
-          generators: gitGenerators.remotes,
-          filterStrategy: "fuzzy",
-        },
-        {
-          name: "branch",
-          isOptional: true,
-          generators: gitGenerators.localBranches,
-          filterStrategy: "fuzzy",
-        },
-      ],
-    },
-    {
-      name: "pull",
-      description: "Integrate with another repository",
-      options: [
-        {
-          name: ["--rebase", "-r"],
-          isDangerous: true,
-          description:
-            "Fetch the remote’s copy of current branch and rebases it into the local copy",
-          args: {
-            isOptional: true,
-            name: "remote",
-            generators: gitGenerators.remotes,
-            filterStrategy: "fuzzy",
-            suggestions: ["false", "true", "merges", "preserve", "interactive"],
-          },
-        },
-        { name: "--no-rebase", description: "Override earlier --rebase" },
-        {
-          name: "--commit",
-          description:
-            "Perform the merge and commit the result. This option can be used to override --no-commit",
-        },
-        {
-          name: "--no-commit",
-          description:
-            "Perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing",
-        },
-        {
-          name: ["--edit", "-e"],
-          description:
-            "Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge",
-        },
-        {
-          name: "--no-edit",
-          description:
-            "The --no-edit option can be used to accept the auto-generated message (this is generally discouraged). The --edit (or -e) option is still useful if you are giving a draft message with the -m option from the command line and want to edit it in the editor",
-        },
-        {
-          name: "--cleanup",
-          description:
-            "This option determines how the merge message will be cleaned up before committing. See git-commit[1] for more details. In addition, if the <mode> is given a value of scissors, scissors will be appended to MERGE_MSG before being passed on to the commit machinery in the case of a merge conflict",
-          requiresSeparator: true,
-          args: {
-            name: "mode",
-            suggestions: [
-              "strip",
-              "whitespace",
-              "verbatim",
-              "scissors",
-              "default",
-            ],
-          },
-        },
-        {
-          name: "--ff",
-          description:
-            "When possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit",
-        },
-        {
-          name: "--no-ff",
-          description:
-            "Create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward",
-        },
-        {
-          name: "--ff-only",
-          description:
-            "Resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status",
-        },
-        {
-          name: ["-S", "--gpg-sign"],
-          description:
-            "GPG-sign the resulting merge commit. The keyid argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space",
-          args: {
-            name: "keyid",
-            isOptional: true,
-          },
-        },
-        {
-          name: "--no-gpg-sign",
-          description:
-            "Is useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
-        },
-        {
-          name: "--log",
-          description:
-            "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also git-fmt-merge-msg[1]",
-          args: {
-            name: "n",
-            isOptional: true,
-          },
-        },
-        {
-          name: "--no-log",
-          description:
-            "Do not list one-line descriptions from the actual commits being merged",
-        },
-        {
-          name: "--signoff",
-          description:
-            "Add a Signed-off-by trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you’re committing. For example, it may certify that the committer has the rights to submit the work under the project’s license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you’re contributing to understand how the signoffs are used in that project",
-        },
-        {
-          name: "--no-signoff",
-          description:
-            "Can be used to countermand an earlier --signoff option on the command line",
-        },
-        {
-          name: "--stat",
-          description:
-            "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat",
-        },
-        {
-          name: ["-n", "--no-stat"],
-          description: "Do not show a diffstat at the end of the merge",
-        },
-        {
-          name: "--squash",
-          description:
-            "With --squash, --commit is not allowed, and will fail. Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the HEAD, or record $GIT_DIR/MERGE_HEAD (to cause the next git commit command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)",
-        },
-        {
-          name: "--no-squash",
-          description:
-            "Perform the merge and commit the result. This option can be used to override --squash",
-        },
-        {
-          name: "--no-verify",
-          description:
-            "This option bypasses the pre-merge and commit-msg hooks. See also githooks[5]",
-        },
-        {
-          name: ["-s", "--strategy"],
-          description:
-            "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no -s option, a built-in list of strategies is used instead (git merge-recursive when merging a single head, git merge-octopus otherwise)",
-          args: {
-            name: "strategy",
-            isVariadic: true,
-            suggestions: ["resolve", "recursive", "octopus", "ours", "subtree"],
-          },
-        },
-        {
-          name: ["-X", "--strategy-option"],
-          description:
-            "Pass merge strategy specific option through to the merge strategy",
-          args: {
-            name: "option",
-            suggestions: [
-              "ours",
-              "theirs",
-              "patience",
-              "diff-algorithm",
-              "diff-algorithm=patience",
-              "diff-algorithm=minimal",
-              "diff-algorithm=histogram",
-              "diff-algorithm=myers",
-              "ignore-space-change",
-              "ignore-all-space",
-              "ignore-space-at-eol",
-              "ignore-cr-at-eol",
-              "renormalize",
-              "no-renormalize",
-              "no-renames",
-              "find-renames",
-              "subtree",
-            ],
-          },
-        },
-        {
-          name: "--verify-signatures",
-          description:
-            "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted",
-        },
-        {
-          name: "--no-verify-signatures",
-          description:
-            "Do not verify that the tip commit of the side branch being merged is signed with a valid key",
-        },
-        {
-          name: "--summary",
-          description:
-            "Synonym to --stat ; this is deprecated and will be removed in the future",
-        },
-        {
-          name: "--no-summary",
-          description:
-            "Synonym to --no-stat ; this is deprecated and will be removed in the future",
-        },
-        {
-          name: ["-q", "--quiet"],
-          description: "Operate quietly. Implies --no-progress",
-        },
-        { name: ["-v", "--verbose"], description: "Be verbose" },
-        {
-          name: "--autostash",
-          description:
-            "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run the operation on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts",
-        },
-        {
-          name: "--no-autostash",
-          description:
-            "Do not automatically create a temporary stash entry before the operation begins, and apply it after the operation ends",
-        },
-        {
-          name: "--allow-unrelated-histories",
-          description:
-            "By default, git merge command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added",
-        },
-        {
-          name: "--all",
-          description: "Fetch all remotes",
-        },
-        {
-          name: ["-a", "--append"],
-          description:
-            "Append ref names and object names of fetched refs to the existing contents of .git/FETCH_HEAD",
-        },
-        {
-          name: "--atomic",
-          description:
-            "Use an atomic transaction to update local refs. Either all refs are updated, or on error, no refs are updated",
-        },
-        {
-          name: "--depth",
-          requiresSeparator: true,
-          args: {
-            name: "depth",
-          },
-          description:
-            "Limit fetching to the specified number of commits from the tip of each remote branch history",
-        },
-        {
-          name: "--deepen",
-          requiresSeparator: true,
-          args: {
-            name: "depth",
-          },
-          description:
-            "Similar to --depth, except it specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history",
-        },
-        {
-          name: "--shallow-since",
-          requiresSeparator: true,
-          args: {
-            name: "date",
-          },
-          description:
-            "Deepen or shorten the history of a shallow repository to include all reachable commits after <date>",
-        },
-        {
-          name: "--shallow-exclude",
-          requiresSeparator: true,
-          args: {
-            name: "revision",
-          },
-          description:
-            "Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag. This option can be specified multiple times",
-        },
-        {
-          name: "--unshallow",
-          description:
-            "If the source repository is shallow, fetch as much as possible so that the current repository has the same history as the source repository",
-        },
-        {
-          name: "--update-shallow",
-          description:
-            "By default when fetching from a shallow repository, git fetch refuses refs that require updating .git/shallow",
-        },
-        {
-          name: "--negotiation-tip",
-          requiresSeparator: true,
-          args: {
-            name: "commit|glob",
-            generators: gitGenerators.commits,
-          },
-          description:
-            "By default, Git will report, to the server, commits reachable from all local refs to find common commits in an attempt to reduce the size of the to-be-received packfile",
-        },
-        {
-          name: "--dry-run",
-          description: "Show what would be done, without making any changes",
-        },
-        {
-          name: ["-f", "--force"],
-          description: "This option overrides that check",
-        },
-        {
-          name: ["-k", "--keep"],
-          description: "Keep downloaded pack",
-        },
-        {
-          name: ["-p", "--prune"],
-          description:
-            "Before fetching, remove any remote-tracking references that no longer exist on the remote",
-        },
-        {
-          name: ["-P", "--prune-tags"],
-          description:
-            "Before fetching, remove any local tags that no longer exist on the remote if --prune is enabled",
-        },
-        {
-          name: "--no-tags",
-          description:
-            "By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following",
-        },
-        {
-          name: "--refmap",
-          requiresSeparator: true,
-          args: {
-            name: "refspec",
-          },
-          description:
-            "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository",
-        },
-        {
-          name: ["-t", "--tags"],
-          description:
-            "By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following",
-        },
-        {
-          name: "--recurse-submodules",
-          requiresSeparator: true,
-          args: {
-            name: "mode",
-            isOptional: true,
-            suggestions: ["yes", "on-demand", "no"],
-          },
-          description:
-            "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository",
-        },
-        {
-          name: "--no-recurse-submodules",
-          description:
-            "Disable recursive fetching of submodules (this has the same effect as using the --recurse-submodules=no option)",
-        },
-        {
-          name: ["-j", "--jobs"],
-          args: {
-            name: "n",
-          },
-          description:
-            "Number of parallel children to be used for all forms of fetching",
-        },
-        {
-          name: "--set-upstream",
-          description:
-            "If the remote is fetched successfully, add upstream (tracking) reference, used by argument-less git-pull[1] and other commands",
-        },
-        {
-          name: "--upload-pack",
-          args: {
-            name: "upload-pack",
-          },
-          description:
-            "When given, and the repository to fetch from is handled by git fetch-pack, --exec=<upload-pack> is passed to the command to specify non-default path for the command run on the other end",
-        },
-        {
-          name: "--progress",
-          description:
-            "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified",
-        },
-        {
-          name: ["-o", "--server-option"],
-          args: {
-            name: "option",
-          },
-          description:
-            "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character",
-        },
-        {
-          name: "--show-forced-updates",
-          description:
-            "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs",
-        },
-        {
-          name: "--no-show-forced-updates",
-          description:
-            "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons",
-        },
-        {
-          name: ["-4", "--ipv4"],
-          description: "Use IPv4 addresses only, ignoring IPv6 addresses",
-        },
-        {
-          name: ["-6", "--ipv6"],
-          description: "Use IPv6 addresses only, ignoring IPv4 addresses",
-        },
-      ],
-      args: [
-        {
-          name: "remote",
-          isOptional: true,
-          generators: gitGenerators.remotes,
-          filterStrategy: "fuzzy",
-        },
-        {
-          name: "branch",
-          isOptional: true,
-          generators: gitGenerators.localBranches,
-          filterStrategy: "fuzzy",
-        },
-      ],
-    },
-    {
-      name: "diff",
-      description: "Show changes between commits, commit and working tree, etc",
-      options: [
-        {
-          name: "--staged",
-          description:
-            "Show difference between the files in the staging area and the latest version",
-        },
-        {
-          name: "--cached",
-          description: "Show difference between staged changes and last commit",
-        },
-        {
-          name: "--help",
-          description: "Shows different options",
-        },
-        {
-          name: "--numstat",
-          description:
-            "Shows number of added and deleted lines in decimal notation",
-        },
-        {
-          name: "--name-only",
-          description: "Show only names of changed files",
-        },
-        {
-          name: "--shortstat",
-          description:
-            "Output only the last line of the --stat format containing total number of modified files",
-        },
-        {
-          name: "--stat",
-          description: "Generate a diffstat",
-          requiresSeparator: true,
-          args: {
-            isOptional: true,
-            name: "[=< width >[,< name-width >[,< count >]]]",
-          },
-        },
-        {
-          name: "--",
-          description:
-            "Separates paths from options for disambiguation purposes",
-          args: {
-            isVariadic: true,
-            optionsCanBreakVariadicArg: false,
-            template: "filepaths",
-            name: "[< path >...]",
-          },
-        },
-      ],
-      args: {
-        name: "commit or file",
-        isOptional: true,
-        isVariadic: true,
-        suggestions: headSuggestions,
-        generators: [
-          gitGenerators.commits,
-          gitGenerators.remoteLocalBranches,
-          gitGenerators.getChangedTrackedFiles,
-        ],
-      },
-    },
-    {
-      name: "reset",
-      description: "Reset current HEAD to the specified state",
-      options: [
-        {
-          name: "--keep",
-          description:
-            "Safe: files which are different between the current HEAD and the given commit. Will abort if there are uncommitted changes",
-        },
-        {
-          name: "--soft",
-          description:
-            "Remove the last commit from the current branch, but the file changes will stay in your working tree",
-        },
-        {
-          name: "--hard",
-          description:
-            "⚠️WARNING: you will lose all uncommitted changes in addition to the changes introduced in the last commit",
-        },
-        {
-          name: "--mixed",
-          description:
-            "Keep the changes in your working tree but not on the index",
-        },
-        {
-          name: "-N",
-          description: "Mark removed paths as intent-to-add",
-          dependsOn: ["--mixed"],
-        },
-        {
-          name: "--merge",
-          description:
-            "Resets the index and updates the files in the working tree that are different" +
-            " between 'commit' and HEAD",
-        },
-        {
-          name: ["-q", "--quiet"],
-          description: "Be quiet, only report errors",
-          exclusiveOn: ["--no-quiet"],
-        },
-        {
-          name: "--no-quiet",
-          description: "Inverse of --quiet",
-          exclusiveOn: ["-q", "--quiet"],
-        },
-        {
-          name: "--pathspec-from-file",
-          requiresSeparator: true,
-          description:
-            "Pathspec is passed in file <file> instead of commandline args",
-          args: {
-            name: "file",
-            template: ["folders", "filepaths"],
-            suggestions: ["-"],
-          },
-        },
-        {
-          name: "--pathspec-file-nul",
-          description: "Pathspec elements are separated with NUL character",
-          dependsOn: ["--pathspec-from-file"],
-        },
-        {
-          name: ["-p", "--patch"],
-          description:
-            "Interactively select hunks in the difference between the index and <tree-ish>",
-        },
-      ],
-      args: {
-        isOptional: true,
-        isVariadic: true,
-        suggestions: headSuggestions,
-        generators: [
-          gitGenerators.treeish,
-          gitGenerators.commits,
-          gitGenerators.remoteLocalBranches,
-        ],
-      },
-    },
-    {
-      name: "log",
-      description: "Show commit logs",
-      options: [
-        {
-          name: "--follow",
-          description: "Show history of given file",
-          args: {
-            name: "file",
-            template: "filepaths",
-          },
-        },
-        {
-          name: ["-q", "--quiet"],
-          description: "Suppress diff output",
-        },
-        {
-          name: "--show-signature",
-          description: "Check the validity of a signed commit",
-        },
-        {
-          name: "--source",
-          description: "Show source",
-        },
-        {
-          name: "--oneline",
-          description: "Show each commit as a single line",
-        },
-        {
-          name: ["-p", "-u", "--patch"],
-          description: "Display the full diff of each commit",
-        },
-        {
-          name: "--stat",
-          description:
-            "Include which files were altered and the relative number of lines that were added or deleted from each of them",
-        },
-        {
-          name: "--grep",
-          description:
-            "Search for commits with a commit message that matches <pattern>",
-          requiresSeparator: true,
-          args: {
-            name: "pattern",
-          },
-        },
-        {
-          name: "--author",
-          description: "Search for commits by a particular author",
-          requiresSeparator: true,
-          args: {
-            name: "pattern",
-          },
-        },
-      ],
-      args: [
-        {
-          name: "since",
-          isOptional: true,
-          description: "Commit ID, branch name, HEAD, or revision reference",
-          generators: gitGenerators.commits,
-          suggestions: headSuggestions,
-        },
-        {
-          name: "until",
-          isOptional: true,
-          description: "Commit ID, branch name, HEAD, or revision reference",
-          generators: gitGenerators.commits,
-          suggestions: headSuggestions,
-        },
-      ],
-    },
-    {
-      name: "remote",
-      description: "Manage remote repository",
-      subcommands: [
-        {
-          name: "add",
-          description: "Add a remote named <name> for the repository at <url>",
-          args: [{ name: "name" }, { name: "repository url" }],
-          options: [
-            {
-              name: "-t",
-              description: "A refspec to track only <branch> is created",
-              args: {
-                name: "branch",
-              },
-            },
-            {
-              name: "-m",
-              description:
-                "A symbolic-ref refs/remotes/<name>/HEAD is set up to point at remote’s <master> branch",
-              args: {
-                name: "master",
-              },
-            },
-            {
-              name: "-f",
-              description:
-                "Git fetch <name> is run immediately after the remote information is set up",
-            },
-            {
-              name: "--tags",
-              description:
-                "Git fetch <name> imports every tag from the remote repository",
-            },
-            {
-              name: "--no-tags",
-              description:
-                "Git fetch <name> does not import tags from the remote repository",
-            },
-            {
-              name: "--mirror",
-              requiresSeparator: true,
-              description: "Create fetch or push mirror",
-              args: {
-                suggestions: ["fetch", "push"],
-              },
-            },
-          ],
-        },
-        {
-          name: "set-head",
-          description: "Sets or deletes the default branch",
-          args: [
-            {
-              name: "name",
-              generators: gitGenerators.remotes,
-              filterStrategy: "fuzzy",
-            },
-            {
-              name: "branch",
-              isOptional: true,
-            },
-          ],
-          options: [
-            {
-              name: ["--auto", "-a"],
-              description:
-                "The remote is queried to determine its HEAD, then the symbolic-ref refs/remotes/<name>/HEAD is set to the same branch",
-            },
-            {
-              name: ["--delete", "-d"],
-              description:
-                "The symbolic ref refs/remotes/<name>/HEAD is deleted",
-            },
-          ],
-        },
-        {
-          name: "set-branches",
-          description:
-            "Changes the list of branches tracked by the named remote. This can be used to track a subset of the available remote branches after the initial setup for a remote",
-          options: [
-            {
-              name: "--add",
-              description:
-                "Instead of replacing the list of currently tracked branches, adds to that list",
-            },
-          ],
-          args: [
-            {
-              name: "name",
-              generators: gitGenerators.remotes,
-              filterStrategy: "fuzzy",
-            },
-            {
-              name: "branch",
-              isVariadic: true,
-            },
-          ],
-        },
-        {
-          name: ["rm", "remove"],
-          description: "Removes given remote [name]",
-          args: {
-            name: "remote",
-            generators: gitGenerators.remotes,
-            filterStrategy: "fuzzy",
-          },
-        },
-        {
-          name: "rename",
-          description: "Removes given remote [name]",
-          args: [
-            {
-              name: "old remote",
-              generators: gitGenerators.remotes,
-              filterStrategy: "fuzzy",
-            },
-            {
-              name: "new remote name",
-            },
-          ],
-        },
-        {
-          name: "get-url",
-          description: "Retrieves the URLs for a remote",
-          options: [
-            {
-              name: "--push",
-              description: "Push URLs are queried rather than fetch URLs",
-            },
-            {
-              name: "--all",
-              description: "All URLs for the remote will be listed",
-            },
-          ],
-          args: {
-            name: "name",
-            generators: gitGenerators.remotes,
-            filterStrategy: "fuzzy",
-          },
-        },
-        {
-          name: "set-url",
-          description: "Changes the URLs for the remote",
-          args: [
-            {
-              name: "name",
-              generators: gitGenerators.remotes,
-              filterStrategy: "fuzzy",
-            },
-            {
-              name: "newurl",
-            },
-            {
-              name: "oldurl",
-              isOptional: true,
-            },
-          ],
-          options: [
-            {
-              name: "--push",
-              description: "Push URLs are manipulated instead of fetch URLs",
-            },
-            {
-              name: "--add",
-              description:
-                "Instead of changing existing URLs, new URL is added",
-            },
-            {
-              name: "--delete",
-              description:
-                "Instead of changing existing URLs, all URLs matching regex <url> are deleted for remote <name>",
-            },
-          ],
-        },
-        {
-          name: "show",
-          description: "Gives some information about the remote [name]",
-          args: {
-            name: "name",
-            isVariadic: true,
-            generators: gitGenerators.remotes,
-            filterStrategy: "fuzzy",
-          },
-          options: [
-            {
-              name: "-n",
-              description:
-                "The remote heads are not queried first with git ls-remote <name>; cached information is used instead",
-            },
-          ],
-        },
-        {
-          name: "prune",
-          description:
-            "Equivalent to git fetch --prune [name], except that no new references will be fetched",
-          args: {
-            name: "name",
-            isVariadic: true,
-            generators: gitGenerators.remotes,
-            filterStrategy: "fuzzy",
-          },
-          options: [
-            {
-              name: "-n",
-            },
-            {
-              name: "--dry-run",
-              description:
-                "Report what branches would be pruned, but do not actually prune them",
-            },
-          ],
-        },
-        {
-          name: "update",
-          description:
-            "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>",
-          options: [
-            {
-              name: ["-p", "--prune"],
-              description: "",
-            },
-          ],
-          args: [
-            {
-              name: "group",
-              isOptional: true,
-              isVariadic: true,
-            },
-            {
-              name: "remote",
-              isOptional: true,
-              isVariadic: true,
-            },
-          ],
-        },
-      ],
-      options: [
-        {
-          name: ["-v", "--verbose"],
-          description:
-            "Be a little more verbose and show remote url after name. NOTE: This must be placed between remote and subcommand",
-        },
-      ],
-    },
-    {
-      name: "fetch",
-      description: "Download objects and refs from another repository",
-      args: [
-        {
-          name: "remote",
-          isOptional: true,
-          generators: gitGenerators.remotes,
-          filterStrategy: "fuzzy",
-        },
-        {
-          name: "branch",
-          isOptional: true,
-          generators: gitGenerators.localBranches,
-          filterStrategy: "fuzzy",
-        },
-        {
-          name: "refspec",
-          isOptional: true,
-        },
-      ],
-      options: [
-        {
-          name: "--all",
-          description: "Fetch all remotes",
-        },
-        {
-          name: ["-a", "--append"],
-          description:
-            "Append ref names and object names of fetched refs to the existing contents of .git/FETCH_HEAD",
-        },
-        {
-          name: "--atomic",
-          description:
-            "Use an atomic transaction to update local refs. Either all refs are updated, or on error, no refs are updated",
-        },
-        {
-          name: "--depth",
-          requiresSeparator: true,
-          args: {
-            name: "depth",
-          },
-          description:
-            "Limit fetching to the specified number of commits from the tip of each remote branch history",
-        },
-        {
-          name: "--deepen",
-          requiresSeparator: true,
-          args: {
-            name: "depth",
-          },
-          description:
-            "Similar to --depth, except it specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history",
-        },
-        {
-          name: "--shallow-since",
-          requiresSeparator: true,
-          args: {
-            name: "date",
-          },
-          description:
-            "Deepen or shorten the history of a shallow repository to include all reachable commits after <date>",
-        },
-        {
-          name: "--shallow-exclude",
-          requiresSeparator: true,
-          args: {
-            name: "revision",
-          },
-          description:
-            "Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag. This option can be specified multiple times",
-        },
-        {
-          name: "--unshallow",
-          description:
-            "If the source repository is shallow, fetch as much as possible so that the current repository has the same history as the source repository",
-        },
-        {
-          name: "--update-shallow",
-          description:
-            "By default when fetching from a shallow repository, git fetch refuses refs that require updating .git/shallow",
-        },
-        {
-          name: "--negotiation-tip",
-          requiresSeparator: true,
-          args: {
-            name: "commit|glob",
-            generators: gitGenerators.commits,
-          },
-          description:
-            "By default, Git will report, to the server, commits reachable from all local refs to find common commits in an attempt to reduce the size of the to-be-received packfile",
-        },
-        {
-          name: "--dry-run",
-          description: "Show what would be done, without making any changes",
-        },
-        {
-          name: "--write-fetch-head",
-          description:
-            "Write the list of remote refs fetched in the FETCH_HEAD file directly under $GIT_DIR. This is the default",
-        },
-        {
-          name: "--no-write-fetch-head",
-          description: "Tells Git not to write the file",
-        },
-        {
-          name: ["-f", "--force"],
-          description: "This option overrides that check",
-        },
-        {
-          name: ["-k", "--keep"],
-          description: "Keep downloaded pack",
-        },
-        {
-          name: "--multiple",
-          description:
-            "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified",
-        },
-        {
-          name: ["--auto-maintenance", "--auto-gc"],
-          description:
-            "Run git maintenance run --auto at the end to perform automatic repository maintenance if",
-        },
-        {
-          name: ["--no-auto-maintenance", "--no-auto-gc"],
-          description:
-            "Don't run git maintenance run --auto at the end to perform automatic repository maintenance",
-        },
-        {
-          name: "--write-commit-graph",
-          description:
-            "Write a commit-graph after fetching. This overrides the config setting fetch.writeCommitGraph",
-        },
-        {
-          name: "--no-write-commit-graph",
-          description:
-            "Don't write a commit-graph after fetching. This overrides the config setting fetch.writeCommitGraph",
-        },
-        {
-          name: ["-p", "--prune"],
-          description:
-            "Before fetching, remove any remote-tracking references that no longer exist on the remote",
-        },
-        {
-          name: ["-P", "--prune-tags"],
-          description:
-            "Before fetching, remove any local tags that no longer exist on the remote if --prune is enabled",
-        },
-        {
-          name: ["-n", "--no-tags"],
-          description:
-            "By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following",
-        },
-        {
-          name: "--refmap",
-          requiresSeparator: true,
-          args: {
-            name: "refspec",
-          },
-          description:
-            "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository",
-        },
-        {
-          name: ["-t", "--tags"],
-          description:
-            "By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following",
-        },
-        {
-          name: "--recurse-submodules",
-          requiresSeparator: true,
-          args: {
-            name: "mode",
-            isOptional: true,
-            suggestions: ["yes", "on-demand", "no"],
-          },
-          description:
-            "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository",
-        },
-        {
-          name: ["-j", "--jobs"],
-          args: {
-            name: "n",
-          },
-          description:
-            "Number of parallel children to be used for all forms of fetching",
-        },
-        {
-          name: "--no-recurse-submodules",
-          description:
-            "Disable recursive fetching of submodules (this has the same effect as using the --recurse-submodules=no option)",
-        },
-        {
-          name: "--set-upstream",
-          description:
-            "If the remote is fetched successfully, add upstream (tracking) reference, used by argument-less git-pull[1] and other commands",
-        },
-        {
-          name: "--submodule-prefix",
-          requiresSeparator: true,
-          args: {
-            name: "path",
-          },
-          description:
-            'Prepend <path> to paths printed in informative messages such as ”Fetching submodule foo". This option is used internally when recursing over submodules',
-        },
-        {
-          name: "--recurse-submodules-default",
-          requiresSeparator: true,
-          args: {
-            name: "mode",
-            isOptional: true,
-            suggestions: ["yes", "on-demand"],
-          },
-          description:
-            "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option",
-        },
-        {
-          name: ["-u", "--update-head-ok"],
-          description:
-            "By default git fetch refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for git pull to communicate with git fetch, and unless you are implementing your own Porcelain you are not supposed to use it",
-        },
-        {
-          name: "--upload-pack",
-          args: {
-            name: "upload-pack",
-          },
-          description:
-            "When given, and the repository to fetch from is handled by git fetch-pack, --exec=<upload-pack> is passed to the command to specify non-default path for the command run on the other end",
-        },
-        {
-          name: ["-q", "--quiet"],
-          description:
-            "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream",
-        },
-        {
-          name: ["-v", "--verbose"],
-          description: "Be verbose",
-        },
-        {
-          name: "--progress",
-          description:
-            "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified",
-        },
-        {
-          name: ["-o", "--server-option"],
-          args: {
-            name: "option",
-          },
-          description:
-            "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character",
-        },
-        {
-          name: "--show-forced-updates",
-          description:
-            "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs",
-        },
-        {
-          name: "--no-show-forced-updates",
-          description:
-            "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons",
-        },
-        {
-          name: ["-4", "--ipv4"],
-          description: "Use IPv4 addresses only, ignoring IPv6 addresses",
-        },
-        {
-          name: ["-6", "--ipv6"],
-          description: "Use IPv6 addresses only, ignoring IPv4 addresses",
-        },
-        {
-          name: "--stdin",
-          description:
-            'Read refspecs, one per line, from stdin in addition to those provided as arguments. The "tag <name>" format is not supported',
-        },
-      ],
-    },
-    {
-      name: "stash",
-      description: "Temporarily stores all the modified tracked files",
-      requiresSubcommand: false,
-      subcommands: [
-        {
-          name: "push", // TODO: support for no subcommand is missing
-          description:
-            "Save your local modifications to a new stash entry and roll them back to HEAD",
-          options: [
-            {
-              name: ["-p", "--patch"],
-              description:
-                "Interactively select hunks from the diff between HEAD and the working tree to be stashed",
-            },
-            {
-              name: ["-k", "--keep-index"],
-              description:
-                "All changed already added to the index are left intact",
-            },
-            {
-              name: ["-u", "--include-untracked"],
-              description:
-                "All untracked files are also stashed and then cleaned up",
-            },
-            {
-              name: ["-a", "--all"],
-              description: "All ignored and untracked files are also stashed",
-            },
-            {
-              name: ["-q", "--quiet"],
-              description: "Quiet, suppress feedback messages",
-            },
-            {
-              name: ["-m", "--message"],
-              insertValue: "-m {cursor}",
-              description: "Use the given <msg> as the stash message",
-              args: {
-                name: "message",
-              },
-            },
-            { name: "--pathspec-from-file", description: "" }, // TODO: pathspec file nul and add description
-            {
-              name: "--",
-              description:
-                "Separates pathsec from options for disambiguation purposes",
-            },
-            // TODO: pathspec
-          ],
-        },
-        {
-          name: "show",
-          description: "Show the changes recorded in the stash entry as a diff",
-          args: {
-            name: "stash",
-            isOptional: true,
-            generators: gitGenerators.stashes,
-            filterStrategy: "fuzzy",
-          },
-        },
-        {
-          name: "save",
-          description: "Temporarily stores all the modified tracked files",
-          options: [
-            {
-              name: ["-p", "--patch"],
-              description:
-                "Interactively select hunks from the diff between HEAD and the working tree to be stashed",
-            },
-            {
-              name: ["-k", "--keep-index"],
-              description:
-                "All changed already added to the index are left intact",
-            },
-            {
-              name: ["-u", "--include-untracked"],
-              description:
-                "All untracked files are also stashed and then cleaned up",
-            },
-            {
-              name: ["-a", "--all"],
-              description: "All ignored and untracked files are also stashed",
-            },
-            {
-              name: ["-q", "--quiet"],
-              description: "Quiet, suppress feedback messages",
-            },
-          ],
-          args: {
-            name: "message",
-            isOptional: true,
-          },
-        },
-        {
-          name: "pop",
-          description: "Restores the most recently stashed files",
-          options: [
-            {
-              name: "--index",
-              description:
-                "Tries to reinstate not only the working tree's changes, but also the index's ones",
-            },
-            {
-              name: ["-q", "--quiet"],
-              description: "Quiet, suppress feedback messages",
-            },
-          ],
-          args: {
-            name: "stash",
-            isOptional: true,
-            generators: gitGenerators.stashes,
-            filterStrategy: "fuzzy",
-          },
-        },
-        {
-          name: "list",
-          description: "Lists all stashed changesets",
-        },
-        {
-          name: "drop",
-          description: "Discards the most recently stashed changeset",
-          options: [
-            {
-              name: ["-q", "--quiet"],
-              description: "Quiet, suppress feedback messages",
-            },
-          ],
-          args: {
-            name: "stash",
-            isOptional: true,
-            generators: gitGenerators.stashes,
-            filterStrategy: "fuzzy",
-          },
-        },
-        {
-          name: "clear",
-          description: "Remove all the stash entries",
-        },
-        {
-          name: "apply",
-          description:
-            "Like pop, but do not remove the state from the stash list",
-          options: [
-            {
-              name: "--index",
-              description:
-                "Tries to reinstate not only the working tree's changes, but also the index's ones",
-            },
-            {
-              name: ["-q", "--quiet"],
-              description: "Quiet, suppress feedback messages",
-            },
-          ],
-          args: {
-            name: "stash",
-            isOptional: true,
-            generators: gitGenerators.stashes,
-            filterStrategy: "fuzzy",
-          },
-        },
-        {
-          name: "branch",
-          description: "Creates and checks out a new branch named",
-          insertValue: "branch {cursor}",
-          args: [
-            {
-              name: "branch",
-              generators: gitGenerators.localBranches,
-              filterStrategy: "fuzzy",
-            },
-            {
-              name: "stash",
-              isOptional: true,
-              generators: gitGenerators.stashes,
-              filterStrategy: "fuzzy",
-            },
-          ],
-        },
-        {
-          name: "create",
-          description: "Creates a stash entry",
-          args: {
-            name: "message",
-            isOptional: true,
-          },
-        },
-        {
-          name: "store",
-          description:
-            "Store a given stash in the stash ref, updating the stash reflog",
-          options: [
-            {
-              name: ["-m", "--message"],
-              insertValue: "-m {cursor}",
-              description: "Use the given <msg> as the stash message",
-              args: {
-                name: "message",
-              },
-            },
-            {
-              name: ["-q", "--quiet"],
-              description: "Quiet, suppress feedback messages",
-            },
-          ],
-          args: [
-            {
-              name: "message",
-            },
-            {
-              name: "commit",
-              generators: gitGenerators.commits,
-            },
-          ],
-        },
-      ],
-    },
-    {
-      name: "reflog",
-      description: "Show history of events with hashes",
-      options: [
-        {
-          name: "--relative-date",
-          description: "Show date info",
-        },
-        {
-          name: "--all",
-          description: "Show all refs",
-        },
-      ],
-    },
-    {
-      name: "clone",
-      description: "Clone a repository into a new directory",
-      args: [
-        {
-          name: "repository",
-          description: "Git library to be cloned",
-        },
-        {
-          name: "directory",
-          description: "Specify the new directory name or target folder",
-          template: "folders",
-          isOptional: true,
-        },
-      ],
-      options: [
-        {
-          name: ["-l", "--local"],
-          description: "Bypasses the normal git aware transport mechanism",
-        },
-        {
-          name: "--no-hardlinks",
-          description:
-            "Force the cloning process from a repository on a local filesystem to copy the files under the .git/objects directory instead of using hardlinks",
-        },
-        {
-          name: ["-s", "--shared"],
-          isDangerous: true,
-          description:
-            "Automatically setup .git/objects/info/alternates to share the objects with the source repository",
-        },
-        {
-          name: "--dry-run",
-          description: "Do nothing; only show what would happen",
-        },
-        {
-          name: "--reference",
-          description:
-            "If the reference repository is on the local machine, automatically setup",
-          args: {
-            name: "repository",
-          },
-        },
-        {
-          name: "--reference-if-able",
-          description:
-            "If the reference repository is on the local machine, automatically setup. Non existing directory is skipped with a warning",
-          args: {
-            name: "repository",
-          },
-        },
-        {
-          name: "--dissociate",
-          description:
-            "Borrow the objects from reference repositories specified with the --reference options only to reduce network transfer, and stop borrowing from them after a clone is made by making necessary local copies of borrowed objects",
-        },
-        {
-          name: ["-q", "--quiet"],
-          description:
-            "Operate quietly. Progress is not reported to the standard error stream",
-        },
-        {
-          name: ["-v", "--verbose"],
-          description:
-            "Run verbosely. Does not affect the reporting of progress status to the standard error stream",
-        },
-        {
-          name: "--progress",
-          description:
-            "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless --quiet is specified. This flag forces progress status even if the standard error stream is not directed to a terminal",
-        },
-        {
-          name: "--server-option",
-          description:
-            "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server’s handling of server options, including unknown ones, is server-specific. When multiple --server-option=<option> are given, they are all sent to the other side in the order listed on the command line",
-          requiresSeparator: true,
-          args: {
-            name: "option",
-          },
-        },
-        {
-          name: ["-n", "--no-checkout"],
-          description:
-            "No checkout of HEAD is performed after the clone is complete",
-        },
-        {
-          name: "--bare",
-          description:
-            "Make a bare Git repository. That is, instead of creating <directory> and placing the administrative files in <directory>/.git, make the <directory> itself the $GIT_DIR. This obviously implies the --no-checkout because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to refs/remotes/origin/. When this option is used, neither remote-tracking branches nor the related configuration variables are created",
-        },
-        {
-          name: "--sparse",
-          description:
-            "Initialize the sparse-checkout file so the working directory starts with only the files in the root of the repository. The sparse-checkout file can be modified to grow the working directory as needed",
-        },
-        {
-          name: "--filter",
-          description:
-            "Use the partial clone feature and request that the server sends a subset of reachable objects according to a given object filter. When using --filter, the supplied <filter-spec> is used for the partial clone filter. For example, --filter=blob:none will filter out all blobs (file contents) until needed by Git. Also, --filter=blob:limit=<size> will filter out all blobs of size at least <size>. For more details on filter specifications, see the --filter option in git-rev-list[1]",
-          requiresSeparator: true,
-          args: { name: "filter spec" },
-        },
-        {
-          name: "--mirror",
-          description:
-            "Set up a mirror of the source repository. This implies --bare. Compared to --bare, --mirror not only maps local branches of the source to local branches of the target, it maps all refs (including remote-tracking branches, notes etc.) and sets up a refspec configuration such that all these refs are overwritten by a git remote update in the target repository",
-        },
-        {
-          name: ["-o", "--origin"],
-          description:
-            "Instead of using the remote name origin to keep track of the upstream repository, use <name>. Overrides clone.defaultRemoteName from the config",
-          args: { name: "name" },
-        },
-        {
-          name: ["-b", "--branch"],
-          description:
-            "Instead of pointing the newly created HEAD to the branch pointed to by the cloned repository’s HEAD, point to <name> branch instead. In a non-bare repository, this is the branch that will be checked out. --branch can also take tags and detaches the HEAD at that commit in the resulting repository",
-          args: { name: "branch name" },
-        },
-        {
-          name: ["-u", "--upload-pack"],
-          description:
-            "When given, and the repository to clone from is accessed via ssh, this specifies a non-default path for the command run on the other end",
-          args: {
-            name: "upload pack",
-          },
-        },
-        {
-          name: "--template",
-          description:
-            "Specify the directory from which templates will be used",
-          requiresSeparator: true,
-          args: {
-            name: "template directory",
-          },
-        },
-        {
-          name: ["-c", "--config"],
-          description:
-            "Set a configuration variable in the newly-created repository; this takes effect immediately after the repository is initialized, but before the remote history is fetched or any files checked out. The key is in the same format as expected by git-config[1] (e.g., core.eol=true). If multiple values are given for the same key, each value will be written to the config file. This makes it safe, for example, to add additional fetch refspecs to the origin remote. Due to limitations of the current implementation, some configuration variables do not take effect until after the initial fetch and checkout. Configuration variables known to not take effect are: remote.<name>.mirror and remote.<name>.tagOpt. Use the corresponding --mirror and --no-tags options instead",
-          args: { name: "key=value" },
-        },
-        {
-          name: "--depth",
-          description:
-            "Create a shallow clone with a history truncated to the specified number of commits. Implies --single-branch unless --no-single-branch is given to fetch the histories near the tips of all branches. If you want to clone submodules shallowly, also pass --shallow-submodules",
-          args: {
-            name: "depth",
-          },
-        },
-        {
-          name: "--shallow-since",
-          description:
-            "Create a shallow clone with a history after the specified time",
-          requiresSeparator: true,
-          args: {
-            name: "date",
-          },
-        },
-        {
-          name: "--shallow-exclude",
-          description:
-            "Create a shallow clone with a history, excluding commits reachable from a specified remote branch or tag. This option can be specified multiple times",
-          requiresSeparator: true,
-          args: {
-            name: "revision",
-          },
-        },
-        {
-          name: "--single-branch",
-          description:
-            "Clone only the history leading to the tip of a single branch, either specified by the --branch option or the primary branch remote’s HEAD points at. Further fetches into the resulting repository will only update the remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any branch when --single-branch clone was made, no remote-tracking branch is created",
-        },
-        {
-          name: "--no-single-branch",
-          description:
-            "Do not clone only the history leading to the tip of a single branch, either specified by the --branch option or the primary branch remote’s HEAD points at. Further fetches into the resulting repository will only update the remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any branch when --single-branch clone was made, no remote-tracking branch is created",
-        },
-        {
-          name: "--no-tags",
-          description:
-            "Don’t clone any tags, and set remote.<remote>.tagOpt=--no-tags in the config, ensuring that future git pull and git fetch operations won’t follow any tags. Subsequent explicit tag fetches will still work, (see git-fetch[1])",
-        },
-        {
-          name: "--recurse-submodules",
-          description:
-            "After the clone is created, initialize and clone submodules within based on the provided pathspec. If no pathspec is provided, all submodules are initialized and cloned. This option can be given multiple times for pathspecs consisting of multiple entries",
-          args: {
-            isOptional: true,
-            name: "pathspec",
-          },
-        },
-        {
-          name: "--shallow-submodules",
-          description:
-            "All submodules which are cloned will be shallow with a depth of 1",
-        },
-        {
-          name: "--no-shallow-submodules",
-          description: "Disable --shallow-submodules",
-        },
-        {
-          name: "--remote-submodules",
-          description:
-            "All submodules which are cloned will use the status of the submodule’s remote-tracking branch to update the submodule, rather than the superproject’s recorded SHA-1. Equivalent to passing --remote to git submodule update",
-        },
-        {
-          name: "--no-remote-submodules",
-          description: "Disable --remote-submodules",
-        },
-        {
-          name: ["-j", "--jobs"],
-          description:
-            "The number of submodules fetched at the same time. Defaults to the submodule.fetchJobs option",
-          args: {
-            name: "n",
-            isOptional: true,
-          },
-        },
-        {
-          name: "--separate-git-dir",
-          description:
-            "Instead of placing the cloned repository where it is supposed to be, place the cloned repository at the specified directory, then make a filesystem-agnostic Git symbolic link to there. The result is Git repository can be separated from working tree",
-          requiresSeparator: true,
-          args: {
-            name: "git dir",
-          },
-        },
-      ],
-    },
-    {
-      name: "init",
-      description:
-        "Create an empty Git repository or reinitialize an existing one",
-      args: {
-        name: "directory",
-        isOptional: true,
-      },
-      options: [
-        {
-          name: ["-q", "--quiet"],
-          description: "Only print error and warning messages",
-        },
-        {
-          name: "--bare",
-          description: "Create a bare repository",
-        },
-        {
-          name: "--object-format",
-          description: "Specify the given object format",
-          args: {
-            name: "format",
-            suggestions: ["sha1", "sha256"],
-          },
-        },
-        {
-          name: "--template",
-          description:
-            "Specify the directory from which templates will be used",
-          args: {
-            name: "template_directory",
-            template: "folders",
-          },
-        },
-        {
-          name: "--separate-git-dir",
-          description:
-            "Instead of initializing the repository as a directory to either $GIT_DIR or ./.git/, create a text file there containing the path to the actual repository. This file acts as filesystem-agnostic Git symbolic link to the repository",
-          args: {
-            name: "git dir",
-          },
-        },
-        {
-          name: ["-b", "--initial-branch"],
-          description: "Initial branch for new repo",
-          args: {
-            isOptional: true,
-            name: "branch-name",
-          },
-        },
-        {
-          name: "--shared",
-          description:
-            "Specify that the Git repository is to be shared amongst several users. This allows users belonging to the same group to push into that repository",
-          args: {
-            isOptional: true,
-            suggestions: [
-              {
-                name: "false",
-                description: "Use permissions reported by umask(2)",
-              },
-              {
-                name: "true",
-                description: "Make the repository group-writable",
-              },
-              {
-                name: "umask",
-                description: "Use permissions reported by umask(2)",
-              },
-              {
-                name: "group",
-                description: "Make the repository group-writable",
-              },
-              {
-                name: "all",
-                description:
-                  "Same as group, but make the repository readable by all users",
-              },
-              {
-                name: "world",
-                description:
-                  "Same as group, but make the repository readable by all users",
-              },
-              {
-                name: "everybody",
-                description:
-                  "Same as group, but make the repository readable by all users",
-              },
-              {
-                name: "0xxx",
-                description:
-                  "0xxx is an octal number and each file will have mode 0xxx. 0xxx will override users' umask(2) value (and not only loosen permissions as group and all does)",
-              },
-            ],
-          },
-        },
-      ],
-    },
-    {
-      name: "mv",
-      description: "Move or rename a file, a directory, or a symlink",
-      args: [
-        {
-          name: "source",
-          description: "File to move",
-          template: "filepaths",
-        },
-        {
-          name: "destination",
-          description: "Location to move to",
-          template: "folders",
-        },
-      ],
-      options: [
-        {
-          name: ["-f", "--force"],
-          description:
-            "Force renaming or moving of a file even if the target exists",
-        },
-        {
-          name: "-k",
-          description:
-            "Skip move or rename actions which would lead to an error condition",
-        },
-        {
-          name: ["-n", "--dry-run"],
-          description: "Do nothing; only show what would happen",
-        },
-        {
-          name: ["-v", "--verbose"],
-          description: "Report the names of files as they are moved",
-        },
-      ],
-    },
-    {
-      name: "rm",
-      description: "Remove files from the working tree and from the index",
-      args: {
-        isVariadic: true,
-        suggestions: [
-          {
-            name: ".",
-            description: "Current directory",
-            icon: "fig://icon?type=folder",
-          },
-        ],
-        generators: gitGenerators.files_for_staging,
-      },
-      options: [
-        {
-          name: "--",
-          description:
-            "Used to separate command-line options from the list of files",
-        },
-        { name: "--cached", description: "Only remove from the index" },
-        {
-          name: ["-f", "--force"],
-          description: "Override the up-to-date check",
-        },
-        {
-          name: ["-n", "--dry-run"],
-          description:
-            "Don’t actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command",
-        },
-        { name: "-r", description: "Allow recursive removal" },
-      ],
-    },
-    {
-      name: "bisect",
-      description: "Use binary search to find the commit that introduced a bug",
-      subcommands: [
-        {
-          name: "start",
-          description: "Reset bisect state and start bisection",
-          args: [
-            {
-              name: "bad",
-              isOptional: true,
-              generators: gitGenerators.revs,
-              suggestions: headSuggestions,
-            },
-            {
-              name: "good",
-              isOptional: true,
-              generators: [gitGenerators.revs, gitGenerators.revs],
-              suggestions: headSuggestions,
-              isVariadic: true,
-            },
-          ],
-          options: [
-            {
-              name: "--term-new",
-              description:
-                "Specify the alias to mark commits as new during the bisect process",
-              args: {
-                name: "term",
-                description:
-                  "Specifying: fixed, would require using git bisect fixed instead of git bisect new",
-              },
-            },
-            {
-              name: "--term-bad",
-              description:
-                "Specify the alias to mark commits as bad during the bisect process",
-              args: {
-                name: "term",
-                description:
-                  "Specifying: broken, would require using git bisect broken instead of git bisect bad",
-              },
-            },
-            {
-              name: "--term-good",
-              description:
-                "Specify the alias to mark commits as good during the bisect process",
-              args: {
-                name: "term",
-                description:
-                  "Specifying: fixed, would require using git bisect fixed instead of git bisect good",
-              },
-            },
-            {
-              name: "--term-old",
-              description:
-                "Specify the alias to mark commits as old during the bisect process",
-              args: {
-                name: "term",
-                description:
-                  "Specifying: broken, would require using git bisect broken instead of git bisect old",
-              },
-            },
-            {
-              name: "--no-checkout",
-              description:
-                "Do not checkout the new working tree at each iteration of the bisection process. Instead just update a special reference named BISECT_HEAD to make it point to the commit that should be tested",
-            },
-            {
-              name: "--first-parent",
-              description:
-                "Follow only the first parent commit upon seeing a merge commit. In detecting regressions introduced through the merging of a branch, the merge commit will be identified as introduction of the bug and its ancestors will be ignored",
-            },
-            {
-              name: "--",
-              description:
-                "Stop taking subcommand arguments and options. Starts taking paths to bisect",
-            },
-          ],
-        },
-        {
-          name: "bad",
-          description: "Mark commits as bad",
-          args: {
-            name: "rev",
-            isOptional: true,
-            generators: gitGenerators.revs,
-            suggestions: headSuggestions,
-          },
-        },
-        {
-          name: "new",
-          description: "Mark commits as new",
-          args: {
-            name: "rev",
-            isOptional: true,
-            generators: gitGenerators.revs,
-            suggestions: headSuggestions,
-          },
-        },
-        {
-          name: "old",
-          description: "Mark commits as old",
-          args: {
-            name: "rev",
-            isOptional: true,
-            generators: gitGenerators.revs,
-            suggestions: headSuggestions,
-            isVariadic: true,
-          },
-        },
-        {
-          name: "good",
-          description: "Mark commits as good",
-          args: {
-            name: "rev",
-            isOptional: true,
-            generators: gitGenerators.revs,
-            suggestions: headSuggestions,
-            isVariadic: true,
-          },
-        },
-        {
-          name: "next",
-          description: "Find next bisection to test and check it out",
-        },
-        {
-          name: "terms",
-          description:
-            "Show the terms used for old and new commits (default: bad, good)",
-          options: [
-            {
-              name: "--term-old",
-              description: "You can get just the old (respectively new) term",
-            },
-            {
-              name: "--term-good",
-              description: "You can get just the old (respectively new) term",
-            },
-          ],
-        },
-        {
-          name: "skip",
-          description: "Mark <rev>... untestable revisions",
-          args: {
-            name: "rev | range",
-            isVariadic: true,
-            isOptional: true,
-            generators: gitGenerators.revs,
-            suggestions: headSuggestions,
-          },
-        },
-        {
-          name: "reset",
-          description: "Finish bisection search and go back to commit",
-          args: {
-            name: "commit",
-            isOptional: true,
-            generators: gitGenerators.commits,
-            suggestions: headSuggestions,
-          },
-        },
-        {
-          name: ["visualize", "view"],
-          description: "See the currently remaining suspects in gitk",
-        },
-        {
-          name: "replay",
-          description: "Replay bisection log",
-          args: {
-            name: "logfile",
-            template: "filepaths",
-          },
-        },
-        {
-          name: "log",
-          description: "Show bisect log",
-        },
-        {
-          name: "run",
-          description: "Use <cmd>... to automatically bisect",
-          args: {
-            name: "cmd",
-            isVariadic: true,
-            isCommand: true,
-          },
-        },
-        {
-          name: "help",
-          args: {
-            name: "Get help text",
-          },
-        },
-      ],
-      args: {
-        name: "paths",
-        template: ["filepaths", "folders"],
-      },
-    },
-    { name: "grep", description: "Print lines matching a pattern" },
-    { name: "show", description: "Show various types of objects" },
-    {
-      name: "branch",
-      description: "List, create, or delete branches",
-      options: [
-        {
-          name: ["-a", "--all"],
-          exclusiveOn: ["-r", "--remotes"],
-          description: "List both remote-tracking and local branches",
-        },
-        {
-          name: ["-d", "--delete"],
-          description: "Delete fully merged branch",
-          args: {
-            generators: gitGenerators.localOrRemoteBranches,
-            isVariadic: true,
-            suggestions: [
-              {
-                name: ["-r", "--remotes"],
-                description: "Deletes the remote-tracking branches",
-              },
-            ],
-          },
-        },
-        {
-          name: "-D",
-          description: "Delete branch (even if not merged)",
-          args: {
-            generators: gitGenerators.localOrRemoteBranches,
-            isVariadic: true,
-            suggestions: [
-              {
-                name: ["-r", "--remotes"],
-                description: "Deletes the remote-tracking branches",
-              },
-            ],
-          },
-        },
-        {
-          name: ["-m", "--move"],
-          description: "Move/rename a branch and its reflog",
-          args: [
-            {
-              generators: gitGenerators.localBranches,
-              filterStrategy: "fuzzy",
-            },
-            {
-              generators: gitGenerators.localBranches,
-              filterStrategy: "fuzzy",
-            },
-          ],
-        },
-        {
-          name: "-M",
-          description: "Move/rename a branch, even if target exists",
-          args: [
-            {
-              generators: gitGenerators.localBranches,
-              filterStrategy: "fuzzy",
-            },
-            {
-              generators: gitGenerators.localBranches,
-              filterStrategy: "fuzzy",
-            },
-          ],
-        },
-        { name: ["-c", "--copy"], description: "Copy a branch and its reflog" },
-        { name: "-C", description: "Copy a branch, even if target exists" },
-        { name: ["-l", "--list"], description: "List branch names" },
-        {
-          name: "--create-reflog",
-          description: "Create the branch's reflog",
-        },
-        {
-          name: "--edit-description",
-          description: "Edit the description for the branch",
-          args: {
-            generators: gitGenerators.localBranches,
-            filterStrategy: "fuzzy",
-          },
-        },
-        {
-          name: ["-f", "--force"],
-          description: "Force creation, move/rename, deletion",
-        },
-        {
-          name: "--merged",
-          description: "Print only branches that are merged",
-          args: { name: "commit" },
-        },
-        {
-          name: "--no-merged",
-          description: "Print only branches that are not merged",
-          args: { name: "commit" },
-        },
-        {
-          name: "--column",
-          exclusiveOn: ["--no-column"],
-          description: "List branches in columns [=<style>]",
-        },
-        {
-          name: "--no-column",
-          exclusiveOn: ["--column"],
-          description: "Doesn't display branch listing in columns",
-        },
-        {
-          name: "--sort",
-          description: "Field name to sort on",
-          args: { name: "key" },
-        },
-        {
-          name: "--points-at",
-          description: "Print only branches of the object",
-          args: { name: "object" },
-        },
-        {
-          name: ["-i", "--ignore-case"],
-          description: "Sorting and filtering are case insensitive",
-        },
-        {
-          name: "--format",
-          description: "Format to use for the output",
-          args: { name: "format" },
-        },
-        {
-          name: ["-r", "--remotes"],
-          exclusiveOn: ["-a", "--all"],
-          description:
-            "Lists or deletes (if used with -d) the remote-tracking branches",
-        },
-        {
-          name: "--show-current",
-          description: "Prints the name of the current branch",
-        },
-        {
-          name: ["-v", "--verbose"],
-          isRepeatable: 2,
-          description:
-            "Shows sha1 and commit subject line for each head, along with relationship to upstream branch when in list mode. If given twice, prints the path of the linked worktree and the name of the upstream branch",
-        },
-        {
-          name: ["-q", "--quiet"],
-          description: "Suppress non-error messages",
-        },
-        {
-          name: "--abbrev",
-          description:
-            "Shows the shortest prefix that is at least <n> hexdigits long that uniquely refers the object",
-          exclusiveOn: ["--no-abbrev"],
-          args: {
-            name: "Number",
-          },
-        },
-        {
-          name: "--no-abbrev",
-          exclusiveOn: ["--abbrev"],
-          description: "Displays the full sha1s in the output listing",
-        },
-        {
-          name: ["-t", "--track"],
-          exclusiveOn: ["--no-track"],
-          description:
-            "When creating a new branch, set up 'upstream' configuration",
-          args: [
-            {
-              name: "branch",
-              generators: gitGenerators.localBranches,
-              filterStrategy: "fuzzy",
-            },
-            {
-              name: "start point",
-              isOptional: true,
-              generators: gitGenerators.commits,
-            },
-          ],
-        },
-        {
-          name: "--no-track",
-          exclusiveOn: ["--track", "-t"],
-          description:
-            "Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true",
-          args: [
-            {
-              generators: gitGenerators.localBranches,
-              filterStrategy: "fuzzy",
-            },
-            {
-              isOptional: true,
-              generators: gitGenerators.localBranches,
-              filterStrategy: "fuzzy",
-            },
-          ],
-        },
-        {
-          name: ["-u", "--set-upstream-to"],
-          description: "Sets branch to upstream provided",
-          args: {
-            name: "upstream",
-            isOptional: true,
-            generators: gitGenerators.localBranches,
-            filterStrategy: "fuzzy",
-          },
-        },
-        {
-          name: "--unset-upstream",
-          description: "Removes the upstream information",
-          args: {
-            name: "upstream",
-            isOptional: true,
-            generators: gitGenerators.localBranches,
-            filterStrategy: "fuzzy",
-          },
-        },
-        {
-          name: "--contains",
-          description: "Only lists branches which contain the specified commit",
-          args: {
-            name: "commit",
-            isOptional: true,
-            generators: gitGenerators.commits,
-          },
-        },
-        {
-          name: "--no-contains",
-          description:
-            "Only lists branches which don't contain the specified commit",
-          args: {
-            name: "commit",
-            isOptional: true,
-            generators: gitGenerators.commits,
-          },
-        },
-        {
-          name: "--color",
-          description:
-            "Color branches to highlight current, local, and remote-tracking branches",
-          exclusiveOn: ["--no-color"],
-          args: {
-            name: "when",
-            isOptional: true,
-            suggestions: ["always", "never", "auto"],
-          },
-        },
-        {
-          name: "--no-color",
-          description: "Turns off branch colors",
-          exclusiveOn: ["--color"],
-        },
-      ],
-    },
-    {
-      name: "checkout",
-      description: "Switch branches or restore working tree files",
-      options: [
-        {
-          name: ["-q", "--quiet"],
-          description: "Quiet, suppress feedback messages",
-        },
-        {
-          name: "--progress",
-          description:
-            "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless --quiet is specified. This flag enables progress reporting even if not attached to a terminal, regardless of --quiet",
-        },
-        {
-          name: "--no-progress",
-          description: "Disable progress status reporting",
-        },
-        {
-          name: ["-f", "--force"],
-          description:
-            "When switching branches, proceed even if the index or the working tree differs from HEAD. This is used to throw away local changes",
-        },
-        {
-          name: ["-2", "--ours"],
-          description:
-            "When checking out paths from the index, check out stage #2 (ours) for unmerged paths",
-        },
-        {
-          name: ["-3", "--theirs"],
-          description:
-            "When checking out paths from the index, check out stage #3 (theirs) for unmerged paths",
-        },
-        {
-          name: "-b",
-          description:
-            "Create a new branch named <new_branch> and start it at <start_point>; see git-branch[1] for details",
-          args: {
-            name: "New Branch",
-          },
-        },
-        {
-          name: "-B",
-          description:
-            "Creates the branch <new_branch> and start it at <start_point>; if it already exists, then reset it to <start_point>. This is equivalent to running 'git branch' with '-f'; see git-branch[1] for details",
-          args: {
-            name: "New Branch",
-          },
-        },
-        {
-          name: ["-t", "--track"],
-          description:
-            "When creating a new branch, set up 'upstream' configuration",
-        },
-        {
-          name: "--no-track",
-          description:
-            "Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true",
-        },
-        {
-          name: "--guess",
-          description:
-            "If <branch> is not found but there does exist a tracking branch in exactly one remote (call it <remote>) with a matching name, treat as equivalent to $ git checkout -b <branch> --track <remote>/<branch>",
-        },
-        { name: "--no-guess", description: "Disable --guess" },
-        {
-          name: "-l",
-          description:
-            "Create the new branch’s reflog; see git-branch[1] for details",
-        },
-        {
-          name: ["-d", "--detach"],
-          description:
-            "Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments. This is the default behavior of git checkout <commit> when <commit> is not a branch name",
-        },
-        {
-          name: "--orphan",
-          description:
-            "Create a new orphan branch, named <new_branch>, started from <start_point> and switch to it",
-          args: {
-            name: "New Branch",
-          },
-        },
-        {
-          name: "--ignore-skip-worktree-bits",
-          description:
-            "In sparse checkout mode, git checkout -- <paths> would update only entries matched by <paths> and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and adds back any files in <paths>",
-        },
-        {
-          name: ["-m", "--merge"],
-          description:
-            "When switching branches, if you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context",
-        },
-        {
-          name: "--conflict",
-          description:
-            "The same as --merge option above, but changes the way the conflicting hunks are presented, overriding the merge.conflictStyle configuration variable. Possible values are 'merge' (default) and 'diff3' (in addition to what is shown by 'merge' style, shows the original contents)",
-          requiresSeparator: true,
-          args: {
-            isOptional: true,
-            suggestions: ["merge", "diff3"],
-          },
-        },
-        {
-          name: ["-p", "--patch"],
-          description:
-            "Interactively select hunks in the difference between the <tree-ish> (or the index, if unspecified) and the working tree",
-        },
-        {
-          name: "--ignore-other-worktrees",
-          description:
-            "Git checkout refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree",
-        },
-        {
-          name: "--overwrite-ignore",
-          description:
-            "Silently overwrite ignored files when switching branches. This is the default behavior",
-        },
-        {
-          name: "--no-overwrite-ignore",
-          description:
-            "Use --no-overwrite-ignore to abort the operation when the new branch contains ignored files",
-        },
-        {
-          name: "--recurse-submodules",
-          description:
-            "Using --recurse-submodules will update the content of all active submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless -f is used. If nothing (or --no-recurse-submodules) is used, submodules working trees will not be updated. Just like git-submodule[1], this will detach HEAD of the submodule",
-        },
-        {
-          name: "--no-recurse-submodules",
-          description: "Submodules working trees will not be updated",
-        },
-        {
-          name: "--overlay",
-          description:
-            "In the default overlay mode, git checkout never removes files from the index or the working tree",
-        },
-        {
-          name: "--no-overlay",
-          description:
-            "When specifying --no-overlay, files that appear in the index and working tree, but not in <tree-ish> are removed, to make them match <tree-ish> exactly",
-        },
-        {
-          name: "--pathspec-from-file",
-          description:
-            "Pathspec is passed in <file> instead of commandline args",
-          args: {
-            name: "file",
-            template: "filepaths",
-          },
-        },
-        {
-          name: "--pathspec-file-nul",
-          description: "Only meaningful with --pathspec-from-file",
-        },
-      ],
-      args: [
-        {
-          name: "branch, file, tag or commit",
-          description: "Branch, file, tag or commit to switch to",
-          isOptional: true,
-          filterStrategy: "fuzzy",
-          generators: [
-            gitGenerators.remoteLocalBranches,
-            gitGenerators.tags,
-            { template: ["filepaths", "folders"] },
-          ],
-          suggestions: [
-            {
-              name: "-",
-              description: "Switch to the last used branch",
-              icon: "fig://icon?type=git",
-            },
-            {
-              name: "--",
-              description: "Do not interpret more arguments as options",
-              hidden: true,
-            },
-          ],
-        },
-        {
-          name: "pathspec",
-          description: "Limits the paths affected by the operation",
-          isOptional: true,
-          isVariadic: true,
-          template: "filepaths",
-        },
-      ],
-    },
-    {
-      name: "cherry-pick",
-      description: "Apply the changes introduced by some existing commits",
-      args: {
-        name: "commit",
-        description: "Commits to cherry-pick",
-        isVariadic: true,
-        generators: gitGenerators.commits,
-      },
-      options: [
-        {
-          name: "--continue",
-          description:
-            "Continue the operation in progress using the information in .git/sequencer",
-        },
-        {
-          name: "--skip",
-          description:
-            "Skip the current commit and continue with the rest of the sequence",
-        },
-        {
-          name: "--quit",
-          description: "Forget about the current operation in progress",
-        },
-        {
-          name: "--abort",
-          description:
-            "Cancel the operation and return to the pre-sequence state",
-        },
-        {
-          name: ["-e", "--edit"],
-          description:
-            "With this option, git cherry-pick will let you edit the commit message prior to committing",
-        },
-        {
-          name: "--cleanup",
-          description:
-            "This option determines how the commit message will be cleaned up before being passed on to the commit machinery",
-          args: {
-            name: "mode",
-            description:
-              "Determines how the supplied commit messaged should be cleaned up before committing",
-            suggestions: [
-              {
-                name: "strip",
-                description:
-                  "Strip leading and trailing empty lines, trailing whitepace, commentary and collapse consecutive empty lines",
-              },
-              {
-                name: "whitespace",
-                description: "Same as strip except #commentary is not removed",
-              },
-              {
-                name: "verbatim",
-                description: "Do not change the message at all",
-              },
-              {
-                name: "scissors",
-                description:
-                  "Same as whitespace except that everything from (and including) the line found below is truncated",
-              },
-              {
-                name: "default",
-                description:
-                  "Same as strip if the message is to be edited. Otherwise whitespace",
-              },
-            ],
-          },
-        },
-        {
-          name: "-x",
-          description:
-            'When recording the commit, append a line that says "(cherry picked from commit ...)" to the original commit message in order to indicate which commit this change was cherry-picked from',
-        },
-        {
-          name: ["-m", "--mainline"],
-          description:
-            "Specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent",
-          args: {
-            name: "parent-number",
-          },
-        },
-        {
-          name: ["-n", "--no-commit"],
-          description:
-            "Applies changes necessary to cherry-pick each named commit to your working tree and the index without making any commit",
-        },
-        {
-          name: ["-s", "--signoff"],
-          description:
-            "Add a Signed-off-by trailer at the end of the commit message",
-        },
-        {
-          name: ["-S", "--gpg-sign"],
-          exclusiveOn: ["--no-gpg-sign"],
-          description: "GPG-sign commits",
-          args: {
-            name: "keyid",
-            description: "Must be stuck to the option without a space",
-            isOptional: true,
-          },
-        },
-        {
-          name: "--no-gpg-sign",
-          exclusiveOn: ["-S", "--gpg-sign"],
-          description:
-            "Useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
-        },
-        {
-          name: "--ff",
-          description:
-            "If the current HEAD is the same as the parent of the cherry-pick'ed commit, the a fast forward to this commit will be performed",
-        },
-        {
-          name: "--allow-empty",
-          description:
-            "Allow empty commits to be preserved automatically in a cherry-pick",
-        },
-        {
-          name: "--allow-empty-message",
-          description: "Allow commits with empty messages to be cherry picked",
-        },
-        {
-          name: "--keep-redundant-commits",
-          description: "Creates an empty commit object. Implies --allow-empty",
-        },
-        {
-          name: "--strategy",
-          description: "Use the given merge strategy. Should only be used once",
-          args: {
-            name: "strategy",
-            suggestions: ["resolve", "recursive", "octopus", "ours", "subtree"],
-          },
-        },
-        {
-          name: ["-X", "--strategy-option"],
-          description:
-            "Pass the merge strategy-specific option through to the merge strategy",
-          args: {
-            name: "option",
-            suggestions: [
-              "ours",
-              "theirs",
-              "patience",
-              "diff-algorithm",
-              "diff-algorithm=patience",
-              "diff-algorithm=minimal",
-              "diff-algorithm=histogram",
-              "diff-algorithm=myers",
-              "ignore-space-change",
-              "ignore-all-space",
-              "ignore-space-at-eol",
-              "ignore-cr-at-eol",
-              "renormalize",
-              "no-renormalize",
-              "no-renames",
-              "find-renames",
-              "subtree",
-            ],
-          },
-        },
-        {
-          name: "--rerere-autoupdate",
-          exclusiveOn: ["--no-rerere-autoupdate"],
-          description:
-            "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
-        },
-        {
-          name: "--no-rerere-autoupdate",
-          exclusiveOn: ["--rerere-autoupdate"],
-          description:
-            "Do not allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
-        },
-      ],
-    },
-    {
-      name: "submodule",
-      description: "Initialize, update or inspect submodules",
-      subcommands: [
-        {
-          name: "add",
-          description:
-            "Add the given repository as a submodule at the given path to the changeset to be committed next to the current project",
-          options: [
-            {
-              name: "-b",
-              description: "Branch of repository to add as submodule",
-              args: {
-                name: "branch",
-              },
-            },
-            {
-              name: ["-f", "--force"],
-              description: "Allow adding an otherwise ignored submodule path",
-            },
-            {
-              name: "--name",
-              description:
-                "It sets the submodule’s name to the given string instead of defaulting to its path",
-              insertValue: "--name '{cursor}'",
-              args: {
-                name: "name",
-                description: "Directory name",
-              },
-            },
-            {
-              name: "--reference",
-              description: "Remote repository to be cloned",
-              args: {
-                name: "repository",
-                description: "Remote repository to be cloned",
-              },
-            },
-            {
-              name: "--depth",
-              description:
-                "Create a shallow clone with a history truncated to the specified number of revisions",
-              args: {
-                name: "depth",
-                description: "Specified number of revisions",
-              },
-            },
-            {
-              name: "--",
-              description: "End of subcommand options",
-            },
-          ],
-          args: [
-            {
-              name: "repository",
-            },
-            {
-              name: "path",
-              isOptional: true,
-              template: "filepaths",
-            },
-          ],
-        },
-        {
-          name: "status",
-          description: "Show the status of the submodules",
-          options: [
-            {
-              name: "--cached",
-              description:
-                "Will instead print the SHA-1 recorded in the superproject for each submodule",
-            },
-            {
-              name: "--recursive",
-              description:
-                "Will recurse into nested submodules, and show their status as well",
-            },
-            {
-              name: "--",
-              description: "End of subcommand options",
-            },
-          ],
-          args: {
-            name: "path",
-            isOptional: true,
-            isVariadic: true,
-            template: "filepaths",
-          },
-        },
-        {
-          name: "init",
-          description: "Initialize the submodules recorded in the index",
-          options: [
-            {
-              name: "--",
-              description: "End of subcommand options",
-            },
-          ],
-          args: {
-            name: "path",
-            isOptional: true,
-            isVariadic: true,
-            template: "filepaths",
-          },
-        },
-        {
-          name: "deinit",
-          description: "Unregister the given submodules",
-          options: [
-            {
-              name: ["-f", "--force"],
-              description:
-                "The submodule’s working tree will be removed even if it contains local modifications",
-            },
-            {
-              name: "--all",
-              description: "Unregister all submodules in the working tree",
-            },
-            {
-              name: "--",
-              description: "End of subcommand options",
-            },
-          ],
-          args: {
-            name: "path",
-            isOptional: true,
-            isVariadic: true,
-            template: "filepaths",
-          },
-        },
-        {
-          name: "update",
-          description:
-            "Update the registered submodules to match what the superproject expects by cloning missing submodules, fetching missing commits in submodules and updating the working tree of the submodules",
-          options: [
-            {
-              name: "--init",
-              description:
-                "Initialize all submodules for which 'git submodule init' has not been called so far before updating",
-            },
-            {
-              name: "--remote",
-              description:
-                "Instead of using the superproject’s recorded SHA-1 to update the submodule, use the status of the submodule’s remote-tracking branch",
-            },
-            {
-              name: ["-N", "--no-fetch"],
-              description: "Don’t fetch new objects from the remote site",
-            },
-            {
-              name: "--no-recommend-shallow",
-              description: "Ignore the suggestions",
-            },
-            {
-              name: "--recommend-shallow",
-              description:
-                "The initial clone of a submodule will use the recommended submodule.<name>.shallow as provided by the .gitmodules file",
-            },
-            {
-              name: ["-f", "--force"],
-              description:
-                "Throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule",
-            },
-            {
-              name: "--checkout",
-              description:
-                "The commit recorded in the superproject will be checked out in the submodule on a detached HEAD",
-            },
-            {
-              name: "--rebase",
-              description:
-                "The current branch of the submodule will be rebased onto the commit recorded in the superproject",
-            },
-            {
-              name: "--merge",
-              description:
-                "The commit recorded in the superproject will be merged into the current branch in the submodule",
-            },
-            {
-              name: "--reference",
-              description: "Remote repository",
-              args: {
-                name: "repository",
-              },
-            },
-            {
-              name: "--depth",
-              description:
-                "Create a shallow clone with a history truncated to the specified number of revisions",
-              args: {
-                name: "depth",
-              },
-            },
-            {
-              name: "--recursive",
-              description: "Traverse submodules recursively",
-            },
-            {
-              name: "--jobs",
-              description: "Clone new submodules in parallel with as many jobs",
-              args: {
-                name: "n",
-              },
-            },
-            {
-              name: "--single-branch",
-              description:
-                "Clone only one branch during update: HEAD or one specified by --branch",
-            },
-            {
-              name: "--no-single-branch",
-              description:
-                "Don't clone only one branch during update: HEAD or one specified by --branch",
-            },
-            { name: "--", description: "End of subcommand options" },
-          ],
-          args: {
-            name: "path",
-            isOptional: true,
-            isVariadic: true,
-            template: "filepaths",
-          },
-        },
-        {
-          name: "set-branch",
-          description:
-            "Sets the default remote tracking branch for the submodule",
-          options: [
-            {
-              name: ["-b", "--branch"],
-              description: "Branch of repository to add as submodule",
-              args: {
-                name: "branch",
-                description: "Remote branch to be specified",
-              },
-            },
-            {
-              name: ["-d", "--default"],
-              description:
-                "Removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote HEAD",
-            },
-            {
-              name: "--",
-              description: "End of subcommand options",
-            },
-          ],
-          args: {
-            name: "path",
-            description: "Path to submodule",
-            template: "filepaths",
-          },
-        },
-        {
-          name: "set-url",
-          description: "Sets the URL of the specified submodule to <newurl>",
-          options: [
-            {
-              name: "--",
-              description: "End of command options",
-            },
-          ],
-          args: [
-            {
-              name: "path",
-              description: "Path to specified submodule",
-              template: "filepaths",
-            },
-            {
-              name: "newurl",
-              description: "New url of submodule",
-            },
-          ],
-        },
-        {
-          name: "summary",
-          description:
-            "Show commit summary between the given commit (defaults to HEAD) and working tree/index",
-          options: [
-            {
-              name: "--cached",
-              description:
-                "This command will recurse into the registered submodules, and sync any nested submodules within",
-            },
-            {
-              name: "--files",
-              description:
-                "Show the series of commits in the submodule between the index of the super project and the working tree of the submodule",
-            },
-            {
-              name: "-n",
-              description:
-                "Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules",
-              args: {
-                name: "n",
-              },
-            },
-            {
-              name: "--summary-limit",
-              description:
-                "Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules",
-              args: {
-                name: "n",
-              },
-            },
-            {
-              name: "--",
-              description: "Everything after this is an argument",
-            },
-          ],
-          args: [
-            {
-              name: "commit",
-              isOptional: true,
-            },
-            {
-              name: "path",
-              isOptional: true,
-              isVariadic: true,
-              template: "filepaths",
-            },
-          ],
-        },
-        {
-          name: "foreach",
-          description:
-            "Evaluates an arbitrary shell command in each checked out submodule",
-          options: [
-            {
-              name: "--recursive",
-              description:
-                "This command will recurse into the registered submodules, and sync any nested submodules within",
-            },
-          ],
-          args: {
-            name: "command",
-          },
-        },
-        {
-          name: "sync",
-          description:
-            "Synchronizes submodules' remote URL configuration setting to the value specified in .gitmodules",
-          options: [
-            {
-              name: "--recursive",
-              description:
-                "This command will recurse into the registered submodules, and sync any nested submodules within",
-            },
-            {
-              name: "--",
-              description: "Everything after this is an argument",
-            },
-          ],
-          args: {
-            name: "path",
-            isOptional: true,
-            isVariadic: true,
-            template: "filepaths",
-          },
-        },
-        {
-          name: "absorbgitdirs",
-          description:
-            "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superproject’s $GIT_DIR/modules path and then connect the git directory and its working directory by setting the core.worktree and adding a .git file pointing to the git directory embedded in the superprojects git directory",
-        },
-      ],
-      options: [
-        {
-          name: ["-q", "--quiet"],
-          description: "Only print error messages",
-        },
-        {
-          name: "--cached",
-          description: "The commit stored in the index is used instead",
-        },
-      ],
-    },
-    {
-      name: "merge",
-      description: "Join two or more development histories together",
-      args: {
-        name: "branch",
-        filterStrategy: "fuzzy",
-        generators: gitGenerators.remoteLocalBranches,
-        isVariadic: true,
-        isOptional: true,
-        // A single dash can be used as arg to merge as short hand for the previous branch
-        // https://github.com/git/git/blob/master/Documentation/RelNotes/1.7.6.txt#L84
-        suggestions: [
-          { name: "-", description: "Shorthand for the previous branch" },
-        ],
-      },
-      options: [
-        {
-          name: "--commit",
-          description:
-            "Perform the merge and commit the result. This option can be used to override --no-commit",
-        },
-        {
-          name: "--no-commit",
-          description:
-            "Perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing",
-        },
-        {
-          name: ["--edit", "-e"],
-          description:
-            "Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge",
-        },
-        {
-          name: "--no-edit",
-          description:
-            "The --no-edit option can be used to accept the auto-generated message (this is generally discouraged). The --edit (or -e) option is still useful if you are giving a draft message with the -m option from the command line and want to edit it in the editor",
-        },
-        {
-          name: "--cleanup",
-          description:
-            "This option determines how the merge message will be cleaned up before committing. See git-commit[1] for more details. In addition, if the <mode> is given a value of scissors, scissors will be appended to MERGE_MSG before being passed on to the commit machinery in the case of a merge conflict",
-          requiresSeparator: true,
-          args: {
-            name: "mode",
-            suggestions: [
-              "strip",
-              "whitespace",
-              "verbatim",
-              "scissors",
-              "default",
-            ],
-          },
-        },
-        {
-          name: "--ff",
-          description:
-            "When possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit",
-        },
-        {
-          name: "--no-ff",
-          description:
-            "Create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward",
-        },
-        {
-          name: "--ff-only",
-          description:
-            "Resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status",
-        },
-        {
-          name: ["-S", "--gpg-sign"],
-          description:
-            "GPG-sign the resulting merge commit. The keyid argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space",
-          args: {
-            name: "keyid",
-            isOptional: true,
-          },
-        },
-        {
-          name: "--no-gpg-sign",
-          description:
-            "Is useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
-        },
-        {
-          name: "--log",
-          description:
-            "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also git-fmt-merge-msg[1]",
-          args: {
-            name: "n",
-            isOptional: true,
-          },
-        },
-        {
-          name: "--no-log",
-          description:
-            "Do not list one-line descriptions from the actual commits being merged",
-        },
-        {
-          name: "--signoff",
-          description:
-            "Add a Signed-off-by trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you’re committing. For example, it may certify that the committer has the rights to submit the work under the project’s license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you’re contributing to understand how the signoffs are used in that project",
-        },
-        {
-          name: "--no-signoff",
-          description:
-            "Can be used to countermand an earlier --signoff option on the command line",
-        },
-        {
-          name: "--stat",
-          description:
-            "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat",
-        },
-        {
-          name: ["-n", "--no-stat"],
-          description: "Do not show a diffstat at the end of the merge",
-        },
-        {
-          name: "--squash",
-          description:
-            "With --squash, --commit is not allowed, and will fail. Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the HEAD, or record $GIT_DIR/MERGE_HEAD (to cause the next git commit command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)",
-        },
-        {
-          name: "--no-squash",
-          description:
-            "Perform the merge and commit the result. This option can be used to override --squash",
-        },
-        {
-          name: "--no-verify",
-          description:
-            "This option bypasses the pre-merge and commit-msg hooks. See also githooks[5]",
-        },
-        {
-          name: ["-s", "--strategy"],
-          description:
-            "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no -s option, a built-in list of strategies is used instead (git merge-recursive when merging a single head, git merge-octopus otherwise)",
-          args: {
-            name: "strategy",
-            isVariadic: true,
-            suggestions: ["resolve", "recursive", "octopus", "ours", "subtree"],
-          },
-        },
-        {
-          name: ["-X", "--strategy-option"],
-          description:
-            "Pass merge strategy specific option through to the merge strategy",
-          args: {
-            name: "option",
-            suggestions: [
-              "ours",
-              "theirs",
-              "patience",
-              "diff-algorithm",
-              "diff-algorithm=patience",
-              "diff-algorithm=minimal",
-              "diff-algorithm=histogram",
-              "diff-algorithm=myers",
-              "ignore-space-change",
-              "ignore-all-space",
-              "ignore-space-at-eol",
-              "ignore-cr-at-eol",
-              "renormalize",
-              "no-renormalize",
-              "no-renames",
-              "find-renames",
-              "subtree",
-            ],
-          },
-        },
-        {
-          name: "--verify-signatures",
-          description:
-            "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted",
-        },
-        {
-          name: "--no-verify-signatures",
-          description:
-            "Do not verify that the tip commit of the side branch being merged is signed with a valid key",
-        },
-        {
-          name: "--summary",
-          description:
-            "Synonym to --stat ; this is deprecated and will be removed in the future",
-        },
-        {
-          name: "--no-summary",
-          description:
-            "Synonym to --no-stat ; this is deprecated and will be removed in the future",
-        },
-        {
-          name: ["-q", "--quiet"],
-          description: "Operate quietly. Implies --no-progress",
-        },
-        { name: ["-v", "--verbose"], description: "Be verbose" },
-        {
-          name: "--progress",
-          description:
-            "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting",
-        },
-        {
-          name: "--no-progress",
-          description:
-            "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting",
-        },
-        {
-          name: "--autostash",
-          description:
-            "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run the operation on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts",
-        },
-        {
-          name: "--no-autostash",
-          description:
-            "Do not automatically create a temporary stash entry before the operation begins, and apply it after the operation ends",
-        },
-        {
-          name: "--allow-unrelated-histories",
-          description:
-            "By default, git merge command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added",
-        },
-        {
-          name: "-m",
-          description:
-            "Set the commit message to be used for the merge commit (in case one is created). If --log is specified, a shortlog of the commits being merged will be appended to the specified message. The git fmt-merge-msg command can be used to give a good default for automated git merge invocations. The automated message can include the branch description",
-          args: {
-            name: "message",
-          },
-        },
-        {
-          name: ["-F", "--file"],
-          description:
-            "Read the commit message to be used for the merge commit (in case one is created). If --log is specified, a shortlog of the commits being merged will be appended to the specified message",
-          args: {
-            name: "file",
-            template: "filepaths",
-          },
-        },
-        {
-          name: "--rerere-autoupdate",
-          description:
-            "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
-        },
-        {
-          name: "--no-rerere-autoupdate",
-          description:
-            "Do not allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
-        },
-        {
-          name: "--overwrite-ignore",
-          description:
-            "Silently overwrite ignored files from the merge result. This is the default behavior. Use --no-overwrite-ignore to abort",
-        },
-        {
-          name: "--no-overwrite-ignore",
-          description:
-            "Do not silently overwrite ignored files from the merge result",
-        },
-        {
-          name: "--abort",
-          description:
-            "Abort the current conflict resolution process, and try to reconstruct the pre-merge state. If an autostash entry is present, apply it to the worktree. If there were uncommitted worktree changes present when the merge started, git merge --abort will in some cases be unable to reconstruct these changes. It is therefore recommended to always commit or stash your changes before running git merge. git merge --abort is equivalent to git reset --merge when MERGE_HEAD is present unless MERGE_AUTOSTASH is also present in which case git merge --abort applies the stash entry to the worktree whereas git reset --merge will save the stashed changes in the stash list",
-        },
-        {
-          name: "--quit",
-          description:
-            "Forget about the current merge in progress. Leave the index and the working tree as-is. If MERGE_AUTOSTASH is present, the stash entry will be saved to the stash list",
-        },
-        {
-          name: "--continue",
-          description:
-            "After a git merge stops due to conflicts you can conclude the merge by running git merge --continue (see 'HOW TO RESOLVE CONFLICTS' section below)",
-        },
-      ],
-    },
-    {
-      name: "mergetool",
-      description: "Open the git tool to fix conflicts",
-    },
-    {
-      name: "tag",
-      description:
-        "Create, list, delete or verify a tag object signed with GPG",
-      options: [
-        { name: ["-l", "--list"], description: "List tag names" },
-        {
-          name: "-n",
-          description: "Print <n> lines of each tag message",
-          args: {
-            name: "n",
-            suggestions: [{ name: "1" }, { name: "2" }, { name: "3" }],
-          },
-        },
-        { name: ["-d", "--delete"], description: "Delete tags" },
-        { name: ["-v", "--verify"], description: "Verify tags" },
-        {
-          name: ["-a", "--annotate"],
-          description: "Annotated tag, needs a message",
-        },
-        {
-          name: ["-m", "--message"],
-          insertValue: "-m '{cursor}'",
-          description: "Tag message",
-          args: { name: "message" },
-        },
-        {
-          name: "--points-at",
-          description: "List tags of the given object",
-          args: {
-            name: "object",
-            generators: gitGenerators.commits,
-            suggestions: headSuggestions,
-          },
-        },
-      ],
-      args: {
-        name: "tagname",
-        description: "Select a tag",
-        generators: gitGenerators.tags,
-        isOptional: true,
-      },
-    },
-    {
-      name: "restore",
-      description: "Restore working tree files",
-      options: [
-        {
-          name: ["-s", "--source"],
-          description:
-            "Restore the working tree files with the content from the given tree",
-          args: {
-            name: "tree",
-          },
-        },
-        {
-          name: ["-p", "--patch"],
-          description:
-            "Interactively select hunks in the difference between the restore source and the restore location",
-        },
-        {
-          name: ["-W", "--worktree"],
-          description: "Use the worktree as the restore location",
-        },
-        {
-          name: ["-S", "--staged"],
-          description: "Use staging as the restore location",
-        },
-        {
-          name: ["-q", "--quiet"],
-          description: "Quiet, suppress feedback messages",
-        },
-        {
-          name: "--progress",
-          description:
-            "Progress status is reported on the standard error stream by default when it is attached to a terminal",
-        },
-        {
-          name: "--no-progress",
-          description: "Disable progress status reporting",
-        },
-        {
-          name: ["-2", "--ours"],
-          description:
-            "When restoring paths from the index, check out stage #2 (ours) for unmerged paths",
-          exclusiveOn: ["--theirs"],
-        },
-        {
-          name: ["-3", "--theirs"],
-          description:
-            "When re out paths from the index, check out stage #3 (theirs) for unmerged paths",
-          exclusiveOn: ["--ours"],
-        },
-        {
-          name: ["-m", "--merge"],
-          description:
-            "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths",
-        },
-        {
-          name: "--conflict",
-          description:
-            "The same as --merge option, but changes the way the conflicting hunks are presented",
-          args: {
-            name: "style",
-            suggestions: ["merge", "diff3"],
-          },
-        },
-        {
-          name: "--ignore-unmerged",
-          description:
-            "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries",
-          exclusiveOn: ["--ours", "--theirs", "--merge", "--conflict"],
-        },
-        {
-          name: "--ignore-skip-worktree-bits",
-          description:
-            "In sparse checkout mode, by default is to only update entries matched by <pathspec> and sparse patterns in $GIT_DIR/info/sparse-checkout",
-        },
-        {
-          name: "--recurse-submodules",
-          description:
-            "If <pathspec> names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten",
-          exclusiveOn: ["--no-recurse-submodules"],
-        },
-        {
-          name: "--no-recurse-submodules",
-          description: "Submodules working trees will not be updated",
-          exclusiveOn: ["--recurse-submodules"],
-        },
-        {
-          name: "--overlay",
-          description:
-            "In overlay mode, the command never removes files when restoring",
-          exclusiveOn: ["--no-overlay"],
-        },
-        {
-          name: "--no-overlay",
-          description:
-            "In no-overlay mode, tracked files that do not appear in the --source tree are removed, to make them match <tree> exactly",
-          exclusiveOn: ["--overlay"],
-        },
-        {
-          name: "--pathspec-from-file",
-          description:
-            "Pathspec is passed in <file> instead of commandline args. If <file> is exactly - then standard input is used",
-          args: {
-            name: "file",
-            template: "filepaths",
-          },
-        },
-        {
-          name: "--pathspec-file-nul",
-          description:
-            "Only meaningful with --pathspec-from-file. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)",
-        },
-        {
-          name: "--",
-          description: "Do not interpret any more arguments as options",
-        },
-      ],
-      args: {
-        name: "pathspec",
-        isOptional: true,
-        isVariadic: true,
-        generators: gitGenerators.files_for_staging,
-      },
-    },
-    {
-      name: "switch",
-      description: "Switch branches",
-      options: [
-        {
-          name: ["-c", "--create"],
-          description:
-            "Create a new branch named <new-branch> starting at <start-point> before switching to the branch",
-          args: [
-            {
-              name: "new branch",
-            },
-            {
-              name: "start point",
-              isOptional: true,
-              generators: gitGenerators.commits,
-            },
-          ],
-        },
-        {
-          name: ["-C", "--force-create"],
-          description:
-            "Similar to --create except that if <new-branch> already exists it will be reset to <start-point>",
-          args: [
-            {
-              name: "new branch",
-            },
-            {
-              name: "start point",
-              isOptional: true,
-              generators: gitGenerators.commits,
-            },
-          ],
-        },
-        {
-          name: ["-d", "--detach"],
-          description:
-            "Switch to a commit for inspection and discardable experiments",
-        },
-        {
-          name: "--guess",
-          description:
-            "If <branch> is not found but there does exist a tracking branch in exactly one remote (call it <remote>) with a matching name",
-        },
-        {
-          name: "--no-guess",
-          description: "Disable --guess",
-        },
-        {
-          name: ["-f", "--force"],
-          description: "An alias for --discard-changes",
-          isDangerous: true,
-        },
-        {
-          name: "--discard-changes",
-          description:
-            "Proceed even if the index or the working tree differs from HEAD. Both the index and working tree are restored to match the switching target",
-          isDangerous: true,
-        },
-        {
-          name: ["-m", "--merge"],
-          description:
-            "If you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context",
-        },
-        {
-          name: "--conflict",
-          description:
-            "The same as --merge option above, but changes the way the conflicting hunks are presented, overriding the merge.conflictStyle configuration variable",
-          args: {
-            name: "style",
-            suggestions: ["merge", "diff3"],
-            default: "merge",
-          },
-        },
-        {
-          name: ["-q", "--quiet"],
-          description: "Quiet, suppress feedback messages",
-        },
-        {
-          name: "--progress",
-          description:
-            "Progress status is reported on the standard error stream by default when it is attached to a terminal",
-        },
-        {
-          name: "--no-progress",
-          description: "Disable progress status reporting",
-        },
-        {
-          name: ["-t", "--track"],
-          exclusiveOn: ["--no-track"],
-          description:
-            "When creating a new branch, set up 'upstream' configuration",
-          args: [
-            {
-              name: "branch",
-              generators: gitGenerators.localBranches,
-              filterStrategy: "fuzzy",
-            },
-            {
-              name: "start point",
-              isOptional: true,
-              generators: gitGenerators.commits,
-            },
-          ],
-        },
-        {
-          name: "--no-track",
-          exclusiveOn: ["--track", "-t"],
-          description:
-            "Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true",
-          args: [
-            {
-              generators: gitGenerators.localBranches,
-              filterStrategy: "fuzzy",
-            },
-            {
-              isOptional: true,
-              generators: gitGenerators.localBranches,
-              filterStrategy: "fuzzy",
-            },
-          ],
-        },
-        {
-          name: "--orphan",
-          description: "Create a new orphan branch, named <new-branch>",
-          args: {
-            name: "new branch",
-          },
-        },
-        {
-          name: "--ignore-other-worktrees",
-          description:
-            "Git switch refuses when the wanted ref is already checked out by another worktree",
-        },
-        {
-          name: "--recurse-submodules",
-          exclusiveOn: ["--no-recurse-submodules"],
-          description:
-            "Updates the content of all active submodules according to the commit recorded in the superproject",
-        },
-        {
-          name: "--no-recurse-submodules",
-          exclusiveOn: ["--recurse-submodules"],
-          description: "Submodules working trees will not be updated",
-        },
-      ],
-      args: [
-        {
-          name: "branch name",
-          description: "Branch or commit to switch to",
-          generators: gitGenerators.localBranches,
-          filterStrategy: "fuzzy",
-          suggestions: [
-            {
-              name: "-",
-              description: "Switch to the last used branch",
-              icon: "fig://icon?type=git",
-            },
-          ],
-        },
-        {
-          name: "start point",
-          isOptional: true,
-          generators: gitGenerators.commits,
-        },
-      ],
-    },
-    {
-      name: "worktree",
-      description: "Manage multiple working trees",
-      subcommands: [
-        {
-          name: "add",
-          description: "Create <path> and checkout <commit-ish> into it",
-          options: [
-            {
-              name: ["-f", "--force"],
-              description:
-                "By default, add refuses to create a new working tree when <commit-ish> is a branch name and is already checked out by another working tree, or if <path> is already assigned to some working tree but is missing (for instance, if <path> was deleted manually). This option overrides these safeguards. To add a missing but locked working tree path, specify --force twice",
-            },
-            {
-              name: ["-d", "--detach"],
-              description:
-                'With add, detach HEAD in the new working tree. See "DETACHED HEAD" in git-checkout[1]',
-            },
-            {
-              name: "--checkout",
-              description:
-                'By default, add checks out <commit-ish>, however, --no-checkout can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See "Sparse checkout" in git-read-tree[1]',
-            },
-            {
-              name: "--lock",
-              description:
-                "Keep the working tree locked after creation. This is the equivalent of git worktree lock after git worktree add, but without a race condition",
-            },
-            {
-              name: ["-b", "-B"],
-              description:
-                "With add, create a new branch named <new-branch> starting at <commit-ish>, and check out <new-branch> into the new working tree. If <commit-ish> is omitted, it defaults to HEAD. By default, -b refuses to create a new branch if it already exists. -B overrides this safeguard, resetting <new-branch> to <commit-ish>",
-              args: {
-                name: "new-branch",
-              },
-            },
-          ],
-        },
-        {
-          name: "list",
-          description: "List details of each working tree",
-          options: [
-            {
-              name: "--porcelain",
-              description:
-                "With list, output in an easy-to-parse format for scripts. This format will remain stable across Git versions and regardless of user configuration. See below for details",
-            },
-            {
-              name: ["-v", "--verbose"],
-              description:
-                "With list, output additional information about worktrees (see below)",
-            },
-            {
-              name: "--expire",
-              description:
-                "With list, annotate missing working trees as prunable if they are older than <time>",
-              args: {
-                name: "time",
-              },
-            },
-          ],
-        },
-        {
-          name: "lock",
-          description:
-            "If a working tree is on a portable device or network share which is not always mounted, lock it to prevent its administrative files from being pruned automatically",
-          args: {
-            name: "worktree",
-            description:
-              "Working trees can be identified by path, either relative or absolute",
-          },
-          options: [
-            {
-              name: "--reason",
-              description:
-                "With lock or with add --lock, an explanation <reason> why the working tree is locked",
-              args: {
-                name: "reason",
-              },
-            },
-          ],
-        },
-        {
-          name: "move",
-          description: "Move a working tree to a new location",
-          args: [
-            {
-              name: "worktree",
-              description:
-                "Working trees can be identified by path, either relative or absolute",
-            },
-            {
-              name: "new-path",
-              template: "filepaths",
-            },
-          ],
-          options: [
-            {
-              name: ["-f", "--force"],
-              description:
-                "Move refuses to move a locked working tree unless --force is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if <new-path> was deleted manually), then --force allows the move to proceed; use --force twice if the destination is locked",
-            },
-          ],
-        },
-        {
-          name: "prune",
-          description: "Prune working tree information in $GIT_DIR/worktrees",
-          options: [
-            {
-              name: ["-n", "--dry-run"],
-              description:
-                "With prune, do not remove anything; just report what it would remove",
-            },
-            {
-              name: ["-v", "--verbose"],
-              description: "With prune, report all removals",
-            },
-            {
-              name: "--expire",
-              description:
-                "With prune, only expire unused working trees older than <time>",
-              args: {
-                name: "time",
-              },
-            },
-          ],
-        },
-        {
-          name: "remove",
-          description: "Remove a working tree",
-          args: {
-            name: "worktree",
-            description:
-              "Working trees can be identified by path, either relative or absolute",
-          },
-          options: [
-            {
-              name: ["-f", "--force"],
-              description:
-                "Remove refuses to remove an unclean working tree unless --force is used. To remove a locked working tree, specify --force twice",
-            },
-          ],
-        },
-        {
-          name: "repair",
-          description:
-            "Repair working tree administrative files, if possible, if they have become corrupted or outdated due to external factors",
-          args: {
-            name: "path",
-            template: "filepaths",
-          },
-        },
-        {
-          name: "unlock",
-          description:
-            "Unlock a working tree, allowing it to be pruned, moved or deleted",
-          args: {
-            name: "worktree",
-            description:
-              "Working trees can be identified by path, either relative or absolute",
-          },
-        },
-      ],
-    },
-    {
-      name: "apply",
-      description: "Apply a patch to files and/or to the index",
-      options: [
-        {
-          name: "--exclude",
-          description: "Don't apply changes matching the given path",
-          args: {
-            name: "path",
-          },
-        },
-        {
-          name: "--include",
-          description: "Apply changes matching the given path",
-          args: {
-            name: "path",
-          },
-        },
-        {
-          name: "-p",
-          description:
-            "Remove <num> leading slashes from traditional diff paths",
-          args: {
-            name: "num",
-          },
-        },
-        {
-          name: "--no-add",
-          description: "Ignore additions made by the patch",
-        },
-        {
-          name: "--stat",
-          description:
-            "Instead of applying the patch, output diffstat for the input",
-        },
-        {
-          name: "--numstat",
-          description:
-            "Show number of added and deleted lines in decimal notation",
-        },
-        {
-          name: "--summary",
-          description:
-            "Instead of applying the patch, output a summary for the input",
-        },
-        {
-          name: "--check",
-          description:
-            "Instead of applying the patch, see if the patch is applicable",
-        },
-        {
-          name: "--index",
-          description: "Make sure the patch is applicable to the current index",
-        },
-        {
-          name: ["-N", "--intent-to-add"],
-          description: "Mark new files with `git add --intent-to-add`",
-        },
-        {
-          name: "--cached",
-          description: "Apply a patch without touching the working tree",
-        },
-        {
-          name: "--unsafe-paths",
-          description: "Accept a patch that touches outside the working area",
-        },
-        {
-          name: "--apply",
-          description:
-            "Also apply the patch (use with --stat/--summary/--check)",
-        },
-        {
-          name: ["-3", "--3way"],
-          description: "Attempt three-way merge if a patch does not apply",
-        },
-        {
-          name: "--build-fake-ancestor",
-          description:
-            "Build a temporary index based on embedded index information",
-          args: {
-            name: "file",
-          },
-        },
-        {
-          name: "-z",
-          description: "Paths are separated with NUL character",
-        },
-        {
-          name: "-C",
-          description: "Ensure at least <n> lines of context match",
-          args: {
-            name: "n",
-          },
-        },
-        {
-          name: "--whitespace",
-          description:
-            "Detect new or modified lines that have whitespace errors",
-          args: {
-            name: "action",
-            suggestions: [
-              {
-                name: "nowarn",
-                description: "Turns off the trailing whitespace warning",
-              },
-              {
-                name: "warn",
-                description:
-                  "Outputs warnings for a few such errors, but applies the patch as-is (default)",
-              },
-              {
-                name: "fix",
-                description:
-                  "Outputs warnings for a few such errors, and applies the patch after fixing them",
-              },
-              {
-                name: "error",
-                description:
-                  "Outputs warnings for a few such errors, and refuses to apply the patch",
-              },
-              {
-                name: "error-all",
-                description: "Similar to `error` but shows all errors",
-              },
-            ],
-          },
-        },
-        {
-          name: ["--ignore-space-change", "--ignore-whitespace"],
-          description: "Ignore changes in whitespace when finding context",
-        },
-        {
-          name: ["-R", "--reverse"],
-          description: "Apply the patch in reverse",
-        },
-        {
-          name: "--unidiff-zero",
-          description: "Don't expect at least one line of context",
-        },
-        {
-          name: "--reject",
-          description: "Leave the rejected hunks in corresponding *.rej files",
-        },
-        {
-          name: "--allow-overlap",
-          description: "Allow overlapping hunks",
-        },
-        {
-          name: ["-v", "--verbose"],
-          description: "Be verbose",
-        },
-        {
-          name: "--inaccurate-eof",
-          description:
-            "Tolerate incorrectly detected missing new-line at the end of file",
-        },
-        {
-          name: "--recount",
-          description: "Do not trust the line counts in the hunk headers",
-        },
-        {
-          name: "--directory",
-          description: "Prepend <root> to all filenames",
-          args: {
-            name: "root",
-          },
-        },
-      ],
-      args: {
-        name: "patch",
-        isVariadic: true,
-      },
-    },
-    {
-      name: "daemon",
-      description: "A really simple server for Git repositories",
-      args: {
-        name: "directory",
-        description:
-          "A directory to add to the whitelist of allowed directories. Unless --strict-paths is specified this will also include subdirectories of each named directory",
-        isVariadic: true,
-      },
-      options: [
-        {
-          name: "--strict-paths",
-          description:
-            'Match paths exactly (i.e. don’t allow "/foo/repo" when the real path is "/foo/repo.git" or "/foo/repo/.git") and don’t do user-relative paths.  git daemon will refuse to start when this option is enabled and no whitelist is specified',
-        },
-        {
-          name: "--base-path",
-          description:
-            "Remap all the path requests as relative to the given path",
-          requiresSeparator: true,
-          args: { name: "path", template: "folders" },
-        },
-        {
-          name: "--base-path-relaxed",
-          description:
-            "If --base-path is enabled and repo lookup fails, with this option git daemon will attempt to lookup without prefixing the base path. This is useful for switching to --base-path usage, while still allowing the old paths",
-        },
-        {
-          name: "--interpolated-path",
-          requiresSeparator: true,
-          description:
-            "To support virtual hosting, an interpolated path template can be used to dynamically construct alternate paths. The template supports %H for the target hostname as supplied by the client but converted to all lowercase, %CH for the canonical hostname, %IP for the server’s IP address, %P for the port number, and %D for the absolute path of the named repository. After interpolation, the path is validated against the directory whitelist",
-          args: { name: "path-template" },
-        },
-        {
-          name: "--export-all",
-          description:
-            "Allow pulling from all directories that look like Git repositories (have the objects and refs subdirectories), even if they do not have the git-daemon-export-ok file",
-        },
-        {
-          name: "--inetd",
-          description: "Have the server run as an inetd service",
-          exclusiveOn: ["--pid-file", "--user", "--group"],
-        },
-        {
-          name: "--listen",
-          description:
-            "Listen on a specific IP address or hostname. IP addresses can be either an IPv4 address or an IPv6 address if supported. If IPv6 is not supported, then --listen=hostname is also not supported and --listen must be given an IPv4 address. Can be given more than once. Incompatible with --inetd option",
-          requiresSeparator: true,
-          args: { name: "host_or_ipaddr" },
-        },
-        {
-          name: "--port",
-          description:
-            "Listen on an alternative port. Incompatible with --inetd option",
-          requiresSeparator: true,
-          args: { name: "port" },
-        },
-        {
-          name: "--init-timeout",
-          description:
-            "Timeout (in seconds) between the moment the connection is established and the client request is received (typically a rather low value, since that should be basically immediate)",
-          requiresSeparator: true,
-          args: { name: "timeout" },
-        },
-        {
-          name: "--max-connections",
-          description:
-            "Maximum number of concurrent clients, defaults to 32. Set it to zero for no limit",
-          requiresSeparator: true,
-          args: { name: "maximum" },
-        },
-        {
-          name: "--syslog",
-          description: "Short for --log-destination=syslog",
-        },
-        {
-          name: "--log-destination",
-          description:
-            "Send log messages to the specified destination. Note that this option does not imply --verbose, thus by default only error conditions will be logged. The default destination is syslog if --inetd or --detach is specified, otherwise stderr",
-          requiresSeparator: true,
-          args: {
-            name: "destination",
-            suggestions: [
-              {
-                name: "stderr",
-                description:
-                  "Write to standard error. Note that if --detach is specified, the process disconnects from the real standard error, making this destination effectively equivalent to none",
-              },
-              {
-                name: "syslog",
-                description: "Write to syslog, using the git-daemon identifier",
-              },
-              { name: "none", description: "Disable all logging" },
-            ],
-          },
-        },
-        {
-          name: "--user-path",
-          description:
-            "Allow ~user notation to be used in requests. When specified with no parameter, requests to git://host/~alice/foo is taken as a request to access foo repository in the home directory of user alice. If --user-path=some-path is specified, the same request is taken as a request to access the some-path/foo repository in the home directory of user alice",
-          requiresSeparator: true,
-          args: {
-            name: "path",
-            template: "folders",
-          },
-        },
-        {
-          name: "--verbose",
-          description:
-            "Log details about the incoming connections and requested files",
-        },
-        {
-          name: "--detach",
-          description: "Detach from the shell. Implies --syslog",
-        },
-        {
-          name: "--pid-file",
-          description: "Save the process id in the provided file",
-          requiresSeparator: true,
-          args: { name: "file", template: "filepaths" },
-          exclusiveOn: ["--inetd"],
-        },
-        {
-          name: "--user",
-          description:
-            "Change daemon’s uid and gid before entering the service loop. When only --user is given without --group, the primary group ID for the user is used. The values of the option are given to getpwnam(3) and getgrnam(3) and numeric IDs are not supported",
-          requiresSeparator: true,
-          exclusiveOn: ["--inetd"],
-          args: { name: "user" },
-        },
-        {
-          name: "--group",
-          description:
-            "Change daemon’s gid before entering the service loop. The value of this option is given to getgrnam(3) and numeric IDs are not supported",
-          exclusiveOn: ["--inetd"],
-        },
-        {
-          name: "--enable",
-          description: "Enable the service site-wide per default",
-          requiresSeparator: true,
-          args: { name: "service", suggestions: daemonServices },
-        },
-        {
-          name: "--disable",
-          description:
-            "Disable the service site-wide per default. Note that a service disabled site-wide can still be enabled per repository if it is marked overridable and the repository enables the service with a configuration item",
-          requiresSeparator: true,
-          args: { name: "service", suggestions: daemonServices },
-        },
-        {
-          name: "--allow-override",
-          description:
-            "Allow overriding the site-wide default with per repository configuration. By default, all the services may be overridden",
-          requiresSeparator: true,
-          args: { name: "service", suggestions: daemonServices },
-        },
-        {
-          name: "--forbid-override",
-          description:
-            "Forbid overriding the site-wide default with per repository configuration. By default, all the services may be overridden",
-          requiresSeparator: true,
-          args: { name: "service", suggestions: daemonServices },
-        },
-        {
-          name: "--informative-errors",
-          description:
-            'When informative errors are turned on, git-daemon will report more verbose errors to the client, differentiating conditions like "no such repository" from "repository not exported". This is more convenient for clients, but may leak information about the existence of unexported repositories. When informative errors are not enabled, all errors report "access denied" to the client',
-          exclusiveOn: ["--no-informative-errors"],
-        },
-        {
-          name: "--no-informative-errors",
-          description:
-            "Turn off informative errors. This option is the default. See --informative-errors for more information",
-          exclusiveOn: ["--informative-errors"],
-        },
-        {
-          name: "--access-hook",
-          description:
-            'Every time a client connects, first run an external command specified by the <path> with service name (e.g. "upload-pack"), path to the repository, hostname (%H), canonical hostname (%CH), IP address (%IP), and TCP port (%P) as its command-line arguments. The external command can decide to decline the service by exiting with a non-zero status (or to allow it by exiting with a zero status). It can also look at the $REMOTE_ADDR and $REMOTE_PORT environment variables to learn about the requestor when making this decision.\n\nThe external command can optionally write a single line to its standard output to be sent to the requestor as an error message when it declines the service',
-          requiresSeparator: true,
-          args: { name: "path", template: "filepaths" },
-        },
-      ],
-    },
-  ],
-  additionalSuggestions: [
-    {
-      name: "commit -m 'msg'",
-      description: "Git commit shortcut",
-      insertValue: "commit -m '{cursor}'",
-      icon: "fig://template?color=2ecc71&badge=🔥",
-      // type: "shortcut",
-    },
-  ],
+					description:
+						"Transmit the given string to the server, which passes them to the pre-receive as well as the post-receive hook. The given string must not contain a NUL or LF character. When multiple --push-option=<option> are given, they are all sent to the other side in the order listed on the command line. When no --push-option=<option> is given from the command line, the values of configuration variable push.pushOption are used instead",
+					args: {
+						name: "option",
+					},
+				},
+				{
+					name: ["--receive-pack", "--exec"],
+					description:
+						"Path to the git-receive-pack program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH",
+					args: {
+						name: "git-receive-pack",
+					},
+				},
+				{
+					name: "--no-force-with-lease",
+					description:
+						"Cancel all the previous --force-with-lease on the command line",
+				},
+				{
+					name: "--force-with-lease",
+					description:
+						"Protect the named ref (alone), if it is going to be updated, by requiring its current value to be the same as the specified value <expect> (which is allowed to be different from the remote-tracking branch we have for the refname, or we do not even have to have such a remote-tracking branch when this form is used). If <expect> is the empty string, then the named ref must not already exist",
+					args: {
+						name: "refname[:expect]",
+						isOptional: true,
+					},
+				},
+			],
+			args: [
+				{
+					name: "remote",
+					isOptional: true,
+					generators: gitGenerators.remotes,
+					filterStrategy: "fuzzy",
+				},
+				{
+					name: "branch",
+					isOptional: true,
+					generators: gitGenerators.localBranches,
+					filterStrategy: "fuzzy",
+				},
+			],
+		},
+		{
+			name: "pull",
+			description: "Integrate with another repository",
+			options: [
+				{
+					name: ["--rebase", "-r"],
+					isDangerous: true,
+					description:
+						"Fetch the remote’s copy of current branch and rebases it into the local copy",
+					args: {
+						isOptional: true,
+						name: "remote",
+						generators: gitGenerators.remotes,
+						filterStrategy: "fuzzy",
+						suggestions: ["false", "true", "merges", "preserve", "interactive"],
+					},
+				},
+				{ name: "--no-rebase", description: "Override earlier --rebase" },
+				{
+					name: "--commit",
+					description:
+						"Perform the merge and commit the result. This option can be used to override --no-commit",
+				},
+				{
+					name: "--no-commit",
+					description:
+						"Perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing",
+				},
+				{
+					name: ["--edit", "-e"],
+					description:
+						"Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge",
+				},
+				{
+					name: "--no-edit",
+					description:
+						"The --no-edit option can be used to accept the auto-generated message (this is generally discouraged). The --edit (or -e) option is still useful if you are giving a draft message with the -m option from the command line and want to edit it in the editor",
+				},
+				{
+					name: "--cleanup",
+					description:
+						"This option determines how the merge message will be cleaned up before committing. See git-commit[1] for more details. In addition, if the <mode> is given a value of scissors, scissors will be appended to MERGE_MSG before being passed on to the commit machinery in the case of a merge conflict",
+					requiresSeparator: true,
+					args: {
+						name: "mode",
+						suggestions: [
+							"strip",
+							"whitespace",
+							"verbatim",
+							"scissors",
+							"default",
+						],
+					},
+				},
+				{
+					name: "--ff",
+					description:
+						"When possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit",
+				},
+				{
+					name: "--no-ff",
+					description:
+						"Create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward",
+				},
+				{
+					name: "--ff-only",
+					description:
+						"Resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status",
+				},
+				{
+					name: ["-S", "--gpg-sign"],
+					description:
+						"GPG-sign the resulting merge commit. The keyid argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space",
+					args: {
+						name: "keyid",
+						isOptional: true,
+					},
+				},
+				{
+					name: "--no-gpg-sign",
+					description:
+						"Is useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
+				},
+				{
+					name: "--log",
+					description:
+						"In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also git-fmt-merge-msg[1]",
+					args: {
+						name: "n",
+						isOptional: true,
+					},
+				},
+				{
+					name: "--no-log",
+					description:
+						"Do not list one-line descriptions from the actual commits being merged",
+				},
+				{
+					name: "--signoff",
+					description:
+						"Add a Signed-off-by trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you’re committing. For example, it may certify that the committer has the rights to submit the work under the project’s license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you’re contributing to understand how the signoffs are used in that project",
+				},
+				{
+					name: "--no-signoff",
+					description:
+						"Can be used to countermand an earlier --signoff option on the command line",
+				},
+				{
+					name: "--stat",
+					description:
+						"Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat",
+				},
+				{
+					name: ["-n", "--no-stat"],
+					description: "Do not show a diffstat at the end of the merge",
+				},
+				{
+					name: "--squash",
+					description:
+						"With --squash, --commit is not allowed, and will fail. Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the HEAD, or record $GIT_DIR/MERGE_HEAD (to cause the next git commit command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)",
+				},
+				{
+					name: "--no-squash",
+					description:
+						"Perform the merge and commit the result. This option can be used to override --squash",
+				},
+				{
+					name: "--no-verify",
+					description:
+						"This option bypasses the pre-merge and commit-msg hooks. See also githooks[5]",
+				},
+				{
+					name: ["-s", "--strategy"],
+					description:
+						"Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no -s option, a built-in list of strategies is used instead (git merge-recursive when merging a single head, git merge-octopus otherwise)",
+					args: {
+						name: "strategy",
+						isVariadic: true,
+						suggestions: ["resolve", "recursive", "octopus", "ours", "subtree"],
+					},
+				},
+				{
+					name: ["-X", "--strategy-option"],
+					description:
+						"Pass merge strategy specific option through to the merge strategy",
+					args: {
+						name: "option",
+						suggestions: [
+							"ours",
+							"theirs",
+							"patience",
+							"diff-algorithm",
+							"diff-algorithm=patience",
+							"diff-algorithm=minimal",
+							"diff-algorithm=histogram",
+							"diff-algorithm=myers",
+							"ignore-space-change",
+							"ignore-all-space",
+							"ignore-space-at-eol",
+							"ignore-cr-at-eol",
+							"renormalize",
+							"no-renormalize",
+							"no-renames",
+							"find-renames",
+							"subtree",
+						],
+					},
+				},
+				{
+					name: "--verify-signatures",
+					description:
+						"Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted",
+				},
+				{
+					name: "--no-verify-signatures",
+					description:
+						"Do not verify that the tip commit of the side branch being merged is signed with a valid key",
+				},
+				{
+					name: "--summary",
+					description:
+						"Synonym to --stat ; this is deprecated and will be removed in the future",
+				},
+				{
+					name: "--no-summary",
+					description:
+						"Synonym to --no-stat ; this is deprecated and will be removed in the future",
+				},
+				{
+					name: ["-q", "--quiet"],
+					description: "Operate quietly. Implies --no-progress",
+				},
+				{ name: ["-v", "--verbose"], description: "Be verbose" },
+				{
+					name: "--autostash",
+					description:
+						"Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run the operation on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts",
+				},
+				{
+					name: "--no-autostash",
+					description:
+						"Do not automatically create a temporary stash entry before the operation begins, and apply it after the operation ends",
+				},
+				{
+					name: "--allow-unrelated-histories",
+					description:
+						"By default, git merge command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added",
+				},
+				{
+					name: "--all",
+					description: "Fetch all remotes",
+				},
+				{
+					name: ["-a", "--append"],
+					description:
+						"Append ref names and object names of fetched refs to the existing contents of .git/FETCH_HEAD",
+				},
+				{
+					name: "--atomic",
+					description:
+						"Use an atomic transaction to update local refs. Either all refs are updated, or on error, no refs are updated",
+				},
+				{
+					name: "--depth",
+					requiresSeparator: true,
+					args: {
+						name: "depth",
+					},
+					description:
+						"Limit fetching to the specified number of commits from the tip of each remote branch history",
+				},
+				{
+					name: "--deepen",
+					requiresSeparator: true,
+					args: {
+						name: "depth",
+					},
+					description:
+						"Similar to --depth, except it specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history",
+				},
+				{
+					name: "--shallow-since",
+					requiresSeparator: true,
+					args: {
+						name: "date",
+					},
+					description:
+						"Deepen or shorten the history of a shallow repository to include all reachable commits after <date>",
+				},
+				{
+					name: "--shallow-exclude",
+					requiresSeparator: true,
+					args: {
+						name: "revision",
+					},
+					description:
+						"Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag. This option can be specified multiple times",
+				},
+				{
+					name: "--unshallow",
+					description:
+						"If the source repository is shallow, fetch as much as possible so that the current repository has the same history as the source repository",
+				},
+				{
+					name: "--update-shallow",
+					description:
+						"By default when fetching from a shallow repository, git fetch refuses refs that require updating .git/shallow",
+				},
+				{
+					name: "--negotiation-tip",
+					requiresSeparator: true,
+					args: {
+						name: "commit|glob",
+						generators: gitGenerators.commits,
+					},
+					description:
+						"By default, Git will report, to the server, commits reachable from all local refs to find common commits in an attempt to reduce the size of the to-be-received packfile",
+				},
+				{
+					name: "--dry-run",
+					description: "Show what would be done, without making any changes",
+				},
+				{
+					name: ["-f", "--force"],
+					description: "This option overrides that check",
+				},
+				{
+					name: ["-k", "--keep"],
+					description: "Keep downloaded pack",
+				},
+				{
+					name: ["-p", "--prune"],
+					description:
+						"Before fetching, remove any remote-tracking references that no longer exist on the remote",
+				},
+				{
+					name: ["-P", "--prune-tags"],
+					description:
+						"Before fetching, remove any local tags that no longer exist on the remote if --prune is enabled",
+				},
+				{
+					name: "--no-tags",
+					description:
+						"By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following",
+				},
+				{
+					name: "--refmap",
+					requiresSeparator: true,
+					args: {
+						name: "refspec",
+					},
+					description:
+						"When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository",
+				},
+				{
+					name: ["-t", "--tags"],
+					description:
+						"By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following",
+				},
+				{
+					name: "--recurse-submodules",
+					requiresSeparator: true,
+					args: {
+						name: "mode",
+						isOptional: true,
+						suggestions: ["yes", "on-demand", "no"],
+					},
+					description:
+						"When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository",
+				},
+				{
+					name: "--no-recurse-submodules",
+					description:
+						"Disable recursive fetching of submodules (this has the same effect as using the --recurse-submodules=no option)",
+				},
+				{
+					name: ["-j", "--jobs"],
+					args: {
+						name: "n",
+					},
+					description:
+						"Number of parallel children to be used for all forms of fetching",
+				},
+				{
+					name: "--set-upstream",
+					description:
+						"If the remote is fetched successfully, add upstream (tracking) reference, used by argument-less git-pull[1] and other commands",
+				},
+				{
+					name: "--upload-pack",
+					args: {
+						name: "upload-pack",
+					},
+					description:
+						"When given, and the repository to fetch from is handled by git fetch-pack, --exec=<upload-pack> is passed to the command to specify non-default path for the command run on the other end",
+				},
+				{
+					name: "--progress",
+					description:
+						"Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified",
+				},
+				{
+					name: ["-o", "--server-option"],
+					args: {
+						name: "option",
+					},
+					description:
+						"Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character",
+				},
+				{
+					name: "--show-forced-updates",
+					description:
+						"By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs",
+				},
+				{
+					name: "--no-show-forced-updates",
+					description:
+						"By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons",
+				},
+				{
+					name: ["-4", "--ipv4"],
+					description: "Use IPv4 addresses only, ignoring IPv6 addresses",
+				},
+				{
+					name: ["-6", "--ipv6"],
+					description: "Use IPv6 addresses only, ignoring IPv4 addresses",
+				},
+			],
+			args: [
+				{
+					name: "remote",
+					isOptional: true,
+					generators: gitGenerators.remotes,
+					filterStrategy: "fuzzy",
+				},
+				{
+					name: "branch",
+					isOptional: true,
+					generators: gitGenerators.localBranches,
+					filterStrategy: "fuzzy",
+				},
+			],
+		},
+		{
+			name: "diff",
+			description: "Show changes between commits, commit and working tree, etc",
+			options: [
+				{
+					name: "--staged",
+					description:
+						"Show difference between the files in the staging area and the latest version",
+				},
+				{
+					name: "--cached",
+					description: "Show difference between staged changes and last commit",
+				},
+				{
+					name: "--help",
+					description: "Shows different options",
+				},
+				{
+					name: "--numstat",
+					description:
+						"Shows number of added and deleted lines in decimal notation",
+				},
+				{
+					name: "--name-only",
+					description: "Show only names of changed files",
+				},
+				{
+					name: "--shortstat",
+					description:
+						"Output only the last line of the --stat format containing total number of modified files",
+				},
+				{
+					name: "--stat",
+					description: "Generate a diffstat",
+					requiresSeparator: true,
+					args: {
+						isOptional: true,
+						name: "[=< width >[,< name-width >[,< count >]]]",
+					},
+				},
+				{
+					name: "--",
+					description:
+						"Separates paths from options for disambiguation purposes",
+					args: {
+						isVariadic: true,
+						optionsCanBreakVariadicArg: false,
+						template: "filepaths",
+						name: "[< path >...]",
+					},
+				},
+			],
+			args: {
+				name: "commit or file",
+				isOptional: true,
+				isVariadic: true,
+				suggestions: headSuggestions,
+				generators: [
+					gitGenerators.commits,
+					gitGenerators.remoteLocalBranches,
+					gitGenerators.getChangedTrackedFiles,
+				],
+			},
+		},
+		{
+			name: "reset",
+			description: "Reset current HEAD to the specified state",
+			options: [
+				{
+					name: "--keep",
+					description:
+						"Safe: files which are different between the current HEAD and the given commit. Will abort if there are uncommitted changes",
+				},
+				{
+					name: "--soft",
+					description:
+						"Remove the last commit from the current branch, but the file changes will stay in your working tree",
+				},
+				{
+					name: "--hard",
+					description:
+						"⚠️WARNING: you will lose all uncommitted changes in addition to the changes introduced in the last commit",
+				},
+				{
+					name: "--mixed",
+					description:
+						"Keep the changes in your working tree but not on the index",
+				},
+				{
+					name: "-N",
+					description: "Mark removed paths as intent-to-add",
+					dependsOn: ["--mixed"],
+				},
+				{
+					name: "--merge",
+					description:
+						"Resets the index and updates the files in the working tree that are different" +
+						" between 'commit' and HEAD",
+				},
+				{
+					name: ["-q", "--quiet"],
+					description: "Be quiet, only report errors",
+					exclusiveOn: ["--no-quiet"],
+				},
+				{
+					name: "--no-quiet",
+					description: "Inverse of --quiet",
+					exclusiveOn: ["-q", "--quiet"],
+				},
+				{
+					name: "--pathspec-from-file",
+					requiresSeparator: true,
+					description:
+						"Pathspec is passed in file <file> instead of commandline args",
+					args: {
+						name: "file",
+						template: ["folders", "filepaths"],
+						suggestions: ["-"],
+					},
+				},
+				{
+					name: "--pathspec-file-nul",
+					description: "Pathspec elements are separated with NUL character",
+					dependsOn: ["--pathspec-from-file"],
+				},
+				{
+					name: ["-p", "--patch"],
+					description:
+						"Interactively select hunks in the difference between the index and <tree-ish>",
+				},
+			],
+			args: {
+				isOptional: true,
+				isVariadic: true,
+				suggestions: headSuggestions,
+				generators: [
+					gitGenerators.treeish,
+					gitGenerators.commits,
+					gitGenerators.remoteLocalBranches,
+				],
+			},
+		},
+		{
+			name: "log",
+			description: "Show commit logs",
+			options: [
+				{
+					name: "--follow",
+					description: "Show history of given file",
+					args: {
+						name: "file",
+						template: "filepaths",
+					},
+				},
+				{
+					name: ["-q", "--quiet"],
+					description: "Suppress diff output",
+				},
+				{
+					name: "--show-signature",
+					description: "Check the validity of a signed commit",
+				},
+				{
+					name: "--source",
+					description: "Show source",
+				},
+				{
+					name: "--oneline",
+					description: "Show each commit as a single line",
+				},
+				{
+					name: ["-p", "-u", "--patch"],
+					description: "Display the full diff of each commit",
+				},
+				{
+					name: "--stat",
+					description:
+						"Include which files were altered and the relative number of lines that were added or deleted from each of them",
+				},
+				{
+					name: "--grep",
+					description:
+						"Search for commits with a commit message that matches <pattern>",
+					requiresSeparator: true,
+					args: {
+						name: "pattern",
+					},
+				},
+				{
+					name: "--author",
+					description: "Search for commits by a particular author",
+					requiresSeparator: true,
+					args: {
+						name: "pattern",
+					},
+				},
+			],
+			args: [
+				{
+					name: "since",
+					isOptional: true,
+					description: "Commit ID, branch name, HEAD, or revision reference",
+					generators: gitGenerators.commits,
+					suggestions: headSuggestions,
+				},
+				{
+					name: "until",
+					isOptional: true,
+					description: "Commit ID, branch name, HEAD, or revision reference",
+					generators: gitGenerators.commits,
+					suggestions: headSuggestions,
+				},
+			],
+		},
+		{
+			name: "remote",
+			description: "Manage remote repository",
+			subcommands: [
+				{
+					name: "add",
+					description: "Add a remote named <name> for the repository at <url>",
+					args: [{ name: "name" }, { name: "repository url" }],
+					options: [
+						{
+							name: "-t",
+							description: "A refspec to track only <branch> is created",
+							args: {
+								name: "branch",
+							},
+						},
+						{
+							name: "-m",
+							description:
+								"A symbolic-ref refs/remotes/<name>/HEAD is set up to point at remote’s <master> branch",
+							args: {
+								name: "master",
+							},
+						},
+						{
+							name: "-f",
+							description:
+								"Git fetch <name> is run immediately after the remote information is set up",
+						},
+						{
+							name: "--tags",
+							description:
+								"Git fetch <name> imports every tag from the remote repository",
+						},
+						{
+							name: "--no-tags",
+							description:
+								"Git fetch <name> does not import tags from the remote repository",
+						},
+						{
+							name: "--mirror",
+							requiresSeparator: true,
+							description: "Create fetch or push mirror",
+							args: {
+								suggestions: ["fetch", "push"],
+							},
+						},
+					],
+				},
+				{
+					name: "set-head",
+					description: "Sets or deletes the default branch",
+					args: [
+						{
+							name: "name",
+							generators: gitGenerators.remotes,
+							filterStrategy: "fuzzy",
+						},
+						{
+							name: "branch",
+							isOptional: true,
+						},
+					],
+					options: [
+						{
+							name: ["--auto", "-a"],
+							description:
+								"The remote is queried to determine its HEAD, then the symbolic-ref refs/remotes/<name>/HEAD is set to the same branch",
+						},
+						{
+							name: ["--delete", "-d"],
+							description:
+								"The symbolic ref refs/remotes/<name>/HEAD is deleted",
+						},
+					],
+				},
+				{
+					name: "set-branches",
+					description:
+						"Changes the list of branches tracked by the named remote. This can be used to track a subset of the available remote branches after the initial setup for a remote",
+					options: [
+						{
+							name: "--add",
+							description:
+								"Instead of replacing the list of currently tracked branches, adds to that list",
+						},
+					],
+					args: [
+						{
+							name: "name",
+							generators: gitGenerators.remotes,
+							filterStrategy: "fuzzy",
+						},
+						{
+							name: "branch",
+							isVariadic: true,
+						},
+					],
+				},
+				{
+					name: ["rm", "remove"],
+					description: "Removes given remote [name]",
+					args: {
+						name: "remote",
+						generators: gitGenerators.remotes,
+						filterStrategy: "fuzzy",
+					},
+				},
+				{
+					name: "rename",
+					description: "Removes given remote [name]",
+					args: [
+						{
+							name: "old remote",
+							generators: gitGenerators.remotes,
+							filterStrategy: "fuzzy",
+						},
+						{
+							name: "new remote name",
+						},
+					],
+				},
+				{
+					name: "get-url",
+					description: "Retrieves the URLs for a remote",
+					options: [
+						{
+							name: "--push",
+							description: "Push URLs are queried rather than fetch URLs",
+						},
+						{
+							name: "--all",
+							description: "All URLs for the remote will be listed",
+						},
+					],
+					args: {
+						name: "name",
+						generators: gitGenerators.remotes,
+						filterStrategy: "fuzzy",
+					},
+				},
+				{
+					name: "set-url",
+					description: "Changes the URLs for the remote",
+					args: [
+						{
+							name: "name",
+							generators: gitGenerators.remotes,
+							filterStrategy: "fuzzy",
+						},
+						{
+							name: "newurl",
+						},
+						{
+							name: "oldurl",
+							isOptional: true,
+						},
+					],
+					options: [
+						{
+							name: "--push",
+							description: "Push URLs are manipulated instead of fetch URLs",
+						},
+						{
+							name: "--add",
+							description:
+								"Instead of changing existing URLs, new URL is added",
+						},
+						{
+							name: "--delete",
+							description:
+								"Instead of changing existing URLs, all URLs matching regex <url> are deleted for remote <name>",
+						},
+					],
+				},
+				{
+					name: "show",
+					description: "Gives some information about the remote [name]",
+					args: {
+						name: "name",
+						isVariadic: true,
+						generators: gitGenerators.remotes,
+						filterStrategy: "fuzzy",
+					},
+					options: [
+						{
+							name: "-n",
+							description:
+								"The remote heads are not queried first with git ls-remote <name>; cached information is used instead",
+						},
+					],
+				},
+				{
+					name: "prune",
+					description:
+						"Equivalent to git fetch --prune [name], except that no new references will be fetched",
+					args: {
+						name: "name",
+						isVariadic: true,
+						generators: gitGenerators.remotes,
+						filterStrategy: "fuzzy",
+					},
+					options: [
+						{
+							name: "-n",
+						},
+						{
+							name: "--dry-run",
+							description:
+								"Report what branches would be pruned, but do not actually prune them",
+						},
+					],
+				},
+				{
+					name: "update",
+					description:
+						"Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>",
+					options: [
+						{
+							name: ["-p", "--prune"],
+							description: "",
+						},
+					],
+					args: [
+						{
+							name: "group",
+							isOptional: true,
+							isVariadic: true,
+						},
+						{
+							name: "remote",
+							isOptional: true,
+							isVariadic: true,
+						},
+					],
+				},
+			],
+			options: [
+				{
+					name: ["-v", "--verbose"],
+					description:
+						"Be a little more verbose and show remote url after name. NOTE: This must be placed between remote and subcommand",
+				},
+			],
+		},
+		{
+			name: "fetch",
+			description: "Download objects and refs from another repository",
+			args: [
+				{
+					name: "remote",
+					isOptional: true,
+					generators: gitGenerators.remotes,
+					filterStrategy: "fuzzy",
+				},
+				{
+					name: "branch",
+					isOptional: true,
+					generators: gitGenerators.localBranches,
+					filterStrategy: "fuzzy",
+				},
+				{
+					name: "refspec",
+					isOptional: true,
+				},
+			],
+			options: [
+				{
+					name: "--all",
+					description: "Fetch all remotes",
+				},
+				{
+					name: ["-a", "--append"],
+					description:
+						"Append ref names and object names of fetched refs to the existing contents of .git/FETCH_HEAD",
+				},
+				{
+					name: "--atomic",
+					description:
+						"Use an atomic transaction to update local refs. Either all refs are updated, or on error, no refs are updated",
+				},
+				{
+					name: "--depth",
+					requiresSeparator: true,
+					args: {
+						name: "depth",
+					},
+					description:
+						"Limit fetching to the specified number of commits from the tip of each remote branch history",
+				},
+				{
+					name: "--deepen",
+					requiresSeparator: true,
+					args: {
+						name: "depth",
+					},
+					description:
+						"Similar to --depth, except it specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history",
+				},
+				{
+					name: "--shallow-since",
+					requiresSeparator: true,
+					args: {
+						name: "date",
+					},
+					description:
+						"Deepen or shorten the history of a shallow repository to include all reachable commits after <date>",
+				},
+				{
+					name: "--shallow-exclude",
+					requiresSeparator: true,
+					args: {
+						name: "revision",
+					},
+					description:
+						"Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag. This option can be specified multiple times",
+				},
+				{
+					name: "--unshallow",
+					description:
+						"If the source repository is shallow, fetch as much as possible so that the current repository has the same history as the source repository",
+				},
+				{
+					name: "--update-shallow",
+					description:
+						"By default when fetching from a shallow repository, git fetch refuses refs that require updating .git/shallow",
+				},
+				{
+					name: "--negotiation-tip",
+					requiresSeparator: true,
+					args: {
+						name: "commit|glob",
+						generators: gitGenerators.commits,
+					},
+					description:
+						"By default, Git will report, to the server, commits reachable from all local refs to find common commits in an attempt to reduce the size of the to-be-received packfile",
+				},
+				{
+					name: "--dry-run",
+					description: "Show what would be done, without making any changes",
+				},
+				{
+					name: "--write-fetch-head",
+					description:
+						"Write the list of remote refs fetched in the FETCH_HEAD file directly under $GIT_DIR. This is the default",
+				},
+				{
+					name: "--no-write-fetch-head",
+					description: "Tells Git not to write the file",
+				},
+				{
+					name: ["-f", "--force"],
+					description: "This option overrides that check",
+				},
+				{
+					name: ["-k", "--keep"],
+					description: "Keep downloaded pack",
+				},
+				{
+					name: "--multiple",
+					description:
+						"Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified",
+				},
+				{
+					name: ["--auto-maintenance", "--auto-gc"],
+					description:
+						"Run git maintenance run --auto at the end to perform automatic repository maintenance if",
+				},
+				{
+					name: ["--no-auto-maintenance", "--no-auto-gc"],
+					description:
+						"Don't run git maintenance run --auto at the end to perform automatic repository maintenance",
+				},
+				{
+					name: "--write-commit-graph",
+					description:
+						"Write a commit-graph after fetching. This overrides the config setting fetch.writeCommitGraph",
+				},
+				{
+					name: "--no-write-commit-graph",
+					description:
+						"Don't write a commit-graph after fetching. This overrides the config setting fetch.writeCommitGraph",
+				},
+				{
+					name: ["-p", "--prune"],
+					description:
+						"Before fetching, remove any remote-tracking references that no longer exist on the remote",
+				},
+				{
+					name: ["-P", "--prune-tags"],
+					description:
+						"Before fetching, remove any local tags that no longer exist on the remote if --prune is enabled",
+				},
+				{
+					name: ["-n", "--no-tags"],
+					description:
+						"By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following",
+				},
+				{
+					name: "--refmap",
+					requiresSeparator: true,
+					args: {
+						name: "refspec",
+					},
+					description:
+						"When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository",
+				},
+				{
+					name: ["-t", "--tags"],
+					description:
+						"By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following",
+				},
+				{
+					name: "--recurse-submodules",
+					requiresSeparator: true,
+					args: {
+						name: "mode",
+						isOptional: true,
+						suggestions: ["yes", "on-demand", "no"],
+					},
+					description:
+						"When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of remote.*.fetch configuration variables for the remote repository",
+				},
+				{
+					name: ["-j", "--jobs"],
+					args: {
+						name: "n",
+					},
+					description:
+						"Number of parallel children to be used for all forms of fetching",
+				},
+				{
+					name: "--no-recurse-submodules",
+					description:
+						"Disable recursive fetching of submodules (this has the same effect as using the --recurse-submodules=no option)",
+				},
+				{
+					name: "--set-upstream",
+					description:
+						"If the remote is fetched successfully, add upstream (tracking) reference, used by argument-less git-pull[1] and other commands",
+				},
+				{
+					name: "--submodule-prefix",
+					requiresSeparator: true,
+					args: {
+						name: "path",
+					},
+					description:
+						'Prepend <path> to paths printed in informative messages such as ”Fetching submodule foo". This option is used internally when recursing over submodules',
+				},
+				{
+					name: "--recurse-submodules-default",
+					requiresSeparator: true,
+					args: {
+						name: "mode",
+						isOptional: true,
+						suggestions: ["yes", "on-demand"],
+					},
+					description:
+						"This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option",
+				},
+				{
+					name: ["-u", "--update-head-ok"],
+					description:
+						"By default git fetch refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for git pull to communicate with git fetch, and unless you are implementing your own Porcelain you are not supposed to use it",
+				},
+				{
+					name: "--upload-pack",
+					args: {
+						name: "upload-pack",
+					},
+					description:
+						"When given, and the repository to fetch from is handled by git fetch-pack, --exec=<upload-pack> is passed to the command to specify non-default path for the command run on the other end",
+				},
+				{
+					name: ["-q", "--quiet"],
+					description:
+						"Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream",
+				},
+				{
+					name: ["-v", "--verbose"],
+					description: "Be verbose",
+				},
+				{
+					name: "--progress",
+					description:
+						"Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified",
+				},
+				{
+					name: ["-o", "--server-option"],
+					args: {
+						name: "option",
+					},
+					description:
+						"Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character",
+				},
+				{
+					name: "--show-forced-updates",
+					description:
+						"By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs",
+				},
+				{
+					name: "--no-show-forced-updates",
+					description:
+						"By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons",
+				},
+				{
+					name: ["-4", "--ipv4"],
+					description: "Use IPv4 addresses only, ignoring IPv6 addresses",
+				},
+				{
+					name: ["-6", "--ipv6"],
+					description: "Use IPv6 addresses only, ignoring IPv4 addresses",
+				},
+				{
+					name: "--stdin",
+					description:
+						'Read refspecs, one per line, from stdin in addition to those provided as arguments. The "tag <name>" format is not supported',
+				},
+			],
+		},
+		{
+			name: "stash",
+			description: "Temporarily stores all the modified tracked files",
+			requiresSubcommand: false,
+			subcommands: [
+				{
+					name: "push", // TODO: support for no subcommand is missing
+					description:
+						"Save your local modifications to a new stash entry and roll them back to HEAD",
+					options: [
+						{
+							name: ["-p", "--patch"],
+							description:
+								"Interactively select hunks from the diff between HEAD and the working tree to be stashed",
+						},
+						{
+							name: ["-k", "--keep-index"],
+							description:
+								"All changed already added to the index are left intact",
+						},
+						{
+							name: ["-u", "--include-untracked"],
+							description:
+								"All untracked files are also stashed and then cleaned up",
+						},
+						{
+							name: ["-a", "--all"],
+							description: "All ignored and untracked files are also stashed",
+						},
+						{
+							name: ["-q", "--quiet"],
+							description: "Quiet, suppress feedback messages",
+						},
+						{
+							name: ["-m", "--message"],
+							insertValue: "-m {cursor}",
+							description: "Use the given <msg> as the stash message",
+							args: {
+								name: "message",
+							},
+						},
+						{ name: "--pathspec-from-file", description: "" }, // TODO: pathspec file nul and add description
+						{
+							name: "--",
+							description:
+								"Separates pathsec from options for disambiguation purposes",
+						},
+						// TODO: pathspec
+					],
+				},
+				{
+					name: "show",
+					description: "Show the changes recorded in the stash entry as a diff",
+					args: {
+						name: "stash",
+						isOptional: true,
+						generators: gitGenerators.stashes,
+						filterStrategy: "fuzzy",
+					},
+				},
+				{
+					name: "save",
+					description: "Temporarily stores all the modified tracked files",
+					options: [
+						{
+							name: ["-p", "--patch"],
+							description:
+								"Interactively select hunks from the diff between HEAD and the working tree to be stashed",
+						},
+						{
+							name: ["-k", "--keep-index"],
+							description:
+								"All changed already added to the index are left intact",
+						},
+						{
+							name: ["-u", "--include-untracked"],
+							description:
+								"All untracked files are also stashed and then cleaned up",
+						},
+						{
+							name: ["-a", "--all"],
+							description: "All ignored and untracked files are also stashed",
+						},
+						{
+							name: ["-q", "--quiet"],
+							description: "Quiet, suppress feedback messages",
+						},
+					],
+					args: {
+						name: "message",
+						isOptional: true,
+					},
+				},
+				{
+					name: "pop",
+					description: "Restores the most recently stashed files",
+					options: [
+						{
+							name: "--index",
+							description:
+								"Tries to reinstate not only the working tree's changes, but also the index's ones",
+						},
+						{
+							name: ["-q", "--quiet"],
+							description: "Quiet, suppress feedback messages",
+						},
+					],
+					args: {
+						name: "stash",
+						isOptional: true,
+						generators: gitGenerators.stashes,
+						filterStrategy: "fuzzy",
+					},
+				},
+				{
+					name: "list",
+					description: "Lists all stashed changesets",
+				},
+				{
+					name: "drop",
+					description: "Discards the most recently stashed changeset",
+					options: [
+						{
+							name: ["-q", "--quiet"],
+							description: "Quiet, suppress feedback messages",
+						},
+					],
+					args: {
+						name: "stash",
+						isOptional: true,
+						generators: gitGenerators.stashes,
+						filterStrategy: "fuzzy",
+					},
+				},
+				{
+					name: "clear",
+					description: "Remove all the stash entries",
+				},
+				{
+					name: "apply",
+					description:
+						"Like pop, but do not remove the state from the stash list",
+					options: [
+						{
+							name: "--index",
+							description:
+								"Tries to reinstate not only the working tree's changes, but also the index's ones",
+						},
+						{
+							name: ["-q", "--quiet"],
+							description: "Quiet, suppress feedback messages",
+						},
+					],
+					args: {
+						name: "stash",
+						isOptional: true,
+						generators: gitGenerators.stashes,
+						filterStrategy: "fuzzy",
+					},
+				},
+				{
+					name: "branch",
+					description: "Creates and checks out a new branch named",
+					insertValue: "branch {cursor}",
+					args: [
+						{
+							name: "branch",
+							generators: gitGenerators.localBranches,
+							filterStrategy: "fuzzy",
+						},
+						{
+							name: "stash",
+							isOptional: true,
+							generators: gitGenerators.stashes,
+							filterStrategy: "fuzzy",
+						},
+					],
+				},
+				{
+					name: "create",
+					description: "Creates a stash entry",
+					args: {
+						name: "message",
+						isOptional: true,
+					},
+				},
+				{
+					name: "store",
+					description:
+						"Store a given stash in the stash ref, updating the stash reflog",
+					options: [
+						{
+							name: ["-m", "--message"],
+							insertValue: "-m {cursor}",
+							description: "Use the given <msg> as the stash message",
+							args: {
+								name: "message",
+							},
+						},
+						{
+							name: ["-q", "--quiet"],
+							description: "Quiet, suppress feedback messages",
+						},
+					],
+					args: [
+						{
+							name: "message",
+						},
+						{
+							name: "commit",
+							generators: gitGenerators.commits,
+						},
+					],
+				},
+			],
+		},
+		{
+			name: "reflog",
+			description: "Show history of events with hashes",
+			options: [
+				{
+					name: "--relative-date",
+					description: "Show date info",
+				},
+				{
+					name: "--all",
+					description: "Show all refs",
+				},
+			],
+		},
+		{
+			name: "clone",
+			description: "Clone a repository into a new directory",
+			args: [
+				{
+					name: "repository",
+					description: "Git library to be cloned",
+				},
+				{
+					name: "directory",
+					description: "Specify the new directory name or target folder",
+					template: "folders",
+					isOptional: true,
+				},
+			],
+			options: [
+				{
+					name: ["-l", "--local"],
+					description: "Bypasses the normal git aware transport mechanism",
+				},
+				{
+					name: "--no-hardlinks",
+					description:
+						"Force the cloning process from a repository on a local filesystem to copy the files under the .git/objects directory instead of using hardlinks",
+				},
+				{
+					name: ["-s", "--shared"],
+					isDangerous: true,
+					description:
+						"Automatically setup .git/objects/info/alternates to share the objects with the source repository",
+				},
+				{
+					name: "--dry-run",
+					description: "Do nothing; only show what would happen",
+				},
+				{
+					name: "--reference",
+					description:
+						"If the reference repository is on the local machine, automatically setup",
+					args: {
+						name: "repository",
+					},
+				},
+				{
+					name: "--reference-if-able",
+					description:
+						"If the reference repository is on the local machine, automatically setup. Non existing directory is skipped with a warning",
+					args: {
+						name: "repository",
+					},
+				},
+				{
+					name: "--dissociate",
+					description:
+						"Borrow the objects from reference repositories specified with the --reference options only to reduce network transfer, and stop borrowing from them after a clone is made by making necessary local copies of borrowed objects",
+				},
+				{
+					name: ["-q", "--quiet"],
+					description:
+						"Operate quietly. Progress is not reported to the standard error stream",
+				},
+				{
+					name: ["-v", "--verbose"],
+					description:
+						"Run verbosely. Does not affect the reporting of progress status to the standard error stream",
+				},
+				{
+					name: "--progress",
+					description:
+						"Progress status is reported on the standard error stream by default when it is attached to a terminal, unless --quiet is specified. This flag forces progress status even if the standard error stream is not directed to a terminal",
+				},
+				{
+					name: "--server-option",
+					description:
+						"Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server’s handling of server options, including unknown ones, is server-specific. When multiple --server-option=<option> are given, they are all sent to the other side in the order listed on the command line",
+					requiresSeparator: true,
+					args: {
+						name: "option",
+					},
+				},
+				{
+					name: ["-n", "--no-checkout"],
+					description:
+						"No checkout of HEAD is performed after the clone is complete",
+				},
+				{
+					name: "--bare",
+					description:
+						"Make a bare Git repository. That is, instead of creating <directory> and placing the administrative files in <directory>/.git, make the <directory> itself the $GIT_DIR. This obviously implies the --no-checkout because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to refs/remotes/origin/. When this option is used, neither remote-tracking branches nor the related configuration variables are created",
+				},
+				{
+					name: "--sparse",
+					description:
+						"Initialize the sparse-checkout file so the working directory starts with only the files in the root of the repository. The sparse-checkout file can be modified to grow the working directory as needed",
+				},
+				{
+					name: "--filter",
+					description:
+						"Use the partial clone feature and request that the server sends a subset of reachable objects according to a given object filter. When using --filter, the supplied <filter-spec> is used for the partial clone filter. For example, --filter=blob:none will filter out all blobs (file contents) until needed by Git. Also, --filter=blob:limit=<size> will filter out all blobs of size at least <size>. For more details on filter specifications, see the --filter option in git-rev-list[1]",
+					requiresSeparator: true,
+					args: { name: "filter spec" },
+				},
+				{
+					name: "--mirror",
+					description:
+						"Set up a mirror of the source repository. This implies --bare. Compared to --bare, --mirror not only maps local branches of the source to local branches of the target, it maps all refs (including remote-tracking branches, notes etc.) and sets up a refspec configuration such that all these refs are overwritten by a git remote update in the target repository",
+				},
+				{
+					name: ["-o", "--origin"],
+					description:
+						"Instead of using the remote name origin to keep track of the upstream repository, use <name>. Overrides clone.defaultRemoteName from the config",
+					args: { name: "name" },
+				},
+				{
+					name: ["-b", "--branch"],
+					description:
+						"Instead of pointing the newly created HEAD to the branch pointed to by the cloned repository’s HEAD, point to <name> branch instead. In a non-bare repository, this is the branch that will be checked out. --branch can also take tags and detaches the HEAD at that commit in the resulting repository",
+					args: { name: "branch name" },
+				},
+				{
+					name: ["-u", "--upload-pack"],
+					description:
+						"When given, and the repository to clone from is accessed via ssh, this specifies a non-default path for the command run on the other end",
+					args: {
+						name: "upload pack",
+					},
+				},
+				{
+					name: "--template",
+					description:
+						"Specify the directory from which templates will be used",
+					requiresSeparator: true,
+					args: {
+						name: "template directory",
+					},
+				},
+				{
+					name: ["-c", "--config"],
+					description:
+						"Set a configuration variable in the newly-created repository; this takes effect immediately after the repository is initialized, but before the remote history is fetched or any files checked out. The key is in the same format as expected by git-config[1] (e.g., core.eol=true). If multiple values are given for the same key, each value will be written to the config file. This makes it safe, for example, to add additional fetch refspecs to the origin remote. Due to limitations of the current implementation, some configuration variables do not take effect until after the initial fetch and checkout. Configuration variables known to not take effect are: remote.<name>.mirror and remote.<name>.tagOpt. Use the corresponding --mirror and --no-tags options instead",
+					args: { name: "key=value" },
+				},
+				{
+					name: "--depth",
+					description:
+						"Create a shallow clone with a history truncated to the specified number of commits. Implies --single-branch unless --no-single-branch is given to fetch the histories near the tips of all branches. If you want to clone submodules shallowly, also pass --shallow-submodules",
+					args: {
+						name: "depth",
+					},
+				},
+				{
+					name: "--shallow-since",
+					description:
+						"Create a shallow clone with a history after the specified time",
+					requiresSeparator: true,
+					args: {
+						name: "date",
+					},
+				},
+				{
+					name: "--shallow-exclude",
+					description:
+						"Create a shallow clone with a history, excluding commits reachable from a specified remote branch or tag. This option can be specified multiple times",
+					requiresSeparator: true,
+					args: {
+						name: "revision",
+					},
+				},
+				{
+					name: "--single-branch",
+					description:
+						"Clone only the history leading to the tip of a single branch, either specified by the --branch option or the primary branch remote’s HEAD points at. Further fetches into the resulting repository will only update the remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any branch when --single-branch clone was made, no remote-tracking branch is created",
+				},
+				{
+					name: "--no-single-branch",
+					description:
+						"Do not clone only the history leading to the tip of a single branch, either specified by the --branch option or the primary branch remote’s HEAD points at. Further fetches into the resulting repository will only update the remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any branch when --single-branch clone was made, no remote-tracking branch is created",
+				},
+				{
+					name: "--no-tags",
+					description:
+						"Don’t clone any tags, and set remote.<remote>.tagOpt=--no-tags in the config, ensuring that future git pull and git fetch operations won’t follow any tags. Subsequent explicit tag fetches will still work, (see git-fetch[1])",
+				},
+				{
+					name: "--recurse-submodules",
+					description:
+						"After the clone is created, initialize and clone submodules within based on the provided pathspec. If no pathspec is provided, all submodules are initialized and cloned. This option can be given multiple times for pathspecs consisting of multiple entries",
+					args: {
+						isOptional: true,
+						name: "pathspec",
+					},
+				},
+				{
+					name: "--shallow-submodules",
+					description:
+						"All submodules which are cloned will be shallow with a depth of 1",
+				},
+				{
+					name: "--no-shallow-submodules",
+					description: "Disable --shallow-submodules",
+				},
+				{
+					name: "--remote-submodules",
+					description:
+						"All submodules which are cloned will use the status of the submodule’s remote-tracking branch to update the submodule, rather than the superproject’s recorded SHA-1. Equivalent to passing --remote to git submodule update",
+				},
+				{
+					name: "--no-remote-submodules",
+					description: "Disable --remote-submodules",
+				},
+				{
+					name: ["-j", "--jobs"],
+					description:
+						"The number of submodules fetched at the same time. Defaults to the submodule.fetchJobs option",
+					args: {
+						name: "n",
+						isOptional: true,
+					},
+				},
+				{
+					name: "--separate-git-dir",
+					description:
+						"Instead of placing the cloned repository where it is supposed to be, place the cloned repository at the specified directory, then make a filesystem-agnostic Git symbolic link to there. The result is Git repository can be separated from working tree",
+					requiresSeparator: true,
+					args: {
+						name: "git dir",
+					},
+				},
+			],
+		},
+		{
+			name: "init",
+			description:
+				"Create an empty Git repository or reinitialize an existing one",
+			args: {
+				name: "directory",
+				isOptional: true,
+			},
+			options: [
+				{
+					name: ["-q", "--quiet"],
+					description: "Only print error and warning messages",
+				},
+				{
+					name: "--bare",
+					description: "Create a bare repository",
+				},
+				{
+					name: "--object-format",
+					description: "Specify the given object format",
+					args: {
+						name: "format",
+						suggestions: ["sha1", "sha256"],
+					},
+				},
+				{
+					name: "--template",
+					description:
+						"Specify the directory from which templates will be used",
+					args: {
+						name: "template_directory",
+						template: "folders",
+					},
+				},
+				{
+					name: "--separate-git-dir",
+					description:
+						"Instead of initializing the repository as a directory to either $GIT_DIR or ./.git/, create a text file there containing the path to the actual repository. This file acts as filesystem-agnostic Git symbolic link to the repository",
+					args: {
+						name: "git dir",
+					},
+				},
+				{
+					name: ["-b", "--initial-branch"],
+					description: "Initial branch for new repo",
+					args: {
+						isOptional: true,
+						name: "branch-name",
+					},
+				},
+				{
+					name: "--shared",
+					description:
+						"Specify that the Git repository is to be shared amongst several users. This allows users belonging to the same group to push into that repository",
+					args: {
+						isOptional: true,
+						suggestions: [
+							{
+								name: "false",
+								description: "Use permissions reported by umask(2)",
+							},
+							{
+								name: "true",
+								description: "Make the repository group-writable",
+							},
+							{
+								name: "umask",
+								description: "Use permissions reported by umask(2)",
+							},
+							{
+								name: "group",
+								description: "Make the repository group-writable",
+							},
+							{
+								name: "all",
+								description:
+									"Same as group, but make the repository readable by all users",
+							},
+							{
+								name: "world",
+								description:
+									"Same as group, but make the repository readable by all users",
+							},
+							{
+								name: "everybody",
+								description:
+									"Same as group, but make the repository readable by all users",
+							},
+							{
+								name: "0xxx",
+								description:
+									"0xxx is an octal number and each file will have mode 0xxx. 0xxx will override users' umask(2) value (and not only loosen permissions as group and all does)",
+							},
+						],
+					},
+				},
+			],
+		},
+		{
+			name: "mv",
+			description: "Move or rename a file, a directory, or a symlink",
+			args: [
+				{
+					name: "source",
+					description: "File to move",
+					template: "filepaths",
+				},
+				{
+					name: "destination",
+					description: "Location to move to",
+					template: "folders",
+				},
+			],
+			options: [
+				{
+					name: ["-f", "--force"],
+					description:
+						"Force renaming or moving of a file even if the target exists",
+				},
+				{
+					name: "-k",
+					description:
+						"Skip move or rename actions which would lead to an error condition",
+				},
+				{
+					name: ["-n", "--dry-run"],
+					description: "Do nothing; only show what would happen",
+				},
+				{
+					name: ["-v", "--verbose"],
+					description: "Report the names of files as they are moved",
+				},
+			],
+		},
+		{
+			name: "rm",
+			description: "Remove files from the working tree and from the index",
+			args: {
+				isVariadic: true,
+				suggestions: [
+					{
+						name: ".",
+						description: "Current directory",
+						icon: "fig://icon?type=folder",
+					},
+				],
+				generators: gitGenerators.files_for_staging,
+			},
+			options: [
+				{
+					name: "--",
+					description:
+						"Used to separate command-line options from the list of files",
+				},
+				{ name: "--cached", description: "Only remove from the index" },
+				{
+					name: ["-f", "--force"],
+					description: "Override the up-to-date check",
+				},
+				{
+					name: ["-n", "--dry-run"],
+					description:
+						"Don’t actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command",
+				},
+				{ name: "-r", description: "Allow recursive removal" },
+			],
+		},
+		{
+			name: "bisect",
+			description: "Use binary search to find the commit that introduced a bug",
+			subcommands: [
+				{
+					name: "start",
+					description: "Reset bisect state and start bisection",
+					args: [
+						{
+							name: "bad",
+							isOptional: true,
+							generators: gitGenerators.revs,
+							suggestions: headSuggestions,
+						},
+						{
+							name: "good",
+							isOptional: true,
+							generators: [gitGenerators.revs, gitGenerators.revs],
+							suggestions: headSuggestions,
+							isVariadic: true,
+						},
+					],
+					options: [
+						{
+							name: "--term-new",
+							description:
+								"Specify the alias to mark commits as new during the bisect process",
+							args: {
+								name: "term",
+								description:
+									"Specifying: fixed, would require using git bisect fixed instead of git bisect new",
+							},
+						},
+						{
+							name: "--term-bad",
+							description:
+								"Specify the alias to mark commits as bad during the bisect process",
+							args: {
+								name: "term",
+								description:
+									"Specifying: broken, would require using git bisect broken instead of git bisect bad",
+							},
+						},
+						{
+							name: "--term-good",
+							description:
+								"Specify the alias to mark commits as good during the bisect process",
+							args: {
+								name: "term",
+								description:
+									"Specifying: fixed, would require using git bisect fixed instead of git bisect good",
+							},
+						},
+						{
+							name: "--term-old",
+							description:
+								"Specify the alias to mark commits as old during the bisect process",
+							args: {
+								name: "term",
+								description:
+									"Specifying: broken, would require using git bisect broken instead of git bisect old",
+							},
+						},
+						{
+							name: "--no-checkout",
+							description:
+								"Do not checkout the new working tree at each iteration of the bisection process. Instead just update a special reference named BISECT_HEAD to make it point to the commit that should be tested",
+						},
+						{
+							name: "--first-parent",
+							description:
+								"Follow only the first parent commit upon seeing a merge commit. In detecting regressions introduced through the merging of a branch, the merge commit will be identified as introduction of the bug and its ancestors will be ignored",
+						},
+						{
+							name: "--",
+							description:
+								"Stop taking subcommand arguments and options. Starts taking paths to bisect",
+						},
+					],
+				},
+				{
+					name: "bad",
+					description: "Mark commits as bad",
+					args: {
+						name: "rev",
+						isOptional: true,
+						generators: gitGenerators.revs,
+						suggestions: headSuggestions,
+					},
+				},
+				{
+					name: "new",
+					description: "Mark commits as new",
+					args: {
+						name: "rev",
+						isOptional: true,
+						generators: gitGenerators.revs,
+						suggestions: headSuggestions,
+					},
+				},
+				{
+					name: "old",
+					description: "Mark commits as old",
+					args: {
+						name: "rev",
+						isOptional: true,
+						generators: gitGenerators.revs,
+						suggestions: headSuggestions,
+						isVariadic: true,
+					},
+				},
+				{
+					name: "good",
+					description: "Mark commits as good",
+					args: {
+						name: "rev",
+						isOptional: true,
+						generators: gitGenerators.revs,
+						suggestions: headSuggestions,
+						isVariadic: true,
+					},
+				},
+				{
+					name: "next",
+					description: "Find next bisection to test and check it out",
+				},
+				{
+					name: "terms",
+					description:
+						"Show the terms used for old and new commits (default: bad, good)",
+					options: [
+						{
+							name: "--term-old",
+							description: "You can get just the old (respectively new) term",
+						},
+						{
+							name: "--term-good",
+							description: "You can get just the old (respectively new) term",
+						},
+					],
+				},
+				{
+					name: "skip",
+					description: "Mark <rev>... untestable revisions",
+					args: {
+						name: "rev | range",
+						isVariadic: true,
+						isOptional: true,
+						generators: gitGenerators.revs,
+						suggestions: headSuggestions,
+					},
+				},
+				{
+					name: "reset",
+					description: "Finish bisection search and go back to commit",
+					args: {
+						name: "commit",
+						isOptional: true,
+						generators: gitGenerators.commits,
+						suggestions: headSuggestions,
+					},
+				},
+				{
+					name: ["visualize", "view"],
+					description: "See the currently remaining suspects in gitk",
+				},
+				{
+					name: "replay",
+					description: "Replay bisection log",
+					args: {
+						name: "logfile",
+						template: "filepaths",
+					},
+				},
+				{
+					name: "log",
+					description: "Show bisect log",
+				},
+				{
+					name: "run",
+					description: "Use <cmd>... to automatically bisect",
+					args: {
+						name: "cmd",
+						isVariadic: true,
+						isCommand: true,
+					},
+				},
+				{
+					name: "help",
+					args: {
+						name: "Get help text",
+					},
+				},
+			],
+			args: {
+				name: "paths",
+				template: ["filepaths", "folders"],
+			},
+		},
+		{ name: "grep", description: "Print lines matching a pattern" },
+		{ name: "show", description: "Show various types of objects" },
+		{
+			name: "branch",
+			description: "List, create, or delete branches",
+			options: [
+				{
+					name: ["-a", "--all"],
+					exclusiveOn: ["-r", "--remotes"],
+					description: "List both remote-tracking and local branches",
+				},
+				{
+					name: ["-d", "--delete"],
+					description: "Delete fully merged branch",
+					args: {
+						generators: gitGenerators.localOrRemoteBranches,
+						isVariadic: true,
+						suggestions: [
+							{
+								name: ["-r", "--remotes"],
+								description: "Deletes the remote-tracking branches",
+							},
+						],
+					},
+				},
+				{
+					name: "-D",
+					description: "Delete branch (even if not merged)",
+					args: {
+						generators: gitGenerators.localOrRemoteBranches,
+						isVariadic: true,
+						suggestions: [
+							{
+								name: ["-r", "--remotes"],
+								description: "Deletes the remote-tracking branches",
+							},
+						],
+					},
+				},
+				{
+					name: ["-m", "--move"],
+					description: "Move/rename a branch and its reflog",
+					args: [
+						{
+							generators: gitGenerators.localBranches,
+							filterStrategy: "fuzzy",
+						},
+						{
+							generators: gitGenerators.localBranches,
+							filterStrategy: "fuzzy",
+						},
+					],
+				},
+				{
+					name: "-M",
+					description: "Move/rename a branch, even if target exists",
+					args: [
+						{
+							generators: gitGenerators.localBranches,
+							filterStrategy: "fuzzy",
+						},
+						{
+							generators: gitGenerators.localBranches,
+							filterStrategy: "fuzzy",
+						},
+					],
+				},
+				{ name: ["-c", "--copy"], description: "Copy a branch and its reflog" },
+				{ name: "-C", description: "Copy a branch, even if target exists" },
+				{ name: ["-l", "--list"], description: "List branch names" },
+				{
+					name: "--create-reflog",
+					description: "Create the branch's reflog",
+				},
+				{
+					name: "--edit-description",
+					description: "Edit the description for the branch",
+					args: {
+						generators: gitGenerators.localBranches,
+						filterStrategy: "fuzzy",
+					},
+				},
+				{
+					name: ["-f", "--force"],
+					description: "Force creation, move/rename, deletion",
+				},
+				{
+					name: "--merged",
+					description: "Print only branches that are merged",
+					args: { name: "commit" },
+				},
+				{
+					name: "--no-merged",
+					description: "Print only branches that are not merged",
+					args: { name: "commit" },
+				},
+				{
+					name: "--column",
+					exclusiveOn: ["--no-column"],
+					description: "List branches in columns [=<style>]",
+				},
+				{
+					name: "--no-column",
+					exclusiveOn: ["--column"],
+					description: "Doesn't display branch listing in columns",
+				},
+				{
+					name: "--sort",
+					description: "Field name to sort on",
+					args: { name: "key" },
+				},
+				{
+					name: "--points-at",
+					description: "Print only branches of the object",
+					args: { name: "object" },
+				},
+				{
+					name: ["-i", "--ignore-case"],
+					description: "Sorting and filtering are case insensitive",
+				},
+				{
+					name: "--format",
+					description: "Format to use for the output",
+					args: { name: "format" },
+				},
+				{
+					name: ["-r", "--remotes"],
+					exclusiveOn: ["-a", "--all"],
+					description:
+						"Lists or deletes (if used with -d) the remote-tracking branches",
+				},
+				{
+					name: "--show-current",
+					description: "Prints the name of the current branch",
+				},
+				{
+					name: ["-v", "--verbose"],
+					isRepeatable: 2,
+					description:
+						"Shows sha1 and commit subject line for each head, along with relationship to upstream branch when in list mode. If given twice, prints the path of the linked worktree and the name of the upstream branch",
+				},
+				{
+					name: ["-q", "--quiet"],
+					description: "Suppress non-error messages",
+				},
+				{
+					name: "--abbrev",
+					description:
+						"Shows the shortest prefix that is at least <n> hexdigits long that uniquely refers the object",
+					exclusiveOn: ["--no-abbrev"],
+					args: {
+						name: "Number",
+					},
+				},
+				{
+					name: "--no-abbrev",
+					exclusiveOn: ["--abbrev"],
+					description: "Displays the full sha1s in the output listing",
+				},
+				{
+					name: ["-t", "--track"],
+					exclusiveOn: ["--no-track"],
+					description:
+						"When creating a new branch, set up 'upstream' configuration",
+					args: [
+						{
+							name: "branch",
+							generators: gitGenerators.localBranches,
+							filterStrategy: "fuzzy",
+						},
+						{
+							name: "start point",
+							isOptional: true,
+							generators: gitGenerators.commits,
+						},
+					],
+				},
+				{
+					name: "--no-track",
+					exclusiveOn: ["--track", "-t"],
+					description:
+						"Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true",
+					args: [
+						{
+							generators: gitGenerators.localBranches,
+							filterStrategy: "fuzzy",
+						},
+						{
+							isOptional: true,
+							generators: gitGenerators.localBranches,
+							filterStrategy: "fuzzy",
+						},
+					],
+				},
+				{
+					name: ["-u", "--set-upstream-to"],
+					description: "Sets branch to upstream provided",
+					args: {
+						name: "upstream",
+						isOptional: true,
+						generators: gitGenerators.localBranches,
+						filterStrategy: "fuzzy",
+					},
+				},
+				{
+					name: "--unset-upstream",
+					description: "Removes the upstream information",
+					args: {
+						name: "upstream",
+						isOptional: true,
+						generators: gitGenerators.localBranches,
+						filterStrategy: "fuzzy",
+					},
+				},
+				{
+					name: "--contains",
+					description: "Only lists branches which contain the specified commit",
+					args: {
+						name: "commit",
+						isOptional: true,
+						generators: gitGenerators.commits,
+					},
+				},
+				{
+					name: "--no-contains",
+					description:
+						"Only lists branches which don't contain the specified commit",
+					args: {
+						name: "commit",
+						isOptional: true,
+						generators: gitGenerators.commits,
+					},
+				},
+				{
+					name: "--color",
+					description:
+						"Color branches to highlight current, local, and remote-tracking branches",
+					exclusiveOn: ["--no-color"],
+					args: {
+						name: "when",
+						isOptional: true,
+						suggestions: ["always", "never", "auto"],
+					},
+				},
+				{
+					name: "--no-color",
+					description: "Turns off branch colors",
+					exclusiveOn: ["--color"],
+				},
+			],
+		},
+		{
+			name: "checkout",
+			description: "Switch branches or restore working tree files",
+			options: [
+				{
+					name: ["-q", "--quiet"],
+					description: "Quiet, suppress feedback messages",
+				},
+				{
+					name: "--progress",
+					description:
+						"Progress status is reported on the standard error stream by default when it is attached to a terminal, unless --quiet is specified. This flag enables progress reporting even if not attached to a terminal, regardless of --quiet",
+				},
+				{
+					name: "--no-progress",
+					description: "Disable progress status reporting",
+				},
+				{
+					name: ["-f", "--force"],
+					description:
+						"When switching branches, proceed even if the index or the working tree differs from HEAD. This is used to throw away local changes",
+				},
+				{
+					name: ["-2", "--ours"],
+					description:
+						"When checking out paths from the index, check out stage #2 (ours) for unmerged paths",
+				},
+				{
+					name: ["-3", "--theirs"],
+					description:
+						"When checking out paths from the index, check out stage #3 (theirs) for unmerged paths",
+				},
+				{
+					name: "-b",
+					description:
+						"Create a new branch named <new_branch> and start it at <start_point>; see git-branch[1] for details",
+					args: {
+						name: "New Branch",
+					},
+				},
+				{
+					name: "-B",
+					description:
+						"Creates the branch <new_branch> and start it at <start_point>; if it already exists, then reset it to <start_point>. This is equivalent to running 'git branch' with '-f'; see git-branch[1] for details",
+					args: {
+						name: "New Branch",
+					},
+				},
+				{
+					name: ["-t", "--track"],
+					description:
+						"When creating a new branch, set up 'upstream' configuration",
+				},
+				{
+					name: "--no-track",
+					description:
+						"Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true",
+				},
+				{
+					name: "--guess",
+					description:
+						"If <branch> is not found but there does exist a tracking branch in exactly one remote (call it <remote>) with a matching name, treat as equivalent to $ git checkout -b <branch> --track <remote>/<branch>",
+				},
+				{ name: "--no-guess", description: "Disable --guess" },
+				{
+					name: "-l",
+					description:
+						"Create the new branch’s reflog; see git-branch[1] for details",
+				},
+				{
+					name: ["-d", "--detach"],
+					description:
+						"Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments. This is the default behavior of git checkout <commit> when <commit> is not a branch name",
+				},
+				{
+					name: "--orphan",
+					description:
+						"Create a new orphan branch, named <new_branch>, started from <start_point> and switch to it",
+					args: {
+						name: "New Branch",
+					},
+				},
+				{
+					name: "--ignore-skip-worktree-bits",
+					description:
+						"In sparse checkout mode, git checkout -- <paths> would update only entries matched by <paths> and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and adds back any files in <paths>",
+				},
+				{
+					name: ["-m", "--merge"],
+					description:
+						"When switching branches, if you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context",
+				},
+				{
+					name: "--conflict",
+					description:
+						"The same as --merge option above, but changes the way the conflicting hunks are presented, overriding the merge.conflictStyle configuration variable. Possible values are 'merge' (default) and 'diff3' (in addition to what is shown by 'merge' style, shows the original contents)",
+					requiresSeparator: true,
+					args: {
+						isOptional: true,
+						suggestions: ["merge", "diff3"],
+					},
+				},
+				{
+					name: ["-p", "--patch"],
+					description:
+						"Interactively select hunks in the difference between the <tree-ish> (or the index, if unspecified) and the working tree",
+				},
+				{
+					name: "--ignore-other-worktrees",
+					description:
+						"Git checkout refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree",
+				},
+				{
+					name: "--overwrite-ignore",
+					description:
+						"Silently overwrite ignored files when switching branches. This is the default behavior",
+				},
+				{
+					name: "--no-overwrite-ignore",
+					description:
+						"Use --no-overwrite-ignore to abort the operation when the new branch contains ignored files",
+				},
+				{
+					name: "--recurse-submodules",
+					description:
+						"Using --recurse-submodules will update the content of all active submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless -f is used. If nothing (or --no-recurse-submodules) is used, submodules working trees will not be updated. Just like git-submodule[1], this will detach HEAD of the submodule",
+				},
+				{
+					name: "--no-recurse-submodules",
+					description: "Submodules working trees will not be updated",
+				},
+				{
+					name: "--overlay",
+					description:
+						"In the default overlay mode, git checkout never removes files from the index or the working tree",
+				},
+				{
+					name: "--no-overlay",
+					description:
+						"When specifying --no-overlay, files that appear in the index and working tree, but not in <tree-ish> are removed, to make them match <tree-ish> exactly",
+				},
+				{
+					name: "--pathspec-from-file",
+					description:
+						"Pathspec is passed in <file> instead of commandline args",
+					args: {
+						name: "file",
+						template: "filepaths",
+					},
+				},
+				{
+					name: "--pathspec-file-nul",
+					description: "Only meaningful with --pathspec-from-file",
+				},
+			],
+			args: [
+				{
+					name: "branch, file, tag or commit",
+					description: "Branch, file, tag or commit to switch to",
+					isOptional: true,
+					filterStrategy: "fuzzy",
+					generators: [
+						gitGenerators.remoteLocalBranches,
+						gitGenerators.tags,
+						{ template: ["filepaths", "folders"] },
+					],
+					suggestions: [
+						{
+							name: "-",
+							description: "Switch to the last used branch",
+							icon: "fig://icon?type=git",
+						},
+						{
+							name: "--",
+							description: "Do not interpret more arguments as options",
+							hidden: true,
+						},
+					],
+				},
+				{
+					name: "pathspec",
+					description: "Limits the paths affected by the operation",
+					isOptional: true,
+					isVariadic: true,
+					template: "filepaths",
+				},
+			],
+		},
+		{
+			name: "cherry-pick",
+			description: "Apply the changes introduced by some existing commits",
+			args: {
+				name: "commit",
+				description: "Commits to cherry-pick",
+				isVariadic: true,
+				generators: gitGenerators.commits,
+			},
+			options: [
+				{
+					name: "--continue",
+					description:
+						"Continue the operation in progress using the information in .git/sequencer",
+				},
+				{
+					name: "--skip",
+					description:
+						"Skip the current commit and continue with the rest of the sequence",
+				},
+				{
+					name: "--quit",
+					description: "Forget about the current operation in progress",
+				},
+				{
+					name: "--abort",
+					description:
+						"Cancel the operation and return to the pre-sequence state",
+				},
+				{
+					name: ["-e", "--edit"],
+					description:
+						"With this option, git cherry-pick will let you edit the commit message prior to committing",
+				},
+				{
+					name: "--cleanup",
+					description:
+						"This option determines how the commit message will be cleaned up before being passed on to the commit machinery",
+					args: {
+						name: "mode",
+						description:
+							"Determines how the supplied commit messaged should be cleaned up before committing",
+						suggestions: [
+							{
+								name: "strip",
+								description:
+									"Strip leading and trailing empty lines, trailing whitepace, commentary and collapse consecutive empty lines",
+							},
+							{
+								name: "whitespace",
+								description: "Same as strip except #commentary is not removed",
+							},
+							{
+								name: "verbatim",
+								description: "Do not change the message at all",
+							},
+							{
+								name: "scissors",
+								description:
+									"Same as whitespace except that everything from (and including) the line found below is truncated",
+							},
+							{
+								name: "default",
+								description:
+									"Same as strip if the message is to be edited. Otherwise whitespace",
+							},
+						],
+					},
+				},
+				{
+					name: "-x",
+					description:
+						'When recording the commit, append a line that says "(cherry picked from commit ...)" to the original commit message in order to indicate which commit this change was cherry-picked from',
+				},
+				{
+					name: ["-m", "--mainline"],
+					description:
+						"Specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent",
+					args: {
+						name: "parent-number",
+					},
+				},
+				{
+					name: ["-n", "--no-commit"],
+					description:
+						"Applies changes necessary to cherry-pick each named commit to your working tree and the index without making any commit",
+				},
+				{
+					name: ["-s", "--signoff"],
+					description:
+						"Add a Signed-off-by trailer at the end of the commit message",
+				},
+				{
+					name: ["-S", "--gpg-sign"],
+					exclusiveOn: ["--no-gpg-sign"],
+					description: "GPG-sign commits",
+					args: {
+						name: "keyid",
+						description: "Must be stuck to the option without a space",
+						isOptional: true,
+					},
+				},
+				{
+					name: "--no-gpg-sign",
+					exclusiveOn: ["-S", "--gpg-sign"],
+					description:
+						"Useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
+				},
+				{
+					name: "--ff",
+					description:
+						"If the current HEAD is the same as the parent of the cherry-pick'ed commit, the a fast forward to this commit will be performed",
+				},
+				{
+					name: "--allow-empty",
+					description:
+						"Allow empty commits to be preserved automatically in a cherry-pick",
+				},
+				{
+					name: "--allow-empty-message",
+					description: "Allow commits with empty messages to be cherry picked",
+				},
+				{
+					name: "--keep-redundant-commits",
+					description: "Creates an empty commit object. Implies --allow-empty",
+				},
+				{
+					name: "--strategy",
+					description: "Use the given merge strategy. Should only be used once",
+					args: {
+						name: "strategy",
+						suggestions: ["resolve", "recursive", "octopus", "ours", "subtree"],
+					},
+				},
+				{
+					name: ["-X", "--strategy-option"],
+					description:
+						"Pass the merge strategy-specific option through to the merge strategy",
+					args: {
+						name: "option",
+						suggestions: [
+							"ours",
+							"theirs",
+							"patience",
+							"diff-algorithm",
+							"diff-algorithm=patience",
+							"diff-algorithm=minimal",
+							"diff-algorithm=histogram",
+							"diff-algorithm=myers",
+							"ignore-space-change",
+							"ignore-all-space",
+							"ignore-space-at-eol",
+							"ignore-cr-at-eol",
+							"renormalize",
+							"no-renormalize",
+							"no-renames",
+							"find-renames",
+							"subtree",
+						],
+					},
+				},
+				{
+					name: "--rerere-autoupdate",
+					exclusiveOn: ["--no-rerere-autoupdate"],
+					description:
+						"Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
+				},
+				{
+					name: "--no-rerere-autoupdate",
+					exclusiveOn: ["--rerere-autoupdate"],
+					description:
+						"Do not allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
+				},
+			],
+		},
+		{
+			name: "submodule",
+			description: "Initialize, update or inspect submodules",
+			subcommands: [
+				{
+					name: "add",
+					description:
+						"Add the given repository as a submodule at the given path to the changeset to be committed next to the current project",
+					options: [
+						{
+							name: "-b",
+							description: "Branch of repository to add as submodule",
+							args: {
+								name: "branch",
+							},
+						},
+						{
+							name: ["-f", "--force"],
+							description: "Allow adding an otherwise ignored submodule path",
+						},
+						{
+							name: "--name",
+							description:
+								"It sets the submodule’s name to the given string instead of defaulting to its path",
+							insertValue: "--name '{cursor}'",
+							args: {
+								name: "name",
+								description: "Directory name",
+							},
+						},
+						{
+							name: "--reference",
+							description: "Remote repository to be cloned",
+							args: {
+								name: "repository",
+								description: "Remote repository to be cloned",
+							},
+						},
+						{
+							name: "--depth",
+							description:
+								"Create a shallow clone with a history truncated to the specified number of revisions",
+							args: {
+								name: "depth",
+								description: "Specified number of revisions",
+							},
+						},
+						{
+							name: "--",
+							description: "End of subcommand options",
+						},
+					],
+					args: [
+						{
+							name: "repository",
+						},
+						{
+							name: "path",
+							isOptional: true,
+							template: "filepaths",
+						},
+					],
+				},
+				{
+					name: "status",
+					description: "Show the status of the submodules",
+					options: [
+						{
+							name: "--cached",
+							description:
+								"Will instead print the SHA-1 recorded in the superproject for each submodule",
+						},
+						{
+							name: "--recursive",
+							description:
+								"Will recurse into nested submodules, and show their status as well",
+						},
+						{
+							name: "--",
+							description: "End of subcommand options",
+						},
+					],
+					args: {
+						name: "path",
+						isOptional: true,
+						isVariadic: true,
+						template: "filepaths",
+					},
+				},
+				{
+					name: "init",
+					description: "Initialize the submodules recorded in the index",
+					options: [
+						{
+							name: "--",
+							description: "End of subcommand options",
+						},
+					],
+					args: {
+						name: "path",
+						isOptional: true,
+						isVariadic: true,
+						template: "filepaths",
+					},
+				},
+				{
+					name: "deinit",
+					description: "Unregister the given submodules",
+					options: [
+						{
+							name: ["-f", "--force"],
+							description:
+								"The submodule’s working tree will be removed even if it contains local modifications",
+						},
+						{
+							name: "--all",
+							description: "Unregister all submodules in the working tree",
+						},
+						{
+							name: "--",
+							description: "End of subcommand options",
+						},
+					],
+					args: {
+						name: "path",
+						isOptional: true,
+						isVariadic: true,
+						template: "filepaths",
+					},
+				},
+				{
+					name: "update",
+					description:
+						"Update the registered submodules to match what the superproject expects by cloning missing submodules, fetching missing commits in submodules and updating the working tree of the submodules",
+					options: [
+						{
+							name: "--init",
+							description:
+								"Initialize all submodules for which 'git submodule init' has not been called so far before updating",
+						},
+						{
+							name: "--remote",
+							description:
+								"Instead of using the superproject’s recorded SHA-1 to update the submodule, use the status of the submodule’s remote-tracking branch",
+						},
+						{
+							name: ["-N", "--no-fetch"],
+							description: "Don’t fetch new objects from the remote site",
+						},
+						{
+							name: "--no-recommend-shallow",
+							description: "Ignore the suggestions",
+						},
+						{
+							name: "--recommend-shallow",
+							description:
+								"The initial clone of a submodule will use the recommended submodule.<name>.shallow as provided by the .gitmodules file",
+						},
+						{
+							name: ["-f", "--force"],
+							description:
+								"Throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule",
+						},
+						{
+							name: "--checkout",
+							description:
+								"The commit recorded in the superproject will be checked out in the submodule on a detached HEAD",
+						},
+						{
+							name: "--rebase",
+							description:
+								"The current branch of the submodule will be rebased onto the commit recorded in the superproject",
+						},
+						{
+							name: "--merge",
+							description:
+								"The commit recorded in the superproject will be merged into the current branch in the submodule",
+						},
+						{
+							name: "--reference",
+							description: "Remote repository",
+							args: {
+								name: "repository",
+							},
+						},
+						{
+							name: "--depth",
+							description:
+								"Create a shallow clone with a history truncated to the specified number of revisions",
+							args: {
+								name: "depth",
+							},
+						},
+						{
+							name: "--recursive",
+							description: "Traverse submodules recursively",
+						},
+						{
+							name: "--jobs",
+							description: "Clone new submodules in parallel with as many jobs",
+							args: {
+								name: "n",
+							},
+						},
+						{
+							name: "--single-branch",
+							description:
+								"Clone only one branch during update: HEAD or one specified by --branch",
+						},
+						{
+							name: "--no-single-branch",
+							description:
+								"Don't clone only one branch during update: HEAD or one specified by --branch",
+						},
+						{ name: "--", description: "End of subcommand options" },
+					],
+					args: {
+						name: "path",
+						isOptional: true,
+						isVariadic: true,
+						template: "filepaths",
+					},
+				},
+				{
+					name: "set-branch",
+					description:
+						"Sets the default remote tracking branch for the submodule",
+					options: [
+						{
+							name: ["-b", "--branch"],
+							description: "Branch of repository to add as submodule",
+							args: {
+								name: "branch",
+								description: "Remote branch to be specified",
+							},
+						},
+						{
+							name: ["-d", "--default"],
+							description:
+								"Removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote HEAD",
+						},
+						{
+							name: "--",
+							description: "End of subcommand options",
+						},
+					],
+					args: {
+						name: "path",
+						description: "Path to submodule",
+						template: "filepaths",
+					},
+				},
+				{
+					name: "set-url",
+					description: "Sets the URL of the specified submodule to <newurl>",
+					options: [
+						{
+							name: "--",
+							description: "End of command options",
+						},
+					],
+					args: [
+						{
+							name: "path",
+							description: "Path to specified submodule",
+							template: "filepaths",
+						},
+						{
+							name: "newurl",
+							description: "New url of submodule",
+						},
+					],
+				},
+				{
+					name: "summary",
+					description:
+						"Show commit summary between the given commit (defaults to HEAD) and working tree/index",
+					options: [
+						{
+							name: "--cached",
+							description:
+								"This command will recurse into the registered submodules, and sync any nested submodules within",
+						},
+						{
+							name: "--files",
+							description:
+								"Show the series of commits in the submodule between the index of the super project and the working tree of the submodule",
+						},
+						{
+							name: "-n",
+							description:
+								"Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules",
+							args: {
+								name: "n",
+							},
+						},
+						{
+							name: "--summary-limit",
+							description:
+								"Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules",
+							args: {
+								name: "n",
+							},
+						},
+						{
+							name: "--",
+							description: "Everything after this is an argument",
+						},
+					],
+					args: [
+						{
+							name: "commit",
+							isOptional: true,
+						},
+						{
+							name: "path",
+							isOptional: true,
+							isVariadic: true,
+							template: "filepaths",
+						},
+					],
+				},
+				{
+					name: "foreach",
+					description:
+						"Evaluates an arbitrary shell command in each checked out submodule",
+					options: [
+						{
+							name: "--recursive",
+							description:
+								"This command will recurse into the registered submodules, and sync any nested submodules within",
+						},
+					],
+					args: {
+						name: "command",
+					},
+				},
+				{
+					name: "sync",
+					description:
+						"Synchronizes submodules' remote URL configuration setting to the value specified in .gitmodules",
+					options: [
+						{
+							name: "--recursive",
+							description:
+								"This command will recurse into the registered submodules, and sync any nested submodules within",
+						},
+						{
+							name: "--",
+							description: "Everything after this is an argument",
+						},
+					],
+					args: {
+						name: "path",
+						isOptional: true,
+						isVariadic: true,
+						template: "filepaths",
+					},
+				},
+				{
+					name: "absorbgitdirs",
+					description:
+						"If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superproject’s $GIT_DIR/modules path and then connect the git directory and its working directory by setting the core.worktree and adding a .git file pointing to the git directory embedded in the superprojects git directory",
+				},
+			],
+			options: [
+				{
+					name: ["-q", "--quiet"],
+					description: "Only print error messages",
+				},
+				{
+					name: "--cached",
+					description: "The commit stored in the index is used instead",
+				},
+			],
+		},
+		{
+			name: "merge",
+			description: "Join two or more development histories together",
+			args: {
+				name: "branch",
+				filterStrategy: "fuzzy",
+				generators: gitGenerators.remoteLocalBranches,
+				isVariadic: true,
+				isOptional: true,
+				// A single dash can be used as arg to merge as short hand for the previous branch
+				// https://github.com/git/git/blob/master/Documentation/RelNotes/1.7.6.txt#L84
+				suggestions: [
+					{ name: "-", description: "Shorthand for the previous branch" },
+				],
+			},
+			options: [
+				{
+					name: "--commit",
+					description:
+						"Perform the merge and commit the result. This option can be used to override --no-commit",
+				},
+				{
+					name: "--no-commit",
+					description:
+						"Perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing",
+				},
+				{
+					name: ["--edit", "-e"],
+					description:
+						"Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge",
+				},
+				{
+					name: "--no-edit",
+					description:
+						"The --no-edit option can be used to accept the auto-generated message (this is generally discouraged). The --edit (or -e) option is still useful if you are giving a draft message with the -m option from the command line and want to edit it in the editor",
+				},
+				{
+					name: "--cleanup",
+					description:
+						"This option determines how the merge message will be cleaned up before committing. See git-commit[1] for more details. In addition, if the <mode> is given a value of scissors, scissors will be appended to MERGE_MSG before being passed on to the commit machinery in the case of a merge conflict",
+					requiresSeparator: true,
+					args: {
+						name: "mode",
+						suggestions: [
+							"strip",
+							"whitespace",
+							"verbatim",
+							"scissors",
+							"default",
+						],
+					},
+				},
+				{
+					name: "--ff",
+					description:
+						"When possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit",
+				},
+				{
+					name: "--no-ff",
+					description:
+						"Create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward",
+				},
+				{
+					name: "--ff-only",
+					description:
+						"Resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status",
+				},
+				{
+					name: ["-S", "--gpg-sign"],
+					description:
+						"GPG-sign the resulting merge commit. The keyid argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space",
+					args: {
+						name: "keyid",
+						isOptional: true,
+					},
+				},
+				{
+					name: "--no-gpg-sign",
+					description:
+						"Is useful to countermand both commit.gpgSign configuration variable, and earlier --gpg-sign",
+				},
+				{
+					name: "--log",
+					description:
+						"In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also git-fmt-merge-msg[1]",
+					args: {
+						name: "n",
+						isOptional: true,
+					},
+				},
+				{
+					name: "--no-log",
+					description:
+						"Do not list one-line descriptions from the actual commits being merged",
+				},
+				{
+					name: "--signoff",
+					description:
+						"Add a Signed-off-by trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you’re committing. For example, it may certify that the committer has the rights to submit the work under the project’s license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you’re contributing to understand how the signoffs are used in that project",
+				},
+				{
+					name: "--no-signoff",
+					description:
+						"Can be used to countermand an earlier --signoff option on the command line",
+				},
+				{
+					name: "--stat",
+					description:
+						"Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat",
+				},
+				{
+					name: ["-n", "--no-stat"],
+					description: "Do not show a diffstat at the end of the merge",
+				},
+				{
+					name: "--squash",
+					description:
+						"With --squash, --commit is not allowed, and will fail. Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the HEAD, or record $GIT_DIR/MERGE_HEAD (to cause the next git commit command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)",
+				},
+				{
+					name: "--no-squash",
+					description:
+						"Perform the merge and commit the result. This option can be used to override --squash",
+				},
+				{
+					name: "--no-verify",
+					description:
+						"This option bypasses the pre-merge and commit-msg hooks. See also githooks[5]",
+				},
+				{
+					name: ["-s", "--strategy"],
+					description:
+						"Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no -s option, a built-in list of strategies is used instead (git merge-recursive when merging a single head, git merge-octopus otherwise)",
+					args: {
+						name: "strategy",
+						isVariadic: true,
+						suggestions: ["resolve", "recursive", "octopus", "ours", "subtree"],
+					},
+				},
+				{
+					name: ["-X", "--strategy-option"],
+					description:
+						"Pass merge strategy specific option through to the merge strategy",
+					args: {
+						name: "option",
+						suggestions: [
+							"ours",
+							"theirs",
+							"patience",
+							"diff-algorithm",
+							"diff-algorithm=patience",
+							"diff-algorithm=minimal",
+							"diff-algorithm=histogram",
+							"diff-algorithm=myers",
+							"ignore-space-change",
+							"ignore-all-space",
+							"ignore-space-at-eol",
+							"ignore-cr-at-eol",
+							"renormalize",
+							"no-renormalize",
+							"no-renames",
+							"find-renames",
+							"subtree",
+						],
+					},
+				},
+				{
+					name: "--verify-signatures",
+					description:
+						"Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted",
+				},
+				{
+					name: "--no-verify-signatures",
+					description:
+						"Do not verify that the tip commit of the side branch being merged is signed with a valid key",
+				},
+				{
+					name: "--summary",
+					description:
+						"Synonym to --stat ; this is deprecated and will be removed in the future",
+				},
+				{
+					name: "--no-summary",
+					description:
+						"Synonym to --no-stat ; this is deprecated and will be removed in the future",
+				},
+				{
+					name: ["-q", "--quiet"],
+					description: "Operate quietly. Implies --no-progress",
+				},
+				{ name: ["-v", "--verbose"], description: "Be verbose" },
+				{
+					name: "--progress",
+					description:
+						"Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting",
+				},
+				{
+					name: "--no-progress",
+					description:
+						"Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting",
+				},
+				{
+					name: "--autostash",
+					description:
+						"Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run the operation on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts",
+				},
+				{
+					name: "--no-autostash",
+					description:
+						"Do not automatically create a temporary stash entry before the operation begins, and apply it after the operation ends",
+				},
+				{
+					name: "--allow-unrelated-histories",
+					description:
+						"By default, git merge command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added",
+				},
+				{
+					name: "-m",
+					description:
+						"Set the commit message to be used for the merge commit (in case one is created). If --log is specified, a shortlog of the commits being merged will be appended to the specified message. The git fmt-merge-msg command can be used to give a good default for automated git merge invocations. The automated message can include the branch description",
+					args: {
+						name: "message",
+					},
+				},
+				{
+					name: ["-F", "--file"],
+					description:
+						"Read the commit message to be used for the merge commit (in case one is created). If --log is specified, a shortlog of the commits being merged will be appended to the specified message",
+					args: {
+						name: "file",
+						template: "filepaths",
+					},
+				},
+				{
+					name: "--rerere-autoupdate",
+					description:
+						"Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
+				},
+				{
+					name: "--no-rerere-autoupdate",
+					description:
+						"Do not allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible",
+				},
+				{
+					name: "--overwrite-ignore",
+					description:
+						"Silently overwrite ignored files from the merge result. This is the default behavior. Use --no-overwrite-ignore to abort",
+				},
+				{
+					name: "--no-overwrite-ignore",
+					description:
+						"Do not silently overwrite ignored files from the merge result",
+				},
+				{
+					name: "--abort",
+					description:
+						"Abort the current conflict resolution process, and try to reconstruct the pre-merge state. If an autostash entry is present, apply it to the worktree. If there were uncommitted worktree changes present when the merge started, git merge --abort will in some cases be unable to reconstruct these changes. It is therefore recommended to always commit or stash your changes before running git merge. git merge --abort is equivalent to git reset --merge when MERGE_HEAD is present unless MERGE_AUTOSTASH is also present in which case git merge --abort applies the stash entry to the worktree whereas git reset --merge will save the stashed changes in the stash list",
+				},
+				{
+					name: "--quit",
+					description:
+						"Forget about the current merge in progress. Leave the index and the working tree as-is. If MERGE_AUTOSTASH is present, the stash entry will be saved to the stash list",
+				},
+				{
+					name: "--continue",
+					description:
+						"After a git merge stops due to conflicts you can conclude the merge by running git merge --continue (see 'HOW TO RESOLVE CONFLICTS' section below)",
+				},
+			],
+		},
+		{
+			name: "mergetool",
+			description: "Open the git tool to fix conflicts",
+		},
+		{
+			name: "tag",
+			description:
+				"Create, list, delete or verify a tag object signed with GPG",
+			options: [
+				{ name: ["-l", "--list"], description: "List tag names" },
+				{
+					name: "-n",
+					description: "Print <n> lines of each tag message",
+					args: {
+						name: "n",
+						suggestions: [{ name: "1" }, { name: "2" }, { name: "3" }],
+					},
+				},
+				{ name: ["-d", "--delete"], description: "Delete tags" },
+				{ name: ["-v", "--verify"], description: "Verify tags" },
+				{
+					name: ["-a", "--annotate"],
+					description: "Annotated tag, needs a message",
+				},
+				{
+					name: ["-m", "--message"],
+					insertValue: "-m '{cursor}'",
+					description: "Tag message",
+					args: { name: "message" },
+				},
+				{
+					name: "--points-at",
+					description: "List tags of the given object",
+					args: {
+						name: "object",
+						generators: gitGenerators.commits,
+						suggestions: headSuggestions,
+					},
+				},
+			],
+			args: {
+				name: "tagname",
+				description: "Select a tag",
+				generators: gitGenerators.tags,
+				isOptional: true,
+			},
+		},
+		{
+			name: "restore",
+			description: "Restore working tree files",
+			options: [
+				{
+					name: ["-s", "--source"],
+					description:
+						"Restore the working tree files with the content from the given tree",
+					args: {
+						name: "tree",
+					},
+				},
+				{
+					name: ["-p", "--patch"],
+					description:
+						"Interactively select hunks in the difference between the restore source and the restore location",
+				},
+				{
+					name: ["-W", "--worktree"],
+					description: "Use the worktree as the restore location",
+				},
+				{
+					name: ["-S", "--staged"],
+					description: "Use staging as the restore location",
+				},
+				{
+					name: ["-q", "--quiet"],
+					description: "Quiet, suppress feedback messages",
+				},
+				{
+					name: "--progress",
+					description:
+						"Progress status is reported on the standard error stream by default when it is attached to a terminal",
+				},
+				{
+					name: "--no-progress",
+					description: "Disable progress status reporting",
+				},
+				{
+					name: ["-2", "--ours"],
+					description:
+						"When restoring paths from the index, check out stage #2 (ours) for unmerged paths",
+					exclusiveOn: ["--theirs"],
+				},
+				{
+					name: ["-3", "--theirs"],
+					description:
+						"When re out paths from the index, check out stage #3 (theirs) for unmerged paths",
+					exclusiveOn: ["--ours"],
+				},
+				{
+					name: ["-m", "--merge"],
+					description:
+						"When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths",
+				},
+				{
+					name: "--conflict",
+					description:
+						"The same as --merge option, but changes the way the conflicting hunks are presented",
+					args: {
+						name: "style",
+						suggestions: ["merge", "diff3"],
+					},
+				},
+				{
+					name: "--ignore-unmerged",
+					description:
+						"When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries",
+					exclusiveOn: ["--ours", "--theirs", "--merge", "--conflict"],
+				},
+				{
+					name: "--ignore-skip-worktree-bits",
+					description:
+						"In sparse checkout mode, by default is to only update entries matched by <pathspec> and sparse patterns in $GIT_DIR/info/sparse-checkout",
+				},
+				{
+					name: "--recurse-submodules",
+					description:
+						"If <pathspec> names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten",
+					exclusiveOn: ["--no-recurse-submodules"],
+				},
+				{
+					name: "--no-recurse-submodules",
+					description: "Submodules working trees will not be updated",
+					exclusiveOn: ["--recurse-submodules"],
+				},
+				{
+					name: "--overlay",
+					description:
+						"In overlay mode, the command never removes files when restoring",
+					exclusiveOn: ["--no-overlay"],
+				},
+				{
+					name: "--no-overlay",
+					description:
+						"In no-overlay mode, tracked files that do not appear in the --source tree are removed, to make them match <tree> exactly",
+					exclusiveOn: ["--overlay"],
+				},
+				{
+					name: "--pathspec-from-file",
+					description:
+						"Pathspec is passed in <file> instead of commandline args. If <file> is exactly - then standard input is used",
+					args: {
+						name: "file",
+						template: "filepaths",
+					},
+				},
+				{
+					name: "--pathspec-file-nul",
+					description:
+						"Only meaningful with --pathspec-from-file. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)",
+				},
+				{
+					name: "--",
+					description: "Do not interpret any more arguments as options",
+				},
+			],
+			args: {
+				name: "pathspec",
+				isOptional: true,
+				isVariadic: true,
+				generators: gitGenerators.files_for_staging,
+			},
+		},
+		{
+			name: "switch",
+			description: "Switch branches",
+			options: [
+				{
+					name: ["-c", "--create"],
+					description:
+						"Create a new branch named <new-branch> starting at <start-point> before switching to the branch",
+					args: [
+						{
+							name: "new branch",
+						},
+						{
+							name: "start point",
+							isOptional: true,
+							generators: gitGenerators.commits,
+						},
+					],
+				},
+				{
+					name: ["-C", "--force-create"],
+					description:
+						"Similar to --create except that if <new-branch> already exists it will be reset to <start-point>",
+					args: [
+						{
+							name: "new branch",
+						},
+						{
+							name: "start point",
+							isOptional: true,
+							generators: gitGenerators.commits,
+						},
+					],
+				},
+				{
+					name: ["-d", "--detach"],
+					description:
+						"Switch to a commit for inspection and discardable experiments",
+				},
+				{
+					name: "--guess",
+					description:
+						"If <branch> is not found but there does exist a tracking branch in exactly one remote (call it <remote>) with a matching name",
+				},
+				{
+					name: "--no-guess",
+					description: "Disable --guess",
+				},
+				{
+					name: ["-f", "--force"],
+					description: "An alias for --discard-changes",
+					isDangerous: true,
+				},
+				{
+					name: "--discard-changes",
+					description:
+						"Proceed even if the index or the working tree differs from HEAD. Both the index and working tree are restored to match the switching target",
+					isDangerous: true,
+				},
+				{
+					name: ["-m", "--merge"],
+					description:
+						"If you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context",
+				},
+				{
+					name: "--conflict",
+					description:
+						"The same as --merge option above, but changes the way the conflicting hunks are presented, overriding the merge.conflictStyle configuration variable",
+					args: {
+						name: "style",
+						suggestions: ["merge", "diff3"],
+						default: "merge",
+					},
+				},
+				{
+					name: ["-q", "--quiet"],
+					description: "Quiet, suppress feedback messages",
+				},
+				{
+					name: "--progress",
+					description:
+						"Progress status is reported on the standard error stream by default when it is attached to a terminal",
+				},
+				{
+					name: "--no-progress",
+					description: "Disable progress status reporting",
+				},
+				{
+					name: ["-t", "--track"],
+					exclusiveOn: ["--no-track"],
+					description:
+						"When creating a new branch, set up 'upstream' configuration",
+					args: [
+						{
+							name: "branch",
+							generators: gitGenerators.localBranches,
+							filterStrategy: "fuzzy",
+						},
+						{
+							name: "start point",
+							isOptional: true,
+							generators: gitGenerators.commits,
+						},
+					],
+				},
+				{
+					name: "--no-track",
+					exclusiveOn: ["--track", "-t"],
+					description:
+						"Do not set up 'upstream' configuration, even if the branch.autoSetupMerge configuration variable is true",
+					args: [
+						{
+							generators: gitGenerators.localBranches,
+							filterStrategy: "fuzzy",
+						},
+						{
+							isOptional: true,
+							generators: gitGenerators.localBranches,
+							filterStrategy: "fuzzy",
+						},
+					],
+				},
+				{
+					name: "--orphan",
+					description: "Create a new orphan branch, named <new-branch>",
+					args: {
+						name: "new branch",
+					},
+				},
+				{
+					name: "--ignore-other-worktrees",
+					description:
+						"Git switch refuses when the wanted ref is already checked out by another worktree",
+				},
+				{
+					name: "--recurse-submodules",
+					exclusiveOn: ["--no-recurse-submodules"],
+					description:
+						"Updates the content of all active submodules according to the commit recorded in the superproject",
+				},
+				{
+					name: "--no-recurse-submodules",
+					exclusiveOn: ["--recurse-submodules"],
+					description: "Submodules working trees will not be updated",
+				},
+			],
+			args: [
+				{
+					name: "branch name",
+					description: "Branch or commit to switch to",
+					generators: gitGenerators.localBranches,
+					filterStrategy: "fuzzy",
+					suggestions: [
+						{
+							name: "-",
+							description: "Switch to the last used branch",
+							icon: "fig://icon?type=git",
+						},
+					],
+				},
+				{
+					name: "start point",
+					isOptional: true,
+					generators: gitGenerators.commits,
+				},
+			],
+		},
+		{
+			name: "worktree",
+			description: "Manage multiple working trees",
+			subcommands: [
+				{
+					name: "add",
+					description: "Create <path> and checkout <commit-ish> into it",
+					options: [
+						{
+							name: ["-f", "--force"],
+							description:
+								"By default, add refuses to create a new working tree when <commit-ish> is a branch name and is already checked out by another working tree, or if <path> is already assigned to some working tree but is missing (for instance, if <path> was deleted manually). This option overrides these safeguards. To add a missing but locked working tree path, specify --force twice",
+						},
+						{
+							name: ["-d", "--detach"],
+							description:
+								'With add, detach HEAD in the new working tree. See "DETACHED HEAD" in git-checkout[1]',
+						},
+						{
+							name: "--checkout",
+							description:
+								'By default, add checks out <commit-ish>, however, --no-checkout can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See "Sparse checkout" in git-read-tree[1]',
+						},
+						{
+							name: "--lock",
+							description:
+								"Keep the working tree locked after creation. This is the equivalent of git worktree lock after git worktree add, but without a race condition",
+						},
+						{
+							name: ["-b", "-B"],
+							description:
+								"With add, create a new branch named <new-branch> starting at <commit-ish>, and check out <new-branch> into the new working tree. If <commit-ish> is omitted, it defaults to HEAD. By default, -b refuses to create a new branch if it already exists. -B overrides this safeguard, resetting <new-branch> to <commit-ish>",
+							args: {
+								name: "new-branch",
+							},
+						},
+					],
+				},
+				{
+					name: "list",
+					description: "List details of each working tree",
+					options: [
+						{
+							name: "--porcelain",
+							description:
+								"With list, output in an easy-to-parse format for scripts. This format will remain stable across Git versions and regardless of user configuration. See below for details",
+						},
+						{
+							name: ["-v", "--verbose"],
+							description:
+								"With list, output additional information about worktrees (see below)",
+						},
+						{
+							name: "--expire",
+							description:
+								"With list, annotate missing working trees as prunable if they are older than <time>",
+							args: {
+								name: "time",
+							},
+						},
+					],
+				},
+				{
+					name: "lock",
+					description:
+						"If a working tree is on a portable device or network share which is not always mounted, lock it to prevent its administrative files from being pruned automatically",
+					args: {
+						name: "worktree",
+						description:
+							"Working trees can be identified by path, either relative or absolute",
+					},
+					options: [
+						{
+							name: "--reason",
+							description:
+								"With lock or with add --lock, an explanation <reason> why the working tree is locked",
+							args: {
+								name: "reason",
+							},
+						},
+					],
+				},
+				{
+					name: "move",
+					description: "Move a working tree to a new location",
+					args: [
+						{
+							name: "worktree",
+							description:
+								"Working trees can be identified by path, either relative or absolute",
+						},
+						{
+							name: "new-path",
+							template: "filepaths",
+						},
+					],
+					options: [
+						{
+							name: ["-f", "--force"],
+							description:
+								"Move refuses to move a locked working tree unless --force is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if <new-path> was deleted manually), then --force allows the move to proceed; use --force twice if the destination is locked",
+						},
+					],
+				},
+				{
+					name: "prune",
+					description: "Prune working tree information in $GIT_DIR/worktrees",
+					options: [
+						{
+							name: ["-n", "--dry-run"],
+							description:
+								"With prune, do not remove anything; just report what it would remove",
+						},
+						{
+							name: ["-v", "--verbose"],
+							description: "With prune, report all removals",
+						},
+						{
+							name: "--expire",
+							description:
+								"With prune, only expire unused working trees older than <time>",
+							args: {
+								name: "time",
+							},
+						},
+					],
+				},
+				{
+					name: "remove",
+					description: "Remove a working tree",
+					args: {
+						name: "worktree",
+						description:
+							"Working trees can be identified by path, either relative or absolute",
+					},
+					options: [
+						{
+							name: ["-f", "--force"],
+							description:
+								"Remove refuses to remove an unclean working tree unless --force is used. To remove a locked working tree, specify --force twice",
+						},
+					],
+				},
+				{
+					name: "repair",
+					description:
+						"Repair working tree administrative files, if possible, if they have become corrupted or outdated due to external factors",
+					args: {
+						name: "path",
+						template: "filepaths",
+					},
+				},
+				{
+					name: "unlock",
+					description:
+						"Unlock a working tree, allowing it to be pruned, moved or deleted",
+					args: {
+						name: "worktree",
+						description:
+							"Working trees can be identified by path, either relative or absolute",
+					},
+				},
+			],
+		},
+		{
+			name: "apply",
+			description: "Apply a patch to files and/or to the index",
+			options: [
+				{
+					name: "--exclude",
+					description: "Don't apply changes matching the given path",
+					args: {
+						name: "path",
+					},
+				},
+				{
+					name: "--include",
+					description: "Apply changes matching the given path",
+					args: {
+						name: "path",
+					},
+				},
+				{
+					name: "-p",
+					description:
+						"Remove <num> leading slashes from traditional diff paths",
+					args: {
+						name: "num",
+					},
+				},
+				{
+					name: "--no-add",
+					description: "Ignore additions made by the patch",
+				},
+				{
+					name: "--stat",
+					description:
+						"Instead of applying the patch, output diffstat for the input",
+				},
+				{
+					name: "--numstat",
+					description:
+						"Show number of added and deleted lines in decimal notation",
+				},
+				{
+					name: "--summary",
+					description:
+						"Instead of applying the patch, output a summary for the input",
+				},
+				{
+					name: "--check",
+					description:
+						"Instead of applying the patch, see if the patch is applicable",
+				},
+				{
+					name: "--index",
+					description: "Make sure the patch is applicable to the current index",
+				},
+				{
+					name: ["-N", "--intent-to-add"],
+					description: "Mark new files with `git add --intent-to-add`",
+				},
+				{
+					name: "--cached",
+					description: "Apply a patch without touching the working tree",
+				},
+				{
+					name: "--unsafe-paths",
+					description: "Accept a patch that touches outside the working area",
+				},
+				{
+					name: "--apply",
+					description:
+						"Also apply the patch (use with --stat/--summary/--check)",
+				},
+				{
+					name: ["-3", "--3way"],
+					description: "Attempt three-way merge if a patch does not apply",
+				},
+				{
+					name: "--build-fake-ancestor",
+					description:
+						"Build a temporary index based on embedded index information",
+					args: {
+						name: "file",
+					},
+				},
+				{
+					name: "-z",
+					description: "Paths are separated with NUL character",
+				},
+				{
+					name: "-C",
+					description: "Ensure at least <n> lines of context match",
+					args: {
+						name: "n",
+					},
+				},
+				{
+					name: "--whitespace",
+					description:
+						"Detect new or modified lines that have whitespace errors",
+					args: {
+						name: "action",
+						suggestions: [
+							{
+								name: "nowarn",
+								description: "Turns off the trailing whitespace warning",
+							},
+							{
+								name: "warn",
+								description:
+									"Outputs warnings for a few such errors, but applies the patch as-is (default)",
+							},
+							{
+								name: "fix",
+								description:
+									"Outputs warnings for a few such errors, and applies the patch after fixing them",
+							},
+							{
+								name: "error",
+								description:
+									"Outputs warnings for a few such errors, and refuses to apply the patch",
+							},
+							{
+								name: "error-all",
+								description: "Similar to `error` but shows all errors",
+							},
+						],
+					},
+				},
+				{
+					name: ["--ignore-space-change", "--ignore-whitespace"],
+					description: "Ignore changes in whitespace when finding context",
+				},
+				{
+					name: ["-R", "--reverse"],
+					description: "Apply the patch in reverse",
+				},
+				{
+					name: "--unidiff-zero",
+					description: "Don't expect at least one line of context",
+				},
+				{
+					name: "--reject",
+					description: "Leave the rejected hunks in corresponding *.rej files",
+				},
+				{
+					name: "--allow-overlap",
+					description: "Allow overlapping hunks",
+				},
+				{
+					name: ["-v", "--verbose"],
+					description: "Be verbose",
+				},
+				{
+					name: "--inaccurate-eof",
+					description:
+						"Tolerate incorrectly detected missing new-line at the end of file",
+				},
+				{
+					name: "--recount",
+					description: "Do not trust the line counts in the hunk headers",
+				},
+				{
+					name: "--directory",
+					description: "Prepend <root> to all filenames",
+					args: {
+						name: "root",
+					},
+				},
+			],
+			args: {
+				name: "patch",
+				isVariadic: true,
+			},
+		},
+		{
+			name: "daemon",
+			description: "A really simple server for Git repositories",
+			args: {
+				name: "directory",
+				description:
+					"A directory to add to the whitelist of allowed directories. Unless --strict-paths is specified this will also include subdirectories of each named directory",
+				isVariadic: true,
+			},
+			options: [
+				{
+					name: "--strict-paths",
+					description:
+						'Match paths exactly (i.e. don’t allow "/foo/repo" when the real path is "/foo/repo.git" or "/foo/repo/.git") and don’t do user-relative paths.  git daemon will refuse to start when this option is enabled and no whitelist is specified',
+				},
+				{
+					name: "--base-path",
+					description:
+						"Remap all the path requests as relative to the given path",
+					requiresSeparator: true,
+					args: { name: "path", template: "folders" },
+				},
+				{
+					name: "--base-path-relaxed",
+					description:
+						"If --base-path is enabled and repo lookup fails, with this option git daemon will attempt to lookup without prefixing the base path. This is useful for switching to --base-path usage, while still allowing the old paths",
+				},
+				{
+					name: "--interpolated-path",
+					requiresSeparator: true,
+					description:
+						"To support virtual hosting, an interpolated path template can be used to dynamically construct alternate paths. The template supports %H for the target hostname as supplied by the client but converted to all lowercase, %CH for the canonical hostname, %IP for the server’s IP address, %P for the port number, and %D for the absolute path of the named repository. After interpolation, the path is validated against the directory whitelist",
+					args: { name: "path-template" },
+				},
+				{
+					name: "--export-all",
+					description:
+						"Allow pulling from all directories that look like Git repositories (have the objects and refs subdirectories), even if they do not have the git-daemon-export-ok file",
+				},
+				{
+					name: "--inetd",
+					description: "Have the server run as an inetd service",
+					exclusiveOn: ["--pid-file", "--user", "--group"],
+				},
+				{
+					name: "--listen",
+					description:
+						"Listen on a specific IP address or hostname. IP addresses can be either an IPv4 address or an IPv6 address if supported. If IPv6 is not supported, then --listen=hostname is also not supported and --listen must be given an IPv4 address. Can be given more than once. Incompatible with --inetd option",
+					requiresSeparator: true,
+					args: { name: "host_or_ipaddr" },
+				},
+				{
+					name: "--port",
+					description:
+						"Listen on an alternative port. Incompatible with --inetd option",
+					requiresSeparator: true,
+					args: { name: "port" },
+				},
+				{
+					name: "--init-timeout",
+					description:
+						"Timeout (in seconds) between the moment the connection is established and the client request is received (typically a rather low value, since that should be basically immediate)",
+					requiresSeparator: true,
+					args: { name: "timeout" },
+				},
+				{
+					name: "--max-connections",
+					description:
+						"Maximum number of concurrent clients, defaults to 32. Set it to zero for no limit",
+					requiresSeparator: true,
+					args: { name: "maximum" },
+				},
+				{
+					name: "--syslog",
+					description: "Short for --log-destination=syslog",
+				},
+				{
+					name: "--log-destination",
+					description:
+						"Send log messages to the specified destination. Note that this option does not imply --verbose, thus by default only error conditions will be logged. The default destination is syslog if --inetd or --detach is specified, otherwise stderr",
+					requiresSeparator: true,
+					args: {
+						name: "destination",
+						suggestions: [
+							{
+								name: "stderr",
+								description:
+									"Write to standard error. Note that if --detach is specified, the process disconnects from the real standard error, making this destination effectively equivalent to none",
+							},
+							{
+								name: "syslog",
+								description: "Write to syslog, using the git-daemon identifier",
+							},
+							{ name: "none", description: "Disable all logging" },
+						],
+					},
+				},
+				{
+					name: "--user-path",
+					description:
+						"Allow ~user notation to be used in requests. When specified with no parameter, requests to git://host/~alice/foo is taken as a request to access foo repository in the home directory of user alice. If --user-path=some-path is specified, the same request is taken as a request to access the some-path/foo repository in the home directory of user alice",
+					requiresSeparator: true,
+					args: {
+						name: "path",
+						template: "folders",
+					},
+				},
+				{
+					name: "--verbose",
+					description:
+						"Log details about the incoming connections and requested files",
+				},
+				{
+					name: "--detach",
+					description: "Detach from the shell. Implies --syslog",
+				},
+				{
+					name: "--pid-file",
+					description: "Save the process id in the provided file",
+					requiresSeparator: true,
+					args: { name: "file", template: "filepaths" },
+					exclusiveOn: ["--inetd"],
+				},
+				{
+					name: "--user",
+					description:
+						"Change daemon’s uid and gid before entering the service loop. When only --user is given without --group, the primary group ID for the user is used. The values of the option are given to getpwnam(3) and getgrnam(3) and numeric IDs are not supported",
+					requiresSeparator: true,
+					exclusiveOn: ["--inetd"],
+					args: { name: "user" },
+				},
+				{
+					name: "--group",
+					description:
+						"Change daemon’s gid before entering the service loop. The value of this option is given to getgrnam(3) and numeric IDs are not supported",
+					exclusiveOn: ["--inetd"],
+				},
+				{
+					name: "--enable",
+					description: "Enable the service site-wide per default",
+					requiresSeparator: true,
+					args: { name: "service", suggestions: daemonServices },
+				},
+				{
+					name: "--disable",
+					description:
+						"Disable the service site-wide per default. Note that a service disabled site-wide can still be enabled per repository if it is marked overridable and the repository enables the service with a configuration item",
+					requiresSeparator: true,
+					args: { name: "service", suggestions: daemonServices },
+				},
+				{
+					name: "--allow-override",
+					description:
+						"Allow overriding the site-wide default with per repository configuration. By default, all the services may be overridden",
+					requiresSeparator: true,
+					args: { name: "service", suggestions: daemonServices },
+				},
+				{
+					name: "--forbid-override",
+					description:
+						"Forbid overriding the site-wide default with per repository configuration. By default, all the services may be overridden",
+					requiresSeparator: true,
+					args: { name: "service", suggestions: daemonServices },
+				},
+				{
+					name: "--informative-errors",
+					description:
+						'When informative errors are turned on, git-daemon will report more verbose errors to the client, differentiating conditions like "no such repository" from "repository not exported". This is more convenient for clients, but may leak information about the existence of unexported repositories. When informative errors are not enabled, all errors report "access denied" to the client',
+					exclusiveOn: ["--no-informative-errors"],
+				},
+				{
+					name: "--no-informative-errors",
+					description:
+						"Turn off informative errors. This option is the default. See --informative-errors for more information",
+					exclusiveOn: ["--informative-errors"],
+				},
+				{
+					name: "--access-hook",
+					description:
+						'Every time a client connects, first run an external command specified by the <path> with service name (e.g. "upload-pack"), path to the repository, hostname (%H), canonical hostname (%CH), IP address (%IP), and TCP port (%P) as its command-line arguments. The external command can decide to decline the service by exiting with a non-zero status (or to allow it by exiting with a zero status). It can also look at the $REMOTE_ADDR and $REMOTE_PORT environment variables to learn about the requestor when making this decision.\n\nThe external command can optionally write a single line to its standard output to be sent to the requestor as an error message when it declines the service',
+					requiresSeparator: true,
+					args: { name: "path", template: "filepaths" },
+				},
+			],
+		},
+	],
+	additionalSuggestions: [
+		{
+			name: "commit -m 'msg'",
+			description: "Git commit shortcut",
+			insertValue: "commit -m '{cursor}'",
+			icon: "fig://template?color=2ecc71&badge=🔥",
+			// type: "shortcut",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/grep.ts b/extensions/terminal-suggest/src/completions/upstream/grep.ts
index a7c15281424b..a897d463a0bc 100644
--- a/extensions/terminal-suggest/src/completions/upstream/grep.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/grep.ts
@@ -1,344 +1,344 @@
 const completionSpec: Fig.Spec = {
-  name: "grep",
-  description:
-    "Matches patterns in input text. Supports simple patterns and regular expressions",
-  args: [
-    {
-      name: "search pattern",
-      suggestCurrentToken: true,
-    },
-    {
-      name: "file",
-      template: "filepaths",
-    },
-  ],
-  options: [
-    {
-      name: "--help",
-      description:
-        "Print a usage message briefly summarizing these command-line options and the bug-reporting address, then exit",
-    },
-    {
-      name: ["-E", "--extended-regexp"],
-      description:
-        "Interpret PATTERN as an extended regular expression (-E is specified by POSIX.)",
-    },
-    {
-      name: ["-F", "--fixed-string"],
-      description:
-        "Interpret PATTERN as a list of fixed strings, separated by newlines, any of which is to be matched. (-F is specified by POSIX.)",
-    },
-    {
-      name: ["-G", "--basic-regexp"],
-      description:
-        "Interpret PATTERN as a basic regular expression (BRE, see below). This is the default",
-    },
-    {
-      name: ["-e", "--regexp"],
-      description:
-        "Use PATTERN as the pattern. This can be used to specify multiple search patterns, or to protect a pattern beginning with a hyphen (-). (-e is specified by POSIX.)",
-      args: {
-        name: "pattern",
-      },
-    },
-    {
-      name: ["-i", "--ignore-case", "-y"],
-      description:
-        "Ignore case distinctions in both the PATTERN and the input files. (-i is specified by POSIX.)",
-    },
-    {
-      name: ["-v", "--invert-match"],
-      description:
-        "Invert the sense of matching, to select non-matching lines. (-v is specified by POSIX.)",
-    },
-    {
-      name: ["-w", "--word-regexp"],
-      description:
-        "Select only those lines containing matches that form whole words. The test is that the matching substring must either be at the beginning of the line, or preceded by a non-word constituent character. Similarly, it must be either at the end of the line or followed by a non-word constituent character. Word-constituent characters are letters, digits, and the underscore",
-    },
-    {
-      name: ["-x", "--line-regexp"],
-      description:
-        "Select only those matches that exactly match the whole line. (-x is specified by POSIX.)",
-    },
-    {
-      name: ["-c", "--count"],
-      description:
-        "Suppress normal output; instead print a count of matching lines for each input file. With the -v, --invert-match option, count non-matching lines. (-c is specified by POSIX.)",
-    },
-    {
-      name: "--color",
-      description:
-        "Surround the matched (non-empty) strings, matching lines, context lines, file names, line numbers, byte offsets, and separators (for fields and groups of context lines) with escape sequences to display them in color on the terminal. The colors are defined by the environment variable GREP_COLORS. The deprecated environment variable GREP_COLOR is still supported, but its setting does not have priority",
-      args: {
-        name: "WHEN",
-        default: "auto",
-        suggestions: ["never", "always", "auto"],
-      },
-    },
-    {
-      name: ["-L", "--files-without-match"],
-      exclusiveOn: ["-l", "--files-with-matches"],
-      description:
-        "Suppress normal output; instead print the name of each input file from which no output would normally have been printed. The scanning will stop on the first match",
-    },
-    {
-      name: ["-l", "--files-with-matches"],
-      exclusiveOn: ["-L", "--files-without-match"],
-      description:
-        "Suppress normal output; instead print the name of each input file from which output would normally have been printed. The scanning will stop on the first match. (-l is specified by POSIX.)",
-    },
-    {
-      name: ["-m", "--max-count"],
-      description:
-        "Stop reading a file after NUM matching lines. If the input is standard input from a regular file, and NUM matching lines are output, grep ensures that the standard input is positioned to just after the last matching line before exiting, regardless of the presence of trailing context lines. This enables a calling process to resume a search. When grep stops after NUM matching lines, it outputs any trailing context lines. When the -c or --count option is also used, grep does not output a count greater than NUM. When the -v or --invert-match option is also used, grep stops after outputting NUM non-matching lines",
-      args: {
-        name: "NUM",
-      },
-    },
-    {
-      name: ["-o", "--only-matching"],
-      description:
-        "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line",
-    },
-    {
-      name: ["-q", "--quiet", "--silent"],
-      description:
-        "Quiet; do not write anything to standard output. Exit immediately with zero status if any match is found, even if an error was detected. Also see the -s or --no-messages option. (-q is specified by POSIX.)",
-    },
-    {
-      name: ["-s", "--no-messages"],
-      description:
-        "Suppress error messages about nonexistent or unreadable files. Portability note: unlike GNU grep, 7th Edition Unix grep did not conform to POSIX, because it lacked -q and its -s option behaved like GNU grep's -q option. USG -style grep also lacked -q but its -s option behaved like GNU grep. Portable shell scripts should avoid both -q and -s and should redirect standard and error output to /dev/null instead. (-s is specified by POSIX.)",
-    },
-    {
-      name: ["-b", "--byte-offset"],
-      description:
-        "Print the 0-based byte offset within the input file before each line of output. If -o (--only-matching) is specified, print the offset of the matching part itself",
-    },
-    {
-      name: ["-H", "--with-filename"],
-      description:
-        "Print the file name for each match. This is the default when there is more than one file to search",
-    },
-    {
-      name: ["-h", "--no-filename"],
-      description:
-        "Suppress the prefixing of file names on output. This is the default when there is only one file (or only standard input) to search",
-    },
-    {
-      name: "--label",
-      description:
-        "Display input actually coming from standard input as input coming from file LABEL. This is especially useful when implementing tools like zgrep, e.g., gzip -cd foo.gz | grep --label=foo -H something",
-      args: {
-        name: "LABEL",
-      },
-    },
-    {
-      name: ["-n", "--line-number"],
-      description:
-        "Prefix each line of output with the 1-based line number within its input file. (-n is specified by POSIX.)",
-    },
-    {
-      name: ["-T", "--initial-tab"],
-      description:
-        "Make sure that the first character of actual line content lies on a tab stop, so that the alignment of tabs looks normal. This is useful with options that prefix their output to the actual content: -H,-n, and -b. In order to improve the probability that lines from a single file will all start at the same column, this also causes the line number and byte offset (if present) to be printed in a minimum size field width",
-    },
-    {
-      name: ["-u", "--unix-byte-offsets"],
-      description:
-        "Report Unix-style byte offsets. This switch causes grep to report byte offsets as if the file were a Unix-style text file, i.e., with CR characters stripped off. This will produce results identical to running grep on a Unix machine. This option has no effect unless -b option is also used; it has no effect on platforms other than MS-DOS and MS -Windows",
-    },
-    {
-      name: "--null",
-      description:
-        "Output a zero byte (the ASCII NUL character) instead of the character that normally follows a file name. For example, grep -lZ outputs a zero byte after each file name instead of the usual newline. This option makes the output unambiguous, even in the presence of file names containing unusual characters like newlines. This option can be used with commands like find -print0, perl -0, sort -z, and xargs -0 to process arbitrary file names, even those that contain newline characters",
-    },
-    {
-      name: ["-A", "--after-context"],
-      description: "Print num lines of trailing context after each match",
-      args: {
-        name: "NUM",
-      },
-    },
-    {
-      name: ["-B", "--before-context"],
-      description:
-        "Print num lines of leading context before each match. See also the -A and -C options",
-      args: {
-        name: "NUM",
-      },
-    },
-    {
-      name: ["-C", "--context"],
-      description:
-        "Print NUM lines of output context. Places a line containing a group separator (--) between contiguous groups of matches. With the -o or --only-matching option, this has no effect and a warning is given",
-      args: {
-        name: "NUM",
-      },
-    },
-    {
-      name: ["-a", "--text"],
-      description:
-        "Treat all files as ASCII text. Normally grep will simply print ``Binary file ... matches'' if files contain binary characters. Use of this option forces grep to output lines matching the specified pattern",
-    },
-    {
-      name: "--binary-files",
-      description: "Controls searching and printing of binary files",
-      args: {
-        name: "value",
-        default: "binary",
-        suggestions: [
-          {
-            name: "binary",
-            description: "Search binary files but do not print them",
-          },
-          {
-            name: "without-match",
-            description: "Do not search binary files",
-          },
-          {
-            name: "text",
-            description: "Treat all files as text",
-          },
-        ],
-      },
-    },
-    {
-      name: ["-D", "--devices"],
-      description: "Specify the demanded action for devices, FIFOs and sockets",
-      args: {
-        name: "action",
-        default: "read",
-        suggestions: [
-          {
-            name: "read",
-            description: "Read as if they were normal files",
-          },
-          {
-            name: "skip",
-            description: "Devices will be silently skipped",
-          },
-        ],
-      },
-    },
-    {
-      name: ["-d", "--directories"],
-      description: "Specify the demanded action for directories",
-      args: {
-        name: "action",
-        default: "read",
-        suggestions: [
-          {
-            name: "read",
-            description:
-              "Directories are read in the same manner as normal files",
-          },
-          {
-            name: "skip",
-            description: "Silently ignore the directories",
-          },
-          {
-            name: "recurse",
-            description: "Read directories recursively",
-          },
-        ],
-      },
-    },
-    {
-      name: "--exclude",
-      description:
-        "Note that --exclude patterns take priority over --include patterns, and if no --include pattern is specified, all files are searched that are not excluded. Patterns are matched to the full path specified, not only to the filename component",
-      args: {
-        name: "GLOB",
-        isOptional: true,
-      },
-    },
-    {
-      name: "--exclude-dir",
-      description:
-        "If -R is specified, only directories matching the given filename pattern are searched.  Note that --exclude-dir patterns take priority over --include-dir patterns",
-      isRepeatable: true,
-      args: {
-        name: "dir",
-        template: "folders",
-        isOptional: true,
-      },
-    },
-    {
-      name: "-I",
-      description:
-        "Ignore binary files. This option is equivalent to --binary-file=without-match option",
-    },
-    {
-      name: "--include",
-      description:
-        "If specified, only files matching the given filename pattern are searched. Note that --exclude patterns take priority over --include patterns. Patterns are matched to the full path specified, not only to the filename component",
-      args: {
-        name: "GLOB",
-        isOptional: true,
-      },
-    },
-    {
-      name: "--include-dir",
-      description:
-        "If -R is specified, only directories matching the given filename pattern are searched. Note that --exclude-dir patterns take priority over --include-dir patterns",
-      args: {
-        name: "dir",
-        template: "folders",
-        isOptional: true,
-      },
-    },
-    {
-      name: ["-R", "-r", "--recursive"],
-      description: "Recursively search subdirectories listed",
-    },
-    {
-      name: "--line-buffered",
-      description:
-        "Force output to be line buffered. By default, output is line buffered when standard output is a terminal and block buffered otherwise",
-    },
-    {
-      name: ["-U", "--binary"],
-      description: "Search binary files, but do not attempt to print them",
-    },
-    {
-      name: ["-J", "-bz2decompress"],
-      description:
-        "Decompress the bzip2(1) compressed file before looking for the text",
-    },
-    {
-      name: ["-V", "--version"],
-      description: "Print version number of grep to the standard output stream",
-    },
-    {
-      name: ["-P", "--perl-regexp"],
-      description: "Interpret pattern as a Perl regular expression",
-    },
-    {
-      name: ["-f", "--file"],
-      description:
-        "Obtain patterns from FILE, one per line. The empty file contains zero patterns, and therefore matches nothing. (-f is specified by POSIX.)",
-      args: {
-        name: "FILE",
-        template: "filepaths",
-      },
-    },
-  ],
-  additionalSuggestions: [
-    {
-      name: "-RIn",
-      description:
-        "Search for a pattern [R]ecursively in the current directory, showing matching line [n]umbers, [I]gnoring non-text files",
-      insertValue: "-RI{cursor}",
-    },
-    {
-      name: "-Hn",
-      description:
-        "Print file name with the corresponding line number (n) for each match",
-      insertValue: "-H{cursor}",
-    },
-  ],
+	name: "grep",
+	description:
+		"Matches patterns in input text. Supports simple patterns and regular expressions",
+	args: [
+		{
+			name: "search pattern",
+			suggestCurrentToken: true,
+		},
+		{
+			name: "file",
+			template: "filepaths",
+		},
+	],
+	options: [
+		{
+			name: "--help",
+			description:
+				"Print a usage message briefly summarizing these command-line options and the bug-reporting address, then exit",
+		},
+		{
+			name: ["-E", "--extended-regexp"],
+			description:
+				"Interpret PATTERN as an extended regular expression (-E is specified by POSIX.)",
+		},
+		{
+			name: ["-F", "--fixed-string"],
+			description:
+				"Interpret PATTERN as a list of fixed strings, separated by newlines, any of which is to be matched. (-F is specified by POSIX.)",
+		},
+		{
+			name: ["-G", "--basic-regexp"],
+			description:
+				"Interpret PATTERN as a basic regular expression (BRE, see below). This is the default",
+		},
+		{
+			name: ["-e", "--regexp"],
+			description:
+				"Use PATTERN as the pattern. This can be used to specify multiple search patterns, or to protect a pattern beginning with a hyphen (-). (-e is specified by POSIX.)",
+			args: {
+				name: "pattern",
+			},
+		},
+		{
+			name: ["-i", "--ignore-case", "-y"],
+			description:
+				"Ignore case distinctions in both the PATTERN and the input files. (-i is specified by POSIX.)",
+		},
+		{
+			name: ["-v", "--invert-match"],
+			description:
+				"Invert the sense of matching, to select non-matching lines. (-v is specified by POSIX.)",
+		},
+		{
+			name: ["-w", "--word-regexp"],
+			description:
+				"Select only those lines containing matches that form whole words. The test is that the matching substring must either be at the beginning of the line, or preceded by a non-word constituent character. Similarly, it must be either at the end of the line or followed by a non-word constituent character. Word-constituent characters are letters, digits, and the underscore",
+		},
+		{
+			name: ["-x", "--line-regexp"],
+			description:
+				"Select only those matches that exactly match the whole line. (-x is specified by POSIX.)",
+		},
+		{
+			name: ["-c", "--count"],
+			description:
+				"Suppress normal output; instead print a count of matching lines for each input file. With the -v, --invert-match option, count non-matching lines. (-c is specified by POSIX.)",
+		},
+		{
+			name: "--color",
+			description:
+				"Surround the matched (non-empty) strings, matching lines, context lines, file names, line numbers, byte offsets, and separators (for fields and groups of context lines) with escape sequences to display them in color on the terminal. The colors are defined by the environment variable GREP_COLORS. The deprecated environment variable GREP_COLOR is still supported, but its setting does not have priority",
+			args: {
+				name: "WHEN",
+				default: "auto",
+				suggestions: ["never", "always", "auto"],
+			},
+		},
+		{
+			name: ["-L", "--files-without-match"],
+			exclusiveOn: ["-l", "--files-with-matches"],
+			description:
+				"Suppress normal output; instead print the name of each input file from which no output would normally have been printed. The scanning will stop on the first match",
+		},
+		{
+			name: ["-l", "--files-with-matches"],
+			exclusiveOn: ["-L", "--files-without-match"],
+			description:
+				"Suppress normal output; instead print the name of each input file from which output would normally have been printed. The scanning will stop on the first match. (-l is specified by POSIX.)",
+		},
+		{
+			name: ["-m", "--max-count"],
+			description:
+				"Stop reading a file after NUM matching lines. If the input is standard input from a regular file, and NUM matching lines are output, grep ensures that the standard input is positioned to just after the last matching line before exiting, regardless of the presence of trailing context lines. This enables a calling process to resume a search. When grep stops after NUM matching lines, it outputs any trailing context lines. When the -c or --count option is also used, grep does not output a count greater than NUM. When the -v or --invert-match option is also used, grep stops after outputting NUM non-matching lines",
+			args: {
+				name: "NUM",
+			},
+		},
+		{
+			name: ["-o", "--only-matching"],
+			description:
+				"Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line",
+		},
+		{
+			name: ["-q", "--quiet", "--silent"],
+			description:
+				"Quiet; do not write anything to standard output. Exit immediately with zero status if any match is found, even if an error was detected. Also see the -s or --no-messages option. (-q is specified by POSIX.)",
+		},
+		{
+			name: ["-s", "--no-messages"],
+			description:
+				"Suppress error messages about nonexistent or unreadable files. Portability note: unlike GNU grep, 7th Edition Unix grep did not conform to POSIX, because it lacked -q and its -s option behaved like GNU grep's -q option. USG -style grep also lacked -q but its -s option behaved like GNU grep. Portable shell scripts should avoid both -q and -s and should redirect standard and error output to /dev/null instead. (-s is specified by POSIX.)",
+		},
+		{
+			name: ["-b", "--byte-offset"],
+			description:
+				"Print the 0-based byte offset within the input file before each line of output. If -o (--only-matching) is specified, print the offset of the matching part itself",
+		},
+		{
+			name: ["-H", "--with-filename"],
+			description:
+				"Print the file name for each match. This is the default when there is more than one file to search",
+		},
+		{
+			name: ["-h", "--no-filename"],
+			description:
+				"Suppress the prefixing of file names on output. This is the default when there is only one file (or only standard input) to search",
+		},
+		{
+			name: "--label",
+			description:
+				"Display input actually coming from standard input as input coming from file LABEL. This is especially useful when implementing tools like zgrep, e.g., gzip -cd foo.gz | grep --label=foo -H something",
+			args: {
+				name: "LABEL",
+			},
+		},
+		{
+			name: ["-n", "--line-number"],
+			description:
+				"Prefix each line of output with the 1-based line number within its input file. (-n is specified by POSIX.)",
+		},
+		{
+			name: ["-T", "--initial-tab"],
+			description:
+				"Make sure that the first character of actual line content lies on a tab stop, so that the alignment of tabs looks normal. This is useful with options that prefix their output to the actual content: -H,-n, and -b. In order to improve the probability that lines from a single file will all start at the same column, this also causes the line number and byte offset (if present) to be printed in a minimum size field width",
+		},
+		{
+			name: ["-u", "--unix-byte-offsets"],
+			description:
+				"Report Unix-style byte offsets. This switch causes grep to report byte offsets as if the file were a Unix-style text file, i.e., with CR characters stripped off. This will produce results identical to running grep on a Unix machine. This option has no effect unless -b option is also used; it has no effect on platforms other than MS-DOS and MS -Windows",
+		},
+		{
+			name: "--null",
+			description:
+				"Output a zero byte (the ASCII NUL character) instead of the character that normally follows a file name. For example, grep -lZ outputs a zero byte after each file name instead of the usual newline. This option makes the output unambiguous, even in the presence of file names containing unusual characters like newlines. This option can be used with commands like find -print0, perl -0, sort -z, and xargs -0 to process arbitrary file names, even those that contain newline characters",
+		},
+		{
+			name: ["-A", "--after-context"],
+			description: "Print num lines of trailing context after each match",
+			args: {
+				name: "NUM",
+			},
+		},
+		{
+			name: ["-B", "--before-context"],
+			description:
+				"Print num lines of leading context before each match. See also the -A and -C options",
+			args: {
+				name: "NUM",
+			},
+		},
+		{
+			name: ["-C", "--context"],
+			description:
+				"Print NUM lines of output context. Places a line containing a group separator (--) between contiguous groups of matches. With the -o or --only-matching option, this has no effect and a warning is given",
+			args: {
+				name: "NUM",
+			},
+		},
+		{
+			name: ["-a", "--text"],
+			description:
+				"Treat all files as ASCII text. Normally grep will simply print ``Binary file ... matches'' if files contain binary characters. Use of this option forces grep to output lines matching the specified pattern",
+		},
+		{
+			name: "--binary-files",
+			description: "Controls searching and printing of binary files",
+			args: {
+				name: "value",
+				default: "binary",
+				suggestions: [
+					{
+						name: "binary",
+						description: "Search binary files but do not print them",
+					},
+					{
+						name: "without-match",
+						description: "Do not search binary files",
+					},
+					{
+						name: "text",
+						description: "Treat all files as text",
+					},
+				],
+			},
+		},
+		{
+			name: ["-D", "--devices"],
+			description: "Specify the demanded action for devices, FIFOs and sockets",
+			args: {
+				name: "action",
+				default: "read",
+				suggestions: [
+					{
+						name: "read",
+						description: "Read as if they were normal files",
+					},
+					{
+						name: "skip",
+						description: "Devices will be silently skipped",
+					},
+				],
+			},
+		},
+		{
+			name: ["-d", "--directories"],
+			description: "Specify the demanded action for directories",
+			args: {
+				name: "action",
+				default: "read",
+				suggestions: [
+					{
+						name: "read",
+						description:
+							"Directories are read in the same manner as normal files",
+					},
+					{
+						name: "skip",
+						description: "Silently ignore the directories",
+					},
+					{
+						name: "recurse",
+						description: "Read directories recursively",
+					},
+				],
+			},
+		},
+		{
+			name: "--exclude",
+			description:
+				"Note that --exclude patterns take priority over --include patterns, and if no --include pattern is specified, all files are searched that are not excluded. Patterns are matched to the full path specified, not only to the filename component",
+			args: {
+				name: "GLOB",
+				isOptional: true,
+			},
+		},
+		{
+			name: "--exclude-dir",
+			description:
+				"If -R is specified, only directories matching the given filename pattern are searched.  Note that --exclude-dir patterns take priority over --include-dir patterns",
+			isRepeatable: true,
+			args: {
+				name: "dir",
+				template: "folders",
+				isOptional: true,
+			},
+		},
+		{
+			name: "-I",
+			description:
+				"Ignore binary files. This option is equivalent to --binary-file=without-match option",
+		},
+		{
+			name: "--include",
+			description:
+				"If specified, only files matching the given filename pattern are searched. Note that --exclude patterns take priority over --include patterns. Patterns are matched to the full path specified, not only to the filename component",
+			args: {
+				name: "GLOB",
+				isOptional: true,
+			},
+		},
+		{
+			name: "--include-dir",
+			description:
+				"If -R is specified, only directories matching the given filename pattern are searched. Note that --exclude-dir patterns take priority over --include-dir patterns",
+			args: {
+				name: "dir",
+				template: "folders",
+				isOptional: true,
+			},
+		},
+		{
+			name: ["-R", "-r", "--recursive"],
+			description: "Recursively search subdirectories listed",
+		},
+		{
+			name: "--line-buffered",
+			description:
+				"Force output to be line buffered. By default, output is line buffered when standard output is a terminal and block buffered otherwise",
+		},
+		{
+			name: ["-U", "--binary"],
+			description: "Search binary files, but do not attempt to print them",
+		},
+		{
+			name: ["-J", "-bz2decompress"],
+			description:
+				"Decompress the bzip2(1) compressed file before looking for the text",
+		},
+		{
+			name: ["-V", "--version"],
+			description: "Print version number of grep to the standard output stream",
+		},
+		{
+			name: ["-P", "--perl-regexp"],
+			description: "Interpret pattern as a Perl regular expression",
+		},
+		{
+			name: ["-f", "--file"],
+			description:
+				"Obtain patterns from FILE, one per line. The empty file contains zero patterns, and therefore matches nothing. (-f is specified by POSIX.)",
+			args: {
+				name: "FILE",
+				template: "filepaths",
+			},
+		},
+	],
+	additionalSuggestions: [
+		{
+			name: "-RIn",
+			description:
+				"Search for a pattern [R]ecursively in the current directory, showing matching line [n]umbers, [I]gnoring non-text files",
+			insertValue: "-RI{cursor}",
+		},
+		{
+			name: "-Hn",
+			description:
+				"Print file name with the corresponding line number (n) for each match",
+			insertValue: "-H{cursor}",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/head.ts b/extensions/terminal-suggest/src/completions/upstream/head.ts
index bc837e09dad1..a7ae0a7aedec 100644
--- a/extensions/terminal-suggest/src/completions/upstream/head.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/head.ts
@@ -1,35 +1,35 @@
 const completionSpec: Fig.Spec = {
-  name: "head",
-  description: "Output the first part of files",
-  args: {
-    name: "file",
-    template: "filepaths",
-  },
-  options: [
-    {
-      name: ["-c", "--bytes"],
-      description: "Print the first [numBytes] bytes of each file",
-      args: { name: "numBytes" },
-    },
-    {
-      name: ["-n", "--lines"],
-      description: "Print the first [numLines] lines instead of the first 10",
-      args: { name: "numLines" },
-    },
-    {
-      name: ["-q", "--quiet", "--silent"],
-      description: "Never print headers giving file names",
-    },
-    {
-      name: ["-v", "--verbose"],
-      description: "Always print headers giving file names",
-    },
-    { name: "--help", description: "Display this help and exit" },
-    {
-      name: "--version",
-      description: "Output version information and exit",
-    },
-  ],
+	name: "head",
+	description: "Output the first part of files",
+	args: {
+		name: "file",
+		template: "filepaths",
+	},
+	options: [
+		{
+			name: ["-c", "--bytes"],
+			description: "Print the first [numBytes] bytes of each file",
+			args: { name: "numBytes" },
+		},
+		{
+			name: ["-n", "--lines"],
+			description: "Print the first [numLines] lines instead of the first 10",
+			args: { name: "numLines" },
+		},
+		{
+			name: ["-q", "--quiet", "--silent"],
+			description: "Never print headers giving file names",
+		},
+		{
+			name: ["-v", "--verbose"],
+			description: "Always print headers giving file names",
+		},
+		{ name: "--help", description: "Display this help and exit" },
+		{
+			name: "--version",
+			description: "Output version information and exit",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/kill.ts b/extensions/terminal-suggest/src/completions/upstream/kill.ts
index abdb87ffdb6e..5df83c453e19 100644
--- a/extensions/terminal-suggest/src/completions/upstream/kill.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/kill.ts
@@ -1,63 +1,63 @@
 // Compatibility: macOS
 
 function processIcon(path: string): string {
-  const idx = path.indexOf(".app/");
-  if (idx === -1) {
-    return "fig://icon?type=gear";
-  }
-  return "fig://" + path.slice(0, idx + 4);
+	const idx = path.indexOf(".app/");
+	if (idx === -1) {
+		return "fig://icon?type=gear";
+	}
+	return "fig://" + path.slice(0, idx + 4);
 }
 
 const completionSpec: Fig.Spec = {
-  name: "kill",
-  description: "Terminate or signal a process",
-  args: {
-    name: "pid",
-    isVariadic: true,
-    generators: {
-      script: ["bash", "-c", "ps axo pid,comm | sed 1d"],
-      postProcess: (result: string) => {
-        return result.split("\n").map((line) => {
-          const [pid, path] = line.trim().split(/\s+/);
-          const name = path.slice(path.lastIndexOf("/") + 1);
-          return {
-            name: pid,
-            description: path,
-            displayName: `${pid} (${name})`,
-            icon: processIcon(path),
-          };
-        });
-      },
-    },
-  },
-  options: [
-    {
-      name: "-s",
-      description: "A symbolic signal name specifying the signal to be sent",
-      args: {
-        name: "signal_name",
-        generators: {
-          // Bash's `kill` builtin has different output to /bin/kill
-          script: ["env", "kill", "-l"],
-          postProcess: (out) =>
-            out.match(/\w+/g)?.map((name) => ({
-              name,
-              description: `Send ${name} instead of TERM`,
-              icon: "fig://icon?type=string",
-            })),
-        },
-      },
-    },
-    {
-      name: "-l",
-      description:
-        "If no operand is given, list the signal names; otherwise, write the signal name corresponding to exit_status",
-      args: {
-        name: "exit_status",
-        isOptional: true,
-      },
-    },
-  ],
+	name: "kill",
+	description: "Terminate or signal a process",
+	args: {
+		name: "pid",
+		isVariadic: true,
+		generators: {
+			script: ["bash", "-c", "ps axo pid,comm | sed 1d"],
+			postProcess: (result: string) => {
+				return result.split("\n").map((line) => {
+					const [pid, path] = line.trim().split(/\s+/);
+					const name = path.slice(path.lastIndexOf("/") + 1);
+					return {
+						name: pid,
+						description: path,
+						displayName: `${pid} (${name})`,
+						icon: processIcon(path),
+					};
+				});
+			},
+		},
+	},
+	options: [
+		{
+			name: "-s",
+			description: "A symbolic signal name specifying the signal to be sent",
+			args: {
+				name: "signal_name",
+				generators: {
+					// Bash's `kill` builtin has different output to /bin/kill
+					script: ["env", "kill", "-l"],
+					postProcess: (out) =>
+						out.match(/\w+/g)?.map((name) => ({
+							name,
+							description: `Send ${name} instead of TERM`,
+							icon: "fig://icon?type=string",
+						})),
+				},
+			},
+		},
+		{
+			name: "-l",
+			description:
+				"If no operand is given, list the signal names; otherwise, write the signal name corresponding to exit_status",
+			args: {
+				name: "exit_status",
+				isOptional: true,
+			},
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/killall.ts b/extensions/terminal-suggest/src/completions/upstream/killall.ts
index c22e55dd6a4f..c963a97177fa 100644
--- a/extensions/terminal-suggest/src/completions/upstream/killall.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/killall.ts
@@ -1,153 +1,153 @@
 // Linux incompatible
 
 const signals = [
-  "hup",
-  "int",
-  "quit",
-  "ill",
-  "trap",
-  "abrt",
-  "emt",
-  "fpe",
-  "kill",
-  "bus",
-  "segv",
-  "sys",
-  "pipe",
-  "alrm",
-  // This is the default signal
-  // "term",
-  "urg",
-  "stop",
-  "tstp",
-  "cont",
-  "chld",
-  "ttin",
-  "ttou",
-  "io",
-  "xcpu",
-  "xfsz",
-  "vtalrm",
-  "prof",
-  "winch",
-  "info",
-  "usr1",
-  "usr2",
+	"hup",
+	"int",
+	"quit",
+	"ill",
+	"trap",
+	"abrt",
+	"emt",
+	"fpe",
+	"kill",
+	"bus",
+	"segv",
+	"sys",
+	"pipe",
+	"alrm",
+	// This is the default signal
+	// "term",
+	"urg",
+	"stop",
+	"tstp",
+	"cont",
+	"chld",
+	"ttin",
+	"ttou",
+	"io",
+	"xcpu",
+	"xfsz",
+	"vtalrm",
+	"prof",
+	"winch",
+	"info",
+	"usr1",
+	"usr2",
 ];
 
 const completionSpec: Fig.Spec = {
-  name: "killall",
-  description: "Kill processes by name",
-  args: {
-    name: "process_name",
-    isVariadic: true,
-    generators: {
-      // All processes, only display the path
-      script: ["bash", "-c", "ps -A -o comm | sort -u"],
-      postProcess: (out) =>
-        out
-          .trim()
-          .split("\n")
-          .map((path) => {
-            const appExtIndex = path.indexOf(".app/");
-            const isApp = appExtIndex !== -1;
-            const name = path.slice(path.lastIndexOf("/") + 1);
-            const nameChars = new Set(name);
-            const badChars = ["(", "_", "."];
-            return {
-              name,
-              description: path,
-              priority:
-                !badChars.some((char) => nameChars.has(char)) && isApp
-                  ? 51
-                  : 40,
-              icon: isApp
-                ? "fig://" + path.slice(0, appExtIndex + 4)
-                : "fig://icon?type=gear",
-            };
-          }),
-    },
-  },
-  options: [
-    {
-      name: "-d",
-      description: "Be verbose (dry run) and display number of user processes",
-    },
-    {
-      name: "-e",
-      description:
-        "Use the effective user ID instead of the real user ID for matching processes with -u",
-    },
-    {
-      name: "-help",
-      description: "Display help and exit",
-    },
-    {
-      name: "-I",
-      description: "Request confirmation before killing each process",
-    },
-    {
-      name: "-l",
-      description: "List the names of the available signals and exit",
-    },
-    {
-      name: "-m",
-      description: "Match the process name as a regular expression",
-    },
-    {
-      name: "-v",
-      description: "Be verbose",
-    },
-    {
-      name: "-s",
-      description: "Be verbose (dry run)",
-    },
-    ...signals.map((signal) => ({
-      name: "-SIG" + signal.toUpperCase(),
-      description: `Send ${signal.toUpperCase()} instead of TERM`,
-    })),
-    {
-      name: "-u",
-      description:
-        "Limit potentially matching processes to those belonging to the user",
-      args: {
-        name: "user",
-        generators: {
-          script: ["bash", "-c", "dscl . -list /Users | grep -v '^_'"],
-          postProcess: (out) =>
-            out
-              .trim()
-              .split("\n")
-              .map((username) => ({
-                name: username,
-                icon: "fig://template?badge=👤",
-              })),
-        },
-      },
-    },
-    {
-      name: "-t",
-      description:
-        "Limit matching processes to those running on the specified TTY",
-      args: {
-        name: "tty",
-      },
-    },
-    {
-      name: "-c",
-      description: "Limit matching processes to those matching the given name",
-      args: {
-        name: "name",
-      },
-    },
-    {
-      name: "-q",
-      description: "Suppress error message if no processes are matched",
-    },
-    {
-      name: "-z",
-      description: "Do not skip zombies",
-    },
-  ],
+	name: "killall",
+	description: "Kill processes by name",
+	args: {
+		name: "process_name",
+		isVariadic: true,
+		generators: {
+			// All processes, only display the path
+			script: ["bash", "-c", "ps -A -o comm | sort -u"],
+			postProcess: (out) =>
+				out
+					.trim()
+					.split("\n")
+					.map((path) => {
+						const appExtIndex = path.indexOf(".app/");
+						const isApp = appExtIndex !== -1;
+						const name = path.slice(path.lastIndexOf("/") + 1);
+						const nameChars = new Set(name);
+						const badChars = ["(", "_", "."];
+						return {
+							name,
+							description: path,
+							priority:
+								!badChars.some((char) => nameChars.has(char)) && isApp
+									? 51
+									: 40,
+							icon: isApp
+								? "fig://" + path.slice(0, appExtIndex + 4)
+								: "fig://icon?type=gear",
+						};
+					}),
+		},
+	},
+	options: [
+		{
+			name: "-d",
+			description: "Be verbose (dry run) and display number of user processes",
+		},
+		{
+			name: "-e",
+			description:
+				"Use the effective user ID instead of the real user ID for matching processes with -u",
+		},
+		{
+			name: "-help",
+			description: "Display help and exit",
+		},
+		{
+			name: "-I",
+			description: "Request confirmation before killing each process",
+		},
+		{
+			name: "-l",
+			description: "List the names of the available signals and exit",
+		},
+		{
+			name: "-m",
+			description: "Match the process name as a regular expression",
+		},
+		{
+			name: "-v",
+			description: "Be verbose",
+		},
+		{
+			name: "-s",
+			description: "Be verbose (dry run)",
+		},
+		...signals.map((signal) => ({
+			name: "-SIG" + signal.toUpperCase(),
+			description: `Send ${signal.toUpperCase()} instead of TERM`,
+		})),
+		{
+			name: "-u",
+			description:
+				"Limit potentially matching processes to those belonging to the user",
+			args: {
+				name: "user",
+				generators: {
+					script: ["bash", "-c", "dscl . -list /Users | grep -v '^_'"],
+					postProcess: (out) =>
+						out
+							.trim()
+							.split("\n")
+							.map((username) => ({
+								name: username,
+								icon: "fig://template?badge=👤",
+							})),
+				},
+			},
+		},
+		{
+			name: "-t",
+			description:
+				"Limit matching processes to those running on the specified TTY",
+			args: {
+				name: "tty",
+			},
+		},
+		{
+			name: "-c",
+			description: "Limit matching processes to those matching the given name",
+			args: {
+				name: "name",
+			},
+		},
+		{
+			name: "-q",
+			description: "Suppress error message if no processes are matched",
+		},
+		{
+			name: "-z",
+			description: "Do not skip zombies",
+		},
+	],
 };
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/less.ts b/extensions/terminal-suggest/src/completions/upstream/less.ts
index f8994808a44d..f50abbd4db85 100644
--- a/extensions/terminal-suggest/src/completions/upstream/less.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/less.ts
@@ -1,19 +1,19 @@
 const completionSpec: Fig.Spec = {
-  name: "less",
-  description: "Opposite of more",
-  args: {
-    isVariadic: true,
-    template: "filepaths",
-  },
-  options: [
-    {
-      name: ["-?", "--help"],
-      description:
-        'This option displays a summary of the commands accepted by less (the same as the h command).  (Depending on how your shell interprets the question mark, it may be necessary to quote the question mark, thus: "-?"',
-    },
-    {
-      name: ["-a", "--search-skip-screen"],
-      description: `By default, forward searches start at the top of the displayed
+	name: "less",
+	description: "Opposite of more",
+	args: {
+		isVariadic: true,
+		template: "filepaths",
+	},
+	options: [
+		{
+			name: ["-?", "--help"],
+			description:
+				'This option displays a summary of the commands accepted by less (the same as the h command).  (Depending on how your shell interprets the question mark, it may be necessary to quote the question mark, thus: "-?"',
+		},
+		{
+			name: ["-a", "--search-skip-screen"],
+			description: `By default, forward searches start at the top of the displayed
 screen and backwards searches start at the bottom of the
 displayed screen (except for repeated searches invoked by the n
 or N commands, which start after or before the "target" line
@@ -21,10 +21,10 @@ respectively; see the -j option for more about the target line).
 The -a option causes forward searches to instead start at the
 bottom of the screen and backward searches to start at the top
 of the screen, thus skipping all lines displayed on the screen`,
-    },
-    {
-      name: ["-A", "--SEARCH-SKIP-SCREEN"],
-      description: `Causes all forward searches (not just non-repeated searches) to
+		},
+		{
+			name: ["-A", "--SEARCH-SKIP-SCREEN"],
+			description: `Causes all forward searches (not just non-repeated searches) to
 start just after the target line, and all backward searches to
 start just before the target line.  Thus, forward searches will
 skip part of the displayed screen (from the first line up to and
@@ -32,23 +32,23 @@ including the target line).  Similarly backwards searches will
 skip the displayed screen from the last line up to and including
 the target line.  This was the default behavior in less versions
 prior to 441`,
-    },
+		},
 
-    {
-      name: ["-b", "--buffers"],
-      args: { name: "n" },
-      description: `Specifies the amount of buffer space less will use for each
+		{
+			name: ["-b", "--buffers"],
+			args: { name: "n" },
+			description: `Specifies the amount of buffer space less will use for each
 file, in units of kilobytes (1024 bytes).  By default 64 KB of
 buffer space is used for each file (unless the file is a pipe;
 see the -B option).  The -b option specifies instead that n
 kilobytes of buffer space should be used for each file.  If n is
 -1, buffer space is unlimited; that is, the entire file can be
 read into memory`,
-    },
+		},
 
-    {
-      name: ["-B", "--auto-buffers"],
-      description: `By default, when data is read from a pipe, buffers are allocated
+		{
+			name: ["-B", "--auto-buffers"],
+			description: `By default, when data is read from a pipe, buffers are allocated
 automatically as needed.  If a large amount of data is read from
 the pipe, this can cause a large amount of memory to be
 allocated.  The -B option disables this automatic allocation of
@@ -57,33 +57,33 @@ specified by the -b option) is used for the pipe.  Warning: use
 of -B can result in erroneous display, since only the most
 recently viewed part of the piped data is kept in memory; any
 earlier data is lost`,
-    },
+		},
 
-    {
-      name: ["-c", "--clear-screen"],
-      description: `Causes full screen repaints to be painted from the top line
+		{
+			name: ["-c", "--clear-screen"],
+			description: `Causes full screen repaints to be painted from the top line
 down.  By default, full screen repaints are done by scrolling
 from the bottom of the screen`,
-    },
+		},
 
-    {
-      name: ["-C", "--CLEAR-SCREEN"],
-      description: `Same as -c, for compatibility with older versions of less`,
-    },
+		{
+			name: ["-C", "--CLEAR-SCREEN"],
+			description: `Same as -c, for compatibility with older versions of less`,
+		},
 
-    {
-      name: ["-d", "--dumb"],
-      description: `The -d option suppresses the error message normally displayed if
+		{
+			name: ["-d", "--dumb"],
+			description: `The -d option suppresses the error message normally displayed if
 the terminal is dumb; that is, lacks some important capability,
 such as the ability to clear the screen or scroll backward.  The
 -d option does not otherwise change the behavior of less on a
 dumb terminal`,
-    },
+		},
 
-    {
-      name: ["-D", "--color"],
-      args: { name: "xcolor" },
-      description: `Changes the color of different parts of the displayed text.  x
+		{
+			name: ["-D", "--color"],
+			args: { name: "xcolor" },
+			description: `Changes the color of different parts of the displayed text.  x
 is a single character which selects the type of text whose color
 is being set:
 B      Binary characters.
@@ -144,80 +144,80 @@ color is set to that of normal text.  On MS-DOS versions of
 less, 8-bit color is not supported; instead, decimal values are
 interpreted as 4-bit CHAR_INFO.Attributes values (see
 https://docs.microsoft.com/en-us/windows/console/char-info-str)`,
-    },
+		},
 
-    {
-      name: ["-e", "--quit-at-eof"],
-      description: `Causes less to automatically exit the second time it reaches
+		{
+			name: ["-e", "--quit-at-eof"],
+			description: `Causes less to automatically exit the second time it reaches
 end-of-file.  By default, the only way to exit less is via the
 "q" command`,
-    },
+		},
 
-    {
-      name: ["-E", "--QUIT-AT-EOF"],
-      description: `Causes less to automatically exit the first time it reaches end-
+		{
+			name: ["-E", "--QUIT-AT-EOF"],
+			description: `Causes less to automatically exit the first time it reaches end-
 of-file`,
-    },
+		},
 
-    {
-      name: ["-f", "--force"],
-      description: `Forces non-regular files to be opened.  (A non-regular file is a
+		{
+			name: ["-f", "--force"],
+			description: `Forces non-regular files to be opened.  (A non-regular file is a
 directory or a device special file.)  Also suppresses the
 warning message when a binary file is opened.  By default, less
 will refuse to open non-regular files.  Note that some operating
 systems will not allow directories to be read, even if -f is
 set`,
-    },
+		},
 
-    {
-      name: ["-F", "--quit-if-one-screen"],
-      description: `Causes less to automatically exit if the entire file can be
+		{
+			name: ["-F", "--quit-if-one-screen"],
+			description: `Causes less to automatically exit if the entire file can be
 displayed on the first screen`,
-    },
+		},
 
-    {
-      name: ["-g", "--hilite-search"],
-      description: `Normally, less will highlight ALL strings which match the last
+		{
+			name: ["-g", "--hilite-search"],
+			description: `Normally, less will highlight ALL strings which match the last
 search command.  The -g option changes this behavior to
 highlight only the particular string which was found by the last
 search command.  This can cause less to run somewhat faster than
 the default`,
-    },
+		},
 
-    {
-      name: ["-G", "--HILITE-SEARCH"],
-      description: `The -G option suppresses all highlighting of strings found by
+		{
+			name: ["-G", "--HILITE-SEARCH"],
+			description: `The -G option suppresses all highlighting of strings found by
 search commands`,
-    },
+		},
 
-    {
-      name: ["-h", "--max-back-scroll"],
-      args: { name: "n" },
-      description: `Specifies a maximum number of lines to scroll backward.  If it
+		{
+			name: ["-h", "--max-back-scroll"],
+			args: { name: "n" },
+			description: `Specifies a maximum number of lines to scroll backward.  If it
 is necessary to scroll backward more than n lines, the screen is
 repainted in a forward direction instead.  (If the terminal does
 not have the ability to scroll backward, -h0 is implied.)`,
-    },
+		},
 
-    {
-      name: ["-i", "--ignore-case"],
-      description: `Causes searches to ignore case; that is, uppercase and lowercase
+		{
+			name: ["-i", "--ignore-case"],
+			description: `Causes searches to ignore case; that is, uppercase and lowercase
 are considered identical.  This option is ignored if any
 uppercase letters appear in the search pattern; in other words,
 if a pattern contains uppercase letters, then that search does
 not ignore case`,
-    },
+		},
 
-    {
-      name: ["-I", "--IGNORE-CASE"],
-      description: `Like -i, but searches ignore case even if the pattern contains
+		{
+			name: ["-I", "--IGNORE-CASE"],
+			description: `Like -i, but searches ignore case even if the pattern contains
 uppercase letters`,
-    },
+		},
 
-    {
-      name: ["-j", "--jump-target"],
-      args: { name: "n" },
-      description: `Specifies a line on the screen where the "target" line is to be
+		{
+			name: ["-j", "--jump-target"],
+			args: { name: "n" },
+			description: `Specifies a line on the screen where the "target" line is to be
 positioned.  The target line is the line specified by any
 command to search for a pattern, jump to a line number, jump to
 a file percentage or jump to a tag.  The screen line may be
@@ -240,57 +240,57 @@ fourth line on the screen, so forward searches begin at the
 fifth line on the screen.  However nonrepeated searches (invoked
 with "/" or "?") always begin at the start or end of the current
 screen respectively`,
-    },
+		},
 
-    {
-      name: ["-J", "--status-column"],
-      description: `Displays a status column at the left edge of the screen.  The
+		{
+			name: ["-J", "--status-column"],
+			description: `Displays a status column at the left edge of the screen.  The
 status column shows the lines that matched the current search,
 and any lines that are marked (via the m or M command)`,
-    },
+		},
 
-    {
-      name: ["-k", "--lesskey-file"],
-      args: { name: "filename", template: "filepaths" },
-      description: `Causes less to open and interpret the named file as a lesskey(1)
+		{
+			name: ["-k", "--lesskey-file"],
+			args: { name: "filename", template: "filepaths" },
+			description: `Causes less to open and interpret the named file as a lesskey(1)
 file.  Multiple -k options may be specified.  If the LESSKEY or
 LESSKEY_SYSTEM environment variable is set, or if a lesskey file
 is found in a standard place (see KEY BINDINGS), it is also used
 as a lesskey file`,
-    },
+		},
 
-    {
-      name: ["-K", "--quit-on-intr"],
-      description: `Causes less to exit immediately (with status 2) when an
+		{
+			name: ["-K", "--quit-on-intr"],
+			description: `Causes less to exit immediately (with status 2) when an
 interrupt character (usually ^C) is typed.  Normally, an
 interrupt character causes less to stop whatever it is doing and
 return to its command prompt.  Note that use of this option
 makes it impossible to return to the command prompt from the "F"
 command`,
-    },
+		},
 
-    {
-      name: ["-L", "--no-lessopen"],
-      description: `Ignore the LESSOPEN environment variable (see the INPUT
+		{
+			name: ["-L", "--no-lessopen"],
+			description: `Ignore the LESSOPEN environment variable (see the INPUT
 PREPROCESSOR section below).  This option can be set from within
 less, but it will apply only to files opened subsequently, not
 to the file which is currently open`,
-    },
+		},
 
-    {
-      name: ["-m", "--long-prompt"],
-      description: `Causes less to prompt verbosely (like more), with the percent
+		{
+			name: ["-m", "--long-prompt"],
+			description: `Causes less to prompt verbosely (like more), with the percent
 into the file.  By default, less prompts with a colon`,
-    },
+		},
 
-    {
-      name: ["-M", "--LONG-PROMPT"],
-      description: `Causes less to prompt even more verbosely than more`,
-    },
+		{
+			name: ["-M", "--LONG-PROMPT"],
+			description: `Causes less to prompt even more verbosely than more`,
+		},
 
-    {
-      name: ["-n", "--line-numbers"],
-      description: `Suppresses line numbers.  The default (to use line numbers) may
+		{
+			name: ["-n", "--line-numbers"],
+			description: `Suppresses line numbers.  The default (to use line numbers) may
 cause less to run more slowly in some cases, especially with a
 very large input file.  Suppressing line numbers with the -n
 option will avoid this problem.  Using line numbers means: the
@@ -298,46 +298,46 @@ line number will be displayed in the verbose prompt and in the =
 command, and the v command will pass the current line number to
 the editor (see also the discussion of LESSEDIT in PROMPTS
 below)`,
-    },
+		},
 
-    {
-      name: ["-N", "--LINE-NUMBERS"],
-      description: `Causes a line number to be displayed at the beginning of each
+		{
+			name: ["-N", "--LINE-NUMBERS"],
+			description: `Causes a line number to be displayed at the beginning of each
 line in the display`,
-    },
+		},
 
-    {
-      name: ["-o", "--log-file"],
-      args: { name: "filename", template: "filepaths" },
-      description: `Causes less to copy its input to the named file as it is being
+		{
+			name: ["-o", "--log-file"],
+			args: { name: "filename", template: "filepaths" },
+			description: `Causes less to copy its input to the named file as it is being
 viewed.  This applies only when the input file is a pipe, not an
 ordinary file.  If the file already exists, less will ask for
 confirmation before overwriting it`,
-    },
+		},
 
-    {
-      name: ["-O", "--LOG-FILE"],
-      args: { name: "filename", template: "filepaths" },
-      description: `The -O option is like -o, but it will overwrite an existing file
+		{
+			name: ["-O", "--LOG-FILE"],
+			args: { name: "filename", template: "filepaths" },
+			description: `The -O option is like -o, but it will overwrite an existing file
 without asking for confirmation.
 If no log file has been specified, the -o and -O options can be
 used from within less to specify a log file.  Without a file
 name, they will simply report the name of the log file.  The "s"
 command is equivalent to specifying -o from within less`,
-    },
+		},
 
-    {
-      name: ["-p", "--pattern"],
-      args: { name: "pattern" },
-      description: `The -p option on the command line is equivalent to specifying
+		{
+			name: ["-p", "--pattern"],
+			args: { name: "pattern" },
+			description: `The -p option on the command line is equivalent to specifying
 +/pattern; that is, it tells less to start at the first
 occurrence of pattern in the file`,
-    },
+		},
 
-    {
-      name: ["-P", "--prompt"],
-      args: { name: "prompt" },
-      description: `Provides a way to tailor the three prompt styles to your own
+		{
+			name: ["-P", "--prompt"],
+			args: { name: "prompt" },
+			description: `Provides a way to tailor the three prompt styles to your own
 preference.  This option would normally be put in the LESS
 environment variable, rather than being typed in with each less
 command.  Such an option must either be the last option in the
@@ -352,28 +352,28 @@ that string.
 F command).
 All prompt strings consist of a sequence of letters and special
 escape sequences.  See the section on PROMPTS for more details`,
-    },
+		},
 
-    {
-      name: ["-q", "--quiet", "--silent"],
-      description: `Causes moderately "quiet" operation: the terminal bell is not
+		{
+			name: ["-q", "--quiet", "--silent"],
+			description: `Causes moderately "quiet" operation: the terminal bell is not
 rung if an attempt is made to scroll past the end of the file or
 before the beginning of the file.  If the terminal has a "visual
 bell", it is used instead.  The bell will be rung on certain
 other errors, such as typing an invalid character.  The default
 is to ring the terminal bell in all such cases`,
-    },
+		},
 
-    {
-      name: ["-Q", "--QUIET", "--SILENT"],
-      description: `Causes totally "quiet" operation: the terminal bell is never
+		{
+			name: ["-Q", "--QUIET", "--SILENT"],
+			description: `Causes totally "quiet" operation: the terminal bell is never
 rung.  If the terminal has a "visual bell", it is used in all
 cases where the terminal bell would have been rung`,
-    },
+		},
 
-    {
-      name: ["-r", "--raw-control-chars"],
-      description: `Causes "raw" control characters to be displayed.  The default is
+		{
+			name: ["-r", "--raw-control-chars"],
+			description: `Causes "raw" control characters to be displayed.  The default is
 to display control characters using the caret notation; for
 example, a control-A (octal 001) is displayed as "^A".  Warning:
 when the -r option is used, less cannot keep track of the actual
@@ -382,11 +382,11 @@ responds to each type of control character).  Thus, various
 display problems may result, such as long lines being split in
 the wrong place.
 USE OF THE -r OPTION IS NOT RECOMMENDED`,
-    },
+		},
 
-    {
-      name: ["-R", "--RAW-CONTROL-CHARS"],
-      description: `Like -r, but only ANSI "color" escape sequences and OSC 8
+		{
+			name: ["-R", "--RAW-CONTROL-CHARS"],
+			description: `Like -r, but only ANSI "color" escape sequences and OSC 8
 hyperlink sequences are output in "raw" form.  Unlike -r, the
 screen appearance is maintained correctly, provided that there
 are no escape sequences in the file other than these types of
@@ -408,27 +408,27 @@ escape sequence.  And you can make less think that characters
 other than the standard ones may appear between the ESC and the
 m by setting the environment variable LESSANSIMIDCHARS to the
 list of characters which can appear`,
-    },
+		},
 
-    {
-      name: ["-s", "--squeeze-blank-lines"],
-      description: `Causes consecutive blank lines to be squeezed into a single
+		{
+			name: ["-s", "--squeeze-blank-lines"],
+			description: `Causes consecutive blank lines to be squeezed into a single
 blank line.  This is useful when viewing nroff output`,
-    },
+		},
 
-    {
-      name: ["-S", "--chop-long-lines"],
-      description: `Causes lines longer than the screen width to be chopped
+		{
+			name: ["-S", "--chop-long-lines"],
+			description: `Causes lines longer than the screen width to be chopped
 (truncated) rather than wrapped.  That is, the portion of a long
 line that does not fit in the screen width is not displayed
 until you press RIGHT-ARROW.  The default is to wrap long lines;
 that is, display the remainder on the next line`,
-    },
+		},
 
-    {
-      name: ["-t", "--tag"],
-      args: { name: "tag" },
-      description: `The -t option, followed immediately by a TAG, will edit the file
+		{
+			name: ["-t", "--tag"],
+			args: { name: "tag" },
+			description: `The -t option, followed immediately by a TAG, will edit the file
 containing that tag.  For this to work, tag information must be
 available; for example, there may be a file in the current
 directory called "tags", which was previously built by ctags(1)
@@ -439,24 +439,24 @@ the tag.  (See http://www.gnu.org/software/global/global.html).
 The -t option may also be specified from within less (using the
 - command) as a way of examining a new file.  The command ":t"
 is equivalent to specifying -t from within less`,
-    },
+		},
 
-    {
-      name: ["-T", "--tag-file"],
-      args: { name: "tagsfile" },
-      description: `Specifies a tags file to be used instead of "tags"`,
-    },
+		{
+			name: ["-T", "--tag-file"],
+			args: { name: "tagsfile" },
+			description: `Specifies a tags file to be used instead of "tags"`,
+		},
 
-    {
-      name: ["-u", "--underline-special"],
-      description: `Causes backspaces and carriage returns to be treated as
+		{
+			name: ["-u", "--underline-special"],
+			description: `Causes backspaces and carriage returns to be treated as
 printable characters; that is, they are sent to the terminal
 when they appear in the input`,
-    },
+		},
 
-    {
-      name: ["-U", "--UNDERLINE-SPECIAL"],
-      description: `Causes backspaces, tabs, carriage returns and "formatting
+		{
+			name: ["-U", "--UNDERLINE-SPECIAL"],
+			description: `Causes backspaces, tabs, carriage returns and "formatting
 characters" (as defined by Unicode) to be treated as control
 characters; that is, they are handled as specified by the -r
 option.
@@ -473,16 +473,16 @@ specified by the -r option.  Unicode formatting characters, such
 as the Byte Order Mark, are sent to the terminal.  Text which is
 overstruck or underlined can be searched for if neither -u nor
 -U is in effect`,
-    },
+		},
 
-    {
-      name: ["-V", "--version"],
-      description: `Displays the version number of less`,
-    },
+		{
+			name: ["-V", "--version"],
+			description: `Displays the version number of less`,
+		},
 
-    {
-      name: ["-w", "--hilite-unread"],
-      description: `Temporarily highlights the first "new" line after a forward
+		{
+			name: ["-w", "--hilite-unread"],
+			description: `Temporarily highlights the first "new" line after a forward
 movement of a full page.  The first "new" line is the line
 immediately following the line previously at the bottom of the
 screen.  Also highlights the target line after a g or p command.
@@ -490,47 +490,47 @@ The highlight is removed at the next command which causes
 movement.  The entire line is highlighted, unless the -J option
 is in effect, in which case only the status column is
 highlighted`,
-    },
+		},
 
-    {
-      name: ["-W", "--HILITE-UNREAD"],
-      description: `Like -w, but temporarily highlights the first new line after any
+		{
+			name: ["-W", "--HILITE-UNREAD"],
+			description: `Like -w, but temporarily highlights the first new line after any
 forward movement command larger than one line`,
-    },
+		},
 
-    {
-      name: ["-x", "--tabs="],
-      args: { name: "n,..." },
-      description: `Sets tab stops.  If only one n is specified, tab stops are set
+		{
+			name: ["-x", "--tabs="],
+			args: { name: "n,..." },
+			description: `Sets tab stops.  If only one n is specified, tab stops are set
 at multiples of n.  If multiple values separated by commas are
 specified, tab stops are set at those positions, and then
 continue with the same spacing as the last two.  For example,
 -x9,17 will set tabs at positions 9, 17, 25, 33, etc.  The
 default for n is 8`,
-    },
+		},
 
-    {
-      name: ["-X", "--no-init"],
-      description: `Disables sending the termcap initialization and deinitialization
+		{
+			name: ["-X", "--no-init"],
+			description: `Disables sending the termcap initialization and deinitialization
 strings to the terminal.  This is sometimes desirable if the
 deinitialization string does something unnecessary, like
 clearing the screen`,
-    },
+		},
 
-    {
-      name: ["-y", "--max-forw-scroll"],
-      args: { name: "n" },
-      description: `Specifies a maximum number of lines to scroll forward.  If it is
+		{
+			name: ["-y", "--max-forw-scroll"],
+			args: { name: "n" },
+			description: `Specifies a maximum number of lines to scroll forward.  If it is
 necessary to scroll forward more than n lines, the screen is
 repainted instead.  The -c or -C option may be used to repaint
 from the top of the screen if desired.  By default, any forward
 movement causes scrolling`,
-    },
+		},
 
-    {
-      name: ["-z", "--window"],
-      args: { name: "n" },
-      description: `Changes the default scrolling window size to n lines.  The
+		{
+			name: ["-z", "--window"],
+			args: { name: "n" },
+			description: `Changes the default scrolling window size to n lines.  The
 default is one screenful.  The z and w commands can also be used
 to change the window size.  The "z" may be omitted for
 compatibility with some versions of more.  If the number n is
@@ -538,11 +538,11 @@ negative, it indicates n lines less than the current screen
 size.  For example, if the screen is 24 lines, -z-4 sets the
 scrolling window to 20 lines.  If the screen is resized to 40
 lines, the scrolling window automatically changes to 36 lines`,
-    },
+		},
 
-    {
-      name: "--quotes",
-      description: `Changes the filename quoting character.  This may be necessary
+		{
+			name: "--quotes",
+			description: `Changes the filename quoting character.  This may be necessary
 if you are trying to name a file which contains both spaces and
 quote characters.  Followed by a single character, this changes
 the quote character to that character.  Filenames containing a
@@ -554,18 +554,18 @@ by the open quote character and followed by the close quote
 character.  Note that even after the quote characters are
 changed, this option remains -" (a dash followed by a double
 quote)`,
-    },
+		},
 
-    {
-      name: ["-~", "--tilde"],
-      description: `Normally lines after end of file are displayed as a single tilde
+		{
+			name: ["-~", "--tilde"],
+			description: `Normally lines after end of file are displayed as a single tilde
 (~).  This option causes lines after end of file to be displayed
 as blank lines`,
-    },
+		},
 
-    {
-      name: ["-#", "--shift"],
-      description: `Specifies the default number of positions to scroll horizontally
+		{
+			name: ["-#", "--shift"],
+			description: `Specifies the default number of positions to scroll horizontally
 in the RIGHTARROW and LEFTARROW commands.  If the number
 specified is zero, it sets the default number of positions to
 one half of the screen width.  Alternately, the number may be
@@ -576,11 +576,11 @@ specified as a fraction, the actual number of scroll positions
 is recalculated if the terminal window is resized, so that the
 actual scroll remains at the specified fraction of the screen
 width`,
-    },
+		},
 
-    {
-      name: "--follow-name",
-      description: `Normally, if the input file is renamed while an F command is
+		{
+			name: "--follow-name",
+			description: `Normally, if the input file is renamed while an F command is
 executing, less will continue to display the contents of the
 original file despite its name change.  If --follow-name is
 specified, during an F command less will periodically attempt to
@@ -588,89 +588,89 @@ reopen the file by name.  If the reopen succeeds and the file is
 a different file from the original (which means that a new file
 has been created with the same name as the original (now
 renamed) file), less will display the contents of that new file`,
-    },
-    {
-      name: "--incsearch",
-      description: `Subsequent search commands will be "incremental"; that is, less
+		},
+		{
+			name: "--incsearch",
+			description: `Subsequent search commands will be "incremental"; that is, less
 will advance to the next line containing the search pattern as
 each character of the pattern is typed in`,
-    },
+		},
 
-    {
-      name: "--line-num-width",
-      description: `Sets the minimum width of the line number field when the -N
+		{
+			name: "--line-num-width",
+			description: `Sets the minimum width of the line number field when the -N
 option is in effect.  The default is 7 characters`,
-    },
-    {
-      name: "--mouse",
-      description: `Enables mouse input: scrolling the mouse wheel down moves
+		},
+		{
+			name: "--mouse",
+			description: `Enables mouse input: scrolling the mouse wheel down moves
 forward in the file, scrolling the mouse wheel up moves
 backwards in the file, and clicking the mouse sets the "#" mark
 to the line where the mouse is clicked.  The number of lines to
 scroll when the wheel is moved can be set by the --wheel-lines
 option.  Mouse input works only on terminals which support X11
 mouse reporting, and on the Windows version of less`,
-    },
-    {
-      name: "--MOUSE",
-      description: `Like --mouse, except the direction scrolled on mouse wheel
+		},
+		{
+			name: "--MOUSE",
+			description: `Like --mouse, except the direction scrolled on mouse wheel
 movement is reversed`,
-    },
-    {
-      name: "--no-keypad",
-      description: `Disables sending the keypad initialization and deinitialization
+		},
+		{
+			name: "--no-keypad",
+			description: `Disables sending the keypad initialization and deinitialization
 strings to the terminal.  This is sometimes useful if the keypad
 strings make the numeric keypad behave in an undesirable manner`,
-    },
-    {
-      name: "--no-histdups",
-      description: `This option changes the behavior so that if a search string or
+		},
+		{
+			name: "--no-histdups",
+			description: `This option changes the behavior so that if a search string or
 file name is typed in, and the same string is already in the
 history list, the existing copy is removed from the history list
 before the new one is added.  Thus, a given string will appear
 only once in the history list.  Normally, a string may appear
 multiple times`,
-    },
-    {
-      name: "--rscroll",
-      description: `This option changes the character used to mark truncated lines.
+		},
+		{
+			name: "--rscroll",
+			description: `This option changes the character used to mark truncated lines.
 It may begin with a two-character attribute indicator like
 LESSBINFMT does.  If there is no attribute indicator, standout
 is used.  If set to "-", truncated lines are not marked`,
-    },
-    {
-      name: "--save-marks",
-      description: `Save marks in the history file, so marks are retained across
+		},
+		{
+			name: "--save-marks",
+			description: `Save marks in the history file, so marks are retained across
 different invocations of less`,
-    },
-    {
-      name: "--status-col-width",
-      description: `Sets the width of the status column when the -J option is in
+		},
+		{
+			name: "--status-col-width",
+			description: `Sets the width of the status column when the -J option is in
 effect.  The default is 2 characters`,
-    },
-    {
-      name: "--use-backslash",
-      description: `This option changes the interpretations of options which follow
+		},
+		{
+			name: "--use-backslash",
+			description: `This option changes the interpretations of options which follow
 this one.  After the --use-backslash option, any backslash in an
 option string is removed and the following character is taken
 literally.  This allows a dollar sign to be included in option
 strings`,
-    },
-    {
-      name: "--use-color",
-      description: `Enables the colored text in various places.  The -D option can
+		},
+		{
+			name: "--use-color",
+			description: `Enables the colored text in various places.  The -D option can
 be used to change the colors.  Colored text works only if the
 terminal supports ANSI color escape sequences (as defined in
 ECMA-48 SGR; see
 https://www.ecma-international.org/publications-and-
 standards/standards/ecma-48)`,
-    },
-    {
-      name: "--wheel-lines",
-      args: { name: "n" },
-      description: `Set the number of lines to scroll when the mouse wheel is rolled`,
-    },
-  ],
+		},
+		{
+			name: "--wheel-lines",
+			args: { name: "n" },
+			description: `Set the number of lines to scroll when the mouse wheel is rolled`,
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/ls.ts b/extensions/terminal-suggest/src/completions/upstream/ls.ts
index 91afc0b75ed9..9e1471da3e9a 100644
--- a/extensions/terminal-suggest/src/completions/upstream/ls.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/ls.ts
@@ -1,227 +1,227 @@
 const completionSpec: Fig.Spec = {
-  name: "ls",
-  description: "List directory contents",
-  args: {
-    isVariadic: true,
-    template: ["filepaths", "folders"],
-    filterStrategy: "fuzzy",
-  },
-  options: [
-    {
-      name: "-@",
-      description:
-        "Display extended attribute keys and sizes in long (-l) output",
-    },
-    {
-      name: "-1",
-      description:
-        "(The numeric digit ``one''.)  Force output to be one entry per line.  This is the default when output is not to a terminal",
-    },
-    {
-      name: "-A",
-      description:
-        "List all entries except for . and ...  Always set for the super-user",
-    },
-    {
-      name: "-a",
-      description: "Include directory entries whose names begin with a dot (.)",
-    },
-    {
-      name: "-B",
-      description:
-        "Force printing of non-printable characters (as defined by ctype(3) and current locale settings) in file names as xxx, where xxx is the numeric value of the character in octal",
-    },
-    {
-      name: "-b",
-      description: "As -B, but use C escape codes whenever possible",
-    },
-    {
-      name: "-C",
-      description:
-        "Force multi-column output; this is the default when output is to a terminal",
-    },
-    {
-      name: "-c",
-      description:
-        "Use time when file status was last changed for sorting (-t) or long printing (-l)",
-    },
-    {
-      name: "-d",
-      description:
-        "Directories are listed as plain files (not searched recursively)",
-    },
-    {
-      name: "-e",
-      description:
-        "Print the Access Control List (ACL) associated with the file, if present, in long (-l) output",
-    },
-    {
-      name: "-F",
-      description:
-        "Display a slash (/) immediately after each pathname that is a directory, an asterisk (*) after each that is executable, an at sign (@) after each symbolic link, an equals sign (=) after each socket, a percent sign (%) after each whiteout, and a vertical bar (|) after each that is a FIFO",
-    },
-    {
-      name: "-f",
-      description: "Output is not sorted.  This option turns on the -a option",
-    },
-    {
-      name: "-G",
-      description:
-        "Enable colorized output.  This option is equivalent to defining CLICOLOR in the environment.  (See below.)",
-    },
-    {
-      name: "-g",
-      description:
-        "This option is only available for compatibility with POSIX; it is used to display the group name in the long (-l) format output (the owner name is suppressed)",
-    },
-    {
-      name: "-H",
-      description:
-        "Symbolic links on the command line are followed.  This option is assumed if none of the -F, -d, or -l options are specified",
-    },
-    {
-      name: "-h",
-      description:
-        "When used with the -l option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of digits to three or less using base 2 for sizes",
-    },
-    {
-      name: "-i",
-      description:
-        "For each file, print the file's file serial number (inode number)",
-    },
-    {
-      name: "-k",
-      description:
-        "If the -s option is specified, print the file size allocation in kilobytes, not blocks.  This option overrides the environment variable BLOCKSIZE",
-    },
-    {
-      name: "-L",
-      description:
-        "Follow all symbolic links to final target and list the file or directory the link references rather than the link itself.  This option cancels the -P option",
-    },
-    {
-      name: "-l",
-      description:
-        "(The lowercase letter ``ell''.)  List in long format.  (See below.)  A total sum for all the file sizes is output on a line before the long listing",
-    },
-    {
-      name: "-m",
-      description:
-        "Stream output format; list files across the page, separated by commas",
-    },
-    {
-      name: "-n",
-      description:
-        "Display user and group IDs numerically, rather than converting to a user or group name in a long (-l) output.  This option turns on the -l option",
-    },
-    {
-      name: "-O",
-      description: "Include the file flags in a long (-l) output",
-    },
-    { name: "-o", description: "List in long format, but omit the group id" },
-    {
-      name: "-P",
-      description:
-        "If argument is a symbolic link, list the link itself rather than the object the link references.  This option cancels the -H and -L options",
-    },
-    {
-      name: "-p",
-      description:
-        "Write a slash (`/') after each filename if that file is a directory",
-    },
-    {
-      name: "-q",
-      description:
-        "Force printing of non-graphic characters in file names as the character `?'; this is the default when output is to a terminal",
-    },
-    { name: "-R", description: "Recursively list subdirectories encountered" },
-    {
-      name: "-r",
-      description:
-        "Reverse the order of the sort to get reverse lexicographical order or the oldest entries first (or largest files last, if combined with sort by size",
-    },
-    { name: "-S", description: "Sort files by size" },
-    {
-      name: "-s",
-      description:
-        "Display the number of file system blocks actually used by each file, in units of 512 bytes, where partial units are rounded up to the next integer value.  If the output is to a terminal, a total sum for all the file sizes is output on a line before the listing.  The environment variable BLOCKSIZE overrides the unit size of 512 bytes",
-    },
-    {
-      name: "-T",
-      description:
-        "When used with the -l (lowercase letter ``ell'') option, display complete time information for the file, including month, day, hour, minute, second, and year",
-    },
-    {
-      name: "-t",
-      description:
-        "Sort by time modified (most recently modified first) before sorting the operands by lexicographical order",
-    },
-    {
-      name: "-u",
-      description:
-        "Use time of last access, instead of last modification of the file for sorting (-t) or long printing (-l)",
-    },
-    {
-      name: "-U",
-      description:
-        "Use time of file creation, instead of last modification for sorting (-t) or long output (-l)",
-    },
-    {
-      name: "-v",
-      description:
-        "Force unedited printing of non-graphic characters; this is the default when output is not to a terminal",
-    },
-    {
-      name: "-W",
-      description: "Display whiteouts when scanning directories.  (-S) flag)",
-    },
-    {
-      name: "-w",
-      description:
-        "Force raw printing of non-printable characters.  This is the default when output is not to a terminal",
-    },
-    {
-      name: "-x",
-      description:
-        "The same as -C, except that the multi-column output is produced with entries sorted across, rather than down, the columns",
-    },
-    {
-      name: "-%",
-      description:
-        "Distinguish dataless files and directories with a '%' character in long (-l) output, and don't materialize dataless directories when listing them",
-    },
-    {
-      name: "-,",
-      description: `When the -l option is set, print file sizes grouped and separated by thousands using the non-monetary separator returned
+	name: "ls",
+	description: "List directory contents",
+	args: {
+		isVariadic: true,
+		template: ["filepaths", "folders"],
+		filterStrategy: "fuzzy",
+	},
+	options: [
+		{
+			name: "-@",
+			description:
+				"Display extended attribute keys and sizes in long (-l) output",
+		},
+		{
+			name: "-1",
+			description:
+				"(The numeric digit ``one''.)  Force output to be one entry per line.  This is the default when output is not to a terminal",
+		},
+		{
+			name: "-A",
+			description:
+				"List all entries except for . and ...  Always set for the super-user",
+		},
+		{
+			name: "-a",
+			description: "Include directory entries whose names begin with a dot (.)",
+		},
+		{
+			name: "-B",
+			description:
+				"Force printing of non-printable characters (as defined by ctype(3) and current locale settings) in file names as xxx, where xxx is the numeric value of the character in octal",
+		},
+		{
+			name: "-b",
+			description: "As -B, but use C escape codes whenever possible",
+		},
+		{
+			name: "-C",
+			description:
+				"Force multi-column output; this is the default when output is to a terminal",
+		},
+		{
+			name: "-c",
+			description:
+				"Use time when file status was last changed for sorting (-t) or long printing (-l)",
+		},
+		{
+			name: "-d",
+			description:
+				"Directories are listed as plain files (not searched recursively)",
+		},
+		{
+			name: "-e",
+			description:
+				"Print the Access Control List (ACL) associated with the file, if present, in long (-l) output",
+		},
+		{
+			name: "-F",
+			description:
+				"Display a slash (/) immediately after each pathname that is a directory, an asterisk (*) after each that is executable, an at sign (@) after each symbolic link, an equals sign (=) after each socket, a percent sign (%) after each whiteout, and a vertical bar (|) after each that is a FIFO",
+		},
+		{
+			name: "-f",
+			description: "Output is not sorted.  This option turns on the -a option",
+		},
+		{
+			name: "-G",
+			description:
+				"Enable colorized output.  This option is equivalent to defining CLICOLOR in the environment.  (See below.)",
+		},
+		{
+			name: "-g",
+			description:
+				"This option is only available for compatibility with POSIX; it is used to display the group name in the long (-l) format output (the owner name is suppressed)",
+		},
+		{
+			name: "-H",
+			description:
+				"Symbolic links on the command line are followed.  This option is assumed if none of the -F, -d, or -l options are specified",
+		},
+		{
+			name: "-h",
+			description:
+				"When used with the -l option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of digits to three or less using base 2 for sizes",
+		},
+		{
+			name: "-i",
+			description:
+				"For each file, print the file's file serial number (inode number)",
+		},
+		{
+			name: "-k",
+			description:
+				"If the -s option is specified, print the file size allocation in kilobytes, not blocks.  This option overrides the environment variable BLOCKSIZE",
+		},
+		{
+			name: "-L",
+			description:
+				"Follow all symbolic links to final target and list the file or directory the link references rather than the link itself.  This option cancels the -P option",
+		},
+		{
+			name: "-l",
+			description:
+				"(The lowercase letter ``ell''.)  List in long format.  (See below.)  A total sum for all the file sizes is output on a line before the long listing",
+		},
+		{
+			name: "-m",
+			description:
+				"Stream output format; list files across the page, separated by commas",
+		},
+		{
+			name: "-n",
+			description:
+				"Display user and group IDs numerically, rather than converting to a user or group name in a long (-l) output.  This option turns on the -l option",
+		},
+		{
+			name: "-O",
+			description: "Include the file flags in a long (-l) output",
+		},
+		{ name: "-o", description: "List in long format, but omit the group id" },
+		{
+			name: "-P",
+			description:
+				"If argument is a symbolic link, list the link itself rather than the object the link references.  This option cancels the -H and -L options",
+		},
+		{
+			name: "-p",
+			description:
+				"Write a slash (`/') after each filename if that file is a directory",
+		},
+		{
+			name: "-q",
+			description:
+				"Force printing of non-graphic characters in file names as the character `?'; this is the default when output is to a terminal",
+		},
+		{ name: "-R", description: "Recursively list subdirectories encountered" },
+		{
+			name: "-r",
+			description:
+				"Reverse the order of the sort to get reverse lexicographical order or the oldest entries first (or largest files last, if combined with sort by size",
+		},
+		{ name: "-S", description: "Sort files by size" },
+		{
+			name: "-s",
+			description:
+				"Display the number of file system blocks actually used by each file, in units of 512 bytes, where partial units are rounded up to the next integer value.  If the output is to a terminal, a total sum for all the file sizes is output on a line before the listing.  The environment variable BLOCKSIZE overrides the unit size of 512 bytes",
+		},
+		{
+			name: "-T",
+			description:
+				"When used with the -l (lowercase letter ``ell'') option, display complete time information for the file, including month, day, hour, minute, second, and year",
+		},
+		{
+			name: "-t",
+			description:
+				"Sort by time modified (most recently modified first) before sorting the operands by lexicographical order",
+		},
+		{
+			name: "-u",
+			description:
+				"Use time of last access, instead of last modification of the file for sorting (-t) or long printing (-l)",
+		},
+		{
+			name: "-U",
+			description:
+				"Use time of file creation, instead of last modification for sorting (-t) or long output (-l)",
+		},
+		{
+			name: "-v",
+			description:
+				"Force unedited printing of non-graphic characters; this is the default when output is not to a terminal",
+		},
+		{
+			name: "-W",
+			description: "Display whiteouts when scanning directories.  (-S) flag)",
+		},
+		{
+			name: "-w",
+			description:
+				"Force raw printing of non-printable characters.  This is the default when output is not to a terminal",
+		},
+		{
+			name: "-x",
+			description:
+				"The same as -C, except that the multi-column output is produced with entries sorted across, rather than down, the columns",
+		},
+		{
+			name: "-%",
+			description:
+				"Distinguish dataless files and directories with a '%' character in long (-l) output, and don't materialize dataless directories when listing them",
+		},
+		{
+			name: "-,",
+			description: `When the -l option is set, print file sizes grouped and separated by thousands using the non-monetary separator returned
 by localeconv(3), typically a comma or period.  If no locale is set, or the locale does not have a non-monetary separator, this
 option has no effect.  This option is not defined in IEEE Std 1003.1-2001 (“POSIX.1”)`,
-      dependsOn: ["-l"],
-    },
-    {
-      name: "--color",
-      description: `Output colored escape sequences based on when, which may be set to either always, auto, or never`,
-      requiresSeparator: true,
-      args: {
-        name: "when",
-        suggestions: [
-          {
-            name: ["always", "yes", "force"],
-            description: "Will make ls always output color",
-          },
-          {
-            name: "auto",
-            description:
-              "Will make ls output escape sequences based on termcap(5), but only if stdout is a tty and either the -G flag is specified or the COLORTERM environment variable is set and not empty",
-          },
-          {
-            name: ["never", "no", "none"],
-            description:
-              "Will disable color regardless of environment variables",
-          },
-        ],
-      },
-    },
-  ],
+			dependsOn: ["-l"],
+		},
+		{
+			name: "--color",
+			description: `Output colored escape sequences based on when, which may be set to either always, auto, or never`,
+			requiresSeparator: true,
+			args: {
+				name: "when",
+				suggestions: [
+					{
+						name: ["always", "yes", "force"],
+						description: "Will make ls always output color",
+					},
+					{
+						name: "auto",
+						description:
+							"Will make ls output escape sequences based on termcap(5), but only if stdout is a tty and either the -G flag is specified or the COLORTERM environment variable is set and not empty",
+					},
+					{
+						name: ["never", "no", "none"],
+						description:
+							"Will disable color regardless of environment variables",
+					},
+				],
+			},
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/mkdir.ts b/extensions/terminal-suggest/src/completions/upstream/mkdir.ts
index 90a6530c3bda..2f9ff425d834 100644
--- a/extensions/terminal-suggest/src/completions/upstream/mkdir.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/mkdir.ts
@@ -1,37 +1,37 @@
 const completionSpec: Fig.Spec = {
-  name: "mkdir",
-  description: "Make directories",
-  args: {
-    name: "directory name",
-    template: "folders",
-    suggestCurrentToken: true,
-  },
-  options: [
-    {
-      name: ["-m", "--mode"],
-      description: "Set file mode (as in chmod), not a=rwx - umask",
-      args: { name: "MODE" },
-    },
-    {
-      name: ["-p", "--parents"],
-      description: "No error if existing, make parent directories as needed",
-    },
-    {
-      name: ["-v", "--verbose"],
-      description: "Print a message for each created directory",
-    },
-    {
-      name: ["-Z", "--context"],
-      description:
-        "Set the SELinux security context of each created directory to CTX",
-      args: { name: "CTX" },
-    },
-    { name: "--help", description: "Display this help and exit" },
-    {
-      name: "--version",
-      description: "Output version information and exit",
-    },
-  ],
+	name: "mkdir",
+	description: "Make directories",
+	args: {
+		name: "directory name",
+		template: "folders",
+		suggestCurrentToken: true,
+	},
+	options: [
+		{
+			name: ["-m", "--mode"],
+			description: "Set file mode (as in chmod), not a=rwx - umask",
+			args: { name: "MODE" },
+		},
+		{
+			name: ["-p", "--parents"],
+			description: "No error if existing, make parent directories as needed",
+		},
+		{
+			name: ["-v", "--verbose"],
+			description: "Print a message for each created directory",
+		},
+		{
+			name: ["-Z", "--context"],
+			description:
+				"Set the SELinux security context of each created directory to CTX",
+			args: { name: "CTX" },
+		},
+		{ name: "--help", description: "Display this help and exit" },
+		{
+			name: "--version",
+			description: "Output version information and exit",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/more.ts b/extensions/terminal-suggest/src/completions/upstream/more.ts
index a70c8ee9078d..6a9d6e820661 100644
--- a/extensions/terminal-suggest/src/completions/upstream/more.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/more.ts
@@ -1,55 +1,55 @@
 const completionSpec: Fig.Spec = {
-  name: "more",
-  description: "Opposite of less",
-  options: [
-    {
-      name: ["-d", "--silent"],
-      description:
-        "Prompt with '[Press space to continue, 'q' to quit.]', and display '[Press 'h' for instructions.]' instead of ringing the bell when an illegal key is pressed",
-    },
-    {
-      name: ["-l", "--logical"],
-      description: "Do not pause after any line containing a ^L (form feed)",
-    },
-    {
-      name: ["-f", "--no-pause"],
-      description: "Count logical lines, rather than screen lines",
-    },
-    {
-      name: ["-p", "--print-over"],
-      description: "Instead, clear the whole screen and then display the text",
-    },
-    {
-      name: ["-c", "--clean-print"],
-      description:
-        "Instead, paint each screen from the top, clearing the remainder of each line as it is displayed",
-    },
-    {
-      name: ["-s", "--squeeze"],
-      description: "Squeeze multiple blank lines into one",
-    },
-    {
-      name: ["-u", "--plain"],
-      description: "Silently ignored as backwards compatibility",
-    },
-    {
-      name: ["-n", "--lines"],
-      description: "Specify the number of lines per screenful",
-      args: { name: "n" },
-    },
-    {
-      name: "--help",
-      description: "Display help text",
-    },
-    {
-      name: ["-V", "--version"],
-      description: "Display version information",
-    },
-  ],
-  args: {
-    isVariadic: true,
-    template: "filepaths",
-  },
+	name: "more",
+	description: "Opposite of less",
+	options: [
+		{
+			name: ["-d", "--silent"],
+			description:
+				"Prompt with '[Press space to continue, 'q' to quit.]', and display '[Press 'h' for instructions.]' instead of ringing the bell when an illegal key is pressed",
+		},
+		{
+			name: ["-l", "--logical"],
+			description: "Do not pause after any line containing a ^L (form feed)",
+		},
+		{
+			name: ["-f", "--no-pause"],
+			description: "Count logical lines, rather than screen lines",
+		},
+		{
+			name: ["-p", "--print-over"],
+			description: "Instead, clear the whole screen and then display the text",
+		},
+		{
+			name: ["-c", "--clean-print"],
+			description:
+				"Instead, paint each screen from the top, clearing the remainder of each line as it is displayed",
+		},
+		{
+			name: ["-s", "--squeeze"],
+			description: "Squeeze multiple blank lines into one",
+		},
+		{
+			name: ["-u", "--plain"],
+			description: "Silently ignored as backwards compatibility",
+		},
+		{
+			name: ["-n", "--lines"],
+			description: "Specify the number of lines per screenful",
+			args: { name: "n" },
+		},
+		{
+			name: "--help",
+			description: "Display help text",
+		},
+		{
+			name: ["-V", "--version"],
+			description: "Display version information",
+		},
+	],
+	args: {
+		isVariadic: true,
+		template: "filepaths",
+	},
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/mv.ts b/extensions/terminal-suggest/src/completions/upstream/mv.ts
index bbf98bf49031..2109b0dd0fff 100644
--- a/extensions/terminal-suggest/src/completions/upstream/mv.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/mv.ts
@@ -1,40 +1,40 @@
 const completionSpec: Fig.Spec = {
-  name: "mv",
-  description: "Move & rename files and folders",
-  args: [
-    {
-      name: "source",
-      isVariadic: true,
-      template: ["filepaths", "folders"],
-    },
-    {
-      name: "target",
-      template: ["filepaths", "folders"],
-    },
-  ],
-  options: [
-    {
-      name: "-f",
-      description:
-        "Do not prompt for confirmation before overwriting the destination path",
-      exclusiveOn: ["-i", "-n"],
-    },
-    {
-      name: "-i",
-      description:
-        "Cause mv to write a prompt to standard error before moving a file that would overwrite an existing file",
-      exclusiveOn: ["-f", "-n"],
-    },
-    {
-      name: "-n",
-      description: "Do not overwrite existing file",
-      exclusiveOn: ["-f", "-i"],
-    },
-    {
-      name: "-v",
-      description: "Cause mv to be verbose, showing files after they are moved",
-    },
-  ],
+	name: "mv",
+	description: "Move & rename files and folders",
+	args: [
+		{
+			name: "source",
+			isVariadic: true,
+			template: ["filepaths", "folders"],
+		},
+		{
+			name: "target",
+			template: ["filepaths", "folders"],
+		},
+	],
+	options: [
+		{
+			name: "-f",
+			description:
+				"Do not prompt for confirmation before overwriting the destination path",
+			exclusiveOn: ["-i", "-n"],
+		},
+		{
+			name: "-i",
+			description:
+				"Cause mv to write a prompt to standard error before moving a file that would overwrite an existing file",
+			exclusiveOn: ["-f", "-n"],
+		},
+		{
+			name: "-n",
+			description: "Do not overwrite existing file",
+			exclusiveOn: ["-f", "-i"],
+		},
+		{
+			name: "-v",
+			description: "Cause mv to be verbose, showing files after they are moved",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/nano.ts b/extensions/terminal-suggest/src/completions/upstream/nano.ts
index 6064072e8731..caa84c34d658 100644
--- a/extensions/terminal-suggest/src/completions/upstream/nano.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/nano.ts
@@ -1,9 +1,9 @@
 const completionSpec: Fig.Spec = {
-  name: "nano",
-  description: "Nano's ANOther editor, an enhanced free Pico clone",
-  args: {
-    template: "filepaths",
-  },
+	name: "nano",
+	description: "Nano's ANOther editor, an enhanced free Pico clone",
+	args: {
+		template: "filepaths",
+	},
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/node.ts b/extensions/terminal-suggest/src/completions/upstream/node.ts
index 97db1f76f22c..38a1c44b140e 100644
--- a/extensions/terminal-suggest/src/completions/upstream/node.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/node.ts
@@ -1,504 +1,504 @@
 import { filepaths } from '../../helpers/filepaths';
 
 const completionSpec: Fig.Subcommand = {
-  name: "node",
-  description: "Run the node interpreter",
-  args: {
-    name: "node script",
-    isScript: true,
-    generators: filepaths({
-      extensions: ["mjs", "js", "cjs"],
-      editFileSuggestions: { priority: 76 },
-    }),
-  },
-  options: [
-    {
-      name: ["-e", "--eval=..."],
-      insertValue: "-e '{cursor}'",
-      description: "Evaluate script",
-      args: {},
-    },
-    {
-      name: "--watch",
-      description: "Watch input files",
-    },
-    {
-      name: "--watch-path",
-      description: "Specify a watch directory or file",
-      args: {
-        name: "path",
-        template: "filepaths",
-      },
-      isRepeatable: true,
-    },
-    {
-      name: "--watch-preserve-output",
-      description:
-        "Disable the clearing of the console when watch mode restarts the process",
-      dependsOn: ["--watch", "--watch-path"],
-    },
-    {
-      name: "--env-file",
-      description: "Specify a file containing environment variables",
-      args: {
-        name: "path",
-        template: "filepaths",
-      },
-      isRepeatable: true,
-    },
-    {
-      name: ["-p", "--print"],
-      description: "Evaluate script and print result",
-    },
-    {
-      name: ["-c", "--check"],
-      description: "Syntax check script without executing",
-    },
-    {
-      name: ["-v", "--version"],
-      description: "Print Node.js version",
-    },
-    {
-      name: ["-i", "--interactive"],
-      description:
-        "Always enter the REPL even if stdin does not appear to be a terminal",
-    },
-    {
-      name: ["-h", "--help"],
-      description: "Print node command line options (currently set)",
-    },
-    {
-      name: "--inspect",
-      requiresSeparator: true,
-      args: {
-        name: "[host:]port",
-        isOptional: true,
-      },
-      description: "Activate inspector on host:port (default: 127.0.0.1:9229)",
-    },
-    {
-      name: "--preserve-symlinks",
-      description:
-        "Follows symlinks to directories when examining source code and templates for translation strings",
-    },
-  ],
-  generateSpec: async (tokens, executeShellCommand) => {
-    
-    if (
-      (
-        await executeShellCommand({
-          command: "bash",
-          args: ["-c", "isAdonisJsonPresentCommand"],
-        })
-      ).status === 0
-    ) {
-      return {
-        name: "node",
-        subcommands: [
-          {
-            name: "ace",
-            description: "Run AdonisJS command-line",
-            options: [
-              {
-                name: ["-h", "--help"],
-                description: "Display AdonisJS Ace help",
-              },
-              {
-                name: ["-v", "--version"],
-                description: "Display AdonisJS version",
-              },
-            ],
-            subcommands: [
-              {
-                name: "build",
-                description:
-                  "Compile project from Typescript to Javascript. Also compiles the frontend assets if using webpack encore",
-                options: [
-                  {
-                    name: ["-prod", "--production"],
-                    description: "Build for production",
-                  },
-                  {
-                    name: "--assets",
-                    description:
-                      "Build frontend assets when webpack encore is installed",
-                  },
-                  {
-                    name: "--no-assets",
-                    description: "Disable building assets",
-                  },
-                  {
-                    name: "--ignore-ts-errors",
-                    description:
-                      "Ignore typescript errors and complete the build process",
-                  },
-                  {
-                    name: "--tsconfig",
-                    description:
-                      "Path to the TypeScript project configuration file",
-                    args: {
-                      name: "path",
-                      description: "Path to tsconfig.json",
-                    },
-                  },
-                  {
-                    name: "--encore-args",
-                    requiresSeparator: true,
-                    insertValue: "--encore-args='{cursor}'",
-                    description:
-                      "CLI options to pass to the encore command line",
-                  },
-                  {
-                    name: "--client",
-                    args: {
-                      name: "name",
-                    },
-                    description:
-                      "Select the package manager to decide which lock file to copy to the build folder",
-                  },
-                ],
-              },
-              {
-                name: ["configure", "invoke"],
-                description: "Configure a given AdonisJS package",
-                args: {
-                  name: "name",
-                  description: "Name of the package you want to configure",
-                },
-                subcommands: [
-                  {
-                    name: "@adonisjs/auth",
-                    description: "Trigger auto configuring auth package",
-                  },
-                  {
-                    name: "@adonisjs/shield",
-                    description: "Trigger auto configuring shield package",
-                  },
-                  {
-                    name: "@adonisjs/redis",
-                    description: "Trigger auto configuring redis package",
-                  },
-                  {
-                    name: "@adonisjs/mail",
-                    description: "Trigger auto configuring mail package",
-                  },
-                ],
-              },
-              {
-                name: "repl",
-                description: "Start a new REPL session",
-              },
-              {
-                name: "serve",
-                description:
-                  "Start the AdonisJS HTTP server, along with the file watcher. Also starts the webpack dev server when webpack encore is installed",
-                options: [
-                  {
-                    name: "--assets",
-                    description:
-                      "Start webpack dev server when encore is installed",
-                  },
-                  {
-                    name: "--no-assets",
-                    description: "Disable webpack dev server",
-                  },
-                  {
-                    name: ["-w", "--watch"],
-                    description:
-                      "Watch for file changes and re-start the HTTP server on change",
-                  },
-                  {
-                    name: ["-p", "--poll"],
-                    description:
-                      "Detect file changes by polling files instead of listening to filesystem events",
-                  },
-                  {
-                    name: "--node-args",
-                    requiresSeparator: true,
-                    insertValue: "--node-args='{cursor}'",
-                    description: "CLI options to pass to the node command line",
-                  },
-                  {
-                    name: "--encore-args",
-                    requiresSeparator: true,
-                    insertValue: "--encore-args='{cursor}'",
-                    description:
-                      "CLI options to pass to the encore command line",
-                  },
-                ],
-              },
-              {
-                name: "db:seed",
-                description: "Execute database seeder files",
-                options: [
-                  {
-                    name: ["-c", "--connection"],
-                    description:
-                      "Define a custom database connection for the seeders",
-                    args: {
-                      name: "name",
-                    },
-                  },
-                  {
-                    name: ["-i", "--interactive"],
-                    description: "Run seeders in interactive mode",
-                  },
-                  {
-                    name: ["-f", "--files"],
-                    args: {
-                      name: "file",
-                      isVariadic: true,
-                      template: "filepaths",
-                    },
-                    description:
-                      "Define a custom set of seeders files names to run",
-                  },
-                ],
-              },
-              {
-                name: "dump:rcfile",
-                description:
-                  "Dump contents of .adonisrc.json file along with defaults",
-              },
-              {
-                name: "generate:key",
-                description: "Generate a new APP_KEY secret",
-              },
-              {
-                name: "generate:manifest",
-                description:
-                  "Generate ace commands manifest file. Manifest file speeds up commands lookup",
-              },
-              {
-                name: "list:routes",
-                description: "List application routes",
-              },
-              {
-                name: "make:command",
-                description: "Make a new ace command",
-              },
-              {
-                name: "make:controller",
-                description: "Make a new HTTP controller",
-                args: {
-                  name: "name",
-                  description: "Name of the controller class",
-                },
-                options: [
-                  {
-                    name: ["-r", "--resource"],
-                    description:
-                      "Add resourceful methods to the controller class",
-                  },
-                  {
-                    name: ["-e", "--exact"],
-                    description:
-                      "Create the controller with the exact name as provided",
-                  },
-                ],
-              },
-              {
-                name: "make:exception",
-                description: "Make a new custom exception class",
-              },
-              {
-                name: "make:listener",
-                description: "Make a new event listener class",
-              },
-              {
-                name: "make:mailer",
-                description: "Make a new mailer class",
-                args: {
-                  name: "name",
-                  description: "Mailer class name",
-                },
-              },
-              {
-                name: "make:middleware",
-                description: "Make a new middleware",
-                args: {
-                  name: "name",
-                  description: "Middleware class name",
-                },
-              },
-              {
-                name: "make:migration",
-                description: "Make a new migration file",
-                args: {
-                  name: "name",
-                  description: "Name of the migration file",
-                },
-                options: [
-                  {
-                    name: "--connection",
-                    description:
-                      "The connection flag is used to lookup the directory for the migration file",
-                    args: {
-                      name: "name",
-                    },
-                  },
-                  {
-                    name: "--folder",
-                    description: "Pre-select a migration directory",
-                    args: {
-                      name: "name",
-                      template: "filepaths",
-                    },
-                  },
-                  {
-                    name: "--create",
-                    description:
-                      "Define the table name for creating a new table",
-                    args: {
-                      name: "name",
-                    },
-                  },
-                  {
-                    name: "--table",
-                    description:
-                      "Define the table name for altering an existing table",
-                    args: {
-                      name: "name",
-                    },
-                  },
-                ],
-              },
-              {
-                name: "make:model",
-                description: "Make a new Lucid model",
-                args: {
-                  name: "name",
-                  description: "Name of the model class",
-                },
-                options: [
-                  {
-                    name: ["-m", "--migration"],
-                    description: "Generate the migration for the model",
-                  },
-                  {
-                    name: ["-c", "--controller"],
-                    description: "Generate the controller for the model",
-                  },
-                ],
-              },
-              {
-                name: "make:prldfile",
-                description: "Make a new preload file",
-                subcommands: [
-                  {
-                    name: "events",
-                    description: "Make events preload file",
-                  },
-                ],
-              },
-              {
-                name: "make:provider",
-                description: "Make a new provider class",
-              },
-              {
-                name: "make:seeder",
-                description: "Make a new Seeder file",
-                args: {
-                  name: "name",
-                  description: "Name of the seeder class",
-                },
-              },
-              {
-                name: "make:validator",
-                description: "Make a new validator",
-                args: {
-                  name: "name",
-                  description: "Name of the validator class",
-                },
-                options: [
-                  {
-                    name: ["-e", "--exact"],
-                    description:
-                      "Create the validator with the exact name as provided",
-                  },
-                ],
-              },
-              {
-                name: "make:view",
-                description: "Make a new view template",
-                args: {
-                  name: "name",
-                  description: "Name of the view",
-                },
-                options: [
-                  {
-                    name: ["-e", "--exact"],
-                    description:
-                      "Create the template file with the exact name as provided",
-                  },
-                ],
-              },
-              {
-                name: "migration:rollback",
-                description: "Rollback migrations to a given batch number",
-                options: [
-                  {
-                    name: ["-c", "--connection"],
-                    description: "Define a custom database connection",
-                    args: {
-                      name: "name",
-                    },
-                  },
-                  {
-                    name: "--force",
-                    description:
-                      "Explicitly force to run migrations in production",
-                    isDangerous: true,
-                  },
-                  {
-                    name: "--dry-run",
-                    description:
-                      "Print SQL queries, instead of running the migrations",
-                  },
-                  {
-                    name: "--batch",
-                    args: {
-                      name: "number",
-                      description: "Use 0 to rollback to initial state",
-                    },
-                    description: "Define custom batch number for rollback",
-                  },
-                ],
-              },
-              {
-                name: "migration:run",
-                description: "Run pending migrations",
-                options: [
-                  {
-                    name: ["-c", "--connection"],
-                    description: "Define a custom database connection",
-                    args: {
-                      name: "name",
-                    },
-                  },
-                  {
-                    name: "--force",
-                    description:
-                      "Explicitly force to run migrations in production",
-                    isDangerous: true,
-                  },
-                  {
-                    name: "--dry-run",
-                    description:
-                      "Print SQL queries, instead of running the migrations",
-                  },
-                ],
-              },
-              {
-                name: "migration:status",
-                description: "Check migrations current status",
-              },
-            ],
-          },
-        ],
-      };
-    }
-  },
+	name: "node",
+	description: "Run the node interpreter",
+	args: {
+		name: "node script",
+		isScript: true,
+		generators: filepaths({
+			extensions: ["mjs", "js", "cjs"],
+			editFileSuggestions: { priority: 76 },
+		}),
+	},
+	options: [
+		{
+			name: ["-e", "--eval=..."],
+			insertValue: "-e '{cursor}'",
+			description: "Evaluate script",
+			args: {},
+		},
+		{
+			name: "--watch",
+			description: "Watch input files",
+		},
+		{
+			name: "--watch-path",
+			description: "Specify a watch directory or file",
+			args: {
+				name: "path",
+				template: "filepaths",
+			},
+			isRepeatable: true,
+		},
+		{
+			name: "--watch-preserve-output",
+			description:
+				"Disable the clearing of the console when watch mode restarts the process",
+			dependsOn: ["--watch", "--watch-path"],
+		},
+		{
+			name: "--env-file",
+			description: "Specify a file containing environment variables",
+			args: {
+				name: "path",
+				template: "filepaths",
+			},
+			isRepeatable: true,
+		},
+		{
+			name: ["-p", "--print"],
+			description: "Evaluate script and print result",
+		},
+		{
+			name: ["-c", "--check"],
+			description: "Syntax check script without executing",
+		},
+		{
+			name: ["-v", "--version"],
+			description: "Print Node.js version",
+		},
+		{
+			name: ["-i", "--interactive"],
+			description:
+				"Always enter the REPL even if stdin does not appear to be a terminal",
+		},
+		{
+			name: ["-h", "--help"],
+			description: "Print node command line options (currently set)",
+		},
+		{
+			name: "--inspect",
+			requiresSeparator: true,
+			args: {
+				name: "[host:]port",
+				isOptional: true,
+			},
+			description: "Activate inspector on host:port (default: 127.0.0.1:9229)",
+		},
+		{
+			name: "--preserve-symlinks",
+			description:
+				"Follows symlinks to directories when examining source code and templates for translation strings",
+		},
+	],
+	generateSpec: async (tokens, executeShellCommand) => {
+		
+		if (
+			(
+				await executeShellCommand({
+					command: "bash",
+					args: ["-c", "isAdonisJsonPresentCommand"],
+				})
+			).status === 0
+		) {
+			return {
+				name: "node",
+				subcommands: [
+					{
+						name: "ace",
+						description: "Run AdonisJS command-line",
+						options: [
+							{
+								name: ["-h", "--help"],
+								description: "Display AdonisJS Ace help",
+							},
+							{
+								name: ["-v", "--version"],
+								description: "Display AdonisJS version",
+							},
+						],
+						subcommands: [
+							{
+								name: "build",
+								description:
+									"Compile project from Typescript to Javascript. Also compiles the frontend assets if using webpack encore",
+								options: [
+									{
+										name: ["-prod", "--production"],
+										description: "Build for production",
+									},
+									{
+										name: "--assets",
+										description:
+											"Build frontend assets when webpack encore is installed",
+									},
+									{
+										name: "--no-assets",
+										description: "Disable building assets",
+									},
+									{
+										name: "--ignore-ts-errors",
+										description:
+											"Ignore typescript errors and complete the build process",
+									},
+									{
+										name: "--tsconfig",
+										description:
+											"Path to the TypeScript project configuration file",
+										args: {
+											name: "path",
+											description: "Path to tsconfig.json",
+										},
+									},
+									{
+										name: "--encore-args",
+										requiresSeparator: true,
+										insertValue: "--encore-args='{cursor}'",
+										description:
+											"CLI options to pass to the encore command line",
+									},
+									{
+										name: "--client",
+										args: {
+											name: "name",
+										},
+										description:
+											"Select the package manager to decide which lock file to copy to the build folder",
+									},
+								],
+							},
+							{
+								name: ["configure", "invoke"],
+								description: "Configure a given AdonisJS package",
+								args: {
+									name: "name",
+									description: "Name of the package you want to configure",
+								},
+								subcommands: [
+									{
+										name: "@adonisjs/auth",
+										description: "Trigger auto configuring auth package",
+									},
+									{
+										name: "@adonisjs/shield",
+										description: "Trigger auto configuring shield package",
+									},
+									{
+										name: "@adonisjs/redis",
+										description: "Trigger auto configuring redis package",
+									},
+									{
+										name: "@adonisjs/mail",
+										description: "Trigger auto configuring mail package",
+									},
+								],
+							},
+							{
+								name: "repl",
+								description: "Start a new REPL session",
+							},
+							{
+								name: "serve",
+								description:
+									"Start the AdonisJS HTTP server, along with the file watcher. Also starts the webpack dev server when webpack encore is installed",
+								options: [
+									{
+										name: "--assets",
+										description:
+											"Start webpack dev server when encore is installed",
+									},
+									{
+										name: "--no-assets",
+										description: "Disable webpack dev server",
+									},
+									{
+										name: ["-w", "--watch"],
+										description:
+											"Watch for file changes and re-start the HTTP server on change",
+									},
+									{
+										name: ["-p", "--poll"],
+										description:
+											"Detect file changes by polling files instead of listening to filesystem events",
+									},
+									{
+										name: "--node-args",
+										requiresSeparator: true,
+										insertValue: "--node-args='{cursor}'",
+										description: "CLI options to pass to the node command line",
+									},
+									{
+										name: "--encore-args",
+										requiresSeparator: true,
+										insertValue: "--encore-args='{cursor}'",
+										description:
+											"CLI options to pass to the encore command line",
+									},
+								],
+							},
+							{
+								name: "db:seed",
+								description: "Execute database seeder files",
+								options: [
+									{
+										name: ["-c", "--connection"],
+										description:
+											"Define a custom database connection for the seeders",
+										args: {
+											name: "name",
+										},
+									},
+									{
+										name: ["-i", "--interactive"],
+										description: "Run seeders in interactive mode",
+									},
+									{
+										name: ["-f", "--files"],
+										args: {
+											name: "file",
+											isVariadic: true,
+											template: "filepaths",
+										},
+										description:
+											"Define a custom set of seeders files names to run",
+									},
+								],
+							},
+							{
+								name: "dump:rcfile",
+								description:
+									"Dump contents of .adonisrc.json file along with defaults",
+							},
+							{
+								name: "generate:key",
+								description: "Generate a new APP_KEY secret",
+							},
+							{
+								name: "generate:manifest",
+								description:
+									"Generate ace commands manifest file. Manifest file speeds up commands lookup",
+							},
+							{
+								name: "list:routes",
+								description: "List application routes",
+							},
+							{
+								name: "make:command",
+								description: "Make a new ace command",
+							},
+							{
+								name: "make:controller",
+								description: "Make a new HTTP controller",
+								args: {
+									name: "name",
+									description: "Name of the controller class",
+								},
+								options: [
+									{
+										name: ["-r", "--resource"],
+										description:
+											"Add resourceful methods to the controller class",
+									},
+									{
+										name: ["-e", "--exact"],
+										description:
+											"Create the controller with the exact name as provided",
+									},
+								],
+							},
+							{
+								name: "make:exception",
+								description: "Make a new custom exception class",
+							},
+							{
+								name: "make:listener",
+								description: "Make a new event listener class",
+							},
+							{
+								name: "make:mailer",
+								description: "Make a new mailer class",
+								args: {
+									name: "name",
+									description: "Mailer class name",
+								},
+							},
+							{
+								name: "make:middleware",
+								description: "Make a new middleware",
+								args: {
+									name: "name",
+									description: "Middleware class name",
+								},
+							},
+							{
+								name: "make:migration",
+								description: "Make a new migration file",
+								args: {
+									name: "name",
+									description: "Name of the migration file",
+								},
+								options: [
+									{
+										name: "--connection",
+										description:
+											"The connection flag is used to lookup the directory for the migration file",
+										args: {
+											name: "name",
+										},
+									},
+									{
+										name: "--folder",
+										description: "Pre-select a migration directory",
+										args: {
+											name: "name",
+											template: "filepaths",
+										},
+									},
+									{
+										name: "--create",
+										description:
+											"Define the table name for creating a new table",
+										args: {
+											name: "name",
+										},
+									},
+									{
+										name: "--table",
+										description:
+											"Define the table name for altering an existing table",
+										args: {
+											name: "name",
+										},
+									},
+								],
+							},
+							{
+								name: "make:model",
+								description: "Make a new Lucid model",
+								args: {
+									name: "name",
+									description: "Name of the model class",
+								},
+								options: [
+									{
+										name: ["-m", "--migration"],
+										description: "Generate the migration for the model",
+									},
+									{
+										name: ["-c", "--controller"],
+										description: "Generate the controller for the model",
+									},
+								],
+							},
+							{
+								name: "make:prldfile",
+								description: "Make a new preload file",
+								subcommands: [
+									{
+										name: "events",
+										description: "Make events preload file",
+									},
+								],
+							},
+							{
+								name: "make:provider",
+								description: "Make a new provider class",
+							},
+							{
+								name: "make:seeder",
+								description: "Make a new Seeder file",
+								args: {
+									name: "name",
+									description: "Name of the seeder class",
+								},
+							},
+							{
+								name: "make:validator",
+								description: "Make a new validator",
+								args: {
+									name: "name",
+									description: "Name of the validator class",
+								},
+								options: [
+									{
+										name: ["-e", "--exact"],
+										description:
+											"Create the validator with the exact name as provided",
+									},
+								],
+							},
+							{
+								name: "make:view",
+								description: "Make a new view template",
+								args: {
+									name: "name",
+									description: "Name of the view",
+								},
+								options: [
+									{
+										name: ["-e", "--exact"],
+										description:
+											"Create the template file with the exact name as provided",
+									},
+								],
+							},
+							{
+								name: "migration:rollback",
+								description: "Rollback migrations to a given batch number",
+								options: [
+									{
+										name: ["-c", "--connection"],
+										description: "Define a custom database connection",
+										args: {
+											name: "name",
+										},
+									},
+									{
+										name: "--force",
+										description:
+											"Explicitly force to run migrations in production",
+										isDangerous: true,
+									},
+									{
+										name: "--dry-run",
+										description:
+											"Print SQL queries, instead of running the migrations",
+									},
+									{
+										name: "--batch",
+										args: {
+											name: "number",
+											description: "Use 0 to rollback to initial state",
+										},
+										description: "Define custom batch number for rollback",
+									},
+								],
+							},
+							{
+								name: "migration:run",
+								description: "Run pending migrations",
+								options: [
+									{
+										name: ["-c", "--connection"],
+										description: "Define a custom database connection",
+										args: {
+											name: "name",
+										},
+									},
+									{
+										name: "--force",
+										description:
+											"Explicitly force to run migrations in production",
+										isDangerous: true,
+									},
+									{
+										name: "--dry-run",
+										description:
+											"Print SQL queries, instead of running the migrations",
+									},
+								],
+							},
+							{
+								name: "migration:status",
+								description: "Check migrations current status",
+							},
+						],
+					},
+				],
+			};
+		}
+	},
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/npm.ts b/extensions/terminal-suggest/src/completions/upstream/npm.ts
index 2c782c412627..809f15752c6c 100644
--- a/extensions/terminal-suggest/src/completions/upstream/npm.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/npm.ts
@@ -1,1608 +1,1608 @@
 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,
-  };
+	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(",")}` : "";
+	(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`;
+		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("@");
+		// 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;
-      }
+		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: any) => ({
-        name: item.package.name,
-        description: item.package.description,
-      })) as Fig.Suggestion[];
-    } catch (error) {
-      console.error({ error });
-      return [];
-    }
-  };
+			const results = keywordParameter ? data.results : data;
+			return results.map((item: any) => ({
+				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);
-    }
+	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(),
+		// 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"],
-    });
+	// 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 { 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 suggestions: Fig.Suggestion[] = [];
+		try {
+			if (out.trim() == "") {
+				return suggestions;
+			}
 
-      const packageContent = JSON.parse(out);
-      const workspaces = packageContent["workspaces"];
+			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;
-  },
+			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);
+	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",
-      }));
-    }
-  },
+			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 [];
-    }
+	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"] || {};
+		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);
-    }
+			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 [];
-  },
+		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",
+	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",
+	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,
+	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",
+	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",
+	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",
-  },
+	{
+		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,
+	{
+		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,
+	{
+		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" },
+	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" },
+	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" },
+	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",
+	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" },
+	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",
+	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],
-    },
-  ],
+	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/nvm.ts b/extensions/terminal-suggest/src/completions/upstream/nvm.ts
index aeeba4629e99..81724580835e 100644
--- a/extensions/terminal-suggest/src/completions/upstream/nvm.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/nvm.ts
@@ -1,318 +1,316 @@
 // args
 const version: Fig.Arg = {
-  name: "version",
-  description: "Node version",
-  suggestions: [
-    {
-      name: "node",
-      description: "The latest version of node",
-    },
-    {
-      name: "iojs",
-      description: "The latest version of io.js",
-    },
-    {
-      name: "system",
-      description: "System-installed version of node",
-    },
-  ],
+	name: "version",
+	description: "Node version",
+	suggestions: [
+		{
+			name: "node",
+			description: "The latest version of node",
+		},
+		{
+			name: "iojs",
+			description: "The latest version of io.js",
+		},
+		{
+			name: "system",
+			description: "System-installed version of node",
+		},
+	],
 };
 
 const command: Fig.Arg = {
-  name: "command",
-  isVariadic: true,
+	name: "command",
+	isVariadic: true,
 };
 
 const args: Fig.Arg = {
-  name: "args",
-  isVariadic: true,
+	name: "args",
+	isVariadic: true,
 };
 
-const pattern: Fig.Arg = {
-  name: "pattern",
-};
+
 
 const name: Fig.Arg = {
-  name: "name",
+	name: "name",
 };
 
 const ltsName: Fig.Arg = {
-  name: "LTS name",
+	name: "LTS name",
 };
 
 const colorCodes: Fig.Arg = {
-  name: "color codes",
-  description: 'Using format "yMeBg"',
+	name: "color codes",
+	description: 'Using format "yMeBg"',
 };
 
 // options
 const noColors: Fig.Option = {
-  name: "--no-colors",
-  description: "Suppress colored output",
+	name: "--no-colors",
+	description: "Suppress colored output",
 };
 
 const noAlias: Fig.Option = {
-  name: "--no-alias",
-  description: "Suppress `nvm alias` output",
+	name: "--no-alias",
+	description: "Suppress `nvm alias` output",
 };
 
 const silent: Fig.Option = {
-  name: "--silent",
-  description: "Silences stdout/stderr output",
+	name: "--silent",
+	description: "Silences stdout/stderr output",
 };
 
 const lts: Fig.Option = {
-  name: "--lts",
-  description:
-    "Uses automatic LTS (long-term support) alias `lts/*`, if available",
+	name: "--lts",
+	description:
+		"Uses automatic LTS (long-term support) alias `lts/*`, if available",
 };
 
 const ltsWithName: Fig.Option = {
-  name: "--lts",
-  description: "Uses automatic alias for provided LTS line, if available",
-  args: ltsName,
+	name: "--lts",
+	description: "Uses automatic alias for provided LTS line, if available",
+	args: ltsName,
 };
 
 const completionSpec: Fig.Spec = {
-  name: "nvm",
-  description: "Node Package Manager",
-  subcommands: [
-    {
-      name: "install",
-      description:
-        "Download and install a <version>. Uses .nvmrc if available and version is omitted",
-      args: { ...version, isOptional: true },
-      options: [
-        {
-          name: "-s",
-          description: "Skip binary download, install from source only",
-        },
-        {
-          name: "--reinstall-packages-from",
-          description:
-            "When installing, reinstall packages installed in <version>",
-          args: version,
-        },
-        {
-          ...lts,
-          description:
-            "When installing, only select from LTS (long-term support) versions",
-        },
-        {
-          ...ltsWithName,
-          description:
-            "When installing, only select from versions for a specific LTS line",
-        },
-        {
-          name: "--skip-default-packages",
-          description:
-            "When installing, skip the default-packages file if it exists",
-        },
-        {
-          name: "--latest-npm",
-          description:
-            "After installing, attempt to upgrade to the latest working npm on the given node version",
-        },
-        {
-          name: "--no-progress",
-          description: "Disable the progress bar on any downloads",
-        },
-        {
-          name: "--alias",
-          description:
-            "After installing, set the alias specified to the version specified. (same as: nvm alias <name> <version>)",
-          args: name,
-        },
-        {
-          name: "--default",
-          description:
-            "After installing, set default alias to the version specified. (same as: nvm alias default <version>)",
-        },
-      ],
-    },
-    {
-      name: "uninstall",
-      description: "Uninstall a version",
-      args: version,
-      options: [
-        {
-          ...lts,
-          description:
-            "Uninstall using automatic LTS (long-term support) alias `lts/*`, if available",
-        },
-        {
-          ...ltsWithName,
-          description:
-            "Uninstall using automatic alias for provided LTS line, if available",
-        },
-      ],
-    },
-    {
-      name: "use",
-      description:
-        "Modify PATH to use <version>. Uses .nvmrc if available and version is omitted",
-      args: { ...version, isOptional: true },
-      options: [silent, lts, ltsWithName],
-    },
-    {
-      name: "exec",
-      description:
-        "Run <command> on <version>. Uses .nvmrc if available and version is omitted",
-      args: [{ ...version, isOptional: true }, command],
-      options: [silent, lts, ltsWithName],
-    },
-    {
-      name: "run",
-      description:
-        "Run `node` on <version> with <args> as arguments. Uses .nvmrc if available and version is omitted",
-      args: [{ ...version, isOptional: true }, args],
-      options: [silent, lts, ltsWithName],
-    },
-    {
-      name: "current",
-      description: "Display currently activated version of Node",
-    },
-    {
-      name: "ls",
-      description:
-        "List installed versions, matching a given <version> if provided",
-      args: version,
-      options: [noColors, noAlias],
-    },
-    {
-      name: "ls-remote",
-      description:
-        "List remote versions available for install, matching a given <version> if provided",
-      args: version,
-      options: [
-        {
-          ...lts,
-          description:
-            "When listing, only show LTS (long-term support) versions",
-        },
-        {
-          ...ltsWithName,
-          description:
-            "When listing, only show versions for a specific LTS line",
-        },
-        noColors,
-      ],
-    },
-    {
-      name: "version",
-      description: "Resolve the given description to a single local version",
-      args: version,
-    },
-    {
-      name: "version-remote",
-      description: "Resolve the given description to a single remote version",
-      args: version,
-      options: [
-        {
-          ...lts,
-          description:
-            "When listing, only show LTS (long-term support) versions",
-        },
-        {
-          ...ltsWithName,
-          description:
-            "When listing, only show versions for a specific LTS line",
-        },
-      ],
-    },
-    {
-      name: "deactivate",
-      description: "Undo effects of `nvm` on current shell",
-      options: [silent],
-    },
-    {
-      name: "alias",
-      description:
-        "Show all aliases beginning with <pattern> or Set an alias named <name> pointing to <version>",
-      args: [
-        {
-          name: "pattern or name",
-          description: "Pattern or name",
-        },
-        {
-          name: "version",
-          isOptional: true,
-        },
-      ],
-    },
-    {
-      name: "unalias",
-      description: "Deletes the alias named <name>",
-      args: name,
-    },
-    {
-      name: "install-latest-npm",
-      description:
-        "Attempt to upgrade to the latest working `npm` on the current node version",
-    },
-    {
-      name: "reinstall-packages",
-      description:
-        "Reinstall global `npm` packages contained in <version> to current version",
-      args: version,
-    },
-    {
-      name: "unload",
-      description: "Unload `nvm` from shell",
-    },
-    {
-      name: "which",
-      description:
-        "Display path to installed node version. Uses .nvmrc if available and version is omitted",
-      args: { ...version, isOptional: true },
-      subcommands: [
-        {
-          name: "current",
-        },
-      ],
-      options: [
-        {
-          ...silent,
-          description:
-            "Silences stdout/stderr output when a version is omitted",
-        },
-      ],
-    },
-    {
-      name: "cache",
-      args: {
-        suggestions: [
-          {
-            name: "dir",
-            description: "Display path to the cache directory for nvm",
-            type: "subcommand",
-          },
-          {
-            name: "clear",
-            description: "Empty cache directory for nvm",
-            type: "subcommand",
-          },
-        ],
-      },
-    },
-    {
-      name: "set-colors",
-      description:
-        'Set five text colors using format "yMeBg". Available when supported',
-      args: colorCodes,
-    },
-  ],
-  options: [
-    {
-      name: "--help",
-      description: "Show help page",
-    },
-    {
-      name: "--version",
-      description: "Print out the installed version of nvm",
-    },
-    noColors,
-  ],
+	name: "nvm",
+	description: "Node Package Manager",
+	subcommands: [
+		{
+			name: "install",
+			description:
+				"Download and install a <version>. Uses .nvmrc if available and version is omitted",
+			args: { ...version, isOptional: true },
+			options: [
+				{
+					name: "-s",
+					description: "Skip binary download, install from source only",
+				},
+				{
+					name: "--reinstall-packages-from",
+					description:
+						"When installing, reinstall packages installed in <version>",
+					args: version,
+				},
+				{
+					...lts,
+					description:
+						"When installing, only select from LTS (long-term support) versions",
+				},
+				{
+					...ltsWithName,
+					description:
+						"When installing, only select from versions for a specific LTS line",
+				},
+				{
+					name: "--skip-default-packages",
+					description:
+						"When installing, skip the default-packages file if it exists",
+				},
+				{
+					name: "--latest-npm",
+					description:
+						"After installing, attempt to upgrade to the latest working npm on the given node version",
+				},
+				{
+					name: "--no-progress",
+					description: "Disable the progress bar on any downloads",
+				},
+				{
+					name: "--alias",
+					description:
+						"After installing, set the alias specified to the version specified. (same as: nvm alias <name> <version>)",
+					args: name,
+				},
+				{
+					name: "--default",
+					description:
+						"After installing, set default alias to the version specified. (same as: nvm alias default <version>)",
+				},
+			],
+		},
+		{
+			name: "uninstall",
+			description: "Uninstall a version",
+			args: version,
+			options: [
+				{
+					...lts,
+					description:
+						"Uninstall using automatic LTS (long-term support) alias `lts/*`, if available",
+				},
+				{
+					...ltsWithName,
+					description:
+						"Uninstall using automatic alias for provided LTS line, if available",
+				},
+			],
+		},
+		{
+			name: "use",
+			description:
+				"Modify PATH to use <version>. Uses .nvmrc if available and version is omitted",
+			args: { ...version, isOptional: true },
+			options: [silent, lts, ltsWithName],
+		},
+		{
+			name: "exec",
+			description:
+				"Run <command> on <version>. Uses .nvmrc if available and version is omitted",
+			args: [{ ...version, isOptional: true }, command],
+			options: [silent, lts, ltsWithName],
+		},
+		{
+			name: "run",
+			description:
+				"Run `node` on <version> with <args> as arguments. Uses .nvmrc if available and version is omitted",
+			args: [{ ...version, isOptional: true }, args],
+			options: [silent, lts, ltsWithName],
+		},
+		{
+			name: "current",
+			description: "Display currently activated version of Node",
+		},
+		{
+			name: "ls",
+			description:
+				"List installed versions, matching a given <version> if provided",
+			args: version,
+			options: [noColors, noAlias],
+		},
+		{
+			name: "ls-remote",
+			description:
+				"List remote versions available for install, matching a given <version> if provided",
+			args: version,
+			options: [
+				{
+					...lts,
+					description:
+						"When listing, only show LTS (long-term support) versions",
+				},
+				{
+					...ltsWithName,
+					description:
+						"When listing, only show versions for a specific LTS line",
+				},
+				noColors,
+			],
+		},
+		{
+			name: "version",
+			description: "Resolve the given description to a single local version",
+			args: version,
+		},
+		{
+			name: "version-remote",
+			description: "Resolve the given description to a single remote version",
+			args: version,
+			options: [
+				{
+					...lts,
+					description:
+						"When listing, only show LTS (long-term support) versions",
+				},
+				{
+					...ltsWithName,
+					description:
+						"When listing, only show versions for a specific LTS line",
+				},
+			],
+		},
+		{
+			name: "deactivate",
+			description: "Undo effects of `nvm` on current shell",
+			options: [silent],
+		},
+		{
+			name: "alias",
+			description:
+				"Show all aliases beginning with <pattern> or Set an alias named <name> pointing to <version>",
+			args: [
+				{
+					name: "pattern or name",
+					description: "Pattern or name",
+				},
+				{
+					name: "version",
+					isOptional: true,
+				},
+			],
+		},
+		{
+			name: "unalias",
+			description: "Deletes the alias named <name>",
+			args: name,
+		},
+		{
+			name: "install-latest-npm",
+			description:
+				"Attempt to upgrade to the latest working `npm` on the current node version",
+		},
+		{
+			name: "reinstall-packages",
+			description:
+				"Reinstall global `npm` packages contained in <version> to current version",
+			args: version,
+		},
+		{
+			name: "unload",
+			description: "Unload `nvm` from shell",
+		},
+		{
+			name: "which",
+			description:
+				"Display path to installed node version. Uses .nvmrc if available and version is omitted",
+			args: { ...version, isOptional: true },
+			subcommands: [
+				{
+					name: "current",
+				},
+			],
+			options: [
+				{
+					...silent,
+					description:
+						"Silences stdout/stderr output when a version is omitted",
+				},
+			],
+		},
+		{
+			name: "cache",
+			args: {
+				suggestions: [
+					{
+						name: "dir",
+						description: "Display path to the cache directory for nvm",
+						type: "subcommand",
+					},
+					{
+						name: "clear",
+						description: "Empty cache directory for nvm",
+						type: "subcommand",
+					},
+				],
+			},
+		},
+		{
+			name: "set-colors",
+			description:
+				'Set five text colors using format "yMeBg". Available when supported',
+			args: colorCodes,
+		},
+	],
+	options: [
+		{
+			name: "--help",
+			description: "Show help page",
+		},
+		{
+			name: "--version",
+			description: "Print out the installed version of nvm",
+		},
+		noColors,
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/pnpm.ts b/extensions/terminal-suggest/src/completions/upstream/pnpm.ts
index 47ac1acecd2b..8faff2a66e4e 100644
--- a/extensions/terminal-suggest/src/completions/upstream/pnpm.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/pnpm.ts
@@ -4,940 +4,940 @@ 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;
+	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);
+	script: ["git", "branch", "--no-color"],
+	postProcess: function (out) {
+		const output = filterMessages(out);
 
-    if (output.startsWith("fatal:")) {
-      return [];
-    }
+		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 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",
-      };
-    });
-  },
+			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 [];
-    }
+	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
+		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",
-      };
-    });
-  },
+		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.
+	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"],
-    },
-  },
+	{
+		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.
+	{
+		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",
-  },
+	},
+	{
+		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.
+	{
+		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,
+	},
+	{
+		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.
+	{
+		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;
+		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.
+			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.
+		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.
+			},
+			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).
+			},
+			{
+				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
-    },
-  },
+		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.
+	{
+		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.
+		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.
+			},
+			{
+				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.
+	},
+	{
+		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.
+	{
+		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.
+		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.
+		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,
-    ],
-  },
+				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.
+	{
+		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.
+		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.
+				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,
+			},
+			{
+				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.
+			},
+			{
+				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",
-  },
+			},
+			{
+				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,
+	...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",
+	"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);
+	if (Array.isArray(subcommand.name)) {
+		return subcommand.name.some((name) =>
+			recursiveSubcommandsNames.includes(name)
+		);
+	}
+	return recursiveSubcommandsNames.includes(subcommand.name);
 });
 
 // RECURSIVE SUBCOMMAND INDEX
@@ -945,77 +945,77 @@ 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",
-  },
+	{
+		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[];
-    };
+	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[];
+		};
 
-    const packages = postProcess?.(
-      (
-        await executeShellCommand({
-          command: script[0],
-          args: script.slice(1),
-        })
-      ).stdout,
-      tokens
-    ).map(({ name }) => name as string);
+		const packages = postProcess?.(
+			(
+				await executeShellCommand({
+					command: script[0],
+					args: script.slice(1),
+				})
+			).stdout,
+			tokens
+		).map(({ name }) => name as string);
 
-    const subcommands = packages
-      .filter((name) => nodeClis.has(name))
-      .map((name) => ({
-        name,
-        loadSpec: name,
-        icon: "fig://icon?type=package",
-      }));
+		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,
+		return {
+			name: "pnpm",
+			subcommands,
+		} as Fig.Spec;
+	},
+	subcommands,
+	options: COMMON_OPTIONS,
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/ps.ts b/extensions/terminal-suggest/src/completions/upstream/ps.ts
index 37c34815a8c8..17dd6623679b 100644
--- a/extensions/terminal-suggest/src/completions/upstream/ps.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/ps.ts
@@ -1,153 +1,153 @@
 const completionSpec: Fig.Spec = {
-  name: "ps",
-  description: "Report a snapshot of the current processes",
-  options: [
-    { name: ["-A", "-e"], description: "Select all processes" },
-    {
-      name: "-a",
-      description: "Select all processes except both session leaders",
-      args: { name: "getsid" },
-    },
-    {
-      name: "-d",
-      description: "Select all processes except session leaders",
-    },
-    {
-      name: "--deselect",
-      description:
-        "Select all processes except those that fulfill the specified conditions",
-    },
-    {
-      name: "-N",
-      description:
-        "Select all processes except those that fulfill the specified conditions (negates the selection)",
-    },
-    {
-      name: "--pid",
-      description: "Select by process ID",
-      args: { name: "pidlist" },
-    },
-    {
-      name: "--ppid",
-      description:
-        "Select by parent process ID. This selects the processes with a parent process ID in pidlist",
-      args: { name: "pidlist" },
-    },
-    {
-      name: "--sid",
-      description: "Select by session ID",
-      args: { name: "sesslist" },
-    },
-    {
-      name: "--tty",
-      description: "Select by terminal",
-      args: { name: "ttylist" },
-    },
-    {
-      name: "U",
-      description: "Select by effective user ID (EUID) or name",
-      args: { name: "userlist" },
-    },
-    {
-      name: "-U",
-      description: "Select by real user ID (RUID) or name",
-      args: { name: "userlist" },
-    },
-    {
-      name: "-u",
-      description: "Select by effective user ID (EUID) or name",
-      args: { name: "userlist" },
-    },
-    {
-      name: "--User",
-      description: "Select by real user ID (RUID) or name",
-      args: { name: "userlist" },
-    },
-    {
-      name: "--user",
-      description: "Select by effective user ID (EUID) or name",
-      args: { name: "userlist" },
-    },
-    {
-      name: "-c",
-      description: "Show different scheduler information for the -l option",
-    },
-    {
-      name: "--context",
-      description: "Display security context format (for SE Linux)",
-    },
-    { name: "-f", description: "Do full-format listing" },
-    { name: "-F", description: "Extra full format" },
-    {
-      name: ["--format", "-o", "o"],
-      description: "",
-      args: { name: "format" },
-      isRepeatable: true,
-    },
-    { name: ["-M", "Z"], description: "(for SE Linux)" },
-    { name: ["-y", "-l"], description: "" },
-    {
-      name: "--cols",
-      description: "Set screen width",
-      args: { name: "n" },
-    },
-    {
-      name: "--columns",
-      description: "Set screen width",
-      args: { name: "n" },
-    },
-    {
-      name: "--cumulative",
-      description:
-        "Include some dead child process data (as a sum with the parent)",
-    },
-    { name: "--forest", description: "ASCII art process tree" },
-    { name: "-H", description: "Show process hierarchy (forest)" },
-    {
-      name: "--headers",
-      description: "Repeat header lines, one per page of output",
-    },
-    {
-      name: "-n",
-      description: "Set namelist file",
-      args: { name: "namelist" },
-    },
-    {
-      name: "--lines",
-      description: "Set screen height",
-      args: { name: "n" },
-    },
-    {
-      name: ["--no-headers", "--no-heading"],
-      description: "Print no header line at all",
-    },
-    {
-      name: "--rows",
-      description: "Set screen height",
-      args: { name: "n" },
-    },
-    {
-      name: "--sort",
-      description: "Specify sorting order",
-      args: { name: "spec" },
-    },
-    {
-      name: "--width",
-      description: "Set screen width",
-      args: { name: "n" },
-    },
-    {
-      name: "-L",
-      description: "Show threads, possibly with LWP and NLWP columns",
-    },
-    {
-      name: "-T",
-      description: "Show threads, possibly with SPID column",
-    },
-    { name: "--help", description: "Print a help message" },
-    { name: "--info", description: "Print debugging info" },
-    { name: "--version", description: "Print the procps version" },
-  ],
+	name: "ps",
+	description: "Report a snapshot of the current processes",
+	options: [
+		{ name: ["-A", "-e"], description: "Select all processes" },
+		{
+			name: "-a",
+			description: "Select all processes except both session leaders",
+			args: { name: "getsid" },
+		},
+		{
+			name: "-d",
+			description: "Select all processes except session leaders",
+		},
+		{
+			name: "--deselect",
+			description:
+				"Select all processes except those that fulfill the specified conditions",
+		},
+		{
+			name: "-N",
+			description:
+				"Select all processes except those that fulfill the specified conditions (negates the selection)",
+		},
+		{
+			name: "--pid",
+			description: "Select by process ID",
+			args: { name: "pidlist" },
+		},
+		{
+			name: "--ppid",
+			description:
+				"Select by parent process ID. This selects the processes with a parent process ID in pidlist",
+			args: { name: "pidlist" },
+		},
+		{
+			name: "--sid",
+			description: "Select by session ID",
+			args: { name: "sesslist" },
+		},
+		{
+			name: "--tty",
+			description: "Select by terminal",
+			args: { name: "ttylist" },
+		},
+		{
+			name: "U",
+			description: "Select by effective user ID (EUID) or name",
+			args: { name: "userlist" },
+		},
+		{
+			name: "-U",
+			description: "Select by real user ID (RUID) or name",
+			args: { name: "userlist" },
+		},
+		{
+			name: "-u",
+			description: "Select by effective user ID (EUID) or name",
+			args: { name: "userlist" },
+		},
+		{
+			name: "--User",
+			description: "Select by real user ID (RUID) or name",
+			args: { name: "userlist" },
+		},
+		{
+			name: "--user",
+			description: "Select by effective user ID (EUID) or name",
+			args: { name: "userlist" },
+		},
+		{
+			name: "-c",
+			description: "Show different scheduler information for the -l option",
+		},
+		{
+			name: "--context",
+			description: "Display security context format (for SE Linux)",
+		},
+		{ name: "-f", description: "Do full-format listing" },
+		{ name: "-F", description: "Extra full format" },
+		{
+			name: ["--format", "-o", "o"],
+			description: "",
+			args: { name: "format" },
+			isRepeatable: true,
+		},
+		{ name: ["-M", "Z"], description: "(for SE Linux)" },
+		{ name: ["-y", "-l"], description: "" },
+		{
+			name: "--cols",
+			description: "Set screen width",
+			args: { name: "n" },
+		},
+		{
+			name: "--columns",
+			description: "Set screen width",
+			args: { name: "n" },
+		},
+		{
+			name: "--cumulative",
+			description:
+				"Include some dead child process data (as a sum with the parent)",
+		},
+		{ name: "--forest", description: "ASCII art process tree" },
+		{ name: "-H", description: "Show process hierarchy (forest)" },
+		{
+			name: "--headers",
+			description: "Repeat header lines, one per page of output",
+		},
+		{
+			name: "-n",
+			description: "Set namelist file",
+			args: { name: "namelist" },
+		},
+		{
+			name: "--lines",
+			description: "Set screen height",
+			args: { name: "n" },
+		},
+		{
+			name: ["--no-headers", "--no-heading"],
+			description: "Print no header line at all",
+		},
+		{
+			name: "--rows",
+			description: "Set screen height",
+			args: { name: "n" },
+		},
+		{
+			name: "--sort",
+			description: "Specify sorting order",
+			args: { name: "spec" },
+		},
+		{
+			name: "--width",
+			description: "Set screen width",
+			args: { name: "n" },
+		},
+		{
+			name: "-L",
+			description: "Show threads, possibly with LWP and NLWP columns",
+		},
+		{
+			name: "-T",
+			description: "Show threads, possibly with SPID column",
+		},
+		{ name: "--help", description: "Print a help message" },
+		{ name: "--info", description: "Print debugging info" },
+		{ name: "--version", description: "Print the procps version" },
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/pwd.ts b/extensions/terminal-suggest/src/completions/upstream/pwd.ts
index 42126db30b7d..11c390ad031d 100644
--- a/extensions/terminal-suggest/src/completions/upstream/pwd.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/pwd.ts
@@ -1,16 +1,16 @@
 const completionSpec: Fig.Spec = {
-  name: "pwd",
-  description: "Return working directory name",
-  options: [
-    {
-      name: "-L",
-      description: "Display the logical current working directory",
-    },
-    {
-      name: "-P",
-      description: "Display the physical current working directory",
-    },
-  ],
+	name: "pwd",
+	description: "Return working directory name",
+	options: [
+		{
+			name: "-L",
+			description: "Display the logical current working directory",
+		},
+		{
+			name: "-P",
+			description: "Display the physical current working directory",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/python.ts b/extensions/terminal-suggest/src/completions/upstream/python.ts
index 8362ef135e0c..beca86b3bee0 100644
--- a/extensions/terminal-suggest/src/completions/upstream/python.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/python.ts
@@ -1,168 +1,168 @@
 import { filepaths } from '../../helpers/filepaths';
 
 const completionSpec: Fig.Spec = {
-  name: "python",
-  description: "Run the python interpreter",
-  generateSpec: async (tokens, executeShellCommand) => {
-    const isDjangoManagePyFilePresentCommand = "cat manage.py | grep -q django";
-    if (
-      (
-        await executeShellCommand({
-          command: "bash",
-          args: ["-c", isDjangoManagePyFilePresentCommand],
-        })
-      ).status === 0
-    ) {
-      return {
-        name: "python",
-        subcommands: [{ name: "manage.py", loadSpec: "django-admin" }],
-      };
-    }
-  },
-  args: {
-    name: "python script",
-    isScript: true,
-    generators: filepaths({
-      extensions: ["py"],
-      editFileSuggestions: { priority: 76 },
-    }),
-  },
-  options: [
-    {
-      name: "-c",
-      insertValue: "-c '{cursor}'",
-      description:
-        "Execute the Python code in command. command can be one or more statements separated by newlines, with significant leading whitespace as in normal module code",
-      args: {
-        name: "command",
-        isCommand: true,
-      },
-    },
-    {
-      name: "-m",
-      description: "Module",
-      args: {
-        name: "python module",
-        isModule: "python/",
-        suggestions: ["http.server"],
-      },
-    },
-    {
-      name: ["-?", "-h", "--help"],
-      description: "Print a short description of all command line options",
-    },
-    {
-      name: ["-V", "--version"],
-      description: "Print the Python version number and exit",
-    },
-    {
-      name: "-b",
-      description:
-        "Issue a warning when comparing bytes or bytearray with str or bytes with int. Issue an error when the option is given twice (-bb)",
-    },
-    {
-      name: "-B",
-      description:
-        "If given, Python won’t try to write .pyc files on the import of source modules",
-    },
-    {
-      name: "--check-hash-based-pycs",
-      description:
-        "Control the validation behavior of hash-based .pyc files. See Cached bytecode invalidation",
-      args: {
-        suggestions: [
-          { name: "default" },
-          { name: "always" },
-          { name: "never" },
-        ],
-      },
-    },
-    {
-      name: "-d",
-      description:
-        "Turn on parser debugging output (for expert only, depending on compilation options)",
-    },
-    {
-      name: "-E",
-      description:
-        "Ignore all PYTHON* environment variables, e.g. PYTHONPATH and PYTHONHOME, that might be set",
-    },
-    {
-      name: "-i",
-      description:
-        "When a script is passed as first argument or the -c option is used, enter interactive mode after executing the script or the command, even when sys.stdin does not appear to be a terminal",
-    },
-    {
-      name: "-I",
-      description:
-        "Run Python in isolated mode. This also implies -E and -s. In isolated mode sys.path contains neither the script’s directory nor the user’s site-packages directory",
-    },
-    {
-      name: "-O",
-      description:
-        "Remove assert statements and any code conditional on the value of __debug__",
-    },
-    {
-      name: "-OO",
-      description: "Do -O and also discard docstrings",
-    },
-    {
-      name: "-g",
-      description:
-        "Don’t display the copyright and version messages even in interactive mode",
-    },
-    {
-      name: "-R",
-      description:
-        "Turn on hash randomization. This option only has an effect if the PYTHONHASHSEED environment variable is set to 0, since hash randomization is enabled by default",
-    },
-    {
-      name: "-s",
-      description: "Don’t add the user site-packages directory to sys.path",
-    },
-    {
-      name: "-S",
-      description:
-        "Disable the import of the module site and the site-dependent manipulations of sys.path that it entails",
-    },
-    {
-      name: "-u",
-      description:
-        "Force the stdout and stderr streams to be unbuffered. This option has no effect on the stdin stream",
-    },
-    {
-      name: "-v",
-      description:
-        "Print a message each time a module is initialized, showing the place (filename or built-in module) from which it is loaded",
-    },
-    {
-      name: "-W",
-      description:
-        "Warning control. Python’s warning machinery by default prints warning messages to sys.stderr",
-      args: {},
-    },
-    {
-      name: "-x",
-      description:
-        "Skip the first line of the source, allowing use of non-Unix forms of #!cmd. This is intended for a DOS specific hack only",
-    },
-    {
-      name: "-X",
-      description: "Reserved for various implementation-specific options",
-      args: {
-        suggestions: [
-          { name: "faulthandler" },
-          { name: "showrefcount" },
-          { name: "tracemalloc" },
-          { name: "showalloccount" },
-          { name: "importtime" },
-          { name: "dev" },
-          { name: "utf8" },
-          { name: "pycache_prefix=PATH" },
-        ],
-      },
-    },
-  ],
+	name: "python",
+	description: "Run the python interpreter",
+	generateSpec: async (tokens, executeShellCommand) => {
+		const isDjangoManagePyFilePresentCommand = "cat manage.py | grep -q django";
+		if (
+			(
+				await executeShellCommand({
+					command: "bash",
+					args: ["-c", isDjangoManagePyFilePresentCommand],
+				})
+			).status === 0
+		) {
+			return {
+				name: "python",
+				subcommands: [{ name: "manage.py", loadSpec: "django-admin" }],
+			};
+		}
+	},
+	args: {
+		name: "python script",
+		isScript: true,
+		generators: filepaths({
+			extensions: ["py"],
+			editFileSuggestions: { priority: 76 },
+		}),
+	},
+	options: [
+		{
+			name: "-c",
+			insertValue: "-c '{cursor}'",
+			description:
+				"Execute the Python code in command. command can be one or more statements separated by newlines, with significant leading whitespace as in normal module code",
+			args: {
+				name: "command",
+				isCommand: true,
+			},
+		},
+		{
+			name: "-m",
+			description: "Module",
+			args: {
+				name: "python module",
+				isModule: "python/",
+				suggestions: ["http.server"],
+			},
+		},
+		{
+			name: ["-?", "-h", "--help"],
+			description: "Print a short description of all command line options",
+		},
+		{
+			name: ["-V", "--version"],
+			description: "Print the Python version number and exit",
+		},
+		{
+			name: "-b",
+			description:
+				"Issue a warning when comparing bytes or bytearray with str or bytes with int. Issue an error when the option is given twice (-bb)",
+		},
+		{
+			name: "-B",
+			description:
+				"If given, Python won’t try to write .pyc files on the import of source modules",
+		},
+		{
+			name: "--check-hash-based-pycs",
+			description:
+				"Control the validation behavior of hash-based .pyc files. See Cached bytecode invalidation",
+			args: {
+				suggestions: [
+					{ name: "default" },
+					{ name: "always" },
+					{ name: "never" },
+				],
+			},
+		},
+		{
+			name: "-d",
+			description:
+				"Turn on parser debugging output (for expert only, depending on compilation options)",
+		},
+		{
+			name: "-E",
+			description:
+				"Ignore all PYTHON* environment variables, e.g. PYTHONPATH and PYTHONHOME, that might be set",
+		},
+		{
+			name: "-i",
+			description:
+				"When a script is passed as first argument or the -c option is used, enter interactive mode after executing the script or the command, even when sys.stdin does not appear to be a terminal",
+		},
+		{
+			name: "-I",
+			description:
+				"Run Python in isolated mode. This also implies -E and -s. In isolated mode sys.path contains neither the script’s directory nor the user’s site-packages directory",
+		},
+		{
+			name: "-O",
+			description:
+				"Remove assert statements and any code conditional on the value of __debug__",
+		},
+		{
+			name: "-OO",
+			description: "Do -O and also discard docstrings",
+		},
+		{
+			name: "-g",
+			description:
+				"Don’t display the copyright and version messages even in interactive mode",
+		},
+		{
+			name: "-R",
+			description:
+				"Turn on hash randomization. This option only has an effect if the PYTHONHASHSEED environment variable is set to 0, since hash randomization is enabled by default",
+		},
+		{
+			name: "-s",
+			description: "Don’t add the user site-packages directory to sys.path",
+		},
+		{
+			name: "-S",
+			description:
+				"Disable the import of the module site and the site-dependent manipulations of sys.path that it entails",
+		},
+		{
+			name: "-u",
+			description:
+				"Force the stdout and stderr streams to be unbuffered. This option has no effect on the stdin stream",
+		},
+		{
+			name: "-v",
+			description:
+				"Print a message each time a module is initialized, showing the place (filename or built-in module) from which it is loaded",
+		},
+		{
+			name: "-W",
+			description:
+				"Warning control. Python’s warning machinery by default prints warning messages to sys.stderr",
+			args: {},
+		},
+		{
+			name: "-x",
+			description:
+				"Skip the first line of the source, allowing use of non-Unix forms of #!cmd. This is intended for a DOS specific hack only",
+		},
+		{
+			name: "-X",
+			description: "Reserved for various implementation-specific options",
+			args: {
+				suggestions: [
+					{ name: "faulthandler" },
+					{ name: "showrefcount" },
+					{ name: "tracemalloc" },
+					{ name: "showalloccount" },
+					{ name: "importtime" },
+					{ name: "dev" },
+					{ name: "utf8" },
+					{ name: "pycache_prefix=PATH" },
+				],
+			},
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/python3.ts b/extensions/terminal-suggest/src/completions/upstream/python3.ts
index 37aab70947d2..7e08e0a20f90 100644
--- a/extensions/terminal-suggest/src/completions/upstream/python3.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/python3.ts
@@ -1,170 +1,170 @@
 import { filepaths } from '../../helpers/filepaths';
 
 const completionSpec: Fig.Spec = {
-  name: "python3",
-  description: "Run the python interpreter",
-  generateSpec: async (tokens, executeShellCommand) => {
-    const isDjangoManagePyFilePresentCommand = "cat manage.py | grep -q django";
+	name: "python3",
+	description: "Run the python interpreter",
+	generateSpec: async (tokens, executeShellCommand) => {
+		const isDjangoManagePyFilePresentCommand = "cat manage.py | grep -q django";
 
-    if (
-      (
-        await executeShellCommand({
-          command: "bash",
-          args: ["-c", isDjangoManagePyFilePresentCommand],
-        })
-      ).status === 0
-    ) {
-      return {
-        name: "python3",
-        subcommands: [{ name: "manage.py", loadSpec: "django-admin" }],
-      };
-    }
-  },
-  args: {
-    name: "python script",
-    isScript: true,
-    generators: filepaths({
-      extensions: ["py"],
-      editFileSuggestions: { priority: 76 },
-    }),
-  },
-  options: [
-    {
-      name: "-c",
-      insertValue: "-c '{cursor}'",
-      description:
-        "Execute the Python code in command. command can be one or more statements separated by newlines, with significant leading whitespace as in normal module code",
-      args: {
-        name: "command",
-        isCommand: true,
-      },
-    },
-    {
-      name: "-m",
-      insertValue: "-m '{cursor}'",
-      description:
-        "Search sys.path for the named module and execute its contents as the __main__ module",
-      args: {
-        name: "command",
-        isCommand: true,
-      },
-    },
-    {
-      name: ["-?", "-h", "--help"],
-      description: "Print a short description of all command line options",
-    },
-    {
-      name: ["-V", "--version"],
-      description: "Print the Python version number and exit",
-    },
-    {
-      name: "-b",
-      description:
-        "Issue a warning when comparing bytes or bytearray with str or bytes with int. Issue an error when the option is given twice (-bb)",
-    },
-    {
-      name: "-B",
-      description:
-        "If given, Python won’t try to write .pyc files on the import of source modules",
-    },
-    {
-      name: "--check-hash-based-pycs",
-      description:
-        "Control the validation behavior of hash-based .pyc files. See Cached bytecode invalidation",
-      args: {
-        suggestions: [
-          { name: "default" },
-          { name: "always" },
-          { name: "never" },
-        ],
-      },
-    },
-    {
-      name: "-d",
-      description:
-        "Turn on parser debugging output (for expert only, depending on compilation options)",
-    },
-    {
-      name: "-E",
-      description:
-        "Ignore all PYTHON* environment variables, e.g. PYTHONPATH and PYTHONHOME, that might be set",
-    },
-    {
-      name: "-i",
-      description:
-        "When a script is passed as first argument or the -c option is used, enter interactive mode after executing the script or the command, even when sys.stdin does not appear to be a terminal",
-    },
-    {
-      name: "-I",
-      description:
-        "Run Python in isolated mode. This also implies -E and -s. In isolated mode sys.path contains neither the script’s directory nor the user’s site-packages directory",
-    },
-    {
-      name: "-O",
-      description:
-        "Remove assert statements and any code conditional on the value of __debug__",
-    },
-    {
-      name: "-OO",
-      description: "Do -O and also discard docstrings",
-    },
-    {
-      name: "-g",
-      description:
-        "Don’t display the copyright and version messages even in interactive mode",
-    },
-    {
-      name: "-R",
-      description:
-        "Turn on hash randomization. This option only has an effect if the PYTHONHASHSEED environment variable is set to 0, since hash randomization is enabled by default",
-    },
-    {
-      name: "-s",
-      description: "Don’t add the user site-packages directory to sys.path",
-    },
-    {
-      name: "-S",
-      description:
-        "Disable the import of the module site and the site-dependent manipulations of sys.path that it entails",
-    },
-    {
-      name: "-u",
-      description:
-        "Force the stdout and stderr streams to be unbuffered. This option has no effect on the stdin stream",
-    },
-    {
-      name: "-v",
-      description:
-        "Print a message each time a module is initialized, showing the place (filename or built-in module) from which it is loaded",
-    },
-    {
-      name: "-W",
-      description:
-        "Warning control. Python’s warning machinery by default prints warning messages to sys.stderr",
-      args: {},
-    },
-    {
-      name: "-x",
-      description:
-        "Skip the first line of the source, allowing use of non-Unix forms of #!cmd. This is intended for a DOS specific hack only",
-    },
-    {
-      name: "-X",
-      description: "Reserved for various implementation-specific options",
-      args: {
-        suggestions: [
-          { name: "faulthandler" },
-          { name: "showrefcount" },
-          { name: "tracemalloc" },
-          { name: "showalloccount" },
-          { name: "importtime" },
-          { name: "dev" },
-          { name: "utf8" },
-          { name: "pycache_prefix=PATH" },
-        ],
-      },
-    },
-  ],
+		if (
+			(
+				await executeShellCommand({
+					command: "bash",
+					args: ["-c", isDjangoManagePyFilePresentCommand],
+				})
+			).status === 0
+		) {
+			return {
+				name: "python3",
+				subcommands: [{ name: "manage.py", loadSpec: "django-admin" }],
+			};
+		}
+	},
+	args: {
+		name: "python script",
+		isScript: true,
+		generators: filepaths({
+			extensions: ["py"],
+			editFileSuggestions: { priority: 76 },
+		}),
+	},
+	options: [
+		{
+			name: "-c",
+			insertValue: "-c '{cursor}'",
+			description:
+				"Execute the Python code in command. command can be one or more statements separated by newlines, with significant leading whitespace as in normal module code",
+			args: {
+				name: "command",
+				isCommand: true,
+			},
+		},
+		{
+			name: "-m",
+			insertValue: "-m '{cursor}'",
+			description:
+				"Search sys.path for the named module and execute its contents as the __main__ module",
+			args: {
+				name: "command",
+				isCommand: true,
+			},
+		},
+		{
+			name: ["-?", "-h", "--help"],
+			description: "Print a short description of all command line options",
+		},
+		{
+			name: ["-V", "--version"],
+			description: "Print the Python version number and exit",
+		},
+		{
+			name: "-b",
+			description:
+				"Issue a warning when comparing bytes or bytearray with str or bytes with int. Issue an error when the option is given twice (-bb)",
+		},
+		{
+			name: "-B",
+			description:
+				"If given, Python won’t try to write .pyc files on the import of source modules",
+		},
+		{
+			name: "--check-hash-based-pycs",
+			description:
+				"Control the validation behavior of hash-based .pyc files. See Cached bytecode invalidation",
+			args: {
+				suggestions: [
+					{ name: "default" },
+					{ name: "always" },
+					{ name: "never" },
+				],
+			},
+		},
+		{
+			name: "-d",
+			description:
+				"Turn on parser debugging output (for expert only, depending on compilation options)",
+		},
+		{
+			name: "-E",
+			description:
+				"Ignore all PYTHON* environment variables, e.g. PYTHONPATH and PYTHONHOME, that might be set",
+		},
+		{
+			name: "-i",
+			description:
+				"When a script is passed as first argument or the -c option is used, enter interactive mode after executing the script or the command, even when sys.stdin does not appear to be a terminal",
+		},
+		{
+			name: "-I",
+			description:
+				"Run Python in isolated mode. This also implies -E and -s. In isolated mode sys.path contains neither the script’s directory nor the user’s site-packages directory",
+		},
+		{
+			name: "-O",
+			description:
+				"Remove assert statements and any code conditional on the value of __debug__",
+		},
+		{
+			name: "-OO",
+			description: "Do -O and also discard docstrings",
+		},
+		{
+			name: "-g",
+			description:
+				"Don’t display the copyright and version messages even in interactive mode",
+		},
+		{
+			name: "-R",
+			description:
+				"Turn on hash randomization. This option only has an effect if the PYTHONHASHSEED environment variable is set to 0, since hash randomization is enabled by default",
+		},
+		{
+			name: "-s",
+			description: "Don’t add the user site-packages directory to sys.path",
+		},
+		{
+			name: "-S",
+			description:
+				"Disable the import of the module site and the site-dependent manipulations of sys.path that it entails",
+		},
+		{
+			name: "-u",
+			description:
+				"Force the stdout and stderr streams to be unbuffered. This option has no effect on the stdin stream",
+		},
+		{
+			name: "-v",
+			description:
+				"Print a message each time a module is initialized, showing the place (filename or built-in module) from which it is loaded",
+		},
+		{
+			name: "-W",
+			description:
+				"Warning control. Python’s warning machinery by default prints warning messages to sys.stderr",
+			args: {},
+		},
+		{
+			name: "-x",
+			description:
+				"Skip the first line of the source, allowing use of non-Unix forms of #!cmd. This is intended for a DOS specific hack only",
+		},
+		{
+			name: "-X",
+			description: "Reserved for various implementation-specific options",
+			args: {
+				suggestions: [
+					{ name: "faulthandler" },
+					{ name: "showrefcount" },
+					{ name: "tracemalloc" },
+					{ name: "showalloccount" },
+					{ name: "importtime" },
+					{ name: "dev" },
+					{ name: "utf8" },
+					{ name: "pycache_prefix=PATH" },
+				],
+			},
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/rm.ts b/extensions/terminal-suggest/src/completions/upstream/rm.ts
index 7b52f909527a..9aaf18553fea 100644
--- a/extensions/terminal-suggest/src/completions/upstream/rm.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/rm.ts
@@ -1,43 +1,43 @@
 const completionSpec: Fig.Spec = {
-  name: "rm",
-  description: "Remove directory entries",
-  args: {
-    isVariadic: true,
-    template: ["folders", "filepaths"],
-  },
+	name: "rm",
+	description: "Remove directory entries",
+	args: {
+		isVariadic: true,
+		template: ["folders", "filepaths"],
+	},
 
-  options: [
-    {
-      name: ["-r", "-R"],
-      description:
-        "Recursive. Attempt to remove the file hierarchy rooted in each file argument",
-      isDangerous: true,
-    },
-    {
-      name: "-P",
-      description: "Overwrite regular files before deleting them",
-      isDangerous: true,
-    },
-    {
-      name: "-d",
-      description:
-        "Attempt to remove directories as well as other types of files",
-    },
-    {
-      name: "-f",
-      description:
-        "⚠️ Attempt to remove the files without prompting for confirmation",
-      isDangerous: true,
-    },
-    {
-      name: "-i",
-      description: "Request confirmation before attempting to remove each file",
-    },
-    {
-      name: "-v",
-      description: "Be verbose when deleting files",
-    },
-  ],
+	options: [
+		{
+			name: ["-r", "-R"],
+			description:
+				"Recursive. Attempt to remove the file hierarchy rooted in each file argument",
+			isDangerous: true,
+		},
+		{
+			name: "-P",
+			description: "Overwrite regular files before deleting them",
+			isDangerous: true,
+		},
+		{
+			name: "-d",
+			description:
+				"Attempt to remove directories as well as other types of files",
+		},
+		{
+			name: "-f",
+			description:
+				"⚠️ Attempt to remove the files without prompting for confirmation",
+			isDangerous: true,
+		},
+		{
+			name: "-i",
+			description: "Request confirmation before attempting to remove each file",
+		},
+		{
+			name: "-v",
+			description: "Be verbose when deleting files",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/rmdir.ts b/extensions/terminal-suggest/src/completions/upstream/rmdir.ts
index 92790e75d0dd..430b9a678eff 100644
--- a/extensions/terminal-suggest/src/completions/upstream/rmdir.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/rmdir.ts
@@ -1,18 +1,18 @@
 const completionSpec: Fig.Spec = {
-  name: "rmdir",
-  description: "Remove directories",
-  args: {
-    isVariadic: true,
-    template: "folders",
-  },
+	name: "rmdir",
+	description: "Remove directories",
+	args: {
+		isVariadic: true,
+		template: "folders",
+	},
 
-  options: [
-    {
-      name: "-p",
-      description: "Remove each directory of path",
-      isDangerous: true,
-    },
-  ],
+	options: [
+		{
+			name: "-p",
+			description: "Remove each directory of path",
+			isDangerous: true,
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/scp.ts b/extensions/terminal-suggest/src/completions/upstream/scp.ts
index 93da019b6867..3971e94d46fd 100644
--- a/extensions/terminal-suggest/src/completions/upstream/scp.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/scp.ts
@@ -1,226 +1,226 @@
 import { knownHosts, configHosts } from "./ssh";
 
 const completionSpec: Fig.Spec = {
-  name: "scp",
-  description: "Copies files or directories between hosts on a network",
-  args: [
-    {
-      name: "sources",
-      description: "File or directory, local or remote ([user@]host:[path])",
-      isVariadic: true,
-      generators: [
-        knownHosts,
-        configHosts,
-        { template: ["history", "filepaths", "folders"] },
-      ],
-    },
-    {
-      name: "target",
-      description: "File or directory, local or remote ([user@]host:[path])",
-      generators: [
-        knownHosts,
-        configHosts,
-        { template: ["history", "filepaths", "folders"] },
-      ],
-    },
-  ],
-  options: [
-    {
-      name: "-3",
-      description: `Copies between two remote hosts are transferred through the local
+	name: "scp",
+	description: "Copies files or directories between hosts on a network",
+	args: [
+		{
+			name: "sources",
+			description: "File or directory, local or remote ([user@]host:[path])",
+			isVariadic: true,
+			generators: [
+				knownHosts,
+				configHosts,
+				{ template: ["history", "filepaths", "folders"] },
+			],
+		},
+		{
+			name: "target",
+			description: "File or directory, local or remote ([user@]host:[path])",
+			generators: [
+				knownHosts,
+				configHosts,
+				{ template: ["history", "filepaths", "folders"] },
+			],
+		},
+	],
+	options: [
+		{
+			name: "-3",
+			description: `Copies between two remote hosts are transferred through the local
 host.  Without this option the data is copied directly between the
 two remote hosts.  Note that this option disables the progress
 meter and selects batch mode for the second host, since scp cannot
 ask for passwords or passphrases for both hosts`,
-    },
-    {
-      name: "-4",
-      description: "Forces scp to use IPv4 addresses only",
-    },
-    {
-      name: "-6",
-      description: "Forces scp to use IPv6 addresses only",
-    },
-    {
-      name: "-A",
-      description:
-        "Allows forwarding of ssh-agent(1) to the remote system. The default is not to forward an authentication agent",
-    },
-    {
-      name: "-B",
-      description:
-        "Selects batch mode (prevents asking for passwords or passphrases)",
-    },
-    {
-      name: "-C",
-      description:
-        "Compression enable. Passes the -C flag to ssh(1) to enable compression",
-    },
-    {
-      name: "-c",
-      description:
-        "Selects the cipher to use for encrypting the data transfer. This option is directly passed to ssh(1)",
-      args: {
-        name: "cipher",
-        description: "The selected cipher specification",
-      },
-    },
-    {
-      name: "-F",
-      description:
-        "Specifies an alternative per-user configuration file for ssh. This option is directly passed to ssh(1)",
-      args: {
-        name: "ssh_config",
-        description: "The selected ssh config",
-      },
-    },
-    {
-      name: "-i",
-      description:
-        "Selects the file from which the identity (private key) for public key authentication is read. This option is directly passed to ssh(1)",
-      args: {
-        name: "identity_file",
-        description: "Specified identity file",
-      },
-    },
-    {
-      name: "-J",
-      description: `Connect to the target host by first making an scp connection to the
+		},
+		{
+			name: "-4",
+			description: "Forces scp to use IPv4 addresses only",
+		},
+		{
+			name: "-6",
+			description: "Forces scp to use IPv6 addresses only",
+		},
+		{
+			name: "-A",
+			description:
+				"Allows forwarding of ssh-agent(1) to the remote system. The default is not to forward an authentication agent",
+		},
+		{
+			name: "-B",
+			description:
+				"Selects batch mode (prevents asking for passwords or passphrases)",
+		},
+		{
+			name: "-C",
+			description:
+				"Compression enable. Passes the -C flag to ssh(1) to enable compression",
+		},
+		{
+			name: "-c",
+			description:
+				"Selects the cipher to use for encrypting the data transfer. This option is directly passed to ssh(1)",
+			args: {
+				name: "cipher",
+				description: "The selected cipher specification",
+			},
+		},
+		{
+			name: "-F",
+			description:
+				"Specifies an alternative per-user configuration file for ssh. This option is directly passed to ssh(1)",
+			args: {
+				name: "ssh_config",
+				description: "The selected ssh config",
+			},
+		},
+		{
+			name: "-i",
+			description:
+				"Selects the file from which the identity (private key) for public key authentication is read. This option is directly passed to ssh(1)",
+			args: {
+				name: "identity_file",
+				description: "Specified identity file",
+			},
+		},
+		{
+			name: "-J",
+			description: `Connect to the target host by first making an scp connection to the
 jump host described by destination and then establishing a TCP
 forwarding to the ultimate destination from there.  Multiple jump
 hops may be specified separated by comma characters.  This is a
 shortcut to specify a ProxyJump configuration directive.  This
 option is directly passed to ssh(1)`,
-      args: {
-        name: "destination",
-        description: "Scp destination",
-      },
-    },
-    {
-      name: "-l",
-      description: "Limits the used bandwidth, specified in Kbit/s",
-      args: {
-        name: "limit",
-        description: "Limit bandwidth in Kbit/s",
-      },
-    },
-    {
-      name: "-o",
-      description: `Can be used to pass options to ssh in the format used in
+			args: {
+				name: "destination",
+				description: "Scp destination",
+			},
+		},
+		{
+			name: "-l",
+			description: "Limits the used bandwidth, specified in Kbit/s",
+			args: {
+				name: "limit",
+				description: "Limit bandwidth in Kbit/s",
+			},
+		},
+		{
+			name: "-o",
+			description: `Can be used to pass options to ssh in the format used in
 ssh_config(5).  This is useful for specifying options for which
 there is no separate scp command-line flag.  For full details of
 the options listed below, and their possible values, see
 ssh_config(5)`,
-      args: {
-        name: "option",
-        suggestions: [
-          { name: "AddressFamily" },
-          { name: "BatchMode" },
-          { name: "BindAddress" },
-          { name: "ChallengeResponseAuthentication" },
-          { name: "CheckHostIP" },
-          { name: "Cipher" },
-          { name: "Ciphers" },
-          { name: "ClearAllForwardings" },
-          { name: "Compression" },
-          { name: "CompressionLevel" },
-          { name: "ConnectionAttempts" },
-          { name: "ConnectTimeout" },
-          { name: "ControlMaster" },
-          { name: "ControlPath" },
-          { name: "ControlPersist" },
-          { name: "DynamicForward" },
-          { name: "EscapeChar" },
-          { name: "ExitOnForwardFailure" },
-          { name: "ForwardAgent" },
-          { name: "ForwardX11" },
-          { name: "ForwardX11Timeout" },
-          { name: "ForwardX11Trusted" },
-          { name: "GatewayPorts" },
-          { name: "GlobalKnownHostsFile" },
-          { name: "GSSAPIAuthentication" },
-          { name: "GSSAPIDelegateCredentials" },
-          { name: "HashKnownHosts" },
-          { name: "Host" },
-          { name: "HostbasedAuthentication" },
-          { name: "HostKeyAlgorithms" },
-          { name: "HostKeyAlias" },
-          { name: "HostName" },
-          { name: "IdentityFile" },
-          { name: "IdentitiesOnly" },
-          { name: "IPQoS" },
-          { name: "KbdInteractiveAuthentication" },
-          { name: "KbdInteractiveDevices" },
-          { name: "KexAlgorithms" },
-          { name: "LocalCommand" },
-          { name: "LocalForward" },
-          { name: "LogLevel" },
-          { name: "MACs" },
-          { name: "NoHostAuthenticationForLocalhost" },
-          { name: "NumberOfPasswordPrompts" },
-          { name: "PasswordAuthentication" },
-          { name: "PermitLocalCommand" },
-          { name: "PKCS11Provider" },
-          { name: "Port" },
-          { name: "PreferredAuthentications" },
-          { name: "Protocol" },
-          { name: "ProxyCommand" },
-          { name: "PubkeyAuthentication" },
-          { name: "RekeyLimit" },
-          { name: "RequestTTY" },
-          { name: "RhostsRSAAuthentication" },
-          { name: "RSAAuthentication" },
-          { name: "SendEnv" },
-          { name: "ServerAliveInterval" },
-          { name: "ServerAliveCountMax" },
-          { name: "StrictHostKeyChecking" },
-          { name: "TCPKeepAlive" },
-          { name: "Tunnel" },
-          { name: "TunnelDevice" },
-          { name: "UsePrivilegedPort" },
-          { name: "User" },
-          { name: "UserKnownHostsFile" },
-          { name: "VerifyHostKeyDNS" },
-          { name: "VisualHostKey" },
-          { name: "XAuthLocation" },
-        ],
-      },
-    },
-    {
-      name: "-P",
-      description: `Specifies the port to connect to on the remote host.  Note that
+			args: {
+				name: "option",
+				suggestions: [
+					{ name: "AddressFamily" },
+					{ name: "BatchMode" },
+					{ name: "BindAddress" },
+					{ name: "ChallengeResponseAuthentication" },
+					{ name: "CheckHostIP" },
+					{ name: "Cipher" },
+					{ name: "Ciphers" },
+					{ name: "ClearAllForwardings" },
+					{ name: "Compression" },
+					{ name: "CompressionLevel" },
+					{ name: "ConnectionAttempts" },
+					{ name: "ConnectTimeout" },
+					{ name: "ControlMaster" },
+					{ name: "ControlPath" },
+					{ name: "ControlPersist" },
+					{ name: "DynamicForward" },
+					{ name: "EscapeChar" },
+					{ name: "ExitOnForwardFailure" },
+					{ name: "ForwardAgent" },
+					{ name: "ForwardX11" },
+					{ name: "ForwardX11Timeout" },
+					{ name: "ForwardX11Trusted" },
+					{ name: "GatewayPorts" },
+					{ name: "GlobalKnownHostsFile" },
+					{ name: "GSSAPIAuthentication" },
+					{ name: "GSSAPIDelegateCredentials" },
+					{ name: "HashKnownHosts" },
+					{ name: "Host" },
+					{ name: "HostbasedAuthentication" },
+					{ name: "HostKeyAlgorithms" },
+					{ name: "HostKeyAlias" },
+					{ name: "HostName" },
+					{ name: "IdentityFile" },
+					{ name: "IdentitiesOnly" },
+					{ name: "IPQoS" },
+					{ name: "KbdInteractiveAuthentication" },
+					{ name: "KbdInteractiveDevices" },
+					{ name: "KexAlgorithms" },
+					{ name: "LocalCommand" },
+					{ name: "LocalForward" },
+					{ name: "LogLevel" },
+					{ name: "MACs" },
+					{ name: "NoHostAuthenticationForLocalhost" },
+					{ name: "NumberOfPasswordPrompts" },
+					{ name: "PasswordAuthentication" },
+					{ name: "PermitLocalCommand" },
+					{ name: "PKCS11Provider" },
+					{ name: "Port" },
+					{ name: "PreferredAuthentications" },
+					{ name: "Protocol" },
+					{ name: "ProxyCommand" },
+					{ name: "PubkeyAuthentication" },
+					{ name: "RekeyLimit" },
+					{ name: "RequestTTY" },
+					{ name: "RhostsRSAAuthentication" },
+					{ name: "RSAAuthentication" },
+					{ name: "SendEnv" },
+					{ name: "ServerAliveInterval" },
+					{ name: "ServerAliveCountMax" },
+					{ name: "StrictHostKeyChecking" },
+					{ name: "TCPKeepAlive" },
+					{ name: "Tunnel" },
+					{ name: "TunnelDevice" },
+					{ name: "UsePrivilegedPort" },
+					{ name: "User" },
+					{ name: "UserKnownHostsFile" },
+					{ name: "VerifyHostKeyDNS" },
+					{ name: "VisualHostKey" },
+					{ name: "XAuthLocation" },
+				],
+			},
+		},
+		{
+			name: "-P",
+			description: `Specifies the port to connect to on the remote host.  Note that
 this option is written with a capital ‘P’, because -p is already
 reserved for preserving the times and modes of the file`,
-      args: {
-        name: "port",
-      },
-    },
-    {
-      name: "-p",
-      description:
-        "Preserves modification times, access times, and modes from the original file",
-    },
-    {
-      name: "-q",
-      description:
-        "Quiet mode: disables the progress meter as well as warning and diagnostic messages from ssh(1)",
-    },
-    {
-      name: "-r",
-      description:
-        "Recursively copy entire directories.  Note that scp follows symbolic links encountered in the tree traversal",
-    },
-    {
-      name: "-S",
-      description:
-        "Name of program to use for the encrypted connection.  The program must understand ssh(1) options",
-      args: {
-        name: "program",
-      },
-    },
-    {
-      name: "-T",
-      description: `Disable strict filename checking.  By default when copying files
+			args: {
+				name: "port",
+			},
+		},
+		{
+			name: "-p",
+			description:
+				"Preserves modification times, access times, and modes from the original file",
+		},
+		{
+			name: "-q",
+			description:
+				"Quiet mode: disables the progress meter as well as warning and diagnostic messages from ssh(1)",
+		},
+		{
+			name: "-r",
+			description:
+				"Recursively copy entire directories.  Note that scp follows symbolic links encountered in the tree traversal",
+		},
+		{
+			name: "-S",
+			description:
+				"Name of program to use for the encrypted connection.  The program must understand ssh(1) options",
+			args: {
+				name: "program",
+			},
+		},
+		{
+			name: "-T",
+			description: `Disable strict filename checking.  By default when copying files
 from a remote host to a local directory scp checks that the
 received filenames match those requested on the command-line to
 prevent the remote end from sending unexpected or unwanted files.
@@ -229,13 +229,13 @@ interpret filename wildcards, these checks may cause wanted files
 to be rejected.  This option disables these checks at the expense
 of fully trusting that the server will not send unexpected
 filenames`,
-    },
-    {
-      name: "-v",
-      description:
-        "Verbose mode.  Causes scp and ssh(1) to print debugging messages about their progress. This is helpful in debugging connection, authentication, and configuration problems",
-    },
-  ],
+		},
+		{
+			name: "-v",
+			description:
+				"Verbose mode.  Causes scp and ssh(1) to print debugging messages about their progress. This is helpful in debugging connection, authentication, and configuration problems",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/ssh.ts b/extensions/terminal-suggest/src/completions/upstream/ssh.ts
index 9e7c9b6f0e0e..2fa0884c63da 100644
--- a/extensions/terminal-suggest/src/completions/upstream/ssh.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/ssh.ts
@@ -1,447 +1,447 @@
 const knownHostRegex = /(?:[a-zA-Z0-9-]+\.)+[a-zA-Z0-9]+/; // will match numerical IPs as well as domains/subdomains
 
 const resolveAbsolutePath = (
-  path: string,
-  basePath: string,
-  home: string
+	path: string,
+	basePath: string,
+	home: string
 ): string => {
-  if (path.startsWith("/") || path.startsWith("~/") || path === "~") {
-    return path.replace("~", home);
-  }
-  if (
-    basePath.startsWith("/") ||
-    basePath.startsWith("~/") ||
-    basePath === "~"
-  ) {
-    return (
-      basePath.replace("~", home) +
-      (basePath.replace("~", home).endsWith("/") ? "" : "/") +
-      path
-    );
-  }
-  return basePath + (basePath.endsWith("/") ? "" : "/") + path;
+	if (path.startsWith("/") || path.startsWith("~/") || path === "~") {
+		return path.replace("~", home);
+	}
+	if (
+		basePath.startsWith("/") ||
+		basePath.startsWith("~/") ||
+		basePath === "~"
+	) {
+		return (
+			basePath.replace("~", home) +
+			(basePath.replace("~", home).endsWith("/") ? "" : "/") +
+			path
+		);
+	}
+	return basePath + (basePath.endsWith("/") ? "" : "/") + path;
 };
 
 const getConfigLines = async (
-  file: string,
-  executeShellCommand: Fig.ExecuteCommandFunction,
-  home: string,
-  basePath: string
+	file: string,
+	executeShellCommand: Fig.ExecuteCommandFunction,
+	home: string,
+	basePath: string
 ) => {
-  const absolutePath = resolveAbsolutePath(file, basePath, home);
+	const absolutePath = resolveAbsolutePath(file, basePath, home);
 
-  const { stdout } = await executeShellCommand({
-    command: "cat",
-    // eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
-    args: [absolutePath],
-  });
-  const configLines = stdout.split("\n").map((line) => line.trim());
+	const { stdout } = await executeShellCommand({
+		command: "cat",
+		// eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
+		args: [absolutePath],
+	});
+	const configLines = stdout.split("\n").map((line) => line.trim());
 
-  // Get list of includes in the config file
-  const includes = configLines
-    .filter((line) => line.toLowerCase().startsWith("include "))
-    .map((line) => line.split(" ")[1]);
+	// Get list of includes in the config file
+	const includes = configLines
+		.filter((line) => line.toLowerCase().startsWith("include "))
+		.map((line) => line.split(" ")[1]);
 
-  // Get the lines of every include file
-  const includeLines: any = await Promise.all(
-    includes.map((file) =>
-      getConfigLines(file, executeShellCommand, home, basePath)
-    )
-  );
+	// Get the lines of every include file
+	const includeLines: any = await Promise.all(
+		includes.map((file) =>
+			getConfigLines(file, executeShellCommand, home, basePath)
+		)
+	);
 
-  // Combine config lines with includes config lines
-  return [...configLines, ...includeLines.flat()];
+	// Combine config lines with includes config lines
+	return [...configLines, ...includeLines.flat()];
 };
 
 export const knownHosts: Fig.Generator = {
-  custom: async (tokens, executeCommand, context) => {
-    const { stdout } = await executeCommand({
-      command: "cat",
-      // eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
-      args: [`${context.environmentVariables["HOME"]}/.ssh/known_hosts`],
-    });
+	custom: async (tokens, executeCommand, context) => {
+		const { stdout } = await executeCommand({
+			command: "cat",
+			// eslint-disable-next-line @withfig/fig-linter/no-useless-arrays
+			args: [`${context.environmentVariables["HOME"]}/.ssh/known_hosts`],
+		});
 
-    return stdout
-      .split("\n")
-      .map((line) => {
-        const match = knownHostRegex.exec(line);
-        if (match) {
-          return String(match);
-        }
-      })
-      .filter((value, index, self) => value && self.indexOf(value) === index)
-      .map((knownHost) => ({
-        name: (tokens[1].endsWith("@") ? tokens[1] : "") + knownHost, // also suggest when user@ is provided
-        description: "SSH host",
-      }));
-  },
-  trigger: "@",
+		return stdout
+			.split("\n")
+			.map((line) => {
+				const match = knownHostRegex.exec(line);
+				if (match) {
+					return String(match);
+				}
+			})
+			.filter((value, index, self) => value && self.indexOf(value) === index)
+			.map((knownHost) => ({
+				name: (tokens[1].endsWith("@") ? tokens[1] : "") + knownHost, // also suggest when user@ is provided
+				description: "SSH host",
+			}));
+	},
+	trigger: "@",
 };
 
 export const configHosts: Fig.Generator = {
-  custom: async (tokens, executeShellCommand, context) => {
-    const configLines = await getConfigLines(
-      "config",
-      executeShellCommand,
-      context.environmentVariables["HOME"],
-      "~/.ssh"
-    );
+	custom: async (tokens, executeShellCommand, context) => {
+		const configLines = await getConfigLines(
+			"config",
+			executeShellCommand,
+			context.environmentVariables["HOME"],
+			"~/.ssh"
+		);
 
-    return configLines
-      .filter(
-        (line) =>
-          line.trim().toLowerCase().startsWith("host ") && !line.includes("*")
-      )
-      .map((host) => ({
-        name: host.split(" ")[1],
-        description: "SSH host",
-        priority: 90,
-      }));
-  },
+		return configLines
+			.filter(
+				(line) =>
+					line.trim().toLowerCase().startsWith("host ") && !line.includes("*")
+			)
+			.map((host) => ({
+				name: host.split(" ")[1],
+				description: "SSH host",
+				priority: 90,
+			}));
+	},
 };
 
 const completionSpec: Fig.Spec = {
-  name: "ssh",
-  description: "Log into a remote machine",
-  args: {
-    name: "user@hostname",
-    description: "Address of remote machine to log into",
-    generators: [knownHosts, configHosts, { template: "history" }],
-  },
-  options: [
-    {
-      name: "-1",
-      description: "Forces ssh to try protocol version 1 only",
-    },
-    {
-      name: "-2",
-      description: "Forces ssh to try protocol version 2 only",
-    },
-    {
-      name: "-4",
-      description: "Forces ssh to use IPv4 addresses only",
-    },
-    {
-      name: "-6",
-      description: "Forces ssh to use IPv6 addresses only",
-    },
-    {
-      name: "-A",
-      description: "Enables forwarding of the authentication agent connection",
-    },
-    {
-      name: "-a",
-      description: "Disables forwarding of the authentication agent connection",
-    },
-    {
-      name: "-b",
-      description:
-        "Use bind_address on the local machine as the source address of the connection",
-      args: {
-        name: "bind address",
-        description: "Source address of the connection",
-      },
-    },
-    {
-      name: "-C",
-      description:
-        "Requests compression of all data (including stdin, stdout, stderr, and data for forwarded X11 and TCP connections)",
-    },
-    {
-      name: "-c",
-      description:
-        "Selects the cipher specification for encrypting the session",
-      args: {
-        name: "cipher spec",
-        description: "The selected cipher specification",
-      },
-    },
-    {
-      name: "-D",
-      description:
-        "Specifies a local 'dynamic' application-level port forwarding",
-      args: {
-        name: "port",
-        description: "Port of the bind address",
-      },
-    },
-    {
-      name: "-e",
-      description:
-        "Sets the escape character for sessions with a pty (default: '~')",
-      args: {
-        name: "escape char",
-        description: "Specified escape character",
-      },
-    },
-    {
-      name: "-F",
-      description: "Specifies an alternative per-user configuration file",
-      args: {
-        name: "configfile",
-        description: "Path to alternative config file",
-        template: "filepaths",
-      },
-    },
-    {
-      name: "-f",
-      description:
-        "Requests ssh to go to background just before command execution",
-    },
-    {
-      name: "-g",
-      description: "Allows remote hosts to connect to local forwarded ports",
-    },
-    {
-      name: "-I",
-      description:
-        "Specify the PKCS#11 shared library ssh should use to communicate with a PKCS#11 token providing the user's private RSA key",
-      args: {
-        name: "pkcs11",
-      },
-    },
-    {
-      name: "-i",
-      description:
-        "Selects a file from which the identity (private key) for public key authentication is read",
-      isRepeatable: true,
-      args: {
-        name: "identity file",
-        description: "Path to identity (private key)",
-        template: "filepaths",
-      },
-    },
-    {
-      name: "-K",
-      description:
-        "Enables GSSAPI-based authentication and forwarding (delegation) of GSSAPI credentials to the server",
-    },
-    {
-      name: "-k",
-      description:
-        "Disables forwarding (delegation) of GSSAPI credentials to the server",
-    },
-    {
-      name: "-L",
-      description:
-        "Specifies that the given port on the local (client) host is to be forwarded to the given host and port on the remote side",
-      args: {
-        name: "port:host:hostport",
-        description: "Local port, followed by host and host port to forward to",
-      },
-    },
-    {
-      name: "-l",
-      description: "Specifies the user to log in as on the remote machine",
-      args: {
-        name: "login name",
-        description: "Name of user logging into remote machine",
-      },
-    },
-    {
-      name: "-M",
-      description:
-        "Places the ssh client into ``master'' mode for connection sharing",
-      isRepeatable: true,
-    },
-    {
-      name: "-m",
-      description:
-        "Additionally, for protocol version 2 a comma-separated list of MAC (message authentication code) algorithms can be specified in order of preference",
-      args: {
-        name: "mac spec",
-      },
-    },
-    {
-      name: "-N",
-      description: "Do not execute a remote command",
-    },
-    {
-      name: "-n",
-      description:
-        "Redirects stdin from /dev/null (actually, prevents reading from stdin)",
-    },
-    {
-      name: "-O",
-      description: "Control an active connection multiplexing master process",
-      args: {
-        name: "ctl cmd",
-        description: "Command that's passed to the master process",
-      },
-    },
-    {
-      name: "-o",
-      description:
-        "Can be used to give options in the format used in the configuration file",
-      isRepeatable: true,
-      args: {
-        name: "option",
-        description:
-          "Options that can be specified in the format of the config file",
-        suggestions: [
-          { name: "AddressFamily" },
-          { name: "BatchMode" },
-          { name: "BindAddress" },
-          { name: "ChallengeResponseAuthentication" },
-          { name: "CheckHostIP" },
-          { name: "Cipher" },
-          { name: "Ciphers" },
-          { name: "ClearAllForwardings" },
-          { name: "Compression" },
-          { name: "CompressionLevel" },
-          { name: "ConnectionAttempts" },
-          { name: "ConnectTimeout" },
-          { name: "ControlMaster" },
-          { name: "ControlPath" },
-          { name: "ControlPersist" },
-          { name: "DynamicForward" },
-          { name: "EscapeChar" },
-          { name: "ExitOnForwardFailure" },
-          { name: "ForwardAgent" },
-          { name: "ForwardX11" },
-          { name: "ForwardX11Timeout" },
-          { name: "ForwardX11Trusted" },
-          { name: "GatewayPorts" },
-          { name: "GlobalKnownHostsFile" },
-          { name: "GSSAPIAuthentication" },
-          { name: "GSSAPIDelegateCredentials" },
-          { name: "HashKnownHosts" },
-          { name: "Host" },
-          { name: "HostbasedAuthentication" },
-          { name: "HostKeyAlgorithms" },
-          { name: "HostKeyAlias" },
-          { name: "HostName" },
-          { name: "IdentityFile" },
-          { name: "IdentitiesOnly" },
-          { name: "IPQoS" },
-          { name: "KbdInteractiveAuthentication" },
-          { name: "KbdInteractiveDevices" },
-          { name: "KexAlgorithms" },
-          { name: "LocalCommand" },
-          { name: "LocalForward" },
-          { name: "LogLevel" },
-          { name: "MACs" },
-          { name: "NoHostAuthenticationForLocalhost" },
-          { name: "NumberOfPasswordPrompts" },
-          { name: "PasswordAuthentication" },
-          { name: "PermitLocalCommand" },
-          { name: "PKCS11Provider" },
-          { name: "Port" },
-          { name: "PreferredAuthentications" },
-          { name: "Protocol" },
-          { name: "ProxyCommand" },
-          { name: "PubkeyAuthentication" },
-          { name: "RekeyLimit" },
-          { name: "RequestTTY" },
-          { name: "RhostsRSAAuthentication" },
-          { name: "RSAAuthentication" },
-          { name: "SendEnv" },
-          { name: "ServerAliveInterval" },
-          { name: "ServerAliveCountMax" },
-          { name: "StrictHostKeyChecking" },
-          { name: "TCPKeepAlive" },
-          { name: "Tunnel" },
-          { name: "TunnelDevice" },
-          { name: "UsePrivilegedPort" },
-          { name: "User" },
-          { name: "UserKnownHostsFile" },
-          { name: "VerifyHostKeyDNS" },
-          { name: "VisualHostKey" },
-          { name: "XAuthLocation" },
-        ],
-      },
-    },
-    {
-      name: "-p",
-      description: "Port to connect to on the remote host",
-      args: {
-        name: "port",
-        description: "Port to connect to",
-      },
-    },
-    {
-      name: "-q",
-      description:
-        "Quiet mode.  Causes most warning and diagnostic messages to be suppressed",
-    },
-    {
-      name: "-R",
-      description:
-        "Specifies that the given port on the remote (server) host is to be forwarded to the given host and port on the local side",
-      args: {
-        name: "port:host:hostport",
-        description: "Local port, followed by host and host port to forward to",
-      },
-    },
-    {
-      name: "-S",
-      description:
-        "Specifies the location of a control socket for connection sharing, or the string 'none' to disable connection sharing",
-      args: {
-        name: "ctl_path",
-        description: "Location of the control socket",
-        template: "filepaths",
-      },
-    },
-    {
-      name: "-s",
-      description:
-        "May be used to request invocation of a subsystem on the remote system",
-    },
-    {
-      name: "-T",
-      description: "Disable pseudo-tty allocation",
-    },
-    {
-      name: "-t",
-      description: "Force pseudo-tty allocation",
-      isRepeatable: true,
-    },
-    {
-      name: "-V",
-      description: "Display the version number and exit",
-    },
-    {
-      name: "-v",
-      description:
-        "Verbose mode.  Causes ssh to print debugging messages about its progress",
-      isRepeatable: 3,
-    },
-    {
-      name: "-W",
-      description:
-        "Requests that standard input and output on the client be forwarded to host on port over the secure channel",
-      args: {
-        name: "host:port",
-        description: "Host and port to forward to",
-      },
-    },
-    {
-      name: "-w",
-      description:
-        "Requests tunnel device forwarding with the specified tun(4) devices between the client (local_tun) and the server (remote_tun)",
-      args: {
-        name: "local tun",
-        description: "Local device to forward to",
-      },
-    },
-    {
-      name: "-X",
-      description: "Enables X11 forwarding",
-    },
-    {
-      name: "-x",
-      description: "Disables X11 forwarding",
-    },
-    {
-      name: "-Y",
-      description: "Enables trusted X11 forwarding",
-    },
-    {
-      name: "-y",
-      description: "Send log information using the syslog(3) system module",
-    },
-  ],
+	name: "ssh",
+	description: "Log into a remote machine",
+	args: {
+		name: "user@hostname",
+		description: "Address of remote machine to log into",
+		generators: [knownHosts, configHosts, { template: "history" }],
+	},
+	options: [
+		{
+			name: "-1",
+			description: "Forces ssh to try protocol version 1 only",
+		},
+		{
+			name: "-2",
+			description: "Forces ssh to try protocol version 2 only",
+		},
+		{
+			name: "-4",
+			description: "Forces ssh to use IPv4 addresses only",
+		},
+		{
+			name: "-6",
+			description: "Forces ssh to use IPv6 addresses only",
+		},
+		{
+			name: "-A",
+			description: "Enables forwarding of the authentication agent connection",
+		},
+		{
+			name: "-a",
+			description: "Disables forwarding of the authentication agent connection",
+		},
+		{
+			name: "-b",
+			description:
+				"Use bind_address on the local machine as the source address of the connection",
+			args: {
+				name: "bind address",
+				description: "Source address of the connection",
+			},
+		},
+		{
+			name: "-C",
+			description:
+				"Requests compression of all data (including stdin, stdout, stderr, and data for forwarded X11 and TCP connections)",
+		},
+		{
+			name: "-c",
+			description:
+				"Selects the cipher specification for encrypting the session",
+			args: {
+				name: "cipher spec",
+				description: "The selected cipher specification",
+			},
+		},
+		{
+			name: "-D",
+			description:
+				"Specifies a local 'dynamic' application-level port forwarding",
+			args: {
+				name: "port",
+				description: "Port of the bind address",
+			},
+		},
+		{
+			name: "-e",
+			description:
+				"Sets the escape character for sessions with a pty (default: '~')",
+			args: {
+				name: "escape char",
+				description: "Specified escape character",
+			},
+		},
+		{
+			name: "-F",
+			description: "Specifies an alternative per-user configuration file",
+			args: {
+				name: "configfile",
+				description: "Path to alternative config file",
+				template: "filepaths",
+			},
+		},
+		{
+			name: "-f",
+			description:
+				"Requests ssh to go to background just before command execution",
+		},
+		{
+			name: "-g",
+			description: "Allows remote hosts to connect to local forwarded ports",
+		},
+		{
+			name: "-I",
+			description:
+				"Specify the PKCS#11 shared library ssh should use to communicate with a PKCS#11 token providing the user's private RSA key",
+			args: {
+				name: "pkcs11",
+			},
+		},
+		{
+			name: "-i",
+			description:
+				"Selects a file from which the identity (private key) for public key authentication is read",
+			isRepeatable: true,
+			args: {
+				name: "identity file",
+				description: "Path to identity (private key)",
+				template: "filepaths",
+			},
+		},
+		{
+			name: "-K",
+			description:
+				"Enables GSSAPI-based authentication and forwarding (delegation) of GSSAPI credentials to the server",
+		},
+		{
+			name: "-k",
+			description:
+				"Disables forwarding (delegation) of GSSAPI credentials to the server",
+		},
+		{
+			name: "-L",
+			description:
+				"Specifies that the given port on the local (client) host is to be forwarded to the given host and port on the remote side",
+			args: {
+				name: "port:host:hostport",
+				description: "Local port, followed by host and host port to forward to",
+			},
+		},
+		{
+			name: "-l",
+			description: "Specifies the user to log in as on the remote machine",
+			args: {
+				name: "login name",
+				description: "Name of user logging into remote machine",
+			},
+		},
+		{
+			name: "-M",
+			description:
+				"Places the ssh client into ``master'' mode for connection sharing",
+			isRepeatable: true,
+		},
+		{
+			name: "-m",
+			description:
+				"Additionally, for protocol version 2 a comma-separated list of MAC (message authentication code) algorithms can be specified in order of preference",
+			args: {
+				name: "mac spec",
+			},
+		},
+		{
+			name: "-N",
+			description: "Do not execute a remote command",
+		},
+		{
+			name: "-n",
+			description:
+				"Redirects stdin from /dev/null (actually, prevents reading from stdin)",
+		},
+		{
+			name: "-O",
+			description: "Control an active connection multiplexing master process",
+			args: {
+				name: "ctl cmd",
+				description: "Command that's passed to the master process",
+			},
+		},
+		{
+			name: "-o",
+			description:
+				"Can be used to give options in the format used in the configuration file",
+			isRepeatable: true,
+			args: {
+				name: "option",
+				description:
+					"Options that can be specified in the format of the config file",
+				suggestions: [
+					{ name: "AddressFamily" },
+					{ name: "BatchMode" },
+					{ name: "BindAddress" },
+					{ name: "ChallengeResponseAuthentication" },
+					{ name: "CheckHostIP" },
+					{ name: "Cipher" },
+					{ name: "Ciphers" },
+					{ name: "ClearAllForwardings" },
+					{ name: "Compression" },
+					{ name: "CompressionLevel" },
+					{ name: "ConnectionAttempts" },
+					{ name: "ConnectTimeout" },
+					{ name: "ControlMaster" },
+					{ name: "ControlPath" },
+					{ name: "ControlPersist" },
+					{ name: "DynamicForward" },
+					{ name: "EscapeChar" },
+					{ name: "ExitOnForwardFailure" },
+					{ name: "ForwardAgent" },
+					{ name: "ForwardX11" },
+					{ name: "ForwardX11Timeout" },
+					{ name: "ForwardX11Trusted" },
+					{ name: "GatewayPorts" },
+					{ name: "GlobalKnownHostsFile" },
+					{ name: "GSSAPIAuthentication" },
+					{ name: "GSSAPIDelegateCredentials" },
+					{ name: "HashKnownHosts" },
+					{ name: "Host" },
+					{ name: "HostbasedAuthentication" },
+					{ name: "HostKeyAlgorithms" },
+					{ name: "HostKeyAlias" },
+					{ name: "HostName" },
+					{ name: "IdentityFile" },
+					{ name: "IdentitiesOnly" },
+					{ name: "IPQoS" },
+					{ name: "KbdInteractiveAuthentication" },
+					{ name: "KbdInteractiveDevices" },
+					{ name: "KexAlgorithms" },
+					{ name: "LocalCommand" },
+					{ name: "LocalForward" },
+					{ name: "LogLevel" },
+					{ name: "MACs" },
+					{ name: "NoHostAuthenticationForLocalhost" },
+					{ name: "NumberOfPasswordPrompts" },
+					{ name: "PasswordAuthentication" },
+					{ name: "PermitLocalCommand" },
+					{ name: "PKCS11Provider" },
+					{ name: "Port" },
+					{ name: "PreferredAuthentications" },
+					{ name: "Protocol" },
+					{ name: "ProxyCommand" },
+					{ name: "PubkeyAuthentication" },
+					{ name: "RekeyLimit" },
+					{ name: "RequestTTY" },
+					{ name: "RhostsRSAAuthentication" },
+					{ name: "RSAAuthentication" },
+					{ name: "SendEnv" },
+					{ name: "ServerAliveInterval" },
+					{ name: "ServerAliveCountMax" },
+					{ name: "StrictHostKeyChecking" },
+					{ name: "TCPKeepAlive" },
+					{ name: "Tunnel" },
+					{ name: "TunnelDevice" },
+					{ name: "UsePrivilegedPort" },
+					{ name: "User" },
+					{ name: "UserKnownHostsFile" },
+					{ name: "VerifyHostKeyDNS" },
+					{ name: "VisualHostKey" },
+					{ name: "XAuthLocation" },
+				],
+			},
+		},
+		{
+			name: "-p",
+			description: "Port to connect to on the remote host",
+			args: {
+				name: "port",
+				description: "Port to connect to",
+			},
+		},
+		{
+			name: "-q",
+			description:
+				"Quiet mode.  Causes most warning and diagnostic messages to be suppressed",
+		},
+		{
+			name: "-R",
+			description:
+				"Specifies that the given port on the remote (server) host is to be forwarded to the given host and port on the local side",
+			args: {
+				name: "port:host:hostport",
+				description: "Local port, followed by host and host port to forward to",
+			},
+		},
+		{
+			name: "-S",
+			description:
+				"Specifies the location of a control socket for connection sharing, or the string 'none' to disable connection sharing",
+			args: {
+				name: "ctl_path",
+				description: "Location of the control socket",
+				template: "filepaths",
+			},
+		},
+		{
+			name: "-s",
+			description:
+				"May be used to request invocation of a subsystem on the remote system",
+		},
+		{
+			name: "-T",
+			description: "Disable pseudo-tty allocation",
+		},
+		{
+			name: "-t",
+			description: "Force pseudo-tty allocation",
+			isRepeatable: true,
+		},
+		{
+			name: "-V",
+			description: "Display the version number and exit",
+		},
+		{
+			name: "-v",
+			description:
+				"Verbose mode.  Causes ssh to print debugging messages about its progress",
+			isRepeatable: 3,
+		},
+		{
+			name: "-W",
+			description:
+				"Requests that standard input and output on the client be forwarded to host on port over the secure channel",
+			args: {
+				name: "host:port",
+				description: "Host and port to forward to",
+			},
+		},
+		{
+			name: "-w",
+			description:
+				"Requests tunnel device forwarding with the specified tun(4) devices between the client (local_tun) and the server (remote_tun)",
+			args: {
+				name: "local tun",
+				description: "Local device to forward to",
+			},
+		},
+		{
+			name: "-X",
+			description: "Enables X11 forwarding",
+		},
+		{
+			name: "-x",
+			description: "Disables X11 forwarding",
+		},
+		{
+			name: "-Y",
+			description: "Enables trusted X11 forwarding",
+		},
+		{
+			name: "-y",
+			description: "Send log information using the syslog(3) system module",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/tail.ts b/extensions/terminal-suggest/src/completions/upstream/tail.ts
index 657c610b37dc..fd905588c60f 100644
--- a/extensions/terminal-suggest/src/completions/upstream/tail.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/tail.ts
@@ -1,20 +1,20 @@
 const completionSpec: Fig.Spec = {
-  name: "tail",
-  description: "Display the last part of a file",
-  args: {
-    isVariadic: true,
-    template: "filepaths",
-  },
-  options: [
-    {
-      name: "-f",
-      description: "Wait for additional data to be appended",
-    },
-    {
-      name: "-r",
-      description: "Display in reverse order",
-    },
-  ],
+	name: "tail",
+	description: "Display the last part of a file",
+	args: {
+		isVariadic: true,
+		template: "filepaths",
+	},
+	options: [
+		{
+			name: "-f",
+			description: "Wait for additional data to be appended",
+		},
+		{
+			name: "-r",
+			description: "Display in reverse order",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/top.ts b/extensions/terminal-suggest/src/completions/upstream/top.ts
index df922164c069..5831fd7b89ed 100644
--- a/extensions/terminal-suggest/src/completions/upstream/top.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/top.ts
@@ -1,49 +1,49 @@
 const completionSpec: Fig.Spec = {
-  name: "top",
-  description: "Display Linux tasks",
-  options: [
-    {
-      name: ["-h", "-v"],
-      description: "Show library version and usage prompt",
-    },
-    {
-      name: "-b",
-      description: "Starts top in Batch mode",
-      args: {
-        name: "operation",
-      },
-    },
-    {
-      name: "-c",
-      description: "Starts top with last remembered c state reversed",
-      args: {
-        name: "toggle",
-      },
-    },
-    {
-      name: "-i",
-      description:
-        "Starts top with the last remembered 'i' state reversed. When this toggle is Off, tasks that are idled or zombied will not be displayed",
-      args: {
-        name: "toggle",
-      },
-    },
-    {
-      name: "-s",
-      description: "Starts top with secure mode forced",
-      args: {
-        name: "delay",
-      },
-    },
-    {
-      name: "-pid",
-      description: "Monitor pids",
-      args: {
-        name: "process ids",
-        isVariadic: true,
-      },
-    },
-  ],
+	name: "top",
+	description: "Display Linux tasks",
+	options: [
+		{
+			name: ["-h", "-v"],
+			description: "Show library version and usage prompt",
+		},
+		{
+			name: "-b",
+			description: "Starts top in Batch mode",
+			args: {
+				name: "operation",
+			},
+		},
+		{
+			name: "-c",
+			description: "Starts top with last remembered c state reversed",
+			args: {
+				name: "toggle",
+			},
+		},
+		{
+			name: "-i",
+			description:
+				"Starts top with the last remembered 'i' state reversed. When this toggle is Off, tasks that are idled or zombied will not be displayed",
+			args: {
+				name: "toggle",
+			},
+		},
+		{
+			name: "-s",
+			description: "Starts top with secure mode forced",
+			args: {
+				name: "delay",
+			},
+		},
+		{
+			name: "-pid",
+			description: "Monitor pids",
+			args: {
+				name: "process ids",
+				isVariadic: true,
+			},
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/touch.ts b/extensions/terminal-suggest/src/completions/upstream/touch.ts
index 452088783139..6987272ad846 100644
--- a/extensions/terminal-suggest/src/completions/upstream/touch.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/touch.ts
@@ -1,59 +1,59 @@
 const completionSpec: Fig.Spec = {
-  name: "touch",
-  description: "Change file access and modification times",
-  args: {
-    name: "file",
-    isVariadic: true,
-    template: "folders",
-    suggestCurrentToken: true,
-  },
-  options: [
-    {
-      name: "-A",
-      description:
-        "Adjust the access and modification time stamps for the file by the specified value",
-      args: {
-        name: "time",
-        description: "[-][[hh]mm]SS",
-      },
-    },
-    { name: "-a", description: "Change the access time of the file" },
-    {
-      name: "-c",
-      description: "Do not create the file if it does not exist",
-    },
-    {
-      name: "-f",
-      description:
-        "Attempt to force the update, even if the file permissions do not currently permit it",
-    },
-    {
-      name: "-h",
-      description:
-        "If the file is a symbolic link, change the times of the link itself rather than the file that the link points to",
-    },
-    {
-      name: "-m",
-      description: "Change the modification time of the file",
-    },
-    {
-      name: "-r",
-      description:
-        "Use the access and modifications times from the specified file instead of the current time of day",
-      args: {
-        name: "file",
-      },
-    },
-    {
-      name: "-t",
-      description:
-        "Change the access and modification times to the specified time instead of the current time of day",
-      args: {
-        name: "timestamp",
-        description: "[[CC]YY]MMDDhhmm[.SS]",
-      },
-    },
-  ],
+	name: "touch",
+	description: "Change file access and modification times",
+	args: {
+		name: "file",
+		isVariadic: true,
+		template: "folders",
+		suggestCurrentToken: true,
+	},
+	options: [
+		{
+			name: "-A",
+			description:
+				"Adjust the access and modification time stamps for the file by the specified value",
+			args: {
+				name: "time",
+				description: "[-][[hh]mm]SS",
+			},
+		},
+		{ name: "-a", description: "Change the access time of the file" },
+		{
+			name: "-c",
+			description: "Do not create the file if it does not exist",
+		},
+		{
+			name: "-f",
+			description:
+				"Attempt to force the update, even if the file permissions do not currently permit it",
+		},
+		{
+			name: "-h",
+			description:
+				"If the file is a symbolic link, change the times of the link itself rather than the file that the link points to",
+		},
+		{
+			name: "-m",
+			description: "Change the modification time of the file",
+		},
+		{
+			name: "-r",
+			description:
+				"Use the access and modifications times from the specified file instead of the current time of day",
+			args: {
+				name: "file",
+			},
+		},
+		{
+			name: "-t",
+			description:
+				"Change the access and modification times to the specified time instead of the current time of day",
+			args: {
+				name: "timestamp",
+				description: "[[CC]YY]MMDDhhmm[.SS]",
+			},
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/uname.ts b/extensions/terminal-suggest/src/completions/upstream/uname.ts
index e73b9efe3979..775387703d41 100644
--- a/extensions/terminal-suggest/src/completions/upstream/uname.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/uname.ts
@@ -1,36 +1,36 @@
 const completionSpec: Fig.Spec = {
-  name: "uname",
-  description: "Print operating system name",
-  options: [
-    {
-      name: "-a",
-      description: "Print all available system information",
-    },
-    {
-      name: "-m",
-      description: "Print the machine hardware name",
-    },
-    {
-      name: "-n",
-      description: "Print the system hostname",
-    },
-    {
-      name: "-p",
-      description: "Print the machine processor architecture name",
-    },
-    {
-      name: "-r",
-      description: "Print the operating system release",
-    },
-    {
-      name: "-s",
-      description: "Print the operating system name",
-    },
-    {
-      name: "-v",
-      description: "Print the operating system version",
-    },
-  ],
+	name: "uname",
+	description: "Print operating system name",
+	options: [
+		{
+			name: "-a",
+			description: "Print all available system information",
+		},
+		{
+			name: "-m",
+			description: "Print the machine hardware name",
+		},
+		{
+			name: "-n",
+			description: "Print the system hostname",
+		},
+		{
+			name: "-p",
+			description: "Print the machine processor architecture name",
+		},
+		{
+			name: "-r",
+			description: "Print the operating system release",
+		},
+		{
+			name: "-s",
+			description: "Print the operating system name",
+		},
+		{
+			name: "-v",
+			description: "Print the operating system version",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/vim.ts b/extensions/terminal-suggest/src/completions/upstream/vim.ts
index 7e41109f025c..267edb385fff 100644
--- a/extensions/terminal-suggest/src/completions/upstream/vim.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/vim.ts
@@ -1,244 +1,244 @@
 const completionSpec: Fig.Spec = {
-  name: "vim",
-  description: "Vi IMproved, a programmer's text editor",
-  args: {
-    template: "filepaths",
-    // suggestCurrentToken: true,
-  },
-  options: [
-    {
-      name: "-v",
-      description: "Vi mode (like 'vi')",
-    },
-    {
-      name: "-e",
-      description: "Ex mode (like 'ex')",
-    },
-    {
-      name: "-E",
-      description: "Improved Ex mode",
-    },
-    {
-      name: "-s",
-      description:
-        "Enable silent mode (when in ex mode), or Read Normal mode commands from file",
-      args: {
-        name: "scriptin",
-        template: "filepaths",
-        isOptional: true,
-      },
-    },
-    {
-      name: "-d",
-      description: "Diff mode (like 'vimdiff')",
-    },
-    {
-      name: "-y",
-      description: "Easy mode (like 'evim', modeless)",
-    },
-    {
-      name: "-R",
-      description: "Readonly mode (like 'view')",
-    },
-    {
-      name: "-Z",
-      description: "Restricted mode (like 'rvim')",
-    },
-    {
-      name: "-m",
-      description: "Modifications (writing files) not allowed",
-    },
-    {
-      name: "-M",
-      description: "Modifications in text not allowed",
-    },
-    {
-      name: "-b",
-      description: "Binary mode",
-    },
-    {
-      name: "-l",
-      description: "Lisp mode",
-    },
-    {
-      name: "-C",
-      description: "Compatible with Vi: 'compatible'",
-    },
-    {
-      name: "-N",
-      description: "Not fully Vi compatible: 'nocompatible'",
-    },
-    {
-      name: "-V",
-      description: "Be verbose [level N] [log messages to fname]",
-      args: [
-        {
-          name: "N",
-        },
-        {
-          name: "fname",
-          template: "filepaths",
-        },
-      ],
-    },
-    {
-      name: "-D",
-      description: "Debugging mode",
-    },
-    {
-      name: "-n",
-      description: "No swap file, use memory only",
-    },
-    {
-      name: "-r",
-      description:
-        "Recover crashed session if filename is specified, otherwise list swap files and exit",
-      args: {
-        name: "filename",
-        isOptional: true,
-        template: "filepaths",
-      },
-    },
-    {
-      name: "-L",
-      description: "Same as -r",
-      args: {
-        name: "filename",
-        template: "filepaths",
-      },
-    },
-    {
-      name: "-T",
-      description: "Set terminal type to <terminal>",
-      args: {
-        name: "terminal",
-      },
-    },
-    {
-      name: "--not-a-term",
-      description: "Skip warning for input/output not being a terminal",
-    },
-    {
-      name: "--ttyfail",
-      description: "Exit if input or output is not a terminal",
-    },
-    {
-      name: "-u",
-      description: "Use <vimrc> instead of any .vimrc",
-      args: {
-        name: "vimrc",
-        template: "filepaths",
-      },
-    },
-    {
-      name: "--noplugin",
-      description: "Don't load plugin scripts",
-    },
-    {
-      name: "-p",
-      description: "Open N tab pages (default: one for each file)",
-      args: {
-        name: "N",
-        isOptional: true,
-      },
-    },
-    {
-      name: "-o",
-      description: "Open N windows (default: one for each file)",
-      args: {
-        name: "N",
-        isOptional: true,
-      },
-    },
-    {
-      name: "-O",
-      description: "Like -o but split vertically",
-      args: {
-        name: "N",
-        isOptional: true,
-      },
-    },
-    {
-      name: "+",
-      description:
-        "Start at end of file, if line number is specified, start at that line",
-      args: {
-        name: "lnum",
-        isOptional: true,
-      },
-    },
-    {
-      name: "--cmd",
-      description: "Execute <command> before loading any vimrc file",
-      args: {
-        name: "command",
-        isCommand: true,
-      },
-    },
-    {
-      name: "-c",
-      description: "Execute <command> after loading the first file",
-      args: {
-        name: "command",
-      },
-    },
-    {
-      name: "-S",
-      description: "Source file <session> after loading the first file",
-      args: {
-        name: "session",
-        template: "filepaths",
-      },
-    },
-    {
-      name: "-w",
-      description: "Append all typed commands to file <scriptout>",
-      args: {
-        name: "scriptout",
-        template: "filepaths",
-      },
-    },
-    {
-      name: "-W",
-      description: "Write all typed commands to file <scriptout>",
-      args: {
-        name: "scriptout",
-        template: "filepaths",
-      },
-    },
-    {
-      name: "-x",
-      description: "Edit encrypted files",
-    },
-    {
-      name: "--startuptime",
-      description: "Write startup timing messages to <file>",
-      args: {
-        name: "file",
-        template: "filepaths",
-      },
-    },
-    {
-      name: "-i",
-      description: "Use <viminfo> instead of .viminfo",
-      args: {
-        name: "viminfo",
-        template: "filepaths",
-      },
-    },
-    {
-      name: "--clean",
-      description: "'nocompatible', Vim defaults, no plugins, no viminfo",
-    },
-    {
-      name: ["-h", "--help"],
-      description: "Print Help message and exit",
-    },
-    {
-      name: "--version",
-      description: "Print version information and exit",
-    },
-  ],
+	name: "vim",
+	description: "Vi IMproved, a programmer's text editor",
+	args: {
+		template: "filepaths",
+		// suggestCurrentToken: true,
+	},
+	options: [
+		{
+			name: "-v",
+			description: "Vi mode (like 'vi')",
+		},
+		{
+			name: "-e",
+			description: "Ex mode (like 'ex')",
+		},
+		{
+			name: "-E",
+			description: "Improved Ex mode",
+		},
+		{
+			name: "-s",
+			description:
+				"Enable silent mode (when in ex mode), or Read Normal mode commands from file",
+			args: {
+				name: "scriptin",
+				template: "filepaths",
+				isOptional: true,
+			},
+		},
+		{
+			name: "-d",
+			description: "Diff mode (like 'vimdiff')",
+		},
+		{
+			name: "-y",
+			description: "Easy mode (like 'evim', modeless)",
+		},
+		{
+			name: "-R",
+			description: "Readonly mode (like 'view')",
+		},
+		{
+			name: "-Z",
+			description: "Restricted mode (like 'rvim')",
+		},
+		{
+			name: "-m",
+			description: "Modifications (writing files) not allowed",
+		},
+		{
+			name: "-M",
+			description: "Modifications in text not allowed",
+		},
+		{
+			name: "-b",
+			description: "Binary mode",
+		},
+		{
+			name: "-l",
+			description: "Lisp mode",
+		},
+		{
+			name: "-C",
+			description: "Compatible with Vi: 'compatible'",
+		},
+		{
+			name: "-N",
+			description: "Not fully Vi compatible: 'nocompatible'",
+		},
+		{
+			name: "-V",
+			description: "Be verbose [level N] [log messages to fname]",
+			args: [
+				{
+					name: "N",
+				},
+				{
+					name: "fname",
+					template: "filepaths",
+				},
+			],
+		},
+		{
+			name: "-D",
+			description: "Debugging mode",
+		},
+		{
+			name: "-n",
+			description: "No swap file, use memory only",
+		},
+		{
+			name: "-r",
+			description:
+				"Recover crashed session if filename is specified, otherwise list swap files and exit",
+			args: {
+				name: "filename",
+				isOptional: true,
+				template: "filepaths",
+			},
+		},
+		{
+			name: "-L",
+			description: "Same as -r",
+			args: {
+				name: "filename",
+				template: "filepaths",
+			},
+		},
+		{
+			name: "-T",
+			description: "Set terminal type to <terminal>",
+			args: {
+				name: "terminal",
+			},
+		},
+		{
+			name: "--not-a-term",
+			description: "Skip warning for input/output not being a terminal",
+		},
+		{
+			name: "--ttyfail",
+			description: "Exit if input or output is not a terminal",
+		},
+		{
+			name: "-u",
+			description: "Use <vimrc> instead of any .vimrc",
+			args: {
+				name: "vimrc",
+				template: "filepaths",
+			},
+		},
+		{
+			name: "--noplugin",
+			description: "Don't load plugin scripts",
+		},
+		{
+			name: "-p",
+			description: "Open N tab pages (default: one for each file)",
+			args: {
+				name: "N",
+				isOptional: true,
+			},
+		},
+		{
+			name: "-o",
+			description: "Open N windows (default: one for each file)",
+			args: {
+				name: "N",
+				isOptional: true,
+			},
+		},
+		{
+			name: "-O",
+			description: "Like -o but split vertically",
+			args: {
+				name: "N",
+				isOptional: true,
+			},
+		},
+		{
+			name: "+",
+			description:
+				"Start at end of file, if line number is specified, start at that line",
+			args: {
+				name: "lnum",
+				isOptional: true,
+			},
+		},
+		{
+			name: "--cmd",
+			description: "Execute <command> before loading any vimrc file",
+			args: {
+				name: "command",
+				isCommand: true,
+			},
+		},
+		{
+			name: "-c",
+			description: "Execute <command> after loading the first file",
+			args: {
+				name: "command",
+			},
+		},
+		{
+			name: "-S",
+			description: "Source file <session> after loading the first file",
+			args: {
+				name: "session",
+				template: "filepaths",
+			},
+		},
+		{
+			name: "-w",
+			description: "Append all typed commands to file <scriptout>",
+			args: {
+				name: "scriptout",
+				template: "filepaths",
+			},
+		},
+		{
+			name: "-W",
+			description: "Write all typed commands to file <scriptout>",
+			args: {
+				name: "scriptout",
+				template: "filepaths",
+			},
+		},
+		{
+			name: "-x",
+			description: "Edit encrypted files",
+		},
+		{
+			name: "--startuptime",
+			description: "Write startup timing messages to <file>",
+			args: {
+				name: "file",
+				template: "filepaths",
+			},
+		},
+		{
+			name: "-i",
+			description: "Use <viminfo> instead of .viminfo",
+			args: {
+				name: "viminfo",
+				template: "filepaths",
+			},
+		},
+		{
+			name: "--clean",
+			description: "'nocompatible', Vim defaults, no plugins, no viminfo",
+		},
+		{
+			name: ["-h", "--help"],
+			description: "Print Help message and exit",
+		},
+		{
+			name: "--version",
+			description: "Print version information and exit",
+		},
+	],
 };
 
 export default completionSpec;
diff --git a/extensions/terminal-suggest/src/completions/upstream/wget.ts b/extensions/terminal-suggest/src/completions/upstream/wget.ts
index fd8442d9e8aa..ff14b34f0f86 100644
--- a/extensions/terminal-suggest/src/completions/upstream/wget.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/wget.ts
@@ -1,399 +1,399 @@
 const completionSpec: Fig.Spec = {
-  name: "wget",
-  description: "A non-interactive network retriever",
-  args: {
-    isVariadic: true,
-    name: "url",
-    description: "The url(s) to retrieve",
-  },
-  options: [
-    {
-      name: ["-V", "--version"],
-      description: "Display the version of Wget and exit",
-    },
-    { name: ["-h", "--help"], description: "Print this help" },
-    {
-      name: ["-b", "--background"],
-      description: "Go to background after startup",
-    },
-    {
-      name: ["-e", "--execute=COMMAND"],
-      description: "Execute a `.wgetrc'-style command",
-    },
-    { name: ["-o", "--output-file=FILE"], description: "Log messages to FILE" },
-    {
-      name: ["-a", "--append-output=FILE"],
-      description: "Append messages to FILE",
-    },
-    { name: ["-q", "--quiet"], description: "Quiet (no output)" },
-    {
-      name: ["-v", "--verbose"],
-      description: "Be verbose (this is the default)",
-    },
-    {
-      name: ["-nv", "--no-verbose"],
-      description: "Turn off verboseness, without being quiet",
-    },
-    {
-      name: "--report-speed=TYPE",
-      description: "Output bandwidth as TYPE.  TYPE can be bits",
-    },
-    {
-      name: ["-i", "--input-file=FILE"],
-      description: "Download URLs found in local or external FILE",
-    },
-    { name: ["-F", "--force-html"], description: "Treat input file as HTML" },
-    {
-      name: ["-B", "--base=URL"],
-      description: "Resolves HTML input-file links (-i -F) relative to URL",
-    },
-    { name: "--config=FILE", description: "Specify config file to use" },
-    { name: "--no-config", description: "Do not read any config file" },
-    {
-      name: "--rejected-log=FILE",
-      description: "Log reasons for URL rejection to FILE",
-    },
-    {
-      name: ["-t", "--tries=NUMBER"],
-      description: "Set number of retries to NUMBER (0 unlimits)",
-    },
-    {
-      name: "--retry-connrefused",
-      description: "Retry even if connection is refused",
-    },
-    {
-      name: "--retry-on-http-error",
-      description: "Comma-separated list of HTTP errors to retry",
-    },
-    {
-      name: ["-O", "--output-document=FILE"],
-      description: "Write documents to FILE",
-    },
-    {
-      name: ["-nc", "--no-clobber"],
-      description:
-        "Skip downloads that would download to existing files (overwriting them)",
-    },
-    {
-      name: "--no-netrc",
-      description: "Don't try to obtain credentials from .netrc",
-    },
-    {
-      name: ["-c", "--continue"],
-      description: "Resume getting a partially-downloaded file",
-    },
-    {
-      name: "--start-pos=OFFSET",
-      description: "Start downloading from zero-based position OFFSET",
-    },
-    { name: "--progress=TYPE", description: "Select progress gauge type" },
-    {
-      name: "--show-progress",
-      description: "Display the progress bar in any verbosity mode",
-    },
-    {
-      name: ["-N", "--timestamping"],
-      description: "Don't re-retrieve files unless newer than local",
-    },
-    { name: ["-S", "--server-response"], description: "Print server response" },
-    { name: "--spider", description: "Don't download anything" },
-    {
-      name: ["-T", "--timeout=SECONDS"],
-      description: "Set all timeout values to SECONDS",
-    },
-    {
-      name: "--dns-timeout=SECS",
-      description: "Set the DNS lookup timeout to SECS",
-    },
-    {
-      name: "--connect-timeout=SECS",
-      description: "Set the connect timeout to SECS",
-    },
-    {
-      name: "--read-timeout=SECS",
-      description: "Set the read timeout to SECS",
-    },
-    {
-      name: ["-w", "--wait=SECONDS"],
-      description: "Wait SECONDS between retrievals",
-    },
-    {
-      name: "--waitretry=SECONDS",
-      description: "Wait 1..SECONDS between retries of a retrieval",
-    },
-    {
-      name: "--random-wait",
-      description: "Wait from 0.5*WAIT...1.5*WAIT secs between retrievals",
-    },
-    { name: "--no-proxy", description: "Explicitly turn off proxy" },
-    {
-      name: ["-Q", "--quota=NUMBER"],
-      description: "Set retrieval quota to NUMBER",
-    },
-    {
-      name: "--bind-address=ADDRESS",
-      description: "Bind to ADDRESS (hostname or IP) on local host",
-    },
-    { name: "--limit-rate=RATE", description: "Limit download rate to RATE" },
-    { name: "--no-dns-cache", description: "Disable caching DNS lookups" },
-    {
-      name: "--restrict-file-names=OS",
-      description: "Restrict chars in file names to ones OS allows",
-    },
-    {
-      name: "--ignore-case",
-      description: "Ignore case when matching files/directories",
-    },
-    {
-      name: ["-4", "--inet4-only"],
-      description: "Connect only to IPv4 addresses",
-    },
-    {
-      name: ["-6", "--inet6-only"],
-      description: "Connect only to IPv6 addresses",
-    },
-    {
-      name: "--user=USER",
-      description: "Set both ftp and http user to USER",
-    },
-    {
-      name: "--password=PASS",
-      description: "Set both ftp and http password to PASS",
-    },
-    { name: "--ask-password", description: "Prompt for passwords" },
-    { name: "--no-iri", description: "Turn off IRI support" },
-    {
-      name: "--local-encoding=ENC",
-      description: "Use ENC as the local encoding for IRIs",
-    },
-    {
-      name: "--remote-encoding=ENC",
-      description: "Use ENC as the default remote encoding",
-    },
-    { name: "--unlink", description: "Remove file before clobber" },
-    {
-      name: "--xattr",
-      description: "Turn on storage of metadata in extended file attributes",
-    },
-    {
-      name: ["-nd", "--no-directories"],
-      description: "Don't create directories",
-    },
-    {
-      name: ["-x", "--force-directories"],
-      description: "Force creation of directories",
-    },
-    {
-      name: ["-nH", "--no-host-directories"],
-      description: "Don't create host directories",
-    },
-    {
-      name: "--protocol-directories",
-      description: "Use protocol name in directories",
-    },
-    {
-      name: ["-P", "--directory-prefix=PREFIX"],
-      description: "Save files to PREFIX/",
-    },
-    {
-      name: "--cut-dirs=NUMBER",
-      description: "Ignore NUMBER remote directory components",
-    },
-    { name: "--http-user=USER", description: "Set http user to USER" },
-    {
-      name: "--http-password=PASS",
-      description: "Set http password to PASS",
-    },
-    { name: "--no-cache", description: "Disallow server-cached data" },
-    {
-      name: ["-E", "--adjust-extension"],
-      description: "Save HTML/CSS documents with proper extensions",
-    },
-    {
-      name: "--ignore-length",
-      description: "Ignore 'Content-Length' header field",
-    },
-    {
-      name: "--header=STRING",
-      description: "Insert STRING among the headers",
-    },
-    {
-      name: "--compression=TYPE",
-      description:
-        "Choose compression, one of auto, gzip and none. (default: none)",
-    },
-    {
-      name: "--max-redirect",
-      description: "Maximum redirections allowed per page",
-    },
-    { name: "--proxy-user=USER", description: "Set USER as proxy username" },
-    {
-      name: "--proxy-password=PASS",
-      description: "Set PASS as proxy password",
-    },
-    {
-      name: "--referer=URL",
-      description: "Include 'Referer: URL' header in HTTP request",
-    },
-    { name: "--save-headers", description: "Save the HTTP headers to file" },
-    {
-      name: ["-U", "--user-agent=AGENT"],
-      description: "Identify as AGENT instead of Wget/VERSION",
-    },
-    {
-      name: "--no-http-keep-alive",
-      description: "Disable HTTP keep-alive (persistent connections)",
-    },
-    { name: "--no-cookies", description: "Don't use cookies" },
-    {
-      name: "--load-cookies=FILE",
-      description: "Load cookies from FILE before session",
-    },
-    {
-      name: "--save-cookies=FILE",
-      description: "Save cookies to FILE after session",
-    },
-    {
-      name: "--keep-session-cookies",
-      description: "Load and save session (non-permanent) cookies",
-    },
-    {
-      name: "--post-data=STRING",
-      description: "Use the POST method; send STRING as the data",
-    },
-    {
-      name: "--post-file=FILE",
-      description: "Use the POST method; send contents of FILE",
-    },
-    {
-      name: "--method=HTTPMethod",
-      description: 'Use method "HTTPMethod" in the request',
-    },
-    {
-      name: "--body-data=STRING",
-      description: "Send STRING as data. --method MUST be set",
-    },
-    {
-      name: "--body-file=FILE",
-      description: "Send contents of FILE. --method MUST be set",
-    },
-    {
-      name: "--content-on-error",
-      description: "Output the received content on server errors",
-    },
-    {
-      name: "--secure-protocol=PR",
-      description: "Choose secure protocol, one of auto, SSLv2,",
-    },
-    { name: "--https-only", description: "Only follow secure HTTPS links" },
-    {
-      name: "--no-check-certificate",
-      description: "Don't validate the server's certificate",
-    },
-    { name: "--certificate=FILE", description: "Client certificate file" },
-    {
-      name: "--certificate-type=TYPE",
-      description: "Client certificate type, PEM or DER",
-    },
-    { name: "--private-key=FILE", description: "Private key file" },
-    {
-      name: "--private-key-type=TYPE",
-      description: "Private key type, PEM or DER",
-    },
-    {
-      name: "--ca-certificate=FILE",
-      description: "File with the bundle of CAs",
-    },
-    {
-      name: "--ca-directory=DIR",
-      description: "Directory where hash list of CAs is stored",
-    },
-    { name: "--crl-file=FILE", description: "File with bundle of CRLs" },
-    {
-      name: "--ciphers=STR",
-      description:
-        "Set the priority string (GnuTLS) or cipher list string (OpenSSL) directly",
-    },
-    { name: ["-r", "--recursive"], description: "Specify recursive download" },
-    {
-      name: ["-l", "--level=NUMBER"],
-      description: "Maximum recursion depth (inf or 0 for infinite)",
-    },
-    {
-      name: "--delete-after",
-      description: "Delete files locally after downloading them",
-    },
-    {
-      name: ["-k", "--convert-links"],
-      description: "Make links in downloaded HTML or CSS point to local files",
-    },
-    {
-      name: ["-K", "--backup-converted"],
-      description: "Before converting file X, back up as X.orig",
-    },
-    {
-      name: ["-m", "--mirror"],
-      description: "Shortcut for -N -r -l inf --no-remove-listing",
-    },
-    {
-      name: ["-p", "--page-requisites"],
-      description: "Get all images, etc. needed to display HTML page",
-    },
-    {
-      name: ["-A", "--accept=LIST"],
-      description: "Comma-separated list of accepted extensions",
-    },
-    {
-      name: ["-R", "--reject=LIST"],
-      description: "Comma-separated list of rejected extensions",
-    },
-    {
-      name: "--accept-regex=REGEX",
-      description: "Regex matching accepted URLs",
-    },
-    {
-      name: "--reject-regex=REGEX",
-      description: "Regex matching rejected URLs",
-    },
-    { name: "--regex-type=TYPE", description: "Regex type (posix)" },
-    {
-      name: ["-D", "--domains=LIST"],
-      description: "Comma-separated list of accepted domains",
-    },
-    {
-      name: "--exclude-domains=LIST",
-      description: "Comma-separated list of rejected domains",
-    },
-    {
-      name: "--follow-ftp",
-      description: "Follow FTP links from HTML documents",
-    },
-    {
-      name: "--follow-tags=LIST",
-      description: "Comma-separated list of followed HTML tags",
-    },
-    {
-      name: "--ignore-tags=LIST",
-      description: "Comma-separated list of ignored HTML tags",
-    },
-    {
-      name: ["-H", "--span-hosts"],
-      description: "Go to foreign hosts when recursive",
-    },
-    { name: ["-L", "--relative"], description: "Follow relative links only" },
-    {
-      name: ["-I", "--include-directories=LIST"],
-      description: "List of allowed directories",
-    },
-    {
-      name: ["-X", "--exclude-directories=LIST"],
-      description: "List of excluded directories",
-    },
-    {
-      name: ["-np", "--no-parent"],
-      description: "Don't ascend to the parent directory",
-    },
-  ],
+	name: "wget",
+	description: "A non-interactive network retriever",
+	args: {
+		isVariadic: true,
+		name: "url",
+		description: "The url(s) to retrieve",
+	},
+	options: [
+		{
+			name: ["-V", "--version"],
+			description: "Display the version of Wget and exit",
+		},
+		{ name: ["-h", "--help"], description: "Print this help" },
+		{
+			name: ["-b", "--background"],
+			description: "Go to background after startup",
+		},
+		{
+			name: ["-e", "--execute=COMMAND"],
+			description: "Execute a `.wgetrc'-style command",
+		},
+		{ name: ["-o", "--output-file=FILE"], description: "Log messages to FILE" },
+		{
+			name: ["-a", "--append-output=FILE"],
+			description: "Append messages to FILE",
+		},
+		{ name: ["-q", "--quiet"], description: "Quiet (no output)" },
+		{
+			name: ["-v", "--verbose"],
+			description: "Be verbose (this is the default)",
+		},
+		{
+			name: ["-nv", "--no-verbose"],
+			description: "Turn off verboseness, without being quiet",
+		},
+		{
+			name: "--report-speed=TYPE",
+			description: "Output bandwidth as TYPE.  TYPE can be bits",
+		},
+		{
+			name: ["-i", "--input-file=FILE"],
+			description: "Download URLs found in local or external FILE",
+		},
+		{ name: ["-F", "--force-html"], description: "Treat input file as HTML" },
+		{
+			name: ["-B", "--base=URL"],
+			description: "Resolves HTML input-file links (-i -F) relative to URL",
+		},
+		{ name: "--config=FILE", description: "Specify config file to use" },
+		{ name: "--no-config", description: "Do not read any config file" },
+		{
+			name: "--rejected-log=FILE",
+			description: "Log reasons for URL rejection to FILE",
+		},
+		{
+			name: ["-t", "--tries=NUMBER"],
+			description: "Set number of retries to NUMBER (0 unlimits)",
+		},
+		{
+			name: "--retry-connrefused",
+			description: "Retry even if connection is refused",
+		},
+		{
+			name: "--retry-on-http-error",
+			description: "Comma-separated list of HTTP errors to retry",
+		},
+		{
+			name: ["-O", "--output-document=FILE"],
+			description: "Write documents to FILE",
+		},
+		{
+			name: ["-nc", "--no-clobber"],
+			description:
+				"Skip downloads that would download to existing files (overwriting them)",
+		},
+		{
+			name: "--no-netrc",
+			description: "Don't try to obtain credentials from .netrc",
+		},
+		{
+			name: ["-c", "--continue"],
+			description: "Resume getting a partially-downloaded file",
+		},
+		{
+			name: "--start-pos=OFFSET",
+			description: "Start downloading from zero-based position OFFSET",
+		},
+		{ name: "--progress=TYPE", description: "Select progress gauge type" },
+		{
+			name: "--show-progress",
+			description: "Display the progress bar in any verbosity mode",
+		},
+		{
+			name: ["-N", "--timestamping"],
+			description: "Don't re-retrieve files unless newer than local",
+		},
+		{ name: ["-S", "--server-response"], description: "Print server response" },
+		{ name: "--spider", description: "Don't download anything" },
+		{
+			name: ["-T", "--timeout=SECONDS"],
+			description: "Set all timeout values to SECONDS",
+		},
+		{
+			name: "--dns-timeout=SECS",
+			description: "Set the DNS lookup timeout to SECS",
+		},
+		{
+			name: "--connect-timeout=SECS",
+			description: "Set the connect timeout to SECS",
+		},
+		{
+			name: "--read-timeout=SECS",
+			description: "Set the read timeout to SECS",
+		},
+		{
+			name: ["-w", "--wait=SECONDS"],
+			description: "Wait SECONDS between retrievals",
+		},
+		{
+			name: "--waitretry=SECONDS",
+			description: "Wait 1..SECONDS between retries of a retrieval",
+		},
+		{
+			name: "--random-wait",
+			description: "Wait from 0.5*WAIT...1.5*WAIT secs between retrievals",
+		},
+		{ name: "--no-proxy", description: "Explicitly turn off proxy" },
+		{
+			name: ["-Q", "--quota=NUMBER"],
+			description: "Set retrieval quota to NUMBER",
+		},
+		{
+			name: "--bind-address=ADDRESS",
+			description: "Bind to ADDRESS (hostname or IP) on local host",
+		},
+		{ name: "--limit-rate=RATE", description: "Limit download rate to RATE" },
+		{ name: "--no-dns-cache", description: "Disable caching DNS lookups" },
+		{
+			name: "--restrict-file-names=OS",
+			description: "Restrict chars in file names to ones OS allows",
+		},
+		{
+			name: "--ignore-case",
+			description: "Ignore case when matching files/directories",
+		},
+		{
+			name: ["-4", "--inet4-only"],
+			description: "Connect only to IPv4 addresses",
+		},
+		{
+			name: ["-6", "--inet6-only"],
+			description: "Connect only to IPv6 addresses",
+		},
+		{
+			name: "--user=USER",
+			description: "Set both ftp and http user to USER",
+		},
+		{
+			name: "--password=PASS",
+			description: "Set both ftp and http password to PASS",
+		},
+		{ name: "--ask-password", description: "Prompt for passwords" },
+		{ name: "--no-iri", description: "Turn off IRI support" },
+		{
+			name: "--local-encoding=ENC",
+			description: "Use ENC as the local encoding for IRIs",
+		},
+		{
+			name: "--remote-encoding=ENC",
+			description: "Use ENC as the default remote encoding",
+		},
+		{ name: "--unlink", description: "Remove file before clobber" },
+		{
+			name: "--xattr",
+			description: "Turn on storage of metadata in extended file attributes",
+		},
+		{
+			name: ["-nd", "--no-directories"],
+			description: "Don't create directories",
+		},
+		{
+			name: ["-x", "--force-directories"],
+			description: "Force creation of directories",
+		},
+		{
+			name: ["-nH", "--no-host-directories"],
+			description: "Don't create host directories",
+		},
+		{
+			name: "--protocol-directories",
+			description: "Use protocol name in directories",
+		},
+		{
+			name: ["-P", "--directory-prefix=PREFIX"],
+			description: "Save files to PREFIX/",
+		},
+		{
+			name: "--cut-dirs=NUMBER",
+			description: "Ignore NUMBER remote directory components",
+		},
+		{ name: "--http-user=USER", description: "Set http user to USER" },
+		{
+			name: "--http-password=PASS",
+			description: "Set http password to PASS",
+		},
+		{ name: "--no-cache", description: "Disallow server-cached data" },
+		{
+			name: ["-E", "--adjust-extension"],
+			description: "Save HTML/CSS documents with proper extensions",
+		},
+		{
+			name: "--ignore-length",
+			description: "Ignore 'Content-Length' header field",
+		},
+		{
+			name: "--header=STRING",
+			description: "Insert STRING among the headers",
+		},
+		{
+			name: "--compression=TYPE",
+			description:
+				"Choose compression, one of auto, gzip and none. (default: none)",
+		},
+		{
+			name: "--max-redirect",
+			description: "Maximum redirections allowed per page",
+		},
+		{ name: "--proxy-user=USER", description: "Set USER as proxy username" },
+		{
+			name: "--proxy-password=PASS",
+			description: "Set PASS as proxy password",
+		},
+		{
+			name: "--referer=URL",
+			description: "Include 'Referer: URL' header in HTTP request",
+		},
+		{ name: "--save-headers", description: "Save the HTTP headers to file" },
+		{
+			name: ["-U", "--user-agent=AGENT"],
+			description: "Identify as AGENT instead of Wget/VERSION",
+		},
+		{
+			name: "--no-http-keep-alive",
+			description: "Disable HTTP keep-alive (persistent connections)",
+		},
+		{ name: "--no-cookies", description: "Don't use cookies" },
+		{
+			name: "--load-cookies=FILE",
+			description: "Load cookies from FILE before session",
+		},
+		{
+			name: "--save-cookies=FILE",
+			description: "Save cookies to FILE after session",
+		},
+		{
+			name: "--keep-session-cookies",
+			description: "Load and save session (non-permanent) cookies",
+		},
+		{
+			name: "--post-data=STRING",
+			description: "Use the POST method; send STRING as the data",
+		},
+		{
+			name: "--post-file=FILE",
+			description: "Use the POST method; send contents of FILE",
+		},
+		{
+			name: "--method=HTTPMethod",
+			description: 'Use method "HTTPMethod" in the request',
+		},
+		{
+			name: "--body-data=STRING",
+			description: "Send STRING as data. --method MUST be set",
+		},
+		{
+			name: "--body-file=FILE",
+			description: "Send contents of FILE. --method MUST be set",
+		},
+		{
+			name: "--content-on-error",
+			description: "Output the received content on server errors",
+		},
+		{
+			name: "--secure-protocol=PR",
+			description: "Choose secure protocol, one of auto, SSLv2,",
+		},
+		{ name: "--https-only", description: "Only follow secure HTTPS links" },
+		{
+			name: "--no-check-certificate",
+			description: "Don't validate the server's certificate",
+		},
+		{ name: "--certificate=FILE", description: "Client certificate file" },
+		{
+			name: "--certificate-type=TYPE",
+			description: "Client certificate type, PEM or DER",
+		},
+		{ name: "--private-key=FILE", description: "Private key file" },
+		{
+			name: "--private-key-type=TYPE",
+			description: "Private key type, PEM or DER",
+		},
+		{
+			name: "--ca-certificate=FILE",
+			description: "File with the bundle of CAs",
+		},
+		{
+			name: "--ca-directory=DIR",
+			description: "Directory where hash list of CAs is stored",
+		},
+		{ name: "--crl-file=FILE", description: "File with bundle of CRLs" },
+		{
+			name: "--ciphers=STR",
+			description:
+				"Set the priority string (GnuTLS) or cipher list string (OpenSSL) directly",
+		},
+		{ name: ["-r", "--recursive"], description: "Specify recursive download" },
+		{
+			name: ["-l", "--level=NUMBER"],
+			description: "Maximum recursion depth (inf or 0 for infinite)",
+		},
+		{
+			name: "--delete-after",
+			description: "Delete files locally after downloading them",
+		},
+		{
+			name: ["-k", "--convert-links"],
+			description: "Make links in downloaded HTML or CSS point to local files",
+		},
+		{
+			name: ["-K", "--backup-converted"],
+			description: "Before converting file X, back up as X.orig",
+		},
+		{
+			name: ["-m", "--mirror"],
+			description: "Shortcut for -N -r -l inf --no-remove-listing",
+		},
+		{
+			name: ["-p", "--page-requisites"],
+			description: "Get all images, etc. needed to display HTML page",
+		},
+		{
+			name: ["-A", "--accept=LIST"],
+			description: "Comma-separated list of accepted extensions",
+		},
+		{
+			name: ["-R", "--reject=LIST"],
+			description: "Comma-separated list of rejected extensions",
+		},
+		{
+			name: "--accept-regex=REGEX",
+			description: "Regex matching accepted URLs",
+		},
+		{
+			name: "--reject-regex=REGEX",
+			description: "Regex matching rejected URLs",
+		},
+		{ name: "--regex-type=TYPE", description: "Regex type (posix)" },
+		{
+			name: ["-D", "--domains=LIST"],
+			description: "Comma-separated list of accepted domains",
+		},
+		{
+			name: "--exclude-domains=LIST",
+			description: "Comma-separated list of rejected domains",
+		},
+		{
+			name: "--follow-ftp",
+			description: "Follow FTP links from HTML documents",
+		},
+		{
+			name: "--follow-tags=LIST",
+			description: "Comma-separated list of followed HTML tags",
+		},
+		{
+			name: "--ignore-tags=LIST",
+			description: "Comma-separated list of ignored HTML tags",
+		},
+		{
+			name: ["-H", "--span-hosts"],
+			description: "Go to foreign hosts when recursive",
+		},
+		{ name: ["-L", "--relative"], description: "Follow relative links only" },
+		{
+			name: ["-I", "--include-directories=LIST"],
+			description: "List of allowed directories",
+		},
+		{
+			name: ["-X", "--exclude-directories=LIST"],
+			description: "List of excluded directories",
+		},
+		{
+			name: ["-np", "--no-parent"],
+			description: "Don't ascend to the parent directory",
+		},
+	],
 };
 
 // GNU Wget 1.20.3, a non-interactive network retriever.
diff --git a/extensions/terminal-suggest/src/completions/upstream/yarn.ts b/extensions/terminal-suggest/src/completions/upstream/yarn.ts
index f3f7a81d90f8..e8d5a2011ce1 100644
--- a/extensions/terminal-suggest/src/completions/upstream/yarn.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/yarn.ts
@@ -1,1674 +1,1674 @@
 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;
-  },
+	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",
+	"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"],
-    });
+	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`],
-    });
+		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 [];
+		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),
-      ];
+		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)
-      );
+			const filteredDependencies = dependencies.filter(
+				(dependency) => !tokens.includes(dependency)
+			);
 
-      return filteredDependencies.map((dependencyName) => ({
-        name: dependencyName,
-        icon: "📦",
-      }));
-    } catch (e) {}
+			return filteredDependencies.map((dependencyName) => ({
+				name: dependencyName,
+				icon: "📦",
+			}));
+		} catch (e) {}
 
-    return [];
-  },
+		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 [];
+	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 [];
-  },
+		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 [];
-    }
+	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) {}
+		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 [];
-  },
+		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 [];
-    }
+	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);
+		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 [];
-    }
-  },
+			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" },
-  },
+	{ 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: any) =>
-          ({
-            name: item.package.name.substring(7),
-            description: item.package.description,
-          }) as Fig.Suggestion
-      ) as Fig.Suggestion[];
-    } catch (e) {
-      return [];
-    }
-  },
+	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: any) =>
+					({
+						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");
+	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",
-      }));
+		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.");
+		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 getWorkspacesDefinitionsV1 = async () => {
+					const { stdout } = await executeShellCommand({
+						command: "yarn",
+						args: ["workspaces", "info"],
+					});
 
-          const startJson = stdout.indexOf("{");
-          const endJson = stdout.lastIndexOf("}");
+					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,
-          }));
-        };
+					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()));
-        };
+				// 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();
+				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 [];
-                  },
-                },
-              },
-            })
-          );
+					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",
-            },
-          ],
-        },
-      ],
-    },
-  ],
+					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;

From e98b8e124e120e62eb16e86bed33b417f9d73a3d Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 6 Mar 2025 05:21:21 -0800
Subject: [PATCH 0677/1815] Remove tsconfig changes and amend specs

---
 .../terminal-suggest/scripts/update-specs.js  | 20 ++++++++++++++++---
 .../src/completions/upstream/git.ts           |  7 ++++---
 .../src/completions/upstream/pnpm.ts          |  7 ++++---
 extensions/terminal-suggest/tsconfig.json     |  4 +---
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/extensions/terminal-suggest/scripts/update-specs.js b/extensions/terminal-suggest/scripts/update-specs.js
index 7fbac83d6c16..63084a094454 100644
--- a/extensions/terminal-suggest/scripts/update-specs.js
+++ b/extensions/terminal-suggest/scripts/update-specs.js
@@ -33,6 +33,15 @@ const specSpecificReplaceStrings = new Map([
 		], [
 			'message: async ({ executeCommand }) =>',
 			'message: async ({ executeCommand }: any) =>'
+		], [
+			'if (parts.length > 1) {',
+			'if (parts && parts.length > 1) {'
+		], [
+			'if (seen.has(suggestion.name)) return false;',
+			'if (!suggestion) return false;\n\t\t\t\tif (seen.has(suggestion.name)) return false;'
+		], [
+			'return pp(',
+			'return pp?.('
 		]
 	]],
 	['kill', [[
@@ -63,10 +72,15 @@ const specSpecificReplaceStrings = new Map([
 		[
 			'if (parts.length > 1) {',
 			'if (parts && parts.length > 1) {'
-		],
-		[
+		], [
 			'const packages = postProcess(',
-			'const packages = postProcess?.('
+			'if (postProcess === undefined) return undefined;\n\t\tconst packages = postProcess('
+		], [
+			').map(({ name }) => name as string);',
+			')?.filter((e) => e !== null).map(({ name }) => name as string);'
+		], [
+			'.filter((name) => nodeClis.has(name))',
+			'?.filter((name) => nodeClis.has(name))'
 		]
 	]],
 	['ssh', [[
diff --git a/extensions/terminal-suggest/src/completions/upstream/git.ts b/extensions/terminal-suggest/src/completions/upstream/git.ts
index 63af2af69849..03668c69e2dd 100644
--- a/extensions/terminal-suggest/src/completions/upstream/git.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/git.ts
@@ -69,7 +69,7 @@ const postProcessBranches =
 			.map((branch) => {
 				let name = branch.trim();
 				const parts = branch.match(/\S+/g);
-				if (parts.length > 1) {
+				if (parts && parts.length > 1) {
 					if (parts[0] === "*") {
 						// We are in a detached HEAD state
 						if (branch.includes("HEAD detached")) {
@@ -108,6 +108,7 @@ const postProcessBranches =
 				};
 			})
 			.filter((suggestion) => {
+				if (!suggestion) return false;
 				if (seen.has(suggestion.name)) return false;
 				seen.add(suggestion.name);
 				return true;
@@ -259,7 +260,7 @@ export const gitGenerators: Record<string, Fig.Generator> = {
 		custom: async (tokens, executeShellCommand) => {
 			const pp = postProcessBranches({ insertWithoutRemotes: true });
 			if (tokens.includes("-r")) {
-				return pp(
+				return pp?.(
 					(
 						await executeShellCommand({
 							command: "git",
@@ -274,7 +275,7 @@ export const gitGenerators: Record<string, Fig.Generator> = {
 					tokens
 				);
 			} else {
-				return pp(
+				return pp?.(
 					(
 						await executeShellCommand({
 							command: "git",
diff --git a/extensions/terminal-suggest/src/completions/upstream/pnpm.ts b/extensions/terminal-suggest/src/completions/upstream/pnpm.ts
index 8faff2a66e4e..deaa454f7507 100644
--- a/extensions/terminal-suggest/src/completions/upstream/pnpm.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/pnpm.ts
@@ -991,7 +991,8 @@ const completionSpec: Fig.Spec = {
 			script: string[];
 		};
 
-		const packages = postProcess?.(
+		if (postProcess === undefined) return undefined;
+		const packages = postProcess(
 			(
 				await executeShellCommand({
 					command: script[0],
@@ -999,10 +1000,10 @@ const completionSpec: Fig.Spec = {
 				})
 			).stdout,
 			tokens
-		).map(({ name }) => name as string);
+		)?.filter((e) => e !== null).map(({ name }) => name as string);
 
 		const subcommands = packages
-			.filter((name) => nodeClis.has(name))
+			?.filter((name) => nodeClis.has(name))
 			.map((name) => ({
 				name,
 				loadSpec: name,
diff --git a/extensions/terminal-suggest/tsconfig.json b/extensions/terminal-suggest/tsconfig.json
index 27bfe671c9e4..a61b7c784693 100644
--- a/extensions/terminal-suggest/tsconfig.json
+++ b/extensions/terminal-suggest/tsconfig.json
@@ -10,9 +10,7 @@
 
 		// Needed to suppress warnings in upstream completions
 		"noImplicitReturns": false,
-		"noUnusedParameters": false,
-		"strictNullChecks": false,
-		"noUnusedLocals": false
+		"noUnusedParameters": false
 	},
 	"include": [
 		"src/**/*",

From 78c206a0ae56f63afadd1cfad8819d61c921c5a6 Mon Sep 17 00:00:00 2001
From: mattmaniak <72657016+mattmaniak@users.noreply.github.com>
Date: Thu, 6 Mar 2025 14:41:14 +0100
Subject: [PATCH 0678/1815] Make telemetry info table a little bit narrower and
 aligned (#233961)

* Make telemetry info table a little bit narrower but aligned

* Match spaces after a checkmark to align table on some monospaced views
---
 src/vs/platform/telemetry/common/telemetryService.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
index 51fbb8fa7539..72a7ab576e5d 100644
--- a/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/src/vs/platform/telemetry/common/telemetryService.ts
@@ -176,11 +176,11 @@ function getTelemetryLevelSettingDescription(): string {
 	const telemetryTableDescription = localize('telemetry.telemetryLevel.tableDescription', "The following table outlines the data sent with each setting:");
 	const telemetryTable = `
 |       | ${crashReportsHeader} | ${errorsHeader} | ${usageHeader} |
-|:------|:---------------------:|:---------------:|:--------------:|
-| all   |            ✓          |        ✓        |        ✓       |
-| error |            ✓          |        ✓        |        -       |
-| crash |            ✓          |        -        |        -       |
-| off   |            -          |        -        |        -       |
+|:------|:-------------:|:---------------:|:----------:|
+| all   |       ✓       |        ✓        |     ✓      |
+| error |       ✓       |        ✓        |     -      |
+| crash |       ✓       |        -        |     -      |
+| off   |       -       |        -        |     -      |
 `;
 
 	const deprecatedSettingNote = localize('telemetry.telemetryLevel.deprecated', "****Note:*** If this setting is 'off', no telemetry will be sent regardless of other telemetry settings. If this setting is set to anything except 'off' and telemetry is disabled with deprecated settings, no telemetry will be sent.*");

From 1f82bf8903a4f7215deec83920933aca21d8b226 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 6 Mar 2025 14:58:50 +0100
Subject: [PATCH 0679/1815] fix #242445 (#242788)

---
 src/vs/workbench/contrib/themes/browser/themes.contribution.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
index e8e7b606c867..678d939d9c36 100644
--- a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
+++ b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
@@ -809,7 +809,7 @@ MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
 	order: 7
 } satisfies ISubmenuItem);
 MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
-	title: localize({ key: 'miSelectTheme', comment: ['&& denotes a mnemonic'] }, "&&Theme"),
+	title: localize({ key: 'miSelectTheme', comment: ['&& denotes a mnemonic'] }, "&&Themes"),
 	submenu: ThemesSubMenu,
 	group: '2_configuration',
 	order: 7

From 001f97552633667892aa06d2e98efb2798fc77cc Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 6 Mar 2025 16:26:45 +0100
Subject: [PATCH 0680/1815] Improve uninstalling problematic extensions. Detect
 them and disable them before running. (#242805)

---
 .../abstractExtensionManagementService.ts     | 41 +++++++++--
 .../common/extensionManagementUtil.ts         |  6 +-
 .../node/extensionManagementService.ts        |  4 ++
 .../browser/extensions.contribution.ts        |  4 +-
 .../extensions/browser/extensionsActions.ts   |  2 +-
 .../extensions/browser/extensionsViewlet.ts   | 71 ++++++++++---------
 .../browser/extensionsWorkbenchService.ts     | 16 +++--
 .../browser/extensionEnablementService.ts     | 57 +++++++++++++--
 .../browser/webExtensionsScannerService.ts    |  2 +-
 .../common/extensionManagement.ts             |  1 +
 .../common/extensionManagementService.ts      |  2 +-
 .../common/webExtensionManagementService.ts   |  4 ++
 .../extensionEnablementService.test.ts        | 43 +++++++++--
 13 files changed, 186 insertions(+), 67 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
index 73fbccd8f518..f0f8be2593aa 100644
--- a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
@@ -635,7 +635,7 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 		let compatibleExtension: IGalleryExtension | null;
 
 		const extensionsControlManifest = await this.getExtensionsControlManifest();
-		if (isMalicious(extension.identifier, extensionsControlManifest)) {
+		if (isMalicious(extension.identifier, extensionsControlManifest.malicious)) {
 			throw new ExtensionManagementError(nls.localize('malicious extension', "Can't install '{0}' extension since it was reported to be problematic.", extension.identifier.id), ExtensionManagementErrorCode.Malicious);
 		}
 
@@ -729,8 +729,16 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 		const allTasks: IUninstallExtensionTask[] = [];
 		const processedTasks: IUninstallExtensionTask[] = [];
 		const alreadyRequestedUninstalls: Promise<any>[] = [];
+		const extensionsToRemove: ILocalExtension[] = [];
 
 		const installedExtensionsMap = new ResourceMap<ILocalExtension[]>();
+		const getInstalledExtensions = async (profileLocation: URI) => {
+			let installed = installedExtensionsMap.get(profileLocation);
+			if (!installed) {
+				installedExtensionsMap.set(profileLocation, installed = await this.getInstalled(ExtensionType.User, profileLocation));
+			}
+			return installed;
+		};
 
 		for (const { extension, options } of extensions) {
 			const uninstallOptions: UninstallExtensionTaskOptions = {
@@ -744,14 +752,32 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 			} else {
 				allTasks.push(createUninstallExtensionTask(extension, uninstallOptions));
 			}
+
+			if (uninstallOptions.remove) {
+				extensionsToRemove.push(extension);
+				for (const profile of this.userDataProfilesService.profiles) {
+					if (this.uriIdentityService.extUri.isEqual(profile.extensionsResource, uninstallOptions.profileLocation)) {
+						continue;
+					}
+					const installed = await getInstalledExtensions(profile.extensionsResource);
+					const profileExtension = installed.find(e => areSameExtensions(e.identifier, extension.identifier));
+					if (profileExtension) {
+						const uninstallOptionsWithProfile = { ...uninstallOptions, profileLocation: profile.extensionsResource };
+						const uninstallExtensionTask = this.uninstallingExtensions.get(getUninstallExtensionTaskKey(profileExtension, uninstallOptionsWithProfile));
+						if (uninstallExtensionTask) {
+							this.logService.info('Extensions is already requested to uninstall', profileExtension.identifier.id);
+							alreadyRequestedUninstalls.push(uninstallExtensionTask.waitUntilTaskIsFinished());
+						} else {
+							allTasks.push(createUninstallExtensionTask(profileExtension, uninstallOptionsWithProfile));
+						}
+					}
+				}
+			}
 		}
 
 		try {
 			for (const task of allTasks.slice(0)) {
-				let installed = installedExtensionsMap.get(task.options.profileLocation);
-				if (!installed) {
-					installedExtensionsMap.set(task.options.profileLocation, installed = await this.getInstalled(ExtensionType.User, task.options.profileLocation));
-				}
+				const installed = await getInstalledExtensions(task.options.profileLocation);
 
 				if (task.options.donotIncludePack) {
 					this.logService.info('Uninstalling the extension without including packed extension', `${task.extension.identifier.id}@${task.extension.manifest.version}`);
@@ -799,6 +825,10 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 			for (const task of allTasks) {
 				postUninstallExtension(task.extension, task.options);
 			}
+
+			if (extensionsToRemove.length) {
+				await this.joinAllSettled(extensionsToRemove.map(extension => this.removeExtension(extension)));
+			}
 		} catch (e) {
 			const error = toExtensionManagementError(e);
 			for (const task of allTasks) {
@@ -895,6 +925,7 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 	protected abstract createInstallExtensionTask(manifest: IExtensionManifest, extension: URI | IGalleryExtension, options: InstallExtensionTaskOptions): IInstallExtensionTask;
 	protected abstract createUninstallExtensionTask(extension: ILocalExtension, options: UninstallExtensionTaskOptions): IUninstallExtensionTask;
 	protected abstract copyExtension(extension: ILocalExtension, fromProfileLocation: URI, toProfileLocation: URI, metadata?: Partial<Metadata>): Promise<ILocalExtension>;
+	protected abstract removeExtension(extension: ILocalExtension): Promise<void>;
 }
 
 export function toExtensionManagementError(error: Error, code?: ExtensionManagementErrorCode): ExtensionManagementError {
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
index 7a2cd54e8654..ece6b6241632 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { compareIgnoreCase } from '../../../base/common/strings.js';
-import { IExtensionIdentifier, IExtensionsControlManifest, IGalleryExtension, ILocalExtension, getTargetPlatform } from './extensionManagement.js';
+import { IExtensionIdentifier, IGalleryExtension, ILocalExtension, getTargetPlatform } from './extensionManagement.js';
 import { ExtensionIdentifier, IExtension, TargetPlatform, UNDEFINED_PUBLISHER } from '../../extensions/common/extensions.js';
 import { IFileService } from '../../files/common/files.js';
 import { isLinux, platform } from '../../../base/common/platform.js';
@@ -198,8 +198,8 @@ export async function computeTargetPlatform(fileService: IFileService, logServic
 	return targetPlatform;
 }
 
-export function isMalicious(identifier: IExtensionIdentifier, controlManifest: IExtensionsControlManifest): boolean {
-	return controlManifest.malicious.some(publisherOrIdentifier => {
+export function isMalicious(identifier: IExtensionIdentifier, malicious: ReadonlyArray<IExtensionIdentifier | string>): boolean {
+	return malicious.some(publisherOrIdentifier => {
 		if (isString(publisherOrIdentifier)) {
 			return compareIgnoreCase(identifier.id.split('.')[0], publisherOrIdentifier) === 0;
 		}
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 04ed18266096..11bb73f08484 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -214,6 +214,10 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 		return local;
 	}
 
+	protected removeExtension(extension: ILocalExtension): Promise<void> {
+		return this.extensionsScanner.deleteExtension(extension, 'remove');
+	}
+
 	protected copyExtension(extension: ILocalExtension, fromProfileLocation: URI, toProfileLocation: URI, metadata: Partial<Metadata>): Promise<ILocalExtension> {
 		return this.extensionsScanner.copyExtension(extension, fromProfileLocation, toProfileLocation, metadata);
 	}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index e30163945172..68e1762d67e7 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -1670,7 +1670,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			title: localize('download VSIX', "Download VSIX"),
 			menu: {
 				id: MenuId.ExtensionContext,
-				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.has('isGalleryExtension')),
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.not('extensionDisallowInstall'), ContextKeyExpr.has('isGalleryExtension')),
 				order: this.productService.quality === 'stable' ? 0 : 1
 			},
 			run: async (accessor: ServicesAccessor, extensionId: string) => {
@@ -1683,7 +1683,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			title: localize('download pre-release', "Download Pre-Release VSIX"),
 			menu: {
 				id: MenuId.ExtensionContext,
-				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.has('isGalleryExtension'), ContextKeyExpr.has('extensionHasPreReleaseVersion')),
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.not('extensionDisallowInstall'), ContextKeyExpr.has('isGalleryExtension'), ContextKeyExpr.has('extensionHasPreReleaseVersion')),
 				order: this.productService.quality === 'stable' ? 1 : 0
 			},
 			run: async (accessor: ServicesAccessor, extensionId: string) => {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
index 8b062d1d47d6..3cd6405610ef 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
@@ -1250,7 +1250,7 @@ async function getContextMenuActionsGroups(extension: IExtension | undefined | n
 			cksOverlay.push(['galleryExtensionHasPreReleaseVersion', extension.gallery?.hasPreReleaseVersion]);
 			cksOverlay.push(['extensionHasPreReleaseVersion', extension.hasPreReleaseVersion]);
 			cksOverlay.push(['extensionHasReleaseVersion', extension.hasReleaseVersion]);
-			cksOverlay.push(['extensionDisallowInstall', !!extension.deprecationInfo?.disallowInstall]);
+			cksOverlay.push(['extensionDisallowInstall', extension.isMalicious || extension.deprecationInfo?.disallowInstall]);
 			cksOverlay.push(['isExtensionAllowed', allowedExtensionsService.isAllowed({ id: extension.identifier.id, publisherDisplayName: extension.publisherDisplayName }) === true]);
 			cksOverlay.push(['isPreReleaseExtensionAllowed', allowedExtensionsService.isAllowed({ id: extension.identifier.id, publisherDisplayName: extension.publisherDisplayName, prerelease: true }) === true]);
 			cksOverlay.push(['extensionIsUnsigned', extension.gallery && !extension.gallery.isSigned]);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
index ee75bba1ed6f..5e3d3cdb3277 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
@@ -5,7 +5,7 @@
 
 import './media/extensionsViewlet.css';
 import { localize, localize2 } from '../../../../nls.js';
-import { timeout, Delayer, Promises } from '../../../../base/common/async.js';
+import { timeout, Delayer } from '../../../../base/common/async.js';
 import { isCancellationError } from '../../../../base/common/errors.js';
 import { createErrorWithActions } from '../../../../base/common/errorMessage.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
@@ -16,9 +16,9 @@ import { append, $, Dimension, hide, show, DragAndDropObserver, trackFocus, addD
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { IExtensionsWorkbenchService, IExtensionsViewPaneContainer, VIEWLET_ID, CloseExtensionDetailsOnViewChangeKey, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, AutoCheckUpdatesConfigurationKey, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu, AutoRestartConfigurationKey } from '../common/extensions.js';
+import { IExtensionsWorkbenchService, IExtensionsViewPaneContainer, VIEWLET_ID, CloseExtensionDetailsOnViewChangeKey, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, AutoCheckUpdatesConfigurationKey, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu, AutoRestartConfigurationKey, ExtensionRuntimeActionType } from '../common/extensions.js';
 import { InstallLocalExtensionsInRemoteAction, InstallRemoteExtensionsInLocalAction } from './extensionsActions.js';
-import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IExtensionManagementService, ILocalExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IWorkbenchExtensionEnablementService, IExtensionManagementServerService, IExtensionManagementServer } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { ExtensionsInput } from '../common/extensionsInput.js';
 import { ExtensionsListView, EnabledExtensionsView, DisabledExtensionsView, RecommendedExtensionsView, WorkspaceRecommendedExtensionsView, ServerInstalledExtensionsView, DefaultRecommendedExtensionsView, UntrustedWorkspaceUnsupportedExtensionsView, UntrustedWorkspacePartiallySupportedExtensionsView, VirtualWorkspaceUnsupportedExtensionsView, VirtualWorkspacePartiallySupportedExtensionsView, DefaultPopularExtensionsView, DeprecatedExtensionsView, SearchMarketplaceExtensionsView, RecentlyUpdatedExtensionsView, OutdatedExtensionsView, StaticQueryExtensionsView, NONE_CATEGORY } from './extensionsViews.js';
@@ -42,14 +42,13 @@ import { ViewPane } from '../../../browser/parts/views/viewPane.js';
 import { Query } from '../common/extensionQuery.js';
 import { SuggestEnabledInput } from '../../codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
-import { EXTENSION_CATEGORIES, ExtensionType } from '../../../../platform/extensions/common/extensions.js';
+import { EXTENSION_CATEGORIES } from '../../../../platform/extensions/common/extensions.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { MementoObject } from '../../../common/memento.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
 import { SIDE_BAR_DRAG_AND_DROP_BACKGROUND } from '../../../common/theme.js';
-import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 import { VirtualWorkspaceContext, WorkbenchStateContext } from '../../../common/contextkeys.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { installLocalInRemoteIcon } from './extensionsIcons.js';
@@ -59,7 +58,6 @@ import { IPaneCompositePartService } from '../../../services/panecomposite/brows
 import { coalesce } from '../../../../base/common/arrays.js';
 import { extractEditorsAndFilesDropData } from '../../../../platform/dnd/browser/dnd.js';
 import { extname } from '../../../../base/common/resources.js';
-import { isMalicious } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { ILocalizedString } from '../../../../platform/action/common/action.js';
 import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
 import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
@@ -972,14 +970,12 @@ export class MaliciousExtensionChecker implements IWorkbenchContribution {
 
 	constructor(
 		@IExtensionManagementService private readonly extensionsManagementService: IExtensionManagementService,
+		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IHostService private readonly hostService: IHostService,
 		@ILogService private readonly logService: ILogService,
 		@INotificationService private readonly notificationService: INotificationService,
-		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService
 	) {
-		if (!this.environmentService.disableExtensions) {
-			this.loopCheckForMaliciousExtensions();
-		}
+		this.loopCheckForMaliciousExtensions();
 	}
 
 	private loopCheckForMaliciousExtensions(): void {
@@ -988,31 +984,36 @@ export class MaliciousExtensionChecker implements IWorkbenchContribution {
 			.then(() => this.loopCheckForMaliciousExtensions());
 	}
 
-	private checkForMaliciousExtensions(): Promise<void> {
-		return this.extensionsManagementService.getExtensionsControlManifest().then(extensionsControlManifest => {
-
-			return this.extensionsManagementService.getInstalled(ExtensionType.User).then(installed => {
-				const maliciousExtensions = installed.filter(e => isMalicious(e.identifier, extensionsControlManifest));
-
-				if (maliciousExtensions.length) {
-					return Promises.settled(maliciousExtensions.map(e => this.extensionsManagementService.uninstall(e).then(() => {
-						this.notificationService.prompt(
-							Severity.Warning,
-							localize('malicious warning', "We have uninstalled '{0}' which was reported to be problematic.", e.identifier.id),
-							[{
-								label: localize('reloadNow', "Reload Now"),
-								run: () => this.hostService.reload()
-							}],
-							{
-								sticky: true,
-								priority: NotificationPriority.URGENT
-							}
-						);
-					})));
-				} else {
-					return Promise.resolve(undefined);
+	private async checkForMaliciousExtensions(): Promise<void> {
+		try {
+			const maliciousExtensions: ILocalExtension[] = [];
+			let shouldRestartExtensions = false;
+			let shouldReloadWindow = false;
+			for (const extension of this.extensionsWorkbenchService.installed) {
+				if (extension.isMalicious && extension.local) {
+					maliciousExtensions.push(extension.local);
+					shouldRestartExtensions = shouldRestartExtensions || extension.runtimeState?.action === ExtensionRuntimeActionType.RestartExtensions;
+					shouldReloadWindow = shouldReloadWindow || extension.runtimeState?.action === ExtensionRuntimeActionType.ReloadWindow;
 				}
-			}).then(() => undefined);
-		}, err => this.logService.error(err));
+			}
+			if (maliciousExtensions.length) {
+				await this.extensionsManagementService.uninstallExtensions(maliciousExtensions.map(e => ({ extension: e, options: { remove: true } })));
+				this.notificationService.prompt(
+					Severity.Warning,
+					localize('malicious warning', "The following extensions were found to be problematic and have been uninstalled: {0}", maliciousExtensions.map(e => e.identifier.id).join(', ')),
+					shouldRestartExtensions || shouldReloadWindow ? [{
+						label: shouldRestartExtensions ? localize('restartNow', "Restart Extensions") : localize('reloadNow', "Reload Now"),
+						run: () => shouldRestartExtensions ? this.extensionsWorkbenchService.updateRunningExtensions() : this.hostService.reload()
+					}] : [],
+					{
+						sticky: true,
+						priority: NotificationPriority.URGENT
+					}
+				);
+			}
+
+		} catch (err) {
+			this.logService.error(err);
+		}
 	}
 }
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index 74f8e88fb618..c81a7b99e5e8 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -295,7 +295,11 @@ export class Extension implements IExtension {
 		return this.stateProvider(this);
 	}
 
-	public isMalicious: boolean = false;
+	private malicious: boolean = false;
+	public get isMalicious(): boolean {
+		return this.malicious || this.enablementState === EnablementState.DisabledByMalicious;
+	}
+
 	public deprecationInfo: IDeprecationInfo | undefined;
 
 	get installCount(): number | undefined {
@@ -549,7 +553,7 @@ ${this.description}
 	}
 
 	setExtensionsControlManifest(extensionsControlManifest: IExtensionsControlManifest): void {
-		this.isMalicious = isMalicious(this.identifier, extensionsControlManifest);
+		this.malicious = isMalicious(this.identifier, extensionsControlManifest.malicious);
 		this.deprecationInfo = extensionsControlManifest.deprecated ? extensionsControlManifest.deprecated[this.identifier.id.toLowerCase()] : undefined;
 		this._extensionEnabledWithPreRelease = extensionsControlManifest?.extensionsEnabledWithPreRelease?.includes(this.identifier.id.toLowerCase());
 	}
@@ -626,8 +630,8 @@ class Extensions extends Disposable {
 		}
 	}
 
-	private _local: IExtension[] | undefined;
-	get local(): IExtension[] {
+	private _local: Extension[] | undefined;
+	get local(): Extension[] {
 		if (!this._local) {
 			this._local = [];
 			for (const extension of this.installed) {
@@ -882,8 +886,8 @@ class Extensions extends Disposable {
 			if (extension.local) {
 				const enablementState = this.extensionEnablementService.getEnablementState(extension.local);
 				if (enablementState !== extension.enablementState) {
-					(extension as Extension).enablementState = enablementState;
-					this._onChange.fire({ extension: extension as Extension });
+					extension.enablementState = enablementState;
+					this._onChange.fire({ extension });
 				}
 			}
 		}
diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
index 2ad63cc370b8..10b674d60ea7 100644
--- a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts
@@ -8,9 +8,9 @@ import { Event, Emitter } from '../../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { IExtensionManagementService, IExtensionIdentifier, IGlobalExtensionEnablementService, ENABLED_EXTENSIONS_STORAGE_PATH, DISABLED_EXTENSIONS_STORAGE_PATH, InstallOperation, IAllowedExtensionsService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IWorkbenchExtensionManagementService, IExtensionManagementServer, ExtensionInstallLocation } from '../common/extensionManagement.js';
-import { areSameExtensions, BetterMergeId, getExtensionDependencies } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { areSameExtensions, BetterMergeId, getExtensionDependencies, isMalicious } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
-import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
 import { ExtensionType, IExtension, isAuthenticationProviderExtension, isLanguagePackExtension, isResolverExtension } from '../../../../platform/extensions/common/extensions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
@@ -28,6 +28,9 @@ import { IExtensionManifestPropertiesService } from '../../extensions/common/ext
 import { isVirtualWorkspace } from '../../../../platform/workspace/common/virtualWorkspace.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { equals } from '../../../../base/common/arrays.js';
+import { isString } from '../../../../base/common/types.js';
+import { Delayer } from '../../../../base/common/async.js';
 
 const SOURCE = 'IWorkbenchExtensionEnablementService';
 
@@ -43,13 +46,14 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 	protected readonly extensionsManager: ExtensionsManager;
 	private readonly storageManager: StorageManager;
 	private extensionsDisabledExtensions: IExtension[] = [];
+	private readonly delayer = this._register(new Delayer<void>(0));
 
 	constructor(
-		@IStorageService storageService: IStorageService,
+		@IStorageService private readonly storageService: IStorageService,
 		@IGlobalExtensionEnablementService protected readonly globalExtensionEnablementService: IGlobalExtensionEnablementService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
-		@IExtensionManagementService extensionManagementService: IExtensionManagementService,
+		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
 		@IUserDataSyncEnablementService private readonly userDataSyncEnablementService: IUserDataSyncEnablementService,
@@ -63,6 +67,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		@IWorkspaceTrustRequestService private readonly workspaceTrustRequestService: IWorkspaceTrustRequestService,
 		@IExtensionManifestPropertiesService private readonly extensionManifestPropertiesService: IExtensionManifestPropertiesService,
 		@IInstantiationService instantiationService: IInstantiationService,
+		@ILogService private readonly logService: ILogService,
 	) {
 		super();
 		this.storageManager = this._register(new StorageManager(storageService));
@@ -73,9 +78,10 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		this.extensionsManager = this._register(instantiationService.createInstance(ExtensionsManager));
 		this.extensionsManager.whenInitialized().then(() => {
 			if (!isDisposed) {
+				uninstallDisposable.dispose();
 				this._onDidChangeExtensions([], [], false);
 				this._register(this.extensionsManager.onDidChangeExtensions(({ added, removed, isProfileSwitch }) => this._onDidChangeExtensions(added, removed, isProfileSwitch)));
-				uninstallDisposable.dispose();
+				this.loopCheckForMaliciousExtensions();
 			}
 		});
 
@@ -161,6 +167,8 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		switch (enablementStateOfExtension) {
 			case EnablementState.DisabledByEnvironment:
 				throw new Error(localize('cannot change disablement environment', "Cannot change enablement of {0} extension because it is disabled in environment", extension.manifest.displayName || extension.identifier.id));
+			case EnablementState.DisabledByMalicious:
+				throw new Error(localize('cannot change enablement malicious', "Cannot change enablement of {0} extension because it is malicious", extension.manifest.displayName || extension.identifier.id));
 			case EnablementState.DisabledByVirtualWorkspace:
 				throw new Error(localize('cannot change enablement virtual workspace', "Cannot change enablement of {0} extension because it does not support virtual workspaces", extension.manifest.displayName || extension.identifier.id));
 			case EnablementState.DisabledByExtensionKind:
@@ -340,7 +348,11 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		enablementState = this._getUserEnablementState(extension.identifier);
 		const isEnabled = this.isEnabledEnablementState(enablementState);
 
-		if (isEnabled && extension.type === ExtensionType.User && this.allowedExtensionsService.isAllowed(extension) !== true) {
+		if (isMalicious(extension.identifier, this.getMaliciousExtensions())) {
+			enablementState = EnablementState.DisabledByMalicious;
+		}
+
+		else if (isEnabled && extension.type === ExtensionType.User && this.allowedExtensionsService.isAllowed(extension) !== true) {
 			enablementState = EnablementState.DisabledByAllowlist;
 		}
 
@@ -647,7 +659,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		const existingDisabledExtensions = this.extensionsDisabledExtensions;
 		this.extensionsDisabledExtensions = this.extensionsManager.extensions.filter(extension => {
 			const enablementState = this.getEnablementState(extension);
-			return enablementState === EnablementState.DisabledByExtensionDependency || enablementState === EnablementState.DisabledByAllowlist;
+			return enablementState === EnablementState.DisabledByExtensionDependency || enablementState === EnablementState.DisabledByAllowlist || enablementState === EnablementState.DisabledByMalicious;
 		});
 		for (const extension of existingDisabledExtensions) {
 			if (this.extensionsDisabledExtensions.every(e => !areSameExtensions(e.identifier, extension.identifier))) {
@@ -694,6 +706,37 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench
 		this._removeFromWorkspaceEnabledExtensions(extension);
 		this.globalExtensionEnablementService.enableExtension(extension);
 	}
+
+	private loopCheckForMaliciousExtensions(): void {
+		this.checkForMaliciousExtensions()
+			.then(() => this.delayer.trigger(() => { }, 1000 * 60 * 5)) // every five minutes
+			.then(() => this.loopCheckForMaliciousExtensions());
+	}
+
+	private async checkForMaliciousExtensions(): Promise<void> {
+		try {
+			const extensionsControlManifest = await this.extensionManagementService.getExtensionsControlManifest();
+			const changed = this.storeMaliciousExtensions(extensionsControlManifest.malicious);
+			if (changed) {
+				this._onDidChangeExtensions([], [], false);
+			}
+		} catch (err) {
+			this.logService.error(err);
+		}
+	}
+
+	private getMaliciousExtensions(): ReadonlyArray<IExtensionIdentifier | string> {
+		return this.storageService.getObject('extensionsEnablement/malicious', StorageScope.APPLICATION, []);
+	}
+
+	private storeMaliciousExtensions(extensions: ReadonlyArray<IExtensionIdentifier | string>): boolean {
+		const existing = this.getMaliciousExtensions();
+		if (equals(existing, extensions, (a, b) => !isString(a) && !isString(b) ? areSameExtensions(a, b) : a === b)) {
+			return false;
+		}
+		this.storageService.store('extensionsEnablement/malicious', JSON.stringify(extensions), StorageScope.APPLICATION, StorageTarget.MACHINE);
+		return true;
+	}
 }
 
 class ExtensionsManager extends Disposable {
diff --git a/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts b/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts
index 976d3aa1c14d..828322f4fc2b 100644
--- a/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts
+++ b/src/vs/workbench/services/extensionManagement/browser/webExtensionsScannerService.ts
@@ -175,7 +175,7 @@ export class WebExtensionsScannerService extends Disposable implements IWebExten
 		const extensionsControlManifest = await this.galleryService.getExtensionsControlManifest();
 		const result: ExtensionInfo[] = [];
 		for (const extension of extensions) {
-			if (isMalicious({ id: extension.id }, extensionsControlManifest)) {
+			if (isMalicious({ id: extension.id }, extensionsControlManifest.malicious)) {
 				this.logService.info(`Checking additional builtin extensions: Ignoring '${extension.id}' because it is reported to be malicious.`);
 				continue;
 			}
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts
index f65608c8fa70..7516276152e9 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts
@@ -106,6 +106,7 @@ export const enum EnablementState {
 	DisabledByExtensionKind,
 	DisabledByEnvironment,
 	EnabledByEnvironment,
+	DisabledByMalicious,
 	DisabledByVirtualWorkspace,
 	DisabledByInvalidExtension,
 	DisabledByAllowlist,
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
index bcf58d25cd92..75d90366ab1f 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
@@ -783,7 +783,7 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 		if (this.extensionManagementServerService.webExtensionManagementServer) {
 			return this.extensionManagementServerService.webExtensionManagementServer.extensionManagementService.getExtensionsControlManifest();
 		}
-		return Promise.resolve({ malicious: [], deprecated: {}, search: [] });
+		return this.extensionGalleryService.getExtensionsControlManifest();
 	}
 
 	private getServer(extension: ILocalExtension): IExtensionManagementServer | null {
diff --git a/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
index 65b49fb7bd12..c3e21ded56a6 100644
--- a/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
@@ -119,6 +119,10 @@ export class WebExtensionManagementService extends AbstractExtensionManagementSe
 		return this.install(location, { profileLocation });
 	}
 
+	protected async removeExtension(extension: ILocalExtension): Promise<void> {
+		// do nothing
+	}
+
 	protected async copyExtension(extension: ILocalExtension, fromProfileLocation: URI, toProfileLocation: URI, metadata: Partial<Metadata>): Promise<ILocalExtension> {
 		const target = await this.webExtensionsScannerService.scanExistingExtension(extension.location, extension.type, toProfileLocation);
 		const source = await this.webExtensionsScannerService.scanExistingExtension(extension.location, extension.type, fromProfileLocation);
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 f7c0ff78feb9..b68956b47e09 100644
--- a/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
+++ b/src/vs/workbench/services/extensionManagement/test/browser/extensionEnablementService.test.ts
@@ -4,15 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 import assert from 'assert';
 import * as sinon from 'sinon';
-import { IExtensionManagementService, DidUninstallExtensionEvent, ILocalExtension, InstallExtensionEvent, InstallExtensionResult, UninstallExtensionEvent, DidUpdateExtensionMetadata, InstallOperation, IAllowedExtensionsService, AllowedExtensionsConfigKey } from '../../../../../platform/extensionManagement/common/extensionManagement.js';
-import { IWorkbenchExtensionEnablementService, EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, ExtensionInstallLocation, IProfileAwareExtensionManagementService, DidChangeProfileEvent } from '../../common/extensionManagement.js';
+import { IExtensionManagementService, DidUninstallExtensionEvent, ILocalExtension, InstallExtensionEvent, InstallExtensionResult, UninstallExtensionEvent, DidUpdateExtensionMetadata, InstallOperation, IAllowedExtensionsService, AllowedExtensionsConfigKey, IExtensionsControlManifest } from '../../../../../platform/extensionManagement/common/extensionManagement.js';
+import { EnablementState, IExtensionManagementServerService, IExtensionManagementServer, IWorkbenchExtensionManagementService, ExtensionInstallLocation, IProfileAwareExtensionManagementService, DidChangeProfileEvent } from '../../common/extensionManagement.js';
 import { ExtensionEnablementService } from '../../browser/extensionEnablementService.js';
 import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 import { Emitter, Event } from '../../../../../base/common/event.js';
 import { IWorkspace, IWorkspaceContextService, WorkbenchState } from '../../../../../platform/workspace/common/workspace.js';
 import { IWorkbenchEnvironmentService } from '../../../environment/common/environmentService.js';
 import { IStorageService, InMemoryStorageService } from '../../../../../platform/storage/common/storage.js';
-import { IExtensionContributions, ExtensionType, IExtension, IExtensionManifest } from '../../../../../platform/extensions/common/extensions.js';
+import { IExtensionContributions, ExtensionType, IExtension, IExtensionManifest, IExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
 import { isUndefinedOrNull } from '../../../../../base/common/types.js';
 import { areSameExtensions } from '../../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
@@ -96,7 +96,8 @@ export class TestExtensionEnablementService extends ExtensionEnablementService {
 			workspaceTrustManagementService,
 			new class extends mock<IWorkspaceTrustRequestService>() { override requestWorkspaceTrust(options?: WorkspaceTrustRequestOptions): Promise<boolean> { return Promise.resolve(true); } },
 			instantiationService.get(IExtensionManifestPropertiesService) || instantiationService.stub(IExtensionManifestPropertiesService, disposables.add(new ExtensionManifestPropertiesService(TestProductService, new TestConfigurationService(), new TestWorkspaceTrustEnablementService(), new NullLogService()))),
-			instantiationService
+			instantiationService,
+			new NullLogService()
 		);
 		this._register(disposables);
 	}
@@ -125,12 +126,13 @@ suite('ExtensionEnablementService Test', () => {
 	const disposableStore = ensureNoDisposablesAreLeakedInTestSuite();
 
 	let instantiationService: TestInstantiationService;
-	let testObject: IWorkbenchExtensionEnablementService;
+	let testObject: TestExtensionEnablementService;
 
 	const didInstallEvent = new Emitter<readonly InstallExtensionResult[]>();
 	const didUninstallEvent = new Emitter<DidUninstallExtensionEvent>();
 	const didChangeProfileExtensionsEvent = new Emitter<DidChangeProfileEvent>();
 	const installed: ILocalExtension[] = [];
+	const malicious: IExtensionIdentifier[] = [];
 
 	setup(() => {
 		installed.splice(0, installed.length);
@@ -149,7 +151,14 @@ suite('ExtensionEnablementService Test', () => {
 				onDidUninstallExtension: didUninstallEvent.event,
 				onDidChangeProfile: didChangeProfileExtensionsEvent.event,
 				onProfileAwareDidInstallExtensions: Event.None,
-				getInstalled: () => Promise.resolve(installed)
+				getInstalled: () => Promise.resolve(installed),
+				async getExtensionsControlManifest(): Promise<IExtensionsControlManifest> {
+					return {
+						malicious,
+						deprecated: {},
+						search: []
+					};
+				}
 			},
 		}, null, null));
 		instantiationService.stub(ILogService, NullLogService);
@@ -1165,6 +1174,28 @@ suite('ExtensionEnablementService Test', () => {
 		assert.strictEqual(testObject.getEnablementState(target), EnablementState.DisabledByAllowlist);
 	});
 
+	test('test extension is disabled by malicious', async () => {
+		malicious.push({ id: 'malicious.extensionA' });
+		testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService));
+		await (<TestExtensionEnablementService>testObject).waitUntilInitialized();
+		const target = aLocalExtension2('malicious.extensionA');
+		assert.strictEqual(testObject.getEnablementState(target), EnablementState.DisabledByMalicious);
+	});
+
+	test('test installed malicious extension triggers change event', async () => {
+		testObject.dispose();
+		malicious.push({ id: 'malicious.extensionB' });
+		const local = aLocalExtension2('malicious.extensionB');
+		installed.push(local);
+		testObject = disposableStore.add(new TestExtensionEnablementService(instantiationService));
+		assert.strictEqual(testObject.getEnablementState(local), EnablementState.EnabledGlobally);
+		const promise = Event.toPromise(testObject.onEnablementChanged);
+
+		const result = await promise;
+		assert.deepStrictEqual(result[0], local);
+		assert.strictEqual(testObject.getEnablementState(local), EnablementState.DisabledByMalicious);
+	});
+
 });
 
 function anExtensionManagementServer(authority: string, instantiationService: TestInstantiationService): IExtensionManagementServer {

From aac9914f93551f894b8df1e4680bd847e7636be3 Mon Sep 17 00:00:00 2001
From: Bhavya U <bhavyau@microsoft.com>
Date: Thu, 6 Mar 2025 10:31:48 -0800
Subject: [PATCH 0681/1815] Update workspace trust command (#242828)

---
 .../welcomeGettingStarted/common/gettingStartedContent.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
index 5b01dd409146..370cf7bcfa0e 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
@@ -632,7 +632,7 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 				{
 					id: 'workspaceTrust',
 					title: localize('gettingStarted.workspaceTrust.title', "Safely browse and edit code"),
-					description: localize('gettingStarted.workspaceTrust.description.interpolated', "{0} lets you decide whether your project folders should **allow or restrict** automatic code execution __(required for extensions, debugging, etc)__.\nOpening a file/folder will prompt to grant trust. You can always {1} later.", Button(localize('workspaceTrust', "Workspace Trust"), 'https://code.visualstudio.com/docs/editor/workspace-trust'), Button(localize('enableTrust', "enable trust"), 'command:toSide:workbench.action.manageTrustedDomain')),
+					description: localize('gettingStarted.workspaceTrust.description.interpolated', "{0} lets you decide whether your project folders should **allow or restrict** automatic code execution __(required for extensions, debugging, etc)__.\nOpening a file/folder will prompt to grant trust. You can always {1} later.", Button(localize('workspaceTrust', "Workspace Trust"), 'https://code.visualstudio.com/docs/editor/workspace-trust'), Button(localize('enableTrust', "enable trust"), 'command:toSide:workbench.trust.manage')),
 					when: 'workspacePlatform != \'webworker\' && !isWorkspaceTrusted && workspaceFolderCount == 0',
 					media: {
 						type: 'svg', altText: 'Workspace Trust editor in Restricted mode and a primary button for switching to Trusted mode.', path: 'workspaceTrust.svg'

From 3451266030d87dc48f89e9a837c2feb4a7be8df6 Mon Sep 17 00:00:00 2001
From: Bhavya U <bhavyau@microsoft.com>
Date: Thu, 6 Mar 2025 12:44:00 -0800
Subject: [PATCH 0682/1815] Add alt text support for videos in Getting Started
 page (#242840)

---
 .../contrib/welcomeGettingStarted/browser/gettingStarted.ts | 6 +++---
 .../browser/gettingStartedDetailsRenderer.ts                | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
index 143018f6cc58..18322a787ac6 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
@@ -719,8 +719,8 @@ export class GettingStartedPage extends EditorPane {
 			const themeType = this.themeService.getColorTheme().type;
 			const videoPath = media.path[themeType];
 			const videoPoster = media.poster ? media.poster[themeType] : undefined;
-
-			const rawHTML = await this.detailsRenderer.renderVideo(videoPath, videoPoster);
+			const altText = media.altText ? media.altText : localize('videoAltText', "Video for {0}", stepToExpand.title);
+			const rawHTML = await this.detailsRenderer.renderVideo(videoPath, videoPoster, altText);
 			this.webview.setHtml(rawHTML);
 
 			let isDisposed = false;
@@ -731,7 +731,7 @@ export class GettingStartedPage extends EditorPane {
 				const themeType = this.themeService.getColorTheme().type;
 				const videoPath = media.path[themeType];
 				const videoPoster = media.poster ? media.poster[themeType] : undefined;
-				const body = await this.detailsRenderer.renderVideo(videoPath, videoPoster);
+				const body = await this.detailsRenderer.renderVideo(videoPath, videoPoster, altText);
 
 				if (!isDisposed) { // Make sure we weren't disposed of in the meantime
 					this.webview.setHtml(body);
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts
index 9490776109bd..1ca5db0b86b9 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts
@@ -201,7 +201,7 @@ export class GettingStartedDetailsRenderer {
 		</html>`;
 	}
 
-	async renderVideo(path: URI, poster?: URI): Promise<string> {
+	async renderVideo(path: URI, poster?: URI, description?: string): Promise<string> {
 		const nonce = generateUuid();
 
 		return `<!DOCTYPE html>
@@ -218,7 +218,7 @@ export class GettingStartedDetailsRenderer {
 				</style>
 			</head>
 			<body>
-				<video controls autoplay ${poster ? `poster="${poster?.toString(true)}"` : ''} muted>
+				<video controls autoplay ${poster ? `poster="${poster.toString(true)}"` : ''} muted ${description ? `aria-label="${description}"` : ''}>
 					<source src="${path.toString(true)}" type="video/mp4">
 				</video>
 			</body>

From a20e37209b28a2e3b1679b4210d333e737473839 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Fri, 7 Mar 2025 09:22:14 +0900
Subject: [PATCH 0683/1815] fix: crash on linux with 16KB page size (#242851)

---
 src/main.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main.ts b/src/main.ts
index c132c9b8b9bb..11ead39bd9e7 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -522,6 +522,14 @@ function getJSFlags(cliArgs: NativeParsedArgs): string | null {
 		jsFlags.push(cliArgs['js-flags']);
 	}
 
+	if (process.platform === 'linux') {
+		// Fix cppgc crash on Linux with 16KB page size.
+		// Refs https://issues.chromium.org/issues/378017037
+		// TODO(deepak1556): Remove this once we update to
+		// Chromium >= 134.
+		jsFlags.push('--nodecommit_pooled_pages');
+	}
+
 	return jsFlags.length > 0 ? jsFlags.join(' ') : null;
 }
 

From b36626a123e336d5c55bc79e7582dd5fed673f3a Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Fri, 7 Mar 2025 14:08:28 +1100
Subject: [PATCH 0684/1815] Deserialize nb content textedits into notebook
 edits (#242853)

---
 .../chatEditingModifiedNotebookEntry.ts       | 28 +++++-
 .../chatEditingNewNotebookContentEdits.ts     | 86 +++++++++++++++++++
 2 files changed, 110 insertions(+), 4 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNewNotebookContentEdits.ts

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index 72149a29c116..f0d2928bad2c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -46,6 +46,7 @@ import { IChatResponseModel } from '../../common/chatModel.js';
 import { IChatService } from '../../common/chatService.js';
 import { AbstractChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISnapshotEntry } from './chatEditingModifiedFileEntry.js';
 import { createSnapshot, deserializeSnapshot, getNotebookSnapshotFileURI, restoreSnapshot, SnapshotComparer } from './notebook/chatEditingModifiedNotebookSnapshot.js';
+import { ChatEditingNewNotebookContentEdits } from './notebook/chatEditingNewNotebookContentEdits.js';
 import { ChatEditingNotebookCellEntry } from './notebook/chatEditingNotebookCellEntry.js';
 import { ChatEditingNotebookDiffEditorIntegration, ChatEditingNotebookEditorIntegration } from './notebook/chatEditingNotebookEditorIntegration.js';
 import { ChatEditingNotebookFileSystemProvider } from './notebook/chatEditingNotebookFileSystemProvider.js';
@@ -441,6 +442,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		return new SnapshotComparer(snapshot).isEqual(this.modifiedModel);
 	}
 
+	private newNotebookEditGenerator?: ChatEditingNewNotebookContentEdits;
 	override async acceptAgentEdits(resource: URI, edits: (TextEdit | ICellEditOperation)[], isLastEdits: boolean, responseModel: IChatResponseModel): Promise<void> {
 		const isCellUri = resource.scheme === Schemas.vscodeNotebookCell;
 		const cell = isCellUri && this.modifiedModel.cells.find(cell => isEqual(cell.uri, resource));
@@ -470,12 +472,22 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		await this._applyEdits(async () => {
 			edits.map(edit => {
 				if (TextEdit.isTextEdit(edit)) {
-					if (!this.editedCells.has(resource)) {
-						finishPreviousCells();
-						this.editedCells.add(resource);
+					// Possible we're getting the raw content for the notebook.
+					if (isEqual(resource, this.modifiedModel.uri)) {
+						this.newNotebookEditGenerator ??= this._instantiationService.createInstance(ChatEditingNewNotebookContentEdits, this.modifiedModel);
+						this.newNotebookEditGenerator.acceptTextEdits([edit]);
+					} else {
+						// If we get cell edits, its impossible to get text edits for the notebook uri.
+						this.newNotebookEditGenerator = undefined;
+						if (!this.editedCells.has(resource)) {
+							finishPreviousCells();
+							this.editedCells.add(resource);
+						}
+						cellEntry?.acceptAgentEdits([edit], isLastEdits, responseModel);
 					}
-					cellEntry?.acceptAgentEdits([edit], isLastEdits, responseModel);
 				} else {
+					// If we notebook edits, its impossible to get text edits for the notebook uri.
+					this.newNotebookEditGenerator = undefined;
 					this.acceptNotebookEdit(edit);
 				}
 			});
@@ -490,6 +502,14 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		// It cannot be true for the notebook itself.
 		isLastEdits = !isCellUri && isLastEdits;
 
+		// If this is the last edit and & we got regular text edits for generating new notebook content
+		// Then generate notebook edits from those text edits & apply those notebook edits.
+		if (isLastEdits && this.newNotebookEditGenerator) {
+			const notebookEdits = await this.newNotebookEditGenerator.generateEdits();
+			this.newNotebookEditGenerator = undefined;
+			notebookEdits.forEach(edit => this.acceptNotebookEdit(edit));
+		}
+
 		transaction((tx) => {
 			if (!isLastEdits) {
 				this._stateObs.set(WorkingSetEntryState.Modified, tx);
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNewNotebookContentEdits.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNewNotebookContentEdits.ts
new file mode 100644
index 000000000000..b516adce76ef
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNewNotebookContentEdits.ts
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { VSBuffer } from '../../../../../../base/common/buffer.js';
+import { TextEdit } from '../../../../../../editor/common/languages.js';
+import { NotebookTextModel } from '../../../../notebook/common/model/notebookTextModel.js';
+import { CellEditType, ICellEditOperation } from '../../../../notebook/common/notebookCommon.js';
+import { INotebookService } from '../../../../notebook/common/notebookService.js';
+
+
+/**
+ * When asking LLM to generate a new notebook, LLM might end up generating the notebook
+ * using the raw file format.
+ * E.g. assume we ask LLM to generate a new Github Issues notebook, LLM might end up
+ * genrating the notebook using the JSON format of github issues file.
+ * Such a format is not known to copilot extension and those are sent over as regular
+ * text edits for the Notebook URI.
+ *
+ * In such cases we should accumulate all of the edits, generate the content and deserialize the content
+ * into a notebook, then generate notebooke edits to insert these cells.
+ */
+export class ChatEditingNewNotebookContentEdits {
+	private readonly textEdits: TextEdit[] = [];
+	constructor(
+		private readonly notebook: NotebookTextModel,
+		@INotebookService private readonly _notebookService: INotebookService,
+	) {
+	}
+
+	acceptTextEdits(edits: TextEdit[]): void {
+		if (edits.length) {
+			this.textEdits.push(...edits);
+		}
+	}
+
+	async generateEdits(): Promise<ICellEditOperation[]> {
+		if (this.notebook.cells.length) {
+			console.error(`Notebook edits not generated as notebook already has cells`);
+			return [];
+		}
+		const content = this.generateContent();
+		if (!content) {
+			return [];
+		}
+
+		const notebookEdits: ICellEditOperation[] = [];
+		try {
+			const { serializer } = await this._notebookService.withNotebookDataProvider(this.notebook.viewType);
+			const data = await serializer.dataToNotebook(VSBuffer.fromString(content));
+			for (let i = 0; i < data.cells.length; i++) {
+				notebookEdits.push({
+					editType: CellEditType.Replace,
+					index: i,
+					count: 0,
+					cells: [data.cells[i]]
+				});
+			}
+		} catch (ex) {
+			console.error(`Failed to generate notebook edits from text edits ${content}`, ex);
+			return [];
+		}
+
+		return notebookEdits;
+	}
+
+	private generateContent() {
+		try {
+			return applyTextEdits(this.textEdits);
+		} catch (ex) {
+			console.error('Failed to generate content from text edits', ex);
+			return '';
+		}
+	}
+}
+
+function applyTextEdits(edits: TextEdit[]): string {
+	let output = '';
+	for (const edit of edits) {
+		output = output.slice(0, edit.range.startColumn)
+			+ edit.text
+			+ output.slice(edit.range.endColumn);
+	}
+	return output;
+}

From 2b3cb533550639a43a144968b07576998a880718 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Fri, 7 Mar 2025 15:19:50 +1100
Subject: [PATCH 0685/1815] Ensure notebook/cells are readonly when applying
 edits (#242849)

---
 .../chatEditingNotebookEditorIntegration.ts   | 63 ++++++++++++++++---
 1 file changed, 55 insertions(+), 8 deletions(-)

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 ebb8ccbf4b48..e057d1b3982e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
@@ -15,9 +15,9 @@ import { IResourceDiffEditorInput } from '../../../../../common/editor.js';
 import { IEditorService } from '../../../../../services/editor/common/editorService.js';
 import { NotebookDeletedCellDecorator } from '../../../../notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.js';
 import { NotebookInsertedCellDecorator } from '../../../../notebook/browser/diff/inlineDiff/notebookInsertedCellDecorator.js';
-import { NotebookModifiedCellDecorator } from '../../../../notebook/browser/diff/inlineDiff/notebookModifiedCellDecorator.js';
 import { INotebookTextDiffEditor } from '../../../../notebook/browser/diff/notebookDiffEditorBrowser.js';
 import { INotebookEditor } from '../../../../notebook/browser/notebookBrowser.js';
+import { INotebookEditorService } from '../../../../notebook/browser/services/notebookEditorService.js';
 import { NotebookCellTextModel } from '../../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../../notebook/common/model/notebookTextModel.js';
 import { ChatAgentLocation, IChatAgentService } from '../../../common/chatAgents.js';
@@ -29,7 +29,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 	private readonly _currentIndex = observableValue(this, -1);
 	readonly currentIndex: IObservable<number> = this._currentIndex;
 
-	// TODO@DonJayamanne For now we're going to ignore being able to focus on a deleted cell.
+	// TODO@amunger For now we're going to ignore being able to focus on a deleted cell.
 	private readonly _currentCell = observableValue<NotebookCellTextModel | undefined>(this, undefined);
 	readonly currentCell: IObservable<NotebookCellTextModel | undefined> = this._currentCell;
 
@@ -38,7 +38,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 
 	private readonly cellEditorIntegrations = new Map<NotebookCellTextModel, { integration: ChatEditingCodeEditorIntegration; diff: ISettableObservable<IDocumentDiff2> }>();
 
-	private readonly insertDeleteDecorators: IObservable<{ insertedCellDecorator: NotebookInsertedCellDecorator; modifiedCellDecorator: NotebookModifiedCellDecorator; deletedCellDecorator: NotebookDeletedCellDecorator } | undefined>;
+	private readonly insertDeleteDecorators: IObservable<{ insertedCellDecorator: NotebookInsertedCellDecorator; deletedCellDecorator: NotebookDeletedCellDecorator } | undefined>;
 
 	constructor(
 		private readonly _entry: IModifiedFileEntry,
@@ -49,12 +49,32 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IEditorService private readonly _editorService: IEditorService,
 		@IChatAgentService private readonly _chatAgentService: IChatAgentService,
+		@INotebookEditorService notebookEditorService: INotebookEditorService,
 	) {
 		super();
 
 		const onDidChangeVisibleRanges = debouncedObservable(observableFromEvent(notebookEditor.onDidChangeVisibleRanges, () => notebookEditor.visibleRanges), 50);
 		const notebookEdotirViewModelAttached = observableFromEvent(notebookEditor.onDidAttachViewModel, () => notebookEditor.getViewModel());
 
+		let originalReadonly: boolean | undefined = undefined;
+		const shouldBeReadonly = _entry.isCurrentlyBeingModifiedBy.map(value => !!value);
+		this._register(autorun(r => {
+			const isReadOnly = shouldBeReadonly.read(r);
+			const notebookEditor = notebookEditorService.retrieveExistingWidgetFromURI(_entry.modifiedURI)?.value;
+			if (!notebookEditor) {
+				return;
+			}
+			originalReadonly ??= notebookEditor.isReadOnly;
+			if (isReadOnly) {
+				if (!notebookEditor.isReadOnly) {
+					notebookEditor.setOptions({ isReadOnly: true });
+				}
+			} else {
+				if (notebookEditor.isReadOnly && originalReadonly === false) {
+					notebookEditor.setOptions({ isReadOnly: false });
+				}
+			}
+		}));
 
 		// INIT current index when: enabled, not streaming anymore, once per request, and when having changes
 		let lastModifyingRequestId: string | undefined;
@@ -82,7 +102,7 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 		this._register(autorun(r => {
 			const sortedCellChanges = sortCellChanges(cellChanges.read(r));
 
-			const changes = sortedCellChanges.filter(c => c.type !== 'unchanged' && c.type !== 'delete' && !c.diff.read(r).identical);
+			const changes = sortedCellChanges.filter(c => c.type !== 'delete');
 			onDidChangeVisibleRanges.read(r);
 			if (!changes.length) {
 				this.cellEditorIntegrations.forEach(({ diff }) => {
@@ -114,7 +134,9 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 				const currentDiff = this.cellEditorIntegrations.get(cell);
 				if (currentDiff) {
 					// Do not unnecessarily trigger a change event
-					currentDiff.diff.set(diff, undefined);
+					if (!areDocumentDiff2Equal(currentDiff.diff.get(), diff)) {
+						currentDiff.diff.set(diff, undefined);
+					}
 				} else {
 					const diff2 = observableValue(`diff${cell.handle}`, diff);
 					const integration = this.instantiationService.createInstance(ChatEditingCodeEditorIntegration, _entry, editor, diff2);
@@ -179,7 +201,6 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 			}
 
 			const insertedCellDecorator = store.add(this.instantiationService.createInstance(NotebookInsertedCellDecorator, this.notebookEditor));
-			const modifiedCellDecorator = store.add(this.instantiationService.createInstance(NotebookModifiedCellDecorator, this.notebookEditor));
 			const deletedCellDecorator = store.add(this.instantiationService.createInstance(NotebookDeletedCellDecorator, this.notebookEditor, {
 				className: 'chat-diff-change-content-widget',
 				telemetrySource: 'chatEditingNotebookHunk',
@@ -206,7 +227,6 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 
 			return {
 				insertedCellDecorator,
-				modifiedCellDecorator,
 				deletedCellDecorator
 			};
 		});
@@ -220,7 +240,6 @@ export class ChatEditingNotebookEditorIntegration extends Disposable implements
 			const decorators = debouncedObservable(this.insertDeleteDecorators, 10).read(r);
 			if (decorators) {
 				decorators.insertedCellDecorator.apply(changes);
-				decorators.modifiedCellDecorator.apply(changes);
 				decorators.deletedCellDecorator.apply(changes, originalModel);
 			}
 		}));
@@ -528,3 +547,31 @@ export class ChatEditingNotebookDiffEditorIntegration extends Disposable impleme
 		//
 	}
 }
+
+function areDocumentDiff2Equal(diff1: IDocumentDiff2, diff2: IDocumentDiff2): boolean {
+	if (diff1.changes !== diff2.changes) {
+		return false;
+	}
+	if (diff1.identical !== diff2.identical) {
+		return false;
+	}
+	if (diff1.moves !== diff2.moves) {
+		return false;
+	}
+	if (diff1.originalModel !== diff2.originalModel) {
+		return false;
+	}
+	if (diff1.modifiedModel !== diff2.modifiedModel) {
+		return false;
+	}
+	if (diff1.keep !== diff2.keep) {
+		return false;
+	}
+	if (diff1.undo !== diff2.undo) {
+		return false;
+	}
+	if (diff1.quitEarly !== diff2.quitEarly) {
+		return false;
+	}
+	return true;
+}

From f29401eee82c743f54873a57deb70c8a2dd1fc0d Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 7 Mar 2025 05:21:45 -0800
Subject: [PATCH 0686/1815] Create a strong tie between exthost and renderer
 executions

This also makes the .shellIntegration extension API only available when rich command
detection is reported from the shell. This will cause it to stop working now for some
shells as they don't report this special sequence, but it's the only way we can get a
reliably signal since we must know if the terminal will report the E sequence ahead of
time and we cannot know that without executing something.

Part of #242195
---
 .../common/capabilities/capabilities.ts       |  3 ++
 .../commandDetectionCapability.ts             | 13 ++++++
 .../terminal/common/terminalRecorder.ts       |  1 +
 .../common/xterm/shellIntegrationAddon.ts     | 13 +++++-
 .../mainThreadTerminalShellIntegration.ts     |  9 +++-
 .../common/extHostTerminalShellIntegration.ts | 44 ++++++++++++-------
 .../common/scripts/shellIntegration.ps1       |  1 +
 7 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/src/vs/platform/terminal/common/capabilities/capabilities.ts b/src/vs/platform/terminal/common/capabilities/capabilities.ts
index 1b6f70a42637..4d82757b0621 100644
--- a/src/vs/platform/terminal/common/capabilities/capabilities.ts
+++ b/src/vs/platform/terminal/common/capabilities/capabilities.ts
@@ -214,6 +214,7 @@ export interface ICommandDetectionCapability {
 	readonly executingCommandConfidence: 'low' | 'medium' | 'high' | undefined;
 	/** The current cwd at the cursor's position. */
 	readonly cwd: string | undefined;
+	readonly hasRichCommandDetection: boolean;
 	readonly currentCommand: ICurrentPartialCommand | undefined;
 	readonly onCommandStarted: Event<ITerminalCommand>;
 	readonly onCommandFinished: Event<ITerminalCommand>;
@@ -239,6 +240,7 @@ export interface ICommandDetectionCapability {
 	handleCommandStart(options?: IHandleCommandOptions): void;
 	handleCommandExecuted(options?: IHandleCommandOptions): void;
 	handleCommandFinished(exitCode?: number, options?: IHandleCommandOptions): void;
+	setHasRichCommandDetection(value: boolean): void;
 	/**
 	 * Set the command line explicitly.
 	 * @param commandLine The command line being set.
@@ -345,6 +347,7 @@ export interface IMarkProperties {
 }
 export interface ISerializedCommandDetectionCapability {
 	isWindowsPty: boolean;
+	hasRichCommandDetection: boolean;
 	commands: ISerializedTerminalCommand[];
 	promptInputModel: ISerializedPromptInputModel | undefined;
 }
diff --git a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
index 852d6a46115b..b0782aefba82 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
@@ -33,6 +33,8 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 	private _dimensions: ITerminalDimensions;
 	private __isCommandStorageDisabled: boolean = false;
 	private _handleCommandStartOptions?: IHandleCommandOptions;
+	private _hasRichCommandDetection: boolean = false;
+	get hasRichCommandDetection() { return this._hasRichCommandDetection; }
 
 	private _ptyHeuristicsHooks: ICommandDetectionHeuristicsHooks;
 	private readonly _ptyHeuristics: MandatoryMutableDisposable<IPtyHeuristics>;
@@ -71,6 +73,8 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 	readonly onCommandInvalidated = this._onCommandInvalidated.event;
 	private readonly _onCurrentCommandInvalidated = this._register(new Emitter<ICommandInvalidationRequest>());
 	readonly onCurrentCommandInvalidated = this._onCurrentCommandInvalidated.event;
+	private readonly _onSetRichCommandDetection = this._register(new Emitter<void>());
+	readonly onSetRichCommandDetection = this._onSetRichCommandDetection.event;
 
 	constructor(
 		private readonly _terminal: Terminal,
@@ -223,6 +227,11 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 		}
 	}
 
+	setHasRichCommandDetection(value: boolean): void {
+		this._hasRichCommandDetection = value;
+		this._onSetRichCommandDetection.fire();
+	}
+
 	setIsCommandStorageDisabled(): void {
 		this.__isCommandStorageDisabled = true;
 	}
@@ -403,6 +412,7 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 		}
 		return {
 			isWindowsPty: this._ptyHeuristics.value instanceof WindowsPtyHeuristics,
+			hasRichCommandDetection: this._hasRichCommandDetection,
 			commands,
 			promptInputModel: this._promptInputModel.serialize(),
 		};
@@ -412,6 +422,9 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 		if (serialized.isWindowsPty) {
 			this.setIsWindowsPty(serialized.isWindowsPty);
 		}
+		if (serialized.hasRichCommandDetection) {
+			this.setHasRichCommandDetection(serialized.hasRichCommandDetection);
+		}
 		const buffer = this._terminal.buffer.normal;
 		for (const e of serialized.commands) {
 			// Partial command
diff --git a/src/vs/platform/terminal/common/terminalRecorder.ts b/src/vs/platform/terminal/common/terminalRecorder.ts
index 18026ca1ad76..1f924f3192ab 100644
--- a/src/vs/platform/terminal/common/terminalRecorder.ts
+++ b/src/vs/platform/terminal/common/terminalRecorder.ts
@@ -91,6 +91,7 @@ export class TerminalRecorder {
 			// No command restoration is needed when relaunching terminals
 			commands: {
 				isWindowsPty: false,
+				hasRichCommandDetection: false,
 				commands: [],
 				promptInputModel: undefined,
 			}
diff --git a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
index eed96c0f8f22..5019a0c57318 100644
--- a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
+++ b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
@@ -204,11 +204,15 @@ const enum VSCodeOscPt {
 	 * Known properties:
 	 *
 	 * - `Cwd` - Reports the current working directory to the terminal.
-	 * - `IsWindows` - Indicates whether the terminal is using a Windows backend like winpty or
-	 *   conpty. This may be used to enable additional heuristics as the positioning of the shell
+	 * - `IsWindows` - Reports whether the shell is using a Windows backend like winpty or 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
 	 *   multi-line inputs.
+	 * - `HasRichCmdDetection` - Reports whether the shell has rich command line detection, meaning
+	 *   that sequences A, B, C, D and E are exactly where they're meant to be. In particular,
+	 *   {@link CommandLine} must happen immediately before {@link CommandExecuted} so VS Code knows
+	 *   the command line when the execution begins.
 	 *
 	 * WARNING: Any other properties may be changed and are not guaranteed to work in the future.
 	 */
@@ -553,6 +557,10 @@ export class ShellIntegrationAddon extends Disposable implements IShellIntegrati
 						this._createOrGetCommandDetection(this._terminal).setIsWindowsPty(value === 'True' ? true : false);
 						return true;
 					}
+					case 'HasRichCmdDetection': {
+						this._createOrGetCommandDetection(this._terminal).setHasRichCommandDetection(value === 'True' ? true : false);
+						return true;
+					}
 					case 'Prompt': {
 						// Remove escape sequences from the user's prompt
 						const sanitizedValue = value.replace(/\x1b\[[0-9;]*m/g, '');
@@ -680,6 +688,7 @@ export class ShellIntegrationAddon extends Disposable implements IShellIntegrati
 		if (!this._terminal || !this.capabilities.has(TerminalCapability.CommandDetection)) {
 			return {
 				isWindowsPty: false,
+				hasRichCommandDetection: false,
 				commands: [],
 				promptInputModel: undefined,
 			};
diff --git a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
index 44cc83b1116e..6f158b42f780 100644
--- a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
@@ -35,7 +35,8 @@ export class MainThreadTerminalShellIntegration extends Disposable implements Ma
 
 		// onDidchangeTerminalShellIntegration initial state
 		for (const terminal of this._terminalService.instances) {
-			if (terminal.capabilities.has(TerminalCapability.CommandDetection)) {
+			const cmdDetection = terminal.capabilities.get(TerminalCapability.CommandDetection);
+			if (cmdDetection?.hasRichCommandDetection) {
 				this._proxy.$shellIntegrationChange(terminal.instanceId);
 				const cwdDetection = terminal.capabilities.get(TerminalCapability.CwdDetection);
 				if (cwdDetection) {
@@ -48,7 +49,11 @@ export class MainThreadTerminalShellIntegration extends Disposable implements Ma
 		const onDidAddCommandDetection = this._store.add(this._terminalService.createOnInstanceEvent(instance => {
 			return Event.map(
 				Event.filter(instance.capabilities.onDidAddCapabilityType, e => {
-					return e === TerminalCapability.CommandDetection || e === TerminalCapability.CwdDetection;
+					if (e !== TerminalCapability.CommandDetection) {
+						return false;
+					}
+					const cmdDetection = instance.capabilities.get(TerminalCapability.CommandDetection);
+					return !!cmdDetection?.hasRichCommandDetection;
 				}), () => instance
 			);
 		})).event;
diff --git a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
index c2d7b9e31729..59f925fa04e5 100644
--- a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
@@ -110,6 +110,7 @@ export class ExtHostTerminalShellIntegration extends Disposable implements IExtH
 		if (!this._activeShellIntegrations.has(instanceId)) {
 			this.$shellIntegrationChange(instanceId);
 		}
+		// TODO: Map this command line to a previously created shell execution, if it's found do not create a new one
 		const commandLine: vscode.TerminalShellExecutionCommandLine = {
 			value: commandLineValue,
 			confidence: commandLineConfidence,
@@ -147,10 +148,11 @@ export class ExtHostTerminalShellIntegration extends Disposable implements IExtH
 }
 
 class InternalTerminalShellIntegration extends Disposable {
+	private _activeExecutions: InternalTerminalShellExecution[] = [];
+
 	private _currentExecution: InternalTerminalShellExecution | undefined;
 	get currentExecution(): InternalTerminalShellExecution | undefined { return this._currentExecution; }
 
-	private _ignoreNextExecution: boolean = false;
 	private _env: vscode.TerminalShellIntegrationEnvironment | undefined;
 	private _cwd: URI | undefined;
 
@@ -164,6 +166,8 @@ class InternalTerminalShellIntegration extends Disposable {
 	readonly onDidRequestShellExecution = this._onDidRequestShellExecution.event;
 	protected readonly _onDidRequestEndExecution = this._register(new Emitter<vscode.TerminalShellExecutionEndEvent>());
 	readonly onDidRequestEndExecution = this._onDidRequestEndExecution.event;
+	protected readonly _onDidRequestNewExecution = this._register(new Emitter<string>());
+	readonly onDidRequestNewExecution = this._onDidRequestNewExecution.event;
 
 	constructor(
 		private readonly _terminal: vscode.Terminal,
@@ -202,29 +206,35 @@ class InternalTerminalShellIntegration extends Disposable {
 					confidence: TerminalShellExecutionCommandLineConfidence.High,
 					isTrusted: true
 				};
-				const execution = that.startShellExecution(commandLine, that._cwd, true).value;
-				that._ignoreNextExecution = true;
+				const execution = that.requestNewShellExecution(commandLine, that._cwd).value;
 				return execution;
 			}
 		};
 	}
 
-	startShellExecution(commandLine: vscode.TerminalShellExecutionCommandLine, cwd: URI | undefined, fireEventInMicrotask?: boolean): InternalTerminalShellExecution {
-		if (this._ignoreNextExecution && this._currentExecution) {
-			this._ignoreNextExecution = false;
-		} else {
-			if (this._currentExecution) {
-				this._currentExecution.endExecution(undefined);
-				this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value, exitCode: undefined });
-			}
+	requestNewShellExecution(commandLine: vscode.TerminalShellExecutionCommandLine, cwd: URI | undefined) {
+		const execution = new InternalTerminalShellExecution(commandLine, cwd ?? this._cwd);
+		this._activeExecutions.push(execution);
+		this._onDidRequestNewExecution.fire(commandLine.value);
+		return execution;
+	}
+
+	startShellExecution(commandLine: vscode.TerminalShellExecutionCommandLine, cwd: URI | undefined): InternalTerminalShellExecution {
+		if (this._currentExecution) {
+			// TODO: Should we log when this happens?
+			this._currentExecution.endExecution(undefined);
+			this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value, exitCode: undefined });
+		}
+		// TODO: Should we check all of them and log a error when one that is not [0] is started?
+		let currentExecution = this._activeExecutions.find(e => e.value.commandLine.value === commandLine.value);
+		if (!currentExecution) {
 			// Fallback to the shell integration's cwd as the cwd may not have been restored after a reload
-			const currentExecution = this._currentExecution = new InternalTerminalShellExecution(commandLine, cwd ?? this._cwd);
-			if (fireEventInMicrotask) {
-				queueMicrotask(() => this._onDidStartTerminalShellExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: currentExecution.value }));
-			} else {
-				this._onDidStartTerminalShellExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value });
-			}
+			currentExecution = new InternalTerminalShellExecution(commandLine, cwd ?? this._cwd);
 		}
+
+		this._currentExecution = currentExecution;
+
+		this._onDidStartTerminalShellExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value });
 		return this._currentExecution;
 	}
 
diff --git a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1 b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
index de5e863b7db3..62ebb339fe0b 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
@@ -124,6 +124,7 @@ function Global:Prompt() {
 # Only send the command executed sequence when PSReadLine is loaded, if not shell integration should
 # still work thanks to the command line sequence
 if (Get-Module -Name PSReadLine) {
+	[Console]::Write("$([char]0x1b)]633;P;HasRichCmdDetection=True`a")
 	$__VSCodeOriginalPSConsoleHostReadLine = $function:PSConsoleHostReadLine
 	function Global:PSConsoleHostReadLine {
 		$CommandLine = $__VSCodeOriginalPSConsoleHostReadLine.Invoke()

From d43bf10526c8058e820856ba2580faa3cac3cee2 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 7 Mar 2025 05:26:57 -0800
Subject: [PATCH 0687/1815] Add new sequence to other shell integration scripts

---
 .../terminal/common/xterm/shellIntegrationAddon.ts     | 10 +++++-----
 .../terminal/common/scripts/shellIntegration-bash.sh   |  3 +++
 .../terminal/common/scripts/shellIntegration-rc.zsh    |  3 +++
 .../terminal/common/scripts/shellIntegration.fish      |  4 ++++
 .../terminal/common/scripts/shellIntegration.ps1       |  2 +-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
index 5019a0c57318..19358af3b487 100644
--- a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
+++ b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
@@ -209,10 +209,10 @@ const enum VSCodeOscPt {
 	 *   integration sequences are not guaranteed to be correct. Valid values: `True`, `False`.
 	 * - `ContinuationPrompt` - Reports the continuation prompt that is printed at the start of
 	 *   multi-line inputs.
-	 * - `HasRichCmdDetection` - Reports whether the shell has rich command line detection, meaning
-	 *   that sequences A, B, C, D and E are exactly where they're meant to be. In particular,
-	 *   {@link CommandLine} must happen immediately before {@link CommandExecuted} so VS Code knows
-	 *   the command line when the execution begins.
+	 * - `HasRichCommandDetection` - Reports whether the shell has rich command line detection,
+	 *   meaning that sequences A, B, C, D and E are exactly where they're meant to be. In
+	 *   particular, {@link CommandLine} must happen immediately before {@link CommandExecuted} so
+	 *   VS Code knows the command line when the execution begins.
 	 *
 	 * WARNING: Any other properties may be changed and are not guaranteed to work in the future.
 	 */
@@ -557,7 +557,7 @@ export class ShellIntegrationAddon extends Disposable implements IShellIntegrati
 						this._createOrGetCommandDetection(this._terminal).setIsWindowsPty(value === 'True' ? true : false);
 						return true;
 					}
-					case 'HasRichCmdDetection': {
+					case 'HasRichCommandDetection': {
 						this._createOrGetCommandDetection(this._terminal).setHasRichCommandDetection(value === 'True' ? true : false);
 						return true;
 					}
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 b5f2e1f53250..86015654e38a 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-bash.sh
@@ -198,6 +198,9 @@ if [ "$__vsc_stable" = "0" ]; then
 	builtin printf "\e]633;P;ContinuationPrompt=$(echo "$PS2" | sed 's/\x1b/\\\\x1b/g')\a"
 fi
 
+# Report this shell supports rich command detection
+builtin printf '\e]633;P;HasRichCommandDetection=True\a'
+
 __vsc_report_prompt() {
 	# Expand the original PS1 similarly to how bash would normally
 	# See https://stackoverflow.com/a/37137981 for technique
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 43738d95a187..50f859af05c4 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration-rc.zsh
@@ -112,6 +112,9 @@ unset VSCODE_NONCE
 __vscode_shell_env_reporting="$VSCODE_SHELL_ENV_REPORTING"
 unset VSCODE_SHELL_ENV_REPORTING
 
+# Report this shell supports rich command detection
+builtin printf '\e]633;P;HasRichCommandDetection=True\a'
+
 __vsc_prompt_start() {
 	builtin printf '\e]633;A\a'
 }
diff --git a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish
index e67701b03b95..f1ef2bd6c6eb 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.fish
@@ -207,4 +207,8 @@ function __init_vscode_shell_integration
 		end
 	end
 end
+
+# Report this shell supports rich command detection
+__vsc_esc P HasRichCommandDetection=True
+
 __preserve_fish_prompt
diff --git a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1 b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
index 62ebb339fe0b..d2e2b0aef618 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
@@ -124,7 +124,7 @@ function Global:Prompt() {
 # Only send the command executed sequence when PSReadLine is loaded, if not shell integration should
 # still work thanks to the command line sequence
 if (Get-Module -Name PSReadLine) {
-	[Console]::Write("$([char]0x1b)]633;P;HasRichCmdDetection=True`a")
+	[Console]::Write("$([char]0x1b)]633;P;HasRichCommandDetection=True`a")
 	$__VSCodeOriginalPSConsoleHostReadLine = $function:PSConsoleHostReadLine
 	function Global:PSConsoleHostReadLine {
 		$CommandLine = $__VSCodeOriginalPSConsoleHostReadLine.Invoke()

From 02d18d1d321cdca1e5652e5daf35ce0aa0810560 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 7 Mar 2025 06:21:30 -0800
Subject: [PATCH 0688/1815] Move term tab SI info to status, add details

Fixes #242075
---
 src/vs/platform/terminal/common/terminal.ts   |  2 +
 .../common/xterm/shellIntegrationAddon.ts     | 23 +++++++-
 .../terminal/browser/terminalInstance.ts      |  8 +++
 .../terminal/browser/terminalStatusList.ts    |  1 +
 .../terminal/browser/terminalTooltip.ts       | 56 ++++++++++---------
 5 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/src/vs/platform/terminal/common/terminal.ts b/src/vs/platform/terminal/common/terminal.ts
index 2b985ab369e7..3f326233dc79 100644
--- a/src/vs/platform/terminal/common/terminal.ts
+++ b/src/vs/platform/terminal/common/terminal.ts
@@ -949,9 +949,11 @@ export type ITerminalProfileObject = ITerminalExecutable | ITerminalProfileSourc
 
 export interface IShellIntegration {
 	readonly capabilities: ITerminalCapabilityStore;
+	readonly seenSequences: ReadonlySet<string>;
 	readonly status: ShellIntegrationStatus;
 
 	readonly onDidChangeStatus: Event<ShellIntegrationStatus>;
+	readonly onDidChangeSeenSequences: Event<ReadonlySet<string>>;
 
 	deserialize(serialized: ISerializedCommandDetectionCapability): void;
 }
diff --git a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
index 19358af3b487..a4489849b2c8 100644
--- a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
+++ b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
@@ -325,12 +325,17 @@ export class ShellIntegrationAddon extends Disposable implements IShellIntegrati
 	private _hasUpdatedTelemetry: boolean = false;
 	private _activationTimeout: any;
 	private _commonProtocolDisposables: IDisposable[] = [];
-	private _status: ShellIntegrationStatus = ShellIntegrationStatus.Off;
 
+	private _seenSequences: Set<string> = new Set();
+	get seenSequences(): ReadonlySet<string> { return this._seenSequences; }
+
+	private _status: ShellIntegrationStatus = ShellIntegrationStatus.Off;
 	get status(): ShellIntegrationStatus { return this._status; }
 
 	private readonly _onDidChangeStatus = new Emitter<ShellIntegrationStatus>();
 	readonly onDidChangeStatus = this._onDidChangeStatus.event;
+	private readonly _onDidChangeSeenSequences = new Emitter<ReadonlySet<string>>();
+	readonly onDidChangeSeenSequences = this._onDidChangeSeenSequences.event;
 
 	constructor(
 		private _nonce: string,
@@ -367,6 +372,13 @@ export class ShellIntegrationAddon extends Disposable implements IShellIntegrati
 		this._createOrGetBufferMarkDetection(terminal).getMark(vscodeMarkerId);
 	}
 
+	private _markSequenceSeen(sequence: string) {
+		if (!this._seenSequences.has(sequence)) {
+			this._seenSequences.add(sequence);
+			this._onDidChangeSeenSequences.fire(this._seenSequences);
+		}
+	}
+
 	private _handleFinalTermSequence(data: string): boolean {
 		const didHandle = this._doHandleFinalTermSequence(data);
 		if (this._status === ShellIntegrationStatus.Off) {
@@ -387,6 +399,7 @@ export class ShellIntegrationAddon extends Disposable implements IShellIntegrati
 		// when instant prompt is enabled though. If this does end up being a problem we could pass
 		// a type flag through the capability calls
 		const [command, ...args] = data.split(';');
+		this._markSequenceSeen(command);
 		switch (command) {
 			case FinalTermOscPt.PromptStart:
 				this._createOrGetCommandDetection(this._terminal).handlePromptStart();
@@ -448,10 +461,11 @@ export class ShellIntegrationAddon extends Disposable implements IShellIntegrati
 
 		// Pass the sequence along to the capability
 		const argsIndex = data.indexOf(';');
-		const sequenceCommand = argsIndex === -1 ? data : data.substring(0, argsIndex);
+		const command = argsIndex === -1 ? data : data.substring(0, argsIndex);
+		this._markSequenceSeen(command);
 		// Cast to strict checked index access
 		const args: (string | undefined)[] = argsIndex === -1 ? [] : data.substring(argsIndex + 1).split(';');
-		switch (sequenceCommand) {
+		switch (command) {
 			case VSCodeOscPt.PromptStart:
 				this._createOrGetCommandDetection(this._terminal).handlePromptStart();
 				return true;
@@ -615,6 +629,7 @@ export class ShellIntegrationAddon extends Disposable implements IShellIntegrati
 		}
 
 		const [command] = data.split(';');
+		this._markSequenceSeen(`${ShellIntegrationOscPs.ITerm};${command}`);
 		switch (command) {
 			case ITermOscPt.SetMark: {
 				this._createOrGetBufferMarkDetection(this._terminal).addMark();
@@ -649,6 +664,7 @@ export class ShellIntegrationAddon extends Disposable implements IShellIntegrati
 		}
 
 		const [command, ...args] = data.split(';');
+		this._markSequenceSeen(`${ShellIntegrationOscPs.SetWindowsFriendlyCwd};${command}`);
 		switch (command) {
 			case '9':
 				// Encountered `OSC 9 ; 9 ; <cwd> ST`
@@ -671,6 +687,7 @@ export class ShellIntegrationAddon extends Disposable implements IShellIntegrati
 		}
 
 		const [command] = data.split(';');
+		this._markSequenceSeen(`${ShellIntegrationOscPs.SetCwd};${command}`);
 
 		if (command.match(/^file:\/\/.*\//)) {
 			const uri = URI.parse(command);
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index e0a7854c29de..e8ff3493bc2f 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -90,6 +90,7 @@ 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';
 
 const enum Constants {
 	/**
@@ -860,6 +861,13 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		}));
 		this._register(xterm.onDidChangeProgress(() => this._labelComputer?.refreshLabel(this)));
 
+		// Register and update the terminal's shell integration status
+		this._register(Event.runAndSubscribe(xterm.shellIntegration.onDidChangeSeenSequences, () => {
+			if (xterm.shellIntegration.seenSequences.size > 0) {
+				refreshShellIntegrationInfoStatus(this);
+			}
+		}));
+
 		// Set up updating of the process cwd on key press, this is only needed when the cwd
 		// detection capability has not been registered
 		if (!this.capabilities.has(TerminalCapability.CwdDetection)) {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalStatusList.ts b/src/vs/workbench/contrib/terminal/browser/terminalStatusList.ts
index ecc8d38258bd..bdbbe66141e7 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalStatusList.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalStatusList.ts
@@ -24,6 +24,7 @@ export const enum TerminalStatus {
 	Disconnected = 'disconnected',
 	RelaunchNeeded = 'relaunch-needed',
 	EnvironmentVariableInfoChangesActive = 'env-var-info-changes-active',
+	ShellIntegrationInfo = 'shell-integration-info',
 	ShellIntegrationAttentionNeeded = 'shell-integration-attention-needed'
 }
 
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts b/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts
index fd9340099475..95aeca1ef150 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts
@@ -5,10 +5,12 @@
 
 import { localize } from '../../../../nls.js';
 import { ITerminalInstance } from './terminal.js';
-import { TerminalCapability } from '../../../../platform/terminal/common/capabilities/capabilities.js';
 import { asArray } from '../../../../base/common/arrays.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import type { IHoverAction } from '../../../../base/browser/ui/hover/hover.js';
+import { TerminalCapability } from '../../../../platform/terminal/common/capabilities/capabilities.js';
+import { TerminalStatus } from './terminalStatusList.js';
+import Severity from '../../../../base/common/severity.js';
 
 export function getInstanceHoverInfo(instance: ITerminalInstance): { content: MarkdownString; actions: IHoverAction[] } {
 	let statusString = '';
@@ -22,35 +24,11 @@ export function getInstanceHoverInfo(instance: ITerminalInstance): { content: Ma
 	}
 
 	const shellProcessString = getShellProcessTooltip(instance, true);
-	const shellIntegrationString = getShellIntegrationTooltip(instance, true);
-	const content = new MarkdownString(instance.title + shellProcessString + shellIntegrationString + statusString, { supportThemeIcons: true });
+	const content = new MarkdownString(instance.title + shellProcessString + statusString, { supportThemeIcons: true });
 
 	return { content, actions };
 }
 
-export function getShellIntegrationTooltip(instance: ITerminalInstance, markdown: boolean): string {
-	const shellIntegrationCapabilities: TerminalCapability[] = [];
-	if (instance.capabilities.has(TerminalCapability.CommandDetection)) {
-		shellIntegrationCapabilities.push(TerminalCapability.CommandDetection);
-	}
-	if (instance.capabilities.has(TerminalCapability.CwdDetection)) {
-		shellIntegrationCapabilities.push(TerminalCapability.CwdDetection);
-	}
-	let shellIntegrationString = '';
-	if (shellIntegrationCapabilities.length > 0) {
-		shellIntegrationString += `${markdown ? '\n\n---\n\n' : '\n\n'}${localize('shellIntegration.enabled', "Shell integration activated")}`;
-	} else {
-		if (instance.shellLaunchConfig.ignoreShellIntegration) {
-			shellIntegrationString += `${markdown ? '\n\n---\n\n' : '\n\n'}${localize('launchFailed.exitCodeOnlyShellIntegration', "The terminal process failed to launch. Disabling shell integration with terminal.integrated.shellIntegration.enabled might help.")}`;
-		} else {
-			if (instance.usedShellIntegrationInjection) {
-				shellIntegrationString += `${markdown ? '\n\n---\n\n' : '\n\n'}${localize('shellIntegration.activationFailed', "Shell integration failed to activate")}`;
-			}
-		}
-	}
-	return shellIntegrationString;
-}
-
 export function getShellProcessTooltip(instance: ITerminalInstance, markdown: boolean): string {
 	const lines: string[] = [];
 
@@ -70,3 +48,29 @@ export function getShellProcessTooltip(instance: ITerminalInstance, markdown: bo
 
 	return lines.length ? `${markdown ? '\n\n---\n\n' : '\n\n'}${lines.join('\n')}` : '';
 }
+
+export function refreshShellIntegrationInfoStatus(instance: ITerminalInstance) {
+	if (!instance.xterm) {
+		return;
+	}
+	const cmdDetectionType = (
+		instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection
+			? 'Rich'
+			: instance.capabilities.has(TerminalCapability.CommandDetection)
+				? 'Basic'
+				: instance.usedShellIntegrationInjection
+					? localize('shellIntegration.injectionFailed', "Injection failed to activate")
+					: 'No'
+	);
+	const seenSequences = Array.from(instance.xterm.shellIntegration.seenSequences);
+	const seenSequencesString = (
+		seenSequences.length > 0
+			? ` (${seenSequences.map(e => `\`${e}\``).join(', ')})`
+			: ''
+	);
+	instance.statusList.add({
+		id: TerminalStatus.ShellIntegrationInfo,
+		severity: Severity.Info,
+		tooltip: `${localize('shellIntegration', "Shell integration")}: ${cmdDetectionType}${seenSequencesString}`
+	});
+}

From a5d6d69da17ba4df64eff432826dc5c6bf9c3758 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 7 Mar 2025 07:10:40 -0800
Subject: [PATCH 0689/1815] Add
 TerminalShellIntegration.hasRichCommandDetection API

Part of #242897
---
 .../common/extensionsApiProposals.ts          |  3 ++
 .../common/capabilities/capabilities.ts       |  1 +
 .../commandDetectionCapability.ts             |  4 +--
 .../mainThreadTerminalShellIntegration.ts     | 30 +++++++++++--------
 .../workbench/api/common/extHost.protocol.ts  |  1 +
 .../common/extHostTerminalShellIntegration.ts | 14 +++++++++
 ...proposed.terminalShellIntegrationRich.d.ts | 20 +++++++++++++
 7 files changed, 59 insertions(+), 14 deletions(-)
 create mode 100644 src/vscode-dts/vscode.proposed.terminalShellIntegrationRich.d.ts

diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index e065c9faa394..a33708b4972c 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -355,6 +355,9 @@ const _allApiProposals = {
 	terminalShellEnv: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts',
 	},
+	terminalShellIntegrationRich: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellIntegrationRich.d.ts',
+	},
 	terminalShellType: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellType.d.ts',
 	},
diff --git a/src/vs/platform/terminal/common/capabilities/capabilities.ts b/src/vs/platform/terminal/common/capabilities/capabilities.ts
index 4d82757b0621..17b2429ff8fa 100644
--- a/src/vs/platform/terminal/common/capabilities/capabilities.ts
+++ b/src/vs/platform/terminal/common/capabilities/capabilities.ts
@@ -221,6 +221,7 @@ export interface ICommandDetectionCapability {
 	readonly onCommandExecuted: Event<ITerminalCommand>;
 	readonly onCommandInvalidated: Event<ITerminalCommand[]>;
 	readonly onCurrentCommandInvalidated: Event<ICommandInvalidationRequest>;
+	readonly onSetRichCommandDetection: Event<boolean>;
 	setContinuationPrompt(value: string): void;
 	setPromptTerminator(value: string, lastPromptLine: string): void;
 	setCwd(value: string): void;
diff --git a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
index b0782aefba82..7237d1270d09 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
@@ -73,7 +73,7 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 	readonly onCommandInvalidated = this._onCommandInvalidated.event;
 	private readonly _onCurrentCommandInvalidated = this._register(new Emitter<ICommandInvalidationRequest>());
 	readonly onCurrentCommandInvalidated = this._onCurrentCommandInvalidated.event;
-	private readonly _onSetRichCommandDetection = this._register(new Emitter<void>());
+	private readonly _onSetRichCommandDetection = this._register(new Emitter<boolean>());
 	readonly onSetRichCommandDetection = this._onSetRichCommandDetection.event;
 
 	constructor(
@@ -229,7 +229,7 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 
 	setHasRichCommandDetection(value: boolean): void {
 		this._hasRichCommandDetection = value;
-		this._onSetRichCommandDetection.fire();
+		this._onSetRichCommandDetection.fire(value);
 	}
 
 	setIsCommandStorageDisabled(): void {
diff --git a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
index 6f158b42f780..e37e58307fb5 100644
--- a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
@@ -33,32 +33,38 @@ export class MainThreadTerminalShellIntegration extends Disposable implements Ma
 			}
 		}));
 
-		// onDidchangeTerminalShellIntegration initial state
+		// onDidChangeTerminalShellIntegration initial state
 		for (const terminal of this._terminalService.instances) {
 			const cmdDetection = terminal.capabilities.get(TerminalCapability.CommandDetection);
-			if (cmdDetection?.hasRichCommandDetection) {
+			if (cmdDetection) {
 				this._proxy.$shellIntegrationChange(terminal.instanceId);
-				const cwdDetection = terminal.capabilities.get(TerminalCapability.CwdDetection);
-				if (cwdDetection) {
-					this._proxy.$cwdChange(terminal.instanceId, this._convertCwdToUri(cwdDetection.getCwd()));
-				}
+				this._proxy.$setHasRichCommandDetection(terminal.instanceId, !!cmdDetection?.hasRichCommandDetection);
+			}
+			const cwdDetection = terminal.capabilities.get(TerminalCapability.CwdDetection);
+			if (cwdDetection) {
+				this._proxy.$cwdChange(terminal.instanceId, this._convertCwdToUri(cwdDetection.getCwd()));
 			}
 		}
 
+		// TODO: Rich isn't set on reconnected terminals
+
 		// onDidChangeTerminalShellIntegration via command detection
 		const onDidAddCommandDetection = this._store.add(this._terminalService.createOnInstanceEvent(instance => {
 			return Event.map(
 				Event.filter(instance.capabilities.onDidAddCapabilityType, e => {
-					if (e !== TerminalCapability.CommandDetection) {
-						return false;
-					}
-					const cmdDetection = instance.capabilities.get(TerminalCapability.CommandDetection);
-					return !!cmdDetection?.hasRichCommandDetection;
-				}), () => instance
+					return (e === TerminalCapability.CwdDetection || e === TerminalCapability.CommandDetection);
+				}),
+				() => instance
 			);
 		})).event;
 		this._store.add(onDidAddCommandDetection(e => this._proxy.$shellIntegrationChange(e.instanceId)));
 
+		// onDidChangeTerminalShellIntegration via rich command detection
+		const onDidSetRichCommandDetection = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CommandDetection, e => e.onSetRichCommandDetection));
+		onDidSetRichCommandDetection.event(e => {
+			this._proxy.$setHasRichCommandDetection(e.instance.instanceId, e.data);
+		});
+
 		// onDidChangeTerminalShellIntegration via cwd
 		const cwdChangeEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CwdDetection, e => e.onDidChangeCwd));
 		this._store.add(cwdChangeEvent.event(e => {
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 575b5f4f5b5e..2fb436bd7f9c 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -2523,6 +2523,7 @@ export interface ExtHostTerminalShellIntegrationShape {
 	$shellExecutionData(instanceId: number, data: string): void;
 	$shellEnvChange(instanceId: number, shellEnvKeys: string[], shellEnvValues: string[], isTrusted: boolean): void;
 	$cwdChange(instanceId: number, cwd: UriComponents | undefined): void;
+	$setHasRichCommandDetection(instanceId: number, value: boolean): void;
 	$closeTerminal(instanceId: number): void;
 }
 
diff --git a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
index 59f925fa04e5..e0b5e1fd71c5 100644
--- a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
@@ -143,7 +143,10 @@ export class ExtHostTerminalShellIntegration extends Disposable implements IExtH
 	public $closeTerminal(instanceId: number): void {
 		this._activeShellIntegrations.get(instanceId)?.dispose();
 		this._activeShellIntegrations.delete(instanceId);
+	}
 
+	public $setHasRichCommandDetection(instanceId: number, value: boolean): void {
+		this._activeShellIntegrations.get(instanceId)?.setHasRichCommandDetection(value);
 	}
 }
 
@@ -155,6 +158,7 @@ class InternalTerminalShellIntegration extends Disposable {
 
 	private _env: vscode.TerminalShellIntegrationEnvironment | undefined;
 	private _cwd: URI | undefined;
+	private _hasRichCommandDetection: boolean = false;
 
 	readonly store: DisposableStore = this._register(new DisposableStore());
 
@@ -183,6 +187,9 @@ class InternalTerminalShellIntegration extends Disposable {
 			get env(): vscode.TerminalShellIntegrationEnvironment | undefined {
 				return that._env;
 			},
+			get hasRichCommandDetection(): boolean {
+				return that._hasRichCommandDetection;
+			},
 			// executeCommand(commandLine: string): vscode.TerminalShellExecution;
 			// executeCommand(executable: string, args: string[]): vscode.TerminalShellExecution;
 			executeCommand(commandLineOrExecutable: string, args?: string[]): vscode.TerminalShellExecution {
@@ -259,6 +266,13 @@ class InternalTerminalShellIntegration extends Disposable {
 		}
 	}
 
+	setHasRichCommandDetection(value: boolean): void {
+		if (this._hasRichCommandDetection !== value) {
+			this._hasRichCommandDetection = value;
+			this._fireChangeEvent();
+		}
+	}
+
 	setEnv(keys: string[], values: string[], isTrusted: boolean): void {
 		const env: { [key: string]: string | undefined } = {};
 		for (let i = 0; i < keys.length; i++) {
diff --git a/src/vscode-dts/vscode.proposed.terminalShellIntegrationRich.d.ts b/src/vscode-dts/vscode.proposed.terminalShellIntegrationRich.d.ts
new file mode 100644
index 000000000000..e1d3a4ce5a49
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.terminalShellIntegrationRich.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' {
+	// @tyriar https://github.com/microsoft/vscode/issues/227467
+
+	export interface TerminalShellIntegration {
+		/**
+		 * Whether this shell supports rich command detection. This means that the shell has
+		 * declared that it will report the required shell integation sequences in the exact order
+		 * they're expected, so {@link TerminalShellExecutionCommandLine.value} should always be set
+		 * and {@link TerminalShellExecutionCommandLine.confidence} should always be
+		 * {@link TerminalShellExecutionCommandLineConfidence.High} at the time
+		 * {@link onDidStartTerminalShellExecution} fires.
+		 */
+		readonly hasRichCommandDetection: boolean;
+	}
+}

From 04260cb17b5147503f313cc4624ff301212837dd Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 7 Mar 2025 15:30:39 +0000
Subject: [PATCH 0690/1815] Git - use relative path when running git commands
 (#242889)

---
 extensions/git/src/git.ts        | 82 ++++++++++++++++++++------------
 extensions/git/src/repository.ts | 36 +++++---------
 2 files changed, 63 insertions(+), 55 deletions(-)

diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index f5ef1b894da8..2efa507ed663 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -12,7 +12,7 @@ import which from 'which';
 import { EventEmitter } from 'events';
 import * as iconv from '@vscode/iconv-lite-umd';
 import * as filetype from 'file-type';
-import { assign, groupBy, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent, splitInChunks, Limiter, Versions, isWindows, pathEquals, isMacintosh, isDescendant } from './util';
+import { assign, groupBy, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent, splitInChunks, Limiter, Versions, isWindows, pathEquals, isMacintosh, isDescendant, relativePath } from './util';
 import { CancellationError, CancellationToken, ConfigurationChangeEvent, LogOutputChannel, Progress, Uri, workspace } from 'vscode';
 import { detectEncoding } from './encoding';
 import { Ref, RefType, Branch, Remote, ForcePushMode, GitErrorCodes, LogOptions, Change, Status, CommitOptions, RefQuery, InitOptions } from './api/git';
@@ -355,6 +355,10 @@ function sanitizePath(path: string): string {
 	return path.replace(/^([a-z]):\\/i, (_, letter) => `${letter.toUpperCase()}:\\`);
 }
 
+function sanitizeRelativePath(from: string, to: string): string {
+	return relativePath(from, to).replace(/\\/g, '/');
+}
+
 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';
 
@@ -1330,8 +1334,8 @@ export class Repository {
 			.filter(entry => !!entry);
 	}
 
-	async bufferString(object: string, encoding: string = 'utf8', autoGuessEncoding = false, candidateGuessEncodings: string[] = []): Promise<string> {
-		const stdout = await this.buffer(object);
+	async bufferString(ref: string, filePath: string, encoding: string = 'utf8', autoGuessEncoding = false, candidateGuessEncodings: string[] = []): Promise<string> {
+		const stdout = await this.buffer(ref, filePath);
 
 		if (autoGuessEncoding) {
 			encoding = detectEncoding(stdout, candidateGuessEncodings) || encoding;
@@ -1342,8 +1346,9 @@ export class Repository {
 		return iconv.decode(stdout, encoding);
 	}
 
-	async buffer(object: string): Promise<Buffer> {
-		const child = this.stream(['show', '--textconv', object]);
+	async buffer(ref: string, filePath: string): Promise<Buffer> {
+		const relativePath = sanitizeRelativePath(this.repositoryRoot, filePath);
+		const child = this.stream(['show', '--textconv', `${ref}:${relativePath}`]);
 
 		if (!child.stdout) {
 			return Promise.reject<Buffer>('Can\'t open file from git');
@@ -1395,10 +1400,17 @@ export class Repository {
 		return { mode, object, size: parseInt(size) || 0 };
 	}
 
-	async lstree(treeish: string, path?: string): Promise<LsTreeElement[]> {
-		const args = ['ls-tree', '-l', treeish];
+	async lstree(treeish: string, path?: string, options?: { recursive?: boolean }): Promise<LsTreeElement[]> {
+		const args = ['ls-tree', '-l'];
+
+		if (options?.recursive) {
+			args.push('-r');
+		}
+
+		args.push(treeish);
+
 		if (path) {
-			args.push('--', sanitizePath(path));
+			args.push('--', sanitizeRelativePath(this.repositoryRoot, path));
 		}
 
 		const { stdout } = await this.exec(args);
@@ -1406,15 +1418,24 @@ export class Repository {
 	}
 
 	async lsfiles(path: string): Promise<LsFilesElement[]> {
-		const { stdout } = await this.exec(['ls-files', '--stage', '--', sanitizePath(path)]);
+		const args = ['ls-files', '--stage'];
+		const relativePath = sanitizeRelativePath(this.repositoryRoot, path);
+
+		if (relativePath) {
+			args.push('--', relativePath);
+		}
+
+		const { stdout } = await this.exec(args);
 		return parseLsFiles(stdout);
 	}
 
-	async getGitRelativePath(ref: string, relativePath: string): Promise<string> {
-		const relativePathLowercase = relativePath.toLowerCase();
-		const dirname = path.posix.dirname(relativePath) + '/';
-		const elements: { file: string }[] = ref ? await this.lstree(ref, dirname) : await this.lsfiles(dirname);
-		const element = elements.filter(file => file.file.toLowerCase() === relativePathLowercase)[0];
+	async getGitFilePath(ref: string, filePath: string): Promise<string> {
+		const elements: { file: string }[] = ref
+			? await this.lstree(ref, undefined, { recursive: true })
+			: await this.lsfiles(this.repositoryRoot);
+
+		const relativePathLowercase = sanitizeRelativePath(this.repositoryRoot, filePath).toLowerCase();
+		const element = elements.find(file => file.file.toLowerCase() === relativePathLowercase);
 
 		if (!element) {
 			throw new GitError({
@@ -1422,7 +1443,7 @@ export class Repository {
 			});
 		}
 
-		return element.file;
+		return path.join(this.repositoryRoot, element.file);
 	}
 
 	async detectObjectType(object: string): Promise<{ mimetype: string; encoding?: string }> {
@@ -1502,7 +1523,7 @@ export class Repository {
 			return await this.diffFiles(false);
 		}
 
-		const args = ['diff', '--', sanitizePath(path)];
+		const args = ['diff', '--', sanitizeRelativePath(this.repositoryRoot, path)];
 		const result = await this.exec(args);
 		return result.stdout;
 	}
@@ -1515,7 +1536,7 @@ export class Repository {
 			return await this.diffFiles(false, ref);
 		}
 
-		const args = ['diff', ref, '--', sanitizePath(path)];
+		const args = ['diff', ref, '--', sanitizeRelativePath(this.repositoryRoot, path)];
 		const result = await this.exec(args);
 		return result.stdout;
 	}
@@ -1528,7 +1549,7 @@ export class Repository {
 			return await this.diffFiles(true);
 		}
 
-		const args = ['diff', '--cached', '--', sanitizePath(path)];
+		const args = ['diff', '--cached', '--', sanitizeRelativePath(this.repositoryRoot, path)];
 		const result = await this.exec(args);
 		return result.stdout;
 	}
@@ -1541,7 +1562,7 @@ export class Repository {
 			return await this.diffFiles(true, ref);
 		}
 
-		const args = ['diff', '--cached', ref, '--', sanitizePath(path)];
+		const args = ['diff', '--cached', ref, '--', sanitizeRelativePath(this.repositoryRoot, path)];
 		const result = await this.exec(args);
 		return result.stdout;
 	}
@@ -1561,7 +1582,7 @@ export class Repository {
 			return await this.diffFiles(false, range);
 		}
 
-		const args = ['diff', range, '--', sanitizePath(path)];
+		const args = ['diff', range, '--', sanitizeRelativePath(this.repositoryRoot, path)];
 		const result = await this.exec(args);
 
 		return result.stdout.trim();
@@ -1653,7 +1674,7 @@ export class Repository {
 		}
 
 		if (paths && paths.length) {
-			for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
+			for (const chunk of splitInChunks(paths.map(p => sanitizeRelativePath(this.repositoryRoot, p)), MAX_CLI_LENGTH)) {
 				await this.exec([...args, '--', ...chunk]);
 			}
 		} else {
@@ -1668,13 +1689,14 @@ export class Repository {
 			return;
 		}
 
-		args.push(...paths.map(sanitizePath));
+		args.push(...paths.map(p => sanitizeRelativePath(this.repositoryRoot, p)));
 
 		await this.exec(args);
 	}
 
 	async stage(path: string, data: string, encoding: string): Promise<void> {
-		const child = this.stream(['hash-object', '--stdin', '-w', '--path', sanitizePath(path)], { stdio: [null, null, null] });
+		const relativePath = sanitizeRelativePath(this.repositoryRoot, path);
+		const child = this.stream(['hash-object', '--stdin', '-w', '--path', relativePath], { stdio: [null, null, null] });
 		child.stdin!.end(iconv.encode(data, encoding));
 
 		const { exitCode, stdout } = await exec(child);
@@ -1703,7 +1725,7 @@ export class Repository {
 			add = '--add';
 		}
 
-		await this.exec(['update-index', add, '--cacheinfo', mode, hash, path]);
+		await this.exec(['update-index', add, '--cacheinfo', mode, hash, relativePath]);
 	}
 
 	async checkout(treeish: string, paths: string[], opts: { track?: boolean; detached?: boolean } = Object.create(null)): Promise<void> {
@@ -1723,7 +1745,7 @@ export class Repository {
 
 		try {
 			if (paths && paths.length > 0) {
-				for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
+				for (const chunk of splitInChunks(paths.map(p => sanitizeRelativePath(this.repositoryRoot, p)), MAX_CLI_LENGTH)) {
 					await this.exec([...args, '--', ...chunk]);
 				}
 			} else {
@@ -1937,7 +1959,7 @@ export class Repository {
 		const args = ['clean', '-f', '-q'];
 
 		for (const paths of groups) {
-			for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
+			for (const chunk of splitInChunks(paths.map(p => sanitizeRelativePath(this.repositoryRoot, p)), MAX_CLI_LENGTH)) {
 				promises.push(limiter.queue(() => this.exec([...args, '--', ...chunk])));
 			}
 		}
@@ -1977,7 +1999,7 @@ export class Repository {
 
 		try {
 			if (paths && paths.length > 0) {
-				for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
+				for (const chunk of splitInChunks(paths.map(p => sanitizeRelativePath(this.repositoryRoot, p)), MAX_CLI_LENGTH)) {
 					await this.exec([...args, '--', ...chunk]);
 				}
 			} else {
@@ -2222,7 +2244,7 @@ export class Repository {
 
 	async blame(path: string): Promise<string> {
 		try {
-			const args = ['blame', '--', sanitizePath(path)];
+			const args = ['blame', '--', sanitizeRelativePath(this.repositoryRoot, path)];
 			const result = await this.exec(args);
 			return result.stdout.trim();
 		} catch (err) {
@@ -2242,7 +2264,7 @@ export class Repository {
 				args.push(ref);
 			}
 
-			args.push('--', sanitizePath(path));
+			args.push('--', sanitizeRelativePath(this.repositoryRoot, path));
 
 			const result = await this.exec(args);
 
@@ -2892,7 +2914,7 @@ export class Repository {
 	async updateSubmodules(paths: string[]): Promise<void> {
 		const args = ['submodule', 'update'];
 
-		for (const chunk of splitInChunks(paths.map(sanitizePath), MAX_CLI_LENGTH)) {
+		for (const chunk of splitInChunks(paths.map(p => sanitizeRelativePath(this.repositoryRoot, p)), MAX_CLI_LENGTH)) {
 			await this.exec([...args, '--', ...chunk]);
 		}
 	}
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 6185ce6f6018..f32d915d7151 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -1223,7 +1223,6 @@ export class Repository implements Disposable {
 	}
 
 	async stage(resource: Uri, contents: string): Promise<void> {
-		const path = relativePath(this.repository.root, resource.fsPath).replace(/\\/g, '/');
 		await this.run(Operation.Stage, async () => {
 			const configFiles = workspace.getConfiguration('files', Uri.file(resource.fsPath));
 			let encoding = configFiles.get<string>('encoding') ?? 'utf8';
@@ -1235,7 +1234,7 @@ export class Repository implements Disposable {
 			}
 
 			encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';
-			await this.repository.stage(path, contents, encoding);
+			await this.repository.stage(resource.fsPath, contents, encoding);
 
 			this._onDidChangeOriginalResource.fire(resource);
 			this.closeDiffEditors([], [...resource.fsPath]);
@@ -1856,18 +1855,12 @@ export class Repository implements Disposable {
 		await this.run(Operation.Push, () => this._push(remote, undefined, false, false, forcePushMode, true));
 	}
 
-	async blame(filePath: string): Promise<string> {
-		return await this.run(Operation.Blame(true), () => {
-			const path = relativePath(this.repository.root, filePath).replace(/\\/g, '/');
-			return this.repository.blame(path);
-		});
+	async blame(path: string): Promise<string> {
+		return await this.run(Operation.Blame(true), () => this.repository.blame(path));
 	}
 
-	async blame2(filePath: string, ref?: string): Promise<BlameInformation[] | undefined> {
-		return await this.run(Operation.Blame(false), () => {
-			const path = relativePath(this.repository.root, filePath).replace(/\\/g, '/');
-			return this.repository.blame2(path, ref);
-		});
+	async blame2(path: string, ref?: string): Promise<BlameInformation[] | undefined> {
+		return await this.run(Operation.Blame(false), () => this.repository.blame2(path, ref));
 	}
 
 	@throttle
@@ -1983,18 +1976,17 @@ export class Repository implements Disposable {
 
 	async show(ref: string, filePath: string): Promise<string> {
 		return await this.run(Operation.Show, async () => {
-			const path = relativePath(this.repository.root, filePath).replace(/\\/g, '/');
 			const configFiles = workspace.getConfiguration('files', Uri.file(filePath));
 			const defaultEncoding = configFiles.get<string>('encoding');
 			const autoGuessEncoding = configFiles.get<boolean>('autoGuessEncoding');
 			const candidateGuessEncodings = configFiles.get<string[]>('candidateGuessEncodings');
 
 			try {
-				return await this.repository.bufferString(`${ref}:${path}`, defaultEncoding, autoGuessEncoding, candidateGuessEncodings);
+				return await this.repository.bufferString(ref, filePath, defaultEncoding, autoGuessEncoding, candidateGuessEncodings);
 			} catch (err) {
 				if (err.gitErrorCode === GitErrorCodes.WrongCase) {
-					const gitRelativePath = await this.repository.getGitRelativePath(ref, path);
-					return await this.repository.bufferString(`${ref}:${gitRelativePath}`, defaultEncoding, autoGuessEncoding, candidateGuessEncodings);
+					const gitFilePath = await this.repository.getGitFilePath(ref, filePath);
+					return await this.repository.bufferString(ref, gitFilePath, defaultEncoding, autoGuessEncoding, candidateGuessEncodings);
 				}
 
 				throw err;
@@ -2003,21 +1995,15 @@ export class Repository implements Disposable {
 	}
 
 	async buffer(ref: string, filePath: string): Promise<Buffer> {
-		return this.run(Operation.Show, () => {
-			const path = relativePath(this.repository.root, filePath).replace(/\\/g, '/');
-			return this.repository.buffer(`${ref}:${path}`);
-		});
+		return this.run(Operation.Show, () => this.repository.buffer(ref, filePath));
 	}
 
 	getObjectFiles(ref: string): Promise<LsTreeElement[]> {
 		return this.run(Operation.GetObjectFiles, () => this.repository.lstree(ref));
 	}
 
-	getObjectDetails(ref: string, filePath: string): Promise<{ mode: string; object: string; size: number }> {
-		return this.run(Operation.GetObjectDetails, () => {
-			const path = relativePath(this.repository.root, filePath).replace(/\\/g, '/');
-			return this.repository.getObjectDetails(ref, path);
-		});
+	getObjectDetails(ref: string, path: string): Promise<{ mode: string; object: string; size: number }> {
+		return this.run(Operation.GetObjectDetails, () => this.repository.getObjectDetails(ref, path));
 	}
 
 	detectObjectType(object: string): Promise<{ mimetype: string; encoding?: string }> {

From 4a929292eef1717c181a0231e4f009f62639c8d9 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 7 Mar 2025 07:26:15 -0800
Subject: [PATCH 0691/1815] Handle less confidence command lines by assuming
 it's the next one

---
 .../mainThreadTerminalShellIntegration.ts      |  2 --
 .../common/extHostTerminalShellIntegration.ts  | 18 ++++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
index e37e58307fb5..20caecec3b5e 100644
--- a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
@@ -46,8 +46,6 @@ export class MainThreadTerminalShellIntegration extends Disposable implements Ma
 			}
 		}
 
-		// TODO: Rich isn't set on reconnected terminals
-
 		// onDidChangeTerminalShellIntegration via command detection
 		const onDidAddCommandDetection = this._store.add(this._terminalService.createOnInstanceEvent(instance => {
 			return Event.map(
diff --git a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
index e0b5e1fd71c5..cc5fccb9a8df 100644
--- a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
@@ -110,7 +110,6 @@ export class ExtHostTerminalShellIntegration extends Disposable implements IExtH
 		if (!this._activeShellIntegrations.has(instanceId)) {
 			this.$shellIntegrationChange(instanceId);
 		}
-		// TODO: Map this command line to a previously created shell execution, if it's found do not create a new one
 		const commandLine: vscode.TerminalShellExecutionCommandLine = {
 			value: commandLineValue,
 			confidence: commandLineConfidence,
@@ -228,12 +227,23 @@ class InternalTerminalShellIntegration extends Disposable {
 
 	startShellExecution(commandLine: vscode.TerminalShellExecutionCommandLine, cwd: URI | undefined): InternalTerminalShellExecution {
 		if (this._currentExecution) {
-			// TODO: Should we log when this happens?
+			if (this._hasRichCommandDetection) {
+				console.warn('Rich command detection is enabled but an execution started before the last ended');
+			}
 			this._currentExecution.endExecution(undefined);
 			this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value, exitCode: undefined });
 		}
-		// TODO: Should we check all of them and log a error when one that is not [0] is started?
-		let currentExecution = this._activeExecutions.find(e => e.value.commandLine.value === commandLine.value);
+
+		// Get the active execution, how strict this is depends on whether the terminal has rich
+		// command detection
+		let currentExecution: InternalTerminalShellExecution | undefined;
+		if (commandLine.confidence === TerminalShellExecutionCommandLineConfidence.High) {
+			currentExecution = this._activeExecutions.find(e => e.value.commandLine.value === commandLine.value);
+		} else {
+			currentExecution = this._activeExecutions.shift();
+		}
+
+		// If there is no execution, create a new one
 		if (!currentExecution) {
 			// Fallback to the shell integration's cwd as the cwd may not have been restored after a reload
 			currentExecution = new InternalTerminalShellExecution(commandLine, cwd ?? this._cwd);

From 3d5c0f0e5a426bf3fabb6e9e749ddcf5476cd441 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 7 Mar 2025 07:54:21 -0800
Subject: [PATCH 0692/1815] Localize strings

---
 .../workbench/contrib/terminal/browser/terminalTooltip.ts   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts b/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts
index 95aeca1ef150..8213adb69af9 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts
@@ -55,12 +55,12 @@ export function refreshShellIntegrationInfoStatus(instance: ITerminalInstance) {
 	}
 	const cmdDetectionType = (
 		instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection
-			? 'Rich'
+			? localize('shellIntegration.rich', 'Rich')
 			: instance.capabilities.has(TerminalCapability.CommandDetection)
-				? 'Basic'
+				? localize('shellIntegration.basic', 'Basic')
 				: instance.usedShellIntegrationInjection
 					? localize('shellIntegration.injectionFailed', "Injection failed to activate")
-					: 'No'
+					: localize('shellIntegration.no', 'No')
 	);
 	const seenSequences = Array.from(instance.xterm.shellIntegration.seenSequences);
 	const seenSequencesString = (

From e9f564f31ac40bf89069a6ad2acdbaf9c22bdb1b Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 7 Mar 2025 09:05:50 -0800
Subject: [PATCH 0693/1815] Correct SI comments in ps1 script

---
 .../contrib/terminal/common/scripts/shellIntegration.ps1      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1 b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
index d2e2b0aef618..b7409b45b113 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
@@ -93,7 +93,7 @@ function Global:Prompt() {
 	$Result += if ($pwd.Provider.Name -eq 'FileSystem') { "$([char]0x1b)]633;P;Cwd=$(__VSCode-Escape-Value $pwd.ProviderPath)`a" }
 
 	# Send current environment variables as JSON
-	# OSC 633 ; Env ; <Environment> ; <Nonce>
+	# OSC 633 ; EnvJson ; <Environment> ; <Nonce>
 	if ($__vscode_shell_env_reporting -eq "1") {
 		$envMap = @{}
 		Get-ChildItem Env: | ForEach-Object { $envMap[$_.Name] = $_.Value }
@@ -130,7 +130,7 @@ if (Get-Module -Name PSReadLine) {
 		$CommandLine = $__VSCodeOriginalPSConsoleHostReadLine.Invoke()
 
 		# Command line
-		# OSC 633 ; E ; <CommandLine?> ; <Nonce?> ST
+		# OSC 633 ; E [; <CommandLine> [; <Nonce>]] ST
 		$Result = "$([char]0x1b)]633;E;"
 		$Result += $(__VSCode-Escape-Value $CommandLine)
 		# Only send the nonce if the OS is not Windows 10 as it seems to echo to the terminal

From 469d54e9127bf38ac9c983c5bdb4474e67822252 Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Fri, 7 Mar 2025 10:54:22 -0800
Subject: [PATCH 0694/1815] call the generator function (#242912)

call the function

Co-authored-by: amunger <>
---
 extensions/ipynb/src/helper.ts  | 2 +-
 test/automation/src/profiler.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/ipynb/src/helper.ts b/extensions/ipynb/src/helper.ts
index bd0310e7bb0d..6d67b7d529fa 100644
--- a/extensions/ipynb/src/helper.ts
+++ b/extensions/ipynb/src/helper.ts
@@ -155,7 +155,7 @@ export function generateUuid(): string {
 		// > usable feature in insecure contexts: the getRandomValues() method.
 		// > In general, you should use this API only in secure contexts.
 
-		return crypto.randomUUID.bind(crypto).toString();
+		return crypto.randomUUID.bind(crypto)();
 	}
 
 	// prep-work
diff --git a/test/automation/src/profiler.ts b/test/automation/src/profiler.ts
index 281a8b9bcd58..8305732cba8e 100644
--- a/test/automation/src/profiler.ts
+++ b/test/automation/src/profiler.ts
@@ -66,7 +66,7 @@ export function generateUuid(): string {
 		// > usable feature in insecure contexts: the getRandomValues() method.
 		// > In general, you should use this API only in secure contexts.
 
-		return crypto.randomUUID.bind(crypto).toString();
+		return crypto.randomUUID.bind(crypto)();
 	}
 
 	// prep-work

From fddc71e69f36163164331e141e34a5ee7ffff54b Mon Sep 17 00:00:00 2001
From: Logan Ramos <lramos15@gmail.com>
Date: Fri, 7 Mar 2025 12:44:55 -0700
Subject: [PATCH 0695/1815] Pass through chatInteractionId to tool calls
 (#242915)

---
 src/vs/workbench/api/common/extHostLanguageModelTools.ts        | 2 ++
 .../workbench/contrib/chat/common/languageModelToolsService.ts  | 1 +
 src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts      | 1 +
 3 files changed, 4 insertions(+)

diff --git a/src/vs/workbench/api/common/extHostLanguageModelTools.ts b/src/vs/workbench/api/common/extHostLanguageModelTools.ts
index 7ef25620b846..7c6ad141c6e9 100644
--- a/src/vs/workbench/api/common/extHostLanguageModelTools.ts
+++ b/src/vs/workbench/api/common/extHostLanguageModelTools.ts
@@ -75,6 +75,7 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 				tokenBudget: options.tokenizationOptions?.tokenBudget,
 				context: options.toolInvocationToken as IToolInvocationContext | undefined,
 				chatRequestId: isProposedApiEnabled(extension, 'chatParticipantPrivate') ? options.chatRequestId : undefined,
+				chatInteractionId: isProposedApiEnabled(extension, 'chatParticipantPrivate') ? options.chatInteractionId : undefined,
 			}, token);
 			return typeConvert.LanguageModelToolResult.to(revive(result));
 		} finally {
@@ -111,6 +112,7 @@ export class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape
 			input: dto.parameters,
 			toolInvocationToken: dto.context as vscode.ChatParticipantToolToken | undefined,
 			chatRequestId: dto.chatRequestId,
+			chatInteractionId: dto.chatInteractionId,
 		};
 		if (isProposedApiEnabled(item.extension, 'chatParticipantPrivate') && dto.toolSpecificData?.kind === 'terminal') {
 			options.terminalCommand = dto.toolSpecificData.command;
diff --git a/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
index 8a692ee4cf0a..4e8731110146 100644
--- a/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
+++ b/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
@@ -37,6 +37,7 @@ export interface IToolInvocation {
 	tokenBudget?: number;
 	context: IToolInvocationContext | undefined;
 	chatRequestId?: string;
+	chatInteractionId?: string;
 	toolSpecificData?: IChatTerminalToolInvocationData;
 }
 
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
index 0f274bf257b6..1391558150a7 100644
--- a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
@@ -124,6 +124,7 @@ declare module 'vscode' {
 
 	export interface LanguageModelToolInvocationOptions<T> {
 		chatRequestId?: string;
+		chatInteractionId?: string;
 		terminalCommand?: string;
 	}
 

From 35ccec1f08f6d4719e6aea2eed363d21acb781d8 Mon Sep 17 00:00:00 2001
From: Bhavya U <bhavyau@microsoft.com>
Date: Fri, 7 Mar 2025 11:48:46 -0800
Subject: [PATCH 0696/1815] Remove redundant logging for startup editor
 configuration (#242917)

remove redundant logging for startup editor configuration
---
 .../contrib/welcomeGettingStarted/browser/startupPage.ts      | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts
index ca01ace770ba..9f54e5df21ed 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/startupPage.ts
@@ -221,10 +221,6 @@ function isStartupPageEnabled(configurationService: IConfigurationService, conte
 		}
 	}
 
-	if (startupEditor.value !== startupEditor.userRemoteValue) {
-		logService.trace(`Startup editor is configured to be "${startupEditor.value}". This setting will be overridden by "${startupEditor.userRemoteValue}".`);
-	}
-
 	return startupEditor.value === 'welcomePage'
 		|| startupEditor.value === 'readme'
 		|| (contextService.getWorkbenchState() === WorkbenchState.EMPTY && startupEditor.value === 'welcomePageInEmptyWorkbench')

From e5ac6509817d1297d370d708abf16405f1214b50 Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Fri, 7 Mar 2025 11:58:55 -0800
Subject: [PATCH 0697/1815] bump default nb format version (#242741)

* bump default nb format version

* update tests

---------

Co-authored-by: amunger <>
---
 extensions/ipynb/src/constants.ts                        | 2 +-
 extensions/ipynb/src/ipynbMain.ts                        | 5 +++--
 extensions/ipynb/src/test/notebookModelStoreSync.test.ts | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/extensions/ipynb/src/constants.ts b/extensions/ipynb/src/constants.ts
index 9a82ccfae390..b72185968a81 100644
--- a/extensions/ipynb/src/constants.ts
+++ b/extensions/ipynb/src/constants.ts
@@ -5,7 +5,7 @@
 
 import type { DocumentSelector } from 'vscode';
 
-export const defaultNotebookFormat = { major: 4, minor: 2 };
+export const defaultNotebookFormat = { major: 4, minor: 5 };
 export const ATTACHMENT_CLEANUP_COMMANDID = 'ipynb.cleanInvalidImageAttachment';
 
 export const JUPYTER_NOTEBOOK_MARKDOWN_SELECTOR: DocumentSelector = { notebookType: 'jupyter-notebook', language: 'markdown' };
diff --git a/extensions/ipynb/src/ipynbMain.ts b/extensions/ipynb/src/ipynbMain.ts
index e4fe302d1882..cc55d39e112a 100644
--- a/extensions/ipynb/src/ipynbMain.ts
+++ b/extensions/ipynb/src/ipynbMain.ts
@@ -8,6 +8,7 @@ import { activate as keepNotebookModelStoreInSync } from './notebookModelStoreSy
 import { notebookImagePasteSetup } from './notebookImagePaste';
 import { AttachmentCleaner } from './notebookAttachmentCleaner';
 import { serializeNotebookToString } from './serializers';
+import { defaultNotebookFormat } from './constants';
 
 // From {nbformat.INotebookMetadata} in @jupyterlab/coreutils
 type NotebookMetadata = {
@@ -86,8 +87,8 @@ export function activate(context: vscode.ExtensionContext, serializer: vscode.No
 		data.metadata = {
 			cells: [],
 			metadata: {},
-			nbformat: 4,
-			nbformat_minor: 2
+			nbformat: defaultNotebookFormat.major,
+			nbformat_minor: defaultNotebookFormat.minor,
 		};
 		const doc = await vscode.workspace.openNotebookDocument('jupyter-notebook', data);
 		await vscode.window.showNotebookDocument(doc);
diff --git a/extensions/ipynb/src/test/notebookModelStoreSync.test.ts b/extensions/ipynb/src/test/notebookModelStoreSync.test.ts
index eab921672150..7174678ad61c 100644
--- a/extensions/ipynb/src/test/notebookModelStoreSync.test.ts
+++ b/extensions/ipynb/src/test/notebookModelStoreSync.test.ts
@@ -101,7 +101,8 @@ suite(`Notebook Model Store Sync`, () => {
 		assert.strictEqual(editsApplied.length, 0);
 		assert.strictEqual(cellMetadataUpdates.length, 0);
 	});
-	test('Adding cell will result in an update to the metadata', async () => {
+	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 = {
 			document: {} as any,
 			executionSummary: {},
@@ -131,7 +132,7 @@ suite(`Notebook Model Store Sync`, () => {
 		const newMetadata = cellMetadataUpdates[0].newCellMetadata;
 		assert.deepStrictEqual(newMetadata, { execution_count: null, metadata: {} });
 	});
-	test('Add cell id if nbformat is 4.5', async () => {
+	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 = {
 			document: {} as any,

From fbfb939654e3ca41ace7751b5243e7e8f319129e Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Fri, 7 Mar 2025 12:03:17 -0800
Subject: [PATCH 0698/1815] refactor: deprecate
 `IChatEditingSession.addFileToWorkingSet()` (#242918)

---
 .../browser/actions/chatContextActions.ts     |  9 +------
 .../browser/actions/chatExecuteActions.ts     | 16 ++++++-------
 .../chat/browser/actions/chatTitleActions.ts  |  2 +-
 .../browser/chatEditing/chatEditingActions.ts | 24 +------------------
 .../browser/chatEditing/chatEditingSession.ts | 18 --------------
 .../contrib/chat/browser/chatWidget.ts        |  7 ------
 .../contrib/chat/common/chatEditingService.ts | 11 ++++++---
 .../browser/inlineChatSessionServiceImpl.ts   |  5 +++-
 8 files changed, 22 insertions(+), 70 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index 0162dc6b1486..b3fafac28fbe 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -854,7 +854,7 @@ export class AttachContextAction extends Action2 {
 		}
 
 		if (context?.showFilesOnly) {
-			if (chatEditingService?.hasRelatedFilesProviders() && (widget.getInput() || (getEditingSession(chatEditingService, widget)?.workingSet.size))) {
+			if (chatEditingService?.hasRelatedFilesProviders() && (widget.getInput() || widget.attachmentModel.fileAttachments.length > 0)) {
 				quickPickItems.unshift({
 					kind: 'related-files',
 					id: 'related-files',
@@ -1051,11 +1051,4 @@ registerAction2(class AttachFilesAction extends AttachContextAction {
 	}
 });
 
-function getEditingSession(chatEditingService: IChatEditingService, chatWidget: IChatWidget) {
-	if (!chatWidget.viewModel?.sessionId) {
-		return;
-	}
-	return chatEditingService.getEditingSession(chatWidget.viewModel.sessionId);
-}
-
 registerAction2(AttachPromptAction);
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index d6d800abf468..cacf54dcc9f8 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -5,7 +5,6 @@
 
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
-import { URI } from '../../../../../base/common/uri.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';
@@ -376,7 +375,7 @@ export class ChatSubmitSecondaryAgentAction extends Action2 {
 	}
 }
 
-class SendToChatEditingAction extends EditingSessionAction {
+class SendToChatEditingAction extends Action2 {
 	constructor() {
 		const precondition = ContextKeyExpr.and(
 			// if the input has prompt instructions attached, allow submitting requests even
@@ -416,14 +415,17 @@ class SendToChatEditingAction extends EditingSessionAction {
 		});
 	}
 
-	async runEditingSessionAction(accessor: ServicesAccessor, currentEditingSession: IChatEditingSession, widget: IChatWidget, ...args: any[]) {
+	async run(accessor: ServicesAccessor, ...args: any[]) {
 		if (!accessor.get(IChatAgentService).getDefaultAgent(ChatAgentLocation.EditingSession)) {
 			return;
 		}
 
+		const widget = args.length > 0 && args[0].widget ? args[0].widget : accessor.get(IChatWidgetService).lastFocusedWidget;
+
 		const viewsService = accessor.get(IViewsService);
 		const dialogService = accessor.get(IDialogService);
 		const chatEditingService = accessor.get(IChatEditingService);
+		const currentEditingSession: IChatEditingSession | undefined = chatEditingService.editingSessionsObs.get().at(0);
 
 		const currentEditCount = currentEditingSession?.entries.get().length;
 		if (currentEditCount) {
@@ -447,16 +449,12 @@ class SendToChatEditingAction extends EditingSessionAction {
 		if (!editingWidget.viewModel?.sessionId) {
 			return;
 		}
-		const chatEditingSession = chatEditingService.getEditingSession(editingWidget.viewModel.sessionId);
+		const chatEditingSession = await chatEditingService.startOrContinueGlobalEditingSession(editingWidget.viewModel.sessionId);
 		if (!chatEditingSession) {
 			return;
 		}
 		for (const attachment of widget.attachmentModel.attachments) {
-			if (attachment.isFile && URI.isUri(attachment.value)) {
-				chatEditingSession.addFileToWorkingSet(attachment.value);
-			} else {
-				editingWidget.attachmentModel.addContext(attachment);
-			}
+			editingWidget.attachmentModel.addContext(attachment);
 		}
 
 		editingWidget.setInput(widget.getInput());
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
index c4595b8c4ed3..511e7216583e 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
@@ -487,7 +487,7 @@ export function registerChatTitleActions() {
 				await chatService.adoptRequest(editingSession.chatSessionId, request);
 				this._collectWorkingSetAdditions(request, workingSetAdditions);
 			}
-			workingSetAdditions.forEach(uri => editingSession.addFileToWorkingSet(uri));
+			workingSetAdditions.forEach(uri => editsView.widget.attachmentModel.addFile(uri));
 
 			// make request
 			await chatService.sendRequest(editingSession.chatSessionId, '', {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
index 41a35be31a97..72b297c735e4 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
@@ -91,28 +91,6 @@ abstract class WorkingSetAction extends EditingSessionAction {
 	abstract runWorkingSetAction(accessor: ServicesAccessor, editingSession: IChatEditingSession, chatWidget: IChatWidget | undefined, ...uris: URI[]): any;
 }
 
-registerAction2(class AddFileToWorkingSet extends WorkingSetAction {
-	constructor() {
-		super({
-			id: 'chatEditing.addFileToWorkingSet',
-			title: localize2('addFileToWorkingSet', 'Add File'),
-			icon: Codicon.plus,
-			menu: [{
-				id: MenuId.ChatEditingWidgetModifiedFilesToolbar,
-				when: ContextKeyExpr.equals(chatEditingWidgetFileStateContextKey.key, WorkingSetEntryState.Suggested),
-				order: 0,
-				group: 'navigation'
-			}],
-		});
-	}
-
-	async runWorkingSetAction(_accessor: ServicesAccessor, currentEditingSession: IChatEditingSession, _chatWidget: IChatWidget, ...uris: URI[]): Promise<void> {
-		for (const uri of uris) {
-			currentEditingSession.addFileToWorkingSet(uri);
-		}
-	}
-});
-
 registerAction2(class RemoveFileFromWorkingSet extends WorkingSetAction {
 	constructor() {
 		super({
@@ -437,7 +415,7 @@ registerAction2(class AddFilesToWorkingSetAction extends EditingSessionAction {
 		}
 
 		for (const file of uris) {
-			editingSession.addFileToWorkingSet(file);
+			chatWidget.attachmentModel.addFile(file);
 		}
 	}
 });
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 7c862c98e143..8a1983972772 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -575,20 +575,6 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		this._onDidChange.fire(ChatEditingSessionChangeType.WorkingSet);
 	}
 
-	markIsReadonly(resource: URI, isReadonly?: boolean): void {
-		const entry = this._workingSet.get(resource);
-		if (entry) {
-			if (entry.state === WorkingSetEntryState.Suggested) {
-				entry.state = WorkingSetEntryState.Attached;
-			}
-		} else {
-			this._workingSet.set(resource, {
-				state: WorkingSetEntryState.Attached,
-			});
-		}
-		this._onDidChange.fire(ChatEditingSessionChangeType.WorkingSet);
-	}
-
 	private _assertNotDisposed(): void {
 		if (this._state.get() === ChatEditingSessionState.Disposed) {
 			throw new BugIndicatingError(`Cannot access a disposed editing session`);
@@ -807,10 +793,6 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			this._workingSet.set(resource, { description, state: WorkingSetEntryState.Suggested });
 			this._trackUntitledWorkingSetEntry(resource);
 			this._onDidChange.fire(ChatEditingSessionChangeType.WorkingSet);
-		} else if (state === undefined || state.state === WorkingSetEntryState.Suggested) {
-			this._workingSet.set(resource, { description, state: WorkingSetEntryState.Attached });
-			this._trackUntitledWorkingSetEntry(resource);
-			this._onDidChange.fire(ChatEditingSessionChangeType.WorkingSet);
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index 2b3136322e5c..15cbfab26cfa 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -1119,13 +1119,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 					}
 				}
 
-				for (const file of uniqueWorkingSetEntries) {
-					// Make sure that any files that we sent are part of the working set
-					// but do not permanently add file variables from previous requests to the working set
-					// since the user may subsequently edit the chat history
-					currentEditingSession.get()?.addFileToWorkingSet(file);
-				}
-
 				// Collect file variables from previous requests before sending the request
 				const previousRequests = this.viewModel.model.getRequests();
 				for (const request of previousRequests) {
diff --git a/src/vs/workbench/contrib/chat/common/chatEditingService.ts b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
index a4af996def4b..25d54f30d742 100644
--- a/src/vs/workbench/contrib/chat/common/chatEditingService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
@@ -87,11 +87,16 @@ export interface IChatEditingSession extends IDisposable {
 	readonly onDidDispose: Event<void>;
 	readonly state: IObservable<ChatEditingSessionState>;
 	readonly entries: IObservable<readonly IModifiedFileEntry[]>;
+	/**
+	 * @deprecated
+	 */
 	readonly workingSet: ResourceMap<WorkingSetDisplayMetadata>;
+	/**
+	 * @deprecated
+	 */
 	addFileToWorkingSet(uri: URI, description?: string, kind?: WorkingSetEntryState.Suggested): void;
 	show(): Promise<void>;
 	remove(reason: WorkingSetEntryRemovalReason, ...uris: URI[]): void;
-	markIsReadonly(uri: URI, isReadonly?: boolean): void;
 	accept(...uris: URI[]): Promise<void>;
 	reject(...uris: URI[]): Promise<void>;
 	getEntry(uri: URI): IModifiedFileEntry | undefined;
@@ -156,9 +161,9 @@ export const enum WorkingSetEntryState {
 	Accepted,
 	Rejected,
 	Transient, // TODO@joyceerhl remove this
-	Attached,
+	Attached, // TODO@joyceerhl remove this
 	Sent, // TODO@joyceerhl remove this
-	Suggested,
+	Suggested, // TODO@joyceerhl remove this
 }
 
 export const enum ChatEditingSessionChangeType {
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
index 5f06c2dacb4d..96f8fc6eedec 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
@@ -34,6 +34,7 @@ import { IChatEditingService, WorkingSetEntryState } from '../../chat/common/cha
 import { assertType } from '../../../../base/common/types.js';
 import { autorun } from '../../../../base/common/observable.js';
 import { ResourceMap } from '../../../../base/common/map.js';
+import { IChatWidgetService } from '../../chat/browser/chat.js';
 
 
 type SessionData = {
@@ -85,6 +86,7 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 		@IChatService private readonly _chatService: IChatService,
 		@IChatAgentService private readonly _chatAgentService: IChatAgentService,
 		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
+		@IChatWidgetService private readonly _chatWidgetService: IChatWidgetService,
 	) { }
 
 	dispose() {
@@ -338,7 +340,8 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 		const chatModel = this._chatService.startSession(ChatAgentLocation.EditingSession, token);
 
 		const editingSession = await this._chatEditingService.createEditingSession(chatModel.sessionId);
-		editingSession.addFileToWorkingSet(uri);
+		const widget = this._chatWidgetService.getWidgetBySessionId(chatModel.sessionId);
+		widget?.attachmentModel.addFile(uri);
 
 		const store = new DisposableStore();
 		store.add(toDisposable(() => {

From 93b91e506f2d00ef446594126670825f483b4c49 Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Fri, 7 Mar 2025 13:55:38 -0800
Subject: [PATCH 0699/1815] refactor: extract chat related files from editing
 session working set (#242924)

---
 .../browser/actions/chatAccessibilityHelp.ts  |  1 -
 .../chat/browser/actions/chatClearActions.ts  |  1 +
 .../browser/chatEditing/chatEditingActions.ts | 10 +--
 .../chatEditing/chatEditingServiceImpl.ts     |  3 +-
 .../browser/chatEditing/chatEditingSession.ts | 67 +----------------
 .../contrib/chat/browser/chatInputPart.ts     | 67 ++++++++---------
 .../contrib/chat/browser/chatWidget.ts        | 18 +----
 .../contrib/chatInputRelatedFilesContrib.ts   | 74 ++++++++++++++-----
 .../contrib/chat/common/chatEditingService.ts |  5 --
 9 files changed, 99 insertions(+), 147 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
index 6de18445dec7..2278a1752477 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
@@ -89,7 +89,6 @@ export function getAccessibilityHelpText(type: 'panelChat' | 'inlineChat' | 'qui
 		content.push(localize('chatEditing.acceptAllFiles', '- Accept All Edits{0}.', '<keybinding:chatEditing.acceptAllFiles>'));
 		content.push(localize('chatEditing.discardAllFiles', '- Discard All Edits{0}.', '<keybinding:chatEditing.discardAllFiles>'));
 		content.push(localize('chatEditing.openFileInDiff', '- Open File in Diff{0}.', '<keybinding:chatEditing.openFileInDiff>'));
-		content.push(localize('chatEditing.addFileToWorkingSet', '- Add File to Working Set{0}.', '<keybinding:chatEditing.addFileToWorkingSet>'));
 		content.push(localize('chatEditing.viewChanges', '- View Changes{0}.', '<keybinding:chatEditing.viewChanges>'));
 	}
 	else {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
index cdd73683c537..7390f91b8825 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
@@ -225,6 +225,7 @@ export function registerNewChatActions() {
 			await editingSession.stop(true);
 			widget.clear();
 			widget.attachmentModel.clear();
+			widget.input.relatedFiles?.clear();
 			widget.focusInput();
 
 			if (!context) {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
index 72b297c735e4..88eb081dff9d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
@@ -136,11 +136,9 @@ registerAction2(class RemoveFileFromWorkingSet extends WorkingSetAction {
 			chatWidget.attachmentModel.delete(uri.toString());
 		}
 
-		// If there are now only suggested files in the working set, also clear those
-		const entries = [...currentEditingSession.workingSet.entries()];
-		const suggestedFiles = entries.filter(([_, state]) => state.state === WorkingSetEntryState.Suggested);
-		if (suggestedFiles.length === entries.length && !chatWidget.attachmentModel.attachments.find((v) => v.isFile && URI.isUri(v.value))) {
-			currentEditingSession.remove(WorkingSetEntryRemovalReason.Programmatic, ...entries.map(([uri,]) => uri));
+		// Clear all related file suggestions
+		if (chatWidget.attachmentModel.fileAttachments.length === 0) {
+			chatWidget.input.relatedFiles?.clear();
 		}
 	}
 });
@@ -338,7 +336,7 @@ export class ChatEditingRemoveAllFilesAction extends EditingSessionAction {
 
 	override async runEditingSessionAction(accessor: ServicesAccessor, editingSession: IChatEditingSession, chatWidget: IChatWidget, ...args: any[]): Promise<void> {
 		// Remove all files from working set
-		const uris = [...editingSession.workingSet.keys()];
+		const uris = [...editingSession.entries.get()].map((e) => e.modifiedURI);
 		editingSession.remove(WorkingSetEntryRemovalReason.User, ...uris);
 
 		// Remove all file attachments
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
index a3da95a5fc3f..34c2ac94cced 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
@@ -13,6 +13,7 @@ import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from
 import { LinkedList } from '../../../../../base/common/linkedList.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
 import { derived, IObservable, observableValueOpts, runOnChange, ValueWithChangeEventFromObservable } from '../../../../../base/common/observable.js';
+import { isEqual } from '../../../../../base/common/resources.js';
 import { compare } from '../../../../../base/common/strings.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { assertType, isString } from '../../../../../base/common/types.js';
@@ -256,7 +257,7 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 					return;
 				}
 				const activeUri = this._editorService.activeEditorPane?.input.resource;
-				const inactive = activeUri && session.workingSet.has(activeUri);
+				const inactive = Boolean(activeUri && session.entries.get().find(entry => isEqual(activeUri, entry.modifiedURI)));
 				this._editorService.openEditor({ resource: uri, options: { inactive, preserveFocus: true, pinned: true } });
 			}));
 		};
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 8a1983972772..3833dd6dfe03 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -10,9 +10,8 @@ import { BugIndicatingError } from '../../../../../base/common/errors.js';
 import { Emitter } from '../../../../../base/common/event.js';
 import { StringSHA1 } from '../../../../../base/common/hash.js';
 import { Iterable } from '../../../../../base/common/iterator.js';
-import { Disposable, DisposableMap, DisposableStore, dispose } from '../../../../../base/common/lifecycle.js';
-import { ResourceMap, ResourceSet } from '../../../../../base/common/map.js';
-import { Schemas } from '../../../../../base/common/network.js';
+import { Disposable, DisposableMap, dispose } from '../../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../../base/common/map.js';
 import { asyncTransaction, autorun, derived, derivedOpts, derivedWithStore, IObservable, IReader, ITransaction, ObservablePromise, observableValue, transaction } from '../../../../../base/common/observable.js';
 import { autorunDelta, autorunIterableDelta } from '../../../../../base/common/observableInternal/autorun.js';
 import { isEqual, joinPath } from '../../../../../base/common/resources.js';
@@ -154,8 +153,6 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		return result;
 	}
 
-	private _removedTransientEntries = new ResourceSet();
-
 	private _editorPane: MultiDiffEditor | undefined;
 
 	get state(): IObservable<ChatEditingSessionState> {
@@ -431,10 +428,8 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 
 	public createSnapshot(requestId: string, undoStop: string | undefined): void {
 		const snapshot = this._createSnapshot(requestId, undoStop);
-		for (const [uri, data] of this._workingSet) {
-			if (data.state !== WorkingSetEntryState.Suggested) {
-				this._workingSet.set(uri, { state: WorkingSetEntryState.Sent });
-			}
+		for (const [uri, _] of this._workingSet) {
+			this._workingSet.set(uri, { state: WorkingSetEntryState.Sent });
 		}
 
 		const linearHistoryPtr = this._linearHistoryIndex.get();
@@ -562,9 +557,6 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			const state = this._workingSet.get(uri);
 			if (state !== undefined) {
 				didRemoveUris = this._workingSet.delete(uri) || didRemoveUris;
-				if (reason === WorkingSetEntryRemovalReason.User && state.state === WorkingSetEntryState.Suggested) {
-					this._removedTransientEntries.add(uri);
-				}
 			}
 		}
 
@@ -745,57 +737,6 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		};
 	}
 
-	private _trackUntitledWorkingSetEntry(resource: URI) {
-		if (resource.scheme !== Schemas.untitled) {
-			return;
-		}
-		const untitled = this._textFileService.untitled.get(resource);
-		if (!untitled) { // Shouldn't happen
-			return;
-		}
-
-		// Track this file until
-		// 1. it is removed from the working set
-		// 2. it is closed
-		// 3. we are disposed
-		const store = new DisposableStore();
-		store.add(this.onDidChange(e => {
-			if (e === ChatEditingSessionChangeType.WorkingSet && !this._workingSet.get(resource)) {
-				// The user has removed the file from the working set
-				store.dispose();
-			}
-		}));
-		store.add(this._textFileService.untitled.onDidSave(e => {
-			const existing = this._workingSet.get(resource);
-			if (isEqual(e.source, resource) && existing) {
-				this._workingSet.delete(resource);
-				this._workingSet.set(e.target, existing);
-				store.dispose();
-				this._onDidChange.fire(ChatEditingSessionChangeType.WorkingSet);
-			}
-		}));
-		store.add(this._editorService.onDidCloseEditor((e) => {
-			if (isEqual(e.editor.resource, resource)) {
-				this._workingSet.delete(resource);
-				store.dispose();
-				this._onDidChange.fire(ChatEditingSessionChangeType.WorkingSet);
-			}
-		}));
-		this._store.add(store);
-	}
-
-	addFileToWorkingSet(resource: URI, description?: string, proposedState?: WorkingSetEntryState.Suggested): void {
-		const state = this._workingSet.get(resource);
-		if (proposedState === WorkingSetEntryState.Suggested) {
-			if (state !== undefined || this._removedTransientEntries.has(resource)) {
-				return;
-			}
-			this._workingSet.set(resource, { description, state: WorkingSetEntryState.Suggested });
-			this._trackUntitledWorkingSetEntry(resource);
-			this._onDidChange.fire(ChatEditingSessionChangeType.WorkingSet);
-		}
-	}
-
 	private _getHistoryEntryByLinearIndex(index: number) {
 		const history = this._linearHistory.get();
 		const searchedIndex = binarySearch2(history.length, (e) => history[e].startIndex - index);
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 72d27bf4d439..c39c2521b1cf 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -76,7 +76,7 @@ import { getSimpleCodeEditorWidgetOptions, getSimpleEditorOptions, setupSimpleEd
 import { revealInSideBarCommand } from '../../files/browser/fileActions.contribution.js';
 import { ChatAgentLocation, IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { IChatEditingSession, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../common/chatEditingService.js';
+import { IChatEditingSession } from '../common/chatEditingService.js';
 import { ChatEntitlement, IChatEntitlementService } from '../common/chatEntitlementService.js';
 import { IChatRequestVariableEntry, isImageVariableEntry, isLinkVariableEntry, isPasteVariableEntry } from '../common/chatModel.js';
 import { IChatFollowup } from '../common/chatService.js';
@@ -99,6 +99,7 @@ import { ChatFollowups } from './chatFollowups.js';
 import { IChatViewState } from './chatWidget.js';
 import { ChatFileReference } from './contrib/chatDynamicVariables/chatFileReference.js';
 import { ChatImplicitContext } from './contrib/chatImplicitContext.js';
+import { ChatRelatedFiles } from './contrib/chatInputRelatedFilesContrib.js';
 import { convertUint8ArrayToString, resizeImage } from './imageUtils.js';
 
 const $ = dom.$;
@@ -217,6 +218,11 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		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>());
@@ -764,7 +770,13 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 		this.renderAttachedContext();
 		this._register(this._attachmentModel.onDidChangeContext(() => this._handleAttachedContextChange()));
-		this.renderChatEditingSessionState(null, widget);
+		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(container, container);
 
@@ -1280,13 +1292,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		};
 	}
 
-	async renderChatEditingSessionState(chatEditingSession: IChatEditingSession | null, chatWidget?: IChatWidget) {
+	async renderChatEditingSessionState(chatEditingSession: IChatEditingSession | null) {
 		dom.setVisibility(Boolean(chatEditingSession), this.chatEditingSessionWidgetContainer);
 
-		if (chatEditingSession && this.configurationService.getValue('chat.renderRelatedFiles')) {
-			this.renderChatRelatedFiles(chatEditingSession, this.relatedFilesContainer);
-		}
-
 		const seenEntries = new ResourceSet();
 		const entries: IChatCollapsibleListItem[] = chatEditingSession?.entries.get().map((entry) => {
 			seenEntries.add(entry.modifiedURI);
@@ -1306,15 +1314,14 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 		// Summary of number of files changed
 		const innerContainer = this.chatEditingSessionWidgetContainer.querySelector('.chat-editing-session-container.show-file-icons') as HTMLElement ?? dom.append(this.chatEditingSessionWidgetContainer, $('.chat-editing-session-container.show-file-icons'));
-		for (const [file, metadata] of chatEditingSession.workingSet.entries()) {
-			if (!seenEntries.has(file) && metadata.state !== WorkingSetEntryState.Suggested) {
+		for (const entry of chatEditingSession.entries.get()) {
+			if (!seenEntries.has(entry.modifiedURI)) {
 				entries.unshift({
-					reference: file,
-					state: metadata.state,
-					description: metadata.description,
+					reference: entry.modifiedURI,
+					state: entry.state.get(),
 					kind: 'reference',
 				});
-				seenEntries.add(file);
+				seenEntries.add(entry.modifiedURI);
 			}
 		}
 
@@ -1332,19 +1339,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		const overviewTitle = overviewRegion.querySelector('.working-set-title') as HTMLElement ?? dom.append(overviewRegion, $('.working-set-title'));
 		const overviewFileCount = overviewTitle.querySelector('span.working-set-count') ?? dom.append(overviewTitle, $('span.working-set-count'));
 
-		let suggestedFilesInWorkingSetCount = 0;
-		overviewFileCount.textContent = '';
-		if (entries.length === 1) {
-			overviewFileCount.textContent = localize('chatEditingSession.oneFile.1', '1 file changed');
-			suggestedFilesInWorkingSetCount = entries[0].kind === 'reference' && entries[0].state === WorkingSetEntryState.Suggested ? 1 : 0;
-		} else {
-			suggestedFilesInWorkingSetCount = entries.filter(e => e.kind === 'reference' && e.state === WorkingSetEntryState.Suggested).length;
-		}
-
-		if (entries.length > 1) {
-			const fileCount = entries.length - suggestedFilesInWorkingSetCount;
-			overviewFileCount.textContent = (fileCount === 1 ? localize('chatEditingSession.oneFile.1', '1 file changed') : localize('chatEditingSession.manyFiles.1', '{0} files changed', fileCount));
-		}
+		overviewFileCount.textContent = entries.length === 1 ? localize('chatEditingSession.oneFile.1', '1 file changed') : localize('chatEditingSession.manyFiles.1', '{0} files changed', entries.length);
 
 		overviewTitle.ariaLabel = overviewFileCount.textContent;
 		overviewTitle.tabIndex = 0;
@@ -1416,15 +1411,17 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		this._onDidChangeHeight.fire();
 	}
 
-	async renderChatRelatedFiles(chatEditingSession: IChatEditingSession, anchor: HTMLElement) {
+	async renderChatRelatedFiles() {
+		const anchor = this.relatedFilesContainer;
 		dom.clearNode(anchor);
-		dom.setVisibility(Boolean(chatEditingSession.workingSet.size), 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, metadata] of chatEditingSession.workingSet) {
-			if (metadata.state !== WorkingSetEntryState.Suggested) {
-				continue;
-			}
+		for (const { uri, description } of this.relatedFiles.value) {
 			const uriLabel = this._chatEditsActionsDisposables.add(new Button(anchor, {
 				supportIcons: true,
 				secondary: true,
@@ -1432,12 +1429,12 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			}));
 			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 }), metadata.description ?? '');
+			uriLabel.element.title = localize('suggeste.title', "{0} - {1}", this.labelService.getUriLabel(uri, { relative: true }), description ?? '');
 
 			this._chatEditsActionsDisposables.add(uriLabel.onDidClick(() => {
 				group.remove(); // REMOVE asap
 				this._attachmentModel.addFile(uri);
-				chatEditingSession.remove(WorkingSetEntryRemovalReason.User, uri);
+				this.relatedFiles?.remove(uri);
 			}));
 
 			const addButton = this._chatEditsActionsDisposables.add(new Button(anchor, {
@@ -1451,7 +1448,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			this._chatEditsActionsDisposables.add(addButton.onDidClick(() => {
 				group.remove(); // REMOVE asap
 				this._attachmentModel.addFile(uri);
-				chatEditingSession.remove(WorkingSetEntryRemovalReason.User, uri);
+				this.relatedFiles?.remove(uri);
 			}));
 
 			const sep = document.createElement('div');
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index 15cbfab26cfa..b7062cf6024f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -39,7 +39,7 @@ import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentService, IChatWelcomeMessageContent, isChatWelcomeMessageContent } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { applyingChatEditsFailedContextKey, decidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, IChatEditingService, IChatEditingSession, inChatEditingSessionContextKey, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../common/chatEditingService.js';
+import { applyingChatEditsFailedContextKey, decidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, IChatEditingService, IChatEditingSession, inChatEditingSessionContextKey, WorkingSetEntryState } from '../common/chatEditingService.js';
 import { ChatPauseState, IChatModel, IChatRequestVariableEntry, IChatResponseModel } from '../common/chatModel.js';
 import { chatAgentLeader, ChatRequestAgentPart, chatSubcommandLeader, formatChatQuestion, IParsedChatRequest } from '../common/chatParserTypes.js';
 import { ChatRequestParser } from '../common/chatRequestParser.js';
@@ -654,7 +654,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		if (!this.inputPart) {
 			return;
 		}
-		this.inputPart.renderChatEditingSessionState(this._editingSession.get() ?? null, this);
+		this.inputPart.renderChatEditingSessionState(this._editingSession.get() ?? null);
 
 		if (this.bodyDimension) {
 			this.layout(this.bodyDimension.height, this.bodyDimension.width);
@@ -1103,21 +1103,8 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 			let attachedContext = this.inputPart.getAttachedAndImplicitContext(this.viewModel.sessionId);
 			if (this.viewOptions.enableWorkingSet !== undefined) {
-				const currentEditingSession = this._editingSession;
-
-				const unconfirmedSuggestions = new ResourceSet();
 				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: IChatRequestVariableEntry[] = attachedContext;
-				// Pick up everything that the user sees is part of the working set.
-				for (const [uri, state] of currentEditingSession.get()?.workingSet || []) {
-					// Skip over any suggested files that haven't been confirmed yet in the working set
-					if (state.state === WorkingSetEntryState.Suggested) {
-						unconfirmedSuggestions.add(uri);
-					} else {
-						uniqueWorkingSetEntries.add(uri);
-						editingSessionAttachedContext.unshift(this.attachmentModel.asVariableEntry(uri, undefined));
-					}
-				}
 
 				// Collect file variables from previous requests before sending the request
 				const previousRequests = this.viewModel.model.getRequests();
@@ -1145,7 +1132,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 					actualSize: number;
 				};
 				this.telemetryService.publicLog2<ChatEditingWorkingSetEvent, ChatEditingWorkingSetClassification>('chatEditing/workingSetSize', { originalSize: uniqueWorkingSetEntries.size, actualSize: uniqueWorkingSetEntries.size });
-				currentEditingSession.get()?.remove(WorkingSetEntryRemovalReason.User, ...unconfirmedSuggestions);
 			}
 
 			this.chatService.cancelCurrentRequestForSession(this.viewModel.sessionId);
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib.ts
index 3860b5d5efa5..44c4d6d89465 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib.ts
@@ -4,14 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
-import { Event } from '../../../../../base/common/event.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, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../../common/chatEditingService.js';
+import { IChatEditingService, IChatEditingSession } from '../../common/chatEditingService.js';
 import { IChatWidget, IChatWidgetService } from '../chat.js';
 
 export class ChatRelatedFilesContribution extends Disposable implements IWorkbenchContribution {
@@ -22,7 +23,7 @@ export class ChatRelatedFilesContribution extends Disposable implements IWorkben
 
 	constructor(
 		@IChatEditingService private readonly chatEditingService: IChatEditingService,
-		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
 	) {
 		super();
 
@@ -50,7 +51,7 @@ export class ChatRelatedFilesContribution extends Disposable implements IWorkben
 
 		this._currentRelatedFilesRetrievalOperation = this.chatEditingService.getRelatedFiles(currentEditingSession.chatSessionId, widget.getInput(), widget.attachmentModel.fileAttachments, CancellationToken.None)
 			.then((files) => {
-				if (!files?.length || !widget.viewModel?.sessionId) {
+				if (!files?.length || !widget.viewModel?.sessionId || !widget.input.relatedFiles) {
 					return;
 				}
 
@@ -59,13 +60,13 @@ export class ChatRelatedFilesContribution extends Disposable implements IWorkben
 					return; // Might have disposed while we were calculating
 				}
 
-				const existingFiles = new ResourceSet(widget.attachmentModel.fileAttachments);
+				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<{ description: string; group: string }>();
+				const newSuggestions = new ResourceMap<string>();
 				for (const group of files) {
 					for (const file of group.files) {
 						if (newSuggestions.size >= 2) {
@@ -74,24 +75,12 @@ export class ChatRelatedFilesContribution extends Disposable implements IWorkben
 						if (existingFiles.has(file.uri)) {
 							continue;
 						}
-						newSuggestions.set(file.uri, { group: group.group, description: file.description });
+						newSuggestions.set(file.uri, localize('relatedFile', "{0} (Suggested)", file.description));
 						existingFiles.add(file.uri);
 					}
 				}
 
-				// Remove the existing related file suggestions from the working set
-				const existingSuggestedEntriesToRemove: URI[] = [];
-				for (const entry of currentEditingSession.workingSet) {
-					if (entry[1].state === WorkingSetEntryState.Suggested && !newSuggestions.has(entry[0])) {
-						existingSuggestedEntriesToRemove.push(entry[0]);
-					}
-				}
-				currentEditingSession?.remove(WorkingSetEntryRemovalReason.Programmatic, ...existingSuggestedEntriesToRemove);
-
-				// Add the new related file suggestions to the working set
-				for (const [uri, data] of newSuggestions) {
-					currentEditingSession.addFileToWorkingSet(uri, localize('relatedFile', "{0} (Suggested)", data.description), WorkingSetEntryState.Suggested);
-				}
+				widget.input.relatedFiles.value = [...newSuggestions.entries()].map(([uri, description]) => ({ uri, description }));
 			})
 			.finally(() => {
 				this._currentRelatedFilesRetrievalOperation = undefined;
@@ -115,6 +104,10 @@ export class ChatRelatedFilesContribution extends Disposable implements IWorkben
 		disposableStore.add(currentEditingSession.onDidDispose(() => {
 			disposableStore.dispose();
 		}));
+		disposableStore.add(widget.onDidAcceptInput(() => {
+			widget.input.relatedFiles?.clear();
+			this._updateRelatedFileSuggestions(currentEditingSession, widget);
+		}));
 		this.chatEditingSessionDisposables.set(currentEditingSession.chatSessionId, disposableStore);
 	}
 
@@ -125,3 +118,44 @@ export class ChatRelatedFilesContribution extends Disposable implements IWorkben
 		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/common/chatEditingService.ts b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
index 25d54f30d742..11fd17579962 100644
--- a/src/vs/workbench/contrib/chat/common/chatEditingService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
@@ -91,10 +91,6 @@ export interface IChatEditingSession extends IDisposable {
 	 * @deprecated
 	 */
 	readonly workingSet: ResourceMap<WorkingSetDisplayMetadata>;
-	/**
-	 * @deprecated
-	 */
-	addFileToWorkingSet(uri: URI, description?: string, kind?: WorkingSetEntryState.Suggested): void;
 	show(): Promise<void>;
 	remove(reason: WorkingSetEntryRemovalReason, ...uris: URI[]): void;
 	accept(...uris: URI[]): Promise<void>;
@@ -163,7 +159,6 @@ export const enum WorkingSetEntryState {
 	Transient, // TODO@joyceerhl remove this
 	Attached, // TODO@joyceerhl remove this
 	Sent, // TODO@joyceerhl remove this
-	Suggested, // TODO@joyceerhl remove this
 }
 
 export const enum ChatEditingSessionChangeType {

From 315b2d7f611524c630d3eb37187fd73af66c09de Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Fri, 7 Mar 2025 14:16:37 -0800
Subject: [PATCH 0700/1815] fix: render Attach Context above input editor for
 both chat and edits (#242927)

---
 .../browser/actions/chatContextActions.ts     | 13 +++---
 .../contrib/chat/browser/chatInputPart.ts     | 43 ++++++++-----------
 .../contrib/chat/browser/media/chat.css       |  4 ++
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index b3fafac28fbe..5a8d84e93b08 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -504,7 +504,7 @@ export class AttachContextAction extends Action2 {
 
 	constructor(desc: Readonly<IAction2Options> = {
 		id: AttachContextAction.ID,
-		title: localize2('workbench.action.chat.attachContext.label', "Attach Context"),
+		title: localize2('workbench.action.chat.attachContext.label.2', "Add Context"),
 		icon: Codicon.attach,
 		category: CHAT_CATEGORY,
 		precondition: ContextKeyExpr.or(AttachContextAction._cdt, ContextKeyExpr.and(ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession))),
@@ -516,9 +516,8 @@ export class AttachContextAction extends Action2 {
 		menu: [
 			{
 				when: ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel),
-				id: MenuId.ChatInput,
-				group: 'navigation',
-				order: 2
+				id: MenuId.ChatInputAttachmentToolbar,
+				group: 'navigation'
 			},
 			{
 				when: ContextKeyExpr.and(ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel).negate(), AttachContextAction._cdt),
@@ -1033,7 +1032,11 @@ registerAction2(class AttachFilesAction extends AttachContextAction {
 			shortTitle: localize2('workbench.action.chat.editing.attachContext.shortLabel', "Add Context..."),
 			f1: false,
 			category: CHAT_CATEGORY,
-			menu: { id: MenuId.ChatInputAttachmentToolbar, group: 'navigation' },
+			menu: {
+				when: ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
+				id: MenuId.ChatInputAttachmentToolbar,
+				group: 'navigation'
+			},
 			icon: Codicon.attach,
 			precondition: ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
 			keybinding: {
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index c39c2521b1cf..97191f193de8 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -973,31 +973,26 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			this.renderAttachedContext();
 		}));
 
-		if (this.options.renderWorkingSet) {
-			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.Ignore,
-				hoverDelegate,
-				getKeyBinding: () => undefined,
-				actionViewItemProvider: (action, options) => {
-					if (action.id === 'workbench.action.chat.editing.attachContext') {
-						const viewItem = this.instantiationService.createInstance(AddFilesButton, undefined, action, options);
-						return viewItem;
-					}
-					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.layout(this.cachedDimensions.height, this.cachedDimensions.width);
+		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.Ignore,
+			hoverDelegate,
+			actionViewItemProvider: (action, options) => {
+				if (action.id === 'workbench.action.chat.editing.attachContext' || action.id === 'workbench.action.chat.attachContext') {
+					const viewItem = this.instantiationService.createInstance(AddFilesButton, undefined, action, options);
+					return viewItem;
 				}
-			}));
-		} else {
-			dom.hide(attachmentToolbarContainer);
-		}
+				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.layout(this.cachedDimensions.height, this.cachedDimensions.width);
+			}
+		}));
 	}
 
 	private renderAttachedContext() {
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 727fe8694c08..f3a59f596ec0 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1121,6 +1121,10 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	color: var(--vscode-descriptionForeground);
 }
 
+.action-item.chat-attached-context-attachment.chat-add-files span.keybinding {
+	display: none;
+}
+
 .action-item.chat-attached-context-attachment.chat-add-files .action-label,
 .interactive-session .chat-attached-context .chat-attached-context-attachment {
 	display: flex;

From 739de723a51dff7702ddbcc47fd45ca315911d4b Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <2644648+TylerLeonhardt@users.noreply.github.com>
Date: Fri, 7 Mar 2025 14:46:25 -0800
Subject: [PATCH 0701/1815] Fix ScopeData so that `tenantId` truly is only a
 GUID (#242929)

Fixes https://github.com/microsoft/vscode/issues/242839
---
 .../src/common/scopeData.ts                   | 28 +++++++++++++------
 .../src/common/test/scopeData.test.ts         | 17 +++++++++++
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/extensions/microsoft-authentication/src/common/scopeData.ts b/extensions/microsoft-authentication/src/common/scopeData.ts
index cee462d40571..88a0aad68cc1 100644
--- a/extensions/microsoft-authentication/src/common/scopeData.ts
+++ b/extensions/microsoft-authentication/src/common/scopeData.ts
@@ -34,12 +34,12 @@ export class ScopeData {
 	readonly clientId: string;
 
 	/**
-	 * The tenant ID to use for the token request. This is the value of the `VSCODE_TENANT:...` scope if present, otherwise the default tenant ID.
+	 * The tenant ID or `organizations`, `common`, `consumers` to use for the token request. This is the value of the `VSCODE_TENANT:...` scope if present, otherwise it's the default.
 	 */
 	readonly tenant: string;
 
 	/**
-	 * The tenant ID to use for the token request. This is the value of the `VSCODE_TENANT:...` scope if present, otherwise undefined.
+	 * The tenant ID to use for the token request. This will only ever be a GUID if one was specified via the `VSCODE_TENANT:...` scope, otherwise undefined.
 	 */
 	readonly tenantId: string | undefined;
 
@@ -50,11 +50,11 @@ export class ScopeData {
 		this.scopeStr = modifiedScopes.join(' ');
 		this.scopesToSend = this.getScopesToSend(modifiedScopes);
 		this.clientId = this.getClientId(this.allScopes);
-		this.tenantId = this.getTenantId(this.allScopes);
-		this.tenant = this.tenantId ?? DEFAULT_TENANT;
+		this.tenant = this.getTenant(this.allScopes);
+		this.tenantId = this.getTenantId(this.tenant);
 	}
 
-	private getClientId(scopes: string[]) {
+	private getClientId(scopes: string[]): string {
 		return scopes.reduce<string | undefined>((prev, current) => {
 			if (current.startsWith('VSCODE_CLIENT_ID:')) {
 				return current.split('VSCODE_CLIENT_ID:')[1];
@@ -63,16 +63,28 @@ export class ScopeData {
 		}, undefined) ?? DEFAULT_CLIENT_ID;
 	}
 
-	private getTenantId(scopes: string[]) {
+	private getTenant(scopes: string[]): string {
 		return scopes.reduce<string | undefined>((prev, current) => {
 			if (current.startsWith('VSCODE_TENANT:')) {
 				return current.split('VSCODE_TENANT:')[1];
 			}
 			return prev;
-		}, undefined);
+		}, undefined) ?? DEFAULT_TENANT;
 	}
 
-	private getScopesToSend(scopes: string[]) {
+	private getTenantId(tenant: string): string | undefined {
+		switch (tenant) {
+			case 'organizations':
+			case 'common':
+			case 'consumers':
+				// These are not valid tenant IDs, so we return undefined
+				return undefined;
+			default:
+				return this.tenant;
+		}
+	}
+
+	private getScopesToSend(scopes: string[]): string[] {
 		const scopesToSend = scopes.filter(s => !s.startsWith('VSCODE_'));
 
 		const set = new Set(scopesToSend);
diff --git a/extensions/microsoft-authentication/src/common/test/scopeData.test.ts b/extensions/microsoft-authentication/src/common/test/scopeData.test.ts
index 9250d7cecbda..4c70e4fd07c8 100644
--- a/extensions/microsoft-authentication/src/common/test/scopeData.test.ts
+++ b/extensions/microsoft-authentication/src/common/test/scopeData.test.ts
@@ -56,4 +56,21 @@ suite('ScopeData', () => {
 		const scopeData = new ScopeData(['custom_scope', 'VSCODE_TENANT:some_tenant']);
 		assert.strictEqual(scopeData.tenant, 'some_tenant');
 	});
+
+	test('should have tenantId be undefined if no VSCODE_TENANT scope is present', () => {
+		const scopeData = new ScopeData(['custom_scope']);
+		assert.strictEqual(scopeData.tenantId, undefined);
+	});
+
+	test('should have tenantId be undefined if typical tenant values are present', () => {
+		for (const element of ['common', 'organizations', 'consumers']) {
+			const scopeData = new ScopeData(['custom_scope', `VSCODE_TENANT:${element}`]);
+			assert.strictEqual(scopeData.tenantId, undefined);
+		}
+	});
+
+	test('should have tenantId be the value of VSCODE_TENANT scope if set to a specific value', () => {
+		const scopeData = new ScopeData(['custom_scope', 'VSCODE_TENANT:some_guid']);
+		assert.strictEqual(scopeData.tenantId, 'some_guid');
+	});
 });

From 02662f159658dc8cc59b56527ed7766083824009 Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Fri, 7 Mar 2025 17:39:40 -0800
Subject: [PATCH 0702/1815] fix: track active editor in implicit context widget
 (#242928)

---
 .../contrib/chat/browser/contrib/chatImplicitContext.ts         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
index 480c6f78b38c..dc70c779fc83 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
@@ -46,7 +46,7 @@ export class ChatImplicitContextContribution extends Disposable implements IWork
 		const activeEditorDisposables = this._register(new DisposableStore());
 
 		this._register(Event.runAndSubscribe(
-			editorService.onDidVisibleEditorsChange,
+			editorService.onDidActiveEditorChange,
 			(() => {
 				activeEditorDisposables.clear();
 				const codeEditor = this.findActiveCodeEditor();

From 1073944dfc585a25793e20ce638633d357decf8c Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sat, 8 Mar 2025 12:59:09 +0100
Subject: [PATCH 0703/1815] chat - status :lipstick: (#242887)

---
 src/vs/workbench/contrib/chat/browser/chatStatus.ts        | 2 +-
 src/vs/workbench/contrib/chat/browser/media/chatStatus.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 2187eea59e6b..23655a2a115f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -288,7 +288,7 @@ class ChatStatusDashboard extends Disposable {
 			this.element.appendChild($('div.description', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.value.format(quotaResetDate))));
 
 			if (chatQuotaExceeded || completionsQuotaExceeded) {
-				const upgradePlanButton = disposables.add(new Button(this.element, { ...defaultButtonStyles }));
+				const upgradePlanButton = disposables.add(new Button(this.element, { ...defaultButtonStyles, secondary: true }));
 				upgradePlanButton.label = localize('upgradeToCopilotPro', "Upgrade to Copilot Pro");
 				disposables.add(upgradePlanButton.onDidClick(() => this.runCommandAndClose('workbench.action.chat.upgradePlan')));
 			}
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
index 738856913cf0..70ca83aef277 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
@@ -36,7 +36,7 @@
 	display: flex;
 	align-items: center;
 	gap: 5px;
-	padding: 4px;
+	padding: 3px;
 }
 
 /* Quota Indicator */

From 6c1afa4f7d46a4e64f9fc228358179ee3852d5cd Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sat, 8 Mar 2025 06:51:01 -0800
Subject: [PATCH 0704/1815] Remove compile workarounds in upstream specs

Part of #242795
---
 .../terminal-suggest/scripts/update-specs.js  | 59 -------------------
 .../src/completions/upstream/git.ts           | 16 ++---
 .../src/completions/upstream/node.ts          |  1 -
 .../src/completions/upstream/npm.ts           | 10 ++--
 .../src/completions/upstream/nvm.ts           |  2 -
 .../src/completions/upstream/pnpm.ts          |  9 ++-
 .../src/completions/upstream/ssh.ts           |  2 +-
 .../src/completions/upstream/yarn.ts          |  2 +-
 8 files changed, 24 insertions(+), 77 deletions(-)

diff --git a/extensions/terminal-suggest/scripts/update-specs.js b/extensions/terminal-suggest/scripts/update-specs.js
index 63084a094454..775c5dd32648 100644
--- a/extensions/terminal-suggest/scripts/update-specs.js
+++ b/extensions/terminal-suggest/scripts/update-specs.js
@@ -24,73 +24,14 @@ const specSpecificReplaceStrings = new Map([
 		[
 			'import { ai } from "@fig/autocomplete-generators";',
 			'function ai(...args: any[]): undefined { return undefined; }'
-		], [
-			'const remoteURLs = out.split("\\n").reduce((dict, line) => {',
-			'const remoteURLs = out.split("\\n").reduce<Record<string, string>>((dict, line) => {',
 		], [
 			'prompt: async ({ executeCommand }) => {',
 			'prompt: async ({ executeCommand }: any) => {'
 		], [
 			'message: async ({ executeCommand }) =>',
 			'message: async ({ executeCommand }: any) =>'
-		], [
-			'if (parts.length > 1) {',
-			'if (parts && parts.length > 1) {'
-		], [
-			'if (seen.has(suggestion.name)) return false;',
-			'if (!suggestion) return false;\n\t\t\t\tif (seen.has(suggestion.name)) return false;'
-		], [
-			'return pp(',
-			'return pp?.('
-		]
-	]],
-	['kill', [[
-		'out.match(/\\w+/g)',
-		'out.match(/\\w+/g)?'
-	]]],
-	['node', [[
-		'const isAdonisJsonPresentCommand = "test -f .adonisrc.json";',
-		''
-	]]],
-	['npm', [
-		[
-			'keywords?.length > 0 ? `+keywords:${keywords.join(",")}` : "";',
-			'keywords && keywords.length > 0 ? `+keywords:${keywords.join(",")}` : "";'
-		], [
-			'return results.map((item) => ({',
-			'return results.map((item: any) => ({'
-		], [
-			'const suggestions = [];',
-			'const suggestions: Fig.Suggestion[] = [];'
-		]
-	]],
-	['nvm', [[
-		'const pattern: Fig.Arg = {\n\tname: "pattern",\n};',
-		''
-	]]],
-	['pnpm', [
-		[
-			'if (parts.length > 1) {',
-			'if (parts && parts.length > 1) {'
-		], [
-			'const packages = postProcess(',
-			'if (postProcess === undefined) return undefined;\n\t\tconst packages = postProcess('
-		], [
-			').map(({ name }) => name as string);',
-			')?.filter((e) => e !== null).map(({ name }) => name as string);'
-		], [
-			'.filter((name) => nodeClis.has(name))',
-			'?.filter((name) => nodeClis.has(name))'
 		]
 	]],
-	['ssh', [[
-		'const includeLines = await Promise.all(',
-		'const includeLines: any = await Promise.all('
-	]]],
-	['yarn', [[
-		'(item) =>',
-		'(item: any) =>'
-	]]],
 ]);
 
 for (const spec of upstreamSpecs) {
diff --git a/extensions/terminal-suggest/src/completions/upstream/git.ts b/extensions/terminal-suggest/src/completions/upstream/git.ts
index 03668c69e2dd..56468610acce 100644
--- a/extensions/terminal-suggest/src/completions/upstream/git.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/git.ts
@@ -296,14 +296,16 @@ export const gitGenerators: Record<string, Fig.Generator> = {
 	remotes: {
 		script: ["git", "--no-optional-locks", "remote", "-v"],
 		postProcess: function (out) {
-			const remoteURLs = out.split("\n").reduce<Record<string, string>>((dict, line) => {
-				const pair = line.split("\t");
-				const remote = pair[0];
-				const url = pair[1].split(" ")[0];
+			const remoteURLs = out
+				.split("\n")
+				.reduce<Record<string, string>>((dict, line) => {
+					const pair = line.split("\t");
+					const remote = pair[0];
+					const url = pair[1].split(" ")[0];
 
-				dict[remote] = url;
-				return dict;
-			}, {});
+					dict[remote] = url;
+					return dict;
+				}, {});
 
 			return Object.keys(remoteURLs).map((remote) => {
 				const url = remoteURLs[remote];
diff --git a/extensions/terminal-suggest/src/completions/upstream/node.ts b/extensions/terminal-suggest/src/completions/upstream/node.ts
index 38a1c44b140e..d6e7b52e17d8 100644
--- a/extensions/terminal-suggest/src/completions/upstream/node.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/node.ts
@@ -83,7 +83,6 @@ const completionSpec: Fig.Subcommand = {
 		},
 	],
 	generateSpec: async (tokens, executeShellCommand) => {
-		
 		if (
 			(
 				await executeShellCommand({
diff --git a/extensions/terminal-suggest/src/completions/upstream/npm.ts b/extensions/terminal-suggest/src/completions/upstream/npm.ts
index 809f15752c6c..aa142e056611 100644
--- a/extensions/terminal-suggest/src/completions/upstream/npm.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/npm.ts
@@ -81,10 +81,12 @@ export const createNpmSearchHandler =
 			}
 
 			const results = keywordParameter ? data.results : data;
-			return results.map((item: any) => ({
-				name: item.package.name,
-				description: item.package.description,
-			})) as Fig.Suggestion[];
+			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 [];
diff --git a/extensions/terminal-suggest/src/completions/upstream/nvm.ts b/extensions/terminal-suggest/src/completions/upstream/nvm.ts
index 81724580835e..6adafbcb1745 100644
--- a/extensions/terminal-suggest/src/completions/upstream/nvm.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/nvm.ts
@@ -28,8 +28,6 @@ const args: Fig.Arg = {
 	isVariadic: true,
 };
 
-
-
 const name: Fig.Arg = {
 	name: "name",
 };
diff --git a/extensions/terminal-suggest/src/completions/upstream/pnpm.ts b/extensions/terminal-suggest/src/completions/upstream/pnpm.ts
index deaa454f7507..9ce7c798208e 100644
--- a/extensions/terminal-suggest/src/completions/upstream/pnpm.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/pnpm.ts
@@ -991,7 +991,10 @@ const completionSpec: Fig.Spec = {
 			script: string[];
 		};
 
-		if (postProcess === undefined) return undefined;
+		if (postProcess === undefined) {
+			return undefined;
+		}
+
 		const packages = postProcess(
 			(
 				await executeShellCommand({
@@ -1000,7 +1003,9 @@ const completionSpec: Fig.Spec = {
 				})
 			).stdout,
 			tokens
-		)?.filter((e) => e !== null).map(({ name }) => name as string);
+		)
+			?.filter((e) => e !== null)
+			.map(({ name }) => name as string);
 
 		const subcommands = packages
 			?.filter((name) => nodeClis.has(name))
diff --git a/extensions/terminal-suggest/src/completions/upstream/ssh.ts b/extensions/terminal-suggest/src/completions/upstream/ssh.ts
index 2fa0884c63da..4998530d3ec6 100644
--- a/extensions/terminal-suggest/src/completions/upstream/ssh.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/ssh.ts
@@ -43,7 +43,7 @@ const getConfigLines = async (
 		.map((line) => line.split(" ")[1]);
 
 	// Get the lines of every include file
-	const includeLines: any = await Promise.all(
+	const includeLines: string[][] = await Promise.all(
 		includes.map((file) =>
 			getConfigLines(file, executeShellCommand, home, basePath)
 		)
diff --git a/extensions/terminal-suggest/src/completions/upstream/yarn.ts b/extensions/terminal-suggest/src/completions/upstream/yarn.ts
index e8d5a2011ce1..04c573a151be 100644
--- a/extensions/terminal-suggest/src/completions/upstream/yarn.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/yarn.ts
@@ -367,7 +367,7 @@ export const createCLIsGenerator: Fig.Generator = {
 	postProcess: function (out) {
 		try {
 			return JSON.parse(out).results.map(
-				(item: any) =>
+				(item: { package: { name: string; description: string } }) =>
 					({
 						name: item.package.name.substring(7),
 						description: item.package.description,

From d70596e87bfd917c9b8ec4232abf27fd7e7aab8d Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sat, 8 Mar 2025 18:58:26 +0100
Subject: [PATCH 0705/1815] Chat-related commands should not be available on
 web (without backend) (fix #241873) (#242954)

* Chat-related commands should not be available on web (without backend) (fix #241873)

* Remove notebook.cellOutput.addToChat from command palette

* Only show "Toggle agent mode" when chat enabled

* Show notebook.cellOutput.addToChat only when chat enabled

---------

Co-authored-by: Rob Lourens <roblourens@gmail.com>
---
 extensions/ipynb/package.json                 |  3 ++-
 .../chat/browser/actions/chatActions.ts       |  2 ++
 .../chatAttachPromptAction.ts                 |  2 ++
 .../chat/browser/actions/chatClearActions.ts  |  1 +
 .../browser/actions/chatDeveloperActions.ts   |  4 ++-
 .../browser/actions/chatExecuteActions.ts     |  1 +
 .../browser/actions/chatQuickInputActions.ts  |  1 +
 .../chatEditing/chatEditingEditorActions.ts   |  3 ++-
 .../contrib/chat/browser/chatSetup.ts         |  2 +-
 .../contrib/chat/browser/chatStatus.ts        |  7 +++--
 .../createPromptCommand.ts                    | 26 ++++++++++---------
 .../contributions/usePromptCommand.ts         | 16 +++++++-----
 .../chat/common/chatEntitlementService.ts     |  1 +
 .../chat/notebook.chat.contribution.ts        |  2 ++
 14 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/extensions/ipynb/package.json b/extensions/ipynb/package.json
index f7ee3c344e70..f43a494f66b0 100644
--- a/extensions/ipynb/package.json
+++ b/extensions/ipynb/package.json
@@ -74,7 +74,8 @@
       {
         "command": "notebook.cellOutput.addToChat",
         "title": "%addCellOutputToChat.title%",
-        "category": "Notebook"
+        "category": "Notebook",
+        "enablement": "chatIsEnabled"
       },
       {
         "command": "notebook.cellOutput.openInTextEditor",
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index 9ea0054f433d..8821860a8f33 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -116,6 +116,7 @@ export function registerChatActions() {
 				icon: Codicon.copilot,
 				f1: true,
 				category: CHAT_CATEGORY,
+				precondition: ChatContextKeys.Setup.hidden.toNegated(),
 				keybinding: {
 					weight: KeybindingWeight.WorkbenchContrib,
 					primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyI,
@@ -546,6 +547,7 @@ export function registerChatActions() {
 				title: localize2('showCopilotUsageExtensions', "Show Extensions using Copilot"),
 				f1: true,
 				category: EXTENSIONS_CATEGORY,
+				precondition: ChatContextKeys.enabled
 			});
 		}
 
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts
index 985dc1b9aa9e..a5c08661755e 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAttachPromptAction/chatAttachPromptAction.ts
@@ -13,6 +13,7 @@ import { IViewsService } from '../../../../../services/views/common/viewsService
 import { ServicesAccessor } from '../../../../../../editor/browser/editorExtensions.js';
 import { ISelectPromptOptions, askToSelectPrompt } from './dialogs/askToSelectPrompt.js';
 import { IQuickInputService } from '../../../../../../platform/quickinput/common/quickInput.js';
+import { ChatContextKeys } from '../../../common/chatContextKeys.js';
 
 /**
  * Action ID for the `Attach Prompt` action.
@@ -35,6 +36,7 @@ export class AttachPromptAction extends Action2 {
 			id: ATTACH_PROMPT_ACTION_ID,
 			title: localize2('workbench.action.chat.attach.prompt.label', "Use Prompt"),
 			f1: false,
+			precondition: ChatContextKeys.enabled,
 			category: CHAT_CATEGORY,
 		});
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
index 7390f91b8825..0ea53e725db8 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
@@ -345,6 +345,7 @@ export function registerNewChatActions() {
 				category: CHAT_CATEGORY,
 				icon: Codicon.goToEditingSession,
 				f1: true,
+				precondition: ChatContextKeys.Setup.hidden.toNegated(),
 				menu: [{
 					id: MenuId.ViewTitle,
 					when: ContextKeyExpr.and(ContextKeyExpr.equals('view', ChatViewId), ChatContextKeys.editingParticipantRegistered,
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatDeveloperActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatDeveloperActions.ts
index 4d9afa63ee41..aa3b3db690bb 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatDeveloperActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatDeveloperActions.ts
@@ -8,6 +8,7 @@ import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions
 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 { IChatWidgetService } from '../chat.js';
 
 export function registerChatDeveloperActions() {
@@ -24,7 +25,8 @@ class LogChatInputHistoryAction extends Action2 {
 			title: localize2('workbench.action.chat.logInputHistory.label', "Log Chat Input History"),
 			icon: Codicon.attach,
 			category: Categories.Developer,
-			f1: true
+			f1: true,
+			precondition: ChatContextKeys.enabled
 		});
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index cacf54dcc9f8..b5074baf299f 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -107,6 +107,7 @@ export class ToggleAgentModeAction extends EditingSessionAction {
 			f1: true,
 			category: CHAT_CATEGORY,
 			precondition: ContextKeyExpr.and(
+				ChatContextKeys.enabled,
 				ChatContextKeys.Editing.hasToolsAgent,
 				ChatContextKeys.requestInProgress.negate()),
 			toggled: {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts
index 7d59054a9d16..f5f9343bed89 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.ts
@@ -134,6 +134,7 @@ class AskQuickChatAction extends Action2 {
 			id: `workbench.action.openQuickChat`,
 			category: CHAT_CATEGORY,
 			title: localize2('interactiveSession.open', "Open Quick Chat"),
+			precondition: ChatContextKeys.enabled,
 			f1: true
 		});
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts
index bd4d875cfd82..29299765e873 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts
@@ -21,6 +21,7 @@ import { MultiDiffEditorInput } from '../../../multiDiffEditor/browser/multiDiff
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ActiveEditorContext } from '../../../../common/contextkeys.js';
 import { EditorResourceAccessor, SideBySideEditor, TEXT_DIFF_EDITOR_ID } from '../../../../common/editor.js';
+import { ChatContextKeys } from '../../common/chatContextKeys.js';
 
 
 abstract class ChatEditingEditorAction extends Action2 {
@@ -71,7 +72,7 @@ abstract class NavigateAction extends ChatEditingEditorAction {
 				? localize2('next', 'Go to Next Chat Edit')
 				: localize2('prev', 'Go to Previous Chat Edit'),
 			icon: next ? Codicon.arrowDown : Codicon.arrowUp,
-			precondition: ctxHasRequestInProgress.negate(),
+			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ctxHasRequestInProgress.negate()),
 			keybinding: {
 				primary: next
 					? KeyMod.Alt | KeyCode.F5
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 67221131bb5c..9e8aac0a218c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -168,7 +168,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 					title: ChatSetupHideAction.TITLE,
 					f1: true,
 					category: CHAT_CATEGORY,
-					precondition: ChatContextKeys.Setup.installed.negate(),
+					precondition: ContextKeyExpr.and(ChatContextKeys.Setup.installed.negate(), ChatContextKeys.Setup.hidden.negate()),
 					menu: {
 						id: MenuId.ChatTitleBarMenu,
 						group: 'z_hide',
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 23655a2a115f..48b31011420c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -122,7 +122,10 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	}
 
 	private async create(): Promise<void> {
-		if (this.configurationService.getValue<boolean>(ChatStatusBarEntry.SETTING) === true) {
+		const hidden = this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.hidden.key) === true;
+		const disabled = this.configurationService.getValue<boolean>(ChatStatusBarEntry.SETTING) === false;
+
+		if (!hidden && !disabled) {
 			this.entry ||= this.statusbarService.addEntry(this.getEntryProps(), ChatStatusBarEntry.ID, StatusbarAlignment.RIGHT, { location: { id: 'status.editor.mode', priority: 100.1 }, alignment: StatusbarAlignment.RIGHT });
 			this.statusbarService.updateEntryVisibility(`${this.productService.defaultChatAgent?.extensionId}.status`, false); // TODO@bpasero: remove this eventually
 		} else {
@@ -219,7 +222,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 function isNewUser(contextKeyService: IContextKeyService, chatEntitlementService: IChatEntitlementService): boolean {
 	return contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.installed.key) === false ||	// copilot not installed
-		chatEntitlementService.entitlement === ChatEntitlement.Available;								// not yet signed up to copilot
+		chatEntitlementService.entitlement === ChatEntitlement.Available;									// not yet signed up to copilot
 }
 
 class ChatStatusDashboard extends Disposable {
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
index e3f61c986d4c..6f73d7ee0367 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/createPromptCommand.ts
@@ -14,11 +14,13 @@ import { IOpenerService } from '../../../../../../../platform/opener/common/open
 import { PromptsConfig } from '../../../../../../../platform/prompts/common/config.js';
 import { ICommandService } from '../../../../../../../platform/commands/common/commands.js';
 import { IPromptPath, IPromptsService } from '../../../../common/promptSyntax/service/types.js';
-import { appendToCommandPalette } from '../../../../../files/browser/fileActions.contribution.js';
 import { IQuickInputService } from '../../../../../../../platform/quickinput/common/quickInput.js';
 import { ServicesAccessor } from '../../../../../../../platform/instantiation/common/instantiation.js';
 import { IWorkspaceContextService } from '../../../../../../../platform/workspace/common/workspace.js';
 import { KeybindingsRegistry, KeybindingWeight } from '../../../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { MenuId, MenuRegistry } from '../../../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../../../platform/contextkey/common/contextkey.js';
+import { ChatContextKeys } from '../../../../common/chatContextKeys.js';
 
 /**
  * Base command ID prefix.
@@ -109,7 +111,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: LOCAL_COMMAND_ID,
 	weight: KeybindingWeight.WorkbenchContrib,
 	handler: commandFactory('local'),
-	when: PromptsConfig.enabledCtx,
+	when: ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled),
 });
 
 /**
@@ -119,29 +121,29 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: USER_COMMAND_ID,
 	weight: KeybindingWeight.WorkbenchContrib,
 	handler: commandFactory('user'),
-	when: PromptsConfig.enabledCtx,
+	when: ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled),
 });
 
 /**
  * Register the "Create Prompt" command in the command palette.
  */
-appendToCommandPalette(
-	{
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+	command: {
 		id: LOCAL_COMMAND_ID,
 		title: LOCAL_COMMAND_TITLE,
-		category: CHAT_CATEGORY,
+		category: CHAT_CATEGORY
 	},
-	PromptsConfig.enabledCtx,
-);
+	when: ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)
+});
 
 /**
  * Register the "Create User Prompt" command in the command palette.
  */
-appendToCommandPalette(
-	{
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+	command: {
 		id: USER_COMMAND_ID,
 		title: USER_COMMAND_TITLE,
 		category: CHAT_CATEGORY,
 	},
-	PromptsConfig.enabledCtx,
-);
+	when: ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)
+});
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
index efad59458244..87aa3636fe45 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/usePromptCommand.ts
@@ -13,11 +13,13 @@ import { IViewsService } from '../../../../../services/views/common/viewsService
 import { isPromptFile } from '../../../../../../platform/prompts/common/constants.js';
 import { IEditorService } from '../../../../../services/editor/common/editorService.js';
 import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
-import { appendToCommandPalette } from '../../../../files/browser/fileActions.contribution.js';
 import { ServicesAccessor } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { IActiveCodeEditor, isCodeEditor, isDiffEditor } from '../../../../../../editor/browser/editorBrowser.js';
 import { KeybindingsRegistry, KeybindingWeight } from '../../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IChatAttachPromptActionOptions, ATTACH_PROMPT_ACTION_ID } from '../../actions/chatAttachPromptAction/chatAttachPromptAction.js';
+import { MenuId, MenuRegistry } from '../../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { ChatContextKeys } from '../../../common/chatContextKeys.js';
 
 /**
  * Command ID of the "Use Prompt" command.
@@ -133,17 +135,17 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	weight: KeybindingWeight.WorkbenchContrib,
 	primary: COMMAND_KEY_BINDING,
 	handler: command,
-	when: PromptsConfig.enabledCtx,
+	when: ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled),
 });
 
 /**
  * Register the "Use Prompt" command in the `command palette`.
  */
-appendToCommandPalette(
-	{
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+	command: {
 		id: COMMAND_ID,
 		title: localize('commands.prompts.use.title', "Use Prompt"),
-		category: CHAT_CATEGORY,
+		category: CHAT_CATEGORY
 	},
-	PromptsConfig.enabledCtx,
-);
+	when: ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)
+});
diff --git a/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts b/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
index cdfdedd10653..a462cafcd5b7 100644
--- a/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
@@ -115,6 +115,7 @@ export class ChatEntitlementService extends Disposable implements IChatEntitleme
 			!productService.defaultChatAgent ||				// needs product config
 			(isWeb && !environmentService.remoteAuthority)	// only enabled locally or a remote backend
 		) {
+			ChatContextKeys.Setup.hidden.bindTo(this.contextKeyService).set(true); // hide copilot UI
 			return;
 		}
 
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 fd5ac883a4cd..91607d1621da 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
@@ -24,6 +24,7 @@ import { ChatInputPart } from '../../../../chat/browser/chatInputPart.js';
 import { ChatDynamicVariableModel } from '../../../../chat/browser/contrib/chatDynamicVariables.js';
 import { computeCompletionRanges } from '../../../../chat/browser/contrib/chatInputCompletions.js';
 import { ChatAgentLocation, IChatAgentService } from '../../../../chat/common/chatAgents.js';
+import { ChatContextKeys } from '../../../../chat/common/chatContextKeys.js';
 import { IChatRequestPasteVariableEntry } from '../../../../chat/common/chatModel.js';
 import { chatVariableLeader } from '../../../../chat/common/chatParserTypes.js';
 import { NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_OUTPUT_MIME_TYPE_LIST_FOR_CHAT, NOTEBOOK_CELL_OUTPUT_MIMETYPE } from '../../../common/notebookContextKeys.js';
@@ -249,6 +250,7 @@ registerAction2(class CopyCellOutputAction extends Action2 {
 			},
 			category: NOTEBOOK_ACTIONS_CATEGORY,
 			icon: icons.copyIcon,
+			precondition: ChatContextKeys.enabled
 		});
 	}
 

From 4c5b6c2eba954c61c8ffa14f95fab2425aa9ae7c Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sat, 8 Mar 2025 17:59:39 -0800
Subject: [PATCH 0706/1815] Fix chat edit session persisting (#242976)

The intent here was to persist live edit sessions, but not old ones, since there is no history for edit sessions. But there were some changes and we ended up persisting all edit sessions, just never exposing them in history.

The 25 session limit still applies, so they would rotate through like other chat sessions, but now edit sessions take up a slot that was supposed to go to chat sessions.

Fixing this will make the persisted data much smaller for people who have used agent mode and don't have a large edit session open at the moment.

But I'm going to switch to writing these to disk anyway so it's all about to change again.
---
 .../contrib/chat/common/chatServiceImpl.ts    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
index f519d27d9323..0dafd8770a39 100644
--- a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
@@ -197,7 +197,26 @@ export class ChatService extends Disposable implements IChatService {
 					.filter(session => !this._sessionModels.has(session.sessionId))
 					.filter(session => session.requests.length));
 			allSessions.sort((a, b) => (b.creationDate ?? 0) - (a.creationDate ?? 0));
+
+			// Only keep one persisted edit session, the latest one. This would be the current one if it's live.
+			// No way to know whether it's currently live or if it has been cleared and there is no current session.
+			// But ensure that we don't store multiple edit sessions.
+			let hasPersistedEditSession = false;
+			allSessions = allSessions.filter(s => {
+				if (s.initialLocation === ChatAgentLocation.EditingSession) {
+					if (hasPersistedEditSession) {
+						return false;
+					} else {
+						hasPersistedEditSession = true;
+						return true;
+					}
+				}
+
+				return true;
+			});
+
 			allSessions = allSessions.slice(0, maxPersistedSessions);
+
 			if (allSessions.length) {
 				this.trace('onWillSaveState', `Persisting ${allSessions.length} sessions`);
 			}

From 19775bf998beb9b9c73721897bbc4ccc4db845ea Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sat, 8 Mar 2025 18:06:28 -0800
Subject: [PATCH 0707/1815] Fix #242955 (#242977)

---
 src/vs/platform/actions/browser/menuEntryActionViewItem.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
index 8971195a1c9d..14ef06a50a5f 100644
--- a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
+++ b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
@@ -462,7 +462,7 @@ export class DropdownWithDefaultActionViewItem extends BaseActionViewItem {
 			defaultAction = submenuAction.actions[0];
 		}
 
-		this._defaultAction = this._instaService.createInstance(MenuEntryActionViewItem, <MenuItemAction>defaultAction, { keybinding: this._getDefaultActionKeybindingLabel(defaultAction) });
+		this._defaultAction = this._defaultActionDisposables.add(this._instaService.createInstance(MenuEntryActionViewItem, <MenuItemAction>defaultAction, { keybinding: this._getDefaultActionKeybindingLabel(defaultAction) }));
 
 		const dropdownOptions: IDropdownMenuActionViewItemOptions = {
 			keybindingProvider: action => this._keybindingService.lookupKeybinding(action.id),

From 3180cbe178749f4243fa04fa8e6732d77c7b4f88 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sun, 9 Mar 2025 08:27:07 +0100
Subject: [PATCH 0708/1815] GitHub Copilot Sign-In Issues After VS Code Update
 (fix #242819) (#242962)

---
 package.json                                  |  2 +-
 src/vs/base/common/product.ts                 | 12 +++++-
 .../test/browser/markdownRenderer.test.ts     |  2 +-
 .../chat/browser/actions/chatActions.ts       |  7 ++--
 .../contrib/chat/browser/chatSetup.ts         | 39 +++++++++++++++----
 .../contrib/chat/browser/chatStatus.ts        |  3 +-
 .../chat/common/chatEntitlementService.ts     | 10 +++--
 7 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index f678af10fa74..0f5909dcb1e2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.99.0",
-  "distro": "bddc23b1d673eab2bb0ebe3a6d40b92fb3c42c22",
+  "distro": "0e2323d4ed865131a871b853d9573173441799a9",
   "author": {
     "name": "Microsoft Corporation"
   },
diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
index 52c4c943d97d..23c6e95e9b05 100644
--- a/src/vs/base/common/product.ts
+++ b/src/vs/base/common/product.ts
@@ -319,10 +319,20 @@ export interface IDefaultChatAgent {
 	readonly providerName: string;
 	readonly enterpriseProviderId: string;
 	readonly enterpriseProviderName: string;
-	readonly providerSetting: string;
 	readonly providerUriSetting: string;
 	readonly providerScopes: string[][];
 
 	readonly entitlementUrl: string;
 	readonly entitlementSignupLimitedUrl: string;
+
+	readonly chatQuotaExceededContext: string;
+	readonly completionsQuotaExceededContext: string;
+
+	readonly walkthroughCommand: string;
+	readonly completionsMenuCommand: string;
+	readonly completionsRefreshTokenCommand: string;
+	readonly chatRefreshTokenCommand: string;
+
+	readonly completionsAdvancedSetting: string;
+	readonly completionsEnablementSetting: string;
 }
diff --git a/src/vs/base/test/browser/markdownRenderer.test.ts b/src/vs/base/test/browser/markdownRenderer.test.ts
index 3263774598ed..dcda5f102e59 100644
--- a/src/vs/base/test/browser/markdownRenderer.test.ts
+++ b/src/vs/base/test/browser/markdownRenderer.test.ts
@@ -852,7 +852,7 @@ suite('MarkdownRenderer', () => {
 			});
 
 			test('incomplete link target with incomplete arg 2', () => {
-				const incomplete = '[text](command:_github.copilot.openRelativePath "arg';
+				const incomplete = '[text](command:vscode.openRelativePath "arg';
 				const tokens = marked.marked.lexer(incomplete);
 				const newTokens = fillInIncompleteTokens(tokens);
 
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index 8821860a8f33..24b9685d175f 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -515,7 +515,7 @@ export function registerChatActions() {
 		}
 	});
 
-	const nonEnterpriseCopilotUsers = ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.notEquals(`config.${defaultChat.providerSetting}`, defaultChat.enterpriseProviderId));
+	const nonEnterpriseCopilotUsers = ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.notEquals(`config.${defaultChat.completionsAdvancedSetting}.authProvider`, defaultChat.enterpriseProviderId));
 	registerAction2(class extends Action2 {
 		constructor() {
 			super({
@@ -574,7 +574,7 @@ export function registerChatActions() {
 
 		override async run(accessor: ServicesAccessor): Promise<void> {
 			const commandService = accessor.get(ICommandService);
-			commandService.executeCommand('github.copilot.toggleStatusMenu');
+			commandService.executeCommand(defaultChat.completionsMenuCommand);
 		}
 	});
 
@@ -647,7 +647,8 @@ const defaultChat = {
 	manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? '',
 	managePlanUrl: product.defaultChatAgent?.managePlanUrl ?? '',
 	enterpriseProviderId: product.defaultChatAgent?.enterpriseProviderId ?? '',
-	providerSetting: product.defaultChatAgent?.providerSetting ?? '',
+	completionsAdvancedSetting: product.defaultChatAgent?.completionsAdvancedSetting ?? '',
+	completionsMenuCommand: product.defaultChatAgent?.completionsMenuCommand ?? '',
 };
 
 // Add next to the command center if command center is disabled
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 9e8aac0a218c..149242c8e040 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -60,6 +60,7 @@ import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.
 import { equalsIgnoreCase } from '../../../../base/common/strings.js';
 import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
 import { IChatEntitlementService, ChatEntitlement, ChatEntitlementService, ChatSetupContext, ChatSetupRequests } from '../common/chatEntitlementService.js';
+import { isObject } from '../../../../base/common/types.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -73,10 +74,13 @@ const defaultChat = {
 	providerName: product.defaultChatAgent?.providerName ?? '',
 	enterpriseProviderId: product.defaultChatAgent?.enterpriseProviderId ?? '',
 	enterpriseProviderName: product.defaultChatAgent?.enterpriseProviderName ?? '',
-	providerSetting: product.defaultChatAgent?.providerSetting ?? '',
 	providerUriSetting: product.defaultChatAgent?.providerUriSetting ?? '',
 	providerScopes: product.defaultChatAgent?.providerScopes ?? [[]],
 	manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? '',
+	completionsAdvancedSetting: product.defaultChatAgent?.completionsAdvancedSetting ?? '',
+	walkthroughCommand: product.defaultChatAgent?.walkthroughCommand ?? '',
+	completionsRefreshTokenCommand: product.defaultChatAgent?.completionsRefreshTokenCommand ?? '',
+	chatRefreshTokenCommand: product.defaultChatAgent?.chatRefreshTokenCommand ?? '',
 };
 
 //#region Contribution
@@ -560,7 +564,7 @@ class ChatSetupWelcomeContent extends Disposable {
 
 		// Header
 		{
-			const header = localize({ key: 'header', comment: ['{Locked="[Copilot]({0})"}'] }, "[Copilot]({0}) is your AI pair programmer.", this.context.state.installed ? 'command:github.copilot.open.walkthrough' : defaultChat.documentationUrl);
+			const header = localize({ key: 'header', comment: ['{Locked="[Copilot]({0})"}'] }, "[Copilot]({0}) is your AI pair programmer.", this.context.state.installed ? `command:${defaultChat.walkthroughCommand}` : defaultChat.documentationUrl);
 			this.element.appendChild($('p', undefined, this._register(markdown.render(new MarkdownString(header, { isTrusted: true }))).element));
 
 			this.element.appendChild(
@@ -662,8 +666,13 @@ class ChatSetupWelcomeContent extends Disposable {
 			'id': 'copilot.setup',
 			'type': 'object',
 			'properties': {
-				[defaultChat.providerSetting]: {
-					'type': 'string'
+				[defaultChat.completionsAdvancedSetting]: {
+					'type': 'object',
+					'properties': {
+						'authProvider': {
+							'type': 'string'
+						}
+					}
 				},
 				[defaultChat.providerUriSetting]: {
 					'type': 'string'
@@ -676,9 +685,23 @@ class ChatSetupWelcomeContent extends Disposable {
 			if (!success) {
 				return; // not properly configured, abort
 			}
-			await this.configurationService.updateValue(defaultChat.providerSetting, defaultChat.enterpriseProviderId, ConfigurationTarget.USER);
+		}
+
+		let existingAdvancedSetting = this.configurationService.inspect(defaultChat.completionsAdvancedSetting).user?.value;
+		if (!isObject(existingAdvancedSetting)) {
+			existingAdvancedSetting = {};
+		}
+
+		if (useEnterpriseProvider) {
+			await this.configurationService.updateValue(`${defaultChat.completionsAdvancedSetting}`, {
+				...existingAdvancedSetting,
+				'authProvider': defaultChat.enterpriseProviderId
+			}, ConfigurationTarget.USER);
 		} else {
-			await this.configurationService.updateValue(defaultChat.providerSetting, undefined, ConfigurationTarget.USER);
+			await this.configurationService.updateValue(`${defaultChat.completionsAdvancedSetting}`, Object.keys(existingAdvancedSetting).length > 0 ? {
+				...existingAdvancedSetting,
+				'authProvider': undefined
+			} : undefined, ConfigurationTarget.USER);
 			await this.configurationService.updateValue(defaultChat.providerUriSetting, undefined, ConfigurationTarget.USER);
 		}
 
@@ -757,6 +780,6 @@ class ChatSetupWelcomeContent extends Disposable {
 
 function refreshTokens(commandService: ICommandService): void {
 	// ugly, but we need to signal to the extension that entitlements changed
-	commandService.executeCommand('github.copilot.signIn');
-	commandService.executeCommand('github.copilot.refreshToken');
+	commandService.executeCommand(defaultChat.completionsRefreshTokenCommand);
+	commandService.executeCommand(defaultChat.chatRefreshTokenCommand);
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 48b31011420c..14a6497b112a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -241,6 +241,7 @@ class ChatStatusDashboard extends Disposable {
 		@ILanguageService private readonly languageService: ILanguageService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@ICommandService private readonly commandService: ICommandService,
+		@IProductService private readonly productService: IProductService
 	) {
 		super();
 	}
@@ -391,7 +392,7 @@ class ChatStatusDashboard extends Disposable {
 	}
 
 	private createCodeCompletionsSetting(container: HTMLElement, label: string, language: string | '*', disposables: DisposableStore): void {
-		const settingId = 'github.copilot.enable';
+		const settingId = this.productService.defaultChatAgent?.completionsEnablementSetting ?? '';
 
 		const readSetting = () => {
 			const result = this.configurationService.getValue<Record<string, boolean>>(settingId);
diff --git a/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts b/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
index a462cafcd5b7..d966f2826fa8 100644
--- a/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
@@ -85,10 +85,12 @@ const defaultChat = {
 	upgradePlanUrl: product.defaultChatAgent?.upgradePlanUrl ?? '',
 	providerId: product.defaultChatAgent?.providerId ?? '',
 	enterpriseProviderId: product.defaultChatAgent?.enterpriseProviderId ?? '',
-	providerSetting: product.defaultChatAgent?.providerSetting ?? '',
 	providerScopes: product.defaultChatAgent?.providerScopes ?? [[]],
 	entitlementUrl: product.defaultChatAgent?.entitlementUrl ?? '',
 	entitlementSignupLimitedUrl: product.defaultChatAgent?.entitlementSignupLimitedUrl ?? '',
+	completionsAdvancedSetting: product.defaultChatAgent?.completionsAdvancedSetting ?? '',
+	chatQuotaExceededContext: product.defaultChatAgent?.chatQuotaExceededContext ?? '',
+	completionsQuotaExceededContext: product.defaultChatAgent?.completionsQuotaExceededContext ?? ''
 };
 
 interface IChatQuotasAccessor {
@@ -172,8 +174,8 @@ export class ChatEntitlementService extends Disposable implements IChatEntitleme
 	private readonly completionsQuotaExceededContextKey = ChatContextKeys.completionsQuotaExceeded.bindTo(this.contextKeyService);
 
 	private ExtensionQuotaContextKeys = {
-		chatQuotaExceeded: 'github.copilot.chat.quotaExceeded',
-		completionsQuotaExceeded: 'github.copilot.completions.quotaExceeded',
+		chatQuotaExceeded: defaultChat.chatQuotaExceededContext,
+		completionsQuotaExceeded: defaultChat.completionsQuotaExceededContext,
 	};
 
 	private registerListeners(): void {
@@ -306,7 +308,7 @@ interface IQuotas {
 export class ChatSetupRequests extends Disposable {
 
 	static providerId(configurationService: IConfigurationService): string {
-		if (configurationService.getValue<string | undefined>(defaultChat.providerSetting) === defaultChat.enterpriseProviderId) {
+		if (configurationService.getValue<string | undefined>(`${defaultChat.completionsAdvancedSetting}.authProvider`) === defaultChat.enterpriseProviderId) {
 			return defaultChat.enterpriseProviderId;
 		}
 

From b90f20946a31cfceca4528f3486a867b8200ad2f Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sun, 9 Mar 2025 15:54:27 +0100
Subject: [PATCH 0709/1815] tests - allow to run API tests in vscode (#242987)

---
 .vscode-test.js | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/.vscode-test.js b/.vscode-test.js
index 917413ede2ac..823ef615f4f7 100644
--- a/.vscode-test.js
+++ b/.vscode-test.js
@@ -19,7 +19,7 @@ const { defineConfig } = require('@vscode/test-cli');
  * A list of extension folders who have opted into tests, or configuration objects.
  * Edit me to add more!
  *
- * @type {Array<string | (Partial<import("@vscode/test-cli").TestConfiguration> & { label: string })>}
+ * @type {Array<Partial<import("@vscode/test-cli").TestConfiguration> & { label: string }>}
  */
 const extensions = [
 	{
@@ -65,6 +65,20 @@ const extensions = [
 	{
 		label: 'microsoft-authentication',
 		mocha: { timeout: 60_000 }
+	},
+	{
+		label: 'vscode-api-tests-folder',
+		extensionDevelopmentPath: `extensions/vscode-api-tests`,
+		workspaceFolder: `extensions/vscode-api-tests/testWorkspace`,
+		mocha: { timeout: 60_000 },
+		files: 'extensions/vscode-api-tests/out/singlefolder-tests/**/*.test.js',
+	},
+	{
+		label: 'vscode-api-tests-workspace',
+		extensionDevelopmentPath: `extensions/vscode-api-tests`,
+		workspaceFolder: `extensions/vscode-api-tests/testworkspace.code-workspace`,
+		mocha: { timeout: 60_000 },
+		files: 'extensions/vscode-api-tests/out/workspace-tests/**/*.test.js',
 	}
 ];
 
@@ -75,9 +89,12 @@ const defaultLaunchArgs = process.env.API_TESTS_EXTRA_ARGS?.split(' ') || [
 
 const config = defineConfig(extensions.map(extension => {
 	/** @type {import('@vscode/test-cli').TestConfiguration} */
-	const config = typeof extension === 'object'
-		? { files: `extensions/${extension.label}/out/**/*.test.js`, ...extension }
-		: { files: `extensions/${extension}/out/**/*.test.js`, label: extension };
+	const config = {
+		platform: 'desktop',
+		files: `extensions/${extension.label}/out/**/*.test.js`,
+		extensionDevelopmentPath: `extensions/${extension.label}`,
+		...extension,
+	};
 
 	config.mocha ??= {};
 	if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {

From eb700003ebf3797af1de1f9e222478d6d7f7eea3 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Sat, 8 Mar 2025 10:19:08 -0800
Subject: [PATCH 0710/1815] mcp: initial hacking

This is some basic work to get MCP hooked up. It's enough to discover
and establish connections to MCP servers on the machine with very very
basic commands to manage them:

![](https://memes.peet.io/img/25-03-2220f93e-3d1f-41ab-867e-0b9ba616ec6f.mp4)

Refs #242864

The McpRegistry registers both collections of servers (from various
config files) and 'delegates', which is currently _only_ the node
extension host but is pretty generic and so could point at other
processes in the future. SSE could even be served from the renderer when
we aren't on a remote.

It wraps into IMcpServerConnection's, which do some basic connection
management and expose the McpServerRequestHandler which speaks JSON-RPC
to the MCP server. This is wrapped into the IMcpServer which is the
complete, stateful representation of the server. It does stuff like
caching discovered tools such that they can be viewed and controlled
even when the MCP server isn't running.

The IMcpService is the 'public' entry for other VS Code features. Its
API is very simple right now, exposing an observable of the available
servers, which should be easy for chat to consume.

Still need to get some good tests going, add proper and more discovery,
and excercise currently-untested API. SSE is also a stub right now.
---
 .../api/browser/extensionHost.contribution.ts |    1 +
 src/vs/workbench/api/browser/mainThreadMcp.ts |  104 ++
 .../workbench/api/common/extHost.api.impl.ts  |    2 +
 .../api/common/extHost.common.services.ts     |    2 +
 .../workbench/api/common/extHost.protocol.ts  |   17 +-
 src/vs/workbench/api/common/extHostMcp.ts     |   37 +
 .../api/node/extHost.node.services.ts         |    3 +
 src/vs/workbench/api/node/extHostMpcNode.ts   |   99 ++
 .../contrib/mcp/browser/mcp.contribution.ts   |   19 +
 .../contrib/mcp/browser/mcpCommands.ts        |  147 +++
 .../contrib/mcp/browser/mcpDiscovery.ts       |   79 ++
 .../contrib/mcp/common/mcpRegistry.ts         |  124 ++
 .../contrib/mcp/common/mcpRegistryTypes.ts    |   44 +
 .../workbench/contrib/mcp/common/mcpServer.ts |  226 ++++
 .../contrib/mcp/common/mcpServerConnection.ts |  124 ++
 .../mcp/common/mcpServerRequestHandler.ts     |  444 +++++++
 .../contrib/mcp/common/mcpService.ts          |   78 ++
 .../workbench/contrib/mcp/common/mcpTypes.ts  |  219 ++++
 .../mcp/common/modelContextProtocol.ts        | 1138 +++++++++++++++++
 .../baseConfigurationResolverService.ts       |    3 +-
 src/vs/workbench/workbench.common.main.ts     |    1 +
 21 files changed, 2909 insertions(+), 2 deletions(-)
 create mode 100644 src/vs/workbench/api/browser/mainThreadMcp.ts
 create mode 100644 src/vs/workbench/api/common/extHostMcp.ts
 create mode 100644 src/vs/workbench/api/node/extHostMpcNode.ts
 create mode 100644 src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
 create mode 100644 src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
 create mode 100644 src/vs/workbench/contrib/mcp/browser/mcpDiscovery.ts
 create mode 100644 src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
 create mode 100644 src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
 create mode 100644 src/vs/workbench/contrib/mcp/common/mcpServer.ts
 create mode 100644 src/vs/workbench/contrib/mcp/common/mcpServerConnection.ts
 create mode 100644 src/vs/workbench/contrib/mcp/common/mcpServerRequestHandler.ts
 create mode 100644 src/vs/workbench/contrib/mcp/common/mcpService.ts
 create mode 100644 src/vs/workbench/contrib/mcp/common/mcpTypes.ts
 create mode 100644 src/vs/workbench/contrib/mcp/common/modelContextProtocol.ts

diff --git a/src/vs/workbench/api/browser/extensionHost.contribution.ts b/src/vs/workbench/api/browser/extensionHost.contribution.ts
index 3e73acf1abd4..f0bf62c67ff5 100644
--- a/src/vs/workbench/api/browser/extensionHost.contribution.ts
+++ b/src/vs/workbench/api/browser/extensionHost.contribution.ts
@@ -88,6 +88,7 @@ import './mainThreadShare.js';
 import './mainThreadProfileContentHandlers.js';
 import './mainThreadAiRelatedInformation.js';
 import './mainThreadAiEmbeddingVector.js';
+import './mainThreadMcp.js';
 
 export class ExtensionPoints implements IWorkbenchContribution {
 
diff --git a/src/vs/workbench/api/browser/mainThreadMcp.ts b/src/vs/workbench/api/browser/mainThreadMcp.ts
new file mode 100644
index 000000000000..fd6b783011f0
--- /dev/null
+++ b/src/vs/workbench/api/browser/mainThreadMcp.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 { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { observableValue } from '../../../base/common/observable.js';
+import { IMcpRegistry, IMcpMessageTransport } from '../../contrib/mcp/common/mcpRegistryTypes.js';
+import { McpConnectionState, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
+import { MCP } from '../../contrib/mcp/common/modelContextProtocol.js';
+import { ExtensionHostKind } from '../../services/extensions/common/extensionHostKind.js';
+import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { ExtHostContext, MainContext, MainThreadMcpShape } from '../common/extHost.protocol.js';
+
+@extHostNamedCustomer(MainContext.MainThreadMcp)
+export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
+
+	private _serverIdCounter = 0;
+
+	private readonly _servers: Map<number, ExtHostMcpServerLaunch> = new Map();
+
+	constructor(
+		extHostContext: IExtHostContext,
+		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry,
+	) {
+		super();
+		const proxy = extHostContext.getProxy(ExtHostContext.ExtHostMcp);
+		this._register(this._mcpRegistry.registerDelegate({
+			canStart(collection, serverDefinition) {
+				// todo: SSE MPC servers without a remote authority could be served from the renderer
+				if (collection.remoteAuthority !== extHostContext.remoteAuthority) {
+					return false;
+				}
+				if (serverDefinition.launch.type === McpServerTransportType.Stdio && extHostContext.extensionHostKind === ExtensionHostKind.LocalWebWorker) {
+					return false;
+				}
+				return true;
+			},
+			start: (collection, _serverDefiniton, resolveLaunch) => {
+				const id = ++this._serverIdCounter;
+				const launch = new ExtHostMcpServerLaunch(
+					() => proxy.$stopMcp(id),
+					msg => proxy.$sendMessage(id, JSON.stringify(msg)),
+				);
+
+				this._servers.set(id, launch);
+				proxy.$startMcp(id, resolveLaunch);
+
+				return launch;
+			},
+		}));
+	}
+
+	$onDidChangeState(id: number, update: McpConnectionState): void {
+		this._servers.get(id)?.state.set(update, undefined);
+
+		if (update.state === McpConnectionState.Kind.Stopped || update.state === McpConnectionState.Kind.Error) {
+			this._servers.delete(id);
+		}
+	}
+	$onDidPublishLog(id: number, log: string): void {
+		this._servers.get(id)?.pushLog(log);
+	}
+	$onDidReceiveMessage(id: number, message: string): void {
+		this._servers.get(id)?.pushMessage(message);
+	}
+}
+
+
+class ExtHostMcpServerLaunch extends Disposable implements IMcpMessageTransport {
+	public readonly state = observableValue<McpConnectionState>('mcpServerState', { state: McpConnectionState.Kind.Starting });
+
+	private readonly _onDidLog = this._register(new Emitter<string>());
+	public readonly onDidLog = this._onDidLog.event;
+
+	private readonly _onDidReceiveMessage = this._register(new Emitter<MCP.JSONRPCMessage>());
+	public readonly onDidReceiveMessage = this._onDidReceiveMessage.event;
+
+	pushLog(log: string): void {
+		this._onDidLog.fire(log);
+	}
+
+	pushMessage(message: string): void {
+		let parsed: MCP.JSONRPCMessage | undefined;
+		try {
+			parsed = JSON.parse(message);
+		} catch (e) {
+			this.pushLog(`Failed to parse message: ${JSON.stringify(message)}`);
+		}
+
+		if (parsed) {
+			this._onDidReceiveMessage.fire(parsed);
+		}
+	}
+
+	constructor(
+		public readonly stop: () => void,
+		public readonly send: (message: MCP.JSONRPCMessage) => void,
+	) {
+		super();
+	}
+
+}
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index 898d747ddfbc..c35994fc4eda 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -108,6 +108,7 @@ import { ProxyIdentifier } from '../../services/extensions/common/proxyIdentifie
 import { ExcludeSettingOptions, TextSearchCompleteMessageType, TextSearchContext2, TextSearchMatch2 } from '../../services/search/common/searchExtTypes.js';
 import type * as vscode from 'vscode';
 import { ExtHostCodeMapper } from './extHostCodeMapper.js';
+import { IExtHostMpcService } from './extHostMcp.js';
 
 export interface IExtensionRegistries {
 	mine: ExtensionDescriptionRegistry;
@@ -218,6 +219,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	const extHostStatusBar = rpcProtocol.set(ExtHostContext.ExtHostStatusBar, new ExtHostStatusBar(rpcProtocol, extHostCommands.converter));
 	const extHostSpeech = rpcProtocol.set(ExtHostContext.ExtHostSpeech, new ExtHostSpeech(rpcProtocol));
 	const extHostEmbeddings = rpcProtocol.set(ExtHostContext.ExtHostEmbeddings, new ExtHostEmbeddings(rpcProtocol));
+	rpcProtocol.set(ExtHostContext.ExtHostMcp, accessor.get(IExtHostMpcService));
 
 	// Check that no named customers are missing
 	const expected = Object.values<ProxyIdentifier<any>>(ExtHostContext);
diff --git a/src/vs/workbench/api/common/extHost.common.services.ts b/src/vs/workbench/api/common/extHost.common.services.ts
index c81dd9fab4b0..5551bfa74522 100644
--- a/src/vs/workbench/api/common/extHost.common.services.ts
+++ b/src/vs/workbench/api/common/extHost.common.services.ts
@@ -31,6 +31,7 @@ import { ExtHostAuthentication, IExtHostAuthentication } from './extHostAuthenti
 import { ExtHostLanguageModels, IExtHostLanguageModels } from './extHostLanguageModels.js';
 import { IExtHostTerminalShellIntegration, ExtHostTerminalShellIntegration } from './extHostTerminalShellIntegration.js';
 import { ExtHostTesting, IExtHostTesting } from './extHostTesting.js';
+import { ExtHostMcpService, IExtHostMpcService } from './extHostMcp.js';
 
 registerSingleton(IExtHostLocalizationService, ExtHostLocalizationService, InstantiationType.Delayed);
 registerSingleton(ILoggerService, ExtHostLoggerService, InstantiationType.Delayed);
@@ -58,3 +59,4 @@ registerSingleton(IExtHostWorkspace, ExtHostWorkspace, InstantiationType.Eager);
 registerSingleton(IExtHostSecretState, ExtHostSecretState, InstantiationType.Eager);
 registerSingleton(IExtHostEditorTabs, ExtHostEditorTabs, InstantiationType.Eager);
 registerSingleton(IExtHostVariableResolverProvider, ExtHostVariableResolverProviderService, InstantiationType.Eager);
+registerSingleton(IExtHostMpcService, ExtHostMcpService, InstantiationType.Eager);
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 2fb436bd7f9c..b4b309080198 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -60,6 +60,7 @@ import { IChatRequestVariableValue } from '../../contrib/chat/common/chatVariabl
 import { IChatMessage, IChatResponseFragment, ILanguageModelChatMetadata, ILanguageModelChatSelector, ILanguageModelsChangeEvent } from '../../contrib/chat/common/languageModels.js';
 import { IPreparedToolInvocation, IToolData, IToolInvocation, IToolResult } from '../../contrib/chat/common/languageModelToolsService.js';
 import { DebugConfigurationProviderTriggerKind, IAdapterDescriptor, IConfig, IDebugSessionReplMode, IDebugTestRunReference, IDebugVisualization, IDebugVisualizationContext, IDebugVisualizationTreeItem, MainThreadDebugVisualization } from '../../contrib/debug/common/debug.js';
+import { McpServerLaunch, McpConnectionState } from '../../contrib/mcp/common/mcpTypes.js';
 import * as notebookCommon from '../../contrib/notebook/common/notebookCommon.js';
 import { CellExecutionUpdateType } from '../../contrib/notebook/common/notebookExecutionService.js';
 import { ICellExecutionComplete, ICellExecutionStateUpdate } from '../../contrib/notebook/common/notebookExecutionStateService.js';
@@ -2967,6 +2968,18 @@ export interface ExtHostTestingShape {
 	$disposeTestFollowups(id: number[]): void;
 }
 
+export interface ExtHostMcpShape {
+	$startMcp(id: number, launch: McpServerLaunch): void;
+	$stopMcp(id: number): void;
+	$sendMessage(id: number, message: string): void;
+}
+
+export interface MainThreadMcpShape {
+	$onDidChangeState(id: number, state: McpConnectionState): void;
+	$onDidPublishLog(id: number, log: string): void;
+	$onDidReceiveMessage(id: number, message: string): void;
+}
+
 export interface ExtHostLocalizationShape {
 	getMessage(extensionId: string, details: IStringDetails): string;
 	getBundle(extensionId: string): { [key: string]: string } | undefined;
@@ -3113,6 +3126,7 @@ export const MainContext = {
 	MainThreadTimeline: createProxyIdentifier<MainThreadTimelineShape>('MainThreadTimeline'),
 	MainThreadTesting: createProxyIdentifier<MainThreadTestingShape>('MainThreadTesting'),
 	MainThreadLocalization: createProxyIdentifier<MainThreadLocalizationShape>('MainThreadLocalizationShape'),
+	MainThreadMcp: createProxyIdentifier<MainThreadMcpShape>('MainThreadMcpShape'),
 	MainThreadAiRelatedInformation: createProxyIdentifier<MainThreadAiRelatedInformationShape>('MainThreadAiRelatedInformation'),
 	MainThreadAiEmbeddingVector: createProxyIdentifier<MainThreadAiEmbeddingVectorShape>('MainThreadAiEmbeddingVector')
 };
@@ -3184,5 +3198,6 @@ export const ExtHostContext = {
 	ExtHostTimeline: createProxyIdentifier<ExtHostTimelineShape>('ExtHostTimeline'),
 	ExtHostTesting: createProxyIdentifier<ExtHostTestingShape>('ExtHostTesting'),
 	ExtHostTelemetry: createProxyIdentifier<ExtHostTelemetryShape>('ExtHostTelemetry'),
-	ExtHostLocalization: createProxyIdentifier<ExtHostLocalizationShape>('ExtHostLocalization')
+	ExtHostLocalization: createProxyIdentifier<ExtHostLocalizationShape>('ExtHostLocalization'),
+	ExtHostMcp: createProxyIdentifier<ExtHostMcpShape>('ExtHostMcp'),
 };
diff --git a/src/vs/workbench/api/common/extHostMcp.ts b/src/vs/workbench/api/common/extHostMcp.ts
new file mode 100644
index 000000000000..da65186caea0
--- /dev/null
+++ b/src/vs/workbench/api/common/extHostMcp.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 { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { McpServerLaunch } from '../../contrib/mcp/common/mcpTypes.js';
+import { ExtHostMcpShape, MainContext, MainThreadMcpShape } from './extHost.protocol.js';
+import { IExtHostRpcService } from './extHostRpcService.js';
+
+
+export const IExtHostMpcService = createDecorator<IExtHostMpcService>('IExtHostMpcService');
+
+export interface IExtHostMpcService extends ExtHostMcpShape { }
+
+export class ExtHostMcpService implements IExtHostMpcService {
+	protected _proxy: MainThreadMcpShape;
+
+	constructor(
+		@IExtHostRpcService extHostRpc: IExtHostRpcService,
+	) {
+		this._proxy = extHostRpc.getProxy(MainContext.MainThreadMcp);
+	}
+
+	$startMcp(id: number, launch: McpServerLaunch): void {
+		// todo: SSE launches can be implemented in this common layer
+		throw new Error('not implemented');
+	}
+
+	$stopMcp(id: number): void {
+		// no-op
+	}
+
+	$sendMessage(id: number, message: string): void {
+		// no-op
+	}
+}
diff --git a/src/vs/workbench/api/node/extHost.node.services.ts b/src/vs/workbench/api/node/extHost.node.services.ts
index ade6d90abb40..331d9a7b180e 100644
--- a/src/vs/workbench/api/node/extHost.node.services.ts
+++ b/src/vs/workbench/api/node/extHost.node.services.ts
@@ -27,6 +27,8 @@ import { SyncDescriptor } from '../../../platform/instantiation/common/descripto
 import { ISignService } from '../../../platform/sign/common/sign.js';
 import { SignService } from '../../../platform/sign/node/signService.js';
 import { ExtHostTelemetry, IExtHostTelemetry } from '../common/extHostTelemetry.js';
+import { IExtHostMpcService } from '../common/extHostMcp.js';
+import { NodeExtHostMpcService } from './extHostMpcNode.js';
 
 // #########################################################################
 // ###                                                                   ###
@@ -47,3 +49,4 @@ registerSingleton(IExtHostTask, ExtHostTask, InstantiationType.Eager);
 registerSingleton(IExtHostTerminalService, ExtHostTerminalService, InstantiationType.Eager);
 registerSingleton(IExtHostTunnelService, NodeExtHostTunnelService, InstantiationType.Eager);
 registerSingleton(IExtHostVariableResolverProvider, NodeExtHostVariableResolverProviderService, InstantiationType.Eager);
+registerSingleton(IExtHostMpcService, NodeExtHostMpcService, InstantiationType.Eager);
diff --git a/src/vs/workbench/api/node/extHostMpcNode.ts b/src/vs/workbench/api/node/extHostMpcNode.ts
new file mode 100644
index 000000000000..1277212df655
--- /dev/null
+++ b/src/vs/workbench/api/node/extHostMpcNode.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 { ChildProcessWithoutNullStreams, spawn } from 'child_process';
+import { mapValues } from '../../../base/common/objects.js';
+import { URI } from '../../../base/common/uri.js';
+import { StreamSplitter } from '../../../base/node/nodeStreams.js';
+import { McpConnectionState, McpServerLaunch, McpServerTransportStdio, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
+import { ExtHostMcpService } from '../common/extHostMcp.js';
+import { IExtHostRpcService } from '../common/extHostRpcService.js';
+
+export class NodeExtHostMpcService extends ExtHostMcpService {
+	constructor(
+		@IExtHostRpcService extHostRpc: IExtHostRpcService,
+	) {
+		super(extHostRpc);
+	}
+
+	private nodeServers = new Map<number, {
+		abortCtrl: AbortController;
+		child: ChildProcessWithoutNullStreams;
+	}>();
+
+	override $startMcp(id: number, launch: McpServerLaunch): void {
+		if (launch.type === McpServerTransportType.Stdio) {
+			this.startNodeMpc(id, launch);
+		} else {
+			super.$startMcp(id, launch);
+		}
+	}
+
+	override $stopMcp(id: number): void {
+		const nodeServer = this.nodeServers.get(id);
+		if (nodeServer) {
+			nodeServer.abortCtrl.abort();
+			this.nodeServers.delete(id);
+		} else {
+			super.$stopMcp(id);
+		}
+	}
+
+	override $sendMessage(id: number, message: string): void {
+		const nodeServer = this.nodeServers.get(id);
+		if (nodeServer) {
+			nodeServer.child.stdin.write(message + '\n');
+		} else {
+			super.$sendMessage(id, message);
+		}
+	}
+
+	private startNodeMpc(id: number, launch: McpServerTransportStdio): void {
+		const onError = (err: Error) => this._proxy.$onDidChangeState(id, {
+			state: McpConnectionState.Kind.Error,
+			message: err.message,
+		});
+
+		const abortCtrl = new AbortController();
+		let child: ChildProcessWithoutNullStreams;
+		try {
+			child = spawn(launch.command, launch.args, {
+				stdio: 'pipe',
+				cwd: URI.revive(launch.cwd).fsPath,
+				signal: abortCtrl.signal,
+				env: {
+					...process.env,
+					...mapValues(launch.env, v => typeof v === 'number' ? String(v) : (v === null ? undefined : v)),
+				},
+			});
+		} catch (e) {
+			onError(e);
+			abortCtrl.abort();
+			return;
+		}
+
+		this._proxy.$onDidChangeState(id, { state: McpConnectionState.Kind.Starting });
+
+		child.stdout.pipe(new StreamSplitter('\n')).on('data', line => this._proxy.$onDidReceiveMessage(id, line.toString()));
+
+		// Stderr handling is not currently specified https://github.com/modelcontextprotocol/specification/issues/177
+		// Just treat it as generic log data for now
+		child.stderr.pipe(new StreamSplitter('\n')).on('data', line => this._proxy.$onDidPublishLog(id, line.toString()));
+
+		child.on('spawn', () => this._proxy.$onDidChangeState(id, { state: McpConnectionState.Kind.Running }));
+
+		child.on('error', onError);
+		child.on('exit', code =>
+			code === 0
+				? this._proxy.$onDidChangeState(id, { state: McpConnectionState.Kind.Stopped })
+				: this._proxy.$onDidChangeState(id, {
+					state: McpConnectionState.Kind.Error,
+					message: `Process exited with code ${code}`,
+				})
+		);
+
+		this.nodeServers.set(id, { abortCtrl, child });
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
new file mode 100644
index 000000000000..0e31680a7310
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.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 { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+import { McpRegistry } from '../common/mcpRegistry.js';
+import { IMcpRegistry } from '../common/mcpRegistryTypes.js';
+import { McpService } from '../common/mcpService.js';
+import { IMcpService } from '../common/mcpTypes.js';
+
+import './mcpCommands.js';
+import { McpDiscovery } from './mcpDiscovery.js';
+
+registerSingleton(IMcpRegistry, McpRegistry, InstantiationType.Delayed);
+registerSingleton(IMcpService, McpService, InstantiationType.Delayed);
+
+registerWorkbenchContribution2('mcpDiscovery', McpDiscovery, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
new file mode 100644
index 000000000000..af168e5d07a4
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.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 { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../base/common/observable.js';
+import { ILocalizedString, localize, localize2 } from '../../../../nls.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { IMcpService, McpConnectionState } from '../common/mcpTypes.js';
+
+// acroynms do not get localized
+const category: ILocalizedString = {
+	original: 'MCP',
+	value: 'MCP',
+};
+
+class ListMcpServerCommand extends Action2 {
+	public static readonly id = 'workbench.mcp.listServer';
+	constructor() {
+		super({
+			id: ListMcpServerCommand.id,
+			title: localize2('mcp.list', 'List Servers'),
+			category,
+			f1: true,
+		});
+	}
+
+	override async run(accessor: ServicesAccessor) {
+		const mcpService = accessor.get(IMcpService);
+		const commandService = accessor.get(ICommandService);
+		const quickInput = accessor.get(IQuickInputService);
+
+		type ItemType = { id: string } & IQuickPickItem;
+
+		const store = new DisposableStore();
+		const pick = quickInput.createQuickPick<ItemType>();
+
+		store.add(pick);
+		store.add(autorun(reader => {
+			const servers = mcpService.servers.read(reader);
+			pick.items = servers.map(server => ({
+				id: server.definition.id,
+				label: server.definition.label,
+				description: McpConnectionState.toString(server.state.read(reader)),
+			}));
+		}));
+
+
+		const picked = await new Promise<ItemType | undefined>(resolve => {
+			pick.onDidAccept(() => {
+				resolve(pick.activeItems[0]);
+			});
+			pick.onDidHide(() => {
+				resolve(undefined);
+			});
+			pick.show();
+		});
+
+		store.dispose();
+
+		if (picked) {
+			commandService.executeCommand(McpServerOptionsCommand.id, picked.id);
+		}
+	}
+}
+registerAction2(ListMcpServerCommand);
+
+
+class McpServerOptionsCommand extends Action2 {
+	public static readonly id = 'workbench.mcp.serverOptions';
+
+	constructor() {
+		super({
+			id: McpServerOptionsCommand.id,
+			title: localize2('mcp.options', 'Server Options'),
+			category,
+			f1: true,
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, id: string): Promise<void> {
+		const mcpService = accessor.get(IMcpService);
+		const quickInputService = accessor.get(IQuickInputService);
+		const server = mcpService.servers.get().find(s => s.definition.id === id);
+		if (!server) {
+			return;
+		}
+
+		interface ActionItem extends IQuickPickItem {
+			action: 'start' | 'stop' | 'restart' | 'showOutput';
+		}
+
+		const items: ActionItem[] = [];
+		const serverState = server.state.get();
+
+		// Only show start when server is stopped or in error state
+		if (McpConnectionState.canBeStarted(serverState.state)) {
+			items.push({
+				label: localize2('mcp.start', 'Start Server').value,
+				action: 'start'
+			});
+		} else {
+			items.push({
+				label: localize2('mcp.stop', 'Stop Server').value,
+				action: 'stop'
+			});
+			items.push({
+				label: localize2('mcp.restart', 'Restart Server').value,
+				action: 'restart'
+			});
+		}
+
+		items.push({
+			label: localize2('mcp.showOutput', 'Show Output').value,
+			action: 'showOutput'
+		});
+
+		const pick = await quickInputService.pick(items, {
+			placeHolder: localize('mcp.selectAction', 'Select Server Action')
+		});
+
+		if (!pick) {
+			return;
+		}
+
+		switch (pick.action) {
+			case 'start':
+				await server.start();
+				break;
+			case 'stop':
+				await server.stop();
+				break;
+			case 'restart':
+				await server.stop();
+				await server.start();
+				break;
+			case 'showOutput':
+				server.showOutput();
+				break;
+		}
+	}
+}
+registerAction2(McpServerOptionsCommand);
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpDiscovery.ts b/src/vs/workbench/contrib/mcp/browser/mcpDiscovery.ts
new file mode 100644
index 000000000000..87b575e5a1a3
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/browser/mcpDiscovery.ts
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { observableValue } from '../../../../base/common/observable.js';
+import { Platform, platform } from '../../../../base/common/platform.js';
+import { URI } from '../../../../base/common/uri.js';
+import { INativeEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { StorageScope } from '../../../../platform/storage/common/storage.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IMcpRegistry } from '../common/mcpRegistryTypes.js';
+import { McpServerDefinition, McpServerTransportType } from '../common/mcpTypes.js';
+
+export class McpDiscovery implements IWorkbenchContribution {
+	public static readonly ID = 'workbench.contrib.mcp.discovery';
+
+	constructor(
+		@INativeEnvironmentService environmentService: INativeEnvironmentService,
+		@IFileService fileService: IFileService,
+		@IMcpRegistry mcpRegistry: IMcpRegistry
+	) {
+
+		const homeDir = environmentService.userHome;
+		//#region hacked in reading for claude desktop config
+		let configPath: URI;
+		if (platform === Platform.Windows) {
+			const appData = /* process.env.APPDATA ||*/ URI.joinPath(environmentService.userHome, 'AppData', 'Roaming');
+			configPath = URI.joinPath(appData, 'Claude', 'claude_desktop_config.json');
+		} else if (platform === Platform.Mac) {
+			configPath = URI.joinPath(environmentService.userHome, 'Library', 'Application Support', 'Claude', 'claude_desktop_config.json');
+		} else {
+			const configDir = /*process.env.XDG_CONFIG_HOME || */URI.joinPath(environmentService.userHome, '.config');
+			configPath = URI.joinPath(configDir, 'Claude', 'claude_desktop_config.json');
+		}
+
+
+		fileService.readFile(configPath).then((content) => {
+			let parsed: {
+				mcpServers: Record<string, {
+					command: string;
+					args?: string[];
+					env?: Record<string, string>;
+				}>;
+			};
+
+			try {
+				parsed = JSON.parse(content.value.toString());
+			} catch {
+				return;
+			}
+			const definitions = Object.entries(parsed.mcpServers).map(([name, server]): McpServerDefinition => {
+				return {
+					id: `claude_desktop_config.${name}`,
+					label: name,
+					launch: {
+						type: McpServerTransportType.Stdio,
+						args: server.args || [],
+						command: server.command,
+						env: server.env || {},
+						cwd: homeDir,
+					}
+				};
+			});
+
+			mcpRegistry.registerCollection({
+				id: 'claude_desktop_config',
+				label: 'Claude Desktop',
+				isTrustedByDefault: false,
+				remoteAuthority: null,
+				scope: StorageScope.APPLICATION,
+				serverDefinitions: observableValue(this, definitions),
+			});
+		}, () => { });
+
+		//#endregion
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
new file mode 100644
index 000000000000..417599b5d87f
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistry.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 { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { IObservable, observableValue } from '../../../../base/common/observable.js';
+import { isEmptyObject } from '../../../../base/common/types.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
+import { IMcpHostDelegate, IMcpRegistry } from './mcpRegistryTypes.js';
+import { McpServerConnection } from './mcpServerConnection.js';
+import { McpCollectionDefinition, IMcpServerConnection, McpServerDefinition } from './mcpTypes.js';
+
+export class McpRegistry extends Disposable implements IMcpRegistry {
+	declare public readonly _serviceBrand: undefined;
+
+	private readonly _collections = observableValue<readonly McpCollectionDefinition[]>('collections', []);
+	private readonly _delegates: IMcpHostDelegate[] = [];
+
+	public readonly collections: IObservable<readonly McpCollectionDefinition[]> = this._collections;
+
+	public get delegates(): readonly IMcpHostDelegate[] {
+		return this._delegates;
+	}
+
+	constructor(
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IConfigurationResolverService private readonly _configurationResolverService: IConfigurationResolverService,
+		@IStorageService private readonly _storageService: IStorageService,
+	) {
+		super();
+	}
+
+	public registerDelegate(delegate: IMcpHostDelegate): IDisposable {
+		this._delegates.push(delegate);
+		return {
+			dispose: () => {
+				const index = this._delegates.indexOf(delegate);
+				if (index !== -1) {
+					this._delegates.splice(index, 1);
+				}
+			}
+		};
+	}
+
+	public registerCollection(collection: McpCollectionDefinition): IDisposable {
+		const currentCollections = this._collections.get();
+		this._collections.set([...currentCollections, collection], undefined);
+
+		return {
+			dispose: () => {
+				const currentCollections = this._collections.get();
+				this._collections.set(currentCollections.filter(c => c !== collection), undefined);
+			}
+		};
+	}
+
+	public hasSavedInputs(collection: McpCollectionDefinition, definition: McpServerDefinition): boolean {
+		const stored = this.getInputStorageData(collection, definition);
+		return !!stored && !isEmptyObject(stored.map);
+	}
+
+	public clearSavedInputs(collection: McpCollectionDefinition, definition: McpServerDefinition) {
+		const stored = this.getInputStorageData(collection, definition);
+		if (stored) {
+			this._storageService.remove(stored.key, stored.scope);
+		}
+	}
+
+	public async resolveConnection(
+		collection: McpCollectionDefinition,
+		definition: McpServerDefinition
+	): Promise<IMcpServerConnection> {
+		const delegate = this._delegates.find(d => d.canStart(collection, definition));
+		if (!delegate) {
+			throw new Error('No delegate found that can handle the connection');
+		}
+
+		let launch = definition.launch;
+
+		const storage = this.getInputStorageData(collection, definition);
+		if (definition.variableReplacement && storage) {
+			const { folder, section, target } = definition.variableReplacement;
+			// based on _configurationResolverService.resolveWithInteractionReplace
+			launch = await this._configurationResolverService.resolveAnyAsync(folder, section);
+
+			const newVariables = await this._configurationResolverService.resolveWithInteraction(folder, launch, section, storage.map, target);
+
+			if (newVariables?.size) {
+				launch = await this._configurationResolverService.resolveAnyAsync(folder, launch, Object.fromEntries(newVariables));
+				this._storageService.store(storage.key, JSON.stringify(Object.fromEntries(newVariables)), storage.scope, StorageTarget.MACHINE);
+			}
+		}
+
+		return this._instantiationService.createInstance(
+			McpServerConnection,
+			collection,
+			definition,
+			delegate,
+			launch,
+		);
+	}
+
+	private getInputStorageData(collection: McpCollectionDefinition, definition: McpServerDefinition) {
+		if (!definition.variableReplacement) {
+			return undefined;
+		}
+
+		const key = `mcpConfig.${collection.id}.${definition.id}`;
+		const scope = definition.variableReplacement.folder ? StorageScope.WORKSPACE : StorageScope.APPLICATION;
+
+		let map: Record<string, string> | undefined;
+		try {
+			map = this._storageService.getObject(key, scope);
+		} catch {
+			// ignord
+		}
+
+		return { key, scope, map };
+	}
+}
+
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
new file mode 100644
index 000000000000..9659bc986daa
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { IDisposable } from '../../../../base/common/lifecycle.js';
+import { IObservable } from '../../../../base/common/observable.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { McpCollectionDefinition, McpServerDefinition, McpServerLaunch, McpConnectionState, IMcpServerConnection } from './mcpTypes.js';
+import { MCP } from './modelContextProtocol.js';
+
+export const IMcpRegistry = createDecorator<IMcpRegistry>('mcpRegistry');
+
+/** Message transport to a single MCP server. */
+export interface IMcpMessageTransport extends IDisposable {
+	readonly state: IObservable<McpConnectionState>;
+	readonly onDidLog: Event<string>;
+	readonly onDidReceiveMessage: Event<MCP.JSONRPCMessage>;
+	send(message: MCP.JSONRPCMessage): void;
+	stop(): void;
+}
+
+export interface IMcpHostDelegate {
+	canStart(collectionDefinition: McpCollectionDefinition, serverDefinition: McpServerDefinition): boolean;
+	start(collectionDefinition: McpCollectionDefinition, serverDefinition: McpServerDefinition, resolvedLaunch: McpServerLaunch): IMcpMessageTransport;
+}
+
+export interface IMcpRegistry {
+	readonly _serviceBrand: undefined;
+
+	readonly collections: IObservable<readonly McpCollectionDefinition[]>;
+	readonly delegates: readonly IMcpHostDelegate[];
+
+	registerDelegate(delegate: IMcpHostDelegate): IDisposable;
+	registerCollection(collection: McpCollectionDefinition): IDisposable;
+
+	/** Gets whether there are saved inputs used to resolve the connection */
+	hasSavedInputs(collection: McpCollectionDefinition, definition: McpServerDefinition): boolean;
+	/** Resets any saved inputs for the connection. */
+	clearSavedInputs(collection: McpCollectionDefinition, definition: McpServerDefinition): void;
+	/** Createse a connection for the collection and definition. */
+	resolveConnection(collection: McpCollectionDefinition, definition: McpServerDefinition): Promise<IMcpServerConnection>;
+}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServer.ts b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
new file mode 100644
index 000000000000..8d8c2c294b08
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
@@ -0,0 +1,226 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Sequencer } from '../../../../base/common/async.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { CancellationError } from '../../../../base/common/errors.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { LRUCache } from '../../../../base/common/map.js';
+import { autorun, autorunWithStore, derived, disposableObservableValue, IObservable, ITransaction, observableFromEvent, ObservablePromise, observableValue, transaction } from '../../../../base/common/observable.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IMcpRegistry } from './mcpRegistryTypes.js';
+import { McpServerRequestHandler } from './mcpServerRequestHandler.js';
+import { McpCollectionDefinition, IMcpServer, IMcpServerConnection, McpServerDefinition, IMcpTool, McpConnectionFailedError, McpConnectionState } from './mcpTypes.js';
+import { MCP } from './modelContextProtocol.js';
+
+
+interface IMetadataCacheEntry {
+	/** Cached tools so we can show what's available before it's started */
+	readonly tools: readonly MCP.Tool[];
+}
+
+export class McpServerMetadataCache extends Disposable {
+	private didChange = false;
+	private readonly cache = new LRUCache<string, IMetadataCacheEntry>(128);
+
+	constructor(
+		scope: StorageScope,
+		@IStorageService storageService: IStorageService,
+	) {
+		super();
+
+		type StoredType = [string, IMetadataCacheEntry][];
+
+		const storageKey = 'mcpToolCache';
+		this._register(storageService.onWillSaveState(() => {
+			if (this.didChange) {
+				storageService.store(storageKey, this.cache.toJSON() satisfies StoredType, scope, StorageTarget.MACHINE);
+				this.didChange = false;
+			}
+		}));
+
+		try {
+			const cached: StoredType | undefined = storageService.getObject(storageKey, scope);
+			cached?.forEach(([k, v]) => this.cache.set(k, v));
+		} catch {
+			// ignored
+		}
+	}
+
+	getTools(definitionId: string): readonly MCP.Tool[] | undefined {
+		return this.cache.get(definitionId)?.tools;
+	}
+
+	storeTools(definitionId: string, tools: readonly MCP.Tool[]): void {
+		this.cache.set(definitionId, { ...this.cache.get(definitionId), tools });
+		this.didChange = true;
+	}
+}
+
+export class McpServer extends Disposable implements IMcpServer {
+	private readonly _connectionSequencer = new Sequencer();
+	private readonly _connection = this._register(disposableObservableValue<IMcpServerConnection | undefined>(this, undefined));
+
+	public readonly state: IObservable<McpConnectionState> = derived(reader => this._connection.read(reader)?.state.read(reader) ?? { state: McpConnectionState.Kind.Stopped });
+
+	private get toolsFromCache() {
+		return this._toolCache.getTools(this.definition.id);
+	}
+	private readonly toolsFromServerPromise = observableValue<ObservablePromise<readonly MCP.Tool[]> | undefined>(this, undefined);
+	private readonly toolsFromServer = derived(reader => this.toolsFromServerPromise.read(reader)?.promiseResult.read(reader)?.data);
+
+	public readonly tools = derived(reader => {
+		const serverTools = this.toolsFromServer.read(reader);
+		const definitions = serverTools ?? this.toolsFromCache ?? [];
+		return definitions.map(def => new McpTool(this, def));
+	});
+
+	constructor(
+		public readonly collection: McpCollectionDefinition,
+		public readonly definition: McpServerDefinition,
+		private readonly _toolCache: McpServerMetadataCache,
+		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry,
+		@IWorkspaceContextService workspacesService: IWorkspaceContextService,
+	) {
+		super();
+
+		// 1. Reflect workspaces into the MCP roots
+		const workspaces = observableFromEvent(
+			this,
+			workspacesService.onDidChangeWorkspaceFolders,
+			() => workspacesService.getWorkspace().folders,
+		);
+
+		this._register(autorunWithStore(reader => {
+			const cnx = this._connection.read(reader)?.handler.read(reader);
+			if (!cnx) {
+				return;
+			}
+
+			cnx.roots = workspaces.read(reader).map(wf => ({
+				uri: wf.uri.toString(),
+				name: wf.name,
+			}));
+		}));
+
+		// 2. Populate this.tools when we connect to a server.
+		this._register(autorunWithStore((reader, store) => {
+			const cnx = this._connection.read(reader)?.handler.read(reader);
+			if (cnx) {
+				this.populateLiveData(cnx, store);
+			} else {
+				this.resetLiveData();
+			}
+		}));
+
+		// 3. Update the cache when tools update
+		this._register(autorun(reader => {
+			const tools = this.toolsFromServer.read(reader);
+			if (tools) {
+				this._toolCache.storeTools(definition.id, tools);
+			}
+		}));
+	}
+
+	public showOutput(): void {
+		this._connection.get()?.showOutput();
+	}
+
+	public start(): Promise<McpConnectionState> {
+		return this._connectionSequencer.queue(async () => {
+			let connection = this._connection.get();
+			if (!connection) {
+				connection = await this._mcpRegistry.resolveConnection(this.collection, this.definition);
+				if (this._store.isDisposed) {
+					connection.dispose();
+					return { state: McpConnectionState.Kind.Stopped };
+				}
+
+				this._connection.set(connection, undefined);
+			}
+
+			return connection.start();
+		});
+	}
+
+	public stop(): Promise<void> {
+		return this._connection.get()?.stop() || Promise.resolve();
+	}
+
+	private resetLiveData() {
+		transaction(tx => {
+			this.toolsFromServerPromise.set(undefined, tx);
+		});
+	}
+
+	private populateLiveData(handler: McpServerRequestHandler, store: DisposableStore) {
+		const cts = new CancellationTokenSource();
+		store.add(toDisposable(() => cts.dispose(true)));
+
+		// todo: add more than just tools here
+
+		const updateTools = (tx: ITransaction | undefined) => {
+			this.toolsFromServerPromise.set(new ObservablePromise(handler.listTools({}, cts.token)), tx);
+		};
+
+		store.add(handler.onDidChangeToolList(() => updateTools(undefined)));
+
+		transaction(tx => {
+			updateTools(tx);
+		});
+	}
+
+	/**
+	 * Helper function to call the function on the handler once it's online. The
+	 * connection started if it is not already.
+	 */
+	public callOn<R>(fn: (handler: McpServerRequestHandler) => Promise<R>, token?: CancellationToken): Promise<R> {
+		const store = new DisposableStore();
+		this.start(); // idempotent
+
+		try {
+			return new Promise((resolve, reject) => {
+				if (token) {
+					store.add(token.onCancellationRequested(() => {
+						reject(new CancellationError());
+					}));
+				}
+				store.add(autorun(reader => {
+					const connection = this._connection.read(reader);
+					if (!connection) {
+						return;
+					}
+
+					const handler = connection.handler.read(reader);
+					if (handler) {
+						resolve(fn(handler));
+						store.dispose(); // aggressive dispose to prevent multiple racey calls
+					} else {
+						const state = connection.state.read(reader);
+						if (state.state === McpConnectionState.Kind.Error) {
+							reject(new McpConnectionFailedError(`MCP server could not be started: ${state.message}`));
+						} else {
+							reject(new McpConnectionFailedError('MCP server has stopped'));
+						}
+					}
+				}));
+			});
+		} finally {
+			store.dispose();
+		}
+	}
+}
+
+export class McpTool implements IMcpTool {
+	constructor(
+		private readonly _server: McpServer,
+		public readonly definition: MCP.Tool,
+	) { }
+
+	call(params: Record<string, unknown>, token?: CancellationToken): Promise<MCP.CallToolResult> {
+		return this._server.callOn(h => h.callTool({ name: this.definition.name, arguments: params }), token);
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServerConnection.ts b/src/vs/workbench/contrib/mcp/common/mcpServerConnection.ts
new file mode 100644
index 000000000000..ee65077e9da9
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/mcpServerConnection.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 { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { Disposable, DisposableStore, IReference, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun, IObservable, observableValue } from '../../../../base/common/observable.js';
+import { localize } from '../../../../nls.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogger, ILoggerService } from '../../../../platform/log/common/log.js';
+import { IOutputService } from '../../../services/output/common/output.js';
+import { IMcpHostDelegate, IMcpMessageTransport } from './mcpRegistryTypes.js';
+import { McpServerRequestHandler } from './mcpServerRequestHandler.js';
+import { McpCollectionDefinition, IMcpServerConnection, McpServerDefinition, McpConnectionState, McpServerLaunch } from './mcpTypes.js';
+
+export class McpServerConnection extends Disposable implements IMcpServerConnection {
+	private readonly _launch = this._register(new MutableDisposable<IReference<IMcpMessageTransport>>());
+	private readonly _state = observableValue<McpConnectionState>('mcpServerState', { state: McpConnectionState.Kind.Stopped });
+	private readonly _requestHandler = observableValue<McpServerRequestHandler | undefined>('mcpServerRequestHandler', undefined);
+
+	public readonly state: IObservable<McpConnectionState> = this._state;
+	public readonly handler: IObservable<McpServerRequestHandler | undefined> = this._requestHandler;
+
+	private readonly _loggerId: string;
+	private readonly _logger: ILogger;
+
+	constructor(
+		private readonly _collection: McpCollectionDefinition,
+		public readonly definition: McpServerDefinition,
+		private readonly _delegate: IMcpHostDelegate,
+		private readonly _launchDefinition: McpServerLaunch,
+		@ILoggerService private readonly _loggerService: ILoggerService,
+		@IOutputService private readonly _outputService: IOutputService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+	) {
+		super();
+		this._loggerId = `mcpServer/${definition.id}`;
+		this._logger = this._register(_loggerService.createLogger(this._loggerId, { hidden: true, name: `MCP: ${definition.label}` }));
+	}
+
+	/** @inheritdoc */
+	public showOutput(): void {
+		this._loggerService.setVisibility(this._loggerId, true);
+		this._outputService.showChannel(this._loggerId);
+	}
+
+	/** @inheritdoc */
+	public async start(): Promise<McpConnectionState> {
+		const currentState = this._state.get();
+		if (!McpConnectionState.canBeStarted(currentState.state)) {
+			return this._waitForState(McpConnectionState.Kind.Running, McpConnectionState.Kind.Error);
+		}
+
+		this._launch.value = undefined;
+		this._state.set({ state: McpConnectionState.Kind.Starting }, undefined);
+		this._logger.info(localize('mcpServer.starting', 'Starting server {0}', this.definition.label));
+
+		try {
+			const launch = this._delegate.start(this._collection, this.definition, this._launchDefinition);
+			this._launch.value = this.adoptLaunch(launch);
+			return this._waitForState(McpConnectionState.Kind.Running, McpConnectionState.Kind.Error);
+		} catch (e) {
+			const errorState: McpConnectionState = {
+				state: McpConnectionState.Kind.Error,
+				message: e instanceof Error ? e.message : String(e)
+			};
+			this._state.set(errorState, undefined);
+			return errorState;
+		}
+	}
+
+	private adoptLaunch(launch: IMcpMessageTransport): IReference<IMcpMessageTransport> {
+		const store = new DisposableStore();
+		const cts = new CancellationTokenSource();
+
+		store.add(toDisposable(() => cts.dispose(true)));
+		store.add(launch);
+		store.add(launch.onDidLog(msg => {
+			this._logger.info(msg);
+		}));
+		store.add(autorun(reader => {
+			const state = launch.state.read(reader);
+			this._state.set(state, undefined);
+			this._logger.info(localize('mcpServer.state', 'Connection state: {0}', McpConnectionState.toString(state)));
+
+			if (state.state === McpConnectionState.Kind.Running) {
+				McpServerRequestHandler.create(this._instantiationService, launch, this._logger, cts.token).then(
+					handler => this._requestHandler.set(handler, undefined),
+					err => {
+						store.dispose();
+						this._logger.error(err);
+						this._state.set({ state: McpConnectionState.Kind.Error, message: `Could not initialize MCP server: ${err.message}` }, undefined);
+					},
+				);
+			}
+		}));
+
+		return { dispose: () => store.dispose(), object: launch };
+	}
+
+	public async stop(): Promise<void> {
+		this._logger.info(localize('mcpServer.stopping', 'Stopping server {0}', this.definition.label));
+		this._launch.value?.object.stop();
+		await this._waitForState(McpConnectionState.Kind.Stopped, McpConnectionState.Kind.Error);
+	}
+
+	public override dispose(): void {
+		super.dispose();
+		this._state.set({ state: McpConnectionState.Kind.Stopped }, undefined);
+	}
+
+	private _waitForState(...kinds: McpConnectionState.Kind[]): Promise<McpConnectionState> {
+		return new Promise(resolve => {
+			const disposable = autorun(reader => {
+				const state = this._state.read(reader);
+				if (kinds.includes(state.state)) {
+					disposable.dispose();
+					resolve(state);
+				}
+			});
+		});
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServerRequestHandler.ts b/src/vs/workbench/contrib/mcp/common/mcpServerRequestHandler.ts
new file mode 100644
index 000000000000..572c4ef2e159
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/mcpServerRequestHandler.ts
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+import { equals } from '../../../../base/common/arrays.js';
+import { DeferredPromise } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogger } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IMcpMessageTransport } from './mcpRegistryTypes.js';
+import { MpcResponseError } from './mcpTypes.js';
+import { MCP } from './modelContextProtocol.js';
+
+/**
+ * Maps request IDs to handlers.
+ */
+interface PendingRequest {
+	promise: DeferredPromise<MCP.Result>;
+}
+
+export interface McpRoot {
+	uri: string;
+	name?: string;
+}
+
+/**
+ * Request handler for communicating with an MCP server.
+ *
+ * Handles sending requests and receiving responses, with automatic
+ * handling of ping requests and typed client request methods.
+ */
+export class McpServerRequestHandler extends Disposable {
+	private _nextRequestId = 1;
+	private readonly _pendingRequests = new Map<MCP.RequestId, PendingRequest>();
+
+	private _hasAnnouncedRoots = false;
+	private _roots: MCP.Root[] = [];
+
+	public set roots(roots: MCP.Root[]) {
+		if (!equals(this._roots, roots)) {
+			this._roots = roots;
+			if (this._hasAnnouncedRoots) {
+				this.sendNotification({ method: 'notifications/roots/list_changed' });
+				this._hasAnnouncedRoots = false;
+			}
+		}
+	}
+
+	private _serverInit!: MCP.InitializeResult;
+	public get capabilities(): MCP.ServerCapabilities {
+		return this._serverInit.capabilities;
+	}
+
+	// Event emitters for server notifications
+	private readonly _onDidReceiveCancelledNotification = this._register(new Emitter<MCP.CancelledNotification>());
+	readonly onDidReceiveCancelledNotification = this._onDidReceiveCancelledNotification.event;
+
+	private readonly _onDidReceiveProgressNotification = this._register(new Emitter<MCP.ProgressNotification>());
+	readonly onDidReceiveProgressNotification = this._onDidReceiveProgressNotification.event;
+
+	private readonly _onDidChangeResourceList = this._register(new Emitter<void>());
+	readonly onDidChangeResourceList = this._onDidChangeResourceList.event;
+
+	private readonly _onDidUpdateResource = this._register(new Emitter<MCP.ResourceUpdatedNotification>());
+	readonly onDidUpdateResource = this._onDidUpdateResource.event;
+
+	private readonly _onDidChangeToolList = this._register(new Emitter<void>());
+	readonly onDidChangeToolList = this._onDidChangeToolList.event;
+
+	private readonly _onDidChangePromptList = this._register(new Emitter<void>());
+	readonly onDidChangePromptList = this._onDidChangePromptList.event;
+
+	/**
+	 * Connects to the MCP server and does the initialization handshake.
+	 * @throws MpcResponseError if the server fails to initialize.
+	 */
+	public static async create(instaService: IInstantiationService, launch: IMcpMessageTransport, logger: ILogger, token?: CancellationToken) {
+		const mcp = new McpServerRequestHandler(launch, logger);
+		try {
+			await instaService.invokeFunction(async accessor => {
+				const productService = accessor.get(IProductService);
+				const initialized = await mcp.sendRequest<MCP.InitializeRequest, MCP.InitializeResult>({
+					method: 'initialize',
+					params: {
+						protocolVersion: MCP.LATEST_PROTOCOL_VERSION,
+						capabilities: {
+							roots: { listChanged: true },
+						},
+						clientInfo: {
+							name: productService.nameLong,
+							version: productService.version,
+						}
+					}
+				}, token);
+
+				mcp._serverInit = initialized;
+			});
+
+			return mcp;
+		} catch (e) {
+			mcp.dispose();
+			throw e;
+		}
+	}
+
+	protected constructor(
+		private readonly launch: IMcpMessageTransport,
+		private readonly logger: ILogger,
+	) {
+		super();
+		this._register(launch.onDidReceiveMessage(message => this.handleMessage(message)));
+	}
+
+	/**
+	 * Send a client request to the server and return the response.
+	 *
+	 * @param request The request to send
+	 * @param token Cancellation token
+	 * @param timeoutMs Optional timeout in milliseconds
+	 * @returns A promise that resolves with the response
+	 */
+	private async sendRequest<T extends MCP.ClientRequest, R extends MCP.ServerResult>(
+		request: Pick<T, 'params' | 'method'>,
+		token: CancellationToken = CancellationToken.None
+	): Promise<R> {
+		const id = this._nextRequestId++;
+
+		// Create the full JSON-RPC request
+		const jsonRpcRequest: MCP.JSONRPCRequest = {
+			jsonrpc: MCP.JSONRPC_VERSION,
+			id,
+			...request
+		};
+
+		const promise = new DeferredPromise<MCP.ServerResult>();
+		// Store the pending request
+		this._pendingRequests.set(id, { promise });
+
+		// Set up cancellation
+		const cancelListener = token.onCancellationRequested(() => {
+			if (!promise.isSettled) {
+				this._pendingRequests.delete(id);
+				this.sendNotification({ method: 'notifications/cancelled', params: { requestId: id } });
+				promise.cancel();
+			}
+		});
+
+		// Send the request
+		this.launch.send(jsonRpcRequest);
+		promise.p.finally(() => {
+			cancelListener.dispose();
+			this._pendingRequests.delete(id);
+		});
+
+		return promise.p as Promise<R>;
+	}
+
+	/**
+	 * Handles paginated requests by making multiple requests until all items are retrieved.
+	 *
+	 * @param method The method name to call
+	 * @param getItems Function to extract the array of items from a result
+	 * @param initialParams Initial parameters
+	 * @param token Cancellation token
+	 * @returns Promise with all items combined
+	 */
+	private async sendRequestPaginated<T extends MCP.PaginatedRequest & MCP.ClientRequest, R extends MCP.PaginatedResult, I>(method: T['method'], getItems: (result: R) => I[], initialParams?: Omit<T['params'], 'jsonrpc' | 'id'>, token: CancellationToken = CancellationToken.None): Promise<I[]> {
+		let allItems: I[] = [];
+		let nextCursor: MCP.Cursor | undefined = undefined;
+
+		do {
+			const params: T['params'] = {
+				...initialParams,
+				cursor: nextCursor
+			};
+
+			const result: R = await this.sendRequest<T, R>({ method, params }, token);
+			allItems = allItems.concat(getItems(result));
+			nextCursor = result.nextCursor;
+		} while (nextCursor !== undefined && !token.isCancellationRequested);
+
+		return allItems;
+	}
+
+	private sendNotification<N extends MCP.ClientNotification>(notification: N): void {
+		this.launch.send({ ...notification, jsonrpc: MCP.JSONRPC_VERSION });
+	}
+
+	/**
+	 * Handle incoming messages from the server
+	 */
+	private handleMessage(message: MCP.JSONRPCMessage): void {
+		// Handle responses to our requests
+		if ('id' in message) {
+			if ('result' in message) {
+				this.handleResult(message);
+			} else if ('error' in message) {
+				this.handleError(message);
+			}
+		}
+
+		// Handle requests from the server
+		if ('method' in message) {
+			if ('id' in message) {
+				this.handleServerRequest(message as MCP.JSONRPCRequest & MCP.ServerRequest);
+			} else {
+				this.handleServerNotification(message as MCP.JSONRPCNotification & MCP.ServerNotification);
+
+			}
+		}
+	}
+
+	/**
+	 * 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);
+		}
+	}
+
+	/**
+	 * 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));
+		}
+	}
+
+	/**
+	 * Handle incoming server requests
+	 */
+	private handleServerRequest(request: MCP.JSONRPCRequest & MCP.ServerRequest): void {
+		switch (request.method) {
+			case 'ping':
+				return this.respondToRequest(request, this.handlePing(request));
+			case 'roots/list':
+				return this.respondToRequest(request, this.handleRootsList(request));
+
+			default: {
+				const errorResponse: MCP.JSONRPCError = {
+					jsonrpc: MCP.JSONRPC_VERSION,
+					id: request.id,
+					error: {
+						code: MCP.METHOD_NOT_FOUND,
+						message: `Method not found: ${request.method}`
+					}
+				};
+				this.launch.send(errorResponse);
+				break;
+			}
+		}
+	}
+	/**
+	 * Handle incoming server notifications
+	 */
+	private handleServerNotification(request: MCP.JSONRPCNotification & MCP.ServerNotification): void {
+		switch (request.method) {
+			case 'notifications/message':
+				return this.handleLoggingNotification(request);
+			case 'notifications/cancelled':
+				this._onDidReceiveCancelledNotification.fire(request);
+				return this.handleCancelledNotification(request);
+			case 'notifications/progress':
+				this._onDidReceiveProgressNotification.fire(request);
+				return;
+			case 'notifications/resources/list_changed':
+				this._onDidChangeResourceList.fire();
+				return;
+			case 'notifications/resources/updated':
+				this._onDidUpdateResource.fire(request);
+				return;
+			case 'notifications/tools/list_changed':
+				this._onDidChangeToolList.fire();
+				return;
+			case 'notifications/prompts/list_changed':
+				this._onDidChangePromptList.fire();
+				return;
+		}
+	}
+
+	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();
+		}
+	}
+
+	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;
+		}
+	}
+
+	/**
+	 * Send a generic response to a request
+	 */
+	private respondToRequest(request: MCP.JSONRPCRequest, result: MCP.Result): void {
+		const response: MCP.JSONRPCResponse = {
+			jsonrpc: MCP.JSONRPC_VERSION,
+			id: request.id,
+			result
+		};
+		this.launch.send(response);
+	}
+
+	/**
+	 * Send a response to a ping request
+	 */
+	private handlePing(_request: MCP.PingRequest): {} {
+		return {};
+	}
+
+	/**
+	 * Send a response to a roots/list request
+	 */
+	private handleRootsList(_request: MCP.ListRootsRequest): MCP.ListRootsResult {
+		this._hasAnnouncedRoots = true;
+		return { roots: this._roots };
+	}
+
+	public override dispose(): void {
+		this._pendingRequests.forEach(pending => pending.promise.cancel());
+		this._pendingRequests.clear();
+		super.dispose();
+	}
+
+	/**
+	 * Send an initialize request
+	 */
+	initialize(params: MCP.InitializeRequest['params'], token?: CancellationToken): Promise<MCP.InitializeResult> {
+		return this.sendRequest<MCP.InitializeRequest, MCP.InitializeResult>({ method: 'initialize', params }, token);
+	}
+
+	/**
+	 * List available resources
+	 */
+	listResources(params?: MCP.ListResourcesRequest['params'], token?: CancellationToken): Promise<MCP.Resource[]> {
+		return this.sendRequestPaginated<MCP.ListResourcesRequest, MCP.ListResourcesResult, MCP.Resource>('resources/list', result => result.resources, params, token);
+	}
+
+	/**
+	 * Read a specific resource
+	 */
+	readResource(params: MCP.ReadResourceRequest['params'], token?: CancellationToken): Promise<MCP.ReadResourceResult> {
+		return this.sendRequest<MCP.ReadResourceRequest, MCP.ReadResourceResult>({ method: 'resources/read', params }, token);
+	}
+
+	/**
+	 * List available resource templates
+	 */
+	listResourceTemplates(params?: MCP.ListResourceTemplatesRequest['params'], token?: CancellationToken): Promise<MCP.ResourceTemplate[]> {
+		return this.sendRequestPaginated<MCP.ListResourceTemplatesRequest, MCP.ListResourceTemplatesResult, MCP.ResourceTemplate>('resources/templates/list', result => result.resourceTemplates, params, token);
+	}
+
+	/**
+	 * Subscribe to resource updates
+	 */
+	subscribe(params: MCP.SubscribeRequest['params'], token?: CancellationToken): Promise<MCP.EmptyResult> {
+		return this.sendRequest<MCP.SubscribeRequest, MCP.EmptyResult>({ method: 'resources/subscribe', params }, token);
+	}
+
+	/**
+	 * Unsubscribe from resource updates
+	 */
+	unsubscribe(params: MCP.UnsubscribeRequest['params'], token?: CancellationToken): Promise<MCP.EmptyResult> {
+		return this.sendRequest<MCP.UnsubscribeRequest, MCP.EmptyResult>({ method: 'resources/unsubscribe', params }, token);
+	}
+
+	/**
+	 * List available prompts
+	 */
+	listPrompts(params?: MCP.ListPromptsRequest['params'], token?: CancellationToken): Promise<MCP.Prompt[]> {
+		return this.sendRequestPaginated<MCP.ListPromptsRequest, MCP.ListPromptsResult, MCP.Prompt>('prompts/list', result => result.prompts, params, token);
+	}
+
+	/**
+	 * Get a specific prompt
+	 */
+	getPrompt(params: MCP.GetPromptRequest['params'], token?: CancellationToken): Promise<MCP.GetPromptResult> {
+		return this.sendRequest<MCP.GetPromptRequest, MCP.GetPromptResult>({ method: 'prompts/get', params }, token);
+	}
+
+	/**
+	 * List available tools
+	 */
+	listTools(params?: MCP.ListToolsRequest['params'], token?: CancellationToken): Promise<MCP.Tool[]> {
+		return this.sendRequestPaginated<MCP.ListToolsRequest, MCP.ListToolsResult, MCP.Tool>('tools/list', result => result.tools, params, token);
+	}
+
+	/**
+	 * Call a specific tool
+	 */
+	callTool(params: MCP.CallToolRequest['params'], token?: CancellationToken): Promise<MCP.CallToolResult> {
+		return this.sendRequest<MCP.CallToolRequest, MCP.CallToolResult>({ method: 'tools/call', params }, token);
+	}
+
+	/**
+	 * Set the logging level
+	 */
+	setLevel(params: MCP.SetLevelRequest['params'], token?: CancellationToken): Promise<MCP.EmptyResult> {
+		return this.sendRequest<MCP.SetLevelRequest, MCP.EmptyResult>({ method: 'logging/setLevel', params }, token);
+	}
+
+	/**
+	 * Find completions for an argument
+	 */
+	complete(params: MCP.CompleteRequest['params'], token?: CancellationToken): Promise<MCP.CompleteResult> {
+		return this.sendRequest<MCP.CompleteRequest, MCP.CompleteResult>({ method: 'completion/complete', params }, token);
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpService.ts b/src/vs/workbench/contrib/mcp/common/mcpService.ts
new file mode 100644
index 000000000000..49fd4ee79abb
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/mcpService.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 { RunOnceScheduler } from '../../../../base/common/async.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { autorun, derived, IObservable, observableValue } from '../../../../base/common/observable.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { StorageScope } from '../../../../platform/storage/common/storage.js';
+import { IMcpRegistry } from './mcpRegistryTypes.js';
+import { McpServer, McpServerMetadataCache } from './mcpServer.js';
+import { IMcpServer, IMcpService, McpCollectionDefinition, McpServerDefinition } from './mcpTypes.js';
+
+export class McpService extends Disposable implements IMcpService {
+	private readonly _servers = observableValue<readonly IMcpServer[]>(this, []);
+	public readonly servers: IObservable<readonly IMcpServer[]> = this._servers;
+
+	private readonly userCache: McpServerMetadataCache;
+	private readonly workspaceCache: McpServerMetadataCache;
+
+	constructor(
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry
+	) {
+		super();
+
+		this.userCache = instantiationService.createInstance(McpServerMetadataCache, StorageScope.PROFILE);
+		this.workspaceCache = instantiationService.createInstance(McpServerMetadataCache, StorageScope.WORKSPACE);
+
+		const definitionsObservable = derived(reader => {
+			const collections = this._mcpRegistry.collections.read(reader);
+			return collections.flatMap(collectionDefinition => collectionDefinition.serverDefinitions.read(reader).map(serverDefinition => ({
+				serverDefinition,
+				collectionDefinition,
+			})));
+		});
+
+		const updateThrottle = this._store.add(new RunOnceScheduler(() => {
+			const definitions = definitionsObservable.get();
+
+			const nextDefinitions = new Set(definitions);
+			const currentServers = this._servers.get();
+			const nextServers: IMcpServer[] = [];
+			for (const server of currentServers) {
+				const match = definitions.find(d => defsEqual(server, d));
+				if (match) {
+					nextDefinitions.delete(match);
+					nextServers.push(server);
+				} else {
+					server.dispose();
+				}
+			}
+			for (const def of nextDefinitions) {
+				nextServers.push(instantiationService.createInstance(McpServer, def.collectionDefinition, def.serverDefinition, def.collectionDefinition.scope === StorageScope.WORKSPACE ? this.workspaceCache : this.userCache));
+			}
+
+			this._servers.set(nextServers, undefined);
+		}, 500));
+
+		// Throttle changes so that if a collection is changed, or a server is
+		// unregistered/registered, we don't stop servers unnecessarily.
+		this._register(autorun(reader => {
+			definitionsObservable.read(reader);
+			updateThrottle.schedule(500);
+		}));
+	}
+
+	public override dispose(): void {
+		this._servers.get().forEach(server => server.dispose());
+		super.dispose();
+	}
+}
+
+function defsEqual(server: IMcpServer, def: { serverDefinition: McpServerDefinition; collectionDefinition: McpCollectionDefinition }) {
+	return McpCollectionDefinition.equals(server.collection, def.collectionDefinition) &&
+		McpServerDefinition.equals(server.definition, def.serverDefinition);
+}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
new file mode 100644
index 000000000000..2b34e23e5cc8
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/mcpTypes.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 { assertNever } from '../../../../base/common/assert.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { equals as objectsEqual } from '../../../../base/common/objects.js';
+import { IObservable } from '../../../../base/common/observable.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { StorageScope } from '../../../../platform/storage/common/storage.js';
+import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { McpServerRequestHandler } from './mcpServerRequestHandler.js';
+import { MCP } from './modelContextProtocol.js';
+
+/**
+ * An McpCollection contains McpServers. There may be multiple collections for
+ * different locations servers are discovered.
+ */
+export interface McpCollectionDefinition {
+	/** Origin authority from which this collection was discovered. */
+	readonly remoteAuthority: string | null;
+	/** Globally-unique, stable ID for this definition */
+	readonly id: string;
+	/** Human-readable label for the definition */
+	readonly label: string;
+	/** Definitions this collection contains. */
+	readonly serverDefinitions: IObservable<readonly McpServerDefinition[]>;
+	/** If 'false', consent is required before any MCP servers in this collection are automatically launched. */
+	readonly isTrustedByDefault: boolean;
+	/** Scope where associated collection info should be stored. */
+	readonly scope: StorageScope;
+}
+
+export namespace McpCollectionDefinition {
+	export function equals(a: McpCollectionDefinition, b: McpCollectionDefinition): boolean {
+		return a.id === b.id
+			&& a.remoteAuthority === b.remoteAuthority
+			&& a.label === b.label
+			&& a.isTrustedByDefault === b.isTrustedByDefault;
+	}
+}
+
+export interface McpServerDefinition {
+	/** Globally-unique, stable ID for this definition */
+	readonly id: string;
+	/** Human-readable label for the definition */
+	readonly label: string;
+	/** Descriptor defining how the configuration should be launched. */
+	readonly launch: McpServerLaunch;
+	/** If set, allows configuration variables to be resolved in the {@link launch} with the given context */
+	readonly variableReplacement?: {
+		section?: string; // e.g. 'mcp'
+		folder?: IWorkspaceFolder;
+		target?: ConfigurationTarget;
+	};
+}
+
+export namespace McpServerDefinition {
+	export function equals(a: McpServerDefinition, b: McpServerDefinition): boolean {
+		return a.id === b.id
+			&& a.label === b.label
+			&& objectsEqual(a.launch, b.launch)
+			&& objectsEqual(a.variableReplacement, b.variableReplacement);
+	}
+}
+
+export interface IMcpService {
+	readonly servers: IObservable<readonly IMcpServer[]>;
+}
+
+export const IMcpService = createDecorator<IMcpService>('IMcpService');
+
+export interface IMcpServer extends IDisposable {
+	readonly collection: McpCollectionDefinition;
+	readonly definition: McpServerDefinition;
+	readonly state: IObservable<McpConnectionState>;
+	showOutput(): void;
+	start(): Promise<McpConnectionState>;
+	stop(): Promise<void>;
+
+	readonly tools: IObservable<readonly IMcpTool[]>;
+}
+
+
+export interface IMcpTool {
+	readonly definition: MCP.Tool;
+	/**
+	 * Calls a tool
+	 * @throws {@link MpcResponseError} if the tool fails to execute
+	 * @throws {@link McpConnectionFailedError} if the connection to the server fails
+	 */
+	call(params: Record<string, unknown>, token?: CancellationToken): Promise<MCP.CallToolResult>;
+}
+
+export const enum McpServerTransportType {
+	/** A command-line MCP server communicating over standard in/out */
+	Stdio = 1 << 0,
+	/** An MCP server that uses Server-Sent Events */
+	SSE = 1 << 1,
+}
+
+/**
+ * MCP server launched on the command line which communicated over stdio.
+ * https://spec.modelcontextprotocol.io/specification/2024-11-05/basic/transports/#stdio
+ */
+export interface McpServerTransportStdio {
+	readonly type: McpServerTransportType.Stdio;
+	readonly cwd: URI;
+	readonly command: string;
+	readonly args: readonly string[];
+	readonly env: Record<string, string | number | null>;
+}
+
+/**
+ * MCP server launched on the command line which communicated over server-sent-events.
+ * https://spec.modelcontextprotocol.io/specification/2024-11-05/basic/transports/#http-with-sse
+ */
+export interface McpServerTransportSSE {
+	readonly type: McpServerTransportType.SSE;
+	readonly url: string;
+}
+
+export type McpServerLaunch =
+	| McpServerTransportStdio
+	| McpServerTransportSSE;
+
+/**
+ * An instance that manages a connection to an MCP server. It can be started,
+ * stopped, and restarted. Once started and in a running state, it will
+ * eventually build a {@link IMcpServerConnection.handler}.
+ */
+export interface IMcpServerConnection extends IDisposable {
+	readonly definition: McpServerDefinition;
+	readonly state: IObservable<McpConnectionState>;
+	readonly handler: IObservable<McpServerRequestHandler | undefined>;
+
+	/**
+	 * Shows the current server output.
+	 */
+	showOutput(): void;
+
+	/**
+	 * Starts the server if it's stopped. Returns a promise that resolves once
+	 * server exits a 'starting' state.
+	 */
+	start(): Promise<McpConnectionState>;
+
+	/**
+	 * Stops the server.
+	 */
+	stop(): Promise<void>;
+}
+
+/**
+ * McpConnectionState is the state of the underlying connection and is
+ * communicated e.g. from the extension host to the renderer.
+ */
+export namespace McpConnectionState {
+	export const enum Kind {
+		Stopped,
+		Starting,
+		Running,
+		Error,
+	}
+
+	export const toString = (s: McpConnectionState): string => {
+		switch (s.state) {
+			case Kind.Stopped:
+				return localize('mcpstate.stopped', 'Stopped');
+			case Kind.Starting:
+				return localize('mcpstate.starting', 'Starting');
+			case Kind.Running:
+				return localize('mcpstate.running', 'Running');
+			case Kind.Error:
+				return localize('mcpstate.error', 'Error {0}', s.message);
+			default:
+				assertNever(s);
+		}
+	};
+
+	/** Returns if the MCP state is one where starting a new server is valid */
+	export const canBeStarted = (s: Kind) => s === Kind.Error || s === Kind.Stopped;
+
+	export interface Stopped {
+		readonly state: Kind.Stopped;
+	}
+
+	export interface Starting {
+		readonly state: Kind.Starting;
+	}
+
+	export interface Running {
+		readonly state: Kind.Running;
+	}
+
+	export interface Error {
+		readonly state: Kind.Error;
+		readonly message: string;
+	}
+}
+
+export type McpConnectionState =
+	| McpConnectionState.Stopped
+	| McpConnectionState.Starting
+	| McpConnectionState.Running
+	| McpConnectionState.Error;
+
+export class MpcResponseError extends Error {
+	constructor(message: string, public readonly code: number, public readonly data: unknown) {
+		super(`MPC ${code}: ${message}`);
+	}
+}
+
+export class McpConnectionFailedError extends Error { }
diff --git a/src/vs/workbench/contrib/mcp/common/modelContextProtocol.ts b/src/vs/workbench/contrib/mcp/common/modelContextProtocol.ts
new file mode 100644
index 000000000000..582e69eaf930
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/modelContextProtocol.ts
@@ -0,0 +1,1138 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/* eslint-disable @stylistic/ts/member-delimiter-style */
+/* eslint-disable local/code-no-unexternalized-strings */
+
+/**
+ * Schema updated from the Model Context Protocol repository at
+ * https://github.com/modelcontextprotocol/specification/tree/main/schema
+ *
+ * ⚠️ Do not edit within `namespace` manually except to update schema versions ⚠️
+ */
+export namespace MCP {
+	/* JSON-RPC types */
+	export type JSONRPCMessage =
+		| JSONRPCRequest
+		| JSONRPCNotification
+		| JSONRPCResponse
+		| JSONRPCError;
+
+	export const LATEST_PROTOCOL_VERSION = "2024-11-05";
+	export const JSONRPC_VERSION = "2.0";
+
+	/**
+	* A progress token, used to associate progress notifications with the original request.
+	*/
+	export type ProgressToken = string | number;
+
+	/**
+	* An opaque token used to represent a cursor for pagination.
+	*/
+	export type Cursor = string;
+
+	export interface Request {
+		method: string;
+		params?: {
+			_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;
+		};
+	}
+
+	export interface Notification {
+		method: string;
+		params?: {
+			/**
+			 * This parameter name is reserved by MCP to allow clients and servers to attach additional metadata to their notifications.
+			 */
+			_meta?: { [key: string]: unknown };
+			[key: string]: unknown;
+		};
+	}
+
+	export interface Result {
+		/**
+		 * This result property is reserved by the protocol to allow clients and servers to attach additional metadata to their responses.
+		 */
+		_meta?: { [key: string]: unknown };
+		[key: string]: unknown;
+	}
+
+	/**
+	* A uniquely identifying ID for a request in JSON-RPC.
+	*/
+	export type RequestId = string | number;
+
+	/**
+	* A request that expects a response.
+	*/
+	export interface JSONRPCRequest extends Request {
+		jsonrpc: typeof JSONRPC_VERSION;
+		id: RequestId;
+	}
+
+	/**
+	* A notification which does not expect a response.
+	*/
+	export interface JSONRPCNotification extends Notification {
+		jsonrpc: typeof JSONRPC_VERSION;
+	}
+
+	/**
+	* A successful (non-error) response to a request.
+	*/
+	export interface JSONRPCResponse {
+		jsonrpc: typeof JSONRPC_VERSION;
+		id: RequestId;
+		result: Result;
+	}
+
+	// Standard JSON-RPC error codes
+	export const PARSE_ERROR = -32700;
+	export const INVALID_REQUEST = -32600;
+	export const METHOD_NOT_FOUND = -32601;
+	export const INVALID_PARAMS = -32602;
+	export const INTERNAL_ERROR = -32603;
+
+	/**
+	* A response to a request that indicates an error occurred.
+	*/
+	export interface JSONRPCError {
+		jsonrpc: typeof JSONRPC_VERSION;
+		id: RequestId;
+		error: {
+			/**
+			 * The error type that occurred.
+			 */
+			code: number;
+			/**
+			 * A short description of the error. The message SHOULD be limited to a concise single sentence.
+			 */
+			message: string;
+			/**
+			 * Additional information about the error. The value of this member is defined by the sender (e.g. detailed error information, nested errors etc.).
+			 */
+			data?: unknown;
+		};
+	}
+
+	/* Empty result */
+	/**
+	* A response that indicates success but carries no data.
+	*/
+	export type EmptyResult = Result;
+
+	/* Cancellation */
+	/**
+	* This notification can be sent by either side to indicate that it is cancelling a previously-issued request.
+	*
+	* The request SHOULD still be in-flight, but due to communication latency, it is always possible that this notification MAY arrive after the request has already finished.
+	*
+	* This notification indicates that the result will be unused, so any associated processing SHOULD cease.
+	*
+	* A client MUST NOT attempt to cancel its `initialize` request.
+	*/
+	export interface CancelledNotification extends Notification {
+		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;
+		};
+	}
+
+	/* Initialization */
+	/**
+	* This request is sent from the client to the server when it first connects, asking it to begin initialization.
+	*/
+	export interface InitializeRequest extends Request {
+		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;
+		};
+	}
+
+	/**
+	* After receiving an initialize request from the client, the server sends this response.
+	*/
+	export interface InitializeResult extends Result {
+		/**
+		 * The version of the Model Context Protocol that the server wants to use. This may not match the version that the client requested. If the client cannot support this version, it MUST disconnect.
+		 */
+		protocolVersion: string;
+		capabilities: ServerCapabilities;
+		serverInfo: Implementation;
+		/**
+		 * Instructions describing how to use the server and its features.
+		 *
+		 * This can be used by clients to improve the LLM's understanding of available tools, resources, etc. It can be thought of like a "hint" to the model. For example, this information MAY be added to the system prompt.
+		 */
+		instructions?: string;
+	}
+
+	/**
+	* This notification is sent from the client to the server after initialization has finished.
+	*/
+	export interface InitializedNotification extends Notification {
+		method: "notifications/initialized";
+	}
+
+	/**
+	* 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.
+	*/
+	export interface ClientCapabilities {
+		/**
+		 * Experimental, non-standard capabilities that the client supports.
+		 */
+		experimental?: { [key: string]: object };
+		/**
+		 * Present if the client supports listing roots.
+		 */
+		roots?: {
+			/**
+			 * Whether the client supports notifications for changes to the roots list.
+			 */
+			listChanged?: boolean;
+		};
+		/**
+		 * Present if the client supports sampling from an LLM.
+		 */
+		sampling?: 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.
+	*/
+	export interface ServerCapabilities {
+		/**
+		 * Experimental, non-standard capabilities that the server supports.
+		 */
+		experimental?: { [key: string]: object };
+		/**
+		 * Present if the server supports sending log messages to the client.
+		 */
+		logging?: object;
+		/**
+		 * Present if the server offers any prompt templates.
+		 */
+		prompts?: {
+			/**
+			 * Whether this server supports notifications for changes to the prompt list.
+			 */
+			listChanged?: boolean;
+		};
+		/**
+		 * Present if the server offers any resources to read.
+		 */
+		resources?: {
+			/**
+			 * Whether this server supports subscribing to resource updates.
+			 */
+			subscribe?: boolean;
+			/**
+			 * Whether this server supports notifications for changes to the resource list.
+			 */
+			listChanged?: boolean;
+		};
+		/**
+		 * Present if the server offers any tools to call.
+		 */
+		tools?: {
+			/**
+			 * Whether this server supports notifications for changes to the tool list.
+			 */
+			listChanged?: boolean;
+		};
+	}
+
+	/**
+	* Describes the name and version of an MCP implementation.
+	*/
+	export interface Implementation {
+		name: string;
+		version: string;
+	}
+
+	/* Ping */
+	/**
+	* 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.
+	*/
+	export interface PingRequest extends Request {
+		method: "ping";
+	}
+
+	/* Progress notifications */
+	/**
+	* An out-of-band notification used to inform the receiver of a progress update for a long-running request.
+	*/
+	export interface ProgressNotification extends Notification {
+		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;
+		};
+	}
+
+	/* Pagination */
+	export interface PaginatedRequest extends Request {
+		params?: {
+			/**
+			 * An opaque token representing the current pagination position.
+			 * If provided, the server should return results starting after this cursor.
+			 */
+			cursor?: Cursor;
+		};
+	}
+
+	export interface PaginatedResult extends Result {
+		/**
+		 * An opaque token representing the pagination position after the last returned result.
+		 * If present, there may be more results available.
+		 */
+		nextCursor?: Cursor;
+	}
+
+	/* Resources */
+	/**
+	* Sent from the client to request a list of resources the server has.
+	*/
+	export interface ListResourcesRequest extends PaginatedRequest {
+		method: "resources/list";
+	}
+
+	/**
+	* The server's response to a resources/list request from the client.
+	*/
+	export interface ListResourcesResult extends PaginatedResult {
+		resources: Resource[];
+	}
+
+	/**
+	* Sent from the client to request a list of resource templates the server has.
+	*/
+	export interface ListResourceTemplatesRequest extends PaginatedRequest {
+		method: "resources/templates/list";
+	}
+
+	/**
+	* The server's response to a resources/templates/list request from the client.
+	*/
+	export interface ListResourceTemplatesResult extends PaginatedResult {
+		resourceTemplates: ResourceTemplate[];
+	}
+
+	/**
+	* Sent from the client to the server, to read a specific resource URI.
+	*/
+	export interface ReadResourceRequest extends Request {
+		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;
+		};
+	}
+
+	/**
+	* The server's response to a resources/read request from the client.
+	*/
+	export interface ReadResourceResult extends Result {
+		contents: (TextResourceContents | BlobResourceContents)[];
+	}
+
+	/**
+	* 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.
+	*/
+	export interface ResourceListChangedNotification extends Notification {
+		method: "notifications/resources/list_changed";
+	}
+
+	/**
+	* Sent from the client to request resources/updated notifications from the server whenever a particular resource changes.
+	*/
+	export interface SubscribeRequest extends Request {
+		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;
+		};
+	}
+
+	/**
+	* Sent from the client to request cancellation of resources/updated notifications from the server. This should follow a previous resources/subscribe request.
+	*/
+	export interface UnsubscribeRequest extends Request {
+		method: "resources/unsubscribe";
+		params: {
+			/**
+			 * The URI of the resource to unsubscribe from.
+			 *
+			 * @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.
+	*/
+	export interface ResourceUpdatedNotification extends Notification {
+		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;
+		};
+	}
+
+	/**
+	* A known resource that the server is capable of reading.
+	*/
+	export interface Resource extends Annotated {
+		/**
+		 * The URI of this resource.
+		 *
+		 * @format uri
+		 */
+		uri: string;
+
+		/**
+		 * A human-readable name for this resource.
+		 *
+		 * This can be used by clients to populate UI elements.
+		 */
+		name: string;
+
+		/**
+		 * A description of what this resource represents.
+		 *
+		 * This can be used by clients to improve the LLM's understanding of available resources. It can be thought of like a "hint" to the model.
+		 */
+		description?: string;
+
+		/**
+		 * The MIME type of this resource, if known.
+		 */
+		mimeType?: string;
+
+		/**
+		 * The size of the raw resource content, in bytes (i.e., before base64 encoding or any tokenization), if known.
+		 *
+		 * This can be used by Hosts to display file sizes and estimate context window usage.
+		 */
+		size?: number;
+	}
+
+	/**
+	* A template description for resources available on the server.
+	*/
+	export interface ResourceTemplate extends Annotated {
+		/**
+		 * A URI template (according to RFC 6570) that can be used to construct resource URIs.
+		 *
+		 * @format uri-template
+		 */
+		uriTemplate: string;
+
+		/**
+		 * A human-readable name for the type of resource this template refers to.
+		 *
+		 * This can be used by clients to populate UI elements.
+		 */
+		name: string;
+
+		/**
+		 * A description of what this template is for.
+		 *
+		 * This can be used by clients to improve the LLM's understanding of available resources. It can be thought of like a "hint" to the model.
+		 */
+		description?: string;
+
+		/**
+		 * The MIME type for all resources that match this template. This should only be included if all resources matching this template have the same type.
+		 */
+		mimeType?: string;
+	}
+
+	/**
+	* The contents of a specific resource or sub-resource.
+	*/
+	export interface ResourceContents {
+		/**
+		 * The URI of this resource.
+		 *
+		 * @format uri
+		 */
+		uri: string;
+		/**
+		 * The MIME type of this resource, if known.
+		 */
+		mimeType?: string;
+	}
+
+	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).
+		 */
+		text: string;
+	}
+
+	export interface BlobResourceContents extends ResourceContents {
+		/**
+		 * A base64-encoded string representing the binary data of the item.
+		 *
+		 * @format byte
+		 */
+		blob: string;
+	}
+
+	/* Prompts */
+	/**
+	* Sent from the client to request a list of prompts and prompt templates the server has.
+	*/
+	export interface ListPromptsRequest extends PaginatedRequest {
+		method: "prompts/list";
+	}
+
+	/**
+	* The server's response to a prompts/list request from the client.
+	*/
+	export interface ListPromptsResult extends PaginatedResult {
+		prompts: Prompt[];
+	}
+
+	/**
+	* Used by the client to get a prompt provided by the server.
+	*/
+	export interface GetPromptRequest extends Request {
+		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 };
+		};
+	}
+
+	/**
+	* The server's response to a prompts/get request from the client.
+	*/
+	export interface GetPromptResult extends Result {
+		/**
+		 * An optional description for the prompt.
+		 */
+		description?: string;
+		messages: PromptMessage[];
+	}
+
+	/**
+	* A prompt or prompt template that the server offers.
+	*/
+	export interface Prompt {
+		/**
+		 * The name of the prompt or prompt template.
+		 */
+		name: string;
+		/**
+		 * An optional description of what this prompt provides
+		 */
+		description?: string;
+		/**
+		 * A list of arguments to use for templating the prompt.
+		 */
+		arguments?: PromptArgument[];
+	}
+
+	/**
+	* Describes an argument that a prompt can accept.
+	*/
+	export interface PromptArgument {
+		/**
+		 * The name of the argument.
+		 */
+		name: string;
+		/**
+		 * A human-readable description of the argument.
+		 */
+		description?: string;
+		/**
+		 * Whether this argument must be provided.
+		 */
+		required?: boolean;
+	}
+
+	/**
+	* The sender or recipient of messages and data in a conversation.
+	*/
+	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
+	* resources from the MCP server.
+	*/
+	export interface PromptMessage {
+		role: Role;
+		content: TextContent | ImageContent | EmbeddedResource;
+	}
+
+	/**
+	* The contents of a resource, embedded into a prompt or tool call result.
+	*
+	* It is up to the client how best to render embedded resources for the benefit
+	* of the LLM and/or the user.
+	*/
+	export interface EmbeddedResource extends Annotated {
+		type: "resource";
+		resource: TextResourceContents | BlobResourceContents;
+	}
+
+	/**
+	* 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.
+	*/
+	export interface PromptListChangedNotification extends Notification {
+		method: "notifications/prompts/list_changed";
+	}
+
+	/* Tools */
+	/**
+	* Sent from the client to request a list of tools the server has.
+	*/
+	export interface ListToolsRequest extends PaginatedRequest {
+		method: "tools/list";
+	}
+
+	/**
+	* The server's response to a tools/list request from the client.
+	*/
+	export interface ListToolsResult extends PaginatedResult {
+		tools: Tool[];
+	}
+
+	/**
+	* The server's response to a tool call.
+	*
+	* Any errors that originate from the tool SHOULD be reported inside the result
+	* object, with `isError` set to true, _not_ as an MCP protocol-level error
+	* response. Otherwise, the LLM would not be able to see that an error occurred
+	* and self-correct.
+	*
+	* However, any errors in _finding_ the tool, an error indicating that the
+	* server does not support tool calls, or any other exceptional conditions,
+	* should be reported as an MCP error response.
+	*/
+	export interface CallToolResult extends Result {
+		content: (TextContent | ImageContent | EmbeddedResource)[];
+
+		/**
+		 * Whether the tool call ended in an error.
+		 *
+		 * If not set, this is assumed to be false (the call was successful).
+		 */
+		isError?: boolean;
+	}
+
+	/**
+	* Used by the client to invoke a tool provided by the server.
+	*/
+	export interface CallToolRequest extends Request {
+		method: "tools/call";
+		params: {
+			name: string;
+			arguments?: { [key: string]: unknown };
+		};
+	}
+
+	/**
+	* 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.
+	*/
+	export interface ToolListChangedNotification extends Notification {
+		method: "notifications/tools/list_changed";
+	}
+
+	/**
+	* Definition for a tool the client can call.
+	*/
+	export interface Tool {
+		/**
+		 * The name of the tool.
+		 */
+		name: string;
+		/**
+		 * A human-readable description of the tool.
+		 */
+		description?: string;
+		/**
+		 * A JSON Schema object defining the expected parameters for the tool.
+		 */
+		inputSchema: {
+			type: "object";
+			properties?: { [key: string]: object };
+			required?: string[];
+		};
+	}
+
+	/* Logging */
+	/**
+	* A request from the client to the server, to enable or adjust logging.
+	*/
+	export interface SetLevelRequest extends Request {
+		method: "logging/setLevel";
+		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.
+			 */
+			level: LoggingLevel;
+		};
+	}
+
+	/**
+	* Notification 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.
+	*/
+	export interface LoggingMessageNotification extends Notification {
+		method: "notifications/message";
+		params: {
+			/**
+			 * 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;
+		};
+	}
+
+	/**
+	* 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
+	*/
+	export type LoggingLevel =
+		| "debug"
+		| "info"
+		| "notice"
+		| "warning"
+		| "error"
+		| "critical"
+		| "alert"
+		| "emergency";
+
+	/* Sampling */
+	/**
+	* 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.
+	*/
+	export interface CreateMessageRequest extends Request {
+		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 maximum number of tokens to sample, as requested by the server. The client MAY choose to sample fewer tokens than requested.
+			 */
+			maxTokens: number;
+			stopSequences?: string[];
+			/**
+			 * Optional metadata to pass through to the LLM provider. The format of this metadata is provider-specific.
+			 */
+			metadata?: object;
+		};
+	}
+
+	/**
+	* 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.
+	*/
+	export interface CreateMessageResult extends Result, SamplingMessage {
+		/**
+		 * The name of the model that generated the message.
+		 */
+		model: string;
+		/**
+		 * The reason why sampling stopped, if known.
+		 */
+		stopReason?: "endTurn" | "stopSequence" | "maxTokens" | string;
+	}
+
+	/**
+	* Describes a message issued to or received from an LLM API.
+	*/
+	export interface SamplingMessage {
+		role: Role;
+		content: TextContent | ImageContent;
+	}
+
+	/**
+	* Base for objects that include optional annotations for the client. The client can use annotations to inform how objects are used or displayed
+	*/
+	export interface Annotated {
+		annotations?: {
+			/**
+			 * Describes who the intended customer of this object or data is.
+			 *
+			 * It can include multiple entries to indicate content useful for multiple audiences (e.g., `["user", "assistant"]`).
+			 */
+			audience?: Role[];
+
+			/**
+			 * Describes how important this data is for operating the server.
+			 *
+			 * A value of 1 means "most important," and indicates that the data is
+			 * effectively required, while 0 means "least important," and indicates that
+			 * the data is entirely optional.
+			 *
+			 * @TJS-type number
+			 * @minimum 0
+			 * @maximum 1
+			 */
+			priority?: number;
+		}
+	}
+
+	/**
+	* Text provided to or from an LLM.
+	*/
+	export interface TextContent extends Annotated {
+		type: "text";
+		/**
+		 * The text content of the message.
+		 */
+		text: string;
+	}
+
+	/**
+	* An image provided to or from an LLM.
+	*/
+	export interface ImageContent extends Annotated {
+		type: "image";
+		/**
+		 * The base64-encoded image data.
+		 *
+		 * @format byte
+		 */
+		data: string;
+		/**
+		 * The MIME type of the image. Different providers may support different image types.
+		 */
+		mimeType: string;
+	}
+
+	/**
+	* The server's preferences for model selection, requested of the client during sampling.
+	*
+	* Because LLMs can vary along multiple dimensions, choosing the "best" model is
+	* rarely straightforward.  Different models excel in different areas-some are
+	* faster but less capable, others are more capable but more expensive, and so
+	* on. This interface allows servers to express their priorities across multiple
+	* dimensions to help clients make an appropriate selection for their use case.
+	*
+	* 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.
+	*/
+	export interface ModelPreferences {
+		/**
+		 * Optional hints to use for model selection.
+		 *
+		 * If multiple hints are specified, the client MUST evaluate them in order
+		 * (such that the first match is taken).
+		 *
+		 * The client SHOULD prioritize these hints over the numeric priorities, but
+		 * MAY still use the priorities to select from ambiguous matches.
+		 */
+		hints?: ModelHint[];
+
+		/**
+		 * How much to prioritize cost when selecting a model. A value of 0 means cost
+		 * is not important, while a value of 1 means cost is the most important
+		 * factor.
+		 *
+		 * @TJS-type number
+		 * @minimum 0
+		 * @maximum 1
+		 */
+		costPriority?: number;
+
+		/**
+		 * How much to prioritize sampling speed (latency) when selecting a model. A
+		 * value of 0 means speed is not important, while a value of 1 means speed is
+		 * the most important factor.
+		 *
+		 * @TJS-type number
+		 * @minimum 0
+		 * @maximum 1
+		 */
+		speedPriority?: number;
+
+		/**
+		 * How much to prioritize intelligence and capabilities when selecting a
+		 * model. A value of 0 means intelligence is not important, while a value of 1
+		 * means intelligence is the most important factor.
+		 *
+		 * @TJS-type number
+		 * @minimum 0
+		 * @maximum 1
+		 */
+		intelligencePriority?: number;
+	}
+
+	/**
+	* Hints to use for model selection.
+	*
+	* Keys not declared here are currently left unspecified by the spec and are up
+	* to the client to interpret.
+	*/
+	export interface ModelHint {
+		/**
+		 * A hint for a model name.
+		 *
+		 * The client SHOULD treat this as a substring of a model name; for example:
+		 *  - `claude-3-5-sonnet` should match `claude-3-5-sonnet-20241022`
+		 *  - `sonnet` should match `claude-3-5-sonnet-20241022`, `claude-3-sonnet-20240229`, etc.
+		 *  - `claude` should match any Claude model
+		 *
+		 * The client MAY also map the string to a different provider's model name or a different model family, as long as it fills a similar niche; for example:
+		 *  - `gemini-1.5-flash` could match `claude-3-haiku-20240307`
+		 */
+		name?: string;
+	}
+
+	/* Autocomplete */
+	/**
+	* A request from the client to the server, to ask for completion options.
+	*/
+	export interface CompleteRequest extends Request {
+		method: "completion/complete";
+		params: {
+			ref: PromptReference | ResourceReference;
+			/**
+			 * The argument's information
+			 */
+			argument: {
+				/**
+				 * The name of the argument
+				 */
+				name: string;
+				/**
+				 * The value of the argument to use for completion matching.
+				 */
+				value: string;
+			};
+		};
+	}
+
+	/**
+	* The server's response to a completion/complete request
+	*/
+	export interface CompleteResult extends Result {
+		completion: {
+			/**
+			 * An array of completion values. Must not exceed 100 items.
+			 */
+			values: string[];
+			/**
+			 * The total number of completion options available. This can exceed the number of values actually sent in the response.
+			 */
+			total?: number;
+			/**
+			 * Indicates whether there are additional completion options beyond those provided in the current response, even if the exact total is unknown.
+			 */
+			hasMore?: boolean;
+		};
+	}
+
+	/**
+	* A reference to a resource or resource template definition.
+	*/
+	export interface ResourceReference {
+		type: "ref/resource";
+		/**
+		 * The URI or URI template of the resource.
+		 *
+		 * @format uri-template
+		 */
+		uri: string;
+	}
+
+	/**
+	* Identifies a prompt.
+	*/
+	export interface PromptReference {
+		type: "ref/prompt";
+		/**
+		 * The name of the prompt or prompt template
+		 */
+		name: string;
+	}
+
+	/* Roots */
+	/**
+	* Sent from the server to request a list of root URIs from the client. Roots allow
+	* servers to ask for specific directories or files to operate on. A common example
+	* for roots is providing a set of repositories or directories a server should operate
+	* on.
+	*
+	* 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.
+	*/
+	export interface ListRootsRequest extends Request {
+		method: "roots/list";
+	}
+
+	/**
+	* 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
+	* or file that the server can operate on.
+	*/
+	export interface ListRootsResult extends Result {
+		roots: Root[];
+	}
+
+	/**
+	* Represents a root directory or file that the server can operate on.
+	*/
+	export interface Root {
+		/**
+		 * 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.
+		 *
+		 * @format uri
+		 */
+		uri: string;
+		/**
+		 * An optional name for the root. This can be used to provide a human-readable
+		 * identifier for the root, which may be useful for display purposes or for
+		 * referencing the root in other parts of the application.
+		 */
+		name?: string;
+	}
+
+	/**
+	* 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.
+	*/
+	export interface RootsListChangedNotification extends Notification {
+		method: "notifications/roots/list_changed";
+	}
+
+	/* Client messages */
+	export type ClientRequest =
+		| PingRequest
+		| InitializeRequest
+		| CompleteRequest
+		| SetLevelRequest
+		| GetPromptRequest
+		| ListPromptsRequest
+		| ListResourcesRequest
+		| ListResourceTemplatesRequest
+		| ReadResourceRequest
+		| SubscribeRequest
+		| UnsubscribeRequest
+		| CallToolRequest
+		| ListToolsRequest;
+
+	export type ClientNotification =
+		| CancelledNotification
+		| ProgressNotification
+		| InitializedNotification
+		| RootsListChangedNotification;
+
+	export type ClientResult = EmptyResult | CreateMessageResult | ListRootsResult;
+
+	/* Server messages */
+	export type ServerRequest =
+		| PingRequest
+		| CreateMessageRequest
+		| ListRootsRequest;
+
+	export type ServerNotification =
+		| CancelledNotification
+		| ProgressNotification
+		| LoggingMessageNotification
+		| ResourceUpdatedNotification
+		| ResourceListChangedNotification
+		| ToolListChangedNotification
+		| PromptListChangedNotification;
+
+	export type ServerResult =
+		| EmptyResult
+		| InitializeResult
+		| CompleteResult
+		| GetPromptResult
+		| ListPromptsResult
+		| ListResourcesResult
+		| ListResourceTemplatesResult
+		| ReadResourceResult
+		| CallToolResult
+		| ListToolsResult;
+}
diff --git a/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts b/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
index 5c06bad50b54..af059baa74ba 100644
--- a/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
@@ -202,9 +202,10 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 		if (this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY && section) {
 			const overrides: IConfigurationOverrides = folder ? { resource: folder.uri } : {};
 			const result = this.configurationService.inspect(section, overrides);
-			if (result && (result.userValue || result.workspaceValue || result.workspaceFolderValue)) {
+			if (result && (result.userValue || result.workspaceValue || result.workspaceFolderValue || result.userRemoteValue)) {
 				switch (target) {
 					case ConfigurationTarget.USER: inputs = (<any>result.userValue)?.inputs; break;
+					case ConfigurationTarget.USER_REMOTE: inputs = (<any>result.userRemoteValue)?.inputs; break;
 					case ConfigurationTarget.WORKSPACE: inputs = (<any>result.workspaceValue)?.inputs; break;
 					default: inputs = (<any>result.workspaceFolderValue)?.inputs;
 				}
diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts
index f43004533d7a..3863717be263 100644
--- a/src/vs/workbench/workbench.common.main.ts
+++ b/src/vs/workbench/workbench.common.main.ts
@@ -191,6 +191,7 @@ import './contrib/speech/browser/speech.contribution.js';
 // Chat
 import './contrib/chat/browser/chat.contribution.js';
 import './contrib/inlineChat/browser/inlineChat.contribution.js';
+import './contrib/mcp/browser/mcp.contribution.js';
 
 // Interactive
 import './contrib/interactive/browser/interactive.contribution.js';

From 4c3374008a7ee7e75c5d0b41a83429087174b0d7 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sun, 9 Mar 2025 14:47:16 -0700
Subject: [PATCH 0711/1815] Fix chat render loop when rendering
 notebookEditGroup (#243013)

---
 src/vs/workbench/contrib/chat/browser/chatListRenderer.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index 8605f76403cf..7bc69accb60c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -898,12 +898,11 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			return this.renderUndoStop(content);
 		}
 
-		// todo@connor4312/roblourens: should this throw or renderNoContent to avoid progressive render thrashing?
-		return undefined;
+		return this.renderNoContent(other => content.kind === other.kind);
 	}
 
 	private renderUndoStop(content: IChatUndoStop) {
-		return this.renderNoContent(other => other.kind === 'undoStop' && other.id === content.id);
+		return this.renderNoContent(other => other.kind === content.kind && other.id === content.id);
 	}
 
 	private renderNoContent(equals: (otherContent: IChatRendererContent) => boolean): IChatContentPart {

From c9fd0dcc926f41f1e0eb5d970a72a8ed02b97c4f Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sun, 9 Mar 2025 17:41:37 -0700
Subject: [PATCH 0712/1815] Add keybinding to switch models in chat (#243018)

cmd+alt+.
---
 .../browser/actions/chatExecuteActions.ts     | 62 ++++++++++++-------
 .../contrib/chat/browser/chatInputPart.ts     | 43 ++++++++-----
 2 files changed, 70 insertions(+), 35 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index b5074baf299f..2f67d98e4c6f 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -7,7 +7,7 @@ import { Codicon } from '../../../../../base/common/codicons.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.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 { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
@@ -210,6 +210,45 @@ export class ToggleRequestPausedAction extends Action2 {
 	}
 }
 
+export const ChatSwitchToNextModelActionId = 'workbench.action.chat.switchToNextModel';
+export class SwitchToNextModelAction extends Action2 {
+	static readonly ID = ChatSwitchToNextModelActionId;
+
+	constructor() {
+		super({
+			id: SwitchToNextModelAction.ID,
+			title: localize2('interactive.switchToNextModel.label', "Switch to Next Model"),
+			category: CHAT_CATEGORY,
+			f1: true,
+			keybinding: {
+				primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Period,
+				weight: KeybindingWeight.WorkbenchContrib,
+			},
+			menu: {
+				id: MenuId.ChatExecute,
+				order: 3,
+				group: 'navigation',
+				when: ContextKeyExpr.and(
+					ChatContextKeys.languageModelsAreUserSelectable,
+					ContextKeyExpr.or(
+						ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Panel),
+						ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.EditingSession),
+						ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Editor),
+						ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Notebook),
+						ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Terminal)
+					)
+				),
+			}
+		});
+	}
+
+	override run(accessor: ServicesAccessor, ...args: any[]): void {
+		const widgetService = accessor.get(IChatWidgetService);
+		const widget = widgetService.lastFocusedWidget;
+		widget?.input.switchToNextModel();
+	}
+}
+
 export class ChatEditingSessionSubmitAction extends SubmitAction {
 	static readonly ID = 'workbench.action.edits.submit';
 
@@ -303,26 +342,6 @@ class SubmitWithoutDispatchingAction extends Action2 {
 	}
 }
 
-export const ChatModelPickerActionId = 'workbench.action.chat.pickModel';
-MenuRegistry.appendMenuItem(MenuId.ChatExecute, {
-	command: {
-		id: ChatModelPickerActionId,
-		title: localize2('chat.pickModel.label', "Pick Model"),
-	},
-	order: 3,
-	group: 'navigation',
-	when: ContextKeyExpr.and(
-		ChatContextKeys.languageModelsAreUserSelectable,
-		ContextKeyExpr.or(
-			ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Panel),
-			ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.EditingSession),
-			ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Editor),
-			ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Notebook),
-			ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Terminal)
-		)
-	),
-});
-
 export class ChatSubmitSecondaryAgentAction extends Action2 {
 	static readonly ID = 'workbench.action.chat.submitSecondaryAgent';
 
@@ -559,4 +578,5 @@ export function registerChatExecuteActions() {
 	registerAction2(SendToChatEditingAction);
 	registerAction2(ToggleAgentModeAction);
 	registerAction2(ToggleRequestPausedAction);
+	registerAction2(SwitchToNextModelAction);
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 97191f193de8..a4d3bfa098aa 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -84,7 +84,7 @@ import { IChatVariablesService } from '../common/chatVariables.js';
 import { IChatResponseViewModel } from '../common/chatViewModel.js';
 import { ChatInputHistoryMaxEntries, IChatHistoryEntry, IChatInputState, IChatWidgetHistoryService } from '../common/chatWidgetHistoryService.js';
 import { ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../common/languageModels.js';
-import { CancelAction, ChatModelPickerActionId, ChatSubmitAction, ChatSubmitSecondaryAgentAction, IChatExecuteActionContext, IToggleAgentModeArgs, ToggleAgentModeActionId } from './actions/chatExecuteActions.js';
+import { CancelAction, ChatSubmitAction, ChatSubmitSecondaryAgentAction, IChatExecuteActionContext, IToggleAgentModeArgs, ChatSwitchToNextModelActionId, ToggleAgentModeActionId } from './actions/chatExecuteActions.js';
 import { ImplicitContextAttachmentWidget } from './attachments/implicitContextAttachment.js';
 import { PromptAttachmentsCollectionWidget } from './attachments/promptAttachments/promptAttachmentsCollectionWidget.js';
 import { IChatWidget } from './chat.js';
@@ -416,8 +416,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		if (persistedSelection) {
 			const model = this.languageModelsService.lookupLanguageModel(persistedSelection);
 			if (model) {
-				this._currentLanguageModel = { metadata: model, identifier: persistedSelection };
-				this._onDidChangeCurrentLanguageModel.fire(this._currentLanguageModel);
+				this.setCurrentLanguageModel({ metadata: model, identifier: persistedSelection });
 				this.checkModelSupported();
 			} else {
 				this._waitForPersistedLanguageModel.value = this.languageModelsService.onDidChangeLanguageModels(e => {
@@ -426,8 +425,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 						this._waitForPersistedLanguageModel.clear();
 
 						if (persistedModel.metadata.isUserSelectable) {
-							this._currentLanguageModel = { metadata: persistedModel.metadata, identifier: persistedSelection };
-							this._onDidChangeCurrentLanguageModel.fire(this._currentLanguageModel!);
+							this.setCurrentLanguageModel({ metadata: persistedModel.metadata, identifier: persistedSelection });
 							this.checkModelSupported();
 						}
 					}
@@ -440,6 +438,15 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}));
 	}
 
+	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]);
+		}
+	}
+
 	private checkModelSupported(): void {
 		if (this._currentLanguageModel && !this.modelSupportedForDefaultAgent(this._currentLanguageModel)) {
 			this.setCurrentLanguageModelToDefault();
@@ -481,24 +488,25 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			const model = this.languageModelsService.lookupLanguageModel(id);
 			return model?.isUserSelectable && !model.isDefault;
 		});
-		this._currentLanguageModel = hasUserSelectableLanguageModels && defaultLanguageModelId ?
+		const defaultModel = hasUserSelectableLanguageModels && defaultLanguageModelId ?
 			{ metadata: this.languageModelsService.lookupLanguageModel(defaultLanguageModelId)!, identifier: defaultLanguageModelId } :
 			undefined;
-		if (this._currentLanguageModel) {
-			this._onDidChangeCurrentLanguageModel.fire(this._currentLanguageModel);
+		if (defaultModel) {
+			this.setCurrentLanguageModel(defaultModel);
 		}
 	}
 
-	private setCurrentLanguageModelByUser(model: ILanguageModelChatMetadataAndIdentifier) {
+	private setCurrentLanguageModel(model: ILanguageModelChatMetadataAndIdentifier) {
 		this._currentLanguageModel = model;
 
-		// The user changed the language model, so we don't wait for the persisted option to be registered
-		this._waitForPersistedLanguageModel.clear();
 		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._onDidChangeCurrentLanguageModel.fire(model);
 	}
 
 	private loadHistory(): HistoryNavigator2<IChatHistoryEntry> {
@@ -883,7 +891,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 					}
 				}
 
-				if (action.id === ChatModelPickerActionId && action instanceof MenuItemAction) {
+				if (action.id === ChatSwitchToNextModelActionId && action instanceof MenuItemAction) {
 					if (!this._currentLanguageModel) {
 						this.setCurrentLanguageModelToDefault();
 					}
@@ -892,7 +900,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 						const itemDelegate: ModelPickerDelegate = {
 							onDidChangeModel: this._onDidChangeCurrentLanguageModel.event,
 							setModel: (model: ILanguageModelChatMetadataAndIdentifier) => {
-								this.setCurrentLanguageModelByUser(model);
+								// The user changed the language model, so we don't wait for the persisted option to be registered
+								this._waitForPersistedLanguageModel.clear();
+								this.setCurrentLanguageModel(model);
 								this.renderAttachedContext();
 							},
 							getModels: () => this.getModels()
@@ -1654,7 +1664,12 @@ class ModelPickerActionViewItem extends DropdownMenuActionViewItemWithKeybinding
 			}
 		};
 
-		super(action, modelActionsProvider, contextMenuService, undefined, keybindingService, contextKeyService);
+		const actionWithLabel: IAction = {
+			...action,
+			tooltip: localize('chat.modelPicker.label', "Pick Model"),
+			run: () => { }
+		};
+		super(actionWithLabel, modelActionsProvider, contextMenuService, undefined, keybindingService, contextKeyService);
 		this._register(delegate.onDidChangeModel(modelId => {
 			this.currentLanguageModel = modelId;
 			this.renderLabel(this.element!);

From 8ebc9a6f21bef915c1373b8d0f57a95b496216dd Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Sun, 9 Mar 2025 18:40:09 -0700
Subject: [PATCH 0713/1815] refactor: extract chat attachment rendering
 (#243019)

---
 .../chat/browser/chatAttachmentWidgets.ts     | 403 ++++++++++++++++++
 .../chatAttachmentsContentPart.ts             |   1 +
 .../contrib/chat/browser/chatInputPart.ts     | 295 ++-----------
 3 files changed, 434 insertions(+), 265 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/browser/chatAttachmentWidgets.ts

diff --git a/src/vs/workbench/contrib/chat/browser/chatAttachmentWidgets.ts b/src/vs/workbench/contrib/chat/browser/chatAttachmentWidgets.ts
new file mode 100644
index 000000000000..ec400c28df77
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatAttachmentWidgets.ts
@@ -0,0 +1,403 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { $, addDisposableListener } from '../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { Button } from '../../../../base/browser/ui/button/button.js';
+import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { IManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { URI } from '../../../../base/common/uri.js';
+import { localize } from '../../../../nls.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ITextEditorOptions } from '../../../../platform/editor/common/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 { IOpenerService, OpenInternalOptions } from '../../../../platform/opener/common/opener.js';
+import { IThemeService, FolderThemeIcon } from '../../../../platform/theme/common/themeService.js';
+import { IResourceLabel, ResourceLabels, IFileLabelOptions } from '../../../browser/labels.js';
+import { revealInSideBarCommand } from '../../files/browser/fileActions.contribution.js';
+import { IChatRequestPasteVariableEntry, IChatRequestVariableEntry, ILinkVariableEntry, isImageVariableEntry } from '../common/chatModel.js';
+import { ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../common/languageModels.js';
+import { hookUpResourceAttachmentDragAndContextMenu, hookUpSymbolAttachmentDragAndContextMenu } from './chatContentParts/chatAttachmentsContentPart.js';
+import { convertUint8ArrayToString } from './imageUtils.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { basename, dirname } from '../../../../base/common/path.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
+
+abstract class AbstractChatAttachmentWidget extends Disposable {
+	public readonly element: HTMLElement;
+	public readonly label: IResourceLabel;
+
+	private readonly _onDidDelete: Emitter<globalThis.Event> = this._register(new Emitter<globalThis.Event>());
+	get onDidDelete(): Event<globalThis.Event> {
+		return this._onDidDelete.event;
+	}
+
+	constructor(
+		private readonly attachment: IChatRequestVariableEntry,
+		private readonly shouldFocusClearButton: boolean,
+		container: HTMLElement,
+		contextResourceLabels: ResourceLabels,
+		protected readonly hoverDelegate: IHoverDelegate,
+		protected readonly currentLanguageModel: ILanguageModelChatMetadataAndIdentifier | undefined,
+		@ICommandService protected readonly commandService: ICommandService,
+		@IOpenerService protected readonly openerService: IOpenerService,
+	) {
+		super();
+		this.element = dom.append(container, $('.chat-attached-context-attachment.show-file-icons'));
+		this.label = contextResourceLabels.create(this.element, { supportIcons: true, hoverDelegate, hoverTargetOverride: this.element });
+		this._register(this.label);
+		this.element.tabIndex = 0;
+	}
+
+	protected modelSupportsVision() {
+		return this.currentLanguageModel?.metadata.capabilities?.vision ?? false;
+	}
+
+	protected attachClearButton() {
+		const clearButton = new Button(this.element, {
+			supportIcons: true,
+			hoverDelegate: this.hoverDelegate,
+			title: localize('chat.attachment.clearButton', "Remove from context")
+		});
+		clearButton.icon = Codicon.close;
+		this._register(clearButton);
+		this._register(Event.once(clearButton.onDidClick)((e) => {
+			this._onDidDelete.fire(e);
+		}));
+		if (this.shouldFocusClearButton) {
+			clearButton.focus();
+		}
+	}
+
+	protected addResourceOpenHandlers(resource: URI, range: IRange | undefined): void {
+		this.element.style.cursor = 'pointer';
+		this._register(dom.addDisposableListener(this.element, dom.EventType.CLICK, (e: MouseEvent) => {
+			dom.EventHelper.stop(e, true);
+			if (this.attachment.isDirectory) {
+				this.openResource(resource, true);
+			} else {
+				this.openResource(resource, false, range);
+			}
+		}));
+
+		this._register(dom.addDisposableListener(this.element, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			const event = new StandardKeyboardEvent(e);
+			if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
+				dom.EventHelper.stop(e, true);
+				if (this.attachment.isDirectory) {
+					this.openResource(resource, true);
+				} else {
+					this.openResource(resource, false, range);
+				}
+			}
+		}));
+	}
+
+	protected openResource(resource: URI, isDirectory: true): void;
+	protected openResource(resource: URI, isDirectory: false, range: IRange | undefined): void;
+	protected openResource(resource: URI, isDirectory?: boolean, range?: IRange): void {
+		if (isDirectory) {
+			// Reveal Directory in explorer
+			this.commandService.executeCommand(revealInSideBarCommand.id, resource);
+			return;
+		}
+
+		// Open file in editor
+		const openTextEditorOptions: ITextEditorOptions | undefined = range ? { selection: range } : undefined;
+		const options: OpenInternalOptions = {
+			fromUserGesture: true,
+			editorOptions: openTextEditorOptions,
+		};
+		this.openerService.open(resource, options);
+	}
+}
+
+export class FileAttachmentWidget extends AbstractChatAttachmentWidget {
+
+	constructor(
+		resource: URI,
+		range: IRange | undefined,
+		attachment: IChatRequestVariableEntry,
+		currentLanguageModel: ILanguageModelChatMetadataAndIdentifier | undefined,
+		shouldFocusClearButton: boolean,
+		container: HTMLElement,
+		contextResourceLabels: ResourceLabels,
+		hoverDelegate: IHoverDelegate,
+		@ICommandService commandService: ICommandService,
+		@IOpenerService openerService: IOpenerService,
+		@IThemeService private readonly themeService: IThemeService,
+		@IHoverService private readonly hoverService: IHoverService,
+		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super(attachment, shouldFocusClearButton, container, contextResourceLabels, hoverDelegate, currentLanguageModel, commandService, openerService);
+
+		const fileBasename = basename(resource.path);
+		const fileDirname = dirname(resource.path);
+		const friendlyName = `${fileBasename} ${fileDirname}`;
+		const ariaLabel = range ? localize('chat.fileAttachmentWithRange', "Attached file, {0}, line {1} to line {2}", friendlyName, range.startLineNumber, range.endLineNumber) : localize('chat.fileAttachment', "Attached file, {0}", friendlyName);
+		this.element.ariaLabel = ariaLabel;
+
+		if (attachment.isOmitted) {
+			this.renderOmittedWarning(friendlyName, ariaLabel, hoverDelegate);
+		} else {
+			const fileOptions: IFileLabelOptions = { hidePath: true };
+			this.label.setFile(resource, attachment.isFile ? {
+				...fileOptions,
+				fileKind: FileKind.FILE,
+				range,
+			} : {
+				...fileOptions,
+				fileKind: FileKind.FOLDER,
+				icon: !this.themeService.getFileIconTheme().hasFolderIcons ? FolderThemeIcon : undefined
+			});
+		}
+
+		this.instantiationService.invokeFunction(accessor => {
+			this._register(hookUpResourceAttachmentDragAndContextMenu(accessor, this.element, resource));
+		});
+		this.addResourceOpenHandlers(resource, range);
+
+		this.attachClearButton();
+	}
+
+	private renderOmittedWarning(friendlyName: string, ariaLabel: string, hoverDelegate: IHoverDelegate) {
+		const pillIcon = dom.$('div.chat-attached-context-pill', {}, dom.$(this.modelSupportsVision() ? 'span.codicon.codicon-file-media' : 'span.codicon.codicon-warning'));
+		const textLabel = dom.$('span.chat-attached-context-custom-text', {}, friendlyName);
+		this.element.appendChild(pillIcon);
+		this.element.appendChild(textLabel);
+
+		const hoverElement = dom.$('div.chat-attached-context-hover');
+		hoverElement.setAttribute('aria-label', ariaLabel);
+
+		if (!this.modelSupportsVision()) {
+			this.element.classList.add('warning');
+			hoverElement.textContent = localize('chat.fileAttachmentHover', "{0} does not support this {1} type.", this.currentLanguageModel ? this.languageModelsService.lookupLanguageModel(this.currentLanguageModel.identifier)?.name : this.currentLanguageModel, 'file');
+			this._register(this.hoverService.setupManagedHover(hoverDelegate, this.element, hoverElement, { trapFocus: true }));
+		}
+	}
+}
+
+export class ImageAttachmentWidget extends AbstractChatAttachmentWidget {
+
+	constructor(
+		resource: URI | undefined,
+		attachment: IChatRequestVariableEntry,
+		currentLanguageModel: ILanguageModelChatMetadataAndIdentifier | undefined,
+		shouldFocusClearButton: boolean,
+		container: HTMLElement,
+		contextResourceLabels: ResourceLabels,
+		hoverDelegate: IHoverDelegate,
+		@ICommandService commandService: ICommandService,
+		@IOpenerService openerService: IOpenerService,
+		@IHoverService private readonly hoverService: IHoverService,
+		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
+	) {
+		super(attachment, shouldFocusClearButton, container, contextResourceLabels, hoverDelegate, currentLanguageModel, commandService, openerService);
+
+		const ariaLabel = localize('chat.imageAttachment', "Attached image, {0}", attachment.name);
+		this.element.ariaLabel = ariaLabel;
+		this.element.style.position = 'relative';
+
+		if (attachment.references) {
+			this.element.style.cursor = 'pointer';
+			const clickHandler = () => {
+				if (attachment.references && URI.isUri(attachment.references[0].reference)) {
+					this.openResource(attachment.references[0].reference, false, undefined);
+				}
+			};
+			this._register(addDisposableListener(this.element, 'click', clickHandler));
+		}
+
+		const pillIcon = dom.$('div.chat-attached-context-pill', {}, dom.$(this.modelSupportsVision() ? 'span.codicon.codicon-file-media' : 'span.codicon.codicon-warning'));
+		const textLabel = dom.$('span.chat-attached-context-custom-text', {}, attachment.name);
+		this.element.appendChild(pillIcon);
+		this.element.appendChild(textLabel);
+
+		const hoverElement = dom.$('div.chat-attached-context-hover');
+		hoverElement.setAttribute('aria-label', ariaLabel);
+
+		if (!this.modelSupportsVision()) {
+			this.element.classList.add('warning');
+			hoverElement.textContent = localize('chat.fileAttachmentHover', "{0} does not support this {1} type.", this.currentLanguageModel ? this.languageModelsService.lookupLanguageModel(this.currentLanguageModel.identifier)?.name : this.currentLanguageModel, 'image');
+			this._register(this.hoverService.setupManagedHover(hoverDelegate, this.element, hoverElement, { trapFocus: true }));
+		} else {
+			const buffer = attachment.value as Uint8Array;
+			const isURL = isImageVariableEntry(attachment) && attachment.isURL;
+			if (isURL) {
+				hoverElement.textContent = localize('chat.imageAttachmentHover', "{0}", convertUint8ArrayToString(buffer));
+				this._register(this.hoverService.setupManagedHover(hoverDelegate, this.element, hoverElement, { trapFocus: true }));
+			}
+			this.createImageElements(buffer, this.element, hoverElement);
+			this._register(this.hoverService.setupManagedHover(hoverDelegate, this.element, hoverElement, { trapFocus: false }));
+		}
+
+		if (resource) {
+			this.addResourceOpenHandlers(resource, undefined);
+		}
+
+		this.attachClearButton();
+	}
+
+	private createImageElements(buffer: ArrayBuffer | Uint8Array, widget: HTMLElement, hoverElement: HTMLElement) {
+		const blob = new Blob([buffer], { type: 'image/png' });
+		const url = URL.createObjectURL(blob);
+		const pillImg = dom.$('img.chat-attached-context-pill-image', { src: url, alt: '' });
+		const pill = dom.$('div.chat-attached-context-pill', {}, pillImg);
+
+		const existingPill = widget.querySelector('.chat-attached-context-pill');
+		if (existingPill) {
+			existingPill.replaceWith(pill);
+		}
+
+		const hoverImage = dom.$('img.chat-attached-context-image', { src: url, alt: '' });
+
+		// Update hover image
+		hoverElement.appendChild(hoverImage);
+
+		hoverImage.onload = () => {
+			URL.revokeObjectURL(url);
+		};
+
+		hoverImage.onerror = () => {
+			// reset to original icon on error or invalid image
+			const pillIcon = dom.$('div.chat-attached-context-pill', {}, dom.$('span.codicon.codicon-file-media'));
+			const pill = dom.$('div.chat-attached-context-pill', {}, pillIcon);
+			const existingPill = widget.querySelector('.chat-attached-context-pill');
+			if (existingPill) {
+				existingPill.replaceWith(pill);
+			}
+		};
+	}
+}
+
+export class PasteAttachmentWidget extends AbstractChatAttachmentWidget {
+
+	constructor(
+		attachment: IChatRequestPasteVariableEntry,
+		currentLanguageModel: ILanguageModelChatMetadataAndIdentifier | undefined,
+		shouldFocusClearButton: boolean,
+		container: HTMLElement,
+		contextResourceLabels: ResourceLabels,
+		hoverDelegate: IHoverDelegate,
+		@ICommandService commandService: ICommandService,
+		@IOpenerService openerService: IOpenerService,
+		@IHoverService private readonly hoverService: IHoverService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super(attachment, shouldFocusClearButton, container, contextResourceLabels, hoverDelegate, currentLanguageModel, commandService, openerService);
+
+		const ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
+		this.element.ariaLabel = ariaLabel;
+
+		const classNames = ['file-icon', `${attachment.language}-lang-file-icon`];
+		let resource: URI | undefined;
+		let range: IRange | undefined;
+
+		if (attachment.copiedFrom) {
+			resource = attachment.copiedFrom.uri;
+			range = attachment.copiedFrom.range;
+			const filename = basename(resource.path);
+			this.label.setLabel(filename, undefined, { extraClasses: classNames });
+		} else {
+			this.label.setLabel(attachment.fileName, undefined, { extraClasses: classNames });
+		}
+		this.element.appendChild(dom.$('span.attachment-additional-info', {}, `Pasted ${attachment.pastedLines}`));
+
+		this.element.style.position = 'relative';
+
+		const sourceUri = attachment.copiedFrom?.uri;
+		const hoverContent: IManagedHoverTooltipMarkdownString = {
+			markdown: {
+				value: `${sourceUri ? this.instantiationService.invokeFunction(accessor => accessor.get(ILabelService).getUriLabel(sourceUri, { relative: true })) : attachment.fileName}\n\n---\n\n\`\`\`${attachment.language}\n\n${attachment.code}\n\`\`\``,
+			},
+			markdownNotSupportedFallback: attachment.code,
+		};
+		this._register(this.hoverService.setupManagedHover(hoverDelegate, this.element, hoverContent, { trapFocus: true }));
+
+		const copiedFromResource = attachment.copiedFrom?.uri;
+		if (copiedFromResource) {
+			this._register(this.instantiationService.invokeFunction(accessor => hookUpResourceAttachmentDragAndContextMenu(accessor, this.element, copiedFromResource)));
+			this.addResourceOpenHandlers(copiedFromResource, range);
+		}
+
+		this.attachClearButton();
+	}
+}
+
+export class LinkAttachmentWidget extends AbstractChatAttachmentWidget {
+	constructor(
+		attachment: ILinkVariableEntry,
+		currentLanguageModel: ILanguageModelChatMetadataAndIdentifier | undefined,
+		shouldFocusClearButton: boolean,
+		container: HTMLElement,
+		contextResourceLabels: ResourceLabels,
+		hoverDelegate: IHoverDelegate,
+		@ICommandService commandService: ICommandService,
+		@IOpenerService openerService: IOpenerService,
+	) {
+		super(attachment, shouldFocusClearButton, container, contextResourceLabels, hoverDelegate, currentLanguageModel, commandService, openerService);
+
+		this.element.ariaLabel = localize('chat.attachment.link', "Attached link, {0}", attachment.name);
+		this.label.setResource({ resource: attachment.value, name: attachment.name }, { icon: Codicon.link, title: attachment.value.toString() });
+		this.attachClearButton();
+	}
+}
+
+export class DefaultChatAttachmentWidget extends AbstractChatAttachmentWidget {
+	constructor(
+		resource: URI | undefined,
+		range: IRange | undefined,
+		attachment: IChatRequestVariableEntry,
+		currentLanguageModel: ILanguageModelChatMetadataAndIdentifier | undefined,
+		shouldFocusClearButton: boolean,
+		container: HTMLElement,
+		contextResourceLabels: ResourceLabels,
+		hoverDelegate: IHoverDelegate,
+		@ICommandService commandService: ICommandService,
+		@IOpenerService openerService: IOpenerService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super(attachment, shouldFocusClearButton, container, contextResourceLabels, hoverDelegate, currentLanguageModel, commandService, openerService);
+
+		const attachmentLabel = attachment.fullName ?? attachment.name;
+		const withIcon = attachment.icon?.id ? `$(${attachment.icon.id}) ${attachmentLabel}` : attachmentLabel;
+		this.label.setLabel(withIcon, undefined);
+		this.element.ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
+
+		if (attachment.kind === 'diagnostic') {
+			if (attachment.filterUri) {
+				resource = attachment.filterUri ? URI.revive(attachment.filterUri) : undefined;
+				range = attachment.filterRange;
+			} else {
+				this.element.style.cursor = 'pointer';
+				this._register(dom.addDisposableListener(this.element, dom.EventType.CLICK, () => {
+					this.commandService.executeCommand('workbench.panel.markers.view.focus');
+				}));
+			}
+		}
+
+		if (attachment.kind === 'symbol') {
+			const scopedContextKeyService = this._register(this.contextKeyService.createScoped(this.element));
+			this._register(this.instantiationService.invokeFunction(accessor => hookUpSymbolAttachmentDragAndContextMenu(accessor, this.element, scopedContextKeyService, { ...attachment, kind: attachment.symbolKind }, MenuId.ChatInputSymbolAttachmentContext)));
+		}
+
+		if (resource) {
+			this.addResourceOpenHandlers(resource, range);
+		}
+
+		this.attachClearButton();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
index 2c6413069a47..bd7fd35870c7 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts
@@ -73,6 +73,7 @@ export class ChatAttachmentsContentPart extends Disposable {
 		}
 	}
 
+	// TODO@joyceerhl adopt chat attachment widgets
 	private initAttachedContext(container: HTMLElement) {
 		dom.clearNode(container);
 		this.attachedContextDisposables.clear();
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index a4d3bfa098aa..7688d1a305ea 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -12,8 +12,6 @@ import { ActionViewItem, IActionViewItemOptions } from '../../../../base/browser
 import * as aria from '../../../../base/browser/ui/aria/aria.js';
 import { Button } from '../../../../base/browser/ui/button/button.js';
 import { IActionProvider } from '../../../../base/browser/ui/dropdown/dropdown.js';
-import { IManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
-import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
 import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { IAction, Separator, toAction } from '../../../../base/common/actions.js';
@@ -23,7 +21,6 @@ import { HistoryNavigator2 } from '../../../../base/common/history.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ResourceSet } from '../../../../base/common/map.js';
-import { basename, dirname } from '../../../../base/common/path.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IEditorConstructionOptions } from '../../../../editor/browser/config/editorConfiguration.js';
@@ -32,7 +29,7 @@ import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/c
 import { EditorOptions } from '../../../../editor/common/config/editorOptions.js';
 import { IDimension } from '../../../../editor/common/core/dimension.js';
 import { IPosition } from '../../../../editor/common/core/position.js';
-import { IRange, Range } from '../../../../editor/common/core/range.js';
+import { Range } from '../../../../editor/common/core/range.js';
 import { ITextModel } from '../../../../editor/common/model.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
@@ -54,10 +51,8 @@ import { ICommandService } from '../../../../platform/commands/common/commands.j
 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 { ITextEditorOptions } from '../../../../platform/editor/common/editor.js';
-import { FileKind, IFileService } from '../../../../platform/files/common/files.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
 import { registerAndCreateHistoryNavigationContext } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
-import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
@@ -65,15 +60,13 @@ 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 { INotificationService } from '../../../../platform/notification/common/notification.js';
-import { IOpenerService, type OpenInternalOptions } from '../../../../platform/opener/common/opener.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { FolderThemeIcon, IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { IFileLabelOptions, ResourceLabels } from '../../../browser/labels.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ResourceLabels } from '../../../browser/labels.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 { revealInSideBarCommand } from '../../files/browser/fileActions.contribution.js';
 import { ChatAgentLocation, IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatEditingSession } from '../common/chatEditingService.js';
@@ -90,7 +83,7 @@ import { PromptAttachmentsCollectionWidget } from './attachments/promptAttachmen
 import { IChatWidget } from './chat.js';
 import { ChatAttachmentModel } from './chatAttachmentModel.js';
 import { toChatVariable } from './chatAttachmentModel/chatPromptAttachmentsCollection.js';
-import { hookUpResourceAttachmentDragAndContextMenu, hookUpSymbolAttachmentDragAndContextMenu } from './chatContentParts/chatAttachmentsContentPart.js';
+import { DefaultChatAttachmentWidget, FileAttachmentWidget, ImageAttachmentWidget, LinkAttachmentWidget, PasteAttachmentWidget } from './chatAttachmentWidgets.js';
 import { IDisposableReference } from './chatContentParts/chatCollections.js';
 import { CollapsibleListPool, IChatCollapsibleListItem } from './chatContentParts/chatReferencesContentPart.js';
 import { ChatDragAndDrop } from './chatDragAndDrop.js';
@@ -100,7 +93,7 @@ import { IChatViewState } from './chatWidget.js';
 import { ChatFileReference } from './contrib/chatDynamicVariables/chatFileReference.js';
 import { ChatImplicitContext } from './contrib/chatImplicitContext.js';
 import { ChatRelatedFiles } from './contrib/chatInputRelatedFilesContrib.js';
-import { convertUint8ArrayToString, resizeImage } from './imageUtils.js';
+import { resizeImage } from './imageUtils.js';
 
 const $ = dom.$;
 
@@ -348,11 +341,8 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		@IAccessibilityService private readonly accessibilityService: IAccessibilityService,
 		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
 		@ILogService private readonly logService: ILogService,
-		@IHoverService private readonly hoverService: IHoverService,
 		@IFileService private readonly fileService: IFileService,
-		@ICommandService private readonly commandService: ICommandService,
 		@IEditorService private readonly editorService: IEditorService,
-		@IOpenerService private readonly openerService: IOpenerService,
 		@IThemeService private readonly themeService: IThemeService,
 		@ITextModelService private readonly textModelResolverService: ITextModelService,
 		@IStorageService private readonly storageService: IStorageService,
@@ -453,10 +443,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}
 	}
 
-	private supportsVision(): boolean {
-		return this._currentLanguageModel?.metadata.capabilities?.vision ?? false;
-	}
-
 	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.chatAgentService.getDefaultAgent(this.location)?.isToolsAgent) {
@@ -1031,154 +1017,26 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		this.instructionAttachmentsPart.render(container);
 
 		for (const [index, attachment] of attachments) {
-			const widget = dom.append(container, $('.chat-attached-context-attachment.show-file-icons'));
-			const label = this._contextResourceLabels.create(widget, { supportIcons: true, hoverDelegate, hoverTargetOverride: widget });
-
-			let ariaLabel: string | undefined;
+			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);
 
-			let 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;
-			let range = attachment.value && typeof attachment.value === 'object' && 'range' in attachment.value && Range.isIRange(attachment.value.range) ? attachment.value.range : undefined;
+			let attachmentWidget;
 			if (resource && (attachment.isFile || attachment.isDirectory)) {
-				const fileBasename = basename(resource.path);
-				const fileDirname = dirname(resource.path);
-				const friendlyName = `${fileBasename} ${fileDirname}`;
-				ariaLabel = range ? localize('chat.fileAttachmentWithRange', "Attached file, {0}, line {1} to line {2}", friendlyName, range.startLineNumber, range.endLineNumber) : localize('chat.fileAttachment', "Attached file, {0}", friendlyName);
-
-				if (attachment.isOmitted) {
-					this.customAttachment(widget, friendlyName, hoverDelegate, ariaLabel, store);
-				} else {
-					const fileOptions: IFileLabelOptions = { hidePath: true };
-					label.setFile(resource, attachment.isFile ? {
-						...fileOptions,
-						fileKind: FileKind.FILE,
-						range,
-					} : {
-						...fileOptions,
-						fileKind: FileKind.FOLDER,
-						icon: !this.themeService.getFileIconTheme().hasFolderIcons ? FolderThemeIcon : undefined
-					});
-				}
-
-				this.attachButtonAndDisposables(widget, index, attachment, hoverDelegate);
-				this.instantiationService.invokeFunction(accessor => {
-					if (resource) {
-						store.add(hookUpResourceAttachmentDragAndContextMenu(accessor, widget, resource));
-					}
-				});
+				attachmentWidget = this.instantiationService.createInstance(FileAttachmentWidget, resource, range, attachment, this._currentLanguageModel, shouldFocusClearButton, container, this._contextResourceLabels, hoverDelegate);
 			} else if (attachment.isImage) {
-				ariaLabel = localize('chat.imageAttachment', "Attached image, {0}", attachment.name);
-				const supportsVision = this.supportsVision();
-				const isURL = isImageVariableEntry(attachment) && attachment.isURL;
-				const hoverElement = this.customAttachment(widget, attachment.name, hoverDelegate, ariaLabel, store, attachment.isImage, supportsVision, isURL, attachment.value as Uint8Array);
-
-				if (attachment.references) {
-					widget.style.cursor = 'pointer';
-					const clickHandler = () => {
-						if (attachment.references && URI.isUri(attachment.references[0].reference)) {
-							this.openResource(attachment.references[0].reference, false, undefined);
-						}
-					};
-					store.add(addDisposableListener(widget, 'click', clickHandler));
-				}
-
-				if (supportsVision) {
-					const buffer = attachment.value as Uint8Array;
-					this.createImageElements(buffer, widget, hoverElement);
-					store.add(this.hoverService.setupManagedHover(hoverDelegate, widget, hoverElement, { trapFocus: false }));
-				}
-
-				this.attachButtonAndDisposables(widget, index, attachment, hoverDelegate);
-				widget.style.position = 'relative';
+				attachmentWidget = this.instantiationService.createInstance(ImageAttachmentWidget, resource, attachment, this._currentLanguageModel, shouldFocusClearButton, container, this._contextResourceLabels, hoverDelegate);
 			} else if (isPasteVariableEntry(attachment)) {
-				ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
-
-				const classNames = ['file-icon', `${attachment.language}-lang-file-icon`];
-				if (attachment.copiedFrom) {
-					resource = attachment.copiedFrom.uri;
-					range = attachment.copiedFrom.range;
-					const filename = basename(resource.path);
-					label.setLabel(filename, undefined, { extraClasses: classNames });
-				} else {
-					label.setLabel(attachment.fileName, undefined, { extraClasses: classNames });
-				}
-				widget.appendChild(dom.$('span.attachment-additional-info', {}, `Pasted ${attachment.pastedLines}`));
-
-				widget.style.position = 'relative';
-
-				const hoverContent: IManagedHoverTooltipMarkdownString = {
-					markdown: {
-						value: `${attachment.copiedFrom ? this.labelService.getUriLabel(attachment.copiedFrom.uri, { relative: true }) : attachment.fileName}\n\n---\n\n\`\`\`${attachment.language}\n\n${attachment.code}\n\`\`\``,
-					},
-					markdownNotSupportedFallback: attachment.code,
-				};
-				store.add(this.hoverService.setupManagedHover(hoverDelegate, widget, hoverContent, { trapFocus: true }));
-				this.attachButtonAndDisposables(widget, index, attachment, hoverDelegate);
-
-				const copiedFromResource = attachment.copiedFrom?.uri;
-				if (copiedFromResource) {
-					store.add(this.instantiationService.invokeFunction(accessor => hookUpResourceAttachmentDragAndContextMenu(accessor, widget, copiedFromResource)));
-				}
+				attachmentWidget = this.instantiationService.createInstance(PasteAttachmentWidget, attachment, this._currentLanguageModel, shouldFocusClearButton, container, this._contextResourceLabels, hoverDelegate);
 			} else if (isLinkVariableEntry(attachment)) {
-				ariaLabel = localize('chat.attachment.link', "Attached link, {0}", attachment.name);
-				label.setResource({ resource: attachment.value, name: attachment.name }, { icon: Codicon.link, title: attachment.value.toString() });
-				this.attachButtonAndDisposables(widget, index, attachment, hoverDelegate);
+				attachmentWidget = this.instantiationService.createInstance(LinkAttachmentWidget, attachment, this._currentLanguageModel, shouldFocusClearButton, container, this._contextResourceLabels, hoverDelegate);
 			} else {
-				const attachmentLabel = attachment.fullName ?? attachment.name;
-				const withIcon = attachment.icon?.id ? `$(${attachment.icon.id}) ${attachmentLabel}` : attachmentLabel;
-				label.setLabel(withIcon, undefined);
-
-				ariaLabel = localize('chat.attachment', "Attached context, {0}", attachment.name);
-
-				this.attachButtonAndDisposables(widget, index, attachment, hoverDelegate);
-
-				if (attachment.kind === 'diagnostic') {
-					if (attachment.filterUri) {
-						resource = attachment.filterUri ? URI.revive(attachment.filterUri) : undefined;
-						range = attachment.filterRange;
-					} else {
-						widget.style.cursor = 'pointer';
-						store.add(dom.addDisposableListener(widget, dom.EventType.CLICK, () => {
-							this.commandService.executeCommand('workbench.panel.markers.view.focus');
-						}));
-					}
-				}
-			}
-
-			if (attachment.kind === 'symbol') {
-				const scopedContextKeyService = store.add(this.contextKeyService.createScoped(widget));
-				store.add(this.instantiationService.invokeFunction(accessor => hookUpSymbolAttachmentDragAndContextMenu(accessor, widget, scopedContextKeyService, { ...attachment, kind: attachment.symbolKind }, MenuId.ChatInputSymbolAttachmentContext)));
+				attachmentWidget = this.instantiationService.createInstance(DefaultChatAttachmentWidget, resource, range, attachment, this._currentLanguageModel, shouldFocusClearButton, container, this._contextResourceLabels, hoverDelegate);
 			}
-
-			if (store.isDisposed) {
-				return;
-			}
-
-			if (resource) {
-				widget.style.cursor = 'pointer';
-				store.add(dom.addDisposableListener(widget, dom.EventType.CLICK, (e: MouseEvent) => {
-					dom.EventHelper.stop(e, true);
-					if (attachment.isDirectory) {
-						this.openResource(resource, true);
-					} else {
-						this.openResource(resource, false, range);
-					}
-				}));
-
-				store.add(dom.addDisposableListener(widget, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => {
-					const event = new StandardKeyboardEvent(e);
-					if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
-						dom.EventHelper.stop(e, true);
-						if (attachment.isDirectory) {
-							this.openResource(resource, true);
-						} else {
-							this.openResource(resource, false, range);
-						}
-					}
-				}));
-			}
-
-			widget.tabIndex = 0;
-			widget.ariaLabel = ariaLabel;
+			store.add(attachmentWidget);
+			store.add(attachmentWidget.onDidDelete((e) => {
+				this.handleAttachmentDeletion(e, index, attachment);
+			}));
 		}
 
 		if (oldHeight !== container.offsetHeight) {
@@ -1186,115 +1044,22 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}
 	}
 
-	private customAttachment(widget: HTMLElement, friendlyName: string, hoverDelegate: IHoverDelegate, ariaLabel: string, store: DisposableStore, isImage?: boolean, supportsVision?: boolean, isURL?: boolean, value?: Uint8Array): HTMLElement {
-		const pillIcon = dom.$('div.chat-attached-context-pill', {}, dom.$(supportsVision ? 'span.codicon.codicon-file-media' : 'span.codicon.codicon-warning'));
-		const textLabel = dom.$('span.chat-attached-context-custom-text', {}, friendlyName);
-		widget.appendChild(pillIcon);
-		widget.appendChild(textLabel);
+	private handleAttachmentDeletion(e: globalThis.Event, index: number, attachment: IChatRequestVariableEntry) {
+		this._attachmentModel.delete(attachment.id);
 
-		const hoverElement = dom.$('div.chat-attached-context-hover');
-		hoverElement.setAttribute('aria-label', ariaLabel);
-
-		if (isURL && supportsVision && value) {
-			hoverElement.textContent = localize('chat.imageAttachmentHover', "{0}", convertUint8ArrayToString(value));
-			store.add(this.hoverService.setupManagedHover(hoverDelegate, widget, hoverElement, { trapFocus: true }));
-		}
-
-		if (!supportsVision) {
-			widget.classList.add('warning');
-			hoverElement.textContent = localize('chat.fileAttachmentHover', "{0} does not support this {1} type.", this.currentLanguageModel ? this.languageModelsService.lookupLanguageModel(this.currentLanguageModel)?.name : this.currentLanguageModel, isImage ? 'image' : 'file');
-			store.add(this.hoverService.setupManagedHover(hoverDelegate, widget, hoverElement, { trapFocus: true }));
-		}
-
-		return hoverElement;
-	}
-
-	private openResource(resource: URI, isDirectory: true): void;
-	private openResource(resource: URI, isDirectory: false, range: IRange | undefined): void;
-	private openResource(resource: URI, isDirectory?: boolean, range?: IRange): void {
-		if (isDirectory) {
-			// Reveal Directory in explorer
-			this.commandService.executeCommand(revealInSideBarCommand.id, resource);
-			return;
-		}
-
-		// Open file in editor
-		const openTextEditorOptions: ITextEditorOptions | undefined = range ? { selection: range } : undefined;
-		const options: OpenInternalOptions = {
-			fromUserGesture: true,
-			editorOptions: openTextEditorOptions,
-		};
-		this.openerService.open(resource, options);
-	}
-
-	private attachButtonAndDisposables(widget: HTMLElement, index: number, attachment: IChatRequestVariableEntry, hoverDelegate: IHoverDelegate) {
-		const store = this.attachedContextDisposables.value;
-		if (!store) {
-			return;
-		}
-
-		const clearButton = new Button(widget, {
-			supportIcons: true,
-			hoverDelegate,
-			title: localize('chat.attachment.clearButton', "Remove from context")
-		});
-
-		// If this item is rendering in place of the last attached context item, focus the clear button so the user can continue deleting attached context items with the keyboard
-		if (index === Math.min(this._indexOfLastAttachedContextDeletedWithKeyboard, this.attachmentModel.size - 1)) {
-			clearButton.focus();
-		}
-
-		store.add(clearButton);
-		clearButton.icon = Codicon.close;
-		store.add(Event.once(clearButton.onDidClick)((e) => {
-			this._attachmentModel.delete(attachment.id);
-
-			// Set focus to the next attached context item if deletion was triggered by a keystroke (vs a mouse click)
-			if (dom.isKeyboardEvent(e)) {
-				const event = new StandardKeyboardEvent(e);
-				if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
-					this._indexOfLastAttachedContextDeletedWithKeyboard = index;
-				}
+		// Set focus to the next attached context item if deletion was triggered by a keystroke (vs a mouse click)
+		if (dom.isKeyboardEvent(e)) {
+			const event = new StandardKeyboardEvent(e);
+			if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
+				this._indexOfLastAttachedContextDeletedWithKeyboard = index;
 			}
-
-			if (this._attachmentModel.size === 0) {
-				this.focus();
-			}
-
-			this._onDidChangeContext.fire({ removed: [attachment] });
-		}));
-	}
-
-	// Helper function to create and replace image
-	private createImageElements(buffer: ArrayBuffer | Uint8Array, widget: HTMLElement, hoverElement: HTMLElement) {
-		const blob = new Blob([buffer], { type: 'image/png' });
-		const url = URL.createObjectURL(blob);
-		const pillImg = dom.$('img.chat-attached-context-pill-image', { src: url, alt: '' });
-		const pill = dom.$('div.chat-attached-context-pill', {}, pillImg);
-
-		const existingPill = widget.querySelector('.chat-attached-context-pill');
-		if (existingPill) {
-			existingPill.replaceWith(pill);
 		}
 
-		const hoverImage = dom.$('img.chat-attached-context-image', { src: url, alt: '' });
-
-		// Update hover image
-		hoverElement.appendChild(hoverImage);
-
-		hoverImage.onload = () => {
-			URL.revokeObjectURL(url);
-		};
+		if (this._attachmentModel.size === 0) {
+			this.focus();
+		}
 
-		hoverImage.onerror = () => {
-			// reset to original icon on error or invalid image
-			const pillIcon = dom.$('div.chat-attached-context-pill', {}, dom.$('span.codicon.codicon-file-media'));
-			const pill = dom.$('div.chat-attached-context-pill', {}, pillIcon);
-			const existingPill = widget.querySelector('.chat-attached-context-pill');
-			if (existingPill) {
-				existingPill.replaceWith(pill);
-			}
-		};
+		this._onDidChangeContext.fire({ removed: [attachment] });
 	}
 
 	async renderChatEditingSessionState(chatEditingSession: IChatEditingSession | null) {

From d8aba066d47dc6c5420c902d6f62e19eb09d4e3b Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sun, 9 Mar 2025 22:38:29 -0700
Subject: [PATCH 0714/1815] Bump @vscode/ripgrep (#243004)

* Bump @vscode/ripgrep
Brings in error handling fixes

* In remote/ too
---
 package-lock.json        | 8 ++++----
 package.json             | 2 +-
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1c163334b1a1..75139c612fb5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
         "@vscode/iconv-lite-umd": "0.7.0",
         "@vscode/policy-watcher": "^1.1.10",
         "@vscode/proxy-agent": "^0.32.0",
-        "@vscode/ripgrep": "^1.15.10",
+        "@vscode/ripgrep": "^1.15.11",
         "@vscode/spdlog": "^0.15.0",
         "@vscode/sqlite3": "5.1.8-vscode",
         "@vscode/sudo-prompt": "9.3.1",
@@ -2868,9 +2868,9 @@
       }
     },
     "node_modules/@vscode/ripgrep": {
-      "version": "1.15.10",
-      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.10.tgz",
-      "integrity": "sha512-83Q6qFrELpFgf88bPOcwSWDegfY2r/cb6bIfdLTSZvN73Dg1wviSfO+1v6lTFMd0mAvUYYcTUu+Mn5xMroZMxA==",
+      "version": "1.15.11",
+      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.11.tgz",
+      "integrity": "sha512-G/VqtA6kR50mJkIH4WA+I2Q78V5blovgPPq0VPYM0QIRp57lYMkdV+U9VrY80b3AvaC72A1z8STmyxc8ZKiTsw==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 0f5909dcb1e2..920d539df285 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "@vscode/iconv-lite-umd": "0.7.0",
     "@vscode/policy-watcher": "^1.1.10",
     "@vscode/proxy-agent": "^0.32.0",
-    "@vscode/ripgrep": "^1.15.10",
+    "@vscode/ripgrep": "^1.15.11",
     "@vscode/spdlog": "^0.15.0",
     "@vscode/sqlite3": "5.1.8-vscode",
     "@vscode/sudo-prompt": "9.3.1",
diff --git a/remote/package-lock.json b/remote/package-lock.json
index 2349babd03e8..89ceed12c719 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -14,7 +14,7 @@
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.0",
         "@vscode/proxy-agent": "^0.32.0",
-        "@vscode/ripgrep": "^1.15.10",
+        "@vscode/ripgrep": "^1.15.11",
         "@vscode/spdlog": "^0.15.0",
         "@vscode/tree-sitter-wasm": "^0.1.3",
         "@vscode/vscode-languagedetection": "1.0.21",
@@ -437,9 +437,9 @@
       }
     },
     "node_modules/@vscode/ripgrep": {
-      "version": "1.15.10",
-      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.10.tgz",
-      "integrity": "sha512-83Q6qFrELpFgf88bPOcwSWDegfY2r/cb6bIfdLTSZvN73Dg1wviSfO+1v6lTFMd0mAvUYYcTUu+Mn5xMroZMxA==",
+      "version": "1.15.11",
+      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.11.tgz",
+      "integrity": "sha512-G/VqtA6kR50mJkIH4WA+I2Q78V5blovgPPq0VPYM0QIRp57lYMkdV+U9VrY80b3AvaC72A1z8STmyxc8ZKiTsw==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/remote/package.json b/remote/package.json
index a25b884dedb9..905239d09167 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -9,7 +9,7 @@
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
     "@vscode/proxy-agent": "^0.32.0",
-    "@vscode/ripgrep": "^1.15.10",
+    "@vscode/ripgrep": "^1.15.11",
     "@vscode/spdlog": "^0.15.0",
     "@vscode/tree-sitter-wasm": "^0.1.3",
     "@vscode/vscode-languagedetection": "1.0.21",

From c04ac5a5dfdd81826c0340d1940ed58899983635 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 10 Mar 2025 10:22:18 +0100
Subject: [PATCH 0715/1815] add `property-init-order-check` and run during CI
 (just like valid layers check) (#243042)

Enable ignore list which capture current violations and todo list
---
 .github/workflows/basic.yml               |   3 +
 .github/workflows/ci.yml                  |   3 +
 build/azure-pipelines/product-compile.yml |   4 +-
 build/lib/propertyInitOrderChecker.js     | 451 +++++++++++++++++++
 build/lib/propertyInitOrderChecker.ts     | 500 ++++++++++++++++++++++
 package.json                              |   1 +
 6 files changed, 960 insertions(+), 2 deletions(-)
 create mode 100644 build/lib/propertyInitOrderChecker.js
 create mode 100644 build/lib/propertyInitOrderChecker.ts

diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
index d5f166a4aae8..321db470c550 100644
--- a/.github/workflows/basic.yml
+++ b/.github/workflows/basic.yml
@@ -118,6 +118,9 @@ jobs:
       - name: Run Valid Layers Checks
         run: npm run valid-layers-check
 
+      - name: Run Property Init Order Checks
+        run: npm run property-init-order-check
+
       - name: Compile /build/
         run: npm run compile
         working-directory: build
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 344213e0ca88..813b8dac7655 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -299,6 +299,9 @@ jobs:
       - name: Run Valid Layers Checks
         run: npm run valid-layers-check
 
+      - name: Run Property Init Order Checks
+        run: npm run property-init-order-check
+
       - name: Compile /build/
         run: npm run compile
         working-directory: build
diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index dcc1a62225d6..6096157ad8d5 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -104,12 +104,12 @@ steps:
   - template: common/install-builtin-extensions.yml@self
 
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
-    - script: npm exec -- npm-run-all -lp core-ci-pr extensions-ci-pr hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check
+    - script: npm exec -- npm-run-all -lp core-ci-pr extensions-ci-pr hygiene eslint valid-layers-check property-init-order-check vscode-dts-compile-check tsec-compile-check
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Compile & Hygiene (OSS)
   - ${{ else }}:
-    - script: npm exec -- npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check vscode-dts-compile-check tsec-compile-check
+    - script: npm exec -- npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check property-init-order-check vscode-dts-compile-check tsec-compile-check
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Compile & Hygiene (non-OSS)
diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
new file mode 100644
index 000000000000..1f796a8fc45c
--- /dev/null
+++ b/build/lib/propertyInitOrderChecker.js
@@ -0,0 +1,451 @@
+"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.EntryKind = void 0;
+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');
+const ignored = new Set([
+    'vs/base/common/arrays.ts',
+    'vs/platform/workspace/common/workspace.ts',
+    'vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts',
+    'vs/base/parts/ipc/common/ipc.mp.ts',
+    'vs/platform/storage/common/storage.ts',
+    'vs/platform/state/node/stateService.ts',
+    'vs/platform/workspaces/electron-main/workspacesManagementMainService.ts',
+    'vs/platform/windows/electron-main/windowImpl.ts',
+    'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts',
+    'vs/base/parts/storage/node/storage.ts',
+    'vs/platform/storage/electron-main/storageMainService.ts',
+    'vs/platform/backup/electron-main/backupMainService.ts',
+    'vs/platform/files/node/diskFileSystemProviderServer.ts',
+    'vs/platform/native/electron-main/nativeHostMainService.ts',
+    'vs/platform/menubar/electron-main/menubarMainService.ts',
+    'vs/platform/windows/electron-main/windowsStateHandler.ts',
+    'vs/platform/windows/electron-main/windowsMainService.ts',
+    'vs/platform/workspaces/electron-main/workspacesMainService.ts',
+    'vs/platform/extensionManagement/common/extensionsScannerService.ts',
+    'vs/platform/utilityProcess/electron-main/utilityProcessWorkerMainService.ts',
+    'vs/platform/configuration/common/configurations.ts',
+    'vs/platform/userData/common/fileUserDataProvider.ts',
+    'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.ts',
+    'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.ts',
+    'vs/editor/common/model/textModelTokens.ts',
+    'vs/editor/common/model/tokenizationTextModelPart.ts',
+    'vs/workbench/common/editor/sideBySideEditorInput.ts',
+    'vs/workbench/services/untitled/common/untitledTextEditorModel.ts',
+    'vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts',
+    'vs/workbench/services/workingCopy/common/workingCopyFileService.ts',
+    'vs/editor/common/core/textEdit.ts',
+    'vs/workbench/contrib/debug/common/debugStorage.ts',
+    'vs/workbench/contrib/debug/common/debugModel.ts',
+    'vs/workbench/api/common/extHostCommands.ts',
+    'vs/server/node/remoteExtensionHostAgentServer.ts',
+    'vs/base/parts/ipc/node/ipc.mp.ts',
+    'vs/editor/browser/view/viewLayer.ts',
+    'vs/editor/browser/controller/editContext/textArea/textAreaEditContextInput.ts',
+    'vs/editor/browser/widget/codeEditor/codeEditorWidget.ts',
+    'vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts',
+    'vs/editor/browser/widget/diffEditor/utils.ts',
+    'vs/editor/browser/observableCodeEditor.ts',
+    'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.ts',
+    'vs/editor/browser/widget/diffEditor/diffEditorOptions.ts',
+    'vs/editor/browser/widget/diffEditor/components/diffEditorEditors.ts',
+    'vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.ts',
+    'vs/editor/browser/widget/diffEditor/components/diffEditorSash.ts',
+    'vs/editor/browser/widget/diffEditor/utils/editorGutter.ts',
+    'vs/editor/browser/widget/diffEditor/features/gutterFeature.ts',
+    'vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.ts',
+    'vs/editor/browser/widget/diffEditor/diffEditorWidget.ts',
+    'vs/editor/contrib/colorPicker/browser/colorDetector.ts',
+    'vs/editor/contrib/inlineCompletions/browser/model/ghostText.ts',
+    'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts',
+    'vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdapter.ts',
+    'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts',
+    'vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts',
+    'vs/editor/contrib/zoneWidget/browser/zoneWidget.ts',
+    'vs/editor/contrib/inlayHints/browser/inlayHintsController.ts',
+    'vs/editor/contrib/inlineCompletions/browser/model/changeRecorder.ts',
+    'vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts',
+    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.ts',
+    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts',
+    'vs/platform/contextview/browser/contextViewService.ts',
+    'vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts',
+    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.ts',
+    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts',
+    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.ts',
+    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.ts',
+    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.ts',
+    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.ts',
+    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsSideBySideView.ts',
+    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/originalEditorInlineDiffView.ts',
+    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts',
+    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts',
+    'vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts',
+    'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts',
+    'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts',
+    'vs/editor/contrib/multicursor/browser/multicursor.ts',
+    'vs/editor/contrib/placeholderText/browser/placeholderTextContribution.ts',
+    'vs/editor/contrib/sectionHeaders/browser/sectionHeaders.ts',
+    'vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.ts',
+    'vs/workbench/browser/parts/statusbar/statusbarPart.ts',
+    'vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts',
+    'vs/workbench/contrib/chat/common/chatEntitlementService.ts',
+    'vs/workbench/browser/parts/editor/sideBySideEditor.ts',
+    'vs/workbench/common/editor/diffEditorInput.ts',
+    'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.ts',
+    'vs/workbench/browser/parts/editor/editorPanes.ts',
+    'vs/workbench/browser/parts/editor/editorGroupWatermark.ts',
+    'vs/workbench/contrib/files/browser/views/openEditorsView.ts',
+    'vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts',
+    'vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts',
+    'vs/workbench/contrib/chat/browser/chatInputPart.ts',
+    'vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange.ts',
+    'vs/workbench/contrib/mergeEditor/browser/model/diffComputer.ts',
+    'vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts',
+    'vs/workbench/contrib/mergeEditor/browser/view/editorGutter.ts',
+    'vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.ts',
+    'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts',
+    'vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts',
+    'vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.ts',
+    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts',
+    'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts',
+    'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.ts',
+    'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts',
+    'vs/platform/terminal/common/capabilities/commandDetectionCapability.ts',
+    'vs/workbench/api/browser/mainThreadWorkspace.ts',
+    'vs/workbench/contrib/comments/browser/commentsViewActions.ts',
+    'vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.ts',
+    'vs/workbench/contrib/testing/common/testExclusions.ts',
+    'vs/workbench/contrib/testing/common/testResultStorage.ts',
+    'vs/workbench/browser/parts/titlebar/titlebarPart.ts',
+    'vs/workbench/browser/parts/editor/editorStatus.ts',
+    'vs/workbench/browser/parts/editor/editorPart.ts',
+    'vs/workbench/browser/parts/editor/editorParts.ts',
+    'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts',
+    'vs/workbench/services/textfile/common/textFileEditorModel.ts',
+    'vs/workbench/services/history/browser/historyService.ts',
+    'vs/workbench/services/notification/common/notificationService.ts',
+    'vs/workbench/services/userDataProfile/browser/snippetsResource.ts',
+    'vs/platform/quickinput/browser/quickInputController.ts',
+    'vs/platform/userDataSync/common/abstractSynchronizer.ts',
+    'vs/workbench/services/authentication/browser/authenticationExtensionsService.ts',
+    'vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts',
+    'vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts',
+    'vs/workbench/contrib/preferences/browser/preferencesWidgets.ts',
+    'vs/workbench/contrib/preferences/browser/preferencesRenderers.ts',
+    'vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts',
+    'vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts',
+    'vs/workbench/contrib/debug/browser/callStackEditorContribution.ts',
+    'vs/workbench/contrib/debug/browser/debugHover.ts',
+    'vs/workbench/contrib/debug/browser/debugEditorContribution.ts',
+    'vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts',
+    'vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts',
+    'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.ts',
+    'vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor.ts',
+    'vs/workbench/contrib/speech/browser/speechService.ts',
+    'vs/workbench/contrib/chat/common/promptSyntax/contentProviders/textModelContentsProvider.ts',
+    'vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.ts',
+    'vs/workbench/contrib/chat/common/voiceChatService.ts',
+    'vs/workbench/contrib/search/common/cacheState.ts',
+    'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts',
+    'vs/workbench/contrib/search/browser/anythingQuickAccess.ts',
+    'vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts',
+    'vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts',
+    'vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts',
+    'vs/workbench/contrib/testing/common/testExplorerFilterState.ts',
+    'vs/workbench/contrib/testing/browser/testResultsView/testResultsTree.ts',
+    'vs/workbench/contrib/testing/browser/testingOutputPeek.ts',
+    'vs/workbench/contrib/testing/browser/explorerProjections/index.ts',
+    'vs/workbench/contrib/testing/browser/testingExplorerFilter.ts',
+    'vs/workbench/contrib/testing/browser/testingExplorerView.ts',
+    'vs/workbench/contrib/testing/common/testServiceImpl.ts',
+    'vs/platform/quickinput/browser/commandsQuickAccess.ts',
+    'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts',
+    'vs/workbench/contrib/scm/browser/quickDiffDecorator.ts',
+    'vs/workbench/contrib/scm/browser/activity.ts',
+    'vs/workbench/contrib/scm/browser/scmViewService.ts',
+    'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts',
+    'vs/workbench/contrib/scm/browser/workingSet.ts',
+    'vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts',
+    'vs/workbench/contrib/debug/browser/debugMemory.ts',
+    'vs/workbench/contrib/markers/browser/markersViewActions.ts',
+    'vs/workbench/contrib/mergeEditor/browser/view/viewZones.ts',
+    'vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts',
+    'vs/workbench/contrib/comments/browser/commentsAccessibleView.ts',
+    'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts',
+    'vs/workbench/contrib/output/browser/outputServices.ts',
+    'vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts',
+    'vs/workbench/contrib/remote/browser/remoteIndicator.ts',
+    'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts',
+    'vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts',
+    'vs/workbench/contrib/accessibilitySignals/browser/editorTextPropertySignalsContribution.ts',
+    'vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts',
+    'vs/workbench/browser/parts/dialogs/dialogHandler.ts',
+    'vs/workbench/browser/parts/notifications/notificationsCenter.ts',
+    'vs/workbench/browser/parts/notifications/notificationsToasts.ts',
+    'vs/workbench/services/storage/browser/storageService.ts',
+    'vs/workbench/services/textfile/common/textFileEditorModelManager.ts',
+    'vs/workbench/services/textfile/browser/textFileService.ts',
+    'vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts',
+    'vs/workbench/services/workingCopy/common/workingCopyBackupTracker.ts',
+    'vs/workbench/contrib/welcomeDialog/browser/welcomeWidget.ts',
+    'vs/code/browser/workbench/workbench.ts',
+    'vs/workbench/electron-sandbox/window.ts',
+    'vs/platform/storage/common/storageService.ts',
+    'vs/workbench/services/files/electron-sandbox/diskFileSystemProvider.ts',
+    'vs/code/electron-utility/sharedProcess/contrib/codeCacheCleaner.ts',
+    'vs/code/electron-utility/sharedProcess/contrib/languagePackCachedDataCleaner.ts',
+    'vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts',
+    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordInsertView.ts',
+    'vs/platform/files/node/watcher/parcel/parcelWatcher.ts',
+    'vs/platform/terminal/node/ptyService.ts',
+    'vs/workbench/services/host/electron-sandbox/nativeHostService.ts',
+    'vs/workbench/services/integrity/electron-sandbox/integrityService.ts',
+    'vs/workbench/api/common/extHostLanguageFeatures.ts',
+    'vs/workbench/api/common/extHostFileSystemEventService.ts',
+    'vs/workbench/api/common/extHostSearch.ts',
+    'vs/workbench/api/node/extHostDiskFileSystemProvider.ts',
+    'vs/workbench/test/common/workbenchTestServices.ts',
+    'vs/workbench/test/browser/workbenchTestServices.ts',
+    'vs/workbench/contrib/testing/test/common/testStubs.ts',
+    'vs/workbench/test/browser/parts/editor/editorGroupModel.test.ts',
+    'vs/workbench/test/browser/parts/editor/filteredEditorGroupModel.test.ts',
+]);
+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;
+    }
+    const relativePath = path.relative(path.dirname(TS_CONFIG_PATH), file.fileName);
+    if (ignored.has(relativePath)) {
+        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 !== 1 /* EntryKind.Node */ || entry.node === node) {
+                continue;
+            }
+            if (findClass(entry.node) === classDecl) {
+                yield entry.node;
+            }
+        }
+    }
+}
+// NOTE: The following uses TypeScript internals and are subject to change from version to version.
+function findAllReferences(node) {
+    const sourceFile = node.getSourceFile();
+    const position = node.getStart();
+    const name = ts.getTouchingPropertyName(sourceFile, position);
+    const options = { use: ts.FindAllReferences.FindReferencesUse.References };
+    return ts.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 = {}));
+/** @internal */
+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 || (exports.EntryKind = EntryKind = {}));
+//# sourceMappingURL=propertyInitOrderChecker.js.map
\ No newline at end of file
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
new file mode 100644
index 000000000000..fa7d6c88a71e
--- /dev/null
+++ b/build/lib/propertyInitOrderChecker.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 * 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 ignored = new Set([
+	'vs/base/common/arrays.ts',
+	'vs/platform/workspace/common/workspace.ts',
+	'vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts',
+	'vs/base/parts/ipc/common/ipc.mp.ts',
+	'vs/platform/storage/common/storage.ts',
+	'vs/platform/state/node/stateService.ts',
+	'vs/platform/workspaces/electron-main/workspacesManagementMainService.ts',
+	'vs/platform/windows/electron-main/windowImpl.ts',
+	'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts',
+	'vs/base/parts/storage/node/storage.ts',
+	'vs/platform/storage/electron-main/storageMainService.ts',
+	'vs/platform/backup/electron-main/backupMainService.ts',
+	'vs/platform/files/node/diskFileSystemProviderServer.ts',
+	'vs/platform/native/electron-main/nativeHostMainService.ts',
+	'vs/platform/menubar/electron-main/menubarMainService.ts',
+	'vs/platform/windows/electron-main/windowsStateHandler.ts',
+	'vs/platform/windows/electron-main/windowsMainService.ts',
+	'vs/platform/workspaces/electron-main/workspacesMainService.ts',
+	'vs/platform/extensionManagement/common/extensionsScannerService.ts',
+	'vs/platform/utilityProcess/electron-main/utilityProcessWorkerMainService.ts',
+	'vs/platform/configuration/common/configurations.ts',
+	'vs/platform/userData/common/fileUserDataProvider.ts',
+	'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.ts',
+	'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.ts',
+	'vs/editor/common/model/textModelTokens.ts',
+	'vs/editor/common/model/tokenizationTextModelPart.ts',
+	'vs/workbench/common/editor/sideBySideEditorInput.ts',
+	'vs/workbench/services/untitled/common/untitledTextEditorModel.ts',
+	'vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts',
+	'vs/workbench/services/workingCopy/common/workingCopyFileService.ts',
+	'vs/editor/common/core/textEdit.ts',
+	'vs/workbench/contrib/debug/common/debugStorage.ts',
+	'vs/workbench/contrib/debug/common/debugModel.ts',
+	'vs/workbench/api/common/extHostCommands.ts',
+	'vs/server/node/remoteExtensionHostAgentServer.ts',
+	'vs/base/parts/ipc/node/ipc.mp.ts',
+	'vs/editor/browser/view/viewLayer.ts',
+	'vs/editor/browser/controller/editContext/textArea/textAreaEditContextInput.ts',
+	'vs/editor/browser/widget/codeEditor/codeEditorWidget.ts',
+	'vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts',
+	'vs/editor/browser/widget/diffEditor/utils.ts',
+	'vs/editor/browser/observableCodeEditor.ts',
+	'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.ts',
+	'vs/editor/browser/widget/diffEditor/diffEditorOptions.ts',
+	'vs/editor/browser/widget/diffEditor/components/diffEditorEditors.ts',
+	'vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.ts',
+	'vs/editor/browser/widget/diffEditor/components/diffEditorSash.ts',
+	'vs/editor/browser/widget/diffEditor/utils/editorGutter.ts',
+	'vs/editor/browser/widget/diffEditor/features/gutterFeature.ts',
+	'vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.ts',
+	'vs/editor/browser/widget/diffEditor/diffEditorWidget.ts',
+	'vs/editor/contrib/colorPicker/browser/colorDetector.ts',
+	'vs/editor/contrib/inlineCompletions/browser/model/ghostText.ts',
+	'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts',
+	'vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdapter.ts',
+	'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts',
+	'vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts',
+	'vs/editor/contrib/zoneWidget/browser/zoneWidget.ts',
+	'vs/editor/contrib/inlayHints/browser/inlayHintsController.ts',
+	'vs/editor/contrib/inlineCompletions/browser/model/changeRecorder.ts',
+	'vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts',
+	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.ts',
+	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts',
+	'vs/platform/contextview/browser/contextViewService.ts',
+	'vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts',
+	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.ts',
+	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts',
+	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.ts',
+	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.ts',
+	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.ts',
+	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.ts',
+	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsSideBySideView.ts',
+	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/originalEditorInlineDiffView.ts',
+	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts',
+	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts',
+	'vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts',
+	'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts',
+	'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts',
+	'vs/editor/contrib/multicursor/browser/multicursor.ts',
+	'vs/editor/contrib/placeholderText/browser/placeholderTextContribution.ts',
+	'vs/editor/contrib/sectionHeaders/browser/sectionHeaders.ts',
+	'vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.ts',
+	'vs/workbench/browser/parts/statusbar/statusbarPart.ts',
+	'vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts',
+	'vs/workbench/contrib/chat/common/chatEntitlementService.ts',
+	'vs/workbench/browser/parts/editor/sideBySideEditor.ts',
+	'vs/workbench/common/editor/diffEditorInput.ts',
+	'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.ts',
+	'vs/workbench/browser/parts/editor/editorPanes.ts',
+	'vs/workbench/browser/parts/editor/editorGroupWatermark.ts',
+	'vs/workbench/contrib/files/browser/views/openEditorsView.ts',
+	'vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts',
+	'vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts',
+	'vs/workbench/contrib/chat/browser/chatInputPart.ts',
+	'vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange.ts',
+	'vs/workbench/contrib/mergeEditor/browser/model/diffComputer.ts',
+	'vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts',
+	'vs/workbench/contrib/mergeEditor/browser/view/editorGutter.ts',
+	'vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.ts',
+	'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts',
+	'vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts',
+	'vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.ts',
+	'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts',
+	'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts',
+	'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.ts',
+	'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts',
+	'vs/platform/terminal/common/capabilities/commandDetectionCapability.ts',
+	'vs/workbench/api/browser/mainThreadWorkspace.ts',
+	'vs/workbench/contrib/comments/browser/commentsViewActions.ts',
+	'vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.ts',
+	'vs/workbench/contrib/testing/common/testExclusions.ts',
+	'vs/workbench/contrib/testing/common/testResultStorage.ts',
+	'vs/workbench/browser/parts/titlebar/titlebarPart.ts',
+	'vs/workbench/browser/parts/editor/editorStatus.ts',
+	'vs/workbench/browser/parts/editor/editorPart.ts',
+	'vs/workbench/browser/parts/editor/editorParts.ts',
+	'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts',
+	'vs/workbench/services/textfile/common/textFileEditorModel.ts',
+	'vs/workbench/services/history/browser/historyService.ts',
+	'vs/workbench/services/notification/common/notificationService.ts',
+	'vs/workbench/services/userDataProfile/browser/snippetsResource.ts',
+	'vs/platform/quickinput/browser/quickInputController.ts',
+	'vs/platform/userDataSync/common/abstractSynchronizer.ts',
+	'vs/workbench/services/authentication/browser/authenticationExtensionsService.ts',
+	'vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts',
+	'vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts',
+	'vs/workbench/contrib/preferences/browser/preferencesWidgets.ts',
+	'vs/workbench/contrib/preferences/browser/preferencesRenderers.ts',
+	'vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts',
+	'vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts',
+	'vs/workbench/contrib/debug/browser/callStackEditorContribution.ts',
+	'vs/workbench/contrib/debug/browser/debugHover.ts',
+	'vs/workbench/contrib/debug/browser/debugEditorContribution.ts',
+	'vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts',
+	'vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts',
+	'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.ts',
+	'vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor.ts',
+	'vs/workbench/contrib/speech/browser/speechService.ts',
+	'vs/workbench/contrib/chat/common/promptSyntax/contentProviders/textModelContentsProvider.ts',
+	'vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.ts',
+	'vs/workbench/contrib/chat/common/voiceChatService.ts',
+	'vs/workbench/contrib/search/common/cacheState.ts',
+	'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts',
+	'vs/workbench/contrib/search/browser/anythingQuickAccess.ts',
+	'vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts',
+	'vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts',
+	'vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts',
+	'vs/workbench/contrib/testing/common/testExplorerFilterState.ts',
+	'vs/workbench/contrib/testing/browser/testResultsView/testResultsTree.ts',
+	'vs/workbench/contrib/testing/browser/testingOutputPeek.ts',
+	'vs/workbench/contrib/testing/browser/explorerProjections/index.ts',
+	'vs/workbench/contrib/testing/browser/testingExplorerFilter.ts',
+	'vs/workbench/contrib/testing/browser/testingExplorerView.ts',
+	'vs/workbench/contrib/testing/common/testServiceImpl.ts',
+	'vs/platform/quickinput/browser/commandsQuickAccess.ts',
+	'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts',
+	'vs/workbench/contrib/scm/browser/quickDiffDecorator.ts',
+	'vs/workbench/contrib/scm/browser/activity.ts',
+	'vs/workbench/contrib/scm/browser/scmViewService.ts',
+	'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts',
+	'vs/workbench/contrib/scm/browser/workingSet.ts',
+	'vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts',
+	'vs/workbench/contrib/debug/browser/debugMemory.ts',
+	'vs/workbench/contrib/markers/browser/markersViewActions.ts',
+	'vs/workbench/contrib/mergeEditor/browser/view/viewZones.ts',
+	'vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts',
+	'vs/workbench/contrib/comments/browser/commentsAccessibleView.ts',
+	'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts',
+	'vs/workbench/contrib/output/browser/outputServices.ts',
+	'vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts',
+	'vs/workbench/contrib/remote/browser/remoteIndicator.ts',
+	'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts',
+	'vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts',
+	'vs/workbench/contrib/accessibilitySignals/browser/editorTextPropertySignalsContribution.ts',
+	'vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts',
+	'vs/workbench/browser/parts/dialogs/dialogHandler.ts',
+	'vs/workbench/browser/parts/notifications/notificationsCenter.ts',
+	'vs/workbench/browser/parts/notifications/notificationsToasts.ts',
+	'vs/workbench/services/storage/browser/storageService.ts',
+	'vs/workbench/services/textfile/common/textFileEditorModelManager.ts',
+	'vs/workbench/services/textfile/browser/textFileService.ts',
+	'vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts',
+	'vs/workbench/services/workingCopy/common/workingCopyBackupTracker.ts',
+	'vs/workbench/contrib/welcomeDialog/browser/welcomeWidget.ts',
+	'vs/code/browser/workbench/workbench.ts',
+	'vs/workbench/electron-sandbox/window.ts',
+	'vs/platform/storage/common/storageService.ts',
+	'vs/workbench/services/files/electron-sandbox/diskFileSystemProvider.ts',
+	'vs/code/electron-utility/sharedProcess/contrib/codeCacheCleaner.ts',
+	'vs/code/electron-utility/sharedProcess/contrib/languagePackCachedDataCleaner.ts',
+	'vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts',
+	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordInsertView.ts',
+	'vs/platform/files/node/watcher/parcel/parcelWatcher.ts',
+	'vs/platform/terminal/node/ptyService.ts',
+	'vs/workbench/services/host/electron-sandbox/nativeHostService.ts',
+	'vs/workbench/services/integrity/electron-sandbox/integrityService.ts',
+	'vs/workbench/api/common/extHostLanguageFeatures.ts',
+	'vs/workbench/api/common/extHostFileSystemEventService.ts',
+	'vs/workbench/api/common/extHostSearch.ts',
+	'vs/workbench/api/node/extHostDiskFileSystemProvider.ts',
+	'vs/workbench/test/common/workbenchTestServices.ts',
+	'vs/workbench/test/browser/workbenchTestServices.ts',
+	'vs/workbench/contrib/testing/test/common/testStubs.ts',
+	'vs/workbench/test/browser/parts/editor/editorGroupModel.test.ts',
+	'vs/workbench/test/browser/parts/editor/filteredEditorGroupModel.test.ts',
+]);
+
+
+const cancellationToken: ts.CancellationToken = {
+	isCancellationRequested: () => false,
+	throwIfCancellationRequested: () => { },
+};
+
+const seenFiles = new Set<ts.SourceFile>();
+let errorCount = 0;
+
+
+
+function createProgram(tsconfigPath: string): ts.Program {
+	const tsConfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
+
+	const configHostParser: ts.ParseConfigHost = { 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;
+	}
+
+	const relativePath = path.relative(path.dirname(TS_CONFIG_PATH), file.fileName);
+	if (ignored.has(relativePath)) {
+		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: ts.Node) {
+	if (ts.isParameter(node) && ts.isParameterPropertyDeclaration(node, node.parent)) {
+		checkParameterPropertyDeclaration(node);
+	}
+
+	ts.forEachChild(node, visit);
+}
+
+function checkParameterPropertyDeclaration(param: ts.ParameterPropertyDeclaration) {
+	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++;
+	}
+}
+
+interface InvalidUse {
+	stack: ts.Node[];
+	container: ReferenceContainer;
+}
+
+function* collectReferences(node: ts.Node, stack: ts.Node[], requiresInvocationDepth: number = 0, seen = new Set<ReferenceContainer>()): Generator<InvalidUse> {
+	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: ReferenceContainer): boolean {
+	return ts.isMethodDeclaration(definition) || ts.isFunctionDeclaration(definition) || ts.isFunctionExpression(definition) || ts.isArrowFunction(definition);
+}
+
+function isInvocation(use: ts.Node): boolean {
+	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: ts.Node): string {
+	const sourceFile = node.getSourceFile();
+	return path.resolve(sourceFile.fileName);
+}
+
+function formatLocation(node: ts.Node): string {
+	const sourceFile = node.getSourceFile();
+	const { line, character } = ts.getLineAndCharacterOfPosition(sourceFile, node.pos);
+	return `${formatFileName(sourceFile)}(${line + 1},${character + 1})`;
+}
+
+function formatStack(stack: ts.Node[]): string {
+	return stack.slice().reverse().map((use) => formatUse(use)).join(' -> ');
+}
+
+function formatMember(container: ReferenceContainer): string {
+	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: ts.Node): string {
+	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;
+}
+
+type ReferenceContainer =
+	| ts.PropertyDeclaration
+	| ts.MethodDeclaration
+	| ts.GetAccessorDeclaration
+	| ts.SetAccessorDeclaration
+	| ts.ConstructorDeclaration
+	| ts.ClassStaticBlockDeclaration
+	| ts.ArrowFunction
+	| ts.FunctionExpression
+	| ts.FunctionDeclaration
+	| ts.ParameterDeclaration;
+
+function findContainer(node: ts.Node): ReferenceContainer | undefined {
+	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;
+	}) as ReferenceContainer | undefined;
+}
+
+function findClass(node: ts.Node): ts.ClassLikeDeclaration | undefined {
+	return ts.findAncestor(node, ts.isClassLike);
+}
+
+function* findAllReferencesInClass(node: ts.Node): Generator<ts.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;
+			}
+		}
+	}
+}
+
+// NOTE: The following uses TypeScript internals and are subject to change from version to version.
+
+function findAllReferences(node: ts.Node): readonly SymbolAndEntries[] {
+	const sourceFile = node.getSourceFile();
+	const position = node.getStart();
+	const name: ts.Node = (ts as any).getTouchingPropertyName(sourceFile, position);
+	const options = { use: (ts as any).FindAllReferences.FindReferencesUse.References };
+	return (ts as any).FindAllReferences.Core.getReferencedSymbolsForNode(position, name, program, [sourceFile], cancellationToken, options) ?? [];
+}
+
+interface SymbolAndEntries {
+	readonly definition: Definition | undefined;
+	readonly references: readonly Entry[];
+}
+
+const enum DefinitionKind {
+	Symbol,
+	Label,
+	Keyword,
+	This,
+	String,
+	TripleSlashReference,
+}
+
+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 };
+
+/** @internal */
+export const enum EntryKind {
+	Span,
+	Node,
+	StringLiteral,
+	SearchedLocalFoundProperty,
+	SearchedPropertyFoundLocal,
+}
+type NodeEntryKind = EntryKind.Node | EntryKind.StringLiteral | EntryKind.SearchedLocalFoundProperty | EntryKind.SearchedPropertyFoundLocal;
+type Entry = NodeEntry | SpanEntry;
+interface ContextWithStartAndEndNode {
+	start: ts.Node;
+	end: ts.Node;
+}
+type ContextNode = ts.Node | ContextWithStartAndEndNode;
+interface NodeEntry {
+	readonly kind: NodeEntryKind;
+	readonly node: ts.Node;
+	readonly context?: ContextNode;
+}
+interface SpanEntry {
+	readonly kind: EntryKind.Span;
+	readonly fileName: string;
+	readonly textSpan: ts.TextSpan;
+}
diff --git a/package.json b/package.json
index 920d539df285..c20d4503efd7 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "tsec-compile-check": "node node_modules/tsec/bin/tsec -p src/tsconfig.tsec.json",
     "vscode-dts-compile-check": "tsc -p src/tsconfig.vscode-dts.json && tsc -p src/tsconfig.vscode-proposed-dts.json",
     "valid-layers-check": "node build/lib/layersChecker.js",
+    "property-init-order-check": "node build/lib/propertyInitOrderChecker.js",
     "update-distro": "node build/npm/update-distro.mjs",
     "web": "echo 'npm run web' is replaced by './scripts/code-server' or './scripts/code-web'",
     "compile-cli": "gulp compile-cli",

From df54f43ef658133ff2e5886428b29bee07f693e7 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 10 Mar 2025 10:57:51 +0100
Subject: [PATCH 0716/1815] title - custom window controls setting (#242986)

---
 .../electron-sandbox/workbench/workbench.ts   | 16 +++--
 src/vs/platform/native/common/native.ts       |  3 +
 .../electron-main/nativeHostMainService.ts    | 15 +++++
 .../browser/quickInputController.ts           |  8 +--
 src/vs/platform/window/common/window.ts       | 28 ++++++++
 src/vs/workbench/browser/layout.ts            |  6 +-
 .../parts/titlebar/media/titlebarpart.css     | 51 ++++++++++++++
 .../browser/parts/titlebar/titlebarPart.ts    | 10 ++-
 src/vs/workbench/common/theme.ts              |  4 +-
 .../contrib/debug/browser/debugToolBar.ts     | 10 ++-
 .../browser/relauncher.contribution.ts        |  5 ++
 .../electron-sandbox/desktop.contribution.ts  |  8 +++
 .../parts/titlebar/titlebarPart.ts            | 67 ++++++++++++++++++-
 .../electron-sandbox/workbenchTestServices.ts |  3 +
 14 files changed, 208 insertions(+), 26 deletions(-)

diff --git a/src/vs/code/electron-sandbox/workbench/workbench.ts b/src/vs/code/electron-sandbox/workbench/workbench.ts
index 47c3d28a6fcd..44a6051573c0 100644
--- a/src/vs/code/electron-sandbox/workbench/workbench.ts
+++ b/src/vs/code/electron-sandbox/workbench/workbench.ts
@@ -90,15 +90,19 @@
 			splash.className = baseTheme ?? 'vs-dark';
 
 			if (layoutInfo.windowBorder && colorInfo.windowBorder) {
-				splash.style.position = 'relative';
-				splash.style.height = 'calc(100vh - 2px)';
-				splash.style.width = 'calc(100vw - 2px)';
-				splash.style.border = `1px solid var(--window-border-color)`;
-				splash.style.setProperty('--window-border-color', colorInfo.windowBorder);
+				const borderElement = document.createElement('div');
+				borderElement.style.position = 'absolute';
+				borderElement.style.width = 'calc(100vw - 2px)';
+				borderElement.style.height = 'calc(100vh - 2px)';
+				borderElement.style.zIndex = '1'; // allow border above other elements
+				borderElement.style.border = `1px solid var(--window-border-color)`;
+				borderElement.style.setProperty('--window-border-color', colorInfo.windowBorder);
 
 				if (layoutInfo.windowBorderRadius) {
-					splash.style.borderRadius = layoutInfo.windowBorderRadius;
+					borderElement.style.borderRadius = layoutInfo.windowBorderRadius;
 				}
+
+				splash.appendChild(borderElement);
 			}
 
 			// ensure there is enough space
diff --git a/src/vs/platform/native/common/native.ts b/src/vs/platform/native/common/native.ts
index 049c19d1ec57..4d60c1d9f1bb 100644
--- a/src/vs/platform/native/common/native.ts
+++ b/src/vs/platform/native/common/native.ts
@@ -86,6 +86,9 @@ export interface ICommonNativeHostService {
 	getCursorScreenPoint(): Promise<{ readonly point: IPoint; readonly display: IRectangle }>;
 
 	isMaximized(options?: INativeHostOptions): Promise<boolean>;
+	maximizeWindow(options?: INativeHostOptions): Promise<void>;
+	unmaximizeWindow(options?: INativeHostOptions): Promise<void>;
+	minimizeWindow(options?: INativeHostOptions): Promise<void>;
 	moveWindowTop(options?: INativeHostOptions): Promise<void>;
 	positionWindow(position: IRectangle, options?: INativeHostOptions): Promise<void>;
 
diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts
index c2241a9a4524..c04dabc6785c 100644
--- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
+++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
@@ -260,6 +260,21 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		return window?.win?.isMaximized() ?? false;
 	}
 
+	async maximizeWindow(windowId: number | undefined, options?: INativeHostOptions): Promise<void> {
+		const window = this.windowById(options?.targetWindowId, windowId);
+		window?.win?.maximize();
+	}
+
+	async unmaximizeWindow(windowId: number | undefined, options?: INativeHostOptions): Promise<void> {
+		const window = this.windowById(options?.targetWindowId, windowId);
+		window?.win?.unmaximize();
+	}
+
+	async minimizeWindow(windowId: number | undefined, options?: INativeHostOptions): Promise<void> {
+		const window = this.windowById(options?.targetWindowId, windowId);
+		window?.win?.minimize();
+	}
+
 	async moveWindowTop(windowId: number | undefined, options?: INativeHostOptions): Promise<void> {
 		const window = this.windowById(options?.targetWindowId, windowId);
 		window?.win?.moveTop();
diff --git a/src/vs/platform/quickinput/browser/quickInputController.ts b/src/vs/platform/quickinput/browser/quickInputController.ts
index afed745b58e2..bad5b6d24f19 100644
--- a/src/vs/platform/quickinput/browser/quickInputController.ts
+++ b/src/vs/platform/quickinput/browser/quickInputController.ts
@@ -31,7 +31,7 @@ import { StandardMouseEvent } from '../../../base/browser/mouseEvent.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
 import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { Platform, platform } from '../../../base/common/platform.js';
-import { getTitleBarStyle, TitlebarStyle } from '../../window/common/window.js';
+import { getTitleControlsStyle } from '../../window/common/window.js';
 import { getZoomFactor } from '../../../base/browser/browser.js';
 
 const $ = dom.$;
@@ -923,12 +923,12 @@ class QuickInputDragAndDropController extends Disposable {
 		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		super();
-		const customTitleBar = getTitleBarStyle(this.configurationService) === TitlebarStyle.CUSTOM;
+		const customTitleControls = getTitleControlsStyle(this.configurationService) === 'custom';
 
 		// Do not allow the widget to overflow or underflow window controls.
 		// Use CSS calculations to avoid having to force layout with `.clientWidth`
-		this._controlsOnLeft = customTitleBar && platform === Platform.Mac;
-		this._controlsOnRight = customTitleBar && (platform === Platform.Windows || platform === Platform.Linux);
+		this._controlsOnLeft = customTitleControls && platform === Platform.Mac;
+		this._controlsOnRight = customTitleControls && (platform === Platform.Windows || platform === Platform.Linux);
 		this._registerLayoutListener();
 		this.registerMouseListeners();
 		this.dndViewState.set({ ...initialViewState, done: true }, undefined);
diff --git a/src/vs/platform/window/common/window.ts b/src/vs/platform/window/common/window.ts
index e230d1a09a5c..7756aea58fc0 100644
--- a/src/vs/platform/window/common/window.ts
+++ b/src/vs/platform/window/common/window.ts
@@ -152,6 +152,7 @@ export interface IWindowSettings {
 	readonly restoreFullscreen: boolean;
 	readonly zoomLevel: number;
 	readonly titleBarStyle: TitlebarStyle;
+	readonly titleControlsStyle: TitleControlsStyle;
 	readonly autoDetectHighContrast: boolean;
 	readonly autoDetectColorScheme: boolean;
 	readonly menuBarVisibility: MenuBarVisibility;
@@ -179,6 +180,12 @@ export const enum TitlebarStyle {
 	CUSTOM = 'custom',
 }
 
+export const enum TitleControlsStyle {
+	NATIVE = 'native',
+	CUSTOM = 'custom',
+	HIDDEN = 'hidden'
+}
+
 export const enum CustomTitleBarVisibility {
 	AUTO = 'auto',
 	WINDOWED = 'windowed',
@@ -225,6 +232,20 @@ export function getTitleBarStyle(configurationService: IConfigurationService): T
 	return TitlebarStyle.CUSTOM; // default to custom on all OS
 }
 
+export function getTitleControlsStyle(configurationService: IConfigurationService): TitleControlsStyle {
+	if (isWeb || isMacintosh || getTitleBarStyle(configurationService) === TitlebarStyle.NATIVE) {
+		return TitleControlsStyle.NATIVE; // only supported on Windows/Linux desktop with custom titlebar
+	}
+
+	const configuration = configurationService.getValue<IWindowSettings | undefined>('window');
+	const style = configuration?.titleControlsStyle;
+	if (style === TitleControlsStyle.CUSTOM || style === TitleControlsStyle.HIDDEN) {
+		return style;
+	}
+
+	return TitleControlsStyle.NATIVE; // default to native on all OS
+}
+
 export const DEFAULT_CUSTOM_TITLEBAR_HEIGHT = 35; // includes space for command center
 
 export function useWindowControlsOverlay(configurationService: IConfigurationService): boolean {
@@ -236,6 +257,13 @@ export function useWindowControlsOverlay(configurationService: IConfigurationSer
 		return false; // only supported when title bar is custom
 	}
 
+	if (!isMacintosh) {
+		const setting = getTitleControlsStyle(configurationService);
+		if (setting === TitleControlsStyle.CUSTOM || setting === TitleControlsStyle.HIDDEN) {
+			return false; // explicitly disabled by choice
+		}
+	}
+
 	return true; // default
 }
 
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index fc33edf32941..501d95a87132 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -599,10 +599,9 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		for (const container of this.containers) {
 			const isMainContainer = container === this.mainContainer;
 			const isActiveContainer = this.activeContainer === container;
-			const containerWindowId = getWindowId(getWindow(container));
 
 			let windowBorder = false;
-			if (!this.state.runtime.mainWindowFullscreen && !this.state.runtime.maximized.has(containerWindowId) && (activeBorder || inactiveBorder)) {
+			if (!this.state.runtime.mainWindowFullscreen && (activeBorder || inactiveBorder)) {
 				windowBorder = true;
 
 				// If the inactive color is missing, fallback to the active one
@@ -2079,11 +2078,10 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 	}
 
 	getMainWindowBorderRadius(): string | undefined {
-		return this.state.runtime.mainWindowBorder && isMacintosh ? '5px' : undefined;
+		return this.state.runtime.mainWindowBorder && isMacintosh ? '10px' : undefined;
 	}
 
 	isPanelMaximized(): boolean {
-
 		// the workbench grid currently prevents us from supporting panel maximization with non-center panel alignment
 		return (this.getPanelAlignment() === 'center' || !isHorizontal(this.getPanelPosition())) && !this.isVisible(Parts.EDITOR_PART, mainWindow);
 	}
diff --git a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
index 2f16f7a10370..e1a7a7e2f70f 100644
--- a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
+++ b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
@@ -231,6 +231,21 @@
 	zoom: var(--zoom-factor); /* helps to position the menu properly when counter zooming */
 }
 
+/* Resizer */
+.monaco-workbench.windows .part.titlebar > .titlebar-container > .resizer,
+.monaco-workbench.linux .part.titlebar > .titlebar-container > .resizer {
+	-webkit-app-region: no-drag;
+	position: absolute;
+	top: 0;
+	width: 100%;
+	height: 4px;
+}
+
+.monaco-workbench.windows.fullscreen .part.titlebar > .titlebar-container > .resizer,
+.monaco-workbench.linux.fullscreen .part.titlebar > .titlebar-container > .resizer {
+	display: none;
+}
+
 /* App Icon */
 .monaco-workbench .part.titlebar > .titlebar-container > .titlebar-left > .window-appicon {
 	width: 35px;
@@ -313,6 +328,42 @@
 	width: 70px;
 }
 
+/* Window Control Icons */
+.monaco-workbench .part.titlebar .window-controls-container > .window-icon {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 100%;
+	width: 46px;
+	font-size: 16px;
+	color: var(--vscode-titleBar-activeForeground);
+}
+
+.monaco-workbench .part.titlebar.inactive .window-controls-container > .window-icon {
+	color: var(--vscode-titleBar-inactiveForeground);
+}
+
+.monaco-workbench .part.titlebar .window-controls-container > .window-icon::before {
+	height: 16px;
+	line-height: 16px;
+}
+
+.monaco-workbench .part.titlebar .window-controls-container > .window-icon:hover {
+	background-color: rgba(255, 255, 255, 0.1);
+}
+
+.monaco-workbench .part.titlebar.light .window-controls-container > .window-icon:hover {
+	background-color: rgba(0, 0, 0, 0.1);
+}
+
+.monaco-workbench .part.titlebar .window-controls-container > .window-icon.window-close:hover {
+	background-color: rgba(232, 17, 35, 0.9);
+}
+
+.monaco-workbench .part.titlebar .window-controls-container .window-icon.window-close:hover {
+	color: white;
+}
+
 /* Action Tool Bar Controls */
 .monaco-workbench .part.titlebar > .titlebar-container > .titlebar-right > .action-toolbar-container {
 	display: none;
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 14cdd2393761..112527794576 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -8,7 +8,7 @@ import { localize, localize2 } from '../../../../nls.js';
 import { MultiWindowParts, Part } from '../../part.js';
 import { ITitleService } from '../../../services/title/browser/titleService.js';
 import { getWCOTitlebarAreaRect, getZoomFactor, isWCOEnabled } from '../../../../base/browser/browser.js';
-import { MenuBarVisibility, getTitleBarStyle, getMenuBarVisibility, hasCustomTitlebar, hasNativeTitlebar, DEFAULT_CUSTOM_TITLEBAR_HEIGHT } from '../../../../platform/window/common/window.js';
+import { MenuBarVisibility, getTitleBarStyle, getMenuBarVisibility, hasCustomTitlebar, hasNativeTitlebar, DEFAULT_CUSTOM_TITLEBAR_HEIGHT, getTitleControlsStyle, TitleControlsStyle } from '../../../../platform/window/common/window.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { IConfigurationService, IConfigurationChangeEvent } from '../../../../platform/configuration/common/configuration.js';
@@ -247,6 +247,8 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 	//#endregion
 
 	protected rootContainer!: HTMLElement;
+	protected windowControlsContainer: HTMLElement | undefined;
+
 	protected dragRegion: HTMLElement | undefined;
 	private title!: HTMLElement;
 
@@ -482,8 +484,10 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 				// for something, except for web where a custom menu being supported). not putting the
 				// container helps with allowing to move the window when clicking very close to the
 				// window control buttons.
+			} else if (getTitleControlsStyle(this.configurationService) === TitleControlsStyle.HIDDEN) {
+				// Linux/Windows: controls are explicitly disabled
 			} else {
-				const windowControlsContainer = append(primaryWindowControlsLocation === 'left' ? this.leftContent : this.rightContent, $('div.window-controls-container'));
+				this.windowControlsContainer = append(primaryWindowControlsLocation === 'left' ? this.leftContent : this.rightContent, $('div.window-controls-container'));
 				if (isWeb) {
 					// Web: its possible to have control overlays on both sides, for example on macOS
 					// with window controls on the left and PWA controls on the right.
@@ -491,7 +495,7 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 				}
 
 				if (isWCOEnabled()) {
-					windowControlsContainer.classList.add('wco-enabled');
+					this.windowControlsContainer.classList.add('wco-enabled');
 				}
 			}
 		}
diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
index bba032c63875..69756aafa366 100644
--- a/src/vs/workbench/common/theme.ts
+++ b/src/vs/workbench/common/theme.ts
@@ -801,11 +801,11 @@ export const WINDOW_ACTIVE_BORDER = registerColor('window.activeBorder', {
 	light: null,
 	hcDark: contrastBorder,
 	hcLight: contrastBorder
-}, localize('windowActiveBorder', "The color used for the border of the window when it is active. Only supported in the macOS and Linux desktop client when using the custom title bar."));
+}, localize('windowActiveBorder', "The color used for the border of the window when it is active on macOS or Linux. Requires custom title bar style and custom or hidden title controls on Linux."));
 
 export const WINDOW_INACTIVE_BORDER = registerColor('window.inactiveBorder', {
 	dark: null,
 	light: null,
 	hcDark: contrastBorder,
 	hcLight: contrastBorder
-}, localize('windowInactiveBorder', "The color used for the border of the window when it is inactive. Only supported in the macOS and Linux desktop client when using the custom title bar."));
+}, localize('windowInactiveBorder', "The color used for the border of the window when it is inactive on macOS or Linux. Requires custom title bar style and custom or hidden title controls on Linux."));
diff --git a/src/vs/workbench/contrib/debug/browser/debugToolBar.ts b/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
index 41f28eabfc27..a374adcb598c 100644
--- a/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
@@ -32,7 +32,7 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../platfo
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { widgetBorder, widgetShadow } from '../../../../platform/theme/common/colorRegistry.js';
 import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
-import { getTitleBarStyle, TitlebarStyle } from '../../../../platform/window/common/window.js';
+import { getTitleControlsStyle, TitleControlsStyle } from '../../../../platform/window/common/window.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { EditorTabsMode, IWorkbenchLayoutService, LayoutSettings, Parts } from '../../../services/layout/browser/layoutService.js';
 import { CONTEXT_DEBUG_STATE, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_IN_DEBUG_MODE, CONTEXT_MULTI_SESSION_DEBUG, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, IDebugConfiguration, IDebugService, State, VIEWLET_ID } from '../common/debug.js';
@@ -80,12 +80,12 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
 		this.$el = dom.$('div.debug-toolbar');
 
 		// Note: changes to this setting require a restart, so no need to listen to it.
-		const customTitleBar = getTitleBarStyle(this.configurationService) === TitlebarStyle.CUSTOM;
+		const customTitleControls = getTitleControlsStyle(this.configurationService) === TitleControlsStyle.CUSTOM;
 
 		// Do not allow the widget to overflow or underflow window controls.
 		// Use CSS calculations to avoid having to force layout with `.clientWidth`
-		const controlsOnLeft = customTitleBar && platform === Platform.Mac;
-		const controlsOnRight = customTitleBar && (platform === Platform.Windows || platform === Platform.Linux);
+		const controlsOnLeft = customTitleControls && platform === Platform.Mac;
+		const controlsOnRight = customTitleControls && (platform === Platform.Windows || platform === Platform.Linux);
 		this.$el.style.transform = `translate(
 			min(
 				max(${controlsOnLeft ? '60px' : '0px'}, calc(-50% + (100vw * var(--x-position)))),
@@ -94,8 +94,6 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
 			var(--y-position)
 		)`;
 
-
-
 		this.dragArea = dom.append(this.$el, dom.$('div.drag-area' + ThemeIcon.asCSSSelector(icons.debugGripper)));
 
 		const actionBarContainer = dom.append(this.$el, dom.$('div.action-bar-container'));
diff --git a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
index 9f53c894c91b..0ef403d13606 100644
--- a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
+++ b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
@@ -41,6 +41,7 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 		'window.nativeTabs',
 		'window.nativeFullScreen',
 		'window.clickThroughInactive',
+		'window.titleControlsStyle',
 		'update.mode',
 		'editor.accessibilitySupport',
 		'security.workspace.trust.enabled',
@@ -54,6 +55,7 @@ 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 titleControlsStyle = new ChangeObserver('string');
 	private readonly updateMode = new ChangeObserver('string');
 	private accessibilitySupport: 'on' | 'off' | 'auto' | undefined;
 	private readonly workspaceTrustEnabled = new ChangeObserver('boolean');
@@ -117,6 +119,9 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 			// macOS: Click through (accept first mouse)
 			processChanged(isMacintosh && this.clickThroughInactive.handleChange(config.window?.clickThroughInactive));
 
+			// Windows/Linux: Title controls style
+			processChanged(!isMacintosh && this.titleControlsStyle.handleChange(config.window?.titleControlsStyle));
+
 			// Update mode
 			processChanged(this.updateMode.handleChange(config.update?.mode));
 
diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
index c420ccfefc36..5e45beb11ea3 100644
--- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts
+++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
@@ -236,6 +236,14 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s
 				'scope': ConfigurationScope.APPLICATION,
 				'description': localize('titleBarStyle', "Adjust the appearance of the window title bar to be native by the OS or custom. On Linux and Windows, this setting also affects the application and context menu appearances. Changes require a full restart to apply."),
 			},
+			'window.titleControlsStyle': {
+				'type': 'string',
+				'enum': ['native', 'custom', 'hidden'],
+				'default': 'native',
+				'included': !isMacintosh,
+				'scope': ConfigurationScope.APPLICATION,
+				'description': localize('titleControlsStyle', "Adjust the appearance of the window controls to be native by the OS, custom drawn or hidden. Changes require a full restart to apply."),
+			},
 			'window.customTitleBarVisibility': {
 				'type': 'string',
 				'enum': ['auto', 'windowed', 'never'],
diff --git a/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts b/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
index 9e7022319dcd..45fbdbf950da 100644
--- a/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
@@ -3,8 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Event } from '../../../../base/common/event.js';
 import { getZoomFactor } from '../../../../base/browser/browser.js';
-import { addDisposableListener, EventType, getWindow, getWindowId, hide, show } from '../../../../base/browser/dom.js';
+import { $, addDisposableListener, append, EventType, getWindow, getWindowId, hide, show } from '../../../../base/browser/dom.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IConfigurationService, IConfigurationChangeEvent } from '../../../../platform/configuration/common/configuration.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
@@ -19,6 +20,8 @@ import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser
 import { INativeHostService } from '../../../../platform/native/common/native.js';
 import { hasNativeTitlebar, useWindowControlsOverlay, DEFAULT_CUSTOM_TITLEBAR_HEIGHT } from '../../../../platform/window/common/window.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 import { NativeMenubarControl } from './menubarControl.js';
 import { IEditorGroupsContainer, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
@@ -49,6 +52,9 @@ export class NativeTitlebarPart extends BrowserTitlebarPart {
 
 	//#endregion
 
+	private maxRestoreControl: HTMLElement | undefined;
+	private resizer: HTMLElement | undefined;
+
 	private cachedWindowControlStyles: { bgColor: string; fgColor: string } | undefined;
 	private cachedWindowControlHeight: number | undefined;
 
@@ -151,6 +157,45 @@ export class NativeTitlebarPart extends BrowserTitlebarPart {
 			})));
 		}
 
+		// Custom Window Controls (Native Windows/Linux)
+		if (
+			!hasNativeTitlebar(this.configurationService) &&		// not for native title bars
+			!useWindowControlsOverlay(this.configurationService) &&	// not when controls are natively drawn
+			this.windowControlsContainer
+		) {
+
+			// Minimize
+			const minimizeIcon = append(this.windowControlsContainer, $('div.window-icon.window-minimize' + ThemeIcon.asCSSSelector(Codicon.chromeMinimize)));
+			this._register(addDisposableListener(minimizeIcon, EventType.CLICK, () => {
+				this.nativeHostService.minimizeWindow({ targetWindowId });
+			}));
+
+			// Restore
+			this.maxRestoreControl = append(this.windowControlsContainer, $('div.window-icon.window-max-restore'));
+			this._register(addDisposableListener(this.maxRestoreControl, EventType.CLICK, async () => {
+				const maximized = await this.nativeHostService.isMaximized({ targetWindowId });
+				if (maximized) {
+					return this.nativeHostService.unmaximizeWindow({ targetWindowId });
+				}
+
+				return this.nativeHostService.maximizeWindow({ targetWindowId });
+			}));
+
+			// Close
+			const closeIcon = append(this.windowControlsContainer, $('div.window-icon.window-close' + ThemeIcon.asCSSSelector(Codicon.chromeClose)));
+			this._register(addDisposableListener(closeIcon, EventType.CLICK, () => {
+				this.nativeHostService.closeWindow({ targetWindowId });
+			}));
+
+			// Resizer
+			this.resizer = append(this.rootContainer, $('div.resizer'));
+			this._register(Event.runAndSubscribe(this.layoutService.onDidChangeWindowMaximized, ({ windowId, maximized }) => {
+				if (windowId === targetWindowId) {
+					this.onDidChangeWindowMaximized(maximized);
+				}
+			}, { windowId: targetWindowId, maximized: this.layoutService.isWindowMaximized(targetWindow) }));
+		}
+
 		// Window System Context Menu
 		// See https://github.com/electron/electron/issues/24893
 		if (isWindows && !hasNativeTitlebar(this.configurationService)) {
@@ -167,6 +212,26 @@ export class NativeTitlebarPart extends BrowserTitlebarPart {
 		return result;
 	}
 
+	private onDidChangeWindowMaximized(maximized: boolean): void {
+		if (this.maxRestoreControl) {
+			if (maximized) {
+				this.maxRestoreControl.classList.remove(...ThemeIcon.asClassNameArray(Codicon.chromeMaximize));
+				this.maxRestoreControl.classList.add(...ThemeIcon.asClassNameArray(Codicon.chromeRestore));
+			} else {
+				this.maxRestoreControl.classList.remove(...ThemeIcon.asClassNameArray(Codicon.chromeRestore));
+				this.maxRestoreControl.classList.add(...ThemeIcon.asClassNameArray(Codicon.chromeMaximize));
+			}
+		}
+
+		if (this.resizer) {
+			if (maximized) {
+				hide(this.resizer);
+			} else {
+				show(this.resizer);
+			}
+		}
+	}
+
 	override updateStyles(): void {
 		super.updateStyles();
 
diff --git a/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts b/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts
index 431160fe73d7..9bc958141ff7 100644
--- a/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts
+++ b/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts
@@ -96,6 +96,9 @@ export class TestNativeHostService implements INativeHostService {
 	async toggleFullScreen(): Promise<void> { }
 	async isMaximized(): Promise<boolean> { return true; }
 	async isFullScreen(): Promise<boolean> { return true; }
+	async maximizeWindow(): Promise<void> { }
+	async unmaximizeWindow(): Promise<void> { }
+	async minimizeWindow(): Promise<void> { }
 	async moveWindowTop(options?: INativeHostOptions): Promise<void> { }
 	getCursorScreenPoint(): Promise<{ readonly point: IPoint; readonly display: IRectangle }> { throw new Error('Method not implemented.'); }
 	async positionWindow(position: IRectangle, options?: INativeHostOptions): Promise<void> { }

From e4abf531296414dcb41bc8fbf503835e0aa5bb0b Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 10 Mar 2025 11:21:09 +0100
Subject: [PATCH 0717/1815] refactor: use enum for title controls style in
 quick input controller (#243047)

---
 src/vs/platform/quickinput/browser/quickInputController.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/quickinput/browser/quickInputController.ts b/src/vs/platform/quickinput/browser/quickInputController.ts
index bad5b6d24f19..a4c55b213e67 100644
--- a/src/vs/platform/quickinput/browser/quickInputController.ts
+++ b/src/vs/platform/quickinput/browser/quickInputController.ts
@@ -31,7 +31,7 @@ import { StandardMouseEvent } from '../../../base/browser/mouseEvent.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
 import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { Platform, platform } from '../../../base/common/platform.js';
-import { getTitleControlsStyle } from '../../window/common/window.js';
+import { getTitleControlsStyle, TitleControlsStyle } from '../../window/common/window.js';
 import { getZoomFactor } from '../../../base/browser/browser.js';
 
 const $ = dom.$;
@@ -923,7 +923,7 @@ class QuickInputDragAndDropController extends Disposable {
 		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		super();
-		const customTitleControls = getTitleControlsStyle(this.configurationService) === 'custom';
+		const customTitleControls = getTitleControlsStyle(this.configurationService) === TitleControlsStyle.CUSTOM;
 
 		// Do not allow the widget to overflow or underflow window controls.
 		// Use CSS calculations to avoid having to force layout with `.clientWidth`

From 2cde379d3ac445f2854711403f1ba764d0ca637f Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 10 Mar 2025 11:37:20 +0100
Subject: [PATCH 0718/1815] fix property init order for
 `chatEditingCodeEditorIntegration` (#243051)

* add explaining comment

* fix property init order for `chatEditingCodeEditorIntegration`

https://github.com/microsoft/vscode/issues/243049
---
 build/lib/propertyInitOrderChecker.js               | 12 +++++++++++-
 build/lib/propertyInitOrderChecker.ts               | 13 ++++++++++++-
 .../chatEditing/chatEditingCodeEditorIntegration.ts |  9 ++++++---
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index 1f796a8fc45c..25c16359aa30 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -42,6 +42,17 @@ 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
+//
+// #############################################################################################
+//
 const ignored = new Set([
     'vs/base/common/arrays.ts',
     'vs/platform/workspace/common/workspace.ts',
@@ -187,7 +198,6 @@ const ignored = new Set([
     'vs/workbench/contrib/search/common/cacheState.ts',
     'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts',
     'vs/workbench/contrib/search/browser/anythingQuickAccess.ts',
-    'vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts',
     'vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts',
     'vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts',
     'vs/workbench/contrib/testing/common/testExplorerFilterState.ts',
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index fa7d6c88a71e..0a925af84f66 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -10,6 +10,18 @@ import * as fs from '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
+//
+// #############################################################################################
+//
+
 const ignored = new Set([
 	'vs/base/common/arrays.ts',
 	'vs/platform/workspace/common/workspace.ts',
@@ -155,7 +167,6 @@ const ignored = new Set([
 	'vs/workbench/contrib/search/common/cacheState.ts',
 	'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts',
 	'vs/workbench/contrib/search/browser/anythingQuickAccess.ts',
-	'vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts',
 	'vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts',
 	'vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts',
 	'vs/workbench/contrib/testing/common/testExplorerFilterState.ts',
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
index 7814f58ead9a..a79cfd9127d3 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
@@ -38,6 +38,7 @@ import { overviewRulerModifiedForeground, minimapGutterModifiedBackground, overv
 import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
 import { IChatEditingService, IModifiedFileEntry, IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { isTextDiffEditorForEntry } from './chatEditing.js';
+import { IEditorDecorationsCollection } from '../../../../../editor/common/editorCommon.js';
 
 export interface IDocumentDiff2 extends IDocumentDiff {
 
@@ -56,9 +57,8 @@ export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEdito
 	readonly currentIndex: IObservable<number> = this._currentIndex;
 	private readonly _store = new DisposableStore();
 
-	private readonly _diffLineDecorations = this._editor.createDecorationsCollection(); // tracks the line range w/o visuals (used for navigate)
-
-	private readonly _diffVisualDecorations = this._editor.createDecorationsCollection(); // tracks the real diff with character level inserts
+	private readonly _diffLineDecorations: IEditorDecorationsCollection;
+	private readonly _diffVisualDecorations: IEditorDecorationsCollection;
 	private readonly _diffHunksRenderStore = this._store.add(new DisposableStore());
 	private readonly _diffHunkWidgets: DiffHunkWidget[] = [];
 	private _viewZones: string[] = [];
@@ -78,6 +78,9 @@ export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEdito
 		this._diffLineDecorations = _editor.createDecorationsCollection();
 		const codeEditorObs = observableCodeEditor(_editor);
 
+		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
+
 		const enabledObs = derived(r => {
 			if (!isEqual(codeEditorObs.model.read(r)?.uri, documentDiffInfo.read(r).modifiedModel.uri)) {
 				return false;

From 8d69af582f1f4ff9c77857ef858162152fa8999a Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 10 Mar 2025 11:27:12 +0000
Subject: [PATCH 0719/1815] =?UTF-8?q?SCM=20-=20=F0=9F=92=84=20fix=20proper?=
 =?UTF-8?q?ty=20init=20order=20in=20`activity.ts`=20(#243056)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/lib/propertyInitOrderChecker.js         |   1 -
 build/lib/propertyInitOrderChecker.ts         |   1 -
 .../workbench/contrib/scm/browser/activity.ts | 105 ++++++++++--------
 3 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index 25c16359aa30..a916776b128b 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -210,7 +210,6 @@ const ignored = new Set([
     'vs/platform/quickinput/browser/commandsQuickAccess.ts',
     'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts',
     'vs/workbench/contrib/scm/browser/quickDiffDecorator.ts',
-    'vs/workbench/contrib/scm/browser/activity.ts',
     'vs/workbench/contrib/scm/browser/scmViewService.ts',
     'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts',
     'vs/workbench/contrib/scm/browser/workingSet.ts',
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index 0a925af84f66..9bffb9d9e6fe 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -179,7 +179,6 @@ const ignored = new Set([
 	'vs/platform/quickinput/browser/commandsQuickAccess.ts',
 	'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts',
 	'vs/workbench/contrib/scm/browser/quickDiffDecorator.ts',
-	'vs/workbench/contrib/scm/browser/activity.ts',
 	'vs/workbench/contrib/scm/browser/scmViewService.ts',
 	'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts',
 	'vs/workbench/contrib/scm/browser/workingSet.ts',
diff --git a/src/vs/workbench/contrib/scm/browser/activity.ts b/src/vs/workbench/contrib/scm/browser/activity.ts
index adda8fa26c40..c8a7faebab60 100644
--- a/src/vs/workbench/contrib/scm/browser/activity.ts
+++ b/src/vs/workbench/contrib/scm/browser/activity.ts
@@ -7,7 +7,7 @@ import { localize } from '../../../../nls.js';
 import { basename } from '../../../../base/common/resources.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
-import { VIEW_PANE_ID, ISCMService, ISCMRepository, ISCMViewService } from '../common/scm.js';
+import { VIEW_PANE_ID, ISCMService, ISCMRepository, ISCMViewService, ISCMProvider } from '../common/scm.js';
 import { IActivityService, NumberBadge } from '../../../services/activity/common/activity.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
@@ -30,49 +30,11 @@ const ActiveRepositoryContextKeys = {
 };
 
 export class SCMActiveRepositoryController extends Disposable implements IWorkbenchContribution {
-	private readonly _countBadgeConfig = observableConfigValue<'all' | 'focused' | 'off'>('scm.countBadge', 'all', this.configurationService);
-
-	private readonly _repositories = observableFromEvent(this,
-		Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository),
-		() => this.scmService.repositories);
-
-	private readonly _activeRepositoryHistoryItemRefName = derived(reader => {
-		const repository = this.scmViewService.activeRepository.read(reader);
-		const historyProvider = repository?.provider.historyProvider.read(reader);
-		const historyItemRef = historyProvider?.historyItemRef.read(reader);
-
-		return historyItemRef?.name;
-	});
-
-	private readonly _countBadgeRepositories = derived(this, reader => {
-		switch (this._countBadgeConfig.read(reader)) {
-			case 'all': {
-				const repositories = this._repositories.read(reader);
-				return [...Iterable.map(repositories, r => ({ provider: r.provider, resourceCount: this._getRepositoryResourceCount(r) }))];
-			}
-			case 'focused': {
-				const repository = this.scmViewService.activeRepository.read(reader);
-				return repository ? [{ provider: repository.provider, resourceCount: this._getRepositoryResourceCount(repository) }] : [];
-			}
-			case 'off':
-				return [];
-			default:
-				throw new Error('Invalid countBadge setting');
-		}
-	});
-
-	private readonly _countBadge = derived(this, reader => {
-		let total = 0;
-
-		for (const repository of this._countBadgeRepositories.read(reader)) {
-			const count = repository.provider.count?.read(reader);
-			const resourceCount = repository.resourceCount.read(reader);
-
-			total = total + (count ?? resourceCount);
-		}
-
-		return total;
-	});
+	private readonly _repositories: IObservable<Iterable<ISCMRepository>>;
+	private readonly _activeRepositoryHistoryItemRefName: IObservable<string | undefined>;
+	private readonly _countBadgeConfig: IObservable<'all' | 'focused' | 'off'>;
+	private readonly _countBadgeRepositories: IObservable<readonly { provider: ISCMProvider; resourceCount: IObservable<number> }[]>;
+	private readonly _countBadge: IObservable<number>;
 
 	private _activeRepositoryNameContextKey: IContextKey<string>;
 	private _activeRepositoryBranchNameContextKey: IContextKey<string>;
@@ -96,8 +58,53 @@ export class SCMActiveRepositoryController extends Disposable implements IWorkbe
 			{ name: 'activeRepositoryBranchName', contextKey: ActiveRepositoryContextKeys.ActiveRepositoryBranchName.key, }
 		]);
 
+		this._countBadgeConfig = observableConfigValue<'all' | 'focused' | 'off'>('scm.countBadge', 'all', this.configurationService);
+
+		this._repositories = observableFromEvent(this,
+			Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository),
+			() => this.scmService.repositories);
+
+		this._activeRepositoryHistoryItemRefName = derived(reader => {
+			const repository = this.scmViewService.activeRepository.read(reader);
+			const historyProvider = repository?.provider.historyProvider.read(reader);
+			const historyItemRef = historyProvider?.historyItemRef.read(reader);
+
+			return historyItemRef?.name;
+		});
+
+		this._countBadgeRepositories = derived(this, reader => {
+			switch (this._countBadgeConfig.read(reader)) {
+				case 'all': {
+					const repositories = this._repositories.read(reader);
+					return [...Iterable.map(repositories, r => ({ provider: r.provider, resourceCount: this._getRepositoryResourceCount(r) }))];
+				}
+				case 'focused': {
+					const repository = this.scmViewService.activeRepository.read(reader);
+					return repository ? [{ provider: repository.provider, resourceCount: this._getRepositoryResourceCount(repository) }] : [];
+				}
+				case 'off':
+					return [];
+				default:
+					throw new Error('Invalid countBadge setting');
+			}
+		});
+
+		this._countBadge = derived(this, reader => {
+			let total = 0;
+
+			for (const repository of this._countBadgeRepositories.read(reader)) {
+				const count = repository.provider.count?.read(reader);
+				const resourceCount = repository.resourceCount.read(reader);
+
+				total = total + (count ?? resourceCount);
+			}
+
+			return total;
+		});
+
 		this._register(autorunWithStore((reader, store) => {
-			this._updateActivityCountBadge(this._countBadge.read(reader), store);
+			const countBadge = this._countBadge.read(reader);
+			this._updateActivityCountBadge(countBadge, store);
 		}));
 
 		this._register(autorunWithStore((reader, store) => {
@@ -177,9 +184,7 @@ export class SCMActiveRepositoryController extends Disposable implements IWorkbe
 }
 
 export class SCMActiveResourceContextKeyController extends Disposable implements IWorkbenchContribution {
-	private readonly _repositories = observableFromEvent(this,
-		Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository),
-		() => this.scmService.repositories);
+	private readonly _repositories: IObservable<Iterable<ISCMRepository>>;
 
 	private readonly _onDidRepositoryChange = new Emitter<void>();
 
@@ -193,6 +198,10 @@ export class SCMActiveResourceContextKeyController extends Disposable implements
 		const activeResourceHasChangesContextKey = new RawContextKey<boolean>('scmActiveResourceHasChanges', false, localize('scmActiveResourceHasChanges', "Whether the active resource has changes"));
 		const activeResourceRepositoryContextKey = new RawContextKey<string | undefined>('scmActiveResourceRepository', undefined, localize('scmActiveResourceRepository', "The active resource's repository"));
 
+		this._repositories = observableFromEvent(this,
+			Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository),
+			() => this.scmService.repositories);
+
 		this._store.add(autorunWithStore((reader, store) => {
 			for (const repository of this._repositories.read(reader)) {
 				store.add(Event.runAndSubscribe(repository.provider.onDidChangeResources, () => {

From 06e9d7ece1b14eeacbd01a963f83b72e0ec9a04b Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 10 Mar 2025 11:46:39 +0000
Subject: [PATCH 0720/1815] =?UTF-8?q?SCM=20-=20=F0=9F=92=84=20fix=20proper?=
 =?UTF-8?q?ty=20init=20order=20in=20`quickDiffDecorator.ts`=20(#243058)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/lib/propertyInitOrderChecker.js                    | 1 -
 build/lib/propertyInitOrderChecker.ts                    | 1 -
 .../workbench/contrib/scm/browser/quickDiffDecorator.ts  | 9 ++++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index a916776b128b..39c5da6cc847 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -209,7 +209,6 @@ const ignored = new Set([
     'vs/workbench/contrib/testing/common/testServiceImpl.ts',
     'vs/platform/quickinput/browser/commandsQuickAccess.ts',
     'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts',
-    'vs/workbench/contrib/scm/browser/quickDiffDecorator.ts',
     'vs/workbench/contrib/scm/browser/scmViewService.ts',
     'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts',
     'vs/workbench/contrib/scm/browser/workingSet.ts',
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index 9bffb9d9e6fe..e7cb6171f925 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -178,7 +178,6 @@ const ignored = new Set([
 	'vs/workbench/contrib/testing/common/testServiceImpl.ts',
 	'vs/platform/quickinput/browser/commandsQuickAccess.ts',
 	'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts',
-	'vs/workbench/contrib/scm/browser/quickDiffDecorator.ts',
 	'vs/workbench/contrib/scm/browser/scmViewService.ts',
 	'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts',
 	'vs/workbench/contrib/scm/browser/workingSet.ts',
diff --git a/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.ts b/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.ts
index 01c9eb2173c2..ac52c163d589 100644
--- a/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.ts
+++ b/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.ts
@@ -22,7 +22,8 @@ import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { ResourceMap } from '../../../../base/common/map.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-import { autorun, autorunWithStore, observableFromEvent } from '../../../../base/common/observable.js';
+import { autorun, autorunWithStore, IObservable, observableFromEvent } from '../../../../base/common/observable.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
 
 export const quickDiffDecorationCount = new RawContextKey<number>('quickDiffDecorationCount', 0);
 
@@ -188,8 +189,7 @@ export class QuickDiffWorkbenchController extends Disposable implements IWorkben
 	private enabled = false;
 	private readonly quickDiffDecorationCount: IContextKey<number>;
 
-	private readonly activeEditor = observableFromEvent(this,
-		this.editorService.onDidActiveEditorChange, () => this.editorService.activeEditor);
+	private readonly activeEditor: IObservable<EditorInput | undefined>;
 
 	// Resource URI -> Code Editor Id -> Decoration (Disposable)
 	private readonly decorators = new ResourceMap<DisposableMap<string>>();
@@ -209,6 +209,9 @@ export class QuickDiffWorkbenchController extends Disposable implements IWorkben
 
 		this.quickDiffDecorationCount = quickDiffDecorationCount.bindTo(contextKeyService);
 
+		this.activeEditor = observableFromEvent(this,
+			this.editorService.onDidActiveEditorChange, () => this.editorService.activeEditor);
+
 		const onDidChangeConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorations'));
 		this._register(onDidChangeConfiguration(this.onDidChangeConfiguration, this));
 		this.onDidChangeConfiguration();

From 838ece1cefbca2df611e64082689ba0eb09dfac3 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 10 Mar 2025 12:48:46 +0100
Subject: [PATCH 0721/1815] Inline Edits Code Shifting Horizontal Support
 (#243059)

Inline Edits Code Shifting horizintal support
---
 .../editor/browser/config/migrateOptions.ts   |  7 +++++++
 src/vs/editor/common/config/editorOptions.ts  | 21 ++++++++++---------
 .../view/inlineEdits/inlineEditsView.ts       |  6 +++---
 .../inlineEditsLineReplacementView.ts         |  2 +-
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/vs/editor/browser/config/migrateOptions.ts b/src/vs/editor/browser/config/migrateOptions.ts
index 4adf4e3d848e..a056495bfef8 100644
--- a/src/vs/editor/browser/config/migrateOptions.ts
+++ b/src/vs/editor/browser/config/migrateOptions.ts
@@ -232,3 +232,10 @@ registerEditorSettingMigration('lightbulb.enabled', (value, read, write) => {
 	}
 });
 
+// NES Code Shifting
+registerEditorSettingMigration('inlineSuggest.edits.codeShifting', (value, read, write) => {
+	if (typeof value === 'boolean') {
+		write('inlineSuggest.edits.codeShifting', undefined);
+		write('inlineSuggest.edits.allowCodeShifting', value ? 'always' : 'never');
+	}
+});
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 31a120da6ca9..82570d79fd25 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -4256,7 +4256,7 @@ export interface IInlineSuggestOptions {
 	fontFamily?: string | 'default';
 
 	edits?: {
-		codeShifting?: boolean;
+		allowCodeShifting?: 'always' | 'horizontal' | 'never';
 
 		renderSideBySide?: 'never' | 'auto';
 
@@ -4309,7 +4309,7 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 				useMixedLinesDiff: 'forStableInsertions',
 				useInterleavedLinesDiff: 'never',
 				renderSideBySide: 'auto',
-				codeShifting: true,
+				allowCodeShifting: 'always',
 				useMultiLineGhostText: true
 			},
 		};
@@ -4354,11 +4354,12 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 					description: nls.localize('inlineSuggest.edits.useMixedLinesDiff', "Controls whether to enable mixed lines diff in inline suggestions."),
 					enum: ['never', 'whenPossible', 'forStableInsertions', 'afterJumpWhenPossible'],
 				}, */
-				'editor.inlineSuggest.edits.codeShifting': {
-					type: 'boolean',
-					default: defaults.edits.codeShifting,
-					description: nls.localize('inlineSuggest.edits.codeShifting', "Controls whether showing a suggestion will shift the code to make space for the suggestion inline."),
-					tags: ['nextEditSuggestions']
+				'editor.inlineSuggest.edits.allowCodeShifting': {
+					type: 'string',
+					default: defaults.edits.allowCodeShifting,
+					description: nls.localize('inlineSuggest.edits.allowCodeShifting', "Controls whether showing a suggestion will shift the code to make space for the suggestion inline."),
+					enum: ['always', 'horizontal', 'never'],
+					tags: ['nextEditSuggestions', 'preview']
 				},
 				'editor.inlineSuggest.edits.renderSideBySide': {
 					type: 'string',
@@ -4369,13 +4370,13 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 						nls.localize('editor.inlineSuggest.edits.renderSideBySide.auto', "Larger suggestions will show side by side if there is enough space, otherwise they will be shown below."),
 						nls.localize('editor.inlineSuggest.edits.renderSideBySide.never', "Larger suggestions are never shown side by side and will always be shown below."),
 					],
-					tags: ['nextEditSuggestions']
+					tags: ['nextEditSuggestions', 'preview']
 				},
 				'editor.inlineSuggest.edits.showCollapsed': {
 					type: 'boolean',
 					default: defaults.edits.showCollapsed,
 					description: nls.localize('inlineSuggest.edits.showCollapsed', "Controls whether the suggestion will show as collapsed until jumping to it."),
-					tags: ['nextEditSuggestions']
+					tags: ['nextEditSuggestions', 'preview']
 				},
 				/* 'editor.inlineSuggest.edits.useMultiLineGhostText': {
 					type: 'boolean',
@@ -4414,7 +4415,7 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 				enabled: boolean(input.edits?.enabled, this.defaultValue.edits.enabled),
 				showCollapsed: boolean(input.edits?.showCollapsed, this.defaultValue.edits.showCollapsed),
 				useMixedLinesDiff: stringSet(input.edits?.useMixedLinesDiff, this.defaultValue.edits.useMixedLinesDiff, ['never', 'whenPossible', 'forStableInsertions', 'afterJumpWhenPossible']),
-				codeShifting: boolean(input.edits?.codeShifting, this.defaultValue.edits.codeShifting),
+				allowCodeShifting: stringSet(input.edits?.allowCodeShifting, this.defaultValue.edits.allowCodeShifting, ['always', 'horizontal', 'never']),
 				renderSideBySide: stringSet(input.edits?.renderSideBySide, this.defaultValue.edits.renderSideBySide, ['never', 'auto']),
 				useInterleavedLinesDiff: stringSet(input.edits?.useInterleavedLinesDiff, this.defaultValue.edits.useInterleavedLinesDiff, ['never', 'always', 'afterJump']),
 				useMultiLineGhostText: boolean(input.edits?.useMultiLineGhostText, this.defaultValue.edits.useMultiLineGhostText),
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 7f16b9652fb5..6b6834a8221f 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
@@ -38,7 +38,7 @@ export class InlineEditsView extends Disposable {
 
 	private readonly _useMixedLinesDiff = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.useMixedLinesDiff);
 	private readonly _useInterleavedLinesDiff = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.useInterleavedLinesDiff);
-	private readonly _useCodeShifting = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.codeShifting);
+	private readonly _useCodeShifting = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.allowCodeShifting);
 	private readonly _renderSideBySide = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.renderSideBySide);
 	private readonly _showCollapsed = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.showCollapsed);
 	private readonly _useMultiLineGhostText = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.useMultiLineGhostText);
@@ -321,7 +321,7 @@ export class InlineEditsView extends Disposable {
 		if (
 			isSingleInnerEdit && (
 				this._useMixedLinesDiff.read(reader) === 'forStableInsertions'
-				&& this._useCodeShifting.read(reader)
+				&& this._useCodeShifting.read(reader) !== 'never'
 				&& isSingleLineInsertionAfterPosition(diff, inlineEdit.cursorPosition)
 			)
 		) {
@@ -333,7 +333,7 @@ export class InlineEditsView extends Disposable {
 			return 'deletion';
 		}
 
-		if (isSingleMultiLineInsertion(diff) && this._useMultiLineGhostText.read(reader) && this._useCodeShifting.read(reader)) {
+		if (isSingleMultiLineInsertion(diff) && this._useMultiLineGhostText.read(reader) && this._useCodeShifting.read(reader) === 'always') {
 			return 'insertionMultiLine';
 		}
 
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 c2fb53db63b8..eb7460eeed27 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
@@ -153,7 +153,7 @@ export class InlineEditsLineReplacementView extends Disposable implements IInlin
 	});
 
 	private readonly _viewZoneInfo = derived<{ height: number; lineNumber: number } | undefined>(reader => {
-		const shouldShowViewZone = this._editor.getOption(EditorOption.inlineSuggest).map(o => o.edits.codeShifting).read(reader);
+		const shouldShowViewZone = this._editor.getOption(EditorOption.inlineSuggest).map(o => o.edits.allowCodeShifting === 'always').read(reader);
 		if (!shouldShowViewZone) {
 			return undefined;
 		}

From 887fa0736e21fdb3814ea10f1471463118ea7f99 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 10 Mar 2025 12:10:05 +0000
Subject: [PATCH 0722/1815] =?UTF-8?q?SCM=20-=20=F0=9F=92=84=20fix=20proper?=
 =?UTF-8?q?ty=20init=20order=20in=20`scmViewService.ts`=20(#243060)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/lib/propertyInitOrderChecker.js         |  1 -
 build/lib/propertyInitOrderChecker.ts         |  1 -
 .../contrib/scm/browser/scmViewService.ts     | 85 ++++++++++---------
 3 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index 39c5da6cc847..9fba60168622 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -209,7 +209,6 @@ const ignored = new Set([
     'vs/workbench/contrib/testing/common/testServiceImpl.ts',
     'vs/platform/quickinput/browser/commandsQuickAccess.ts',
     'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts',
-    'vs/workbench/contrib/scm/browser/scmViewService.ts',
     'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts',
     'vs/workbench/contrib/scm/browser/workingSet.ts',
     'vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts',
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index e7cb6171f925..def5f9bf478b 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -178,7 +178,6 @@ const ignored = new Set([
 	'vs/workbench/contrib/testing/common/testServiceImpl.ts',
 	'vs/platform/quickinput/browser/commandsQuickAccess.ts',
 	'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts',
-	'vs/workbench/contrib/scm/browser/scmViewService.ts',
 	'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts',
 	'vs/workbench/contrib/scm/browser/workingSet.ts',
 	'vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts',
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewService.ts b/src/vs/workbench/contrib/scm/browser/scmViewService.ts
index 52af3ec95aa2..3e4d5f735070 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewService.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewService.ts
@@ -18,9 +18,10 @@ import { binarySearch } from '../../../../base/common/arrays.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { derivedObservableWithCache, derivedOpts, latestChangedValue, observableFromEventOpts } from '../../../../base/common/observable.js';
+import { derivedObservableWithCache, derivedOpts, IObservable, latestChangedValue, observableFromEventOpts } from '../../../../base/common/observable.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { EditorResourceAccessor } from '../../../common/editor.js';
+import { EditorInput } from '../../../common/editor/editorInput.js';
 
 function getProviderStorageKey(provider: ISCMProvider): string {
 	return `${provider.contextValue}:${provider.label}${provider.rootUri ? `:${provider.rootUri.toString()}` : ''}`;
@@ -157,49 +158,16 @@ export class SCMViewService implements ISCMViewService {
 	private _onDidFocusRepository = new Emitter<ISCMRepository | undefined>();
 	readonly onDidFocusRepository = this._onDidFocusRepository.event;
 
-	private readonly _focusedRepository = observableFromEventOpts<ISCMRepository | undefined>(
-		{
-			owner: this,
-			equalsFn: () => false
-		}, this.onDidFocusRepository,
-		() => this.focusedRepository);
-
-	private readonly _activeEditor = observableFromEventOpts(
-		{
-			owner: this,
-			equalsFn: () => false
-		}, this.editorService.onDidActiveEditorChange,
-		() => this.editorService.activeEditor);
-
-	private readonly _activeEditorRepository = derivedObservableWithCache<ISCMRepository | undefined>(this,
-		(reader, lastValue) => {
-			const activeEditor = this._activeEditor.read(reader);
-			const activeResource = EditorResourceAccessor.getOriginalUri(activeEditor);
-			if (!activeResource) {
-				return lastValue;
-			}
-
-			const repository = this.scmService.getRepository(activeResource);
-			if (!repository) {
-				return lastValue;
-			}
-
-			return Object.create(repository);
-		});
+	readonly activeRepository: IObservable<ISCMRepository | undefined>;
+	private readonly _activeEditorObs: IObservable<EditorInput | undefined>;
+	private readonly _activeEditorRepositoryObs: IObservable<ISCMRepository | undefined>;
 
 	/**
 	 * The focused repository takes precedence over the active editor repository when the observable
 	 * values are updated in the same transaction (or during the initial read of the observable value).
-	 */
-	private readonly _activeRepository = latestChangedValue(this, [this._activeEditorRepository, this._focusedRepository]);
-
-	/**
-	 * Derived with a custom equality function
-	 */
-	readonly activeRepository = derivedOpts<ISCMRepository | undefined>({
-		owner: this,
-		equalsFn: (r1, r2) => r1?.id === r2?.id
-	}, reader => this._activeRepository.read(reader));
+	*/
+	private readonly _activeRepositoryObs: IObservable<ISCMRepository | undefined>;
+	private readonly _focusedRepositoryObs: IObservable<ISCMRepository | undefined>;
 
 	private _repositoriesSortKey: ISCMRepositorySortKey;
 	private _sortKeyContextKey: IContextKey<ISCMRepositorySortKey>;
@@ -216,6 +184,43 @@ export class SCMViewService implements ISCMViewService {
 	) {
 		this.menus = instantiationService.createInstance(SCMMenus);
 
+		this._focusedRepositoryObs = observableFromEventOpts<ISCMRepository | undefined>(
+			{
+				owner: this,
+				equalsFn: () => false
+			}, this.onDidFocusRepository,
+			() => this.focusedRepository);
+
+		this._activeEditorObs = observableFromEventOpts(
+			{
+				owner: this,
+				equalsFn: () => false
+			}, this.editorService.onDidActiveEditorChange,
+			() => this.editorService.activeEditor);
+
+		this._activeEditorRepositoryObs = derivedObservableWithCache<ISCMRepository | undefined>(this,
+			(reader, lastValue) => {
+				const activeEditor = this._activeEditorObs.read(reader);
+				const activeResource = EditorResourceAccessor.getOriginalUri(activeEditor);
+				if (!activeResource) {
+					return lastValue;
+				}
+
+				const repository = this.scmService.getRepository(activeResource);
+				if (!repository) {
+					return lastValue;
+				}
+
+				return Object.create(repository);
+			});
+
+		this._activeRepositoryObs = latestChangedValue(this, [this._activeEditorRepositoryObs, this._focusedRepositoryObs]);
+
+		this.activeRepository = derivedOpts<ISCMRepository | undefined>({
+			owner: this,
+			equalsFn: (r1, r2) => r1?.id === r2?.id
+		}, reader => this._activeRepositoryObs.read(reader));
+
 		try {
 			this.previousState = JSON.parse(storageService.get('scm:view:visibleRepositories', StorageScope.WORKSPACE, ''));
 		} catch {

From fb57e96676e0383e44197382d4e3d10204a63d8f Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 10 Mar 2025 12:14:59 +0000
Subject: [PATCH 0723/1815] =?UTF-8?q?SCM=20-=20=F0=9F=92=84=20fix=20proper?=
 =?UTF-8?q?ty=20init=20order=20in=20`workingSet.ts`=20(#243061)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/lib/propertyInitOrderChecker.js              | 1 -
 build/lib/propertyInitOrderChecker.ts              | 1 -
 src/vs/workbench/contrib/scm/browser/workingSet.ts | 6 ++++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index 9fba60168622..53ff7f753227 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -210,7 +210,6 @@ const ignored = new Set([
     'vs/platform/quickinput/browser/commandsQuickAccess.ts',
     'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts',
     'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts',
-    'vs/workbench/contrib/scm/browser/workingSet.ts',
     'vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts',
     'vs/workbench/contrib/debug/browser/debugMemory.ts',
     'vs/workbench/contrib/markers/browser/markersViewActions.ts',
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index def5f9bf478b..356478336bff 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -179,7 +179,6 @@ const ignored = new Set([
 	'vs/platform/quickinput/browser/commandsQuickAccess.ts',
 	'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts',
 	'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts',
-	'vs/workbench/contrib/scm/browser/workingSet.ts',
 	'vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts',
 	'vs/workbench/contrib/debug/browser/debugMemory.ts',
 	'vs/workbench/contrib/markers/browser/markersViewActions.ts',
diff --git a/src/vs/workbench/contrib/scm/browser/workingSet.ts b/src/vs/workbench/contrib/scm/browser/workingSet.ts
index 1185f8de20a3..1f53f8d298b7 100644
--- a/src/vs/workbench/contrib/scm/browser/workingSet.ts
+++ b/src/vs/workbench/contrib/scm/browser/workingSet.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable, DisposableMap, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { autorun, autorunWithStore, derived } from '../../../../base/common/observable.js';
+import { autorun, autorunWithStore, derived, IObservable } from '../../../../base/common/observable.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
@@ -28,8 +28,8 @@ interface ISCMRepositoryWorkingSet {
 export class SCMWorkingSetController extends Disposable implements IWorkbenchContribution {
 	static readonly ID = 'workbench.contrib.scmWorkingSets';
 
+	private _enabledConfig: IObservable<boolean>;
 	private _workingSets!: Map<string, ISCMRepositoryWorkingSet>;
-	private _enabledConfig = observableConfigValue<boolean>('scm.workingSets.enabled', false, this.configurationService);
 
 	private readonly _repositoryDisposables = new DisposableMap<ISCMRepository>();
 
@@ -42,6 +42,8 @@ export class SCMWorkingSetController extends Disposable implements IWorkbenchCon
 	) {
 		super();
 
+		this._enabledConfig = observableConfigValue<boolean>('scm.workingSets.enabled', false, this.configurationService);
+
 		this._store.add(autorunWithStore((reader, store) => {
 			if (!this._enabledConfig.read(reader)) {
 				this.storageService.remove('scm.workingSets', StorageScope.WORKSPACE);

From 4ffd9dd63350bc72882415c0d52b7a87b2cc1b09 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Mon, 10 Mar 2025 13:53:34 +0100
Subject: [PATCH 0724/1815] Fixing property initialization order in
 stickyScrollWidget.ts file (#243067)

* running property init order check on sticky scroll widget

* refactoring
---
 build/lib/propertyInitOrderChecker.js                  |  1 -
 build/lib/propertyInitOrderChecker.ts                  |  1 -
 .../contrib/stickyScroll/browser/stickyScrollWidget.ts | 10 +++++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index 53ff7f753227..71c3e517f687 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -118,7 +118,6 @@ const ignored = new Set([
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts',
     'vs/platform/contextview/browser/contextViewService.ts',
-    'vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.ts',
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index 356478336bff..f40ab7925d8e 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -87,7 +87,6 @@ const ignored = new Set([
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts',
 	'vs/platform/contextview/browser/contextViewService.ts',
-	'vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.ts',
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
index fada2e0c7cff..c672613d27fc 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
@@ -56,8 +56,10 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 	private readonly _linesDomNodeScrollable: HTMLElement = document.createElement('div');
 	private readonly _linesDomNode: HTMLElement = document.createElement('div');
 
+	private readonly _editor: ICodeEditor;
+
 	private _previousState: StickyScrollWidgetState | undefined;
-	private _lineHeight: number = this._editor.getOption(EditorOption.lineHeight);
+	private _lineHeight: number;
 	private _renderedStickyLines: RenderedStickyLine[] = [];
 	private _lineNumbers: number[] = [];
 	private _lastLineRelativePosition: number = 0;
@@ -71,10 +73,12 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 	public readonly onDidChangeStickyScrollHeight = this._onDidChangeStickyScrollHeight.event;
 
 	constructor(
-		private readonly _editor: ICodeEditor
+		editor: ICodeEditor
 	) {
 		super();
 
+		this._editor = editor;
+		this._lineHeight = editor.getOption(EditorOption.lineHeight);
 		this._lineNumbersDomNode.className = 'sticky-widget-line-numbers';
 		this._lineNumbersDomNode.setAttribute('role', 'none');
 
@@ -85,7 +89,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 		this._linesDomNodeScrollable.appendChild(this._linesDomNode);
 
 		this._rootDomNode.className = 'sticky-widget';
-		this._rootDomNode.classList.toggle('peek', _editor instanceof EmbeddedCodeEditorWidget);
+		this._rootDomNode.classList.toggle('peek', editor instanceof EmbeddedCodeEditorWidget);
 		this._rootDomNode.appendChild(this._lineNumbersDomNode);
 		this._rootDomNode.appendChild(this._linesDomNodeScrollable);
 		this._setHeight(0);

From 0018d20957216c30ea7aaf9cb994fc8fd6b5f30e Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Mon, 10 Mar 2025 21:57:36 +0900
Subject: [PATCH 0725/1815] chore: fix property init order in ipc.mp.ts
 (#243066)

---
 build/lib/propertyInitOrderChecker.js  |  2 --
 build/lib/propertyInitOrderChecker.ts  |  2 --
 src/vs/base/parts/ipc/common/ipc.mp.ts | 14 +++++++-------
 src/vs/base/parts/ipc/node/ipc.mp.ts   | 14 +++++++-------
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index 71c3e517f687..14a331b07782 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -57,7 +57,6 @@ const ignored = new Set([
     'vs/base/common/arrays.ts',
     'vs/platform/workspace/common/workspace.ts',
     'vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts',
-    'vs/base/parts/ipc/common/ipc.mp.ts',
     'vs/platform/storage/common/storage.ts',
     'vs/platform/state/node/stateService.ts',
     'vs/platform/workspaces/electron-main/workspacesManagementMainService.ts',
@@ -89,7 +88,6 @@ const ignored = new Set([
     'vs/workbench/contrib/debug/common/debugModel.ts',
     'vs/workbench/api/common/extHostCommands.ts',
     'vs/server/node/remoteExtensionHostAgentServer.ts',
-    'vs/base/parts/ipc/node/ipc.mp.ts',
     'vs/editor/browser/view/viewLayer.ts',
     'vs/editor/browser/controller/editContext/textArea/textAreaEditContextInput.ts',
     'vs/editor/browser/widget/codeEditor/codeEditorWidget.ts',
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index f40ab7925d8e..fe7b0959347c 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -26,7 +26,6 @@ const ignored = new Set([
 	'vs/base/common/arrays.ts',
 	'vs/platform/workspace/common/workspace.ts',
 	'vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts',
-	'vs/base/parts/ipc/common/ipc.mp.ts',
 	'vs/platform/storage/common/storage.ts',
 	'vs/platform/state/node/stateService.ts',
 	'vs/platform/workspaces/electron-main/workspacesManagementMainService.ts',
@@ -58,7 +57,6 @@ const ignored = new Set([
 	'vs/workbench/contrib/debug/common/debugModel.ts',
 	'vs/workbench/api/common/extHostCommands.ts',
 	'vs/server/node/remoteExtensionHostAgentServer.ts',
-	'vs/base/parts/ipc/node/ipc.mp.ts',
 	'vs/editor/browser/view/viewLayer.ts',
 	'vs/editor/browser/controller/editContext/textArea/textAreaEditContextInput.ts',
 	'vs/editor/browser/widget/codeEditor/codeEditorWidget.ts',
diff --git a/src/vs/base/parts/ipc/common/ipc.mp.ts b/src/vs/base/parts/ipc/common/ipc.mp.ts
index 4fc2f0b6dac6..91931de0a326 100644
--- a/src/vs/base/parts/ipc/common/ipc.mp.ts
+++ b/src/vs/base/parts/ipc/common/ipc.mp.ts
@@ -41,15 +41,15 @@ export interface MessagePort {
  */
 export class Protocol implements IMessagePassingProtocol {
 
-	readonly onMessage = Event.fromDOMEventEmitter<VSBuffer>(this.port, 'message', (e: MessageEvent) => {
-		if (e.data) {
-			return VSBuffer.wrap(e.data);
-		}
-		return VSBuffer.alloc(0);
-	});
+	readonly onMessage;
 
 	constructor(private port: MessagePort) {
-
+		this.onMessage = Event.fromDOMEventEmitter<VSBuffer>(this.port, 'message', (e: MessageEvent) => {
+			if (e.data) {
+				return VSBuffer.wrap(e.data);
+			}
+			return VSBuffer.alloc(0);
+		});
 		// we must call start() to ensure messages are flowing
 		port.start();
 	}
diff --git a/src/vs/base/parts/ipc/node/ipc.mp.ts b/src/vs/base/parts/ipc/node/ipc.mp.ts
index 87e1016f045f..df9cd52c58ae 100644
--- a/src/vs/base/parts/ipc/node/ipc.mp.ts
+++ b/src/vs/base/parts/ipc/node/ipc.mp.ts
@@ -15,15 +15,15 @@ import { assertType } from '../../../common/types.js';
  */
 class Protocol implements IMessagePassingProtocol {
 
-	readonly onMessage = Event.fromNodeEventEmitter<VSBuffer>(this.port, 'message', (e: MessageEvent) => {
-		if (e.data) {
-			return VSBuffer.wrap(e.data);
-		}
-		return VSBuffer.alloc(0);
-	});
+	readonly onMessage;
 
 	constructor(private port: MessagePortMain) {
-
+		this.onMessage = Event.fromNodeEventEmitter<VSBuffer>(this.port, 'message', (e: MessageEvent) => {
+			if (e.data) {
+				return VSBuffer.wrap(e.data);
+			}
+			return VSBuffer.alloc(0);
+		});
 		// we must call start() to ensure messages are flowing
 		port.start();
 	}

From d750544dc3bebc498aa6db4298b10eb8f582d8bd Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Mon, 10 Mar 2025 06:02:42 -0700
Subject: [PATCH 0726/1815] Fix shell integration smoke test flake

The problem was caused by zsh being out of date causing the shell
initialized check to not work properly as the prompt was delayed after
that.

Fixes #242739
---
 .../src/areas/terminal/terminal-shellIntegration.test.ts   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/smoke/src/areas/terminal/terminal-shellIntegration.test.ts b/test/smoke/src/areas/terminal/terminal-shellIntegration.test.ts
index 23f94e89f931..b0d0db48bf30 100644
--- a/test/smoke/src/areas/terminal/terminal-shellIntegration.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-shellIntegration.test.ts
@@ -95,8 +95,8 @@ export function setup(options?: { skipSuite: boolean }) {
 				await settingsEditor.clearUserSettings();
 			});
 			beforeEach(async function () {
-				// Create the simplest system profile to get as little process interaction as possible
-				await terminal.createTerminal();
+				// 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')}`);
 			});
@@ -114,8 +114,7 @@ export function setup(options?: { skipSuite: boolean }) {
 					await terminal.assertCommandDecorations({ placeholder: 1, success: 1, error: 1 });
 				});
 			});
-			// TODO: This depends on https://github.com/microsoft/vscode/issues/146587
-			describe.skip('Final Term sequences', () => {
+			describe('Final Term sequences', () => {
 				it('should handle the simple case', async () => {
 					await terminal.runCommandWithValue(TerminalCommandIdWithValue.WriteDataToTerminal, `${ft('A')}Prompt> ${ft('B')}exitcode 0`);
 					await terminal.assertCommandDecorations({ placeholder: 1, success: 0, error: 0 });

From 50a7fe57441c3c68aabc91a84735c18067a6c019 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Mon, 10 Mar 2025 14:04:32 +0100
Subject: [PATCH 0727/1815] Fixing property initialization order check in
 ghostText.ts (#243068)

fixing property initialization order check in ghostText.ts
---
 build/lib/propertyInitOrderChecker.js         |  1 -
 build/lib/propertyInitOrderChecker.ts         |  1 -
 .../browser/model/ghostText.ts                | 35 +++++++++++--------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index 14a331b07782..99c266c723e4 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -104,7 +104,6 @@ const ignored = new Set([
     'vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.ts',
     'vs/editor/browser/widget/diffEditor/diffEditorWidget.ts',
     'vs/editor/contrib/colorPicker/browser/colorDetector.ts',
-    'vs/editor/contrib/inlineCompletions/browser/model/ghostText.ts',
     'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts',
     'vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdapter.ts',
     'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts',
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index fe7b0959347c..c5538d62f71b 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -73,7 +73,6 @@ const ignored = new Set([
 	'vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.ts',
 	'vs/editor/browser/widget/diffEditor/diffEditorWidget.ts',
 	'vs/editor/contrib/colorPicker/browser/colorDetector.ts',
-	'vs/editor/contrib/inlineCompletions/browser/model/ghostText.ts',
 	'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts',
 	'vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdapter.ts',
 	'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts',
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/ghostText.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/ghostText.ts
index 40411f027ef7..700bc76bf640 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/ghostText.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/ghostText.ts
@@ -68,7 +68,11 @@ export interface IGhostTextLine {
 	lineDecorations: LineDecoration[];
 }
 
+
 export class GhostTextPart {
+
+	readonly lines: IGhostTextLine[];
+
 	constructor(
 		readonly column: number,
 		readonly text: string,
@@ -78,13 +82,12 @@ export class GhostTextPart {
 		readonly preview: boolean,
 		private _inlineDecorations: InlineDecoration[] = [],
 	) {
+		this.lines = splitLines(this.text).map((line, i) => ({
+			line,
+			lineDecorations: LineDecoration.filter(this._inlineDecorations, i + 1, 1, line.length + 1)
+		}));
 	}
 
-	readonly lines: IGhostTextLine[] = splitLines(this.text).map((line, i) => ({
-		line,
-		lineDecorations: LineDecoration.filter(this._inlineDecorations, i + 1, 1, line.length + 1)
-	}));
-
 	equals(other: GhostTextPart): boolean {
 		return this.column === other.column &&
 			this.lines.length === other.lines.length &&
@@ -96,22 +99,24 @@ export class GhostTextPart {
 }
 
 export class GhostTextReplacement {
-	public readonly parts: ReadonlyArray<GhostTextPart> = [
-		new GhostTextPart(
-			this.columnRange.endColumnExclusive,
-			this.text,
-			false
-		),
-	];
+	public readonly parts: ReadonlyArray<GhostTextPart>;
+	readonly newLines: string[];
 
 	constructor(
 		readonly lineNumber: number,
 		readonly columnRange: ColumnRange,
 		readonly text: string,
 		public readonly additionalReservedLineCount: number = 0,
-	) { }
-
-	readonly newLines = splitLines(this.text);
+	) {
+		this.parts = [
+			new GhostTextPart(
+				this.columnRange.endColumnExclusive,
+				this.text,
+				false
+			),
+		];
+		this.newLines = splitLines(this.text);
+	}
 
 	renderForScreenReader(_lineText: string): string {
 		return this.newLines.join('\n');

From 4c1fe96dde7479362529880e9f2fcc1f7ada3665 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Mon, 10 Mar 2025 06:15:49 -0700
Subject: [PATCH 0728/1815] Fix git aliases not completing

Fixes #240374
---
 .../fig/autocomplete-parser/parseArguments.ts   | 17 ++++++++++++++---
 .../terminal-suggest/src/fig/figInterface.ts    |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/extensions/terminal-suggest/src/fig/autocomplete-parser/parseArguments.ts b/extensions/terminal-suggest/src/fig/autocomplete-parser/parseArguments.ts
index c26f3a77143d..3436414c4a6a 100644
--- a/extensions/terminal-suggest/src/fig/autocomplete-parser/parseArguments.ts
+++ b/extensions/terminal-suggest/src/fig/autocomplete-parser/parseArguments.ts
@@ -35,6 +35,7 @@ import {
 } from './errors.js';
 import { convertSubcommand, initializeDefault } from '../fig-autocomplete-shared';
 import { exec, type ExecException } from 'child_process';
+import type { IFigExecuteExternals } from '../execute';
 
 type ArgArrayState = {
 	args: Array<Internal.Arg> | null;
@@ -605,8 +606,15 @@ const historyExecuteShellCommand: Fig.ExecuteCommandFunction = async () => {
 	);
 };
 
-const getExecuteShellCommandFunction = (isParsingHistory = false) =>
-	isParsingHistory ? historyExecuteShellCommand : () => { throw new Error('Not implemented'); };
+function getExecuteShellCommandFunction(
+	isParsingHistory = false,
+	executeExternals: IFigExecuteExternals,
+) {
+	if (isParsingHistory) {
+		return historyExecuteShellCommand;
+	}
+	return executeExternals.executeCommand;
+}
 
 // const getGenerateSpecCacheKey = (
 // 	completionObj: Internal.Subcommand,
@@ -790,13 +798,14 @@ const parseArgumentsCached = async (
 	command: Command,
 	context: Fig.ShellContext,
 	spec: Fig.Spec,
+	executeExternals: IFigExecuteExternals,
 	// authClient: AuthClient,
 	isParsingHistory?: boolean,
 	startIndex = 0,
 	// localconsole: console.console = console,
 ): Promise<ArgumentParserState> => {
 	// Route to cp.exec instead, we don't need to deal with ipc
-	const exec = getExecuteShellCommandFunction(isParsingHistory);
+	const exec = getExecuteShellCommandFunction(isParsingHistory, executeExternals);
 
 	let currentCommand = command;
 	let tokens = currentCommand.tokens.slice(startIndex);
@@ -1124,6 +1133,7 @@ export const parseArguments = async (
 	command: Command | null,
 	context: Fig.ShellContext,
 	spec: Fig.Spec,
+	executeExternals: IFigExecuteExternals,
 	// authClient: AuthClient,
 	isParsingHistory = false,
 	// localconsole: console.console = console,
@@ -1157,6 +1167,7 @@ export const parseArguments = async (
 		context,
 		// authClient,
 		spec,
+		executeExternals,
 		isParsingHistory,
 		0,
 	);
diff --git a/extensions/terminal-suggest/src/fig/figInterface.ts b/extensions/terminal-suggest/src/fig/figInterface.ts
index 524b29f7413d..8d5a139ea901 100644
--- a/extensions/terminal-suggest/src/fig/figInterface.ts
+++ b/extensions/terminal-suggest/src/fig/figInterface.ts
@@ -133,7 +133,7 @@ async function getFigSpecSuggestions(
 		currentProcess: name,
 		// TODO: pass in aliases
 	};
-	const parsedArguments: ArgumentParserResult = await parseArguments(command, shellContext, spec);
+	const parsedArguments: ArgumentParserResult = await parseArguments(command, shellContext, spec, executeExternals);
 
 	const items: vscode.TerminalCompletionItem[] = [];
 	// TODO: Pass in and respect cancellation token

From 6306af46f01e3cb758f6ec2fab949d452cadb79d Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 10 Mar 2025 13:23:53 +0000
Subject: [PATCH 0729/1815] =?UTF-8?q?SCM=20-=20=F0=9F=92=84=20fix=20proper?=
 =?UTF-8?q?ty=20init=20order=20in=20`scmHistoryViewPane.ts`=20(#243069)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/lib/propertyInitOrderChecker.js         |  1 -
 build/lib/propertyInitOrderChecker.ts         |  1 -
 .../contrib/scm/browser/scmHistoryViewPane.ts | 58 +++++++++----------
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index 99c266c723e4..0d48106f93ca 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -206,7 +206,6 @@ const ignored = new Set([
     'vs/platform/quickinput/browser/commandsQuickAccess.ts',
     'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts',
     'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts',
-    'vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts',
     'vs/workbench/contrib/debug/browser/debugMemory.ts',
     'vs/workbench/contrib/markers/browser/markersViewActions.ts',
     'vs/workbench/contrib/mergeEditor/browser/view/viewZones.ts',
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index c5538d62f71b..c0719def6331 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -175,7 +175,6 @@ const ignored = new Set([
 	'vs/platform/quickinput/browser/commandsQuickAccess.ts',
 	'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts',
 	'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts',
-	'vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts',
 	'vs/workbench/contrib/debug/browser/debugMemory.ts',
 	'vs/workbench/contrib/markers/browser/markersViewActions.ts',
 	'vs/workbench/contrib/mergeEditor/browser/view/viewZones.ts',
diff --git a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
index 64d04fc0cbce..501e99edf7e5 100644
--- a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
@@ -318,7 +318,7 @@ class HistoryItemRenderer implements ITreeRenderer<SCMHistoryItemViewModelTreeEl
 	static readonly TEMPLATE_ID = 'history-item';
 	get templateId(): string { return HistoryItemRenderer.TEMPLATE_ID; }
 
-	private readonly _badgesConfig = observableConfigValue<'all' | 'filter'>('scm.graph.badges', 'filter', this._configurationService);
+	private readonly _badgesConfig: IObservable<'all' | 'filter'>;
 
 	constructor(
 		private readonly hoverDelegate: IHoverDelegate,
@@ -328,7 +328,9 @@ class HistoryItemRenderer implements ITreeRenderer<SCMHistoryItemViewModelTreeEl
 		@IHoverService private readonly _hoverService: IHoverService,
 		@IMenuService private readonly _menuService: IMenuService,
 		@IThemeService private readonly _themeService: IThemeService
-	) { }
+	) {
+		this._badgesConfig = observableConfigValue<'all' | 'filter'>('scm.graph.badges', 'filter', this._configurationService);
+	}
 
 	renderTemplate(container: HTMLElement): HistoryItemTemplate {
 		// hack
@@ -749,36 +751,13 @@ type RepositoryState = {
 };
 
 class SCMHistoryViewModel extends Disposable {
-
-	private readonly _closedRepository = observableFromEvent(
-		this,
-		this._scmService.onDidRemoveRepository,
-		repository => repository);
-
-	private readonly _firstRepository = this._scmService.repositoryCount > 0 ?
-		constObservable(Iterable.first(this._scmService.repositories)) :
-		observableFromEvent(
-			this,
-			Event.once(this._scmService.onDidAddRepository),
-			repository => repository
-		);
-
-	private readonly _selectedRepository = observableValue<'auto' | ISCMRepository>(this, 'auto');
-
-	private readonly _graphRepository = derived(reader => {
-		const selectedRepository = this._selectedRepository.read(reader);
-		if (selectedRepository !== 'auto') {
-			return selectedRepository;
-		}
-
-		return this._scmViewService.activeRepository.read(reader);
-	});
-
 	/**
 	 * The active | selected repository takes precedence over the first repository when the observable
 	 * values are updated in the same transaction (or during the initial read of the observable value).
 	 */
-	readonly repository = latestChangedValue(this, [this._firstRepository, this._graphRepository]);
+	readonly repository: IObservable<ISCMRepository | undefined>;
+	private readonly _selectedRepository = observableValue<'auto' | ISCMRepository>(this, 'auto');
+
 	readonly onDidChangeHistoryItemsFilter = observableSignal(this);
 	readonly isViewModelEmpty = observableValue(this, false);
 
@@ -804,9 +783,30 @@ class SCMHistoryViewModel extends Disposable {
 
 		this._scmHistoryItemCountCtx = ContextKeys.SCMHistoryItemCount.bindTo(this._contextKeyService);
 
+		const firstRepository = this._scmService.repositoryCount > 0
+			? constObservable(Iterable.first(this._scmService.repositories))
+			: observableFromEvent(this,
+				Event.once(this._scmService.onDidAddRepository),
+				repository => repository);
+
+		const graphRepository = derived(reader => {
+			const selectedRepository = this._selectedRepository.read(reader);
+			if (selectedRepository !== 'auto') {
+				return selectedRepository;
+			}
+
+			return this._scmViewService.activeRepository.read(reader);
+		});
+
+		this.repository = latestChangedValue(this, [firstRepository, graphRepository]);
+
+		const closedRepository = observableFromEvent(this,
+			this._scmService.onDidRemoveRepository,
+			repository => repository);
+
 		// Closed repository cleanup
 		this._register(autorun(reader => {
-			const repository = this._closedRepository.read(reader);
+			const repository = closedRepository.read(reader);
 			if (!repository) {
 				return;
 			}

From 92c3d156008209e1ab07f5825acb8feb67bd5058 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Mon, 10 Mar 2025 15:11:47 +0100
Subject: [PATCH 0730/1815] Merge pull request #243062 from
 microsoft/alexd/extra-sailfish

Emit editor widget focus events via ViewModelEventDispatcher
---
 src/vs/editor/browser/view.ts                 | 79 ++++++++++++++++++-
 .../widget/codeEditor/codeEditorWidget.ts     | 78 ++----------------
 src/vs/editor/common/viewModel.ts             |  1 +
 .../editor/common/viewModel/viewModelImpl.ts  |  6 +-
 .../editor/common/viewModelEventDispatcher.ts | 26 ++++++
 5 files changed, 118 insertions(+), 72 deletions(-)

diff --git a/src/vs/editor/browser/view.ts b/src/vs/editor/browser/view.ts
index e2a992cd339a..53acaf14f7f4 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 { IDisposable } from '../../base/common/lifecycle.js';
+import { Disposable, IDisposable } from '../../base/common/lifecycle.js';
 import { IPointerHandlerHelper } from './controller/mouseHandler.js';
 import { PointerHandlerLastRenderData } from './controller/mouseTarget.js';
 import { PointerHandler } from './controller/pointerHandler.js';
@@ -63,6 +63,7 @@ import { NativeEditContext } from './controller/editContext/native/nativeEditCon
 import { RulersGpu } from './viewParts/rulersGpu/rulersGpu.js';
 import { GpuMarkOverlay } from './viewParts/gpuMark/gpuMark.js';
 import { AccessibilitySupport } from '../../platform/accessibility/common/accessibility.js';
+import { Event, Emitter } from '../../base/common/event.js';
 
 
 export interface IContentWidgetData {
@@ -82,6 +83,8 @@ export interface IGlyphMarginWidgetData {
 
 export class View extends ViewEventHandler {
 
+	private _widgetFocusTracker: CodeEditorWidgetFocusTracker;
+
 	private readonly _scrollbar: EditorScrollbar;
 	private readonly _context: ViewContext;
 	private readonly _viewGpuContext?: ViewGpuContext;
@@ -116,6 +119,7 @@ export class View extends ViewEventHandler {
 	private _ownerID: string;
 
 	constructor(
+		editorContainer: HTMLElement,
 		ownerID: string,
 		commandDelegate: ICommandDelegate,
 		configuration: IEditorConfiguration,
@@ -127,6 +131,14 @@ export class View extends ViewEventHandler {
 	) {
 		super();
 		this._ownerID = ownerID;
+
+		this._widgetFocusTracker = this._register(
+			new CodeEditorWidgetFocusTracker(editorContainer, overflowWidgetsDomNode)
+		);
+		this._register(this._widgetFocusTracker.onChange(() => {
+			this._context.viewModel.setHasWidgetFocus(this._widgetFocusTracker.hasFocus());
+		}));
+
 		this._selections = [new Selection(1, 1, 1, 1)];
 		this._renderAnimationFrame = null;
 
@@ -684,8 +696,13 @@ export class View extends ViewEventHandler {
 		return this._editContext.isFocused();
 	}
 
+	public isWidgetFocused(): boolean {
+		return this._widgetFocusTracker.hasFocus();
+	}
+
 	public refreshFocusState() {
 		this._editContext.refreshFocusState();
+		this._widgetFocusTracker.refreshState();
 	}
 
 	public setAriaOptions(options: IEditorAriaOptions): void {
@@ -851,3 +868,63 @@ class EditorRenderingCoordinator {
 	}
 }
 
+class CodeEditorWidgetFocusTracker extends Disposable {
+
+	private _hasDomElementFocus: boolean;
+	private readonly _domFocusTracker: dom.IFocusTracker;
+	private readonly _overflowWidgetsDomNode: dom.IFocusTracker | undefined;
+
+	private readonly _onChange: Emitter<void> = this._register(new Emitter<void>());
+	public readonly onChange: Event<void> = this._onChange.event;
+
+	private _overflowWidgetsDomNodeHasFocus: boolean;
+
+	private _hadFocus: boolean | undefined = undefined;
+
+	constructor(domElement: HTMLElement, overflowWidgetsDomNode: HTMLElement | undefined) {
+		super();
+
+		this._hasDomElementFocus = false;
+		this._domFocusTracker = this._register(dom.trackFocus(domElement));
+
+		this._overflowWidgetsDomNodeHasFocus = false;
+
+		this._register(this._domFocusTracker.onDidFocus(() => {
+			this._hasDomElementFocus = true;
+			this._update();
+		}));
+		this._register(this._domFocusTracker.onDidBlur(() => {
+			this._hasDomElementFocus = false;
+			this._update();
+		}));
+
+		if (overflowWidgetsDomNode) {
+			this._overflowWidgetsDomNode = this._register(dom.trackFocus(overflowWidgetsDomNode));
+			this._register(this._overflowWidgetsDomNode.onDidFocus(() => {
+				this._overflowWidgetsDomNodeHasFocus = true;
+				this._update();
+			}));
+			this._register(this._overflowWidgetsDomNode.onDidBlur(() => {
+				this._overflowWidgetsDomNodeHasFocus = false;
+				this._update();
+			}));
+		}
+	}
+
+	private _update() {
+		const focused = this._hasDomElementFocus || this._overflowWidgetsDomNodeHasFocus;
+		if (this._hadFocus !== focused) {
+			this._hadFocus = focused;
+			this._onChange.fire(undefined);
+		}
+	}
+
+	public hasFocus(): boolean {
+		return this._hadFocus ?? false;
+	}
+
+	public refreshState(): void {
+		this._domFocusTracker.refreshState();
+		this._overflowWidgetsDomNode?.refreshState?.();
+	}
+}
diff --git a/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
index 7e325a7f888b..6875c9736450 100644
--- a/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
@@ -231,8 +231,6 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 	private readonly _commandService: ICommandService;
 	private readonly _themeService: IThemeService;
 
-	private readonly _focusTracker: CodeEditorWidgetFocusTracker;
-
 	private _contentWidgets: { [key: string]: IContentWidgetData };
 	private _overlayWidgets: { [key: string]: IOverlayWidgetData };
 	private _glyphMarginWidgets: { [key: string]: IGlyphMarginWidgetData };
@@ -306,11 +304,6 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 
 		this._modelData = null;
 
-		this._focusTracker = new CodeEditorWidgetFocusTracker(domElement, this._overflowWidgetsDomNode);
-		this._register(this._focusTracker.onChange(() => {
-			this._editorWidgetFocus.setValue(this._focusTracker.hasFocus());
-		}));
-
 		this._contentWidgets = {};
 		this._overlayWidgets = {};
 		this._glyphMarginWidgets = {};
@@ -406,7 +399,6 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 	public override dispose(): void {
 		this._codeEditorService.removeCodeEditor(this);
 
-		this._focusTracker.dispose();
 		this._actions.clear();
 		this._contentWidgets = {};
 		this._overlayWidgets = {};
@@ -1033,7 +1025,6 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 
 	public onHide(): void {
 		this._modelData?.view.refreshFocusState();
-		this._focusTracker.refreshState();
 	}
 
 	public getContribution<T extends editorCommon.IEditorContribution>(id: string): T | null {
@@ -1451,7 +1442,10 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 	}
 
 	public hasWidgetFocus(): boolean {
-		return this._focusTracker && this._focusTracker.hasFocus();
+		if (!this._modelData || !this._modelData.hasRealView) {
+			return false;
+		}
+		return this._modelData.view.isWidgetFocused();
 	}
 
 	public addContentWidget(widget: editorBrowser.IContentWidget): void {
@@ -1690,6 +1684,9 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 				case OutgoingViewModelEventKind.FocusChanged:
 					this._editorTextFocus.setValue(e.hasFocus);
 					break;
+				case OutgoingViewModelEventKind.WidgetFocusChanged:
+					this._editorWidgetFocus.setValue(e.hasFocus);
+					break;
 				case OutgoingViewModelEventKind.ScrollChanged:
 					this._onDidScrollChange.fire(e);
 					break;
@@ -1873,6 +1870,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		viewUserInputEvents.onMouseWheel = (e) => this._onMouseWheel.fire(e);
 
 		const view = new View(
+			this._domElement,
 			this.getId(),
 			commandDelegate,
 			this._configuration,
@@ -2301,66 +2299,6 @@ export class EditorModeContext extends Disposable {
 	}
 }
 
-class CodeEditorWidgetFocusTracker extends Disposable {
-
-	private _hasDomElementFocus: boolean;
-	private readonly _domFocusTracker: dom.IFocusTracker;
-	private readonly _overflowWidgetsDomNode: dom.IFocusTracker | undefined;
-
-	private readonly _onChange: Emitter<void> = this._register(new Emitter<void>());
-	public readonly onChange: Event<void> = this._onChange.event;
-
-	private _overflowWidgetsDomNodeHasFocus: boolean;
-
-	private _hadFocus: boolean | undefined = undefined;
-
-	constructor(domElement: HTMLElement, overflowWidgetsDomNode: HTMLElement | undefined) {
-		super();
-
-		this._hasDomElementFocus = false;
-		this._domFocusTracker = this._register(dom.trackFocus(domElement));
-
-		this._overflowWidgetsDomNodeHasFocus = false;
-
-		this._register(this._domFocusTracker.onDidFocus(() => {
-			this._hasDomElementFocus = true;
-			this._update();
-		}));
-		this._register(this._domFocusTracker.onDidBlur(() => {
-			this._hasDomElementFocus = false;
-			this._update();
-		}));
-
-		if (overflowWidgetsDomNode) {
-			this._overflowWidgetsDomNode = this._register(dom.trackFocus(overflowWidgetsDomNode));
-			this._register(this._overflowWidgetsDomNode.onDidFocus(() => {
-				this._overflowWidgetsDomNodeHasFocus = true;
-				this._update();
-			}));
-			this._register(this._overflowWidgetsDomNode.onDidBlur(() => {
-				this._overflowWidgetsDomNodeHasFocus = false;
-				this._update();
-			}));
-		}
-	}
-
-	private _update() {
-		const focused = this._hasDomElementFocus || this._overflowWidgetsDomNodeHasFocus;
-		if (this._hadFocus !== focused) {
-			this._hadFocus = focused;
-			this._onChange.fire(undefined);
-		}
-	}
-
-	public hasFocus(): boolean {
-		return this._hadFocus ?? false;
-	}
-
-	public refreshState(): void {
-		this._domFocusTracker.refreshState();
-		this._overflowWidgetsDomNode?.refreshState?.();
-	}
-}
 
 class EditorDecorationsCollection implements editorCommon.IEditorDecorationsCollection {
 
diff --git a/src/vs/editor/common/viewModel.ts b/src/vs/editor/common/viewModel.ts
index 444bac5d610e..1aefa04abeb7 100644
--- a/src/vs/editor/common/viewModel.ts
+++ b/src/vs/editor/common/viewModel.ts
@@ -40,6 +40,7 @@ export interface IViewModel extends ICursorSimpleModel {
 	setViewport(startLineNumber: number, endLineNumber: number, centeredLineNumber: number): void;
 	visibleLinesStabilized(): void;
 	setHasFocus(hasFocus: boolean): void;
+	setHasWidgetFocus(hasWidgetFocus: boolean): void;
 	onCompositionStart(): void;
 	onCompositionEnd(): void;
 
diff --git a/src/vs/editor/common/viewModel/viewModelImpl.ts b/src/vs/editor/common/viewModel/viewModelImpl.ts
index 1db590850902..8918d324ce7c 100644
--- a/src/vs/editor/common/viewModel/viewModelImpl.ts
+++ b/src/vs/editor/common/viewModel/viewModelImpl.ts
@@ -36,7 +36,7 @@ import { ILineBreaksComputer, ILineBreaksComputerFactory, InjectedText } from '.
 import { ViewEventHandler } from '../viewEventHandler.js';
 import { ICoordinatesConverter, InlineDecoration, IViewModel, IWhitespaceChangeAccessor, MinimapLinesRenderingData, OverviewRulerDecorationsGroup, ViewLineData, ViewLineRenderingData, ViewModelDecoration } from '../viewModel.js';
 import { ViewModelDecorations } from './viewModelDecorations.js';
-import { FocusChangedEvent, HiddenAreasChangedEvent, ModelContentChangedEvent, ModelDecorationsChangedEvent, ModelLanguageChangedEvent, ModelLanguageConfigurationChangedEvent, ModelOptionsChangedEvent, ModelTokensChangedEvent, OutgoingViewModelEvent, ReadOnlyEditAttemptEvent, ScrollChangedEvent, ViewModelEventDispatcher, ViewModelEventsCollector, ViewZonesChangedEvent } from '../viewModelEventDispatcher.js';
+import { FocusChangedEvent, HiddenAreasChangedEvent, ModelContentChangedEvent, ModelDecorationsChangedEvent, ModelLanguageChangedEvent, ModelLanguageConfigurationChangedEvent, ModelOptionsChangedEvent, ModelTokensChangedEvent, OutgoingViewModelEvent, ReadOnlyEditAttemptEvent, ScrollChangedEvent, ViewModelEventDispatcher, ViewModelEventsCollector, ViewZonesChangedEvent, WidgetFocusChangedEvent } from '../viewModelEventDispatcher.js';
 import { IViewModelLines, ViewModelLinesFromModelAsIs, ViewModelLinesFromProjectedModel } from './viewModelLines.js';
 import { IThemeService } from '../../../platform/theme/common/themeService.js';
 import { GlyphMarginLanesModel } from './glyphLanesModel.js';
@@ -216,6 +216,10 @@ export class ViewModel extends Disposable implements IViewModel {
 		this._eventDispatcher.emitOutgoingEvent(new FocusChangedEvent(!hasFocus, hasFocus));
 	}
 
+	public setHasWidgetFocus(hasWidgetFocus: boolean): void {
+		this._eventDispatcher.emitOutgoingEvent(new WidgetFocusChangedEvent(!hasWidgetFocus, hasWidgetFocus));
+	}
+
 	public onCompositionStart(): void {
 		this._eventDispatcher.emitSingleViewEvent(new viewEvents.ViewCompositionStartEvent());
 	}
diff --git a/src/vs/editor/common/viewModelEventDispatcher.ts b/src/vs/editor/common/viewModelEventDispatcher.ts
index 7fddb80251ff..fc91875b3196 100644
--- a/src/vs/editor/common/viewModelEventDispatcher.ts
+++ b/src/vs/editor/common/viewModelEventDispatcher.ts
@@ -176,6 +176,7 @@ export class ViewModelEventsCollector {
 export type OutgoingViewModelEvent = (
 	ContentSizeChangedEvent
 	| FocusChangedEvent
+	| WidgetFocusChangedEvent
 	| ScrollChangedEvent
 	| ViewZonesChangedEvent
 	| HiddenAreasChangedEvent
@@ -192,6 +193,7 @@ export type OutgoingViewModelEvent = (
 export const enum OutgoingViewModelEventKind {
 	ContentSizeChanged,
 	FocusChanged,
+	WidgetFocusChanged,
 	ScrollChanged,
 	ViewZonesChanged,
 	HiddenAreasChanged,
@@ -262,6 +264,30 @@ export class FocusChangedEvent {
 	}
 }
 
+export class WidgetFocusChangedEvent {
+
+	public readonly kind = OutgoingViewModelEventKind.WidgetFocusChanged;
+
+	readonly oldHasFocus: boolean;
+	readonly hasFocus: boolean;
+
+	constructor(oldHasFocus: boolean, hasFocus: boolean) {
+		this.oldHasFocus = oldHasFocus;
+		this.hasFocus = hasFocus;
+	}
+
+	public isNoOp(): boolean {
+		return (this.oldHasFocus === this.hasFocus);
+	}
+
+	public attemptToMerge(other: OutgoingViewModelEvent): OutgoingViewModelEvent | null {
+		if (other.kind !== this.kind) {
+			return null;
+		}
+		return new FocusChangedEvent(this.oldHasFocus, other.hasFocus);
+	}
+}
+
 export class ScrollChangedEvent {
 
 	public readonly kind = OutgoingViewModelEventKind.ScrollChanged;

From 60358fed786a2a7f455769eaa966639a6b93b0eb Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Mon, 10 Mar 2025 15:58:30 +0100
Subject: [PATCH 0731/1815] removing refresh focus state before isFocused call

---
 src/vs/editor/browser/view.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vs/editor/browser/view.ts b/src/vs/editor/browser/view.ts
index e5fab9186f52..e2a992cd339a 100644
--- a/src/vs/editor/browser/view.ts
+++ b/src/vs/editor/browser/view.ts
@@ -681,7 +681,6 @@ export class View extends ViewEventHandler {
 	}
 
 	public isFocused(): boolean {
-		this._editContext.refreshFocusState();
 		return this._editContext.isFocused();
 	}
 

From 6001ed8a20a6227c5592ee703e3c7b91a9cf5b94 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Mon, 10 Mar 2025 16:01:56 +0100
Subject: [PATCH 0732/1815] Add workaround (again) for browser bug

---
 .../editContext/native/nativeEditContext.ts   |  2 +-
 .../native/nativeEditContextUtils.ts          | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
index a6f5d41ad094..9666b4275384 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
@@ -262,7 +262,7 @@ export class NativeEditContext extends AbstractEditContext {
 	}
 
 	public isFocused(): boolean {
-		return this._focusTracker.isFocused || (getActiveWindow().document.activeElement === this.textArea.domNode);
+		return this._focusTracker.isFocused;
 	}
 
 	public focus(): void {
diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
index b3166de0437a..faa0ec2f2cc6 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, getActiveWindow } from '../../../../../base/browser/dom.js';
+import { addDisposableListener, getActiveElement, getShadowRoot } from '../../../../../base/browser/dom.js';
 import { IDisposable, Disposable } from '../../../../../base/common/lifecycle.js';
 
 export interface ITypeData {
@@ -21,8 +21,15 @@ export class FocusTracker extends Disposable {
 		private readonly _onFocusChange: (newFocusValue: boolean) => void,
 	) {
 		super();
-		this._register(addDisposableListener(this._domNode, 'focus', () => this._handleFocusedChanged(true)));
-		this._register(addDisposableListener(this._domNode, 'blur', () => this._handleFocusedChanged(false)));
+		this._register(addDisposableListener(this._domNode, 'focus', () => {
+			// Here we don't trust the browser and instead we check
+			// that the active element is the one we are tracking
+			// (this happens when cmd+tab is used to switch apps)
+			this.refreshFocusState();
+		}));
+		this._register(addDisposableListener(this._domNode, 'blur', () => {
+			this._handleFocusedChanged(false);
+		}));
 	}
 
 	private _handleFocusedChanged(focused: boolean): void {
@@ -34,14 +41,14 @@ export class FocusTracker extends Disposable {
 	}
 
 	public focus(): void {
-		// fixes: https://github.com/microsoft/vscode/issues/228147
-		// Immediately call this method in order to directly set the field isFocused to true so the textInputFocus context key is evaluated correctly
-		this._handleFocusedChanged(true);
 		this._domNode.focus();
+		this.refreshFocusState();
 	}
 
 	public refreshFocusState(): void {
-		const focused = this._domNode === getActiveWindow().document.activeElement;
+		const shadowRoot = getShadowRoot(this._domNode);
+		const activeElement = shadowRoot ? shadowRoot.activeElement : getActiveElement();
+		const focused = this._domNode === activeElement;
 		this._handleFocusedChanged(focused);
 	}
 

From c6a01c44e294b223dd53138dfd7af2aea2a45e0e Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Tue, 11 Mar 2025 00:15:18 +0900
Subject: [PATCH 0733/1815] chore: update runtime builds (#243077)

* chore: update runtime builds

* chore: bump distro
---
 .npmrc       | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.npmrc b/.npmrc
index bfa6fba99e3d..b97a643fc384 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,6 +1,6 @@
 disturl="https://electronjs.org/headers"
 target="34.2.0"
-ms_build_id="11044223"
+ms_build_id="11160463"
 runtime="electron"
 build_from_source="true"
 legacy-peer-deps="true"
diff --git a/package.json b/package.json
index c20d4503efd7..b31bd2bdf4bf 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.99.0",
-  "distro": "0e2323d4ed865131a871b853d9573173441799a9",
+  "distro": "41cec92368205e685549ec26290a8f26c8d47bcf",
   "author": {
     "name": "Microsoft Corporation"
   },

From 6b9869a75cb6036eacab21c1e4386ed13006b835 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 10 Mar 2025 16:20:42 +0100
Subject: [PATCH 0734/1815] start adopting to
 includeLatestPrereleaseAndStableVersionOnly flag (#243083)

#243072 start adopting to includeLatestPrereleaseAndStableVersionOnly flag
---
 .../common/extensionGalleryService.ts         | 158 +++++++++++++++---
 .../common/extensionGalleryService.ts         |  36 ++++
 src/vs/workbench/workbench.common.main.ts     |   5 +-
 3 files changed, 173 insertions(+), 26 deletions(-)
 create mode 100644 src/vs/workbench/services/extensionManagement/common/extensionGalleryService.ts

diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
index a107e590a129..c9dce9515892 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
@@ -28,6 +28,7 @@ import { IStorageService } from '../../storage/common/storage.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 import { StopWatch } from '../../../base/common/stopwatch.js';
 import { format2 } from '../../../base/common/strings.js';
+import { IAssignmentService } from '../../assignment/common/assignment.js';
 
 const CURRENT_TARGET_PLATFORM = isWeb ? TargetPlatform.WEB : getTargetPlatform(platform, arch);
 const ACTIVITY_HEADER_NAME = 'X-Market-Search-Activity-Id';
@@ -177,6 +178,14 @@ enum Flags {
 	 * Include the details if an extension is in conflict list or not
 	 */
 	IncludeNameConflictInfo = 0x8000,
+
+	/**
+	 * When retrieving versions from a query, only include the latest stable and pre-release
+	 * versions of the extensions that matched. This is useful when the caller needs
+	 * only the latest versions and not the entire version history. It will save a
+	 * significant size in the returned payload.
+	 */
+	IncludeLatestPrereleaseAndStableVersionOnly = 0x10000,
 }
 
 function flagsToString(...flags: Flags[]): string {
@@ -251,6 +260,7 @@ type GalleryServiceQueryClassification = {
 	comment: 'Information about Marketplace query and its response';
 	readonly filterTypes: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Filter types used in the query.' };
 	readonly flags: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Flags passed in the query.' };
+	readonly includeLatestPrereleaseAndStableVersionOnly: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'whether the query includes latest pre-release and stable version only flag' };
 	readonly sortBy: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'sorted by option passed in the query' };
 	readonly sortOrder: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'sort order option passed in the query' };
 	readonly pageNumber: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'requested page number in the query' };
@@ -267,6 +277,7 @@ type GalleryServiceQueryClassification = {
 
 type QueryTelemetryData = {
 	readonly flags: number;
+	readonly includeLatestPrereleaseAndStableVersionOnly: boolean;
 	readonly filterTypes: string[];
 	readonly sortBy: string;
 	readonly sortOrder: string;
@@ -303,6 +314,7 @@ type ExtensionsCriteria = {
 	readonly compatible: boolean;
 	readonly includePreRelease: boolean | (IExtensionIdentifier & { includePreRelease: boolean })[];
 	readonly versions?: (IExtensionIdentifier & { version: string })[];
+	readonly isQueryForReleaseVersionFromPreReleaseVersion?: boolean;
 };
 
 const enum VersionKind {
@@ -381,7 +393,8 @@ class Query {
 			sortOrder: String(this.sortOrder),
 			pageNumber: String(this.pageNumber),
 			source: this.state.source,
-			searchTextLength: this.searchText.length
+			searchTextLength: this.searchText.length,
+			includeLatestPrereleaseAndStableVersionOnly: !!(this.state.flags & Flags.IncludeLatestPrereleaseAndStableVersionOnly)
 		};
 	}
 }
@@ -611,7 +624,7 @@ interface IRawExtensionsControlManifest {
 	extensionsEnabledWithPreRelease?: string[];
 }
 
-abstract class AbstractExtensionGalleryService implements IExtensionGalleryService {
+export abstract class AbstractExtensionGalleryService implements IExtensionGalleryService {
 
 	declare readonly _serviceBrand: undefined;
 
@@ -624,6 +637,7 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 
 	constructor(
 		storageService: IStorageService | undefined,
+		private readonly assignmentService: IAssignmentService | undefined,
 		@IRequestService private readonly requestService: IRequestService,
 		@ILogService private readonly logService: ILogService,
 		@IEnvironmentService private readonly environmentService: IEnvironmentService,
@@ -669,7 +683,7 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 		const useResourceApi = options.preferResourceApi && (this.configurationService.getValue(UseUnpkgResourceApiConfigKey) ?? false);
 		const result = useResourceApi
 			? await this.getExtensionsUsingResourceApi(extensionInfos, options, token)
-			: await this.doGetExtensions(extensionInfos, options, token);
+			: await this.getExtensionsUsingQueryApi(extensionInfos, options, token);
 
 		const uuids = result.map(r => r.identifier.uuid);
 		const extensionInfosByName: IExtensionInfo[] = [];
@@ -691,29 +705,32 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 					count: extensionInfosByName.length
 				});
 
-			const extensions = await this.doGetExtensions(extensionInfosByName, options, token);
+			const extensions = await this.getExtensionsUsingQueryApi(extensionInfosByName, options, token);
 			result.push(...extensions);
 		}
 
 		return result;
 	}
 
-	private async doGetExtensions(extensionInfos: ReadonlyArray<IExtensionInfo>, options: IExtensionQueryOptions, token: CancellationToken): Promise<IGalleryExtension[]> {
-		const names: string[] = []; const ids: string[] = [], includePreReleases: (IExtensionIdentifier & { includePreRelease: boolean })[] = [], versions: (IExtensionIdentifier & { version: string })[] = [];
+	private async getExtensionsUsingQueryApi(extensionInfos: ReadonlyArray<IExtensionInfo>, options: IExtensionQueryOptions, token: CancellationToken): Promise<IGalleryExtension[]> {
+		const names: string[] = [],
+			ids: string[] = [],
+			includePreRelease: (IExtensionIdentifier & { includePreRelease: boolean })[] = [],
+			versions: (IExtensionIdentifier & { version: string })[] = [];
 		let isQueryForReleaseVersionFromPreReleaseVersion = true;
+
 		for (const extensionInfo of extensionInfos) {
 			if (extensionInfo.uuid) {
 				ids.push(extensionInfo.uuid);
 			} else {
 				names.push(extensionInfo.id);
 			}
-			// Set includePreRelease to true if version is set, because the version can be a pre-release version
-			const includePreRelease = !!(extensionInfo.version || extensionInfo.preRelease);
-			includePreReleases.push({ id: extensionInfo.id, uuid: extensionInfo.uuid, includePreRelease });
 			if (extensionInfo.version) {
 				versions.push({ id: extensionInfo.id, uuid: extensionInfo.uuid, version: extensionInfo.version });
+			} else {
+				includePreRelease.push({ id: extensionInfo.id, uuid: extensionInfo.uuid, includePreRelease: !!extensionInfo.preRelease });
 			}
-			isQueryForReleaseVersionFromPreReleaseVersion = isQueryForReleaseVersionFromPreReleaseVersion && (!!extensionInfo.hasPreRelease && !includePreRelease);
+			isQueryForReleaseVersionFromPreReleaseVersion = isQueryForReleaseVersionFromPreReleaseVersion && (!!extensionInfo.hasPreRelease && !extensionInfo.preRelease);
 		}
 
 		if (!ids.length && !names.length) {
@@ -727,17 +744,29 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 		if (names.length) {
 			query = query.withFilter(FilterType.ExtensionName, ...names);
 		}
-		if (options.queryAllVersions || isQueryForReleaseVersionFromPreReleaseVersion /* Inlcude all versions if every requested extension is for release version and has pre-release version  */) {
+		if (options.queryAllVersions) {
 			query = query.withFlags(query.flags, Flags.IncludeVersions);
 		}
 		if (options.source) {
 			query = query.withSource(options.source);
 		}
 
-		const { extensions } = await this.queryGalleryExtensions(query, { targetPlatform: options.targetPlatform ?? CURRENT_TARGET_PLATFORM, includePreRelease: includePreReleases, versions, compatible: !!options.compatible, productVersion: options.productVersion ?? { version: this.productService.version, date: this.productService.date } }, token);
+		const { extensions } = await this.queryGalleryExtensions(
+			query,
+			{
+				targetPlatform: options.targetPlatform ?? CURRENT_TARGET_PLATFORM,
+				includePreRelease,
+				versions,
+				compatible: !!options.compatible,
+				productVersion: options.productVersion ?? { version: this.productService.version, date: this.productService.date },
+				isQueryForReleaseVersionFromPreReleaseVersion
+			},
+			token);
+
 		if (options.source) {
 			extensions.forEach((e, index) => setTelemetry(e, index, options.source));
 		}
+
 		return extensions;
 	}
 
@@ -812,7 +841,7 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 			}
 		}));
 
-		const extensions = await this.doGetExtensions(toQuery, options, token);
+		const extensions = await this.getExtensionsUsingQueryApi(toQuery, options, token);
 		result.push(...extensions);
 
 		return result;
@@ -828,12 +857,18 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 		if (this.allowedExtensionsService.isAllowed({ id: extension.identifier.id, publisherDisplayName: extension.publisherDisplayName }) !== true) {
 			return null;
 		}
-		const query = new Query()
-			.withFlags(Flags.IncludeVersions)
-			.withPage(1, 1)
-			.withFilter(FilterType.ExtensionId, extension.identifier.uuid);
-		const { extensions } = await this.queryGalleryExtensions(query, { targetPlatform, compatible: true, includePreRelease, productVersion }, CancellationToken.None);
-		return extensions[0] || null;
+		const result = await this.getExtensions([{
+			...extension.identifier,
+			preRelease: includePreRelease,
+			hasPreRelease: extension.hasPreReleaseVersion,
+		}], {
+			compatible: true,
+			productVersion,
+			queryAllVersions: true,
+			targetPlatform,
+		}, CancellationToken.None);
+
+		return result[0] ?? null;
 	}
 
 	async isExtensionCompatible(extension: IGalleryExtension, includePreRelease: boolean, targetPlatform: TargetPlatform, productVersion: IProductVersion = { version: this.productService.version, date: this.productService.date }): Promise<boolean> {
@@ -993,6 +1028,17 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 	}
 
 	private async queryGalleryExtensions(query: Query, criteria: ExtensionsCriteria, token: CancellationToken): Promise<{ extensions: IGalleryExtension[]; total: number }> {
+		if (
+			this.productService.quality !== 'stable'
+			&& (await this.assignmentService?.getTreatment<boolean>('useLatestPrereleaseAndStableVersionFlag'))
+		) {
+			return this.queryGalleryExtensionsUsingIncludeLatestPrereleaseAndStableVersionFlag(query, criteria, token);
+		}
+
+		return this.queryGalleryExtensionsWithAllVersionsAsFallback(query, criteria, token);
+	}
+
+	private async queryGalleryExtensionsWithAllVersionsAsFallback(query: Query, criteria: ExtensionsCriteria, token: CancellationToken): Promise<{ extensions: IGalleryExtension[]; total: number }> {
 		const flags = query.flags;
 
 		/**
@@ -1010,9 +1056,9 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 		}
 
 		/**
-		 * If versions criteria exist, then remove IncludeLatestVersionOnly flag and add IncludeVersions flag.
+		 * If versions criteria exist or every requested extension is for release version and has a pre-release version, then remove latest flags and add all versions flag.
 		 */
-		if (criteria.versions?.length) {
+		if (criteria.versions?.length || criteria.isQueryForReleaseVersionFromPreReleaseVersion) {
 			query = query.withFlags(query.flags & ~Flags.IncludeLatestVersionOnly, Flags.IncludeVersions);
 		}
 
@@ -1116,6 +1162,72 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 		return { extensions: result.sort((a, b) => a[0] - b[0]).map(([, extension]) => extension), total };
 	}
 
+	private async queryGalleryExtensionsUsingIncludeLatestPrereleaseAndStableVersionFlag(query: Query, criteria: ExtensionsCriteria, token: CancellationToken): Promise<{ extensions: IGalleryExtension[]; total: number }> {
+
+		/**
+		 * If versions criteria exist, then remove latest flags and add all versions flag.
+		*/
+		if (criteria.versions?.length) {
+			query = query.withFlags(query.flags & ~Flags.IncludeLatestVersionOnly & ~Flags.IncludeLatestPrereleaseAndStableVersionOnly, Flags.IncludeVersions);
+		}
+
+		/**
+		 * If the query does not specify all versions flag, handle latest versions.
+		 */
+		else if (!(query.flags & Flags.IncludeVersions)) {
+			const includeLatest = isBoolean(criteria.includePreRelease) ? criteria.includePreRelease : criteria.includePreRelease.every(({ includePreRelease }) => includePreRelease);
+			query = includeLatest ? query.withFlags(query.flags & ~Flags.IncludeLatestPrereleaseAndStableVersionOnly, Flags.IncludeLatestVersionOnly) : query.withFlags(query.flags & ~Flags.IncludeLatestVersionOnly, Flags.IncludeLatestPrereleaseAndStableVersionOnly);
+		}
+
+		/**
+		 * If all versions flag is set, remove latest flags.
+		 */
+		if (!!(query.flags & Flags.IncludeVersions) && (!!(query.flags & Flags.IncludeLatestVersionOnly) || !!(query.flags & Flags.IncludeLatestPrereleaseAndStableVersionOnly))) {
+			query = query.withFlags(query.flags & ~Flags.IncludeLatestVersionOnly & ~Flags.IncludeLatestPrereleaseAndStableVersionOnly, Flags.IncludeVersions);
+		}
+
+		/**
+		 * Add necessary extension flags
+		 */
+		query = query.withFlags(query.flags, Flags.IncludeAssetUri, Flags.IncludeCategoryAndTags, Flags.IncludeFiles, Flags.IncludeStatistics, Flags.IncludeVersionProperties);
+		const { galleryExtensions: rawGalleryExtensions, total, context } = await this.queryRawGalleryExtensions(query, token);
+
+		const extensions: IGalleryExtension[] = [];
+		for (let index = 0; index < rawGalleryExtensions.length; index++) {
+			const rawGalleryExtension = rawGalleryExtensions[index];
+			const extensionIdentifier = { id: getGalleryExtensionId(rawGalleryExtension.publisher.publisherName, rawGalleryExtension.extensionName), uuid: rawGalleryExtension.extensionId };
+			const allTargetPlatforms = getAllTargetPlatforms(rawGalleryExtension);
+			if (criteria.compatible) {
+				// Skip looking for all versions if requested for a web-compatible extension and it is not a web extension.
+				if (isNotWebExtensionInWebTargetPlatform(allTargetPlatforms, criteria.targetPlatform)) {
+					continue;
+				}
+				// Skip looking for all versions if the extension is not allowed.
+				if (this.allowedExtensionsService.isAllowed({ id: extensionIdentifier.id, publisherDisplayName: rawGalleryExtension.publisher.displayName }) !== true) {
+					continue;
+				}
+			}
+
+			const version = criteria.versions?.find(extensionIdentifierWithVersion => areSameExtensions(extensionIdentifierWithVersion, extensionIdentifier))?.version
+				?? ((isBoolean(criteria.includePreRelease) ? criteria.includePreRelease : !!criteria.includePreRelease.find(extensionIdentifierWithPreRelease => areSameExtensions(extensionIdentifierWithPreRelease, extensionIdentifier))?.includePreRelease) ? VersionKind.Latest : VersionKind.Release);
+			const rawGalleryExtensionVersion = await this.getRawGalleryExtensionVersion(
+				rawGalleryExtension,
+				{
+					compatible: criteria.compatible,
+					targetPlatform: criteria.targetPlatform,
+					productVersion: criteria.productVersion,
+					version
+				},
+				allTargetPlatforms
+			);
+			if (rawGalleryExtensionVersion) {
+				extensions.push(toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms, context));
+			}
+		}
+
+		return { extensions, total };
+	}
+
 	private async getRawGalleryExtensionVersion(rawGalleryExtension: IRawGalleryExtension, criteria: ExtensionVersionCriteria, allTargetPlatforms: TargetPlatform[]): Promise<IRawGalleryExtensionVersion | null> {
 		const extensionIdentifier = { id: getGalleryExtensionId(rawGalleryExtension.publisher.publisherName, rawGalleryExtension.extensionName), uuid: rawGalleryExtension.extensionId };
 		const rawGalleryExtensionVersions = sortExtensionVersions(rawGalleryExtension.versions, criteria.targetPlatform);
@@ -1639,7 +1751,7 @@ export class ExtensionGalleryService extends AbstractExtensionGalleryService {
 		@IConfigurationService configurationService: IConfigurationService,
 		@IAllowedExtensionsService allowedExtensionsService: IAllowedExtensionsService,
 	) {
-		super(storageService, requestService, logService, environmentService, telemetryService, fileService, productService, configurationService, allowedExtensionsService);
+		super(storageService, undefined, requestService, logService, environmentService, telemetryService, fileService, productService, configurationService, allowedExtensionsService);
 	}
 }
 
@@ -1655,6 +1767,6 @@ export class ExtensionGalleryServiceWithNoStorageService extends AbstractExtensi
 		@IConfigurationService configurationService: IConfigurationService,
 		@IAllowedExtensionsService allowedExtensionsService: IAllowedExtensionsService,
 	) {
-		super(undefined, requestService, logService, environmentService, telemetryService, fileService, productService, configurationService, allowedExtensionsService);
+		super(undefined, undefined, requestService, logService, environmentService, telemetryService, fileService, productService, configurationService, allowedExtensionsService);
 	}
 }
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionGalleryService.ts b/src/vs/workbench/services/extensionManagement/common/extensionGalleryService.ts
new file mode 100644
index 000000000000..6e28af1478f4
--- /dev/null
+++ b/src/vs/workbench/services/extensionManagement/common/extensionGalleryService.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 { IAllowedExtensionsService, IExtensionGalleryService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IRequestService } from '../../../../platform/request/common/request.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { AbstractExtensionGalleryService } from '../../../../platform/extensionManagement/common/extensionGalleryService.js';
+import { IWorkbenchAssignmentService } from '../../assignment/common/assignmentService.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+
+export class WorkbenchExtensionGalleryService extends AbstractExtensionGalleryService {
+	constructor(
+		@IStorageService storageService: IStorageService,
+		@IWorkbenchAssignmentService assignmentService: IWorkbenchAssignmentService,
+		@IRequestService requestService: IRequestService,
+		@ILogService logService: ILogService,
+		@IEnvironmentService environmentService: IEnvironmentService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IFileService fileService: IFileService,
+		@IProductService productService: IProductService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IAllowedExtensionsService allowedExtensionsService: IAllowedExtensionsService,
+	) {
+		super(storageService, assignmentService, requestService, logService, environmentService, telemetryService, fileService, productService, configurationService, allowedExtensionsService);
+	}
+}
+
+registerSingleton(IExtensionGalleryService, WorkbenchExtensionGalleryService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts
index f43004533d7a..11dc5c60d036 100644
--- a/src/vs/workbench/workbench.common.main.ts
+++ b/src/vs/workbench/workbench.common.main.ts
@@ -82,6 +82,7 @@ import './services/commands/common/commandService.js';
 import './services/themes/browser/workbenchThemeService.js';
 import './services/label/common/labelService.js';
 import './services/extensions/common/extensionManifestPropertiesService.js';
+import './services/extensionManagement/common/extensionGalleryService.js';
 import './services/extensionManagement/browser/extensionEnablementService.js';
 import './services/extensionManagement/browser/builtinExtensionsScannerService.js';
 import './services/extensionRecommendations/common/extensionIgnoredRecommendationsService.js';
@@ -122,9 +123,8 @@ import './services/editor/browser/editorPaneService.js';
 import './services/editor/common/customEditorLabelService.js';
 
 import { InstantiationType, registerSingleton } from '../platform/instantiation/common/extensions.js';
-import { ExtensionGalleryService } from '../platform/extensionManagement/common/extensionGalleryService.js';
 import { GlobalExtensionEnablementService } from '../platform/extensionManagement/common/extensionEnablementService.js';
-import { IAllowedExtensionsService, IExtensionGalleryService, IGlobalExtensionEnablementService } from '../platform/extensionManagement/common/extensionManagement.js';
+import { IAllowedExtensionsService, IGlobalExtensionEnablementService } from '../platform/extensionManagement/common/extensionManagement.js';
 import { ContextViewService } from '../platform/contextview/browser/contextViewService.js';
 import { IContextViewService } from '../platform/contextview/browser/contextView.js';
 import { IListService, ListService } from '../platform/list/browser/listService.js';
@@ -152,7 +152,6 @@ registerSingleton(IAllowedExtensionsService, AllowedExtensionsService, Instantia
 registerSingleton(IIgnoredExtensionsManagementService, IgnoredExtensionsManagementService, InstantiationType.Delayed);
 registerSingleton(IGlobalExtensionEnablementService, GlobalExtensionEnablementService, InstantiationType.Delayed);
 registerSingleton(IExtensionStorageService, ExtensionStorageService, InstantiationType.Delayed);
-registerSingleton(IExtensionGalleryService, ExtensionGalleryService, 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 */);

From f38950794551e65283f7070c53c4a9804ca4346b Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 10 Mar 2025 16:35:29 +0100
Subject: [PATCH 0735/1815] rename `window.titleControlsStyle` to
 `window.controlsStyle` (#243085)

---
 .../quickinput/browser/quickInputController.ts |  8 ++++----
 src/vs/platform/window/common/window.ts        | 18 +++++++++---------
 .../browser/parts/titlebar/titlebarPart.ts     |  4 ++--
 src/vs/workbench/common/theme.ts               |  4 ++--
 .../contrib/debug/browser/debugToolBar.ts      |  8 ++++----
 .../browser/relauncher.contribution.ts         |  8 ++++----
 .../electron-sandbox/desktop.contribution.ts   |  4 ++--
 7 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/vs/platform/quickinput/browser/quickInputController.ts b/src/vs/platform/quickinput/browser/quickInputController.ts
index a4c55b213e67..f4de62bbabce 100644
--- a/src/vs/platform/quickinput/browser/quickInputController.ts
+++ b/src/vs/platform/quickinput/browser/quickInputController.ts
@@ -31,7 +31,7 @@ import { StandardMouseEvent } from '../../../base/browser/mouseEvent.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
 import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { Platform, platform } from '../../../base/common/platform.js';
-import { getTitleControlsStyle, TitleControlsStyle } from '../../window/common/window.js';
+import { getWindowControlsStyle, WindowControlsStyle } from '../../window/common/window.js';
 import { getZoomFactor } from '../../../base/browser/browser.js';
 
 const $ = dom.$;
@@ -923,12 +923,12 @@ class QuickInputDragAndDropController extends Disposable {
 		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		super();
-		const customTitleControls = getTitleControlsStyle(this.configurationService) === TitleControlsStyle.CUSTOM;
+		const customWindowControls = getWindowControlsStyle(this.configurationService) === WindowControlsStyle.CUSTOM;
 
 		// Do not allow the widget to overflow or underflow window controls.
 		// Use CSS calculations to avoid having to force layout with `.clientWidth`
-		this._controlsOnLeft = customTitleControls && platform === Platform.Mac;
-		this._controlsOnRight = customTitleControls && (platform === Platform.Windows || platform === Platform.Linux);
+		this._controlsOnLeft = customWindowControls && platform === Platform.Mac;
+		this._controlsOnRight = customWindowControls && (platform === Platform.Windows || platform === Platform.Linux);
 		this._registerLayoutListener();
 		this.registerMouseListeners();
 		this.dndViewState.set({ ...initialViewState, done: true }, undefined);
diff --git a/src/vs/platform/window/common/window.ts b/src/vs/platform/window/common/window.ts
index 7756aea58fc0..ddf6d46f7db6 100644
--- a/src/vs/platform/window/common/window.ts
+++ b/src/vs/platform/window/common/window.ts
@@ -152,7 +152,7 @@ export interface IWindowSettings {
 	readonly restoreFullscreen: boolean;
 	readonly zoomLevel: number;
 	readonly titleBarStyle: TitlebarStyle;
-	readonly titleControlsStyle: TitleControlsStyle;
+	readonly controlsStyle: WindowControlsStyle;
 	readonly autoDetectHighContrast: boolean;
 	readonly autoDetectColorScheme: boolean;
 	readonly menuBarVisibility: MenuBarVisibility;
@@ -180,7 +180,7 @@ export const enum TitlebarStyle {
 	CUSTOM = 'custom',
 }
 
-export const enum TitleControlsStyle {
+export const enum WindowControlsStyle {
 	NATIVE = 'native',
 	CUSTOM = 'custom',
 	HIDDEN = 'hidden'
@@ -232,18 +232,18 @@ export function getTitleBarStyle(configurationService: IConfigurationService): T
 	return TitlebarStyle.CUSTOM; // default to custom on all OS
 }
 
-export function getTitleControlsStyle(configurationService: IConfigurationService): TitleControlsStyle {
+export function getWindowControlsStyle(configurationService: IConfigurationService): WindowControlsStyle {
 	if (isWeb || isMacintosh || getTitleBarStyle(configurationService) === TitlebarStyle.NATIVE) {
-		return TitleControlsStyle.NATIVE; // only supported on Windows/Linux desktop with custom titlebar
+		return WindowControlsStyle.NATIVE; // only supported on Windows/Linux desktop with custom titlebar
 	}
 
 	const configuration = configurationService.getValue<IWindowSettings | undefined>('window');
-	const style = configuration?.titleControlsStyle;
-	if (style === TitleControlsStyle.CUSTOM || style === TitleControlsStyle.HIDDEN) {
+	const style = configuration?.controlsStyle;
+	if (style === WindowControlsStyle.CUSTOM || style === WindowControlsStyle.HIDDEN) {
 		return style;
 	}
 
-	return TitleControlsStyle.NATIVE; // default to native on all OS
+	return WindowControlsStyle.NATIVE; // default to native on all OS
 }
 
 export const DEFAULT_CUSTOM_TITLEBAR_HEIGHT = 35; // includes space for command center
@@ -258,8 +258,8 @@ export function useWindowControlsOverlay(configurationService: IConfigurationSer
 	}
 
 	if (!isMacintosh) {
-		const setting = getTitleControlsStyle(configurationService);
-		if (setting === TitleControlsStyle.CUSTOM || setting === TitleControlsStyle.HIDDEN) {
+		const setting = getWindowControlsStyle(configurationService);
+		if (setting === WindowControlsStyle.CUSTOM || setting === WindowControlsStyle.HIDDEN) {
 			return false; // explicitly disabled by choice
 		}
 	}
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 112527794576..3eb043309444 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -8,7 +8,7 @@ import { localize, localize2 } from '../../../../nls.js';
 import { MultiWindowParts, Part } from '../../part.js';
 import { ITitleService } from '../../../services/title/browser/titleService.js';
 import { getWCOTitlebarAreaRect, getZoomFactor, isWCOEnabled } from '../../../../base/browser/browser.js';
-import { MenuBarVisibility, getTitleBarStyle, getMenuBarVisibility, hasCustomTitlebar, hasNativeTitlebar, DEFAULT_CUSTOM_TITLEBAR_HEIGHT, getTitleControlsStyle, TitleControlsStyle } from '../../../../platform/window/common/window.js';
+import { MenuBarVisibility, getTitleBarStyle, getMenuBarVisibility, hasCustomTitlebar, hasNativeTitlebar, DEFAULT_CUSTOM_TITLEBAR_HEIGHT, getWindowControlsStyle, WindowControlsStyle } from '../../../../platform/window/common/window.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { IConfigurationService, IConfigurationChangeEvent } from '../../../../platform/configuration/common/configuration.js';
@@ -484,7 +484,7 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 				// for something, except for web where a custom menu being supported). not putting the
 				// container helps with allowing to move the window when clicking very close to the
 				// window control buttons.
-			} else if (getTitleControlsStyle(this.configurationService) === TitleControlsStyle.HIDDEN) {
+			} else if (getWindowControlsStyle(this.configurationService) === WindowControlsStyle.HIDDEN) {
 				// Linux/Windows: controls are explicitly disabled
 			} else {
 				this.windowControlsContainer = append(primaryWindowControlsLocation === 'left' ? this.leftContent : this.rightContent, $('div.window-controls-container'));
diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
index 69756aafa366..52e7ba54e435 100644
--- a/src/vs/workbench/common/theme.ts
+++ b/src/vs/workbench/common/theme.ts
@@ -801,11 +801,11 @@ export const WINDOW_ACTIVE_BORDER = registerColor('window.activeBorder', {
 	light: null,
 	hcDark: contrastBorder,
 	hcLight: contrastBorder
-}, localize('windowActiveBorder', "The color used for the border of the window when it is active on macOS or Linux. Requires custom title bar style and custom or hidden title controls on Linux."));
+}, localize('windowActiveBorder', "The color used for the border of the window when it is active on macOS or Linux. Requires custom title bar style and custom or hidden window controls on Linux."));
 
 export const WINDOW_INACTIVE_BORDER = registerColor('window.inactiveBorder', {
 	dark: null,
 	light: null,
 	hcDark: contrastBorder,
 	hcLight: contrastBorder
-}, localize('windowInactiveBorder', "The color used for the border of the window when it is inactive on macOS or Linux. Requires custom title bar style and custom or hidden title controls on Linux."));
+}, localize('windowInactiveBorder', "The color used for the border of the window when it is inactive on macOS or Linux. Requires custom title bar style and custom or hidden window controls on Linux."));
diff --git a/src/vs/workbench/contrib/debug/browser/debugToolBar.ts b/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
index a374adcb598c..b9ea3a411785 100644
--- a/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugToolBar.ts
@@ -32,7 +32,7 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../platfo
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { widgetBorder, widgetShadow } from '../../../../platform/theme/common/colorRegistry.js';
 import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
-import { getTitleControlsStyle, TitleControlsStyle } from '../../../../platform/window/common/window.js';
+import { getWindowControlsStyle, WindowControlsStyle } from '../../../../platform/window/common/window.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { EditorTabsMode, IWorkbenchLayoutService, LayoutSettings, Parts } from '../../../services/layout/browser/layoutService.js';
 import { CONTEXT_DEBUG_STATE, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_IN_DEBUG_MODE, CONTEXT_MULTI_SESSION_DEBUG, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, IDebugConfiguration, IDebugService, State, VIEWLET_ID } from '../common/debug.js';
@@ -80,12 +80,12 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
 		this.$el = dom.$('div.debug-toolbar');
 
 		// Note: changes to this setting require a restart, so no need to listen to it.
-		const customTitleControls = getTitleControlsStyle(this.configurationService) === TitleControlsStyle.CUSTOM;
+		const customWindowControls = getWindowControlsStyle(this.configurationService) === WindowControlsStyle.CUSTOM;
 
 		// Do not allow the widget to overflow or underflow window controls.
 		// Use CSS calculations to avoid having to force layout with `.clientWidth`
-		const controlsOnLeft = customTitleControls && platform === Platform.Mac;
-		const controlsOnRight = customTitleControls && (platform === Platform.Windows || platform === Platform.Linux);
+		const controlsOnLeft = customWindowControls && platform === Platform.Mac;
+		const controlsOnRight = customWindowControls && (platform === Platform.Windows || platform === Platform.Linux);
 		this.$el.style.transform = `translate(
 			min(
 				max(${controlsOnLeft ? '60px' : '0px'}, calc(-50% + (100vw * var(--x-position)))),
diff --git a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
index 0ef403d13606..e5b909b90e7b 100644
--- a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
+++ b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
@@ -41,7 +41,7 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 		'window.nativeTabs',
 		'window.nativeFullScreen',
 		'window.clickThroughInactive',
-		'window.titleControlsStyle',
+		'window.controlsStyle',
 		'update.mode',
 		'editor.accessibilitySupport',
 		'security.workspace.trust.enabled',
@@ -55,7 +55,7 @@ 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 titleControlsStyle = new ChangeObserver('string');
+	private readonly controlsStyle = new ChangeObserver('string');
 	private readonly updateMode = new ChangeObserver('string');
 	private accessibilitySupport: 'on' | 'off' | 'auto' | undefined;
 	private readonly workspaceTrustEnabled = new ChangeObserver('boolean');
@@ -119,8 +119,8 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 			// macOS: Click through (accept first mouse)
 			processChanged(isMacintosh && this.clickThroughInactive.handleChange(config.window?.clickThroughInactive));
 
-			// Windows/Linux: Title controls style
-			processChanged(!isMacintosh && this.titleControlsStyle.handleChange(config.window?.titleControlsStyle));
+			// Windows/Linux: Window controls style
+			processChanged(!isMacintosh && this.controlsStyle.handleChange(config.window?.controlsStyle));
 
 			// Update mode
 			processChanged(this.updateMode.handleChange(config.update?.mode));
diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
index 5e45beb11ea3..ba3850853bec 100644
--- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts
+++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
@@ -236,13 +236,13 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s
 				'scope': ConfigurationScope.APPLICATION,
 				'description': localize('titleBarStyle', "Adjust the appearance of the window title bar to be native by the OS or custom. On Linux and Windows, this setting also affects the application and context menu appearances. Changes require a full restart to apply."),
 			},
-			'window.titleControlsStyle': {
+			'window.controlsStyle': {
 				'type': 'string',
 				'enum': ['native', 'custom', 'hidden'],
 				'default': 'native',
 				'included': !isMacintosh,
 				'scope': ConfigurationScope.APPLICATION,
-				'description': localize('titleControlsStyle', "Adjust the appearance of the window controls to be native by the OS, custom drawn or hidden. Changes require a full restart to apply."),
+				'description': localize('controlsStyle', "Adjust the appearance of the window controls to be native by the OS, custom drawn or hidden. Changes require a full restart to apply."),
 			},
 			'window.customTitleBarVisibility': {
 				'type': 'string',

From 3ea047c09e86b75b33ea8c84a351efd7d3899558 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 10 Mar 2025 16:39:41 +0100
Subject: [PATCH 0736/1815] fix #241002 (#242880)

---
 .../contrib/extensions/browser/extensions.contribution.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index 68e1762d67e7..f66033a1ca1a 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -905,7 +905,8 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 				if (requireReload) {
 					notificationService.prompt(
 						Severity.Info,
-						localize('InstallVSIXAction.successReload', "Completed installing extension from VSIX. Please reload Visual Studio Code to enable it."),
+						vsixs.length > 1 ? localize('InstallVSIXs.successReload', "Completed installing extensions. Please reload Visual Studio Code to enable them.")
+							: localize('InstallVSIXAction.successReload', "Completed installing extension. Please reload Visual Studio Code to enable it."),
 						[{
 							label: localize('InstallVSIXAction.reloadNow', "Reload Now"),
 							run: () => hostService.reload()
@@ -915,7 +916,8 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 				else if (requireRestart) {
 					notificationService.prompt(
 						Severity.Info,
-						localize('InstallVSIXAction.successRestart', "Completed installing extension from VSIX. Please restart extensions to enable it."),
+						vsixs.length > 1 ? localize('InstallVSIXs.successRestart', "Completed installing extensions. Please restart extensions to enable them.")
+							: localize('InstallVSIXAction.successRestart', "Completed installing extension. Please restart extensions to enable it."),
 						[{
 							label: localize('InstallVSIXAction.restartExtensions', "Restart Extensions"),
 							run: () => extensionsWorkbenchService.updateRunningExtensions()
@@ -925,7 +927,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 				else {
 					notificationService.prompt(
 						Severity.Info,
-						localize('InstallVSIXAction.successNoReload', "Completed installing extension."),
+						vsixs.length > 1 ? localize('InstallVSIXs.successNoReload', "Completed installing extensions.") : localize('InstallVSIXAction.successNoReload', "Completed installing extension."),
 						[]
 					);
 				}

From 35372a92050561499d3ce632d14fa90c760a0f4c Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Mon, 10 Mar 2025 09:12:56 -0700
Subject: [PATCH 0737/1815] refactor: remove working set from chat editing
 session (#243087)

---
 .../chat/browser/chatEditing/chatEditingSession.ts    | 11 -----------
 .../contrib/chat/common/chatEditingService.ts         |  5 -----
 2 files changed, 16 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 3833dd6dfe03..714f256b7bea 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -141,17 +141,6 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 	}
 
 	private _workingSet = new ResourceMap<WorkingSetDisplayMetadata>();
-	get workingSet() {
-		this._assertNotDisposed();
-
-		// Return here a reunion between the AI modified entries and the user built working set
-		const result = new ResourceMap<WorkingSetDisplayMetadata>(this._workingSet);
-		for (const entry of this._entriesObs.get()) {
-			result.set(entry.modifiedURI, { state: entry.state.get() });
-		}
-
-		return result;
-	}
 
 	private _editorPane: MultiDiffEditor | undefined;
 
diff --git a/src/vs/workbench/contrib/chat/common/chatEditingService.ts b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
index 11fd17579962..0de480c9d886 100644
--- a/src/vs/workbench/contrib/chat/common/chatEditingService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
@@ -6,7 +6,6 @@
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Event } from '../../../../base/common/event.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
-import { ResourceMap } from '../../../../base/common/map.js';
 import { IObservable, IReader, ITransaction } from '../../../../base/common/observable.js';
 import { URI } from '../../../../base/common/uri.js';
 import { TextEdit } from '../../../../editor/common/languages.js';
@@ -87,10 +86,6 @@ export interface IChatEditingSession extends IDisposable {
 	readonly onDidDispose: Event<void>;
 	readonly state: IObservable<ChatEditingSessionState>;
 	readonly entries: IObservable<readonly IModifiedFileEntry[]>;
-	/**
-	 * @deprecated
-	 */
-	readonly workingSet: ResourceMap<WorkingSetDisplayMetadata>;
 	show(): Promise<void>;
 	remove(reason: WorkingSetEntryRemovalReason, ...uris: URI[]): void;
 	accept(...uris: URI[]): Promise<void>;

From 1e271e0428a2776af50b41b8876e7284204809d8 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Mon, 10 Mar 2025 17:45:37 +0100
Subject: [PATCH 0738/1815] Adopt initialisation order changes (#243090)

Adopt initialisation order changes (#243049)
---
 build/lib/propertyInitOrderChecker.js                | 12 ------------
 build/lib/propertyInitOrderChecker.ts                | 12 ------------
 .../browser/widget/codeEditor/codeEditorWidget.ts    | 12 ++++++++----
 .../contrib/colorPicker/browser/colorDetector.ts     |  8 +++++---
 .../contrib/multicursor/browser/multicursor.ts       |  3 ++-
 .../contrib/sectionHeaders/browser/sectionHeaders.ts |  5 +++--
 .../editor/contrib/zoneWidget/browser/zoneWidget.ts  |  6 ++++--
 src/vs/server/node/remoteExtensionHostAgentServer.ts |  3 ++-
 .../debug/browser/callStackEditorContribution.ts     |  5 +++--
 .../contrib/debug/browser/debugEditorContribution.ts |  5 +++--
 src/vs/workbench/contrib/debug/browser/debugHover.ts |  4 +++-
 .../browser/keybindingsEditorContribution.ts         |  4 +++-
 .../preferences/browser/preferencesRenderers.ts      |  3 ++-
 .../preferences/browser/preferencesWidgets.ts        |  4 +++-
 14 files changed, 41 insertions(+), 45 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index 0d48106f93ca..14c0e2cbd6c3 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -87,10 +87,8 @@ const ignored = new Set([
     'vs/workbench/contrib/debug/common/debugStorage.ts',
     'vs/workbench/contrib/debug/common/debugModel.ts',
     'vs/workbench/api/common/extHostCommands.ts',
-    'vs/server/node/remoteExtensionHostAgentServer.ts',
     'vs/editor/browser/view/viewLayer.ts',
     'vs/editor/browser/controller/editContext/textArea/textAreaEditContextInput.ts',
-    'vs/editor/browser/widget/codeEditor/codeEditorWidget.ts',
     'vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts',
     'vs/editor/browser/widget/diffEditor/utils.ts',
     'vs/editor/browser/observableCodeEditor.ts',
@@ -103,12 +101,10 @@ const ignored = new Set([
     'vs/editor/browser/widget/diffEditor/features/gutterFeature.ts',
     'vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.ts',
     'vs/editor/browser/widget/diffEditor/diffEditorWidget.ts',
-    'vs/editor/contrib/colorPicker/browser/colorDetector.ts',
     'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts',
     'vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdapter.ts',
     'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts',
     'vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts',
-    'vs/editor/contrib/zoneWidget/browser/zoneWidget.ts',
     'vs/editor/contrib/inlayHints/browser/inlayHintsController.ts',
     'vs/editor/contrib/inlineCompletions/browser/model/changeRecorder.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts',
@@ -128,9 +124,7 @@ const ignored = new Set([
     'vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts',
     'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts',
     'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts',
-    'vs/editor/contrib/multicursor/browser/multicursor.ts',
     'vs/editor/contrib/placeholderText/browser/placeholderTextContribution.ts',
-    'vs/editor/contrib/sectionHeaders/browser/sectionHeaders.ts',
     'vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.ts',
     'vs/workbench/browser/parts/statusbar/statusbarPart.ts',
     'vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts',
@@ -176,13 +170,7 @@ const ignored = new Set([
     'vs/workbench/services/authentication/browser/authenticationExtensionsService.ts',
     'vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts',
     'vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts',
-    'vs/workbench/contrib/preferences/browser/preferencesWidgets.ts',
-    'vs/workbench/contrib/preferences/browser/preferencesRenderers.ts',
-    'vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts',
     'vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts',
-    'vs/workbench/contrib/debug/browser/callStackEditorContribution.ts',
-    'vs/workbench/contrib/debug/browser/debugHover.ts',
-    'vs/workbench/contrib/debug/browser/debugEditorContribution.ts',
     'vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts',
     'vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts',
     'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.ts',
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index c0719def6331..2c3090d8dced 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -56,10 +56,8 @@ const ignored = new Set([
 	'vs/workbench/contrib/debug/common/debugStorage.ts',
 	'vs/workbench/contrib/debug/common/debugModel.ts',
 	'vs/workbench/api/common/extHostCommands.ts',
-	'vs/server/node/remoteExtensionHostAgentServer.ts',
 	'vs/editor/browser/view/viewLayer.ts',
 	'vs/editor/browser/controller/editContext/textArea/textAreaEditContextInput.ts',
-	'vs/editor/browser/widget/codeEditor/codeEditorWidget.ts',
 	'vs/platform/accessibilitySignal/browser/accessibilitySignalService.ts',
 	'vs/editor/browser/widget/diffEditor/utils.ts',
 	'vs/editor/browser/observableCodeEditor.ts',
@@ -72,12 +70,10 @@ const ignored = new Set([
 	'vs/editor/browser/widget/diffEditor/features/gutterFeature.ts',
 	'vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.ts',
 	'vs/editor/browser/widget/diffEditor/diffEditorWidget.ts',
-	'vs/editor/contrib/colorPicker/browser/colorDetector.ts',
 	'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts',
 	'vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdapter.ts',
 	'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts',
 	'vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts',
-	'vs/editor/contrib/zoneWidget/browser/zoneWidget.ts',
 	'vs/editor/contrib/inlayHints/browser/inlayHintsController.ts',
 	'vs/editor/contrib/inlineCompletions/browser/model/changeRecorder.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts',
@@ -97,9 +93,7 @@ const ignored = new Set([
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts',
 	'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts',
 	'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts',
-	'vs/editor/contrib/multicursor/browser/multicursor.ts',
 	'vs/editor/contrib/placeholderText/browser/placeholderTextContribution.ts',
-	'vs/editor/contrib/sectionHeaders/browser/sectionHeaders.ts',
 	'vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.ts',
 	'vs/workbench/browser/parts/statusbar/statusbarPart.ts',
 	'vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts',
@@ -145,13 +139,7 @@ const ignored = new Set([
 	'vs/workbench/services/authentication/browser/authenticationExtensionsService.ts',
 	'vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.ts',
 	'vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.ts',
-	'vs/workbench/contrib/preferences/browser/preferencesWidgets.ts',
-	'vs/workbench/contrib/preferences/browser/preferencesRenderers.ts',
-	'vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts',
 	'vs/workbench/contrib/notebook/browser/services/notebookServiceImpl.ts',
-	'vs/workbench/contrib/debug/browser/callStackEditorContribution.ts',
-	'vs/workbench/contrib/debug/browser/debugHover.ts',
-	'vs/workbench/contrib/debug/browser/debugEditorContribution.ts',
 	'vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts',
 	'vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts',
 	'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.ts',
diff --git a/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
index 6875c9736450..042152e7ddea 100644
--- a/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
@@ -2027,11 +2027,11 @@ const enum BooleanEventValue {
 }
 
 export class BooleanEventEmitter extends Disposable {
-	private readonly _onDidChangeToTrue: Emitter<void> = this._register(new Emitter<void>(this._emitterOptions));
-	public readonly onDidChangeToTrue: Event<void> = this._onDidChangeToTrue.event;
+	private readonly _onDidChangeToTrue: Emitter<void>;
+	public readonly onDidChangeToTrue: Event<void>;
 
-	private readonly _onDidChangeToFalse: Emitter<void> = this._register(new Emitter<void>(this._emitterOptions));
-	public readonly onDidChangeToFalse: Event<void> = this._onDidChangeToFalse.event;
+	private readonly _onDidChangeToFalse: Emitter<void>;
+	public readonly onDidChangeToFalse: Event<void>;
 
 	private _value: BooleanEventValue;
 
@@ -2039,6 +2039,10 @@ export class BooleanEventEmitter extends Disposable {
 		private readonly _emitterOptions: EmitterOptions
 	) {
 		super();
+		this._onDidChangeToTrue = this._register(new Emitter<void>(this._emitterOptions));
+		this.onDidChangeToTrue = this._onDidChangeToTrue.event;
+		this._onDidChangeToFalse = this._register(new Emitter<void>(this._emitterOptions));
+		this.onDidChangeToFalse = this._onDidChangeToFalse.event;
 		this._value = BooleanEventValue.NotSet;
 	}
 
diff --git a/src/vs/editor/contrib/colorPicker/browser/colorDetector.ts b/src/vs/editor/contrib/colorPicker/browser/colorDetector.ts
index 3a00c1d8f96d..e6043ebbd332 100644
--- a/src/vs/editor/contrib/colorPicker/browser/colorDetector.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/colorDetector.ts
@@ -15,7 +15,7 @@ import { DynamicCssRules } from '../../../browser/editorDom.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
-import { IEditorContribution } from '../../../common/editorCommon.js';
+import { IEditorContribution, IEditorDecorationsCollection } from '../../../common/editorCommon.js';
 import { IModelDecoration, IModelDeltaDecoration } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { IFeatureDebounceInformation, ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
@@ -40,12 +40,12 @@ export class ColorDetector extends Disposable implements IEditorContribution {
 	private _decorationsIds: string[] = [];
 	private _colorDatas = new Map<string, IColorData>();
 
-	private readonly _colorDecoratorIds = this._editor.createDecorationsCollection();
+	private readonly _colorDecoratorIds: IEditorDecorationsCollection;
 
 	private _isColorDecoratorsEnabled: boolean;
 	private _defaultColorDecoratorsEnablement: 'auto' | 'always' | 'never';
 
-	private readonly _ruleFactory = new DynamicCssRules(this._editor);
+	private readonly _ruleFactory: DynamicCssRules;
 
 	private readonly _decoratorLimitReporter = new DecoratorLimitReporter();
 
@@ -56,6 +56,8 @@ export class ColorDetector extends Disposable implements IEditorContribution {
 		@ILanguageFeatureDebounceService languageFeatureDebounceService: ILanguageFeatureDebounceService,
 	) {
 		super();
+		this._colorDecoratorIds = this._editor.createDecorationsCollection();
+		this._ruleFactory = new DynamicCssRules(this._editor);
 		this._debounceInformation = languageFeatureDebounceService.for(_languageFeaturesService.colorProvider, 'Document Colors', { min: ColorDetector.RECOMPUTE_TIME });
 		this._register(_editor.onDidChangeModel(() => {
 			this._isColorDecoratorsEnabled = this.isEnabled();
diff --git a/src/vs/editor/contrib/multicursor/browser/multicursor.ts b/src/vs/editor/contrib/multicursor/browser/multicursor.ts
index c3bcf55dd7ce..3138b9317bb6 100644
--- a/src/vs/editor/contrib/multicursor/browser/multicursor.ts
+++ b/src/vs/editor/contrib/multicursor/browser/multicursor.ts
@@ -803,7 +803,7 @@ export class CompatChangeAll extends MultiCursorSelectionControllerAction {
 }
 
 class SelectionHighlighterState {
-	private readonly _modelVersionId: number = this._model.getVersionId();
+	private readonly _modelVersionId: number;
 	private _cachedFindMatches: Range[] | null = null;
 
 	constructor(
@@ -813,6 +813,7 @@ class SelectionHighlighterState {
 		private readonly _wordSeparators: string | null,
 		prevState: SelectionHighlighterState | null
 	) {
+		this._modelVersionId = this._model.getVersionId();
 		if (prevState
 			&& this._model === prevState._model
 			&& this._searchText === prevState._searchText
diff --git a/src/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.ts b/src/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.ts
index 01b574130290..8fda7ce5b661 100644
--- a/src/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.ts
+++ b/src/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.ts
@@ -8,7 +8,7 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import { ICodeEditor } from '../../../browser/editorBrowser.js';
 import { EditorContributionInstantiation, registerEditorContribution } from '../../../browser/editorExtensions.js';
 import { EditorOption, IEditorMinimapOptions } from '../../../common/config/editorOptions.js';
-import { IEditorContribution } from '../../../common/editorCommon.js';
+import { IEditorContribution, IEditorDecorationsCollection } from '../../../common/editorCommon.js';
 import { StandardTokenType } from '../../../common/encodedTokenAttributes.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
 import { IModelDeltaDecoration, MinimapPosition, MinimapSectionHeaderStyle, TrackedRangeStickiness } from '../../../common/model.js';
@@ -21,7 +21,7 @@ export class SectionHeaderDetector extends Disposable implements IEditorContribu
 	public static readonly ID: string = 'editor.sectionHeaderDetector';
 
 	private options: FindSectionHeaderOptions | undefined;
-	private decorations = this.editor.createDecorationsCollection();
+	private decorations: IEditorDecorationsCollection;
 	private computeSectionHeaders: RunOnceScheduler;
 	private computePromise: CancelablePromise<SectionHeader[]> | null;
 	private currentOccurrences: { [decorationId: string]: SectionHeaderOccurrence };
@@ -32,6 +32,7 @@ export class SectionHeaderDetector extends Disposable implements IEditorContribu
 		@IEditorWorkerService private readonly editorWorkerService: IEditorWorkerService,
 	) {
 		super();
+		this.decorations = this.editor.createDecorationsCollection();
 
 		this.options = this.createOptions(editor.getOption(EditorOption.minimap));
 		this.computePromise = null;
diff --git a/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts b/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts
index 611fcb7e21c1..2a65960d9831 100644
--- a/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts
+++ b/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts
@@ -117,13 +117,15 @@ class Arrow {
 	private static readonly _IdGenerator = new IdGenerator('.arrow-decoration-');
 
 	private readonly _ruleName = Arrow._IdGenerator.nextId();
-	private readonly _decorations = this._editor.createDecorationsCollection();
+	private readonly _decorations: IEditorDecorationsCollection;
 	private _color: string | null = null;
 	private _height: number = -1;
 
 	constructor(
 		private readonly _editor: ICodeEditor
-	) { }
+	) {
+		this._decorations = this._editor.createDecorationsCollection();
+	}
 
 	dispose(): void {
 		this.hide();
diff --git a/src/vs/server/node/remoteExtensionHostAgentServer.ts b/src/vs/server/node/remoteExtensionHostAgentServer.ts
index 8323d0f13d0a..18bc307d31e9 100644
--- a/src/vs/server/node/remoteExtensionHostAgentServer.ts
+++ b/src/vs/server/node/remoteExtensionHostAgentServer.ts
@@ -64,7 +64,7 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 	private readonly _managementConnections: { [reconnectionToken: string]: ManagementConnection };
 	private readonly _allReconnectionTokens: Set<string>;
 	private readonly _webClientServer: WebClientServer | null;
-	private readonly _webEndpointOriginChecker = WebEndpointOriginChecker.create(this._productService);
+	private readonly _webEndpointOriginChecker: WebEndpointOriginChecker;
 
 	private readonly _serverBasePath: string | undefined;
 	private readonly _serverProductPath: string;
@@ -83,6 +83,7 @@ class RemoteExtensionHostAgentServer extends Disposable implements IServerAPI {
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
 		super();
+		this._webEndpointOriginChecker = WebEndpointOriginChecker.create(this._productService);
 
 		if (serverBasePath !== undefined && serverBasePath.charCodeAt(serverBasePath.length - 1) === CharCode.Slash) {
 			// Remove trailing slash from base path
diff --git a/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.ts
index 9a0a631edd98..cc2513d24a37 100644
--- a/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.ts
@@ -9,7 +9,7 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import { Constants } from '../../../../base/common/uint.js';
 import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { Range } from '../../../../editor/common/core/range.js';
-import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
+import { IEditorContribution, IEditorDecorationsCollection } from '../../../../editor/common/editorCommon.js';
 import { GlyphMarginLane, IModelDecorationOptions, IModelDeltaDecoration, OverviewRulerLane, TrackedRangeStickiness } from '../../../../editor/common/model.js';
 import { localize } from '../../../../nls.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
@@ -116,7 +116,7 @@ export function createDecorationsForStackFrame(stackFrame: IStackFrame, isFocuse
 }
 
 export class CallStackEditorContribution extends Disposable implements IEditorContribution {
-	private decorations = this.editor.createDecorationsCollection();
+	private decorations: IEditorDecorationsCollection;
 
 	constructor(
 		private readonly editor: ICodeEditor,
@@ -125,6 +125,7 @@ export class CallStackEditorContribution extends Disposable implements IEditorCo
 		@ILogService private readonly logService: ILogService,
 	) {
 		super();
+		this.decorations = this.editor.createDecorationsCollection();
 
 		const setDecorations = () => this.decorations.set(this.createCallStackDecorations());
 		this._register(Event.any(this.debugService.getViewModel().onDidFocusStackFrame, this.debugService.getModel().onDidChangeCallStack)(() => {
diff --git a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
index 34ef1b0806bd..285e99c61f97 100644
--- a/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugEditorContribution.ts
@@ -30,7 +30,7 @@ import { EditOperation } from '../../../../editor/common/core/editOperation.js';
 import { Position } from '../../../../editor/common/core/position.js';
 import { IRange, Range } from '../../../../editor/common/core/range.js';
 import { DEFAULT_WORD_REGEXP } from '../../../../editor/common/core/wordHelper.js';
-import { ScrollType } from '../../../../editor/common/editorCommon.js';
+import { IEditorDecorationsCollection, ScrollType } from '../../../../editor/common/editorCommon.js';
 import { StandardTokenType } from '../../../../editor/common/encodedTokenAttributes.js';
 import { InlineValue, InlineValueContext } from '../../../../editor/common/languages.js';
 import { IModelDeltaDecoration, ITextModel, InjectedTextCursorStops } from '../../../../editor/common/model.js';
@@ -261,7 +261,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 	private configurationWidget: FloatingEditorClickWidget | undefined;
 	private readonly altListener = new MutableDisposable();
 	private altPressed = false;
-	private oldDecorations = this.editor.createDecorationsCollection();
+	private oldDecorations: IEditorDecorationsCollection;
 	private readonly displayedStore = new DisposableStore();
 	private editorHoverOptions: IEditorHoverOptions | undefined;
 	private readonly debounceInfo: IFeatureDebounceInformation;
@@ -281,6 +281,7 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 		@ILanguageFeaturesService private readonly languageFeaturesService: ILanguageFeaturesService,
 		@ILanguageFeatureDebounceService featureDebounceService: ILanguageFeatureDebounceService
 	) {
+		this.oldDecorations = this.editor.createDecorationsCollection();
 		this.debounceInfo = featureDebounceService.for(languageFeaturesService.inlineValuesProvider, 'InlineValues', { min: DEAFULT_INLINE_DEBOUNCE_DELAY });
 		this.hoverWidget = this.instantiationService.createInstance(DebugHoverWidget, this.editor);
 		this.toDispose = [this.defaultHoverLockout, this.altListener, this.displayedStore];
diff --git a/src/vs/workbench/contrib/debug/browser/debugHover.ts b/src/vs/workbench/contrib/debug/browser/debugHover.ts
index ddd5e8bdbc68..2d2a3ea5f63f 100644
--- a/src/vs/workbench/contrib/debug/browser/debugHover.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugHover.ts
@@ -23,6 +23,7 @@ import { ConfigurationChangedEvent, EditorOption } from '../../../../editor/comm
 import { IDimension } from '../../../../editor/common/core/dimension.js';
 import { Position } from '../../../../editor/common/core/position.js';
 import { Range } from '../../../../editor/common/core/range.js';
+import { IEditorDecorationsCollection } from '../../../../editor/common/editorCommon.js';
 import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
 import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
 import * as nls from '../../../../nls.js';
@@ -93,7 +94,7 @@ export class DebugHoverWidget implements IContentWidget {
 	private tree!: AsyncDataTree<IExpression, IExpression, any>;
 	private showAtPosition: Position | null;
 	private positionPreference: ContentWidgetPositionPreference[];
-	private readonly highlightDecorations = this.editor.createDecorationsCollection();
+	private readonly highlightDecorations: IEditorDecorationsCollection;
 	private complexValueContainer!: HTMLElement;
 	private complexValueTitle!: HTMLElement;
 	private valueContainer!: HTMLElement;
@@ -118,6 +119,7 @@ export class DebugHoverWidget implements IContentWidget {
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 	) {
+		this.highlightDecorations = this.editor.createDecorationsCollection();
 		this.toDispose = [];
 
 		this.showAtPosition = null;
diff --git a/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts b/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts
index d896d8650da5..af01934653d5 100644
--- a/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts
+++ b/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.ts
@@ -26,6 +26,7 @@ import { assertIsDefined } from '../../../../base/common/types.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
 import { DEFINE_KEYBINDING_EDITOR_CONTRIB_ID, IDefineKeybindingEditorContribution } from '../../../services/preferences/common/preferences.js';
+import { IEditorDecorationsCollection } from '../../../../editor/common/editorCommon.js';
 
 const NLS_KB_LAYOUT_ERROR_MESSAGE = nls.localize('defineKeybinding.kbLayoutErrorMessage', "You won't be able to produce this key combination under your current keyboard layout.");
 
@@ -88,13 +89,14 @@ class DefineKeybindingEditorContribution extends Disposable implements IDefineKe
 export class KeybindingEditorDecorationsRenderer extends Disposable {
 
 	private _updateDecorations: RunOnceScheduler;
-	private readonly _dec = this._editor.createDecorationsCollection();
+	private readonly _dec: IEditorDecorationsCollection;
 
 	constructor(
 		private _editor: ICodeEditor,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 	) {
 		super();
+		this._dec = this._editor.createDecorationsCollection();
 
 		this._updateDecorations = this._register(new RunOnceScheduler(() => this._updateDecorationsNow(), 500));
 
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
index c8f0b595562f..1d6c0b83da27 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesRenderers.ts
@@ -787,7 +787,7 @@ class UnsupportedSettingsRenderer extends Disposable implements languages.CodeAc
 class WorkspaceConfigurationRenderer extends Disposable {
 	private static readonly supportedKeys = ['folders', 'tasks', 'launch', 'extensions', 'settings', 'remoteAuthority', 'transient'];
 
-	private readonly decorations = this.editor.createDecorationsCollection();
+	private readonly decorations: editorCommon.IEditorDecorationsCollection;
 	private renderingDelayer: Delayer<void> = new Delayer<void>(200);
 
 	constructor(private editor: ICodeEditor, private workspaceSettingsEditorModel: SettingsEditorModel,
@@ -795,6 +795,7 @@ class WorkspaceConfigurationRenderer extends Disposable {
 		@IMarkerService private readonly markerService: IMarkerService
 	) {
 		super();
+		this.decorations = this.editor.createDecorationsCollection();
 		this._register(this.editor.getModel()!.onDidChangeContent(() => this.renderingDelayer.trigger(() => this.render())));
 	}
 
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts b/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts
index 84321a355d91..9bc4c9432383 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.ts
@@ -37,6 +37,7 @@ import { ILanguageService } from '../../../../editor/common/languages/language.j
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import type { IManagedHover } from '../../../../base/browser/ui/hover/hover.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IEditorDecorationsCollection } from '../../../../editor/common/editorCommon.js';
 
 export class FolderSettingsActionViewItem extends BaseActionViewItem {
 
@@ -500,13 +501,14 @@ export class EditPreferenceWidget<T> extends Disposable {
 	private _line: number = -1;
 	private _preferences: T[] = [];
 
-	private readonly _editPreferenceDecoration = this.editor.createDecorationsCollection();
+	private readonly _editPreferenceDecoration: IEditorDecorationsCollection;
 
 	private readonly _onClick = this._register(new Emitter<IEditorMouseEvent>());
 	readonly onClick: Event<IEditorMouseEvent> = this._onClick.event;
 
 	constructor(private editor: ICodeEditor) {
 		super();
+		this._editPreferenceDecoration = this.editor.createDecorationsCollection();
 		this._register(this.editor.onMouseDown((e: IEditorMouseEvent) => {
 			if (e.target.type !== MouseTargetType.GUTTER_GLYPH_MARGIN || e.target.detail.isAfterLines || !this.isVisible()) {
 				return;

From 31ec1c528f3352405f329821df31b91e6deba824 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Tue, 11 Mar 2025 01:54:23 +0900
Subject: [PATCH 0739/1815] build: remove legacy server support (#235232)

* build: remove legacy server support

* chore: update rpm dependencies

* chore: fix publishing

* cli: provide option for unsupported glibc sysroot

* chore: add unsupported mode to prereq check

* chore: add logging

* chore: add comment about patchelf execution order
---
 build/azure-pipelines/cli/cli-compile.yml     |   7 +-
 build/azure-pipelines/common/publish.js       |  12 +-
 build/azure-pipelines/common/publish.ts       |  10 +-
 .../product-build-linux-legacy-server.yml     | 233 ------------------
 build/azure-pipelines/linux/setup-env.sh      |  82 +++---
 build/azure-pipelines/product-build.yml       |  59 -----
 build/azure-pipelines/product-publish.yml     |   1 -
 build/checksums/vscode-sysroot.txt            |   3 -
 build/gulpfile.reh.js                         |   8 +-
 build/linux/rpm/dep-lists.js                  |   3 +
 build/linux/rpm/dep-lists.ts                  |   3 +
 cli/src/util/prereqs.rs                       |  36 +--
 resources/server/bin/code-server-linux.sh     |  10 +
 .../check-requirements-linux-legacy.sh        |   9 -
 .../bin/helpers/check-requirements-linux.sh   |  15 +-
 .../server/node/remoteAgentEnvironmentImpl.ts |   2 +-
 16 files changed, 86 insertions(+), 407 deletions(-)
 delete mode 100644 build/azure-pipelines/linux/product-build-linux-legacy-server.yml
 delete mode 100755 resources/server/bin/helpers/check-requirements-linux-legacy.sh

diff --git a/build/azure-pipelines/cli/cli-compile.yml b/build/azure-pipelines/cli/cli-compile.yml
index 71cd3f71e78b..5982e42c5dd4 100644
--- a/build/azure-pipelines/cli/cli-compile.yml
+++ b/build/azure-pipelines/cli/cli-compile.yml
@@ -42,7 +42,6 @@ steps:
       - script: |
           set -e
           if [ -n "$SYSROOT_ARCH" ]; then
-            export VSCODE_SYSROOT_PREFIX='-glibc-2.17'
             export VSCODE_SYSROOT_DIR=$(Build.SourcesDirectory)/.build/sysroots
             node -e '(async () => { const { getVSCodeSysroot } = require("../build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
             if [ "$SYSROOT_ARCH" == "arm64" ]; then
@@ -73,7 +72,7 @@ steps:
 
           # verify glibc requirement
           if [ -n "$SYSROOT_ARCH" ]; then
-            glibc_version="2.17"
+            glibc_version="2.28"
             while IFS= read -r line; do
               if [[ $line == *"GLIBC_"* ]]; then
                 version=$(echo "$line" | awk '{print $5}' | tr -d '()')
@@ -83,8 +82,8 @@ steps:
                 fi
               fi
             done < <("$OBJDUMP" -T "$PWD/target/${{ parameters.VSCODE_CLI_TARGET }}/release/code")
-            if [[ "$glibc_version" != "2.17" ]]; then
-              echo "Error: binary has dependency on GLIBC > 2.17, found $glibc_version"
+            if [[ "$glibc_version" != "2.28" ]]; then
+              echo "Error: binary has dependency on GLIBC > 2.28, found $glibc_version"
               exit 1
             fi
           fi
diff --git a/build/azure-pipelines/common/publish.js b/build/azure-pipelines/common/publish.js
index 444e005d3c63..8e052881b2ca 100644
--- a/build/azure-pipelines/common/publish.js
+++ b/build/azure-pipelines/common/publish.js
@@ -382,7 +382,7 @@ async function unzip(packagePath, outputPath) {
     });
 }
 // Contains all of the logic for mapping details to our actual product names in CosmosDB
-function getPlatform(product, os, arch, type, isLegacy) {
+function getPlatform(product, os, arch, type) {
     switch (os) {
         case 'win32':
             switch (product) {
@@ -427,12 +427,12 @@ function getPlatform(product, os, arch, type, isLegacy) {
                         case 'client':
                             return `linux-${arch}`;
                         case 'server':
-                            return isLegacy ? `server-linux-legacy-${arch}` : `server-linux-${arch}`;
+                            return `server-linux-${arch}`;
                         case 'web':
                             if (arch === 'standalone') {
                                 return 'web-standalone';
                             }
-                            return isLegacy ? `server-linux-legacy-${arch}-web` : `server-linux-${arch}-web`;
+                            return `server-linux-${arch}-web`;
                         default:
                             throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
                     }
@@ -556,8 +556,7 @@ async function processArtifact(artifact, filePath) {
             await releaseService.createRelease(version, filePath, friendlyFileName);
         }
         const { product, os, arch, unprocessedType } = match.groups;
-        const isLegacy = artifact.name.includes('_legacy');
-        const platform = getPlatform(product, os, arch, unprocessedType, isLegacy);
+        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);
@@ -610,9 +609,6 @@ async function main() {
     if (e('VSCODE_BUILD_STAGE_LINUX') === 'True') {
         stages.add('Linux');
     }
-    if (e('VSCODE_BUILD_STAGE_LINUX_LEGACY_SERVER') === 'True') {
-        stages.add('LinuxLegacyServer');
-    }
     if (e('VSCODE_BUILD_STAGE_ALPINE') === 'True') {
         stages.add('Alpine');
     }
diff --git a/build/azure-pipelines/common/publish.ts b/build/azure-pipelines/common/publish.ts
index f061d043d137..37bf5ccc6cd3 100644
--- a/build/azure-pipelines/common/publish.ts
+++ b/build/azure-pipelines/common/publish.ts
@@ -694,7 +694,7 @@ interface Asset {
 }
 
 // Contains all of the logic for mapping details to our actual product names in CosmosDB
-function getPlatform(product: string, os: string, arch: string, type: string, isLegacy: boolean): string {
+function getPlatform(product: string, os: string, arch: string, type: string): string {
 	switch (os) {
 		case 'win32':
 			switch (product) {
@@ -739,12 +739,12 @@ function getPlatform(product: string, os: string, arch: string, type: string, is
 						case 'client':
 							return `linux-${arch}`;
 						case 'server':
-							return isLegacy ? `server-linux-legacy-${arch}` : `server-linux-${arch}`;
+							return `server-linux-${arch}`;
 						case 'web':
 							if (arch === 'standalone') {
 								return 'web-standalone';
 							}
-							return isLegacy ? `server-linux-legacy-${arch}-web` : `server-linux-${arch}-web`;
+							return `server-linux-${arch}-web`;
 						default:
 							throw new Error(`Unrecognized: ${product} ${os} ${arch} ${type}`);
 					}
@@ -896,8 +896,7 @@ async function processArtifact(
 		}
 
 		const { product, os, arch, unprocessedType } = match.groups!;
-		const isLegacy = artifact.name.includes('_legacy');
-		const platform = getPlatform(product, os, arch, unprocessedType, isLegacy);
+		const platform = getPlatform(product, os, arch, unprocessedType);
 		const type = getRealType(unprocessedType);
 		const size = fs.statSync(filePath).size;
 		const stream = fs.createReadStream(filePath);
@@ -956,7 +955,6 @@ async function main() {
 
 	if (e('VSCODE_BUILD_STAGE_WINDOWS') === 'True') { stages.add('Windows'); }
 	if (e('VSCODE_BUILD_STAGE_LINUX') === 'True') { stages.add('Linux'); }
-	if (e('VSCODE_BUILD_STAGE_LINUX_LEGACY_SERVER') === 'True') { stages.add('LinuxLegacyServer'); }
 	if (e('VSCODE_BUILD_STAGE_ALPINE') === 'True') { stages.add('Alpine'); }
 	if (e('VSCODE_BUILD_STAGE_MACOS') === 'True') { stages.add('macOS'); }
 	if (e('VSCODE_BUILD_STAGE_WEB') === 'True') { stages.add('Web'); }
diff --git a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml
deleted file mode 100644
index 4c26baf2f999..000000000000
--- a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml
+++ /dev/null
@@ -1,233 +0,0 @@
-parameters:
-  - name: VSCODE_QUALITY
-    type: string
-  - name: VSCODE_RUN_INTEGRATION_TESTS
-    type: boolean
-  - name: VSCODE_ARCH
-    type: string
-
-steps:
-  - task: NodeTool@0
-    inputs:
-      versionSource: fromFile
-      versionFilePath: .nvmrc
-      nodejsMirror: https://github.com/joaomoreno/node-mirror/releases/download
-
-  - template: ../distro/download-distro.yml
-
-  - task: AzureKeyVault@2
-    displayName: "Azure Key Vault: Get Secrets"
-    inputs:
-      azureSubscription: vscode
-      KeyVaultName: vscode-build-secrets
-      SecretsFilter: "github-distro-mixin-password"
-
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      artifact: Compilation
-      path: $(Build.ArtifactStagingDirectory)
-    displayName: Download compilation output
-
-  - script: tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz
-    displayName: Extract compilation output
-
-  - script: |
-      set -e
-      # Start X server
-      ./build/azure-pipelines/linux/apt-retry.sh sudo apt-get update
-      ./build/azure-pipelines/linux/apt-retry.sh sudo apt-get install -y pkg-config \
-        dbus \
-        xvfb \
-        libgtk-3-0 \
-        libxkbfile-dev \
-        libkrb5-dev \
-        libgbm1 \
-        rpm \
-        gcc-10 \
-        g++-10
-      sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
-      sudo chmod +x /etc/init.d/xvfb
-      sudo update-rc.d xvfb defaults
-      sudo service xvfb start
-      # Start dbus session
-      sudo mkdir -p /var/run/dbus
-      DBUS_LAUNCH_RESULT=$(sudo dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address)
-      echo "##vso[task.setvariable variable=DBUS_SESSION_BUS_ADDRESS]$DBUS_LAUNCH_RESULT"
-    displayName: Setup system services
-
-  - script: node build/setup-npm-registry.js $NPM_REGISTRY
-    condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM Registry
-
-  - script: |
-      set -e
-      # Set the private NPM registry to the global npmrc file
-      # so that authentication works for subfolders like build/, remote/, extensions/ etc
-      # which does not have their own .npmrc file
-      npm config set registry "$NPM_REGISTRY"
-      echo "##vso[task.setvariable variable=NPMRC_PATH]$(npm config get userconfig)"
-    condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM
-
-  - task: npmAuthenticate@0
-    inputs:
-      workingFile: $(NPMRC_PATH)
-    condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
-    displayName: Setup NPM Authentication
-
-  - ${{ if or(eq(parameters.VSCODE_ARCH, 'x64'), eq(parameters.VSCODE_ARCH, 'arm64')) }}:
-    - task: Docker@1
-      displayName: "Pull Docker image"
-      inputs:
-        azureSubscriptionEndpoint: vscode
-        azureContainerRegistry: vscodehub.azurecr.io
-        command: "Run an image"
-        imageName: vscode-linux-build-agent:centos7-devtoolset8-$(VSCODE_ARCH)
-        containerCommand: uname
-
-  - script: |
-      set -e
-
-      for i in {1..5}; do # try 5 times
-        npm ci && break
-        if [ $i -eq 5 ]; then
-          echo "Npm install failed too many times" >&2
-          exit 1
-        fi
-        echo "Npm install failed $i, trying again..."
-      done
-    workingDirectory: build
-    env:
-      GITHUB_TOKEN: "$(github-distro-mixin-password)"
-    displayName: Install build dependencies
-
-  - script: |
-      set -e
-
-      export VSCODE_SYSROOT_PREFIX='-glibc-2.17'
-      export CC=$(which gcc-10)
-      export CXX=$(which g++-10)
-      source ./build/azure-pipelines/linux/setup-env.sh --skip-sysroot
-
-      for i in {1..5}; do # try 5 times
-        npm ci && break
-        if [ $i -eq 5 ]; then
-          echo "Npm install failed too many times" >&2
-          exit 1
-        fi
-        echo "Npm install failed $i, trying again..."
-      done
-    env:
-      npm_config_arch: $(NPM_ARCH)
-      VSCODE_ARCH: $(VSCODE_ARCH)
-      NPM_REGISTRY: "$(NPM_REGISTRY)"
-      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-      GITHUB_TOKEN: "$(github-distro-mixin-password)"
-      VSCODE_HOST_MOUNT: "/mnt/vss/_work/1/s"
-      ${{ if or(eq(parameters.VSCODE_ARCH, 'x64'), eq(parameters.VSCODE_ARCH, 'arm64')) }}:
-        VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME: vscodehub.azurecr.io/vscode-linux-build-agent:centos7-devtoolset8-$(VSCODE_ARCH)
-    displayName: Install dependencies
-
-  - script: node build/azure-pipelines/distro/mixin-npm
-    displayName: Mixin distro node modules
-
-  - script: node build/azure-pipelines/distro/mixin-quality
-    displayName: Mixin distro quality
-
-  - template: ../common/install-builtin-extensions.yml
-
-  - script: |
-      set -e
-      npm run gulp vscode-linux-$(VSCODE_ARCH)-min-ci
-      ARCHIVE_PATH=".build/linux/client/code-${{ parameters.VSCODE_QUALITY }}-$(VSCODE_ARCH)-$(date +%s).tar.gz"
-      mkdir -p $(dirname $ARCHIVE_PATH)
-      echo "##vso[task.setvariable variable=CLIENT_PATH]$ARCHIVE_PATH"
-    env:
-      GITHUB_TOKEN: "$(github-distro-mixin-password)"
-    displayName: Build client
-
-  - script: |
-      set -e
-      tar -czf $CLIENT_PATH -C .. VSCode-linux-$(VSCODE_ARCH)
-    env:
-      GITHUB_TOKEN: "$(github-distro-mixin-password)"
-    displayName: Archive client
-
-  - script: |
-      set -e
-      export VSCODE_NODE_GLIBC="-glibc-2.17"
-      npm run gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
-      mv ../vscode-reh-linux-$(VSCODE_ARCH) ../vscode-server-linux-$(VSCODE_ARCH) # TODO@joaomoreno
-      ARCHIVE_PATH=".build/linux/server/vscode-server-linux-legacy-$(VSCODE_ARCH).tar.gz"
-      UNARCHIVE_PATH="`pwd`/../vscode-server-linux-$(VSCODE_ARCH)"
-      mkdir -p $(dirname $ARCHIVE_PATH)
-      tar --owner=0 --group=0 -czf $ARCHIVE_PATH -C .. vscode-server-linux-$(VSCODE_ARCH)
-      echo "##vso[task.setvariable variable=SERVER_PATH]$ARCHIVE_PATH"
-      echo "##vso[task.setvariable variable=SERVER_UNARCHIVE_PATH]$UNARCHIVE_PATH"
-    env:
-      GITHUB_TOKEN: "$(github-distro-mixin-password)"
-    displayName: Build server
-
-  - script: |
-      set -e
-      export VSCODE_NODE_GLIBC="-glibc-2.17"
-      npm run gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
-      mv ../vscode-reh-web-linux-$(VSCODE_ARCH) ../vscode-server-linux-$(VSCODE_ARCH)-web # TODO@joaomoreno
-      ARCHIVE_PATH=".build/linux/web/vscode-server-linux-legacy-$(VSCODE_ARCH)-web.tar.gz"
-      mkdir -p $(dirname $ARCHIVE_PATH)
-      tar --owner=0 --group=0 -czf $ARCHIVE_PATH -C .. vscode-server-linux-$(VSCODE_ARCH)-web
-      echo "##vso[task.setvariable variable=WEB_PATH]$ARCHIVE_PATH"
-    env:
-      GITHUB_TOKEN: "$(github-distro-mixin-password)"
-    displayName: Build server (web)
-
-  - ${{ if or(eq(parameters.VSCODE_ARCH, 'x64'), eq(parameters.VSCODE_ARCH, 'arm64')) }}:
-    - script: |
-        set -e
-        EXPECTED_GLIBC_VERSION="2.17" \
-        EXPECTED_GLIBCXX_VERSION="3.4.19" \
-        ./build/azure-pipelines/linux/verify-glibc-requirements.sh
-      env:
-        SEARCH_PATH: $(SERVER_UNARCHIVE_PATH)
-      displayName: Check GLIBC and GLIBCXX dependencies in server archive
-
-  - ${{ else }}:
-    - script: |
-        set -e
-        EXPECTED_GLIBC_VERSION="2.17" \
-        EXPECTED_GLIBCXX_VERSION="3.4.22" \
-        ./build/azure-pipelines/linux/verify-glibc-requirements.sh
-      env:
-        SEARCH_PATH: $(SERVER_UNARCHIVE_PATH)
-      displayName: Check GLIBC and GLIBCXX dependencies in server archive
-
-  - ${{ if eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true) }}:
-    - template: product-build-linux-test.yml
-      parameters:
-        VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
-        VSCODE_RUN_UNIT_TESTS: false
-        VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }}
-        VSCODE_RUN_SMOKE_TESTS: false
-        ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
-          PUBLISH_TASK_NAME: 1ES.PublishPipelineArtifact@1
-
-  - task: 1ES.PublishPipelineArtifact@1
-    inputs:
-      targetPath: $(SERVER_PATH)
-      artifactName: $(ARTIFACT_PREFIX)vscode_server_linux_legacy_$(VSCODE_ARCH)_archive-unsigned
-      sbomBuildDropPath: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH)
-      sbomPackageName: "VS Code Linux $(VSCODE_ARCH) Legacy Server"
-      sbomPackageVersion: $(Build.SourceVersion)
-    condition: and(succeededOrFailed(), ne(variables['SERVER_PATH'], ''))
-    displayName: Publish server archive
-
-  - task: 1ES.PublishPipelineArtifact@1
-    inputs:
-      targetPath: $(WEB_PATH)
-      artifactName: $(ARTIFACT_PREFIX)vscode_web_linux_legacy_$(VSCODE_ARCH)_archive-unsigned
-      sbomBuildDropPath: $(Agent.BuildDirectory)/vscode-server-linux-$(VSCODE_ARCH)-web
-      sbomPackageName: "VS Code Linux $(VSCODE_ARCH) Legacy Web"
-      sbomPackageVersion: $(Build.SourceVersion)
-    condition: and(succeededOrFailed(), ne(variables['WEB_PATH'], ''))
-    displayName: Publish web server archive
diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh
index 1f198441bc3e..fb43bbf0d205 100755
--- a/build/azure-pipelines/linux/setup-env.sh
+++ b/build/azure-pipelines/linux/setup-env.sh
@@ -16,56 +16,50 @@ else
 fi
 
 if [ "$npm_config_arch" == "x64" ]; then
-    # Download clang based on chromium revision used by vscode
-    curl -s https://raw.githubusercontent.com/chromium/chromium/132.0.6834.196/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
+  # Download clang based on chromium revision used by vscode
+  curl -s https://raw.githubusercontent.com/chromium/chromium/132.0.6834.196/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
 
-    # Download libcxx headers and objects from upstream electron releases
-    DEBUG=libcxx-fetcher \
-    VSCODE_LIBCXX_OBJECTS_DIR=$PWD/.build/libcxx-objects \
-    VSCODE_LIBCXX_HEADERS_DIR=$PWD/.build/libcxx_headers  \
-    VSCODE_LIBCXXABI_HEADERS_DIR=$PWD/.build/libcxxabi_headers \
-    VSCODE_ARCH="$npm_config_arch" \
-    node build/linux/libcxx-fetcher.js
+  # Download libcxx headers and objects from upstream electron releases
+  DEBUG=libcxx-fetcher \
+  VSCODE_LIBCXX_OBJECTS_DIR=$PWD/.build/libcxx-objects \
+  VSCODE_LIBCXX_HEADERS_DIR=$PWD/.build/libcxx_headers  \
+  VSCODE_LIBCXXABI_HEADERS_DIR=$PWD/.build/libcxxabi_headers \
+  VSCODE_ARCH="$npm_config_arch" \
+  node build/linux/libcxx-fetcher.js
 
-    # Set compiler toolchain
-    # Flags for the client build are based on
-    # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:build/config/arm.gni
-    # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:build/config/compiler/BUILD.gn
-    # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:build/config/c++/BUILD.gn
-    export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu"
-    export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu"
-    export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -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_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot"
-    export LDFLAGS="-stdlib=libc++ --sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -fuse-ld=lld -flto=thin -L$PWD/.build/libcxx-objects -lc++abi -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/lib/x86_64-linux-gnu -Wl,--lto-O0"
+  # Set compiler toolchain
+  # Flags for the client build are based on
+  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:build/config/arm.gni
+  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:build/config/compiler/BUILD.gn
+  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:build/config/c++/BUILD.gn
+  export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu"
+  export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu"
+  export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -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_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot"
+  export LDFLAGS="-stdlib=libc++ --sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -fuse-ld=lld -flto=thin -L$PWD/.build/libcxx-objects -lc++abi -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/lib/x86_64-linux-gnu -Wl,--lto-O0"
 
-  if [ "$(echo "$@" | grep -c -- "--skip-sysroot")" -eq 0 ]; then
-    # Set compiler toolchain for remote server
-    export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-gcc
-    export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-g++
-    export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot"
-    export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/lib/x86_64-linux-gnu"
-  fi
+  # Set compiler toolchain for remote server
+  export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-gcc
+  export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-g++
+  export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot"
+  export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/lib/x86_64-linux-gnu"
 elif [ "$npm_config_arch" == "arm64" ]; then
-  if [ "$(echo "$@" | grep -c -- "--skip-sysroot")" -eq 0 ]; then
-    # Set compiler toolchain for client native modules
-    export CC=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc
-    export CXX=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-g++
-    export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot"
-    export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/lib/aarch64-linux-gnu"
+  # Set compiler toolchain for client native modules
+  export CC=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc
+  export CXX=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-g++
+  export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot"
+  export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/lib/aarch64-linux-gnu"
 
-    # Set compiler toolchain for remote server
-    export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc
-    export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-g++
-    export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot"
-    export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/lib/aarch64-linux-gnu"
-  fi
+  # Set compiler toolchain for remote server
+  export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc
+  export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-g++
+  export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot"
+  export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/lib/aarch64-linux-gnu"
 elif [ "$npm_config_arch" == "arm" ]; then
-  if [ "$(echo "$@" | grep -c -- "--skip-sysroot")" -eq 0 ]; then
-    # Set compiler toolchain for client native modules
-    export CC=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc
-    export CXX=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-g++
-    export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot"
-    export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-linux-gnueabihf -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/lib/arm-linux-gnueabihf"
-  fi
+  # Set compiler toolchain for client native modules
+  export CC=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc
+  export CXX=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-g++
+  export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot"
+  export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-linux-gnueabihf -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/lib/arm-linux-gnueabihf"
 
   # Set compiler toolchain for remote server
   export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 3e49db44c2c8..4c39fe5134d6 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -41,26 +41,14 @@ parameters:
     displayName: "🎯 Linux x64"
     type: boolean
     default: true
-  - name: VSCODE_BUILD_LINUX_X64_LEGACY_SERVER
-    displayName: "🎯 Linux x64 Legacy Server"
-    type: boolean
-    default: true
   - name: VSCODE_BUILD_LINUX_ARM64
     displayName: "🎯 Linux arm64"
     type: boolean
     default: true
-  - name: VSCODE_BUILD_LINUX_ARM64_LEGACY_SERVER
-    displayName: "🎯 Linux arm64 Legacy Server"
-    type: boolean
-    default: true
   - name: VSCODE_BUILD_LINUX_ARMHF
     displayName: "🎯 Linux armhf"
     type: boolean
     default: true
-  - name: VSCODE_BUILD_LINUX_ARMHF_LEGACY_SERVER
-    displayName: "🎯 Linux armhf Legacy Server"
-    type: boolean
-    default: true
   - name: VSCODE_BUILD_ALPINE
     displayName: "🎯 Alpine x64"
     type: boolean
@@ -118,8 +106,6 @@ variables:
     value: ${{ or(eq(parameters.VSCODE_BUILD_WIN32, true), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}
   - name: VSCODE_BUILD_STAGE_LINUX
     value: ${{ or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true)) }}
-  - name: VSCODE_BUILD_STAGE_LINUX_LEGACY_SERVER
-    value: ${{ or(eq(parameters.VSCODE_BUILD_LINUX_X64_LEGACY_SERVER, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF_LEGACY_SERVER, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64_LEGACY_SERVER, true)) }}
   - name: VSCODE_BUILD_STAGE_ALPINE
     value: ${{ or(eq(parameters.VSCODE_BUILD_ALPINE, true), eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true)) }}
   - name: VSCODE_BUILD_STAGE_MACOS
@@ -555,51 +541,6 @@ extends:
                       VSCODE_RUN_INTEGRATION_TESTS: false
                       VSCODE_RUN_SMOKE_TESTS: false
 
-      - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_LINUX_LEGACY_SERVER'], true)) }}:
-        - stage: LinuxLegacyServer
-          dependsOn:
-            - Compile
-          pool:
-            name: 1es-ubuntu-20.04-x64
-            os: linux
-          jobs:
-            - ${{ if eq(parameters.VSCODE_BUILD_LINUX_X64_LEGACY_SERVER, true) }}:
-              - job: Linuxx64LegacyServer
-                variables:
-                  VSCODE_ARCH: x64
-                  NPM_ARCH: x64
-                  DISPLAY: ":10"
-                steps:
-                  - template: build/azure-pipelines/linux/product-build-linux-legacy-server.yml@self
-                    parameters:
-                      VSCODE_ARCH: x64
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
-
-            - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF_LEGACY_SERVER, true) }}:
-              - job: LinuxArmhfLegacyServer
-                variables:
-                  VSCODE_ARCH: armhf
-                  NPM_ARCH: arm
-                steps:
-                  - template: build/azure-pipelines/linux/product-build-linux-legacy-server.yml@self
-                    parameters:
-                      VSCODE_ARCH: armhf
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_INTEGRATION_TESTS: false
-
-            - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64_LEGACY_SERVER, true) }}:
-              - job: LinuxArm64LegacyServer
-                variables:
-                  VSCODE_ARCH: arm64
-                  NPM_ARCH: arm64
-                steps:
-                  - template: build/azure-pipelines/linux/product-build-linux-legacy-server.yml@self
-                    parameters:
-                      VSCODE_ARCH: arm64
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
-                      VSCODE_RUN_INTEGRATION_TESTS: false
-
       - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_ALPINE'], true)) }}:
         - stage: Alpine
           dependsOn:
diff --git a/build/azure-pipelines/product-publish.yml b/build/azure-pipelines/product-publish.yml
index 8ecf5e6238ef..1127e5212e9b 100644
--- a/build/azure-pipelines/product-publish.yml
+++ b/build/azure-pipelines/product-publish.yml
@@ -102,7 +102,6 @@ steps:
       $stages = @(
         if ($env:VSCODE_BUILD_STAGE_WINDOWS -eq 'True') { 'Windows' }
         if ($env:VSCODE_BUILD_STAGE_LINUX -eq 'True') { 'Linux' }
-        if ($env:VSCODE_BUILD_STAGE_LINUX_LEGACY_SERVER -eq 'True') { 'LinuxLegacyServer' }
         if ($env:VSCODE_BUILD_STAGE_ALPINE -eq 'True') { 'Alpine' }
         if ($env:VSCODE_BUILD_STAGE_MACOS -eq 'True') { 'macOS' }
         if ($env:VSCODE_BUILD_STAGE_WEB -eq 'True') { 'Web' }
diff --git a/build/checksums/vscode-sysroot.txt b/build/checksums/vscode-sysroot.txt
index 0b5f38c60ce7..67182b078ed5 100644
--- a/build/checksums/vscode-sysroot.txt
+++ b/build/checksums/vscode-sysroot.txt
@@ -1,6 +1,3 @@
-68a17006021975ff271a1dd615f9db9eda7c25f2cc65e750c87980dc57a06c94  aarch64-linux-gnu-glibc-2.17.tar.gz
 0de422a81683cf9e8cf875dbd1e0c27545ac3c775b2d53015daf3ca2b31d3f15  aarch64-linux-gnu-glibc-2.28.tar.gz
-3ced48cb479f2cdba95aa649710fcb7778685551c745bbd76ac706c3c0ead9fb  arm-rpi-linux-gnueabihf-glibc-2.17.tar.gz
 7aea163f7fad8cc50000c86b5108be880121d35e2f55d016ef8c96bbe54129eb  arm-rpi-linux-gnueabihf-glibc-2.28.tar.gz
-5aae21115f1d284c3cdf32c83db15771b59bc80793f1423032abf5a823c0d658  x86_64-linux-gnu-glibc-2.17.tar.gz
 dbb927408393041664a020661f2641c9785741be3d29b050b9dac58980967784  x86_64-linux-gnu-glibc-2.28.tar.gz
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
index e0df76f1c8f2..44add792d14c 100644
--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
@@ -402,13 +402,7 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 			);
 		}
 
-		if (platform === 'linux' && process.env['VSCODE_NODE_GLIBC'] === '-glibc-2.17') {
-			result = es.merge(result,
-				gulp.src(`resources/server/bin/helpers/check-requirements-linux-legacy.sh`, { base: '.' })
-					.pipe(rename(`bin/helpers/check-requirements.sh`))
-					.pipe(util.setExecutableBit())
-			);
-		} else if (platform === 'linux' || platform === 'alpine') {
+		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`))
diff --git a/build/linux/rpm/dep-lists.js b/build/linux/rpm/dep-lists.js
index 13f323760376..f45b6f34b843 100644
--- a/build/linux/rpm/dep-lists.js
+++ b/build/linux/rpm/dep-lists.js
@@ -46,6 +46,7 @@ exports.referenceGeneratedDepsByArch = {
         '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)',
@@ -140,6 +141,7 @@ exports.referenceGeneratedDepsByArch = {
         '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)',
@@ -240,6 +242,7 @@ exports.referenceGeneratedDepsByArch = {
         '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)',
diff --git a/build/linux/rpm/dep-lists.ts b/build/linux/rpm/dep-lists.ts
index 63b47522d50d..d277ca7e6647 100644
--- a/build/linux/rpm/dep-lists.ts
+++ b/build/linux/rpm/dep-lists.ts
@@ -45,6 +45,7 @@ export const referenceGeneratedDepsByArch = {
 		'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)',
@@ -139,6 +140,7 @@ export const referenceGeneratedDepsByArch = {
 		'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)',
@@ -239,6 +241,7 @@ export const referenceGeneratedDepsByArch = {
 		'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)',
diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
index f8eff34ec39c..8752c2ff1566 100644
--- a/cli/src/util/prereqs.rs
+++ b/cli/src/util/prereqs.rs
@@ -20,19 +20,16 @@ lazy_static! {
 	static ref LIBSTD_CXX_VERSION_RE: BinRegex =
 		BinRegex::new(r"GLIBCXX_([0-9]+)\.([0-9]+)(?:\.([0-9]+))?").unwrap();
 	static ref MIN_LDD_VERSION: SimpleSemver = SimpleSemver::new(2, 28, 0);
-	static ref MIN_LEGACY_LDD_VERSION: SimpleSemver = SimpleSemver::new(2, 17, 0);
 }
 
 #[cfg(target_arch = "arm")]
 lazy_static! {
 	static ref MIN_CXX_VERSION: SimpleSemver = SimpleSemver::new(3, 4, 26);
-	static ref MIN_LEGACY_CXX_VERSION: SimpleSemver = SimpleSemver::new(3, 4, 22);
 }
 
 #[cfg(not(target_arch = "arm"))]
 lazy_static! {
 	static ref MIN_CXX_VERSION: SimpleSemver = SimpleSemver::new(3, 4, 25);
-	static ref MIN_LEGACY_CXX_VERSION: SimpleSemver = SimpleSemver::new(3, 4, 19);
 }
 
 const NIXOS_TEST_PATH: &str = "/etc/NIXOS";
@@ -74,12 +71,11 @@ impl PreReqChecker {
 		} else {
 			println!("!!! WARNING: Skipping server pre-requisite check !!!");
 			println!("!!! Server stability is not guaranteed. Proceed at your own risk. !!!");
-			// Use the legacy server for #210029
 			(Ok(true), Ok(true))
 		};
 
 		match (&gnu_a, &gnu_b, is_nixos) {
-			(Ok(false), Ok(false), _) | (_, _, true) => {
+			(Ok(true), Ok(true), _) | (_, _, true) => {
 				return Ok(if cfg!(target_arch = "x86_64") {
 					Platform::LinuxX64
 				} else if cfg!(target_arch = "arm") {
@@ -88,15 +84,6 @@ impl PreReqChecker {
 					Platform::LinuxARM64
 				});
 			}
-			(Ok(_), Ok(_), _) => {
-				return Ok(if cfg!(target_arch = "x86_64") {
-					Platform::LinuxX64Legacy
-				} else if cfg!(target_arch = "arm") {
-					Platform::LinuxARM32Legacy
-				} else {
-					Platform::LinuxARM64Legacy
-				});
-			}
 			_ => {}
 		};
 
@@ -149,7 +136,7 @@ async fn check_musl_interpreter() -> Result<(), String> {
 	Ok(())
 }
 
-/// Checks the glibc version, returns "true" if the legacy server is required.
+/// Checks the glibc version, returns "true" if the default server is required.
 #[cfg(target_os = "linux")]
 async fn check_glibc_version() -> Result<bool, String> {
 	#[cfg(target_env = "gnu")]
@@ -170,8 +157,6 @@ async fn check_glibc_version() -> Result<bool, String> {
 	if let Some(v) = version {
 		return if v >= *MIN_LDD_VERSION {
 			Ok(false)
-		} else if v >= *MIN_LEGACY_LDD_VERSION {
-			Ok(true)
 		} else {
 			Err(format!(
 				"find GLIBC >= {} (but found {} instead) for GNU environments",
@@ -192,10 +177,17 @@ async fn check_is_nixos() -> bool {
 
 /// Do not remove this check.
 /// Provides a way to skip the server glibc requirements check from
-/// outside the install flow. A system process can create this
-/// file before the server is downloaded and installed.
+/// outside the install flow.
+///
+/// 1) A system process can create this
+///    file before the server is downloaded and installed.
+///
+/// 2) An environment variable declared in host
+///    that contains path to a glibc sysroot satisfying the
+///    minimum requirements.
 #[cfg(not(windows))]
 pub async fn skip_requirements_check() -> bool {
+	std::env::var("VSCODE_SERVER_CUSTOM_GLIBC_LINKER").is_ok() ||
 	fs::metadata("/tmp/vscode-skip-server-requirements-check")
 		.await
 		.is_ok()
@@ -206,7 +198,7 @@ pub async fn skip_requirements_check() -> bool {
 	false
 }
 
-/// Checks the glibc++ version, returns "true" if the legacy server is required.
+/// Checks the glibc++ version, returns "true" if the default server is required.
 #[cfg(target_os = "linux")]
 async fn check_glibcxx_version() -> Result<bool, String> {
 	let mut libstdc_path: Option<String> = None;
@@ -250,10 +242,6 @@ fn check_for_sufficient_glibcxx_versions(contents: Vec<u8>) -> Result<bool, Stri
 
 	if let Some(max_version) = &max_version {
 		if max_version >= &*MIN_CXX_VERSION {
-			return Ok(false);
-		}
-
-		if max_version >= &*MIN_LEGACY_CXX_VERSION {
 			return Ok(true);
 		}
 	}
diff --git a/resources/server/bin/code-server-linux.sh b/resources/server/bin/code-server-linux.sh
index 3df32dfd43c7..20df7cda4df4 100644
--- a/resources/server/bin/code-server-linux.sh
+++ b/resources/server/bin/code-server-linux.sh
@@ -9,4 +9,14 @@ esac
 
 ROOT="$(dirname "$(dirname "$(readlink -f "$0")")")"
 
+# Set rpath before changing the interpreter path
+# Refs https://github.com/NixOS/patchelf/issues/524
+if [ -n "$VSCODE_SERVER_CUSTOM_GLIBC_LINKER" ] && [ -n "$VSCODE_SERVER_CUSTOM_GLIBC_PATH" ] && [ -n "$VSCODE_SERVER_PATCHELF_PATH" ]; then
+	echo "Patching glibc from $VSCODE_SERVER_CUSTOM_GLIBC_PATH with $VSCODE_SERVER_PATCHELF_PATH..."
+	"$VSCODE_SERVER_PATCHELF_PATH" --set-rpath "$VSCODE_SERVER_CUSTOM_GLIBC_PATH" "$ROOT/node"
+	echo "Patching linker from $VSCODE_SERVER_CUSTOM_GLIBC_LINKER with $VSCODE_SERVER_PATCHELF_PATH..."
+	"$VSCODE_SERVER_PATCHELF_PATH" --set-interpreter "$VSCODE_SERVER_CUSTOM_GLIBC_LINKER" "$ROOT/node"
+	echo "Patching complete."
+fi
+
 "$ROOT/node" ${INSPECT:-} "$ROOT/out/server-main.js" "$@"
diff --git a/resources/server/bin/helpers/check-requirements-linux-legacy.sh b/resources/server/bin/helpers/check-requirements-linux-legacy.sh
deleted file mode 100755
index 0db776769650..000000000000
--- a/resources/server/bin/helpers/check-requirements-linux-legacy.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env sh
-#
-# Copyright (c) Microsoft Corporation. All rights reserved.
-#
-
-set -e
-
-echo "!!! WARNING: Using legacy server, please check https://aka.ms/vscode-remote/faq/old-linux for additional information !!!"
-exit 0
diff --git a/resources/server/bin/helpers/check-requirements-linux.sh b/resources/server/bin/helpers/check-requirements-linux.sh
index 8ef07a2fb1f0..8ea4c0b5adbf 100644
--- a/resources/server/bin/helpers/check-requirements-linux.sh
+++ b/resources/server/bin/helpers/check-requirements-linux.sh
@@ -7,21 +7,20 @@ set -e
 
 # The script checks necessary server requirements for the classic server
 # scenarios. Currently, the script can exit with any of the following
-# 3 exit codes and should be handled accordingly on the extension side.
+# 2 exit codes and should be handled accordingly on the extension side.
 #
 # 0: All requirements are met, use the default server.
 # 99: Unsupported OS, abort server startup with appropriate error message.
-# 100: Use legacy server.
 #
 
 # Do not remove this check.
 # Provides a way to skip the server requirements check from
 # outside the install flow. A system process can create this
 # file before the server is downloaded and installed.
-if [ -f "/tmp/vscode-skip-server-requirements-check" ]; then
-	echo "!!! WARNING: Skipping server pre-requisite check !!!"
-	echo "!!! Server stability is not guaranteed. Proceed at your own risk. !!!"
-	exit 0
+if [ -f "/tmp/vscode-skip-server-requirements-check" ] || [ -n "$VSCODE_SERVER_CUSTOM_GLIBC_LINKER" ]; then
+    echo "!!! WARNING: Skipping server pre-requisite check !!!"
+    echo "!!! Server stability is not guaranteed. Proceed at your own risk. !!!"
+    exit 0
 fi
 
 ARCH=$(uname -m)
@@ -156,7 +155,7 @@ else
 fi
 
 if [ "$found_required_glibc" = "0" ] || [ "$found_required_glibcxx" = "0" ]; then
-	echo "Warning: Missing required dependencies. Please refer to our FAQ https://aka.ms/vscode-remote/faq/old-linux for additional information."
+	echo "Error: Missing required dependencies. Please refer to our FAQ https://aka.ms/vscode-remote/faq/old-linux for additional information."
 	# Custom exit code based on https://tldp.org/LDP/abs/html/exitcodes.html
-	exit 100
+	exit 99
 fi
diff --git a/src/vs/server/node/remoteAgentEnvironmentImpl.ts b/src/vs/server/node/remoteAgentEnvironmentImpl.ts
index e050ae1f4f5f..3b4aa7cbe3ae 100644
--- a/src/vs/server/node/remoteAgentEnvironmentImpl.ts
+++ b/src/vs/server/node/remoteAgentEnvironmentImpl.ts
@@ -103,7 +103,7 @@ export class RemoteAgentEnvironmentChannel implements IServerChannel {
 		if (process.platform === 'linux') {
 			const glibcVersion = (process as ProcessWithGlibc).glibcVersion;
 			const minorVersion = glibcVersion ? parseInt(glibcVersion.split('.')[1]) : 28;
-			isUnsupportedGlibc = (minorVersion <= 27);
+			isUnsupportedGlibc = (minorVersion <= 27) || !!process.env['VSCODE_SERVER_CUSTOM_GLIBC_LINKER'];
 		}
 		return {
 			pid: process.pid,

From 62e914e344f870f6a0d214873f6bcd2d930957ff Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Mon, 10 Mar 2025 17:54:49 +0100
Subject: [PATCH 0740/1815] Make the property init order checker script Windows
 friendly (#243093)

Part of #243049
---
 build/lib/propertyInitOrderChecker.js | 2 +-
 build/lib/propertyInitOrderChecker.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index 14c0e2cbd6c3..8c287dbd8528 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -257,7 +257,7 @@ for (const file of program.getSourceFiles()) {
     if (!file || file.isDeclarationFile) {
         continue;
     }
-    const relativePath = path.relative(path.dirname(TS_CONFIG_PATH), file.fileName);
+    const relativePath = path.relative(path.dirname(TS_CONFIG_PATH), file.fileName).replace(/\\/g, '/');
     if (ignored.has(relativePath)) {
         continue;
     }
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index 2c3090d8dced..d83b8c3fa2dd 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -239,7 +239,7 @@ for (const file of program.getSourceFiles()) {
 		continue;
 	}
 
-	const relativePath = path.relative(path.dirname(TS_CONFIG_PATH), file.fileName);
+	const relativePath = path.relative(path.dirname(TS_CONFIG_PATH), file.fileName).replace(/\\/g, '/');
 	if (ignored.has(relativePath)) {
 		continue;
 	}

From 0287979d68c80ce2a2f5a4175c66707ed6661928 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Mon, 10 Mar 2025 09:57:46 -0700
Subject: [PATCH 0741/1815] Remove old key-matching algorithm and setting

Closes #243091
---
 .../preferences/browser/preferencesSearch.ts  | 146 +++++++-----------
 .../common/preferencesContribution.ts         |   7 -
 .../preferences/common/preferences.ts         |   1 +
 3 files changed, 59 insertions(+), 95 deletions(-)

diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
index 57f59b72d5d4..c6d01b7fc63f 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ISettingsEditorModel, ISetting, ISettingsGroup, ISearchResult, IGroupFilter, SettingMatchType, ISettingMatch, SettingKeyMatchTypes } from '../../../services/preferences/common/preferences.js';
+import { ISettingsEditorModel, ISetting, ISettingsGroup, ISearchResult, IGroupFilter, SettingMatchType, ISettingMatch, SettingKeyMatchTypes, ISettingMatcher } from '../../../services/preferences/common/preferences.js';
 import { IRange } from '../../../../editor/common/core/range.js';
 import { distinct } from '../../../../base/common/arrays.js';
 import * as strings from '../../../../base/common/strings.js';
@@ -97,29 +97,25 @@ export class LocalSearchProvider implements ISearchProvider {
 			return Promise.resolve(null);
 		}
 
-		let orderedScore = LocalSearchProvider.START_SCORE; // Sort is not stable
-		const useNewKeyMatchAlgorithm = this.configurationService.getValue('workbench.settings.useWeightedKeySearch') === true;
-		const settingMatcher = (setting: ISetting) => {
-			const { matches, matchType, keyMatchScore } = new SettingMatches(
+		const settingMatcher: ISettingMatcher = (setting: ISetting) => {
+			let { matches, matchType, keyMatchScore } = new SettingMatches(
 				this._filter,
 				setting,
 				true,
 				(filter, setting) => preferencesModel.findValueMatches(filter, setting),
-				useNewKeyMatchAlgorithm,
 				this.configurationService
 			);
 			if (matchType === SettingMatchType.None || matches.length === 0) {
 				return null;
 			}
-
-			const score = strings.equalsIgnoreCase(this._filter, setting.key) ?
-				LocalSearchProvider.EXACT_MATCH_SCORE :
-				orderedScore--;
+			if (strings.equalsIgnoreCase(this._filter, setting.key)) {
+				matchType = SettingMatchType.ExactMatch;
+			}
 			return {
 				matches,
 				matchType,
 				keyMatchScore,
-				score
+				score: 0 // only used for RemoteSearchProvider matches.
 			};
 		};
 
@@ -130,22 +126,17 @@ export class LocalSearchProvider implements ISearchProvider {
 				filterMatches: [exactMatch],
 				exactMatch: true
 			});
-		} else if (useNewKeyMatchAlgorithm) {
-			// Check the top key match type.
-			const topKeyMatchType = Math.max(...filterMatches.map(m => (m.matchType & SettingKeyMatchTypes)));
-			// Always allow description matches as part of https://github.com/microsoft/vscode/issues/239936.
-			const alwaysAllowedMatchTypes = SettingMatchType.DescriptionOrValueMatch | SettingMatchType.LanguageTagSettingMatch;
-			const filteredMatches = filterMatches.filter(m => (m.matchType & topKeyMatchType) || (m.matchType & alwaysAllowedMatchTypes));
-			return Promise.resolve({
-				filterMatches: filteredMatches,
-				exactMatch: false
-			});
-		} else {
-			return Promise.resolve({
-				filterMatches: filterMatches,
-				exactMatch: false
-			});
 		}
+
+		// Check the top key match type.
+		const topKeyMatchType = Math.max(...filterMatches.map(m => (m.matchType & SettingKeyMatchTypes)));
+		// Always allow description matches as part of https://github.com/microsoft/vscode/issues/239936.
+		const alwaysAllowedMatchTypes = SettingMatchType.DescriptionOrValueMatch | SettingMatchType.LanguageTagSettingMatch;
+		const filteredMatches = filterMatches.filter(m => (m.matchType & topKeyMatchType) || (m.matchType & alwaysAllowedMatchTypes));
+		return Promise.resolve({
+			filterMatches: filteredMatches,
+			exactMatch: false
+		});
 	}
 
 	private getGroupFilter(filter: string): IGroupFilter {
@@ -170,7 +161,6 @@ export class SettingMatches {
 		setting: ISetting,
 		private searchDescription: boolean,
 		valuesMatcher: (filter: string, setting: ISetting) => IRange[],
-		private useNewKeyMatchAlgorithm: boolean,
 		private readonly configurationService: IConfigurationService
 	) {
 		this.matches = distinct(this._findMatchesInSetting(searchString, setting), (match) => `${match.startLineNumber}_${match.startColumn}_${match.endLineNumber}_${match.endColumn}_`);
@@ -205,68 +195,52 @@ export class SettingMatches {
 		const settingKeyAsWords: string = this._keyToLabel(setting.key);
 		const queryWords = new Set<string>(searchString.split(' '));
 		for (const word of queryWords) {
-			// Check if the key contains the word.
-			// Force contiguous matching iff we're using the new algorithm.
-			const keyMatches = matchesWords(word, settingKeyAsWords, this.useNewKeyMatchAlgorithm);
+			// Check if the key contains the word. Use contiguous search.
+			const keyMatches = matchesWords(word, settingKeyAsWords, true);
 			if (keyMatches?.length) {
 				keyMatchingWords.set(word, keyMatches.map(match => this.toKeyRange(setting, match)));
 			}
 		}
-		if (this.useNewKeyMatchAlgorithm) {
-			// New key match algorithm
-			if (keyMatchingWords.size === queryWords.size) {
-				// All words in the query matched with something in the setting key.
-				// Matches "edit format on paste" to "editor.formatOnPaste".
-				this.matchType |= SettingMatchType.AllWordsInSettingsLabel;
-			} else if (keyMatchingWords.size >= 2) {
-				// Matches "edit paste" to "editor.formatOnPaste".
-				// The if statement reduces noise by preventing "editor formatonpast" from matching all editor settings.
-				this.matchType |= SettingMatchType.ContiguousWordsInSettingsLabel;
-				this.keyMatchScore = keyMatchingWords.size;
-			}
-			const searchStringAlphaNumeric = this._toAlphaNumeric(searchString);
-			const keyAlphaNumeric = this._toAlphaNumeric(setting.key);
-			const keyIdMatches = matchesContiguousSubString(searchStringAlphaNumeric, keyAlphaNumeric);
-			if (keyIdMatches?.length) {
-				// Matches "editorformatonp" to "editor.formatonpaste".
-				keyMatchingWords.set(setting.key, keyIdMatches.map(match => this.toKeyRange(setting, match)));
-				this.matchType |= SettingMatchType.ContiguousQueryInSettingId;
-			}
+		if (keyMatchingWords.size === queryWords.size) {
+			// All words in the query matched with something in the setting key.
+			// Matches "edit format on paste" to "editor.formatOnPaste".
+			this.matchType |= SettingMatchType.AllWordsInSettingsLabel;
+		} else if (keyMatchingWords.size >= 2) {
+			// Matches "edit paste" to "editor.formatOnPaste".
+			// The if statement reduces noise by preventing "editor formatonpast" from matching all editor settings.
+			this.matchType |= SettingMatchType.ContiguousWordsInSettingsLabel;
+			this.keyMatchScore = keyMatchingWords.size;
+		}
+		const searchStringAlphaNumeric = this._toAlphaNumeric(searchString);
+		const keyAlphaNumeric = this._toAlphaNumeric(setting.key);
+		const keyIdMatches = matchesContiguousSubString(searchStringAlphaNumeric, keyAlphaNumeric);
+		if (keyIdMatches?.length) {
+			// Matches "editorformatonp" to "editor.formatonpaste".
+			keyMatchingWords.set(setting.key, keyIdMatches.map(match => this.toKeyRange(setting, match)));
+			this.matchType |= SettingMatchType.ContiguousQueryInSettingId;
+		}
 
-			// Fall back to non-contiguous searches if nothing matched yet.
-			if (this.matchType === SettingMatchType.None) {
-				keyMatchingWords.clear();
-				for (const word of queryWords) {
-					const keyMatches = matchesWords(word, settingKeyAsWords, false);
-					if (keyMatches?.length) {
-						keyMatchingWords.set(word, keyMatches.map(match => this.toKeyRange(setting, match)));
-					}
-				}
-				if (keyMatchingWords.size >= 2 || (keyMatchingWords.size === 1 && queryWords.size === 1)) {
-					// Matches "edforonpas" to "editor.formatOnPaste".
-					// The if statement reduces noise by preventing "editor fomonpast" from matching all editor settings.
-					this.matchType |= SettingMatchType.NonContiguousWordsInSettingsLabel;
-					this.keyMatchScore = keyMatchingWords.size;
-				} else {
-					const keyIdMatches = matchesSubString(searchStringAlphaNumeric, keyAlphaNumeric);
-					if (keyIdMatches?.length) {
-						// Matches "edfmonpas" to "editor.formatOnPaste".
-						keyMatchingWords.set(setting.key, keyIdMatches.map(match => this.toKeyRange(setting, match)));
-						this.matchType |= SettingMatchType.NonContiguousQueryInSettingId;
-					}
+		// Fall back to non-contiguous key (ID) searches if nothing matched yet.
+		if (this.matchType === SettingMatchType.None) {
+			keyMatchingWords.clear();
+			for (const word of queryWords) {
+				const keyMatches = matchesWords(word, settingKeyAsWords, false);
+				if (keyMatches?.length) {
+					keyMatchingWords.set(word, keyMatches.map(match => this.toKeyRange(setting, match)));
 				}
 			}
-		} else {
-			// Old key match algorithm
-			if (keyMatchingWords.size) {
+			if (keyMatchingWords.size >= 2 || (keyMatchingWords.size === 1 && queryWords.size === 1)) {
+				// Matches "edforonpas" to "editor.formatOnPaste".
+				// The if statement reduces noise by preventing "editor fomonpast" from matching all editor settings.
 				this.matchType |= SettingMatchType.NonContiguousWordsInSettingsLabel;
 				this.keyMatchScore = keyMatchingWords.size;
-			}
-			const keyIdMatches = matchesContiguousSubString(searchString, setting.key);
-			if (keyIdMatches?.length) {
-				// Handles cases such as "editor.formatonpaste" where the user tries searching for the ID.
-				keyMatchingWords.set(setting.key, keyIdMatches.map(match => this.toKeyRange(setting, match)));
-				this.matchType |= SettingMatchType.ContiguousQueryInSettingId;
+			} else {
+				const keyIdMatches = matchesSubString(searchStringAlphaNumeric, keyAlphaNumeric);
+				if (keyIdMatches?.length) {
+					// Matches "edfmonpas" to "editor.formatOnPaste".
+					keyMatchingWords.set(setting.key, keyIdMatches.map(match => this.toKeyRange(setting, match)));
+					this.matchType |= SettingMatchType.NonContiguousQueryInSettingId;
+				}
 			}
 		}
 
@@ -280,11 +254,9 @@ export class SettingMatches {
 		}
 
 		// Description search
-		// Old algorithm: search the description if we haven't matched anything yet.
-		// New algorithm: search the description if we found non-contiguous key matches at best.
+		// Search the description if we found non-contiguous key matches at best.
 		const hasContiguousKeyMatchTypes = this.matchType >= SettingMatchType.ContiguousWordsInSettingsLabel;
-		const checkDescription = (!this.useNewKeyMatchAlgorithm && this.matchType === SettingMatchType.None) || (this.useNewKeyMatchAlgorithm && !hasContiguousKeyMatchTypes);
-		if (this.searchDescription && checkDescription) {
+		if (this.searchDescription && !hasContiguousKeyMatchTypes) {
 			for (const word of queryWords) {
 				// Search the description lines.
 				for (let lineIndex = 0; lineIndex < setting.description.length; lineIndex++) {
@@ -304,10 +276,8 @@ export class SettingMatches {
 
 		// Value search
 		// Check if the value contains all the words.
-		// Old algorithm: always search the values.
-		// New algorithm: search the values if we found non-contiguous key matches at best.
-		const checkValue = !this.useNewKeyMatchAlgorithm || !hasContiguousKeyMatchTypes;
-		if (checkValue) {
+		// Search the values if we found non-contiguous key matches at best.
+		if (!hasContiguousKeyMatchTypes) {
 			if (setting.enum?.length) {
 				// Search all string values of enums.
 				for (const option of setting.enum) {
diff --git a/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts b/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
index b57d8931d6c9..e5cec6f206a2 100644
--- a/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
+++ b/src/vs/workbench/contrib/preferences/common/preferencesContribution.ts
@@ -125,13 +125,6 @@ registry.registerConfiguration({
 			'description': nls.localize('settingsSearchTocBehavior', "Controls the behavior of the Settings editor Table of Contents while searching. If this setting is being changed in the Settings editor, the setting will take effect after the search query is modified."),
 			'default': 'filter',
 			'scope': ConfigurationScope.WINDOW
-		},
-		'workbench.settings.useWeightedKeySearch': {
-			'type': 'boolean',
-			'default': true,
-			'description': nls.localize('useWeightedKeySearch', "Controls whether to use an experimental ranking algorithm for search results in the Settings editor. The newer algorithm is still in development and aims to show fewer and more relevant results."),
-			'scope': ConfigurationScope.WINDOW,
-			'tags': ['experimental']
 		}
 	}
 });
diff --git a/src/vs/workbench/services/preferences/common/preferences.ts b/src/vs/workbench/services/preferences/common/preferences.ts
index f36d548facf3..79b764b569d5 100644
--- a/src/vs/workbench/services/preferences/common/preferences.ts
+++ b/src/vs/workbench/services/preferences/common/preferences.ts
@@ -143,6 +143,7 @@ export enum SettingMatchType {
 	ContiguousWordsInSettingsLabel = 1 << 5,
 	ContiguousQueryInSettingId = 1 << 6,
 	AllWordsInSettingsLabel = 1 << 7,
+	ExactMatch = 1 << 8,
 }
 export const SettingKeyMatchTypes = (SettingMatchType.AllWordsInSettingsLabel
 	| SettingMatchType.ContiguousWordsInSettingsLabel

From b8006b5f360afe8ea2dbc4d0cdb3b61c175d8cc8 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Mon, 10 Mar 2025 10:01:27 -0700
Subject: [PATCH 0742/1815] Fix exact match check

---
 .../contrib/preferences/browser/preferencesSearch.ts         | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
index c6d01b7fc63f..52ef9dbd446e 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
@@ -82,9 +82,6 @@ function cleanFilter(filter: string): string {
 }
 
 export class LocalSearchProvider implements ISearchProvider {
-	static readonly EXACT_MATCH_SCORE = 10000;
-	static readonly START_SCORE = 1000;
-
 	constructor(
 		private _filter: string,
 		@IConfigurationService private readonly configurationService: IConfigurationService
@@ -120,7 +117,7 @@ export class LocalSearchProvider implements ISearchProvider {
 		};
 
 		const filterMatches = preferencesModel.filterSettings(this._filter, this.getGroupFilter(this._filter), settingMatcher);
-		const exactMatch = filterMatches.find(m => m.score === LocalSearchProvider.EXACT_MATCH_SCORE);
+		const exactMatch = filterMatches.find(m => m.matchType === SettingMatchType.ExactMatch);
 		if (exactMatch) {
 			return Promise.resolve({
 				filterMatches: [exactMatch],

From 897d7c8abf740c82e038700e2dafff1c5ad73a8e Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Mon, 10 Mar 2025 18:03:17 +0100
Subject: [PATCH 0743/1815] Fix some property init order debt in comments files
 (#243095)

Part of #243049
---
 build/lib/propertyInitOrderChecker.js         |  2 --
 build/lib/propertyInitOrderChecker.ts         |  2 --
 .../browser/commentsAccessibleView.ts         | 32 +++++++++++--------
 .../comments/browser/commentsViewActions.ts   |  9 ++++--
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index 8c287dbd8528..1bf6e453e0ce 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -152,7 +152,6 @@ const ignored = new Set([
     'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts',
     'vs/platform/terminal/common/capabilities/commandDetectionCapability.ts',
     'vs/workbench/api/browser/mainThreadWorkspace.ts',
-    'vs/workbench/contrib/comments/browser/commentsViewActions.ts',
     'vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.ts',
     'vs/workbench/contrib/testing/common/testExclusions.ts',
     'vs/workbench/contrib/testing/common/testResultStorage.ts',
@@ -198,7 +197,6 @@ const ignored = new Set([
     'vs/workbench/contrib/markers/browser/markersViewActions.ts',
     'vs/workbench/contrib/mergeEditor/browser/view/viewZones.ts',
     'vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts',
-    'vs/workbench/contrib/comments/browser/commentsAccessibleView.ts',
     'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts',
     'vs/workbench/contrib/output/browser/outputServices.ts',
     'vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts',
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index d83b8c3fa2dd..9bcae6abef3e 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -121,7 +121,6 @@ const ignored = new Set([
 	'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts',
 	'vs/platform/terminal/common/capabilities/commandDetectionCapability.ts',
 	'vs/workbench/api/browser/mainThreadWorkspace.ts',
-	'vs/workbench/contrib/comments/browser/commentsViewActions.ts',
 	'vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.ts',
 	'vs/workbench/contrib/testing/common/testExclusions.ts',
 	'vs/workbench/contrib/testing/common/testResultStorage.ts',
@@ -167,7 +166,6 @@ const ignored = new Set([
 	'vs/workbench/contrib/markers/browser/markersViewActions.ts',
 	'vs/workbench/contrib/mergeEditor/browser/view/viewZones.ts',
 	'vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts',
-	'vs/workbench/contrib/comments/browser/commentsAccessibleView.ts',
 	'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts',
 	'vs/workbench/contrib/output/browser/outputServices.ts',
 	'vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts',
diff --git a/src/vs/workbench/contrib/comments/browser/commentsAccessibleView.ts b/src/vs/workbench/contrib/comments/browser/commentsAccessibleView.ts
index c18066cbe58e..3efc58ca953c 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsAccessibleView.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsAccessibleView.ts
@@ -23,6 +23,7 @@ import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { URI } from '../../../../base/common/uri.js';
 import { CommentThread, Comment } from '../../../../editor/common/languages.js';
 import { IRange } from '../../../../editor/common/core/range.js';
+import { IAction } from '../../../../base/common/actions.js';
 
 export class CommentsAccessibleView extends Disposable implements IAccessibleViewImplementation {
 	readonly priority = 90;
@@ -72,30 +73,33 @@ export class CommentThreadAccessibleView extends Disposable implements IAccessib
 
 
 class CommentsAccessibleContentProvider extends Disposable implements IAccessibleViewContentProvider {
+	public readonly actions: IAction[];
 	constructor(
 		private readonly _commentsView: CommentsPanel,
 		private readonly _focusedCommentNode: any,
 		private readonly _menus: CommentsMenus,
 	) {
 		super();
+
+		this.actions = [...this._menus.getResourceContextActions(this._focusedCommentNode)].filter(i => i.enabled).map(action => {
+			return {
+				...action,
+				run: () => {
+					this._commentsView.focus();
+					action.run({
+						thread: this._focusedCommentNode.thread,
+						$mid: MarshalledId.CommentThread,
+						commentControlHandle: this._focusedCommentNode.controllerHandle,
+						commentThreadHandle: this._focusedCommentNode.threadHandle,
+					});
+				}
+			};
+		});
 	}
 	readonly id = AccessibleViewProviderId.Comments;
 	readonly verbositySettingKey = AccessibilityVerbositySettingId.Comments;
 	readonly options = { type: AccessibleViewType.View };
-	public actions = [...this._menus.getResourceContextActions(this._focusedCommentNode)].filter(i => i.enabled).map(action => {
-		return {
-			...action,
-			run: () => {
-				this._commentsView.focus();
-				action.run({
-					thread: this._focusedCommentNode.thread,
-					$mid: MarshalledId.CommentThread,
-					commentControlHandle: this._focusedCommentNode.controllerHandle,
-					commentThreadHandle: this._focusedCommentNode.threadHandle,
-				});
-			}
-		};
-	});
+
 	provideContent(): string {
 		const commentNode = this._commentsView.focusedCommentNode;
 		const content = this._commentsView.focusedCommentInfo?.toString();
diff --git a/src/vs/workbench/contrib/comments/browser/commentsViewActions.ts b/src/vs/workbench/contrib/comments/browser/commentsViewActions.ts
index 016ead15476e..41ed56ce07f9 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsViewActions.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsViewActions.ts
@@ -44,15 +44,20 @@ export class CommentsFilters extends Disposable {
 
 	private readonly _onDidChange: Emitter<CommentsFiltersChangeEvent> = this._register(new Emitter<CommentsFiltersChangeEvent>());
 	readonly onDidChange: Event<CommentsFiltersChangeEvent> = this._onDidChange.event;
+	private readonly _showUnresolved: IContextKey<boolean>;
+	private readonly _showResolved: IContextKey<boolean>;
+	private readonly _sortBy: IContextKey<CommentsSortOrder>;
 
 	constructor(options: CommentsFiltersOptions, private readonly contextKeyService: IContextKeyService) {
 		super();
+		this._showUnresolved = CONTEXT_KEY_SHOW_UNRESOLVED.bindTo(this.contextKeyService);
+		this._showResolved = CONTEXT_KEY_SHOW_RESOLVED.bindTo(this.contextKeyService);
+		this._sortBy = CONTEXT_KEY_SORT_BY.bindTo(this.contextKeyService);
 		this._showResolved.set(options.showResolved);
 		this._showUnresolved.set(options.showUnresolved);
 		this._sortBy.set(options.sortBy);
 	}
 
-	private readonly _showUnresolved = CONTEXT_KEY_SHOW_UNRESOLVED.bindTo(this.contextKeyService);
 	get showUnresolved(): boolean {
 		return !!this._showUnresolved.get();
 	}
@@ -63,7 +68,6 @@ export class CommentsFilters extends Disposable {
 		}
 	}
 
-	private _showResolved = CONTEXT_KEY_SHOW_RESOLVED.bindTo(this.contextKeyService);
 	get showResolved(): boolean {
 		return !!this._showResolved.get();
 	}
@@ -74,7 +78,6 @@ export class CommentsFilters extends Disposable {
 		}
 	}
 
-	private _sortBy: IContextKey<CommentsSortOrder> = CONTEXT_KEY_SORT_BY.bindTo(this.contextKeyService);
 	get sortBy(): CommentsSortOrder {
 		return this._sortBy.get() ?? CommentsSortOrder.ResourceAscending;
 	}

From c2676f75e5e4345eeae2718cae20d3b16cea9270 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Mon, 10 Mar 2025 18:11:28 +0100
Subject: [PATCH 0744/1815] - show mcp servers in ui (WIP) - register mcp
 server tools as tools - add `IMcpTool#id` - make sure `callOn` awaits result
 before disposing fyi @connor4312

---
 .../contrib/chat/browser/chatInputPart.ts     | 24 +++++++
 .../contrib/chat/browser/media/chat.css       |  3 +-
 .../workbench/contrib/mcp/common/mcpServer.ts | 11 ++-
 .../contrib/mcp/common/mcpService.ts          | 72 ++++++++++++++++++-
 .../workbench/contrib/mcp/common/mcpTypes.ts  |  4 ++
 5 files changed, 108 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 72d27bf4d439..e6485222077d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -23,6 +23,7 @@ import { HistoryNavigator2 } from '../../../../base/common/history.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ResourceSet } from '../../../../base/common/map.js';
+import { autorun } from '../../../../base/common/observable.js';
 import { basename, dirname } from '../../../../base/common/path.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import { URI } from '../../../../base/common/uri.js';
@@ -74,6 +75,7 @@ import { AccessibilityVerbositySettingId } from '../../accessibility/browser/acc
 import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
 import { getSimpleCodeEditorWidgetOptions, getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from '../../codeEditor/browser/simpleEditorOptions.js';
 import { revealInSideBarCommand } from '../../files/browser/fileActions.contribution.js';
+import { IMcpService } from '../../mcp/common/mcpTypes.js';
 import { ChatAgentLocation, IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatEditingSession, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../common/chatEditingService.js';
@@ -200,6 +202,19 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		contextArr
 			.push(...this.instructionAttachmentsPart.chatAttachments);
 
+
+		// // TODO@jrieken use only selected servers
+		// for (const server of this.mcpService.servers.get()) {
+		// 	for (const { id, definition } of server.tools.get()) {
+		// 		contextArr.push({
+		// 			isTool: true,
+		// 			id,
+		// 			name: definition.name,
+		// 			value: undefined
+		// 		});
+		// 	}
+		// }
+
 		return contextArr;
 	}
 
@@ -353,6 +368,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		@ILabelService private readonly labelService: ILabelService,
 		@IChatVariablesService private readonly variableService: IChatVariablesService,
 		@IChatAgentService private readonly chatAgentService: IChatAgentService,
+		@IMcpService private readonly mcpService: IMcpService
 	) {
 		super();
 
@@ -723,6 +739,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 						dom.h('.chat-attachment-toolbar@attachmentToolbar'),
 						dom.h('.chat-attached-context@attachedContextContainer'),
 						dom.h('.chat-related-files@relatedFilesContainer'),
+						dom.h('.chat-mcp@mcpContainer'),
 					]),
 					dom.h('.interactive-input-followups@followupsContainer'),
 				])
@@ -737,6 +754,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 							dom.h('.chat-attachment-toolbar@attachmentToolbar'),
 							dom.h('.chat-related-files@relatedFilesContainer'),
 							dom.h('.chat-attached-context@attachedContextContainer'),
+							dom.h('.chat-mcp@mcpContainer'),
 						]),
 						dom.h('.chat-editor-container@editorContainer'),
 						dom.h('.chat-input-toolbars@inputToolbars'),
@@ -762,6 +780,12 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			this._register(this._implicitContext.onDidChangeValue(() => this._handleAttachedContextChange()));
 		}
 
+		this._register(autorun(r => {
+			const servers = this.mcpService.servers.read(r);
+			const contents = renderLabelWithIcons(localize('serverpattern', "{0} {1}", '$(tools)', servers.length));
+			dom.reset(elements.mcpContainer, ...contents);
+		}));
+
 		this.renderAttachedContext();
 		this._register(this._attachmentModel.onDidChangeContext(() => this._handleAttachedContextChange()));
 		this.renderChatEditingSessionState(null, widget);
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 727fe8694c08..95a7168004c6 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1122,7 +1122,8 @@ have to be updated for changes to the rules above, or to support more deeply nes
 }
 
 .action-item.chat-attached-context-attachment.chat-add-files .action-label,
-.interactive-session .chat-attached-context .chat-attached-context-attachment {
+.interactive-session .chat-attached-context .chat-attached-context-attachment,
+.interactive-session .chat-mcp {
 	display: flex;
 	gap: 2px;
 	overflow: hidden;
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServer.ts b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
index 8d8c2c294b08..31b3fc177191 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServer.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
@@ -177,12 +177,12 @@ export class McpServer extends Disposable implements IMcpServer {
 	 * Helper function to call the function on the handler once it's online. The
 	 * connection started if it is not already.
 	 */
-	public callOn<R>(fn: (handler: McpServerRequestHandler) => Promise<R>, token?: CancellationToken): Promise<R> {
+	public async callOn<R>(fn: (handler: McpServerRequestHandler) => Promise<R>, token?: CancellationToken): Promise<R> {
 		const store = new DisposableStore();
 		this.start(); // idempotent
 
 		try {
-			return new Promise((resolve, reject) => {
+			return await new Promise((resolve, reject) => {
 				if (token) {
 					store.add(token.onCancellationRequested(() => {
 						reject(new CancellationError());
@@ -215,10 +215,15 @@ export class McpServer extends Disposable implements IMcpServer {
 }
 
 export class McpTool implements IMcpTool {
+
+	readonly id: string;
+
 	constructor(
 		private readonly _server: McpServer,
 		public readonly definition: MCP.Tool,
-	) { }
+	) {
+		this.id = `${_server.definition.id}_${definition.name}`.replaceAll('.', '_');
+	}
 
 	call(params: Record<string, unknown>, token?: CancellationToken): Promise<MCP.CallToolResult> {
 		return this._server.callOn(h => h.callTool({ name: this.definition.name, arguments: params }), token);
diff --git a/src/vs/workbench/contrib/mcp/common/mcpService.ts b/src/vs/workbench/contrib/mcp/common/mcpService.ts
index 49fd4ee79abb..ed78ed34fd4c 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpService.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpService.ts
@@ -4,15 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { RunOnceScheduler } from '../../../../base/common/async.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { autorun, derived, IObservable, observableValue } from '../../../../base/common/observable.js';
+import { localize } from '../../../../nls.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { StorageScope } from '../../../../platform/storage/common/storage.js';
+import { ILanguageModelToolsService, IToolResult } from '../../chat/common/languageModelToolsService.js';
 import { IMcpRegistry } from './mcpRegistryTypes.js';
 import { McpServer, McpServerMetadataCache } from './mcpServer.js';
 import { IMcpServer, IMcpService, McpCollectionDefinition, McpServerDefinition } from './mcpTypes.js';
 
 export class McpService extends Disposable implements IMcpService {
+
+	declare _serviceBrand: undefined;
+
 	private readonly _servers = observableValue<readonly IMcpServer[]>(this, []);
 	public readonly servers: IObservable<readonly IMcpServer[]> = this._servers;
 
@@ -21,7 +26,8 @@ export class McpService extends Disposable implements IMcpService {
 
 	constructor(
 		@IInstantiationService instantiationService: IInstantiationService,
-		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry
+		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry,
+		@ILanguageModelToolsService toolsService: ILanguageModelToolsService
 	) {
 		super();
 
@@ -64,6 +70,68 @@ export class McpService extends Disposable implements IMcpService {
 			definitionsObservable.read(reader);
 			updateThrottle.schedule(500);
 		}));
+
+
+		const tools = this._register(new MutableDisposable());
+
+		this._register(autorun(reader => {
+
+			const servers = this._servers.read(reader);
+
+			// TODO@jrieken wasteful, needs some diff'ing/change-info
+			const newStore = new DisposableStore();
+
+			tools.clear();
+
+			for (const server of servers) {
+
+				for (const tool of server.tools.read(reader)) {
+
+					newStore.add(toolsService.registerToolData({
+						id: tool.id,
+						displayName: tool.definition.name,
+						modelDescription: tool.definition.description ?? '',
+						inputSchema: tool.definition.inputSchema,
+						tags: ['mcp', 'vscode_editing']
+					}));
+					newStore.add(toolsService.registerToolImplementation(tool.id, {
+
+						async prepareToolInvocation(parameters, token) {
+							return {
+								confirmationMessages: {
+									title: localize('aaa', "Run tool from {0}", server.definition.label),
+									message: localize('ddd', "Do you allow to run `{0}` from `{1}`?", tool.definition.name, server.definition.label)
+								}
+							};
+						},
+
+						async invoke(invocation, countTokens, token) {
+
+							const result: IToolResult = {
+								content: []
+							};
+
+							const callResult = await tool.call(invocation.parameters as Record<string, any>, token);
+							for (const item of callResult.content) {
+								if (item.type === 'text') {
+									result.content.push({
+										kind: 'text',
+										value: item.text
+									});
+								} else {
+									// TODO@jrieken handle different item types
+								}
+							}
+
+							return result;
+						},
+					}));
+				}
+			}
+
+			tools.value = newStore;
+
+		}));
 	}
 
 	public override dispose(): void {
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
index 2b34e23e5cc8..d2d3e7fb10de 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
@@ -70,6 +70,7 @@ export namespace McpServerDefinition {
 }
 
 export interface IMcpService {
+	_serviceBrand: undefined;
 	readonly servers: IObservable<readonly IMcpServer[]>;
 }
 
@@ -88,6 +89,9 @@ export interface IMcpServer extends IDisposable {
 
 
 export interface IMcpTool {
+
+	readonly id: string;
+
 	readonly definition: MCP.Tool;
 	/**
 	 * Calls a tool

From da2bbdda8023de06d0633129267b3a1088992557 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Mon, 10 Mar 2025 18:17:02 +0100
Subject: [PATCH 0745/1815] `tree-sitter` doesn't apply some scopes (part 3)
 (#243088)

Fixes #241715
---
 .../colorize-fixtures/test-issue241715.ts     |   47 +
 .../colorize-results/test-issue241715_ts.json | 6876 +++++++++++++++++
 .../test-241001_ts.json                       |   88 +-
 .../test-issue11_ts.json                      |   32 +-
 .../test-issue241715_ts.json                  | 4692 +++++++++++
 .../test-issue5465_ts.json                    |   32 +-
 .../test-members_ts.json                      |    4 +-
 .../colorize-tree-sitter-results/test_ts.json |   50 +-
 .../languages/highlights/typescript.scm       |   94 +-
 .../browser/treeSitterTokenizationFeature.ts  |    2 +-
 10 files changed, 11803 insertions(+), 114 deletions(-)
 create mode 100644 extensions/vscode-colorize-tests/test/colorize-fixtures/test-issue241715.ts
 create mode 100644 extensions/vscode-colorize-tests/test/colorize-results/test-issue241715_ts.json
 create mode 100644 extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue241715_ts.json

diff --git a/extensions/vscode-colorize-tests/test/colorize-fixtures/test-issue241715.ts b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-issue241715.ts
new file mode 100644
index 000000000000..ff95456b8563
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-fixtures/test-issue241715.ts
@@ -0,0 +1,47 @@
+type obj = { [key: string]: any };
+
+function destruct({ start, end, message }: any): any { return start + end + message}
+function destructArr([first, second]: any): any { return first + second}
+
+interface WebviewMessageUpdateEverything extends WebviewMessageBase {}
+
+type NegNum = -1 | -2 | -10;
+const n: NegNum = -10;
+
+export interface OptionalMethod {
+    optMeth?(): any;
+}
+
+window.addEventListener('message', event => { return event });
+
+export function dayOfTheWeek(date: dayjs.Dayjs): string {
+	return date.format('ddd');
+}
+
+type N = never | any | unknown;
+
+type Truthy<T> = T extends '' | 0 | false | null | undefined ? never : T;
+export function guardedBoolean<T>(value: T): value is Truthy<T> {
+	return Boolean(value);
+}
+
+type Truthy<T> = T extends '' | 0 | false | null | undefined ? never : T;
+
+const enum EnumName {
+    one = 1,
+}
+
+void 0;
+
+function* makeIterator(start = 0, end = Infinity, step = 1) {
+}
+
+function makeDate(timestamp: number): Date;
+function makeDate(m: number, d: number, y: number): Date;
+function makeDate(mOrTimestamp: number, d?: number, y?: number): Date {
+
+}
+
+type StringNumberBooleans = [string, number, ...boolean[]];
+type StringBooleansNumber = [string, ...boolean[], number];
+type BooleansStringNumber = [...boolean[], string, number];
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
new file mode 100644
index 000000000000..96a67b213ca2
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test-issue241715_ts.json
@@ -0,0 +1,6876 @@
+[
+	{
+		"c": "type",
+		"t": "source.ts meta.type.declaration.ts storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "obj",
+		"t": "source.ts meta.type.declaration.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.ts meta.type.declaration.ts meta.object.type.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts meta.object.type.ts meta.indexer.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "[",
+		"t": "source.ts meta.type.declaration.ts meta.object.type.ts meta.indexer.declaration.ts meta.brace.square.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "key",
+		"t": "source.ts meta.type.declaration.ts meta.object.type.ts meta.indexer.declaration.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.type.declaration.ts meta.object.type.ts meta.indexer.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts meta.object.type.ts meta.indexer.declaration.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "string",
+		"t": "source.ts meta.type.declaration.ts meta.object.type.ts meta.indexer.declaration.ts meta.type.annotation.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "]",
+		"t": "source.ts meta.type.declaration.ts meta.object.type.ts meta.indexer.declaration.ts meta.brace.square.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.type.declaration.ts meta.object.type.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts meta.object.type.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "any",
+		"t": "source.ts meta.type.declaration.ts meta.object.type.ts meta.type.annotation.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts meta.object.type.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.ts meta.type.declaration.ts meta.object.type.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "source.ts meta.function.ts storage.type.function.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "destruct",
+		"t": "source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "start",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.separator.comma.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "end",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.separator.comma.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "message",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.parameter.object-binding-pattern.ts punctuation.definition.binding-pattern.object.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "any",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.return.type.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.return.type.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "any",
+		"t": "source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.return.type.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "source.ts meta.function.ts meta.block.ts keyword.control.flow.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "start",
+		"t": "source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "+",
+		"t": "source.ts meta.function.ts meta.block.ts keyword.operator.arithmetic.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "end",
+		"t": "source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "+",
+		"t": "source.ts meta.function.ts meta.block.ts keyword.operator.arithmetic.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "message",
+		"t": "source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "source.ts meta.function.ts storage.type.function.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "destructArr",
+		"t": "source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "[",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.array.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "first",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts punctuation.separator.comma.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "second",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "]",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.paramter.array-binding-pattern.ts punctuation.definition.binding-pattern.array.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "any",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.return.type.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.return.type.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "any",
+		"t": "source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.return.type.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "source.ts meta.function.ts meta.block.ts keyword.control.flow.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "first",
+		"t": "source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "+",
+		"t": "source.ts meta.function.ts meta.block.ts keyword.operator.arithmetic.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "second",
+		"t": "source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "interface",
+		"t": "source.ts meta.interface.ts storage.type.interface.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.interface.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "WebviewMessageUpdateEverything",
+		"t": "source.ts meta.interface.ts entity.name.type.interface.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.interface.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "extends",
+		"t": "source.ts meta.interface.ts storage.modifier.ts",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.interface.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "WebviewMessageBase",
+		"t": "source.ts meta.interface.ts entity.other.inherited-class.ts",
+		"r": {
+			"dark_plus": "entity.other.inherited-class: #4EC9B0",
+			"light_plus": "entity.other.inherited-class: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.other.inherited-class: #4EC9B0",
+			"dark_modern": "entity.other.inherited-class: #4EC9B0",
+			"hc_light": "entity.other.inherited-class: #185E73",
+			"light_modern": "entity.other.inherited-class: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.interface.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{}",
+		"t": "source.ts meta.interface.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "source.ts meta.type.declaration.ts storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "NegNum",
+		"t": "source.ts meta.type.declaration.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " -",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "1",
+		"t": "source.ts meta.type.declaration.ts constant.numeric.decimal.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "|",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " -",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "2",
+		"t": "source.ts meta.type.declaration.ts constant.numeric.decimal.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "|",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " -",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "10",
+		"t": "source.ts meta.type.declaration.ts constant.numeric.decimal.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "source.ts meta.var.expr.ts storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "n",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts",
+		"r": {
+			"dark_plus": "variable.other.constant: #4FC1FF",
+			"light_plus": "variable.other.constant: #0070C1",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_modern": "variable.other.constant: #0070C1"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "NegNum",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.var.expr.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.var.expr.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "-",
+		"t": "source.ts meta.var.expr.ts keyword.operator.arithmetic.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "10",
+		"t": "source.ts meta.var.expr.ts constant.numeric.decimal.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "export",
+		"t": "source.ts meta.interface.ts keyword.control.export.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.interface.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "interface",
+		"t": "source.ts meta.interface.ts storage.type.interface.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.interface.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "OptionalMethod",
+		"t": "source.ts meta.interface.ts entity.name.type.interface.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.interface.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.ts meta.interface.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "    ",
+		"t": "source.ts meta.interface.ts meta.method.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "optMeth",
+		"t": "source.ts meta.interface.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "?",
+		"t": "source.ts meta.interface.ts meta.method.declaration.ts keyword.operator.optional.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.ts meta.interface.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.ts meta.interface.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.interface.ts meta.method.declaration.ts meta.return.type.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.interface.ts meta.method.declaration.ts meta.return.type.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "any",
+		"t": "source.ts meta.interface.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts meta.interface.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.ts meta.interface.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "window",
+		"t": "source.ts meta.function-call.ts variable.other.object.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "source.ts meta.function-call.ts punctuation.accessor.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "addEventListener",
+		"t": "source.ts meta.function-call.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.ts meta.brace.round.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "'",
+		"t": "source.ts string.quoted.single.ts punctuation.definition.string.begin.ts",
+		"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": "message",
+		"t": "source.ts string.quoted.single.ts",
+		"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": "source.ts string.quoted.single.ts punctuation.definition.string.end.ts",
+		"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": "source.ts punctuation.separator.comma.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "event",
+		"t": "source.ts meta.arrow.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.arrow.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=>",
+		"t": "source.ts meta.arrow.ts storage.type.function.arrow.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.arrow.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.arrow.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "source.ts meta.arrow.ts meta.block.ts keyword.control.flow.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.arrow.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "event",
+		"t": "source.ts meta.arrow.ts meta.block.ts variable.other.readwrite.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.arrow.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.ts meta.brace.round.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "export",
+		"t": "source.ts meta.function.ts keyword.control.export.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "source.ts meta.function.ts storage.type.function.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "dayOfTheWeek",
+		"t": "source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "date",
+		"t": "source.ts meta.function.ts meta.parameters.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "dayjs",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.module.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ".",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts punctuation.accessor.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "Dayjs",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.return.type.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.return.type.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "string",
+		"t": "source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.return.type.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "\t",
+		"t": "source.ts meta.function.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "source.ts meta.function.ts meta.block.ts keyword.control.flow.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "date",
+		"t": "source.ts meta.function.ts meta.block.ts meta.function-call.ts variable.other.object.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "source.ts meta.function.ts meta.block.ts meta.function-call.ts punctuation.accessor.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "format",
+		"t": "source.ts meta.function.ts meta.block.ts meta.function-call.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.ts meta.function.ts meta.block.ts meta.brace.round.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "'",
+		"t": "source.ts meta.function.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.begin.ts",
+		"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": "ddd",
+		"t": "source.ts meta.function.ts meta.block.ts string.quoted.single.ts",
+		"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": "source.ts meta.function.ts meta.block.ts string.quoted.single.ts punctuation.definition.string.end.ts",
+		"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": "source.ts meta.function.ts meta.block.ts meta.brace.round.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "source.ts meta.type.declaration.ts storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "N",
+		"t": "source.ts meta.type.declaration.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "never",
+		"t": "source.ts meta.type.declaration.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "|",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "any",
+		"t": "source.ts meta.type.declaration.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "|",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "unknown",
+		"t": "source.ts meta.type.declaration.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "source.ts meta.type.declaration.ts storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "Truthy",
+		"t": "source.ts meta.type.declaration.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "<",
+		"t": "source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "T",
+		"t": "source.ts meta.type.declaration.ts meta.type.parameters.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ">",
+		"t": "source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "T",
+		"t": "source.ts meta.type.declaration.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "extends",
+		"t": "source.ts meta.type.declaration.ts storage.modifier.ts",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "'",
+		"t": "source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts",
+		"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": "source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts",
+		"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": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "|",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "0",
+		"t": "source.ts meta.type.declaration.ts constant.numeric.decimal.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "|",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "false",
+		"t": "source.ts meta.type.declaration.ts support.type.builtin.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "|",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "null",
+		"t": "source.ts meta.type.declaration.ts support.type.builtin.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "|",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "undefined",
+		"t": "source.ts meta.type.declaration.ts support.type.builtin.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "?",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.ternary.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "never",
+		"t": "source.ts meta.type.declaration.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.ternary.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "T",
+		"t": "source.ts meta.type.declaration.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "export",
+		"t": "source.ts meta.function.ts keyword.control.export.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "source.ts meta.function.ts storage.type.function.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "guardedBoolean",
+		"t": "source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "<",
+		"t": "source.ts meta.function.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "T",
+		"t": "source.ts meta.function.ts meta.type.parameters.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ">",
+		"t": "source.ts meta.function.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "value",
+		"t": "source.ts meta.function.ts meta.parameters.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "T",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.return.type.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.return.type.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "value",
+		"t": "source.ts meta.function.ts meta.return.type.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.return.type.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "is",
+		"t": "source.ts meta.function.ts meta.return.type.ts keyword.operator.expression.is.ts",
+		"r": {
+			"dark_plus": "keyword.operator.expression: #569CD6",
+			"light_plus": "keyword.operator.expression: #0000FF",
+			"dark_vs": "keyword.operator.expression: #569CD6",
+			"light_vs": "keyword.operator.expression: #0000FF",
+			"hc_black": "keyword.operator.expression: #569CD6",
+			"dark_modern": "keyword.operator.expression: #569CD6",
+			"hc_light": "keyword.operator.expression: #0F4A85",
+			"light_modern": "keyword.operator.expression: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.return.type.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "Truthy",
+		"t": "source.ts meta.function.ts meta.return.type.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "<",
+		"t": "source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "T",
+		"t": "source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ">",
+		"t": "source.ts meta.function.ts meta.return.type.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.return.type.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "\t",
+		"t": "source.ts meta.function.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "source.ts meta.function.ts meta.block.ts keyword.control.flow.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "Boolean",
+		"t": "source.ts meta.function.ts meta.block.ts meta.function-call.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.ts meta.function.ts meta.block.ts meta.brace.round.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "value",
+		"t": "source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.ts meta.function.ts meta.block.ts meta.brace.round.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "source.ts meta.type.declaration.ts storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "Truthy",
+		"t": "source.ts meta.type.declaration.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "<",
+		"t": "source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "T",
+		"t": "source.ts meta.type.declaration.ts meta.type.parameters.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ">",
+		"t": "source.ts meta.type.declaration.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "T",
+		"t": "source.ts meta.type.declaration.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "extends",
+		"t": "source.ts meta.type.declaration.ts storage.modifier.ts",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "'",
+		"t": "source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts",
+		"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": "source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts",
+		"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": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "|",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "0",
+		"t": "source.ts meta.type.declaration.ts constant.numeric.decimal.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "|",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "false",
+		"t": "source.ts meta.type.declaration.ts support.type.builtin.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "|",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "null",
+		"t": "source.ts meta.type.declaration.ts support.type.builtin.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "|",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "undefined",
+		"t": "source.ts meta.type.declaration.ts support.type.builtin.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "?",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.ternary.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "never",
+		"t": "source.ts meta.type.declaration.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.ternary.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "T",
+		"t": "source.ts meta.type.declaration.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "source.ts meta.enum.declaration.ts storage.modifier.ts",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.enum.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "enum",
+		"t": "source.ts meta.enum.declaration.ts storage.type.enum.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.enum.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "EnumName",
+		"t": "source.ts meta.enum.declaration.ts entity.name.type.enum.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.enum.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.ts meta.enum.declaration.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "    ",
+		"t": "source.ts meta.enum.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "one",
+		"t": "source.ts meta.enum.declaration.ts variable.other.enummember.ts",
+		"r": {
+			"dark_plus": "variable.other.enummember: #4FC1FF",
+			"light_plus": "variable.other.enummember: #0070C1",
+			"dark_vs": "variable.other.enummember: #B5CEA8",
+			"light_vs": "variable.other.enummember: #098658",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable.other.enummember: #4FC1FF",
+			"hc_light": "variable.other.enummember: #02715D",
+			"light_modern": "variable.other.enummember: #0070C1"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.enum.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.enum.declaration.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.enum.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "1",
+		"t": "source.ts meta.enum.declaration.ts constant.numeric.decimal.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.enum.declaration.ts punctuation.separator.comma.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.ts meta.enum.declaration.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "void",
+		"t": "source.ts keyword.operator.expression.void.ts",
+		"r": {
+			"dark_plus": "keyword.operator.expression: #569CD6",
+			"light_plus": "keyword.operator.expression: #0000FF",
+			"dark_vs": "keyword.operator.expression: #569CD6",
+			"light_vs": "keyword.operator.expression: #0000FF",
+			"hc_black": "keyword.operator.expression: #569CD6",
+			"dark_modern": "keyword.operator.expression: #569CD6",
+			"hc_light": "keyword.operator.expression: #0F4A85",
+			"light_modern": "keyword.operator.expression: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "0",
+		"t": "source.ts constant.numeric.decimal.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "source.ts meta.function.ts storage.type.function.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "*",
+		"t": "source.ts meta.function.ts keyword.generator.asterisk.ts",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6",
+			"dark_modern": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_modern": "keyword: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "makeIterator",
+		"t": "source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "start",
+		"t": "source.ts meta.function.ts meta.parameters.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.function.ts meta.parameters.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "0",
+		"t": "source.ts meta.function.ts meta.parameters.ts constant.numeric.decimal.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "end",
+		"t": "source.ts meta.function.ts meta.parameters.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.function.ts meta.parameters.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "Infinity",
+		"t": "source.ts meta.function.ts meta.parameters.ts constant.language.infinity.ts",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "step",
+		"t": "source.ts meta.function.ts meta.parameters.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.function.ts meta.parameters.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "1",
+		"t": "source.ts meta.function.ts meta.parameters.ts constant.numeric.decimal.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "source.ts meta.function.ts storage.type.function.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "makeDate",
+		"t": "source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "timestamp",
+		"t": "source.ts meta.function.ts meta.parameters.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "number",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.return.type.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.return.type.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "Date",
+		"t": "source.ts meta.function.ts meta.return.type.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "source.ts meta.function.ts storage.type.function.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "makeDate",
+		"t": "source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "m",
+		"t": "source.ts meta.function.ts meta.parameters.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "number",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "d",
+		"t": "source.ts meta.function.ts meta.parameters.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "number",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "y",
+		"t": "source.ts meta.function.ts meta.parameters.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "number",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.return.type.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.return.type.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "Date",
+		"t": "source.ts meta.function.ts meta.return.type.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "source.ts meta.function.ts storage.type.function.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "makeDate",
+		"t": "source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "mOrTimestamp",
+		"t": "source.ts meta.function.ts meta.parameters.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "number",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "d",
+		"t": "source.ts meta.function.ts meta.parameters.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "?",
+		"t": "source.ts meta.function.ts meta.parameters.ts keyword.operator.optional.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "number",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.separator.parameter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "y",
+		"t": "source.ts meta.function.ts meta.parameters.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "?",
+		"t": "source.ts meta.function.ts meta.parameters.ts keyword.operator.optional.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "number",
+		"t": "source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "source.ts meta.function.ts meta.return.type.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.return.type.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "Date",
+		"t": "source.ts meta.function.ts meta.return.type.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.function.ts meta.return.type.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "source.ts meta.type.declaration.ts storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "StringNumberBooleans",
+		"t": "source.ts meta.type.declaration.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "[",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts meta.brace.square.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "string",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts punctuation.separator.comma.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "number",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts punctuation.separator.comma.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "...",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts keyword.operator.rest.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "boolean",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "[]",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts meta.type.tuple.ts meta.brace.square.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "]",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts meta.brace.square.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "source.ts meta.type.declaration.ts storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "StringBooleansNumber",
+		"t": "source.ts meta.type.declaration.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "[",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts meta.brace.square.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "string",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts punctuation.separator.comma.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "...",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts keyword.operator.rest.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "boolean",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "[]",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts meta.type.tuple.ts meta.brace.square.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts punctuation.separator.comma.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "number",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "]",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts meta.brace.square.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "source.ts meta.type.declaration.ts storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "BooleansStringNumber",
+		"t": "source.ts meta.type.declaration.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "source.ts meta.type.declaration.ts keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "[",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts meta.brace.square.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "...",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts keyword.operator.rest.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "boolean",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "[]",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts meta.type.tuple.ts meta.brace.square.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts punctuation.separator.comma.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "string",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts punctuation.separator.comma.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "number",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "]",
+		"t": "source.ts meta.type.declaration.ts meta.type.tuple.ts meta.brace.square.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "source.ts punctuation.terminator.statement.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	}
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json
index 296cc9092daa..a5a8c33bf22b 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
@@ -239,21 +239,21 @@
 	},
 	{
 		"c": "type",
-		"t": "keyword.control.ts",
+		"t": "storage.type.type.ts",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0",
-			"dark_modern": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
 		}
 	},
 	{
 		"c": "T",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts entity.name.type.alias.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -645,7 +645,7 @@
 	},
 	{
 		"c": "A",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts entity.name.type.interface.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1373,21 +1373,21 @@
 	},
 	{
 		"c": "type",
-		"t": "keyword.control.ts",
+		"t": "storage.type.type.ts",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0",
-			"dark_modern": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
 		}
 	},
 	{
 		"c": "One",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts entity.name.type.alias.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1471,21 +1471,21 @@
 	},
 	{
 		"c": "type",
-		"t": "keyword.control.ts",
+		"t": "storage.type.type.ts",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0",
-			"dark_modern": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
 		}
 	},
 	{
 		"c": "Two",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts entity.name.type.alias.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1807,21 +1807,21 @@
 	},
 	{
 		"c": "type",
-		"t": "keyword.control.ts",
+		"t": "storage.type.type.ts",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0",
-			"dark_modern": "keyword.control: #C586C0",
-			"hc_light": "keyword.control: #B5200D",
-			"light_modern": "keyword.control: #AF00DB"
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
 		}
 	},
 	{
 		"c": "Rec",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts entity.name.type.alias.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1849,7 +1849,7 @@
 	},
 	{
 		"c": "Record",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1863,7 +1863,7 @@
 	},
 	{
 		"c": "<",
-		"t": "punctuation.definition.typeparameters.ts",
+		"t": "punctuation.definition.typeparameters.begin.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1919,7 +1919,7 @@
 	},
 	{
 		"c": ">",
-		"t": "punctuation.definition.typeparameters.ts",
+		"t": "punctuation.definition.typeparameters.end.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
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 f34090b7b826..5e8481b6289e 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
@@ -1737,7 +1737,7 @@
 	},
 	{
 		"c": "A",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts entity.name.type.class.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1751,7 +1751,7 @@
 	},
 	{
 		"c": "<",
-		"t": "",
+		"t": "punctuation.definition.typeparameters.begin.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1807,7 +1807,7 @@
 	},
 	{
 		"c": ">",
-		"t": "",
+		"t": "punctuation.definition.typeparameters.end.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1863,7 +1863,7 @@
 	},
 	{
 		"c": "A1",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts entity.name.type.class.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1877,7 +1877,7 @@
 	},
 	{
 		"c": "<",
-		"t": "",
+		"t": "punctuation.definition.typeparameters.begin.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2031,7 +2031,7 @@
 	},
 	{
 		"c": ">",
-		"t": "",
+		"t": "punctuation.definition.typeparameters.end.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2087,7 +2087,7 @@
 	},
 	{
 		"c": "B",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts entity.name.type.class.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -2143,7 +2143,7 @@
 	},
 	{
 		"c": "C",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts entity.name.type.class.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -2213,7 +2213,7 @@
 	},
 	{
 		"c": "<",
-		"t": "",
+		"t": "punctuation.definition.typeparameters.begin.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2241,7 +2241,7 @@
 	},
 	{
 		"c": ">",
-		"t": "",
+		"t": "punctuation.definition.typeparameters.end.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2409,7 +2409,7 @@
 	},
 	{
 		"c": "<",
-		"t": "punctuation.definition.typeparameters.ts",
+		"t": "punctuation.definition.typeparameters.begin.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2563,7 +2563,7 @@
 	},
 	{
 		"c": ">",
-		"t": "punctuation.definition.typeparameters.ts",
+		"t": "punctuation.definition.typeparameters.end.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2647,7 +2647,7 @@
 	},
 	{
 		"c": "<",
-		"t": "punctuation.definition.typeparameters.ts",
+		"t": "punctuation.definition.typeparameters.begin.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2759,7 +2759,7 @@
 	},
 	{
 		"c": ">",
-		"t": "punctuation.definition.typeparameters.ts",
+		"t": "punctuation.definition.typeparameters.end.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3081,7 +3081,7 @@
 	},
 	{
 		"c": "<",
-		"t": "punctuation.definition.typeparameters.ts",
+		"t": "punctuation.definition.typeparameters.begin.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -3109,7 +3109,7 @@
 	},
 	{
 		"c": ">",
-		"t": "punctuation.definition.typeparameters.ts",
+		"t": "punctuation.definition.typeparameters.end.ts",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
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
new file mode 100644
index 000000000000..6d4254d3ab7d
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue241715_ts.json
@@ -0,0 +1,4692 @@
+[
+	{
+		"c": "type",
+		"t": "storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "obj",
+		"t": "entity.name.type.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "[",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "key",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "string",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "]",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "any",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "destruct",
+		"t": "variable.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "start",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "end",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "message",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "any",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "any",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "keyword.control.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "start",
+		"t": "variable.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "+",
+		"t": "keyword.operator.arithmetic.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "end",
+		"t": "variable.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "+",
+		"t": "keyword.operator.arithmetic.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "message",
+		"t": "variable.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "destructArr",
+		"t": "variable.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "[",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "first",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "second",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "]",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "any",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "any",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "keyword.control.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "first",
+		"t": "variable.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "+",
+		"t": "keyword.operator.arithmetic.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "second",
+		"t": "variable.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "interface",
+		"t": "storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "WebviewMessageUpdateEverything",
+		"t": "entity.name.type.ts entity.name.type.interface.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "extends",
+		"t": "storage.modifier.ts",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "WebviewMessageBase",
+		"t": "entity.name.type.ts entity.other.inherited-class.ts",
+		"r": {
+			"dark_plus": "entity.other.inherited-class: #4EC9B0",
+			"light_plus": "entity.other.inherited-class: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.other.inherited-class: #4EC9B0",
+			"dark_modern": "entity.other.inherited-class: #4EC9B0",
+			"hc_light": "entity.other.inherited-class: #185E73",
+			"light_modern": "entity.other.inherited-class: #267F99"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "NegNum",
+		"t": "entity.name.type.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "-",
+		"t": "keyword.operator.arithmetic.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "1",
+		"t": "constant.numeric.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "|",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "-",
+		"t": "keyword.operator.arithmetic.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "2",
+		"t": "constant.numeric.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "|",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "-",
+		"t": "keyword.operator.arithmetic.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "10",
+		"t": "constant.numeric.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "n",
+		"t": "variable.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "NegNum",
+		"t": "entity.name.type.ts meta.type.annotation.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "-",
+		"t": "keyword.operator.arithmetic.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "10",
+		"t": "constant.numeric.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "export",
+		"t": "keyword.control.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "interface",
+		"t": "storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "OptionalMethod",
+		"t": "entity.name.type.ts entity.name.type.interface.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "optMeth",
+		"t": "variable.ts meta.definition.method.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "?",
+		"t": "punctuation.delimiter.ts keyword.operator.optional.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "(",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "any",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "window",
+		"t": "variable.ts variable.other.object.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "addEventListener",
+		"t": "variable.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts",
+		"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": "message",
+		"t": "string.quoted.single.ts",
+		"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.ts punctuation.definition.string.end.ts",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "event",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=>",
+		"t": "storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "keyword.control.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "event",
+		"t": "variable.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ")",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "export",
+		"t": "keyword.control.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "function",
+		"t": "storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "dayOfTheWeek",
+		"t": "variable.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "date",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "dayjs",
+		"t": "meta.type.annotation.ts entity.name.type.ts variable.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "meta.type.annotation.ts entity.name.type.ts punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "Dayjs",
+		"t": "meta.type.annotation.ts entity.name.type.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "string",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "keyword.control.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "date",
+		"t": "variable.ts variable.other.object.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ".",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "format",
+		"t": "variable.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts",
+		"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": "ddd",
+		"t": "string.quoted.single.ts",
+		"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.ts punctuation.definition.string.end.ts",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string: #0F4A85",
+			"light_modern": "string: #A31515"
+		}
+	},
+	{
+		"c": ")",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "N",
+		"t": "entity.name.type.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "never",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "|",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "any",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "|",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "unknown",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "Truthy",
+		"t": "entity.name.type.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "<",
+		"t": "punctuation.definition.typeparameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "T",
+		"t": "entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ">",
+		"t": "punctuation.definition.typeparameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "T",
+		"t": "entity.name.type.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "extends",
+		"t": "storage.modifier.ts",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts punctuation.definition.string.end.ts",
+		"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.ts punctuation.definition.string.begin.ts punctuation.definition.string.end.ts",
+		"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": "keyword.operator.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "|",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "false",
+		"t": "constant.language.boolean.false.ts support.type.builtin.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "|",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "null",
+		"t": "constant.language.null.ts support.type.builtin.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "|",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "undefined",
+		"t": "constant.language.undefined.ts support.type.builtin.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "?",
+		"t": "punctuation.delimiter.ts keyword.operator.ternary.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "never",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.ternary.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "T",
+		"t": "entity.name.type.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "export",
+		"t": "keyword.control.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "function",
+		"t": "storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "guardedBoolean",
+		"t": "variable.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "<",
+		"t": "punctuation.definition.typeparameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "T",
+		"t": "entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ">",
+		"t": "punctuation.definition.typeparameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "(",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "value",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "T",
+		"t": "entity.name.type.ts meta.type.annotation.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "value",
+		"t": "variable.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "is",
+		"t": "keyword.operator.expression.is.ts",
+		"r": {
+			"dark_plus": "keyword.operator.expression: #569CD6",
+			"light_plus": "keyword.operator.expression: #0000FF",
+			"dark_vs": "keyword.operator.expression: #569CD6",
+			"light_vs": "keyword.operator.expression: #0000FF",
+			"hc_black": "keyword.operator.expression: #569CD6",
+			"dark_modern": "keyword.operator.expression: #569CD6",
+			"hc_light": "keyword.operator.expression: #0F4A85",
+			"light_modern": "keyword.operator.expression: #0000FF"
+		}
+	},
+	{
+		"c": "Truthy",
+		"t": "entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "<",
+		"t": "punctuation.definition.typeparameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "T",
+		"t": "entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ">",
+		"t": "punctuation.definition.typeparameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "return",
+		"t": "keyword.control.ts",
+		"r": {
+			"dark_plus": "keyword.control: #C586C0",
+			"light_plus": "keyword.control: #AF00DB",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "keyword.control: #C586C0",
+			"dark_modern": "keyword.control: #C586C0",
+			"hc_light": "keyword.control: #B5200D",
+			"light_modern": "keyword.control: #AF00DB"
+		}
+	},
+	{
+		"c": "Boolean",
+		"t": "variable.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "value",
+		"t": "variable.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ")",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "Truthy",
+		"t": "entity.name.type.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "<",
+		"t": "punctuation.definition.typeparameters.begin.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "T",
+		"t": "entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ">",
+		"t": "punctuation.definition.typeparameters.end.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "T",
+		"t": "entity.name.type.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "extends",
+		"t": "storage.modifier.ts",
+		"r": {
+			"dark_plus": "storage.modifier: #569CD6",
+			"light_plus": "storage.modifier: #0000FF",
+			"dark_vs": "storage.modifier: #569CD6",
+			"light_vs": "storage.modifier: #0000FF",
+			"hc_black": "storage.modifier: #569CD6",
+			"dark_modern": "storage.modifier: #569CD6",
+			"hc_light": "storage.modifier: #0F4A85",
+			"light_modern": "storage.modifier: #0000FF"
+		}
+	},
+	{
+		"c": "'",
+		"t": "string.quoted.single.ts punctuation.definition.string.begin.ts punctuation.definition.string.end.ts",
+		"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.ts punctuation.definition.string.begin.ts punctuation.definition.string.end.ts",
+		"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": "keyword.operator.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": "|",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "false",
+		"t": "constant.language.boolean.false.ts support.type.builtin.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "|",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "null",
+		"t": "constant.language.null.ts support.type.builtin.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "|",
+		"t": "keyword.operator.ts keyword.operator.type.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "undefined",
+		"t": "constant.language.undefined.ts support.type.builtin.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "?",
+		"t": "punctuation.delimiter.ts keyword.operator.ternary.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "never",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.ternary.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "T",
+		"t": "entity.name.type.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "const",
+		"t": "storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "enum",
+		"t": "storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "EnumName",
+		"t": "variable.ts entity.name.type.enum.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "one",
+		"t": "variable.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "1",
+		"t": "constant.numeric.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "void",
+		"t": "keyword.operator.expression.void.ts",
+		"r": {
+			"dark_plus": "keyword.operator.expression: #569CD6",
+			"light_plus": "keyword.operator.expression: #0000FF",
+			"dark_vs": "keyword.operator.expression: #569CD6",
+			"light_vs": "keyword.operator.expression: #0000FF",
+			"hc_black": "keyword.operator.expression: #569CD6",
+			"dark_modern": "keyword.operator.expression: #569CD6",
+			"hc_light": "keyword.operator.expression: #0F4A85",
+			"light_modern": "keyword.operator.expression: #0000FF"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "*",
+		"t": "keyword.generator.asterisk.ts",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6",
+			"dark_modern": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_modern": "keyword: #0000FF"
+		}
+	},
+	{
+		"c": "makeIterator",
+		"t": "variable.ts meta.definition.function.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "start",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "0",
+		"t": "constant.numeric.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "end",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "Infinity",
+		"t": "variable.ts variable.parameter.ts constant.language.infinity.ts",
+		"r": {
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "step",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "1",
+		"t": "constant.numeric.ts",
+		"r": {
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #098658",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #098658",
+			"hc_black": "constant.numeric: #B5CEA8",
+			"dark_modern": "constant.numeric: #B5CEA8",
+			"hc_light": "constant.numeric: #096D48",
+			"light_modern": "constant.numeric: #098658"
+		}
+	},
+	{
+		"c": ")",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "makeDate",
+		"t": "variable.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "timestamp",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "Date",
+		"t": "entity.name.type.ts meta.type.annotation.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "makeDate",
+		"t": "variable.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "m",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "d",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "y",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "Date",
+		"t": "entity.name.type.ts meta.type.annotation.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "function",
+		"t": "storage.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "makeDate",
+		"t": "variable.ts entity.name.function.ts",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": "(",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "mOrTimestamp",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "d",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "?",
+		"t": "punctuation.delimiter.ts keyword.operator.optional.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "y",
+		"t": "variable.ts variable.parameter.ts",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
+		}
+	},
+	{
+		"c": "?",
+		"t": "punctuation.delimiter.ts keyword.operator.optional.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ")",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ":",
+		"t": "punctuation.delimiter.ts keyword.operator.type.annotation.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "Date",
+		"t": "entity.name.type.ts meta.type.annotation.ts entity.name.type.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "{",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "}",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "StringNumberBooleans",
+		"t": "entity.name.type.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "[",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "string",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "...",
+		"t": "keyword.operator.rest.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "boolean",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "[",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "]",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "]",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "StringBooleansNumber",
+		"t": "entity.name.type.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "[",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "string",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "...",
+		"t": "keyword.operator.rest.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "boolean",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "[",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "]",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "]",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "type",
+		"t": "storage.type.type.ts",
+		"r": {
+			"dark_plus": "storage.type: #569CD6",
+			"light_plus": "storage.type: #0000FF",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6",
+			"dark_modern": "storage.type: #569CD6",
+			"hc_light": "storage.type: #0F4A85",
+			"light_modern": "storage.type: #0000FF"
+		}
+	},
+	{
+		"c": "BooleansStringNumber",
+		"t": "entity.name.type.ts entity.name.type.alias.ts",
+		"r": {
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.type: #4EC9B0",
+			"dark_modern": "entity.name.type: #4EC9B0",
+			"hc_light": "entity.name.type: #185E73",
+			"light_modern": "entity.name.type: #267F99"
+		}
+	},
+	{
+		"c": "=",
+		"t": "keyword.operator.assignment.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "[",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "...",
+		"t": "keyword.operator.rest.ts",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
+		}
+	},
+	{
+		"c": "boolean",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "[",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "]",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "string",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": ",",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "number",
+		"t": "support.type.ts support.type.primitive.ts",
+		"r": {
+			"dark_plus": "support.type: #4EC9B0",
+			"light_plus": "support.type: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.type: #4EC9B0",
+			"dark_modern": "support.type: #4EC9B0",
+			"hc_light": "support.type: #185E73",
+			"light_modern": "support.type: #267F99"
+		}
+	},
+	{
+		"c": "]",
+		"t": "punctuation.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": ";",
+		"t": "punctuation.delimiter.ts",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	}
+]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5465_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5465_ts.json
index d89c57d852ab..100bf5c3d07b 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
@@ -15,30 +15,30 @@
 	},
 	{
 		"c": "*",
-		"t": "",
+		"t": "keyword.generator.asterisk.ts",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6",
+			"dark_modern": "keyword: #569CD6",
+			"hc_light": "keyword: #0F4A85",
+			"light_modern": "keyword: #0000FF"
 		}
 	},
 	{
 		"c": "foo2",
-		"t": "variable.ts",
+		"t": "variable.ts meta.definition.function.ts entity.name.function.ts",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "variable: #9CDCFE",
-			"dark_modern": "variable: #9CDCFE",
-			"hc_light": "variable: #001080",
-			"light_modern": "variable: #001080"
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
 		}
 	},
 	{
diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json
index c48a54b4fc3e..e57fa0af7ff6 100644
--- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json
+++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "A2",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts entity.name.type.class.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -239,7 +239,7 @@
 	},
 	{
 		"c": "A2",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts meta.type.annotation.ts entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
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 d10dc8e4d44e..b31e6daa154a 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
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts entity.name.type.class.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -827,7 +827,7 @@
 	},
 	{
 		"c": "GameOfLife",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts entity.name.type.class.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -2689,7 +2689,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts meta.type.annotation.ts entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -3291,7 +3291,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts meta.type.annotation.ts entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -4159,7 +4159,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts meta.type.annotation.ts entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -5139,7 +5139,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts meta.type.annotation.ts entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -5321,16 +5321,16 @@
 	},
 	{
 		"c": "-",
-		"t": "",
+		"t": "keyword.operator.arithmetic.ts",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -5545,16 +5545,16 @@
 	},
 	{
 		"c": "-",
-		"t": "",
+		"t": "keyword.operator.arithmetic.ts",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4",
+			"dark_modern": "keyword.operator: #D4D4D4",
+			"hc_light": "keyword.operator: #000000",
+			"light_modern": "keyword.operator: #000000"
 		}
 	},
 	{
@@ -8233,7 +8233,7 @@
 	},
 	{
 		"c": "Cell",
-		"t": "entity.name.type.ts",
+		"t": "entity.name.type.ts meta.type.annotation.ts entity.name.type.ts",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
diff --git a/src/vs/editor/common/languages/highlights/typescript.scm b/src/vs/editor/common/languages/highlights/typescript.scm
index bcd5f9fe5813..7b789592f614 100644
--- a/src/vs/editor/common/languages/highlights/typescript.scm
+++ b/src/vs/editor/common/languages/highlights/typescript.scm
@@ -68,6 +68,8 @@
 
 (function_expression
   name: (identifier) @entity.name.function.ts)
+(function_signature
+  name: (identifier) @entity.name.function.ts)
 (function_declaration
   name: (identifier) @entity.name.function.ts)
 (method_definition
@@ -78,6 +80,10 @@
   (#eq? @storage.type.ts "constructor"))
 (method_signature
   name: (property_identifier) @meta.definition.method.ts @entity.name.function.ts)
+(generator_function_declaration
+  "*" @keyword.generator.asterisk.ts)
+(generator_function_declaration
+  name: (identifier) @meta.definition.function.ts @entity.name.function.ts)
 
 (pair
   key: (property_identifier) @entity.name.function.ts
@@ -100,15 +106,31 @@
   (identifier) @variable.parameter.ts)
 
 (required_parameter
-  (rest_pattern
-    (identifier) @variable.parameter.ts))
+  (_
+    ([
+      (identifier)
+      (shorthand_property_identifier_pattern)
+    ]) @variable.parameter.ts))
 
 (optional_parameter
   (identifier) @variable.parameter.ts)
 
+(optional_parameter
+  (_
+    ([
+      (identifier)
+      (shorthand_property_identifier_pattern)
+    ]) @variable.parameter.ts))
+
 (catch_clause
   parameter: (identifier) @variable.parameter.ts)
 
+(index_signature
+  name: (identifier) @variable.parameter.ts)
+
+(arrow_function
+  parameter: (identifier) @variable.parameter.ts)
+
 ; Function and method calls
 
 (call_expression
@@ -132,11 +154,35 @@
 ; Special identifiers
 
 (predefined_type) @support.type.ts
-(predefined_type (["string" "boolean" "number" "any" "unknown"])) @support.type.primitive.ts
-(type_identifier) @entity.name.type.ts
+(predefined_type (["string" "boolean" "number" "any" "unknown" "never" "void"])) @support.type.primitive.ts
+
+(_
+  (type_identifier) @entity.name.type.ts)
+
+(type_annotation
+  ([
+    (type_identifier)
+    (nested_type_identifier)
+   ]) @meta.type.annotation.ts @entity.name.type.ts)
+
+(class_declaration
+  (type_identifier) @entity.name.type.class.ts)
+
+(type_alias_declaration
+  (type_identifier) @entity.name.type.alias.ts)
+(type_alias_declaration
+  value: (_
+    (type_identifier) @entity.name.type.ts))
+
+(interface_declaration
+  (type_identifier) @entity.name.type.interface.ts)
+
 (internal_module
   name: (identifier) @entity.name.type.ts)
 
+(enum_declaration
+  name: (identifier) @entity.name.type.enum.ts)
+
 (
   [
     (_ name: (identifier))
@@ -148,6 +194,9 @@
 (extends_clause
   value: (identifier) @entity.other.inherited-class.ts)
 
+(extends_type_clause
+  type: (type_identifier) @entity.other.inherited-class.ts)
+
 (implements_clause
   (type_identifier) @entity.other.inherited-class.ts)
 
@@ -188,6 +237,10 @@
   ">="
 ]) @keyword.operator.relational.ts)
 
+(unary_expression ([
+  "-"
+]) @keyword.operator.arithmetic.ts)
+
 [
   "="
 ] @keyword.operator.assignment.ts
@@ -239,6 +292,18 @@
 (type_annotation
   (":") @keyword.operator.type.annotation.ts)
 
+(index_signature
+  (":") @keyword.operator.type.annotation.ts)
+
+(type_predicate_annotation
+  (":") @keyword.operator.type.annotation.ts)
+
+(conditional_type
+  ([
+    "?"
+    ":"
+  ]) @keyword.operator.ternary.ts)
+
 [
   "{"
   "}"
@@ -257,8 +322,12 @@
   "}" @punctuation.definition.template-expression.end.ts)
 
 (type_arguments
-  "<" @punctuation.definition.typeparameters.ts
-  ">" @punctuation.definition.typeparameters.ts)
+  "<" @punctuation.definition.typeparameters.begin.ts
+  ">" @punctuation.definition.typeparameters.end.ts)
+
+(type_parameters
+  "<" @punctuation.definition.typeparameters.begin.ts
+  ">" @punctuation.definition.typeparameters.end.ts)
 
 ; Keywords
 
@@ -299,7 +368,6 @@
   "switch"
   "throw"
   "try"
-  "type"
   "while"
   "yield"
 ] @keyword.control.ts
@@ -332,6 +400,8 @@
   "var"
 ] @storage.type.ts
 
+("type") @storage.type.type.ts
+
 [
   "module"
 ] @storage.type.namespace.ts
@@ -344,9 +414,8 @@
 
 (regex_flags) @keyword.ts
 
-[
-  "void"
-] @support.type.primitive.ts
+(unary_expression
+  "void" @keyword.operator.expression.void.ts)
 
 [
   "new"
@@ -358,6 +427,9 @@
 (property_signature
   ("?") @keyword.operator.optional.ts)
 
+(method_signature
+  ("?") @keyword.operator.optional.ts)
+
 (optional_parameter
   ([
     "?"
@@ -375,6 +447,8 @@
 
 (rest_pattern
   ("...") @keyword.operator.rest.ts)
+(rest_type
+  ("...") @keyword.operator.rest.ts)
 
 (spread_element
   ("...") @keyword.operator.spread.ts)
diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
index 2ebaae84c0a9..affd38ab73ea 100644
--- a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
@@ -586,7 +586,7 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 					tokenIndex++;
 				}
 
-				endOffsetsAndScopes.splice(position, 0, { endOffset: endOffset, scopes: [...oldScopes, capture.name], bracket: brackets(capture, startOffset) });
+				endOffsetsAndScopes.splice(position, 0, { endOffset: endOffset, scopes: [capture.name, ...oldScopes], bracket: brackets(capture, startOffset) });
 				endOffsetsAndScopes[tokenIndex].bracket = oldBracket;
 			} else {
 				endOffsetsAndScopes[tokenIndex] = { endOffset: endOffset, scopes: [capture.name], bracket: brackets(capture, startOffset) };

From 20dccd9313cfdccda79d59fc12edb12eeb7fd937 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Mon, 10 Mar 2025 10:45:11 -0700
Subject: [PATCH 0746/1815] Remove redundant permission (#243098)

---
 src/vs/code/electron-main/app.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index e59527da2bd2..21a297a12d85 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -174,7 +174,6 @@ export class CodeApplication extends Disposable {
 
 		const allowedPermissionsInCore = new Set([
 			'media',
-			'font-access',
 			'local-fonts',
 			// TODO(deepak1556): Should be removed once migration is complete
 			// https://github.com/microsoft/vscode/issues/239228

From 0bec97c0bf5b9404909e0f359cd6b1bd4f9ae1e5 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Mon, 10 Mar 2025 11:22:52 -0700
Subject: [PATCH 0747/1815] re #243049. property initialisation order for file
 user data provider. (#243101)

---
 build/lib/propertyInitOrderChecker.js         |  1 -
 build/lib/propertyInitOrderChecker.ts         |  1 -
 .../userData/common/fileUserDataProvider.ts   | 20 ++++++++++++-------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index 1bf6e453e0ce..a0f03f7e8abe 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -74,7 +74,6 @@ const ignored = new Set([
     'vs/platform/extensionManagement/common/extensionsScannerService.ts',
     'vs/platform/utilityProcess/electron-main/utilityProcessWorkerMainService.ts',
     'vs/platform/configuration/common/configurations.ts',
-    'vs/platform/userData/common/fileUserDataProvider.ts',
     'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.ts',
     'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.ts',
     'vs/editor/common/model/textModelTokens.ts',
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index 9bcae6abef3e..36f219ff25af 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -43,7 +43,6 @@ const ignored = new Set([
 	'vs/platform/extensionManagement/common/extensionsScannerService.ts',
 	'vs/platform/utilityProcess/electron-main/utilityProcessWorkerMainService.ts',
 	'vs/platform/configuration/common/configurations.ts',
-	'vs/platform/userData/common/fileUserDataProvider.ts',
 	'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.ts',
 	'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.ts',
 	'vs/editor/common/model/textModelTokens.ts',
diff --git a/src/vs/platform/userData/common/fileUserDataProvider.ts b/src/vs/platform/userData/common/fileUserDataProvider.ts
index 1cfd07ec02b2..efa390b0ad2c 100644
--- a/src/vs/platform/userData/common/fileUserDataProvider.ts
+++ b/src/vs/platform/userData/common/fileUserDataProvider.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 { Emitter } from '../../../base/common/event.js';
+import { Emitter, Event } from '../../../base/common/event.js';
 import { Disposable, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { IFileSystemProviderWithFileReadWriteCapability, IFileChange, IWatchOptions, IStat, IFileOverwriteOptions, FileType, IFileWriteOptions, IFileDeleteOptions, FileSystemProviderCapabilities, IFileSystemProviderWithFileReadStreamCapability, IFileReadStreamOptions, IFileSystemProviderWithFileAtomicReadCapability, hasFileFolderCopyCapability, IFileSystemProviderWithOpenReadWriteCloseCapability, IFileOpenOptions, IFileSystemProviderWithFileAtomicWriteCapability, IFileSystemProviderWithFileAtomicDeleteCapability, IFileSystemProviderWithFileFolderCopyCapability, IFileSystemProviderWithFileCloneCapability, hasFileCloneCapability, IFileAtomicReadOptions, IFileAtomicOptions } from '../../files/common/files.js';
 import { URI } from '../../../base/common/uri.js';
@@ -29,14 +29,14 @@ export class FileUserDataProvider extends Disposable implements
 	IFileSystemProviderWithFileAtomicDeleteCapability,
 	IFileSystemProviderWithFileCloneCapability {
 
-	readonly capabilities = this.fileSystemProvider.capabilities;
-	readonly onDidChangeCapabilities = this.fileSystemProvider.onDidChangeCapabilities;
+	readonly capabilities: FileSystemProviderCapabilities;
+	readonly onDidChangeCapabilities: Event<void>;
 
-	private readonly _onDidChangeFile = this._register(new Emitter<readonly IFileChange[]>());
-	readonly onDidChangeFile = this._onDidChangeFile.event;
+	private readonly _onDidChangeFile: Emitter<readonly IFileChange[]>;
+	readonly onDidChangeFile: Event<readonly IFileChange[]>;
 
-	private readonly watchResources = TernarySearchTree.forUris<URI>(() => !(this.capabilities & FileSystemProviderCapabilities.PathCaseSensitive));
-	private readonly atomicReadWriteResources = new ResourceSet((uri) => this.uriIdentityService.extUri.getComparisonKey(this.toFileSystemResource(uri)));
+	private readonly watchResources: TernarySearchTree<URI, URI>;
+	private readonly atomicReadWriteResources: ResourceSet;
 
 	constructor(
 		private readonly fileSystemScheme: string,
@@ -47,6 +47,12 @@ export class FileUserDataProvider extends Disposable implements
 		private readonly logService: ILogService,
 	) {
 		super();
+		this.capabilities = this.fileSystemProvider.capabilities;
+		this.onDidChangeCapabilities = this.fileSystemProvider.onDidChangeCapabilities;
+		this._onDidChangeFile = this._register(new Emitter());
+		this.onDidChangeFile = this._onDidChangeFile.event;
+		this.watchResources = TernarySearchTree.forUris(() => !(this.capabilities & 1024 /* FileSystemProviderCapabilities.PathCaseSensitive */));
+		this.atomicReadWriteResources = new ResourceSet((uri) => this.uriIdentityService.extUri.getComparisonKey(this.toFileSystemResource(uri)));
 		this.updateAtomicReadWritesResources();
 		this._register(userDataProfilesService.onDidChangeProfiles(() => this.updateAtomicReadWritesResources()));
 		this._register(this.fileSystemProvider.onDidChangeFile(e => this.handleFileChanges(e)));

From 4e8d2667e65f6fcf35704ac6577d58e95074b93a Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Mon, 10 Mar 2025 11:44:48 -0700
Subject: [PATCH 0748/1815] Add proper "when" clause for "Switch to next model"
 (#243104)

---
 .../workbench/contrib/chat/browser/actions/chatExecuteActions.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index 2f67d98e4c6f..060244893471 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -223,6 +223,7 @@ export class SwitchToNextModelAction extends Action2 {
 			keybinding: {
 				primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Period,
 				weight: KeybindingWeight.WorkbenchContrib,
+				when: ChatContextKeys.inChatInput
 			},
 			menu: {
 				id: MenuId.ChatExecute,

From 2c19ac01f38962501770e2e49189e49099a68adf Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Mon, 10 Mar 2025 12:00:27 -0700
Subject: [PATCH 0749/1815] Add languageModelToolsForAgent proposal (#243105)

To have a cleaner proposal to enable the tag for extensions to contribute tools to agent mode
---
 .../extensions/common/extensionsApiProposals.ts       |  3 +++
 .../common/tools/languageModelToolsContribution.ts    | 11 ++++++++++-
 .../vscode.proposed.languageModelToolsForAgent.d.ts   |  8 ++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 src/vscode-dts/vscode.proposed.languageModelToolsForAgent.d.ts

diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index a33708b4972c..80042f2c555c 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -226,6 +226,9 @@ const _allApiProposals = {
 	languageModelSystem: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelSystem.d.ts',
 	},
+	languageModelToolsForAgent: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelToolsForAgent.d.ts',
+	},
 	languageStatusText: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageStatusText.d.ts',
 	},
diff --git a/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts
index e75fb61664af..d375686f5536 100644
--- a/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts
@@ -135,6 +135,8 @@ function toToolKey(extensionIdentifier: ExtensionIdentifier, toolName: string) {
 	return `${extensionIdentifier.value}/${toolName}`;
 }
 
+const CopilotAgentModeTag = 'vscode_editing';
+
 export class LanguageModelToolsExtensionPointHandler implements IWorkbenchContribution {
 	static readonly ID = 'workbench.contrib.toolsExtensionPointHandler';
 
@@ -167,7 +169,14 @@ export class LanguageModelToolsExtensionPointHandler implements IWorkbenchContri
 						continue;
 					}
 
-					if (rawTool.tags?.some(tag => tag.startsWith('copilot_') || tag.startsWith('vscode_')) && !isProposedApiEnabled(extension.description, 'chatParticipantPrivate')) {
+					if (rawTool.tags?.includes(CopilotAgentModeTag)) {
+						if (!isProposedApiEnabled(extension.description, 'languageModelToolsForAgent') && !isProposedApiEnabled(extension.description, 'chatParticipantPrivate')) {
+							logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with tag "${CopilotAgentModeTag}" without enabling 'languageModelToolsForAgent' proposal`);
+							continue;
+						}
+					}
+
+					if (rawTool.tags?.some(tag => tag !== CopilotAgentModeTag && (tag.startsWith('copilot_') || tag.startsWith('vscode_'))) && !isProposedApiEnabled(extension.description, 'chatParticipantPrivate')) {
 						logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with tags starting with "vscode_" or "copilot_"`);
 						continue;
 					}
diff --git a/src/vscode-dts/vscode.proposed.languageModelToolsForAgent.d.ts b/src/vscode-dts/vscode.proposed.languageModelToolsForAgent.d.ts
new file mode 100644
index 000000000000..9190a1c18b82
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.languageModelToolsForAgent.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 'vscode' {
+	// Enables access to providing language model tools to agent mode
+}

From cb807ec6ae375343d9bffbaeb5ea9c1f45055ad3 Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <2644648+TylerLeonhardt@users.noreply.github.com>
Date: Mon, 10 Mar 2025 12:17:25 -0700
Subject: [PATCH 0750/1815] Fix a few property call patterns (#243109)

ref https://github.com/microsoft/vscode/issues/243049
---
 .../browser/quickInputController.ts           | 22 ++++++++++++-------
 .../authenticationExtensionsService.ts        | 16 ++++++++------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/vs/platform/quickinput/browser/quickInputController.ts b/src/vs/platform/quickinput/browser/quickInputController.ts
index f4de62bbabce..47b007a41931 100644
--- a/src/vs/platform/quickinput/browser/quickInputController.ts
+++ b/src/vs/platform/quickinput/browser/quickInputController.ts
@@ -17,14 +17,14 @@ import { Disposable, DisposableStore, dispose } from '../../../base/common/lifec
 import Severity from '../../../base/common/severity.js';
 import { isString } from '../../../base/common/types.js';
 import { localize } from '../../../nls.js';
-import { IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInput, IQuickInputButton, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, IQuickWidget, QuickInputHideReason, QuickPickInput, QuickPickFocus } from '../common/quickInput.js';
+import { IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInput, IQuickInputButton, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, IQuickWidget, QuickInputHideReason, QuickPickInput, QuickPickFocus, QuickInputType } from '../common/quickInput.js';
 import { QuickInputBox } from './quickInputBox.js';
 import { QuickInputUI, Writeable, IQuickInputStyles, IQuickInputOptions, QuickPick, backButton, InputBox, Visibilities, QuickWidget, InQuickInputContextKey, QuickInputTypeContextKey, EndOfQuickInputBoxContextKey, QuickInputAlignmentContextKey } from './quickInput.js';
 import { ILayoutService } from '../../layout/browser/layoutService.js';
 import { mainWindow } from '../../../base/browser/window.js';
 import { IInstantiationService } from '../../instantiation/common/instantiation.js';
 import { QuickInputTree } from './quickInputTree.js';
-import { IContextKeyService } from '../../contextkey/common/contextkey.js';
+import { IContextKey, IContextKeyService } from '../../contextkey/common/contextkey.js';
 import './quickInputActions.js';
 import { autorun, observableValue } from '../../../base/common/observable.js';
 import { StandardMouseEvent } from '../../../base/browser/mouseEvent.js';
@@ -75,18 +75,23 @@ export class QuickInputController extends Disposable {
 	private viewState: QuickInputViewState | undefined;
 	private dndController: QuickInputDragAndDropController | undefined;
 
-	private readonly inQuickInputContext = InQuickInputContextKey.bindTo(this.contextKeyService);
-	private readonly quickInputTypeContext = QuickInputTypeContextKey.bindTo(this.contextKeyService);
-	private readonly endOfQuickInputBoxContext = EndOfQuickInputBoxContextKey.bindTo(this.contextKeyService);
+	private readonly inQuickInputContext: IContextKey<boolean>;
+	private readonly quickInputTypeContext: IContextKey<QuickInputType>;
+	private readonly endOfQuickInputBoxContext: IContextKey<boolean>;
 
 	constructor(
 		private options: IQuickInputOptions,
 		@ILayoutService private readonly layoutService: ILayoutService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IContextKeyService contextKeyService: IContextKeyService,
 		@IStorageService private readonly storageService: IStorageService
 	) {
 		super();
+
+		this.inQuickInputContext = InQuickInputContextKey.bindTo(contextKeyService);
+		this.quickInputTypeContext = QuickInputTypeContextKey.bindTo(contextKeyService);
+		this.endOfQuickInputBoxContext = EndOfQuickInputBoxContextKey.bindTo(contextKeyService);
+
 		this.idPrefix = options.idPrefix;
 		this._container = options.container;
 		this.styles = options.styles;
@@ -911,7 +916,7 @@ class QuickInputDragAndDropController extends Disposable {
 	private readonly _controlsOnLeft: boolean;
 	private readonly _controlsOnRight: boolean;
 
-	private _quickInputAlignmentContext = QuickInputAlignmentContextKey.bindTo(this._contextKeyService);
+	private _quickInputAlignmentContext: IContextKey<'center' | 'top' | undefined>;
 
 	constructor(
 		private _container: HTMLElement,
@@ -919,10 +924,11 @@ class QuickInputDragAndDropController extends Disposable {
 		private _quickInputDragAreas: { node: HTMLElement; includeChildren: boolean }[],
 		initialViewState: QuickInputViewState | undefined,
 		@ILayoutService private readonly _layoutService: ILayoutService,
-		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		super();
+		this._quickInputAlignmentContext = QuickInputAlignmentContextKey.bindTo(contextKeyService);
 		const customWindowControls = getWindowControlsStyle(this.configurationService) === WindowControlsStyle.CUSTOM;
 
 		// Do not allow the widget to overflow or underflow window controls.
diff --git a/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.ts b/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.ts
index af74628d58ce..ff0e09e7f311 100644
--- a/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.ts
+++ b/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.ts
@@ -42,13 +42,8 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 	private _onDidAccountPreferenceChange: Emitter<{ providerId: string; extensionIds: string[] }> = this._register(new Emitter<{ providerId: string; extensionIds: string[] }>());
 	readonly onDidChangeAccountPreference = this._onDidAccountPreferenceChange.event;
 
-	private _inheritAuthAccountPreferenceParentToChildren: Record<string, string[]> = this._productService.inheritAuthAccountPreference || {};
-	private _inheritAuthAccountPreferenceChildToParent = Object.entries(this._inheritAuthAccountPreferenceParentToChildren).reduce<{ [extensionId: string]: string }>((acc, [parent, children]) => {
-		children.forEach((child: string) => {
-			acc[child] = parent;
-		});
-		return acc;
-	}, {});
+	private _inheritAuthAccountPreferenceParentToChildren: Record<string, string[]>;
+	private _inheritAuthAccountPreferenceChildToParent: { [extensionId: string]: string };
 
 	constructor(
 		@IActivityService private readonly activityService: IActivityService,
@@ -61,6 +56,13 @@ export class AuthenticationExtensionsService extends Disposable implements IAuth
 		@IAuthenticationAccessService private readonly _authenticationAccessService: IAuthenticationAccessService
 	) {
 		super();
+		this._inheritAuthAccountPreferenceParentToChildren = this._productService.inheritAuthAccountPreference || {};
+		this._inheritAuthAccountPreferenceChildToParent = Object.entries(this._inheritAuthAccountPreferenceParentToChildren).reduce<{ [extensionId: string]: string }>((acc, [parent, children]) => {
+			children.forEach((child: string) => {
+				acc[child] = parent;
+			});
+			return acc;
+		}, {});
 		this.registerListeners();
 	}
 

From 393f929eff78295f740f2c801728d9238d8c6ec7 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Mon, 10 Mar 2025 16:48:00 -0400
Subject: [PATCH 0751/1815] add `getInstalledExtensions` generators (#242704)

---
 .../src/completions/code-insiders.ts          |  7 ++-
 .../terminal-suggest/src/completions/code.ts  | 45 +++++++++++++++----
 .../generators/scriptSuggestionsGenerator.ts  |  3 +-
 .../terminal-suggest/src/fig/execute.ts       |  2 +-
 .../src/terminalSuggestMain.ts                | 35 ++++++++++++---
 .../src/test/completions/code.test.ts         |  6 +--
 6 files changed, 78 insertions(+), 20 deletions(-)

diff --git a/extensions/terminal-suggest/src/completions/code-insiders.ts b/extensions/terminal-suggest/src/completions/code-insiders.ts
index 89d01dc536ff..1eb4f04acb17 100644
--- a/extensions/terminal-suggest/src/completions/code-insiders.ts
+++ b/extensions/terminal-suggest/src/completions/code-insiders.ts
@@ -2,12 +2,17 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import code from './code';
+import code, { commonOptions, extensionManagementOptions, troubleshootingOptions } from './code';
 
 const codeInsidersCompletionSpec: Fig.Spec = {
 	...code,
 	name: 'code-insiders',
 	description: 'Visual Studio Code Insiders',
+	options: [
+		...commonOptions,
+		...extensionManagementOptions('code-insiders'),
+		...troubleshootingOptions('code-insiders'),
+	],
 };
 
 export default codeInsidersCompletionSpec;
diff --git a/extensions/terminal-suggest/src/completions/code.ts b/extensions/terminal-suggest/src/completions/code.ts
index 9830d6cff422..919253c387f6 100644
--- a/extensions/terminal-suggest/src/completions/code.ts
+++ b/extensions/terminal-suggest/src/completions/code.ts
@@ -3,7 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-const commonOptions: Fig.Option[] = [
+import { filepaths } from '../helpers/filepaths';
+
+export const commonOptions: Fig.Option[] = [
 	{
 		name: '-',
 		description: `Read from stdin (e.g. 'ps aux | grep code | code -')`,
@@ -60,7 +62,6 @@ const commonOptions: Fig.Option[] = [
 			'Open a file at the path on the specified line and character position',
 		args: {
 			name: 'file:line[:character]',
-			// TODO: Support :line[:character] completion?
 			template: 'filepaths',
 		},
 	},
@@ -153,7 +154,7 @@ const commonOptions: Fig.Option[] = [
 	}
 ];
 
-const extensionManagementOptions: Fig.Option[] = [
+export const extensionManagementOptions = (cliName: string): Fig.Option[] => [
 	{
 		name: '--extensions-dir',
 		description: 'Set the root path for extensions',
@@ -204,8 +205,13 @@ const extensionManagementOptions: Fig.Option[] = [
 		description:
 			`Installs or updates an extension. The argument is either an extension id or a path to a VSIX. The identifier of an extension is '\${ publisher }.\${ name }'. Use '--force' argument to update to latest version. To install a specific version provide '@\${version}'. For example: 'vscode.csharp@1.2.3'`,
 		args: {
-			// TODO: Create extension ID generator
 			name: 'extension-id[@version] | path-to-vsix',
+			generators: [
+				createCodeGenerators(cliName),
+				filepaths({
+					extensions: ['vsix'],
+				}),
+			],
 		},
 	},
 	{
@@ -217,8 +223,8 @@ const extensionManagementOptions: Fig.Option[] = [
 		name: '--uninstall-extension',
 		description: 'Uninstalls an extension',
 		args: {
-			// TODO: Create extension ID generator
 			name: 'extension-id',
+			generators: createCodeGenerators(cliName)
 		},
 	},
 	{
@@ -228,7 +234,7 @@ const extensionManagementOptions: Fig.Option[] = [
 	},
 ];
 
-const troubleshootingOptions: Fig.Option[] = [
+export const troubleshootingOptions = (cliName: string): Fig.Option[] => [
 	{
 		name: ['-v', '--version'],
 		description: 'Print version',
@@ -270,8 +276,8 @@ const troubleshootingOptions: Fig.Option[] = [
 		name: '--disable-extension',
 		description: 'Disable an extension',
 		args: {
-			// TODO: Create extension ID generator
 			name: 'extension-id',
+			generators: createCodeGenerators(cliName)
 		},
 	},
 	{
@@ -317,6 +323,26 @@ const troubleshootingOptions: Fig.Option[] = [
 	},
 ];
 
+export function createCodeGenerators(cliName: string): Fig.Generator {
+	return {
+		script: [cliName, '--list-extensions', '--show-versions'],
+		postProcess: parseInstalledExtensions
+	};
+}
+
+export function parseInstalledExtensions(out: string): Fig.Suggestion[] | undefined {
+	const extensions = out.split('\n').filter(Boolean).map((line) => {
+		const [id, version] = line.split('@');
+		return {
+			name: id,
+			type: 'option' as Fig.SuggestionType,
+			description: `Version: ${version}`
+		};
+	});
+	return extensions;
+}
+
+
 const codeCompletionSpec: Fig.Spec = {
 	name: 'code',
 	description: 'Visual Studio Code',
@@ -326,9 +352,10 @@ const codeCompletionSpec: Fig.Spec = {
 	},
 	options: [
 		...commonOptions,
-		...extensionManagementOptions,
-		...troubleshootingOptions,
+		...extensionManagementOptions('code'),
+		...troubleshootingOptions('code'),
 	],
 };
 
 export default codeCompletionSpec;
+
diff --git a/extensions/terminal-suggest/src/fig/autocomplete/generators/scriptSuggestionsGenerator.ts b/extensions/terminal-suggest/src/fig/autocomplete/generators/scriptSuggestionsGenerator.ts
index 07e90069d032..bd8463265c49 100644
--- a/extensions/terminal-suggest/src/fig/autocomplete/generators/scriptSuggestionsGenerator.ts
+++ b/extensions/terminal-suggest/src/fig/autocomplete/generators/scriptSuggestionsGenerator.ts
@@ -28,7 +28,7 @@ export async function getScriptSuggestions(
 	}
 
 	try {
-		const { isDangerous, tokenArray, currentWorkingDirectory } = context;
+		const { isDangerous, tokenArray, currentWorkingDirectory, environmentVariables } = context;
 		// A script can either be a string or a function that returns a string.
 		// If the script is a function, run it, and get the output string.
 		const commandToRun =
@@ -46,6 +46,7 @@ export async function getScriptSuggestions(
 				command: commandToRun[0],
 				args: commandToRun.slice(1),
 				cwd: currentWorkingDirectory,
+				env: environmentVariables
 			};
 		} else {
 			executeCommandInput = {
diff --git a/extensions/terminal-suggest/src/fig/execute.ts b/extensions/terminal-suggest/src/fig/execute.ts
index ab9792f61378..2c642019b671 100644
--- a/extensions/terminal-suggest/src/fig/execute.ts
+++ b/extensions/terminal-suggest/src/fig/execute.ts
@@ -20,7 +20,7 @@ export const executeCommandTimeout = async (
 ): Promise<Fig.ExecuteCommandOutput> => {
 	const command = [input.command, ...input.args].join(' ');
 	try {
-		console.info(`About to run shell command '${command}'`);
+		console.debug(`About to run shell command '${command}'`);
 		const result = await withTimeout(
 			Math.max(timeout, input.timeout ?? 0),
 			spawnHelper2(input.command, input.args, {
diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 02046d680ed3..ec8ceac83f22 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -320,12 +320,37 @@ function getShell(shellType: TerminalShellType): string | undefined {
 
 function getEnvAsRecord(shellIntegrationEnv: { [key: string]: string | undefined } | undefined): Record<string, string> {
 	const env: Record<string, string> = {};
-	if (shellIntegrationEnv) {
-		for (const [key, value] of Object.entries(shellIntegrationEnv)) {
-			if (typeof value === 'string') {
-				env[key] = value;
-			}
+	for (const [key, value] of Object.entries(shellIntegrationEnv ?? process.env)) {
+		if (typeof value === 'string') {
+			env[key] = value;
 		}
 	}
+	if (!shellIntegrationEnv) {
+		sanitizeProcessEnvironment(env);
+	}
 	return env;
 }
+
+export function sanitizeProcessEnvironment(env: Record<string, string>, ...preserve: string[]): void {
+	const set = preserve.reduce<Record<string, boolean>>((set, key) => {
+		set[key] = true;
+		return set;
+	}, {});
+	const keysToRemove = [
+		/^ELECTRON_.$/,
+		/^VSCODE_(?!(PORTABLE|SHELL_LOGIN|ENV_REPLACE|ENV_APPEND|ENV_PREPEND)).$/,
+		/^SNAP(|_.*)$/,
+		/^GDK_PIXBUF_.$/,
+	];
+	const envKeys = Object.keys(env);
+	envKeys
+		.filter(key => !set[key])
+		.forEach(envKey => {
+			for (let i = 0; i < keysToRemove.length; i) {
+				if (envKey.search(keysToRemove[i]) !== -1) {
+					delete env[envKey];
+					break;
+				}
+			}
+		});
+}
diff --git a/extensions/terminal-suggest/src/test/completions/code.test.ts b/extensions/terminal-suggest/src/test/completions/code.test.ts
index c6823d19a997..a7b6885f83d8 100644
--- a/extensions/terminal-suggest/src/test/completions/code.test.ts
+++ b/extensions/terminal-suggest/src/test/completions/code.test.ts
@@ -10,7 +10,6 @@ import codeInsidersCompletionSpec from '../../completions/code-insiders';
 
 export const codeSpecOptions = ['-', '--add', '--category', '--diff', '--disable-extension', '--disable-extensions', '--disable-gpu', '--enable-proposed-api', '--extensions-dir', '--goto', '--help', '--inspect-brk-extensions', '--inspect-extensions', '--install-extension', '--list-extensions', '--locale', '--locate-shell-integration-path', '--log', '--max-memory', '--merge', '--new-window', '--pre-release', '--prof-startup', '--profile', '--reuse-window', '--show-versions', '--status', '--sync', '--telemetry', '--uninstall-extension', '--user-data-dir', '--verbose', '--version', '--wait', '-a', '-d', '-g', '-h', '-m', '-n', '-r', '-s', '-v', '-w'];
 
-
 export function createCodeTestSpecs(executable: string): ITestSpec[] {
 	const localeOptions = ['bg', 'de', 'en', 'es', 'fr', 'hu', 'it', 'ja', 'ko', 'pt-br', 'ru', 'tr', 'zh-CN', 'zh-TW'];
 	const categoryOptions = ['azure', 'data science', 'debuggers', 'extension packs', 'education', 'formatters', 'keymaps', 'language packs', 'linters', 'machine learning', 'notebooks', 'programming languages', 'scm providers', 'snippets', 'testing', 'themes', 'visualization', 'other'];
@@ -39,8 +38,9 @@ export function createCodeTestSpecs(executable: string): ITestSpec[] {
 		{ input: `${executable} --goto |`, expectedResourceRequests: { type: 'files', cwd: testPaths.cwd } },
 		{ input: `${executable} --user-data-dir |`, expectedResourceRequests: { type: 'folders', cwd: testPaths.cwd } },
 		{ input: `${executable} --profile |` },
-		{ input: `${executable} --install-extension |` },
-		{ input: `${executable} --uninstall-extension |` },
+		{ input: `${executable} --install-extension |`, expectedCompletions: [executable], expectedResourceRequests: { type: 'both', cwd: testPaths.cwd } },
+		{ input: `${executable} --uninstall-extension |`, expectedCompletions: [executable] },
+		{ input: `${executable} --disable-extension |`, expectedCompletions: [executable] },
 		{ input: `${executable} --log |`, expectedCompletions: logOptions },
 		{ input: `${executable} --sync |`, expectedCompletions: syncOptions },
 		{ input: `${executable} --extensions-dir |`, expectedResourceRequests: { type: 'folders', cwd: testPaths.cwd } },

From 68ea1f64a348291b8b83395da6df33ded1d17614 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Mon, 10 Mar 2025 22:40:59 +0100
Subject: [PATCH 0752/1815] Fix issue where the chat widget service expects
 having a last focused widget even when focus could not be really set inside
 the chat widget

---
 src/vs/workbench/contrib/chat/browser/chatWidget.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index b7062cf6024f..9d31efdde9b2 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -528,6 +528,11 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 	focusInput(): void {
 		this.inputPart.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 {

From 1418a96b8e7acdf7609921fcff54eb0069ede5e5 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Mon, 10 Mar 2025 15:36:40 -0700
Subject: [PATCH 0753/1815] mcp: add tests and clean up some raciness in MCP
 handling

---
 .../contrib/mcp/common/mcpRegistry.ts         |   4 +-
 .../contrib/mcp/common/mcpServerConnection.ts |  37 +-
 .../mcp/common/mcpServerRequestHandler.ts     |  21 +-
 .../mcp/test/common/mcpRegistry.test.ts       | 276 ++++++++++++
 .../mcp/test/common/mcpRegistryTypes.ts       | 107 +++++
 .../test/common/mcpServerConnection.test.ts   | 425 ++++++++++++++++++
 .../common/mcpServerRequestHandler.test.ts    | 392 ++++++++++++++++
 7 files changed, 1248 insertions(+), 14 deletions(-)
 create mode 100644 src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
 create mode 100644 src/vs/workbench/contrib/mcp/test/common/mcpRegistryTypes.ts
 create mode 100644 src/vs/workbench/contrib/mcp/test/common/mcpServerConnection.test.ts
 create mode 100644 src/vs/workbench/contrib/mcp/test/common/mcpServerRequestHandler.test.ts

diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
index 417599b5d87f..fb96aa95cdd6 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
@@ -59,7 +59,7 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 
 	public hasSavedInputs(collection: McpCollectionDefinition, definition: McpServerDefinition): boolean {
 		const stored = this.getInputStorageData(collection, definition);
-		return !!stored && !isEmptyObject(stored.map);
+		return !!stored && !!stored.map && !isEmptyObject(stored.map);
 	}
 
 	public clearSavedInputs(collection: McpCollectionDefinition, definition: McpServerDefinition) {
@@ -84,7 +84,7 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 		if (definition.variableReplacement && storage) {
 			const { folder, section, target } = definition.variableReplacement;
 			// based on _configurationResolverService.resolveWithInteractionReplace
-			launch = await this._configurationResolverService.resolveAnyAsync(folder, section);
+			launch = await this._configurationResolverService.resolveAnyAsync(folder, launch);
 
 			const newVariables = await this._configurationResolverService.resolveWithInteraction(folder, launch, section, storage.map, target);
 
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServerConnection.ts b/src/vs/workbench/contrib/mcp/common/mcpServerConnection.ts
index ee65077e9da9..5016ebe7f531 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServerConnection.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServerConnection.ts
@@ -24,12 +24,13 @@ export class McpServerConnection extends Disposable implements IMcpServerConnect
 
 	private readonly _loggerId: string;
 	private readonly _logger: ILogger;
+	private _launchId = 0;
 
 	constructor(
 		private readonly _collection: McpCollectionDefinition,
 		public readonly definition: McpServerDefinition,
 		private readonly _delegate: IMcpHostDelegate,
-		private readonly _launchDefinition: McpServerLaunch,
+		public readonly launchDefinition: McpServerLaunch,
 		@ILoggerService private readonly _loggerService: ILoggerService,
 		@IOutputService private readonly _outputService: IOutputService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
@@ -52,13 +53,14 @@ export class McpServerConnection extends Disposable implements IMcpServerConnect
 			return this._waitForState(McpConnectionState.Kind.Running, McpConnectionState.Kind.Error);
 		}
 
+		const launchId = ++this._launchId;
 		this._launch.value = undefined;
 		this._state.set({ state: McpConnectionState.Kind.Starting }, undefined);
 		this._logger.info(localize('mcpServer.starting', 'Starting server {0}', this.definition.label));
 
 		try {
-			const launch = this._delegate.start(this._collection, this.definition, this._launchDefinition);
-			this._launch.value = this.adoptLaunch(launch);
+			const launch = this._delegate.start(this._collection, this.definition, this.launchDefinition);
+			this._launch.value = this.adoptLaunch(launch, launchId);
 			return this._waitForState(McpConnectionState.Kind.Running, McpConnectionState.Kind.Error);
 		} catch (e) {
 			const errorState: McpConnectionState = {
@@ -70,7 +72,7 @@ export class McpServerConnection extends Disposable implements IMcpServerConnect
 		}
 	}
 
-	private adoptLaunch(launch: IMcpMessageTransport): IReference<IMcpMessageTransport> {
+	private adoptLaunch(launch: IMcpMessageTransport, launchId: number): IReference<IMcpMessageTransport> {
 		const store = new DisposableStore();
 		const cts = new CancellationTokenSource();
 
@@ -79,18 +81,29 @@ export class McpServerConnection extends Disposable implements IMcpServerConnect
 		store.add(launch.onDidLog(msg => {
 			this._logger.info(msg);
 		}));
+
+		let didStart = false;
 		store.add(autorun(reader => {
 			const state = launch.state.read(reader);
 			this._state.set(state, undefined);
 			this._logger.info(localize('mcpServer.state', 'Connection state: {0}', McpConnectionState.toString(state)));
 
-			if (state.state === McpConnectionState.Kind.Running) {
+			if (state.state === McpConnectionState.Kind.Running && !didStart) {
+				didStart = true;
 				McpServerRequestHandler.create(this._instantiationService, launch, this._logger, cts.token).then(
-					handler => this._requestHandler.set(handler, undefined),
+					handler => {
+						if (this._launchId === launchId) {
+							this._requestHandler.set(handler, undefined);
+						} else {
+							handler.dispose();
+						}
+					},
 					err => {
 						store.dispose();
-						this._logger.error(err);
-						this._state.set({ state: McpConnectionState.Kind.Error, message: `Could not initialize MCP server: ${err.message}` }, undefined);
+						if (this._launchId === launchId) {
+							this._logger.error(err);
+							this._state.set({ state: McpConnectionState.Kind.Error, message: `Could not initialize MCP server: ${err.message}` }, undefined);
+						}
 					},
 				);
 			}
@@ -100,17 +113,25 @@ export class McpServerConnection extends Disposable implements IMcpServerConnect
 	}
 
 	public async stop(): Promise<void> {
+		this._launchId = -1;
 		this._logger.info(localize('mcpServer.stopping', 'Stopping server {0}', this.definition.label));
 		this._launch.value?.object.stop();
 		await this._waitForState(McpConnectionState.Kind.Stopped, McpConnectionState.Kind.Error);
 	}
 
 	public override dispose(): void {
+		this._launchId = -1;
+		this._requestHandler.get()?.dispose();
 		super.dispose();
 		this._state.set({ state: McpConnectionState.Kind.Stopped }, undefined);
 	}
 
 	private _waitForState(...kinds: McpConnectionState.Kind[]): Promise<McpConnectionState> {
+		const current = this._state.get();
+		if (kinds.includes(current.state)) {
+			return Promise.resolve(current);
+		}
+
 		return new Promise(resolve => {
 			const disposable = autorun(reader => {
 				const state = this._state.read(reader);
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServerRequestHandler.ts b/src/vs/workbench/contrib/mcp/common/mcpServerRequestHandler.ts
index 572c4ef2e159..992c71ec4b58 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServerRequestHandler.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServerRequestHandler.ts
@@ -8,11 +8,12 @@ import { DeferredPromise } from '../../../../base/common/async.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { autorun } from '../../../../base/common/observable.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogger } from '../../../../platform/log/common/log.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IMcpMessageTransport } from './mcpRegistryTypes.js';
-import { MpcResponseError } from './mcpTypes.js';
+import { McpConnectionState, MpcResponseError } from './mcpTypes.js';
 import { MCP } from './modelContextProtocol.js';
 
 /**
@@ -113,6 +114,14 @@ export class McpServerRequestHandler extends Disposable {
 	) {
 		super();
 		this._register(launch.onDidReceiveMessage(message => this.handleMessage(message)));
+		this._register(autorun(reader => {
+			const state = launch.state.read(reader).state;
+			// the handler will get disposed when the launch stops, but if we're still
+			// create()'ing we need to make sure to cancel the initialize request.
+			if (state === McpConnectionState.Kind.Error || state === McpConnectionState.Kind.Stopped) {
+				this.cancelAllRequests();
+			}
+		}));
 	}
 
 	/**
@@ -151,12 +160,12 @@ export class McpServerRequestHandler extends Disposable {
 
 		// Send the request
 		this.launch.send(jsonRpcRequest);
-		promise.p.finally(() => {
+		const ret = promise.p.finally(() => {
 			cancelListener.dispose();
 			this._pendingRequests.delete(id);
 		});
 
-		return promise.p as Promise<R>;
+		return ret as Promise<R>;
 	}
 
 	/**
@@ -352,9 +361,13 @@ export class McpServerRequestHandler extends Disposable {
 		return { roots: this._roots };
 	}
 
-	public override dispose(): void {
+	private cancelAllRequests() {
 		this._pendingRequests.forEach(pending => pending.promise.cancel());
 		this._pendingRequests.clear();
+	}
+
+	public override dispose(): void {
+		this.cancelAllRequests();
 		super.dispose();
 	}
 
diff --git a/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts b/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
new file mode 100644
index 000000000000..19465290098e
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { cloneAndChange } from '../../../../../base/common/objects.js';
+import { observableValue } from '../../../../../base/common/observable.js';
+import { upcast } from '../../../../../base/common/types.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ConfigurationTarget } from '../../../../../platform/configuration/common/configuration.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILoggerService } from '../../../../../platform/log/common/log.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { IConfigurationResolverService } from '../../../../services/configurationResolver/common/configurationResolver.js';
+import { IOutputService } from '../../../../services/output/common/output.js';
+import { TestLoggerService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
+import { McpRegistry } from '../../common/mcpRegistry.js';
+import { IMcpHostDelegate, IMcpMessageTransport } from '../../common/mcpRegistryTypes.js';
+import { McpServerConnection } from '../../common/mcpServerConnection.js';
+import { McpCollectionDefinition, McpServerDefinition, McpServerTransportType } from '../../common/mcpTypes.js';
+import { TestMcpMessageTransport } from './mcpRegistryTypes.js';
+
+class TestConfigurationResolverService implements Partial<IConfigurationResolverService> {
+	declare readonly _serviceBrand: undefined;
+
+	private interactiveCounter = 0;
+
+	// Used to simulate stored/resolved variables
+	private readonly resolvedVariables = new Map<string, string>();
+
+	constructor() {
+		// Add some test variables
+		this.resolvedVariables.set('workspaceFolder', '/test/workspace');
+		this.resolvedVariables.set('fileBasename', 'test.txt');
+	}
+
+	resolveAsync(folder: any, value: any): Promise<any> {
+		if (typeof value === 'string') {
+			return Promise.resolve(this.replaceVariables(value));
+		} else if (Array.isArray(value)) {
+			return Promise.resolve(value.map(v => typeof v === 'string' ? this.replaceVariables(v) : v));
+		} else {
+			const result: Record<string, any> = {};
+			for (const key in value) {
+				if (typeof value[key] === 'string') {
+					result[key] = this.replaceVariables(value[key]);
+				} else {
+					result[key] = value[key];
+				}
+			}
+			return Promise.resolve(result);
+		}
+	}
+
+	private replaceVariables(value: string): string {
+		let result = value;
+		for (const [key, val] of this.resolvedVariables.entries()) {
+			result = result.replace(`\${${key}}`, val);
+		}
+		return result;
+	}
+
+	resolveAnyAsync(folder: any, config: any, commandValueMapping?: Record<string, string>): Promise<any> {
+		// Use cloneAndChange to recursively replace variables in the config
+		const newConfig = cloneAndChange(config, (value) => {
+			if (typeof value === 'string') {
+				// Replace any ${variable} with its value
+				let result = value;
+				for (const [key, val] of this.resolvedVariables.entries()) {
+					result = result.replace(`\${${key}}`, val);
+				}
+
+				// If a commandValueMapping is provided, use it for additional replacements
+				if (commandValueMapping) {
+					for (const [key, val] of Object.entries(commandValueMapping)) {
+						result = result.replace(`\${${key}}`, val);
+					}
+				}
+
+				return result === value ? undefined : result;
+			}
+			return undefined;
+		});
+
+		return Promise.resolve(newConfig);
+	}
+
+	resolveWithInteraction(folder: any, config: any, section?: string, variables?: Record<string, string>, target?: ConfigurationTarget): Promise<Map<string, string> | undefined> {
+		// For testing, we simulate interaction by returning a map with some variables
+		const result = new Map<string, string>();
+		result.set('input:testInteractive', `interactiveValue${this.interactiveCounter++}`);
+		result.set('command:testCommand', `commandOutput${this.interactiveCounter++}}`);
+
+		// If variables are provided, include those too
+		if (variables) {
+			Object.entries(variables).forEach(([key, value]) => {
+				result.set(key, value);
+			});
+		}
+
+		return Promise.resolve(result);
+	}
+}
+
+class TestMcpHostDelegate implements IMcpHostDelegate {
+	canStart(): boolean {
+		return true;
+	}
+
+	start(): IMcpMessageTransport {
+		return new TestMcpMessageTransport();
+	}
+}
+
+suite('Workbench - MCP - Registry', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let registry: McpRegistry;
+	let testStorageService: TestStorageService;
+	let testConfigResolverService: TestConfigurationResolverService;
+	let testCollection: McpCollectionDefinition;
+	let baseDefinition: McpServerDefinition;
+
+	setup(() => {
+		testConfigResolverService = new TestConfigurationResolverService();
+		testStorageService = store.add(new TestStorageService());
+
+		const services = new ServiceCollection(
+			[IConfigurationResolverService, testConfigResolverService],
+			[IStorageService, testStorageService],
+			[ILoggerService, store.add(new TestLoggerService())],
+			[IOutputService, upcast({ showChannel: () => { } })],
+		);
+
+		const instaService = store.add(new TestInstantiationService(services));
+		registry = store.add(instaService.createInstance(McpRegistry));
+
+		// Create test collection that can be reused
+		testCollection = {
+			id: 'test-collection',
+			label: 'Test Collection',
+			remoteAuthority: null,
+			serverDefinitions: observableValue('serverDefs', []),
+			isTrustedByDefault: true,
+			scope: StorageScope.APPLICATION
+		};
+
+		// Create base definition that can be reused
+		baseDefinition = {
+			id: 'test-server',
+			label: 'Test Server',
+			launch: {
+				type: McpServerTransportType.Stdio,
+				command: 'test-command',
+				args: [],
+				env: {},
+				cwd: URI.parse('file:///test')
+			}
+		};
+	});
+
+	test('registerCollection adds collection to registry', () => {
+		const disposable = registry.registerCollection(testCollection);
+		store.add(disposable);
+
+		assert.strictEqual(registry.collections.get().length, 1);
+		assert.strictEqual(registry.collections.get()[0], testCollection);
+
+		disposable.dispose();
+		assert.strictEqual(registry.collections.get().length, 0);
+	});
+
+	test('registerDelegate adds delegate to registry', () => {
+		const delegate = new TestMcpHostDelegate();
+		const disposable = registry.registerDelegate(delegate);
+		store.add(disposable);
+
+		assert.strictEqual(registry.delegates.length, 1);
+		assert.strictEqual(registry.delegates[0], delegate);
+
+		disposable.dispose();
+		assert.strictEqual(registry.delegates.length, 0);
+	});
+
+	test('hasSavedInputs returns false when no inputs are saved', () => {
+		assert.strictEqual(registry.hasSavedInputs(testCollection, baseDefinition), false);
+	});
+
+	test('clearSavedInputs removes stored inputs', () => {
+		const definition: McpServerDefinition = {
+			...baseDefinition,
+			variableReplacement: {
+				section: 'mcp'
+			}
+		};
+
+		// Save some mock inputs
+		const key = `mcpConfig.${testCollection.id}.${definition.id}`;
+		testStorageService.store(key, JSON.stringify({ 'input:foo': 'bar' }), StorageScope.APPLICATION, StorageTarget.MACHINE);
+
+		assert.strictEqual(registry.hasSavedInputs(testCollection, definition), true);
+		registry.clearSavedInputs(testCollection, definition);
+		assert.strictEqual(registry.hasSavedInputs(testCollection, definition), false);
+	});
+
+	test('resolveConnection creates connection with resolved variables and memorizes them', async () => {
+		const definition: McpServerDefinition = {
+			...baseDefinition,
+			launch: {
+				type: McpServerTransportType.Stdio,
+				command: '${workspaceFolder}/cmd',
+				args: ['--file', '${fileBasename}'],
+				env: {
+					PATH: '${input:testInteractive}'
+				},
+				cwd: URI.parse('file:///test')
+			},
+			variableReplacement: {
+				section: 'mcp'
+			}
+		};
+
+		// Register a delegate that can handle the connection
+		const delegate = new TestMcpHostDelegate();
+		const disposable = registry.registerDelegate(delegate);
+		store.add(disposable);
+
+		const connection = await registry.resolveConnection(testCollection, definition) as McpServerConnection;
+
+		assert.ok(connection);
+		assert.strictEqual(connection.definition, definition);
+		assert.strictEqual((connection.launchDefinition as any).command, '/test/workspace/cmd');
+		assert.strictEqual((connection.launchDefinition as any).env.PATH, 'interactiveValue0');
+		connection.dispose();
+
+		const connection2 = await registry.resolveConnection(testCollection, definition) as McpServerConnection;
+
+		assert.ok(connection2);
+		assert.strictEqual((connection2.launchDefinition as any).env.PATH, 'interactiveValue0');
+		connection2.dispose();
+	});
+
+	test('resolveConnection with stored variables resolves them', async () => {
+		const definition: McpServerDefinition = {
+			...baseDefinition,
+			launch: {
+				type: McpServerTransportType.Stdio,
+				command: '${storedVar}',
+				args: [],
+				env: {},
+				cwd: URI.parse('file:///test')
+			},
+			variableReplacement: {
+				section: 'mcp'
+			}
+		};
+
+		// Save some mock inputs
+		const key = `mcpConfig.${testCollection.id}.${definition.id}`;
+		testStorageService.store(key, { 'storedVar': 'resolved-value' }, StorageScope.APPLICATION, StorageTarget.MACHINE);
+
+		// Register a delegate that can handle the connection
+		const delegate = new TestMcpHostDelegate();
+		const disposable = registry.registerDelegate(delegate);
+		store.add(disposable);
+
+		const connection = await registry.resolveConnection(testCollection, definition) as McpServerConnection;
+
+		assert.ok(connection);
+		assert.strictEqual((connection.launchDefinition as any).command, 'resolved-value');
+		connection.dispose();
+	});
+});
diff --git a/src/vs/workbench/contrib/mcp/test/common/mcpRegistryTypes.ts b/src/vs/workbench/contrib/mcp/test/common/mcpRegistryTypes.ts
new file mode 100644
index 000000000000..567c613329da
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpRegistryTypes.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 { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../../base/common/observable.js';
+import { IMcpMessageTransport } from '../../common/mcpRegistryTypes.js';
+import { McpConnectionState } from '../../common/mcpTypes.js';
+import { MCP } from '../../common/modelContextProtocol.js';
+
+/**
+ * Implementation of IMcpMessageTransport for testing purposes.
+ * Allows tests to easily send/receive messages and control the connection state.
+ */
+export class TestMcpMessageTransport extends Disposable implements IMcpMessageTransport {
+	private readonly _onDidLog = this._register(new Emitter<string>());
+	public readonly onDidLog = this._onDidLog.event;
+
+	private readonly _onDidReceiveMessage = this._register(new Emitter<MCP.JSONRPCMessage>());
+	public readonly onDidReceiveMessage = this._onDidReceiveMessage.event;
+
+	private readonly _stateValue = observableValue<McpConnectionState>('testTransportState', { state: McpConnectionState.Kind.Starting });
+	public readonly state = this._stateValue;
+
+	private readonly _sentMessages: MCP.JSONRPCMessage[] = [];
+
+	constructor() {
+		super();
+	}
+
+	/**
+	 * Send a message through the transport.
+	 */
+	public send(message: MCP.JSONRPCMessage): void {
+		this._sentMessages.push(message);
+	}
+
+	/**
+	 * Stop the transport.
+	 */
+	public stop(): void {
+		this._stateValue.set({ state: McpConnectionState.Kind.Stopped }, undefined);
+	}
+
+	// Test Helper Methods
+
+	/**
+	 * Simulate receiving a message from the server.
+	 */
+	public simulateReceiveMessage(message: MCP.JSONRPCMessage): void {
+		this._onDidReceiveMessage.fire(message);
+	}
+
+	/**
+	 * Simulates a reply to an 'initialized' request.
+	 */
+	public simulateInitialized() {
+		if (!this._sentMessages.length) {
+			throw new Error('initialize was not called yet');
+		}
+
+		this.simulateReceiveMessage({
+			jsonrpc: MCP.JSONRPC_VERSION,
+			id: (this.getSentMessages()[0] as MCP.JSONRPCRequest).id,
+			result: {
+				protocolVersion: MCP.LATEST_PROTOCOL_VERSION,
+				capabilities: {
+					tools: {},
+				},
+				serverInfo: {
+					name: 'Test Server',
+					version: '1.0.0'
+				},
+			} satisfies MCP.InitializeResult
+		});
+	}
+
+	/**
+	 * Simulate a log event.
+	 */
+	public simulateLog(message: string): void {
+		this._onDidLog.fire(message);
+	}
+
+	/**
+	 * Set the connection state.
+	 */
+	public setConnectionState(state: McpConnectionState): void {
+		this._stateValue.set(state, undefined);
+	}
+
+	/**
+	 * Get all messages that have been sent.
+	 */
+	public getSentMessages(): readonly MCP.JSONRPCMessage[] {
+		return [...this._sentMessages];
+	}
+
+	/**
+	 * Clear the sent messages history.
+	 */
+	public clearSentMessages(): void {
+		this._sentMessages.length = 0;
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/test/common/mcpServerConnection.test.ts b/src/vs/workbench/contrib/mcp/test/common/mcpServerConnection.test.ts
new file mode 100644
index 000000000000..dea177b77ff7
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpServerConnection.test.ts
@@ -0,0 +1,425 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { timeout } from '../../../../../base/common/async.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { autorun, observableValue } from '../../../../../base/common/observable.js';
+import { upcast } from '../../../../../base/common/types.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILogger, ILoggerService } from '../../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { IStorageService, StorageScope } from '../../../../../platform/storage/common/storage.js';
+import { IOutputService } from '../../../../services/output/common/output.js';
+import { TestLoggerService, TestProductService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
+import { IMcpHostDelegate, IMcpMessageTransport } from '../../common/mcpRegistryTypes.js';
+import { McpServerConnection } from '../../common/mcpServerConnection.js';
+import { McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpServerTransportType } from '../../common/mcpTypes.js';
+import { TestMcpMessageTransport } from './mcpRegistryTypes.js';
+
+class TestMcpHostDelegate extends Disposable implements IMcpHostDelegate {
+	private readonly _transport: TestMcpMessageTransport;
+	private _canStartValue = true;
+
+	constructor() {
+		super();
+		this._transport = this._register(new TestMcpMessageTransport());
+	}
+
+	canStart(): boolean {
+		return this._canStartValue;
+	}
+
+	start(): IMcpMessageTransport {
+		if (!this._canStartValue) {
+			throw new Error('Cannot start server');
+		}
+		return this._transport;
+	}
+
+	getTransport(): TestMcpMessageTransport {
+		return this._transport;
+	}
+
+	setCanStart(value: boolean): void {
+		this._canStartValue = value;
+	}
+}
+
+suite('Workbench - MCP - ServerConnection', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instantiationService: TestInstantiationService;
+	let delegate: TestMcpHostDelegate;
+	let transport: TestMcpMessageTransport;
+	let collection: McpCollectionDefinition;
+	let serverDefinition: McpServerDefinition;
+
+	setup(() => {
+		delegate = store.add(new TestMcpHostDelegate());
+		transport = delegate.getTransport();
+
+		// Setup test services
+		const services = new ServiceCollection(
+			[ILoggerService, store.add(new TestLoggerService())],
+			[IOutputService, upcast({ showChannel: () => { } })],
+			[IStorageService, store.add(new TestStorageService())],
+			[IProductService, TestProductService],
+		);
+
+		instantiationService = store.add(new TestInstantiationService(services));
+
+		// Create test collection
+		collection = {
+			id: 'test-collection',
+			label: 'Test Collection',
+			remoteAuthority: null,
+			serverDefinitions: observableValue('serverDefs', []),
+			isTrustedByDefault: true,
+			scope: StorageScope.APPLICATION
+		};
+
+		// Create server definition
+		serverDefinition = {
+			id: 'test-server',
+			label: 'Test Server',
+			launch: {
+				type: McpServerTransportType.Stdio,
+				command: 'test-command',
+				args: [],
+				env: {},
+				cwd: URI.parse('file:///test')
+			}
+		};
+	});
+
+	function waitForHandler(cnx: McpServerConnection) {
+		const handler = cnx.handler.get();
+		if (handler) {
+			return Promise.resolve(handler);
+		}
+
+		return new Promise(resolve => {
+			const disposable = autorun(reader => {
+				const handler = cnx.handler.read(reader);
+				if (handler) {
+					disposable.dispose();
+					resolve(handler);
+				}
+			});
+		});
+	}
+
+	test('should start and set state to Running when transport succeeds', async () => {
+		// Create server connection
+		const connection = instantiationService.createInstance(
+			McpServerConnection,
+			collection,
+			serverDefinition,
+			delegate,
+			serverDefinition.launch
+		);
+		store.add(connection);
+
+		// Start the connection
+		const startPromise = connection.start();
+
+		// Simulate successful connection
+		transport.setConnectionState({ state: McpConnectionState.Kind.Running });
+
+		const state = await startPromise;
+		assert.strictEqual(state.state, McpConnectionState.Kind.Running);
+
+		transport.simulateInitialized();
+		assert.ok(await waitForHandler(connection));
+	});
+
+	test('should handle errors during start', async () => {
+		// Setup delegate to fail on start
+		delegate.setCanStart(false);
+
+		// Create server connection
+		const connection = instantiationService.createInstance(
+			McpServerConnection,
+			collection,
+			serverDefinition,
+			delegate,
+			serverDefinition.launch
+		);
+		store.add(connection);
+
+		// Start the connection
+		const state = await connection.start();
+
+		assert.strictEqual(state.state, McpConnectionState.Kind.Error);
+		assert.ok(state.message);
+	});
+
+	test('should handle transport errors', async () => {
+		// Create server connection
+		const connection = instantiationService.createInstance(
+			McpServerConnection,
+			collection,
+			serverDefinition,
+			delegate,
+			serverDefinition.launch
+		);
+		store.add(connection);
+
+		// Start the connection
+		const startPromise = connection.start();
+
+		// Simulate error in transport
+		transport.setConnectionState({
+			state: McpConnectionState.Kind.Error,
+			message: 'Test error message'
+		});
+
+		const state = await startPromise;
+		assert.strictEqual(state.state, McpConnectionState.Kind.Error);
+		assert.strictEqual(state.message, 'Test error message');
+	});
+
+	test('should stop and set state to Stopped', async () => {
+		// Create server connection
+		const connection = instantiationService.createInstance(
+			McpServerConnection,
+			collection,
+			serverDefinition,
+			delegate,
+			serverDefinition.launch
+		);
+		store.add(connection);
+
+		// Start the connection
+		const startPromise = connection.start();
+		transport.setConnectionState({ state: McpConnectionState.Kind.Running });
+		await startPromise;
+
+		// Stop the connection
+		const stopPromise = connection.stop();
+		await stopPromise;
+
+		assert.strictEqual(connection.state.get().state, McpConnectionState.Kind.Stopped);
+	});
+
+	test('should not restart if already starting', async () => {
+		// Create server connection
+		const connection = instantiationService.createInstance(
+			McpServerConnection,
+			collection,
+			serverDefinition,
+			delegate,
+			serverDefinition.launch
+		);
+		store.add(connection);
+
+		// Start the connection
+		const startPromise1 = connection.start();
+
+		// Try to start again while starting
+		const startPromise2 = connection.start();
+
+		// Simulate successful connection
+		transport.setConnectionState({ state: McpConnectionState.Kind.Running });
+
+		const state1 = await startPromise1;
+		const state2 = await startPromise2;
+
+		// Both promises should resolve to the same state
+		assert.strictEqual(state1.state, McpConnectionState.Kind.Running);
+		assert.strictEqual(state2.state, McpConnectionState.Kind.Running);
+
+		transport.simulateInitialized();
+		assert.ok(await waitForHandler(connection));
+	});
+
+	test('should clean up when disposed', async () => {
+		// Create server connection
+		const connection = instantiationService.createInstance(
+			McpServerConnection,
+			collection,
+			serverDefinition,
+			delegate,
+			serverDefinition.launch
+		);
+
+		// Start the connection
+		const startPromise = connection.start();
+		transport.setConnectionState({ state: McpConnectionState.Kind.Running });
+		await startPromise;
+
+		// Dispose the connection
+		connection.dispose();
+
+		assert.strictEqual(connection.state.get().state, McpConnectionState.Kind.Stopped);
+	});
+
+	test('showOutput should call logger and output services', () => {
+		let channelShown = false;
+		const outputService = {
+			showChannel: (id: string) => {
+				assert.strictEqual(id, `mcpServer/${serverDefinition.id}`);
+				channelShown = true;
+			}
+		};
+
+		let loggerVisible = false;
+		const loggerService = new class extends TestLoggerService {
+			override setVisibility(id: string, visible: boolean): void {
+				assert.strictEqual(id, `mcpServer/${serverDefinition.id}`);
+				assert.strictEqual(visible, true);
+				loggerVisible = true;
+			}
+		};
+
+		// Override services
+		const services = new ServiceCollection(
+			[ILoggerService, store.add(loggerService)],
+			[IOutputService, upcast(outputService)],
+			[IStorageService, store.add(new TestStorageService())]
+		);
+
+		const localInstantiationService = store.add(new TestInstantiationService(services));
+
+		// Create server connection
+		const connection = localInstantiationService.createInstance(
+			McpServerConnection,
+			collection,
+			serverDefinition,
+			delegate,
+			serverDefinition.launch
+		);
+		store.add(connection);
+
+		// Show output
+		connection.showOutput();
+
+		assert.strictEqual(channelShown, true);
+		assert.strictEqual(loggerVisible, true);
+	});
+
+	test('should log transport messages', async () => {
+		// Track logged messages
+		const loggedMessages: string[] = [];
+		const loggerService = new class extends TestLoggerService {
+			override createLogger(id: string) {
+				return {
+					info: (message: string) => {
+						loggedMessages.push(message);
+					},
+					error: () => { },
+					dispose: () => { }
+				} as Partial<ILogger> as ILogger;
+			}
+		};
+
+		// Override services
+		const services = new ServiceCollection(
+			[ILoggerService, store.add(loggerService)],
+			[IOutputService, upcast({ showChannel: () => { } })],
+			[IStorageService, store.add(new TestStorageService())]
+		);
+
+		const localInstantiationService = store.add(new TestInstantiationService(services));
+
+		// Create server connection
+		const connection = localInstantiationService.createInstance(
+			McpServerConnection,
+			collection,
+			serverDefinition,
+			delegate,
+			serverDefinition.launch
+		);
+		store.add(connection);
+
+		// Start the connection
+		const startPromise = connection.start();
+
+		// Simulate log message from transport
+		transport.simulateLog('Test log message');
+
+		// Set connection to running
+		transport.setConnectionState({ state: McpConnectionState.Kind.Running });
+		await startPromise;
+
+		// Check that the message was logged
+		assert.ok(loggedMessages.some(msg => msg === 'Test log message'));
+	});
+
+	test('should correctly handle transitions to and from error state', async () => {
+		// Create server connection
+		const connection = instantiationService.createInstance(
+			McpServerConnection,
+			collection,
+			serverDefinition,
+			delegate,
+			serverDefinition.launch
+		);
+		store.add(connection);
+
+		// Start the connection
+		const startPromise = connection.start();
+
+		// Transition to error state
+		const errorState: McpConnectionState = {
+			state: McpConnectionState.Kind.Error,
+			message: 'Temporary error'
+		};
+		transport.setConnectionState(errorState);
+
+		let state = await startPromise;
+		assert.equal(state, errorState);
+
+
+		transport.setConnectionState({ state: McpConnectionState.Kind.Stopped });
+
+		// Transition back to running state
+		const startPromise2 = connection.start();
+		transport.setConnectionState({ state: McpConnectionState.Kind.Running });
+		state = await startPromise2;
+		assert.deepStrictEqual(state, { state: McpConnectionState.Kind.Running });
+
+		connection.dispose();
+		await timeout(10);
+	});
+
+	test('should handle multiple start/stop cycles', async () => {
+		// Create server connection
+		const connection = instantiationService.createInstance(
+			McpServerConnection,
+			collection,
+			serverDefinition,
+			delegate,
+			serverDefinition.launch
+		);
+		store.add(connection);
+
+		// First cycle
+		let startPromise = connection.start();
+		transport.setConnectionState({ state: McpConnectionState.Kind.Running });
+		await startPromise;
+
+		await connection.stop();
+		assert.deepStrictEqual(connection.state.get(), { state: McpConnectionState.Kind.Stopped });
+
+		// Second cycle
+		startPromise = connection.start();
+		transport.setConnectionState({ state: McpConnectionState.Kind.Running });
+		await startPromise;
+
+		assert.deepStrictEqual(connection.state.get(), { state: McpConnectionState.Kind.Running });
+
+		await connection.stop();
+
+		assert.deepStrictEqual(connection.state.get(), { state: McpConnectionState.Kind.Stopped });
+
+		connection.dispose();
+		await timeout(10);
+	});
+});
diff --git a/src/vs/workbench/contrib/mcp/test/common/mcpServerRequestHandler.test.ts b/src/vs/workbench/contrib/mcp/test/common/mcpServerRequestHandler.test.ts
new file mode 100644
index 000000000000..f78bf427271a
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpServerRequestHandler.test.ts
@@ -0,0 +1,392 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { upcast } from '../../../../../base/common/types.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { ILoggerService } from '../../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+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 { McpConnectionState } 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';
+
+class TestMcpHostDelegate extends Disposable implements IMcpHostDelegate {
+	private readonly _transport: TestMcpMessageTransport;
+
+	constructor() {
+		super();
+		this._transport = this._register(new TestMcpMessageTransport());
+	}
+
+	canStart(): boolean {
+		return true;
+	}
+
+	start(): TestMcpMessageTransport {
+		return this._transport;
+	}
+
+	getTransport(): TestMcpMessageTransport {
+		return this._transport;
+	}
+}
+
+suite('Workbench - MCP - ServerRequestHandler', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instantiationService: TestInstantiationService;
+	let delegate: TestMcpHostDelegate;
+	let transport: TestMcpMessageTransport;
+	let handler: McpServerRequestHandler;
+	let cts: CancellationTokenSource;
+
+	setup(async () => {
+		delegate = store.add(new TestMcpHostDelegate());
+		transport = delegate.getTransport();
+		cts = store.add(new CancellationTokenSource());
+
+		// Setup test services
+		const services = new ServiceCollection(
+			[ILoggerService, store.add(new TestLoggerService())],
+			[IOutputService, upcast({ showChannel: () => { } })],
+			[IStorageService, store.add(new TestStorageService())],
+			[IProductService, TestProductService],
+		);
+
+		instantiationService = store.add(new TestInstantiationService(services));
+
+		transport.setConnectionState({ state: McpConnectionState.Kind.Running });
+
+		// Manually create the handler since we need the transport already set up
+		const logger = store.add((instantiationService.get(ILoggerService) as TestLoggerService)
+			.createLogger('mcpServerTest', { hidden: true, name: 'MCP Test' }));
+
+		// Start the handler creation
+		const handlerPromise = McpServerRequestHandler.create(instantiationService, transport, logger, cts.token);
+
+		// Simulate successful initialization
+		// We need to respond to the initialize request that the handler will make
+		transport.simulateReceiveMessage({
+			jsonrpc: MCP.JSONRPC_VERSION,
+			id: 1, // The handler uses 1 for the first request
+			result: {
+				protocolVersion: MCP.LATEST_PROTOCOL_VERSION,
+				serverInfo: {
+					name: 'Test MCP Server',
+					version: '1.0.0',
+				},
+				capabilities: {
+					resources: {
+						supportedTypes: ['text/plain'],
+					},
+					tools: {
+						supportsCancellation: true,
+					}
+				}
+			}
+		});
+
+		handler = await handlerPromise;
+		store.add(handler);
+	});
+
+	test('should send and receive JSON-RPC requests', async () => {
+		// Setup request
+		const requestPromise = handler.listResources();
+
+		// Get the sent message and verify it
+		const sentMessages = transport.getSentMessages();
+		assert.strictEqual(sentMessages.length, 2); // initialize + listResources
+
+		// Verify listResources request format
+		const listResourcesRequest = sentMessages[1] as MCP.JSONRPCRequest;
+		assert.strictEqual(listResourcesRequest.method, 'resources/list');
+		assert.strictEqual(listResourcesRequest.jsonrpc, MCP.JSONRPC_VERSION);
+		assert.ok(typeof listResourcesRequest.id === 'number');
+
+		// Simulate server response with mock resources that match the expected Resource interface
+		transport.simulateReceiveMessage({
+			jsonrpc: MCP.JSONRPC_VERSION,
+			id: listResourcesRequest.id,
+			result: {
+				resources: [
+					{ uri: 'resource1', type: 'text/plain', name: 'Test Resource 1' },
+					{ uri: 'resource2', type: 'text/plain', name: 'Test Resource 2' }
+				]
+			}
+		});
+
+		// Verify the result
+		const resources = await requestPromise;
+		assert.strictEqual(resources.length, 2);
+		assert.strictEqual(resources[0].uri, 'resource1');
+		assert.strictEqual(resources[1].name, 'Test Resource 2');
+	});
+
+	test('should handle paginated requests', async () => {
+		// Setup request
+		const requestPromise = handler.listResources();
+
+		// Get the first request and respond with pagination
+		const sentMessages = transport.getSentMessages();
+		const listResourcesRequest = sentMessages[1] as MCP.JSONRPCRequest;
+
+		// Send first page with nextCursor
+		transport.simulateReceiveMessage({
+			jsonrpc: MCP.JSONRPC_VERSION,
+			id: listResourcesRequest.id,
+			result: {
+				resources: [
+					{ uri: 'resource1', type: 'text/plain', name: 'Test Resource 1' }
+				],
+				nextCursor: 'page2'
+			}
+		});
+
+		// Clear the sent messages to only capture the next page request
+		transport.clearSentMessages();
+
+		// Wait a bit to allow the handler to process and send the next request
+		await new Promise(resolve => setTimeout(resolve, 0));
+
+		// Get the second request and verify cursor is included
+		const sentMessages2 = transport.getSentMessages();
+		assert.strictEqual(sentMessages2.length, 1);
+
+		const listResourcesRequest2 = sentMessages2[0] as MCP.JSONRPCRequest;
+		assert.strictEqual(listResourcesRequest2.method, 'resources/list');
+		assert.deepStrictEqual(listResourcesRequest2.params, { cursor: 'page2' });
+
+		// Send final page with no nextCursor
+		transport.simulateReceiveMessage({
+			jsonrpc: MCP.JSONRPC_VERSION,
+			id: listResourcesRequest2.id,
+			result: {
+				resources: [
+					{ uri: 'resource2', type: 'text/plain', name: 'Test Resource 2' }
+				]
+			}
+		});
+
+		// Verify the combined result
+		const resources = await requestPromise;
+		assert.strictEqual(resources.length, 2);
+		assert.strictEqual(resources[0].uri, 'resource1');
+		assert.strictEqual(resources[1].uri, 'resource2');
+	});
+
+	test('should handle error responses', async () => {
+		// Setup request
+		const requestPromise = handler.readResource({ uri: 'non-existent' });
+
+		// Get the sent message
+		const sentMessages = transport.getSentMessages();
+		const readResourceRequest = sentMessages[1] as MCP.JSONRPCRequest; // [0] is initialize
+
+		// Simulate error response
+		transport.simulateReceiveMessage({
+			jsonrpc: MCP.JSONRPC_VERSION,
+			id: readResourceRequest.id,
+			error: {
+				code: MCP.METHOD_NOT_FOUND,
+				message: 'Resource not found'
+			}
+		});
+
+		// Verify the error is thrown correctly
+		try {
+			await requestPromise;
+			assert.fail('Expected error was not thrown');
+		} catch (e: any) {
+			assert.strictEqual(e.message, 'MPC -32601: Resource not found');
+			assert.strictEqual(e.code, MCP.METHOD_NOT_FOUND);
+		}
+	});
+
+	test('should handle server requests', async () => {
+		// Simulate ping request from server
+		const pingRequest: MCP.JSONRPCRequest & MCP.PingRequest = {
+			jsonrpc: MCP.JSONRPC_VERSION,
+			id: 100,
+			method: 'ping'
+		};
+
+		transport.simulateReceiveMessage(pingRequest);
+
+		// The handler should have sent a response
+		const sentMessages = transport.getSentMessages();
+		const pingResponse = sentMessages.find(m =>
+			'id' in m && m.id === pingRequest.id && 'result' in m
+		) as MCP.JSONRPCResponse;
+
+		assert.ok(pingResponse, 'No ping response was sent');
+		assert.deepStrictEqual(pingResponse.result, {});
+	});
+
+	test('should handle roots list requests', async () => {
+		// Set roots
+		handler.roots = [
+			{ uri: 'file:///test/root1', name: 'Root 1' },
+			{ uri: 'file:///test/root2', name: 'Root 2' }
+		];
+
+		// Simulate roots/list request from server
+		const rootsRequest: MCP.JSONRPCRequest & MCP.ListRootsRequest = {
+			jsonrpc: MCP.JSONRPC_VERSION,
+			id: 101,
+			method: 'roots/list'
+		};
+
+		transport.simulateReceiveMessage(rootsRequest);
+
+		// The handler should have sent a response
+		const sentMessages = transport.getSentMessages();
+		const rootsResponse = sentMessages.find(m =>
+			'id' in m && m.id === rootsRequest.id && 'result' in m
+		) as MCP.JSONRPCResponse;
+
+		assert.ok(rootsResponse, 'No roots/list response was sent');
+		assert.strictEqual((rootsResponse.result as MCP.ListRootsResult).roots.length, 2);
+		assert.strictEqual((rootsResponse.result as MCP.ListRootsResult).roots[0].uri, 'file:///test/root1');
+	});
+
+	test('should handle server notifications', async () => {
+		let progressNotificationReceived = false;
+		store.add(handler.onDidReceiveProgressNotification(notification => {
+			progressNotificationReceived = true;
+			assert.strictEqual(notification.method, 'notifications/progress');
+			assert.strictEqual(notification.params.progressToken, 'token1');
+			assert.strictEqual(notification.params.progress, 50);
+		}));
+
+		// Simulate progress notification with correct format
+		const progressNotification: MCP.JSONRPCNotification & MCP.ProgressNotification = {
+			jsonrpc: MCP.JSONRPC_VERSION,
+			method: 'notifications/progress',
+			params: {
+				progressToken: 'token1',
+				progress: 50,
+				total: 100
+			}
+		};
+
+		transport.simulateReceiveMessage(progressNotification);
+		assert.strictEqual(progressNotificationReceived, true);
+	});
+
+	test('should handle cancellation', async () => {
+		// Setup a new cancellation token source for this specific test
+		const testCts = store.add(new CancellationTokenSource());
+		const requestPromise = handler.listResources(undefined, testCts.token);
+
+		// Get the request ID
+		const sentMessages = transport.getSentMessages();
+		const listResourcesRequest = sentMessages[1] as MCP.JSONRPCRequest;
+		const requestId = listResourcesRequest.id;
+
+		// Cancel the request
+		testCts.cancel();
+
+		// Check that a cancellation notification was sent
+		const cancelNotification = transport.getSentMessages().find(m =>
+			!('id' in m) &&
+			'method' in m &&
+			m.method === 'notifications/cancelled' &&
+			'params' in m &&
+			m.params && m.params.requestId === requestId
+		);
+
+		assert.ok(cancelNotification, 'No cancellation notification was sent');
+
+		// Verify the promise was cancelled
+		try {
+			await requestPromise;
+			assert.fail('Promise should have been cancelled');
+		} catch (e) {
+			assert.strictEqual(e.name, 'Canceled');
+		}
+	});
+
+	test('should handle cancelled notification from server', async () => {
+		// Setup request
+		const requestPromise = handler.listResources();
+
+		// Get the request ID
+		const sentMessages = transport.getSentMessages();
+		const listResourcesRequest = sentMessages[1] as MCP.JSONRPCRequest;
+		const requestId = listResourcesRequest.id;
+
+		// Simulate cancelled notification from server
+		const cancelledNotification: MCP.JSONRPCNotification & MCP.CancelledNotification = {
+			jsonrpc: MCP.JSONRPC_VERSION,
+			method: 'notifications/cancelled',
+			params: {
+				requestId
+			}
+		};
+
+		transport.simulateReceiveMessage(cancelledNotification);
+
+		// Verify the promise was cancelled
+		try {
+			await requestPromise;
+			assert.fail('Promise should have been cancelled');
+		} catch (e) {
+			assert.strictEqual(e.name, 'Canceled');
+		}
+	});
+
+	test('should dispose properly and cancel pending requests', async () => {
+		// Setup multiple requests
+		const request1 = handler.listResources();
+		const request2 = handler.listTools();
+
+		// Dispose the handler
+		handler.dispose();
+
+		// Verify all promises were cancelled
+		try {
+			await request1;
+			assert.fail('Promise 1 should have been cancelled');
+		} catch (e) {
+			assert.strictEqual(e.name, 'Canceled');
+		}
+
+		try {
+			await request2;
+			assert.fail('Promise 2 should have been cancelled');
+		} catch (e) {
+			assert.strictEqual(e.name, 'Canceled');
+		}
+	});
+
+	test('should handle connection error by cancelling requests', async () => {
+		// Setup request
+		const requestPromise = handler.listResources();
+
+		// Simulate connection error
+		transport.setConnectionState({
+			state: McpConnectionState.Kind.Error,
+			message: 'Connection lost'
+		});
+
+		// Verify the promise was cancelled
+		try {
+			await requestPromise;
+			assert.fail('Promise should have been cancelled');
+		} catch (e) {
+			assert.strictEqual(e.name, 'Canceled');
+		}
+	});
+});

From 56440fa4423f62b5b953ce08041560d3ac2ba034 Mon Sep 17 00:00:00 2001
From: Josh Spicer <23246594+joshspicer@users.noreply.github.com>
Date: Mon, 10 Mar 2025 18:51:51 -0700
Subject: [PATCH 0754/1815] @vscode/policy-watcher 1.2.0 (#243132)

* mac policy support (code changes)

* adopt @vscode/policy-watcher 1.2.0
---
 package-lock.json                 |  8 ++++----
 package.json                      |  2 +-
 src/vs/base/common/product.ts     |  1 +
 src/vs/code/electron-main/main.ts | 13 ++++++++++---
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 75139c612fb5..83a411ed2031 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
         "@types/semver": "^7.5.8",
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.0",
-        "@vscode/policy-watcher": "^1.1.10",
+        "@vscode/policy-watcher": "^1.2.0",
         "@vscode/proxy-agent": "^0.32.0",
         "@vscode/ripgrep": "^1.15.11",
         "@vscode/spdlog": "^0.15.0",
@@ -2830,9 +2830,9 @@
       }
     },
     "node_modules/@vscode/policy-watcher": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.1.10.tgz",
-      "integrity": "sha512-erRJiryjhP//MnRZo+j0LxjVSFa4eZMR9HeAGxIuxlZCQrnvrIG5nv/4qBxiMH0+uE4Z74YY/Ct0wus6l9U/xg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.2.0.tgz",
+      "integrity": "sha512-6QwVEx5ibKW/hXEiDHKcqF4jv5dE8QQUgfVX2J0sDg0YCPReo+MG1oxxKTsxP8XAH11xBgDIDM0TA0ZAYpJKHw==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index b31bd2bdf4bf..323dfc555644 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "@types/semver": "^7.5.8",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
-    "@vscode/policy-watcher": "^1.1.10",
+    "@vscode/policy-watcher": "^1.2.0",
     "@vscode/proxy-agent": "^0.32.0",
     "@vscode/ripgrep": "^1.15.11",
     "@vscode/spdlog": "^0.15.0",
diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
index 23c6e95e9b05..189d3ac16933 100644
--- a/src/vs/base/common/product.ts
+++ b/src/vs/base/common/product.ts
@@ -188,6 +188,7 @@ export interface IProductConfiguration {
 
 	readonly 'editSessions.store'?: Omit<ConfigurationSyncStore, 'insidersUrl' | 'stableUrl'>;
 	readonly darwinUniversalAssetId?: string;
+	readonly darwinBundleIdentifier?: string;
 	readonly profileTemplatesUrl?: string;
 
 	readonly commonlyUsedSettings?: string[];
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 3f819e1662b5..84c4e12898f5 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -198,9 +198,16 @@ class CodeMain {
 		fileService.registerProvider(Schemas.vscodeUserData, new FileUserDataProvider(Schemas.file, diskFileSystemProvider, Schemas.vscodeUserData, userDataProfilesMainService, uriIdentityService, logService));
 
 		// Policy
-		const policyService = isWindows && productService.win32RegValueName ? disposables.add(new NativePolicyService(logService, productService.win32RegValueName))
-			: environmentMainService.policyFile ? disposables.add(new FilePolicyService(environmentMainService.policyFile, fileService, logService))
-				: new NullPolicyService();
+		let policyService: IPolicyService | undefined;
+		if (isWindows && productService.win32RegValueName) {
+			policyService = disposables.add(new NativePolicyService(logService, productService.win32RegValueName));
+		} else if (isMacintosh && productService.darwinBundleIdentifier) {
+			policyService = disposables.add(new NativePolicyService(logService, productService.darwinBundleIdentifier));
+		} else if (environmentMainService.policyFile) {
+			policyService = disposables.add(new FilePolicyService(environmentMainService.policyFile, fileService, logService));
+		} else {
+			policyService = new NullPolicyService();
+		}
 		services.set(IPolicyService, policyService);
 
 		// Configuration

From acb986b977f3f8827651cbc5efb689f9bbede1ad Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Tue, 11 Mar 2025 14:15:47 +1100
Subject: [PATCH 0755/1815] Display notebook decorators when opening new nb
 from diff view (#243136)

---
 .../chatEditingModifiedNotebookEntry.ts       |  2 +-
 .../chatEditingNotebookEditorIntegration.ts   | 57 ++++++++++++++++++-
 .../notebook/browser/notebookEditor.ts        |  1 +
 3 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index f0d2928bad2c..a547adb37a64 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -420,7 +420,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			return this._instantiationService.createInstance(ChatEditingNotebookDiffEditorIntegration, diffEditor, this._cellsDiffInfo);
 		}
 		assertType(notebookEditor);
-		return this._instantiationService.createInstance(ChatEditingNotebookEditorIntegration, this, notebookEditor, this.modifiedModel, this.originalModel, this._cellsDiffInfo);
+		return this._instantiationService.createInstance(ChatEditingNotebookEditorIntegration, this, editor, this.modifiedModel, this.originalModel, this._cellsDiffInfo);
 	}
 
 	protected override _resetEditsState(tx: ITransaction): void {
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 e057d1b3982e..4f634c700804 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
@@ -7,16 +7,17 @@ import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { autorun, derivedWithStore, IObservable, ISettableObservable, observableFromEvent, observableValue } from '../../../../../../base/common/observable.js';
 import { debouncedObservable } from '../../../../../../base/common/observableInternal/utils.js';
 import { basename } from '../../../../../../base/common/resources.js';
+import { assertType } from '../../../../../../base/common/types.js';
 import { nullDocumentDiff } from '../../../../../../editor/common/diff/documentDiffProvider.js';
 import { localize } from '../../../../../../nls.js';
 import { MenuId } from '../../../../../../platform/actions/common/actions.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { IResourceDiffEditorInput } from '../../../../../common/editor.js';
+import { IEditorPane, IResourceDiffEditorInput } from '../../../../../common/editor.js';
 import { IEditorService } from '../../../../../services/editor/common/editorService.js';
 import { NotebookDeletedCellDecorator } from '../../../../notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.js';
 import { NotebookInsertedCellDecorator } from '../../../../notebook/browser/diff/inlineDiff/notebookInsertedCellDecorator.js';
 import { INotebookTextDiffEditor } from '../../../../notebook/browser/diff/notebookDiffEditorBrowser.js';
-import { INotebookEditor } from '../../../../notebook/browser/notebookBrowser.js';
+import { getNotebookEditorFromEditorPane, INotebookEditor } from '../../../../notebook/browser/notebookBrowser.js';
 import { INotebookEditorService } from '../../../../notebook/browser/services/notebookEditorService.js';
 import { NotebookCellTextModel } from '../../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../../notebook/common/model/notebookTextModel.js';
@@ -26,6 +27,58 @@ import { ChatEditingCodeEditorIntegration, IDocumentDiff2 } from '../chatEditing
 import { countChanges, ICellDiffInfo, sortCellChanges } from './notebookCellChanges.js';
 
 export class ChatEditingNotebookEditorIntegration extends Disposable implements IModifiedFileEntryEditorIntegration {
+	private integration: ChatEditingNotebookEditorWidgetIntegration;
+	private notebookEditor: INotebookEditor;
+	constructor(
+		_entry: IModifiedFileEntry,
+		editor: IEditorPane,
+		notebookModel: NotebookTextModel,
+		originalModel: NotebookTextModel,
+		cellChanges: IObservable<ICellDiffInfo[]>,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super();
+
+		const notebookEditor = getNotebookEditorFromEditorPane(editor);
+		assertType(notebookEditor);
+		this.notebookEditor = notebookEditor;
+		this.integration = this.instantiationService.createInstance(ChatEditingNotebookEditorWidgetIntegration, _entry, notebookEditor, notebookModel, originalModel, cellChanges);
+		this._register(editor.onDidChangeControl(() => {
+			const notebookEditor = getNotebookEditorFromEditorPane(editor);
+			if (notebookEditor && notebookEditor !== this.notebookEditor) {
+				this.notebookEditor = notebookEditor;
+				this.integration.dispose();
+				this.integration = this.instantiationService.createInstance(ChatEditingNotebookEditorWidgetIntegration, _entry, notebookEditor, notebookModel, originalModel, cellChanges);
+			}
+		}));
+	}
+	public get currentIndex(): IObservable<number> {
+		return this.integration.currentIndex;
+	}
+	reveal(firstOrLast: boolean): void {
+		return this.integration.reveal(firstOrLast);
+	}
+	next(wrap: boolean): boolean {
+		return this.integration.next(wrap);
+	}
+	previous(wrap: boolean): boolean {
+		return this.integration.previous(wrap);
+	}
+	enableAccessibleDiffView(): void {
+		this.integration.enableAccessibleDiffView();
+	}
+	acceptNearestChange(change: IModifiedFileEntryChangeHunk): void {
+		this.integration.acceptNearestChange(change);
+	}
+	rejectNearestChange(change: IModifiedFileEntryChangeHunk): void {
+		this.integration.rejectNearestChange(change);
+	}
+	toggleDiff(change: IModifiedFileEntryChangeHunk | undefined): Promise<void> {
+		return this.integration.toggleDiff(change);
+	}
+}
+
+class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements IModifiedFileEntryEditorIntegration {
 	private readonly _currentIndex = observableValue(this, -1);
 	readonly currentIndex: IObservable<number> = this._currentIndex;
 
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
index 7234b9b4143b..b289cdb6142c 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
@@ -332,6 +332,7 @@ export class NotebookEditor extends EditorPane implements INotebookEditorPane, I
 			}
 
 			this._handlePerfMark(perf, input, model.notebook);
+			this._onDidChangeControl.fire();
 		} catch (e) {
 			this.logService.warn('NotebookEditorWidget#setInput failed', e);
 			if (isEditorOpenError(e)) {

From 81775e7ade6b9a65893dc6b1f00009a3b0a8e969 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Mon, 10 Mar 2025 23:06:29 -0700
Subject: [PATCH 0756/1815] mcp: make discovery good

- There's an mcpDiscoveryRegistry that allows components to register in
  how they discover MCP servers.
- Config discovery is one of these. Figured out all the bits for a
  standalone file config shebang. Duplication there that could be
  cleaned up but it works.
- The others are remote and local filesystem discovery. I ended up
  making another message channel for the main process/remote server to
  get a couple environment variables we need since I didn't see anything
  generic for this already(?)

![](https://memes.peet.io/img/25-03-29927218-daa9-4206-8cef-29992850d9ba.mp4)
---
 extensions/configuration-editing/package.json |   5 +
 src/vs/code/electron-main/app.ts              |   5 +
 .../diagnostics/node/diagnosticsService.ts    |   1 +
 .../mcp/common/nativeMcpDiscoveryHelper.ts    |  26 ++++
 .../node/nativeMcpDiscoveryHelperChannel.ts   |  47 +++++++
 src/vs/server/node/serverServices.ts          |   4 +
 src/vs/workbench/api/browser/mainThreadMcp.ts |  63 +++++++--
 .../api/common/configurationExtensionPoint.ts |  16 ++-
 .../workbench/api/common/extHost.protocol.ts  |   4 +-
 src/vs/workbench/api/node/extHostMpcNode.ts   |   3 +-
 .../contrib/chat/browser/chat.contribution.ts |  11 ++
 .../contrib/mcp/browser/mcp.contribution.ts   |  16 ++-
 .../contrib/mcp/browser/mcpCommands.ts        |  29 ++--
 .../contrib/mcp/browser/mcpDiscovery.ts       |  74 ++--------
 .../common/discovery/configMcpDiscovery.ts    | 131 ++++++++++++++++++
 .../mcp/common/discovery/mcpDiscovery.ts      |  29 ++++
 .../discovery/nativeMcpDiscoveryAbstract.ts   | 103 ++++++++++++++
 .../discovery/nativeMcpDiscoveryAdapters.ts   |  69 +++++++++
 .../discovery/nativeMcpRemoteDiscovery.ts     |  48 +++++++
 .../contrib/mcp/common/mcpConfiguration.ts    |  79 +++++++++++
 .../workbench/contrib/mcp/common/mcpTypes.ts  |  23 ++-
 .../mcp/electron-sandbox/mcp.contribution.ts  |  10 ++
 .../electron-sandbox/nativeMpcDiscovery.ts    |  39 ++++++
 .../configuration/browser/configuration.ts    |   4 +-
 .../configuration/common/configuration.ts     |   4 +
 .../common/configurationEditing.ts            |  14 +-
 .../baseConfigurationResolverService.ts       |  12 +-
 .../common/configurationResolver.ts           |  24 ++--
 .../common/variableResolver.ts                |  36 ++---
 src/vs/workbench/workbench.desktop.main.ts    |   3 +
 30 files changed, 801 insertions(+), 131 deletions(-)
 create mode 100644 src/vs/platform/mcp/common/nativeMcpDiscoveryHelper.ts
 create mode 100644 src/vs/platform/mcp/node/nativeMcpDiscoveryHelperChannel.ts
 create mode 100644 src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
 create mode 100644 src/vs/workbench/contrib/mcp/common/discovery/mcpDiscovery.ts
 create mode 100644 src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.ts
 create mode 100644 src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAdapters.ts
 create mode 100644 src/vs/workbench/contrib/mcp/common/discovery/nativeMcpRemoteDiscovery.ts
 create mode 100644 src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
 create mode 100644 src/vs/workbench/contrib/mcp/electron-sandbox/mcp.contribution.ts
 create mode 100644 src/vs/workbench/contrib/mcp/electron-sandbox/nativeMpcDiscovery.ts

diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json
index 224ea33c02ad..531ba21fe063 100644
--- a/extensions/configuration-editing/package.json
+++ b/extensions/configuration-editing/package.json
@@ -49,6 +49,7 @@
           "settings.json",
           "launch.json",
           "tasks.json",
+          "mcp.json",
           "keybindings.json",
           "extensions.json",
           "argv.json",
@@ -117,6 +118,10 @@
         "fileMatch": "/.vscode/tasks.json",
         "url": "vscode://schemas/tasks"
       },
+      {
+        "fileMatch": "/.vscode/mcp.json",
+        "url": "vscode://schemas/mcp"
+      },
       {
         "fileMatch": "%APP_SETTINGS_HOME%/tasks.json",
         "url": "vscode://schemas/tasks"
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 21a297a12d85..22b09835a9c2 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -118,6 +118,8 @@ import { IAuxiliaryWindowsMainService } from '../../platform/auxiliaryWindow/ele
 import { AuxiliaryWindowsMainService } from '../../platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService.js';
 import { normalizeNFC } from '../../base/common/normalization.js';
 import { ICSSDevelopmentService, CSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js';
+import { NativeMcpDiscoveryHelperChannelName } from '../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
+import { NativeMcpDiscoveryHelperChannel } from '../../platform/mcp/node/nativeMcpDiscoveryHelperChannel.js';
 
 /**
  * The main VS Code application. There will only ever be one instance,
@@ -1222,6 +1224,9 @@ export class CodeApplication extends Disposable {
 		const externalTerminalChannel = ProxyChannel.fromService(accessor.get(IExternalTerminalMainService), disposables);
 		mainProcessElectronServer.registerChannel('externalTerminal', externalTerminalChannel);
 
+		// MCP
+		mainProcessElectronServer.registerChannel(NativeMcpDiscoveryHelperChannelName, new NativeMcpDiscoveryHelperChannel(undefined));
+
 		// Logger
 		const loggerChannel = new LoggerChannel(accessor.get(ILoggerMainService),);
 		mainProcessElectronServer.registerChannel('logger', loggerChannel);
diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts
index 5f6efd51dd43..e523217c1085 100644
--- a/src/vs/platform/diagnostics/node/diagnosticsService.ts
+++ b/src/vs/platform/diagnostics/node/diagnosticsService.ts
@@ -46,6 +46,7 @@ export async function collectWorkspaceStats(folder: string, filter: string[]): P
 		{ tag: 'eslint.json', filePattern: /^eslint\.json$/i },
 		{ tag: 'tasks.json', filePattern: /^tasks\.json$/i },
 		{ tag: 'launch.json', filePattern: /^launch\.json$/i },
+		{ tag: 'mcp.json', filePattern: /^mcp\.json$/i },
 		{ tag: 'settings.json', filePattern: /^settings\.json$/i },
 		{ tag: 'webpack.config.js', filePattern: /^webpack\.config\.js$/i },
 		{ tag: 'project.json', filePattern: /^project\.json$/i },
diff --git a/src/vs/platform/mcp/common/nativeMcpDiscoveryHelper.ts b/src/vs/platform/mcp/common/nativeMcpDiscoveryHelper.ts
new file mode 100644
index 000000000000..31fc9e2604a6
--- /dev/null
+++ b/src/vs/platform/mcp/common/nativeMcpDiscoveryHelper.ts
@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Platform } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+
+export const INativeMcpDiscoveryHelperService = createDecorator<INativeMcpDiscoveryHelperService>('INativeMcpDiscoveryHelperService');
+
+export const NativeMcpDiscoveryHelperChannelName = 'NativeMcpDiscoveryHelper';
+
+export interface INativeMcpDiscoveryData {
+	// platform and homedir are duplicated by the remote/native environment, but here for convenience
+	platform: Platform;
+	homedir: URI;
+	winAppData?: URI;
+	xdgHome?: URI;
+}
+
+export interface INativeMcpDiscoveryHelperService {
+	readonly _serviceBrand: undefined;
+
+	load(): Promise<INativeMcpDiscoveryData>;
+}
diff --git a/src/vs/platform/mcp/node/nativeMcpDiscoveryHelperChannel.ts b/src/vs/platform/mcp/node/nativeMcpDiscoveryHelperChannel.ts
new file mode 100644
index 000000000000..875788b36957
--- /dev/null
+++ b/src/vs/platform/mcp/node/nativeMcpDiscoveryHelperChannel.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 { homedir } from 'os';
+import { Event } from '../../../base/common/event.js';
+import { URI } from '../../../base/common/uri.js';
+import { IURITransformer, transformOutgoingURIs } from '../../../base/common/uriIpc.js';
+import { IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { INativeMcpDiscoveryData } from '../common/nativeMcpDiscoveryHelper.js';
+import { platform } from '../../../base/common/platform.js';
+
+export class NativeMcpDiscoveryHelperChannel implements IServerChannel {
+
+	constructor(private getUriTransformer: undefined | ((requestContext: any) => IURITransformer)) { }
+
+	listen(context: any, event: string): Event<any> {
+		throw new Error('Invalid listen');
+	}
+
+	async call(context: any, command: string, args?: any): Promise<any> {
+		const uriTransformer = this.getUriTransformer?.(context);
+		switch (command) {
+			case 'load': {
+				const result: INativeMcpDiscoveryData = {
+					platform,
+					homedir: URI.file(homedir()),
+					winAppData: this.uriFromEnvVariable('APPDATA'),
+					xdgHome: this.uriFromEnvVariable('XDG_CONFIG_HOME'),
+				};
+
+				return uriTransformer ? transformOutgoingURIs(result, uriTransformer) : result;
+			}
+		}
+		throw new Error('Invalid call');
+	}
+
+	private uriFromEnvVariable(varName: string) {
+		const envVar = process.env[varName];
+		if (!envVar) {
+			return undefined;
+		}
+		return URI.file(envVar);
+	}
+}
+
diff --git a/src/vs/server/node/serverServices.ts b/src/vs/server/node/serverServices.ts
index d66209b4ad63..cb2757d4104a 100644
--- a/src/vs/server/node/serverServices.ts
+++ b/src/vs/server/node/serverServices.ts
@@ -80,6 +80,8 @@ import { NodePtyHostStarter } from '../../platform/terminal/node/nodePtyHostStar
 import { CSSDevelopmentService, ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js';
 import { AllowedExtensionsService } from '../../platform/extensionManagement/common/allowedExtensionsService.js';
 import { TelemetryLogAppender } from '../../platform/telemetry/common/telemetryLogAppender.js';
+import { NativeMcpDiscoveryHelperChannelName } from '../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
+import { NativeMcpDiscoveryHelperChannel } from '../../platform/mcp/node/nativeMcpDiscoveryHelperChannel.js';
 
 const eventPrefix = 'monacoworkbench';
 
@@ -224,6 +226,8 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 		const remoteExtensionsScanner = new RemoteExtensionsScannerService(instantiationService.createInstance(ExtensionManagementCLI, logService), environmentService, userDataProfilesService, extensionsScannerService, logService, extensionGalleryService, languagePackService, extensionManagementService);
 		socketServer.registerChannel(RemoteExtensionsScannerChannelName, new RemoteExtensionsScannerChannel(remoteExtensionsScanner, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
 
+		socketServer.registerChannel(NativeMcpDiscoveryHelperChannelName, new NativeMcpDiscoveryHelperChannel((ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
+
 		const remoteFileSystemChannel = disposables.add(new RemoteAgentFileSystemProviderChannel(logService, environmentService, configurationService));
 		socketServer.registerChannel(REMOTE_FILE_SYSTEM_CHANNEL_NAME, remoteFileSystemChannel);
 
diff --git a/src/vs/workbench/api/browser/mainThreadMcp.ts b/src/vs/workbench/api/browser/mainThreadMcp.ts
index fd6b783011f0..357bb34c0315 100644
--- a/src/vs/workbench/api/browser/mainThreadMcp.ts
+++ b/src/vs/workbench/api/browser/mainThreadMcp.ts
@@ -4,13 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Emitter } from '../../../base/common/event.js';
-import { Disposable } from '../../../base/common/lifecycle.js';
-import { observableValue } from '../../../base/common/observable.js';
-import { IMcpRegistry, IMcpMessageTransport } from '../../contrib/mcp/common/mcpRegistryTypes.js';
-import { McpConnectionState, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
+import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { ISettableObservable, observableValue } from '../../../base/common/observable.js';
+import { URI } from '../../../base/common/uri.js';
+import { IMcpMessageTransport, IMcpRegistry } from '../../contrib/mcp/common/mcpRegistryTypes.js';
+import { McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
 import { MCP } from '../../contrib/mcp/common/modelContextProtocol.js';
 import { ExtensionHostKind } from '../../services/extensions/common/extensionHostKind.js';
 import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
+import { Dto } from '../../services/extensions/common/proxyIdentifier.js';
 import { ExtHostContext, MainContext, MainThreadMcpShape } from '../common/extHost.protocol.js';
 
 @extHostNamedCustomer(MainContext.MainThreadMcp)
@@ -19,20 +21,25 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 	private _serverIdCounter = 0;
 
 	private readonly _servers: Map<number, ExtHostMcpServerLaunch> = new Map();
+	private readonly _collectionDefinitions = this._register(new DisposableMap<string, {
+		fromExtHost: McpCollectionDefinition.FromExtHost;
+		servers: ISettableObservable<readonly McpServerDefinition[]>;
+		dispose(): void;
+	}>());
 
 	constructor(
-		extHostContext: IExtHostContext,
+		private readonly _extHostContext: IExtHostContext,
 		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry,
 	) {
 		super();
-		const proxy = extHostContext.getProxy(ExtHostContext.ExtHostMcp);
+		const proxy = _extHostContext.getProxy(ExtHostContext.ExtHostMcp);
 		this._register(this._mcpRegistry.registerDelegate({
 			canStart(collection, serverDefinition) {
 				// todo: SSE MPC servers without a remote authority could be served from the renderer
-				if (collection.remoteAuthority !== extHostContext.remoteAuthority) {
+				if (collection.remoteAuthority !== _extHostContext.remoteAuthority) {
 					return false;
 				}
-				if (serverDefinition.launch.type === McpServerTransportType.Stdio && extHostContext.extensionHostKind === ExtensionHostKind.LocalWebWorker) {
+				if (serverDefinition.launch.type === McpServerTransportType.Stdio && _extHostContext.extensionHostKind === ExtensionHostKind.LocalWebWorker) {
 					return false;
 				}
 				return true;
@@ -52,6 +59,44 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 		}));
 	}
 
+	$upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, serversDto: Dto<McpServerDefinition>[]): void {
+		const servers = serversDto.map((s): McpServerDefinition => ({
+			...s,
+			launch: s.launch.type === McpServerTransportType.Stdio
+				? { ...s.launch, cwd: URI.revive(s.launch.cwd) }
+				: s.launch,
+			variableReplacement: s.variableReplacement && {
+				...s.variableReplacement,
+				folder: s.variableReplacement.folder && {
+					...s.variableReplacement.folder,
+					uri: URI.revive(s.variableReplacement.folder.uri),
+				},
+			},
+		}));
+
+		const existing = this._collectionDefinitions.get(collection.id);
+		if (existing) {
+			existing.servers.set(servers, undefined);
+		} else {
+			const serverDefinitions = observableValue<readonly McpServerDefinition[]>('mcpServers', servers);
+			const handle = this._mcpRegistry.registerCollection({
+				...collection,
+				remoteAuthority: this._extHostContext.remoteAuthority,
+				serverDefinitions,
+			});
+
+			this._collectionDefinitions.set(collection.id, {
+				fromExtHost: collection,
+				servers: serverDefinitions,
+				dispose: () => handle.dispose(),
+			});
+		}
+	}
+
+	$deleteMcpCollection(collectionId: string): void {
+		this._collectionDefinitions.deleteAndDispose(collectionId);
+	}
+
 	$onDidChangeState(id: number, update: McpConnectionState): void {
 		this._servers.get(id)?.state.set(update, undefined);
 
@@ -59,9 +104,11 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 			this._servers.delete(id);
 		}
 	}
+
 	$onDidPublishLog(id: number, log: string): void {
 		this._servers.get(id)?.pushLog(log);
 	}
+
 	$onDidReceiveMessage(id: number, message: string): void {
 		this._servers.get(id)?.pushMessage(message);
 	}
diff --git a/src/vs/workbench/api/common/configurationExtensionPoint.ts b/src/vs/workbench/api/common/configurationExtensionPoint.ts
index 8b54b9e5a1d7..d96bc0160c22 100644
--- a/src/vs/workbench/api/common/configurationExtensionPoint.ts
+++ b/src/vs/workbench/api/common/configurationExtensionPoint.ts
@@ -10,7 +10,7 @@ import { IJSONSchema } from '../../../base/common/jsonSchema.js';
 import { ExtensionsRegistry, IExtensionPointUser } from '../../services/extensions/common/extensionsRegistry.js';
 import { IConfigurationNode, IConfigurationRegistry, Extensions, validateProperty, ConfigurationScope, OVERRIDE_PROPERTY_REGEX, IConfigurationDefaults, configurationDefaultsSchemaId, IConfigurationDelta, getDefaultValue, getAllConfigurationProperties, parseScope } from '../../../platform/configuration/common/configurationRegistry.js';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from '../../../platform/jsonschemas/common/jsonContributionRegistry.js';
-import { workspaceSettingsSchemaId, launchSchemaId, tasksSchemaId } from '../../services/configuration/common/configuration.js';
+import { workspaceSettingsSchemaId, launchSchemaId, tasksSchemaId, mcpSchemaId } from '../../services/configuration/common/configuration.js';
 import { isObject, isUndefined } from '../../../base/common/types.js';
 import { ExtensionIdentifierMap, IExtensionManifest } from '../../../platform/extensions/common/extensions.js';
 import { IStringDictionary } from '../../../base/common/collections.js';
@@ -367,6 +367,20 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
 			description: nls.localize('workspaceConfig.tasks.description', "Workspace task configurations"),
 			$ref: tasksSchemaId
 		},
+		'mcp': {
+			type: 'object',
+			default: {
+				inputs: [],
+				servers: {
+					'mcp-server-time': {
+						command: 'python',
+						args: ['-m', 'mcp_server_time', '--local-timezone=America/Los_Angeles']
+					}
+				}
+			},
+			description: nls.localize('workspaceConfig.mcp.description', "Model Context Protocol server configurations"),
+			$ref: mcpSchemaId
+		},
 		'extensions': {
 			type: 'object',
 			default: {},
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index b4b309080198..0d1b41e637a1 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -60,7 +60,7 @@ import { IChatRequestVariableValue } from '../../contrib/chat/common/chatVariabl
 import { IChatMessage, IChatResponseFragment, ILanguageModelChatMetadata, ILanguageModelChatSelector, ILanguageModelsChangeEvent } from '../../contrib/chat/common/languageModels.js';
 import { IPreparedToolInvocation, IToolData, IToolInvocation, IToolResult } from '../../contrib/chat/common/languageModelToolsService.js';
 import { DebugConfigurationProviderTriggerKind, IAdapterDescriptor, IConfig, IDebugSessionReplMode, IDebugTestRunReference, IDebugVisualization, IDebugVisualizationContext, IDebugVisualizationTreeItem, MainThreadDebugVisualization } from '../../contrib/debug/common/debug.js';
-import { McpServerLaunch, McpConnectionState } from '../../contrib/mcp/common/mcpTypes.js';
+import { McpServerLaunch, McpConnectionState, McpCollectionDefinition, McpServerDefinition } from '../../contrib/mcp/common/mcpTypes.js';
 import * as notebookCommon from '../../contrib/notebook/common/notebookCommon.js';
 import { CellExecutionUpdateType } from '../../contrib/notebook/common/notebookExecutionService.js';
 import { ICellExecutionComplete, ICellExecutionStateUpdate } from '../../contrib/notebook/common/notebookExecutionStateService.js';
@@ -2978,6 +2978,8 @@ export interface MainThreadMcpShape {
 	$onDidChangeState(id: number, state: McpConnectionState): void;
 	$onDidPublishLog(id: number, log: string): void;
 	$onDidReceiveMessage(id: number, message: string): void;
+	$upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, servers: Dto<McpServerDefinition>[]): void;
+	$deleteMcpCollection(collectionId: string): void;
 }
 
 export interface ExtHostLocalizationShape {
diff --git a/src/vs/workbench/api/node/extHostMpcNode.ts b/src/vs/workbench/api/node/extHostMpcNode.ts
index 1277212df655..45cacedc7c28 100644
--- a/src/vs/workbench/api/node/extHostMpcNode.ts
+++ b/src/vs/workbench/api/node/extHostMpcNode.ts
@@ -10,6 +10,7 @@ import { StreamSplitter } from '../../../base/node/nodeStreams.js';
 import { McpConnectionState, McpServerLaunch, McpServerTransportStdio, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
 import { ExtHostMcpService } from '../common/extHostMcp.js';
 import { IExtHostRpcService } from '../common/extHostRpcService.js';
+import { homedir } from 'os';
 
 export class NodeExtHostMpcService extends ExtHostMcpService {
 	constructor(
@@ -61,7 +62,7 @@ export class NodeExtHostMpcService extends ExtHostMcpService {
 		try {
 			child = spawn(launch.command, launch.args, {
 				stdio: 'pipe',
-				cwd: URI.revive(launch.cwd).fsPath,
+				cwd: launch.cwd ? URI.revive(launch.cwd).fsPath : homedir(),
 				signal: abortCtrl.signal,
 				env: {
 					...process.env,
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index e951101ecb3f..005c3152255d 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -100,6 +100,8 @@ import { ChatStatusBarEntry } from './chatStatus.js';
 import product from '../../../../platform/product/common/product.js';
 import { Event } from '../../../../base/common/event.js';
 import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditing/notebook/chatEditingNotebookFileSystemProvider.js';
+import { mcpConfigurationSection, mcpSchemaExampleServers } from '../../mcp/common/mcpConfiguration.js';
+import { mcpSchemaId } from '../../../services/configuration/common/configuration.js';
 
 // Register configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -199,6 +201,15 @@ configurationRegistry.registerConfiguration({
 			default: product.quality !== 'stable',
 			tags: ['experimental', 'onExp']
 		},
+		[mcpConfigurationSection]: {
+			type: 'object',
+			default: {
+				inputs: [],
+				servers: mcpSchemaExampleServers,
+			},
+			description: nls.localize('workspaceConfig.mcp.description', "Model Context Protocol server configurations"),
+			$ref: mcpSchemaId
+		},
 		[PromptsConfig.CONFIG_KEY]: {
 			type: 'boolean',
 			title: nls.localize(
diff --git a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
index 0e31680a7310..3a800f0665f1 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
@@ -3,17 +3,31 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import * as jsonContributionRegistry from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+import { mcpSchemaId } from '../../../services/configuration/common/configuration.js';
+import { ConfigMcpDiscovery } from '../common/discovery/configMcpDiscovery.js';
+import { mcpDiscoveryRegistry } from '../common/discovery/mcpDiscovery.js';
+import { RemoteNativeMpcDiscovery } from '../common/discovery/nativeMcpRemoteDiscovery.js';
+import { mcpServerSchema } from '../common/mcpConfiguration.js';
 import { McpRegistry } from '../common/mcpRegistry.js';
 import { IMcpRegistry } from '../common/mcpRegistryTypes.js';
 import { McpService } from '../common/mcpService.js';
 import { IMcpService } from '../common/mcpTypes.js';
+import { McpDiscovery } from './mcpDiscovery.js';
 
 import './mcpCommands.js';
-import { McpDiscovery } from './mcpDiscovery.js';
 
 registerSingleton(IMcpRegistry, McpRegistry, InstantiationType.Delayed);
 registerSingleton(IMcpService, McpService, InstantiationType.Delayed);
 
+mcpDiscoveryRegistry.register(new SyncDescriptor(RemoteNativeMpcDiscovery));
+mcpDiscoveryRegistry.register(new SyncDescriptor(ConfigMcpDiscovery));
+
 registerWorkbenchContribution2('mcpDiscovery', McpDiscovery, WorkbenchPhase.AfterRestored);
+
+const jsonRegistry = <jsonContributionRegistry.IJSONContributionRegistry>Registry.as(jsonContributionRegistry.Extensions.JSONContribution);
+jsonRegistry.registerSchema(mcpSchemaId, mcpServerSchema);
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index af168e5d07a4..727aaae21b6b 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { groupBy } from '../../../../base/common/collections.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { autorun } from '../../../../base/common/observable.js';
 import { ILocalizedString, localize, localize2 } from '../../../../nls.js';
@@ -37,26 +38,31 @@ class ListMcpServerCommand extends Action2 {
 		type ItemType = { id: string } & IQuickPickItem;
 
 		const store = new DisposableStore();
-		const pick = quickInput.createQuickPick<ItemType>();
+		const pick = quickInput.createQuickPick<ItemType>({ useSeparators: true });
 
 		store.add(pick);
 		store.add(autorun(reader => {
-			const servers = mcpService.servers.read(reader);
-			pick.items = servers.map(server => ({
-				id: server.definition.id,
-				label: server.definition.label,
-				description: McpConnectionState.toString(server.state.read(reader)),
-			}));
+			const servers = groupBy(mcpService.servers.read(reader).slice().sort((a, b) => (a.collection.order || 0) - (b.collection.order || 0)), s => s.collection.id);
+			pick.items = Object.values(servers).flatMap(servers => {
+				return [
+					{ type: 'separator', label: servers[0].collection.label, id: servers[0].collection.id },
+					...servers.map(server => ({
+						id: server.definition.id,
+						label: server.definition.label,
+						description: McpConnectionState.toString(server.state.read(reader)),
+					})),
+				];
+			});
 		}));
 
 
 		const picked = await new Promise<ItemType | undefined>(resolve => {
-			pick.onDidAccept(() => {
+			store.add(pick.onDidAccept(() => {
 				resolve(pick.activeItems[0]);
-			});
-			pick.onDidHide(() => {
+			}));
+			store.add(pick.onDidHide(() => {
 				resolve(undefined);
-			});
+			}));
 			pick.show();
 		});
 
@@ -130,6 +136,7 @@ class McpServerOptionsCommand extends Action2 {
 		switch (pick.action) {
 			case 'start':
 				await server.start();
+				server.showOutput();
 				break;
 			case 'stop':
 				await server.stop();
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpDiscovery.ts b/src/vs/workbench/contrib/mcp/browser/mcpDiscovery.ts
index 87b575e5a1a3..f9d339b79626 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpDiscovery.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpDiscovery.ts
@@ -3,77 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { observableValue } from '../../../../base/common/observable.js';
-import { Platform, platform } from '../../../../base/common/platform.js';
-import { URI } from '../../../../base/common/uri.js';
-import { INativeEnvironmentService } from '../../../../platform/environment/common/environment.js';
-import { IFileService } from '../../../../platform/files/common/files.js';
-import { StorageScope } from '../../../../platform/storage/common/storage.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { IMcpRegistry } from '../common/mcpRegistryTypes.js';
-import { McpServerDefinition, McpServerTransportType } from '../common/mcpTypes.js';
+import { mcpDiscoveryRegistry } from '../common/discovery/mcpDiscovery.js';
 
-export class McpDiscovery implements IWorkbenchContribution {
+export class McpDiscovery extends Disposable implements IWorkbenchContribution {
 	public static readonly ID = 'workbench.contrib.mcp.discovery';
 
 	constructor(
-		@INativeEnvironmentService environmentService: INativeEnvironmentService,
-		@IFileService fileService: IFileService,
-		@IMcpRegistry mcpRegistry: IMcpRegistry
+		@IInstantiationService instantiationService: IInstantiationService,
 	) {
-
-		const homeDir = environmentService.userHome;
-		//#region hacked in reading for claude desktop config
-		let configPath: URI;
-		if (platform === Platform.Windows) {
-			const appData = /* process.env.APPDATA ||*/ URI.joinPath(environmentService.userHome, 'AppData', 'Roaming');
-			configPath = URI.joinPath(appData, 'Claude', 'claude_desktop_config.json');
-		} else if (platform === Platform.Mac) {
-			configPath = URI.joinPath(environmentService.userHome, 'Library', 'Application Support', 'Claude', 'claude_desktop_config.json');
-		} else {
-			const configDir = /*process.env.XDG_CONFIG_HOME || */URI.joinPath(environmentService.userHome, '.config');
-			configPath = URI.joinPath(configDir, 'Claude', 'claude_desktop_config.json');
+		super();
+		for (const discovery of mcpDiscoveryRegistry.getAll()) {
+			const inst = this._register(instantiationService.createInstance(discovery));
+			inst.start();
 		}
-
-
-		fileService.readFile(configPath).then((content) => {
-			let parsed: {
-				mcpServers: Record<string, {
-					command: string;
-					args?: string[];
-					env?: Record<string, string>;
-				}>;
-			};
-
-			try {
-				parsed = JSON.parse(content.value.toString());
-			} catch {
-				return;
-			}
-			const definitions = Object.entries(parsed.mcpServers).map(([name, server]): McpServerDefinition => {
-				return {
-					id: `claude_desktop_config.${name}`,
-					label: name,
-					launch: {
-						type: McpServerTransportType.Stdio,
-						args: server.args || [],
-						command: server.command,
-						env: server.env || {},
-						cwd: homeDir,
-					}
-				};
-			});
-
-			mcpRegistry.registerCollection({
-				id: 'claude_desktop_config',
-				label: 'Claude Desktop',
-				isTrustedByDefault: false,
-				remoteAuthority: null,
-				scope: StorageScope.APPLICATION,
-				serverDefinitions: observableValue(this, definitions),
-			});
-		}, () => { });
-
-		//#endregion
 	}
 }
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts b/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
new file mode 100644
index 000000000000..aea862d7fb19
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.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 { equals as arrayEquals } from '../../../../../base/common/arrays.js';
+import { Disposable, IDisposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { ISettableObservable, observableValue } from '../../../../../base/common/observable.js';
+import { localize } from '../../../../../nls.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { StorageScope } from '../../../../../platform/storage/common/storage.js';
+import { IWorkbenchEnvironmentService } from '../../../../services/environment/common/environmentService.js';
+import { IMcpConfiguration, mcpConfigurationSection } from '../mcpConfiguration.js';
+import { IMcpRegistry } from '../mcpRegistryTypes.js';
+import { McpCollectionSortOrder, McpServerDefinition, McpServerTransportType } from '../mcpTypes.js';
+import { IMcpDiscovery } from './mcpDiscovery.js';
+
+
+/**
+ * Discovers MCP servers based on various config sources.
+ */
+export class ConfigMcpDiscovery extends Disposable implements IMcpDiscovery {
+	private readonly configSources: {
+		key: 'userLocalValue' | 'userRemoteValue' | 'workspaceValue';
+		label: string;
+		serverDefinitions: ISettableObservable<readonly McpServerDefinition[]>;
+		scope: StorageScope;
+		target: ConfigurationTarget;
+		disposable: MutableDisposable<IDisposable>;
+		order: number;
+		remoteAuthority?: string;
+	}[];
+
+	constructor(
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry,
+		@IProductService productService: IProductService,
+		@ILabelService labelService: ILabelService,
+		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
+	) {
+		super();
+		const remoteLabel = environmentService.remoteAuthority ? labelService.getHostLabel(Schemas.vscodeRemote, environmentService.remoteAuthority) : 'Remote';
+		this.configSources = [
+			{
+				key: 'userLocalValue',
+				target: ConfigurationTarget.USER_LOCAL,
+				label: localize('mcp.configuration.userLocalValue', 'Global in {0}', productService.nameShort),
+				serverDefinitions: observableValue(this, []),
+				scope: StorageScope.PROFILE,
+				disposable: this._register(new MutableDisposable()),
+				order: McpCollectionSortOrder.User,
+			},
+			{
+				key: 'userRemoteValue',
+				target: ConfigurationTarget.USER_REMOTE,
+				label: localize('mcp.configuration.userRemoteValue', 'From {0}', remoteLabel),
+				serverDefinitions: observableValue(this, []),
+				scope: StorageScope.PROFILE,
+				disposable: this._register(new MutableDisposable()),
+				remoteAuthority: environmentService.remoteAuthority,
+				order: McpCollectionSortOrder.User + McpCollectionSortOrder.RemotePenalty,
+			},
+			{
+				key: 'workspaceValue',
+				target: ConfigurationTarget.WORKSPACE,
+				label: localize('mcp.configuration.workspaceValue', 'From your workspace'),
+				serverDefinitions: observableValue(this, []),
+				scope: StorageScope.WORKSPACE,
+				disposable: this._register(new MutableDisposable()),
+				order: McpCollectionSortOrder.Workspace,
+
+			},
+		];
+	}
+
+	public start() {
+		this._register(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(mcpConfigurationSection)) {
+				this.sync();
+			}
+		}));
+
+		this.sync();
+	}
+
+	private sync() {
+		const configurationKey = this._configurationService.inspect<IMcpConfiguration>(mcpConfigurationSection);
+
+		for (const src of this.configSources) {
+			const collectionId = `mcp.config.${src.key}`;
+			const value = configurationKey[src.key];
+			const nextDefinitions = Object.entries(value?.servers || {}).map(([name, value]): McpServerDefinition => ({
+				id: `${collectionId}.${name}`,
+				label: name,
+				launch: {
+					type: McpServerTransportType.Stdio,
+					args: value.args,
+					command: value.command,
+					env: value.env,
+					cwd: undefined,
+				},
+				variableReplacement: {
+					section: mcpConfigurationSection,
+					target: src.target,
+				}
+			}));
+
+			if (arrayEquals(nextDefinitions, src.serverDefinitions.get(), McpServerDefinition.equals)) {
+				continue;
+			}
+
+			if (!nextDefinitions.length) {
+				src.disposable.clear();
+			} else {
+				src.serverDefinitions.set(nextDefinitions, undefined);
+				src.disposable.value ??= this._mcpRegistry.registerCollection({
+					id: collectionId,
+					label: src.label,
+					order: src.order,
+					remoteAuthority: src.remoteAuthority || null,
+					serverDefinitions: src.serverDefinitions,
+					isTrustedByDefault: true,
+					scope: src.scope,
+				});
+			}
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/mcpDiscovery.ts b/src/vs/workbench/contrib/mcp/common/discovery/mcpDiscovery.ts
new file mode 100644
index 000000000000..a6a091cfaa7d
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/discovery/mcpDiscovery.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 { IDisposable } from '../../../../../base/common/lifecycle.js';
+import { SyncDescriptor0 } from '../../../../../platform/instantiation/common/descriptors.js';
+
+
+export interface IMcpDiscovery extends IDisposable {
+	start(): void;
+}
+
+class McpDiscoveryRegistry {
+	private readonly _discovery: SyncDescriptor0<IMcpDiscovery>[] = [];
+
+	register(discovery: SyncDescriptor0<IMcpDiscovery>): void {
+		this._discovery.push(discovery);
+	}
+
+	getAll(): readonly SyncDescriptor0<IMcpDiscovery>[] {
+		return this._discovery;
+	}
+}
+
+export const mcpDiscoveryRegistry = new McpDiscoveryRegistry();
+
+
+
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.ts b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.ts
new file mode 100644
index 000000000000..3e291cedeb94
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.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 { RunOnceScheduler } from '../../../../../base/common/async.js';
+import { Disposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { observableValue } from '../../../../../base/common/observable.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { localize } from '../../../../../nls.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ILabelService } from '../../../../../platform/label/common/label.js';
+import { INativeMcpDiscoveryData } from '../../../../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
+import { StorageScope } from '../../../../../platform/storage/common/storage.js';
+import { Dto } from '../../../../services/extensions/common/proxyIdentifier.js';
+import { IMcpRegistry } from '../mcpRegistryTypes.js';
+import { McpCollectionDefinition, McpCollectionSortOrder, McpServerDefinition } from '../mcpTypes.js';
+import { IMcpDiscovery } from './mcpDiscovery.js';
+import { ClaudeDesktopMpcDiscoveryAdapter, NativeMpcDiscoveryAdapter } from './nativeMcpDiscoveryAdapters.js';
+
+/**
+ * Base class that discovers MCP servers on a filesystem, outside of the ones
+ * defined in VS Code settings.
+ */
+export abstract class FilesystemMpcDiscovery extends Disposable implements IMcpDiscovery {
+	private readonly adapters: readonly NativeMpcDiscoveryAdapter[];
+	private suffix = '';
+
+	constructor(
+		remoteAuthority: string | null,
+		@ILabelService labelService: ILabelService,
+		@IFileService private readonly fileService: IFileService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IMcpRegistry private readonly mcpRegistry: IMcpRegistry,
+	) {
+		super();
+		if (remoteAuthority) {
+			this.suffix = ' ' + localize('onRemoteLabel', ' on {0}', labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority));
+		}
+
+		this.adapters = [
+			instantiationService.createInstance(ClaudeDesktopMpcDiscoveryAdapter, remoteAuthority)
+		];
+	}
+
+	public abstract start(): void;
+
+	protected setDetails(detailsDto: Dto<INativeMcpDiscoveryData> | undefined) {
+		if (!detailsDto) {
+			return;
+		}
+
+		const details: INativeMcpDiscoveryData = {
+			...detailsDto,
+			homedir: URI.revive(detailsDto.homedir),
+			xdgHome: detailsDto.xdgHome ? URI.revive(detailsDto.xdgHome) : undefined,
+			winAppData: detailsDto.winAppData ? URI.revive(detailsDto.winAppData) : undefined,
+		};
+
+		for (const adapter of this.adapters) {
+			const file = adapter.getFilePath(details);
+			if (!file) {
+				continue;
+			}
+
+			const collection = {
+				id: adapter.id,
+				label: adapter.label + this.suffix,
+				remoteAuthority: adapter.remoteAuthority,
+				scope: StorageScope.PROFILE,
+				isTrustedByDefault: false,
+				serverDefinitions: observableValue<readonly McpServerDefinition[]>(this, []),
+				order: adapter.order + (adapter.remoteAuthority ? McpCollectionSortOrder.RemotePenalty : 0)
+			} satisfies McpCollectionDefinition;
+
+			const collectionRegistration = this._register(new MutableDisposable());
+			const updateFile = async () => {
+				let definitions: McpServerDefinition[] = [];
+				try {
+					const contents = await this.fileService.readFile(file);
+					definitions = adapter.adaptFile(contents.value, details) || [];
+				} catch {
+					// ignored
+				}
+				if (!definitions.length) {
+					collectionRegistration.clear();
+				} else {
+					collection.serverDefinitions.set(definitions, undefined);
+					if (!collectionRegistration.value) {
+						collectionRegistration.value = this.mcpRegistry.registerCollection(collection);
+					}
+				}
+			};
+
+			const watcher = this._register(this.fileService.createWatcher(file, { recursive: false, excludes: [] }));
+			const throttler = this._register(new RunOnceScheduler(updateFile, 500));
+			this._register(watcher.onDidChange(() => throttler.schedule()));
+			updateFile();
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAdapters.ts b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAdapters.ts
new file mode 100644
index 000000000000..fddd0b699f54
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAdapters.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 { VSBuffer } from '../../../../../base/common/buffer.js';
+import { Platform } from '../../../../../base/common/platform.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { INativeMcpDiscoveryData } from '../../../../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
+import { McpCollectionSortOrder, McpServerDefinition, McpServerTransportType } from '../mcpTypes.js';
+
+export interface NativeMpcDiscoveryAdapter {
+	readonly remoteAuthority: string | null;
+	readonly id: string;
+	readonly label: string;
+	readonly order: number;
+
+	getFilePath(details: INativeMcpDiscoveryData): URI | undefined;
+	adaptFile(contents: VSBuffer, details: INativeMcpDiscoveryData): McpServerDefinition[] | undefined;
+}
+
+export class ClaudeDesktopMpcDiscoveryAdapter implements NativeMpcDiscoveryAdapter {
+	public readonly id: string = `claude-desktop.${this.remoteAuthority}`;
+	public readonly label: string = 'Claude Desktop';
+	public readonly order = McpCollectionSortOrder.Filesystem;
+
+	constructor(public readonly remoteAuthority: string | null) { }
+
+	getFilePath({ platform, winAppData, homedir }: INativeMcpDiscoveryData): URI | undefined {
+		if (platform === Platform.Windows) {
+			const appData = winAppData || URI.joinPath(homedir, 'AppData', 'Roaming');
+			return URI.joinPath(appData, 'Claude', 'claude_desktop_config.json');
+		} else if (platform === Platform.Mac) {
+			return URI.joinPath(homedir, 'Library', 'Application Support', 'Claude', 'claude_desktop_config.json');
+		} else {
+			const configDir = /*process.env.XDG_CONFIG_HOME || */URI.joinPath(homedir, '.config');
+			return URI.joinPath(configDir, 'Claude', 'claude_desktop_config.json');
+		}
+	}
+
+	adaptFile(contents: VSBuffer, { homedir }: INativeMcpDiscoveryData): McpServerDefinition[] | undefined {
+		let parsed: {
+			mcpServers: Record<string, {
+				command: string;
+				args?: string[];
+				env?: Record<string, string>;
+			}>;
+		};
+
+		try {
+			parsed = JSON.parse(contents.toString());
+		} catch {
+			return;
+		}
+		return Object.entries(parsed.mcpServers).map(([name, server]): McpServerDefinition => {
+			return {
+				id: `claude_desktop_config.${name}`,
+				label: name,
+				launch: {
+					type: McpServerTransportType.Stdio,
+					args: server.args || [],
+					command: server.command,
+					env: server.env || {},
+					cwd: homedir,
+				}
+			};
+		});
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpRemoteDiscovery.ts b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpRemoteDiscovery.ts
new file mode 100644
index 000000000000..0eacf9c41840
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpRemoteDiscovery.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 { IFileService } from '../../../../../platform/files/common/files.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 { INativeMcpDiscoveryData, NativeMcpDiscoveryHelperChannelName } from '../../../../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
+import { Dto } from '../../../../services/extensions/common/proxyIdentifier.js';
+import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js';
+import { IMcpRegistry } from '../mcpRegistryTypes.js';
+import { FilesystemMpcDiscovery } from './nativeMcpDiscoveryAbstract.js';
+
+/**
+ * Discovers MCP servers on the remote filesystem, if any.
+ */
+export class RemoteNativeMpcDiscovery extends FilesystemMpcDiscovery {
+	constructor(
+		@IRemoteAgentService private readonly remoteAgent: IRemoteAgentService,
+		@ILogService private readonly logService: ILogService,
+		@ILabelService labelService: ILabelService,
+		@IFileService fileService: IFileService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IMcpRegistry mcpRegistry: IMcpRegistry,
+	) {
+		super(remoteAgent.getConnection()?.remoteAuthority || null, labelService, fileService, instantiationService, mcpRegistry);
+	}
+
+	public override async start() {
+		const connection = this.remoteAgent.getConnection();
+		if (!connection) {
+			return this.setDetails(undefined);
+		}
+
+		connection.withChannel(NativeMcpDiscoveryHelperChannelName, channel =>
+			channel.call<Dto<INativeMcpDiscoveryData>>('load', undefined))
+
+			.then(
+				data => this.setDetails(data),
+				err => {
+					this.logService.warn('Error getting remote process MCP environment', err);
+					this.setDetails(undefined);
+				}
+			);
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
new file mode 100644
index 000000000000..78fb48d097c3
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
+import { localize } from '../../../../nls.js';
+import { mcpSchemaId } from '../../../services/configuration/common/configuration.js';
+import { inputsSchema } from '../../../services/configurationResolver/common/configurationResolverSchema.js';
+
+
+const mcpSchemaExampleServer = {
+	command: 'node',
+	args: ['my-mcp-server.js'],
+	env: {},
+};
+
+export const mcpConfigurationSection = 'mcp';
+
+export interface IMcpConfiguration {
+	inputs: unknown[];
+	servers: Record<string, IMcpConfigurationServer>;
+}
+
+export interface IMcpConfigurationServer {
+	command: string;
+	args: readonly string[];
+	env: Record<string, string | number | null>;
+}
+
+export const mcpSchemaExampleServers = {
+	'mcp-server-time': {
+		command: 'python',
+		args: ['-m', 'mcp_server_time', '--local-timezone=America/Los_Angeles'],
+		env: {},
+	}
+};
+
+export const mcpServerSchema: IJSONSchema = {
+	id: mcpSchemaId,
+	type: 'object',
+	title: localize('app.mcp.json.title', "Model Context Protocol Servers"),
+	allowTrailingCommas: true,
+	allowComments: true,
+	properties: {
+		servers: {
+			examples: [mcpSchemaExampleServers],
+			additionalProperties: {
+				type: 'object',
+				additionalProperties: false,
+				examples: [mcpSchemaExampleServer],
+				properties: {
+					command: {
+						type: 'string',
+						description: localize('app.mcp.json.command', "The command to run the server.")
+					},
+					args: {
+						type: 'array',
+						description: localize('app.mcp.args.command', "Arguments passed to the server."),
+						items: {
+							type: 'string'
+						},
+					},
+					env: {
+						description: localize('app.mcp.env.command', "Environment variables passed to the server."),
+						additionalProperties: {
+							anyOf: [
+								{ type: 'null' },
+								{ type: 'string' },
+								{ type: 'number' },
+							]
+						}
+					},
+				}
+			}
+		},
+		inputs: inputsSchema.definitions!.inputs
+	}
+};
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
index d2d3e7fb10de..568b51ad018f 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
@@ -13,7 +13,7 @@ import { localize } from '../../../../nls.js';
 import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { StorageScope } from '../../../../platform/storage/common/storage.js';
-import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkspaceFolderData } from '../../../../platform/workspace/common/workspace.js';
 import { McpServerRequestHandler } from './mcpServerRequestHandler.js';
 import { MCP } from './modelContextProtocol.js';
 
@@ -34,9 +34,26 @@ export interface McpCollectionDefinition {
 	readonly isTrustedByDefault: boolean;
 	/** Scope where associated collection info should be stored. */
 	readonly scope: StorageScope;
+	/** Sort order of the collection. */
+	readonly order?: number;
+}
+
+export const enum McpCollectionSortOrder {
+	Workspace = 0,
+	User = 100,
+	Filesystem = 200,
+
+	RemotePenalty = 50,
 }
 
 export namespace McpCollectionDefinition {
+	export interface FromExtHost {
+		readonly id: string;
+		readonly label: string;
+		readonly isTrustedByDefault: boolean;
+		readonly scope: StorageScope;
+	}
+
 	export function equals(a: McpCollectionDefinition, b: McpCollectionDefinition): boolean {
 		return a.id === b.id
 			&& a.remoteAuthority === b.remoteAuthority
@@ -55,7 +72,7 @@ export interface McpServerDefinition {
 	/** If set, allows configuration variables to be resolved in the {@link launch} with the given context */
 	readonly variableReplacement?: {
 		section?: string; // e.g. 'mcp'
-		folder?: IWorkspaceFolder;
+		folder?: IWorkspaceFolderData;
 		target?: ConfigurationTarget;
 	};
 }
@@ -114,7 +131,7 @@ export const enum McpServerTransportType {
  */
 export interface McpServerTransportStdio {
 	readonly type: McpServerTransportType.Stdio;
-	readonly cwd: URI;
+	readonly cwd: URI | undefined;
 	readonly command: string;
 	readonly args: readonly string[];
 	readonly env: Record<string, string | number | null>;
diff --git a/src/vs/workbench/contrib/mcp/electron-sandbox/mcp.contribution.ts b/src/vs/workbench/contrib/mcp/electron-sandbox/mcp.contribution.ts
new file mode 100644
index 000000000000..efdf3ee192d4
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/electron-sandbox/mcp.contribution.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.
+ *--------------------------------------------------------------------------------------------*/
+
+import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { mcpDiscoveryRegistry } from '../common/discovery/mcpDiscovery.js';
+import { NativeMcpDiscovery } from './nativeMpcDiscovery.js';
+
+mcpDiscoveryRegistry.register(new SyncDescriptor(NativeMcpDiscovery));
diff --git a/src/vs/workbench/contrib/mcp/electron-sandbox/nativeMpcDiscovery.ts b/src/vs/workbench/contrib/mcp/electron-sandbox/nativeMpcDiscovery.ts
new file mode 100644
index 000000000000..7f623f83643e
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/electron-sandbox/nativeMpcDiscovery.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 { IFileService } from '../../../../platform/files/common/files.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { INativeMcpDiscoveryData, NativeMcpDiscoveryHelperChannelName } from '../../../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
+import { Dto } from '../../../services/extensions/common/proxyIdentifier.js';
+import { FilesystemMpcDiscovery } from '../common/discovery/nativeMcpDiscoveryAbstract.js';
+import { IMcpRegistry } from '../common/mcpRegistryTypes.js';
+
+export class NativeMcpDiscovery extends FilesystemMpcDiscovery {
+	constructor(
+		@IMainProcessService private readonly mainProcess: IMainProcessService,
+		@ILogService private readonly logService: ILogService,
+		@ILabelService labelService: ILabelService,
+		@IFileService fileService: IFileService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IMcpRegistry mcpRegistry: IMcpRegistry,
+	) {
+		super(null, labelService, fileService, instantiationService, mcpRegistry);
+	}
+
+	public override start(): void {
+		this.mainProcess.getChannel(NativeMcpDiscoveryHelperChannelName)
+			.call<Dto<INativeMcpDiscoveryData>>('load', undefined)
+			.then(
+				data => this.setDetails(data),
+				err => {
+					this.logService.warn('Error getting main process MCP environment', err);
+					this.setDetails(undefined);
+				}
+			);
+	}
+}
diff --git a/src/vs/workbench/services/configuration/browser/configuration.ts b/src/vs/workbench/services/configuration/browser/configuration.ts
index a3d2d34f58c8..1ee88812ed5c 100644
--- a/src/vs/workbench/services/configuration/browser/configuration.ts
+++ b/src/vs/workbench/services/configuration/browser/configuration.ts
@@ -11,7 +11,7 @@ import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { FileChangeType, FileChangesEvent, IFileService, whenProviderRegistered, FileOperationError, FileOperationResult, FileOperation, FileOperationEvent } from '../../../../platform/files/common/files.js';
 import { ConfigurationModel, ConfigurationModelParser, ConfigurationParseOptions, UserSettings } from '../../../../platform/configuration/common/configurationModels.js';
 import { WorkspaceConfigurationModelParser, StandaloneConfigurationModelParser } from '../common/configurationModels.js';
-import { TASKS_CONFIGURATION_KEY, FOLDER_SETTINGS_NAME, LAUNCH_CONFIGURATION_KEY, IConfigurationCache, ConfigurationKey, REMOTE_MACHINE_SCOPES, FOLDER_SCOPES, WORKSPACE_SCOPES, APPLY_ALL_PROFILES_SETTING, APPLICATION_SCOPES } from '../common/configuration.js';
+import { TASKS_CONFIGURATION_KEY, FOLDER_SETTINGS_NAME, LAUNCH_CONFIGURATION_KEY, IConfigurationCache, ConfigurationKey, REMOTE_MACHINE_SCOPES, FOLDER_SCOPES, WORKSPACE_SCOPES, APPLY_ALL_PROFILES_SETTING, APPLICATION_SCOPES, MCP_CONFIGURATION_KEY } from '../common/configuration.js';
 import { IStoredWorkspaceFolder } from '../../../../platform/workspaces/common/workspaces.js';
 import { WorkbenchState, IWorkspaceFolder, IWorkspaceIdentifier } from '../../../../platform/workspace/common/workspace.js';
 import { ConfigurationScope, Extensions, IConfigurationRegistry, OVERRIDE_PROPERTY_REGEX } from '../../../../platform/configuration/common/configurationRegistry.js';
@@ -1068,7 +1068,7 @@ export class FolderConfiguration extends Disposable {
 
 	private createFileServiceBasedConfiguration(fileService: IFileService, uriIdentityService: IUriIdentityService, logService: ILogService) {
 		const settingsResource = uriIdentityService.extUri.joinPath(this.configurationFolder, `${FOLDER_SETTINGS_NAME}.json`);
-		const standAloneConfigurationResources: [string, URI][] = [TASKS_CONFIGURATION_KEY, LAUNCH_CONFIGURATION_KEY].map(name => ([name, uriIdentityService.extUri.joinPath(this.configurationFolder, `${name}.json`)]));
+		const standAloneConfigurationResources: [string, URI][] = [TASKS_CONFIGURATION_KEY, LAUNCH_CONFIGURATION_KEY, MCP_CONFIGURATION_KEY].map(name => ([name, uriIdentityService.extUri.joinPath(this.configurationFolder, `${name}.json`)]));
 		return new FileServiceBasedConfiguration(this.configurationFolder.toString(), settingsResource, standAloneConfigurationResources, { scopes: this.scopes, skipRestricted: this.isUntrusted() }, fileService, uriIdentityService, logService);
 	}
 
diff --git a/src/vs/workbench/services/configuration/common/configuration.ts b/src/vs/workbench/services/configuration/common/configuration.ts
index 12e011d39777..56155f1b1b0e 100644
--- a/src/vs/workbench/services/configuration/common/configuration.ts
+++ b/src/vs/workbench/services/configuration/common/configuration.ts
@@ -23,6 +23,7 @@ export const workspaceSettingsSchemaId = 'vscode://schemas/settings/workspace';
 export const folderSettingsSchemaId = 'vscode://schemas/settings/folder';
 export const launchSchemaId = 'vscode://schemas/launch';
 export const tasksSchemaId = 'vscode://schemas/tasks';
+export const mcpSchemaId = 'vscode://schemas/mcp';
 
 export const APPLICATION_SCOPES = [ConfigurationScope.APPLICATION, ConfigurationScope.APPLICATION_MACHINE];
 export const PROFILE_SCOPES = [ConfigurationScope.MACHINE, ConfigurationScope.WINDOW, ConfigurationScope.RESOURCE, ConfigurationScope.LANGUAGE_OVERRIDABLE, ConfigurationScope.MACHINE_OVERRIDABLE];
@@ -34,12 +35,15 @@ export const FOLDER_SCOPES = [ConfigurationScope.RESOURCE, ConfigurationScope.LA
 
 export const TASKS_CONFIGURATION_KEY = 'tasks';
 export const LAUNCH_CONFIGURATION_KEY = 'launch';
+export const MCP_CONFIGURATION_KEY = 'mcp';
 
 export const WORKSPACE_STANDALONE_CONFIGURATIONS = Object.create(null);
 WORKSPACE_STANDALONE_CONFIGURATIONS[TASKS_CONFIGURATION_KEY] = `${FOLDER_CONFIG_FOLDER_NAME}/${TASKS_CONFIGURATION_KEY}.json`;
 WORKSPACE_STANDALONE_CONFIGURATIONS[LAUNCH_CONFIGURATION_KEY] = `${FOLDER_CONFIG_FOLDER_NAME}/${LAUNCH_CONFIGURATION_KEY}.json`;
+WORKSPACE_STANDALONE_CONFIGURATIONS[MCP_CONFIGURATION_KEY] = `${FOLDER_CONFIG_FOLDER_NAME}/${MCP_CONFIGURATION_KEY}.json`;
 export const USER_STANDALONE_CONFIGURATIONS = Object.create(null);
 USER_STANDALONE_CONFIGURATIONS[TASKS_CONFIGURATION_KEY] = `${TASKS_CONFIGURATION_KEY}.json`;
+USER_STANDALONE_CONFIGURATIONS[MCP_CONFIGURATION_KEY] = `${MCP_CONFIGURATION_KEY}.json`;
 
 export type ConfigurationKey = { type: 'defaults' | 'user' | 'workspaces' | 'folder'; key: string };
 
diff --git a/src/vs/workbench/services/configuration/common/configurationEditing.ts b/src/vs/workbench/services/configuration/common/configurationEditing.ts
index cd732b3ef0dd..2ecea1839655 100644
--- a/src/vs/workbench/services/configuration/common/configurationEditing.ts
+++ b/src/vs/workbench/services/configuration/common/configurationEditing.ts
@@ -13,7 +13,7 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
 import { ITextFileService } from '../../textfile/common/textfiles.js';
 import { IConfigurationUpdateOptions, IConfigurationUpdateOverrides } from '../../../../platform/configuration/common/configuration.js';
-import { FOLDER_SETTINGS_PATH, WORKSPACE_STANDALONE_CONFIGURATIONS, TASKS_CONFIGURATION_KEY, LAUNCH_CONFIGURATION_KEY, USER_STANDALONE_CONFIGURATIONS, TASKS_DEFAULT, FOLDER_SCOPES, IWorkbenchConfigurationService, APPLICATION_SCOPES } from './configuration.js';
+import { FOLDER_SETTINGS_PATH, WORKSPACE_STANDALONE_CONFIGURATIONS, TASKS_CONFIGURATION_KEY, LAUNCH_CONFIGURATION_KEY, USER_STANDALONE_CONFIGURATIONS, TASKS_DEFAULT, FOLDER_SCOPES, IWorkbenchConfigurationService, APPLICATION_SCOPES, MCP_CONFIGURATION_KEY } from './configuration.js';
 import { FileOperationError, FileOperationResult, IFileService } from '../../../../platform/files/common/files.js';
 import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, keyFromOverrideIdentifiers, OVERRIDE_PROPERTY_REGEX } from '../../../../platform/configuration/common/configurationRegistry.js';
@@ -279,7 +279,8 @@ export class ConfigurationEditing {
 	private onInvalidConfigurationError(error: ConfigurationEditingError, operation: IConfigurationEditOperation,): void {
 		const openStandAloneConfigurationActionLabel = operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY ? nls.localize('openTasksConfiguration', "Open Tasks Configuration")
 			: operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY ? nls.localize('openLaunchConfiguration', "Open Launch Configuration")
-				: null;
+				: operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY ? nls.localize('openMcpConfiguration', "Open MCP Configuration")
+					: null;
 		if (openStandAloneConfigurationActionLabel) {
 			this.notificationService.prompt(Severity.Error, error.message,
 				[{
@@ -384,6 +385,9 @@ export class ConfigurationEditing {
 				if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
 					return nls.localize('errorInvalidLaunchConfiguration', "Unable to write into the launch configuration file. Please open it to correct errors/warnings in it and try again.");
 				}
+				if (operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY) {
+					return nls.localize('errorInvalidMCPConfiguration', "Unable to write into the MCP configuration file. Please open it to correct errors/warnings in it and try again.");
+				}
 				switch (target) {
 					case EditableConfigurationTarget.USER_LOCAL:
 						return nls.localize('errorInvalidConfiguration', "Unable to write into user settings. Please open the user settings to correct errors/warnings in it and try again.");
@@ -412,6 +416,9 @@ export class ConfigurationEditing {
 				if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
 					return nls.localize('errorLaunchConfigurationFileDirty', "Unable to write into launch configuration file because the file has unsaved changes. Please save it first and then try again.");
 				}
+				if (operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY) {
+					return nls.localize('errorMCPConfigurationFileDirty', "Unable to write into MCP configuration file because the file has unsaved changes. Please save it first and then try again.");
+				}
 				switch (target) {
 					case EditableConfigurationTarget.USER_LOCAL:
 						return nls.localize('errorConfigurationFileDirty', "Unable to write into user settings because the file has unsaved changes. Please save the user settings file first and then try again.");
@@ -440,6 +447,9 @@ export class ConfigurationEditing {
 				if (operation.workspaceStandAloneConfigurationKey === LAUNCH_CONFIGURATION_KEY) {
 					return nls.localize('errorLaunchConfigurationFileModifiedSince', "Unable to write into launch configuration file because the content of the file is newer.");
 				}
+				if (operation.workspaceStandAloneConfigurationKey === MCP_CONFIGURATION_KEY) {
+					return nls.localize('errorMCPConfigurationFileModifiedSince', "Unable to write into MCP configuration file because the content of the file is newer.");
+				}
 				switch (target) {
 					case EditableConfigurationTarget.USER_LOCAL:
 						return nls.localize('errorConfigurationFileModifiedSince', "Unable to write into user settings because the content of the file is newer.");
diff --git a/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts b/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
index af059baa74ba..fde5e04ed5d8 100644
--- a/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
@@ -16,13 +16,13 @@ import { ConfigurationTarget, IConfigurationOverrides, IConfigurationService } f
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { IInputOptions, IPickOptions, IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkspaceContextService, IWorkspaceFolderData, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
 import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
-import { ConfiguredInput } from '../common/configurationResolver.js';
-import { AbstractVariableResolverService } from '../common/variableResolver.js';
 import { IEditorService } from '../../editor/common/editorService.js';
 import { IExtensionService } from '../../extensions/common/extensions.js';
 import { IPathService } from '../../path/common/pathService.js';
+import { ConfiguredInput } from '../common/configurationResolver.js';
+import { AbstractVariableResolverService } from '../common/variableResolver.js';
 
 const LAST_INPUT_STORAGE_KEY = 'configResolveInputLru';
 const LAST_INPUT_CACHE_SIZE = 5;
@@ -138,7 +138,7 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 		}, labelService, pathService.userHome().then(home => home.path), envVariablesPromise);
 	}
 
-	public override async resolveWithInteractionReplace(folder: IWorkspaceFolder | undefined, config: any, section?: string, variables?: IStringDictionary<string>, target?: ConfigurationTarget): Promise<any> {
+	public override async resolveWithInteractionReplace(folder: IWorkspaceFolderData | undefined, config: any, section?: string, variables?: IStringDictionary<string>, target?: ConfigurationTarget): Promise<any> {
 		// resolve any non-interactive variables and any contributed variables
 		config = await this.resolveAnyAsync(folder, config);
 
@@ -155,7 +155,7 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 		});
 	}
 
-	public override async resolveWithInteraction(folder: IWorkspaceFolder | undefined, config: any, section?: string, variables?: IStringDictionary<string>, target?: ConfigurationTarget): Promise<Map<string, string> | undefined> {
+	public override async resolveWithInteraction(folder: IWorkspaceFolderData | undefined, config: any, section?: string, variables?: IStringDictionary<string>, target?: ConfigurationTarget): Promise<Map<string, string> | undefined> {
 		// resolve any non-interactive variables and any contributed variables
 		const resolved = await this.resolveAnyMap(folder, config);
 		config = resolved.newConfig;
@@ -191,7 +191,7 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 	 *
 	 * @param variableToCommandMap Aliases for commands
 	 */
-	private async resolveWithInputAndCommands(folder: IWorkspaceFolder | undefined, configuration: any, variableToCommandMap?: IStringDictionary<string>, section?: string, target?: ConfigurationTarget): Promise<IStringDictionary<string> | undefined> {
+	private async resolveWithInputAndCommands(folder: IWorkspaceFolderData | undefined, configuration: any, variableToCommandMap?: IStringDictionary<string>, section?: string, target?: ConfigurationTarget): Promise<IStringDictionary<string> | undefined> {
 
 		if (!configuration) {
 			return Promise.resolve(undefined);
diff --git a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
index e74865448881..ea661b6c21db 100644
--- a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
+++ b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
@@ -4,35 +4,35 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IStringDictionary } from '../../../../base/common/collections.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
-import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
-import { IProcessEnvironment } from '../../../../base/common/platform.js';
 import { ErrorNoTelemetry } from '../../../../base/common/errors.js';
+import { IProcessEnvironment } from '../../../../base/common/platform.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { IWorkspaceFolderData } from '../../../../platform/workspace/common/workspace.js';
 
 export const IConfigurationResolverService = createDecorator<IConfigurationResolverService>('configurationResolverService');
 
 export interface IConfigurationResolverService {
 	readonly _serviceBrand: undefined;
 
-	resolveWithEnvironment(environment: IProcessEnvironment, folder: IWorkspaceFolder | undefined, value: string): Promise<string>;
+	resolveWithEnvironment(environment: IProcessEnvironment, folder: IWorkspaceFolderData | undefined, value: string): Promise<string>;
 
-	resolveAsync(folder: IWorkspaceFolder | undefined, value: string): Promise<string>;
-	resolveAsync(folder: IWorkspaceFolder | undefined, value: string[]): Promise<string[]>;
-	resolveAsync(folder: IWorkspaceFolder | undefined, value: IStringDictionary<string>): Promise<IStringDictionary<string>>;
+	resolveAsync(folder: IWorkspaceFolderData | undefined, value: string): Promise<string>;
+	resolveAsync(folder: IWorkspaceFolderData | undefined, value: string[]): Promise<string[]>;
+	resolveAsync(folder: IWorkspaceFolderData | undefined, value: IStringDictionary<string>): Promise<IStringDictionary<string>>;
 
 	/**
 	 * Recursively resolves all variables in the given config and returns a copy of it with substituted values.
 	 * Command variables are only substituted if a "commandValueMapping" dictionary is given and if it contains an entry for the command.
 	 */
-	resolveAnyAsync(folder: IWorkspaceFolder | undefined, config: any, commandValueMapping?: IStringDictionary<string>): Promise<any>;
+	resolveAnyAsync(folder: IWorkspaceFolderData | undefined, config: any, commandValueMapping?: IStringDictionary<string>): Promise<any>;
 
 	/**
 	 * Recursively resolves all variables in the given config.
 	 * Returns a copy of it with substituted values and a map of variables and their resolution.
 	 * Keys in the map will be of the format input:variableName or command:variableName.
 	 */
-	resolveAnyMap(folder: IWorkspaceFolder | undefined, config: any, commandValueMapping?: IStringDictionary<string>): Promise<{ newConfig: any; resolvedVariables: Map<string, string> }>;
+	resolveAnyMap(folder: IWorkspaceFolderData | undefined, config: any, commandValueMapping?: IStringDictionary<string>): Promise<{ newConfig: any; resolvedVariables: Map<string, string> }>;
 
 	/**
 	 * Recursively resolves all variables (including commands and user input) in the given config and returns a copy of it with substituted values.
@@ -41,13 +41,13 @@ export interface IConfigurationResolverService {
 	 * @param section For example, 'tasks' or 'debug'. Used for resolving inputs.
 	 * @param variables Aliases for commands.
 	 */
-	resolveWithInteractionReplace(folder: IWorkspaceFolder | undefined, config: any, section?: string, variables?: IStringDictionary<string>, target?: ConfigurationTarget): Promise<any>;
+	resolveWithInteractionReplace(folder: IWorkspaceFolderData | undefined, config: any, section?: string, variables?: IStringDictionary<string>, target?: ConfigurationTarget): Promise<any>;
 
 	/**
 	 * Similar to resolveWithInteractionReplace, except without the replace. Returns a map of variables and their resolution.
 	 * Keys in the map will be of the format input:variableName or command:variableName.
 	 */
-	resolveWithInteraction(folder: IWorkspaceFolder | undefined, config: any, section?: string, variables?: IStringDictionary<string>, target?: ConfigurationTarget): Promise<Map<string, string> | undefined>;
+	resolveWithInteraction(folder: IWorkspaceFolderData | undefined, config: any, section?: string, variables?: IStringDictionary<string>, target?: ConfigurationTarget): Promise<Map<string, string> | undefined>;
 
 	/**
 	 * Contributes a variable that can be resolved later. Consumers that use resolveAny, resolveWithInteraction,
diff --git a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
index b67a8fe14015..2c906b6a8cbc 100644
--- a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
+++ b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
@@ -3,19 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { IStringDictionary } from '../../../../base/common/collections.js';
+import { normalizeDriveLetter } from '../../../../base/common/labels.js';
+import * as objects from '../../../../base/common/objects.js';
 import * as paths from '../../../../base/common/path.js';
+import { IProcessEnvironment, isLinux, isMacintosh, isWindows } from '../../../../base/common/platform.js';
 import * as process from '../../../../base/common/process.js';
+import { replaceAsync } from '../../../../base/common/strings.js';
 import * as types from '../../../../base/common/types.js';
-import * as objects from '../../../../base/common/objects.js';
-import { IStringDictionary } from '../../../../base/common/collections.js';
-import { IProcessEnvironment, isWindows, isMacintosh, isLinux } from '../../../../base/common/platform.js';
-import { normalizeDriveLetter } from '../../../../base/common/labels.js';
-import { localize } from '../../../../nls.js';
 import { URI as uri } from '../../../../base/common/uri.js';
-import { IConfigurationResolverService, VariableError, VariableKind } from './configurationResolver.js';
-import { IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { localize } from '../../../../nls.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
-import { replaceAsync } from '../../../../base/common/strings.js';
+import { IWorkspaceFolderData } from '../../../../platform/workspace/common/workspace.js';
+import { IConfigurationResolverService, VariableError, VariableKind } from './configurationResolver.js';
 
 interface IVariableResolveContext {
 	getFolderUri(folderName: string): uri | undefined;
@@ -69,14 +69,14 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe
 		return envVariables;
 	}
 
-	public resolveWithEnvironment(environment: IProcessEnvironment, root: IWorkspaceFolder | undefined, value: string): Promise<string> {
+	public resolveWithEnvironment(environment: IProcessEnvironment, root: IWorkspaceFolderData | undefined, value: string): Promise<string> {
 		return this.recursiveResolve({ env: this.prepareEnv(environment), userHome: undefined }, root ? root.uri : undefined, value);
 	}
 
-	public async resolveAsync(root: IWorkspaceFolder | undefined, value: string): Promise<string>;
-	public async resolveAsync(root: IWorkspaceFolder | undefined, value: string[]): Promise<string[]>;
-	public async resolveAsync(root: IWorkspaceFolder | undefined, value: IStringDictionary<string>): Promise<IStringDictionary<string>>;
-	public async resolveAsync(root: IWorkspaceFolder | undefined, value: any): Promise<any> {
+	public async resolveAsync(root: IWorkspaceFolderData | undefined, value: string): Promise<string>;
+	public async resolveAsync(root: IWorkspaceFolderData | undefined, value: string[]): Promise<string[]>;
+	public async resolveAsync(root: IWorkspaceFolderData | undefined, value: IStringDictionary<string>): Promise<IStringDictionary<string>>;
+	public async resolveAsync(root: IWorkspaceFolderData | undefined, value: any): Promise<any> {
 		const environment: Environment = {
 			env: await this._envVariablesPromise,
 			userHome: await this._userHomePromise
@@ -84,7 +84,7 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe
 		return this.recursiveResolve(environment, root ? root.uri : undefined, value);
 	}
 
-	private async resolveAnyBase(workspaceFolder: IWorkspaceFolder | undefined, config: any, commandValueMapping?: IStringDictionary<string>, resolvedVariables?: Map<string, string>): Promise<any> {
+	private async resolveAnyBase(workspaceFolder: IWorkspaceFolderData | undefined, config: any, commandValueMapping?: IStringDictionary<string>, resolvedVariables?: Map<string, string>): Promise<any> {
 
 		const result = objects.deepClone(config);
 
@@ -110,21 +110,21 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe
 		return this.recursiveResolve(environmentPromises, workspaceFolder ? workspaceFolder.uri : undefined, result, commandValueMapping, resolvedVariables);
 	}
 
-	public async resolveAnyAsync(workspaceFolder: IWorkspaceFolder | undefined, config: any, commandValueMapping?: IStringDictionary<string>): Promise<any> {
+	public async resolveAnyAsync(workspaceFolder: IWorkspaceFolderData | undefined, config: any, commandValueMapping?: IStringDictionary<string>): Promise<any> {
 		return this.resolveAnyBase(workspaceFolder, config, commandValueMapping);
 	}
 
-	public async resolveAnyMap(workspaceFolder: IWorkspaceFolder | undefined, config: any, commandValueMapping?: IStringDictionary<string>): Promise<{ newConfig: any; resolvedVariables: Map<string, string> }> {
+	public async resolveAnyMap(workspaceFolder: IWorkspaceFolderData | undefined, config: any, commandValueMapping?: IStringDictionary<string>): Promise<{ newConfig: any; resolvedVariables: Map<string, string> }> {
 		const resolvedVariables = new Map<string, string>();
 		const newConfig = await this.resolveAnyBase(workspaceFolder, config, commandValueMapping, resolvedVariables);
 		return { newConfig, resolvedVariables };
 	}
 
-	public resolveWithInteractionReplace(folder: IWorkspaceFolder | undefined, config: any, section?: string, variables?: IStringDictionary<string>): Promise<any> {
+	public resolveWithInteractionReplace(folder: IWorkspaceFolderData | undefined, config: any, section?: string, variables?: IStringDictionary<string>): Promise<any> {
 		throw new Error('resolveWithInteractionReplace not implemented.');
 	}
 
-	public resolveWithInteraction(folder: IWorkspaceFolder | undefined, config: any, section?: string, variables?: IStringDictionary<string>): Promise<Map<string, string> | undefined> {
+	public resolveWithInteraction(folder: IWorkspaceFolderData | undefined, config: any, section?: string, variables?: IStringDictionary<string>): Promise<Map<string, string> | undefined> {
 		throw new Error('resolveWithInteraction not implemented.');
 	}
 
diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts
index 6cb01c728741..a71db4c88e5e 100644
--- a/src/vs/workbench/workbench.desktop.main.ts
+++ b/src/vs/workbench/workbench.desktop.main.ts
@@ -175,6 +175,9 @@ import './contrib/encryption/electron-sandbox/encryption.contribution.js';
 // Emergency Alert
 import './contrib/emergencyAlert/electron-sandbox/emergencyAlert.contribution.js';
 
+// MCP
+import './contrib/mcp/electron-sandbox/mcp.contribution.js';
+
 //#endregion
 
 

From 129f975fd4f4e71bef3f3a3272d81f909796eb23 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 11 Mar 2025 09:51:56 +0100
Subject: [PATCH 0757/1815] debt - prepare for property initialisation order
 changes #243049 (#243153)

---
 build/lib/propertyInitOrderChecker.js         |  26 ----
 build/lib/propertyInitOrderChecker.ts         |  26 ----
 src/vs/base/parts/storage/node/storage.ts     |  15 ++-
 src/vs/code/browser/workbench/workbench.ts    |  58 ++++++---
 .../sharedProcess/contrib/codeCacheCleaner.ts |  16 ++-
 .../contrib/languagePackCachedDataCleaner.ts  |  18 +--
 .../electron-main/auxiliaryWindow.ts          |   4 +-
 .../backup/electron-main/backupMainService.ts |   5 +-
 .../node/diskFileSystemProviderServer.ts      |   6 +-
 .../node/watcher/nodejs/nodejsWatcherLib.ts   |  17 ++-
 .../node/watcher/parcel/parcelWatcher.ts      |   9 +-
 .../electron-main/menubarMainService.ts       |   4 +-
 .../electron-main/nativeHostMainService.ts    | 122 +++++++++++-------
 src/vs/platform/state/node/stateService.ts    |   6 +-
 src/vs/platform/storage/common/storage.ts     |   6 +-
 .../platform/storage/common/storageService.ts |  25 ++--
 .../electron-main/storageMainService.ts       |   8 +-
 .../utilityProcessWorkerMainService.ts        |  10 +-
 .../windows/electron-main/windowImpl.ts       |   8 +-
 .../electron-main/windowsMainService.ts       |   6 +-
 .../electron-main/windowsStateHandler.ts      |   4 +-
 src/vs/platform/workspace/common/workspace.ts |  28 ++--
 .../electron-main/workspacesMainService.ts    |   4 +-
 .../workspacesManagementMainService.ts        |   4 +-
 .../common/extHostFileSystemEventService.ts   |   8 +-
 .../api/node/extHostDiskFileSystemProvider.ts |   6 +-
 .../parts/auxiliarybar/auxiliaryBarPart.ts    |   4 +-
 .../browser/parts/dialogs/dialogHandler.ts    |   6 +-
 .../storage/browser/storageService.ts         |   4 +-
 29 files changed, 258 insertions(+), 205 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index a0f03f7e8abe..622bbf2d7ac6 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -55,24 +55,7 @@ const TS_CONFIG_PATH = path.join(__dirname, '../../', 'src', 'tsconfig.json');
 //
 const ignored = new Set([
     'vs/base/common/arrays.ts',
-    'vs/platform/workspace/common/workspace.ts',
-    'vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts',
-    'vs/platform/storage/common/storage.ts',
-    'vs/platform/state/node/stateService.ts',
-    'vs/platform/workspaces/electron-main/workspacesManagementMainService.ts',
-    'vs/platform/windows/electron-main/windowImpl.ts',
-    'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts',
-    'vs/base/parts/storage/node/storage.ts',
-    'vs/platform/storage/electron-main/storageMainService.ts',
-    'vs/platform/backup/electron-main/backupMainService.ts',
-    'vs/platform/files/node/diskFileSystemProviderServer.ts',
-    'vs/platform/native/electron-main/nativeHostMainService.ts',
-    'vs/platform/menubar/electron-main/menubarMainService.ts',
-    'vs/platform/windows/electron-main/windowsStateHandler.ts',
-    'vs/platform/windows/electron-main/windowsMainService.ts',
-    'vs/platform/workspaces/electron-main/workspacesMainService.ts',
     'vs/platform/extensionManagement/common/extensionsScannerService.ts',
-    'vs/platform/utilityProcess/electron-main/utilityProcessWorkerMainService.ts',
     'vs/platform/configuration/common/configurations.ts',
     'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.ts',
     'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.ts',
@@ -158,7 +141,6 @@ const ignored = new Set([
     'vs/workbench/browser/parts/editor/editorStatus.ts',
     'vs/workbench/browser/parts/editor/editorPart.ts',
     'vs/workbench/browser/parts/editor/editorParts.ts',
-    'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts',
     'vs/workbench/services/textfile/common/textFileEditorModel.ts',
     'vs/workbench/services/history/browser/historyService.ts',
     'vs/workbench/services/notification/common/notificationService.ts',
@@ -204,31 +186,23 @@ const ignored = new Set([
     'vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts',
     'vs/workbench/contrib/accessibilitySignals/browser/editorTextPropertySignalsContribution.ts',
     'vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts',
-    'vs/workbench/browser/parts/dialogs/dialogHandler.ts',
     'vs/workbench/browser/parts/notifications/notificationsCenter.ts',
     'vs/workbench/browser/parts/notifications/notificationsToasts.ts',
-    'vs/workbench/services/storage/browser/storageService.ts',
     'vs/workbench/services/textfile/common/textFileEditorModelManager.ts',
     'vs/workbench/services/textfile/browser/textFileService.ts',
     'vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts',
     'vs/workbench/services/workingCopy/common/workingCopyBackupTracker.ts',
     'vs/workbench/contrib/welcomeDialog/browser/welcomeWidget.ts',
-    'vs/code/browser/workbench/workbench.ts',
     'vs/workbench/electron-sandbox/window.ts',
-    'vs/platform/storage/common/storageService.ts',
     'vs/workbench/services/files/electron-sandbox/diskFileSystemProvider.ts',
-    'vs/code/electron-utility/sharedProcess/contrib/codeCacheCleaner.ts',
     'vs/code/electron-utility/sharedProcess/contrib/languagePackCachedDataCleaner.ts',
     'vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordInsertView.ts',
-    'vs/platform/files/node/watcher/parcel/parcelWatcher.ts',
     'vs/platform/terminal/node/ptyService.ts',
     'vs/workbench/services/host/electron-sandbox/nativeHostService.ts',
     'vs/workbench/services/integrity/electron-sandbox/integrityService.ts',
     'vs/workbench/api/common/extHostLanguageFeatures.ts',
-    'vs/workbench/api/common/extHostFileSystemEventService.ts',
     'vs/workbench/api/common/extHostSearch.ts',
-    'vs/workbench/api/node/extHostDiskFileSystemProvider.ts',
     'vs/workbench/test/common/workbenchTestServices.ts',
     'vs/workbench/test/browser/workbenchTestServices.ts',
     'vs/workbench/contrib/testing/test/common/testStubs.ts',
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index 36f219ff25af..17cc0c1eb310 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -24,24 +24,7 @@ const TS_CONFIG_PATH = path.join(__dirname, '../../', 'src', 'tsconfig.json');
 
 const ignored = new Set([
 	'vs/base/common/arrays.ts',
-	'vs/platform/workspace/common/workspace.ts',
-	'vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts',
-	'vs/platform/storage/common/storage.ts',
-	'vs/platform/state/node/stateService.ts',
-	'vs/platform/workspaces/electron-main/workspacesManagementMainService.ts',
-	'vs/platform/windows/electron-main/windowImpl.ts',
-	'vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts',
-	'vs/base/parts/storage/node/storage.ts',
-	'vs/platform/storage/electron-main/storageMainService.ts',
-	'vs/platform/backup/electron-main/backupMainService.ts',
-	'vs/platform/files/node/diskFileSystemProviderServer.ts',
-	'vs/platform/native/electron-main/nativeHostMainService.ts',
-	'vs/platform/menubar/electron-main/menubarMainService.ts',
-	'vs/platform/windows/electron-main/windowsStateHandler.ts',
-	'vs/platform/windows/electron-main/windowsMainService.ts',
-	'vs/platform/workspaces/electron-main/workspacesMainService.ts',
 	'vs/platform/extensionManagement/common/extensionsScannerService.ts',
-	'vs/platform/utilityProcess/electron-main/utilityProcessWorkerMainService.ts',
 	'vs/platform/configuration/common/configurations.ts',
 	'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.ts',
 	'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.ts',
@@ -127,7 +110,6 @@ const ignored = new Set([
 	'vs/workbench/browser/parts/editor/editorStatus.ts',
 	'vs/workbench/browser/parts/editor/editorPart.ts',
 	'vs/workbench/browser/parts/editor/editorParts.ts',
-	'vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts',
 	'vs/workbench/services/textfile/common/textFileEditorModel.ts',
 	'vs/workbench/services/history/browser/historyService.ts',
 	'vs/workbench/services/notification/common/notificationService.ts',
@@ -173,31 +155,23 @@ const ignored = new Set([
 	'vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts',
 	'vs/workbench/contrib/accessibilitySignals/browser/editorTextPropertySignalsContribution.ts',
 	'vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts',
-	'vs/workbench/browser/parts/dialogs/dialogHandler.ts',
 	'vs/workbench/browser/parts/notifications/notificationsCenter.ts',
 	'vs/workbench/browser/parts/notifications/notificationsToasts.ts',
-	'vs/workbench/services/storage/browser/storageService.ts',
 	'vs/workbench/services/textfile/common/textFileEditorModelManager.ts',
 	'vs/workbench/services/textfile/browser/textFileService.ts',
 	'vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts',
 	'vs/workbench/services/workingCopy/common/workingCopyBackupTracker.ts',
 	'vs/workbench/contrib/welcomeDialog/browser/welcomeWidget.ts',
-	'vs/code/browser/workbench/workbench.ts',
 	'vs/workbench/electron-sandbox/window.ts',
-	'vs/platform/storage/common/storageService.ts',
 	'vs/workbench/services/files/electron-sandbox/diskFileSystemProvider.ts',
-	'vs/code/electron-utility/sharedProcess/contrib/codeCacheCleaner.ts',
 	'vs/code/electron-utility/sharedProcess/contrib/languagePackCachedDataCleaner.ts',
 	'vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordInsertView.ts',
-	'vs/platform/files/node/watcher/parcel/parcelWatcher.ts',
 	'vs/platform/terminal/node/ptyService.ts',
 	'vs/workbench/services/host/electron-sandbox/nativeHostService.ts',
 	'vs/workbench/services/integrity/electron-sandbox/integrityService.ts',
 	'vs/workbench/api/common/extHostLanguageFeatures.ts',
-	'vs/workbench/api/common/extHostFileSystemEventService.ts',
 	'vs/workbench/api/common/extHostSearch.ts',
-	'vs/workbench/api/node/extHostDiskFileSystemProvider.ts',
 	'vs/workbench/test/common/workbenchTestServices.ts',
 	'vs/workbench/test/browser/workbenchTestServices.ts',
 	'vs/workbench/contrib/testing/test/common/testStubs.ts',
diff --git a/src/vs/base/parts/storage/node/storage.ts b/src/vs/base/parts/storage/node/storage.ts
index 2def700f2b05..bf674966c0a0 100644
--- a/src/vs/base/parts/storage/node/storage.ts
+++ b/src/vs/base/parts/storage/node/storage.ts
@@ -38,13 +38,20 @@ export class SQLiteStorageDatabase implements IStorageDatabase {
 	private static readonly BUSY_OPEN_TIMEOUT = 2000; // timeout in ms to retry when opening DB fails with SQLITE_BUSY
 	private static readonly MAX_HOST_PARAMETERS = 256; // maximum number of parameters within a statement
 
-	private readonly name = basename(this.path);
+	private readonly name: string;
 
-	private readonly logger = new SQLiteStorageDatabaseLogger(this.options.logging);
+	private readonly logger: SQLiteStorageDatabaseLogger;
 
-	private readonly whenConnected = this.connect(this.path);
+	private readonly whenConnected: Promise<IDatabaseConnection>;
 
-	constructor(private readonly path: string, private readonly options: ISQLiteStorageDatabaseOptions = Object.create(null)) { }
+	constructor(
+		private readonly path: string,
+		options: ISQLiteStorageDatabaseOptions = Object.create(null)
+	) {
+		this.name = basename(this.path);
+		this.logger = new SQLiteStorageDatabaseLogger(options.logging);
+		this.whenConnected = this.connect(this.path);
+	}
 
 	async getItems(): Promise<Map<string, string>> {
 		const connection = await this.whenConnected;
diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts
index faa711a30c5b..ab9671491fb0 100644
--- a/src/vs/code/browser/workbench/workbench.ts
+++ b/src/vs/code/browser/workbench/workbench.ts
@@ -28,6 +28,7 @@ interface ISecretStorageCrypto {
 }
 
 class TransparentCrypto implements ISecretStorageCrypto {
+
 	async seal(data: string): Promise<string> {
 		return data;
 	}
@@ -44,6 +45,7 @@ const enum AESConstants {
 }
 
 class NetworkError extends Error {
+
 	constructor(inner: Error) {
 		super(inner.message);
 		this.name = inner.name;
@@ -52,10 +54,13 @@ class NetworkError extends Error {
 }
 
 class ServerKeyedAESCrypto implements ISecretStorageCrypto {
-	private _serverKey: Uint8Array | undefined;
 
-	/** Gets whether the algorithm is supported; requires a secure context */
-	public static supported() {
+	private serverKey: Uint8Array | undefined;
+
+	/**
+	 * Gets whether the algorithm is supported; requires a secure context
+	 */
+	static supported() {
 		return !!crypto.subtle;
 	}
 
@@ -141,8 +146,8 @@ class ServerKeyedAESCrypto implements ISecretStorageCrypto {
 	}
 
 	private async getServerKeyPart(): Promise<Uint8Array> {
-		if (this._serverKey) {
-			return this._serverKey;
+		if (this.serverKey) {
+			return this.serverKey;
 		}
 
 		let attempt = 0;
@@ -154,12 +159,15 @@ class ServerKeyedAESCrypto implements ISecretStorageCrypto {
 				if (!res.ok) {
 					throw new Error(res.statusText);
 				}
+
 				const serverKey = new Uint8Array(await res.arrayBuffer());
 				if (serverKey.byteLength !== AESConstants.KEY_LENGTH / 8) {
 					throw Error(`The key retrieved by the server is not ${AESConstants.KEY_LENGTH} bit long.`);
 				}
-				this._serverKey = serverKey;
-				return this._serverKey;
+
+				this.serverKey = serverKey;
+
+				return this.serverKey;
 			} catch (e) {
 				lastError = e instanceof Error ? e : new Error(String(e));
 				attempt++;
@@ -172,34 +180,39 @@ class ServerKeyedAESCrypto implements ISecretStorageCrypto {
 		if (lastError) {
 			throw new NetworkError(lastError);
 		}
+
 		throw new Error('Unknown error');
 	}
 }
 
 export class LocalStorageSecretStorageProvider implements ISecretStorageProvider {
-	private readonly _storageKey = 'secrets.provider';
 
-	private _secretsPromise: Promise<Record<string, string>> = this.load();
+	private readonly storageKey = 'secrets.provider';
+
+	private secretsPromise: Promise<Record<string, string>>;
 
 	type: 'in-memory' | 'persisted' | 'unknown' = 'persisted';
 
 	constructor(
 		private readonly crypto: ISecretStorageCrypto,
-	) { }
+	) {
+		this.secretsPromise = this.load();
+	}
 
 	private async load(): Promise<Record<string, string>> {
 		const record = this.loadAuthSessionFromElement();
-		// Get the secrets from localStorage
-		const encrypted = localStorage.getItem(this._storageKey);
+
+		const encrypted = localStorage.getItem(this.storageKey);
 		if (encrypted) {
 			try {
 				const decrypted = JSON.parse(await this.crypto.unseal(encrypted));
+
 				return { ...record, ...decrypted };
 			} catch (err) {
 				// TODO: send telemetry
 				console.error('Failed to decrypt secrets from localStorage', err);
 				if (!(err instanceof NetworkError)) {
-					localStorage.removeItem(this._storageKey);
+					localStorage.removeItem(this.storageKey);
 				}
 			}
 		}
@@ -243,33 +256,35 @@ export class LocalStorageSecretStorageProvider implements ISecretStorageProvider
 	}
 
 	async get(key: string): Promise<string | undefined> {
-		const secrets = await this._secretsPromise;
+		const secrets = await this.secretsPromise;
+
 		return secrets[key];
 	}
+
 	async set(key: string, value: string): Promise<void> {
-		const secrets = await this._secretsPromise;
+		const secrets = await this.secretsPromise;
 		secrets[key] = value;
-		this._secretsPromise = Promise.resolve(secrets);
+		this.secretsPromise = Promise.resolve(secrets);
 		this.save();
 	}
+
 	async delete(key: string): Promise<void> {
-		const secrets = await this._secretsPromise;
+		const secrets = await this.secretsPromise;
 		delete secrets[key];
-		this._secretsPromise = Promise.resolve(secrets);
+		this.secretsPromise = Promise.resolve(secrets);
 		this.save();
 	}
 
 	private async save(): Promise<void> {
 		try {
-			const encrypted = await this.crypto.seal(JSON.stringify(await this._secretsPromise));
-			localStorage.setItem(this._storageKey, encrypted);
+			const encrypted = await this.crypto.seal(JSON.stringify(await this.secretsPromise));
+			localStorage.setItem(this.storageKey, encrypted);
 		} catch (err) {
 			console.error(err);
 		}
 	}
 }
 
-
 class LocalStorageURLCallbackProvider extends Disposable implements IURLCallbackProvider {
 
 	private static REQUEST_ID = 0;
@@ -485,6 +500,7 @@ class WorkspaceProvider implements IWorkspaceProvider {
 				return !!result;
 			}
 		}
+
 		return false;
 	}
 
diff --git a/src/vs/code/electron-utility/sharedProcess/contrib/codeCacheCleaner.ts b/src/vs/code/electron-utility/sharedProcess/contrib/codeCacheCleaner.ts
index 7560b8fac32c..5e7ebeaee5d2 100644
--- a/src/vs/code/electron-utility/sharedProcess/contrib/codeCacheCleaner.ts
+++ b/src/vs/code/electron-utility/sharedProcess/contrib/codeCacheCleaner.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as fs from 'fs';
+import { promises } from 'fs';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
@@ -14,17 +14,19 @@ import { IProductService } from '../../../../platform/product/common/productServ
 
 export class CodeCacheCleaner extends Disposable {
 
-	private readonly _DataMaxAge = this.productService.quality !== 'stable'
-		? 1000 * 60 * 60 * 24 * 7 		// roughly 1 week (insiders)
-		: 1000 * 60 * 60 * 24 * 30 * 3; // roughly 3 months (stable)
+	private readonly dataMaxAge: number;
 
 	constructor(
 		currentCodeCachePath: string | undefined,
-		@IProductService private readonly productService: IProductService,
+		@IProductService productService: IProductService,
 		@ILogService private readonly logService: ILogService
 	) {
 		super();
 
+		this.dataMaxAge = productService.quality !== 'stable'
+			? 1000 * 60 * 60 * 24 * 7 		// roughly 1 week (insiders)
+			: 1000 * 60 * 60 * 24 * 30 * 3; // roughly 3 months (stable)
+
 		// Cached data is stored as user data and we run a cleanup task every time
 		// the editor starts. The strategy is to delete all files that are older than
 		// 3 months (1 week respectively)
@@ -55,8 +57,8 @@ export class CodeCacheCleaner extends Disposable {
 
 				// Delete cache folder if old enough
 				const codeCacheEntryPath = join(codeCacheRootPath, codeCache);
-				const codeCacheEntryStat = await fs.promises.stat(codeCacheEntryPath);
-				if (codeCacheEntryStat.isDirectory() && (now - codeCacheEntryStat.mtime.getTime()) > this._DataMaxAge) {
+				const codeCacheEntryStat = await promises.stat(codeCacheEntryPath);
+				if (codeCacheEntryStat.isDirectory() && (now - codeCacheEntryStat.mtime.getTime()) > this.dataMaxAge) {
 					this.logService.trace(`[code cache cleanup]: Removing code cache folder ${codeCache}.`);
 
 					return Promises.rm(codeCacheEntryPath);
diff --git a/src/vs/code/electron-utility/sharedProcess/contrib/languagePackCachedDataCleaner.ts b/src/vs/code/electron-utility/sharedProcess/contrib/languagePackCachedDataCleaner.ts
index 0c70b33f15c2..f3f351ebaa49 100644
--- a/src/vs/code/electron-utility/sharedProcess/contrib/languagePackCachedDataCleaner.ts
+++ b/src/vs/code/electron-utility/sharedProcess/contrib/languagePackCachedDataCleaner.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as fs from 'fs';
+import { promises } from 'fs';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { IStringDictionary } from '../../../../base/common/collections.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
@@ -33,17 +33,19 @@ interface ILanguagePackFile {
 
 export class LanguagePackCachedDataCleaner extends Disposable {
 
-	private readonly _DataMaxAge = this.productService.quality !== 'stable'
-		? 1000 * 60 * 60 * 24 * 7 		// roughly 1 week (insiders)
-		: 1000 * 60 * 60 * 24 * 30 * 3; // roughly 3 months (stable)
+	private readonly dataMaxAge: number;
 
 	constructor(
 		@INativeEnvironmentService private readonly environmentService: INativeEnvironmentService,
 		@ILogService private readonly logService: ILogService,
-		@IProductService private readonly productService: IProductService
+		@IProductService productService: IProductService
 	) {
 		super();
 
+		this.dataMaxAge = productService.quality !== 'stable'
+			? 1000 * 60 * 60 * 24 * 7 		// roughly 1 week (insiders)
+			: 1000 * 60 * 60 * 24 * 30 * 3; // roughly 3 months (stable)
+
 		// We have no Language pack support for dev version (run from source)
 		// So only cleanup when we have a build version.
 		if (this.environmentService.isBuilt) {
@@ -59,7 +61,7 @@ export class LanguagePackCachedDataCleaner extends Disposable {
 
 		try {
 			const installed: IStringDictionary<boolean> = Object.create(null);
-			const metaData: ILanguagePackFile = JSON.parse(await fs.promises.readFile(join(this.environmentService.userDataPath, 'languagepacks.json'), 'utf8'));
+			const metaData: ILanguagePackFile = JSON.parse(await promises.readFile(join(this.environmentService.userDataPath, 'languagepacks.json'), 'utf8'));
 			for (const locale of Object.keys(metaData)) {
 				const entry = metaData[locale];
 				installed[`${entry.hash}.${locale}`] = true;
@@ -94,8 +96,8 @@ export class LanguagePackCachedDataCleaner extends Disposable {
 					}
 
 					const candidate = join(folder, entry);
-					const stat = await fs.promises.stat(candidate);
-					if (stat.isDirectory() && (now - stat.mtime.getTime()) > this._DataMaxAge) {
+					const stat = await promises.stat(candidate);
+					if (stat.isDirectory() && (now - stat.mtime.getTime()) > this.dataMaxAge) {
 						this.logService.trace(`[language pack cache cleanup]: Removing language pack cache folder: ${join(packEntry, entry)}`);
 
 						await Promises.rm(candidate);
diff --git a/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts b/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts
index 971d5cd6b2e9..683ca26d49b8 100644
--- a/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts
+++ b/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts
@@ -20,7 +20,7 @@ export interface IAuxiliaryWindow extends IBaseWindow {
 
 export class AuxiliaryWindow extends BaseWindow implements IAuxiliaryWindow {
 
-	readonly id = this.webContents.id;
+	readonly id: number;
 	parentId = -1;
 
 	override get win() {
@@ -43,6 +43,8 @@ export class AuxiliaryWindow extends BaseWindow implements IAuxiliaryWindow {
 	) {
 		super(configurationService, stateService, environmentMainService, logService);
 
+		this.id = this.webContents.id;
+
 		// Try to claim window
 		this.tryClaimWindow();
 	}
diff --git a/src/vs/platform/backup/electron-main/backupMainService.ts b/src/vs/platform/backup/electron-main/backupMainService.ts
index 36287ebc981f..55b36989ae31 100644
--- a/src/vs/platform/backup/electron-main/backupMainService.ts
+++ b/src/vs/platform/backup/electron-main/backupMainService.ts
@@ -27,7 +27,7 @@ export class BackupMainService implements IBackupMainService {
 
 	private static readonly backupWorkspacesMetadataStorageKey = 'backupWorkspaces';
 
-	protected backupHome = this.environmentMainService.backupHome;
+	protected backupHome: string;
 
 	private workspaces: IWorkspaceBackupInfo[] = [];
 	private folders: IFolderBackupInfo[] = [];
@@ -40,11 +40,12 @@ export class BackupMainService implements IBackupMainService {
 	private readonly backupPathComparer = { isEqual: (pathA: string, pathB: string) => isEqual(pathA, pathB, !isLinux) };
 
 	constructor(
-		@IEnvironmentMainService private readonly environmentMainService: IEnvironmentMainService,
+		@IEnvironmentMainService environmentMainService: IEnvironmentMainService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@ILogService private readonly logService: ILogService,
 		@IStateService private readonly stateService: IStateService
 	) {
+		this.backupHome = environmentMainService.backupHome;
 	}
 
 	async initialize(): Promise<void> {
diff --git a/src/vs/platform/files/node/diskFileSystemProviderServer.ts b/src/vs/platform/files/node/diskFileSystemProviderServer.ts
index d626904949ef..e5a847eb635d 100644
--- a/src/vs/platform/files/node/diskFileSystemProviderServer.ts
+++ b/src/vs/platform/files/node/diskFileSystemProviderServer.ts
@@ -272,16 +272,18 @@ export abstract class AbstractSessionFileWatcher extends Disposable implements I
 	// This is important because we want to ensure that we only
 	// forward events from the watched paths for this session and
 	// not other clients that asked to watch other paths.
-	private readonly fileWatcher = this._register(new DiskFileSystemProvider(this.logService));
+	private readonly fileWatcher: DiskFileSystemProvider;
 
 	constructor(
 		private readonly uriTransformer: IURITransformer,
 		sessionEmitter: Emitter<IFileChange[] | string>,
-		private readonly logService: ILogService,
+		logService: ILogService,
 		private readonly environmentService: IEnvironmentService
 	) {
 		super();
 
+		this.fileWatcher = this._register(new DiskFileSystemProvider(logService));
+
 		this.registerListeners(sessionEmitter);
 	}
 
diff --git a/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts b/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts
index b016dde0a9ff..3d92b0e33615 100644
--- a/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts
+++ b/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts
@@ -15,9 +15,10 @@ import { joinPath } from '../../../../../base/common/resources.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { realpath } from '../../../../../base/node/extpath.js';
 import { Promises } from '../../../../../base/node/pfs.js';
-import { FileChangeType, IFileChange } from '../../../common/files.js';
+import { FileChangeFilter, FileChangeType, IFileChange } from '../../../common/files.js';
 import { ILogMessage, coalesceEvents, INonRecursiveWatchRequest, parseWatcherPatterns, IRecursiveWatcherWithSubscribe, isFiltered, isWatchRequestWithCorrelation } from '../../../common/watcher.js';
 import { Lazy } from '../../../../../base/common/lazy.js';
+import { ParsedPattern } from '../../../../../base/common/glob.js';
 
 export class NodeJSFileWatcherLibrary extends Disposable {
 
@@ -50,9 +51,9 @@ export class NodeJSFileWatcherLibrary extends Disposable {
 	// to coalesce events and reduce spam.
 	private readonly fileChangesAggregator = this._register(new RunOnceWorker<IFileChange>(events => this.handleFileChanges(events), NodeJSFileWatcherLibrary.FILE_CHANGES_HANDLER_DELAY));
 
-	private readonly excludes = parseWatcherPatterns(this.request.path, this.request.excludes);
-	private readonly includes = this.request.includes ? parseWatcherPatterns(this.request.path, this.request.includes) : undefined;
-	private readonly filter = isWatchRequestWithCorrelation(this.request) ? this.request.filter : undefined; // filtering is only enabled when correlating because watchers are otherwise potentially reused
+	private readonly excludes: ParsedPattern[];
+	private readonly includes: ParsedPattern[] | undefined;
+	private readonly filter: FileChangeFilter | undefined;
 
 	private readonly cts = new CancellationTokenSource();
 
@@ -78,7 +79,7 @@ export class NodeJSFileWatcherLibrary extends Disposable {
 		return result;
 	});
 
-	readonly ready = this.watch();
+	readonly ready: Promise<void>;
 
 	private _isReusingRecursiveWatcher = false;
 	get isReusingRecursiveWatcher(): boolean { return this._isReusingRecursiveWatcher; }
@@ -95,6 +96,12 @@ export class NodeJSFileWatcherLibrary extends Disposable {
 		private verboseLogging?: boolean
 	) {
 		super();
+
+		this.excludes = parseWatcherPatterns(this.request.path, this.request.excludes);
+		this.includes = this.request.includes ? parseWatcherPatterns(this.request.path, this.request.includes) : 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();
 	}
 
 	private async watch(): Promise<void> {
diff --git a/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts b/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts
index a24ef066a5f7..70a36d3be486 100644
--- a/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts
+++ b/src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts
@@ -12,7 +12,7 @@ import { CancellationToken, CancellationTokenSource } from '../../../../../base/
 import { toErrorMessage } from '../../../../../base/common/errorMessage.js';
 import { Emitter, Event } from '../../../../../base/common/event.js';
 import { randomPath, isEqual, isEqualOrParent } from '../../../../../base/common/extpath.js';
-import { GLOBSTAR, patternsEquals } from '../../../../../base/common/glob.js';
+import { GLOBSTAR, ParsedPattern, patternsEquals } from '../../../../../base/common/glob.js';
 import { BaseWatcher } from '../baseWatcher.js';
 import { TernarySearchTree } from '../../../../../base/common/ternarySearchTree.js';
 import { normalizeNFC } from '../../../../../base/common/normalization.js';
@@ -37,8 +37,8 @@ export class ParcelWatcherInstance extends Disposable {
 	private didStop = false;
 	get stopped(): boolean { return this.didStop; }
 
-	private readonly includes = this.request.includes ? parseWatcherPatterns(this.request.path, this.request.includes) : undefined;
-	private readonly excludes = this.request.excludes ? parseWatcherPatterns(this.request.path, this.request.excludes) : undefined;
+	private readonly includes: ParsedPattern[] | undefined;
+	private readonly excludes: ParsedPattern[] | undefined;
 
 	private readonly subscriptions = new Map<string, Set<(change: IFileChange) => void>>();
 
@@ -65,6 +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;
+
 		this._register(toDisposable(() => this.subscriptions.clear()));
 	}
 
diff --git a/src/vs/platform/menubar/electron-main/menubarMainService.ts b/src/vs/platform/menubar/electron-main/menubarMainService.ts
index a80966d417af..b26f617df2fd 100644
--- a/src/vs/platform/menubar/electron-main/menubarMainService.ts
+++ b/src/vs/platform/menubar/electron-main/menubarMainService.ts
@@ -20,7 +20,7 @@ export class MenubarMainService extends Disposable implements IMenubarMainServic
 
 	declare readonly _serviceBrand: undefined;
 
-	private readonly menubar = this.installMenuBarAfterWindowOpen();
+	private readonly menubar: Promise<Menubar>;
 
 	constructor(
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -28,6 +28,8 @@ export class MenubarMainService extends Disposable implements IMenubarMainServic
 		@ILogService private readonly logService: ILogService
 	) {
 		super();
+
+		this.menubar = this.installMenuBarAfterWindowOpen();
 	}
 
 	private async installMenuBarAfterWindowOpen(): Promise<Menubar> {
diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts
index c04dabc6785c..6324e98e290f 100644
--- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
+++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
@@ -73,6 +73,60 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
 		super();
+
+		// Events
+		{
+			this.onDidOpenMainWindow = Event.map(this.windowsMainService.onDidOpenWindow, window => window.id);
+
+			this.onDidTriggerWindowSystemContextMenu = Event.any(
+				Event.map(this.windowsMainService.onDidTriggerSystemContextMenu, ({ window, x, y }) => ({ windowId: window.id, x, y })),
+				Event.map(this.auxiliaryWindowsMainService.onDidTriggerSystemContextMenu, ({ window, x, y }) => ({ windowId: window.id, x, y }))
+			);
+
+			this.onDidMaximizeWindow = Event.any(
+				Event.map(this.windowsMainService.onDidMaximizeWindow, window => window.id),
+				Event.map(this.auxiliaryWindowsMainService.onDidMaximizeWindow, window => window.id)
+			);
+			this.onDidUnmaximizeWindow = Event.any(
+				Event.map(this.windowsMainService.onDidUnmaximizeWindow, window => window.id),
+				Event.map(this.auxiliaryWindowsMainService.onDidUnmaximizeWindow, window => window.id)
+			);
+
+			this.onDidChangeWindowFullScreen = Event.any(
+				Event.map(this.windowsMainService.onDidChangeFullScreen, e => ({ windowId: e.window.id, fullscreen: e.fullscreen })),
+				Event.map(this.auxiliaryWindowsMainService.onDidChangeFullScreen, e => ({ windowId: e.window.id, fullscreen: e.fullscreen }))
+			);
+
+			this.onDidBlurMainWindow = Event.filter(Event.fromNodeEventEmitter(app, 'browser-window-blur', (event, window: BrowserWindow) => window.id), windowId => !!this.windowsMainService.getWindowById(windowId));
+			this.onDidFocusMainWindow = Event.any(
+				Event.map(Event.filter(Event.map(this.windowsMainService.onDidChangeWindowsCount, () => this.windowsMainService.getLastActiveWindow()), window => !!window), window => window!.id),
+				Event.filter(Event.fromNodeEventEmitter(app, 'browser-window-focus', (event, window: BrowserWindow) => window.id), windowId => !!this.windowsMainService.getWindowById(windowId))
+			);
+
+			this.onDidBlurMainOrAuxiliaryWindow = Event.any(
+				this.onDidBlurMainWindow,
+				Event.map(Event.filter(Event.fromNodeEventEmitter(app, 'browser-window-blur', (event, window: BrowserWindow) => this.auxiliaryWindowsMainService.getWindowByWebContents(window.webContents)), window => !!window), window => window!.id)
+			);
+			this.onDidFocusMainOrAuxiliaryWindow = Event.any(
+				this.onDidFocusMainWindow,
+				Event.map(Event.filter(Event.fromNodeEventEmitter(app, 'browser-window-focus', (event, window: BrowserWindow) => this.auxiliaryWindowsMainService.getWindowByWebContents(window.webContents)), window => !!window), window => window!.id)
+			);
+
+			this.onDidResumeOS = Event.fromNodeEventEmitter(powerMonitor, 'resume');
+
+			this.onDidChangeColorScheme = this.themeMainService.onDidChangeColorScheme;
+
+			this.onDidChangeDisplay = Event.debounce(Event.any(
+				Event.filter(Event.fromNodeEventEmitter(screen, 'display-metrics-changed', (event: Electron.Event, display: Display, changedMetrics?: string[]) => changedMetrics), changedMetrics => {
+					// Electron will emit 'display-metrics-changed' events even when actually
+					// going fullscreen, because the dock hides. However, we do not want to
+					// react on this event as there is no change in display bounds.
+					return !(Array.isArray(changedMetrics) && changedMetrics.length === 1 && changedMetrics[0] === 'workArea');
+				}),
+				Event.fromNodeEventEmitter(screen, 'display-added'),
+				Event.fromNodeEventEmitter(screen, 'display-removed')
+			), () => { }, 100);
+		}
 	}
 
 
@@ -85,59 +139,29 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 	//#region Events
 
-	readonly onDidOpenMainWindow = Event.map(this.windowsMainService.onDidOpenWindow, window => window.id);
-
-	readonly onDidTriggerWindowSystemContextMenu = Event.any(
-		Event.map(this.windowsMainService.onDidTriggerSystemContextMenu, ({ window, x, y }) => ({ windowId: window.id, x, y })),
-		Event.map(this.auxiliaryWindowsMainService.onDidTriggerSystemContextMenu, ({ window, x, y }) => ({ windowId: window.id, x, y }))
-	);
-
-	readonly onDidMaximizeWindow = Event.any(
-		Event.map(this.windowsMainService.onDidMaximizeWindow, window => window.id),
-		Event.map(this.auxiliaryWindowsMainService.onDidMaximizeWindow, window => window.id)
-	);
-	readonly onDidUnmaximizeWindow = Event.any(
-		Event.map(this.windowsMainService.onDidUnmaximizeWindow, window => window.id),
-		Event.map(this.auxiliaryWindowsMainService.onDidUnmaximizeWindow, window => window.id)
-	);
-
-	readonly onDidChangeWindowFullScreen = Event.any(
-		Event.map(this.windowsMainService.onDidChangeFullScreen, e => ({ windowId: e.window.id, fullscreen: e.fullscreen })),
-		Event.map(this.auxiliaryWindowsMainService.onDidChangeFullScreen, e => ({ windowId: e.window.id, fullscreen: e.fullscreen }))
-	);
-
-	readonly onDidBlurMainWindow = Event.filter(Event.fromNodeEventEmitter(app, 'browser-window-blur', (event, window: BrowserWindow) => window.id), windowId => !!this.windowsMainService.getWindowById(windowId));
-	readonly onDidFocusMainWindow = Event.any(
-		Event.map(Event.filter(Event.map(this.windowsMainService.onDidChangeWindowsCount, () => this.windowsMainService.getLastActiveWindow()), window => !!window), window => window!.id),
-		Event.filter(Event.fromNodeEventEmitter(app, 'browser-window-focus', (event, window: BrowserWindow) => window.id), windowId => !!this.windowsMainService.getWindowById(windowId))
-	);
-
-	readonly onDidBlurMainOrAuxiliaryWindow = Event.any(
-		this.onDidBlurMainWindow,
-		Event.map(Event.filter(Event.fromNodeEventEmitter(app, 'browser-window-blur', (event, window: BrowserWindow) => this.auxiliaryWindowsMainService.getWindowByWebContents(window.webContents)), window => !!window), window => window!.id)
-	);
-	readonly onDidFocusMainOrAuxiliaryWindow = Event.any(
-		this.onDidFocusMainWindow,
-		Event.map(Event.filter(Event.fromNodeEventEmitter(app, 'browser-window-focus', (event, window: BrowserWindow) => this.auxiliaryWindowsMainService.getWindowByWebContents(window.webContents)), window => !!window), window => window!.id)
-	);
-
-	readonly onDidResumeOS = Event.fromNodeEventEmitter(powerMonitor, 'resume');
-
-	readonly onDidChangeColorScheme = this.themeMainService.onDidChangeColorScheme;
+	readonly onDidOpenMainWindow: Event<number>;
+
+	readonly onDidTriggerWindowSystemContextMenu: Event<{ windowId: number; x: number; y: number }>;
+
+	readonly onDidMaximizeWindow: Event<number>;
+	readonly onDidUnmaximizeWindow: Event<number>;
+
+	readonly onDidChangeWindowFullScreen: Event<{ readonly windowId: number; readonly fullscreen: boolean }>;
+
+	readonly onDidBlurMainWindow: Event<number>;
+	readonly onDidFocusMainWindow: Event<number>;
+
+	readonly onDidBlurMainOrAuxiliaryWindow: Event<number>;
+	readonly onDidFocusMainOrAuxiliaryWindow: Event<number>;
+
+	readonly onDidResumeOS: Event<void>;
+
+	readonly onDidChangeColorScheme: Event<IColorScheme>;
 
 	private readonly _onDidChangePassword = this._register(new Emitter<{ account: string; service: string }>());
 	readonly onDidChangePassword = this._onDidChangePassword.event;
 
-	readonly onDidChangeDisplay = Event.debounce(Event.any(
-		Event.filter(Event.fromNodeEventEmitter(screen, 'display-metrics-changed', (event: Electron.Event, display: Display, changedMetrics?: string[]) => changedMetrics), changedMetrics => {
-			// Electron will emit 'display-metrics-changed' events even when actually
-			// going fullscreen, because the dock hides. However, we do not want to
-			// react on this event as there is no change in display bounds.
-			return !(Array.isArray(changedMetrics) && changedMetrics.length === 1 && changedMetrics[0] === 'workArea');
-		}),
-		Event.fromNodeEventEmitter(screen, 'display-added'),
-		Event.fromNodeEventEmitter(screen, 'display-removed')
-	), () => { }, 100);
+	readonly onDidChangeDisplay: Event<void>;
 
 	//#endregion
 
diff --git a/src/vs/platform/state/node/stateService.ts b/src/vs/platform/state/node/stateService.ts
index 77f7c45bc118..ef71d504bf68 100644
--- a/src/vs/platform/state/node/stateService.ts
+++ b/src/vs/platform/state/node/stateService.ts
@@ -25,18 +25,20 @@ export class FileStorage extends Disposable {
 	private storage: StorageDatabase = Object.create(null);
 	private lastSavedStorageContents = '';
 
-	private readonly flushDelayer = this._register(new ThrottledDelayer<void>(this.saveStrategy === SaveStrategy.IMMEDIATE ? 0 : 100 /* buffer saves over a short time */));
+	private readonly flushDelayer: ThrottledDelayer<void>;
 
 	private initializing: Promise<void> | undefined = undefined;
 	private closing: Promise<void> | undefined = undefined;
 
 	constructor(
 		private readonly storagePath: URI,
-		private readonly saveStrategy: SaveStrategy,
+		saveStrategy: SaveStrategy,
 		private readonly logService: ILogService,
 		private readonly fileService: IFileService,
 	) {
 		super();
+
+		this.flushDelayer = this._register(new ThrottledDelayer<void>(saveStrategy === SaveStrategy.IMMEDIATE ? 0 : 100 /* buffer saves over a short time */));
 	}
 
 	init(): Promise<void> {
diff --git a/src/vs/platform/storage/common/storage.ts b/src/vs/platform/storage/common/storage.ts
index b120f38a2963..d67cdc476805 100644
--- a/src/vs/platform/storage/common/storage.ts
+++ b/src/vs/platform/storage/common/storage.ts
@@ -328,11 +328,13 @@ export abstract class AbstractStorageService extends Disposable implements IStor
 
 	private initializationPromise: Promise<void> | undefined;
 
-	private readonly flushWhenIdleScheduler = this._register(new RunOnceScheduler(() => this.doFlushWhenIdle(), this.options.flushInterval));
+	private readonly flushWhenIdleScheduler: RunOnceScheduler;
 	private readonly runFlushWhenIdle = this._register(new MutableDisposable());
 
-	constructor(private readonly options: IStorageServiceOptions = { flushInterval: AbstractStorageService.DEFAULT_FLUSH_INTERVAL }) {
+	constructor(options: IStorageServiceOptions = { flushInterval: AbstractStorageService.DEFAULT_FLUSH_INTERVAL }) {
 		super();
+
+		this.flushWhenIdleScheduler = this._register(new RunOnceScheduler(() => this.doFlushWhenIdle(), options.flushInterval));
 	}
 
 	onDidChangeValue(scope: StorageScope.WORKSPACE, key: string | undefined, disposable: DisposableStore): Event<IWorkspaceStorageValueChangeEvent>;
diff --git a/src/vs/platform/storage/common/storageService.ts b/src/vs/platform/storage/common/storageService.ts
index c7181a897057..1b6d567fe3e0 100644
--- a/src/vs/platform/storage/common/storageService.ts
+++ b/src/vs/platform/storage/common/storageService.ts
@@ -17,24 +17,33 @@ import { IAnyWorkspaceIdentifier } from '../../workspace/common/workspace.js';
 
 export class RemoteStorageService extends AbstractStorageService {
 
-	private readonly applicationStorageProfile = this.initialProfiles.defaultProfile;
-	private readonly applicationStorage = this.createApplicationStorage();
+	private readonly applicationStorageProfile: IUserDataProfile;
+	private readonly applicationStorage: IStorage;
 
-	private profileStorageProfile = this.initialProfiles.currentProfile;
+	private profileStorageProfile: IUserDataProfile;
 	private readonly profileStorageDisposables = this._register(new DisposableStore());
-	private profileStorage = this.createProfileStorage(this.profileStorageProfile);
+	private profileStorage: IStorage;
 
-	private workspaceStorageId = this.initialWorkspace?.id;
+	private workspaceStorageId: string | undefined;
 	private readonly workspaceStorageDisposables = this._register(new DisposableStore());
-	private workspaceStorage = this.createWorkspaceStorage(this.initialWorkspace);
+	private workspaceStorage: IStorage | undefined;
 
 	constructor(
-		private readonly initialWorkspace: IAnyWorkspaceIdentifier | undefined,
-		private readonly initialProfiles: { defaultProfile: IUserDataProfile; currentProfile: IUserDataProfile },
+		initialWorkspace: IAnyWorkspaceIdentifier | undefined,
+		initialProfiles: { defaultProfile: IUserDataProfile; currentProfile: IUserDataProfile },
 		private readonly remoteService: IRemoteService,
 		private readonly environmentService: IEnvironmentService
 	) {
 		super();
+
+		this.applicationStorageProfile = initialProfiles.defaultProfile;
+		this.applicationStorage = this.createApplicationStorage();
+
+		this.profileStorageProfile = initialProfiles.currentProfile;
+		this.profileStorage = this.createProfileStorage(this.profileStorageProfile);
+
+		this.workspaceStorageId = initialWorkspace?.id;
+		this.workspaceStorage = this.createWorkspaceStorage(initialWorkspace);
 	}
 
 	private createApplicationStorage(): IStorage {
diff --git a/src/vs/platform/storage/electron-main/storageMainService.ts b/src/vs/platform/storage/electron-main/storageMainService.ts
index 94664c7eaef5..d46df4368623 100644
--- a/src/vs/platform/storage/electron-main/storageMainService.ts
+++ b/src/vs/platform/storage/electron-main/storageMainService.ts
@@ -91,6 +91,8 @@ export class StorageMainService extends Disposable implements IStorageMainServic
 	) {
 		super();
 
+		this.applicationStorage = this._register(this.createApplicationStorage());
+
 		this.registerListeners();
 	}
 
@@ -163,7 +165,7 @@ export class StorageMainService extends Disposable implements IStorageMainServic
 
 	//#region Application Storage
 
-	readonly applicationStorage = this._register(this.createApplicationStorage());
+	readonly applicationStorage: IStorageMain;
 
 	private createApplicationStorage(): IStorageMain {
 		this.logService.trace(`StorageMainService: creating application storage`);
@@ -332,13 +334,15 @@ export class ApplicationStorageMainService extends AbstractStorageService implem
 
 	declare readonly _serviceBrand: undefined;
 
-	readonly whenReady = this.storageMainService.applicationStorage.whenInit;
+	readonly whenReady: Promise<void>;
 
 	constructor(
 		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
 		@IStorageMainService private readonly storageMainService: IStorageMainService
 	) {
 		super();
+
+		this.whenReady = this.storageMainService.applicationStorage.whenInit;
 	}
 
 	protected doInitialize(): Promise<void> {
diff --git a/src/vs/platform/utilityProcess/electron-main/utilityProcessWorkerMainService.ts b/src/vs/platform/utilityProcess/electron-main/utilityProcessWorkerMainService.ts
index 9ab01b9be15d..1ce3d5a18a55 100644
--- a/src/vs/platform/utilityProcess/electron-main/utilityProcessWorkerMainService.ts
+++ b/src/vs/platform/utilityProcess/electron-main/utilityProcessWorkerMainService.ts
@@ -99,17 +99,19 @@ class UtilityProcessWorker extends Disposable {
 	private readonly _onDidTerminate = this._register(new Emitter<IUtilityProcessWorkerProcessExit>());
 	readonly onDidTerminate = this._onDidTerminate.event;
 
-	private readonly utilityProcess = this._register(new WindowUtilityProcess(this.logService, this.windowsMainService, this.telemetryService, this.lifecycleMainService));
+	private readonly utilityProcess: WindowUtilityProcess;
 
 	constructor(
-		@ILogService private readonly logService: ILogService,
+		@ILogService logService: ILogService,
 		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@ILifecycleMainService lifecycleMainService: ILifecycleMainService,
 		private readonly configuration: IUtilityProcessWorkerCreateConfiguration
 	) {
 		super();
 
+		this.utilityProcess = this._register(new WindowUtilityProcess(logService, windowsMainService, telemetryService, lifecycleMainService));
+
 		this.registerListeners();
 	}
 
diff --git a/src/vs/platform/windows/electron-main/windowImpl.ts b/src/vs/platform/windows/electron-main/windowImpl.ts
index 7ea47d522f8e..d7c6a41d986d 100644
--- a/src/vs/platform/windows/electron-main/windowImpl.ts
+++ b/src/vs/platform/windows/electron-main/windowImpl.ts
@@ -26,7 +26,7 @@ import { IFileService } from '../../files/common/files.js';
 import { ILifecycleMainService } from '../../lifecycle/electron-main/lifecycleMainService.js';
 import { ILogService } from '../../log/common/log.js';
 import { IProductService } from '../../product/common/productService.js';
-import { IProtocolMainService } from '../../protocol/electron-main/protocol.js';
+import { IIPCObjectUrl, IProtocolMainService } from '../../protocol/electron-main/protocol.js';
 import { resolveMarketplaceHeaders } from '../../externalServices/common/marketplace.js';
 import { IApplicationStorageMainService, IStorageMainService } from '../../storage/electron-main/storageMainService.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.js';
@@ -536,7 +536,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 
 	private customZoomLevel: number | undefined = undefined;
 
-	private readonly configObjectUrl = this._register(this.protocolMainService.createIPCObjectUrl<INativeWindowConfiguration>());
+	private readonly configObjectUrl: IIPCObjectUrl<INativeWindowConfiguration>;
 	private pendingLoadConfig: INativeWindowConfiguration | undefined;
 	private wasLoaded = false;
 
@@ -558,7 +558,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 		@IDialogMainService private readonly dialogMainService: IDialogMainService,
 		@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService,
 		@IProductService private readonly productService: IProductService,
-		@IProtocolMainService private readonly protocolMainService: IProtocolMainService,
+		@IProtocolMainService protocolMainService: IProtocolMainService,
 		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
 		@IStateService stateService: IStateService,
 		@IInstantiationService instantiationService: IInstantiationService
@@ -567,6 +567,8 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 
 		//#region create browser window
 		{
+			this.configObjectUrl = this._register(protocolMainService.createIPCObjectUrl<INativeWindowConfiguration>());
+
 			// Load window state
 			const [state, hasMultipleDisplays] = this.restoreWindowState(config.state);
 			this.windowState = state;
diff --git a/src/vs/platform/windows/electron-main/windowsMainService.ts b/src/vs/platform/windows/electron-main/windowsMainService.ts
index d2ca2f8f6c7a..594b83643530 100644
--- a/src/vs/platform/windows/electron-main/windowsMainService.ts
+++ b/src/vs/platform/windows/electron-main/windowsMainService.ts
@@ -210,7 +210,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 
 	private readonly windows = new Map<number, ICodeWindow>();
 
-	private readonly windowsStateHandler = this._register(new WindowsStateHandler(this, this.stateService, this.lifecycleMainService, this.logService, this.configurationService));
+	private readonly windowsStateHandler: WindowsStateHandler;
 
 	constructor(
 		private readonly machineId: string,
@@ -219,7 +219,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		private readonly initialUserEnv: IProcessEnvironment,
 		@ILogService private readonly logService: ILogService,
 		@ILoggerMainService private readonly loggerService: ILoggerMainService,
-		@IStateService private readonly stateService: IStateService,
+		@IStateService stateService: IStateService,
 		@IPolicyService private readonly policyService: IPolicyService,
 		@IEnvironmentMainService private readonly environmentMainService: IEnvironmentMainService,
 		@IUserDataProfilesMainService private readonly userDataProfilesMainService: IUserDataProfilesMainService,
@@ -238,6 +238,8 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 	) {
 		super();
 
+		this.windowsStateHandler = this._register(new WindowsStateHandler(this, stateService, this.lifecycleMainService, this.logService, this.configurationService));
+
 		this.registerListeners();
 	}
 
diff --git a/src/vs/platform/windows/electron-main/windowsStateHandler.ts b/src/vs/platform/windows/electron-main/windowsStateHandler.ts
index bd14cdbe3f4c..1008f8217e59 100644
--- a/src/vs/platform/windows/electron-main/windowsStateHandler.ts
+++ b/src/vs/platform/windows/electron-main/windowsStateHandler.ts
@@ -55,7 +55,7 @@ export class WindowsStateHandler extends Disposable {
 	private static readonly windowsStateStorageKey = 'windowsState';
 
 	get state() { return this._state; }
-	private readonly _state = restoreWindowsState(this.stateService.getItem<ISerializedWindowsState>(WindowsStateHandler.windowsStateStorageKey));
+	private readonly _state: IWindowsState;
 
 	private lastClosedState: IWindowState | undefined = undefined;
 
@@ -70,6 +70,8 @@ export class WindowsStateHandler extends Disposable {
 	) {
 		super();
 
+		this._state = restoreWindowsState(this.stateService.getItem<ISerializedWindowsState>(WindowsStateHandler.windowsStateStorageKey));
+
 		this.registerListeners();
 	}
 
diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index c6e7245ba7f8..d46996a9210b 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -329,16 +329,23 @@ export function isWorkspaceFolder(thing: unknown): thing is IWorkspaceFolder {
 
 export class Workspace implements IWorkspace {
 
-	private _foldersMap: TernarySearchTree<URI, WorkspaceFolder> = TernarySearchTree.forUris<WorkspaceFolder>(this._ignorePathCasing, () => true);
+	private foldersMap: TernarySearchTree<URI, WorkspaceFolder>;
+
 	private _folders!: WorkspaceFolder[];
+	get folders(): WorkspaceFolder[] { return this._folders; }
+	set folders(folders: WorkspaceFolder[]) {
+		this._folders = folders;
+		this.updateFoldersMap();
+	}
 
 	constructor(
 		private _id: string,
 		folders: WorkspaceFolder[],
 		private _transient: boolean,
 		private _configuration: URI | null,
-		private _ignorePathCasing: (key: URI) => boolean,
+		private ignorePathCasing: (key: URI) => boolean,
 	) {
+		this.foldersMap = TernarySearchTree.forUris<WorkspaceFolder>(this.ignorePathCasing, () => true);
 		this.folders = folders;
 	}
 
@@ -346,19 +353,10 @@ export class Workspace implements IWorkspace {
 		this._id = workspace.id;
 		this._configuration = workspace.configuration;
 		this._transient = workspace.transient;
-		this._ignorePathCasing = workspace._ignorePathCasing;
+		this.ignorePathCasing = workspace.ignorePathCasing;
 		this.folders = workspace.folders;
 	}
 
-	get folders(): WorkspaceFolder[] {
-		return this._folders;
-	}
-
-	set folders(folders: WorkspaceFolder[]) {
-		this._folders = folders;
-		this.updateFoldersMap();
-	}
-
 	get id(): string {
 		return this._id;
 	}
@@ -380,13 +378,13 @@ export class Workspace implements IWorkspace {
 			return null;
 		}
 
-		return this._foldersMap.findSubstr(resource) || null;
+		return this.foldersMap.findSubstr(resource) || null;
 	}
 
 	private updateFoldersMap(): void {
-		this._foldersMap = TernarySearchTree.forUris<WorkspaceFolder>(this._ignorePathCasing, () => true);
+		this.foldersMap = TernarySearchTree.forUris<WorkspaceFolder>(this.ignorePathCasing, () => true);
 		for (const folder of this.folders) {
-			this._foldersMap.set(folder.uri, folder);
+			this.foldersMap.set(folder.uri, folder);
 		}
 	}
 
diff --git a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
index b42bd3ad6792..17374c47894b 100644
--- a/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
+++ b/src/vs/platform/workspaces/electron-main/workspacesMainService.ts
@@ -12,6 +12,7 @@ import { IWorkspaceIdentifier } from '../../workspace/common/workspace.js';
 import { IWorkspacesHistoryMainService } from './workspacesHistoryMainService.js';
 import { IWorkspacesManagementMainService } from './workspacesManagementMainService.js';
 import { IWorkspaceBackupInfo, IFolderBackupInfo } from '../../backup/common/backup.js';
+import { Event } from '../../../base/common/event.js';
 
 export class WorkspacesMainService implements AddFirstParameterToFunctions<IWorkspacesService, Promise<unknown> /* only methods, not events */, number /* window ID */> {
 
@@ -23,6 +24,7 @@ export class WorkspacesMainService implements AddFirstParameterToFunctions<IWork
 		@IWorkspacesHistoryMainService private readonly workspacesHistoryMainService: IWorkspacesHistoryMainService,
 		@IBackupMainService private readonly backupMainService: IBackupMainService
 	) {
+		this.onDidChangeRecentlyOpened = this.workspacesHistoryMainService.onDidChangeRecentlyOpened;
 	}
 
 	//#region Workspace Management
@@ -52,7 +54,7 @@ export class WorkspacesMainService implements AddFirstParameterToFunctions<IWork
 
 	//#region Workspaces History
 
-	readonly onDidChangeRecentlyOpened = this.workspacesHistoryMainService.onDidChangeRecentlyOpened;
+	readonly onDidChangeRecentlyOpened: Event<void>;
 
 	getRecentlyOpened(windowId: number): Promise<IRecentlyOpened> {
 		return this.workspacesHistoryMainService.getRecentlyOpened();
diff --git a/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts b/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
index 33a585bd9822..64835d8b0ebc 100644
--- a/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
+++ b/src/vs/platform/workspaces/electron-main/workspacesManagementMainService.ts
@@ -64,7 +64,7 @@ export class WorkspacesManagementMainService extends Disposable implements IWork
 	private readonly _onDidEnterWorkspace = this._register(new Emitter<IWorkspaceEnteredEvent>());
 	readonly onDidEnterWorkspace: Event<IWorkspaceEnteredEvent> = this._onDidEnterWorkspace.event;
 
-	private readonly untitledWorkspacesHome = this.environmentMainService.untitledWorkspacesHome; // local URI that contains all untitled workspaces
+	private readonly untitledWorkspacesHome: URI; // local URI that contains all untitled workspaces
 
 	private untitledWorkspaces: IUntitledWorkspaceInfo[] = [];
 
@@ -76,6 +76,8 @@ export class WorkspacesManagementMainService extends Disposable implements IWork
 		@IDialogMainService private readonly dialogMainService: IDialogMainService
 	) {
 		super();
+
+		this.untitledWorkspacesHome = this.environmentMainService.untitledWorkspacesHome;
 	}
 
 	async initialize(): Promise<void> {
diff --git a/src/vs/workbench/api/common/extHostFileSystemEventService.ts b/src/vs/workbench/api/common/extHostFileSystemEventService.ts
index 9bacc4ae0daa..5fcd3c613d08 100644
--- a/src/vs/workbench/api/common/extHostFileSystemEventService.ts
+++ b/src/vs/workbench/api/common/extHostFileSystemEventService.ts
@@ -243,9 +243,7 @@ interface IExtensionListener<E> {
 
 class LazyRevivedFileSystemEvents implements FileSystemEvents {
 
-	constructor(private readonly _events: FileSystemEvents) { }
-
-	readonly session = this._events.session;
+	readonly session: number | undefined;
 
 	private _created = new Lazy(() => this._events.created.map(URI.revive) as URI[]);
 	get created(): URI[] { return this._created.value; }
@@ -255,6 +253,10 @@ class LazyRevivedFileSystemEvents implements FileSystemEvents {
 
 	private _deleted = new Lazy(() => this._events.deleted.map(URI.revive) as URI[]);
 	get deleted(): URI[] { return this._deleted.value; }
+
+	constructor(private readonly _events: FileSystemEvents) {
+		this.session = this._events.session;
+	}
 }
 
 export class ExtHostFileSystemEventService implements ExtHostFileSystemEventServiceShape {
diff --git a/src/vs/workbench/api/node/extHostDiskFileSystemProvider.ts b/src/vs/workbench/api/node/extHostDiskFileSystemProvider.ts
index 2be6ba4652fa..cb6a09dc96d5 100644
--- a/src/vs/workbench/api/node/extHostDiskFileSystemProvider.ts
+++ b/src/vs/workbench/api/node/extHostDiskFileSystemProvider.ts
@@ -27,9 +27,11 @@ export class ExtHostDiskFileSystemProvider {
 
 class DiskFileSystemProviderAdapter implements vscode.FileSystemProvider {
 
-	private readonly impl = new DiskFileSystemProvider(this.logService);
+	private readonly impl: DiskFileSystemProvider;
 
-	constructor(private readonly logService: ILogService) { }
+	constructor(logService: ILogService) {
+		this.impl = new DiskFileSystemProvider(logService);
+	}
 
 	async stat(uri: vscode.Uri): Promise<vscode.FileStat> {
 		const stat = await this.impl.stat(uri);
diff --git a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts
index 508322d359f7..75a3ce42d689 100644
--- a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts
+++ b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts
@@ -80,7 +80,7 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
 
 	readonly priority = LayoutPriority.Low;
 
-	private configuration = this.resolveConfiguration();
+	private configuration: IAuxiliaryBarPartConfiguration;
 
 	constructor(
 		@INotificationService notificationService: INotificationService,
@@ -125,6 +125,8 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
 			menuService,
 		);
 
+		this.configuration = this.resolveConfiguration();
+
 		this._register(configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_LOCATION)) {
 				this.configuration = this.resolveConfiguration();
diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
index 7563b30cd475..a7524ec4fe69 100644
--- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
+++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
@@ -33,18 +33,20 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
 		'editor.action.clipboardPasteAction'
 	];
 
-	private readonly markdownRenderer = this.instantiationService.createInstance(MarkdownRenderer, {});
+	private readonly markdownRenderer: MarkdownRenderer;
 
 	constructor(
 		@ILogService private readonly logService: ILogService,
 		@ILayoutService private readonly layoutService: ILayoutService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IInstantiationService instantiationService: IInstantiationService,
 		@IProductService private readonly productService: IProductService,
 		@IClipboardService private readonly clipboardService: IClipboardService,
 		@IOpenerService private readonly openerService: IOpenerService
 	) {
 		super();
+
+		this.markdownRenderer = instantiationService.createInstance(MarkdownRenderer, {});
 	}
 
 	async prompt<T>(prompt: IPrompt<T>): Promise<IAsyncPromptResult<T>> {
diff --git a/src/vs/workbench/services/storage/browser/storageService.ts b/src/vs/workbench/services/storage/browser/storageService.ts
index 68573404c1e0..ca10b6f7d95d 100644
--- a/src/vs/workbench/services/storage/browser/storageService.ts
+++ b/src/vs/workbench/services/storage/browser/storageService.ts
@@ -29,7 +29,7 @@ export class BrowserStorageService extends AbstractStorageService {
 
 	private profileStorage: IStorage | undefined;
 	private profileStorageDatabase: IIndexedDBStorageDatabase | undefined;
-	private profileStorageProfile = this.userDataProfileService.currentProfile;
+	private profileStorageProfile: IUserDataProfile;
 	private readonly profileStorageDisposables = this._register(new DisposableStore());
 
 	private workspaceStorage: IStorage | undefined;
@@ -50,6 +50,8 @@ export class BrowserStorageService extends AbstractStorageService {
 	) {
 		super({ flushInterval: BrowserStorageService.BROWSER_DEFAULT_FLUSH_INTERVAL });
 
+		this.profileStorageProfile = this.userDataProfileService.currentProfile;
+
 		this.registerListeners();
 	}
 

From c4318dc750d19f09eda6b4bc4ff692aad0bd7aeb Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Tue, 11 Mar 2025 10:22:51 +0100
Subject: [PATCH 0758/1815] more fixes in `McpServer#callOn`

---
 .../workbench/contrib/mcp/common/mcpServer.ts | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/vs/workbench/contrib/mcp/common/mcpServer.ts b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
index 31b3fc177191..af5adb110b6d 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServer.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
@@ -3,10 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Sequencer } from '../../../../base/common/async.js';
+import { raceCancellationError, Sequencer } from '../../../../base/common/async.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
-import { CancellationError } from '../../../../base/common/errors.js';
-import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { LRUCache } from '../../../../base/common/map.js';
 import { autorun, autorunWithStore, derived, disposableObservableValue, IObservable, ITransaction, observableFromEvent, ObservablePromise, observableValue, transaction } from '../../../../base/common/observable.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
@@ -177,40 +176,42 @@ export class McpServer extends Disposable implements IMcpServer {
 	 * Helper function to call the function on the handler once it's online. The
 	 * connection started if it is not already.
 	 */
-	public async callOn<R>(fn: (handler: McpServerRequestHandler) => Promise<R>, token?: CancellationToken): Promise<R> {
-		const store = new DisposableStore();
-		this.start(); // idempotent
+	public async callOn<R>(fn: (handler: McpServerRequestHandler) => Promise<R>, token: CancellationToken = CancellationToken.None): Promise<R> {
 
-		try {
-			return await new Promise((resolve, reject) => {
-				if (token) {
-					store.add(token.onCancellationRequested(() => {
-						reject(new CancellationError());
-					}));
+		await this.start(); // idempotent
+
+		let ranOnce = false;
+		let d: IDisposable;
+
+		const callPromise = new Promise<R>((resolve, reject) => {
+
+			d = autorun(reader => {
+				const connection = this._connection.read(reader);
+				if (!connection || ranOnce) {
+					return;
 				}
-				store.add(autorun(reader => {
-					const connection = this._connection.read(reader);
-					if (!connection) {
-						return;
-					}
 
-					const handler = connection.handler.read(reader);
-					if (handler) {
-						resolve(fn(handler));
-						store.dispose(); // aggressive dispose to prevent multiple racey calls
+				const handler = connection.handler.read(reader);
+				if (!handler) {
+					const state = connection.state.read(reader);
+					if (state.state === McpConnectionState.Kind.Error) {
+						reject(new McpConnectionFailedError(`MCP server could not be started: ${state.message}`));
+						return;
+					} else if (state.state === McpConnectionState.Kind.Stopped) {
+						reject(new McpConnectionFailedError('MCP server has stopped'));
+						return;
 					} else {
-						const state = connection.state.read(reader);
-						if (state.state === McpConnectionState.Kind.Error) {
-							reject(new McpConnectionFailedError(`MCP server could not be started: ${state.message}`));
-						} else {
-							reject(new McpConnectionFailedError('MCP server has stopped'));
-						}
+						// keep waiting for handler
+						return;
 					}
-				}));
+				}
+
+				resolve(fn(handler));
+				ranOnce = true; // aggressive prevent multiple racey calls, don't dispose because autorun is sync
 			});
-		} finally {
-			store.dispose();
-		}
+		});
+
+		return raceCancellationError(callPromise, token).finally(() => d.dispose());
 	}
 }
 

From 6f87a279c8b3633e05cbd3ba63d7c0b2f5d939cd Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Tue, 11 Mar 2025 10:38:36 +0100
Subject: [PATCH 0759/1815] Add custom hover to copilot edits code indicator
 (#243161)

fix https://github.com/microsoft/vscode/issues/243113
---
 .../chatMarkdownContentPart.ts                | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
index d51c29af5b73..d9238e060d82 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
@@ -5,10 +5,11 @@
 
 import * as dom from '../../../../../base/browser/dom.js';
 import { StandardMouseEvent } from '../../../../../base/browser/mouseEvent.js';
+import { HoverPosition } from '../../../../../base/browser/ui/hover/hoverWidget.js';
 import { findLast } from '../../../../../base/common/arraysFind.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Emitter } from '../../../../../base/common/event.js';
-import { Disposable, DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
 import { autorun } from '../../../../../base/common/observable.js';
 import { equalsIgnoreCase } from '../../../../../base/common/strings.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
@@ -26,6 +27,7 @@ import { IMenuService, MenuId } from '../../../../../platform/actions/common/act
 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 } from '../../../../services/editor/common/editorService.js';
@@ -294,6 +296,9 @@ class CollapsedCodeBlock extends Disposable {
 
 	public readonly element: HTMLElement;
 
+	private readonly hover = this._register(new MutableDisposable());
+	private tooltip: string | undefined;
+
 	private _uri: URI | undefined;
 	public get uri(): URI | undefined {
 		return this._uri;
@@ -315,6 +320,7 @@ class CollapsedCodeBlock extends Disposable {
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IMenuService private readonly menuService: IMenuService,
 		@IChatEditingService private readonly chatEditingService: IChatEditingService,
+		@IHoverService private readonly hoverService: IHoverService,
 	) {
 		super();
 		this.element = $('.chat-codeblock-pill-widget');
@@ -375,8 +381,7 @@ class CollapsedCodeBlock extends Disposable {
 		}
 
 		this.element.replaceChildren(iconEl, ...children);
-		this.element.title = this.labelService.getUriLabel(uri, { relative: false });
-
+		this.updateTooltip(this.labelService.getUriLabel(uri, { relative: false }));
 
 		const renderDiff = (changes: IEditSessionEntryDiff | undefined) => {
 			const labelAdded = this.element.querySelector('.label-added') ?? this.element.appendChild(dom.$('span.label-added'));
@@ -387,7 +392,9 @@ class CollapsedCodeBlock extends Disposable {
 				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);
-				this.element.ariaLabel = this.element.title = localize('summary', 'Edited {0}, {1}, {2}', iconText, insertionsFragment, deletionsFragment);
+				const summary = localize('summary', 'Edited {0}, {1}, {2}', iconText, insertionsFragment, deletionsFragment);
+				this.element.ariaLabel = summary;
+				this.updateTooltip(summary);
 			}
 		};
 
@@ -416,4 +423,18 @@ class CollapsedCodeBlock extends Disposable {
 			}
 		}));
 	}
+
+	private updateTooltip(tooltip: string): void {
+		this.tooltip = tooltip;
+		if (!this.hover.value) {
+			this.hover.value = this.hoverService.setupDelayedHover(this.element, () => (
+				{
+					content: this.tooltip!,
+					appearance: { compact: true, showPointer: true },
+					position: { hoverPosition: HoverPosition.BELOW },
+					persistence: { hideOnKeyDown: true },
+				}
+			));
+		}
+	}
 }

From 9037210ea433e412fa0fb53c9fa60cf2dccffeca Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 11 Mar 2025 11:11:05 +0100
Subject: [PATCH 0760/1815] macOS: window controls stop working when zoomed in
 (fix #242890) (#243120)

---
 .../platform/windows/electron-main/windows.ts | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/vs/platform/windows/electron-main/windows.ts b/src/vs/platform/windows/electron-main/windows.ts
index d8720996b919..99f145c92367 100644
--- a/src/vs/platform/windows/electron-main/windows.ts
+++ b/src/vs/platform/windows/electron-main/windows.ts
@@ -192,21 +192,23 @@ export function defaultBrowserWindowOptions(accessor: ServicesAccessor, windowSt
 		}
 
 		if (useWindowControlsOverlay(configurationService)) {
-
-			// This logic will not perfectly guess the right colors
-			// to use on initialization, but prefer to keep things
-			// simple as it is temporary and not noticeable
-			// On macOS, only the presence of `titleBarOverlay` is
-			// considered, the properties are ignored.
-
-			const titleBarColor = themeMainService.getWindowSplash(undefined)?.colorInfo.titleBarBackground ?? themeMainService.getBackgroundColor();
-			const symbolColor = Color.fromHex(titleBarColor).isDarker() ? '#FFFFFF' : '#000000';
-
-			options.titleBarOverlay = {
-				height: 29, // the smallest size of the title bar on windows accounting for the border on windows 11
-				color: titleBarColor,
-				symbolColor
-			};
+			if (isMacintosh) {
+				options.titleBarOverlay = true;
+			} else {
+
+				// This logic will not perfectly guess the right colors
+				// to use on initialization, but prefer to keep things
+				// simple as it is temporary and not noticeable
+
+				const titleBarColor = themeMainService.getWindowSplash(undefined)?.colorInfo.titleBarBackground ?? themeMainService.getBackgroundColor();
+				const symbolColor = Color.fromHex(titleBarColor).isDarker() ? '#FFFFFF' : '#000000';
+
+				options.titleBarOverlay = {
+					height: 29, // the smallest size of the title bar on windows accounting for the border on windows 11
+					color: titleBarColor,
+					symbolColor
+				};
+			}
 		}
 	}
 

From 7ba949dfa99ec2b7c772de8e05f63f31bd355c60 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Tue, 11 Mar 2025 11:52:34 +0100
Subject: [PATCH 0761/1815] Fix uncolored content at the end of the viewport
 after edit (#243174)

---
 .../treeSitter/browser/treeSitterTokenizationFeature.ts         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
index affd38ab73ea..6d6b359482ff 100644
--- a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
@@ -182,7 +182,7 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 
 		const treeRange = new Range(1, 1, range.endLineNumber - range.startLineNumber + 1 + likelyRelevantLines.length, range.endColumn);
 		const captures = this._captureAtRange(treeRange, tree);
-		const tokens = this._tokenizeCapturesWithMetadata(tree, captures, languageId, likelyRelevantPrefix.length, endOffsetOfRangeInDocument - startOffsetOfRangeInDocument);
+		const tokens = this._tokenizeCapturesWithMetadata(tree, captures, languageId, likelyRelevantPrefix.length, endOffsetOfRangeInDocument - startOffsetOfRangeInDocument + likelyRelevantPrefix.length);
 		if (!tokens) {
 			return;
 		}

From c17a578a6cb51eda1e97df0a0357add9fac3188f Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 11 Mar 2025 12:09:51 +0100
Subject: [PATCH 0762/1815] Remove "Show Release Notes" and "Send Chat
 Feedback" from menu (vscode-copilot#14087) (#243176)

---
 .../workbench/contrib/chat/browser/actions/chatActions.ts | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index 24b9685d175f..eeb033f26122 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -96,14 +96,6 @@ export interface IChatViewOpenRequestEntry {
 	response: string;
 }
 
-MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
-	command: {
-		id: 'update.showCurrentReleaseNotes',
-		title: localize2('chat.releaseNotes.label', "Show Release Notes"),
-	},
-	when: ContextKeyExpr.equals('view', ChatViewId)
-});
-
 export const OPEN_CHAT_QUOTA_EXCEEDED_DIALOG = 'workbench.action.chat.openQuotaExceededDialog';
 
 export function registerChatActions() {

From ef0f96c1756611f80977dffb87b89f8ef4c627dd Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Tue, 11 Mar 2025 12:19:04 +0100
Subject: [PATCH 0763/1815] allow to enable/disable MCP tools from chat input

---
 .../browser/menuEntryActionViewItem.ts        |   2 +-
 .../contrib/chat/browser/chatInputPart.ts     |  11 --
 .../contrib/chat/browser/media/chat.css       |  11 +-
 .../contrib/mcp/browser/mcp.contribution.ts   |   9 +-
 .../contrib/mcp/browser/mcpCommands.ts        | 174 ++++++++++++++++--
 .../workbench/contrib/mcp/common/mcpServer.ts |   8 +
 .../contrib/mcp/common/mcpService.ts          |  18 +-
 .../workbench/contrib/mcp/common/mcpTypes.ts  |   5 +
 8 files changed, 206 insertions(+), 32 deletions(-)

diff --git a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
index 14ef06a50a5f..2e86c3bcdea8 100644
--- a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
+++ b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts
@@ -167,7 +167,7 @@ function fillInActions(
 
 export interface IMenuEntryActionViewItemOptions {
 	draggable?: boolean;
-	keybinding?: string;
+	keybinding?: string | null;
 	hoverDelegate?: IHoverDelegate;
 	keybindingNotRenderedWithLabel?: boolean;
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index a1b75caba234..707265a92e02 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -21,7 +21,6 @@ import { HistoryNavigator2 } from '../../../../base/common/history.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ResourceSet } from '../../../../base/common/map.js';
-import { autorun } from '../../../../base/common/observable.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IEditorConstructionOptions } from '../../../../editor/browser/config/editorConfiguration.js';
@@ -68,7 +67,6 @@ import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../services/edit
 import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
 import { getSimpleCodeEditorWidgetOptions, getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from '../../codeEditor/browser/simpleEditorOptions.js';
-import { IMcpService } from '../../mcp/common/mcpTypes.js';
 import { ChatAgentLocation, IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatEditingSession } from '../common/chatEditingService.js';
@@ -364,7 +362,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		@ILabelService private readonly labelService: ILabelService,
 		@IChatVariablesService private readonly variableService: IChatVariablesService,
 		@IChatAgentService private readonly chatAgentService: IChatAgentService,
-		@IMcpService private readonly mcpService: IMcpService
 	) {
 		super();
 
@@ -739,7 +736,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 						dom.h('.chat-attachment-toolbar@attachmentToolbar'),
 						dom.h('.chat-attached-context@attachedContextContainer'),
 						dom.h('.chat-related-files@relatedFilesContainer'),
-						dom.h('.chat-mcp@mcpContainer'),
 					]),
 					dom.h('.interactive-input-followups@followupsContainer'),
 				])
@@ -754,7 +750,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 							dom.h('.chat-attachment-toolbar@attachmentToolbar'),
 							dom.h('.chat-related-files@relatedFilesContainer'),
 							dom.h('.chat-attached-context@attachedContextContainer'),
-							dom.h('.chat-mcp@mcpContainer'),
 						]),
 						dom.h('.chat-editor-container@editorContainer'),
 						dom.h('.chat-input-toolbars@inputToolbars'),
@@ -780,12 +775,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			this._register(this._implicitContext.onDidChangeValue(() => this._handleAttachedContextChange()));
 		}
 
-		this._register(autorun(r => {
-			const servers = this.mcpService.servers.read(r);
-			const contents = renderLabelWithIcons(localize('serverpattern', "{0} {1}", '$(tools)', servers.length));
-			dom.reset(elements.mcpContainer, ...contents);
-		}));
-
 		this.renderAttachedContext();
 		this._register(this._attachmentModel.onDidChangeContext(() => this._handleAttachedContextChange()));
 		this.renderChatEditingSessionState(null);
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index dc34c1cfc16e..68deb3b7c60d 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1115,9 +1115,12 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	padding: 8px 0 0 0
 }
 
+.chat-attachment-toolbar .action-item:not(:last-child) {
+	margin-right: 4px;
+}
+
 .action-item.chat-attached-context-attachment.chat-add-files {
 	height: 20px;
-	gap: 0px;
 	color: var(--vscode-descriptionForeground);
 }
 
@@ -1125,9 +1128,9 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	display: none;
 }
 
+.action-item.chat-mcp .action-label,
 .action-item.chat-attached-context-attachment.chat-add-files .action-label,
-.interactive-session .chat-attached-context .chat-attached-context-attachment,
-.interactive-session .chat-mcp {
+.interactive-session .chat-attached-context .chat-attached-context-attachment {
 	display: flex;
 	gap: 2px;
 	overflow: hidden;
@@ -1139,7 +1142,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	max-width: 100%;
 	width: fit-content;
 }
-
+.action-item.chat-mcp .action-label,
 .action-item.chat-attached-context-attachment.chat-add-files .action-label {
 	color: var(--vscode-descriptionForeground);
 	font-family: unset;
diff --git a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
index 3a800f0665f1..987334853c1b 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
@@ -19,7 +19,9 @@ import { McpService } from '../common/mcpService.js';
 import { IMcpService } from '../common/mcpTypes.js';
 import { McpDiscovery } from './mcpDiscovery.js';
 
-import './mcpCommands.js';
+import { AttachMCPToolsAction, AttachMCPToolsActionRendering, ListMcpServerCommand, McpServerOptionsCommand } from './mcpCommands.js';
+
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
 
 registerSingleton(IMcpRegistry, McpRegistry, InstantiationType.Delayed);
 registerSingleton(IMcpService, McpService, InstantiationType.Delayed);
@@ -29,5 +31,10 @@ mcpDiscoveryRegistry.register(new SyncDescriptor(ConfigMcpDiscovery));
 
 registerWorkbenchContribution2('mcpDiscovery', McpDiscovery, WorkbenchPhase.AfterRestored);
 
+registerAction2(ListMcpServerCommand);
+registerAction2(McpServerOptionsCommand);
+registerAction2(AttachMCPToolsAction);
+registerWorkbenchContribution2('mcpActionRendering', AttachMCPToolsActionRendering, WorkbenchPhase.BlockRestore);
+
 const jsonRegistry = <jsonContributionRegistry.IJSONContributionRegistry>Registry.as(jsonContributionRegistry.Extensions.JSONContribution);
 jsonRegistry.registerSchema(mcpSchemaId, mcpServerSchema);
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 727aaae21b6b..002e54c518b3 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -3,15 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { reset } from '../../../../base/browser/dom.js';
+import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Codicon } from '../../../../base/common/codicons.js';
 import { groupBy } from '../../../../base/common/collections.js';
-import { DisposableStore } from '../../../../base/common/lifecycle.js';
-import { autorun } from '../../../../base/common/observable.js';
+import { Event } from '../../../../base/common/event.js';
+import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { autorun, derived } from '../../../../base/common/observable.js';
+import { assertType } from '../../../../base/common/types.js';
 import { ILocalizedString, localize, localize2 } from '../../../../nls.js';
-import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IActionViewItemService } from '../../../../platform/actions/browser/actionViewItemService.js';
+import { MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { Action2, MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
-import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
-import { IMcpService, McpConnectionState } from '../common/mcpTypes.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { CHAT_CATEGORY } from '../../chat/browser/actions/chatActions.js';
+import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
+import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
+import { IMcpService, IMcpTool, McpConnectionState } from '../common/mcpTypes.js';
 
 // acroynms do not get localized
 const category: ILocalizedString = {
@@ -19,7 +33,7 @@ const category: ILocalizedString = {
 	value: 'MCP',
 };
 
-class ListMcpServerCommand extends Action2 {
+export class ListMcpServerCommand extends Action2 {
 	public static readonly id = 'workbench.mcp.listServer';
 	constructor() {
 		super({
@@ -73,11 +87,11 @@ class ListMcpServerCommand extends Action2 {
 		}
 	}
 }
-registerAction2(ListMcpServerCommand);
 
 
-class McpServerOptionsCommand extends Action2 {
-	public static readonly id = 'workbench.mcp.serverOptions';
+export class McpServerOptionsCommand extends Action2 {
+
+	static readonly id = 'workbench.mcp.serverOptions';
 
 	constructor() {
 		super({
@@ -151,4 +165,142 @@ class McpServerOptionsCommand extends Action2 {
 		}
 	}
 }
-registerAction2(McpServerOptionsCommand);
+
+
+export class AttachMCPToolsAction extends Action2 {
+
+	static readonly id = 'workbench.action.chat.mcp.attachMcpTools';
+
+	constructor() {
+		super({
+			id: AttachMCPToolsAction.id,
+			title: localize2('workbench.action.chat.editing.attachContext.shortLabel', "Select Tools..."),
+			icon: Codicon.tools,
+			f1: false,
+			category: CHAT_CATEGORY,
+			precondition: ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
+			menu: {
+				when: ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
+				id: MenuId.ChatInputAttachmentToolbar,
+				group: 'navigation'
+			},
+			keybinding: {
+				when: ContextKeyExpr.and(ChatContextKeys.inChatInput, ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)),
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Slash,
+				weight: KeybindingWeight.EditorContrib
+			}
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+
+		const quickPickService = accessor.get(IQuickInputService);
+		const mcpService = accessor.get(IMcpService);
+
+		type IToolPick = IQuickPickItem & { tool: IMcpTool };
+		const picks: (IToolPick | IQuickPickSeparator)[] = [];
+
+		for (const server of mcpService.servers.get()) {
+
+			picks.push({
+				type: 'separator',
+				label: server.definition.label
+			});
+
+			for (const tool of server.tools.get()) {
+				picks.push({
+					type: 'item',
+					label: tool.definition.name,
+					detail: tool.definition.description,
+					tooltip: tool.definition.description,
+					picked: tool.enabled.get(),
+					tool,
+				});
+			}
+		}
+
+		const result = await quickPickService.pick(picks, {
+			placeHolder: localize('placeholder', "Select tools that are available to chat"),
+			canPickMany: true
+		});
+
+		if (!result) {
+			return;
+		}
+
+		const seen = new Set<IMcpTool>();
+		for (const item of result) {
+			item.tool.updateEnablement(true);
+			seen.add(item.tool);
+		}
+
+		for (const pick of picks) {
+			if (pick.type === 'item' && !seen.has(pick.tool)) {
+				pick.tool.updateEnablement(false);
+			}
+		}
+	}
+}
+
+export class AttachMCPToolsActionRendering extends Disposable implements IWorkbenchContribution {
+	public static readonly ID = 'workbench.contrib.mcp.discovery';
+
+	constructor(
+		@IActionViewItemService actionViewItemService: IActionViewItemService,
+		@IMcpService mcpService: IMcpService,
+		@IInstantiationService instaService: IInstantiationService
+	) {
+		super();
+
+
+		const toolsCount = derived(r => {
+			let count = 0;
+			let enabled = 0;
+			const servers = mcpService.servers.read(r);
+			for (const server of servers) {
+				for (const tool of server.tools.read(r)) {
+					count += 1;
+					enabled += tool.enabled.read(r) ? 1 : 0;
+				}
+			}
+			return { count, enabled };
+		});
+
+
+		this._store.add(actionViewItemService.register(MenuId.ChatInputAttachmentToolbar, AttachMCPToolsAction.id, (action, options) => {
+			if (!(action instanceof MenuItemAction)) {
+				return undefined;
+			}
+
+			return instaService.createInstance(class extends MenuEntryActionViewItem {
+
+				override render(container: HTMLElement): void {
+					this.options.icon = false;
+					this.options.label = true;
+					container.classList.add('chat-mcp');
+					super.render(container);
+				}
+
+				protected override updateLabel(): void {
+					this._store.add(autorun(r => {
+						assertType(this.label);
+
+						const { enabled, count } = toolsCount.read(r);
+
+						if (count === 0) {
+							super.updateLabel();
+							return;
+						}
+
+						const message = enabled !== count
+							? localize('tool.1', "{0} {1} of {2}", '$(tools)', enabled, count)
+							: localize('tool.0', "{0} {1}", '$(tools)', count);
+						reset(this.label, ...renderLabelWithIcons(message));
+					}));
+				}
+
+			}, action, { ...options, keybindingNotRenderedWithLabel: true });
+
+		}, Event.fromObservable(toolsCount)));
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServer.ts b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
index af5adb110b6d..f884386642d4 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServer.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
@@ -219,6 +219,10 @@ export class McpTool implements IMcpTool {
 
 	readonly id: string;
 
+	private _enabled = observableValue<boolean>(this, true);
+
+	readonly enabled: IObservable<boolean> = this._enabled;
+
 	constructor(
 		private readonly _server: McpServer,
 		public readonly definition: MCP.Tool,
@@ -226,6 +230,10 @@ export class McpTool implements IMcpTool {
 		this.id = `${_server.definition.id}_${definition.name}`.replaceAll('.', '_');
 	}
 
+	updateEnablement(value: boolean): void {
+		this._enabled.set(value, undefined);
+	}
+
 	call(params: Record<string, unknown>, token?: CancellationToken): Promise<MCP.CallToolResult> {
 		return this._server.callOn(h => h.callTool({ name: this.definition.name, arguments: params }), token);
 	}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpService.ts b/src/vs/workbench/contrib/mcp/common/mcpService.ts
index ed78ed34fd4c..f46e7fd57b53 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpService.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpService.ts
@@ -4,9 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { RunOnceScheduler } from '../../../../base/common/async.js';
-import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { autorun, derived, IObservable, observableValue } from '../../../../base/common/observable.js';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun, autorunWithStore, derived, IObservable, observableValue } from '../../../../base/common/observable.js';
 import { localize } from '../../../../nls.js';
+import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { StorageScope } from '../../../../platform/storage/common/storage.js';
 import { ILanguageModelToolsService, IToolResult } from '../../chat/common/languageModelToolsService.js';
@@ -27,7 +28,8 @@ export class McpService extends Disposable implements IMcpService {
 	constructor(
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry,
-		@ILanguageModelToolsService toolsService: ILanguageModelToolsService
+		@ILanguageModelToolsService toolsService: ILanguageModelToolsService,
+		@IContextKeyService contextKeyService: IContextKeyService
 	) {
 		super();
 
@@ -74,7 +76,7 @@ export class McpService extends Disposable implements IMcpService {
 
 		const tools = this._register(new MutableDisposable());
 
-		this._register(autorun(reader => {
+		this._register(autorunWithStore((reader, store) => {
 
 			const servers = this._servers.read(reader);
 
@@ -87,11 +89,19 @@ export class McpService extends Disposable implements IMcpService {
 
 				for (const tool of server.tools.read(reader)) {
 
+					const ctxKey = new RawContextKey<boolean>(`mcp.tool.${tool.id}.enabled`, true);
+					const ctxInst = contextKeyService.createKey<boolean>(ctxKey.key, true);
+					store.add(toDisposable(() => ctxInst.reset()));
+					store.add(autorun(reader => {
+						ctxInst.set(tool.enabled.read(reader));
+					}));
+
 					newStore.add(toolsService.registerToolData({
 						id: tool.id,
 						displayName: tool.definition.name,
 						modelDescription: tool.definition.description ?? '',
 						inputSchema: tool.definition.inputSchema,
+						when: ctxKey.isEqualTo(true),
 						tags: ['mcp', 'vscode_editing']
 					}));
 					newStore.add(toolsService.registerToolImplementation(tool.id, {
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
index 568b51ad018f..5baf2ca137d8 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
@@ -110,6 +110,11 @@ export interface IMcpTool {
 	readonly id: string;
 
 	readonly definition: MCP.Tool;
+
+	readonly enabled: IObservable<boolean>;
+
+	updateEnablement(value: boolean): void;
+
 	/**
 	 * Calls a tool
 	 * @throws {@link MpcResponseError} if the tool fails to execute

From 0b0be23c6b7975ffb79f614b19ecec4324b7c09b Mon Sep 17 00:00:00 2001
From: isidorn <inikolic@microsoft.com>
Date: Tue, 11 Mar 2025 12:30:42 +0100
Subject: [PATCH 0764/1815] remove unused telemetry events

---
 .../browser/parts/editor/editorGroupView.ts   | 10 ----------
 .../browser/telemetry.contribution.ts         | 19 ++-----------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
index ceb003699c0c..1a6788573ec3 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts
@@ -680,16 +680,6 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 			}
 		}
 
-		/* __GDPR__
-			"editorClosed" : {
-				"owner": "isidorn",
-				"${include}": [
-					"${EditorTelemetryDescriptor}"
-				]
-			}
-		*/
-		this.telemetryService.publicLog('editorClosed', this.toEditorTelemetryDescriptor(editor));
-
 		// Update container
 		this.updateContainer();
 
diff --git a/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts b/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts
index 06e08fcd7899..15ffde581b3d 100644
--- a/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts
+++ b/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.ts
@@ -154,15 +154,7 @@ export class TelemetryContribution extends Disposable implements IWorkbenchContr
 
 	private onTextFileModelResolved(e: ITextFileResolveEvent): void {
 		const settingsType = this.getTypeIfSettings(e.model.resource);
-		if (settingsType) {
-			type SettingsReadClassification = {
-				owner: 'isidorn';
-				settingsType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The type of the settings file that was read.' };
-				comment: 'Track when a settings file was read, for example from an editor.';
-			};
-
-			this.telemetryService.publicLog2<{ settingsType: string }, SettingsReadClassification>('settingsRead', { settingsType }); // Do not log read to user settings.json and .vscode folder as a fileGet event as it ruins our JSON usage data
-		} else {
+		if (!settingsType) {
 			type FileGetClassification = {
 				owner: 'isidorn';
 				comment: 'Track when a file was read, for example from an editor.';
@@ -174,14 +166,7 @@ export class TelemetryContribution extends Disposable implements IWorkbenchContr
 
 	private onTextFileModelSaved(e: ITextFileSaveEvent): void {
 		const settingsType = this.getTypeIfSettings(e.model.resource);
-		if (settingsType) {
-			type SettingsWrittenClassification = {
-				owner: 'isidorn';
-				settingsType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The type of the settings file that was written to.' };
-				comment: 'Track when a settings file was written to, for example from an editor.';
-			};
-			this.telemetryService.publicLog2<{ settingsType: string }, SettingsWrittenClassification>('settingsWritten', { settingsType }); // Do not log write to user settings.json and .vscode folder as a filePUT event as it ruins our JSON usage data
-		} else {
+		if (!settingsType) {
 			type FilePutClassfication = {
 				owner: 'isidorn';
 				comment: 'Track when a file was written to, for example from an editor.';

From d1ce0bf2c1f5fc1969f57ade62832dacfbd7cd83 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Tue, 11 Mar 2025 20:45:06 +0900
Subject: [PATCH 0765/1815] chore: update electron@34.3.2 (#243032)

* chore: update electron@34.3.2

* chore: update node.js builds

* chore: update runtime builds

* chore: bump distro
---
 .npmrc                                   |   4 +-
 build/azure-pipelines/linux/setup-env.sh |   8 +-
 build/checksums/electron.txt             | 150 +++++++++++------------
 build/checksums/nodejs.txt               |  14 +--
 build/linux/dependencies-generator.js    |   2 +-
 build/linux/dependencies-generator.ts    |   2 +-
 cgmanifest.json                          |  12 +-
 package-lock.json                        |   8 +-
 package.json                             |   4 +-
 remote/.npmrc                            |   4 +-
 src/main.ts                              |   8 --
 11 files changed, 104 insertions(+), 112 deletions(-)

diff --git a/.npmrc b/.npmrc
index b97a643fc384..71d98e6c5834 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,6 +1,6 @@
 disturl="https://electronjs.org/headers"
-target="34.2.0"
-ms_build_id="11160463"
+target="34.3.2"
+ms_build_id="11161073"
 runtime="electron"
 build_from_source="true"
 legacy-peer-deps="true"
diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh
index fb43bbf0d205..94105642b190 100755
--- a/build/azure-pipelines/linux/setup-env.sh
+++ b/build/azure-pipelines/linux/setup-env.sh
@@ -17,7 +17,7 @@ fi
 
 if [ "$npm_config_arch" == "x64" ]; then
   # Download clang based on chromium revision used by vscode
-  curl -s https://raw.githubusercontent.com/chromium/chromium/132.0.6834.196/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
+  curl -s https://raw.githubusercontent.com/chromium/chromium/132.0.6834.210/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 \
@@ -29,9 +29,9 @@ if [ "$npm_config_arch" == "x64" ]; then
 
   # Set compiler toolchain
   # Flags for the client build are based on
-  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:build/config/arm.gni
-  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:build/config/compiler/BUILD.gn
-  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:build/config/c++/BUILD.gn
+  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.210:build/config/arm.gni
+  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.210:build/config/compiler/BUILD.gn
+  # https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.210:build/config/c++/BUILD.gn
   export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu"
   export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu"
   export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -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_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot"
diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt
index dcc7bf55c5ca..d390d7a233ca 100644
--- a/build/checksums/electron.txt
+++ b/build/checksums/electron.txt
@@ -1,75 +1,75 @@
-c0a187acca68906c4a6387e8fabd052cb031ace6132d60a71001d9a0e891958e *chromedriver-v34.2.0-darwin-arm64.zip
-fa5a46d752267d8497d375e19079e8b6a8df70c234a79b2d6b48f5862e1a0abc *chromedriver-v34.2.0-darwin-x64.zip
-61e03d4fa570976d80f740637f56192b6448a05a73d1fba9717900b29f2b1b4d *chromedriver-v34.2.0-linux-arm64.zip
-ec774d9b1a1b828a0db1502a1017fcab1dfed99b1b6b2fd2308dd600a1efa98a *chromedriver-v34.2.0-linux-armv7l.zip
-cc15a6e6206485a2d96649ceb60509b9da04fa2811c4824b2e0eb43d1f4b1417 *chromedriver-v34.2.0-linux-x64.zip
-9777122f6684180ef375b9b21dcabbc731d8a8befa300d1d47ad954a5b64c1c8 *chromedriver-v34.2.0-mas-arm64.zip
-69451fa148b105fec9644646b22ca758a206499574c5816591354835c8056679 *chromedriver-v34.2.0-mas-x64.zip
-eb7adc7e720f5e0f1d2c12ecbe886bdc01f2c9aaa3954bd6ebd313750bb18819 *chromedriver-v34.2.0-win32-arm64.zip
-cb1973b0c2f5565974d5c2cb51816692f064b6cdc7897fa341d528ba7f9b14bf *chromedriver-v34.2.0-win32-ia32.zip
-af5575b4727c3dbe7272016cbbaa8872043f843168a47d86748a50397efb4f77 *chromedriver-v34.2.0-win32-x64.zip
-fcc718af2a28fb953290dc971e945818b4dbb293f297e6e25acb669d450cc0dd *electron-api.json
-fa47e752e559a6472b87d8907f63296ed8cd53ecf862a4ae113018474d40aa8e *electron-v34.2.0-darwin-arm64-dsym-snapshot.zip
-336c3374e721e2379901141be6345459f78d243b037c65b55bac4ae8cb14bfbe *electron-v34.2.0-darwin-arm64-dsym.zip
-ac3b9d712d9f036f066d8eba42797117a513e2d250fcc117f0354300b7d5c1e5 *electron-v34.2.0-darwin-arm64-symbols.zip
-ee447c17b2ac545e48083113d7e39a916821c1316f60f42cbcbee4fffe7c022a *electron-v34.2.0-darwin-arm64.zip
-d7510bc038d06b26690ac9a78fbb256626502303ff7f5b1c2242f64a02832b1b *electron-v34.2.0-darwin-x64-dsym-snapshot.zip
-0e95c2bbda00afe78e6229b824e3ffe0cc8612956dc11a5a30380224acdbecae *electron-v34.2.0-darwin-x64-dsym.zip
-6d734ef8e8fd007071aae9a13534894dd801f11900f3e73e49cf5352b426e575 *electron-v34.2.0-darwin-x64-symbols.zip
-8ef741819c8a5370dabc3b9df5e6ac217366477c5d5c656ed23c800bc984d887 *electron-v34.2.0-darwin-x64.zip
-c2f448882a0392ebfd9810058a6a9580b087002c74fca3dcd3cf4ba5c3b27a7c *electron-v34.2.0-linux-arm64-debug.zip
-51e887c382593021127593ceba89ad662d3a6de0f748b94fe3a0ce78a7393923 *electron-v34.2.0-linux-arm64-symbols.zip
-818c91309da8ff948c43df58a996c05c0d27daa690e1d659355d9db01e351919 *electron-v34.2.0-linux-arm64.zip
-c2f448882a0392ebfd9810058a6a9580b087002c74fca3dcd3cf4ba5c3b27a7c *electron-v34.2.0-linux-armv7l-debug.zip
-71ec2b7473db766194bcf04648229c4affedce06e150e692745cc72dbc3749c5 *electron-v34.2.0-linux-armv7l-symbols.zip
-0c75996c6bf2d37d0441d3e1021386a9348f8d21783d75571cdb10ede606424f *electron-v34.2.0-linux-armv7l.zip
-d1f17be8df8ec6dc1a23afd8a7752f0b949c755a493b8a2c1e83f76c629258ca *electron-v34.2.0-linux-x64-debug.zip
-d8fa79154b0b663dbd0054d69f53aec326997449ef21943d27225a2d6899660f *electron-v34.2.0-linux-x64-symbols.zip
-f12a02d86cc657500978d263ec6d1841b6e2085cd3bd4d30a97cfe14685396f3 *electron-v34.2.0-linux-x64.zip
-71ef8bfebb8513a405fd2beb44ad18f802bbac2248f81a5328ddaaa12906d70c *electron-v34.2.0-mas-arm64-dsym-snapshot.zip
-437aca6cad3158f15fd852e5913462637052940f812b20ccc10fccc133d5a0d6 *electron-v34.2.0-mas-arm64-dsym.zip
-7f253375a7b43d34b770c03153e47185be7a64bc0c10a783993a93144eb35492 *electron-v34.2.0-mas-arm64-symbols.zip
-1f601c20430b036b485c7dc02a39a297f0d08905462a4568306c12f299375e2f *electron-v34.2.0-mas-arm64.zip
-d32664181804a17f825bf1fbfd8f0cbe01e0b41b284937359e6d9754b3481ed8 *electron-v34.2.0-mas-x64-dsym-snapshot.zip
-f6b394b89fb77dfeefdf525739fe8cd9695f8c2ac2251ed7c571a376cde059e9 *electron-v34.2.0-mas-x64-dsym.zip
-539328d93e9bc122e6e34faeab6a42f4845c523f796c7a11bbdcfe5e856f6b98 *electron-v34.2.0-mas-x64-symbols.zip
-749b6ced7a9d35a719ad98d4c3bf1a08c315c19ce97d2497235d4ac302cda665 *electron-v34.2.0-mas-x64.zip
-e843ea4cb7a93686728d056c957c124760886167932ff619b518e45917edf38a *electron-v34.2.0-win32-arm64-pdb.zip
-4908423be5f8ad1b5dd737edfd69ee0870460e16bb639bb963b0981bda2628e4 *electron-v34.2.0-win32-arm64-symbols.zip
-9d13b2bd61416eec28f43faa399cc5c0dc9e36dec226314bbf397828f55d74de *electron-v34.2.0-win32-arm64-toolchain-profile.zip
-1629cec7b5620e6ca3b5305c393ae147d1a3871a8f164d686b7bee3810fc1109 *electron-v34.2.0-win32-arm64.zip
-e7182f1ef5ed13187fe12f35133cefb50c59e1d52ada758cbb72813dda575205 *electron-v34.2.0-win32-ia32-pdb.zip
-a10f778f62bf060a7e38f5ea75ea472679b9ef4f12767ee0703e6d77effae78a *electron-v34.2.0-win32-ia32-symbols.zip
-9d13b2bd61416eec28f43faa399cc5c0dc9e36dec226314bbf397828f55d74de *electron-v34.2.0-win32-ia32-toolchain-profile.zip
-96396712a0240f04471f71246b3885a513b08e3f2d40154272d34e59419db7e6 *electron-v34.2.0-win32-ia32.zip
-0c55ef5b1a6ea4604e3f0e9f8b5e946944abd1cfc3b974432d40e924a9996812 *electron-v34.2.0-win32-x64-pdb.zip
-d6b67cf12edabcc62ae21e7c90ac6b1161dbefe4e6b765c69fc7040096b7d026 *electron-v34.2.0-win32-x64-symbols.zip
-9d13b2bd61416eec28f43faa399cc5c0dc9e36dec226314bbf397828f55d74de *electron-v34.2.0-win32-x64-toolchain-profile.zip
-a4fdf617dca787b7f1c6f8d0d1cb69c8adb37ee23f9553fe69803f9cad713360 *electron-v34.2.0-win32-x64.zip
-5ca44a4ee9cc74a56c9556ce3f3774986dbb8b4f4953088c7f4577bfba4356a8 *electron.d.ts
-86247a6815cc98f321374edcbfc0ab7ee79bcb13a5c25213f42151e4059ec690 *ffmpeg-v34.2.0-darwin-arm64.zip
-e94f4707a91194f97d0451f9d5a27982c873a5c13d83d20926ce6fdb613f536c *ffmpeg-v34.2.0-darwin-x64.zip
-947d7b7cb035eab94cc15b602dfa8a925cf238c1d9225c01732fe0c41f59c571 *ffmpeg-v34.2.0-linux-arm64.zip
-64d74b6b94ac4fd755b97e0ec8d50af9cd73810fdb52f6c081b13a3337ace0ea *ffmpeg-v34.2.0-linux-armv7l.zip
-a62cb20c5e5f2ba6f1df6f1bc406cc30f7ed44fe6380b506afa333d1b4ad7a87 *ffmpeg-v34.2.0-linux-x64.zip
-715bbb3d193b1ca57d4b329edd05cd6b125dc188cdb73d1c66f220f62c8562e3 *ffmpeg-v34.2.0-mas-arm64.zip
-866bf47106e8c3e50f046783eb8f5c756069c6de962a46f4edc7a5ee7e4593ee *ffmpeg-v34.2.0-mas-x64.zip
-71a2a6c4cca15ccbcbf8912f5d73f855b0ca79804f941f68527ae808f8163957 *ffmpeg-v34.2.0-win32-arm64.zip
-399f841cca166781078ca42c8ea060e3d5850ec6cb79716186d0806f3ce20842 *ffmpeg-v34.2.0-win32-ia32.zip
-afad2a44f20a0c0c01fb1fea637f3f821842399593c9961c74d650ca12d32cbb *ffmpeg-v34.2.0-win32-x64.zip
-c95fdc9dba05aa68aeccb69d4c34f0cb1fb98d7f5291d974d0b638488693655f *hunspell_dictionaries.zip
-0abe74138afdb6e45a085d77407659f13c75ab96f694313d4e98bd662f9c6df2 *libcxx-objects-v34.2.0-linux-arm64.zip
-3d0cbf6fb150b006428eab78235856d2204d5e93ca85f162e429b4c8bd9b0d3b *libcxx-objects-v34.2.0-linux-armv7l.zip
-3a5491e32cec825499919be1b8bf0550d28fe5a31ff00a95572d49a58bb4820a *libcxx-objects-v34.2.0-linux-x64.zip
-ff8753d52f759041b8e5462125ee2b96798fe8b5047f8fb8ae60cd07af2fb13d *libcxx_headers.zip
-c98cce0091681bc367a48f66c5f4602961aa9cb6dd1a995d8969d6b39ce732f3 *libcxxabi_headers.zip
-78a9606190fb227460ddcd276ad540873595d6a82fd1007f42900f53347e3eb1 *mksnapshot-v34.2.0-darwin-arm64.zip
-6d4587a36f509356a908b6752de527cfe8a294a2d435b82ea3a98288c3a3a178 *mksnapshot-v34.2.0-darwin-x64.zip
-17737bd34f7feefc5143b745f2c4f0e5a41678780e144eb43de41f8d4b9d7852 *mksnapshot-v34.2.0-linux-arm64-x64.zip
-565aa9a84d913b7b5eb8d3b868cff151cb8a6c16548233ffd92b2f9bf3789227 *mksnapshot-v34.2.0-linux-armv7l-x64.zip
-7332d7864ab4e5ee7fa8d00580d9357f30d0e69d3d1434d67c61f79f666314a4 *mksnapshot-v34.2.0-linux-x64.zip
-cc81bfc9894378a9fc8a777429e04cc80860663b3dff8eba1f8cc72559a4f23d *mksnapshot-v34.2.0-mas-arm64.zip
-c98230088698638159f6e7e0c5ddde3cb4dba9fa81d76e3c58fc86f96b63ef81 *mksnapshot-v34.2.0-mas-x64.zip
-cc7b42943d998e1083ad8119dc2201dd27d709c15aa2a9b78f409485d2927592 *mksnapshot-v34.2.0-win32-arm64-x64.zip
-ade9e3126f113318e226f9bdeba068b4383b30a98517a361386eff448459effa *mksnapshot-v34.2.0-win32-ia32.zip
-344292ea318dc0e21f37bc7c82d57a57449f0fb278d9868f1b1b597bdcb1f36f *mksnapshot-v34.2.0-win32-x64.zip
+c9b82c9f381742e839fea00aeb14f24519bcaf38a0f4eed25532191701f9535b *chromedriver-v34.3.2-darwin-arm64.zip
+d556c1e2b06f1bf131e83c2fb981de755c28e1083a884d257eb964815be16b0c *chromedriver-v34.3.2-darwin-x64.zip
+1cabad4f3303ac2ff172a9f22185f64944dbaa6fc68271609077158eaefdee35 *chromedriver-v34.3.2-linux-arm64.zip
+4213ce52c72ef414179b5c5c22ae8423847ff030d438296bd6c2aac763930a7b *chromedriver-v34.3.2-linux-armv7l.zip
+3c64c08221fdfc0f4be60ea8b1b126f2ecca45f60001b63778522f711022c6ea *chromedriver-v34.3.2-linux-x64.zip
+e8388734d88e011cb6cd79795431de9206820749219d80565ee49d90501d2bf3 *chromedriver-v34.3.2-mas-arm64.zip
+3ad1dd37bd6e0bb37e8503898db7aedd56bd5213e6d6760b05c3d11f4625062b *chromedriver-v34.3.2-mas-x64.zip
+d567b481a0f5d88e84bba7718f89fb08f56363bfc4cb5914e1c2086358a5c252 *chromedriver-v34.3.2-win32-arm64.zip
+df6732e9dc61cb20a3c0b2a2de453aac7e2bd54e7cbff43512afa614852c15fa *chromedriver-v34.3.2-win32-ia32.zip
+dda0765c8d064924632e18cd152014ecd767f3808fc51c8249a053bfb7ca70a2 *chromedriver-v34.3.2-win32-x64.zip
+1945f15caff98f2e0f1ee539c483d352fb8d4d0c13f342caa7abe247676d828c *electron-api.json
+c078bbf727b3c3026f60e07a0f4643b85c06c581b54be017d0a6c284ba6772d3 *electron-v34.3.2-darwin-arm64-dsym-snapshot.zip
+35f587754d6a3272606258386bf73688d63dd53c7e572d3a7cbaae6f3f60bdae *electron-v34.3.2-darwin-arm64-dsym.zip
+08b14ee02c98353de3c738120dfd017322666e82b914a7f6de9b9888dcc5c0f0 *electron-v34.3.2-darwin-arm64-symbols.zip
+2a4aa7e8fa30f229e465ebd18d3e4722e2b41529dc51a68a954d333a7e556ffe *electron-v34.3.2-darwin-arm64.zip
+1509ccdeb80024f5e3edd5ecf804b4cef4e47ea2bd74e33ef0b39044b0ccf892 *electron-v34.3.2-darwin-x64-dsym-snapshot.zip
+3bbe5d587c3f582ed8c126b0fb635cc02ad9a14d077b04892fe6f862092445b0 *electron-v34.3.2-darwin-x64-dsym.zip
+fa7ece82e6ecaf1c94ed341e8ebff98e64687c68fe113f52cd9a21400302e22f *electron-v34.3.2-darwin-x64-symbols.zip
+23938c62257a65a863ed7aa7c7966ba5f257a7d3dc16c78293e826962cc39c5c *electron-v34.3.2-darwin-x64.zip
+0547eecf8ab538d74fa854f591ce8b888a3dbb339256d2db3038e7bb2c6dd929 *electron-v34.3.2-linux-arm64-debug.zip
+676d0dc2b1c1c85c8b2abbb8cd5376ee22ecdb910493b910d9ae5a998532136a *electron-v34.3.2-linux-arm64-symbols.zip
+774e4ccb39d553e5487994a9f8c60774a90f08cdb049ff65f3963fc27c969ff2 *electron-v34.3.2-linux-arm64.zip
+0547eecf8ab538d74fa854f591ce8b888a3dbb339256d2db3038e7bb2c6dd929 *electron-v34.3.2-linux-armv7l-debug.zip
+ba33bf53fcb35dea568a2795f5b23ecf46c218abe8258946611c72a1f42f716c *electron-v34.3.2-linux-armv7l-symbols.zip
+73ae92c8fffb351d3a455569cf57ce9a3f676f42bf61939c613c607fe0fc3bfb *electron-v34.3.2-linux-armv7l.zip
+e61a9a69dd7ea6f2687708a8e83516670cdea53c728226e598e2f6f1fad5b77b *electron-v34.3.2-linux-x64-debug.zip
+f1a04df7fe67dd1cd29e7b87871525458d2eb24c0cf3b5835a1c56974707562a *electron-v34.3.2-linux-x64-symbols.zip
+7b74c0c4fae82e27c7e9cbca13e9763e046113dba8737d3e27de9a0b300ac87e *electron-v34.3.2-linux-x64.zip
+8571a6aa83e00925ceb39fdc5a45a9f6b9aa3d92fd84951c6f252ed723aea4ae *electron-v34.3.2-mas-arm64-dsym-snapshot.zip
+477410c6f9a6c5eeaedf376058a02c2996fc0a334aa40eeec7d3734c09347f4d *electron-v34.3.2-mas-arm64-dsym.zip
+c2e62dcd6630cb51b2d8e2869e74e47d29bda785521cea6e82e546d0fc58aabb *electron-v34.3.2-mas-arm64-symbols.zip
+a1698e8546a062fd59b7f8e5507a7f3220fb00b347f2377de83fc9a07f7f3507 *electron-v34.3.2-mas-arm64.zip
+741a24ac230a3651dca81d211f9f00b835c428a5ed0c5f67d370d4e88b62f8d6 *electron-v34.3.2-mas-x64-dsym-snapshot.zip
+aeff97ec9e5c9e173ac89e38acd94476025c5640d5f27be1e8c2abd54398bab3 *electron-v34.3.2-mas-x64-dsym.zip
+9f14b66b1d612ac66697288e8763171c388f7f200854871a5f0ab464a6a921c2 *electron-v34.3.2-mas-x64-symbols.zip
+c979d7e7175f1e8e03ca187997d4c156b878189fc3611b347fadebcb16f3e027 *electron-v34.3.2-mas-x64.zip
+f43c700641e8220205dd356952e32718d113cf530520c4ed7209b59851eac266 *electron-v34.3.2-win32-arm64-pdb.zip
+3ba6e01c99bffac6b5dd3fd6f122ecdb571cf6f675dc5498c65050bd7a382ef8 *electron-v34.3.2-win32-arm64-symbols.zip
+c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.3.2-win32-arm64-toolchain-profile.zip
+9b9cb65d75a16782088b492f9ef3bb4d27525012b819c12bf29bd27e159d749b *electron-v34.3.2-win32-arm64.zip
+1006e7af4c149114b5ebc3497617aaa6cd1bb0b131e0a225fd73709ff308f9c5 *electron-v34.3.2-win32-ia32-pdb.zip
+1ecb6430cd04454f08f557c9579163f3552144bfcc0b67b768dad8868b5b891d *electron-v34.3.2-win32-ia32-symbols.zip
+c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.3.2-win32-ia32-toolchain-profile.zip
+d004fd5f853754001fafaec33e383d1950b30c935ee71b297ec1c9e084355e9b *electron-v34.3.2-win32-ia32.zip
+4e0721552fd2f09e9466e88089af8b965f1bfbc4ae00a59aaf6245b1d1efabfd *electron-v34.3.2-win32-x64-pdb.zip
+9dea812a7e7cd0fb18e5fed9a99db5531959a068c24d3c0ecedceb644cd3ffa0 *electron-v34.3.2-win32-x64-symbols.zip
+c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.3.2-win32-x64-toolchain-profile.zip
+1785e161420fb90d2331c26e50bba3413cae9625b7db3c8524ea02ade631efba *electron-v34.3.2-win32-x64.zip
+722b304c31ddac58b0083d94a241c5276464f04bd8ea4fcbfd33051d197be103 *electron.d.ts
+31ce159b2e47d1de5bc907d8e1c89726b0f2ba530ec2e9d7a8e5c723b1ccf6e0 *ffmpeg-v34.3.2-darwin-arm64.zip
+565539bac64a6ee9cf6f188070f520210a1507341718f5dc388ac7c454b1e1d5 *ffmpeg-v34.3.2-darwin-x64.zip
+6006ea0f46ab229feb2685be086b0fafd65981e2939dd2218a078459c75ab527 *ffmpeg-v34.3.2-linux-arm64.zip
+9404ce2e85df7c40f809f2cf62c7af607de299839fe6b7ae978c3015500abcc8 *ffmpeg-v34.3.2-linux-armv7l.zip
+79aec96898b7e2462826780ee0b52b9ab299dc662af333e128a34fd5ddae87f1 *ffmpeg-v34.3.2-linux-x64.zip
+9190743c78210574faf5d5ecb82a00f8fa15e5f2253378cb925a99ca9d39961b *ffmpeg-v34.3.2-mas-arm64.zip
+48915adcb1a6342efeda896035101300f0432c0304cfb38f2378e98c6309ebae *ffmpeg-v34.3.2-mas-x64.zip
+745d5ef786de6d4a720475079836e2fda7b501cfcd255819485a47de5b24b74e *ffmpeg-v34.3.2-win32-arm64.zip
+d0d86d60978439dc8ae4a723d4e4c1f853891d596bfd84033440a232fa762e2f *ffmpeg-v34.3.2-win32-ia32.zip
+4441539fd8c9cbe79880ff1bade9bdc0c3744c33d7409130af6404e57ee401ff *ffmpeg-v34.3.2-win32-x64.zip
+39edd1eeefe881aa75af0e438204e0b1c6e6724e34fa5819109276331c0c2c9a *hunspell_dictionaries.zip
+20dd417536e5f4ebc01f480221284c0673729c27b082bc04e2922f16cd571719 *libcxx-objects-v34.3.2-linux-arm64.zip
+7e53c5779c04f895f8282c0450ec4a63074d15a0e910e41006cfea133d0288af *libcxx-objects-v34.3.2-linux-armv7l.zip
+92e2283c924ab523ffec3ea22513beaab6417f7fc3d570f57d51a1e1ceb7f510 *libcxx-objects-v34.3.2-linux-x64.zip
+9bf3c6e8ad68f523fe086fada4148dd04e5bb0b9290d104873e66f2584a5cf50 *libcxx_headers.zip
+34e4b44f9c5e08b557a2caed55456ce7690abab910196a783a2a47b58d2b9ac9 *libcxxabi_headers.zip
+11f67635e6659f9188198e4086c51b89890b61a22f6c17c99eff35595ee8f51d *mksnapshot-v34.3.2-darwin-arm64.zip
+c0add9ef4ac27c73fa043d04b4c9635fd3fd9f5c16d7a03e961864ba05252813 *mksnapshot-v34.3.2-darwin-x64.zip
+6262adf86a340d8d28059937b01ef1117b93212e945fddbceea5c18d7e7c64f0 *mksnapshot-v34.3.2-linux-arm64-x64.zip
+f7db8ebe91a1cc8d24ef6aad12949a18d8e4975ac296e3e5e9ecd88c9bccb143 *mksnapshot-v34.3.2-linux-armv7l-x64.zip
+6642038e86bda362980ff1c8973a404e2b02efdd87de9e35b650fc1e743833da *mksnapshot-v34.3.2-linux-x64.zip
+15883bf8e8cd737c3682d1e719d7cbac92f50b525681aac324dca876861dfc7d *mksnapshot-v34.3.2-mas-arm64.zip
+4da23a950bfcc377ef21c37d496017ab4c36da03f3b41049ac114042c42608ce *mksnapshot-v34.3.2-mas-x64.zip
+fab59573d3c2f9bdf31146a1896d24ac0c51f736aad86d2f3c7ecef13c05a7fd *mksnapshot-v34.3.2-win32-arm64-x64.zip
+66f25e07c6f8d5d2009577a129440255a3baf63c929a5b60b2e77cd52e46105b *mksnapshot-v34.3.2-win32-ia32.zip
+8168bfbf61882cfac80aed1e71e364e1c7f2fccd11eac298e6abade8b46894ea *mksnapshot-v34.3.2-win32-x64.zip
diff --git a/build/checksums/nodejs.txt b/build/checksums/nodejs.txt
index d00d52bc25f9..d394605dda3a 100644
--- a/build/checksums/nodejs.txt
+++ b/build/checksums/nodejs.txt
@@ -1,7 +1,7 @@
-fa76d5b5340f14070ebaa88ef8faa28c1e9271502725e830cb52f0cf5b6493de  node-v20.18.2-darwin-arm64.tar.gz
-00a16bb0a82a2ad5d00d66b466ae1afa678482283747c27e9bce96668f334744  node-v20.18.2-darwin-x64.tar.gz
-319789e8a055ff80793a05e633c8c5c9226050144a09da3747225b4ec56a2a99  node-v20.18.2-linux-arm64.tar.gz
-65397a4a63960bda94718099698d2961623e9ef400f60f4c3a71add2268bccfb  node-v20.18.2-linux-armv7l.tar.gz
-eb5b031bdd728871c3b9a82655dbfa533bc262c0b6da1d09a86842430cef07d4  node-v20.18.2-linux-x64.tar.gz
-83e7ad1b8c4d4d9c5e06849c3e8f3a5948a5eb6aa34c5bd973ba700e0386f42c  win-arm64/node.exe
-8487a277e92282904dfe0f860dbd5d229543e97a858a223fbe9c9b8670bbe170  win-x64/node.exe
+1f15b7ed18a580af31cf32bc126572292d820f547bf55bf9cdce08041a24e1d9  node-v20.18.3-darwin-arm64.tar.gz
+ba668f64df9239843fefcef095ee539f5ac5aa1b0fc15a71f1ecca16abedec7a  node-v20.18.3-darwin-x64.tar.gz
+93a9df19238adfaa289f4784041d03edaf2fdd89fbb247faffca2fe4a1000703  node-v20.18.3-linux-arm64.tar.gz
+8a84eb34287db6a273066934d7195e429f57b91686b62fc19497210204a2b3de  node-v20.18.3-linux-armv7l.tar.gz
+9fc3952da39b20d1fcfdb777b198cc035485afbbb1004b4df93f35245d61151e  node-v20.18.3-linux-x64.tar.gz
+4258e333f4b95060681d61bffa762542a8068547d3dffebe57c575b38d380dda  win-arm64/node.exe
+528a9aa64888a2a3ba71c6aea89434dd5ab5cb3caa9f0f31345cf5facf685ab0  win-x64/node.exe
diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
index 39e2b4e317b2..448ab38c4a43 100644
--- a/build/linux/dependencies-generator.js
+++ b/build/linux/dependencies-generator.js
@@ -26,7 +26,7 @@ const product = require("../../product.json");
 // The reference dependencies, which one has to update when the new dependencies
 // are valid, are in dep-lists.ts
 const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
-// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:chrome/installer/linux/BUILD.gn;l=64-80
+// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.210: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/dependencies-generator.ts b/build/linux/dependencies-generator.ts
index 83d2ec78abb0..6c1f7b7570b5 100644
--- a/build/linux/dependencies-generator.ts
+++ b/build/linux/dependencies-generator.ts
@@ -25,7 +25,7 @@ import product = require('../../product.json');
 // are valid, are in dep-lists.ts
 const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true;
 
-// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:chrome/installer/linux/BUILD.gn;l=64-80
+// Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.210: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/cgmanifest.json b/cgmanifest.json
index 24c00b3731dc..eb5b37d39a75 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "chromium",
 					"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
-					"commitHash": "46a5bd1e987735e0cdc41cf48a7db4988ae73d16"
+					"commitHash": "5c0cb964bca15fcf41718d54f4b8d70d6b9079de"
 				}
 			},
 			"licenseDetail": [
@@ -40,7 +40,7 @@
 				"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 			],
 			"isOnlyProductionDependency": true,
-			"version": "132.0.6834.196"
+			"version": "132.0.6834.210"
 		},
 		{
 			"component": {
@@ -516,11 +516,11 @@
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "53a57efd83a18efe7a84bf1b460acc789139939b"
+					"commitHash": "4819c99baa28bf2c1baf411ba100c467fec3d486"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "20.18.2"
+			"version": "20.18.3"
 		},
 		{
 			"component": {
@@ -528,12 +528,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "ddc7afd3f006dab49a3b6bf73bf3222b017556d5"
+					"commitHash": "f98501308a973e0aee2414315b426e5de2c03a60"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "34.2.0"
+			"version": "34.3.2"
 		},
 		{
 			"component": {
diff --git a/package-lock.json b/package-lock.json
index 83a411ed2031..9d386986ea46 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -96,7 +96,7 @@
         "cssnano": "^6.0.3",
         "debounce": "^1.0.0",
         "deemon": "^1.8.0",
-        "electron": "34.2.0",
+        "electron": "34.3.2",
         "eslint": "^9.11.1",
         "eslint-formatter-compact": "^8.40.0",
         "eslint-plugin-header": "3.1.1",
@@ -6099,9 +6099,9 @@
       "dev": true
     },
     "node_modules/electron": {
-      "version": "34.2.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-34.2.0.tgz",
-      "integrity": "sha512-SYwBJNeXBTm1q/ErybQMUBZAYqEreBUqBwTrNkw1rV4YatDZk5Aittpcus3PPeC4UoI/tqmJ946uG8AKHTd6CA==",
+      "version": "34.3.2",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-34.3.2.tgz",
+      "integrity": "sha512-n9tzmFexVLxipZXwMTY30H10f0X9k2OP0SkpSwL5VvnDZi0l/Hc+8CEArKkQPbbSf/IS7nxgc96gtTaR+XoSBg==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
diff --git a/package.json b/package.json
index 323dfc555644..a61d78887c02 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.99.0",
-  "distro": "41cec92368205e685549ec26290a8f26c8d47bcf",
+  "distro": "034ea95a21e3eb734fd22bf565a1e2e80d62ea9b",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -155,7 +155,7 @@
     "cssnano": "^6.0.3",
     "debounce": "^1.0.0",
     "deemon": "^1.8.0",
-    "electron": "34.2.0",
+    "electron": "34.3.2",
     "eslint": "^9.11.1",
     "eslint-formatter-compact": "^8.40.0",
     "eslint-plugin-header": "3.1.1",
diff --git a/remote/.npmrc b/remote/.npmrc
index 1d8b1e877826..e2c53927b15e 100644
--- a/remote/.npmrc
+++ b/remote/.npmrc
@@ -1,6 +1,6 @@
 disturl="https://nodejs.org/dist"
-target="20.18.2"
-ms_build_id="320948"
+target="20.18.3"
+ms_build_id="323695"
 runtime="node"
 build_from_source="true"
 legacy-peer-deps="true"
diff --git a/src/main.ts b/src/main.ts
index 11ead39bd9e7..c132c9b8b9bb 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -522,14 +522,6 @@ function getJSFlags(cliArgs: NativeParsedArgs): string | null {
 		jsFlags.push(cliArgs['js-flags']);
 	}
 
-	if (process.platform === 'linux') {
-		// Fix cppgc crash on Linux with 16KB page size.
-		// Refs https://issues.chromium.org/issues/378017037
-		// TODO(deepak1556): Remove this once we update to
-		// Chromium >= 134.
-		jsFlags.push('--nodecommit_pooled_pages');
-	}
-
 	return jsFlags.length > 0 ? jsFlags.join(' ') : null;
 }
 

From a2b64db7649b967dc5e1bb2531c9890d95bd0a2a Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 11 Mar 2025 13:33:10 +0100
Subject: [PATCH 0766/1815] chat - add NES to status as checkbox (#243173)

---
 src/vs/base/common/product.ts                 |   1 +
 .../contrib/chat/browser/chatStatus.ts        | 148 +++++++++++++-----
 .../contrib/chat/browser/media/chatStatus.css |   4 +
 3 files changed, 112 insertions(+), 41 deletions(-)

diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
index 189d3ac16933..762e11341aad 100644
--- a/src/vs/base/common/product.ts
+++ b/src/vs/base/common/product.ts
@@ -336,4 +336,5 @@ export interface IDefaultChatAgent {
 
 	readonly completionsAdvancedSetting: string;
 	readonly completionsEnablementSetting: string;
+	readonly nextEditSuggestionsSetting: string;
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 14a6497b112a..794f248a042d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -33,7 +33,7 @@ import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Gesture, EventType as TouchEventType } from '../../../../base/browser/touch.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { IProductService } from '../../../../platform/product/common/productService.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';
@@ -94,6 +94,12 @@ registerColor('gauge.errorForeground', {
 
 //#endregion
 
+const defaultChat = {
+	extensionId: product.defaultChatAgent?.extensionId ?? '',
+	completionsEnablementSetting: product.defaultChatAgent?.completionsEnablementSetting ?? '',
+	nextEditSuggestionsSetting: product.defaultChatAgent?.nextEditSuggestionsSetting ?? ''
+};
+
 export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribution {
 
 	static readonly ID = 'chat.statusBarEntry';
@@ -111,7 +117,6 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		@IChatEntitlementService private readonly chatEntitlementService: ChatEntitlementService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IProductService private readonly productService: IProductService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
 		super();
@@ -127,7 +132,11 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 		if (!hidden && !disabled) {
 			this.entry ||= this.statusbarService.addEntry(this.getEntryProps(), ChatStatusBarEntry.ID, StatusbarAlignment.RIGHT, { location: { id: 'status.editor.mode', priority: 100.1 }, alignment: StatusbarAlignment.RIGHT });
-			this.statusbarService.updateEntryVisibility(`${this.productService.defaultChatAgent?.extensionId}.status`, false); // TODO@bpasero: remove this eventually
+
+			// TODO@bpasero: remove this eventually
+			const completionsStatusId = `${defaultChat.extensionId}.status`;
+			this.statusbarService.updateEntryVisibility(completionsStatusId, false);
+			this.statusbarService.overrideEntry(completionsStatusId, { name: localize('codeCompletionsStatus', "Copilot Code Completions"), text: localize('codeCompletionsStatusText', "$(copilot) Completions") });
 		} else {
 			this.entry?.dispose();
 			this.entry = undefined;
@@ -225,6 +234,11 @@ function isNewUser(contextKeyService: IContextKeyService, chatEntitlementService
 		chatEntitlementService.entitlement === ChatEntitlement.Available;									// not yet signed up to copilot
 }
 
+interface ISettingsAccessor {
+	readSetting: () => boolean;
+	writeSetting: (value: boolean) => Promise<void>;
+}
+
 class ChatStatusDashboard extends Disposable {
 
 	private readonly element = $('div.chat-status-bar-entry-tooltip');
@@ -240,8 +254,7 @@ class ChatStatusDashboard extends Disposable {
 		@IEditorService private readonly editorService: IEditorService,
 		@ILanguageService private readonly languageService: ILanguageService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
-		@ICommandService private readonly commandService: ICommandService,
-		@IProductService private readonly productService: IProductService
+		@ICommandService private readonly commandService: ICommandService
 	) {
 		super();
 	}
@@ -374,7 +387,7 @@ class ChatStatusDashboard extends Disposable {
 	}
 
 	private createSettings(container: HTMLElement, disposables: DisposableStore): HTMLElement {
-		const language = this.editorService.activeTextEditorLanguageId;
+		const modeId = this.editorService.activeTextEditorLanguageId;
 		const settings = container.appendChild($('div.settings'));
 
 		// --- Code Completions
@@ -382,63 +395,116 @@ class ChatStatusDashboard extends Disposable {
 			const globalSetting = append(settings, $('div.setting'));
 			this.createCodeCompletionsSetting(globalSetting, localize('settings.codeCompletions', "Code completions (all files)"), '*', disposables);
 
-			if (language) {
+			if (modeId) {
 				const languageSetting = append(settings, $('div.setting'));
-				this.createCodeCompletionsSetting(languageSetting, localize('settings.codeCompletionsLanguage', "Code completions ({0})", this.languageService.getLanguageName(language) ?? language), language, disposables);
+				this.createCodeCompletionsSetting(languageSetting, localize('settings.codeCompletionsLanguage', "Code completions ({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"), modeId, this.getCompletionsSettingAccessor(modeId), disposables);
+		}
+
 		return settings;
 	}
 
-	private createCodeCompletionsSetting(container: HTMLElement, label: string, language: string | '*', disposables: DisposableStore): void {
-		const settingId = this.productService.defaultChatAgent?.completionsEnablementSetting ?? '';
-
-		const readSetting = () => {
-			const result = this.configurationService.getValue<Record<string, boolean>>(settingId);
-			if (!isObject(result)) {
-				return false;
-			}
-
-			if (typeof result[language] !== 'undefined') {
-				return Boolean(result[language]); // go with setting if explicitly defined
-			}
-
-			return Boolean(result['*']); // fallback to global setting otherwise
-		};
-		const writeSetting = (checkbox: Checkbox) => {
-			let result = this.configurationService.getValue<Record<string, boolean>>(settingId);
-			if (!isObject(result)) {
-				result = Object.create(null);
-			}
-
-			return this.configurationService.updateValue(settingId, { ...result, [language]: checkbox.checked });
-		};
-
-		const settingCheckbox = disposables.add(new Checkbox(label, readSetting(), defaultCheckboxStyles));
-		container.appendChild(settingCheckbox.domNode);
+	private createSetting(container: HTMLElement, settingId: 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 (settingCheckbox?.enabled) {
+				if (checkbox?.enabled) {
 					EventHelper.stop(e, true);
 
-					settingCheckbox.checked = !settingCheckbox.checked;
-					writeSetting(settingCheckbox);
-					settingCheckbox.focus();
+					checkbox.checked = !checkbox.checked;
+					accessor.writeSetting(checkbox.checked);
+					checkbox.focus();
 				}
 			}));
 		});
 
-		disposables.add(settingCheckbox.onChange(() => {
-			writeSetting(settingCheckbox);
+		disposables.add(checkbox.onChange(() => {
+			accessor.writeSetting(checkbox.checked);
 		}));
 
 		disposables.add(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(settingId)) {
-				settingCheckbox.checked = readSetting();
+				checkbox.checked = Boolean(accessor.readSetting());
+			}
+		}));
+
+		return checkbox;
+	}
+
+	private createCodeCompletionsSetting(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: () => {
+				const result = this.configurationService.getValue<Record<string, boolean>>(settingId);
+				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
+			},
+			writeSetting: (value: boolean) => {
+				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, modeId: string | undefined, completionsSettingAccessor: ISettingsAccessor, disposables: DisposableStore): void {
+		const nesSettingId = defaultChat.nextEditSuggestionsSetting;
+		const completionsSettingId = defaultChat.completionsEnablementSetting;
+
+		const checkbox = this.createSetting(container, nesSettingId, label, {
+			readSetting: () => this.configurationService.getValue<boolean>(nesSettingId, { overrideIdentifier: modeId }),
+			writeSetting: (value: boolean) => {
+				const { overrideIdentifiers } = this.configurationService.inspect(nesSettingId, { overrideIdentifier: modeId });
+				if (modeId && overrideIdentifiers?.includes(modeId)) {
+					return this.configurationService.updateValue(nesSettingId, value, { overrideIdentifier: modeId });
+				}
+
+				return this.configurationService.updateValue(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()) {
+					checkbox.enable();
+					container.classList.remove('disabled');
+				} else {
+					checkbox.disable();
+					container.classList.add('disabled');
+				}
 			}
 		}));
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
index 70ca83aef277..151748f2124a 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
@@ -108,6 +108,10 @@
 	cursor: pointer;
 }
 
+.chat-status-bar-entry-tooltip .settings .setting.disabled .setting-label {
+	color: var(--vscode-disabledForeground);
+}
+
 /* Shortcuts */
 
 .chat-status-bar-entry-tooltip .shortcuts {

From 7a5dc239516a8953105da34f84bae152421a8886 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Tue, 11 Mar 2025 13:57:04 +0100
Subject: [PATCH 0767/1815] Hover Identity check not working (#243164)

hover identity never the same
---
 .../services/hoverService/hoverService.ts     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/vs/editor/browser/services/hoverService/hoverService.ts b/src/vs/editor/browser/services/hoverService/hoverService.ts
index 3949c56e5069..beed982c6656 100644
--- a/src/vs/editor/browser/services/hoverService/hoverService.ts
+++ b/src/vs/editor/browser/services/hoverService/hoverService.ts
@@ -186,6 +186,16 @@ export class HoverService extends Disposable implements IHoverService {
 		if (this._currentHover?.isLocked) {
 			return undefined;
 		}
+
+		// Set `id` to default if it's undefined
+		if (options.id === undefined) {
+			options.id = isHTMLElement(options.content)
+				? undefined
+				: typeof options.content === 'string'
+					? options.content.toString()
+					: options.content.value;
+		}
+
 		if (getHoverOptionsIdentity(this._currentHoverOptions) === getHoverOptionsIdentity(options)) {
 			return undefined;
 		}
@@ -204,15 +214,6 @@ export class HoverService extends Disposable implements IHoverService {
 			}
 		}
 
-		// Set `id` to default if it's undefined
-		if (options.id === undefined) {
-			options.id = isHTMLElement(options.content)
-				? undefined
-				: typeof options.content === 'string'
-					? options.content.toString()
-					: options.content.value;
-		}
-
 		const hoverDisposables = new DisposableStore();
 		const hover = this._instantiationService.createInstance(HoverWidget, options);
 		if (options.persistence?.sticky) {

From 66e5b8b2be44cf892145da0bd361a51594c2b71e Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Tue, 11 Mar 2025 14:48:52 +0100
Subject: [PATCH 0768/1815] #243073 adopt to /latest API from Marketplace
 (#243193)

---
 .../common/extensionGalleryService.ts         | 172 +++++++++++++-----
 1 file changed, 124 insertions(+), 48 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
index c9dce9515892..7e64c57499d8 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
@@ -630,7 +630,8 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 
 	private readonly extensionsGalleryUrl: string | undefined;
 	private readonly extensionsControlUrl: string | undefined;
-	private readonly extensionUrlTemplate: string | undefined;
+	private readonly extensionsGalleryResourceApi: string | undefined;
+	private readonly unpkgResourceApi: string | undefined;
 
 	private readonly commonHeadersPromise: Promise<IHeaders>;
 	private readonly extensionsEnabledWithApiProposalVersion: string[];
@@ -650,7 +651,8 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		const config = productService.extensionsGallery;
 		this.extensionsGalleryUrl = config?.serviceUrl;
 		this.extensionsControlUrl = config?.controlUrl;
-		this.extensionUrlTemplate = config?.extensionUrlTemplate;
+		this.extensionsGalleryResourceApi = this.extensionsGalleryUrl ? `${this.extensionsGalleryUrl}${'/vscode/{publisher}/{name}/latest'}` : undefined;
+		this.unpkgResourceApi = config?.extensionUrlTemplate;
 		this.extensionsEnabledWithApiProposalVersion = productService.extensionsEnabledWithApiProposalVersion?.map(id => id.toLowerCase()) ?? [];
 		this.commonHeadersPromise = resolveMarketplaceHeaders(
 			productService.version,
@@ -680,9 +682,9 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		const options = CancellationToken.isCancellationToken(arg1) ? {} : arg1 as IExtensionQueryOptions;
 		const token = CancellationToken.isCancellationToken(arg1) ? arg1 : arg2 as CancellationToken;
 
-		const useResourceApi = options.preferResourceApi && (this.configurationService.getValue(UseUnpkgResourceApiConfigKey) ?? false);
-		const result = useResourceApi
-			? await this.getExtensionsUsingResourceApi(extensionInfos, options, token)
+		const resourceApi = (options.preferResourceApi && (this.configurationService.getValue(UseUnpkgResourceApiConfigKey) ?? false)) ? await this.getResourceApi() : undefined;
+		const result = resourceApi
+			? await this.getExtensionsUsingResourceApi(extensionInfos, options, resourceApi, token)
 			: await this.getExtensionsUsingQueryApi(extensionInfos, options, token);
 
 		const uuids = result.map(r => r.identifier.uuid);
@@ -712,6 +714,34 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		return result;
 	}
 
+	private async getResourceApi(): Promise<{ uri: string; fallback?: string } | undefined> {
+		if (!this.extensionsGalleryResourceApi) {
+			return undefined;
+		}
+
+		if (this.productService.quality !== 'stable') {
+			return {
+				uri: this.extensionsGalleryResourceApi,
+				fallback: this.unpkgResourceApi
+			};
+		}
+
+		const value = await this.assignmentService?.getTreatment<'unpkg' | 'marketplace' | 'none'>('extensions.gallery.useResourceApi') ?? 'unpkg';
+
+		if (value === 'marketplace') {
+			return {
+				uri: this.extensionsGalleryResourceApi,
+				fallback: this.unpkgResourceApi
+			};
+		}
+
+		if (value === 'unpkg' && this.unpkgResourceApi) {
+			return { uri: this.unpkgResourceApi };
+		}
+
+		return undefined;
+	}
+
 	private async getExtensionsUsingQueryApi(extensionInfos: ReadonlyArray<IExtensionInfo>, options: IExtensionQueryOptions, token: CancellationToken): Promise<IGalleryExtension[]> {
 		const names: string[] = [],
 			ids: string[] = [],
@@ -770,49 +800,35 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		return extensions;
 	}
 
-	private async getExtensionsUsingResourceApi(extensionInfos: ReadonlyArray<IExtensionInfo>, options: IExtensionQueryOptions, token: CancellationToken): Promise<IGalleryExtension[]> {
+	private async getExtensionsUsingResourceApi(extensionInfos: ReadonlyArray<IExtensionInfo>, options: IExtensionQueryOptions, resourceApi: { uri: string; fallback?: string }, token: CancellationToken): Promise<IGalleryExtension[]> {
 
-		const toQuery: IExtensionInfo[] = [];
 		const result: IGalleryExtension[] = [];
+		const toQuery: IExtensionInfo[] = [];
+		const toFetchLatest: IExtensionInfo[] = [];
 
-		await Promise.allSettled(extensionInfos.map(async extensionInfo => {
+		for (const extensionInfo of extensionInfos) {
+			if (!EXTENSION_IDENTIFIER_REGEX.test(extensionInfo.id)) {
+				continue;
+			}
 			if (extensionInfo.version) {
 				toQuery.push(extensionInfo);
-				return;
-			}
-
-			if (!EXTENSION_IDENTIFIER_REGEX.test(extensionInfo.id)) {
-				return;
+			} else {
+				toFetchLatest.push(extensionInfo);
 			}
+		}
 
+		await Promise.allSettled(toFetchLatest.map(async extensionInfo => {
+			let galleryExtension: IGalleryExtension | null | 'NOT_FOUND';
 			try {
-				const rawGalleryExtension = await this.getLatestRawGalleryExtension(extensionInfo.id, token);
-				if (!rawGalleryExtension) {
-					if (extensionInfo.uuid) {
-						toQuery.push(extensionInfo);
+				try {
+					galleryExtension = await this.getLatestGalleryExtension(extensionInfo, options, resourceApi.uri, token);
+				} catch (error) {
+					if (!resourceApi.fallback) {
+						throw error;
 					}
-					return;
-				}
 
-				const allTargetPlatforms = getAllTargetPlatforms(rawGalleryExtension);
-				const rawGalleryExtensionVersion = await this.getRawGalleryExtensionVersion(
-					rawGalleryExtension,
-					{
-						targetPlatform: options.targetPlatform ?? CURRENT_TARGET_PLATFORM,
-						compatible: !!options.compatible,
-						productVersion: options.productVersion ?? {
-							version: this.productService.version,
-							date: this.productService.date
-						},
-						version: extensionInfo.preRelease ? VersionKind.Prerelease : VersionKind.Release
-					}, allTargetPlatforms);
-
-				if (rawGalleryExtensionVersion) {
-					result.push(toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms));
-				}
-
-				// report telemetry
-				else {
+					// fallback to unpkg
+					this.logService.error(`Error while getting the latest version for the extension ${extensionInfo.id} from ${resourceApi.uri}. Trying the fallback ${resourceApi.fallback}`, getErrorMessage(error));
 					this.telemetryService.publicLog2<
 						{
 							extension: string;
@@ -821,32 +837,92 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 						},
 						{
 							owner: 'sandy081';
-							comment: 'Report the fallback to the Marketplace query for fetching extensions';
+							comment: 'Report the fallback to the unpkg service for getting latest extension';
 							extension: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Extension id' };
 							preRelease: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Get pre-release version' };
 							compatible: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Get compatible version' };
-						}>('galleryService:fallbacktoquery', {
+						}>('galleryService:fallbacktounpkg', {
 							extension: extensionInfo.id,
 							preRelease: !!extensionInfo.preRelease,
 							compatible: !!options.compatible
 						});
-					if (!options.compatible || this.allowedExtensionsService.isAllowed({ id: extensionInfo.id, publisherDisplayName: rawGalleryExtension.publisher.displayName }) === true) {
+					galleryExtension = await this.getLatestGalleryExtension(extensionInfo, options, resourceApi.fallback, token);
+				}
+
+				if (galleryExtension === 'NOT_FOUND') {
+					if (extensionInfo.uuid) {
+						// Fallback to query if extension with UUID is not found. Probably extension is renamed.
 						toQuery.push(extensionInfo);
 					}
+					return;
+				}
+
+				if (galleryExtension) {
+					result.push(galleryExtension);
 				}
+
 			} catch (error) {
-				// Skip if there is an error while getting the latest version
+				// fallback to query
 				this.logService.error(`Error while getting the latest version for the extension ${extensionInfo.id}.`, getErrorMessage(error));
+				this.telemetryService.publicLog2<
+					{
+						extension: string;
+						preRelease: boolean;
+						compatible: boolean;
+					},
+					{
+						owner: 'sandy081';
+						comment: 'Report the fallback to the Marketplace query for fetching extensions';
+						extension: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Extension id' };
+						preRelease: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Get pre-release version' };
+						compatible: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Get compatible version' };
+					}>('galleryService:fallbacktoquery', {
+						extension: extensionInfo.id,
+						preRelease: !!extensionInfo.preRelease,
+						compatible: !!options.compatible
+					});
 				toQuery.push(extensionInfo);
 			}
+
 		}));
 
-		const extensions = await this.getExtensionsUsingQueryApi(toQuery, options, token);
-		result.push(...extensions);
+		if (toQuery.length) {
+			const extensions = await this.getExtensionsUsingQueryApi(toQuery, options, token);
+			result.push(...extensions);
+		}
 
 		return result;
 	}
 
+	private async getLatestGalleryExtension(extensionInfo: IExtensionInfo, options: IExtensionQueryOptions, resourceUriTemplate: string, token: CancellationToken): Promise<IGalleryExtension | null | 'NOT_FOUND'> {
+		const [publisher, name] = extensionInfo.id.split('.');
+		const uri = URI.parse(format2(resourceUriTemplate, { publisher, name }));
+		const rawGalleryExtension = await this.getLatestRawGalleryExtension(extensionInfo.id, uri, token);
+
+		if (!rawGalleryExtension) {
+			return 'NOT_FOUND';
+		}
+
+		const allTargetPlatforms = getAllTargetPlatforms(rawGalleryExtension);
+		const rawGalleryExtensionVersion = await this.getRawGalleryExtensionVersion(
+			rawGalleryExtension,
+			{
+				targetPlatform: options.targetPlatform ?? CURRENT_TARGET_PLATFORM,
+				compatible: !!options.compatible,
+				productVersion: options.productVersion ?? {
+					version: this.productService.version,
+					date: this.productService.date
+				},
+				version: extensionInfo.preRelease ? VersionKind.Prerelease : VersionKind.Release
+			}, allTargetPlatforms);
+
+		if (rawGalleryExtensionVersion) {
+			return toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms);
+		}
+
+		return null;
+	}
+
 	async getCompatibleExtension(extension: IGalleryExtension, includePreRelease: boolean, targetPlatform: TargetPlatform, productVersion: IProductVersion = { version: this.productService.version, date: this.productService.date }): Promise<IGalleryExtension | null> {
 		if (isNotWebExtensionInWebTargetPlatform(extension.allTargetPlatforms, targetPlatform)) {
 			return null;
@@ -1349,13 +1425,11 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		}
 	}
 
-	private async getLatestRawGalleryExtension(extensionId: string, token: CancellationToken): Promise<IRawGalleryExtension | null> {
+	private async getLatestRawGalleryExtension(extension: string, uri: URI, token: CancellationToken): Promise<IRawGalleryExtension | null> {
 		let errorCode: string | undefined;
 		const stopWatch = new StopWatch();
 
 		try {
-			const [publisher, name] = extensionId.split('.');
-			const uri = URI.parse(format2(this.extensionUrlTemplate!, { publisher, name }));
 			const commonHeaders = await this.commonHeadersPromise;
 			const headers = {
 				...commonHeaders,
@@ -1406,16 +1480,18 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			type GalleryServiceGetLatestEventClassification = {
 				owner: 'sandy081';
 				comment: 'Report the query to the Marketplace for fetching latest version of an extension';
+				host: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The host of the end point' };
 				extension: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The identifier of the extension' };
 				duration: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; isMeasurement: true; comment: 'Duration in ms for the query' };
 				errorCode?: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'The error code in case of error' };
 			};
 			type GalleryServiceGetLatestEvent = {
 				extension: string;
+				host: string;
 				duration: number;
 				errorCode?: string;
 			};
-			this.telemetryService.publicLog2<GalleryServiceGetLatestEvent, GalleryServiceGetLatestEventClassification>('galleryService:getLatest', { extension: extensionId, duration: stopWatch.elapsed(), errorCode });
+			this.telemetryService.publicLog2<GalleryServiceGetLatestEvent, GalleryServiceGetLatestEventClassification>('galleryService:getLatest', { extension, host: uri.authority, duration: stopWatch.elapsed(), errorCode });
 		}
 	}
 

From cb447008b7b209ea1ce8d58a7d6dab4a9525cc69 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Tue, 11 Mar 2025 06:49:34 -0700
Subject: [PATCH 0769/1815] Add locate si path to --help

I put this in troubleshooting as it doesn't fit well in 'Options' and
it makes it harder to read as it's a long arg name.

Fixes #243057
---
 src/vs/platform/environment/node/argv.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
index 7ac132ae5cdf..b4e76a58f3f4 100644
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -125,6 +125,7 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'disable-gpu': { type: 'boolean', cat: 't', description: localize('disableGPU', "Disable GPU hardware acceleration.") },
 	'disable-chromium-sandbox': { type: 'boolean', cat: 't', description: localize('disableChromiumSandbox', "Use this option only when there is requirement to launch the application as sudo user on Linux or when running as an elevated user in an applocker environment on Windows.") },
 	'sandbox': { type: 'boolean' },
+	'locate-shell-integration-path': { type: 'string', cat: 't', args: ['shell'], description: localize('locateShellIntegrationPath', "Print the path to a terminal shell integration script. Allowed values are 'bash', 'pwsh', 'zsh' or 'fish'.") },
 	'telemetry': { type: 'boolean', cat: 't', description: localize('telemetry', "Shows all telemetry events which VS code collects.") },
 
 	'remote': { type: 'string', allowEmptyValue: true },
@@ -179,7 +180,6 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'__enable-file-policy': { type: 'boolean' },
 	'editSessionId': { type: 'string' },
 	'continueOn': { type: 'string' },
-	'locate-shell-integration-path': { type: 'string', args: ['bash', 'pwsh', 'zsh', 'fish'] },
 
 	'enable-coi': { type: 'boolean' },
 

From 0e6e6d2bffdaf3baaea2bd501294ef85a29aac9c Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 11 Mar 2025 15:32:59 +0100
Subject: [PATCH 0770/1815] debt - prepare for property initialisation order
 changes #243049 (#243184)

* debt - prepare for property initialisation order changes #243049

* missing

* omg?
---
 build/lib/propertyInitOrderChecker.js         | 40 +---------
 build/lib/propertyInitOrderChecker.ts         | 40 +---------
 .../contextview/browser/contextViewService.ts |  4 +-
 .../api/browser/mainThreadWorkspace.ts        |  3 +-
 .../parts/editor/editorGroupWatermark.ts      |  7 +-
 .../browser/parts/editor/editorPanes.ts       |  8 +-
 .../browser/parts/editor/editorPart.ts        |  4 +-
 .../browser/parts/editor/editorParts.ts       |  7 +-
 .../browser/parts/editor/editorStatus.ts      | 12 ++-
 .../browser/parts/editor/sideBySideEditor.ts  |  4 +-
 .../notifications/notificationsCenter.ts      |  4 +-
 .../notifications/notificationsToasts.ts      |  8 +-
 .../browser/parts/statusbar/statusbarPart.ts  | 72 +++++++++--------
 .../browser/parts/titlebar/titlebarPart.ts    | 15 ++--
 .../common/editor/diffEditorInput.ts          | 20 ++---
 .../common/editor/sideBySideEditorInput.ts    |  4 +-
 .../chat/common/chatEntitlementService.ts     | 60 +++++++++------
 .../contrib/chat/common/voiceChatService.ts   |  8 +-
 .../browser/dictation/editorDictation.ts      | 13 ++--
 .../editors/textFileSaveErrorHandler.ts       |  8 +-
 .../contrib/speech/browser/speechService.ts   | 14 ++--
 src/vs/workbench/electron-sandbox/window.ts   |  4 +-
 .../diskFileSystemProvider.ts                 |  6 +-
 .../common/filesConfigurationService.ts       |  8 +-
 .../history/browser/historyService.ts         | 77 ++++++++++++-------
 .../electron-sandbox/nativeHostService.ts     | 20 +++--
 .../electron-sandbox/integrityService.ts      | 17 ++--
 .../common/notificationService.ts             |  4 +-
 .../textfile/browser/textFileService.ts       |  9 ++-
 .../textfile/common/textFileEditorModel.ts    |  7 +-
 .../common/textFileEditorModelManager.ts      |  4 +-
 .../common/untitledTextEditorModel.ts         |  4 +-
 .../common/untitledFileWorkingCopy.ts         |  7 +-
 .../common/workingCopyBackupTracker.ts        |  4 +-
 .../common/workingCopyFileService.ts          |  9 ++-
 .../parts/editor/editorGroupModel.test.ts     |  4 +-
 .../editor/filteredEditorGroupModel.test.ts   |  3 +-
 .../test/browser/workbenchTestServices.ts     | 26 ++++---
 .../test/common/workbenchTestServices.ts      |  3 +-
 39 files changed, 315 insertions(+), 256 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index 622bbf2d7ac6..6bcc728f06ef 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -61,10 +61,6 @@ const ignored = new Set([
     'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.ts',
     'vs/editor/common/model/textModelTokens.ts',
     'vs/editor/common/model/tokenizationTextModelPart.ts',
-    'vs/workbench/common/editor/sideBySideEditorInput.ts',
-    'vs/workbench/services/untitled/common/untitledTextEditorModel.ts',
-    'vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts',
-    'vs/workbench/services/workingCopy/common/workingCopyFileService.ts',
     'vs/editor/common/core/textEdit.ts',
     'vs/workbench/contrib/debug/common/debugStorage.ts',
     'vs/workbench/contrib/debug/common/debugModel.ts',
@@ -92,7 +88,6 @@ const ignored = new Set([
     'vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts',
-    'vs/platform/contextview/browser/contextViewService.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.ts',
@@ -108,14 +103,7 @@ const ignored = new Set([
     'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts',
     'vs/editor/contrib/placeholderText/browser/placeholderTextContribution.ts',
     'vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.ts',
-    'vs/workbench/browser/parts/statusbar/statusbarPart.ts',
     'vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts',
-    'vs/workbench/contrib/chat/common/chatEntitlementService.ts',
-    'vs/workbench/browser/parts/editor/sideBySideEditor.ts',
-    'vs/workbench/common/editor/diffEditorInput.ts',
-    'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.ts',
-    'vs/workbench/browser/parts/editor/editorPanes.ts',
-    'vs/workbench/browser/parts/editor/editorGroupWatermark.ts',
     'vs/workbench/contrib/files/browser/views/openEditorsView.ts',
     'vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts',
     'vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts',
@@ -127,23 +115,13 @@ const ignored = new Set([
     'vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.ts',
     'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts',
     'vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts',
-    'vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.ts',
     'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts',
     'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts',
     'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.ts',
     'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts',
     'vs/platform/terminal/common/capabilities/commandDetectionCapability.ts',
-    'vs/workbench/api/browser/mainThreadWorkspace.ts',
-    'vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.ts',
     'vs/workbench/contrib/testing/common/testExclusions.ts',
     'vs/workbench/contrib/testing/common/testResultStorage.ts',
-    'vs/workbench/browser/parts/titlebar/titlebarPart.ts',
-    'vs/workbench/browser/parts/editor/editorStatus.ts',
-    'vs/workbench/browser/parts/editor/editorPart.ts',
-    'vs/workbench/browser/parts/editor/editorParts.ts',
-    'vs/workbench/services/textfile/common/textFileEditorModel.ts',
-    'vs/workbench/services/history/browser/historyService.ts',
-    'vs/workbench/services/notification/common/notificationService.ts',
     'vs/workbench/services/userDataProfile/browser/snippetsResource.ts',
     'vs/platform/quickinput/browser/quickInputController.ts',
     'vs/platform/userDataSync/common/abstractSynchronizer.ts',
@@ -155,10 +133,8 @@ const ignored = new Set([
     'vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts',
     'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.ts',
     'vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor.ts',
-    'vs/workbench/contrib/speech/browser/speechService.ts',
     'vs/workbench/contrib/chat/common/promptSyntax/contentProviders/textModelContentsProvider.ts',
     'vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.ts',
-    'vs/workbench/contrib/chat/common/voiceChatService.ts',
     'vs/workbench/contrib/search/common/cacheState.ts',
     'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts',
     'vs/workbench/contrib/search/browser/anythingQuickAccess.ts',
@@ -186,28 +162,14 @@ const ignored = new Set([
     'vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts',
     'vs/workbench/contrib/accessibilitySignals/browser/editorTextPropertySignalsContribution.ts',
     'vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts',
-    'vs/workbench/browser/parts/notifications/notificationsCenter.ts',
-    'vs/workbench/browser/parts/notifications/notificationsToasts.ts',
-    'vs/workbench/services/textfile/common/textFileEditorModelManager.ts',
-    'vs/workbench/services/textfile/browser/textFileService.ts',
     'vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts',
-    'vs/workbench/services/workingCopy/common/workingCopyBackupTracker.ts',
     'vs/workbench/contrib/welcomeDialog/browser/welcomeWidget.ts',
-    'vs/workbench/electron-sandbox/window.ts',
-    'vs/workbench/services/files/electron-sandbox/diskFileSystemProvider.ts',
-    'vs/code/electron-utility/sharedProcess/contrib/languagePackCachedDataCleaner.ts',
     'vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordInsertView.ts',
     'vs/platform/terminal/node/ptyService.ts',
-    'vs/workbench/services/host/electron-sandbox/nativeHostService.ts',
-    'vs/workbench/services/integrity/electron-sandbox/integrityService.ts',
     'vs/workbench/api/common/extHostLanguageFeatures.ts',
     'vs/workbench/api/common/extHostSearch.ts',
-    'vs/workbench/test/common/workbenchTestServices.ts',
-    'vs/workbench/test/browser/workbenchTestServices.ts',
-    'vs/workbench/contrib/testing/test/common/testStubs.ts',
-    'vs/workbench/test/browser/parts/editor/editorGroupModel.test.ts',
-    'vs/workbench/test/browser/parts/editor/filteredEditorGroupModel.test.ts',
+    'vs/workbench/contrib/testing/test/common/testStubs.ts'
 ]);
 const cancellationToken = {
     isCancellationRequested: () => false,
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index 17cc0c1eb310..78dc22e4002c 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -30,10 +30,6 @@ const ignored = new Set([
 	'vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.ts',
 	'vs/editor/common/model/textModelTokens.ts',
 	'vs/editor/common/model/tokenizationTextModelPart.ts',
-	'vs/workbench/common/editor/sideBySideEditorInput.ts',
-	'vs/workbench/services/untitled/common/untitledTextEditorModel.ts',
-	'vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts',
-	'vs/workbench/services/workingCopy/common/workingCopyFileService.ts',
 	'vs/editor/common/core/textEdit.ts',
 	'vs/workbench/contrib/debug/common/debugStorage.ts',
 	'vs/workbench/contrib/debug/common/debugModel.ts',
@@ -61,7 +57,6 @@ const ignored = new Set([
 	'vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts',
-	'vs/platform/contextview/browser/contextViewService.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.ts',
@@ -77,14 +72,7 @@ const ignored = new Set([
 	'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts',
 	'vs/editor/contrib/placeholderText/browser/placeholderTextContribution.ts',
 	'vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.ts',
-	'vs/workbench/browser/parts/statusbar/statusbarPart.ts',
 	'vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts',
-	'vs/workbench/contrib/chat/common/chatEntitlementService.ts',
-	'vs/workbench/browser/parts/editor/sideBySideEditor.ts',
-	'vs/workbench/common/editor/diffEditorInput.ts',
-	'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.ts',
-	'vs/workbench/browser/parts/editor/editorPanes.ts',
-	'vs/workbench/browser/parts/editor/editorGroupWatermark.ts',
 	'vs/workbench/contrib/files/browser/views/openEditorsView.ts',
 	'vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.ts',
 	'vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts',
@@ -96,23 +84,13 @@ const ignored = new Set([
 	'vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.ts',
 	'vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts',
 	'vs/workbench/contrib/mergeEditor/browser/view/viewModel.ts',
-	'vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.ts',
 	'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts',
 	'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts',
 	'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.ts',
 	'vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts',
 	'vs/platform/terminal/common/capabilities/commandDetectionCapability.ts',
-	'vs/workbench/api/browser/mainThreadWorkspace.ts',
-	'vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.ts',
 	'vs/workbench/contrib/testing/common/testExclusions.ts',
 	'vs/workbench/contrib/testing/common/testResultStorage.ts',
-	'vs/workbench/browser/parts/titlebar/titlebarPart.ts',
-	'vs/workbench/browser/parts/editor/editorStatus.ts',
-	'vs/workbench/browser/parts/editor/editorPart.ts',
-	'vs/workbench/browser/parts/editor/editorParts.ts',
-	'vs/workbench/services/textfile/common/textFileEditorModel.ts',
-	'vs/workbench/services/history/browser/historyService.ts',
-	'vs/workbench/services/notification/common/notificationService.ts',
 	'vs/workbench/services/userDataProfile/browser/snippetsResource.ts',
 	'vs/platform/quickinput/browser/quickInputController.ts',
 	'vs/platform/userDataSync/common/abstractSynchronizer.ts',
@@ -124,10 +102,8 @@ const ignored = new Set([
 	'vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.ts',
 	'vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.ts',
 	'vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor.ts',
-	'vs/workbench/contrib/speech/browser/speechService.ts',
 	'vs/workbench/contrib/chat/common/promptSyntax/contentProviders/textModelContentsProvider.ts',
 	'vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.ts',
-	'vs/workbench/contrib/chat/common/voiceChatService.ts',
 	'vs/workbench/contrib/search/common/cacheState.ts',
 	'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.ts',
 	'vs/workbench/contrib/search/browser/anythingQuickAccess.ts',
@@ -155,28 +131,14 @@ const ignored = new Set([
 	'vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts',
 	'vs/workbench/contrib/accessibilitySignals/browser/editorTextPropertySignalsContribution.ts',
 	'vs/workbench/contrib/inlineCompletions/browser/inlineCompletionLanguageStatusBarContribution.ts',
-	'vs/workbench/browser/parts/notifications/notificationsCenter.ts',
-	'vs/workbench/browser/parts/notifications/notificationsToasts.ts',
-	'vs/workbench/services/textfile/common/textFileEditorModelManager.ts',
-	'vs/workbench/services/textfile/browser/textFileService.ts',
 	'vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts',
-	'vs/workbench/services/workingCopy/common/workingCopyBackupTracker.ts',
 	'vs/workbench/contrib/welcomeDialog/browser/welcomeWidget.ts',
-	'vs/workbench/electron-sandbox/window.ts',
-	'vs/workbench/services/files/electron-sandbox/diskFileSystemProvider.ts',
-	'vs/code/electron-utility/sharedProcess/contrib/languagePackCachedDataCleaner.ts',
 	'vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordInsertView.ts',
 	'vs/platform/terminal/node/ptyService.ts',
-	'vs/workbench/services/host/electron-sandbox/nativeHostService.ts',
-	'vs/workbench/services/integrity/electron-sandbox/integrityService.ts',
 	'vs/workbench/api/common/extHostLanguageFeatures.ts',
 	'vs/workbench/api/common/extHostSearch.ts',
-	'vs/workbench/test/common/workbenchTestServices.ts',
-	'vs/workbench/test/browser/workbenchTestServices.ts',
-	'vs/workbench/contrib/testing/test/common/testStubs.ts',
-	'vs/workbench/test/browser/parts/editor/editorGroupModel.test.ts',
-	'vs/workbench/test/browser/parts/editor/filteredEditorGroupModel.test.ts',
+	'vs/workbench/contrib/testing/test/common/testStubs.ts'
 ]);
 
 
diff --git a/src/vs/platform/contextview/browser/contextViewService.ts b/src/vs/platform/contextview/browser/contextViewService.ts
index 4ee1349dcce9..734a1f326034 100644
--- a/src/vs/platform/contextview/browser/contextViewService.ts
+++ b/src/vs/platform/contextview/browser/contextViewService.ts
@@ -12,13 +12,15 @@ import { getWindow } from '../../../base/browser/dom.js';
 export class ContextViewHandler extends Disposable implements IContextViewProvider {
 
 	private openContextView: IOpenContextView | undefined;
-	protected readonly contextView = this._register(new ContextView(this.layoutService.mainContainer, ContextViewDOMPosition.ABSOLUTE));
+	protected readonly contextView: ContextView;
 
 	constructor(
 		@ILayoutService private readonly layoutService: ILayoutService
 	) {
 		super();
 
+		this.contextView = this._register(new ContextView(this.layoutService.mainContainer, ContextViewDOMPosition.ABSOLUTE));
+
 		this.layout();
 		this._register(layoutService.onDidLayoutContainer(() => this.layout()));
 	}
diff --git a/src/vs/workbench/api/browser/mainThreadWorkspace.ts b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
index dae04c793583..89b4f98c69e1 100644
--- a/src/vs/workbench/api/browser/mainThreadWorkspace.ts
+++ b/src/vs/workbench/api/browser/mainThreadWorkspace.ts
@@ -39,7 +39,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 	private readonly _toDispose = new DisposableStore();
 	private readonly _activeCancelTokens: { [id: number]: CancellationTokenSource } = Object.create(null);
 	private readonly _proxy: ExtHostWorkspaceShape;
-	private readonly _queryBuilder = this._instantiationService.createInstance(QueryBuilder);
+	private readonly _queryBuilder: QueryBuilder;
 
 	constructor(
 		extHostContext: IExtHostContext,
@@ -59,6 +59,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
 		@IWorkspaceTrustRequestService private readonly _workspaceTrustRequestService: IWorkspaceTrustRequestService,
 		@ITextFileService private readonly _textFileService: ITextFileService,
 	) {
+		this._queryBuilder = this._instantiationService.createInstance(QueryBuilder);
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostWorkspace);
 		const workspace = this._contextService.getWorkspace();
 		// The workspace file is provided be a unknown file system provider. It might come
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts b/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts
index 541b7ab1b90d..2e6d68d514af 100644
--- a/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts
+++ b/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts
@@ -73,14 +73,14 @@ export class EditorGroupWatermark extends Disposable {
 
 	private static readonly CACHED_WHEN = 'editorGroupWatermark.whenConditions';
 
-	private readonly cachedWhen: { [when: string]: boolean } = this.storageService.getObject(EditorGroupWatermark.CACHED_WHEN, StorageScope.PROFILE, Object.create(null));
+	private readonly cachedWhen: { [when: string]: boolean };
 
 	private readonly shortcuts: HTMLElement;
 	private readonly transientDisposables = this._register(new DisposableStore());
 	private readonly keybindingLabels = this._register(new DisposableStore());
 
 	private enabled = false;
-	private workbenchState = this.contextService.getWorkbenchState();
+	private workbenchState: WorkbenchState;
 
 	constructor(
 		container: HTMLElement,
@@ -92,6 +92,9 @@ export class EditorGroupWatermark extends Disposable {
 	) {
 		super();
 
+		this.cachedWhen = this.storageService.getObject(EditorGroupWatermark.CACHED_WHEN, StorageScope.PROFILE, Object.create(null));
+		this.workbenchState = this.contextService.getWorkbenchState();
+
 		const elements = h('.editor-group-watermark', [
 			h('.letterpress'),
 			h('.shortcuts@shortcuts'),
diff --git a/src/vs/workbench/browser/parts/editor/editorPanes.ts b/src/vs/workbench/browser/parts/editor/editorPanes.ts
index 89c9f8c92437..0bbe03002a16 100644
--- a/src/vs/workbench/browser/parts/editor/editorPanes.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPanes.ts
@@ -87,9 +87,11 @@ export class EditorPanes extends Disposable {
 	private readonly mapEditorPaneToPendingSetInput = new Map<EditorPane, Promise<void>>();
 
 	private readonly activeEditorPaneDisposables = this._register(new DisposableStore());
+
 	private pagePosition: IDomNodePagePosition | undefined;
 	private boundarySashes: IBoundarySashes | undefined;
-	private readonly editorOperation = this._register(new LongRunningOperation(this.editorProgressService));
+
+	private readonly editorOperation: LongRunningOperation;
 	private readonly editorPanesRegistry = Registry.as<IEditorPaneRegistry>(EditorExtensions.EditorPane);
 
 	constructor(
@@ -98,7 +100,7 @@ export class EditorPanes extends Disposable {
 		private readonly groupView: IEditorGroupView,
 		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IEditorProgressService private readonly editorProgressService: IEditorProgressService,
+		@IEditorProgressService editorProgressService: IEditorProgressService,
 		@IWorkspaceTrustManagementService private readonly workspaceTrustService: IWorkspaceTrustManagementService,
 		@ILogService private readonly logService: ILogService,
 		@IDialogService private readonly dialogService: IDialogService,
@@ -106,6 +108,8 @@ export class EditorPanes extends Disposable {
 	) {
 		super();
 
+		this.editorOperation = this._register(new LongRunningOperation(editorProgressService));
+
 		this.registerListeners();
 	}
 
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
index 0875886e68bf..c3a6d7eb29ce 100644
--- a/src/vs/workbench/browser/parts/editor/editorPart.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -170,6 +170,8 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 	) {
 		super(id, { hasTitle: false }, themeService, storageService, layoutService);
 
+		this._partOptions = getEditorPartOptions(this.configurationService, this.themeService);
+
 		this.registerListeners();
 	}
 
@@ -200,7 +202,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupsView {
 
 	private enforcedPartOptions: DeepPartial<IEditorPartOptions>[] = [];
 
-	private _partOptions = getEditorPartOptions(this.configurationService, this.themeService);
+	private _partOptions: IEditorPartOptions;
 	get partOptions(): IEditorPartOptions { return this._partOptions; }
 
 	enforcePartOptions(options: DeepPartial<IEditorPartOptions>): IDisposable {
diff --git a/src/vs/workbench/browser/parts/editor/editorParts.ts b/src/vs/workbench/browser/parts/editor/editorParts.ts
index 5d8dd28ea474..14daf210d0c4 100644
--- a/src/vs/workbench/browser/parts/editor/editorParts.ts
+++ b/src/vs/workbench/browser/parts/editor/editorParts.ts
@@ -44,9 +44,9 @@ export class EditorParts extends MultiWindowParts<EditorPart> implements IEditor
 
 	declare readonly _serviceBrand: undefined;
 
-	readonly mainPart = this._register(this.createMainEditorPart());
+	readonly mainPart: MainEditorPart;
 
-	private mostRecentActiveParts = [this.mainPart];
+	private mostRecentActiveParts: MainEditorPart[];
 
 	constructor(
 		@IInstantiationService protected readonly instantiationService: IInstantiationService,
@@ -57,8 +57,11 @@ export class EditorParts extends MultiWindowParts<EditorPart> implements IEditor
 	) {
 		super('workbench.editorParts', themeService, storageService);
 
+		this.mainPart = this._register(this.createMainEditorPart());
 		this._register(this.registerPart(this.mainPart));
 
+		this.mostRecentActiveParts = [this.mainPart];
+
 		this.restoreParts();
 		this.registerListeners();
 	}
diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index 1b5c562771cf..52c6462f7618 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -353,9 +353,9 @@ class EditorStatus extends Disposable {
 	private readonly languageElement = this._register(new MutableDisposable<IStatusbarEntryAccessor>());
 	private readonly metadataElement = this._register(new MutableDisposable<IStatusbarEntryAccessor>());
 
-	private readonly currentMarkerStatus = this._register(this.instantiationService.createInstance(ShowCurrentMarkerInStatusbarContribution));
-	private readonly tabFocusMode = this._register(this.instantiationService.createInstance(TabFocusMode));
-	private readonly inputMode = this._register(this.instantiationService.createInstance(StatusInputMode));
+	private readonly currentMarkerStatus: ShowCurrentMarkerInStatusbarContribution;
+	private readonly tabFocusMode: TabFocusMode;
+	private readonly inputMode: StatusInputMode;
 
 	private readonly state = new State();
 	private toRender: StateChange | undefined = undefined;
@@ -370,11 +370,15 @@ class EditorStatus extends Disposable {
 		@ILanguageService private readonly languageService: ILanguageService,
 		@ITextFileService private readonly textFileService: ITextFileService,
 		@IStatusbarService private readonly statusbarService: IStatusbarService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IInstantiationService instantiationService: IInstantiationService,
 		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		super();
 
+		this.currentMarkerStatus = this._register(instantiationService.createInstance(ShowCurrentMarkerInStatusbarContribution));
+		this.tabFocusMode = this._register(instantiationService.createInstance(TabFocusMode));
+		this.inputMode = this._register(instantiationService.createInstance(StatusInputMode));
+
 		this.registerCommands();
 		this.registerListeners();
 	}
diff --git a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
index b373fd8b0518..691a716cba62 100644
--- a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts
@@ -116,7 +116,7 @@ export class SideBySideEditor extends AbstractEditorWithViewState<ISideBySideEdi
 	private readonly splitviewDisposables = this._register(new DisposableStore());
 	private readonly editorDisposables = this._register(new DisposableStore());
 
-	private orientation = this.configurationService.getValue<'vertical' | 'horizontal'>(SideBySideEditor.SIDE_BY_SIDE_LAYOUT_SETTING) === 'vertical' ? Orientation.VERTICAL : Orientation.HORIZONTAL;
+	private orientation: Orientation;
 	private dimension = new Dimension(0, 0);
 
 	private lastFocusedSide: Side.PRIMARY | Side.SECONDARY | undefined = undefined;
@@ -134,6 +134,8 @@ export class SideBySideEditor extends AbstractEditorWithViewState<ISideBySideEdi
 	) {
 		super(SideBySideEditor.ID, group, SideBySideEditor.VIEW_STATE_PREFERENCE_KEY, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorService, editorGroupService);
 
+		this.orientation = this.configurationService.getValue<'vertical' | 'horizontal'>(SideBySideEditor.SIDE_BY_SIDE_LAYOUT_SETTING) === 'vertical' ? Orientation.VERTICAL : Orientation.HORIZONTAL;
+
 		this.registerListeners();
 	}
 
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
index d0ad9d533b81..103e37a3019c 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsCenter.ts
@@ -45,7 +45,7 @@ export class NotificationsCenter extends Themable implements INotificationsCente
 	private notificationsList: NotificationsList | undefined;
 	private _isVisible: boolean | undefined;
 	private workbenchDimensions: Dimension | undefined;
-	private readonly notificationsCenterVisibleContextKey = NotificationsCenterVisibleContext.bindTo(this.contextKeyService);
+	private readonly notificationsCenterVisibleContextKey;
 	private clearAllAction: ClearAllNotificationsAction | undefined;
 	private configureDoNotDisturbAction: ConfigureDoNotDisturbAction | undefined;
 
@@ -55,7 +55,7 @@ export class NotificationsCenter extends Themable implements INotificationsCente
 		@IThemeService themeService: IThemeService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IContextKeyService contextKeyService: IContextKeyService,
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@INotificationService private readonly notificationService: INotificationService,
diff --git a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
index aa20ba8de9e6..3a02bb871932 100644
--- a/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
+++ b/src/vs/workbench/browser/parts/notifications/notificationsToasts.ts
@@ -17,7 +17,7 @@ import { IThemeService, Themable } from '../../../../platform/theme/common/theme
 import { widgetShadow } from '../../../../platform/theme/common/colorRegistry.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { INotificationsToastController } from './notificationsCommands.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { Severity, NotificationsFilter, NotificationPriority } from '../../../../platform/notification/common/notification.js';
 import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
 import { ILifecycleService, LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
@@ -71,7 +71,7 @@ export class NotificationsToasts extends Themable implements INotificationsToast
 	private readonly mapNotificationToToast = new Map<INotificationViewItem, INotificationToast>();
 	private readonly mapNotificationToDisposable = new Map<INotificationViewItem, IDisposable>();
 
-	private readonly notificationsToastsVisibleContextKey = NotificationsToastsVisibleContext.bindTo(this.contextKeyService);
+	private readonly notificationsToastsVisibleContextKey: IContextKey<boolean>;
 
 	private readonly addedToastsIntervalCounter = new IntervalCounter(NotificationsToasts.SPAM_PROTECTION.interval);
 
@@ -82,12 +82,14 @@ export class NotificationsToasts extends Themable implements INotificationsToast
 		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService,
 		@IThemeService themeService: IThemeService,
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IContextKeyService contextKeyService: IContextKeyService,
 		@ILifecycleService private readonly lifecycleService: ILifecycleService,
 		@IHostService private readonly hostService: IHostService
 	) {
 		super(themeService);
 
+		this.notificationsToastsVisibleContextKey = NotificationsToastsVisibleContext.bindTo(contextKeyService);
+
 		this.registerListeners();
 	}
 
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index 357bf1d39776..2e6ce3bc4a2c 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -133,9 +133,9 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 
 	private pendingEntries: IPendingStatusbarEntry[] = [];
 
-	private readonly viewModel = this._register(new StatusbarViewModel(this.storageService));
+	private readonly viewModel: StatusbarViewModel;
 
-	readonly onDidChangeEntryVisibility = this.viewModel.onDidChangeEntryVisibility;
+	readonly onDidChangeEntryVisibility: Event<{ id: string; visible: boolean }>;
 
 	private readonly _onWillDispose = this._register(new Emitter<void>());
 	readonly onWillDispose = this._onWillDispose.event;
@@ -146,31 +146,7 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 	private leftItemsContainer: HTMLElement | undefined;
 	private rightItemsContainer: HTMLElement | undefined;
 
-	private readonly hoverDelegate = this._register(this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', {
-		instantHover: true,
-		dynamicDelay(content) {
-			if (
-				typeof content === 'function' ||
-				isHTMLElement(content) ||
-				(isManagedHoverTooltipMarkdownString(content) && typeof content.markdown === 'function') ||
-				isManagedHoverTooltipHTMLElement(content)
-			) {
-				// override the delay for content that is rich (e.g. html or long running)
-				// so that it appears more instantly. these hovers carry more important
-				// information and should not be delayed by preference.
-				return 500;
-			}
-
-			return undefined;
-		}
-	}, (_, focus?: boolean) => (
-		{
-			persistence: {
-				hideOnKeyDown: true,
-				sticky: focus
-			}
-		}
-	)));
+	private readonly hoverDelegate: WorkbenchHoverDelegate;
 
 	private readonly compactEntriesDisposable = this._register(new MutableDisposable<DisposableStore>());
 	private readonly styleOverrides = new Set<IStatusbarStyleOverride>();
@@ -180,13 +156,42 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IThemeService themeService: IThemeService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
-		@IStorageService private readonly storageService: IStorageService,
+		@IStorageService storageService: IStorageService,
 		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 	) {
 		super(id, { hasTitle: false }, themeService, storageService, layoutService);
 
+		this.viewModel = this._register(new StatusbarViewModel(storageService));
+		this.onDidChangeEntryVisibility = this.viewModel.onDidChangeEntryVisibility;
+
+		this.hoverDelegate = this._register(this.instantiationService.createInstance(WorkbenchHoverDelegate, 'element', {
+			instantHover: true,
+			dynamicDelay(content) {
+				if (
+					typeof content === 'function' ||
+					isHTMLElement(content) ||
+					(isManagedHoverTooltipMarkdownString(content) && typeof content.markdown === 'function') ||
+					isManagedHoverTooltipHTMLElement(content)
+				) {
+					// override the delay for content that is rich (e.g. html or long running)
+					// so that it appears more instantly. these hovers carry more important
+					// information and should not be delayed by preference.
+					return 500;
+				}
+
+				return undefined;
+			}
+		}, (_, focus?: boolean) => (
+			{
+				persistence: {
+					hideOnKeyDown: true,
+					sticky: focus
+				}
+			}
+		)));
+
 		this.registerListeners();
 	}
 
@@ -748,7 +753,7 @@ export class StatusbarService extends MultiWindowParts<StatusbarPart> implements
 
 	declare readonly _serviceBrand: undefined;
 
-	readonly mainPart = this._register(this.instantiationService.createInstance(MainStatusbarPart));
+	readonly mainPart: MainStatusbarPart;
 
 	private readonly _onDidCreateAuxiliaryStatusbarPart = this._register(new Emitter<AuxiliaryStatusbarPart>());
 	private readonly onDidCreateAuxiliaryStatusbarPart = this._onDidCreateAuxiliaryStatusbarPart.event;
@@ -760,7 +765,10 @@ export class StatusbarService extends MultiWindowParts<StatusbarPart> implements
 	) {
 		super('workbench.statusBarService', themeService, storageService);
 
+		this.mainPart = this._register(this.instantiationService.createInstance(MainStatusbarPart));
 		this._register(this.registerPart(this.mainPart));
+
+		this.onDidChangeEntryVisibility = this.mainPart.onDidChangeEntryVisibility;
 	}
 
 	//#region Auxiliary Statusbar Parts
@@ -798,7 +806,7 @@ export class StatusbarService extends MultiWindowParts<StatusbarPart> implements
 
 	//#region Service Implementation
 
-	readonly onDidChangeEntryVisibility = this.mainPart.onDidChangeEntryVisibility;
+	readonly onDidChangeEntryVisibility: Event<{ id: string; visible: boolean }>;
 
 	addEntry(entry: IStatusbarEntry, id: string, alignment: StatusbarAlignment, priorityOrLocation: number | IStatusbarEntryLocation | IStatusbarEntryPriority = 0): IStatusbarEntryAccessor {
 		if (entry.showInAllWindows) {
@@ -902,6 +910,8 @@ export class ScopedStatusbarService extends Disposable implements IStatusbarServ
 		@IStatusbarService private readonly statusbarService: IStatusbarService
 	) {
 		super();
+
+		this.onDidChangeEntryVisibility = this.statusbarEntryContainer.onDidChangeEntryVisibility;
 	}
 
 	createAuxiliaryStatusbarPart(container: HTMLElement): IAuxiliaryStatusbarPart {
@@ -916,7 +926,7 @@ export class ScopedStatusbarService extends Disposable implements IStatusbarServ
 		return this.statusbarEntryContainer;
 	}
 
-	readonly onDidChangeEntryVisibility = this.statusbarEntryContainer.onDidChangeEntryVisibility;
+	readonly onDidChangeEntryVisibility: Event<{ id: string; visible: boolean }>;
 
 	addEntry(entry: IStatusbarEntry, id: string, alignment: StatusbarAlignment, priorityOrLocation: number | IStatusbarEntryLocation | IStatusbarEntryPriority = 0): IStatusbarEntryAccessor {
 		return this.statusbarEntryContainer.addEntry(entry, id, alignment, priorityOrLocation);
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 3eb043309444..87fa51d50d85 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -8,7 +8,7 @@ import { localize, localize2 } from '../../../../nls.js';
 import { MultiWindowParts, Part } from '../../part.js';
 import { ITitleService } from '../../../services/title/browser/titleService.js';
 import { getWCOTitlebarAreaRect, getZoomFactor, isWCOEnabled } from '../../../../base/browser/browser.js';
-import { MenuBarVisibility, getTitleBarStyle, getMenuBarVisibility, hasCustomTitlebar, hasNativeTitlebar, DEFAULT_CUSTOM_TITLEBAR_HEIGHT, getWindowControlsStyle, WindowControlsStyle } from '../../../../platform/window/common/window.js';
+import { MenuBarVisibility, getTitleBarStyle, getMenuBarVisibility, hasCustomTitlebar, hasNativeTitlebar, DEFAULT_CUSTOM_TITLEBAR_HEIGHT, getWindowControlsStyle, WindowControlsStyle, TitlebarStyle } from '../../../../platform/window/common/window.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { IConfigurationService, IConfigurationChangeEvent } from '../../../../platform/configuration/common/configuration.js';
@@ -89,7 +89,7 @@ export class BrowserTitleService extends MultiWindowParts<BrowserTitlebarPart> i
 
 	declare _serviceBrand: undefined;
 
-	readonly mainPart = this._register(this.createMainTitlebarPart());
+	readonly mainPart: BrowserTitlebarPart;
 
 	constructor(
 		@IInstantiationService protected readonly instantiationService: IInstantiationService,
@@ -98,6 +98,8 @@ export class BrowserTitleService extends MultiWindowParts<BrowserTitlebarPart> i
 	) {
 		super('workbench.titleService', themeService, storageService);
 
+		this.mainPart = this._register(this.createMainTitlebarPart());
+		this.onMenubarVisibilityChange = this.mainPart.onMenubarVisibilityChange;
 		this._register(this.registerPart(this.mainPart));
 
 		this.registerActions();
@@ -183,7 +185,7 @@ export class BrowserTitleService extends MultiWindowParts<BrowserTitlebarPart> i
 
 	//#region Service Implementation
 
-	readonly onMenubarVisibilityChange = this.mainPart.onMenubarVisibilityChange;
+	readonly onMenubarVisibilityChange: Event<boolean>;
 
 	private properties: ITitleProperties | undefined = undefined;
 
@@ -267,7 +269,7 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 	private readonly editorActionsChangeDisposable = this._register(new DisposableStore());
 	private actionToolBarElement!: HTMLElement;
 
-	private globalToolbarMenu = this._register(this.menuService.createMenu(MenuId.TitleBar, this.contextKeyService));
+	private globalToolbarMenu: IMenu;
 	private hasGlobalToolbarEntries = false;
 	private layoutToolbarMenu: IMenu | undefined;
 
@@ -279,7 +281,7 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 	private readonly hoverDelegate: IHoverDelegate;
 
 	private readonly titleDisposables = this._register(new DisposableStore());
-	private titleBarStyle = getTitleBarStyle(this.configurationService);
+	private titleBarStyle: TitlebarStyle;
 
 	private isInactive: boolean = false;
 	private readonly isAuxiliary: boolean;
@@ -309,6 +311,9 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 	) {
 		super(id, { hasTitle: false }, themeService, storageService, layoutService);
 
+		this.titleBarStyle = getTitleBarStyle(this.configurationService);
+		this.globalToolbarMenu = this._register(this.menuService.createMenu(MenuId.TitleBar, this.contextKeyService));
+
 		this.isAuxiliary = editorGroupsContainer !== 'main';
 		this.editorService = editorService.createScoped(editorGroupsContainer, this._store);
 		this.editorGroupsContainer = editorGroupsContainer === 'main' ? editorGroupService.mainPart : editorGroupsContainer;
diff --git a/src/vs/workbench/common/editor/diffEditorInput.ts b/src/vs/workbench/common/editor/diffEditorInput.ts
index 8ed7a6695287..8f2c0a1696ec 100644
--- a/src/vs/workbench/common/editor/diffEditorInput.ts
+++ b/src/vs/workbench/common/editor/diffEditorInput.ts
@@ -17,17 +17,17 @@ import { shorten } from '../../../base/common/labels.js';
 import { isResolvedEditorModel } from '../../../platform/editor/common/editor.js';
 
 interface IDiffEditorInputLabels {
-	name: string;
+	readonly name: string;
 
-	shortDescription: string | undefined;
-	mediumDescription: string | undefined;
-	longDescription: string | undefined;
+	readonly shortDescription: string | undefined;
+	readonly mediumDescription: string | undefined;
+	readonly longDescription: string | undefined;
 
-	forceDescription: boolean;
+	readonly forceDescription: boolean;
 
-	shortTitle: string;
-	mediumTitle: string;
-	longTitle: string;
+	readonly shortTitle: string;
+	readonly mediumTitle: string;
+	readonly longTitle: string;
 }
 
 /**
@@ -59,7 +59,7 @@ export class DiffEditorInput extends SideBySideEditorInput implements IDiffEdito
 
 	private cachedModel: DiffEditorModel | undefined = undefined;
 
-	private readonly labels = this.computeLabels();
+	private readonly labels: IDiffEditorInputLabels;
 
 	constructor(
 		preferredName: string | undefined,
@@ -70,6 +70,8 @@ export class DiffEditorInput extends SideBySideEditorInput implements IDiffEdito
 		@IEditorService editorService: IEditorService
 	) {
 		super(preferredName, preferredDescription, original, modified, editorService);
+
+		this.labels = this.computeLabels();
 	}
 
 	private computeLabels(): IDiffEditorInputLabels {
diff --git a/src/vs/workbench/common/editor/sideBySideEditorInput.ts b/src/vs/workbench/common/editor/sideBySideEditorInput.ts
index 5b20850a87e8..3a4cb208b304 100644
--- a/src/vs/workbench/common/editor/sideBySideEditorInput.ts
+++ b/src/vs/workbench/common/editor/sideBySideEditorInput.ts
@@ -60,7 +60,7 @@ export class SideBySideEditorInput extends EditorInput implements ISideBySideEdi
 		return undefined;
 	}
 
-	private hasIdenticalSides = this.primary.matches(this.secondary);
+	private hasIdenticalSides: boolean;
 
 	constructor(
 		protected readonly preferredName: string | undefined,
@@ -71,6 +71,8 @@ export class SideBySideEditorInput extends EditorInput implements ISideBySideEdi
 	) {
 		super();
 
+		this.hasIdenticalSides = this.primary.matches(this.secondary);
+
 		this.registerListeners();
 	}
 
diff --git a/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts b/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
index d966f2826fa8..17a5c25b033a 100644
--- a/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
@@ -12,7 +12,7 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import { IRequestContext } from '../../../../base/parts/request/common/request.js';
 import { localize } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { 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 { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -113,6 +113,20 @@ export class ChatEntitlementService extends Disposable implements IChatEntitleme
 	) {
 		super();
 
+		this.chatQuotaExceededContextKey = ChatContextKeys.chatQuotaExceeded.bindTo(this.contextKeyService);
+		this.completionsQuotaExceededContextKey = ChatContextKeys.completionsQuotaExceeded.bindTo(this.contextKeyService);
+
+		this.onDidChangeEntitlement = Event.map(
+			Event.filter(
+				this.contextKeyService.onDidChangeContext, e => e.affectsSome(new Set([
+					ChatContextKeys.Setup.pro.key,
+					ChatContextKeys.Setup.limited.key,
+					ChatContextKeys.Setup.canSignUp.key,
+					ChatContextKeys.Setup.signedOut.key
+				])), this._store
+			), () => { }, this._store
+		);
+
 		if (
 			!productService.defaultChatAgent ||				// needs product config
 			(isWeb && !environmentService.remoteAuthority)	// only enabled locally or a remote backend
@@ -132,16 +146,7 @@ export class ChatEntitlementService extends Disposable implements IChatEntitleme
 
 	//#region --- Entitlements
 
-	readonly onDidChangeEntitlement = Event.map(
-		Event.filter(
-			this.contextKeyService.onDidChangeContext, e => e.affectsSome(new Set([
-				ChatContextKeys.Setup.pro.key,
-				ChatContextKeys.Setup.limited.key,
-				ChatContextKeys.Setup.canSignUp.key,
-				ChatContextKeys.Setup.signedOut.key
-			])), this._store
-		), () => { }, this._store
-	);
+	readonly onDidChangeEntitlement: Event<void>;
 
 	get entitlement(): ChatEntitlement {
 		if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.pro.key) === true) {
@@ -170,8 +175,8 @@ export class ChatEntitlementService extends Disposable implements IChatEntitleme
 	private _quotas: IChatQuotas = { chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: undefined };
 	get quotas() { return this._quotas; }
 
-	private readonly chatQuotaExceededContextKey = ChatContextKeys.chatQuotaExceeded.bindTo(this.contextKeyService);
-	private readonly completionsQuotaExceededContextKey = ChatContextKeys.completionsQuotaExceeded.bindTo(this.contextKeyService);
+	private readonly chatQuotaExceededContextKey: IContextKey<boolean>;
+	private readonly completionsQuotaExceededContextKey: IContextKey<boolean>;
 
 	private ExtensionQuotaContextKeys = {
 		chatQuotaExceeded: defaultChat.chatQuotaExceededContext,
@@ -315,7 +320,7 @@ export class ChatSetupRequests extends Disposable {
 		return defaultChat.providerId;
 	}
 
-	private state: IEntitlements = { entitlement: this.context.state.entitlement };
+	private state: IEntitlements;
 
 	private pendingResolveCts = new CancellationTokenSource();
 	private didResolveEntitlements = false;
@@ -334,6 +339,8 @@ export class ChatSetupRequests extends Disposable {
 	) {
 		super();
 
+		this.state = { entitlement: this.context.state.entitlement };
+
 		this.registerListeners();
 
 		this.resolve();
@@ -706,14 +713,14 @@ export class ChatSetupContext extends Disposable {
 
 	private static readonly CHAT_SETUP_CONTEXT_STORAGE_KEY = 'chat.setupContext';
 
-	private readonly canSignUpContextKey = ChatContextKeys.Setup.canSignUp.bindTo(this.contextKeyService);
-	private readonly signedOutContextKey = ChatContextKeys.Setup.signedOut.bindTo(this.contextKeyService);
-	private readonly limitedContextKey = ChatContextKeys.Setup.limited.bindTo(this.contextKeyService);
-	private readonly proContextKey = ChatContextKeys.Setup.pro.bindTo(this.contextKeyService);
-	private readonly hiddenContext = ChatContextKeys.Setup.hidden.bindTo(this.contextKeyService);
-	private readonly installedContext = ChatContextKeys.Setup.installed.bindTo(this.contextKeyService);
+	private readonly canSignUpContextKey: IContextKey<boolean>;
+	private readonly signedOutContextKey: IContextKey<boolean>;
+	private readonly limitedContextKey: IContextKey<boolean>;
+	private readonly proContextKey: IContextKey<boolean>;
+	private readonly hiddenContext: IContextKey<boolean>;
+	private readonly installedContext: IContextKey<boolean>;
 
-	private _state: IChatSetupContextState = this.storageService.getObject<IChatSetupContextState>(ChatSetupContext.CHAT_SETUP_CONTEXT_STORAGE_KEY, StorageScope.PROFILE) ?? { entitlement: ChatEntitlement.Unknown };
+	private _state: IChatSetupContextState;
 	private suspendedState: IChatSetupContextState | undefined = undefined;
 	get state(): IChatSetupContextState {
 		return this.suspendedState ?? this._state;
@@ -725,7 +732,7 @@ export class ChatSetupContext extends Disposable {
 	private updateBarrier: Barrier | undefined = undefined;
 
 	constructor(
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IContextKeyService contextKeyService: IContextKeyService,
 		@IStorageService private readonly storageService: IStorageService,
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
 		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
@@ -734,6 +741,15 @@ export class ChatSetupContext extends Disposable {
 	) {
 		super();
 
+		this.canSignUpContextKey = ChatContextKeys.Setup.canSignUp.bindTo(contextKeyService);
+		this.signedOutContextKey = ChatContextKeys.Setup.signedOut.bindTo(contextKeyService);
+		this.limitedContextKey = ChatContextKeys.Setup.limited.bindTo(contextKeyService);
+		this.proContextKey = ChatContextKeys.Setup.pro.bindTo(contextKeyService);
+		this.hiddenContext = ChatContextKeys.Setup.hidden.bindTo(contextKeyService);
+		this.installedContext = ChatContextKeys.Setup.installed.bindTo(contextKeyService);
+
+		this._state = this.storageService.getObject<IChatSetupContextState>(ChatSetupContext.CHAT_SETUP_CONTEXT_STORAGE_KEY, StorageScope.PROFILE) ?? { entitlement: ChatEntitlement.Unknown };
+
 		this.checkExtensionInstallation();
 		this.updateContextSync();
 	}
diff --git a/src/vs/workbench/contrib/chat/common/voiceChatService.ts b/src/vs/workbench/contrib/chat/common/voiceChatService.ts
index 71ca69aecb16..bcf91b3a5b5c 100644
--- a/src/vs/workbench/contrib/chat/common/voiceChatService.ts
+++ b/src/vs/workbench/contrib/chat/common/voiceChatService.ts
@@ -8,7 +8,7 @@ import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { rtrim } from '../../../../base/common/strings.js';
-import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { 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';
@@ -81,15 +81,17 @@ export class VoiceChatService extends Disposable implements IVoiceChatService {
 
 	private static readonly CHAT_AGENT_ALIAS = new Map<string, string>([['vscode', 'code']]);
 
-	private readonly voiceChatInProgress = VoiceChatInProgress.bindTo(this.contextKeyService);
+	private readonly voiceChatInProgress: IContextKey<boolean>;
 	private activeVoiceChatSessions = 0;
 
 	constructor(
 		@ISpeechService private readonly speechService: ISpeechService,
 		@IChatAgentService private readonly chatAgentService: IChatAgentService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService
+		@IContextKeyService contextKeyService: IContextKeyService
 	) {
 		super();
+
+		this.voiceChatInProgress = VoiceChatInProgress.bindTo(contextKeyService);
 	}
 
 	private createPhrases(model?: IChatModel): Map<string, IPhraseValue> {
diff --git a/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.ts b/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.ts
index 6c657fb91247..9a24f11cbb43 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.ts
@@ -10,7 +10,7 @@ import { CancellationTokenSource } from '../../../../../base/common/cancellation
 import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../../../editor/browser/editorBrowser.js';
 import { IEditorContribution } from '../../../../../editor/common/editorCommon.js';
-import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
 import { HasSpeechProvider, ISpeechService, SpeechToTextInProgress, SpeechToTextStatus } from '../../../speech/common/speechService.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { EditorOption } from '../../../../../editor/common/config/editorOptions.js';
@@ -187,18 +187,21 @@ export class EditorDictation extends Disposable implements IEditorContribution {
 		return editor.getContribution<EditorDictation>(EditorDictation.ID);
 	}
 
-	private readonly widget = this._register(new DictationWidget(this.editor, this.keybindingService));
-	private readonly editorDictationInProgress = EDITOR_DICTATION_IN_PROGRESS.bindTo(this.contextKeyService);
+	private readonly widget: DictationWidget;
+	private readonly editorDictationInProgress: IContextKey<boolean>;
 
 	private readonly sessionDisposables = this._register(new MutableDisposable());
 
 	constructor(
 		private readonly editor: ICodeEditor,
 		@ISpeechService private readonly speechService: ISpeechService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IKeybindingService private readonly keybindingService: IKeybindingService
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IKeybindingService keybindingService: IKeybindingService
 	) {
 		super();
+
+		this.widget = this._register(new DictationWidget(this.editor, keybindingService));
+		this.editorDictationInProgress = EDITOR_DICTATION_IN_PROGRESS.bindTo(contextKeyService);
 	}
 
 	async start(): Promise<void> {
diff --git a/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.ts b/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.ts
index addaf29046f9..c8c1f5e33148 100644
--- a/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.ts
+++ b/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.ts
@@ -16,7 +16,7 @@ import { IWorkbenchContribution } from '../../../../common/contributions.js';
 import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
 import { DiffEditorInput } from '../../../../common/editor/diffEditorInput.js';
-import { IContextKeyService, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
 import { TextFileContentProvider } from '../../common/files.js';
 import { FileEditorInput } from './fileEditorInput.js';
 import { SAVE_FILE_AS_LABEL } from '../fileConstants.js';
@@ -45,13 +45,13 @@ export class TextFileSaveErrorHandler extends Disposable implements ISaveErrorHa
 	static readonly ID = 'workbench.contrib.textFileSaveErrorHandler';
 
 	private readonly messages = new ResourceMap<INotificationHandle>();
-	private readonly conflictResolutionContext = new RawContextKey<boolean>(CONFLICT_RESOLUTION_CONTEXT, false, true).bindTo(this.contextKeyService);
+	private readonly conflictResolutionContext: IContextKey<boolean>;
 	private activeConflictResolutionResource: URI | undefined = undefined;
 
 	constructor(
 		@INotificationService private readonly notificationService: INotificationService,
 		@ITextFileService private readonly textFileService: ITextFileService,
-		@IContextKeyService private contextKeyService: IContextKeyService,
+		@IContextKeyService contextKeyService: IContextKeyService,
 		@IEditorService private readonly editorService: IEditorService,
 		@ITextModelService textModelService: ITextModelService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -59,6 +59,8 @@ export class TextFileSaveErrorHandler extends Disposable implements ISaveErrorHa
 	) {
 		super();
 
+		this.conflictResolutionContext = new RawContextKey<boolean>(CONFLICT_RESOLUTION_CONTEXT, false, true).bindTo(contextKeyService);
+
 		const provider = this._register(instantiationService.createInstance(TextFileContentProvider));
 		this._register(textModelService.registerTextModelContentProvider(CONFLICT_RESOLUTION_SCHEME, provider));
 
diff --git a/src/vs/workbench/contrib/speech/browser/speechService.ts b/src/vs/workbench/contrib/speech/browser/speechService.ts
index 8529260f59af..45d4b02a1227 100644
--- a/src/vs/workbench/contrib/speech/browser/speechService.ts
+++ b/src/vs/workbench/contrib/speech/browser/speechService.ts
@@ -7,7 +7,7 @@ import { localize } from '../../../../nls.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IHostService } from '../../../services/host/browser/host.js';
 import { DeferredPromise } from '../../../../base/common/async.js';
@@ -58,11 +58,11 @@ export class SpeechService extends Disposable implements ISpeechService {
 	private readonly providers = new Map<string, ISpeechProvider>();
 	private readonly providerDescriptors = new Map<string, ISpeechProviderDescriptor>();
 
-	private readonly hasSpeechProviderContext = HasSpeechProvider.bindTo(this.contextKeyService);
+	private readonly hasSpeechProviderContext: IContextKey<boolean>;
 
 	constructor(
 		@ILogService private readonly logService: ILogService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IContextKeyService contextKeyService: IContextKeyService,
 		@IHostService private readonly hostService: IHostService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -70,6 +70,10 @@ export class SpeechService extends Disposable implements ISpeechService {
 	) {
 		super();
 
+		this.hasSpeechProviderContext = HasSpeechProvider.bindTo(contextKeyService);
+		this.textToSpeechInProgress = TextToSpeechInProgress.bindTo(contextKeyService);
+		this.speechToTextInProgress = SpeechToTextInProgress.bindTo(contextKeyService);
+
 		this.handleAndRegisterSpeechExtensions();
 	}
 
@@ -136,7 +140,7 @@ export class SpeechService extends Disposable implements ISpeechService {
 	private activeSpeechToTextSessions = 0;
 	get hasActiveSpeechToTextSession() { return this.activeSpeechToTextSessions > 0; }
 
-	private readonly speechToTextInProgress = SpeechToTextInProgress.bindTo(this.contextKeyService);
+	private readonly speechToTextInProgress: IContextKey<boolean>;
 
 	async createSpeechToTextSession(token: CancellationToken, context: string = 'speech'): Promise<ISpeechToTextSession> {
 		const provider = await this.getProvider();
@@ -249,7 +253,7 @@ export class SpeechService extends Disposable implements ISpeechService {
 	private activeTextToSpeechSessions = 0;
 	get hasActiveTextToSpeechSession() { return this.activeTextToSpeechSessions > 0; }
 
-	private readonly textToSpeechInProgress = TextToSpeechInProgress.bindTo(this.contextKeyService);
+	private readonly textToSpeechInProgress: IContextKey<boolean>;
 
 	async createTextToSpeechSession(token: CancellationToken, context: string = 'speech'): Promise<ITextToSpeechSession> {
 		const provider = await this.getProvider();
diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-sandbox/window.ts
index 810be457095b..1c187b2948eb 100644
--- a/src/vs/workbench/electron-sandbox/window.ts
+++ b/src/vs/workbench/electron-sandbox/window.ts
@@ -131,6 +131,8 @@ export class NativeWindow extends BaseWindow {
 	) {
 		super(mainWindow, undefined, hostService, nativeEnvironmentService);
 
+		this.configuredWindowZoomLevel = this.resolveConfiguredWindowZoomLevel();
+
 		this.registerListeners();
 		this.create();
 	}
@@ -1058,7 +1060,7 @@ export class NativeWindow extends BaseWindow {
 
 	private readonly mapWindowIdToZoomStatusEntry = new Map<number, ZoomStatusEntry>();
 
-	private configuredWindowZoomLevel = this.resolveConfiguredWindowZoomLevel();
+	private configuredWindowZoomLevel: number;
 
 	private resolveConfiguredWindowZoomLevel(): number {
 		const windowZoomLevel = this.configurationService.getValue('window.zoomLevel');
diff --git a/src/vs/workbench/services/files/electron-sandbox/diskFileSystemProvider.ts b/src/vs/workbench/services/files/electron-sandbox/diskFileSystemProvider.ts
index c037805a6d35..85b2f1eb68a7 100644
--- a/src/vs/workbench/services/files/electron-sandbox/diskFileSystemProvider.ts
+++ b/src/vs/workbench/services/files/electron-sandbox/diskFileSystemProvider.ts
@@ -32,16 +32,18 @@ export class DiskFileSystemProvider extends AbstractDiskFileSystemProvider imple
 	IFileSystemProviderWithFileAtomicReadCapability,
 	IFileSystemProviderWithFileCloneCapability {
 
-	private readonly provider = this._register(new DiskFileSystemProviderClient(this.mainProcessService.getChannel(LOCAL_FILE_SYSTEM_CHANNEL_NAME), { pathCaseSensitive: isLinux, trash: true }));
+	private readonly provider: DiskFileSystemProviderClient;
 
 	constructor(
-		private readonly mainProcessService: IMainProcessService,
+		mainProcessService: IMainProcessService,
 		private readonly utilityProcessWorkerWorkbenchService: IUtilityProcessWorkerWorkbenchService,
 		logService: ILogService,
 		private readonly loggerService: ILoggerService
 	) {
 		super(logService, { watcher: { forceUniversal: true /* send all requests to universal watcher process */ } });
 
+		this.provider = this._register(new DiskFileSystemProviderClient(mainProcessService.getChannel(LOCAL_FILE_SYSTEM_CHANNEL_NAME), { pathCaseSensitive: isLinux, trash: true }));
+
 		this.registerListeners();
 	}
 
diff --git a/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts b/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts
index f7479b7912ef..a7e2a589c3ba 100644
--- a/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts
+++ b/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts
@@ -8,7 +8,7 @@ import { createDecorator } from '../../../../platform/instantiation/common/insta
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { Event, Emitter } from '../../../../base/common/event.js';
 import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { RawContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { RawContextKey, IContextKeyService, IContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IFilesConfiguration, AutoSaveConfiguration, HotExitConfiguration, FILES_READONLY_INCLUDE_CONFIG, FILES_READONLY_EXCLUDE_CONFIG, IFileStatWithMetadata, IFileService, IBaseFileStat, hasReadonlyCapability, IFilesConfigurationNode } from '../../../../platform/files/common/files.js';
 import { equals } from '../../../../base/common/objects.js';
@@ -152,7 +152,7 @@ export class FilesConfigurationService extends Disposable implements IFilesConfi
 	private readonly autoSaveAfterShortDelayOverrides = new ResourceMap<number /* counter */>();
 	private readonly autoSaveDisabledOverrides = new ResourceMap<number /* counter */>();
 
-	private readonly autoSaveAfterShortDelayContext = AutoSaveAfterShortDelayContext.bindTo(this.contextKeyService);
+	private readonly autoSaveAfterShortDelayContext: IContextKey<boolean>;
 
 	private readonly readonlyIncludeMatcher = this._register(new GlobalIdleValue(() => this.createReadonlyMatcher(FILES_READONLY_INCLUDE_CONFIG)));
 	private readonly readonlyExcludeMatcher = this._register(new GlobalIdleValue(() => this.createReadonlyMatcher(FILES_READONLY_EXCLUDE_CONFIG)));
@@ -161,7 +161,7 @@ export class FilesConfigurationService extends Disposable implements IFilesConfi
 	private readonly sessionReadonlyOverrides = new ResourceMap<boolean>(resource => this.uriIdentityService.extUri.getComparisonKey(resource));
 
 	constructor(
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
 		@IEnvironmentService private readonly environmentService: IEnvironmentService,
@@ -172,6 +172,8 @@ export class FilesConfigurationService extends Disposable implements IFilesConfi
 	) {
 		super();
 
+		this.autoSaveAfterShortDelayContext = AutoSaveAfterShortDelayContext.bindTo(contextKeyService);
+
 		const configuration = configurationService.getValue<IFilesConfiguration>();
 
 		this.currentGlobalAutoSaveConfiguration = this.computeAutoSaveConfiguration(undefined, configuration.files);
diff --git a/src/vs/workbench/services/history/browser/historyService.ts b/src/vs/workbench/services/history/browser/historyService.ts
index 62791d7a0bcf..4f22c67ae44d 100644
--- a/src/vs/workbench/services/history/browser/historyService.ts
+++ b/src/vs/workbench/services/history/browser/historyService.ts
@@ -21,7 +21,7 @@ import { getExcludes, ISearchConfiguration, SEARCH_EXCLUDE_CONFIG } from '../../
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { EditorServiceImpl } from '../../../browser/parts/editor/editor.js';
 import { IWorkbenchLayoutService } from '../../layout/browser/layoutService.js';
-import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { coalesce, remove } from '../../../../base/common/arrays.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { addDisposableListener, EventType, EventHelper, WindowIdleValue } from '../../../../base/browser/dom.js';
@@ -60,7 +60,7 @@ export class HistoryService extends Disposable implements IHistoryService {
 	private readonly activeEditorListeners = this._register(new DisposableStore());
 	private lastActiveEditor: IEditorIdentifier | undefined = undefined;
 
-	private readonly editorHelper = this.instantiationService.createInstance(EditorHelper);
+	private readonly editorHelper: EditorHelper;
 
 	constructor(
 		@IEditorService private readonly editorService: EditorServiceImpl,
@@ -77,6 +77,21 @@ export class HistoryService extends Disposable implements IHistoryService {
 	) {
 		super();
 
+		this.editorHelper = this.instantiationService.createInstance(EditorHelper);
+
+		this.canNavigateBackContextKey = (new RawContextKey<boolean>('canNavigateBack', false, localize('canNavigateBack', "Whether it is possible to navigate back in editor history"))).bindTo(this.contextKeyService);
+		this.canNavigateForwardContextKey = (new RawContextKey<boolean>('canNavigateForward', false, localize('canNavigateForward', "Whether it is possible to navigate forward in editor history"))).bindTo(this.contextKeyService);
+
+		this.canNavigateBackInNavigationsContextKey = (new RawContextKey<boolean>('canNavigateBackInNavigationLocations', false, localize('canNavigateBackInNavigationLocations', "Whether it is possible to navigate back in editor navigation locations history"))).bindTo(this.contextKeyService);
+		this.canNavigateForwardInNavigationsContextKey = (new RawContextKey<boolean>('canNavigateForwardInNavigationLocations', false, localize('canNavigateForwardInNavigationLocations', "Whether it is possible to navigate forward in editor navigation locations history"))).bindTo(this.contextKeyService);
+		this.canNavigateToLastNavigationLocationContextKey = (new RawContextKey<boolean>('canNavigateToLastNavigationLocation', false, localize('canNavigateToLastNavigationLocation', "Whether it is possible to navigate to the last editor navigation location"))).bindTo(this.contextKeyService);
+
+		this.canNavigateBackInEditsContextKey = (new RawContextKey<boolean>('canNavigateBackInEditLocations', false, localize('canNavigateBackInEditLocations', "Whether it is possible to navigate back in editor edit locations history"))).bindTo(this.contextKeyService);
+		this.canNavigateForwardInEditsContextKey = (new RawContextKey<boolean>('canNavigateForwardInEditLocations', false, localize('canNavigateForwardInEditLocations', "Whether it is possible to navigate forward in editor edit locations history"))).bindTo(this.contextKeyService);
+		this.canNavigateToLastEditLocationContextKey = (new RawContextKey<boolean>('canNavigateToLastEditLocation', false, localize('canNavigateToLastEditLocation', "Whether it is possible to navigate to the last editor edit location"))).bindTo(this.contextKeyService);
+
+		this.canReopenClosedEditorContextKey = (new RawContextKey<boolean>('canReopenClosedEditor', false, localize('canReopenClosedEditor', "Whether it is possible to reopen the last closed editor"))).bindTo(this.contextKeyService);
+
 		this.registerListeners();
 
 		// if the service is created late enough that an editor is already opened
@@ -302,18 +317,18 @@ export class HistoryService extends Disposable implements IHistoryService {
 
 	//#region History Context Keys
 
-	private readonly canNavigateBackContextKey = (new RawContextKey<boolean>('canNavigateBack', false, localize('canNavigateBack', "Whether it is possible to navigate back in editor history"))).bindTo(this.contextKeyService);
-	private readonly canNavigateForwardContextKey = (new RawContextKey<boolean>('canNavigateForward', false, localize('canNavigateForward', "Whether it is possible to navigate forward in editor history"))).bindTo(this.contextKeyService);
+	private readonly canNavigateBackContextKey: IContextKey<boolean>;
+	private readonly canNavigateForwardContextKey: IContextKey<boolean>;
 
-	private readonly canNavigateBackInNavigationsContextKey = (new RawContextKey<boolean>('canNavigateBackInNavigationLocations', false, localize('canNavigateBackInNavigationLocations', "Whether it is possible to navigate back in editor navigation locations history"))).bindTo(this.contextKeyService);
-	private readonly canNavigateForwardInNavigationsContextKey = (new RawContextKey<boolean>('canNavigateForwardInNavigationLocations', false, localize('canNavigateForwardInNavigationLocations', "Whether it is possible to navigate forward in editor navigation locations history"))).bindTo(this.contextKeyService);
-	private readonly canNavigateToLastNavigationLocationContextKey = (new RawContextKey<boolean>('canNavigateToLastNavigationLocation', false, localize('canNavigateToLastNavigationLocation', "Whether it is possible to navigate to the last editor navigation location"))).bindTo(this.contextKeyService);
+	private readonly canNavigateBackInNavigationsContextKey: IContextKey<boolean>;
+	private readonly canNavigateForwardInNavigationsContextKey: IContextKey<boolean>;
+	private readonly canNavigateToLastNavigationLocationContextKey: IContextKey<boolean>;
 
-	private readonly canNavigateBackInEditsContextKey = (new RawContextKey<boolean>('canNavigateBackInEditLocations', false, localize('canNavigateBackInEditLocations', "Whether it is possible to navigate back in editor edit locations history"))).bindTo(this.contextKeyService);
-	private readonly canNavigateForwardInEditsContextKey = (new RawContextKey<boolean>('canNavigateForwardInEditLocations', false, localize('canNavigateForwardInEditLocations', "Whether it is possible to navigate forward in editor edit locations history"))).bindTo(this.contextKeyService);
-	private readonly canNavigateToLastEditLocationContextKey = (new RawContextKey<boolean>('canNavigateToLastEditLocation', false, localize('canNavigateToLastEditLocation', "Whether it is possible to navigate to the last editor edit location"))).bindTo(this.contextKeyService);
+	private readonly canNavigateBackInEditsContextKey: IContextKey<boolean>;
+	private readonly canNavigateForwardInEditsContextKey: IContextKey<boolean>;
+	private readonly canNavigateToLastEditLocationContextKey: IContextKey<boolean>;
 
-	private readonly canReopenClosedEditorContextKey = (new RawContextKey<boolean>('canReopenClosedEditor', false, localize('canReopenClosedEditor', "Whether it is possible to reopen the last closed editor"))).bindTo(this.contextKeyService);
+	private readonly canReopenClosedEditorContextKey: IContextKey<boolean>;
 
 	updateContextKeys(): void {
 		this.contextKeyService.bufferChangeEvents(() => {
@@ -1257,27 +1272,35 @@ interface IEditorNavigationStacks extends IDisposable {
 
 class EditorNavigationStacks extends Disposable implements IEditorNavigationStacks {
 
-	private readonly selectionsStack = this._register(this.instantiationService.createInstance(EditorNavigationStack, GoFilter.NONE, this.scope));
-	private readonly editsStack = this._register(this.instantiationService.createInstance(EditorNavigationStack, GoFilter.EDITS, this.scope));
-	private readonly navigationsStack = this._register(this.instantiationService.createInstance(EditorNavigationStack, GoFilter.NAVIGATION, this.scope));
+	private readonly selectionsStack: EditorNavigationStack;
+	private readonly editsStack: EditorNavigationStack;
+	private readonly navigationsStack: EditorNavigationStack;
 
-	private readonly stacks: EditorNavigationStack[] = [
-		this.selectionsStack,
-		this.editsStack,
-		this.navigationsStack
-	];
+	private readonly stacks: EditorNavigationStack[];
 
-	readonly onDidChange = Event.any(
-		this.selectionsStack.onDidChange,
-		this.editsStack.onDidChange,
-		this.navigationsStack.onDidChange
-	);
+	readonly onDidChange: Event<void>;
 
 	constructor(
 		private readonly scope: GoScope,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
 		super();
+
+		this.selectionsStack = this._register(this.instantiationService.createInstance(EditorNavigationStack, GoFilter.NONE, this.scope));
+		this.editsStack = this._register(this.instantiationService.createInstance(EditorNavigationStack, GoFilter.EDITS, this.scope));
+		this.navigationsStack = this._register(this.instantiationService.createInstance(EditorNavigationStack, GoFilter.NAVIGATION, this.scope));
+
+		this.stacks = [
+			this.selectionsStack,
+			this.editsStack,
+			this.navigationsStack
+		];
+
+		this.onDidChange = Event.any(
+			this.selectionsStack.onDidChange,
+			this.editsStack.onDidChange,
+			this.navigationsStack.onDidChange
+		);
 	}
 
 	canGoForward(filter?: GoFilter): boolean {
@@ -1414,7 +1437,7 @@ export class EditorNavigationStack extends Disposable {
 	private readonly mapEditorToDisposable = new Map<EditorInput, DisposableStore>();
 	private readonly mapGroupToDisposable = new Map<GroupIdentifier, IDisposable>();
 
-	private readonly editorHelper = this.instantiationService.createInstance(EditorHelper);
+	private readonly editorHelper: EditorHelper;
 
 	private stack: IEditorNavigationStackEntry[] = [];
 
@@ -1438,13 +1461,15 @@ export class EditorNavigationStack extends Disposable {
 	constructor(
 		private readonly filter: GoFilter,
 		private readonly scope: GoScope,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IInstantiationService instantiationService: IInstantiationService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService,
 		@ILogService private readonly logService: ILogService
 	) {
 		super();
 
+		this.editorHelper = instantiationService.createInstance(EditorHelper);
+
 		this.registerListeners();
 	}
 
diff --git a/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts b/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts
index be5cdaa8bb6f..bda11474b2c3 100644
--- a/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts
+++ b/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts
@@ -39,17 +39,21 @@ class WorkbenchHostService extends Disposable implements IHostService {
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService
 	) {
 		super();
+
+		this.onDidChangeFocus = Event.latch(
+			Event.any(
+				Event.map(Event.filter(this.nativeHostService.onDidFocusMainOrAuxiliaryWindow, id => hasWindow(id), this._store), () => this.hasFocus, this._store),
+				Event.map(Event.filter(this.nativeHostService.onDidBlurMainOrAuxiliaryWindow, id => hasWindow(id), this._store), () => this.hasFocus, this._store),
+				Event.map(this.onDidChangeActiveWindow, () => this.hasFocus, this._store)
+			), undefined, this._store
+		);
+
+		this.onDidChangeFullScreen = Event.filter(this.nativeHostService.onDidChangeWindowFullScreen, e => hasWindow(e.windowId), this._store);
 	}
 
 	//#region Focus
 
-	readonly onDidChangeFocus = Event.latch(
-		Event.any(
-			Event.map(Event.filter(this.nativeHostService.onDidFocusMainOrAuxiliaryWindow, id => hasWindow(id), this._store), () => this.hasFocus, this._store),
-			Event.map(Event.filter(this.nativeHostService.onDidBlurMainOrAuxiliaryWindow, id => hasWindow(id), this._store), () => this.hasFocus, this._store),
-			Event.map(this.onDidChangeActiveWindow, () => this.hasFocus, this._store)
-		), undefined, this._store
-	);
+	readonly onDidChangeFocus: Event<boolean>;
 
 	get hasFocus(): boolean {
 		return getActiveDocument().hasFocus();
@@ -94,7 +98,7 @@ class WorkbenchHostService extends Disposable implements IHostService {
 		return Event.latch(emitter.event, undefined, this._store);
 	}
 
-	readonly onDidChangeFullScreen = Event.filter(this.nativeHostService.onDidChangeWindowFullScreen, e => hasWindow(e.windowId), this._store);
+	readonly onDidChangeFullScreen: Event<{ readonly windowId: number; readonly fullscreen: boolean }>;
 
 	openWindow(options?: IOpenEmptyWindowOptions): Promise<void>;
 	openWindow(toOpen: IWindowOpenable[], options?: IOpenWindowOptions): Promise<void>;
diff --git a/src/vs/workbench/services/integrity/electron-sandbox/integrityService.ts b/src/vs/workbench/services/integrity/electron-sandbox/integrityService.ts
index 8050895e5f63..a2466a691d2d 100644
--- a/src/vs/workbench/services/integrity/electron-sandbox/integrityService.ts
+++ b/src/vs/workbench/services/integrity/electron-sandbox/integrityService.ts
@@ -59,22 +59,23 @@ export class IntegrityService implements IIntegrityService {
 
 	declare readonly _serviceBrand: undefined;
 
-	private readonly _storage = new IntegrityStorage(this.storageService);
+	private readonly storage: IntegrityStorage;
 
-	private readonly _isPurePromise = this._isPure();
-	isPure(): Promise<IntegrityTestResult> {
-		return this._isPurePromise;
-	}
+	private readonly isPurePromise: Promise<IntegrityTestResult>;
+	isPure(): Promise<IntegrityTestResult> { return this.isPurePromise; }
 
 	constructor(
 		@INotificationService private readonly notificationService: INotificationService,
-		@IStorageService private readonly storageService: IStorageService,
+		@IStorageService storageService: IStorageService,
 		@ILifecycleService private readonly lifecycleService: ILifecycleService,
 		@IOpenerService private readonly openerService: IOpenerService,
 		@IProductService private readonly productService: IProductService,
 		@IChecksumService private readonly checksumService: IChecksumService,
 		@ILogService private readonly logService: ILogService
 	) {
+		this.storage = new IntegrityStorage(storageService);
+		this.isPurePromise = this._isPure();
+
 		this._compute();
 	}
 
@@ -92,7 +93,7 @@ export class IntegrityService implements IIntegrityService {
 
 `);
 
-		const storedData = this._storage.get();
+		const storedData = this.storage.get();
 		if (storedData?.dontShowPrompt && storedData.commit === this.productService.commit) {
 			return; // Do not prompt
 		}
@@ -157,7 +158,7 @@ export class IntegrityService implements IIntegrityService {
 					{
 						label: localize('integrity.dontShowAgain', "Don't Show Again"),
 						isSecondary: true,
-						run: () => this._storage.set({ dontShowPrompt: true, commit: this.productService.commit })
+						run: () => this.storage.set({ dontShowPrompt: true, commit: this.productService.commit })
 					}
 				],
 				{
diff --git a/src/vs/workbench/services/notification/common/notificationService.ts b/src/vs/workbench/services/notification/common/notificationService.ts
index f557bc098c13..a61a1c3b6f0c 100644
--- a/src/vs/workbench/services/notification/common/notificationService.ts
+++ b/src/vs/workbench/services/notification/common/notificationService.ts
@@ -29,6 +29,8 @@ export class NotificationService extends Disposable implements INotificationServ
 	) {
 		super();
 
+		this.globalFilterEnabled = this.storageService.getBoolean(NotificationService.GLOBAL_FILTER_SETTINGS_KEY, StorageScope.APPLICATION, false);
+
 		this.updateFilters();
 		this.registerListeners();
 	}
@@ -81,7 +83,7 @@ export class NotificationService extends Disposable implements INotificationServ
 	private readonly _onDidChangeFilter = this._register(new Emitter<void>());
 	readonly onDidChangeFilter = this._onDidChangeFilter.event;
 
-	private globalFilterEnabled = this.storageService.getBoolean(NotificationService.GLOBAL_FILTER_SETTINGS_KEY, StorageScope.APPLICATION, false);
+	private globalFilterEnabled: boolean;
 
 	private readonly mapSourceToFilter: Map<string /** source id */, INotificationSourceFilter> = (() => {
 		const map = new Map<string, INotificationSourceFilter>();
diff --git a/src/vs/workbench/services/textfile/browser/textFileService.ts b/src/vs/workbench/services/textfile/browser/textFileService.ts
index 352a5e7dd8ca..231136ccb716 100644
--- a/src/vs/workbench/services/textfile/browser/textFileService.ts
+++ b/src/vs/workbench/services/textfile/browser/textFileService.ts
@@ -51,13 +51,13 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 	private static readonly TEXTFILE_SAVE_CREATE_SOURCE = SaveSourceRegistry.registerSource('textFileCreate.source', localize('textFileCreate.source', "File Created"));
 	private static readonly TEXTFILE_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('textFileOverwrite.source', localize('textFileOverwrite.source', "File Replaced"));
 
-	readonly files: ITextFileEditorModelManager = this._register(this.instantiationService.createInstance(TextFileEditorModelManager));
+	readonly files: ITextFileEditorModelManager;
 
-	readonly untitled: IUntitledTextEditorModelManager = this.untitledTextEditorService;
+	readonly untitled: IUntitledTextEditorModelManager;
 
 	constructor(
 		@IFileService protected readonly fileService: IFileService,
-		@IUntitledTextEditorService private untitledTextEditorService: IUntitledTextEditorModelManager,
+		@IUntitledTextEditorService untitledTextEditorService: IUntitledTextEditorModelManager,
 		@ILifecycleService protected readonly lifecycleService: ILifecycleService,
 		@IInstantiationService protected readonly instantiationService: IInstantiationService,
 		@IModelService private readonly modelService: IModelService,
@@ -77,6 +77,9 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 	) {
 		super();
 
+		this.files = this._register(this.instantiationService.createInstance(TextFileEditorModelManager));
+		this.untitled = untitledTextEditorService;
+
 		this.provideDecorations();
 	}
 
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index 31b4827edfb0..c88ac59e5225 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -86,8 +86,8 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 
 	readonly capabilities = WorkingCopyCapabilities.None;
 
-	readonly name = basename(this.labelService.getUriLabel(this.resource));
-	private resourceHasExtension: boolean = !!extUri.extname(this.resource);
+	readonly name: string;
+	private resourceHasExtension: boolean;
 
 	private contentEncoding: string | undefined; // encoding as reported from disk
 
@@ -130,6 +130,9 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	) {
 		super(modelService, languageService, languageDetectionService, accessibilityService);
 
+		this.name = basename(this.labelService.getUriLabel(this.resource));
+		this.resourceHasExtension = !!extUri.extname(this.resource);
+
 		// Make known to working copy service
 		this._register(this.workingCopyService.registerWorkingCopy(this));
 
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
index 0da81d1e2f6b..81a2ae95035a 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
@@ -99,6 +99,8 @@ export class TextFileEditorModelManager extends Disposable implements ITextFileE
 	) {
 		super();
 
+		this.saveParticipants = this._register(this.instantiationService.createInstance(TextFileSaveParticipant));
+
 		this.registerListeners();
 	}
 
@@ -558,7 +560,7 @@ export class TextFileEditorModelManager extends Disposable implements ITextFileE
 
 	//#region Save participants
 
-	private readonly saveParticipants = this._register(this.instantiationService.createInstance(TextFileSaveParticipant));
+	private readonly saveParticipants: TextFileSaveParticipant;
 
 	addSaveParticipant(participant: ITextFileSaveParticipant): IDisposable {
 		return this.saveParticipants.addSaveParticipant(participant);
diff --git a/src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts b/src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts
index 5a4c357d5669..31ff76a179ef 100644
--- a/src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts
+++ b/src/vs/workbench/services/untitled/common/untitledTextEditorModel.ts
@@ -144,6 +144,8 @@ export class UntitledTextEditorModel extends BaseTextEditorModel implements IUnt
 	) {
 		super(modelService, languageService, languageDetectionService, accessibilityService);
 
+		this.dirty = this.hasAssociatedFilePath || !!this.initialValue;
+
 		// Make known to working copy service
 		this._register(this.workingCopyService.registerWorkingCopy(this));
 
@@ -237,7 +239,7 @@ export class UntitledTextEditorModel extends BaseTextEditorModel implements IUnt
 
 	//#region Dirty
 
-	private dirty = this.hasAssociatedFilePath || !!this.initialValue;
+	private dirty: boolean;
 
 	isDirty(): boolean {
 		return this.dirty;
diff --git a/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.ts b/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.ts
index 08df8feee6ca..7f0250a7c455 100644
--- a/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.ts
+++ b/src/vs/workbench/services/workingCopy/common/untitledFileWorkingCopy.ts
@@ -92,7 +92,7 @@ export interface IUntitledFileWorkingCopyInitialContents {
 
 export class UntitledFileWorkingCopy<M extends IUntitledFileWorkingCopyModel> extends Disposable implements IUntitledFileWorkingCopy<M> {
 
-	readonly capabilities = this.isScratchpad ? WorkingCopyCapabilities.Untitled | WorkingCopyCapabilities.Scratchpad : WorkingCopyCapabilities.Untitled;
+	readonly capabilities: WorkingCopyCapabilities;
 
 	private _model: M | undefined = undefined;
 	get model(): M | undefined { return this._model; }
@@ -131,13 +131,16 @@ export class UntitledFileWorkingCopy<M extends IUntitledFileWorkingCopyModel> ex
 	) {
 		super();
 
+		this.capabilities = this.isScratchpad ? WorkingCopyCapabilities.Untitled | WorkingCopyCapabilities.Scratchpad : WorkingCopyCapabilities.Untitled;
+		this.modified = this.hasAssociatedFilePath || Boolean(this.initialContents && this.initialContents.markModified !== false);
+
 		// Make known to working copy service
 		this._register(workingCopyService.registerWorkingCopy(this));
 	}
 
 	//#region Dirty/Modified
 
-	private modified = this.hasAssociatedFilePath || Boolean(this.initialContents && this.initialContents.markModified !== false);
+	private modified: boolean;
 
 	isDirty(): boolean {
 		return this.modified && !this.isScratchpad; // Scratchpad working copies are never dirty
diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyBackupTracker.ts b/src/vs/workbench/services/workingCopy/common/workingCopyBackupTracker.ts
index ba09b6ec381e..e032ebe1bdb7 100644
--- a/src/vs/workbench/services/workingCopy/common/workingCopyBackupTracker.ts
+++ b/src/vs/workbench/services/workingCopy/common/workingCopyBackupTracker.ts
@@ -39,6 +39,8 @@ export abstract class WorkingCopyBackupTracker extends Disposable {
 	) {
 		super();
 
+		this.whenReady = this.resolveBackupsToRestore();
+
 		// Fill in initial modified working copies
 		for (const workingCopy of this.workingCopyService.modifiedWorkingCopies) {
 			this.onDidRegister(workingCopy);
@@ -335,7 +337,7 @@ export abstract class WorkingCopyBackupTracker extends Disposable {
 	//#region Backup Restorer
 
 	protected readonly unrestoredBackups = new Set<IWorkingCopyIdentifier>();
-	protected readonly whenReady = this.resolveBackupsToRestore();
+	protected readonly whenReady: Promise<void>;
 
 	private _isReady = false;
 	protected get isReady(): boolean { return this._isReady; }
diff --git a/src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts b/src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts
index 4e2d5626d118..a9649dcc4cbe 100644
--- a/src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts
+++ b/src/vs/workbench/services/workingCopy/common/workingCopyFileService.ts
@@ -309,11 +309,14 @@ export class WorkingCopyFileService extends Disposable implements IWorkingCopyFi
 	constructor(
 		@IFileService private readonly fileService: IFileService,
 		@IWorkingCopyService private readonly workingCopyService: IWorkingCopyService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IInstantiationService instantiationService: IInstantiationService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService
 	) {
 		super();
 
+		this.fileOperationParticipants = this._register(instantiationService.createInstance(WorkingCopyFileOperationParticipant));
+		this.saveParticipants = this._register(instantiationService.createInstance(StoredFileWorkingCopySaveParticipant));
+
 		// register a default working copy provider that uses the working copy service
 		this._register(this.registerWorkingCopyProvider(resource => {
 			return this.workingCopyService.workingCopies.filter(workingCopy => {
@@ -491,7 +494,7 @@ export class WorkingCopyFileService extends Disposable implements IWorkingCopyFi
 
 	//#region File operation participants
 
-	private readonly fileOperationParticipants = this._register(this.instantiationService.createInstance(WorkingCopyFileOperationParticipant));
+	private readonly fileOperationParticipants: WorkingCopyFileOperationParticipant;
 
 	addFileOperationParticipant(participant: IWorkingCopyFileOperationParticipant): IDisposable {
 		return this.fileOperationParticipants.addFileOperationParticipant(participant);
@@ -505,7 +508,7 @@ export class WorkingCopyFileService extends Disposable implements IWorkingCopyFi
 
 	//#region Save participants (stored file working copies only)
 
-	private readonly saveParticipants = this._register(this.instantiationService.createInstance(StoredFileWorkingCopySaveParticipant));
+	private readonly saveParticipants: StoredFileWorkingCopySaveParticipant;
 
 	get hasSaveParticipants(): boolean { return this.saveParticipants.length > 0; }
 
diff --git a/src/vs/workbench/test/browser/parts/editor/editorGroupModel.test.ts b/src/vs/workbench/test/browser/parts/editor/editorGroupModel.test.ts
index 30c8430e6557..adf1ea1dcbe3 100644
--- a/src/vs/workbench/test/browser/parts/editor/editorGroupModel.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/editorGroupModel.test.ts
@@ -236,10 +236,12 @@ suite('EditorGroupModel', () => {
 
 	class TestFileEditorInput extends EditorInput implements IFileEditorInput {
 
-		readonly preferredResource = this.resource;
+		readonly preferredResource;
 
 		constructor(public id: string, public resource: URI) {
 			super();
+
+			this.preferredResource = this.resource;
 		}
 		override get typeId() { return 'testFileEditorInputForGroups'; }
 		override get editorId() { return this.id; }
diff --git a/src/vs/workbench/test/browser/parts/editor/filteredEditorGroupModel.test.ts b/src/vs/workbench/test/browser/parts/editor/filteredEditorGroupModel.test.ts
index c4fef60fd157..c07cd8577abf 100644
--- a/src/vs/workbench/test/browser/parts/editor/filteredEditorGroupModel.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/filteredEditorGroupModel.test.ts
@@ -104,10 +104,11 @@ suite('FilteredEditorGroupModel', () => {
 
 	class TestFileEditorInput extends EditorInput implements IFileEditorInput {
 
-		readonly preferredResource = this.resource;
+		readonly preferredResource;
 
 		constructor(public id: string, public resource: URI) {
 			super();
+			this.preferredResource = this.resource;
 		}
 		override get typeId() { return 'testFileEditorInputForGroups'; }
 		override get editorId() { return this.id; }
diff --git a/src/vs/workbench/test/browser/workbenchTestServices.ts b/src/vs/workbench/test/browser/workbenchTestServices.ts
index 6161e10f542f..cda2844478e8 100644
--- a/src/vs/workbench/test/browser/workbenchTestServices.ts
+++ b/src/vs/workbench/test/browser/workbenchTestServices.ts
@@ -1467,17 +1467,21 @@ export class TestTextResourceConfigurationService implements ITextResourceConfig
 
 export class RemoteFileSystemProvider implements IFileSystemProvider {
 
-	constructor(private readonly wrappedFsp: IFileSystemProvider, private readonly remoteAuthority: string) { }
+	constructor(private readonly wrappedFsp: IFileSystemProvider, private readonly remoteAuthority: string) {
+		this.capabilities = this.wrappedFsp.capabilities;
+		this.onDidChangeCapabilities = this.wrappedFsp.onDidChangeCapabilities;
+		this.onDidChangeFile = Event.map(this.wrappedFsp.onDidChangeFile, changes => changes.map(c => {
+			return {
+				type: c.type,
+				resource: c.resource.with({ scheme: Schemas.vscodeRemote, authority: this.remoteAuthority }),
+			};
+		}));
+	}
 
-	readonly capabilities: FileSystemProviderCapabilities = this.wrappedFsp.capabilities;
-	readonly onDidChangeCapabilities: Event<void> = this.wrappedFsp.onDidChangeCapabilities;
+	readonly capabilities: FileSystemProviderCapabilities;
+	readonly onDidChangeCapabilities: Event<void>;
 
-	readonly onDidChangeFile: Event<readonly IFileChange[]> = Event.map(this.wrappedFsp.onDidChangeFile, changes => changes.map(c => {
-		return {
-			type: c.type,
-			resource: c.resource.with({ scheme: Schemas.vscodeRemote, authority: this.remoteAuthority }),
-		};
-	}));
+	readonly onDidChangeFile: Event<readonly IFileChange[]>;
 	watch(resource: URI, opts: IWatchOptions): IDisposable { return this.wrappedFsp.watch(this.toFileResource(resource), opts); }
 
 	stat(resource: URI): Promise<IStat> { return this.wrappedFsp.stat(this.toFileResource(resource)); }
@@ -1728,7 +1732,7 @@ export function registerTestSideBySideEditor(): IDisposable {
 
 export class TestFileEditorInput extends EditorInput implements IFileEditorInput {
 
-	readonly preferredResource = this.resource;
+	readonly preferredResource;
 
 	gotDisposed = false;
 	gotSaved = false;
@@ -1745,6 +1749,8 @@ export class TestFileEditorInput extends EditorInput implements IFileEditorInput
 		private _typeId: string
 	) {
 		super();
+
+		this.preferredResource = this.resource;
 	}
 
 	override get typeId() { return this._typeId; }
diff --git a/src/vs/workbench/test/common/workbenchTestServices.ts b/src/vs/workbench/test/common/workbenchTestServices.ts
index 1ac3c9f52d34..eac375577dcd 100644
--- a/src/vs/workbench/test/common/workbenchTestServices.ts
+++ b/src/vs/workbench/test/common/workbenchTestServices.ts
@@ -181,13 +181,14 @@ export class TestWorkingCopy extends Disposable implements IWorkingCopy {
 
 	readonly capabilities = WorkingCopyCapabilities.None;
 
-	readonly name = basename(this.resource);
+	readonly name;
 
 	private dirty = false;
 
 	constructor(readonly resource: URI, isDirty = false, readonly typeId = 'testWorkingCopyType') {
 		super();
 
+		this.name = basename(this.resource);
 		this.dirty = isDirty;
 	}
 

From 7db007682b2b28557d044c6a107bc3c0d4a2ed39 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Tue, 11 Mar 2025 16:11:02 +0100
Subject: [PATCH 0771/1815] forward `stdin|out` errors

---
 src/vs/workbench/api/node/extHostMpcNode.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/vs/workbench/api/node/extHostMpcNode.ts b/src/vs/workbench/api/node/extHostMpcNode.ts
index 45cacedc7c28..73dcccf17e71 100644
--- a/src/vs/workbench/api/node/extHostMpcNode.ts
+++ b/src/vs/workbench/api/node/extHostMpcNode.ts
@@ -79,6 +79,9 @@ export class NodeExtHostMpcService extends ExtHostMcpService {
 
 		child.stdout.pipe(new StreamSplitter('\n')).on('data', line => this._proxy.$onDidReceiveMessage(id, line.toString()));
 
+		child.stdin.on('error', onError);
+		child.stdout.on('error', onError);
+
 		// Stderr handling is not currently specified https://github.com/modelcontextprotocol/specification/issues/177
 		// Just treat it as generic log data for now
 		child.stderr.pipe(new StreamSplitter('\n')).on('data', line => this._proxy.$onDidPublishLog(id, line.toString()));

From 7d36a427d6c545ee437894eea9b5ae484018a82c Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Tue, 11 Mar 2025 16:16:05 +0100
Subject: [PATCH 0772/1815] Fix scope order (#243210)

---
 .../treeSitter/browser/treeSitterTokenizationFeature.ts         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
index 6d6b359482ff..7264b70a34d7 100644
--- a/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.ts
@@ -586,7 +586,7 @@ export class TreeSitterTokenizationSupport extends Disposable implements ITreeSi
 					tokenIndex++;
 				}
 
-				endOffsetsAndScopes.splice(position, 0, { endOffset: endOffset, scopes: [capture.name, ...oldScopes], bracket: brackets(capture, startOffset) });
+				endOffsetsAndScopes.splice(position, 0, { endOffset: endOffset, scopes: [...oldScopes, capture.name], bracket: brackets(capture, startOffset) });
 				endOffsetsAndScopes[tokenIndex].bracket = oldBracket;
 			} else {
 				endOffsetsAndScopes[tokenIndex] = { endOffset: endOffset, scopes: [capture.name], bracket: brackets(capture, startOffset) };

From 87e6cd178f02909a3791c7a7f83bfccdfcbe41b0 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Tue, 11 Mar 2025 16:28:57 +0100
Subject: [PATCH 0773/1815] add full ipc/stdio logging, make sure to send
 `notifications/initialized` after init-response has been received

---
 src/vs/workbench/api/node/extHostMpcNode.ts            | 10 +++++++++-
 .../contrib/mcp/common/mcpServerRequestHandler.ts      |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/node/extHostMpcNode.ts b/src/vs/workbench/api/node/extHostMpcNode.ts
index 73dcccf17e71..0ad54d3c5d1a 100644
--- a/src/vs/workbench/api/node/extHostMpcNode.ts
+++ b/src/vs/workbench/api/node/extHostMpcNode.ts
@@ -11,6 +11,7 @@ import { McpConnectionState, McpServerLaunch, McpServerTransportStdio, McpServer
 import { ExtHostMcpService } from '../common/extHostMcp.js';
 import { IExtHostRpcService } from '../common/extHostRpcService.js';
 import { homedir } from 'os';
+import { PassThrough } from 'stream';
 
 export class NodeExtHostMpcService extends ExtHostMcpService {
 	constructor(
@@ -45,6 +46,8 @@ export class NodeExtHostMpcService extends ExtHostMcpService {
 	override $sendMessage(id: number, message: string): void {
 		const nodeServer = this.nodeServers.get(id);
 		if (nodeServer) {
+			this._proxy.$onDidPublishLog(id, '[Client Says] ' + message.toString());
+
 			nodeServer.child.stdin.write(message + '\n');
 		} else {
 			super.$sendMessage(id, message);
@@ -77,7 +80,12 @@ export class NodeExtHostMpcService extends ExtHostMcpService {
 
 		this._proxy.$onDidChangeState(id, { state: McpConnectionState.Kind.Starting });
 
-		child.stdout.pipe(new StreamSplitter('\n')).on('data', line => this._proxy.$onDidReceiveMessage(id, line.toString()));
+		const debug = new PassThrough();
+		debug.on('data', line => {
+			this._proxy.$onDidPublishLog(id, '[Server Says] ' + line.toString());
+		});
+
+		child.stdout.pipe(new StreamSplitter('\n')).pipe(debug).on('data', line => this._proxy.$onDidReceiveMessage(id, line.toString()));
 
 		child.stdin.on('error', onError);
 		child.stdout.on('error', onError);
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServerRequestHandler.ts b/src/vs/workbench/contrib/mcp/common/mcpServerRequestHandler.ts
index 992c71ec4b58..651cb01d8cdc 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServerRequestHandler.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServerRequestHandler.ts
@@ -99,6 +99,10 @@ export class McpServerRequestHandler extends Disposable {
 				}, token);
 
 				mcp._serverInit = initialized;
+
+				mcp.sendNotification<MCP.InitializedNotification>({
+					method: 'notifications/initialized'
+				});
 			});
 
 			return mcp;

From 4926da084970634fc1d54f27fcf05c1ec78ea03c Mon Sep 17 00:00:00 2001
From: Anthony <w732qq@gmail.com>
Date: Tue, 11 Mar 2025 19:08:17 +0300
Subject: [PATCH 0774/1815] Add discovery of PowerShell Core user installation
 (#243025)

* Add discovery of PowerShell Core user installation

* Rename function to find Scoop installation accordingly

* Update powershell.ts

* Update powershell.ts
---
 src/vs/base/node/powershell.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/vs/base/node/powershell.ts b/src/vs/base/node/powershell.ts
index 05d68e3cefd0..63d230f56bca 100644
--- a/src/vs/base/node/powershell.ts
+++ b/src/vs/base/node/powershell.ts
@@ -226,6 +226,13 @@ function findPSCoreDotnetGlobalTool(): IPossiblePowerShellExe {
 	return new PossiblePowerShellExe(dotnetGlobalToolExePath, '.NET Core PowerShell Global Tool');
 }
 
+function findPSCoreScoopInstallation(): IPossiblePowerShellExe {
+	const scoopAppsDir = path.join(os.homedir(), 'scoop', 'apps');
+	const scoopPwsh = path.join(scoopAppsDir, 'pwsh', 'current', 'pwsh.exe');
+
+	return new PossiblePowerShellExe(scoopPwsh, 'PowerShell (Scoop)');
+}
+
 function findWinPS(): IPossiblePowerShellExe | null {
 	const winPSPath = path.join(
 		process.env.windir!,
@@ -285,6 +292,11 @@ async function* enumerateDefaultPowerShellInstallations(): AsyncIterable<IPossib
 		yield pwshExe;
 	}
 
+	pwshExe = await findPSCoreScoopInstallation();
+	if (pwshExe) {
+		yield pwshExe;
+	}
+
 	// Finally, get Windows PowerShell
 	pwshExe = findWinPS();
 	if (pwshExe) {

From dfcb7fdc5568274d1e391088fb19f472d18f0076 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Tue, 11 Mar 2025 17:09:22 +0100
Subject: [PATCH 0775/1815] Fixes #13224 (#243213)

---
 src/vs/editor/common/config/editorOptions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 82570d79fd25..6388b3c386c8 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -4302,7 +4302,7 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 			suppressSuggestions: false,
 			keepOnBlur: false,
 			fontFamily: 'default',
-			syntaxHighlightingEnabled: false,
+			syntaxHighlightingEnabled: true,
 			edits: {
 				enabled: true,
 				showCollapsed: false,

From b3d3aad6b5e24950e89536e79c89b5ba3fea34c0 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 11 Mar 2025 09:20:25 -0700
Subject: [PATCH 0776/1815] fix new lint

---
 .../mcp/common/discovery/nativeMcpDiscoveryAdapters.ts      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAdapters.ts b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAdapters.ts
index fddd0b699f54..73476c78b6a1 100644
--- a/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAdapters.ts
+++ b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAdapters.ts
@@ -20,11 +20,13 @@ export interface NativeMpcDiscoveryAdapter {
 }
 
 export class ClaudeDesktopMpcDiscoveryAdapter implements NativeMpcDiscoveryAdapter {
-	public readonly id: string = `claude-desktop.${this.remoteAuthority}`;
+	public readonly id: string;
 	public readonly label: string = 'Claude Desktop';
 	public readonly order = McpCollectionSortOrder.Filesystem;
 
-	constructor(public readonly remoteAuthority: string | null) { }
+	constructor(public readonly remoteAuthority: string | null) {
+		this.id = `claude-desktop.${this.remoteAuthority}`;
+	}
 
 	getFilePath({ platform, winAppData, homedir }: INativeMcpDiscoveryData): URI | undefined {
 		if (platform === Platform.Windows) {

From 6151dca5749e837bc3d7514bfd593c22d45ef219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joaomoreno@users.noreply.github.com>
Date: Tue, 11 Mar 2025 17:21:23 +0100
Subject: [PATCH 0777/1815] remove watch module (#243208)

---
 test/automation/package-lock.json | 327 +++++++++++++++++++++++++++---
 test/automation/package.json      |   6 +-
 test/smoke/package-lock.json      |  40 +---
 test/smoke/package.json           |   3 +-
 4 files changed, 303 insertions(+), 73 deletions(-)

diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
index 0253b826dafc..6bf5b31ed494 100644
--- a/test/automation/package-lock.json
+++ b/test/automation/package-lock.json
@@ -19,8 +19,8 @@
         "@types/node": "20.x",
         "@types/tmp": "0.2.2",
         "cpx2": "3.0.0",
-        "npm-run-all": "^4.1.5",
-        "watch": "^1.0.2"
+        "nodemon": "^3.1.9",
+        "npm-run-all": "^4.1.5"
       }
     },
     "node_modules/@types/ncp": {
@@ -59,6 +59,20 @@
         "node": ">=4"
       }
     },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
@@ -73,6 +87,19 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg=="
     },
+    "node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -82,6 +109,19 @@
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/call-bind": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz",
@@ -109,6 +149,31 @@
         "node": ">=4"
       }
     },
+    "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/co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -283,13 +348,17 @@
         "node": ">=0.8.0"
       }
     },
-    "node_modules/exec-sh": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
-      "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
+    "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,
+      "license": "MIT",
       "dependencies": {
-        "merge": "^1.2.0"
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/find-index": {
@@ -318,6 +387,21 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
+    "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/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -358,6 +442,19 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/glob2base": {
       "version": "0.0.12",
       "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
@@ -415,6 +512,13 @@
       "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",
+      "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -436,6 +540,19 @@
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
       "dev": true
     },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-callable": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
@@ -472,6 +589,29 @@
         "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",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-negative-zero": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
@@ -484,6 +624,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "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",
@@ -562,12 +712,6 @@
         "node": ">= 0.10.0"
       }
     },
-    "node_modules/merge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
-      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
-      "dev": true
-    },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -605,6 +749,48 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
+    "node_modules/nodemon": {
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.9.tgz",
+      "integrity": "sha512-hdr1oIb2p6ZSxu3PB2JWWYS7ZQ0qvaZsc3hK8DR8f02kRzc8rjYmxAIvdz+aYC+8F2IjNaB7HMcSDg8nQpJxyg==",
+      "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"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/nodemon"
+      }
+    },
+    "node_modules/nodemon/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.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",
@@ -617,6 +803,16 @@
         "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",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "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",
@@ -734,6 +930,19 @@
         "node": ">=4"
       }
     },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/pidtree": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz",
@@ -755,6 +964,13 @@
         "node": ">=4"
       }
     },
+    "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/read-pkg": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
@@ -769,6 +985,19 @@
         "node": ">=4"
       }
     },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
     "node_modules/resolve": {
       "version": "1.20.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
@@ -853,6 +1082,32 @@
       "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
       "dev": true
     },
+    "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/simple-update-notifier/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/spdx-correct": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
@@ -969,6 +1224,29 @@
         "node": ">=8.17.0"
       }
     },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "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/tree-kill": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
@@ -977,6 +1255,13 @@
         "tree-kill": "cli.js"
       }
     },
+    "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/undici-types": {
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
@@ -1007,22 +1292,6 @@
       "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.2.tgz",
       "integrity": "sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA=="
     },
-    "node_modules/watch": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/watch/-/watch-1.0.2.tgz",
-      "integrity": "sha1-NApxe952Vyb6CqB9ch4BR6VR3ww= sha512-1u+Z5n9Jc1E2c7qDO8SinPoZuHj7FgbgU1olSFoyaklduDvvtX7GMMtlE6OC9FTXq4KvNAOfj6Zu4vI1e9bAKA==",
-      "dev": true,
-      "dependencies": {
-        "exec-sh": "^0.2.0",
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "watch": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.1.95"
-      }
-    },
     "node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
diff --git a/test/automation/package.json b/test/automation/package.json
index 4d5dbd02f632..cf8f9c861cb2 100644
--- a/test/automation/package.json
+++ b/test/automation/package.json
@@ -13,7 +13,7 @@
     "watch": "npm-run-all -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": "watch \"node tools/copy-driver-definition.js\"",
+    "watch-driver-definition": "nodemon --watch ../../src/vs/workbench/services/driver/common/driver.ts tools/copy-driver-definition.js",
     "copy-package-version": "node tools/copy-package-version.js",
     "prepublishOnly": "npm run copy-package-version"
   },
@@ -28,7 +28,7 @@
     "@types/node": "20.x",
     "@types/tmp": "0.2.2",
     "cpx2": "3.0.0",
-    "npm-run-all": "^4.1.5",
-    "watch": "^1.0.2"
+    "nodemon": "^3.1.9",
+    "npm-run-all": "^4.1.5"
   }
 }
diff --git a/test/smoke/package-lock.json b/test/smoke/package-lock.json
index af2f72d890a0..ecbe39deabbe 100644
--- a/test/smoke/package-lock.json
+++ b/test/smoke/package-lock.json
@@ -19,8 +19,7 @@
         "@types/node": "20.x",
         "@types/node-fetch": "^2.5.10",
         "@types/rimraf": "3.0.2",
-        "npm-run-all": "^4.1.5",
-        "watch": "^1.0.2"
+        "npm-run-all": "^4.1.5"
       }
     },
     "node_modules/@types/events": {
@@ -279,15 +278,6 @@
         "node": ">=0.8.0"
       }
     },
-    "node_modules/exec-sh": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
-      "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
-      "dev": true,
-      "dependencies": {
-        "merge": "^1.2.0"
-      }
-    },
     "node_modules/form-data": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
@@ -527,12 +517,6 @@
         "node": ">= 0.10.0"
       }
     },
-    "node_modules/merge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
-      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
-      "dev": true
-    },
     "node_modules/mime-db": {
       "version": "1.48.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
@@ -565,12 +549,6 @@
         "node": "*"
       }
     },
-    "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
-    },
     "node_modules/ncp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
@@ -949,22 +927,6 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
-    "node_modules/watch": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/watch/-/watch-1.0.2.tgz",
-      "integrity": "sha1-NApxe952Vyb6CqB9ch4BR6VR3ww= sha512-1u+Z5n9Jc1E2c7qDO8SinPoZuHj7FgbgU1olSFoyaklduDvvtX7GMMtlE6OC9FTXq4KvNAOfj6Zu4vI1e9bAKA==",
-      "dev": true,
-      "dependencies": {
-        "exec-sh": "^0.2.0",
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "watch": "cli.js"
-      },
-      "engines": {
-        "node": ">=0.1.95"
-      }
-    },
     "node_modules/webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
diff --git a/test/smoke/package.json b/test/smoke/package.json
index 90da59a0f534..22266dd559c1 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -21,7 +21,6 @@
     "@types/node": "20.x",
     "@types/node-fetch": "^2.5.10",
     "@types/rimraf": "3.0.2",
-    "npm-run-all": "^4.1.5",
-    "watch": "^1.0.2"
+    "npm-run-all": "^4.1.5"
   }
 }

From b61a4f9887171261d0708e42bf51dfcb7e5647e1 Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Tue, 11 Mar 2025 09:39:56 -0700
Subject: [PATCH 0778/1815] set diff index from cell diff counts (#243214)

Co-authored-by: amunger <>
---
 .../chatEditingNotebookEditorIntegration.ts   | 40 +++++++++++++------
 1 file changed, 27 insertions(+), 13 deletions(-)

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 4f634c700804..04999b9d6859 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
@@ -9,6 +9,7 @@ import { debouncedObservable } from '../../../../../../base/common/observableInt
 import { basename } from '../../../../../../base/common/resources.js';
 import { assertType } from '../../../../../../base/common/types.js';
 import { nullDocumentDiff } from '../../../../../../editor/common/diff/documentDiffProvider.js';
+import { PrefixSumComputer } from '../../../../../../editor/common/model/prefixSumComputer.js';
 import { localize } from '../../../../../../nls.js';
 import { MenuId } from '../../../../../../platform/actions/common/actions.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
@@ -89,6 +90,8 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 	private readonly _currentChange = observableValue<{ change: ICellDiffInfo; index: number } | undefined>(this, undefined);
 	readonly currentChange: IObservable<{ change: ICellDiffInfo; index: number } | undefined> = this._currentChange;
 
+	private diffIndexPrefixSum: PrefixSumComputer = new PrefixSumComputer(new Uint32Array());
+
 	private readonly cellEditorIntegrations = new Map<NotebookCellTextModel, { integration: ChatEditingCodeEditorIntegration; diff: ISettableObservable<IDocumentDiff2> }>();
 
 	private readonly insertDeleteDecorators: IObservable<{ insertedCellDecorator: NotebookInsertedCellDecorator; deletedCellDecorator: NotebookDeletedCellDecorator } | undefined>;
@@ -223,6 +226,17 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 		this._register(autorun(r => {
 			const sortedCellChanges = sortCellChanges(cellChanges.read(r));
 
+			const values = new Uint32Array(sortedCellChanges.length);
+			for (let i = 0; i < sortedCellChanges.length; i++) {
+				const change = sortedCellChanges[i];
+				values[i] = change.type === 'insert' ? 1
+					: change.type === 'delete' ? 1
+						: change.type === 'modified' ? change.diff.read(r).changes.length
+							: 0;
+			}
+
+			this.diffIndexPrefixSum = new PrefixSumComputer(values);
+
 			const changes = sortedCellChanges.filter(c => c.type !== 'unchanged' && c.type !== 'delete' && !c.diff.read(r).identical);
 			if (!changes.length || !cellsAreVisible.read(r)) {
 				return;
@@ -231,21 +245,21 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 			// set initial index
 			this._currentIndex.set(0, undefined);
 			this._revealChange(sortedCellChanges[0]);
+		}));
 
-			this._register(autorun(r => {
-				const currentChange = this.currentChange.read(r);
-				if (currentChange) {
-					const change = currentChange.change;
-					const indexInChange = currentChange.index;
-					const diffChangeIndex = sortCellChanges(this.cellChanges.get().filter(c => c.type !== 'unchanged' && !c.diff.read(r).identical)).findIndex(c => c === change);
+		this._register(autorun(r => {
+			const currentChange = this.currentChange.read(r);
+			if (currentChange) {
+				const indexInChange = currentChange.index;
+				const modifiedCellIndex = currentChange.change.modifiedCellIndex;
 
-					if (diffChangeIndex !== -1) {
-						this._currentIndex.set(diffChangeIndex + indexInChange, undefined);
-					}
-				} else {
-					this._currentIndex.set(-1, undefined);
-				}
-			}));
+				const changesBeforeCell = modifiedCellIndex !== undefined && modifiedCellIndex > 0 ?
+					this.diffIndexPrefixSum.getPrefixSum(modifiedCellIndex - 1) : 0;
+
+				this._currentIndex.set(changesBeforeCell + indexInChange, undefined);
+			} else {
+				this._currentIndex.set(-1, undefined);
+			}
 		}));
 
 		this.insertDeleteDecorators = derivedWithStore((r, store) => {

From a4147b92a752ef9bb24bcac6ae858a848a6bc01f Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 11 Mar 2025 17:42:12 +0100
Subject: [PATCH 0779/1815] chat - remove shortcuts from status (#243217)

We make room for more useful things in the status tooltip soon.
---
 .../contrib/chat/browser/chatStatus.ts        | 77 ++++---------------
 .../contrib/chat/browser/media/chatStatus.css | 39 ----------
 2 files changed, 14 insertions(+), 102 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 794f248a042d..6fb6b89848ec 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -8,13 +8,12 @@ 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 { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowTooltipCommand, StatusbarAlignment, StatusbarEntryKind } from '../../../services/statusbar/browser/statusbar.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL, CHAT_OPEN_ACTION_ID } from './actions/chatActions.js';
-import { $, addDisposableListener, append, clearNode, EventHelper, EventLike, EventType } from '../../../../base/browser/dom.js';
+import { OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL } from './actions/chatActions.js';
+import { $, addDisposableListener, append, clearNode, EventHelper, EventType } from '../../../../base/browser/dom.js';
 import { ChatEntitlement, ChatEntitlementService, IChatEntitlementService } from '../common/chatEntitlementService.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { defaultButtonStyles, defaultCheckboxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
@@ -25,12 +24,7 @@ import { CommandsRegistry, ICommandService } from '../../../../platform/commands
 import { Lazy } from '../../../../base/common/lazy.js';
 import { contrastBorder, inputValidationErrorBorder, inputValidationInfoBorder, inputValidationWarningBorder, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
-import { coalesce } from '../../../../base/common/arrays.js';
-import { CTX_INLINE_CHAT_POSSIBLE } from '../../inlineChat/common/inlineChat.js';
-import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { Color } from '../../../../base/common/color.js';
-import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { KeyCode } from '../../../../base/common/keyCodes.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';
@@ -253,7 +247,6 @@ class ChatStatusDashboard extends Disposable {
 		@IHoverService private readonly hoverService: IHoverService,
 		@IEditorService private readonly editorService: IEditorService,
 		@ILanguageService private readonly languageService: ILanguageService,
-		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@ICommandService private readonly commandService: ICommandService
 	) {
 		super();
@@ -265,9 +258,12 @@ class ChatStatusDashboard extends Disposable {
 		const disposables = this.entryDisposables.value = new DisposableStore();
 		disposables.add(token.onCancellationRequested(() => disposables.dispose()));
 
+		let addSeparator = false;
+
 		// New to Copilot
 		if (isNewUser(this.contextKeyService, this.chatEntitlementService)) {
 			this.element.appendChild($('div.header', undefined, localize('setupCopilotForFreeHeader', "Use AI Features with Copilot")));
+			addSeparator = true;
 
 			this.element.appendChild(
 				$('div', undefined,
@@ -289,8 +285,6 @@ class ChatStatusDashboard extends Disposable {
 			const setupCopilotButton = disposables.add(new Button(this.element, { ...defaultButtonStyles }));
 			setupCopilotButton.label = localize('setupCopilotForFreeButton', "Setup Copilot for Free");
 			disposables.add(setupCopilotButton.onDidClick(() => this.runCommandAndClose('workbench.action.chat.triggerSetup')));
-
-			this.element.appendChild($('hr'));
 		}
 
 		// Quota Indicator
@@ -298,6 +292,7 @@ class ChatStatusDashboard extends Disposable {
 			const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate, chatQuotaExceeded, completionsQuotaExceeded } = this.chatEntitlementService.quotas;
 
 			this.element.appendChild($('div.header', undefined, localize('usageTitle', "Copilot Free Usage")));
+			addSeparator = true;
 
 			const chatQuotaIndicator = this.createQuotaIndicator(this.element, chatTotal, chatRemaining, localize('chatsLabel', "Chat messages"));
 			const completionsQuotaIndicator = this.createQuotaIndicator(this.element, completionsTotal, completionsRemaining, localize('completionsLabel', "Code completions"));
@@ -321,21 +316,19 @@ class ChatStatusDashboard extends Disposable {
 				chatQuotaIndicator(chatTotal, chatRemaining);
 				completionsQuotaIndicator(completionsTotal, completionsRemaining);
 			})();
-
-			this.element.appendChild($('hr'));
 		}
 
 		// Settings
 		if (!isNewUser(this.contextKeyService, this.chatEntitlementService)) {
+			if (addSeparator) {
+				this.element.appendChild($('hr'));
+				addSeparator = false;
+			}
+
 			this.element.appendChild($('div.header', undefined, localize('settingsTitle', "Settings")));
-			this.createSettings(this.element, disposables);
-			this.element.appendChild($('hr'));
-		}
+			addSeparator = true;
 
-		// Shortcuts
-		{
-			this.element.appendChild($('div.header', undefined, localize('keybindingsTitle', "Keybindings")));
-			this.createShortcuts(this.element, disposables);
+			this.createSettings(this.element, disposables);
 		}
 
 		return this.element;
@@ -508,46 +501,4 @@ class ChatStatusDashboard extends Disposable {
 			}
 		}));
 	}
-
-	private createShortcuts(container: HTMLElement, disposables: DisposableStore): HTMLElement {
-		const shortcuts = container.appendChild($('div.shortcuts'));
-
-		const entries = coalesce([
-			{ text: localize('shortcuts.chat', "Chat"), id: CHAT_OPEN_ACTION_ID },
-			{ text: localize('shortcuts.copilotEdits', "Copilot Edits"), id: 'workbench.action.chat.openEditSession' },
-			this.contextKeyService.contextMatchesRules(ContextKeyExpr.and(
-				CTX_INLINE_CHAT_POSSIBLE,
-				EditorContextKeys.writable,
-				EditorContextKeys.editorSimpleInput.negate()
-			)) ? { text: localize('shortcuts.inlineChat', "Inline Chat"), id: 'inlineChat.start' } : undefined,
-			!isNewUser(this.contextKeyService, this.chatEntitlementService) ? { text: localize('shortcuts.quickChat', "Quick Chat"), id: 'workbench.action.quickchat.toggle' } : undefined,
-		]);
-
-		const onTrigger = (commandId: string, e: EventLike) => {
-			EventHelper.stop(e, true);
-
-			this.runCommandAndClose(commandId);
-		};
-
-		for (const entry of entries) {
-			const shortcut = append(shortcuts, $('div.shortcut', { tabIndex: 0, role: 'button', 'aria-label': entry.text },
-				$('span.shortcut-label', undefined, entry.text),
-				$('span.shortcut-value', undefined, this.keybindingService.lookupKeybinding(entry.id)?.getLabel() ?? '')
-			));
-
-			disposables.add(Gesture.addTarget(shortcut));
-			[EventType.CLICK, TouchEventType.Tap].forEach(eventType => {
-				disposables.add(addDisposableListener(shortcut, eventType, e => onTrigger(entry.id, e)));
-			});
-
-			disposables.add(addDisposableListener(shortcut, EventType.KEY_DOWN, e => {
-				const event = new StandardKeyboardEvent(e);
-				if ((event.equals(KeyCode.Enter) || event.equals(KeyCode.Space))) {
-					onTrigger(entry.id, e);
-				}
-			}));
-		}
-
-		return shortcuts;
-	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
index 151748f2124a..dfb5a545e927 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
@@ -111,42 +111,3 @@
 .chat-status-bar-entry-tooltip .settings .setting.disabled .setting-label {
 	color: var(--vscode-disabledForeground);
 }
-
-/* Shortcuts */
-
-.chat-status-bar-entry-tooltip .shortcuts {
-	display: flex;
-	flex-direction: column;
-	gap: 2px;
-}
-
-.chat-status-bar-entry-tooltip .shortcuts .shortcut {
-	display: flex;
-	gap: 15px;
-
-	/** Make room for the hover feedback */
-	margin-left: -3px;
-	margin-right: -3px;
-	padding-left: 3px;
-	padding-right: 3px;
-	margin-top: -1px;
-	margin-bottom: -1px;
-	padding-top: 1px;
-	padding-bottom: 1px;
-}
-
-.chat-status-bar-entry-tooltip .shortcuts .shortcut:hover {
-	outline: 1px dashed var(--vscode-toolbar-hoverOutline);
-	outline-offset: -1px;
-	background-color: var(--vscode-toolbar-hoverBackground);
-	border-radius: 3px;
-}
-
-.chat-status-bar-entry-tooltip .shortcuts .shortcut .shortcut-label {
-	flex: 1;
-	cursor: pointer;
-}
-
-.chat-status-bar-entry-tooltip .shortcuts .shortcut .shortcut-value {
-	color: var(--vscode-descriptionForeground);
-}

From c4df08cbdbba37b6bfe8d7fee4930b1d811f6d29 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Tue, 11 Mar 2025 17:42:41 +0100
Subject: [PATCH 0780/1815] Do not extend very simple edits to entire word
 (#243218)

do not extend very simple edits to entire word
---
 .../browser/model/inlineCompletionsSource.ts    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
index 2ba418658729..da14a0b836b0 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
@@ -796,6 +796,23 @@ function reshapeEdit(edit: SingleOffsetEdit, originalText: string, totalInnerEdi
 		edit = reshapeMultiLineInsertion(edit, textModel);
 	}
 
+	// The diff algorithm extended a simple edit to the entire word
+	// shrink it back to a simple edit if it is deletion/insertion only
+	if (totalInnerEdits === 1) {
+		const prefixLength = commonPrefixLength(originalText, edit.newText);
+		const suffixLength = commonSuffixLength(originalText.slice(prefixLength), edit.newText.slice(prefixLength));
+
+		// reshape it back to an insertion
+		if (prefixLength + suffixLength === originalText.length) {
+			return new SingleOffsetEdit(edit.replaceRange.deltaStart(prefixLength).deltaEnd(-suffixLength), edit.newText.substring(prefixLength, edit.newText.length - suffixLength));
+		}
+
+		// reshape it back to a deletion
+		if (prefixLength + suffixLength === edit.newText.length) {
+			return new SingleOffsetEdit(edit.replaceRange.deltaStart(prefixLength).deltaEnd(-suffixLength), '');
+		}
+	}
+
 	return edit;
 }
 

From 856dbe90b01e06f97ee16b4e3fbe8f63e93e4639 Mon Sep 17 00:00:00 2001
From: Kevin Wang <kevmo314@gmail.com>
Date: Tue, 11 Mar 2025 12:58:20 -0400
Subject: [PATCH 0781/1815] Fix comment typo (#243145)

I think this is supposed to say "without deviating from it"?
---
 src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts b/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
index 2bbd50bb777a..d7c851010916 100644
--- a/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
+++ b/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
@@ -126,7 +126,7 @@ declare module 'vscode' {
 		commands?: Command[];
 
 		/**
-		 * When set and the user types a suggestion without derivating from it, the inline suggestion is not updated.
+		 * When set and the user types a suggestion without deviating from it, the inline suggestion is not updated.
 		 * Defaults to false (might change).
 		 */
 		enableForwardStability?: boolean;

From 67e6e173f850c0f3935e38ccb3a4bddc26f65782 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 11 Mar 2025 09:58:27 -0700
Subject: [PATCH 0782/1815] fix xdg home not being read for posix

---
 .../common/discovery/nativeMcpDiscoveryAdapters.ts   |  4 ++--
 .../mcp/test/common/mcpServerRequestHandler.test.ts  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAdapters.ts b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAdapters.ts
index 73476c78b6a1..8eb01b9c7227 100644
--- a/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAdapters.ts
+++ b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAdapters.ts
@@ -28,14 +28,14 @@ export class ClaudeDesktopMpcDiscoveryAdapter implements NativeMpcDiscoveryAdapt
 		this.id = `claude-desktop.${this.remoteAuthority}`;
 	}
 
-	getFilePath({ platform, winAppData, homedir }: INativeMcpDiscoveryData): URI | undefined {
+	getFilePath({ platform, winAppData, xdgHome, homedir }: INativeMcpDiscoveryData): URI | undefined {
 		if (platform === Platform.Windows) {
 			const appData = winAppData || URI.joinPath(homedir, 'AppData', 'Roaming');
 			return URI.joinPath(appData, 'Claude', 'claude_desktop_config.json');
 		} else if (platform === Platform.Mac) {
 			return URI.joinPath(homedir, 'Library', 'Application Support', 'Claude', 'claude_desktop_config.json');
 		} else {
-			const configDir = /*process.env.XDG_CONFIG_HOME || */URI.joinPath(homedir, '.config');
+			const configDir = xdgHome || URI.joinPath(homedir, '.config');
 			return URI.joinPath(configDir, 'Claude', 'claude_desktop_config.json');
 		}
 	}
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 f78bf427271a..1da6d3d88688 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpServerRequestHandler.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpServerRequestHandler.test.ts
@@ -107,10 +107,10 @@ suite('Workbench - MCP - ServerRequestHandler', () => {
 
 		// Get the sent message and verify it
 		const sentMessages = transport.getSentMessages();
-		assert.strictEqual(sentMessages.length, 2); // initialize + listResources
+		assert.strictEqual(sentMessages.length, 3); // initialize + listResources
 
 		// Verify listResources request format
-		const listResourcesRequest = sentMessages[1] as MCP.JSONRPCRequest;
+		const listResourcesRequest = sentMessages[2] as MCP.JSONRPCRequest;
 		assert.strictEqual(listResourcesRequest.method, 'resources/list');
 		assert.strictEqual(listResourcesRequest.jsonrpc, MCP.JSONRPC_VERSION);
 		assert.ok(typeof listResourcesRequest.id === 'number');
@@ -140,7 +140,7 @@ suite('Workbench - MCP - ServerRequestHandler', () => {
 
 		// Get the first request and respond with pagination
 		const sentMessages = transport.getSentMessages();
-		const listResourcesRequest = sentMessages[1] as MCP.JSONRPCRequest;
+		const listResourcesRequest = sentMessages[2] as MCP.JSONRPCRequest;
 
 		// Send first page with nextCursor
 		transport.simulateReceiveMessage({
@@ -192,7 +192,7 @@ suite('Workbench - MCP - ServerRequestHandler', () => {
 
 		// Get the sent message
 		const sentMessages = transport.getSentMessages();
-		const readResourceRequest = sentMessages[1] as MCP.JSONRPCRequest; // [0] is initialize
+		const readResourceRequest = sentMessages[2] as MCP.JSONRPCRequest; // [0] is initialize
 
 		// Simulate error response
 		transport.simulateReceiveMessage({
@@ -292,7 +292,7 @@ suite('Workbench - MCP - ServerRequestHandler', () => {
 
 		// Get the request ID
 		const sentMessages = transport.getSentMessages();
-		const listResourcesRequest = sentMessages[1] as MCP.JSONRPCRequest;
+		const listResourcesRequest = sentMessages[2] as MCP.JSONRPCRequest;
 		const requestId = listResourcesRequest.id;
 
 		// Cancel the request
@@ -324,7 +324,7 @@ suite('Workbench - MCP - ServerRequestHandler', () => {
 
 		// Get the request ID
 		const sentMessages = transport.getSentMessages();
-		const listResourcesRequest = sentMessages[1] as MCP.JSONRPCRequest;
+		const listResourcesRequest = sentMessages[2] as MCP.JSONRPCRequest;
 		const requestId = listResourcesRequest.id;
 
 		// Simulate cancelled notification from server

From 7ef53af572bac0c0231edcd0f7bbc0b1de262eff Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Tue, 11 Mar 2025 18:52:13 +0100
Subject: [PATCH 0783/1815] Revert "Add workaround (again) for browser bug"
 (#243232)

---
 .../editContext/native/nativeEditContext.ts   |  2 +-
 .../native/nativeEditContextUtils.ts          | 21 +++++++------------
 .../contrib/chat/browser/chatWidget.ts        |  5 -----
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
index 9666b4275384..a6f5d41ad094 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
@@ -262,7 +262,7 @@ export class NativeEditContext extends AbstractEditContext {
 	}
 
 	public isFocused(): boolean {
-		return this._focusTracker.isFocused;
+		return this._focusTracker.isFocused || (getActiveWindow().document.activeElement === this.textArea.domNode);
 	}
 
 	public focus(): void {
diff --git a/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts b/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
index faa0ec2f2cc6..b3166de0437a 100644
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, getActiveElement, getShadowRoot } from '../../../../../base/browser/dom.js';
+import { addDisposableListener, getActiveWindow } from '../../../../../base/browser/dom.js';
 import { IDisposable, Disposable } from '../../../../../base/common/lifecycle.js';
 
 export interface ITypeData {
@@ -21,15 +21,8 @@ export class FocusTracker extends Disposable {
 		private readonly _onFocusChange: (newFocusValue: boolean) => void,
 	) {
 		super();
-		this._register(addDisposableListener(this._domNode, 'focus', () => {
-			// Here we don't trust the browser and instead we check
-			// that the active element is the one we are tracking
-			// (this happens when cmd+tab is used to switch apps)
-			this.refreshFocusState();
-		}));
-		this._register(addDisposableListener(this._domNode, 'blur', () => {
-			this._handleFocusedChanged(false);
-		}));
+		this._register(addDisposableListener(this._domNode, 'focus', () => this._handleFocusedChanged(true)));
+		this._register(addDisposableListener(this._domNode, 'blur', () => this._handleFocusedChanged(false)));
 	}
 
 	private _handleFocusedChanged(focused: boolean): void {
@@ -41,14 +34,14 @@ export class FocusTracker extends Disposable {
 	}
 
 	public focus(): void {
+		// fixes: https://github.com/microsoft/vscode/issues/228147
+		// Immediately call this method in order to directly set the field isFocused to true so the textInputFocus context key is evaluated correctly
+		this._handleFocusedChanged(true);
 		this._domNode.focus();
-		this.refreshFocusState();
 	}
 
 	public refreshFocusState(): void {
-		const shadowRoot = getShadowRoot(this._domNode);
-		const activeElement = shadowRoot ? shadowRoot.activeElement : getActiveElement();
-		const focused = this._domNode === activeElement;
+		const focused = this._domNode === getActiveWindow().document.activeElement;
 		this._handleFocusedChanged(focused);
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index 9d31efdde9b2..b7062cf6024f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -528,11 +528,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 	focusInput(): void {
 		this.inputPart.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 {

From 0e01b1cc94680791f9c92dd4c02fbcbfaa044a1b Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 11 Mar 2025 10:53:25 -0700
Subject: [PATCH 0784/1815] refactor: adopt proxychannel for calling
 INativeMcpDiscoveryHelperService

---
 src/vs/code/electron-main/app.ts              | 11 +++++--
 .../node/nativeMcpDiscoveryHelperChannel.ts   | 26 ++++-----------
 .../node/nativeMcpDiscoveryHelperService.ts   | 33 +++++++++++++++++++
 src/vs/server/node/serverServices.ts          |  6 ++--
 .../discovery/nativeMcpRemoteDiscovery.ts     | 11 ++++---
 .../electron-sandbox/nativeMpcDiscovery.ts    | 23 ++++++-------
 6 files changed, 69 insertions(+), 41 deletions(-)
 create mode 100644 src/vs/platform/mcp/node/nativeMcpDiscoveryHelperService.ts

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 22b09835a9c2..5bcfbd5b6541 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -118,8 +118,8 @@ import { IAuxiliaryWindowsMainService } from '../../platform/auxiliaryWindow/ele
 import { AuxiliaryWindowsMainService } from '../../platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService.js';
 import { normalizeNFC } from '../../base/common/normalization.js';
 import { ICSSDevelopmentService, CSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js';
-import { NativeMcpDiscoveryHelperChannelName } from '../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
-import { NativeMcpDiscoveryHelperChannel } from '../../platform/mcp/node/nativeMcpDiscoveryHelperChannel.js';
+import { INativeMcpDiscoveryHelperService, NativeMcpDiscoveryHelperChannelName } from '../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
+import { NativeMcpDiscoveryHelperService } from '../../platform/mcp/node/nativeMcpDiscoveryHelperService.js';
 
 /**
  * The main VS Code application. There will only ever be one instance,
@@ -1121,6 +1121,10 @@ export class CodeApplication extends Disposable {
 		// Proxy Auth
 		services.set(IProxyAuthService, new SyncDescriptor(ProxyAuthService));
 
+		// MCP
+		services.set(INativeMcpDiscoveryHelperService, new SyncDescriptor(NativeMcpDiscoveryHelperService));
+
+
 		// Dev Only: CSS service (for ESM)
 		services.set(ICSSDevelopmentService, new SyncDescriptor(CSSDevelopmentService, undefined, true));
 
@@ -1225,7 +1229,8 @@ export class CodeApplication extends Disposable {
 		mainProcessElectronServer.registerChannel('externalTerminal', externalTerminalChannel);
 
 		// MCP
-		mainProcessElectronServer.registerChannel(NativeMcpDiscoveryHelperChannelName, new NativeMcpDiscoveryHelperChannel(undefined));
+		const mcpDiscoveryChannel = ProxyChannel.fromService(accessor.get(INativeMcpDiscoveryHelperService), disposables);
+		mainProcessElectronServer.registerChannel(NativeMcpDiscoveryHelperChannelName, mcpDiscoveryChannel);
 
 		// Logger
 		const loggerChannel = new LoggerChannel(accessor.get(ILoggerMainService),);
diff --git a/src/vs/platform/mcp/node/nativeMcpDiscoveryHelperChannel.ts b/src/vs/platform/mcp/node/nativeMcpDiscoveryHelperChannel.ts
index 875788b36957..b09f36ba58ef 100644
--- a/src/vs/platform/mcp/node/nativeMcpDiscoveryHelperChannel.ts
+++ b/src/vs/platform/mcp/node/nativeMcpDiscoveryHelperChannel.ts
@@ -3,17 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { homedir } from 'os';
 import { Event } from '../../../base/common/event.js';
-import { URI } from '../../../base/common/uri.js';
 import { IURITransformer, transformOutgoingURIs } from '../../../base/common/uriIpc.js';
 import { IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
-import { INativeMcpDiscoveryData } from '../common/nativeMcpDiscoveryHelper.js';
-import { platform } from '../../../base/common/platform.js';
+import { INativeMcpDiscoveryHelperService } from '../common/nativeMcpDiscoveryHelper.js';
 
 export class NativeMcpDiscoveryHelperChannel implements IServerChannel {
 
-	constructor(private getUriTransformer: undefined | ((requestContext: any) => IURITransformer)) { }
+	constructor(
+		private getUriTransformer: undefined | ((requestContext: any) => IURITransformer),
+		@INativeMcpDiscoveryHelperService private nativeMcpDiscoveryHelperService: INativeMcpDiscoveryHelperService
+	) { }
 
 	listen(context: any, event: string): Event<any> {
 		throw new Error('Invalid listen');
@@ -23,25 +23,11 @@ export class NativeMcpDiscoveryHelperChannel implements IServerChannel {
 		const uriTransformer = this.getUriTransformer?.(context);
 		switch (command) {
 			case 'load': {
-				const result: INativeMcpDiscoveryData = {
-					platform,
-					homedir: URI.file(homedir()),
-					winAppData: this.uriFromEnvVariable('APPDATA'),
-					xdgHome: this.uriFromEnvVariable('XDG_CONFIG_HOME'),
-				};
-
+				const result = await this.nativeMcpDiscoveryHelperService.load();
 				return uriTransformer ? transformOutgoingURIs(result, uriTransformer) : result;
 			}
 		}
 		throw new Error('Invalid call');
 	}
-
-	private uriFromEnvVariable(varName: string) {
-		const envVar = process.env[varName];
-		if (!envVar) {
-			return undefined;
-		}
-		return URI.file(envVar);
-	}
 }
 
diff --git a/src/vs/platform/mcp/node/nativeMcpDiscoveryHelperService.ts b/src/vs/platform/mcp/node/nativeMcpDiscoveryHelperService.ts
new file mode 100644
index 000000000000..987f25f9a7cd
--- /dev/null
+++ b/src/vs/platform/mcp/node/nativeMcpDiscoveryHelperService.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 { homedir } from 'os';
+import { platform } from '../../../base/common/platform.js';
+import { URI } from '../../../base/common/uri.js';
+import { INativeMcpDiscoveryData, INativeMcpDiscoveryHelperService } from '../common/nativeMcpDiscoveryHelper.js';
+
+export class NativeMcpDiscoveryHelperService implements INativeMcpDiscoveryHelperService {
+	declare readonly _serviceBrand: undefined;
+
+	constructor() { }
+
+	load(): Promise<INativeMcpDiscoveryData> {
+		return Promise.resolve({
+			platform,
+			homedir: URI.file(homedir()),
+			winAppData: this.uriFromEnvVariable('APPDATA'),
+			xdgHome: this.uriFromEnvVariable('XDG_CONFIG_HOME'),
+		});
+	}
+
+	private uriFromEnvVariable(varName: string) {
+		const envVar = process.env[varName];
+		if (!envVar) {
+			return undefined;
+		}
+		return URI.file(envVar);
+	}
+}
+
diff --git a/src/vs/server/node/serverServices.ts b/src/vs/server/node/serverServices.ts
index cb2757d4104a..edb08e14d6dc 100644
--- a/src/vs/server/node/serverServices.ts
+++ b/src/vs/server/node/serverServices.ts
@@ -80,8 +80,9 @@ import { NodePtyHostStarter } from '../../platform/terminal/node/nodePtyHostStar
 import { CSSDevelopmentService, ICSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js';
 import { AllowedExtensionsService } from '../../platform/extensionManagement/common/allowedExtensionsService.js';
 import { TelemetryLogAppender } from '../../platform/telemetry/common/telemetryLogAppender.js';
-import { NativeMcpDiscoveryHelperChannelName } from '../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
+import { INativeMcpDiscoveryHelperService, NativeMcpDiscoveryHelperChannelName } from '../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
 import { NativeMcpDiscoveryHelperChannel } from '../../platform/mcp/node/nativeMcpDiscoveryHelperChannel.js';
+import { NativeMcpDiscoveryHelperService } from '../../platform/mcp/node/nativeMcpDiscoveryHelperService.js';
 
 const eventPrefix = 'monacoworkbench';
 
@@ -195,6 +196,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 	services.set(IExtensionSignatureVerificationService, new SyncDescriptor(ExtensionSignatureVerificationService));
 	services.set(IAllowedExtensionsService, new SyncDescriptor(AllowedExtensionsService));
 	services.set(INativeServerExtensionManagementService, new SyncDescriptor(ExtensionManagementService));
+	services.set(INativeMcpDiscoveryHelperService, new SyncDescriptor(NativeMcpDiscoveryHelperService));
 
 	const instantiationService: IInstantiationService = new InstantiationService(services);
 	services.set(ILanguagePackService, instantiationService.createInstance(NativeLanguagePackService));
@@ -226,7 +228,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 		const remoteExtensionsScanner = new RemoteExtensionsScannerService(instantiationService.createInstance(ExtensionManagementCLI, logService), environmentService, userDataProfilesService, extensionsScannerService, logService, extensionGalleryService, languagePackService, extensionManagementService);
 		socketServer.registerChannel(RemoteExtensionsScannerChannelName, new RemoteExtensionsScannerChannel(remoteExtensionsScanner, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
 
-		socketServer.registerChannel(NativeMcpDiscoveryHelperChannelName, new NativeMcpDiscoveryHelperChannel((ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
+		socketServer.registerChannel(NativeMcpDiscoveryHelperChannelName, instantiationService.createInstance(NativeMcpDiscoveryHelperChannel, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
 
 		const remoteFileSystemChannel = disposables.add(new RemoteAgentFileSystemProviderChannel(logService, environmentService, configurationService));
 		socketServer.registerChannel(REMOTE_FILE_SYSTEM_CHANNEL_NAME, remoteFileSystemChannel);
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpRemoteDiscovery.ts b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpRemoteDiscovery.ts
index 0eacf9c41840..44e2ed08b5bc 100644
--- a/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpRemoteDiscovery.ts
+++ b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpRemoteDiscovery.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { ProxyChannel } from '../../../../../base/parts/ipc/common/ipc.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
-import { INativeMcpDiscoveryData, NativeMcpDiscoveryHelperChannelName } from '../../../../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
-import { Dto } from '../../../../services/extensions/common/proxyIdentifier.js';
+import { INativeMcpDiscoveryHelperService, NativeMcpDiscoveryHelperChannelName } from '../../../../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
 import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js';
 import { IMcpRegistry } from '../mcpRegistryTypes.js';
 import { FilesystemMpcDiscovery } from './nativeMcpDiscoveryAbstract.js';
@@ -34,15 +34,16 @@ export class RemoteNativeMpcDiscovery extends FilesystemMpcDiscovery {
 			return this.setDetails(undefined);
 		}
 
-		connection.withChannel(NativeMcpDiscoveryHelperChannelName, channel =>
-			channel.call<Dto<INativeMcpDiscoveryData>>('load', undefined))
+		await connection.withChannel(NativeMcpDiscoveryHelperChannelName, async channel => {
+			const service = ProxyChannel.toService<INativeMcpDiscoveryHelperService>(channel);
 
-			.then(
+			service.load().then(
 				data => this.setDetails(data),
 				err => {
 					this.logService.warn('Error getting remote process MCP environment', err);
 					this.setDetails(undefined);
 				}
 			);
+		});
 	}
 }
diff --git a/src/vs/workbench/contrib/mcp/electron-sandbox/nativeMpcDiscovery.ts b/src/vs/workbench/contrib/mcp/electron-sandbox/nativeMpcDiscovery.ts
index 7f623f83643e..3a05e75b7a05 100644
--- a/src/vs/workbench/contrib/mcp/electron-sandbox/nativeMpcDiscovery.ts
+++ b/src/vs/workbench/contrib/mcp/electron-sandbox/nativeMpcDiscovery.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
-import { INativeMcpDiscoveryData, NativeMcpDiscoveryHelperChannelName } from '../../../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
-import { Dto } from '../../../services/extensions/common/proxyIdentifier.js';
+import { INativeMcpDiscoveryHelperService, NativeMcpDiscoveryHelperChannelName } from '../../../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
 import { FilesystemMpcDiscovery } from '../common/discovery/nativeMcpDiscoveryAbstract.js';
 import { IMcpRegistry } from '../common/mcpRegistryTypes.js';
 
@@ -26,14 +26,15 @@ export class NativeMcpDiscovery extends FilesystemMpcDiscovery {
 	}
 
 	public override start(): void {
-		this.mainProcess.getChannel(NativeMcpDiscoveryHelperChannelName)
-			.call<Dto<INativeMcpDiscoveryData>>('load', undefined)
-			.then(
-				data => this.setDetails(data),
-				err => {
-					this.logService.warn('Error getting main process MCP environment', err);
-					this.setDetails(undefined);
-				}
-			);
+		const service = ProxyChannel.toService<INativeMcpDiscoveryHelperService>(
+			this.mainProcess.getChannel(NativeMcpDiscoveryHelperChannelName));
+
+		service.load().then(
+			data => this.setDetails(data),
+			err => {
+				this.logService.warn('Error getting main process MCP environment', err);
+				this.setDetails(undefined);
+			}
+		);
 	}
 }

From ef3d0c75cfe200c7f0fda59736d4af840ab59bc6 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Tue, 11 Mar 2025 19:12:18 +0100
Subject: [PATCH 0785/1815] update notebook (#243233)

---
 .vscode/notebooks/api.github-issues | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/notebooks/api.github-issues b/.vscode/notebooks/api.github-issues
index 09d6480e1024..3a0eaec922fa 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:\"February 2025\""
+    "value": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"March 2025\""
   },
   {
     "kind": 1,

From 85e7090710c8403fe01be482c0c0450bb3dfd256 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Tue, 11 Mar 2025 19:13:38 +0100
Subject: [PATCH 0786/1815] Fixes #228033 (#243234)

---
 .../controller/inlineCompletionsController.ts | 12 ++++++---
 .../inlineCompletionsAccessibleView.ts        | 27 +++++++++++++------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
index bc5d723722fc..1658944cc6d5 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
@@ -243,7 +243,7 @@ export class InlineCompletionsController extends Disposable {
 
 		const currentInlineCompletionBySemanticId = derivedObservableWithCache<string | undefined>(this, (reader, last) => {
 			const model = this.model.read(reader);
-			const state = model?.inlineCompletionState.read(reader);
+			const state = model?.state.read(reader);
 			if (this._suggestWidgetAdapter.selectedItem.get()) {
 				return last;
 			}
@@ -256,16 +256,20 @@ export class InlineCompletionsController extends Disposable {
 		}), async (_value, _, _deltas, store) => {
 			/** @description InlineCompletionsController.playAccessibilitySignalAndReadSuggestion */
 			const model = this.model.get();
-			const state = model?.inlineCompletionState.get();
+			const state = model?.state.get();
 			if (!state || !model) { return; }
-			const lineText = model.textModel.getLineContent(state.primaryGhostText.lineNumber);
+			const lineText = state.kind === 'ghostText' ? model.textModel.getLineContent(state.primaryGhostText.lineNumber) : '';
 
 			await timeout(50, cancelOnDispose(store));
 			await waitForState(this._suggestWidgetAdapter.selectedItem, isUndefined, () => false, cancelOnDispose(store));
 
 			await this._accessibilitySignalService.playSignal(AccessibilitySignal.inlineSuggestion);
 			if (this.editor.getOption(EditorOption.screenReaderAnnounceInlineSuggestion)) {
-				this._provideScreenReaderUpdate(state.primaryGhostText.renderForScreenReader(lineText));
+				if (state.kind === 'ghostText') {
+					this._provideScreenReaderUpdate(state.primaryGhostText.renderForScreenReader(lineText));
+				} else {
+					this._provideScreenReaderUpdate(''); // Only announce Alt+F2
+				}
 			}
 		}));
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts
index 0a4e864d2c67..959a99ea366c 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts
@@ -14,12 +14,16 @@ import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextke
 import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { InlineCompletionsModel } from './model/inlineCompletionsModel.js';
+import { TextEdit } from '../../../common/core/textEdit.js';
+import { LineEdit } from '../../../common/core/lineEdit.js';
+import { TextModelText } from '../../../common/model/textModelText.js';
+import { localize } from '../../../../nls.js';
 
 export class InlineCompletionsAccessibleView implements IAccessibleViewImplementation {
 	readonly type = AccessibleViewType.View;
 	readonly priority = 95;
 	readonly name = 'inline-completions';
-	readonly when = ContextKeyExpr.and(InlineCompletionContextKeys.inlineSuggestionVisible);
+	readonly when = ContextKeyExpr.or(InlineCompletionContextKeys.inlineSuggestionVisible, InlineCompletionContextKeys.inlineEditVisible);
 	getProvider(accessor: ServicesAccessor) {
 		const codeEditorService = accessor.get(ICodeEditorService);
 		const editor = codeEditorService.getActiveCodeEditor() || codeEditorService.getFocusedCodeEditor();
@@ -28,7 +32,7 @@ export class InlineCompletionsAccessibleView implements IAccessibleViewImplement
 		}
 
 		const model = InlineCompletionsController.get(editor)?.model.get();
-		if (!model?.inlineCompletionState.get()) {
+		if (!model?.state.get()) {
 			return;
 		}
 
@@ -51,16 +55,23 @@ class InlineCompletionsAccessibleViewContentProvider extends Disposable implemen
 	public readonly options = { language: this._editor.getModel()?.getLanguageId() ?? undefined, type: AccessibleViewType.View };
 
 	public provideContent(): string {
-		const state = this._model.inlineCompletionState.get();
+		const state = this._model.state.get();
 		if (!state) {
 			throw new Error('Inline completion is visible but state is not available');
 		}
-		const lineText = this._model.textModel.getLineContent(state.primaryGhostText.lineNumber);
-		const ghostText = state.primaryGhostText.renderForScreenReader(lineText);
-		if (!ghostText) {
-			throw new Error('Inline completion is visible but ghost text is not available');
+		if (state.kind === 'ghostText') {
+
+			const lineText = this._model.textModel.getLineContent(state.primaryGhostText.lineNumber);
+			const ghostText = state.primaryGhostText.renderForScreenReader(lineText);
+			if (!ghostText) {
+				throw new Error('Inline completion is visible but ghost text is not available');
+			}
+			return lineText + ghostText;
+		} else {
+			const text = new TextModelText(this._model.textModel);
+			const lineEdit = LineEdit.fromTextEdit(new TextEdit(state.edits), text);
+			return localize('inlineEditAvailable', 'There is an inline edit available:') + '\n' + lineEdit.humanReadablePatch(text.getLines());
 		}
-		return lineText + ghostText;
 	}
 	public provideNextContent(): string | undefined {
 		// asynchronously update the model and fire the event

From 7cddf2eb98a555c64a099d015bf436d618fea1d4 Mon Sep 17 00:00:00 2001
From: Joyce Er <30305945+joyceerhl@users.noreply.github.com>
Date: Tue, 11 Mar 2025 11:17:35 -0700
Subject: [PATCH 0787/1815] fix: reenable implicit context for chat editors
 (#243237)

---
 src/vs/workbench/contrib/chat/browser/chatEditor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditor.ts b/src/vs/workbench/contrib/chat/browser/chatEditor.ts
index 7b89c3d65a62..19280d5133db 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditor.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditor.ts
@@ -68,6 +68,7 @@ export class ChatEditor extends EditorPane {
 				undefined,
 				{
 					supportsFileReferences: true,
+					enableImplicitContext: true,
 				},
 				{
 					listForeground: editorForeground,

From 91c7debaf60542381e92f3b101f48a7d5598df6a Mon Sep 17 00:00:00 2001
From: Bhavya U <bhavyau@microsoft.com>
Date: Tue, 11 Mar 2025 11:43:36 -0700
Subject: [PATCH 0788/1815] Allow edits chat action to accept input query
 (#243247)

---
 .../chat/browser/actions/chatClearActions.ts       | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
index 0ea53e725db8..6187720a229e 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
@@ -23,7 +23,7 @@ import { EditingSessionAction } from '../chatEditing/chatEditingActions.js';
 import { ctxIsGlobalEditingSession } from '../chatEditing/chatEditingEditorContextKeys.js';
 import { ChatEditorInput } from '../chatEditorInput.js';
 import { ChatViewPane } from '../chatViewPane.js';
-import { CHAT_CATEGORY } from './chatActions.js';
+import { CHAT_CATEGORY, IChatViewOpenOptions } from './chatActions.js';
 import { clearChatEditor } from './chatClear.js';
 
 export const ACTION_ID_NEW_CHAT = `workbench.action.chat.newChat`;
@@ -377,9 +377,19 @@ export function registerNewChatActions() {
 			});
 		}
 
-		async run(accessor: ServicesAccessor, ...args: any[]) {
+		async run(accessor: ServicesAccessor, opts?: string | IChatViewOpenOptions) {
+			opts = typeof opts === 'string' ? { query: opts } : opts;
 			const viewsService = accessor.get(IViewsService);
 			const chatView = await viewsService.openView(EditsViewId) as ChatViewPane;
+
+			if (opts?.query) {
+				if (opts.isPartialQuery) {
+					chatView.widget.setInput(opts.query);
+				} else {
+					chatView.widget.acceptInput(opts.query);
+				}
+			}
+
 			chatView.widget.focusInput();
 		}
 	});

From 7d2f5bb1aee0ce20c6259d96b0d81f0aa9f9a0db Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Tue, 11 Mar 2025 20:15:46 +0100
Subject: [PATCH 0789/1815] add context keys and control tools command
 placement based on MCP servers being around

---
 .../platform/contextkey/common/contextkey.ts  |  4 +++
 .../contrib/mcp/browser/mcp.contribution.ts   |  2 ++
 .../contrib/mcp/browser/mcpCommands.ts        | 11 ++++--
 .../contrib/mcp/common/mcpContextKeys.ts      | 36 +++++++++++++++++++
 4 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts

diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts
index ef011cc6b2c3..57be3923e57d 100644
--- a/src/vs/platform/contextkey/common/contextkey.ts
+++ b/src/vs/platform/contextkey/common/contextkey.ts
@@ -2005,6 +2005,10 @@ export class RawContextKey<T extends ContextKeyValue> extends ContextKeyDefinedE
 	public notEqualsTo(value: any): ContextKeyExpression {
 		return ContextKeyNotEqualsExpr.create(this.key, value);
 	}
+
+	public greater(value: any): ContextKeyExpression {
+		return ContextKeyGreaterExpr.create(this.key, value);
+	}
 }
 
 export type ContextKeyValue = null | undefined | boolean | number | string
diff --git a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
index 987334853c1b..ce7d2c0b0ca5 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
@@ -22,6 +22,7 @@ import { McpDiscovery } from './mcpDiscovery.js';
 import { AttachMCPToolsAction, AttachMCPToolsActionRendering, ListMcpServerCommand, McpServerOptionsCommand } from './mcpCommands.js';
 
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { McpContextKeysController } from '../common/mcpContextKeys.js';
 
 registerSingleton(IMcpRegistry, McpRegistry, InstantiationType.Delayed);
 registerSingleton(IMcpService, McpService, InstantiationType.Delayed);
@@ -30,6 +31,7 @@ mcpDiscoveryRegistry.register(new SyncDescriptor(RemoteNativeMpcDiscovery));
 mcpDiscoveryRegistry.register(new SyncDescriptor(ConfigMcpDiscovery));
 
 registerWorkbenchContribution2('mcpDiscovery', McpDiscovery, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2('mcpContextKeys', McpContextKeysController, WorkbenchPhase.BlockRestore);
 
 registerAction2(ListMcpServerCommand);
 registerAction2(McpServerOptionsCommand);
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 002e54c518b3..364c5c2b4b49 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -25,6 +25,7 @@ import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { CHAT_CATEGORY } from '../../chat/browser/actions/chatActions.js';
 import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
 import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
+import { McpContextKeys } from '../common/mcpContextKeys.js';
 import { IMcpService, IMcpTool, McpConnectionState } from '../common/mcpTypes.js';
 
 // acroynms do not get localized
@@ -178,9 +179,15 @@ export class AttachMCPToolsAction extends Action2 {
 			icon: Codicon.tools,
 			f1: false,
 			category: CHAT_CATEGORY,
-			precondition: ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
+			precondition: ContextKeyExpr.and(
+				McpContextKeys.serverCount.greater(0),
+				ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)
+			),
 			menu: {
-				when: ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
+				when: ContextKeyExpr.and(
+					McpContextKeys.serverCount.greater(0),
+					ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)
+				),
 				id: MenuId.ChatInputAttachmentToolbar,
 				group: 'navigation'
 			},
diff --git a/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts b/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
new file mode 100644
index 000000000000..c49fd058f550
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/mcpContextKeys.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 { autorun } from '../../../../base/common/observable.js';
+import { localize } from '../../../../nls.js';
+import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IMcpService } from './mcpTypes.js';
+
+
+export namespace McpContextKeys {
+
+	export const serverCount = new RawContextKey<number>('mcp.serverCount', undefined, { type: 'number', description: localize('mcp.serverCount.description', "Context key that has the number of registered MCP servers") });
+}
+
+
+export class McpContextKeysController extends Disposable implements IWorkbenchContribution {
+	public static readonly ID = 'workbench.contrib.mcp.contextKey';
+
+	constructor(
+		@IMcpService mcpService: IMcpService,
+		@IContextKeyService contextKeyService: IContextKeyService
+	) {
+		super();
+
+		const ctxServerCount = McpContextKeys.serverCount.bindTo(contextKeyService);
+
+		this._store.add(autorun(r => {
+			ctxServerCount.set(mcpService.servers.read(r).length);
+		}));
+	}
+}

From bea6e1ff1b4e4f8bcd87953a5fe4e649a9ea035c Mon Sep 17 00:00:00 2001
From: Logan Ramos <lramos15@gmail.com>
Date: Tue, 11 Mar 2025 12:27:03 -0700
Subject: [PATCH 0790/1815] Add id to chat request (#243239)

* Add id to chat request

* Support proposed api check

* Do some casting
---
 src/vs/workbench/api/common/extHostChatAgents2.ts      |  6 ++++--
 src/vs/workbench/api/common/extHostTypeConverters.ts   | 10 +++++++++-
 .../vscode.proposed.chatParticipantPrivate.d.ts        |  4 ++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/api/common/extHostChatAgents2.ts b/src/vs/workbench/api/common/extHostChatAgents2.ts
index b95655d118a8..1c7afac413a5 100644
--- a/src/vs/workbench/api/common/extHostChatAgents2.ts
+++ b/src/vs/workbench/api/common/extHostChatAgents2.ts
@@ -404,7 +404,8 @@ 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 extRequest = typeConvert.ChatAgentRequest.to(request, location, model, this.getDiagnosticsWhenEnabled(detector.extension));
+		const includeInteractionId = isProposedApiEnabled(detector.extension, 'chatParticipantPrivate');
+		const extRequest = typeConvert.ChatAgentRequest.to(includeInteractionId ? request : { ...request, requestId: '' }, location, model, this.getDiagnosticsWhenEnabled(detector.extension));
 
 		return detector.provider.provideParticipantDetection(
 			extRequest,
@@ -488,7 +489,8 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 			stream = new ChatAgentResponseStream(agent.extension, request, this._proxy, this._commands.converter, sessionDisposables);
 
 			const model = await this.getModelForRequest(request, agent.extension);
-			const extRequest = typeConvert.ChatAgentRequest.to(request, location, model, this.getDiagnosticsWhenEnabled(agent.extension));
+			const includeInteractionId = isProposedApiEnabled(agent.extension, 'chatParticipantPrivate');
+			const extRequest = typeConvert.ChatAgentRequest.to(includeInteractionId ? request : { ...request, requestId: '' }, location, model, this.getDiagnosticsWhenEnabled(agent.extension));
 			inFlightRequest = { requestId: requestDto.requestId, extRequest };
 			this._inFlightRequests.add(inFlightRequest);
 
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
index 8f4a1d6533df..5e96a687c55f 100644
--- a/src/vs/workbench/api/common/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -2768,7 +2768,7 @@ export namespace ChatAgentRequest {
 	export function to(request: IChatAgentRequest, location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined, model: vscode.LanguageModelChat, diagnostics: readonly [vscode.Uri, readonly vscode.Diagnostic[]][]): vscode.ChatRequest {
 		const toolReferences = request.variables.variables.filter(v => v.isTool);
 		const variableReferences = request.variables.variables.filter(v => !v.isTool);
-		return {
+		const requestWithoutId = {
 			prompt: request.message,
 			command: request.command,
 			attempt: request.attempt ?? 0,
@@ -2783,6 +2783,14 @@ export namespace ChatAgentRequest {
 			toolInvocationToken: Object.freeze({ sessionId: request.sessionId }) as never,
 			model
 		};
+		if (request.requestId) {
+			return {
+				...requestWithoutId,
+				id: request.requestId
+			};
+		}
+		// This cast is done to allow sending the stabl version of ChatRequest which does not have an id property
+		return requestWithoutId as unknown as vscode.ChatRequest;
 	}
 }
 
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
index 1391558150a7..6a60318a2411 100644
--- a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
@@ -50,6 +50,10 @@ declare module 'vscode' {
 	}
 
 	export interface ChatRequest {
+		/**
+		 * The id of the chat request. Used to identity an interaction with any of the chat surfaces.
+		 */
+		readonly id: string;
 		/**
 		 * The attempt number of the request. The first request has attempt number 0.
 		 */

From e065362e8f07a37acb140b6fbe97e26b49ba359f Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Tue, 11 Mar 2025 20:43:06 +0100
Subject: [PATCH 0791/1815] Fix hovers with groupIds (#243230)

fix https://github.com/microsoft/vscode/issues/243215
---
 .../services/hoverService/hoverService.ts     | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/vs/editor/browser/services/hoverService/hoverService.ts b/src/vs/editor/browser/services/hoverService/hoverService.ts
index beed982c6656..25d55d9e9cd5 100644
--- a/src/vs/editor/browser/services/hoverService/hoverService.ts
+++ b/src/vs/editor/browser/services/hoverService/hoverService.ts
@@ -29,6 +29,7 @@ import { isNumber } from '../../../../base/common/types.js';
 import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { IMarkdownString } from '../../../../base/common/htmlContent.js';
 
 export class HoverService extends Disposable implements IHoverService {
 	declare readonly _serviceBrand: undefined;
@@ -81,6 +82,11 @@ export class HoverService extends Disposable implements IHoverService {
 		options: IHoverOptions,
 		lifecycleOptions: Pick<IHoverLifecycleOptions, 'groupId'>,
 	): IHoverWidget | undefined {
+		// Set `id` to default if it's undefined
+		if (options.id === undefined) {
+			options.id = getHoverIdFromContent(options.content);
+		}
+
 		if (!this._currentDelayedHover || this._currentDelayedHoverWasShown) {
 			// Current hover is locked, reject
 			if (this._currentHover?.isLocked) {
@@ -102,6 +108,9 @@ export class HoverService extends Disposable implements IHoverService {
 					}
 				});
 			}
+		} else if (this._currentDelayedHover && getHoverOptionsIdentity(this._currentHoverOptions) === getHoverOptionsIdentity(options)) {
+			// If the hover is the same but timeout is not finished yet, return the current hover
+			return this._currentDelayedHover;
 		}
 
 		const hover = this._createHover(options, undefined);
@@ -118,7 +127,6 @@ export class HoverService extends Disposable implements IHoverService {
 
 		timeout(this._configurationService.getValue<number>('workbench.hover.delay')).then(() => {
 			if (hover && !hover.isDisposed) {
-				this._currentDelayedHoverWasShown = true;
 				this._currentDelayedHoverWasShown = true;
 				this._showHover(hover, options);
 			}
@@ -189,11 +197,7 @@ export class HoverService extends Disposable implements IHoverService {
 
 		// Set `id` to default if it's undefined
 		if (options.id === undefined) {
-			options.id = isHTMLElement(options.content)
-				? undefined
-				: typeof options.content === 'string'
-					? options.content.toString()
-					: options.content.value;
+			options.id = getHoverIdFromContent(options.content);
 		}
 
 		if (getHoverOptionsIdentity(this._currentHoverOptions) === getHoverOptionsIdentity(options)) {
@@ -506,6 +510,16 @@ function getHoverOptionsIdentity(options: IHoverOptions | undefined): IHoverOpti
 	return options?.id ?? options;
 }
 
+function getHoverIdFromContent(content: string | HTMLElement | IMarkdownString): string | undefined {
+	if (isHTMLElement(content)) {
+		return undefined;
+	}
+	if (typeof content === 'string') {
+		return content.toString();
+	}
+	return content.value;
+}
+
 class HoverContextViewDelegate implements IDelegate {
 
 	// Render over all other context views

From e9a3e2a03c6617049865f76b87a7152fbbf3c9a9 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Wed, 12 Mar 2025 04:54:24 +0900
Subject: [PATCH 0792/1815] fix: libc checks for exec server (#243254)

---
 cli/src/util/prereqs.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
index 8752c2ff1566..44c859772e38 100644
--- a/cli/src/util/prereqs.rs
+++ b/cli/src/util/prereqs.rs
@@ -156,7 +156,7 @@ async fn check_glibc_version() -> Result<bool, String> {
 
 	if let Some(v) = version {
 		return if v >= *MIN_LDD_VERSION {
-			Ok(false)
+			Ok(true)
 		} else {
 			Err(format!(
 				"find GLIBC >= {} (but found {} instead) for GNU environments",

From e9f1d10a3a7aa36aa4332bea4c92bba483f568fb Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Tue, 11 Mar 2025 12:54:12 -0700
Subject: [PATCH 0793/1815] Capture all OSC sequences and ESC sequences

Part of microsoft/vscode-copilot#14072
---
 .../debug-server-ready/src/extension.ts       |  11 +-
 src/vs/base/common/strings.ts                 |  16 +-
 src/vs/base/test/common/strings.test.ts       | 328 +++++++++++-------
 3 files changed, 219 insertions(+), 136 deletions(-)

diff --git a/extensions/debug-server-ready/src/extension.ts b/extensions/debug-server-ready/src/extension.ts
index 22a8ff836d34..40155f306bc8 100644
--- a/extensions/debug-server-ready/src/extension.ts
+++ b/extensions/debug-server-ready/src/extension.ts
@@ -23,7 +23,14 @@ interface ServerReadyAction {
 }
 
 // From src/vs/base/common/strings.ts
-const CSI_SEQUENCE = /(?:(?:\x1b\[|\x9B)[=?>!]?[\d;:]*["$#'* ]?[a-zA-Z@^`{}|~])|(:?\x1b\].*?\x07)/g;
+const CSI_SEQUENCE = /(?:\x1b\[|\x9b)[=?>!]?[\d;:]*["$#'* ]?[a-zA-Z@^`{}|~]/;
+const OSC_SEQUENCE = /(?:\x1b\]|\x9d).*?(?:\x1b\\|\x07|\x9c)/;
+const ESC_SEQUENCE = /\x1b(?:[ #%\(\)\*\+\-\.\/]?[a-zA-Z0-9\|}~@])/;
+const CONTROL_SEQUENCES = new RegExp('(?:' + [
+	CSI_SEQUENCE.source,
+	OSC_SEQUENCE.source,
+	ESC_SEQUENCE.source,
+].join('|') + ')', 'g');
 
 /**
  * Froms vs/base/common/strings.ts in core
@@ -31,7 +38,7 @@ const CSI_SEQUENCE = /(?:(?:\x1b\[|\x9B)[=?>!]?[\d;:]*["$#'* ]?[a-zA-Z@^`{}|~])|
  */
 function removeAnsiEscapeCodes(str: string): string {
 	if (str) {
-		str = str.replace(CSI_SEQUENCE, '');
+		str = str.replace(CONTROL_SEQUENCES, '');
 	}
 
 	return str;
diff --git a/src/vs/base/common/strings.ts b/src/vs/base/common/strings.ts
index 9ed7eaa47326..1a8467170b55 100644
--- a/src/vs/base/common/strings.ts
+++ b/src/vs/base/common/strings.ts
@@ -802,14 +802,20 @@ export function rcut(text: string, n: number, suffix = ''): string {
 	return result.trim().replace(/b$/, '') + suffix;
 }
 
-// Escape codes, compiled from https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h3-Functions-using-CSI-_-ordered-by-the-final-character_s_
-// Plus additional markers for custom `\x1b]...\x07` instructions.
-const CSI_SEQUENCE = /(?:(?:\x1b\[|\x9B)[=?>!]?[\d;:]*["$#'* ]?[a-zA-Z@^`{}|~])|(:?\x1b\].*?\x07)/g;
+// 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)/;
+const ESC_SEQUENCE = /\x1b(?:[ #%\(\)\*\+\-\.\/]?[a-zA-Z0-9\|}~@])/;
+const CONTROL_SEQUENCES = new RegExp('(?:' + [
+	CSI_SEQUENCE.source,
+	OSC_SEQUENCE.source,
+	ESC_SEQUENCE.source,
+].join('|') + ')', 'g');
 
 /** Iterates over parts of a string with CSI sequences */
 export function* forAnsiStringParts(str: string) {
 	let last = 0;
-	for (const match of str.matchAll(CSI_SEQUENCE)) {
+	for (const match of str.matchAll(CONTROL_SEQUENCES)) {
 		if (last !== match.index) {
 			yield { isCode: false, str: str.substring(last, match.index) };
 		}
@@ -833,7 +839,7 @@ export function* forAnsiStringParts(str: string) {
  */
 export function removeAnsiEscapeCodes(str: string): string {
 	if (str) {
-		str = str.replace(CSI_SEQUENCE, '');
+		str = str.replace(CONTROL_SEQUENCES, '');
 	}
 
 	return str;
diff --git a/src/vs/base/test/common/strings.test.ts b/src/vs/base/test/common/strings.test.ts
index 7c567df4b6f1..dca2a40410e6 100644
--- a/src/vs/base/test/common/strings.test.ts
+++ b/src/vs/base/test/common/strings.test.ts
@@ -422,132 +422,9 @@ suite('Strings', () => {
 		}), 'a0ca1ca2ca3c');
 	});
 
-	test('removeAnsiEscapeCodes', () => {
-		const CSI = '\x1b\[';
-		const sequences = [
-			// Base cases from https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h3-Functions-using-CSI-_-ordered-by-the-final-character_s_
-			`${CSI}42@`,
-			`${CSI}42 @`,
-			`${CSI}42A`,
-			`${CSI}42 A`,
-			`${CSI}42B`,
-			`${CSI}42C`,
-			`${CSI}42D`,
-			`${CSI}42E`,
-			`${CSI}42F`,
-			`${CSI}42G`,
-			`${CSI}42;42H`,
-			`${CSI}42I`,
-			`${CSI}42J`,
-			`${CSI}?42J`,
-			`${CSI}42K`,
-			`${CSI}?42K`,
-			`${CSI}42L`,
-			`${CSI}42M`,
-			`${CSI}42P`,
-			`${CSI}#P`,
-			`${CSI}3#P`,
-			`${CSI}#Q`,
-			`${CSI}3#Q`,
-			`${CSI}#R`,
-			`${CSI}42S`,
-			`${CSI}?1;2;3S`,
-			`${CSI}42T`,
-			`${CSI}42;42;42;42;42T`,
-			`${CSI}>3T`,
-			`${CSI}42X`,
-			`${CSI}42Z`,
-			`${CSI}42^`,
-			`${CSI}42\``,
-			`${CSI}42a`,
-			`${CSI}42b`,
-			`${CSI}42c`,
-			`${CSI}=42c`,
-			`${CSI}>42c`,
-			`${CSI}42d`,
-			`${CSI}42e`,
-			`${CSI}42;42f`,
-			`${CSI}42g`,
-			`${CSI}3h`,
-			`${CSI}?3h`,
-			`${CSI}42i`,
-			`${CSI}?42i`,
-			`${CSI}3l`,
-			`${CSI}?3l`,
-			`${CSI}3m`,
-			`${CSI}>0;0m`,
-			`${CSI}>0m`,
-			`${CSI}?0m`,
-			`${CSI}42n`,
-			`${CSI}>42n`,
-			`${CSI}?42n`,
-			`${CSI}>42p`,
-			`${CSI}!p`,
-			`${CSI}0;0"p`,
-			`${CSI}42$p`,
-			`${CSI}?42$p`,
-			`${CSI}#p`,
-			`${CSI}3#p`,
-			`${CSI}>42q`,
-			`${CSI}42q`,
-			`${CSI}42 q`,
-			`${CSI}42"q`,
-			`${CSI}#q`,
-			`${CSI}42;42r`,
-			`${CSI}?3r`,
-			`${CSI}0;0;0;0;3$r`,
-			`${CSI}s`,
-			`${CSI}0;0s`,
-			`${CSI}>42s`,
-			`${CSI}?3s`,
-			`${CSI}42;42;42t`,
-			`${CSI}>3t`,
-			`${CSI}42 t`,
-			`${CSI}0;0;0;0;3$t`,
-			`${CSI}u`,
-			`${CSI}42 u`,
-			`${CSI}0;0;0;0;0;0;0;0$v`,
-			`${CSI}42$w`,
-			`${CSI}0;0;0;0'w`,
-			`${CSI}42x`,
-			`${CSI}42*x`,
-			`${CSI}0;0;0;0;0$x`,
-			`${CSI}42#y`,
-			`${CSI}0;0;0;0;0;0*y`,
-			`${CSI}42;0'z`,
-			`${CSI}0;1;2;4$z`,
-			`${CSI}3'{`,
-			`${CSI}#{`,
-			`${CSI}3#{`,
-			`${CSI}0;0;0;0\${`,
-			`${CSI}0;0;0;0#|`,
-			`${CSI}42$|`,
-			`${CSI}42'|`,
-			`${CSI}42*|`,
-			`${CSI}#}`,
-			`${CSI}42'}`,
-			`${CSI}42$}`,
-			`${CSI}42'~`,
-			`${CSI}42$~`,
-
-			// Common SGR cases:
-			`${CSI}1;31m`, // multiple attrs
-			`${CSI}105m`, // bright background
-			`${CSI}48:5:128m`, // 256 indexed color
-			`${CSI}48;5;128m`, // 256 indexed color alt
-			`${CSI}38:2:0:255:255:255m`, // truecolor
-			`${CSI}38;2;255;255;255m`, // truecolor alt
-
-			// Custom sequences:
-			'\x1b]633;SetMark;\x07',
-			'\x1b]633;P;Cwd=/foo\x07',
-		];
-
-		for (const sequence of sequences) {
+	suite('removeAnsiEscapeCodes', () => {
+		function testSequence(sequence: string) {
 			assert.strictEqual(strings.removeAnsiEscapeCodes(`hello${sequence}world`), 'helloworld', `expect to remove ${JSON.stringify(sequence)}`);
-		}
-
-		for (const sequence of sequences) {
 			assert.deepStrictEqual(
 				[...strings.forAnsiStringParts(`hello${sequence}world`)],
 				[{ isCode: false, str: 'hello' }, { isCode: true, str: sequence }, { isCode: false, str: 'world' }],
@@ -555,10 +432,203 @@ suite('Strings', () => {
 			);
 		}
 
-		// #209937
-		assert.strictEqual(
-			strings.removeAnsiEscapeCodes(`localhost:\x1b[31m1234`),
-			'localhost:1234',);
+		test('CSI sequences', () => {
+			const CSI = '\x1b[';
+			const sequences = [
+				// Base cases from https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h3-Functions-using-CSI-_-ordered-by-the-final-character_s_
+				`${CSI}42@`,
+				`${CSI}42 @`,
+				`${CSI}42A`,
+				`${CSI}42 A`,
+				`${CSI}42B`,
+				`${CSI}42C`,
+				`${CSI}42D`,
+				`${CSI}42E`,
+				`${CSI}42F`,
+				`${CSI}42G`,
+				`${CSI}42;42H`,
+				`${CSI}42I`,
+				`${CSI}42J`,
+				`${CSI}?42J`,
+				`${CSI}42K`,
+				`${CSI}?42K`,
+				`${CSI}42L`,
+				`${CSI}42M`,
+				`${CSI}42P`,
+				`${CSI}#P`,
+				`${CSI}3#P`,
+				`${CSI}#Q`,
+				`${CSI}3#Q`,
+				`${CSI}#R`,
+				`${CSI}42S`,
+				`${CSI}?1;2;3S`,
+				`${CSI}42T`,
+				`${CSI}42;42;42;42;42T`,
+				`${CSI}>3T`,
+				`${CSI}42X`,
+				`${CSI}42Z`,
+				`${CSI}42^`,
+				`${CSI}42\``,
+				`${CSI}42a`,
+				`${CSI}42b`,
+				`${CSI}42c`,
+				`${CSI}=42c`,
+				`${CSI}>42c`,
+				`${CSI}42d`,
+				`${CSI}42e`,
+				`${CSI}42;42f`,
+				`${CSI}42g`,
+				`${CSI}3h`,
+				`${CSI}?3h`,
+				`${CSI}42i`,
+				`${CSI}?42i`,
+				`${CSI}3l`,
+				`${CSI}?3l`,
+				`${CSI}3m`,
+				`${CSI}>0;0m`,
+				`${CSI}>0m`,
+				`${CSI}?0m`,
+				`${CSI}42n`,
+				`${CSI}>42n`,
+				`${CSI}?42n`,
+				`${CSI}>42p`,
+				`${CSI}!p`,
+				`${CSI}0;0"p`,
+				`${CSI}42$p`,
+				`${CSI}?42$p`,
+				`${CSI}#p`,
+				`${CSI}3#p`,
+				`${CSI}>42q`,
+				`${CSI}42q`,
+				`${CSI}42 q`,
+				`${CSI}42"q`,
+				`${CSI}#q`,
+				`${CSI}42;42r`,
+				`${CSI}?3r`,
+				`${CSI}0;0;0;0;3$r`,
+				`${CSI}s`,
+				`${CSI}0;0s`,
+				`${CSI}>42s`,
+				`${CSI}?3s`,
+				`${CSI}42;42;42t`,
+				`${CSI}>3t`,
+				`${CSI}42 t`,
+				`${CSI}0;0;0;0;3$t`,
+				`${CSI}u`,
+				`${CSI}42 u`,
+				`${CSI}0;0;0;0;0;0;0;0$v`,
+				`${CSI}42$w`,
+				`${CSI}0;0;0;0'w`,
+				`${CSI}42x`,
+				`${CSI}42*x`,
+				`${CSI}0;0;0;0;0$x`,
+				`${CSI}42#y`,
+				`${CSI}0;0;0;0;0;0*y`,
+				`${CSI}42;0'z`,
+				`${CSI}0;1;2;4$z`,
+				`${CSI}3'{`,
+				`${CSI}#{`,
+				`${CSI}3#{`,
+				`${CSI}0;0;0;0\${`,
+				`${CSI}0;0;0;0#|`,
+				`${CSI}42$|`,
+				`${CSI}42'|`,
+				`${CSI}42*|`,
+				`${CSI}#}`,
+				`${CSI}42'}`,
+				`${CSI}42$}`,
+				`${CSI}42'~`,
+				`${CSI}42$~`,
+
+				// Common SGR cases:
+				`${CSI}1;31m`, // multiple attrs
+				`${CSI}105m`, // bright background
+				`${CSI}48:5:128m`, // 256 indexed color
+				`${CSI}48;5;128m`, // 256 indexed color alt
+				`${CSI}38:2:0:255:255:255m`, // truecolor
+				`${CSI}38;2;255;255;255m`, // truecolor alt
+			];
+
+			for (const sequence of sequences) {
+				testSequence(sequence);
+			}
+		});
+
+		suite('OSC sequences', () => {
+			function testOscSequence(prefix: string, suffix: string) {
+				const sequenceContent = [
+					`633;SetMark;`,
+					`633;P;Cwd=/foo`,
+					`7;file://local/Users/me/foo/bar`
+				];
+
+				const sequences = [];
+				for (const content of sequenceContent) {
+					sequences.push(`${prefix}${content}${suffix}`);
+				}
+				for (const sequence of sequences) {
+					testSequence(sequence);
+				}
+			}
+			test('ESC ] Ps ; Pt ESC \\', () => {
+				testOscSequence('\x1b]', '\x1b\\');
+			});
+			test('ESC ] Ps ; Pt BEL', () => {
+				testOscSequence('\x1b]', '\x07');
+			});
+			test('ESC ] Ps ; Pt ST', () => {
+				testOscSequence('\x1b]', '\x9c');
+			});
+			test('OSC Ps ; Pt ESC \\', () => {
+				testOscSequence('\x9d', '\x1b\\');
+			});
+			test('OSC Ps ; Pt BEL', () => {
+				testOscSequence('\x9d', '\x07');
+			});
+			test('OSC Ps ; Pt ST', () => {
+				testOscSequence('\x9d', '\x9c');
+			});
+		});
+
+		test('ESC sequences', () => {
+			const sequenceContent = [
+				` F`,
+				` G`,
+				` L`,
+				` M`,
+				` N`,
+				`#3`,
+				`#4`,
+				`#5`,
+				`#6`,
+				`#8`,
+				`%@`,
+				`%G`,
+				`(C`,
+				`)C`,
+				`*C`,
+				`+C`,
+				`-C`,
+				`.C`,
+				`/C`
+			];
+			const sequences = [];
+			for (const content of sequenceContent) {
+				sequences.push(`\x1b${content}`);
+			}
+			for (const sequence of sequences) {
+				testSequence(sequence);
+			}
+		});
+
+		suite('regression tests', () => {
+			test('#209937', () => {
+				assert.strictEqual(
+					strings.removeAnsiEscapeCodes(`localhost:\x1b[31m1234`),
+					'localhost:1234'
+				);
+			});
+		});
 	});
 
 	test('removeAnsiEscapeCodesFromPrompt', () => {

From 212086e8cf206b375ea03e793d0a989e2224f209 Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Tue, 11 Mar 2025 13:19:47 -0700
Subject: [PATCH 0794/1815] fix diff navigation for out-of-viewport changes
 (#243249)

* navigate modified cells

* fix leaked disposable

---------

Co-authored-by: amunger <>
---
 .../chatEditingNotebookEditorIntegration.ts   | 102 ++++++++----------
 .../notebook/browser/view/notebookCellList.ts |   2 +-
 2 files changed, 47 insertions(+), 57 deletions(-)

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 04999b9d6859..dc2a00bbbe48 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
@@ -8,6 +8,8 @@ import { autorun, derivedWithStore, IObservable, ISettableObservable, observable
 import { debouncedObservable } from '../../../../../../base/common/observableInternal/utils.js';
 import { basename } from '../../../../../../base/common/resources.js';
 import { assertType } from '../../../../../../base/common/types.js';
+import { LineRange } from '../../../../../../editor/common/core/lineRange.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
 import { nullDocumentDiff } from '../../../../../../editor/common/diff/documentDiffProvider.js';
 import { PrefixSumComputer } from '../../../../../../editor/common/model/prefixSumComputer.js';
 import { localize } from '../../../../../../nls.js';
@@ -18,7 +20,7 @@ import { IEditorService } from '../../../../../services/editor/common/editorServ
 import { NotebookDeletedCellDecorator } from '../../../../notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.js';
 import { NotebookInsertedCellDecorator } from '../../../../notebook/browser/diff/inlineDiff/notebookInsertedCellDecorator.js';
 import { INotebookTextDiffEditor } from '../../../../notebook/browser/diff/notebookDiffEditorBrowser.js';
-import { getNotebookEditorFromEditorPane, INotebookEditor } from '../../../../notebook/browser/notebookBrowser.js';
+import { getNotebookEditorFromEditorPane, ICellViewModel, INotebookEditor } from '../../../../notebook/browser/notebookBrowser.js';
 import { INotebookEditorService } from '../../../../notebook/browser/services/notebookEditorService.js';
 import { NotebookCellTextModel } from '../../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../../notebook/common/model/notebookTextModel.js';
@@ -332,35 +334,6 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 			}
 		}
 	}
-	getNextCell(nextOrPrevious: boolean) {
-		const current = this.getCurrentCell();
-		if (!current) {
-			// const changes = this.cellChanges.get().filter(c => c.type === 'modified' || c.type !== 'delete');
-			// if (!changes.length) {
-			// 	return undefined;
-			// }
-			// return this.getIntegrationForCell(changes[0].modifiedCellIndex);
-			return;
-		}
-		const changes = this.cellChanges.get().filter(c => c.type === 'modified' || c.type === 'insert');
-		const nextIndex = changes.reduce((prev, curr) => {
-			if (nextOrPrevious) {
-				if (typeof curr.modifiedCellIndex !== 'number' || curr.modifiedCellIndex <= current.index) {
-					return prev;
-				}
-				return Math.min(prev, curr.modifiedCellIndex);
-			} else {
-				if (typeof curr.modifiedCellIndex !== 'number' || curr.modifiedCellIndex >= current.index) {
-					return prev;
-				}
-				return Math.max(prev, curr.modifiedCellIndex);
-			}
-		}, nextOrPrevious ? Number.MAX_SAFE_INTEGER : -1);
-		if (nextIndex === -1 || nextIndex === Number.MAX_SAFE_INTEGER) {
-			return undefined;
-		}
-		return this.getCell(nextIndex);
-	}
 
 	getCell(modifiedCellIndex: number) {
 		const cell = this.notebookModel.cells[modifiedCellIndex];
@@ -377,19 +350,26 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 		this._revealChange(change, firstOrLast);
 	}
 
-	private _revealChange(change: ICellDiffInfo, firstOrLast?: boolean) {
+	private _revealChange(change: ICellDiffInfo, firstOrLast: boolean = true) {
 		switch (change.type) {
 			case 'insert':
 			case 'modified':
 				{
+					const index = firstOrLast || change.type === 'insert' ? 0 : change.diff.get().changes.length - 1;
+					// TODO: check if this breaks for inserted cells
+					const textChange = change.diff.get().changes[index];
 					const cell = this.getCell(change.modifiedCellIndex);
-					if (!cell) {
-						return false;
+					if (cell) {
+						cell.integration.reveal(firstOrLast);
+						this._currentChange.set({ change: change, index }, undefined);
+					} else {
+						const cellViewModel = this.getCellViewModel(change);
+						if (cellViewModel) {
+							this.revealChangeInView(cellViewModel, textChange.modified);
+							this._currentChange.set({ change: change, index }, undefined);
+						}
 					}
 
-					cell.integration.reveal(firstOrLast ?? true);
-					this._currentChange.set({ change: change, index: cell.integration.currentIndex.get() }, undefined);
-
 					return true;
 				}
 			case 'delete':
@@ -405,6 +385,20 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 		return false;
 	}
 
+	private getCellViewModel(change: ICellDiffInfo) {
+		if (change.type === 'delete' || change.modifiedCellIndex === undefined) {
+			return undefined;
+		}
+		const cell = this.notebookModel.cells[change.modifiedCellIndex];
+		const cellViewModel = this.notebookEditor.getViewModel()?.viewCells.find(c => c.handle === cell.handle);
+		return cellViewModel;
+	}
+
+	private async revealChangeInView(cell: ICellViewModel, lines: LineRange): Promise<void> {
+		await this.notebookEditor.focusNotebookCell(cell, 'editor', { focusEditorLine: lines.startLineNumber });
+		await this.notebookEditor.revealRangeInCenterAsync(cell, new Range(lines.startLineNumber, 0, lines.endLineNumberExclusive, 0));
+	}
+
 	next(wrap: boolean): boolean {
 		const changes = sortCellChanges(this.cellChanges.get().filter(c => c.type !== 'unchanged'));
 		const currentChange = this.currentChange.get();
@@ -425,18 +419,16 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 			case 'modified':
 				{
 					const currentChangeInfo = this.getCell(currentChange.change.modifiedCellIndex);
-					if (!currentChangeInfo) {
-						return false;
+					if (currentChangeInfo) {
+						if (currentChangeInfo.integration.next(false)) {
+							this._currentChange.set({ change: currentChange.change, index: currentChangeInfo.integration.currentIndex.get() }, undefined);
+							return true;
+						}
 					}
 
-					if (currentChangeInfo.integration.next(false)) {
-						this._currentChange.set({ change: currentChange.change, index: currentChangeInfo.integration.currentIndex.get() }, undefined);
-						return true;
-					} else {
-						const nextChange = changes[changes.indexOf(currentChange.change) + 1];
-						if (nextChange) {
-							return this._revealChange(nextChange, true);
-						}
+					const nextChange = changes[changes.indexOf(currentChange.change) + 1];
+					if (nextChange) {
+						return this._revealChange(nextChange, true);
 					}
 				}
 				break;
@@ -480,18 +472,16 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 			case 'modified':
 				{
 					const currentChangeInfo = this.getCell(currentChange.change.modifiedCellIndex);
-					if (!currentChangeInfo) {
-						return false;
+					if (currentChangeInfo) {
+						if (currentChangeInfo.integration.previous(false)) {
+							this._currentChange.set({ change: currentChange.change, index: currentChangeInfo.integration.currentIndex.get() }, undefined);
+							return true;
+						}
 					}
 
-					if (currentChangeInfo.integration.previous(false)) {
-						this._currentChange.set({ change: currentChange.change, index: currentChangeInfo.integration.currentIndex.get() }, undefined);
-						return true;
-					} else {
-						const prevChange = changes[changes.indexOf(currentChange.change) - 1];
-						if (prevChange) {
-							return this._revealChange(prevChange, false);
-						}
+					const nextChange = changes[changes.indexOf(currentChange.change) - 1];
+					if (nextChange) {
+						return this._revealChange(nextChange, false);
 					}
 				}
 				break;
diff --git a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
index fdeaf59ad84e..652327a9acd7 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
@@ -1036,7 +1036,7 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 			}
 
 			const editorAttachedPromise = new Promise<void>((resolve, reject) => {
-				element.onDidChangeEditorAttachState(() => {
+				Event.once(element.onDidChangeEditorAttachState)(() => {
 					element.editorAttached ? resolve() : reject();
 				});
 			});

From d9b76ec948505defb9e974d165cd09c61a3fd542 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Tue, 11 Mar 2025 13:35:18 -0700
Subject: [PATCH 0795/1815] Fix extension host locking up when using terminal
 suggest

---
 extensions/terminal-suggest/src/terminalSuggestMain.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index ec8ceac83f22..d152aa97ba8d 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -346,7 +346,7 @@ export function sanitizeProcessEnvironment(env: Record<string, string>, ...prese
 	envKeys
 		.filter(key => !set[key])
 		.forEach(envKey => {
-			for (let i = 0; i < keysToRemove.length; i) {
+			for (let i = 0; i < keysToRemove.length; i++) {
 				if (envKey.search(keysToRemove[i]) !== -1) {
 					delete env[envKey];
 					break;

From e1851c98c74f6be5881d9282ea7cba58f316abd9 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Tue, 11 Mar 2025 21:54:57 +0100
Subject: [PATCH 0796/1815] introduce extension gallery manifest (#243265)

---
 .../common/extensionGalleryService.ts         | 559 ++++++++++++------
 .../common/extensionManagement.ts             |  16 +-
 2 files changed, 392 insertions(+), 183 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
index 7e64c57499d8..568a055716b6 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
@@ -15,7 +15,7 @@ import { URI } from '../../../base/common/uri.js';
 import { IHeaders, IRequestContext, IRequestOptions, isOfflineError } from '../../../base/parts/request/common/request.js';
 import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { IEnvironmentService } from '../../environment/common/environment.js';
-import { getTargetPlatform, IExtensionGalleryService, IExtensionIdentifier, IExtensionInfo, IGalleryExtension, IGalleryExtensionAsset, IGalleryExtensionAssets, IGalleryExtensionVersion, InstallOperation, IQueryOptions, IExtensionsControlManifest, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, ITranslation, SortBy, SortOrder, StatisticType, toTargetPlatform, WEB_EXTENSION_TAG, IExtensionQueryOptions, IDeprecationInfo, ISearchPrefferedResults, ExtensionGalleryError, ExtensionGalleryErrorCode, IProductVersion, UseUnpkgResourceApiConfigKey, IAllowedExtensionsService, EXTENSION_IDENTIFIER_REGEX } from './extensionManagement.js';
+import { getTargetPlatform, IExtensionGalleryService, IExtensionIdentifier, IExtensionInfo, IGalleryExtension, IGalleryExtensionAsset, IGalleryExtensionAssets, IGalleryExtensionVersion, InstallOperation, IQueryOptions, IExtensionsControlManifest, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, ITranslation, SortOrder, StatisticType, toTargetPlatform, WEB_EXTENSION_TAG, IExtensionQueryOptions, IDeprecationInfo, ISearchPrefferedResults, ExtensionGalleryError, ExtensionGalleryErrorCode, IProductVersion, UseUnpkgResourceApiConfigKey, IAllowedExtensionsService, EXTENSION_IDENTIFIER_REGEX, SortBy } from './extensionManagement.js';
 import { adoptToGalleryExtensionId, areSameExtensions, getGalleryExtensionId, getGalleryExtensionTelemetryData } from './extensionManagementUtil.js';
 import { IExtensionManifest, TargetPlatform } from '../../extensions/common/extensions.js';
 import { areApiProposalsCompatible, isEngineValid } from '../../extensions/common/extensionValidator.js';
@@ -30,6 +30,71 @@ import { StopWatch } from '../../../base/common/stopwatch.js';
 import { format2 } from '../../../base/common/strings.js';
 import { IAssignmentService } from '../../assignment/common/assignment.js';
 
+const enum ExtensionGalleryResourceType {
+	ExtensionQueryService = 'ExtensionQueryService',
+	ExtensionLatestVersionUri = 'ExtensionLatestVersionUriTemplate',
+	ExtensionStatisticsUri = 'ExtensionStatisticsUriTemplate',
+	WebExtensionStatisticsUri = 'WebExtensionStatisticsUriTemplate',
+	PublisherViewUri = 'PublisherViewUriTemplate',
+	ExtensionDetailsViewUri = 'ExtensionDetailsViewUriTemplate',
+	ExtensionRatingViewUri = 'ExtensionRatingViewUriTemplate',
+	WebLanguagePackService = 'WebLanguagePackService',
+	ExtensionUriTemplate = 'ExtensionUriTemplate',
+}
+
+const enum FilterType {
+	Category = 'Category',
+	ExtensionId = 'ExtensionId',
+	ExtensionName = 'ExtensionName',
+	ExcludeWithFlags = 'ExcludeWithFlags',
+	Featured = 'Featured',
+	SearchText = 'SearchText',
+	Tag = 'Tag',
+	Target = 'Target',
+}
+
+const enum Flag {
+	None = 'None',
+	IncludeVersions = 'IncludeVersions',
+	IncludeFiles = 'IncludeFiles',
+	IncludeCategoryAndTags = 'IncludeCategoryAndTags',
+	IncludeSharedAccounts = 'IncludeSharedAccounts',
+	IncludeVersionProperties = 'IncludeVersionProperties',
+	ExcludeNonValidated = 'ExcludeNonValidated',
+	IncludeInstallationTargets = 'IncludeInstallationTargets',
+	IncludeAssetUri = 'IncludeAssetUri',
+	IncludeStatistics = 'IncludeStatistics',
+	IncludeLatestVersionOnly = 'IncludeLatestVersionOnly',
+	Unpublished = 'Unpublished',
+	IncludeNameConflictInfo = 'IncludeNameConflictInfo',
+	IncludeLatestPrereleaseAndStableVersionOnly = 'IncludeLatestPrereleaseAndStableVersionOnly',
+}
+
+type ExtensionGalleryManifestResource = {
+	readonly '@id': string;
+	readonly '@type': string;
+};
+
+type ExtensionQueryCapabilityValue = {
+	readonly name: string;
+	readonly value: number;
+};
+
+interface IExtensionGalleryManifest {
+	readonly version: string;
+	readonly resources: readonly ExtensionGalleryManifestResource[];
+	readonly capabilities: {
+		readonly extensionQuery: {
+			readonly filtering?: readonly ExtensionQueryCapabilityValue[];
+			readonly sorting?: readonly ExtensionQueryCapabilityValue[];
+			readonly flags?: readonly ExtensionQueryCapabilityValue[];
+		};
+		readonly signing?: {
+			readonly allRepositoriesSigned: boolean;
+		};
+	};
+}
+
 const CURRENT_TARGET_PLATFORM = isWeb ? TargetPlatform.WEB : getTargetPlatform(platform, arch);
 const ACTIVITY_HEADER_NAME = 'X-Market-Search-Activity-Id';
 
@@ -101,108 +166,6 @@ interface IRawGalleryQueryResult {
 	}[];
 }
 
-enum Flags {
-
-	/**
-	 * None is used to retrieve only the basic extension details.
-	 */
-	None = 0x0,
-
-	/**
-	 * IncludeVersions will return version information for extensions returned
-	 */
-	IncludeVersions = 0x1,
-
-	/**
-	 * IncludeFiles will return information about which files were found
-	 * within the extension that were stored independent of the manifest.
-	 * When asking for files, versions will be included as well since files
-	 * are returned as a property of the versions.
-	 * These files can be retrieved using the path to the file without
-	 * requiring the entire manifest be downloaded.
-	 */
-	IncludeFiles = 0x2,
-
-	/**
-	 * Include the Categories and Tags that were added to the extension definition.
-	 */
-	IncludeCategoryAndTags = 0x4,
-
-	/**
-	 * Include the details about which accounts the extension has been shared
-	 * with if the extension is a private extension.
-	 */
-	IncludeSharedAccounts = 0x8,
-
-	/**
-	 * Include properties associated with versions of the extension
-	 */
-	IncludeVersionProperties = 0x10,
-
-	/**
-	 * Excluding non-validated extensions will remove any extension versions that
-	 * either are in the process of being validated or have failed validation.
-	 */
-	ExcludeNonValidated = 0x20,
-
-	/**
-	 * Include the set of installation targets the extension has requested.
-	 */
-	IncludeInstallationTargets = 0x40,
-
-	/**
-	 * Include the base uri for assets of this extension
-	 */
-	IncludeAssetUri = 0x80,
-
-	/**
-	 * Include the statistics associated with this extension
-	 */
-	IncludeStatistics = 0x100,
-
-	/**
-	 * When retrieving versions from a query, only include the latest
-	 * version of the extensions that matched. This is useful when the
-	 * caller doesn't need all the published versions. It will save a
-	 * significant size in the returned payload.
-	 */
-	IncludeLatestVersionOnly = 0x200,
-
-	/**
-	 * The Unpublished extension flag indicates that the extension can't be installed/downloaded.
-	 * Users who have installed such an extension can continue to use the extension.
-	 */
-	Unpublished = 0x1000,
-
-	/**
-	 * Include the details if an extension is in conflict list or not
-	 */
-	IncludeNameConflictInfo = 0x8000,
-
-	/**
-	 * When retrieving versions from a query, only include the latest stable and pre-release
-	 * versions of the extensions that matched. This is useful when the caller needs
-	 * only the latest versions and not the entire version history. It will save a
-	 * significant size in the returned payload.
-	 */
-	IncludeLatestPrereleaseAndStableVersionOnly = 0x10000,
-}
-
-function flagsToString(...flags: Flags[]): string {
-	return String(flags.reduce((r, f) => r | f, 0));
-}
-
-enum FilterType {
-	Tag = 1,
-	ExtensionId = 4,
-	Category = 5,
-	ExtensionName = 7,
-	Target = 8,
-	Featured = 9,
-	SearchText = 10,
-	ExcludeWithFlags = 12
-}
-
 const AssetType = {
 	Icon: 'Microsoft.VisualStudio.Services.Icons.Default',
 	Details: 'Microsoft.VisualStudio.Services.Content.Details',
@@ -239,7 +202,7 @@ interface IQueryState {
 	readonly pageSize: number;
 	readonly sortBy: SortBy;
 	readonly sortOrder: SortOrder;
-	readonly flags: Flags;
+	readonly flags: Flag[];
 	readonly criteria: ICriterium[];
 	readonly assetTypes: string[];
 	readonly source?: string;
@@ -250,7 +213,7 @@ const DefaultQueryState: IQueryState = {
 	pageSize: DefaultPageSize,
 	sortBy: SortBy.NoneOrRelevance,
 	sortOrder: SortOrder.Default,
-	flags: Flags.None,
+	flags: [],
 	criteria: [],
 	assetTypes: []
 };
@@ -260,7 +223,6 @@ type GalleryServiceQueryClassification = {
 	comment: 'Information about Marketplace query and its response';
 	readonly filterTypes: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Filter types used in the query.' };
 	readonly flags: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Flags passed in the query.' };
-	readonly includeLatestPrereleaseAndStableVersionOnly: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'whether the query includes latest pre-release and stable version only flag' };
 	readonly sortBy: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'sorted by option passed in the query' };
 	readonly sortOrder: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'sort order option passed in the query' };
 	readonly pageNumber: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'requested page number in the query' };
@@ -276,9 +238,8 @@ type GalleryServiceQueryClassification = {
 };
 
 type QueryTelemetryData = {
-	readonly flags: number;
-	readonly includeLatestPrereleaseAndStableVersionOnly: boolean;
 	readonly filterTypes: string[];
+	readonly flags: string[];
 	readonly sortBy: string;
 	readonly sortOrder: string;
 	readonly pageNumber: string;
@@ -336,10 +297,17 @@ class Query {
 
 	get pageNumber(): number { return this.state.pageNumber; }
 	get pageSize(): number { return this.state.pageSize; }
-	get sortBy(): number { return this.state.sortBy; }
+	get sortBy(): SortBy { return this.state.sortBy; }
 	get sortOrder(): number { return this.state.sortOrder; }
-	get flags(): number { return this.state.flags; }
+	get flags(): Flag[] { return this.state.flags; }
 	get criteria(): ICriterium[] { return this.state.criteria; }
+	get assetTypes(): string[] { return this.state.assetTypes; }
+	get source(): string | undefined { return this.state.source; }
+	get searchText(): string {
+		const criterium = this.state.criteria.filter(criterium => criterium.filterType === FilterType.SearchText)[0];
+		return criterium && criterium.value ? criterium.value : '';
+	}
+
 
 	withPage(pageNumber: number, pageSize: number = this.state.pageSize): Query {
 		return new Query({ ...this.state, pageNumber, pageSize });
@@ -362,8 +330,8 @@ class Query {
 		return new Query({ ...this.state, sortOrder });
 	}
 
-	withFlags(...flags: Flags[]): Query {
-		return new Query({ ...this.state, flags: flags.reduce<number>((r, f) => r | f, 0) });
+	withFlags(...flags: Flag[]): Query {
+		return new Query({ ...this.state, flags: distinct(flags) });
 	}
 
 	withAssetTypes(...assetTypes: string[]): Query {
@@ -373,30 +341,6 @@ class Query {
 	withSource(source: string): Query {
 		return new Query({ ...this.state, source });
 	}
-
-	get raw() {
-		const { criteria, pageNumber, pageSize, sortBy, sortOrder, flags, assetTypes } = this.state;
-		const filters = [{ criteria, pageNumber, pageSize, sortBy, sortOrder }];
-		return { filters, assetTypes, flags };
-	}
-
-	get searchText(): string {
-		const criterium = this.state.criteria.filter(criterium => criterium.filterType === FilterType.SearchText)[0];
-		return criterium && criterium.value ? criterium.value : '';
-	}
-
-	get telemetryData(): QueryTelemetryData {
-		return {
-			filterTypes: this.state.criteria.map(criterium => String(criterium.filterType)),
-			flags: this.state.flags,
-			sortBy: String(this.sortBy),
-			sortOrder: String(this.sortOrder),
-			pageNumber: String(this.pageNumber),
-			source: this.state.source,
-			searchTextLength: this.searchText.length,
-			includeLatestPrereleaseAndStableVersionOnly: !!(this.state.flags & Flags.IncludeLatestPrereleaseAndStableVersionOnly)
-		};
-	}
 }
 
 function getStatistic(statistics: IRawGalleryExtensionStatistics[], name: string): number {
@@ -628,9 +572,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 
 	declare readonly _serviceBrand: undefined;
 
-	private readonly extensionsGalleryUrl: string | undefined;
 	private readonly extensionsControlUrl: string | undefined;
-	private readonly extensionsGalleryResourceApi: string | undefined;
 	private readonly unpkgResourceApi: string | undefined;
 
 	private readonly commonHeadersPromise: Promise<IHeaders>;
@@ -649,9 +591,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		@IAllowedExtensionsService private readonly allowedExtensionsService: IAllowedExtensionsService,
 	) {
 		const config = productService.extensionsGallery;
-		this.extensionsGalleryUrl = config?.serviceUrl;
 		this.extensionsControlUrl = config?.controlUrl;
-		this.extensionsGalleryResourceApi = this.extensionsGalleryUrl ? `${this.extensionsGalleryUrl}${'/vscode/{publisher}/{name}/latest'}` : undefined;
 		this.unpkgResourceApi = config?.extensionUrlTemplate;
 		this.extensionsEnabledWithApiProposalVersion = productService.extensionsEnabledWithApiProposalVersion?.map(id => id.toLowerCase()) ?? [];
 		this.commonHeadersPromise = resolveMarketplaceHeaders(
@@ -664,12 +604,8 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			this.telemetryService);
 	}
 
-	private api(path = ''): string {
-		return `${this.extensionsGalleryUrl}${path}`;
-	}
-
 	isEnabled(): boolean {
-		return !!this.extensionsGalleryUrl;
+		return !!this.productService.extensionsGallery?.serviceUrl;
 	}
 
 	getExtensions(extensionInfos: ReadonlyArray<IExtensionInfo>, token: CancellationToken): Promise<IGalleryExtension[]>;
@@ -715,13 +651,15 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 	}
 
 	private async getResourceApi(): Promise<{ uri: string; fallback?: string } | undefined> {
-		if (!this.extensionsGalleryResourceApi) {
+		const manifest = await this.getExtensionGalleryManifest();
+		const latestVersionResource = this.getExtensionGalleryManifestResourceUri(manifest, ExtensionGalleryResourceType.ExtensionLatestVersionUri);
+		if (!latestVersionResource) {
 			return undefined;
 		}
 
 		if (this.productService.quality !== 'stable') {
 			return {
-				uri: this.extensionsGalleryResourceApi,
+				uri: latestVersionResource,
 				fallback: this.unpkgResourceApi
 			};
 		}
@@ -730,7 +668,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 
 		if (value === 'marketplace') {
 			return {
-				uri: this.extensionsGalleryResourceApi,
+				uri: latestVersionResource,
 				fallback: this.unpkgResourceApi
 			};
 		}
@@ -775,7 +713,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			query = query.withFilter(FilterType.ExtensionName, ...names);
 		}
 		if (options.queryAllVersions) {
-			query = query.withFlags(query.flags, Flags.IncludeVersions);
+			query = query.withFlags(...query.flags, Flag.IncludeVersions);
 		}
 		if (options.source) {
 			query = query.withSource(options.source);
@@ -1120,31 +1058,31 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		/**
 		 * If both version flags (IncludeLatestVersionOnly and IncludeVersions) are included, then only include latest versions (IncludeLatestVersionOnly) flag.
 		 */
-		if (!!(query.flags & Flags.IncludeLatestVersionOnly) && !!(query.flags & Flags.IncludeVersions)) {
-			query = query.withFlags(query.flags & ~Flags.IncludeVersions, Flags.IncludeLatestVersionOnly);
+		if (query.flags.includes(Flag.IncludeLatestVersionOnly) && query.flags.includes(Flag.IncludeVersions)) {
+			query = query.withFlags(...query.flags.filter(flag => flag !== Flag.IncludeVersions));
 		}
 
 		/**
 		 * If version flags (IncludeLatestVersionOnly and IncludeVersions) are not included, default is to query for latest versions (IncludeLatestVersionOnly).
 		 */
-		if (!(query.flags & Flags.IncludeLatestVersionOnly) && !(query.flags & Flags.IncludeVersions)) {
-			query = query.withFlags(query.flags, Flags.IncludeLatestVersionOnly);
+		if (!query.flags.includes(Flag.IncludeLatestVersionOnly) && !query.flags.includes(Flag.IncludeVersions)) {
+			query = query.withFlags(...query.flags, Flag.IncludeLatestVersionOnly);
 		}
 
 		/**
 		 * If versions criteria exist or every requested extension is for release version and has a pre-release version, then remove latest flags and add all versions flag.
 		 */
 		if (criteria.versions?.length || criteria.isQueryForReleaseVersionFromPreReleaseVersion) {
-			query = query.withFlags(query.flags & ~Flags.IncludeLatestVersionOnly, Flags.IncludeVersions);
+			query = query.withFlags(...query.flags.filter(flag => flag !== Flag.IncludeLatestVersionOnly), Flag.IncludeVersions);
 		}
 
 		/**
 		 * Add necessary extension flags
 		 */
-		query = query.withFlags(query.flags, Flags.IncludeAssetUri, Flags.IncludeCategoryAndTags, Flags.IncludeFiles, Flags.IncludeStatistics, Flags.IncludeVersionProperties);
+		query = query.withFlags(...query.flags, Flag.IncludeAssetUri, Flag.IncludeCategoryAndTags, Flag.IncludeFiles, Flag.IncludeStatistics, Flag.IncludeVersionProperties);
 		const { galleryExtensions: rawGalleryExtensions, total, context } = await this.queryRawGalleryExtensions(query, token);
 
-		const hasAllVersions: boolean = !(query.flags & Flags.IncludeLatestVersionOnly);
+		const hasAllVersions: boolean = !query.flags.includes(Flag.IncludeLatestVersionOnly);
 		if (hasAllVersions) {
 			const extensions: IGalleryExtension[] = [];
 			for (const rawGalleryExtension of rawGalleryExtensions) {
@@ -1221,7 +1159,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		if (needAllVersions.size) {
 			const stopWatch = new StopWatch();
 			const query = new Query()
-				.withFlags(flags & ~Flags.IncludeLatestVersionOnly, Flags.IncludeVersions)
+				.withFlags(...flags.filter(flag => flag !== Flag.IncludeLatestVersionOnly), Flag.IncludeVersions)
 				.withPage(1, needAllVersions.size)
 				.withFilter(FilterType.ExtensionId, ...needAllVersions.keys());
 			const { extensions } = await this.queryGalleryExtensions(query, criteria, token);
@@ -1244,28 +1182,28 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		 * If versions criteria exist, then remove latest flags and add all versions flag.
 		*/
 		if (criteria.versions?.length) {
-			query = query.withFlags(query.flags & ~Flags.IncludeLatestVersionOnly & ~Flags.IncludeLatestPrereleaseAndStableVersionOnly, Flags.IncludeVersions);
+			query = query.withFlags(...query.flags.filter(flag => flag !== Flag.IncludeLatestVersionOnly && flag !== Flag.IncludeLatestPrereleaseAndStableVersionOnly), Flag.IncludeVersions);
 		}
 
 		/**
 		 * If the query does not specify all versions flag, handle latest versions.
 		 */
-		else if (!(query.flags & Flags.IncludeVersions)) {
+		else if (!query.flags.includes(Flag.IncludeVersions)) {
 			const includeLatest = isBoolean(criteria.includePreRelease) ? criteria.includePreRelease : criteria.includePreRelease.every(({ includePreRelease }) => includePreRelease);
-			query = includeLatest ? query.withFlags(query.flags & ~Flags.IncludeLatestPrereleaseAndStableVersionOnly, Flags.IncludeLatestVersionOnly) : query.withFlags(query.flags & ~Flags.IncludeLatestVersionOnly, Flags.IncludeLatestPrereleaseAndStableVersionOnly);
+			query = includeLatest ? query.withFlags(...query.flags.filter(flag => flag !== Flag.IncludeLatestPrereleaseAndStableVersionOnly), Flag.IncludeLatestVersionOnly) : query.withFlags(...query.flags.filter(flag => flag !== Flag.IncludeLatestVersionOnly), Flag.IncludeLatestPrereleaseAndStableVersionOnly);
 		}
 
 		/**
 		 * If all versions flag is set, remove latest flags.
 		 */
-		if (!!(query.flags & Flags.IncludeVersions) && (!!(query.flags & Flags.IncludeLatestVersionOnly) || !!(query.flags & Flags.IncludeLatestPrereleaseAndStableVersionOnly))) {
-			query = query.withFlags(query.flags & ~Flags.IncludeLatestVersionOnly & ~Flags.IncludeLatestPrereleaseAndStableVersionOnly, Flags.IncludeVersions);
+		if (query.flags.includes(Flag.IncludeVersions) && (query.flags.includes(Flag.IncludeLatestVersionOnly) || query.flags.includes(Flag.IncludeLatestPrereleaseAndStableVersionOnly))) {
+			query = query.withFlags(...query.flags.filter(flag => flag !== Flag.IncludeLatestVersionOnly && flag !== Flag.IncludeLatestPrereleaseAndStableVersionOnly), Flag.IncludeVersions);
 		}
 
 		/**
 		 * Add necessary extension flags
 		 */
-		query = query.withFlags(query.flags, Flags.IncludeAssetUri, Flags.IncludeCategoryAndTags, Flags.IncludeFiles, Flags.IncludeStatistics, Flags.IncludeVersionProperties);
+		query = query.withFlags(...query.flags, Flag.IncludeAssetUri, Flag.IncludeCategoryAndTags, Flag.IncludeFiles, Flag.IncludeStatistics, Flag.IncludeVersionProperties);
 		const { galleryExtensions: rawGalleryExtensions, total, context } = await this.queryRawGalleryExtensions(query, token);
 
 		const extensions: IGalleryExtension[] = [];
@@ -1345,19 +1283,54 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 	}
 
 	private async queryRawGalleryExtensions(query: Query, token: CancellationToken): Promise<IRawGalleryExtensionsResult> {
-		if (!this.isEnabled()) {
-			throw new Error('No extension gallery service configured.');
+		const manifest = await this.getExtensionGalleryManifest();
+		const extensionsQueryApi = this.getExtensionGalleryManifestResourceUri(manifest, ExtensionGalleryResourceType.ExtensionQueryService);
+
+		if (!extensionsQueryApi) {
+			throw new Error('No extension gallery query service configured.');
 		}
 
 		query = query
 			/* Always exclude non validated extensions */
-			.withFlags(query.flags, Flags.ExcludeNonValidated)
-			.withFilter(FilterType.Target, 'Microsoft.VisualStudio.Code')
-			/* Always exclude unpublished extensions */
-			.withFilter(FilterType.ExcludeWithFlags, flagsToString(Flags.Unpublished));
+			.withFlags(...query.flags, Flag.ExcludeNonValidated)
+			.withFilter(FilterType.Target, 'Microsoft.VisualStudio.Code');
+
+		const unpublishedFlag = manifest.capabilities.extensionQuery.flags?.find(f => f.name === Flag.Unpublished);
+		/* Always exclude unpublished extensions */
+		if (unpublishedFlag) {
+			query = query.withFilter(FilterType.ExcludeWithFlags, String(unpublishedFlag.value));
+		}
+
+		const data = JSON.stringify({
+			filters: [
+				{
+					criteria: query.criteria.reduce<{ filterType: number; value?: string }[]>((criteria, c) => {
+						const criterium = manifest.capabilities.extensionQuery.filtering?.find(f => f.name === c.filterType);
+						if (criterium) {
+							criteria.push({
+								filterType: criterium.value,
+								value: c.value,
+							});
+						}
+						return criteria;
+					}, []),
+					pageNumber: query.pageNumber,
+					pageSize: query.pageSize,
+					sortBy: manifest.capabilities.extensionQuery.sorting?.find(s => s.name === query.sortBy)?.value,
+					sortOrder: query.sortOrder,
+				}
+			],
+			assetTypes: query.assetTypes,
+			flags: query.flags.reduce<number>((flags, flag) => {
+				const flagValue = manifest.capabilities.extensionQuery.flags?.find(f => f.name === flag);
+				if (flagValue) {
+					flags |= flagValue.value;
+				}
+				return flags;
+			}, 0)
+		});
 
 		const commonHeaders = await this.commonHeadersPromise;
-		const data = JSON.stringify(query.raw);
 		const headers = {
 			...commonHeaders,
 			'Content-Type': 'application/json',
@@ -1372,7 +1345,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		try {
 			context = await this.requestService.request({
 				type: 'POST',
-				url: this.api('/extensionquery'),
+				url: extensionsQueryApi,
 				data,
 				headers
 			}, token);
@@ -1413,7 +1386,13 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			}
 		} finally {
 			this.telemetryService.publicLog2<GalleryServiceQueryEvent, GalleryServiceQueryClassification>('galleryService:query', {
-				...query.telemetryData,
+				filterTypes: query.criteria.map(criterium => criterium.filterType),
+				flags: query.flags,
+				sortBy: query.sortBy,
+				sortOrder: String(query.sortOrder),
+				pageNumber: String(query.pageNumber),
+				source: query.source,
+				searchTextLength: query.searchText.length,
 				requestBodySize: String(data.length),
 				duration: stopWatch.elapsed(),
 				success: !!context && isSuccess(context),
@@ -1500,9 +1479,24 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			return undefined;
 		}
 
-		const url = isWeb ? this.api(`/itemName/${publisher}.${name}/version/${version}/statType/${type === StatisticType.Install ? '1' : '3'}/vscodewebextension`) : this.api(`/publishers/${publisher}/extensions/${name}/${version}/stats?statType=${type}`);
-		const Accept = isWeb ? 'api-version=6.1-preview.1' : '*/*;api-version=4.0-preview.1';
+		const manifest = await this.getExtensionGalleryManifest();
+		let url: string;
 
+		if (isWeb) {
+			const resource = this.getExtensionGalleryManifestResourceUri(manifest, ExtensionGalleryResourceType.WebExtensionStatisticsUri);
+			if (!resource) {
+				return;
+			}
+			url = format2(resource, { publisher, name, version, statTypeValue: type === StatisticType.Install ? '1' : '3' });
+		} else {
+			const resource = this.getExtensionGalleryManifestResourceUri(manifest, ExtensionGalleryResourceType.ExtensionStatisticsUri);
+			if (!resource) {
+				return;
+			}
+			url = format2(resource, { publisher, name, version, statTypeName: type });
+		}
+
+		const Accept = isWeb ? 'api-version=6.1-preview.1' : '*/*;api-version=4.0-preview.1';
 		const commonHeaders = await this.commonHeadersPromise;
 		const headers = { ...commonHeaders, Accept };
 		try {
@@ -1623,7 +1617,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 
 	async getAllCompatibleVersions(extensionIdentifier: IExtensionIdentifier, includePreRelease: boolean, targetPlatform: TargetPlatform): Promise<IGalleryExtensionVersion[]> {
 		let query = new Query()
-			.withFlags(Flags.IncludeVersions, Flags.IncludeCategoryAndTags, Flags.IncludeFiles, Flags.IncludeVersionProperties)
+			.withFlags(Flag.IncludeVersions, Flag.IncludeCategoryAndTags, Flag.IncludeFiles, Flag.IncludeVersionProperties)
 			.withPage(1, 1);
 
 		if (extensionIdentifier.uuid) {
@@ -1812,6 +1806,221 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 
 		return { malicious, deprecated, search, extensionsEnabledWithPreRelease };
 	}
+
+	private getExtensionGalleryManifestResourceUri(manifest: IExtensionGalleryManifest, type: ExtensionGalleryResourceType, version?: string): string | undefined {
+		for (const resource of manifest.resources) {
+			const [r, v] = resource['@type'].split('/');
+			if (r !== type) {
+				continue;
+			}
+			if (!version || v === version) {
+				return resource['@id'];
+			}
+			break;
+		}
+		return undefined;
+	}
+
+	private async getExtensionGalleryManifest(): Promise<IExtensionGalleryManifest> {
+		if (!this.productService.extensionsGallery?.serviceUrl) {
+			throw new Error('No extension gallery service configured.');
+		}
+
+		const resources = [
+			{
+				'@id': `${this.productService.extensionsGallery.serviceUrl}/extensionquery`,
+				'@type': ExtensionGalleryResourceType.ExtensionQueryService
+			},
+			{
+				'@id': `${this.productService.extensionsGallery.serviceUrl}/vscode/{publisher}/{name}/latest`,
+				'@type': ExtensionGalleryResourceType.ExtensionLatestVersionUri
+			},
+			{
+				'@id': `${this.productService.extensionsGallery.serviceUrl}/publishers/{publisher}/extensions/{name}/{version}/stats?statType={statTypeName}`,
+				'@type': ExtensionGalleryResourceType.ExtensionStatisticsUri
+			},
+			{
+				'@id': `${this.productService.extensionsGallery.serviceUrl}/itemName/{publisher}.{name}/version/{version}/statType/{statTypeValue}/vscodewebextension`,
+				'@type': ExtensionGalleryResourceType.WebExtensionStatisticsUri
+			},
+		];
+
+		if (this.productService.extensionsGallery?.publisherUrl) {
+			resources.push({
+				'@id': `${this.productService.extensionsGallery.publisherUrl}/{publisher}`,
+				'@type': ExtensionGalleryResourceType.ExtensionDetailsViewUri
+			});
+		}
+
+		if (this.productService.extensionsGallery?.itemUrl) {
+			resources.push({
+				'@id': `${this.productService.extensionsGallery.itemUrl}/?itemName={publisher}.{name}`,
+				'@type': ExtensionGalleryResourceType.ExtensionDetailsViewUri
+			});
+			resources.push({
+				'@id': `${this.productService.extensionsGallery.itemUrl}/?itemName={publisher}.{name}&ssr=false#review-details`,
+				'@type': ExtensionGalleryResourceType.ExtensionRatingViewUri
+			});
+		}
+
+		if (this.productService.extensionsGallery.resourceUrlTemplate) {
+			resources.push({
+				'@id': this.productService.extensionsGallery.resourceUrlTemplate,
+				'@type': ExtensionGalleryResourceType.ExtensionUriTemplate
+			});
+		}
+
+		if (this.productService.extensionsGallery?.nlsBaseUrl) {
+			resources.push({
+				'@id': this.productService.extensionsGallery.nlsBaseUrl,
+				'@type': ExtensionGalleryResourceType.WebLanguagePackService
+			});
+		}
+
+		const filtering = [
+			{
+				name: FilterType.Tag,
+				value: 1,
+			},
+			{
+				name: FilterType.ExtensionId,
+				value: 4,
+			},
+			{
+				name: FilterType.Category,
+				value: 5,
+			},
+			{
+				name: FilterType.ExtensionName,
+				value: 7,
+			},
+			{
+				name: FilterType.Target,
+				value: 8,
+			},
+			{
+				name: FilterType.Featured,
+				value: 9,
+			},
+			{
+				name: FilterType.SearchText,
+				value: 10,
+			},
+			{
+				name: FilterType.ExcludeWithFlags,
+				value: 12,
+			},
+		];
+
+		const sorting = [
+			{
+				name: SortBy.NoneOrRelevance,
+				value: 0,
+			},
+			{
+				name: SortBy.LastUpdatedDate,
+				value: 1,
+			},
+			{
+				name: SortBy.Title,
+				value: 2,
+			},
+			{
+				name: SortBy.PublisherName,
+				value: 3,
+			},
+			{
+				name: SortBy.InstallCount,
+				value: 4,
+			},
+			{
+				name: SortBy.AverageRating,
+				value: 6,
+			},
+			{
+				name: SortBy.PublishedDate,
+				value: 10,
+			},
+			{
+				name: SortBy.WeightedRating,
+				value: 12,
+			},
+		];
+
+		const flags = [
+			{
+				name: Flag.None,
+				value: 0x0,
+			},
+			{
+				name: Flag.IncludeVersions,
+				value: 0x1,
+			},
+			{
+				name: Flag.IncludeFiles,
+				value: 0x2,
+			},
+			{
+				name: Flag.IncludeCategoryAndTags,
+				value: 0x4,
+			},
+			{
+				name: Flag.IncludeSharedAccounts,
+				value: 0x8,
+			},
+			{
+				name: Flag.IncludeVersionProperties,
+				value: 0x10,
+			},
+			{
+				name: Flag.ExcludeNonValidated,
+				value: 0x20,
+			},
+			{
+				name: Flag.IncludeInstallationTargets,
+				value: 0x40,
+			},
+			{
+				name: Flag.IncludeAssetUri,
+				value: 0x80,
+			},
+			{
+				name: Flag.IncludeStatistics,
+				value: 0x100,
+			},
+			{
+				name: Flag.IncludeLatestVersionOnly,
+				value: 0x200,
+			},
+			{
+				name: Flag.Unpublished,
+				value: 0x1000,
+			},
+			{
+				name: Flag.IncludeNameConflictInfo,
+				value: 0x8000,
+			},
+			{
+				name: Flag.IncludeLatestPrereleaseAndStableVersionOnly,
+				value: 0x10000,
+			},
+		];
+
+		return {
+			version: '',
+			resources,
+			capabilities: {
+				extensionQuery: {
+					filtering,
+					sorting,
+					flags,
+				},
+				signing: {
+					allRepositoriesSigned: true,
+				}
+			}
+		};
+	}
 }
 
 export class ExtensionGalleryService extends AbstractExtensionGalleryService {
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 578f0c6dd7fd..a272af04d650 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -279,14 +279,14 @@ export interface ILocalExtension extends IExtension {
 }
 
 export const enum SortBy {
-	NoneOrRelevance = 0,
-	LastUpdatedDate = 1,
-	Title = 2,
-	PublisherName = 3,
-	InstallCount = 4,
-	PublishedDate = 10,
-	AverageRating = 6,
-	WeightedRating = 12
+	NoneOrRelevance = 'NoneOrRelevance',
+	LastUpdatedDate = 'LastUpdatedDate',
+	Title = 'Title',
+	PublisherName = 'PublisherName',
+	InstallCount = 'InstallCount',
+	PublishedDate = 'PublishedDate',
+	AverageRating = 'AverageRating',
+	WeightedRating = 'WeightedRating'
 }
 
 export const enum SortOrder {

From da8be437aa09a6628c8b36e3ca5904deb649bfb4 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Wed, 12 Mar 2025 08:10:43 +1100
Subject: [PATCH 0797/1815] Allow an additional command in nb outputs (#243251)

---
 .../notebook/browser/view/renderers/backLayerWebView.ts        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
index 26e9dbba4408..21e6cf46c139 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts
@@ -794,7 +794,8 @@ export class BackLayerWebView<T extends ICommonCellInfo> extends Themable {
 								'workbench.action.openSettings',
 								'_notebook.selectKernel',
 								// TODO@rebornix explore open output channel with name command
-								'jupyter.viewOutput'
+								'jupyter.viewOutput',
+								'jupyter.createPythonEnvAndSelectController',
 							],
 						});
 						return;

From eeebd7a1f889691b853f0c2b0a2830600f12de85 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Tue, 11 Mar 2025 14:20:28 -0700
Subject: [PATCH 0798/1815] Evict execution from active executions

Part of #242195
---
 .../workbench/api/common/extHostTerminalShellIntegration.ts  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
index cc5fccb9a8df..fbbe2863ea45 100644
--- a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
@@ -238,7 +238,10 @@ class InternalTerminalShellIntegration extends Disposable {
 		// command detection
 		let currentExecution: InternalTerminalShellExecution | undefined;
 		if (commandLine.confidence === TerminalShellExecutionCommandLineConfidence.High) {
-			currentExecution = this._activeExecutions.find(e => e.value.commandLine.value === commandLine.value);
+			const index = this._activeExecutions.findIndex(e => e.value.commandLine.value === commandLine.value);
+			if (index !== -1) {
+				currentExecution = this._activeExecutions.splice(index, 1)[0];
+			}
 		} else {
 			currentExecution = this._activeExecutions.shift();
 		}

From 462a6ff92db09f7ea3f18ec39c592a9556f20c8c Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 11 Mar 2025 15:20:36 -0700
Subject: [PATCH 0799/1815] mcp: securely store mcp inputs

This just treats everything as a secret for now, I want to do some work on the IConfigurationResolverService so we can differentiate password versus non-password input, among other work

Fixes #243226
---
 .../test/common/testSecretStorageService.ts   |  36 ++++
 .../contrib/mcp/common/mcpRegistry.ts         |  56 ++---
 .../mcp/common/mcpRegistryInputStorage.ts     | 192 ++++++++++++++++++
 .../contrib/mcp/common/mcpRegistryTypes.ts    |   2 -
 .../mcp/test/common/mcpRegistry.test.ts       |  24 +--
 .../common/mcpRegistryInputStorage.test.ts    | 178 ++++++++++++++++
 6 files changed, 428 insertions(+), 60 deletions(-)
 create mode 100644 src/vs/platform/secrets/test/common/testSecretStorageService.ts
 create mode 100644 src/vs/workbench/contrib/mcp/common/mcpRegistryInputStorage.ts
 create mode 100644 src/vs/workbench/contrib/mcp/test/common/mcpRegistryInputStorage.test.ts

diff --git a/src/vs/platform/secrets/test/common/testSecretStorageService.ts b/src/vs/platform/secrets/test/common/testSecretStorageService.ts
new file mode 100644
index 000000000000..ec7482e72bb2
--- /dev/null
+++ b/src/vs/platform/secrets/test/common/testSecretStorageService.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 { Emitter } from '../../../../base/common/event.js';
+import { ISecretStorageService } from '../../common/secrets.js';
+
+export class TestSecretStorageService implements ISecretStorageService {
+	declare readonly _serviceBrand: undefined;
+
+	private readonly _storage = new Map<string, string>();
+	private readonly _onDidChangeSecretEmitter = new Emitter<string>();
+	readonly onDidChangeSecret = this._onDidChangeSecretEmitter.event;
+
+	type = 'in-memory' as const;
+
+	async get(key: string): Promise<string | undefined> {
+		return this._storage.get(key);
+	}
+
+	async set(key: string, value: string): Promise<void> {
+		this._storage.set(key, value);
+		this._onDidChangeSecretEmitter.fire(key);
+	}
+
+	async delete(key: string): Promise<void> {
+		this._storage.delete(key);
+		this._onDidChangeSecretEmitter.fire(key);
+	}
+
+	// Helper method for tests to clear all secrets
+	clear(): void {
+		this._storage.clear();
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
index fb96aa95cdd6..b6a317949e0d 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
@@ -3,15 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Lazy } from '../../../../base/common/lazy.js';
 import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
 import { IObservable, observableValue } from '../../../../base/common/observable.js';
-import { isEmptyObject } from '../../../../base/common/types.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
+import { McpRegistryInputStorage } from './mcpRegistryInputStorage.js';
 import { IMcpHostDelegate, IMcpRegistry } from './mcpRegistryTypes.js';
 import { McpServerConnection } from './mcpServerConnection.js';
-import { McpCollectionDefinition, IMcpServerConnection, McpServerDefinition } from './mcpTypes.js';
+import { IMcpServerConnection, McpCollectionDefinition, McpServerDefinition } from './mcpTypes.js';
 
 export class McpRegistry extends Disposable implements IMcpRegistry {
 	declare public readonly _serviceBrand: undefined;
@@ -21,6 +22,9 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 
 	public readonly collections: IObservable<readonly McpCollectionDefinition[]> = this._collections;
 
+	private readonly _workspaceStorage = new Lazy(() => this._register(this._instantiationService.createInstance(McpRegistryInputStorage, StorageScope.WORKSPACE, StorageTarget.USER)));
+	private readonly _profileStorage = new Lazy(() => this._register(this._instantiationService.createInstance(McpRegistryInputStorage, StorageScope.PROFILE, StorageTarget.USER)));
+
 	public get delegates(): readonly IMcpHostDelegate[] {
 		return this._delegates;
 	}
@@ -28,7 +32,6 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 	constructor(
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IConfigurationResolverService private readonly _configurationResolverService: IConfigurationResolverService,
-		@IStorageService private readonly _storageService: IStorageService,
 	) {
 		super();
 	}
@@ -57,16 +60,9 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 		};
 	}
 
-	public hasSavedInputs(collection: McpCollectionDefinition, definition: McpServerDefinition): boolean {
-		const stored = this.getInputStorageData(collection, definition);
-		return !!stored && !!stored.map && !isEmptyObject(stored.map);
-	}
-
-	public clearSavedInputs(collection: McpCollectionDefinition, definition: McpServerDefinition) {
-		const stored = this.getInputStorageData(collection, definition);
-		if (stored) {
-			this._storageService.remove(stored.key, stored.scope);
-		}
+	public clearSavedInputs() {
+		this._profileStorage.value.clearAll();
+		this._workspaceStorage.value.clearAll();
 	}
 
 	public async resolveConnection(
@@ -80,17 +76,21 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 
 		let launch = definition.launch;
 
-		const storage = this.getInputStorageData(collection, definition);
-		if (definition.variableReplacement && storage) {
+		if (definition.variableReplacement) {
+			const inputStorage = definition.variableReplacement.folder ? this._workspaceStorage.value : this._profileStorage.value;
+			const previouslyStored = await inputStorage.getMap();
+
 			const { folder, section, target } = definition.variableReplacement;
+
 			// based on _configurationResolverService.resolveWithInteractionReplace
 			launch = await this._configurationResolverService.resolveAnyAsync(folder, launch);
 
-			const newVariables = await this._configurationResolverService.resolveWithInteraction(folder, launch, section, storage.map, target);
+			const newVariables = await this._configurationResolverService.resolveWithInteraction(folder, launch, section, previouslyStored, target);
 
 			if (newVariables?.size) {
-				launch = await this._configurationResolverService.resolveAnyAsync(folder, launch, Object.fromEntries(newVariables));
-				this._storageService.store(storage.key, JSON.stringify(Object.fromEntries(newVariables)), storage.scope, StorageTarget.MACHINE);
+				const completeVariables = { ...previouslyStored, ...Object.fromEntries(newVariables) };
+				launch = await this._configurationResolverService.resolveAnyAsync(folder, launch, completeVariables);
+				await inputStorage.setSecrets(completeVariables);
 			}
 		}
 
@@ -102,23 +102,5 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 			launch,
 		);
 	}
-
-	private getInputStorageData(collection: McpCollectionDefinition, definition: McpServerDefinition) {
-		if (!definition.variableReplacement) {
-			return undefined;
-		}
-
-		const key = `mcpConfig.${collection.id}.${definition.id}`;
-		const scope = definition.variableReplacement.folder ? StorageScope.WORKSPACE : StorageScope.APPLICATION;
-
-		let map: Record<string, string> | undefined;
-		try {
-			map = this._storageService.getObject(key, scope);
-		} catch {
-			// ignord
-		}
-
-		return { key, scope, map };
-	}
 }
 
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistryInputStorage.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistryInputStorage.ts
new file mode 100644
index 000000000000..6e23a0599988
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistryInputStorage.ts
@@ -0,0 +1,192 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { decodeBase64, encodeBase64, VSBuffer } from '../../../../base/common/buffer.js';
+import { Lazy } from '../../../../base/common/lazy.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { isEmptyObject } from '../../../../base/common/types.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
+import { ISecretStorageService } from '../../../../platform/secrets/common/secrets.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+
+const MCP_ENCRYPTION_KEY_NAME = 'mcpEncryptionKey';
+const MCP_ENCRYPTION_KEY_ALGORITHM = 'AES-GCM';
+const MCP_ENCRYPTION_KEY_LEN = 256;
+const MCP_ENCRYPTION_IV_LENGTH = 12; // 96 bits
+const MCP_DATA_STORED_VERSION = 1;
+const MCP_DATA_STORED_KEY = 'mcpInputs';
+
+interface IStoredData {
+	version: number;
+	values: Record<string, string>;
+	secrets?: { value: string; iv: string }; // base64, encrypted
+}
+
+interface IHydratedData extends IStoredData {
+	unsealedSecrets?: Record<string, string>;
+}
+
+export class McpRegistryInputStorage extends Disposable {
+	private static secretSequencer = new Sequencer();
+	private readonly _secretsSealerSequencer = new Sequencer();
+
+	private readonly _getEncryptionKey = new Lazy(() => {
+		return McpRegistryInputStorage.secretSequencer.queue(async () => {
+			const existing = await this._secretStorageService.get(MCP_ENCRYPTION_KEY_NAME);
+			if (existing) {
+				try {
+					const parsed: JsonWebKey = JSON.parse(existing);
+					return await crypto.subtle.importKey('jwk', parsed, MCP_ENCRYPTION_KEY_ALGORITHM, false, ['encrypt', 'decrypt']);
+				} catch {
+					// fall through
+				}
+			}
+
+			const key = await crypto.subtle.generateKey(
+				{ name: MCP_ENCRYPTION_KEY_ALGORITHM, length: MCP_ENCRYPTION_KEY_LEN },
+				true,
+				['encrypt', 'decrypt'],
+			);
+
+			const exported = await crypto.subtle.exportKey('jwk', key);
+			await this._secretStorageService.set(MCP_ENCRYPTION_KEY_NAME, JSON.stringify(exported));
+			return key;
+		});
+	});
+
+	private _didChange = false;
+
+	private _record = new Lazy<IHydratedData>(() => {
+		const stored = this._storageService.getObject<IStoredData>(MCP_DATA_STORED_KEY, this._scope);
+		return stored?.version === MCP_DATA_STORED_VERSION ? { ...stored } : { version: MCP_DATA_STORED_VERSION, values: {} };
+	});
+
+
+	constructor(
+		private readonly _scope: StorageScope,
+		_target: StorageTarget,
+		@IStorageService private readonly _storageService: IStorageService,
+		@ISecretStorageService private readonly _secretStorageService: ISecretStorageService,
+		@ILogService private readonly _logService: ILogService,
+	) {
+		super();
+
+		this._register(_storageService.onWillSaveState(() => {
+			if (this._didChange) {
+				this._storageService.store(MCP_DATA_STORED_KEY, {
+					version: MCP_DATA_STORED_VERSION,
+					values: this._record.value.values,
+					secrets: this._record.value.secrets,
+				} satisfies IStoredData, this._scope, _target);
+				this._didChange = false;
+			}
+		}));
+	}
+
+	/** Deletes all collection data from storage. */
+	public clearAll() {
+		this._record.value.values = {};
+		this._record.value.secrets = undefined;
+		this._record.value.unsealedSecrets = undefined;
+		this._didChange = true;
+	}
+
+	/** Delete a single collection data from the storage. */
+	public async clear(inputKey: string) {
+		const secrets = await this._unsealSecrets();
+		delete this._record.value.values[inputKey];
+		this._didChange = true;
+
+		if (secrets.hasOwnProperty(inputKey)) {
+			delete secrets[inputKey];
+			await this._sealSecrets();
+		}
+	}
+
+	/** Gets a mapping of saved input data. */
+	public async getMap() {
+		const secrets = await this._unsealSecrets();
+		return { ...this._record.value.values, ...secrets };
+	}
+
+	/** Updates the input data mapping. */
+	public async setPlainText(values: Record<string, string>) {
+		Object.assign(this._record.value.values, values);
+		this._didChange = true;
+	}
+
+	/** Updates the input secrets mapping. */
+	public async setSecrets(values: Record<string, string>) {
+		const unsealed = await this._unsealSecrets();
+		Object.assign(unsealed, values);
+		await this._sealSecrets();
+	}
+
+	private async _sealSecrets() {
+		return this._secretsSealerSequencer.queue(async () => {
+			if (!this._record.value.unsealedSecrets || isEmptyObject(this._record.value.unsealedSecrets)) {
+				this._record.value.secrets = undefined;
+				return;
+			}
+
+			if (!this._record.value.secrets) {
+				const iv = crypto.getRandomValues(new Uint8Array(MCP_ENCRYPTION_IV_LENGTH));
+				this._record.value.secrets = {
+					value: '',
+					iv: encodeBase64(VSBuffer.wrap(iv)),
+				};
+			}
+
+			const toSeal = JSON.stringify(this._record.value.unsealedSecrets);
+			const iv = decodeBase64(this._record.value.secrets.iv);
+			const key = await this._getEncryptionKey.value;
+			const encrypted = await crypto.subtle.encrypt(
+				{ name: MCP_ENCRYPTION_KEY_ALGORITHM, iv: iv.buffer },
+				key,
+				new TextEncoder().encode(toSeal).buffer,
+			);
+
+			const enc = encodeBase64(VSBuffer.wrap(new Uint8Array(encrypted)));
+			if (this._record.value.secrets.value === enc) {
+				return;
+			}
+
+			this._record.value.secrets.value = enc;
+			this._didChange = true;
+		});
+	}
+
+	private async _unsealSecrets(): Promise<Record<string, string>> {
+		if (!this._record.value.secrets) {
+			return this._record.value.unsealedSecrets ??= {};
+		}
+
+		if (this._record.value.unsealedSecrets) {
+			return this._record.value.unsealedSecrets;
+		}
+
+		try {
+			const key = await this._getEncryptionKey.value;
+			const iv = decodeBase64(this._record.value.secrets.iv);
+			const encrypted = decodeBase64(this._record.value.secrets.value);
+
+			const decrypted = await crypto.subtle.decrypt(
+				{ name: MCP_ENCRYPTION_KEY_ALGORITHM, iv: iv.buffer },
+				key,
+				encrypted.buffer,
+			);
+
+			const unsealedSecrets = JSON.parse(new TextDecoder().decode(decrypted));
+			this._record.value.unsealedSecrets = unsealedSecrets;
+			return unsealedSecrets;
+		} catch (e) {
+			this._logService.warn('Error unsealing MCP secrets', e);
+			this._record.value.secrets = undefined;
+		}
+
+		return {};
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
index 9659bc986daa..12f5123a8034 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
@@ -35,8 +35,6 @@ export interface IMcpRegistry {
 	registerDelegate(delegate: IMcpHostDelegate): IDisposable;
 	registerCollection(collection: McpCollectionDefinition): IDisposable;
 
-	/** Gets whether there are saved inputs used to resolve the connection */
-	hasSavedInputs(collection: McpCollectionDefinition, definition: McpServerDefinition): boolean;
 	/** Resets any saved inputs for the connection. */
 	clearSavedInputs(collection: McpCollectionDefinition, definition: McpServerDefinition): void;
 	/** Createse a connection for the collection and definition. */
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 19465290098e..d7493cdccaa3 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
@@ -22,6 +22,8 @@ import { IMcpHostDelegate, IMcpMessageTransport } from '../../common/mcpRegistry
 import { McpServerConnection } from '../../common/mcpServerConnection.js';
 import { McpCollectionDefinition, McpServerDefinition, McpServerTransportType } from '../../common/mcpTypes.js';
 import { TestMcpMessageTransport } from './mcpRegistryTypes.js';
+import { ISecretStorageService } from '../../../../../platform/secrets/common/secrets.js';
+import { TestSecretStorageService } from '../../../../../platform/secrets/test/common/testSecretStorageService.js';
 
 class TestConfigurationResolverService implements Partial<IConfigurationResolverService> {
 	declare readonly _serviceBrand: undefined;
@@ -131,6 +133,7 @@ suite('Workbench - MCP - Registry', () => {
 		const services = new ServiceCollection(
 			[IConfigurationResolverService, testConfigResolverService],
 			[IStorageService, testStorageService],
+			[ISecretStorageService, new TestSecretStorageService()],
 			[ILoggerService, store.add(new TestLoggerService())],
 			[IOutputService, upcast({ showChannel: () => { } })],
 		);
@@ -185,27 +188,6 @@ suite('Workbench - MCP - Registry', () => {
 		assert.strictEqual(registry.delegates.length, 0);
 	});
 
-	test('hasSavedInputs returns false when no inputs are saved', () => {
-		assert.strictEqual(registry.hasSavedInputs(testCollection, baseDefinition), false);
-	});
-
-	test('clearSavedInputs removes stored inputs', () => {
-		const definition: McpServerDefinition = {
-			...baseDefinition,
-			variableReplacement: {
-				section: 'mcp'
-			}
-		};
-
-		// Save some mock inputs
-		const key = `mcpConfig.${testCollection.id}.${definition.id}`;
-		testStorageService.store(key, JSON.stringify({ 'input:foo': 'bar' }), StorageScope.APPLICATION, StorageTarget.MACHINE);
-
-		assert.strictEqual(registry.hasSavedInputs(testCollection, definition), true);
-		registry.clearSavedInputs(testCollection, definition);
-		assert.strictEqual(registry.hasSavedInputs(testCollection, definition), false);
-	});
-
 	test('resolveConnection creates connection with resolved variables and memorizes them', async () => {
 		const definition: McpServerDefinition = {
 			...baseDefinition,
diff --git a/src/vs/workbench/contrib/mcp/test/common/mcpRegistryInputStorage.test.ts b/src/vs/workbench/contrib/mcp/test/common/mcpRegistryInputStorage.test.ts
new file mode 100644
index 000000000000..f6f745d57512
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpRegistryInputStorage.test.ts
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { TestSecretStorageService } from '../../../../../platform/secrets/test/common/testSecretStorageService.js';
+import { StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { TestStorageService } from '../../../../test/common/workbenchTestServices.js';
+import { McpRegistryInputStorage } from '../../common/mcpRegistryInputStorage.js';
+
+suite('Workbench - MCP - RegistryInputStorage', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let testStorageService: TestStorageService;
+	let testSecretStorageService: TestSecretStorageService;
+	let testLogService: ILogService;
+	let mcpInputStorage: McpRegistryInputStorage;
+
+	setup(() => {
+		testStorageService = store.add(new TestStorageService());
+		testSecretStorageService = new TestSecretStorageService();
+		testLogService = store.add(new NullLogService());
+
+		// Create the input storage with APPLICATION scope
+		mcpInputStorage = store.add(new McpRegistryInputStorage(
+			StorageScope.APPLICATION,
+			StorageTarget.MACHINE,
+			testStorageService,
+			testSecretStorageService,
+			testLogService
+		));
+	});
+
+	test('setPlainText stores values that can be retrieved with getMap', async () => {
+		const values = {
+			'key1': 'value1',
+			'key2': 'value2'
+		};
+
+		await mcpInputStorage.setPlainText(values);
+		const result = await mcpInputStorage.getMap();
+
+		assert.strictEqual(result.key1, 'value1');
+		assert.strictEqual(result.key2, 'value2');
+	});
+
+	test('setSecrets stores encrypted values that can be retrieved with getMap', async () => {
+		const secrets = {
+			'secretKey1': 'secretValue1',
+			'secretKey2': 'secretValue2'
+		};
+
+		await mcpInputStorage.setSecrets(secrets);
+		const result = await mcpInputStorage.getMap();
+
+		assert.strictEqual(result.secretKey1, 'secretValue1');
+		assert.strictEqual(result.secretKey2, 'secretValue2');
+	});
+
+	test('getMap returns combined plain text and secret values', async () => {
+		await mcpInputStorage.setPlainText({
+			'plainKey': 'plainValue'
+		});
+
+		await mcpInputStorage.setSecrets({
+			'secretKey': 'secretValue'
+		});
+
+		const result = await mcpInputStorage.getMap();
+
+		assert.strictEqual(result.plainKey, 'plainValue');
+		assert.strictEqual(result.secretKey, 'secretValue');
+	});
+
+	test('clear removes specific values', async () => {
+		await mcpInputStorage.setPlainText({
+			'key1': 'value1',
+			'key2': 'value2'
+		});
+
+		await mcpInputStorage.setSecrets({
+			'secretKey1': 'secretValue1',
+			'secretKey2': 'secretValue2'
+		});
+
+		// Clear one plain and one secret value
+		await mcpInputStorage.clear('key1');
+		await mcpInputStorage.clear('secretKey1');
+
+		const result = await mcpInputStorage.getMap();
+
+		assert.strictEqual(result.key1, undefined);
+		assert.strictEqual(result.key2, 'value2');
+		assert.strictEqual(result.secretKey1, undefined);
+		assert.strictEqual(result.secretKey2, 'secretValue2');
+	});
+
+	test('clearAll removes all values', async () => {
+		await mcpInputStorage.setPlainText({
+			'key1': 'value1'
+		});
+
+		await mcpInputStorage.setSecrets({
+			'secretKey1': 'secretValue1'
+		});
+
+		mcpInputStorage.clearAll();
+
+		const result = await mcpInputStorage.getMap();
+
+		assert.deepStrictEqual(result, {});
+	});
+
+	test('updates to plain text values overwrite existing values', async () => {
+		await mcpInputStorage.setPlainText({
+			'key1': 'value1',
+			'key2': 'value2'
+		});
+
+		await mcpInputStorage.setPlainText({
+			'key1': 'updatedValue1'
+		});
+
+		const result = await mcpInputStorage.getMap();
+
+		assert.strictEqual(result.key1, 'updatedValue1');
+		assert.strictEqual(result.key2, 'value2');
+	});
+
+	test('updates to secret values overwrite existing values', async () => {
+		await mcpInputStorage.setSecrets({
+			'secretKey1': 'secretValue1',
+			'secretKey2': 'secretValue2'
+		});
+
+		await mcpInputStorage.setSecrets({
+			'secretKey1': 'updatedSecretValue1'
+		});
+
+		const result = await mcpInputStorage.getMap();
+
+		assert.strictEqual(result.secretKey1, 'updatedSecretValue1');
+		assert.strictEqual(result.secretKey2, 'secretValue2');
+	});
+
+	test('storage persists values across instances', async () => {
+		// Set values on first instance
+		await mcpInputStorage.setPlainText({
+			'key1': 'value1'
+		});
+
+		await mcpInputStorage.setSecrets({
+			'secretKey1': 'secretValue1'
+		});
+
+		await testStorageService.flush();
+
+		// Create a second instance that should have access to the same storage
+		const secondInstance = store.add(new McpRegistryInputStorage(
+			StorageScope.APPLICATION,
+			StorageTarget.MACHINE,
+			testStorageService,
+			testSecretStorageService,
+			testLogService
+		));
+
+		const result = await secondInstance.getMap();
+
+		assert.strictEqual(result.key1, 'value1');
+		assert.strictEqual(result.secretKey1, 'secretValue1');
+
+		assert.ok(!testStorageService.get('mcpInputs', StorageScope.APPLICATION)?.includes('secretValue1'));
+	});
+});
+

From fed0175e8985a29def12796390098a714fed1984 Mon Sep 17 00:00:00 2001
From: Justin Chen <54879025+justschen@users.noreply.github.com>
Date: Tue, 11 Mar 2025 15:20:48 -0700
Subject: [PATCH 0800/1815] add telemetry at point of image attachment
 (#243270)

* add telemetry at point of attaching image

* fix imports
---
 .../chat/browser/chatAttachmentWidgets.ts     | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatAttachmentWidgets.ts b/src/vs/workbench/contrib/chat/browser/chatAttachmentWidgets.ts
index ec400c28df77..40691c175940 100644
--- a/src/vs/workbench/contrib/chat/browser/chatAttachmentWidgets.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatAttachmentWidgets.ts
@@ -33,6 +33,7 @@ import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { basename, dirname } from '../../../../base/common/path.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 
 abstract class AbstractChatAttachmentWidget extends Disposable {
 	public readonly element: HTMLElement;
@@ -203,6 +204,7 @@ export class ImageAttachmentWidget extends AbstractChatAttachmentWidget {
 		@IOpenerService openerService: IOpenerService,
 		@IHoverService private readonly hoverService: IHoverService,
 		@ILanguageModelsService private readonly languageModelsService: ILanguageModelsService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
 	) {
 		super(attachment, shouldFocusClearButton, container, contextResourceLabels, hoverDelegate, currentLanguageModel, commandService, openerService);
 
@@ -228,9 +230,28 @@ export class ImageAttachmentWidget extends AbstractChatAttachmentWidget {
 		const hoverElement = dom.$('div.chat-attached-context-hover');
 		hoverElement.setAttribute('aria-label', ariaLabel);
 
-		if (!this.modelSupportsVision()) {
+		type AttachImageEvent = {
+			currentModel: string;
+			supportsVision: boolean;
+		};
+		type AttachImageEventClassification = {
+			currentModel: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The model at the point of attaching the image.' };
+			supportsVision: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the current model supports vision or not.' };
+			owner: 'justschen';
+			comment: 'Event used to gain insights when images are attached, and if the model supported vision or not.';
+		};
+
+		const currentLanguageModelName = this.currentLanguageModel ? this.languageModelsService.lookupLanguageModel(this.currentLanguageModel.identifier)?.name ?? this.currentLanguageModel.identifier : 'unknown';
+		const supportsVision = this.modelSupportsVision();
+
+		this.telemetryService.publicLog2<AttachImageEvent, AttachImageEventClassification>('copilot.attachImage', {
+			currentModel: currentLanguageModelName,
+			supportsVision: supportsVision
+		});
+
+		if (!supportsVision && this.currentLanguageModel) {
 			this.element.classList.add('warning');
-			hoverElement.textContent = localize('chat.fileAttachmentHover', "{0} does not support this {1} type.", this.currentLanguageModel ? this.languageModelsService.lookupLanguageModel(this.currentLanguageModel.identifier)?.name : this.currentLanguageModel, 'image');
+			hoverElement.textContent = localize('chat.fileAttachmentHover', "{0} does not support this {1} type.", currentLanguageModelName, 'image');
 			this._register(this.hoverService.setupManagedHover(hoverDelegate, this.element, hoverElement, { trapFocus: true }));
 		} else {
 			const buffer = attachment.value as Uint8Array;

From 59ae5d4272cf4021d08e04eeb52834db3d452229 Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Tue, 11 Mar 2025 15:24:38 -0700
Subject: [PATCH 0801/1815] reveal first change on edit finish (#243273)

more simplification

Co-authored-by: amunger <>
---
 .../chatEditingNotebookEditorIntegration.ts   | 67 +++++--------------
 1 file changed, 18 insertions(+), 49 deletions(-)

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 dc2a00bbbe48..4379d0774d53 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
@@ -86,8 +86,6 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 	readonly currentIndex: IObservable<number> = this._currentIndex;
 
 	// TODO@amunger For now we're going to ignore being able to focus on a deleted cell.
-	private readonly _currentCell = observableValue<NotebookCellTextModel | undefined>(this, undefined);
-	readonly currentCell: IObservable<NotebookCellTextModel | undefined> = this._currentCell;
 
 	private readonly _currentChange = observableValue<{ change: ICellDiffInfo; index: number } | undefined>(this, undefined);
 	readonly currentChange: IObservable<{ change: ICellDiffInfo; index: number } | undefined> = this._currentChange;
@@ -143,16 +141,7 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 				&& cellChanges.read(r).some(c => c.type !== 'unchanged' && c.type !== 'delete' && !c.diff.read(r).identical)
 			) {
 				lastModifyingRequestId = _entry.lastModifyingRequestId;
-				const firstModifiedCell = cellChanges.read(r).
-					filter(c => c.type !== 'unchanged' && c.type !== 'delete').
-					filter(c => !c.diff.read(r).identical).
-					reduce((prev, curr) => curr.modifiedCellIndex < prev ? curr.modifiedCellIndex : prev, Number.MAX_SAFE_INTEGER);
-				if (typeof firstModifiedCell !== 'number' || firstModifiedCell === Number.MAX_SAFE_INTEGER) {
-					return;
-				}
-				const activeCell = notebookEditor.getActiveCell();
-				const index = activeCell ? notebookModel.cells.findIndex(c => c.handle === activeCell.handle) : firstModifiedCell;
-				this._currentCell.set(notebookModel.cells[index], undefined);
+				this.reveal(true);
 			}
 		}));
 
@@ -314,31 +303,10 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 		}));
 	}
 
-	getCurrentCell() {
-		const activeCell = this.notebookModel.cells.find(c => c.handle === this.notebookEditor.getActiveCell()?.handle) || this._currentCell.get();
-		if (!activeCell) {
-			return undefined;
-		}
-		const index = this.notebookModel.cells.findIndex(c => c.handle === activeCell.handle);
-		const integration = this.cellEditorIntegrations.get(activeCell)?.integration;
-		return integration ? { integration, index: index, handle: activeCell.handle, cell: activeCell } : undefined;
-	}
-
-	selectCell(cell: NotebookCellTextModel) {
-		const integration = this.cellEditorIntegrations.get(cell)?.integration;
-		if (integration) {
-			this._currentCell.set(cell, undefined);
-			const cellViewModel = this.notebookEditor.getViewModel()?.viewCells.find(c => c.handle === cell.handle);
-			if (cellViewModel) {
-				this.notebookEditor.focusNotebookCell(cellViewModel, 'editor');
-			}
-		}
-	}
-
 	getCell(modifiedCellIndex: number) {
 		const cell = this.notebookModel.cells[modifiedCellIndex];
 		const integration = this.cellEditorIntegrations.get(cell)?.integration;
-		return integration ? { integration, index: modifiedCellIndex, handle: cell.handle, cell } : undefined;
+		return integration;
 	}
 
 	reveal(firstOrLast: boolean): void {
@@ -358,9 +326,9 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 					const index = firstOrLast || change.type === 'insert' ? 0 : change.diff.get().changes.length - 1;
 					// TODO: check if this breaks for inserted cells
 					const textChange = change.diff.get().changes[index];
-					const cell = this.getCell(change.modifiedCellIndex);
-					if (cell) {
-						cell.integration.reveal(firstOrLast);
+					const cellIntegration = this.getCell(change.modifiedCellIndex);
+					if (cellIntegration) {
+						cellIntegration.reveal(firstOrLast);
 						this._currentChange.set({ change: change, index }, undefined);
 					} else {
 						const cellViewModel = this.getCellViewModel(change);
@@ -374,7 +342,6 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 				}
 			case 'delete':
 				// reveal the deleted cell decorator
-				this._currentCell.set(undefined, undefined);
 				this.insertDeleteDecorators.get()?.deletedCellDecorator.reveal(change.originalCellIndex);
 				this._currentChange.set({ change: change, index: 0 }, undefined);
 				return true;
@@ -406,7 +373,6 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 			const firstChange = changes[0];
 
 			if (firstChange) {
-				this._currentCell.set(undefined, undefined);
 				return this._revealChange(firstChange);
 			}
 
@@ -418,10 +384,10 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 		switch (currentChange.change.type) {
 			case 'modified':
 				{
-					const currentChangeInfo = this.getCell(currentChange.change.modifiedCellIndex);
-					if (currentChangeInfo) {
-						if (currentChangeInfo.integration.next(false)) {
-							this._currentChange.set({ change: currentChange.change, index: currentChangeInfo.integration.currentIndex.get() }, undefined);
+					const cellIntegration = this.getCell(currentChange.change.modifiedCellIndex);
+					if (cellIntegration) {
+						if (cellIntegration.next(false)) {
+							this._currentChange.set({ change: currentChange.change, index: cellIntegration.currentIndex.get() }, undefined);
 							return true;
 						}
 					}
@@ -459,7 +425,6 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 		if (!currentChange) {
 			const lastChange = changes[changes.length - 1];
 			if (lastChange) {
-				this._currentCell.set(undefined, undefined);
 				return this._revealChange(lastChange, false);
 			}
 
@@ -471,10 +436,10 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 		switch (currentChange.change.type) {
 			case 'modified':
 				{
-					const currentChangeInfo = this.getCell(currentChange.change.modifiedCellIndex);
-					if (currentChangeInfo) {
-						if (currentChangeInfo.integration.previous(false)) {
-							this._currentChange.set({ change: currentChange.change, index: currentChangeInfo.integration.currentIndex.get() }, undefined);
+					const cellIntegration = this.getCell(currentChange.change.modifiedCellIndex);
+					if (cellIntegration) {
+						if (cellIntegration.previous(false)) {
+							this._currentChange.set({ change: currentChange.change, index: cellIntegration.currentIndex.get() }, undefined);
 							return true;
 						}
 					}
@@ -510,7 +475,11 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 	}
 
 	enableAccessibleDiffView(): void {
-		this.getCurrentCell()?.integration.enableAccessibleDiffView();
+		const cell = this.notebookEditor.getActiveCell()?.model;
+		if (cell) {
+			const integration = this.cellEditorIntegrations.get(cell)?.integration;
+			integration?.enableAccessibleDiffView();
+		}
 	}
 	acceptNearestChange(change: IModifiedFileEntryChangeHunk): void {
 		change.accept();

From 5e317a1e5c2977c4f7faf2c66d10f814ae5e6f1a Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Tue, 11 Mar 2025 18:39:03 -0400
Subject: [PATCH 0802/1815] don't keep no suggestions around as a user keeps
 typing (#242699)

---
 .../suggest/browser/terminalSuggestAddon.ts                | 5 ++---
 .../services/suggest/browser/simpleSuggestWidget.ts        | 7 +++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index d54e7c977e2c..7346f6d6938d 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -502,7 +502,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			return;
 		}
 		const xtermBox = this._screen!.getBoundingClientRect();
-		this._suggestWidget.showSuggestions(0, false, false, {
+		this._suggestWidget.showSuggestions(0, false, true, {
 			left: xtermBox.left + this._terminal.buffer.active.cursorX * dimensions.width,
 			top: xtermBox.top + this._terminal.buffer.active.cursorY * dimensions.height,
 			height: dimensions.height
@@ -613,8 +613,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			return;
 		}
 		const xtermBox = this._screen!.getBoundingClientRect();
-
-		suggestWidget.showSuggestions(0, false, false, {
+		suggestWidget.showSuggestions(0, false, !explicitlyInvoked, {
 			left: xtermBox.left + this._terminal.buffer.active.cursorX * dimensions.width,
 			top: xtermBox.top + this._terminal.buffer.active.cursorY * dimensions.height,
 			height: dimensions.height
diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
index 7109812270b0..7c4db50d7ba7 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
@@ -24,6 +24,7 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../platfo
 import { canExpandCompletionItem, SimpleSuggestDetailsOverlay, SimpleSuggestDetailsWidget } 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';
 
 const $ = dom.$;
 
@@ -439,7 +440,6 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 	}
 
 	private _setState(state: State): void {
-
 		if (this._state === state) {
 			return;
 		}
@@ -451,9 +451,11 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 		switch (state) {
 			case State.Hidden:
 				if (this._status) {
-					dom.hide(this._messageElement, this._listElement, this._status.element);
+					dom.hide(this._status.element);
 				}
 				dom.hide(this._listElement);
+				dom.hide(this._messageElement);
+				dom.hide(this.element.domNode);
 				this._details.hide(true);
 				this._status?.hide();
 				// this._contentWidget.hide();
@@ -490,6 +492,7 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 				this._details.hide();
 				this._show();
 				this._focusedItem = undefined;
+				status(SimpleSuggestWidget.NO_SUGGESTIONS_MESSAGE);
 				break;
 			case State.Open:
 				dom.hide(this._messageElement);

From 11cb11ac108db993644e36851f631941d97d9358 Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Tue, 11 Mar 2025 15:50:39 -0700
Subject: [PATCH 0803/1815] move init code to appropriate autorun (#243277)

Co-authored-by: amunger <>
---
 .../chatEditingNotebookEditorIntegration.ts   | 41 +++++++------------
 1 file changed, 14 insertions(+), 27 deletions(-)

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 4379d0774d53..7a3abd9ae007 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
@@ -141,6 +141,19 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 				&& cellChanges.read(r).some(c => c.type !== 'unchanged' && c.type !== 'delete' && !c.diff.read(r).identical)
 			) {
 				lastModifyingRequestId = _entry.lastModifyingRequestId;
+
+				const sortedCellChanges = sortCellChanges(cellChanges.read(r));
+				const values = new Uint32Array(sortedCellChanges.length);
+				for (let i = 0; i < sortedCellChanges.length; i++) {
+					const change = sortedCellChanges[i];
+					values[i] = change.type === 'insert' ? 1
+						: change.type === 'delete' ? 1
+							: change.type === 'modified' ? change.diff.read(r).changes.length
+								: 0;
+				}
+
+				this.diffIndexPrefixSum = new PrefixSumComputer(values);
+
 				this.reveal(true);
 			}
 		}));
@@ -211,33 +224,6 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 			});
 		}));
 
-		const cellsAreVisible = onDidChangeVisibleRanges.map(v => v.length > 0);
-
-		// Focus
-		this._register(autorun(r => {
-			const sortedCellChanges = sortCellChanges(cellChanges.read(r));
-
-			const values = new Uint32Array(sortedCellChanges.length);
-			for (let i = 0; i < sortedCellChanges.length; i++) {
-				const change = sortedCellChanges[i];
-				values[i] = change.type === 'insert' ? 1
-					: change.type === 'delete' ? 1
-						: change.type === 'modified' ? change.diff.read(r).changes.length
-							: 0;
-			}
-
-			this.diffIndexPrefixSum = new PrefixSumComputer(values);
-
-			const changes = sortedCellChanges.filter(c => c.type !== 'unchanged' && c.type !== 'delete' && !c.diff.read(r).identical);
-			if (!changes.length || !cellsAreVisible.read(r)) {
-				return;
-			}
-
-			// set initial index
-			this._currentIndex.set(0, undefined);
-			this._revealChange(sortedCellChanges[0]);
-		}));
-
 		this._register(autorun(r => {
 			const currentChange = this.currentChange.read(r);
 			if (currentChange) {
@@ -289,6 +275,7 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 			};
 		});
 
+		const cellsAreVisible = onDidChangeVisibleRanges.map(v => v.length > 0);
 		this._register(autorun(r => {
 			if (!cellsAreVisible.read(r)) {
 				return;

From 88c3f76f25652c02e840adc99e807ab5e25ed6ec Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 11 Mar 2025 16:32:12 -0700
Subject: [PATCH 0804/1815] update tests

---
 .../mcp/test/common/mcpRegistry.test.ts       | 35 ++++---------------
 1 file changed, 6 insertions(+), 29 deletions(-)

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 d7493cdccaa3..57f2c7271406 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
@@ -188,7 +188,7 @@ suite('Workbench - MCP - Registry', () => {
 		assert.strictEqual(registry.delegates.length, 0);
 	});
 
-	test('resolveConnection creates connection with resolved variables and memorizes them', async () => {
+	test('resolveConnection creates connection with resolved variables and memorizes them until cleared', async () => {
 		const definition: McpServerDefinition = {
 			...baseDefinition,
 			launch: {
@@ -223,36 +223,13 @@ suite('Workbench - MCP - Registry', () => {
 		assert.ok(connection2);
 		assert.strictEqual((connection2.launchDefinition as any).env.PATH, 'interactiveValue0');
 		connection2.dispose();
-	});
-
-	test('resolveConnection with stored variables resolves them', async () => {
-		const definition: McpServerDefinition = {
-			...baseDefinition,
-			launch: {
-				type: McpServerTransportType.Stdio,
-				command: '${storedVar}',
-				args: [],
-				env: {},
-				cwd: URI.parse('file:///test')
-			},
-			variableReplacement: {
-				section: 'mcp'
-			}
-		};
 
-		// Save some mock inputs
-		const key = `mcpConfig.${testCollection.id}.${definition.id}`;
-		testStorageService.store(key, { 'storedVar': 'resolved-value' }, StorageScope.APPLICATION, StorageTarget.MACHINE);
+		registry.clearSavedInputs();
 
-		// Register a delegate that can handle the connection
-		const delegate = new TestMcpHostDelegate();
-		const disposable = registry.registerDelegate(delegate);
-		store.add(disposable);
-
-		const connection = await registry.resolveConnection(testCollection, definition) as McpServerConnection;
+		const connection3 = await registry.resolveConnection(testCollection, definition) as McpServerConnection;
 
-		assert.ok(connection);
-		assert.strictEqual((connection.launchDefinition as any).command, 'resolved-value');
-		connection.dispose();
+		assert.ok(connection3);
+		assert.strictEqual((connection3.launchDefinition as any).env.PATH, 'interactiveValue4');
+		connection3.dispose();
 	});
 });

From 942a5d72a7170ac51bc13cacc08247d5a34c514d Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Tue, 11 Mar 2025 16:36:54 -0700
Subject: [PATCH 0805/1815] Add ChatMode, make agent mode be session-specific,
 not global (#243280)

* Add ChatMode, make agent mode be session-specific, not global
Towards unifying chat views

* Fix mode for transferred session and request parser
---
 .../api/browser/mainThreadChatAgents2.ts      |   4 +-
 .../chat/browser/actions/chatClearActions.ts  |   6 +-
 .../browser/actions/chatExecuteActions.ts     |  15 ++-
 .../chatConfirmationContentPart.ts            |   4 +-
 .../contrib/chat/browser/chatInputPart.ts     | 105 +++++++++++++-----
 .../chatMarkdownDecorationsRenderer.ts        |   6 +-
 .../contrib/chat/browser/chatViewPane.ts      |  27 +++--
 .../contrib/chat/browser/chatWidget.ts        |  12 +-
 .../browser/contrib/chatInputCompletions.ts   |   4 +-
 .../browser/contrib/chatInputEditorContrib.ts |   4 +-
 .../viewsWelcome/chatViewWelcomeController.ts |   4 +-
 .../contrib/chat/common/chatAgents.ts         |  33 ++----
 .../contrib/chat/common/chatRequestParser.ts  |   8 +-
 .../contrib/chat/common/chatService.ts        |   4 +-
 .../contrib/chat/common/chatServiceImpl.ts    |  20 ++--
 .../chat/common/chatWidgetHistoryService.ts   |   2 +
 .../contrib/chat/common/constants.ts          |  10 ++
 .../chat/test/common/chatAgents.test.ts       |   3 +-
 .../chat/test/common/voiceChatService.test.ts |   6 +-
 19 files changed, 163 insertions(+), 114 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/common/constants.ts

diff --git a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
index 510f26d520ab..37e32ea1a822 100644
--- a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
+++ b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
@@ -138,8 +138,8 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 
 		const inputValue = widget?.inputEditor.getValue() ?? '';
 		const location = widget.location;
-		const toolsAgentModeEnabled = this._chatAgentService.toolsAgentModeEnabled;
-		this._chatService.transferChatSession({ sessionId, inputValue, location, toolsAgentModeEnabled }, URI.revive(toWorkspace));
+		const mode = widget.input.currentMode;
+		this._chatService.transferChatSession({ sessionId, inputValue, location, mode }, URI.revive(toWorkspace));
 	}
 
 	async $registerAgent(handle: number, extension: ExtensionIdentifier, id: string, metadata: IExtensionChatAgentMetadata, dynamicProps: IDynamicChatAgentProps | undefined): Promise<void> {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
index 6187720a229e..85b6746bd261 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
@@ -15,9 +15,10 @@ import { KeybindingWeight } from '../../../../../platform/keybinding/common/keyb
 import { ActiveEditorContext } from '../../../../common/contextkeys.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { isChatViewTitleActionContext } from '../../common/chatActions.js';
-import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
+import { ChatAgentLocation } from '../../common/chatAgents.js';
 import { ChatContextKeys } from '../../common/chatContextKeys.js';
 import { hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, IChatEditingSession, WorkingSetEntryState } from '../../common/chatEditingService.js';
+import { ChatMode } from '../../common/constants.js';
 import { ChatViewId, EditsViewId, IChatWidget, IChatWidgetService } from '../chat.js';
 import { EditingSessionAction } from '../chatEditing/chatEditingActions.js';
 import { ctxIsGlobalEditingSession } from '../chatEditing/chatEditingEditorContextKeys.js';
@@ -198,7 +199,6 @@ export function registerNewChatActions() {
 			const widgetService = accessor.get(IChatWidgetService);
 			const dialogService = accessor.get(IDialogService);
 			const viewsService = accessor.get(IViewsService);
-			const agentService = accessor.get(IChatAgentService);
 
 			if (!(await this._handleCurrentEditingSession(editingSession, dialogService))) {
 				return;
@@ -233,7 +233,7 @@ export function registerNewChatActions() {
 			}
 
 			if (!isChatViewTitleAction && typeof context.agentMode === 'boolean') {
-				agentService.toggleToolsAgentMode(context.agentMode);
+				widget.input.setChatMode(context.agentMode ? ChatMode.Agent : ChatMode.Edit);
 			}
 
 			if (context.inputValue) {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index 060244893471..df2139fb6b1e 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -18,6 +18,7 @@ import { ChatContextKeys } from '../../common/chatContextKeys.js';
 import { IChatEditingService, IChatEditingSession, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { chatAgentLeader, extractAgentAndCommand } from '../../common/chatParserTypes.js';
 import { IChatService } from '../../common/chatService.js';
+import { ChatMode } from '../../common/constants.js';
 import { EditsViewId, IChatWidget, IChatWidgetService } from '../chat.js';
 import { discardAllEditsWithConfirmation, EditingSessionAction } from '../chatEditing/chatEditingActions.js';
 import { ChatViewPane } from '../chatViewPane.js';
@@ -103,18 +104,14 @@ export class ToggleAgentModeAction extends EditingSessionAction {
 	constructor() {
 		super({
 			id: ToggleAgentModeAction.ID,
-			title: localize2('interactive.toggleAgent.label', "Toggle Agent Mode (Experimental)"),
+			title: localize2('interactive.toggleMode.label', "Toggle Chat Mode (Experimental)"),
 			f1: true,
 			category: CHAT_CATEGORY,
 			precondition: ContextKeyExpr.and(
 				ChatContextKeys.enabled,
 				ChatContextKeys.Editing.hasToolsAgent,
 				ChatContextKeys.requestInProgress.negate()),
-			toggled: {
-				condition: ChatContextKeys.Editing.agentMode,
-				tooltip: localize('agentEnabled', "Agent Mode Enabled (Experimental)"),
-			},
-			tooltip: localize('agentDisabled', "Agent Mode Disabled"),
+			tooltip: localize('setChatMode', "Set Mode (Experimental)"),
 			keybinding: {
 				when: ContextKeyExpr.and(
 					ChatContextKeys.inChatInput,
@@ -137,7 +134,6 @@ export class ToggleAgentModeAction extends EditingSessionAction {
 
 	override async runEditingSessionAction(accessor: ServicesAccessor, currentEditingSession: IChatEditingSession, chatWidget: IChatWidget, ...args: any[]) {
 
-		const agentService = accessor.get(IChatAgentService);
 		const chatService = accessor.get(IChatService);
 		const commandService = accessor.get(ICommandService);
 		const dialogService = accessor.get(IDialogService);
@@ -164,7 +160,10 @@ export class ToggleAgentModeAction extends EditingSessionAction {
 		}
 
 		const arg = args[0] as IToggleAgentModeArgs | undefined;
-		agentService.toggleToolsAgentMode(typeof arg?.agentMode === 'boolean' ? arg.agentMode : undefined);
+		const setTo = arg ?
+			(arg.agentMode ? ChatMode.Agent : ChatMode.Edit) :
+			(chatWidget.input.toolsAgentModeEnabled ? ChatMode.Edit : ChatMode.Agent);
+		chatWidget.input.setChatMode(setTo);
 
 		await commandService.executeCommand(ChatDoneActionId);
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts
index 68a8d913c373..c3361ccfd3ba 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.ts
@@ -53,7 +53,9 @@ export class ChatConfirmationContentPart extends Disposable implements IChatCont
 				options.agentId = element.agent?.id;
 				options.slashCommand = element.slashCommand?.name;
 				options.confirmation = e.label;
-				options.userSelectedModelId = chatWidgetService.getWidgetBySessionId(element.sessionId)?.input.currentLanguageModel;
+				const widget = chatWidgetService.getWidgetBySessionId(element.sessionId);
+				options.userSelectedModelId = widget?.input.currentLanguageModel;
+				options.mode = widget?.input.currentMode;
 				if (await this.chatService.sendRequest(element.sessionId, prompt, options)) {
 					confirmation.isUsed = true;
 					confirmationWidget.setShowButtons(false);
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 707265a92e02..1c755c9ff900 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -76,6 +76,7 @@ import { IChatFollowup } from '../common/chatService.js';
 import { IChatVariablesService } from '../common/chatVariables.js';
 import { IChatResponseViewModel } from '../common/chatViewModel.js';
 import { ChatInputHistoryMaxEntries, IChatHistoryEntry, IChatInputState, IChatWidgetHistoryService } from '../common/chatWidgetHistoryService.js';
+import { ChatMode } from '../common/constants.js';
 import { ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../common/languageModels.js';
 import { CancelAction, ChatSubmitAction, ChatSubmitSecondaryAgentAction, ChatSwitchToNextModelActionId, IChatExecuteActionContext, IToggleAgentModeArgs, ToggleAgentModeActionId } from './actions/chatExecuteActions.js';
 import { ImplicitContextAttachmentWidget } from './attachments/implicitContextAttachment.js';
@@ -300,6 +301,16 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		return this._currentLanguageModel?.identifier;
 	}
 
+	private _onDidChangeCurrentChatMode = this._register(new Emitter<void>());
+	private _currentMode: ChatMode = ChatMode.Chat;
+	public get toolsAgentModeEnabled(): boolean {
+		return this._currentMode === ChatMode.Agent;
+	}
+
+	public get currentMode(): ChatMode {
+		return this._currentMode === ChatMode.Agent && !this.agentService.hasToolsAgent ? ChatMode.Edit : this._currentMode;
+	}
+
 	private cachedDimensions: dom.Dimension | undefined;
 	private cachedExecuteToolbarWidth: number | undefined;
 	private cachedInputToolbarWidth: number | undefined;
@@ -361,7 +372,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		@IStorageService private readonly storageService: IStorageService,
 		@ILabelService private readonly labelService: ILabelService,
 		@IChatVariablesService private readonly variableService: IChatVariablesService,
-		@IChatAgentService private readonly chatAgentService: IChatAgentService,
+		@IChatAgentService private readonly agentService: IChatAgentService,
 	) {
 		super();
 
@@ -372,6 +383,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			return {
 				...getContribsInputState(),
 				chatContextAttachments: this._attachmentModel.attachments,
+				chatMode: this._currentMode,
 			};
 		};
 		this.inputEditorMaxHeight = this.options.renderStyle === 'compact' ? INPUT_EDITOR_MAX_HEIGHT / 3 : INPUT_EDITOR_MAX_HEIGHT;
@@ -436,7 +448,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			}
 		}
 
-		this._register(this.chatAgentService.onDidChangeToolsAgentModeEnabled(() => {
+		this._register(this._onDidChangeCurrentChatMode.event(() => {
 			this.checkModelSupported();
 		}));
 	}
@@ -456,9 +468,14 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}
 	}
 
+	setChatMode(mode: ChatMode): void {
+		this._currentMode = mode;
+		this._onDidChangeCurrentChatMode.fire();
+	}
+
 	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.chatAgentService.getDefaultAgent(this.location)?.isToolsAgent) {
+		if (this._currentMode === ChatMode.Agent) {
 			if (this.configurationService.getValue('chat.agent.allModels')) {
 				return true;
 			}
@@ -538,6 +555,12 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		if (state.inputValue) {
 			this.setValue(state.inputValue, false);
 		}
+
+		if (state.inputState?.chatMode) {
+			this._currentMode = state.inputState.chatMode;
+		} else if (this.location === ChatAgentLocation.EditingSession) {
+			this._currentMode = ChatMode.Edit;
+		}
 	}
 
 	logInputHistory(): void {
@@ -909,7 +932,11 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 						return this.instantiationService.createInstance(ModelPickerActionViewItem, action, this._currentLanguageModel, itemDelegate);
 					}
 				} else if (action.id === ToggleAgentModeActionId && action instanceof MenuItemAction) {
-					return this.instantiationService.createInstance(ToggleAgentActionViewItem, action);
+					const delegate: IModePickerDelegate = {
+						getMode: () => this._currentMode,
+						onDidChangeMode: this._onDidChangeCurrentChatMode.event
+					};
+					return this.instantiationService.createInstance(ToggleAgentActionViewItem, action, delegate);
 				}
 
 				return undefined;
@@ -1469,45 +1496,65 @@ class ModelPickerActionViewItem extends DropdownMenuActionViewItemWithKeybinding
 const chatInputEditorContainerSelector = '.interactive-input-editor';
 setupSimpleEditorSelectionStyling(chatInputEditorContainerSelector);
 
-class ToggleAgentActionViewItem extends DropdownMenuActionViewItemWithKeybinding {
-	private readonly agentStateActions: IAction[];
+interface IModePickerDelegate {
+	onDidChangeMode: Event<void>;
+	getMode(): ChatMode;
+}
 
+class ToggleAgentActionViewItem extends DropdownMenuActionViewItemWithKeybinding {
 	constructor(
 		action: MenuItemAction,
+		private readonly delegate: IModePickerDelegate,
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 	) {
-		const agentStateActions = [
-			{
-				...action,
-				id: 'agentMode',
-				label: localize('chat.agentMode', "Agent"),
-				class: undefined,
-				enabled: true,
-				run: () => action.run({ agentMode: true } satisfies IToggleAgentModeArgs)
-			},
-			{
-				...action,
-				id: 'normalMode',
-				label: localize('chat.normalMode', "Edit"),
-				class: undefined,
-				enabled: true,
-				checked: !action.checked,
-				run: () => action.run({ agentMode: false } satisfies IToggleAgentModeArgs)
-			},
-		];
+		const makeAction = (mode: ChatMode): IAction => ({
+			...action,
+			id: mode,
+			label: this.modeToString(mode),
+			class: undefined,
+			enabled: true,
+			checked: delegate.getMode() === mode,
+			run: async () => {
+				const result = await action.run({ agentMode: mode === ChatMode.Agent } satisfies IToggleAgentModeArgs);
+				this.renderLabel(this.element!);
+				return result;
+			}
+		});
 
-		super(action, agentStateActions, contextMenuService, undefined, keybindingService, contextKeyService);
-		this.agentStateActions = agentStateActions;
+		const actionProvider: IActionProvider = {
+			getActions: () => {
+				const agentStateActions = [
+					makeAction(ChatMode.Agent),
+					makeAction(ChatMode.Edit),
+				];
+				return agentStateActions;
+			}
+		};
+
+		super(action, actionProvider, contextMenuService, undefined, keybindingService, contextKeyService);
+
+		this._register(delegate.onDidChangeMode(() => this.renderLabel(this.element!)));
+	}
+
+	private modeToString(mode: ChatMode) {
+		switch (mode) {
+			case ChatMode.Agent:
+				return localize('chat.agentMode', "Agent");
+			case ChatMode.Edit:
+				return localize('chat.normalMode', "Edit");
+			case ChatMode.Chat:
+				return localize('chat.chatMode', "Chat");
+		}
 	}
 
 	protected override renderLabel(element: HTMLElement): IDisposable | null {
 		// Can't call super.renderLabel because it has a hack of forcing the 'codicon' class
 		this.setAriaLabelAttributes(element);
 
-		const state = this.agentStateActions.find(action => action.checked)?.label ?? '';
-		dom.reset(element, dom.$('span.chat-model-label', undefined, state), ...renderLabelWithIcons(`$(chevron-down)`));
+		const state = this.delegate.getMode();
+		dom.reset(element, dom.$('span.chat-model-label', undefined, this.modeToString(state)), ...renderLabelWithIcons(`$(chevron-down)`));
 		return null;
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.ts
index 0c3186b3b9fd..3b763727a527 100644
--- a/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.ts
@@ -193,7 +193,8 @@ export class ChatMarkdownDecorationsRenderer {
 					{
 						location: widget.location,
 						agentId: agent.id,
-						userSelectedModelId: widget.input.currentLanguageModel
+						userSelectedModelId: widget.input.currentLanguageModel,
+						mode: widget.input.currentMode
 					});
 			}));
 		} else {
@@ -229,7 +230,8 @@ export class ChatMarkdownDecorationsRenderer {
 				location: widget.location,
 				agentId: agent.id,
 				slashCommand: args.command,
-				userSelectedModelId: widget.input.currentLanguageModel
+				userSelectedModelId: widget.input.currentLanguageModel,
+				mode: widget.input.currentMode
 			});
 		}));
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
index 6e9563085f7a..57b36dcfa1d0 100644
--- a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
@@ -30,6 +30,7 @@ import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { ChatModelInitState, IChatModel } from '../common/chatModel.js';
 import { CHAT_PROVIDER_ID } from '../common/chatParticipantContribTypes.js';
 import { IChatService } from '../common/chatService.js';
+import { ChatMode } from '../common/constants.js';
 import { ChatWidget, IChatViewState } from './chatWidget.js';
 import { ChatViewWelcomeController, IViewWelcomeDelegate } from './viewsWelcome/chatViewWelcomeController.js';
 
@@ -76,8 +77,8 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 		this._register(this.chatAgentService.onDidChangeAgents(() => {
 			if (this.chatAgentService.getDefaultAgent(this.chatOptions?.location)) {
 				if (!this._widget?.viewModel) {
-					const sessionId = this.getSessionId();
-					const model = sessionId ? this.chatService.getOrRestoreSession(sessionId) : undefined;
+					const info = this.getTransferredOrPersistedSessionInfo();
+					const model = info.sessionId ? this.chatService.getOrRestoreSession(info.sessionId) : undefined;
 
 					// 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`
@@ -85,7 +86,7 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 					const wasVisible = this._widget.visible;
 					try {
 						this._widget.setVisible(false);
-						this.updateModel(model);
+						this.updateModel(model, info.inputValue || info.mode ? { inputState: { chatMode: info.mode }, inputValue: info.inputValue } : undefined);
 						this.defaultParticipantRegistrationFailed = false;
 						this.didUnregisterProvider = false;
 						this._onDidChangeViewWelcomeState.fire();
@@ -144,15 +145,17 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 		return !!shouldShow;
 	}
 
-	private getSessionId() {
-		let sessionId: string | undefined;
+	private getTransferredOrPersistedSessionInfo(): { sessionId?: string; inputValue?: string; mode?: ChatMode } {
 		if (this.chatService.transferredSessionData?.location === this.chatOptions.location) {
-			sessionId = this.chatService.transferredSessionData.sessionId;
-			this.viewState.inputValue = this.chatService.transferredSessionData.inputValue;
+			const sessionId = this.chatService.transferredSessionData.sessionId;
+			return {
+				sessionId,
+				inputValue: this.chatService.transferredSessionData.inputValue,
+				mode: this.chatService.transferredSessionData.mode
+			};
 		} else {
-			sessionId = this.viewState.sessionId;
+			return { sessionId: this.viewState.sessionId };
 		}
-		return sessionId;
 	}
 
 	protected override renderBody(parent: HTMLElement): void {
@@ -201,7 +204,7 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 			this._register(this._widget.onDidClear(() => this.clear()));
 			this._widget.render(parent);
 
-			const sessionId = this.getSessionId();
+			const info = this.getTransferredOrPersistedSessionInfo();
 			const disposeListener = this._register(this.chatService.onDidDisposeSession((e) => {
 				// Render the welcome view if provider registration fails, eg when signed out. This activates for any session, but the problem is the same regardless
 				if (e.reason === 'initializationFailed') {
@@ -210,9 +213,9 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 					this._onDidChangeViewWelcomeState.fire();
 				}
 			}));
-			const model = sessionId ? this.chatService.getOrRestoreSession(sessionId) : undefined;
+			const model = info.sessionId ? this.chatService.getOrRestoreSession(info.sessionId) : undefined;
 
-			this.updateModel(model);
+			this.updateModel(model, info.inputValue || info.mode ? { inputState: { chatMode: info.mode }, inputValue: info.inputValue } : undefined);
 		} catch (e) {
 			this.logService.error(e);
 			throw e;
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index b7062cf6024f..0be625675db1 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -48,6 +48,7 @@ import { IChatSlashCommandService } from '../common/chatSlashCommands.js';
 import { ChatViewModel, IChatResponseViewModel, isRequestVM, isResponseVM } from '../common/chatViewModel.js';
 import { IChatInputState } from '../common/chatWidgetHistoryService.js';
 import { CodeBlockModelCollection } from '../common/codeBlockModelCollection.js';
+import { ChatMode } from '../common/constants.js';
 import { ChatTreeItem, IChatAcceptInputOptions, IChatAccessibilityService, IChatCodeBlockInfo, IChatFileTreeInfo, IChatListItemRendererOptions, IChatWidget, IChatWidgetService, IChatWidgetViewContext, IChatWidgetViewOptions } from './chat.js';
 import { ChatAccessibilityProvider } from './chatAccessibilityProvider.js';
 import { ChatAttachmentModel } from './chatAttachmentModel.js';
@@ -200,7 +201,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				return { text: '', parts: [] };
 			}
 
-			this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(this.viewModel!.sessionId, this.getInput(), this.location, { selectedAgent: this._lastSelectedAgent });
+			this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(this.viewModel!.sessionId, this.getInput(), this.location, { selectedAgent: this._lastSelectedAgent, mode: this.input.currentMode });
 		}
 
 		return this.parsedChatRequest;
@@ -538,7 +539,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		if (!this.viewModel) {
 			return;
 		}
-		this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(this.viewModel.sessionId, this.getInput(), this.location, { selectedAgent: this._lastSelectedAgent });
+		this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(this.viewModel.sessionId, this.getInput(), this.location, { selectedAgent: this._lastSelectedAgent, mode: this.input.currentMode });
 		this._onDidChangeParsedInput.fire();
 	}
 
@@ -638,7 +639,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				{ ...welcomeContent, tips, },
 				{
 					location: this.location,
-					isWidgetWelcomeViewContent: true
+					isWidgetAgentWelcomeViewContent: this.input?.currentMode === ChatMode.Agent
 				}
 			));
 			dom.append(this.welcomeMessageContainer, welcomePart.element);
@@ -859,7 +860,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			}
 
 			let msg = '';
-			if (e.followup.agentId && e.followup.agentId !== this.chatAgentService.getDefaultAgent(this.location)?.id) {
+			if (e.followup.agentId && e.followup.agentId !== this.chatAgentService.getDefaultAgent(this.location, this.input.currentMode)?.id) {
 				const agent = this.chatAgentService.getAgent(e.followup.agentId);
 				if (!agent) {
 					return;
@@ -1137,10 +1138,11 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			this.chatService.cancelCurrentRequestForSession(this.viewModel.sessionId);
 
 			const result = await this.chatService.sendRequest(this.viewModel.sessionId, input, {
+				mode: this.inputPart.currentMode,
 				userSelectedModelId: this.inputPart.currentLanguageModel,
 				location: this.location,
 				locationData: this._location.resolveData?.(),
-				parserContext: { selectedAgent: this._lastSelectedAgent },
+				parserContext: { selectedAgent: this._lastSelectedAgent, mode: this.inputPart.currentMode },
 				attachedContext,
 				noCommandDetection: options?.noCommandDetection,
 				hasInstructionAttachments: this.inputPart.hasInstructionAttachments,
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
index 60ce746437cb..64853cc5daa2 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
@@ -265,7 +265,7 @@ class AgentCompletions extends Disposable {
 				return {
 					suggestions: justAgents.concat(
 						coalesce(agents.flatMap(agent => agent.slashCommands.map((c, i) => {
-							if (agent.isDefault && this.chatAgentService.getDefaultAgent(widget.location)?.id !== agent.id) {
+							if (agent.isDefault && this.chatAgentService.getDefaultAgent(widget.location, widget.input.currentMode)?.id !== agent.id) {
 								return;
 							}
 
@@ -324,7 +324,7 @@ class AgentCompletions extends Disposable {
 
 				return {
 					suggestions: coalesce(agents.flatMap(agent => agent.slashCommands.map((c, i) => {
-						if (agent.isDefault && this.chatAgentService.getDefaultAgent(widget.location)?.id !== agent.id) {
+						if (agent.isDefault && this.chatAgentService.getDefaultAgent(widget.location, widget.input.currentMode)?.id !== agent.id) {
 							return;
 						}
 
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts
index e0997913f21d..06957dd285a5 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts
@@ -112,7 +112,7 @@ class InputEditorDecorations extends Disposable {
 		}
 
 		if (!inputValue) {
-			const defaultAgent = this.chatAgentService.getDefaultAgent(this.widget.location);
+			const defaultAgent = this.chatAgentService.getDefaultAgent(this.widget.location, this.widget.input.currentMode);
 			const decoration: IDecorationOptions[] = [
 				{
 					range: {
@@ -301,7 +301,7 @@ class ChatTokenDeleter extends Disposable {
 
 			// If this was a simple delete, try to find out whether it was inside a token
 			if (!change.text && this.widget.viewModel) {
-				const previousParsedValue = parser.parseChatRequest(this.widget.viewModel.sessionId, previousInputValue, widget.location, { selectedAgent: previousSelectedAgent });
+				const previousParsedValue = parser.parseChatRequest(this.widget.viewModel.sessionId, previousInputValue, widget.location, { selectedAgent: previousSelectedAgent, mode: this.widget.input.currentMode });
 
 				// 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 ChatRequestToolPart);
diff --git a/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts b/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts
index eb8eadcfa0d3..bbe6404c8faf 100644
--- a/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts
+++ b/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts
@@ -116,7 +116,7 @@ export interface IChatViewWelcomeContent {
 export interface IChatViewWelcomeRenderOptions {
 	firstLinkToButton?: boolean;
 	location: ChatAgentLocation;
-	isWidgetWelcomeViewContent?: boolean;
+	isWidgetAgentWelcomeViewContent?: boolean;
 }
 
 export class ChatViewWelcomePart extends Disposable {
@@ -147,7 +147,7 @@ export class ChatViewWelcomePart extends Disposable {
 			title.textContent = content.title;
 
 			// Preview indicator
-			if (options?.location === ChatAgentLocation.EditingSession && typeof content.message !== 'function' && chatAgentService.toolsAgentModeEnabled && options.isWidgetWelcomeViewContent) {
+			if (options?.location === ChatAgentLocation.EditingSession && typeof content.message !== 'function' && options.isWidgetAgentWelcomeViewContent) {
 				// Override welcome message for the agent. Sort of a hack, should it come from the participant? This case is different because the welcome content typically doesn't change per ChatWidget
 				const agentMessage = localize({ key: 'agentMessage', comment: ['{Locked="["}', '{Locked="]({0})"}'] }, "Ask Copilot to edit your files in [agent mode]({0}). Copilot will automatically use multiple requests to pick files to edit, run terminal commands, and iterate on errors.\n\nCopilot is powered by AI, so mistakes are possible. Review output carefully before use.", 'https://aka.ms/vscode-copilot-agent');
 				content.message = new MarkdownString(agentMessage);
diff --git a/src/vs/workbench/contrib/chat/common/chatAgents.ts b/src/vs/workbench/contrib/chat/common/chatAgents.ts
index 633010ae07e5..dca99689801c 100644
--- a/src/vs/workbench/contrib/chat/common/chatAgents.ts
+++ b/src/vs/workbench/contrib/chat/common/chatAgents.ts
@@ -27,6 +27,7 @@ import { ChatContextKeys } from './chatContextKeys.js';
 import { IChatProgressHistoryResponseContent, IChatRequestVariableData, ISerializableChatAgentData } from './chatModel.js';
 import { IRawChatCommandContribution, RawChatParticipantLocation } from './chatParticipantContribTypes.js';
 import { IChatFollowup, IChatLocationData, IChatProgress, IChatResponseErrorDetails, IChatTaskDto } from './chatService.js';
+import { ChatMode } from './constants.js';
 
 //#region agent service, commands etc
 
@@ -206,9 +207,7 @@ export interface IChatAgentService {
 	 * undefined when an agent was removed
 	 */
 	readonly onDidChangeAgents: Event<IChatAgent | undefined>;
-	readonly onDidChangeToolsAgentModeEnabled: Event<void>;
-	readonly toolsAgentModeEnabled: boolean;
-	toggleToolsAgentMode(enabled?: boolean): void;
+	readonly hasToolsAgent: boolean;
 	registerAgent(id: string, data: IChatAgentData): IDisposable;
 	registerAgentImplementation(id: string, agent: IChatAgentImplementation): IDisposable;
 	registerDynamicAgent(data: IChatAgentData, agentImpl: IChatAgentImplementation): IDisposable;
@@ -231,7 +230,7 @@ export interface IChatAgentService {
 	/**
 	 * Get the default agent (only if activated)
 	 */
-	getDefaultAgent(location: ChatAgentLocation): IChatAgent | undefined;
+	getDefaultAgent(location: ChatAgentLocation, mode?: ChatMode): IChatAgent | undefined;
 
 	/**
 	 * Get the default agent data that has been contributed (may not be activated yet)
@@ -241,8 +240,6 @@ export interface IChatAgentService {
 	updateAgent(id: string, updateMetadata: IChatAgentMetadata): void;
 }
 
-const ChatToolsAgentModeStorageKey = 'chat.toolsAgentMode';
-
 export class ChatAgentService extends Disposable implements IChatAgentService {
 
 	public static readonly AGENT_LEADER = '@';
@@ -254,21 +251,16 @@ export class ChatAgentService extends Disposable implements IChatAgentService {
 	private readonly _onDidChangeAgents = new Emitter<IChatAgent | undefined>();
 	readonly onDidChangeAgents: Event<IChatAgent | undefined> = this._onDidChangeAgents.event;
 
-	private readonly _onDidChangeToolsAgentModeEnabled = new Emitter<void>();
-	readonly onDidChangeToolsAgentModeEnabled: Event<void> = this._onDidChangeToolsAgentModeEnabled.event;
-
 	private readonly _agentsContextKeys = new Set<string>();
 	private readonly _hasDefaultAgent: IContextKey<boolean>;
 	private readonly _defaultAgentRegistered: IContextKey<boolean>;
 	private readonly _editingAgentRegistered: IContextKey<boolean>;
-	private readonly _agentModeContextKey: IContextKey<boolean>;
 	private readonly _hasToolsAgentContextKey: IContextKey<boolean>;
 
 	private _chatParticipantDetectionProviders = new Map<number, IChatParticipantDetectionProvider>();
 
 	constructor(
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IStorageService private readonly storageService: IStorageService,
 	) {
 		super();
 		this._hasDefaultAgent = ChatContextKeys.enabled.bindTo(this.contextKeyService);
@@ -280,12 +272,7 @@ export class ChatAgentService extends Disposable implements IChatAgentService {
 			}
 		}));
 
-		this._agentModeContextKey = ChatContextKeys.Editing.agentMode.bindTo(contextKeyService);
 		this._hasToolsAgentContextKey = ChatContextKeys.Editing.hasToolsAgent.bindTo(contextKeyService);
-		this._agentModeContextKey.set(
-			this.storageService.getBoolean(ChatToolsAgentModeStorageKey, StorageScope.WORKSPACE, false));
-		this._register(
-			this.storageService.onWillSaveState(() => this.storageService.store(ChatToolsAgentModeStorageKey, this._agentModeContextKey.get(), StorageScope.WORKSPACE, StorageTarget.USER)));
 	}
 
 	registerAgent(id: string, data: IChatAgentData): IDisposable {
@@ -412,9 +399,9 @@ export class ChatAgentService extends Disposable implements IChatAgentService {
 		this._onDidChangeAgents.fire(new MergedChatAgent(agent.data, agent.impl));
 	}
 
-	getDefaultAgent(location: ChatAgentLocation): IChatAgent | undefined {
+	getDefaultAgent(location: ChatAgentLocation, mode?: ChatMode): IChatAgent | undefined {
 		return findLast(this.getActivatedAgents(), a => {
-			if (location === ChatAgentLocation.EditingSession && this.toolsAgentModeEnabled !== !!a.isToolsAgent) {
+			if (location === ChatAgentLocation.EditingSession && ((mode === ChatMode.Agent) !== !!a.isToolsAgent)) {
 				return false;
 			}
 
@@ -422,14 +409,8 @@ export class ChatAgentService extends Disposable implements IChatAgentService {
 		});
 	}
 
-	public get toolsAgentModeEnabled(): boolean {
-		return !!this._hasToolsAgentContextKey.get() && !!this._agentModeContextKey.get();
-	}
-
-	toggleToolsAgentMode(enabled?: boolean): void {
-		this._agentModeContextKey.set(enabled ?? !this._agentModeContextKey.get());
-		this._onDidChangeToolsAgentModeEnabled.fire();
-		this._onDidChangeAgents.fire(this.getDefaultAgent(ChatAgentLocation.EditingSession));
+	public get hasToolsAgent(): boolean {
+		return !!this._hasToolsAgentContextKey.get();
 	}
 
 	getContributedDefaultAgent(location: ChatAgentLocation): IChatAgentData | undefined {
diff --git a/src/vs/workbench/contrib/chat/common/chatRequestParser.ts b/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
index 230b17fc556f..c6359f5c4ff5 100644
--- a/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
+++ b/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
@@ -10,6 +10,7 @@ import { ChatAgentLocation, IChatAgentData, IChatAgentService } from './chatAgen
 import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestToolPart, IParsedChatRequest, IParsedChatRequestPart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from './chatParserTypes.js';
 import { IChatSlashCommandService } from './chatSlashCommands.js';
 import { IChatVariablesService, IDynamicVariable } from './chatVariables.js';
+import { ChatMode } from './constants.js';
 import { ILanguageModelToolsService } from './languageModelToolsService.js';
 
 const agentReg = /^@([\w_\-\.]+)(?=(\s|$|\b))/i; // An @-agent
@@ -19,6 +20,7 @@ const slashReg = /\/([\w_\-]+)(?=(\s|$|\b))/i; // A / command
 export interface IChatParserContext {
 	/** Used only as a disambiguator, when the query references an agent that has a duplicate with the same name. */
 	selectedAgent?: IChatAgentData;
+	mode?: ChatMode;
 }
 
 export class ChatRequestParser {
@@ -45,7 +47,7 @@ export class ChatRequestParser {
 				} else if (char === chatAgentLeader) {
 					newPart = this.tryToParseAgent(message.slice(i), message, i, new Position(lineNumber, column), parts, location, context);
 				} else if (char === chatSubcommandLeader) {
-					newPart = this.tryToParseSlashCommand(message.slice(i), message, i, new Position(lineNumber, column), parts, location);
+					newPart = this.tryToParseSlashCommand(message.slice(i), message, i, new Position(lineNumber, column), parts, location, context);
 				}
 
 				if (!newPart) {
@@ -157,7 +159,7 @@ export class ChatRequestParser {
 		return;
 	}
 
-	private tryToParseSlashCommand(remainingMessage: string, fullMessage: string, offset: number, position: IPosition, parts: ReadonlyArray<IParsedChatRequestPart>, location: ChatAgentLocation): ChatRequestSlashCommandPart | ChatRequestAgentSubcommandPart | undefined {
+	private tryToParseSlashCommand(remainingMessage: string, fullMessage: string, offset: number, position: IPosition, parts: ReadonlyArray<IParsedChatRequestPart>, location: ChatAgentLocation, context?: IChatParserContext): ChatRequestSlashCommandPart | ChatRequestAgentSubcommandPart | undefined {
 		const nextSlashMatch = remainingMessage.match(slashReg);
 		if (!nextSlashMatch) {
 			return;
@@ -199,7 +201,7 @@ export class ChatRequestParser {
 				return new ChatRequestSlashCommandPart(slashRange, slashEditorRange, slashCommand);
 			} else {
 				// check for with default agent for this location
-				const defaultAgent = this.agentService.getDefaultAgent(location);
+				const defaultAgent = this.agentService.getDefaultAgent(location, context?.mode);
 				const subCommand = defaultAgent?.slashCommands.find(c => c.name === command);
 				if (subCommand) {
 					// Valid default agent subcommand
diff --git a/src/vs/workbench/contrib/chat/common/chatService.ts b/src/vs/workbench/contrib/chat/common/chatService.ts
index 8340deb8945d..e777a648233d 100644
--- a/src/vs/workbench/contrib/chat/common/chatService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatService.ts
@@ -21,6 +21,7 @@ import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, ICh
 import { IParsedChatRequest } from './chatParserTypes.js';
 import { IChatParserContext } from './chatRequestParser.js';
 import { IChatRequestVariableValue } from './chatVariables.js';
+import { ChatMode } from './constants.js';
 import { IPreparedToolInvocation, IToolConfirmationMessages, IToolResult } from './languageModelToolsService.js';
 
 export interface IChatRequest {
@@ -411,7 +412,7 @@ export interface IChatTransferredSessionData {
 	sessionId: string;
 	inputValue: string;
 	location: ChatAgentLocation;
-	toolsAgentModeEnabled: boolean;
+	mode: ChatMode;
 }
 
 export interface IChatSendRequestResponseState {
@@ -444,6 +445,7 @@ export interface IChatTerminalLocationData {
 export type IChatLocationData = IChatEditorLocationData | IChatNotebookLocationData | IChatTerminalLocationData;
 
 export interface IChatSendRequestOptions {
+	mode?: ChatMode;
 	userSelectedModelId?: string;
 	location?: ChatAgentLocation;
 	locationData?: IChatLocationData;
diff --git a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
index 0dafd8770a39..86c8b630ec6e 100644
--- a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
@@ -33,6 +33,7 @@ import { IChatCompleteResponse, IChatDetail, IChatFollowup, IChatProgress, IChat
 import { ChatServiceTelemetry } from './chatServiceTelemetry.js';
 import { IChatSlashCommandService } from './chatSlashCommands.js';
 import { IChatVariablesService } from './chatVariables.js';
+import { ChatMode } from './constants.js';
 import { ChatMessageRole, IChatMessage } from './languageModels.js';
 import { ILanguageModelToolsService } from './languageModelToolsService.js';
 
@@ -45,7 +46,7 @@ interface IChatTransfer {
 	chat: ISerializableChatData;
 	inputValue: string;
 	location: ChatAgentLocation;
-	toolsAgentModeEnabled: boolean;
+	mode: ChatMode;
 }
 const SESSION_TRANSFER_EXPIRATION_IN_MILLISECONDS = 1000 * 60;
 
@@ -171,7 +172,7 @@ export class ChatService extends Disposable implements IChatService {
 				sessionId: transferredChat.sessionId,
 				inputValue: transferredData.inputValue,
 				location: transferredData.location,
-				toolsAgentModeEnabled: transferredData.toolsAgentModeEnabled,
+				mode: transferredData.mode,
 			};
 		}
 
@@ -473,7 +474,8 @@ export class ChatService extends Disposable implements IChatService {
 
 		const isTransferred = this.transferredSessionData?.sessionId === sessionId;
 		if (isTransferred) {
-			this.chatAgentService.toggleToolsAgentMode(this.transferredSessionData.toolsAgentModeEnabled);
+			// TODO
+			// this.chatAgentService.toggleToolsAgentMode(this.transferredSessionData.toolsAgentModeEnabled);
 			this._transferredSessionData = undefined;
 		}
 
@@ -501,7 +503,7 @@ export class ChatService extends Disposable implements IChatService {
 		const location = options?.location ?? model.initialLocation;
 		const attempt = options?.attempt ?? 0;
 		const enableCommandDetection = !options?.noCommandDetection;
-		const defaultAgent = this.chatAgentService.getDefaultAgent(location)!;
+		const defaultAgent = this.chatAgentService.getDefaultAgent(location, options?.mode)!;
 
 		model.removeRequest(request.id, ChatRequestRemovalReason.Resend);
 
@@ -554,7 +556,7 @@ export class ChatService extends Disposable implements IChatService {
 
 		const location = options?.location ?? model.initialLocation;
 		const attempt = options?.attempt ?? 0;
-		const defaultAgent = this.chatAgentService.getDefaultAgent(location)!;
+		const defaultAgent = this.chatAgentService.getDefaultAgent(location, options?.mode)!;
 
 		const parsedRequest = this.parseChatRequest(sessionId, request, location, options);
 		const agent = parsedRequest.parts.find((r): r is ChatRequestAgentPart => r instanceof ChatRequestAgentPart)?.agent ?? defaultAgent;
@@ -575,7 +577,7 @@ export class ChatService extends Disposable implements IChatService {
 			if (!agent) {
 				throw new Error(`Unknown agent: ${options.agentId}`);
 			}
-			parserContext = { selectedAgent: agent };
+			parserContext = { selectedAgent: agent, mode: options.mode };
 			const commandPart = options.slashCommand ? ` ${chatSubcommandLeader}${options.slashCommand}` : '';
 			request = `${chatAgentLeader}${agent.name}${commandPart} ${request}`;
 		}
@@ -891,13 +893,13 @@ export class ChatService extends Disposable implements IChatService {
 
 	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;
 			}
 
-			const defaultAgentId = this.chatAgentService.getDefaultAgent(location)?.id;
-			if (forAgentId !== request.response.agent?.id && forAgentId !== defaultAgentId) {
+			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;
@@ -1031,7 +1033,7 @@ export class ChatService extends Disposable implements IChatService {
 			toWorkspace: toWorkspace,
 			inputValue: transferredSessionData.inputValue,
 			location: transferredSessionData.location,
-			toolsAgentModeEnabled: transferredSessionData.toolsAgentModeEnabled,
+			mode: transferredSessionData.mode,
 		});
 
 		this.storageService.store(globalChatKey, JSON.stringify(existingRaw), StorageScope.PROFILE, StorageTarget.MACHINE);
diff --git a/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts b/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts
index d2ab31d58ce3..82ba4748b999 100644
--- a/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts
@@ -12,6 +12,7 @@ import { ChatAgentLocation } from './chatAgents.js';
 import { WorkingSetEntryState } from './chatEditingService.js';
 import { IChatRequestVariableEntry } from './chatModel.js';
 import { CHAT_PROVIDER_ID } from './chatParticipantContribTypes.js';
+import { ChatMode } from './constants.js';
 
 export interface IChatHistoryEntry {
 	text: string;
@@ -23,6 +24,7 @@ export interface IChatInputState {
 	[key: string]: any;
 	chatContextAttachments?: ReadonlyArray<IChatRequestVariableEntry>;
 	chatWorkingSet?: ReadonlyArray<{ uri: URI; state: WorkingSetEntryState }>;
+	chatMode?: ChatMode;
 }
 
 export const IChatWidgetHistoryService = createDecorator<IChatWidgetHistoryService>('IChatWidgetHistoryService');
diff --git a/src/vs/workbench/contrib/chat/common/constants.ts b/src/vs/workbench/contrib/chat/common/constants.ts
new file mode 100644
index 000000000000..9759e6c63168
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/constants.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 enum ChatMode {
+	Chat = 'chat',
+	Edit = 'edit',
+	Agent = 'agent'
+}
diff --git a/src/vs/workbench/contrib/chat/test/common/chatAgents.test.ts b/src/vs/workbench/contrib/chat/test/common/chatAgents.test.ts
index 580fa44ce454..cec803118e1e 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatAgents.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatAgents.test.ts
@@ -9,7 +9,6 @@ import { ContextKeyExpression } from '../../../../../platform/contextkey/common/
 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 { TestStorageService } from '../../../../test/common/workbenchTestServices.js';
 
 const testAgentId = 'testAgent';
 const testAgentData: IChatAgentData = {
@@ -42,7 +41,7 @@ suite('ChatAgents', function () {
 	let contextKeyService: TestingContextKeyService;
 	setup(() => {
 		contextKeyService = new TestingContextKeyService();
-		chatAgentService = store.add(new ChatAgentService(contextKeyService, store.add(new TestStorageService())));
+		chatAgentService = store.add(new ChatAgentService(contextKeyService));
 	});
 
 	test('registerAgent', async () => {
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 0005bca091e8..53def63d4901 100644
--- a/src/vs/workbench/contrib/chat/test/common/voiceChatService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/voiceChatService.test.ts
@@ -66,7 +66,6 @@ suite('VoiceChat', () => {
 	class TestChatAgentService implements IChatAgentService {
 		_serviceBrand: undefined;
 		readonly onDidChangeAgents = Event.None;
-		readonly onDidChangeToolsAgentModeEnabled = Event.None;
 		registerAgentImplementation(id: string, agent: IChatAgentImplementation): IDisposable { throw new Error(); }
 		registerDynamicAgent(data: IChatAgentData, agentImpl: IChatAgentImplementation): IDisposable { throw new Error('Method not implemented.'); }
 		invokeAgent(id: string, request: IChatAgentRequest, progress: (part: IChatProgress) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult> { throw new Error(); }
@@ -86,10 +85,7 @@ suite('VoiceChat', () => {
 		getAgentCompletionItems(id: string, query: string, token: CancellationToken): Promise<IChatAgentCompletionItem[]> { throw new Error('Method not implemented.'); }
 		agentHasDupeName(id: string): boolean { throw new Error('Method not implemented.'); }
 		getChatTitle(id: string, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<string | undefined> { throw new Error('Method not implemented.'); }
-		readonly toolsAgentModeEnabled: boolean = false;
-		toggleToolsAgentMode(): void {
-			throw new Error('Method not implemented.');
-		}
+		hasToolsAgent: boolean = false;
 		hasChatParticipantDetectionProviders(): boolean {
 			throw new Error('Method not implemented.');
 		}

From ab32b428cb81390242522cfd077a49c7e0c87226 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 12 Mar 2025 00:41:14 +0100
Subject: [PATCH 0806/1815] adopt extensions features using gallery
 capabilities and resources (#243281)

* adopt extensions features using gallery capabilities and resources

* remove `@` for properties in manifest resources
---
 src/vs/base/common/product.ts                 |   6 +-
 .../common/extensionGalleryService.ts         | 223 ++++++++++--------
 .../common/extensionManagement.ts             |  24 +-
 .../extensions/browser/extensionEditor.ts     |   5 +-
 .../browser/extensions.contribution.ts        |  47 ++--
 .../extensions/browser/extensionsActions.ts   |  19 +-
 .../browser/extensionsWorkbenchService.ts     |  16 +-
 .../contrib/extensions/common/extensions.ts   |   2 +
 .../common/extensionManagementService.ts      |  22 +-
 9 files changed, 217 insertions(+), 147 deletions(-)

diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
index 762e11341aad..0527af13b60a 100644
--- a/src/vs/base/common/product.ts
+++ b/src/vs/base/common/product.ts
@@ -95,11 +95,9 @@ export interface IProductConfiguration {
 
 	readonly extensionsGallery?: {
 		readonly serviceUrl: string;
-		readonly itemUrl: string;
-		readonly publisherUrl: string;
-		readonly resourceUrlTemplate: string;
-		readonly extensionUrlTemplate: string;
 		readonly controlUrl: string;
+		readonly extensionUrlTemplate: string;
+		readonly resourceUrlTemplate: string;
 		readonly nlsBaseUrl: string;
 	};
 
diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
index 568a055716b6..2acd0d13ad56 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
@@ -15,7 +15,7 @@ import { URI } from '../../../base/common/uri.js';
 import { IHeaders, IRequestContext, IRequestOptions, isOfflineError } from '../../../base/parts/request/common/request.js';
 import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { IEnvironmentService } from '../../environment/common/environment.js';
-import { getTargetPlatform, IExtensionGalleryService, IExtensionIdentifier, IExtensionInfo, IGalleryExtension, IGalleryExtensionAsset, IGalleryExtensionAssets, IGalleryExtensionVersion, InstallOperation, IQueryOptions, IExtensionsControlManifest, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, ITranslation, SortOrder, StatisticType, toTargetPlatform, WEB_EXTENSION_TAG, IExtensionQueryOptions, IDeprecationInfo, ISearchPrefferedResults, ExtensionGalleryError, ExtensionGalleryErrorCode, IProductVersion, UseUnpkgResourceApiConfigKey, IAllowedExtensionsService, EXTENSION_IDENTIFIER_REGEX, SortBy } from './extensionManagement.js';
+import { getTargetPlatform, IExtensionGalleryService, IExtensionIdentifier, IExtensionInfo, IGalleryExtension, IGalleryExtensionAsset, IGalleryExtensionAssets, IGalleryExtensionVersion, InstallOperation, IQueryOptions, IExtensionsControlManifest, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, ITranslation, SortOrder, StatisticType, toTargetPlatform, WEB_EXTENSION_TAG, IExtensionQueryOptions, IDeprecationInfo, ISearchPrefferedResults, ExtensionGalleryError, ExtensionGalleryErrorCode, IProductVersion, UseUnpkgResourceApiConfigKey, IAllowedExtensionsService, EXTENSION_IDENTIFIER_REGEX, SortBy, FilterType, IExtensionGalleryCapabilities } from './extensionManagement.js';
 import { adoptToGalleryExtensionId, areSameExtensions, getGalleryExtensionId, getGalleryExtensionTelemetryData } from './extensionManagementUtil.js';
 import { IExtensionManifest, TargetPlatform } from '../../extensions/common/extensions.js';
 import { areApiProposalsCompatible, isEngineValid } from '../../extensions/common/extensionValidator.js';
@@ -30,6 +30,16 @@ import { StopWatch } from '../../../base/common/stopwatch.js';
 import { format2 } from '../../../base/common/strings.js';
 import { IAssignmentService } from '../../assignment/common/assignment.js';
 
+type ExtensionGalleryConfig = {
+	readonly serviceUrl: string;
+	readonly itemUrl: string;
+	readonly publisherUrl: string;
+	readonly resourceUrlTemplate: string;
+	readonly extensionUrlTemplate: string;
+	readonly controlUrl: string;
+	readonly nlsBaseUrl: string;
+};
+
 const enum ExtensionGalleryResourceType {
 	ExtensionQueryService = 'ExtensionQueryService',
 	ExtensionLatestVersionUri = 'ExtensionLatestVersionUriTemplate',
@@ -42,17 +52,6 @@ const enum ExtensionGalleryResourceType {
 	ExtensionUriTemplate = 'ExtensionUriTemplate',
 }
 
-const enum FilterType {
-	Category = 'Category',
-	ExtensionId = 'ExtensionId',
-	ExtensionName = 'ExtensionName',
-	ExcludeWithFlags = 'ExcludeWithFlags',
-	Featured = 'Featured',
-	SearchText = 'SearchText',
-	Tag = 'Tag',
-	Target = 'Target',
-}
-
 const enum Flag {
 	None = 'None',
 	IncludeVersions = 'IncludeVersions',
@@ -71,8 +70,8 @@ const enum Flag {
 }
 
 type ExtensionGalleryManifestResource = {
-	readonly '@id': string;
-	readonly '@type': string;
+	readonly id: string;
+	readonly type: string;
 };
 
 type ExtensionQueryCapabilityValue = {
@@ -90,7 +89,7 @@ interface IExtensionGalleryManifest {
 			readonly flags?: readonly ExtensionQueryCapabilityValue[];
 		};
 		readonly signing?: {
-			readonly allRepositoriesSigned: boolean;
+			readonly allRepositorySigned: boolean;
 		};
 	};
 }
@@ -490,7 +489,21 @@ function setTelemetry(extension: IGalleryExtension, index: number, querySource?:
 	extension.telemetryData = { index, querySource, queryActivityId: extension.queryContext?.[ACTIVITY_HEADER_NAME] };
 }
 
-function toExtension(galleryExtension: IRawGalleryExtension, version: IRawGalleryExtensionVersion, allTargetPlatforms: TargetPlatform[], queryContext?: IStringDictionary<any>): IGalleryExtension {
+function getExtensionGalleryManifestResourceUri(manifest: IExtensionGalleryManifest, type: ExtensionGalleryResourceType, version?: string): string | undefined {
+	for (const resource of manifest.resources) {
+		const [r, v] = resource.type.split('/');
+		if (r !== type) {
+			continue;
+		}
+		if (!version || v === version) {
+			return resource.id;
+		}
+		break;
+	}
+	return undefined;
+}
+
+function toExtension(galleryExtension: IRawGalleryExtension, version: IRawGalleryExtensionVersion, allTargetPlatforms: TargetPlatform[], extensionGalleryManifest: IExtensionGalleryManifest, queryContext?: IStringDictionary<any>): IGalleryExtension {
 	const latestVersion = galleryExtension.versions[0];
 	const assets: IGalleryExtensionAssets = {
 		manifest: getVersionAsset(version, AssetType.Manifest),
@@ -504,6 +517,10 @@ function toExtension(galleryExtension: IRawGalleryExtension, version: IRawGaller
 		coreTranslations: getCoreTranslationAssets(version)
 	};
 
+	const detailsViewUri = getExtensionGalleryManifestResourceUri(extensionGalleryManifest, ExtensionGalleryResourceType.ExtensionDetailsViewUri);
+	const publisherViewUri = getExtensionGalleryManifestResourceUri(extensionGalleryManifest, ExtensionGalleryResourceType.PublisherViewUri);
+	const ratingViewUri = getExtensionGalleryManifestResourceUri(extensionGalleryManifest, ExtensionGalleryResourceType.ExtensionRatingViewUri);
+
 	return {
 		type: 'gallery',
 		identifier: {
@@ -543,7 +560,10 @@ function toExtension(galleryExtension: IRawGalleryExtension, version: IRawGaller
 		preview: getIsPreview(galleryExtension.flags),
 		isSigned: !!assets.signature,
 		queryContext,
-		supportLink: getSupportLink(latestVersion)
+		supportLink: getSupportLink(latestVersion),
+		detailsLink: detailsViewUri ? format2(detailsViewUri, { publisher: galleryExtension.publisher.publisherName, name: galleryExtension.extensionName }) : undefined,
+		publisherLink: publisherViewUri ? format2(publisherViewUri, { publisher: galleryExtension.publisher.publisherName }) : undefined,
+		ratingLink: ratingViewUri ? format2(ratingViewUri, { publisher: galleryExtension.publisher.publisherName, name: galleryExtension.extensionName }) : undefined,
 	};
 }
 
@@ -608,6 +628,27 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		return !!this.productService.extensionsGallery?.serviceUrl;
 	}
 
+	async getCapabilities(): Promise<IExtensionGalleryCapabilities> {
+		const extensionGalleryManifest = await this.getExtensionGalleryManifest();
+
+		const filters: FilterType[] = [];
+		for (const capability of extensionGalleryManifest.capabilities.extensionQuery.filtering ?? []) {
+			filters.push(capability.name as FilterType);
+		}
+
+		const sortBy: SortBy[] = [];
+		for (const capability of extensionGalleryManifest.capabilities.extensionQuery.sorting ?? []) {
+			sortBy.push(capability.name as SortBy);
+		}
+
+		return {
+			query: {
+				sortBy,
+				filters
+			}
+		};
+	}
+
 	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[]> {
@@ -618,10 +659,11 @@ 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 = (options.preferResourceApi && (this.configurationService.getValue(UseUnpkgResourceApiConfigKey) ?? false)) ? await this.getResourceApi() : undefined;
+		const extensionGalleryManifest = await this.getExtensionGalleryManifest();
+		const resourceApi = (options.preferResourceApi && (this.configurationService.getValue(UseUnpkgResourceApiConfigKey) ?? false)) ? await this.getResourceApi(extensionGalleryManifest) : undefined;
 		const result = resourceApi
-			? await this.getExtensionsUsingResourceApi(extensionInfos, options, resourceApi, token)
-			: await this.getExtensionsUsingQueryApi(extensionInfos, options, token);
+			? await this.getExtensionsUsingResourceApi(extensionInfos, options, resourceApi, extensionGalleryManifest, token)
+			: await this.getExtensionsUsingQueryApi(extensionInfos, options, extensionGalleryManifest, token);
 
 		const uuids = result.map(r => r.identifier.uuid);
 		const extensionInfosByName: IExtensionInfo[] = [];
@@ -643,16 +685,15 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 					count: extensionInfosByName.length
 				});
 
-			const extensions = await this.getExtensionsUsingQueryApi(extensionInfosByName, options, token);
+			const extensions = await this.getExtensionsUsingQueryApi(extensionInfosByName, options, extensionGalleryManifest, token);
 			result.push(...extensions);
 		}
 
 		return result;
 	}
 
-	private async getResourceApi(): Promise<{ uri: string; fallback?: string } | undefined> {
-		const manifest = await this.getExtensionGalleryManifest();
-		const latestVersionResource = this.getExtensionGalleryManifestResourceUri(manifest, ExtensionGalleryResourceType.ExtensionLatestVersionUri);
+	private async getResourceApi(extensionGalleryManifest: IExtensionGalleryManifest): Promise<{ uri: string; fallback?: string } | undefined> {
+		const latestVersionResource = getExtensionGalleryManifestResourceUri(extensionGalleryManifest, ExtensionGalleryResourceType.ExtensionLatestVersionUri);
 		if (!latestVersionResource) {
 			return undefined;
 		}
@@ -680,7 +721,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		return undefined;
 	}
 
-	private async getExtensionsUsingQueryApi(extensionInfos: ReadonlyArray<IExtensionInfo>, options: IExtensionQueryOptions, token: CancellationToken): Promise<IGalleryExtension[]> {
+	private async getExtensionsUsingQueryApi(extensionInfos: ReadonlyArray<IExtensionInfo>, options: IExtensionQueryOptions, extensionGalleryManifest: IExtensionGalleryManifest, token: CancellationToken): Promise<IGalleryExtension[]> {
 		const names: string[] = [],
 			ids: string[] = [],
 			includePreRelease: (IExtensionIdentifier & { includePreRelease: boolean })[] = [],
@@ -729,6 +770,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 				productVersion: options.productVersion ?? { version: this.productService.version, date: this.productService.date },
 				isQueryForReleaseVersionFromPreReleaseVersion
 			},
+			extensionGalleryManifest,
 			token);
 
 		if (options.source) {
@@ -738,7 +780,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		return extensions;
 	}
 
-	private async getExtensionsUsingResourceApi(extensionInfos: ReadonlyArray<IExtensionInfo>, options: IExtensionQueryOptions, resourceApi: { uri: string; fallback?: string }, token: CancellationToken): Promise<IGalleryExtension[]> {
+	private async getExtensionsUsingResourceApi(extensionInfos: ReadonlyArray<IExtensionInfo>, options: IExtensionQueryOptions, resourceApi: { uri: string; fallback?: string }, extensionGalleryManifest: IExtensionGalleryManifest, token: CancellationToken): Promise<IGalleryExtension[]> {
 
 		const result: IGalleryExtension[] = [];
 		const toQuery: IExtensionInfo[] = [];
@@ -759,7 +801,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			let galleryExtension: IGalleryExtension | null | 'NOT_FOUND';
 			try {
 				try {
-					galleryExtension = await this.getLatestGalleryExtension(extensionInfo, options, resourceApi.uri, token);
+					galleryExtension = await this.getLatestGalleryExtension(extensionInfo, options, resourceApi.uri, extensionGalleryManifest, token);
 				} catch (error) {
 					if (!resourceApi.fallback) {
 						throw error;
@@ -784,7 +826,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 							preRelease: !!extensionInfo.preRelease,
 							compatible: !!options.compatible
 						});
-					galleryExtension = await this.getLatestGalleryExtension(extensionInfo, options, resourceApi.fallback, token);
+					galleryExtension = await this.getLatestGalleryExtension(extensionInfo, options, resourceApi.fallback, extensionGalleryManifest, token);
 				}
 
 				if (galleryExtension === 'NOT_FOUND') {
@@ -825,14 +867,14 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		}));
 
 		if (toQuery.length) {
-			const extensions = await this.getExtensionsUsingQueryApi(toQuery, options, token);
+			const extensions = await this.getExtensionsUsingQueryApi(toQuery, options, extensionGalleryManifest, token);
 			result.push(...extensions);
 		}
 
 		return result;
 	}
 
-	private async getLatestGalleryExtension(extensionInfo: IExtensionInfo, options: IExtensionQueryOptions, resourceUriTemplate: string, token: CancellationToken): Promise<IGalleryExtension | null | 'NOT_FOUND'> {
+	private async getLatestGalleryExtension(extensionInfo: IExtensionInfo, options: IExtensionQueryOptions, resourceUriTemplate: string, extensionGalleryManifest: IExtensionGalleryManifest, token: CancellationToken): Promise<IGalleryExtension | null | 'NOT_FOUND'> {
 		const [publisher, name] = extensionInfo.id.split('.');
 		const uri = URI.parse(format2(resourceUriTemplate, { publisher, name }));
 		const rawGalleryExtension = await this.getLatestRawGalleryExtension(extensionInfo.id, uri, token);
@@ -855,7 +897,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			}, allTargetPlatforms);
 
 		if (rawGalleryExtensionVersion) {
-			return toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms);
+			return toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms, extensionGalleryManifest);
 		}
 
 		return null;
@@ -975,6 +1017,8 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 	}
 
 	async query(options: IQueryOptions, token: CancellationToken): Promise<IPager<IGalleryExtension>> {
+		const extensionGalleryManifest = await this.getExtensionGalleryManifest();
+
 		let text = options.text || '';
 		const pageSize = options.pageSize ?? 50;
 
@@ -1007,12 +1051,16 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 				query = query.withFilter(FilterType.SearchText, text);
 			}
 
-			query = query.withSortBy(SortBy.NoneOrRelevance);
+			if (extensionGalleryManifest.capabilities.extensionQuery.sorting?.some(c => c.name === SortBy.NoneOrRelevance)) {
+				query = query.withSortBy(SortBy.NoneOrRelevance);
+			}
 		} else {
-			query = query.withSortBy(SortBy.InstallCount);
+			if (extensionGalleryManifest.capabilities.extensionQuery.sorting?.some(c => c.name === SortBy.InstallCount)) {
+				query = query.withSortBy(SortBy.InstallCount);
+			}
 		}
 
-		if (typeof options.sortBy === 'number') {
+		if (options.sortBy && extensionGalleryManifest.capabilities.extensionQuery.sorting?.some(c => c.name === options.sortBy)) {
 			query = query.withSortBy(options.sortBy);
 		}
 
@@ -1025,7 +1073,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		}
 
 		const runQuery = async (query: Query, token: CancellationToken) => {
-			const { extensions, total } = await this.queryGalleryExtensions(query, { targetPlatform: CURRENT_TARGET_PLATFORM, compatible: false, includePreRelease: !!options.includePreRelease, productVersion: options.productVersion ?? { version: this.productService.version, date: this.productService.date } }, token);
+			const { extensions, total } = await this.queryGalleryExtensions(query, { targetPlatform: CURRENT_TARGET_PLATFORM, compatible: false, includePreRelease: !!options.includePreRelease, productVersion: options.productVersion ?? { version: this.productService.version, date: this.productService.date } }, extensionGalleryManifest, token);
 			extensions.forEach((e, index) => setTelemetry(e, ((query.pageNumber - 1) * query.pageSize) + index, options.source));
 			return { extensions, total };
 		};
@@ -1041,18 +1089,18 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		return { firstPage: extensions, total, pageSize: query.pageSize, getPage };
 	}
 
-	private async queryGalleryExtensions(query: Query, criteria: ExtensionsCriteria, token: CancellationToken): Promise<{ extensions: IGalleryExtension[]; total: number }> {
+	private async queryGalleryExtensions(query: Query, criteria: ExtensionsCriteria, extensionGalleryManifest: IExtensionGalleryManifest, token: CancellationToken): Promise<{ extensions: IGalleryExtension[]; total: number }> {
 		if (
 			this.productService.quality !== 'stable'
 			&& (await this.assignmentService?.getTreatment<boolean>('useLatestPrereleaseAndStableVersionFlag'))
 		) {
-			return this.queryGalleryExtensionsUsingIncludeLatestPrereleaseAndStableVersionFlag(query, criteria, token);
+			return this.queryGalleryExtensionsUsingIncludeLatestPrereleaseAndStableVersionFlag(query, criteria, extensionGalleryManifest, token);
 		}
 
-		return this.queryGalleryExtensionsWithAllVersionsAsFallback(query, criteria, token);
+		return this.queryGalleryExtensionsWithAllVersionsAsFallback(query, criteria, extensionGalleryManifest, token);
 	}
 
-	private async queryGalleryExtensionsWithAllVersionsAsFallback(query: Query, criteria: ExtensionsCriteria, token: CancellationToken): Promise<{ extensions: IGalleryExtension[]; total: number }> {
+	private async queryGalleryExtensionsWithAllVersionsAsFallback(query: Query, criteria: ExtensionsCriteria, extensionGalleryManifest: IExtensionGalleryManifest, token: CancellationToken): Promise<{ extensions: IGalleryExtension[]; total: number }> {
 		const flags = query.flags;
 
 		/**
@@ -1080,7 +1128,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		 * Add necessary extension flags
 		 */
 		query = query.withFlags(...query.flags, Flag.IncludeAssetUri, Flag.IncludeCategoryAndTags, Flag.IncludeFiles, Flag.IncludeStatistics, Flag.IncludeVersionProperties);
-		const { galleryExtensions: rawGalleryExtensions, total, context } = await this.queryRawGalleryExtensions(query, token);
+		const { galleryExtensions: rawGalleryExtensions, total, context } = await this.queryRawGalleryExtensions(query, extensionGalleryManifest, token);
 
 		const hasAllVersions: boolean = !query.flags.includes(Flag.IncludeLatestVersionOnly);
 		if (hasAllVersions) {
@@ -1101,7 +1149,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 					allTargetPlatforms
 				);
 				if (rawGalleryExtensionVersion) {
-					extensions.push(toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms, context));
+					extensions.push(toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms, extensionGalleryManifest, context));
 				}
 			}
 			return { extensions, total };
@@ -1135,7 +1183,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 				},
 				allTargetPlatforms
 			);
-			const extension = rawGalleryExtensionVersion ? toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms, context) : null;
+			const extension = rawGalleryExtensionVersion ? toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms, extensionGalleryManifest, context) : null;
 			if (!extension
 				/** Need all versions if the extension is a pre-release version but
 				 * 		- the query is to look for a release version or
@@ -1162,7 +1210,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 				.withFlags(...flags.filter(flag => flag !== Flag.IncludeLatestVersionOnly), Flag.IncludeVersions)
 				.withPage(1, needAllVersions.size)
 				.withFilter(FilterType.ExtensionId, ...needAllVersions.keys());
-			const { extensions } = await this.queryGalleryExtensions(query, criteria, token);
+			const { extensions } = await this.queryGalleryExtensions(query, criteria, extensionGalleryManifest, token);
 			this.telemetryService.publicLog2<GalleryServiceAdditionalQueryEvent, GalleryServiceAdditionalQueryClassification>('galleryService:additionalQuery', {
 				duration: stopWatch.elapsed(),
 				count: needAllVersions.size
@@ -1176,7 +1224,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		return { extensions: result.sort((a, b) => a[0] - b[0]).map(([, extension]) => extension), total };
 	}
 
-	private async queryGalleryExtensionsUsingIncludeLatestPrereleaseAndStableVersionFlag(query: Query, criteria: ExtensionsCriteria, token: CancellationToken): Promise<{ extensions: IGalleryExtension[]; total: number }> {
+	private async queryGalleryExtensionsUsingIncludeLatestPrereleaseAndStableVersionFlag(query: Query, criteria: ExtensionsCriteria, extensionGalleryManifest: IExtensionGalleryManifest, token: CancellationToken): Promise<{ extensions: IGalleryExtension[]; total: number }> {
 
 		/**
 		 * If versions criteria exist, then remove latest flags and add all versions flag.
@@ -1204,7 +1252,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		 * Add necessary extension flags
 		 */
 		query = query.withFlags(...query.flags, Flag.IncludeAssetUri, Flag.IncludeCategoryAndTags, Flag.IncludeFiles, Flag.IncludeStatistics, Flag.IncludeVersionProperties);
-		const { galleryExtensions: rawGalleryExtensions, total, context } = await this.queryRawGalleryExtensions(query, token);
+		const { galleryExtensions: rawGalleryExtensions, total, context } = await this.queryRawGalleryExtensions(query, extensionGalleryManifest, token);
 
 		const extensions: IGalleryExtension[] = [];
 		for (let index = 0; index < rawGalleryExtensions.length; index++) {
@@ -1235,7 +1283,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 				allTargetPlatforms
 			);
 			if (rawGalleryExtensionVersion) {
-				extensions.push(toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms, context));
+				extensions.push(toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms, extensionGalleryManifest, context));
 			}
 		}
 
@@ -1282,9 +1330,8 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		return rawGalleryExtension.versions[0];
 	}
 
-	private async queryRawGalleryExtensions(query: Query, token: CancellationToken): Promise<IRawGalleryExtensionsResult> {
-		const manifest = await this.getExtensionGalleryManifest();
-		const extensionsQueryApi = this.getExtensionGalleryManifestResourceUri(manifest, ExtensionGalleryResourceType.ExtensionQueryService);
+	private async queryRawGalleryExtensions(query: Query, extensionGalleryManifest: IExtensionGalleryManifest, token: CancellationToken): Promise<IRawGalleryExtensionsResult> {
+		const extensionsQueryApi = getExtensionGalleryManifestResourceUri(extensionGalleryManifest, ExtensionGalleryResourceType.ExtensionQueryService);
 
 		if (!extensionsQueryApi) {
 			throw new Error('No extension gallery query service configured.');
@@ -1295,7 +1342,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			.withFlags(...query.flags, Flag.ExcludeNonValidated)
 			.withFilter(FilterType.Target, 'Microsoft.VisualStudio.Code');
 
-		const unpublishedFlag = manifest.capabilities.extensionQuery.flags?.find(f => f.name === Flag.Unpublished);
+		const unpublishedFlag = extensionGalleryManifest.capabilities.extensionQuery.flags?.find(f => f.name === Flag.Unpublished);
 		/* Always exclude unpublished extensions */
 		if (unpublishedFlag) {
 			query = query.withFilter(FilterType.ExcludeWithFlags, String(unpublishedFlag.value));
@@ -1305,7 +1352,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			filters: [
 				{
 					criteria: query.criteria.reduce<{ filterType: number; value?: string }[]>((criteria, c) => {
-						const criterium = manifest.capabilities.extensionQuery.filtering?.find(f => f.name === c.filterType);
+						const criterium = extensionGalleryManifest.capabilities.extensionQuery.filtering?.find(f => f.name === c.filterType);
 						if (criterium) {
 							criteria.push({
 								filterType: criterium.value,
@@ -1316,13 +1363,13 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 					}, []),
 					pageNumber: query.pageNumber,
 					pageSize: query.pageSize,
-					sortBy: manifest.capabilities.extensionQuery.sorting?.find(s => s.name === query.sortBy)?.value,
+					sortBy: extensionGalleryManifest.capabilities.extensionQuery.sorting?.find(s => s.name === query.sortBy)?.value,
 					sortOrder: query.sortOrder,
 				}
 			],
 			assetTypes: query.assetTypes,
 			flags: query.flags.reduce<number>((flags, flag) => {
-				const flagValue = manifest.capabilities.extensionQuery.flags?.find(f => f.name === flag);
+				const flagValue = extensionGalleryManifest.capabilities.extensionQuery.flags?.find(f => f.name === flag);
 				if (flagValue) {
 					flags |= flagValue.value;
 				}
@@ -1483,13 +1530,13 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		let url: string;
 
 		if (isWeb) {
-			const resource = this.getExtensionGalleryManifestResourceUri(manifest, ExtensionGalleryResourceType.WebExtensionStatisticsUri);
+			const resource = getExtensionGalleryManifestResourceUri(manifest, ExtensionGalleryResourceType.WebExtensionStatisticsUri);
 			if (!resource) {
 				return;
 			}
 			url = format2(resource, { publisher, name, version, statTypeValue: type === StatisticType.Install ? '1' : '3' });
 		} else {
-			const resource = this.getExtensionGalleryManifestResourceUri(manifest, ExtensionGalleryResourceType.ExtensionStatisticsUri);
+			const resource = getExtensionGalleryManifestResourceUri(manifest, ExtensionGalleryResourceType.ExtensionStatisticsUri);
 			if (!resource) {
 				return;
 			}
@@ -1626,7 +1673,8 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			query = query.withFilter(FilterType.ExtensionName, extensionIdentifier.id);
 		}
 
-		const { galleryExtensions } = await this.queryRawGalleryExtensions(query, CancellationToken.None);
+		const extensionGalleryManifest = await this.getExtensionGalleryManifest();
+		const { galleryExtensions } = await this.queryRawGalleryExtensions(query, extensionGalleryManifest, CancellationToken.None);
 		if (!galleryExtensions.length) {
 			return [];
 		}
@@ -1807,73 +1855,60 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		return { malicious, deprecated, search, extensionsEnabledWithPreRelease };
 	}
 
-	private getExtensionGalleryManifestResourceUri(manifest: IExtensionGalleryManifest, type: ExtensionGalleryResourceType, version?: string): string | undefined {
-		for (const resource of manifest.resources) {
-			const [r, v] = resource['@type'].split('/');
-			if (r !== type) {
-				continue;
-			}
-			if (!version || v === version) {
-				return resource['@id'];
-			}
-			break;
-		}
-		return undefined;
-	}
-
 	private async getExtensionGalleryManifest(): Promise<IExtensionGalleryManifest> {
-		if (!this.productService.extensionsGallery?.serviceUrl) {
+		const extensionsGallery = this.productService.extensionsGallery as ExtensionGalleryConfig | undefined;
+		if (!extensionsGallery?.serviceUrl) {
 			throw new Error('No extension gallery service configured.');
 		}
 
 		const resources = [
 			{
-				'@id': `${this.productService.extensionsGallery.serviceUrl}/extensionquery`,
-				'@type': ExtensionGalleryResourceType.ExtensionQueryService
+				id: `${extensionsGallery.serviceUrl}/extensionquery`,
+				type: ExtensionGalleryResourceType.ExtensionQueryService
 			},
 			{
-				'@id': `${this.productService.extensionsGallery.serviceUrl}/vscode/{publisher}/{name}/latest`,
-				'@type': ExtensionGalleryResourceType.ExtensionLatestVersionUri
+				id: `${extensionsGallery.serviceUrl}/vscode/{publisher}/{name}/latest`,
+				type: ExtensionGalleryResourceType.ExtensionLatestVersionUri
 			},
 			{
-				'@id': `${this.productService.extensionsGallery.serviceUrl}/publishers/{publisher}/extensions/{name}/{version}/stats?statType={statTypeName}`,
-				'@type': ExtensionGalleryResourceType.ExtensionStatisticsUri
+				id: `${extensionsGallery.serviceUrl}/publishers/{publisher}/extensions/{name}/{version}/stats?statType={statTypeName}`,
+				type: ExtensionGalleryResourceType.ExtensionStatisticsUri
 			},
 			{
-				'@id': `${this.productService.extensionsGallery.serviceUrl}/itemName/{publisher}.{name}/version/{version}/statType/{statTypeValue}/vscodewebextension`,
-				'@type': ExtensionGalleryResourceType.WebExtensionStatisticsUri
+				id: `${extensionsGallery.serviceUrl}/itemName/{publisher}.{name}/version/{version}/statType/{statTypeValue}/vscodewebextension`,
+				type: ExtensionGalleryResourceType.WebExtensionStatisticsUri
 			},
 		];
 
-		if (this.productService.extensionsGallery?.publisherUrl) {
+		if (extensionsGallery.publisherUrl) {
 			resources.push({
-				'@id': `${this.productService.extensionsGallery.publisherUrl}/{publisher}`,
-				'@type': ExtensionGalleryResourceType.ExtensionDetailsViewUri
+				id: `${extensionsGallery.publisherUrl}/{publisher}`,
+				type: ExtensionGalleryResourceType.PublisherViewUri
 			});
 		}
 
-		if (this.productService.extensionsGallery?.itemUrl) {
+		if (extensionsGallery.itemUrl) {
 			resources.push({
-				'@id': `${this.productService.extensionsGallery.itemUrl}/?itemName={publisher}.{name}`,
-				'@type': ExtensionGalleryResourceType.ExtensionDetailsViewUri
+				id: `${extensionsGallery.itemUrl}/?itemName={publisher}.{name}`,
+				type: ExtensionGalleryResourceType.ExtensionDetailsViewUri
 			});
 			resources.push({
-				'@id': `${this.productService.extensionsGallery.itemUrl}/?itemName={publisher}.{name}&ssr=false#review-details`,
-				'@type': ExtensionGalleryResourceType.ExtensionRatingViewUri
+				id: `${extensionsGallery.itemUrl}/?itemName={publisher}.{name}&ssr=false#review-details`,
+				type: ExtensionGalleryResourceType.ExtensionRatingViewUri
 			});
 		}
 
-		if (this.productService.extensionsGallery.resourceUrlTemplate) {
+		if (extensionsGallery.resourceUrlTemplate) {
 			resources.push({
-				'@id': this.productService.extensionsGallery.resourceUrlTemplate,
-				'@type': ExtensionGalleryResourceType.ExtensionUriTemplate
+				id: extensionsGallery.resourceUrlTemplate,
+				type: ExtensionGalleryResourceType.ExtensionUriTemplate
 			});
 		}
 
-		if (this.productService.extensionsGallery?.nlsBaseUrl) {
+		if (extensionsGallery.nlsBaseUrl) {
 			resources.push({
-				'@id': this.productService.extensionsGallery.nlsBaseUrl,
-				'@type': ExtensionGalleryResourceType.WebLanguagePackService
+				id: extensionsGallery.nlsBaseUrl,
+				type: ExtensionGalleryResourceType.WebLanguagePackService
 			});
 		}
 
@@ -2016,7 +2051,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 					flags,
 				},
 				signing: {
-					allRepositoriesSigned: true,
+					allRepositorySigned: true,
 				}
 			}
 		};
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index a272af04d650..ffeed393a058 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -218,6 +218,7 @@ export interface IGalleryExtension {
 	publisher: string;
 	publisherDisplayName: string;
 	publisherDomain?: { link: string; verified: boolean };
+	publisherLink?: string;
 	publisherSponsorLink?: string;
 	description: string;
 	installCount: number;
@@ -234,9 +235,11 @@ export interface IGalleryExtension {
 	allTargetPlatforms: TargetPlatform[];
 	assets: IGalleryExtensionAssets;
 	properties: IGalleryExtensionProperties;
+	detailsLink?: string;
+	ratingLink?: string;
+	supportLink?: string;
 	telemetryData?: any;
 	queryContext?: IStringDictionary<any>;
-	supportLink?: string;
 }
 
 export type InstallSource = 'gallery' | 'vsix' | 'resource';
@@ -295,6 +298,17 @@ export const enum SortOrder {
 	Descending = 2
 }
 
+export const enum FilterType {
+	Category = 'Category',
+	ExtensionId = 'ExtensionId',
+	ExtensionName = 'ExtensionName',
+	ExcludeWithFlags = 'ExcludeWithFlags',
+	Featured = 'Featured',
+	SearchText = 'SearchText',
+	Tag = 'Tag',
+	Target = 'Target',
+}
+
 export interface IQueryOptions {
 	text?: string;
 	exclude?: string[];
@@ -361,6 +375,13 @@ export interface IExtensionQueryOptions {
 	preferResourceApi?: boolean;
 }
 
+export interface IExtensionGalleryCapabilities {
+	readonly query: {
+		readonly sortBy: readonly SortBy[];
+		readonly filters: readonly FilterType[];
+	};
+}
+
 export const IExtensionGalleryService = createDecorator<IExtensionGalleryService>('extensionGalleryService');
 
 /**
@@ -370,6 +391,7 @@ export const IExtensionGalleryService = createDecorator<IExtensionGalleryService
 export interface IExtensionGalleryService {
 	readonly _serviceBrand: undefined;
 	isEnabled(): boolean;
+	getCapabilities(): Promise<IExtensionGalleryCapabilities>;
 	query(options: IQueryOptions, token: CancellationToken): Promise<IPager<IGalleryExtension>>;
 	getExtensions(extensionInfos: ReadonlyArray<IExtensionInfo>, token: CancellationToken): Promise<IGalleryExtension[]>;
 	getExtensions(extensionInfos: ReadonlyArray<IExtensionInfo>, options: IExtensionQueryOptions, token: CancellationToken): Promise<IGalleryExtension[]>;
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
index 8542167a79b3..300936902dc3 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -589,10 +589,13 @@ export class ExtensionEditor extends EditorPane {
 
 		if (extension.url) {
 			this.transientDisposables.add(onClick(template.name, () => this.openerService.open(URI.parse(extension.url!))));
-			this.transientDisposables.add(onClick(template.rating, () => this.openerService.open(URI.parse(`${extension.url}&ssr=false#review-details`))));
 			this.transientDisposables.add(onClick(template.publisher, () => this.extensionsWorkbenchService.openSearch(`publisher:"${extension.publisherDisplayName}"`)));
 		}
 
+		if (extension.ratingUrl) {
+			this.transientDisposables.add(onClick(template.rating, () => this.openerService.open(URI.parse(extension.ratingUrl!))));
+		}
+
 		const manifest = await this.extensionManifest.get().promise;
 		if (token.isCancellationRequested) {
 			return;
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index f66033a1ca1a..3bc489fb79c7 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -8,7 +8,7 @@ import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { MenuRegistry, MenuId, registerAction2, Action2, IMenuItem, IAction2Options } from '../../../../platform/actions/common/actions.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
-import { ExtensionsLocalizedLabel, IExtensionManagementService, IExtensionGalleryService, PreferencesLocalizedLabel, EXTENSION_INSTALL_SOURCE_CONTEXT, ExtensionInstallSource, UseUnpkgResourceApiConfigKey, AllowedExtensionsConfigKey } from '../../../../platform/extensionManagement/common/extensionManagement.js';
+import { ExtensionsLocalizedLabel, IExtensionManagementService, IExtensionGalleryService, PreferencesLocalizedLabel, EXTENSION_INSTALL_SOURCE_CONTEXT, ExtensionInstallSource, UseUnpkgResourceApiConfigKey, AllowedExtensionsConfigKey, SortBy, FilterType } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { EnablementState, IExtensionManagementServerService, IPublisherInfo, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from '../../../common/contributions.js';
@@ -546,6 +546,8 @@ overrideActionForActiveExtensionEditorWebview(PasteAction, webview => webview.pa
 export const CONTEXT_HAS_LOCAL_SERVER = new RawContextKey<boolean>('hasLocalServer', false);
 export const CONTEXT_HAS_REMOTE_SERVER = new RawContextKey<boolean>('hasRemoteServer', false);
 export const CONTEXT_HAS_WEB_SERVER = new RawContextKey<boolean>('hasWebServer', false);
+const CONTEXT_GALLERY_SORT_CAPABILITIES = new RawContextKey<string>('gallerySortCapabilities', '');
+const CONTEXT_GALLERY_FILTER_CAPABILITIES = new RawContextKey<string>('galleryFilterCapabilities', '');
 
 async function runAction(action: IAction): Promise<void> {
 	try {
@@ -566,8 +568,8 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 
 	constructor(
 		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
-		@IExtensionGalleryService extensionGalleryService: IExtensionGalleryService,
-		@IContextKeyService contextKeyService: IContextKeyService,
+		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IViewsService private readonly viewsService: IViewsService,
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
@@ -597,11 +599,18 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			hasWebServerContext.set(true);
 		}
 
+		this.registerGalleryCapabilitiesContexts();
 		this.registerGlobalActions();
 		this.registerContextMenuActions();
 		this.registerQuickAccessProvider();
 	}
 
+	private async registerGalleryCapabilitiesContexts(): Promise<void> {
+		const capabilities = await this.extensionGalleryService.getCapabilities();
+		CONTEXT_GALLERY_SORT_CAPABILITIES.bindTo(this.contextKeyService).set(`_${capabilities.query.sortBy.join('_')}_UpdateDate_`);
+		CONTEXT_GALLERY_FILTER_CAPABILITIES.bindTo(this.contextKeyService).set(`_${capabilities.query.filters.join('_')}_`);
+	}
+
 	private registerQuickAccessProvider(): void {
 		if (this.extensionManagementServerService.localExtensionManagementServer
 			|| this.extensionManagementServerService.remoteExtensionManagementServer
@@ -994,16 +1003,17 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 		});
 
 		const showFeaturedExtensionsId = 'extensions.filter.featured';
+		const featuresExtensionsWhenContext = ContextKeyExpr.and(CONTEXT_HAS_GALLERY, ContextKeyExpr.regex(CONTEXT_GALLERY_FILTER_CAPABILITIES.key, new RegExp(`_${FilterType.Featured}_`)));
 		this.registerExtensionAction({
 			id: showFeaturedExtensionsId,
 			title: localize2('showFeaturedExtensions', 'Show Featured Extensions'),
 			category: ExtensionsLocalizedLabel,
 			menu: [{
 				id: MenuId.CommandPalette,
-				when: CONTEXT_HAS_GALLERY
+				when: featuresExtensionsWhenContext
 			}, {
 				id: extensionsFilterSubMenu,
-				when: CONTEXT_HAS_GALLERY,
+				when: featuresExtensionsWhenContext,
 				group: '1_predefined',
 				order: 1,
 			}],
@@ -1074,7 +1084,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 		MenuRegistry.appendMenuItem(extensionsFilterSubMenu, {
 			submenu: extensionsCategoryFilterSubMenu,
 			title: localize('filter by category', "Category"),
-			when: CONTEXT_HAS_GALLERY,
+			when: ContextKeyExpr.and(CONTEXT_HAS_GALLERY, ContextKeyExpr.regex(CONTEXT_GALLERY_FILTER_CAPABILITIES.key, new RegExp(`_${FilterType.Category}_`))),
 			group: '2_categories',
 			order: 1,
 		});
@@ -1193,19 +1203,20 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 		});
 
 		[
-			{ id: 'installs', title: localize('sort by installs', "Install Count"), precondition: BuiltInExtensionsContext.negate() },
-			{ id: 'rating', title: localize('sort by rating', "Rating"), precondition: BuiltInExtensionsContext.negate() },
-			{ id: 'name', title: localize('sort by name', "Name"), precondition: BuiltInExtensionsContext.negate() },
-			{ id: 'publishedDate', title: localize('sort by published date', "Published Date"), precondition: BuiltInExtensionsContext.negate() },
-			{ id: 'updateDate', title: localize('sort by update date', "Updated Date"), precondition: ContextKeyExpr.and(SearchMarketplaceExtensionsContext.negate(), RecommendedExtensionsContext.negate(), BuiltInExtensionsContext.negate()) },
-		].map(({ id, title, precondition }, index) => {
+			{ id: 'installs', title: localize('sort by installs', "Install Count"), precondition: BuiltInExtensionsContext.negate(), sortCapability: SortBy.InstallCount },
+			{ id: 'rating', title: localize('sort by rating', "Rating"), precondition: BuiltInExtensionsContext.negate(), sortCapability: SortBy.WeightedRating },
+			{ id: 'name', title: localize('sort by name', "Name"), precondition: BuiltInExtensionsContext.negate(), sortCapability: SortBy.Title },
+			{ id: 'publishedDate', title: localize('sort by published date', "Published Date"), precondition: BuiltInExtensionsContext.negate(), sortCapability: SortBy.PublishedDate },
+			{ id: 'updateDate', title: localize('sort by update date', "Updated Date"), precondition: ContextKeyExpr.and(SearchMarketplaceExtensionsContext.negate(), RecommendedExtensionsContext.negate(), BuiltInExtensionsContext.negate()), sortCapability: 'UpdateDate' },
+		].map(({ id, title, precondition, sortCapability }, index) => {
+			const sortCapabilityContext = ContextKeyExpr.regex(CONTEXT_GALLERY_SORT_CAPABILITIES.key, new RegExp(`_${sortCapability}_`));
 			this.registerExtensionAction({
 				id: `extensions.sort.${id}`,
 				title,
-				precondition: ContextKeyExpr.and(precondition, ContextKeyExpr.regex(ExtensionsSearchValueContext.key, /^@feature:/).negate()),
+				precondition: ContextKeyExpr.and(precondition, ContextKeyExpr.regex(ExtensionsSearchValueContext.key, /^@feature:/).negate(), sortCapabilityContext),
 				menu: [{
 					id: extensionsSortSubMenu,
-					when: ContextKeyExpr.or(CONTEXT_HAS_GALLERY, DefaultViewsContext),
+					when: ContextKeyExpr.and(ContextKeyExpr.or(CONTEXT_HAS_GALLERY, DefaultViewsContext), sortCapabilityContext),
 					order: index,
 				}],
 				toggled: ExtensionsSortByContext.isEqualTo(id),
@@ -1645,12 +1656,10 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 				group: '1_copy',
 				when: ContextKeyExpr.has('isGalleryExtension'),
 			},
-			run: async (accessor: ServicesAccessor, extensionId: string) => {
+			run: async (accessor: ServicesAccessor, _, extension: IExtensionArg) => {
 				const clipboardService = accessor.get(IClipboardService);
-				const productService = accessor.get(IProductService);
-				if (productService.extensionsGallery?.itemUrl) {
-					const link = `${productService.extensionsGallery.itemUrl}?itemName=${extensionId}`;
-					await clipboardService.writeText(link);
+				if (extension.galleryLink) {
+					await clipboardService.writeText(extension.galleryLink);
 				}
 			}
 		});
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
index 3cd6405610ef..7c58defdf354 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
@@ -212,9 +212,6 @@ export class PromptExtensionInstallFailureAction extends Action {
 		if (!this.extension.gallery) {
 			return undefined;
 		}
-		if (!this.productService.extensionsGallery) {
-			return undefined;
-		}
 		if (!this.extensionManagementServerService.localExtensionManagementServer && !this.extensionManagementServerService.remoteExtensionManagementServer) {
 			return undefined;
 		}
@@ -233,7 +230,18 @@ export class PromptExtensionInstallFailureAction extends Action {
 		if (targetPlatform === TargetPlatform.UNKNOWN) {
 			return undefined;
 		}
-		return URI.parse(`${this.productService.extensionsGallery.serviceUrl}/publishers/${this.extension.publisher}/vsextensions/${this.extension.name}/${this.version}/vspackage${targetPlatform !== TargetPlatform.UNDEFINED ? `?targetPlatform=${targetPlatform}` : ''}`);
+
+		const [extension] = await this.galleryService.getExtensions([{
+			...this.extension.identifier,
+			version: this.version
+		}], {
+			targetPlatform
+		}, CancellationToken.None);
+
+		if (!extension) {
+			return undefined;
+		}
+		return URI.parse(extension.assets.download.uri);
 	}
 
 }
@@ -1438,7 +1446,8 @@ export class MenuItemExtensionAction extends ExtensionAction {
 			const extensionArg: IExtensionArg = {
 				id: this.extension.identifier.id,
 				version: this.extension.version,
-				location: this.extension.local?.location
+				location: this.extension.local?.location,
+				galleryLink: this.extension.url
 			};
 			await this.action.run(id, extensionArg);
 		}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index c81a7b99e5e8..77f686949c45 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -196,11 +196,7 @@ export class Extension implements IExtension {
 	}
 
 	get publisherUrl(): URI | undefined {
-		if (!this.productService.extensionsGallery || !this.gallery) {
-			return undefined;
-		}
-
-		return resources.joinPath(URI.parse(this.productService.extensionsGallery.publisherUrl), this.publisher);
+		return this.gallery?.publisherLink ? URI.parse(this.gallery.publisherLink) : undefined;
 	}
 
 	get publisherDomain(): { link: string; verified: boolean } | undefined {
@@ -228,11 +224,7 @@ export class Extension implements IExtension {
 	}
 
 	get url(): string | undefined {
-		if (!this.productService.extensionsGallery || !this.gallery) {
-			return undefined;
-		}
-
-		return `${this.productService.extensionsGallery.itemUrl}?itemName=${this.publisher}.${this.name}`;
+		return this.gallery?.detailsLink;
 	}
 
 	get iconUrl(): string {
@@ -314,6 +306,10 @@ export class Extension implements IExtension {
 		return this.gallery ? this.gallery.ratingCount : undefined;
 	}
 
+	get ratingUrl(): string | undefined {
+		return this.gallery?.ratingLink;
+	}
+
 	get outdated(): boolean {
 		try {
 			if (!this.gallery || !this.local) {
diff --git a/src/vs/workbench/contrib/extensions/common/extensions.ts b/src/vs/workbench/contrib/extensions/common/extensions.ts
index 97e8d4b6d153..ad36a535de66 100644
--- a/src/vs/workbench/contrib/extensions/common/extensions.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensions.ts
@@ -83,6 +83,7 @@ export interface IExtension {
 	readonly installCount?: number;
 	readonly rating?: number;
 	readonly ratingCount?: number;
+	readonly ratingUrl?: string;
 	readonly outdated: boolean;
 	readonly outdatedTargetPlatform: boolean;
 	readonly runtimeState: ExtensionRuntimeState | undefined;
@@ -263,4 +264,5 @@ export interface IExtensionArg {
 	id: string;
 	version: string;
 	location: URI | undefined;
+	galleryLink: string | undefined;
 }
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
index 75d90366ab1f..2cb589f849f8 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
@@ -46,7 +46,6 @@ import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uri
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
 import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
-import { joinPath } from '../../../../base/common/resources.js';
 import { verifiedPublisherIcon } from './extensionsIcons.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { IStringDictionary } from '../../../../base/common/collections.js';
@@ -869,9 +868,6 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 			}
 		};
 
-		const getPublisherLink = ({ publisherDisplayName, publisher }: { publisherDisplayName: string; publisher: string }) => {
-			return `[${publisherDisplayName}](${joinPath(URI.parse(this.productService.extensionsGallery!.publisherUrl), publisher)})`;
-		};
 		const unverifiedLink = 'https://aka.ms/vscode-verify-publisher';
 
 		const title = allPublishers.length === 1
@@ -886,35 +882,35 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 			const extension = untrustedExtensions[0];
 			const manifest = untrustedExtensionManifests[0];
 			if (otherUntrustedPublishers.length) {
-				customMessage.appendMarkdown(localize('extension published by message', "The extension {0} is published by {1}.", `[${extension.displayName}](${this.productService.extensionsGallery!.itemUrl}?itemName=${extension.identifier.id})`, getPublisherLink(extension)));
+				customMessage.appendMarkdown(localize('extension published by message', "The extension {0} is published by {1}.", `[${extension.displayName}](${extension.detailsLink})`, extension.publisherLink));
 				customMessage.appendMarkdown('&nbsp;');
 				const commandUri = URI.parse(`command:extension.open?${encodeURIComponent(JSON.stringify([extension.identifier.id, manifest.extensionPack?.length ? 'extensionPack' : 'dependencies']))}`).toString();
 				if (otherUntrustedPublishers.length === 1) {
-					customMessage.appendMarkdown(localize('singleUntrustedPublisher', "Installing this extension will also install [extensions]({0}) published by {1}.", commandUri, getPublisherLink(otherUntrustedPublishers[0])));
+					customMessage.appendMarkdown(localize('singleUntrustedPublisher', "Installing this extension will also install [extensions]({0}) published by {1}.", commandUri, otherUntrustedPublishers[0].publisherLink));
 				} else {
-					customMessage.appendMarkdown(localize('message3', "Installing this extension will also install [extensions]({0}) published by {1} and {2}.", commandUri, otherUntrustedPublishers.slice(0, otherUntrustedPublishers.length - 1).map(p => getPublisherLink(p)).join(', '), getPublisherLink(otherUntrustedPublishers[otherUntrustedPublishers.length - 1])));
+					customMessage.appendMarkdown(localize('message3', "Installing this extension will also install [extensions]({0}) published by {1} and {2}.", commandUri, otherUntrustedPublishers.slice(0, otherUntrustedPublishers.length - 1).map(p => p.publisherLink).join(', '), otherUntrustedPublishers[otherUntrustedPublishers.length - 1].publisherLink));
 				}
 				customMessage.appendMarkdown('&nbsp;');
 				customMessage.appendMarkdown(localize('firstTimeInstallingMessage', "This is the first time you're installing extensions from these publishers."));
 			} else {
-				customMessage.appendMarkdown(localize('message1', "The extension {0} is published by {1}. This is the first extension you're installing from this publisher.", `[${extension.displayName}](${this.productService.extensionsGallery!.itemUrl}?itemName=${extension.identifier.id})`, getPublisherLink(extension)));
+				customMessage.appendMarkdown(localize('message1', "The extension {0} is published by {1}. This is the first extension you're installing from this publisher.", `[${extension.displayName}](${extension.detailsLink})`, extension.publisherLink));
 			}
 		} else {
-			customMessage.appendMarkdown(localize('multiInstallMessage', "This is the first time you're installing extensions from publishers {0} and {1}.", allPublishers.slice(0, allPublishers.length - 1).map(p => getPublisherLink(p)).join(', '), getPublisherLink(allPublishers[allPublishers.length - 1])));
+			customMessage.appendMarkdown(localize('multiInstallMessage', "This is the first time you're installing extensions from publishers {0} and {1}.", allPublishers.slice(0, allPublishers.length - 1).map(p => p.publisherLink).join(', '), allPublishers[allPublishers.length - 1].publisherLink));
 		}
 
 		if (verifiedPublishers.length || unverfiiedPublishers.length === 1) {
 			for (const publisher of verifiedPublishers) {
 				customMessage.appendText('\n');
-				const publisherVerifiedMessage = localize('verifiedPublisherWithName', "{0} has verified ownership of {1}.", getPublisherLink(publisher), `[$(link-external) ${URI.parse(publisher.publisherDomain!.link).authority}](${publisher.publisherDomain!.link})`);
+				const publisherVerifiedMessage = localize('verifiedPublisherWithName', "{0} has verified ownership of {1}.", publisher.publisherLink, `[$(link-external) ${URI.parse(publisher.publisherDomain!.link).authority}](${publisher.publisherDomain!.link})`);
 				customMessage.appendMarkdown(`$(${verifiedPublisherIcon.id})&nbsp;${publisherVerifiedMessage}`);
 			}
 			if (unverfiiedPublishers.length) {
 				customMessage.appendText('\n');
 				if (unverfiiedPublishers.length === 1) {
-					customMessage.appendMarkdown(`$(${Codicon.unverified.id})&nbsp;${localize('unverifiedPublisherWithName', "{0} is [**not** verified]({1}).", getPublisherLink(unverfiiedPublishers[0]), unverifiedLink)}`);
+					customMessage.appendMarkdown(`$(${Codicon.unverified.id})&nbsp;${localize('unverifiedPublisherWithName', "{0} is [**not** verified]({1}).", unverfiiedPublishers[0].publisherLink, unverifiedLink)}`);
 				} else {
-					customMessage.appendMarkdown(`$(${Codicon.unverified.id})&nbsp;${localize('unverifiedPublishers', "{0} and {1} are [**not** verified]({2}).", unverfiiedPublishers.slice(0, unverfiiedPublishers.length - 1).map(p => getPublisherLink(p)).join(', '), getPublisherLink(unverfiiedPublishers[unverfiiedPublishers.length - 1]), unverifiedLink)}`);
+					customMessage.appendMarkdown(`$(${Codicon.unverified.id})&nbsp;${localize('unverifiedPublishers', "{0} and {1} are [**not** verified]({2}).", unverfiiedPublishers.slice(0, unverfiiedPublishers.length - 1).map(p => p.publisherLink).join(', '), unverfiiedPublishers[unverfiiedPublishers.length - 1].publisherLink, unverifiedLink)}`);
 				}
 			}
 		} else {
@@ -946,7 +942,7 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 
 	}
 
-	private async getOtherUntrustedPublishers(manifests: IExtensionManifest[]): Promise<{ publisher: string; publisherDisplayName: string; publisherDomain?: { link: string; verified: boolean } }[]> {
+	private async getOtherUntrustedPublishers(manifests: IExtensionManifest[]): Promise<{ publisher: string; publisherDisplayName: string; publisherLink?: string; publisherDomain?: { link: string; verified: boolean } }[]> {
 		const extensionIds = new Set<string>();
 		for (const manifest of manifests) {
 			for (const id of [...(manifest.extensionPack ?? []), ...(manifest.extensionDependencies ?? [])]) {

From 0a721d35a20b5736445948aba1c1e21a617d95b5 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 11 Mar 2025 17:01:42 -0700
Subject: [PATCH 0807/1815] update layer check

---
 build/lib/layersChecker.js | 3 ++-
 build/lib/layersChecker.ts | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/lib/layersChecker.js b/build/lib/layersChecker.js
index 5cf5c58402c7..8e46cb715417 100644
--- a/build/lib/layersChecker.js
+++ b/build/lib/layersChecker.js
@@ -81,7 +81,8 @@ const CORE_TYPES = [
     'ImportMeta',
     // webcrypto has been available since Node.js 19, but still live in dom.d.ts
     'Crypto',
-    'SubtleCrypto'
+    'SubtleCrypto',
+    'JsonWebKey',
 ];
 // Types that are defined in a common layer but are known to be only
 // available in native environments should not be allowed in browser
diff --git a/build/lib/layersChecker.ts b/build/lib/layersChecker.ts
index 633773289282..235d2d68dbed 100644
--- a/build/lib/layersChecker.ts
+++ b/build/lib/layersChecker.ts
@@ -80,7 +80,8 @@ const CORE_TYPES = [
 
 	// webcrypto has been available since Node.js 19, but still live in dom.d.ts
 	'Crypto',
-	'SubtleCrypto'
+	'SubtleCrypto',
+	'JsonWebKey',
 ];
 
 // Types that are defined in a common layer but are known to be only

From 589bd5dfe93c0cbaf84830931209f22334c59c15 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 11 Mar 2025 18:22:35 -0700
Subject: [PATCH 0808/1815] mcp: work on --add-mcp CLI (#243282)

* mcp: work on --add-mcp CLI

* throw an error, get it mergable
---
 src/vs/code/node/cli.ts                       |  1 +
 src/vs/code/node/cliProcessMain.ts            |  6 ++
 src/vs/platform/environment/common/argv.ts    |  2 +
 src/vs/platform/environment/node/argv.ts      | 10 +-
 .../platform/mcp/common/mcpManagementCli.ts   | 95 +++++++++++++++++++
 .../platform/mcp/common/mcpPlatformTypes.ts   | 15 +++
 .../common/discovery/configMcpDiscovery.ts    |  4 +-
 .../contrib/mcp/common/mcpConfiguration.ts    | 12 +--
 8 files changed, 130 insertions(+), 15 deletions(-)
 create mode 100644 src/vs/platform/mcp/common/mcpManagementCli.ts
 create mode 100644 src/vs/platform/mcp/common/mcpPlatformTypes.ts

diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
index e91bea07d6a8..312df0c1f929 100644
--- a/src/vs/code/node/cli.ts
+++ b/src/vs/code/node/cli.ts
@@ -36,6 +36,7 @@ function shouldSpawnCliProcess(argv: NativeParsedArgs): boolean {
 		|| !!argv['uninstall-extension']
 		|| !!argv['update-extensions']
 		|| !!argv['locate-extension']
+		|| !!argv['add-mcp']
 		|| !!argv['telemetry'];
 }
 
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index aff3b2da5794..35ffa128d904 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -65,6 +65,7 @@ import { localize } from '../../nls.js';
 import { FileUserDataProvider } from '../../platform/userData/common/fileUserDataProvider.js';
 import { addUNCHostToAllowlist, getUNCHost } from '../../base/node/unc.js';
 import { AllowedExtensionsService } from '../../platform/extensionManagement/common/allowedExtensionsService.js';
+import { McpManagementCli } from '../../platform/mcp/common/mcpManagementCli.js';
 
 class CliMain extends Disposable {
 
@@ -304,6 +305,11 @@ class CliMain extends Disposable {
 			return instantiationService.createInstance(ExtensionManagementCLI, new ConsoleLogger(LogLevel.Info, false)).locateExtension(this.argv['locate-extension']);
 		}
 
+		// Install MCP server
+		else if (this.argv['add-mcp']) {
+			return instantiationService.createInstance(McpManagementCli, new ConsoleLogger(LogLevel.Info, false)).addMcpDefinitions(this.argv['add-mcp-to-workspace'], this.argv['add-mcp']);
+		}
+
 		// Telemetry
 		else if (this.argv['telemetry']) {
 			console.log(await buildTelemetryMessage(environmentService.appRoot, environmentService.extensionsPath));
diff --git a/src/vs/platform/environment/common/argv.ts b/src/vs/platform/environment/common/argv.ts
index cdcb8ee0a053..a4f7464f934f 100644
--- a/src/vs/platform/environment/common/argv.ts
+++ b/src/vs/platform/environment/common/argv.ts
@@ -93,6 +93,8 @@ export interface NativeParsedArgs {
 	'disable-telemetry'?: boolean;
 	'export-default-configuration'?: string;
 	'install-source'?: string;
+	'add-mcp'?: string[];
+	'add-mcp-to-workspace'?: string;
 	'disable-updates'?: boolean;
 	'use-inmemory-secretstorage'?: boolean;
 	'password-store'?: string;
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
index b4e76a58f3f4..2a69ae919cf7 100644
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -104,6 +104,9 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'update-extensions': { type: 'boolean', cat: 'e', description: localize('updateExtensions', "Update the installed extensions.") },
 	'enable-proposed-api': { type: 'string[]', allowEmptyValue: true, cat: 'e', args: 'ext-id', description: localize('experimentalApis', "Enables proposed API features for extensions. Can receive one or more extension IDs to enable individually.") },
 
+	'add-mcp': { type: 'string[]', cat: 'o', args: 'json', description: localize('addMcp', "Adds a Model Context Protocol server definition to the user profile, or workspace or folder when used with --mcp-workspace. Accepts JSON input in the form '{\"name\":\"server-name\",\"command\":...}'") },
+	'add-mcp-to-workspace': { type: 'string', cat: 'o', args: 'path', description: localize('addMcpWorkspace', "Folder or workspace in which to add Model Context Protocol servers, when used with '--add-mcp'") },
+
 	'version': { type: 'boolean', cat: 't', alias: 'v', description: localize('version', "Print version.") },
 	'verbose': { type: 'boolean', cat: 't', global: true, description: localize('verbose', "Print verbose output (implies --wait).") },
 	'log': { type: 'string[]', cat: 't', args: 'level', global: true, description: localize('log', "Log level to use. Default is 'info'. Allowed values are 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'. You can also configure the log level of an extension by passing extension id and log level in the following format: '${publisher}.${name}:${logLevel}'. For example: 'vscode.csharp:trace'. Can receive one or more such entries.") },
@@ -410,9 +413,12 @@ function indent(count: number): string {
 function wrapText(text: string, columns: number): string[] {
 	const lines: string[] = [];
 	while (text.length) {
-		const index = text.length < columns ? text.length : text.lastIndexOf(' ', columns);
+		let index = text.length < columns ? text.length : text.lastIndexOf(' ', columns);
+		if (index === 0) {
+			index = columns;
+		}
 		const line = text.slice(0, index).trim();
-		text = text.slice(index);
+		text = text.slice(index).trimStart();
 		lines.push(line);
 	}
 	return lines;
diff --git a/src/vs/platform/mcp/common/mcpManagementCli.ts b/src/vs/platform/mcp/common/mcpManagementCli.ts
new file mode 100644
index 000000000000..54ab50ee1210
--- /dev/null
+++ b/src/vs/platform/mcp/common/mcpManagementCli.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 { URI } from '../../../base/common/uri.js';
+import { IConfigurationService } from '../../configuration/common/configuration.js';
+import { ConfigurationService } from '../../configuration/common/configurationService.js';
+import { IFileService } from '../../files/common/files.js';
+import { ILogger, ILogService } from '../../log/common/log.js';
+import { IPolicyService } from '../../policy/common/policy.js';
+import { hasWorkspaceFileExtension } from '../../workspace/common/workspace.js';
+import { IMcpConfiguration, IMcpConfigurationServer } from './mcpPlatformTypes.js';
+
+type ValidatedConfig = { name: string; config: IMcpConfigurationServer };
+
+export class McpManagementCli {
+	constructor(
+		private readonly _logger: ILogger,
+		@IConfigurationService private readonly _userConfigurationService: IConfigurationService,
+		@IFileService private readonly _fileService: IFileService,
+		@IPolicyService private readonly _policyService: IPolicyService,
+		@ILogService private readonly _logService: ILogService,
+	) { }
+
+	async addMcpDefinitions(
+		workspace: string | undefined,
+		definitions: string[],
+	) {
+		const configs = definitions.map((config) => this.validateConfiguration(config));
+
+		if (workspace) {
+			// todo (see below comments)
+			throw new InvalidMcpOperationError(`Installing into workspaces is not yet supported`);
+		}
+
+		if (!workspace) {
+			await this.updateMcpInConfig(this._userConfigurationService, configs);
+		} else if (hasWorkspaceFileExtension(workspace)) {
+			// This is not right because settings are nested in .code-workspace...
+			const workspaceConfigService = new ConfigurationService(URI.file(workspace), this._fileService, this._policyService, this._logService);
+			await this.updateMcpInConfig(workspaceConfigService, configs);
+			workspaceConfigService.dispose();
+		} else {
+			// todo: this seems incorrect. IConfigurationService.getValue() fails if
+			// if we point it to mcp.json and call `sevice.getValue()` with no args
+			// but if we point to launch.json, it writes it there instead of the
+			// standalone config file. This technically works but is undesirable.
+			const workspaceFile = URI.joinPath(URI.file(workspace), '.vscode', 'settings.json');
+			const workspaceFolderConfigService = new ConfigurationService(workspaceFile, this._fileService, this._policyService, this._logService);
+			await this.updateMcpInConfig(workspaceFolderConfigService, configs);
+			workspaceFolderConfigService.dispose();
+		}
+
+		this._logger.info(`Added MCP servers: ${configs.map(c => c.name).join(', ')}`);
+	}
+
+	private async updateMcpInConfig(service: IConfigurationService, configs: ValidatedConfig[]) {
+		const mcp = service.getValue<IMcpConfiguration>('mcp') || { servers: {} };
+		mcp.servers ??= {};
+
+		for (const config of configs) {
+			mcp.servers[config.name] = config.config;
+		}
+
+		await service.updateValue('mcp', mcp);
+	}
+
+	private validateConfiguration(config: string): ValidatedConfig {
+		let parsed: IMcpConfigurationServer & { name: string };
+		try {
+			parsed = JSON.parse(config);
+		} catch (e) {
+			throw new InvalidMcpOperationError(`Invalid JSON '${config}': ${e}`);
+		}
+
+		if (!parsed.name) {
+			throw new InvalidMcpOperationError(`Missing name property in ${config}`);
+		}
+
+		if (!parsed.command) {
+			throw new InvalidMcpOperationError(`Missing command property in ${config}`);
+		}
+
+		const { name, ...rest } = parsed;
+		return { name, config: rest };
+	}
+}
+
+class InvalidMcpOperationError extends Error {
+	constructor(message: string) {
+		super(message);
+		this.stack = message;
+	}
+}
diff --git a/src/vs/platform/mcp/common/mcpPlatformTypes.ts b/src/vs/platform/mcp/common/mcpPlatformTypes.ts
new file mode 100644
index 000000000000..877e199ae066
--- /dev/null
+++ b/src/vs/platform/mcp/common/mcpPlatformTypes.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.
+ *--------------------------------------------------------------------------------------------*/
+
+export interface IMcpConfiguration {
+	inputs: unknown[];
+	servers: Record<string, IMcpConfigurationServer>;
+}
+
+export interface IMcpConfigurationServer {
+	command: string;
+	args?: readonly string[];
+	env?: Record<string, string | number | null>;
+}
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts b/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
index aea862d7fb19..69c5df923711 100644
--- a/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
+++ b/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
@@ -97,9 +97,9 @@ export class ConfigMcpDiscovery extends Disposable implements IMcpDiscovery {
 				label: name,
 				launch: {
 					type: McpServerTransportType.Stdio,
-					args: value.args,
+					args: value.args || [],
 					command: value.command,
-					env: value.env,
+					env: value.env || {},
 					cwd: undefined,
 				},
 				variableReplacement: {
diff --git a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
index 78fb48d097c3..b17da0d33130 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
@@ -8,6 +8,7 @@ import { localize } from '../../../../nls.js';
 import { mcpSchemaId } from '../../../services/configuration/common/configuration.js';
 import { inputsSchema } from '../../../services/configurationResolver/common/configurationResolverSchema.js';
 
+export type { IMcpConfigurationServer, IMcpConfiguration } from '../../../../platform/mcp/common/mcpPlatformTypes.js';
 
 const mcpSchemaExampleServer = {
 	command: 'node',
@@ -17,17 +18,6 @@ const mcpSchemaExampleServer = {
 
 export const mcpConfigurationSection = 'mcp';
 
-export interface IMcpConfiguration {
-	inputs: unknown[];
-	servers: Record<string, IMcpConfigurationServer>;
-}
-
-export interface IMcpConfigurationServer {
-	command: string;
-	args: readonly string[];
-	env: Record<string, string | number | null>;
-}
-
 export const mcpSchemaExampleServers = {
 	'mcp-server-time': {
 		command: 'python',

From ead2561297f2a220d2d87567b94fddda87178f12 Mon Sep 17 00:00:00 2001
From: Bhavya U <bhavyau@microsoft.com>
Date: Tue, 11 Mar 2025 19:37:38 -0700
Subject: [PATCH 0809/1815] Implement workspace trust checks for empty folders
 transferred from chat (#243288)

---
 .../browser/workspace.contribution.ts         |  8 +++++
 .../workspaces/common/workspaceTrust.ts       | 10 +++++++
 .../workspaces/common/workspaceUtils.ts       | 30 +++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 src/vs/workbench/services/workspaces/common/workspaceUtils.ts

diff --git a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
index c512b648529b..c973f5f191f4 100644
--- a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
+++ b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
@@ -50,6 +50,7 @@ import { basename, dirname as uriDirname } from '../../../../base/common/resourc
 import { URI } from '../../../../base/common/uri.js';
 import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
+import { areWorkspaceFoldersEmpty, isChatTransferredWorkspace } from '../../../services/workspaces/common/workspaceUtils.js';
 
 const BANNER_RESTRICTED_MODE = 'workbench.banner.restrictedMode';
 const STARTUP_PROMPT_SHOWN_KEY = 'workspace.trust.startupPrompt.shown';
@@ -440,6 +441,13 @@ export class WorkspaceTrustUXHandler extends Disposable implements IWorkbenchCon
 			return;
 		}
 
+		// Don't show modal prompt for empty folders transferred from chat
+		const workspace = this.workspaceContextService.getWorkspace();
+		if (isChatTransferredWorkspace(workspace, this.storageService) && await areWorkspaceFoldersEmpty(workspace, this.fileService)) {
+			this.updateWorkbenchIndicators(false);
+			return;
+		}
+
 		if (this.startupPromptSetting === 'never') {
 			this.updateWorkbenchIndicators(false);
 			return;
diff --git a/src/vs/workbench/services/workspaces/common/workspaceTrust.ts b/src/vs/workbench/services/workspaces/common/workspaceTrust.ts
index e11ae3c24e21..90e1141c1921 100644
--- a/src/vs/workbench/services/workspaces/common/workspaceTrust.ts
+++ b/src/vs/workbench/services/workspaces/common/workspaceTrust.ts
@@ -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 { areWorkspaceFoldersEmpty, isChatTransferredWorkspace } from './workspaceUtils.js';
 
 export const WORKSPACE_TRUST_ENABLED = 'security.workspace.trust.enabled';
 export const WORKSPACE_TRUST_STARTUP_PROMPT = 'security.workspace.trust.startupPrompt';
@@ -333,6 +334,15 @@ export class WorkspaceTrustManagementService extends Disposable implements IWork
 		if (trusted === undefined) {
 			await this.resolveCanonicalUris();
 			trusted = this.calculateWorkspaceTrust();
+
+			const workspace = this.workspaceService.getWorkspace();
+			if (!trusted &&
+				isChatTransferredWorkspace(workspace, this.storageService) &&
+				await areWorkspaceFoldersEmpty(workspace, this.fileService)) {
+
+				// Trust empty folders transferred from chat
+				trusted = true;
+			}
 		}
 
 		if (this.isWorkspaceTrusted() === trusted) { return; }
diff --git a/src/vs/workbench/services/workspaces/common/workspaceUtils.ts b/src/vs/workbench/services/workspaces/common/workspaceUtils.ts
new file mode 100644
index 000000000000..4ba2f5af24a7
--- /dev/null
+++ b/src/vs/workbench/services/workspaces/common/workspaceUtils.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 { URI } from '../../../../base/common/uri.js';
+import { IWorkspace } from '../../../../platform/workspace/common/workspace.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
+
+export function isChatTransferredWorkspace(workspace: IWorkspace, storageService: IStorageService): boolean {
+	const workspaceUri = workspace.folders[0]?.uri;
+	if (!workspaceUri) {
+		return false;
+	}
+	const chatWorkspaceTransfer = storageService.getObject('chat.workspaceTransfer', StorageScope.PROFILE, []);
+	const toWorkspace: { toWorkspace: URI }[] = chatWorkspaceTransfer.map((item: any) => {
+		return { toWorkspace: URI.from(item.toWorkspace) };
+	});
+	return toWorkspace.some(item => item.toWorkspace.toString() === workspaceUri.toString());
+}
+
+export async function areWorkspaceFoldersEmpty(workspace: IWorkspace, fileService: IFileService): Promise<boolean> {
+	for (const folder of workspace.folders) {
+		const folderStat = await fileService.resolve(folder.uri);
+		if (folderStat.children && folderStat.children.length > 0) {
+			return false;
+		}
+	}
+	return true;
+}

From fc7f88a0a73dac40ba16af282b40fddfb0d01f75 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Wed, 12 Mar 2025 15:33:39 +1100
Subject: [PATCH 0810/1815] Do not re-install ext from kernel picker if it is
 already installed (#243287)

* Do not re-install ext from kernel picker if it is already installed

* updates

* revert
---
 .../browser/viewParts/notebookKernelQuickPickStrategy.ts    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
index 3d2c44c67eca..b8e8b2af29c5 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
@@ -34,6 +34,7 @@ import { IOpenerService } from '../../../../../platform/opener/common/opener.js'
 import { INotebookTextModel } from '../../common/notebookCommon.js';
 import { SELECT_KERNEL_ID } from '../controller/coreActions.js';
 import { EnablementState } from '../../../../services/extensionManagement/common/extensionManagement.js';
+import { areSameExtensions } from '../../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 
 type KernelPick = IQuickPickItem & { kernel: INotebookKernel };
 function isKernelPick(item: QuickPickInput<IQuickPickItem>): item is KernelPick {
@@ -293,7 +294,8 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 			const extension = (await extensionWorkbenchService.getExtensions([{ id: extId }], CancellationToken.None))[0];
 			if (extension.enablementState === EnablementState.DisabledGlobally || extension.enablementState === EnablementState.DisabledWorkspace || extension.enablementState === EnablementState.DisabledByEnvironment) {
 				extensionsToEnable.push(extension);
-			} else {
+			} else if (!extensionWorkbenchService.installed.some(e => areSameExtensions(e.identifier, extension.identifier))) {
+				// Install this extension only if it hasn't already been installed.
 				const canInstall = await extensionWorkbenchService.canInstall(extension);
 				if (canInstall === true) {
 					extensionsToInstall.push(extension);
@@ -307,7 +309,7 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 					extension,
 					{
 						installPreReleaseVersion: isInsiders ?? false,
-						context: { skipWalkthrough: true }
+						context: { skipWalkthrough: true },
 					},
 					ProgressLocation.Notification
 				);

From c1fb4c3983bcc28e63dd159dbbb2ea98d352d33e Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Wed, 12 Mar 2025 14:44:53 +0900
Subject: [PATCH 0811/1815] fix: pty crash on windows with legacy conpty path
 (#243267)

---
 package-lock.json        | 8 ++++----
 package.json             | 2 +-
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9d386986ea46..a6f99636b8f6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -45,7 +45,7 @@
         "native-is-elevated": "0.7.0",
         "native-keymap": "^3.3.5",
         "native-watchdog": "^1.4.1",
-        "node-pty": "1.1.0-beta30",
+        "node-pty": "1.1.0-beta31",
         "open": "^8.4.2",
         "tas-client-umd": "0.2.0",
         "v8-inspect-profiler": "^0.1.1",
@@ -12626,9 +12626,9 @@
       }
     },
     "node_modules/node-pty": {
-      "version": "1.1.0-beta30",
-      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta30.tgz",
-      "integrity": "sha512-cmNYVWfbf961aOqnxIFXssvw6Fp6/78BQBNlwYRWUHBenJjUhCJ1wMZpJy+SegoLC07P9D6HTtq39Kd89rpv/w==",
+      "version": "1.1.0-beta31",
+      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta31.tgz",
+      "integrity": "sha512-DwNyk7nQ8NfHX7NrIqvNQ5GiK6eBbsRYJ+hvHK04PTzZ6o5j1Qsc67g0QxXW8tki/ZJmE9Zxw6PEGncvDshdVw==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index a61d78887c02..c6a731a184ad 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "native-is-elevated": "0.7.0",
     "native-keymap": "^3.3.5",
     "native-watchdog": "^1.4.1",
-    "node-pty": "1.1.0-beta30",
+    "node-pty": "1.1.0-beta31",
     "open": "^8.4.2",
     "tas-client-umd": "0.2.0",
     "v8-inspect-profiler": "^0.1.1",
diff --git a/remote/package-lock.json b/remote/package-lock.json
index 89ceed12c719..6ccde5843bd3 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -37,7 +37,7 @@
         "kerberos": "2.1.1",
         "minimist": "^1.2.6",
         "native-watchdog": "^1.4.1",
-        "node-pty": "1.1.0-beta30",
+        "node-pty": "1.1.0-beta31",
         "tas-client-umd": "0.2.0",
         "vscode-oniguruma": "1.7.0",
         "vscode-regexpp": "^3.1.0",
@@ -1098,9 +1098,9 @@
       }
     },
     "node_modules/node-pty": {
-      "version": "1.1.0-beta30",
-      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta30.tgz",
-      "integrity": "sha512-cmNYVWfbf961aOqnxIFXssvw6Fp6/78BQBNlwYRWUHBenJjUhCJ1wMZpJy+SegoLC07P9D6HTtq39Kd89rpv/w==",
+      "version": "1.1.0-beta31",
+      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta31.tgz",
+      "integrity": "sha512-DwNyk7nQ8NfHX7NrIqvNQ5GiK6eBbsRYJ+hvHK04PTzZ6o5j1Qsc67g0QxXW8tki/ZJmE9Zxw6PEGncvDshdVw==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/remote/package.json b/remote/package.json
index 905239d09167..47fe4472cc76 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -32,7 +32,7 @@
     "kerberos": "2.1.1",
     "minimist": "^1.2.6",
     "native-watchdog": "^1.4.1",
-    "node-pty": "1.1.0-beta30",
+    "node-pty": "1.1.0-beta31",
     "tas-client-umd": "0.2.0",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",

From 13e979a629ced09519f4b41af5cbc5d75be05eae Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 12 Mar 2025 09:33:45 +0100
Subject: [PATCH 0812/1815] chat - tweaks to status (#243301)

* chat - tweaks to status

* more

* add `from` for upgrade action

* .
---
 src/vs/base/browser/ui/dialog/dialog.css      |  4 +
 .../chat/browser/actions/chatActions.ts       |  2 +-
 .../browser/actions/chatExecuteActions.ts     |  1 +
 .../chatContentParts/chatQuotaExceededPart.ts |  2 +-
 .../contrib/chat/browser/chatInputPart.ts     |  2 +-
 .../contrib/chat/browser/chatSetup.ts         |  4 +-
 .../contrib/chat/browser/chatStatus.ts        | 74 ++++++++++---------
 .../contrib/chat/browser/media/chatStatus.css |  8 +-
 8 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/src/vs/base/browser/ui/dialog/dialog.css b/src/vs/base/browser/ui/dialog/dialog.css
index 60dba786a8ab..ff25e129d893 100644
--- a/src/vs/base/browser/ui/dialog/dialog.css
+++ b/src/vs/base/browser/ui/dialog/dialog.css
@@ -71,6 +71,10 @@
 	white-space: normal;
 }
 
+.monaco-dialog-box .dialog-message-row .dialog-message-container ul {
+	padding-inline-start: 20px; /* reduce excessive indent of list items in the dialog */
+}
+
 /** Dialog: Message */
 .monaco-dialog-box .dialog-message-row .dialog-message-container .dialog-message {
 	line-height: 22px;
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index eeb033f26122..badc1e5967eb 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -608,7 +608,7 @@ export function registerChatActions() {
 				buttons: [
 					{
 						label: localize('upgradePro', "Upgrade to Copilot Pro"),
-						run: () => commandService.executeCommand('workbench.action.chat.upgradePlan')
+						run: () => commandService.executeCommand('workbench.action.chat.upgradePlan', 'chat-dialog')
 					},
 				],
 				custom: {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index df2139fb6b1e..b7ed71727479 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -224,6 +224,7 @@ export class SwitchToNextModelAction extends Action2 {
 				weight: KeybindingWeight.WorkbenchContrib,
 				when: ChatContextKeys.inChatInput
 			},
+			precondition: ChatContextKeys.enabled,
 			menu: {
 				id: MenuId.ChatExecute,
 				order: 3,
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts
index 97985ca49694..0e8dcd58fa0f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts
@@ -99,7 +99,7 @@ export class ChatQuotaExceededPart extends Disposable implements IChatContentPar
 		};
 
 		this._register(button1.onDidClick(async () => {
-			await commandService.executeCommand('workbench.action.chat.upgradePlan');
+			await commandService.executeCommand('workbench.action.chat.upgradePlan', 'chat-response');
 
 			shouldShowRetryButton = true;
 			addRetryButtonIfNeeded();
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 1c755c9ff900..d7d78d1cfb4c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -1462,7 +1462,7 @@ class ModelPickerActionViewItem extends DropdownMenuActionViewItemWithKeybinding
 				const actions = models.map(entry => setLanguageModelAction(entry));
 				if (chatEntitlementService.entitlement === ChatEntitlement.Limited) {
 					actions.push(new Separator());
-					actions.push(toAction({ id: 'moreModels', label: localize('chat.moreModels', "Add More Models..."), run: () => commandService.executeCommand('workbench.action.chat.upgradePlan') }));
+					actions.push(toAction({ id: 'moreModels', label: localize('chat.moreModels', "Add More Models..."), run: () => commandService.executeCommand('workbench.action.chat.upgradePlan', 'chat-models') }));
 				}
 
 				return actions;
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 149242c8e040..e4b57bc7d93c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -239,13 +239,13 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 				});
 			}
 
-			override async run(accessor: ServicesAccessor): Promise<void> {
+			override async run(accessor: ServicesAccessor, from?: string): Promise<void> {
 				const openerService = accessor.get(IOpenerService);
 				const telemetryService = accessor.get(ITelemetryService);
 				const hostService = accessor.get(IHostService);
 				const commandService = accessor.get(ICommandService);
 
-				telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: this.desc.id, from: 'chat' });
+				telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: this.desc.id, from: from ?? 'chat' });
 
 				openerService.open(URI.parse(defaultChat.upgradePlanUrl));
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 6fb6b89848ec..ea5fd2617589 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -12,15 +12,13 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowTooltipCommand, StatusbarAlignment, StatusbarEntryKind } from '../../../services/statusbar/browser/statusbar.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { OPEN_CHAT_QUOTA_EXCEEDED_DIALOG, CHAT_SETUP_ACTION_LABEL } from './actions/chatActions.js';
 import { $, addDisposableListener, append, clearNode, EventHelper, EventType } from '../../../../base/browser/dom.js';
 import { ChatEntitlement, ChatEntitlementService, IChatEntitlementService } from '../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 { Command } from '../../../../editor/common/languages.js';
-import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.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 } from '../../../../platform/hover/browser/hover.js';
@@ -100,8 +98,6 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 	private static readonly SETTING = 'chat.experimental.statusIndicator.enabled';
 
-	private static readonly SIGN_IN_COMMAND_ID = 'workbench.action.chat.signIn';
-
 	private entry: IStatusbarEntryAccessor | undefined = undefined;
 
 	private dashboard = new Lazy<ChatStatusDashboard>(() => this.instantiationService.createInstance(ChatStatusDashboard));
@@ -117,7 +113,6 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 		this.create();
 		this.registerListeners();
-		this.registerCommands();
 	}
 
 	private async create(): Promise<void> {
@@ -159,31 +154,24 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		this._register(this.chatEntitlementService.onDidChangeEntitlement(() => this.entry?.update(this.getEntryProps())));
 	}
 
-	private registerCommands(): void {
-		CommandsRegistry.registerCommand(ChatStatusBarEntry.SIGN_IN_COMMAND_ID, () => {
-			this.chatEntitlementService.requests?.value.signIn();
-		});
-	}
-
 	private getEntryProps(): IStatusbarEntry {
 		let text = '$(copilot)';
 		let ariaLabel = localize('chatStatus', "Copilot Status");
-		let command: string | Command = ShowTooltipCommand;
 		let kind: StatusbarEntryKind | undefined;
 
 		const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatEntitlementService.quotas;
 
 		// New User
 		if (isNewUser(this.contextKeyService, this.chatEntitlementService)) {
-			ariaLabel = CHAT_SETUP_ACTION_LABEL.value;
+			ariaLabel = localize('triggerChatSetup', "Use AI Features with Copilot for Free");
 		}
 
 		// Signed out
 		else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
-			const signInWarning = localize('signInToUseCopilot', "Sign in to Use Copilot...");
-			text = `$(copilot-warning) ${signInWarning}`;
-			ariaLabel = signInWarning;
-			command = ChatStatusBarEntry.SIGN_IN_COMMAND_ID;
+			const signedOutWarning = localize('notSignedIntoCopilot', "Signed out");
+
+			text = `$(copilot-not-connected) ${signedOutWarning}`;
+			ariaLabel = signedOutWarning;
 			kind = 'prominent';
 		}
 
@@ -200,7 +188,6 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 
 			text = `$(copilot-warning) ${quotaWarning}`;
 			ariaLabel = quotaWarning;
-			command = OPEN_CHAT_QUOTA_EXCEEDED_DIALOG;
 			kind = 'prominent';
 		}
 
@@ -208,7 +195,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			name: localize('chatStatus', "Copilot Status"),
 			text,
 			ariaLabel,
-			command,
+			command: ShowTooltipCommand,
 			showInAllWindows: true,
 			kind,
 			tooltip: { element: token => this.dashboard.value.show(token) }
@@ -228,6 +215,14 @@ function isNewUser(contextKeyService: IContextKeyService, chatEntitlementService
 		chatEntitlementService.entitlement === ChatEntitlement.Available;									// not yet signed up to copilot
 }
 
+function canUseCopilot(contextKeyService: IContextKeyService, chatEntitlementService: IChatEntitlementService): boolean {
+	const newUser = isNewUser(contextKeyService, chatEntitlementService);
+	const signedOut = chatEntitlementService.entitlement === ChatEntitlement.Unknown;
+	const allQuotaReached = chatEntitlementService.quotas.chatQuotaExceeded && chatEntitlementService.quotas.completionsQuotaExceeded;
+
+	return !newUser && !signedOut && !allQuotaReached;
+}
+
 interface ISettingsAccessor {
 	readSetting: () => boolean;
 	writeSetting: (value: boolean) => Promise<void>;
@@ -242,7 +237,7 @@ class ChatStatusDashboard extends Disposable {
 
 	constructor(
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IChatEntitlementService private readonly chatEntitlementService: IChatEntitlementService,
+		@IChatEntitlementService private readonly chatEntitlementService: ChatEntitlementService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IHoverService private readonly hoverService: IHoverService,
 		@IEditorService private readonly editorService: IEditorService,
@@ -260,13 +255,16 @@ class ChatStatusDashboard extends Disposable {
 
 		let addSeparator = false;
 
-		// New to Copilot
-		if (isNewUser(this.contextKeyService, this.chatEntitlementService)) {
-			this.element.appendChild($('div.header', undefined, localize('setupCopilotForFreeHeader', "Use AI Features with Copilot")));
+		const newUser = isNewUser(this.contextKeyService, this.chatEntitlementService);
+		const signedOut = this.chatEntitlementService.entitlement === ChatEntitlement.Unknown;
+
+		// New to Copilot / Signed out
+		if (newUser || signedOut) {
+			this.element.appendChild($('div.header', undefined, localize('setupCopilot', "Use AI Features with Copilot")));
 			addSeparator = true;
 
-			this.element.appendChild(
-				$('div', undefined,
+			const setup = this.element.appendChild(
+				$('div.setup', undefined,
 					$('div.chat-feature-container', undefined,
 						renderIcon(Codicon.code),
 						$('span', undefined, localize('featureChat', "Code faster with Completions"))
@@ -282,9 +280,9 @@ class ChatStatusDashboard extends Disposable {
 				)
 			);
 
-			const setupCopilotButton = disposables.add(new Button(this.element, { ...defaultButtonStyles }));
-			setupCopilotButton.label = localize('setupCopilotForFreeButton', "Setup Copilot for Free");
-			disposables.add(setupCopilotButton.onDidClick(() => this.runCommandAndClose('workbench.action.chat.triggerSetup')));
+			const button = disposables.add(new Button(setup, { ...defaultButtonStyles }));
+			button.label = newUser ? localize('setupCopilotForFreeButton', "Setup Copilot for Free") : localize('signInToUseCopilotButton', "Sign In to Use Copilot");
+			disposables.add(button.onDidClick(() => this.runCommandAndClose(newUser ? { id: 'workbench.action.chat.triggerSetup' } : () => this.chatEntitlementService.requests?.value.signIn())));
 		}
 
 		// Quota Indicator
@@ -300,9 +298,9 @@ class ChatStatusDashboard extends Disposable {
 			this.element.appendChild($('div.description', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.value.format(quotaResetDate))));
 
 			if (chatQuotaExceeded || completionsQuotaExceeded) {
-				const upgradePlanButton = disposables.add(new Button(this.element, { ...defaultButtonStyles, secondary: true }));
+				const upgradePlanButton = disposables.add(new Button(this.element, { ...defaultButtonStyles, secondary: canUseCopilot(this.contextKeyService, this.chatEntitlementService) /* use secondary color when copilot can still be used */ }));
 				upgradePlanButton.label = localize('upgradeToCopilotPro', "Upgrade to Copilot Pro");
-				disposables.add(upgradePlanButton.onDidClick(() => this.runCommandAndClose('workbench.action.chat.upgradePlan')));
+				disposables.add(upgradePlanButton.onDidClick(() => this.runCommandAndClose({ id: 'workbench.action.chat.upgradePlan', args: ['chat-status'] })));
 			}
 
 			(async () => {
@@ -319,7 +317,7 @@ class ChatStatusDashboard extends Disposable {
 		}
 
 		// Settings
-		if (!isNewUser(this.contextKeyService, this.chatEntitlementService)) {
+		if (canUseCopilot(this.contextKeyService, this.chatEntitlementService)) {
 			if (addSeparator) {
 				this.element.appendChild($('hr'));
 				addSeparator = false;
@@ -334,8 +332,12 @@ class ChatStatusDashboard extends Disposable {
 		return this.element;
 	}
 
-	private runCommandAndClose(commandId: string): void {
-		this.commandService.executeCommand(commandId);
+	private runCommandAndClose(command: { id: string; args?: unknown[] } | Function): void {
+		if (typeof command === 'function') {
+			command();
+		} else {
+			this.commandService.executeCommand(command.id, ...(command.args ?? []));
+		}
 		this.hoverService.hideHover(true);
 	}
 
@@ -386,11 +388,11 @@ class ChatStatusDashboard extends Disposable {
 		// --- Code Completions
 		{
 			const globalSetting = append(settings, $('div.setting'));
-			this.createCodeCompletionsSetting(globalSetting, localize('settings.codeCompletions', "Code completions (all files)"), '*', disposables);
+			this.createCodeCompletionsSetting(globalSetting, localize('settings.codeCompletions', "Code Completions (all files)"), '*', disposables);
 
 			if (modeId) {
 				const languageSetting = append(settings, $('div.setting'));
-				this.createCodeCompletionsSetting(languageSetting, localize('settings.codeCompletionsLanguage', "Code completions ({0})", this.languageService.getLanguageName(modeId) ?? modeId), modeId, disposables);
+				this.createCodeCompletionsSetting(languageSetting, localize('settings.codeCompletionsLanguage', "Code Completions ({0})", this.languageService.getLanguageName(modeId) ?? modeId), modeId, disposables);
 			}
 		}
 
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
index dfb5a545e927..82f35aebb209 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatStatus.css
@@ -26,17 +26,17 @@
 }
 
 .chat-status-bar-entry-tooltip .monaco-button {
-	margin-top: 4px;
-	margin-bottom: 4px;
+	margin-top: 5px;
+	margin-bottom: 5px;
 }
 
 /* Setup for New User */
 
-.chat-feature-container {
+.chat-status-bar-entry-tooltip .setup .chat-feature-container {
 	display: flex;
 	align-items: center;
 	gap: 5px;
-	padding: 3px;
+	padding: 4px;
 }
 
 /* Quota Indicator */

From 63ee986e059679afd25ce6638a36541ce76a2532 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 12 Mar 2025 10:18:56 +0100
Subject: [PATCH 0813/1815] debt - move some code out of `platform` (#243307)

---
 .../browser/ui/severityIcon}/media/severityIcon.css         | 0
 .../browser/ui/severityIcon}/severityIcon.ts                | 6 +++---
 src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts  | 2 +-
 .../contrib/extensions/browser/extensionFeaturesTab.ts      | 2 +-
 .../contrib/extensions/browser/extensionsViewlet.ts         | 2 +-
 .../workbench/contrib/extensions/browser/extensionsViews.ts | 2 +-
 src/vs/workbench/contrib/markers/browser/markersTable.ts    | 2 +-
 .../workbench/contrib/markers/browser/markersTreeViewer.ts  | 2 +-
 src/vs/workbench/contrib/search/browser/searchMessage.ts    | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
 rename src/vs/{platform/severityIcon/browser => base/browser/ui/severityIcon}/media/severityIcon.css (100%)
 rename src/vs/{platform/severityIcon/browser => base/browser/ui/severityIcon}/severityIcon.ts (82%)

diff --git a/src/vs/platform/severityIcon/browser/media/severityIcon.css b/src/vs/base/browser/ui/severityIcon/media/severityIcon.css
similarity index 100%
rename from src/vs/platform/severityIcon/browser/media/severityIcon.css
rename to src/vs/base/browser/ui/severityIcon/media/severityIcon.css
diff --git a/src/vs/platform/severityIcon/browser/severityIcon.ts b/src/vs/base/browser/ui/severityIcon/severityIcon.ts
similarity index 82%
rename from src/vs/platform/severityIcon/browser/severityIcon.ts
rename to src/vs/base/browser/ui/severityIcon/severityIcon.ts
index 73bfe9c2da17..66f5564139ae 100644
--- a/src/vs/platform/severityIcon/browser/severityIcon.ts
+++ b/src/vs/base/browser/ui/severityIcon/severityIcon.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import './media/severityIcon.css';
-import { Codicon } from '../../../base/common/codicons.js';
-import { ThemeIcon } from '../../../base/common/themables.js';
-import Severity from '../../../base/common/severity.js';
+import { Codicon } from '../../../common/codicons.js';
+import { ThemeIcon } from '../../../common/themables.js';
+import Severity from '../../../common/severity.js';
 
 export namespace SeverityIcon {
 
diff --git a/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts b/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts
index 33c8ce333233..d8828c069154 100644
--- a/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts
+++ b/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.ts
@@ -26,7 +26,7 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { IMarker, IRelatedInformation, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { SeverityIcon } from '../../../../platform/severityIcon/browser/severityIcon.js';
+import { SeverityIcon } from '../../../../base/browser/ui/severityIcon/severityIcon.js';
 import { contrastBorder, editorBackground, editorErrorBorder, editorErrorForeground, editorInfoBorder, editorInfoForeground, editorWarningBorder, editorWarningForeground, oneOf, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
 import { IColorTheme, IThemeChangeEvent, IThemeService } from '../../../../platform/theme/common/themeService.js';
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts b/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts
index 9d0f876a3075..57b0ea186ef1 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts
@@ -27,7 +27,7 @@ import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import Severity from '../../../../base/common/severity.js';
 import { errorIcon, infoIcon, warningIcon } from './extensionsIcons.js';
-import { SeverityIcon } from '../../../../platform/severityIcon/browser/severityIcon.js';
+import { SeverityIcon } from '../../../../base/browser/ui/severityIcon/severityIcon.js';
 import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { OS } from '../../../../base/common/platform.js';
 import { IMarkdownString, MarkdownString, isMarkdownString } from '../../../../base/common/htmlContent.js';
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
index 5e3d3cdb3277..9b840de9a61a 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
@@ -62,7 +62,7 @@ import { ILocalizedString } from '../../../../platform/action/common/action.js';
 import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
 import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
 import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
-import { SeverityIcon } from '../../../../platform/severityIcon/browser/severityIcon.js';
+import { SeverityIcon } from '../../../../base/browser/ui/severityIcon/severityIcon.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
index cbb4d0cbd4e3..dd378644f9ca 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
@@ -39,7 +39,7 @@ import { IAction, Action, Separator, ActionRunner } from '../../../../base/commo
 import { ExtensionIdentifier, ExtensionIdentifierMap, ExtensionUntrustedWorkspaceSupportType, ExtensionVirtualWorkspaceSupportType, IExtensionDescription, IExtensionIdentifier, isLanguagePackExtension } from '../../../../platform/extensions/common/extensions.js';
 import { CancelablePromise, createCancelablePromise, ThrottledDelayer } from '../../../../base/common/async.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
-import { SeverityIcon } from '../../../../platform/severityIcon/browser/severityIcon.js';
+import { SeverityIcon } from '../../../../base/browser/ui/severityIcon/severityIcon.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
diff --git a/src/vs/workbench/contrib/markers/browser/markersTable.ts b/src/vs/workbench/contrib/markers/browser/markersTable.ts
index af8e6eafa18a..3a10bafb3272 100644
--- a/src/vs/workbench/contrib/markers/browser/markersTable.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersTable.ts
@@ -13,7 +13,7 @@ import { IOpenEvent, IWorkbenchTableOptions, WorkbenchTable } from '../../../../
 import { HighlightedLabel } from '../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
 import { compareMarkersByUri, Marker, MarkerTableItem, ResourceMarkers } from './markersModel.js';
 import { MarkerSeverity } from '../../../../platform/markers/common/markers.js';
-import { SeverityIcon } from '../../../../platform/severityIcon/browser/severityIcon.js';
+import { SeverityIcon } from '../../../../base/browser/ui/severityIcon/severityIcon.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { FilterOptions } from './markersFilterOptions.js';
diff --git a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
index 609416de96aa..4ed27e35584a 100644
--- a/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
+++ b/src/vs/workbench/contrib/markers/browser/markersTreeViewer.ts
@@ -35,7 +35,7 @@ import { applyCodeAction, ApplyCodeActionReason, getCodeActions } from '../../..
 import { CodeActionKind, CodeActionSet, CodeActionTriggerSource } from '../../../../editor/contrib/codeAction/common/types.js';
 import { ITextModel } from '../../../../editor/common/model.js';
 import { IEditorService, ACTIVE_GROUP } from '../../../services/editor/common/editorService.js';
-import { SeverityIcon } from '../../../../platform/severityIcon/browser/severityIcon.js';
+import { SeverityIcon } from '../../../../base/browser/ui/severityIcon/severityIcon.js';
 import { CodeActionTriggerType } from '../../../../editor/common/languages.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { Progress } from '../../../../platform/progress/common/progress.js';
diff --git a/src/vs/workbench/contrib/search/browser/searchMessage.ts b/src/vs/workbench/contrib/search/browser/searchMessage.ts
index 37a03f28a89f..ea8990aad3e7 100644
--- a/src/vs/workbench/contrib/search/browser/searchMessage.ts
+++ b/src/vs/workbench/contrib/search/browser/searchMessage.ts
@@ -10,7 +10,7 @@ import { parseLinkedText } from '../../../../base/common/linkedText.js';
 import Severity from '../../../../base/common/severity.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
-import { SeverityIcon } from '../../../../platform/severityIcon/browser/severityIcon.js';
+import { SeverityIcon } from '../../../../base/browser/ui/severityIcon/severityIcon.js';
 import { TextSearchCompleteMessage, TextSearchCompleteMessageType } from '../../../services/search/common/searchExtTypes.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { Schemas } from '../../../../base/common/network.js';

From 1d929555c6ff546a22213f2ad5be797d7f884e71 Mon Sep 17 00:00:00 2001
From: Nick Trogh <1908215+ntrogh@users.noreply.github.com>
Date: Wed, 12 Mar 2025 10:28:57 +0100
Subject: [PATCH 0814/1815] Update command labels to meet capitalization
 guidance

---
 src/vs/editor/contrib/clipboard/browser/clipboard.ts |  2 +-
 .../contrib/codelens/browser/codelensController.ts   |  2 +-
 src/vs/editor/contrib/find/browser/findController.ts |  4 ++--
 .../contrib/multicursor/browser/multicursor.ts       | 12 ++++++------
 .../workbench/browser/parts/editor/editorActions.ts  |  2 +-
 .../inlayHints/browser/inlayHintsAccessibilty.ts     |  2 +-
 .../contrib/multicursor/notebookMulticursor.ts       |  2 +-
 .../contrib/terminal/browser/terminalActions.ts      |  8 ++++----
 .../contrib/terminal/common/terminalStrings.ts       |  6 +++---
 .../electron-sandbox/actions/developerActions.ts     |  2 +-
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/vs/editor/contrib/clipboard/browser/clipboard.ts b/src/vs/editor/contrib/clipboard/browser/clipboard.ts
index a5bc65bc1008..aaf909057813 100644
--- a/src/vs/editor/contrib/clipboard/browser/clipboard.ts
+++ b/src/vs/editor/contrib/clipboard/browser/clipboard.ts
@@ -157,7 +157,7 @@ class ExecCommandCopyWithSyntaxHighlightingAction extends EditorAction {
 	constructor() {
 		super({
 			id: 'editor.action.clipboardCopyWithSyntaxHighlightingAction',
-			label: nls.localize2('actions.clipboard.copyWithSyntaxHighlightingLabel', "Copy With Syntax Highlighting"),
+			label: nls.localize2('actions.clipboard.copyWithSyntaxHighlightingLabel', "Copy with Syntax Highlighting"),
 			precondition: undefined,
 			kbOpts: {
 				kbExpr: EditorContextKeys.textInputFocus,
diff --git a/src/vs/editor/contrib/codelens/browser/codelensController.ts b/src/vs/editor/contrib/codelens/browser/codelensController.ts
index 85cc79d7ca39..bd54868ea99f 100644
--- a/src/vs/editor/contrib/codelens/browser/codelensController.ts
+++ b/src/vs/editor/contrib/codelens/browser/codelensController.ts
@@ -465,7 +465,7 @@ registerEditorAction(class ShowLensesInCurrentLine extends EditorAction {
 		super({
 			id: 'codelens.showLensesInCurrentLine',
 			precondition: EditorContextKeys.hasCodeLensProvider,
-			label: localize2('showLensOnLine', "Show CodeLens Commands For Current Line"),
+			label: localize2('showLensOnLine', "Show CodeLens Commands for Current Line"),
 		});
 	}
 
diff --git a/src/vs/editor/contrib/find/browser/findController.ts b/src/vs/editor/contrib/find/browser/findController.ts
index 6b6102ea5ac9..9e00a1d5d47a 100644
--- a/src/vs/editor/contrib/find/browser/findController.ts
+++ b/src/vs/editor/contrib/find/browser/findController.ts
@@ -584,7 +584,7 @@ export class StartFindWithArgsAction extends EditorAction {
 	constructor() {
 		super({
 			id: FIND_IDS.StartFindWithArgs,
-			label: nls.localize2('startFindWithArgsAction', "Find With Arguments"),
+			label: nls.localize2('startFindWithArgsAction', "Find with Arguments"),
 			precondition: undefined,
 			kbOpts: {
 				kbExpr: null,
@@ -633,7 +633,7 @@ export class StartFindWithSelectionAction extends EditorAction {
 	constructor() {
 		super({
 			id: FIND_IDS.StartFindWithSelection,
-			label: nls.localize2('startFindWithSelectionAction', "Find With Selection"),
+			label: nls.localize2('startFindWithSelectionAction', "Find with Selection"),
 			precondition: undefined,
 			kbOpts: {
 				kbExpr: null,
diff --git a/src/vs/editor/contrib/multicursor/browser/multicursor.ts b/src/vs/editor/contrib/multicursor/browser/multicursor.ts
index 3138b9317bb6..abc43c1f7d7e 100644
--- a/src/vs/editor/contrib/multicursor/browser/multicursor.ts
+++ b/src/vs/editor/contrib/multicursor/browser/multicursor.ts
@@ -201,7 +201,7 @@ class InsertCursorAtEndOfLineSelected extends EditorAction {
 	constructor() {
 		super({
 			id: 'editor.action.addCursorsToBottom',
-			label: nls.localize2('mutlicursor.addCursorsToBottom', "Add Cursors To Bottom"),
+			label: nls.localize2('mutlicursor.addCursorsToBottom', "Add Cursors to Bottom"),
 			precondition: undefined
 		});
 	}
@@ -233,7 +233,7 @@ class InsertCursorAtTopOfLineSelected extends EditorAction {
 	constructor() {
 		super({
 			id: 'editor.action.addCursorsToTop',
-			label: nls.localize2('mutlicursor.addCursorsToTop', "Add Cursors To Top"),
+			label: nls.localize2('mutlicursor.addCursorsToTop', "Add Cursors to Top"),
 			precondition: undefined
 		});
 	}
@@ -686,7 +686,7 @@ export class AddSelectionToNextFindMatchAction extends MultiCursorSelectionContr
 	constructor() {
 		super({
 			id: 'editor.action.addSelectionToNextFindMatch',
-			label: nls.localize2('addSelectionToNextFindMatch', "Add Selection To Next Find Match"),
+			label: nls.localize2('addSelectionToNextFindMatch', "Add Selection to Next Find Match"),
 			precondition: undefined,
 			kbOpts: {
 				kbExpr: EditorContextKeys.focus,
@@ -710,7 +710,7 @@ export class AddSelectionToPreviousFindMatchAction extends MultiCursorSelectionC
 	constructor() {
 		super({
 			id: 'editor.action.addSelectionToPreviousFindMatch',
-			label: nls.localize2('addSelectionToPreviousFindMatch', "Add Selection To Previous Find Match"),
+			label: nls.localize2('addSelectionToPreviousFindMatch', "Add Selection to Previous Find Match"),
 			precondition: undefined,
 			menuOpts: {
 				menuId: MenuId.MenubarSelectionMenu,
@@ -729,7 +729,7 @@ export class MoveSelectionToNextFindMatchAction extends MultiCursorSelectionCont
 	constructor() {
 		super({
 			id: 'editor.action.moveSelectionToNextFindMatch',
-			label: nls.localize2('moveSelectionToNextFindMatch', "Move Last Selection To Next Find Match"),
+			label: nls.localize2('moveSelectionToNextFindMatch', "Move Last Selection to Next Find Match"),
 			precondition: undefined,
 			kbOpts: {
 				kbExpr: EditorContextKeys.focus,
@@ -747,7 +747,7 @@ export class MoveSelectionToPreviousFindMatchAction extends MultiCursorSelection
 	constructor() {
 		super({
 			id: 'editor.action.moveSelectionToPreviousFindMatch',
-			label: nls.localize2('moveSelectionToPreviousFindMatch', "Move Last Selection To Previous Find Match"),
+			label: nls.localize2('moveSelectionToPreviousFindMatch', "Move Last Selection to Previous Find Match"),
 			precondition: undefined
 		});
 	}
diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts
index c922c06e8177..52d1dc5859cc 100644
--- a/src/vs/workbench/browser/parts/editor/editorActions.ts
+++ b/src/vs/workbench/browser/parts/editor/editorActions.ts
@@ -2493,7 +2493,7 @@ export class ReOpenInTextEditorAction extends Action2 {
 	constructor() {
 		super({
 			id: 'workbench.action.reopenTextEditor',
-			title: localize2('reopenTextEditor', 'Reopen Editor With Text Editor'),
+			title: localize2('reopenTextEditor', 'Reopen Editor with Text Editor'),
 			f1: true,
 			category: Categories.View,
 			precondition: ActiveEditorAvailableEditorIdsContext
diff --git a/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.ts b/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.ts
index 0494623f078e..ab3d1dabf53e 100644
--- a/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.ts
+++ b/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.ts
@@ -174,7 +174,7 @@ registerAction2(class StartReadHints extends EditorAction2 {
 	constructor() {
 		super({
 			id: 'inlayHints.startReadingLineWithHint',
-			title: localize2('read.title', "Read Line With Inline Hints"),
+			title: localize2('read.title', "Read Line with Inline Hints"),
 			precondition: EditorContextKeys.hasInlayHintsProvider,
 			f1: true
 		});
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 8ce231cbd249..116d5d3fab9d 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts
@@ -1035,7 +1035,7 @@ class NotebookAddMatchToMultiSelectionAction extends NotebookAction {
 	constructor() {
 		super({
 			id: NOTEBOOK_ADD_FIND_MATCH_TO_SELECTION_ID,
-			title: localize('addFindMatchToSelection', "Add Selection To Next Find Match"),
+			title: localize('addFindMatchToSelection', "Add Selection to Next Find Match"),
 			precondition: ContextKeyExpr.and(
 				ContextKeyExpr.equals('config.notebook.multiCursor.enabled', true),
 				NOTEBOOK_IS_ACTIVE_EDITOR,
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
index 664eea289081..6008c2b6dd7b 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
@@ -904,7 +904,7 @@ export function registerTerminalActions() {
 
 	registerActiveInstanceAction({
 		id: TerminalCommandId.SelectToPreviousCommand,
-		title: localize2('workbench.action.terminal.selectToPreviousCommand', 'Select To Previous Command'),
+		title: localize2('workbench.action.terminal.selectToPreviousCommand', 'Select to Previous Command'),
 		keybinding: {
 			primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.UpArrow,
 			when: TerminalContextKeys.focus,
@@ -919,7 +919,7 @@ export function registerTerminalActions() {
 
 	registerActiveInstanceAction({
 		id: TerminalCommandId.SelectToNextCommand,
-		title: localize2('workbench.action.terminal.selectToNextCommand', 'Select To Next Command'),
+		title: localize2('workbench.action.terminal.selectToNextCommand', 'Select to Next Command'),
 		keybinding: {
 			primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.DownArrow,
 			when: TerminalContextKeys.focus,
@@ -934,7 +934,7 @@ export function registerTerminalActions() {
 
 	registerActiveXtermAction({
 		id: TerminalCommandId.SelectToPreviousLine,
-		title: localize2('workbench.action.terminal.selectToPreviousLine', 'Select To Previous Line'),
+		title: localize2('workbench.action.terminal.selectToPreviousLine', 'Select to Previous Line'),
 		precondition: sharedWhenClause.terminalAvailable,
 		run: async (xterm, _, instance) => {
 			xterm.markTracker.selectToPreviousLine();
@@ -945,7 +945,7 @@ export function registerTerminalActions() {
 
 	registerActiveXtermAction({
 		id: TerminalCommandId.SelectToNextLine,
-		title: localize2('workbench.action.terminal.selectToNextLine', 'Select To Next Line'),
+		title: localize2('workbench.action.terminal.selectToNextLine', 'Select to Next Line'),
 		precondition: sharedWhenClause.terminalAvailable,
 		run: async (xterm, _, instance) => {
 			xterm.markTracker.selectToNextLine();
diff --git a/src/vs/workbench/contrib/terminal/common/terminalStrings.ts b/src/vs/workbench/contrib/terminal/common/terminalStrings.ts
index 101fb7f7e998..ed00de1f3634 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalStrings.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalStrings.ts
@@ -36,9 +36,9 @@ export const terminalStrings = {
 	rename: localize2('workbench.action.terminal.rename', "Rename..."),
 	toggleSizeToContentWidth: localize2('workbench.action.terminal.sizeToContentWidthInstance', "Toggle Size to Content Width"),
 	focusHover: localize2('workbench.action.terminal.focusHover', "Focus Hover"),
-	sendSequence: localize2('workbench.action.terminal.sendSequence', "Send Custom Sequence To Terminal"),
+	sendSequence: localize2('workbench.action.terminal.sendSequence', "Send Custom Sequence to Terminal"),
 	newWithCwd: localize2('workbench.action.terminal.newWithCwd', "Create New Terminal Starting in a Custom Working Directory"),
 	renameWithArgs: localize2('workbench.action.terminal.renameWithArg', "Rename the Currently Active Terminal"),
-	scrollToPreviousCommand: localize2('workbench.action.terminal.scrollToPreviousCommand', "Scroll To Previous Command"),
-	scrollToNextCommand: localize2('workbench.action.terminal.scrollToNextCommand', "Scroll To Next Command")
+	scrollToPreviousCommand: localize2('workbench.action.terminal.scrollToPreviousCommand', "Scroll to Previous Command"),
+	scrollToNextCommand: localize2('workbench.action.terminal.scrollToNextCommand', "Scroll to Next Command")
 };
diff --git a/src/vs/workbench/electron-sandbox/actions/developerActions.ts b/src/vs/workbench/electron-sandbox/actions/developerActions.ts
index 2c3040af2eb4..42ce42d00251 100644
--- a/src/vs/workbench/electron-sandbox/actions/developerActions.ts
+++ b/src/vs/workbench/electron-sandbox/actions/developerActions.ts
@@ -73,7 +73,7 @@ export class ReloadWindowWithExtensionsDisabledAction extends Action2 {
 	constructor() {
 		super({
 			id: 'workbench.action.reloadWindowWithExtensionsDisabled',
-			title: localize2('reloadWindowWithExtensionsDisabled', 'Reload With Extensions Disabled'),
+			title: localize2('reloadWindowWithExtensionsDisabled', 'Reload with Extensions Disabled'),
 			category: Categories.Developer,
 			f1: true
 		});

From 52e197c53369c7a29d0d760fcb15251e778d5c48 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Wed, 12 Mar 2025 10:37:16 +0100
Subject: [PATCH 0815/1815] Fix initialization orders for inline edits
 (#243310)

fix init orders
---
 build/lib/propertyInitOrderChecker.js         |  4 --
 build/lib/propertyInitOrderChecker.ts         |  4 --
 .../components/gutterIndicatorMenu.ts         |  3 +-
 .../view/inlineEdits/inlineEditsModel.ts      | 28 ++++++++-----
 .../view/inlineEdits/inlineEditsView.ts       | 23 +++++++----
 .../inlineEdits/inlineEditsViewProducer.ts    | 10 +++--
 .../inlineEditsDeletionView.ts                | 40 +++++++++++--------
 7 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index 6bcc728f06ef..1ea42de4a568 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -87,17 +87,13 @@ const ignored = new Set([
     'vs/editor/contrib/inlineCompletions/browser/model/changeRecorder.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.ts',
-    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts',
-    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts',
-    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsSideBySideView.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/originalEditorInlineDiffView.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts',
-    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts',
     'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts',
     'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts',
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index 78dc22e4002c..908b45a97880 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -56,17 +56,13 @@ const ignored = new Set([
 	'vs/editor/contrib/inlineCompletions/browser/model/changeRecorder.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.ts',
-	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts',
-	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts',
-	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsSideBySideView.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/originalEditorInlineDiffView.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts',
-	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts',
 	'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts',
 	'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts',
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 5a5b7aaa1d35..848af4d26139 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
@@ -27,7 +27,7 @@ import { FirstFnArg, } from '../utils/utils.js';
 
 export class GutterIndicatorMenuContent {
 
-	private readonly _inlineEditsShowCollapsed = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.showCollapsed);
+	private readonly _inlineEditsShowCollapsed: IObservable<boolean>;
 
 	constructor(
 		private readonly _model: IInlineEditModel,
@@ -37,6 +37,7 @@ export class GutterIndicatorMenuContent {
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@ICommandService private readonly _commandService: ICommandService,
 	) {
+		this._inlineEditsShowCollapsed = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.showCollapsed);
 	}
 
 	public toDisposableLiveElement(): LiveElement {
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 56db7d9f1b3d..2c8e66d72279 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts
@@ -9,6 +9,7 @@ import { ICodeEditor } from '../../../../../browser/editorBrowser.js';
 import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
 import { LineRange } from '../../../../../common/core/lineRange.js';
 import { StringText, TextEdit } from '../../../../../common/core/textEdit.js';
+import { Command } from '../../../../../common/languages.js';
 import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
 import { InlineCompletionWithUpdatedRange } from '../../model/inlineCompletionsSource.js';
 import { IInlineEditModel, InlineEditTabAction } from './inlineEditsViewInterface.js';
@@ -16,18 +17,25 @@ import { InlineEditWithChanges } from './inlineEditWithChanges.js';
 
 export class InlineEditModel implements IInlineEditModel {
 
-	readonly action = this.inlineEdit.inlineCompletion.action;
-	readonly displayName = this.inlineEdit.inlineCompletion.source.provider.displayName ?? localize('inlineEdit', "Inline Edit");
-	readonly extensionCommands = this.inlineEdit.inlineCompletion.source.inlineCompletions.commands ?? [];
+	readonly action: Command | undefined;
+	readonly displayName: string;
+	readonly extensionCommands: Command[];
 
-	readonly inAcceptFlow = this._model.inAcceptFlow;
-	readonly inPartialAcceptFlow = this._model.inPartialAcceptFlow;
+	readonly inAcceptFlow: IObservable<boolean>;
+	readonly inPartialAcceptFlow: IObservable<boolean>;
 
 	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.inlineCompletions.commands ?? [];
+
+		this.inAcceptFlow = this._model.inAcceptFlow;
+		this.inPartialAcceptFlow = this._model.inPartialAcceptFlow;
+	}
 
 	accept() {
 		this._model.accept();
@@ -52,18 +60,16 @@ export class GhostTextIndicator {
 
 	readonly model: InlineEditModel;
 
-	private readonly _editorObs = observableCodeEditor(this._editor);
-
 	constructor(
-		private _editor: ICodeEditor,
+		editor: ICodeEditor,
 		model: InlineCompletionsModel,
 		readonly lineRange: LineRange,
 		inlineCompletion: InlineCompletionWithUpdatedRange,
 		renderExplicitly: boolean,
 	) {
-
+		const editorObs = observableCodeEditor(editor);
 		const tabAction = derived<InlineEditTabAction>(this, reader => {
-			if (this._editorObs.isFocused.read(reader)) {
+			if (editorObs.isFocused.read(reader)) {
 				if (model.inlineCompletionState.read(reader)?.inlineCompletion?.sourceInlineCompletion.showInlineEditMenu) {
 					return InlineEditTabAction.Accept;
 				}
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 6b6834a8221f..dad7dacaf497 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
@@ -10,7 +10,7 @@ import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { autorunWithStore, derived, derivedOpts, derivedWithStore, IObservable, IReader, ISettableObservable, mapObservableArrayCached, 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 { ObservableCodeEditor, observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
 import { EditorOption } from '../../../../../common/config/editorOptions.js';
 import { LineRange } from '../../../../../common/core/lineRange.js';
 import { Position } from '../../../../../common/core/position.js';
@@ -34,14 +34,14 @@ import { applyEditToModifiedRangeMappings, createReindentEdit } from './utils/ut
 import './view.css';
 
 export class InlineEditsView extends Disposable {
-	private readonly _editorObs = observableCodeEditor(this._editor);
+	private readonly _editorObs: ObservableCodeEditor = observableCodeEditor(this._editor);
 
-	private readonly _useMixedLinesDiff = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.useMixedLinesDiff);
-	private readonly _useInterleavedLinesDiff = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.useInterleavedLinesDiff);
-	private readonly _useCodeShifting = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.allowCodeShifting);
-	private readonly _renderSideBySide = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.renderSideBySide);
-	private readonly _showCollapsed = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.showCollapsed);
-	private readonly _useMultiLineGhostText = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.useMultiLineGhostText);
+	private readonly _useMixedLinesDiff;
+	private readonly _useInterleavedLinesDiff;
+	private readonly _useCodeShifting;
+	private readonly _renderSideBySide;
+	private readonly _showCollapsed;
+	private readonly _useMultiLineGhostText;
 
 	private readonly _tabAction = derived<InlineEditTabAction>(reader => this._model.read(reader)?.tabAction.read(reader) ?? InlineEditTabAction.Inactive);
 
@@ -62,6 +62,13 @@ export class InlineEditsView extends Disposable {
 	) {
 		super();
 
+		this._useMixedLinesDiff = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.useMixedLinesDiff);
+		this._useInterleavedLinesDiff = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.useInterleavedLinesDiff);
+		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._showCollapsed = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.showCollapsed);
+		this._useMultiLineGhostText = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.useMultiLineGhostText);
+
 		this._register(autorunWithStore((reader, store) => {
 			const model = this._model.read(reader);
 			if (!model) {
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 cd93ce8a60aa..f63b071a0ffd 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts
@@ -8,7 +8,7 @@ import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { derived, 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 { ObservableCodeEditor, observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
 import { LineRange } from '../../../../../common/core/lineRange.js';
 import { Range } from '../../../../../common/core/range.js';
 import { SingleTextEdit, TextEdit } from '../../../../../common/core/textEdit.js';
@@ -23,7 +23,7 @@ import { InlineEditTabAction } from './inlineEditsViewInterface.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(InlineEditsViewAndDiffProducer);
 
-	private readonly _editorObs = observableCodeEditor(this._editor);
+	private readonly _editorObs: ObservableCodeEditor;
 
 	private readonly _inlineEdit = derived<InlineEditWithChanges | undefined>(this, (reader) => {
 		const model = this._model.read(reader);
@@ -91,10 +91,12 @@ export class InlineEditsViewAndDiffProducer extends Disposable { // TODO: This c
 		private readonly _edit: IObservable<InlineEdit | undefined>,
 		private readonly _model: IObservable<InlineCompletionsModel | undefined>,
 		private readonly _focusIsInMenu: ISettableObservable<boolean>,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IInstantiationService instantiationService: IInstantiationService,
 	) {
 		super();
 
-		this._register(this._instantiationService.createInstance(InlineEditsView, this._editor, this._inlineEditModel, this._ghostTextIndicator, this._focusIsInMenu));
+		this._editorObs = observableCodeEditor(this._editor);
+
+		this._register(instantiationService.createInstance(InlineEditsView, this._editor, this._inlineEditModel, this._ghostTextIndicator, this._focusIsInMenu));
 	}
 }
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 2881fb21196a..9feed6f4a6bd 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
@@ -9,7 +9,7 @@ import { Disposable } from '../../../../../../../base/common/lifecycle.js';
 import { constObservable, derived, derivedObservableWithCache, IObservable } from '../../../../../../../base/common/observable.js';
 import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
 import { ICodeEditor } from '../../../../../../browser/editorBrowser.js';
-import { observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
+import { ObservableCodeEditor, observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
 import { Point } from '../../../../../../browser/point.js';
 import { LineRange } from '../../../../../../common/core/lineRange.js';
 import { Position } from '../../../../../../common/core/position.js';
@@ -20,11 +20,17 @@ import { getOriginalBorderColor, originalBackgroundColor } from '../theme.js';
 import { createRectangle, getPrefixTrim, mapOutFalsy, maxContentWidthInRange } from '../utils/utils.js';
 
 export class InlineEditsDeletionView extends Disposable implements IInlineEditsView {
-	private readonly _editorObs = observableCodeEditor(this._editor);
 
 	private readonly _onDidClick = this._register(new Emitter<IMouseEvent>());
 	readonly onDidClick = this._onDidClick.event;
 
+	private readonly _editorObs: ObservableCodeEditor;
+
+	private readonly _originalVerticalStartPosition: IObservable<number | undefined>;
+	private readonly _originalVerticalEndPosition: IObservable<number | undefined>;
+
+	private readonly _originalDisplayRange: IObservable<LineRange | undefined>;
+
 	constructor(
 		private readonly _editor: ICodeEditor,
 		private readonly _edit: IObservable<InlineEditWithChanges | undefined>,
@@ -36,6 +42,22 @@ export class InlineEditsDeletionView extends Disposable implements IInlineEditsV
 	) {
 		super();
 
+		this._editorObs = observableCodeEditor(this._editor);
+
+		const originalStartPosition = derived(this, (reader) => {
+			const inlineEdit = this._edit.read(reader);
+			return inlineEdit ? new Position(inlineEdit.originalLineRange.startLineNumber, 1) : null;
+		});
+
+		const originalEndPosition = derived(this, (reader) => {
+			const inlineEdit = this._edit.read(reader);
+			return inlineEdit ? new Position(inlineEdit.originalLineRange.endLineNumberExclusive, 1) : null;
+		});
+
+		this._originalDisplayRange = this._uiState.map(s => s?.originalRange);
+		this._originalVerticalStartPosition = this._editorObs.observePosition(originalStartPosition, this._store).map(p => p?.y);
+		this._originalVerticalEndPosition = this._editorObs.observePosition(originalEndPosition, this._store).map(p => p?.y);
+
 		this._register(this._editorObs.createOverlayWidget({
 			domNode: this._nonOverflowView.element,
 			position: constObservable(null),
@@ -50,20 +72,6 @@ export class InlineEditsDeletionView extends Disposable implements IInlineEditsV
 
 	private readonly _display = derived(this, reader => !!this._uiState.read(reader) ? 'block' : 'none');
 
-	private readonly _originalStartPosition = derived(this, (reader) => {
-		const inlineEdit = this._edit.read(reader);
-		return inlineEdit ? new Position(inlineEdit.originalLineRange.startLineNumber, 1) : null;
-	});
-
-	private readonly _originalEndPosition = derived(this, (reader) => {
-		const inlineEdit = this._edit.read(reader);
-		return inlineEdit ? new Position(inlineEdit.originalLineRange.endLineNumberExclusive, 1) : null;
-	});
-
-	private readonly _originalVerticalStartPosition = this._editorObs.observePosition(this._originalStartPosition, this._store).map(p => p?.y);
-	private readonly _originalVerticalEndPosition = this._editorObs.observePosition(this._originalEndPosition, this._store).map(p => p?.y);
-
-	private readonly _originalDisplayRange = this._uiState.map(s => s?.originalRange);
 	private readonly _editorMaxContentWidthInRange = derived(this, reader => {
 		const originalDisplayRange = this._originalDisplayRange.read(reader);
 		if (!originalDisplayRange) {

From f9c6242a1793598cacfeb9fa229a7440beacae29 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 12 Mar 2025 11:03:07 +0100
Subject: [PATCH 0816/1815] fix
 https://github.com/microsoft/vscode/issues/243168 (#243311)

---
 src/vs/editor/contrib/suggest/browser/suggestModel.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/vs/editor/contrib/suggest/browser/suggestModel.ts b/src/vs/editor/contrib/suggest/browser/suggestModel.ts
index bf6ce4b68676..fcf97af35a62 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestModel.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestModel.ts
@@ -505,6 +505,7 @@ export class SuggestModel implements IDisposable {
 			this._requestToken?.dispose();
 
 			if (!this._editor.hasModel()) {
+				completions.disposable.dispose();
 				return;
 			}
 
@@ -514,6 +515,7 @@ export class SuggestModel implements IDisposable {
 			}
 
 			if (this._triggerState === undefined) {
+				completions.disposable.dispose();
 				return;
 			}
 

From 7c64719ac9e5a7a5b00702a7486032290086604b Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Wed, 12 Mar 2025 11:04:04 +0100
Subject: [PATCH 0817/1815] insertion view init order fix (#243316)

init order
---
 build/lib/propertyInitOrderChecker.js         |  1 -
 build/lib/propertyInitOrderChecker.ts         |  1 -
 .../inlineEditsInsertionView.ts               | 39 +++++++++++--------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index 1ea42de4a568..4c5b735d8a73 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -88,7 +88,6 @@ const ignored = new Set([
     'vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts',
-    'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.ts',
     'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsSideBySideView.ts',
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index 908b45a97880..5b1582552125 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -57,7 +57,6 @@ const ignored = new Set([
 	'vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts',
-	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.ts',
 	'vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsSideBySideView.ts',
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 2f631455e497..bb20b7d863ed 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
@@ -10,7 +10,7 @@ import { constObservable, derived, derivedWithStore, IObservable, observableValu
 import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
 import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
 import { ICodeEditor } from '../../../../../../browser/editorBrowser.js';
-import { observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
+import { ObservableCodeEditor, observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
 import { Rect } from '../../../../../../browser/rect.js';
 import { LineSource, renderLines, RenderOptions } from '../../../../../../browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
@@ -28,7 +28,7 @@ import { getModifiedBorderColor, modifiedChangedLineBackgroundColor } from '../t
 import { createRectangle, getPrefixTrim, mapOutFalsy } from '../utils/utils.js';
 
 export class InlineEditsInsertionView extends Disposable implements IInlineEditsView {
-	private readonly _editorObs = observableCodeEditor(this._editor);
+	private readonly _editorObs: ObservableCodeEditor;
 
 	private readonly _onDidClick = this._register(new Emitter<IMouseEvent>());
 	readonly onDidClick = this._onDidClick.event;
@@ -86,18 +86,8 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 		return new GhostText(state.lineNumber, [new GhostTextPart(state.column, state.text, false, inlineDecorations)]);
 	});
 
-	protected readonly _ghostTextView = this._register(this._instantiationService.createInstance(GhostTextView,
-		this._editor,
-		{
-			ghostText: this._ghostText,
-			minReservedLineCount: constObservable(0),
-			targetTextModel: this._editorObs.model.map(model => model ?? undefined),
-			warning: constObservable(undefined),
-		},
-		observableValue(this, { syntaxHighlightingEnabled: true, extraClasses: ['inline-edit'] }),
-		true,
-		true
-	));
+	protected readonly _ghostTextView: GhostTextView;
+	readonly isHovered: IObservable<boolean>;
 
 	constructor(
 		private readonly _editor: ICodeEditor,
@@ -107,11 +97,28 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 			text: string;
 		} | undefined>,
 		private readonly _tabAction: IObservable<InlineEditTabAction>,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IInstantiationService instantiationService: IInstantiationService,
 		@ILanguageService private readonly _languageService: ILanguageService,
 	) {
 		super();
 
+		this._editorObs = observableCodeEditor(this._editor);
+
+		this._ghostTextView = this._register(instantiationService.createInstance(GhostTextView,
+			this._editor,
+			{
+				ghostText: this._ghostText,
+				minReservedLineCount: constObservable(0),
+				targetTextModel: this._editorObs.model.map(model => model ?? undefined),
+				warning: constObservable(undefined),
+			},
+			observableValue(this, { syntaxHighlightingEnabled: true, extraClasses: ['inline-edit'] }),
+			true,
+			true
+		));
+
+		this.isHovered = this._ghostTextView.isHovered;
+
 		this._register(this._ghostTextView.onDidClick((e) => {
 			this._onDidClick.fire(e);
 		}));
@@ -283,6 +290,4 @@ export class InlineEditsInsertionView extends Disposable implements IInlineEdits
 	}, [
 		[this._foregroundSvg],
 	]).keepUpdated(this._store);
-
-	readonly isHovered = this._ghostTextView.isHovered;
 }

From b36d137b54bfde3290b0f28ae857388f9fcd3184 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 12 Mar 2025 11:05:43 +0100
Subject: [PATCH 0818/1815] add close btn to inline chat (#243319)

---
 .../inlineChat/browser/inlineChatActions.ts      | 16 +++++++++++-----
 .../inlineChat/browser/inlineChatZoneWidget.ts   |  3 ++-
 .../contrib/inlineChat/common/inlineChat.ts      |  2 ++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
index 7fa126eccc01..434bffb469db 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts
@@ -11,7 +11,7 @@ import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diff
 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_AGENT, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, 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, CTX_INLINE_CHAT_HAS_AGENT2 } from '../common/inlineChat.js';
+import { ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, 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, CTX_INLINE_CHAT_HAS_AGENT2, MENU_INLINE_CHAT_SIDE } from '../common/inlineChat.js';
 import { ctxIsGlobalEditingSession, ctxRequestCount } from '../../chat/browser/chatEditing/chatEditingEditorContextKeys.js';
 import { localize, localize2 } from '../../../../nls.js';
 import { Action2, IAction2Options, MenuId } from '../../../../platform/actions/common/actions.js';
@@ -577,20 +577,26 @@ abstract class AbstractInline2ChatAction extends EditorAction2 {
 }
 
 export class StopSessionAction2 extends AbstractInline2ChatAction {
+
 	constructor() {
 		super({
 			id: 'inlineChat2.stop',
-			title: localize2('stop', "Stop"),
+			title: localize2('stop', "Undo & Close"),
 			f1: true,
+			icon: Codicon.close,
 			precondition: CTX_INLINE_CHAT_VISIBLE,
 			keybinding: [{
-				weight: KeybindingWeight.WorkbenchContrib,
-				primary: KeyCode.Escape,
-			}, {
 				when: ctxRequestCount.isEqualTo(0),
 				weight: KeybindingWeight.WorkbenchContrib,
 				primary: KeyMod.CtrlCmd | KeyCode.KeyI,
+			}, {
+				weight: KeybindingWeight.WorkbenchContrib,
+				primary: KeyCode.Escape,
 			}],
+			menu: {
+				id: MENU_INLINE_CHAT_SIDE,
+				group: 'navigation',
+			}
 		});
 	}
 
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts
index 138b51910c44..838360429399 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.ts
@@ -22,7 +22,7 @@ import { ILogService } from '../../../../platform/log/common/log.js';
 import { IChatWidgetViewOptions } from '../../chat/browser/chat.js';
 import { IChatWidgetLocationOptions } from '../../chat/browser/chatWidget.js';
 import { isResponseVM } from '../../chat/common/chatViewModel.js';
-import { ACTION_REGENERATE_RESPONSE, ACTION_REPORT_ISSUE, ACTION_TOGGLE_DIFF, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_WIDGET_SECONDARY, MENU_INLINE_CHAT_WIDGET_STATUS } from '../common/inlineChat.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';
 
 export class InlineChatZoneWidget extends ZoneWidget {
@@ -81,6 +81,7 @@ export class InlineChatZoneWidget extends ZoneWidget {
 			chatWidgetViewOptions: {
 				menus: {
 					telemetrySource: 'interactiveEditorWidget-toolbar',
+					inputSideToolbar: MENU_INLINE_CHAT_SIDE
 				},
 				...options,
 				rendererOptions: {
diff --git a/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts b/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts
index d2a96c1d2cd8..3b6979b8f10b 100644
--- a/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts
+++ b/src/vs/workbench/contrib/inlineChat/common/inlineChat.ts
@@ -106,6 +106,8 @@ export const MENU_INLINE_CHAT_WIDGET_STATUS = MenuId.for('inlineChatWidget.statu
 export const MENU_INLINE_CHAT_WIDGET_SECONDARY = MenuId.for('inlineChatWidget.secondary');
 export const MENU_INLINE_CHAT_ZONE = MenuId.for('inlineChatWidget.changesZone');
 
+export const MENU_INLINE_CHAT_SIDE = MenuId.for('inlineChatWidget.side');
+
 // --- colors
 
 

From bdc8c075801f95287c92d7040ce63d9448f082ab Mon Sep 17 00:00:00 2001
From: Simon Lamon <32477463+silamon@users.noreply.github.com>
Date: Wed, 12 Mar 2025 11:07:22 +0100
Subject: [PATCH 0819/1815] High contrast gutter items (#240906)

High contract gutter items
---
 build/lib/stylelint/vscode-known-variables.json   |  2 ++
 src/vs/editor/browser/widget/diffEditor/style.css |  3 ++-
 src/vs/workbench/contrib/scm/common/quickDiff.ts  | 11 ++++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
index 9a5b08022b64..6b8419291cb6 100644
--- a/build/lib/stylelint/vscode-known-variables.json
+++ b/build/lib/stylelint/vscode-known-variables.json
@@ -232,6 +232,8 @@
 		"--vscode-editorGutter-commentGlyphForeground",
 		"--vscode-editorGutter-commentRangeForeground",
 		"--vscode-editorGutter-commentUnresolvedGlyphForeground",
+		"--vscode-editorGutter-itemGlyphForeground",
+		"--vscode-editorGutter-itemBackground",
 		"--vscode-editorGutter-deletedBackground",
 		"--vscode-editorGutter-foldingControlForeground",
 		"--vscode-editorGutter-modifiedBackground",
diff --git a/src/vs/editor/browser/widget/diffEditor/style.css b/src/vs/editor/browser/widget/diffEditor/style.css
index 8c027c33e1ce..8a461de93ef4 100644
--- a/src/vs/editor/browser/widget/diffEditor/style.css
+++ b/src/vs/editor/browser/widget/diffEditor/style.css
@@ -382,7 +382,7 @@
 					.actions-container {
 						width: fit-content;
 						border-radius: 4px;
-						background: var(--vscode-editorGutter-commentRangeForeground);
+						background: var(--vscode-editorGutter-itemBackground);
 
 						.action-item {
 							&:hover {
@@ -390,6 +390,7 @@
 							}
 
 							.action-label {
+								color: var(--vscode-editorGutter-itemGlyphForeground);
 								padding: 1px 2px;
 							}
 						}
diff --git a/src/vs/workbench/contrib/scm/common/quickDiff.ts b/src/vs/workbench/contrib/scm/common/quickDiff.ts
index 55cd69561f08..60dd34b399e1 100644
--- a/src/vs/workbench/contrib/scm/common/quickDiff.ts
+++ b/src/vs/workbench/contrib/scm/common/quickDiff.ts
@@ -14,7 +14,10 @@ import { LineRangeMapping } from '../../../../editor/common/diff/rangeMapping.js
 import { IChange } from '../../../../editor/common/diff/legacyLinesDiffComputer.js';
 import { IColorTheme } from '../../../../platform/theme/common/themeService.js';
 import { Color } from '../../../../base/common/color.js';
-import { editorErrorForeground, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
+import {
+	darken, editorBackground, editorForeground, listInactiveSelectionBackground, opaque,
+	editorErrorForeground, registerColor, transparent
+} from '../../../../platform/theme/common/colorRegistry.js';
 
 export const IQuickDiffService = createDecorator<IQuickDiffService>('quickDiff');
 
@@ -45,6 +48,12 @@ export const overviewRulerAddedForeground = registerColor('editorOverviewRuler.a
 export const overviewRulerDeletedForeground = registerColor('editorOverviewRuler.deletedForeground',
 	transparent(editorGutterDeletedBackground, 0.6), nls.localize('overviewRulerDeletedForeground', 'Overview ruler marker color for deleted content.'));
 
+export const editorGutterItemGlyphForeground = registerColor('editorGutter.itemGlyphForeground',
+	{ dark: editorForeground, light: editorForeground, hcDark: Color.black, hcLight: Color.white },
+	nls.localize('editorGutterItemGlyphForeground', 'Editor gutter decoration color for gutter item glyphs.')
+);
+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.'));
+
 export interface QuickDiffProvider {
 	label: string;
 	rootUri: URI | undefined;

From 94ee396f8464609258676ee1705370d450edf748 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Wed, 12 Mar 2025 11:12:18 +0100
Subject: [PATCH 0820/1815] Enable tree sitter for typescript (#243322)

---
 .vscode/settings.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index f3e04c8f8934..1116a4903f5c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -177,5 +177,6 @@
 		"*": "error",
 		"ts": "warning",
 		"eslint": "warning"
-	}
+	},
+	"editor.experimental.preferTreeSitter.typescript": true
 }

From 255c12ce12a8d38721bb337346b6b11d3d57dede Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Wed, 12 Mar 2025 11:12:36 +0100
Subject: [PATCH 0821/1815] Fix tab progress with different tab sizings
 (#243321)

fixes https://github.com/microsoft/vscode/issues/242661
---
 .../browser/parts/editor/media/multieditortabscontrol.css     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
index b9375b27dc2c..31c863e9901f 100644
--- a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
@@ -345,7 +345,7 @@
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container >  .tab.sizing-shrink > .tab-label.tab-label-has-badge::after,
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container >  .tab.sizing-fixed > .tab-label.tab-label-has-badge::after {
-	padding-right: 5px; /* with tab sizing shrink/fixed and badges, we want a right-padding because the close button is hidden */
+	margin-right: 5px; /* with tab sizing shrink/fixed and badges, we want a right-margin because the close button is hidden. Use margin instead of padding to support animating the badge (https://github.com/microsoft/vscode/issues/242661) */
 }
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink:not(.tab-actions-left):not(.close-action-off) .tab-label {
@@ -386,7 +386,7 @@
 	 * fully without clipping in case the parent container has `overflow: hidden`
 	 * and/or `flex: none`. We added those styles to fix other issues so a pragmatic
 	 * solution is to give the label container a bit more room to fully render.
-	 * 
+	 *
 	 * Refs: https://github.com/microsoft/vscode/issues/207409
 	 */
 	padding-right: 1px;

From 8c0bf90908836410fcb1099a7c550a34f36f0ffc Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 12 Mar 2025 04:48:35 -0700
Subject: [PATCH 0822/1815] Improve name active -> pending

Part of #242195
---
 .../api/common/extHostTerminalShellIntegration.ts  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
index fbbe2863ea45..8dcc66143012 100644
--- a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
@@ -150,7 +150,7 @@ export class ExtHostTerminalShellIntegration extends Disposable implements IExtH
 }
 
 class InternalTerminalShellIntegration extends Disposable {
-	private _activeExecutions: InternalTerminalShellExecution[] = [];
+	private _pendingExecutions: InternalTerminalShellExecution[] = [];
 
 	private _currentExecution: InternalTerminalShellExecution | undefined;
 	get currentExecution(): InternalTerminalShellExecution | undefined { return this._currentExecution; }
@@ -220,7 +220,7 @@ class InternalTerminalShellIntegration extends Disposable {
 
 	requestNewShellExecution(commandLine: vscode.TerminalShellExecutionCommandLine, cwd: URI | undefined) {
 		const execution = new InternalTerminalShellExecution(commandLine, cwd ?? this._cwd);
-		this._activeExecutions.push(execution);
+		this._pendingExecutions.push(execution);
 		this._onDidRequestNewExecution.fire(commandLine.value);
 		return execution;
 	}
@@ -234,16 +234,16 @@ class InternalTerminalShellIntegration extends Disposable {
 			this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value, exitCode: undefined });
 		}
 
-		// Get the active execution, how strict this is depends on whether the terminal has rich
-		// command detection
+		// Get the matching pending execution, how strict this is depends on the confidence of the
+		// command line
 		let currentExecution: InternalTerminalShellExecution | undefined;
 		if (commandLine.confidence === TerminalShellExecutionCommandLineConfidence.High) {
-			const index = this._activeExecutions.findIndex(e => e.value.commandLine.value === commandLine.value);
+			const index = this._pendingExecutions.findIndex(e => e.value.commandLine.value === commandLine.value);
 			if (index !== -1) {
-				currentExecution = this._activeExecutions.splice(index, 1)[0];
+				currentExecution = this._pendingExecutions.splice(index, 1)[0];
 			}
 		} else {
-			currentExecution = this._activeExecutions.shift();
+			currentExecution = this._pendingExecutions.shift();
 		}
 
 		// If there is no execution, create a new one

From 6e072ba61f6119d23ae3cd5b1a70eb67b7164887 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 12 Mar 2025 05:10:58 -0700
Subject: [PATCH 0823/1815] Require chat enabled as precond for terminal
 actions

Fixes #243306
---
 .../chat/browser/terminalChatActions.ts             | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
index 782aca3edb12..a18ee7ae7dd9 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
@@ -10,6 +10,7 @@ import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contex
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IChatWidgetService } from '../../../chat/browser/chat.js';
 import { ChatAgentLocation } from '../../../chat/common/chatAgents.js';
+import { ChatContextKeys } from '../../../chat/common/chatContextKeys.js';
 import { IChatService } from '../../../chat/common/chatService.js';
 import { AbstractInline1ChatAction } from '../../../inlineChat/browser/inlineChatActions.js';
 import { isDetachedTerminalInstance } from '../../../terminal/browser/terminal.js';
@@ -30,6 +31,7 @@ registerActiveXtermAction({
 	},
 	f1: true,
 	precondition: ContextKeyExpr.and(
+		ChatContextKeys.enabled,
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
 		TerminalChatContextKeys.hasChatAgent
 	),
@@ -74,7 +76,10 @@ registerActiveXtermAction({
 	}],
 	icon: Codicon.close,
 	f1: true,
-	precondition: TerminalChatContextKeys.visible,
+	precondition: ContextKeyExpr.and(
+		ChatContextKeys.enabled,
+		TerminalChatContextKeys.visible,
+	),
 	run: (_xterm, _accessor, activeInstance) => {
 		if (isDetachedTerminalInstance(activeInstance)) {
 			return;
@@ -90,6 +95,7 @@ registerActiveXtermAction({
 	shortTitle: localize2('run', 'Run'),
 	category: AbstractInline1ChatAction.category,
 	precondition: ContextKeyExpr.and(
+		ChatContextKeys.enabled,
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
 		TerminalChatContextKeys.requestActive.negate(),
 		TerminalChatContextKeys.responseContainsCodeBlock,
@@ -122,6 +128,7 @@ registerActiveXtermAction({
 	shortTitle: localize2('runFirst', 'Run First'),
 	category: AbstractInline1ChatAction.category,
 	precondition: ContextKeyExpr.and(
+		ChatContextKeys.enabled,
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
 		TerminalChatContextKeys.requestActive.negate(),
 		TerminalChatContextKeys.responseContainsMultipleCodeBlocks
@@ -154,6 +161,7 @@ registerActiveXtermAction({
 	category: AbstractInline1ChatAction.category,
 	icon: Codicon.insert,
 	precondition: ContextKeyExpr.and(
+		ChatContextKeys.enabled,
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
 		TerminalChatContextKeys.requestActive.negate(),
 		TerminalChatContextKeys.responseContainsCodeBlock,
@@ -186,6 +194,7 @@ registerActiveXtermAction({
 	shortTitle: localize2('insertFirst', 'Insert First'),
 	category: AbstractInline1ChatAction.category,
 	precondition: ContextKeyExpr.and(
+		ChatContextKeys.enabled,
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
 		TerminalChatContextKeys.requestActive.negate(),
 		TerminalChatContextKeys.responseContainsMultipleCodeBlocks
@@ -218,6 +227,7 @@ registerActiveXtermAction({
 	icon: Codicon.refresh,
 	category: AbstractInline1ChatAction.category,
 	precondition: ContextKeyExpr.and(
+		ChatContextKeys.enabled,
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
 		TerminalChatContextKeys.requestActive.negate(),
 	),
@@ -259,6 +269,7 @@ registerActiveXtermAction({
 	title: localize2('viewInChat', 'View in Chat'),
 	category: AbstractInline1ChatAction.category,
 	precondition: ContextKeyExpr.and(
+		ChatContextKeys.enabled,
 		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
 		TerminalChatContextKeys.requestActive.negate(),
 	),

From d81f6ad5b8fe26ed793a47e6911d75bafee7b3de Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 12 Mar 2025 05:49:08 -0700
Subject: [PATCH 0824/1815] Improve docs for 633 D sequence

Fixes #179913
---
 .../platform/terminal/common/xterm/shellIntegrationAddon.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
index a4489849b2c8..f17dbb5be08e 100644
--- a/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
+++ b/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.ts
@@ -131,8 +131,10 @@ const enum VSCodeOscPt {
 	CommandExecuted = 'C',
 
 	/**
-	 * Sent just after a command has finished. The exit code is optional, when not specified it
-	 * means no command was run (ie. enter on empty prompt or ctrl+c).
+	 * Sent just after a command has finished. This should generally be used on the new line
+	 * following the end of a command's output, just before {@link PromptStart}. The exit code is
+	 * optional, when not specified it means no command was run (ie. enter on empty prompt or
+	 * ctrl+c).
 	 *
 	 * Format: `OSC 633 ; D [; <ExitCode>] ST`
 	 *

From ca677df9f5b397233ab0fd90658d039e47275f5d Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 12 Mar 2025 06:39:26 -0700
Subject: [PATCH 0825/1815] Hide terminal hover details by default

Fixes #242103
---
 .../browser/environmentVariableInfo.ts        |  3 +-
 .../terminal/browser/terminalTabbedView.ts    |  2 +-
 .../terminal/browser/terminalTabsList.ts      | 11 +++--
 .../terminal/browser/terminalTooltip.ts       | 47 +++++++++++++++----
 .../contrib/terminal/browser/terminalView.ts  |  6 ++-
 .../contrib/terminal/common/terminal.ts       |  4 ++
 .../terminal/common/terminalStorageKeys.ts    |  1 +
 7 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.ts b/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.ts
index 1ec81c70b9f1..9da2be1b5f23 100644
--- a/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.ts
+++ b/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.ts
@@ -87,7 +87,8 @@ export class EnvironmentVariableInfoChangesActive implements IEnvironmentVariabl
 		return {
 			id: TerminalStatus.EnvironmentVariableInfoChangesActive,
 			severity: Severity.Info,
-			tooltip: this._getInfo(scope),
+			tooltip: undefined, // The action is present when details aren't shown
+			detailedTooltip: this._getInfo(scope),
 			hoverActions: this._getActions(scope)
 		};
 	}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
index 872391084be5..66792ebeccba 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
@@ -459,7 +459,7 @@ export class TerminalTabbedView extends Disposable {
 			return;
 		}
 		this._hoverService.showHover({
-			...getInstanceHoverInfo(instance),
+			...getInstanceHoverInfo(instance, this._storageService),
 			target: this._terminalContainer,
 			trapFocus: true
 		}, true);
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
index 5d8140d604bd..2b280ca8712d 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
@@ -53,6 +53,8 @@ import { TerminalContextActionRunner } from './terminalContextMenu.js';
 import type { IHoverAction } from '../../../../base/browser/ui/hover/hover.js';
 import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
+import { TerminalStorageKeys } from '../common/terminalStorageKeys.js';
 
 const $ = DOM.$;
 
@@ -82,6 +84,7 @@ export class TerminalTabList extends WorkbenchList<ITerminalInstance> {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IDecorationsService decorationsService: IDecorationsService,
 		@IThemeService private readonly _themeService: IThemeService,
+		@IStorageService private readonly _storageService: IStorageService,
 		@ILifecycleService lifecycleService: ILifecycleService,
 		@IHoverService private readonly _hoverService: IHoverService,
 	) {
@@ -128,7 +131,8 @@ export class TerminalTabList extends WorkbenchList<ITerminalInstance> {
 					this.reveal(i);
 				}
 				this.refresh();
-			})
+			}),
+			this._storageService.onDidChangeValue(StorageScope.APPLICATION, TerminalStorageKeys.TabsShowDetailed, this.disposables)(() => this.refresh()),
 		];
 
 		// Dispose of instance listeners on shutdown to avoid extra work and so tabs don't disappear
@@ -230,7 +234,7 @@ export class TerminalTabList extends WorkbenchList<ITerminalInstance> {
 		}
 
 		this._hoverService.showHover({
-			...getInstanceHoverInfo(instance),
+			...getInstanceHoverInfo(instance, this._storageService),
 			target: this.getHTMLElement(),
 			trapFocus: true
 		}, true);
@@ -257,6 +261,7 @@ class TerminalTabsRenderer extends Disposable implements IListRenderer<ITerminal
 		@IHoverService private readonly _hoverService: IHoverService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@IListService private readonly _listService: IListService,
+		@IStorageService private readonly _storageService: IStorageService,
 		@IThemeService private readonly _themeService: IThemeService,
 		@IContextViewService private readonly _contextViewService: IContextViewService,
 		@ICommandService private readonly _commandService: ICommandService,
@@ -339,7 +344,7 @@ class TerminalTabsRenderer extends Disposable implements IListRenderer<ITerminal
 			}
 		}
 
-		const hoverInfo = getInstanceHoverInfo(instance);
+		const hoverInfo = getInstanceHoverInfo(instance, this._storageService);
 		template.context.hoverActions = hoverInfo.actions;
 
 		const iconId = this._instantiationService.invokeFunction(getIconId, instance);
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts b/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts
index 8213adb69af9..d81b5a037d19 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTooltip.ts
@@ -11,25 +11,45 @@ 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 { 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';
 
-export function getInstanceHoverInfo(instance: ITerminalInstance): { content: MarkdownString; actions: IHoverAction[] } {
+export function getInstanceHoverInfo(instance: ITerminalInstance, storageService: IStorageService): { content: MarkdownString; actions: IHoverAction[] } {
+	const showDetailed = parseInt(storageService.get(TerminalStorageKeys.TabsShowDetailed, StorageScope.APPLICATION) ?? '0');
 	let statusString = '';
 	const statuses = instance.statusList.statuses;
-	const actions = [];
+	const actions: ITerminalStatusHoverAction[] = [];
 	for (const status of statuses) {
-		statusString += `\n\n---\n\n${status.icon ? `$(${status.icon?.id}) ` : ''}${status.tooltip || status.id}`;
+		if (showDetailed) {
+			if (status.detailedTooltip ?? status.tooltip) {
+				statusString += `\n\n---\n\n${status.icon ? `$(${status.icon?.id}) ` : ''}` + (status.detailedTooltip ?? status.tooltip ?? '');
+			}
+		} else {
+			if (status.tooltip) {
+				statusString += `\n\n---\n\n${status.icon ? `$(${status.icon?.id}) ` : ''}` + (status.tooltip ?? '');
+			}
+		}
 		if (status.hoverActions) {
 			actions.push(...status.hoverActions);
 		}
 	}
+	actions.push({
+		commandId: 'toggleDetailedInfo',
+		label: showDetailed ? localize('hideDetails', 'Hide Details') : localize('showDetails', 'Show Details'),
+		run() {
+			storageService.store(TerminalStorageKeys.TabsShowDetailed, (showDetailed + 1) % 2, StorageScope.APPLICATION, StorageTarget.USER);
+		},
+	});
 
-	const shellProcessString = getShellProcessTooltip(instance, true);
+	const shellProcessString = getShellProcessTooltip(instance, !!showDetailed);
 	const content = new MarkdownString(instance.title + shellProcessString + statusString, { supportThemeIcons: true });
 
 	return { content, actions };
 }
 
-export function getShellProcessTooltip(instance: ITerminalInstance, markdown: boolean): string {
+export function getShellProcessTooltip(instance: ITerminalInstance, showDetailed: boolean): string {
 	const lines: string[] = [];
 
 	if (instance.processId && instance.processId > 0) {
@@ -37,8 +57,16 @@ export function getShellProcessTooltip(instance: ITerminalInstance, markdown: bo
 	}
 
 	if (instance.shellLaunchConfig.executable) {
-		let commandLine = instance.shellLaunchConfig.executable;
-		const args = asArray(instance.injectedArgs || instance.shellLaunchConfig.args || []).map(x => `'${x}'`).join(' ');
+		let commandLine = '';
+		if (!showDetailed && instance.shellLaunchConfig.executable.length > 32) {
+			const base = basename(instance.shellLaunchConfig.executable);
+			const sepIndex = instance.shellLaunchConfig.executable.length - base.length - 1;
+			const sep = instance.shellLaunchConfig.executable.substring(sepIndex, sepIndex + 1);
+			commandLine += `…${sep}${base}`;
+		} else {
+			commandLine += instance.shellLaunchConfig.executable;
+		}
+		const args = asArray(instance.injectedArgs || instance.shellLaunchConfig.args || []).map(x => x.match(/\s/) ? `'${x}'` : x).join(' ');
 		if (args) {
 			commandLine += ` ${args}`;
 		}
@@ -46,7 +74,7 @@ export function getShellProcessTooltip(instance: ITerminalInstance, markdown: bo
 		lines.push(localize('shellProcessTooltip.commandLine', 'Command line: {0}', commandLine));
 	}
 
-	return lines.length ? `${markdown ? '\n\n---\n\n' : '\n\n'}${lines.join('\n')}` : '';
+	return lines.length ? `\n\n---\n\n${lines.join('\n')}` : '';
 }
 
 export function refreshShellIntegrationInfoStatus(instance: ITerminalInstance) {
@@ -71,6 +99,7 @@ export function refreshShellIntegrationInfoStatus(instance: ITerminalInstance) {
 	instance.statusList.add({
 		id: TerminalStatus.ShellIntegrationInfo,
 		severity: Severity.Info,
-		tooltip: `${localize('shellIntegration', "Shell integration")}: ${cmdDetectionType}${seenSequencesString}`
+		tooltip: `${localize('shellIntegration', "Shell integration")}: ${cmdDetectionType}`,
+		detailedTooltip: `${localize('shellIntegration', "Shell integration")}: ${cmdDetectionType}${seenSequencesString}`
 	});
 }
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
index 7e22be4d682a..5390345ee238 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
@@ -50,6 +50,7 @@ import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
 import { InstanceContext, TerminalContextActionRunner } from './terminalContextMenu.js';
 import { MicrotaskDelay } from '../../../../base/common/symbols.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
 
 export class TerminalViewPane extends ViewPane {
 	private _parentDomElement: HTMLElement | undefined;
@@ -660,7 +661,8 @@ class SingleTabHoverDelegate implements IHoverDelegate {
 	constructor(
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IHoverService private readonly _hoverService: IHoverService,
-		@ITerminalGroupService private readonly _terminalGroupService: ITerminalGroupService
+		@IStorageService private readonly _storageService: IStorageService,
+		@ITerminalGroupService private readonly _terminalGroupService: ITerminalGroupService,
 	) {
 	}
 
@@ -675,7 +677,7 @@ class SingleTabHoverDelegate implements IHoverDelegate {
 		if (!instance) {
 			return;
 		}
-		const hoverInfo = getInstanceHoverInfo(instance);
+		const hoverInfo = getInstanceHoverInfo(instance, this._storageService);
 		return this._hoverService.showHover({
 			...options,
 			content: hoverInfo.content,
diff --git a/src/vs/workbench/contrib/terminal/common/terminal.ts b/src/vs/workbench/contrib/terminal/common/terminal.ts
index 2a717f4a7ede..3683a60a46bc 100644
--- a/src/vs/workbench/contrib/terminal/common/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminal.ts
@@ -370,6 +370,10 @@ export interface ITerminalStatus {
 	 * What to show for this status in the terminal's hover.
 	 */
 	tooltip?: string | undefined;
+	/**
+	 * What to show for this status in the terminal's hover when details are toggled.
+	 */
+	detailedTooltip?: string | undefined;
 	/**
 	 * Actions to expose on hover.
 	 */
diff --git a/src/vs/workbench/contrib/terminal/common/terminalStorageKeys.ts b/src/vs/workbench/contrib/terminal/common/terminalStorageKeys.ts
index 6a495eca81b5..915da5be4200 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalStorageKeys.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalStorageKeys.ts
@@ -7,6 +7,7 @@ export const enum TerminalStorageKeys {
 	SuggestedRendererType = 'terminal.integrated.suggestedRendererType',
 	TabsListWidthHorizontal = 'tabs-list-width-horizontal',
 	TabsListWidthVertical = 'tabs-list-width-vertical',
+	TabsShowDetailed = 'terminal.integrated.tabs.showDetailed',
 	DeprecatedEnvironmentVariableCollections = 'terminal.integrated.environmentVariableCollections',
 	EnvironmentVariableCollections = 'terminal.integrated.environmentVariableCollectionsV2',
 	TerminalBufferState = 'terminal.integrated.bufferState',

From c65d27807b48dbaf8f294a565d442440a40c52ac Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 12 Mar 2025 06:48:22 -0700
Subject: [PATCH 0826/1815] showHover -> showInstantHover

This rename and moving the interface a little lower is designed to
dissuade the use of the API in favor of the delayed ones.

Part of #243348
---
 src/vs/base/browser/ui/hover/hover.ts         | 56 +++++++++----------
 .../base/browser/ui/hover/hoverDelegate2.ts   |  2 +-
 .../services/hoverService/hoverService.ts     | 10 ++--
 .../components/gutterIndicatorView.ts         |  2 +-
 src/vs/platform/hover/browser/hover.ts        |  2 +-
 .../hover/test/browser/nullHoverService.ts    |  2 +-
 .../contrib/chat/browser/chatListRenderer.ts  |  2 +-
 .../contrib/debug/browser/breakpointsView.ts  |  2 +-
 .../browser/extensionFeaturesTab.ts           |  2 +-
 .../extensions/browser/extensionsWidgets.ts   |  2 +-
 .../browser/view/cellParts/cellStatusPart.ts  |  2 +-
 .../settingsEditorSettingIndicators.ts        | 12 ++--
 .../terminal/browser/terminalIconPicker.ts    |  2 +-
 .../terminal/browser/terminalTabbedView.ts    |  2 +-
 .../terminal/browser/terminalTabsList.ts      |  2 +-
 .../contrib/terminal/browser/terminalView.ts  |  2 +-
 .../browser/widgets/terminalHoverWidget.ts    |  2 +-
 .../browser/userDataProfilesEditor.ts         |  2 +-
 18 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/src/vs/base/browser/ui/hover/hover.ts b/src/vs/base/browser/ui/hover/hover.ts
index be6a8ab1ace1..6b877ec17fdb 100644
--- a/src/vs/base/browser/ui/hover/hover.ts
+++ b/src/vs/base/browser/ui/hover/hover.ts
@@ -13,32 +13,6 @@ import type { IDisposable } from '../../../common/lifecycle.js';
  * Enables the convenient display of rich markdown-based hovers in the workbench.
  */
 export interface IHoverDelegate2 {
-	/**
-	 * Shows a hover immediately, provided a hover with the same {@link options} object is not
-	 * already visible.
-	 *
-	 * Use this method when you want to:
-	 *
-	 * - Control showing the hover yourself.
-	 * - Show the hover immediately.
-	 *
-	 * @param options A set of options defining the characteristics of the hover.
-	 * @param focus Whether to focus the hover (useful for keyboard accessibility).
-	 *
-	 * @example A simple usage with a single element target.
-	 *
-	 * ```typescript
-	 * showHover({
-	 *   text: new MarkdownString('Hello world'),
-	 *   target: someElement
-	 * });
-	 * ```
-	 */
-	showHover(
-		options: IHoverOptions,
-		focus?: boolean
-	): IHoverWidget | undefined;
-
 	/**
 	 * Shows a hover after a delay, or immediately if the {@link groupId} matches the currently
 	 * shown hover.
@@ -100,6 +74,32 @@ export interface IHoverDelegate2 {
 		lifecycleOptions?: IHoverLifecycleOptions,
 	): IDisposable;
 
+	/**
+	 * Shows a hover immediately, provided a hover with the same {@link options} object is not
+	 * already visible.
+	 *
+	 * Use this method when you want to:
+	 *
+	 * - Control showing the hover yourself.
+	 * - Show the hover immediately.
+	 *
+	 * @param options A set of options defining the characteristics of the hover.
+	 * @param focus Whether to focus the hover (useful for keyboard accessibility).
+	 *
+	 * @example A simple usage with a single element target.
+	 *
+	 * ```typescript
+	 * showInstantHover({
+	 *   text: new MarkdownString('Hello world'),
+	 *   target: someElement
+	 * });
+	 * ```
+	 */
+	showInstantHover(
+		options: IHoverOptions,
+		focus?: boolean
+	): IHoverWidget | undefined;
+
 	/**
 	 * Hides the hover if it was visible. This call will be ignored if the hover is currently
 	 * "locked" via the alt/option key unless `force` is set.
@@ -116,8 +116,8 @@ export interface IHoverDelegate2 {
 	 * Sets up a managed hover for the given element. A managed hover will set up listeners for
 	 * mouse events, show the hover after a delay and provide hooks to easily update the content.
 	 *
-	 * This should be used over {@link showHover} when fine-grained control is not needed. The
-	 * managed hover also does not scale well, consider using {@link showHover} when showing hovers
+	 * This should be used over {@link showInstantHover} when fine-grained control is not needed. The
+	 * managed hover also does not scale well, consider using {@link showInstantHover} when showing hovers
 	 * for many elements.
 	 *
 	 * @param hoverDelegate The hover delegate containing hooks and configuration for the hover.
diff --git a/src/vs/base/browser/ui/hover/hoverDelegate2.ts b/src/vs/base/browser/ui/hover/hoverDelegate2.ts
index 05b4c692d940..b49cb84951c5 100644
--- a/src/vs/base/browser/ui/hover/hoverDelegate2.ts
+++ b/src/vs/base/browser/ui/hover/hoverDelegate2.ts
@@ -7,7 +7,7 @@ import { Disposable } from '../../../common/lifecycle.js';
 import type { IHoverDelegate2 } from './hover.js';
 
 let baseHoverDelegate: IHoverDelegate2 = {
-	showHover: () => undefined,
+	showInstantHover: () => undefined,
 	showDelayedHover: () => undefined,
 	setupDelayedHover: () => Disposable.None,
 	setupDelayedHoverAtMouse: () => Disposable.None,
diff --git a/src/vs/editor/browser/services/hoverService/hoverService.ts b/src/vs/editor/browser/services/hoverService/hoverService.ts
index 25d55d9e9cd5..523378c4c79f 100644
--- a/src/vs/editor/browser/services/hoverService/hoverService.ts
+++ b/src/vs/editor/browser/services/hoverService/hoverService.ts
@@ -69,7 +69,7 @@ export class HoverService extends Disposable implements IHoverService {
 		}));
 	}
 
-	showHover(options: IHoverOptions, focus?: boolean, skipLastFocusedUpdate?: boolean, dontShow?: boolean): IHoverWidget | undefined {
+	showInstantHover(options: IHoverOptions, focus?: boolean, skipLastFocusedUpdate?: boolean, dontShow?: boolean): IHoverWidget | undefined {
 		const hover = this._createHover(options, skipLastFocusedUpdate);
 		if (!hover) {
 			return undefined;
@@ -100,7 +100,7 @@ export class HoverService extends Disposable implements IHoverService {
 
 			// Check group identity, if it's the same skip the delay and show the hover immediately
 			if (this._currentHover && !this._currentHover.isDisposed && this._currentDelayedHoverGroupId !== undefined && this._currentDelayedHoverGroupId === lifecycleOptions?.groupId) {
-				return this.showHover({
+				return this.showInstantHover({
 					...options,
 					appearance: {
 						...options.appearance,
@@ -177,12 +177,12 @@ export class HoverService extends Disposable implements IHoverService {
 			store.add(addDisposableListener(target, EventType.KEY_DOWN, e => {
 				const evt = new StandardKeyboardEvent(e);
 				if (evt.equals(KeyCode.Space) || evt.equals(KeyCode.Enter)) {
-					this.showHover(resolveHoverOptions(), true);
+					this.showInstantHover(resolveHoverOptions(), true);
 				}
 			}));
 		}
 
-		this._delayedHovers.set(target, { show: (focus: boolean) => { this.showHover(resolveHoverOptions(), focus); } });
+		this._delayedHovers.set(target, { show: (focus: boolean) => { this.showInstantHover(resolveHoverOptions(), focus); } });
 		store.add(toDisposable(() => this._delayedHovers.delete(target)));
 
 		return store;
@@ -320,7 +320,7 @@ export class HoverService extends Disposable implements IHoverService {
 		if (!this._lastHoverOptions) {
 			return;
 		}
-		this.showHover(this._lastHoverOptions, true, true);
+		this.showInstantHover(this._lastHoverOptions, true, true);
 	}
 
 	private _showAndFocusHoverForActiveElement(): void {
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 8ec842d9fc59..7707dca9ab13 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
@@ -154,7 +154,7 @@ export class InlineEditsGutterIndicator extends Disposable {
 		disposableStore.add(focusTracker.onDidFocus(() => this._focusIsInMenu.set(true, undefined)));
 		disposableStore.add(toDisposable(() => this._focusIsInMenu.set(false, undefined)));
 
-		const h = this._hoverService.showHover({
+		const h = this._hoverService.showInstantHover({
 			target: this._iconRef.element,
 			content: content.element,
 		}) as HoverWidget | undefined;
diff --git a/src/vs/platform/hover/browser/hover.ts b/src/vs/platform/hover/browser/hover.ts
index f2651c086d15..01fcf3cb7a34 100644
--- a/src/vs/platform/hover/browser/hover.ts
+++ b/src/vs/platform/hover/browser/hover.ts
@@ -79,7 +79,7 @@ export class WorkbenchHoverDelegate extends Disposable implements IHoverDelegate
 				? options.content.toString()
 				: options.content.value;
 
-		return this.hoverService.showHover({
+		return this.hoverService.showInstantHover({
 			...options,
 			...overrideOptions,
 			persistence: {
diff --git a/src/vs/platform/hover/test/browser/nullHoverService.ts b/src/vs/platform/hover/test/browser/nullHoverService.ts
index 4644330752bf..2f846c8e225b 100644
--- a/src/vs/platform/hover/test/browser/nullHoverService.ts
+++ b/src/vs/platform/hover/test/browser/nullHoverService.ts
@@ -9,7 +9,7 @@ import type { IHoverService } from '../../browser/hover.js';
 export const NullHoverService: IHoverService = {
 	_serviceBrand: undefined,
 	hideHover: () => undefined,
-	showHover: () => undefined,
+	showInstantHover: () => undefined,
 	showDelayedHover: () => undefined,
 	setupDelayedHover: () => Disposable.None,
 	setupDelayedHoverAtMouse: () => Disposable.None,
diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index 7bc69accb60c..9751c788d42c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -346,7 +346,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 			if (ev.equals(KeyCode.Space) || ev.equals(KeyCode.Enter)) {
 				const content = hoverContent();
 				if (content) {
-					this.hoverService.showHover({ content, target: user, trapFocus: true, actions: hoverOptions.actions }, true);
+					this.hoverService.showInstantHover({ content, target: user, trapFocus: true, actions: hoverOptions.actions }, true);
 				}
 			} else if (ev.equals(KeyCode.Escape)) {
 				this.hoverService.hideHover();
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
index f1879eac040f..0965dcaf6361 100644
--- a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
@@ -224,7 +224,7 @@ export class BreakpointsView extends ViewPane {
 		const iconLabelContainer = dom.append(container, $('span.breakpoint-warning'));
 		this.hintContainer = this._register(new IconLabel(iconLabelContainer, {
 			supportIcons: true, hoverDelegate: {
-				showHover: (options, focus?) => this.hoverService.showHover({ content: options.content, target: this.hintContainer!.element }, focus),
+				showHover: (options, focus?) => this.hoverService.showInstantHover({ content: options.content, target: this.hintContainer!.element }, focus),
 				delay: <number>this.configurationService.getValue('workbench.hover.delay')
 			}
 		}));
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts b/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts
index 57b0ea186ef1..0b90d652d3ff 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.ts
@@ -292,7 +292,7 @@ class RuntimeStatusMarkdownRenderer extends Disposable implements IExtensionFeat
 				highlightCircle.style.display = 'block';
 				tooltip.style.left = `${closestPoint.x + 24}px`;
 				tooltip.style.top = `${closestPoint.y + 14}px`;
-				hoverDisposable.value = this.hoverService.showHover({
+				hoverDisposable.value = this.hoverService.showInstantHover({
 					content: new MarkdownString(`${closestPoint.date}: ${closestPoint.count} requests`),
 					target: tooltip,
 					appearance: {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
index 17bba8cc4fa6..6fc27676d0e5 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
@@ -555,7 +555,7 @@ export class ExtensionHoverWidget extends ExtensionWidget {
 			this.hover.value = this.hoverService.setupManagedHover({
 				delay: this.configurationService.getValue<number>('workbench.hover.delay'),
 				showHover: (options, focus) => {
-					return this.hoverService.showHover({
+					return this.hoverService.showInstantHover({
 						...options,
 						additionalClasses: ['extension-hover'],
 						position: {
diff --git a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellStatusPart.ts b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellStatusPart.ts
index f58ff0aa23fd..a23d2f8b28ed 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellStatusPart.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellStatusPart.ts
@@ -79,7 +79,7 @@ export class CellEditorStatusBar extends CellContentPart {
 			readonly showHover = (options: IHoverDelegateOptions) => {
 				options.position = options.position ?? {};
 				options.position.hoverPosition = HoverPosition.ABOVE;
-				return hoverService.showHover(options);
+				return hoverService.showInstantHover(options);
 			};
 
 			readonly placement = 'element';
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts
index 678042ec78be..c669643a71af 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.ts
@@ -145,7 +145,7 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 
 		const content = localize('trustLabel', "The setting value can only be applied in a trusted workspace.");
 		const showHover = (focus: boolean) => {
-			return this.hoverService.showHover({
+			return this.hoverService.showInstantHover({
 				...this.defaultHoverOptions,
 				content,
 				target: workspaceTrustElement,
@@ -186,7 +186,7 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 
 		const syncIgnoredHoverContent = localize('syncIgnoredTitle', "This setting is ignored during sync");
 		const showHover = (focus: boolean) => {
-			return this.hoverService.showHover({
+			return this.hoverService.showInstantHover({
 				...this.defaultHoverOptions,
 				content: syncIgnoredHoverContent,
 				target: syncIgnoredElement
@@ -329,7 +329,7 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 
 		const content = isPreviewSetting ? PREVIEW_INDICATOR_DESCRIPTION : EXPERIMENTAL_INDICATOR_DESCRIPTION;
 		const showHover = (focus: boolean) => {
-			return this.hoverService.showHover({
+			return this.hoverService.showInstantHover({
 				...this.defaultHoverOptions,
 				content,
 				target: this.previewIndicator.element
@@ -374,7 +374,7 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 			this.scopeOverridesIndicator.label.text = '$(briefcase) ' + localize('policyLabelText', "Managed by organization");
 			const content = localize('policyDescription', "This setting is managed by your organization and its actual value cannot be changed.");
 			const showHover = (focus: boolean) => {
-				return this.hoverService.showHover({
+				return this.hoverService.showInstantHover({
 					...this.defaultHoverOptions,
 					content,
 					actions: [{
@@ -396,7 +396,7 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 
 			const content = localize('applicationSettingDescription', "The setting is not specific to the current profile, and will retain its value when switching profiles.");
 			const showHover = (focus: boolean) => {
-				return this.hoverService.showHover({
+				return this.hoverService.showInstantHover({
 					...this.defaultHoverOptions,
 					content,
 					target: this.scopeOverridesIndicator.element
@@ -512,7 +512,7 @@ export class SettingsTreeIndicatorsLabel implements IDisposable {
 			}
 
 			const showHover = (focus: boolean) => {
-				return this.hoverService.showHover({
+				return this.hoverService.showInstantHover({
 					content: new MarkdownString().appendMarkdown(defaultOverrideHoverContent),
 					target: this.defaultOverrideIndicator.element,
 					position: {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalIconPicker.ts b/src/vs/workbench/contrib/terminal/browser/terminalIconPicker.ts
index 4e295a44f372..f5f78bd178f7 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalIconPicker.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalIconPicker.ts
@@ -58,7 +58,7 @@ export class TerminalIconPicker extends Disposable {
 				this._iconSelectBox.dispose();
 			}));
 			this._iconSelectBox.clearInput();
-			const hoverWidget = this._hoverService.showHover({
+			const hoverWidget = this._hoverService.showInstantHover({
 				content: this._iconSelectBox.domNode,
 				target: getActiveDocument().body,
 				position: {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
index 872391084be5..a776866b2110 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
@@ -458,7 +458,7 @@ export class TerminalTabbedView extends Disposable {
 		if (!instance) {
 			return;
 		}
-		this._hoverService.showHover({
+		this._hoverService.showInstantHover({
 			...getInstanceHoverInfo(instance),
 			target: this._terminalContainer,
 			trapFocus: true
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
index 5d8140d604bd..2829a26ef12d 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalTabsList.ts
@@ -229,7 +229,7 @@ export class TerminalTabList extends WorkbenchList<ITerminalInstance> {
 			return;
 		}
 
-		this._hoverService.showHover({
+		this._hoverService.showInstantHover({
 			...getInstanceHoverInfo(instance),
 			target: this.getHTMLElement(),
 			trapFocus: true
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
index 7e22be4d682a..d117bbeacd81 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
@@ -676,7 +676,7 @@ class SingleTabHoverDelegate implements IHoverDelegate {
 			return;
 		}
 		const hoverInfo = getInstanceHoverInfo(instance);
-		return this._hoverService.showHover({
+		return this._hoverService.showInstantHover({
 			...options,
 			content: hoverInfo.content,
 			actions: hoverInfo.actions
diff --git a/src/vs/workbench/contrib/terminal/browser/widgets/terminalHoverWidget.ts b/src/vs/workbench/contrib/terminal/browser/widgets/terminalHoverWidget.ts
index 235a4586fb8c..5f6aec126a00 100644
--- a/src/vs/workbench/contrib/terminal/browser/widgets/terminalHoverWidget.ts
+++ b/src/vs/workbench/contrib/terminal/browser/widgets/terminalHoverWidget.ts
@@ -44,7 +44,7 @@ export class TerminalHover extends Disposable implements ITerminalWidget {
 			return;
 		}
 		const target = new CellHoverTarget(container, this._targetOptions);
-		const hover = this._hoverService.showHover({
+		const hover = this._hoverService.showInstantHover({
 			target,
 			content: this._text,
 			actions: this._actions,
diff --git a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
index f4127ee477f6..04a696743504 100644
--- a/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
+++ b/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
@@ -1047,7 +1047,7 @@ class ProfileIconRenderer extends ProfilePropertyRenderer {
 				return;
 			}
 			iconSelectBox.clearInput();
-			hoverWidget = this.hoverService.showHover({
+			hoverWidget = this.hoverService.showInstantHover({
 				content: iconSelectBox.domNode,
 				target: iconElement,
 				position: {

From 870d14c7b395ec400d1d934a80b715cdafafcbf2 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Wed, 12 Mar 2025 10:24:22 -0400
Subject: [PATCH 0827/1815] add task status API (#243092)

---
 .../common/extensionsApiProposals.ts          |  3 +
 .../workbench/api/browser/mainThreadTask.ts   | 25 ++++++-
 .../workbench/api/common/extHost.api.impl.ts  |  5 ++
 .../workbench/api/common/extHost.protocol.ts  |  1 +
 src/vs/workbench/api/common/extHostTask.ts    | 22 ++++++
 src/vs/workbench/api/common/extHostTypes.ts   | 42 +++++++++++
 src/vs/workbench/api/common/shared/tasks.ts   | 53 ++++++++++++++
 .../tasks/browser/abstractTaskService.ts      |  6 +-
 .../tasks/browser/task.contribution.ts        |  2 +-
 .../tasks/browser/terminalTaskSystem.ts       | 15 +++-
 .../contrib/tasks/common/taskService.ts       |  5 ++
 .../workbench/contrib/tasks/common/tasks.ts   | 59 ++++++++++++----
 .../vscode.proposed.taskStatus.d.ts           | 70 +++++++++++++++++++
 13 files changed, 288 insertions(+), 20 deletions(-)
 create mode 100644 src/vscode-dts/vscode.proposed.taskStatus.d.ts

diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index 80042f2c555c..7eebcbb224b6 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -334,6 +334,9 @@ const _allApiProposals = {
 	taskPresentationGroup: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.taskPresentationGroup.d.ts',
 	},
+	taskStatus: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.taskStatus.d.ts',
+	},
 	telemetry: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.telemetry.d.ts',
 	},
diff --git a/src/vs/workbench/api/browser/mainThreadTask.ts b/src/vs/workbench/api/browser/mainThreadTask.ts
index 52e977fe25d9..c3a1c502e5f0 100644
--- a/src/vs/workbench/api/browser/mainThreadTask.ts
+++ b/src/vs/workbench/api/browser/mainThreadTask.ts
@@ -15,7 +15,7 @@ import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
 import { IWorkspace, IWorkspaceContextService, IWorkspaceFolder } from '../../../platform/workspace/common/workspace.js';
 
 import {
-	ContributedTask, ConfiguringTask, KeyedTaskIdentifier, ITaskExecution, Task, ITaskEvent, TaskEventKind,
+	ContributedTask, ConfiguringTask, KeyedTaskIdentifier, ITaskExecution, Task, ITaskEvent,
 	IPresentationOptions, CommandOptions, ICommandConfiguration, RuntimeType, CustomTask, TaskScope, TaskSource,
 	TaskSourceKind, IExtensionTaskSource, IRunOptions, ITaskSet, TaskGroup, TaskDefinition, PresentationOptions, RunOptions
 } from '../../contrib/tasks/common/tasks.js';
@@ -29,7 +29,9 @@ import { ExtHostContext, MainThreadTaskShape, ExtHostTaskShape, MainContext } fr
 import {
 	ITaskDefinitionDTO, ITaskExecutionDTO, IProcessExecutionOptionsDTO, ITaskPresentationOptionsDTO,
 	IProcessExecutionDTO, IShellExecutionDTO, IShellExecutionOptionsDTO, ICustomExecutionDTO, ITaskDTO, ITaskSourceDTO, ITaskHandleDTO, ITaskFilterDTO, ITaskProcessStartedDTO, ITaskProcessEndedDTO, ITaskSystemInfoDTO,
-	IRunOptionsDTO, ITaskGroupDTO
+	IRunOptionsDTO, ITaskGroupDTO,
+	ITaskStatus,
+	TaskEventKind
 } from '../common/shared/tasks.js';
 import { IConfigurationResolverService } from '../../services/configurationResolver/common/configurationResolver.js';
 import { ConfigurationTarget } from '../../../platform/configuration/common/configuration.js';
@@ -45,6 +47,24 @@ namespace TaskExecutionDTO {
 	}
 }
 
+export interface ITaskTerminalStatusDTO {
+	execution: ITaskExecutionDTO;
+	taskEventKind: TaskEventKind;
+}
+
+export namespace TaskTerminalStatusDTO {
+	export function from(value: ITaskStatus): ITaskTerminalStatusDTO {
+		return {
+			execution: {
+				id: value.execution.id,
+				task: TaskDTO.from(value.execution.task)
+			},
+			taskEventKind: value.taskEventKind
+		};
+	}
+}
+
+
 namespace TaskProcessStartedDTO {
 	export function from(value: ITaskExecution, processId: number): ITaskProcessStartedDTO {
 		return {
@@ -455,6 +475,7 @@ export class MainThreadTask extends Disposable implements MainThreadTaskShape {
 			} else if (event.kind === TaskEventKind.End) {
 				this._proxy.$OnDidEndTask(TaskExecutionDTO.from(task.getTaskExecution()));
 			}
+			this._proxy.$onDidChangeTaskTerminalStatus(TaskTerminalStatusDTO.from({ execution: task.getTaskExecution(), taskEventKind: event.kind }));
 		}));
 	}
 
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index c35994fc4eda..e8fa70f081f4 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -1357,6 +1357,10 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			},
 			onDidEndTaskProcess: (listeners, thisArgs?, disposables?) => {
 				return _asExtensionEvent(extHostTask.onDidEndTaskProcess)(listeners, thisArgs, disposables);
+			},
+			onDidChangeTaskStatus: (listeners) => {
+				checkProposedApiEnabled(extension, 'taskStatus');
+				return _asExtensionEvent(extHostTask.onDidChangeTaskTerminalStatus)(listeners);
 			}
 		};
 
@@ -1654,6 +1658,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			SymbolKind: extHostTypes.SymbolKind,
 			SymbolTag: extHostTypes.SymbolTag,
 			Task: extHostTypes.Task,
+			TaskEventKind: extHostTypes.TaskEventKind,
 			TaskGroup: extHostTypes.TaskGroup,
 			TaskPanelKind: extHostTypes.TaskPanelKind,
 			TaskRevealKind: extHostTypes.TaskRevealKind,
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 0d1b41e637a1..498c1c1cb1d8 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -2555,6 +2555,7 @@ export interface ExtHostTaskShape {
 	$onDidStartTaskProcess(value: tasks.ITaskProcessStartedDTO): void;
 	$onDidEndTaskProcess(value: tasks.ITaskProcessEndedDTO): void;
 	$OnDidEndTask(execution: tasks.ITaskExecutionDTO): void;
+	$onDidChangeTaskTerminalStatus(status: tasks.ITaskStatusDTO): void;
 	$resolveVariables(workspaceFolder: UriComponents, toResolve: { process?: { name: string; cwd?: string }; variables: string[] }): Promise<{ process?: string; variables: { [key: string]: string } }>;
 	$jsonTasksSupported(): Promise<boolean>;
 	$findExecutable(command: string, cwd?: string, paths?: string[]): Promise<string | undefined>;
diff --git a/src/vs/workbench/api/common/extHostTask.ts b/src/vs/workbench/api/common/extHostTask.ts
index e0774e293a08..91de874b71b1 100644
--- a/src/vs/workbench/api/common/extHostTask.ts
+++ b/src/vs/workbench/api/common/extHostTask.ts
@@ -29,6 +29,7 @@ import { IExtHostApiDeprecationService } from './extHostApiDeprecationService.js
 import { USER_TASKS_GROUP_KEY } from '../../contrib/tasks/common/tasks.js';
 import { ErrorNoTelemetry, NotSupportedError } from '../../../base/common/errors.js';
 import { asArray } from '../../../base/common/arrays.js';
+import { ITaskStatusDTO } from './shared/tasks.js';
 
 export interface IExtHostTask extends ExtHostTaskShape {
 
@@ -39,6 +40,7 @@ export interface IExtHostTask extends ExtHostTaskShape {
 	onDidEndTask: Event<vscode.TaskEndEvent>;
 	onDidStartTaskProcess: Event<vscode.TaskProcessStartEvent>;
 	onDidEndTaskProcess: Event<vscode.TaskProcessEndEvent>;
+	onDidChangeTaskTerminalStatus: Event<vscode.TaskStatusEvent>;  // Fixed the event type back to Event<TaskTerminalStatus>
 
 	registerTaskProvider(extension: IExtensionDescription, type: string, provider: vscode.TaskProvider): vscode.Disposable;
 	registerTaskSystem(scheme: string, info: tasks.ITaskSystemInfoDTO): void;
@@ -406,6 +408,7 @@ export abstract class ExtHostTaskBase implements ExtHostTaskShape, IExtHostTask
 
 	protected readonly _onDidTaskProcessStarted: Emitter<vscode.TaskProcessStartEvent> = new Emitter<vscode.TaskProcessStartEvent>();
 	protected readonly _onDidTaskProcessEnded: Emitter<vscode.TaskProcessEndEvent> = new Emitter<vscode.TaskProcessEndEvent>();
+	protected readonly _onDidChangeTaskTerminalStatus: Emitter<vscode.TaskStatusEvent> = new Emitter<vscode.TaskStatusEvent>();
 
 	constructor(
 		@IExtHostRpcService extHostRpc: IExtHostRpcService,
@@ -540,6 +543,25 @@ export abstract class ExtHostTaskBase implements ExtHostTaskShape, IExtHostTask
 		});
 	}
 
+	public get onDidChangeTaskTerminalStatus(): Event<vscode.TaskStatusEvent> {
+		return this._onDidChangeTaskTerminalStatus.event;
+	}
+
+	public async $onDidChangeTaskTerminalStatus(value: ITaskStatusDTO): Promise<void> {
+		let execution;
+		try {
+			execution = await this.getTaskExecution(value.execution.id);
+		} catch (error) {
+			// The task execution is not available anymore
+			return;
+		}
+
+		this._onDidChangeTaskTerminalStatus.fire({
+			execution: execution,
+			eventKind: value.taskEventKind
+		});
+	}
+
 	protected abstract provideTasksInternal(validTypes: { [key: string]: boolean }, taskIdPromises: Promise<void>[], handler: HandlerData, value: vscode.Task[] | null | undefined): { tasks: tasks.ITaskDTO[]; extension: IExtensionDescription };
 
 	public $provideTasks(handle: number, validTypes: { [key: string]: boolean }): Promise<tasks.ITaskSetDTO> {
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index f1fcdc1ab1b8..432ae5e6d256 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -2216,6 +2216,48 @@ export enum TaskRevealKind {
 	Never = 3
 }
 
+export enum TaskEventKind {
+	/** Indicates a task's properties or configuration have changed */
+	Changed = 'changed',
+
+	/** Indicates a task has begun executing */
+	ProcessStarted = 'processStarted',
+
+	/** Indicates a task process has completed */
+	ProcessEnded = 'processEnded',
+
+	/** Indicates a task was terminated, either by user action or by the system */
+	Terminated = 'terminated',
+
+	/** Indicates a task has started running */
+	Start = 'start',
+
+	/** Indicates a task has acquired all needed input/variables to execute */
+	AcquiredInput = 'acquiredInput',
+
+	/** Indicates a dependent task has started */
+	DependsOnStarted = 'dependsOnStarted',
+
+	/** Indicates a task is actively running/processing */
+	Active = 'active',
+
+	/** Indicates a task is paused/waiting but not complete */
+	Inactive = 'inactive',
+
+	/** Indicates a task has completed fully */
+	End = 'end',
+
+	/** Indicates the task's problem matcher has started */
+	ProblemMatcherStarted = 'problemMatcherStarted',
+
+	/** Indicates the task's problem matcher has ended */
+	ProblemMatcherEnded = 'problemMatcherEnded',
+
+	/** Indicates the task's problem matcher has found errors */
+	ProblemMatcherFoundErrors = 'problemMatcherFoundErrors'
+}
+
+
 export enum TaskPanelKind {
 	Shared = 1,
 
diff --git a/src/vs/workbench/api/common/shared/tasks.ts b/src/vs/workbench/api/common/shared/tasks.ts
index 67a3fe9e05db..da343180cb99 100644
--- a/src/vs/workbench/api/common/shared/tasks.ts
+++ b/src/vs/workbench/api/common/shared/tasks.ts
@@ -6,6 +6,7 @@
 import { UriComponents } from '../../../../base/common/uri.js';
 import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
 import type { Dto } from '../../../services/extensions/common/proxyIdentifier.js';
+import { ITaskExecution } from '../../../contrib/tasks/common/tasks.js';
 
 export interface ITaskDefinitionDTO {
 	type: string;
@@ -50,6 +51,48 @@ export interface IShellQuotingOptionsDTO {
 	weak?: string;
 }
 
+export enum TaskEventKind {
+	/** Indicates that a task's properties or configuration have changed */
+	Changed = 'changed',
+
+	/** Indicates that a task has begun executing */
+	ProcessStarted = 'processStarted',
+
+	/** Indicates that a task process has completed */
+	ProcessEnded = 'processEnded',
+
+	/** Indicates that a task was terminated, either by user action or by the system */
+	Terminated = 'terminated',
+
+	/** Indicates that a task has started running */
+	Start = 'start',
+
+	/** Indicates that a task has acquired all needed input/variables to execute */
+	AcquiredInput = 'acquiredInput',
+
+	/** Indicates that a dependent task has started */
+	DependsOnStarted = 'dependsOnStarted',
+
+	/** Indicates that a task is actively running/processing */
+	Active = 'active',
+
+	/** Indicates that a task is paused/waiting but not complete */
+	Inactive = 'inactive',
+
+	/** Indicates that a task has completed fully */
+	End = 'end',
+
+	/** Indicates that a task's problem matcher has started */
+	ProblemMatcherStarted = 'problemMatcherStarted',
+
+	/** Indicates that a task's problem matcher has ended */
+	ProblemMatcherEnded = 'problemMatcherEnded',
+
+	/** Indicates that a task's problem matcher has found errors */
+	ProblemMatcherFoundErrors = 'problemMatcherFoundErrors'
+}
+
+
 export interface IShellExecutionOptionsDTO extends IExecutionOptionsDTO {
 	executable?: string;
 	shellArgs?: string[];
@@ -137,3 +180,13 @@ export interface ITaskSystemInfoDTO {
 	authority: string;
 	platform: string;
 }
+
+export interface ITaskStatus {
+	execution: ITaskExecution;
+	taskEventKind: TaskEventKind;
+}
+
+export interface ITaskStatusDTO {
+	execution: ITaskExecutionDTO;
+	taskEventKind: TaskEventKind;
+}
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
index d6a12341d75b..4672ffa2c9bb 100644
--- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
+++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -47,8 +47,8 @@ import { ITextFileService } from '../../../services/textfile/common/textfiles.js
 import { ITerminalGroupService, ITerminalService } from '../../terminal/browser/terminal.js';
 import { ITerminalProfileResolverService } from '../../terminal/common/terminal.js';
 
-import { ConfiguringTask, ContributedTask, CustomTask, ExecutionEngine, InMemoryTask, ITaskEvent, ITaskIdentifier, ITaskSet, JsonSchemaVersion, KeyedTaskIdentifier, RuntimeType, Task, TASK_RUNNING_STATE, TaskDefinition, TaskEventKind, TaskGroup, TaskRunSource, TaskSettingId, TaskSorter, TaskSourceKind, TasksSchemaProperties, USER_TASKS_GROUP_KEY } from '../common/tasks.js';
-import { CustomExecutionSupportedContext, ICustomizationProperties, IProblemMatcherRunOptions, ITaskFilter, ITaskProvider, ITaskService, IWorkspaceFolderTaskResult, ProcessExecutionSupportedContext, ServerlessWebContext, ShellExecutionSupportedContext, TaskCommandsRegistered, TaskExecutionSupportedContext } from '../common/taskService.js';
+import { ConfiguringTask, ContributedTask, CustomTask, ExecutionEngine, InMemoryTask, ITaskEvent, ITaskIdentifier, ITaskSet, JsonSchemaVersion, KeyedTaskIdentifier, RuntimeType, Task, TASK_RUNNING_STATE, TaskDefinition, TaskGroup, TaskRunSource, TaskSettingId, TaskSorter, TaskSourceKind, TasksSchemaProperties, USER_TASKS_GROUP_KEY, TaskEventKind } from '../common/tasks.js';
+import { CustomExecutionSupportedContext, ICustomizationProperties, IProblemMatcherRunOptions, ITaskFilter, ITaskProvider, ITaskService, ITaskTerminalStatus, IWorkspaceFolderTaskResult, ProcessExecutionSupportedContext, ServerlessWebContext, ShellExecutionSupportedContext, TaskCommandsRegistered, TaskExecutionSupportedContext } from '../common/taskService.js';
 import { ITaskExecuteResult, ITaskResolver, ITaskSummary, ITaskSystem, ITaskSystemInfo, ITaskTerminateResponse, TaskError, TaskErrors, TaskExecuteKind } from '../common/taskSystem.js';
 import { getTemplates as getTaskTemplates } from '../common/taskTemplates.js';
 
@@ -237,6 +237,8 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 	public get isReconnected(): boolean { return this._tasksReconnected; }
 	private _onDidChangeTaskProviders = this._register(new Emitter<void>());
 	public onDidChangeTaskProviders = this._onDidChangeTaskProviders.event;
+	private _onDidChangeTaskTerminalStatus: Emitter<ITaskTerminalStatus> = new Emitter<ITaskTerminalStatus>();
+	public readonly onDidChangeTaskTerminalStatus: Event<ITaskTerminalStatus> = this._onDidChangeTaskTerminalStatus.event;
 
 	private _activatedTaskProviders: Set<string> = new Set();
 
diff --git a/src/vs/workbench/contrib/tasks/browser/task.contribution.ts b/src/vs/workbench/contrib/tasks/browser/task.contribution.ts
index 98592cc01a37..8629aa38b0f7 100644
--- a/src/vs/workbench/contrib/tasks/browser/task.contribution.ts
+++ b/src/vs/workbench/contrib/tasks/browser/task.contribution.ts
@@ -20,7 +20,7 @@ import { StatusbarAlignment, IStatusbarService, IStatusbarEntryAccessor, IStatus
 
 import { IOutputChannelRegistry, Extensions as OutputExt } from '../../../services/output/common/output.js';
 
-import { ITaskEvent, TaskEventKind, TaskGroup, TaskSettingId, TASKS_CATEGORY, TASK_RUNNING_STATE, TASK_TERMINAL_ACTIVE } from '../common/tasks.js';
+import { ITaskEvent, TaskGroup, TaskSettingId, TASKS_CATEGORY, TASK_RUNNING_STATE, TASK_TERMINAL_ACTIVE, TaskEventKind } from '../common/tasks.js';
 import { ITaskService, TaskCommandsRegistered, TaskExecutionSupportedContext } from '../common/taskService.js';
 
 import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
index 61d996724fe4..31f4e203f540 100644
--- a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
@@ -833,15 +833,18 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 					eventCounter++;
 					this._busyTasks[mapKey] = task;
 					this._fireTaskEvent(TaskEvent.general(TaskEventKind.Active, task, terminal?.instanceId));
+					this._fireTaskEvent(TaskEvent.general(TaskEventKind.ProblemMatcherStarted, task, terminal?.instanceId));
 				} else if (event.kind === ProblemCollectorEventKind.BackgroundProcessingEnds) {
 					eventCounter--;
 					if (this._busyTasks[mapKey]) {
 						delete this._busyTasks[mapKey];
 					}
 					this._fireTaskEvent(TaskEvent.general(TaskEventKind.Inactive, task, terminal?.instanceId));
+					this._fireTaskEvent(TaskEvent.general(TaskEventKind.ProblemMatcherEnded, task, terminal?.instanceId));
 					if (eventCounter === 0) {
 						if ((watchingProblemMatcher.numberOfMatches > 0) && watchingProblemMatcher.maxMarkerSeverity &&
 							(watchingProblemMatcher.maxMarkerSeverity >= MarkerSeverity.Error)) {
+							this._fireTaskEvent(TaskEvent.general(TaskEventKind.ProblemMatcherFoundErrors, task, terminal?.instanceId));
 							const reveal = task.command.presentation!.reveal;
 							const revealProblems = task.command.presentation!.revealProblems;
 							if (revealProblems === RevealProblemKind.OnProblem) {
@@ -981,7 +984,16 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 			const problemMatchers = await this._resolveMatchers(resolver, task.configurationProperties.problemMatchers);
 			const startStopProblemMatcher = new StartStopProblemCollector(problemMatchers, this._markerService, this._modelService, ProblemHandlingStrategy.Clean, this._fileService);
 			this._terminalStatusManager.addTerminal(task, terminal, startStopProblemMatcher);
-
+			startStopProblemMatcher.onDidStateChange((event) => {
+				if (event.kind === ProblemCollectorEventKind.BackgroundProcessingBegins) {
+					this._fireTaskEvent(TaskEvent.general(TaskEventKind.ProblemMatcherStarted, task, terminal?.instanceId));
+				} else if (event.kind === ProblemCollectorEventKind.BackgroundProcessingEnds) {
+					this._fireTaskEvent(TaskEvent.general(TaskEventKind.ProblemMatcherEnded, task, terminal?.instanceId));
+					if (startStopProblemMatcher.numberOfMatches) {
+						this._fireTaskEvent(TaskEvent.general(TaskEventKind.ProblemMatcherFoundErrors, task, terminal?.instanceId));
+					}
+				}
+			});
 			let processStartedSignaled = false;
 			terminal.processReady.then(() => {
 				if (!processStartedSignaled) {
@@ -1044,6 +1056,7 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 						delete this._busyTasks[mapKey];
 					}
 					this._fireTaskEvent(TaskEvent.general(TaskEventKind.Inactive, task, terminal?.instanceId));
+					this._fireTaskEvent(TaskEvent.general(TaskEventKind.ProblemMatcherEnded, task, terminal?.instanceId));
 					this._fireTaskEvent(TaskEvent.general(TaskEventKind.End, task, terminal?.instanceId));
 					resolve({ exitCode: exitCode ?? undefined });
 				});
diff --git a/src/vs/workbench/contrib/tasks/common/taskService.ts b/src/vs/workbench/contrib/tasks/common/taskService.ts
index ac2f0c34c3ba..ec687197deec 100644
--- a/src/vs/workbench/contrib/tasks/common/taskService.ts
+++ b/src/vs/workbench/contrib/tasks/common/taskService.ts
@@ -108,3 +108,8 @@ export interface ITaskService {
 
 	extensionCallbackTaskComplete(task: Task, result: number | undefined): Promise<void>;
 }
+
+export interface ITaskTerminalStatus {
+	terminalId: number;
+	status: string;
+}
diff --git a/src/vs/workbench/contrib/tasks/common/tasks.ts b/src/vs/workbench/contrib/tasks/common/tasks.ts
index c78cb6d4d77d..3c01d029ade1 100644
--- a/src/vs/workbench/contrib/tasks/common/tasks.ts
+++ b/src/vs/workbench/contrib/tasks/common/tasks.ts
@@ -1102,18 +1102,6 @@ export class TaskSorter {
 	}
 }
 
-export const enum TaskEventKind {
-	DependsOnStarted = 'dependsOnStarted',
-	AcquiredInput = 'acquiredInput',
-	Start = 'start',
-	ProcessStarted = 'processStarted',
-	Active = 'active',
-	Inactive = 'inactive',
-	Changed = 'changed',
-	Terminated = 'terminated',
-	ProcessEnded = 'processEnded',
-	End = 'end'
-}
 
 
 export const enum TaskRunType {
@@ -1125,6 +1113,49 @@ export interface ITaskChangedEvent {
 	kind: TaskEventKind.Changed;
 }
 
+
+
+export enum TaskEventKind {
+	/** Indicates that a task's properties or configuration have changed */
+	Changed = 'changed',
+
+	/** Indicates that a task has begun executing */
+	ProcessStarted = 'processStarted',
+
+	/** Indicates that a task process has completed */
+	ProcessEnded = 'processEnded',
+
+	/** Indicates that a task was terminated, either by user action or by the system */
+	Terminated = 'terminated',
+
+	/** Indicates that a task has started running */
+	Start = 'start',
+
+	/** Indicates that a task has acquired all needed input/variables to execute */
+	AcquiredInput = 'acquiredInput',
+
+	/** Indicates that a dependent task has started */
+	DependsOnStarted = 'dependsOnStarted',
+
+	/** Indicates that a task is actively running/processing */
+	Active = 'active',
+
+	/** Indicates that a task is paused/waiting but not complete */
+	Inactive = 'inactive',
+
+	/** Indicates that a task has completed fully */
+	End = 'end',
+
+	/** Indicates that a task's problem matcher has started */
+	ProblemMatcherStarted = 'problemMatcherStarted',
+
+	/** Indicates that a task's problem matcher has ended */
+	ProblemMatcherEnded = 'problemMatcherEnded',
+
+	/** Indicates that a task's problem matcher has found errors */
+	ProblemMatcherFoundErrors = 'problemMatcherFoundErrors'
+}
+
 interface ITaskCommon {
 	taskId: string;
 	runType: TaskRunType;
@@ -1158,7 +1189,7 @@ export interface ITaskStartedEvent extends ITaskCommon {
 }
 
 export interface ITaskGeneralEvent extends ITaskCommon {
-	kind: TaskEventKind.AcquiredInput | TaskEventKind.DependsOnStarted | TaskEventKind.Active | TaskEventKind.Inactive | TaskEventKind.End;
+	kind: TaskEventKind.AcquiredInput | TaskEventKind.DependsOnStarted | TaskEventKind.Active | TaskEventKind.Inactive | TaskEventKind.End | TaskEventKind.ProblemMatcherEnded | TaskEventKind.ProblemMatcherStarted | TaskEventKind.ProblemMatcherFoundErrors;
 	terminalId: number | undefined;
 }
 
@@ -1224,7 +1255,7 @@ export namespace TaskEvent {
 		};
 	}
 
-	export function general(kind: TaskEventKind.AcquiredInput | TaskEventKind.DependsOnStarted | TaskEventKind.Active | TaskEventKind.Inactive | TaskEventKind.End, task: Task, terminalId?: number): ITaskGeneralEvent {
+	export function general(kind: TaskEventKind.AcquiredInput | TaskEventKind.DependsOnStarted | TaskEventKind.Active | TaskEventKind.Inactive | TaskEventKind.End | TaskEventKind.ProblemMatcherEnded | TaskEventKind.ProblemMatcherStarted | TaskEventKind.ProblemMatcherFoundErrors, task: Task, terminalId?: number): ITaskGeneralEvent {
 		return {
 			...common(task),
 			kind,
diff --git a/src/vscode-dts/vscode.proposed.taskStatus.d.ts b/src/vscode-dts/vscode.proposed.taskStatus.d.ts
new file mode 100644
index 000000000000..64fd05f98b01
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.taskStatus.d.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.
+ *--------------------------------------------------------------------------------------------*/
+
+
+declare module 'vscode' {
+
+	export enum TaskEventKind {
+		/** Indicates that a task's properties or configuration have changed */
+		Changed = 'changed',
+
+		/** Indicates that a task has begun executing */
+		ProcessStarted = 'processStarted',
+
+		/** Indicates that a task process has completed */
+		ProcessEnded = 'processEnded',
+
+		/** Indicates that a task was terminated, either by user action or by the system */
+		Terminated = 'terminated',
+
+		/** Indicates that a task has started running */
+		Start = 'start',
+
+		/** Indicates that a task has acquired all needed input/variables to execute */
+		AcquiredInput = 'acquiredInput',
+
+		/** Indicates that a dependent task has started */
+		DependsOnStarted = 'dependsOnStarted',
+
+		/** Indicates that a task is actively running/processing */
+		Active = 'active',
+
+		/** Indicates that a task is paused/waiting but not complete */
+		Inactive = 'inactive',
+
+		/** Indicates that a task has completed fully */
+		End = 'end',
+
+		/** Indicates that a task's problem matcher has started */
+		ProblemMatcherStarted = 'problemMatcherStarted',
+
+		/** Indicates that a task's problem matcher has ended */
+		ProblemMatcherEnded = 'problemMatcherEnded',
+
+		/** Indicates that a task's problem matcher has found errors */
+		ProblemMatcherFoundErrors = 'problemMatcherFoundErrors'
+	}
+
+	export interface TaskStatusEvent {
+		/**
+		 * The task item representing the task for which the event occurred
+		 */
+		readonly execution: TaskExecution;
+
+		/**
+		 * The task event kind
+		 */
+		readonly eventKind: TaskEventKind;
+	}
+
+	export namespace tasks {
+
+		/**
+		 * An event that is emitted when the status of a task changes.
+		 */
+		export const onDidChangeTaskStatus: Event<TaskStatusEvent>;
+	}
+
+}

From 8bbfc150ea07e053d5b4df60232ca2184c1e2355 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 12 Mar 2025 15:25:44 +0100
Subject: [PATCH 0828/1815] MCP work (#243351)

* - fix enablement/showing of select tools command (partially)
- show tools picker grouped by server

* render MCP tools runs a little nicer
---
 .../chatConfirmationWidget.ts                 |   2 +-
 .../contrib/mcp/browser/mcpCommands.ts        | 147 ++++++++++++++----
 .../contrib/mcp/common/mcpContextKeys.ts      |   6 +-
 .../workbench/contrib/mcp/common/mcpServer.ts |   4 +-
 .../contrib/mcp/common/mcpService.ts          |  23 ++-
 .../workbench/contrib/mcp/common/mcpTypes.ts  |   4 +-
 6 files changed, 144 insertions(+), 42 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
index 761e83ff51c9..7bdb9b234992 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
@@ -54,7 +54,7 @@ abstract class BaseChatConfirmationWidget extends Disposable {
 		this._domNode = elements.root;
 		this.markdownRenderer = this.instantiationService.createInstance(MarkdownRenderer, {});
 
-		const renderedTitle = this._register(this.markdownRenderer.render(new MarkdownString(title), {
+		const renderedTitle = this._register(this.markdownRenderer.render(new MarkdownString(title, { supportThemeIcons: true }), {
 			asyncRenderCallback: () => this._onDidChangeHeight.fire(),
 		}));
 		elements.title.append(renderedTitle.element);
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 364c5c2b4b49..0514c67931b8 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -6,11 +6,11 @@
 import { reset } from '../../../../base/browser/dom.js';
 import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { groupBy } from '../../../../base/common/collections.js';
+import { diffSets, groupBy } from '../../../../base/common/collections.js';
 import { Event } from '../../../../base/common/event.js';
 import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { autorun, derived } from '../../../../base/common/observable.js';
+import { autorun, derived, transaction } from '../../../../base/common/observable.js';
 import { assertType } from '../../../../base/common/types.js';
 import { ILocalizedString, localize, localize2 } from '../../../../nls.js';
 import { IActionViewItemService } from '../../../../platform/actions/browser/actionViewItemService.js';
@@ -26,7 +26,7 @@ import { CHAT_CATEGORY } from '../../chat/browser/actions/chatActions.js';
 import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
 import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
 import { McpContextKeys } from '../common/mcpContextKeys.js';
-import { IMcpService, IMcpTool, McpConnectionState } from '../common/mcpTypes.js';
+import { IMcpServer, IMcpService, IMcpTool, McpConnectionState } from '../common/mcpTypes.js';
 
 // acroynms do not get localized
 const category: ILocalizedString = {
@@ -180,12 +180,12 @@ export class AttachMCPToolsAction extends Action2 {
 			f1: false,
 			category: CHAT_CATEGORY,
 			precondition: ContextKeyExpr.and(
-				McpContextKeys.serverCount.greater(0),
+				McpContextKeys.toolsCount.greater(0),
 				ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)
 			),
 			menu: {
 				when: ContextKeyExpr.and(
-					McpContextKeys.serverCount.greater(0),
+					McpContextKeys.toolsCount.greater(0),
 					ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)
 				),
 				id: MenuId.ChatInputAttachmentToolbar,
@@ -204,48 +204,131 @@ export class AttachMCPToolsAction extends Action2 {
 		const quickPickService = accessor.get(IQuickInputService);
 		const mcpService = accessor.get(IMcpService);
 
-		type IToolPick = IQuickPickItem & { tool: IMcpTool };
-		const picks: (IToolPick | IQuickPickSeparator)[] = [];
+		type ToolPick = IQuickPickItem & { picked: boolean; tool: IMcpTool; parent: ServerPick };
+		type ServerPick = IQuickPickItem & { picked: boolean; server: IMcpServer; toolPicks: ToolPick[] };
+		type McpPick = ToolPick | ServerPick;
+
+		function isServerPick(obj: any): obj is ServerPick {
+			return Boolean((obj as ServerPick).server);
+		}
+		function isToolPick(obj: any): obj is ToolPick {
+			return Boolean((obj as ToolPick).tool);
+		}
+
+		const store = new DisposableStore();
+		const picker = store.add(quickPickService.createQuickPick<McpPick>({ useSeparators: true }));
+
+		const picks: (McpPick | IQuickPickSeparator)[] = [];
 
 		for (const server of mcpService.servers.get()) {
 
+			const tools = server.tools.get();
+
+			if (tools.length === 0) {
+				continue;
+			}
 			picks.push({
 				type: 'separator',
-				label: server.definition.label
+				label: server.collection.label
 			});
 
-			for (const tool of server.tools.get()) {
-				picks.push({
-					type: 'item',
-					label: tool.definition.name,
-					detail: tool.definition.description,
-					tooltip: tool.definition.description,
-					picked: tool.enabled.get(),
+			const item: ServerPick = {
+				server,
+				type: 'item',
+				label: `$(server) ${server.definition.label}`,
+				description: McpConnectionState.toString(server.state.get()),
+				picked: tools.some(tool => tool.enabled.get()),
+				toolPicks: []
+			};
+
+			picks.push(item);
+
+			for (const tool of tools) {
+				const toolItem: ToolPick = {
 					tool,
-				});
+					parent: item,
+					type: 'item',
+					label: `$(tools) ${tool.definition.name}`,
+					description: tool.definition.description,
+					picked: tool.enabled.get()
+				};
+				item.toolPicks.push(toolItem);
+				picks.push(toolItem);
 			}
 		}
 
-		const result = await quickPickService.pick(picks, {
-			placeHolder: localize('placeholder', "Select tools that are available to chat"),
-			canPickMany: true
-		});
+		picker.placeholder = localize('placeholder', "Select tools that are available to chat");
+		picker.canSelectMany = true;
+
+		let lastSelectedItems = new Set<McpPick>();
+		let ignoreEvent = false;
+
+		const _update = () => {
+			ignoreEvent = true;
+			try {
+				const items = picks.filter((p): p is McpPick => p.type === 'item' && Boolean(p.picked));
+				lastSelectedItems = new Set(items);
+				picker.items = picks;
+				picker.selectedItems = items;
+			} finally {
+				ignoreEvent = false;
+			}
+		};
 
-		if (!result) {
-			return;
-		}
+		_update();
+		picker.show();
 
-		const seen = new Set<IMcpTool>();
-		for (const item of result) {
-			item.tool.updateEnablement(true);
-			seen.add(item.tool);
-		}
+		store.add(picker.onDidChangeSelection(selectedPicks => {
+			if (ignoreEvent) {
+				return;
+			}
 
-		for (const pick of picks) {
-			if (pick.type === 'item' && !seen.has(pick.tool)) {
-				pick.tool.updateEnablement(false);
+			const { added, removed } = diffSets(lastSelectedItems, new Set(selectedPicks));
+
+			for (const item of added) {
+				item.picked = true;
+
+				if (isServerPick(item)) {
+					// add server -> add back tools
+					for (const toolPick of item.toolPicks) {
+						toolPick.picked = true;
+					}
+				} else if (isToolPick(item)) {
+					// add server when tool is picked
+					item.parent.picked = true;
+				}
 			}
-		}
+
+			for (const item of removed) {
+				item.picked = false;
+
+				if (isServerPick(item)) {
+					// removed server -> remove tools
+					for (const toolPick of item.toolPicks) {
+						toolPick.picked = false;
+					}
+				} else if (isToolPick(item) && item.parent.toolPicks.every(child => !child.picked)) {
+					// remove LAST tool -> remove server
+					item.parent.picked = false;
+				}
+			}
+
+			transaction(tx => {
+				for (const item of picks) {
+					if (isToolPick(item)) {
+						item.tool.updateEnablement(item.picked, tx);
+					}
+				}
+			});
+
+			_update();
+		}));
+
+
+		await Promise.race([Event.toPromise(Event.any(picker.onDidAccept, picker.onDidHide))]);
+
+		store.dispose();
+
 	}
 }
 
diff --git a/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts b/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
index c49fd058f550..545c678a5c17 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
@@ -15,11 +15,13 @@ import { IMcpService } from './mcpTypes.js';
 export namespace McpContextKeys {
 
 	export const serverCount = new RawContextKey<number>('mcp.serverCount', undefined, { type: 'number', description: localize('mcp.serverCount.description', "Context key that has the number of registered MCP servers") });
+	export const toolsCount = new RawContextKey<number>('mcp.toolsCount', undefined, { type: 'number', description: localize('mcp.toolsCount.description', "Context key that has the number of registered MCP tools") });
 }
 
 
 export class McpContextKeysController extends Disposable implements IWorkbenchContribution {
-	public static readonly ID = 'workbench.contrib.mcp.contextKey';
+
+	static readonly ID = 'workbench.contrib.mcp.contextKey';
 
 	constructor(
 		@IMcpService mcpService: IMcpService,
@@ -28,9 +30,11 @@ export class McpContextKeysController extends Disposable implements IWorkbenchCo
 		super();
 
 		const ctxServerCount = McpContextKeys.serverCount.bindTo(contextKeyService);
+		const ctxToolsCount = McpContextKeys.toolsCount.bindTo(contextKeyService);
 
 		this._store.add(autorun(r => {
 			ctxServerCount.set(mcpService.servers.read(r).length);
+			ctxToolsCount.set(mcpService.servers.read(r).reduce((count, server) => count + server.tools.read(r).length, 0));
 		}));
 	}
 }
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServer.ts b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
index f884386642d4..082d62363f19 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServer.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
@@ -230,8 +230,8 @@ export class McpTool implements IMcpTool {
 		this.id = `${_server.definition.id}_${definition.name}`.replaceAll('.', '_');
 	}
 
-	updateEnablement(value: boolean): void {
-		this._enabled.set(value, undefined);
+	updateEnablement(value: boolean, tx?: ITransaction): void {
+		this._enabled.set(value, tx);
 	}
 
 	call(params: Record<string, unknown>, token?: CancellationToken): Promise<MCP.CallToolResult> {
diff --git a/src/vs/workbench/contrib/mcp/common/mcpService.ts b/src/vs/workbench/contrib/mcp/common/mcpService.ts
index f46e7fd57b53..f08e7af0f483 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpService.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpService.ts
@@ -4,11 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { autorun, autorunWithStore, derived, IObservable, observableValue } from '../../../../base/common/observable.js';
 import { localize } from '../../../../nls.js';
 import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
 import { StorageScope } from '../../../../platform/storage/common/storage.js';
 import { ILanguageModelToolsService, IToolResult } from '../../chat/common/languageModelToolsService.js';
 import { IMcpRegistry } from './mcpRegistryTypes.js';
@@ -29,7 +31,8 @@ export class McpService extends Disposable implements IMcpService {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry,
 		@ILanguageModelToolsService toolsService: ILanguageModelToolsService,
-		@IContextKeyService contextKeyService: IContextKeyService
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IProductService productService: IProductService
 	) {
 		super();
 
@@ -96,6 +99,7 @@ export class McpService extends Disposable implements IMcpService {
 						ctxInst.set(tool.enabled.read(reader));
 					}));
 
+
 					newStore.add(toolsService.registerToolData({
 						id: tool.id,
 						displayName: tool.definition.name,
@@ -107,11 +111,20 @@ export class McpService extends Disposable implements IMcpService {
 					newStore.add(toolsService.registerToolImplementation(tool.id, {
 
 						async prepareToolInvocation(parameters, token) {
+
+							const mcpToolWarning = localize(
+								'mcp.tool.warning',
+								"MCP servers or malicious conversation content may attempt to misuse '{0}' through the installed tools. Please carefully review any requested actions.",
+								productService.nameShort
+							);
+
 							return {
 								confirmationMessages: {
-									title: localize('aaa', "Run tool from {0}", server.definition.label),
-									message: localize('ddd', "Do you allow to run `{0}` from `{1}`?", tool.definition.name, server.definition.label)
-								}
+									title: localize('msg.title', "Run `{0}` from $(server) `{1}` (MCP server)", tool.definition.name, server.definition.label),
+									message: new MarkdownString(localize('msg.msg', "{0}\n\nInput:\n\n```json\n{1}\n```\n\n$(warning) {2}", tool.definition.description, JSON.stringify(parameters, undefined, 2), mcpToolWarning), { supportThemeIcons: true })
+								},
+								invocationMessage: new MarkdownString(localize('msg.run', "Running `{0}`", tool.definition.name, server.definition.label)),
+								pastTenseMessage: new MarkdownString(localize('msg.ran', "Ran `{0}` ", tool.definition.name, server.definition.label))
 							};
 						},
 
@@ -133,6 +146,8 @@ export class McpService extends Disposable implements IMcpService {
 								}
 							}
 
+							// result.toolResultMessage = new MarkdownString(localize('reuslt.pattern', "```json\n{0}\n```", JSON.stringify(callResult, undefined, 2)));
+
 							return result;
 						},
 					}));
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
index 5baf2ca137d8..ec1b2e00c4bd 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
@@ -7,7 +7,7 @@ import { assertNever } from '../../../../base/common/assert.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { equals as objectsEqual } from '../../../../base/common/objects.js';
-import { IObservable } from '../../../../base/common/observable.js';
+import { IObservable, ITransaction } from '../../../../base/common/observable.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
 import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
@@ -113,7 +113,7 @@ export interface IMcpTool {
 
 	readonly enabled: IObservable<boolean>;
 
-	updateEnablement(value: boolean): void;
+	updateEnablement(value: boolean, tx?: ITransaction): void;
 
 	/**
 	 * Calls a tool

From 38cc6fe8b4ae0f6ae3a85c1a7e13d2e7ec1de36a Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Wed, 12 Mar 2025 10:26:38 -0400
Subject: [PATCH 0829/1815] add kind of completion to aria label  (#243241)

---
 src/vs/editor/common/languages.ts             | 37 +++++++++++++++++++
 .../contrib/suggest/browser/suggestWidget.ts  | 12 ++++--
 .../suggest/browser/terminalSuggestAddon.ts   | 16 ++++++++
 .../suggest/browser/simpleCompletionItem.ts   |  5 +++
 .../suggest/browser/simpleSuggestWidget.ts    | 10 +++--
 5 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/src/vs/editor/common/languages.ts b/src/vs/editor/common/languages.ts
index 10f7119dd2c2..6ce3c2421736 100644
--- a/src/vs/editor/common/languages.ts
+++ b/src/vs/editor/common/languages.ts
@@ -431,6 +431,43 @@ export namespace CompletionItemKinds {
 		return codicon;
 	}
 
+	/**
+	 * @internal
+	 */
+	export function toLabel(kind: CompletionItemKind): string {
+		switch (kind) {
+			case CompletionItemKind.Method: return localize('suggestWidget.kind.method', 'Method');
+			case CompletionItemKind.Function: return localize('suggestWidget.kind.function', 'Function');
+			case CompletionItemKind.Constructor: return localize('suggestWidget.kind.constructor', 'Constructor');
+			case CompletionItemKind.Field: return localize('suggestWidget.kind.field', 'Field');
+			case CompletionItemKind.Variable: return localize('suggestWidget.kind.variable', 'Variable');
+			case CompletionItemKind.Class: return localize('suggestWidget.kind.class', 'Class');
+			case CompletionItemKind.Struct: return localize('suggestWidget.kind.struct', 'Struct');
+			case CompletionItemKind.Interface: return localize('suggestWidget.kind.interface', 'Interface');
+			case CompletionItemKind.Module: return localize('suggestWidget.kind.module', 'Module');
+			case CompletionItemKind.Property: return localize('suggestWidget.kind.property', 'Property');
+			case CompletionItemKind.Event: return localize('suggestWidget.kind.event', 'Event');
+			case CompletionItemKind.Operator: return localize('suggestWidget.kind.operator', 'Operator');
+			case CompletionItemKind.Unit: return localize('suggestWidget.kind.unit', 'Unit');
+			case CompletionItemKind.Value: return localize('suggestWidget.kind.value', 'Value');
+			case CompletionItemKind.Constant: return localize('suggestWidget.kind.constant', 'Constant');
+			case CompletionItemKind.Enum: return localize('suggestWidget.kind.enum', 'Enum');
+			case CompletionItemKind.EnumMember: return localize('suggestWidget.kind.enumMember', 'Enum Member');
+			case CompletionItemKind.Keyword: return localize('suggestWidget.kind.keyword', 'Keyword');
+			case CompletionItemKind.Text: return localize('suggestWidget.kind.text', 'Text');
+			case CompletionItemKind.Color: return localize('suggestWidget.kind.color', 'Color');
+			case CompletionItemKind.File: return localize('suggestWidget.kind.file', 'File');
+			case CompletionItemKind.Reference: return localize('suggestWidget.kind.reference', 'Reference');
+			case CompletionItemKind.Customcolor: return localize('suggestWidget.kind.customcolor', 'Custom Color');
+			case CompletionItemKind.Folder: return localize('suggestWidget.kind.folder', 'Folder');
+			case CompletionItemKind.TypeParameter: return localize('suggestWidget.kind.typeParameter', 'Type Parameter');
+			case CompletionItemKind.User: return localize('suggestWidget.kind.user', 'User');
+			case CompletionItemKind.Issue: return localize('suggestWidget.kind.issue', 'Issue');
+			case CompletionItemKind.Snippet: return localize('suggestWidget.kind.snippet', 'Snippet');
+			default: return '';
+		}
+	}
+
 	const data = new Map<string, CompletionItemKind>();
 	data.set('method', CompletionItemKind.Method);
 	data.set('function', CompletionItemKind.Function);
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
index fbaa5530d893..8c77c920b400 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
@@ -35,6 +35,7 @@ import { canExpandCompletionItem, SuggestDetailsOverlay, SuggestDetailsWidget }
 import { ItemRenderer } from './suggestWidgetRenderer.js';
 import { getListStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { status } from '../../../../base/browser/ui/aria/aria.js';
+import { CompletionItemKinds } from '../../../common/languages.js';
 
 /**
  * Suggest widget colors
@@ -236,17 +237,19 @@ export class SuggestWidget implements IDisposable {
 				getAriaLabel: (item: CompletionItem) => {
 
 					let label = item.textLabel;
+					const kindLabel = CompletionItemKinds.toLabel(item.completion.kind);
 					if (typeof item.completion.label !== 'string') {
 						const { detail, description } = item.completion.label;
 						if (detail && description) {
-							label = nls.localize('label.full', '{0} {1}, {2}', label, detail, description);
+							label = nls.localize('label.full', '{0} {1}, {2}, {3}', label, detail, description, kindLabel);
 						} else if (detail) {
-							label = nls.localize('label.detail', '{0} {1}', label, detail);
+							label = nls.localize('label.detail', '{0} {1}, {2}', label, detail, kindLabel);
 						} else if (description) {
-							label = nls.localize('label.desc', '{0}, {1}', label, description);
+							label = nls.localize('label.desc', '{0}, {1}, {2}', label, description, kindLabel);
 						}
+					} else {
+						label = nls.localize('label', '{0}, {1}', label, kindLabel);
 					}
-
 					if (!item.isResolved || !this._isDetailsVisible()) {
 						return label;
 					}
@@ -1041,3 +1044,4 @@ export class SuggestContentWidget implements IContentWidget {
 		this._position = position;
 	}
 }
+
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index 7346f6d6938d..2c854f922a50 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -36,6 +36,7 @@ import { GOLDEN_LINE_HEIGHT_RATIO, MINIMUM_LINE_HEIGHT } from '../../../../../ed
 import { TerminalCompletionModel } from './terminalCompletionModel.js';
 import { TerminalCompletionItem, TerminalCompletionItemKind, type ITerminalCompletion } from './terminalCompletionItem.js';
 import { IntervalTimer, TimeoutTimer } from '../../../../../base/common/async.js';
+import { localize } from '../../../../../nls.js';
 
 export interface ISuggestController {
 	isPasting: boolean;
@@ -101,6 +102,19 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		[TerminalCompletionItemKind.InlineSuggestionAlwaysOnTop, Codicon.star],
 	]);
 
+	private _kindToTypeMap = new Map<number, string>([
+		[TerminalCompletionItemKind.File, localize('file', 'File')],
+		[TerminalCompletionItemKind.Folder, localize('folder', 'Folder')],
+		[TerminalCompletionItemKind.Method, localize('method', 'Method')],
+		[TerminalCompletionItemKind.Alias, localize('alias', 'Alias')],
+		[TerminalCompletionItemKind.Argument, localize('argument', 'Argument')],
+		[TerminalCompletionItemKind.Option, localize('option', 'Option')],
+		[TerminalCompletionItemKind.OptionValue, localize('optionValue', 'Option Value')],
+		[TerminalCompletionItemKind.Flag, localize('flag', 'Flag')],
+		[TerminalCompletionItemKind.InlineSuggestion, localize('inlineSuggestion', 'Inline Suggestion')],
+		[TerminalCompletionItemKind.InlineSuggestionAlwaysOnTop, localize('inlineSuggestionAlwaysOnTop', 'Inline Suggestion')],
+	]);
+
 	private readonly _inlineCompletion: ITerminalCompletion = {
 		label: '',
 		// Right arrow is used to accept the completion. This is a common keybinding in pwsh, zsh
@@ -111,6 +125,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		provider: 'core',
 		detail: 'Inline suggestion',
 		kind: TerminalCompletionItemKind.InlineSuggestion,
+		kindLabel: 'Inline suggestion',
 		icon: this._kindToIconMap.get(TerminalCompletionItemKind.InlineSuggestion),
 	};
 	private readonly _inlineCompletionItem = new TerminalCompletionItem(this._inlineCompletion);
@@ -291,6 +306,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		for (const completion of completions) {
 			if (!completion.icon && completion.kind !== undefined) {
 				completion.icon = this._kindToIconMap.get(completion.kind);
+				completion.kindLabel = this._kindToTypeMap.get(completion.kind);
 			}
 		}
 
diff --git a/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts b/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts
index e89c53ae4b85..05ce1746f1bf 100644
--- a/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts
@@ -29,6 +29,11 @@ export interface ISimpleCompletion {
 	 */
 	icon?: ThemeIcon;
 
+	/**
+	 * The completion item's kind that will be included in the aria label.
+	 */
+	kindLabel?: string;
+
 	/**
 	 * The completion's detail which appears on the right of the list.
 	 */
diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
index 7c4db50d7ba7..0c9752a960db 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
@@ -201,17 +201,19 @@ export class SimpleSuggestWidget<TModel extends SimpleCompletionModel<TItem>, TI
 				getWidgetRole: () => 'listbox',
 				getAriaLabel: (item: SimpleCompletionItem) => {
 					let label = item.textLabel;
+					const kindLabel = item.completion.kindLabel ?? '';
 					if (typeof item.completion.label !== 'string') {
 						const { detail, description } = item.completion.label;
 						if (detail && description) {
-							label = localize('label.full', '{0}{1}, {2}', label, detail, description);
+							label = localize('label.full', '{0}{1}, {2} {3}', label, detail, description, kindLabel);
 						} else if (detail) {
-							label = localize('label.detail', '{0}{1}', label, detail);
+							label = localize('label.detail', '{0}{1} {2}', label, detail, kindLabel);
 						} else if (description) {
-							label = localize('label.desc', '{0}, {1}', label, description);
+							label = localize('label.desc', '{0}, {1} {2}', label, description, kindLabel);
 						}
+					} else {
+						label = localize('label', '{0}, {1}', label, kindLabel);
 					}
-
 					const { documentation, detail } = item.completion;
 					const docs = strings.format(
 						'{0}{1}',

From 6e2d27b9bb02865ee199f1f9baee2cdb977b9c67 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 12 Mar 2025 08:15:06 -0700
Subject: [PATCH 0830/1815] Correct merge problem

---
 src/vs/workbench/contrib/terminal/browser/terminalView.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
index df6f8bc7ebeb..42ff0ac18797 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
@@ -678,7 +678,7 @@ class SingleTabHoverDelegate implements IHoverDelegate {
 			return;
 		}
 		const hoverInfo = getInstanceHoverInfo(instance, this._storageService);
-		return this._hoverService.getInstanceHoverInfo({
+		return this._hoverService.showInstantHover({
 			...options,
 			content: hoverInfo.content,
 			actions: hoverInfo.actions

From 0aa5ce75151173f9721875965d9304610ea9c6a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joaomoreno@users.noreply.github.com>
Date: Wed, 12 Mar 2025 16:47:18 +0100
Subject: [PATCH 0831/1815] bump inno updater (#243364)

---
 build/win32/Cargo.lock       |   2 +-
 build/win32/Cargo.toml       |   2 +-
 build/win32/inno_updater.exe | Bin 437760 -> 439808 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/win32/Cargo.lock b/build/win32/Cargo.lock
index 4c169ba0f973..5437686ef940 100644
--- a/build/win32/Cargo.lock
+++ b/build/win32/Cargo.lock
@@ -95,7 +95,7 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "inno_updater"
-version = "0.12.1"
+version = "0.13.2"
 dependencies = [
  "byteorder",
  "crc",
diff --git a/build/win32/Cargo.toml b/build/win32/Cargo.toml
index e2130dd2bfae..42958b3124a9 100644
--- a/build/win32/Cargo.toml
+++ b/build/win32/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "inno_updater"
-version = "0.12.1"
+version = "0.13.2"
 authors = ["Microsoft <monacotools@microsoft.com>"]
 build = "build.rs"
 
diff --git a/build/win32/inno_updater.exe b/build/win32/inno_updater.exe
index ef7cb934eb637a39ef4246012216e64dc6d5cc68..2ca110dea1fd05d9d96ac9c741f67ca6e5520234 100644
GIT binary patch
delta 200459
zcmbq+4O~=J`v2U^sH38HNYFt>9b{DS6%rK!6_r6OK~w}wCEb)pvwRzTDP^Dm^L8C`
zJDTlonYGr|u9f9WO1^-&g60-#DZXsdW_8(dH+)GD&G~<yb7y$5_V@e$_wT3X-us+$
zp7WgN?L6l>=UxgfbuYNuePg1~@Y|8&ocjm9r~I5&QSJZ#=CI7_dOTnK?AUoPzaBl`
zz^~=!ukq`V^WWhbA9w70Bd$NE9jktUUn{DA!nMtbxazz7`q%SxoihIkJK@&d_b<by
z(@hlGJfd5$>eQ3|vKn1)p`*}wfKF_q)9n*D*j269>5RCw0H#aQ?nRxhEiY}p>gw27
zVQ}X!KX0R}qoTSty2X2c8{Q>wXIoulyiQlMyNxar&png&w9%PR!2&=M)%5?P4#eMv
zckeRTF>j><P(cR>buG4GcZ43DFMNu7s&xR@wydw%t9=c%!P60zF7}E+pSpc`I*MzH
ze@UQw@X~n;7d@flr077B?jclIy=$xZnDDZ`zYxp@=rhGmm8?)dw3FFo(<zBo>67*C
z%`R4^A1Rt$FSiNB@2;>mZG^TXmf3V_HtX9q7VT!V&FW4KqRQOk?iSwj*8J2)J}Z54
z+}HZEw$W(Eer~&eBsKF4ldroPpO9V%^?JRvBk?1BvgrY8pDSnT@3~6v9qs_aN{ILF
zSbbDQcGd#j0zrL|-Dnr(3<q6nGcn#euOTl`*+92BwU4#Y>vGCZ`u=4p$yS3aPUq;N
zEY^ENUPBw8$nb`|iaS)x&T_@;<j+x@?<>x3Dt6@uQoDSk)~;oN2?asQa&v2p?5d#;
zQPo`2yFAz%vWdES+(%ND;;<UzYiiNcg3dLH@Gt*0y8QH?1pRs`vQ1KNn@$SSm7kRM
zwmEvmri(dVVgOUrr#I<!#ib6Rd_VM32bcxGEmeA5D+J0!t3k=odlwtjzq6g~yE-ik
z+S^SFZ94B_vv+c!>u6vT!=_CIORmO(%85#jMR~@oJQuh?vM2Si>85$lq2@<IQK?jX
z6209@3D)NgSs>VlE%p~u(K-~N!&LdYI%JfnD=Pg+kc!*@)^5Si0@0o{+Syz`Z`O6m
zm~L<<TLa{UR=qsaY5<@uA#i6}jmH2N<Ya50l480p1x>W#*O+c}JFI#<CR>dti{u3s
z*<l@6k!+1NjfOt%9Z5Yq^dAYHKIn1;U|DMTH#!|gP*fW6k&q{W@IjmWgve!brR!*H
z&f_y?`B=fWbQmK}`y0E^p{Kb0E7sUyl=#z0_E5(#vEnP1-La2Y^##lC7$vM^?{@sX
z*x?J792nkqQ}-mD_dE7s$0)Wb@ONU{&vp&zWDo}S*&yf&k8Z>8c?UZM&oz6^W{|n?
zq+X|NvXYf*fEg#*6P-srG70Q12?A6jX5Z}lo|n)w`2t^gVe4lS;=XMtSH(l@YUf3w
zFq+Mh`u5NihwDh^4Wu|y(b!HpU9R*@o5j7^Hp$#|O{Jb#1aS<smkK&v_OuLjVIDgz
zMTqB~X7$qSEGYBTCKI{eG7cK1+H{9|fw0;Q@H%qEed=m(YrX#55ruK`biJISuShXC
z`m*<p(;`}#j%NboA1F_>&UH@&F$KV>zPFI|35qkeBH>`asqE>XjDSgIft3b@i=L<0
zw?QMR&a@^n4<=1z(GQHDusKZ7X(W3c*2tz}&maY=21}#vOs>X&6|qXE>e)73!EJrs
zWT6ULH51+IJfqb!Owb*iHI<b<&{wRU&D00R(<P?Mkhn{z5AC%Ag_&#mn*@>eo{*2I
z(fNW7NDRLRcPjK&&YuzRR?5grv)QX%di9>x-A`Dv?@(r1^)LeyHC#QFo$nGuT?Gc4
zBY9U7t<!}nq5Msv6V=S<I}lY#DRhbYyxu5a8NuOGsWPGBQrUkC6x7B-uu2FOs6EyQ
z)Y?QfsH6QFh2cO_YiX`_Yc;C*s$7`Ljs}l4Qoo6MsVEg*n~<@tAw2^ZXWMl418Apy
z-jyYVJQzAJlaH8GIahLY%77cgwax6_ObO}kd|4}f0HvPL!`*S&9|90qXpr_+%86F>
zyXSoLWm+TEeH-zRXjK-%n<ZP5;P<*TNpp6SG+nE$b9D}%({5JP`!sR&3wqsCWB^Mr
z`^k~=N}npm^##E+n->6&L+1#FCtTdx&BJZ(wicm^=GtM{U^+MK1rheKpnobj8O%ox
zm7<}m@078Zy7ub2TpO<$pxRF08*zMICOg_SN}O26e(c&)+|-9j-G+DIhARJ4owSxs
z>b6rHna>1Ms(51!d&HC?{$&kgrV*V`XFtsWs8&(L&Y6abL)I`UG*XCVaiR0Xmx|aM
zp>A>H6Krtzp)@Nsv*LcM#Yi)Chb>RobO(C?p;Yueew#RJul*d4i2=*v4{xO^ocg00
zXvX2^2o!;*+K)I$auq}ThaV+yZvy`wKMJeq9wlylf^`fVB0l#7OAHHJ0E%FQ!A)ZG
z^%rYxg4`#u;O8~p(H{8WJM4NWq(So^cj5jtp+PUAi!WkQ2zCsBUI#0KUJYkuVJ2b#
zpZLG>T)}V$V&ZKYU^5Mx>NJ<=n`l8vQp+~2)XfBz=^G(W9$&O_Ewxu~d%dzpVbjh1
z#YdlDMP_TC2M_9XEm*nZp4Z!gjjz)qYW~gKeY9~FO!UG5y>36o3_;tCV5@qZ05shL
za1tX|_xWqYoVMR2tG;qhuiLn>1KZl;p<S6h?g}9k4Y;maz!57r6iIrQ)Su1i6*}F5
zd;RQ?Br-aql4^$MH<0>LhZ*Y8jWlCg%lD=B$Ap8a!Z+belfR=l;Y!`UQpBZdkN5RD
z_tHT3SW`ujwHi%l_h&J~O%ZrX1)<f^u<3K|DdZcI<=xhOurCxHz-2b;WHEK&{co~X
zYVeaB9%mUP&g{olT4qFP*3hVav|6u|%Zp3%f;4_Ks(;_7*L_N)W@k-RBR*kwE&asz
z_OU+U7IFMzY<zfj4CLPIQZ)fJ2Y~KPoIbE*Hs~R;j04zjQ$m><-d%jRKfmqKJ2(LJ
zvEN2?@2dXoIhaRN1Qv*n)&9@1xxGiweAA4#q_jW#OK+>$Pxzi^HPsa%Te&<tD?^Rl
z!#us$im6(6>mvsBCLX9c&;A1cr>nHKJBP4^y?e6T5g{F0^u<E05eD9k`tT~2Y_*8{
zcd=Y+y!iTF_NKL;82k)7VLc<hG?~58$12W0!v5N)xAP4<Lhml_^?bx7kr>5-UiJb2
zRnImN@-`@%jFbahM$H4}A?K4TG=lDpfCiS!(Qut$;L4Isxi$(#yUS;NcCg#J5Ta=^
zA%yw|tkHn5+`dw)F%<Oe+3NYdzLUk9c6PUK-(k}iKy?mSCqj!Lp$uF|+PJ-h>+B!K
z(Ctyk4U;L|W}?FCc`UnMPjkUXNxCVM;i)&F$h(PO5ZTDL)mg{bZ~Hyg8C-;^`c0hO
z?l(;Q=|dJBIc6B~*S(vMy@`6#5zkj}14f;rd(!}69{vHccOoAax6NlCjWMw|65F*^
ziSpg-o0Kj=M7@vJD<B&LCPWPpPv2n+qxz5=_XqQJ%h=YauHvR#wl~TunmMi^7*&h*
zWL)cj*<*7b;JPboCWcz1zNx%T@Gsl!TfipuA0(pd{QkYf>GRne{X@jp(%IhrQ(Lh<
zctD((nvOw)vL^?0YHNDRKM3X?Ac@n{+13F)g#vbPK&aUD2&*0t-je=xOIX{1dqn$R
z*ujC8Uf^Q0<#~$SpimPM5xV|K-bcuwu!x=WDJD2uWZjKo42On@%5=dvNX`Xp>Y#{D
zWFP?eMC=-rC4{pJgUrE0|I9;HyB;+$$7Op%)`znWgC~gb@9vs5xV_Ml!iZ<sQ$u<T
zBUP<k4xO><8cBdt)tBDoNW39MAbSDeYdEqDx<z>64Jim`2Z!_#Ph_wwLx#77(9~z1
zW|rts^K0qA^;h(bj%lUmeod3hdA0puHZ3|)EPax(=;%Q{@<{>kpH7|dG+gUyD^`-h
z%4(}`CFy4vtBVfx(M?WQUAd5TjmZ#K+L=9O@Kg7rTE6gqKn04{TPuMC&W<>*Har~A
z!iRB_e)}oSq!S0~bT_2@B3@sv*bhw<9t<Z1@dpoV(1VM`H{NA$JUCE@W+xv!EB^jZ
zcnD$phjtSt?m9IzP!Lo8xa)H45J4Q3%Z$T&iF!Ncf{5@2h#4`e8IubImLy8z1vlJe
zs}-6VKBAj86KIC+lXU@mV|YXuNI<Z*?govc$ht#oPbv~;XMYFwNV2y73i~4?`cZHI
z-&6{$I!D)EGj7<ZxArNT;&)rE=v5PSj8`e*t-vUvFYnRX@u(x8*L-SMdn)<V9xrj9
zdY>2l(>#skqx!-jUK`P^kA^}jx`BY<*GV9842p}ks*{2B#SI*5v9|@m1)$&OuvlT-
z60s;9GZ^<qVX0)unyUc+Xi^4y$*&m8Sy^H%S@zuc2_)$z72FpecfXIk7oRL9PJ&|&
zWwRdY8%jP6NNd0lpENCBjn%2oKfzvm$ZW`*1Tqiz5LxL%+`Ts;u6<~TX#FSap73a^
z{_+zhg}3ORuUZ0|i6!0L7excIpfei5wkSk>zwnMLqit+R{7{M=W+e6(FYzYik;C4l
zFyz;Gurq*oV4c|ydX5gs<z!^>WJj~mk^ofmX0y<de-yrD2S-M=qW#*)UhNvdVs%9+
z>o#hbSo0oBAN7Ym7*4Ag*PSB#@#?oww(=w>>ui`>n~W=4%5LgStncWMp71Jpe{b&6
z0&&7xFj90qEQdWhdV<*DBHKPX(&rjXRIq0jJ3l(s2Z<$!V;1Y4w8HQ%=*dvOn#z8c
zG<YZ|fvN=7c{}H|L-r~6U;wga9Wlv~4FPmsjW`~l!!md_53SVVf9Y6blGza0AA>qo
zEV7<sG_MyslRY+OaJwr3g02M1_Ls(lbV^^!<v;?;jDlMqC#pl(tucMXr0-devE6$4
z)Z~|QIJt6&Y3kTP&XXfFbLb6!AfJ<u_=1ycb=(qi%zEyXs0XBf)>}()Q!*FgN3{kF
z83~~ER&uL+9wEqrK(&28-V!Ey7XY8mR1a>VbzLOCr6^QnpN^4O=W!E73nw`MB(vq?
zdXf^oGH#r>Y&g3(u7`MK5o;VbTKr=lmXI7K?u}s6lL!B%#r%C|x;BWHLotYG#6~Oi
zha6Z>)`r8&whFiU+FwQQYX9f|_i*c-=}b-TGn&`GQ24*s&+-xRFKCA^JOdGIqU~77
ziKjV7AoW+lEBOKxVZ{~JFJ+)u`z@Q6@{pL>5BAl!b7^`q@rzXB<e(;NYD`HI9}H*S
zj9zTUc!b9r*+Y}Vx@a0CU-Qo{|1|5_+vCTI!#A=&PmT&ZVL^iHHS0-80BIbPd;t!$
z3J<EVjSWg2BGw&YIjIriTQ4zJ>Iy><EHF!rc!`M<VgrWv)U)^rgN5&yeS*cj`z7Q{
zkLsnp$<|C_B@Li)9VQO7v4(A*5H6mpVHFb|6u0+dcP99TfKpV`ssCm}9_|~^PcN|P
z51XB@!e1#^?8uGk&olUKD)fG$T1O9=NG<rLOKoK8c>-%*19@ht_?x@PcdX|QNPYiE
zfUdSm1JD#JUr_&iU-iGVsGd*NrQZVrE*RU>G_oz6<xlJyl8F)^tpN_C1FsO#lV`9&
zj|`e}h4jSz+^<a`-KJ>j_5lKvCi{@fxyr#1bhX1U`Vu{U?3GUf%L^~*b?THIY{w%*
zoGrBWoyi)SkwDW@Ydy>0qYNZ9Z8|gA7eYMhxo0&UbRcPjxTV=$@kruPAF?{6Jz663
zF_rkM_IXTT8IOiYKbHnjCZ#1KoYjEc$B3^U707tjV;t(L%lw|Cum1gOeov~bp29tv
z8F3H((c)Fzie><jGXRKOfT|Fv$;Ca5qS|TaA<ax{l9qk_{e0vn<+2ir{_J*|zuF^B
zit<>k{5cdO>oB|a&1+~zI&>CVG>p(9UyXVb)kr+l{u}E&K$0<;kk9hjQe?C5sU|}+
zv6YW^Wq(c!B{%cewE3bwl0#F|9|)K}*v7V|^`VlY^mx(IT(YjYq|2nS;tv;C_M~xQ
z5>*H_I*@ipNJ4!kTPK#Lv%gNVh$GV350fIYpT9$Ec>}_z;=uu63X*Ifer6VD6WKc0
zL{pzS0U(~9x=*%a(lkY>Mo8K$TQ(;nOcVr`pAjA~tE0f)%7}_Rb)i{g(=IlPX+PjT
z`MB3}{{s1&sLw^+;8^0t@7BVpL<K~3(X-siW5v9+<V1S3@5Zy_O-=+#<aZ;ZUSV~U
zhl!ueVg05=2NZYHv&W|N5-&xv=cZVt+2!zKekZW_5%$59G0rst_anrGeqa;0K#pL=
z)D|LKKo6P|fJhDMWAxm@1N0>6`aHnk5}0%+P22|32Dx1AueEQ<(ry5`VM*%5!2o0I
zT$?|}eQgrrz5SbH=vu(T$bZsoUlK^#`ruk5RkVdT9CgZWuNUe>8V+?Lt*X>?g4UXm
zLlD`}TC-ai1u?%G<UkpMGM9)K9$-b88DhhJb~bamIDH6<p0-R3q#!Abl}-y2b+029
z>d9Wq>PouTC2Npqp~6r$BP&Q;H-tTtl}rV@vwHVf9--;OHJY=}U_DAy$w%bdQ&rDQ
zb|Whx;DZPBEG9d?|CDPObSvVMwAhU%UyR5<JMSC9Hf8sHfR7>BYI5U$$j^*8;$-&I
z;#7$xOiu`Sr=y;&nm&ZD!D^D(2h)2|{9bzic=oS+5PbY78QdGV6M=Y(IoPv;_}|Kt
z)jr+Ilc~2qyswFwYlkM(iD@k~WHdcAYe;}PB#ljav}>n!y8}qL#0T{`w)D|HLLPhd
z(Vk8_)`)7E%a_OFc{Dp0`43LWxMd#37Z|khk@i33VG73)`;qEI5<VDequ}mS3O6w9
zmHOJF1j@9o+|T!o)t8;@p~nVtru81j7Ctukfd`y?L<a2BoqI&kp()$(SXkFKVO&<^
zL+rHOj0J_7zJ~q%F|)X>FT3;D3iF8-0(G2e4VH>0K=!a`itV7Jbq})*Gy25O|B;6~
z6r;O+i_YA1L06z<Ec8+_ZRm1yaAMyBOg4c~v-<MG?CK0tf|^QxN)N0mRa?*VJFxew
zcv3%WD!i!`R)J0wHc;UQZ1l{L0o&T?nRBMK<+A_lB(`&ApCLaXf5=njB^ENU@97aV
z>PiqQVPb1~<WY3xYNnqxFyPXT05)`1#6#b2!^DIfP}vWL{a2v8C0)^`eLZqhT<f)L
zru{BT>_+5dq3y)M4D}f&+c+zDY>WB!@1y;4b2wVd%#$ux5X6@cf@mlDT(J7?X!iZA
z@X)+e?nhG9z<=p<p9aI$IU7frm?fvXxbZobnA0y{e;atuoN#CHpP|p#*8oO2nrjAh
zmZ$}5$?()K$8$BN{24%$eO1de5OEctFA4MkK;ZC9a9CUR`Za$O59`zo)Wm`0@g^&!
z!=MH`o+YV1hFtG;b%}<sr8CUYK(zWt8xpemhz6?DKqOi<4j|-5^vJE-2#itq9N$K5
zNw@Ox9-=9lZFzh!Iiwkhy*p6$na20pMm~?iGn!NX)0z(}RsS;aiP<qD?0-WSt)qpn
z&@E0I=oUQSn{2!x4RAD2Ro@zE`xPDgY<B1)D&h^F5o0Q8M2Zt>&_41p`Hb4>UG7q*
z>p!g~!^9Y})%}0+dR<5Lwa@+xkG`7+k|ad%>O+YQnPYMmYZZJb)$iZo@#25ve_PPm
zn*Y|7#DC8I+GN~nQ!RMSr}wiOs3rT$HIR?}R?h#OfYp}M%;tb?J_wp*lf0N~6S<0i
z&SB!VD(3vn<{@Cpo0b|3FDH0vwzmp-kYKr7%cNmjy}J0gRQx9dhw%-0za=Oe_e8WX
zpE;fwDPCO4c0JLDvJ6v|9RD^9`~Hapr1pBxoh;sdlI6|qCoUYww$6<oV8gi?CEwvr
z&y*Xz%U7yD>G^WTmA|-YyRRw7AkLd3)~amYyhuqiJsoxzW4!A15$v^jVWKIU?VlI#
za}fokZZD14<()T02#UrIW^TpWQfM+Vfa=1H>^D!Y=?5I@d&9Kp4v8Dxu_OZ)SFlr>
zsr@#(ZWwE8w~99wv4Qqz?r8@OW52N{iq1uBoBc@+DU4;E=3Dt~b}Sn)zjx^BdBi!|
z1%Hk1QUcxiffXsn_4C-$`Tazw@*n1#O>r?)G||0w8~T&CzKh?Alnl#P?2GxK5j0(9
zyHiXV-sREimQ@tr1S(m<?hRDgyF5va$Y&iF^cNEcvJng75@|WEzB`n7X;!i<@@?ce
zd9LQ>zo@Cfm5-d{FV4IuIjKs1@|HqVK+j~z%g<=+_JeymB}Gq%a5^gKdL_%CPI(eq
zmx64A!7;>@pGl`&a;9rZt)@g`r>A-a7@ri_kf%b#?E_iLQxT#ehCTIEsI%30?qIUP
zc#vx2T}VZAN~m@me&jN{;ZKmuszqE4Y8f$QZJh70)Bf!UsrYnnH&Lx8v|1kQ<x+~*
zl}}qqbh^i&(bYU47O*gGfcich`K7n;)9?bNQ9fEsodil9n*%ia;tjw%<!P3?FviL2
zCl5q@3weJorwnxxT4@bP{j>%@Ed(qHw3Z~1-ZkP8IgJ#<enL?)00qcq@b>oE8Ne5b
zY@Z*W7lY979Y8(x5TW7|7}OEZA2vN>-qxwx=y3;VQd2>PoMMvG&CR{oR}-}~S7od3
zE@D|v_idHYdg1ACv1mB^^V8wuqUj{Z_wolOy1rw^Z^hb3{6YrainUhU?W{@$jTYR^
zRVZJrlQ-~(KhnK7WN|p_{7kHrNKX~WBJfKxoBT|8mn5hOWFUQ#W6YJ!&yJV#lUeaI
z<D7|kAG^~NO9J1dqhL8kIUhT{fm*lJT)p{dfX?%L?nYOsD1BmZ-L^P>a@}t4s8h0%
zT2*v!FoDZ*R$R8a<jDYtP!IP}vSS-kKYR?BEs(U^in%>yI@Zu@sWz@1H&}3!D=i8s
z=*^}q8uts@w=WtZnAn$#`Z$y29E+S2xB%l^NsbJpLYKTD3-KUVz!`SdG>%prBY`yj
zavt;PV8gRgac;OySA210v~W?rtmFiG3N*S%o?w7{VS%_n%vSS@x%w$NiAo9vX!I1J
z?qL$ZqqP(93p;LZ7k^HAq0R!M%rdys?b+(}d3@kXjzh_}D_IMb^u@0HL^vIbBSOBT
z<R{7L201IxX9x0Se+v23;sha*bz0Id6GLgXkBSuH4Ms?Z>AcGgO<QCd1ytr4;kU9x
zvi<y|`)v$W*}5hDg3NFF1wqZ!fB%7%E_t*cDOUiV{lYV3$oYZmaxCg&a|7UQvn)Qr
zBrOe&JJ2LbG{TsSYRVrV%^YKMJ<QqpI6u}>z8frT{nEVA!Q*mW4ZWq}V`!?RfHwv?
z$9&2o=a`}@<Ey3T*Mce~$LzWzO3#N<q?@(Sb;lyPc5t|fB`xa}b+w5ABH2f%eHv)U
zGAQXFBgaqfx@ALfLUP}-M8V8{S~eKJR>z3Gmwv7N!c4Sp)ws~nWqR-!Iel@iYo(}j
zC+Q_ygIrxZ3_*l^LgPGVS-PDx#=G1EO4M$JdY=+=9?-myz8C}YjpO-Dn%;9v?5blf
zD4U$uuiwf0sZpm)<vhP{EN|q6JDbF$^$FHN`2*E91;6N&>l|mKQF`8nPHXExck%JO
z_P5G$IB+bq9VE$>Eyls^Hbb?~)^s<0W<q*qUJp4vknHy^Q5nt+nB1TG#1>)~9Laq$
zp1nLOk}IjDNl8(Sl;1JOufK7Ab^mC&`F?$@dWC(xJZktp66_&zx$@Rh{JLKuh;Uop
zaFm|X6V)511F(ymke;~2rtpf&)}w6XiUG6<>Rk@!kfEJ8^_)}IQkzdnRs+@^U@xrb
zId2Z;hNe^t3{gGXM~gI)P@tqI%N64)QUb|9<VkcmG9?i+L_0Yr^HYjG<oxLsDHI%%
z-&#wA;kuy|SL6VFZtUz@6YH?Duamr+`ok&ETAGkzUkpzWNNlZC)>=uUvxvC^)|zo&
zrs|Ux1TN5LsOuIW`2wavck-uuUUwZL)Ntcw;ymc0Cr4N15cT{^Gv7|d_~%)n95RPf
zCtInjs5_4MGLPO>q4zwHJ6P&f#4F`)WK}DJX*KU%-YhZCMb{zjai|v>!Tr4`DVa+8
zba^fHg(=R>op=TRCA1ZMKy(KoIDlN)N?1S-e)s7LMtxQC^+&G@QPt$gZ_D{?_No|X
zHFB%_z0OfzC8S%zFh9A?CLqsR=+3db^Ap`0E&-kU6~d!+v=Ec2))AlG)<&X){>dqJ
zIVVx(1Hja0G$x@Mae&Iz-c}NDpzC%(o?S^XD@nnwhIV=Ll@zCW|DZvO=akG@x@?}3
zWE^T3ni0_cgjD<vno-46OYw1e!@IyCt=o*<24$sLDndx(*CU08h%v{JkRB4jm8lq8
zyt>*Kpm);q26AP-?%L$_Qqs*Og9bgBr%W&o4U+aw(7UcV=eIuv!lWYFBnNp?@x^Yq
zX=o=E5%I2u2c+WTfN(6v8`2`3^huHt=SVB*bl=9_{FGm(ZTxx>uybVy+t79KCNyf&
zbu9vVskf%>9Z@8gxxOit$0P;-F}u5FgELr}ZYjPft;@r5n-B6~5Y&VK!#f_X4Udjf
z)`n{X1MlW7Em^vB(b8t#(P)Y{5SFzyV4Jex3VvHkFtJI3BpP@kx;XK_Pk2pIlT$L~
z^y#z;Nl(Q53aRpl`cycu<}XyT7B@%KJ+R>75w#tw*blojscx+q=U-j7MXC7b5VXoN
zD`O#f(b3=4&|WGo0}SW0R}Ql2oZy3Zu~A(;L!1B81L@FXZ6&oDYs@W-8?+qR6g+8D
zWkrgeZ;Eo=--!0Vs*+pDnkrHj64@=3v8;<;SKARpHnF!P3ArGhIv;yDh+c}m3vL#W
zCZAWFlK|s#dAwbVhLFo2duei+2slzuXn8^X8%D8@?x$uW8qH9RkMU8xNn4_rxiPf%
zsd7qOZ88r1YXd6bo2uCbaPL|mS6N@Zqz_z;MOPbwT2A;RC4Hunlj+L0!}uZNum(&o
zG5FC8Tu!%89M$OEOQTlbpAW_#)!#}<6cDIM#XGSJqvRw*#fsjh+w>&Y9YHFdfqQAM
z;A$9vqwBc;l&E$!43dhRc&gpg8CA)|oc{4-$QA0iNBMAkQA?wIsE&rJUVMqK_Z99f
z6z+`VQ}yQ+?wgm)A<oXn1SqE@%IQh&EUr^rfCrj15^C+&NZiR;cEs19s3OI=kapag
zg{bwd&JTk3B9hgYOniCqN+O;xb!>>mRoOa`eh+16u(iqj8uZF~G{DTVp$J#ZA+M07
zQ=5Uf%3EKfo)2Bcud+205arNxL1*EMl}!L@Ztxc*vkwZ)&P2DLVjpj^5@9vE*ITLI
zkAZsKo0V8-V+k>kdeIl&DoDZ&0t6AeNiEAjRi_$o2X%;Ga>F3FlM0Z$RYe<kq=Hmj
z`4mV~XRefAc0+O^?3`BE%UOvcspvF3qI|g`WiFmT{|@|C0fQ%^c}9|YC4-W+yHS*|
zmRjLNdr<@0Dc#(Yg5|3EYN<dWG_UB0C9iN+ZJ_GP267<sp(?sRgq#rAM$DJ1<X4<`
z0W7>e@5xmQ<qanZ>!F+UyS0ISvn<Lh1ROT+=|#)rlwi41zCA2&-m=Ao*PdQ9_ZdY0
za&_VLIZNj~Gi=V%MRR3@nXgbU(%vb?m~-+gI|<1J`Ln|MW%C@X3a|fW?!4tfx-lpv
zSjaa7Wm%-{&hk#uj<POtgS5TMC~a>vVg)ud$2c@ScxaX-ra`zIlx`8wF&15ygR)TL
ziy&#oXOdhd?WpP~Z9f%)?7~oLVkum1fm?^+nGmhUWSNHY-eW2YuK_9wjdE77l4S}y
zFQ*&j+d`HlD8(RcKkr2Mm%GSkr0qwH(vEW8aXv<+<QQVA;Te<^OUx0WGU$$wWt3Aa
zU_e%!oMS+Ws7sDX+TH+aZc9qOX=sXNXgUz)$A#cY+R@li$&ZV<Ff`vNq!@!f!*G$3
zlFRv+KSQ6DUF6%+_H#z3wBwW!OC}m~N^s06IXzBEH^h7)oDVu8<OkDo=sbxbD~?9L
zqg;}<mj%hy@*V1J$GMK^SK59CTri>~r#Cp}Tuix8*(J*af#FpZIg9WM7lPnpwx`5(
zQc{AY9e0dnKSDx7bDV~llsMEPAt)(vL(`4I5#FC6=mcOAs&-V?l1yVx#eAlu&jqKI
zB)xoDzEJjKDCY>K+KTY%n2V56t~9&!y0o|yI*uRZ5a}`WKd>EENvAL!S7G{X#Nm$=
z5Jmh*F*$EY2QCZca)VYm{4;m(-_b}X-;O$^a0%wdPi}CGbf;orX$0GI!^>z;Ux1Xn
z@?2^8X`np;w8s&`_W{tIY%;pajp3D^!d!naSAS7SzI@jmc)4~RQ2RnSsR(&icx~<l
zwP;R06<#K%%mu}INhYMF<Plw{rsM#6pj4;|ua@=(wktX=$%g@UXVevZBZOaown%%A
zuQRt>H?x~jBRh(_#j=_JjHIl-8ZVKxYp57Q)~56F`8%dG$#qDFjSmc#GfEzFS1O92
z9eLk!wmI&s4Fq_<k*Zb+m98>lghpjM`G}9o;u&b?`9?mc8LZ~qynD%ty?e=`y?d!|
zbyp73FO7(xYxQW5E7=!8Hs?xda5S*mfq*v6i@`XvgWwaj@0%A*wQm_(&x__&E$2n4
zkPgpibK@e^RJK;Ks<k0bn|#hysxSLd?+LljvAIfvCpr4MR^HV)ZYn03yE%;y{wy6_
zEQfl&baB_ObA<R9wO7T+n$|VGkXjS#2AVjad;xG(?&qAObTr)hs@g)dX{I4}BNPn6
zPd5-J<nt9NiFawrOG)A@*;l?q?TVC%_|-wAc%yJkgRAVWyn*2E4SI5>Yx!?_CZe&5
zl<5TsXymM!6)Cf4e~-KLWX${(9a2(h`c#*+)w9oESTqg`faY8VMGac4OlgXR_pdBm
z`FH~a1uI(@u!42L^IPFT7K=iNSHN~Zf9lX_6Mt$~kwEy01H)|@kSv+qA|NqI#hs9m
z@&zO!-KHn8pVv)Ej&mKUay7PJ(Xk*uPM6naj8L`gG8eTg--6|rT;c1sMLI@qKrEHS
z&zoU##6dI0<b*+(V1IGOECs}YL*>{-B-@*g5C?%RLJ_uPbgy89N+^|6lGJy93w_H^
zLh!@}zu3*BCDu*UbS9c2=R&Q2Hn49-_hiq#DEVGDi>3<Qe7H{#AJPqQt?W-P4tAR4
z=~g*4Ql36gGamb^{LtFA4rBl@Z@%7hd9h{q9Ed{S$bfnG(!x#KiYmTHXWAqjV7sj*
zI4B8Vsq?naYop$C;vp+o3xeis*XiCxRJRd0D%O(v#3DA9vrNv4wbgiv!2if<;TNwV
zH94@>GDi}Y#~D1OydcaTi`=ZbD)HCO<pdy*CQjUg{J?o0%h7opEF3ViK~L$(u&Y78
ztdldT_H}eB^(vsg-JCRc7PQ%}g;R+*f}(}+WD&kK3GTG;4{J+b6fb8jhEDlbGbxVd
zn2>9}9x=VfIwdO^ixWXh_ow|$U{lufw+Z|P!IrMKVe4hz`d$+$rjlPFPV+r5{A%lJ
zY%(BYJ{Q`LaJ|<8FMphkM;JT5r!&wlyfd3O+!O2run2d5piOs=p|!ogGg>1qO0gg^
zD<|7Ig>ki7n`LGCm_R;(dlu5e7EC~>tgXOP_zKLwE=$z7!<k5)h+3(`5JAGgN3>d=
z6@J#VJp1K_hi~g|xrw&@m~BIUGiY!2iyo<U1!cpm|H()Vt&G&v<QT|EO|6V{;7bqw
zPewXa(v+(b8u6<}YFgi9q=#PW7Sh5<Pj=RtE)IZ&T3P3fhG4CfTd3kI9mV=@90|ir
zZEcdlZGK^rODPUcNmB9?<rG6JtModIN{WGYgpf8gsP8_*Pn+^%rVF1X!?b9I`NdYv
zF#iNhF&FW^wH`6b(t(u!P*MjLA9wUtRz|vR!*oA`5T(8Cupo1E=51*)RvZD@?&Epi
zGGxkiYSLz&E%ZwUn^=6u*5BRaJw$Mz>(C`&(>X$wLp8YGZ|CI8+m<>8BQ3(7`fX@*
zE3u={bHQ~84h0Av@H<^|lRTBR7WUC^Bb~!ArBm!){VBb`UjHpPL^0sT6cg^xNPD{l
zAbNQ@CD`ZIyJA*&@tI)5GbY+YGmICiTxWF4_VBUAT&(>8DO1<&pk>=)N)hs<BjlrX
z34+<Zqg@qME^qr4UzJcl!o@N5|8SfCAg~!P8#{iKi}QXvu;#A4$(Fx7#L0Kd-kLyi
z)O(_}jU)2>>Oh>-fL(!+^mzZyS%KC<>Nvl$VE&U{%_+#-tMTnB;rvs_=V~^`cbDwJ
zaIU^>F!CZ9>b-|CJ7hTnd6(KQ*gNB~LQO(%C1juKU+9q^-gyF<krrn(UZw(QhwqGr
ztLc&JtOJjfKSR>Yf{X<6K2IR;GiRB-b>64w9{O-Q^%Edc_bUcG$Q$U_tuK@}(CSdx
zKmwIF7zvnem)8d4MwPL#j?HDg<l2Bz&HW=r`M=1p_|tu@GAvG=TKRJT7)?ys-IScc
zLkp)?v6dG0G+=E}j~idls)ELv*?feJZzX-9di!(Q1y$d|qqKJ|<!Th}u`vrupKJ}q
zb6JfM31uiBW<@6%qeU%V9-xEr@gz8`G|6YBN$P70V3{d_W#1aw-;sHWwAO{*TkIHG
zNwCp;e^V1|6jVbyyY?ZbRv!)0C$CV~$_AP|d<3Lh<P<hwQ+sCsdWUNeV1<;0Z$&^i
z9|1Ln_6?eTVY+NSY$NkIpv4gz&d3aP8??6tkq7Q4vVh970WFazpJ%t@R()bNHYr*p
zo~OC4n%sN7#M>JR-{(Znq*yEUI!8yk&oHR*zw`SFOlwUB?>cIlRi3-?{`M{&x$wle
z7Ol``S@wdq+C~8Du{pF~b7%jda&z767IpJ6l{7h?=A8vjhtx~=e@RF)Zf8r}b{_8j
zG7kO^gCr6D+V<XmV#=@8cfJbF{D%ez>($6z<kP`qyuzw|oWh7BxRJ_J7G;@PSrfP*
z$WC8N(B9Y3K2EU>YI|!OK29;v_i+lXu&6X|HjWWl75Wy&v@G@Cvnlj;8t4lZjyaxZ
z_@^oSm{2(u=MMw$RS7*lOkr^2?e}AN);>nz$6}|CO-xna=9qw})dwf0s%e?j13oy>
z;(HSsE!y`cjCgB&%QAC77w0d=L|=UPFUHi_Ps#t=kRHJYHtrkKUmqvhe>tY7r~WTv
z+OpUj(DnWS8SV7RivMCjgZ*Uue-G%poL?W1d&++|Ao}LUe=(qRKN<hu18U>Pbf4C}
zKl#5IP$xUR<K1#VZ~4t=(EVog8?G#=dbmZ{(bKbhjKzq4<5_gS84de&Gn$<2(>adD
zXGjr#RQC<(vyA^`Nc8yymhyYc#L_ApMX{;=b0}%*+&^L%I{VJBWUOJlA=BY)+<B!H
zwo)B%W_d&CaDz7_1HVcqa}6fAf_HG>$9oF-<}HJ_2lQZH{JyPlg`NHVaC&JX@3Jos
z9WoGD75($_Ix}wMS7{l1tW5)UGIVl}I@-|abQ8ZVv)0H~yY|gSJ?w)O;P=f)?2p}7
zVSml4Bwa<pY!nj`^&k$8zp3KR)eyjxKlB)T6!DzY(QUhQ%yvnru+`BDZ$DLtIW5~t
z?T+;rfo=-~sa`-$I3Lf)Zd-MQjfcD#b>@2Z&p-5xl5Le0Hp()CS(mahCaYZn$jt`2
z)Ap&a>JeyQ+eY`dD5)b`@<vyuJnxDslnOeU<^o-R4W#F5IQZ4_`J4NmPvQBb?>hlk
zO^P6Yf$hk%t_H7Tx;sN~n|1MLr157yrHB)W4Qbp3oPrq@a~!M6&dMacoOX%FI<oDG
z+xGA!IjzQ>rpgyG)H?}0es!%;1?&gguFB)}axcse{QDbO>hMH_Mrl`-X?0m@f82ur
z%<S?Bw63tJ+hf?y*DS(FcIveuLlTXoQ+ogReu!3OnnAGzDi7<GDF*Li3%-t|zVj$o
z?pftq4j%|G301q^eZ8aL`#wjbI_4fbxHaCe636qh)G8ypw>2gy6(9B~$-=Pg6LA{d
zZbw;$8aa{+1LwzX;u&(o`oOEcg;NmPFdO}#zs0jfZ&>Llmj81CZ0j4{hglZ1u|Kd0
zn(F^xlaFi=ou%0R!xygDzup)gwg7L|L9oK*m{KH*Ih*8ba^qCh7|%v+>l<uUmKYLZ
z@;aBS1GVxOssUL~wrtzZjCsSghV}AuhL}=tN^AR>+?b^r;*ili518_t!Ba_JmuUV+
zd`vTx5Kp{$f$A*mm2oz+hBw2-nyM|G7YW@X*3E|E%4wBS(H%sIO*@X*Bph@nfM-u8
zu<38b3y0XtZ$<Zh6Lk`%A*J#vRsN)d`?op^-JC9L)FHzvJzv1CyfrPGEFB?`^vM_U
znxloc3-GvXtYW()Urw-9$>maUZ(5a2JLyiV;-dx6Q3dY>;S~&J&6mooOUks9wLfFA
z)f^fEA1nCd(jgsVIX6&2xFOG~1~vGuS@9~=^$hdj0b1<4<Xy^AUmwQ8w?8tag%IIg
z;FP#4@_%NEYl3<SJC&LWTu?jXgsIQMTx+T*w95NZTVgip!lCU$#={M%&ovO295GOI
zx!lu+?@wk;nX2A=kdrBokRR8}D-3?AX=|&LroOJLD`Q#g+jB$cTWf{4`DfZrNuQKT
zpA_lveYW@C9!j5S`^Vb@=pwx{(ph|3DyjvqlvTlpbh;qjz5#eZPWvB%lzdFMAlvG&
zn~)dyu3jp-Kqa=T(8?HZ@hupzRJ08s*F6JTlCW0e7j@|n*G_&yU{Q}!T-_`6xzdlN
z`2V=;`v&>OM(lAcx{IHFu8IJItDJrPPBh-9kp9%w`2|dWR$$bPfIMhs!KhN{_0klf
z;*q@T%B*1c1flVkAmsJ+JgSTdc26ZQIY{dg<Q4aY4pi8#5GknT7^W=IN1a_h_+3NZ
zZ<H}6dNTpvx{+*E(%uV281#F1=3Byu{&n(=m|OU^6CHe5VpdjJ$dI7p-n=W`ygKza
zY{#GaIxEH)qp51zRoPY}?Hyw}HpV0<k5ct@HV-zITC|X`<c4ih)SCBx3SZQxOGWRX
z`GV-F-fW{5e_izql5eD(@|^m&GRCM(CQRdiTb_0m%K3<+n>Vk<n|IY$-C64R*GEF_
zER0f_brtU;oo^=aO{^<@-ATm>sNu~E_U0MU6G%V-eZ9>Js9g6c71mcntQ!?uols3~
zdrZrI#v#`I&J*2?fH%jN-Ubza3!8utl(ZT-702JwJnK?TF~@690xaK%zahO`R$GdD
z?l4&3d#lB&-n(9WZ=XQd<iF_o_2C`;1##g7w*38pJ?KLoAf&=}lkU_<2DSLO-AVTN
z`yt|bUh$dxDtZRCtk^Ua1!KD=NEu^L@(d)SQ|-&J0R*WdL0m-kNps3I8D_OcRTc-j
zu_<M{Qhdu{lN(}A$9O#^|Na&$_#jw#m~H-`|13veoE1>ks70l##KfB7(~chT*OzrG
zNbFX+rb|qzCkRF8jbA;1dH<3dkR7&N#{oWAFKRo`rR$!NcKB>{%d%oh(Ono$B3<XH
zXg2UeQ^qKwDy<GP=o(edt5K3nq@$J6-t$Gr9m&woya$z8U=jCco}tuO-A!ICtuCr;
z#Ss!mswFGiKYLi%2Oow7nU$3mIqgcbuVYmo=C%#4wL|u7;?9A3vyx$9t9SOc9tB@8
zY4LcW!uF+wKT+mfhbSZfle0YS3Olm%kpWjS(3Ll~fmDTmSCCX{EV!$TyD8hgl=cR!
zvt3fg-IZ<CEbgPzhASD~*gL4q9{6}n$17e(mEId$Mb9}OkHm?@*FGL69t>sQd>j$R
zKPq|qFnKC`PBQ-TVd~xYRmonvZipk6vEbc($z3Jxj-bn&-Tg%Ub@t-!vEuYZ_WACo
zaM_ixCq)p~4P~yqy~o83#g{%rwE%eFCU2En9DC&3B}oJgP#5^2NsjG+P9$g>70WrQ
zTXb<1190|GrtUR|?M{V1o@zysAri%Wf56URCn9$B`lPoQ7l@-UFc0~YZ77!;3Xc*W
zwaHZbQiN9hCQdT7XpKYDtM=!KPxWMV`~T?t8l9B%Ksz659Ld3Zs??zdhy`Fj8Ep%g
z1u$-9n33_droyWe;ck@f(EllVxw?IoRHO?8V7x(D5eR?MzD_C%004eP$u`Qft|*TO
z%Xz9?)xKJaExL!ioMO8oV~#r}RFOKC1>uD39e@+^YUIi=n<_mopt*1s`}NbR<yl{{
zM?QVTc~sgvzWZT{QrFpT5CYA^xFbQUyO?%9?XRK``4sha94Q2!lr(i8)kogfRjreY
zS95<-BNtynv?RN0@arzVg5RcwbNvm!RBYAM?6OWiSWUHyopHQTB5#z`vQf0w$X#3n
z{Px#;G<4UX^~dmBP*H3FeKaFf6c?Zt-Q|sRySb0Nt_BfOH>c{ls^<^9x9e&>Vkl+W
zrQG7v&Xs)&|KUa2$?YZ#o-y@bYj@J&v+Aj)YO5~DRT^HLDEXug*85d`3*?pj!H4`)
zJSek{x(^Z=?&3{AV&4YJvNP1lVHyYBeDJTw{_J&n<3EFqOXELt-Hw!AID|AE(&{P5
zBcJv=GG+H>!Yu7Al}c)KLAy5-M)wp!dbu?IRNgmm^r6(Ys2wuQ6-90;B}R<#h%v_%
z&LP>2p1kpu()dc(?I_7b8;DS-vTwwFPA{r9dl){&fq=ov?oJzlDCTs+?oK3NY4Z_j
zd=<8Li%vT(KQ!&enm&lzl4RSZTJp{AqE4JBPFj2wD&M+*N~<qo|1ZfM`#So-@mv3Z
z_VJW^KcP}S<znVTQgVpv4(K06RIPuVxHb;7UsT-Gu{`T2r}+<9h{T*OKE97|IUaT=
zy6MKfhr}CmQR>CsIMgH7j#UwOQ9?yh(N}09zs40{j9jVAf^HK=(1hlkCikAWpIP0Z
z7$=f;)Hm^Y9Ad=HBp>%d(g^pSx;uUWW~s@cngB7oU*n;OTuf|IXHa5t4{4+O^@&aO
zr>enPeSC3-EJogQ6=mw+7M0({y?q<>PnSJa{Q-x;$Pt~#OUqO{m1+xA+fBDnDpHn{
zer2&?v`R6dRQ3=R%4Q+}%P2I4e7}_Q$k07zL?JPyO4>=en1&VqnZJD-YHvdt{c3Nw
zp0l%A5fHmBRCc%7j?PI3+F00_(okm(RO6wT(>sOcia-tprD6CKwEiqql&ij9MK5EL
zDayfS>&KYUk9vBzi`r0qH*e+BmV!oM`CC{bpI2;O#+OOs%Ulgm)RAc9jxDC~P>-e}
zy3=jM{JUB?FpPK-b1~t-FbfmPddz$%=GI5|5q4k?2?M84q>^uR_2+^P?BRqhhwYTb
z*X3Qtk(Htk;B*U4U}`_=>ECi#$>@6bFlz5UIFUVD)>C+y{jRKM2jaJ{*Rrx6PV{;|
zI}UJ_@w1~<uch(V&@0&SZ-jaUM?~Vsuk=bP=RQck@%N<7<+m;t+!2<)ESD*H)$!M)
z@z-4Uz?>?ea9j1*Giz<ZwC-4_9B4zjPJ}{sg-0MeWtIVq8xeE7CB4c4?)O>{%e|+2
z0(UQ;Ys3ylPxp?<c}G1xAv<mr+&1DHnuvP~*yYbL?YMCIs|X)Z#OR{e1qUdbiH!KO
za^xv#{O8<~4Jb^4?~ySh^&)RKP$}v}nh9cyI$7A9^4?CeYWG3<_4Of7tKm-6&8Mdf
z&8=pr4}@s;$TeHu!`<95oP(pT;7)Na6&)ZzbUdPY)B<9ba-fw%J@8A1I;j`;s1<15
z%A@)=_TX1-)%QEq5LCvfq+UrhrbK0v=0HmmHg#If<{UL;-H7{a&4aahaF;FB?3cc?
z^cId&rJ=U8J{6VYDy8*FxFYp(>r*1%G1(o+g&uPea}4|9=!pL3X|etqSMC%Uvv>`>
zCbVFl&vs&tYrF)zS@d6f&Z%)Vz~3s=Xg!~`ljJf_uV$)pH)0`$F=}Y?ws``uSfJQ|
zdt^E~v4iYaGfYBGezUnboUwGsJjaR_yrYg<M^q`Pb{1MTSH<e(O6|h{VU+H(7#v3J
zX1HpTEqAf1dIP@Ac2sebduyJ>hOmLh!a8s*r&-FvCLinSd`7N}Io-n5OU3WfdE<ZK
z2a^<6-Ocpd<aWem30nBS56Hc8qkob@+&@u1mGp4I>dxMH$F+O<t_f*ZS4aVAhKvQ#
zlhqCnaK&@2xf&$7=rE;{b_r_;r!q}dkjsdcGxWJ~s-f^G#dJKDgl!ya8w08Iz*nZQ
z9$XNeq5c);fXQZ#VvAIgUbv#+IhNd3h{lU^@{uu~kM|#?$PzD__yWndaZsmKWJ%u^
zz+@E3Yd9&^T?WYhfLJs$6VQS?brHd$3D$#P83da_u-Q%ZRugPI!SusWZ#dOU#GN{n
zU<at)2!h?Ddc6QcAjrRgZQntVpK+>Yzmv#l5#l-sh@&0a$Fl9~sp4$F5S<g${u%)$
z0YGuEKMbA;OHxGTSz2zjZ-B2vV4y5DC}RT=DaqGpLHHw&U{sv3R~`$N%i5opit4CV
zx3oGsmnuD9kEi%+asv;0@3m*ED<A4ApV8vhGhJL>9=h5pv3O>Gs|+*U#HkHP!Ckx#
zy3rJDel5Lx+>+79&4Xcz`H&UN#n)?RsVgH3zty5ficaMVo(PH?>7L@o_nYdis;<AN
zHJ3g)qwew0B+eEe56iM?9m;!18L?u7M_)FH+~F<9u(IzFx%ti<VVWZ^NS`@8@%x0y
z+3Jh{y>5P`Zuq>TauF{QZo7`%%{%8RuXo*HUmx%4<ZGL6NwdtaPfxVr(1BF+JmMRL
z_eC9jg<ghIFQrZBr)FfUKZ+2{c^_Ko!^)^HfLU(HyP)vs8ZjB7h)S}SSy-J1##ds+
zE2UtjhNs<uSOU5|G3K~4=5$N@-o2St622)IkpW*GP-IXRUxncHxT7afaW^pvG*%Q9
zQw6v?U6Q9A*5&~yrA!5<0JcxvVeT7+?#gP!{r5+&pkbjS0f7s#l?N`wJ>cN+>nT?$
z#jlqN8pUNpq)(<9$LGeM!-`#VIki7yV#54JQq*LL{wR_~^`)nvDHvax+sva8_Z}Km
z%yD+_P*-R9-8>&l;P`u^BBAC(ngKH5VySMDM<OtW)Q+yG1?@(b-$%jvMd(~QTp=Ak
z5ry;QQK#bTq{C&>xMSpPrxIa%5-}2O4m`+}&UQ6BOZ|JG-pLnbEh17HvU>Ah7`GPg
z9DEhQp>Ou2mJs!yaG0MW&D*}Xlzg*V*3_hBW%ognNVe)|Y69~_a7r9jH=v1AQx65v
zrmadTCR7MM6>T|at5&oHrL6`zY6@FYQLao2gc@P>kc5nh?WEfm#PHPzm|lc8;PAo6
zPQ*8zdxGBKflrM;CXGMFg+CN7)g8#?Ko;XXj!#K%>O`YP1hJ_Tg?J^T7zj?J@fT>#
za?x=i=5)awacK|FWcT_`TnD)(#-HL53@=<Z9O*I4-Uw%@f<J1caFz(+D=t!69yN{!
z4G3qCL4r;SS(}J^6|$1+edKB9fS?smV?9MHBoMfp6L_eJz^{D-BE(zqI8^Lc!&s7_
zpCAe-IYGWK_BR?upP*wN$5wj6Fh*+O-b25L82usSn@9quRX0zeWfW(|y1}a!F-b1P
z*H6PUkR&O99A-s)9qN2snN@?KjA$M3DhIe?wg@1biED~>+YxOP?N%a!+&zpm*?o|H
zTZFf70zE~zf$`_1@#kH4pep}{8o2d*r6$jE*7>+u>R9SG@Qa6ujaZ(L%(<0A;+M(F
zFFMW<L+7~G)al@^kVamE>>MKBjmmD#PixC*TCHfg4lUySBJVQrP=uaIvyiP0aj&h?
z)5~3ysyPO3do2RrHz@E;tHWv-7F)CgjeLPG_ZQhde}N#0vxW5Q<-@_;Wq_9nN?sk>
zyY3+zdjL)4^}JS!Vmpb&TY~MXRQw(!=!uNE)dKVifkL<wM!!upodE9?WMIrgy66((
z3QzkOY@}Wy@xq7l;QM_f9gB}U-J5+bL@HW?Qg<NN0a`~V`%mnhtM4sT%V*?vIGBaQ
zZgjG{G4Bc%&r=Z?a_=^WN1Z%B17eaqN!ZwfLA_uhcqIa&s7gm?;XIF*`XK6u!$G)*
zN-`Z^M0~W;P&=9;+fq+k8jY<6=};~I)Vu_YLIrqwF6gG%tklt8*`)dS;|ZI%^rg*+
z`oAF2A9q|<)?AhLVx|xrgFLzSyYx+^MNZo#$0}5EPa^AZ9Y7zq^c@99LVUgS0{#|+
z?w7$}A1xT{s0D*v;%_hW4{ai}n}(Kl#WP2~4ZjA#h93)vk*jw_BiZHXHX&&;1$$Pl
zo~NCX=DgyG-4(;<fwU{`@d74+)jdE@eEqV{*yF^?Xr1{X`OJ8vq@i6l)ze<P@+#5`
z+en~TxQEKCz{N3$GAU%zGL|iqj(gi9`f3gYCsHu?F~OY8k>E@MZY5xIB)E`ZFA}Ud
z609NEa)LESf>i|j4Z-eEkQxTEv}|WOV3gywZ=)K~RHIcGi=%b}0koG=@dH%3WujH^
zx86v_H=sH9XKoh&hE0I$_MKE?COuuZ7tnnM?px$kT~`_kuWlrEwM?t7bRq-g%d6_G
z?dx!c$S4)9;6Nk3o26H>gXLrG&uTFFYx>S2&NS(TWAfKQXQk)!sHVeeNQkw{Ux!iS
z=a&N%kZd&sU8p~T?rNmsm4FnV#tbphI#Ei#E+tnf<4u?uQfuU7r`3Yp0lBK|2fVyh
zXQU?Zh>zAuwtJH8h-5pD<45=0Q}O=SZA01jhWCKcE7{ISwt8xIMm{0eOWUvO%YM+;
zm!Ygqu6ED3E7?v-wrZe|&$`FmleXUzIVsr6D0iC=qMD9xYFx%wA@PC}R+G~2%AzWz
zx4%B~Ej~tMp|3O3An_3-(||;4*i3wQZ?$zcz;kmk277K)nY3;{!fMwyqf6j!z2I74
zOzD|_-YT<TtJPM=Z3e@X>%yynBvY;mZ-{TiU4~p2id3`*@tyScoijh&Dsx(R8c(ua
zrcIV)-nkXMMT0i&&qm;HgrMiyxoB<&!UiA0>i7$x_Xwr*{OdrsZyV?+VaL;+8vv?b
zb?XbtYV>V(;!H;UKf&F`4rOXD;fSkovgC@S<pIu$A%?~H1NpE)xn#Qmrj`9eue^8@
z`om9?orMY*xy-lL5v)=UwATLsKpc9;+iu{NnZB-8{|%la@!nacbzuDuKx>7x=_#=O
z8zs;hQz~3XkI~4}2H>xwxT<t0ibRuG*;xsE$@l<NB|!8QJ5&AlcuwT4lTcQ{@2ra1
zTK_%xV+5Yy+<<irASb4@{=CqrAx(r}OlYnL@<P(P0_p{SVneRx#1X=C5NcfgTzpJ2
z86TglmV>SJ-#BrPEe5>i3U~~Wr`HgsqJ6+bYohC%E+Ei~Ukxk1sTCMhhDY?5O5{RT
ziD+eUoz>wo5SK!*f(Yn>k8$GBbwr@wZ${&NN;Jl)=z8gWGPK}BaIa3Cd_sEr#+e__
ze1GeRMM`e)sl(S$BN{H}^=k0i0c6L#t~1_3udyFy75oV)ltoIP6f}Yr%dn7}yDSDL
z)4d%eR_<PXQSdxl=uH|c>6Q&I^lroFK}x9EVY-uEE|<nO7Tjp#$u4wyRXEI&xghv3
z-TBJ`Jc)%~-8VnASr%64EqLWsT?yejOn3e&?L48Vg0)x))jLdg{-XBM-Wy<cFmVf%
znxc-S;4%}kOO~r6NLAn<<SN`b2L?ExEf4}mYbKsMtV!A>8keZ+q2=IO5}1h5CS&%+
zo2)az^-M?>f5IpNEC3c_g^`~u046ivjKqL+KxsiHHPIS#tG-@7r;nE2CXKf6tT<Vp
zMVdj5q%i=-)`i>{3{SoumWh*>(+um9yJJ1O^g&?3X&OwSQqgKiOo6LAQ}Q>s)^T!O
z{Xfe78Q{9tK|Z&P?cbRIxBDKQcs5(98y0;&!kG$13523>UWAcCVJMjx!3o!Coh#WI
z=*81OFe=)0${W>)+Q9%A0I-H$kEg#I1C<0tM&c#-i)GsN&=VN1S#mXsAO{~u1*?q-
zf!0v?Ea~~<0Q$CM5y3d2yg?TdKm#xv;4ldrB(pRYjRJu)m=HwW3B67z2N12mLN(%H
z+f){M0kwd4Ep;}NJ0|PBO8IQmXQAg3%vKcQh1t+kSjM6U-h%gb4LKkT7oSCdM_rfP
z*(<rSfq`0}1CIC{=93F}GRj{_u4(XJwWEo47*))1{Ou|5n$E~5iB?x*5a_m`Bw8v;
zLIe$w=nr95q0y6XPOksn9Vq*>2!FY&z-=BYH^7tVhg(Un(3;$b!)kE{K1{<QH32%K
zd_H0#wDDX7{?HDd4Zueht!Mg+miGAGWN0OtN3%f}!;Ha-o=bHAzFZpyqi54ES{@oG
z*9BEZog*fMeh#FOXdFyEa`!zEe$oMsLbIY8La!&l;f0=ndqG7L`}kr^8$Db`EK@H=
zI1L!)0E{Y>9HlktbMz1xPaeP!+9*9gfb>rDk5-f$fju_rL|Cj9vr1i9vNaA!!S!GS
zU5R8&CLC!Y45(*WH!}{rzemhkZH>G4S^NoLvWDIxJ+8uw8LljFp1pX<oIp7;5;5c{
zU-xv7&ybXeTj-L$pgd5nioX`xAXh2D)@7p$@JVG|UYu|O{pr~^m%1bvXuS@Z>tVHb
z;;TTsKJ+}{kX!-U0Fsaxr?350xQ_e`b$8tpv2Tic6WNfzo17Me!YH0e>B8DdqJ{bf
z6Du$xqD|IYJtU$y8Ug4}faO4?$zUUwjRZj^UEXk@ixsMau7TSFL0T*}d?A;mO8_S`
zi{!kk4!u4A0|K#;@eQFTmQ4lJnGDoPCBf8DL;XME%iV!5V!p1F>oER_OQX>H{%V@-
z8!)Ls6{8x<z6pTZMV$zMz~SwU@zr7AOn3hGophcK=y75N(XDgOyXnh(8sxSB;~fL?
zcNl4k!SfHCI(1-(%=We9Ty_s98k+;vByuTMf;Gpf83Z#DtT|4dO|ZN4+C_^vm0&8t
zTEwXY`;uUbaaS@3wAr^2tdwBY4<ZSvrA19RMxgE>U~|s0lqz-sOg>dInOa5@K>V4t
zyZm!k9y6T9j=Wrn_l6LXS1KFohOzE7Sz^O5wzOuU*f?xgO-+>0t^k=h_0XMN#(%sm
zWHt{qn81}dEVkc@yAmsPkV>%KfGKIg@(KG!dbH5vv|#y~eH%Rn;jtAxx`tituXGp0
ztedRQcm2iwH`(OxQhQZV-LG$<?s@x8x<9Smm(u;QTWsHVlf)aFS^Mw%ipe8c%=Z)N
z$@#rCv5xo@PQ>U(qUwd8KwvQLN_r72mSD#K<B@h#-nIy3_)rSF{QaZ++*(v!p;tQ(
z;y<^R_Co?4{dn<*@8~?p64gXcirQbSKg2#!!#i3QbhZ}(InKebZ`Fc!{7;uAA7Tq?
zKNW-jxU1hk9}}F8pmjO=V<~L}xz2SoPE)W^IM68VO=)ur>Fc~)h@+@<e{})KeQ+85
zi9dwEr<6$+S6x8H6z>Y(U)02ruD!~5i#N|ehqD09pl>Jvx(!gAk^a*r(9r@cXVXEg
zX-+!yReKmiMO7<R4Y0@JB?DBI&j1G~kuLzzE}R*Yil@MGj@fPqZrcrf6Jxv?U&BD6
z&Zgp_9sZ}!MFrUo;3w@Ul^f~tB-RP;HK_HayoL@2(<=;<r(~-**N=6klb-^+gXEi!
z#%wi#7jQV8?Q+`=WN=c6QX=AW0Fj?Sefl$--n?pUsB(GjZj>|~yfVXm`ZkZ1ROB=+
z;XMo-c|!8lb_Kg<$35|sfN>(mTiqS;)}~SgX-_QjZwP1C2~)FhDhR84KNpdGpv63L
ztHqb$1#gw%9l_JMNw680OGy986}9v5$ny=94NNn-6UC@9*X?#IEb%t1#zvsjmyak&
z?A5{X*tq!fc|X-!oPf*saN^MQ!(HS$<i@D$j;xrA%_(P^JoD-b5_@)#ijIIY<Ki#m
z{oB2y0o&a1*X6wG<uRV;TGmFmAg`%&uMQA|YEUOV{|7XxeFHyQBQ)8E$yX;-@CXaz
zhn7EnS7|4IU3lv!{3|>r;9vW%<?_NC{JESzmxte|KT}^`fPZ-%T}KSA3PZxQ>g7k{
zPdMfwucWLoV*f4>iQubI=b|cFQk0}CNDS@ZXg3a@BK*k{C!7I;n&@*bYme3iiKY&Y
z#R+SS_(sUuBaot}M@tMkVE1&y4_a~-BkxCPd*ep}a#it{9cd687*Y_AKbEyXZ;$4B
z;gcWQXofH_VHU&}1ne=TwGZHemtpVp_8nqtMsUG%2pJr4Cr&7uxjC}LAA5+=quGof
z6FZRdLK)RTN7$P`(qATKH9z*Ei%{27eE$;`UKb&j^5cO)_Z<(s<6*A4DH1<d*3f+P
z^-A5S-UQ2)ZMWn)d>*jFvi5<|>yksRKkVt!RBg*Q1B4Lv=(Rxc$-V5!Ybzw~Nox0a
zy@m8A^K@*@kKK$m18JU4F{oeP^m=ENGyRRHgp0ct-}pihAO4Pw`KiBfo-O=onpk;-
zmH!kep8A;m>!(binvK0RJfs><)mCR$fefGFe)~)OeY-K$%zeumfs&G5#h%G>8O6zM
zo;or&s!UF+rY#(-7*MbA9Q*QCxbs{9y}CVjN{0G0M^=Lxv|2%p1I=ZVdD#`JiGn|(
zKtAScHXKDbp}1eyt3#u9Fc@crkH1DI@IL$;fv9jEhj9IWuvt5bM|{g1MH>`XQ~V_a
zxvosZxu&K+?L6uxPDizTzNJj7Y59zkkyo^5R#N|@aF+FMSookOmgI*ZtuhqyBY|*-
zoCrF$Or0mkH=@7zyC7#cw4k(MY$%s71<oiPg@Q5}C!P5*=djy@NmU-X-6PW1dK4`G
zo}A#<wEeT7UfM3_YTT)vudt1`7j+*5ufIUAuHDN&>@=&qB$5Da)V#gBLL2ME?hUA$
zF;z{xLR0KjyNbuDbU=8(6&CSxKhfBMP5gP9SpCA5PhS_!xU#aJy9}&;!G^zlQ}(05
z^@Fr-*1x2^Z)gzLKO}s+L)!Z?J)-Qz!__ameDBX)Kd|BD0?J<6E#q<5o9^z}Sn0jc
zuG_`}@I3)4$KkGubf{r0`|;io>dfLbkMegG$UDO^WnX9h?!Re*{95;0yl;rH>;rFa
zv8MNy$T!5E9qRZw?%X!Ih+U1|Y(X@P*)mlS)``N`TmCKxLySq619XluxeTX`aY+5a
z%UjH%@CUJI%$EJ4V9w^2nYPoNcD2H`duJznx?|eD3fqC`&SP}$Y1`zqQg_<B6}F=r
z-yeq(dT)i_rP1VtZ4&6H5l8RU$rl22@u%FjSJ9@zR&{jDmVp6++1Z2~D0XWo_Q`p#
z0)I0WEYbZ~emaj&_}dI_xI`kSDtZjPuJI*#=n7j6eqoltw1cCawi7tD4)%dY-m!)j
zuLlr)M>i&bXwXUReROU@4|1dZ5)iBEMSqav-=4+`HuMV0bc?dsyhYRt`GaPD>-8cQ
z=!Vx&F~!zxhQq@j9`{8Pj<!36oX2OC(<?LA)tGO$yssBxa_T1FIDM9(?1zr=71H>#
zO5)}kf-FTwk3+62iF>Mf9kHoS?B*{C@~lwyeMj1EYE*&`a>xpy>>nNDaXhacCm#~`
zR882D*hVl#RiXBwAF;G7Q$t*h;dpCD!%+6`5IWm%*z4`3i%8sj^8c{*Ch$=d+y3}e
zXD|Z{^Z)?@1Q=kzL?R{<gg}4*2?@v&mIRa?5d(6OWd`s{n1q=@+Ga4Wg<e#=;=6bs
zUU370fC*rNh{$#Y#a+}M#w8%iD*1g+b<Y;mci;d2^h2h*s`^ybsZ*y;ojT{#FkaGt
z-6TyM&R@cBqL(ZP1`?Y&vZFJQQtYIJ9w&IP0ei<@4$9S913|!*a;aFn?*9<NVJT%a
z{fHmFfwk?Sj<Kkw#?4%^I>ug5w=k)0EJP9Ol)e2+0k9_bD*l=lH(H&0bvx#Oi9df-
zYTfwi>fGPN@qBO!9~{qSHmlu4v)2-K|2fECj%Rn=Jf(KdDOz7~kYnz<+k~eI`jdV#
zrMh9Yn$y>er>cfkoz7l3a-nKlPYe48lU_Q!?URP=S=PwbMFh2IZ|}0r+n9BaNvN>0
zVpgy{8~vF50lI&wct1Tqjk8GQi1M-iHiB|KE<Q;)?;R3o&|h}rrC6inH}Hhe*B9w|
z(;>dFDH|d!@5Q$^WxXK7@*kSAcJ$szW*zAFCYjwrzmsIPlzxxP>;X3-Ik}S5k#=bP
ztFg;Uqpe^X{=;tq{bFZt#V&7znwyBN_IT{!C#s_@&}EQ{sQ~mzr^W>sdv$^pqSsr{
zeM0&BF{u+^zJR?h6bi@{d;gKP^rIKfn$ryR4z6rUaAP;~6~+9(Ef=&=wL#sZBsqjK
z=wS?*=Tak57sxAfV4tT#L2v^4ruQmn(YtT~kWK(dOQ;vKplbBh$=<Xum<EWVD0^{p
z0DLxP$t%r~?<<atoM|(@cIP-+MSX4xe|`hJ>|`%pFkE&;=<QbS1%okKP;p1=ZAZfO
zw~hkvK0eU9(F9>#WH0Tq%dXH`E3aG`1>l`Kmp38+Zqb880ijB3pm&0Yfgs971KH~p
zK!j#-<$x$4p3mA13Adt6R4ZnM0W|kqyuq1Qc7>FSFv`Zqgh6zp;@$((?wx&s4{pv{
z45r(m^j5c`z@EOIc$c@mr&t}>whLVn20K;R>o-4|X?DmfSD-=uA$7ac@JqupyPVrv
zFo!!-8YESExzEykz_ijK6BH;Qh^)XOswa==$qqShJiQg#KxwIfWAZ0Fnz?650$y$O
z3RQv?L>ah^O6ku~^OO6Dj#X0oLR(4XIUe9akb(I!%8H2|_>mx>Wn!KOz6iY$cMlv5
zy%8r4><hgCH>SYW&>P6b6xbAci>J4z=`GjRU+8F8s&RZ_b7prt2UMMDgWD-=7UhJi
zzr1a)ayf(s#Z1aETYxNm(5(!7PnQr8*68kc`Uy@It+dc%m$DKY$!+pVGVoJQ!n)<c
z1<E!<=yW7)r>O<K2x*K6Gr*!v$w|ey=>5;y!lEkyDoCG$!glCC(!|8%X$dUxUietz
z+hU}q%7Z_~q*V*;NSKF&@p2BP?62|U+P(ld&6m9o01%CFdY$L8MOU7$ECuZPK3lL_
zUlH-z`r@Lp2Pe?{?F2T+jc9aLKhBn~RpDWOAs+T;A`;z-51a`pdsy}C@+ilx;c(o7
zS}U$3u{6tJQW0^(`vG;EhB<>&bIEW*sFl4{)Vo^ZD)Pp|t<YMBQd^}p!b1*LM$_rW
z<BP@uFG-rMB5t~=;-d5fY4nqY+ZhyjjtYElf_5sWg0!6S5a_MsA)r=y$RPlA^ry)N
zoAHlKi&{WdrZ))B?`(%-EOHz8SN~eqz~nDqUl&j6YJRpQOK>}?v}XPs#%PFeiVr;-
zt^hFudx39Ig{LM#xd@e2hPbcJ#4e&sHrlJ^Vt@vN1LhoKds03`s(DE#bucuvhFi}i
zoHBQX6`8Azav?-Ci3D9E>I^9Oqg)tz<R|x$9|=Q1UY?q7Qzs^=3rL}BGpxHtJDcJD
zNjP{F>3enOk2vu~WdhPP0HKHlTUfBaYIb137A{|yrZK91c9ERFnn%IO6TV+@P>S|z
zm*s$xG^B{Du+l2M4rZ;SxZ$a-S$8SnZhl8=)*(R%Tj)JB5IK%)&}@RK3s+lXu}T}v
zH??Nn5~+kbI!T>Iq)WXplfUowr}?+7*|0`wSX%LwrC>16Ok_z?`OADlA{(A`<tZVA
zD^**V_g&X;1lhq*m{HQczMSt$WcFJ{%}`bnRHRdgPB@#qq<<G``VN|B#o5&UY5Ta`
zhK*}9{LMI6!quLH1o7N0tR27KFEwuA!rtbMfwWs78-Q(V8YX%8i)~ms_7VJK8`g<_
zuh4Jl+HD=$vOX;SeJ|vsgI+$R9qR)v80YQS&C<~Ryt*BvqGA2{xpr)h^!#2vC5dG>
zmk&^HtN|6RL0gj#dHE|zz~a%({F5YhQ^y=Auc!}Lv2aU?;3_~=MzEz(xNCdXr`ZS;
z+R>Hz<HVC@tK{?BvtQ+dXox)cK-EtjeU;na_wvOZSg&@6kVxMWQi9n864n*?>p%<l
zc3?MB3%|!Ndy^-0WNGc!JtNQ^;z)#3+>s38NYqBw@EILhZ+EgMlR*c5z?Dmm)Dz9>
zGK;#%_UqsTi&ChODGSs-R=CN+(?FSWSSdLU{SW-X<gJ4fSLgoZ>O%f)BTpl;<lF%5
zT-4!7>R3CxgV03JzSMw<Uv;p3+?cvWVJR41os<d(xyqW^xd*8;5Z&>YWOm}bDIdv$
zVT`HaoN#1qO}6mRtj<nkTbQWIc`q!hJvA1;by%=fg!(63Wyd@<R!`M==Wu!3go}`C
zgPzOqES0w{<t28keXWCU%iBIIyG(2S4q8h*ADe=kv1v~Ec*%{J%UdgjZ!b>OQMtVJ
zET(mu=NfZ4ln)I(N3aXjTz)9!MkOIER)HqmOwW1{q3M3*!@);>JaPuUh={O^9l_A@
zQ3zA!`eH)eIAc0<TPN1Qau6pAm?_hF`%bK|QKDyGvQU#8<ZC*y8tEScd0}U^h<@Mg
z%x>f_K4!M@(r&Erwkw@kHfyPq#YylGt5RL{qd^=64v3YY)+ZdS2T|)g4xL)hI@sOP
zlRNmtuAo+Pl}@c|2+^QQP-~}dtOeiIm9>$oU*IRZMo5-qG(oah5J9qi1j!m-q;=>H
zv!T#btf)u7bz8UH*Nu%~1_4)58;@3ifIqmAWl5;BNisxTwDIO-v=#I^C7Hnka5G<-
z%rY_`578?f^(BB_({y^ZYX^6U)&qHTID?a8tRr*;n&bzY($?~ylG%#pLa)=-9n$Ln
zv3&F~snrB*(h#-MW>Uu_c<#3_mkplKbqlT9eK5_%;7!?!ckS;mET6Jh_`_3qXkf1^
zFQen(@{eBS2h-RZx2RNJL6xop*7VT?M+KxJNZ%H9q*dN(TD?!%Q+YK$?W^RkN-xh^
z)W&o){nyexedMi2<!z7Z`i#QMud!gG-Gutm%TQ#M9!Og~zSpH-0t(SNIpn>NPNwj3
z`cZGCKd09v+5OZW&#!Ssz|&l&DJ9gvgsFP`9pOmm`5v}Zq7mD0-QVmBAJ3Na56jyw
z>u2bTMnGLLr!EiDOw~^<=3Jnuk#bJncCPA2Y0j??;2@~#$7c6_HVb?d8k$^F%E$2I
zkF>*8yPH(7P~{Y!Q!WSl?50^Y+k+0?SoM=Mr%nL)soA|3W~H3lO_E*A*YphvH(K0C
z@9K}ENNE=ZetfSVJk{4AWce!JCdlaUPx4cHQZ7u;yZg80FgW!X;UsjF!*$a0J@ly9
zbHZ#U_w<F2<ox}@$E@s<F5`0m5^>((*sy<x*d~0X?5{f0WX?I!``S6RdcRxTdo9xM
zi`V(xlLE`x{@X@SRJGUqL#`@&AKU$6XHrqY6W^^5>G%ekr}7%qV{elT<99YVlTvfx
zXw{jH6A&W+<Mq@7G+uU{W^{{p&-Zp}{W3E;a7npbb*W?e{&biDw>i+CnkOV4girvu
z-Qt+8q&8#-NA921IPM_LAr*x<H2nGSs_5>)x@JJ{+s=iR@C~7ki)aCz{SW(>UWH{(
z|D%hZhH<3l;$2Iv!JeW9zO@arPtg05)9WY(gv|M1rETb1dmS4Uw1qT|K!zv+=e)YN
zseKr-<IzKQ-(RW6X`xxNZC*OdV7y==YuWF@VZ`UWhAYx*>qePf2nR?}xI(cMa!pey
zrj+rYfvVFNX{_59cY3lXOR%CeWC9uSVJ3It_MWWQe5AmJ_Kmr9h#VuLUe@42guH|^
z{VT!0hrr>tNI3+ddr_Ra<m&HMtlhpUqWnR5w19$;!RcY$NG!^^+N_a?R?@NkKQ~7g
zLn-Beh)S%D{_i*wf8{6Enpt_xPpn__e6%hPL;Qgnr`~P`m$mSOT6WuwiSoZ{)k)dP
z$4Aa&9&s*B$Hiq}hKZgl**KTB%8ykwJcPZBg)gjSv)Q}+WGzdYx~Ul22gm_f>B)49
z&hIVCo^-?&PruUen5%In1nWgD0{JrhAW%^o@J@MUU%bTxv>|H<bD3J&2jfQDd*3QN
zpaie^jdkD)&a&?DU*bH3Qi3g|B)<DBYufDaDajOQgY6SG^R9l{jD!5sv#ewLQWV7f
z<+AS^81~|p!E!405uUZ#JL7npbIc*-cj5!jvDPCk>A%9$FHU`ocH-(=2l2Q2>$K+^
zj&3A&+M_0&@GoPTWU6LyO$Oh$_y@CoWtAwg$l3*l1#z!ZX}CJ!nZIz34FigQIL8w4
z^XfU)lDGSrCF42gXO_y+_`;uA(w*{bfiOET>j0k^55uQ(=^r&b;%bt)+>!h$1F~u{
zWi$7_%3#uGkyn0&w?9V~t*eBZ?|x?8yW48=Y<M@-<k2KB(ISP0)7UsL(#a6%?b^`$
z^$+@=XE)u{3tn4+8sG<aP&Lxx>7v@%5b?EL??S@~>mPhE9kUx7O8&@s)*{iSeYniP
zuoqup;BDIJlah(=JkM_I{U98@pRYWfYkCPV+_*{u?^yF`4~rAfA>uUh5u~X@gmUOa
zJRX~%?Q0rKiR?5VBTMah!7r>Mo)`SWZnxPXK|4VmQ>~d-<W+KG{@yQ8)+VYskKoGb
zN38w?(kmpQb<4(%fq1!0oAQDPP;|Sm4!3Q|-jmp?gFctRJ^@$pVOe+CqMH{0a?t}A
z5UzrdfS4Nkdm1hy^uCPe()$~lWbe(8`Vs#FaX@Nl%`vq=^b%xN53;bpP|8CS`2D{!
z`;D(J1vx-QKp=~&=$hwp2aIr{>lQS@qLyC7x1<uY@XB9V$6L?~OcpYS!;R2t&SCQ=
z<{Bc_+w@ZiA<@3Pt|d)XnuAo5H@(18yIB0gndeeRHRG`C`wmN!fShgKB;kS<ssseZ
zr(9rdZ6rP;wQD%_!3)ezsR=Qu+l<ttnAGo#R7Xr|>x(*s)R@#fBQ+x?b*Yh>6_ff8
zBQ+-`^#oG;qGcnH8tw&Nam~xS=34pH;Uiq<H(_+#L~qo|?D5ehdHN;2zmsE9Cn1%f
z&WcXOYZ&S*9V!b$ofln_zk=`Y!S~MSRJ?}2ck18241;&QRm)>bE)SPnu9x(LN|t&-
z2`C&HoV3f#j@YlIG?$|@^pp^whbY^1mT=KN4D0cFpYSIEs|8@Kub=U*k+HFU##JL@
zbN!54uISBrqh5wuN-5!H(Tm=!4shiV$SB=e?-Tw6U{SM(Wkz?A?>90I*3Y<NWE`)b
z(c`KP>XZ5zGmMPW^)ntvMr&05y~vP#wV24^nepCL)}f%9Qow3TS7czy|2N7Bo<VzE
z8^Q#|u#J}?QG#XM0G8pyCAJhFE)|?AFh2x!GG<}sZ>($T7)k-}2{sQ2OM^U@I>_G4
zP|2MAG<VNXTlhm*?K*;YA}U=f>W^I#@4^?xl4!sC6kde-!|6z>8LBh<p$YhgF8Z|*
z+Xi3BMv3Y8%>i)ItLEb$_>2R_m9Sjimg9hpN{(ZUyfw$M6iMSyJgGq2;iC<-*;s4a
z@~PLD#oglriTEU0*V$k*yRj;<>WqaL=4Naf<c$X`RbRsLrLrLz64M3=0e#R8Fe7Xs
zszN(9BMdTDwQyL}z)?i05PM${HK$L+dH{<RDQ_1D9@v4H-~wXQ)O>az&r>CZ*{SbM
ze&re#1=8vJXneKCZ{zHv2F*w!9Q^@CEa21m_&0*Ep?Cc;OiOefk>d6EPpB|S>u?C`
zV<J{F1Zg5W7BBe)N3RAT7L11C{y^_vByPD_nP@Sn3=BXC&4rD~|JbbS21;+*B~PSj
z(;)Lu(*k4gpiTQ1R_tdfgvZ;c1jZ^5YDmkNWUL-|rk1lSLp?PT+2IUEUp&|17k>`_
zs&AB&<O}q3dA{pP@FW64-3E}#N7^YUwW8KZ?;=<xXtTG*nKDTG3xHxJ_uhwO8WBhr
z+3rYiU0^f^&CV`9Jq40+{xlqOYjdB8GihA`ftoNB%&U4RV}bs7Ahkqs+VotL_K&CI
zOk?z^g#OVY>>KwBc@yFEsTl)Qn;4q4VAu%czxp5sW+k4rLujqn4Y-X^8tt)GX9M<c
z)MoQ8oC@|q3q%7dj-x@^bTp-6A3YV}Nf*V9kg>|YY2|+xc!bN0?2~}e+B$zF-euoH
zGhXB!f62yS$v`lGS6O<c|IJe5)yiA^rP-oTAqqty&NmtF;2`)563KALTYY7CA{<OZ
zn(A9a=|7TC@Dqm;sAY$Q5T788(%$np&p;bgIlU6=;2azOr2@waU^T&Nw2NY5%f469
z7Bx3p^^+8<>}hxaB@44%zxaHVAbWFAY71NCqfpjV@o4-8mgA$^x{-Zk-y%FIxC0p$
zMJSb<jUwKu1hT}6+hDrlFd=A*OiRyR>u5LPF~?Cn=%3Zb+9wAjQ}B$Z1QC!Cht9Yq
zH?nt9OA-MECx{8b#=-=M07QSk-uT`ozE7yX1yV~K`uFz8_wE<~lMMh#0)YK`0BJga
z)Cho>?~{!0lg0O`^}pBO3j;Y|bbkK^U{rITxhDpr-dmBU1U&mFPVbb!!9_scv+Gb&
z{nz98TeFIu=|8`DlJAs%xzFSpocWXNBWE|yZlVB_@{8;($1mJMG90UX>+y)yhb}cI
z2*M03tZ($V-?3)?=B!pn;)KjB2xE-Rl|Zq|#=zbWt|zM|OP10rb#&)NL)Q^43s&jD
z1O6PzQlPx2PcP*o%Gw(Inr6S}9qa9~cQM$4nhT<^xPAm^?FRblv}c!SJek>r8|J2#
z#V&~3KvTwo=%u4sqBo*GBBoY&SEra1P5n!@f<vbTX3y8xJl|Z)47#R(1zoq@R#P47
zF2V}NZL0drYCHv7L?}@12v1`oq9G9?oV=fiFjB^|SIYd<`2yTe4sROZI;-x!2q5)G
zR=E~D;o0Ry4#nSolj^BoL>0Y9I~?jWG!Q{VBNVoW^{M!i8ZirY(HIJ7RQft-uIqOA
z2F>inK6TiZSeCmHl9YBFiGt;tqnHOco%eZ?vv5)yz73k#GFYD(T+#~OYbl-%j#|6{
ze+sk@cw9(Ci5eK+T=4q90~mH~KB^(skcE_L!J$|n4bKrZMHGKjU@#*U(I(m(C(SkY
zn1z#%b8*t6l(Nb!bvB>J_L6TlOBq>N?+{v4s{_@R8T`ll3T8`auC$wv=ilcYJgI@?
zX#dGRfmj@V5__q~9{7|7QkVAYjUvCx0QfT~(q*zy<WJ@}|GI%Rkh<WwK^hSqSCv0-
zgVZ}FVb={(Pjl*CY<bV$AUS$qix%N`f~ejK5!LJ06BY0F5xeQO&3i<*-U`vn>%U7c
zi|f$~|F3wdSM>GU{M&eG1T{LtB2A^=$1PG8-_W1gStnkF9|sy&NYd7a!P6iY&oYV%
zucpOPCT}o+jUuq2YfJdl0j!H#y@httWGY|asg)Yj0kHQl&1Ip~#iCa5$!KvZL@vr=
zkvorfQUD>3u1lb_>G+{v+eBPu0~#gOx^O9|9F;@wB%#r<zFn9{<v1qdc`^tDR}>6n
zUAuF5l%fsbg#~8#2vhA&Se8siTeddX2T?iw-5nN`)^->0f`QDQM0e)MD+#RtoCQIc
z4l${Mf~?Ve%|O;+DqXe!!7>TyImj=d%Ee7MM#b8Z0!%F&Z=<Fhh@B&pj}X^-Ji4Z}
zZY(Z>$$}LG9XwOq(h&O!qwdgPoPa!Zf?poYI`VPZET=ON8<7cPF;8xEJJyfl71^wP
z%m93u&01KC)R1(7Q_=-P*ti%fJT!#0mmVL@t8!Uuv)QqEG`Hk1dwT=Vsp$R)bS=%m
za|WLKl=9phoPEr>mAi6S$5b?oY!hI~8R~@~m6jsX{<S*U_XY5cNF1MPYn$@Q95zx~
zKAX$AtjFZ(EwgD*>B<6=wr3>dNgT*K6M!*u{SE@n^MGcjb~{cZ>kZn)5qb<?iu{OE
z511M3etb56DwlPWFk0wXx3OZhaC8YU)2RzIQko4lqOMsOrRf-<V&!aTgo@(BBlM6y
zLZ?D~3(Zk3M(EvR{O+M_DqYqS%79RHw8D(9bc*`)LH_wr);f7!I@xDrO-Tm*LV1Sg
z>~<&=YzFlV>50Q5-(wI<Y@Ur2NOQ`k=n~p&(;D!JgIK<FdN%+2Al74wfjPS95%z7j
z19P;P3e;UEJK_6@K;3k$CgnQRIfv`0>mNeh#9ct$&4Y0i3)B@2W*zP{2%YQ!MgWY1
z2FxIIamuDWI9w2V0Z=&tXdE9Q^!H(!;Mr%%ig%U#F_GsSAtE0|H>HJe02I|KXFU7n
z2`zgRGN=0DD8{x3FS!L>M`UmuY+~s_oVf2zNBF(NSbI0-U7hm8c>KlL?*fV%Pba{>
z1(fWcMStHc7DeXa?{znDMTSxJQQ;w~pGy08Iq92cCW^n4DP>9}PB>sK>ZddqUryhf
zgUF3eH{PtcuB*nk3{Qfm<qAfwJhNOB+~h#6QnI-wcMA<)O>QYMDwuYPIX99lPKk@*
z)(F+&sl;ivWfUS5`$wc(3j9+x;Us!2S+uK9Q1h{W`LG!@!J>ES6I7!cx@h!znMHYG
zI$rDEq*}GJ*kKbF9=S;^+zf-blWOjkg|bo;yfq^3l%qFF;XeP!HGUYB=I+<5*RWk5
zxkfF-K@%cHmaRd1)sn~6UNp6pV^u+mN1(-o5Y^5k<%)6wv@9;vev_&e3kG5Wf38kB
zS$Y|acO|BUF?W>@LoBxs&hBXAQi)9E9QZ`ZcA*70+VFs4Q<j-w0IT{4;V^^MuQF>a
zuO!LV@1v3S7jE*8tOVZiEG{r}Ux#-;VL-{Pq%k6{UAW)x&!JDBppSrVLC*RxXnpfQ
zH*e-6L)}G%)F(#ZZ-h1cm4#UY_Jm-(5bKN!QgqU>5podye6RdU<qk3feC%@H4({Ol
zI{r&GtFBFIJWh3PD5^V*5%IW5JYSCer^jt+D6gDJYQ!a119###GBnD_ol4;+3Yi+$
zqU$D@|0?GuXbt{bhYA#xY^Fi0!cD&;w=8UA4AJFaD*BB;C2n$XDA}is+<?*5I$p)N
zme9DWBOiw=+{uOMp)plHz^JOZJ8483(I&p|u+E?AT%U;XR0|IW&Z2Gpq=vhR%b|cW
z^0?<p19`~LIJhe{*`>L0I2(+|V>38Qd{Wmkr&BIu?Td9v$wucurE0FlpIcclw;_CS
zuuIPpoX$A_SJ&kt8uxuovSE5NTb_yMQ!wUQf`0{-FqBktzi_1m@2G3(#Rr~?6P!2I
z<enr{1e$>=L&?n95P7oiDWcTeFADV2vbiQVT4M?|j3SDM8b<BXJ!{HJj^lKEppyHA
z?70Oq(jZh%wG~l)&S@n%I+>mUWTgf{a%$qm+|DB;nDUi8i*nIZX@%we;R5Z;72@=u
zXu{l9u%M`GnN5?zSE*cio>;wFvR&V%)g2~|r=z~^Ls3#3?v-pb=>;*Z8r2~}@nL~_
zPsvWxYnVom|3epu8iVqhIWQfG21aybpporGZ8Tefe*gurV<BLelQ7a01MO=^61*J%
z5JoqI$q9641^z=MNmn+yTWw-EqmR?OqmS7bxM6`FiF+xqgU6t1mxc*~40ThTa$M-V
zRJUk~(LQjU!GJ@zNK$u0<2V|<GMb*d{d&;P>7b2Hm29W39RDNq$-Wi<Ch8WVksGTr
zVp$RM!+cGI`s`SJ2?K#r5l%>(r8J>#m+hnVMXWz)idce_bLcEaADvyVZNUf!v!a%!
z=a8T`nu<hisB+gAZ+;&27x!5WgLgvGKgtAk$c@ECPD$7|)5y}sWJCQ%dG;mYzNhfb
zQFH?al~-NsW2hy>fsDZwqL<>@5cyj8d66e}7{I#Fv?d(Z8DFdyUqrTRI3^bM2*pBp
z>65PuFG(cGv_vnj6J9{ukPhn7jO#KXz#IcMAUT+=S__Hy%VUEj>pk3^7ZLu1ft)sW
z(ElL(jfdzlSv%G7ItgYqu5Tq~)dv*`;cq-iFb(r@J_`xvmi&kWlYn;Q0}RPtiG~CN
zVG;t=v)SOelOer8l?w@`AR@t>zD%1;l3<qqu>>=zh9ApkBWRA-mtczPOE60xhzR2c
zf!pm?)SxY%50&mAKfJw*O?aPcnxMUm+jg<c>k|Tu)l`C@x)>^YY)%ZXRG)-X`ZMIn
zp65(_z$n&8I^T&8AH~`>iQ3e>Jb*78#aecz)l>L2mj;JKL}()Sx9E?yWB}hZiVbuZ
z(<bFG8Y(pEJ1DRCaRq5Z|B5u?ce-eMJ6@w{<seK~GSLrE@(M$MkL*}*WwuUnktE!}
zNK}v8JB0)s%4i8H8k$53BwS8NW@=g?RAIc|Y$h%$2^HgWXR})f=Mjl*>a>uFMU;I-
zA6y0l<+VD@tl;($lbVh<Gdu@#91bX6pDjgqpm<$Nzp}3iy^Gen?#DZ#7j9iuhHNiX
z8x*D%J78$4p%pX9?zOMc;pwxaXHq`s_pBGcE}LImYQJN{QsC^dVup)GX#=k&IQ-U0
zLzINopfQ9YSPi?;)wJuxRqXUV0tfC6X~{%%LhL$0mDW|ONZL_gq#LU&`xQ-bLt7R{
z2Po62T@o2PW~cAR5eED!B|L9pP8k|E{b+=AzoWz%u$paA`;e44(Spt(zCW%;_FR%=
z&l%LD_9c}xaPn{|-u&C>uk1sF#~94C!h225T~R9O2SYe&Lv7hcT~Z$u9Vep!?B|U@
zuS$(SVORw*`v_yB$alE@;s;E}L7qM5GpCvTZmaA2%tP|3Jg#hE9o(8r%m+FI8>I-~
z2>IiC4Ig;k4q=USiw{OAJ^u^2fmiVd48r#=et#~H>F&zQSokRKWsz4u_Y))cVdV0(
zIjog+hmk^_Bz)%_)}dj!kurpre<O9_2j{S+4U3GlhLo1W-=D*pG`b3riE4U<@khRq
z20uBMWsAaYlJ_X1CHR+d)FLeE&5==AIlw4$7AXCrGHs1A@Bc}eU$MkfT`xt-xUZ}1
zs8I;#cW^5a5n+5UqH#LrVBH~WFCKyXDCh=q>{(E=IiF6=R&snAETADuKZVipjzXJs
zRdi%jVrjT5S>J^;zF(t8^3x$AtgUM-E^s|n15wk6ynq9xoe#%qH~WxwGp`)nv#Rtg
zi_BAR8Zt0RZL6WSfeynKS&)k>U9=dF$%RI9<WhGWoF&DnD|I7KPM@9Cit1H!hN}4z
ziBU?_5V?E5Lng2hsX;+~h7MKKUA!ey<0nhPI#hJk*UF7)P*F;^I}cfkldTn~gBn7t
z<`M!4R}03&0zcqcn}JNqAP@LzQ9TQgw=|-KEn5NzUoDQqWnH0xk$tm~hc(ZpolF-{
z>DZOxE0HCS6*kl0ii#Uv3F);+NLBV%0Pm*siwIbQAT?F6BeI}KTAOotf!Zz=N3e1Z
zR6(%E??qs7wG7U=@h=tsY~zZwM|;u~C5w1*WQ){9?MJeS+h-2kgMNYmMi|lXMCzw}
zhxZ<I&0s$(DeycIXj8O2>SEXhgr9HFJF(hKC{h=h6@<{KTWZlh7({iNJp*yOXRPqV
z<L9%9(qF#iGv>3wadTS4@&B67W=pmsbR|^kV6i^p0;mHSy8Hk|h-q9AA`KR3`S%G{
z6J8=wYNJsq4W*QtaYY4Mm;3l~z-hGUc{t-T?PXIOf9*avzuo>6|N1^QAo~oah-*8d
z3!PjzSDms`byX^#%bPD)JSE2?H)^`zM{NjSA#qIXvLKG}84Fl`OA`bGNCDVSkx(#~
zfmZu;;=32HjyIqKTKAs(>jiA|fP4QUiivBSLbr9g4u)aNn?D!ziU8EO!AC5&h@4;)
z;0qSA1UptzwZtM$zh46#gnPdu5pUYuTlvO??ABQAB0g(^&!Qkni&(O>cpgt(#2m5m
z(0|%*?43^q{td>V-}JgH-8k6CAp8@(6a=JvT%G$hU9?05t38I~V7e}sP+O6X1qeY+
z9{3ACvIw@})BnQ1U!-eBL$U%-Sj_D8+CFG8Ytu?}Co~4swf%K1H+13)!o@>a<<Bf;
z?OWC>jtk1E^aqPsCmnbQ(zf3gvu;c}`2g?gV#VqBEYuRz5u^Wu`Nt_xKc;GSwaFYz
zgs^H!dxGzFvG(0JU>l*0xEBU>;A%UZr4Z+!_D;ZWu$f5u0tG1Pq?_Ncgmtmrg|fJh
z0bgC3%X=+hnUdAPOP4U*vA4f_o+b00C2jGY6;4Fez!+I@ShLL7J>x}{Gv8nQS2fS9
zE+sZV24-efTUfXFYJv9gJ%ZfWkGS&-!JwQ2A`3YjS<zs%UrKFe&C+go#zzzC7MlyS
z7xj;jl*+C(X1{s%T9gI!Ikzum?HZj`Z3J9PDdV|I*+$7z%7aTmOzT(hmdn_X4nSE*
z@(ZC13??B&!b_I1k-4SipkcEEQ9Y9~Pu2_-vX!&hghIiIKEGQu8n@DU41;Baky(Q;
zw81bw#dG3Ac-~sfE%&o~rH>xquKS_n1}0y;pAC<tWqrgV&B2OiQ@#!iBOZs|)3`Nz
zD-EvG*pS3g3fzz|jT6OYKsi&KScICcz=9KE&o96=1b9<N{3CPKkU%Z=UF2((p&U}i
z^8pXAhL&>h!2<2REI#@HHoWKWU?f6Ro_!9~wwFeCN4ZWF)(ubaW~*73h9#(3RP$IL
zOW$sP3Wi{aqI}|CSyJ;&XaEsIwHfYGUlwS6`tenNWw+l37?GV%ee6(V8*0py-)&8Y
z!5Ei=*g6;tNBNMhZrowAV+Q}@#yFn199|uXSgp0^?lPJU19>t~q;mqB@}>6jWj<p$
z%eLH$#RDFFaeTo8ET!F_bc_G6oTY`2w8Yj|G_PEB8Iv(|fWZfqup8sYYY=Nr9OUjQ
zHn7v5z=er7(8WLB$9BeHIQg^hu*Gz&2l6wAd9jY2$Up_lLnBVVysnDvkd9sCZ|z}!
z`2(5{nLY8Ld)ayE>&ZN8AC7Qdznf3m$EM#l=rvHG;3!dbycS&tp0PxmcPs-^(KL%T
zKckM1sb<~H1vru5rPXX9Ee3TNj(Uxz!lC)rtOf?_<sk@bd)D!EN|_!?nU9n)H8{gs
z_zN$oVT%dfe+m&itel_T$Zl$ig-u+^4vzmq$2gw!B5U93Bo3f!a*3^*vdqr$kR;S5
zpG@bYUxc~so;$ezMV2;TKM~2(IO+5KAg|trlFsGfMNB!PebIpydZ%02TZqeP?z%&8
z1I!NuI4accn!~RE)}1k<3t2|cg$PQR{zLE)C;~q&-cHp#cxPxSI-_rmmxL3H5_cm3
z<&EqKck)O6i}h`@aw1p_g@?<)s-F3a(i#^hE^hKX82st~V#$%NpV3}yAIIDNgQdGA
ze1gK@1lG);60a;ZFK&nra)Ag}C#0IeZg8*}XL6<l`;tthHpxJ)A}Pbo!IXLlqM)mV
zP9Ra^36-jDb^>F4wD~0Uu`^Iq!D#m%N@;cnKk*MXK>9}^Z@r0qXxFINO}RoL4yGHD
zJi>&-o4mv>HV#Qzue6QhwtuprQuVZL6aUHfvHlCz;`?`S?kf;0-nQW_hFGbGa&m(L
zXobN<_Z~Ffr+4A+KEj@swmi!3ew2-->0X}$h3KDu@F;|Ue~;m39%bD+5G4VILubjt
z)CTU<#Rb$A`*_~tG1l2V57FrwQAFKoR-C?o;U%Q(O*xzSkt)j`IuFEJNCJKWa;(Z(
z_R*r&{shx5T5d8A$ax1mmvF&s!1u%bvI<DEYj9~nx4>J-MVQ)3C_E6Mj<gY0T^a^3
zi}D3P(Gjz_5wee|pioN@BAo^2dWp=r9knH4D6{dcRT*qnZX(D?w6Q96FqYVHW8k}5
zz?(eIx=Oa=JmYaTcw6b?><%V<-HxAng1saS8^u>W$@)rbYWSWf*{nb1kApaC&*t-K
z97?n|IQMZjSNd!OKg(H`)xe)!%)iWaP{Gg{_i{9C9?rRMw~*o6ztC40d?9kTTBtkA
z*Py9L6v7F1eDq7AnknTo*|!hBxYH9oD}u*QYaHf++-q{h>Rpp-rDC3U#70WNjzalT
zIa8o5fFY@8AL7&`INWr!<a-{a(1HZY23;p=pHG5D5f|+t2Bqw!jq~>8vEU)`*tr|W
z)p_`gMl(Qmde|c-jVmnB60wNTY+Gzm$6<*p(s%@p(?t?e66W0l&*y_))FvbF*R3EJ
zN_?P{;9hI^HZ>b|0m-kit=;4y*AOs5*^eZ`P_W5EPPAs*2#18BGp}yFdMTT&jF$A%
z^E|UN2aKVfZ3@_8524mfQWldK5g+U*ZyoRGC~tE*+JhSGtKAdgW-CkC>UgvR$4*1&
z9AaOpU|gt$^qC@fB^m&atdzru>%NkDEld-JnAzc?2?fdt?FH<A&~J7@Z_EQ0YA|?B
zb-da6FP&W!2IgRC5u|Fx_z7kVlAW9+wiURB;W@|^o_$2JNzB!R01y%at#q--PPB{G
zB!l1+pbnw{nAw4Nl665rq;j3hinJi+KjD9zB>=?N@hwlY$<l^ayy@TA4EcSSyP$$#
zTG7}s+Mr>4#ow4m`tO!JZatXNy)F5W^(;^7na|g(XLm{YV;`H*u}yC~HPtx&x2gGL
zC_;uM2}Fej+VPGw+>X8Ev<9zxAS@Y~mRbMFx8Cr#6Y<?-bZt7m&E7wjKk^Lhi0OzP
zL~ZfslMHV)UTyw-Izdk`UZHrS3X^Jk;an1<>CaEat3z0^kef|D1xZPzS5IXI3Z&`&
z$w<twUj=-MdhrF`vW&NUbT1q4BP?(mLI2+Cz<WN+`u^!`U;Qi`SUU{mFF(ud=7G2Z
zgCBX8bu=f@)A?svC-a5x@zmxymS%J2iqY|0F)x<YCRnxZc#b98vg)Tkf>hZYNfis+
z{^!_@?n60Y0F+3J7-EZKP8ut<Son9$L)+h`KU$MU`tID1A}K-kqvy&zdGM791w~4=
zwo->xK?QL@cNAK2%J#gAq1}G45F4p$$RUYv5lt+!I@QeQZ(w#3ZX&XKeOYPy#_{}L
z8(1a@EPqm}W<0#!Z{!7SrCVul@FyjIq>?FUN!h;RXqlLp+gqb~;$orFOL2?7Rr}M5
ztxhwmz127@5uu~u2Vm0C2vY$XsVnO+8)DStxh4ZjTfh#!uzetbq<RP>&gcmw-_l0v
zGV#ybN8beo0=gf}r((ebhz{q9=?($y-X{eMRlE+e*D9{WpCaO|pfM|SXD&YG?<^se
z>XEnZ*FJz6Y<n>^qB|N9I876~WhnDC%6zPlKk|3h#_<akvQweWq~`%xlNj>ioygGE
z4j~DE&o5y<Y1s?>ml8JoPs#Vr74X&*tCHDR)Qx@C$NHi^aR`5M1zRCm?&Pi9tiSZd
zMqcP<`5C}UNJ4;US`W40O*ZA*KzE>pc!Jo`?FPLcakJJfHqiD>2K7N26kEBU2k|Rz
zwoXd?FR@u157706kqChZ(Er=b;#=9gXBm4;;{EylGBz&5G#O1;GZ;-cvcrUxwOAzd
z!&w+)H5+B#hfKk31Nu7xrHo$5UXz>?c$|l=jIW)9LSGHwYdow(y6a=!*o%M>DIfD(
zFS}1l{wLq+Wt}CpFaOw!UGSv7ypaz!LH$1BJ$<Y{Tg(^wm_2hW+1<OBPJvu=3bwDK
z%vE1Y{)E5LQZCdnSO*jQ&?X`Q8?_y@VvH-${#_Wy5BgZU)K9vi3D$mSCxjog)lw`{
zF875_mb{=7adLAg{ap$OvY1z`V(qgEl`B<Wo6D|<YVS0}DOCFfxt|(!g1HibM%9Vn
zc)g4|Z^^j_b<RT#;W|aiok-D-Iuq3t+JGt_dVZ^OF5!+<tW(qRdOs(j!XKQi`IuF#
zbxZ%em^vUjl#h?&WoTvd1DO%<McPih@u`1ht(qr;ZqTgA?%BpyJ;<ie7V(eCCHVU9
z?ct?9efe#xnSDSE6;It;aT>~?9q@}a6;CWfPd^(M7N>C}2Be;@^?aYL7SbA&jF2VX
z)i5eMe3c(s&00$nw)5{+Bm9Sv9ydL15dUB`YbDie<4YCRk22m+Kn7{Y`KJm?l=8Om
z3kvHNUrrO^OeS|c#4=hRA0-y)x_G6Qw!;--wmg@~?|X>d-F>2w2}Drt6eGJ6aC9)e
zGIV+;HURvmhgeG;^v`{GW0jqd`i|tMRrZ`z`WpAGVKaN7^P!#k^;0-d2Iit13;q)m
zIEN;1NR^i4XYG26R#o06=CDwZk%m_Y;D%Z)F|1Zg++nEI5}^#5?}u9LEtJ*OYGX3^
zGk$h+j78<Y{j9fSx{o(q3zgs2ZN1jAR!n+z5+C_6!p}T5iO+qQ71A`UdYE-+>BKaQ
zXwRSz()x8^{QSdgmek-DerGxRDC02AR3~)nm?Ak!pjf;+pwh>-<qOK2h&<eVCHR0y
zh)?JDJi><c)+ySm95N2{;LSV|+&21vlLBNJA%75ZSoqaW;PI2#okQ&qJrCg2R-K<v
zGgJucezV(G=bsF}gA^FuJL&iqmP?>D9N-L1qF_q;{W}3K(me1k_|$odKRAhXmoHC;
zo$`J}F0w$|ooeUl1uUW48pBQC9JvV`pc0yAMWP8l0tPgf6)okplORmx4vRhap@l;`
zj6@vBAX=E-a_>vD=HPG^i+$uY2A1p=Fa&e4uw;J&ys<$05PE#W*)I5$wi<8{@^Ce|
z5(QVr>^=?q2X_Jjso!r_n<?+BJ^c@FK>rjgMUpocX}9A@z_ZV+#;c>VRZg=0g`=Gg
zWbVP~bzZjbK}v91Bj+BYL~Mt~s;zE;rEY;)%K}$~Osk)OEKY@H15{|iGHcdm!0DJE
zBLY9RRn89NYthW3D<uNHX_#gg<6O;+guNABV*4x5v#663C#BugBg_QQIfE$R%#}ok
zNwgt~CXl*%1abrN(=#gNt)md}NcJ@rvf8L5gqCT7&%JM=cz~n@41+pUIAi~W9!EQ4
zzdDr-fFE}4R5qe9h)SIgw-b5Q0-iUGb((e}MF@l=5y)@8l{`)KW53^~;P~YCX)hJD
zx0GlPBW;l1yQ|P3G=}u3g7{{a>*RM*C%=aPtv>lVlxXt1lS&xmS0$k7#Alff;yVFJ
zHfqjzFXMDVn>mz-&p?a!7bFqcg@`Ree#NCwI27w-H~;1c**&M(0Rd#UR*>ClxUZej
z-Pc~aDKcC%SgoM$j2@w9&`X*aJJ7b&dDuJDK>%C(8DV{ewciReqIezik23ElK*h>C
zTFy^snufhG0({P3ecVvT2&a12eEr<jIR)e=crorE!bXtfn#<AMCG%Ef+ypErmm^&!
zb1fyqfgYQcFQWQe9_erI)JT7y)&hX+t#rE-(P59=IA*3rS#0E&m00QA8Ed84^%u3j
z15^_m6FUceC7EH6jZO<mKSyp$!>kYlYOjr87U!3KC$mJm`;>2CuxRMu-0!Z2>Y;9K
z-CPEyU@s`DJAp_M&aZSkn;-?1ObsH+bhbE^7L`Deq1Qva5|cAcJMt~46W2FjWk~~5
zPNgf#E@3ZbP5(&Qi^M+Z$8hfh4o8t@#Iq9@MkFY;neGpjYwcVX`B7*@8onp|Tjd;R
znCS9m3I$1P5Gm#+P}FlA$W73^8ZD^e4i3O1`wemJg=pIy<g5je2uIxs=y_X<as|ik
z7@4;;I;q6oUvwAI{LvDnRxYn{<N1WLHx8$}h^1!PFAOnUqXF5rgMvNMeJIMwsx!^m
zVJH#~n-*ov*+W4|QmPT1>IATYgZ(EeahICNY)$Xt+?W#gqQHgE+q~QGBQ#Q6OyYOi
zEMvl`Zi$f`1Fi*)%=2K?I?e-6;!$URiy9#M9Z(RuX#xB-!Z?T9lqwN;(fPUOQk*C#
z53ULxJ;<wPAY#~Q{^JZ*CQWzng)>=Syl$S!l3JgKL>x`a9Z{?19>hPN$=bQYPEVm(
zTf87byT0TI?LMXT#xZkbiNH+FMoDc?SIktMpT;f_rRaqcS|F|nm692&fhy|@MBKys
zP{56KVh`@T|IgNmZ?S{=gLR@Y5U8&c*Dn*d;KG*JWnv>O3CZYPLex6(I3*rOcX;Zj
ztR0Cnp$!Wk`zh<uWpfeu;~CFxTG`1lZTD*Y#%`K;mtE}UE|ZOd<)MNRkEAffpFc%G
zt5I-csNkmSArASB-JG?vP_KGRsNfsd6~v<QJ5g`wEGFr0w(tM57&Kw@|D70gVKl^`
zzrx<U{yG#Z1`VeYe=G(y$ciOrAqJHr@qZx(*~yu@0DlU!C%Z(`cs}4nXgr2F8@DRB
zaRHs@dorkd4+?C<md+Bgr6Vi44Hz5$D*6kC1Jw>~1Ec1juNv>dp6+=RA@SoV5^C!t
zd2I#R(e2($Ut%lQZ#U6}tF3}tn2!0^(hJP#=pcI*0<hx7AzVSUiYUf!bt?&uyx%jb
z6Tn<;J-fG~9Ep|Sm@uZ>i5EyO&4YHBCPk&h8YcaKb`gig8Yv>WkVCeLNWKWm1tYtH
zY_*gGy9<Xq(M39$`(4ez@hC4p+qar>qD4NKx(tcf+YJsI+lc_O`0Q1t_R$UQHsDMD
zHu{Uu5@3bVsJjqnnr*_i4GjT~utLaN9}HpfGRmsk2zly*gcWF19ZD9=4aLpse`0XA
z58_;XgS&3J!QHwfT@#z-fV~}oCVM*t<vnkQ5sFr<dXNxmco~-<JFpsmXj$HXUzpT|
z`@8ZI_!MP4C^BNQJ~OiB8CgG<_m9bc+sGdo&i}bQ^nX+h>x^REgf(8vsGJ!_&QHSr
zZb(9;RpjMBty&kc%yUP5xEPWhWy9?Q3{M2o5teTulcjM+{+GbQ@8$P2@~i$JzlD)c
zLmB$s9c7Za@@K;yuM7o3_INKbjIm*W2YbA~LW3H5b)MC2@pkIAc(^xBnBpx(HK6y{
z0gEO1n*mf83Ec=IfZE6w?^pbWgz`7$W1$YM&6pby3Ll{zbd0pv7wZ%<5_=<~O1Z3C
z<x%HIK<|M}Ocb+F5rRX+n&;`3d0<U$@TNo@*BU__0?!f5vszbF7BwTh4beqy3la^h
zyqG!Ry#cv2DI=mORY<jCxsS5T(^=t5?Zd3lcM1Wg8bMH~$fn>9HZ(-L9kmd<x&bYz
zUPawufy-FewOfshYEV(Nn2#(#R-z%Byw}^t#n|M{L>@#uoA%O4j2Rg*)VIkqE92dN
zVv|RjuK&;`&kCEoyFLyHj}e=^x0h1d@7m<a-qq;UEg|Awju#?+nj=xtLK@*^2YO~K
z61@FHc4Nb3a7Ysx9Pw&jeY=F?TK&IqWU>+2!?;Fa82R|ktY>65a+k3i8RfxlWD<F@
zAAnjTGThGp*6x7XMcG^WGj?61seofXwjY!0Z9m?i<xP(jGN)a5Om(1IYe2vf_qf=B
ztVP>+w@=ulzSv(t)qz;PD{M7-_!}tUr>ZwoFdn}-+n@Acuz5sDQ;v`txO8R!l=Y)|
z@Br&}%avgeQQp<n8~;YoIM=RVK<udW-WL%Ws%fRm5bi*zGzt#0))akX>RzqxR?(u<
zqD7yH^147tVbO7ROy{H&b6cFAs<*0hts02WG*RtXTNfv<9Y)Jii35~v$1+G8rhX+!
zt|tDGNn-n_Wq*Q6kc%7h+;Dub<tf+&DoLvq=W4SX2Iv;0#DSpuh^kSOD>OXl_7v)H
zmM7RO(qTj?$h?BX$;LPmjfoR6$NHLx6EVJlr4+`X*u6J&9o0U~2R7dG=QKc^i1&>+
z5dq5D7W`Vxa?nn+)NOOu3;l2pI6FuHqTFPMJxdZh);@6SKr$JjAxK3?V{#40Q5es-
zB;T52gG_Z_t8T2IV*NzCoi!*QAsX5D7~aGBtvsRMdXhli2Oc}kE;c`Y^UH)%e?m4z
zu_>izvPJ(6#l+IM!0gW^TlDwkRTQ5B#_Jc3s2Pv3fZzO>fBa)s1oK5C-!VA5-qgZS
zX8fw$2i?SrfI!p`PsE%j(NPrnog*|PS_oOjh;0W&4)r{q%=pvs3{o%!-a{*5IyMbe
zM|W&C-s^R24wBUSez#xLp(ZgMa_c?%4)y#=k51wqZ_hsKNT1%L_fSKqN0*1z>ruEv
z_oGy(Lxp%I+D6##6goXm#Js%;^C7|gD~LKw*|PU<)Oa8Vx9X)=uD-!zn2f3IY01^2
z+10@Yr%foXP2Dj8j$O$0R7;rCn?1k9FFphPyoO7puzlBK5uFnHMjUYM#QGQ7w%wWl
zj_zJ_i_X&5Ag4MPfqtOyCx6=G(3V9Z+WRzkpEeDJ4H;Vyk(VPCOD?%JL>3q<EPBuk
z$J8(ry1Nya)+KF4J*a=7Aaq*8`e5fG^^d`tBVc8KouE&yz;kFz=y@-JeGQe-YV}uS
zROg{<3#kw5jnv0cq&m-yWED>p833vc0=S9<dg_fQxp5S;KTpj5OHg)24&}F|{Ensx
zU_6a5WMAUn77!M3t`Os5YFlDlR>8O^I=xAqV^;6C3C=YYyvhRJ<(Aj}1u!7U+SR2L
zqALj-=6*}fU|yqj-IeA)0c7OCZDa|Umw6~~ok+}U-fAq7;9X0tYF?T;Ewv^u4OKwo
zblyq4E5j3PYD{BdTtELF<GSDanp@{w@zI>?<{X`K#e;Jp3>UF~<q|lT^PAwCDgxi5
z0i`Pv>M<@XrUtdce{i|OE_+Ex#oi%F9coc+YC}WOTL3FUVq00hi6_Cf+~287tP#EZ
zv-l>8>U_jI!qZ#V%WopED-grdVz8}U)NR4G!a;p#o;Ss2KrpUigK>QzucCmH`ZP~{
zj9nte<&NQ87x5A1`Dot{$_lIOJ&39h*2x6c70}uY(I<MWv`9Mv+@n_~qStu`Q`^Qn
zESS`0n$%*G0_8HQt=LFpa~cE`(_!~S<VE+G7+k#`&qUIH(&GfwUcbjD1a62`hk6{-
zVT(Jq$8?)txW_5z4l(Q49(zzk7gA(zKD8{=-?#A+-kG@)D~?l#e*xzd2Gwt)ahQ$H
zMr4<x+rbh$b5n@5AA+rCm+Ml$D9e5}xY=>yX5R{Kc2ehLpNBZvKQL)=@*@;bi)3)J
zgU}b#Y$qRbG23a&f+Z&b=}`z4DmU#pBnn364jr02Yj83s0Ao0rE+W5yz8K=viwHCT
zu)CqLj|MvlwQ0jbU_($RB9$1~??d%Yg^X{29SyLdz=x#IFrLHMjZo8W<OW`&>Q12z
z)a3<8q17dD4<594j8tNxB6S8HD)!N6%ta*?kJHn1JQ06$!=X`FU=%wkxe+iqySxN+
zOEh}{|DfXy$+w|PB}w}+QDry@0>3i9hSO;<Gi=@c50_$$q5t6Yi--qME6~ay`}zW4
z6taBeEslF2x2`NBk6h{kF;d!;5T?kZaIKjXAv@L(pwIg4@Z#5%=zoZQb&;;@C@>4s
zBi)6%ay8N+F_{s;Hcv?^$0P2kDTilaxdl0bMil`J-i15XQ4$m(<Xw2vDiK6M1Rb_{
zPsNgYPikhRuKD;hj=y>j?jE82LyS6>*jv7(>=LQ!UH635^q~csv?qq*oVd?_te}U&
z+8)x+Cr9-2ZsGVJ{8&u`b~A95C&35$DVBa(P{xu(b5m4`1fyb#QHR}DwpM`XY`}6h
z7<3NG<YSEX0*(m6-xHE?`p>wrB|}$a!}X~aWo^nelt^k*4fm&p$7J``cS%o=gD=@@
zCvJyY0NM^WB-qVNz#lvQWfy2SfO+cbdb+0A4oD=Ii+k<WD0O|3P}j@eaoA{vl=TUs
z??PFh1u3Sy3XjK>>bS{{EICG5Pl19veihfs9a7HMun#@QfB~2rLJwc7oFvUXDd+3L
z%K2&(xNr)}`Lk#e-DI8=QO*;dNjb0U=3m5QGIaAK{0M!5hx`+PIY|6M)NTgd9s?7L
zCT?PDLZ>F2MdYnzWgs`A@wSAo3L<H>%pll4eydo%l<JT(C<$%2^5QPR$fuh9ORTQi
zOe|d=&=@8OnR^|Uu7q{|oOL0Y+g&hLOSR~FDolydI;qoqpr-ojT*(ol*XiAR%4rYw
zp!t*jYowg>B#1}Mhx#)iUGzzx2|;v#+#1i}SC@j_XSHBI=?@PqWbgaHUuZL3g=e@=
z9*vT%c1{E9xxW#Z_;`mn-xsqw3a8!*C>*pCQJKaDc%{HCg>ZX`lp|z1h<Ovmz@Y&w
z7DsU#rjx4o-;KlS6zY7S1?f({fc`hSvcYJfb}uT+V1Yh(HuNu~_-jh~kb~6R##S_U
zsNN!6c@8|&5N{{Nh-efGY^FAMjcPL$Af-sCz`yVuTEd>i@WE*j;$o!nnAS9JNKxaU
zZt3STdPka|Bl@-)e{<-GO2R_Cw4Q}{dFb79sm|H9wr-f&m4G1m_3izp?&akZ*{Ckq
zWkk%u$Z+LgJ)6+OGyem7Qs<}FAmm+VPg*O!wcBYe`$Jn)$EW;2qU4a~zr$-2r4G`l
zcet$$etW#b)7nUhtrFf50%Uq6L=&?!7k}fne|s07+D7Wyy5XHPWhvZ8=#&NKfyjKi
zjg*-ZlUl$3+xyPKLf8!?9r!1ox`Czr59X0gX7LeirQ678DN@ySKzG~)ps4@~p^`Kq
zynJ<BA}qy|)qCyg;v@tGo!hL~I}<p^`RhK&!9*e(Q2y5;xbr#{akzRd2xVe(HyvZ_
zAicY}ut*!wS>VB2`6_eH2+qe{T-gJo%4UFK;;<-~q3p20`pgWb8b|K_*12IQ#dMMH
zIPI5C1|%l}0tCAP5?v`hPJ5;$rGu_tWiA<Qxfz#d>kWlUbHB&%ln7Jd!TO}KTnzVw
zKOb)M$2zGP<hvn6uG<MMJDLF(y7mnDSZD2X8yA~_RNN)baUWI7#`d|^;)^Ir37wLp
zR&BO~0Z_Rejl%$b7x#`Cp)UQeaKFO-e}(&AAxQOb|0x2u{Qtpy(hQoWgZ>=%IVWRq
zUl~Rnp+(0%@BRY2JI1c-Z!fT-n3K_~FR*+o%qb|A6`YlN?BfL+Swg-DmC@e>ua;kT
zVf8SL8(XM7fk;~DmC{?e&#X+-%`Jq}izsYEVV#<=0A|rPTD=(_z?(O+u2V73gmK`%
zgQufZiecI#p-fOnBXz8~Zh;--plvFq$}EC>z@PQ}W^_H)SeP7%B0i%Ce`SU=wyn4r
zXRkl+YUGZXQ}VX;xMPL4n<?Eww~URLDRrmc`)5k_8+*P-=+m#q4!1;S#HbIOUNUU@
z>?lVt^aTFKOlfI`xMOJffosNv)p}2e@>S>p8oC;Zxvlm4)zBadp!|cLtgV!Gga>=V
zR~LBJ`d3LNAC^29Pt0H)Z=$4TM$$ysO3`KYH8mu^<Jt<LcL1tu@~l=jpOL|mx~7(p
z6Ir=Q{5&p-<!(S>B(8(Ni=RqM3IBTr>z-gk8NY8lm})VM&rB0=t91+hWd`d_;i@9W
znusG!rXM?~jCSBW1ap_g5RjgvgKz&@`l~zCVxi^Zdof2Rq8M^<BmrHk!S;~4REGvA
zeO6C2zqM{Tf2tSj7DH(Vda*9;euCyjxfH!#PeuEb540t%x#c!CVgvviD#cHs0)Qmu
zvgm@#9y%Uusur0wAKU`cLy^*h84(??&cUNRxi{R#X12c!tOhmZg1VKq4xVe0b3om;
zjd-L0KfGga*0#;w4v?%@Z9tkHv1KhiY9%*Gd~9#l3)il!?#)s<ztvGViIwdlltLOT
zUEbL5r)RCq4Xn}C9mh~kCS7Pn?bkql!NvZyU-QO&SVuY|2%)R>E*)K?Q4T?z(tt2T
zfzrbbc}fm~1Q0QcD5`<BzC9W?@-UF_*5u_BkeCuDq#!Z(3oI!yf%qxRA|j+2TOQvv
z2uGo_r*l{NOMO_EUTFXqt_tSPP<HE@-PTl3;o;i4MgR;T2sVywr*cF)lq_+U$y()o
zlO&nuf;5gp$es@R5h2G`ph~<`04#hhG&;h%1u<HN<KVnEwMeRgZx_%>7BjxCd}=03
z8oL$=sJ;#2chR|AGxS)Sj|u<;m7@u0h^q;zPf13iNTEw>pF)@XBg@6IFxOuE)B_;c
z?@rVDY~h1uBfbjS5n0bwSGhXn@v!%#PO8~&5$>JKl{DZ~nP^sO-m(IWK&R{-3z;r3
z1%E<_yA?GmhqS&>{3vH>d2fyc1bwY8eF9x#fjG*q(hjsn{*k~P+4xjzio#U16<(@W
z>E*=P)0P!z@0QC_boim4eht0S;fVGHUiDpzUj%=osDQcUTVCY5`m!D)PrpcWf1iCM
zVl?KiC!}icUZ9Blq#~#!=r;j+WIiBHmK8RHIu9t&cES0<voAzzynjE|zoB3!xMH=0
z*WDJ^J}w!&<Ar`KwW;78*i9CKYb><#Pmv}KvGT@QY*gz{?nX1f_NW2)6{k8oa%S@d
zS@6lXogGApBId1@iSC4XD{=S=vg(#!sKQ2YudZn&2fz_HPAO0mK@r7jiJk6Q&a=*K
zP&{!qmUr46Q;b1FylQ|-f6aw>RTLJlu=5pbt?a|4v~JoVkHF5laGbdB+d}e>9-<aU
zNCZ0D8lcb+c$;f39*-*OT>7PmIRSF{3rk`lu&!BfT^mW(w<M5Rpc1hn0h1d$?`lIT
zgE?#>{MxXyc2i;f#!lLoQ|MXpc!OIO-qNUTKu!ipZfN6}a2tjE&;!{ShWv(Yc%RUP
z<w%BT7bV0II&>kfPt0-(jPfBBSZA7n5hFbR{A>!(&lgm%)~UaMeMYfe-&MRDno4vD
zPKY8%3(;*|9Dlun&6Kf|rpWqhO+dNq8^awtScV<;6yQRm5Gx<5LDHmo3PptTq1pJ<
zdrjiYcCh63YjR-$bjGs+u0IHkWdw5#%}l;)2kX*)gi%BUvtD6142FyRMn$Yf5fRK9
zLR-w%fcJk3ahVSyx+PVVY?8ef(N1-R5wt!838yAsAl<*V6l1Hk{{Rd`XYS4Mh)CS4
zLXo%+pp<gf5Q_t|XtV!6#I5g}`BQ({=L1|LaJ}p$pF}KKz^5MXiuA9tcP&x_PvH;r
zJ7m)PoAVGI1s3wgJK?8$MEiaSI`Kcoq<;VljbZI8V$yG=uTDpzZN=6ayEIHd=ddn_
z)45ylOda2k24T#KymXZ_1~T3c_#y&7f(v$0pCui~A6yfVMOFU?hIH=lalZx?EC(!M
zad*8T9VWu{W^bY03C^6Jf?^?xZoOu3T+M;~vrquXlCGB#cgAcncHtAKXPAJhnJj$u
zQ!QaR)(0-H1zN{*Qt0?83L!oSct$Ar-Kd*p#CpNW%K(i9C{`9<(pj2BTTG}dEJ24l
z$B0cH@#9cItNd(d>DDPI6&*5wGSFpn55?@LI~twiS>EHk2}@#5kBgKi%0=fR1GlkQ
z;FCI{2ON!hShNn`^3pC+H-tC;M;B>WjF^9=i`2EtJVXQp_Wv{j`w)k8bC)EeU}%_r
zCjvWvj0zqcs6!;_iN^EwP56!7H}kJi(7oI!xFu9DV(%DHP^k4|x<jhaciLiYDEodQ
z2}p+!HAt#!Nv>`}=J)|1m3P2b(~2P+Afix#));Y$@Fmhx!Cg~RC9E<9g>@~{@D0hO
z2l;1jGY1Uc62KQt!QSHX4bVx#P$di3mnK?Z{-%sbghD(~00E!3()S`N_+B#4_R_jT
zno=C%6%^CTr(J!7_IPGek5cs61ug*0z|O&e-Ar;n+Pa$^uBS=+itk9*?oQM`dPUGD
z1^ysiY7&SuA>hQsCR6uhv~6yu;_>%@@3uniBvpme?ZpX5*Y@K?2-1!o05Ral7e+xq
zO9oUj4RYX|dpPN|EO4@~0g6neiq+vv9f4_}_NTzU{)y(G1?~lVZKIs6JP%woInS%z
z^<fkwd;)w0Jj~=wyPgb#NuowRqKY|qc~>blH@hihG+aVG!LD^hFk_F~L0o@nax7h-
z)};wxGc!|AIxhh-7=%xYFe`XC5!VOI=q7cJA>p;%q&^haC1wr`O{9-xbri1b6&uh%
zP8)pueK#os*3zABl#=i>;6^F4E#&Q4YJbw+s0rM&V>%v8xO=W8g!D&ll+vZzd-*<;
zlYT1WbvH^K@L7jssa<?$Oin73oh)_hB4D%>Fsu(LPbC3_Qb9H*YLjFtND{x2EZMCa
zAI6RwM;<0EWg~wxS-PKk653($_ivHf*gtLs8XaJAwpNFVX^cLYJ^RG^9r&>k`miWP
z%K1|t(IY8RS1J1lznCJCrMUejDYc#R6;wPF6&J6eFcdQaG!e{lW4f{G%Zj)b4P_tM
zB+#q-H*+HE%-7!}*&U{MiP8u~`t4dJpFk8>>Doy<fMtuGeSwmly62dNC}osbT{ani
zDPR>Aev|SPp@raf>MnJQyW1i0;n-WptwMy<Io+k~n4x^5yEL|a_01UgTy541_zsPn
zEF>3y?%|r;?Zq$gE~!%Tz)k+bbxLlfKX*H%Tq;&DW~{axc7imyN3NrIS=w*^WTp!8
z3x7XF#w|M86bzPxTx!ZgsnVdhPR%8LC{?;KE-zK$7gMD^jlaK*whi00$C1$QW+~MT
z5(GqC&#U`qR$~^L)G=m=Zi6hCwK#X7qcMnWSUWI9ZMdzwWim!o`EpG0mZHJnImH1W
z0f(9Ak*Zp0%A2)^5pNsQ2DeI3P#*+6B~BmVb{>RI(v@NS+o8<HZ%dO>*w=h|nv{Ui
zbfrm|Nf;2<ry|<g;K;Vcj=pM+7x{rSX>{BRITBAwmu`=Hv6IB-rc0p^sYI08l#Tq6
zbScA#nwm{XNgMgmbZMq#^}V#<J^D1yx>dS8=NnlvHT+C(Yjbc6F%uhtV_3DzaTq1w
zLs?)}mRV{{#6CRx3iQFE&>j~7NpqMb{@$%pvh>ss{Fhs$+obg0_{}|~+uNeYkX)0)
zF?W=cz@It$h3~)SkM@*$+VB1>wA~TSE238mst}&kTHa^;o1Rkg7zw8lqm#7lQ0VGR
z;}C66W0}SkE0U(!uv387m9Swk;}#sV!(R+1Nji^?#y<ZKnaLY4FXB5h{x{5IMlYS2
zAShK!{!%Zgt9^;SF5tutWRatNj(fPm1S@#U{|TdcY9068CKX6|zwi^cNv`V|&Q&m#
z>lw~08p(jIj+uCQZ|RoiwLm^h;U9N=PY-6_ydL~WZ)pbZPuZ5yM@nN1p=mOuKGH3m
zKbI*Dj33%gpY@1=+&ca}d_(iDJRsS5m%dU){1e;i>L_JuUz`Cn>dw7=rJFmG@zW3x
z)pV?t2^7x~G+`03;Ss3MwOl*(3Ago=y0!j!E6jUOkxJq<EEK+*AZxs&J*#K7*&51J
z&dT1tSTX~MQ&*=w_ah(OPr8Y%;eYKX&60wQFRWm#rVqgMRGZM<tLc>&aOFB(zY5nc
z7&ELbL!-$F5FuLVb-j3XHlgiH8CYe2?gt<NK;60qS!n7!2$?oC+d{`?bw-yfM@e07
zq?oESeX72d{7Fl27Pnmp%}J3RxR5mXhAb(U=Z=<|HN~DveU9K}{w%M0g`4|JJqo5A
z10`ebfhFDUdsh+JA^p#QWFatE)h(pEQn!=*TvJNV^q=3n#P=%<J7r%dG#Zz}`Vgnr
z#DDECCEL;N`U;}2kr~<ryvGL(kp99B@mB^&W17<y9JDzhn@|`Hl8DP+X5Gde!Z_4)
z!#F_RGTdHC3Dwm3UGR0i{3zK=_UdXpt;;{DvbK(je+#Tw(%-Ggwo@|$(@182?t8K3
zaA2+tFBvbzyK_m!bV(cZBl;gZR^GShi~YzTSG~}XdEY>)veR)AFjspWpWw&u6>pJK
zx8lRgVC$iqL+}50SiTRWppn{A03><dhL`G9oyq`!1<ZH>s~<+&bXIl+m?)Kf1z5}j
z>-lE`rHPmdyic~&sX;rkaoIL2Te2~h$z6k_ep2eg{Ix++eth2+;aSlh%v{WefrF(X
z@xzP4^C4-N?0phFh7J$co#8?I4rf4!6Iq65&y^eG2N&W&sLyaG`X1$@pUbn4oq;a>
z=fG4dK{q-+j}~i(kMlu8q+T6fDm11G;u@m>hUy*w48-ACE78leDGHUrtnuvt`T`)R
zI_<u1`NKn`L@Cq4Um7CKp)MxmNMB{zpei*)J_xX3E*`?lNMu)g9T~t8BY(wGBf~p}
z-;yhpv9I{6xl&*9u>T=fYTxt?#|9cA9GLkZcbw-fhe`^Y&Yv494emm0r^f5pjGqDu
z$LDpN$D^8;G^VIHn<5N+IF{E9l{!j|%-o(Qb&;}*cy6B5S=v&>=j2ItslA!2c~X*l
z3kpvtG88EZ@Zd<k!AW7plCy4*ecuun81Gny+2!;dg(yBx_HMuy0Qt++osLpeiTRED
zIlT@qJwxUd`$Y3te@@kTb%8~lcwRx2w)~4~!Bt{f;0wjdXOI(27w{M2!IbH8=_Wv|
zgA9=4C`Jz09PG!eOj$1|Q&}VE6b$wYs=@160KDN-uY;zlb0#DOTM<x{I<9U)mS>-Z
zdSG@<!Zs%PlTyBAnAB@t3gi<j3uc9FQt*kMl%j8B=tL6Ro}dM`0KybssggIIOsopv
z;yY+z>H3yX71^OGU}TJBzdn6Xe*)Erf$LZ#wH!iBnqu}OQh*=)(tuNNsbtmdC@3;M
zDiDXBr8^ymk%?*+5j>P3K&8)6(>wFZ;gXyJ6MNK;1{R=|*1Ce!NE^WU!ryEb-R<l~
z1#k{Epku)R=$$C0_dth`0|+p4-inTk9`0`hFlz)xu|G4qB6O4@Fh5$<2W_O?dIAKy
z>v|T`CHFq7ymh_klz{C6Y|l;sn}qi_9P@yTSm^>AQ=KW1Kdo65BHmQL5ZX=~O;4o;
z14o}7)AV&SqUA3L_|U!ZlF`UiuHTAVdx@XSlaez&x&-MJG5t}rv%Ib7TXo4-vy};E
zr8lBN+d;0KRDJSz`asom6rci=;(2<$G+b(To|oiH?cC0>xWLmjiMFr$Cev2D!G%rc
z9qFfn9YR!Pxb4Jyt~7>?4Ys_#7jYde_|npE1W$_LNWl}BQmL2`cHq<zq-&K7(2a{f
ze=OIeb$DIuQz2q5Gfk6yGaKR+T}2D`1AQQR=XKbL>ctx<6X*|SBffbZ6c7MD16T0}
z^(JY9nqs^|K0K4TGD7O)Zi&_ghF-){WK4o!d)4gFF`OS*MW5=U3UnRETX>Fy2A75c
zJtEf>tFz-D3^b}I?qUuNxF|@2jhM#K0w<Pvqa>!hXg5UEHI9oYNvQ1unOFY+((=48
zp9R6W?gRCUIb@q4=8(I<?-k!6HrWdgk!WcJk5~YlkQ-vu*!w=jJNSa#97%Nc4pi!;
zsAhGIXo|e`n7na6-BOIpiE^Nr9`CS6KEXBh_ySefQH9B3>OeDV9|lC*It<7K`e8dr
za^hf9oY(O^?=?y)yzTE8t9nbg?<J%GJUsk{3d4vkRAz~lgsA5Lj-*5qqFT4YQcKgC
zgs3bMq9$5`^6c^_M@vN_(!w;DKg+8I^BJS1o>H)qBO^5jf}L?n*au)C)X??Q-XC>P
z)753T=T!Fog4a@aI*6_fSdiLVoT`?VT|@1q@DbuS6i5@<ZG2jRl#&tw*a2S|Qj+gq
zC>k<K|GUv>A^Co8ywFO|vUqKQw6IaXZbb9qvgmuqV5$141%G&qG@W^P?HK94iLac)
zJjU2Y$tugRmnyc*qpjHohzbWR(7n!1np41B^q_bb!5pbVgs8b2C515X3EH52w~yP#
zN&Wi%(;+H{Y$p52bso~d(&m^EP{87{<~+nZm%XL<pgtDvi08g>QepE4x`Ze)q&er`
zkCX0cCQigIQBCVk)RW)hcf+wto41#%<E6a(E&xFKb0{~O%3iuhK0tr8+aZJn=on4y
zMf(7-9DA78!C1BKLu#GQbVxKS;>`-BuI>?zo2$OCHLL<kQvM%xZvq}wk@b!Dt=oo9
zXt)6a1PG8o0||sB5Fn8tVM#zB7-R{^>ZsT(B1^&|ODA*(xU{Xf7S8Ahqcfw33JM8C
z1`@!8O#wmnfuJb2X^;TQs>$~|b#Esf#CQDWeZK$mS0B>%R-JpQ>eQ)Ir%s(Z<-LTV
zO>;DPLo4~u+rGxHp6jw5!n1cD01Umv6sVWvp1Xo-v_~~SjxKao?H)BV1F}^sK!!Mc
z=Vw({x&!Gbn&$f%Rs98Fn~5HrVIPYwv!53Iwhdd~_r@z)14<zb#YuZ1bW!aW%wAds
z%An?b4U!4>=KXl^I|<XuNN{X!P0EIX#k10x5{<1<C3iUKyeG6p3R*G%&zfwY`V4gx
z4#J<jjyXG|A9k{6>OK7w&Ed`D!p{A8@<`UO&P6J}6+8^K+?s>x4BF1^BiVyWDMXa@
zms0vM|8l;RZy3p9rqElwNKE`PD+J+Rf*`6bzUg8HSVnMUgq5;-qZ^y*Gls}Q|M_zd
z3xG(PIL?SX;}}Er`C||7mBAXt0v)D~Xf0_zD0UsxwxB#Rsm5X)M5|?Sch$W}HA6F-
z#+PNl)_sY8l)(l`b@-hO*0dq1k+YhqWl^_;Y4|+&G{<Et;~hq^MuUvH_9d1xW;d(N
zUtP>`%gkT++tZw?drIWdrMBSYK>gcS!e1Q48aOV4kw^e04hmIrOX=l#8`Z#B$Pm|3
zU0_uQg~AKOYO64RAqb1$33?gAp)}O}su1LG(v85EwBW`zDBj4=b6OMFYw3=HR}C4x
zN9nga8`E|VD6kY%HM(Ln^gc`%Gb%O;Wtr?O_!q9_fOt+3T7xXWbdNzNt*M#P#CHYp
z*sk@`IC1wj>jF7BoOscPBq$cqzCPSDnze}xzYm^`Fb4q-hR?}4{K#lFpyMSDizAt;
z?Xj!CP8+bFj_O;mfzlgTv$|1L3vBuhadhTWVh)Sf&TIw~Cf0-uOTw_xdf}@rgXyU&
zo>oQzT_mQ&HyW5s|Bf=5&NMTbPVqI5!G@6Bg_k_WhS|P)71Hy?)d18=@QC7;`FHN<
z`V=f9BX{$M#;}IwV~wx`9zBM2mrn;*@K?sLuC%<_JBIbHW|M3%mbGmf8!YxS9AXo4
z?mbaU`M9yTQTLKX2N9c)bHPY~(>#9*AT8G!AmT>dx%a&_n}0i&wW?Nry>VzA;`t_y
zV{KYn1qOGL&AHu$CeqeQKA95kDQ)RE);4i#4XTiUUFnA<vp{uN4CJ}@-k9qh$C}g}
zwGJ~v7Oa!-eNo0U;iBU=Qu5?`6K0NQ9jaA(?RXf2K+p5zS+~ZYBw!3ovzdJ>?$soD
z`~;THUu`e!@&AQcKI%of4ivj9q(xy{LsRzsKe3|id4{KSWDhZQFVF4Bdj86a=9q)s
z<6m3Rl7tm)#SyYhi|3t6O|m5;9#xpTj(etVO2&MFo5(}4f+QIx){Fla=H!S5pg{Bg
zU{B^@yQRL>I_OWkC0iY6Gl-9au!H)&7sqDt3%jL(t@nHs;EoX(u3m?=f{V1LXK}t;
z>eOYn9~ORmSR=b<z;hzfJ<mEN*dB#}t9z2-M9>54CEQqrn-UXy@hL4>GroC`R2y58
zC3~b6__?@8>S@8e@7oB)m0xMi>hpekq*$u5f47t`*rU7d_%}>M2zprO=|6H3$+@%|
zHFNi&aEQ~~Q_SuV#Mgh-Mgs)$EYsb`0x#JaP_$`0sC&2IZ+7BE#r1S82)Kb^YHeuV
zG(wcT$3oTPW(QP7C*&h3&*BSg>A4+1JIhiq4`A*Abfpx^nnyuC#Ldduq#3%)R!!_I
zswKHMFw=%(VMyiEMRJjNG$GCalJG`!G+_xH>w5w>Ng#X?2}qCm(LQQYj(R{Hn?r0(
zJA!D?G7G8S74;n?Rv@~ES1txfmb)Wto1u=HD6WVp<^*n%S~3rfl0L_kbYH}Lskl5S
zQOQd&_51|@;J1a!k|HdQdY0o=$^8`bp|jjP7q{L#K*2>RPVEa=is6>PG928xQHgf;
zhYoKf5bO4YG|5?fSCmU}uy+9!=3k3?;O1GJ{wgIe<WWj)Fu-#vU^{cDR-3ZyIDM@X
zOOJbhM~i<}r`bP{g-KEDkHsLac#yK>21t~6O<DE}em!X+8HcVohNi1KwO8J!>BfpV
zBp&n|uAa=$o}Eo@nxqrN(>AM;eG?Of5DN$xjI~|@CeUzH2~B$ywZW(11y;BeYfEug
zE;yI=SS{Z9$Wl+novLiH;@pBHZ!9W+=pL3_N1?#6ybo2jkJbGgO_k}HQAV3c%E8t3
zqW1W7y-`VkQ)6wuP|7j<XoUU%hbgs0+xMPm2<q7hOMbx2Q1W)dbV<@Z=bQ;5IJgKL
z*2%4NX3iZ4x++_7^@CR7or)IrBtx^3d$}g6GYz)ka#;Vaq3h5hYOS3p(FC0jeQBN`
z*R^5Vq|Jg<Fh9X+nmbX4P9RMbUyxxaiQ1@57^pX)7jeQ-@$rt44lSnI*DZ~&(SoD`
zVrUGnRrI4_FujR~xIH(&QL<MfOT-mbmc53@+(NMbVC0%IyC`|J=u&cMQpIt5w06%>
zp(sCEas3I97_m>HMrNGV1aD=va(Kzegs-E`_!_@Y5|%0m#TAD9xKrvy-(cGH+m1KW
z$PpRZlm8TyhJ+mjOk?po5noM2y`zcp#JK$$SqPCZ&W(Z?HaEhV+JTCzfJ(@0ZgEd*
zZk|9=`esbYtOnTl&xDPk9`FJQxt3wCItI(u<?n;unad2005@FIGN$RIEJKc3;(Z4F
zDt+P6DFsW^LgGfWB|hvae&t)KzJoe|5+cO;2@HGy(6!d_Ajd+mM>cANY#U|cHyJ_-
z_bN^+ukbboYGMQc4o0=o3rwIBrkhX<`g-o(biFJ1)u@}ceyU!tW2hJKgcC6Gr$>Me
zgOLykykv-QWg~+~<uND6Rd~!f;xOPmUwtC6v)D={!j)kjTqtM-ok|O$Sdhbp&1)sE
zj*@rM_0_yKp2?DTI}lc_>x3Nn7r%NQNAA9D?)<)2_MNkHp1_a}QxPrhVOI2gkQ!lg
zp6eBSHTzE4tYJ#tFxfMeE(#1QIv3>pwubYYUPa&54c;4kI0p+~lW9&rj~gnEDd$_V
zW)^uva`u^EcFEaeI*yjXt_K05p7q5SeH-MN%!04`Y@VsIK<D_@8oW<OGIuMW0xL;E
zIxMb2D*6maO`hIN#dQWBtX;bnv@*wNH_siqILTQdIZswN5uU&A$(%co8NHNc>o7p8
zE}!(oHvuceP0>j{TNh7ZbdHP$jpKQujB23@jzveq7U>JEJnB42O`4Iao}H9SfftjM
z+;sp(j0VB%O5O<c@EuUNc1qkSbVGdBK`#e@k~dCrUTE(8R*-d)l9$HNZldN1P*Yh#
zZjAU?c3!Aabgp5L^K*02g}R_9$ayRWe1zPkZ}U~(!z=l&dH@w8+)6HmNc6QRx_}Q@
z@Yz5*C1c>}F!98OAda9CQAmi7gX*<I+9c;)$$6X>LsRg7x;7aK1XxR4^NmJ(DR5HJ
z1#H#J!3T_5EDL^|@L3VwhbLda_@MhBV0l6b;VP!c#9NB%UuX<EGD3~D6`OmM_m8=S
zVIGNSaLUr1$nwN?!%=%xyLlX5FXkSeg&oO&7nw=6=5TN`SR-b4qNXg#C*U;jc$cA=
zVzoPe^9yJk5$;;y8Q#@YY{or$G#e*gRhE5+8CMj0%ok!T2~n)HZv=(}d`q>D_3vSz
zG?NUDRa|dkajxs&e#HjMu4PChA)wx&n*ngeTIz>-xu_kr)QcUPDgcKx#jLe5Akbz3
z5kVxP7}P*RC`M><07NEmw9z3bsA6Q|4#h>`DnNPq9ATOzI#?I09!kD>g4kNgj-@dV
z_bCe7Sg(~n7oi=4O)AVToie8*FB<a#e1yWQGXbP#n&LVOLJFUuGItNXy%{J7x4Xd|
zf}D$d$5A$r4~JaRwIksutj~I=L2R+9A{YU`NhARfB|m9`@Xf@1E`BAb%6|Zd$2)r_
zn5+B{(=uD=4om6}>MxZQP_L*z1yley?Uh&Q`R!R)5p5JYBYJQKYD`gT-Tvtp6vOQ6
z@L;dryOB7KMC~<y-C)25iM>!LL|++Q>G(kJO7i6b<-N~?!IR|KJ?UG>Sj)=CVUaQ0
zY=jQCN#H`C+_5OfTboo*z#wt>HmwTC+l-WeHK(DdiR@8kTyH8O>1XJdtWzZYv~2-s
zoeOZ;y7My>;3cJ3J&1eyg2{s7r7NCMscGm6_;Hxk0pt&st_~now39j@6wc}qRE?fg
zS|v&cVfr)vp!%4jNs9ROMi-r?rfQ*uk<_{Ydc|S$tZZF2p1qwb+i>6dx8D}<A=Q7D
z>~<In)eJ{vAL<qJ)io*@@D1eTJ^sWXmrh=n7~|lU`c-@jCpTi+w@@{mY1JPpUEQkj
z3^*;p;h9_QV=;|k8cfS<=3Go(a_U|8Lk7>QXDch~J1rPasDGLDjr_`7k-Tl)lNcG}
ziEyz{PQezf0tg4gI(ZI-KXN~&#UOUaB098Ki1?3?y!V7Y+hn2>)dbaU-lm}d+?G!3
zA#$YeLQlNt5*&;%CaYFflq?oV_zG9&l6Qk8XV+>}M!5LgQ%ozPn5)E2kRqt$VA@f|
zu?f|prkgY4kQ%M}JTuL{AP{O$W~5FicLzfhx~DnFf69;z>Mh?%F{u1xf~r+D*wtI;
zgm%Da@#9O&j4<#u)A3a`1gOY^3F90FdSmhAzt{_uxV3Et2;x0ZUNN1*m_^WvVE)^%
zGTyeoN6(k>jNXVx!^s3Ws$e7d*}fTnVBt+j*T%fVOgah=hP7BW*pDMu`*97B90E%5
z_79+;&+*YhLO1Vm{`eKCo+BHekZwuHqbYwB^2U~R)|EQY(xfHh!!7eV17RMb`fVXa
zPu*xET>(}?`mu|fq;|f=plMf2T8|_h9`XZyG2FhJ>h*>WslPjrpb{LF1?A)=dd2`Y
zi3P4bfj*e5fAFf!MWu-&d?PEtpv0K8F_jqB2_RIX3brjWi_z+PnlFsd3H<3RQmrAw
zL1=Fok&mh&B))wW5&y!QMs+Zl$z~a?H})Ws_0uB%U8uEuY*3KPkJuTaP-`$c{>M;j
zu`p&Bw*1NH6T>F&6!F`%hQI)$W<aR5pbw=n-6AoT_adZxRj4&jzh`h`8(eWRGxUgS
z)k2SnP-}h2rKatJpZ!o?ac`Kl#JgFw#PEYpZV9B#b={rjI^1cVC-94cD!k@LQskhh
zYDb)Y_kH9LlGU#xk9nnn7ggv+N&ghd|M8KO9xQJBKBvNpTJe$8$}uC{Ju0juIUHSR
z(jAVHoJ#IEbSZp=a^J--W}MLM#i92^nyE<|6s8~SrAZLb7TTaYOOr^d8JEYwwZaSs
z3ycwjMMG@ra9WK#4P@9}P><^C4YA9Wc$xMMQz^b^ClRy(8(b}cx~iv@+_rcp(MnbH
zZ#TAofM5LrCpRaqm%{2h0U$y$EHHb<7*}%l6%j)1qqtuoGY^3$;S8JN>IrCnxX5mo
z$}6xLYPqLzbZvQM<FH($#%)DfajIGJ(rSXds}XQcaeV;(cXx3Q;(z%NvRF7&`Ou~J
zI8<eA@_k1RRXeRi6xUe#MAjXuYHF(p{CkWP^2!KTk0PXK?{FfG>ovg9sX7-OB&2QS
znW#7pr%_B%T)Zt{C}@^|X-6<-0HyKrTdYCdhy59_@QaUI@fjPWW_26+(+{IF2<cCJ
z^#-X!-4n1(2t=<K>6>`z25Cs$`Tq1SM*0Yj8?#<;oPg%5!=qCO&n8gC*oH~L4exsO
zKGmTzXA;CK_k(!JfOteS@O}`_8W8OX;t>M^m+*iRC<ckHhtNb~L1I*@Q*Jyyxre7{
zHzAOx6ujTdQ+0XS7x3}~OVwn_CSLd{t`BjV_=@#XQ+XBcwYl@D6j6JQ7RWK&wh_0>
z`HvIU$70qWRCDBO*b-Tfuw%3rqhaF@ld-ut8F7G4;RQP`KYko2&v5@6dPZ~LgX)`=
z5D@;o%D~VW{fwv+3nAYehJbT|*Ma!Wdk`N*d0LxaAwI0viPrr0L;Ply;A{uH{wA8C
z%lMzg#pYjr%=pkvh!wdJ#Zp^;32bW_UbZ|BRN4q2*|LtF2H{DmnX?dH*%XzhMP*0k
zt_8DcNl<S6Ntsu@<WuK=RdSc(4U=x9c4H`(pIBjG5oaSM#mz5ll14WCco+?LJr4bF
zn~n4jt>#sU56_cY)GO0D2_BH*0Yj__SMwwXZFq#_OWhn>sd^k87ZCnr8m09`h(^O&
z?Vb{*9&^{(yx)}~Hlt0>??|Gh9LM%saIt%)B{NLDjl+xAuzfaSnB8>lrw2x+`<}@u
z?}Y&Mb6RgP;@6*3ZzF#FWFu@nP6b}=jj;3hVD(bT<crBEzW`33W7~2#?N6a_85iI|
zlXqxHjVYcY+kfay=%+k6(pLvz{jUMRB|Sx=Te!6@pNrG)d`5)afOnHvd-ndf{3(g0
z^@$3cV0>qt;s{#^MuV<q`S*%2wf}^Xts*w>o`Q5Ccy&{G$Z-Cn#Qw|{f5TTY)|7p`
zihs;lVzAI>5?^GdS2jG;xKB2|aHrvFMN3>^&h1d3hmL(40eLd8@Sqw#T2a3YRT0{=
zw+|BCSz#2nF0;1CyA;Lm1hXa?0CA5bgK=`joKWriZV);!7UQxUXkDS{Qz)e1alj}U
zh1lwhRAR7D8;P`1`i}hOunufD))v`rA$XzwX{3&Xs#+Swr-iWO;dq6LnT+Esl`3YH
zE{pn9)L#w|loa6(axXT+z6np^%%%`AS%cgYlHHH=yRj3}=I?Y~{j0bNFAT3HUi2gM
zL(wczo5~AUa`(c~4fZ;36y`D17sAI*{EuHEuZhC!(HF@G(S;bHUVsM5D>6X>6ojHV
zu)lD*xsEh<e;bLwDWEW&>YyVZ^<(+VHCbIast#3HI3M(rRI`30`P?{*to@xkepFoH
zfF=i>89zybD8?%ZPWN~l=Ch?=6V4%#2-S7-m~^)20`r((0tJ%X;s-0?mn@#aFIka~
z)On8%#R%)Com(L$*+J@f8&HMk-pI^EAI-zWY9;ceS3j+oM@7K&N}59wYoNGPN&px&
zWTl=N!T)7t4IOpKhJ9802-Y^JYNS12&;}vV`!|{k(H+^2c$4Bfgkd2{t6tJKfHZu4
zTyya(x<%mFflly_2M%#Bq<eg_dx+kdbd*v(e#nQewmQkUdAE7ipI|OoSXWX$zE-vH
zbl#~ky9vB^qi|sbc@*dY@ak1s{?x<zWQZ{Ew7oVe**!on;0l^S1xV$6oF&XDO32)R
zrqB(T<T{^(Llv+EIm?;_J8oss-j1-d-&Bw4M=8kNOxrd@Sl`0cYlr|=LWG-!_T}!$
zN`QsSS_No)t-Szvf=UIHx<drW9oa7{6~N)@NV?aI+}@Hr0~n6>4@m|;fuPPij-buZ
z&P+<59dK!M9l=bbd|c@FC=@O3<K2l=^)SwqhU$aJuWW*=Xb0@9_ir?T5rd(LaeENy
zyCRdUf8oCZM;dKN9Y)cpOoVDaQLoH7_=FiQ;!9~uf+m;RHN*jcA@5_%1rCq(GzJT+
ze93b+A)(U!U&;Lf+ymNL-Aiflh0Ya<Ln)rcS*Yi0vT$R(#Dx}>vbY<bmt2&oE+=q`
zLl%}CcvTCAQYwa0<{}zKZz@b5Mg)h+NnDXLQtN`<Ml3YYmPpvtYm>r9hj1dbDR5#E
zT(Oz9T-@tv^D@xupKh><Sen&7@p{%AK{-^s@(ePj2P_%ADt>gsCD!GMXEGhf+z-KO
zFM9To(5!ZJGw>t+(8m%55Y1{B;N)M$$dgu5fRNANVQ~aw!S@N!J(9V?9Yoc=?yjwE
zqtuINX4PpjI!Bg(ItyKkf<O=vN`8?d9TZE3RN0c$P~@A8K-EMO?1Io1RRlUA607NC
z{8HGgiTEY&W(q|Zi+`Q4-x06m_p@b9LQYo-I5`(d-L>{vU^CEHEiulti5k(7w&h7E
zNnKBW`PgzP#PI{xqu9xW2{|_zI=i-bEhhAY2`MJ+JjtoM&EWWmdZH`B$&GLaq=34(
z-)C@2F_k$}lbO2Z79PFdl9I5EddQ@_S_JM5U#g!bxhF1%g75tfg(twf4!=j?7c_>*
zt)C8;YPYfXiJ7_t%@Twlg5df7#2||<EO|sYB8V1?L!{Jtbd{1jjRpw$Iu~mc>kwDh
zlT@65)c3GhD0QICMCmHWHlvtG`z`1)_Wk$+1Bj{%5KtiZ6x3Gl5BQ^v_}^4=`D{^1
zhh9qu4ST(o6CroiGVe1;(c<5Lzu*Sa^9CZd+U$4$9&d3sd<}&>O|6!-5n13Xt2=)`
zx?^D6si?i}-rj{rxA|ydQC3|~AF0Q(LcGt;@Hj?GzQ-o5l$TMyXQ-5TP{}3Br}9x5
z?mq((JtuLu;#!AfXSrX<6_f9(lOR7XoP;&jfULXTIZ$`?VHUMd7A2~?AtEP0L=vwP
zIw2x~Md<?snSI<2%u2vuAb`eVARt(0d5zf}shH+S#?0|?an(T73k*UA&1+(RNo=a<
z^GK@qvMxvMIpw4_U<YI&wn4|*o+RZ+tLTI7q}Y+eZ9V#lg(RdcVn__PCB>bLyB&-h
zd=lYgKC7XZjL?ZB31Pl!gdw0Td4?K-B54%Qt<UI$3kGwugv`kpptOZK@jgRZ=iX!t
z*?!>E0iqHM$LptIeD!g1<1G4EoP{}x2k(CT0h?w$q;2>IOlsJL5qOJfG@z2z@X*N6
z8UvT`cIEhz_{gi`LHqP|uurT`qX>`rXm8?eQ~*J)kD68MQ9y>~6s@K}A=;>sIB(<E
z8gkcQIHSzS0?RWgrYWtp5Zs$ex@4x!HnJkiqBWik*?<K_rH!^q6Gre<-5Y&JC`LM(
zk(uXx6zCu`e}tJVU><UXVuwL<{FRv;Vikw820~SH)k3-<=I*!H8jkR;MyOdQjtlrD
z$f6sfkd^lok`6a`tqBULc6w?MQqdhGFd$hSfr~nO_C(-cjX&v{4fwUQz(~_+9TXt^
zRV|_<__THckoNczz<g%FoW~NbSVRwzyvOlutp3m%QrL25pk-U0r0}!@33IOTm7}NL
z;!v^V?L<J3OQr&$y*!&!ZHaX&4PSqOGPkTFDJ=sJ7F)*ks#w9P2jM1qE?s*pM(;9g
z%AqH*fitD9ma3=GL=lV85bAMdhhpwY=VuzS8V~ClK9ta6zj{(-VWyRjKeb9}8R9Gt
znHvm^qXXE4V$eEqu6M#1{?HRFJShE8KZM2N<DOtmx|d>QFrrXhRH_y`zn9(CO_%I_
zOwyr>b2O*)#E?>poacV-4Pj9$39y(2NNm^O8-U1h6QuBD?HVaIe%uaR%!uP1nN6JY
zaJsm@dz5jwxT>!18YMJknYI%<!_gsS7yhK}hqFU6Ii6wPC+&zjAZ%GrDvG>#WX#QK
z%IU0UoELu1swb|y(Zv|m?zwQ%hHfErzdPJL!)%-azRNNn<Kv!W?Px`SErtykep&0F
zeSiH9G=O)EBio*|(*;Q&jeQ;djMTcj&}&=qs9mA{YxWVmN86%~_Vswu9{n@M`l4OI
zH}$fs7ASylTUWT%iFk0{W^)#KhTh7#O)<3)Sj&MX99H_B$V9ARCTz<Ni+3lQzY<;$
zJJhsY>bTv-DF;o?Z+=!s><58Gs})x>gXl6gcyk}Zi#u%>kY}p6monF#wp&P}`6N5i
zcEcH|0v`YBaj%^u@lGuY#$m|I<G75q)?ZLv7iy*}Hj$-rL;mNdSV)9kJ=CsP>321=
zDIy^YHx);HZ>YozpJE-Pzws+iAw0%uJvMO4>2#bMF+$d6p3wt8`Hq&Plo4)iAVx6s
zfup{q<c<M1uY>MIr5Kg2D5_)1E)q0dp*hC6Q&4wHRt)N`eYXak(cH+TFbjxHByug3
zTY_BoqOPTD1Rn%2rkqw-aW3F^e!Omv?%;1IjFWuzBo^NO$Vtf*i`vZu{l<f17vdk8
zr*ZXRfKlWU_4vb!`FE4pwdMsTNs{8O#_SE=>$diYySk0uW4;XjGV18fqc@BBji=ei
zZ2EluPdj^rrT&B8va^g1m!<>5?gjoG0Z{;4EUjefLAbh<GIwg^lv?%@fK|+i;EN`+
zhKh_3m-fhMeN5@tN1wWazcZOdHASo_D}|n9_O7!rVngUzvR{7#-y!PcxydY|ex#BY
zToLcV&G3je;jz&Vvg%G@Gugt~Ja-C93*I;jlR_h{ZyG-}g}ul&&f?Rivd4nAK8s|g
zJu;Xdn9Ax0cb|b*NsAlIFHdE!3=VUigIgM|0*6l_6}mB7V6GTSP7x$t;Uz{o-$}Av
zRO}MoTa^3~lHIAH`bV4ekMj3VV^2%|0>62fCrxJ$2fs_z3e{FV%wL$!V*I(|ALfPA
zS&QH=C|A<DJj{L5SzmwcE)3w^pGB_m?bZR@x|~IYV|kpEmf6NVBoxD;Ucq_#)~q=P
z@V`9EBHMS<TlUxhqmsC)0>Lc)UNOY#TdjW*QSdc=B5U0SaP3*vvh`UVLx}$qC70%9
zUkcFoE;vq^HMGn9dE5+yhi&>-K6D0aAN(yPOB(Obm(5`95*n|k;w(fH+Fi$7Z2nXd
z#VM}4NGPCg^nQycAnjA|G~y%S>-hfs;tZDBa5w5)&=b6Be-&u$)4(d}+CQ`M`_E+a
zB|mXSr0_kn*Z_YAn^QO@`UpR9&i2diHJf#jgI&OY6If5o;tS@$^Z7}<;$kA(ER4`Y
z>JED*-k}d@^=9#XbKuzBc543BIqb4*t@4^pn8`0b$6B*5T)gfA799~;G1pwt9lVP$
zUpc#mqszsR6THbsE&!5iFY|>9ShE_@Gcgn_llhtjY<ADpf=M?e;0N2|)LDwFCdOic
z(b-xL(L>(5Xt&-mjS7sO{-OsTx{wWMvT8{m69zkosRPt6AjSmYru5(&7qZsD*U%bp
zb&nqW+l8!EW8y$>cj8IG8vv*LM%vF0@)nEGX$d-S6hFvEEn=zch4y^)BG%fbLwTpu
zhyJn@*D|W>du#NLdXQgSgx<Hc;~|S#bkiRRuUY#xQ8eLGiTeEtIu~=ygbw_X#jHE~
zM=W2yn6(YQMWC|wL?ZueF>BwK0_~y!?E}BWGkuxZ-emezB26S33C=qb49Ys$7*!=+
z{}Q)zw{x&Y5fmjChz=#_RHP*WRUUYzx8V~VETZWpDmlov&_HqsdY+%axe5FY2kRMp
z0H$9c>6O6GI#`onO>b6{1TJT@ZngB@fEH%fj(6v&+3fGZ$BF(-Yui2l$86SH@^fEl
zSN_lvR>JIVUc<>+1%ILA^~UqAPL^Ubdi*c(dR-~}r~6?Vy_G$l9nb&jWbORSJvg3!
z<zzV#?I8%Kn7wmJFd^K@0Kr7Gk5DjV7Jt?S_Kzb7Nn6o{zv^O_{jaZf<|}ep;|C3P
znb|p@pPr^}j<<nOd!b(G1c$9%=NZLyifFwlo1e*L-P>G%^Q^Zs>FxdCo>_t&)|UQy
zpzcQ5-^B5xrL3`^ySB&i2}@a&pO~-3adj!{*4qFc85dBM!6+*LpTQel0zqO3#A?&Z
zmDiWC$hHO({M1QcA-20r9dFPkb54Q57Dqbqfy-DMKRw><#GhNn8aFc7IY<AT_%>?+
zVNd5DE@Lf{NJxR0sd~0|Iu_D&b~y|jgh=ka&|$-kA?54oA7aLkt;?ep!DT*jIjieu
zif=oTtPkhIma}?2Cczr&Jx3cVI!ku}Za+8vxud@|t_URiRvIu{0bUS2o3B~U!kQYy
znOF%c+yM2C{EUCK9MYgO@q(;1?Z_pS)oW~re>sgNnUoN{R5!6s*V*|UR2D1+e@W~v
zX=mE=<P~6Aqb2Lx^XV&?EqI8Y>uk^evVyg4^nsHqX;F)OThwCp1Q<|!+^;=9xdJD5
z(gyK5Zq}m~1^0E2&~W-M81Z{YyID_)<Gad@{RRByyAdH^mW`iwvkei$fgxj<Hef6k
zyh2_z@e?Gg9e@9M7VDS%$?f===h>VP%frkxd3V`yn1|l(C^g~pJ*;kRQ6Sb4Mu~5D
zSX2j!|BF#Nrmdf@xu?J-<X@ekrB)>tBk@LR7}q?kRVayT^=d_YE(vT+YRj9xfCDtB
zbH)o0eE6OF0&CTLeH5V#1>=d(ChH{;6l_Zp3e+}^V)-A;Wc4d&td!_#GuDr7s?Asj
z+T=g7lG&twf)450pE5{=3b>ehBJN}M&`vVBhQaCi1ZJEsAy_iBjKx$7D>h23)F|!g
zI=tj1)~5D8G$`@FHvBayt`GUoFR`YMpx(YGpc5*2^CdD-U+9%|c21m%lK|x13l~y2
zqux#`QxD8)je!7%UZlaH7Y@s^v&if$?G=10c&9Il+*XTN@LgX+Ko!AL_pY-@uCjPc
zTIpG^-P8A=^TJtYNr?0AgG%2L=dIA$-Q9Jto2$Hg)Lit9Ie16nZ6)_fe)wh9x<fyj
zD&NCoN-8P+XEgkhmFCIYXo0(TBpr>J(xzf&1aJQeYaA3gr3Gn_X|Evc&jP;W6=r)N
zGM!RBc!i}0MfMfX(yOc;Alp!S=U3Tlkwo5+!?YnN%MhR%u={7>xh?sHSJ@PSdu{~J
zc#U;$LFLTFY!8?6PCkU6Ez{YvzMnlmYQfjP#u7y-_~y!M2+;9U5D$KxwWJCmDeiUF
zS5yek&%Ms#8dhHZY#$8e#{NA1jMS#3^Bu3V#7JXOc}(z@88WG@dR6RZh((F^32(yL
zBYr4fq`}l#aR>zs>8S5rYJK?%&Sv{3s8NymL93Xhk`?<m=MCRr9i{Ji|2J5NSpM&d
z3Y3$9ar{r3N166@Ge6os)zG&0@-=Tjnj6C5m1cb38?0NzMjHK%e07r5{ubX+2*!GT
z;`DCDoBkOqr=e!|%upBx>zHD$DNDqi9Ems_;W2ktC3PsYZ3T0VIzm(LD0#g+6SjN$
zA9Q|u*10ppSpn|Z3GPvx6x2$|drneET=HaW_e?nG{N}84hYoSlc^438K!Czhvt{SJ
zex8)F<>SgGm84vScSnljx=BqbElHu1ruuG?Cu_H7M45UuU7MF7+Ik~pH>|8=A>M34
zHNA5IDxR|M7Ai|7;|+pLtkbjamd*;_j!D>*eYb2@?d@d$$i90^arOg{Uan`{RdvxW
zf9cmv4mE8nD&Xl;t}Z&Srfl}~>s79v#j%K#LU+m~Pi7D^j@x?7jmhe}L@Z}hHmh;!
zqD#2%yf@tTQ_DT`wtLe3qv{sua?E*0QI=gq`AXj63eO{gZ0F88i-;)hMVFMmMb2A*
z*i9=xcUocLH)iL~a@<*GIf%wAuhCyR;ZEC{<;Jp8H$$fFcc&cWz29U{jNT1Ty-+xQ
zdq&H_cT~V%0?85&XSIiBUdNOf<J>h-D82!!$Kf=J&kTUQ;7NK48-$yzdYCjT2;@mC
z^^90olJe^Lnf#YGS@YQ4p0tf6Df`pk>4R=ZFu5b0{@%w_U<M<pX~#Wjua=~o&fbuW
z%RYdP4}1#~#_=^AzHgma-)H$>-hvQ5zKp|^6@lMZihijVdwdx_JyvwZ;=G_NA9q>F
zds|O&exnp!0r_60SLChOetg-><?(#*U)hAFAEjXUky2rg?2o4w^i+<tDbZT$vwZho
znXSR<KFIi<GIsaH(?L+ueya~>Z$r~BZNa18X3av%TBKmpX3_(umOTA!HjJtiSrPG&
zze-k7rP9hO`73#@GUa}i<P~o-EqMP@F(9`!<YlYbL$%k7lBPGBq&!={umw+A!|aY*
zb;>Ko`_J8}-wFF#Jgv9KS>cHcZ_&Py{zdF;J!CSXIb^of_4GH0GsaoP)fdfaO{?9W
z2>Z!SZ#FW-^$f11c=EnZa01ak|AN)9ACY?EQwQlyBVo7d9f3a&TRbV(@mt3;qOdsS
zx&$j$3ON1}oS*QRwwpjg)!TT6kuBx8C*?dPAB0V-B&C$%D{If8e40_onBpv#ApVY{
zf>f2P`g#q-(z>z+4sk7pZusaw#8-d4R5cS}s_Q>Q-I=+4y@V}&?0Xq4ZA*xlokVR_
zQ;OD0u02@?1QBjbfH`It*>6zczSOWmM#Ji<x2reJamn4cvTcJXhV*Z>>~BCyO6nM4
z2P#Dc=*o|ZtkZhLXz!!Hkv<c8nm#QWQzP6j+$mPKe(geSaj60yPg2Y>ZYTfYU3MY(
z7M9c_)3t;B^3VJoP92fSV1DgRPb_;+*gMhl4|sNuD78n@%ekI>)q8BNU&A^Y%ERAh
zANZwwi%`D*eKsce07-eXwoT!k)?)nq^&C%Mi!-?6&+(OOSxf(1(^=tL*Rn>zhY6Z#
zp-TRlwXAdH)bn*M-e_Iby4_W)nie#n7JqRaLg2h}F#ps#HbH7=OokuS^v_4(FwVC>
zz=wXsUI{T4Qc}%w{=-LXWr#5=Jsnccmw(Kj2{9^M7F^CNKE`m}bBecG&tlkLPx18i
zEH=bIJ{kE-*R!r6#^SUs-alW@l0%Fplv>KUvVryT=X1P|+Q1gD_xJIyH?SUlJYUx+
z=Z!yM&25G`X<ZFbX?>i%PuvXC%Ve<EHSO_TeB39jW3$j=G4oC`6!JJQKtU^AZ%+ZX
zwV$x2{#G`_`=L)*y%58sBjNprPgrC_WAd$uX}3}**&9^OTYbu2crbA@SwT&wa4FZW
zNFlHL#(kxZwrG*aAYP>XX7`9P_dr^JHZCx#&hY)^Pg$R428r?>D6aq%_EqScM)(Fn
z{x^Kd(>Agbou~q85ey6eLQFP4RF=)xj_~$D7~ah0LLC51sP=}roR8eZPR2xH0k5W7
zu#)QL3vr!NToe~2PG6d2HYvDE>{CN~T`uRN^H_@zMpUtAQ}CXf#|AUs27WjX*Me-@
z{(3%ptf@`}?{of@D=-+`Fprh<x%n(fPQ*iAJ{u7op|1x{N(N6UxgQe|j73K?o%~y+
za^7V#OXy`#;JGU3N2vK%wOhM%3MSLXLAYG20O2A8k`DfLX9|$4-OL7rL=jT6cHLCY
zf8NX*vq`&n_!icNE&7=E-oi#j8y14WCO@0Ea*unHu0Wp#j!;ji*yS(NI^gS~Ei63F
zXqi=qR&}{mQv??_EguhG0p~6eFLLJ=E6Ua4JMxeMW(ygN7upefJtIG%fOV9Evyt#9
z?lfwjKjUBQODSX}-mzn%O=`ynY-eLaVqqm6iE2yj@;}_pk|ZX7z<q^m33IH?f3}GA
zW5MB==W+M&wbuDtcd{oXhma<ZMnSY-r<?plWSj~}+^h88YZnrzJF;Z#xKmc*9i{&r
z`1Om7X2^htrTD%sJ>S;FR1iJivA+jq$-v??wv~9@EMA$`6t5naEgNHN3t0`5b+e%b
zwKB|x)|LWql4uFjF5ATGVDTzzXXy2geU(5bYX@xn?B}edqZ94qUV%pqj+A4xq#eOk
zgV>(%wG%to<o?z>vLdS#eS*bEWwig4-Po6KkHGl&4xc9ORY#o0eRzuN7~Y(Vjz9s$
z&U7hZO*yUP)s8!rygaQG3ZRl#q+*L8<%nlq1-3zUtBysNT!qV1&d+b{8%{G2l(67(
zXme_rdX$D&;X#kJne$fgoN(`Yw0xzKS6G>*EPD${6b+L6qOg0`OiJ3Wyzn|+2KLpl
z9#o5L&6T`cA`?rx?AvGO3|65FUsLijo3Wx&M-Wba1{Y`FE}NALpvK}r;`c#x7!eCV
zy%LyU7F`mWU{;j37O+>%xsz66(HLBUeW*p3^!=f#+AV#8rnqrOVh$^=P<)l0)C{!?
z!4pm)s%aXkkrm~D4vPCNvo1MrwZnEiJh~`25L_<WXU*|`gx8hXi%Q#NJ(lXc8{!#L
z0l-<~<0=9x;PgqeGSyoJu(FtLegoB2S^2q=*V$Qo&{-a=EVBd0C(MO|T@&$Ck#b2b
zk#5f3>wOe&=wdh(IPY43cJ5mLHi|pzQeX)nc@P?fK2VlL;3H4i_S8Y1r1Y!{aDr--
zxTtJSZS2WpCnaom)YP%&4h9%Ba3uFg+vSN*0D6QKLj7nWPY!dIniUsWAhH*oci7=k
zh)3GeqeE>t%9>e=@XeDztX_mDMN9Uz32bq)XXtj%Ost5`(2D3b)&|#{<)Ntd?5xBx
z#nn=HO(D+3KG&)FxV(CX<UA+N_uf4_=RqYeolf@BNz-ezqH*91_zc;3u13)}LFzs%
z|A`%rs#k+g;J!`h{)+2sc#k;?%|17s`YmL^SA97}=d8{`IrxyUfRIc4qSJ5<)yE1H
z9oldS7%WQeVM0;CX4Q75X_ImiC)gC%WF+CFR*Iu62E2p4q9bUhS_JR@l(NiZB~NnR
z0+bEB;Jno#t0Oo@$*n~Kzdz}>*Iz>kv`)vKDJCi_sgM*5!8-|PQ6Z1Hkvb0J?R;FJ
zFM{4jOU^sM=K_V*TQR%U6Vh?#oer6EdpOe0W784#VI{ATT7s}^pxIYS-b~5)jh|-G
zu!snn(SRVD;ePR%vh$l7MWsQW(J*fanic!-!a&8~Yv>7-mc@OIioOv`svSm3ZsndN
zbvGHN+>^(ZVgNhIO&3kcPD(_t+t3Jb3iiv3+{uv{k5;4QQZ!SCEL1$?hv=n%pesS3
z%#iH)#5A4p-rLi+!ZYGsB0}1GYT9`$viM8;Sfr!iE!fu=y^4Mfg}u?eXq6L9cSRD?
zaiyOA65#<+&u3Fb#_44x9#<C~SDX}{C_70iRGv>ky5|w*Js@gL5^@T5EXy+VimJEK
zBfu61og=fG_cJnir<EzWUGSBIOg!xbTKa5QrC9a%ql)t?EAWMMJLWF&#cuCG*q~vt
zlCp23M)WCUC}IOI?+b1KZz#FhWFiM!7>p;_!q~e@*2{L@m1luCtWa@0p9BoBXJKg!
z+*yP>cOF5dl%d{5EHf2~GUW2%n0*-6)FV>iqT1f&{zi~vmb6=NtmaNRPTq5_<sbv?
z^Ty;Bf{DS2aCE|_Dn{{qTnUr=9=)fOWzS>V9gc-wYMwjg{G^<OVd-#RLNoB#2agx^
z$466P1=Ak~4@ZPN{jonDuNtX<y==hZ(Tm6IgsjZByvd@V^Gcp&Gg-@>xBDutgUEH>
zMlD)WrX%gRd&GHl+<s5*3TZDEV$|*t=RNZnEC9{Ll$Y!obkKP_1aYpMJKv_5w=eIo
z?8Qf!3pT(FOHDhNIUfZmc_&<Z4C$gr55UZlSWUWMN=Z=i2FPStgm5`i^nG2Y12)G)
z>b~IX7!f(x{(^BKmW0dmWMzbKp>*#;nm4j8!PZDp=CGIaq7wKD5VsM@S!M_Kxc!3k
z<VBO+s~xr;DRabeG{-X#wiDTTr>2^Ade&kuxrZrvHN*$)lrUFwe1X{oCI^~lvc`LB
z-{J?qWMK`O<6X&nRIZecw{c8=7{Bu+qI1&p)Io901G{*y<1^=?;~}%V#C-+PqU0%_
zncF?R4?4d;>nzsAaWRc|vc<fJpm#8T_7C1sk#;)ki0?ss@;|{(0DKNi|L_o8HmvH~
zV0^qAW|_2u{P+RZ#u1Jz=bcD(#A;=Um7aIxIPXL$OH6nMYi4*-R;O$AdXs*MeObYi
zgMn34eRCo>!?y^sE4WNl6Ya`|{JU4M8Y8F>t)*cwpT_+sAW`o@s$;je9L%(twp0+#
zq0}0D(2uD*F!?rZrrkzg<IS|d@YUN)ix{7EGi_t|9@tFVH10<r#mQXi-)0wed>=@C
z!*n5*NJV)jR6tMg;$GDX2=X`z`jZUhjGsP;@PnWK1r0asQtKt(k8q*zUC~~IxpB)h
zOhDRCaFF>#T0Y|4Dj!Pwo5-*)gay`<@@~2|3=sB(NO~07W;c8o_m%H}d&Cj-s{MJS
z!gEK9L@EvClXeqopANX%B1LmMMwHpt(YG1e&yAp2p0ppt8)?*+@oEnRIF#jcdR8f+
z%g_$v4O1Yr(6Itm(uzb1;ZMQ`!+`%|{fjdC0<WtDz<IE?-9{*p<ROSV57`S19E<fY
z#u^Bo)n5mTSEfzGD-7(UdBDG+uKj0P7{GI)%U7(M1tx2R8H161=2z^?pvXr@QclWY
z)}qc45D9tOBJVGtvKgj^_qHJd)I@Tg`Vu_m!E8OE6mGoW57Y+Tq+c3Q6^?1lQ3-oc
zna`*@Gq4az*G`9u^95C>m#z3x>#9Qy!%=5k^fnJWjX0`8Iew@2Fdd+`8~SrXNJ+9e
z9AR;n53umq?NT_!XGZB-L|ybc#HvYrs@1CY3imF*x6Y4s7)~vbo^9Mn0jvdtP#Zf+
z++bl?)++D%J=hXnUv*47x#KWvKtZ$lVP<O>;hq<%#@cX{!yNf_AKG2IGfeyW0{`kT
z>(yx$&>@FH;m~g+e(1LnQbkw^yhl*}FwJv;_dbF!Y={0P^^_0QX1vZjQdn~hv@(o9
z`VDO1?ijktQ9bJXr6O|{w=I>TYNv~!K65kT_TWf%Lq2q=)Ub{Rr~k2O6sn$6cZ|?%
ztr&0GL~dI5BUs$AN~1FZmXX?OyzxJOjWr!&rI&uq@+HRv%o22X#q;)RR12q9UZh_o
zcQMifTqARH@lG!KFRnp0Md*h!HoEFXQeo-!CRzp0RkQnTlDlXs-I^YzCfR6xyB|ry
z<J*6u2^_yyh9c43VR;yVA4JtH!B{z+1sd$^7JbV+v18&+xi`OuY|rv{2?$Puyx(zz
zbhYrOj<W=D^aU$SI1`48V4lOY%g}5f`LJ<~0|He(`{CO839wmU!}vYe`c3Xtq;HpG
z(=+{N91q69S=TFgb$5-8guKFi@5yxJla7gIQ*t}^Al*SfEj%j>hF2bO0&Dy^6L`W2
zmNwQmKk+R5_LJxc4S9%%I=2%cOqp%s_W0UYDe<H<Bj`cq*ZLXK>+YJ`B^dQ^6V!H5
zA97X)8JFsW)t%M3_XKNW(RN}TOJ2THPqHR<i}x1hB*Y%Ix32EPx&X=AbtIB|slT^e
za|jswig0X*fM0NUfM^sk`R#~4ny&o}MH@bE)PDT}hYwowznsK|V!#e%0xqQ3=YH7i
zHo4=d*EUedF`GF2`vTF)vy}cK&5ZloF){<0h=L-MoDlw~WMldY32+lsUZ6Al`u%3q
z%{{icfFrB18evlpdtPvn19*Wr`Me7=0uJRw*xXA=`SMsD*d^_+hAjt!BUbWqb4kDD
zSURBs+n&eYtj3jR017b-top@ou05G`eUT#UXJtzDqequfFB&%bAt%M*8bJyDa7Y!_
zf@F87ymA+?yR&!W@6CfzyAyY~!)&-I(+`omoN_X)!v9g6>KGXA?rYHv^`k8AKH<id
z?M{vG;4_?{P7p+VF&inKeEO^8UWA4V0`{v6sC*R(BvX(}M>U|0Ez7|p(eg*qhV!Y_
z?q$pAFV0qC{CTXK@B&vw{`h*SUj1Ddw&Jk$1hdCs9JX#P4qH2J1qnF~9v-3!JTQ>t
zs(^QHUqvXCR|~=1mZi(y#0wnK%veh-LbmWvC8vYcc){W3%Em3B2y~ROOk`BcI&Wkl
zMi;)J|9e);#|cRBX<B8z4keCHSC#Nr1FSV)`5kLnKcMWVjhrhIf9X5cH>~QLP$OrR
z$m#R?6e-ye@FAU<rb<f?MaGe6NRDKGk1ZK(<evi-?w6lv<QM%$ej_7)O+daQuz=f8
zrKkcq0D!8D;{r<V`w}`-R0AeRMLYQ?c#0aYnO6sh&BPs~fu*DOa7YW5t+^-$EMC3C
zs&jdJAO(jbI=2IsFqB5J`UZae=j+2pmseDVawm_3W7^e7(m?_Swd+9$U1ZE78(xum
zC;KX$_@cVg+Pnj;HNme1?T`SW5V{<P0U&@vg#fY_V#>5b_BbGX=2@!FDZfoPamx$}
z3oJ@O6SYtjB;51O)dzsfid-5>RkDo=q|zbvM4|TeMtLYM7{wX!ByvwVl-v*~-&;mO
z3~DowqkVv)X;cNFCVv0<J5Z&ymyL{Ka8a=se3G{S&;FC+^&Vi*H2j@|;6%v76cwrk
z!wDKviY5oTUXBh6TE)bNV3Q78bX*w{V%6Og|HTw{D{-vNij`O*h8ZMcr$*N({4fBp
z23GnZJ``5iT?s9W#_$NiKME~uh1cWGU8K*@8R}3f4XNQ;bFhnZm)ZL?t*^ptfl>(<
zV4_t$3~{t%30{cz#Fe=3s&LVaMs@51h%SxMvZ@WL98%P?m0TC!@)K)S1NZeJVp9V5
z{RGphyH6)<kl|ztcGLz&<8iocfJjI$s|ZqFSOGhgdj_d1VQ90t#|(2;9nS!>F5x#L
z5<B%7qI_Zl%wwH{QxTR_HO#FpbkmIt(fGBfGpz1Wo!m2GOOiVgy*%bIxu-lyOO@P>
zs8#30n@a9oJit>bdvW|d(IN6_sxf3c4$g?s7jB+>lQkQ(9p8}a{ZZJ`AYy4)<!+_Q
zrX~kQxcCAX0@yP52;LDih$`X_aB+;k4}^_#aq#j9vdZAJVd7%5XAVi+eah0CW`6M|
zYdSE&q>Eg%cMw9Pjj}4PrT{13{Tkr^1|txy00$j}P61A+K70?OSpWH0l@CSS2x%p^
z-+~Wm6I8xR<-pNl95O6dT*JYNJpTr3jYt<KwElR#C(=btf20cp3&O360M}0vUcpJi
zZ~~`D7j)Z_H89dePr!*aIZmkx=QE8cTs_i7BR@=Af-!@`cIlBWu0l+SkD2lDn<COh
zy&`}5SLhSs$Y~GoH5;V%^~8ldWPEwq$cTM_pW7g%)s6ChK|!wQi~V}6iyVjrQNqjU
zA4;bXYlh&)_PG)3VvG)zIYV&&{U8zzh#>?)C;5McqoDzTAdI*G!hjf#MXx9ZiLPyE
zB=H;=ld6>aZxWBynTuk#1Txo?c)y3ao|gF9n=Df92dB8~yKqE0W)keg!hhyl?y{!!
zZ=~OcZ@BL+TUZ(FVloCg7N7HIU@!SaGHIu=CMJQGgbW&g;^a?9g1V|jA}^p$F1m76
z`v8fM!)BYo^R73DU(6IvIY7PiE1dSixe)cqPa^1ky0)PL&Ij;CZCD*`EK1Wx+>17b
zD)gIZ%LH11bquhIvsZlJFRZbn6gk?b{xtLg&Z<IniUvKi>4Z-<PCo(lmQZ}GxdEpY
zqdr7}k!XlGSCvNXTyLaC0$8Lrq^}MV_7V7Mi;2D;geMUd!|IQU(bb4=lG_%1sU=~R
z>1P9k#b|&u|ErQ~!5gh&v>RJ^csYB#;iuRN(PcR8p+!K3M{3GwiLWeYjhg7}qqs8t
zd_7e>;1KBmzN;Kw*ocSmOF8RX=iN&2y`C!Txyy$lq|iW|s;W9L<^Jzu6g9iX3oBUb
z&}#S)ZJIYIV`HfjnPse3)AK0#wXI|jP+XfZtnBHKZ&RR-rfW@Z@`GjY*(Q*&2FOBy
zsGl1^>Do6pc<@zRsCk{oU1cd0m)c)-o^zGOS4$|o$|gy#@;294(?>tVI16Cd+<d&p
z6{>rcJT(VWfEKLe<fY`TAYGPTZ8S0w1r(Dg=A<z922!L+k7@)~p;gz)dU8Y!^#CnW
zL-`gIQYX|m5xtWDcUQqpt|R=yHI{-Zw7<^Mjn!#r<?3{#miFCmtWNtO+z&Y1{T`{=
zzdBHE1g}~OWt*~liq)wwW$0(er@K4&kB%EFQ|!ll!Xr<xx{gDtS38L#9=_fB>G5M_
z6=|ld&wQG*9OtNMQAmqT+LIWBHmLLaZPU+D_r^KuMJ6w)!Z^kr1)Tw-C(KzuL@{MX
zVM*J@aAiXs(lXCh9XOvxrCoFuh!sP)v6{vFWnHS1+E~$U`4QGktygUbfP2oSZzh9)
zJDaQn=m?9q1a*L{I8TNQt1X~YT@NEin+Agk(jkZfI@i^kK7t(bOP?y0P``q1-h7Cm
zFl`2`7KRS!r67`8^H4tfCuXZx<3|kaQ2^3D28d94_>Bq{Zwuf+nAsQOz+XLFn^Qgb
z%4<V#<gBYKhX)a7x69|lWI2{CpU-n-xe<%J&fk>fNRhWSkMEFWTf{1qR4fIlyPdm2
zF@ki17EwSexW<`TZY!V%=kd;FIhwsUpN}=m;pWt9xF<4NmRpJ3Q=9lZX1N{Pte0ax
zgs_0Ty}zWXoAg@jHgYFYZU<RzF223HQO`YY<dz|bPgSmaBftKD+@5Jhu7h$r%5pRD
zZ4)E+mXWJe%l+U}emDrVvOFhRZ(egHuvR^c+;Af|j&f_6jau#hgnv>)?#QB_6YXW&
zf8f8=kfTJYkA1>z7P)gw!gGO?8#8XF9y}wQXgA;oqwA>ucts5Z?a2+|(`EzyhfjB3
z=095GXi?PI4ZKCL+%aNQHTb}S9=Xh)2{y=ac|CtASRTym&+)Uta{Zdcmntj4pAD8H
z1j=y+&^#T;+zmigJ-P2=oo34osucMGX*R~lU8U!;p*}vfrraz9yaqGjHO==Cf2F3}
zB5IUZ*fpVnQ$|4qD1zYHn5^|cK<|CTkJgks^mvb2WeO6E2l5dLJ=~yr5kmmd*d#vH
zUZ7XV2=d<$;Rq*R<h`tNU$){S?y}0!t^DQh{!kb8?-Fc@uf}%zDDK8cSiv9C_#vy@
zQIKHXhdij39G4`@*I7Rno=XPrQ*AXnT2NJ=RJ>KIKvyrHT}$pBcMvV`JZ~$-C!SYr
z+4ynywc58XNHO8!!P%Bah3iHbuEL`%+&g%ZpQ<H~8+c^hFBQJ=5NmXZ7J`2HLHH-Q
zO_?^5I#jHmQcc$B4cdl$5yR8ss}XlYG;1Udoq4|JOKQtw>!baC!;JRw2l^*h`1RUy
z_Z9~&z}(-Q84c7F3%n9_q5=0$K3I_>L)Ux<B_WNDAC^@}$_rV1p(1-)I%{Gjvdc_|
zQX(Ko!=dpZOc&acz5PA>H7Tw+JT_DguRqF4fR-G+rTU!IiH{DITgyPfmxRiF9QIOB
zORIZW%tTcdc~lTyS=ygrW}t~W5^EkXj?0#fbhQ{uH&YMz^UMeqT1w_rOjno=5Tdjs
z*<uBuy^lfTr@R6bWSSCVFI|jM)_wJ>QvQT)?Pe6R6^Z}~K?lHTlZwcytKR_SzY=x`
zt#9@$t(|=vx=kFdDQLmi+g#FH6k0+C8tVD=_|ZzIAP)Og0P#2L%T0J*9eEaO?Bi|g
z%1tCMPpvCI7W}6p!j;Q)gTG%_Zp!w5&3D(87o-(p=J$33r;`~R25^KhoDbbSV5Sip
z&FEavw`zsw1dMyJxIBdBPd6%Ks0p^H9i&V^heiOVI4nyY?irE3##IY4r8z%PPaZBs
za$A_3!v0apr-sRN$@z*f`8s|U*Owb1b5(tL2dg`Yk8L1_TeSS!k|;pj(0aLnY;n}V
zBsWqm*6p>3(6JqQDQ-8=u=0f=<`!u+Z<EfNil}w3Q{GiA7I^^;6Z?N!J`(-$4pJp3
zz^+BmC{cgwuT^<_B(z<7GX8ivV~ZnQ`|KMi&U1i)6la)=bQKxv4{~U`reCsk>#U?l
zpyNXt%559Hij!%?KP5!Y%BupkT6g(N4dqsjh=s5^G(`@00?c7g!n?f?Y@4ptL}9v2
zibTG)7bgLfnl$Q&6KGBE7fx>?M+YR%*4E&)N|HDzlfLjnPp1UGw%i;BDVq38QE5Z0
zXuD2A<L^Xze#kd`c(^=>!uI+#QEZo0yLL!ikg`+Xy-9$2H5h|7ovhxny2DxcOZGQG
z*@#!)Z#O(KpTyOVO70G-{P;-s;t2OtD}uunpsg7dUqcKC&+Od&s4I>v!JbZ>4kwtd
zGjPaWhajpiK>m~m>~*od>QCH&_3?QCdtXAHd%D1#Vuho`X2K0I6iTrR4Ez*9M8{v~
z$4{7sV-G_=2;CR}I8AdghGrD(D{qisFH0cIsRDDd)!RgWLp5fs20_HRS?8{P-iAm=
zvB~g&_Sa3x-G^duj)_ci7Fc&g=*(g~(@sK!(UOtc*dJ&El01BJDe5(_kRSC(tsl}I
zA_J|={Y0-a?Jc7K?_YIDy*z&lvc^Ns46&d%nT$!erNN4XAQUN6k)iHX^6W-Tb^;^U
zZW3;=wNd><2F(eb@J5%H#*_Q{fb?P78LT7)IWo-~Bwq(`bi7eVtk)7M9R|Uj8{i9q
zZqw^XbjR?7s+WNIjyqMUBW*8kRHZho(-Hn}RSF++p^PMF7-9qMil#}i%Ida%Gl|xM
z7&KE)73ToL3?;g2EYjWPrS9w}@c;`$7Dc#v%_)y`9Kg;+C!EE}#2+cECjz{dRX7U)
z<>*;?|2a&{sp?VnfR+lg6nQX<J2M1m-vmefN;v&v3Td%89#k>YA!}G3P0;*65cRe%
zn@GJS^JCOB6-C&s>l<JU@BWa+@R)yNuwi~NeG#M7<X@g+F`>Do)LgUopELtE#mce9
zH*8bgzhN#3kX5<w1Ns}pMqP(=2woDp&!P&3(2aTkwzD6CdBnGDiny6_whbn)r6c%D
z-y(eCOGkO(w=6aeleCCGj2m(YOB&)Eiuku-6e9K_90^HklRH~-Cz=N@*WgXhv)(MP
z2A_DI%^HVegjn%~V?fiH<FO^WYw!Zh1lYTP_@PWK#YlcqBnM=~8X1F(46&8r|4J$0
z9kGKEa#8q-qkb}NTeRSdzhl8{Q!!V+!-<oL#r({7?3GUYKG#czPG+h&EUE-N+D0Rp
zg2M(Rzx6p^^F6EIXsMC?_v+cte$Eek&$_W?ukacdSX#Stm_!YJswMadJp$_qg$*NN
zD(qIT;z1DJi#w&>y1*W)F>{X|JqVX;Hs(KHV2!LCYO8lVt*X*a@F<OSX190q5gLnT
zk9^J@8oP#>PF&adE@n#uStL6u^H01uFq-iI-+qa$vX0bzUkL6Xhy@o}OUcIHzQ~@E
zI`ap7EVKU;M=@1x6jwz-#iM%NWA5z=YU`UEu&v@5Jsb<eZk9#AaMbrOh20v>3w><x
z!+x7~3&3Hh$D(4w7MqLSwzY(UF(1tlR^evI(&E0xOiNMSCjuDfS^Rb-*Kxk>68np7
z8m>hHUyHC`lW0b~tv%cVSRTW(HbJYJ&x5fw2@zxQe#hUw%+j0TxL<{K4&4Z*s>GcG
z1pr1Xm&$AXz}|8+*-JCJKwn#NJ&YOKOMkRsP$IqU^!<}#R7PdcZN-)GBLMycMOsYv
zp(K0##=GIjLQ6ss=bW_4ss%Ida$ko8k4vQ6vtdf2`JZ-dMjxzNJ|Cm9EkI53dK+GZ
z+OY`_BuI2UV8s`P9srFo1TlrQ<ES6OU!=lQEW+e?2G5m~G0a7zNp|`YGDBRDISEB-
zb--&OTUL@$D+BMmQKbAH&uK1C<X4;EkJM7`%9lpSf8pnv%X7KbRG!SwMIj@qsa(j1
zM&PNa8UCzkK~ItLbpB$LJc8Sz<f*)4bNNx;n=*zrlY6}`vl@<4!xLmb$YWNbA1L#`
z-+T93O?$nMFhPl%x2xa1=1;}iK0uVCb1elV&Zop^k#7iZo51Y-2&jUf$b94#Hjo!y
zVUu{bmU5fOwctErIrTfcD;rT{GltPr9*X@~3p9l18Mn5Q8`YtGSvO2d5DVZ<3titG
zE4Sb!E#+EcDB4mdx^3(s9hJEv-ZrcvJpr<tvMiJZ-yzzpnnrDgc?IrqR>Je<O0mkZ
zf)i<g&@$WPPWsx8Z8dk;*VD3iJDUvBUg*sS+vMibE<VjBw`#Z$-~q_ob@6GZ&Ds1t
zn;a8Kw<$SyM1U7VvAaXpe}~bLK!g<&&NA8jstww3M_#j)+_;WL<^8%@qgu&zr4RX3
zfV5anAh-t>amXmHStMqALK;uR!Y`UYq^Qrgwvy|xgDd!fR&w~`6Yvp+5;Z?M$()sh
zP-3{S`?XZ5ILPd4EmkR{2?Y5XgQCG`ixu~|54OeODIO6x)gjVyETIRBqc=#8L3*t3
zdpt$q$>uw~pLbXwHL}DyXa;<Q^JiPjqdWYMI;1ZjmA4kG#22Wwb@gk!&T^?G8&;Ix
zq>Zde?07VPAV&UES0JehG^Hz|0XN*7BdK%Dw-y8$P;A1TF+_n*ukkly<fiRb1GhG0
z8`NB=J_VUNeIml}>#HM@O7+4cjyw4I7`dhODZtvrS9kx#>$R09g|~#DL=<&UuW~Jk
zvxVcb`Aco(@EXESVBgBux0PeqX@doSX)E{X@emF%Ll3I_r~u0^#BO%z%TL<#FEI^y
zcKTClv3r80M{|S}x?M0M2i5&?0)MWZoFskD^V`X-T4jN=z%>>`4IY;4++{IF!4OK;
z&HdEhQmhQQ0H$mnE4OS~1DOOrxC%ZLNkp0Kw}?05o1R2%2qd-&WIK`wL?1~V`1($A
z5X&0DwOA}A?K!VJ-n<@f+#WnXi$B<2ekMY+eHxY-Vx=M4r`t_NZIQUN6oJY|wv}6k
z(@gVg0{(kp00Fhlyi<n&0xs$x_jzzz-aP~a$xIrJG}2oJ<84xjDLN*Qe#?n|S!0QQ
zk-SkyIpY6kM9lsTB3|C)CnB{`C*p}s5-&}a8t{>Ea&-5Jf{1I8Tgg!1!cp@vJAaO_
z&tq}nQ7)Z;6<vW%FVQzoY~q{Zbh4Jl$xqaO@KZriFn%;?ujp$tSZ7pcxpj;6vbY<B
zxWuGgg)gvsuBAtJ!IZ0rs9%oat2@ix8y5mV2uuien4{k<3NN}Sr0K`}YG=7Y$LEj_
z-0?bYT^tckypz$}1Qmdsv&5a1#ID`CfL%KQVpvAS2!mbC5YF|HL^!~%sCo;2v5RbN
z1J;i~UQGj>SeNdQGH2gLDw&Ju3vjRhiw5X^DPFGM;qS<+YVrSEtMxMP7cbkSiF|Ur
zJX(1G(#--%m}zT@r$~M%Ual7`sN41v%*$o*a;xw((K-J>A%UG!l*QY3^^1u88~EU^
zaw`%M72VLD*SgBR!~XfPzdtC_>{x7pqC3`%mYcMrD;8~NP4wze(Jx{)(jJFPe^tM{
zNB#292;Qli++EtpqaKqRM!gHts27NqLR2JSHqV`nG@$QPiM}3>NRzD$)Gz8Lw`_tX
zZx!{$7eZE;ZJ<5s+O=6wHF{fZg4{SjLwmNM_9NZpgcdvSO2zgQePY18qm#X=VfFad
z?s84GI+X9}4iZo0KXjKz#Y-TpS&+C9p2QV_xY|dZAuYG~w!o%ga5L@(sq)R>m*eH=
z-ynS4tN_9%eRLnfH-x<tvKa&6HwjM@G&(>h{GpkFgx^er|7hqRkMJ@Y#rJlXTmD~C
zz5#5wl}g?JMENz-11P_4?R_Y}?7ja;`LeD7EZ=*2Amw)x<(m!p<58ZKb^UKxe(67d
zC*kW%4Iq33Z0*02H8&v|{sYTTyc59k8>R#j{x}i-g@J!8!V4*P=fC3k8}Iy1!sk34
zK=|k1xewu=Uh^LbpB*2-@lj6)5?&+1m#6-*2rq;@LcjeNLVnWf-%0qZPXrMD=eO@e
z_+xMVN5UuH4dD2fo(LrTEh7B%zJDyj5AK0^{qBFo@kihMorHgUVgTW%y?GzP_y6;M
zB)ln5#!C|e32#{f!k_8&$0GdClVz*)Uy1nCH-0DG4~-3=`{`Bpp?m)8|B>$1w3?Y?
z1L+=4bRUxR$D%t)n*Ua-$$Ra0Qoi@-0Ll-3?LL%m^U8mud^N4++^9gxM-%0@CH(Oy
z|6gh~tzZ6~gx@eCfbd&ix)0&`i~o`E*<AuA*P$Z<37<fO@6h!RNcik7fs<>y-?@T%
z{ROO8U8CgQjV6f|>xWpMxktc0Zd~oEg+9v9jDioKSl>2$flH(1HkC`(!K1NcErSz)
zu11mx!B|rc9VfSnY8gQ0wL?MXN~_iYBJ;91eqpqnC~Xi6Rqp5}2Q{fQX^B<mOnsf2
zq_0y)KPI;j2Cc=9VU5}nd6fn&0Ud%AK<aDMmi+8va#*vU(H_4|OUW}9p>*g&U#Ma+
zD*$WphsMYuE%FR#eaRYO%f5@nG9^|u3~TXvy!`~o_Lh9b7`b(AI_Xep{Cu2m8zc8j
zt|Gp$5WvV^xqAH!up-+?93U+Z_x%I+sg4NKEi|WBphsR9C3pX=9+@~Kphuowai1PZ
zUVfh*LB(w?%DM$~$(^*oE*V8#a;*IywM!O_ffb>w+i&(s-~UaY#3Dj8dDESn@Y@6B
zoq++}vUcfxy2a`Gt!`N#D3E#%4D1#=bxY&6f9P&m-{t>Jw><0AyXA!^<n9gcZ*jZI
zW4p?Ybm{f;lKV^-$FlvMLUx}ji&%icjrM9P?LIH122L0AsCTBf=A}>mE`wWwF35xo
z`Ty47R@E@w)F)l=&lZ23bYFYh@JfjlU~fB$t%~1e^?AH+z%)J0aUZ((Uld69Dtll6
z-4CwlTSa%NZy?>56W!0W_~T8}G8z?VZ~MLTbSm~Z_{J#+^p<^yU%{^w#bc(z<F@;B
zK6k1-o*jFJADb%oWUHRx4W`MX*hA0c&zL4l66-OI&wfVk!OExd_0Px!tk2Z^Y18Ez
zGF!ETXU&wmG=3Lur`Sq`bBVJ8*N@?P3wStLJ@wyR!Vk`pBiQr^UOH25z}D;UjT5TF
z!$Vz%-)iKu>iH)yD+_$Pjr{#hs+9+`ik^SO$bY?hKKW^h?@RT3Hn9o+VHWCh$$)QL
z9iIFn1^g`||HsDF%G-zOT;!Xbdi%CD<|}6dU#RiEyfH7HEl09Bf9Kk4xts9YUE7V@
zGUc}92wyR$>PmOq8;v^{JtJ)@Tq4IutEsWt)-XORQ(nb}&EVE7IhBRH%ZF#d75vPz
zJSR);&xX(Bd$Z&gtkX>XLzdir0(^5sq=S>%KjX1;gUi;icXK?eiP*Jqk2LE_!KN9=
zJH8!FGsT@sADW@ngcA^yF7-A}3py9$9v--)C8^^r>b~k%6!PchpbN2wuxgIn0UH=4
zbL6h=(TXZJKJO$rRAPhQWJ@tU@O;l!h&HzY9!!xasw8#5OB;C1TsfkphBSL5{&-Rc
zq-)+;a6!~R*+QS_fcCj^vqrZ7Q=DoC@F#&^ygiG*Jy#BAPd&@G%$1`D_Yn0ryHms5
z<HHdu(Ho0eY_WcdlAEJs`<r;uj-nW7Mt&lkn~p89ALEemAp-U5+gf+DvoJ8vlbcsN
z6q7Meex3rEe>YE#YeHeuC#l%L_GKt}JF%Gy8eUfNT_ym;&6iuVplN*cd^w&zcyT_u
zX5Cc&>3q3Way({zXlrI{kwbI!Qg}D?&&iQm6J+R#z7Oc$TrI>%$gp_n3OSK>V<``R
zPVU9J2J_L+$@a!njhGTo>d!fMD@uQQ0JjC@S19>gd!f`*&%xgxzt#mfF@fLD7Rt@|
zs0FgZZcOHr7s%~`ZR_D`VErO;J%4MlJY2{1c{N;U(Yp5dw&p?|SCT`X$Y!|sUl+<v
z44g4+zMX%+P;L`efr-;-zz)4hmz{{}FLy(1{QpgDC;h6n3w~#97gB9=?y2olMs39u
zO?}|=*EX9+Wy`%Cm1IdVNhiWgNe|44-2!(uoF7-(m`rn@a^8JHSw{Qxh^D7FkK-YG
zU#I0`tu-F@p2Ew9pt#HK3`=wo9WU;KD0*dq-pZ!LhM9HYz@AcU4(-$@@h3IIGV7A>
zZPB@LqDr^}E5qXZ_m<HO^AD-VZ=Nf<SZnf*P?Q|AbMnpw*xW4A>P`JW)O~$iRMpo1
zoH<7v6g#M(sHmW%;wuyuBql0@q(b8hXeDMhqlvs_I%Af?3=R;-(=jXU*o!y2T3Jso
zS|&=Spv0h(;mb8lODu1laqNa#iZ408@7iaE7xO;%d48YYKfgXXoU_k<U3=}d*IIk6
zwQJ_;xQ5x^FP816d8Z2l2q#lxZXv`B-42^@bn#&r?g7WdvOUtiO3nCKg<eHxRG}B$
z(^7PDSdetk;i|k&BU?6z6)W<idTK}zKH%QK2TeN(8nFjr>ysK63{z4=aKEO&9m}>%
z(RM$~2nZeAau>MYr3X!tRe-UCt16D!b4c(CW5}M4J-=lYc*~pjfAGU2oc!&7ngrp0
zISK9lZzrL!fQIn@^CWa(9_n<B?SGhrHQ<*1yGdw8ARc$}59kEq>lRA$wNh}+e{DpA
zlfR7!LRcX`(U`eZom0qnr}t+H`FP{BIqC<65b%#JQU6iMXZ&eyjf+y*0&`uRyI=?q
z^*^F1keiuLUhS|jJ+St?nOHWP`S@RG;hk$)ax4F|;2gB#USKPZgS|JAELw0_Q2!fL
z@BZNb5Y^YhRG|%&)i?mF6>Ntr`=7z~$TGlo_A_l^`*4m9ThHQ~!q(OuOL^gN010Q%
zo!K^3IxD8L_cja}fLRPm^abr*j2eL!A@_nq0Z5=oD0x{kq7urMK3ns#D8<!hPqAqE
zvu*%F^1oZ~{NgrH*vY{EucrgxXF)L44|j4sj4KbSH9NVOyTHR}v!cle$2LjYgIj$4
zF|DNWFdqwT4-+!puTauP>e+6WA`sfjP@)dl#SP+<b2xR%F0Nb8{yF5@fM7vct}hXl
zv7y{hf~sGD(SUkx7}s6hwv)TXxUN;JOQZfrt!C-j^j6;})?1x5OK&w|JV4W?)i;XK
z>c@Xq9Yt_u1D_KL)`&&L`nZViYaDaGT33WM^AEe~DdKyDy3V$VR<%goQp`u+GF^{W
z^?*NG)v02>dss`fDrOm#Wzib!s<VXaGpOeSI?TzkBwGu?TWxJN$O7H3ZIaU?WlNOr
z4(+x0vasj)AzZIE3|w3DH}(EfKGw7baI<Lr<5annSO44Wqa{9dOv0Pv4cs~0zco&f
zCz|B0@<MVK5Ms|uUrRy^VjM5~5I5||;{~pfE>9OMT6s1Y(ktLVx$DwGwL;=^xMa1@
za=sgPR2{jTAKBqNW{`))pv$e=mh)yYotn7h`x)zNrnYsITC<#=$=TFsnIF}aB1D(h
z;zznHn(M$%y?I4_QsxIfeDr5BC5A;0z#^kVF1U~scgCJ3eM@zFD5f|Zev00QAszN`
z7-<7$GZELc_%WDsS2hK2?_2DhQuwnE3rCsn!-kt6H9j^kCV_;COCG7Q^13?vMSe)v
zKe+E6JG>H!@LWl_RDbDP?sxT#7x~n%9fn$PqMo^^4pq+~tLY&1h3EM`lm3b}ku=M>
zxV=FvK8D37ZcT{61Wp&XrUZG?>GSlMnX(X5_ye^Mi{GNvq+>-yV+w*W998DJuFMr(
z6>8J-`~YzuKH?gfGj#inb`D&v!f$cBa`8bTNpXCFvH=kE{UnEd83{-sZMy4<Q7p;q
zgm%Kdj6fPLM7l=N5vzo9RAun&gBfy54<ADxTJ^A<rygBKY&)8dk#K9FRw!EOXC%+f
zLhW$U**Y3#$`pJ_PX00si$V_hG6H`*FT#`IJp(F~_K3xi1U7&j;P&*O=jkzXF75`P
zn$)!`_~@=5oo<;#n!uvdLF&O3e1wB$)N>lVPfI7)px@GdM9~y33NfhSS8AJq^xP&~
z>;U(F%1)SY9gYu=<HhNLJtereYEMq9n(R~M2!s$Z*@kWZ3JeP|XP5}-AC<rG$-xNQ
z2G}c()M2<WKoOj=mG~wW{fI;g1w`Rd#V_`_8vA+{w3=hvQffE;kmoLHhoBZlP+J-^
zozmgVXG>t%hAX44Ld}DL5Qf!NUTIgU_2qU;jXOh^jyF8MZ!W^|R$e+L-ZQw;LsxIZ
za<Q}r{_YHYX1w9j9)w#3I{h69{z{~)o=?<HD?xCMbWjJZ<nQk2fL9yqz@$6XCs*=!
z8J~Py{jZh$u<ik_vg0<|3cO)JFR;BS>aQ#L@cUC~UI9w!954|3F18F4Zc)hip=EX$
zU}=d__*c)f`1yaZgnI5U{DdXsatDcJ?#C)#24pI=&{(%v_KkYwMZWi6N-$Qo5SGm$
z6fN6L*!Ni7O7yq#Oeh1GSXL2WqKRwP$LC2UWCQ90BiT~e3r<5$&=HlFr<r0A#2PE4
z(xg7~5+BuhA|j!ZQTNUY=PAxuy8To2{g?PYj+6`fl0jt#1V=?4eKnz`z(Rw>hfLCW
ztSrx2ia81}608tWS4J<TtC;i4<^DMLjfmt!E=&UEkLqOe>RE{=42=n`ZHA(zyv+A<
z<Y7S(dDXIKShOpX^{qNA27LMBCholFFVrZYvJF#0u)?g~i-w*1;!39rCeKX06VM$n
zDhl$EO`T|J=>#oq$qnOh)1{MQI>MvxoibzERNqnPeTcYrGcn3~kO4G?k=90BuB<wi
z@Zs?{3R$K_k8jh3EE093p)ukzmBvYFOcYYrJ<CTY{d;+rM4x#HLawwlAxNrz`ZMpi
z&B2TnL@%dHzpIfd-={k*EXH}<|7d{o@E(!AeYxW8D2I;c(}f^c#dT>Pz_GA{4vO~a
zUfjv?d>1{#WR`&{-9>#<W(lTPx6H{;nPMB0n#5(_5mBFqsWf9>n=#Fz-8!im@Yf}~
ziM!%a;IDz@f>2{7L_<e@KB3roFC)a;AK&-j<3w1n#<gyQ5?E1*7R_)LJ}I~8Rl~IY
z0*d>WTJ?7=OAYY0GmCo9kl)qtReY?Y6E#(~yA5(|!_qKNkU*Gwqw|$APdoEh=zfj3
z>?<IHz9j=^(kEg+K12KQzdRC<RVPJECT&OInEC-l#4mOeQH#XmcGvg4#s@mzg*tz?
z-up%mdOsXBH`7f<G`(FP`;rLh!J5&pz4~eoaanit3}HB*5Wn~mb$UU7RsoH_!+z~K
zj!(@ZF#)Gj3vfbyLI&EMwja*;OK6}2K`j|ZVYBeOiVWMLXy~L1ioX~O`hGy%Dty%%
z6+Mvm+c%@)x)O{(I03l07DaZc+h0L<E-(T5UtJ%sh77*t4u+9?lnK`mOo=ow{}9WL
zi)C;4MG0FnFmhIMkmLqNrf+6ifpZKaFUeC(Nu6!o=|vtZFb4cyX^P2yhJ}liu<P51
zu43J#&()DNn_?Xa-UHGZLfC<A5ti!t6Vk2%(yG4K`0kFqzxZhl9~R?LX(7X<cm@;L
zDb%<C6!0XULp<XD1fhd~P|%_R|6(08PBe%mZxd8UJh7fb47P7Bonm-Uc_zrOws2!c
z9H$<0`*jzUXS%djUwkc=ea(~>z|m$6M(8$dhkkbC;isq3xC#P`(Nl;|o7>YGlfq)y
z5|=JXo^ra{55PKwm4flyYd?!fE6u%hpqtM<0LD%S)5D8CB$dhG$}`5tuCRXn+WGNs
z=HiltGW<_aBXZ)W1y|7gf@L=*>#HAxGS)pq`zsnH##I1WB`CIDD39$1j;r^+&UZ*#
z2;QkJjy_hy7Qo)Z%WMU>+LOXEp!s2Feq)ZRYwD}7^8+2vQeABp9Od-+au4nm%c#B{
zSeq`6a<!o;H_LSud;fN6)K6Koc4)~WOg2_;rPjlueW)>b5<yQ4(3fP-Z4S8Al8etM
zv21coQspUAWkW=84WOIs35VAiu<J~=Htr!EaUVB%3b6+g%4KQ8kSKZlC`b2o`tjVT
zb@gY@HhIE8x7ZAympn7HE7-%SfZgQjKwZU39*UsTBv7TKqqbvUQor%%nP&0~!Nx{;
z4AvdM39Wa!de2&Z#4I~V-Ubk%&cLk%eBOn3STY%c@!Sp1m*B?wO^CrT5X|o+{F{e=
z+wk6me;qm-3?{tWQGO0wYh&<lB>n~TR%-29KKVa;viq|K9NKMgXkQv*p}TNw3mE@S
zxQ!s<^1YGZND!zyBrnuD0b-Z5e~R>FD?jt^(C>>A$d7$HN-#fmv%xWqdAgGq;Pd#7
zNJetDi6pCO+9cQ<LgpcVbFug>eDs{rTgvNY9g6z(dmzZmT%wXsM#&FGBHDFcJL?R5
zorcb|_Hrkd%2h4s9cXr>hacm#R-W!;I58tz`{YGBDDk&Eh$_eMP&pjkJL1jn(B9JX
z!_+StJL^3hPQu8&y*gEQX^+5hstLV`w36$1wr2Z_e_Z6)?r7!N9+~a;c)!819Sya1
zY;Wl>b8Np?cWj^4?AYEO4f`G2C$u=W-+Ob%b_b4n(Z6QTc1yOl6)YMX{r|?Xop~X)
za%^Yuw6U}hLf4gKRB-v@_}%66FfXlL904;2xl~5Q=xT-9Z8caQEaaq~4RMDx(wYTO
z7VmJ1lxpN)8BP!xO-e?Sly$8<>J5-lV3cpZNyGdY0vC&(ZY(^ziCDs)q>t9%uTrv(
z-sW6$rJH<EyKFj$YhdQeqfx{lC2I8NK|Pwelo=sqM@j`@jlOo|Kr61eh!yB}iyl1`
z8D-%)=e7hYA{O5Qrq%yVcbOInea<+1s&-Ni?yUq=F&boYjQCtOR-=;6HHw=%Q7R%S
zn31wB8PBeFHllk5*XR_ypjyI4GLA{J$Z3(jMG-zr7$}M}Ka`~7J)iJWT8e#0>vlik
z;HK@`MlEwscU~SIhkCB>b6(*^7Y$!dvq;&YQraA)gv3kv-jHdQ2c%4k@1Q(81v9?w
zsb2E-?Tg30GvoG>H<01>6_hQwQY^ke*-O^Z?}`oh9r@Rs{YMMW4Yhb5rq4%^lqcMW
zEBqiBca+lRN|{#j*N$r7!yLT0j0RG8x$#H9v3M9d;>wLOY<uqo_!_0fP%6q6SCmJ-
zj_=TV1kV)Bm7af6V>I}%)`M4Amn06yWw=mO8f#i^4k;ZQvfLb6I=0hWsTl7R-$()<
zgO$m(Vxt4?`81M<T0_d2AA%Vy)aM5tcsoH$wIj$hO^1!emu>L_<%!QjU))|ZB<^fm
zplnMfqzk!EET$;O@+<48zdH#yh3Bs&jz3#?sjzTWLhv`3;FEL`R*%~*@=W)6zQPNJ
z$VTf<i=qivR$#>eC?=d2h8U#Ih;gH&&B+y?sNBrqw}yqK=|sT`pkn~CFqiIJ@h_FR
zq9e`X4`?s|AKYmvsK~JHHe}s}7!Gu}=}`Vgvp7wA<Zi~(>+!k8L1`8x+oojBb(av*
z(W;Rmq{V`3PKd#U3zNjIMroo+$sA;zvw1u;X#23C%)HN8Fi5aJgH-J<lG9iW?$I2|
zi>|HMk?=vuHd*{2)T)tZrsF=!9)d@>nup4nVSGsO%>RM{=afE|<sShLq=HZ_b}nk1
zogy>bB*nl}`JWg!^B%HMYxIq6a!eCDQdN~$h)NoD4Fj+?pel<tjP;JbuE*Cl4LPVK
z)-T-9u!!<ewtQsskdw4Bwh6PqhMyKAk2N6%#+djD&jKt~dBr+3E$^hI038q_XIvKS
z8HHnV?epf@&Dj1z+nz9+aqGlpqj$V~Pslx<cvRpV6KC)3AcxG6;Not~?1@6!&1yj$
zqC@(W)B2SQLdBv{V2P52Pq2>T@l?^kLvrAZQsv<@o+u>9jFc22Ho9+&y=UIqnTR?O
zNE%LQ?Tagv6wdCEN5@1V99YFh&bCmhxs~#Z<)`{6L>(%`mv<LlRhPda3?6}Y?Snm|
z!RSzM*D+$zF~ERwE_e!;6V(*%!)ppiSU8a|TaNl83OV#br@`#_3poRYB5qPhz^&r%
z7Vf2rB(|vYe0hQ&bF5S?{OFrFTaYij2ufakIGZ?qj37v~iq_tLVWo0E=O3zr4Ic_f
zd@4R9eQW>Ga{!MzmVppph`#bw8$ooqx%4|$pjmf46pBX^77rdn4BE-j@Q2pXh0~0X
zmKnMP<GVKmVI<mxHJG8mwD%IXW~XeYC8;TdkC{=L;}K-?Oajc@X@g2Z%iL*0Sqr&|
zc#LB$<R%!D>_H5B=S{`gBMGArRh7(n+Phdk-uGFRY+2(cGevu728TOmpUh0bPnyM3
ziQ2VakcI#bX(^sVc$F&4X{B2SInbmw4&9&Wc@a3Fq}h}V6Iydc8Ke$MW`uj3FdvJh
z8mA4kvKh?X<3dt)q!2_v%)IwZ@lB1u4impuDX@(N-r_F1)H)??9#tVqGX%XtRzrtC
z1*}r(S(Do_E@b70uv6kTp)Nod<6+Q+eCQq<f-V}Aolg8tLC`b;491Os7@y!nUi<qf
z7>rJt^m>&7>bIL~((Ag(Oi?eWs#DYqRprngZK(^le1s~WO{Z1Nc7Bc2Q_%6`?78tv
z%S6^-ifAI&1+wD!<pf4S5lgN3M;g~wj0nOr#36zVI8NMfY?aM347jR@28|nr@Qdpa
z^y3Q5wq!r;HfsbOgv-P=xwsG4jccLcMJd^TbDNvk6Rrj{*SgL1RE0(RAe4B)gxNWJ
zUY__`q@x1YugK<5gr-rlw7K#~YCy7UbER<hlyRimTq~eXdQ&oL%h%v$Sc_(1m5>aA
zcogBz{95Ro739EKl)0A0Gk8+mYOY0)gJi)rH<`E3!KHkNu5GTDQv}J}Amf_m6ChDt
z9z)eM2Xu=quKY0pNo0J^KjDIo*w(|f*c7~gmmSw`q;dMY&t9Kru=v8)&_Xu*?~5VL
zU<x~6#~sn-8&?Bo%v%uV;M(8$zQTyRVB}S37P|GIPTO$lOsz#549K8iOm@zmTtsnr
zi|-kB=y^;r3%}LUh+43o@9j9qW)b(-1g4Dsf`0^0K>>b3ee(tF!w>>;t32hPh`vU#
zlF_w^QXNsqU6<<Tb9+#7J5eR=y)4eqTq&huXJfI90`+sywc5hf<u41JgQm<fAhX)J
z2afDayZBp-bq7^kDn4IGn2eLW=XddU8k;^=zud(?-W#yVZiZ4|NLBt6HKPJ1LkQgP
zXa(P|eIkIR^|@1BS-}qu8@Id#0?pZn|3w&J!qJ001iXTJ%_KyGfbIjCqyyTUQ#ds$
zScp)!eU1(_;0*C|e%8&K4@{dnb_bsnW|Uf5YW}if2Y=VgGhe&K(fGf_&`k_O>pHL*
z`2P<>KZcFkpD^@&0O$q`bxeKk&rk!aPe|MfGl57m7(uyBepZmDf~uI@=9-PPi(p{`
z!$27Di#6YX`|XL6Nco!Ee3mFWuG3Vqko+4<&Z<+gYH-s!kr8Y$1AJK_uBznO54LHJ
ztpwNE7_5G@a{^XzV^#@$`)v9YwV6*VbWJxCq%2dXXi0Q$T2&m-c<B-$9;5zfiJ(&O
z5@~i6yxPMz;1OI?n6yXVsuA3*9>-_Ji$E}vn(Qx9s=9Eg5XZ-6aOyitg)xFU4A}2k
zDx|aE(b7qIc1Qrx$L0%cE%+9N-mn@1VNTS&`9iNqH0mmd!?7Cz@D?Prr8}<_2-Cz!
z`JO0g_Dm^zR$gao@*4Fo1ww|=vPRupAPl)}3s!@ahPb^J8b?~BvU44JYptUV#4tna
zGmNpy7~D2w)OKS6)LR@vH)3(5?8&(PGequPgqPyu_Q~GCR_=YUD<kJ1!56**C5Yu)
zgb9$`>zzn!&KqUzd6S%fp`3fxQ+>X0y=PHxmEsLtu{0Yu8QJ?-hp}=)+cxnI`n;ZH
zOdG0{kPKlZMjmj}GKO;M*AC&_sB6Th7lgvL5M0aOeTydh!Yj~2XF+#^eTcK*R)gIP
za_BDE1_218H^^fNaCtMWbJwU>okHXg0I0=864$Nuxs+xBRdf*Cr?-W>I<8O{#D6@P
zH9bImxlnkpKZd~u@cVmz2GLt+Z~fBKYWOl?nqxY4*FZ;sJZQpmFW5J!(rS7abFdmL
z1D2NeVZEy;X=oKCDuS{s^Jhuf{sy3>=c84iy*C`!ybr!H^<_#83#4|$_*v%s;hcJY
znJ~DG8RbBiFf{Ddg65UHs2N`$bqRyoWPQyg3<)L>yQ&6Z%?t;nb%Y*D#l>^jx1o*0
zTnDa9lSii$co4|$MK*1DK44rGioQkj46sF5odmY<8irHrDOD^Qf@z9B?i@WCZx9H#
zpx1Jzxl~}Uy_fZQ6u?#+z`_>@w;Yx0>AUZsRQZ;bGFI68Ne8U2-DFBAl!|n2J>_!k
z6{cXbA32XoT(l3gZoEnUILcqWp7Qv)4=KM+$KpJW7VuG!A~m&xFx0UFr<5Rja(=y>
zb3zdwv|a~l60SB5U>|bbMGsOE1n4~mtT=h(eAFuCoIvAI*0P&4J{gce<CINra@q_u
z$aIqDQOyj^5y9f&lsb_yCTWl8LKh64arjZp8}p*ArE7^xdPHyE7hV^ocI_xEiQdF0
znynwMq(ea1&1{y$qCJ>>sTwo1Dq8)xqtMM*5v9623h@pNwN#sbM5ym>=r!)M&8OQz
zbKUKS112ZXn86;VWE?4P3gqJ{Uw-{IT5q}T3C2+%x+mn3i!lz|8codE5nKjhejXf}
zxd>xFev`59L|Kd-Wkmnrm5ib()^-0Fua<-eeI2QP1MG;OWPF>p7<{6fvr#tJ%K0DU
zx`hb@UmF?(a3igI|I~nOIx45{I$#N|#mE0F@XGmh@yESm>Ei3p(IJEFc0Wb9y_tA>
zqh0w$;1T8gQm=5cI&jNdeqD9D$*0vBorK=^o6zxc7^)krF?iB~2eNgKFt284@1Y~7
zpYmw>UJrO`b1`|%m+SiP_H*TLq`2(%5A@Ci*edlvCt*l9<~ERk(b<8lSgh*s8otMn
z(~a9gyMSK&(H;7Es0^E+K$qURhF^Dy2_L9wcZq<fDAiabBs%6{2IUD6V(0|usfLQN
zC3WbR_B<qDh->VnxFT09s6fb5pn(J%`SB*HAX0*vd|HZBFK+E6Zwq5zu!9lhmpeTV
zm`g#$d!@`c+bwUcq#3G^(gxYHy>Zs08#WJ!Xi{37SOi-!==S2)Q`uHUVyySxP=Hk>
z7GZZo{z2<ko>s3G3DLBxVN2`y)*9BD{a)`->%1FE(v|nv)QAVcrnZV2^5>4WmfSq=
z2gtjgGQp@l4{EtPV3Ge#afQ2t_9*(#uXk~)uNMo$g*$xNCiSagVW7~*on}&-iiH8)
z%8|>rC`RA1C_e7&1UMR~2_?cE@#*d~@X(M5&O&QIRVq7a15+~7fqFBvD$sNC<;Wb0
za;4B0rmL@)2)7PL`Dz0v_t^vi+9Vf1xfnGe$qoA&P#o)TB2grzL_kFrZA=tb_IruI
zb9dA;`U{lG4js*!Do7Wf+k@T7+Yw3I{7JduuNBIQ2J{J4yV2mVQX!$M09qh1MVUJ-
zl{#!6r9N3I^t*Fqu50Ny+-wiM%<oc(6JL;lKqHqtk6$MO&=qw<N1RD`XphDardBCP
zSKTP=IKPH;rTfLzyCI{k*hHlu;isjCy$V8{HW^geAic5$zwWe|_(dLK4-}TuU9t+#
zOy*=t0A2m)W-4FCLS|arY17d%?z$s;J01D)3W|E|_iM!A^3;*XB_T?j?@qJPCpd#>
zuMGP`eN_@h8VfF{brLSWO)sZfB!D7nxe&!oR>$H`7pn}3IBgzWPjIuu3MX=?3ziFU
zj`_Z=MXaV&oteQb(ovT_i!_DveK>$=BArJz<bCB8f;+Wqfy)FsbulfSvk!ohTh5-`
z(r4*1BJQ218*v3!LAp`ygRa|$v@YIRFYci7>;xx7EG`DIm(wQ81r{$*WTu`>D_|ad
zD45k!|Mnf23P!M`g2gkWw51j;9(rVUfCAk<dP{}-;9_&g;3KvlrQDHhn2UXjmTK(+
zd2No43^xs)h*o9f>=0Pm6<;DHUs{CE;Q0kl%}e59nu%*(7GhBb2#@Cz{IKhsK@0~e
zpZ$h2beT~yECIleaV0nX&I7>e?avGST5&Ibix6(_7?l@fwSv~t6|pBGgkJsQVnC^Q
z+$@g0okfH+*Aw2l%{%nBij^O#J$ncvVpEV&nG~Yr?{J$}5h|cSDr$l-!w@552dkvQ
zsV?Xt44Op9rkIc5ZnpCb%ji&$4h@}4LOJ_0GLMrYY8o3|OLa4EQeE9w<JEum5E4c-
zSGfFKbA_`}A*3r;B5&^pD-v9d8*CklRYRjo?<vfTZ8M_N=rp=pvF-pQqYQ{e4Kz}H
zU8s9|3KPhqs7o(lL@MQ|HaGH8My--j3RMtglrpLy#<dht%sVXF*hYV6>^<}jaMpJr
z=uroXdkM+^Bk-Q?C5#!^JUr*G&BL1x^w4V!wLamWw26^Isu9lMD<g#-cd~V#@rK*H
zu64IoS+q0%YOZ7_Q5y!Emaa8K3Q66<E{Fv|8=<<j^^|b>P_Wyz*HnB+jq5Gk8WPsZ
zeqEi@TNpfW@WR8gJ>>I300M3p<<ws6Rrp>EmCjAGP^|2Q*uekzQQh2I=o%arxM)xv
z?SUnq{Z{oE4<8*8_8RdqH8?C!_p0xB_{oFApqZ*t%#HRO$-DvAIRn)ClpUc4Fhlso
zpN*DkHS!GKL%^|Zl$vw~q5d#cbI-sj2wzs8;bU&4tBx&N&RI5Yacjnoq8eKyDTl^J
z<%L<-p?7pc^7m)>o_ZzM&cK7{A0D-bmye810C2V2x<OlPuG_u^dCTuayVkRKvd&@^
zKLYL(BECBNc}PWRWB*X4=Y{9^!(F(tu8NSzJ5ruQ4FkJ?*Qm6{(Q_|6^Gjodq$}ct
zE7D~v%Me5v&Re4>!<EjkvxMoIwF%0Tso7dzG>`XC{p$&Q4V-+QjggZeXCOda)>)U&
zXM0SUz$po1KF2O+NU9bmRJ)oS?Zol*#m5)ls|dYFVefd_3=?f!Bd*zQfpZM*d*99$
zsl8sY<M#I>O2!FB&S5HPW%9Afm4AY>^@1W$njlDhT~#r9{L`#PpZ%<s8H&DTG~m8_
z$=oRGX?GzFnhqATJVt%y@4_vyH<yfXZ?yIh$U7)*=`u{KSTyDpQ3&G(tKp*Xw&T4{
zs5`3x(gZ}AQtx6WQ`8mv6k!Q&9D*&JxC&R-+i%HrC62N~-Pa)7BfN3=8FjZkQaV?j
z0L~KpBq55{jd0x_K~>B~=<fzF$4f>TCP)P)IViR%sb;}#sMTjb!mhF&jD}rR>flfz
z!2vlJ&mmM61q)2x_xx2V=94YqldaRymeo{Bn6?%Zgc4+7PaB;fa2K`o$Z72tOmp+(
zC1Tn5Zv+@0k|$bcV!CHQZ`{h5;s6W>Sk!*|9ezs+1Q<Mv+KFhE;v0rpi{th@qc-CQ
z|H7tQ0iMGr&rA668!<GOvS&l^K#+X%1zejg<($S_P__92r)2D46-j1IkCUHKMHxfq
zD)t5vP<BY>Blw$9E7|KI?vRNC+B|*A-zKvm7~l_#pRGmqrL7vBL`?k9=9u`b<1In)
zTU1r*n=6GLUD~khP-52BzPx;GZ}sPu!o34t!BDW*UNR$wJd_eWp^=B<#Z$r!tpBVR
zg$e56-a-!{6b01A-a<Du*UNV`S`Mj8y!?!AS8y#WSOn)6i&2lE9A+|xokL$$H820N
zaq$mo{#m|;U-iTIvh-j0$vmGJ{)ehI^1~TjDBIhJOGb=guc<$s<42kzK(Vx;L7dwE
zJfGhGp<@gX=##zSlKBMdWatf@TXCKr)Hjhhx8ihUps<!waVVZ-v(sHn9ZG&x{l|Ge
zejsDd%ud<7$!#v8)v519kQy-yv=Gg8+1kNxaRV9OJqKX(*&95GR8bZd;t46M4%f*e
zr?r7J$eO@JD{nSFp?64^>~;F5ul%1zQ7L<!AF-*VK%;x2J*U2Pf$wHwZ=vltb=L)c
zAgMtDqLq5?0$i`>98xF!#t-TRA%L#m&^A|-mAAdK?y-7aJ89&~R{X{XbH;!6R$u*{
zFX>>x{+=s(+s%nlV=uyW)kGIo^6~ttNKW-$<nL}@3NUHc_o#7~`2KAgoPCL(#z+1<
zUfptuf0<9j!^9>&tvwrQnXgQ3;x7x19q*#_omZhdB0^}brPqyD@Cq)>|N1Ikn-#MG
zVl`;_vymFI7-mWtr=f2JoSi=2mLO*|id(1j7PmfSlAnoyp@niUSDJN3vY!xFRm1Y-
zIxoI#J_`*`>eq?ih^k|c=>mwW`E<3R0~j$zF2$``XG`mp)RguR*JY5(#V|y+^igc0
zQJE~7TyCK>%PZNB$Z>QglTlBr(|p$3Th3rw)-|Ax=tUV<JvNe)&fS%NMmq5H+9IFr
z5jpFGxb<rsT-%>ThKpt|SM3-ZiMxYJP^8T0y23B0b6sg?+wZ!9TahS{_*+nDoS)x9
zN|Yk9b#h)FE*2YEVkYOhJOZK!UR;-F*<bchR9QLWgdC=9`E@)Idp@hq_k)~qgn0-<
zDo@qx9ElR~K0wE@u=7f1^4+s+6DB}2{JXasPS_BO=5Ew$OF*5r5tRN5aK&Bhvk&3E
zmMUW}i_12kJRrkeFEdIRXQenPoea)91Fsn(L3aIz%V)Ipbm7*d;(wr1&bx;LthJxh
zDi+O$y@=w|ZTTY3={P^!d2zVuD7FXZ`C#s{v?q4IxQv7@s{WkwN(ad#%@m}1G-N(2
z7H!7f;2|?wSOl!cGgB?Sh6e_f7is6nI7_Y~IIf~9((YlMlQT|NbL~C7>3hxzn$wWA
zb%0Q{BPEh!R-$}H9ej+;4c>?S6?h1gEfo-k1bMzAS;O2|of64=_Tw2H-W>}UBog0{
z&YeSVEy5?kK&aAC+{Pp=HhJD-WsZ0|$mV))JEmfiv(6^fJ-tBAsB`RslGVV6tkuvP
zbRfUME6VwlIUkwnMnr>jF!u6-X>v{@cS+7VEsc^U3GyUZk%f*A#?PeA(nK6WLPynk
zBHlZX<4QY73&Nyv5zOELPEzQiwdfTrs~MM2S*10Vp7+!9W$SbYy^O&No45EwRvRS@
zZ<R2Y5_%(HCCR`N{tZR1=s6l7re_-b1pIv)|31b)dZrUwii_{YKRWk2?tiYu-=p}a
zFJp_OmU6;9z0bp%340K*eN}~bg7a#-r^h88vnTV(N=4&%^<SLO)A;#?vJOU}yOH1Y
z+xW5=L0HD|wZDy5-)kq_KRAZEn0g+)y995CbJ7)S0;PO{6rEu@Z~cwPYxH?_SdcJ>
zJFl(?5+-o3s7Hf@v3EVh?carw7-IL?M#5La)@xI+>k0=|{HWpf0r3^i{0kr%6+{la
z-En1*xOEbjFx+`=xT#W|++G+M{-!mITKfvji&dbfJ$O=;_QENC@}=?WQzpUEo;6?c
zt6F0chBz3r6(?tfg3ACM$D;AkxltRw3+578VDbDXvtrRl=pfFu=^U7@t~JRfx~|z=
z1KCDShlM8&w6WndfGKR@`Ppj6Hi8`^=>R;;7Z~AEm0$0W_Qzfjm;H@u%&3F@F$s=F
zapJgR(A7%zDx60SKFg+qwkXgNa~1ck>!2ZtwzC>33vHZ`(%}JlM6#G{w{Rz8znAjs
zu_f78dqdue1Dum_5^b`F;i_}=Ut$XOfakU|QLs6>_%|<NDZegb=X0zaF$yruLk%#u
z!nsDJw9gM7>73Q@B2D1GfQEjRVxWi|&Ps4FJ_8DY6$$JRaRjf{5OxB>IM!6xeZfbM
z7fa0zeqFG~1yD$pqYc<{7WSz01jUTO7a*y@xwj(3S(?#MYCh$C2sVkFVd20^53CEw
z2*IE}dy(%I;=R4ngAtve?Mv;o6W$U~reJd9P)rPFh|NtMSTiZBmNpA>s~O5&iM5Uc
z{!swnWtt%#dx)G<Pc)F&C>-b0{G3z-lQ{0=v}_BcSM4s?++w7p*2eT@RdMw+J6ZK|
zRt+%>8IC$>Vu&=(Wb4R%AA3^DKVg5}8|<GLJB&YZF_PIt6VZAee*f&>&cmN)5iE;;
zV)SWA1irK|&?C-<z`ydpn;uMbIUP3p>>=8RmFl^jxSey``?&mJ<so(d`|x`@p=<Yg
zxSD+SX#EV++u1#VKy0XPFL-kp$%Zi-#2l|h&M_$&HQ0qA*i()vxXRWS-k{gf$rpYa
zPorsTwBO;!JeGZ%bOl#vEyg^9TLmS>RGEo?Hpq^EMTD!$q6<)FZ~!R+>@FtZDh}66
zAQ$4+j<P*e+UNYC;^MbrVKLe*4G9vrW(wCUOEckIgXcA2>&=G5V^Yo*(WUPY4KQ&f
zT0=KKyjpnO0M>UK{eY#HzJ;Tp1!ue0d=65bnRjrudt`G3u>fDANKzwQ4^Wo+{;fsp
zf_$Vv%dY`jFc0Z;kYKO#MpmZ@cy6dR7}3_;4e*GBy%{#G3fW!-h5&=MXj%H8Jz@9)
z4@KwYcA^VQi*@6?MRRP0cFW%fs?NSi&Zt5SNyns&O=9tB%4x5Wu8`6|>!8<#bL$%1
z(}5n>N;w;nfaf2GMV%OFW0Rs}e4u1)unKRJz4hr|2!J4^r39g*bBp5TjL=drOaiw_
z*v{b;&EOpX@qa%^kXV+#SGL!dPULf?XSq_Nv_SC8#y-BuxSd9a9MVLg)aaRrG{C0(
z2oiw^wHwqoE(m=b+NapaVUb0+V?B*;+HRHr0e(KcZNZx#Z(#MJWNotkhGfNDW6=hp
zmxLF!P-(P?kH8S~2CEa9tPxCx9OuQEQGhD>?Az!#s@a@Cb$`g;O&0y5dCZZ$D?3n}
zgLhcnuq0b_amC{Hvia<%f;SlPb8t|IuQ-?}?L)>!58?(;Xjafe)8A=awS+x>%LBh+
zrP_QN6W5^FE5HMz<Iw0KkHIn}TO08qt?H0=xGd?jk5uU++&hVzG}KQ%;vX}fjZ%Am
z%nvs<MyVMe^Y_x<zkSR<;#e6&{637(qi|v}Y#rWQ)uAqT6W)HpKj@eq!rzDR_sJu<
z;vcu_`Jcr1KlUK4_k33V*Kq&eTm66O+jqI*BlY+f?qqqMMA{=~k$&qY_I|Po&yHIw
z`cVgtpMcPT%ujxaXO>B?=wv%R^RL(NUBmZw6|C^_Gw47K{xwoso!*H~dYNB;L)xu+
zqmNL>JL%saK^;%}+k2=2?VQXNRc<r?B?4HvH}m}m(M%jmx-6D_4jv9{MG>%9>-|rl
zKV1|w9dC%eW}5sqyUOQw&5e}-XG>bp*144RC?$Mr4a2hqwyw`XU_mW5`jm!G&_q4D
z1>u26;W>!t;i5?O#Vvf;(0IIH&ueIxij)41+RO{I9AR>G7Ak~fe6w0`)4U}wSiAee
zHTB>YKFSd$KtBP^snI$T>MpR4c;>7ZbS<iH3Y5$tF&uvURwscy5|x=qvytc=W3c6t
zf+H<bo)nTNSh0`|;JC5lXug9es9$_YmcJ9|W<vWEzm5ZnC0~~2Kn_xK5K{q$^Snm(
zcDkF$7kHvu3A35A#yb5C4Vd)-vs?MnJ#Qf0um8|%WEI+{U}0bh2H_tRAz9m`%cKCo
z*(@nVa+tPb8@{DIM6MJWSOBMWjR+VOS_>qDW3iA1M4N;bpzqgj1~k|E^&g~0vJiBN
zD!`OuQMS4na4J*o=t_`eHKh#K%8UzBKVEN)qnIS8)*C-C-nmeHVS_P}-ap)69AMo3
zfjY8`AHjvGkCgFKnA3A?Q{i>y(s#7kQ&{cvDT1D%%*0RmFR6~sTVP9u_aR&O!Nzai
zS7%^Kg$T0Of4vr0ExoROR?GLzc{*Q7{vD$*6#8)F;CQ+K%E1a-jNGZ_v>84V;Y0DM
zvVoUFmdny0JWCl3OsIyQNFmnnw32a_(Lo&JEQL&sZO@f|7FN_$gF5OfzJHGp96M_n
z-w|gB4dHKA_C6Z#>e}sy)wS-B`uTSLR$LQzYC9i|Kd^f4k3R#;`O(AXqpW{_)#jZ9
zf$!Mbyq~#2#8B^T!)ahImh<6cGSp(pB9}zrYl_zh#*sR-yPUtfU(3iwlUoADrdXQX
zg>#S-`;K9I<Bw{;&-o;NSc5^G{W%{wpiPyo>pokzMqj32zfr-n?sLAITGCnQYTR^4
zeZ8~bB6GWzzUb;8*jD-v&DBv|1f?6Y;L>DY_-~B0uy>c-%#!N+E<yw-#-%R8K;uWh
zt5IErJB$O4sx!L^(QWKdin<EJ`=Ac&+1QcbvuUplghXpr($sYorru8NG@sVr*cB?j
z#c<=nznT>$#1CY4IWNL89Gkbd4<>`y)EkX*3XiEDh6w}OsA|3sgEh?$LqO&HmYdB3
z?-MTc>x2%qGUm((7lwr`xLM{E;lglZ#UXWPxG=gmrjDtYo_USXiOl%B`lT^#!_l&c
zZo)XuxZs>RtGn=0;@NkAJLs#yY0GG<iUTnlH7cjx-doA2FK<FNDThobD6h70k2(Oy
zVeK~|S?jY#of9Fn)j;k1kngG1uN1nf$9Ld1n~*ous$5~1vD4qw_%Ha!IL!PPh&ovI
zni^{rh8nlOq0X=hiRu?S`N0k{*CqZme<NdsS`?rlo!J<U%wg?yle0qP1yR1I1dDG$
zq%WHY3ACX%8ld7@I*{2od9lF82n!EeLUR=3auW?DZ8a%oY_~vLu~;ate?5=xtVK-%
zKI%ChK8UGok5@9xZdQlk0Ubj1F2vbukAh}cx3<lO@9`Ba{rBg`$z20BNwB*w&++P(
zr)u>op{H808(|zU;eo}V2JhkH+aL=}PrIr!_aNZ$xR^iG{5^bf7(<YTW}F2WU}*K%
z1AGsM;c%)!I?!Tjr4)oTi?uSmPiB+Uzq%4;D34+MkC2Ho9EtLw_&iZc(o&sFaOr_5
zCs06piuw1|fj5MlR0}khp+U8uU}98*3t=H_{anw&^f^dQxrVxY1O52i(l;vVhEosz
zgP=y-HA!0P>if9C4y<dIX6w}GGvSyb)1)C3nZbq45e{Flx3Jyg?;uIr@U23Mh^`S+
zhOW_m0ok{nb*SM#7-HXqHsJ=x8%(lYRdfYA8CUzIUI>e<UZ^bV=oH0b(x&!9^ik|{
zG$IlVbM}aRQ(7Nnbe?kE7bs5$8(gb*QZ%Ok3bs&;c(lDEy{DVBCs7q7eC^#pm908Z
zALu~6zXOM&*$IL=b~oQ`C{Cb!bOLpv(U&gRyWB`mni*q4L)9{q3-7-Lp3XM`MgSIc
zx}ZM3m+v(^6sW`y36@jX-C%XUo*rCD2HQmVzGD#M$!cq?iRQ?l9vlH(OB+(!Z0YW*
ziqJK^6wQf=tB{xi!)hR<2jKemC^oECD~DDcx(&17XG}n9vbTi6>Km;V3x?Nb%jw*v
zeOl4#n*)UI+<dicfYAG{snUhYABDoJY&)OEw)4(7=&NiXwX%QjZcxniP`M}>r}e#i
zn)VXdNHuhz&^va?ewro?oQu!isQndhdJma~DMIF?1MzzyL)#Xpl_gxSyT?2|U5O-q
z3_%E4lUe>IGtndzxhMQhlDRRM2PH!bG<o4?H2LIap=XadZ-Lf+yN}vEi!($kd*6q5
zHEO!h4R`I`IbDddPSGPw%|!hdK_%}Ml(36R*i`O(^SH7gu(Tc*q*4nSVLZuc&K7~W
z@}FTwvZ<m0Cb4D%!yQ76o{TkiH%1*+wKw_xT_$23LQ<ju!ui5LYzF)tyNBL^^m1Y!
z;95pbk80{VKB*UZJ9;~84@T~7WNsjtHz{<Av&Q+Zx@H~DlWUYLaFp8=^ETK~=;u7^
z6!RLlnY7=Kucm4PUSRT-dVC!}@wPTo9l-k|Ei^H|4lt{?b!hYj+uK37L=2M|Z}Gi5
z+yM#H^DU&;m8$bCoR0s9C;;l(w|MNaku4i?pd$5qI9UjrYBBZ?*5gz@1!G^&59@*5
z*42a%xuxivGyg|}So~K!5eSBFU_9E?4g6iqA?&1|Eo1zmEG&~s$@oQD6M<hC6SOm+
zs$6k?O%_=b;9pJrxA8T>b@tA0nOGw*j;%!26z`BvIOY@=9)fhS_yZ)uHxfeK6MMH2
zgmiz%qpZU9R5n-b_%`2@x{7Z{%}2yyQfn%m!jR%_7kXN~`)xjY3S|_Jc8b*hwxf?e
ze8g`js>B{aR$cKG$ir$bX-CZ`8*LDp0u;f2kfUV$s6G6XLEZE=A3lB{1TKZ;1(6*J
zO7E@Mo~QzuSM0^cI(HRgUWupFz5oV^9b5FME3+(6Xl*x~R!#5lle?p}oApn9{2e}l
zi&EFUgRrfZ!)nbt{4<IF0VkkHbKOOTkqd4-9ew6qK0a(*#7*XZ=es<!gbr|s>V<dt
z{>C|n)rgI}jjsppys(i^;1|cFs?{6$CvNUWQXAlFr@V*5(`6L~b=`Xix9r4avanfx
z*9)^6rkA!xEC+;c+hb6Fd5<3*wmZC~L(Ns({XU-_{pv2Z_ef8hh{)0P<9gA8-Tt#X
zb>MdXA%~Ly{$N$B^E{%djH+4_arEa4Z(_W)t*><~UP&9m-nXy3H5KPZHBzU@25>mO
zQ!JtRji_?oVqf@Tz<V2)VsPf{HnkiX>h%*%RG+Ry;M)0z)zV6xr)g$#sw(+g+b}u5
zRq~7aFX)ObAio~mHg<K!62NL$8~QJ{>h+C5{b~>2!|22++{5>VC=@l=*iDVB;%|v;
zxoq9E0wTM9*ZOx@I<zPuKXnZji`N3-=+*HDM2LRsk}5tbDjMhJ{w1oruID#Ec#@q_
zz)dC?eO|>!8;7K--&gV7(c;A_2%M+Y0bjCZKJiPwcW*PMNjC4mjtFmglU;;*(a)u5
zd1uw4FZr<|uvj{ZScp`s_N`Mr@+JQ<|4h9>Eve?`&;1Ry!*Ks2uag~CCf8NaiiZ9P
zzxcC({#2VcLh-agv2S7KKWKuHUQ#^0Q^-IBz0*+Gx-|2nEPA4@9>$>WcOxcv)*1Cx
zH~)ok<zaPZ4Ig8SyP_7<KpM{WsB3CK0|z4L4{<c9WSjA2h}Iq=jr!hBuD5aBVYR7-
zkBVFcFH_<~h#~Jx!-amHA+J`hsR?@#IrKSAeRMCPBW}XP@8#3m%=7WR{0P2Fr$5wA
z`(Te$aac{<$4_d*|E}1_&(<ZN028TR-p9xD=R5wP4%^SS6{KeG=TnL405{k|`P+IH
z0atM{K?<6VRwpn6R%W__#?NWsJN%A@D&{7rE}Ue8pqs420Z0cv6Mm}AzXAA-WC&y?
z76Cp;^p$`g^7+yL^v4#cUwwsf)d5yt@q;3VB68NvVKw!iYVrYoF!xXO(E|Wg13-0v
zAJqmB2M+KLwSnDTU-QGew;^$i{ba|?s<<Cl{Pqj}LtXpz4KO<JHUA*w<>7VwvprB6
z(>AbKEehq4dkQn?udIXSBU(L<T-0c@E!zA8h=<;ISY3ROALJNxM=G6~l51oQluS_S
z{P8j%x+qdt>PYrl1*&6nUA6fjSjU=jAHG7dR*^#LGeP@fH&d+188zB@ti)3DkBa$6
z=-7Dd2G*7SO!fXuSv3m8lFM2XI0j%CLEC}6?I~~6`za8Z+G`)`d7%uibLJn!+4ngt
zn~mHiJe|f9l;amuDBMaFy)>)qnlZpb2aymHX(;WiT~KqYp&U`{M@r50$^=uj`Iv$A
z5$!j3^LD-IK#$_y9!EX$PSvZE@@rjg6U;`t-?Y-^8vPZ{0C0Y&^lKe!QD<)&<$MN_
zc3O@8McnEzA0u%}+I{hmX&;;$ZS74pp5APrM`)n-r7eT>J}YjW36tR{=>BeL(}~JW
z90Fw)L#@ipr^KyS?XxH!XB|1e6$D7XxEy)#$(Qhj=>vRnBz&=n{s!i|r~;5KB1y=z
zhI0N{3F>j`H3W2xEhX)@ks>it$swm-u#X%m`j0@M2sEa*HBB3;0~)%-Ne-M+-hPu-
zfN|u2K`Nela>64KA+TQq0U<bPF<kS}s4n996_V4muXO0rSnNl2I1FnIFK=ZtYx455
zZ}#Zfrf$FdXNblyzf|*&@MeB;VygP(5lHK{<kYe=NBHU>^}Uyc(3dOz8q{Okbm*!z
z=j-7ATA!2}j;LQB=ZE%P@ebS7<B#t&z{TPc0X7s{b104?eBpzl)t)E#p+xPlgdZ5q
znXqTLx?mk)yHQrJ`_<=z-SB*-K9O<0RdcCcEG$74pjL2*cAMALvLlTRD1imF3BTaM
zaYnik_M`0nG4lsNC4<+jp8!Guq-0Ssi(ZU$Tgb0|d4dlOq5M)7nfBu9(o-j3MppW`
zdhrA<H%Kp4`+vtDpuZQs;~%)U2pmm$9Lid^5N|W)T^gbwcEqLZtI2a8qp+?-3tBk7
z1kAD{vGus}8w|E)fwq|+U;8~jwhJ&)VHla9FocBRaO3xUj3eyg?ohG#5L&yqJ4$3%
zLBl)14f{(L>rf9Y=A&4J;<70iEDKa9_I09wL26<lyb#2%iGsK9qg=5ykJYe1W1g;$
zA4A|cJz9HgJ+@nl8uv}JiWxkr^!&)q^Kbx{D;14=0)G*bU#eDPKILQl0n(mt_k=p-
zQ$Cz~QhoGOe!QA@k`GnOKjnuzSayf+>91jWyR#5|aqYgY6ot=6EwQ@QaCX32*gFmp
z%dQ}leMfxs+=ic)ActrG?=b#^pop4wbwEwZmUgTf_oYLXXZp^-sz9{0(@zqXgcep6
zA;;_od1yS;<-7UbJ&xSeOOH4v2zI?Yv=ZqiG{AGak6U#%VB3gNUu)nK$d%Rmou5=|
z=XM*^?;H3LDUH~3|F>J}@kawY>O+sI8K?Nz$S8D8+TWtrYF29bJJ)@d4`bQYO6nx{
zkS1G5qYo@9J|WCf$M_1V+VvAx`IFFiee#_q1PjIoD3-QsKyC@U)(<{RKZNmmai#f3
zJRX)RmDD>;JJt3-@cm}iAP62;hd4HMh6VAD?M^`yy;wJQ&~+HrQLu1ZUBT7pA7P83
zzgN<?i<ge~xEKtb+z;7#oJF=D$@Ya)5E9r@>A^kJ!XLnawfj<i{RckU(WMf7`G(A<
zvg$oNO|Z_4oed>^ECzzBpMxh3`*fr0>>N5#!if*OgJy>0nXFMzrOxmj25Hg{k;t%(
zG?o=12*H&Cb>Bw8ew&}#>-mV(lUG1C!j3sowNtwY`X)-fhsvgfdHzm-N{tEe)A5#K
zgOCAIY+9s#WRx1y5f9y}@t1?tmKqa^QW5$g5w6ol&P+Nw!ad$dPe9nMP~@5%GZb%$
zc*Di-j+kURKeC`JsoKnzo>ZU*h?bS?r`!0P(tMJHj)}!@A_GQt2a#~2wcgogpAw6m
zR2~*D=e0d}V&=CC<jhFq_E5>@F*qog7#jp~BT8!Ie>)a-a+~t+MugK!HW+ORYtn`Z
zk!k{*)xQ~x11Dm~aZWlpCIwo7O417K#lH$n7;Q^a{G3*$cPmL@O!Jf|KO-QLsXQ)9
zI*e>vXy{OnvvW4+g9b=BXFug=HeV$e<ea@Y9;`xNy3#>=ZwC%q_pn`>Axlw-19?2m
z7-l@N1k5jEVSv9oM)fc|>9I87_mHtP{&rTfcF;i~ZQ%`MCOwv-t}!#|dqSnlc+T2^
zqd}aCQF1L-90&qCB^-?Q(X%3A?_Ae8`(VidMe|wei#=RsJ@|}<)7*nfsm4{6$W&Al
zGQHuOxaQ3nn}=aSCfwn7ZQ>Au*?u7~(!o@ZA0t}oAtuO9)_UJ+?|cqFwkp!%Vl0mF
zG_pzlk#&We)D2@B-#oTSgv$SJWK&To!TbTNV5nyUXlt+6=fyMi-=v$K@~?39*?-~)
zFz$%D=AZoCo#Co&7@Ks!eoo3dA?4J2D%GF=$qyb7)?S{~UXZTuGH@Ih`%UmS<?P|x
z;BTX^Tsm}Vw-f)_?^EymiSNsOq|W#WN7wzm@vwHo5zk0e6<_f=DmHk2z>jnZ1})P0
z*xj~JC9-||UT1PggYEvYN&D=-!;&`XyjVm=HPYc~;Z8$Z(gm^PI9_#T3pP|hw4T|z
zd_S47C}L42s+QcIGGq$~{$@iDX8h+_k3^J0#ayLS2Uf-Tq8j=$-_tP{YQpjn_-b8+
zC#&`xXo2?qTE-Z8h{i+3dc}vXi$yr-LU&+V_97)$6d$s6WTalo-zJeNaR*e1u!AA<
zoj-v3U^`s-AAn(nunkkMO@VPdM=?&&7j{GxLZ@iuQOKcP$x-+J%ul-|<~DFA`}7LD
z3F=UdkC^lYUcKG?R@^u~!LCPe)ZRwA*ip{dBxh~$?}Xkpx*aey-$cRv0K+a2&<U;4
z_#tiNyaO6PNSA<{xgOrb4`}NJfc+c0_SN1(BzJ@fXTvvUGU3c3C}iFyWgXG3fG31I
z8Iif{C@G)VH3K9kxA}v(Rq7LcgeV8&<IGzW^9OD-GnKVypFhD^NYcaTGmhhxn=#ei
zB_s!))8oiw&%5UHK8gew;br^cd{aWPfq3tO6&Hu5(V*_2w26QO9S44Kwp_d|;eDI{
z3B_~%i`2nYQbvtpu0n4?Aee}KLe~QOyGLa$TJI;+v3-Tx+5oJeuW-8%Mebvt^%bIx
zAHGml-&aWF5`JUS{0^Prt)WH{%=8K~Re(kRk%|i`XtshWoJm4N?LFtIsnJ4od*;G0
z?iF=jG|n$Sd_jFZTIkoU0o7^mL(&0%Mdl*(`oJq?hoj-yX{?#9{@zcx-`Ht~I;Fo5
z({0^2VDC?;)mk$iPj#r?+B8m;`wNl1KQbdFmcB(zz*9eZx{kEGLE63@YE^&X!<dGC
z;9p*<a9zGCzEoLwWmCW3ed0?{5C7V(5npn}+;)ck>gpI_?#z0u5Jbe4j+UnL(y>ZU
zsOyv{Zj~sx6c&+432B|uj#5mmQ-Y*pt{=rpkI<61{J-j-E1PmFJbx$MpeD?Im-gm>
zns8H=UriX*psNWfLF(jxqYdh<Yf<#2fp`{m%s^q>z&7%ew*eL>be7u8=r;zI#m0fc
z2<}K({XpSXu8Z~|;B<rt!XRb@_QH#*7%RlI!GgPE;mI9;aT}ZG5W2x`L82_g#9x$W
z!ai{FsOwTqOk?so_TAnm{-Sf~s6T$Ohl^WnqkI_pCa&^SsOzUOl|OX|K7hU7b(vo<
z#Cg{*c39Hi&q>Fery8A?H{t9wfiu<Ed(Z`Wu9wgj;>dem#$U36zte%K1g|9><?6gq
zu4-darD#6TdW%XiBvncW#G+e}QQX=`$>fTTKXcZ3wPC?Q=ha{A2+AuK!HybU+*G#c
zXFNI!xHrY;j^fEx%}eLJJN0@~&&BVBBirgqnC)L}T(B|zI0`sc@8OPl*P>4@_aD+T
zxGrOyQ4X&BF$fG6Oju14E{BP|oPwOozCnd}H6cW4Na2qa;DCcK1RtyXv4gUiEN=^c
z1aUW1o{GTD82=I~wJwD};oT5iO}Si4V@y1SXM_<~J4*~9Bzde*Fwc??QLh{s1NJ6V
zhUq*)W$i}R0wKxe7F^YT#5PGwOfarowgvgP%h^+>z>`CWsZK#SN|eGWFb}7*#s$48
zo_SODRExF(S_m+++$9tYFi+A^tYch`frzKDY96u?Lpe`PIbf)}#N@340Ho=N%72Bj
zShSAFKyHGl25rHZd$Au9o@>}`(QZq9c>?3<BDHTIkAe>aQ%cePL*Na%1VM_iRj`Ud
zN2uy-Z4<Hus-7eSQKmt@SFQ@(9jBXIXH#$%50FzQ)3y*-El^&-CQLeb=@>vCF@Ff^
zi^4<<LdG~SoKcvn7|q%a)h<P({-#UyPlcmE0x~B`K~km=fPtJtw?)CSVOnn#0g8|B
zQ*_7{1kNeQ8&*`|u#Ivq>1(ica4v}kB~J&!Eq^%Lxg^S9>&Olsi%uhBaM5YoZEPRA
zh={pB2ir(_n&5quii*WuQHV;2#lh?;+F<+Ka~%^0tNgyo<Y3-k$iCmXB+_8RTH040
z#&vPJ_Fk`aoazJqC-tB=620nJjzTHuS_f|@;`e9^rkn;?zlmF`q@^(-l?~w?Cz(1<
z3Jb0Q3BcGxXZRLI_!fpv1+O3J3r_{%z~QP`M2pVl6OaSZcI}U_K|V;9Jw?bN9UD#j
zhCR~_lgcnWk;z~v{mmoBKFpHW4*Jd%#-Z2;;aiM9PgHZB7)xFdMKGQg$Y+~|Z6i}a
zkU03{j9}OLRR<xifG`7PkQC{e2Q1Rt$I1vX;H#82RuGG_SURbrFb1JnL+v4NQ$0V+
zD&VV0w_`<h2Rwc7ndoKMaD);tM5~jA3vtHeXf=Phuoybpi^GMn*z^-e2$MnvJ%~;J
zXB>2DV!isp2;r|cKY*$WP}LrB!j!Ns$8j9(x729<QV=I()A_k>IUC|v5v%`<6B4E%
zS?{R#jAH%`#}c}AY#oq-WP1XgUm;!%tvSxl6*x8o!uiox(vyEbDInC(%~12=g}4}9
z-2gw^R`L9ZF*L}ydFWXI6nIg(x-%YYiR=}3&N7TK+z#g?_w8}P7sR4cq!nIn!msF(
z@tf;%81J%Yi)AoUA5gs4_AJWVI+6R=xLlZ&*z>&i=~-^4EV)pk_0DxQjj)-Z#c?&w
zvPX(#?diQcUTj^wL;bJq@anMl#T#<Z^5-65?~O`~lz{Ie?4mplUbc0R9E_ez;5Xm~
zAdjZwvF&6x=jV9fMNg~<d^+6bDm)<li2jG%bP!%sXB5Sft#~WEOi^VQ!fBw!V1!Vn
ztlfa92+{#>*h;7nV$VTmn*)#2DhZb1cJPV5Z}JS&vMD@axPW%0N*I7eN+(;^g>+T#
z5lnEH-DuJ|`zwB&ZF*KLo`?;g_~PP`+(m3LE(vDMB$JVDQ97UJFy<L8TDx_O5Hs8M
z9eQO@2zu<mWfqjiGZ9a4i%2>sKKB7SPevY>VHR(qio}v-^jkLG2r%9y7L$mX>slhr
z5{qf_b_)2x0nAG97ap>W_jfIS2ZH?A99`x73LRrxBng=0Nb^mwx<_umH5;`^Q9}xV
znDYD^4tY^=F4E&KqEmKTu4~jRJEnArah7d98m1Xw_HtgEv`;MS=xUthIyWmfxJEiC
zu5whsS<numYENS!>izlSFM8ACFG4dt5aU9alQD!l!|nZ0YtSrvFIVL?*B+CnKcJ$g
z1pCW*yU=Zodj!0mz<75OfY5bidOQanSWZm(MqEY=qjV+SmvkPdDh_ek2pSTMM1(u!
zdtk0|LJ4`s0wcjG(ot=*lg$gCUkl))9^galb-2PM9Tk_QP%%5AO?6R13M|v6NQbp$
zdUo!loYOE0M=VQBPzD?;zlNRwZT<7E^?HhgB8qS+FBD?o6J7vQWEV}x5)*|M@=r%V
ziUA)#o>qXmc_d;l!4Bn+SV|`NXc&?R^R5@4BgO`wd^q3DIKla(j19VlV*Uq8{st(b
zm5fcy!5){GOowSRGftrs27-m01<#!=fB>A8q|Sc0h^~Vmm6Vth=y?30JfkDen5~W1
zWk$e*bZPclI0(Tz@bAd)AEF*sZ644P+p=c`wSkK2TB^bp&+z^-s1I=fIP?U3Q5h#c
zV}ge@D4gf{mik%@KOI&Uj;)_wwfD|IgJ%I^t%QMJ@J7oSTjZ>5{%>uvJgjFSH+g1R
zMsg#8{^oFJIFC;)_#Q+o`kH9<@*P4SY!nf93U_hutJCfj5{>8cRpm}0srwzcZ2|Db
z$=L}+K7AfH(?AZ}_^A5bok9+6A%R$f*tz^0MY93Ij6~t~@ZX?|(*6KlA`Obp3BCE6
z`evdqB<!U_ExSu|q3;s~OAhI9GsBb>47Xu{1dtmZnEMv}kxD4he@3HZ&X@0!u4sS5
zofL@4BF#>f3PN0s#*S$=`;*Rs#jv|Mhum`7QiN(v8%lC00w%3Uf{B+2p$OVo0zPm}
zAHbgmv}kC{e*8RYQ-4kZ<|=9P;W~g2h`w+Wz<^C+dVIx@+4B*?rdOs7Vu3iW9`irN
z1UvQYh}eTk$3z!6Kngy@9b3>#2{Y`X)r@=cChT)v4i?8>h9+2Y5;vC?mg_cf13Z)Q
zqEk08<Z>cx-;{I{qFrq_MBy?7sfp^X`-GFS6A}By)f6SV_D}=xM%(W$smCMei4Pzm
zrZNMd2KFM}_k4It6^{TdbQRc;ImDJn>^^kD<i03n4w8;}icwZ_;~OpmrM;ve^69~f
zY(N=`gxwdW;!zITF{mSk*h+3c*q*CUD?<)Nxa@W;8I=|vS5RYGoUNBTEfG~BvLMFh
zr^E2H^3Zj75`v1ek3-TTXbj6nqtn!#v<RtSkUK4b3cB?GRx+;3&J0be7mN1-p%4Qx
zGU=*)3<iurwv3pDI|tovHQaI7vuL<tk%%S<n%N<U(<Mh>$Z&~Di-A`+DpY1hNxQiU
zG%x|-KEzTx)-0)u=$h_=NLv^cBovx2r#TRpY_YCHLiFgg`AX(o7PZA97Yv%AomYtv
z;F9gRoZPzt=phyjCi;_U)!Qbw>_j;&MncT3%uw$j8VT!0(X$vm@(=)6K}<WfIFvFM
z48kcw+R&u0fh-QG0E+x5Z_gH)5l)L~g7aGc(gv~kB6cZ%JSzmKBKoT1>Y|}a+H{7u
zd4{RJ!#WFhOCI7RLEpsOpVFp}?u-cM_WpVxr+8oCDZ(R!ID|tQmVVUyR0E%u>hLu{
zjmp3%uv)~TTLEM}Gd!olQ9v%3*`|!I!6JR__oIS20Se#nd8M=;RHDG7#q0wV5V>kL
z)DnI;6htL=6pJe`OP=2`9EYC;+KPB`nF56%(KD>04F5oe8^61n`isRZ{9AiOl#>yL
zB`ulR33t&k2LQu)b&75(j86!!Ul8^0350`%X!eu5*0;L@vDn0UoS5+3l~N7*h8~tS
z=pAJK?@nBkSTq&iF@Cyku6PVO3<GE9VpD(2AttbB9KL#Pr{vi&2v~<2xU0oJ+&fS&
z7I8FwIdd{%yuk-5?d$PUrYZLFsDdadbMkf!!yt}7=EVK(KrLx@f>=~bYri1D_&Mg$
zC&GDec2pAG`Yxu<4pl;W;Rg8P<Lnz27s`m~``H61WN1=m6daIIwP-#D!mtcA!Ig5M
zob3n`%Vs|%7ucBp-~HtO_pIRAfW}=-9T9;FKo%H~Ls|nF9S4vFKafM@g0>|1-$uo5
z4dApmIWtDO3s;+fV#wKHpsy2!YNOyC0?>I8?qD+yU}wk41;~Z4b){nI1eiDA#u*dt
z5X_Y(s5{08JsqeeOg5kjunE<i;63IyxrGM-*rv?+Ow`31$J&-M>GlVGdC$;-S2eF~
zv1kH9h{<VIkbB}bl7O?#BvUNeg^wNz@(=Q)q#+95ESem5+I$E_4*azdINY?&v;V5o
z=HM+rx6!maZ7F?F(q>JuC<Sw8Xm2JHRijw&x8B{#daE@Ffbuv-`7DO0$VW9OjL>md
z$PAAWG%bYer(dNzJ{|gI-3qX-su;gL`wbPq+`hR26IE~@Rp2k*vN!(Q^2u^$N}vPD
zRK5qw4-QmdYTjJ^72E;}{XPEOjeoQ8udf<CR=Dfd51;{_F>Q)vYV&@33xp_W?J97#
zl4kNkFNomD&auL(=vx=k426(KPzc+a#iGLmiV}*{Cyxw?R!5E#Y9SvR!HXL=KBYc4
zUU<@Y=TmCac;Rv5zWM4SslsjThzI#vUHNw*T-}^142e1IcbnNZk~T*OO(6_Lyo=a5
z1^kb+5%XU$3-{b$l9p{2`nF#sfeD)Yl)BU`#N6=xL-UO;KW5<{M$bI;vos;5{UBll
zXFsJjqzMsy8Zn4A<{+D>k6G}!)8K!urtHHNGEbQ(9_kSa9I&b~odtJd+|&K=a<@UO
zs6ZVCZx?Z^A$bH;g2}UR8XX0vyb5?~C>c(8A!{dL2f+4DvlF_qjFoausgzY;iW?5L
zR#2#`Ak-iy6u(i3jlf>(`$?H3cn8AWLz&1GI}VAd`;^HYO<uU*uoQoS(c6x(@Hnfc
zxE!^x)#4GU;A@=4bQ8CVPJ~NAq>;<B&}-8{DPxDXeL(x4RRo^gnO_qmXB0}S#{jb>
z1?vF2Jj4~x+tit`;%(>*b<APl&ij5)rU}J|?1Q~05iV7k!BJ3|Z<Og>jYtgl?rWQf
zplr4>>}z$Xfot?NU^JuP!(u;S8|$6Sy6k_w%{v-mi!zpj{x-EznamsgA9{FWnm^27
zUrhQJdna_e9RS?VTtN`dGRgVR!}PK<tS=xTK1lFBPu$A<C;bq&J7sgJoVC&q<Ihe9
zV5~at5e7L%fvbG30Bj?=2hVR@#zC{G*YWI0R!6g~bzv2ui|$RaHLJ#n$TdalkwRA-
z;kY0l_tvbgEQ02k$uqzhMIg`?v#5CRY$%?ISGkxVUAlS}ewEb@`X&|Uun%L{^Bj7H
zc)fNmy?$Y3iDcXYE7x3iF<F!tjHSg3@K?KMA)>*2L9KMaX`VgDZC;1|K$fRl+wf;2
zy?I`yJrA-Z#SQ>EPSb7!v~+ZIIOPn2&Yw^*eVHE>F%Pav!9!;>Eq+|{QLQ#Qj{La9
zqDR`JdL<H_P_mpjK9bTSl#F$tB*kG!11U+tS#4-B^%8%T5Ir#+aR@pa9PVNp-l?||
zi#6pgUW#`{#dReJ6(LAa6$AzRT}?nk>5P^1kpPJo^BVkQIVrhRyB*MR=CA7@7CBKf
z+h#_sriNgoW{*-7dW2}47wO0oV3YIZbBwylpHZ|c5_U7TDZ(Ly6jOv0u5KK1N|S^9
zgEDVI6RANoBr^>%V<X-t2hnJRAZa!A9$?Tufe24MKyCJ7WMjjW+2Al!$ZTFGnKxED
z5V;xRCyiH8Xjp{1D#ppC=QB!?i)n=NY660e#L1r-Fgrk4XdQe%yDAV7(enw-G1k&J
z4$^<>Ze=n@^rB5dfL>6<jThSyu{a?)zJ@m%RLAXQC@}1Z96iEzH!0SVyg_;j#X1nK
zCUZ{@bmmu}g(@^F7X5GyVUW)wdI^Ac{|WRiqY54N>_;*N3@ppm4nOW6L{8fUxOOi3
z&RqwMONSh;rez5I9rfaK-v9;Vj9L~22qA);$mBakLvwq_=&i>4yag<R5FK5E&V4&W
zdkN$T?V?NG+lW*$!no9A@`ki}Gt$a#F7lvW1bUF9q^pafSY(mAs+`G*yBs~XufeIJ
z9!Rl{&KG~nqdryHe@?n8E;|hI2ZuVI{rHQ-c=obWy`CY&=tQIojR1>~!j5#~4&tC`
zYY^VCC#<49VO52xM*csveG5QT)%N$9;T#<hoI$}*Q3f3q6qONt;Byf0l^VV^Q9%L0
z2M`Y*r40n86H;2*wz9;cvaTkTDViyW2^J}uDVZsjbw}|gX(~RF@3;1u!wh8oz5nm~
z2G%)et-bbp@3r4+H<V<`Sf%h<#!=Cw!t5S_W+4+o%`zn?zAR!h>UqRlHKX&yqf`*f
zbH^26pT-&wRo=!avVAq&7y~UY<3&IHHn{+y@NsqEXHdtryLnZ?ZJgSio2+KM=xy#p
z_k$e7@tF*ao3`b-7UOOv*U@MwR3%PuzT^^AhiOh{yqOu|oUv&XifGNtxf$DXBl78Z
z6U18x)bMQ6t}?=Z((po=oxiUds({E-9Avb%eUs9Mp9`FF>asKVV1H0Xentmk?g8#v
z2kxtz$sF6QFu_!i=XwiaQT;w*jfVzNWbZ!##qHZJUq-(jQAZe1B+FKX!%0*Zo4PtK
zDOQcO(T=Q&#1|&=igU+p!zKh;7u-oT0}3O`Ennq{#gvfOEw@yMupezoWsN%yV58U{
z@g9^>sm;j&D;5T`?;*XG;d{-SdJnjlx6v2RZK^f1a8$Djb5txoQtTG42XWtFM8;YP
zp^Vn26KXPzdGhioj7t5;#yJ(5xWcYvnk;}S%dmU7pZUog>_j9kcJQVuaR-~bHwJ^8
zyJ`TQHn(c}=593DQA=%&!Dh1W2I?OlE<<08?D4)@B2f@9Gu<dKk=Cnc<i?EZIaISn
zoT61B#I`(iFpHlcwlfBjOxYL+zqph!7E>j~c5z7m8a>{PM2i*#_VENv+MqXBpHbY<
z<Ae$&T2gM~Fe4^Uh+&d4f^;|X{G*~zd4?h{w*!|yz?>L5GO_}|*6~!8G&0gmMyPzr
zgqv}^)@%7n+9+WkZ;a|=?dp>FbX~)uwmodwU+}Vnz<oxV4(0B$GKtEzPZT?t(?O=t
z^Om4716IJ~1E=A1JcFO?pu=Zajb540X9o)&%D-+Vk~tcHHb$WDrvT3ZFrOjR0BCh@
zA%MQkf8Y@e1bXL%D4PL&hXM8jP5>_1zDx1G0BDa4-wNR~7@}<!fWF7zJspq+=!1^o
z3cz&0LcmBs6`&d*V4o^|{|;EHL0`|wNf7=82TlU$dq3WE!}SHgbTk?Z0XR3uzh~jS
z9Iyqj32+$jf$jSw-X8&I?*aYflO6`F6QeVoQJemF$mz7cxJ%kN_&*tg@<ymaD$}0M
zeqeS=4a!_$RBc%jfERWMbiwOEeriXq7p7_%)IZjA!WJpg5>pjUn8)CQ&o;v_2S;aR
zY5}MgS|{W8T4BYE4$~WO*b8fAR5NTxOK_3|t7b?&!Fqij>Ptxi@krM7K-gE4#q}-G
zg$OBKa-MXoS*52~;uP^iEgJQZBTG(0=7Bgig>{-L9#fBfo?V|R78rMtC@{vrG2Ggl
zz_HF8gQ~d#GV@fh4TLq1VP(^xnk|}Xr;DA{8&<R6>EfYwi4d%%*vfi1igz^W+$q;0
zIdl%w%@D_9N_ox<@i%`|JNs&kGVt?gsD?EI7EGU1-_JUFCR_5P7_I*IldS4Vah%7}
zLNw8~ai-43%|d31-s+`Y*|eF^jL_DBLvfF>nV4HXyYnG-PtOz$2-CfpVuH%TVxz<W
z=h;YRTIl+ny%r?~sWY?Lu_!Tc=v${y!&mO7MRjc!-{gq?JNgq?=a_OX^PUsbctM$0
z*>Dsz<dT~5O1p}7$k8ct4GVl(>=%ewEA`brIbL;{Y6=$SDBZ2^SJu~KlP~Edx;&2M
z&k{X*wVKYmcQjpxbvkSusQ0APiV(_lV0Z@R>+=a+6-h_QHnQqjqK7$;Zf_%{bCp;d
zFRAnCylOfK*|@kf!-TEL*hpDYQsYu`xr6WbaOYNu3Z0kquC(9*&6xF;FpcGL*Rn7<
zE>3b>XziTqb8MjVn1<=(mlwUX?qPau>&FBAERPR>h=og!4=xKck&$K6SW8%>q6|Yx
z2KLTuagecO`+e%#HWfe)BNtlz<ONEe*<h}7#Eu@Rux2X_4VR>`p>t3Q`aI0!S=ebE
z*ooQ^Z^xtJY)&+e^kFAlw3wncEMhMlgq9M`IvmP8=(OPBYvK)eg*jd=rr}qMwVWof
z^~Fy99(_KvhpvJDSg}(V9J$x<5jgg^>6~0Qrmv&UB6h!7h4<L8IijC)k+Qdq)z1-Q
z*`&E*8#+0Q-Gu_O#9G8M=8D6;_zBHu6b?S?ARBF&jQU@Hz=`5xoeQN}MhHPjEz7si
ze_^aI3)4}{fj&UqcqdC`_Qm`Dzx$VGS2xF^!-%i6VRg_-NJ=cV&n-lP=Y@IDcDnFB
zP^c8Y4&Bq7Y-D8S02j;YyovRBruvK;xT-qlk9EdV+UJ^4F;4SFzXV;a9BKw~Bd{eG
zeIvoYHsp{tdj#Cf4f9gfPQ)-F(sIVyej+c~st1-dZ?yMROwfqtjVrR&;<$F^$|CH8
zSPFO0-bNImaH72xE>oSd+`WC__DQEH8pnyQK?r*}cH`VzVxocdSan_Q3bXpY<*Tgg
zH}T6lgnh0m=dUbxvTk#{jN`}iM%DSA$(vet`^@b!+Vh(COkMhCh*wCZcJ)g5W%t5z
zLiN2iC!f+_a2pp(Ro;^NyqWbGR@9)pbanj*IUTa^qQi$c>^nsg8G9ouSF=sAVpsEn
zNvJ@yVJ~lzuPwG<leJ@8FJe+qUQ{cBZnjyuh%bh`(3mkxgGIJzuHbRM1=q@oTmcgq
zF7?L7*}1qv1;c~P6@m3G8BfAJ%UPS-))!y2rQxc#s0%uS+;fGk8Y4P;ThPmBmhoDH
zC%Gd%VB|FGl$=#G@`lUEs!28Nuni6a5GR;aYM+0%!Gvexx7LtI_C}o8+w5mTtMD?<
zQL(0tEf8p!1`z$OOvl+B=t0C5Zl2c&E!Lqm)-U+%oJP*?&mgBRe@W7dYt5Ka6*<Ye
zS!THWG|DbtXjNQ4%k8fuWADS7%QIoVH=ULj+oK-XGj1J=ju-o@zGIu>#qO$htTZ0V
zZ))0+YMI`w(|mChj26xp_p3f*ehJvMxw<W>mx*@4ia2_QuGVo~SV@A|6<pQ?+*+`*
z4KpT+{nhDSY(b(pxOoowSQ5EsN22JWa>-OIb!H_C#IF6n!;GARR+Wa+CuKNQ1&f&M
zKqp7o>W2!>)dKv05<(|aij%|+&F9iF|Hw-WDgnBgX(9xT>zV9QRrVRIp4Mv1+#+Eu
z<Htsaki{%ZkvE)txSjy)yMvy9?~QfN<&Js+sD}nU0k}RFw>A~J$$A3l2!~Bi!0{p#
zvn~`}pM-x%eQFZ8q5$j>rmZNT=8ZeNj}i>~I*vpf7N=T&^X0pNF=jZ7eGXkS@1Qo*
zLPc%{R>BWkZfgt9dzD<%U<_M7N`tK&Z2Tf|LSr=`igdSkf@SWEHe9m+PB)wuo*(6!
zc}FeZ&6#;m)UKkQX+zVIeRwi&H>@icqxQ8&ML_6D23iXes5iyG_pZZX_kCSqFQMx>
zI`{5B9<`Jwg7vL9*n6K>>20=~Hn-uX&7F%ypI$Q_N53}%r(@6tlb!<dJ_kJ@RR4T!
z!EH^+uUI87&6|QG+O~ZIyPP6+>dE&dPpR0qA9)XLtT;fYABPe$t}u^=eBj(gX>0vy
z3|i9`EdOP(ed{;v4T+KvtYwneQC--Y^-2;A?O$lk2S>bvZ&&|<^Y16J+2SOzyZ=9w
z!IKVUP%d?(ChSs@*u`x5-<G$06bD5wMdR|e4JLdiUP$BewjFeN(aWK{tx0ZN-pI0C
z-pB(gZ&cSB%G>yke=TpfsVw~eDQ~<jr1F;cu=1vqvX&@5e=TLakiCK|&hvJos9QC2
zQOZ7kcquC#`H)hEnbUtLW&Iwpl#PYc4*E0L&aF=EJzBl~cjZl|<K?Zx746@YH)AH0
zT4-BBH&sZg*b?$`RH{hDX;G@!rG@ZzICX#PJ$1fpbE-Je7roY|TPu`)A$5<jc%w}d
zd$frRr$A!N>V>^5SXV<UW<Br%i%b)7f$JuFSnb!UV%L!qiag7ETYRh~ofxVTBC(OM
z-gB}qyO1UhczCByS$AT=>0&>Ri41*GXuqXCur&gRb^A#6Y`WN%nvrx--ywJcFK)LY
zig9FoGnIiUhjCc8KBL_F+CuhSx;P~S5wu6B#v98F@}-%%TsH>pg*$;8<fIzxP^*?D
zoiZk3^D@N#9-UsbN3L2K?R=CW29LmLN}2=XH|u6!#et*xBN6qgy;jhTCoK_m&`6Mw
zzBWQg5FpJWtu=F~pXH%+dNG*AMph4B=C?%bhUi2t5xYO;g}~BuIPEUaZJ9e&q?Tto
zwEry;1Nn`iWQfh(LT*QxG{XuYgfB6iTO#_XjX~_sCE|?7PWPcE%4xR7{q6$z{?+S)
zCQh=J^kIvairojo2Mcz4jF3kRBTPs$EM@BK3R@FWpdK!vZZ(CuZaD87*7WBE;lxt$
zu@KtHzpn=@B}Ci#4$6F(PN~As*%}Cxj?3g_?9WXKgzJ&kZ=9L$GDyoE&Mb79*b5O(
z0g6)j(lXIs?d{9<EyGEeOYF=tM5Lc_Pu(){8&!`;gkoP?@@yBrtZPi@Xa50pp!+%#
z%?kmrrh~>qSNpX1*uaN|E`J!01wt1|Hr#=dey@h$`9)fHG-IL9i0w(;Ahry-O`D2x
zss}>aS&YT>qzMT2`UdE|EBua?ZxF}yvO;;BcK0%8?d}w0{wYhzw5j!JqIG87159gH
zL&H|?XpOu>G;^Q0nVB|<USa?YS=2_{ECt8y#gaD~@(c&*x<K`cBrSRMMmiI-YqMzR
zM)GMLL=!^Sp!Du9I`4K2Wc8axuQsw;JDYoO4EvpMMKoLarr0h*pG#`+L$UVY9#Mxc
z9QwmKK-|KC<x0@T)sle~8K$F}g)tfriiSc1#Tyf$vJdOg?EV3#cIx8qSlyfAV0Cpa
z>-QG&RLA1p5=W52AFCVsjtHs`c1A1{vCDH``5WxeTSz?D5LWwE6SadKw<tOju@4pr
zkDYJhwxCp0e#e$=5eJd`pKXErE!m|lnB{;|&iV57rb-I3q4{F_=CuZ72o&_yZVB?)
zhvi_Ts_FvfXrG0W9UPISSs2>sHpv<_iG7kUcJlDSr8l@x#}x`2(qBNRr{BF-&wkDq
z-%}q9X1QC%j-6-AgCn{er<_WFtUeGDsoK`T{K8e%$GvU6sO91gE7Km$>DtNy*EiUA
z>qWgkt}{N&53@nzOEJH^Dq=go^@*RRBE47}?>#_TyE5;W#WDRG6%3{CrHEBbG1#>>
z$;!5En#6gtq3>g{ODnq_rFfwPKfOWp7I)Xx*W&^jZ*}c=Y|Y!4Un$wazIYpJ)7w75
z{4L}l=4`91&*k7Mb8+6o<#fZg^A+!i<2_zpZTGgp<orA0fB@mN?MOQE15ybWzQ02s
zxdXBKoAWRF8ZPFhYH$!{^;tH&K<sH=i805lV(jzE89{<>O1bKW<w*_QjFB@E1l*IM
zT}6i>;<H0=vByyUwOox)+LnWjwU|UfTTh-?hogPIE#IqyonA0jl2cLFiTRz@AY%}U
z;pAlvIbg;f(vs|p53-;pr{1j1#+AGfrnt@$bNhGTD9zquW%VoLQR6M!VkQ<PtmQYU
zz~k(>Hb;bw?0fpuXqt4I1tsF=R8{^Z*(IB@@90w>2hs8XCk~DE*}vB2g?lZ-z|}rT
z()vJCvA|64icj?0hw6^#)0GeuZ8UIuLE+KP`G%We8os*NipeueAB;&YPixi;cV*|^
z6%FQSnAa4b#2-r7v=t@$XCowM3QqD{_x^E@*4OwFy7fw+;|Q&x*J?{M`=Ks-dfAJT
zQW+H8JmaWF*mUzakv_|r?}>e!b;y6{&J?<^SKkxosnZJBz4tI`!(oWv_r*cj?2+=m
z=s{)vGA$?CSBC{O`BwKEJW)sJv^fVGnezU?jqB|5_r=sUgJBy<&+mlPZW!T~q2=vC
z*fudt)sL;-CNAWAJC^t<!lfQ2F4d??;|*maqP^Jq4{?`#><40RS^O^>kvlsO2Cb3o
z3&gw;(UA*0`B@V7@dwaF=*y0Nfc?0>O#DzZ%rSA#v6+uDDMN=3<UVhZsGSYSojtjJ
zH}y+wTF&pG6rTWkndWIA>h{CB<xqCrw2WuBdLc;rronIsX~fQ0Tqb!{v(+Dp1HHK)
zTFWtH>OR^>K4dDk0;YR$`|QUL#gRVX$iAn_7)l$CbEgL6&5q8#tJkiY4(58#QNAqf
zU*hm4sqpf@#29h;9P|}$|4Zyl{lNN$BtoF>(w4K`vwbe_p~cD$8+_TI?V_I=ZpCdE
zO%GuQ3#?5I;CDNM{m6E)r<Pp(wtfjs0_P5aTvzW92T)*T5{Y_zH=RqKu|xFtPVh&E
zyDdNH#JhiG&(|SoC~>Xh*jqb9KT4I`&~1ZS+E7p%BEWvyfk_5m=Jt^|LXLOCOm*}}
zVgO9?KEm-tU-rdEqV241tx`O$e<V(HmGd<tfET66ouXbVQ__8nKVSnB;%D9|c7OwK
z?i9nDBj?H@%DvdiLecBhLhf^qLeZaR3-UHG*Nrl_h%z_p4$s}GJa^Ly#lGzkk5$FX
zpR<${QQl_V;hEbUox}aUth7)JW4k{VwE<{VE#Gnl!Ff>eWjPC(<Zutwo-TsGPl8WH
zSMN{u`^Tb}yt`@qWv2T?^iWT~#=3qY_Aw(EIDn1&^fKr^J&$4h+y>?aN1_noI=$K<
zNY7zQWAi*dLs*5ZyO8VVrK3q7M!M(LK-ez%w;HF_T#Kj*;@Fo55FHL?xmqsb27rOo
z=!)5c4XX5>INK(^LpCgZ1MuWJL`%m&AQhnpX?@=S>$dMV@Qu@PB5Y_B+G@~vd#gOA
za8(JeWun0V*R~F>X1<?_9<KP-t|~)VwiaJvp`VJajiAuE{Y#+b4haU9YaBF$LI5q2
z=TL)qEO67_6Dmt^k;N^znyva&97L)fKj0F7)u*s&EPh_{gPp;c(^wB2Vo&ZvR9lW&
zO02y{BlN#3`W%T-n-c=tdE63bIX9G85Guvp99pi$Z87uE{lo;)@0mAL5O@BtO9$#^
zdN)|Ncg5*g;F>4{9efiLVt1ljUWK%aw8mhTMD_|IfaW|d&w_2M3tXnCn}8hQE~_rn
zVlaE*GcnQZjJRX`!8@`QIK{}5JJ%(5B06?-_S%|Yq8^`yGf?IsOEkH3i*LGaU(Yn`
z(-5tn-MR-Bv2>pw;ga=T8(v}Om(P>0RSay|x6g;Y{JA*H)%!4}*?%hRTN=O4g{i&}
zv-d>r7Yij8xmyg4F8nw`$oh#k?!<@OUE=J2r_j~%)$BQ?+CBRNKZ2P;ZP7s8?m%^E
zpnm8;b#9<;`<VT{Tl9GHJqOd~4W<PS)MgFTw;iZb12x})D%z+yfp2}x=IjxFRSUb=
z$RaUVI{~ZFmP0iiEZ<v4;FG;jBtG6kzo2D8;3p*iyjgXT=xH7b1ZUBsOX=zY(K^7N
z@_;&|!(ot6{7twp1$xqa8_1&-@+6R58px3f87C24kukM?+#Oyqf8RHSOf%s{<N|l=
zce0Uocep{)vh=;8SBHPR4S{{I7mM0!s5-4R<kKt1z(?8>WNl5f2Y_p9>WGZPQEez}
zI%~O5a@WULX*}a!+4js3(!>O<M`xk5DFZwQJYd7(ZBX<!;bf)d2nMRehLb~4SWZqX
zudRZx|6RN1`;r=U;t$U(fSr;W_k}gF{+GWX-A&p(M?-ENfI~vt2iiTm+IwfCqT}XK
zMaNUTC4I0MZy7tdS>Dq7mNTiZD}nbmWY<Cc63t0nZciaj5p%uvWl@lB^Udk6JR$kD
zYqnPl%9xPv>7c97_J*a#@*uU8+<0ZZ<msZB8d;OdZN5?{g{Ydnaz*N9*4Vu8FN2yU
z`EJ;nL>^iAxWr$(rxM5f6Yp|;RM*@Wo{9CZY@~lGJh)l*kq4H#>^he;XV<_r;la(v
z*XXo+as-N8yhS!Qo?P|AK}x~A@L-MhwL|{5r$u5-Qe|zu_9v>G&<aI)#idmRyRi?8
z0{4;qWf0TUk;I#(r3H-Ya9UW*1AwF{MBxDLLE}IObCA4{HV`!}uacvFrKGiOT0%Tr
zQu=s-rI8b?FRdV<5+Dl|xvm#&{u}~nCwfmd++0b7Eq21-{lH(c<5t4WcHH9&;K_E}
zMED##zKQTB?D#3dhuLwz1HgMX;O3&qMDS@K6lD^wwc{0p*SBg2aUJ2;?6~0|@C$Z4
zlJMhpd<EeL?f5prcPhBKqUaP6wkU*(B26*ym+bgp!p(L(f$(HIzJc&LcD$VMC+xUu
z3GiWd+(dY98*Z+sC|W@TA3MV-!nJl>I0U@jy&(kx2)|~>rxSj`j^_}5+>RF#e$bAe
zBYdZf!~cq+;8GB_*cp}){*oOpAlz)nD+y1w<M#=lW5)vz1AoGf7ZE<pj$b0YH^<5U
ziX#1&Ao$oB#uBcz<7)`7N5|V%YWEX<&5qX+e!-4=9|3;cjxQtppdH^%_)fyP{}n}5
zMA%|y!0Az>fE^z|xY>@!5}s_wHxWL^jvprc2|JGMEJy)6?p+SNH*neiilR|O@Ub(j
zC0uLAiwLiW+_R;?CBm=Saothi7wq_8!jIeW1i}y6@dCnkYOx{6=3o^Ow%8dwz5@P|
z9gig3Y{%CUo@~d92%lreFA@HP9oKyge3%^{On7gtxgka=MDVdQ>>^xi$Lk2MZ`r^f
zPyzg!9iLA41v{QY_;EX4NccfJeu?m%W;;Rm4G3H8_+Y|cvg0X)JMeENJlSquPWT)<
z{s-Yt*m3<a;KS_rBEtLhZXncmsq}>e?^2<s*+-Q%2qxAfEPX~=XVYgCK67iW&#_Hq
zqW6r>7s7Ge6$5Xpk+a-$6NDKvFzlFM?GA!93lB{4wMZyD2gWmGY7Hd=+C^q<Lyw!V
z9ck6U?HN`z2v~!Ztb3VTx!9{k6<H`<;E}ND7#mTJLDMDnRJrIe^b$HN`c8Ow;9(87
zd76$5ilpqLzNj7z)8%V;B<P4sLtI{*t4yl6#7fJ>5a@>fvs~=Z_dl-W@xSoQt+O7Z
zSD>{7FU-^iTBYOEw7DX_Bjk`R%=rOhgdOaOqhi<g1IX%((%d+!wYhBECv)Y$X%Lah
z)`7vf8yKLr*xF^!!J}dy+@8FP-S|qJ;eJiSQ$-)Um3HGCsJz5xeJ%EAhFGbrS?tBH
zF~x;%AstsX&MKYCH?u(p0d%L$wI;|`yJA72Q$iKEtOL;*q7>IATq3lGjHdVKQ(P06
zeYD=<MqC!RbNpG&pTuZ!v-0OvJda4<;R&6(vuBl}XV_0IG#4tMX0YfO3#|}e(a&$r
z!>i52*@Fz{pyIuiU|)@}P078QIpowO_D6--jV5(zUwKAzYcp)~t7#zz?+@1J8*va#
zz~n~M1x5T}iNI;yH9(E@QHfH958T6rVG1p6;L6v$arc8Ft_DTi4=OoYn(LNX%|7@>
z44GDqvHXcS7Pn%2%q|To#=ohwNH7UPX+kae?P-Ah(n3{f0`?SQQ3EppxFO6735G00
z0;x*TA4akY6^C#?K^?5X`Y$ZxnAoK=+{D)D(xL%iC@l)6C*qcM)!+n`i3=X9_uS>n
zvW{Vm>=*X#G0~!$$$B5hZnjgn>Fv1aMLLSGl!GW(^(^H$bVd2H^~c2_n%B-_EaSP&
zmz_Q?hMAv3Nw);%E)}h`wb2r2bwjDC$nK)~1)(aPH1&WEy`azOG3Z8G+iAH&F`{<K
z#korX<+uJ!_7QQ=jnvC?X3r#EFXE-g|HNC7uo0Csw!SZwHPWxBvn;}R9MGeB($r~N
zk-mkMV()RW2vdEAhoxCPu6D|Botn_%=Wq-OkTTXCBBh}>N(T~!c7l*5i5VQr?xLg6
zXJ7Tpc1r-SYJm$+tX?O?0wmVAC$N|B7uM;dIBh0ObKRox%q~~w_Kl^Fiw|%~0qj#p
z@*T2n;S3gTdK=lK!>D-`OtZ^HnUgxG*%z-hVP>aJiV-w%kzKBl`4B+a#apHN^yRs3
z+`Do;w};_~Q{`3)N$0cK)qlzs5PRVrqFFfaptBj{Q5N@AgPc3=kIsiW9~*QiBXH2M
zi~w#^j;$%X`Ulx<IMNRhL54cIQqw{<<yLM-T*VYJhRURj?t$zLd}PPI6@wySH|w|`
z%IxhEop}ImpXoe=2S<L&5vWrw(PsbqplsK|O;8+yijSf)gh+=GdYoA*9Yl3z!YSxf
zLAgYBQL%&+bQXnT<PAPiP*=c+XP{ih<s!~kwxk8>8Q=K7<Mk^gg$F%7b@c4uO3%I;
zdJYlsj9=>+$X{*-{^}s`mvkR-iC^2L?iU=Dj9=UH51^Z0lKfzp8zH>o&EMiXdc5-@
zH17luzUmw%k;<e5u&VI4l?>l80K*g*o)q#j$(x&Ed?NYTz7~kn7ZwX;nE}A5V8}R$
z41{s4REJ|X(@UyR>WXcI1g~8v&edom)*UUa@8W^9sPE#%p8|h+^QVqKUHMbPpCW&5
z;?ETR9L1l@_;Uk)M)K!m{+!OAi=y}|nm_aTGnPLS_;V3|uH(;i{xtFD0RAlC&$axy
zf<H6)GlxId@MkcdsFD-1hv<G`6HbfCs)|>7zv)BElGEfRds5Vh5#ny?FytNP2Jc$0
zmttin=}qtcSYF1>6dEigTFXlB)mxE(bcr<f=HadhYxv~*_0%Z?1xjeIdeOx<*vOYU
zm8s5%UR{RpL$@ulyllapcvOEK@5Hm*jkMzI1~Z)z+qEe-BF$;HjqL_Jj?Z8zXGEXD
ze60(YdXK`Hu?kCyYniIJ4{|+Jr23m3qr<($nzB$=%3SL_Jmdh82>R?KJ9-A2OSua;
zl%Jx(70RRpTQy)PyLUz$)cVL#S&uG{16kR4l8vqspLEL{irU~8g#JxJ=1^8xg}boV
z4P_NoqS2f0#~7vAYuaxT;GQK#XBp+eT|GRMwf$b~G|<LTW^#=NPhJKtQ*`G`rK9O=
zmV4f~KP;nkHv1ly6fX;g%M_}*p)BKjtXKw)X8GTXq56U$G$C9~DTk}7@x;Out`o#1
zSbtzsdHxNiIxF^2hrh{sofUmra$l8O2~2F}Suwyp!d=cG$|6ho-t9x!CXm&e*Rdn8
zqF%Ry{rjxgTU}epynev_d4CLHkw1uD>J3NOf*+uCYSd7+^#`#h8~cao-6aJ{GHq%C
zy(U?|KxO3paX2hD29$a)`LGK=i0z$)6bd*N)n6&x?Bn$nrv5pvY(buZRTMVszCpAa
zT@w^@PW0nCrk|3p4SMCAXrz9Rwcrc()j4s@W15bb601XlE$;^NZwK+)7yF%h{3sgK
zf3{^4eiYj@55vM6{9_+ohAPOO>)46Q*fuc!Hv9du=<Re(SI=};#K+ZJUt+VaU_GMf
z7F&HqoQ+$H>Y4S5I9T-?>rx|*r%82X9|!dwHUpocOz^*0BX&^-Ze*X;hy$B@O+^5!
zZnIl8VxVdb>vmNPG0&zstxW&3xO9F5=3D*)eK*rY?as^4^rpk))*^!!wXncEX#T`<
zc1oo6GR9GuJcar&QI+0<&tyZFL4RskY3(`J)sTQoQLrbHZj?}vmV{vT1+%fP7U;FJ
z(aqLdSWUDiJjysv`dHjYKH3%D8nW+T^|TV5pWGyorfn?gP(L?Cg^*2#0-SG4tWMcK
z*ZG%b{|R*`KU%6zSfMa5TS7yh+YI$T$}j-hB54-iSbXb{7Oje^JiQZi<w+@>A+N`(
z4X!M@T5NBgLq32FGr=C%Z$e6zM`=jmvyPr3>A_ouup4rt3@f-gw<B3M7AMCh^^Kdq
zd{Ne|xW&n7@MV;x3gHX1oX)x)lNy(lbt@w-ErntMtAQ{H$lYbgM1tcpGV4}MYI3Y9
z$`IgwU286=b<=LY(K-tTb7SL{1ce&{jNig$pyfOwF;-h}#2xN?YYVE}jX%J8crMZb
z6qB*|GAXdKDVx|6b-WHyh{T*@5JHOS`LD8Wq{XE#w_I>qVKB5#H;mF2oYiRyzSbG<
zS*ncJLG`wLXEEQgT!7(Npn<Iy83MEgm7dz|-?p$^&$>l}5My1?U_;PkL%6Xf>n3ou
zWw60=JZP-Jq;fU5f2TU)egQcmTE5Y4KhYY&(_y_tqb>N(%~Gb_UZq1|Nt+-j7j#fz
zX#5=$ravO|UPxA*u}oz(yMKjU+0>`2gKZJ~UWmNL{f4%n76G~40u&u0WvS6_|3-`8
zyBojD^)S#<it&c=jImtxz55jv$`^_V&Uaco43@L*53~hWkg9b$?e?11+JZZ}+yDde
zPJ?)e##&>I@s8?@`*{kf%KVMx3<aA4Y6&n{zHvXI-F_AxU2sQ^YqZ--T4)Qt^vo40
z5p)Ru1>={hI``8k$_*jbseW_+8VLt4&$LFSX@bCwN@Dq1jyjsJf^T%jo5pXETz9qG
z%d`kri(C|B;~BH@9+fKN4U5&c>V`I1Y;J)D)idSL4VQ64yZ@-_gzx3d!CFCU$wBJF
zJ-y|a{}Ia>|1#qP-`}zyP{94P&t;M!+{qJ3VhMRq)t1z>y<O$|Ti)d6buSpSYrM5<
zqWbIB7z~+%4X9Ud5&u|2u+{wU<Jf)%o4^KN-iIwM2T;qgY^A!6JDz>7P>>#z1El5W
zifib`=jKGA;9bV)RVaU_u*m^{Gah-v$#-At8t=!}L^ao;*j9#E^GsM4_Lc-;pm+19
zYN4}U{F3aLEqDD7A@B6Jzt28YhmXO?{@}}f5D>&n&(r3Iyz#YAgj{c_rO5hTJ`%3g
z)l=wES5@R8Dyq8XO`MMp<N9;5?`hI-U@;qeCSNJe3tk18Ak+jwJ4SuIk9Ktm(2}2>
z_I4TlGE{1sEmgNK`hR<(M)j@b`T=m%V>146?H6C)KJo2uBXCVGw=)EGY!~fj*W=Rl
zp1`xqw0TLo?0?r<?x||D&$R<7>)!8tKLzQLKs2W3P0|^U+PW^*%3ZY3ugwW0!xGE&
zyxGv`T5Hb!sSZU3sz6+!#MJ8Ke<=Hbb6$FgPCJ~WK-823s)bXnfl!l-Mg`Tz5AxST
zzzPIOg`6n#GeGo48P+3pNZyc`T82!bMT|^X#tw-;v#yiOBFO{cbeoH=-$_JenQw9l
z2Aeq0u);73cD<3gReiaPI^q7McKe~$x4(rLazo~rAUUp}UU(Rfq1J~(&Zf&5rY-p0
zU0ZP49XtcjNlQ0G+g3i}v1<X64!Q|_C@c_H$s=)fxGuW{TJ_Hq4>8jr)$}X3D-m$g
zw;za7Rh+xoK+LLgTwUycDC-6ZM(v)|ItbaxhOty#gVGHvvTkwtcGGg*X%QqGgs?2(
zZs?3xjHRFrh6p9u^c~ECfrq2gLe`nGf(?|Ya7SY?pGI{@6+iC@r(G?Fkd_+bZ$W7K
zP~Qg_(J;`a9yQ$2p~8xm8c5e@$Znl`r7GBf0Bc~w)%{EE(T|XvkT(#1*R|V^=)elW
zcSuLVgB*m2F&<J`-J{TcLdGF97RW!uhJ?Fz`;S`7x7zL35ttjE$Vx6n;3bzkHy}CS
z1Uwdbu#dQV7_<eyLE>0jBV0NVT`lL~J={92Lt459LE2hjS3~gvK{TFr!k0UC(%b||
zw8hBmir{E0SG3!|gwQ+WZn0W!YPX+9Ab#|Oz=i`N!mTk@A*xjRbP#`)_@;Kz)g94S
z)sS@l7SRx?sAvmH-7K}_ueQL7z}(d322+cqL&GK-Z>r8)f(?kA=uYVlIcT=FFkS~i
zZ=@371<C1qh-41--Jhw&v6Cq%54R9QJxX1G>U3wc51A{FCCg{!O+|fa`*>&AS`*$^
zDEZat_W3p8o)r1Oyy5k}<lfj-KR`wduY-UH?^|d2O}pwT2$q__&q>Cq&ca`_KD$&$
zZa8?Fv9{(C$|(kc+B22#|9Z^^NSP?a*pI^40}=;ya55%9ERodnPoD{+>0t4OP{T~C
zkX>EtUy}QjO{<%-fe+)DKGxJwh+Akg&I{E|oDgZbJs!Fd=hnz|8}8!J=L6h<K!<$8
z4Fmkkp)-z-E@x&Rj+NKuzqdXG7b>u`Q#-BLQVnGah6Oqdhqq%OMZMOd3u4GC6JGb!
z>rXuNo)qhg2q3>QuIqVmwCkJbtzLc)K_<HwaRD8B@w}+PET!%Cxx({e2j673rnk?X
zYPfyQ#NDdyuJ&*n0B0=0cgw=>iq#cNdjThr9(GS07Cq^nxO3Q7U-hti;%*f3je<~C
zviy?=_Iu)NM~RypK&j8v!?o<jx2f@7C3=&&Y;t=iFPc<y97}p&Qp(qHJZbs}1HE<a
zo%)$QEZ@<7hrEy1z)_q|Sx;~6szJyBhfNNv=uT1NN$u_|3yf(q!jmB6&JuIQ*JxvH
z4$iO9lIrDhJgBzPu{hMDeV9xYEVZ|P!aV}8U@04dvWVSxbebMv>SQsy8fbv4G#JZw
z@cpGzb6pK67S}V}YMwNn<a<(3FP^Xj81kSY`ld~;9%+sS$#q=D?U3tB0!w~XTfWH~
zyu@-u9u?4)Iw&JFl(t;X4KUDTt9-BPUF!twv;oN?zLsmIup*#2Co@{*deW|r+lSEp
znYF9-Bjm=DXd41h4gH>PlX(|=M%IFeE%JH66D{6_mKBBKk?=wd_S+QJ)@S8VR4cI+
zLoT(q(I35I4WX9rcgq8Zw9MI!7S;k|D-KXYvEU&x&%BOZBTC}tyhj`mZ)?#1qIFyQ
z){%tDl^6$CK1<t04xkQA<wE$F<x6?Ph{a0r`u*|@#KCgIa@=ynI-Npr$WjYcZ|9Ls
ztNdYfg!`nr+@anThr0OwLG|`~^{<S7-AkYHca;b?weo_$`x+`yhe7xMu@aeT#g2OC
zN2)^@j3{-e@c*I?eY#z#Lm?miU(}&#Q@56PMlp!Zm2aJ-D<`87Lg>a=GJP+<$0)LH
z2rkcMKZ-q?zwW}L$d3LfcJz9;86t9`=8FpZ+zUoSsk8XxOH4SQe1XO{8rjLptk9--
zQ1*hLvs_d(o((47Fyy4&R&5~?p*l~r43+m;$%D=GUyv2(`=j7$WXfDnSY3{je{ZV!
z@`#v<zVSaO_fu-dqONtY)v@e*&S~xWq*C=ZSc+Wb)J{A^UrDQ+{QWU|fQchlR9_sK
zw~#hXi2D?cb=KAgjYh5&toD{TTBT<LZ{zHqFN?V?2GfnU_GHU03PeO`h8}xHJKn;?
zW~$k8Jl8pQiVhmm^F(JTn;%(=F6&(tlttBpFHhv%R!&D3waT~h_OB_^?PGQm#_UJa
zwS3GzP6s7f7_(znFD_m=n>Pz5TQ5zDv`(@m-pWg=^zPVGO_wM4mq+XDz%8*^03WUQ
z{}~B5u2xRF?u6iSoGDjvA6Wy{15~#AYo{J9k&Kv1k!Kyo`m$?ZJ9)Yzrj(8ykd9}p
zx$lA1v%<+oOrWm;6;6X#>$^Dpp=X2cVza8AneU38z0q1>GJbEtHf#qqAeaf|__7X%
zKYX$a({*&y^yHWLOwHJrXr{*b>`%4{1Gey(Q+stF?&Z8L_JE7A*TpGF_I=mIF<x-k
zVfVOvjb3hFgPwWc5PhA3n?*3w4Kdgc@t`y4(Bx<ND!bY#`zHwRRWKD)b@kQAmArA#
z3sOE{8{2$C?5gg5ksZFl<8bwc*bc2@^FKuWV8q+fY&gyQxzU-*geZo`C_JWG&qA_i
zAJ!v^)E1!}O`_{Np=D(it?5x)`^q0;PdHS9ml2l#da|;Rwy?-2D;pZCeR|NW=C_&8
zO)<a~Ybv$%>St59Aewd)_j#<xyccwdr-$N7+I`UefN8E%m)5fNH%0xE7a-h7y2x&{
zKaXJ>E_20H-KlEMScO&y{Fm@l=JSqVi+SF-tGF%`d%pR3xN0&bJ?Y=PqX?Ku@3I!R
z#12eTC${U{mJR}66*Fe!YH{{F<ohL^u^T>jsV4UcQT6*I?4|kY2NqF>xxG!RSbUv0
z(Fvzf*~hoV4qYfQF$vmCPRrqPVlLu|8G?Zum0DDtFW`w82d;3A1C@&c({ReQNyi|!
zC>o~NNWY{@Ry|27ZO#P{YU@YVX<vLFam_BP!ySec>C4CQ(5_0rcT-3B1=zWAR#Z9H
zX3Ruy(u`xW)HQsz7$*;l`Hk4h0N7IEdxB3}xx+2&e>_bGXiuZf`}+g5|B%gF<niL4
z2%V)2T6ys<Gl{BKo*CA%eTwT5lb67QZ~URg*?8+y6~9-GidOGC;$ssLM7#KjFUzD+
zjLKo}Ih8J}ntPERZ+D#h!bJ2k*D@1zk>Me2!;(9Uo9>9+%w-Ysq1HB-!9<g8M&4M?
zTn<G$DsN-vrFPai%gSnSl2z-zvsBdVWlwS8ZK7i<H(lYIx$+z~mZL`U3zc#5+Is83
z1KjaTwTGteA>Yw9h<TIQ7k9-Lbl)=#N6@L#!H6a(U9Ib8;9lm#UZqUDCw4OHl_MFA
z3keka*>=`KW|8*OFEN9r97X0^TvvSqibDrw6)9cEG&e;B_0S()Q;+WlP;)(L=Ph*j
zjkKJmPP#DO(wFbW9TKRjX7Ak-kG6t2E`rkL^Z`5c0=+Y!nq}P=`*la|e1IfF&+0xb
z7U^LbcaD@f?#TTV29%o@?~6-Z<34TDO~*aau{H*KPu+uU|5J2sKL5@Gx-6RQ{}X2j
zFEQ$yvnzj!Eu8eF;Y@cyY-^s*du33YZ~Yh&qfz{Gf*`t32@!H@>~%Egj+=X7WW5Gr
zunKBn?5UB{h3xQc!S>D>P6Hu7*U;5P`x7SbglLra^<MkF-fUxzL@BYHv31t&;!MtE
zBl>!Ki$6l6;E5zj2!}Q69F!BZZ`P&o7)Sak^?!$d%I4o+$ZtB%{Lo9OcflD9Hi{s}
zcI9PkmM^7#45FRrB*;2#Rs`9$H(A$ueu#8Ty||l2yEQ9jktd~m^QbCGcn`1!kP3(b
z1OtWwCIaZEJ}C)$z||8nzTvDSv;xrY{`d0x4;ybd@OVHfAQP|#@D^Y@U?1QT_>SSN
z0gOK@nS}*#Xc=G)pby|M3_1Z$+8kU*IOz0ig+S2n(07t>8gK=0AK-dg5)6P~fC-TD
z0|J5f3cy;xTYwzUD)9aZa2?=!29Y{rmV`ijj0emGECD<Zcok3pH~=^ccoLSsIwc83
zfcF3|0G0rz0tNuO1H1q(fLq^6!a2YJz-~Z3U@agO5Cs?m@B?@OelsIR=KvLe1&GNf
zcozU(1-t-Q23Q365N7!Zgb6Sep+A5({dVEID^kh}@GAmJzfACM1{eS%0Q~?@0$Kvp
zfLa9dJV1>A^d<}c!R{aBcMY;d`3=VRza8*=P563WPu+^2#=9@P&}~6s#=g(rXtnqf
zi&RU|tXM6rH;b@JAP9N_pWepLS{#4FbaF<0oy*+Ew;r7NM$WSztT^VYk=|ai`^Ur3
z6VmAS-sDjg1Adu&@8{n}{(5N08~QH~KePAqj%(_64C>SV#h8Gp=8w+4o%7D*j%-Yy
zXD;4P9TE7dG{D-gX5qz4@2$A_QcSkluxDfQPX0mq>Sy2Ie{<5AS=BFg|LXJqT=8tV
zw4~zt!pAnml~yixOJ^^emd}`a^w!g3FXokeZ~64b^=AfW?Yr20bGfqx-7x$D9!#J}
z2ygx|>Q(>oJ+|h4qb@eyl!8og@BbKoz~|tBon>O1BNa7}QoQNX6SE+&Yog@NibYA!
zB1I`>*0Rv|rajd@ckkj^U!M+$teIEdBk*d{=eqUx2ZUYC%GyB6UAT256=W!m1Z9Q_
z)QzDeEbb#`1hrH|%l9<lDgVe`CL1S7)5a8gm;~B7LRJD_4;5-(2^ETW0$vUkDp{xy
zxjs}dy@B_up+Z{fyr{)7iAlXu(}dzK5kd>t2>?(lSlosECQ0qg#pgqT$zGD1`EQ#9
zqFn_)xvR%_VLQ<9E&SY=H+pjuyuc(7&9AF$*MzWCI@ooLE~#$-Zf+ERBF4gUA$0px
zTEYZ9-s=G5aV;WF0jEF~w=oH|&mdrUo1Q};A2SJs%kj=?9H7D`0W`e}KG4c-0SsI}
zI#j532qD~V2$1eVW5+VzF$qKyyUDQ&M9LJ~?XoADOP*>|Hx}Pq8n4dl#&$QC`lz>e
zV^^9>-G^4gk^zo~E?T6IPh1q2rjLzV6qg<s3!1B6gn(_WLO4+pljiGV^s$Mlar4rX
zQ<o3a3xb~?o2ZdSxGV!7^#H0e+1nbaUz-EKsiaJdONv<xd&FDm$9~gDy(WtOvRP8b
z;yG|Cjm$hi!*(=bN=j@D_a`GMF)1xQ#ug;KAI!aA9-BNTgIMBVX%uKwY~W{-v(%@1
z3UD9bfxV1Dz4|}{9B>Sdh0#e#$$IW^T&jKv?uGSdUpY&i)W!bnH)pA%b2R2P#)0oV
z^K_90_37OmeOREOsq-@y$0emlq^2gPPD+nSrEtO9DKMv?(xtLgQ{eq`E>gd+WuW&2
zZbD(82`DNIDLqgK9B}=6CQd5^FE7EUNX6i>m0%XsLh91|Dhz#5f$zCUM#-y3gwUJK
zY9U>7iNt3O97Xk*>MC_@H8~)Hm%0SJ$urPj1l?sV@HR4jz*TB9mu_uU0jD3AC=QQG
z@H+k`#?4DkjZM=BE<+a{W)#umIkJ7l9i_Tng`?PuN&fb8lZ;`L5*KGILe|9U=cUG^
zC6IxfK|V+(XE65cxg;(%EipOCAx9`fvU<ve=lwU>3vN=ocKN`m&?)vGz#~0yYfp9n
z=4OSiMCu&)DaGL>w)5HTH8p<&X4s!74CrM~kbmO;5WJMb361&94FPNF!7iJHO^q%5
zEk7MOArJm8LPudn?Wnbpd*;8l@Z<mBARQDX2M6?iv=kuK5j+JP`QiWHhL{e)kcCZ-
z7XE?X+s0r1i2QxPZzd1w9?`-On+JY@_89+DlG8P{R3@hXJwL@?5R^jqgw4Vl2MhmH
zsAk&&RP>1ab8P(927dVePae=FNQ$AC(H`S};x7X~iH}hZ{2={p7JtnqxJ#|uMQ=9=
znE*x972;difoA9<_N=?qMzapiQ6*-B7fRl`?Z9Zn>W7eVYW@PrJE02H_Ml#Ye~;n4
zC~<CTOzQF|i2dYwQPf3<k57!6HzzGUmHG*Sh#g-Y!8aBBB>5l0zc?M7!Qi9T;sy9d
z5{eZkO5UDPpkkAduoXaRK)CO0N-HVI^CKAH{EDy%ZxWq!xweWu<so^tjzeRZ9-|*R
zL?5Vl$G&JKwfDRUUSIHz1(0;(IQvg4>3vND<2rB2lYP@pa%P{jmbyx(u#>De`?0mu
z!}jUsA$9A^sc--ymsd^&KV)-Q!S4a5Hdb~e(L)Nex$-eS%?j7@Ca$zVT2Yl(%w3z{
zZZ;e&4Lqr!860rZ*f-4qr-hV$4tTsu=wlBW490??lLLbmxMLtlu1I^{^^{sme@(2`
zA;O>tp%<*L1km_Y!9Tz!IiuhtpdImlv5T!GZ&uk_5?M%l>9NrY<IX0GF7Tg<p<-?V
zPI;){JMih~@OE;zE&HUs)Joz!>}Y$bx9#)K_EJ!SVl&8Az!e-j<QuuXs0scv@bL~l
zUjshI0k5#(jz!8_sve9T$?Riq6eRicqPH~2_UYR}>Y;vl2piu)GTIZ@+(GhmK7*Zv
z9pLy`_GSlZkc)^te0rdUq3ov)(m?mZ`zBzrG$4tP!a8)6`nP%+Y}E6A8*i$mdxx_4
zj#8(I3jLhT{3_m*h<j~sd^Sjj{M+ai-!TcMyCy+Tzh_(mT=dWAd-c+<^mA#5+{uno
zpB}@9$x@*QqE4Bhn4)JACkute=~38afr`$2eWV~3=p(s3DXg_w%SWH3E37H_2f(S?
z|HYZKMTzs`q87(3o|i!4MPrgvV-<Kw$SC+$wiljs9tGp>4|OIzRSC_A`I7HA21Xw+
zrXcJjQyg(W2Yep-rc}5U^Yu+|(k1W7lJrs!y<2Dmmt*bmri}5yn{uQ#-YB^OE7MEC
zo%~*xyIYZ<QUWZ&oBH6-;tjXJ%{ux@9eXQ$+d(H`r?|2L0Viqv2Ot2Dly>N|w8d%c
z;(V#CbOX#@EX!Bw=I1?J?ssw$_=X~)RAfp0H-$z?Xjbkk={=`|y9=n41tc>#zUNP0
zX_rIQ|G1mfIb!sv2!Rra`r`Cf@EQ1~a4POLlmiSPqUI*f$BVZP8(_a9bN7>$s@sfa
zFZf9VT?UMn<@%V>?3ka_#$^R?N;u%Z`AOYfHUlT8KN-EJlfU%3lX~Phb|65~Pw2x7
zT58NvTh_w&adQ5520MkWcWOpj`n=x3u_4CTxZt?p0mhI4u`zw(f`WpLL2>c1^I}8h
z#rByuFK}LPzkUM-FrN{UuWlP0iG<}fNGBRAu!}t<lUXx9LNEd2tq$JGj}lYRnS|i^
za`s;U8UlDc5yPT58kXpVWw1+4;X}r+4WmUGzSHn^EqEU?d}Xink}_I-3qxuZui{PJ
zg=^zkyWUbe=W?3|6WEa6Qs;Kdo{*b$3*M+$4Pn;wVo&#$dX3o+I@O-0=0&|4_eS`@
z5TiITQZA%T`8B=S_1;o<vuTli8X~YXR2c9~gb)MwNxKC#?bXY$rbBPwR6P~^C*YJ;
zlrBmaMQ;fe^s7P<IE;=R=z*(4g_P$p+FlddG+XumW4_)qO8(|z#9}&pdm7+t^OdR|
zRaQ#<!ejPWRO`cd|IBY<gb;3y5JrP%C`28}jOgr#hqe(Np)3ZUfVYi4hI`}~4eC3g
z*Mt#k8m}AMCdfsI3OkM}3kpuH0o8d0@6MhYEOlnVVUl5}hyZqi840OTaWSzNJ*UK^
zrp3ucZ=gOH<{oylrKySO4Q7!OSyHexci<xMQ1UOsn~KYGHvC1rso1_|!{5c5vh!0L
z{lLUME`24FYEQyIX_*Si*n2YjX^=Dxecy&e`w>FT0Q~O~r}`sIh`^jcz!Xs=fCk!?
zfOYR+)&_6=c6@*GXmBGFSDMGdt@q&~Nf9Ct{*Db7c7*b7Cs4uEKTN0`7$)cf!-T@1
zFd=$qm{1!UCS*o{Habkm9~&kFMurK+lfs0^X<^XBkMG%Gf(dR^0#fFN3F`vD>ko*B
zeMANWa1)oXaG(EB#*t(w3JS<%&Qpw7DL|!RF1pkU6O-A<eo_bZ^l5wI`$=k%y&NPx
zi8LKGO-_E2O;mdod;-1=4mi~`D&LCv3;3p5r{KBx)&u@4;i#6SV|#N<YHG}KUR?E2
z5yC{cvk@^Q_Z6H0r&_JxF-^?p0q+m<ruFTS!sFs7t&LI#^I?Qy3|!lc+DR>WBxFqz
z-cInP2i}z#5yBF@>8cwFrGoDQPNDo?g~BlqBc%4`r{hwSd722(vmyk_5FeZO3jRE3
z0|5&DEWSe>@c-bOf~%O*{SMSWP;eR{bZde?uHaPRv`rWYZ(xAACvcNu0q<=9M-Qp@
zO|6~c;g|S!3_uxh#{dvcQjz!<QjE(1BW(o2D*%ob2v;nS`8NRKf23@0lHfDuB`2lF
zEu&%NrP&d}WH=KDpjz?&B0pKr$ED_T;n?&!a&G>HZ&d#VycCH^g-J305;zs6|4m%j
zM~_P`=5z3gDpM4IvPHqE%ur88!HxK)QL}>Y$G0Q@+fDEtz<WFJzh*OUl1%Jigw&yX
zVYJ-2q^=;UlTZPiuK^@ud>uv8&X@{Dnpa1&eIul<9mSXk-tbJ~jaWFQC1d0GOf2kz
z=fMbRs7n%fn#=fzky5`-)o_y<B$86pXeszod{g9L@5PZ)pAHIr1!y!Wq2N^3eb|3S
zV*CWwcB7=Oy<+D&1|uS=aWG`>wvaXM3`>F?b<te*>L{tBx@s=lO>ek$dX#j8m5!FW
zF-DIoqoon%z@I{4$v&qac`;NVT6C;DH=K#@bpYGkFz2NQ%7ai0y7D7DpZEZqZFZ~i
zT}w1HaZOi7YJcW-A8+U$>Odf3mCds0652|DVwpUkpYpC=86l(q_eVF8C-X`+b%-={
zad;eNH#n#K;QZ*m>a6z8&pKZ;d%$;rg__C2YY5Em@@fgKm?%Jg6QnIlo<DHlhz#^P
z!c(zaG*Ay|0DoGsl2~c5))*2TGB19>ynb{0&h6W`KP&7hd9}R+^Eq&P6Uv4!-Xk&=
zEgBJnwFFi-MDhun6)*QtAEn2f1Kx-Am}d@^x~Ple*>giNt8*1h9oQE`r66_ie0F`P
zG(ww!9y<+{ZEFN<+Ayh$`(_X+JW6-|d6qX!3TjmaGI}z?d0Q|4>U?%`nAFL|J3%g9
zfeGxvFsYw<b^_~XlAiAKCFqpwXYnRKlu?5|F-@P8oUTvJNW$95{D$muO=Lfr;9fwY
z?4Bu+wG5S}x>$hoFeb93P^qg~2^P;bxLXW!@@E!+YOH2K;~xCq@#le;1`q=tk^fbh
z-z+3NqJ>Xv9&CC<ev)HU*2@2pAC+H;@gbXqx_`7_=RaZ#kl(^bOQB;n_oqAXtD`~u
zyCgjeGYqmD20wntBPvOS&4&vnyeW3;G{dn20wTnQ3x9@kJlKXuv#hbwAa&6~c3>>l
zP(bA+B-7J`MY?%Q<W;V?q*$Af)hw0ARhZi2jevp|!(Kmtg70mDcWc5w0ywqx3jY}3
z?J$SmKo}<z8t_R?aGL9dg$DB|;3nYoqj(c!_8<P2#+e$I`5B44>vVOIJo*?1Uh2qA
zO=QoGkPO;pYE^U587Zrw0;_tsOi36g8T?F(BZNfoYzH_46r9Q;C5JLM!M2Z+yoObP
zn>q~CDp0=tw{5r6c*%GCeK-;c%kSA7!HfS8f1&UMGTZheoF?PxN8beN7B)7|e4C|?
zmqxU#ggxEK;X*Co*z@ejcxkBlev&-dIt2Dw02G|M2aY&J(-DscPOYcHpNwznlqonh
z5j4D1@Kk*JHo-?xNl+Lt!OwGgAbeJ6)R%R1gxU=%PKx<w_;z&k1>n>ZRLpbnO}XHR
zQyWD+E}6#Eky5KpiurS(2Q--B&;h=w%W^-7^^24Sc3PAo&jR%UjmFUmPHxILdpS}X
zKU<+c4th%mz9;cbeJ;hE!s`Y|$w*pGeT!!t%sL_`soSFP8iBXrI2$@adbU&gQxUvp
zxC3vh1s~(x3GZ+5c9;3iPmsnBSL`2zeM$=j@2Hl$wF=%DIN4Wl18|D_q7;@iQCgzL
z``3w5FM79`Bn|M6LZO#OCKI8+u?INk0%$g2Vj5d8NqSO^_mN3bzgC-3#I^!<0Ez&m
zNv!2$X@S`%6-^Sr3or)Y4HyX^S`eTYV7Lu8;5`7)9WWFy9zc8qzJR`fisvJQCv3EC
zcn<=M1DHJQ>r}#rCIvU}WYdE{L=8rB)aB5hLjCx_q;!8+`zca~x#2J*8Sw<(l-84M
z?~%6m<F@xS+k2+%{XQ0wkc>ina_ZukbiT8JPuwX($rCW6l#5)(UY{b3{7Z+Xc8V0(
zM;TWxK?XXGGnWDH56ewD+}yG04|8m~<fmS<gteRT5W|!iQlMFp(id&PQgAEqo;;ZH
z2$*C64HXpgdVD)dc@;uNvOqB>oT{aQtAUSnz?;eZkqrz)aJ108iG`!EOzEaLScz{6
zV3VX^KI5c;e@WD6q(cWK2NG;9DfoHdy&v8ZATzqM^V2Y-Qf3)xCV)hVg1-U$A;A!6
z7SjWKRCH>6Fv|m6XTu{q$hcx2*}gFz=-n94Y!_y3<X~~z#tiFh9w-hLHt}Fx69)sE
z@JHI*;~7i=w(%=?N=LKop+YFOg*Xt*6sziXvblmsV#d=k1@ty^C4iM3k%rfY^VWn?
zNC$j$@`%Oh_|9)0)-X^JG?do(u^mxTw?U86fxrLs!#nT~Ef>>gNrPuQPB<6e87>6g
z9WF#8aD_L93;I8X3+n*F&EY}{pc)W)Yq(Gh2)qp*Kp?KU$Oi<%Za(Z*!mbH+Gw*@s
z!miJfI+>M8>}nJjY8@O)tsWyJN1UdMi8gkHES`#i7rJ1w5Tc5Pc8<J%XLpUwZl!Ej
zqgZBd%$A0z53gWnXG`ryo8SwLw|d5;El-+<Nj;47^Z*xx5CP?8b8Kcx42Vv@!8X2X
z2)n--n|+)owe_$y83|yY4{LV--TtPsO_zK|CB!5p#Vw*~0a!=@^QZ8TD%gM9qpF`O
z`SwyadL3>iH^PoM2^+_xtk$!qqokqJnhstaC!15&Vovu3lx@8K+W`H0j?|&8GX0;>
zTpmd)_&L@gTI%gyh}8j-q6+yun-wkf=wAzR=l?|-9E_H5IZ7tG5-qhGU)=@s%3Tq5
zKqMdqkPoQ!3v1Z$H4{U>U77NjW`1tt_h&YGfS&Jwn;0XF|BIa68G}hwWs;mqh8sd1
z0f(rPEA+ddI|HY-8=npI2R6FG=j0^wDL8f6$)19{HNo9w+}yy>rU^s4CV0mtc&8?K
z*Cu%PCU~zVcpr`j+e6r|3B$l9_|OKNJ(!DmqvJWO<2<QNJ7xc!O2exm;w=B><9;<V
zSF%P$6S)q*8yojLJ5Oq<>T@Yuo?*CxH%glDJKmIZck$NXt<I6nHFy)Q%V7s%rD1=`
zPuDofppML8ed46q=1MS=V`prZF5pdLolCa&WxNp~;VRy|*|WX>z#H{XxQjOh!fBQ4
zjtk!8c`MsH66Onmw?(9)@NUwF>(Pjy^x@XR@?ZOKtb4rFeNge1u!faDT_tw-I^g<z
z)CSOMVL$S1)CNE%fW9GQ*-P<~(flawO%zJ;Lne$GEjK!f4Q1SzmLAJjoKs?w60uB^
zG#@h0&%cpS>GTMT%n|dY&Yg}?FBmCy5!pdatRwErarVM|sh8g)FI`v9m%P=9tJ#D3
zm^e7RTF$pXW1pblzWw?S2#J|HFE%co_JUF4PkEgm0qx+0_J&*8KMo^ag!9iJS@EO%
z=KSh#zL!j~UpzjXo702JwCS^OK`sB->ICUd??wsp2<dV#QR?7~%j5ZS&Q|tIqSVj)
zsL`ikPLo|}OX9G3oo_(FfjzzfY#16z148=f0h8oy0b3SeInM6|c3^=tbeP`@5qx2#
z7&%9>^3h$B9UHU|(L4-C#=^26i&-cIo5#j1PtK4xF;7liJ|Z=F@o3wg=7Ea1Py~qb
zHhpZbDJB*!L~p|Wf!D$XM|!0@w!gPRjcMJOo^l)Oo^|M++(p|0cS2kd6w2e;4XAP(
z;Sd~j+&38g5thdZc7`{U)Hql$u!~8O7mHXV_3xrtE2oQ+6H0AKrBxcZ9R+hw_Sz!p
zarU1@l8>{H1Hx<=ygE&KtlhkfR48Myv0jA<Re}cqXYPf{h0R+m4QHP$mWHthizPp2
zL7x{P9JE;<g>};y>VgPXP-*<EL%Pw7)PI{hFD0S<^?H%*OTxAa#j!E$$0TW{X7h{k
zY7he4flW!4`n!9+6u}2~bughBkdN4#AUi9l3;Quy@@d$TsH8|-(h{B|`(c~r3g$xu
z2jQ)x9P>_*+VxT}#TM<dOioj_SvFfI`)EW9tcP88-zfR9sVPz?4Dq61Na;s2$HDma
z!~0tR1rh1Oe`LX%6{biYAq8Ne{#qND`QzQx=fvbFWKUW$ZNRz&UYbxU0B^fJCsL$Z
z)t-t}DM&R#akvvk(=EWEOnE=VHAE?qua}MjFU>{J-9$7qqu|smlT_q5n~*Mb4%h%z
zVo?U`3hO)+Lu#VnCaMsg7`ij-9Ld|c3O3rpWGDLq4)}^2<&aaN(2x2tde9WMADJpc
zn&UnSq^U4c$O-JJ49U~nG!`i_=?QYVJ^~BmW`86A%}Vv^71c|jorEX8pegtr;KZZg
z_kh!oT*0ZoM4d?m_fT-N&68(Ape#}t%)n`gt>7Dg(=?ZYuWf?A-h}^96Z6lT;Dt7R
zwql9o-Bxim5TcLDl7bIlA1{$wYpOehW3mbtK<Y<Go>3{uiD}76QOQa3;wYg!nA{<L
z3-)MYj(#L^2&xU?92B1KL8I)apTbj#V>|?$hxJ@48M!xX;Zn(6+6~9MvaF?2P=}@&
zm7cg*_J0$yi5*=k`Lr&q3TqhXSL3_z`!IHIDUPHqT_&~0Ern8ZX>Q#7#3c6gGO16i
z8?Z<Pui0yIpUCw!c3_#*Mtx%=JH1RA?l~6pAedi5ZSI8kr+{|MeKpC&<x*#}Lf?$?
zK?PO8Y3F2L;87XRtgM9_NNM2)-c*kio+02F0{q&+FB)j&ppidwmt!YSVp43}GCi#-
zq44XI<MnfsGm>J{l-+|tuSYEA(~SB>i8wMeH!gi?TwIbq4Z=2gehlo>bS5$?DLoBs
zk!@?@WW31(Wvwd4&LumK-QNoD8t{@hP*R;0FPFTfU7-51i_4|n{#Ja_0@a^*(<pi{
z7QSK@$HflCcOm*fWSM%8-Px?CrAg)iI0iEwB$xDrRP1Kbck71jOw`+oi`B=Z>s{8t
zoD%Uhyve!4s24~N+I7Pd&au%lp~0e`(t)Y;XpC2X2>f5@1OcJ}C>B8ty`vNmD#>sM
zTEr$6b-+!4d_b`WYx#`Sz167AvaqoSh>dwh8rZ4`0i@Pdp|9A?UVTRDrz;0P$=rs7
zJN1kd&`WqTLcm}|n2!{pi5V&j^izbMzNfx{HW|7^S6~D}Ba9VNH~TK)3}8J!fJ?n#
z^EQBbDGF|elT>vTJd<#~iJqNbA-RMo^ru00v`1rlYDN_E&w=Y5@bW#rE2U@^%Y9b*
zk`+fwdTbQ3ZEF*r%a@19)4@+}D)=INlYmz6r}0f;Q}E}Tn7<61+DpZp;hW~r6?~GT
zIW<9HHU=Ibrpc5%bOBrC6y6IX@|zp^$IBb=gcO)|0W}kqu`}K@k*m=BAoQBa{hicI
z3FE~5TiJ)1(g-iZ+j5!gi8s|7rQwr()n`c>DFH@ZSkEk}zh2?a2Z<y%H^SS51f7XD
zx3y<;mNZ?}#iKwTBv1vq3VzCfA^<fJ4LEC?Erm^32UaY}G>})~n<|RJwhrGkA*|pV
z@J(r_;IB5p53wEDQtwd1yK>ekY{$Xo=<G@0B+V7`YJB@U;Fnp49I3Nr1Dv7Wn4Bch
zIg+b$5lF;2k!9paJ#>i}v5W$m3VBccH_ka+5#E09$-$spqyB<|pThSr2mD8TQzc(4
z#9$>b318fu7V<dY1-R0c^;{+O4=u(gHN@1)a5CQ1nWW;S;H{A(V;yknQc{x1&b$j}
zg1hMxVjy~PVlIAB@>0mC#Pl>hPDIXI=prbhD)xQ3j}wIv@-P5}s157-ywuWj6O5>s
z%>Yn0fa7fR^EkMo7*Vf+0wo(Qe_raZcHPE4d0y(SF>RBNgpz|EtoC`yLs|rqA9G$U
z_15uESZoOgD92>3$*U#3R0XbJwtTfT&CUA*xzo-`dwyIkbyGPjRs1>TW|5x39jq3M
zG|a49kBLTr5fBEL1ega{0$2ms2zUoj1UL*h4!8uk1JJyTjxN9-@C0BrARn*?PztC3
zoCf>~_!H3L6$n#6SHM8P@K++b3A6CA5bz9OJ>WgS$AB`xDZmB5l~-8O3(^9W8~gqR
zggN%D2w@Rm1t1Tw8SpQ_7l31cvw)ugHvkU+nk{Io06u^KzyQE#z)V0QzzoO*yb5>=
z@IK%Zz!!k80H*;z0sa8o-x4uhaDn7&1Ly)600;w&2h0S-15yAPfd6)saxGUf_MW~Y
zLWoArCZGXqjkoech6}~L{<5E$EnF-0XS>!)^Zqht)HP4)h<Z2bBQ_#Wiu#K&CWX6o
z`tG9$R4aM0u@&A59*OTk9A|g)q?wOCVS(9RFYktN8&vV^l!cu#aub-*3Ei>c7o|Vd
z72ywGB+{&tQq+MTv!~Z#?+xCctdq{VeDR4qnN{)$dv(1u`!CUPdKp8!9-p#aFH5QJ
z(?5$4-u*sYAieYnfMOO?FAi#%S&b43qbCtFp%c6NvNTntVaE5R$IN1<2qN;|g5@XX
z(+71yNSLkI1051?qM^V~F>}Q?iJ5IM+t$R4TEj@RHTz+<-)069|LH%E5H<nIFQHC1
z_-R_-)@@KZLbnK^Q+|}=D}d+NXk@PZ=o~S9n*gxGoHk0InNz+Mg-pOYKt7-lPz<O9
zR0C=O!YNVE0rY@CfC&%@hz6tpG6CxV`G7(|F`yDq4X6bO-@!gW4+sR90Fi*`??khZ
zf{#qVIzT?45Ks)L1XKfR0m5lG0MG+AUJ&_Orc<U<rXGnk7_o`MTaS0MYEc*t*bBG`
z&|egVj{&;@djb0a-F^~<-T(&J^3zZ-T|%e;gW>pOWZ%2ri^9K<apci<_}%;$QCJSg
zCr%2VbSL<gf3F>z7QS1%;rUOdZBA$5uVT(7@Q5h%qD`pa3WO_>T8#Y&H!P-xN63T=
zS?EB>w2Y)hi3{Tvk&}9O10Q=O;)r~VfrbDmViNDB_6iJ~7mpI90ggZjy}~9!ac)>B
zvA8y-nL~-HYfR+D)uRz@G`H;4ghoW~CbTfn^o?oUJwqefSni%*C$nP+#}0>GA)qlM
zw;b4r7RfCKH>PpE0gY&rIp5&MG|p!NO?U+<Gdh)$59RtZiI<FC9EToK{HB9Ooe3K)
zm1y~(ky0xgEp3@>UC``dLpMon%v5#Pp(@(UpMLu3*tt}<T|c))G&OymVKh&4LDz`(
zBoCN}BW<$G=LMREhXZye%Y1r;mc9sME_7vpr_c_YULY7i*rYf__>;1w&7j?f)a_*p
z^`>KT6_9bmGIHn?Xy@>@l`HC%35CaPd~#U}BHC5Z9LirXr=5s`ZW(kFY?i5~h+(<J
zH+A>2rBpfa|I^-=xYu-r@19IV1)&i!l+YkGb?tfHJ4g+sni`{~AP7Z5gBW*I5Un9J
zBnUkSqEdpWDKrS8(h7~5(u!Hp3N@r?-FNSkh~IOcd;fuZ&-3(IJ?rf3z1FwB;r-t4
zJBL+Gw%-TYoSvfua|5elZrJDcZXBgvjxbBPC!)10h)~vT!XBk;Tj}-TQsS9Xw$f{$
zTW-qLtzJ#)#!n5gf9W6#V>7R>>suh@vHels`1K)p0~1>38UxpdSSxmv;ysQC-wt+-
zSs1PP5RBF<*XbI=*1K+LnNUQID?^OWN%?P;SBK#l<?pS(v+iY$`IxiL$x(s;0DoDU
z5#k83-dDV~guMPd51;$ueMrS;7z6R%+5*(e;dAf<{N_!HbCs8OEs|L|FILX`mt?u-
zt!GCbbY-rw2UE7Cd(ll2@je9e6|eZaq4vG4wdT0)k(=gKt??+^L>yTdt;d#Pw3bi>
z|6f*l8IK<|v0k}xuFC@P-g;_S`B;j1>y?DDVh7z1**gf?>Q$}g3)jP~C&am?t%uiq
z;JO-$<Vbf-N38Rz*3P4YbuWi+`B>uK!G2g)`52F};vuE3KeNSD5>+|h=!eROqsOP>
z@-D9F(hNNORppvuUDNhme5Z7LeYw*$pSuB<Css}ulwWS`48IOz-P{sJS>;{o`EKoK
z@1YgOiqG5RzCO}=zTb7UwU%J4SX_kb^TJKI?e@y)g|2B^jv(19?zY!89f7O;ce-wt
zh0*%h(%1Wy4{J#dxIT|4ADtMj1(#r~xE(p{S{(M|pX*wCJVxtdOJyQmA6v)M{G{t+
zg3&?+z8EX+;ymoq!mPtCEzHCF5d3+?E9t!JT1yei%5Q0H_hRLA&=Gqf){|;ptDFvV
zP20k`Svft!HSM&H0+k4B9oD@w%BL;saiTg=F<(?U?_ct-Yu=KC<EU%hzDHf_4#N8o
zYrgyy_LfUoEXjr+wHKJR(W_dEn)rvj@QT1_JvOO)EUi(gTWPM#ZQXL#uAI+*JzuRR
zYAY2heC(RGRSxBr3c&{E*$=gpps|0by{g>0u8%EK?VaaZe?r~|DMMCy`Hu;3T|>%8
z2S$6JxYjz(ta|_Ry|pjP3ax8Wajyz5R)o!!;Mx$(SG-E`zGAh-u4QF8A^!TVY3ugh
z$L!Twn`ms2xp+ljv_*um;;%zpm$}TY3RsVFWs9ktZ$biHe;-pmhGDD_N~Y^NODO)$
zT$klGt^Bye^|5tO{$Pf!R|v+6r~4guDVn8!EnL%xK#q{|Y3QHc%5}U>jMm!Y%ijmK
z4z;D|!03tj63koM&c#@<wlvpmED`wQGV7IvvEt!{l~1YJrgHkFYuc7bY5BZ$Cc!6O
zuhqYu>u$anEABSX^|5UQ?^muNv2xm<xc;gHW5r+PxIVVTSCg-tzT=v<ePl@Gv|qlx
z1p65sE2l$T)0P{miAu0_Z%ZU&%ddt3wk+-LdUgax%UY7k$6SmRYsqq5Z%2h5mD9zQ
zx2fgqS2^!}(zO`NzDoyJ&a<w0`!*vgrz2ipUajUR*R*wB3tvxrH*rRnn{xSBg3(%>
zCH?%$>*_gUU7IPyXnk(o=cVg&OJa>@yKWPM(NdYx_{z(~AMHh3F0Ao_^5ej0i6rpL
z%FAM1mst{RyvX%&VfpC0*maq8=PcJ{wxd{5IbHn5baLgi_o+&OIZ>IdkUQ&|w{;-J
zHEr!U!ZmH14hq875<@Ure`TF+vg>2(*)7ssI|(ZvvoKnhCt<9({KD&pS8L&PU0(W4
z`JdsvbveOkU2Z+RQNioA)^o0NeV&W4V$EUYpIdsnzH)j-<)76m*-$y3;hMJtN_Cf$
zv7S=&`toZ2o66UWvEm`#KiP}0^?FO?H0zqSt>9bNv@NglY3O6U(oEOg0zvs#+%38C
z^IE>!D(7=u^Y$TTRZic3eR;K-J1eIHets>OTE4qo^On~ReLY{T-9eXJLoixe5{S`S
zU}=uaMP*^ESX9#MKl64ksg=?r)62g~@P$x^dLd;@Cb~a{UJiA{;y>R)>mjZedltX%
z80h6lePgaK<}xwod}HqMc`rvc=5o$d{;m53FGpchuorL4)x=y5=Im^u{295JLv|bK
zP~W&=+9hNJxFP$-+#$?$!Q8?(=6=VV6LW3enEMZNA(#t%V=nMA?iJ`|(KOos|1r}4
zw||T@#kt+9QNw;iN5_6VzI|lm#1VE98a6R{IQ}ne;`mW}&Tsen$F0d`&t6kT#}1F`
z9o^e5D_TEV)DiW?*b$xZoz{LSr+0WYNlDB03f$9Zrx)uMvDvNjh}e#<j+D@fUsCLc
z_Kr8^%b()-*Q00b*p5SEVkb=;(b4s-WJicQ{@%La^`fqM^u&)d4*h(@N0UGir4;S*
zYL!wa+lx+#-;H8G*e<VTeku0NqsM<9J$A&$lVW2g#dZu!iP_~9;{TKN$p_;nkDeGk
z-ukh_zC$OD9y%-~a~Dd?<FmcmrQ~FLrS4g=+pB@+yMEap*w$$M@W~LnbXs0T^hMIw
zJk$}>C)6^Xcic;lq;%NtH4p!Y@tz;|d);<7pL#hCT6|>rOZ2Sb2<}kv4v_`_WO7FH
z%J<%5t2m+>RKAayhtKhlidR5N6-T0#)0e-TPF(L<@eXCRjljQ_rz?Ne@y0|{#XF2)
zkM?vp<W;=e{Fv>}j%VZ8`Rr2G$$rZgvX|KFY!%LzYsoR(m)st%i1Xlw@{{<l_&vfT
zaezEl-XR~B&&XHhWy&^Xq#C16R^!#VYN~obt*tfG#%hzb>Dv3cr0e=3eU-jT|5<;k
z8%B)rg^_G*GJZ178@H{xQXnvdiLn6@$p>UGnN60ERb)FkOwJO2Du@cDzMz&;E2-U7
zKJ^b(g?^iUhYq4U(}U?KdJ;XKPNEOdXX$sC-poa|GpF(~{4_qE|B_GUH}ZS<ANi|%
zec?l4r0}^gRhTO*6m|)xg*(E(!dqfJ5&zzjsEZ$q=0I_ocu*`5FN@DaZ>hf2N-~vi
zl*3A?Qd@1KexUYKSE!HFgW3u0C+)oUr`AmWM4znh*Yos~`d|7|<DzlXu&T-F*hpI<
zkOAZlsY*AZC3+A&nx0B0(`)I2^a;8F(}5YnOk$QZZ?W~*Bz7H}&E~PbCP#5Sxc*!g
z#QdCV$hY9z^TYUYd>Vg{FXDp*S{N%N3pqlu5Fox3t4Ix`FlnN+LRu%4Nx||=B||x?
zTvjBtzdAzQp<Y)#wVGP6Hc$H=i@mD7(3<G&^=|q-z0`1oxW2phF&#^PO=m)OSLqkD
z8ORt+I5UP>%B*8{Fvpl*n7hnBOfbu{o!D;dOm+$T4O<7A(4G5&E8u?RYVnP*zzzIv
z{sR9mUsYHpqzU(hr-F~zRusjK;#6^?cwD?9)|FaImnD4lL?*JgQdfCLX`_6q3|H<c
zZLrW=DzAO6eW&G_+G)*CSM=Wc1pOD?+j!fUW_)dA8`k&!A|cX^<QVylJST0b52-QK
zcKSShjSgTMaP=XlKw+A&K=@9`6`l(XL?U(;M~P`-TS=F?OG~6x(sikaJWXCN|0Y*c
zC}qELT^XX9>Pr0wJ>9rq{9`yGzzkaKo<Dh?^q`JXFDQzRpcm3<P^&a%Cvyq1IKkd$
zpRzt&W6r?t?{e;Z6F!8W3-zim91*{e(r^?<r4s3t#L2tm7xFA+w{jD@L#y4?+3F?r
zJ#CKWt*_A;Lo~V>Lyc#a=Et~>!jpuUBnJxPPX$t$_!kCi(-WBgm?rFWwgnf)P37ir
zN!&i}JohK(&G+G#K<s<?!~7lo5#Lm3Ekt7X>B7&#UE#6dDb^L6hy%n3afE1!d&C^^
zuvjcU7k#AK(#O&eX|yz6S}kpqYRGNm2XZGRMhQ|WRa4E6p)?QFUfLjS4D2>hOVQTh
zNCxY%`f}ZbwPLmLNL(;XC*P1iNh)=adPRLoXVBU7QTjCfCq19}nkis*vN@~=SBq=G
z5iWwe!BywS^AGrEd~M;9&_*07PJ^B0h!4dVVk1eA95N?|$sa1?P3486t3B26>P$6B
zy{9^o(9MB|T_N{K4D}WDlycDZ=oa(@dON+3R+&!B0A>Ue%gn+<*D%|dgUm#B7P|n>
z>nHYCHk4by-QsHVAMq3U8T?{?4UXv%?=QS(`+*qYd*KNr<tsK7yNip(RPl&t-V*&`
z^Q_bn0*aFsNY&+fax=M=JV+iX7s+*%iHcKcr}k0@sdLmt>N@p1b))SGy!9G-9lf<4
zs^8Tg>vfHGP^oM1Yh{+iobYTI29VE44BXmRB#EpeTge~f3292TriN0VQK?iqb%wfZ
zQq}3Yv_gMCe+Hknhc2QW48?SXt4Lw8nG&Wp`yOksQ`lrSmwm`q<C<{&xLD4~o#FoA
zUU357o1e|^;!nZX`3vm?Ug#`*B=i!(g$N-*I3OGmeiv>E_k>cIXKgW1Y$dYdIB|+N
z1A9Lt^_7Py<|gHe@`v)5@}JT{?XHehm#VAPceHwXS9rPQh9e7KxyDYmlHKGKc|=~4
zHdy@y{IiyU^hfk{`X0TPn<&JI>C#!LSn`x<S(P8_H4I0ts};|kv?3ov#owbQ(97wq
z^kMo}`Z4Xz^umu7%;6XDYfXM9?<hpM2@lDjcS5C#=-=r(^dtHuU4`*w8ZbdjJ4R$a
zWCk-6nK?`(7sD;pR%;uz?b<%=sC^VywR_qV?UhzductS~k#Kq^_>(AX;0xVR;%YNE
zNY0QUR22Oe^Pa>=n$%hPL>eHCkj!Xlsx(JhB&EQPw@N=qg;J4xM-D+`yQt39m*^|?
z4f;;~uzuF+sVW7hgkdz9gi}3FUXhQe&#9Tze1s`)x*;7-8%%#D6Tg4<gq_OI;`i~_
z`S!v9;Va=AshZqbUMz2yAIr_)3Fj)yl(WhsWwD7`o0}sIH?2Z7p;}TR)rAVDqNq5k
z2jbjVdKP_zzDQSNg5jpSGCwed%t<)jw}hdBiMX&y*ex6q#)z@vEODi{LHthq9Z{mD
z6eztfiBgi3CGC}JD^t|v>UuR(%~6l5cU5n#uGUQJtPRmdYg09Ip7xE_Ltm?B=|}V;
z{g(b*_cMYG#TW%QoNid1zE%w*hL~glk+}|BG(UyED*P$D5UPrPVq>UOthiOo7w?Gm
zrDf7ueUt78bhCd6>=hBHe$;4c9<`0C1taF@)rf?5=r|nX_sm6x=M-*|$)$6J+#>!K
z?;&W=-ca!qF;QG6{wOl)X0<gS#2f&KD|)K&2w~REjtR9$4-!tY;D}yO4e4(5ASR04
z3hNK!263yn16(J50H1{TIbE0|97DvPEX7M}rCrh?>9OP{za_Vo1^H8XsQgH7tePQk
zJ8iXH`Z>KdEEro2akG`tn=}O^`IgkB9#PK`d{e~Tq6`PRQ@SLrlsCvNm66JFWwVm0
zoKb#L+Ny%uUQJVjw8Ppd%}uXvhuzuwSNc+Yh_TryHJ)4d4s)~g(b10#CDTX(IYG{t
z<Py0-%1AKPf$B{4#={=d@ywUZVdfO$##U$BBM5)OE@Q8-f3Qut*4%t<Dfcax%{}AX
z__ugJ{zG_x^}M?<M2Htw3LAt+!b_o}*h`E?6j&l&6Mf;_K9mMS0%_7FiI+p<PH?>a
z<VmuL{lApWh6=BQD^W@;fW%p)SkcsR>X&M=nxURRT&SnD)Y>C9jM5%yFSWLM2fe#K
zQqR>(^_oV2(FPGM7ML!>_z}MEzO};$H%AeMQDg$yLfk1IDg=Q$ii)Scq~4=L>5;UP
z{(&x`p8~c?Oh@LL$<$%nvSZmqb|t$H;PVcG$h+KFZW5s9a&9g619zFb4qsP~mvE|M
z`7eO(zUNQyXAuSe<GqDXg;79A76|!4I3=9N?!5s-I>5h&!y0}=1oV^w5O4-bGo_`_
zfm6~spn`CDqkK^QTlQDX=E@Z1E9H=qk8`}N+*KaK+ly+HI#E3cFcq$y)3BWwH%AVJ
zVPqaO;%Cx{noI4c@~D&4ukeHoq1iHEX>WQ39R(+~n%T%?vKQG`Y!~h-LigWr)B_QY
zuJV84plS;5!c9-I&DSYBFok~vFZkwq;=AJeVurX=`~~3YAJI#y2^&_V{_s)bfM!-p
zN98s+Dpl#E3{<8o3zVfwnv$;ktZdM3YY(+&ny21Np9^(kj9EsavDip8b{GZLk;J>%
z;It}iW*CVg6Ui6kOY)GsAZ}E3%4De|Y8B<AzJ)m*!@nC$!$+T@&(N1?AI6_)&b*H>
zyP5fp*~65w|Kf0JaGm*2_<npOyudvyJquC&h<IAOi6w8B4oHWkpQV4L_he1}PChEP
zP>AxOGC&!tOoMj4P{I)CO~jbB>UK3({Y`sd0;4{*Tx*h>ouBwn4JZMYaGhdkjqZpb
zlSFT(m-F8M({Jbh=GO?D1ru=ntk_bbq<vDfx<vg!y`t9A+G?uSP5TsHElyj62ytI~
z3YD#*pVw;{os1dAS1$8*y4g*BHAp@34rxiuHe@7X^kfoG<|0lVCk5nJa+#D82b?iQ
z@i5DtaK>LyiPSPGh1y8ngo(P-wdht@+%I%vIA$w6^=G2t^=Gj2*oEv0b~~HT7O|gm
zhq!$1XYK;`kn`bR@IFF-5G-63Mu^GMG5Nea0-DE~wrAc6-+V$nt=83=Xe~6N_0-a|
zYg!w`udVu@x@dfF+(0OHb0k1e!>Qx=hpm65N~q^lJ^EdmLaGr;cc&-QTj*VMYqkpj
z`w#5f{JZ@70IC^4$=?VUVHfX-iWnk(1ULPz)K-dwH~2yNPcpm7wUo}v7-glh0m;N}
z<+M_!Q0i3GsTKmgUQzF>t+gcWk?v-UwUjB>%|d97R^%giu!UqPSxder(bQCG4z-EO
zqMlK1u!K+O6nY(fn|???r#+cFOa$CleNN>@bJMwaZV`8%V_?S3g*DPaQ~C|+GEUx!
z!1#~+pIlvOr1XG08V7}$uN+gpR@bP_w7%LDZLOApgkir%08I|*zv_Z<2+5bD(9Oaq
zjsQXs;j2>XkSWS^Cwd&c3OUXW;E7V&ovF(BF@a29CW0BuOlIN%>&F8#9%p}N%~{+o
zoY8nV(X;$>zKYNmE@iAR0ih!c@acq5B$NnkMFE-3N8&c|sn`oR!6A=VW<p+*)gtwG
z^@-XJs@GoYp$*kcZJ~Bay9;Birnl4uJxu>p|4!edpVlAfO$@{GktJ@93s`V{@-7J`
z!%Q+37C8fO;s7$8Q{)`tL2arbWx+&3jiM4D)T`K2E!v=mAm?35e@p*pi?$^b%ETaP
z+sB+{ULj}bj5zTFdy)<0T5+Fq$=qS?66fG|@F%gYmI&8f#WCUv@dx<C8=?amAWBoD
z*^;>k5$(M6Olm9#%f01Y2nzopt)$eU>S%QV(C#Vqs_L$B$YQ?M0wMZddW3H3EA-pC
zuMud38U2iL#%kk|an*2?y4k4L4cXK_c*$FYg6(`wWl+`VmUIUk2g{scE(6jw#8L;a
z%b}>zCJ2U>JOxlO+s@oG_=`a7&v;KE33|Il*e+ZX{z87^EjAK^k=tw+_aRYtv+<h+
z*=|b@rRM;i&E!5<d`q|+L+KBA<%B99R(@1?HAMYFU8o*Y&!|msOp~=G+7YdhE&^GM
z&}ZxBe0_`F))0){#t+6Z<FxVA(sGc)R$kbcbSHhu2prBTkP^QG?=``0c2Z60M0z!|
z0r~RJ%mt<~%dq2M`yIIi?lDlUAcP8GLLDr)k2n+yE<oDeMCvJJO8M}OPo&z&FeE5?
zU1f>#$b|nsjP*>=bF2sZy4%pn4{&=TwG3&fn~nQ=AnUo0NV%Q+37G$gkO?WQmOhcc
zk+YC;Hc^Iv0l1_-S81r<Q_WxRqYu%i=?VH`W4-Z*b>BdDM<RyWq#?MKV)%Y9stqL}
zG@BlX$;otc<p2HHNvz4PVI@xFJMf*6LiGd8yeNznYf0^;UQ)O;9HD5sv<CX`4Q=Tz
zFO<KQSIK$uDfuSM*8_fpQ9FP!ISj4oW;@@e`g?k~K1|=JXBc;l$AEC|j$|x^A_@?~
zbh5*Q-XA8n5syBlA`yhL5r$4se^P#QW8_311OFxh0oP$nCXM-(dB8M-pi|kk>@oH#
zdmH)CQf@U@llSL?zz1~WSMW~$7|#I@WC-VkGJyvQT3|=j_R?l4TdE53>Y=Q|aJy?W
zwKZCfW<JxRL5;ZEKd5MVuw;5Yh>^c&Kc*QHF$IzDEOVXlfX4P^C%|cJVvn#F*lPeP
zr9k->Pu7X+32tODx1P)7zUOke60ihioIjS+ho8>p!LMBBOZm5jcaWedLI<G-JWLD_
zK!WhKu+BtIdP=w=JQQjoD;32qVw5;t+>Gq~SMe_NyqVM&cDh!|kiL`lO9a^ME=2vW
zTvhQ`0zs%mD&K=_m<}JgOj~Chwa6%R2wC|=Ricw?U>2HDA5k-?#W2K;R1tLxfTfJ`
zggJJn^BD(gzQy{nZP@M*>$k|@hjO2BGXXN!aH;$i#H@N)@yEglVVtlH>14ieMi?Y6
z5;q~uXazV`T~3xS%k`Bx$|7Z_lB2k(UEnvqRiCOJniI(BZ*4ZfyF2_uIzre1OA#Yn
z=RXFy?*r-s`h`h1VcugtVrDRlk<mM0QrDS3nMX`LR%Jh8<Jm8f`QBjv2K1=Lz0Cze
z*dw_(ZW)5=HBeDg_*CTh8OR}XAm&p32^h24K*1S^cC5HY+yeAh6NKI-B~Lkt6!$Ha
zRTXs?9NH?_i64Nh`NRSrG46I=Hymbno7ABOQwyjg5L7KB=Hc`<+JmW$&@l!vzLaf`
z1*{jZg2@QbLbL?!M=cZt+aNs-eBfpMEwDUY4b$=>@h%@y8=&hN34kYz1;vvK8nYF6
z!G_ETmg5F;-<sSp?jJafHT(g72ZD`{I9!|uQ1w8p1Ey~RJX{{ArFUgU9wu*<Ps7lH
zf&WG!qdTIyX*0C>+Hvisc2F<Wy&&KdFfvDy%ZF&B6Clk-a-BF3kSEg{5GNk6d-$LE
z6k#<;x^KmM;-`}Nr}Up3gVTGcc&gF*RHR#L^kaxuMfz2}s?pz=Vk|V)8sFjk98PyT
zGwMeAkRgcuD~J<#=@$8mbOa~xIWTcDwT7Bc|4d(^$1uB?8Y~N~y2-v|{Wy-lfUxsW
zjK)^x%Wo^35(6)BOI>B^p~ml)Vr047O@)2nof=XjkTS;5E5U_WQEoglo#_Z7avn0D
zB%r{{{C?pl;WJqFDMYfK(m#?U4@Yu+LR$;s!QD<+J;>W^JbXho46*>)a+`a>c_Cw}
z2Zoj7w@bdVu6BmSn1?Kp6}mfSU=5z6I;lhIlR&bb?0{p+MHIV1o|0-*J<!oK)sgB0
zCp85b?Q*a;In*<{1=F4R42qk<RA*bVAFz|z!$AJC_})liRjDh8T2tO8U$nh_1Er<1
zQ29k+;T<(&kTKI(W1ut9QR4E=HAqjAOjZI=Z3Phhi+EEtfQ4H^78Vk|LQ4oZT|vb*
z6*|Ho=L-jg(eMyY#imjZDFRu-6e(T$9soRFx*?THK5_>*=;=x>V&D_ymEx_|QJbo*
z!4gNSXVp4D%ICBzumH0$;@@Mv*a{P+?v90!0#7`!*9f59b-;AHs5{8q7~5gY010=G
z_D3-K5{%z}jLJr{nZS09Kvph<pkH$BkfN={0o4W#H4leWMeHWd7Wa!akc6%QLsS!s
znkDa*U&*Y}1u*Zjsl2a_Qolm#d`T@;7iu;1@%j@>9~>SQ?}#Jm1WJ7j`I_t}%jtZ2
z7?aQBAlKgyp06$+%J)Pn63;K>p8~p77dWA(FdWWmim(XG*Bu~-GC>gsiW7i*4gfd!
zNHX+gEP~j1Z~?XCp0YU|)r=FUWn{vU9#FiXm5<fAAe7K&XMahoKQ$5zPYD$R2Q`&l
z!qoxY;uQCyX7Ho<7t+gjBr6dKksN^@HatH8Ug!}HuQ?S=k3b%EhkiiU0_;p-z6I;?
zoEgr3#(vGVv=jLhZk>ssk<A?yT7bXifzLk$fj%FZ`zmogfI}znwkts$G4c;`vHXrQ
z9!dHLfb-+(A8LJVfwoiA^#OVsa)b`Z5I{W=4_lGDk@3(Ye@dtNQ@>DuQ!KrJzDau_
zk-Nrtu@sxZ{tP~0FgJ@c4|2Zz7(lPq!bD-Ya99w<!C1myAdx<joPbsh<O8z1(p>oj
z8S-CBHFXwpx8GEveW`t`b<>yWyWuCok#ep?6m>nkCTT~;!FC!@GIg11hA=(>Qm6?x
zzm_?~{L6$P()`GN#_i<Jac(9b2Zh<kw?kN51gI@T0x!f4(C4L+x7<$dDj$-6$IfG*
z$9I*lpu11hrdq0YNV^EyYCOQT!}t_61FO;BGU0}Bw{u~<!Bh`WPrp<DQ5rJHyYySk
zRz#J$;8XSj_5Z_;N5KAx3*^md{3>3-&i6xIhKO@<w)K#9Pm@kdt>td=6Zr$=MyX0I
zl~cozqTN$l0pnjr(z+3Gt)<ZiDK?0y2oL*r3TuGV$v^~A!S3#*hJnsJ2LKm`eeYx1
zu|3#DYzZrKpTZS&;79OFL0_~pg|1-meiz;mW1vuX#jm8FfKnVW9=0j=f{Xo?_#g?5
zgGanUHK4=jdGx<@TaYKuVRk*ZaBecU2^`5yB$+R`s(f?46)*Fh_>p`xAIqNy=}-#%
z-x`*26h)d^V1L&kYrZQ5$g%Qt6!FYI<Oaz7)~WkI4F+hjsN9{={?HnL_w0a3cF*Fi
z;yvsi9^yzCH2WX28Zhl9X!-R>IIA#?nV#SVhOwjBH1-9%j9bY)1t9CdZ{~Xn{e@Lf
z>~7*jF+scl6x<rd7YR!8yi`*SP#dekYA;iLsJ=iXtFC>bEzsK-lx6!#9yZVS5!nGJ
zdyKk>jIKSM!5jyz@;$7+HLrk9$wDpUCQ49sK&6xjw*^}KP|QVO)}<rT1No`k9(lky
z<vA#ae(EN5FU;CN9$D3B<to8AJ!~q@bR$(sZ4io|lkbpz{SAJ57&Q%%Yy+wsjc5V&
zpegih5c3a!2%7*8_G8B3MCYP9^b_216sY-GAg_L8&j1nfpyoHClvl_#LiJ-h)cQQK
zf%djbngM^9jH5my+!Edw`-9}%DHe%WP4TwqA+?ccK<jDJ*HQsWX2BrQJIFH;C>J4g
z7)m@+&0Wet<*CvF#+RXPQ}?Uq)M7PE8wd{kXN}jd>mMUj4>3M7<{Dd!5*HPh<zX?g
zsID@gIF6E^$S>py2?Xw+47c8x4yN0Iwle$B1L;D#*gnZ%hQsa_Gruvh$OOJZjWU9Z
zhH~8oi}j3q8z8$Kh}A1#GU`I1dZEbh88YQ5*x5o@&}v~Fa^~-`$Df2>kT={CJf!!e
zPJl5Zr5LFxYAQtL<&H@8Ps!)x8}f76SLtRdeZXZcw+Xl>iog0k5{S+)wZ160e5S^s
zgqEnLfQ;CRqTwF+y|e0NB&4?iF{@}3wOIgQUur8sVV^~{b1?kDOq8wiK~MS`?-}nK
zoDph#X!J5B!9A@9O}Wk3hcwSBKtHhRf4LqG(+Pd^B@IY(5(+ICPnMB1l8+?mGAcEj
zsqd%*VEIl{=MV+|L>m5z@}dJEwvKcU@O__xpr1fbqvK(eE9g#)FUoX*pkyQXseteg
z#1Y_&Pe{K=SEV~rebCPBaiD9l|Jrb8bCnVR_Z}7*wg$V~slKfZ1|Ppgn+6Jg1U%Xi
z<8J^H5Bp1!^-)+}4p5Q_&$gA_!xkU~xrMUi_uM6Zj1Y_Z_FmxvqFqf86+=;KOA=3r
zXMhbNq%lB8BatH>Qye8OClyIn+r%snYPJ_;&O_bv3aF&|(De~?G<_1Kmv7k3>=y1U
zSIkkMT73mywTaqJ9jVRJ>!6B11N7ob<6GbbmtXjdtfO17bCAz(VxM!K{9mYfED(CY
zmo7o3uotP!AEGD^kw?o*<P1C7{)3z$SQ(^@Qc6rE0&(Ag%={COt#d&#e5>W609ge7
zjzw{87$9jkW4epUL|dsvE;FP(84iP;PUeslvYG6H;r;@g`wR(sbwIUuL1Wej%ogbo
z9M4P?boav%7lV#^O1EYNP_!$M)ZGSr>BXAS>}hr;fTC42Nacq>lqcbghrnYcBgwvk
z6s$RX))Y{%8^Lep0*qIe1Ldjm9OOQ0<&*M9N<ZvmwDL@Gs6J|QnCDI?=wtOi^%HFX
z7@=`E)Hx`}7ihm~?z)d20tP)=pN@J<j(%TnWunC5Y4fv<VVOMj0aA~h@OrnXE%Y<y
zQ#KX=>mt(3LEI>~)(u<$jIa}b9NA7?ock<c30VI)EOwuGRJ;Y>*F{<nqTwLa?iq5#
z<DgvYtIc3bqtT?X4mRVf`J?)ih0NC<(jBOq@%jN&eoCNpb>Mt?qqi{<Oy6Q-1yFxF
zPI<qPYrHTVf%xJUMDI?jk+%sC!G8rvwi5XGDay3d!0#^v_TLPgbRVQ-QxI@})5GCQ
zK1bs2!PaFXK=GesMXooZ-*9dWH-VdmoH>z8F}dSNmfiVao<<GGQ)nfyf&>C30tev~
z_6e84{RAN^&J*3i+V_PIoClutBH9PO0M~I3ymwFRVjXZm0Z>q1<CYaah^NhVG$U=u
zVv=f=Sx7TTcOg}k_M@ACFU>|7(!tbW2xAKH=mVKAnE5EV6a$~Rv2U{hEJ4|&Cp!wO
zPDh_cG5d`D55$^iuYIna>7PUbS_i!l6ZsT=5!}xO{Qi3gz}Ogl3S7`PKt(%%h&=67
zye0`CH0q!OV8UAnPjv&E{4uh?<Mi()>YQF^z*vNE!n0v$#hJp=oQ5jab@Vt`;N%eB
z2|X-H!XCjx9E6iD5IOWWL?X2~f#~o^eotW(5gBe(`;4tR-#I9tw^m2vwFp?$LTwwc
z(sh({+vp6GZyE67Q!D8W!xsdt{DWX+bHUjCM(&fhQKkI`as7l{0ayyqw2P?^X>?$F
zBf>|su{gImD9tQIp=~{v0qE*LQq=%SRbPIl@CDM6ooH4G16P!%+yZJ6kZ{ZZkC?2c
z1F|;Ml3@k!>Z`#AZ3QdpYcw*A&y6|8UKEh9q6pWyNhlXPLB;H+3Xm=j06}GiV2j=E
z3cK}SYp|Eu)*Q!m<HmytNaMZ(hxjYEn*Rqi#A*mlA3|DbC{fM?l3s+mXaUHI+j1c2
zwru4#vY{$!3pEQdG*>N9&2wrky}sTAW#cNw0%N&x(l}>0Vmxgct{SO}3jSm$(fi2#
zeCbWhJtmxuWaon6KL8HsKKlm_DV-;Xf?i^G@ME{-&y@Ab4W++2T)mC-s-@Avh=j-7
z32qS^jQ6x*U0o7c-WQN<+TBi;-wLE!q4GP-E;QVL6ZVFFzQeR<Vn8JY!8$^~ax4&j
z6AHi#6{Fm`Roa8hpsw5nwCz;+AuQcZZKQsPP9Q(6u@<R~x2?PsG+ZbBZxkU%8`1Ei
z%Mk%fjhEJ9k}T!K`O|<0<Isd6Ak%pT9KeBi$$`tc$h8#u3jQdx^hL|jENLOi$$uhk
zs)H7iP$b;Zc<gMsrV^kuR$3_u%3|QitzZ(aAl-ZysV0Zcuo-YU&9rtXXe`3n?}Qh;
zp?T<*#GC5d^u78aQ~yzKU<4snw>P>VPFw3cY@7nw;Az)sd`Tm+iTntD@HvX@{is3U
z#K+lg#vfVnWIOaOgI`~OBz!HC4k&sUtd<XOet&i(QmuLHHZ-(7K<!ipFs;Sc=NqFg
z(#6gjM}Z45|KtOJWtyYdCZPwUhcpVL%VcSuok&+ff;db55q%)_u)}`P=pc0!RL5QO
z(cae-ZKSpV4yYLnt1B3jJuc^yh3~{dx*o9j6m)%9;i(jT6P<u1DnM5fI*fj$7cncD
zVw1VS{>3)q+M&T}5m<W~z;O;beZJ${0ysWIw_1BN&TL0Kcb9^ZX7<DaKbPhr5M2h9
z(q2xGlMqasD-v3((v>V_FPN@J2t^WF*SZ1u9z%(uM6Hek7_5Dz9f0^tL0I+BV}O)a
z!|j{z0UixDCZI-r*iwpImkIij{#f}<QjdBEYRTKpSJ5a&ECDXwLG1%5{{`$=GZf$Z
z(W6k7SdMZ_7QGv_!+cbClR)IvW|!I(z>8=%@=_Y20jo3O<OguwPt=!cP3>*1xz<WU
z!Mr_cc0;rk+InpSSnzmbt9APLmxS=0U!YeSWYdfkCauZ<a{@EFyi4sc>Ihevhw#<4
z*``Qm+k>4Q3U+oj+JM%vJHWx50X_VXb>nJtP0?W2p8JFwikLGSerp}K1ErBOsLVb@
z3B5Mo6s9F2Ra%4K^F9JkS0tj*2(7chckYlHqHANC>_p$jaZ@gk&&n5&jottU`%3o1
zrkcX{YRX0^{Uzl-8ru{#RQ&{e#yXIohtxdeHqX#Z(?V;b8CrEcNN=ZqtS{D+^@j+z
zuMlus7_AN6_{11*WT60Y9z_(8QDB5T9bK^ZB`7)YlnPAH1DbCRqJ|?4Oh6?)3FW^l
zK%{@80m6&+rRyW888%(s2Tdc9HY%M<e~A{q0<_ay!ioHat{V@g2I{%(kUEAiy_liQ
zC_6q+MTDM*@RN+X^?GItlf~?1azU~bAq%*M+TA1OCF8?3V%wN3$9819vLCa3P`nw6
z;5d%`oSlk9VJ=dIrECgH2OHQeaE-g+91pW6(2?~Eu*(%tfcJ11&&tckYY;Yea8bzn
z*MQ4=##cjM=3XQXmxLPVVQYzWu@Cr~IViS0MBzb2<$erml|_>IL~0=q#z{Pv-4t1A
zuf!=U(5Y$F?L83s-qk1SGf*&H2*&w={ynJh%a$lh@s)TC;p9Af5~X!Y;$hqA0L67d
zF7!k>U=h0Zyp?WBUl`C4)c&Wc2}m`3w60n&0Mc=2G&&BWk@P+$vWsPUrv8)uMDK#A
zwFtiI1RjCzeLP?giAJuzl^i08)OKX*t5CH*h}z@7^xF{XpNLx30fSmWStqmW*)kN1
zJ_XUfi#v%bT`T?r<m(f`X3yZ)@u!i~dJ0WZBp4y2q6T(Z_(QBJ)sf5q=^bQKgVC?F
z0r2i$6up|tqp*Vn;LvmOe1N?YbRIqjht(LJt2$J%Cd$cuktUhwNO?!+QH!*?`c9zH
z@;Ch-u)97+GjJFT>XJQ-aAUGD&$t7m=j8~8@;PW9WIBzICi-%XxHg<>!aF(9t&;)9
zDhq*sFP8&mwHWBloA=>;(TfrQI24Fj#e$dX!guGx(3=v@4@5c?iQe2;@N@}$BDlIF
z6n|6E;p*fwk;P~8d%@o4qEJ%A-#}N#eJ~b}`7-_`?+|>2Kp_Z4^ELtzOjZyDRp>25
zq3Q7g+V}!Nmn9<A$wxT!LCaH!)LR;erY9#DhGOZZ6e35+QF07&jx0Gx&V~6F!joSB
zkyZi|zJu(ui=skGW7Sy1sdNCRJh;l2==$){{Inn~3U%*PEgMj|K)a)rrEGOp>EKE5
zt?iVD&MIxqa1i>IIVJ*ErlUjoF%^WGN*wA{xp0Do=u!=40)gmepd}y;DE=|4!p9Fp
zZ%aJ7I-QVVE{K8>jwm5Ym=b}CWfs`lLL8zW$|&(@OL8LA<f07ksj(nt(zVB$2#7fY
zDxRkom|*D3Kz?}}z6hVe=*5|V(*p$<f^XX6_=3??9ZU8im%V`4UPcI7%R<mxmVo6Z
zQ)yUo9^h3GRZRKViBcFsX%Za^fSD~4P^7Vl_sIw|`BEgLP^NW3EjtoTbqRQUDj=kp
z0b9t@vk}B|P)EtrRpi>;jVQDOr6F<1G>XAU-nUAAVP00_mcxhmA(jV$L>fpU0Dt1q
z6qyE_Ne5+?jfLi*ND@r3SY{~IoeBd1J(h}jL&iy1v=htT3t3;Ff=#*$Je?)z3-E7u
zU}|N6^f^e7f}wySuL3arPZf*;H*Kk59L%gz6`fE)m-^-N1$-ft@B&}Vm;7(4=qY#$
zK2S)PI;w&hf?yFNSm#xWc<T!#O0Z#WHqOjf3q%)3h-NV~*;*d5*&8@LPu&kOz{+ZS
zLzJ-)WwM?Q3FhG_MWCPFkXnwF=|<p33m`E<LLjXQSvisY7oa-wm^6Zn;!NaRE>ZZv
zN_*2Y=v4IN7D5ib%vdO0JevSsY9Tt!lTk3u0PUHB7ScR)rWByfst853$8bY0SqJCI
zd2>FfV+L_7_^U)P`KbWaZ<={7mj^=+h1?Qs<8=b_ni+3c?+s8wp&)^h(TklA)AT`W
zpa}Df6Ca}=(NhXSUK)lPW|njTR7e?^-2kv$BCu;XOf*hTlv81*d*ytX=N-8W4mkh>
zfd~V&TGQf`L?sy{Y&sfLvLS6hxHohWbyo+%c4wftpJq2VUH~O_M=et`VX^nM?$FgZ
zJrTNEqTkT(AlGhVs8G;>$Zlt#rj-U^=Ng3|%g`E+3LxCL<@Ja!R8&RXe;^Xa45+0y
zWvOK-TJs{|*6+j2U!r{4n{F71KKcZd&V3ja9VJPq&j+!=D5VmXP5EqN75p?I7{U9f
z62B>DKP~`r4u(G^khX}Pm=JVJN1>@T4sIb4jv>`{3|-(jqikI*<KvOeIKiyt3WXp#
zO9clSm;+HR2tkuuu2?9BOHt@tPLL8|uc?S_87Oq`mGVrOZV}{t0}_7>nR}vW?+3XD
zLGmnQA8Ka~;c_HSAQoqkfKy1uIi%wxvTb)+jQ&7x#Rq562({)QoJbq=SFkAb<|_s8
zR7J`KGz^v?-MItwQ;OEPGUX*~!Bh1H6=M3Teqec3oKrYXDhg*610#vUiN(WI5@9T<
z@VXf|yDT*u1Z@rs$DuU>SRz^%#NI+J3=Sq2rOjeJz-VOqI1y(UVk8+(G;@`JnZ^%r
z;MDx!>5@=9OMUH7GRa;OC5U`d2#c}$X=7k6iJ;{(%8lj@s^H!TaKUhXT~OqWvORYO
zeD?*IkT(;+2I4dcE3zTzsLBD?9)v?<abThF;=SR=BjL$oxf%Zlb1CJ_m&lF(XJ8CQ
zFtohT|MWmsFib}gI}@#1L<kYGan5%@dz8VD{P0DUV3e{$(KBXI_SuM9F))aDR1%Y3
z8$~8UM-GBV9uB7BQ0|-MC(;{2zX6X_g0CUOz<HPI-Qj7HjUrTvy&N~7^Fi>%3rP`L
z-mKk5f^$khyvoL|AA|I;)YJ)gP=e+bPegfFeD95z9t(GnjHPG8U6#TF_#!~}M(_DR
zAx@YfnDO}1N*gf@<+ljYPih1wprQ>m5gpbgP{@~1$N(r|cc@-Glr9sd@1yuZ$r54a
zRw9#Y@8-rEYUR?XMlgSZLcXX*+Oazex|0jLXSMDiJmSH`+(EnwGRr-!!|CM^p(L4z
zFqZ$kk7Ue;YJ~Wbih{g1Dk|Y1`IBs@Tueu@F>sv)<qp!5^RrJo5+|Ji!@Pm;5(YdI
zgP?IA7{%Le>5CT<L3$M6YcMZSK8pl#m=8cwB?_!}nw(O+r3x`!XY+qIno29kQ}aPh
z6e4xAd|C;P?+*I#O2I0Y0iQTDPt6+`#TO_g0QM3HtP*Tn4XcSDQbV***iUx^pWfPD
zgq{o94O7cPoxL}x2po5om(`t*c-#glL?HMlPxRLKq75VfFn=JZx+nyS3v389y$g09
z3HKBSJx@STNQa6Q!0O9j<=%*S0cs$MI0Q!#3Nuf#K~y$iQ~{QL0}J-W@>DFw3<FW0
zjGmBOEgyDW3{t`qT&SPk2mz4*SqucMNz^l7?|WhK`3Q(;3Ps;Y8+hz+BhE+wq{xD|
zF1DzPTraB^5~X2ZH2sO-?JYLN0uwnT4+dWfwBw+>DL;S-6^IAMZ`w$0A=)nr0eD{G
z)PrdjPCNpjXCWHX_QL9K(D&&;FoG)Rz(^EqW8u}EXyz|Ki&q)r$p*o<TlNudODGOu
zHO(dmb5Yd0k1q)M0VW4SV!dszkN{Vn1&o{row?7MWl)?Tz~b(J!~<bEV{JI>gw<yQ
zag+e+`T*pzu>J^iA6kLb34d>?R2h2DgJAz*C=kYp@j$%EKxnyQiFhAM7JxRsP>_K!
zz`dzJzL_W>6~Vr&4lQ4~5ei9`g@v28ky-xT^6Vw@eVAGR;%g}ShsMI4qyl|fMwbJB
zegnSzG0xXISyt_>M!;P!gp=M2Wh{Xj`atPKs8}Sv=obfQm=1hX2v*@Gy4Zqs3nqr6
YMKB8ZCfP=a1#sZ*j*^sVnN{xoFG;#H)c^nh

delta 198321
zcmce<3qVxW`Zv7yX2?;;_Mo63D4?T)S4cESR8R)31W~!DsadIwW_e*SD`lWzjNNuT
z=F;ll#bYNsb<XKxc}d9>#01S_csYuf5<6C#0~KBpL}T9Hv-WVa&Uw%GzTfv*?8~}5
z>siljJ?mL(ugR<JnRlV*`gpPKrP1RZ3nTxc4w+b1+5BgTO0OJ%_xNLn&JN@EgJ&c7
zz4UB2zaKa|0{80Cht3YfeaOT^m0A2=R@o2tzZ{FL9L(=uoTdBJg^$??w&4AjW)*}<
zqOUMM{q@I@)R!k$34O%Q;@ty<+Xg|{CGxb=f8g1SM>88JhKg0}0deTvYxnvJb(CG@
zD=gjhQg}Dhmb-+tv4XJlZC@e%rEvdVTYZH<<Zt_vuaH0moBx@81wnc#yeF#@jUykq
z<%Lb{;s3V(!USRN(B<<Uu|FaRFYZAO)hwbCY^W64v4Y^>rHEzX4QL3v@wS)cN<Hr;
zL<Art+=sh;`=6zm;!9D+4TgbY2peQbmr}l9`G(<L)@NG<HQpkBy0+u`Y*u0zEv?Vq
z;2VVN_F!LM@h<r>tDyB@{qKrFy@&3~>`4_OOWfmc=Qnw(e(_aK%by<h*8cLYDAZ%W
z-nC~mRjV1HTy-`+CchBm@p!67<05~$u`AVIprjj`oW)K1I}!3kVt0%ovMeiek+4YA
z9$?oxM27eQuQloDU7g36V^Y`A<DBZEG*OsS`pRy*c%K6$vK9$xo`6^J<Oz5KR{-$7
z&w2Qv(xYwvWo0_!1m&2$o0@CT3%6Ew=9&b`F#k3qkTO<;{1$vE``8$E2M#OzJpmhm
z#+-+}ZD*=>i&43vrDuzRa|{RNZM+SpZSYi+ECxBkH=(Olko|<xqw+4_gQu)Q^x+~S
zh@|~}nL%(B+r`p7BqvA<L*nSa8-$jQ5&(6Q#i*tkJWGw*lWb|n?vB7k9c{vF&}gZ@
zXNt*r(A3gmrnA<JDuF;VL`kxk)a1ZLvMntDWzm;3Dyv*_r&~;l-C`(AvKY$@7PKrJ
zO0skmY}@{oC}?MY5CrEzgKDzKyV5O2*J1m8+r%3O#GDb%n_|wrfIQWZw+hAWQ8$u9
z3^@a-4bf(r+qR98ZDPUU979bPrNSaQ51QwcqMku7dE42hq&Jtn+bL0c_Xzt}r{2<z
zZ&;_!W26a3*aMw|r8D2K$2<3v=Kjdmb&eEmY<K6^q}OU$x+(mwf}RP2=R3B)b0php
z`X6a}`S!70jN;&o98t(WxCOm}%*-y`Ce~cBz3PJ0FFtG#)QuKWDLvt#!z}ymF%Lcr
z@)Y?YRVU-_rFXpN(>oapZ~jZ|-!rCVW$xaBd~NDy?DpMDr2G)}q};!k&S%cjeNPad
z<$`ft1Yv>vl<(56Y?~a?{i`nwAhpSzWEpHLhSp?dq-nSF*|&0EseU8tV4j-^*_+m)
z0(T1Y=Vq%_*dGeSs@K6(C}np@*X~7ntG{+eW~?&Zpd=g0l8pu3+2`hrz5v~-Fg5pc
zp_pWu=bi*)@&Hpi%-9IOSaUlRJ|AXftNqe^K6+7L6@KATXU4AijixdgEogo|(aI9K
zPPqRUMeu5|$8L#e$*viqrdvozP0A!optI5E=@_+(mSGk0ZW?l?h!tf?mRV?Cs2QvI
zJSPgD&$qIQuKgt~gEe%WK)1wh!(wYuUYTXF07OXjD=7UIrO3OEC<nCS7exU;jDG@k
zAl{rl_rlnyqiZwRd)-3&>?~|Xtd#)jEUssPRI$Lys=Gx~Qz8B#5xl8Mmg!=JSo#*>
z33UuX+a?qxp%CH?Ien19=K6<EqrwD=b7fBxFsP0JW7Po4&^}N^svSrrsG$-a!*Bqp
z4r?v8hKhNMd~0Q={KuK8-FSmsFcC(VfU*7oy-o9yt%7YY>S;qmSX#h6LFxm%$0W)N
zWP6u1SRLGb=XPbU2lRC8)^ocew<c(RPu%wO0tArIDDNs);w@TEp%=e&ON6F9jhA?f
zx){bM$&vsw)lC;baC2@8H=V02^8~xs&bEr`9g;YBzCn0`6kr*~FC{`*=@rF^-GMNY
zggn5p3wD24iKTa%X3q{w0gC9B7>W&|bH!fN*JeYPrh$_Fyyp-p>blmjkNvTGX!ket
z{)Ql_x(nz=6jvW$r@BW<oA)tK_ukUh02bO~WGAku%D*(vW9;D`+oUJwGrz!zQs4RP
zp}=J6{5<w{;JsZ?W)GQc6npwn_Cw%E>EU@SG$=w0WD|qtOZ%T-9|gH3aRwXHb2tqm
zt)#e9YthqmVgKdnR^jtr04NuHk82BMZPmx{8t;=GxBt-@D8jKns3$$Ne=H@DS5y5l
zPm-N3uz!CqO726+ui>Jyx}K5Jqcd1=@GxoY3^pk^co8rH+x%PD=4~&=(vorq#|}QM
z+m4Qa58GigKp>5}{V=sK4RR6XI*)P2-#!R(?XM1b)sGzy4kQBb@$ertm(kt97$;jg
z*ouQLI;}Z|7F>{%(6&xHaSH^=42|F?cM#f{mg?G@9*<I^GF!+%sn-m)F~rg@qR1e$
zA?5o`9#0!GzDchr`E^Loq49}O(F%;jd(dYv+I9*&()LpVjm}885P*aa@uq$C)%NIK
zqa;6PZ5TRk0U;ttywZBI{LrB3WJL^H0uo5K%<4pc7<eN|DZx$CuCJ#7)>68AdQXfi
z7!kbVN`~?sMiS@cy4}TsC}^wyY7pGZP401lWd)W>R9)JWO&J;37jF}RPk9(r_l$cg
znZP7vhh;a^2w8h^+rox~1$N`@Z?u%_=|_3`^sq6~;vVePu!kabp>Ncd%`^x~sjE20
zPw#f4_RpOL;WI)tD|4FW+QCA?2T1pyX4dd9>4$sS<KbD+U~jAC)cMfr{<t@C{6Lbq
zz=zP99?U*Y4r0bWJ*C|}`Qzw5{yxBuecZQacWv}@(1I4f$b^Qqe@$lveeR`Ur4?>b
zMNjr+A4^Cx;yKfG36;P?r8FxuO?&wh*17K*X|Ueh`+bM>AsT4Mp7{;@=d$#=+lH~V
zeR{JXOF-u~ZLv5@Un6fu>y*XjS;C~?kJ%baoHY6rE3piau0P5CWjQGg8^-qcvq*bN
z*?0Z=I3B{>qo$jCE$?wr1bVS3)E19K?V*?8D;_keI*-)7oJXx4=8oWi3>~4Sdm(70
zN)#+42)ME+D%DC3Vo&9?SKN147K1e{ngWM>uO$j8Y)yZ;T_3je@7?bGaQ`XNwlo$p
zp#KQ}sSusLmPwEza3~Eo;x-;H;J*IJarAf)e8ZSYkLf5daWZ>)K<|)*j}wHcQ(%xc
zBFnRp-^iuBsr~v2`*^_2yFo>0WV0r-pokGt)(0#tB5?%K*S&-Hy#;%ck(z%%+s%T#
zXG;g69?czOhaw)3W=&zo69d`)_zrh%CCqm)aY8pg!rqJPWuOfNABr3%ZTK@=8`+Pn
zb+e1TZ3^2L*<FfCWv3%8Qe_&!8iroAsZYw41jsd3_g*f$imqZPMdEAV?fd_>j(sXy
zGH{55rZ*1^mHel${R0Ce+Zc9w;Iww6j~NszS;nB@AojwbE_a=3=>+>=kSqzK*}g%&
z#RT^Cpde`%V-17C+u{%C{Ri)qj=aad9vl`5Dz<7~O@SL2>P#X;V<+=AMhpq=yLbu>
z{ih2oJCKd;P!~~{Zs-T`Ie}#l>Dz@A1PNXizda;V^ka=fLi{(q%RN(@0VOe%WqAVD
z`mupS@0ZSgu{~#KN3ku2|9p_C!+MP%QLSD9nXw6t#K39Vm3KH0Pe1|CUWD}399SAX
z!VB>P<oU6$hxL;hpJs-rk#~V<+Rz7CLR3(QZ46+2fws{w&A;4l=zKY={ZB8J6BRG5
zn#{IGMGf(yPXd7d1#Qn_nATMm%<=ryRTl3gubE)X93AAvn~bg&`v4mmohHSkvBKz~
zPuvOW`zQVbC}6bKQVt+6c0_rta;@0LhH;gif4{EM@q-27nw(p}%PVDjAc^7kgp+_Y
z`v@%Mo~6>*Lu~&&gGDo|z2~%a-xqiZU}uN-5C?C+GTbCe?`_%ci5VtJxhX7aWT;d;
z8Dl};@Eu??T+t8=F62KFD~T3dag!_-$WG$DJ@k=4S9CA06WIQdeS?7le6qr8)Q<wo
z`+9v6k?WJ$uYi8}{}}oc_YNQ*0Jf<ZPz8JU-&1brsHge~8p(H9ENE3{b+kt<;I%*~
z!Y^k=^#qhr&gwR`yUjp0)$QOm^$sig_;{V<WBS7&`o;F>r-P6SuE8((eH4ftDX~$O
zm6HIqF_%MidD<YH2mHMTi@g=QOiCMr5sX`-V8b*}UpEz?9}UVNFWHr_W$aRX3~6>j
z-2KGq77?tBi@noE_P#GkGLD5|4q~hC>mNim4M3|v5HB~ER*e(1tB<n1_k|e4#sbZY
z7erQdA2;tUfIE&FCSBgh?i)3uU3;5HO%89<KA)VJT9GB$Ef1m&g`qL(!L}fH<iD|w
zwlFK395<YNhv(u4O0~QSS>)hX$qo5E8r1m`4J?a$K+e%1nVhst&l!vstxQWmqBdd-
ziyQs6c#?fRI<g(^eq%yA9Gr#zK7NwjJ7$Cw^*8p^nAiKEJMCOqce40)?MVn*X#!MX
zE>z7o?bIvB8x4Uhd2B#$Se2ZwTbm36JE1M;DVqLe6nkdu{nEe!c5rNj*E9rDM$Ra9
zb8L(^C5BRBMzQ-6o;IcfpEPY#G~1IfbT}}9sF><Jcjt6KOz6-RifwhqAV)fcq_f)i
zK+K`iEpxeRrS1GsWIYo@j3My*w8Rx68<VJ8z3Xx8*~Fn8HkOD&5oYHfB?ffq|0w4J
zF=$>8%=&n#GL&^6*H5ZC$VQLr5$Y9_-;UvA%E6}WaYG!719Wxh1ACyHQ4V;WlPs;<
z5;DvNZk4EotFn2mr5F!IcCa7C8qnpdvfo;ZfS&Migi;onv>*eo2^GDK1h34L_in-U
z)j<A8UZ}**C(3N-_(@VRN7)A`vzN#BCL!82e!SGppWPbYOWN@y>zOoG+Agt&l7gj?
z1KG-?p^vs1zdswPcVa^jIuQlmXr*Ca0cIf8;jpsp+^zn$_t3ib+VcOsyR~2>Gg|wN
z<>epvFUoiKBJm@n!|R>_3AWgJDBv}Oc0fyT{Z-IPIR`;__jxuUd9ZXipXDUqC(Y{t
z{px@BmO)8GFA|Nty;`)X=Y$05lL0JrN+^47LQkpFIyQ4ka5r6olq=1nOXE!+_Qiy8
z(yMNEWJ+Z4xnF$*^$p8WZ~)PoK;;|^Xa!!hDQ~fqiNhqJl;uwBD;eDE?TJqtH$nq5
zHP>3!=l&R<<Xb*$#{EOZUs&P&VIf;*5~&RGt|Uu3k&-&lh^U}N8|YvM?+=$cIM@&O
z-y`kl!Ga&~b^*C4CTMfm<Ollu^tdUol@EkCjIf+4COb-_HhMgNoCvv}q(#vSqKK+@
zxYT>51yQnYH4qJ!U6*bntg)6GAZ^IqqEKC-C(sb9oYVd_u6^;pwJF}z1;yppkOC^0
zJJK++#gA>C)IH!7asadnFc9^-Oh~^pj-@;}Wa@R2lV6|sy&>exFkRd}goDzeA4(|~
zIVgfqJp#QiGT>q>m<%Ydti^2bo<Fmr4-Rv*k=g}bFrxvct<=_J!$uj2Yx-~&Xj=vL
zXcKf?5d8=wzope&aZe)13#<;&jkdtNL?!xa^Akn3bVh)@+9V2h5W+DXX?GAJAW<ac
zf!88v$}0X$+}D28pGlOpOL#^#GoC>|n!IY?z+xkbi~*9!1ZZDUQj3Y}h4q!{jI-co
zx+Osmvi^19i<n`S6p{C5i=pu=NJShr-4dhctH?%hVQ%$XS5S>)=rp7#hrmv<=u%|E
zOZ88f=OHBtg9+IzuPz0)+8(TG(8&Di!`<1Dlpr!Q-=!>+`~!KaEw!u9#NJl6FQp&l
zY)y@mqFQrSw&o0<JWeWG$)27(UP_|^L1w#UB1Skej~F;6Z5hPAn;a&+o5DJz_05ug
zqPe^gZj@`N4~T+T8jycuG$#}3I><yrpQa#*N1^WEtvE=Rw@SFAt-NLVX~9yRz&59a
z`=s0u*nzajm`f{LSvFsP=4?8QXD@%;Yq@;^{{yMbpL@Zu#7PqhU{oS~;_7_ZnknO?
zGfpxhy@Ia8h-_>%A`qfxGqUa#W}Z4idf{O<VQQ4mrt3cJ*{PvYZ6JGnszpwt`C+pW
zsCs}Mo0{mDeS@fAASw(1nLq_H1fSm5hJ}Bn7u^VOd3}xE+gO0!#9gli_|TVVrL)^e
z(x8-Ti}d=HZAhAhBsVlkn>1!cD`^fO`d^&@e{au)XCQ0c?njuDM*AWYNo%YVK^1)>
z4nw_QhsOhPA_<2$kyKUcGC_0Az)<g8vqvyFF~95NKp3Lamq{~&*w*wk$ymg0q)(S7
zhO)GbY$=4Cq+nK+5iI5X1-?*kwl}jo$=>kHAyO1&2C?Td{iKzlY+Ys&Wt__F)2q9v
z%fl5Kvrl3^N?0iel$+DE&t|f2S)+XR{p`c0WW^0U@E3Ht9r9_q??!_!del5RzZc4O
zWcBaL`+$`pH~zrC5cm<bSx-tQ1K2~;NBQj1eAxd?AI9fkTl%nL(?iLBuigtddlLG9
zjwRzky|vrmh_@MoYn~?hx3gq3=IEoZ*OF;7?yM5Rr9)@xTExcjsw=sJURou@M_UrZ
zmdxnh<pod6IIq3VHq7WJ{)6qF(c2M&Iihwv&l|4eaWore`H!o><F;`auVaui`+x5k
zB!(0D5z$1f-5+A3;^{MTH_+{shU$Zqlx|rGe+~;S+N-PB%$b8Z(Y_61YiADaDm}n^
zWK^zdJ%)<{s<NXqgS(Fi=e!~tVxwheOenN%&$3@<hDh7Gv*3rG4w?D6NDZf3{AJhu
z;5}56d^-qf)IIFOhx)};U*cpSAKmSpbp9D*QJx;LFvzYV@QSO$M`0X?Kp+~Torq?p
zS%IU<Cvpu1RE>(Q<?$WpdoA9yzqMpu*E1`CCo&r-a~*ql)@Yw?mwnhDXIa`#`#1My
z6|?#cyY&n>K*Ll~7%5mSy#hy}2(FT#eckfPz35}lFw5-0KDTcPY})L;_a*;>Q+RI4
z55_&$A-qN1QKw@)VpCk|^=PKe1b5jMhR`ddohX>5<*s7eX8Vt8Gv2=0tC??hdwZVM
zq$*{U;*AG^wUfLiShMwFcg+b8+BuBdk%`*ci-Pc(1-j13_*8F}FsG;V@=7*q&H$go
z-@<y%33q(=SEvA%F91=A;*tTGC2T=jQasHc(2zv&GbB;;RTK3jqAHS3QPNLC`7k{T
z6xOG`s8Wv3BcI$l?HKam4Vdvx;V_878&=}#OvHMxY9CXsZtGEik1w0`B%1vriI}XZ
zdQzR9M6A_TA_?&k148Hk$EDkA__pX%x>q0WB^krmrw<P$gY;Z{pH38grv7cr<KrkS
zV@T}3oAY6&+B{8k&W*meauk|q?=1uj5h48eud8>k@dPx$&_GnZbENb?iL7RB(1U@&
z+@y0kXw+WA=!r0BKjn~eQhV|}ZiS{BKGR4s!HFy_2x-oPhU#a3g+<@N9Z5I2##gnm
z-Pz<v0v+GI%L{nzf|iU|VDNA0pFH?Z`upo{Es;NxGTW2CyPnjR{62b;m;4q^|GGgK
zoJwhA!}`3o0Z1r;%2F;(WGXs6$|UnK_Qyvz4Fgf$3adc(=J-#`@>C!W;;)qIku;@5
zsdOEdUGGBc;u>;ZqEz<SV^QK?*v7|3OV6!mCm-uaQHE*ioaWUQcGtX72<?rVH$|E;
zpKY2qKw1^T_RWhMv@;ew%C);w)0IZgij|u0w>~tKJ9C$|tm?JI82ZeAM0(~BbIp&C
zb=4EFh#2kBJ_%rZ=Lbva<JsByab6RVN8&a)V0-9-siNQF@rXv2tto~iBLb)$EoaX^
zzIp&)XbZdP!yVQKg+mEOOs=4(G*UO~=)`WUzs(|LJjo{6qPV54?aH3F#Y>kKvtrxh
zJSDL!8?w;CAA59VSqu9F38RT}wAdX+Pst{CuBj~9Y#z-vEF2&~ls{V-5*QIqS(Dsr
zwxB&_^Lx0KC8sT|Vm~ho>Py3AmOD8x&9fp(%Q{Zh)1+qlyVp@+&x!;s+rb7c8YoQ)
zVOfh}<7qms1r8@#hNzig%1y*Ld923&13u_Da}ksL&2AKR&O|jg>6MaOQtu@2tC`SP
z)CcthHQ7L0Wjd>=1~t>D{pm+aLbSnXALh(Wr@be0rt3kimO$c=CqjMZ{wT1?PXtIi
zLfC>Q`brI9OnoBA(XKzAeZ~8OP#bSTE}*?U)#GtdN^E(Xz!zmPpVd|~BFdUr40iNy
zPc2+3KHS^ZQ>kpdR1KDFDa7l{rKKd=cVpD?YV8o~yEt~x;x}N(?JwaHwUWXpB~MZ#
zCb_ddU=Z7FyK@0|`XaVwakPV%PY<E;Wc@jx(zJ(BORqrUr&qYO5NQdhUxb;0pb6Oc
zfS5+IaSwqg8iWi)GkAU5EUfa`lE$^dlUv~JMLF#tf#L%g#1Zd1Ti!8l3)-LQbuVzz
zrlX#c9H^v*w6<bfOW4v_m8I=o%vL<vzg<M@-6z8(Ln=G+WH@{7(LTnoV@c>$lrQ`E
z(E#isTI$D!J{2QFAxRM9;RN88z?MA~-Yp)C2UX=y=a?5LA<s@waue7)PmOoP=6vE#
zjV-G918u>YV^(spL~GLdMb)*KKl%tY&o5Z-ESBU?jn124_FtSgJKF2i%=mT%-RsB)
zRx(4fG(Q(N05AweO955~2K$dN+^3i^Bu~ezcny`tz4JPnXDpDH1mtyP%a@G*4eke*
z3`0cw`jUQ*1Z7T`GRL$C!`(_UO+XdW;R#rb7o`m5?QUI$Xbu5mFT`EUVP2_fcvg0;
z=_3fP^DCpo^U6haj;SV3$BQ@w0x0JeNsFW`ZJ&z^lsYF?O-2XJH3cZUA7bs9Q9TJ)
zXl84@xHIw#W`Komxl?Uf+6E`@xH`wK=GxTE#cJwOXKpOaNSM8^a!bvPS5l2irpYVW
z%EjiO@Rg;b#8@_D*?@F(rB&j~lHrEY=uX?%JS&VXi(Wbglvi_av);s#Hs{9QsWm9d
z-di@nud0O+R89M42di2(V*qKT4-vr2JY$-YYbu-*rZwjKz<y?ic^NZzxqob43j|VS
zh>A9H2e>)M+*%H!a4z<XwdL=+K=%IfoUwu97dRXG$gV@EswRUrMvO|wYm_<jBFp0{
z<>%J`D-1QxTax^I5abTTbKVM*o$vGXd2DWWXympQ1PEm>qVK&195Rh+D$tnIjP85c
z!?3BMGCN-MX94!1xF*@}?Z4&s>c9U#sNb&gTlQ|#0~3|hr3;)ZCBdCwkgW|$W%UTS
z1<Dbf@|<L;Hj)_6ih009%gQ%+g_zTTEPd)ybjaI}=hJDxo->b`a^?ZEWjO-|tiKZ*
zZNsaa=6CdEe@?igg-v>!G@w(XR?J*<2DLQGWsVclEI)5Wqt$i5+jTgn<Bd`gn;sC{
z0!m7Gn|^TCr)kDqU3ODvjY>_=>7}HaNPmk7%W!VJ$)IV|wh_5tNbcZq-ipWwE~H^C
zLW*J}{Psth<u{~R+>fsaxl<mCKVnTQB1gVYjNP}5uA6Du(fu-|h&PpWyXh@8R%1XQ
z`tYdK*kx9g7gRUzX0x9jM9Z3<6)+BI`rgl)GwK?u^BM7K(3)-R-KTrcUmx7!6+|C~
zB5E)D=)S`eWT>eLO4<0bWD_ZfGTBJhKNdE>gEA-mGa6Ww-05Y><nEE(T0@B8zK+mD
zRL^V1POrgk;FbLyWZkqEJ_4@Aqmpe)7lIf>)^c@C2uXA%5qHoUe>|6HhJ;0?MTRu(
zy=+9WKs3ls?(~{Bo%;wh>~|nh9(d84y}P=PTK<iiC(onony1x$1XNZxQ#+Bj?C~Wv
z24~qT-`sEL!G2jOFSvtAHRqlC$N+P|g!G+&)#P+Fb-I!~Pe~1QbE93xuhd!@?*Ki4
z=ypI>Hxme;z@B_&f@2i61?=%S#{6ScYFIEv9`{&^zh^FX&#}34W8LeHqN4j{s-c5i
zg@I28Ndr&W8gBgXq$JyvIk5`I6N8%BoPbQ~9{v}!O?`=VCg)9`oG5G#RTKQ34IOf#
z)j5v9Jwt{peWd7-<=OMq@#f*i;b}e{kH`g2K_c7_nyYQ7E<f)>#>QLCHz!n04J;Zm
z<nbK!e)DiYdDs00=aq#Wj|0A3kd1n1MRwgqRZ;`djQf7GTtH|#8@kG_pYWiH*W@LF
z{Aq%D!6f;qa@sn#zAN8C*JTU8pGVr65;#j}+=U5yvzH2=H34s0p`c4-b|5-l;=EL>
zBx2+aWHVQ<bNH*%!(8X(!moRvp_L(+fB~hJU?76r2RuHQ<H)XikX{{viz<Q!^OqMb
zU%q5{GXY%tKsI$v1zp#j!nG|ACbjSY$h74FsPCYJX1XiM=}PK!^7&I^G4_Ek+<(mv
z2h`lfYUa{b|8@22UjNmGIinoVB4gF7Akxm85}1`5s3wAMl3egJnsqjG%;|;w$&dGf
zNF@h)mYTIbGYo<Qnt|RGoF~lT%s?PtCK+%W5|nlHpsb^yy4#Sirp{B=8R<FIrmP`_
z)|CE0B6q1lb}mDNKp*eQl4JQ=B^T&CH1@mF*DQDI9Tc`~A%IqR#Rsn>zFS+W;st48
zbmLE?T3ma1HA>T4)*eJ<eMK+70TwmUydXbz$O_rj4=zSCa<)5=b8vOLLpL^46J^PZ
ziTZ7jtF7}9s{h;#gc=`)n9!Q7Xj(3uj;^cEL2xQj$tyVOX3B#(Jg2>YMIjQOFOXY(
ziE6ZLsY*anp!T?4pkOMP*j_kacI@>BY!b=~9okd`)VFTyP!A(r-ye2P^TWog-2f>}
z%Tkg<5Xj2pUe{Z+2n){w^Yo4rmE^SQKjC8log77c8P~M|#L|70^7_hU{b1q4gz9XR
za=>P)sk78M>CRl6fYD2K&8Wxlw*(j6CMv06<mWYdb`i<6QHvmG2MsrpV?{WUvg>XD
zQRgH;zY2WlF*V+KOO#!EFk;HPL}$Ywxu6Emd{>*ZVTfGtHQuVb$tX$`bTs!TO)1m<
ziLF==RvmN1p7&KzSGCAL@Bo6!ZJx@xsT{9AtMaj9*&`&|WpGE8<X9y&-kr(yiVN7$
z7OlL4`<XU{S1wC-ET%R7RtfORS=LX@a_0WUhbA;H$Ds4LuR~}7m?zP7-$XraO+3H*
zy}TCaV&q#_fIG&xmr3cVjs<sR^BYK2_FceL-8=~?>b^8l2%`#XHX>2iiQk~iOnD)W
zSa&nVUfN{F!gA#OC9w_W+Sk=S!dvB-+RszF45n5L`8V<s@Bjy9F4nKw<^iiNb)XK)
z5W=L5K)6c-l9bJrr~`AHHxYL}L}SMX9&$^r$qufh&JxkNeiCv8rH~4_4f|c#CgL_Y
zl{GYzlM5!p*CjVXiavo&_r*%(XH@{b0QJqtsoqb8La7l`XUG?vvEwlL6)^Ef@X>=+
zS+fNNlyc>`a_*YEx6+{``}@oZ3;$9%?lydlEPOSiu6Yml1#yWD_Bb`!Upc8}rnx72
z7K9^b3vzNw7RW2mxcvyA9;TqpVlwOy=1HR2S!@nJUX#DR{=AxW?zY=>PC1$2+;<(-
z1SRpdy=$}U<()cEKweEobRlh&w}05#DyXsUiT++x8|o|NyjhgEhBKSPQumQX!z@+F
zOj9;D5bzRZO)c&t=0E<-Vr8F($NVevpInlyBpa0mCDp9l9P!BV`A_9v$(f(M6us8_
z;sA|QE_w2<m1gCLvaT34)pZd7pMUj{<xA!%`-mFKm!R3Y%RG-tL^tGLdveLVr$%JY
zw?Cs?%)j#Jy!k7{IbnX8W--~{FV!e-J<~;g|717ifV}mHS>9S=1}TT<h7F%%9-eB9
zJ|H&u%`u9Z4l__u8o<dFW?UBd<1)wSml`H-t@M-MzX-R9_ijxcAyFZ}f21=?JO#c!
z<&n3R2jEU(u#U1pL_8KRkRLsO`^%h(@}s}t{VV*vOyaRXUJOxKdMIgu{4)wIIpsjk
zN&H>FOBHehwsD_e@s|ta>{C%F1s;<GEjf#XD_s`Ir%*q;&Wy{+;Slu_{QVOUkMv$3
zXC7Q2X8~#iibPbRC>)FI6T_(JAQU?XD7-R|&c5o06qI#jmZA~_YUyD>XkT+U)r@Le
zlbXHSMX&iED*opt+f{V@A2nG4`YoXzf->kF_5UYaPI#cohmnPj=TcXX4~vGT0bfv$
z60_^5?^mer=rSSVSXz#nKU0OTqRVud48N%+;8OyKZHX2{9L1zR8f=|gd{tgr3?AZA
z-4}ZUypFP5@F8*kWpcB1e>eOL^xrTF>RF5+MCcwf@)yXVNibMnIZMoKvK<)MYGDY9
z#Rla}c!j*n<Wq3C5aOq-A(*LVcUqm2n-<<!X!0qX)D2Tw=nEIEk}99POQO8%a3r_)
z%Gt=0`bvB<=hIM@cpG&E5BD&li`%Hb?D7TL)m>?)!^@<iZU;Azo?XRMVHfF_XBVll
zwh8VP2CV7<a6dpiAL<L?Nf-jZ>PL~@GG6<qX$`5rH(rNSJB{tf>%YI)cD$Cm=99Y(
zdm1KGr=h62c`y6e72t?c&Nzz=B|jT#?s69UPqv3SSKb!v*VRBc2f7Js4o`CXRddeC
zhabTn;5Bf&D$$FUxu16$!UtG&9SvU8C-Bw%oEdXx>Rf$A&9j_EFty=}N)VT!?kZ>D
z5}L@HOOA(;g=c&a*Rte^xC&qazHv-!aF*Ow)=|299Z_Cc!>_67@P*5gr*C@-d+#!5
zl_k&J29HchO@Pl)mYhW6wkH15haFq9WIU{JYmkTB72OA;_|4)w=U>iTeA9xAmF+WF
z-V6Q<+rfcHOuoy@AZs&Gs?cZ)QL3LIg7euSdfV0$dTVYQPbfrobwQ}k>j_Epm>SQ1
zePL=+n)5(~v$5mTo%3?jgdE>Qu_F5-XQeYY4AV!Y%-d|6I2DG1<g^67wGN{)_S7*}
zIBEz+_TOx$O9pbF&|`3m$qjlOz7>3T_(1HXv7!F((U7Yo$7}D!L7;Nu;kB`$N{>K&
z4Iz-K-iF7EU=-Chb!1{fZ}yxbdq1Fyq5_|y0Og(~I;0w5zuCLWP)CR|-J(p4P^J&o
zT@ssp76q0QexPs&zG~V>K84eR)zLLnF*hEeLC-GIetp%=b)L5G$=IuRQ+w`R0v%T8
z>6qiIHT@kgnf|($zigf;ya#vkb-*ZFL(-E3F+;S}QMRTWZ+-EHa38MtunNYbfS!Ic
z8P_r7(ep*YHX#8a<il7F;&`_EDD>^0^}aTNf1o^fB5CUpW^HP67{ruzM>`t~*<Bn7
z)o-FDIW&(NbaT|)nGj~1?#CIi+eV)jkwUc2ZFIjAQ*-a!L&;nUnet90lkKg}D3|<n
zxNSP=)XW6T3`KoqBSjV2RF!`?(X0?`xoX8K({43%5)oeEc9t*qL6r3X1lCiqI4}>=
z4|5v2$irXf;uRXspJ}_d6Cdv8jI8nZCa}J12Lf#B+C=h!nj0feZb@<&hJ#Yl9W2qb
zpBQJR>qPjsvtsz@dH_S8{x(mFV|D6qA~sK$H5W}4au?s*Zf=~9@ASYvG6KI{+wrb)
z(wD{!e$46~NFPAATEZH+eF4=y`#&kEv7M4O2jf6BC}~JLB^|u(p8uqzCu?-!Is=LL
zT_p{SX;IRB>v{yVQPRcUstzA$sD<7A2cy59%QbY6H#db1{KIG{=EU|Yx#QArRB|;?
zK%8F9jl~GwPAffjxPV4l{6aj{sA+HUjkSD7?P4e#!uYykUc_b-Qp`^PDf&D<`Zg$;
z=H-LcWJjPnaWI_tKI+N{e6=jQNKNHk9WWEL-_7gNEYL-s@opXvFToOmpjD0GVbo^M
zV7-nnPB%AqX&KgilTFTjM*&T+2dVoiaBpwhX^b<u?kctqMTmnvu|8->JGLVe17I#b
znQU?I16!=Tx+aS4SRaAags;~J;_Lhy>wCwC(E6Wof>_}^DP-^D$VQ*9{uhG7&YOPO
zTcV4j&tpVrF*?dkdDmEHS%uTn@#zyR<)z-8m*GP`ZE%V~sD7EPcxjk}FYj%zk_%v{
ziPBfPVAlk#Ymxybf}+**dgoH#QoV-Ud0~0p!pA+jYAf6}@%1(F>=TC(x1rfNUk<Zb
zU?RQic4Q0Ew4ahGLh4wo_5X_28MQxPr5UkQj)A_4w|ac@DxQEE+VlLCHXkKnL}|0f
zWFci3fTX_1WM<1N7sLngD(_m;4IsRZ9(=S<H~Zneq{{3-<QU>cRvxkyrak)w7E$Iv
zhY{?C(8YU&E?zsnnWWQH@=s&OTM7@2Ry&C<Eh~z)80ujHUzyZ<csF{e?>gHE5_)lv
zKYf{+R@c#}Q&NRl3=l{S<2ZEYBHe%y1>!D3vVMcbBrg_K#*Pg-wJ`*=?v+uvo7859
z3};B1<^s3cVETS5raZWvrp-qI?m}faYXjXo58?|8^}`789^fe;yV4-oJJWNTQTrdn
zetzp7I1dKSE?uzx&iYP1<noBLKFrecSF6c(vZzhn2edZ#AB(dgn}V|1l+A?|Y*Cxm
z)dG$QCi4G}P$Afkwy<Htf7gZkH{B#o{oaz@zaz`<m3PoN7yqUL98zufdNM~KGfso}
zy@MV6Y;<zLe{-<IQreyn`4D#%)s}-D9KSi);s5=E9a;{u_?-?o7WvuetcCx&2McH3
z(S!fH4mkd+qbdGV4;GnibU4I+-GRT%XxjnD?;Wo3|04?=h|i-3bezS1-Gl1sZF}&4
z*8#_WdpgK}WI-1jeMkM@bfD_*INl_(wF8cSbH2&{hb-`Z<6WDe%)ea5y1d?TQWR|h
zv1$mHVssId6m8zy^kA#_+juz5o`C7F5$>GgGHbDrCJ33H0NQ5Y2}r|L?Gl0=Vm4tD
z<~*L`h^)Rcr>mhCbG&|+c#5rgeI$L5kaN)+aSa#@sH)+4r7(ord6ni}hkP3lvlo<J
zbribqavj&U@ma)WoxA6v99FyXaD6KR5wAN6>?wXGK`6_ci);d-b;02qZ)tdPHu$hn
zZ}b`$gVh1Kv)g*%koAICX04+s#U3gUeL}Go+cvI34|cDiPgEYz*AZ$yaa$|PtQSyD
zK(AM=Vz0f?+u_c*pjgYxtlag=)V}lOo|-#lx3;JQqU0E&guh41ooPHWIlnN0yxL1g
zM4|0_{vGej?s$I$??*G0W0)r|_fc2e*2g^k1N2BT)pN)YYk$L6RV@N}^e8xrAyhfy
zPSMJ&+Qx8J{AQRqid}kh*su^xoZw|~`%N`aRLwA|R+IXGL7i&!EXC@Wzjk95l`_sQ
zeZ_Is5E_Pdvh-=fBs|t2jO3jhVn_YAU;7BJ>^o}+dF9+upI+jz?bA1R7QM$;G-@wh
zU{C%r&S=B7woGlkAN%l+(FsNu_CIBUIJOWtQnu;HOVi5l;{hP-yE=t;@B{%Ok2Vf_
z4fG|R#^$8Q?q#7{EVPBG`7?Z$x~1ocz(u~cOLT}&^YKI89-@Dls@3S^L*vpr&P8Hx
zZW$RoYXomuyck`KbsK()hjK+}oThCX$$r|>Uk+858AnCubX305eg)Dj;;n7ctQdCg
zt)3G;Kvm@|$f-VOtSR?WGsRd$-Sy;{v>}+GwIw!D8>cDM2CAZREc&ps!DFA{P7_}d
zuN%7eAB)MS8T;y#lq$ul@!(jE1e~mw-PS61O0CkErY*kpO3FDyaBv!Vpyy)Xyr$Ht
z8P{$6{RrNV9%T`K3YXH3z4D<=?Af<44Wg~2lw+w0o?a{4&S}3^>T|9*R`{nl@k4gt
zPf>kvCV((10}+ivD*S0D_e(+;J)FpI6cCe=pI^%S-_Dpo`|se|$e(_ttUj23GY_xX
z_o&tj%EeLE3Z+zb^#SYLDHTe_Q7{d;*!)JjRaT!;XJ1e=j#f*^U$CAPzrB2zJDL+8
zsp2(db|qTJSzj&%#cM`*D-)!1O3sB$?eF)nN47pVwGHcGZ(ydladIAv;k@JWqnR3-
z1?QX=bB}@iFj7J1>I!m^a!$3?Bb*P?v~}177$)tZ(?k_}w3<<;l-Bt2wYkix)3g;)
z98Kk3<za*Jv=Kbj+v1-gtiXz(E~Hnr&C$&M&b$CRe=PqdKf3I={AscLX@P(<%YJ-k
zI2~Qq=g))aHu=w^9U4*RVb=*|bsatk#<TiN$Zpyih$VGDeD~)3R+N(tDb`x0LTOZ2
z*NK&Cj_Jk$gIsVCg&-Ob?dbEa8;Z3`E_e$`&L$%*A%Rz`aaC8F5RV8b=8FPLdR5@=
zo^C+Ex)^_loj-JIP?{F3M~wQ3+qm>~mKvRh*xm0&iL2Szce^{j#O9D3Q)H9RYGZV9
z-q>RK&Eg4SX==_@6%BJ_X8Yd|#hd{(6Vxdo?(s0CwL_>`9Y<F<_*`bKLW+Q5nD{O;
zL>^iZeB*#ICsp1xBg`lM&D%Q?1kVr3wdfnw#VDpO^H-k<B=v*(7(F>vo}5~38LN4>
zzeAnjUzTX5*_4t}hn~y362lH9hKW@EY@xM=SMk>9jY$Kd&mW5g#W^1&%b^KEs$E_b
zHO-S{hE*#lw%64>;>q#%<d~5}`(p}<KgNXI0en?!otko4nFt$~Qd2lFEc$S@4ath*
zTJrIl<3C|xU7bQWjt2@#MqSG!_d$CPPtIjePF+hIKYlD$4<(4R>#$;b79H|phn-!`
z*vT#vO0=T#vB;5;UB5sBl)BF-v%V7iUmvepYsE^k7~R^oGajA!u0~R>#a)v(lvM9W
zHK-<SD4`9D9{kar#s6iMRMmBR(O-6pbhrP_!0*q#KTwno#<D+uFt`^TqoG*q%B<Jv
zNqb^o+YyER;e!C_GB4=3qhRND1<AtEfibm#FNVLEXjF5I3M|(dF6T1~FBwa2lwi>{
z9XP!wDj65#f*oLJ;ru%E4qRWYsY^|6gACfbZrJZv8lq1`dul=!3~i2IE?DnoZ++NJ
zoW*v2IMDIp{5pFg*3#A0T0!wMQhb%`gk10u0LERFop0fu7vG~;cE5?I=;G>EaYIR<
zgnBm)0*%*@Qe#3Ie_KoW)>>zinbvQtb=eWo#lRv+xv5<BMl++&=fyz_N)yG(2Xd~m
z)Q|3ROs~PxB=+AI<LfRM<H(W~$<!B^<&+CbP8GToeO}&`5awfY#qWizUxGMz4O`7v
z+4UG0tTZ5sY`uzIfnLO1cBBG|Ix#Rat9d}PaEk-+R7w*di5f6OkuKxaiDq@Fzq&F|
zNx94_K3dQ{uzESFyFg-mizckZA3d}9ZG#Q|Dn1`vyseL=3Vp>OdnydKL)ObaWme4h
zDTTW-N=hYo!#>&e;Ghd>Xv7oK;K`}fPxULnb`E^`iftg*73(Q^mro&V!T8%SKrG_p
z6UGZ^o|s!G%%o2eJ74hFD-52P3VKidWHh2jYd;w;{n(uy|D<m)KjQJ`ezK7`+%fK=
zZnpFjBIWJZB>6FB*wLR1<=`EC={9A@0BOe+_Uw*vl5sHGx8n)iwh!8wEJ_pmvg}=b
z#y4P4TqJ3E=m-q-jnXjtPUU8i&=;vb8a8L>sR{P2NHtNaua>T-7My>EAu+5ktK1b5
zY>LH5FdQFU?TJ9PzO|gE{WWa6{AnL4c1(yq8hpA1`AS3nL86-OIOr!r*m&_%y$x+^
zr}btF_vA=#;`6&bZ#zb!k)mFxr<eUJz7@jvsMMgI;E#ko;G?Hant(L!<>^Y6Uz<k3
zk)FyKb*e$B>{uZe&;}^=Y3N*qI@zSub;Q8G8c9k<m6~N%X4k0?`@@@8Dmr3|Y{5z@
z40$RMD^zQhA2!YI;3-vcSCpK~!B$Ov{!^-aOod01QK`&6C7xEw*~rfxbQH_GCiL7-
zZgZjaXM*7h1FDMKf~(sVfvb(w4N*kxNRU3lr)ayWJR+aYN<nd*f@g<eL~+I7L2<|8
z>UPEB+EVeQ=8C6OYb8~?C@7ytQE8WBJ(eI9_eNaZu2*qwsWe-!<aXu3658JI;xIu^
ztv`hKyfRk^@Ph~oWv*2yMNc`S-EQ84tD1>0adWJ$Y94CA&0D*wUB!!<abbb$gkxp@
z{BJ!DM62Bdp(e5Z8~sV%e_A`*QtX*?N`(#=n;<@|gO#X&tIz_xl)rd^@1ku*ImPbJ
z2@SWak|?nSm}TM1GVIsHu%N!lJHK;flgHsva<sT_l(X`LW6qlq@(aVU!N_$O47NW6
zlUdwqFlp>lcW`j>t`j~xT-2Prp%jjVcvab`XKXl-U_2LBl5-j-YT5$`V8K`bEGuvm
z8bqH&SS>iChgD8H#o-1Lp15*(Lb>y1r0m>@SSTz&$t7vG2c;3@9;)u>LM)CxF=|H_
zDlBh0AWx{kQfI*l`^Eb*eqP-V9%F)Hy-+<34Y&)sP*d(rbd9S(;Tz{rXw`YRcksui
zxMN&^i%n%bKDe7*`MjqCBckSP0Im*deJz*31l3KgViE_umJh4$fUM}^c8NW!uNq12
zwYI6U^J^qVpKu-CP3_pHx#QjR;ND4s5PiO7nBNV$2=)ENN`=kb*EQxn%<(|4A}T8v
zR0D?c2A3VsD^V%OIdojm?GL!)X%qsy^|#rUebJ5$RCMi|#EtRrZZ{EY-Jg>%xp&sy
zYUX{WHnO|Udux?)g+8W)=Bz~>EtrC%J3~lT-kjJ{ewucdULGgYkg_Q|HRNeO(b(iI
zycHE~TOhia(P?KfZG>c@v=1+xM5Rlpw3{B))x~jNDJe(g314w3%SUfj7lBlF5*F$v
zLZHlg8I{5RgGx@hl5wgg1Re;8o^n)iQMcm0YObG1^=Dsp8{B=UMq4Q*uX~lc!*>hN
zBbo6HVORDCIi7+jB}W&3BDO0Ffu?TAyBh0HL!?P#<PC?MKZs(zyy1YdR~H52RfzN{
zh_qa=4y%@*z$zBkgp)$J3w)`*dlOx~(w5gKuGoO-|4r3;Fs?+NP~vQelp~xAQPV4Y
zn4UDdA#e*;se4BdjiS$w+B+hIy;a<6R&w;=?RO&TCg#YyZV{r~!pIxSyoi=6dwEKt
z@m5?p5T)(($6(O&j==jUuIUXbx_6AA`tHvsvYsWq#eFQUq<1Hxzqi##N_sg!p5L_U
zA`$Yo>LpK`R=wo8#mPgh-c79@kcd9sR;j-GbGpVg$(u@VoX@)j@+c*kImKO(CtPth
zLF?%#X}86&^Y?kV*O%0u5Ct#84-hYJ5HCNzgG76|5tetItv}<Vb57pyh4Y`Hcnc1#
z@`e}L>bOH75&4eTC?Yf+P;!cELcP4?TElfGuAvRG$JEu8H1qfP$ps%9go)^4RH1*Y
z$~7|XkOC&dc%mQp^i*(XiLhSqsg#V%ZDlQijM-qdpbJSdI#bXkgk3t&$3bSny@{?Q
zKOhh{)^3h%nr^<+v@?FX@^Up$$Z&gF+J({n1C$O%+p5{;v^U!7-WG$s*K4q?Rb;Un
zn=SUkFxj0ls=NYj59c=fO~7kwvuipv%PS1G^^|gl(e^`e^qGi=KE|sXb%R|zYGap`
z?09Kl=FhQTuD+)lM;El$)Zf_Z;v1EiETOc#miB$dmdk4saF0Ihy1|_~m~RsolIZgo
z-q_fK_YV93)=7C|Cuwf7Qcn)V>S9=c$CX<xmfrn2QFlGta<KQzI&SA5rb=tM!;qj{
zR7z?>TRElFQy+COIa_Lc;fmv<EUTvQ@ql(|EP}4L15dVh0n<M3^QdwWb5rkN@-;9=
zBb1p?O;)zW^rJ*|CnTVM?n=l!`s=1ph(5w|<E+`P!75rY;E-W#9Ulj=H@*n&#Pxy3
z!w^>TMR&(ini!U2%<&Eqvde~`MfC@`fW%y=H_^4lKuOu7VLc($y8+yzoNMN;>x4a(
zCR)c69>`mDw<pg2Q<I^4+|8$DpA=)-qNpia(cN4QovX1Y(OC+VF*i{is}Ve?K<rO3
z<J<8C%0y%SLGmZP(+s1_b4ZA`2PI@Jib~U-0R+;egC?g(mS6Z*hjAz=R*Z6%Nr^Q(
z_k@r?i*Fyj?rTSgemj3wGb7<j8)w#W1}S?!gCAZLLe(nqq@AQRjnaBin$d!^{gf7n
zC%s$@rTq<Qn5OdsvTgGyMWIp=sMMwjfzlA~)DP0OB~iIr8EJd*<R}_RO<bqM*;LSu
zry?A6DcIhpwEK~Ufsv})(kWp(YI5&ekMm)cn_oK%I)vGh+DU!Zpp<uPkPDn}5Y**H
zb)1PNzE?Vy$OQ#Rf|je}%<4>krKICoxxm#)2to&H#d5z}^79u_06upEce%gs#Qs%w
zUk}|`KGDtT;r?<4=6mIsin063g9G0-aelg8g%FPxC)aIaPnL(J^>w?+|Aw<U6){vb
zLxaEC>aG@`Mom9*SLun|)xj;Lba$01le=1>-BW}5tJ&A(!PBmH)*XeN<W?&=m?TGL
zPl7!kQSv>!LhtNYePhH0s4ShNc;vNFQ>JO11%t4#To^h3pi;oI#Iw#rw{y-o%j%sT
zmU_6mgU^%3lW@g<ZX9eCM2}o>1+J0G8=_YJfmVi7E5$9~v(lz%f5e9=n0M=7<&VlE
zzXW8ZGUuGiJ%0+Esww4|+Q*e+E-ojRfY@Y2UZ8zpur%Z*A70>S2`uP-vbzfSb3d8W
zu+>l2Gd3JZgr8il`^mk%5DPvB#IgbxRfX*k5^6d`7uWb87fo|y&^kF2&ZBUDN~)wi
z<RWvcTby7|fX_oT<vtHlkNe5ToyFWw&TEvi??p6C{xri3>ox&nXWSXYhh_KMfKjdZ
zvNw<Pw2<LLm!`Ypxs&YPNi0O~+H_7}+x7)I011{p0>wcXg2~P5X`ls*N0kz40=%uE
z3!PfaLH1gjUR#6VQn`hL-S;1n_m?WOwa9Yp9z7mcC+{zj#~&hFTS_D9PClF40z}<!
zlCUWb>*Z;gT6RZ$P^5s5*Q2F=Ytw&(wC&^*$j|wdj%rTJ(#GrMF+GR*hesPrg$K11
z=Hu=(_nSoiX<B!0;j=K5UZ0kztKF&va0lmx-UdETu^v@j1WbVybP)=OXQ<Y4&Z^rm
zglYy<xGGU8a~n8am6QuDq7Ktu@E7R5b8i=-o8Z3RV6TD4>-BZP>;?=VZht<B_>341
zrE#=!WIb&50Ch(IHH#1Wb_7tr<xR!%gi_~$+lc91j6M-BDNW0J*UWPl1W@PPJLw84
zZ^C%1=VnjbCVF)bF@TMmsDQkyuKtA2#?J{YdBZ{H_o8?j&W*gGSaIy&sm7|f<2e=B
zqEzq<dI`7q7#0ZB)fMpcCNw!cz&#)7Zqw($8j%AEaVC+YVqXLofu`I*cw?6~2xCqM
zgyY4hAHm6kqoNNJQaJF#O<eS%!_~>rj1M8RgC`{dnXhtA5i&nQW*~9O>T;8zrWZy)
zs_x!IR~iA)>3DI)AE`vWnsTa@&>P5Ajp2lb`_@Wg*p0>N#u3C}LU@G5<7grAp=OL9
zBhQEC7liQ+9)D<_Rp<n4JFDOt(q>i>PZ(pNAf+76God_!B;LJ=uB|A)NkuTLs8t;~
zrk0t76Cc6jT!Q^18qM+rQnyiAcxA=*+_vU{NKWcWGwCzBg}8ue%hSuTWAwp09c!>m
z-RR;*e%BR}2v-F950UtSiv;=BJ9M2lR>zg*oC09(UM~b*gz@b1rUNy-F;gNC?oD)U
zaYV!w>!`?=h#J9@fJhd6NVRf|@UUIy3;pl1&+*Q8qYvxW2$2anRP<UQiow=`@MFoq
z%)ZQx&;%lf*9Z~JvoJZbYaW<iGnfZ$Yf&<~*qc6y(*4O90)&>*Baw=3cvl>1#>AbJ
zUw8vXgThypk>z&XA9BDUx?=F!ph`8xs2Ej*#IP&^7pVFoxql64G5S2&cbXpb#eA4z
zE0^ull_qao0G=!#K-)<i-w0P9j@ZCSY>ZPxX9+%(y`7_hJ$(QSxRRUhD40!tY&|eV
ztbpj6SR+RtuIbE^^l}(EcqpwozVa4)Lb&SOkhIFkdVIT6PzV8nUh*;I_w@2S0=5MX
zDl{8QCdJMM2NpWWf5U>o3!Bl~7H5)_{Dgh=Z#~Jg*>{UqxFh+Qk4`rT@-=zQRzOkC
zDpzgk{oo#@-Gvjb3c9ox7icX7jPoIRSV3A{1uPtwbC$Uu^k5q4q}VjP${PkFaC#DD
zYEpO^8t_ug+oN+VY6h)vZI5y`isX&@yC3i*Od*H#9$-R+;E}o~U{w5S)ku_$yPDkr
z94!p-8>f^hC#j3G09FB;E6LOKQxXl11<EsUb;)znUESH2m9n^NE6!KnLq*%hU>&}2
z3tK%@19kH`N^A8{{VDBnN^A8{EtEEm(x#D991Jq)G2OA0=D5RC9)v{Ytj$i9WO}~Y
z#)EBwpmGu?QFa~PxbLdFt{W+>meN{X*8)nbq_hY$+Xm8Df^-GUa?GP5(e!%N7DLbd
z@Z9X!@(ls}#Q%o;+VudT-lr}%C=DH<<S&wIJI<)iG~s+BbH_?LH4*|ysWZ*$IDh*2
z9_5>khx9b1N&E&U3K{$k$<LRg%qX0wPVbIjJE}c@1WDqpZb=ryU(iaG>{^Hf{A|EP
z^?^Vo-hxj|FUm;`a#AVInQL;-s6tkRY&|P)Z8VpBZ$=$hr3dR|YrSl(kgZ=T_4vf=
zIL_>nw_Y*U9{@;j-ThF5Y;BUQM`UXyzW-`+PrEH|bu<`CzBkmDpa`m$$kvkpqLjLy
zZIZWMlL#3s#x%P9`HU46>6|XvdRmRKU_yId{-2V_ujF@5p8Qq?LW6J`R&WxISH!Q6
zfF|=60886~$eVKEHUu7(RTh8erLmAi6hpQV1T!g)bW5Q8PW{R6Z<K@qJ8YG0Ktan%
z4e$8c%z6zNp+b!OK@%@ghx6CchvOtfB&H1qq>fi*mj<7ceg_4(DUI?w1Yz#UZ+ZCx
zIFAbKIr$TRJ1Hl90{}+(g9B6;X%1kKjt(I;ExIwfl<-DYM8}g0@Mx1=ZouBX1-h_@
z9Zq>}5Pl-!RktCpq{`sC4WZilYNev2u~Uf_Djsk)PLZ8~=xNEf^m|Yy91|L-e)2wK
zN;wJe2KDv#=(!G<$Jbv%yRnMF;=p^lC9M7jv=*XN;yD6&I6ewbrurWM!xCLA9sxXm
z_z6BZFV0yZAdh}JYOqqr>m?|45TzKT2G)O%^eA3?67tIUlZAd5r2c#AG0Md+@G0B|
zM52r9&x(!kLI`RUSmlpK%z&Ox@{&i*Bmrn0&>@i2M67bA{-1bDLR0bH95Xs_9C=~&
z|K$4vq6wT?hnfT+K9ej_&NFn2$4!Tgv&8)UO7N;oa#&`8TS@4r$tT|8JT3UFvP9sP
z4{{J1-SFEacy*SEbp3WLc7UKLKKMk7@(1<uJC!GYI{D8V2g3HCv>;ncp%v(dK~Abi
zP=pZ24;#s!DxVPPk&gW-B_3ym2hSn-P38d@3jhqX%nouk&C9+Id(@jc$*k0!bY28|
zs@DK&epA9YS;&shZ`y)$REo?4NFwkgk2`=l5lZD<^R1bi-=x8a7R^J2-SpHZ*QaJ&
zev@$N7vJpO`AvB*zlt-E0B|=wIocHKPy>``vRFiAchggw+>YpYEa(&_@45zt4h9kF
zC&J<fk)3G>uS`ZS4A>Z9w@e2+68eIGK6d>45;P5*4<uIDEtB+H3~rHE)fh{VqYS*9
z<UAmvCVtX|c#>|hP-VROhhKz3!cqZ9Ab><5A{=9>zkxx~fN#oBGUDV9g@)eIH{^Ft
zLz(ozKN+D$u+i8Jn8D6jl&isDxO<w23NgyL<wN5jK61gcG~Nx2u@wCs<`z97S^Ku+
zUp`=fayt8^J#z=a8b6Lnvl?QdrdZRNzK&U7oCypLqwWXetXV>x)ZvKpgy2lFm^^qR
z+E|>&J&}zl9fkx0NnFs?IQ(K0-i$!UO!dJ%OdziY9f2|iVv+(+gk%S}m`9l`L1fUM
zFGHff=A9t;m>d?rbEAL(7bVhaWAH3X*zy=uF#%#2Rgb(Cbd>-OB1{2;O2px$JIV_>
zhf;vLhMJm%U!?(&o642bkzWR#85LqdCf3h`j*~y?t-)Kn0**$Yw_y$%&kfPCb2<P}
z1;FQU&nVw0=kR7$zLK4pFjv(HggCT%T=Zf5#1?2xyOdPuSfd~CjzCt7T!6JS0gN^7
z!*D}=H-p>p_20WqidSw7Fm~>caY_R$i@~DCKoC&d0&4<{+@=SpJ0u+dXI9Sk#V?a7
zXZqrNWW19R^ang6J9Rd!qXBd-M^iEE*R#RqFx9|$I>>IB6%74n5$D403sLI)$|KJZ
z5rU2Z=wMX#M-@77nR-dOY(l$+$cCV+qmnGKK}TrrgdbL5&!3C-HNx=3vfbzUIt=LM
zAoMEeDoR@-kD&!qTpb`8f*R%L@kJM%W=Q<7Am0q=v5`lDV=QrvN*%_pC;$c3{V`36
zC-n(K#RvkSt~M6V>fn)`O+>6!mZ+vL<BkB5C8!Ci1O>XOlb+2yA2KQsWr)S#r*gHX
z6TUkqihx>ZG6a<eD;059f*O<x)!&jm7QfaPDCES7N6?;;eSE&#C<EdMH^Fja<kg^C
zaTUP97^GV^r;px&Nmz=WWWk|2&I7+f*qu!hmXc9!BJ-RNbi^nVi2>8OA74(mP}?9P
zPL>TL+!TYQh9^)Dfd44cqLW-#2WO84LSaJANPvqKEB&s3+BD+CD&-*1;N{DZ9)fy<
zIqfQgt_}jrf$ZS8hM*(a(~yewNZ?lFPYpHHe;ZfoHod6S1(ox0Wa9Ejw7#d3Jj{mr
zODGu=*;sPP2Vxg_#0L!T1`&v>3<hO-^4}g45Pm_&$_Q`4J^y-hR93kQ$r1R?E8Ni2
zWMj>@I6T*mF0z2HWykPF>^p7sSnCGDpj^I*v{sK*AR|*jX{{csnbP)BS{R;+hM-Mb
z8l}BQX<M+bLXXE*(ze5ml-3$mT}tI{;mi?urZFhUqpIsEaWNHabxrdqZ93AF<3&@b
zg(|}CKm$AT^{?Hz({NhJs8z}_;395cuC9BpAN$ugnbNj?Y~01g(kK14Z@U;Nc8Efl
zP|K~~URCvunBLmeg9N?sI$Au1ry>hA&_HQ+q^T+X$`M-v)vUUP*9?E<iY<*^kK?r+
zKE>CzpZ&I{DB0@RFaI1U#n-X$%M(NMsO;veD0|j6m!3E1&r9if%~e)-d9w637dv~o
zzf?PziQi44x5?jG;<peo;e^clRP;4ErDZRkib5&v0<VrV-TiLf)=_{wbzBJh=(`zw
zCt+kACQy8zO!H2{Uf++REip5{|Bm*_B>oUcZx8)2P<r8W_QDV0odXx$Z5up<?}laD
zf5_{=e_-|0UUr}MnY8t#?e*GB(ILA6NUg@;n{Z!sLdbiD96RX0d(tvs*Xc2<P;i)B
z>s=-4<UnVgPuf(^)7~HUq#4~gLUBT%CkLDKYAJ{Rj3?z3>p6=g+mZqx&^GHGWM$Dl
zI7A)~I*dwb^+u%NH#x%q3T-d)u^k-Ru1?MhV5Vl&9<p8&-6_}b;r#@E9Ls^#@Dxp*
zj6He}hbi#wQ;rtSz95@BxK~#pbFZ?x0(+a@BTzZUsae{iXay5RYzFM-MJr27r8%*l
z=;yZXO>0Jrb_aIbE*8!)97^^Tl{)9aSg-D#LftYBv%>qMrKL5Mt@EaqnG=3}&5Dh0
z=I9gZM65Yisz%yRhTUM+DtsAtxaMAc-3IOFtqSsVk~bDdo`k=fQduZYo9fBAfT&6{
zHL>JG3t5e_s{yQ{_>7D8@y6Ay@K;kzN?G-Dcxw#^P#QGonmb;MEOp-MfT+vUgW@nB
zn~Gx5=hx@Ohjy|r8Xq^iF6Vl+V@$icJjkcqbe8!zf4GgUWJ+V?5qk!9KC}r*L60uy
z#Rqkg3r>M}<Kxcd{6y;-h-(x##2rBRbVXFniq;AX)+?(oyI1*$VkKfk&u>GW>K(Y~
zbsVUKD!VZr3u0OG62il`RT%?&dH#)G@NWcNd`0}rKSbA#<sH8XKU9CZ{!kwN<#cu)
zFgnYOqcTpdI5aAw&i**<O9kQ2yG;m}Yf63OnaHwMeBccb_Vy0raggILj+%J!Bq#>y
zYQ`};xW<fEB(|h<1jxMjz)to@;_8(KdCi{?uc_&bM)aCW{dQ4lh`S2c5Q}-&?9+JP
zD)X@0JbaPCR?NkPIEvp&OEW1~^@?2VM&t}afXa27$0w_Q#SIg|Ti&gKtzgdA>_#kJ
z+J=pxVGu<2)ssEgjUT&7#Y0)=pW-{|LT=K2EM`-FqMub}>wgNR+s8lkmU``C$A9W8
z1;)_^Prp0%ZNB~k8~*cDnQy~uXx*c{@#isp^j}Z5-cagr#$u=Jj;5%>q=2gr)O2et
zcKzpY>C6t+qwZ;$+m;zPwLbsgdhn7B`ByN;!niyf51<^|Cfdyt3UL@loifIGFkV-s
zIR<q+*_-<yt=MDf+0$h%Yz`S7IqA6iU?8Hs39vWWUVEeHKis=}8kw35EJ7M<-gkKr
z92(D!hGeTCGNZKqQ^F|ifK7Q3ZM3r-<GJOy0NGX_G{b(#yB>t`K*(P!#7Z5)jk~P1
zh1N=Z6(XB`U`BRhg}`myU1qHyA_E`ZG|WSXZDMsKMsh5lwwQ#YdgIl8NXH)hLv;(q
z)7zu2d?iYgs+f3fAU=K>d@Vyda*;W&MMzV&u@A1L<L8B>>mvhBVpOr#*)-4&=dizX
z3O{g|c#@@DxAa9$QK+kCic&(;1m7nP%!@36L7@dUOqWou@dVp=J=}4^2RrQ+&6}F0
zJ;{Mpp#;s@P-1Uu-V~m9nMxw#ZDc5iywye`3lZHtLTIN(eXlyUuOEJchMbR%VeTVh
zJq0m2{dcwX-{GdiUDL<ZVHK%1xjBbYuBsVWJZ$*|?lIS~W3KJ{4K<^x?Rx{lcKSPe
z_Ls-S<LujC7T==_VA6e%%MxVry`q>0a3p9aJvE*b*NFDwZUdc>koUYB<AS&>Uje?z
z9fOP#1)J~r&inH>hLTcruJ0A$tv#m6S=OYCavlufGP&nF@K|49HVnf+z3&^AR==dD
zFUG+|2CX}!+eshI6bY2ztNHHOezv|&>bVkSu^PGe8}cz~Z8p3@O6#=0eZ&6QI6z7>
zG1ILKDQx8{4>2hOcb0#v+u*R3n3<m``Pu0FK`xyAqrB^ndW!Q~87G#=yEf1(@?PAJ
z3dOhn+P(V-d?phKb8RaeiKjmFv|t3wyB*Zscn=c3r-Z2Cc&Z>FntKoX==Lybt?G8j
znC8|@ytS&9)|%VD)ROXh?Z5KJO;QYd>eoI}UDsF2H%h%b3Ek+Bg9X0kZrh7~%@U<$
zQLLM%Q2Mx%z3CZdE<Woc*h`cWY^}#<6Q7)A7d)>^x1%;aBZg#g1C+82pR$x$cht#=
zSX_d3?Oke46x<nGu=~iJ@*XxKr~Q3Aa_F-v{**%BUHPJ4YK9q~f@tDDe1y2;ZtJV4
z1Ko^|-c&1w=$q0BHX!WKA?#LiUIqA8AP7-319|6^4?b`+x-(21n~FE0=$oTcG!}W6
z4-_jPz0Xn3*anz7^1IOhZ&wG4uT==WgK49HGti{^UNn=?g3@S9kA^V4imytV9R=OT
z!`CSE$<_2gY~6n4fGFk;ne?s40|%uCef}uf-gCjCHUBvJ|Dx?(;F~Dczwt~OAcerT
zkV1h11tPRiu+<_|3KVEdfdYj>LFJ}$uv}Cw38DgNn*>?cC<;0pujui3yx<WOfudpy
z*aD)07eGXT<84Dwiy~Jg@AsMAP11t=&hP!dfBn$x&d&9jXP$ZHxeZ88<MnLnv?)83
zF*sDJo&Uq{G_#DU1zB+CD6v-m*et778g@X*e!L&0EU@S)zbe^pr;9x1aGuP^(<tRW
zR{cXWa0bIJDE9Y6$~~<5Kh3hBSvm{8CHw7^EdGa?C8nkz_qJbfu&!1UJQq4UTPRu$
z)juadSy1?XDAdW+HT!W#79SA9dYIQ|@mcsy{H`yC{mXuUVE@)G07~iSl<>`d{#p$C
zAo&~trB=`!92QH(>tbZCRO!RE&-h9UYd48JOB#FbwKCTL1;B*^5}X;z@MmH36?uOM
z|EK_|{p9TfC_2Ex?$sw6I|h~Qsj`)=nDEDnyg#>~+os^1%GktEdT72qG>)_daA~_>
zVYkIDeu<VedAQx#h~3mHuWr^M;xJ~eRGc?j6w8g3CcI^QlW{2ZRP3p3^paW=ThsYt
zVm>zi)`<O!nP2;G^V3b(v#e>dSQ2-4NN=?{H<tCRmvC=WR?3Q!fnRFtJ%Gpg(sX(r
zv6o;YAJ*Rf*p0Wtr8)HFemnz*w3oZ^Qd&gGGbl@S>2!LYw3}zx*iiGlbiT;O`hcV7
zuiIFAdf#JX9qIRkja^H>?VGcE=y!E<c0ct0Ny^e><tA$l4zqMDPE5yt__foo5NK$^
zjY1_a5u%6j5Jya+eaSQpPq~l=;6z*m#KjvV^oUdn2rKv6<Rk~I7vF&(81l%Y_?RLe
zrSK;beVzhFxRL~3XWhS9z(_#M00r6E<CMXU3?%;wF%+^$UJ75TK&f-SsZ<dU%S*6T
zP<5X@`#$Z05Wszg;t4n*{z!!jsdf~@&gco5C2tuDd(O|0Dh`5LgiC%l>b5w&q`S3I
zw0F2@V^1hX^5&yx`FSD3taviI^i6Fx@7GJWF$xnauC?2oqWE}YMPb@+rHUz0h4pfY
z@~+AcZe9Y3xx0}z>i5GHH1UKQN#5On8%AAzUWiyL+C|mzzUQ0vL-mT<8XbTjR_{Pd
zPpGlvm8pDQ+yD}>N)=y$2x+6QoU>=zoSA3O>gC&YL#DIGXA<m2hO21p2{myRP;nB@
zN)^vo`22X5?3TP4$Wwiytp^~s$_FJM#ngin8co#Zul$zBFlA|3I~L|cSV@wWU{7T*
zDTd%R6X-_OkBS3krJ--IC6KeK7fnY-q!5jSAC5IZaMM=tPn2g^Xj?jd^@9MP9>*N+
zvI`{t)r3f{q(#?~ww9!}md-HK2stN06zbVe@>?tZ^#cOa#nairmfFg{ALlTUp6kd~
zYz}a3UNo?Uwt?U@aqb9C5<1)9Sh~`~6dbXo3H=O3W^^<YAvm!eKs<&Y`h_n9zE0W#
zVq*$+Dqk8$T$ogmi3$l#1*CzXNn2<k=upwtj0JE>lfPU~g4=%Rf3~O|xu|x4!G!NN
z$Z^s!+7z*llnKdlE+5#EwRYoMDZZs4d<q`t;&Hq*<R~8J$-7==kORd@xs##VF)_$s
z3lOji6=sAy7p%gRU8;B#^*8hagkQq4upgjob9j!Oleb5olya%eU3bGRkk__kSup^~
z6RlWVcjwgYtfoOmXm$sZZ(u&Fg;x}HC}wFQ#A!B@g7CQBPY4<`MVc%VVnb3UR?(>I
z(6sd8zSbB_vRqfKHpN2@wm;K%&Bm9E1F#a+K^w6zoHIXeLUG47EHX%eAr=<O56Itg
zDoKtj4TVHc8VZS_H1uPjKr-LZ3XnVf796ti*2ur&OsJ8`zw+r&6S~31)_K2wW#S*r
zO^xafH8FMGm$3^1x#Vg!-k-}DMjC`74mY(-Rw-Uf;0H9|sYR4WocmB#pe#Fw5kZ^A
zq&!HLhhRzNe#W+^9$3@?HIbw}HzOpuHw{jXvHOy`4mO4U0|V7F!M6AkCu%0efwp^{
z&ENma{+|VK;9Gc;U74Ra3}CQCfIM^M7-u})U|k$4!4^gmil2k=;i~RNRY<a|XTd=L
zzIL|&oCb4CfEjw+FPao~j@C@esEUT6*!MvTkj@6J1(X9-hNQ7_3GKv-w#S%et~?KV
zbQu4B#XoxHwglGGynZy#N?;xBg1y41AeF(~0iW&3*YG(B*p1d^@D&NHTO#F9#@Ll<
zbj?>XX2&8QMr`smye5GSZ<>R>6Q!(G8N6+4mSisai1%&HMkEEfV7c|P-v~tC1Y|A9
znY_A;Khv5eUng1yy`fr>PT^<aZuEDpoH3BCv=&R((`c@Jpa0UD701k8AHyH;n0vKy
z;q<a`5S<5<r6;vh4fnNS88|8MEp1q5`u&Q2lONiAsSWGLnhbV<8_IF<0c}}72>SRv
zZCNk#&uRRnw%~nErSVVOvRUR0+xdWYET?6s-82GQKtT`Czmy>^{zyAOZpdr=-FB=;
zr;`x=QNOVl;UXGAW&oVbV1k~xQG3=e{xr!7uc0v{L7b-^+sa3`XJ@1wbVM4mr}~#p
zzN#&QUA#Dn^=Ur@iBy&V5zL_~u|MOl13mml66;Pq+>2kfk)KXt=^a))B|r?gT7gVN
zf0A(xHt-`+ol?UGcVK<pklD+71P5@F=SJo#AaNGr1mGh0NmgY++?gRsRvD(L@OFfd
z%LXTH7(>ZR_sUcDk$Wup2M$SwhnTA?Tp=Mm!nFaj1GVU$GQzHmODs}XqpzNw=>c4K
z3W;ap#Id0TQKH1=GbwpgT}D-H-Yy!I?w<%2ooF)j>_cD^t7e4If!ZA58(fo<%+@o}
zl=C*2%y@QK{kGx3=1TD&?4W0d%~O5aIYQc8d=A`e5LP9wZqnw3d`d^=nAR%zzO?y3
z`32g^w*t>ip2Mc#I`Zi}zbKJTwVUeDSd9JcCB4Lgh68^vS#ha;80L<~y$l%6%P1wE
z!bvf>SpInM{-5^;l*Nd#o|umg^16;J!3q@zVgEedyc3(yF4?m)O&mX0l1D7=!7`1~
zfBD=_tk!J5miI|!3+VTiWY&H2v1B%qC1{gRh6y&grut_c1#-H8BLq(Ry0G4alW%v?
zaPoK;_BZpUN?y<vIO(X;aPlDnCU6fp8Sh}N`0HI+TXX&kd{@^9Vx}92nTbIaI{FF3
z)Jvpy><_CbW06%hz|x}|HcxY~u}nwPYU<;sl|a+?uVL9{wE5>X;8M}Y4&BgKVCAT8
ztgAWgHNK!5%glPrz)GT{c3@??hLy?c$#+HX0YcI;Il)Pi9u8U@KM0WeEI-<fEprQT
z)Se}VI7)!mIDF~9ID^4M*-B#CQMmaT)N^sW>=_HPOjXe9Zi9@yY!`^aOgZl?Xlj}a
zU$n9dGZyqTRlV6SWxKR#JIn<)muYf@ybF-dwckdd%5J)_y)E6nBDc?(V0XcRlwD}L
zuvgih^cCY9oe%bd_0={)Vne_}_4|?8b0$XE!Il)kqh-_fsLvO~UgLK*Iu8MS#-~LH
zcrlx)zuZqypp9Uv5yb-oBA;uVDXpDoNSjSFeN~I6!sn1Q{=}HBL&McSTV|bEHT{=s
z`U^oxMCeCjo$!n31Uhv}t_wVl?80Z!C{G8iaC!HY%AYpMLu?qlS1ce%4`(dsUj4Iq
z)|vb5R6c&rff=d$gkf%2lqdj=Hif8hgb+3UG$J_uY8AMzP=g_?>}?1u`_*e9H{qmb
z`=xEPto^wOKc^lLy$vQe$aE?y({HH<GCnN<?g8cl?$cpzqhq)mcocPxw<_trGtvrL
z{O=GqV!(_}74Hl71THpmT_qhRU|UjGeWLlS!!#|ahh`lTfC;vm^C9l7!5$<;UH)l*
zlwT6TBM#K-U*UisAlVwA&XAAZv)*&z_C;MQg?MnEeBkVHT|ig^{DC}-pqkr3_3XIh
zxzH4*=jfI|#14Ux0b<C`ej_{?jjn!X^gY6L@Z<|I-GsC(_1u+v(}8-^LG=&)L*B9K
z(m%Thw17;mk?N_s1oH%7{|F8H0|mh%`B(H<dZ0N3q=BCJgMPM*?kDh8=;X!3_;Wj)
zNc{#YqNgZ!&x64Y0FIu&P&9!20=OBUVu74Ut({oXQcTsP#gVDHg&$uM)5Z-sFs*d>
zXeefcW6!ITR<y+2lrOELS&%PmYlY#1+Ar+wSz3oaK1Huf>j1ayc!GX|aH`M2(SaJg
zMj*5jHr<M=P8YULEKw&v6$5{VIyeWR4fz~9C2jt)I%wu4<>n4<`Cwbj%|=a@nWys`
zG)>M%pZn+i0n@QY2NpbmZi+rE{~JJr7#o`W7y4vvdSQ;8S_{Ytt_9HVbHGz`Np!Vh
zAQiySguqiwzxen*jSXbReMkT{_3XqzM~odgGtQhn)b`Q<0>S%Ooubdb5)`h}pzs{h
zG$;`E=ujANa7=)Nj1edZ#SytOEj<|#J7+%`4T(DTrNkfgm=oPu-ypCFk-*&o7#j1{
z5EzU9kPkEj$F0Wb_En!S&-zrXniKJJew{%O!Jt93!-C-f2O!$jfRbqx(>}uXGgo}w
zMg#We4#2T3^^(5Ee{|`Hqe+CL_Y5p{!k;|EbdED2)QONv#la&lG~cE^7oc(w4&z<@
z6pjW{c7*doVHus@E(%=xYgB<Zf9FTKvxn?r+d7KC59K@8pl@Q^+MJZeGTGpXCCa^V
z^2ac)Z|hlRH`O$`LS$FZrI53AU1+q$g#e)x-p~k+ga}d7R%M)M9sAum&&fEYLuou;
z+l$$4$WlrIgHXcccwW_u^%;m1Se$R19YQ=W5&X6m4<hm{0+hTFd?5-T7$1db9Hnlp
z%LdPxr@otw5L2Bx%ziN<=oBPU-XnsStBwAFAW_#IVeQQGKIS8juw=TCQ5^uQZxSQT
z<BN~5PCY0oUQa5<ft*hJwY5!X&#WD0p&xmgwRV^-=MG+dge6^LxtrQvdFU?sAx;uM
zYw;I9Ye>p~KwZb~;^wbePrHgde&2XtLut_+2xe8JK68i<{+jj8#;79!a4GDv4F<TB
zN4>c#y5O?D$ug?yr1ej%MveZ5>96GbJN`aj^*P`8HFI=Ex8+atn_Sh}JZ(r9&;hyM
z3fu=e?=F7+YgX^hJ>KIR*0p`8io}7aCeQQ=ItGc$RQw>y)beUx`VA{A41e$;Rug$t
zyR6H>KS4}}SEYqgVo^V+ptHURK9uokFf+0$_1Ks$D2v4XRZkpcw{^G?xr0!PDw_z!
zU_Rp<7~1?I9%-Jr`zUMI_I7wvD9hI(O}pmtVR}@*?rh?39%X&lF0LMBsa@K?DuN7`
zzef-S?^Cv<ncq*(YJ6{WtvRB;U4M+FN;l(MC52$~7o8hW_ZgpajCG2>k-p7P4O%0R
z52l;xfLDlOGYPC)x)&I5$k~*_qBc^q;d!YbtcA<^P9`Q(OWd4{*7A-)ZXOo}N8ceL
zaPZct65#S(f?vScP(oT9E|3284<37*b?vhc>}$9wE#h_y1U@~bZYJ;d3H$0oaDO_6
zN+e$~sb=@9y^~G+*5j=8FduTvhNHpf`Z~d>8m=^GQeQ48U5U!I@b-1mh7lIrpF}+}
z*A5X_>^TQLelp*7oF$Et@d3@ZRi+%O3pI1aW5j9;tqW)zT|h@%&C$HvNsI|8J~a1t
z49P!g<<|LkLLHT?uB)Z_u<-cltYiIf)QW4RGG%o*@Yhz7U8#A4MU<;0ayq~X&j-2o
zo$u!26ikqmyc40~4%~)62F&`RG5KS44A4$KMJ66?kN{#>Q$}ne3s~tp41&Rx$@>F0
z(Is(eS7fHF?eS8xT+1inxiXoSR-?5L>d+F^`g7yc#%mmPuP0u$O9=gs6H@s{RbiRu
ztma+5Wxc!2T}{h<r>RFSex3&SOln7XJ_kBrnkv(&b~k)$Rvmx3b!%<K7pY6j%mf~N
zzWFoXvH`Jzcvu{V?&AAL#dL^C0i}rfj-|B_lmf@_37`?r@8<)MW?s0T&-spxZZmxV
zn$C5INyIO8*0gok0KV@#2%D-3aOVt;WTHnhIDs&|#6itkDIu@)k7~$Rc4Smh%)ZEf
z;N0VoCz0&r5T_0fqsWV+4K6;UsCGxtYFHN}AIDjTtY9sWG+JTiNPVcub;P=%6rPVz
zl64!!<^m~}q(_n*vz{Rcf@=gqsJIHzh8{^W?@WG@#Wjf9V5K%F;3I8l`u4WLF7(k-
zdMK&`NmF;o`>qtCv{j_M{(0|S-ghKRW%2yhku2E(LOX$o(ShK1ipAksOmTCS^!l3>
z|K~_HnnL>-B$;0t$-25<YbOFL0!BriI&(7;fO_}QiV_Dn0KMqtL1JdcgD{F2s=_<u
ztX5+}@H?F#h2J=F4=?0YI9c|?d*a%jxdiPbyxZ}fEHr(vuEX<W&?S??*A}vCdiK3T
zbOLhCA_z5?Qu8p#hrQ$Y2CM5*e_mI}l9MPRzErUiHK68fOq&IgKWd@KI*6x@VjZW_
z6<gx?3aegxFQV2(oO``xwR#E`8icxNDHn&~LitO~mAJxp^Fa{so!0Col8@N=j1b)2
z^qoHpyPu080od~hZ#SNG;=hezxm^I+NZ8~0peOVAt)&C`O`}<ddNWWynzg#|$m0=w
zo*?3T&CLj*yV-Xp0?-hi;yH&LU4ro|wR*$77(I?9wk$x)*y&~Rt_Kw2)W`Yaajd{x
zHkxlA$9hj$n~+0uBV^&~8@B+3A>=nX?HIUzZEu91LHS95)^zn>OR%JjNR%2S$;{F=
zlmTc5yccHiz4Xz1R565K0Q#b0*70T?=!vMN5Y>>RKS>9=ka(zPZx%o=LfeG^`uGUY
zfBIYpx@+lQ1Ki>#fRCojD-9R`M0N5B&(67;sX>JB%~%DtXzgfL939S*U&0iarw`(%
zidY+q#j$u0?>B}echK=R4cJsju+s516VLr}xN8hVDX+}n{~W_QrJ-#AFb)PD22zNn
zmmp$0UkXXSV}K9*ioRBR$MU){Y?L{1G#^yNdQa9Tg6<eFsY51VBC;LYJTwTMi9Nj#
z%82m}r`rGC%jRKMA8j5eQka;Bx!W)gyNg&ing<N5+c+@~Ahf7vIt_v5KwUWzuy?{C
zWwK*BU|%YqG7x_G{xHHns3H7U#@Gzh-~!?QF7wC7vZ-{lf$;$$OFxa;Zhm`&OXFCZ
zyi$R}{U&KBoP<tfCtL}Iu`>ckphFgX38C?47#8|%Q{QUL=S*fp%rB4TZ%mGWPspOx
zPbd5j;2RI{O;$f#bQ$<2U9W+!p8>w{gvMD@n1jGKZAt`<?dV1Us-Xp#sH3rvD61XO
zI>1O2zW|^tilDI_6hqJs*OI?R<DL)jn5kewuYks-4bj-|k5C6)Fj9V!SWF5itVMD~
zWXQ6Q`D^1@2X`s9boueQ_zR)&JPV?^lju0_A$e4p?DEPJRs<8onX(~$LVQVOl-Iv>
zrTh$z_=p1L6o2PYMR{e4NglPu@2591`T%96qXBITd8@^)khiOjHie~W2uezu2R^LD
zU;KP7Ru-9`z#L_#X6OOS5po^n{t2v&dsp$;&^U38>Vy@zl%?whGq#?GlnJZlFKGaa
zt@7hb&~C`JM(zHgU^OWAz?8lI30t7EMG%^O^Si*Pu~u4FWA!Xui30=)wgZdsC&IC>
zr2db3S)TGPqW`Gx|A02|Mwb%0yD3xFDNEPO-$?5&=@pQMHE=`y3Y5Hc@~DjfI1S4W
zLHw^UIi09Jz9*_nMt|Bw`m+)Jc?Tr|bj;T}K^@on(GUG_D@$L7)%v0N?d$i03VNs@
z9f}m!y4kFRB3vfq0B3NL%)x<G-;yE=(X(_Tv@M6;!WK&M2yKp0N<XGxskx32h+M;i
zll9BDLvEP(US1P2q9S-Np+;xx%PXP?3sh71N~gDJj>7GfT|^f~pbHIlkha%qOYd%c
zl21vSK2x4?3q*r%W9cD8N~u0>jossUk5I5FLZ^uM&)Qc1Fu>sV5qkS4>=MYdQe1Xp
zAmCbj2Y}beWK{UBpnnsp{Qk+Jz)GN=Sib`AOzNjaK<l@s<C~KE9%WG;pMk#-g1CK8
zm>^Qahyr^BaLb3bk^zMD#*S6(`ge4HQK6y2(!C094sL=;YFrZ92iDl*hC8hn;iW?!
zw>4I(n2aYxn+}YpUu{Mt-!tIf1Fz$c;1obq5j1BPBKM-<L~^%nxL^_2>>OOHXUNTI
z;E-#OKD{CBXd}mvn@%`BFDBEtP9X{_phq)g-5TEv9%PH{0`{n(OK|G=*bnt(sR{41
zaml^=0piqfDY_Sk2$_^=Da_6>@w1!axg{Z8Sv-G#Dl{IeZ{mlivUVhlFb?ovr*Sro
zC3K-F6`mMn!J!cpp^>~pf7F-Kc)w|EP>)Oy6}1S15Qp%s^sV&By-0f(y@=X$svqFx
zZkCW?lRw^|NfcU0zUe@+=!5GWc-MJ)X;VI<1JrEZWDC1FA7|I#9<bxeUH01iL^J}U
ziX2~+f3n}?N|g^)zV_;?ucoSJk7os)_mgd5Oz^e{X_>jw^MNhvYv--}Ut3sDsRs^$
z!ClaGTZ`ya%%6Xa*|S<Ibf~sMe?Q8kUT8vs0^D6=ayG{)IzOq5xPX?yB+s%$6Aae%
z6qk*JAYZ)(`@3;3;fl>DQO4haChFHn%p|8meK6i9kP7CXjxUj$K<FR?p2ku-cQ9m9
z*|>wMNbL%M;y6u5_Tb;u$59W?_$zAi84FfK4o-#;{=0K-&&dMB)c#NzZb2jrlM=sy
zfu&E&sPezL7O;Z+=0W-evyH>}>tMj5`syQ7kc=v6(}T|=3%nkD)kq+PJe?rwLQSNH
z*FkRp$5yJLw*Q+i;@4&OKS;k@t7c)YUG7X|K;=pWX#wyAt>dD6*}ejgY4Z3LWWoaF
z^$I$En`BXw%jVg-g<b(q5v~ReF0Xi(zMqFi-U<`udP0qFMK6~(CIQgD@vNAY5jmpG
z$99pW%Gpml@5$Ou3AmkSNRF>!7pijFG}#a&SR2M9DnqT<awl1o94mNs(w@b^@d6jt
z;m%|Uj*uo(1U0|MrWp+++;v7Ax)^}8sX~AX=y?{&fDEl{eeAFb(!+hhsoFkVh(e-K
zkz(|Ifvt70XZz`_`z`)kY_5}8A4|&zVNCv{;b-?N*=yJ-Kb($p*Vv%Jh5B}E(Kz+V
z3bClk2w=3lfu;gF7vGbp$WysRSn2?d;B{=v%L#@!rddJJ9>({;-|+`rn{NYte_I(D
zaYY;mDt%ZZKGgd}@t5h-QvK6!E9-qepnsmKe@>?F#{W?*yrJjo%U8z4bhSr)p<rOt
zfQi23whB)}MQ8oPE1bQ@yza<{2O;2~5~R8aC6M4!%zh-pEIq?1jQ@%m3iJ&7{whOv
zJ;NK}4DJSPG}d#_mQzkg4074^ksma8WH54xxUe!#UGN~d7vtSYj@0BUYAK)#xhr;H
zPYI5ti6rh*^3Ft+5N_6=Is^CJm?C&8(ZLXeNFe{uXqseTzvI`qC+{}QgQ1Ov5brn0
zm#D!g1ol!OMfJYtwGWxN`O;YK-a+_+<(^2kTOdS<5z<t;#{IW2O?ux$@-KDG73z+|
zkkn4$y0Nfu&!4eIys@;2LYxz+7a7RA*lM&`x+2odBs8OwJ`BNa2@FB^^aKps*9;J;
zOrx9n-at<ERlPg3SJ;rVMl{O;CK|4vJ_6A6kwSyll+(Ipfw%CC=nrd3QA=T24DP~!
zMm;?|W0G$aGT>y9sJeq41;mn24SA&|!yTPM2apw8X2v%FTekc$q7v9)Ktw+9u+1X6
zk^_fh@+xhH@6dZoxk!Ss5gkPA@+VX?%uF)zFMA^XBo(VKCe!jJ8=pkvNkU?>x>h!u
zrhqw#^vjF8`9gs=fiTEqjgYnxBs&u*CV6K;P^^=*iYa)eCG$N>L|q=1M9{k)<L0kd
zvF?qCrtRRvd$FXReGh{Jx{4|#N^r-gf67Laur<Qmg16bR7m9e{`9e1_fd?U7Oho2#
zwYsNim6Ld-2nrwNCa?;a@W-nmA07-IYXJ8C6@`u%Y}8=fnoSJBIj>)#qY1HZOCc=j
z=viu|OG4cGB_WYkrA;VSn{UH7=~6G0Ucyf{we;wY?Nxhk9=_M^KFqw>`1>f!;?Qbu
zWvZQ5Uo>|d_TLT!{Si!F)IPlzV^T7dsWxSqRaDkMNSz;tK52dMkB(C}VV187DS%n~
z&vQQHY*!Z=ZgJUhNlHTobm|UGR#lJZBJYXkJ4IL(Un&wBFkNZ9_EmOsx67F>bhFrR
z$?;G2nSxC;rfMj^<2BZE;FCnvB1{!AQ<7^-@caJ_6Lkz)(`b@)5Obl<d8z>u^*K_N
zzht7+TR^am2_|a8(l8|f6V(;<T!D$w?HEWq=q|zq4RG6z#|jmCAFT5@FbcL}m9}|W
ziH()fIm#2nS!nDASdIJ~-*Ulfv{0G}6*H;JHjD*lVO6e&2W0tqu}5fD&M+LK8p#&a
zg4z>7MeGXAzT{g^n>ZcXKppz2ZQ6qDOorXA6CogA=85&52)l8_ut3q|jB}td4!JI4
zALxx$*n%Q}K-K~Io3@vv$8sGp&G1>;ga;|N8pKaTNkY9Tg4o~>J=j6c923=#gm9TC
zk2?jeq~S}ty4#~2l+aDBd)_;Mlfif)m{9xU7$uUOr)f)D*bU`udi8PYpE|729D-cs
zYMQE2qDqDvH+H5d+7;)l(&&|Y!4~YEhocD9S|U`v@54c2Jw469S%>gm$7<YwkwldJ
z01!C(RPixkcoc$vfp_9>M>Aq>591BbN#5Pg<^&oq-UAB$$ngkwfO{g5_6rdT(&9Z*
zXij9G^Xk{xK=%0)|7L~Fh-BPl%lZ=x8=v@Z)_G9sBEguALKxG#Y;<$2c7fnW=YXZr
z=M^lS5@YEgFs&(i_1thDa{uM(vB1!-iFWd+2I4PA->bBv$M83B^w{-8{Z-SGR!uRd
zRilsD+YL#Ca>h|3vJ;nDCx_R|bN5Ep%X4ZxYCt;=i$e#*KJtmuEm&LX5sX)-K4K=?
zkl|G{_@4pr0DgV}olApgTuH49K@;%sQ3C2RTmNMiR~z{=|7gqBL#R)-IMn!S@WtZb
zL)No?q#hOOVAp(&;c-sKSym8Kgl{^iu7V_9z7RFN-buhrd}s$S$QL4G9z)4j9&=)3
z%rh28#>~|NkH<8pK`$4BE|Z$^{I_5)`Z>SrEmm&svXGy8i`|IVw2dsOjRSJE=zerU
zgX$Zr`LvC!y*qp(r2+ENa}mPyJ3tsY-Q9tDB7_NG-bG-}bOOv##3`CKl>w3w+SC`D
zJJF{69O%RaZHjr=y%SkLqP8Q{;eSt}$O?*VTmOngk<oVKC=;et!&+WOtK9!T5vxC2
z8EjI7R-IpRIjwR>h}E3?uSTqT>A<T;tkxik@&81uE~8adM4_fG1g+Yalh+MlB3#-!
z0rzIXiM+r9!fJ&OeJlj2R(=2Gw#{tk&ES}_K){G$(v=Jm)<s#Cco`2xVhQBcWs6aH
z^OH2Ah0#e$NwPZO*AO3k%zO>$R*X#i#_8<ZhD@8mOhjQ@4qebi!UVhHEk^PL>^E?1
z@oy~y3P76hB>j?j0B8t_!Us6JMlA&&ITF&fFBRp;MkM+>Bw&SOJ%T{GK@1KHiNZtp
z-2Y84{<;$V57MtDPx!1OvZH2_11J?MkgnJr5s5;|<q`#|$(88YN>X<rp{aNp5Ar21
zv?Rffpd{gUSDZV#s}^*`I9Yv2y(F<hMl~b?2&Fe9=Vj)Ulx#<2yMhz}M;S;Eltfx8
zkR;G6c8;8|AOV8OC_w@OLDz##k_G#GnBNLRs4KPoCJjR$Fg#%{lOrH(s^pEq{@PG@
zKvybVMR?HkPEB|KkdBt$bc<HNIFJNk7fy~1!A8<9$@?z81Sl91aVJOd3kg8<I4jzL
z;L*1o;#<S7e_+p{um9A)3JHQJ&pY1EthU4YcW@de{`BpvW9)i8<t8C4;OlN@En*kx
zX`O_afWLk_YaW}Vr+pwK1R~8{fptu+QK%pN?2onxg|O-(b5n7%o{u8xTrJ;qdcLnP
zAy>=SRLke~z4bq2{15nJ>L7VTKyYBw1P33X8yZl-`AF(pPS7d=BXA280?JB5(8LDM
z6N6nu?-?O5YczRYEx0Rio8(V4YlheWGXtr?VAKxW7B*8Ck%OcLW~3QXgMY$U&!BVA
z>)fD-qpnzWQA@;|Mn~z&sE_iFvfsd47`W?Ax(Ip;$w6F%uK;a`TQS*TFI__?`^+IE
z)I19;gaBdRgIY7uO?*d9Ow^muMW*5Ezs5%_I%`zzB)PLVu(y&GLtN<!A*Rq;c?_*Y
z<OgE@1D#QWZp}j?giAo6%7-9rRli4O^_bovf;SPXAHl2Eh}K!)D?F?38yNt0%J3@6
z8yTL(v;3=DlO^0YI|i}@V+JMPKzsyW9H(}S6=T-U_vkSgc?aBIYd}8JWazRp&O?>}
zWiTez0hZntX6X;LrHE$zG*LpPE=uSJQ9?heS3ZnQ#eskBbo}Xue~A;-&zc&0q;Mdh
zMD>$}Vvh{m2E+g<jgT`TIS^PTd2@+J*My-J{qRiadK~y2#gH!{pe?{C_u`ySfiV$G
zEp(4nZFhG+YSiKx6t>MY!~*<Zcd$w3rSEb00S}3hPndarDVu3tD{g2^8zNK>@?o{9
zP18G#0Cg)a!M!*|YLA(MYK65A$n{+_Emt~n$+g8LMQWp&JZTn7YdU!)bR95MKWOIT
zX2JLOoquxAEH*Hw8Y{}R1%c)c&7ZAIc^6j<A+YAUvrr>`9;In9%miTtBqSCHL!)cT
zIGfE168<wobOi?1q+yxOibDzg;`!9stW#qQK%LW+duFpS14n7u#4U?qEzaJs&P`f(
zRJ1FOiMTIMZ^~$#$IW4Ox@#0plO!qhy@@p&9=&$2`m3=#cMiL*zJ&^kHAgXAGiG%9
zg*hz6JmGe}cMfyVb|10C_;1GzjnG$tFKG6KHpkinPaqv|(^k_lO8vPe?_0V*7U?Fn
zEs}#7n#zYXG)Tv;WKzv+2A@9{+NK|F=MT-*tZTx^v2iYJVe9w(IP$g@NyZ$|&~}9q
z*2eR=JB{oHRQZ5AS%-uM*&!yQ+;`u}I%}01HEn+8PS%Z?`&IA{?qa1GC}#A;nE42#
z0$*YEg6`zhm@L6WlKt0t`P92vho1I%nDZmIB7_2@eOpz$;j4WGeuMEMX}q3PIFG+{
zH|uKq4S7pNDfw3Z#oa8cC4`dEoOCYsz_@v^qJy87ysPIhYt{#gl4bBbpar;NwhC~h
z<Gd{!%+@NrC=yn2)<+BHE5j^w-<iz;Dq>}I6A%OCrKti}+0VGBvp*bTod~#u`iUy_
zPp!+Uy{9`7Q&u-Iw9rzdF4l4*DUDrX&HnW4u*&m9Ilg`#Yv1%U`IHhjp;(n~;9tyR
zFPgvY!|$ID<g)qrKj*Wd9RWgvximlsieonrvGD>nDsOQaaN6R494{&BP%Yg+0L@JN
z#0i2lZI~>&i>qfnBErv<9f&dJMG18~x<>KF?!)s9)A*VNY>qiAgEv|TOP_+}yw5^5
z;x;rNnX!hPGT6sB`P;y7B6=7y&13vKb%@FZlbjezfzu|aR-$&gJW)Cx+mw3$6wvTa
zCX%j0Z))nq%Q;Kn-CV3i%cnv8K#i?67D#W77pc}8c)p8`yy2>ypb%Qx-GwxnTP+%D
z*rxmV{<W;D<yQ=!|Gbd3wQfZ1Me3kFTynAz*Ixmy5meP`+;OD}Q+uJp@cEn`CYI<l
z1cGa_(>5hzQT7d)xpfho-5fM#*Ufqv;T8rNHMYVy`MBErA|Jbm<yb$&ZUFWohNnAO
zYWu5njeos}rH4%&g}s#k?n=d_Q&z(ei)Y-!x;J*JU}_HX(N8d+dCi0TiznEKt5$y_
zXPr8z69hWdo4muN^NKN$l$-b>&X$?C^yX(c8(=m)#QUsa1)1n_1bSCQlOKdr4v->6
zpvg9@^$lxSn^s2%K1Xi?CLY%CW5-1P)f%?O+|MsCkZ%6|e~f`j32*fzTV<{+<}W|V
ziZhdP(S^yA(1rb5O>yK3O9{<NkZ__jjh+YLBRInpIiS7&GJ#+F6noQLn$N#|id8hR
zQKmP?^SMv6rRE*`c<^cX@5=l5HP5iS%>|G0C!S$l%&!;mt<PX-EiK|Fo`J#OQ=jlw
z&$0o`#m7F&l5OJ$fB|*iGYzXak-MK|t=rOtc>c*CP{fHG-%7;3xJbP|#Q3Yvvi9vx
zCZN%MMd%rb9eQUi6)D?_Vt9FSOhSu9C6(||KH&K?<Xp^GKgT*}muQVl@%;po@G+L^
z@6G=4chZ`(iG2m^l3lbqw_d9ga7W-J#(#N^b?DkLs=*R94sXI-GwQ}^7eDnZ>o9Pl
ze6jjlOZi1Hs>$HD6L9x5qC8V$Af|RLKmuJr4So$=rcECr!X174r#{5G(HLUcn5ZF&
zl)J`gL)56o3}8?_s*%d`*Rm<SuZlRqx309f&FUC_W-UvmvJrfqx<mb-)L8U5#6zC&
zU7hD-jxvFaJ5%5<KK^;wn#P6rv(K|O=3(FP&CkORTThQ!+h{O<?s?YQy!mTB>;=}J
zK6qaM0+b!)ufM<&&3(V-wJ)%4P4?1Kcy$av{Q}Eu<LpWtr8U$<uEPr7Q7P8Rv@v|p
zKiJ>epX;K1#K7t66#et@(V%so{DUQERqYtfga2R$%_lnZoiDQI%xnM7|MpLITOSP0
zpc2NG64_z`@Wl(sp9NpVQq7Itng94FYu{J&Vr8LNtzy4*f}aE=6OCOuF}zDBZq;|`
zMC{U|U&1b}Ag{JdcOJo)zQlUfvr2vYCDzxR{5b#lC2$Z&HYfaxwPxl|hVou7!`FYq
zP(I>iHh~u0^DncG36Bkh2U>LGKy^-c6URLtGtAxd_>HfyFEdXfi<&!JEZkfyT=9N7
zA6>st`UibW!8iEgh!rmq4(9V=ud?B7F>;HP(r8{QNLAxaJND}DWv%#dAA8cA{v7|_
z$HovHZAh35oZ(}ZgCFBV`0VAZTSq}pa~%$ipvGyt;RTJLuFU2CUe3C>uTy4QNux2%
zCZ9^(A!Gfe29&vuepz2ClH?(aRH6b{>0<4$FBgpS+i#$oflOI@q+xqJ=VPUz0pCxH
z`@>E<0oihdYcENdz`EevMHV1fXcqaHm@VQoizcWyoDzOEo+SeviOeNYgEMP!OH#MM
za%8}`DI{$Us*96{SmYk`9f@{Utqh@qpN-WOk1bN2gZTpwuxreFUgZCNfDLJ)?~a>)
zdVo!4=2bR6Qf9B1FAn5qWOk!@@)~~KgKWlCx1kLWvJPx2|Kvd!q~^ZJe}9n8Hm@AO
zZ&g^fO^0T((){EE{)z%|+Y%U{PDVH9!ias06*`e+<d5k>bYU(23l^yj!yzUzjs}ij
zJG}#<DX9l=n-HEomtx-`Xo3Pd-ejA)NkhLu(2W%&O^}bF01;me(FN#=)lMgM&^g=y
z-8||5l?$Avd{Dnn1kog)BF|167)WIz7@87w4vg+RxH=foqn%xd;Y=ikvp=eQz7*T5
z(tIxd$|EguOn`2<6PC@1U^9U^F@fumLd^sy;EFys#Fo0_pj@Z8*g5QA3A{?0W($U|
zHc#+@wRvLfo)73GPmUdS`M7+dNWJwrablG=*&SsUEUrvI51Wj9f|yHnCxrV(KgVyG
zgih7QK#W92-!_vx)Z$7FyoA>Woep@ay9*s=S|Tf2tysur$|KE2F3DR#Jq4?yaRkQd
z02@CS1qx_KC7A%&NJwx~_hr>Bm@3k9ENmY}0;R*C{u-}+meRF)7g}m!Eb?NjGexU)
zLSgV_az$w`ZFV}^0#}n(6vxbz7qS&GfF!Vfm{mUH(c>WCbHQw!IB`wXSW&ZRugDr)
zp(8C%f0#`+PjA8>ewf`Vy}nA&*<gCfxUp)?jr`KX%wwL@n0p>!1I;}f^Bs?{Vdmfa
zaob9EySXTLRe7hjed#1)(T&gJlmY@fxrx{X-l#KL5o8@ZJc!~-(Xz3B;G=c!e^b^T
zE;|Y3CIfuaQ8s5^E{}f{dMYxlr+v_0KwYruuW|kY+NJFJD}<=jU{YK^gvW#O$X}3#
zSBEf4#&Yl%P`Iu%di7LgB15_sNdt+Q^ZrErFr*jjAzObd!0>YLwa^NaKCsufwB&C+
z%5J>s>b5?HXbi`0;JqGW$(B!0j*oqeb+W9ZC+B0Vv*iJL`uk%nJ?@4Z#4LF(S{6!5
zbMTB`KE_hwF2VXA>nf5Ozlx<uHIdZj&m(KWD%Rb-vVLNoi5A>q;IhuMSJEQcIv0Q5
zr$1`1ugoUMWxRf5Ne!}}Js0OnLoQA%Dv@i{T&=E3%7`#|3vfpmefI3e)NZL83Gcs4
z_(FXAf?VLWMVV^hKd)lRByxysunpJ3mOUeQ@6{}excaN)`e_6LwRGplK4;g}H*UDB
zK0A7{H5EN6-}yOuCbpX`11K?tx_3Ti!4JxS(_WC9X%?lg5(C!Eu+qIBW*$wIVk@MG
zA6@_-(7?JxucaNT3I1ct-;8#s%GF9As*>k?&bm&z`bel;U=YrXevq2V8Tp`izm~p>
zo~r#H5oAa9I>>;&v<iPp=nPAgt4MvXl<$9>+0&>UY11zC69^r*JWQSFi4Fz6BWXf{
z@$pUiSUHl%Kf&5|X<LX)$&_gwG6~U&nDWwND6O7`GX&4xZ5|Tixek2gZnM4dh)iPl
z_$`On-|F!wA0A>Q_0&CSU$O!lBvkSNFxrRJO9yz_m&{%uL^{RS#h5bAyoW)UipNb*
zn`8*2mHWzfTi|CbriBV=*1X-2StCIR9Ft87c%|2xcz)zdc1@hYXnYa;PL$&D<8WgB
zVJS;&fu;opqwVVtn7M5k>(H7u$l5%yVP#vK;~~fpTjii-kW-(&mM>k#(g#igMAZAx
zrtc?d#b)%-xg;zIlTWDgU_c49aLYR;;1=h{VX}_p2FAfEAD*CkhVmfly1Cvgdv@AI
z-^fzWl<`yWQ8BavYGw+AiJCa;gf`Z~aKhnIk)uBnkYE4YE1fKvZ*04<H~2HUZy*zm
zXZ<d>k*8S}ik1Djo25jCenRc@xtTXDV;SyD6hUTCM_X1<ZX(}fSr`jaK&#%>8L1X9
zw6NTaF*#F%H-dgzl;(smvRNKs38pqk5E)&qv_$|kw1(x3o}C&KC;D7UV?2k3D;XJQ
zV-zCg$KJfQ47)^|Lf)jD9Y|hG*=D!E9=g+tBc36>%ybx%oIlIixn_p6cF=zF6CRdt
z-ZXe~frss6{kAMa@uzwSI2|q(Z+^V#yO#D-OwxsjrGRTRGyvRD&90B={BPHF{-e>0
zskiLFIv)Y1JfbOZzNUVO1YH4<4-0YUKjcgYG!5V!Bl>~T)fi1_<|q=Vr1lEy1GGw2
zjvAnFUoDjU52J7VzyR|tH^gDzhl#lzn$_BT!GLKd=1Gq@Cn>#zDR#>UPruSrYs)(7
zyqn+B*xYUOr|7BjDr6bEHM8<B>Ow7C?*#*fWjgLW$hzq4A|I&!IVRXl$m39cv@=d=
zLMq$e6iF?l;wQ8P^x;5r^2mDl`~N`?-1gNg=z(VrG8e@P+wJ&+p%8z6kolUv1&PWe
zdu@(pU2hrg+wITxxH`z^G~@b17{XEKo!Sse5K0OIng$D}k$hTXa~C&3;KP?A5D>QO
z1cl1r_j*i2l%WyFXd`Z>K26zAU;)LIEsJZQx*AFPVaN?geMMSevij~sY59l%s~K_6
zBO`7Lg+(5m=qtjWNGdM)mdjw7r$av=MCeN?jzYe515?sP7y~#Rkgha>QIc;3-oYUV
zZq)EPP%L~}uDKI`C&wI{&<gD~RJeNh@Y~>PegbP%ThNx#FaVn8kh~wEI>QKP`M)4H
zBTMZ1db#Du5*{4PKWT7<NUO=Wu)s)CZ4eub3uWX3(5enjq>*?Tb|mtg_m08VPpX+a
z8<|Fs3$ReE=4hF|#{MBP_0%&BN8eG0mJ1JhzPF8h#5Pl9oq5_2bH|oGBb_|_DE$<l
zJjC3)CHb_AdROV`8~D>h%%fY9VW~(b=AZJ9<$nw@KkUvk(n(lN=^HRAU5^T<WxW@j
zv|P^ll;e>r<@giQ8Px9_Lph+UyS$FC^c=k?2f>b7DFO2!nn9xXMhsCH5&+StufDY?
z(f}tuMK_~y;!C_Y#EBy&!if&NEZ3Z9zMk<Bx3LZ}Pj-&sTXW4xEpB)*daC(%x#nx#
zSQ1YRi6&o?w>xH0?L1VNGy>-g#}IL~CEhXd$q_OJ{iXxFMRMtP5pwpoYe4=^sRJ9-
zyBPe0x*Lg5o*MPKF?bi!v9bJB#TJlAolZ7K#YV(~FK{q4?4u`jfr@k<Y9`I+%lIJn
zsT{@vPvONVVZpeJ=a;E3=pc{JH@9&+^rClaJ+ahK(dl@pJWX3pBQ#rSM>o`qju<FU
zp&Pf8ZrlauD$Sl=^8FilqGtDiCQnato(epPG~-qBJ%l&x|H*1e6>`B$8^=utmRO3y
z|CMhpX(Mf?gA%D<ld+4E#xzB3*3-=G!^~Y;oz_rD@&?5N)|$eH4>P;X+3|eOF!K#=
z2X${)S9J6wJe#yj1wW_G{|2jV>>s+}%*jM$sjZ&N=lYLx5oTMRq4WVhLH#bf)EWPv
zM`^{s@Ru&dm~hOQ8ewfNsB3qavAy}K<V&tZjVrm}*4UD>9f@BP3=A$2u@<YZbP&WR
zTzV^=q}A!D0KCynaymt}fNy3EWd8I;&!-O3G7O_@LDOq<Ebn4;D+&-G>PQWX!3B{K
zmo;5A;@$y9;)2$Rh3JH);uDQ6uJ?){hfw;VDU&)4AEajCyW@5DHZ-}Fnp2O&(R@UF
z+DZsV5&HplP4g~uw02L0jEk5d<iSnj<1C?hiJ^IRRh=nLzruWp$f@`qPw^SYS@kR*
z7+JutLb`%z<DfmtV%zLyrTl5gP(ugN3osFlD8BfP*-c7!_cl`Tu5&N^-Ja&AeC7|V
zL-Wo=+@-B|<sh;_K419*Ym<g6E9;RC+)Zwn_rM4O;p~@}10b|`Bn$uS2X>o8j7Cje
z=wTCRrsTVo=l;ktlhZ)D5WlFO<imQS75>?&P-s0{o}YuF-WD-@&5tal!@6f^%k(V6
zIS3YDdT0RSRK~ylk#+4bSI-hBve@gNk$49cS<>_@Ng_*fgDg{!#eMQ=t)Uc?<h2q3
zU6xiq8_q~|=)eErGMaAxDy+YU*V1DJ9?|dRR(z$dlf5m)gcK}kVCPKKwVbT9lx?f=
zw^lskLHFlNd&JdKRx8tlKOb>Tf5M;di|U_Zf-@q#mvC(b`}GSL5J{QHvjeP4$){=u
z>hp*GT(h-E4$2>C?sIZL{+djX-wGZjmTgot%XRW8G01HXQTt9ioNzE<%a@bo7#Y(z
zlY%|?(*cMs!1ih(iiF1^c#<ZxWs`S0jdU0C(@5XPFD5P>F(wsJC)@|plxJ5UIcRUt
z`yIA1(X3FR-V-nK!kbswMuoxvZv;O@9JXRMv0m;!p49rh(#T0r4CfRXvH8K1Rh*3@
zA}!-g06U+X5F{dMv-6$?F;>4rqA<LvkF?%X_=u%r_$!j35p6Jvu)d*~saDNzQ8T{j
zloW#-js)))1sPv8*oVOVwDm1RGqe^~A*DvF3>J6*&-zls4>d-Vpz&4}lwwCEWG$wT
zQl(~Ej$&bWg7cG-4)eQO0s<W2oYzN)An|ePAsDZL2sQ^1Tx<~)VL5AbOMK5x1Q|1G
z=BHY-HaxM`+`?S-F;7_%<H*5;tCO`lM#?)N_||EtJQT9dxF#g;G{|WmE!*{SqE1U|
za;z!*jaqYJb5H`4MwBbs#PAJEVp_XrwIRAF9DYBrg~{PBvGDXU$c;8oI%1cfoP?z(
ze+;7&b0~q7m?G9v0M+7Fc9;#7rr<jcXzE7^+7TGCF|aLZ6ak?K^N@}r!~*T25@3Ha
z_{^Vy&K4mq#zfl@GK-A*^5tyY=a*=a=O)6UGm)k>4f$<FSP+RcpVah@II5}<EqW5n
zA*4bnMFLVE`Vl<ZPO=))M22&rhlIEMyjh^xnf)PWay<h^Jqd+`%Y&Nct`R6jR!4Lt
zUy_VlH_4rxOu|#p)7hO%O=CbKTcc%)gcVLtF0CSk+tX*LL96DSETqjO6qY~Hatk^S
zQGoA^Tx!Ma3mhqvZ4T%47^yN~O+0pP|0GLL3hz!B+GuBM&;5UxoTrtZ+R70csDr`p
zAk+o1P1h1b;o~s6mn6E!_x{2h5+N;AGAnhJ44-xn8#EYQH%POg$BL{+9Q3fOU3u5K
zrk@z#4&Lcrw$*(5CjQmE?9RWiv@lNneCB=Zv^g)HPre_~Q$D+f-+w=w-g*PM&@`X~
z!8bJlP0c;*?HIVH@@0$JLW)@cC|bfYgv&~;j4V-FrRe$A^$@(1;6WXD;u4Qv!g^ZL
zx1he9C2T&)6r-V~!!IJG;QN;#3SXH~!_>efeu`4o7%2mh62BA?e4gLH2P|a^N&a}%
z8Zjj+`S>2@q4h*!FZ3`w;<21zsfK{X+G^bVCLh+*oSq!pLYGiPOeC~ibOcuKc#|LO
zVIE<5t~umyd1>bURIj0!<VqTjOGt>Q*tDbjJ3Y<q5%TF^PjeUiT<B>YK;qEgM(`OT
zLo^hl46dhxm!*i+4%`I>@i*ER7XG+>`es;6!(jS#I{YrA`2P0(3zJ;U{Ueiv|AhL$
zJ6KIalc7=)2GUrtaJ$Cp#C5JKu;5l$^ALw%p##ySm0RpkA6aULh!Z}X=i$hO6MpCV
zC;a)^3IArX$wr;>=WJ))-2MI7eRLVee{sUMQT7vJMFO|V7GHMC2Zbbw54iQjY%^|(
zbXg^DM<j|OIhKg~lurVwS?LyDM=qN>9ye#`9!TQ&*#ZPlocHP6N`-OYpJz2r{4Q`*
zQ5&9b3Elx^+6llFlN3qvxsj&iCxhx)ltr*Le_KpJt>M9~i7@#4Ip#*KFCwdu2TZg0
z-MaVoJu%`u=pF$>PfRt@14AJ2HnJN6fgcq8lnAK@`ClPiWpu}8Bdft(KuZRJ0M1Gm
zX-K+P22s##5bl1OSC%h;<qa~HD`;|odWZWJz{Lo9Q;6_fl%3qhaxk!5;Wmb=$b{RN
zC2V6Fb{mtL0Vt&QlZ4xtb2w-=d5Yx}<4+;}(aos^6V=YI8K<cfG@yBmb-;{xcH$yd
zOeLmK>z|i`fdul=NuZ}V%?RhX5pk5u3A<+I94dqxeUOEAm*+8$)By+aQ=|+9Ad}Bv
zL4;R@<b^3KDedgI1Qb_o9LGFGCcGbf@76=clZc|xfbE3$hBHo%kl`8Ux4y$#wHNmF
z&^cc|z1nf#J)+5F)B75-ho@J*>hw~Ob7Okb@r>yO1G%EHVS_EgV`qdiz6!S0WF-O=
z?CelajhS$CuNz>(y@m__0}1VS^0^34ITOzJ1+I(1Pr!egQ|hyK$5BZ2BQZ)e0O)>0
zvx4~sVx-g)IZ%MDl+wB5AsJW?QGJoRzo`&8yxKj+9Su~k7sq9_&t(;tBl#*7KNP9>
zUQ`T@RRpFy06r5U2jTm)6Hr!<bk{`=_#oE7a~DJI5HTY-KLvK8_r~)U>c_wJ?9bst
z%`hw*inXDx(Nkq)5vgT(s9b_Bs7uj!<<s=E5KmIG%60U72c<?%`I9NFl~rsLI6*cC
z<C|W#*kaP$@2a*VI1+jT1DsBxA=h`*)8IFP$k(IpEQ+{e=1I31hqY{1?zJd4#et(v
zuEQNZ4+jO6xAk9WAquZ~$f-l$CJImNlKpZLKS9uVBJnn5NV;+hqHPd~PbcyfCh=+Y
zN&FIx#Q!aVKbl0kA+--K|6fu2cPV=mwYN7Ad(Li1?Xid@Z+4j6TcgN*cK|6&?JXeh
z(bPV{p!UBbm$CS52DOJfT{N2dp2B;>wf`*AAOh5=z3r;hJ_G%0NbR4{sr?0WeR5!f
z3<)(G<lqTkgd8-W^e-YC?R<2Ogf}2r?`d?7E=Qv73Kl@}k+8Qi8_Q6Yo4{14{x;wa
z?*sdQ?9sDHEP8=@_J#kKyTORdb_2Jz9c*~<^6lXD=9H%G2AF1jJ0K_Gz%}SA;qqns
zK`+`5QpA4H3VCQhz(%9(2k+xS9J1-i5g>~c%)47`^Wljnk{V6)`{KRf#NS9I|9avh
zFce!s8?@SR?w6wme>TNwN#ez~F}wSO=`tkPk30qvEcg5+5-dYDT!|af(15&k!f0S%
zfGfY!MzdemD8{614_{@3g6+h5)%FOtwn_XpOl%S^T#40W;SZ2JsPZ9gPdF-IC!aHR
z8Eg@&I@jMKb`!1a2*FeREuw~I>aVwmlOT?z>)m3HxXmK=i2e;K{u`0z8YI@Q_%<Y8
zrQ#%1sqZ~aQLnK@Y>C<;CNOLfccNl1q})E)*dxmD5OMx#z&ZHHWFSBxY4j|CWz@YC
zss)v}@Ih=ebMc_I)KkYGi%8AKL**Z|ADo2;US%51%1?N5W9x`)7)K}rN9S}tUvpKr
z*M;ONAh6`y2#kUNaaN8ACsL_`{LcNAW%v}<iwc1nBCq)#Mb>C^rdU6^ksMS?(x&oq
z6!TUMlzhAKMJXpK7Gxepip`;^E31#0#l;-{q#UJk1-=HGA`(`u&9mdQvxg!HR&4$g
zuOTG$7r~FIRJoALRSLPBct#mrE(ay(IHiwJf(qw#P5G%@3nN`o&!{+;oy75@Y;Q6c
z(Jmj)tYsHMPN^<5%H-NF2h`bR*c|lu5C=r+I|#+C1@3aEYWmS+P0|-j-ti4Yb!k-m
z1Ul)d)TDK2HrUitNj)}E<Rk2Qphni^<s`lHep;Wert5VK#%nm9A)6{EnFw*2O&J0&
zC~cKlIf(w?`Sz0M`%76t*ThIX*~pn)!A);(2{505O86ZC(&mP8lhnCGBkJ5GZt8G^
zo_Kbc5rOO#`Ow*YFAsE`QnsB#`}!ffNBGn&UkV=dyyL|uk^;U(E!01V^G(B95BDF-
zsB+Ich7j<rh!8NUw+pWz1k|h`NC*h!fqW_ozeF4&^*<sxlLg38aw3Hkp*fdNMM2EB
zj@Z!PMufzETjZw2vy>K(z(^LDk7rul5v~&ajW`lPp(RYIOGT896u99Rsi#6_6U9eC
z6cZADV|Gw61rSA(y6_t>2pj;K)=`;i4aQ2>0zVoEP){xu5V@LQe4U=<DuVI3dX~Qy
zjE_&#v!n>w`DH@!`m;rs4}@d2XcXc9$_S!I`)GO%BZx{Q{EtQuNrFBL@*I1~Y&b=F
zgk^<#4{B&&1X0cYuZ<w?*v@*4oO3_s;Q!tLB8`e`1`vDsLvOS8^(>j*e4F*|y7xXY
z%iD|vQeR9igx^9+-gSwd(O4it*PzXfA(G?85T|!d(=)!PFS%_mhnHM9<3C95e&k-Q
z>Gej&jhAJ-qTJm;0AVsk(VbxHD0n;wuy0D*LU&ntzGX^lDeoL?8<a&>`HR>OoGlUd
z_rVpAE=|;~x-N1D?<l`C2=`Sia%`nLG2zgND^Xg`+D>;^q}Jfhz*!k0`&#fP!S3ak
zegspwsEdexspV}vYrBdx<c%qvDe~eT?4Tt7in24bcShcg>bL16eQa<E$f{+$vAg^v
zK}Q)v9v_qFHkqam4j^kTd9{P+Fjo0wWr$UN*Foe6R&oS=+<<|<Wmy*_?=aXODPED)
zKf*3Q<RDTlTOYhRPCjIDgA?}D(n{CM!FrUMSYX|{7}*d%L2-+)eJN;WM#gSK{GRue
zW)R6FQUri)vNxq#VY-ZeWZ0@P(%z4dj5jdz*e^(6B5i6i;7`1OCOM@FDn5YBBVnq5
zPIxX^?rBj*x0@#5E%0e9dT_U!!5U2nz~$iCuVA!$jN#f>jFZSTNFat+ei5|KEj>^G
zLn^(8hW*<!*uROTZH-Uja;MZ2o<AE)6|+z*>sRT4dH9vn9R4wliuVV{7Reu|&z>e8
zn(W##VQ^n4yH6CWR;W@mzB&_I$swuiHtHIzUX?Tl224~o8^09G%+epgaJ55m`_`(7
zU`vj`L;>jnF!UWVTq`bmwB!t-GozeT4ylYyo?K2`dpdq8xI>b*Xh{Au+fAGph0xY!
z9VYufRpPvAN(~@>Va3fhL{|GG^<#Ma0|tRo>emADQeSZs&HE6#eh9ECLjh-pu(}3z
zs>>0dkO1>H0zjrCXw!ou2oC`=v#wR2_>CapwxP#q(xx2{fGsIMZo*+Awpu<1WK0X-
zQW(>K5bBnE{m>Dx0y8|9VC#{JX-6qL#r>7azM?nCJ5Xf20PC+4)qYI~-7OF@A$E-K
zVFR4FM^(On{;oxxKvkj-WY2NGOY7_%$R{5Vb!;zDe{URJ$H=HUguodS;v|5h*~J;V
z&;Ca$`-b{B-eDE)PSOLP;1$6Dt4NR4eCOv_QQJvvuim+aT0?P%<bA;g-J6&;ltWSx
zA_jC0<k5;j)j(~5+xRU)R|P;RuoqU-TD)f9)POQJywXTyiz7HztO7xbN+wKHZ}?Rp
z8&1Tf0PkG<&O^QP06PbOnNFQ`%eif>!xRe~MG#rO6iP5lTe1TqEw}eQRI51KS(Ul%
zET|w|KAT#*AfbqSJnibSQ=)QT6$(332`7$VCY+vVH1Kc@vR#{@f3<;Gm|cL^>0d3D
z7yF<#*W$>;t()!)bAp?~e$!O~iNcT_XbORMro2vM1^sylox#^+-ON23xl8e$13no6
z|0*wq0x(slC<@cJnm`c{NGc9wpcO9gg{6arqXvEX<_WD^G3b_$LjK!P;w}?_NmlGS
zad`rj5TyJTcg9aNdcUPy{up_t2V2pN+Cat{8&qM_CGSx>?27~F49vF!K4;RVcxlrK
z@288q`)^_aQX)sVMs1FG`E_Rdu<tv0ei&4C;pn2<K@C#mkEBh*&DB3N2F>ss9~674
z>_XjwVrkQa82=OtoF!7Kk2m&w-^BBuLDk>4jNKFaMfsm0tdB*xe2Et-KnQjfc;5UH
z%&h*tvHvD>?C(K`e@cuf_`NOmBQ5tm?;=xlZ%ov5Mu=6vhhdofgUzzdA<P3YR$D4e
z1oxkqiQB9_hjIU|MH+gdoQ_<BqzAsWnoN1&+4ei#y~sj+`r{gGU%^*^FGU=10e>&S
zK(<l`=VDqx-GY*Flj}@5dtSc$%S;&4P;5otI^@mz5Lamf*`-abq)it9$reL1ege2N
zUHb#HF-e=|Fwc*jJl_lO&6GBcyv~ea6W9U(n^f_J$W$ET`LPLsZ3k|UZwbf&YzNDM
zD5zoiTArF|?&SVc{si5kx+ULD_!R6~{UZvPV}FSTQ!ZAV=z!$QBt!#n!bX&WX6%!H
z-LKB{{K-6r;K*Q}jsJ_(^A_PqC<3ix%z^WOUG<MRuEoTDqIaX|1JkKKn<L{VzAqCC
zfm8u=;RXe~l;M1prApopF&L7s%h`?^OV3MrsVbnD<T)23(H#ONcE-QdBG>uH_pzKk
zlyy+H^aR2tEgVZ#q@K$HH1;Bw-vUo91pWHc*%kGs_(zAv;*cVLp?>fa?2}G-go-1@
z@1EN@#Demn8cZ*>8EhT_!%F#!tP9k%RB;~LMAixEfj{xfE|y?HSW1f3yHOP?5^ggH
zRg3d=L+&|nFA`~~%O}Vy2Jszs;l!;qZl`g(19p^(%3)FerRN|$1absgAOpgUQ6(2N
z*BT#k$cL#G%2Np9VQCgfB)CE<g}x<WJN7Qr2rJc*F7L0gq=)j)eo0s^l@-xyhlU(s
zCEboz*J%5Y?<c@1P4Zr&m2=2&-k(G!NfwX*19?F$M@in3fUi(C*U7(x)y?vs;X|M(
z^f~@g=hDQY5M+v4uQ7#4-qT9o{@m4+nOX)Ei%e)V999B>LF&~AYLkJ?!kdZI-#EtS
zXve5_SI~TmeLi>$wT{O@C(HyG+Gc|XaHB?>0t<eP=TkJEuKWUkP$qdd{|-iA7onrw
zVf0V(O#!3>cN4hL^+<9)B~QX1nks#^zkwiy=1HHIz+G4oWucgbbbq*YJb0QL!7DhZ
z0bmrisYGlozI-$uAiGv17E;Eikx|blE?rmpoCMQKt{|=5A_LW=XYkyQ@b4a?2Z7h|
z2QgY|&weSD1+-b6gaMXO@?r~uB*+DVA(0E>aP3oTG-&k7XiVRRfGz+BF_Qxbb42Sj
zisahdjt;9$YrGrsL`LCq1?b8wt&csZ-l%NU$1BD;4N47iHe64U1|;uxH0YmZ3AT-_
zSh3rXmA2%45nnYNRou}Q5gJ|`!L-3DB8%|Jj~gHe%UgtzyvA05V64l8HN`-Aht>(>
zGzH$~P>{-x*PI`>&AT}d-W^xKFv0%?Z>x2qkva`X*VF?N;_CoiP?bF#bSBbDc(c(i
z#@T{M*u-S6AiMzI3yj>h4lT=8xd``vVFZ(vL}=Bn7f+=YMFg2`T#VZRc)Q=2eJ0r6
zh^n75iDQl2PZq<UBwNdOzKq@p9Y4WChEWT`kYKeoB8Cp82iW9HY8Sm9zY;=$V1sPb
zq7U;d&YpO6@JlzETh|ZRf_vA$5vwG8kwf&#md|NZ(VGV4pKl4qg3}1WIKzop^_YQE
zN=FT}k<O#SuLS(JWdZ<__ZSvcJ@C6VE?+(uAOSFxa{B;%b$0-S|9t7(NqAm*63_eL
zN+RB_Jt3~y&cygk{)Yq)wskRzlpez$KXx+MCqe!o&I+XuQC$PH^1o_tzo2F;`ch<d
z0)aE#*~o(jvah4xT&j3$E)qfLh?gUlfcUw&rat1%G4e%)f&|r6=5#^zAzac>iHSDJ
z8wD?+tQJ3-TZ&mVV>ap~{qiG9iu|NHAMbV)mM)=g9zr^@jyK+SQ9f!5yvsi0+Y-$%
zb{&1Al`f8}rGLN#U0oAS6LbGexVY1?1hwiV7a+L?Ll47XJOSZ~Fh~UO1zR9`AvT55
z$uuF?8ZCh-qOfNUZLEn%)&<f0x!$Y|i{qPnv;Hk9c=|Bx?w=?z3cPuNhum^4yP<oM
z^zS<5mK^!;{u5dIo%dwG@E4UOc`oK)tBjLYRmXk|%(3xXuVph?HQ#kDOPbox2PIRk
zu(nQy&jQR&aERQVaajH^<6`V*u4Y*{Z!KsQD8&Ig3k|ge(~QF+-k#rubumL}o(7;%
z^@^ojDeH$9VWhtt56Hn!O@JH5t?8^slT$sll<Wbl9bcEu;^NC@V#{a?9EHxv)n7f{
zn17Ux_#i8h5uPVn*lV2GawyxEV1LyExQsS715Vqp?7lXGwHam0ID<QEVw6>4mwJad
zpPp~+#NQFb6m{ONBpviGW?4tEx7b{hX#@5TVg1XikYj<ZD=g$<Hc)Q)H&9j^UzNdz
z1H@lvutfYkp8+qpX4kP4JZE0V(pU<=^*WYx^K%sfV97L1ay8D_wv1mhzKq@PYL1gs
z$_55tsW=^F?byKDqgJWnFy5{XEZS%YSO>3TJ$u?~hsEI?cZS;O2PY$nNKSJ@)<Y>+
zKgnu73^S-euj^Tl9^c;%_|yVEI8ioL@4+$(0Ae9^0Qgaq&OwRk2vr9Dke6T2S|!@m
z15o4%2zyZql*g{FMjd?J^{ji}bn0zX^xeLA2SVGZFVd!=!r10Uq$xvfM34{S;NBqA
zZfm}+(A=EoXR@}4wK_eMjf{f~8W4^{1nsPg((;2%`8%07#DML6)aoyM)aJL7Dl!RO
zTs&?pPMnL?M~({KawLukQ=yeT)EKScE1YrQAP)IRef_`&>JK#X&=H7Wd3R~=>Av0Y
zpult4y|Eyax6rwMzU2&KB&RZ&TH#QRk2Qm>Ea0SX=mMYBhb4Dk1^8ekCT8pooW}S(
z7dm2^lU&!L3pS<f9LmzrO?-VH*6CVe-YIHA0rC_ox%(_HGuP0FuCK#N-ERgpP)>fS
z4@>K6^N(Pj^PQB;eTY{Fu3FTbV|m%^>Leb4ReaP9tX&*JRoakxO*r+Q8(1=>+UuqM
zOHWOzmwHf7b<|63(pRe?tzK$hJvFml>K%G&cD+=tr{>m6twrjM=vg6B!=u2fT<zIy
zp^HQdU8i4$zT8bnN07`JADxqT?x&4+a=p}%NTph5M5p34T<Z+2Ru-;xZgfum9LnE;
z^3Lc~yoSp=weqjysG{|1N&TEl!a0{{IXy<sGA}RznIn^voW+v!fg-e^qd#aVMnw<O
zXV)o$MTc-*By)`}!k442R;Y`lto1%r>K|Tg_~E4fVO_%yoo>{+wXwkmrHoR--J%z*
zTOFZ?6~HKaw?Pr^LtWG@qMP-)wMGB1x8aAN{^9e6A3FBesyfo}!&v>pcMU&y@u3YG
zKPf&)J{1c&yfWVD&pH;-!Xr{swk#7%{x#$iG=t1{?2OeX8)R3g8*%tZ#b~INXBxFm
z#wtwBX4j;V(vkL%U`vBb9_%^aQSxROIdgZ>+9l%|8^14`b?g+iH`d!1$=poe7duXq
zys=<gz&9n==4&)xb6f>A$wBILy7=H8Y4do83n{s%oGgtB@DFsxVS~u4Xhor;81&ta
zYwI0jiP)E@=Dk9gNsVBu?c)9cat;tjp}COvNH10=R-X|5m`l*M^x_^XZUjSM%Gh0~
zf@I5fYSoV2Em7K3Z5SPd8BAOFP#QRVR(E#K_!Kq`=`&Yidm^K#d0~P_;>Xr;)K|7=
zn5Wttrk%bI_{9O(0pu^$PtTg8_Z#nS96Hr0=ggYPflc3XyfsLsim(mlL==+%K`sE5
zQ(8DaY;y4YVQd`~evx<rb?AApx@2shOkg4iVTb~__;nLZZJ_i8_*Y2qoT#qaBfuAE
zkBNd{kphN#Wz-bCb4Xs2+mgk4{p&HrCPw>4Rp1acUW;M;W#eeueffk=R9k5sK#*6-
zmq85td0}#+zV<aX_WMBPgv=Kb;WNbe1tH-Vcj@4ny2~!+duoNXVIdu^E;U(r6sqv=
z4P%lc8(5$PDpmhHV>Suf3$mdQ1`;kjfTx7_H^ncnK43Q72{DPZlll})!FmQ(H-Q0E
zu!%qix1m4KM$f~&m*QR%^(Cqo3gsc%e8mZO!9Fyn?_#1W*W%=^R(y%4Y|K~-bum4r
z;ZeQoOS6b8#(yX<_cF(R!xM&^M-2g^8#xmOkJ4?PLgn8;tq!*OcK}?@cHp2!0(3+C
zd-J{g#o^{B&EFj1IU~#+%+msV+6Z%2tnhIE<TJC0Z?MO-PF$-S{_h1okR!l){hdFO
zhsZ17Hc#iV*_Llgz$D$4&mN<cGx@BGW#a*)Bn@Mk*>j6Yzo^(8q-i&Nr{2H{^XQ&a
zJr7|zmI}u&SA#oY`9s5)qk~P<;8`m4+b-Sl%P<Gv9}R=!*WPhLiMdqhw_V8^`h~MJ
zFJN7}KBQ+6`fZo4-!`)339#|v0yc<-u(|*jA^^h1XC5qIed{Ik8qTh_Odg9t&KS-d
z^~09^ceV~U96?N?|GljPZ#{zbsi#0L8Nmvv(=U!-Q|Z?-l4ZLQk$~u$0~9|Qq|h$g
zNx5O7u-=d;LBj#r1J-%mYz&-kw3UyKEnS~51ZvXK0Ej>IVW*L*Ahu<dlbnlPw*uKM
z>f;}w&(lz;MR)Uajid1V4--X+7Pla@-S*f$U~NirT)%7Ah`5^Ress41YQP2EkIvZ=
z2bniML$$G@h1L6j4dhua?g-ZJ*)iq;DrE$<6#hhp5h~)r&ExNnFejv1pk^aI@3>Gx
z9r`Y$EP-EaAW$xQ*)oVyT8M8a<N2Q>%<Z#icqOER%n2=uQ_nvuh#Nqb3$WOVW|I-_
zA>@%JRv}zUvXlx!S%S1<@qFw^b3!aWl>kb3y?dlNha?;5bxyQMF|r|`1EGW!$bzcv
zbk&Llx-XC=X9t4pNady+Wq2+$u9DA;^E5V%Gl7Y;1x>8N<~*I8hVh#Y5Nm@HeNpD;
zD321@eZNY+S+_QWT(261>zAPgZ+a8A5>k;ISdhm{zSTG}L?2_G!8@uKyDaFWIL5q4
zr;5Rtd&xVSHuCy6hP38cnXGwYGVS@fSjW}2VV>=$HH|WDu5_>=>tUdYO_}PTgUwz#
zcZ^QPapvqncC`9OvtoJFpZO@@0W1w4b?}-!ZfuF#W4ActpgiHQZ6pNtlN?UcG-iWm
z!R^P`kLoil8?|!{EGD&c&I7F|0oiB>4{IOoylNEOw%^Br1}HawB;wQn$YMwIzJ<g<
zh>jaLUzFWP98wLIfoQFMONWp%W4A!A<xR_Qy`JwbqyXp0oJb@KJ5SPH2mXx;w*r2q
zs2O&XiKl#Me-P_1&hu?2&&5uziBPyMY00EFe)U{vvamhYfepcEI?Hvs@q3%FoSp9C
zG&VK)urins=Vjo{|Do<(;A6VF|KU0NjF=?D2@--N5=JB_qV9r-1VuDxg1XkNp<1^D
zZ83?N;B-uzw%Xl`miE!h)5}x(v_h&+6I4*uD34NFQ6A28w2ey<x4hrA&zWSR`n12_
z|Np-4r#>H<bI!i6z4qE`t-bbIKcEqHhjc3$TigM!UTyY=0AL7IA*hZZi|Z0#UF?pE
zsKAOG1kn-dJKYV_4HVZNco^b4<=sU<qfzBo<#hUOzMjZOIffyJ$X_Z9<sMDR>7&Bv
z8!frh8AS?8Qk;1JA~8%`fKZSY1C(U@_I$Ydr|TWc2gR_56Q-QW9`f&i?f5q04je*<
zr~>ttrwCbSM0AgUKL1{Jat2Q^2ho#I)qJADG3<mHPTh6;x#BD(e=j6gS`_Y0x#$&E
z#nbc)yF?W7Um0uhPT_T)&O@^EYn=b%171n)px6Ew8~_`lTPR{aLkTQ26}K;#uIMg|
z785SJpLSBRx(a`3Hr$~}-mn_N2`k1D>p(1~?4`7j-b-itLZY0|ZU_b>Q#<$!(JBkZ
z7Y*uMpS+F`?TprX4HgWo)v$Nmv<9t|-e&KZ_+(Ck&uG2^*O0G3{3ndOLuk=m)}FT%
zyOTn$BLGXLZVx#kB&Ut5zr{7e`cGjGIi6Wyo0`)|zny%YSU+J{SE-($+sU73Zw>-&
z{|L(4dllye8hikC_!n1wZ8fEw!9Z)YWwj)Nx6trw3~+$<C(4eKP%PKmR6rQDm}cT)
zLE$hP<X2)0e&g_+cy78j&`G@pzO0K<2o>E7q;;i}rYL;suEl%?HjNZXy9|Y$=niS@
zRwdFLZK1#LY#3yx(bUnl<1`13k8jCvwhwI3T9STJ@NU{}efdzkhAk&Z4@xI|Ev|Ap
zu16{PUxJmyQI3;T#_GJ3PY@2oRN?5K#MDAko_Hu-yLDQx$qyHuQ|*;V$^Va@B8-kh
z3~KEhk0dc#K%<rfp!?X^RwDs?UJAnMGcDbY#T2?i$L8YNL~et?d||zvPo4oF|Ji9)
zJz;neBE)y-t$J8%eTMjWngYU4*p>X=L}ZJ5x1DGjw2hzYFc*As5iO!hIC-0uDj-W9
zVLre&P&H>BTBEvYP<Gwhn9)FV)@<mZv(oVghL*d~iNo4U0M7roFRhKfP#35_&PY%h
z5B<>|LwIeF9;;_MvGVrw+N@K*otJ6Q2WaPw1d7q*BNonaNC8cV#*oE4)Xa<?no2hk
z?S{T<^HOvX&NVm5Rp8sx6KPgKHy}ZV<3!VL8swUvq#ke~D6GEeM<4@~xgoBtq*xe|
za4hCRyBBxj(PjRo=dPTPYK88C4EIFIJ4Vi<M0cjt6RI_s+?b#fSNFQe3sH!khBI>K
zKak+43J?TaNiHQ~O5{(me^4w)wPzuuC;et#%tcwWr&fU4j|H_CR&J<Gr}kB#_9&m7
zOh5#&*Ecgyx9alLFd6lCqzu$hb0n!(l@Chw`t|k#@DUjXTZMEd4hgEoXzL&k?Ib|t
z$$7VkPlA#75?Jt!w~Z&pPP;xCGX}bV@+pvyDJmV**BLCVcRpxKPomv8cxeh9fU;bi
zi=!jIPmfjt4n&rrxo^{P4CXeX^f$^0(2^9ec7v&T$kY+qm^57>P0D@HutUHlP!c8o
z3p{vA@P}0VNkHG1f52hUeL@-^gQGK$D%2%zH`c1}5~NqLa42dldLQ9gf(Olwl}%vu
z#1gnjpf`UrkQNKN3GMhdX0^*VE*QsH^GeoZ7}~3#z18eb{s@pATEIn1u%KqeYIDU7
zL!M@Bi2QERHf{vnz%}^l<H#C@9NVZK{cd{*HcJd9d$WfT6<b@b_lRWPCYK>fCrfsS
z*m$aurN<Wo`?Dz{dPW(CV$t}lt^48G@VtXLBu*}WKE&m%`$#AzUoToOl%!JqbdlOB
zMC#6z2ZX~^B)FRUaY@8?jbR{s8z#~D)poSIwF^n}SGQLmB$2H)Nlj!%SElYIKlrnr
z)};a*3IjY=n3OiuGN0zV$FRupI>!&C`z~Jy`<jzTlE!^sYozqyj$1*C0^v912#zPo
zFE9x+WJZ0PPtrAG{)9i%&=<&F@;ClWKN4l5|GO{Lot)o)5Qjxk5AxiDQWU#2gRiIG
z?`QDhgHm|ooj4@{gON}SXCdb7RC27jW!YH%^FgU~6VGxixZAWll-Tx=)H5D1sTpo<
zAso!{t+DVi6pNYhyu-hLR_gQz?l}*P<;M?6-TuJo<{MOLdsOPU!##8y5n@V7&qmWq
z$0$~WE}YdMYcS3hs}_b<rISsPdJ^l7lwBf>AZ#2^8y#E*nzH6ToNPB~m52)Mz@0B#
zY=OU9a&+8lqjY(@l+)EwDdluW)#ThT5Z)9n4~#J9w52wrEbC<dHcB=kNMnxKTTd;s
zNe-w!c2F@r=M9HnP9xPg-Q2gY!EM-)BxZQ@AI$I?9Xl{`(%KaJv^ZO6;6)8EKHVt?
z(s4O49A1NV6GY~Q@=b@Ou;B1n)~s#DhXaRUO;T1}0p%-#v}sgO+qcK>fm_3(`;*`{
zX=DHW8))1AzXSJe&@M;MOH-cBZxLqy?+~}a@e8d-1LEb?0Hd+{LENXeKv>o>h(&kM
zHNs3cq=1@m(^DOW?ulGL7={S<Vfym>f*pFT*w0tbJ@}CDH8wOTHuGqACL)-Dk7%6m
z7_sf)Sb^@Js@GlOT9JCV_f{t|=8!<G-@bLPq7T|nIMD<3HM{aiCZR3FZM6^51Kh)_
z!YUZx>cQ>pluH%0A;P_ni4+m;^}9*x1@#1WUMuk0a{E1{hp5MfcOiHdHi7H7#|TCj
zOg(ZXQ9wGsnD#?M$d(k_b@kO*drrJ@Bgr)&1P8iSEwn_!VJn{XXsycfT^NB!L>`0f
ziXQ8cn1Aq|BAb%Wkzq!GU=5l;!vbC*1wBr}$jB#lCt-5k1#s<=P=N`7#OxP`)=q(F
z531LjUR0jh5sXyWYa2mmr-GS4r6Tk-g}qK9+hBkpF;hD*hEy4Pcr363NQl<HM8Aog
z5Ui;Cit{1bv@uu_5Y1slb(<icLNbLS`Axi$Bw+V>YI+|ZO0jM+7TPyqW?PK|8<FJN
zw3-t1=|rHiJKO;_LAx-~@A_v2%-mPhfpqm>BJB;gf2=EI(Bg1aw2^-~r&SFi=tuxM
z2-RJ4_;f`+3Im`09p+ug-Xf{CoRLHQ^*f&Kh<9QHyWtm1PEK8D(4X!O-UKX$ox&{;
ze%88P3!o{^udyZh;(L*053pmuZ_me;pF$h`&_YNDmD=fl3udEM0Qo{<R~~{|pZctB
z&%GekURus~kwJw;YWONlA>>Q{K=LBws?N**9SjwkSdJ$AMYmDtkya1Y>sLi<Pnk0v
zsaOI25$1$a%rAz#2(TJw7njNgq7B1609E8ELe~r?34qJri`ur{N8^138MPOT(Gq<i
zrv^UOYB7!YalgdJP|lY~wunB51-(9I@E{=eqPDktnhVV8fiB(2(;R=N9gE_Fz0y6j
z#e;pdcx|qk#-%-<qZ#OSz((**Ua9j0<ns4`LkUPWcTml?s;~W197{S}G9iLWN{6eI
zCi3~GBLSLeOHMu4unq{#(!rwD@5+<TA+SXQ{@^+3o?1HmPtHlLTeXKBGil+882;YX
zMENINs5*YPp0U7}k+dtdc^p29GOji<Zt!J%`?neYhK%+^BjZM2MmlD$T_d1yr^}AI
z#~qEf;c7l%AJ|BXy4w}#g54hs%umwhQFI7X1f{rCHP@m=%&p;dQH=lc3p!D51^x|+
z01;J489mx{Z?tx9BZivcS`_V5^50Xf<QE#>-`DML2Q>Y3`wgIIRSHp=g{uAapI|HP
z;EWr&78x-FGGnVxP2Gz^k-O!~py`94NTYz$77&2*+6jP(KTsjHtTlO0R!BW!Z^xT~
z;Z#U*4G#zVN*0Trl+Gx8u0rYpgPWN1QUrebo|k$y6FR3p#5cM^xua+@9!xM}34?g|
z^m!?PZ5z*bA|LBGidUVNqEIaAg4DcjL&93*NxC4#wi0!Oi8`!Ls4qsK3UzBZ{<`YL
zQAX05s}~Sq=(HUy05m?ZH5|%6z92nHBk@TK{FQjtH2T|)fK6Xhb`#u{Gsa+c?Cc@N
z&>;|Gn14}9`LE9X4_rhfkh1;!>O~RQIr@^+zPaU9Gz_W7ly!*QSdSnvZl_rZCMovh
z4Y?8IP{7+nuPs=eaH%0*dr6A6mAxj>w;HwF(&MfPM@T7_8;#16#K_8#Gv?3$(*QM(
zKJLmJkG~W%58Jy*eUZRI^~U@v#mcRphntySr3g8eOMK?9Qc|s{{ODI{WaNz3G4ZK}
z7g5K~@xtEJomy6!x}}WsR+pu?elNH)-d0nK-KkqjQ+J|zsD56>4uTQ6(_Wx}eOik}
zQjPaJU5Q{g=%lVZaarmwmpmu&{g<US^4awgzj|5f5u7;ZR+T$#i`L~eiTA!DwU1d#
zb&?CuOjiT<JgljNJ(*Q=&05+qAr?*C!N;^=asNAnidhHwoi=}nli18cv=i4rv7wMQ
zkt;xfTmM%Ot!F9^i)Ve=*lRo^p7r?+!lew1zZ1eG3WR%!Q6I(g4kb8K-HjVLp{@}3
zT#JCiyL4cS^|gclctz?e9puqhrBHyQ>s6^|1h6LOI}w#KxyC{`8spQPL--R{rF-S6
zA4&Z9RcWX^{TYe3t(2P8Lm8Y-)5_64y@!vel)4z7lIYWtd-yYz(iF=yu>oG_$8S_h
zLsQ;>q9c&(hrw<%#0DzJ1*yTU+O?`%w55i^_!w?tOHE*GFrn!>MuAN$+KHO9kG_|<
z>ly<7shj!7*Q9Q2)4%vn*QBA%h^RmZP)(R{Zjxd%C;jc*K|b=jba!;{-=I7&qs}7H
zy&JFNm6)-jX#CNBdY!*<U5XolP^|8IBeWMF@9LCoxcfJhEf`~PO$u=hvcko-*#>sk
zjGOjmn>!0}8E3#ej<!Lcs)heaikA(S%Y4a={|Uv5xv5h;#O({?GjB?*qoIq{kyNP8
zv~?H%UqRB!K0Ni7l+Nm2<ouSD^BW|M-WGEwB%LOZGz2$Nd3u%9vEe1a9ir44TLnFs
z^H<N{Pgh9~;4HlGQkB$6lGgIp2#v{}O5~Fy*01i0<~nKG6v&#?{Q_l(I26>CqxmU`
zb*cMtV_jnx#h8uljpQke-PMu~-39=uCWB2U59VZVWD&juNPo9P8}}M7V=T5wBNR?J
zM(*K1#MYG>iM{XdT9lsH^l+Gw2rn4UUf}tKA-&e|Bd*A-ExOrDX4BXd#-BbTHJ%EO
zqu4{p;54E5N(pi!@Np}AQ#L=DhfX_Tc+ysXT`OL*>w(R4UIjfDmqZ};SY4Y*7Qn@`
zbMymV89f*Al}R;5quy4@n(~fj7G#5UiVz=5&M<ex!i3ANEhG>6U!s^%z$cqoDla?5
z>NTX}U6_5j)=>jJFDfgXe5aXpm_F$R!A6r>WoZ5$RU~Hz>1QXmngQL3?ujEQ*YCLF
z$cd>PTcDQPKH;5Xk_b)ElN|HAP^Ir?zBqRR<g?Fu3;lgp_=O@EPuYLu$#qy<D;+5C
z6i~}i-9muRC#X*3Pt;)#OAqp^b=U~|4h$3s0EeliNzr&Vc``^WsMHQZvbb%YoZk_H
zeLq-mIuh_rm-8?c*k(I|!mFIN<M?qq#hc&Rz~l#Uu928T=Nd2JVzu_`E089z7xPam
zSvdbGfYnX<9@Q8!fbI<JJM@59eBrCY@I6buDq!Yu4~4Lj@~&f8xk`Q}m=Mo$zNRi4
zLzW^x*JUxmG5S79I`zU(3k#8?ro43^>&=#Q;Zp+H;JULKRWFxFP<gRX;Ma9P-L{}K
zghW^<5%(z00_dTIYI`Lqq`AO#&*OM@Tn|uIK7<ExJPvEP?ds8s1xW{ggcy3!Glp`I
zRoZKShnDmrKOe-pMyaigrK02qA_Jzn2`coE+kEY(7et<>-F$h-smw=6@x)=3XurJ6
z`vt?3y|oS>8_Z_XKz9bSA9_MrY;e~g?=}8FeXwbUwY1BLyVBrdJ|S=!3C;w5!picb
z?fijytQSKJ!B^_B$lz?-Z1;E=ov*R2=ez4MRa(zS)@R94M2t$Ew)gNejH0UIG6&e}
z5hJsfAjn`QFRag6updnPNPX6dElK7#>$8^ZTr!VQSoFQ(c+_b-jn-YOZRPZnZW-eE
z;i`LB0|c2w1*0=Zj1o%AP)O5p0qQL!|1M;M{&Kd5yhI81T(`iCzR9;VWN`@uK3K2}
zb}zBDR0=cCxEB5}Lq$}y?l23Y!zl{SGTYI^gd4ns9i>4$v=JM^24CTm8?oj%vX}|L
zK+g$72RuN{5nZ$xq0eW9cqjob{hEtLjWe0Lj_bjWgJd6&Prmjs^^5)^roGmrd%r=W
zan$R?fSgsJ35!8YvdJiYEb4SQZMgs+6evqb>JCxO(7WoFXVG7)+kDSG?(wCUT#s8^
z11>?jG`oggrSQT_aKpP4R!;Jj6T-l0vXVOu)q(ucio;!ZT5)I$7raA2$#F5>N|L^X
z<`KI`xt?h*z=+~bTNWO&n~lvJg}zy;Mkj*hA)uRcGNFBmOP|M|Y`|Lb2_dYJ-L{MB
z@**Cw$%V_Q;-#&=uFxJGMYo3tM8>0#?bYqdhTUXpnp+9w9{I4!991<s$ydFSpN>y%
zz0=gv8iWkSFL{ok-yZlOv<g*^pyQ$V5*{LAjKQ}7UI>3pJg5O8H}s%-PyxQi4O>m!
zwec|xSiRPSS(zx@eiZs+sY-8O)Aox<qWsY{!?W1Qmpq0ZitetUqDHY46eE+^I57|n
z<{;=bL5(W-y<Ve3qR*nsuxj#kc~qt`<aFV>UfI0bR)&#K)%N^1P`6{7sGCHjZMNBH
zMQ4v{&Kr<{=9#YCSVSh8?%OkA63mVrnxmvjS>6*X19Ka)$xImF8G|~J+#axv23Fa;
zjRdm)!vX1SR<QOE_CxSQ;5ZkXl>AZDqb0VvST@_KT(&K{HoJ!X(YLPtfefDK1B?Qj
z0L7otGY|YTQF{?uLVZ9^KSbMs4?4QsLsL_l6o;Jrp-`sSyTYj0Gvlh*LIoaqBmFv0
zn>A<#feg#%5PquB%m+9Xo}yd2J`%7~cc|a|roT`cT!Zru1B@asfl$vo!Jik!;PlMY
z1F?LZwi}dnjqNIa02ni1)W(7@aI{1vYo<xPKw%GO(BcPKnk$fVfLKfRQ6n?8jXgm%
z1iH-yphRRG1CIF}L7%X;qRGaHC{}hCPXs<;ywoU0PhC(pe~slurrUvgF_SiEL85&#
zk^d9eb|7*zYW70ra<8`S#3X3jnh2=YkAPa5*vDj(?6g(z;KnSY+eIQsw{c<Dh^k<E
zd@gn+RO?y@gCxcI2I{NDSViVg7eNt-u}UPyYK+Aj<};S(WsO;8Ffmh;ti(mN;R#LH
z-Rx#QpV5T1PXX`ucb)Nz1p0t45pER^>NQSwE$&3h(r@vaYfk_s&ZoY1FRhC{<mTO?
zzlw7)Kiq_kk)Glm!&!WMO@%T_8H`RoA*hd`fEX?YAedvKAT%1<^QGr_aX6b7G;{(@
zkeNRBZi>z8vj9G+DVr>1@#3azj{U0(*lw`?{aBh5h+A0|LV9~@B~+y6wX6-lWtjqK
zYySlawLR)p;S`vb0@&HPHFaVi$VMx3vv$Jgxe@2(Zq)7Sth@HerUgt3**EphMyO}2
z2=u#e1+*Z<a2&@_wJ4RZY{q&wdtjUxmbm=&D``N_Yd@Q@;^3_NcrzBoDgyY8W-Oy&
z=ld}swNRQ*ZO$HSPzhq<$)_3>Rd8%NZ%qta-AUL9wZE<8EP@T{_w87!91x_YoNp7`
zLVvVp!0maC(rCMquz`)W3AU4}!^-ACo%BtWSiDL6=?K=^exL2GlJbzi?HFFXXDuiL
zZIIs(`WLRT{Tsh}s?$b}5j>A0gTdOE{8^j)O~0UZ!K-e7w;}aBY}{96rJA&F^T2st
zfX`xTvI4yqE@sc-LB9zCLt+wz1pej6;xq3b&KeDZXGkS~4hDnU3t7-1c&5_8UN!1D
z40{z}PyZzz#1<Uwb_$vfIvZECyN}rB;wJauK~XHK-Q@2E&?2keAgcFd?Q`l~Sw6(>
z@R{grtdoz5V!f0yqDnW*>BoHYbQxb8#p0*aTNm-M=l-0ap4)Q*K&ma?nSv)-N%>&7
z3%zF|;2o*+Fd_*M_oW^b8JZI-^SwyBjf3^>=N((HrX5ie4Mf`)1yEiDzFN=}UEXg`
zL><nlufwPSUmyXHIL5PEuvn>rzubZim7@6B7A&#}F^}`3)QXs^A|3)cY|eAqF7f8k
ztm$B*r%C8(w83pzZNAQe=UQq0(l;7hYz<g+Or!yaYO`K@xjh<Ju`kf(hux>=&=CDT
zDd;CP52qdK0*m^%RUI0V69h6}W&TpY6a-&y0MSHnWaH9FeQ#8Ok|cR6&lKa$j5iuy
zb7=i>Vivr{pvrrcl-;>FE$<7h7mO)p3jf<7RUe6>_#qNbY8U(u*MeL4PR(lkaK8o7
z46BAfTy!4-Xn2mHgsZ<<C&WqNgsODa0h>ykcUX;0C4V@EwTXTKlcJx))zsKUuMsQ#
z{s{h23>(~W^-AbVY0J&pi6<>DR|vBfXtevI{+w>2@f0*pyVjaCv1@hF{;?GJ_~;Q_
z&E5cNq$w!1^&@(!gQtRMRM!?ep`)?M^v@Xlht1z7Jg+5`3zHw>Z?$BjZ0r)0MNh3q
zM(xVQTcki=>ANWLAt*3p%%oBt)rvJSpT(U4-m?|!E^oVWi!W%!x{`SFPAk^GmPYk*
zE7msBdgB(IY}m!MiAA?r*780!hHDehp->iaZDJ9y%72sROOd73Y9oudHnHf=*Cuw@
zSnFEtU$kL#pSR#mTeCK?=in*_7eEqij?bJJA|0|661#F+YcpE2wmsL@<Sp>!UGtl~
zSksG))1+$c*q+v`dGOm9a#ap44XkOve`(EPYjr9*_O=frVp)e;Ii84xmWaf~Sk|rC
z_5du9+3^4H1QuMBZ^NdA$3xq&^k-878h4FwnJ#a~`YA>iFK>@l@`VJ~X$uU_O?kIM
z+F(&EC&#>>(1*{)HYq#+OTK5H3TWA^U_q)WzQjG?2BN-~|5^v3{R;Oeg{uP#7Cie!
zKqrQun*m$x%2XH%byZ;&K2=%S6dRAH5B`A0H>C2o+Gf7xD8BU>)h_JJ-CfM_rK158
zIFt!OXgk=M<n7Ews?dG<9Tn}PRR|hhE9}%3VNzrfCLLJfW><U4(7-=3)$`R^P+0g`
zbA^y<eAzG&CnJo{_!b&eF}NM>K{xU$#o!Jog~yb_wap6_@GriVI%0JE#<x;C`i(y(
zMc4h?0P1SQvvYYUcOH`#HKK8AR(#FdNoYX5=N-nf@Ve!QJEo@X<ip0|1_ubDno+Fo
za-5M}){nQ%Pc}&hs!lqV?gT3o3#jAz=E)oVVVhVl5m}Y|16WJ0oSm)!{wnIS6P0qO
z?H&P77(3yg(Ci8zp0c@PF*M3y2&Gkfmj})Tl$ubhi6l0P5T3dlf6~gZFD2218u&~}
zJE9H_UD=0PgZqkd85@h5TAnk@arQ<|h-U=Kff^IbHV}_t>Q$HB;tEGxFhfOson?>Y
zY4@{sba?_UJ2sIT@jZ~II{UGL{^m|AcW3M_P2G*=P1-Uz{MfpB0^syb4#-dJ^ROOV
zx;yYn4dEkU6h}~WisL(^a;cM1)=|k8E_IK%npatI5MgZTk9tr^Ihq{;SM7AVZa3L2
zo@en;0Iy-&)wJE}gnheG51AZ4+)y*h08lYR1hg=KEcb*0CK4~MwB4vYTZM&GzAJ5?
z&;~sUjK#CML+khDtt$11he9Xdt-({+CQG1PKj?iKqOu?jCUBMLFF)1I9LirB$ATiN
zJGe_pIiDQ~!xmu%Y7g_2n|Sd!)<MePzl>uz$E=!FHA`}*mZy)Z3bO%#0DkuORbfu>
zQr^QjmJ(3w1urEqt~~5rK~92{&8dg5Z8)LFLdd<{WV}cxk0Gv9blrkj4{7_fxP7;(
zUK2Cwhi7tHan(t`)2c2L>yULq0WTZR!tY9XOftozxv_vqJXrGH_)lvOrayjG2|H=-
zX3pbb6WE0ouF&2I=Mygc%Opus{NcdEMdD#^;NF-ESH8ZooySgOAF%S-{F{mFUbgvF
z9yf`N?yz$rYS133In+f1Fn6<(yW$+Hnp#2DW%aVwAsdXZ`1_Ms6Xk1|nq^hwB%9J_
znYAzS_`yjmCK5JlR<Z(PS@nqE1ktmU<x)`&7GVu0vxqQUc@3=U;?|IkpBwapq~ytL
z9ville>|C`1+Ja~Ik~AeU;qz(fIY=lPvL7HVD|^EnS{?wyEmCvJ%D>t3asKlof49H
z<P`Soun5OV2x9|Ca1o8h%@Z|OjUWv&ZRu}gsgS`aUD9fS;0Rc&^qG7}!}q#gC|)mA
zcw-8CQ1UhSLq9%y8oMWO33V$(E9l4nHI2plQYZG~71LPDz&9vW((dlZn@?v0e7!r{
zmp?cisYcmteR<+C784H9F)=N>jca%a5WG>*HY#h@9DVs0(^>Rg_4Se6-`D75&U<vA
z`$pApt9QL#B%<hjDk5v$`ttA@tW|8GUPF+th?3tPsOU{a_5F)BQes{0r#}3F84y6+
z&-1()?5@C1=(D8pKD=-SYu97e+teIg#?4=i&5u~le@db`#Er#=BAQ0eDLkRl<f09a
zi_%^C@MaIPflbz<&qaNJt68&AZB`ecO1f5>Rk-Lu_Ne3oPDXEDnZ*YCCfMAY51Gj#
ze84%;t8mUtcDEcj9yQ>a@Tlqh-Pzbb6Y)AKQwyDr6?Z`0o;3{b*qJnWI=?;}?7`ZJ
zg)tAapJb~qa$#Ur$OF9DJQmCP=kVltEG{CvYLU6ByKXp`xAQ(sx!A`9Zt@lLP{|Y*
ze{UX(s%v@xOCfGNKQNCi=(BhlA?e2<`0+M0KoN|!SY%ALhRef1BhPh=Tc4PwMaE2j
znZWbrv%$@?RwtXV!U0S@Ls$_ZCcr)`fuEkwVgvVLG{EZK3B1t)*18#Cpr<?Gq`-}^
zB4aV!=)^}Zz@&xfxUs7fU$uY@WD`5`vIQ*Grswit36lm%Z%c8mq`r<X&?l-BZ<dYO
zzto=h%4Ttq`>0*BcB-Qo!apUN_g^r%*d;o4;`VIToh|IZw`8-nfn}6c)~0sk-fVW)
zfO>it?(#3$Q!g3V5p1bMI@>sWa9ooRqm;&>I2m<?3|TSsiyip59M&{~tX1)Ppo0#@
zodiX69zEzA&kJ%`MC49tIl#NbsN?{oKp%kfJMcX@tWV$oxCcfh{W@@EA!{C3tPiVs
z2Y&ZL)~%jC8xZo%+L62X!iDUOz+nV`rnSAR(6)&6mweb)-i|-An3b{~&++b$vetq9
z^?E&R`SeFws?C`3m)q)neSs7;_t5ICp7GqaeE*}Yoe#N(wdL$FmKRY66mFK;vxo?j
z+2$H7pz$-HQxrReuX_yWA4oYQ?TL84^D*|5?{!TaFM6Cc>t&$JJOC7^rq9!ZG|gRX
z08|hxaCLx>^5KjE#s{#DpU3MjVcpxbflkoVnPfE5eUw7@Xyxk%`fjxSLmNJO32WxV
zuFu-=r<Sl7A26S5!?!MB-TE7uGu!xeWf<D>tIxoVyZy5WC#zPQ);ENATFRo^8d&ga
ztf+?Y?kAdg131|WiwwLt6w4o5%G&q<vLTkgvy?S!YT$F8UYr1u^EjkSt$=^Gl(p<b
zR0_}>s3&_KfgVKJ4D~ip$ayTgA7<=6V@-Mc2(-!$^PyD3Sfb9cK8!fknh1S3cPwL#
zdcO(Q*mDvJ3Ii4IM!mjrFCkuszMD8B@Y!2n<k^PoMW(6zz%mvZX+UOjb>4jP<fqT#
zb&gQFv4KH^2(lL0nkU#<qh@bo=4dI&luutpF2b97Qwt~BS)dg7CgHlIecy`D%>~99
zlxJfr{%S6>1;*;Bj#m7OTo&83`4Z}+MJ@4eg{PvUz&=qpr4<j#gYfrhU*12D^{z)8
zw<`m-RwO}iHIMZn=6ZJ?F81U1Y#t7qrZnT$<!n<#d(<#`l-2_QSad)(_W>j)h96zd
z+WW|UQVg%}U<=veM83koy4DwMK(lK!vd6(<IuN6dRXHx&2g-bs%1MzlS{qpNaTh+q
zG@ge$S?drY&+7TAF8M^DH7S~>IU#nTn=73lbohM>xmv7mLRE$U&%{ajMtC9uK(~gX
zLG92`R(R||7FNAOrAF1-p)N(%+M&LREVQp+Ht9Yw^mJ|H5Mr7946!Lj9kkep6bUjG
zYEzG5he-w@QA^Xc&lgfZtk5c0{aNcIF-WaVBYt)zYg3;T4?Vy77yd%__=ZQUVv+X7
z{T<hPE}H9c;bTqF0%h}~5?#<e+b{9N!fq<vDS*3M_*#Y2*2=^R^{e@5SQm~{b@8p_
zR6|_ylN}{yM|r=%tARVH#wc%M$*BN14GFxC*M%Kx>Q=;c>@T8mvt-A*-i{qXP|0}1
zP+Q3<D>9eJRJ`1=qYN3Yhp45F6Q%_{p`fxT8xEUGelQ1q8@Q`yrIO!^?^(rSEfKV-
zJ~@azJK{=M6Y!O^Ayi^82;5FV2WPdZnit9=Rn{yZd{#^1F#D*ii}VGbuQFSm@O1j}
zvdYo}!Uu@w^D1kHoNefP%O}`#(KH?KmU;`)kU?NI)b87*yEo<EJi%s(x)+7=K`z$4
zCA9-hMtX>2XD4qbS5AeF!PTVTk#N4=#d?ZXQ09aS$H1v|d8LcBq7LCx%xX43bO_J0
zR<ndAxLT;+EX=Zj`N_Hue=@aU1NeulS<h%=(`hDf5qxJ(TlKsUw1p6&&F8^xcCRnj
zyN!)SfD5*jA{Xge!SL|M+-!kw0}F3lc-hS?)u>xHjMsgNb(G%Z-JfC|+K>LOstWCl
z#!{c-6l?3bP+zslwW|F|<4->YYH!ewQK9^kr&za$)kGkgdK)CEgDl>|pqq_+%UcTN
z^$H*<;g0sa5a<RQnBuP}%d=<$YT&rV+~&@zgbUp8V~S78=4OOkAr1qZ3}mX~LmtNw
zlj0aGGA2uE#<@hwyE{7JYe(@qM==m@ySI*`xD4-CLmb~CZv^rdpE6r^*cYd`Q!7?Y
zsF+cjdL9QlsTWOZ>gm!{jesRomhPN=?u-ice7d%3xETB8)P1-ON=D&ZOz5`fW8YKm
z^<rf?T@x-s?WWx8<@3YoJ}I6m=GQO6W{;<<ii6bhdYkSE=k4m!Eq+aB>{io?(E<0M
zTks^Fp{c3c+$jxjsi`|%sps6;0jyd!b){~RpqFLJ@<l}2Q@5!J>V$LBRYVq7HfP>)
zT<f_o!m*bY-}ZHm?PBdUs9Br1+Pxj?ZmU8!FF(P5Q_llUcPPv0um<NyRRCZM0^l(p
z0C&_5t(-!t*|LOVJxjJy;igAj6V55i_u$c$wzK#Lv!nDD;v`whR>=dTN>>^-AY42o
zsaC`Va;25IQV+R9!Q^r6X*O}}J~+z^fe&W)SUK>TTIR|)2dMWvm~$6|fd;1Rc*oAk
zg4gyFSlbghnA;m_heUdMvkx=n_BLtt0cLmFX?MnZrKxMSJ;2vJ!&-FM=T7^mG_`Ew
z`^iwz94bvclKVljspvS$AvC-@ZB1!vdD5mNIHK%Dq?rHs3^uAB@A1HAStr)&LEigW
z>;%z^`M76sWD>pj*}UtG+D9)&Vcb%;IL<1oCj6vqUZ;O?{GgQlf*E**UXk|1XDCp7
zy$e70ESnVBxGNSlu`*e!y5XrMJ<Y(kS#etIgFI^uvo*GKM#33N=yW%p$^g==$({M@
zNMjWZ`R+9=D#+9b>NaIYosdSnVhtNbeJZ~Z(bv}}tLRgCb)S5_JX!taPQB#oo?}{I
z=pwPqJJjO^&$GVui(xrDLwTg>3}sGOSwnvOd6s3*s(Y(yq7g>f*tX6kl9WHe>goag
zk!t|S>q2y1VBBfL#S5Fxb-qL>f{X(q-Ztm7AW>R-8-rDMcyf`li6jW;3Osq9#~(FS
z(<|%u1Y{_qGP_m%RxoU%pzul#b*ElbHV=u$!j+)*N<EIn<4O)uLYO;ai<){4Y7sT{
z5EhS`x_cEgVwLXH<H&}jeZYvf5r$r)`JiS`p+y8U098GL9#U6w!t~~aMDH7m9crT8
zK6}(b!@Z#!CI59bXt=r~yBIgbc1SrFt4A776|pR$;J$HKRs9m)egT9x(71O89gm>5
z141yg0ioz@#ugeF`VRkE(PDgxJw#rWdW428hH)AL@*B)V)I;1bskL0GWoWY$W30;A
zr(Z7gO#Gei%fJ-s8d*#!qKLXut^S(Um6=5PEHvwiKIeJoa?zA4IfAddDwB$sAGj*N
z$CRnuUMWY=`zw`lY`vKh6*Tm|yrLc=fRBEWeIFRT1Up;0R?)Sv?@RFe6uk;~rw!={
z>HKKcVtVe2XIDmfRu;V^bmUjpvPC{#FrW@!{0e*5x7my|^Y*W@ae;5qW@FZVmU+Re
zSh4$0@Qts+==jMKyy8{X%D3fBk$J>A)->>4%FVPSxv=j#*138Iti$-D>ub~tunzWD
zFFYmjU)IAO>EQmt-mkGqQWKg{)N-uqCWc9SayZUMCVa^^z0RHuGUUC4s+)ZH-&jGA
zu{rWvH@WsV_HdBV;b^>1+JN<4d6egGVDW7KQND2lYae7({^HG>{LBW{HOP>m@5g)V
zH&{}TF@zAj&v}FO^QD*GfU(sZ>~VH<5AXUW>+P$j4!%G3CTn3cv|h)ri%#nc^Y55V
z(h$uAI$qG8-p)ULlXZ+r+9?=-8HVVP0PHEcNr02Joa;Av&|56hH_G97Pk4(p3NkcL
z33wm=7K?6T@BqQs{i|7{Yu9e_{I}SXy=HDE^{a`(yzGn?G=2c?5{|WK=|~_%R<Sx=
z85OP}Bquj3GP>Rw<<s7VftvxMGdS=@E?t1iZ%P#9fOc{pfB$WEv=eneErBxdr>ix&
za%|pqRBtlf*lQuU666Wd_FTQmH~*b|8-Ep=LUo`8@?JM@kn@=0qyzc{U5LtVUUZP4
zP*>Y^<tE?y4r>|oExlW`m+=0dci1r2d?Ua6UDl5M{3)OOF1tTchl1xZum-mYI&WXT
z$-jA*CCW4L(D*%;5qF8|Vp`B;1F4k!4+siEnbW-JGNsDexnFPcXWwHz`WYa2=hy1o
z_tN;!YjHbt5GGOK09->W!eObXq=Qd9&Os$X@3X-{l~k!&YlZjm@3Us?`R#o1`>YLn
z|9$@2`)o{{p~+Zs$%p5yT@%*k11htD66#U)T2)SkHu2I;9`g?to?sw)qMq9zbipE$
zylK@$xNdRm6lT*qww^}2nlqZu`UkTG*&t5Q1^;ft3t#vL>nI0~!3S93OpGcl+r;)u
zL0Nc*?T)r0g1`MwHZI7FIm$%0V<HOceZ&$acK6@;(2v=2_QBhQUwzC{SYQRTMI+O-
zhT(+~Ti7(oF38F24aG@ndmKAiWt<H6+^Y=Qn<YrlN+ij+TSrL<rZngpd~u6}N05Mf
zXrlZSdal&zR3<%N%gRMNqajBRYb;(1#4FSK;1y;CL@KwEb~8y=Z<gcHP;ZWh9~sme
zDn`PzdQ|>GmQB3M+O05A-CR+fto;(k`xUWP_8xR>vj^G)ir186Db-J5)U-pmkOD)j
zG%JLns+{AP69`2*<)^iDfJ&t9?wtx2vrKsoe-X!G8$LRg9)hH}T_l$&o0WuPNvqOM
zi*2VwO+8M`+T1Ffz3f(VDxAfu?5X=6ZRZ_Z&5M?tu?Aj&{DT{--+*@mXXv)Ja9j;s
z81C7KkweHVuKuR1d<CC+ey=$1LvwI_(?Ux8OnGtvUWN=n-Ke@uEwQywHdly5h?=>T
zCl(F^SFc`EHZN(xO3Lj4kXHjsb1N(6=Oa@y*>Oh5r)L@p!Bli25K+!61pA2aJwL)e
z&VQ3eJeR;-6bHQmW6*h7y~oOmskA{(I23<SasGr-xrr^%yR&$5T$j|ea&#jn#_mcz
z{-NZ!+D>u4f)w?Z5Um_n@5))^Sxrq9<SsqkF6aJ1j_X10aaHQA`I8cgYud*y@9;|V
zvz5(#i!f{xA{7;U?kFvDz!S&HAt?VLbN&R^jCdL-U0ra{(}U{l;5(I4TG*4&rsKM0
z(L2>sP`myl0JgrPq|8x?8Y?Yei9>S-4t1MH<eY`Cx75>cmqj!o?Oc2bkj9l(uB;e`
z54njF2HO^`se9dt63)+h6YD;i@}^p$H(z?rl@#G9x0@B`c*?(Y9~@YTsxnSPQJWo<
z`zX~g4K=v?OYSZWye)mbCRt>UPZlY0Tnlj=g&bB$xBx#dUC~EnGmdo*I*%<5O@j2Y
zXun5AV)X!(&4VS!4=tdV$h~eqv2cL0c`>6PGC+i{NWe-#2HEig;emP(nhK%7Q1=FY
zn|F<52*r62CU%ZuGpa@qFif(yL&*;TurCSROR`doXFR@@{9ttyLj)0-;F8TR*sl<n
z_UQe#E6eX8Gyyo$${kC~OgUq{j~0N*#4GqW^(*l$)mtm_vq{OPE>NM=-Rj;_oM7Ug
z^c7a4;#?2*OFbZp)%SKl9>Nh+oZV90uP<kCa&&ej*0Wtdjv_<z02<ZO(`<gr8F@V?
z*>aleGeB{=s?tvP_s1IW-KQ~wxZIOgkq!6(fo+Pj4d&5twL?y4;J1=rm$oNCKET4i
zn{Tv-vt(?obO7eO2tz%OJstLc=%L%(RGmQFCxV1V(EC`)aSe4kF)+0vez$s5I^ww2
zA$w8pw0-d5CbXzc)m>tiAN^XWo-m_lF{39I#zD0t6i=jDq6v*hx|q;%1WtlJsG(T%
zUW%e*$IJy@1C-EO4)-?2w2|bv-T0DUjWlEfNp@(i3CBTk91!p^x{BPy1R!ZIjDfIv
zuUg_t3eOx_i&D<TF!h|pirb4~p03DV02mRD+X=~2@d2ZE52(VhAw;?}HmDPDBM^co
z5j~Td3Yl|*4NtpLx8Ww@7JAfrzl<Y|rE7qX50D->=LN?tkn-WwT*h&<=pG0VO4)(A
zz0rgVpL>?6IY$)7mne+oS*)yHSO+KK5UxFRSIC$v7!p)u>H{ESJ}btXaM@X$-OclN
zvls~EZ`4I9vs5uM+8{<%Zx6odRlisA5p~@Ze^EN`IRbS*l!1~f!<t)(&ZM9qJPqTb
z&no*^pb3yh$^V>AB$7$A5y&~;Z?oy7x9qqs&j-jDdOig;ICk8Eu26UhQu5zN7K{Yj
zO2+BzQ~*FNi?0BATG$9ZQfZ!wT{%aVHu8Lcj3C!(px8%nHN%cqX*UI)bLImGP#0y#
z(o{EqDIb+gEypUzQSv2vPp!yZ%s#U(@w|yrGxB<mN=Lflyo4d(Eje9rw#OjwIC7xk
zq{DGM4!circGn*V;qh+cEAn=vM>{g(xgDN!d*@`o;&~B<(8}guRJ?@_CLEOm6lX)E
zIx5kNC1fRy<8Mfx-@3;z_q-};FANPb_Nh5#bnf3f6^r8}#sTmX3H$;iFgVG(*he`*
z=_JQV-#Qt9z`u6TxQw03=5*#j^sH;NT6!Uu>^NB$D?|N)$RFt9H)<tTMBq_`O~@(B
zgRT^+lzTt|5ljn&6O@mVy$$fE<fNc`2lU-g<aduKb6g|MnWJQ#qcQ--bCv^2KAfdi
zm8MSGiQZ!I93dNpo-l1toG-$tGq-m;CI2}}Njri8yT{1xdAA&u!OHR#_~;=N-UwM1
zsw^s)Q>tu+O$zqV2`DQZ@zV}E(KGxCpSzufHXaVjq--83W3#4VUch#*EMLN3+Kzi5
z8CF6+=M><mhqNe;rALAm3`_VLL`c-yb745CulD%VS0!Eq5O$&i$O^sHp3e{%!_>3%
zGy2f<D?mV5{?TQk|K<UK+lS|T;vG+Q<x=vU>Pva%PgFP!73N`)!;jm_F?!|0Q9Jxp
zybl!@%!c~xU~TM?NO4??Rx{Qs%Nx-1_B_Y67-e}KJi~a*ow`0<+uBV?-<|?=XG;Sh
zn0HZ0c>p*Z0}Q=!q)DsLAlWsmFlP>y1J(i--xGk+(EgsCSQ1<4^vm0&q}&=<mg%eG
zDjhm~vW1R@z0J0enB{G>g+w{8bqgIkdFyPUBQ<1q4M9ukRcJ++MPOIKwnuxzOw>&i
zta*F!`*%XO+x$h;83bi2!4aAmpBhj5ItY5Z6l`Z&Rv?4-%T*a0YOJZVvXPKA4XST<
z>V|Y}mxVzQj!z@OUO$S03154^a%CI>13nF3adBOnimzEm@RE)!nRtQa@Y|E%ql8ZQ
z2jLw|X_k|!NY{E$UQK^)uV>vt)nsZ>lo8b9+pJKGcND6!>gl^F9j`ahS69XnXee$_
zd3^DTFQ>C!Fy4>h9p$^|<-2J6@SfGhNc>Dsw24HfZNw|-TA*lwtx3bILnQpbie<;=
zteXYL127!Kfrhk;?GFeaiJQ)${NKA+%kcLA7o=&C-w8>~(8ED%*>N{(O!vVC?Pj(n
zp{~W@YI_?DL(Ox`lj(Hm+9++?alU*v>(^;6E=(bXLiy2eG|i5GP8FAU@E$?wqqMZ+
z{QPc~&Kr~>4qk<@cq?};wYZ^JI}9(CR2UaE(u}+EH4$SUhpQNf)(@*YMnloF-b5C!
z@DSt+(_}?CZM2>z1M!{4(Cui7#wkL18u_$tdWHeSSam8*vYRV#O1CS?61Pi|q3L#^
zSygla*0j2Ym^!Uq)0RuXFc5s$3s6G~YQ3sC<vtUv`;njo6B#zH=A)$|YD7DJ5wt>F
zyf^e>aLC3}_TthVt|sR0WrdQRj?l?9j(gpDGy(@XPtmV_WZ~y?C4U<7k?Yo{UPCh7
zl%0tWc->~aR-w~$^~<&HJ$wQ9&9KZ4RTFI_VDG~x-4M-);RDA91tIw8>aZ%5vX|kY
z&>FZKCzGfZC*UQgn7jQrc%|L)Hj>?|Hc%$mNb}SCShQs2b-rXhghOOp_=gE`xG=IG
zrA5M93sihK;Sa~ORr_%b*PMt$j#E2V9*#Rqt`|ST-%|062P15KqDyg-HzQY9^2_NB
z(S<6+EWNJBc5t<G4K)JThl>FAeA|~$GBmdHBVV$#X`W>$>vIE(=$1WCWJl^T>JjtN
zng$a%nJnNgx`MT}P*e)@T^M<UIzA(KnX=6Zdl01lGwL6L)R)keD>4XOp#xaIQ_J)A
zvo_;!72qh&e*7lKxfXkfHZ4-W9P67QC&yPzNjR)NZuhYx?!+d|Alsz(F>{(l)^AvB
z+|Qb~vwB`ZNf`YJ2c;C5OuL8%K_124xoah%faJlA_A0(<q#R+F)Gu83m?5&_+)Fs#
zY7cz+Fc-OiPfyUV?skiKCBJUxZ^1j^)DwBgLO4}|4?r6$E*`?;R$b-E_rPwsK3q*T
zl=lA6iQk-1_Y?G6R6G+1KD{5(ad*S)TD}S&q4BV|tqTY0&bHvFb`@OKP{do^;g%|D
zg0HQj7myiX7QVJH3)U6O*Wv?s4Kxg=a<winpAx;)FADtw&#vSoSCIU~PQ5*|>lyoQ
zJYM-aW_!;A)LKq3a^x?kkN*C*?hSVhu(&KPM0ym#sY9_w;HV(naI@q%fc%D!D#W9r
z*suPe`VsG-XBK3_s#`7qhWR*;&n~+dmH`1=j_~=X+TjkpXDcSja4t$-qT!&(B-~Uz
zZg!8e=A0upRsArg|Kg_V$E(752bnKdd#O_LUqVGbPgV9c#R7&kKB?fQ7wMiC@rMjI
zHsSYTLCsi~H%6x@0ax3RP%DWn>?jF007TMl$;XZ4iGIlul;^g59~=3)^8#6J73$YE
zof1$3CQ3<ZR6PO9VX7k%{?4UOC8xb6fv#awiH0C?#x)VbxS9-ej0_~3-7&*(BSYEm
zWw^`8@IiG3JE4+a8&)I7lgN>WJA&k!Rmmr%4cRk6`h#vXMB5H~>gxCG3Yr$GM|eS7
zz6UIpcLYr&xe-&GGf*X@6GH!*sq^8!9a9AN2y_M7cT4VPG)+o7GR^S$68ms5E?O8j
zEupR*&;;xS8uUY5=U{MU+Fm1pZtwe+yOaEpV!7XmK)qnc2A`!<DCL?&s$dOj#oOy{
zj3H@rs_Vv*!WBZ_>ToK=Q>MVbS+z+5GLXMMi;pB`t*U9}?MjK<G8555Gj_8l8Qn8J
zVA%P=fXLQPpqW|~a%$I%?hskDBIhpAtmHA#aKEEO0Gbj%177XQqZKQ8{)uO(Mqi*S
zVQVi-*tS8SJ5|pZL|kN`4NbH6ehyO!?`Wtd9ApWn;Ob$J(H@|UT@t<r*b>$KcVh$T
z4P?+S3K2y~Y7Vb^cnzkA$D50l6nugZP0sj2)vu^#TnFlc|B2*QFJhE->3Le-wcY8#
zCfqa;=MXjha?&m!qOPDK%T^!-umWc5L&yuLKrzKR2XcbXXWUdg(~|iQP|WYZJDQ;9
zz_|DE{Z%YJq%|zN(2nOVDBE0-i4C5sD}UUOyx{xc4=x5jw_k4DFq85uvk?N$LHl%D
zQux|XBsrLk4&o7#JWJgBTwsHf^%Z0J(~^7_J9wTKOLF@J7{MF&KI;Xeo;0{(T|s`D
zLlc?e{23Zdj1{aHf_HU7znvp3Jd(-%S#t}Y%;fnK7Jz+#%XkcytTMM%=!X)IgZhGa
zVV)^bd&BrlSL6jb@+GV`5{4QHwG!u4@Qxr+K|_p8fiizumRs^=vK+|5D!3}kqge4T
z{Cin`wo^M?FC?7$5fG?4D7u73v{2*o!P=j1{>)!9%VAB={H&LvtF(TlzWSMeWtO|K
zHc#=ob>y^mL!b?+#ie0JuolQk7417DBj?lAAp$+_uSW4#>d1ZTp2YQ3`hu&g&G?Nv
za#QPr(7=g9TCLtC9upvUW-~AFi~u=~eeg542gn!T^FmyPtp|7*l|{3DX8vJaxs^1I
zAFeCE95fWu1k|A9$1V8$Fkfepr%NyMI)QTbpi}Umfs5B9Oy=tGgiSuerPHmRsM<%j
zV(^UVZBGKbMZe4Iy@$M^PvFIY@-RDQ^gBpNemLiRACjw<6>MCc4Z)g2sH%bDWd9u`
zp|%hN41F8T*U%O?AR$)H?G)d$)`LIEnmmhGtaU$0ro5g2elA!XY+TsL+v5jB6gz!H
zbMzQp_~aqPnh(J<8N}q{a-B(A^$YJ4BsXCT82_fO{6g$#Z7L=LP!aB`Z(?oXptgJ#
z%ALovcKH|KWQ>+YbKWsn4v?1cZozVTd?BUw_!;yB;Th35DZ_K~K*Z=evkgBusvl;X
zt*+)L>&g-Qi(q-7y&<%(HJ573LDW3-M=OF5<k^npZBRzfK_bB)LBJ)vB<G3ZM(QR!
z&?&5b`*kr)kqn=To&b20)|^KEGnYuOWD#zrzr}Mkt+1K0iiuc6c;J6bTuL431<`#N
zD7tkcaef2v%KL=LqZ*5q3wALOmn$uB)u$cHx>dD<uLzUp@)hMc#>D-yL*=YrBxr#4
z9CQe@!1sXZ$s!f-EMb%Q>1p2SB<!py%XlM80kWu{8=2BI=V?CkBx@sG;ZL7rsliwo
zz8m=b<Vn`0)`#dH*bM1yzVZhaIg)rBKh(;Hb1PsbqN8nA^MC`y_P&Ep*cOQerB}Km
z4q*i(o_r!%b@!vRVK>E8(Sp$F-YJ;A+IiDcEV4nUcQR-}4;Q1z5|~qs4?4wC(F6A>
zmTt&N6i+~xlQOkFAN-D-v|*YdClQ0}x?{MDh$j{2a!T#vFDD_g1&+gBrtcjPjYn(_
zX?}8&y&G!w?sTU}7PzCRs7f<s|LFbLaSIU~<^ww+?wE<P(+Q6HXv)8Eqtl4uu+-$q
zAw)m2_1$;gc_*F%Y+S^N!oN#?lD&|5Q?MR(3Gqq<!MKPZ82hFQ@d|Ooi%4+LMJroS
zHPcVB6**!jC)U;#I@AsMs?L9)&B9s?WZ1r~Hos|ePNX&TwEi9U>HVh9nMwV-GaDo1
zEDLt~bnV}8LZfxULck2t4Kh8LEr{zDl7L;gBo1S`Euq4Hk8gEN0YT83Gyd6sn5|{c
zlUNMegTPTQD$_-J@z+OOHt?~BS?hWeEMOEYh*LA9lgq^O5972Ib~o^!k99sIPBq)`
z2LJ!!TY5#6tUS4aPIcy4A!3_*&ojej2)m(>u-t>q+7ufSX)i;N64>&B7J`!?DJx=?
zn;gAB%2LO#vZ#x!u0fq#i`thC>O^qQFLs-g+=(l4+N)RF*390O>?Jtd^2)VOmh^e-
zc`JJoKX!!0PW>8E?n4h?BKPPhW4NLU&e`hykIxm=F6&T;)z$N!NZEhH#9AmIW9{wW
zI?0h3g4p#FZM5l^@v+~qs9__4adfNju;Sc|eL@i541&hMq)n2mlkgb~D%}MY_@P67
zZ@e3R&3!&A`qts!9b?haP8vKM0_z7&LfTqpb}uAp>kDPY-F5i2Z&>7zC%)6gDgatU
zW3npF_faQZP$U<fv6F9A!Am^d0|^D2Vy-=$smO_;)TMDW<qsTTjbZe?_y`+pe-~pA
zgafXS)x%&;`iIkyobQ0I6iV*lATGq2{fsI=c?Bzyq~}@T%hT4#vln?#g`Nu!M!t!@
zd{_;luGg#c@vg}%tP$?9=#701;8J7r>+lK5?5;*XW2J~*JYytuuESqRW@!zd^d)pQ
z629g)lG&5?pRtYT1q4DV`JK(xA{MOmj1KMAb7jw^wnFZd<4q&Sa4~ei$Pm+N>L6#n
zXeqlr<=AKB7zOr6WWh)0PK?%-Xd?upF69qFiQBM*Vs!drNe{f=h9$lE@nft-aP>*}
zjDqKn!=~CH3AA9}9_2lcv&gW8<L@y4{GsD)3DKwJkcj-+aqb4dwR+bj^7KKjopes+
zb9{Bd2_i_7AD3b%gR;tN_>)n<Mbz5<wpu^OF0U2hW35`J(dPgA)rNrMG1#7)ur~7T
z`Zg4TR#^x>gTDnOoQ!&jW4H>1J5d|K0(kKv+@|oo-?3(P6YA1hp>u{S7334HmjKmV
zeW%MWN4;A+QNHVFO}h-HhH8bWpYCCU<SDJ(_*#I>!tcgPDpf&j#OElrHJZwQf+r;y
zqP3MoYuwjL?W&8_O1_O~|BaJk!3aq^`@AOv->PvVpW#i2ZH*W67rti?G&%U_Z^f#w
z;H50&1Z&z{M<Sdi>o})4r;7(H(+_yc30yb>$FlSU8_?j~qdxBmWz^Z5NBDsgto0B-
z-UA4_Ed2I+)sAIWatXXF<n{#Dzz9-82D^qwxH6-){bP7iIg1UcRo}!(JNV`Qur9V*
zUmeSEhr1D6^5|7oI|&$mhBb)_HMX>_?XgN-<`u5oX?VaQ$q_-fPTgXe_Aj6u?BrT(
zri0GA$V9b!Mb*k;WV3g#cGe0N2I97;UugkA4&oj?4`chQs2bG6-mp3oib2U?TGj>L
zYRq&Ga&)E^dyb%OQIC38;H$i~#!K(|SAmYh)~43Q4!r3ISjLX6%uVg#t{jUx9VYUS
zx#%$Poaw6+oYZL3T(GtQ$-1mAHO>N*Rqx`1dJsm|*=?&e|72Z=306yCiIP*E6S)-~
zB9o`%m@n<@AxXbdU7A{s&$y5=T6-Rn85HqG1$N_vKubd<P*mTq?r^1+8y{6!ecTL(
zA->~-cs)<5EA6-%UYca?F<YD-1poH*fI^>4*ntb?Mn@*0BYx)x)2d(jmL;+>Y$)F8
z*dWE^e{Mk4Yx{O#`uxrfXn`W=MFniOl?I4Yfp-z)qE6OHoTt&b4#l)cG=<irQ~r?K
z-lMDEVX#)T1TD>q*G%t<Lm)ot3~L(z&Pcnyh&#@(_H6DfzUd5W%DNro`_8avk+ymf
zzi@`xB66`}cS!+c#2f;I)kjGjlvegN?|jy%DPj?ya+bxhf?0g^Sr%>{kNt>`Im23u
zy53#L51xf}<9fXv^VtJPo#1P!_d>lF8;#V3lsfSYYaz;hk)x*;8>s=cQpe@+Rvtu_
zEi+P|D?`~yXIPXd>&@0v%Z=35wNf9?=JJo|RfUmS_?3UJf{j$uLjpGDL6q9(tkJ8r
z3-}K|vW_g|Au(R|@BREPFN+bawq3yQ^RmwI(GU4U4)~&b+6^bzP2BItRq~ErquO`o
zi=t7T{!7vCzvQ-aEKW4lem)<0j&+Pks+Hfrq3K`pSI!yW_;emGIR_~%{UNUW#KMA)
z@2l<vUw4j0h$`<gGQqzKWik&#rka_2d9Dt#xdv3e`NAJ&?Tpl1J(WH91%LTx+&}=X
z(OS_ynZtMd%v#3m-6Pg0cw|Z_iU35E2DF=s<34Ti93Jos>(IM^Mr8^Rh*xX5t=sEc
zZd6p;K(GFE!M>Nz`GpN&K~M9KeqnK~eeJ*Sh%S<DKq<A<TUXqKO1Mm9W8-cvRj`f%
z1cM*p-6~i@qG(@7{q|V!2JVX{mth1o%YQuHYIR`f9{#rq);-~EEIc>7VWK_v8e1-Y
zTm!6GYaUKD!4>8L%Sgi=<~ETOfDi~g_&l31<i4kFR(U64>63#Eh@-2DNh4><wvp6A
z&H5naovjb(A4nJB<1F5~375sNGI5=~Y8U_TJR2W|@k18@ZVkYiViY;STV24dv|^|^
zT!YNnaj4qrUv;37kMkuLSae9EUC?QyktJD0m83j5oxgX1xm%3_Rd>KCJ8rv1fLjaC
zy$*%SRWy_P8EI@xF!<%;FS78kRR<`eB~KqI<_e;7G*>UOSb59rRQ};bmfTW%%U7H4
z)E9k&4Yf9BmOjcb-ux1aOg?&FwTtZ1B+F@l*mEz~Vqyw>ly2aiYSKcCdNy<WB^K5n
zQ1Q7YUXSt#dsft^n5a$%ULe7Q;>5VLzo@@dBJ9FMZp4o^1nqmg$OKQ|Q2$h1V)LUe
zeJ21xQ}!<~uR^$S-oyhbzfSSoU)lX}H?|AiptAxQ+)hy!s?0?u^+GyS#1wfYNt>~g
zv&-ypTM=@3$SSJlq>8+}`thRqG5od5tWjedK0{p#=2HmvbYZMUbs@=?s1Ssoq&z?Y
zM6XRa=1#P`=0<x%b?J^PSJ-`02%mO^rLwpZ{_Yh<Ap`baVHff9udA#n5|3PE+u8Da
z`C2&goeTyxr@S^>d;)BhW`fWR1{R3q<BN|I<Bs>=GR9d+*jEJi3N|7-T}#;ko^l<K
z%;<W|*w0WlQ{82R<gD;KOnhyrmW!5gr{*fDZ_<d%94JYi6g+4%kU|{kSRY49;Yna@
zZfM5Z78^V=fASh@+w@S9jzy(_Kjy<YSkZ2t;0Lb3N!=x^(V|GCKy=5XW`#b2?#>3T
zrE9&n`>0Pe(zOa0BPqeOz6eQxIA$MLupKG-eo2U|mEyIAX1qa(RKk~g4Sn#jp)E{V
zS4sO2f=&ZT%BlP`;Mmr5VxW6%=WDJbylO4Ju{OJyO713hj4~pK(c;AYMrE@_{lZal
zGxt<L?sc=0a)3nV^{5+0gi3x8dP9>(o>%0o85pbXy#j0g&QZqfDHLX`xc&f>b_n)=
zAOz6l7*WO$*ar2A&{s<S9%_QT@IHkHbVZLirdxiBsAJ21H|kjSRB;E{*Dsbet)^f0
z-|Lv@S3v>#)#vtpW%tv=arL79IOl;UrT*L@l$kf2KGw<V`&11aA|{U8;R}I=(06?N
z>ryNk(Kuh1+OXUc{QcLZ@P4J|i4=q)(CW@Ongc)O(H3IFisAtT{cDC1wJ%=%3W#yo
zakDBro3B|X#q=222iR|4G&cVy1dO@YT=F00z7KK9VY(p@3QDI?1mWA`o{hByV+{mM
z*`A?w21yFu%OV>t|3oOD>8!+(sb%AhxBtZ)E#wS6bjL8DjyDtmE@O<X1npnbiYFoG
z++WPycx-*y#q%1-lX(LL%H5I>xtO1)r@T<PA5T~01b&iIOB&(N`Fi-1r^t)=s(SKF
z{#rx%5k7|!ltyv}pB5rd;4z_i?cWf8Hr1EA^2=dzo534E;XoWFtN+QmIycpnF?tkv
zvkHNu8jBgudi7K@BILkpwBhBK5)i=|l8=oR8Wx=e&VJ{%z#)#>Sgto3Wji5@Q0rnr
z>ScRi<1s3&M`hu>l}Mq$)sa@J!|?ZOrR9is;?SUf_;(UcEM1}hPMOZnH<qJX6+E0w
zsiBk$9$@1}jllkG!|I@jym5(WcO&oIL~h+=4RZLk;%bOeo!Zaik2I0vdr>Wp?Ge!J
zg}|#dd58?9+oYILVMRsHqeoybiyKi>c{EktogZi-H)~*`%6~ijsBpQV^d(OSmz%|`
zr|!d-C^|{8Jfqdwx+hA4GTO7O;d5HZjqN><joOVS48nJt>Dd7_14Iu{z7rPS;8EIi
z<izqe2AUHGC%JIC{oFulSAf|Y1U?S6f>4508zv+p@uidZ9409qkkB1S2ja=9W}4OE
z(y9ROAvy?6z^5)ETMV9T-XHic3#4$%`Z+{rTRg!#HkHSA_^(vXTZj=_i_H4atdsLO
z0ztH5@}|OLO=V4D;obP>&E+XwQHd{T4c4>p6<8C@$#ar+if_E{0BVDGnGnE&z*OPn
z<0ItAcA=<SyY)T@G5kdqX?jZ$tMKb>AU@q^d>S^FZ-|gvS;PJznX*Kwci-m+Bjg$3
zt+D;;woNt5?OW~BbUq?d4zDX@+4}GCxsh@_gKutu&!0xh$-R@_@fT*nDiaT<UAb51
zhwcS7mzsvpd1Sh}%QeZ;y9FF)RTiC|hwj?$=e?rjM5&Z7ijrHmMraumu+5S=x@uIC
zqk1`{(`Q}NgEhcQqU7c>@ROg2l3PUvB9ZbBtI6LGp9nH=$c;XBXhk75;ffZ0qKtlP
zv;?0hqrNyh#OoPdMn>KDHj)Xg$;yIQ0Lp%R9)gE9;zwG@Eu^{pY76<{SOJ@mzZ-j{
z7{4z2-@rxSYSPN<Mau2Ni4poOl>4OlLHWtIc}27zl>5ZU$-Ro-yba2Lt4UilOouY5
zac7j8;^O^*e1m}eMkWC{njejkBmQELzVsVNM+!(kje~2!l@R-B(jmPR-?(g(dv~88
z0Q?S8{Ly&JJ>bYbhkge36-xe#NY(k8Z}sAVZ}1$O4)XOjd1_eV-vqR=a^gsXgn2gu
z_pn4_TUONRPiPYYG=p;$L|t$#vh?mQu-ZDG7U4)fxwYKA*{8@LNH~-mI3L<jLLTV}
zncm}@TFZ^=3v`D&d86*Lv2v8a>&vZy*A#PL)aa@V1Fy{}X5h6Mc#ST$<nPDIRvWgA
z2&7qz>;`sI_F{C8ss?uZvNyJoTLh}s=UCn>9LtlHk>4n(C#<3luiHkpNmF_IHXv`2
zpnTEru%B(KgC{aYOji*FZLYM+;@ygE*#P4~#I*vx^Nnrf*5O0MM7)X0{U;)3Apfb2
zkDknbja%d7)<jPZq+v`MadQ7ge_!W=J%#li4~6*}-k`1Ah?kF&1KWjz*xN9$xblW#
z9>jjA&3n*)9wKNS9=VrS#L3-x`7k-E84X&{6hRE;0$ixNQ%%*&+R9b|{k(X&Rr6SX
z=!+8d@CCU6d-Ssv{~=y(*j)Apy2$k@!Q5;E$VINMZRN0-Eww<78Kam4@9Plv8yj_i
zl{e(8+XCp1@J(&yF>RXy)DZ&c5}wHXX4sv8e($Ri4;d*n=9}BdEq({;Pbd39{fAfX
z0QIJ8{}j||>j(68sGpqb5B2s0_3wxNm7qR6QLe`}C2@CKn3Vj_p#IrQe++f0pC8mm
zzH|qut1tX1sE73M!}Sr9{h^*nP#-?{uLO00>mfb<H@Myr;qCqi*XQ;2gZlR8?*R2m
zFu!1lLEZl=h1q!B57$e^`$K&gLH%DTe>JGf7}Ea++1EY$$6!C%-4E=YpS=UvXFmO>
zz+TYR57`sO`h$HufxScjzZ%$CLD&BcvMU9D4D}IR{Gk5&Q+I&+QTLyN`VBv1e=Wlw
z>az*zulD(?L0vAm@xMZL`|3Xidr2ohus2+N2e9As#GeBD<Zgb*-e9CZ*q0F4>-YLA
zfxSalxt`SRe}n74tomc1C*0)+^yRDW0Q9XZ{uIz_F)?|t#;;-FR};{eb^9v;{r`Z8
znUw#>P=77n59$}3cYu1l<4-}o787%Rh(FZV64Zb0{8xhd{{a*8Ro)*%y+N!W)TiX#
z0qQT>{}j~cCi)SW2L|~={XK#@JSG3t#H6{2{uHL&pA?h&ErW&t_tRqdl%aB~rW6Mc
zHg*uiTp2LtHcs=jxh?stL*)ov-Sz2GUNTfhEDA$BwGM-Ldf{;&+(|XyCqqI!ZP+rp
zwI8^P1_0dEI<IX6?!tEbtzmLc=^y;$Fu6(etB@hpv(*|eAw}Z+m!#9g8tJrMnj9je
z)4mWsn@1zPTIVH7kc-1=>9kWzLn(mU@ii(hk?&)Csg_TB#gKVARitYJB5ZWrk}qu5
zYmKYlaEPYSt$EsTIkx_EC?TsArlWb@aJf%6p&WqmQ?+pVIdbSCtNwAYv?|=YF<}oN
zt*cv}dhE~4MRAnhT-1B)4s(&b_`l7Csh8he1SR>;#Xg#gx^aKSxu_@g`oB39Cl=~c
z(f{{WM5E?@voLw#9cJOV?Ef|k>-`DPghc;YI8L*0zwNI$3s$y1@&D#DbY6gIcqCKq
z{yPesc}@KGgYEP0upd-Ht5qY^)}~8-YBS@2NLS#L^zh#g&e3%IE1DON{;z7Y9yNsN
z{~xuP-`J`<U}$ji#@<nHc3(AV@>5o>oAbxp@X1DgVDCKV4q%`8us_)SG<vnQmBz7^
z4)%nu{$RgBVDAw5SK5ZZ?+3lvvjhB934eAQR%Qdy4@67N_`4J2mMr=!{?!ERhYfh(
zM0pq+J&})|C{JWpCh)?Eav!#30>3;_9>XS1C`_LuOA;G5o{yR=_hwP!dBJ44h)o$+
zIP3wruFR|pc*ZpO?q(k~p;N#R*qS(SlOg|c91*w%THRsc3;4$A@Z!0w2``=|H)b~d
zz1iT}`4wOOPDXme+UZBJ)r$HOjr8M)I_B3N&JFbR!AAO<wbOwudis5OI-A>=@1KtT
zOg8fOs-2&VdPIA(jdXME^e>2kq46y?>f0a2=gvTVPUHQBF#hHYIhsBH65l;T?xq|6
z)#c^~<+gOxUbWCN%amRf_5z+=0}&u2#hqzWVW=}PP94}@OH}yC2jv%7&SZY>L3to+
z`y%g>CAVXy$^3yVc@VQbz~9NjG@2gZ`?KV`Cc#`um<fEVwW%X)cF836NKSKc*y74G
z>)Ze1laY2rSb!xQOCK>>y9;Ofpk26dpJ8z<Ly)Lw*Rn))A`C%ln=JGDXJQI*60>-w
z+yMch-<m0Ry$e0}UA=;p72RTnt!bywR8yVReOjBgj#&?LhG^n^1`du{&jV-45v>;E
zTh_*PuzMRg7`|wxz&J)PvXzSH83)gjqnfTl#$5xmkhxZgIa9cOmK@HyPU0`llH-O2
zi~hqxBh)o993D13?a_;^YhOdlEzojS``59=-$XOufqX!CYa&ju4#gm0DGbW>)2M6O
z8xwiGhvXKuu8(zpNM23eXFq>PPC$q+ic2=k7U&(VY~JxNpob~pC#BG7LWTyj<ya|>
zmpm?q@?o>(7%DVpHl}C)IR5Nxxph)D4xPZ8nQ=@GzSKjG0m)TwrZx@<`bY1(Y9-vj
z3^6{8ws_zx1G(_6+ai8-w%m_BSC{`kw7m;lRAv4@K4;DY4vHR7P*hYjR8Uh$D^V;|
z1}%lf3+T3LwrlQa7tLn8lrW<M%IP$voA%gsHQjHvwMDz;h0GX1Kt)Am4b8liTQiLn
zS}CYG|M%xPGhEF5?*4zj|KFFxIp?`wKF{a*JfG)tNqIuH=w8SwT^To4To+!*jw?Ih
zI&Js;sP*F~WZ{ME;uG>9YQ<{{pdUK?Nm((*Jj5S(QXUw#4U*Ve_@UxAdEQg<RK2Wy
zt;#~L-n$cdeNXCT#V(R(8;h+xe}UXRP-dd>wduTKf!sgpenEp!uY7y;F5PM6(n6@S
z{?qt>)7ojjYVDK%Wos8uYoEHMwK;*-KGihb!PY*-rKjc5Er#XY#q#g;VL8$~zDHd7
zHv;Y<;+8;@7Q-`jiTt4P`vrXC5~zmad)E><+4#>X{NfUvT$U~1(M#pb7RA1{?7u5E
z{TUQH_{rAAMo$*SM(+X|gVQ`f5rjP8Zg(49a&uE9OcW;_;R(y-_%vVw&y1_2?_-?+
zdG>J-2^Ds0)Ugo4h-d>r3^{P>^4zT_8!F`4=PbsGgEbufL8UP!oJ0w9b2lp|^Wx=l
zmza5zbuo1asqcdkzjGy&!Sh2p|1?jI?hffhlRwGho=8YpceEG0f9GfO<X*-PvtQ1~
zI6e9}@0u@n=LJ8p9zzI$=yDb$ag_WW^bT@-6CrohBhW(U^{}VA3*jTf6@!7-{KUGk
zFJbn8fBzFp>=CS>`ZkhMOL=;}+<R26E-5v$Nm5Gw50X+sh9D=~Lk@9x{hy^+`wQ7E
z#ibndh1*?ns25sdzz~!*X+#9uGc6Y>!iAQFE<Xs9<wKiJx+Ox~uj(f;L+#Zhbtx0&
zG>OlP_(7;g6l_0~sI&`~9C&)5lie)dP+jf3Xi}@RFzDQ>P**(<sU21lfu@nSME^pQ
z=e-Usq#;m--agEjHa<$rj`82)c_vXv=*?;=c}A|d2WdNQ<jb9;?yYcrYY7=Xz#%7^
zZlJzwkDS1N=aBjTn!NoAIsN{L?~FA_m*9wM4AUMoX`SHm9)d_L@tS&AW$`egyRu6s
zY_MaQ)G!IK#j-us6LioIm#(VM@--{unbI)+{R+9W^cfFXDc{}p8sJif5RtQjr>~UF
z%519Qs{b3{-RYiH1NnxP@^lD}Tv{oQ>_jGrOVY>@N}~eH=5W{4$nSSz-Bw)Wmx|<0
zSr*KKdWwqkCIeYRp0t2${=sM=)M+p<(_wnD@KK2Qx*NiF^(ypDTJg0XTY_t;AJ^o=
z)P{MF#}6Zt<EmF}aQpdwr#!IJ&(at3j;|rQVn+P1t94gTNx$%gs+=CR%`gM|ly^3X
z7DMEXq=Jq7;R3nmgn6hFK{Fgn+ZdEWvKpgo9~O^G>8Z;0v`}w4MNf^N4s5XEOR66d
zt_5p}!2&C}q#HK?Mb33zo1-{)^Qr>5pHhKHxH$QiJi&N+&*8rm$lL7w{`D~JPD%1G
z*KQ1&|7$I3-x@2niHY%3o!5-Ys(TdF6SePoguz<$>(IOh3KIS(ya#k4-arc<MH^bQ
zFvMGnCd2F~O+iS4SV&1^Ig%{VU=*g3oaOdW5X=1z?b3$rE5ej$;rpJ)!|OrY-ywlE
zwM;3Dp<%<YW4OK1^gcCy_LaRDsGs-~tK{CD-t-C)av@*pyvAUCF@$egCCAvqYJ{+g
zcN3OO^GL46mwFIpUfC5Ek5W8Ty%^O?#lqWp6^$$a(s>gKp`YTz;e{lhTNzW~{jkNH
z*d}POvdH3L*u|u*-WhH%$ioUZh%wyt*nx*1Q|)zB%GL8~joZ_iYQWv+@NCbMFxG$}
z^p4Y~T#TM|dGawz>|IY4(1>|pP!*CNQz;Za0Ib6Vq`}MMk2ndU2LxR;?rR}#PcLb&
z+VE-8s<DR04$OhERQJ`B$^&liF}a^m{4DB<{(YLHjx}5@gZUGH(rX9^6r%p<eV3nK
z4di?>oL^fl-`CCwfoaizUj6ylB6);y^K5P}lJ7L@G*EhcyPcRnh=>BT+A7WzeC(nC
zvLj`197rmf%1mB3(GWul%d)V4vi%Y|Zi4Z)(cg##Hux(<dkLWbKUhHBwiy;<0XZu|
zl^qrHN?*d*xIGbx70Qki{IDwbXa~`AeHpC$Ex)45y@t2$h?kTY3BCb#0^UC&LnHxc
zl(i|Q#2QlGUG=xNJo7m@E;5U(a6*`QPpRX)WGs5%EuR0J+|zzR$o8@l6lU;tq%``H
zK}o^Yl<WBviNp@>t%s>ff(V*jwaWW7a>2QFCH(LN45Y84qzwQQF>}I%v9e>YAXs&}
zlL%6p49ulL>%{wLa+G~BDT4rQdUB^_d%BDf<h>RZFa4}OW|E-DN0nmXiK)`3@52_8
zR-!lJl3F3KBX9(ew4bDv8K8wa2DnI4D<J%7x_U+#54+m?C*@9=?Eef$F<N{hO;~-l
zdr_mnoqjUXf&MAm;aQ_J00IwRXth>tLiE#HdxgK?k`wLQkp<oSbq{x8t-uF1GbOq;
znf8lAi47@L@L2;?t#1?nFL^X}iEnYFk$&*r1q&Cuj%WTpLWLbT_qU-W&%O?0rF^p2
zS>Mb10$$y|kX`#8THcmY&=PG!M$7_hbgoaVQN8)F>OdW%rlxw^P!l26J5t#(F+Rn8
z-sC<P6IO+hN%aoKX0eOhA?tOvr#cg`ECO}*!Rs#PneJot=#CWK1^o&{M}`=t8T3Ui
znjAv$X;>tI_z`&BbqG7SXfN4bDEv+-Aklo~lYP`D(lTgDaI|XFtFOG$RayBGYT&(}
zmU|~R5&vd`bTZ12YFhlH?$Y@>xpY<s#VaextI8h0zd>|^7e6WYPNn6Nc-un)f#C9C
zY_9tFuu!#P$w$J1>W5(oZe_a{12R?po<H`y+|B++lBHjcZ#vI>^^i`5Pc!*y)l<UV
z`OY}1k<M(%{zRbJBfzSMTDI1U*0x#vSfI5Vao?z>qP1@zM{{dckLshTZa;4?^(V1x
z-t}i;)xrJ4=uVGS&e4xZ=t&tJcYYB^r++p%aBk|!48145@gJI~8;znHH>n#vV^C*P
zFG8Dop{4TT7v;Wo9ji=bp>SQT9-w^CQ}@z^$A9eJQFJeK$=DCus8R7PYSkv0QX;J+
z3_TSN;VW1~(wHoDlF9ZhoS!|8(ez?8AO5XAnmKlp?=vjCz!2R(MlmR>F43?Kd2+J^
z(~c*uo)@r(r4SgOiU1gTY103zHin>$q5r0h_Wz}kyQc>l*{Y59mp2#|Pu}&_J>AIk
zB(;w=P4~CP*6r&&uR=_tr_*Cqm_<5rV-^o9I}Q{6>wpmW1~eP&^cAr)6n&uqBiG`q
z&SF8p1@w;NROn?<%J-3votOig{5$Z!+1<F9v&-HOkp90K2!??OX+043|7Ny6n$~I{
z^b_Xdj9t52p}{dwM}D2tasc$+Q<vPHj_z-}_PrVCltTwN41wsh-8X;|iTM|uzkrbd
zDpgOoJ;r%8)cKusxNv_PNkejihUAzSl5Zm)J2oc~p4#!hX-J?ra!Qa*|J8UHmyET4
zD7PMv|7JYi&TTaw0pK;9|2bq)-+2c_>%5&FbI(b{j<6Tvyn)%*r<!`BPj%a;+d3u+
z%A?JA*bHs%g;<ONL%2YdBv#~lUIwWsc3|n6cOMLP2^%)^_7PeQVoc|tYdmkQ+#~HG
z3?a1KLgwvll`NK`TVVTJq8B#ub8F@P_6E=bEwMf&gEh#bRmzUiQLlEzBss@YNrGZ*
zNifc<(i84icI;o#_zI<5{f8fsl0ZaXyIrj&eRF_O<v0w7jzg~y4m}*ep?00$1C$Re
zV<SU$Q`HkC<OUMhW0EH@8iJ#x)~vWrW*46BL#e`(u+K-rMqeZnCLkfm0F2yT$(svH
zX2GeTlt>pLrUb5L{NFSsG<xquLOay#uH|})rUGZfqCCUi?LBr8)t*$p&GkHmU<!Q9
z<h5a6rL;Mo8I;x=NV|w=7LdW}C6qoUkUZDqRcIuL_JP}Pup(kcBF{;jPkIHCOfh-y
zClVlBq)DPQKab$aFUdouF2#<x1$%LOAd6v$-iz;-v8uxG-Wl)z!fz8!*@N+0iJyXB
zDSl`1>kKO2fS(QdXMoy@!!H>>zWXIP^*?Lf1<vpR-8(X67ps}*Otclnl2Zv%g(I2_
z$V_P4MOfa&+4?_d+ohAT-NGlv*kPY|%CEHTK1Xo@Z97uD6IHx}7gQe9wtEwwq;030
zmixCFcS<20oqSJIg6@_zEgBX(s|+o+izbIyK5h~7ZxjSYlZ77MUWi}OTsP?lTJP2M
z@Dha{-ZY{e(9+xJ;l)d!J5g~>@FgSohG7O^l6#;OqiYgV#_lbtL7Q4C+~GJ#))CU8
z0@f0C4nl&G1oW?rfBvHsD;?og3cI7@cmPJF?iQ!QTx}p7)N}W+E)l~JUQ&M?%<Rz(
zD;n#M^Y{ps(%ox^>QCEU00_g*@*;2;%*8Hqaiw{K;bp!wg2nbPb-^>Ed8f;~v(mgf
z`_NdV*yu8EfP)8=2ObKJ$+RH&ClTzyyTEq|+V}`+Ci!i(O*aSR*8>*vt!>HdT8JmC
z8^ACnlJy8TO_2;<GSUhw_I!3E>&nW2J$POuyEE#oYdEtDC8y@1_?}4c)*LC4;iVg|
zcC%;04hIPqWS(=uEVgzx8fH*!K?B)ve29TymF9X1cV$+W)Wi9DwkNHFm`B*TjDb5B
z9KuO`hxGWXVO9f-M}uzxUZ6syY&Tb@GV3F$vTY_j%V{RnT&JZmat{PIisuU3lv)*(
zF7X?GVRwwW?HJTGjRB0o&)G~3ah9hE{W5rHEU^?qo6Wop8eeBN%DtF$H#&Cq^_Z^I
zE-NhIS7&?XLz55VjI+Ybvbk&c!vA62qKu8rLldll&)OvSh>X-zH`z$9=BFds2;;&d
zJf<VNvuiC*jt#i>D#GMB^1i|eo47v&DziGWJD@7PvLhQ|M=IM{1d`pc=s{?*##X9D
zWHUhBfbtDLD)}J>#LiU~R^`l9^7rCbm3%6>Dy+s9xyd9dfps=FlBW3v{vGDRVc0o3
z9O1hB2;3`{;kSP$>P8{Ich6N$hypiL-no2aC)SOcintTzTBY!PBy+WoLP%vuL@j@^
z6YD*R5-KO!$Lh}ziu5BAf7??bwwSrf52bJs6exLB2vwhIv?jNh2U2aFS?0?8$}=TP
z;^#WC=&@ZULPbub#if_9SXa91+$x~t_pyw24T48lOgN4=2G18miP7BbZDvhQHaL5`
z47GfC6r0!uwcW0L{Iw`H47%twQLLZQafCNSv1P+=3pvfJ2L||^BgmZ2BBrm0;8Nr7
zM6=|my+1VrLogHnKAH`nOQNQvcXVcV7}p%(<2y4etalsur=8g_dHnXV{7Pr`WRDg}
zn-_3(0C@R|E^MOw(?E&WbYVlgEp?dTSH<?W?=;2&NY8JX{R~EE@?eSgh+(6m#$0Z0
zP*V|4#<20-+YO{mG+bR`n)UF^GP1^_XMOWdiF_RMufLZ&88;r`*S`m!Vhh@Y+kvjm
z2EQ%IA6<Y?Uu5MtY-jK<(}wxl32G8<f7EfT#iVA7N!4bWT$$x+-nmM1Ic1oXtycP@
zw?$BqYTjvUu9gQzz&M5q7D4ICNuWsXOb$4{EWL6{S@8ip&KQcq+bG+A!*05Zegj;9
z_YGUtnhnEGsx!AK&QDP)&;(5E5EKJjc$Z=*Fd|eP)qM@FmE$ndxM(2c0v{j(xp*fb
z*@~M6n4j56e_WY6)l*>DWqUS{5_stf+}v6p(Cp^jWJc^LN`t$o)i}k8Qcq=jmh0)9
zdF5aUK8A33SJG_NzSs&3j=)?-wCblnfjRj#iDQ{}YqnBcg}~bkSPx_h8%^>aB&@sL
z?Pv^9oEJrtcdFN*uo`THeWyg_**<_TTNIIUQq3$@3co~3l;g6MtCyz0$(&vo5M_BP
zvt^(m>dY-Eb#Mu!6p%h@VDw#?@4;7)W!*~vNY8WQuyD5HcBhC&Gv(6a!9{IQlT^$E
z&&bzL*`8Uc<=D?DJM#8vwyL5B<+<uJQjt+z#Jq3>?JqX&qRzoprurZ&GJ0i%VZck~
zpm<a`Lp-WzRstTUDzOWQuNwS?4$=TnU~XLv(~88N??eD>7#Qg5EWS|8LzEUc+Lcpm
zDL}Z(T%PTz$&kcOQ3XF8%|_C&XPCEGB9O?k5I%6TJx>ghT6r%ET1+Abb<yi0`S+LP
zaYTZRA{{YXr}<>XY&O0D#v;htyRdX=8+h0H2lIvD3fv#P8?kBzE9&ViAEsk1b3Hcu
zt!t>u)p}p+M2l^u0Yg$1<_iWF#>iabGFJsgf_ysLL62fX34sNSke~Uk%W^;2)m`FW
zUY6$>cSrEdALYTu(g>dSqx>6s9{y2&)V?r^&>3tc#KA4@oeq3CD<Yhg4fy&RKOpc&
z@O%W%1+{aPU;66l7a;x@VEP3;vPJ$Mq65#qfhWa%F;{uC4!`KxBFzGXJ$e!0eb<QZ
zv*mcV_pRwj4fy=@T*ZgP3-;k%B+?5y8=@!v;RfP8h!5E)GJpOp8c>BFoZc-6Db^d&
zUeEKxPYCO)SNbS5yuBX(D9Tt6sPB<d)N^*O!jpfN_dy2b>d*2W2{aQY;iY}m$GF6Y
zAH=A20Gd(I2_(K@$pt_G6yQv!U*e<!J<9V<UqD-92`zQYPXu3ADBzT33*NKgtYt|e
zKCf9Al`<Dm0m556UW(k&g?k$1@YGn%aAj|VQb-VdWpA8PNSe)Bl70@oNn9jlB^WG*
zkBKGLyeSEDT|DlZ+^>sZMl`IrDfme^K$q$VBR=yQ#AR?V{OUD%ANjI<<T?Zw@cry{
zd4TboOZ@HY&<=k4imbGYnIC3Z2nve)$Gfk{QG=G@L%n3lE*lF8i*}x!_YnR9)p8Nc
z;R3{2;@o4=$1u;E_x!@8t8$z@mf3{w7o(*;e82eGk{=k!qNyl!VZgZ#k;vh+Jzxaj
zEJhqaU{n$L3=Z68=BJU1W03XCvQ}@4?(ES8M`G}oX#1(i+z>#*73M~qxzGg9I*1hl
z<TZOHIKep$aI2c7Q|^y|atGS7{p84NG+5Jw9gh+J_Ecf*<xA45cD1NF7M`Ki8eeCW
z@^4B106k`>9>HElz>{!ZIGF^Trq8Wyw3ydC%%8FyRN5S6B^`p4?N!NFTv4hk>ZtqM
za9o=tz%g=Q?yw}(LL0UdwZ=<Ix-gBhX9b=`)lKf;)Pw5f(u>UTl~Q!JsE+sSFZD_C
z-G>VFgyrN0Ms*{Fdf9PaDLSMcbd=reIF#gQY^!WPq-_6O8FP|nH_Dy6?!5`;%mvX_
zRG0W;31OTm*>Hk(i}zz=*bjVPqdY{4<v%ydlm3sOu5JJCZeY5|gYru+e$$!%D~3%m
zC9KB!@W)BKzOxj=x89H=jm1a!$2a7@pjyx0kbC1H{{l75THgN`dDNYCT##yLCgcoy
z5vdj+XoH4yojc<x(mI%^-?hKU(Xm+A&4NPOsyM`^!9Yo=)*dPL{vzMkr`8;#h)2<Z
zN(+C^mEBOeVm4A@BQ)&7;i}I~IYsV)cFwvf$M$PgB>di4JJ<WOV4d|AI&R}lxiin*
zB1afYk8sNtdB*MOu_jXg{1!PS>N43Y3Y?FcVg~<39`VxnHx(QTJs~WC-M~cgdsH^i
zn0J$p4rTKY@op$9VQ-_o{I%!U0Au1Wyz)6VoF8h#2DGIU68Tzs;}Spmz1)RQFJx5K
z@VDfJEFL!v{Jpp2dyRF~{9kX$kKMkN<w2_PiOs+yFhH?-v)rdm14w7j;4Zv)vpgW`
z@1Hj}y(#(ko8`VwT8h^b{aG#uHES=+E_`D9s}kS4l5h-FKx4FztuY&B`p=7irY~At
z^OyRgmtxd+N@)hi%)O>o=v4TgGLhN-2>(Ln`Q#!`)>vPop@vs=Wy!5%s&LBe+lqc3
z){QNWGoAuq=G7TsN7!6PrZGWe)_TBXA*vQ@od5M6)<de{rZAS<s<?S!dihP{IA*XD
z-x<dG$d~JG@GrtxY7|=Sx1DP`FNzZRp>C|JF|LMtx}o4&9`_UUxMRDs4zbNPE3@-~
zX<@SxbjKmwITJWzJ#-3F3f}-w(q}JYNQ~5xKii$f#a(J6!U&M{m5_H%nCy>3Cj_8>
z+@19{){f<8y0b2*@k)0#1do2P;&}LAEbGxD1d|7f5TtVyje+9I+zpIN7{Sx_7hVv{
zMk`n->Iq2nP^q40KH{~p>;w6gArfEJgDsqMN}=@#FYe$h)QELjO1VME;IF}DBQKKl
zR$<->3T6xZ=ef+NqKd+Zf~h#Av+gc=CY}c43_UWC_z8Fj0gqPH>4$o<QO2LI@mG4X
zPmD=5e0nbyZ>(?N`Mp?-@k%4#&<i|<O7Jsh!Uugi8MWLO?s*$@A`h!H_AsW^@P=M2
zE_Nzikb-uW(A`MtZaDf19O(Bv)X0a$vE<PHq6~g8oOL&5*YKh^Hog_)d>+S!$iF{!
zgSYR^5{<KK`0(CrLM!Nap*Ne=zSZ>e#@;Mh9&_{tzq1eP*Q&T#eOUVKVWr{<8`wb<
zW76^1#7OSH!lENF8ziFC10qVFc}8NV;C-($3<JH5zsg1?1U#~}vs3|=ns(yAriE2A
z4ZCm*4eG(`a#!gu{9o7QUcHsoP7J&&6@pIiG2;hN*p<}|ykn&L2~g^FLyj2?=Xl~4
zmoO<DUAoNYT$vXI@eSjCe*)=_!-zBQqGU}Hc^<hT-(j}`C_KLfi9`M`bAGaj?+5VR
zL>!?}Xwx7UZT59BpdTvDFvv?V<iTISPz|Pu-YU#L0fxvyrpsJc36dE92!=-124Tqk
z&lWHwD&V7F_0_l#Fmne>h@A*}`SuVn`6vGR9c(}wcp{*&;&--1HU}2#9c*N)2_78J
z9%(g+ug0^%T`*Nae1HiO{2hWsuJmEu<zv-1_%HFd%>CfL>|v0hFZ5;4bVY6qbpNKa
z1Ed-&VLlnBi{AZMSEL%*k3B<`2F=3pq_(WHaZL@c>&Fu8OV2@q=Dgr$RT0@@v{aLA
z*2MvLrmC&lWvebS*HoB~;^<RVau~6o^$b3u=$OaVRnU6ym+W~9Sf<GQnalhc$i8Dp
zW~upBPh<%s%BgbY)xr0~25=h#(*m>9B_}9t#5=GR1+Vg>^t3oh);RKxg13AU)45eD
z#v2`PG;{TpG-CU{M<1XXbqcZxR=sai_)@`q4Vam2?n<4@R##*`?HXsQFn?hXZAAS|
z%`A%%eF?V6@xd5sk#DkIoSIkdtTfFJwS3)rd;*0wl^7^+8U|;PULe?aDDxuqvRI5r
zh-bPUqinaEzrZo~w7U1oG1CD^2wB^hs=Ohhqjh>m*8xzQJL-KApAe>!;4NGyLBD9(
z99L$Yi@d9zE&@lwEDnMd=JWbYc&t5j>Nm3v#P2x}zmtk3J4q!8&!t2Gn>E{MN8WjZ
z^?pGCr|5Jn`E_ju2zRkmu;1F#H|I7qyYDw3fG41k+YrFMp|{CU)ZJVoHqtK0q?X-6
z4!xhqVus9J6F}x7T_>b#ohq<ofb@G~Xt4MOFthynmt(nY0Cv^#ugC6qbpWdf?FCE$
zihJi&oWDGd@3Ht>8gkxP!(U8hgL<uL6kB-m=X(qtA+J=45+gu;6ytd9k4}i>r;vya
z>{xNX8zq@A6;5J(VCQqK--ye(Y|ktEh-QUPpxtWK)jDOxDii^X1FmzWdE=b5grLY)
z93I8^Yk&u7HFImFxkhNcnhB~6KC{l{(kBzy>QOzi$$EMYYxWW0lpdaNu^Yld#-_Vi
zC*y`vzWpu`c#fs~tGn1?dj4Z5``vG<!IUdWLSD-aV$b~`y2#){>NDSZus;mwg(U$E
z^Xx-R(5`bVc0p&}IfJ!hkhE-KDb5_mMt6+y4|6Si6{9lD74sS%u;pAljKvR##p%=*
zg%gZz%8K#=R7y+=@0SyQ@x%4DX8Lpm_2Do%+vR)iW~rfYI$8l+_V=)%gX_gn#JTro
z;!T_{7Gi4^r;A+ubb<C+Dgws=D)*&F{vItz<!;3_0VCY)5e$BOfW1!J6z)BGv;~14
zyzyvrFT2-x<`hr67nm`EKXfk}Mpn#yUj(p`XHzGMzj-ekk~SRIBL8o<l8;M+Tgm9X
zy!~*N7+Z>_sRxCH@Y^=7%Pi8{__W2P3|Qml1}p5+f^tP~;BLNMa%u8@Z~)i4-RD{T
z&54Q$ZW*Yf=DIy32dDxyf9b#aHEtu+I%SRdE4&_u$Wyvv+Qs(`XMLvEyT9!y)u?sO
z8pERGd3)0!X^~hdop2t9GYEK3SzjvE>yc5x?+S|BfA#aO`@=4|%wJA|(_76}3+E#7
zpuZuhX$>U^<@cw6get4!zfEDi?WK|6Uwj7l+h9|BCCr{qhD8uL6_4$mcGLg~5uxG4
zYcs)39WH6$hh@IWVxjZKlHjJ3SMSQZs9r8I|3pUC@vp-CGnglW!{GT$zqWDZco0(j
z1CI6k5MmdL?jkVTPrz)$^<(`6LTX9y5bntP*<c+YkXrn|M`~fdZu$Yf{x<kazp~T$
z5iQ9NVfHc=Y+9W+L7T;Nlb%1}DRio7`*D*?(@p3MAy9auR|;MDfNlM)%+>|W67Xcd
zKdO^K@U^~7oa8|?=|$cDT&tp}2-_sElQW`R<{z~jk7D1R6<1;YQ6e5B{L)|0G9r`+
z_{y$T&0tcVE&|ez#4TRtMPM9pmshiOu-TA3$@8pUCvL$86ie{(ZX2lz6mRRK*PPh0
z6VCEfovjWjWTT}LCHQUCg7IPxClB%a#!c`=eJC|Ep60F@H$knke(<5RRYIR_m-PM)
zpt6mYi7m_i5Pq_3M{_X}*`9A|#6YNSA85r|^hI=)`iJhoAa9)LCOTLI)N1|_T^qYo
z5S8e9%kGK7UegOBbGqag2RC@Pv^`vPdvg)PpBcqsjWsoV!zgxN<Pa>t(J6;*msEIX
zpIPTU%D)-K2K1ZJhG|i4)SI6gBuPp<8+P_%@p3%uc<<|1k6$fw;Gb<4zxO`YOZtFM
zyN|`$6MUl!kD&;q-~eV^Jzl}?HDsjxxOkrTGJRi#k8<^L;$CZaS8SW){mp~7#*y02
zV4W~J<$&#H&3rng-j)Er-VJ^%b)^7zpAa=3s}v>S1^dyHY95B5RG<yt0<|nqiL&|y
z+_D-pbYPeM1lwM6t2Nl19B*^we%8&t1<0;s2x2X@c(Y^+-t{504aBII#3++XeQhxc
z$)&KqidxOP0YTv9tGI-y_(<$`&b;?<32~fi$SV$3y=oB#Ro_2QKhz4k<OUBUw1p}K
zf2Yza`}mY*e#@s+L$mfl9KJlxm-x2(*%bQ?(t>&gdpFj)Z>(;Co)W;DyqZ@F98No=
z=XoUX_0=+qwHzEE1@Z4I7FP=DWjz^H;dvCvTHf0QcRoT`fi?r>H66o22=lzOTj=oj
z(^!IjU~AePzd{;1mNn-D2TPm^-q;J#<PZZtxmWHT{vM7h0A+}OEG_4uW%9%Uu}qwA
z>uobt^A=nyfF=;8T+OxA+yF1X(!90)C|_PCcV$s<DZ*bVgE2zrxs{he_X#mSm&x&c
z$xk+T06HN8>T-8Ml{J>Q9iwCBM_HEs0gD#yweKsJyXl3@D2Jj{NEu&N4o;Qfd5rN&
zAYGTaX4msbTXHX|x0K_}k}eAV2m{AIKLq1{=W6)%L-MrFfBi+kfa4Ro`7)G{EWw`g
zB5pY>zhrFi^Is0jRdSReeMi+1d7><P8gB3|$K}DI@*NKxm%B^G_f$T&R=(R*jA8M-
z{x1XHTq}>i<HL_dxljwTox5tr5#MjO-pVrT@J~6RR}BOgDhtOW0a^P~3nTERnH`md
z)S%iTp7T#RxxX&E;Lu3Ap@2v*U7Z9Ai%^XD94<(5J&%0C|MpM0%S_B5m@wYqR8Y=2
zN|RGV4$#fDmJPV8_e{qDlAtgbQD_~)0fc(gs6f<6%GGrKq@1r)@6LP;;nov!XOsAH
zTrlwaPssgSoeG~i0ae!e8h-GEoX{PIcAVEQdyayVgvL>10FpiCFAY07d?trU#zF({
zS|_h+TN*`oBfgNDDE>|zQ~?j1;rE`DljUK41Apu!d@jaO{ZIad7oU{xXjS2vlkyb#
zb(YSDoswUYcjD#1DLJE!=xP76JGy)>H!}OMmy!GJQ($j0f{1kbjG<2ukb%!IeEw>0
zOi**`pIa0w&g0Y7%nKN2$4%Kf6leP9CP8)TDU-G=#&Jz{{YEOv`4)~*ly#MmgSjay
zFPSfbK1n|^{Di{G?56A14x0Hwg`ure7^9w9rp>H>F6W~5Y(!Dbb5nY{($m@y_O~iV
z7pNp>B`eDDskT}*vrc=OY3*>`tJ*I5dVpmI+*9}tmX&6%-!4_8#Y*at5w>sD#wC9)
zxME$ZY_Aa7D9;m&nCq{YeU!!yZvZ571xVR$gz&_oYG*@;wbI!DR|i5%28{(ui$M~~
zy&dR~-ctv|w-lbr_R*5FVTe*d>LAXB88(-<9p0LeJ;)^#t)&(wv?pPf({f%7l!45(
z-fX}i2xfaa>dv`HBGz{zqa*K}{B$e?8=71~p#Vp!G{ZV7EoHCmXJ6;!(lyX+k(@V&
zSO++7&an2S@b8jwNdPeFjgBQ=la9b|j_o3R&}XylM(;I{X#)RZJ2|V(L<c4HaM4+7
z<Uhik4R)g~#*s4E*2(phw8P}MZ?Llc>>gU`iusIGsh&u@sjN&y!?c`w>4@WcTPk-1
zu4=a%m4dfWu(tqd1LU0dMdJ5>*`pK|;*G{A4^MJd2o^mJ`sgeb4B89oLRKNQ@peF@
zU97`;Eoyx_28bq2-22NpHU2L#T)y#?n{LSixsg>sOQ`oK?&lDQEVB1gde6B~)D2h0
z>KK#vBN11N8z^%fL=p)tq|`5Yit3tK^C`*Z%CYNbphCa>D=qJ|Pto!yaUK$XN{O*=
zUt2T@fG8c&Y!}p#>J+9;i2=1THVl6zM5?(FC=1j|7QQ1hq@vDhR+O3%<Hhwlv}G-+
zBvVp%0tLBo?|g$$%Y&cci+o^)Q`~OEi6w7OK4uw2A@2r55D-fNuOeXX8aik?@w*qz
zqW8fVNP2$(@00OdkKdp1qxUuVy^7xs{K&KD!NB`&JS*^PTEjZc4iYz8<)#br13k83
ziw9KzNQW2nagOUDOU4X8X-kz;U1=TC`I8sqZpOUhJD$4$^&B~=WBQIQU&|{cd1A+O
zp6HPu8gQCAxDB(UUR5j9OStd6NFjZWp_8bW{0F>80c(%)zj@@@(s#UrR~{#=<+)yY
z^xZS0g91Dg4_K3m!=U;Cp^$5mt)FA$U|a9xQU|W8m6u8h5BNG#SbN8_(qMknEBEiV
z#Zpb>j;R5v+D&i6@g};-+kY#cm#d@F`K52=>^7qMD~I`bAC!-C!5y)M!%YQ`-6F??
z<M2awe1|;?zBlkRgm6=_+`(=*dfNl2HflU@H@T;TJwsA%q}%;!l(A_xg_qi5EFSPT
z{n0fDD=ghip-KUC<_*c8J4Q{!mq97q29ic=KZi2xw{^GtgbYpBAWFfDbpEruH&eX-
zsOsKip@gNjKI&nMaRb8crb2_)CQ89<N`GlHrE>0Pll(Q>-H%g_E4KcYh})!3qVyG;
zDNTTqQh}ACi?KV-mxwev0eJ!*^`Sh-{+>?&237`+fG+m1<tEtiNa8Ub6cKYP3m&E*
zu!zeH*g&+q7ot>k=4n(OXX$mD$|qtZP&p;jtDG_o6%uYOB(iy$=f&N+wwMD6<5S8M
zXFA5&3mqcRE?ejKwoC;nlkHgoni~-7k3Jp2zxq&qw)Z(P+;9epT?W3W#VjcWWwahE
zFhgLR+W!v22p1wa|GS)Qe-EWpn7=Z>ohIRyTJ#WYm|NLqaF9V@i^A<s$?jmfAJG6L
z61Ze;<v8O=5PGMzyO*LLz*E2q=300PGe1v9m;&^D>}~qKht@*HX5>)<op)sxOtO@A
zOXs=&kbBupE+QYnQmRK~;EYg}Gq-{{s^z^mw~~#c@wK8t3~sC?`BxQKr=oC**9Vry
zwea&GY1K@NYk4)vpZi8T^J)!b5!zrKsuRZ3hBlGKzTVEf0t5Uy<Q4hY?aE009Hmr*
zOvH8UHo3<`)flA`I*?dAc=PNRlLICPdV+1vzl;8q^rraNDLx+YO?TK$e88<F1ZR6s
zZ%mNT=5KD32X<~ndHZbu)(e<!ZeNFEj+QKJPUO_n1?-cqT*<}m`Iu;#lp1ARjq_TF
zGWJyA=S!!$qPnl3t<bLKTwF30$Ce0qtxz*@l0K~~5{erPoI7h>&?^U2U?JEpdWL<X
zAKvrMN!A!_JrGAzdpXPF#DUpwtMB6JRE2rTyny36K0P7$A`JA>{cm;|5OI4P;<uSR
zD|YH&4$D8l4@vyoemP3&&VSx7|HXcAA4<$QCor<D$TyFcUuF$d(%a8<E?;(Yq%B0V
z#XwlW7BlibTQ6{-8!)PYrR?d8J|c$pI%LaY0Gwqb4dc{&lNJhHwVFkDx!5wu+@cZL
zp5LJ+R09%4YJlYmUC@pv9E2Xxo`304C@PC-`6k~xff`)qv(3U$mKeaSC2gr0YjXL1
zk%O-492mafbsbo;o<o@N*76<!IS<9Mo_It-c1p9HhrP9+$Lt>I22c2TadH5O8Ibe1
zg(0NNdHnYbq5n;yqdQF^I9oVjl|(H8W;A-<e_d2Rvy8uelZ@9K<p*!dPP!&<UR*l#
zLJ};nmiS|S*(Kl?M#!T*0!i7rkhEe!<oXUQMv7eDpY=E1{BnIZyT^Fq-1;Kcn~3;e
ziR-tq!9DTq%&P)1VFg3II%pOpxI|u-*yN$DS4co^AlL}Xz75yffps2iTA{>}`#W$2
z@A<HdW{&xKVv4ajG&}h*Sk_SdrZWD8bjvBZgOLr2`u%EL4Bk>3&oZ(;`uVv@a3Rl#
z>)6YyZj*SAkqtH`9p&E}*(mb3Elx!bJW5N-ggviQfPnCnl<pWWvoVr!?-~9)V}BYx
z2Mr@mzQJM5Y>hL(`W-oPW}U4ESnVYXkxZRQIF-_R8h+-vA#7-y1nSm(1$<2i`_-YT
z8(;c~oCtxaP|GkZEaHN{_ley7j&o7K^|C8-9kxgP5MM`l8rR(VS84Vk{_Q97ki>c<
zbWI3%<>6X;9bpn=h!9J(j=ogfD^MY&X?)BcIbi~sKLFav_IO_w07fjWFHo}M*$BzD
zOp~D=KviR}Xf7`PHpLkd)A>hx<Y7aa3Y_0uAneUxqcS;%%kX9@)1^(Ag){@GcQK#J
z(-T|u=mMIFR+pyz49$Q{+~l95p6W+y{>rDY{R8&Im!HZ*(kVp+phnHCc4ZcUy+H}p
zOuE8o&Vmd6Y)|j?f!^7=>J5-Ag8zvI<dn*(|JCqrE0yo>-_*U?>zc-EDs~vX)CkLn
zz@&9^%jrfK?Vs(IyWUGyU)9XlE6p2QHfvqB=fF!%h3p~JDaNL`X~k|irAsVi;zPGG
zEWqw6gbDNaI`^AEL~_4d?%OW5`LM>5_R0hL_j&p_1lm4cfq`(kZ;I=V#OtnfSjB))
zEtr%FxGo-75nr(vavZTu7r1{r1Ra5ehrqC`IRt^Bexq5WbW~jD4lWvqqsn=h)(|(X
zVE=j^!nOpM(Xyhn+!!^FhP!@i8m8<$LjiwbG}x2kD#^UfWqz;HEH=1ok8iE$DqXoj
z37IDJ*Vl7cEp@(U>E`&7E=QB`;tjv=j|kAlvs{0Ye^Lal^nJgj+e%c83U$CKreVcW
zz+XsC6~+yF1&f6hR^b5-n3@T8bvas#`wekZe_H3;1e!;Avptz>`6FZ4U9ET+Z;oL@
zSquT`KgU3F<vaV1hB0ioH0*gWJy4szxUl5{=Ag3$CIlE<SZ(z`VYbbsf+b$Am;T_3
zd`>#+-9|8@CU57@r?Wdz9{)I<_36Bncqk><l5x((Rj>GbZ2OKM(^;Hk+?vdzGuT7M
zC(iSyGFW_P(_Pr|zDB8*q@j4jkpphx?&9xeu-G1*??wn6m@P&3;H?k6%|+P!1kZpk
z`GpMjxA=MpyDEPwbv9mC{^VY9t+>z6e&tV4viKpy(1}<*b3-CJ@sGx_In(2?twKLi
zJyA4XR!_RU5zh09vR$R%qVbGE!dr%fP>88zNT_<!`IX}KvgW|&-i=$j<EimXmL}XH
zjCB|&vFQ}DYt3Ehx-eE;jV_Eu0c!ie7wwFjE@C&E=|4vsB|p+0@<faHH|<%E)T!!^
z?yuO2>m)O>BnMoFPUIi#9EdG&+Rn8Q7db7iP%r4>B2zrYTLAm_bznU@z6jYBEz<+W
z2$56}*M~yG18hwHR=b?<97L$e1WwasW_@sHOL!1sO-FZ3e~|T+IzA5JDN8uC8Z5H~
znc^?zFHT_bt-x&01l)DOWQ|Fi#FDSTz!oF6x&cPy7TpQgkzH;gur9tnb)&6k@)gJO
zF28(di&nN<yZAA@A4=}8BAj2}@BX@N*cn2x;35r$T9?T&{5#uS^rCE^E{W{LxR!HV
zl1y$}H?mLX)KCX0h<S-AWhX|{y#N@fnSl~BxxzzzG0qAj9L1Z@(A_FX+JovDrJxhi
zDBD9_vv9St>|*M<MW<4~v&AD>0j_#s)XWHj1O;H{8XWo3pOw|*{K#1$t3Ucm_0rOR
zO#VFOu(G~P`Z2YB(Ywi|$cpPidzo(|HO5)_i@J=QyqL5|_gA4<=tlKuVk4<Fqg81s
zZe=BS8RV8Le8pF#AQ!@ZM2jQB&bYs7>w1|id#v~hKGhBGuVY}%;9CZL;T2!v+Yq)l
z?0DE2XQK@5pbCgyhcvS`u_9L4-$AKD#cn3m9uBh8iAKoIvR{C5SqfNxi47oQQ|gqJ
zWVu&roC2df;gfv5kQy$-!<#Y_om;o4hjdLOnCyA*uSDL2OJ|Wgh;D%_F5$E*O$nS<
z!ZmxYAahA&o~hR;F5B}y=vJbSQGsUCmYM(=;famjP}*&v3>YkAJ`>{ev7UUShk!ZU
zs#C5|kj+q4@eW0DVvFeYJrpQYP}Sah5l1Viy4tQkbcqJ%g$C!v;p$;XohQ(7;eUi_
z8FH7GfW{0`k6t~Ab|x(xh-rvGt74EamK0zyO;MidAp)*qNm${jXk>^(;&?Sw&0@j+
z(`D_9_&8(*cuoVucAULu!7*znZtFsQQMfl8<FNNKSlc@6y@`JzK<+oa9ric_oG3AC
zhl2g&2!_sCNFNT_k!1QtGQ*WNk~Kw}#(WE?1f}o?gi$`F5GM+}^)^_ydBIW!3_sk<
zHKV(X0;w%_hMcxahdmZ2Pi6b5k|?R8!+G$g`>URyh|-TE3G>CGjqOU1ISmbM>uXQ8
zhF-)cC5D$+n8(@gJ|Ep~oT=Tos4(|@!z8s1`J$%ym&Ev&L`(*LODAf&!Eb#=bvv&!
z+x?=ODe4iwT__=`jiYv;JRA9zhpsyIG{8MQ=bK=bIVyX8=p>|#9*<Ih+2(?!mjyW#
z26uBN0e`mpysv|d5Z@J{uqMc+A+u7j8i6{QI>pyVmjppHls=kr-lr7&p(#<2xQCWc
zmIx#TDLsSWW}pvEH6HQ~L=wI&o84`!kKn#+mSp@Xg7=ujmO@bM<w<Nb(Gio_gz%zN
z&=KE2SJUI)!iP*|PuyO{w<d^3cTHxKqKuC>lkH70J*TkTNHj^;aS0E|sqw-oY}llx
zmioSR(OrMFuE!!MLr7oHU_!$vAgxyckv><>1ze;+pei8TL=t>&E~Iles1Q&5BHnf?
zONtMkrJM9XH&aR47?bu41I}HXj*~o}HI;R-uSWQu8HW1}L#H#fa%fW6kJcqC@=iA(
z_~~cnI_<_0w(-i2am;szwLQ2#wv@Tf`wh0)zR7yrAc~ty*!X>5x4Gc&L%n@RDY5q>
zl^t#9I~*U@Hoo4A2O<C|W&~0Uv2{~+*vH`}VTLsX38B|8hV;XX-Um>WiUav5l3&IN
zU>C`hgTh9e@F*AOf}C@ex)^L=lrVG@?u%@uFxM!nwj*doqlB2JJA&S(a$Ik0xegR_
z*cY`1B%M9+l5GYU{i>~s?ojD0>i=xMVM?ywR_Bjyz^<*jakPq6&(cwn01LF!b-iWi
zwNS23xnz4;k8?IWqZCd?>kF?ey<57XUh+9rC>)97lq<7Ty*%GI-<a+B=UyFCg37Z)
zA5HJ3x!Ow#41)jTeGqS2PEE>Dh?b(w;5j%Ojc|`lBd~axvSTbpZG>&vT<5cFhHa60
zU{3_@qQtF~muS^MYw}9LLIXvSSKj(G3u@E6TU}^^ZX9&`FsAg!L6yJ_WWhgaTU~gI
zf+f}#xoJ}m*pihU?Qj=<0DBYOY){X1HqNlcQj=(IZ5<)L<Sb)*rc#5by}mZWg);1U
z;({@!#x=FAgqvg>l(gX~pFM3)f@se%rHGs#x>!f`#3(FJNYCDnZ!mFYWBo}GoZ6xv
zZS&sqWvdOod{LsP_#J1%{njn0SkNF!;W7*y+5#ZIUnv-Y7CReowK5N(7^~13O5rTL
zI``gimYKZ!sVaC~&D#P2G*@P^U}V7v)2WvOY%GXe7Hp-_FmHp{D;!9x$r>aT>y!Ot
z#we7=W3P*akx1-Q4EJoV@O<#Wswb%@Jipy2rdZB{Fi;Kk+*X%(Q(bCGIiak)iBW+t
z5xVON|3iNElu7Dw&j3BWgiEJ$BOxOCtO?AjlO<M+B3451M82sGU@=oLtDYuiRldP6
z&PlWUtcm!6foX2WhuT<NA?@Z}rn6pleKjftj{-wsyp)0&c=0aApTNl6iQ({$#-BiK
z7Qybg`z`7S^S+Bl!)76dVP<V0LGm#joG(KGl(ujT!^~Pu(m)Vpo))7^$!qis0?@Fn
ziv{3r&VkVhX2KYn>%51XThQb`Ilx*e*(BQHyF<&|rseDmG{Xm+AXb=V4o1rpB1RGn
zRWM6Ql7YqtgER0pqay$wakm0H-}PJ8llFn%vJuh&-svGW-1yTQJo6!z(j^zREu7_`
z1I(wP5dS<hkZ^MIr1Li(Vl!!nxYaEw;32p}bom_{8oiCQKmPV-3?|IU5|NYZv46rJ
z{v8___0}JnH;<-FZ~l&D&jvbIv%+03(DBJNYoP}Z!*n%w;v8)hz2Y`a-9vG6R9(pK
zq&5Qne|JI}TgzAoLe5!lY?ooREpX&7h01#vfpo@lDDh`Ngo3FV34Fo~*2A8l<um6}
z28zPD)D*Tz*6cTK#T)uJSdf7}0WEBy2GnV9ZpBl3;XVAV%&_7w9t-J#Js;E|E`JQz
zjBg00p7n|3(t)!Uf@tlYWd-j_8B+(au}?Aq%evLvxWuC=Cl%*j%6wF6R94==n=8ry
zBa`C}2y2|q#xP|p++E{tQ7JluSlWQL;fcbu2jG%+p_;K&$N_mbB2-6*Ajm&9#8JD3
zBg~*hxW=2*tU((7*3c!TJr|#GiB-;qIK@d-YPl2DSxJ?v>hKP%;df;%B=T|)EueC!
zL1!$4zH}iO3v=dMk=kUv19fP#k}$Ga@hH~|FvsLXAZmr*k6mZ+4Bs-?pa$MWgwT}!
zGv1&LkYROY*cZC8W(y8TwtsPiXVn@V3+2z2Z0(T=PD`bJ-i1i7Wz3;|=0*@kifk%;
zNiWx*4Tx6j`ucm}sv>$9^)}Hh9mENGt7Huky+;cR{jN03{UB?bVoA*y?u&wS*@u#9
z&l)~3BaV8%lA*T<)Ux8#jQGloVbt2njPdl)GGIW>Hg;r2gzY{I5XPi=fM|3g(9IU3
zL#AA4bd-XFc%$Ko5Ce`@r?}OuSPZZ&&DnTXS>4S}Lp&)C2vyuh(5}!1L52I(+<5B{
z%1W@hP)w_uwba+Md8eny;e?&U?B~b(Mh3>Tc}QXAe41z2i%nw+5mF!;Eo%<t&81nh
ztKbt1hjbo9L)|H7m9f{gS*dE)<7$3_dc+sgTpNiQ`0prcPztNCOI2n})rTjWRG10Q
z{fiT(xiYc^%+EJW_D7cjFX+Tyhxq^kQ$WQzBYRXNtkl^0;0%b4+R+S1eH;X29n`{I
z5t-=*IV;A0UYuq{cBSBTR7evpGC(sr8p*W`*cNS-1C%>yNmD3#)}pB9K46_?FwYh2
zbV#C}Ol_wW+QHH>c!`-RR3S6a4uFY>dXr+x5Yt=$OmPB+VEpC|rSL(-;K)bQlLmVr
zSy7<&V|1`Ud+EkPot28K)>)~53=L`Wqi%y|Ab1z#<kPj>>*#@hF>69J)Rp|ly=yRQ
zVnk56da|eiEiZtYy1_vX;4KtM7GEK$LLwrt)9zSmqNysFjwo+;3Iot#g0+l6g?<&1
z#H6&NWsFy6*;Cc)>MWMhpk!16GbT1@nD~tGTE?)nl<OZOl|dO>=77z0z>1nNOewrd
zh#-HMk-)f4J^3-_(63}3Ov#T@(yIW*un{!AEaiwY#+{PS6tkOZF7vvPOWB_Fw3ZvL
z?3neGmTwhm{SQfY==DFtyx<DJ-cLK*!oY~e(1?P)Z|$g$D7t`gF_Ck1jAaat&9@oL
z|1gvpgQzX0fmv}tEC73QlHI$<hjLMamODtxk9GSZ)Dc>Kc##4eT{KRbt3J#Z{+@NS
zBOkPnfhK@@DkSDR>B>k4o)?Ff3@bIQa+L#r>7Ofqc4fwNdaKBof$%0YnmZlX*_E-d
zGGjT#s*Ty6!;c880nM1HFty&K$JPvPqyiD|vVRnhG1lI%LN@AqmfrVv^qy_<H2$t>
z18o5~&hmJ&7b6O2l|O;FCbZune*)#-)gpiM4%Z@ormIx}X<*U@3rM2^mbECL8FB*!
zWC1sK0JGsqJYT>sgD1~nBl<>x>pN}Aq-@}c!0y-qhaeW8TuS0HCLcI<5Hw#ihpp?q
z<Rzki!s&L*fYm{po{%?PHI>l9-G)eRew0<?9NTd&a~iL$<$Nw%U{u#~(;wMm#@Myo
z_D6PC2oV!Uc=lgdG<W}z4U7+7Bw6mkT)+!~EnG<3_!bLEliVrOJS*1l2n&1Q7R9`|
z7S>Dm{xoJSf8N64Z;AiJa?35)_ZId~<Fdc;ee+m+n~ij-G;1xdpT}bCwA;4QMk%I7
z9*5e1Aax$bg$eBM2w<66tL6ms8(^&tbT_Dg930%LtTSNY^Dckt5a<b{&H$4xuFB<F
z4se0#CT#GRvpxAA2DYX`3f3|UAUX~DP0h5Q)-s>hq6%XlMy)ueHA)B6gS$xd34&Fb
zr=4!*n^-JWnCn6-3$4gX4Z%f$XpecfcQs*^oKl=7T@Omww$cx{CU!9Sy8bH62;-%M
z5CbQ>0d2uM8Lj0w?3ybN#X9opLN!~FdbYV1bv=0=K+}d((_FLhp{#S$k(gR1odWIb
z|5DDZQeir-gZ7aqrE!R|Zm*+p1`?W%qI4=&by2(Z($tTr7*u5Is^Yj&3l%8!BN7v(
z4nne7my!-tc{XrO(Xu{$NT6dd7^H7D8m31!_|HMQ!!@4y{(znbhk{I`Ol)g}?9MU0
z7T?TY#oA#`&9=>VP7IE(AIz+{MoYk+>26fznkX549e)*O8kt$67YHGzyt)ufcppr(
zc_-8=a74fCiGLqfz)Nj^2mk?GH>~_XM>5xy?Vkt;Fc)Y!&!h1mnzhtV=Ab9iS^qb@
z!{g8jOu3}2wwVxt(+M<}M&lJQic++*q7?o5A7LxX33`QygClP@?oZ2=LXzr6qht_X
zkjY!`E^sRaw1>hfjLX%4oyfI5jpn0}{z4jGElkG?&J=Y;LWWl>w9_1^g%41Cq3}LY
zI8mfMtrn6vq$UJ=)k1NXXD(F>r;9+E<++uGGw?7Ni^O5qGvOZqtxu@dwpvcDZBC{6
zbu<M4yb(wUk1h1&{T~A2nYF>uvgdk+VE_ds7hEptWzF_{aLt?+lMZ3cDuT=!89W9s
z%V@25iFws5zfOk$&-5gnMxWINwYVbCJlA@CZPuvcV_cc91LYN(5Dc7`Myd|>LTWHx
zTn0UKJXk}K5OKEPliIBoK90A_La@I4V&BovfRuyAhsvWN!BY%1GG{{G2sFP4j5M!9
zh-d=E6nGN;PV4XWwn~8$g_lTn{2jTTDuZf*EzaelS2d?@e(Zc4XFL!6RbXQ6BWeVs
zqH!Q~v18yMxmcQ1GX@FOiJ^ghncqVd>7mpsGxalb3%)0YQh!*ex}G|q4~Az85EL~6
z1=?*ZkyP|n6Me+g0kV<D45{fYB#wnsFLm7IA|Qgb#`gl#^^pK7fUOQn>uERwll75<
zChLrtEN3b1Xua!b+OfzoBmio91s0nL_B%39+gpS*p)Ip15qyuQu!qTz1v*GH3CtIv
zS;XcWNqoF}eDq0x%&w<OOZq$VcB1%d0G3h!X?%alUm<yj@gr?@gaf?1?;}`)UaY{?
zkXQ1QzKf2;(E;lX0ue2^O3~2NH!h$9qWS!<3$RLSl+}j;4O(WoE~y&+hG8~jhk+H(
zQ~xS`@p|pae&3uRMsh7T8GYd`zHlJ20l`#5FnF2C`wI>*La-I<GNoa0929#UsVSc#
z-rjXr67D{AbpQ+9f_9zr993Rz`vz3w%5vnS5_aRsI~<Yw*mF$8!Rv_@+F;nw*I7DA
zh&mL$d$3Kdqit$ksi{h9f>@flAdsq=1fm4A5Ry~HP^dYMxn!5nSY&?H_kfG-CuqZ|
zXQT6`R1_t-){oZn8&SrCfEAwf6zgZ-qC<!dV?vJaORQ{VyI2=w5553`i#TbkHGA+h
zINaBqrPm#eu)s({;MN3C)7IT!8rx=R<}FT-v<P;vHoBrpT~U*zy^hq#Fx#7eNZ%`(
zZHs1p9qc^9cqvt2+9`#@{r=ft-__t69*ewW1B7*{1>lBx_K10_(QI`9ZEpn4v~9~s
z+v~O-fy7%|BwkC2MM}-Q(G`Bh75;#9DWfRLgg*1sMQqUcE#7({473bw0K>DgFbO46
ze<}-y;Z2|jYK{o2C`_d=+_Y<%Td?JkHBT}m3>#a#coB=bcc(8B)=q3S&WhNPww+2r
z0V0*{J)PGvT1)X>^hOj4aIKHV->p&+h!QZ5XV&rSi&%d<MU^Z^>plM}7JE=1ELGa~
zT`p==a1CszLwje|p|JwXX4blJ;`}H!m;&=qlv#^;&^eo9-H;S`owle(NH?rcKr*dx
z5dH?r_T8<mj}e~}MO|vWFFp`e@-7ygI5xv-oZga>trSFU0?WHq>#{u(+C^uJymE{<
z|L$p)kX(#<we>`M3q+D!D&2(737s;+0y*s(Bj}#J0(~e5;2Bo19O(pSt7<;MnXBmv
zy7RC2ZN!hRCUi%`L-0@Y1i066zV~lnx#@}}uN9)fm-Y7-@s5S0f2<TA0re9bJ_yQY
z>T!R>Cyj7B!5=RX`_Uf@=#(3jx^rURZoV0BZm{zc0Yqr=M+8IqnKZ~<<%4YCnbEdD
zT@o8X>jb!VB1;BAt*UVFBFWICt*bNdbs@gF@wVyLJd0U*3%?`y(L3E?;2P9G@)6JD
zSB+mJrjFk2@8iz}{Al|oAg2g=_u)4W@A>$x#gE<>;`cm$`|x`r#9;UqG-Nw$$n@TT
z_fWjY;a3NphCZN8Z{it==XZGK<GBjI|G|&mIetCD48Jv$fvvLy1-ywLy%*v63V!e7
zHvol>!Y>;?dLM${1pKV{J%Qiz_`M%^&&Tr}{Pc@mNJ&H}tg~e0{S_8Ba*FO1=pjg=
z#y~#86$Lv`lcmcLk`QyM=A45~js37~fNKR;rY<A_WzxY*fQTIm>k-+0CE@9ykc5AQ
zK{uW>eF<}Rz|Nmiw)hNPI(tGs<lZIhuL?Hel#0bCT$vjYII)<&wG`^))qmiNma#3#
zkJHlL<Nzpw&a{ZHm&6y;5oS<aVeo4reJyeDanG=EaKiTDGq5}v^(f!=4BOl79c&h5
z&^j)kq3e_8)a&5-em-CGEXxA>`Rudo`$VjvUvov852wE2^QTXNKcIHc@+-^PY~wr6
z@acIhGiuyuY^wntN<@$Wy(<sOozrIX&+;IS=uK-*5iE~)$p;_$uPtJl^5*8loy1Z8
zY(BF{%lL(SHYn^7z!BYn{lL50*-&H6PM&3FNvZj@KuvkO)do`jUkAX|%%#|%aS$Ml
z9jKhB4~AEc0YV3EHlhfFQdkOTh5CtR;xBBG?;*SqTxCt1AX}aH5lRJZCZg`u8qho>
zstyh`{9GZt)RK+D<{MmZ4Ex3JpW->OM3892ki&f*`0V~@GA~Nk*;BzF+lY6~H5Ey<
zLdpQ_GaL`XKKAhx`bIYXVuw(nbsp_*>~)80Is%+|;Rf4%?-<a0WnINpH<}-Z<Cf{N
zEfHuB7d@cez*ib=QYVF1j@CO#*N^BVQQh9R@dqP8H(+P9nN@}UrjbB|p>j+F{@#se
z41Fq*W8#!f4<@M(4ObVXR*p%dKy}PS^}+0Bbk%fI5VwMjjD7(t1!%i9X5kB0u+B0h
zjrs2NtXC&mOaVF6CZW?kD*zJ4+r`{m!Ft{mF@yGm*nl0JCgBV4PQ?Ko5^fQ4_<HuZ
z5WO4EJf&8CUja)9iwjD&@dX8J4j;ObMFEJ$uVf2ZInFl1hL$}1$#nkpTk`zdU$8e>
z#cF9p%Os3w9k#(w^=3ISYVwHYE;Xfx6|H`}wtxw9yRg7SbLOezKNqkuorMjx8bF9(
zb?8wcR-ReNx}klRLe|rMAMvYanxN316P|pfa$E%M0MMXwO_0?Z=lL6nCvjD9t_?0F
zG7czX>q%hiXyPShCFx?g#zm2|{3VjHOYa8b_05bd>^ekkti((@hPQ>#$^+oW`)xki
zR*Q-fFDole0B6+(KSWDnK?#vg*H8j*T$DkL&zM+`yT?@zq7oPnkm@H*$yN_~4nHMe
zT{@#KiN$VCV1o3pr|L<@!4gC`Qws7>2%sAW<bd^6H<g-K3-Op^(y6N_o13_XE+Fj<
zP>egcIE{Gf%cTZwqI5$&u;TL1__ty&^uDFA18U=nOXAxtz8hUj8+spg<u+VBdeu!j
z;I0V`){oFBu=7{1L}kr2;9BRTZVAAV+8MrFT#Nm#-}!AG=$DbXTC35Y5sjg6ilcJo
z&XRISq=DfQvy_`wgQA`FG*%K^Eg4+XdI!3TzT(DyipL4sTfd&$2{Wu<?(d{Badv{7
zRAwD+?EXl?{xD5qg!-Gf9HMyiaY-yTmq#(Cj^&~Lwy<(7#xGF1r+Q3a7z<y!>7NDk
zhB9&CN!ffu!DZM05+c<0r<QeT<Dw8N9mIsyD62Nnl+c7tp5lv1z5>-cP1a*xYl@ka
zjf>!~7x2&`HpISh2)2&z#Jn<J=RiADx22fEa~1_inikRpJF};FepyT5CVj%U0bO~^
z35fx6fR}2J;Iy8=w-PSC=x#Px?y2ltPpKX!d|mD`rP4iR{?lTCb>*ju*qzcbZc^C*
zsVyI>LJs}osbocO2>+AH#v|%;mF<Q-tPRgWQgqrBvZFV<t!X(CfZ?7)<H)>RKcs@=
zvvI~lIee1_GbHJg`6-R1wwXv(^<KE6$MdYM)V7Xv94M2SC%ag`dynD7diXX5L@Lc2
z*C8YL7oZvpn-ajr#34l~JPx=Z%O^=|S&ufqCj;Ht!kBk|`)i27miw8rOmcn(wsXBw
z**+WDY+oRKvl%$HLfsjQB5!Zun?#zcl20Z#gjKb)@I3)#!@~E6x`prd;V4fj?1sRA
zh3_LfB|iNH7XA<-FzB=+2ov9sONIz8nGh$ty)<A@YN{}ovs}-U=|Tb->g(kYG3!Ss
zvVzA^A`U6q%yRXrvgJ&S`v*ur*80brl)}|~&kJnQ?f1^o7Bo1ewsjOX!S};1w_(-z
za7UxjIt@PUZI3i@wVdTs1zF<x_&Kb#JBVc^I_3FJ#rFw(qZfn`J=F!+xAga2!&gIm
zx1=9BXIV~GDpx!Kcq|Rab~^|czo^0bXOL9Nma8WB*WePAxpL6^t=0lAtzmse2r=iJ
z>XHIXs}OpqF$}=uXBN9Mw?gI#*5PT`JdXJwZ<7!fuo=G<Hsc?BiS;sO&FAMfvM!uQ
zvZzjjn|Fj@?|J?j*3;<7<ZrHF@!cQF6vrGvqc>St(qP0eayb8D4I7a7zX0B=EdWmk
zHL|ujbuH^_Cr!uyBOu!d7zmn?Zw+Ky5d*SCDHz=v$lgP^u3Fs!$QstR1~SU50~u97
zKt>C!3CIqE*3*xl%|Q11|KETtlYng6uYk<ep1R_hwhEwit_5h_v!W$vHAB`wB=*g_
z6|~;@zXz>v=iVN)!gnG9rZU7?jwfxByG4CD;NJmQ{R0BP%m+Z=U}%30U@LH#6rsVh
z4m}~t+H~y|_)ac``qb)m5UW4Nx2_XbC#%=N80SWNI?>1eXcozDtYedVgOt5h?4%|A
zjO(KX>)F80FaLo$fqSqR97SpK$_e-M%;m-F*?_3a3C-PUA_~7>&k|)U1D^R8)};d(
z4XiU{ldfO%RG2<`nGL@^#byegH`cw(?ujy@WK<>u*F8V?zv1`Xn9I++4D(aRc*Dyq
zu1C35fZ!E#DfC*2NY--7U76M39C-F`<acwHlY$O5cgPnDeM*0HHWBc`{3(<-k3!8e
z#0N>Yb2?=kJTmbz&hCvm)~~s9=Yoyvuz?NBI4(8~n^cD3hf`LU8J8e_X_p7#$;VW4
z1FR}q)&VJ7cH$(L?P<51_SdK&8H`M@GiZwBMH^Uubf<U&8_*>j?V_7GxNtRS9pJ>8
zwxH>?{L%)N)SYZ?Q6vPv4O&mql))V&d1gR@)K`GRj!xz?Utz!PvUoC~5qXv=^4ffZ
zg*^OBp5l3AGC%YR8!!Te;DWj`gANOjKS-m8D<h(XreXa$v^hzL@Q?pJwK?2(uee7{
zewB4eAu0cofyiVz*PKq#(}7KLnpm5TM}$&hgv+*Ddol^7XM0>@`HEM8L7y1QH@(UR
zqr)}$1mgSQRhaXPh~(W~W3l+W_ce6nMD~v9udzeYzzt9cEa^&>-N2it?qLw!%TaB~
z9Tc_^Z=Q05iPmMm!McpNZR_f1iC&;}HI(BKeA10>Q}YsFYCer`dV_T*(=*^qw}-~Q
zKbk(sf;P`yV(h|qybZ74#r(|MG9OH1I4h2>Qe#90TND}J69S%YwGJeD;bP2DN`q~!
zXxZkia+17knSr0!D&Nn>5o4k2JMws%&uO?tn-v}etEb-4tpP)Xr)ksGVKTTxdE+~B
zcQUc;%um7`L;fs(*ey_-^jCR`5~V#5qt1eu*Npj*mfF?)Pk)s&jh@x~{9omPcaZ|R
zngN||S_W!HtZUCkG}lst9TI|8o;A5*xX?SQ$kXRJwD-Pu<<8{L1af1LtPIzB6yT%q
zbK6AU0L#1$Ai8c*m0yelkXpIffmBUt<18z0lk)eJvTQSzr>j$|8F8D6sH*%3byf_n
zlzUp%i+qD-i!{0sV|eIAn>UMu8G~G_)(}9@%D}*RKFu+3|GV;~kt9K+<ww9>Jm~DV
z{EH{*3eArEE(Y5`M}A)eY&K?wSFYL#h7-{T+GrZM`O_^oR`Y>>lVb;B0D|bi49jD_
zo>w!nLAcmy;HTa)@QeN?C&<00imLnZvcJg>-+=~;4$Qnw$2XzA&C6@K`F(kceGXb4
zY$%`yRd|1c%?vcV5TyJlho%IVqk2=3^H-{)Zv~R1?P54L>*>&YD2YQZ-Z$XZ(0@>9
zR4}w1`Y#f{G0njHd>{*_C&7;MX&=agqPli%!h?&O0G59sC$!X}<p(~H2aY10aTu8)
zOczwLsNWgU5p9{7fyw?_eZL_R&;PlBzm=;@h#+FHauvf{Dev=<Jly^SW&=kaC1M;2
zn<<H_YN#ux3vffJED#@sr68tD6=BvC8r2Y@$&XdGcZa+eWW=<cQ5aAN+NfD+I#g-x
zpC_2gU=Rt*O0ss?v_{Mg<QHwZz9h@0))O=a)23!5DFriWUNVw4Q|1;~;w?K`XAtQV
zblWlz2-&=*mUr7O_ogL-_0n$B22q>sH@-oZ+FNpJSrLTQNx}syW*t=&NZs4={q56|
zpyXysq=rKC0)kGEFaNBtv~m?K0Qy&%5l3&8ykt8pMJ;Cj&ivwbxj&o5Dnogf9df_U
zZbbVR$Ls3>QajqLVOoZXPuU^glMJbx@l=ZQB6Eo%U3+MCxU$l*xTbkJ{fS5r2>6k-
zPm!c$r1O#;a^Jfvq!yOzz^Z_NAQW>TAQ(3;rBZ<pc&yN$6v1X&#ZVrseP$VUwBISq
z(%o@bXh6K3AecCcI^oJsS5}u{1^C(_XlEdZ4j!%-&Y@{)XeFx6*d-6^U`jrQt0r|-
z5rS<axNDc(=N{+sF-C(cO|t#0zU)A_kc?Czwz}$he8B+%9I>JW@PMThDyRiAK&X*_
zjlA~fpscHyp{cbO!c#94BfXXtgWBFhI0lB6iTX0hiw1=E)E5Z%xJ1gzRm8ItDzGnX
z5TO)Txr!(gaYD(OSeZer#(;{i4*mE9+8qe;25VfVhCEjy$8~r-AOs5z?bi?A;JZrX
zyN&lH@%j>ZTv)o0H&-zRX&=jR(s=#|9+7jjP&LD%t#Y71TTd-(Ie+P6Im!OGe>=`u
znC@^LPht+gaW&21EJkzqxIZo2D`APNx#93o@G^}!D*p2<oxaLQmu&sDjEP$A_~tf~
z@KuK)HwB@ZpKjD<F|^&5(jxn8%5E=bSCAh9S0uJpSO~5HWahN|iH?-O@<-zgw!Xd`
zNF(a0XhF=RbotX;C9>YNYbvIpL>#g6t<xY2mhCx>++bW3lxi7EArS{NS1_<J3vy`&
zZ!$PKyX*@o3t7#8d_K)55>qv^7%71J;r<$Rh^G0_e}IDD;60DGrsZ)ZRBBow{||fb
z9v5Y`{f|Eb&sIQi1_eb$9duMw#NjF;!f+K$4R3e}6%+^+0l9cP>Of#I5*;dYdpcTZ
zR+d&+mS|d_CRSFMm&~ltJT;~jrm3mP_r0DAGtlMJ`TV}G-#@?Kz<TyxYp;FZd+qz)
z+Oil}xbz}E=+RTMN?je_$~Uk70LzkOLybUcN)nJd{T{Sb)Q%yW#~yI(=iDkO`8$Wv
zczpYhyZq8&$44BC5`{el?>UA!PA#W?&$2NnbM;xvNxuks$5jS#<ZbPk+qeQrVn`;2
zpR=-vVI1^0zUGvrN8fXDvNh^H3D?P{elX>)9dqnKy$@Tz7#H*Kqd20^?;LZyZ{WaL
zR63k)#y24q%!NJC1;;INOWGal;MpHJj^QVs6FsDUJ~oAUbflw2+jQ$V+a~G<9j?UY
zD!T1(Kb>%=bK&tjrK|aBNI2n|N-cRK@`>BTan#b<f+M%An3QYn2HB1KlK62hdhwZ6
zVwbMYt&LJEFUJ|vo@Sit^Rj$q`PlN!q$w?*A~Lm0dR6S*yFB`Z=|OP@G04^6T#qUe
zhr^dRUn#8wg)E-^;pvi}{gN)vcRpxoE=)+CLN8rA)oxfE9<}$a#Dau<t_XLl^;#U$
zM6tz*Kg@FCjONwbZ!N7Vxw-zcNvoZ`J}GjmOc13*EERZdyt8^7kpHyB(c4@<NWSab
zeh~LNJ=#uO&Tgc^R=g{n?!wp`=a5JMDd(0d0_2+lD$)KGUBspBBx7(REbjcMj0fH<
zC3?~IhWJ}@@+)V*29O&`)@*O8+`-6u*>7naW55OsC%BJ$2XbF@?CV|p2&Pf!!g(z9
zTIGDJaHD)f`_5gS7rn&}aEzbbEc)>d&SFole?|=SKZ6TbwQntV*1na8fze4z{q*FP
z0?~@OSIo&Y;dSGRvGC+1(Bgg9*YV<KL@zOp+}ZRD<}cfn1$DG5cO^=$P@Th+p0su_
z*OGd-G|{Q0!6XVN;_w(l2n+>_QGOy2Cvz;*b~d-LIy9Bq$BNL&!39iU@&l7JZC4>a
zTwEJWcC>3Z!dRZm<0kItMNK!|G8VPWy)sdQn~vOq$(6FTNP`MVUxF74TB3@2F5Eoh
zT2&iT$F+6T_*|;!O*j4q)K#vo!5;bo%h3U3L%Z*MpUN6E0(IIa50>0RUO;oC?B^m+
zI=>W!GwLNcU(9=Na_l-BUKS0J9{QHe%8pT3;XwXk%LkUDB_9AaA#k1)xWbuy?k2|}
z(!+xTr9(H8rNU*B1+PD_fL%P7ca*$Oj$o>6Vaq~sdKS6Va)NemNY@n8K$%E28ack&
zwbWZ%xOvvKs>*zgeYCY}>7BH-pPDT{7kzW-3+Qn!s&qng%RZ5#<Z900gbkLps0@{+
z>7aEIC9Ny=a+(C8Is(3wW;6?>qfO8uM|Qy&t3)`<UJ<{urD%Igk_W^^@oF7zO12z%
z-LYt>{oL#88oa<!T5A*nvAJ=X`#Mh}T)FoFu13_BzCoErN64ggm8y#AuGXE9;FkDu
z%d|(~2wipUVRn>X7^l}gk<)9Rf~C@oqe3k`@`?IK)P>^AwRQXSRJw5wuJa7+%*G`S
z6h<7>vV{>5w`gc@-XsyrdF$d`%cEV_#p}wW-L}LbRFhglD2h^ioG68?#YhUXeQb)c
zR*3i<DV9rTnE}Pb+Us+gI;DdH0{oVOVVPEq4K$@0XRvGGoS;r22f+10m%XG|kIY87
zrW$}nW1Nm#ORM}1@l9|;sC+XIwCX?@R>oJG@kZObBta@CR6%x7J~ebOA*wiAE9F!s
z5}vl1TgKtRmhy%e*ScpR8<L$G5@?(ySjOorD{-0E#>#1DlC7yuEiE&ESif_Yb|+#d
zWTT_&+N$le%!l*=6Q1o_h+F_yjkVsn#oTh~Dg_FM>3&3t)7_J+*IWOE;W92AwbbAI
ze2L%d4!ayL`5<J?Ez!7A5wD*_-$H^=P%$f65sj_xMTr4*mmZ)#-2`ms+>I-&wPkO@
zycAR5Yd?mjBr>xoJ6pT<AoS>R>g2WtZI2ma{*4eluWNQWTsi>Lim|R^FS*O*n1ZXZ
z9zd0sg6n}uT^<uq_b~Hlj2AG)J_<L|*HBu;@21d{X4F9|UBOVAu^*{hQ&~xA4QG<9
zV{kNOhKyT3L^9EP0>~@G+1fjYYRysW^S98+_zvQyIMP_uo4P}eu-zI|C8U>rqzY#r
z2gLy8;8W?jP&cXsSof}2y<S^(6^&(t_&VytchJ=}Iqq{5G!B;f6W?Dt4T9NfO2Grk
zxFfnr^12dNBPfBcwrFrE94as6cxgZ32$tYcu<5DWXxF6uCY%BdLt_XrOa-Ad6$K^H
z>GJeREt9=aW9gWrlU&xKF|LY4c_Mf41d%ol_lQ(moN$4rB>~s6VJjb;OmLOjv3_v1
ztgWk(zi3g4Ha3`CsT$A;<~t0@iSx^)NY;fNXVM!smD4s-l1s%K!EF%mCM|_d${K_Y
zr(vZMo$4w_1+Kiw%(641ZO+gn5vDt>-&3UM9%6-{WEk=*4|_N%zi!=-`qQ*yM__RJ
zb-)JzcQh(!xaegVG~-ELE$BoA;Fgt^$><-_TSxf8d^#?|b>dFXin>8mW%It0vbD3t
zXjv}qJBngO^HA~@BqxN$dSWDxdRFwxBqPZY@&g`daIHow9`A$;jjFmrRJqGcc0G)J
zRGON#^-{Yr&eBK?)4Mm%<Vlm6dr96~|AoRJ2aqp*R_qz?RY7-hMq?|gd;Bfva96r+
ztP?sQXpCvIVKW(6adUDP>Q!L5Uy801#aM|ij#6;%t+?Y-cY<4=6(bz#{=o-UV=}M{
zpH?j<&||OG&F7@3_qBK->NsY+uXY`Oy;}5hxG;hiXxiQ()p?700oF;SqsT{Z!E~bj
z1kc(cjw1J;-vak_{Nxtwo`F-pZfW<RtN&K9S4Y89N~9;NtAqMpfxt!9XuifNur+vK
z6;IpRu9V20#<y-2`)PaP<P5Ha>xfeK8}fsn*($!^a3hEpKPUE?P%u?;fv$2pYM114
z7VWE3mM9N&mPS@`3bz&m^ja%$YpirndExBJBn{VG7rUj$QYFW1FZxavJOo6=xa~tg
zM8UAGe6ZAUmmUJ@Q4!xv=bR!-4|`GZ$=bgX>6?k@DbE2(crtJ~ki7bR$L^XFJn?z#
z$2nigS3fTrwbs|Lc@Gog*syoT`a}TV|GYT=k0<UM)f|X;L7eEZ^%h26%07`+lV@HK
z!~9I>r=i5CT{S#2{T#wBRD{!2pEQQAh!HFDokkwfK2pyeUKEFg%)%P<>^i#szZ;^7
z?Y^38mRU}vEfDP8K`3o;D00s%#ofA{GD}xD_-o7PW?=s8cCnlJQg3J*H24%>>Vhw&
zUw!HMds0`%tSt>C+96B{HA29W9=pKMYJU*$e!vawTkJ4OB>D{2`%Y7#l<tkEnfcN?
z`ur)h<!JU{?Ay_t8C+jlzp?aJeSRc}mV3A*J)ouZ+vdu+j$X@gohP1~Hf|U1pYT03
zO4E)uklaG3G4*f>6biX^?Jv;Lv37drq?ydEQJ|;;u-1!rY!}V(H@Az12UdXTawW>=
z!L0FB$laX*m>8_Z>r>W;Zrp)qC#6#n)|ZUvPGKaf?pgc`cUz?rf8ZrC&^ZaY1u3HQ
z<QrZR=R15;#_zm@)py)_5&W_^3a5qgUdE1BG@6$lhon=IOx-WD>x7hScuJw{-8QBW
zjDq#a6a4L$#r$s9(M3k$N;4<g^$Bi8T4~Zec83_NS;`;TAuf{61}*hf3s?(GT+r%P
zOvLfhR4@McD;N!??-YmA{e3vsn1C~OFz5<T7K)V#sYwexr_e<reAiCgo#f8n-zkPe
z5nmAvbLHzrl$o3&9W=;aX+41^3;inQOl^5<lSHB2VtAuLz9jil2e6^7rIV7DgQd5o
z7p>Xig&^(2tg0|t&|x}baRc*e<d3`}hSMxMT5t;;PTxn*B8<iaI}SNY_W75uh-3Q7
zZWl$;;YpmLtDKWsdRwnuI|Ixuo)PXm_Ej;aT`D~Bs+cA^BU$;)SH=FcjEAG6t;1!@
zZA>d_-<s3+(jHXAir%=Eb<}I3uLIo5cuh3@0XtX_mt;R_)&uNEUK58wpkpW?pV+P#
zz0sXJ)QDjeSo=fVN;Pj?vfwjo@OI0@!4OeB<R*)<yW!zm_)_9pgZMKwcn}QE+)U7;
z-7&ZBM{A7$zfgnCBJSL6mzW^OTU`+0sk=l!m{jh<%~S6Dz%KO(fo8RM{Jcw?>?-GL
zk)OOW^t!0mDi_K41bl&o4aCp<I-UY_=bK*_<2oYe(2MlqtKSg4HoPJEJoF85u#_#x
z+XWSFl)1H(xfq&J?j}pQTkwV$(hKoeTespNOMNZnZON}v=61x|-hOv}=nXNpa~qjn
z$ge)5>1B#qmR#vgeM~{QzH7QP`#BNUcR4@~V8Cs6eOD6(-<1=r>h)cddSXH5%g$m?
zFYhYUbpHVmiW9EjLbWUj?=wKaE8yLD$K7IQKN4Ukq^llRzYhs>7Q)W%68s+wc<Pq&
zBpC~Y|K!oTMKAeK-eceM)ZL<o!}72B(%oX98L>x`)Y4M8ta6N|(j$uY-wPuTYR91L
z<KEZi(a6TAWh*N^sHZKI+@{{-vimUe-F=G@cI&@$z;#KkQj{#K3?5S3h3kHB(T}U;
ze3JDkoV`Uqu{6S<DfGddjQAYcvV{2IORd+qxrZR(^jLYce$gMX#l=xHbEDE4KvVT^
zLvP>cO7F|KHi!lT+}aY+$d|k+dbmQbUE6@5(&f~TzbSSN0EK1)FM?JvIv7|*z^KvW
ze-X2uL&cTify3|jYb?RF7PsI=e(Fte6b-dsq9Uwa`vz>%c)%BSB5-N@<G>+I<qkv>
zCZg)C@6zhW)z{^1KAyygcSvBnQnDnmoQokAyWv_HZPv$~+4EyzfSyS4HC&F*2E#7h
z$Yl0zwQgI$MN*69DF(VmNzA&n8H>3oNVz2I78DfOD@Y#NQ*&uHY+GI6GDY14<cQ?5
z<`V5#ms8Q&3GuK?P%L!gth_U>NVMRdMe})FizV(e!hP(N)wJX}S&w1P(2oCDvNS)Y
zLGkWJGi??5)CW##$@geUrY`WDLv40096N@tFiJ&*5ibEz24ReLqcF(Uut?osuOm_?
z(amCzI>_7L{hYb>{o_?WXa_sOG7Sd!E)U19-RSf{hke9q?<4>IEpfp#Jer5{=OIsn
zQTda?EIpL0+sAN=BwnLq=+TrO77y(c2xrz`Zp!#E8^3&y<2l8EC%z+&O*K`=3ndq5
zcYWr_+e@7X|61c}`2c~{?%8jQgqce1)Jl!8qvEO@g*V)e>fA~VtL9hV5j|#w+L?B2
zH4V0-c4(yr+EH06)o4c*6>6E$znaf|SNztYYAYX8CkAWX9jT^W?rr(p+5uX=t`2W-
zdM)gnRR`;66nIme=xP2K2rhR_T1+nhiq@<^>gl@T`s7bxkX83yoG=Yf6;5g;f3A|J
zfE?aRZc@o~`y5hSFPlh0<LbWukg0Gm4(}+sTbXQxL%as2<%RX4SMR@kBb&ceFZLc=
zh5}Nt-azepMVW!tYbwTh->BCWdEKZ->$?U7yI0tpu+;>oPb$1D9)^7-FtglLR{);8
zpG6IEHM~RA(z<(tPfP1fm2sk&oOC%~vQ#VC@G!uV|C6=s0llkXaKrRu^_J2HE>mg3
zTg?<ENoH`z!{YGFN4KD9f~2HABUEoF0>)KzaUw3F6G3t^A`O6h&`1n52P7|)Hq>|j
zU&u}0Lv#o2^sF05FB*tVLaj3%!pl`=yyjGT*pCW5Ke|U8>w2yMQ!^K8LJnnCx$x+{
zV(FghTCs+iYsbF~Sy6)ilw7ZCiwR$1!><sYX2Un`06xivA0|B7hBp%)V8au40{5}u
zg@n7SxcOLZH4!u_;aKf4!mnbrSP78+72xM>_;|vP+wkRt*W2*JgzvK9&4h2U;oh$T
ze_X+FU0`h@5lU<fg@iA$;njqv+3;h8PqN`ouK|y?;Sq!f*zhdEeQfwP!rf(@t}CoP
zLj;YD!L<hXRrl5u2qXNw4X+~nxDDS=c)bm`628lZd+Y+f#fF;*e_X=J|6{e;L@2Q_
zR1?0$hTkPT&4wFa2R_M$rw|@(!^;T|u;Kd&_p#wt!rcj%{6ALf{RRjc8$%-DSJ4+!
z%0MCE=WTd3;m2+GF~aL@xNbM_T{b*|@GUkxi}1&R%l;p$-9&^E8^d+Nm)P*IH-V?w
z@N~i_+3+gDqiy(p!UJr$m2e*$?(r6Icb#BXV`w6R#>TLU@T*u*S5lyc@bfnO3gO3X
zxbGg|^)@`6@Le{%itsHqd_UojYt5}5Scy<#WALa2zQl$n5}szmA0>Q}4R0ho+J=jJ
zfd|-dBjG+aJcV#~vyD(r1dR>fPx#f&wg3`--iG__1Ag3wXAxd+!`BnO%ZAqxzQu-L
zA>919ji7%Ugc2J*mGC7tyqNGb8@`k9NjCfp;n6nSupf9pE8a4o(H&BHz!@DahH9)K
zFtK*c!2(;7HI?)!&{i~C%lM2BMDLmN&*85AhcN`S21qQw;Vy!iSf41GWTg{x))IWs
z@9LD*{5cpuCsS)Q8AQ;h8-0F(?Idd#xINSA00L&Rne}b{(FdY`r?X_?5Z*jX+Rr<D
zh*8l=9`K>)5qS~~uf7XD9{5-j6i*9rJoGL)$}P2YO7_xE_+;sb%Za#pN?Z->*h!9C
zhel$?@4$y*?~tFcpgPm~3ceM$tc|1?t%smswa{qwJWlPGE8?3Vhip;V7wC<@#<j=9
zfxW`X>dZqG8CGjY**LIx^>@@=FXTyJa2^Z>JVIt2w8wl*4AeMm+sfbgNSx_@6<tWA
ziavdd7sB{X<4NB8V{vE)#7bi=<r6;^hf%LyC=_cnvkxWXL^?X442PtP=2;iYRtI9k
zXuqs8;Ic-zAQVV(ZPrCXhskK+(7?LO#?tp&EN;YQaXTk{o1`x>THLJC_X@s8*eQJR
zMDv{4htSIjbr3oV$MB|S-hQt6M0`@e0R32mS6jT=Nhop-s@vNL_D2x5X%$zBN1r^&
zcYh)dqPf!+T%lFe(dy)kk#{FKcsKaZpNOL(P^c>6Zw19)x5VRCwsN2Wq&bIT1`WOP
z*y2fBPcdUyIpJ<l{FR{iyFvBuAF6P}Gu#Ur#gWq+F<3u7*Wy+O&74C)b@(?OsufH)
zx0%&UetQ~V|4@zQP!{bZ!$*S=fwd<R3|WW-(i}qH4#_GUJ17XXw_pX<Pw`(H#R2`{
zCeE@Sstr3s)L{A|ZY5U?=wc=>?B3$J+nq-r#~$YIc*b$jqM6NqI*!ALwL0$hspv)f
z&#=`NQ8=mN#!s>1*_}`NR2=Q}`4{NVcy7ndte=Xp<}#FYi?L#vXf2j>RxL`+vC;uf
zrx2<`Q<C2~{8GH|Hho52E9f!3A`+ulmkQiKE1>*hAHWfD)V2IebLTujyvK-_KK~Q%
zv8+?5r0FdoRMrFx6?B$tjC%n?o2DdB--7hbJ0T9gKNDeU!8XzkEk!yUU`fuJ&=e<R
z6(eP=uVJi>`E-;HBnsV<HXg|`lje<qmk!WT__4pF)GZ6#nuRV>a$PwgZquCNkDtV0
z&{MqWq&WQnm{z!@;#+#up&}%mH0SR%FtShm#plSnMPjf>rZ<sMI*d?h!MpURD05Oj
zwDkN>?U?x!r^NVilG9EyAA%^mc;k@1a0Q-Vk_`2dJ=`kn*tms4(*JB}({Hi`#9w%h
zXcq9|g+H<Hc(Niz%2e9)h3tgPi;T1J;t`5YvZ3VUO?vURSSZxdipD*1ES`Azqo>87
zBt*636JM0go5%Z0CO1FpKU(rs{>s6;rCEv<vUg>>7RdzJ9#r=}3jIiS7!KmTm_wte
zZfHNlEx0Iu$QCMokao_ZP$%y=M1fodBPrYDvMd*6nl3723mvdf^_<sfim(TLJ$3Z$
z?MmMeC;E;S@y&eH(<mu!21)5HND8})xMV&$;MS>lGt^<%fo}RI^MzprBJ3@x;&Xba
zSjKzKkMOnUFfG%-vZM^x2wTYTIRh}vW#LO9Z(!b%DFz$NSJ5pLXDq4{8jAgZQ})X^
zi3WsmJiBEEp}q-at4<+gZQqJwOJ^~v-aphbzyrzBGQdmv3ewkG`s$>wtMqk}zM}Nq
zD1Gy!Z=&>FE`8Ta-z4cfRr=15zS${~k}7?xrEj|Q&62*^(zi<b7D``}^bM1~+obQK
z(sz~gEtbAz(zjgt2IGsWHmP*9?iAO4F6KsKDF>Gh;ZUHH_4s>tTC7MFTII7G#YGqg
zt*?S4cgfT*%%)>2j~6ZMI8JlQpTXVFie7`FP!RrVRmXBW$@<fKclgA!V$W_h^m;2z
z*eI(v5<Y>iIV<+{kT&<^iCA;R*#}FWYlEh|AKwKpv}p(#EijVYc<R(0UVK*U)y-+I
zWC1r8<~dmsU16s|b7mOt^o2O8Yr=kY`bM!;bc)aXLY(EM^GE5n_Cv=cOXtt)z7Tsl
z=>7S*FT?<ETCIiOdubsU?pgA57K}y7)v5k`@HzE#R-zLYZS%lWS#$+!h0;pmSh|(Q
zy>h~JOQKG(?_tUFvLt#-_RIbG+H+XYD-Yu}=fr6J_+d0t+eGq8c?%IQVph_8DeZA;
zyw2Uf#1rniM|tFzV&BeExZ*K;io+)tllY=9ML+lFJ@3kyBjwlLsl)hokm;3`)3D-z
zmt}5#DGql?{h0fHg@=OH596s{;hAoay?o_Yxc1vRjPLqN9Of>q+RCz;l2$u__x)Pz
z<$Pu?h0l6r_>*;;`+D8R)Vo>)U_qXWRCb$m*L{RY?6Z5joNxJB^p&1lUvi7Kpzsr4
ziviRvv6el<U7Eyk-OH!lZL!=!dn%u<o7o*LN(eTuENT)B4#T?h$D71%#s%1-AbC1H
z*?vC>_L5W-r@~9z$g*_CUdi92TchC(za|dtcy{XD77E$>*Tg<fPjy36dHnK$CtIHG
zuCMy|51;3=K7$RF6>hNd!Vj1`_;SVFmP;?dd2;0ZUB|Ax^N*qvdW?M?m=}6`#vjGr
zKJWf;k36xRmRx;O3YH%BOp;qo*EJq)VL&axw;SSai~4l_&mVDUw~<r2*2(#P4CW|9
zyOm4KY2ORBRY=eOVx!?vGNo++Pac#em9a$I<M2J(wSd!-u%h246k<tBu^yH%yN6a4
zOa9vFb(SVvuw+=MgAm`Tix;J6h5aCoG)tM7QW5P+6Q9z-y2a>kRV)xKqCt8dV44Ok
zd>k%~J6&&eEdBP@;3K8K;gZ^4EX~KQBSk}nXwa6%p-HdkVL6T^=0bxno(;KiP>VK2
zbF^>(wzsp?u8^#sOAB_`@%(;brZ(LfFVh~y+Xp=FqS(oN8{I0L|8WG|=Y$hL<Ga#V
z?5a#f7UIc-JWRGO*ZPi5BDZiczoj80Ek7ft<m%$w^c?uANBB)8H!>FI7L@#)mY<tm
z0$Rp{E3!*&7G)IV(HyensOA&*)7ou~ZrYv4yTaTwFFj)^=I_nH0k;CK!jUk`LB!bz
zW}SB12kzQ!_3k)Lhy#c@KVt>;(@gEW=1VkBD4%`P?uk2b3p*uETHmk1QiqL{g?QNE
z-Zic6Oh`dS;R;K=Bj&WaPBrMY+m67+Te^UwmiGcqgQ~M!v)qJ<(J|W)W`^zaT~iFf
z+HDP<(0`=e)=cWB6-ar++XMQa0Ea9m5CkM!4$cZ>TamO!v`5}EK)nL`_kfe2Ujlrf
zo&Fw@`a`X6qt^FKruHN(6?__m&j};8Ih=)+Mj*{Pe13K_gM@cvk`HBSrz5g?@At`s
zML?^~;be2Dy-kF#;Ai*$(c+(Z*~X&z|9vl8<CoVImuW`Y$T37po&T#?<~9C^WJS{C
z9foENvLWv<_D!!j4X6*O5BS(}$%hJ3;x%oqh{^6u?PtvxT=jkzvmCfDKC?=5yR<>)
z^F0}Nl?@B8Tr+F;->_IUr+t1bjtCM~tU#7KS#A#g#ByrzM*%-s-t%cFZPDcyRl5EH
zS8$Y|+4B9(&wYNXjO%m@MHQz+#Gvvxg8{WAvEJIFc$LA>Qck2%Sg3voHZc3|3ODf>
zl^H>^T1xJ=C^ZS;0L2VLze_<_G(fq)BP*XZUeoUX`4XMl$*dw*E5|kaT!Pc(V%PGx
zPP%~iM}A*98B51$Oc26dyDn+26i-pma2pANe)H_$dZ>P-^|w%)TrZtPH_dXKB87VF
zYWb)#rum52wZ-Qs!sUG=&QWJ>p~HWu@tVuen-WGgYscVCMyCSYI#qg4q$ga1*FwMu
zmqSWuJl<FP$VWiyzjfR@VC)kHOS9z{%juiv2cJ6rgXWaw=Xb!;QvZX)1nq&3ZXQ4J
zV}fdFBP><=Nl94xTeJ3&a^R)!X)D+0%%%Tnwp`ZS(LPiJTFITOv;bDR0D43tqH+o%
ztSs1AjT>mC1`AbWSZ}#jncPx(zPa?9Ti|rHK#Dd)N)A3$de6BsZm>=pb9Q<bO&^d%
zNwNmwkT^{Mhz4?EKLiO9*UOS(Hq1ck&?1d2>1d<(FS2AKSq3S0!zRf}ejynL@35*t
za*whM0ueR&v$~s&@W=y>E{AZ;O^3L9PrI|et9IK#H;6gkfJ*_lA<X?M{0!*YO~u15
z$N<PgGfBCl*p&iNquqAYJpgCnbLuRp{qyRzzHTIPZP!)Ml71%c8HL;`(kl-(A`D5o
z(mGvfJq6>_5^RFRgu|tqpCZF`@W=z@=~GBb2=J?#59%*C4nAFSQxd*~5PEyeOK(~5
zR8P+7ph80-r035iHze_S&GNG&-frodO#<{b1n5m&z*)=bfS*7$AVP^S@pddU_`&XF
zq=nIP54!(AYPxnsI|O}-!KmFf)sW~3`;tTj4LtKmUc){l<!yu=H|HJsjKnAcG4C$m
zKQOohIH#Td8S492THgy=U&z;!5S#@kNv545F$$@hdx7L2VqI|E4HU@V<WrEMCm<NU
zASnuCn?;f_r$~ynS|llY-JRs`U)%h@?qwSvA%A}#*uUqc8o|7u;}DgTatx7B*M1*M
zo0oYPNQxq9@=lW!{S@tA-f2mU29O}V5b(3*N0gdGpVK5XAfr42QLJv`X2SlK6PE7}
zkT8WP{ju~tozH19Mp((X@QUS><t)lti{_@!PsI`8!iso2;*(gptl8(s`pZ4ay~E2>
z0(JDRkL5>{5~up_9B+PIImO)Ka~8y4NTDgWAcm%nz6H~;32T4QuI&z~c)2q&8n;Az
z_A}hRcli~nwWzESurmX<u@VNshKuget`mKzw}AqVhjy@%rNhhPmKjckNg(Me#g8!C
zE0i`h4?b9tue>Ob9N)Ul<?>K#$8mRCDr0q%ahJ_$tM-Z{F>vqAT8En$D&bKl@@^=W
zsuP{m+p@5D*#(yPt4(<5ZgV9+-h^|>RhRkICehpR-9z`d?!0)PgL@^PeI7ezZhy}o
zIWNv}{O;gAZaptXXm0WW7sQFQ?L$2vNz-4OfKOAmpgeX#9N^Gg#^1akhIgDAgD(8h
z%lyU#(WqI+2Yn-sj9pGID-{nuJF;<E;@TeyyWkZk?Q55$=71)Myrdh+FiC_I@}PA-
z%h_p3)(1CIhnA8_)D-sNTfV_k>x_TE@s>-7DpmrKVy+f+F<lK=68$@(tH@a(rB|@s
zLfQ_89rz;cz^_e){rhowmDI1Lb1dG-8!t;!B?Jlf<#x5y@7pv1QBBSwWs0@pGVacz
zO#qFS3zdatFu7QcH+1lxjm=N4_+)LuCn<}x$=11GRt7-w=*O$Fq@2Y2$9OV;ZmDk8
z);vZ8?b>kk?d`TbtW5wOP^W$CF$;{#-bXaFYwrgQZxB`Zy@ND!llDJQI$nAYpNd&d
zkmXXZTsozLJui5-$#UlA1xtgrxCk~&TF|cIb(jUvqwM!<-BW;D+V013IBH`OVP<)6
z?H86aMQ)ex3#dDQW(&uh3r&?c0d>}1s0&9lcy!Y2I<DyE$TLfQ>c4TQjCepU2Giwo
zFdiiWZoyUBc1-zW@p~9qBqA=rTyY{<XCLEN;1%wTTxBq#p7=eip-m)fDP}RQm98dB
zN~K^~RVf~ct8~&-##Lem{KI8f8^WjsyF0N-6|P!7v-)CWV7YDQY}r2a0buZ&WDtza
zBX%iTwu=l=3(*~-#bf(h0GzUsnO^uLS+9NH(lQAG26J3~m<ypeTzU|_2FquW)){b@
zyuM9aNTNVI@-XF?MtX})+Wv)C>ZKitbH2k_JW5Xxs&Y~6CVa;yJ?}U`ulwYWN0@6+
znWa(Tw^uR3oRIa`Bh0*?#XfrM)M+!c`{My7g8YADfa!?T!<Z2ROv~$ke}Jjf!5K?1
zqKy_wx}h5OItJ8Q@YFr3F1D#6bUE_pN^?c#1k4q6slX0k^bo1jV%r0ZY?HP`oR>Bo
zU=#4HCuKQ7yQzAhq+x5lx(oP_EEsNGlw>2la_1ydz6C|DshAhROciZ6TQ41Zu|7)5
zlZQ5YcXIhwWje-(xrjX+Qa|C#Z;3;(zk1s(aT?~`Z{HHfc~KF;2H)opHIz<2xpamY
zbUfu((Z}(6OB}~_M8UqO9(3g$wiDq!s3ynK3nFd=hpC{U%fP4Uu&o}W`I-&<+^^z5
zhglc7cpDdG=(yi)+_QF)kHPG~0L&#=I>gYtmzyv2S<Sd<BTK;TLCMy$(w-hYrp@_R
zUy0sBi&scejFc(XsMhF8C)6R({OHyOTC}1GjOT9S#;TM2I21ZU^ZPrVYG@;de8*F(
z7}=)>%{u&HKKzd8=ZZyx<`#!Fc~Sv>@D5%xO@sKsX_UffdhXu1nkF<(x~}G1?uhzX
z7f>~*RLX9+pU0VyPSTTZCym(5i-`_M5GWV%#moox2xF3)?kR1?%*Pe%OO`I_X(AfU
zeEhaUEtsXR@LqSt-rVVi=w{YFMB>Eq3DOpq9#r(L6njZy2Mil-YbvL@<97JEN>Lg*
zNOXGC(5La{w|RwfYxMzIs{{x`52>}9t;0ptxCO>Cy9ske3_2Y1n5|r*IVH*3<CI(q
zS6|c=_C|TIMBqX95wwsYNvjFXa>2XyHHu<9U9M?~Z^qQ7O#PCmD$)pqn|=|;BJ<b%
zf~&x=llK=f*xPO*Nt6zLA$Ewu>_fQEi(f{x>G}nFm!*STI%4GF;UN`|AoRH@F#P-~
z$L>7ruGq8xYxi*5-4(HDW`!1~F-CsAw7&(n$}MxkrJ));C_Kp;@g*<1i%G&;5AqFn
z#mP*nFnri=V$UA9=tkPqj%7|H@dTyxQ(3~vvhKdSL4C(=t`AEH@y&&<%`L*al(S}B
zFdHDvzvbK$yH9QtvCM|z5U^<MHdj;Ovz{-J_Q1`;%RWGrvn_ZejHZ80)Z+uqgA}O*
zes)hBG{L$bk+w8gPG6eaqR3+TB=u_CDcRJZY&^ew4o8o|!9W*V(Gytbu$qFJ+T7wq
zQ{GM1<obIps8y?ON+&CJ+{8X@9slX3=-CrBAN6go2S;bX0I##cptElM68V?YBK8bx
zM1IJPwA!<AwWenMhK%q!q{zkH*q{fwIE2C<?G(2e_Mh3yQzznTu01WH)|{#yA84D>
zcxk`@*RjD9i$?T<3*A$zo`#clTCV*F6uX9TEj<ygoP$FhR(4db{Q}eqPuc*w_S3>K
zmeZ1)ooES>wuFv0Y8szPVDEP!UvA^PLLj(tfAMo+ShCWv&>_e<Wjp9y<Vvj`vA|QR
z4fgv&=_n$VixLf6>iXuJNNf9PQ)lg3x(b9CY%`}Ge7pm5?)Vutkdr}*1M30lM02Hl
zodfISSXUp%t9}%Fm}f|Jt8&7A>*EkMZK7XB(-o)(2)T7P4wu=bM42y)tWlUZmd<|J
z5~FMY*^xG<+U+il-;csjPH#T%&$1$al-;G~FK~cQ*<NZ{-DLSp?kr#<`s$`j0qAG!
zoeJiCo>VN(P`3W`1q$P|Gu8%#1{a@F|KTe9Q@5c0hy13C+xGv_<nJb&vx7?zfwd5U
zyXDE>?r1NFNHXxkR#gUOZR1BA8Qrn=y(4?eeCs_XBp+cy7@!}(6>t%>9{~=~)9>iJ
zOgIDB2B2TuQ6?O0ko7wib(_L_9cnkw`T>l9Fu+7W3Sc2%J<QiYt%Zu^R<qC(j`;$@
z02g3T2>29+4*}?BA{;=!eM$gQ4>3XiJ`>hKtp?Np4g*dDegp)=tjl30^Z^6|;s8?t
zIe;~QO@RG?#=~aB7Mkk-5i#xp@B<_QrUJ47#Q+yLn0Jr~a{%K3Mu0cK1#q_>o&p*H
z2LZ1F)&rITasV>`aeyHJ4}b%psSf;r7tHvq2b2MH2>C*&DS(N97=RIA03^XI34v%v
zD&2!V2YUMDLw_0pJPOzVpx;2yVgMf?a905500QvcP`3j%0LlRS;O=m;Fzjp`DbjEF
zNt=EZgv%g1y!yS^$9+6?m)8ID;IHA2Bu#(p+P;ab^D3U?#8Mqv1isaYJ&P_l{ea59
z;&#6tlQ(y%e`A=}mK7yp_e1k~AIhv45z~C)*v41y-dh~(c9Cu*psNY!@&USf;9UQU
z7w`M+*&{ozc_f<VPhT<eWJ`~z<^ztF;b+d@FnsgPqmK>jm1}zIl80%2)W%i&Ld-`e
z9~*TlEnlDa<C8uW=J0;zm3_wr@DF~<7XLHd*ihc{2wM{~?ZwN7`rIA<L32>$tN%XU
z{oG^zE2|$Xxf`(XY}QZn=5%^~Ve>b&>joWj-|*T;553*Ieslc7=X?GzIOw{A`_3q5
z3wkH``Q4i&#qiX<n8Sr1zyEyQQP1Hc6Vfz;c%BQ(<4G<|&sROioOqZE^O``{CD6SI
zbSDDch(L`LfgtE1Gf~PtOak?IL_q47u|%SS6%wt<(?qEBBRh3`bSE}_oB%RyqaZ6a
zFGLH))zLytVzgj-Hd;vC7A-Vxjuz@(j24=<MhgY`^HUb5Ey(fDFAy3%;|1Eq?gyY2
zvC)%%)rs{q8x1kQWG~6hs;wr0Xm`O+?h4u%p}MC@(kJ=0<!#yybNtjO=(d>zqJ?#n
z?bcCP?Cjb{moBCRZf><K#UI2%ST^Ar<fhKCLd~K$K@UB7Y(&H<;8Mi9nS`W=qJ?Tw
z%cBKdcaxwiMglzCHbBOg+Tx7}Akoe!0j$|P7Aa;ILi^Yhw@aC%=S%|8Ji5!V!$hr6
zW3$Vn+?c0BQg@#0#wI#!?#^FuV}TC)yYsVdY)E7?EE(W>bau8rb3t}Sfj&JWJEJfo
z9W-yRcmZ2Fg*c)t$azqorcYmxpE18MH-AOAUJ$~(cuZ%O;8G4gYVgM|;ZJmCq1`?P
zPDwvGBPVS!>=AF17yqg=^PlX|LpIAPT09p{6_A+$G;GZhrsbulN&Xb&EXXM+OjClS
z4}-ZE%+qt{77<GZEX@FoiVggnqh*0Zih=h9ZuAcb^bZh(?Z7(#ADfettCt+k$k#7L
ztKWm~)3SaJjXn5RTGq$8F*9D60KT)F>DZ{isGjKj0gcXouxN2cPGNk0es2Dh!nAw}
z7rf1YIR$k*Mub#T;C;T1g~pbHJ`8yE;b_4XDiwyLp{6!?)$=G6pw)qwN^mL)PBn1S
zqag9_?ku3=T^K?N^2<6lfCcx87ku~xclMJ@Dzum3D5^(77dEg<x_7)(>Xt(#&p=-T
zy2~cuSRf|+)h?{tyr^~Z1|pEK1+DF`3B2~d$r<x=^V19T#^s>)mLnQlB->ZrQLF0}
z4W2v$8~hpAl?C)4Hf(7|e!+s=9J>Uk^cM2q5EYK7b^PhBtY^<E;8dtohwi~4J@7NV
z`NuFft8|d1-!br0ie>?@#?Wf7z4^akMrTTV``9A<SNt!7mvV4MTYmGOdazruP~O(U
zpYp$>@c&ta-iJB0kZ0PshX(7<EPVMtIM@M6LJs=&{d*}uhh?P{u;-@+^Ung%OR-RH
zZ{aWay%ql2zsVm6elvy0`Zq0%Ry^?1+hR=i|11I%!B1r(@z41w{@9eG6gryIBn!*!
zEc{iWnxh10``_fBtMH#`<%j=&<pFK?qZm5**kb%w{0-nI@epRm57M8e(1$#&JL}rB
zW`{{=1gN4+*a^`^@CtvdJL~3G4Ckm4LqzA!Pod^KKW*9Er5W?lqHls3wTD9yPU7KB
z-I<534pbZw5x$4--HGbz#k`CcK_zK56I7DsHuo|Y7s4&qe(_Sjqa1FLwBg0M%)`?U
zR2;Sto(0hLqmtXa(u)OoE>(<Dp_0RQOOZ}o(~EiX@4Z+j{+k!;<#_;xWN$pc86e?&
zSP%9hKi7lBIj`>@FAM^GDgUh}^Y&PfQ&gaj)EhxjO_q^KuhDtgvWZG2xk)up#ScPH
z9;o;o=t&kzIN#Ni#WGp@E3{^nYXvy$U7-W>_PA?1+^rp+58R;o0(BYi>2`P-@K8HE
z6F5Q@*c#07AoR0i&;qv)00|Dlg*`v?VqF;}TA#QF^A{8pQHM^b9TG1Lgz0Jk4JcLo
zCFseTijxGk$9D+4Pe0a|TYOmeu`1JR?U-EPH<c>Y+ytDGSjAsy$G?+ust0%I$GR|y
zhxh2mhAY|${a8?{YBNYFuPTnM-fdjYZijyZe4?GtKLH<ShaXdLZtcgsS(RVB(2G0w
zXG0b3$o_1UqFn*1L-;WMLVp&(zwXaGoz2)uM@jcJ{|#&|+konU9v;SH3@ltz%qtCS
zM3;Wp^hdq&K&Vuw#`^Qq2G(z!O3zlzS3#vT8mp+#w$|*%TPDGD$0Sq%^z{3Oi=T`B
zA9{a({c2wqK5hUD)O`wjRCh-qMwDTE*8mpE>jp5FV00KVr23Egnu5(sQ~;(9m)T!{
zpHvQ1{59Y`$+~VJ^XgF!F6z`-0DS-|{ydK!$bx#+!FUMBtsWE<<|`iXX9uz#6FVB^
zNarC$Bn<3vUpst0dV!Rbs`=yX@Fygkvq5aAKiHPSS&}qmP)Tr>L!~s{2o*(5n75)Z
zL%$#=J!83^Ck<l3{e}H7A=%Xcm7@CtRO<cy0u^q<CVycN>l3f?83JU{q`G)rNv`YQ
z^#kM-9DK82aY1Xu3l}WTpk!SHdphp!%LeHmg_cCDM1mTLG@znKuYpk@d8#kddmaT>
zZ(x+>RNp0h&r`l^H{+B1S%3Ym5puDjQcOvv;<KP9;mJ4oGcR@>T;2Fyf40maCyWOU
zXW>Jt!ejxw6>2{)=BMR6n4!<eNmo+lB<PfATf_K<;cSS@b>QTn%g8++3};U}Iy@V}
zGlQ7kY*gD0wd@FoBjkLa3U&&U`lDzGI+IX+C#H2|RtJ4!RJ5=gMwC}cV=(eUXS%u@
z`0Ri>*aQXHxetbiClnQA=;QJ+{0wJ$Gy<dfSNE|fZD?k|i1fg~dGpc&LX5@$?l&HV
zG;4IcFc&UwM9<O(Y69-2N=U=VggXT@6V3FV2Zsr&)X+d}nkbi_CcY$?b&ZXSlnaN+
z!_*pVWrW#^s{_m#;QfOECT|F4MO~hSA+=exP^rOxJCaWfVLhGKD;`YYOF~%xo^erf
z!#oYDi(Rm8_2#dJF#mDopi^yYZ@#@x+x~<!bi+8S5&Tq`+w<S*!v}`4A#=B9#0yJd
z{yOr9s;i3AHCrQro6beI##4ANS{R;RR8Tm7_{hxpq4R=+0s=#WLq}!=g@uG=1ZHN0
zh0agQoEMyF%uEk4hK7ZOj^y{pumR@rCR~*X$DUL?QE|EgjyzHE)OP0d+QEqb=YcS%
zWG|SPpO(KO#nwHUm%BVe5_Uo}0!MZ483;#`LwWhO7@L-03Se=(kOum21cn5QS5~}`
z1C=hc8A|*QVhIas6L3mF6~6#nN<oj=wtkqd5ktjKq6Pg4Ost?tsr|E5;KIkCLH%!&
z_@_`d*nBKHUYG&jR|0$h?eopP{8D+X&5akvg6}LO9Q8GdKeCN`Q$NKl4+3g}s@o7P
zRZXg%M(B$HR27>^T?ccHaqyGTW})U^Ap8w@a0xaj!?73PB8eCke@?+o>!YP+g*+^d
zixqT<u|m@5SY%VIP<>ylV7xz8sGAI0a;(raGgio(9gA+KIaa7jj}=T=U|a+u91)(1
z7OHY%g~pL!4u!=6@PMWcgyFvQLpBNer;#NJC}c?vHz7hQP$zjFddrIz<U*RqkWQbK
zk(Q2WiTU}wG@9Kvp)6LG9Z7J5DyfQ3g5F?<Q*oh8Qq9*vPen(?E1=i&fH2nGAtH{C
z3u8SUX2kK#Fg7o|Fisv#7ejRc+d2i`0F@fCEeie$R4T1+EA%6AdmKhGlLjJhPw#qB
zoktir^7@D0=->WIuh9tO6ZYhfW)9+>m~ggS<1iwDzcY$W52JXa?Z)&;0kvWy$IA{=
zlT3XI6(?ER%MKsR&yQgJ&Atod+ChC(sx2yB2Ysj=zPBAtPe|GGCjh6$S+ze7IJJu^
zKA{~xMaE-W8Is#EqyRU;f%X+83G+#Lpbv(SrZ^^L^3eNOWP17pX<i2uxvi4Q=c1T4
z6GYA1(QX~KRV3X@CV^->VOMIyF!R_1ob>IdJo8Wi`Rwrw_ek9WI~5=MI{RmBjvmd`
zAGJB}j%NcLQYP|m$FqT~98A5r&j!|&drV+Pho*@<VFF9&>vO-{1yd)(q{!ieq@lK&
z|9b)(;64LPKETz6@ezJ}0t@Q09%SkrJq?u#+V=Z-w~4Hu%NgJvz^~lTV<xgthn`7%
z<wUl!OG%R4Bi;a&`nq>Zd58O1ABUq!eBk}CX9b<?-A&???`O#_@snh}^^>G&C4TIF
z=4w{MAO#T2tH4B=GzS3jEgS}}no%SBXZ(-BjLfh9O@1!(n+3z<zvsaliU(8wCjSBO
zQ;913OMc8Ps4+gISlIoS7Hs?tN`Nl@P5w_5_dTZABJ9u~#6L^YFJLB(EyOT}BMh+C
z4;0EA`cdZ008MRnXe81XH2Y@9zHPLp+qaEv=yuIiyEaq*KlV%h8H;|&QG|$Ob8nOx
z5;iLSF!bSe_!{V=?eHtm+w*sXeG*QpeP`e_|6q^bXNS{(ALiy(1|rxqbOmm*v#=d{
zdk<+)J<QJhF!c5TI0D>00EAO(uLg)p!x-w-sDuyOSs>ir!ZFDLIzj(^_pcZCk7q7@
z$4`qFrot5?KoV|kJC^*l1lBvY4ouXD3;<A(IS2fI<7Kcsl5K`{YKzN}oRnPjqgqB_
z@{f_0u^ud1K+T$vn#^xcX2HBEfqB4uYcju)zy>-TP3C>Zp#23NK88iQ1Wu0^I>I{e
zhsLnbE?cp~lf>3CK!8j?JB9@gQ|YTfqoz^CQH7;~ui{0(J^A27Od!C?<V1MsJA<!D
zWIbD*ezw&Le;MX6t7gbTF9EAPnDN&y%U^&YZ3ZoLgzLe(Nim<CF)s}xCCNb6ON${C
z^e$uB5iX8n{dmh*#`u}BY!DwfjwP6j2gSez+rnGjz!-sOhFNk8)(CwQz`g||ek8D<
zQx@@5ycv8%OI7R|p*I2S?b6VMazj5@@^^mgSR)mTMBJoU&V#-fpjz(Wpy?<&L*O_$
z{%;CMX7+*tnxFgz&XWZA5fBSd@q>ua5Ig)ZaO%weZ~QVZOIwtYFBP)%2jqcJ3Y?<)
ztl}hWXt1o}RFY_JMaB0+Z_mHA9Zr*GSafRT|CeGeb#9V@P#V+lZ3@Qtaw$N5DFYi{
z#LWlB)d4X=u)<q4GDc{QLVhWDqX|77m{aYQ+zN`}eG6DO{?R1XKdme!9xvl!y>Qx;
zsdFccoj7;O)acmzK)_GU;ifvQwtf&T7y*=t>JOd^b)F`yHO^nEhK$U}7lLB+u{8Yr
zeJtX4BmAoMtUG^p3Uf2-XU7W*!2CLZdX*}^6MAPrURutA`E%3e<>nVk6BZZ`O8K!9
z_PW8Gnj&hv{>$uD$CW&2D(m5JayFkhmGuhPVS-EYk0Pi4O0H5wA-rj)jFX-qwTM4G
zl_hjGfv*^l`gM%ZZ5jV@DvLCqoD(njgJ(3L6F|kOyx8LuXL~#oI7uCqKNosx4^*5w
zxHPk*;`z|~w8Imrfl?VDAf@hhIDA%V)GFFLvKu%xLaO<j(Azt@4mh<bs(A(Ul<@XA
z6=JG~G7Y71GY~3Te!h_r15K)dAUs4gfNHr6dTKRJ&f#;CS$My=RCyXI5HuR5s5p5b
z<9uH-o7l>CAL!JLRrzK?Pc<?wl@FQDdbaZQL6%YNRQUpcQwaiJ=5)5E-}tn6Nl>hX
zO2yX#wI9?SP~By|4l~%q7}Y*)P^3gq@jec6^Qhwefs=g|Hvp%2!oLkO*ir|moo6zC
zQX^-wFz?}N(H4fxkC$Y|JaAK+I%Gb7VkVpA0QJY2Xt@eewpIYv0;&N2p2I_Dv4!TF
z2<a6-GlhI!yl@?AU#LXu1hoU8r-I)FO$WULpc`PILMPr|0dBxOmSHhQp|^n675V`H
z`+<_(z{xBnn>uo8O8?`L)BOnv)1xO(96K@L{@BT5r^Zj7e1BYg%$TW@W8(#HOldhH
z!h@hv77SI?zKYskQHLvPkfP?6(Ut%dkj&it#c74oMh2<zRA+pSlVboCr(V_2KNd|%
zv)Mo%nZjI#s}pKVk<rwmsQ7Z=BY?LXfAXj)Ec|zpt}%u6P0UKm$;rru+){_AZ@>xa
z*8G=Ji~lp7`AksvP3-9)7j%1^YN`5zA2b&H-Mp=u2w%Z?_+KQ##JNZWbxw@t%&2;+
z_`j7H{M|(8<85n8)c|C{JvmqS$`m%{kJ8T9VS5(8{YQq#Cu8dz#d*agbxy$woYGhI
ziKHyG%Bpz_^d#_9T!Yw<l(okxDOKD7=40&e4l=*Fm4OKM7HC{yZ{dAdrl_h8HbPGU
zY?pk}6ee{_sr2joF&%~}O`U@4ePvuVuNjKDGh%2Z3~P%wDh{aTNkiM3HxFrxSGB{N
z+j-dR*Op&zRtS`|PJpDrGJ}d&wKK0#%&9Lzu_{(PP;q^`0Mrd?>tPZiD7eN-4J4(I
zW1fHPA6L7Y`B>tpUKB4p2)17Vl)LQ{`%mOp8!_gKgFe*hscAO>G&VP3aUtAHHN>`d
zl<J_*%Uw{Ao0E~Q&(7tS)3K=7l*+tE{hj%slkn+}=7auFtQ4oQh&lH2-BsO?G~F>*
zs*M$jb(l*9q`G4c6=3RuZF2y9SInaV1P|~41W$w)Ai!=O>{i3B4)&6~z&nuloX7f^
z)vjg}3N*E{_GzdCzdcUfRH7Mj<TPtWnpF>k-^!$!J@22{O;zj)a0hmsRLlI(JT}_A
z38teEiut)kIh6YJa|KXgNWzj7Ei(;ED_D^;AHBESc;OcKU0{a5OJ;KwGc{I3r=JIS
ziLVK5bQh?9BA3m7wpgNeC)+Pmq+om}jUP<#;C?t<1)y%B{cK3}dL;Lg$O5Q;;<4gy
zm*1_@r0_E<nRgF$awemrJaMDqpYxY8*l>44p1i9<C4a#$Ww4=P=^*$2^Vt4rWO?2r
z*wUJv$($Be!HH>bf_jr~0Q!+6pbXImp(p{00abt+Koh`-DSdTs+XJ&96PL&nRoif6
zlQKkA2P<?xy|mfyt4ucWcTL2o2U%~kx)4FRM}eq>Llgj&ej9XW;MAXiwv~QQp{sn3
zjxwK$JGH~z+TrdpZf<q3TRVoH?eISB@P6&^f$i`i?Qs8gc%Xy_+hP>jjv>4q9@&cX
zby=*>JT)6M)WF&OTIo(wj<lMnS)-wOGP_?Zoi@za{dTO~<FbHt)`ZL`l;@o1Kt&l9
zGN4kHV4J5@UY086s}#J9@IUUGY+T3;4u=c*I}6zyb6k<^-hEK1+)aT>!@(JfIvXnD
zjG>xbB+?Z%3o5!#LJm|4$1<oCt~F4}ore|mFv772cn`#jhW_+Z%QxozsdsK8&_Fr$
z3CKi1O(H+Chz%Ll_)=`Egu+F|f<110ITm{t;)JP7(U0E&JAgU>>9NSbhi0<?^WSMY
z>fpd1G#zc$Dea|<@8G|dGj?L8gR&a@TQ=+8uNx{5NwM=tV(L`b<31A3V-_=i-@m=a
zym2w}Ht&L~iLiYZK*D$Nf^_Wp%Ff7v-gUX0KgNK-px}_u5n&_K=FLyf$gF9wHM{CA
zd9X{RwZ<FCyu;MmZ)*Ax&7d7#Jv5G3)qE6%yt>#uV{({A^SDurAi+UU{LcR*jqOrN
zPNWo`;>En3t5(R%($DhExh(YWC&ryz*4yN<GG5vo7mnu0fMERXj8cPeraSX?$Xm&m
z=CMdq9$dQ*uGAsJNHYG{uI+?t&aRNB<6(O!@3Djho2TZlNXXA!JXYDFO*0y5tykrM
zs@iX4%-b0!)DgTACsZG`)r!W#IH9>HPN-ShmR<**;`h;He1M*S9e?NIe9T7`zyd5{
zy5;r~HmkRBl^oH6!gP6G3r!IsU}d1Y@fG>(zG*Ic^@j!Ev}`?gv#05^(hBtRGBR?o
z^&Tswxht^wejBVj2&<}7g<1JnD^8hTl#dHk6lXnF%UeQz;5`ahZ#SFM@PdaHu$XqF
z<pnIN9cfPi^X;OB$VD*0#h>6SZ!Tb7QDJN3B{UHU+Y{9PGT-=^LN<7CDjb;s%Wpui
zk&KI;KR=_OK%S{nJ)lXDVBQ;k@?C{2%IPBPOakwQA~xQAnmJw`=tA`b@nt@{h>dVI
zDQE}2xrp`EtLc=Hvs6m+yD+An;scPoK~VXXBG!{fEM+n7$;I-5WOtB5q1W@rmttje
z=TheDwh1^*kI;_C!F$}6v1Uyt=~Tpug2If&`aQobXF-}CttIVhsk~~gZvNp(E1Aat
zFH8i`91*?lL#m2XLrDTl!ntK7>+hMOu*!1>s!{z)OiVVxDd%dK)3gtEF@oLaFi@J8
zqoC7|`Vmc_scdI?^gq~Kcc-;DVhtmeoWXbfgL#_OG|EdW%#sV{!(h~caRj1Evtj=J
zDgG+$Q#kGenu`AloOo3H4saU1syOvi2HD{r?eH~b5C+>Z5Kf~})q(ZEhuh(gw!@!p
z$A7S$`P=RA8ik))So-l}tC+`Z)i-|#BkC`zcqnjMSE8RPeQREW%m%0lM_u}q+?@He
z9q-t~^1{tC;HODK3Fm36S$7}fd+1&Q=%+fBlml@AklEI*#+dA#)vOPj^9a`J`T5n@
zx~%%5?)TdbBP|bD!}@lu-bC*d%dRy--#9pq&tJn*J?CXSxFBb4K^7*a=gv!;zo;-j
zZGHydzXoOf=QXU~kcx7-C_V#~(qWsTMik{N%E?`p6A2piD0Zynk!A>ti!i6^;*EOH
zlUJHq><mc@(k7G<s=z8f6!}jxt0_hQSY2+BJ2(|k!Pd$%8a$(c|Mc#GRvNvJ*$*_n
zzZlzM@obmSgMV4fhWEe`bE$%BaAJk3F2ac8LmBCj{P7ajz4u^{snZjn7?+{!!YO$_
z4i70|Q|6??Xd+1V0zV1Do_=b7$@o%Ryc#cF)&X>&>j9M1G%G+ER}8!fkh%kAYk2rW
zY)BXH3R&pdyyr_FV&PquBRDh&ROv|-{NO_@)M*p=hk?#_l`?N`C}p~dCqbf`^dORo
zCLJin=%)$+{V;tiP5-EzvZ{=>Q_~9dG)&<Sm16Y`t`8bq1ZJv|KLe<tRdJdtq_VE!
zE4ZeN^&hFC1u(W}-wE8;j(s<9y&Yb^XLcD&)ws|CVu2(W`GK|UJ)T$2yv%9&@;;xW
zf6C{vNcNNCDxM8}4?BD%^b|JL{NZ-yPXMP0a@CwePZCkZr?fS9mgWbEK?)8Z{|L?=
zG$SmO;Clh&w`^4P2y=4xtCIJ~E`_k@52GPmUx2d$#~;Dgli5|=rJN;r9R?4T{Ewhg
z$!(SPh_IeHJx-fro+@V}^eST*NF>=LBd8`M-~&)4fA_dr*bL2pZBNL(SZdPBz^{k8
z6+j}i73Y?9EOwIq$#`iyfl8)+0fk4!DG6zAQN`ClPbr|{#qIE&ymti~9=#jR+WSVS
zWAE&K;3U~pXFh;_upNGaS5~n8PKNam6(IAv3TALl1m**5691us4b`c=>U>luTBhK}
zN0~mn226yJk2H8u@srR;+2LP8PqlTikcQ<s>WND!*hyZUcX^6L=bMkR5z%4LQU;TZ
zl*mxu1yI3JaoQ6x-VWCRr&N-i8CJ<gM7YSkEd8KCQkN_jC)zTzbC+dcTXSInx)>0!
zF6ZDCrP6<(QrJ`Q7X{$emCW1IYlBRk2@|S`63&lT;?Rj|L~SjFOE%Ix#zr`lZQ$XL
zu_1WMTt17*3m-$lx(H0q|MeIfu9LK|LkBO&bKdkA^J9q|vF7goWYgWsprtOhMA}pI
zPc}&7tXA*U{P`;O4^0p5^Eit#pM+$;2>1oiu>>7Fz#u?4U_4+Z;6cDDKsn$^z;?g^
zz%jsCzz=|~55Y%3I^Z9GM*vlTrvWbm>H%i~R=_U+XLOa^OXCL#e$a#i#sN|RMSx<!
z2EcQGR{?vmx$6nGP}7|+c>-bft&A6p025#mAQg}cC;>bHcn0tyU=QFR;27X@z&C(q
z0PfHi+#W-j0}KPi0`3RQ0?Y#}0xSiT05$@)0crpT0UtaTKSMYJ%|*a9KnDmDcYrrw
zFd!HZ35W&!w>{)Xo@4>{)%_bWLf$P#YewBg`l+oI4d!+AaY7!T{i=7~ncq!(^6#F+
zv5>Y-NE-wDtY`CoH*JOW?>-J+ZQ`%5XDPok#N2fc9{LpP+;73=c+^07*^t~;@g(R+
zNjT4Ziaqf6hnQGD^5QK8%o$zJiO<MlP#R-!A7^yLjT_i+4u|9ZcuIXaXL$~F&+_j%
z1T@rs8`)Wx30vfOl}TH8hkvm-zl%%3zt~`hx3}<T{>Ad$y|%>*|2Z8e(532GfI43C
zG#jNYZbUA?XgXqqHwE~+IczYmdYbt;?teZW*9<%$c8Mn==@&co-z0>k{s)Of;|sVN
zVFP-Q_^D>D(33n$fmupBGpRvDi<1YlybX*(Fk0LA5@sM?ju+?(X5TLHkGp%Ck0MZh
z2$cFm^%o+5$0;;2SAVo6m-Hq8+0lJ03VMJMU;-ooQUQ5@Vn7w38c+kM12h7f0L=j5
z6H(B8BBly@Xp8_8APJBP$O9AussPo18bBSO5zqu^1_+IC0H6mL0VY5aAQg}YC<atD
ziu~Dsvp3DB&WQpo);JbB7N2~c2@%liUSNVAYT}ooPzJaI81a=T%mZ8l+ydMI+ygB5
zS`?N5J_no!%sVd%`G8d?L}4l_)qhTl!VY8(`SU8mHui!j?YEjdC2q=zFTZpvetUJ!
zn5rKpP5WX({QzFI8M6y{heW}@Fk^Wkf`Atwgd`MI2{$aJW=N=m6I;+nl4(Ub*$WnB
zWUqjM4*tMP{{=L#H&Fi=rHM)P+23fKpNV4Q1RS9d{9`9iHOz>OCKlJWG;=gjb!~~W
zh|!}BZLDP3s~wGq-tB0ypy}JvB=-z$XyYaKe7l(KLpVN$JoanLC|NePp(RO{gWJ+1
zzOXj5sS;mATbjgY0<G?Gq>MSAk`KOaV^YcRmvF;W3WyhIiBJ_<KG9M^qYc>#tzfxg
zeLqSQWuZb}nwwp?I2}0E*DBOMg}!p-%Jg|uq3d3fBX0K3FPv`}E9HW4SRu-^SyD)k
z+S8`We8<|*WWGkwNS6B-W*0ya&H&F-a0ArDmz9);xnY)UXZ*{!hDL;>^;e>iv|p|h
zGHzH-4m}FmIdVuYXn{n_I-u~$G#bYV+d#7`kiin|T_${sZiHf&x{j!@xU>a|zm#&Q
zfk#20N+}Tx(lizhbs(8Lf;O)}ijB~OTVSZP=VOz<!5Bd9BwgUQtJyf7xP_%S=Dkd!
zlQ(Z+PTf;in4}8`s-X5`PxhdG%r@D)@pa}rZL0|c)V3|Ms@rOk#A_39<do1{EvwbQ
z;iX_y_-a6>pJ}V?EY&RC4tZ#3+`%VqWij(-C^*?8w@6(M8s&`8h$aA{)41Ivm<U&X
zCg7_1VVEbiGfxFh(Lkva_U}-m>D+mTjcjctJ9VqBk?G{M$4+^aY}m;kdyxh94Fhgc
zyd@>?ySP@Tvv;aaJ8AV}qFd=3?dWwgZS=#fbmz{OWoKyI-z<|Gw=?HZvsC{CJyZ&O
zF;ogwjiM$g=FMwtuExEhhQhfs&L^nx&XdWMeVsp)$tZ2YCYfBljXC>cA0Yj7irN$w
zBYUQ(#ZXn(tg<!Tt8gvfM)r8s=J$CU*(8&7JHd?=Ue%FonVk1L$iLZ=abv3^PFiD`
zjs37pmts&QlcmCDWAEGiN~{!xVyKi}HBiYnN;ALL)UY{qH)5iQ+TbLpYG_gw^Oq2s
z7CAKJ{G&42xQjXWd0lqhq^NqRs_RE>w!6I{vsFP=jqlod-u$L)u6xVoxv@qH9Hpn{
zUYoU)8oBgk*T|)>7`O?6Qh!MeHYaw=PEh^TregM6jaQRB9kb&q-E~)MdT8q~W3JM}
z?C90UZ1i-QP9>%D$1<6cwaUicz4{Y5W~orgIfx(Ou+3WJ2|3lPp-QD$!SyF&rK&DK
zC6Uksx+By&sN@WJqkmlvEpn$D*yvXSRSoo1*;oqPDI2+1u|;XptkB7|oid#YWVg?h
z+<>aO)@0|}Sz8!f-;lyUo^<;{wp9#OwPmsycW$zgvt=^!#kuqMHuA<+GJ<x+MnA03
zsTg7ziX5jjX_m=UR|fu~_<dbY&KgB+f~tlkcz0`Zb#AedQx!6$hsjYc<dhzd%5)Mr
zy?exgfYgObu90!wZn+pX?v{(;Mc^i4QhwFmGA{+x>&@0;HK<vSXT$I_`rs;3n58Oe
z9q4LEQ)GUrR^!rYm0WIfMw^P|H<iBIj;;@}(VJwtQ~)AuWY@P^L!+&WvC+e1x+K5i
zWU?ayn68jfF8Yj@!=9w5jZoF}sJ5|nn<OV!9aJ(VS5DeI?OiuVcBUCBB|#okl~2d(
zpT^<=)!5#q2W59sp;D4nLsj|4%X}0!??tk)PEo6%5*s;PF0+xOa>eYmO5Sbr#Vs}8
zMsKpwwMHzCsr;_BQj$r+8tY|5rZNzwkRhSEVeO5=*a(%3DciGUV~We5)Rl5vnpViF
z2{`fVp{o2fcKpq&WxhN`ZG=kvHBeRWuiN;$o6NF#DpWG3$ouY<LM`Qgv5h=cCQFsC
z#6~V|C8P2&%oHk-+$qzkmUSzWJuyO6J!!JDW_(1ZQ{-LuNuE>65B#TMO;PipQu5V6
zC1<F7B+2ZQR((wy<+$siQk(^-s&|jJ@;P_jY$MmUlAW~G&)Db}Wx7<8w#a1iS@(8p
z73e+-ljrnX1XYc5oNP{k@3un;JXAFh%Wc-R`kglVHkmHfpx12VMmu)n>oT4C8Fytm
z1<rq;90(Is$~rw%3TX4*I7#f+KvjKD+}|2_v#C?OfXgqXf%7p%B|Pg?oUjT&Kh^w<
zo%xnCal&rEQR-eRzboig8!-M$ddEiVT*ri+pv|zOZF>)QAA(l+F8cZE?{yFx-I<UI
zN7UatpzQ}u>ccC<ydyA&<?D7Hk3R}eLAzo{%K<GBv^YDD9|Nr#w2Q5Ln0S8`L=%W-
zT8ZcqgBGllrzQUX8#({KeIqBg?!mg1M=jIw4z;ZFo_@9LhK7gjV}1Nq3$fUgP?$mM
zK+}b6#|fA)Cw=_#={TN0W!Zwl`B_tQr%F2)_7v`8p&GtwKhBKp-p?WjIXR5UD4dX+
zUX-1Yn3j{Coe?bvCZZ+f=gyB#PtV6L0YSLPx9nve+-E=L1rNRrUGRPusJ-Ag88;H*
zaN2|-%+Uz^>VDRX>klx0p1cox0w*3|8>3&;z^zz$yF}aq+%!m+7GiSmH^<3^*|BMP
zg+=)pvAH?Y9M5m!^abe|u~}*PQ*$R2Wfv}p!6h$y{&Rr!5_$7MmehaS)_AG@(dosx
z(qSNF)lLTygZ^w%U>wci^>(PL=P?J_!+6bh53W1?&cXaG6AsX9pYjX4j@xBpR1CeB
z&<?`(0XEzTPY7rAwBdP6VGd8!pVuQDgmM}=E5GV0@QW&juE0|m?U4XfeqEeE$Wk$=
zNf-9S9AW3)G%pGMM{r4SMewV^wZRR+$Ag=KzYo@h^bF}Ak`R&<@?c0o$Oj=eLi&Wx
z3@r_PaYRPgec>tLTf%pR*M}bue`wS*qmm<1BQhiMB8no)BX&e+Mt2&WGCFhgqS1XL
z2S@rxu8v$6`CQ~Xk>5rRk4lZok1C7W5OpA`A?mXzgh7wl1(JL&MqguyaiVdF(QI62
zeAc+jc+l7(z#||yAU~iaz!LC$KrP<*xe?$P=oaV^I3jRj;EceGz-58Ofv*N040H>M
z3wl3zM2KH#YUskyywH`QWuZ@nz8JbM^mwTAi0~1~Bj%4-FrsM0su9nPcz48^5kHK$
zJ)&cnN0?8Te^^wQd3@MIVXuVk5Bo6eyRchf&LiiJGLPCas&UlSQLYgKB1S|kjrcTT
z^XL~xzcPBy=#NG_L<U4AM?M|7E%K$vk0X~v?TvbmVq(M;1{61AcjGAIQR8<3cLRC^
zjt(3fI5V&?a82Omz!w8=2lfk!3Yr#F6!d-2&7eG_`TF2(!OiAi_YnV(ks(zfyF<=~
z+zIIr>Ju6hIw5pb=;qMfp-%s&taA_SvHtu22cyZ<NQhxr&T^g4htZT%StaK(HCZL5
z6lq+;NaZjkR>X1&5k(P;IV-0niVO=mL>W;IOZVgY_};(Y{kwmE?LWJ&_xtsFo?fqO
z^y+#SeV9I5FVL^)#l~slh9Q`bo3EK;%tL0Z^^`r)o^P+W?{iG2y)(_(;+%5+aALWD
z89eSL_lWzi+t6$2?edEJNHX4phioHtlU|V~Npqx4(h(_$$PHve?j#SD$H>#<h4L!-
zJNd92tJGAQC@qzzlp#u>TvqN;TdB{e%ha#bi)xwLj#_wMTdN(_&S)=lu)Fmi^$U7c
zqqfo5=w*yI78x6jt40-bz4@zo(TumwT34-qtT@}UAGCLIuG5_DPEGd-ce1-6a96lj
z+`69PJ?5?Q&U$}(z5Q4G>3;aVZCJ14g@wX5!p}lgv4z-4oGPv1#;-{?l<R6kEu#14
zW+&_U`p?{HywTKn*vK-fn)S_A<`8qFxy5|I>TQj+zOl|()$9-LEw=CUb6)r6dO7}D
z|FHiTR~JOm$bk4ock>5B=Zi<gYErT^NXnAFkh0`=<#n9KC(3T+N9BTYOKHISf2W>M
z|5X#U0oqdSx;D>v#?0a}=9`7)ar0j5ed~zzwEe!ljrytXv~>DA>zvB&v+h}Uly{F`
z+i&T&rS?ySHIvCVJmK$86lPO0e+dzBlDI~^Bt9k|lmC_bD3w$}?WI1eW~v{kYt%jJ
zSyk1BaPTv=kF}lJeyyBdMNi@VbM(*j@AL!uDgCPcuWlR3Mth^5G1HiBd`wyYY+Nud
z8Es78>}Wn}zG03xe>dZ-eO41Y)sAthIYB+A4P~>>kzLpA<aT#6+~MvRF2(b@d9Ql?
z{0V*}o6rAw;6AkH9$|#|k$7CRq>0jWX}+{V+9M5=Uy+x|?<%vElgdRNJ6?6wO+4-l
zZ4NauhU%zf)G;KZr?Jl1YW!;4GP;{-oY`0AVRK$!{bXIXF4*zTM^1@z#ff(txRN``
zwY-PC1K}~{MxuY#X{xkTsvuXD8_EKux<dY1c9e&dKFR=Pm@-;<Px%M{`$l<L9j(5l
zPUEzGR8zFKw9{HO{SiGZ(JA^zoYG~zrqSH!WIShN8edVO{7;ebW<#@!ImOH~H=C!;
znpO)-u^zMrTO+KutSWXbyOG_(e#(B%K49PLyzJyV4^X#Hx#OtaIqp(-p|{8T$&2-?
z`qh2Qf5JcM|L$M*Bl%>3JbMM<IpH<o4PlZnLzpET7Je0~iFL)t#6IFgaXSC6-Y)TG
zAXb!GN~+WcL|Y{7l`6}!{G2>R{#O1|ZlXM@yrryCPAhk*9RcD+>Rz?7CTq`WqqPat
z!AIJBZLzjeJD^noCmzsM-PV)!zIuN>Qy)oPe53E+@XzX_j5m$Xj7Q9#W`A>$`GxhD
z)y6h$&wkW?*A8ae1@<rYdAo;u)cxJPk7JLlWVpoBzbL#ayd!)e6bKiDhGL%hsaPUb
zr7zY=6Xl6&JH3N3%$#Q~GY^>MtvG9l9pl&YBZaq@!>S9G&`;PcnBo{|p|oE5UOFws
z$hGBX)tA-xc<|4(&03_0p;*8#Qe;o=DyPXW$iw8(@<iHhw)~mAS^iNj0W7b`x8%E(
zD{4eL<F55Kd%L|Ky%O&??}~SegRkx<_|1INf7pM_@8b{fhxp_CY5qrkq=ZnNfBSdw
zI*%|^PE>nY&sr~8!>uvaJGALsYl*eW+F=FX)3Lu=7p(~GP#YdQ=2Z5+^f&t7`ak$5
z{7ZhM6n5qxDldEh5q&P+A+?c4QTfY(qD_(^cjkeIa81R^v+Dg?9%Xhyzt>1JMi{G%
zV^%MFrhUx**G{2!vYdm?38#_U&OPSpp5wjd9rP{-Y+jX%<nRj~lKaU6<q`aIdGca;
ztvp4UqbyT4DCO1rxcv+@ptAo}<F(3WZL^d4vAL0hKW$z$Z<$N2)z${<uyxY<-KuXp
z+-sUW#2x{OmD<<r$J{miq7&W)ugt6Dx9~goPx{aJZ~AlnCD2!}-9H|-8CwwHQp6PD
zm{2N|hkToeme@_q5Z@3#5q}U*i7Taz(znt`eXPF1SYtG_T3fdDu+`0a+IoRsf8L6<
zo7uhW{ox=uv0U^oG~^0-!c$T;xraPleoI~?@0Hsqy7Hv5UOB47s(I>sn)G_0cGvsp
z@9SIjQhm8m$!u&sWezmct)bRpB*t&ncg_>uj&M6oC>I4G8=df;utm5iEEda44Wy@~
z45?7wBUgc}`Y11{U#JJwYMP*}&<eD>^#r|_{-M53KdxsOqm5-oO|vD?GtJy&F0<Bv
zJ9pc`clJTMwxc>d-LJet?|bhEWp$5V-|y!4_h0berkKt_o#i5jc!oO#jjA3c<Oum7
z;US@x*idXOJ}wRyXNnudo#GYo3F%#kwVwRFTu!O1G*=!`UWDoADF>Cts;qvko>KpS
z<m+gnHdgyoTd$oDw9Bx(O}~!OKi2o@y^O)e1mn1IhuO~T2S{!-OU&zL1?zES*L*5=
zpLLvKZD(iNZ`(`l4R(oLW><1%08ERVmChPU?6_0aZRECcA9C~EBKHsXnj41#=;jUc
zCVESw{S)@eW`DPT9+nNtg)JMYgak8$6pnVDune+w#ol7NID+@uD4r4jh80^Qyf#a_
zrGKRAa)R7U9wje_8xP25<vWztyk~!9oH9#UsMJ@Rsn2r_1?mO$PqmzOpVmYhu8-HJ
z>I?Lh`X+rZ66^wECf2A0VGj(9Y-1MabP$%hX$&>r<aYL%N1)Qy^y>sV^^A4XGVGOh
z8yaY?vzrDz>6AL1+;`oJ?n_=Itz1;q925Q(62-PWZh6U&+DQ*fPf1gyB`C!8(k|(c
zRA0VRsiC~4WK(=+lz)}VNZcfKm>P^$H>ee~s#<-mnU<lw9HrMn?K|zPmWEvXL$79d
zMym0o@r-e|b)VIkil1Svu>P=Y`#1;R-0A5&;|z3$Ia8dq&YzCyrn&FAAGz~j&<pNT
z*x`m3=U1biv?%A73pqb>TsSBEDg42I&s#2#sz`ODq-Y)IN%N$Ol0yGiR>mSP_G>q^
zEPV@yb*FK+alg^s7-9@F#u)D#^NdnsmwC{<X;ws5nRY*WvE9~r#CZaJQ{WUkZQV!Q
zXWYTi)C~8admM!o@w$4wyaC=&Z@4$kn;Jz<+4udR7oa)VpX$$wYS}&hMgL~_q}jKh
zv@xP&hB#YXBo?5J&LL0A#2D!T=^mvAH$D*Z-J)Do%F)YzsMpk6YAo{A(S~V7+Rs{v
z_M7&PR#AUg&(r7Wi}f$`%}{Vfqn+`+am4t=IBz7FO#)LzoBU~dRtM`*tEct4HPw2;
zo^3C(m)T$0`|Pv!75hEz{4Bcmnp2IsuIsh(46lP%&L1B>Xl}Wvd|Qp^zAox=M>yn!
zd_le}mr<B^12_GYu?V>8YF~=-h+2<JKCQ**<IvKj#$QGdG3%JR`Jnlj*~?5f2bnX>
zZ_OXf&US{qksFrX2i>mR=^A&3`z!+W8*dAD8t*rS<I6>6^ZW0Y+sG=)ew^GIbZezb
z>UK!_9<85t(YTve>t{|imzxFVF7s#eoO#WxYSpy{S+7}H6n77MYG7}tgR4+RlbxAp
zpii7-&S~oVFDK$wbRD|53!<!#o9Sj_LOyrDayPsC>FM%btXJKu<=xMnzU+<VMwjwv
zQ~eM8QvZe@S$P{R9~9DsX~I&Wh?X|RN5pS{at(poTY3?R`?hpK3aUW7qvfgc$58G@
zxk&z<=BT2^XbDCO<8h$q6JxJ&$T({JW~7;c8LA@}-0yCsSsz*pkP=huO?FE>(y!hf
zesjOGKNby8E|d_FMnWI#+-%`vVU=(~xFTG~)KwP^F-06pRmIB5xQ=dt{JK0}E`;f0
zm3m4FMs$VpHMiAFout;#J_jN%X*V?ygnU&G^kid>Q47H~&>V`s&q1_(Yo0LAm{&~8
z%0TIFhlr}%NpRmhU|n|RbDHa&pPgGyqN}=X5xB$MZ@9`m?oV!0U-Wf9NC}Im=r#p!
z5_SpkQa!0LXxCmUmCB^@^4;?Na(nrrd=o^!OX;qpDdR!&A?oWe*gSO`I=6|It<~3`
z)OYD4jUscT^#uT3-xh4ue%O8ugEkrKvB=(ug1pnI;UqdO9L0GQ&%D(c>@Ezb=j~7q
z4^dJss&tzQKMHq<jl`$L$>Lmbf%uj9D*#+3R+jDsf_qE3(uXL;l~P33<xk`%lo?9C
z@;5CQ;@LoTs5(;3Q9lHJ|3WL=s}0rO_<v5Zt=<_uya;9Z2e|T&9^454&ov%0Q_Y!(
ziZkXVQ@7e$Z(7r$_q)S7VZ|dUy6_(5InI{uKzEosl0!V;6{2+`rMKa?s?bt+UN|l$
zDGw+$)kf-b$klvxDU7#W-K}=kUeU&D3$#-09z9X-p}(XLhwi3;3kL%Im|opTFxnWp
zkzzby3<uvP8jFn+_?G(S(`JVGx;epIVSa7ype;+xKg=8W-iB5a%K|Z;vR<Z*@~khd
zol#z_VmGkcgNDO++_^mP18yoT=z3fHU&CuA3JzCCY~id>TNK5?;yN+7pF6(OY-WC9
zZZq3i%dK_R&sKw|gc@M~gfi~qEOEYcSj%$nqy5%LOXqj@EY)5staX%A`6vP92=QW_
zsJ5Rb&Jw=|Eq@UkNkgR9rO%<DS{N6LpyEwD_J{HU`Dgi*EGh3QWq}f-R>$GZSBnAA
z8k(VX(Vij4_!R53P1~#W*54+#IHtESrWmpK+UaJo8G|}{!^*doQfQjpmGU}m|7qtr
zJDgvgm)yDT-);-!Wm_*DT(|{T-Rr;OZ}NBfWB`ffquU*Kim!_A0p|;);9Kbj=`KpC
zgZzd(9vnD@@%RS<x<^S=e86)m4cQmz`5yJYpNBjFuU}GIYN}>y?X^zY80{Txnl?+z
z*M8J)X(nOIRDFg1ll}{qybhPz)_9GkJ#17k+n8O=;YgaDW({C|vpvbV?34vy`lD`7
zEY%SAV~)3w13v2h<_g~9UWQlX9rw<87rjRQ1HOWC?dxaw3!$j%encoAx~zyUv=!b2
z<9-r;5t?$R7Vt7Gig9DfIJRLt8pw|P8ZWk4PEZWR!!eFg-c*(-tyNw9QVllJ!~3EM
zR~M~2u6~U6p|(jorv0lmh;mj#%5jCc+pJ_YK!h!$(DssMRKppXAm1+gY3CJZIix$z
z-Rdep@NhD&+^{Z^%SXR=dR*u$yblIm6yn5(#D3zt;sr5Qx(mzqnAAghJ&-yR3hkp9
zP9m22(yL{9546x;vpHq>ls(WMWM|n6Z4H_6uUpT1(+f9k!d<57LYYumJTK0XE)Xs~
zh<ErzUZ!kTJ|mt<*Jh(DAE(p5M8y0|Hc*G|dery_UD@1}&1cP*K+o1zt`%&sp5#5=
zbQU@*oITF-ZU%HRoYby>eCr4ArdQ(s7QRhd`6$~xBU}}7#V^ErK}lEYFMTX6CIdJu
zmGB6a@pnDshoIaS$Ptey{nZ4tUt6uCHUhP~P1}i#sbM^3^f9I(`EF}~I|8#>6v@BC
z%^U@OszNZHHNYBT&A|bjuq1+%%8m^m#=GUb`@Bv(TuZ;ZKb&A<9t!qq_;8u!qsvr{
zsDzcmehkc2p&7~Hd~vbZTvBMk@zMe5nABB$O`T4!?Imf8(W;Q8?AL-9^z9r^uCdLK
zt?`(G6V?Oxn0E=)jzi1MoYBq?&M%JOTCVRFdev_0xa{)LzX$g+y}d~~tHtZxuo*Rs
zx<+fGgYkj!DX~kec^~z@-TcLrV1%<)BRhqQ%(Z{CZ`h`D-ch}Zek*@u;J=U6jO3P&
z4B|ze5MIJ^j{)_IMOo@j!nqNSPL$h{c}%BD{*)^y5`pbp<xAxnVne53-zDel0;ta5
zt|uG$DCu{A@^zeKP3uYPRXjtH-Ozc+c?D#+9`a0n`KV&rfz|s&3_g{<#L?fBUZCsm
zQnS^~lwl2RkMR=<?WWP#Y;8)Yn1KNBPv!;8X86y33gB+EF2Mc~yNUe}XgQx6`oaDc
zvG$LB2H3US@7!A6VDEkJsAu}Av@I@kW%)=7zkjmusc=vnq2wsjl)D3Ui`rCMr5)7b
zjsD0D%Q|I^wy)Y*@ODLzA>K2+d>r5@?=HVC@k*qyeDsftwGo<-2MSVG=?$s3{1X1J
zIaVv5sPY5#FoOO8ZJ_D#SgXSNC@LS#5)(xmOPeMR!q~hCNG}wZioqIjyLeE%q^4;T
zjVY#ph<*hrHr<)!%meuwxDU7n$yjH%KXQ5$sm}+<u(e2t!|pj`SVgY}a&#b<xIO$u
zCAY7!n$TQWMEY@#yr+ryj(AL5je3|3=v-CKsI@`OZsh6DYg4rwf!0o+t2Z{LU@D5N
zOT;K&pm{Ibf7?|Z-|6K%?Y!u`LA1WtSqH#W^fr-uj1Qd~1Bdd_grgUE(J1s&raDD^
zU7Jc7cEYR-G~O`x;&5+S4egdlkrex7=L^d2RX1=~yBpk&-gGa^f6EUJ@=sNW_Vya#
zywFH&1&Fp42cr4gNq<NU<+o*1nWcTB9Vc+q^>g|Vg2m6sHntg;iO(vVHO)q52b6QB
zIf(>qw|Ub_wmaFclA=$fi$1nLr7AAk%^lfk=XAj-jd31=l%I6pa=*Zy{u#LSJ=yE&
z&GOcG-+5=ezaiFp{VsmsulG-fZy8@9TCFXG-bl&4fT%BKi7NonM5!-YXt#7ra^%7C
zr}8gyJ>=O(M74F*$JDpgquA`1v}Hhfg8ryJ5pNwsKyA>R{~Eg42dTf5&^G969ko0=
zAOWpL^eDK!5ZZnGDNtpFD1J8*CJI@2pe*TA>1%0&w4Yy?EO(K=lDEsd<g0RZr7`|j
z#{th#7DuNjH}U#|)pyl(Fl9Ny{1*vqU({dI$LSgVe2A+;WD@UHMQB8obPOnz?}bxf
zmO`+)P~0O9ly<;cKS{rU>sO=-NU2P4D;rJswYmeU`WXt2BmY~X9o9PPuaNmB7*BB}
z6_GIOp{eFpFY8-wezZNyF1A}cIZhMW@g4UwVyEujXzv5!4cQ-dyI_;~_%h6P8wu@r
zh(=<2aj1A!yi00Mim?H&{|KbAL(WjXK=YPUN2qgnhzGPswaH}vI-qk+Z)Xeu&tuI8
z2$(mR$IN=xOT=nttchenR{@?pXM=Otd6e#1?*8NU0KRJzKaKZ4Cw!>D(jmXR8JW)W
zpwTVCMf08^Vp}X-mhJ`h){=!^mj^3Tls!s4b+|fHHK3A(AYKQ3u>O{QORvwnFNf8d
zA}gv}s@2~*M9tr4Pq9C<f45yc)f%FmdG0p%64W+@u}yv7^GEr6!rDr!5DCJ!Zz?>D
zB$UJ_A&qNdeaR#?*vnw)DS3_jlRScVzo9f!=b{u!)E)@xby}RBK}j`Z*0B_K)YW{|
z%r)<@T9SnoSha1#K4eQy4`;knM&9SraECy{=e=#-uQc!e|BzONP>cqVhQwqW2!|g<
zk1iMg5qmJ%sx3c*82emqMgsi2a*WY~t4>zWsCSU}{;oCEUqL7R<+k#k@$#VQ7^3G)
ze^K~G*|&?Up74m!OQ<6`(qL(XG(*}Bz*m&3$#vzXn3+y;Z!lv5nrONl{0%b2D|M94
z@b*cxdmDbyCQ9p0-O#7&v-C@PWy3PQHa3yg-)R}vbZZtcRhe1N*Y-2c^GtG%In}XM
zjhOdM@aA~?J)P2u0#t5=NIK6{T}To}5YDs|J+Tvy^R9GC@{|s|T2EzMpfprls-kME
zW7My;FuNXQ`~uNjH7j$NL#@8prpxvr=Y-qV>){Rb7JJ3sNocqc-fcnn#`zT@)A`X+
zSS_v>D@paGX;PkalJ^}><hWe!sHAd!rCeXC+JpGb)SiYj4-rf_#)C#TBly5*K-6}J
zRn4k}t>|mzSU*@-tg1lfKs(=F1FxO7>oQ(z=ZtdRB52#>B*6)an+$ptyEVznH+Va_
zgr6B*-S9H~tPr+VR){WT*AQ9>sSx_R$dd2yz~#hBVv?wd4(9GTu6vj`G7#Sua~TBe
z7Y~akdHyGu1UxG}Py1~LW;)5Ka$neOxV%y>kk81M<eCI7G6R+e)voFf>aYCw2#)rF
z_N{hKyQVqJIhq)2jh#k0V7VSCaZl!8<M9k15J1FOH7v>MXw|hlldn`@_9HtFIzeYb
zqk+zFXB><--&uu;*ykK^&X8qogW+ztv0gk@;t{W}_m@`%3C>v;R){*DyTPxw8P6>f
zHVNB>o0wKld=^?=3!mE3?@|>oau>FKpK?x_2yPq)4ev*q4u|&^63`Z+v8x0a!q<Vu
z>G~XmSYrf~%v3hpm}LBDd|;ljYBIHJ!}0r0XJ-HxP)GuJ#kt{BaPM@hxphc7o4L9>
z0ZQJ?knOU&$omHdG5rUb@NEsRqUiR+#t1D0MKFmt(}dTFZ@(6f5J@D7K?iZGSYGZa
zcUS&WCIGL8RSk%lq@CCPMnLx^lwGcuFf^{fXz>H%Ps7BN4mKy7f0+}k&DL(zqCuq$
zwKv<l?N-D$tDTMDT{rhNjAzJjKViqp=#Hjde=m#4@yDb{YcV$Gy~{jkT)>e&&CFt>
zU+iCFYH_<|sz#so8DS8U@H4_59CB@@dSOz!l<@r^`EWywdYG5JOkOq%(R$9>M;uw-
zahL<=A>^y_0J&iP8h4l%P?(9nM4UY(#J$oAQU6d|cmdxOEMvO!Fx5CiY#}SMNm4%x
z;Q2<b&rD+mc4Bul-)ly$^`Tl(tAjaxPy1T?NmKQ9jHVys@=oh-812nd1Q}z!NnV(u
z|G=Q(LBF3rk~nG&*83t=6BCtf9fg;L22xY0x%@bV{ki;bpyVpK=3MhL^DnCgfO*{c
z-MQ(+x%J%hZX`Y?a)5ekC@f<3f3MU;dQ}c!gH6EkJ*+46W0*7?W}E<I%~BVupQ~$O
z$Rbj{U%<-0)beQjYFaH!h^EbB<g^;#{#M(kmDj5gKFr}_x9Pz(J&}=VFGi*V2v<iM
z<BWyIx5j=@{g`pixEQre4KPi~w9}L3FmtpyC#rL<G4-lq{b-%H-{7&|1_#eOjopXI
zM?S!&HT7B}Tz7EK#okqK1WCc?l;hs8dlF-!8E``q6H#yjp`-AGFad3|2<K8vh>(E7
z=`3awkrjwH#6QR}D=GIXy+|=9K}3Hm71U~KZ6-obk@b9ompP%f#e9E>32Cd3CSc#A
zA7KRbAbG(OZ1++|n#uU7LDm%OYio=3H+k_rb}Rd3%*c;+yc@J}2k^w-xVzmyy;qT4
zZ~33_tn0%k75FxbA45T~_ek&J38fUVqu5pKMhx|=^nx^08Yzv9PJ*-1i5~*EKg$0w
zu)2e4an!ve0v-@F4l}X^WpI|5Hv#~?0lsSXIQynu(Ww$RwHUf(VX{s-wcQpx%22P=
zi}-gk*XvICEb-TIa2KMp`bct2R0}p22BDQcA?Y6{O=cjuUn&M}{+4RWM-ZzIDjlJ+
zx0NDBa;?=u2KGh77IzUq-7?}aGoe%+WhOG{6)eXJp0{7IU$@627GCEbzjn4c*D)S_
zSfLor4vWmAa0IC_QF}H6(CC1Lc$Hx8Qy{xoJdEodE!XDPtyD&+`<NQMZd^AE2JMH<
zljh^7;CD#}_JODM(3aWmK2|a=K-~#mGf(x}d8q;2`3??esdtDOT{zE-q}~2yrP2(7
zqA$osC8iZmsbM_Pm-M<NGW;zjW;>brU)P6_j|Jw3sGkGo`z+?1ft&>byG-tPv;7x#
z>@~`AD(5=a{S*~+&P~LyWT3WBhh8u<;JZD3PGv&<op?g*h*)@DUc<<Fk-CPUyu5xF
zL$qXl6yxN1ETJ6G|3q+BHmZ^7EJk#$V<CkUpAi2sG|(u<H;YKSBg}(m;CeRzO!bIk
z+u41I<lZBaTVj81drk-P&)!ZhhNK{Hc5ygW+<WMFhp;`@o$Ws4z2Hp)Du2ffglJyX
z&-N$zU-?JFtH|c#LVnZ~5``v$#A7!XWr!z5>>>6S^TlPvZr9<_Dxk%ql;>0o`p=wX
zxG}H+2Yr^wz~4*;1}l?Ucsi&A+W>^a+DYvX?G9j}rrv~cWCqZXVss^`7|ObhZ+>d7
zF~1>zJW0@e%S^+n6*DugXg4P1we7a#yxn=j0rrdVK(;*r@%a(fa|r{CAE>69ZlbH9
z7cRl35wDVW4>&o?Tj;IE@RS5zUH^VR9KuZT^KLH_<?_WMZ&;2rV=}m~6!Gwt@Gaiw
zXQ4zmO(WJtM6?lA-0UL^AN%m$0~tX!m9EL>5a}(|w(4MZVv6-Ajn0VBLCy$g0>Wht
z(&e<1>h@-a@B{OM0p1W6Jc2Rc^=_{V;ozU)@#gdWCO;|&RRvdg8eXr?;l9nb!bTF!
zQkE4OO0wijk4pokRnk!@PL`N}_mrQON6H@&<ZodV`!}A*R(c~`GnJ9bSFB}xuSAHa
zL!s9}eS(#iY;~1-NPS34)y4)`iSM+FtkQ(LPKl`cu?Xw0D72&c{iMM^F?gtDnha+K
zL%9l>XCVoHg6*SXUb9!(cQ_K9*UQ=AJ_f-~pk|&XY#0pn6v3#x$;y~$;#re(+btdv
ztH2}esEo<1uSodDU>q`dIkTI#$|dC=r7gZ~1te0QX<)MUxHd4FTo-Cbw8p?|j-IRE
z#~{u$o;4O2E0J1TalsKDuf5sX>_LKjfQY&ZIpNbR8LTJDD78{ZM>6eEn6VOE@DmvN
zp{RsS&RewPR=0A1s(sJ<*4qbBlro{O<2NAb^jRh8??3Oq8dV1SZ;#{(`OKCVx`QP%
zU1%?KLdgtZXKsX$D{Lk2YA22q<E2FO?{aAik=#WTe_dIWAI8SCR}MqtW$cmMqu#H!
z0G!*Zz2VOp>VSD_vDQd$uMg6{*Q<FA*>7vhDpr36g=1*KkG;={9KQE{@h&lNtL8Uk
zXwsJPaesfPKZe=($8g0a|9k(Ja8sfvCX&L=VL73i&=78GD?BFj=K;qE(`F7`P^nMw
zGTRNS<)d;6OJzC8iz!6Qt6}q-$|bFj{w8z!68$2}LUBf@cj_BSjG%lpdLNRZSBz1t
z4qZ0tkbw^ZUUQfee?qwS8x0v_iI&bR;5k?>usYl6_F#Ley%*;oIu^?DafU4~I->*j
z&OT$bcGbDhZOkC?d!TRxhWJe{7gIc!j$FqmW;YI|Ht*TOSACbYlE+yq>Cd~q$=lBK
z^RZc<`K#Dq+>Kb{+vae`Qn*W~DJ0<M1@;5l3tfeQLMB^3W66Ez3rmC*!k5B&G;*+0
z*vD+=C`S9da9Oy)n#G-BO|b#p+yY|t#7D6OgX!e)L`KsXy?;c4xrD6aOPtLnaR=GJ
z54eQm%!AG|i2WO{SV5{R-AzT;r7fE>w34x|KBKFyWMVH+*dOB=uFLbI!Nhj~^<7b|
zh1F`W_Gdmb2buIQYm<*?y|o$IR_#}<CPB$ua{F?`B;8R&6LI!ijOOMm=-v0hze-jT
z$^HA*XV!kwztAI10MEa&pJe$Uni7}tMK=dhiv%H^45TpubQTRgNngdq25XHX28q`o
zjK+X!3V}ga+{qQQy_HH%xyy>N??Rg-5x>4*&#+gM``+((<lb4#MYjQ?nw#Qo<l24%
zN;SOiTCaj%hf8_|(emN#m^xB1Dy}L<xj`2kAww8~%H1gZE?fyn<2vE-CyG-sTw9@q
zGwkp5!vwDYwGI(AoRoi5{!rr7d)3yQQP>`)HVVBv3%{}hM{r$h0vEPt?Qj56YZ4N2
zfj-y>SS8z!B<~OZ%|PoMz`QoKWagy3tbvr|Sf*+3v2YZ8X01gqp0+xKOERq5_Y8|i
zij!(f2~smDkrhiv?V>JFSF#JbmI+>=x>eoD_^g;9DORhkC1{CS62R1o{T4+_Aw=wn
zB1pqhWoU!gd>zIhGDpkRrfYfR|M?8u7L$LiWD};4>)jb>yP3-$&`xPrFpFiZPsZr6
zdYm2)><YSq-*<Ss6ukqwK3yN7uV!_uh9R*1kVmY1h=E*!DKIAtr{wwON+ibxGmfjv
zWLGYmS1ZH~6~T-p;NDs4qZFNY&1z-$w7WRnxWtAz&Lr$nfpdT+jB{(a32qWbI@_J-
zE^wE*1@57l{*p=$#UxgY?4J47l1i<EboP&i5!PnGKP$xp3_%kZUZ<isb20gcq_ff?
z{H4O!xSNvBveXrZX*C#wDr$<_O-*OLBZt7hgeQsE@hm*1fyCKl@LO4n5}afwmEGk`
zCz~O0v6H}{eL6W!3EHe1Za3YV7yt};XtUK+S^+6bhCc!TScw|t-UL4A;71}&pNz>*
zgQ*u_g;z6`i4o&ipi02zr-)sUi&@MeR*HoLYuChZPcx3j+G^}JPI08Q%|x>xdLHqd
zM<TE!a3%&?DA^5C+z#v>>~xcmY>JmkOqz~#8wP4+dD&hL3q6x~#8^L`%~FN^>I`C_
z5&mKxajjqIAM#85v#bN~l*xPmLa`-~M>s+U?C(mUkfneUyr07(_7wXPif3UtX7i}a
zc-YlE?$&^nrX=Pk$x;f3-c3rEGFfLH!REk3W^1`HXr44%%9j?9*DYfry;@o;6-b5B
zR%s`>Y%%%eHAd(WIYy3^<K%d`1_Po5IZ;kxeW(?CoC=G_4r>4@3?I9&hLA32zz|t-
zHv1c8a-0$*D6NQZ1|j7Sv6p_980Q*FB34b;O6(4-Ok|MLFQBBhQc|ag1!5?wu%wa!
zif-KIV#;bQg|!oRQ{*1tc8j^+Q>??(_CgsfFeXj*QdlPG!s&M7e6tCdN<G6*X8$WI
zV3b$r??g#l@yo(vOsyEn;20H-Z!HH{620kkj&3>=o7Dsf2UwK5!h%c<HhL6JEj+Vf
zQVu7zfYaH^6zUY2ZVV@pglHNhXY#I-<Xj*q53RqLHQF%eDU`P|t8AqNj?zWx%ll_x
z{bp0&1-S8IHj&G~sDvn7<O3E3QGiGW3I;JWE}^p>x;P7bD%6Xh)Y|ylzQ!P9y0O|g
zU<la36h`M==-h4u2z^1QEc!RcnrKa8AUK_I`eM4dz$y%^t&BUvraoXPOc1)+YguDB
z#C+nK9m}$0GZq<AXzes7oi-XqBNed2dx~A13k09F+2Wmz#7W|aQ@u1VGulOk-c~xP
zhMz>irf|sVB+)r2-^G;dPD=Ld?UPR9uNstll27Ex4i(rm8<A5&NFJfBTG3bq9QJOG
zyI5>R$k~Naz#xvc28Wu#;g!h|B}R!=;*=4bT{dE4A}5&3#(kbLd*-*xD>V)-P)ubM
zQw-%4$I5aIJhh=FBT!S-o@yHVmYM2AM&5~FZ89_YLM;TzE_y1FP#VA(F0j?0kMro@
z5DW{=BBWm_)+gRd#91bDylEV5X7q5wgPqO9ewnp0JXmXY@E@cMQL+qliUXe#>_m)t
zXx@_9w@AfNq%r&rja;@p3DlY$J@lmLu^SwG2j(fM9Dh%zFIN!C{MGb9cmbvK!ZofS
z;>NhKZXBJE55$Juu#zk~?1-R{oB7{uaTaS@>eld*Xbk0lHAY`<a1eL+KY?dD=y-^E
zRE!_%C;9?o?|gq5;IlgHl}!E;4!sg1)DXG|-58>rrCVY_#(1!?cECL*a+69FBvZM|
z;%MuXiE)tO|Gm>JfMzz}Qt%%@DU%X_jV?e%mOP33oXs~B%Mg(TiohondF-4lrX$uu
zojbAphsf*Cs-=ue{+l|xMd>nA3x+Y2&WiHoM8dwpC^Z(-Jg2bm7g$ueO_8_hF#|H3
zsF%@5g5ellAjG~b_zofvoWwRp8aG;I^<+bFtzAe6ScL98WS^o-F0g-FW=EVDCzi#Z
z+D-z?KUqLloGSz@IHb}L2f&(1eC}`{JhJTDf65~cNuPtHk0qCHrGywTj4ICIElXgy
zYf4z0d3=je@E>VV7Ja`~1i@XR7?20;L-)K)DRYXD-IMfY;K5eP_6mi&3>*jwfP#>F
zGRzSS?xvfwso`Qi)u>J7cA$29QmJd{{{#Pn%vq7PV<}aG0_|YuP?Xbo-w1Ekic*{n
zjTX@R*ZBUVwwsA(59?ti2wDUYMRNI+FiJsPgvCN>AY7xDo3Ud$2!_7`NyL)}rn9`4
z0~juli`hfDBFC_@nGF8r!vH1G5I>!^%;u)^SqG1eilB64&q}SBl|F+HWs2A?jX|00
zrX3IPiA*s~d5Yxe0<C$4?YlA>G{%axy2sI{HF(<ux;4paX0@Vc6~-IR{|Aq0Ryw<7
zgBa_C4VuK7b1Rxu;S|C~P2nWMX6=T|>1)sY?ej`PkccBqjy7o6ni=fnra(Ps85ie!
z1>r^KSBz#DBjAxqa7U~E!=V>gI=d#N0%HFSU`a|dwpJV@PG6;)H4HSF2t0>(QwTN}
zG3_crY+a!OlX-@|c%NYbh>^q9<VVZ#0$?490(ELMXq)XUc6NdjSHOoDupyLT&CnU$
z*z3v$Cl-SdYZ))?1`MvjlS%MnYP9iZ!;L$s*elr77&M3A8$ftEnj;qg4_kjXbzI^H
zyy41<kwM&cM2MyT6%<kjA&bu-^5D&_(P?Lxb2?&&sKA>Zl^r|9BK&y?DybBm6a#~{
zVw1Ng44Q-1Sc$gS3dEO6@u-L-G(#%vnZ=g^i{+iHAzuOXV*vcxiV<*F>0}SNpnZrA
zVda!53FyLBD8ppHeGtoqd7#8r212E*$tBP`9T3r(fI<$kc^N!<i2gYX4Adb1N&@;*
z^_~F#AXqg|UrR5YVqra=#Wjb;np8d~89_WhG0L&@R;ca{;dCNq9Ddax1Wm`W=F($p
z&8-w<X|&T4sXGM{?n{MbMj4`jI}LBM2DR3V$_hy!i$VHg+|U66ga}9yProHbJ1(8t
e%3(Jk{F^;BIP3@}G*L*N+4##!N5k(GXa5%rSX*HL


From 0a66642a0473bbd51a3eba9df4f87f022ec1d792 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Wed, 12 Mar 2025 09:07:34 -0700
Subject: [PATCH 0832/1815] Don't duplicate body in md preview

Fixes #243340
---
 extensions/markdown-language-features/preview-src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/markdown-language-features/preview-src/index.ts b/extensions/markdown-language-features/preview-src/index.ts
index 08c6759f05b4..7e5aee5e277e 100644
--- a/extensions/markdown-language-features/preview-src/index.ts
+++ b/extensions/markdown-language-features/preview-src/index.ts
@@ -68,7 +68,7 @@ onceDocumentLoaded(() => {
 		getRawData('data-initial-md-content'),
 		'text/html'
 	);
-	document.body.appendChild(markDownHtml.body);
+	document.body.append(...markDownHtml.body.children);
 
 	// Restore
 	const scrollProgress = state.scrollProgress;

From 7e4a7468c54e32790a7225007f170f5071d51b7e Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 12 Mar 2025 17:41:50 +0100
Subject: [PATCH 0833/1815] tweak quick pick for tools (#243370)

---
 src/vs/workbench/contrib/mcp/browser/mcpCommands.ts | 10 ++++++----
 src/vs/workbench/contrib/mcp/browser/media/mcp.css  |  8 ++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 src/vs/workbench/contrib/mcp/browser/media/mcp.css

diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 0514c67931b8..3a766d4e4c05 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import './media/mcp.css';
 import { reset } from '../../../../base/browser/dom.js';
 import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { Codicon } from '../../../../base/common/codicons.js';
@@ -229,14 +230,14 @@ export class AttachMCPToolsAction extends Action2 {
 			}
 			picks.push({
 				type: 'separator',
-				label: server.collection.label
+				label: localize('desc', "MCP Server - {0}", McpConnectionState.toString(server.state.get()))
 			});
 
 			const item: ServerPick = {
 				server,
 				type: 'item',
-				label: `$(server) ${server.definition.label}`,
-				description: McpConnectionState.toString(server.state.get()),
+				label: `${server.definition.label}`,
+				description: localize('desc', "MCP Server - {0}", McpConnectionState.toString(server.state.get())),
 				picked: tools.some(tool => tool.enabled.get()),
 				toolPicks: []
 			};
@@ -250,7 +251,8 @@ export class AttachMCPToolsAction extends Action2 {
 					type: 'item',
 					label: `$(tools) ${tool.definition.name}`,
 					description: tool.definition.description,
-					picked: tool.enabled.get()
+					picked: tool.enabled.get(),
+					iconClasses: ['mcp-tool']
 				};
 				item.toolPicks.push(toolItem);
 				picks.push(toolItem);
diff --git a/src/vs/workbench/contrib/mcp/browser/media/mcp.css b/src/vs/workbench/contrib/mcp/browser/media/mcp.css
new file mode 100644
index 000000000000..f65fb9628f71
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/browser/media/mcp.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.quick-input-list .quick-input-list-rows > .quick-input-list-row .monaco-icon-label.mcp-tool .codicon[class*='codicon-'] {
+	font-size: 14px;
+}

From 7209458e541cbb9f667ab40e98be1b34140d2f53 Mon Sep 17 00:00:00 2001
From: Anthony Kim <62267334+anthonykim1@users.noreply.github.com>
Date: Wed, 12 Mar 2025 09:42:10 -0700
Subject: [PATCH 0834/1815] Remove undefined from
 TerminalShellIntegrationEnvironment.value (#243219)

Remove | undefined from TerminalShellIntegrationEnvironment.value
---
 src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts b/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts
index ff3ea00e7659..e4bc845c46ad 100644
--- a/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts
+++ b/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts
@@ -10,7 +10,7 @@ declare module 'vscode' {
 		/**
 		 * The dictionary of environment variables.
 		 */
-		value: { [key: string]: string | undefined } | undefined;
+		value: { [key: string]: string | undefined };
 
 		/**
 		 * Whether the environment came from a trusted source and is therefore safe to use its

From 9e41fb2187e05be9086899a25411d2e53c875c1a Mon Sep 17 00:00:00 2001
From: Anthony Kim <62267334+anthonykim1@users.noreply.github.com>
Date: Wed, 12 Mar 2025 09:47:02 -0700
Subject: [PATCH 0835/1815] Use Object.freeze when exposing shell env api 
 (#243262)

Use Object.freeze when exposing extension API
---
 .../api/common/extHostTerminalShellIntegration.ts         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
index 8dcc66143012..af013c0c7c5d 100644
--- a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
@@ -184,7 +184,13 @@ class InternalTerminalShellIntegration extends Disposable {
 				return that._cwd;
 			},
 			get env(): vscode.TerminalShellIntegrationEnvironment | undefined {
-				return that._env;
+				if (!that._env) {
+					return undefined;
+				}
+				return Object.freeze({
+					isTrusted: that._env.isTrusted,
+					value: Object.freeze({ ...that._env.value })
+				});
 			},
 			get hasRichCommandDetection(): boolean {
 				return that._hasRichCommandDetection;

From 97837b945ab54e88b5f61e42d9bbc6d09c6817b7 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 12 Mar 2025 18:15:29 +0100
Subject: [PATCH 0836/1815] handle allRepositorySigned gallery capability
 (#243358)

---
 .../common/extensionGalleryService.ts                |  3 ++-
 .../common/extensionManagement.ts                    |  1 +
 .../node/extensionManagementService.ts               | 12 ++++++++++--
 .../extensions/browser/extensions.contribution.ts    |  4 +++-
 .../contrib/extensions/browser/extensionsActions.ts  |  6 ++++--
 .../extensions/browser/extensionsWorkbenchService.ts |  2 +-
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
index 2acd0d13ad56..9ec0ff32f905 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
@@ -645,7 +645,8 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			query: {
 				sortBy,
 				filters
-			}
+			},
+			allRepositorySigned: !extensionGalleryManifest.capabilities.signing?.allRepositorySigned,
 		};
 	}
 
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index ffeed393a058..1dd20692b3af 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -380,6 +380,7 @@ export interface IExtensionGalleryCapabilities {
 		readonly sortBy: readonly SortBy[];
 		readonly filters: readonly FilterType[];
 	};
+	readonly allRepositorySigned: boolean;
 }
 
 export const IExtensionGalleryService = createDecorator<IExtensionGalleryService>('extensionGalleryService');
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 11bb73f08484..28b058ee7826 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -332,8 +332,15 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 			verifySignature = isBoolean(value) ? value : true;
 		}
 		const { location, verificationStatus } = await this.extensionsDownloader.download(extension, operation, verifySignature, clientTargetPlatform);
-
-		if (verificationStatus !== ExtensionSignatureVerificationCode.Success && verificationStatus !== ExtensionSignatureVerificationCode.NotSigned && verifySignature && this.environmentService.isBuilt && !(isLinux && this.productService.quality === 'stable')) {
+		const shouldRequireSignature = (await this.galleryService.getCapabilities()).allRepositorySigned;
+
+		if (
+			verificationStatus !== ExtensionSignatureVerificationCode.Success
+			&& !(verificationStatus === ExtensionSignatureVerificationCode.NotSigned && !shouldRequireSignature)
+			&& verifySignature
+			&& this.environmentService.isBuilt
+			&& !(isLinux && this.productService.quality === 'stable')
+		) {
 			try {
 				await this.extensionsDownloader.delete(location);
 			} catch (e) {
@@ -356,6 +363,7 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 				case ExtensionSignatureVerificationCode.CertificateRevoked:
 				case ExtensionSignatureVerificationCode.SignatureIsNotValid:
 				case ExtensionSignatureVerificationCode.SignatureArchiveHasTooManyEntries:
+				case ExtensionSignatureVerificationCode.NotSigned:
 					throw new ExtensionManagementError(nls.localize('signature verification failed', "Signature verification failed with '{0}' error.", verificationStatus), ExtensionManagementErrorCode.SignatureVerificationFailed);
 			}
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index 3bc489fb79c7..c1565b16c633 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -548,6 +548,7 @@ export const CONTEXT_HAS_REMOTE_SERVER = new RawContextKey<boolean>('hasRemoteSe
 export const CONTEXT_HAS_WEB_SERVER = new RawContextKey<boolean>('hasWebServer', false);
 const CONTEXT_GALLERY_SORT_CAPABILITIES = new RawContextKey<string>('gallerySortCapabilities', '');
 const CONTEXT_GALLERY_FILTER_CAPABILITIES = new RawContextKey<string>('galleryFilterCapabilities', '');
+const CONTEXT_GALLERY_ALL_REPOSITORY_SIGNED = new RawContextKey<boolean>('galleryAllRepositorySigned', false);
 
 async function runAction(action: IAction): Promise<void> {
 	try {
@@ -609,6 +610,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 		const capabilities = await this.extensionGalleryService.getCapabilities();
 		CONTEXT_GALLERY_SORT_CAPABILITIES.bindTo(this.contextKeyService).set(`_${capabilities.query.sortBy.join('_')}_UpdateDate_`);
 		CONTEXT_GALLERY_FILTER_CAPABILITIES.bindTo(this.contextKeyService).set(`_${capabilities.query.filters.join('_')}_`);
+		CONTEXT_GALLERY_ALL_REPOSITORY_SIGNED.bindTo(this.contextKeyService).set(capabilities.allRepositorySigned);
 	}
 
 	private registerQuickAccessProvider(): void {
@@ -1532,7 +1534,7 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			menu: {
 				id: MenuId.ExtensionContext,
 				group: '0_install',
-				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.has('isGalleryExtension'), ContextKeyExpr.not('extensionDisallowInstall'), ContextKeyExpr.has('extensionIsUnsigned')),
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('extensionStatus', 'uninstalled'), ContextKeyExpr.has('isGalleryExtension'), ContextKeyExpr.not('extensionDisallowInstall'), ContextKeyExpr.has('extensionIsUnsigned'), CONTEXT_GALLERY_ALL_REPOSITORY_SIGNED),
 				order: 1
 			},
 			run: async (accessor: ServicesAccessor, extensionId: string) => {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
index 7c58defdf354..3c33b2614d36 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
@@ -420,6 +420,7 @@ export class InstallAction extends ExtensionAction {
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
 		@IAllowedExtensionsService private readonly allowedExtensionsService: IAllowedExtensionsService,
+		@IExtensionGalleryService private readonly galleryService: IExtensionGalleryService,
 	) {
 		super('extensions.install', localize('install', "Install"), InstallAction.CLASS, false);
 		this.hideOnDisabled = false;
@@ -468,7 +469,7 @@ export class InstallAction extends ExtensionAction {
 			return;
 		}
 
-		if (this.extension.gallery && !this.extension.gallery.isSigned) {
+		if (this.extension.gallery && !this.extension.gallery.isSigned && (await this.galleryService.getCapabilities()).allRepositorySigned) {
 			const { result } = await this.dialogService.prompt({
 				type: Severity.Warning,
 				message: localize('not signed', "'{0}' is an extension from an unknown source. Are you sure you want to install?", this.extension.displayName),
@@ -2523,6 +2524,7 @@ export class ExtensionStatusAction extends ExtensionAction {
 		@IAllowedExtensionsService private readonly allowedExtensionsService: IAllowedExtensionsService,
 		@IWorkbenchExtensionEnablementService private readonly workbenchExtensionEnablementService: IWorkbenchExtensionEnablementService,
 		@IExtensionFeaturesManagementService private readonly extensionFeaturesManagementService: IExtensionFeaturesManagementService,
+		@IExtensionGalleryService private readonly galleryService: IExtensionGalleryService,
 	) {
 		super('extensions.status', '', `${ExtensionStatusAction.CLASS} hide`, false);
 		this._register(this.labelService.onDidChangeFormatters(() => this.update(), this));
@@ -2549,7 +2551,7 @@ export class ExtensionStatusAction extends ExtensionAction {
 			return;
 		}
 
-		if (this.extension.state === ExtensionState.Uninstalled && this.extension.gallery && !this.extension.gallery.isSigned) {
+		if (this.extension.state === ExtensionState.Uninstalled && this.extension.gallery && !this.extension.gallery.isSigned && (await this.galleryService.getCapabilities()).allRepositorySigned) {
 			this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('not signed tooltip', "This extension is not signed by the Extension Marketplace.")) }, true);
 			return;
 		}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index 77f686949c45..b5a1450cca2c 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -2278,7 +2278,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		}
 
 		if (extension.gallery) {
-			if (!extension.gallery.isSigned) {
+			if (!extension.gallery.isSigned && (await this.galleryService.getCapabilities()).allRepositorySigned) {
 				return new MarkdownString().appendText(nls.localize('not signed', "This extension is not signed."));
 			}
 

From 7e36f9a2401550f55adfdcb3f3377ad9cbcd8049 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 12 Mar 2025 10:23:29 -0700
Subject: [PATCH 0837/1815] fix hygenie

---
 .../workbench/contrib/mcp/test/common/mcpRegistry.test.ts   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 57f2c7271406..6f9f02f2a58e 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
@@ -13,7 +13,9 @@ import { ConfigurationTarget } from '../../../../../platform/configuration/commo
 import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
 import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 import { ILoggerService } from '../../../../../platform/log/common/log.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { ISecretStorageService } from '../../../../../platform/secrets/common/secrets.js';
+import { TestSecretStorageService } from '../../../../../platform/secrets/test/common/testSecretStorageService.js';
+import { IStorageService, StorageScope } from '../../../../../platform/storage/common/storage.js';
 import { IConfigurationResolverService } from '../../../../services/configurationResolver/common/configurationResolver.js';
 import { IOutputService } from '../../../../services/output/common/output.js';
 import { TestLoggerService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
@@ -22,8 +24,6 @@ import { IMcpHostDelegate, IMcpMessageTransport } from '../../common/mcpRegistry
 import { McpServerConnection } from '../../common/mcpServerConnection.js';
 import { McpCollectionDefinition, McpServerDefinition, McpServerTransportType } from '../../common/mcpTypes.js';
 import { TestMcpMessageTransport } from './mcpRegistryTypes.js';
-import { ISecretStorageService } from '../../../../../platform/secrets/common/secrets.js';
-import { TestSecretStorageService } from '../../../../../platform/secrets/test/common/testSecretStorageService.js';
 
 class TestConfigurationResolverService implements Partial<IConfigurationResolverService> {
 	declare readonly _serviceBrand: undefined;

From 2b292c85334bed3e35937bfadab53a3e9f4272c7 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 12 Mar 2025 10:47:10 -0700
Subject: [PATCH 0838/1815] Respond to VT DA1 request when using conpty

I'm concerned about accidental regressions which is why this only
happens in conpty. It's also hard to gauge the conformance of xterm.js
as a whole and which extensions we properly support

Fixes #241694
---
 .../contrib/terminal/browser/terminalInstance.ts     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index e8ff3493bc2f..7893790b4c18 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -847,6 +847,18 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		// Init winpty 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
+			// a long delay in conpty 1.22+ where it waits for the response.
+			// Reference: https://github.com/microsoft/terminal/blob/3760caed97fa9140a40777a8fbc1c95785e6d2ab/src/terminal/adapter/adaptDispatch.cpp#L1471-L1495
+			if (processTraits?.windowsPty?.backend === 'conpty') {
+				this._register(xterm.raw.parser.registerCsiHandler({ final: 'c' }, params => {
+					if (params.length === 0 || params.length === 1 && params[0] === 0) {
+						this._processManager.write('\x1b[?61;4c');
+						return true;
+					}
+					return false;
+				}));
+			}
 			if (this._processManager.os) {
 				lineDataEventAddon.setOperatingSystem(this._processManager.os);
 			}

From 146b31fbe91f1220538e78a8691eb8ce91346c59 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 12 Mar 2025 11:12:07 -0700
Subject: [PATCH 0839/1815] mcp: rm --add-mcp-to-workspace for now (#243377)

This isn't supported in the IConfigEditingService, and is probably not a feature we need in the immdiate future anyhow.
---
 src/vs/code/node/cliProcessMain.ts            |  2 +-
 src/vs/platform/environment/common/argv.ts    |  1 -
 src/vs/platform/environment/node/argv.ts      |  1 -
 .../platform/mcp/common/mcpManagementCli.ts   | 36 ++-----------------
 4 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index 35ffa128d904..817baf739922 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -307,7 +307,7 @@ class CliMain extends Disposable {
 
 		// Install MCP server
 		else if (this.argv['add-mcp']) {
-			return instantiationService.createInstance(McpManagementCli, new ConsoleLogger(LogLevel.Info, false)).addMcpDefinitions(this.argv['add-mcp-to-workspace'], this.argv['add-mcp']);
+			return instantiationService.createInstance(McpManagementCli, new ConsoleLogger(LogLevel.Info, false)).addMcpDefinitions(this.argv['add-mcp']);
 		}
 
 		// Telemetry
diff --git a/src/vs/platform/environment/common/argv.ts b/src/vs/platform/environment/common/argv.ts
index a4f7464f934f..1efc1b5de457 100644
--- a/src/vs/platform/environment/common/argv.ts
+++ b/src/vs/platform/environment/common/argv.ts
@@ -94,7 +94,6 @@ export interface NativeParsedArgs {
 	'export-default-configuration'?: string;
 	'install-source'?: string;
 	'add-mcp'?: string[];
-	'add-mcp-to-workspace'?: string;
 	'disable-updates'?: boolean;
 	'use-inmemory-secretstorage'?: boolean;
 	'password-store'?: string;
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
index 2a69ae919cf7..0025e4b59739 100644
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -105,7 +105,6 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'enable-proposed-api': { type: 'string[]', allowEmptyValue: true, cat: 'e', args: 'ext-id', description: localize('experimentalApis', "Enables proposed API features for extensions. Can receive one or more extension IDs to enable individually.") },
 
 	'add-mcp': { type: 'string[]', cat: 'o', args: 'json', description: localize('addMcp', "Adds a Model Context Protocol server definition to the user profile, or workspace or folder when used with --mcp-workspace. Accepts JSON input in the form '{\"name\":\"server-name\",\"command\":...}'") },
-	'add-mcp-to-workspace': { type: 'string', cat: 'o', args: 'path', description: localize('addMcpWorkspace', "Folder or workspace in which to add Model Context Protocol servers, when used with '--add-mcp'") },
 
 	'version': { type: 'boolean', cat: 't', alias: 'v', description: localize('version', "Print version.") },
 	'verbose': { type: 'boolean', cat: 't', global: true, description: localize('verbose', "Print verbose output (implies --wait).") },
diff --git a/src/vs/platform/mcp/common/mcpManagementCli.ts b/src/vs/platform/mcp/common/mcpManagementCli.ts
index 54ab50ee1210..28ff0484bab0 100644
--- a/src/vs/platform/mcp/common/mcpManagementCli.ts
+++ b/src/vs/platform/mcp/common/mcpManagementCli.ts
@@ -3,13 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from '../../../base/common/uri.js';
 import { IConfigurationService } from '../../configuration/common/configuration.js';
-import { ConfigurationService } from '../../configuration/common/configurationService.js';
-import { IFileService } from '../../files/common/files.js';
-import { ILogger, ILogService } from '../../log/common/log.js';
-import { IPolicyService } from '../../policy/common/policy.js';
-import { hasWorkspaceFileExtension } from '../../workspace/common/workspace.js';
+import { ILogger } from '../../log/common/log.js';
 import { IMcpConfiguration, IMcpConfigurationServer } from './mcpPlatformTypes.js';
 
 type ValidatedConfig = { name: string; config: IMcpConfigurationServer };
@@ -18,40 +13,13 @@ export class McpManagementCli {
 	constructor(
 		private readonly _logger: ILogger,
 		@IConfigurationService private readonly _userConfigurationService: IConfigurationService,
-		@IFileService private readonly _fileService: IFileService,
-		@IPolicyService private readonly _policyService: IPolicyService,
-		@ILogService private readonly _logService: ILogService,
 	) { }
 
 	async addMcpDefinitions(
-		workspace: string | undefined,
 		definitions: string[],
 	) {
 		const configs = definitions.map((config) => this.validateConfiguration(config));
-
-		if (workspace) {
-			// todo (see below comments)
-			throw new InvalidMcpOperationError(`Installing into workspaces is not yet supported`);
-		}
-
-		if (!workspace) {
-			await this.updateMcpInConfig(this._userConfigurationService, configs);
-		} else if (hasWorkspaceFileExtension(workspace)) {
-			// This is not right because settings are nested in .code-workspace...
-			const workspaceConfigService = new ConfigurationService(URI.file(workspace), this._fileService, this._policyService, this._logService);
-			await this.updateMcpInConfig(workspaceConfigService, configs);
-			workspaceConfigService.dispose();
-		} else {
-			// todo: this seems incorrect. IConfigurationService.getValue() fails if
-			// if we point it to mcp.json and call `sevice.getValue()` with no args
-			// but if we point to launch.json, it writes it there instead of the
-			// standalone config file. This technically works but is undesirable.
-			const workspaceFile = URI.joinPath(URI.file(workspace), '.vscode', 'settings.json');
-			const workspaceFolderConfigService = new ConfigurationService(workspaceFile, this._fileService, this._policyService, this._logService);
-			await this.updateMcpInConfig(workspaceFolderConfigService, configs);
-			workspaceFolderConfigService.dispose();
-		}
-
+		await this.updateMcpInConfig(this._userConfigurationService, configs);
 		this._logger.info(`Added MCP servers: ${configs.map(c => c.name).join(', ')}`);
 	}
 

From 3071862cc1a69506bd93ceab1117c8281037e1b9 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Tue, 25 Feb 2025 12:19:27 -0800
Subject: [PATCH 0840/1815] refactor out the markdown link parsers into a
 separate file

---
 .../codecs/markdownCodec/markdownDecoder.ts   | 210 +----------------
 .../markdownCodec/parsers/markdownLink.ts     | 218 ++++++++++++++++++
 2 files changed, 221 insertions(+), 207 deletions(-)
 create mode 100644 src/vs/editor/common/codecs/markdownCodec/parsers/markdownLink.ts

diff --git a/src/vs/editor/common/codecs/markdownCodec/markdownDecoder.ts b/src/vs/editor/common/codecs/markdownCodec/markdownDecoder.ts
index 3703fa1df29c..71b8d6488464 100644
--- a/src/vs/editor/common/codecs/markdownCodec/markdownDecoder.ts
+++ b/src/vs/editor/common/codecs/markdownCodec/markdownDecoder.ts
@@ -4,18 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { MarkdownLink } from './tokens/markdownLink.js';
-import { NewLine } from '../linesCodec/tokens/newLine.js';
-import { assert } from '../../../../base/common/assert.js';
-import { FormFeed } from '../simpleCodec/tokens/formFeed.js';
 import { VSBuffer } from '../../../../base/common/buffer.js';
-import { VerticalTab } from '../simpleCodec/tokens/verticalTab.js';
+import { LeftBracket } from '../simpleCodec/tokens/brackets.js';
 import { ReadableStream } from '../../../../base/common/stream.js';
-import { CarriageReturn } from '../linesCodec/tokens/carriageReturn.js';
 import { BaseDecoder } from '../../../../base/common/codecs/baseDecoder.js';
-import { LeftBracket, RightBracket } from '../simpleCodec/tokens/brackets.js';
 import { SimpleDecoder, TSimpleToken } from '../simpleCodec/simpleDecoder.js';
-import { ParserBase, TAcceptTokenResult } from '../simpleCodec/parserBase.js';
-import { LeftParenthesis, RightParenthesis } from '../simpleCodec/tokens/parentheses.js';
+import { MarkdownLinkCaption, PartialMarkdownLink, PartialMarkdownLinkCaption } from './parsers/markdownLink.js';
 
 /**
  * Tokens handled by this decoder.
@@ -23,205 +17,7 @@ import { LeftParenthesis, RightParenthesis } from '../simpleCodec/tokens/parenth
 export type TMarkdownToken = MarkdownLink | TSimpleToken;
 
 /**
- * List of characters that stop a markdown link sequence.
- */
-const MARKDOWN_LINK_STOP_CHARACTERS: readonly string[] = [CarriageReturn, NewLine, VerticalTab, FormFeed]
-	.map((token) => { return token.symbol; });
-
-/**
- * The parser responsible for parsing a `markdown link caption` part of a markdown
- * link (e.g., the `[caption text]` part of the `[caption text](./some/path)` link).
- *
- * The parsing process starts with single `[` token and collects all tokens until
- * the first `]` token is encountered. In this successful case, the parser transitions
- * into the {@linkcode MarkdownLinkCaption} parser type which continues the general
- * parsing process of the markdown link.
- *
- * Otherwise, if one of the stop characters defined in the {@linkcode MARKDOWN_LINK_STOP_CHARACTERS}
- * is encountered before the `]` token, the parsing process is aborted which is communicated to
- * the caller by returning a `failure` result. In this case, the caller is assumed to be responsible
- * for re-emitting the {@link tokens} accumulated so far as standalone entities since they are no
- * longer represent a coherent token entity of a larger size.
- */
-class PartialMarkdownLinkCaption extends ParserBase<TSimpleToken, PartialMarkdownLinkCaption | MarkdownLinkCaption> {
-	constructor(token: LeftBracket) {
-		super([token]);
-	}
-
-	public accept(token: TSimpleToken): TAcceptTokenResult<PartialMarkdownLinkCaption | MarkdownLinkCaption> {
-		// any of stop characters is are breaking a markdown link caption sequence
-		if (MARKDOWN_LINK_STOP_CHARACTERS.includes(token.text)) {
-			return {
-				result: 'failure',
-				wasTokenConsumed: false,
-			};
-		}
-
-		// the `]` character ends the caption of a markdown link
-		if (token instanceof RightBracket) {
-			return {
-				result: 'success',
-				nextParser: new MarkdownLinkCaption([...this.tokens, token]),
-				wasTokenConsumed: true,
-			};
-		}
-
-		// otherwise, include the token in the sequence
-		// and keep the current parser object instance
-		this.currentTokens.push(token);
-		return {
-			result: 'success',
-			nextParser: this,
-			wasTokenConsumed: true,
-		};
-	}
-}
-
-/**
- * The parser responsible for transitioning from a {@linkcode PartialMarkdownLinkCaption}
- * parser to the {@link PartialMarkdownLink} one, therefore serves a parser glue between
- * the `[caption]` and the `(./some/path)` parts of the `[caption](./some/path)` link.
- *
- * The only successful case of this parser is the `(` token that initiated the process
- * of parsing the `reference` part of a markdown link and in this case the parser
- * transitions into the `PartialMarkdownLink` parser type.
- *
- * Any other character is considered a failure result. In this case, the caller is assumed
- * to be responsible for re-emitting the {@link tokens} accumulated so far as standalone
- * entities since they are no longer represent a coherent token entity of a larger size.
- */
-class MarkdownLinkCaption extends ParserBase<TSimpleToken, MarkdownLinkCaption | PartialMarkdownLink> {
-	public accept(token: TSimpleToken): TAcceptTokenResult<MarkdownLinkCaption | PartialMarkdownLink> {
-		// the `(` character starts the link part of a markdown link
-		// that is the only character that can follow the caption
-		if (token instanceof LeftParenthesis) {
-			return {
-				result: 'success',
-				wasTokenConsumed: true,
-				nextParser: new PartialMarkdownLink([...this.tokens], token),
-			};
-		}
-
-		return {
-			result: 'failure',
-			wasTokenConsumed: false,
-		};
-	}
-}
-
-/**
- * The parser responsible for parsing a `link reference` part of a markdown link
- * (e.g., the `(./some/path)` part of the `[caption text](./some/path)` link).
- *
- * The parsing process starts with tokens that represent the `[caption]` part of a markdown
- * link, followed by the `(` token. The parser collects all subsequent tokens until final closing
- * parenthesis (`)`) is encountered (*\*see [1] below*). In this successful case, the parser object
- * transitions into the {@linkcode MarkdownLink} token type which signifies the end of the entire
- * parsing process of the link text.
- *
- * Otherwise, if one of the stop characters defined in the {@linkcode MARKDOWN_LINK_STOP_CHARACTERS}
- * is encountered before the final `)` token, the parsing process is aborted which is communicated to
- * the caller by returning a `failure` result. In this case, the caller is assumed to be responsible
- * for re-emitting the {@link tokens} accumulated so far as standalone entities since they are no
- * longer represent a coherent token entity of a larger size.
- *
- * `[1]` The `reference` part of the markdown link can contain any number of nested parenthesis, e.g.,
- * 	  `[caption](/some/p(th/file.md)` is a valid markdown link and a valid folder name, hence number
- *     of open parenthesis must match the number of closing ones and the path sequence is considered
- *     to be complete as soon as this requirement is met. Therefore the `final` word is used in
- *     the description comments above to highlight this important detail.
- */
-class PartialMarkdownLink extends ParserBase<TSimpleToken, PartialMarkdownLink | MarkdownLink> {
-	/**
-	 * Number of open parenthesis in the sequence.
-	 * See comment in the {@linkcode accept} method for more details.
-	 */
-	private openParensCount: number = 1;
-
-	constructor(
-		protected readonly captionTokens: TSimpleToken[],
-		token: LeftParenthesis,
-	) {
-		super([token]);
-	}
-
-	public override get tokens(): readonly TSimpleToken[] {
-		return [...this.captionTokens, ...this.currentTokens];
-	}
-
-	public accept(token: TSimpleToken): TAcceptTokenResult<PartialMarkdownLink | MarkdownLink> {
-		// markdown links allow for nested parenthesis inside the link reference part, but
-		// the number of open parenthesis must match the number of closing parenthesis, e.g.:
-		// 	- `[caption](/some/p()th/file.md)` is a valid markdown link
-		// 	- `[caption](/some/p(th/file.md)` is an invalid markdown link
-		// hence we use the `openParensCount` variable to keep track of the number of open
-		// parenthesis encountered so far; then upon encountering a closing parenthesis we
-		// decrement the `openParensCount` and if it reaches 0 - we consider the link reference
-		// to be complete
-
-		if (token instanceof LeftParenthesis) {
-			this.openParensCount += 1;
-		}
-
-		if (token instanceof RightParenthesis) {
-			this.openParensCount -= 1;
-
-			// sanity check! this must alway hold true because we return a complete markdown
-			// link as soon as we encounter matching number of closing parenthesis, hence
-			// we must never have `openParensCount` that is less than 0
-			assert(
-				this.openParensCount >= 0,
-				`Unexpected right parenthesis token encountered: '${token}'.`,
-			);
-
-			// the markdown link is complete as soon as we get the same number of closing parenthesis
-			if (this.openParensCount === 0) {
-				const { startLineNumber, startColumn } = this.captionTokens[0].range;
-
-				// create link caption string
-				const caption = this.captionTokens
-					.map((token) => { return token.text; })
-					.join('');
-
-				// create link reference string
-				this.currentTokens.push(token);
-				const reference = this.currentTokens
-					.map((token) => { return token.text; }).join('');
-
-				// return complete markdown link object
-				return {
-					result: 'success',
-					wasTokenConsumed: true,
-					nextParser: new MarkdownLink(
-						startLineNumber,
-						startColumn,
-						caption,
-						reference,
-					),
-				};
-			}
-		}
-
-		// any of stop characters is are breaking a markdown link reference sequence
-		if (MARKDOWN_LINK_STOP_CHARACTERS.includes(token.text)) {
-			return {
-				result: 'failure',
-				wasTokenConsumed: false,
-			};
-		}
-
-		// the rest of the tokens can be included in the sequence
-		this.currentTokens.push(token);
-		return {
-			result: 'success',
-			nextParser: this,
-			wasTokenConsumed: true,
-		};
-	}
-}
-
-/**
- * Decoder capable of parsing markdown entities (e.g., links) from a sequence of simplier tokens.
+ * Decoder capable of parsing markdown entities (e.g., links) from a sequence of simple tokens.
  */
 export class MarkdownDecoder extends BaseDecoder<TMarkdownToken, TSimpleToken> {
 	/**
diff --git a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownLink.ts b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownLink.ts
new file mode 100644
index 000000000000..66dc2ce4f7e0
--- /dev/null
+++ b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownLink.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 { MarkdownLink } from '../tokens/markdownLink.js';
+import { NewLine } from '../../linesCodec/tokens/newLine.js';
+import { assert } from '../../../../../base/common/assert.js';
+import { FormFeed } from '../../simpleCodec/tokens/formFeed.js';
+import { TSimpleToken } from '../../simpleCodec/simpleDecoder.js';
+import { VerticalTab } from '../../simpleCodec/tokens/verticalTab.js';
+import { CarriageReturn } from '../../linesCodec/tokens/carriageReturn.js';
+import { LeftBracket, RightBracket } from '../../simpleCodec/tokens/brackets.js';
+import { ParserBase, TAcceptTokenResult } from '../../simpleCodec/parserBase.js';
+import { LeftParenthesis, RightParenthesis } from '../../simpleCodec/tokens/parentheses.js';
+
+/**
+ * Tokens handled by this decoder.
+ */
+export type TMarkdownToken = MarkdownLink | TSimpleToken;
+
+/**
+ * List of characters that stop a markdown link sequence.
+ */
+const MARKDOWN_LINK_STOP_CHARACTERS: readonly string[] = [CarriageReturn, NewLine, VerticalTab, FormFeed]
+	.map((token) => { return token.symbol; });
+
+/**
+ * The parser responsible for parsing a `markdown link caption` part of a markdown
+ * link (e.g., the `[caption text]` part of the `[caption text](./some/path)` link).
+ *
+ * The parsing process starts with single `[` token and collects all tokens until
+ * the first `]` token is encountered. In this successful case, the parser transitions
+ * into the {@linkcode MarkdownLinkCaption} parser type which continues the general
+ * parsing process of the markdown link.
+ *
+ * Otherwise, if one of the stop characters defined in the {@linkcode MARKDOWN_LINK_STOP_CHARACTERS}
+ * is encountered before the `]` token, the parsing process is aborted which is communicated to
+ * the caller by returning a `failure` result. In this case, the caller is assumed to be responsible
+ * for re-emitting the {@link tokens} accumulated so far as standalone entities since they are no
+ * longer represent a coherent token entity of a larger size.
+ */
+export class PartialMarkdownLinkCaption extends ParserBase<TSimpleToken, PartialMarkdownLinkCaption | MarkdownLinkCaption> {
+	constructor(token: LeftBracket) {
+		super([token]);
+	}
+
+	public accept(token: TSimpleToken): TAcceptTokenResult<PartialMarkdownLinkCaption | MarkdownLinkCaption> {
+		// any of stop characters is are breaking a markdown link caption sequence
+		if (MARKDOWN_LINK_STOP_CHARACTERS.includes(token.text)) {
+			return {
+				result: 'failure',
+				wasTokenConsumed: false,
+			};
+		}
+
+		// the `]` character ends the caption of a markdown link
+		if (token instanceof RightBracket) {
+			return {
+				result: 'success',
+				nextParser: new MarkdownLinkCaption([...this.tokens, token]),
+				wasTokenConsumed: true,
+			};
+		}
+
+		// otherwise, include the token in the sequence
+		// and keep the current parser object instance
+		this.currentTokens.push(token);
+		return {
+			result: 'success',
+			nextParser: this,
+			wasTokenConsumed: true,
+		};
+	}
+}
+
+/**
+ * The parser responsible for transitioning from a {@linkcode PartialMarkdownLinkCaption}
+ * parser to the {@link PartialMarkdownLink} one, therefore serves a parser glue between
+ * the `[caption]` and the `(./some/path)` parts of the `[caption](./some/path)` link.
+ *
+ * The only successful case of this parser is the `(` token that initiated the process
+ * of parsing the `reference` part of a markdown link and in this case the parser
+ * transitions into the `PartialMarkdownLink` parser type.
+ *
+ * Any other character is considered a failure result. In this case, the caller is assumed
+ * to be responsible for re-emitting the {@link tokens} accumulated so far as standalone
+ * entities since they are no longer represent a coherent token entity of a larger size.
+ */
+export class MarkdownLinkCaption extends ParserBase<TSimpleToken, MarkdownLinkCaption | PartialMarkdownLink> {
+	public accept(token: TSimpleToken): TAcceptTokenResult<MarkdownLinkCaption | PartialMarkdownLink> {
+		// the `(` character starts the link part of a markdown link
+		// that is the only character that can follow the caption
+		if (token instanceof LeftParenthesis) {
+			return {
+				result: 'success',
+				wasTokenConsumed: true,
+				nextParser: new PartialMarkdownLink([...this.tokens], token),
+			};
+		}
+
+		return {
+			result: 'failure',
+			wasTokenConsumed: false,
+		};
+	}
+}
+
+/**
+ * The parser responsible for parsing a `link reference` part of a markdown link
+ * (e.g., the `(./some/path)` part of the `[caption text](./some/path)` link).
+ *
+ * The parsing process starts with tokens that represent the `[caption]` part of a markdown
+ * link, followed by the `(` token. The parser collects all subsequent tokens until final closing
+ * parenthesis (`)`) is encountered (*\*see [1] below*). In this successful case, the parser object
+ * transitions into the {@linkcode MarkdownLink} token type which signifies the end of the entire
+ * parsing process of the link text.
+ *
+ * Otherwise, if one of the stop characters defined in the {@linkcode MARKDOWN_LINK_STOP_CHARACTERS}
+ * is encountered before the final `)` token, the parsing process is aborted which is communicated to
+ * the caller by returning a `failure` result. In this case, the caller is assumed to be responsible
+ * for re-emitting the {@link tokens} accumulated so far as standalone entities since they are no
+ * longer represent a coherent token entity of a larger size.
+ *
+ * `[1]` The `reference` part of the markdown link can contain any number of nested parenthesis, e.g.,
+ * 	  `[caption](/some/p(th/file.md)` is a valid markdown link and a valid folder name, hence number
+ *     of open parenthesis must match the number of closing ones and the path sequence is considered
+ *     to be complete as soon as this requirement is met. Therefore the `final` word is used in
+ *     the description comments above to highlight this important detail.
+ */
+export class PartialMarkdownLink extends ParserBase<TSimpleToken, PartialMarkdownLink | MarkdownLink> {
+	/**
+	 * Number of open parenthesis in the sequence.
+	 * See comment in the {@linkcode accept} method for more details.
+	 */
+	private openParensCount: number = 1;
+
+	constructor(
+		protected readonly captionTokens: TSimpleToken[],
+		token: LeftParenthesis,
+	) {
+		super([token]);
+	}
+
+	public override get tokens(): readonly TSimpleToken[] {
+		return [...this.captionTokens, ...this.currentTokens];
+	}
+
+	public accept(token: TSimpleToken): TAcceptTokenResult<PartialMarkdownLink | MarkdownLink> {
+		// markdown links allow for nested parenthesis inside the link reference part, but
+		// the number of open parenthesis must match the number of closing parenthesis, e.g.:
+		// 	- `[caption](/some/p()th/file.md)` is a valid markdown link
+		// 	- `[caption](/some/p(th/file.md)` is an invalid markdown link
+		// hence we use the `openParensCount` variable to keep track of the number of open
+		// parenthesis encountered so far; then upon encountering a closing parenthesis we
+		// decrement the `openParensCount` and if it reaches 0 - we consider the link reference
+		// to be complete
+
+		if (token instanceof LeftParenthesis) {
+			this.openParensCount += 1;
+		}
+
+		if (token instanceof RightParenthesis) {
+			this.openParensCount -= 1;
+
+			// sanity check! this must alway hold true because we return a complete markdown
+			// link as soon as we encounter matching number of closing parenthesis, hence
+			// we must never have `openParensCount` that is less than 0
+			assert(
+				this.openParensCount >= 0,
+				`Unexpected right parenthesis token encountered: '${token}'.`,
+			);
+
+			// the markdown link is complete as soon as we get the same number of closing parenthesis
+			if (this.openParensCount === 0) {
+				const { startLineNumber, startColumn } = this.captionTokens[0].range;
+
+				// create link caption string
+				const caption = this.captionTokens
+					.map((token) => { return token.text; })
+					.join('');
+
+				// create link reference string
+				this.currentTokens.push(token);
+				const reference = this.currentTokens
+					.map((token) => { return token.text; }).join('');
+
+				// return complete markdown link object
+				return {
+					result: 'success',
+					wasTokenConsumed: true,
+					nextParser: new MarkdownLink(
+						startLineNumber,
+						startColumn,
+						caption,
+						reference,
+					),
+				};
+			}
+		}
+
+		// any of stop characters is are breaking a markdown link reference sequence
+		if (MARKDOWN_LINK_STOP_CHARACTERS.includes(token.text)) {
+			return {
+				result: 'failure',
+				wasTokenConsumed: false,
+			};
+		}
+
+		// the rest of the tokens can be included in the sequence
+		this.currentTokens.push(token);
+		return {
+			result: 'success',
+			nextParser: this,
+			wasTokenConsumed: true,
+		};
+	}
+}

From 6aab0b1a86afa1fed7446762ea1e4179db52a002 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Tue, 25 Feb 2025 14:50:42 -0800
Subject: [PATCH 0841/1815] suport for `<` and `>` tokens in the simple decoder

---
 .../markdownCodec/parsers/markdownLink.ts     |   2 +-
 .../codecs/simpleCodec/simpleDecoder.ts       |  22 ++--
 .../simpleCodec/tokens/angleBrackets.ts       | 102 ++++++++++++++++++
 .../codecs/simpleCodec/tokens/brackets.ts     |   7 +-
 .../codecs/simpleCodec/tokens/parentheses.ts  |  11 +-
 .../test/common/codecs/simpleDecoder.test.ts  |  18 ++--
 .../editor/test/common/utils/testDecoder.ts   |   4 +
 7 files changed, 143 insertions(+), 23 deletions(-)
 create mode 100644 src/vs/editor/common/codecs/simpleCodec/tokens/angleBrackets.ts

diff --git a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownLink.ts b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownLink.ts
index 66dc2ce4f7e0..808d40ff415e 100644
--- a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownLink.ts
+++ b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownLink.ts
@@ -20,7 +20,7 @@ import { LeftParenthesis, RightParenthesis } from '../../simpleCodec/tokens/pare
 export type TMarkdownToken = MarkdownLink | TSimpleToken;
 
 /**
- * List of characters that stop a markdown link sequence.
+ * List of characters that are not allowed in links so stop a markdown link sequence abruptly.
  */
 const MARKDOWN_LINK_STOP_CHARACTERS: readonly string[] = [CarriageReturn, NewLine, VerticalTab, FormFeed]
 	.map((token) => { return token.symbol; });
diff --git a/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts b/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts
index 88ad12985017..b4ad6465738e 100644
--- a/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts
+++ b/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts
@@ -12,39 +12,41 @@ import { VerticalTab } from './tokens/verticalTab.js';
 import { Space } from '../simpleCodec/tokens/space.js';
 import { NewLine } from '../linesCodec/tokens/newLine.js';
 import { VSBuffer } from '../../../../base/common/buffer.js';
-import { LeftBracket, RightBracket } from './tokens/brackets.js';
 import { ReadableStream } from '../../../../base/common/stream.js';
 import { CarriageReturn } from '../linesCodec/tokens/carriageReturn.js';
 import { LinesDecoder, TLineToken } from '../linesCodec/linesDecoder.js';
+import { LeftBracket, RightBracket, TBracket } from './tokens/brackets.js';
 import { BaseDecoder } from '../../../../base/common/codecs/baseDecoder.js';
-import { LeftParenthesis, RightParenthesis } from './tokens/parentheses.js';
+import { LeftParenthesis, RightParenthesis, TParenthesis } from './tokens/parentheses.js';
+import { LeftAngleBracket, RightAngleBracket, TAngleBracket } from './tokens/angleBrackets.js';
 
 /**
  * A token type that this decoder can handle.
  */
-export type TSimpleToken = Word | Space | Tab | VerticalTab | NewLine | FormFeed | CarriageReturn | LeftBracket
-	| RightBracket | LeftParenthesis | RightParenthesis | Colon | Hash;
+export type TSimpleToken = Word | Space | Tab | VerticalTab | NewLine | FormFeed
+	| CarriageReturn | TBracket | TAngleBracket | TParenthesis | Colon | Hash;
 
 /**
  * List of well-known distinct tokens that this decoder emits (excluding
  * the word stop characters defined below). Everything else is considered
  * an arbitrary "text" sequence and is emitted as a single `Word` token.
  */
-const WELL_KNOWN_TOKENS = [
+const WELL_KNOWN_TOKENS = Object.freeze([
 	Space, Tab, VerticalTab, FormFeed, LeftBracket, RightBracket,
+	LeftAngleBracket, RightAngleBracket,
 	LeftParenthesis, RightParenthesis, Colon, Hash,
-];
+]);
 
 /**
  * Characters that stop a "word" sequence.
  * Note! the `\r` and `\n` are excluded from the list because this decoder based on `LinesDecoder` which
  * 	     already handles the `carriagereturn`/`newline` cases and emits lines that don't contain them.
  */
-const WORD_STOP_CHARACTERS = [
+const WORD_STOP_CHARACTERS: readonly string[] = Object.freeze([
 	Space.symbol, Tab.symbol, VerticalTab.symbol, FormFeed.symbol,
-	LeftBracket.symbol, RightBracket.symbol, LeftParenthesis.symbol,
-	RightParenthesis.symbol, Colon.symbol, Hash.symbol,
-];
+	LeftBracket.symbol, RightBracket.symbol, LeftAngleBracket.symbol, RightAngleBracket.symbol,
+	LeftParenthesis.symbol, RightParenthesis.symbol, Colon.symbol, Hash.symbol,
+]);
 
 /**
  * A decoder that can decode a stream of `Line`s into a stream
diff --git a/src/vs/editor/common/codecs/simpleCodec/tokens/angleBrackets.ts b/src/vs/editor/common/codecs/simpleCodec/tokens/angleBrackets.ts
new file mode 100644
index 000000000000..70d264bdd993
--- /dev/null
+++ b/src/vs/editor/common/codecs/simpleCodec/tokens/angleBrackets.ts
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { BaseToken } from '../../baseToken.js';
+import { Range } from '../../../core/range.js';
+import { Position } from '../../../core/position.js';
+import { Line } from '../../linesCodec/tokens/line.js';
+
+/**
+ * A token that represent a `<` with a `range`. The `range`
+ * value reflects the position of the token in the original data.
+ */
+export class LeftAngleBracket extends BaseToken {
+	/**
+	 * The underlying symbol of the token.
+	 */
+	public static readonly symbol: string = '<';
+
+	/**
+	 * Return text representation of the token.
+	 */
+	public get text(): string {
+		return LeftAngleBracket.symbol;
+	}
+
+	/**
+	 * Create new `LeftBracket` token with range inside
+	 * the given `Line` at the given `column number`.
+	 */
+	public static newOnLine(
+		line: Line,
+		atColumnNumber: number,
+	): LeftAngleBracket {
+		const { range } = line;
+
+		const startPosition = new Position(range.startLineNumber, atColumnNumber);
+		const endPosition = new Position(range.startLineNumber, atColumnNumber + this.symbol.length);
+
+		return new LeftAngleBracket(Range.fromPositions(
+			startPosition,
+			endPosition,
+		));
+	}
+
+	/**
+	 * Returns a string representation of the token.
+	 */
+	public override toString(): string {
+		return `left-angle-bracket${this.range}`;
+	}
+}
+
+/**
+ * A token that represent a `>` with a `range`. The `range`
+ * value reflects the position of the token in the original data.
+ */
+export class RightAngleBracket extends BaseToken {
+	/**
+	 * The underlying symbol of the token.
+	 */
+	public static readonly symbol: string = '>';
+
+	/**
+	 * Return text representation of the token.
+	 */
+	public get text(): string {
+		return RightAngleBracket.symbol;
+	}
+
+	/**
+	 * Create new `RightAngleBracket` token with range inside
+	 * the given `Line` at the given `column number`.
+	 */
+	public static newOnLine(
+		line: Line,
+		atColumnNumber: number,
+	): RightAngleBracket {
+		const { range } = line;
+
+		const startPosition = new Position(range.startLineNumber, atColumnNumber);
+		const endPosition = new Position(range.startLineNumber, atColumnNumber + this.symbol.length);
+
+		return new RightAngleBracket(Range.fromPositions(
+			startPosition,
+			endPosition,
+		));
+	}
+
+	/**
+	 * Returns a string representation of the token.
+	 */
+	public override toString(): string {
+		return `right-angle-bracket${this.range}`;
+	}
+}
+
+/**
+ * General angle bracket token type.
+ */
+export type TAngleBracket = LeftAngleBracket | RightAngleBracket;
diff --git a/src/vs/editor/common/codecs/simpleCodec/tokens/brackets.ts b/src/vs/editor/common/codecs/simpleCodec/tokens/brackets.ts
index 5c6c1e46a5d3..16165cf64a71 100644
--- a/src/vs/editor/common/codecs/simpleCodec/tokens/brackets.ts
+++ b/src/vs/editor/common/codecs/simpleCodec/tokens/brackets.ts
@@ -36,7 +36,6 @@ export class LeftBracket extends BaseToken {
 		const { range } = line;
 
 		const startPosition = new Position(range.startLineNumber, atColumnNumber);
-		// the tab token length is 1, hence `+ 1`
 		const endPosition = new Position(range.startLineNumber, atColumnNumber + this.symbol.length);
 
 		return new LeftBracket(Range.fromPositions(
@@ -81,7 +80,6 @@ export class RightBracket extends BaseToken {
 		const { range } = line;
 
 		const startPosition = new Position(range.startLineNumber, atColumnNumber);
-		// the tab token length is 1, hence `+ 1`
 		const endPosition = new Position(range.startLineNumber, atColumnNumber + this.symbol.length);
 
 		return new RightBracket(Range.fromPositions(
@@ -97,3 +95,8 @@ export class RightBracket extends BaseToken {
 		return `right-bracket${this.range}`;
 	}
 }
+
+/**
+ * General bracket token type.
+ */
+export type TBracket = LeftBracket | RightBracket;
diff --git a/src/vs/editor/common/codecs/simpleCodec/tokens/parentheses.ts b/src/vs/editor/common/codecs/simpleCodec/tokens/parentheses.ts
index b67f4e10f5c7..d3509824f539 100644
--- a/src/vs/editor/common/codecs/simpleCodec/tokens/parentheses.ts
+++ b/src/vs/editor/common/codecs/simpleCodec/tokens/parentheses.ts
@@ -14,7 +14,7 @@ import { Line } from '../../linesCodec/tokens/line.js';
  */
 export class LeftParenthesis extends BaseToken {
 	/**
-	 * The underlying symbol of the `LeftParenthesis` token.
+	 * The underlying symbol of the token.
 	 */
 	public static readonly symbol: string = '(';
 
@@ -36,7 +36,6 @@ export class LeftParenthesis extends BaseToken {
 		const { range } = line;
 
 		const startPosition = new Position(range.startLineNumber, atColumnNumber);
-		// the tab token length is 1, hence `+ 1`
 		const endPosition = new Position(range.startLineNumber, atColumnNumber + this.symbol.length);
 
 		return new LeftParenthesis(Range.fromPositions(
@@ -59,7 +58,7 @@ export class LeftParenthesis extends BaseToken {
  */
 export class RightParenthesis extends BaseToken {
 	/**
-	 * The underlying symbol of the `RightParenthesis` token.
+	 * The underlying symbol of the token.
 	 */
 	public static readonly symbol: string = ')';
 
@@ -81,7 +80,6 @@ export class RightParenthesis extends BaseToken {
 		const { range } = line;
 
 		const startPosition = new Position(range.startLineNumber, atColumnNumber);
-		// the tab token length is 1, hence `+ 1`
 		const endPosition = new Position(range.startLineNumber, atColumnNumber + this.symbol.length);
 
 		return new RightParenthesis(Range.fromPositions(
@@ -97,3 +95,8 @@ export class RightParenthesis extends BaseToken {
 		return `right-parenthesis${this.range}`;
 	}
 }
+
+/**
+ * General parenthesis token type.
+ */
+export type TParenthesis = LeftParenthesis | RightParenthesis;
diff --git a/src/vs/editor/test/common/codecs/simpleDecoder.test.ts b/src/vs/editor/test/common/codecs/simpleDecoder.test.ts
index b0804a2fe5fa..a13eb3fb502b 100644
--- a/src/vs/editor/test/common/codecs/simpleDecoder.test.ts
+++ b/src/vs/editor/test/common/codecs/simpleDecoder.test.ts
@@ -19,6 +19,7 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/c
 import { SimpleDecoder, TSimpleToken } from '../../../common/codecs/simpleCodec/simpleDecoder.js';
 import { LeftBracket, RightBracket } from '../../../common/codecs/simpleCodec/tokens/brackets.js';
 import { LeftParenthesis, RightParenthesis } from '../../../common/codecs/simpleCodec/tokens/parentheses.js';
+import { LeftAngleBracket, RightAngleBracket } from '../../../common/codecs/simpleCodec/tokens/angleBrackets.js';
 
 /**
  * A reusable test utility that asserts that a `SimpleDecoder` instance
@@ -60,7 +61,7 @@ suite('SimpleDecoder', () => {
 		);
 
 		await test.run(
-			' hello world\nhow are\t you?\v\n\n   (test)  [!@#$%^🦄&*_+=]\f  \n\t\t🤗❤ \t\n hey\vthere\r\n\r\n',
+			' hello world\nhow are\t you?\v\n\n   (test)  [!@#$%^🦄&*_+=]\f  \n\t<hi 👋>\t🤗❤ \t\n hey\vthere\r\n\r\n',
 			[
 				// first line
 				new Space(new Range(1, 1, 1, 2)),
@@ -99,11 +100,16 @@ suite('SimpleDecoder', () => {
 				new NewLine(new Range(4, 30, 4, 31)),
 				// fifth line
 				new Tab(new Range(5, 1, 5, 2)),
-				new Tab(new Range(5, 2, 5, 3)),
-				new Word(new Range(5, 3, 5, 6), '🤗❤'),
-				new Space(new Range(5, 6, 5, 7)),
-				new Tab(new Range(5, 7, 5, 8)),
-				new NewLine(new Range(5, 8, 5, 9)),
+				new LeftAngleBracket(new Range(5, 2, 5, 3)),
+				new Word(new Range(5, 3, 5, 5), 'hi'),
+				new Space(new Range(5, 5, 5, 6)),
+				new Word(new Range(5, 6, 5, 8), '👋'),
+				new RightAngleBracket(new Range(5, 8, 5, 9)),
+				new Tab(new Range(5, 9, 5, 10)),
+				new Word(new Range(5, 10, 5, 13), '🤗❤'),
+				new Space(new Range(5, 13, 5, 14)),
+				new Tab(new Range(5, 14, 5, 15)),
+				new NewLine(new Range(5, 15, 5, 16)),
 				// sixth line
 				new Space(new Range(6, 1, 6, 2)),
 				new Word(new Range(6, 2, 6, 5), 'hey'),
diff --git a/src/vs/editor/test/common/utils/testDecoder.ts b/src/vs/editor/test/common/utils/testDecoder.ts
index a998a64e2cc1..4f29a2f18145 100644
--- a/src/vs/editor/test/common/utils/testDecoder.ts
+++ b/src/vs/editor/test/common/utils/testDecoder.ts
@@ -129,6 +129,8 @@ export class TestDecoder<T extends BaseToken, D extends BaseDecoder<T>> extends
 						receivedTokens.push(token);
 					});
 
+					this.decoder.start();
+
 					// in this case we also test the `settled` promise of the decoder
 					await this.decoder.settled;
 
@@ -158,6 +160,8 @@ export class TestDecoder<T extends BaseToken, D extends BaseDecoder<T>> extends
 			// add the tokens consume method to the error message so we
 			// would know which method of consuming the tokens failed exactly
 			error.message = `[${tokensConsumeMethod}] ${error.message}`;
+
+			throw error;
 		}
 	}
 

From 6af7fd5cc3980bcf3e68705d30f539825c1ffe42 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Tue, 25 Feb 2025 14:52:49 -0800
Subject: [PATCH 0842/1815] support dash token in simple decoder

---
 .../codecs/simpleCodec/simpleDecoder.ts       | 17 ++++--
 .../common/codecs/simpleCodec/tokens/colon.ts |  5 +-
 .../common/codecs/simpleCodec/tokens/dash.ts  | 53 +++++++++++++++++++
 .../common/codecs/simpleCodec/tokens/hash.ts  |  5 +-
 .../common/codecs/simpleCodec/tokens/tab.ts   |  5 +-
 .../test/common/codecs/simpleDecoder.test.ts  | 20 ++++---
 6 files changed, 83 insertions(+), 22 deletions(-)
 create mode 100644 src/vs/editor/common/codecs/simpleCodec/tokens/dash.ts

diff --git a/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts b/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts
index b4ad6465738e..54089bfaa9e1 100644
--- a/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts
+++ b/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Hash } from './tokens/hash.js';
+import { Dash } from './tokens/dash.js';
 import { Colon } from './tokens/colon.js';
 import { FormFeed } from './tokens/formFeed.js';
 import { Tab } from '../simpleCodec/tokens/tab.js';
@@ -20,11 +21,17 @@ import { BaseDecoder } from '../../../../base/common/codecs/baseDecoder.js';
 import { LeftParenthesis, RightParenthesis, TParenthesis } from './tokens/parentheses.js';
 import { LeftAngleBracket, RightAngleBracket, TAngleBracket } from './tokens/angleBrackets.js';
 
+/**
+ * TODO: @legomushroom - list
+ *  - add `!` token support
+ *  - add `comment` token support in the markdown decoder
+ */
+
 /**
  * A token type that this decoder can handle.
  */
 export type TSimpleToken = Word | Space | Tab | VerticalTab | NewLine | FormFeed
-	| CarriageReturn | TBracket | TAngleBracket | TParenthesis | Colon | Hash;
+	| CarriageReturn | TBracket | TAngleBracket | TParenthesis | Colon | Hash | Dash;
 
 /**
  * List of well-known distinct tokens that this decoder emits (excluding
@@ -32,9 +39,9 @@ export type TSimpleToken = Word | Space | Tab | VerticalTab | NewLine | FormFeed
  * an arbitrary "text" sequence and is emitted as a single `Word` token.
  */
 const WELL_KNOWN_TOKENS = Object.freeze([
-	Space, Tab, VerticalTab, FormFeed, LeftBracket, RightBracket,
-	LeftAngleBracket, RightAngleBracket,
-	LeftParenthesis, RightParenthesis, Colon, Hash,
+	Space, Tab, VerticalTab, FormFeed,
+	LeftBracket, RightBracket, LeftAngleBracket, RightAngleBracket,
+	LeftParenthesis, RightParenthesis, Colon, Hash, Dash,
 ]);
 
 /**
@@ -45,7 +52,7 @@ const WELL_KNOWN_TOKENS = Object.freeze([
 const WORD_STOP_CHARACTERS: readonly string[] = Object.freeze([
 	Space.symbol, Tab.symbol, VerticalTab.symbol, FormFeed.symbol,
 	LeftBracket.symbol, RightBracket.symbol, LeftAngleBracket.symbol, RightAngleBracket.symbol,
-	LeftParenthesis.symbol, RightParenthesis.symbol, Colon.symbol, Hash.symbol,
+	LeftParenthesis.symbol, RightParenthesis.symbol, Colon.symbol, Hash.symbol, Dash.symbol,
 ]);
 
 /**
diff --git a/src/vs/editor/common/codecs/simpleCodec/tokens/colon.ts b/src/vs/editor/common/codecs/simpleCodec/tokens/colon.ts
index 2c4b89d9ce52..76e9f0cd2b4e 100644
--- a/src/vs/editor/common/codecs/simpleCodec/tokens/colon.ts
+++ b/src/vs/editor/common/codecs/simpleCodec/tokens/colon.ts
@@ -14,7 +14,7 @@ import { Line } from '../../linesCodec/tokens/line.js';
  */
 export class Colon extends BaseToken {
 	/**
-	 * The underlying symbol of the `LeftBracket` token.
+	 * The underlying symbol of the token.
 	 */
 	public static readonly symbol: string = ':';
 
@@ -26,7 +26,7 @@ export class Colon extends BaseToken {
 	}
 
 	/**
-	 * Create new `LeftBracket` token with range inside
+	 * Create new token with range inside
 	 * the given `Line` at the given `column number`.
 	 */
 	public static newOnLine(
@@ -36,7 +36,6 @@ export class Colon extends BaseToken {
 		const { range } = line;
 
 		const startPosition = new Position(range.startLineNumber, atColumnNumber);
-		// the tab token length is 1, hence `+ 1`
 		const endPosition = new Position(range.startLineNumber, atColumnNumber + this.symbol.length);
 
 		return new Colon(Range.fromPositions(
diff --git a/src/vs/editor/common/codecs/simpleCodec/tokens/dash.ts b/src/vs/editor/common/codecs/simpleCodec/tokens/dash.ts
new file mode 100644
index 000000000000..ebc0179eeef9
--- /dev/null
+++ b/src/vs/editor/common/codecs/simpleCodec/tokens/dash.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 { BaseToken } from '../../baseToken.js';
+import { Range } from '../../../core/range.js';
+import { Position } from '../../../core/position.js';
+import { Line } from '../../linesCodec/tokens/line.js';
+
+/**
+ * A token that represent a `-` with a `range`. The `range`
+ * value reflects the position of the token in the original data.
+ */
+export class Dash extends BaseToken {
+	/**
+	 * The underlying symbol of the token.
+	 */
+	public static readonly symbol: string = '-';
+
+	/**
+	 * Return text representation of the token.
+	 */
+	public get text(): string {
+		return Dash.symbol;
+	}
+
+	/**
+	 * Create new token with range inside
+	 * the given `Line` at the given `column number`.
+	 */
+	public static newOnLine(
+		line: Line,
+		atColumnNumber: number,
+	): Dash {
+		const { range } = line;
+
+		const startPosition = new Position(range.startLineNumber, atColumnNumber);
+		const endPosition = new Position(range.startLineNumber, atColumnNumber + this.symbol.length);
+
+		return new Dash(Range.fromPositions(
+			startPosition,
+			endPosition,
+		));
+	}
+
+	/**
+	 * Returns a string representation of the token.
+	 */
+	public override toString(): string {
+		return `dash${this.range}`;
+	}
+}
diff --git a/src/vs/editor/common/codecs/simpleCodec/tokens/hash.ts b/src/vs/editor/common/codecs/simpleCodec/tokens/hash.ts
index 372e0b2ee3d9..ddca12a22792 100644
--- a/src/vs/editor/common/codecs/simpleCodec/tokens/hash.ts
+++ b/src/vs/editor/common/codecs/simpleCodec/tokens/hash.ts
@@ -14,7 +14,7 @@ import { Line } from '../../linesCodec/tokens/line.js';
  */
 export class Hash extends BaseToken {
 	/**
-	 * The underlying symbol of the `LeftBracket` token.
+	 * The underlying symbol of the token.
 	 */
 	public static readonly symbol: string = '#';
 
@@ -26,7 +26,7 @@ export class Hash extends BaseToken {
 	}
 
 	/**
-	 * Create new `LeftBracket` token with range inside
+	 * Create new token with range inside
 	 * the given `Line` at the given `column number`.
 	 */
 	public static newOnLine(
@@ -36,7 +36,6 @@ export class Hash extends BaseToken {
 		const { range } = line;
 
 		const startPosition = new Position(range.startLineNumber, atColumnNumber);
-		// the tab token length is 1, hence `+ 1`
 		const endPosition = new Position(range.startLineNumber, atColumnNumber + this.symbol.length);
 
 		return new Hash(Range.fromPositions(
diff --git a/src/vs/editor/common/codecs/simpleCodec/tokens/tab.ts b/src/vs/editor/common/codecs/simpleCodec/tokens/tab.ts
index 7f511c2626bf..c0d775ff8cd8 100644
--- a/src/vs/editor/common/codecs/simpleCodec/tokens/tab.ts
+++ b/src/vs/editor/common/codecs/simpleCodec/tokens/tab.ts
@@ -14,7 +14,7 @@ import { Position } from '../../../../../editor/common/core/position.js';
  */
 export class Tab extends BaseToken {
 	/**
-	 * The underlying symbol of the `Tab` token.
+	 * The underlying symbol of the token.
 	 */
 	public static readonly symbol: string = '\t';
 
@@ -26,7 +26,7 @@ export class Tab extends BaseToken {
 	}
 
 	/**
-	 * Create new `Tab` token with range inside
+	 * Create new token with range inside
 	 * the given `Line` at the given `column number`.
 	 */
 	public static newOnLine(
@@ -36,7 +36,6 @@ export class Tab extends BaseToken {
 		const { range } = line;
 
 		const startPosition = new Position(range.startLineNumber, atColumnNumber);
-		// the tab token length is 1, hence `+ 1`
 		const endPosition = new Position(range.startLineNumber, atColumnNumber + this.symbol.length);
 
 		return new Tab(Range.fromPositions(
diff --git a/src/vs/editor/test/common/codecs/simpleDecoder.test.ts b/src/vs/editor/test/common/codecs/simpleDecoder.test.ts
index a13eb3fb502b..7ebc25e160f7 100644
--- a/src/vs/editor/test/common/codecs/simpleDecoder.test.ts
+++ b/src/vs/editor/test/common/codecs/simpleDecoder.test.ts
@@ -10,6 +10,7 @@ import { newWriteableStream } from '../../../../base/common/stream.js';
 import { Tab } from '../../../common/codecs/simpleCodec/tokens/tab.js';
 import { Hash } from '../../../common/codecs/simpleCodec/tokens/hash.js';
 import { Word } from '../../../common/codecs/simpleCodec/tokens/word.js';
+import { Dash } from '../../../common/codecs/simpleCodec/tokens/dash.js';
 import { Space } from '../../../common/codecs/simpleCodec/tokens/space.js';
 import { NewLine } from '../../../common/codecs/linesCodec/tokens/newLine.js';
 import { FormFeed } from '../../../common/codecs/simpleCodec/tokens/formFeed.js';
@@ -61,7 +62,7 @@ suite('SimpleDecoder', () => {
 		);
 
 		await test.run(
-			' hello world\nhow are\t you?\v\n\n   (test)  [!@#$%^🦄&*_+=]\f  \n\t<hi 👋>\t🤗❤ \t\n hey\vthere\r\n\r\n',
+			' hello world\nhow are\t you?\v\n\n   (test)  [!@#$%^🦄&*_+=-]\f  \n\t<hi 👋>\t🤗❤ \t\n hey\v-\tthere\r\n\r\n',
 			[
 				// first line
 				new Space(new Range(1, 1, 1, 2)),
@@ -93,11 +94,12 @@ suite('SimpleDecoder', () => {
 				new Word(new Range(4, 13, 4, 13 + 2), '!@'),
 				new Hash(new Range(4, 15, 4, 16)),
 				new Word(new Range(4, 16, 4, 16 + 10), '$%^🦄&*_+='),
-				new RightBracket(new Range(4, 26, 4, 27)),
-				new FormFeed(new Range(4, 27, 4, 28)),
-				new Space(new Range(4, 28, 4, 29)),
+				new Dash(new Range(4, 26, 4, 27)),
+				new RightBracket(new Range(4, 27, 4, 28)),
+				new FormFeed(new Range(4, 28, 4, 29)),
 				new Space(new Range(4, 29, 4, 30)),
-				new NewLine(new Range(4, 30, 4, 31)),
+				new Space(new Range(4, 30, 4, 31)),
+				new NewLine(new Range(4, 31, 4, 32)),
 				// fifth line
 				new Tab(new Range(5, 1, 5, 2)),
 				new LeftAngleBracket(new Range(5, 2, 5, 3)),
@@ -114,9 +116,11 @@ suite('SimpleDecoder', () => {
 				new Space(new Range(6, 1, 6, 2)),
 				new Word(new Range(6, 2, 6, 5), 'hey'),
 				new VerticalTab(new Range(6, 5, 6, 6)),
-				new Word(new Range(6, 6, 6, 11), 'there'),
-				new CarriageReturn(new Range(6, 11, 6, 12)),
-				new NewLine(new Range(6, 12, 6, 13)),
+				new Dash(new Range(6, 6, 6, 7)),
+				new Tab(new Range(6, 7, 6, 8)),
+				new Word(new Range(6, 8, 6, 13), 'there'),
+				new CarriageReturn(new Range(6, 13, 6, 14)),
+				new NewLine(new Range(6, 14, 6, 15)),
 				// seventh line
 				new CarriageReturn(new Range(7, 1, 7, 2)),
 				new NewLine(new Range(7, 2, 7, 3)),

From e767fe120b661f89c556e4eb78d425c14ff1fbf9 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Tue, 25 Feb 2025 16:08:47 -0800
Subject: [PATCH 0843/1815] add `!` token support

---
 .../codecs/simpleCodec/simpleDecoder.ts       | 10 ++--
 .../simpleCodec/tokens/exclamationMark.ts     | 53 +++++++++++++++++++
 .../test/common/codecs/simpleDecoder.test.ts  |  9 ++--
 3 files changed, 65 insertions(+), 7 deletions(-)
 create mode 100644 src/vs/editor/common/codecs/simpleCodec/tokens/exclamationMark.ts

diff --git a/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts b/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts
index 54089bfaa9e1..80186a14cc5e 100644
--- a/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts
+++ b/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts
@@ -13,6 +13,7 @@ import { VerticalTab } from './tokens/verticalTab.js';
 import { Space } from '../simpleCodec/tokens/space.js';
 import { NewLine } from '../linesCodec/tokens/newLine.js';
 import { VSBuffer } from '../../../../base/common/buffer.js';
+import { ExclamationMark } from './tokens/exclamationMark.js';
 import { ReadableStream } from '../../../../base/common/stream.js';
 import { CarriageReturn } from '../linesCodec/tokens/carriageReturn.js';
 import { LinesDecoder, TLineToken } from '../linesCodec/linesDecoder.js';
@@ -23,7 +24,6 @@ import { LeftAngleBracket, RightAngleBracket, TAngleBracket } from './tokens/ang
 
 /**
  * TODO: @legomushroom - list
- *  - add `!` token support
  *  - add `comment` token support in the markdown decoder
  */
 
@@ -31,7 +31,8 @@ import { LeftAngleBracket, RightAngleBracket, TAngleBracket } from './tokens/ang
  * A token type that this decoder can handle.
  */
 export type TSimpleToken = Word | Space | Tab | VerticalTab | NewLine | FormFeed
-	| CarriageReturn | TBracket | TAngleBracket | TParenthesis | Colon | Hash | Dash;
+	| CarriageReturn | TBracket | TAngleBracket | TParenthesis
+	| Colon | Hash | Dash | ExclamationMark;
 
 /**
  * List of well-known distinct tokens that this decoder emits (excluding
@@ -41,7 +42,7 @@ export type TSimpleToken = Word | Space | Tab | VerticalTab | NewLine | FormFeed
 const WELL_KNOWN_TOKENS = Object.freeze([
 	Space, Tab, VerticalTab, FormFeed,
 	LeftBracket, RightBracket, LeftAngleBracket, RightAngleBracket,
-	LeftParenthesis, RightParenthesis, Colon, Hash, Dash,
+	LeftParenthesis, RightParenthesis, Colon, Hash, Dash, ExclamationMark,
 ]);
 
 /**
@@ -52,7 +53,8 @@ const WELL_KNOWN_TOKENS = Object.freeze([
 const WORD_STOP_CHARACTERS: readonly string[] = Object.freeze([
 	Space.symbol, Tab.symbol, VerticalTab.symbol, FormFeed.symbol,
 	LeftBracket.symbol, RightBracket.symbol, LeftAngleBracket.symbol, RightAngleBracket.symbol,
-	LeftParenthesis.symbol, RightParenthesis.symbol, Colon.symbol, Hash.symbol, Dash.symbol,
+	LeftParenthesis.symbol, RightParenthesis.symbol,
+	Colon.symbol, Hash.symbol, Dash.symbol, ExclamationMark.symbol,
 ]);
 
 /**
diff --git a/src/vs/editor/common/codecs/simpleCodec/tokens/exclamationMark.ts b/src/vs/editor/common/codecs/simpleCodec/tokens/exclamationMark.ts
new file mode 100644
index 000000000000..025edf702912
--- /dev/null
+++ b/src/vs/editor/common/codecs/simpleCodec/tokens/exclamationMark.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 { BaseToken } from '../../baseToken.js';
+import { Range } from '../../../core/range.js';
+import { Position } from '../../../core/position.js';
+import { Line } from '../../linesCodec/tokens/line.js';
+
+/**
+ * A token that represent a `!` with a `range`. The `range`
+ * value reflects the position of the token in the original data.
+ */
+export class ExclamationMark extends BaseToken {
+	/**
+	 * The underlying symbol of the token.
+	 */
+	public static readonly symbol: string = '!';
+
+	/**
+	 * Return text representation of the token.
+	 */
+	public get text(): string {
+		return ExclamationMark.symbol;
+	}
+
+	/**
+	 * Create new token with range inside
+	 * the given `Line` at the given `column number`.
+	 */
+	public static newOnLine(
+		line: Line,
+		atColumnNumber: number,
+	): ExclamationMark {
+		const { range } = line;
+
+		const startPosition = new Position(range.startLineNumber, atColumnNumber);
+		const endPosition = new Position(range.startLineNumber, atColumnNumber + this.symbol.length);
+
+		return new ExclamationMark(Range.fromPositions(
+			startPosition,
+			endPosition,
+		));
+	}
+
+	/**
+	 * Returns a string representation of the token.
+	 */
+	public override toString(): string {
+		return `exclamation-mark${this.range}`;
+	}
+}
diff --git a/src/vs/editor/test/common/codecs/simpleDecoder.test.ts b/src/vs/editor/test/common/codecs/simpleDecoder.test.ts
index 7ebc25e160f7..16ae699708c8 100644
--- a/src/vs/editor/test/common/codecs/simpleDecoder.test.ts
+++ b/src/vs/editor/test/common/codecs/simpleDecoder.test.ts
@@ -21,6 +21,7 @@ import { SimpleDecoder, TSimpleToken } from '../../../common/codecs/simpleCodec/
 import { LeftBracket, RightBracket } from '../../../common/codecs/simpleCodec/tokens/brackets.js';
 import { LeftParenthesis, RightParenthesis } from '../../../common/codecs/simpleCodec/tokens/parentheses.js';
 import { LeftAngleBracket, RightAngleBracket } from '../../../common/codecs/simpleCodec/tokens/angleBrackets.js';
+import { ExclamationMark } from '../../../common/codecs/simpleCodec/tokens/exclamationMark.js';
 
 /**
  * A reusable test utility that asserts that a `SimpleDecoder` instance
@@ -62,14 +63,15 @@ suite('SimpleDecoder', () => {
 		);
 
 		await test.run(
-			' hello world\nhow are\t you?\v\n\n   (test)  [!@#$%^🦄&*_+=-]\f  \n\t<hi 👋>\t🤗❤ \t\n hey\v-\tthere\r\n\r\n',
+			' hello world!\nhow are\t you?\v\n\n   (test)  [!@#$%^🦄&*_+=-]\f  \n\t<hi 👋>\t🤗❤ \t\n hey\v-\tthere\r\n\r\n',
 			[
 				// first line
 				new Space(new Range(1, 1, 1, 2)),
 				new Word(new Range(1, 2, 1, 7), 'hello'),
 				new Space(new Range(1, 7, 1, 8)),
 				new Word(new Range(1, 8, 1, 13), 'world'),
-				new NewLine(new Range(1, 13, 1, 14)),
+				new ExclamationMark(new Range(1, 13, 1, 14)),
+				new NewLine(new Range(1, 14, 1, 15)),
 				// second line
 				new Word(new Range(2, 1, 2, 4), 'how'),
 				new Space(new Range(2, 4, 2, 5)),
@@ -91,7 +93,8 @@ suite('SimpleDecoder', () => {
 				new Space(new Range(4, 10, 4, 11)),
 				new Space(new Range(4, 11, 4, 12)),
 				new LeftBracket(new Range(4, 12, 4, 13)),
-				new Word(new Range(4, 13, 4, 13 + 2), '!@'),
+				new ExclamationMark(new Range(4, 13, 4, 14)),
+				new Word(new Range(4, 14, 4, 15), '@'),
 				new Hash(new Range(4, 15, 4, 16)),
 				new Word(new Range(4, 16, 4, 16 + 10), '$%^🦄&*_+='),
 				new Dash(new Range(4, 26, 4, 27)),

From a4561a32dccdca7ad0afac66e722d8fc28418662 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Tue, 25 Feb 2025 16:15:36 -0800
Subject: [PATCH 0844/1815] update test cases for the markdown decoder to
 incorporate new token types

---
 .../codecs/simpleCodec/simpleDecoder.ts       |  5 ----
 .../common/codecs/markdownDecoder.test.ts     | 30 +++++++++----------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts b/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts
index 80186a14cc5e..c32542f28da9 100644
--- a/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts
+++ b/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts
@@ -22,11 +22,6 @@ import { BaseDecoder } from '../../../../base/common/codecs/baseDecoder.js';
 import { LeftParenthesis, RightParenthesis, TParenthesis } from './tokens/parentheses.js';
 import { LeftAngleBracket, RightAngleBracket, TAngleBracket } from './tokens/angleBrackets.js';
 
-/**
- * TODO: @legomushroom - list
- *  - add `comment` token support in the markdown decoder
- */
-
 /**
  * A token type that this decoder can handle.
  */
diff --git a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
index bff4b428ae1d..bd720971d790 100644
--- a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
+++ b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
@@ -61,7 +61,7 @@ suite('MarkdownDecoder', () => {
 		);
 
 		await test.run(
-			' hello world\nhow are\t you [caption text](./some/file/path/refer🎨nce.md)?\v\n\n[(example)](another/path/with[-and-]-chars/folder)\t \n\t[#file:something.txt](/absolute/path/to/something.txt)',
+			' hello world\nhow are\t you [caption text](./some/file/path/refer🎨nce.md)?\v\n\n[(example!)](another/path/with[-and-]-chars/folder)\t \n\t[#file:something.txt](/absolute/path/to/something.txt)',
 			[
 				// first line
 				new Space(new Range(1, 1, 1, 2)),
@@ -84,10 +84,10 @@ suite('MarkdownDecoder', () => {
 				// third line
 				new NewLine(new Range(3, 1, 3, 2)),
 				// fourth line
-				new MarkdownLink(4, 1, '[(example)]', '(another/path/with[-and-]-chars/folder)'),
-				new Tab(new Range(4, 51, 4, 52)),
-				new Space(new Range(4, 52, 4, 53)),
-				new NewLine(new Range(4, 53, 4, 54)),
+				new MarkdownLink(4, 1, '[(example!)]', '(another/path/with[-and-]-chars/folder)'),
+				new Tab(new Range(4, 52, 4, 53)),
+				new Space(new Range(4, 53, 4, 54)),
+				new NewLine(new Range(4, 54, 4, 55)),
 				// fifth line
 				new Tab(new Range(5, 1, 5, 2)),
 				new MarkdownLink(5, 2, '[#file:something.txt]', '(/absolute/path/to/something.txt)'),
@@ -103,15 +103,15 @@ suite('MarkdownDecoder', () => {
 		const inputLines = [
 			// tests that the link caption contain a chat prompt `#file:` reference, while
 			// the file path can contain other `graphical characters`
-			'\v\t[#file:./another/path/to/file.txt](./real/filepath/file◆name.md)',
+			'\v\t[#file:./another/path/to/file.txt](./real/file!path/file◆name.md)',
 			// tests that the link file path contain a chat prompt `#file:` reference,
 			// `spaces`, `emojies`, and other `graphical characters`
 			' [reference ∘ label](/absolute/pa th/to-#file:file.txt/f🥸⚡️le.md)',
 			// tests that link caption and file path can contain `parentheses`, `spaces`, and
 			// `emojies`
-			'\f[!(hello)!](./w(())rld/nice-🦚-filen(a)me.git))\n\t',
+			'\f[!(hello)!](./w(())rld/nice-🦚-filen(a)<me>.git))\n\t',
 			// tests that the link caption can be empty, while the file path can contain `square brackets`
-			'[](./s[]me/pa[h!) ',
+			'[<test>](./s[]me/pa[h!) ',
 		];
 
 		await test.run(
@@ -120,23 +120,23 @@ suite('MarkdownDecoder', () => {
 				// `1st` line
 				new VerticalTab(new Range(1, 1, 1, 2)),
 				new Tab(new Range(1, 2, 1, 3)),
-				new MarkdownLink(1, 3, '[#file:./another/path/to/file.txt]', '(./real/filepath/file◆name.md)'),
-				new NewLine(new Range(1, 67, 1, 68)),
+				new MarkdownLink(1, 3, '[#file:./another/path/to/file.txt]', '(./real/file!path/file◆name.md)'),
+				new NewLine(new Range(1, 68, 1, 69)),
 				// `2nd` line
 				new Space(new Range(2, 1, 2, 2)),
 				new MarkdownLink(2, 2, '[reference ∘ label]', '(/absolute/pa th/to-#file:file.txt/f🥸⚡️le.md)'),
 				new NewLine(new Range(2, 67, 2, 68)),
 				// `3rd` line
 				new FormFeed(new Range(3, 1, 3, 2)),
-				new MarkdownLink(3, 2, '[!(hello)!]', '(./w(())rld/nice-🦚-filen(a)me.git)'),
-				new RightParenthesis(new Range(3, 48, 3, 49)),
-				new NewLine(new Range(3, 49, 3, 50)),
+				new MarkdownLink(3, 2, '[!(hello)!]', '(./w(())rld/nice-🦚-filen(a)<me>.git)'),
+				new RightParenthesis(new Range(3, 50, 3, 51)),
+				new NewLine(new Range(3, 51, 3, 52)),
 				// `4th` line
 				new Tab(new Range(4, 1, 4, 2)),
 				new NewLine(new Range(4, 2, 4, 3)),
 				// `5th` line
-				new MarkdownLink(5, 1, '[]', '(./s[]me/pa[h!)'),
-				new Space(new Range(5, 18, 5, 19)),
+				new MarkdownLink(5, 1, '[<test>]', '(./s[]me/pa[h!)'),
+				new Space(new Range(5, 24, 5, 25)),
 			],
 		);
 	});

From a635c118deef2cf03f33e2564750ff4f4d939d06 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 12 Mar 2025 11:28:49 -0700
Subject: [PATCH 0845/1815] mcp: warn on invalid properties, automatically
 migrate any 'mcpServers' (#243378)

This keeps our 'servers' key but fixes up if people paste in other editors configuration into us
---
 src/vs/platform/mcp/common/mcpPlatformTypes.ts           | 2 ++
 .../contrib/mcp/common/discovery/configMcpDiscovery.ts   | 9 ++++++++-
 src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts  | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/vs/platform/mcp/common/mcpPlatformTypes.ts b/src/vs/platform/mcp/common/mcpPlatformTypes.ts
index 877e199ae066..bee43d9672ba 100644
--- a/src/vs/platform/mcp/common/mcpPlatformTypes.ts
+++ b/src/vs/platform/mcp/common/mcpPlatformTypes.ts
@@ -5,6 +5,8 @@
 
 export interface IMcpConfiguration {
 	inputs: unknown[];
+	/** @deprecated Only for rough cross-compat with other formats */
+	mcpServers?: Record<string, IMcpConfigurationServer>;
 	servers: Record<string, IMcpConfigurationServer>;
 }
 
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts b/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
index 69c5df923711..80d83720622c 100644
--- a/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
+++ b/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
@@ -91,7 +91,14 @@ export class ConfigMcpDiscovery extends Disposable implements IMcpDiscovery {
 
 		for (const src of this.configSources) {
 			const collectionId = `mcp.config.${src.key}`;
-			const value = configurationKey[src.key];
+			let value = configurationKey[src.key];
+
+			// If we see there are MCP servers, migrate them automatically
+			if (value?.mcpServers) {
+				value = { ...value, servers: { ...value.servers, ...value.mcpServers }, mcpServers: undefined };
+				this._configurationService.updateValue(mcpConfigurationSection, value, {}, src.target, { donotNotifyError: true });
+			}
+
 			const nextDefinitions = Object.entries(value?.servers || {}).map(([name, value]): McpServerDefinition => ({
 				id: `${collectionId}.${name}`,
 				label: name,
diff --git a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
index b17da0d33130..25e58fa94858 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
@@ -32,6 +32,7 @@ export const mcpServerSchema: IJSONSchema = {
 	title: localize('app.mcp.json.title', "Model Context Protocol Servers"),
 	allowTrailingCommas: true,
 	allowComments: true,
+	additionalProperties: false,
 	properties: {
 		servers: {
 			examples: [mcpSchemaExampleServers],

From df6adbae7c691093512fa71e40eb362a560cdb17 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Wed, 12 Mar 2025 11:42:19 -0700
Subject: [PATCH 0846/1815] Onboard onto 1ES template's BinSkim (#243374)

* Exclude Windows setup files from BinSkim

* Debug: Scan everything but with TSA off

* Narrow analyzeTargetGlob

* Scan node and DLL files as well

* Try excluding BinSkim from CustomSDL

* Re-enable TSA

* Clean up

* Rename CustomSDL stage and job
---
 build/azure-pipelines/cli/cli-compile.yml     | 16 ----------
 build/azure-pipelines/product-build.yml       |  6 ++--
 .../win32/product-build-win32.yml             |  8 ++---
 .../azure-pipelines/win32/sdl-scan-win32.yml  | 31 +------------------
 4 files changed, 9 insertions(+), 52 deletions(-)

diff --git a/build/azure-pipelines/cli/cli-compile.yml b/build/azure-pipelines/cli/cli-compile.yml
index 5982e42c5dd4..a5d8bdc1a2c3 100644
--- a/build/azure-pipelines/cli/cli-compile.yml
+++ b/build/azure-pipelines/cli/cli-compile.yml
@@ -119,22 +119,6 @@ steps:
           ArtifactServices.Symbol.UseAAD: false
         displayName: Publish Symbols
 
-      - task: CopyFiles@2
-        inputs:
-          SourceFolder: $(Build.SourcesDirectory)/cli/target/${{ parameters.VSCODE_CLI_TARGET }}/release
-          Contents: 'code.*'
-          TargetFolder: $(Agent.TempDirectory)/binskim-cli
-        displayName: Copy files for BinSkim
-
-      - task: BinSkim@4
-        inputs:
-          InputType: Basic
-          Function: analyze
-          TargetPattern: guardianGlob
-          AnalyzeTargetGlob: $(Agent.TempDirectory)/binskim-cli/*.*
-          AnalyzeSymPath: $(Agent.TempDirectory)/binskim-cli
-        displayName: Run BinSkim
-
       - powershell: |
           . build/azure-pipelines/win32/exec.ps1
           $ErrorActionPreference = "Stop"
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index 4c39fe5134d6..c3e1342359ab 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -169,6 +169,8 @@ 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|**/VSCodeSetup*.exe'
       codeql:
         runSourceLanguagesInSourceAnalysis: true
         compiled:
@@ -316,13 +318,13 @@ extends:
                       VSCODE_BUILD_WIN32_ARM64: ${{ parameters.VSCODE_BUILD_WIN32_ARM64 }}
 
       - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_COMPILE_ONLY, false)) }}:
-        - stage: CustomSDL
+        - stage: APIScan
           dependsOn: []
           pool:
             name: 1es-windows-2019-x64
             os: windows
           jobs:
-            - job: WindowsSDL
+            - job: WindowsAPIScan
               steps:
                 - template: build/azure-pipelines/win32/sdl-scan-win32.yml@self
                   parameters:
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index ed7f10048cad..f7389943dc7a 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -145,7 +145,7 @@ steps:
         exec { npm run gulp "vscode-win32-$(VSCODE_ARCH)-min-ci" }
         exec { npm run gulp "vscode-win32-$(VSCODE_ARCH)-inno-updater" }
         echo "##vso[task.setvariable variable=BUILT_CLIENT]true"
-        echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)"
+        echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(Agent.BuildDirectory)/VSCode-win32-$(VSCODE_ARCH)"
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Build client
@@ -156,7 +156,7 @@ steps:
         exec { npm run gulp "vscode-reh-win32-$(VSCODE_ARCH)-min-ci" }
         mv ..\vscode-reh-win32-$(VSCODE_ARCH) ..\vscode-server-win32-$(VSCODE_ARCH) # TODO@joaomoreno
         echo "##vso[task.setvariable variable=BUILT_SERVER]true"
-        echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(CodeSigningFolderPath),$(agent.builddirectory)/vscode-server-win32-$(VSCODE_ARCH)"
+        echo "##vso[task.setvariable variable=CodeSigningFolderPath]$(CodeSigningFolderPath),$(Agent.BuildDirectory)/vscode-server-win32-$(VSCODE_ARCH)"
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Build server
@@ -196,10 +196,10 @@ 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
+          $AppProductJson = Get-Content -Raw -Path "$(Agent.BuildDirectory)\VSCode-win32-$(VSCODE_ARCH)\resources\app\product.json" | 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"
+          Move-Item -Path "$(Build.ArtifactStagingDirectory)/cli/$AppName.exe" -Destination "$(Agent.BuildDirectory)/VSCode-win32-$(VSCODE_ARCH)/bin/$CliAppName.exe"
         displayName: Move VS Code CLI
 
       - task: UseDotNet@2
diff --git a/build/azure-pipelines/win32/sdl-scan-win32.yml b/build/azure-pipelines/win32/sdl-scan-win32.yml
index def3cb53dfcc..bf6819a4b479 100644
--- a/build/azure-pipelines/win32/sdl-scan-win32.yml
+++ b/build/azure-pipelines/win32/sdl-scan-win32.yml
@@ -102,13 +102,6 @@ steps:
   - powershell: npm run compile
     displayName: Compile
 
-  - powershell: |
-      Get-ChildItem '$(Build.SourcesDirectory)' -Recurse -Filter "*.exe"
-      Get-ChildItem '$(Build.SourcesDirectory)' -Recurse -Filter "*.dll"
-      Get-ChildItem '$(Build.SourcesDirectory)' -Recurse -Filter "*.node"
-      Get-ChildItem '$(Build.SourcesDirectory)' -Recurse -Filter "*.pdb"
-    displayName: List files
-
   - powershell: npm run gulp "vscode-symbols-win32-${{ parameters.VSCODE_ARCH }}"
     env:
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
@@ -119,16 +112,7 @@ steps:
       Get-ChildItem '$(Agent.BuildDirectory)\scanbin' -Recurse -Filter "*.dll"
       Get-ChildItem '$(Agent.BuildDirectory)\scanbin' -Recurse -Filter "*.node"
       Get-ChildItem '$(Agent.BuildDirectory)\scanbin' -Recurse -Filter "*.pdb"
-    displayName: List files again
-
-  - task: BinSkim@4
-    inputs:
-      InputType: "Basic"
-      Function: "analyze"
-      TargetPattern: "guardianGlob"
-      AnalyzeIgnorePdbLoadError: true
-      AnalyzeTargetGlob: '$(Agent.BuildDirectory)\scanbin\**.dll;$(Agent.BuildDirectory)\scanbin\**.exe;$(Agent.BuildDirectory)\scanbin\**.node'
-      AnalyzeLocalSymbolDirectories: '$(Agent.BuildDirectory)\scanbin\VSCode-win32-${{ parameters.VSCODE_ARCH }}\pdb'
+    displayName: List files
 
   - task: CopyFiles@2
     displayName: 'Collect Symbols for API Scan'
@@ -139,19 +123,6 @@ steps:
       flattenFolders: true
     condition: succeeded()
 
-  - task: PublishSymbols@2
-    inputs:
-      IndexSources: false
-      SymbolsFolder: '$(Agent.BuildDirectory)\symbols'
-      SearchPattern: '**\*.pdb'
-      SymbolServerType: TeamServices
-      SymbolsProduct: 'code'
-      ArtifactServices.Symbol.AccountName: microsoft
-      ArtifactServices.Symbol.PAT: $(System.AccessToken)
-      ArtifactServices.Symbol.UseAAD: false
-    displayName: Publish Symbols
-    condition: succeeded()
-
   - task: APIScan@2
     inputs:
       softwareFolder: $(Agent.BuildDirectory)\scanbin

From 330361c639fb1cf0e1d733fe0a4acfa3837af2ac Mon Sep 17 00:00:00 2001
From: Bhavya U <bhavyau@microsoft.com>
Date: Wed, 12 Mar 2025 12:19:49 -0700
Subject: [PATCH 0847/1815] Implement chat transfer service and contribution
 for workspace trust management (#243381)

---
 .../chat/browser/actions/chatTransfer.ts      | 19 ++++++++++
 .../contrib/chat/browser/chat.contribution.ts |  4 +++
 .../chat/common/chatTransferService.ts        | 36 +++++++++++++++++++
 .../browser/workspace.contribution.ts         |  8 -----
 .../workspaces/common/workspaceTrust.ts       | 10 ------
 5 files changed, 59 insertions(+), 18 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/browser/actions/chatTransfer.ts
 create mode 100644 src/vs/workbench/contrib/chat/common/chatTransferService.ts

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatTransfer.ts b/src/vs/workbench/contrib/chat/browser/actions/chatTransfer.ts
new file mode 100644
index 000000000000..52bc36801707
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatTransfer.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 { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IChatTransferService } from '../../common/chatTransferService.js';
+
+export class ChatTransferContribution extends Disposable implements IWorkbenchContribution {
+	static readonly ID = 'workbench.contrib.chatTransfer';
+
+	constructor(
+		@IChatTransferService chatTransferService: IChatTransferService,
+	) {
+		super();
+		chatTransferService.checkAndSetWorkspaceTrust();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 005c3152255d..da8e0c2ff4a5 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -102,6 +102,8 @@ import { Event } from '../../../../base/common/event.js';
 import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditing/notebook/chatEditingNotebookFileSystemProvider.js';
 import { mcpConfigurationSection, mcpSchemaExampleServers } from '../../mcp/common/mcpConfiguration.js';
 import { mcpSchemaId } from '../../../services/configuration/common/configuration.js';
+import { ChatTransferService, IChatTransferService } from '../common/chatTransferService.js';
+import { ChatTransferContribution } from './actions/chatTransfer.js';
 
 // Register configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -519,6 +521,7 @@ registerWorkbenchContribution2(ChatAgentSettingContribution.ID, ChatAgentSetting
 registerWorkbenchContribution2(ChatEditingEditorAccessibility.ID, ChatEditingEditorAccessibility, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(ChatEditingEditorOverlay.ID, ChatEditingEditorOverlay, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2(ChatEditingEditorContextKeys.ID, ChatEditingEditorContextKeys, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(ChatTransferContribution.ID, ChatTransferContribution, WorkbenchPhase.BlockRestore);
 
 registerChatActions();
 registerChatCopyActions();
@@ -559,5 +562,6 @@ registerSingleton(IChatMarkdownAnchorService, ChatMarkdownAnchorService, Instant
 registerSingleton(ILanguageModelIgnoredFilesService, LanguageModelIgnoredFilesService, InstantiationType.Delayed);
 registerSingleton(IChatEntitlementService, ChatEntitlementService, InstantiationType.Delayed);
 registerSingleton(IPromptsService, PromptsService, InstantiationType.Delayed);
+registerSingleton(IChatTransferService, ChatTransferService, InstantiationType.Delayed);
 
 registerWorkbenchContribution2(ChatEditingNotebookFileSystemProviderContrib.ID, ChatEditingNotebookFileSystemProviderContrib, WorkbenchPhase.BlockStartup);
diff --git a/src/vs/workbench/contrib/chat/common/chatTransferService.ts b/src/vs/workbench/contrib/chat/common/chatTransferService.ts
new file mode 100644
index 000000000000..22a2eb31aa85
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/chatTransferService.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 { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { IWorkspaceTrustManagementService } from '../../../../platform/workspace/common/workspaceTrust.js';
+import { isChatTransferredWorkspace, areWorkspaceFoldersEmpty } from '../../../services/workspaces/common/workspaceUtils.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+export const IChatTransferService = createDecorator<IChatTransferService>('chatTransferService');
+
+export interface IChatTransferService {
+	readonly _serviceBrand: undefined;
+
+	checkAndSetWorkspaceTrust(): Promise<void>;
+}
+
+export class ChatTransferService implements IChatTransferService {
+	_serviceBrand: undefined;
+
+	constructor(
+		@IWorkspaceContextService private readonly workspaceService: IWorkspaceContextService,
+		@IStorageService private readonly storageService: IStorageService,
+		@IFileService private readonly fileService: IFileService,
+		@IWorkspaceTrustManagementService private readonly workspaceTrustManagementService: IWorkspaceTrustManagementService
+	) { }
+
+	async checkAndSetWorkspaceTrust(): Promise<void> {
+		const workspace = this.workspaceService.getWorkspace();
+		if (isChatTransferredWorkspace(workspace, this.storageService) && await areWorkspaceFoldersEmpty(workspace, this.fileService)) {
+			await this.workspaceTrustManagementService.setWorkspaceTrust(true);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
index c973f5f191f4..c512b648529b 100644
--- a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
+++ b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts
@@ -50,7 +50,6 @@ import { basename, dirname as uriDirname } from '../../../../base/common/resourc
 import { URI } from '../../../../base/common/uri.js';
 import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
-import { areWorkspaceFoldersEmpty, isChatTransferredWorkspace } from '../../../services/workspaces/common/workspaceUtils.js';
 
 const BANNER_RESTRICTED_MODE = 'workbench.banner.restrictedMode';
 const STARTUP_PROMPT_SHOWN_KEY = 'workspace.trust.startupPrompt.shown';
@@ -441,13 +440,6 @@ export class WorkspaceTrustUXHandler extends Disposable implements IWorkbenchCon
 			return;
 		}
 
-		// Don't show modal prompt for empty folders transferred from chat
-		const workspace = this.workspaceContextService.getWorkspace();
-		if (isChatTransferredWorkspace(workspace, this.storageService) && await areWorkspaceFoldersEmpty(workspace, this.fileService)) {
-			this.updateWorkbenchIndicators(false);
-			return;
-		}
-
 		if (this.startupPromptSetting === 'never') {
 			this.updateWorkbenchIndicators(false);
 			return;
diff --git a/src/vs/workbench/services/workspaces/common/workspaceTrust.ts b/src/vs/workbench/services/workspaces/common/workspaceTrust.ts
index 90e1141c1921..e11ae3c24e21 100644
--- a/src/vs/workbench/services/workspaces/common/workspaceTrust.ts
+++ b/src/vs/workbench/services/workspaces/common/workspaceTrust.ts
@@ -24,7 +24,6 @@ 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 { areWorkspaceFoldersEmpty, isChatTransferredWorkspace } from './workspaceUtils.js';
 
 export const WORKSPACE_TRUST_ENABLED = 'security.workspace.trust.enabled';
 export const WORKSPACE_TRUST_STARTUP_PROMPT = 'security.workspace.trust.startupPrompt';
@@ -334,15 +333,6 @@ export class WorkspaceTrustManagementService extends Disposable implements IWork
 		if (trusted === undefined) {
 			await this.resolveCanonicalUris();
 			trusted = this.calculateWorkspaceTrust();
-
-			const workspace = this.workspaceService.getWorkspace();
-			if (!trusted &&
-				isChatTransferredWorkspace(workspace, this.storageService) &&
-				await areWorkspaceFoldersEmpty(workspace, this.fileService)) {
-
-				// Trust empty folders transferred from chat
-				trusted = true;
-			}
 		}
 
 		if (this.isWorkspaceTrusted() === trusted) { return; }

From c67dcc317d410f57c4ffed55243395210b74cd8d Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Wed, 26 Feb 2025 11:39:43 -0800
Subject: [PATCH 0848/1815] II of markdown comment parser, add base
 @assertNotConsumed decorator

---
 extensions/git/src/decorators.ts              |   2 +-
 .../markdownCodec/parsers/markdownComment.ts  | 172 ++++++++++++++++++
 .../markdownCodec/parsers/markdownLink.ts     |   5 -
 .../markdownCodec/tokens/markdownComment.ts   |  86 +++++++++
 .../common/codecs/simpleCodec/parserBase.ts   |  50 +++++
 5 files changed, 309 insertions(+), 6 deletions(-)
 create mode 100644 src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts
 create mode 100644 src/vs/editor/common/codecs/markdownCodec/tokens/markdownComment.ts

diff --git a/extensions/git/src/decorators.ts b/extensions/git/src/decorators.ts
index b1a25d4fd919..f89ff2327e95 100644
--- a/extensions/git/src/decorators.ts
+++ b/extensions/git/src/decorators.ts
@@ -98,4 +98,4 @@ export function debounce(delay: number): Function {
 			this[timerKey] = setTimeout(() => fn.apply(this, args), delay);
 		};
 	});
-}
\ No newline at end of file
+}
diff --git a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts
new file mode 100644
index 000000000000..87e218d8e6d1
--- /dev/null
+++ b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.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 { Range } from '../../../core/range.js';
+import { Dash } from '../../simpleCodec/tokens/dash.js';
+import { assert } from '../../../../../base/common/assert.js';
+import { MarkdownComment } from '../tokens/markdownComment.js';
+import { TSimpleToken } from '../../simpleCodec/simpleDecoder.js';
+import { ExclamationMark } from '../../simpleCodec/tokens/exclamationMark.js';
+import { LeftAngleBracket, RightAngleBracket } from '../../simpleCodec/tokens/angleBrackets.js';
+import { assertNotConsumed, ParserBase, TAcceptTokenResult } from '../../simpleCodec/parserBase.js';
+
+/**
+ * The parser responsible for parsing the `<!--` sequence - the start of a `markdown comment`.
+ */
+export class PartialMarkdownCommentStart extends ParserBase<TSimpleToken, PartialMarkdownCommentStart | MarkdownCommentStart> {
+	constructor(token: LeftAngleBracket) {
+		super([token]);
+	}
+
+	@assertNotConsumed
+	public accept(token: TSimpleToken): TAcceptTokenResult<PartialMarkdownCommentStart | MarkdownCommentStart> {
+		const lastToken = this.currentTokens[this.currentTokens.length - 1];
+
+		// if received `!` after `<`, continue the parsing process
+		if (token instanceof ExclamationMark && lastToken instanceof LeftAngleBracket) {
+			this.currentTokens.push(token);
+			return {
+				result: 'success',
+				nextParser: this,
+				wasTokenConsumed: true,
+			};
+		}
+
+		// if received `-` after, check that previous token either `!` or `-`,
+		// which allows to continue the parsing process, otherwise fail
+		if (token instanceof Dash) {
+			this.currentTokens.push(token);
+
+			if (lastToken instanceof ExclamationMark) {
+				return {
+					result: 'success',
+					nextParser: this,
+					wasTokenConsumed: true,
+				};
+			}
+
+			if (lastToken instanceof Dash) {
+				const token1: TSimpleToken | undefined = this.currentTokens[0];
+				const token2: TSimpleToken | undefined = this.currentTokens[1];
+				const token3: TSimpleToken | undefined = this.currentTokens[3];
+				const token4: TSimpleToken | undefined = this.currentTokens[4];
+
+				// sanity checks
+				assert(
+					token1 instanceof LeftAngleBracket,
+					`The first token must be a '<', got '${token1}'.`,
+				);
+				assert(
+					token2 instanceof ExclamationMark,
+					`The second token must be a '!', got '${token2}'.`,
+				);
+				assert(
+					token3 instanceof Dash,
+					`The third token must be a '-', got '${token3}'.`,
+				);
+				assert(
+					token4 instanceof Dash,
+					`The fourth token must be a '-', got '${token4}'.`,
+				);
+
+				this.isConsumed = true;
+				return {
+					result: 'success',
+					nextParser: new MarkdownCommentStart([token1, token2, token3, token4]),
+					wasTokenConsumed: true,
+				};
+			}
+		}
+
+		this.isConsumed = true;
+		return {
+			result: 'failure',
+			wasTokenConsumed: false,
+		};
+	}
+}
+
+/**
+ * The parser responsible for a `markdown comment` sequence of tokens.
+ * E.g. `<!-- some comment` which may or may not end with `-->`. If it does,
+ * then the parser transitions to the {@link MarkdownComment} token.
+ */
+export class MarkdownCommentStart extends ParserBase<TSimpleToken, MarkdownCommentStart | MarkdownComment> {
+	constructor(tokens: [LeftAngleBracket, ExclamationMark, Dash, Dash]) {
+		super(tokens);
+	}
+
+	@assertNotConsumed
+	public accept(token: TSimpleToken): TAcceptTokenResult<MarkdownCommentStart | MarkdownComment> {
+		// if received `>` while current token sequence ends with `--`,
+		// then this is the end of the comment sequence
+		if (token instanceof RightAngleBracket && this.endsWithDashes) {
+			this.currentTokens.push(token);
+
+			return {
+				result: 'success',
+				nextParser: this.asMarkdownComment(),
+				wasTokenConsumed: true,
+			};
+		}
+
+		this.currentTokens.push(token);
+
+		return {
+			result: 'success',
+			nextParser: this,
+			wasTokenConsumed: true,
+		};
+	}
+
+	/**
+	 * Convert the current token sequence into a {@link MarkdownComment} token.
+	 *
+	 * Note! that this method marks the current parser object as "consumend"
+	 *       hence it should not be used after this method is called.
+	 */
+	public asMarkdownComment(): MarkdownComment {
+		this.isConsumed = true;
+
+		return new MarkdownComment(
+			this.range,
+			Object.freeze(this.currentTokens),
+		);
+	}
+
+	/**
+	 * Get range of current token sequence.
+	 */
+	private get range(): Range {
+		const firstToken = this.currentTokens[0];
+		const lastToken = this.currentTokens[this.currentTokens.length - 1];
+
+		const range = new Range(
+			firstToken.range.startLineNumber,
+			firstToken.range.startColumn,
+			lastToken.range.endLineNumber,
+			lastToken.range.endColumn,
+		);
+
+		return range;
+	}
+
+	/**
+	 * Whether the current token sequence ends with two dashes.
+	 */
+	private get endsWithDashes(): boolean {
+		const lastToken = this.currentTokens[this.currentTokens.length - 1];
+		if (!(lastToken instanceof Dash)) {
+			return false;
+		}
+
+		const secondLastToken = this.currentTokens[this.currentTokens.length - 2];
+		if (!(secondLastToken instanceof Dash)) {
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownLink.ts b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownLink.ts
index 808d40ff415e..e8163286fd2c 100644
--- a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownLink.ts
+++ b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownLink.ts
@@ -14,11 +14,6 @@ import { LeftBracket, RightBracket } from '../../simpleCodec/tokens/brackets.js'
 import { ParserBase, TAcceptTokenResult } from '../../simpleCodec/parserBase.js';
 import { LeftParenthesis, RightParenthesis } from '../../simpleCodec/tokens/parentheses.js';
 
-/**
- * Tokens handled by this decoder.
- */
-export type TMarkdownToken = MarkdownLink | TSimpleToken;
-
 /**
  * List of characters that are not allowed in links so stop a markdown link sequence abruptly.
  */
diff --git a/src/vs/editor/common/codecs/markdownCodec/tokens/markdownComment.ts b/src/vs/editor/common/codecs/markdownCodec/tokens/markdownComment.ts
new file mode 100644
index 000000000000..661a1be7076e
--- /dev/null
+++ b/src/vs/editor/common/codecs/markdownCodec/tokens/markdownComment.ts
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { BaseToken } from '../../baseToken.js';
+import { Range } from '../../../core/range.js';
+import { MarkdownToken } from './markdownToken.js';
+import { TSimpleToken } from '../../simpleCodec/simpleDecoder.js';
+
+/**
+ * A token that represent a `markdown comment` with a `range`. The `range`
+ * value reflects the position of the token in the original data.
+ */
+export class MarkdownComment extends MarkdownToken {
+	constructor(
+		range: Range,
+		public readonly tokens: readonly TSimpleToken[],
+	) {
+		// TODO: @lego - validate tokens
+		super(range);
+		// assert(
+		// 	!isNaN(lineNumber),
+		// 	`The line number must not be a NaN.`,
+		// );
+
+		// assert(
+		// 	lineNumber > 0,
+		// 	`The line number must be >= 1, got "${lineNumber}".`,
+		// );
+
+		// assert(
+		// 	columnNumber > 0,
+		// 	`The column number must be >= 1, got "${columnNumber}".`,
+		// );
+
+		// assert(
+		// 	caption[0] === '[' && caption[caption.length - 1] === ']',
+		// 	`The caption must be enclosed in square brackets, got "${caption}".`,
+		// );
+
+		// assert(
+		// 	reference[0] === '(' && reference[reference.length - 1] === ')',
+		// 	`The reference must be enclosed in parentheses, got "${reference}".`,
+		// );
+
+		// super(
+		// 	new Range(
+		// 		lineNumber,
+		// 		columnNumber,
+		// 		lineNumber,
+		// 		columnNumber + caption.length + reference.length,
+		// 	),
+		// );
+
+		// // set up the `isURL` flag based on the current
+		// try {
+		// 	new URL(this.path);
+		// 	this.isURL = true;
+		// } catch {
+		// 	this.isURL = false;
+		// }
+	}
+
+	/**
+	 * Check if this token is equal to another one.
+	 */
+	public override equals<T extends BaseToken>(other: T): boolean {
+		if (!super.sameRange(other.range)) {
+			return false;
+		}
+
+		if (!(other instanceof MarkdownComment)) {
+			return false;
+		}
+
+		return this.text === other.text;
+	}
+
+	/**
+	 * Returns a string representation of the token.
+	 */
+	public override toString(): string {
+		return `md-comment("${this.text}")${this.range}`;
+	}
+}
diff --git a/src/vs/editor/common/codecs/simpleCodec/parserBase.ts b/src/vs/editor/common/codecs/simpleCodec/parserBase.ts
index 9e864177f9fd..bb4fc9271122 100644
--- a/src/vs/editor/common/codecs/simpleCodec/parserBase.ts
+++ b/src/vs/editor/common/codecs/simpleCodec/parserBase.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { BaseToken } from '../baseToken.js';
+import { assert } from '../../../../base/common/assert.js';
 
 /**
  * Common interface for a result of accepting a next token
@@ -42,11 +43,47 @@ export interface IAcceptTokenFailure extends IAcceptTokenResult {
  */
 export type TAcceptTokenResult<T> = IAcceptTokenSuccess<T> | IAcceptTokenFailure;
 
+/**
+ * Decorator that validates that the current parser object was not yet consumed,
+ * hence can still be used to accept new tokens in the parsing process.
+ *
+ * @throws the resulting decorated method throws if the parser object was already consumed.
+ */
+export function assertNotConsumed<T extends ParserBase<any, any>>(
+	_target: T,
+	propertyKey: 'accept',
+	descriptor: PropertyDescriptor,
+) {
+	// store the original method reference
+	const originalMethod = descriptor.value;
+
+	// validate that the current parser object was not yet consumed
+	// before invoking the original accept method
+	descriptor.value = function (
+		this: T,
+		...args: Parameters<T[typeof propertyKey]>
+	): ReturnType<T[typeof propertyKey]> {
+		assert(
+			this.isConsumed === false,
+			`The parser object is already consumed and should not be used anymore.`,
+		);
+
+		return originalMethod.apply(this, args);
+	};
+
+	return descriptor;
+}
+
 /**
  * An abstract parser class that is able to parse a sequence of
  * tokens into a new single entity.
  */
 export abstract class ParserBase<TToken extends BaseToken, TNextObject> {
+	/**
+	 * Whether the parser object was "consumed" and should not be used anymore.
+	 */
+	protected isConsumed: boolean = false;
+
 	constructor(
 		/**
 		 * Set of tokens that were accumulated so far.
@@ -70,4 +107,17 @@ export abstract class ParserBase<TToken extends BaseToken, TNextObject> {
 	 * @returns The parsing result.
 	 */
 	public abstract accept(token: TToken): TAcceptTokenResult<TNextObject>;
+
+	/**
+	 * A helper method that validates that the current parser object was not yet consumed,
+	 * hence can still be used to accept new tokens in the parsing process.
+	 *
+	 * @throws if the parser object is already consumed.
+	 */
+	protected assertNotConsumed(): void {
+		assert(
+			this.isConsumed === false,
+			`The parser object is already consumed and should not be used anymore.`,
+		);
+	}
 }

From 9e7505f5b1ba4bc600e71cfd7c81ec9ebb192d31 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Wed, 26 Feb 2025 12:07:15 -0800
Subject: [PATCH 0849/1815] II of `markdown comment` token

---
 .../markdownCodec/parsers/markdownComment.ts  | 37 +++++++++++-
 .../markdownCodec/tokens/markdownComment.ts   | 56 +++++--------------
 2 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts
index 87e218d8e6d1..58e3dfcae756 100644
--- a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts
+++ b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts
@@ -130,9 +130,13 @@ export class MarkdownCommentStart extends ParserBase<TSimpleToken, MarkdownComme
 	public asMarkdownComment(): MarkdownComment {
 		this.isConsumed = true;
 
+		const text = this.currentTokens
+			.map(pick('text'))
+			.join('');
+
 		return new MarkdownComment(
 			this.range,
-			Object.freeze(this.currentTokens),
+			text,
 		);
 	}
 
@@ -170,3 +174,34 @@ export class MarkdownCommentStart extends ParserBase<TSimpleToken, MarkdownComme
 		return true;
 	}
 }
+
+/**
+ * Utility that helps to pick a property from an object.
+ *
+ * ## Examples
+ *
+ * ```typescript
+ * interface IObject = {
+ *   a: number,
+ *   b: string,
+ * };
+ *
+ * const list: IObject[] = [
+ *   { a: 1, b: 'foo' },
+ *   { a: 2, b: 'bar' },
+ * ];
+ *
+ * assert.deepStrictEqual(
+ *   list.map(pick('a')),
+ *   [1, 2],
+ * );
+ * ```
+ */
+// TODO: @legomushroom - move to common utils?
+const pick = <TObject, TKeyName extends keyof TObject>(
+	key: TKeyName,
+) => {
+	return (obj: TObject): TObject[TKeyName] => {
+		return obj[key];
+	};
+};
diff --git a/src/vs/editor/common/codecs/markdownCodec/tokens/markdownComment.ts b/src/vs/editor/common/codecs/markdownCodec/tokens/markdownComment.ts
index 661a1be7076e..f7875d957a28 100644
--- a/src/vs/editor/common/codecs/markdownCodec/tokens/markdownComment.ts
+++ b/src/vs/editor/common/codecs/markdownCodec/tokens/markdownComment.ts
@@ -6,7 +6,7 @@
 import { BaseToken } from '../../baseToken.js';
 import { Range } from '../../../core/range.js';
 import { MarkdownToken } from './markdownToken.js';
-import { TSimpleToken } from '../../simpleCodec/simpleDecoder.js';
+import { assert } from '../../../../../base/common/assert.js';
 
 /**
  * A token that represent a `markdown comment` with a `range`. The `range`
@@ -15,51 +15,21 @@ import { TSimpleToken } from '../../simpleCodec/simpleDecoder.js';
 export class MarkdownComment extends MarkdownToken {
 	constructor(
 		range: Range,
-		public readonly tokens: readonly TSimpleToken[],
+		public readonly text: string,
 	) {
-		// TODO: @lego - validate tokens
-		super(range);
-		// assert(
-		// 	!isNaN(lineNumber),
-		// 	`The line number must not be a NaN.`,
-		// );
-
-		// assert(
-		// 	lineNumber > 0,
-		// 	`The line number must be >= 1, got "${lineNumber}".`,
-		// );
-
-		// assert(
-		// 	columnNumber > 0,
-		// 	`The column number must be >= 1, got "${columnNumber}".`,
-		// );
-
-		// assert(
-		// 	caption[0] === '[' && caption[caption.length - 1] === ']',
-		// 	`The caption must be enclosed in square brackets, got "${caption}".`,
-		// );
-
-		// assert(
-		// 	reference[0] === '(' && reference[reference.length - 1] === ')',
-		// 	`The reference must be enclosed in parentheses, got "${reference}".`,
-		// );
+		assert(
+			text.startsWith('<!--'),
+			`The comment must start with '<!--', got '${text.substring(0, 10)}'.`,
+		);
 
-		// super(
-		// 	new Range(
-		// 		lineNumber,
-		// 		columnNumber,
-		// 		lineNumber,
-		// 		columnNumber + caption.length + reference.length,
-		// 	),
-		// );
+		super(range);
+	}
 
-		// // set up the `isURL` flag based on the current
-		// try {
-		// 	new URL(this.path);
-		// 	this.isURL = true;
-		// } catch {
-		// 	this.isURL = false;
-		// }
+	/**
+	 * Whether the comment has an end comment marker `-->`.
+	 */
+	public get hasEndMarker(): boolean {
+		return this.text.endsWith('-->');
 	}
 
 	/**

From fcb827a8cd920b1a483806dac0a93760c56ad665 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Wed, 26 Feb 2025 12:53:18 -0800
Subject: [PATCH 0850/1815] add basic unit tests for the markdown comments

---
 .../codecs/markdownCodec/markdownDecoder.ts   | 38 +++++++----
 .../markdownCodec/parsers/markdownComment.ts  |  4 +-
 .../common/codecs/simpleCodec/parserBase.ts   | 63 ++++++++++---------
 .../common/codecs/markdownDecoder.test.ts     | 36 +++++++++--
 4 files changed, 90 insertions(+), 51 deletions(-)

diff --git a/src/vs/editor/common/codecs/markdownCodec/markdownDecoder.ts b/src/vs/editor/common/codecs/markdownCodec/markdownDecoder.ts
index 71b8d6488464..ce5254ffee71 100644
--- a/src/vs/editor/common/codecs/markdownCodec/markdownDecoder.ts
+++ b/src/vs/editor/common/codecs/markdownCodec/markdownDecoder.ts
@@ -3,28 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MarkdownLink } from './tokens/markdownLink.js';
+import { MarkdownToken } from './tokens/markdownToken.js';
 import { VSBuffer } from '../../../../base/common/buffer.js';
 import { LeftBracket } from '../simpleCodec/tokens/brackets.js';
 import { ReadableStream } from '../../../../base/common/stream.js';
+import { LeftAngleBracket } from '../simpleCodec/tokens/angleBrackets.js';
 import { BaseDecoder } from '../../../../base/common/codecs/baseDecoder.js';
 import { SimpleDecoder, TSimpleToken } from '../simpleCodec/simpleDecoder.js';
+import { MarkdownCommentStart, PartialMarkdownCommentStart } from './parsers/markdownComment.js';
 import { MarkdownLinkCaption, PartialMarkdownLink, PartialMarkdownLinkCaption } from './parsers/markdownLink.js';
 
 /**
  * Tokens handled by this decoder.
  */
-export type TMarkdownToken = MarkdownLink | TSimpleToken;
+export type TMarkdownToken = MarkdownToken | TSimpleToken;
 
 /**
  * Decoder capable of parsing markdown entities (e.g., links) from a sequence of simple tokens.
  */
 export class MarkdownDecoder extends BaseDecoder<TMarkdownToken, TSimpleToken> {
 	/**
-	 * Current parser object that is responsible for parsing a sequence of tokens
-	 * into some markdown entity.
+	 * Current parser object that is responsible for parsing a sequence of tokens into
+	 * some markdown entity. Set to `undefined` when no parsing is in progress at the moment.
 	 */
-	private current?: PartialMarkdownLinkCaption | MarkdownLinkCaption | PartialMarkdownLink;
+	private current?:
+		PartialMarkdownLinkCaption | MarkdownLinkCaption | PartialMarkdownLink |
+		PartialMarkdownCommentStart | MarkdownCommentStart;
 
 	constructor(
 		stream: ReadableStream<VSBuffer>,
@@ -41,9 +45,14 @@ export class MarkdownDecoder extends BaseDecoder<TMarkdownToken, TSimpleToken> {
 			return;
 		}
 
-		// if current parser was not initiated before, - we are not inside a
-		// sequence of tokens we care about, therefore re-emit the token
-		// immediately and continue to the next one
+		if (token instanceof LeftAngleBracket && !this.current) {
+			this.current = new PartialMarkdownCommentStart(token);
+
+			return;
+		}
+
+		// if current parser was not initiated before, - we are not inside a sequence
+		// of tokens we care about, therefore re-emit the token immediately and continue
 		if (!this.current) {
 			this._onData.fire(token);
 			return;
@@ -51,16 +60,19 @@ export class MarkdownDecoder extends BaseDecoder<TMarkdownToken, TSimpleToken> {
 
 		// if there is a current parser object, submit the token to it
 		// so it can progress with parsing the tokens sequence
+		// TODO: @lego - handle `accept` errors thrown
 		const parseResult = this.current.accept(token);
 		if (parseResult.result === 'success') {
-			// if got a parsed out `MarkdownLink` back, emit it
-			// then reset the current parser object
-			if (parseResult.nextParser instanceof MarkdownLink) {
-				this._onData.fire(parseResult.nextParser);
+			const { nextParser } = parseResult;
+
+			// if got a fully parsed out token back, emit it and reset
+			// the current parser object so a new parsing process can start
+			if (nextParser instanceof MarkdownToken) {
+				this._onData.fire(nextParser);
 				delete this.current;
 			} else {
 				// otherwise, update the current parser object
-				this.current = parseResult.nextParser;
+				this.current = nextParser;
 			}
 		} else {
 			// if failed to parse a sequence of a tokens as a single markdown
diff --git a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts
index 58e3dfcae756..f415ae25cca9 100644
--- a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts
+++ b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts
@@ -50,8 +50,8 @@ export class PartialMarkdownCommentStart extends ParserBase<TSimpleToken, Partia
 			if (lastToken instanceof Dash) {
 				const token1: TSimpleToken | undefined = this.currentTokens[0];
 				const token2: TSimpleToken | undefined = this.currentTokens[1];
-				const token3: TSimpleToken | undefined = this.currentTokens[3];
-				const token4: TSimpleToken | undefined = this.currentTokens[4];
+				const token3: TSimpleToken | undefined = this.currentTokens[2];
+				const token4: TSimpleToken | undefined = this.currentTokens[3];
 
 				// sanity checks
 				assert(
diff --git a/src/vs/editor/common/codecs/simpleCodec/parserBase.ts b/src/vs/editor/common/codecs/simpleCodec/parserBase.ts
index bb4fc9271122..18b800db5548 100644
--- a/src/vs/editor/common/codecs/simpleCodec/parserBase.ts
+++ b/src/vs/editor/common/codecs/simpleCodec/parserBase.ts
@@ -43,37 +43,6 @@ export interface IAcceptTokenFailure extends IAcceptTokenResult {
  */
 export type TAcceptTokenResult<T> = IAcceptTokenSuccess<T> | IAcceptTokenFailure;
 
-/**
- * Decorator that validates that the current parser object was not yet consumed,
- * hence can still be used to accept new tokens in the parsing process.
- *
- * @throws the resulting decorated method throws if the parser object was already consumed.
- */
-export function assertNotConsumed<T extends ParserBase<any, any>>(
-	_target: T,
-	propertyKey: 'accept',
-	descriptor: PropertyDescriptor,
-) {
-	// store the original method reference
-	const originalMethod = descriptor.value;
-
-	// validate that the current parser object was not yet consumed
-	// before invoking the original accept method
-	descriptor.value = function (
-		this: T,
-		...args: Parameters<T[typeof propertyKey]>
-	): ReturnType<T[typeof propertyKey]> {
-		assert(
-			this.isConsumed === false,
-			`The parser object is already consumed and should not be used anymore.`,
-		);
-
-		return originalMethod.apply(this, args);
-	};
-
-	return descriptor;
-}
-
 /**
  * An abstract parser class that is able to parse a sequence of
  * tokens into a new single entity.
@@ -121,3 +90,35 @@ export abstract class ParserBase<TToken extends BaseToken, TNextObject> {
 		);
 	}
 }
+
+/**
+ * Decorator that validates that the current parser object was not yet consumed,
+ * hence can still be used to accept new tokens in the parsing process.
+ *
+ * @throws the resulting decorated method throws if the parser object was already consumed.
+ */
+// TODO: @legomushroom - use in all parsers
+export function assertNotConsumed<T extends ParserBase<any, any>>(
+	_target: T,
+	propertyKey: 'accept',
+	descriptor: PropertyDescriptor,
+) {
+	// store the original method reference
+	const originalMethod = descriptor.value;
+
+	// validate that the current parser object was not yet consumed
+	// before invoking the original accept method
+	descriptor.value = function (
+		this: T,
+		...args: Parameters<T[typeof propertyKey]>
+	): ReturnType<T[typeof propertyKey]> {
+		assert(
+			this.isConsumed === false,
+			`The parser object is already consumed and should not be used anymore.`,
+		);
+
+		return originalMethod.apply(this, args);
+	};
+
+	return descriptor;
+}
diff --git a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
index bd720971d790..bae943eab1e2 100644
--- a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
+++ b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import assert from 'assert';
 import { TestDecoder } from '../utils/testDecoder.js';
 import { Range } from '../../../common/core/range.js';
 import { VSBuffer } from '../../../../base/common/buffer.js';
@@ -11,15 +12,15 @@ import { Tab } from '../../../common/codecs/simpleCodec/tokens/tab.js';
 import { Word } from '../../../common/codecs/simpleCodec/tokens/word.js';
 import { Space } from '../../../common/codecs/simpleCodec/tokens/space.js';
 import { NewLine } from '../../../common/codecs/linesCodec/tokens/newLine.js';
+import { FormFeed } from '../../../common/codecs/simpleCodec/tokens/formFeed.js';
 import { VerticalTab } from '../../../common/codecs/simpleCodec/tokens/verticalTab.js';
 import { MarkdownLink } from '../../../common/codecs/markdownCodec/tokens/markdownLink.js';
+import { CarriageReturn } from '../../../common/codecs/linesCodec/tokens/carriageReturn.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { LeftBracket, RightBracket } from '../../../common/codecs/simpleCodec/tokens/brackets.js';
 import { MarkdownDecoder, TMarkdownToken } from '../../../common/codecs/markdownCodec/markdownDecoder.js';
-import { FormFeed } from '../../../common/codecs/simpleCodec/tokens/formFeed.js';
 import { LeftParenthesis, RightParenthesis } from '../../../common/codecs/simpleCodec/tokens/parentheses.js';
-import { LeftBracket, RightBracket } from '../../../common/codecs/simpleCodec/tokens/brackets.js';
-import { CarriageReturn } from '../../../common/codecs/linesCodec/tokens/carriageReturn.js';
-import assert from 'assert';
+import { MarkdownComment } from '../../../common/codecs/markdownCodec/tokens/markdownComment.js';
 
 /**
  * A reusable test utility that asserts that a `TestMarkdownDecoder` instance
@@ -61,7 +62,20 @@ suite('MarkdownDecoder', () => {
 		);
 
 		await test.run(
-			' hello world\nhow are\t you [caption text](./some/file/path/refer🎨nce.md)?\v\n\n[(example!)](another/path/with[-and-]-chars/folder)\t \n\t[#file:something.txt](/absolute/path/to/something.txt)',
+			[
+				// basic text
+				' hello world',
+				// text with markdown link and special characters in the filename
+				'how are\t you [caption text](./some/file/path/refer🎨nce.md)?\v',
+				// empty line
+				'',
+				// markdown link with special characters in the link caption and path
+				'[(example!)](another/path/with[-and-]-chars/folder)\t ',
+				// markdown link `#file` variable in the caption and with absolute path
+				'\t[#file:something.txt](/absolute/path/to/something.txt)',
+				// text with a commented out markdown link
+				'\v\f machines must <!-- [computer rights](/do/not/exist) --> suffer',
+			],
 			[
 				// first line
 				new Space(new Range(1, 1, 1, 2)),
@@ -91,6 +105,18 @@ suite('MarkdownDecoder', () => {
 				// fifth line
 				new Tab(new Range(5, 1, 5, 2)),
 				new MarkdownLink(5, 2, '[#file:something.txt]', '(/absolute/path/to/something.txt)'),
+				new NewLine(new Range(5, 56, 5, 57)),
+				// sixth line
+				new VerticalTab(new Range(6, 1, 6, 2)),
+				new FormFeed(new Range(6, 2, 6, 3)),
+				new Space(new Range(6, 3, 6, 4)),
+				new Word(new Range(6, 4, 6, 12), 'machines'),
+				new Space(new Range(6, 12, 6, 13)),
+				new Word(new Range(6, 13, 6, 17), 'must'),
+				new Space(new Range(6, 17, 6, 18)),
+				new MarkdownComment(new Range(6, 18, 6, 18 + 41), '<!-- [computer rights](/do/not/exist) -->'),
+				new Space(new Range(6, 59, 6, 60)),
+				new Word(new Range(6, 60, 6, 66), 'suffer'),
 			],
 		);
 	});

From 298766c4a2c60706635e75891451b778fb887355 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Wed, 26 Feb 2025 13:27:47 -0800
Subject: [PATCH 0851/1815] add more unit tests for makrdown comment parsing

---
 .../codecs/markdownCodec/markdownDecoder.ts   |  13 +-
 .../common/codecs/markdownDecoder.test.ts     | 585 ++++++++++--------
 2 files changed, 333 insertions(+), 265 deletions(-)

diff --git a/src/vs/editor/common/codecs/markdownCodec/markdownDecoder.ts b/src/vs/editor/common/codecs/markdownCodec/markdownDecoder.ts
index ce5254ffee71..61fc3c6e3016 100644
--- a/src/vs/editor/common/codecs/markdownCodec/markdownDecoder.ts
+++ b/src/vs/editor/common/codecs/markdownCodec/markdownDecoder.ts
@@ -60,7 +60,6 @@ export class MarkdownDecoder extends BaseDecoder<TMarkdownToken, TSimpleToken> {
 
 		// if there is a current parser object, submit the token to it
 		// so it can progress with parsing the tokens sequence
-		// TODO: @lego - handle `accept` errors thrown
 		const parseResult = this.current.accept(token);
 		if (parseResult.result === 'success') {
 			const { nextParser } = parseResult;
@@ -94,8 +93,18 @@ export class MarkdownDecoder extends BaseDecoder<TMarkdownToken, TSimpleToken> {
 
 	protected override onStreamEnd(): void {
 		// if the stream has ended and there is a current incomplete parser
-		// object present, then re-emit its tokens as standalone entities
+		// object present, handle the remaining parser object
 		if (this.current) {
+			// if a `markdown comment` does not have an end marker `-->`
+			// it is still a comment that extends to the end of the file
+			// so re-emit the current parser as a comment token
+			if (this.current instanceof MarkdownCommentStart) {
+				this._onData.fire(this.current.asMarkdownComment());
+				delete this.current;
+				return this.onStreamEnd();
+			}
+
+			// in all other cases, re-emit existing parser tokens
 			const { tokens } = this.current;
 			delete this.current;
 
diff --git a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
index bae943eab1e2..d31907d22775 100644
--- a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
+++ b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
@@ -56,303 +56,362 @@ export class TestMarkdownDecoder extends TestDecoder<TMarkdownToken, MarkdownDec
 suite('MarkdownDecoder', () => {
 	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
 
-	test('produces expected tokens', async () => {
-		const test = testDisposables.add(
-			new TestMarkdownDecoder(),
-		);
-
-		await test.run(
-			[
-				// basic text
-				' hello world',
-				// text with markdown link and special characters in the filename
-				'how are\t you [caption text](./some/file/path/refer🎨nce.md)?\v',
-				// empty line
-				'',
-				// markdown link with special characters in the link caption and path
-				'[(example!)](another/path/with[-and-]-chars/folder)\t ',
-				// markdown link `#file` variable in the caption and with absolute path
-				'\t[#file:something.txt](/absolute/path/to/something.txt)',
-				// text with a commented out markdown link
-				'\v\f machines must <!-- [computer rights](/do/not/exist) --> suffer',
-			],
-			[
-				// first line
-				new Space(new Range(1, 1, 1, 2)),
-				new Word(new Range(1, 2, 1, 7), 'hello'),
-				new Space(new Range(1, 7, 1, 8)),
-				new Word(new Range(1, 8, 1, 13), 'world'),
-				new NewLine(new Range(1, 13, 1, 14)),
-				// second line
-				new Word(new Range(2, 1, 2, 4), 'how'),
-				new Space(new Range(2, 4, 2, 5)),
-				new Word(new Range(2, 5, 2, 8), 'are'),
-				new Tab(new Range(2, 8, 2, 9)),
-				new Space(new Range(2, 9, 2, 10)),
-				new Word(new Range(2, 10, 2, 13), 'you'),
-				new Space(new Range(2, 13, 2, 14)),
-				new MarkdownLink(2, 14, '[caption text]', '(./some/file/path/refer🎨nce.md)'),
-				new Word(new Range(2, 60, 2, 61), '?'),
-				new VerticalTab(new Range(2, 61, 2, 62)),
-				new NewLine(new Range(2, 62, 2, 63)),
-				// third line
-				new NewLine(new Range(3, 1, 3, 2)),
-				// fourth line
-				new MarkdownLink(4, 1, '[(example!)]', '(another/path/with[-and-]-chars/folder)'),
-				new Tab(new Range(4, 52, 4, 53)),
-				new Space(new Range(4, 53, 4, 54)),
-				new NewLine(new Range(4, 54, 4, 55)),
-				// fifth line
-				new Tab(new Range(5, 1, 5, 2)),
-				new MarkdownLink(5, 2, '[#file:something.txt]', '(/absolute/path/to/something.txt)'),
-				new NewLine(new Range(5, 56, 5, 57)),
-				// sixth line
-				new VerticalTab(new Range(6, 1, 6, 2)),
-				new FormFeed(new Range(6, 2, 6, 3)),
-				new Space(new Range(6, 3, 6, 4)),
-				new Word(new Range(6, 4, 6, 12), 'machines'),
-				new Space(new Range(6, 12, 6, 13)),
-				new Word(new Range(6, 13, 6, 17), 'must'),
-				new Space(new Range(6, 17, 6, 18)),
-				new MarkdownComment(new Range(6, 18, 6, 18 + 41), '<!-- [computer rights](/do/not/exist) -->'),
-				new Space(new Range(6, 59, 6, 60)),
-				new Word(new Range(6, 60, 6, 66), 'suffer'),
-			],
-		);
-	});
-
-	test('handles complex cases', async () => {
-		const test = testDisposables.add(
-			new TestMarkdownDecoder(),
-		);
-
-		const inputLines = [
-			// tests that the link caption contain a chat prompt `#file:` reference, while
-			// the file path can contain other `graphical characters`
-			'\v\t[#file:./another/path/to/file.txt](./real/file!path/file◆name.md)',
-			// tests that the link file path contain a chat prompt `#file:` reference,
-			// `spaces`, `emojies`, and other `graphical characters`
-			' [reference ∘ label](/absolute/pa th/to-#file:file.txt/f🥸⚡️le.md)',
-			// tests that link caption and file path can contain `parentheses`, `spaces`, and
-			// `emojies`
-			'\f[!(hello)!](./w(())rld/nice-🦚-filen(a)<me>.git))\n\t',
-			// tests that the link caption can be empty, while the file path can contain `square brackets`
-			'[<test>](./s[]me/pa[h!) ',
-		];
+	suite('general', () => {
+		test('produces expected tokens', async () => {
+			const test = testDisposables.add(
+				new TestMarkdownDecoder(),
+			);
 
-		await test.run(
-			inputLines,
-			[
-				// `1st` line
-				new VerticalTab(new Range(1, 1, 1, 2)),
-				new Tab(new Range(1, 2, 1, 3)),
-				new MarkdownLink(1, 3, '[#file:./another/path/to/file.txt]', '(./real/file!path/file◆name.md)'),
-				new NewLine(new Range(1, 68, 1, 69)),
-				// `2nd` line
-				new Space(new Range(2, 1, 2, 2)),
-				new MarkdownLink(2, 2, '[reference ∘ label]', '(/absolute/pa th/to-#file:file.txt/f🥸⚡️le.md)'),
-				new NewLine(new Range(2, 67, 2, 68)),
-				// `3rd` line
-				new FormFeed(new Range(3, 1, 3, 2)),
-				new MarkdownLink(3, 2, '[!(hello)!]', '(./w(())rld/nice-🦚-filen(a)<me>.git)'),
-				new RightParenthesis(new Range(3, 50, 3, 51)),
-				new NewLine(new Range(3, 51, 3, 52)),
-				// `4th` line
-				new Tab(new Range(4, 1, 4, 2)),
-				new NewLine(new Range(4, 2, 4, 3)),
-				// `5th` line
-				new MarkdownLink(5, 1, '[<test>]', '(./s[]me/pa[h!)'),
-				new Space(new Range(5, 24, 5, 25)),
-			],
-		);
-	});
+			await test.run(
+				[
+					// basic text
+					' hello world',
+					// text with markdown link and special characters in the filename
+					'how are\t you [caption text](./some/file/path/refer🎨nce.md)?\v',
+					// empty line
+					'',
+					// markdown link with special characters in the link caption and path
+					'[(example!)](another/path/with[-and-]-chars/folder)\t ',
+					// markdown link `#file` variable in the caption and with absolute path
+					'\t[#file:something.txt](/absolute/path/to/something.txt)',
+					// text with a commented out markdown link
+					'\v\f machines must <!-- [computer rights](/do/not/exist) --> suffer',
+				],
+				[
+					// first line
+					new Space(new Range(1, 1, 1, 2)),
+					new Word(new Range(1, 2, 1, 7), 'hello'),
+					new Space(new Range(1, 7, 1, 8)),
+					new Word(new Range(1, 8, 1, 13), 'world'),
+					new NewLine(new Range(1, 13, 1, 14)),
+					// second line
+					new Word(new Range(2, 1, 2, 4), 'how'),
+					new Space(new Range(2, 4, 2, 5)),
+					new Word(new Range(2, 5, 2, 8), 'are'),
+					new Tab(new Range(2, 8, 2, 9)),
+					new Space(new Range(2, 9, 2, 10)),
+					new Word(new Range(2, 10, 2, 13), 'you'),
+					new Space(new Range(2, 13, 2, 14)),
+					new MarkdownLink(2, 14, '[caption text]', '(./some/file/path/refer🎨nce.md)'),
+					new Word(new Range(2, 60, 2, 61), '?'),
+					new VerticalTab(new Range(2, 61, 2, 62)),
+					new NewLine(new Range(2, 62, 2, 63)),
+					// third line
+					new NewLine(new Range(3, 1, 3, 2)),
+					// fourth line
+					new MarkdownLink(4, 1, '[(example!)]', '(another/path/with[-and-]-chars/folder)'),
+					new Tab(new Range(4, 52, 4, 53)),
+					new Space(new Range(4, 53, 4, 54)),
+					new NewLine(new Range(4, 54, 4, 55)),
+					// fifth line
+					new Tab(new Range(5, 1, 5, 2)),
+					new MarkdownLink(5, 2, '[#file:something.txt]', '(/absolute/path/to/something.txt)'),
+					new NewLine(new Range(5, 56, 5, 57)),
+					// sixth line
+					new VerticalTab(new Range(6, 1, 6, 2)),
+					new FormFeed(new Range(6, 2, 6, 3)),
+					new Space(new Range(6, 3, 6, 4)),
+					new Word(new Range(6, 4, 6, 12), 'machines'),
+					new Space(new Range(6, 12, 6, 13)),
+					new Word(new Range(6, 13, 6, 17), 'must'),
+					new Space(new Range(6, 17, 6, 18)),
+					new MarkdownComment(new Range(6, 18, 6, 18 + 41), '<!-- [computer rights](/do/not/exist) -->'),
+					new Space(new Range(6, 59, 6, 60)),
+					new Word(new Range(6, 60, 6, 66), 'suffer'),
+				],
+			);
+		});
 
-	suite('broken links', () => {
-		test('incomplete/invalid links', async () => {
+		test('handles complex cases', async () => {
 			const test = testDisposables.add(
 				new TestMarkdownDecoder(),
 			);
 
 			const inputLines = [
-				// incomplete link reference with empty caption
-				'[ ](./real/file path/file⇧name.md',
-				// space between caption and reference is disallowed
-				'[link text] (./file path/name.txt)',
+				// tests that the link caption contain a chat prompt `#file:` reference, while
+				// the file path can contain other `graphical characters`
+				'\v\t[#file:./another/path/to/file.txt](./real/file!path/file◆name.md)',
+				// tests that the link file path contain a chat prompt `#file:` reference,
+				// `spaces`, `emojies`, and other `graphical characters`
+				' [reference ∘ label](/absolute/pa th/to-#file:file.txt/f🥸⚡️le.md)',
+				// tests that link caption and file path can contain `parentheses`, `spaces`, and
+				// `emojies`
+				'\f[!(hello)!](./w(())rld/nice-🦚-filen(a)<me>.git))\n\t',
+				// tests that the link caption can be empty, while the file path can contain `square brackets`
+				'[<test>](./s[]me/pa[h!) ',
 			];
 
 			await test.run(
 				inputLines,
 				[
 					// `1st` line
-					new LeftBracket(new Range(1, 1, 1, 2)),
-					new Space(new Range(1, 2, 1, 3)),
-					new RightBracket(new Range(1, 3, 1, 4)),
-					new LeftParenthesis(new Range(1, 4, 1, 5)),
-					new Word(new Range(1, 5, 1, 5 + 11), './real/file'),
-					new Space(new Range(1, 16, 1, 17)),
-					new Word(new Range(1, 17, 1, 17 + 17), 'path/file⇧name.md'),
-					new NewLine(new Range(1, 34, 1, 35)),
+					new VerticalTab(new Range(1, 1, 1, 2)),
+					new Tab(new Range(1, 2, 1, 3)),
+					new MarkdownLink(1, 3, '[#file:./another/path/to/file.txt]', '(./real/file!path/file◆name.md)'),
+					new NewLine(new Range(1, 68, 1, 69)),
 					// `2nd` line
-					new LeftBracket(new Range(2, 1, 2, 2)),
-					new Word(new Range(2, 2, 2, 2 + 4), 'link'),
-					new Space(new Range(2, 6, 2, 7)),
-					new Word(new Range(2, 7, 2, 7 + 4), 'text'),
-					new RightBracket(new Range(2, 11, 2, 12)),
-					new Space(new Range(2, 12, 2, 13)),
-					new LeftParenthesis(new Range(2, 13, 2, 14)),
-					new Word(new Range(2, 14, 2, 14 + 6), './file'),
-					new Space(new Range(2, 20, 2, 21)),
-					new Word(new Range(2, 21, 2, 21 + 13), 'path/name.txt'),
-					new RightParenthesis(new Range(2, 34, 2, 35)),
+					new Space(new Range(2, 1, 2, 2)),
+					new MarkdownLink(2, 2, '[reference ∘ label]', '(/absolute/pa th/to-#file:file.txt/f🥸⚡️le.md)'),
+					new NewLine(new Range(2, 67, 2, 68)),
+					// `3rd` line
+					new FormFeed(new Range(3, 1, 3, 2)),
+					new MarkdownLink(3, 2, '[!(hello)!]', '(./w(())rld/nice-🦚-filen(a)<me>.git)'),
+					new RightParenthesis(new Range(3, 50, 3, 51)),
+					new NewLine(new Range(3, 51, 3, 52)),
+					// `4th` line
+					new Tab(new Range(4, 1, 4, 2)),
+					new NewLine(new Range(4, 2, 4, 3)),
+					// `5th` line
+					new MarkdownLink(5, 1, '[<test>]', '(./s[]me/pa[h!)'),
+					new Space(new Range(5, 24, 5, 25)),
 				],
 			);
 		});
+	});
 
-		suite('stop characters inside caption/reference (new lines)', () => {
-			for (const stopCharacter of [CarriageReturn, NewLine]) {
-				let characterName = '';
+	suite('links', () => {
+		suite('broken links', () => {
+			test('incomplete/invalid links', async () => {
+				const test = testDisposables.add(
+					new TestMarkdownDecoder(),
+				);
 
-				if (stopCharacter === CarriageReturn) {
-					characterName = '\\r';
-				}
-				if (stopCharacter === NewLine) {
-					characterName = '\\n';
-				}
+				const inputLines = [
+					// incomplete link reference with empty caption
+					'[ ](./real/file path/file⇧name.md',
+					// space between caption and reference is disallowed
+					'[link text] (./file path/name.txt)',
+				];
 
-				assert(
-					characterName !== '',
-					'The "characterName" must be set, got "empty line".',
+				await test.run(
+					inputLines,
+					[
+						// `1st` line
+						new LeftBracket(new Range(1, 1, 1, 2)),
+						new Space(new Range(1, 2, 1, 3)),
+						new RightBracket(new Range(1, 3, 1, 4)),
+						new LeftParenthesis(new Range(1, 4, 1, 5)),
+						new Word(new Range(1, 5, 1, 5 + 11), './real/file'),
+						new Space(new Range(1, 16, 1, 17)),
+						new Word(new Range(1, 17, 1, 17 + 17), 'path/file⇧name.md'),
+						new NewLine(new Range(1, 34, 1, 35)),
+						// `2nd` line
+						new LeftBracket(new Range(2, 1, 2, 2)),
+						new Word(new Range(2, 2, 2, 2 + 4), 'link'),
+						new Space(new Range(2, 6, 2, 7)),
+						new Word(new Range(2, 7, 2, 7 + 4), 'text'),
+						new RightBracket(new Range(2, 11, 2, 12)),
+						new Space(new Range(2, 12, 2, 13)),
+						new LeftParenthesis(new Range(2, 13, 2, 14)),
+						new Word(new Range(2, 14, 2, 14 + 6), './file'),
+						new Space(new Range(2, 20, 2, 21)),
+						new Word(new Range(2, 21, 2, 21 + 13), 'path/name.txt'),
+						new RightParenthesis(new Range(2, 34, 2, 35)),
+					],
 				);
+			});
 
-				test(`stop character - "${characterName}"`, async () => {
-					const test = testDisposables.add(
-						new TestMarkdownDecoder(),
-					);
+			suite('stop characters inside caption/reference (new lines)', () => {
+				for (const stopCharacter of [CarriageReturn, NewLine]) {
+					let characterName = '';
 
-					const inputLines = [
-						// stop character inside link caption
-						`[haa${stopCharacter.symbol}loů](./real/💁/name.txt)`,
-						// stop character inside link reference
-						`[ref text](/etc/pat${stopCharacter.symbol}h/to/file.md)`,
-						// stop character between line caption and link reference is disallowed
-						`[text]${stopCharacter.symbol}(/etc/ path/file.md)`,
-					];
+					if (stopCharacter === CarriageReturn) {
+						characterName = '\\r';
+					}
+					if (stopCharacter === NewLine) {
+						characterName = '\\n';
+					}
 
-
-					await test.run(
-						inputLines,
-						[
-							// `1st` input line
-							new LeftBracket(new Range(1, 1, 1, 2)),
-							new Word(new Range(1, 2, 1, 2 + 3), 'haa'),
-							new stopCharacter(new Range(1, 5, 1, 6)), // <- stop character
-							new Word(new Range(2, 1, 2, 1 + 3), 'loů'),
-							new RightBracket(new Range(2, 4, 2, 5)),
-							new LeftParenthesis(new Range(2, 5, 2, 6)),
-							new Word(new Range(2, 6, 2, 6 + 18), './real/💁/name.txt'),
-							new RightParenthesis(new Range(2, 24, 2, 25)),
-							new NewLine(new Range(2, 25, 2, 26)),
-							// `2nd` input line
-							new LeftBracket(new Range(3, 1, 3, 2)),
-							new Word(new Range(3, 2, 3, 2 + 3), 'ref'),
-							new Space(new Range(3, 5, 3, 6)),
-							new Word(new Range(3, 6, 3, 6 + 4), 'text'),
-							new RightBracket(new Range(3, 10, 3, 11)),
-							new LeftParenthesis(new Range(3, 11, 3, 12)),
-							new Word(new Range(3, 12, 3, 12 + 8), '/etc/pat'),
-							new stopCharacter(new Range(3, 20, 3, 21)), // <- stop character
-							new Word(new Range(4, 1, 4, 1 + 12), 'h/to/file.md'),
-							new RightParenthesis(new Range(4, 13, 4, 14)),
-							new NewLine(new Range(4, 14, 4, 15)),
-							// `3nd` input line
-							new LeftBracket(new Range(5, 1, 5, 2)),
-							new Word(new Range(5, 2, 5, 2 + 4), 'text'),
-							new RightBracket(new Range(5, 6, 5, 7)),
-							new stopCharacter(new Range(5, 7, 5, 8)), // <- stop character
-							new LeftParenthesis(new Range(6, 1, 6, 2)),
-							new Word(new Range(6, 2, 6, 2 + 5), '/etc/'),
-							new Space(new Range(6, 7, 6, 8)),
-							new Word(new Range(6, 8, 6, 8 + 12), 'path/file.md'),
-							new RightParenthesis(new Range(6, 20, 6, 21)),
-						],
+					assert(
+						characterName !== '',
+						'The "characterName" must be set, got "empty line".',
 					);
-				});
-			}
-		});
 
-		/**
-		 * Same as above but these stop characters do not move the caret to the next line.
-		 */
-		suite('stop characters inside caption/reference (same line)', () => {
-			for (const stopCharacter of [VerticalTab, FormFeed]) {
-				let characterName = '';
+					test(`stop character - "${characterName}"`, async () => {
+						const test = testDisposables.add(
+							new TestMarkdownDecoder(),
+						);
 
-				if (stopCharacter === VerticalTab) {
-					characterName = '\\v';
-				}
-				if (stopCharacter === FormFeed) {
-					characterName = '\\f';
+						const inputLines = [
+							// stop character inside link caption
+							`[haa${stopCharacter.symbol}loů](./real/💁/name.txt)`,
+							// stop character inside link reference
+							`[ref text](/etc/pat${stopCharacter.symbol}h/to/file.md)`,
+							// stop character between line caption and link reference is disallowed
+							`[text]${stopCharacter.symbol}(/etc/ path/file.md)`,
+						];
+
+
+						await test.run(
+							inputLines,
+							[
+								// `1st` input line
+								new LeftBracket(new Range(1, 1, 1, 2)),
+								new Word(new Range(1, 2, 1, 2 + 3), 'haa'),
+								new stopCharacter(new Range(1, 5, 1, 6)), // <- stop character
+								new Word(new Range(2, 1, 2, 1 + 3), 'loů'),
+								new RightBracket(new Range(2, 4, 2, 5)),
+								new LeftParenthesis(new Range(2, 5, 2, 6)),
+								new Word(new Range(2, 6, 2, 6 + 18), './real/💁/name.txt'),
+								new RightParenthesis(new Range(2, 24, 2, 25)),
+								new NewLine(new Range(2, 25, 2, 26)),
+								// `2nd` input line
+								new LeftBracket(new Range(3, 1, 3, 2)),
+								new Word(new Range(3, 2, 3, 2 + 3), 'ref'),
+								new Space(new Range(3, 5, 3, 6)),
+								new Word(new Range(3, 6, 3, 6 + 4), 'text'),
+								new RightBracket(new Range(3, 10, 3, 11)),
+								new LeftParenthesis(new Range(3, 11, 3, 12)),
+								new Word(new Range(3, 12, 3, 12 + 8), '/etc/pat'),
+								new stopCharacter(new Range(3, 20, 3, 21)), // <- stop character
+								new Word(new Range(4, 1, 4, 1 + 12), 'h/to/file.md'),
+								new RightParenthesis(new Range(4, 13, 4, 14)),
+								new NewLine(new Range(4, 14, 4, 15)),
+								// `3nd` input line
+								new LeftBracket(new Range(5, 1, 5, 2)),
+								new Word(new Range(5, 2, 5, 2 + 4), 'text'),
+								new RightBracket(new Range(5, 6, 5, 7)),
+								new stopCharacter(new Range(5, 7, 5, 8)), // <- stop character
+								new LeftParenthesis(new Range(6, 1, 6, 2)),
+								new Word(new Range(6, 2, 6, 2 + 5), '/etc/'),
+								new Space(new Range(6, 7, 6, 8)),
+								new Word(new Range(6, 8, 6, 8 + 12), 'path/file.md'),
+								new RightParenthesis(new Range(6, 20, 6, 21)),
+							],
+						);
+					});
 				}
+			});
 
-				assert(
-					characterName !== '',
-					'The "characterName" must be set, got "empty line".',
-				);
+			/**
+			 * Same as above but these stop characters do not move the caret to the next line.
+			 */
+			suite('stop characters inside caption/reference (same line)', () => {
+				for (const stopCharacter of [VerticalTab, FormFeed]) {
+					let characterName = '';
+
+					if (stopCharacter === VerticalTab) {
+						characterName = '\\v';
+					}
+					if (stopCharacter === FormFeed) {
+						characterName = '\\f';
+					}
 
-				test(`stop character - "${characterName}"`, async () => {
-					const test = testDisposables.add(
-						new TestMarkdownDecoder(),
+					assert(
+						characterName !== '',
+						'The "characterName" must be set, got "empty line".',
 					);
 
-					const inputLines = [
-						// stop character inside link caption
-						`[haa${stopCharacter.symbol}loů](./real/💁/name.txt)`,
-						// stop character inside link reference
-						`[ref text](/etc/pat${stopCharacter.symbol}h/to/file.md)`,
-						// stop character between line caption and link reference is disallowed
-						`[text]${stopCharacter.symbol}(/etc/ path/file.md)`,
-					];
+					test(`stop character - "${characterName}"`, async () => {
+						const test = testDisposables.add(
+							new TestMarkdownDecoder(),
+						);
 
+						const inputLines = [
+							// stop character inside link caption
+							`[haa${stopCharacter.symbol}loů](./real/💁/name.txt)`,
+							// stop character inside link reference
+							`[ref text](/etc/pat${stopCharacter.symbol}h/to/file.md)`,
+							// stop character between line caption and link reference is disallowed
+							`[text]${stopCharacter.symbol}(/etc/ path/file.md)`,
+						];
 
-					await test.run(
-						inputLines,
-						[
-							// `1st` input line
-							new LeftBracket(new Range(1, 1, 1, 2)),
-							new Word(new Range(1, 2, 1, 2 + 3), 'haa'),
-							new stopCharacter(new Range(1, 5, 1, 6)), // <- stop character
-							new Word(new Range(1, 6, 1, 6 + 3), 'loů'),
-							new RightBracket(new Range(1, 9, 1, 10)),
-							new LeftParenthesis(new Range(1, 10, 1, 11)),
-							new Word(new Range(1, 11, 1, 11 + 18), './real/💁/name.txt'),
-							new RightParenthesis(new Range(1, 29, 1, 30)),
-							new NewLine(new Range(1, 30, 1, 31)),
-							// `2nd` input line
-							new LeftBracket(new Range(2, 1, 2, 2)),
-							new Word(new Range(2, 2, 2, 2 + 3), 'ref'),
-							new Space(new Range(2, 5, 2, 6)),
-							new Word(new Range(2, 6, 2, 6 + 4), 'text'),
-							new RightBracket(new Range(2, 10, 2, 11)),
-							new LeftParenthesis(new Range(2, 11, 2, 12)),
-							new Word(new Range(2, 12, 2, 12 + 8), '/etc/pat'),
-							new stopCharacter(new Range(2, 20, 2, 21)), // <- stop character
-							new Word(new Range(2, 21, 2, 21 + 12), 'h/to/file.md'),
-							new RightParenthesis(new Range(2, 33, 2, 34)),
-							new NewLine(new Range(2, 34, 2, 35)),
-							// `3nd` input line
-							new LeftBracket(new Range(3, 1, 3, 2)),
-							new Word(new Range(3, 2, 3, 2 + 4), 'text'),
-							new RightBracket(new Range(3, 6, 3, 7)),
-							new stopCharacter(new Range(3, 7, 3, 8)), // <- stop character
-							new LeftParenthesis(new Range(3, 8, 3, 9)),
-							new Word(new Range(3, 9, 3, 9 + 5), '/etc/'),
-							new Space(new Range(3, 14, 3, 15)),
-							new Word(new Range(3, 15, 3, 15 + 12), 'path/file.md'),
-							new RightParenthesis(new Range(3, 27, 3, 28)),
-						],
-					);
-				});
-			}
+
+						await test.run(
+							inputLines,
+							[
+								// `1st` input line
+								new LeftBracket(new Range(1, 1, 1, 2)),
+								new Word(new Range(1, 2, 1, 2 + 3), 'haa'),
+								new stopCharacter(new Range(1, 5, 1, 6)), // <- stop character
+								new Word(new Range(1, 6, 1, 6 + 3), 'loů'),
+								new RightBracket(new Range(1, 9, 1, 10)),
+								new LeftParenthesis(new Range(1, 10, 1, 11)),
+								new Word(new Range(1, 11, 1, 11 + 18), './real/💁/name.txt'),
+								new RightParenthesis(new Range(1, 29, 1, 30)),
+								new NewLine(new Range(1, 30, 1, 31)),
+								// `2nd` input line
+								new LeftBracket(new Range(2, 1, 2, 2)),
+								new Word(new Range(2, 2, 2, 2 + 3), 'ref'),
+								new Space(new Range(2, 5, 2, 6)),
+								new Word(new Range(2, 6, 2, 6 + 4), 'text'),
+								new RightBracket(new Range(2, 10, 2, 11)),
+								new LeftParenthesis(new Range(2, 11, 2, 12)),
+								new Word(new Range(2, 12, 2, 12 + 8), '/etc/pat'),
+								new stopCharacter(new Range(2, 20, 2, 21)), // <- stop character
+								new Word(new Range(2, 21, 2, 21 + 12), 'h/to/file.md'),
+								new RightParenthesis(new Range(2, 33, 2, 34)),
+								new NewLine(new Range(2, 34, 2, 35)),
+								// `3nd` input line
+								new LeftBracket(new Range(3, 1, 3, 2)),
+								new Word(new Range(3, 2, 3, 2 + 4), 'text'),
+								new RightBracket(new Range(3, 6, 3, 7)),
+								new stopCharacter(new Range(3, 7, 3, 8)), // <- stop character
+								new LeftParenthesis(new Range(3, 8, 3, 9)),
+								new Word(new Range(3, 9, 3, 9 + 5), '/etc/'),
+								new Space(new Range(3, 14, 3, 15)),
+								new Word(new Range(3, 15, 3, 15 + 12), 'path/file.md'),
+								new RightParenthesis(new Range(3, 27, 3, 28)),
+							],
+						);
+					});
+				}
+			});
+		});
+	});
+
+	suite('comments', () => {
+		test('base cases', async () => {
+			const test = testDisposables.add(
+				new TestMarkdownDecoder(),
+			);
+
+			const inputData = [
+				// markdown comment with text inside it
+				'\t<!-- hello world -->',
+				// markdown comment with a link inside
+				'some text<!-- \v[link label](/some/path/to/file.md)\f --> and more text ',
+				// markdown comment new lines inside it
+				'<!-- comment\r\ntext\n\ngoes here --> usual text follows',
+				// markdown comment that was not closed properly
+				'haalo\t<!-- [link label](/some/path/to/file.md)',
+			];
+
+			await test.run(
+				inputData,
+				[
+					// `1st`
+					new Tab(new Range(1, 1, 1, 2)),
+					new MarkdownComment(new Range(1, 2, 1, 2 + 20), '<!-- hello world -->'),
+					new NewLine(new Range(1, 22, 1, 23)),
+					// `2nd`
+					new Word(new Range(2, 1, 2, 5), 'some'),
+					new Space(new Range(2, 5, 2, 6)),
+					new Word(new Range(2, 6, 2, 10), 'text'),
+					new MarkdownComment(new Range(2, 10, 2, 10 + 46), '<!-- \v[link label](/some/path/to/file.md)\f -->'),
+					new Space(new Range(2, 56, 2, 57)),
+					new Word(new Range(2, 57, 2, 60), 'and'),
+					new Space(new Range(2, 60, 2, 61)),
+					new Word(new Range(2, 61, 2, 65), 'more'),
+					new Space(new Range(2, 65, 2, 66)),
+					new Word(new Range(2, 66, 2, 70), 'text'),
+					new Space(new Range(2, 70, 2, 71)),
+					new NewLine(new Range(2, 71, 2, 72)),
+					// `3rd`
+					new MarkdownComment(new Range(3, 1, 3 + 3, 1 + 13), '<!-- comment\r\ntext\n\ngoes here -->'),
+					new Space(new Range(6, 14, 6, 15)),
+					new Word(new Range(6, 15, 6, 15 + 5), 'usual'),
+					new Space(new Range(6, 20, 6, 21)),
+					new Word(new Range(6, 21, 6, 21 + 4), 'text'),
+					new Space(new Range(6, 25, 6, 26)),
+					new Word(new Range(6, 26, 6, 26 + 7), 'follows'),
+					new NewLine(new Range(6, 33, 6, 34)),
+					// `4rd`
+					new Word(new Range(7, 1, 7, 6), 'haalo'),
+					new Tab(new Range(7, 6, 7, 7)),
+					new MarkdownComment(new Range(7, 7, 7, 7 + 40), '<!-- [link label](/some/path/to/file.md)'),
+				],
+			);
 		});
 	});
 });

From 167c4c3487464bd14192d08a695421059a3105cb Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Wed, 26 Feb 2025 13:49:25 -0800
Subject: [PATCH 0852/1815] add unit tests for invalid markdown links

---
 .../common/codecs/markdownDecoder.test.ts     | 149 ++++++++++++++----
 1 file changed, 115 insertions(+), 34 deletions(-)

diff --git a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
index d31907d22775..7cb8bfd93026 100644
--- a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
+++ b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
@@ -21,6 +21,9 @@ import { LeftBracket, RightBracket } from '../../../common/codecs/simpleCodec/to
 import { MarkdownDecoder, TMarkdownToken } from '../../../common/codecs/markdownCodec/markdownDecoder.js';
 import { LeftParenthesis, RightParenthesis } from '../../../common/codecs/simpleCodec/tokens/parentheses.js';
 import { MarkdownComment } from '../../../common/codecs/markdownCodec/tokens/markdownComment.js';
+import { LeftAngleBracket, RightAngleBracket } from '../../../common/codecs/simpleCodec/tokens/angleBrackets.js';
+import { ExclamationMark } from '../../../common/codecs/simpleCodec/tokens/exclamationMark.js';
+import { Dash } from '../../../common/codecs/simpleCodec/tokens/dash.js';
 
 /**
  * A reusable test utility that asserts that a `TestMarkdownDecoder` instance
@@ -361,20 +364,79 @@ suite('MarkdownDecoder', () => {
 	});
 
 	suite('comments', () => {
-		test('base cases', async () => {
+		suite('general', () => {
+			test('base cases', async () => {
+				const test = testDisposables.add(
+					new TestMarkdownDecoder(),
+				);
+
+				const inputData = [
+					// markdown comment with text inside it
+					'\t<!-- hello world -->',
+					// markdown comment with a link inside
+					'some text<!-- \v[link label](/some/path/to/file.md)\f --> and more text ',
+					// markdown comment new lines inside it
+					'<!-- comment\r\ntext\n\ngoes here --> usual text follows',
+					// an empty comment
+					'\t<!---->\t',
+					// markdown comment that was not closed properly
+					'haalo\t<!-- [link label](/some/path/to/file.md)',
+				];
+
+				await test.run(
+					inputData,
+					[
+						// `1st`
+						new Tab(new Range(1, 1, 1, 2)),
+						new MarkdownComment(new Range(1, 2, 1, 2 + 20), '<!-- hello world -->'),
+						new NewLine(new Range(1, 22, 1, 23)),
+						// `2nd`
+						new Word(new Range(2, 1, 2, 5), 'some'),
+						new Space(new Range(2, 5, 2, 6)),
+						new Word(new Range(2, 6, 2, 10), 'text'),
+						new MarkdownComment(new Range(2, 10, 2, 10 + 46), '<!-- \v[link label](/some/path/to/file.md)\f -->'),
+						new Space(new Range(2, 56, 2, 57)),
+						new Word(new Range(2, 57, 2, 60), 'and'),
+						new Space(new Range(2, 60, 2, 61)),
+						new Word(new Range(2, 61, 2, 65), 'more'),
+						new Space(new Range(2, 65, 2, 66)),
+						new Word(new Range(2, 66, 2, 70), 'text'),
+						new Space(new Range(2, 70, 2, 71)),
+						new NewLine(new Range(2, 71, 2, 72)),
+						// `3rd`
+						new MarkdownComment(new Range(3, 1, 3 + 3, 1 + 13), '<!-- comment\r\ntext\n\ngoes here -->'),
+						new Space(new Range(6, 14, 6, 15)),
+						new Word(new Range(6, 15, 6, 15 + 5), 'usual'),
+						new Space(new Range(6, 20, 6, 21)),
+						new Word(new Range(6, 21, 6, 21 + 4), 'text'),
+						new Space(new Range(6, 25, 6, 26)),
+						new Word(new Range(6, 26, 6, 26 + 7), 'follows'),
+						new NewLine(new Range(6, 33, 6, 34)),
+						// `4rd`
+						new Tab(new Range(7, 1, 7, 2)),
+						new MarkdownComment(new Range(7, 2, 7, 2 + 7), '<!---->'),
+						new Tab(new Range(7, 9, 7, 10)),
+						new NewLine(new Range(7, 10, 7, 11)),
+						// `5th`
+						new Word(new Range(8, 1, 8, 6), 'haalo'),
+						new Tab(new Range(8, 6, 8, 7)),
+						new MarkdownComment(new Range(8, 7, 8, 7 + 40), '<!-- [link label](/some/path/to/file.md)'),
+					],
+				);
+			});
+		});
+
+
+		test('not valid comments', async () => {
 			const test = testDisposables.add(
 				new TestMarkdownDecoder(),
 			);
 
 			const inputData = [
-				// markdown comment with text inside it
-				'\t<!-- hello world -->',
-				// markdown comment with a link inside
-				'some text<!-- \v[link label](/some/path/to/file.md)\f --> and more text ',
-				// markdown comment new lines inside it
-				'<!-- comment\r\ntext\n\ngoes here --> usual text follows',
-				// markdown comment that was not closed properly
-				'haalo\t<!-- [link label](/some/path/to/file.md)',
+				'\t<! -- mondo --> ',
+				' < !-- світ -->\t',
+				'\v<!- - terra -->\f',
+				'<!--mundo - -> ',
 			];
 
 			await test.run(
@@ -382,34 +444,53 @@ suite('MarkdownDecoder', () => {
 				[
 					// `1st`
 					new Tab(new Range(1, 1, 1, 2)),
-					new MarkdownComment(new Range(1, 2, 1, 2 + 20), '<!-- hello world -->'),
-					new NewLine(new Range(1, 22, 1, 23)),
+					new LeftAngleBracket(new Range(1, 2, 1, 3)),
+					new ExclamationMark(new Range(1, 3, 1, 4)),
+					new Space(new Range(1, 4, 1, 5)),
+					new Dash(new Range(1, 5, 1, 6)),
+					new Dash(new Range(1, 6, 1, 7)),
+					new Space(new Range(1, 7, 1, 8)),
+					new Word(new Range(1, 8, 1, 8 + 5), 'mondo'),
+					new Space(new Range(1, 13, 1, 14)),
+					new Dash(new Range(1, 14, 1, 15)),
+					new Dash(new Range(1, 15, 1, 16)),
+					new RightAngleBracket(new Range(1, 16, 1, 17)),
+					new Space(new Range(1, 17, 1, 18)),
+					new NewLine(new Range(1, 18, 1, 19)),
 					// `2nd`
-					new Word(new Range(2, 1, 2, 5), 'some'),
-					new Space(new Range(2, 5, 2, 6)),
-					new Word(new Range(2, 6, 2, 10), 'text'),
-					new MarkdownComment(new Range(2, 10, 2, 10 + 46), '<!-- \v[link label](/some/path/to/file.md)\f -->'),
-					new Space(new Range(2, 56, 2, 57)),
-					new Word(new Range(2, 57, 2, 60), 'and'),
-					new Space(new Range(2, 60, 2, 61)),
-					new Word(new Range(2, 61, 2, 65), 'more'),
-					new Space(new Range(2, 65, 2, 66)),
-					new Word(new Range(2, 66, 2, 70), 'text'),
-					new Space(new Range(2, 70, 2, 71)),
-					new NewLine(new Range(2, 71, 2, 72)),
+					new Space(new Range(2, 1, 2, 2)),
+					new LeftAngleBracket(new Range(2, 2, 2, 3)),
+					new Space(new Range(2, 3, 2, 4)),
+					new ExclamationMark(new Range(2, 4, 2, 5)),
+					new Dash(new Range(2, 5, 2, 6)),
+					new Dash(new Range(2, 6, 2, 7)),
+					new Space(new Range(2, 7, 2, 8)),
+					new Word(new Range(2, 8, 2, 8 + 4), 'світ'),
+					new Space(new Range(2, 12, 2, 13)),
+					new Dash(new Range(2, 13, 2, 14)),
+					new Dash(new Range(2, 14, 2, 15)),
+					new RightAngleBracket(new Range(2, 15, 2, 16)),
+					new Tab(new Range(2, 16, 2, 17)),
+					new NewLine(new Range(2, 17, 2, 18)),
 					// `3rd`
-					new MarkdownComment(new Range(3, 1, 3 + 3, 1 + 13), '<!-- comment\r\ntext\n\ngoes here -->'),
-					new Space(new Range(6, 14, 6, 15)),
-					new Word(new Range(6, 15, 6, 15 + 5), 'usual'),
-					new Space(new Range(6, 20, 6, 21)),
-					new Word(new Range(6, 21, 6, 21 + 4), 'text'),
-					new Space(new Range(6, 25, 6, 26)),
-					new Word(new Range(6, 26, 6, 26 + 7), 'follows'),
-					new NewLine(new Range(6, 33, 6, 34)),
+					new VerticalTab(new Range(3, 1, 3, 2)),
+					new LeftAngleBracket(new Range(3, 2, 3, 3)),
+					new ExclamationMark(new Range(3, 3, 3, 4)),
+					new Dash(new Range(3, 4, 3, 5)),
+					new Space(new Range(3, 5, 3, 6)),
+					new Dash(new Range(3, 6, 3, 7)),
+					new Space(new Range(3, 7, 3, 8)),
+					new Word(new Range(3, 8, 3, 8 + 5), 'terra'),
+					new Space(new Range(3, 13, 3, 14)),
+					new Dash(new Range(3, 14, 3, 15)),
+					new Dash(new Range(3, 15, 3, 16)),
+					new RightAngleBracket(new Range(3, 16, 3, 17)),
+					new FormFeed(new Range(3, 17, 3, 18)),
+					new NewLine(new Range(3, 18, 3, 19)),
 					// `4rd`
-					new Word(new Range(7, 1, 7, 6), 'haalo'),
-					new Tab(new Range(7, 6, 7, 7)),
-					new MarkdownComment(new Range(7, 7, 7, 7 + 40), '<!-- [link label](/some/path/to/file.md)'),
+					// note! it does not have correct closing `-->`, hence the comment extends
+					//       to the end of the text, and therefore includes the `space` at the end
+					new MarkdownComment(new Range(4, 1, 4, 1 + 15), '<!--mundo - -> '),
 				],
 			);
 		});

From a3fe4ce607efd493157ecfe65f0c5f3167c10ffa Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Wed, 26 Feb 2025 14:51:01 -0800
Subject: [PATCH 0853/1815] finish unit test for invalid markdown comments
 parsing

---
 .../common/codecs/markdownDecoder.test.ts     | 63 ++++++++++++++++---
 .../editor/test/common/utils/testDecoder.ts   | 22 +++++--
 2 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
index 7cb8bfd93026..3c3d8f4e0e25 100644
--- a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
+++ b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
@@ -10,20 +10,20 @@ import { VSBuffer } from '../../../../base/common/buffer.js';
 import { newWriteableStream } from '../../../../base/common/stream.js';
 import { Tab } from '../../../common/codecs/simpleCodec/tokens/tab.js';
 import { Word } from '../../../common/codecs/simpleCodec/tokens/word.js';
+import { Dash } from '../../../common/codecs/simpleCodec/tokens/dash.js';
 import { Space } from '../../../common/codecs/simpleCodec/tokens/space.js';
 import { NewLine } from '../../../common/codecs/linesCodec/tokens/newLine.js';
 import { FormFeed } from '../../../common/codecs/simpleCodec/tokens/formFeed.js';
 import { VerticalTab } from '../../../common/codecs/simpleCodec/tokens/verticalTab.js';
 import { MarkdownLink } from '../../../common/codecs/markdownCodec/tokens/markdownLink.js';
 import { CarriageReturn } from '../../../common/codecs/linesCodec/tokens/carriageReturn.js';
+import { ExclamationMark } from '../../../common/codecs/simpleCodec/tokens/exclamationMark.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { MarkdownComment } from '../../../common/codecs/markdownCodec/tokens/markdownComment.js';
 import { LeftBracket, RightBracket } from '../../../common/codecs/simpleCodec/tokens/brackets.js';
 import { MarkdownDecoder, TMarkdownToken } from '../../../common/codecs/markdownCodec/markdownDecoder.js';
 import { LeftParenthesis, RightParenthesis } from '../../../common/codecs/simpleCodec/tokens/parentheses.js';
-import { MarkdownComment } from '../../../common/codecs/markdownCodec/tokens/markdownComment.js';
 import { LeftAngleBracket, RightAngleBracket } from '../../../common/codecs/simpleCodec/tokens/angleBrackets.js';
-import { ExclamationMark } from '../../../common/codecs/simpleCodec/tokens/exclamationMark.js';
-import { Dash } from '../../../common/codecs/simpleCodec/tokens/dash.js';
 
 /**
  * A reusable test utility that asserts that a `TestMarkdownDecoder` instance
@@ -371,15 +371,15 @@ suite('MarkdownDecoder', () => {
 				);
 
 				const inputData = [
-					// markdown comment with text inside it
+					// comment with text inside it
 					'\t<!-- hello world -->',
-					// markdown comment with a link inside
+					// comment with a link inside
 					'some text<!-- \v[link label](/some/path/to/file.md)\f --> and more text ',
-					// markdown comment new lines inside it
+					// comment new lines inside it
 					'<!-- comment\r\ntext\n\ngoes here --> usual text follows',
 					// an empty comment
 					'\t<!---->\t',
-					// markdown comment that was not closed properly
+					// comment that was not closed properly
 					'haalo\t<!-- [link label](/some/path/to/file.md)',
 				];
 
@@ -424,6 +424,53 @@ suite('MarkdownDecoder', () => {
 					],
 				);
 			});
+
+			test('nuanced cases', async () => {
+				const test = testDisposables.add(
+					new TestMarkdownDecoder(),
+				);
+
+				const inputData = [
+					// comment inside `<>` brackets
+					' \f <<!--commen\t-->>',
+					// comment contains `<[]>` brackets and `!`
+					'<!--<[!c⚽︎mment!]>-->\t\t',
+					// comment contains `<!--` and new lines
+					'\v<!--some\r\ntext\n\t<!--inner\r\ntext-->\t\t',
+					// comment contains `<!--` and never closed properly
+					' <!--<!--inner\r\ntext-- >\t\v\f ',
+				];
+
+				await test.run(
+					inputData,
+					[
+						// `1st`
+						new Space(new Range(1, 1, 1, 2)),
+						new FormFeed(new Range(1, 2, 1, 3)),
+						new Space(new Range(1, 3, 1, 4)),
+						new LeftAngleBracket(new Range(1, 4, 1, 5)),
+						new MarkdownComment(new Range(1, 5, 1, 5 + 14), '<!--commen\t-->'),
+						new RightAngleBracket(new Range(1, 19, 1, 20)),
+						new NewLine(new Range(1, 20, 1, 21)),
+						// `2nd`
+						new MarkdownComment(new Range(2, 1, 2, 1 + 21), '<!--<[!c⚽︎mment!]>-->'),
+						new Tab(new Range(2, 22, 2, 23)),
+						new Tab(new Range(2, 23, 2, 24)),
+						new NewLine(new Range(2, 24, 2, 25)),
+						// `3rd`
+						new VerticalTab(new Range(3, 1, 3, 2)),
+						new MarkdownComment(new Range(3, 2, 3 + 3, 1 + 7), '<!--some\r\ntext\n\t<!--inner\r\ntext-->'),
+						new Tab(new Range(6, 8, 6, 9)),
+						new Tab(new Range(6, 9, 6, 10)),
+						new NewLine(new Range(6, 10, 6, 11)),
+						// `4rd`
+						new Space(new Range(7, 1, 7, 2)),
+						// note! comment does not have correct closing `-->`, hence the comment extends
+						//       to the end of the text, and therefore includes the \t\v\f and space at the end
+						new MarkdownComment(new Range(7, 2, 8, 1 + 12), '<!--<!--inner\r\ntext-- >\t\v\f '),
+					],
+				);
+			});
 		});
 
 
@@ -488,7 +535,7 @@ suite('MarkdownDecoder', () => {
 					new FormFeed(new Range(3, 17, 3, 18)),
 					new NewLine(new Range(3, 18, 3, 19)),
 					// `4rd`
-					// note! it does not have correct closing `-->`, hence the comment extends
+					// note! comment does not have correct closing `-->`, hence the comment extends
 					//       to the end of the text, and therefore includes the `space` at the end
 					new MarkdownComment(new Range(4, 1, 4, 1 + 15), '<!--mundo - -> '),
 				],
diff --git a/src/vs/editor/test/common/utils/testDecoder.ts b/src/vs/editor/test/common/utils/testDecoder.ts
index 4f29a2f18145..e0127aacdc00 100644
--- a/src/vs/editor/test/common/utils/testDecoder.ts
+++ b/src/vs/editor/test/common/utils/testDecoder.ts
@@ -213,10 +213,24 @@ export class TestDecoder<T extends BaseToken, D extends BaseDecoder<T>> extends
 			);
 		}
 
-		assert.strictEqual(
-			receivedTokens.length,
-			expectedTokens.length,
-			'Must produce correct number of tokens.',
+		if (receivedTokens.length === expectedTokens.length) {
+			return;
+		}
+
+		// sanity check - if received/expected list lengths are not equal, the received
+		// list must be longer than the expected one, because the other way around case
+		// must have been caught by the comparison loop above
+		assert(
+			receivedTokens.length > expectedTokens.length,
+			'Must have received more tokens than expected.',
+		);
+
+		const index = expectedTokens.length;
+		throw new Error(
+			[
+				`Expected no '${index}' token present, got '${receivedTokens[index]}'.`,
+				`(received ${receivedTokens.length} tokens in total)`,
+			].join(' '),
 		);
 	}
 }

From a1bbb37b0b97c815ac631e634696ed70d6a5455e Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Wed, 26 Feb 2025 14:56:55 -0800
Subject: [PATCH 0854/1815] improve output formatting of unit tests

---
 .../markdownCodec/parsers/markdownComment.ts  |  1 -
 .../common/codecs/simpleCodec/parserBase.ts   |  1 -
 .../common/codecs/markdownDecoder.test.ts     | 30 +++++++++----------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts
index f415ae25cca9..10b66e43c60c 100644
--- a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts
+++ b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts
@@ -197,7 +197,6 @@ export class MarkdownCommentStart extends ParserBase<TSimpleToken, MarkdownComme
  * );
  * ```
  */
-// TODO: @legomushroom - move to common utils?
 const pick = <TObject, TKeyName extends keyof TObject>(
 	key: TKeyName,
 ) => {
diff --git a/src/vs/editor/common/codecs/simpleCodec/parserBase.ts b/src/vs/editor/common/codecs/simpleCodec/parserBase.ts
index 18b800db5548..807beda411ae 100644
--- a/src/vs/editor/common/codecs/simpleCodec/parserBase.ts
+++ b/src/vs/editor/common/codecs/simpleCodec/parserBase.ts
@@ -97,7 +97,6 @@ export abstract class ParserBase<TToken extends BaseToken, TNextObject> {
  *
  * @throws the resulting decorated method throws if the parser object was already consumed.
  */
-// TODO: @legomushroom - use in all parsers
 export function assertNotConsumed<T extends ParserBase<any, any>>(
 	_target: T,
 	propertyKey: 'accept',
diff --git a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
index 3c3d8f4e0e25..92cfbee83975 100644
--- a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
+++ b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
@@ -59,8 +59,8 @@ export class TestMarkdownDecoder extends TestDecoder<TMarkdownToken, MarkdownDec
 suite('MarkdownDecoder', () => {
 	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
 
-	suite('general', () => {
-		test('produces expected tokens', async () => {
+	suite('• general', () => {
+		test('• base cases', async () => {
 			const test = testDisposables.add(
 				new TestMarkdownDecoder(),
 			);
@@ -125,7 +125,7 @@ suite('MarkdownDecoder', () => {
 			);
 		});
 
-		test('handles complex cases', async () => {
+		test('• nuanced', async () => {
 			const test = testDisposables.add(
 				new TestMarkdownDecoder(),
 			);
@@ -172,9 +172,9 @@ suite('MarkdownDecoder', () => {
 		});
 	});
 
-	suite('links', () => {
-		suite('broken links', () => {
-			test('incomplete/invalid links', async () => {
+	suite('• links', () => {
+		suite('• broken', () => {
+			test('• invalid', async () => {
 				const test = testDisposables.add(
 					new TestMarkdownDecoder(),
 				);
@@ -214,7 +214,7 @@ suite('MarkdownDecoder', () => {
 				);
 			});
 
-			suite('stop characters inside caption/reference (new lines)', () => {
+			suite('• stop characters inside caption/reference (new lines)', () => {
 				for (const stopCharacter of [CarriageReturn, NewLine]) {
 					let characterName = '';
 
@@ -230,7 +230,7 @@ suite('MarkdownDecoder', () => {
 						'The "characterName" must be set, got "empty line".',
 					);
 
-					test(`stop character - "${characterName}"`, async () => {
+					test(`• stop character - "${characterName}"`, async () => {
 						const test = testDisposables.add(
 							new TestMarkdownDecoder(),
 						);
@@ -289,7 +289,7 @@ suite('MarkdownDecoder', () => {
 			/**
 			 * Same as above but these stop characters do not move the caret to the next line.
 			 */
-			suite('stop characters inside caption/reference (same line)', () => {
+			suite('• stop characters inside caption/reference (same line)', () => {
 				for (const stopCharacter of [VerticalTab, FormFeed]) {
 					let characterName = '';
 
@@ -305,7 +305,7 @@ suite('MarkdownDecoder', () => {
 						'The "characterName" must be set, got "empty line".',
 					);
 
-					test(`stop character - "${characterName}"`, async () => {
+					test(`• stop character - "${characterName}"`, async () => {
 						const test = testDisposables.add(
 							new TestMarkdownDecoder(),
 						);
@@ -363,9 +363,9 @@ suite('MarkdownDecoder', () => {
 		});
 	});
 
-	suite('comments', () => {
-		suite('general', () => {
-			test('base cases', async () => {
+	suite('• comments', () => {
+		suite('• general', () => {
+			test('• base cases', async () => {
 				const test = testDisposables.add(
 					new TestMarkdownDecoder(),
 				);
@@ -425,7 +425,7 @@ suite('MarkdownDecoder', () => {
 				);
 			});
 
-			test('nuanced cases', async () => {
+			test('• nuanced', async () => {
 				const test = testDisposables.add(
 					new TestMarkdownDecoder(),
 				);
@@ -474,7 +474,7 @@ suite('MarkdownDecoder', () => {
 		});
 
 
-		test('not valid comments', async () => {
+		test('• invalid', async () => {
 			const test = testDisposables.add(
 				new TestMarkdownDecoder(),
 			);

From f3245eb1a2045fe732579170958dce12f290522e Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 12 Mar 2025 12:35:40 -0700
Subject: [PATCH 0855/1815] Fix agentMode context key

---
 src/vs/workbench/contrib/chat/browser/chatInputPart.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index d7d78d1cfb4c..1aee4bd741fc 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -289,6 +289,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	private inputEditorHasText: IContextKey<boolean>;
 	private chatCursorAtTop: IContextKey<boolean>;
 	private inputEditorHasFocus: IContextKey<boolean>;
+	private agentMode: IContextKey<boolean>;
 	/**
 	 * Context key is set when prompt instructions are attached.
 	 */
@@ -392,6 +393,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		this.chatCursorAtTop = ChatContextKeys.inputCursorAtTop.bindTo(contextKeyService);
 		this.inputEditorHasFocus = ChatContextKeys.inputHasFocus.bindTo(contextKeyService);
 		this.promptInstructionsAttached = ChatContextKeys.instructionsAttached.bindTo(contextKeyService);
+		this.agentMode = ChatContextKeys.Editing.agentMode.bindTo(contextKeyService);
 
 		this.history = this.loadHistory();
 		this._register(this.historyService.onDidClearHistory(() => this.history = new HistoryNavigator2([{ text: '' }], ChatInputHistoryMaxEntries, historyKeyFn)));
@@ -471,6 +473,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	setChatMode(mode: ChatMode): void {
 		this._currentMode = mode;
 		this._onDidChangeCurrentChatMode.fire();
+		this.agentMode.set(this._currentMode === ChatMode.Agent);
 	}
 
 	private modelSupportedForDefaultAgent(model: ILanguageModelChatMetadataAndIdentifier): boolean {
@@ -557,9 +560,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}
 
 		if (state.inputState?.chatMode) {
-			this._currentMode = state.inputState.chatMode;
+			this.setChatMode(state.inputState.chatMode);
 		} else if (this.location === ChatAgentLocation.EditingSession) {
-			this._currentMode = ChatMode.Edit;
+			this.setChatMode(ChatMode.Edit);
 		}
 	}
 

From 424ce85a4771b8c2faf6f7d4e4f60abf266751c4 Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Wed, 12 Mar 2025 12:37:43 -0700
Subject: [PATCH 0856/1815] deleted cell diff navigation (#243380)

* deleted cell navigation

* handle only deleted cells

---------

Co-authored-by: amunger <>
---
 .../notebook/chatEditingNotebookEditorIntegration.ts | 12 +++++-------
 .../diff/inlineDiff/notebookDeletedCellDecorator.ts  |  6 +++++-
 .../notebook/browser/view/notebookCellList.ts        |  3 ++-
 3 files changed, 12 insertions(+), 9 deletions(-)

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 7a3abd9ae007..f594e30b84a4 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
@@ -85,8 +85,6 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 	private readonly _currentIndex = observableValue(this, -1);
 	readonly currentIndex: IObservable<number> = this._currentIndex;
 
-	// TODO@amunger For now we're going to ignore being able to focus on a deleted cell.
-
 	private readonly _currentChange = observableValue<{ change: ICellDiffInfo; index: number } | undefined>(this, undefined);
 	readonly currentChange: IObservable<{ change: ICellDiffInfo; index: number } | undefined> = this._currentChange;
 
@@ -132,13 +130,13 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 			}
 		}));
 
-		// INIT current index when: enabled, not streaming anymore, once per request, and when having changes
+		// INIT when not streaming anymore, once per request, and when having changes
 		let lastModifyingRequestId: string | undefined;
 		this._store.add(autorun(r => {
 
 			if (!_entry.isCurrentlyBeingModifiedBy.read(r)
 				&& lastModifyingRequestId !== _entry.lastModifyingRequestId
-				&& cellChanges.read(r).some(c => c.type !== 'unchanged' && c.type !== 'delete' && !c.diff.read(r).identical)
+				&& cellChanges.read(r).some(c => c.type !== 'unchanged' && !c.diff.read(r).identical)
 			) {
 				lastModifyingRequestId = _entry.lastModifyingRequestId;
 
@@ -228,10 +226,10 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 			const currentChange = this.currentChange.read(r);
 			if (currentChange) {
 				const indexInChange = currentChange.index;
-				const modifiedCellIndex = currentChange.change.modifiedCellIndex;
+				const cellIndex = currentChange.change.modifiedCellIndex ?? currentChange.change.originalCellIndex;
 
-				const changesBeforeCell = modifiedCellIndex !== undefined && modifiedCellIndex > 0 ?
-					this.diffIndexPrefixSum.getPrefixSum(modifiedCellIndex - 1) : 0;
+				const changesBeforeCell = cellIndex !== undefined && cellIndex > 0 ?
+					this.diffIndexPrefixSum.getPrefixSum(cellIndex - 1) : 0;
 
 				this._currentIndex.set(changesBeforeCell + indexInChange, undefined);
 			} else {
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 2d9733f68ec2..b75579cab137 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator.ts
@@ -46,6 +46,10 @@ export class NotebookDeletedCellDecorator extends Disposable implements INoteboo
 		if (!info) {
 			return;
 		}
+		if (info.previousIndex === -1) {
+			// deleted cell is before the first real cell
+			return 0;
+		}
 		const cells = this._notebookEditor.getCellsInRange({ start: info.previousIndex, end: info.previousIndex + 1 });
 		if (!cells.length) {
 			return this._notebookEditor.getLayoutInfo().height + info.offset;
@@ -65,7 +69,7 @@ export class NotebookDeletedCellDecorator extends Disposable implements INoteboo
 			const info = this.deletedCellInfos.get(deletedIndex);
 
 			if (info) {
-				const prevIndex = info.previousIndex;
+				const prevIndex = info.previousIndex === -1 ? 0 : info.previousIndex;
 				this._notebookEditor.setFocus({ start: prevIndex, end: prevIndex });
 				this._notebookEditor.setSelections([{ start: prevIndex, end: prevIndex }]);
 			}
diff --git a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
index 652327a9acd7..eea24dd3d151 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
@@ -1168,7 +1168,8 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 		const wrapperBottom = this.getViewScrollBottom();
 
 		if (offset < scrollTop || offset > wrapperBottom) {
-			this.view.setScrollTop(offset - this.view.renderHeight / 2);
+			const newTop = Math.max(0, offset - this.view.renderHeight / 2);
+			this.view.setScrollTop(newTop);
 		}
 	}
 

From 8caab471dfd36f18f3a9f057df1e0a533f51e28e Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Fri, 28 Feb 2025 15:54:23 -0800
Subject: [PATCH 0857/1815] * II of `markdown image`

---
 .../codecs/markdownCodec/markdownDecoder.ts   |  17 ++-
 .../markdownCodec/parsers/markdownImage.ts    |  99 ++++++++++++
 .../markdownCodec/tokens/markdownImage.ts     | 141 ++++++++++++++++++
 .../markdownCodec/tokens/markdownLink.ts      |   8 +-
 4 files changed, 259 insertions(+), 6 deletions(-)
 create mode 100644 src/vs/editor/common/codecs/markdownCodec/parsers/markdownImage.ts
 create mode 100644 src/vs/editor/common/codecs/markdownCodec/tokens/markdownImage.ts

diff --git a/src/vs/editor/common/codecs/markdownCodec/markdownDecoder.ts b/src/vs/editor/common/codecs/markdownCodec/markdownDecoder.ts
index 61fc3c6e3016..9da1394cf82e 100644
--- a/src/vs/editor/common/codecs/markdownCodec/markdownDecoder.ts
+++ b/src/vs/editor/common/codecs/markdownCodec/markdownDecoder.ts
@@ -12,6 +12,8 @@ import { BaseDecoder } from '../../../../base/common/codecs/baseDecoder.js';
 import { SimpleDecoder, TSimpleToken } from '../simpleCodec/simpleDecoder.js';
 import { MarkdownCommentStart, PartialMarkdownCommentStart } from './parsers/markdownComment.js';
 import { MarkdownLinkCaption, PartialMarkdownLink, PartialMarkdownLinkCaption } from './parsers/markdownLink.js';
+import { ExclamationMark } from '../simpleCodec/tokens/exclamationMark.js';
+import { PartialMarkdownImage } from './parsers/markdownImage.js';
 
 /**
  * Tokens handled by this decoder.
@@ -28,7 +30,8 @@ export class MarkdownDecoder extends BaseDecoder<TMarkdownToken, TSimpleToken> {
 	 */
 	private current?:
 		PartialMarkdownLinkCaption | MarkdownLinkCaption | PartialMarkdownLink |
-		PartialMarkdownCommentStart | MarkdownCommentStart;
+		PartialMarkdownCommentStart | MarkdownCommentStart |
+		PartialMarkdownImage;
 
 	constructor(
 		stream: ReadableStream<VSBuffer>,
@@ -37,7 +40,7 @@ export class MarkdownDecoder extends BaseDecoder<TMarkdownToken, TSimpleToken> {
 	}
 
 	protected override onStreamData(token: TSimpleToken): void {
-		// markdown links start with `[` character, so here we can
+		// `markdown links` start with `[` character, so here we can
 		// initiate the process of parsing a markdown link
 		if (token instanceof LeftBracket && !this.current) {
 			this.current = new PartialMarkdownLinkCaption(token);
@@ -45,12 +48,22 @@ export class MarkdownDecoder extends BaseDecoder<TMarkdownToken, TSimpleToken> {
 			return;
 		}
 
+		// `markdown comments` start with `<` character, so here we can
+		// initiate the process of parsing a markdown comment
 		if (token instanceof LeftAngleBracket && !this.current) {
 			this.current = new PartialMarkdownCommentStart(token);
 
 			return;
 		}
 
+		// `markdown image links` start with `!` character, so here we can
+		// initiate the process of parsing a markdown image
+		if (token instanceof ExclamationMark && !this.current) {
+			this.current = new PartialMarkdownImage(token);
+
+			return;
+		}
+
 		// if current parser was not initiated before, - we are not inside a sequence
 		// of tokens we care about, therefore re-emit the token immediately and continue
 		if (!this.current) {
diff --git a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownImage.ts b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownImage.ts
new file mode 100644
index 000000000000..460f9b239326
--- /dev/null
+++ b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownImage.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 { MarkdownLink } from '../tokens/markdownLink.js';
+import { MarkdownImage } from '../tokens/markdownImage.js';
+import { TSimpleToken } from '../../simpleCodec/simpleDecoder.js';
+import { LeftBracket } from '../../simpleCodec/tokens/brackets.js';
+import { ExclamationMark } from '../../simpleCodec/tokens/exclamationMark.js';
+import { assertNotConsumed, ParserBase, TAcceptTokenResult } from '../../simpleCodec/parserBase.js';
+import { MarkdownLinkCaption, PartialMarkdownLink, PartialMarkdownLinkCaption } from './markdownLink.js';
+
+/**
+ * The parser responsible for parsing the `<!--` sequence - the start of a `markdown comment`.
+ * TODO: @lego - update the docs
+ */
+export class PartialMarkdownImage extends ParserBase<TSimpleToken, PartialMarkdownImage | MarkdownImage> {
+	/**
+	 * TODO: @lego
+	 */
+	private markdownLinkParser: PartialMarkdownLinkCaption | MarkdownLinkCaption | PartialMarkdownLink | undefined;
+
+	constructor(token: ExclamationMark) {
+		super([token]);
+	}
+
+	/**
+	 * TODO: @lego - implement
+	 */
+	public override get tokens(): readonly TSimpleToken[] {
+		const linkTokens = this.markdownLinkParser?.tokens ?? [];
+
+		return [
+			...this.currentTokens,
+			...linkTokens,
+		];
+	}
+
+	@assertNotConsumed
+	public accept(token: TSimpleToken): TAcceptTokenResult<PartialMarkdownImage | MarkdownImage> {
+		// on the first call we expect a character that begins `markdown link` sequence
+		// hence we initiate the markdown link parsing process, otherwise we fail
+		if (!this.markdownLinkParser) {
+			if (token instanceof LeftBracket) {
+				this.markdownLinkParser = new PartialMarkdownLinkCaption(token);
+
+				return {
+					result: 'success',
+					nextParser: this,
+					wasTokenConsumed: true,
+				};
+			}
+
+			return {
+				result: 'failure',
+				wasTokenConsumed: false,
+			};
+		}
+
+		// handle subsequent tokens next
+
+		const acceptResult = this.markdownLinkParser.accept(token);
+		const { result, wasTokenConsumed } = acceptResult;
+
+		if (result === 'success') {
+			const { nextParser } = acceptResult;
+
+			// if full markdown link was parsed out, the process completes
+			if (nextParser instanceof MarkdownLink) {
+				this.isConsumed = true;
+
+				const firstToken = this.currentTokens[0];
+				return {
+					result,
+					wasTokenConsumed,
+					nextParser: new MarkdownImage(
+						firstToken.range.startLineNumber,
+						firstToken.range.startColumn,
+						`${firstToken.text}${nextParser.caption}`,
+						nextParser.reference,
+					),
+				};
+			}
+
+			// otherwise save new link parser reference and continue
+			this.markdownLinkParser = nextParser;
+			return {
+				result,
+				wasTokenConsumed,
+				nextParser: this,
+			};
+		}
+
+		// return the failure result
+		this.isConsumed = true;
+		return acceptResult;
+	}
+}
diff --git a/src/vs/editor/common/codecs/markdownCodec/tokens/markdownImage.ts b/src/vs/editor/common/codecs/markdownCodec/tokens/markdownImage.ts
new file mode 100644
index 000000000000..75e42e31aaf0
--- /dev/null
+++ b/src/vs/editor/common/codecs/markdownCodec/tokens/markdownImage.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 { BaseToken } from '../../baseToken.js';
+import { MarkdownToken } from './markdownToken.js';
+import { IRange, Range } from '../../../core/range.js';
+import { assert } from '../../../../../base/common/assert.js';
+
+/**
+ * A token that represent a `markdown image` with a `range`. The `range`
+ * value reflects the position of the token in the original data.
+ */
+export class MarkdownImage extends MarkdownToken {
+	/**
+	 * Check if this `markdown image link` points to a valid URL address.
+	 */
+	public readonly isURL: boolean;
+
+	constructor(
+		/**
+		 * The starting line number of the image (1-based indexing).
+		 */
+		lineNumber: number,
+		/**
+		 * The starting column number of the image (1-based indexing).
+		 */
+		columnNumber: number,
+		/**
+		 * The caption of the image, including the `!` and `square brackets`.
+		 */
+		private readonly caption: string,
+		/**
+		 * The reference of the image, including the parentheses.
+		 */
+		private readonly reference: string,
+	) {
+		assert(
+			!isNaN(lineNumber),
+			`The line number must not be a NaN.`,
+		);
+
+		assert(
+			lineNumber > 0,
+			`The line number must be >= 1, got "${lineNumber}".`,
+		);
+
+		assert(
+			columnNumber > 0,
+			`The column number must be >= 1, got "${columnNumber}".`,
+		);
+
+		assert(
+			caption[0] === '!',
+			`The caption must start with '!' character, got "${caption}".`,
+		);
+
+		assert(
+			caption[1] === '[' && caption[caption.length - 1] === ']',
+			`The caption must be enclosed in square brackets, got "${caption}".`,
+		);
+
+		assert(
+			reference[0] === '(' && reference[reference.length - 1] === ')',
+			`The reference must be enclosed in parentheses, got "${reference}".`,
+		);
+
+		super(
+			new Range(
+				lineNumber,
+				columnNumber,
+				lineNumber,
+				columnNumber + caption.length + reference.length,
+			),
+		);
+
+		// set up the `isURL` flag based on the current
+		try {
+			new URL(this.path);
+			this.isURL = true;
+		} catch {
+			this.isURL = false;
+		}
+	}
+
+	public override get text(): string {
+		return `${this.caption}${this.reference}`;
+	}
+
+	/**
+	 * Returns the `reference` part of the link without enclosing parentheses.
+	 */
+	public get path(): string {
+		return this.reference.slice(1, this.reference.length - 1);
+	}
+
+	/**
+	 * Check if this token is equal to another one.
+	 */
+	public override equals<T extends BaseToken>(other: T): boolean {
+		if (!super.sameRange(other.range)) {
+			return false;
+		}
+
+		if (!(other instanceof MarkdownImage)) {
+			return false;
+		}
+
+		return this.text === other.text;
+	}
+
+	/**
+	 * Get the range of the `link part` of the token.
+	 */
+	public get linkRange(): IRange | undefined {
+		if (this.path.length === 0) {
+			return undefined;
+		}
+
+		const { range } = this;
+
+		// note! '+1' for openning `(` of the link
+		const startColumn = range.startColumn + this.caption.length + 1;
+		const endColumn = startColumn + this.path.length;
+
+		return new Range(
+			range.startLineNumber,
+			startColumn,
+			range.endLineNumber,
+			endColumn,
+		);
+	}
+
+	/**
+	 * Returns a string representation of the token.
+	 */
+	public override toString(): string {
+		return `md-image("${this.text}")${this.range}`;
+	}
+}
diff --git a/src/vs/editor/common/codecs/markdownCodec/tokens/markdownLink.ts b/src/vs/editor/common/codecs/markdownCodec/tokens/markdownLink.ts
index b4c8947a2131..a4b157187172 100644
--- a/src/vs/editor/common/codecs/markdownCodec/tokens/markdownLink.ts
+++ b/src/vs/editor/common/codecs/markdownCodec/tokens/markdownLink.ts
@@ -28,13 +28,13 @@ export class MarkdownLink extends MarkdownToken {
 		 */
 		columnNumber: number,
 		/**
-		 * The caption of the link, including the square brackets.
+		 * The caption of the original link, including the square brackets.
 		 */
-		private readonly caption: string,
+		public readonly caption: string,
 		/**
-		 * The reference of the link, including the parentheses.
+		 * The reference of the original link, including the parentheses.
 		 */
-		private readonly reference: string,
+		public readonly reference: string,
 	) {
 		assert(
 			!isNaN(lineNumber),

From 5d52ecfa0884292c3a81572a60c36ddb12fa6849 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Fri, 28 Feb 2025 16:05:25 -0800
Subject: [PATCH 0858/1815] add basic unit tests for the new `markdown image`
 token

---
 .../common/codecs/markdownDecoder.test.ts     | 283 +++++++++++++++++-
 1 file changed, 282 insertions(+), 1 deletion(-)

diff --git a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
index 92cfbee83975..f51d64934f39 100644
--- a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
+++ b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
@@ -24,6 +24,7 @@ import { LeftBracket, RightBracket } from '../../../common/codecs/simpleCodec/to
 import { MarkdownDecoder, TMarkdownToken } from '../../../common/codecs/markdownCodec/markdownDecoder.js';
 import { LeftParenthesis, RightParenthesis } from '../../../common/codecs/simpleCodec/tokens/parentheses.js';
 import { LeftAngleBracket, RightAngleBracket } from '../../../common/codecs/simpleCodec/tokens/angleBrackets.js';
+import { MarkdownImage } from '../../../common/codecs/markdownCodec/tokens/markdownImage.js';
 
 /**
  * A reusable test utility that asserts that a `TestMarkdownDecoder` instance
@@ -363,6 +364,287 @@ suite('MarkdownDecoder', () => {
 		});
 	});
 
+
+	suite('• images', () => {
+		suite('• general', () => {
+			test('• base cases', async () => {
+				const test = testDisposables.add(
+					new TestMarkdownDecoder(),
+				);
+
+				const inputData = [
+					'\t![alt text](./some/path/to/file.jpg) ',
+					'plain text \f![label](./image.png)\v and more text',
+					// '<!-- comment\r\ntext\n\ngoes here --> usual text follows',
+					// '\t<!---->\t',
+					// 'haalo\t<!-- [link label](/some/path/to/file.md)',
+				];
+
+				await test.run(
+					inputData,
+					[
+						// `1st`
+						new Tab(new Range(1, 1, 1, 2)),
+						new MarkdownImage(1, 2, '![alt text]', '(./some/path/to/file.jpg)'),
+						new Space(new Range(1, 38, 1, 39)),
+						new NewLine(new Range(1, 39, 1, 40)),
+						// `2nd`
+						new Word(new Range(2, 1, 2, 6), 'plain'),
+						new Space(new Range(2, 6, 2, 7)),
+						new Word(new Range(2, 7, 2, 11), 'text'),
+						new Space(new Range(2, 11, 2, 12)),
+						new FormFeed(new Range(2, 12, 2, 13)),
+						new MarkdownImage(2, 13, '![label]', '(./image.png)'),
+						new VerticalTab(new Range(2, 34, 2, 35)),
+						new Space(new Range(2, 35, 2, 36)),
+						new Word(new Range(2, 36, 2, 39), 'and'),
+						new Space(new Range(2, 39, 2, 40)),
+						new Word(new Range(2, 40, 2, 44), 'more'),
+						new Space(new Range(2, 44, 2, 45)),
+						new Word(new Range(2, 45, 2, 49), 'text'),
+						// new NewLine(new Range(2, 49, 2, 50)),
+					],
+				);
+			});
+
+			// test('• nuanced', async () => {
+			// 	const test = testDisposables.add(
+			// 		new TestMarkdownDecoder(),
+			// 	);
+
+			// 	const inputData = [
+			// 		// comment inside `<>` brackets
+			// 		' \f <<!--commen\t-->>',
+			// 		// comment contains `<[]>` brackets and `!`
+			// 		'<!--<[!c⚽︎mment!]>-->\t\t',
+			// 		// comment contains `<!--` and new lines
+			// 		'\v<!--some\r\ntext\n\t<!--inner\r\ntext-->\t\t',
+			// 		// comment contains `<!--` and never closed properly
+			// 		' <!--<!--inner\r\ntext-- >\t\v\f ',
+			// 	];
+
+			// 	await test.run(
+			// 		inputData,
+			// 		[
+			// 			// `1st`
+			// 			new Space(new Range(1, 1, 1, 2)),
+			// 			new FormFeed(new Range(1, 2, 1, 3)),
+			// 			new Space(new Range(1, 3, 1, 4)),
+			// 			new LeftAngleBracket(new Range(1, 4, 1, 5)),
+			// 			new MarkdownComment(new Range(1, 5, 1, 5 + 14), '<!--commen\t-->'),
+			// 			new RightAngleBracket(new Range(1, 19, 1, 20)),
+			// 			new NewLine(new Range(1, 20, 1, 21)),
+			// 			// `2nd`
+			// 			new MarkdownComment(new Range(2, 1, 2, 1 + 21), '<!--<[!c⚽︎mment!]>-->'),
+			// 			new Tab(new Range(2, 22, 2, 23)),
+			// 			new Tab(new Range(2, 23, 2, 24)),
+			// 			new NewLine(new Range(2, 24, 2, 25)),
+			// 			// `3rd`
+			// 			new VerticalTab(new Range(3, 1, 3, 2)),
+			// 			new MarkdownComment(new Range(3, 2, 3 + 3, 1 + 7), '<!--some\r\ntext\n\t<!--inner\r\ntext-->'),
+			// 			new Tab(new Range(6, 8, 6, 9)),
+			// 			new Tab(new Range(6, 9, 6, 10)),
+			// 			new NewLine(new Range(6, 10, 6, 11)),
+			// 			// `4rd`
+			// 			new Space(new Range(7, 1, 7, 2)),
+			// 			// note! comment does not have correct closing `-->`, hence the comment extends
+			// 			//       to the end of the text, and therefore includes the \t\v\f and space at the end
+			// 			new MarkdownComment(new Range(7, 2, 8, 1 + 12), '<!--<!--inner\r\ntext-- >\t\v\f '),
+			// 		],
+			// 	);
+			// });
+		});
+
+		// suite('• broken', () => {
+		// 	test('• invalid', async () => {
+		// 		const test = testDisposables.add(
+		// 			new TestMarkdownDecoder(),
+		// 		);
+
+		// 		const inputLines = [
+		// 			// incomplete link reference with empty caption
+		// 			'[ ](./real/file path/file⇧name.md',
+		// 			// space between caption and reference is disallowed
+		// 			'[link text] (./file path/name.txt)',
+		// 		];
+
+		// 		await test.run(
+		// 			inputLines,
+		// 			[
+		// 				// `1st` line
+		// 				new LeftBracket(new Range(1, 1, 1, 2)),
+		// 				new Space(new Range(1, 2, 1, 3)),
+		// 				new RightBracket(new Range(1, 3, 1, 4)),
+		// 				new LeftParenthesis(new Range(1, 4, 1, 5)),
+		// 				new Word(new Range(1, 5, 1, 5 + 11), './real/file'),
+		// 				new Space(new Range(1, 16, 1, 17)),
+		// 				new Word(new Range(1, 17, 1, 17 + 17), 'path/file⇧name.md'),
+		// 				new NewLine(new Range(1, 34, 1, 35)),
+		// 				// `2nd` line
+		// 				new LeftBracket(new Range(2, 1, 2, 2)),
+		// 				new Word(new Range(2, 2, 2, 2 + 4), 'link'),
+		// 				new Space(new Range(2, 6, 2, 7)),
+		// 				new Word(new Range(2, 7, 2, 7 + 4), 'text'),
+		// 				new RightBracket(new Range(2, 11, 2, 12)),
+		// 				new Space(new Range(2, 12, 2, 13)),
+		// 				new LeftParenthesis(new Range(2, 13, 2, 14)),
+		// 				new Word(new Range(2, 14, 2, 14 + 6), './file'),
+		// 				new Space(new Range(2, 20, 2, 21)),
+		// 				new Word(new Range(2, 21, 2, 21 + 13), 'path/name.txt'),
+		// 				new RightParenthesis(new Range(2, 34, 2, 35)),
+		// 			],
+		// 		);
+		// 	});
+
+		// 	suite('• stop characters inside caption/reference (new lines)', () => {
+		// 		for (const stopCharacter of [CarriageReturn, NewLine]) {
+		// 			let characterName = '';
+
+		// 			if (stopCharacter === CarriageReturn) {
+		// 				characterName = '\\r';
+		// 			}
+		// 			if (stopCharacter === NewLine) {
+		// 				characterName = '\\n';
+		// 			}
+
+		// 			assert(
+		// 				characterName !== '',
+		// 				'The "characterName" must be set, got "empty line".',
+		// 			);
+
+		// 			test(`• stop character - "${characterName}"`, async () => {
+		// 				const test = testDisposables.add(
+		// 					new TestMarkdownDecoder(),
+		// 				);
+
+		// 				const inputLines = [
+		// 					// stop character inside link caption
+		// 					`[haa${stopCharacter.symbol}loů](./real/💁/name.txt)`,
+		// 					// stop character inside link reference
+		// 					`[ref text](/etc/pat${stopCharacter.symbol}h/to/file.md)`,
+		// 					// stop character between line caption and link reference is disallowed
+		// 					`[text]${stopCharacter.symbol}(/etc/ path/file.md)`,
+		// 				];
+
+
+		// 				await test.run(
+		// 					inputLines,
+		// 					[
+		// 						// `1st` input line
+		// 						new LeftBracket(new Range(1, 1, 1, 2)),
+		// 						new Word(new Range(1, 2, 1, 2 + 3), 'haa'),
+		// 						new stopCharacter(new Range(1, 5, 1, 6)), // <- stop character
+		// 						new Word(new Range(2, 1, 2, 1 + 3), 'loů'),
+		// 						new RightBracket(new Range(2, 4, 2, 5)),
+		// 						new LeftParenthesis(new Range(2, 5, 2, 6)),
+		// 						new Word(new Range(2, 6, 2, 6 + 18), './real/💁/name.txt'),
+		// 						new RightParenthesis(new Range(2, 24, 2, 25)),
+		// 						new NewLine(new Range(2, 25, 2, 26)),
+		// 						// `2nd` input line
+		// 						new LeftBracket(new Range(3, 1, 3, 2)),
+		// 						new Word(new Range(3, 2, 3, 2 + 3), 'ref'),
+		// 						new Space(new Range(3, 5, 3, 6)),
+		// 						new Word(new Range(3, 6, 3, 6 + 4), 'text'),
+		// 						new RightBracket(new Range(3, 10, 3, 11)),
+		// 						new LeftParenthesis(new Range(3, 11, 3, 12)),
+		// 						new Word(new Range(3, 12, 3, 12 + 8), '/etc/pat'),
+		// 						new stopCharacter(new Range(3, 20, 3, 21)), // <- stop character
+		// 						new Word(new Range(4, 1, 4, 1 + 12), 'h/to/file.md'),
+		// 						new RightParenthesis(new Range(4, 13, 4, 14)),
+		// 						new NewLine(new Range(4, 14, 4, 15)),
+		// 						// `3nd` input line
+		// 						new LeftBracket(new Range(5, 1, 5, 2)),
+		// 						new Word(new Range(5, 2, 5, 2 + 4), 'text'),
+		// 						new RightBracket(new Range(5, 6, 5, 7)),
+		// 						new stopCharacter(new Range(5, 7, 5, 8)), // <- stop character
+		// 						new LeftParenthesis(new Range(6, 1, 6, 2)),
+		// 						new Word(new Range(6, 2, 6, 2 + 5), '/etc/'),
+		// 						new Space(new Range(6, 7, 6, 8)),
+		// 						new Word(new Range(6, 8, 6, 8 + 12), 'path/file.md'),
+		// 						new RightParenthesis(new Range(6, 20, 6, 21)),
+		// 					],
+		// 				);
+		// 			});
+		// 		}
+		// 	});
+
+		// 	/**
+		// 	 * Same as above but these stop characters do not move the caret to the next line.
+		// 	 */
+		// 	suite('• stop characters inside caption/reference (same line)', () => {
+		// 		for (const stopCharacter of [VerticalTab, FormFeed]) {
+		// 			let characterName = '';
+
+		// 			if (stopCharacter === VerticalTab) {
+		// 				characterName = '\\v';
+		// 			}
+		// 			if (stopCharacter === FormFeed) {
+		// 				characterName = '\\f';
+		// 			}
+
+		// 			assert(
+		// 				characterName !== '',
+		// 				'The "characterName" must be set, got "empty line".',
+		// 			);
+
+		// 			test(`• stop character - "${characterName}"`, async () => {
+		// 				const test = testDisposables.add(
+		// 					new TestMarkdownDecoder(),
+		// 				);
+
+		// 				const inputLines = [
+		// 					// stop character inside link caption
+		// 					`[haa${stopCharacter.symbol}loů](./real/💁/name.txt)`,
+		// 					// stop character inside link reference
+		// 					`[ref text](/etc/pat${stopCharacter.symbol}h/to/file.md)`,
+		// 					// stop character between line caption and link reference is disallowed
+		// 					`[text]${stopCharacter.symbol}(/etc/ path/file.md)`,
+		// 				];
+
+
+		// 				await test.run(
+		// 					inputLines,
+		// 					[
+		// 						// `1st` input line
+		// 						new LeftBracket(new Range(1, 1, 1, 2)),
+		// 						new Word(new Range(1, 2, 1, 2 + 3), 'haa'),
+		// 						new stopCharacter(new Range(1, 5, 1, 6)), // <- stop character
+		// 						new Word(new Range(1, 6, 1, 6 + 3), 'loů'),
+		// 						new RightBracket(new Range(1, 9, 1, 10)),
+		// 						new LeftParenthesis(new Range(1, 10, 1, 11)),
+		// 						new Word(new Range(1, 11, 1, 11 + 18), './real/💁/name.txt'),
+		// 						new RightParenthesis(new Range(1, 29, 1, 30)),
+		// 						new NewLine(new Range(1, 30, 1, 31)),
+		// 						// `2nd` input line
+		// 						new LeftBracket(new Range(2, 1, 2, 2)),
+		// 						new Word(new Range(2, 2, 2, 2 + 3), 'ref'),
+		// 						new Space(new Range(2, 5, 2, 6)),
+		// 						new Word(new Range(2, 6, 2, 6 + 4), 'text'),
+		// 						new RightBracket(new Range(2, 10, 2, 11)),
+		// 						new LeftParenthesis(new Range(2, 11, 2, 12)),
+		// 						new Word(new Range(2, 12, 2, 12 + 8), '/etc/pat'),
+		// 						new stopCharacter(new Range(2, 20, 2, 21)), // <- stop character
+		// 						new Word(new Range(2, 21, 2, 21 + 12), 'h/to/file.md'),
+		// 						new RightParenthesis(new Range(2, 33, 2, 34)),
+		// 						new NewLine(new Range(2, 34, 2, 35)),
+		// 						// `3nd` input line
+		// 						new LeftBracket(new Range(3, 1, 3, 2)),
+		// 						new Word(new Range(3, 2, 3, 2 + 4), 'text'),
+		// 						new RightBracket(new Range(3, 6, 3, 7)),
+		// 						new stopCharacter(new Range(3, 7, 3, 8)), // <- stop character
+		// 						new LeftParenthesis(new Range(3, 8, 3, 9)),
+		// 						new Word(new Range(3, 9, 3, 9 + 5), '/etc/'),
+		// 						new Space(new Range(3, 14, 3, 15)),
+		// 						new Word(new Range(3, 15, 3, 15 + 12), 'path/file.md'),
+		// 						new RightParenthesis(new Range(3, 27, 3, 28)),
+		// 					],
+		// 				);
+		// 			});
+		// 		}
+		// 	});
+		// });
+	});
+
 	suite('• comments', () => {
 		suite('• general', () => {
 			test('• base cases', async () => {
@@ -473,7 +755,6 @@ suite('MarkdownDecoder', () => {
 			});
 		});
 
-
 		test('• invalid', async () => {
 			const test = testDisposables.add(
 				new TestMarkdownDecoder(),

From 184545d2802085b88e05279ca341b2820b318fb9 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Mon, 3 Mar 2025 08:42:45 -0800
Subject: [PATCH 0859/1815] add unit tests for nuanced cases

---
 .../common/codecs/markdownDecoder.test.ts     | 283 +++---------------
 1 file changed, 44 insertions(+), 239 deletions(-)

diff --git a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
index f51d64934f39..f3bd57916df5 100644
--- a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
+++ b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
@@ -375,9 +375,7 @@ suite('MarkdownDecoder', () => {
 				const inputData = [
 					'\t![alt text](./some/path/to/file.jpg) ',
 					'plain text \f![label](./image.png)\v and more text',
-					// '<!-- comment\r\ntext\n\ngoes here --> usual text follows',
-					// '\t<!---->\t',
-					// 'haalo\t<!-- [link label](/some/path/to/file.md)',
+					'![](/var/images/default) following text',
 				];
 
 				await test.run(
@@ -402,247 +400,54 @@ suite('MarkdownDecoder', () => {
 						new Word(new Range(2, 40, 2, 44), 'more'),
 						new Space(new Range(2, 44, 2, 45)),
 						new Word(new Range(2, 45, 2, 49), 'text'),
-						// new NewLine(new Range(2, 49, 2, 50)),
+						new NewLine(new Range(2, 49, 2, 50)),
+						// `3rd`
+						new MarkdownImage(3, 1, '![]', '(/var/images/default)'),
+						new Space(new Range(3, 25, 3, 26)),
+						new Word(new Range(3, 26, 3, 35), 'following'),
+						new Space(new Range(3, 35, 3, 36)),
+						new Word(new Range(3, 36, 3, 40), 'text'),
 					],
 				);
 			});
 
-			// test('• nuanced', async () => {
-			// 	const test = testDisposables.add(
-			// 		new TestMarkdownDecoder(),
-			// 	);
-
-			// 	const inputData = [
-			// 		// comment inside `<>` brackets
-			// 		' \f <<!--commen\t-->>',
-			// 		// comment contains `<[]>` brackets and `!`
-			// 		'<!--<[!c⚽︎mment!]>-->\t\t',
-			// 		// comment contains `<!--` and new lines
-			// 		'\v<!--some\r\ntext\n\t<!--inner\r\ntext-->\t\t',
-			// 		// comment contains `<!--` and never closed properly
-			// 		' <!--<!--inner\r\ntext-- >\t\v\f ',
-			// 	];
-
-			// 	await test.run(
-			// 		inputData,
-			// 		[
-			// 			// `1st`
-			// 			new Space(new Range(1, 1, 1, 2)),
-			// 			new FormFeed(new Range(1, 2, 1, 3)),
-			// 			new Space(new Range(1, 3, 1, 4)),
-			// 			new LeftAngleBracket(new Range(1, 4, 1, 5)),
-			// 			new MarkdownComment(new Range(1, 5, 1, 5 + 14), '<!--commen\t-->'),
-			// 			new RightAngleBracket(new Range(1, 19, 1, 20)),
-			// 			new NewLine(new Range(1, 20, 1, 21)),
-			// 			// `2nd`
-			// 			new MarkdownComment(new Range(2, 1, 2, 1 + 21), '<!--<[!c⚽︎mment!]>-->'),
-			// 			new Tab(new Range(2, 22, 2, 23)),
-			// 			new Tab(new Range(2, 23, 2, 24)),
-			// 			new NewLine(new Range(2, 24, 2, 25)),
-			// 			// `3rd`
-			// 			new VerticalTab(new Range(3, 1, 3, 2)),
-			// 			new MarkdownComment(new Range(3, 2, 3 + 3, 1 + 7), '<!--some\r\ntext\n\t<!--inner\r\ntext-->'),
-			// 			new Tab(new Range(6, 8, 6, 9)),
-			// 			new Tab(new Range(6, 9, 6, 10)),
-			// 			new NewLine(new Range(6, 10, 6, 11)),
-			// 			// `4rd`
-			// 			new Space(new Range(7, 1, 7, 2)),
-			// 			// note! comment does not have correct closing `-->`, hence the comment extends
-			// 			//       to the end of the text, and therefore includes the \t\v\f and space at the end
-			// 			new MarkdownComment(new Range(7, 2, 8, 1 + 12), '<!--<!--inner\r\ntext-- >\t\v\f '),
-			// 		],
-			// 	);
-			// });
-		});
+			test('• nuanced', async () => {
+				const test = testDisposables.add(
+					new TestMarkdownDecoder(),
+				);
 
-		// suite('• broken', () => {
-		// 	test('• invalid', async () => {
-		// 		const test = testDisposables.add(
-		// 			new TestMarkdownDecoder(),
-		// 		);
-
-		// 		const inputLines = [
-		// 			// incomplete link reference with empty caption
-		// 			'[ ](./real/file path/file⇧name.md',
-		// 			// space between caption and reference is disallowed
-		// 			'[link text] (./file path/name.txt)',
-		// 		];
-
-		// 		await test.run(
-		// 			inputLines,
-		// 			[
-		// 				// `1st` line
-		// 				new LeftBracket(new Range(1, 1, 1, 2)),
-		// 				new Space(new Range(1, 2, 1, 3)),
-		// 				new RightBracket(new Range(1, 3, 1, 4)),
-		// 				new LeftParenthesis(new Range(1, 4, 1, 5)),
-		// 				new Word(new Range(1, 5, 1, 5 + 11), './real/file'),
-		// 				new Space(new Range(1, 16, 1, 17)),
-		// 				new Word(new Range(1, 17, 1, 17 + 17), 'path/file⇧name.md'),
-		// 				new NewLine(new Range(1, 34, 1, 35)),
-		// 				// `2nd` line
-		// 				new LeftBracket(new Range(2, 1, 2, 2)),
-		// 				new Word(new Range(2, 2, 2, 2 + 4), 'link'),
-		// 				new Space(new Range(2, 6, 2, 7)),
-		// 				new Word(new Range(2, 7, 2, 7 + 4), 'text'),
-		// 				new RightBracket(new Range(2, 11, 2, 12)),
-		// 				new Space(new Range(2, 12, 2, 13)),
-		// 				new LeftParenthesis(new Range(2, 13, 2, 14)),
-		// 				new Word(new Range(2, 14, 2, 14 + 6), './file'),
-		// 				new Space(new Range(2, 20, 2, 21)),
-		// 				new Word(new Range(2, 21, 2, 21 + 13), 'path/name.txt'),
-		// 				new RightParenthesis(new Range(2, 34, 2, 35)),
-		// 			],
-		// 		);
-		// 	});
-
-		// 	suite('• stop characters inside caption/reference (new lines)', () => {
-		// 		for (const stopCharacter of [CarriageReturn, NewLine]) {
-		// 			let characterName = '';
-
-		// 			if (stopCharacter === CarriageReturn) {
-		// 				characterName = '\\r';
-		// 			}
-		// 			if (stopCharacter === NewLine) {
-		// 				characterName = '\\n';
-		// 			}
-
-		// 			assert(
-		// 				characterName !== '',
-		// 				'The "characterName" must be set, got "empty line".',
-		// 			);
-
-		// 			test(`• stop character - "${characterName}"`, async () => {
-		// 				const test = testDisposables.add(
-		// 					new TestMarkdownDecoder(),
-		// 				);
-
-		// 				const inputLines = [
-		// 					// stop character inside link caption
-		// 					`[haa${stopCharacter.symbol}loů](./real/💁/name.txt)`,
-		// 					// stop character inside link reference
-		// 					`[ref text](/etc/pat${stopCharacter.symbol}h/to/file.md)`,
-		// 					// stop character between line caption and link reference is disallowed
-		// 					`[text]${stopCharacter.symbol}(/etc/ path/file.md)`,
-		// 				];
-
-
-		// 				await test.run(
-		// 					inputLines,
-		// 					[
-		// 						// `1st` input line
-		// 						new LeftBracket(new Range(1, 1, 1, 2)),
-		// 						new Word(new Range(1, 2, 1, 2 + 3), 'haa'),
-		// 						new stopCharacter(new Range(1, 5, 1, 6)), // <- stop character
-		// 						new Word(new Range(2, 1, 2, 1 + 3), 'loů'),
-		// 						new RightBracket(new Range(2, 4, 2, 5)),
-		// 						new LeftParenthesis(new Range(2, 5, 2, 6)),
-		// 						new Word(new Range(2, 6, 2, 6 + 18), './real/💁/name.txt'),
-		// 						new RightParenthesis(new Range(2, 24, 2, 25)),
-		// 						new NewLine(new Range(2, 25, 2, 26)),
-		// 						// `2nd` input line
-		// 						new LeftBracket(new Range(3, 1, 3, 2)),
-		// 						new Word(new Range(3, 2, 3, 2 + 3), 'ref'),
-		// 						new Space(new Range(3, 5, 3, 6)),
-		// 						new Word(new Range(3, 6, 3, 6 + 4), 'text'),
-		// 						new RightBracket(new Range(3, 10, 3, 11)),
-		// 						new LeftParenthesis(new Range(3, 11, 3, 12)),
-		// 						new Word(new Range(3, 12, 3, 12 + 8), '/etc/pat'),
-		// 						new stopCharacter(new Range(3, 20, 3, 21)), // <- stop character
-		// 						new Word(new Range(4, 1, 4, 1 + 12), 'h/to/file.md'),
-		// 						new RightParenthesis(new Range(4, 13, 4, 14)),
-		// 						new NewLine(new Range(4, 14, 4, 15)),
-		// 						// `3nd` input line
-		// 						new LeftBracket(new Range(5, 1, 5, 2)),
-		// 						new Word(new Range(5, 2, 5, 2 + 4), 'text'),
-		// 						new RightBracket(new Range(5, 6, 5, 7)),
-		// 						new stopCharacter(new Range(5, 7, 5, 8)), // <- stop character
-		// 						new LeftParenthesis(new Range(6, 1, 6, 2)),
-		// 						new Word(new Range(6, 2, 6, 2 + 5), '/etc/'),
-		// 						new Space(new Range(6, 7, 6, 8)),
-		// 						new Word(new Range(6, 8, 6, 8 + 12), 'path/file.md'),
-		// 						new RightParenthesis(new Range(6, 20, 6, 21)),
-		// 					],
-		// 				);
-		// 			});
-		// 		}
-		// 	});
-
-		// 	/**
-		// 	 * Same as above but these stop characters do not move the caret to the next line.
-		// 	 */
-		// 	suite('• stop characters inside caption/reference (same line)', () => {
-		// 		for (const stopCharacter of [VerticalTab, FormFeed]) {
-		// 			let characterName = '';
-
-		// 			if (stopCharacter === VerticalTab) {
-		// 				characterName = '\\v';
-		// 			}
-		// 			if (stopCharacter === FormFeed) {
-		// 				characterName = '\\f';
-		// 			}
-
-		// 			assert(
-		// 				characterName !== '',
-		// 				'The "characterName" must be set, got "empty line".',
-		// 			);
-
-		// 			test(`• stop character - "${characterName}"`, async () => {
-		// 				const test = testDisposables.add(
-		// 					new TestMarkdownDecoder(),
-		// 				);
-
-		// 				const inputLines = [
-		// 					// stop character inside link caption
-		// 					`[haa${stopCharacter.symbol}loů](./real/💁/name.txt)`,
-		// 					// stop character inside link reference
-		// 					`[ref text](/etc/pat${stopCharacter.symbol}h/to/file.md)`,
-		// 					// stop character between line caption and link reference is disallowed
-		// 					`[text]${stopCharacter.symbol}(/etc/ path/file.md)`,
-		// 				];
-
-
-		// 				await test.run(
-		// 					inputLines,
-		// 					[
-		// 						// `1st` input line
-		// 						new LeftBracket(new Range(1, 1, 1, 2)),
-		// 						new Word(new Range(1, 2, 1, 2 + 3), 'haa'),
-		// 						new stopCharacter(new Range(1, 5, 1, 6)), // <- stop character
-		// 						new Word(new Range(1, 6, 1, 6 + 3), 'loů'),
-		// 						new RightBracket(new Range(1, 9, 1, 10)),
-		// 						new LeftParenthesis(new Range(1, 10, 1, 11)),
-		// 						new Word(new Range(1, 11, 1, 11 + 18), './real/💁/name.txt'),
-		// 						new RightParenthesis(new Range(1, 29, 1, 30)),
-		// 						new NewLine(new Range(1, 30, 1, 31)),
-		// 						// `2nd` input line
-		// 						new LeftBracket(new Range(2, 1, 2, 2)),
-		// 						new Word(new Range(2, 2, 2, 2 + 3), 'ref'),
-		// 						new Space(new Range(2, 5, 2, 6)),
-		// 						new Word(new Range(2, 6, 2, 6 + 4), 'text'),
-		// 						new RightBracket(new Range(2, 10, 2, 11)),
-		// 						new LeftParenthesis(new Range(2, 11, 2, 12)),
-		// 						new Word(new Range(2, 12, 2, 12 + 8), '/etc/pat'),
-		// 						new stopCharacter(new Range(2, 20, 2, 21)), // <- stop character
-		// 						new Word(new Range(2, 21, 2, 21 + 12), 'h/to/file.md'),
-		// 						new RightParenthesis(new Range(2, 33, 2, 34)),
-		// 						new NewLine(new Range(2, 34, 2, 35)),
-		// 						// `3nd` input line
-		// 						new LeftBracket(new Range(3, 1, 3, 2)),
-		// 						new Word(new Range(3, 2, 3, 2 + 4), 'text'),
-		// 						new RightBracket(new Range(3, 6, 3, 7)),
-		// 						new stopCharacter(new Range(3, 7, 3, 8)), // <- stop character
-		// 						new LeftParenthesis(new Range(3, 8, 3, 9)),
-		// 						new Word(new Range(3, 9, 3, 9 + 5), '/etc/'),
-		// 						new Space(new Range(3, 14, 3, 15)),
-		// 						new Word(new Range(3, 15, 3, 15 + 12), 'path/file.md'),
-		// 						new RightParenthesis(new Range(3, 27, 3, 28)),
-		// 					],
-		// 				);
-		// 			});
-		// 		}
-		// 	});
-		// });
+				const inputData = [
+					'\t![<!-- comment -->](./s☻me/path/to/file.jpeg) ',
+					'raw text \f![(/1.png)](./image-🥸.png)\v and more text',
+					// '![](/var/images/default) following text',
+				];
+
+				await test.run(
+					inputData,
+					[
+						// `1st`
+						new Tab(new Range(1, 1, 1, 2)),
+						new MarkdownImage(1, 2, '![<!-- comment -->]', '(./s☻me/path/to/file.jpeg)'),
+						new Space(new Range(1, 47, 1, 48)),
+						new NewLine(new Range(1, 48, 1, 49)),
+						// `2nd`
+						new Word(new Range(2, 1, 2, 4), 'raw'),
+						new Space(new Range(2, 4, 2, 5)),
+						new Word(new Range(2, 5, 2, 9), 'text'),
+						new Space(new Range(2, 9, 2, 10)),
+						new FormFeed(new Range(2, 10, 2, 11)),
+						new MarkdownImage(2, 11, '![(/1.png)]', '(./image-🥸.png)'),
+						new VerticalTab(new Range(2, 38, 2, 39)),
+						new Space(new Range(2, 39, 2, 40)),
+						new Word(new Range(2, 40, 2, 43), 'and'),
+						new Space(new Range(2, 43, 2, 44)),
+						new Word(new Range(2, 44, 2, 48), 'more'),
+						new Space(new Range(2, 48, 2, 49)),
+						new Word(new Range(2, 49, 2, 53), 'text'),
+					],
+				);
+			});
+		});
 	});
 
 	suite('• comments', () => {

From 222fa26881d5eb8507f9426444afc508f69b9ce0 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Mon, 3 Mar 2025 09:04:14 -0800
Subject: [PATCH 0860/1815] add unit tests for the markdown image "invalid"
 cases

---
 .../common/codecs/simpleCodec/tokens/word.ts  |   2 +-
 .../common/codecs/markdownDecoder.test.ts     | 215 +++++++++++++++++-
 2 files changed, 215 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/common/codecs/simpleCodec/tokens/word.ts b/src/vs/editor/common/codecs/simpleCodec/tokens/word.ts
index fc3cefa79be6..2ca5598ac4ba 100644
--- a/src/vs/editor/common/codecs/simpleCodec/tokens/word.ts
+++ b/src/vs/editor/common/codecs/simpleCodec/tokens/word.ts
@@ -67,6 +67,6 @@ export class Word extends BaseToken {
 	 * Returns a string representation of the token.
 	 */
 	public override toString(): string {
-		return `word("${this.text.slice(0, 8)}")${this.range}`;
+		return `word("${this.text}")${this.range}`;
 	}
 }
diff --git a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
index f3bd57916df5..d0ea73d7fa23 100644
--- a/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
+++ b/src/vs/editor/test/common/codecs/markdownDecoder.test.ts
@@ -17,6 +17,7 @@ import { FormFeed } from '../../../common/codecs/simpleCodec/tokens/formFeed.js'
 import { VerticalTab } from '../../../common/codecs/simpleCodec/tokens/verticalTab.js';
 import { MarkdownLink } from '../../../common/codecs/markdownCodec/tokens/markdownLink.js';
 import { CarriageReturn } from '../../../common/codecs/linesCodec/tokens/carriageReturn.js';
+import { MarkdownImage } from '../../../common/codecs/markdownCodec/tokens/markdownImage.js';
 import { ExclamationMark } from '../../../common/codecs/simpleCodec/tokens/exclamationMark.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
 import { MarkdownComment } from '../../../common/codecs/markdownCodec/tokens/markdownComment.js';
@@ -24,7 +25,6 @@ import { LeftBracket, RightBracket } from '../../../common/codecs/simpleCodec/to
 import { MarkdownDecoder, TMarkdownToken } from '../../../common/codecs/markdownCodec/markdownDecoder.js';
 import { LeftParenthesis, RightParenthesis } from '../../../common/codecs/simpleCodec/tokens/parentheses.js';
 import { LeftAngleBracket, RightAngleBracket } from '../../../common/codecs/simpleCodec/tokens/angleBrackets.js';
-import { MarkdownImage } from '../../../common/codecs/markdownCodec/tokens/markdownImage.js';
 
 /**
  * A reusable test utility that asserts that a `TestMarkdownDecoder` instance
@@ -448,6 +448,219 @@ suite('MarkdownDecoder', () => {
 				);
 			});
 		});
+
+		suite('• broken', () => {
+			test('• invalid', async () => {
+				const test = testDisposables.add(
+					new TestMarkdownDecoder(),
+				);
+
+				const inputLines = [
+					// incomplete link reference with empty caption
+					'![ ](./real/file path/file★name.webp',
+					// space between caption and reference is disallowed
+					'\f![link text] (./file path/name.jpg)',
+					// new line inside the link reference
+					'\v![ ](./file\npath/name.jpg )',
+				];
+
+				await test.run(
+					inputLines,
+					[
+						// `1st` line
+						new ExclamationMark(new Range(1, 1, 1, 2)),
+						new LeftBracket(new Range(1, 2, 1, 3)),
+						new Space(new Range(1, 3, 1, 4)),
+						new RightBracket(new Range(1, 4, 1, 5)),
+						new LeftParenthesis(new Range(1, 5, 1, 6)),
+						new Word(new Range(1, 6, 1, 6 + 11), './real/file'),
+						new Space(new Range(1, 17, 1, 18)),
+						new Word(new Range(1, 18, 1, 18 + 19), 'path/file★name.webp'),
+						new NewLine(new Range(1, 37, 1, 38)),
+						// `2nd` line
+						new FormFeed(new Range(2, 1, 2, 2)),
+						new ExclamationMark(new Range(2, 2, 2, 3)),
+						new LeftBracket(new Range(2, 3, 2, 4)),
+						new Word(new Range(2, 4, 2, 4 + 4), 'link'),
+						new Space(new Range(2, 8, 2, 9)),
+						new Word(new Range(2, 9, 2, 9 + 4), 'text'),
+						new RightBracket(new Range(2, 13, 2, 14)),
+						new Space(new Range(2, 14, 2, 15)),
+						new LeftParenthesis(new Range(2, 15, 2, 16)),
+						new Word(new Range(2, 16, 2, 16 + 6), './file'),
+						new Space(new Range(2, 22, 2, 23)),
+						new Word(new Range(2, 23, 2, 23 + 13), 'path/name.jpg'),
+						new RightParenthesis(new Range(2, 36, 2, 37)),
+						new NewLine(new Range(2, 37, 2, 38)),
+						// `3rd` line
+						new VerticalTab(new Range(3, 1, 3, 2)),
+						new ExclamationMark(new Range(3, 2, 3, 3)),
+						new LeftBracket(new Range(3, 3, 3, 4)),
+						new Space(new Range(3, 4, 3, 5)),
+						new RightBracket(new Range(3, 5, 3, 6)),
+						new LeftParenthesis(new Range(3, 6, 3, 7)),
+						new Word(new Range(3, 7, 3, 7 + 6), './file'),
+						new NewLine(new Range(3, 13, 3, 14)),
+						new Word(new Range(4, 1, 4, 1 + 13), 'path/name.jpg'),
+						new Space(new Range(4, 14, 4, 15)),
+						new RightParenthesis(new Range(4, 15, 4, 16)),
+					],
+				);
+			});
+
+			suite('• stop characters inside caption/reference (new lines)', () => {
+				for (const stopCharacter of [CarriageReturn, NewLine]) {
+					let characterName = '';
+
+					if (stopCharacter === CarriageReturn) {
+						characterName = '\\r';
+					}
+					if (stopCharacter === NewLine) {
+						characterName = '\\n';
+					}
+
+					assert(
+						characterName !== '',
+						'The "characterName" must be set, got "empty line".',
+					);
+
+					test(`• stop character - "${characterName}"`, async () => {
+						const test = testDisposables.add(
+							new TestMarkdownDecoder(),
+						);
+
+						const inputLines = [
+							// stop character inside link caption
+							`![haa${stopCharacter.symbol}loů](./real/💁/name.png)`,
+							// stop character inside link reference
+							`![ref text](/etc/pat${stopCharacter.symbol}h/to/file.webp)`,
+							// stop character between line caption and link reference is disallowed
+							`![text]${stopCharacter.symbol}(/etc/ path/file.jpeg)`,
+						];
+
+
+						await test.run(
+							inputLines,
+							[
+								// `1st` input line
+								new ExclamationMark(new Range(1, 1, 1, 2)),
+								new LeftBracket(new Range(1, 2, 1, 3)),
+								new Word(new Range(1, 3, 1, 3 + 3), 'haa'),
+								new stopCharacter(new Range(1, 6, 1, 7)), // <- stop character
+								new Word(new Range(2, 1, 2, 1 + 3), 'loů'),
+								new RightBracket(new Range(2, 4, 2, 5)),
+								new LeftParenthesis(new Range(2, 5, 2, 6)),
+								new Word(new Range(2, 6, 2, 6 + 18), './real/💁/name.png'),
+								new RightParenthesis(new Range(2, 24, 2, 25)),
+								new NewLine(new Range(2, 25, 2, 26)),
+								// `2nd` input line
+								new ExclamationMark(new Range(3, 1, 3, 2)),
+								new LeftBracket(new Range(3, 2, 3, 3)),
+								new Word(new Range(3, 3, 3, 3 + 3), 'ref'),
+								new Space(new Range(3, 6, 3, 7)),
+								new Word(new Range(3, 7, 3, 7 + 4), 'text'),
+								new RightBracket(new Range(3, 11, 3, 12)),
+								new LeftParenthesis(new Range(3, 12, 3, 13)),
+								new Word(new Range(3, 13, 3, 13 + 8), '/etc/pat'),
+								new stopCharacter(new Range(3, 21, 3, 22)), // <- stop character
+								new Word(new Range(4, 1, 4, 1 + 14), 'h/to/file.webp'),
+								new RightParenthesis(new Range(4, 15, 4, 16)),
+								new NewLine(new Range(4, 16, 4, 17)),
+								// `3nd` input line
+								new ExclamationMark(new Range(5, 1, 5, 2)),
+								new LeftBracket(new Range(5, 2, 5, 3)),
+								new Word(new Range(5, 3, 5, 3 + 4), 'text'),
+								new RightBracket(new Range(5, 7, 5, 8)),
+								new stopCharacter(new Range(5, 8, 5, 9)), // <- stop character
+								new LeftParenthesis(new Range(6, 1, 6, 2)),
+								new Word(new Range(6, 2, 6, 2 + 5), '/etc/'),
+								new Space(new Range(6, 7, 6, 8)),
+								new Word(new Range(6, 8, 6, 8 + 14), 'path/file.jpeg'),
+								new RightParenthesis(new Range(6, 22, 6, 23)),
+							],
+						);
+					});
+				}
+			});
+
+			/**
+			 * Same as above but these stop characters do not move the caret to the next line.
+			 */
+			suite('• stop characters inside caption/reference (same line)', () => {
+				for (const stopCharacter of [VerticalTab, FormFeed]) {
+					let characterName = '';
+
+					if (stopCharacter === VerticalTab) {
+						characterName = '\\v';
+					}
+					if (stopCharacter === FormFeed) {
+						characterName = '\\f';
+					}
+
+					assert(
+						characterName !== '',
+						'The "characterName" must be set, got "empty line".',
+					);
+
+					test(`• stop character - "${characterName}"`, async () => {
+						const test = testDisposables.add(
+							new TestMarkdownDecoder(),
+						);
+
+						const inputLines = [
+							// stop character inside link caption
+							`![haa${stopCharacter.symbol}loů](./real/💁/name)`,
+							// stop character inside link reference
+							`![ref text](/etc/pat${stopCharacter.symbol}h/to/file.webp)`,
+							// stop character between line caption and link reference is disallowed
+							`![text]${stopCharacter.symbol}(/etc/ path/image.gif)`,
+						];
+
+
+						await test.run(
+							inputLines,
+							[
+								// `1st` input line
+								new ExclamationMark(new Range(1, 1, 1, 2)),
+								new LeftBracket(new Range(1, 2, 1, 3)),
+								new Word(new Range(1, 3, 1, 3 + 3), 'haa'),
+								new stopCharacter(new Range(1, 6, 1, 7)), // <- stop character
+								new Word(new Range(1, 7, 1, 7 + 3), 'loů'),
+								new RightBracket(new Range(1, 10, 1, 11)),
+								new LeftParenthesis(new Range(1, 11, 1, 12)),
+								new Word(new Range(1, 12, 1, 12 + 14), './real/💁/name'),
+								new RightParenthesis(new Range(1, 26, 1, 27)),
+								new NewLine(new Range(1, 27, 1, 28)),
+								// `2nd` input line
+								new ExclamationMark(new Range(2, 1, 2, 2)),
+								new LeftBracket(new Range(2, 2, 2, 3)),
+								new Word(new Range(2, 3, 2, 3 + 3), 'ref'),
+								new Space(new Range(2, 6, 2, 7)),
+								new Word(new Range(2, 7, 2, 7 + 4), 'text'),
+								new RightBracket(new Range(2, 11, 2, 12)),
+								new LeftParenthesis(new Range(2, 12, 2, 13)),
+								new Word(new Range(2, 13, 2, 13 + 8), '/etc/pat'),
+								new stopCharacter(new Range(2, 21, 2, 22)), // <- stop character
+								new Word(new Range(2, 22, 2, 22 + 14), 'h/to/file.webp'),
+								new RightParenthesis(new Range(2, 36, 2, 37)),
+								new NewLine(new Range(2, 37, 2, 38)),
+								// `3nd` input line
+								new ExclamationMark(new Range(3, 1, 3, 2)),
+								new LeftBracket(new Range(3, 2, 3, 3)),
+								new Word(new Range(3, 3, 3, 3 + 4), 'text'),
+								new RightBracket(new Range(3, 7, 3, 8)),
+								new stopCharacter(new Range(3, 8, 3, 9)), // <- stop character
+								new LeftParenthesis(new Range(3, 9, 3, 10)),
+								new Word(new Range(3, 10, 3, 10 + 5), '/etc/'),
+								new Space(new Range(3, 15, 3, 16)),
+								new Word(new Range(3, 16, 3, 16 + 14), 'path/image.gif'),
+								new RightParenthesis(new Range(3, 30, 3, 31)),
+							],
+						);
+					});
+				}
+			});
+		});
 	});
 
 	suite('• comments', () => {

From 05ab239df1589c4fe5559d9037eda43030eaf1cc Mon Sep 17 00:00:00 2001
From: amunger <>
Date: Wed, 12 Mar 2025 14:06:38 -0700
Subject: [PATCH 0861/1815] wait for diffing to stop before initializing, fix
 indexing

---
 .../chatEditingModifiedNotebookEntry.ts       |  9 ++-
 .../chatEditingNotebookEditorIntegration.ts   | 56 +++++++++----------
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index a547adb37a64..df32680d2c43 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -66,8 +66,12 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	 */
 	override initialContent: string;
 	/**
-	 * Whether we're in the process of applying edits.
+	 * Whether we're still generating diffs from a response.
 	 */
+	private _isProcessingResponse = observableValue<boolean>('isProcessingResponse', false);
+	get isProcessingResponse(): IObservable<boolean> {
+		return this._isProcessingResponse;
+	}
 	private _isEditFromUs: boolean = false;
 	/**
 	 * Whether all edits are from us, e.g. is possible a user has made edits, then this will be false.
@@ -216,6 +220,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		}
 		const cellsDiffInfo: CellDiffInfo[] = [];
 		try {
+			this._isProcessingResponse.set(true, undefined);
 			const notebookDiff = await this.notebookEditorWorkerService.computeDiff(this.originalURI, this.modifiedURI);
 			if (id !== this.computeRequestId) {
 				return;
@@ -226,6 +231,8 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			}
 		} catch (ex) {
 			this.loggingService.error('Notebook Chat', 'Error computing diff:\n' + ex);
+		} finally {
+			this._isProcessingResponse.set(false, undefined);
 		}
 		this.initializeModelsFromDiffImpl(cellsDiffInfo);
 	}
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 f594e30b84a4..024b4e642bef 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
@@ -11,7 +11,6 @@ import { assertType } from '../../../../../../base/common/types.js';
 import { LineRange } from '../../../../../../editor/common/core/lineRange.js';
 import { Range } from '../../../../../../editor/common/core/range.js';
 import { nullDocumentDiff } from '../../../../../../editor/common/diff/documentDiffProvider.js';
-import { PrefixSumComputer } from '../../../../../../editor/common/model/prefixSumComputer.js';
 import { localize } from '../../../../../../nls.js';
 import { MenuId } from '../../../../../../platform/actions/common/actions.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
@@ -25,15 +24,16 @@ import { INotebookEditorService } from '../../../../notebook/browser/services/no
 import { NotebookCellTextModel } from '../../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../../notebook/common/model/notebookTextModel.js';
 import { ChatAgentLocation, IChatAgentService } from '../../../common/chatAgents.js';
-import { IModifiedFileEntry, IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from '../../../common/chatEditingService.js';
+import { IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from '../../../common/chatEditingService.js';
 import { ChatEditingCodeEditorIntegration, IDocumentDiff2 } from '../chatEditingCodeEditorIntegration.js';
+import { ChatEditingModifiedNotebookEntry } from '../chatEditingModifiedNotebookEntry.js';
 import { countChanges, ICellDiffInfo, sortCellChanges } from './notebookCellChanges.js';
 
 export class ChatEditingNotebookEditorIntegration extends Disposable implements IModifiedFileEntryEditorIntegration {
 	private integration: ChatEditingNotebookEditorWidgetIntegration;
 	private notebookEditor: INotebookEditor;
 	constructor(
-		_entry: IModifiedFileEntry,
+		_entry: ChatEditingModifiedNotebookEntry,
 		editor: IEditorPane,
 		notebookModel: NotebookTextModel,
 		originalModel: NotebookTextModel,
@@ -88,14 +88,12 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 	private readonly _currentChange = observableValue<{ change: ICellDiffInfo; index: number } | undefined>(this, undefined);
 	readonly currentChange: IObservable<{ change: ICellDiffInfo; index: number } | undefined> = this._currentChange;
 
-	private diffIndexPrefixSum: PrefixSumComputer = new PrefixSumComputer(new Uint32Array());
-
 	private readonly cellEditorIntegrations = new Map<NotebookCellTextModel, { integration: ChatEditingCodeEditorIntegration; diff: ISettableObservable<IDocumentDiff2> }>();
 
 	private readonly insertDeleteDecorators: IObservable<{ insertedCellDecorator: NotebookInsertedCellDecorator; deletedCellDecorator: NotebookDeletedCellDecorator } | undefined>;
 
 	constructor(
-		private readonly _entry: IModifiedFileEntry,
+		private readonly _entry: ChatEditingModifiedNotebookEntry,
 		private readonly notebookEditor: INotebookEditor,
 		private readonly notebookModel: NotebookTextModel,
 		originalModel: NotebookTextModel,
@@ -130,28 +128,15 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 			}
 		}));
 
-		// INIT when not streaming anymore, once per request, and when having changes
+		// INIT when not streaming nor diffing the response anymore, once per request, and when having changes
 		let lastModifyingRequestId: string | undefined;
 		this._store.add(autorun(r => {
 
 			if (!_entry.isCurrentlyBeingModifiedBy.read(r)
+				&& !_entry.isProcessingResponse.read(r)
 				&& lastModifyingRequestId !== _entry.lastModifyingRequestId
 				&& cellChanges.read(r).some(c => c.type !== 'unchanged' && !c.diff.read(r).identical)
 			) {
-				lastModifyingRequestId = _entry.lastModifyingRequestId;
-
-				const sortedCellChanges = sortCellChanges(cellChanges.read(r));
-				const values = new Uint32Array(sortedCellChanges.length);
-				for (let i = 0; i < sortedCellChanges.length; i++) {
-					const change = sortedCellChanges[i];
-					values[i] = change.type === 'insert' ? 1
-						: change.type === 'delete' ? 1
-							: change.type === 'modified' ? change.diff.read(r).changes.length
-								: 0;
-				}
-
-				this.diffIndexPrefixSum = new PrefixSumComputer(values);
-
 				this.reveal(true);
 			}
 		}));
@@ -224,17 +209,28 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 
 		this._register(autorun(r => {
 			const currentChange = this.currentChange.read(r);
-			if (currentChange) {
-				const indexInChange = currentChange.index;
-				const cellIndex = currentChange.change.modifiedCellIndex ?? currentChange.change.originalCellIndex;
-
-				const changesBeforeCell = cellIndex !== undefined && cellIndex > 0 ?
-					this.diffIndexPrefixSum.getPrefixSum(cellIndex - 1) : 0;
-
-				this._currentIndex.set(changesBeforeCell + indexInChange, undefined);
-			} else {
+			if (!currentChange) {
 				this._currentIndex.set(-1, undefined);
+				return;
 			}
+
+			let index = 0;
+			const sortedCellChanges = sortCellChanges(cellChanges.read(r));
+			for (const change of sortedCellChanges) {
+				if (currentChange && currentChange.change === change) {
+					if (change.type === 'modified') {
+						index += currentChange.index;
+					}
+					break;
+				}
+				if (change.type === 'insert' || change.type === 'delete') {
+					index++;
+				} else if (change.type === 'modified') {
+					index += change.diff.read(r).changes.length;
+				}
+			}
+
+			this._currentIndex.set(index, undefined);
 		}));
 
 		this.insertDeleteDecorators = derivedWithStore((r, store) => {

From c2261b02faf97df586d23f8b7d2eb75e67bd00ed Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 12 Mar 2025 14:08:17 -0700
Subject: [PATCH 0862/1815] Merge pull request #243384 from
 microsoft/connor4312/mcp-trust

mcp: allow trust per server collection
---
 src/vs/platform/dialogs/common/dialogs.ts     |   1 +
 .../browser/parts/dialogs/dialogHandler.ts    |   7 +-
 .../contrib/mcp/browser/mcpCommands.ts        |   6 +-
 .../common/discovery/configMcpDiscovery.ts    |   2 +-
 .../discovery/nativeMcpDiscoveryAbstract.ts   |   5 +-
 .../contrib/mcp/common/mcpRegistry.ts         |  60 ++++++-
 .../contrib/mcp/common/mcpRegistryTypes.ts    |  11 +-
 .../workbench/contrib/mcp/common/mcpServer.ts |  12 +-
 .../workbench/contrib/mcp/common/mcpTypes.ts  |  17 +-
 .../mcp/test/common/mcpRegistry.test.ts       | 161 +++++++++++++++++-
 10 files changed, 257 insertions(+), 25 deletions(-)

diff --git a/src/vs/platform/dialogs/common/dialogs.ts b/src/vs/platform/dialogs/common/dialogs.ts
index 7adeddd7013e..bb9270b9c287 100644
--- a/src/vs/platform/dialogs/common/dialogs.ts
+++ b/src/vs/platform/dialogs/common/dialogs.ts
@@ -283,6 +283,7 @@ export interface ICustomDialogOptions {
 export interface ICustomDialogMarkdown {
 	readonly markdown: IMarkdownString;
 	readonly classes?: string[];
+	readonly dismissOnLinkClick?: boolean;
 }
 
 /**
diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
index a7524ec4fe69..e41d878f990a 100644
--- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
+++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
@@ -117,7 +117,12 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
 			customOptions.markdownDetails?.forEach(markdownDetail => {
 				const result = this.markdownRenderer.render(markdownDetail.markdown, {
 					actionHandler: {
-						callback: link => openLinkFromMarkdown(this.openerService, link, markdownDetail.markdown.isTrusted, true /* skip URL validation to prevent another dialog from showing which is unsupported */),
+						callback: link => {
+							if (markdownDetail.dismissOnLinkClick) {
+								dialog.dispose();
+							}
+							return openLinkFromMarkdown(this.openerService, link, markdownDetail.markdown.isTrusted, true /* skip URL validation to prevent another dialog from showing which is unsupported */);
+						},
 						disposables: dialogDisposables
 					}
 				});
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 3a766d4e4c05..7153741982b5 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -58,7 +58,7 @@ export class ListMcpServerCommand extends Action2 {
 
 		store.add(pick);
 		store.add(autorun(reader => {
-			const servers = groupBy(mcpService.servers.read(reader).slice().sort((a, b) => (a.collection.order || 0) - (b.collection.order || 0)), s => s.collection.id);
+			const servers = groupBy(mcpService.servers.read(reader).slice().sort((a, b) => (a.collection.presentation?.order || 0) - (b.collection.presentation?.order || 0)), s => s.collection.id);
 			pick.items = Object.values(servers).flatMap(servers => {
 				return [
 					{ type: 'separator', label: servers[0].collection.label, id: servers[0].collection.id },
@@ -151,7 +151,7 @@ export class McpServerOptionsCommand extends Action2 {
 
 		switch (pick.action) {
 			case 'start':
-				await server.start();
+				await server.start(true);
 				server.showOutput();
 				break;
 			case 'stop':
@@ -159,7 +159,7 @@ export class McpServerOptionsCommand extends Action2 {
 				break;
 			case 'restart':
 				await server.stop();
-				await server.start();
+				await server.start(true);
 				break;
 			case 'showOutput':
 				server.showOutput();
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts b/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
index 80d83720622c..c0ee83a78d3c 100644
--- a/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
+++ b/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
@@ -126,7 +126,7 @@ export class ConfigMcpDiscovery extends Disposable implements IMcpDiscovery {
 				src.disposable.value ??= this._mcpRegistry.registerCollection({
 					id: collectionId,
 					label: src.label,
-					order: src.order,
+					presentation: { order: src.order },
 					remoteAuthority: src.remoteAuthority || null,
 					serverDefinitions: src.serverDefinitions,
 					isTrustedByDefault: true,
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.ts b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.ts
index 3e291cedeb94..7fe18f5f4a4e 100644
--- a/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.ts
+++ b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.ts
@@ -72,7 +72,10 @@ export abstract class FilesystemMpcDiscovery extends Disposable implements IMcpD
 				scope: StorageScope.PROFILE,
 				isTrustedByDefault: false,
 				serverDefinitions: observableValue<readonly McpServerDefinition[]>(this, []),
-				order: adapter.order + (adapter.remoteAuthority ? McpCollectionSortOrder.RemotePenalty : 0)
+				presentation: {
+					origin: file,
+					order: adapter.order + (adapter.remoteAuthority ? McpCollectionSortOrder.RemotePenalty : 0),
+				},
 			} satisfies McpCollectionDefinition;
 
 			const collectionRegistration = this._register(new MutableDisposable());
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
index b6a317949e0d..b72dc8b61656 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
@@ -3,14 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Lazy } from '../../../../base/common/lazy.js';
 import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
 import { IObservable, observableValue } from '../../../../base/common/observable.js';
+import { localize } from '../../../../nls.js';
+import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { Memento } from '../../../common/memento.js';
 import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
 import { McpRegistryInputStorage } from './mcpRegistryInputStorage.js';
-import { IMcpHostDelegate, IMcpRegistry } from './mcpRegistryTypes.js';
+import { IMcpHostDelegate, IMcpRegistry, IMcpResolveConnectionOptions } from './mcpRegistryTypes.js';
 import { McpServerConnection } from './mcpServerConnection.js';
 import { IMcpServerConnection, McpCollectionDefinition, McpServerDefinition } from './mcpTypes.js';
 
@@ -25,6 +29,12 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 	private readonly _workspaceStorage = new Lazy(() => this._register(this._instantiationService.createInstance(McpRegistryInputStorage, StorageScope.WORKSPACE, StorageTarget.USER)));
 	private readonly _profileStorage = new Lazy(() => this._register(this._instantiationService.createInstance(McpRegistryInputStorage, StorageScope.PROFILE, StorageTarget.USER)));
 
+	private readonly _trustMemento = new Lazy(() => {
+		const memento = new Memento('mcpTrustedServers', this._storageService);
+		this._register(this._storageService.onWillSaveState(() => memento.saveMemento()));
+		return memento.getMemento(StorageScope.APPLICATION, StorageTarget.MACHINE);
+	});
+
 	public get delegates(): readonly IMcpHostDelegate[] {
 		return this._delegates;
 	}
@@ -32,6 +42,8 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 	constructor(
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IConfigurationResolverService private readonly _configurationResolverService: IConfigurationResolverService,
+		@IDialogService private readonly _dialogService: IDialogService,
+		@IStorageService private readonly _storageService: IStorageService,
 	) {
 		super();
 	}
@@ -65,15 +77,51 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 		this._workspaceStorage.value.clearAll();
 	}
 
-	public async resolveConnection(
-		collection: McpCollectionDefinition,
-		definition: McpServerDefinition
-	): Promise<IMcpServerConnection> {
+	private async promptForTrust(collection: McpCollectionDefinition, definition: McpServerDefinition): Promise<boolean | undefined> {
+		const labelWithOrigin = collection.presentation?.origin
+			? `[\`${collection.label}\`](${collection.presentation.origin})`
+			: collection.label;
+
+		const result = await this._dialogService.prompt(
+			{
+				message: 'Do you trust this server?',
+				custom: {
+					markdownDetails: [{
+						markdown: new MarkdownString(localize('mcp.trust.details', 'The Model Context Protocol server `{0}` was found from {1}.\n\nDo you want to allow running MCP servers from {1}?', definition.label, labelWithOrigin)),
+						dismissOnLinkClick: true,
+					}]
+				},
+				buttons: [
+					{ label: localize('mcp.trust.yes', 'Trust'), run: () => true },
+					{ label: localize('mcp.trust.no', 'Do not trust'), run: () => false }
+				],
+			},
+		);
+
+		return result.result;
+	}
+
+	public async resolveConnection({ collection, definition, forceTrust }: IMcpResolveConnectionOptions): Promise<IMcpServerConnection | undefined> {
 		const delegate = this._delegates.find(d => d.canStart(collection, definition));
 		if (!delegate) {
 			throw new Error('No delegate found that can handle the connection');
 		}
 
+		if (!collection.isTrustedByDefault) {
+			const memento = this._trustMemento.value;
+			const trusted = memento.hasOwnProperty(definition.id) ? memento[definition.id] : undefined;
+
+			if (trusted) {
+				// continue
+			} else if (trusted === undefined || forceTrust) {
+				const trustValue = await this.promptForTrust(collection, definition);
+				memento[definition.id] = trustValue;
+				if (!trustValue) { return; }
+			} else /** trusted === false && !forceTrust */ {
+				return undefined;
+			}
+		}
+
 		let launch = definition.launch;
 
 		if (definition.variableReplacement) {
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
index 12f5123a8034..8bb2c2d066ab 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
@@ -26,6 +26,13 @@ export interface IMcpHostDelegate {
 	start(collectionDefinition: McpCollectionDefinition, serverDefinition: McpServerDefinition, resolvedLaunch: McpServerLaunch): IMcpMessageTransport;
 }
 
+export interface IMcpResolveConnectionOptions {
+	collection: McpCollectionDefinition;
+	definition: McpServerDefinition;
+	/** If set, the user will be asked to trust the collection even if they untrusted it previously */
+	forceTrust?: boolean;
+}
+
 export interface IMcpRegistry {
 	readonly _serviceBrand: undefined;
 
@@ -37,6 +44,6 @@ export interface IMcpRegistry {
 
 	/** Resets any saved inputs for the connection. */
 	clearSavedInputs(collection: McpCollectionDefinition, definition: McpServerDefinition): void;
-	/** Createse a connection for the collection and definition. */
-	resolveConnection(collection: McpCollectionDefinition, definition: McpServerDefinition): Promise<IMcpServerConnection>;
+	/** Creates a connection for the collection and definition. */
+	resolveConnection(options: IMcpResolveConnectionOptions): Promise<IMcpServerConnection | undefined>;
 }
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServer.ts b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
index 082d62363f19..e5fea1c89c20 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServer.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
@@ -128,11 +128,19 @@ export class McpServer extends Disposable implements IMcpServer {
 		this._connection.get()?.showOutput();
 	}
 
-	public start(): Promise<McpConnectionState> {
+	public start(isFromInteraction?: boolean): Promise<McpConnectionState> {
 		return this._connectionSequencer.queue(async () => {
 			let connection = this._connection.get();
 			if (!connection) {
-				connection = await this._mcpRegistry.resolveConnection(this.collection, this.definition);
+				connection = await this._mcpRegistry.resolveConnection({
+					collection: this.collection,
+					definition: this.definition,
+					forceTrust: isFromInteraction,
+				});
+				if (!connection) {
+					return { state: McpConnectionState.Kind.Stopped };
+				}
+
 				if (this._store.isDisposed) {
 					connection.dispose();
 					return { state: McpConnectionState.Kind.Stopped };
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
index ec1b2e00c4bd..d7909a2f2d20 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
@@ -34,8 +34,13 @@ export interface McpCollectionDefinition {
 	readonly isTrustedByDefault: boolean;
 	/** Scope where associated collection info should be stored. */
 	readonly scope: StorageScope;
-	/** Sort order of the collection. */
-	readonly order?: number;
+
+	readonly presentation?: {
+		/** Sort order of the collection. */
+		readonly order?: number;
+		/** Place where this server is configured, used in workspac trust prompts */
+		readonly origin?: URI;
+	};
 }
 
 export const enum McpCollectionSortOrder {
@@ -98,7 +103,13 @@ export interface IMcpServer extends IDisposable {
 	readonly definition: McpServerDefinition;
 	readonly state: IObservable<McpConnectionState>;
 	showOutput(): void;
-	start(): Promise<McpConnectionState>;
+	/**
+	 * Starts the server and returns its resulting state. One of:
+	 * - Running, if all good
+	 * - Error, if the server failed to start
+	 * - Stopped, if the server was disposed or the user cancelled the launch
+	 */
+	start(isFromInteraction?: boolean): Promise<McpConnectionState>;
 	stop(): Promise<void>;
 
 	readonly tools: IObservable<readonly IMcpTool[]>;
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 6f9f02f2a58e..8b32ec67463e 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
@@ -4,12 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import * as sinon from 'sinon';
 import { cloneAndChange } from '../../../../../base/common/objects.js';
 import { observableValue } from '../../../../../base/common/observable.js';
 import { upcast } from '../../../../../base/common/types.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { ConfigurationTarget } from '../../../../../platform/configuration/common/configuration.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
 import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
 import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
 import { ILoggerService } from '../../../../../platform/log/common/log.js';
@@ -24,6 +26,7 @@ import { IMcpHostDelegate, IMcpMessageTransport } from '../../common/mcpRegistry
 import { McpServerConnection } from '../../common/mcpServerConnection.js';
 import { McpCollectionDefinition, McpServerDefinition, McpServerTransportType } from '../../common/mcpTypes.js';
 import { TestMcpMessageTransport } from './mcpRegistryTypes.js';
+import { Memento } from '../../../../common/memento.js';
 
 class TestConfigurationResolverService implements Partial<IConfigurationResolverService> {
 	declare readonly _serviceBrand: undefined;
@@ -117,18 +120,46 @@ class TestMcpHostDelegate implements IMcpHostDelegate {
 	}
 }
 
+class TestDialogService implements Partial<IDialogService> {
+	declare readonly _serviceBrand: undefined;
+
+	private _promptResult: boolean | undefined;
+	private _promptSpy: sinon.SinonStub;
+
+	constructor() {
+		this._promptSpy = sinon.stub();
+		this._promptSpy.callsFake(() => {
+			return Promise.resolve({ result: this._promptResult });
+		});
+	}
+
+	setPromptResult(result: boolean | undefined): void {
+		this._promptResult = result;
+	}
+
+	get promptSpy(): sinon.SinonStub {
+		return this._promptSpy;
+	}
+
+	prompt(options: any): Promise<any> {
+		return this._promptSpy(options);
+	}
+}
+
 suite('Workbench - MCP - Registry', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
 
 	let registry: McpRegistry;
 	let testStorageService: TestStorageService;
 	let testConfigResolverService: TestConfigurationResolverService;
+	let testDialogService: TestDialogService;
 	let testCollection: McpCollectionDefinition;
 	let baseDefinition: McpServerDefinition;
 
 	setup(() => {
 		testConfigResolverService = new TestConfigurationResolverService();
 		testStorageService = store.add(new TestStorageService());
+		testDialogService = new TestDialogService();
 
 		const services = new ServiceCollection(
 			[IConfigurationResolverService, testConfigResolverService],
@@ -136,6 +167,7 @@ suite('Workbench - MCP - Registry', () => {
 			[ISecretStorageService, new TestSecretStorageService()],
 			[ILoggerService, store.add(new TestLoggerService())],
 			[IOutputService, upcast({ showChannel: () => { } })],
+			[IDialogService, testDialogService]
 		);
 
 		const instaService = store.add(new TestInstantiationService(services));
@@ -165,6 +197,10 @@ suite('Workbench - MCP - Registry', () => {
 		};
 	});
 
+	teardown(() => {
+		Memento.clear(StorageScope.APPLICATION);
+	});
+
 	test('registerCollection adds collection to registry', () => {
 		const disposable = registry.registerCollection(testCollection);
 		store.add(disposable);
@@ -205,12 +241,10 @@ suite('Workbench - MCP - Registry', () => {
 			}
 		};
 
-		// Register a delegate that can handle the connection
 		const delegate = new TestMcpHostDelegate();
-		const disposable = registry.registerDelegate(delegate);
-		store.add(disposable);
+		store.add(registry.registerDelegate(delegate));
 
-		const connection = await registry.resolveConnection(testCollection, definition) as McpServerConnection;
+		const connection = await registry.resolveConnection({ collection: testCollection, definition }) as McpServerConnection;
 
 		assert.ok(connection);
 		assert.strictEqual(connection.definition, definition);
@@ -218,7 +252,7 @@ suite('Workbench - MCP - Registry', () => {
 		assert.strictEqual((connection.launchDefinition as any).env.PATH, 'interactiveValue0');
 		connection.dispose();
 
-		const connection2 = await registry.resolveConnection(testCollection, definition) as McpServerConnection;
+		const connection2 = await registry.resolveConnection({ collection: testCollection, definition }) as McpServerConnection;
 
 		assert.ok(connection2);
 		assert.strictEqual((connection2.launchDefinition as any).env.PATH, 'interactiveValue0');
@@ -226,10 +260,125 @@ suite('Workbench - MCP - Registry', () => {
 
 		registry.clearSavedInputs();
 
-		const connection3 = await registry.resolveConnection(testCollection, definition) as McpServerConnection;
+		const connection3 = await registry.resolveConnection({ collection: testCollection, definition }) as McpServerConnection;
 
 		assert.ok(connection3);
 		assert.strictEqual((connection3.launchDefinition as any).env.PATH, 'interactiveValue4');
 		connection3.dispose();
 	});
+
+	suite('Trust Management', () => {
+		setup(() => {
+			const delegate = new TestMcpHostDelegate();
+			store.add(registry.registerDelegate(delegate));
+		});
+		test('resolveConnection connects to server when trusted by default', async () => {
+			const definition = { ...baseDefinition };
+
+			const connection = await registry.resolveConnection({ collection: testCollection, definition });
+
+			assert.ok(connection);
+			assert.strictEqual(testDialogService.promptSpy.called, false);
+			connection?.dispose();
+		});
+
+		test('resolveConnection prompts for confirmation when not trusted by default', async () => {
+			const untrustedCollection: McpCollectionDefinition = {
+				...testCollection,
+				isTrustedByDefault: false
+			};
+
+			const definition = { ...baseDefinition };
+
+			testDialogService.setPromptResult(true);
+
+			const connection = await registry.resolveConnection({
+				collection: untrustedCollection,
+				definition
+			});
+
+			assert.ok(connection);
+			assert.strictEqual(testDialogService.promptSpy.called, true);
+			connection?.dispose();
+
+			testDialogService.promptSpy.resetHistory();
+			const connection2 = await registry.resolveConnection({
+				collection: untrustedCollection,
+				definition
+			});
+
+			assert.ok(connection2);
+			assert.strictEqual(testDialogService.promptSpy.called, false);
+			connection2?.dispose();
+		});
+
+		test('resolveConnection returns undefined when user does not trust the server', async () => {
+			const untrustedCollection: McpCollectionDefinition = {
+				...testCollection,
+				isTrustedByDefault: false
+			};
+
+			const definition = { ...baseDefinition };
+
+			testDialogService.setPromptResult(false);
+
+			const connection = await registry.resolveConnection({
+				collection: untrustedCollection,
+				definition
+			});
+
+			assert.strictEqual(connection, undefined);
+			assert.strictEqual(testDialogService.promptSpy.called, true);
+
+			testDialogService.promptSpy.resetHistory();
+			const connection2 = await registry.resolveConnection({
+				collection: untrustedCollection,
+				definition
+			});
+
+			assert.strictEqual(connection2, undefined);
+			assert.strictEqual(testDialogService.promptSpy.called, false);
+		});
+
+		test('resolveConnection honors forceTrust parameter', async () => {
+			const untrustedCollection: McpCollectionDefinition = {
+				...testCollection,
+				isTrustedByDefault: false
+			};
+
+			const definition = { ...baseDefinition };
+
+			testDialogService.setPromptResult(false);
+
+			const connection1 = await registry.resolveConnection({
+				collection: untrustedCollection,
+				definition
+			});
+
+			assert.strictEqual(connection1, undefined);
+
+			testDialogService.promptSpy.resetHistory();
+			testDialogService.setPromptResult(true);
+
+			const connection2 = await registry.resolveConnection({
+				collection: untrustedCollection,
+				definition,
+				forceTrust: true
+			});
+
+			assert.ok(connection2);
+			assert.strictEqual(testDialogService.promptSpy.called, true);
+			connection2?.dispose();
+
+			testDialogService.promptSpy.resetHistory();
+			const connection3 = await registry.resolveConnection({
+				collection: untrustedCollection,
+				definition
+			});
+
+			assert.ok(connection3);
+			assert.strictEqual(testDialogService.promptSpy.called, false);
+			connection3?.dispose();
+		});
+	});
 });

From f012f59b41d1b85c4b79bae201f22d8fa0e99f0a Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Wed, 12 Mar 2025 14:48:03 -0700
Subject: [PATCH 0863/1815] enables the `user prompt` synchronization for all
 vscode qualities (#243394)

---
 src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
index c8fdf9f404b8..5ab93b685365 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -619,8 +619,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 
 		// if the `reusable prompt` feature is enabled and in vscode
 		// insiders, add the `Prompts` resource item to the list
-		const isInsiders = (this.productService.quality !== 'stable');
-		if (PromptsConfig.enabled(this.configService) && isInsiders) {
+		if (PromptsConfig.enabled(this.configService) === true) {
 			result.push({
 				id: SyncResource.Prompts,
 				label: getSyncAreaLabel(SyncResource.Prompts)

From e8a73d9b17aa6fc0959d1a1a330b16183938f6b4 Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Wed, 12 Mar 2025 14:49:25 -0700
Subject: [PATCH 0864/1815] wait for diffing to stop before initializing, fix
 indexing (#243392)

Co-authored-by: amunger <>
---
 .../chatEditingModifiedNotebookEntry.ts       |  9 ++-
 .../chatEditingNotebookEditorIntegration.ts   | 56 +++++++++----------
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index a547adb37a64..df32680d2c43 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -66,8 +66,12 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	 */
 	override initialContent: string;
 	/**
-	 * Whether we're in the process of applying edits.
+	 * Whether we're still generating diffs from a response.
 	 */
+	private _isProcessingResponse = observableValue<boolean>('isProcessingResponse', false);
+	get isProcessingResponse(): IObservable<boolean> {
+		return this._isProcessingResponse;
+	}
 	private _isEditFromUs: boolean = false;
 	/**
 	 * Whether all edits are from us, e.g. is possible a user has made edits, then this will be false.
@@ -216,6 +220,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		}
 		const cellsDiffInfo: CellDiffInfo[] = [];
 		try {
+			this._isProcessingResponse.set(true, undefined);
 			const notebookDiff = await this.notebookEditorWorkerService.computeDiff(this.originalURI, this.modifiedURI);
 			if (id !== this.computeRequestId) {
 				return;
@@ -226,6 +231,8 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			}
 		} catch (ex) {
 			this.loggingService.error('Notebook Chat', 'Error computing diff:\n' + ex);
+		} finally {
+			this._isProcessingResponse.set(false, undefined);
 		}
 		this.initializeModelsFromDiffImpl(cellsDiffInfo);
 	}
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 f594e30b84a4..024b4e642bef 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
@@ -11,7 +11,6 @@ import { assertType } from '../../../../../../base/common/types.js';
 import { LineRange } from '../../../../../../editor/common/core/lineRange.js';
 import { Range } from '../../../../../../editor/common/core/range.js';
 import { nullDocumentDiff } from '../../../../../../editor/common/diff/documentDiffProvider.js';
-import { PrefixSumComputer } from '../../../../../../editor/common/model/prefixSumComputer.js';
 import { localize } from '../../../../../../nls.js';
 import { MenuId } from '../../../../../../platform/actions/common/actions.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
@@ -25,15 +24,16 @@ import { INotebookEditorService } from '../../../../notebook/browser/services/no
 import { NotebookCellTextModel } from '../../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../../notebook/common/model/notebookTextModel.js';
 import { ChatAgentLocation, IChatAgentService } from '../../../common/chatAgents.js';
-import { IModifiedFileEntry, IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from '../../../common/chatEditingService.js';
+import { IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from '../../../common/chatEditingService.js';
 import { ChatEditingCodeEditorIntegration, IDocumentDiff2 } from '../chatEditingCodeEditorIntegration.js';
+import { ChatEditingModifiedNotebookEntry } from '../chatEditingModifiedNotebookEntry.js';
 import { countChanges, ICellDiffInfo, sortCellChanges } from './notebookCellChanges.js';
 
 export class ChatEditingNotebookEditorIntegration extends Disposable implements IModifiedFileEntryEditorIntegration {
 	private integration: ChatEditingNotebookEditorWidgetIntegration;
 	private notebookEditor: INotebookEditor;
 	constructor(
-		_entry: IModifiedFileEntry,
+		_entry: ChatEditingModifiedNotebookEntry,
 		editor: IEditorPane,
 		notebookModel: NotebookTextModel,
 		originalModel: NotebookTextModel,
@@ -88,14 +88,12 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 	private readonly _currentChange = observableValue<{ change: ICellDiffInfo; index: number } | undefined>(this, undefined);
 	readonly currentChange: IObservable<{ change: ICellDiffInfo; index: number } | undefined> = this._currentChange;
 
-	private diffIndexPrefixSum: PrefixSumComputer = new PrefixSumComputer(new Uint32Array());
-
 	private readonly cellEditorIntegrations = new Map<NotebookCellTextModel, { integration: ChatEditingCodeEditorIntegration; diff: ISettableObservable<IDocumentDiff2> }>();
 
 	private readonly insertDeleteDecorators: IObservable<{ insertedCellDecorator: NotebookInsertedCellDecorator; deletedCellDecorator: NotebookDeletedCellDecorator } | undefined>;
 
 	constructor(
-		private readonly _entry: IModifiedFileEntry,
+		private readonly _entry: ChatEditingModifiedNotebookEntry,
 		private readonly notebookEditor: INotebookEditor,
 		private readonly notebookModel: NotebookTextModel,
 		originalModel: NotebookTextModel,
@@ -130,28 +128,15 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 			}
 		}));
 
-		// INIT when not streaming anymore, once per request, and when having changes
+		// INIT when not streaming nor diffing the response anymore, once per request, and when having changes
 		let lastModifyingRequestId: string | undefined;
 		this._store.add(autorun(r => {
 
 			if (!_entry.isCurrentlyBeingModifiedBy.read(r)
+				&& !_entry.isProcessingResponse.read(r)
 				&& lastModifyingRequestId !== _entry.lastModifyingRequestId
 				&& cellChanges.read(r).some(c => c.type !== 'unchanged' && !c.diff.read(r).identical)
 			) {
-				lastModifyingRequestId = _entry.lastModifyingRequestId;
-
-				const sortedCellChanges = sortCellChanges(cellChanges.read(r));
-				const values = new Uint32Array(sortedCellChanges.length);
-				for (let i = 0; i < sortedCellChanges.length; i++) {
-					const change = sortedCellChanges[i];
-					values[i] = change.type === 'insert' ? 1
-						: change.type === 'delete' ? 1
-							: change.type === 'modified' ? change.diff.read(r).changes.length
-								: 0;
-				}
-
-				this.diffIndexPrefixSum = new PrefixSumComputer(values);
-
 				this.reveal(true);
 			}
 		}));
@@ -224,17 +209,28 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 
 		this._register(autorun(r => {
 			const currentChange = this.currentChange.read(r);
-			if (currentChange) {
-				const indexInChange = currentChange.index;
-				const cellIndex = currentChange.change.modifiedCellIndex ?? currentChange.change.originalCellIndex;
-
-				const changesBeforeCell = cellIndex !== undefined && cellIndex > 0 ?
-					this.diffIndexPrefixSum.getPrefixSum(cellIndex - 1) : 0;
-
-				this._currentIndex.set(changesBeforeCell + indexInChange, undefined);
-			} else {
+			if (!currentChange) {
 				this._currentIndex.set(-1, undefined);
+				return;
 			}
+
+			let index = 0;
+			const sortedCellChanges = sortCellChanges(cellChanges.read(r));
+			for (const change of sortedCellChanges) {
+				if (currentChange && currentChange.change === change) {
+					if (change.type === 'modified') {
+						index += currentChange.index;
+					}
+					break;
+				}
+				if (change.type === 'insert' || change.type === 'delete') {
+					index++;
+				} else if (change.type === 'modified') {
+					index += change.diff.read(r).changes.length;
+				}
+			}
+
+			this._currentIndex.set(index, undefined);
 		}));
 
 		this.insertDeleteDecorators = derivedWithStore((r, store) => {

From 4fe72cafb7ceb1a8736f16d61348d622a1bf7a6c Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 6 Mar 2025 12:55:23 -0800
Subject: [PATCH 0865/1815] * II of `PromptVariable` and
 `PromptVariableWithData` classes

---
 .../markdownCodec/parsers/markdownComment.ts  |   2 +-
 .../codecs/parsers/promptVariableParser.ts    | 236 ++++++++++++++++++
 .../codecs/tokens/fileReference.ts            |   8 +-
 .../promptSyntax/codecs/tokens/promptToken.ts |  11 +
 .../codecs/tokens/promptVariable.ts           | 121 +++++++++
 5 files changed, 376 insertions(+), 2 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
 create mode 100644 src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptToken.ts
 create mode 100644 src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts

diff --git a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts
index 10b66e43c60c..eeba627f7081 100644
--- a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts
+++ b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts
@@ -197,7 +197,7 @@ export class MarkdownCommentStart extends ParserBase<TSimpleToken, MarkdownComme
  * );
  * ```
  */
-const pick = <TObject, TKeyName extends keyof TObject>(
+export const pick = <TObject, TKeyName extends keyof TObject>(
 	key: TKeyName,
 ) => {
 	return (obj: TObject): TObject[TKeyName] => {
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
new file mode 100644
index 000000000000..dd3e3acc16a1
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Range } from '../../../../../../../editor/common/core/range.js';
+import { PromptVariable, PromptVariableWithData } from '../tokens/promptVariable.js';
+import { Tab } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/tab.js';
+import { Hash } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/hash.js';
+import { Space } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/space.js';
+import { Colon } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/colon.js';
+import { NewLine } from '../../../../../../../editor/common/codecs/linesCodec/tokens/newLine.js';
+import { FormFeed } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/formFeed.js';
+import { TSimpleToken } from '../../../../../../../editor/common/codecs/simpleCodec/simpleDecoder.js';
+import { VerticalTab } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/verticalTab.js';
+import { CarriageReturn } from '../../../../../../../editor/common/codecs/linesCodec/tokens/carriageReturn.js';
+import { ExclamationMark } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/exclamationMark.js';
+import { LeftBracket, RightBracket } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/brackets.js';
+import { LeftAngleBracket, RightAngleBracket } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/angleBrackets.js';
+import { assertNotConsumed, ParserBase, TAcceptTokenResult } from '../../../../../../../editor/common/codecs/simpleCodec/parserBase.js';
+
+/**
+ * TODO: @lego
+ */
+const STOP_CHARACTERS: readonly string[] = [CarriageReturn, NewLine, Tab, VerticalTab, FormFeed, Space]
+	.map((token) => { return token.symbol; });
+
+/**
+ * TODO: @lego (excluding the stop ones)
+ */
+// TODO: @lego - add `@` here once we have it
+const INVALID_NAME_CHARACTERS: readonly string[] = [Hash, ExclamationMark, LeftAngleBracket, RightAngleBracket, LeftBracket, RightBracket]
+	.map((token) => { return token.symbol; });
+
+/**
+ * The parser responsible for parsing the TODO: @lego
+ */
+export class PartialPromptVariableName extends ParserBase<TSimpleToken, PartialPromptVariableName | PartialPromptVariableWithData | PromptVariable> {
+	constructor(token: Hash) {
+		super([token]);
+	}
+
+	@assertNotConsumed
+	public accept(token: TSimpleToken): TAcceptTokenResult<PartialPromptVariableName | PartialPromptVariableWithData | PromptVariable> {
+		// if a `stop` character is encountered, finish the parsing process
+		if (STOP_CHARACTERS.includes(token.text)) {
+			// in any case, success of failure below, this is an end of the parsing process
+			this.isConsumed = true;
+
+			// if there is only one token before the stop character
+			// must be the starting `#` one), then fail
+			if (this.currentTokens.length <= 1) {
+				return {
+					result: 'failure',
+					wasTokenConsumed: false,
+				};
+			}
+
+			const firstToken = this.currentTokens[0];
+			const lastToken = this.currentTokens[this.currentTokens.length - 1];
+
+			// TODO: @lego - validate that first and last tokens are defined?
+
+			// render the characters above into strings, excluding the starting `#` character
+			const variableNameTokens = this.currentTokens.slice(1);
+			const variableName = variableNameTokens.map(pick('text')).join('');
+
+			return {
+				result: 'success',
+				nextParser: new PromptVariable(
+					new Range(
+						firstToken.range.startLineNumber,
+						firstToken.range.startColumn,
+						lastToken.range.endLineNumber,
+						lastToken.range.endColumn,
+					),
+					variableName,
+				),
+				wasTokenConsumed: false,
+			};
+		}
+
+		// if a `:` character is encountered, we might transition to {@link PartialPromptVariableWithData}
+		if (token instanceof Colon) {
+			// if there is only one token before the `:` character
+			// must be the starting `#` one), then fail
+			if (this.currentTokens.length <= 1) {
+				this.isConsumed = true;
+
+				return {
+					result: 'failure',
+					wasTokenConsumed: false,
+				};
+			}
+
+			// otherwise, if there are more characters after `#` available,
+			// we have a variable name, so with `:`, transition to {@link PromptVariableWithData}
+			this.currentTokens.push(token);
+			this.isConsumed = true;
+
+			return {
+				result: 'success',
+				nextParser: new PartialPromptVariableWithData(this.currentTokens),
+				wasTokenConsumed: true,
+			};
+		}
+
+		// variables cannot have {@link INVALID_NAME_CHARACTERS} in their names
+		if (INVALID_NAME_CHARACTERS.includes(token.text)) {
+			this.isConsumed = true;
+
+			return {
+				result: 'failure',
+				wasTokenConsumed: false,
+			};
+		}
+
+		// otherwise, a valid name character, so add it to the list of
+		// the current tokens and continue the parsing process
+		this.currentTokens.push(token);
+
+		return {
+			result: 'success',
+			nextParser: this,
+			wasTokenConsumed: true,
+		};
+	}
+}
+
+/**
+ * TODO: @lego
+ */
+export class PartialPromptVariableWithData extends ParserBase<TSimpleToken, PartialPromptVariableWithData | PromptVariableWithData> {
+	/**
+	 * Number of tokens at the initialization of the current parser.
+	 */
+	// TODO: @lego - move to the base class?
+	private readonly startTokensCount: number;
+
+	constructor(tokens: readonly TSimpleToken[]) {
+		super([...tokens]);
+
+		// TODO: @lego - validate that it starts with `#` and ends with `:`
+
+		// save the number of tokens that represent a variable name and the colon at the end
+		this.startTokensCount = this.currentTokens.length;
+	}
+
+	@assertNotConsumed
+	public accept(token: TSimpleToken): TAcceptTokenResult<PartialPromptVariableWithData | PromptVariableWithData> {
+		// if a `stop` character is encountered, finish the parsing process
+		if (STOP_CHARACTERS.includes(token.text)) {
+			// in any case, success of failure below, this is an end of the parsing process
+			this.isConsumed = true;
+
+			// if no tokens received after initial set of tokens, fail
+			if (this.currentTokens.length === this.startTokensCount) {
+				return {
+					result: 'failure',
+					wasTokenConsumed: false,
+				};
+			}
+
+			// tokens representing variable name without the `#` character at the start and
+			// the `:` data separator character at the end
+			const variableNameTokens = this.currentTokens.slice(1, this.startTokensCount - 1);
+			// tokens representing variable data without the `:` separator character at the start
+			const variableDataTokens = this.currentTokens.slice(this.startTokensCount);
+
+			// render the characters above into strings
+			const variableName = variableNameTokens.map(pick('text')).join('');
+			const variableData = variableDataTokens.map(pick('text')).join('');
+
+			const firstToken = this.currentTokens[0];
+			const lastToken = this.currentTokens[this.currentTokens.length - 1];
+
+			// TODO: @lego - validate that first and last tokens are defined?
+
+			return {
+				result: 'success',
+				nextParser: new PromptVariableWithData(
+					new Range(
+						firstToken.range.startLineNumber,
+						firstToken.range.startColumn,
+						lastToken.range.endLineNumber,
+						lastToken.range.endColumn,
+					),
+					variableName,
+					variableData,
+				),
+				wasTokenConsumed: false,
+			};
+		}
+
+		// otherwise, a valid data character - the data can contain almost any character,
+		// including `:` and `#`, hence add it to the list of the current tokens and continue
+		this.currentTokens.push(token);
+
+		return {
+			result: 'success',
+			nextParser: this,
+			wasTokenConsumed: true,
+		};
+	}
+}
+
+/**
+ * Utility that helps to pick a property from an object.
+ *
+ * ## Examples
+ *
+ * ```typescript
+ * interface IObject = {
+ *   a: number,
+ *   b: string,
+ * };
+ *
+ * const list: IObject[] = [
+ *   { a: 1, b: 'foo' },
+ *   { a: 2, b: 'bar' },
+ * ];
+ *
+ * assert.deepStrictEqual(
+ *   list.map(pick('a')),
+ *   [1, 2],
+ * );
+ * ```
+ */
+// TODO: @lego - move to a common place
+export const pick = <TObject, TKeyName extends keyof TObject>(
+	key: TKeyName,
+) => {
+	return (obj: TObject): TObject[TKeyName] => {
+		return obj[key];
+	};
+};
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/fileReference.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/fileReference.ts
index 5efc84d9a6cc..d8c9660c7ccd 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/fileReference.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/fileReference.ts
@@ -3,11 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { PromptToken } from './promptToken.js';
 import { assert } from '../../../../../../../base/common/assert.js';
 import { IRange, Range } from '../../../../../../../editor/common/core/range.js';
 import { BaseToken } from '../../../../../../../editor/common/codecs/baseToken.js';
 import { Word } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/word.js';
 
+/**
+ * TODO: @legomushroom - list
+ * - make {@link FileReference} to extend {@link PromptVariableWithData}.
+ */
+
 /**
  * Start sequence for a file reference token in a prompt.
  */
@@ -16,7 +22,7 @@ const TOKEN_START: string = '#file:';
 /**
  * Object represents a file reference token inside a chatbot prompt.
  */
-export class FileReference extends BaseToken {
+export class FileReference extends PromptToken {
 	/**
 	 * Start sequence for a file reference token in a prompt.
 	 */
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptToken.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptToken.ts
new file mode 100644
index 000000000000..38a9d69d5ac3
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptToken.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 { BaseToken } from '../../../../../../../editor/common/codecs/baseToken.js';
+
+/**
+ * Common base token that all chatbot `prompt` tokens should inherit from.
+ */
+export abstract class PromptToken extends BaseToken { }
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts
new file mode 100644
index 000000000000..436a3ed60236
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts
@@ -0,0 +1,121 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { PromptToken } from './promptToken.js';
+import { Range } from '../../../../../../../editor/common/core/range.js';
+import { BaseToken } from '../../../../../../../editor/common/codecs/baseToken.js';
+
+/**
+ * All prompt variables start with `#` character.
+ */
+const TOKEN_START: string = '#';
+
+/**
+ * TODO: @lego
+ */
+const TOKEN_DATA_SEPARATOR: string = ':';
+
+/**
+ * Represents a `#variable` token in a prompt text.
+ */
+export class PromptVariable extends PromptToken {
+	constructor(
+		range: Range,
+		/**
+		 * The name of the variable, excluding the starting `#` character.
+		 */
+		public readonly name: string,
+	) {
+		// TODO: @lego - validate that name does not have `#` character (and no `:`?)
+
+		super(range);
+	}
+
+	/**
+	 * Get full text of the token.
+	 */
+	public get text(): string {
+		return `${TOKEN_START}${this.name}`;
+	}
+
+	/**
+	 * Check if this token is equal to another one.
+	 */
+	public override equals<T extends BaseToken>(other: T): boolean {
+		if (!super.sameRange(other.range)) {
+			return false;
+		}
+
+		if ((other instanceof PromptVariable) === false) {
+			return false;
+		}
+
+		if (this.text.length !== other.text.length) {
+			return false;
+		}
+
+		return this.text === other.text;
+	}
+
+	/**
+	 * Return a string representation of the token.
+	 */
+	public override toString(): string {
+		return `${this.name}${this.range}`;
+	}
+}
+
+/**
+ * Represents a {@link PromptVariable} with additional data token in a prompt text.
+ * (e.g., `#variable:/path/to/file.md`)
+ */
+export class PromptVariableWithData extends PromptVariable {
+	constructor(
+		range: Range,
+		/**
+		 * The name of the variable, excluding the starting `#` character.
+		 */
+		name: string,
+		/**
+		 * The data of the variable, excluding the starting {@link TOKEN_DATA_SEPARATOR} character.
+		 */
+		public readonly data: string,
+	) {
+		super(range, name);
+	}
+
+	/**
+	 * Get full text of the token.
+	 */
+	public override get text(): string {
+		return `${TOKEN_START}${this.name}${TOKEN_DATA_SEPARATOR}${this.data}`;
+	}
+
+	/**
+	 * Check if this token is equal to another one.
+	 */
+	public override equals<T extends BaseToken>(other: T): boolean {
+		if (!super.sameRange(other.range)) {
+			return false;
+		}
+
+		if ((other instanceof PromptVariableWithData) === false) {
+			return false;
+		}
+
+		if (this.text.length !== other.text.length) {
+			return false;
+		}
+
+		return this.text === other.text;
+	}
+
+	/**
+	 * Return a string representation of the token.
+	 */
+	public override toString(): string {
+		return `${this.text}${this.range}`;
+	}
+}

From 6de7a2735b262e90d5ec885bab544601e867f957 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 6 Mar 2025 14:03:27 -0800
Subject: [PATCH 0866/1815] make prompt `FileReference`  to extend the prompt
 `Variable` class

---
 .../codecs/parsers/promptVariableParser.ts    |   5 +
 .../codecs/tokens/fileReference.ts            | 102 ++----------------
 .../codecs/tokens/promptVariable.ts           |  46 ++++----
 .../promptSyntax/parsers/basePromptParser.ts  |   8 +-
 .../codecs/tokens/fileReference.test.ts       |  26 ++++-
 5 files changed, 66 insertions(+), 121 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
index dd3e3acc16a1..167a625499e5 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
@@ -19,6 +19,11 @@ import { LeftBracket, RightBracket } from '../../../../../../../editor/common/co
 import { LeftAngleBracket, RightAngleBracket } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/angleBrackets.js';
 import { assertNotConsumed, ParserBase, TAcceptTokenResult } from '../../../../../../../editor/common/codecs/simpleCodec/parserBase.js';
 
+/**
+ * TODO: @lego - list
+ *  - use the parser in the the prompt codec.
+ */
+
 /**
  * TODO: @lego
  */
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/fileReference.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/fileReference.ts
index d8c9660c7ccd..c9729f5158da 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/fileReference.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/fileReference.ts
@@ -3,124 +3,42 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { PromptToken } from './promptToken.js';
-import { assert } from '../../../../../../../base/common/assert.js';
+import { PromptVariableWithData } from './promptVariable.js';
 import { IRange, Range } from '../../../../../../../editor/common/core/range.js';
 import { BaseToken } from '../../../../../../../editor/common/codecs/baseToken.js';
-import { Word } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/word.js';
 
 /**
- * TODO: @legomushroom - list
- * - make {@link FileReference} to extend {@link PromptVariableWithData}.
+ * Name of the variable.
  */
-
-/**
- * Start sequence for a file reference token in a prompt.
- */
-const TOKEN_START: string = '#file:';
+const VARIABLE_NAME: string = 'file';
 
 /**
  * Object represents a file reference token inside a chatbot prompt.
  */
-export class FileReference extends PromptToken {
-	/**
-	 * Start sequence for a file reference token in a prompt.
-	 */
-	public static readonly TOKEN_START = TOKEN_START;
-
+export class FileReference extends PromptVariableWithData {
 	constructor(
 		range: Range,
 		public readonly path: string,
 	) {
-		super(range);
-	}
-
-	/**
-	 * Get full text of the file reference token.
-	 */
-	public get text(): string {
-		return `${TOKEN_START}${this.path}`;
-	}
-
-	/**
-	 * Create a file reference token out of a generic `Word`.
-	 * @throws if the word does not conform to the expected format or if
-	 *         the reference is an invalid `URI`.
-	 */
-	public static fromWord(word: Word): FileReference {
-		const { text } = word;
-
-		assert(
-			text.startsWith(TOKEN_START),
-			`The reference must start with "${TOKEN_START}", got ${text}.`,
-		);
-
-		const maybeReference = text.split(TOKEN_START);
-
-		assert(
-			maybeReference.length === 2,
-			`The expected reference format is "${TOKEN_START}:filesystem-path", got ${text}.`,
-		);
-
-		const [first, second] = maybeReference;
-
-		assert(
-			first === '',
-			`The reference must start with "${TOKEN_START}", got ${first}.`,
-		);
-
-		assert(
-			// Note! this accounts for both cases when second is `undefined` or `empty`
-			// 		 and we don't care about rest of the "falsy" cases here
-			!!second,
-			`The reference path must be defined, got ${second}.`,
-		);
-
-		const reference = new FileReference(
-			word.range,
-			second,
-		);
-
-		return reference;
+		super(range, VARIABLE_NAME, path);
 	}
 
 	/**
 	 * Check if this token is equal to another one.
 	 */
 	public override equals<T extends BaseToken>(other: T): boolean {
-		if (!super.sameRange(other.range)) {
+		if ((other instanceof FileReference) === false) {
 			return false;
 		}
 
-		if (!(other instanceof FileReference)) {
-			return false;
-		}
-
-		return this.text === other.text;
+		return super.equals(other);
 	}
 
 	/**
-	 * Get the range of the `link part` of the token (e.g.,
+	 * Get the range of the `link` part of the token (e.g.,
 	 * the `/path/to/file.md` part of `#file:/path/to/file.md`).
 	 */
-	public get linkRange(): IRange | undefined {
-		if (this.path.length === 0) {
-			return undefined;
-		}
-
-		const { range } = this;
-		return new Range(
-			range.startLineNumber,
-			range.startColumn + TOKEN_START.length,
-			range.endLineNumber,
-			range.endColumn,
-		);
-	}
-
-	/**
-	 * Return a string representation of the token.
-	 */
-	public override toString(): string {
-		return `file-ref("${this.text}")${this.range}`;
+	public get linkRange(): IRange {
+		return super.dataRange;
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts
index 436a3ed60236..d6d0f51837aa 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts
@@ -4,18 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { PromptToken } from './promptToken.js';
-import { Range } from '../../../../../../../editor/common/core/range.js';
+import { IRange, Range } from '../../../../../../../editor/common/core/range.js';
 import { BaseToken } from '../../../../../../../editor/common/codecs/baseToken.js';
 
 /**
  * All prompt variables start with `#` character.
  */
-const TOKEN_START: string = '#';
+const START_CHARACTER: string = '#';
 
 /**
  * TODO: @lego
  */
-const TOKEN_DATA_SEPARATOR: string = ':';
+const DATA_SEPARATOR: string = ':';
 
 /**
  * Represents a `#variable` token in a prompt text.
@@ -37,7 +37,7 @@ export class PromptVariable extends PromptToken {
 	 * Get full text of the token.
 	 */
 	public get text(): string {
-		return `${TOKEN_START}${this.name}`;
+		return `${START_CHARACTER}${this.name}`;
 	}
 
 	/**
@@ -63,7 +63,7 @@ export class PromptVariable extends PromptToken {
 	 * Return a string representation of the token.
 	 */
 	public override toString(): string {
-		return `${this.name}${this.range}`;
+		return `${this.text}${this.range}`;
 	}
 }
 
@@ -71,51 +71,55 @@ export class PromptVariable extends PromptToken {
  * Represents a {@link PromptVariable} with additional data token in a prompt text.
  * (e.g., `#variable:/path/to/file.md`)
  */
+// TODO: @legomushroom - all for empty `path`s?
 export class PromptVariableWithData extends PromptVariable {
 	constructor(
-		range: Range,
+		fullRange: Range,
 		/**
 		 * The name of the variable, excluding the starting `#` character.
 		 */
 		name: string,
+
 		/**
-		 * The data of the variable, excluding the starting {@link TOKEN_DATA_SEPARATOR} character.
+		 * The data of the variable, excluding the starting {@link DATA_SEPARATOR} character.
 		 */
 		public readonly data: string,
 	) {
-		super(range, name);
+		super(fullRange, name);
 	}
 
 	/**
 	 * Get full text of the token.
 	 */
 	public override get text(): string {
-		return `${TOKEN_START}${this.name}${TOKEN_DATA_SEPARATOR}${this.data}`;
+		return `${START_CHARACTER}${this.name}${DATA_SEPARATOR}${this.data}`;
 	}
 
 	/**
 	 * Check if this token is equal to another one.
 	 */
 	public override equals<T extends BaseToken>(other: T): boolean {
-		if (!super.sameRange(other.range)) {
-			return false;
-		}
-
 		if ((other instanceof PromptVariableWithData) === false) {
 			return false;
 		}
 
-		if (this.text.length !== other.text.length) {
-			return false;
-		}
-
-		return this.text === other.text;
+		return super.equals(other);
 	}
 
 	/**
-	 * Return a string representation of the token.
+	 * Range of the `data` part of the variable.
 	 */
-	public override toString(): string {
-		return `${this.text}${this.range}`;
+	public get dataRange(): IRange {
+		const { range } = this;
+		const dataStartColumn = range.startColumn +
+			START_CHARACTER.length + this.name.length +
+			DATA_SEPARATOR.length;
+
+		return new Range(
+			range.startLineNumber,
+			dataStartColumn,
+			range.endLineNumber,
+			range.endColumn,
+		);
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
index 937c7e6b1bb0..d4e990345fbd 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
@@ -575,7 +575,7 @@ export class PromptFileReference extends BasePromptParser<FilePromptContentProvi
 	public get linkRange(): IRange | undefined {
 		// `#file:` references
 		if (this.token instanceof FileReference) {
-			return this.token.linkRange;
+			return this.token.dataRange;
 		}
 
 		// `markdown link` references
@@ -591,7 +591,7 @@ export class PromptFileReference extends BasePromptParser<FilePromptContentProvi
 	 */
 	public override toString() {
 		const prefix = (this.token instanceof FileReference)
-			? FileReference.TOKEN_START
+			? `${this.token.name}:`
 			: 'md-link:';
 
 		return `${prefix}${this.uri.path}`;
@@ -601,7 +601,7 @@ export class PromptFileReference extends BasePromptParser<FilePromptContentProvi
 	 * @inheritdoc
 	 */
 	protected override getErrorMessage(error: ParseError): string {
-		// if failed to open a file, return approprivate message and the file path
+		// if failed to open a file, return appropriate message and the file path
 		if (error instanceof OpenFailed) {
 			return `${errorMessages.fileOpenFailed} '${error.uri.path}'.`;
 		}
@@ -611,7 +611,7 @@ export class PromptFileReference extends BasePromptParser<FilePromptContentProvi
 }
 
 /**
- * A tiny utility object that helps us to track existance
+ * A tiny utility object that helps us to track existence
  * of at least one parse result from the content provider.
  */
 class FirstParseResult extends DeferredPromise<void> {
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/codecs/tokens/fileReference.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/codecs/tokens/fileReference.test.ts
index 4a48b3a850d4..2e91084067f4 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/codecs/tokens/fileReference.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/codecs/tokens/fileReference.test.ts
@@ -7,14 +7,17 @@ import assert from 'assert';
 import { randomInt } from '../../../../../../../../base/common/numbers.js';
 import { Range } from '../../../../../../../../editor/common/core/range.js';
 import { assertDefined } from '../../../../../../../../base/common/types.js';
+import { BaseToken } from '../../../../../../../../editor/common/codecs/baseToken.js';
+import { PromptToken } from '../../../../../common/promptSyntax/codecs/tokens/promptToken.js';
 import { FileReference } from '../../../../../common/promptSyntax/codecs/tokens/fileReference.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../../base/test/common/utils.js';
-import { BaseToken } from '../../../../../../../../editor/common/codecs/baseToken.js';
+import { PromptVariable, PromptVariableWithData } from '../../../../../common/promptSyntax/codecs/tokens/promptVariable.js';
 
+// TODO: @lego - add test name separators
 suite('FileReference', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
-	test('`linkRange`', () => {
+	test('linkRange', () => {
 		const lineNumber = randomInt(100, 1);
 		const columnStartNumber = randomInt(100, 1);
 		const path = `/temp/test/file-${randomInt(Number.MAX_SAFE_INTEGER)}.txt`;
@@ -46,7 +49,7 @@ suite('FileReference', () => {
 		);
 	});
 
-	test('`path`', () => {
+	test('path', () => {
 		const lineNumber = randomInt(100, 1);
 		const columnStartNumber = randomInt(100, 1);
 		const link = `/temp/test/file-${randomInt(Number.MAX_SAFE_INTEGER)}.txt`;
@@ -67,7 +70,7 @@ suite('FileReference', () => {
 		);
 	});
 
-	test('extends `BaseToken`', () => {
+	test('extends `PromptVariableWithData` and others', () => {
 		const lineNumber = randomInt(100, 1);
 		const columnStartNumber = randomInt(100, 1);
 		const link = `/temp/test/file-${randomInt(Number.MAX_SAFE_INTEGER)}.txt`;
@@ -81,6 +84,21 @@ suite('FileReference', () => {
 		);
 		const fileReference = new FileReference(range, link);
 
+		assert(
+			fileReference instanceof PromptVariableWithData,
+			'Must extend `PromptVariableWithData`.',
+		);
+
+		assert(
+			fileReference instanceof PromptVariable,
+			'Must extend `PromptVariable`.',
+		);
+
+		assert(
+			fileReference instanceof PromptToken,
+			'Must extend `PromptToken`.',
+		);
+
 		assert(
 			fileReference instanceof BaseToken,
 			'Must extend `BaseToken`.',

From 3154cd442f94cf1666d7d1d2cd724a2f3a892d34 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Thu, 6 Mar 2025 15:16:52 -0800
Subject: [PATCH 0867/1815] use new prompt variables parser in the
 decoder/codec

---
 .../promptSyntax/codecs/chatPromptDecoder.ts  | 344 +++++++++---------
 .../codecs/parsers/promptVariableParser.ts    | 119 ++++--
 .../codecs/tokens/fileReference.ts            |  18 +
 .../promptPathAutocompletion.ts               |  10 +-
 .../promptSyntax/parsers/basePromptParser.ts  |  11 +-
 5 files changed, 300 insertions(+), 202 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/chatPromptDecoder.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/chatPromptDecoder.ts
index 06d8e1620ec6..da3a26ab2850 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/chatPromptDecoder.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/chatPromptDecoder.ts
@@ -3,166 +3,159 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { FileReference } from './tokens/fileReference.js';
+import { PromptToken } from './tokens/promptToken.js';
 import { VSBuffer } from '../../../../../../base/common/buffer.js';
-import { Range } from '../../../../../../editor/common/core/range.js';
+import { assertNever } from '../../../../../../base/common/assert.js';
 import { ReadableStream } from '../../../../../../base/common/stream.js';
 import { BaseDecoder } from '../../../../../../base/common/codecs/baseDecoder.js';
-import { Tab } from '../../../../../../editor/common/codecs/simpleCodec/tokens/tab.js';
-import { Word } from '../../../../../../editor/common/codecs/simpleCodec/tokens/word.js';
+import { PromptVariable, PromptVariableWithData } from './tokens/promptVariable.js';
 import { Hash } from '../../../../../../editor/common/codecs/simpleCodec/tokens/hash.js';
-import { Space } from '../../../../../../editor/common/codecs/simpleCodec/tokens/space.js';
-import { Colon } from '../../../../../../editor/common/codecs/simpleCodec/tokens/colon.js';
-import { NewLine } from '../../../../../../editor/common/codecs/linesCodec/tokens/newLine.js';
-import { FormFeed } from '../../../../../../editor/common/codecs/simpleCodec/tokens/formFeed.js';
-import { VerticalTab } from '../../../../../../editor/common/codecs/simpleCodec/tokens/verticalTab.js';
 import { MarkdownLink } from '../../../../../../editor/common/codecs/markdownCodec/tokens/markdownLink.js';
-import { CarriageReturn } from '../../../../../../editor/common/codecs/linesCodec/tokens/carriageReturn.js';
-import { ParserBase, TAcceptTokenResult } from '../../../../../../editor/common/codecs/simpleCodec/parserBase.js';
+import { PartialPromptVariableName, PartialPromptVariableWithData } from './parsers/promptVariableParser.js';
 import { MarkdownDecoder, TMarkdownToken } from '../../../../../../editor/common/codecs/markdownCodec/markdownDecoder.js';
 
 /**
  * Tokens produced by this decoder.
  */
-export type TChatPromptToken = MarkdownLink | FileReference;
-
-/**
- * The Parser responsible for processing a `prompt variable name` syntax from
- * a sequence of tokens (e.g., `#variable:`).
- *
- * The parsing process starts with single `#` token, then can accept `file` word,
- * followed by the `:` token, resulting in the tokens sequence equivalent to
- * the `#file:` text sequence. In this successful case, the parser transitions into
- * the {@linkcode PartialPromptFileReference} parser to continue the parsing process.
- */
-class PartialPromptVariableName extends ParserBase<TMarkdownToken, PartialPromptVariableName | PartialPromptFileReference | FileReference> {
-	constructor(token: Hash) {
-		super([token]);
-	}
-
-	public accept(token: TMarkdownToken): TAcceptTokenResult<PartialPromptVariableName | PartialPromptFileReference | FileReference> {
-		// given we currently hold the `#` token, if we receive a `file` word,
-		// we can successfully proceed to the next token in the sequence
-		if (token instanceof Word) {
-			if (token.text === 'file') {
-				this.currentTokens.push(token);
-
-				return {
-					result: 'success',
-					nextParser: this,
-					wasTokenConsumed: true,
-				};
-			}
-
-			return {
-				result: 'failure',
-				wasTokenConsumed: false,
-			};
-		}
-
-		// if we receive the `:` token, we can successfully proceed to the next
-		// token in the sequence `only if` the previous token was a `file` word
-		// therefore for currently tokens sequence equivalent to the `#file` text
-		if (token instanceof Colon) {
-			const lastToken = this.currentTokens[this.currentTokens.length - 1];
-
-			if (lastToken instanceof Word) {
-				this.currentTokens.push(token);
-
-				return {
-					result: 'success',
-					nextParser: new PartialPromptFileReference(this.currentTokens),
-					wasTokenConsumed: true,
-				};
-			}
-		}
-
-		// all other cases are failures and we don't consume the offending token
-		return {
-			result: 'failure',
-			wasTokenConsumed: false,
-		};
-	}
-}
-
-/**
- * List of characters that stop a prompt variable sequence.
- */
-const PROMPT_FILE_REFERENCE_STOP_CHARACTERS: readonly string[] = [Space, Tab, CarriageReturn, NewLine, VerticalTab, FormFeed]
-	.map((token) => { return token.symbol; });
-
-/**
- * Parser responsible for processing the `file reference` syntax part from
- * a sequence of tokens (e.g., #variable:`./some/file/path.md`).
- *
- * The parsing process starts with the sequence of `#`, `file`, and `:` tokens,
- * then can accept a sequence of tokens until one of the tokens defined in
- * the {@linkcode PROMPT_FILE_REFERENCE_STOP_CHARACTERS} list is encountered.
- * This sequence of tokens is treated as a `file path` part of the `#file:` variable,
- * and in the successful case, the parser transitions into the {@linkcode FileReference}
- * token which signifies the end of the file reference text parsing process.
- */
-class PartialPromptFileReference extends ParserBase<TMarkdownToken, PartialPromptFileReference | FileReference> {
-	/**
-	 * Set of tokens that were accumulated so far.
-	 */
-	private readonly fileReferenceTokens: (Hash | Word | Colon)[];
-
-	constructor(tokens: (Hash | Word | Colon)[]) {
-		super([]);
-
-		this.fileReferenceTokens = tokens;
-	}
-
-	/**
-	 * List of tokens that were accumulated so far.
-	 */
-	public override get tokens(): readonly (Hash | Word | Colon)[] {
-		return [...this.fileReferenceTokens, ...this.currentTokens];
-	}
-
-	/**
-	 * Return the `FileReference` instance created from the current object.
-	 */
-	public asFileReference(): FileReference {
-		// use only tokens in the `currentTokens` list to
-		// create the path component of the file reference
-		const path = this.currentTokens
-			.map((token) => { return token.text; })
-			.join('');
-
-		const firstToken = this.tokens[0];
-
-		const range = new Range(
-			firstToken.range.startLineNumber,
-			firstToken.range.startColumn,
-			firstToken.range.startLineNumber,
-			firstToken.range.startColumn + FileReference.TOKEN_START.length + path.length,
-		);
-
-		return new FileReference(range, path);
-	}
-
-	public accept(token: TMarkdownToken): TAcceptTokenResult<PartialPromptFileReference | FileReference> {
-		// any of stop characters is are breaking a prompt variable sequence
-		if (PROMPT_FILE_REFERENCE_STOP_CHARACTERS.includes(token.text)) {
-			return {
-				result: 'success',
-				wasTokenConsumed: false,
-				nextParser: this.asFileReference(),
-			};
-		}
-
-		// any other token can be included in the sequence so accumulate
-		// it and continue with using the current parser instance
-		this.currentTokens.push(token);
-		return {
-			result: 'success',
-			wasTokenConsumed: true,
-			nextParser: this,
-		};
-	}
-}
+export type TChatPromptToken = MarkdownLink | PromptVariable | PromptVariableWithData;
+
+// /**
+//  * The Parser responsible for processing a `prompt variable name` syntax from
+//  * a sequence of tokens (e.g., `#variable:`).
+//  *
+//  * The parsing process starts with single `#` token, then can accept `file` word,
+//  * followed by the `:` token, resulting in the tokens sequence equivalent to
+//  * the `#file:` text sequence. In this successful case, the parser transitions into
+//  * the {@linkcode PartialPromptFileReference} parser to continue the parsing process.
+//  */
+// class PartialPromptVariableName extends ParserBase<TMarkdownToken, PartialPromptVariableName | PartialPromptFileReference | FileReference> {
+// 	constructor(token: Hash) {
+// 		super([token]);
+// 	}
+
+// 	public accept(token: TMarkdownToken): TAcceptTokenResult<PartialPromptVariableName | PartialPromptFileReference | FileReference> {
+// 		// given we currently hold the `#` token, if we receive a `file` word,
+// 		// we can successfully proceed to the next token in the sequence
+// 		if (token instanceof Word) {
+// 			if (token.text === 'file') {
+// 				this.currentTokens.push(token);
+
+// 				return {
+// 					result: 'success',
+// 					nextParser: this,
+// 					wasTokenConsumed: true,
+// 				};
+// 			}
+
+// 			return {
+// 				result: 'failure',
+// 				wasTokenConsumed: false,
+// 			};
+// 		}
+
+// 		// if we receive the `:` token, we can successfully proceed to the next
+// 		// token in the sequence `only if` the previous token was a `file` word
+// 		// therefore for currently tokens sequence equivalent to the `#file` text
+// 		if (token instanceof Colon) {
+// 			const lastToken = this.currentTokens[this.currentTokens.length - 1];
+
+// 			if (lastToken instanceof Word) {
+// 				this.currentTokens.push(token);
+
+// 				return {
+// 					result: 'success',
+// 					nextParser: new PartialPromptFileReference(this.currentTokens),
+// 					wasTokenConsumed: true,
+// 				};
+// 			}
+// 		}
+
+// 		// all other cases are failures and we don't consume the offending token
+// 		return {
+// 			result: 'failure',
+// 			wasTokenConsumed: false,
+// 		};
+// 	}
+// }
+
+// /**
+//  * List of characters that stop a prompt variable sequence.
+//  */
+// const PROMPT_FILE_REFERENCE_STOP_CHARACTERS: readonly string[] = [Space, Tab, CarriageReturn, NewLine, VerticalTab, FormFeed]
+// 	.map((token) => { return token.symbol; });
+
+// /**
+//  * Parser responsible for processing the `file reference` syntax part from
+//  * a sequence of tokens (e.g., #variable:`./some/file/path.md`).
+//  *
+//  * The parsing process starts with the sequence of `#`, `file`, and `:` tokens,
+//  * then can accept a sequence of tokens until one of the tokens defined in
+//  * the {@linkcode PROMPT_FILE_REFERENCE_STOP_CHARACTERS} list is encountered.
+//  * This sequence of tokens is treated as a `file path` part of the `#file:` variable,
+//  * and in the successful case, the parser transitions into the {@linkcode FileReference}
+//  * token which signifies the end of the file reference text parsing process.
+//  */
+// class PartialPromptFileReference extends ParserBase<TMarkdownToken, PartialPromptFileReference | FileReference> {
+// 	/**
+// 	 * Set of tokens that were accumulated so far.
+// 	 */
+// 	private readonly fileReferenceTokens: (Hash | Word | Colon)[];
+
+// 	constructor(tokens: (Hash | Word | Colon)[]) {
+// 		super([]);
+
+// 		this.fileReferenceTokens = tokens;
+// 	}
+
+// 	/**
+// 	 * List of tokens that were accumulated so far.
+// 	 */
+// 	public override get tokens(): readonly (Hash | Word | Colon)[] {
+// 		return [...this.fileReferenceTokens, ...this.currentTokens];
+// 	}
+
+// 	/**
+// 	 * Return the `FileReference` instance created from the current object.
+// 	 */
+// 	public asFileReference(): FileReference {
+// 		// use only tokens in the `currentTokens` list to
+// 		// create the path component of the file reference
+// 		const path = this.currentTokens
+// 			.map((token) => { return token.text; })
+// 			.join('');
+
+// 		const firstToken = this.tokens[0];
+
+// 		const range = new Range(
+// 			firstToken.range.startLineNumber,
+// 			firstToken.range.startColumn,
+// 			firstToken.range.startLineNumber,
+// 			firstToken.range.startColumn + FileReference.TOKEN_START.length + path.length,
+// 		);
+
+// 		return new FileReference(range, path);
+// 	}
+
+// 	public accept(token: TMarkdownToken): TAcceptTokenResult<PartialPromptFileReference | FileReference> {
+// 		// any of stop characters is are breaking a prompt variable sequence
+// 		if (PROMPT_FILE_REFERENCE_STOP_CHARACTERS.includes(token.text)) {
+// 			return {
+// 				result: 'success',
+// 				wasTokenConsumed: false,
+// 				nextParser: this.asFileReference(),
+// 			};
+// 		}
+
+// 		// any other token can be included in the sequence so accumulate
+// 		// it and continue with using the current parser instance
+// 		this.currentTokens.push(token);
+// 		return {
+// 			result: 'success',
+// 			wasTokenConsumed: true,
+// 			nextParser: this,
+// 		};
+// 	}
+// }
 
 /**
  * Decoder for the common chatbot prompt message syntax.
@@ -170,11 +163,12 @@ class PartialPromptFileReference extends ParserBase<TMarkdownToken, PartialPromp
  */
 export class ChatPromptDecoder extends BaseDecoder<TChatPromptToken, TMarkdownToken> {
 	/**
-	 * Currently active parser object that is used to parse a well-known equence of
+	 * Currently active parser object that is used to parse a well-known sequence of
 	 * tokens, for instance, a `file reference` that consists of `hash`, `word`, and
 	 * `colon` tokens sequence plus following file path part.
+	 * TODO: @lego - update the comment
 	 */
-	private current?: PartialPromptVariableName;
+	private current?: PartialPromptVariableName | PartialPromptVariableWithData;
 
 	constructor(
 		stream: ReadableStream<VSBuffer>,
@@ -193,7 +187,7 @@ export class ChatPromptDecoder extends BaseDecoder<TChatPromptToken, TMarkdownTo
 		}
 
 		// if current parser was not yet initiated, - we are in the general
-		// "text" mode, therefore re-emit the token immediately and return
+		// "text" parsing mode, therefore re-emit the token immediately and return
 		if (!this.current) {
 			// at the moment, the decoder outputs only specific markdown tokens, like
 			// the `markdown link` one, so re-emit only these tokens ignoring the rest
@@ -219,13 +213,16 @@ export class ChatPromptDecoder extends BaseDecoder<TChatPromptToken, TMarkdownTo
 			//   1) parsing fully completed and an parsed entity is returned back, in this case,
 			// 		emit the parsed token (e.g., a `link`) and reset current parser object
 			//   2) parsing is still in progress and the next parser object is returned, hence
-			//  	we need to update the current praser object with a new one and continue
+			//  	we need to update the current parser object with a new one and continue
+			// TODO: @lego - update the comment
 			case 'success': {
-				if (parseResult.nextParser instanceof FileReference) {
-					this._onData.fire(parseResult.nextParser);
+				const { nextParser } = parseResult;
+
+				if (nextParser instanceof PromptToken) {
+					this._onData.fire(nextParser);
 					delete this.current;
 				} else {
-					this.current = parseResult.nextParser;
+					this.current = nextParser;
 				}
 
 				break;
@@ -249,14 +246,35 @@ export class ChatPromptDecoder extends BaseDecoder<TChatPromptToken, TMarkdownTo
 		}
 	}
 
+	// TODO: @lego - add/emit `EOF` token instead of doing this everywhere?
 	protected override onStreamEnd(): void {
-		// if the stream has ended and there is a current `PartialPromptFileReference`
-		// parser object, then the file reference was terminated by the end of the stream
-		if (this.current && this.current instanceof PartialPromptFileReference) {
-			this._onData.fire(this.current.asFileReference());
+		try {
+			// if there is no currently active parser object present, nothing to do
+			if (!this.current) {
+				return;
+			}
+
+			// otherwise try to convert incomplete parser object to a token
+			if (this.current instanceof PartialPromptVariableName) {
+				return this._onData.fire(this.current.asPromptVariable());
+			}
+
+			if (this.current instanceof PartialPromptVariableWithData) {
+				return this._onData.fire(this.current.asPromptVariableWithData());
+			}
+
+			assertNever(
+				this.current,
+				`Unknown parser object '${this.current}'`,
+			);
+		} catch (error) {
+			// TODO: @lego - do this when this decoder returns all tokens, not just `links`
+			// for (const token of this.current.tokens) {
+			// 	this._onData.fire(token);
+			// }
+		} finally {
 			delete this.current;
+			super.onStreamEnd();
 		}
-
-		super.onStreamEnd();
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
index 167a625499e5..97e008520061 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
@@ -18,16 +18,16 @@ import { ExclamationMark } from '../../../../../../../editor/common/codecs/simpl
 import { LeftBracket, RightBracket } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/brackets.js';
 import { LeftAngleBracket, RightAngleBracket } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/angleBrackets.js';
 import { assertNotConsumed, ParserBase, TAcceptTokenResult } from '../../../../../../../editor/common/codecs/simpleCodec/parserBase.js';
+import { assert } from '../../../../../../../base/common/assert.js';
 
 /**
  * TODO: @lego - list
- *  - use the parser in the the prompt codec.
  */
 
 /**
  * TODO: @lego
  */
-const STOP_CHARACTERS: readonly string[] = [CarriageReturn, NewLine, Tab, VerticalTab, FormFeed, Space]
+const STOP_CHARACTERS: readonly string[] = [Space, Tab, NewLine, CarriageReturn, VerticalTab, FormFeed]
 	.map((token) => { return token.symbol; });
 
 /**
@@ -49,40 +49,23 @@ export class PartialPromptVariableName extends ParserBase<TSimpleToken, PartialP
 	public accept(token: TSimpleToken): TAcceptTokenResult<PartialPromptVariableName | PartialPromptVariableWithData | PromptVariable> {
 		// if a `stop` character is encountered, finish the parsing process
 		if (STOP_CHARACTERS.includes(token.text)) {
-			// in any case, success of failure below, this is an end of the parsing process
-			this.isConsumed = true;
-
-			// if there is only one token before the stop character
-			// must be the starting `#` one), then fail
-			if (this.currentTokens.length <= 1) {
+			try {
+				// if it is possible to convert current parser to `PromptVariable`, return success result
+				return {
+					result: 'success',
+					nextParser: this.asPromptVariable(),
+					wasTokenConsumed: false,
+				};
+			} catch (error) {
+				// otherwise fail
 				return {
 					result: 'failure',
 					wasTokenConsumed: false,
 				};
+			} finally {
+				// in any case this is an end of the parsing process
+				this.isConsumed = true;
 			}
-
-			const firstToken = this.currentTokens[0];
-			const lastToken = this.currentTokens[this.currentTokens.length - 1];
-
-			// TODO: @lego - validate that first and last tokens are defined?
-
-			// render the characters above into strings, excluding the starting `#` character
-			const variableNameTokens = this.currentTokens.slice(1);
-			const variableName = variableNameTokens.map(pick('text')).join('');
-
-			return {
-				result: 'success',
-				nextParser: new PromptVariable(
-					new Range(
-						firstToken.range.startLineNumber,
-						firstToken.range.startColumn,
-						lastToken.range.endLineNumber,
-						lastToken.range.endColumn,
-					),
-					variableName,
-				),
-				wasTokenConsumed: false,
-			};
 		}
 
 		// if a `:` character is encountered, we might transition to {@link PartialPromptVariableWithData}
@@ -130,6 +113,40 @@ export class PartialPromptVariableName extends ParserBase<TSimpleToken, PartialP
 			wasTokenConsumed: true,
 		};
 	}
+
+	/**
+	 * Try to convert current parser instance into a fully-parsed {@link PromptVariable} token.
+	 *
+	 * @throws if sequence of tokens received so far do not constitute a valid prompt variable,
+	 *        for instance, if there is only `1` starting `#` token is available.
+	 */
+	public asPromptVariable(): PromptVariable {
+		// if there is only one token before the stop character
+		// must be the starting `#` one), then fail
+		assert(
+			this.currentTokens.length > 1,
+			'Cannot create a prompt variable out of incomplete token sequence.',
+		);
+
+		const firstToken = this.currentTokens[0];
+		const lastToken = this.currentTokens[this.currentTokens.length - 1];
+
+		// TODO: @lego - validate that first and last tokens are defined?
+
+		// render the characters above into strings, excluding the starting `#` character
+		const variableNameTokens = this.currentTokens.slice(1);
+		const variableName = variableNameTokens.map(pick('text')).join('');
+
+		return new PromptVariable(
+			new Range(
+				firstToken.range.startLineNumber,
+				firstToken.range.startColumn,
+				lastToken.range.endLineNumber,
+				lastToken.range.endColumn,
+			),
+			variableName,
+		);
+	}
 }
 
 /**
@@ -207,6 +224,46 @@ export class PartialPromptVariableWithData extends ParserBase<TSimpleToken, Part
 			wasTokenConsumed: true,
 		};
 	}
+
+	/**
+	 * Try to convert current parser instance into a fully-parsed {@link asPromptVariableWithData} token.
+	 *
+	 * @throws if sequence of tokens received so far do not constitute a valid prompt variable with data.
+	 */
+	public asPromptVariableWithData(): PromptVariableWithData {
+		// if no tokens received after initial set of tokens, fail
+		// TODO: @lego - allow this to allow for `#file:` tokens to be emitted? (without path)
+		assert(
+			this.currentTokens.length > this.startTokensCount,
+			`No 'data' part of the token found.`,
+		);
+
+		// tokens representing variable name without the `#` character at the start and
+		// the `:` data separator character at the end
+		const variableNameTokens = this.currentTokens.slice(1, this.startTokensCount - 1);
+		// tokens representing variable data without the `:` separator character at the start
+		const variableDataTokens = this.currentTokens.slice(this.startTokensCount);
+
+		// render the characters above into strings
+		const variableName = variableNameTokens.map(pick('text')).join('');
+		const variableData = variableDataTokens.map(pick('text')).join('');
+
+		const firstToken = this.currentTokens[0];
+		const lastToken = this.currentTokens[this.currentTokens.length - 1];
+
+		// TODO: @lego - validate that first and last tokens are defined?
+
+		return new PromptVariableWithData(
+			new Range(
+				firstToken.range.startLineNumber,
+				firstToken.range.startColumn,
+				lastToken.range.endLineNumber,
+				lastToken.range.endColumn,
+			),
+			variableName,
+			variableData,
+		);
+	}
 }
 
 /**
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/fileReference.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/fileReference.ts
index c9729f5158da..1dfdfdd8e9ef 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/fileReference.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/fileReference.ts
@@ -3,7 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+
 import { PromptVariableWithData } from './promptVariable.js';
+import { assert } from '../../../../../../../base/common/assert.js';
 import { IRange, Range } from '../../../../../../../editor/common/core/range.js';
 import { BaseToken } from '../../../../../../../editor/common/codecs/baseToken.js';
 
@@ -23,6 +25,22 @@ export class FileReference extends PromptVariableWithData {
 		super(range, VARIABLE_NAME, path);
 	}
 
+	/**
+	 * Create a {@link FileReference} from a {@link PromptVariableWithData} instance.
+	 * @throws if variable name is not equal to {@link VARIABLE_NAME}.
+	 */
+	public static from(variable: PromptVariableWithData) {
+		assert(
+			variable.name === VARIABLE_NAME,
+			`Variable name must be '${VARIABLE_NAME}', got '${variable.name}'.`,
+		);
+
+		return new FileReference(
+			variable.range,
+			variable.data,
+		);
+	}
+
 	/**
 	 * Check if this token is equal to another one.
 	 */
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptPathAutocompletion.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptPathAutocompletion.ts
index 7f026bdfff83..7a5010781d54 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptPathAutocompletion.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptPathAutocompletion.ts
@@ -18,7 +18,6 @@ import { LANGUAGE_SELECTOR } from '../constants.js';
 import { IPromptsService } from '../service/types.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import { IPromptFileReference } from '../parsers/types.js';
-import { FileReference } from '../codecs/tokens/fileReference.js';
 import { assertOneOf } from '../../../../../../base/common/types.js';
 import { isWindows } from '../../../../../../base/common/platform.js';
 import { ITextModel } from '../../../../../../editor/common/model.js';
@@ -68,10 +67,11 @@ const findFileReference = (
 			return undefined;
 		}
 
-		// this ensures that we handle only the `#file:` references for now
-		if (!reference.text.startsWith(FileReference.TOKEN_START)) {
-			return undefined;
-		}
+		// TODO: @lego - put this back?
+		// // this ensures that we handle only the `#file:` references for now
+		// if (!reference.text.startsWith(FileReference.TOKEN_START)) {
+		// 	return undefined;
+		// }
 
 		// reference must match the provided position
 		const { startLineNumber, endColumn } = range;
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
index d4e990345fbd..63e0ff7296c4 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
@@ -9,7 +9,6 @@ import { ChatPromptCodec } from '../codecs/chatPromptCodec.js';
 import { Emitter } from '../../../../../../base/common/event.js';
 import { assert } from '../../../../../../base/common/assert.js';
 import { IPromptFileReference, IResolveError } from './types.js';
-import { FileReference } from '../codecs/tokens/fileReference.js';
 import { ChatPromptDecoder } from '../codecs/chatPromptDecoder.js';
 import { IRange } from '../../../../../../editor/common/core/range.js';
 import { assertDefined } from '../../../../../../base/common/types.js';
@@ -24,6 +23,8 @@ import { FilePromptContentProvider } from '../contentProviders/filePromptContent
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { MarkdownLink } from '../../../../../../editor/common/codecs/markdownCodec/tokens/markdownLink.js';
 import { OpenFailed, NotPromptFile, RecursiveReference, FolderReference, ParseError, FailedToResolveContentsStream } from '../../promptFileReferenceErrors.js';
+import { PromptVariableWithData } from '../codecs/tokens/promptVariable.js';
+import { FileReference } from '../codecs/tokens/fileReference.js';
 
 /**
  * Well-known localized error messages.
@@ -225,8 +226,12 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 
 		// when some tokens received, process and store the references
 		this.stream.on('data', (token) => {
-			if (token instanceof FileReference) {
-				this.onReference(token, [...seenReferences]);
+			if (token instanceof PromptVariableWithData) {
+				try {
+					this.onReference(FileReference.from(token), [...seenReferences]);
+				} catch (error) {
+					// no-op
+				}
 			}
 
 			// note! the `isURL` is a simple check and needs to be improved to truly

From c50894bb6520de8f146088e5527e352e677efb42 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Mon, 10 Mar 2025 17:05:25 -0600
Subject: [PATCH 0868/1815] add common `pick` utility for arrays and related
 unit tests

---
 src/vs/base/common/arrays.ts                  | 30 +++++++
 src/vs/base/test/common/arrays.test.ts        | 59 ++++++++++++++
 .../markdownCodec/parsers/markdownComment.ts  | 31 +-------
 .../common/codecs/simpleCodec/parserBase.ts   |  9 ++-
 .../promptSyntax/codecs/chatPromptDecoder.ts  |  2 +-
 .../codecs/parsers/promptVariableParser.ts    | 79 +++++++------------
 .../codecs/tokens/promptVariable.ts           |  4 +-
 7 files changed, 129 insertions(+), 85 deletions(-)

diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts
index d4a409034430..98bf168f39da 100644
--- a/src/vs/base/common/arrays.ts
+++ b/src/vs/base/common/arrays.ts
@@ -620,6 +620,36 @@ function getActualStartIndex<T>(array: T[], start: number): number {
 	return start < 0 ? Math.max(start + array.length, 0) : Math.min(start, array.length);
 }
 
+/**
+ * Utility that helps to pick a property from an object.
+ *
+ * ## Examples
+ *
+ * ```typescript
+ * interface IObject = {
+ *   a: number,
+ *   b: string,
+ * };
+ *
+ * const list: IObject[] = [
+ *   { a: 1, b: 'foo' },
+ *   { a: 2, b: 'bar' },
+ * ];
+ *
+ * assert.deepStrictEqual(
+ *   list.map(pick('a')),
+ *   [1, 2],
+ * );
+ * ```
+ */
+export const pick = <TObject, TKeyName extends keyof TObject>(
+	key: TKeyName,
+) => {
+	return (obj: TObject): TObject[TKeyName] => {
+		return obj[key];
+	};
+};
+
 /**
  * When comparing two values,
  * a negative number indicates that the first value is less than the second,
diff --git a/src/vs/base/test/common/arrays.test.ts b/src/vs/base/test/common/arrays.test.ts
index f1144fbb6137..8c4249b6a44f 100644
--- a/src/vs/base/test/common/arrays.test.ts
+++ b/src/vs/base/test/common/arrays.test.ts
@@ -6,6 +6,7 @@ import assert from 'assert';
 import * as arrays from '../../common/arrays.js';
 import * as arraysFind from '../../common/arraysFind.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
+import { pick } from '../../common/arrays.js';
 
 suite('Arrays', () => {
 
@@ -399,6 +400,64 @@ suite('Arrays', () => {
 		);
 	});
 
+	suite('pick', () => {
+		suite('object', () => {
+			test('numbers', () => {
+				const array = [{ v: 3, foo: 'a' }, { v: 5, foo: 'b' }, { v: 2, foo: 'c' }, { v: 2, foo: 'd' }, { v: 17, bar: '1' }, { v: NaN, baz: '10' }];
+
+				assert.deepStrictEqual(
+					array.map(pick('v')),
+					[3, 5, 2, 2, 17, NaN],
+				);
+			});
+
+			test('strings', () => {
+				const array = [{ v: 3, foo: 'a' }, { v: 5, foo: 'b' }, { v: 2, foo: 'c' }, { v: 2, foo: 'd' }, { v: 17, bar: '1' }, { v: NaN, baz: '10' }, { foo: '12' }];
+
+				assert.deepStrictEqual(
+					array.map(pick('foo')),
+					['a', 'b', 'c', 'd', undefined, undefined, '12'],
+				);
+			});
+
+			test('booleans', () => {
+				const array = [{ v: 3, foo: 'a' }, { v: 5, foo: 'b' }, { v: 2, foo: 'c' }, { v: 2, foo: 'd' }, { v: 17, bar: true }, { v: NaN, bar: false }, { bar: false }];
+
+				assert.deepStrictEqual(
+					array.map(pick('bar')),
+					[undefined, undefined, undefined, undefined, true, false, false],
+				);
+			});
+
+			test('objects', () => {
+				const array = [{ v: { test: 12 } }, { v: { test: 24 } }, {}, { v: { test: 17892 } }];
+
+				assert.deepStrictEqual(
+					array.map(pick('v')),
+					[{ test: 12 }, { test: 24 }, undefined, { test: 17892 }],
+				);
+			});
+
+			test('mixed', () => {
+				const array = [{ v: { test: 104 } }, { v: 2 }, {}, { v: '24' }, { v: null }];
+
+				assert.deepStrictEqual(
+					array.map(pick('v')),
+					[{ test: 104 }, 2, undefined, '24', null],
+				);
+			});
+		});
+
+		test('string', () => {
+			const array = ['haallo', 'there', ':wave:', '!'];
+
+			assert.deepStrictEqual(
+				array.map(pick('length')),
+				[6, 5, 6, 1],
+			);
+		});
+	});
+
 	suite('ArrayQueue', () => {
 		suite('takeWhile/takeFromEndWhile', () => {
 			test('TakeWhile 1', () => {
diff --git a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts
index eeba627f7081..df5f3f028ab8 100644
--- a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts
+++ b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownComment.ts
@@ -5,6 +5,7 @@
 
 import { Range } from '../../../core/range.js';
 import { Dash } from '../../simpleCodec/tokens/dash.js';
+import { pick } from '../../../../../base/common/arrays.js';
 import { assert } from '../../../../../base/common/assert.js';
 import { MarkdownComment } from '../tokens/markdownComment.js';
 import { TSimpleToken } from '../../simpleCodec/simpleDecoder.js';
@@ -174,33 +175,3 @@ export class MarkdownCommentStart extends ParserBase<TSimpleToken, MarkdownComme
 		return true;
 	}
 }
-
-/**
- * Utility that helps to pick a property from an object.
- *
- * ## Examples
- *
- * ```typescript
- * interface IObject = {
- *   a: number,
- *   b: string,
- * };
- *
- * const list: IObject[] = [
- *   { a: 1, b: 'foo' },
- *   { a: 2, b: 'bar' },
- * ];
- *
- * assert.deepStrictEqual(
- *   list.map(pick('a')),
- *   [1, 2],
- * );
- * ```
- */
-export const pick = <TObject, TKeyName extends keyof TObject>(
-	key: TKeyName,
-) => {
-	return (obj: TObject): TObject[TKeyName] => {
-		return obj[key];
-	};
-};
diff --git a/src/vs/editor/common/codecs/simpleCodec/parserBase.ts b/src/vs/editor/common/codecs/simpleCodec/parserBase.ts
index 807beda411ae..e088a18f2641 100644
--- a/src/vs/editor/common/codecs/simpleCodec/parserBase.ts
+++ b/src/vs/editor/common/codecs/simpleCodec/parserBase.ts
@@ -53,12 +53,19 @@ export abstract class ParserBase<TToken extends BaseToken, TNextObject> {
 	 */
 	protected isConsumed: boolean = false;
 
+	/**
+	 * Number of tokens at the initialization of the current parser.
+	 */
+	protected readonly startTokensCount: number;
+
 	constructor(
 		/**
 		 * Set of tokens that were accumulated so far.
 		 */
 		protected readonly currentTokens: TToken[] = [],
-	) { }
+	) {
+		this.startTokensCount = this.currentTokens.length;
+	}
 
 	/**
 	 * Get the tokens that were accumulated so far.
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/chatPromptDecoder.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/chatPromptDecoder.ts
index da3a26ab2850..ac486f61d345 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/chatPromptDecoder.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/chatPromptDecoder.ts
@@ -268,7 +268,7 @@ export class ChatPromptDecoder extends BaseDecoder<TChatPromptToken, TMarkdownTo
 				`Unknown parser object '${this.current}'`,
 			);
 		} catch (error) {
-			// TODO: @lego - do this when this decoder returns all tokens, not just `links`
+			// TODO: @lego - uncomment this when this decoder returns all tokens, not just `links`
 			// for (const token of this.current.tokens) {
 			// 	this._onData.fire(token);
 			// }
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
index 97e008520061..85492e40f60f 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { pick } from '../../../../../../../base/common/arrays.js';
+import { assert } from '../../../../../../../base/common/assert.js';
 import { Range } from '../../../../../../../editor/common/core/range.js';
 import { PromptVariable, PromptVariableWithData } from '../tokens/promptVariable.js';
 import { Tab } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/tab.js';
@@ -18,27 +20,25 @@ import { ExclamationMark } from '../../../../../../../editor/common/codecs/simpl
 import { LeftBracket, RightBracket } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/brackets.js';
 import { LeftAngleBracket, RightAngleBracket } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/angleBrackets.js';
 import { assertNotConsumed, ParserBase, TAcceptTokenResult } from '../../../../../../../editor/common/codecs/simpleCodec/parserBase.js';
-import { assert } from '../../../../../../../base/common/assert.js';
-
-/**
- * TODO: @lego - list
- */
 
 /**
- * TODO: @lego
+ * List of characters that terminate the prompt variable sequence.
  */
 const STOP_CHARACTERS: readonly string[] = [Space, Tab, NewLine, CarriageReturn, VerticalTab, FormFeed]
 	.map((token) => { return token.symbol; });
 
 /**
- * TODO: @lego (excluding the stop ones)
+ * List of characters that cannot be in a variable name (excluding the {@link STOP_CHARACTERS}).
  */
-// TODO: @lego - add `@` here once we have it
 const INVALID_NAME_CHARACTERS: readonly string[] = [Hash, ExclamationMark, LeftAngleBracket, RightAngleBracket, LeftBracket, RightBracket]
 	.map((token) => { return token.symbol; });
 
 /**
- * The parser responsible for parsing the TODO: @lego
+ * The parser responsible for parsing a `prompt variable name`.
+ * E.g., `#selection` or `#workspace` variable. If the `:` character follows
+ * the variable name, the parser transitions to {@link PartialPromptVariableWithData}
+ * that is also able to parse the `data` part of the variable. E.g., the `#file` part
+ * of the `#file:/path/to/something.md` sequence.
  */
 export class PartialPromptVariableName extends ParserBase<TSimpleToken, PartialPromptVariableName | PartialPromptVariableWithData | PromptVariable> {
 	constructor(token: Hash) {
@@ -150,22 +150,30 @@ export class PartialPromptVariableName extends ParserBase<TSimpleToken, PartialP
 }
 
 /**
- * TODO: @lego
+ * The parser responsible for parsing a `prompt variable name` with `data`.
+ * E.g., the `/path/to/something.md` part of the `#file:/path/to/something.md` sequence.
  */
 export class PartialPromptVariableWithData extends ParserBase<TSimpleToken, PartialPromptVariableWithData | PromptVariableWithData> {
-	/**
-	 * Number of tokens at the initialization of the current parser.
-	 */
-	// TODO: @lego - move to the base class?
-	private readonly startTokensCount: number;
 
 	constructor(tokens: readonly TSimpleToken[]) {
-		super([...tokens]);
+		const firstToken = tokens;
+		const lastToken = tokens[tokens.length - 1];
 
-		// TODO: @lego - validate that it starts with `#` and ends with `:`
+		// sanity checks of our expectations about the tokens list
+		assert(
+			tokens.length > 2,
+			`Tokens list must contain at least 3 items, got '${tokens.length}'.`,
+		);
+		assert(
+			firstToken instanceof Hash,
+			`The first token must be a '#', got '${firstToken} '.`,
+		);
+		assert(
+			lastToken instanceof Colon,
+			`The last token must be a ':', got '${lastToken} '.`,
+		);
 
-		// save the number of tokens that represent a variable name and the colon at the end
-		this.startTokensCount = this.currentTokens.length;
+		super([...tokens]);
 	}
 
 	@assertNotConsumed
@@ -232,7 +240,7 @@ export class PartialPromptVariableWithData extends ParserBase<TSimpleToken, Part
 	 */
 	public asPromptVariableWithData(): PromptVariableWithData {
 		// if no tokens received after initial set of tokens, fail
-		// TODO: @lego - allow this to allow for `#file:` tokens to be emitted? (without path)
+		// TODO: @lego - allow this to emit `#file:` tokens? (without path)
 		assert(
 			this.currentTokens.length > this.startTokensCount,
 			`No 'data' part of the token found.`,
@@ -265,34 +273,3 @@ export class PartialPromptVariableWithData extends ParserBase<TSimpleToken, Part
 		);
 	}
 }
-
-/**
- * Utility that helps to pick a property from an object.
- *
- * ## Examples
- *
- * ```typescript
- * interface IObject = {
- *   a: number,
- *   b: string,
- * };
- *
- * const list: IObject[] = [
- *   { a: 1, b: 'foo' },
- *   { a: 2, b: 'bar' },
- * ];
- *
- * assert.deepStrictEqual(
- *   list.map(pick('a')),
- *   [1, 2],
- * );
- * ```
- */
-// TODO: @lego - move to a common place
-export const pick = <TObject, TKeyName extends keyof TObject>(
-	key: TKeyName,
-) => {
-	return (obj: TObject): TObject[TKeyName] => {
-		return obj[key];
-	};
-};
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts
index d6d0f51837aa..db6479e0e53b 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts
@@ -13,7 +13,7 @@ import { BaseToken } from '../../../../../../../editor/common/codecs/baseToken.j
 const START_CHARACTER: string = '#';
 
 /**
- * TODO: @lego
+ * Character that separates name of a prompt variable from its data.
  */
 const DATA_SEPARATOR: string = ':';
 
@@ -71,7 +71,7 @@ export class PromptVariable extends PromptToken {
  * Represents a {@link PromptVariable} with additional data token in a prompt text.
  * (e.g., `#variable:/path/to/file.md`)
  */
-// TODO: @legomushroom - all for empty `path`s?
+// TODO: @legomushroom - allow for empty `path`s?
 export class PromptVariableWithData extends PromptVariable {
 	constructor(
 		fullRange: Range,

From a1d5a4c72f185804b22989e2440f3eee29719824 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Mon, 10 Mar 2025 18:08:16 -0600
Subject: [PATCH 0869/1815] improve the `IPromptReference` type, add more doc
 comments

---
 .../markdownCodec/parsers/markdownImage.ts    |  8 ++--
 .../promptSyntax/codecs/chatPromptDecoder.ts  | 23 +++++-----
 .../codecs/parsers/promptVariableParser.ts    | 19 ++++----
 .../codecs/tokens/promptVariable.ts           | 16 ++++++-
 .../promptPathAutocompletion.ts               | 13 +++---
 .../promptSyntax/parsers/basePromptParser.ts  | 43 +++++++++++++------
 .../common/promptSyntax/parsers/types.d.ts    | 32 +++++++++-----
 .../testUtils/expectedReference.ts            |  4 +-
 8 files changed, 96 insertions(+), 62 deletions(-)

diff --git a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownImage.ts b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownImage.ts
index 460f9b239326..a3264f7cbdd7 100644
--- a/src/vs/editor/common/codecs/markdownCodec/parsers/markdownImage.ts
+++ b/src/vs/editor/common/codecs/markdownCodec/parsers/markdownImage.ts
@@ -12,12 +12,12 @@ import { assertNotConsumed, ParserBase, TAcceptTokenResult } from '../../simpleC
 import { MarkdownLinkCaption, PartialMarkdownLink, PartialMarkdownLinkCaption } from './markdownLink.js';
 
 /**
- * The parser responsible for parsing the `<!--` sequence - the start of a `markdown comment`.
- * TODO: @lego - update the docs
+ * The parser responsible for parsing the `markdown image` sequence of characters.
+ * E.g., `![alt text](./path/to/image.jpeg)` syntax.
  */
 export class PartialMarkdownImage extends ParserBase<TSimpleToken, PartialMarkdownImage | MarkdownImage> {
 	/**
-	 * TODO: @lego
+	 * Current active parser instance, if in the mode of actively parsing the markdown link sequence.
 	 */
 	private markdownLinkParser: PartialMarkdownLinkCaption | MarkdownLinkCaption | PartialMarkdownLink | undefined;
 
@@ -26,7 +26,7 @@ export class PartialMarkdownImage extends ParserBase<TSimpleToken, PartialMarkdo
 	}
 
 	/**
-	 * TODO: @lego - implement
+	 * Get all currently available tokens of the `markdown link` sequence.
 	 */
 	public override get tokens(): readonly TSimpleToken[] {
 		const linkTokens = this.markdownLinkParser?.tokens ?? [];
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/chatPromptDecoder.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/chatPromptDecoder.ts
index ac486f61d345..05394532793c 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/chatPromptDecoder.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/chatPromptDecoder.ts
@@ -19,6 +19,8 @@ import { MarkdownDecoder, TMarkdownToken } from '../../../../../../editor/common
  */
 export type TChatPromptToken = MarkdownLink | PromptVariable | PromptVariableWithData;
 
+
+// TODO: @lego - cleanup
 // /**
 //  * The Parser responsible for processing a `prompt variable name` syntax from
 //  * a sequence of tokens (e.g., `#variable:`).
@@ -164,9 +166,8 @@ export type TChatPromptToken = MarkdownLink | PromptVariable | PromptVariableWit
 export class ChatPromptDecoder extends BaseDecoder<TChatPromptToken, TMarkdownToken> {
 	/**
 	 * Currently active parser object that is used to parse a well-known sequence of
-	 * tokens, for instance, a `file reference` that consists of `hash`, `word`, and
-	 * `colon` tokens sequence plus following file path part.
-	 * TODO: @lego - update the comment
+	 * tokens, for instance, a `#file:/path/to/file.md` link that consists of `hash`,
+	 * `word`, and `colon` tokens sequence plus the `file path` part that follows.
 	 */
 	private current?: PartialPromptVariableName | PartialPromptVariableWithData;
 
@@ -210,11 +211,11 @@ export class ChatPromptDecoder extends BaseDecoder<TChatPromptToken, TMarkdownTo
 		// process the parse result next
 		switch (parseResult.result) {
 			// in the case of success there might be 2 cases:
-			//   1) parsing fully completed and an parsed entity is returned back, in this case,
-			// 		emit the parsed token (e.g., a `link`) and reset current parser object
+			//   1) parsing fully completed and an instance of `PromptToken` is returned back,
+			//      in this case, emit the parsed token (e.g., a `link`) and reset the current
+			//      parser object reference so a new parsing process can be initiated next
 			//   2) parsing is still in progress and the next parser object is returned, hence
-			//  	we need to update the current parser object with a new one and continue
-			// TODO: @lego - update the comment
+			//      we need to replace the current parser object with a new one and continue
 			case 'success': {
 				const { nextParser } = parseResult;
 
@@ -246,7 +247,6 @@ export class ChatPromptDecoder extends BaseDecoder<TChatPromptToken, TMarkdownTo
 		}
 	}
 
-	// TODO: @lego - add/emit `EOF` token instead of doing this everywhere?
 	protected override onStreamEnd(): void {
 		try {
 			// if there is no currently active parser object present, nothing to do
@@ -268,10 +268,9 @@ export class ChatPromptDecoder extends BaseDecoder<TChatPromptToken, TMarkdownTo
 				`Unknown parser object '${this.current}'`,
 			);
 		} catch (error) {
-			// TODO: @lego - uncomment this when this decoder returns all tokens, not just `links`
-			// for (const token of this.current.tokens) {
-			// 	this._onData.fire(token);
-			// }
+			// note! when this decoder becomes consistent with other ones and hence starts emitting
+			// 		 all token types, not just links, we would need to re-emit all the tokens that
+			//       the parser object has accumulated so far
 		} finally {
 			delete this.current;
 			super.onStreamEnd();
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
index 85492e40f60f..e7681e064c85 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
@@ -24,13 +24,13 @@ import { assertNotConsumed, ParserBase, TAcceptTokenResult } from '../../../../.
 /**
  * List of characters that terminate the prompt variable sequence.
  */
-const STOP_CHARACTERS: readonly string[] = [Space, Tab, NewLine, CarriageReturn, VerticalTab, FormFeed]
+export const STOP_CHARACTERS: readonly string[] = [Space, Tab, NewLine, CarriageReturn, VerticalTab, FormFeed]
 	.map((token) => { return token.symbol; });
 
 /**
  * List of characters that cannot be in a variable name (excluding the {@link STOP_CHARACTERS}).
  */
-const INVALID_NAME_CHARACTERS: readonly string[] = [Hash, ExclamationMark, LeftAngleBracket, RightAngleBracket, LeftBracket, RightBracket]
+export const INVALID_NAME_CHARACTERS: readonly string[] = [Hash, Colon, ExclamationMark, LeftAngleBracket, RightAngleBracket, LeftBracket, RightBracket]
 	.map((token) => { return token.symbol; });
 
 /**
@@ -70,11 +70,11 @@ export class PartialPromptVariableName extends ParserBase<TSimpleToken, PartialP
 
 		// if a `:` character is encountered, we might transition to {@link PartialPromptVariableWithData}
 		if (token instanceof Colon) {
-			// if there is only one token before the `:` character
-			// must be the starting `#` one), then fail
-			if (this.currentTokens.length <= 1) {
-				this.isConsumed = true;
+			this.isConsumed = true;
 
+			// if there is only one token before the `:` character, it must be the starting
+			// `#` symbol, therefore fail because there is no variable name present
+			if (this.currentTokens.length <= 1) {
 				return {
 					result: 'failure',
 					wasTokenConsumed: false,
@@ -82,13 +82,10 @@ export class PartialPromptVariableName extends ParserBase<TSimpleToken, PartialP
 			}
 
 			// otherwise, if there are more characters after `#` available,
-			// we have a variable name, so with `:`, transition to {@link PromptVariableWithData}
-			this.currentTokens.push(token);
-			this.isConsumed = true;
-
+			// we have a variable name, so we can transition to {@link PromptVariableWithData}
 			return {
 				result: 'success',
-				nextParser: new PartialPromptVariableWithData(this.currentTokens),
+				nextParser: new PartialPromptVariableWithData([...this.currentTokens, token]),
 				wasTokenConsumed: true,
 			};
 		}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts
index db6479e0e53b..148b80468897 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { PromptToken } from './promptToken.js';
+import { assert } from '../../../../../../../base/common/assert.js';
+import { INVALID_NAME_CHARACTERS, STOP_CHARACTERS } from '../parsers/promptVariableParser.js';
 import { IRange, Range } from '../../../../../../../editor/common/core/range.js';
 import { BaseToken } from '../../../../../../../editor/common/codecs/baseToken.js';
 
@@ -24,11 +26,21 @@ export class PromptVariable extends PromptToken {
 	constructor(
 		range: Range,
 		/**
-		 * The name of the variable, excluding the starting `#` character.
+		 * The name of a prompt variable, excluding the `#` character at the start.
 		 */
 		public readonly name: string,
 	) {
-		// TODO: @lego - validate that name does not have `#` character (and no `:`?)
+		for (const character of name) {
+			assert(
+				(INVALID_NAME_CHARACTERS.includes(character) === false),
+				`File name cannot contain character '${character}', got '${name}'.`,
+			);
+
+			assert(
+				(STOP_CHARACTERS.includes(character) === false),
+				`File name cannot contain character '${character}', got '${name}'.`,
+			);
+		}
 
 		super(range);
 	}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptPathAutocompletion.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptPathAutocompletion.ts
index 7a5010781d54..1cabcacc6e95 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptPathAutocompletion.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptPathAutocompletion.ts
@@ -17,13 +17,13 @@
 import { LANGUAGE_SELECTOR } from '../constants.js';
 import { IPromptsService } from '../service/types.js';
 import { URI } from '../../../../../../base/common/uri.js';
-import { IPromptFileReference } from '../parsers/types.js';
 import { assertOneOf } from '../../../../../../base/common/types.js';
 import { isWindows } from '../../../../../../base/common/platform.js';
 import { ITextModel } from '../../../../../../editor/common/model.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { CancellationError } from '../../../../../../base/common/errors.js';
 import { Position } from '../../../../../../editor/common/core/position.js';
+import { IPromptFileReference, IPromptReference } from '../parsers/types.js';
 import { dirname, extUri } from '../../../../../../base/common/resources.js';
 import { assert, assertNever } from '../../../../../../base/common/assert.js';
 import { IFileService } from '../../../../../../platform/files/common/files.js';
@@ -56,7 +56,7 @@ type TTriggerCharacter = ':' | '.' | '/';
  * Finds a file reference that suites the provided `position`.
  */
 const findFileReference = (
-	references: readonly IPromptFileReference[],
+	references: readonly IPromptReference[],
 	position: Position,
 ): IPromptFileReference | undefined => {
 	for (const reference of references) {
@@ -67,11 +67,10 @@ const findFileReference = (
 			return undefined;
 		}
 
-		// TODO: @lego - put this back?
-		// // this ensures that we handle only the `#file:` references for now
-		// if (!reference.text.startsWith(FileReference.TOKEN_START)) {
-		// 	return undefined;
-		// }
+		// this ensures that we handle only the `#file:` references for now
+		if (reference.subtype !== 'prompt') {
+			return undefined;
+		}
 
 		// reference must match the provided position
 		const { startLineNumber, endColumn } = range;
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
index 63e0ff7296c4..22cb63c03eab 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
@@ -7,24 +7,24 @@ import { localize } from '../../../../../../nls.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import { ChatPromptCodec } from '../codecs/chatPromptCodec.js';
 import { Emitter } from '../../../../../../base/common/event.js';
-import { assert } from '../../../../../../base/common/assert.js';
-import { IPromptFileReference, IResolveError } from './types.js';
+import { FileReference } from '../codecs/tokens/fileReference.js';
 import { ChatPromptDecoder } from '../codecs/chatPromptDecoder.js';
 import { IRange } from '../../../../../../editor/common/core/range.js';
 import { assertDefined } from '../../../../../../base/common/types.js';
 import { IPromptContentsProvider } from '../contentProviders/types.js';
 import { DeferredPromise } from '../../../../../../base/common/async.js';
 import { ILogService } from '../../../../../../platform/log/common/log.js';
+import { PromptVariableWithData } from '../codecs/tokens/promptVariable.js';
 import { basename, extUri } from '../../../../../../base/common/resources.js';
+import { assert, assertNever } from '../../../../../../base/common/assert.js';
 import { VSBufferReadableStream } from '../../../../../../base/common/buffer.js';
+import { IPromptFileReference, IPromptReference, IResolveError } from './types.js';
 import { isPromptFile } from '../../../../../../platform/prompts/common/constants.js';
 import { ObservableDisposable } from '../../../../../../base/common/observableDisposable.js';
 import { FilePromptContentProvider } from '../contentProviders/filePromptContentsProvider.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { MarkdownLink } from '../../../../../../editor/common/codecs/markdownCodec/tokens/markdownLink.js';
 import { OpenFailed, NotPromptFile, RecursiveReference, FolderReference, ParseError, FailedToResolveContentsStream } from '../../promptFileReferenceErrors.js';
-import { PromptVariableWithData } from '../codecs/tokens/promptVariable.js';
-import { FileReference } from '../codecs/tokens/fileReference.js';
 
 /**
  * Well-known localized error messages.
@@ -350,7 +350,7 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 	/**
 	 * Get a list of immediate child references of the prompt.
 	 */
-	public get references(): readonly IPromptFileReference[] {
+	public get references(): readonly IPromptReference[] {
 		return [...this._references];
 	}
 
@@ -358,8 +358,8 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 	 * Get a list of all references of the prompt, including
 	 * all possible nested references its children may have.
 	 */
-	public get allReferences(): readonly IPromptFileReference[] {
-		const result: IPromptFileReference[] = [];
+	public get allReferences(): readonly IPromptReference[] {
+		const result: IPromptReference[] = [];
 
 		for (const reference of this.references) {
 			result.push(reference);
@@ -375,7 +375,7 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 	/**
 	 * Get list of all valid references.
 	 */
-	public get allValidReferences(): readonly IPromptFileReference[] {
+	public get allValidReferences(): readonly IPromptReference[] {
 		return this.allReferences
 			// filter out unresolved references
 			.filter((reference) => {
@@ -551,7 +551,7 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 
 /**
  * Prompt file reference object represents any file reference inside prompt
- * text contents. For instanve the file variable(`#file:/path/to/file.md`)
+ * text contents. For instance the file variable(`#file:/path/to/file.md`)
  * or a markdown link(`[#file:file.md](/path/to/file.md)`).
  */
 export class PromptFileReference extends BasePromptParser<FilePromptContentProvider> implements IPromptFileReference {
@@ -591,15 +591,30 @@ export class PromptFileReference extends BasePromptParser<FilePromptContentProvi
 		return undefined;
 	}
 
+	/**
+	 * Subtype of a file reference, - either a prompt `#file` variable,
+	 * or a `markdown link` reference (`[caption](/path/to/file.md)`).
+	 */
+	public get subtype(): 'prompt' | 'markdown' {
+		if (this.token instanceof FileReference) {
+			return 'prompt';
+		}
+
+		if (this.token instanceof MarkdownLink) {
+			return 'markdown';
+		}
+
+		assertNever(
+			this.token,
+			`Unknown token type '${this.token}'.`,
+		);
+	}
+
 	/**
 	 * Returns a string representation of this object.
 	 */
 	public override toString() {
-		const prefix = (this.token instanceof FileReference)
-			? `${this.token.name}:`
-			: 'md-link:';
-
-		return `${prefix}${this.uri.path}`;
+		return `prompt-reference/${this.token}`;
 	}
 
 	/**
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts
index 325e5c3ec451..772d251f1a47 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts
@@ -25,18 +25,19 @@ export interface IResolveError {
 }
 
 /**
- * List of all available prompt reference types.
+ * Base interface for a generic prompt reference.
  */
-type PromptReferenceTypes = 'file';
+interface IPromptReferenceBase extends IDisposable {
+	/**
+	 * Type of the prompt reference. E.g., `file`, `http`, `image`, etc.
+	 */
+	readonly type: string;
 
-/**
- * Interface for a generic prompt reference.
- */
-export interface IPromptReference extends IDisposable {
 	/**
-	 * Type of the prompt reference.
+	 * Subtype of the prompt reference. For instance a `file` reference
+	 * can be a `markdown link` or a prompt `#file:` variable reference.
 	 */
-	readonly type: PromptReferenceTypes;
+	readonly subtype: string;
 
 	/**
 	 * URI component of the associated with this reference.
@@ -138,9 +139,20 @@ export interface IPromptReference extends IDisposable {
 }
 
 /**
- * The special case of the {@linkcode IPromptReference} that pertains
+ * The special case of the {@linkcode IPromptReferenceBase} that pertains
  * to a file resource on the disk.
  */
-export interface IPromptFileReference extends IPromptReference {
+export interface IPromptFileReference extends IPromptReferenceBase {
 	readonly type: 'file';
+
+	/**
+	 * Subtype of a file reference, - either a prompt `#file` variable,
+	 * or a `markdown link` (e.g., `[caption](/path/to/file.md)`).
+	 */
+	readonly subtype: 'prompt' | 'markdown';
 }
+
+/**
+ * List of all known prompt reference types.
+ */
+export type IPromptReference = IPromptFileReference;
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/expectedReference.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/expectedReference.ts
index 45bd8552489d..4cd4232bcd47 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/expectedReference.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/expectedReference.ts
@@ -8,7 +8,7 @@ import { URI } from '../../../../../../../base/common/uri.js';
 import { Range } from '../../../../../../../editor/common/core/range.js';
 import { assertDefined } from '../../../../../../../base/common/types.js';
 import { ParseError } from '../../../../common/promptFileReferenceErrors.js';
-import { IPromptFileReference } from '../../../../common/promptSyntax/parsers/types.js';
+import { IPromptReference } from '../../../../common/promptSyntax/parsers/types.js';
 import { TErrorCondition } from '../../../../common/promptSyntax/parsers/basePromptParser.js';
 
 /**
@@ -63,7 +63,7 @@ export class ExpectedReference {
 	/**
 	 * Validate that the provided reference is equal to this object.
 	 */
-	public validateEqual(other: IPromptFileReference) {
+	public validateEqual(other: IPromptReference) {
 		const { uri, text, path, childrenOrError = [] } = this.options;
 		const errorPrefix = `[${uri}] `;
 

From 8f7b53d806fcfb523517be7f6f844c5d80d69a53 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Mon, 10 Mar 2025 18:19:48 -0600
Subject: [PATCH 0870/1815] allow for empty #variable data

---
 .../editor/test/common/utils/testDecoder.ts   |   8 +-
 .../promptSyntax/codecs/chatPromptDecoder.ts  | 142 +-----------------
 .../codecs/parsers/promptVariableParser.ts    |  45 ++----
 .../codecs/tokens/promptVariable.ts           |  20 ++-
 .../codecs/chatPromptCodec.test.ts            |   8 +-
 .../codecs/chatPromptDecoder.test.ts          |   7 +-
 .../codecs/tokens/fileReference.test.ts       |   7 +-
 7 files changed, 44 insertions(+), 193 deletions(-)

diff --git a/src/vs/editor/test/common/utils/testDecoder.ts b/src/vs/editor/test/common/utils/testDecoder.ts
index e0127aacdc00..78ce39a310b2 100644
--- a/src/vs/editor/test/common/utils/testDecoder.ts
+++ b/src/vs/editor/test/common/utils/testDecoder.ts
@@ -200,16 +200,16 @@ export class TestDecoder<T extends BaseToken, D extends BaseDecoder<T>> extends
 	) {
 		for (let i = 0; i < expectedTokens.length; i++) {
 			const expectedToken = expectedTokens[i];
-			const receivedtoken = receivedTokens[i];
+			const receivedToken = receivedTokens[i];
 
 			assertDefined(
-				receivedtoken,
+				receivedToken,
 				`Expected token '${i}' to be '${expectedToken}', got 'undefined'.`,
 			);
 
 			assert(
-				receivedtoken.equals(expectedToken),
-				`Expected token '${i}' to be '${expectedToken}', got '${receivedtoken}'.`,
+				receivedToken.equals(expectedToken),
+				`Expected token '${i}' to be '${expectedToken}', got '${receivedToken}'.`,
 			);
 		}
 
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/chatPromptDecoder.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/chatPromptDecoder.ts
index 05394532793c..b1bd3de2b923 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/chatPromptDecoder.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/chatPromptDecoder.ts
@@ -19,146 +19,6 @@ import { MarkdownDecoder, TMarkdownToken } from '../../../../../../editor/common
  */
 export type TChatPromptToken = MarkdownLink | PromptVariable | PromptVariableWithData;
 
-
-// TODO: @lego - cleanup
-// /**
-//  * The Parser responsible for processing a `prompt variable name` syntax from
-//  * a sequence of tokens (e.g., `#variable:`).
-//  *
-//  * The parsing process starts with single `#` token, then can accept `file` word,
-//  * followed by the `:` token, resulting in the tokens sequence equivalent to
-//  * the `#file:` text sequence. In this successful case, the parser transitions into
-//  * the {@linkcode PartialPromptFileReference} parser to continue the parsing process.
-//  */
-// class PartialPromptVariableName extends ParserBase<TMarkdownToken, PartialPromptVariableName | PartialPromptFileReference | FileReference> {
-// 	constructor(token: Hash) {
-// 		super([token]);
-// 	}
-
-// 	public accept(token: TMarkdownToken): TAcceptTokenResult<PartialPromptVariableName | PartialPromptFileReference | FileReference> {
-// 		// given we currently hold the `#` token, if we receive a `file` word,
-// 		// we can successfully proceed to the next token in the sequence
-// 		if (token instanceof Word) {
-// 			if (token.text === 'file') {
-// 				this.currentTokens.push(token);
-
-// 				return {
-// 					result: 'success',
-// 					nextParser: this,
-// 					wasTokenConsumed: true,
-// 				};
-// 			}
-
-// 			return {
-// 				result: 'failure',
-// 				wasTokenConsumed: false,
-// 			};
-// 		}
-
-// 		// if we receive the `:` token, we can successfully proceed to the next
-// 		// token in the sequence `only if` the previous token was a `file` word
-// 		// therefore for currently tokens sequence equivalent to the `#file` text
-// 		if (token instanceof Colon) {
-// 			const lastToken = this.currentTokens[this.currentTokens.length - 1];
-
-// 			if (lastToken instanceof Word) {
-// 				this.currentTokens.push(token);
-
-// 				return {
-// 					result: 'success',
-// 					nextParser: new PartialPromptFileReference(this.currentTokens),
-// 					wasTokenConsumed: true,
-// 				};
-// 			}
-// 		}
-
-// 		// all other cases are failures and we don't consume the offending token
-// 		return {
-// 			result: 'failure',
-// 			wasTokenConsumed: false,
-// 		};
-// 	}
-// }
-
-// /**
-//  * List of characters that stop a prompt variable sequence.
-//  */
-// const PROMPT_FILE_REFERENCE_STOP_CHARACTERS: readonly string[] = [Space, Tab, CarriageReturn, NewLine, VerticalTab, FormFeed]
-// 	.map((token) => { return token.symbol; });
-
-// /**
-//  * Parser responsible for processing the `file reference` syntax part from
-//  * a sequence of tokens (e.g., #variable:`./some/file/path.md`).
-//  *
-//  * The parsing process starts with the sequence of `#`, `file`, and `:` tokens,
-//  * then can accept a sequence of tokens until one of the tokens defined in
-//  * the {@linkcode PROMPT_FILE_REFERENCE_STOP_CHARACTERS} list is encountered.
-//  * This sequence of tokens is treated as a `file path` part of the `#file:` variable,
-//  * and in the successful case, the parser transitions into the {@linkcode FileReference}
-//  * token which signifies the end of the file reference text parsing process.
-//  */
-// class PartialPromptFileReference extends ParserBase<TMarkdownToken, PartialPromptFileReference | FileReference> {
-// 	/**
-// 	 * Set of tokens that were accumulated so far.
-// 	 */
-// 	private readonly fileReferenceTokens: (Hash | Word | Colon)[];
-
-// 	constructor(tokens: (Hash | Word | Colon)[]) {
-// 		super([]);
-
-// 		this.fileReferenceTokens = tokens;
-// 	}
-
-// 	/**
-// 	 * List of tokens that were accumulated so far.
-// 	 */
-// 	public override get tokens(): readonly (Hash | Word | Colon)[] {
-// 		return [...this.fileReferenceTokens, ...this.currentTokens];
-// 	}
-
-// 	/**
-// 	 * Return the `FileReference` instance created from the current object.
-// 	 */
-// 	public asFileReference(): FileReference {
-// 		// use only tokens in the `currentTokens` list to
-// 		// create the path component of the file reference
-// 		const path = this.currentTokens
-// 			.map((token) => { return token.text; })
-// 			.join('');
-
-// 		const firstToken = this.tokens[0];
-
-// 		const range = new Range(
-// 			firstToken.range.startLineNumber,
-// 			firstToken.range.startColumn,
-// 			firstToken.range.startLineNumber,
-// 			firstToken.range.startColumn + FileReference.TOKEN_START.length + path.length,
-// 		);
-
-// 		return new FileReference(range, path);
-// 	}
-
-// 	public accept(token: TMarkdownToken): TAcceptTokenResult<PartialPromptFileReference | FileReference> {
-// 		// any of stop characters is are breaking a prompt variable sequence
-// 		if (PROMPT_FILE_REFERENCE_STOP_CHARACTERS.includes(token.text)) {
-// 			return {
-// 				result: 'success',
-// 				wasTokenConsumed: false,
-// 				nextParser: this.asFileReference(),
-// 			};
-// 		}
-
-// 		// any other token can be included in the sequence so accumulate
-// 		// it and continue with using the current parser instance
-// 		this.currentTokens.push(token);
-// 		return {
-// 			result: 'success',
-// 			wasTokenConsumed: true,
-// 			nextParser: this,
-// 		};
-// 	}
-// }
-
 /**
  * Decoder for the common chatbot prompt message syntax.
  * For instance, the file references `#file:./path/file.md` are handled by this decoder.
@@ -180,7 +40,7 @@ export class ChatPromptDecoder extends BaseDecoder<TChatPromptToken, TMarkdownTo
 	protected override onStreamData(token: TMarkdownToken): void {
 		// prompt variables always start with the `#` character, hence
 		// initiate a parser object if we encounter respective token and
-		/// there is no active parser object present at the moment
+		// there is no active parser object present at the moment
 		if (token instanceof Hash && !this.current) {
 			this.current = new PartialPromptVariableName(token);
 
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
index e7681e064c85..d7fddaf9a06f 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/parsers/promptVariableParser.ts
@@ -128,8 +128,6 @@ export class PartialPromptVariableName extends ParserBase<TSimpleToken, PartialP
 		const firstToken = this.currentTokens[0];
 		const lastToken = this.currentTokens[this.currentTokens.length - 1];
 
-		// TODO: @lego - validate that first and last tokens are defined?
-
 		// render the characters above into strings, excluding the starting `#` character
 		const variableNameTokens = this.currentTokens.slice(1);
 		const variableName = variableNameTokens.map(pick('text')).join('');
@@ -153,7 +151,7 @@ export class PartialPromptVariableName extends ParserBase<TSimpleToken, PartialP
 export class PartialPromptVariableWithData extends ParserBase<TSimpleToken, PartialPromptVariableWithData | PromptVariableWithData> {
 
 	constructor(tokens: readonly TSimpleToken[]) {
-		const firstToken = tokens;
+		const firstToken = tokens[0];
 		const lastToken = tokens[tokens.length - 1];
 
 		// sanity checks of our expectations about the tokens list
@@ -180,38 +178,30 @@ export class PartialPromptVariableWithData extends ParserBase<TSimpleToken, Part
 			// in any case, success of failure below, this is an end of the parsing process
 			this.isConsumed = true;
 
-			// if no tokens received after initial set of tokens, fail
-			if (this.currentTokens.length === this.startTokensCount) {
-				return {
-					result: 'failure',
-					wasTokenConsumed: false,
-				};
-			}
+			const firstToken = this.currentTokens[0];
+			const lastToken = this.currentTokens[this.currentTokens.length - 1];
 
 			// tokens representing variable name without the `#` character at the start and
 			// the `:` data separator character at the end
 			const variableNameTokens = this.currentTokens.slice(1, this.startTokensCount - 1);
 			// tokens representing variable data without the `:` separator character at the start
 			const variableDataTokens = this.currentTokens.slice(this.startTokensCount);
+			// compute the full range of the variable token
+			const fullRange = new Range(
+				firstToken.range.startLineNumber,
+				firstToken.range.startColumn,
+				lastToken.range.endLineNumber,
+				lastToken.range.endColumn,
+			);
 
 			// render the characters above into strings
 			const variableName = variableNameTokens.map(pick('text')).join('');
 			const variableData = variableDataTokens.map(pick('text')).join('');
 
-			const firstToken = this.currentTokens[0];
-			const lastToken = this.currentTokens[this.currentTokens.length - 1];
-
-			// TODO: @lego - validate that first and last tokens are defined?
-
 			return {
 				result: 'success',
 				nextParser: new PromptVariableWithData(
-					new Range(
-						firstToken.range.startLineNumber,
-						firstToken.range.startColumn,
-						lastToken.range.endLineNumber,
-						lastToken.range.endColumn,
-					),
+					fullRange,
 					variableName,
 					variableData,
 				),
@@ -219,7 +209,7 @@ export class PartialPromptVariableWithData extends ParserBase<TSimpleToken, Part
 			};
 		}
 
-		// otherwise, a valid data character - the data can contain almost any character,
+		// otherwise, token is a valid data character - the data can contain almost any character,
 		// including `:` and `#`, hence add it to the list of the current tokens and continue
 		this.currentTokens.push(token);
 
@@ -232,17 +222,8 @@ export class PartialPromptVariableWithData extends ParserBase<TSimpleToken, Part
 
 	/**
 	 * Try to convert current parser instance into a fully-parsed {@link asPromptVariableWithData} token.
-	 *
-	 * @throws if sequence of tokens received so far do not constitute a valid prompt variable with data.
 	 */
 	public asPromptVariableWithData(): PromptVariableWithData {
-		// if no tokens received after initial set of tokens, fail
-		// TODO: @lego - allow this to emit `#file:` tokens? (without path)
-		assert(
-			this.currentTokens.length > this.startTokensCount,
-			`No 'data' part of the token found.`,
-		);
-
 		// tokens representing variable name without the `#` character at the start and
 		// the `:` data separator character at the end
 		const variableNameTokens = this.currentTokens.slice(1, this.startTokensCount - 1);
@@ -256,8 +237,6 @@ export class PartialPromptVariableWithData extends ParserBase<TSimpleToken, Part
 		const firstToken = this.currentTokens[0];
 		const lastToken = this.currentTokens[this.currentTokens.length - 1];
 
-		// TODO: @lego - validate that first and last tokens are defined?
-
 		return new PromptVariableWithData(
 			new Range(
 				firstToken.range.startLineNumber,
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts
index 148b80468897..49e8c02d0da6 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts
@@ -5,9 +5,9 @@
 
 import { PromptToken } from './promptToken.js';
 import { assert } from '../../../../../../../base/common/assert.js';
-import { INVALID_NAME_CHARACTERS, STOP_CHARACTERS } from '../parsers/promptVariableParser.js';
 import { IRange, Range } from '../../../../../../../editor/common/core/range.js';
 import { BaseToken } from '../../../../../../../editor/common/codecs/baseToken.js';
+import { INVALID_NAME_CHARACTERS, STOP_CHARACTERS } from '../parsers/promptVariableParser.js';
 
 /**
  * All prompt variables start with `#` character.
@@ -30,15 +30,12 @@ export class PromptVariable extends PromptToken {
 		 */
 		public readonly name: string,
 	) {
+		// sanity check of characters used in the provided variable name
 		for (const character of name) {
 			assert(
-				(INVALID_NAME_CHARACTERS.includes(character) === false),
-				`File name cannot contain character '${character}', got '${name}'.`,
-			);
-
-			assert(
+				(INVALID_NAME_CHARACTERS.includes(character) === false) &&
 				(STOP_CHARACTERS.includes(character) === false),
-				`File name cannot contain character '${character}', got '${name}'.`,
+				`Variable 'name' cannot contain character '${character}', got '${name}'.`,
 			);
 		}
 
@@ -83,7 +80,6 @@ export class PromptVariable extends PromptToken {
  * Represents a {@link PromptVariable} with additional data token in a prompt text.
  * (e.g., `#variable:/path/to/file.md`)
  */
-// TODO: @legomushroom - allow for empty `path`s?
 export class PromptVariableWithData extends PromptVariable {
 	constructor(
 		fullRange: Range,
@@ -98,6 +94,14 @@ export class PromptVariableWithData extends PromptVariable {
 		public readonly data: string,
 	) {
 		super(fullRange, name);
+
+		// sanity check of characters used in the provided variable data
+		for (const character of data) {
+			assert(
+				(STOP_CHARACTERS.includes(character) === false),
+				`Variable 'data' cannot contain character '${character}', got '${data}'.`,
+			);
+		}
 	}
 
 	/**
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/codecs/chatPromptCodec.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/codecs/chatPromptCodec.test.ts
index dceacea29d5c..b063215ec7df 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/codecs/chatPromptCodec.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/codecs/chatPromptCodec.test.ts
@@ -45,11 +45,11 @@ export class TestChatPromptCodec extends TestDecoder<TChatPromptToken, ChatPromp
 suite('ChatPromptCodec', () => {
 	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
 
-	test('produces expected tokens', async () => {
+	test('• produces expected tokens', async () => {
 		const test = testDisposables.add(new TestChatPromptCodec());
 
 		await test.run(
-			'#file:/etc/hosts some text\t\n  for #file:./README.md\t testing\n ✔ purposes\n#file:LICENSE.md ✌ \t#file:.gitignore\n\n\n\t   #file:/Users/legomushroom/repos/vscode   ',
+			'#file:/etc/hosts some text\t\n  for #file:./README.md\t testing\n ✔ purposes\n#file:LICENSE.md ✌ \t#file:.gitignore\n\n\n\t   #file:/Users/legomushroom/repos/vscode   \n\nsomething #file:\tsomewhere\n',
 			[
 				new FileReference(
 					new Range(1, 1, 1, 1 + 16),
@@ -71,6 +71,10 @@ suite('ChatPromptCodec', () => {
 					new Range(7, 5, 7, 5 + 38),
 					'/Users/legomushroom/repos/vscode',
 				),
+				new FileReference(
+					new Range(9, 11, 9, 11 + 6),
+					'',
+				),
 			],
 		);
 	});
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/codecs/chatPromptDecoder.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/codecs/chatPromptDecoder.test.ts
index 1f73d7febae4..6f009d574683 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/codecs/chatPromptDecoder.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/codecs/chatPromptDecoder.test.ts
@@ -46,7 +46,7 @@ export class TestChatPromptDecoder extends TestDecoder<TChatPromptToken, ChatPro
 suite('ChatPromptDecoder', () => {
 	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
 
-	test('produces expected tokens', async () => {
+	test('• produces expected tokens', async () => {
 		const test = testDisposables.add(
 			new TestChatPromptDecoder(),
 		);
@@ -59,6 +59,7 @@ suite('ChatPromptDecoder', () => {
 			'## Heading Title',
 			' \t#file:a/b/c/filename2.md\t🖖\t#file:other-file.md',
 			' [#file:reference.md](./reference.md)some text #file:/some/file/with/absolute/path.md',
+			'text text #file: another text',
 		];
 
 		await test.run(
@@ -86,6 +87,10 @@ suite('ChatPromptDecoder', () => {
 					new Range(7, 48, 7, 48 + 38),
 					'/some/file/with/absolute/path.md',
 				),
+				new FileReference(
+					new Range(8, 11, 8, 11 + 6),
+					'',
+				),
 			],
 		);
 	});
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/codecs/tokens/fileReference.test.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/codecs/tokens/fileReference.test.ts
index 2e91084067f4..3478fd7d34d4 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/codecs/tokens/fileReference.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/codecs/tokens/fileReference.test.ts
@@ -13,11 +13,10 @@ import { FileReference } from '../../../../../common/promptSyntax/codecs/tokens/
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../../base/test/common/utils.js';
 import { PromptVariable, PromptVariableWithData } from '../../../../../common/promptSyntax/codecs/tokens/promptVariable.js';
 
-// TODO: @lego - add test name separators
 suite('FileReference', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
-	test('linkRange', () => {
+	test('• linkRange', () => {
 		const lineNumber = randomInt(100, 1);
 		const columnStartNumber = randomInt(100, 1);
 		const path = `/temp/test/file-${randomInt(Number.MAX_SAFE_INTEGER)}.txt`;
@@ -49,7 +48,7 @@ suite('FileReference', () => {
 		);
 	});
 
-	test('path', () => {
+	test('• path', () => {
 		const lineNumber = randomInt(100, 1);
 		const columnStartNumber = randomInt(100, 1);
 		const link = `/temp/test/file-${randomInt(Number.MAX_SAFE_INTEGER)}.txt`;
@@ -70,7 +69,7 @@ suite('FileReference', () => {
 		);
 	});
 
-	test('extends `PromptVariableWithData` and others', () => {
+	test('• extends `PromptVariableWithData` and others', () => {
 		const lineNumber = randomInt(100, 1);
 		const columnStartNumber = randomInt(100, 1);
 		const link = `/temp/test/file-${randomInt(Number.MAX_SAFE_INTEGER)}.txt`;

From 9cec336121af4119e8b78232bab8932556b4b41b Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Wed, 12 Mar 2025 12:53:35 -0700
Subject: [PATCH 0871/1815] fix path autocompletion trigger logic

---
 .../promptSyntax/codecs/tokens/fileReference.ts   |  2 +-
 .../promptSyntax/codecs/tokens/promptVariable.ts  | 15 +++++++++++++--
 .../languageFeatures/promptPathAutocompletion.ts  |  9 ++++-----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/fileReference.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/fileReference.ts
index 1dfdfdd8e9ef..fd04befbc575 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/fileReference.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/fileReference.ts
@@ -56,7 +56,7 @@ export class FileReference extends PromptVariableWithData {
 	 * Get the range of the `link` part of the token (e.g.,
 	 * the `/path/to/file.md` part of `#file:/path/to/file.md`).
 	 */
-	public get linkRange(): IRange {
+	public get linkRange(): IRange | undefined {
 		return super.dataRange;
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts
index 49e8c02d0da6..449926faa3e2 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/tokens/promptVariable.ts
@@ -125,17 +125,28 @@ export class PromptVariableWithData extends PromptVariable {
 	/**
 	 * Range of the `data` part of the variable.
 	 */
-	public get dataRange(): IRange {
+	public get dataRange(): IRange | undefined {
 		const { range } = this;
+
+		// calculate the start column number of the `data` part of the variable
 		const dataStartColumn = range.startColumn +
 			START_CHARACTER.length + this.name.length +
 			DATA_SEPARATOR.length;
 
-		return new Range(
+		// create `range` of the `data` part of the variable
+		const result = new Range(
 			range.startLineNumber,
 			dataStartColumn,
 			range.endLineNumber,
 			range.endColumn,
 		);
+
+		// if the resulting range is empty, return `undefined`
+		// because there is no `data` part present in the variable
+		if (result.isEmpty()) {
+			return undefined;
+		}
+
+		return result;
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptPathAutocompletion.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptPathAutocompletion.ts
index 1cabcacc6e95..26f630845d57 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptPathAutocompletion.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptPathAutocompletion.ts
@@ -244,21 +244,20 @@ export class PromptPathAutocompletion extends Disposable implements CompletionIt
 		// when character is `:`, there must be no link present yet
 		// otherwise the `:` was used in the middle of the link hence
 		// we don't want to provide suggestions for that
-		if (character === ':' && linkRange !== undefined) {
+		if ((character === ':') && (linkRange !== undefined)) {
 			return [];
 		}
 
 		// otherwise when the `.` character is present, it is inside the link part
 		// of the reference, hence we always expect the link range to be present
-		if (character === '.' && linkRange === undefined) {
+		if ((character === '.') && (linkRange === undefined)) {
 			return [];
 		}
 
 		const suggestions = await this.getFolderSuggestions(fileFolderUri);
 
-		// replacement range of the suggestions
-		// when character is `.` we want to also replace it, because we add
-		// the `./` at the beginning of all the relative paths
+		// replacement range for suggestions; when character is `.`, we want to also
+		// replace it, because we add `./` at the beginning of all the relative paths
 		const startColumnOffset = (character === '.') ? 1 : 0;
 		const range = {
 			...fileReference.range,

From 07cbc588fb1ce681c3f7b5614d51f92ff168b059 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Wed, 12 Mar 2025 13:37:56 -0700
Subject: [PATCH 0872/1815] fix `pick` utility unit tests on linux and windows

---
 src/vs/base/test/common/arrays.test.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vs/base/test/common/arrays.test.ts b/src/vs/base/test/common/arrays.test.ts
index 8c4249b6a44f..b9a18cffdf26 100644
--- a/src/vs/base/test/common/arrays.test.ts
+++ b/src/vs/base/test/common/arrays.test.ts
@@ -403,16 +403,16 @@ suite('Arrays', () => {
 	suite('pick', () => {
 		suite('object', () => {
 			test('numbers', () => {
-				const array = [{ v: 3, foo: 'a' }, { v: 5, foo: 'b' }, { v: 2, foo: 'c' }, { v: 2, foo: 'd' }, { v: 17, bar: '1' }, { v: NaN, baz: '10' }];
+				const array = [{ v: 3, foo: 'a' }, { v: 5, foo: 'b' }, { v: 2, foo: 'c' }, { v: 2, foo: 'd' }, { v: 17, bar: '1' }, { v: -100, baz: '10' }];
 
 				assert.deepStrictEqual(
 					array.map(pick('v')),
-					[3, 5, 2, 2, 17, NaN],
+					[3, 5, 2, 2, 17, -100],
 				);
 			});
 
 			test('strings', () => {
-				const array = [{ v: 3, foo: 'a' }, { v: 5, foo: 'b' }, { v: 2, foo: 'c' }, { v: 2, foo: 'd' }, { v: 17, bar: '1' }, { v: NaN, baz: '10' }, { foo: '12' }];
+				const array = [{ v: 3, foo: 'a' }, { v: 5, foo: 'b' }, { v: 2, foo: 'c' }, { v: 2, foo: 'd' }, { v: 17, bar: '1' }, { v: -100, baz: '10' }, { foo: '12' }];
 
 				assert.deepStrictEqual(
 					array.map(pick('foo')),
@@ -421,7 +421,7 @@ suite('Arrays', () => {
 			});
 
 			test('booleans', () => {
-				const array = [{ v: 3, foo: 'a' }, { v: 5, foo: 'b' }, { v: 2, foo: 'c' }, { v: 2, foo: 'd' }, { v: 17, bar: true }, { v: NaN, bar: false }, { bar: false }];
+				const array = [{ v: 3, foo: 'a' }, { v: 5, foo: 'b' }, { v: 2, foo: 'c' }, { v: 2, foo: 'd' }, { v: 17, bar: true }, { v: -100, bar: false }, { bar: false }];
 
 				assert.deepStrictEqual(
 					array.map(pick('bar')),

From dc8115b92eee4310555654f2aaf138c9c961aa4b Mon Sep 17 00:00:00 2001
From: amunger <>
Date: Wed, 12 Mar 2025 15:00:26 -0700
Subject: [PATCH 0873/1815] dont use cell editor integration for navigation
 within cells either

---
 .../chatEditingNotebookEditorIntegration.ts   | 74 ++++++++-----------
 1 file changed, 32 insertions(+), 42 deletions(-)

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 024b4e642bef..749ac686c8c0 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
@@ -296,27 +296,26 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 			return undefined;
 		}
 		const change = firstOrLast ? changes[0] : changes[changes.length - 1];
-		this._revealChange(change, firstOrLast);
+		this._revealChange(change, firstOrLast ? 0 : this.lastChangeIndex(change));
 	}
 
-	private _revealChange(change: ICellDiffInfo, firstOrLast: boolean = true) {
+	private lastChangeIndex(change: ICellDiffInfo): number {
+		if (change.type === 'modified') {
+			return change.diff.get().changes.length - 1;
+		}
+		return 0;
+	}
+
+	private _revealChange(change: ICellDiffInfo, indexInCell: number) {
 		switch (change.type) {
 			case 'insert':
 			case 'modified':
 				{
-					const index = firstOrLast || change.type === 'insert' ? 0 : change.diff.get().changes.length - 1;
-					// TODO: check if this breaks for inserted cells
-					const textChange = change.diff.get().changes[index];
-					const cellIntegration = this.getCell(change.modifiedCellIndex);
-					if (cellIntegration) {
-						cellIntegration.reveal(firstOrLast);
-						this._currentChange.set({ change: change, index }, undefined);
-					} else {
-						const cellViewModel = this.getCellViewModel(change);
-						if (cellViewModel) {
-							this.revealChangeInView(cellViewModel, textChange.modified);
-							this._currentChange.set({ change: change, index }, undefined);
-						}
+					const textChange = change.diff.get().changes[indexInCell];
+					const cellViewModel = this.getCellViewModel(change);
+					if (cellViewModel) {
+						this.revealChangeInView(cellViewModel, textChange.modified);
+						this._currentChange.set({ change: change, index: indexInCell }, undefined);
 					}
 
 					return true;
@@ -344,7 +343,7 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 
 	private async revealChangeInView(cell: ICellViewModel, lines: LineRange): Promise<void> {
 		await this.notebookEditor.focusNotebookCell(cell, 'editor', { focusEditorLine: lines.startLineNumber });
-		await this.notebookEditor.revealRangeInCenterAsync(cell, new Range(lines.startLineNumber, 0, lines.endLineNumberExclusive, 0));
+		await this.notebookEditor.revealRangeInCenterIfOutsideViewportAsync(cell, new Range(lines.startLineNumber, 0, lines.endLineNumberExclusive, 0));
 	}
 
 	next(wrap: boolean): boolean {
@@ -354,28 +353,23 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 			const firstChange = changes[0];
 
 			if (firstChange) {
-				return this._revealChange(firstChange);
+				return this._revealChange(firstChange, 0);
 			}
 
 			return false;
 		}
 
 		// go to next
-		// first check if we are at the end of the current change
 		switch (currentChange.change.type) {
 			case 'modified':
 				{
-					const cellIntegration = this.getCell(currentChange.change.modifiedCellIndex);
-					if (cellIntegration) {
-						if (cellIntegration.next(false)) {
-							this._currentChange.set({ change: currentChange.change, index: cellIntegration.currentIndex.get() }, undefined);
-							return true;
-						}
-					}
+					// first check if we are at the end of the current change
+					const isLastChangeInCell = currentChange.index === this.lastChangeIndex(currentChange.change);
+					const index = isLastChangeInCell ? 0 : currentChange.index + 1;
+					const change = isLastChangeInCell ? changes[changes.indexOf(currentChange.change) + 1] : currentChange.change;
 
-					const nextChange = changes[changes.indexOf(currentChange.change) + 1];
-					if (nextChange) {
-						return this._revealChange(nextChange, true);
+					if (change) {
+						return this._revealChange(change, index);
 					}
 				}
 				break;
@@ -385,7 +379,7 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 					// go to next change directly
 					const nextChange = changes[changes.indexOf(currentChange.change) + 1];
 					if (nextChange) {
-						return this._revealChange(nextChange, true);
+						return this._revealChange(nextChange, 0);
 					}
 				}
 				break;
@@ -406,7 +400,7 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 		if (!currentChange) {
 			const lastChange = changes[changes.length - 1];
 			if (lastChange) {
-				return this._revealChange(lastChange, false);
+				return this._revealChange(lastChange, this.lastChangeIndex(lastChange));
 			}
 
 			return false;
@@ -417,17 +411,13 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 		switch (currentChange.change.type) {
 			case 'modified':
 				{
-					const cellIntegration = this.getCell(currentChange.change.modifiedCellIndex);
-					if (cellIntegration) {
-						if (cellIntegration.previous(false)) {
-							this._currentChange.set({ change: currentChange.change, index: cellIntegration.currentIndex.get() }, undefined);
-							return true;
-						}
-					}
+					// first check if we are at the first change within the cell
+					const isFirstChangeInCell = currentChange.index === 0;
+					const change = isFirstChangeInCell ? changes[changes.indexOf(currentChange.change) - 1] : currentChange.change;
 
-					const nextChange = changes[changes.indexOf(currentChange.change) - 1];
-					if (nextChange) {
-						return this._revealChange(nextChange, false);
+					if (change) {
+						const index = isFirstChangeInCell ? this.lastChangeIndex(change) : currentChange.index - 1;
+						return this._revealChange(change, index);
 					}
 				}
 				break;
@@ -437,7 +427,7 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 					// go to previous change directly
 					const prevChange = changes[changes.indexOf(currentChange.change) - 1];
 					if (prevChange) {
-						return this._revealChange(prevChange, false);
+						return this._revealChange(prevChange, this.lastChangeIndex(prevChange));
 					}
 				}
 				break;
@@ -448,7 +438,7 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 		if (wrap) {
 			const lastChange = changes[changes.length - 1];
 			if (lastChange) {
-				return this._revealChange(lastChange, false);
+				return this._revealChange(lastChange, this.lastChangeIndex(lastChange));
 			}
 		}
 

From 6e8c48dacfa02a9dea6e432ddad3b2df338c0182 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 12 Mar 2025 23:02:09 +0100
Subject: [PATCH 0874/1815] refactor gallery service (#243395)

---
 .../common/extensionGalleryService.ts         | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
index 9ec0ff32f905..17f5e9ede924 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
@@ -1856,7 +1856,48 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		return { malicious, deprecated, search, extensionsEnabledWithPreRelease };
 	}
 
+	private extensionGalleryManifestPromise: Promise<IExtensionGalleryManifest> | undefined;
 	private async getExtensionGalleryManifest(): Promise<IExtensionGalleryManifest> {
+		if (!this.extensionGalleryManifestPromise) {
+			const configuredServiceUrl = this.configurationService.inspect<string>('extensions.gallery.serviceUrl').userLocalValue;
+			if (configuredServiceUrl) {
+				this.extensionGalleryManifestPromise = this.getExtensionGalleryManifestFromServiceUrl(configuredServiceUrl);
+			} else {
+				this.extensionGalleryManifestPromise = this.getExtensionGalleryManifestFromProduct();
+			}
+		}
+		return this.extensionGalleryManifestPromise;
+	}
+
+	private async getExtensionGalleryManifestFromServiceUrl(url: string): Promise<IExtensionGalleryManifest> {
+		const commonHeaders = await this.commonHeadersPromise;
+		const headers = {
+			...commonHeaders,
+			'Content-Type': 'application/json',
+			'Accept-Encoding': 'gzip',
+		};
+
+		try {
+			const context = await this.requestService.request({
+				type: 'GET',
+				url,
+				headers,
+			}, CancellationToken.None);
+
+			const extensionGalleryManifest = await asJson<IExtensionGalleryManifest>(context);
+
+			if (!extensionGalleryManifest) {
+				throw new Error('Unable to retrieve extension gallery manifest.');
+			}
+
+			return extensionGalleryManifest;
+		} catch (error) {
+			this.logService.error(error);
+			throw error;
+		}
+	}
+
+	private async getExtensionGalleryManifestFromProduct(): Promise<IExtensionGalleryManifest> {
 		const extensionsGallery = this.productService.extensionsGallery as ExtensionGalleryConfig | undefined;
 		if (!extensionsGallery?.serviceUrl) {
 			throw new Error('No extension gallery service configured.');

From 8dbf7504d5d788839660f4a40591f6384d49c92a Mon Sep 17 00:00:00 2001
From: Josh Spicer <23246594+joshspicer@users.noreply.github.com>
Date: Wed, 12 Mar 2025 15:26:54 -0700
Subject: [PATCH 0875/1815] @vscode/policy-watcher 1.2.1 (#243387)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a6f99636b8f6..5563f531f7fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
         "@types/semver": "^7.5.8",
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.0",
-        "@vscode/policy-watcher": "^1.2.0",
+        "@vscode/policy-watcher": "^1.2.1",
         "@vscode/proxy-agent": "^0.32.0",
         "@vscode/ripgrep": "^1.15.11",
         "@vscode/spdlog": "^0.15.0",
@@ -2830,9 +2830,9 @@
       }
     },
     "node_modules/@vscode/policy-watcher": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.2.0.tgz",
-      "integrity": "sha512-6QwVEx5ibKW/hXEiDHKcqF4jv5dE8QQUgfVX2J0sDg0YCPReo+MG1oxxKTsxP8XAH11xBgDIDM0TA0ZAYpJKHw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.2.1.tgz",
+      "integrity": "sha512-qOiIXyt0cSj2cngkhmU5VdpwoubRrsYzglaMW7NpSlvQ/IiX3xvmBXlzjmpSMPDLQ/CKyJkMz03CZmeXuGnmCQ==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index c6a731a184ad..fc59723d77de 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "@types/semver": "^7.5.8",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
-    "@vscode/policy-watcher": "^1.2.0",
+    "@vscode/policy-watcher": "^1.2.1",
     "@vscode/proxy-agent": "^0.32.0",
     "@vscode/ripgrep": "^1.15.11",
     "@vscode/spdlog": "^0.15.0",

From 33028c3db26b86cef2576e97e80e11c468323f69 Mon Sep 17 00:00:00 2001
From: Justin Chen <54879025+justschen@users.noreply.github.com>
Date: Wed, 12 Mar 2025 16:03:31 -0700
Subject: [PATCH 0876/1815] disable feedback setting (#243276)

* disable feedback setting

* reload when setting changed

* remove unused setting

* add policy and case when disabled and hit the button
---
 .../telemetry/common/telemetryService.ts      | 23 ++++++++++++++--
 .../issue/common/issue.contribution.ts        | 19 +++++++++++---
 .../electron-sandbox/issue.contribution.ts    | 26 +++++++++++--------
 .../browser/relauncher.contribution.ts        |  8 +++++-
 .../surveys/browser/nps.contribution.ts       |  6 +++--
 5 files changed, 63 insertions(+), 19 deletions(-)

diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
index 72a7ab576e5d..7c83051f3e65 100644
--- a/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/src/vs/platform/telemetry/common/telemetryService.ts
@@ -219,9 +219,28 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 			'default': TelemetryConfiguration.ON,
 			'restricted': true,
 			'scope': ConfigurationScope.APPLICATION,
-			'tags': ['usesOnlineServices', 'telemetry']
+			'tags': ['usesOnlineServices', 'telemetry'],
+			'policy': {
+				name: 'TelemetryLevel',
+				minimumVersion: '1.99',
+			}
 		}
-	}
+	},
+});
+
+Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
+	'id': TELEMETRY_SECTION_ID,
+	properties: {
+		'telemetry.disableFeedback': {
+			type: 'boolean',
+			default: false,
+			description: 'Disable feedback options.',
+			policy: {
+				name: 'DisableFeedback',
+				minimumVersion: '1.99',
+			}
+		},
+	},
 });
 
 // Deprecated telemetry setting
diff --git a/src/vs/workbench/contrib/issue/common/issue.contribution.ts b/src/vs/workbench/contrib/issue/common/issue.contribution.ts
index a2805613d961..43be68be59eb 100644
--- a/src/vs/workbench/contrib/issue/common/issue.contribution.ts
+++ b/src/vs/workbench/contrib/issue/common/issue.contribution.ts
@@ -3,16 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Disposable } from '../../../../base/common/lifecycle.js';
 import { localize, localize2 } from '../../../../nls.js';
 import { ICommandAction } from '../../../../platform/action/common/action.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
 import { CommandsRegistry, ICommandMetadata } from '../../../../platform/commands/common/commands.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { IWorkbenchIssueService, IssueReporterData } from './issue.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IssueReporterData, IWorkbenchIssueService } from './issue.js';
 
 const OpenIssueReporterActionId = 'workbench.action.openIssueReporter';
 const OpenIssueReporterApiId = 'vscode.openIssueReporter';
@@ -65,6 +66,18 @@ export class BaseIssueContribution extends Disposable implements IWorkbenchContr
 	) {
 		super();
 
+		if (configurationService.getValue<boolean>('telemetry.disableFeedback')) {
+			this._register(CommandsRegistry.registerCommand({
+				id: 'workbench.action.openIssueReporter',
+				handler: function (accessor) {
+					const data = accessor.get(INotificationService);
+					data.info('Feedback is disabled.');
+
+				},
+			}));
+			return;
+		}
+
 		if (!productService.reportIssueUrl) {
 			return;
 		}
diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issue.contribution.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issue.contribution.ts
index 4ff3e642e27b..9d0bcff49594 100644
--- a/src/vs/workbench/contrib/issue/electron-sandbox/issue.contribution.ts
+++ b/src/vs/workbench/contrib/issue/electron-sandbox/issue.contribution.ts
@@ -3,25 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { localize, localize2 } from '../../../../nls.js';
-import { registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
-import { IWorkbenchIssueService, IssueType, IIssueFormService } from '../common/issue.js';
-import { BaseIssueContribution } from '../common/issue.contribution.js';
+import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from '../../../../platform/quickinput/common/quickAccess.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Extensions, IWorkbenchContributionsRegistry } from '../../../common/contributions.js';
 import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
-import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IDisposable } from '../../../../base/common/lifecycle.js';
-import { IQuickAccessRegistry, Extensions as QuickAccessExtensions } from '../../../../platform/quickinput/common/quickAccess.js';
 import { IssueQuickAccess } from '../browser/issueQuickAccess.js';
-import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
-import { NativeIssueService } from './issueService.js';
-import './processMainService.js';
 import '../browser/issueTroubleshoot.js';
+import { BaseIssueContribution } from '../common/issue.contribution.js';
+import { IIssueFormService, IWorkbenchIssueService, IssueType } from '../common/issue.js';
+import { NativeIssueService } from './issueService.js';
 import { NativeIssueFormService } from './nativeIssueFormService.js';
+import './processMainService.js';
 
 //#region Issue Contribution
 registerSingleton(IWorkbenchIssueService, NativeIssueService, InstantiationType.Delayed);
@@ -35,6 +35,10 @@ class NativeIssueContribution extends BaseIssueContribution {
 	) {
 		super(productService, configurationService);
 
+		if (configurationService.getValue<boolean>('telemetry.disableFeedback')) {
+			return;
+		}
+
 		if (productService.reportIssueUrl) {
 			this._register(registerAction2(ReportPerformanceIssueUsingReporterAction));
 		}
diff --git a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
index e5b909b90e7b..aee4e52e6c37 100644
--- a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
+++ b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
@@ -30,6 +30,7 @@ interface IConfiguration extends IWindowsConfiguration {
 	security?: { workspace?: { trust?: { enabled?: boolean } }; restrictUNCAccess?: boolean };
 	window: IWindowSettings;
 	workbench?: { enableExperiments?: boolean };
+	telemetry?: { disableFeedback?: boolean };
 	_extensionsGallery?: { enablePPE?: boolean };
 	accessibility?: { verbosity?: { debug?: boolean } };
 }
@@ -48,7 +49,8 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 		'workbench.enableExperiments',
 		'_extensionsGallery.enablePPE',
 		'security.restrictUNCAccess',
-		'accessibility.verbosity.debug'
+		'accessibility.verbosity.debug',
+		'telemetry.disableFeedback'
 	];
 
 	private readonly titleBarStyle = new ChangeObserver<TitlebarStyle>('string');
@@ -63,6 +65,7 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 	private readonly enablePPEExtensionsGallery = new ChangeObserver('boolean');
 	private readonly restrictUNCAccess = new ChangeObserver('boolean');
 	private readonly accessibilityVerbosityDebug = new ChangeObserver('boolean');
+	private readonly telemetryDisableFeedback = new ChangeObserver('boolean');
 
 	constructor(
 		@IHostService private readonly hostService: IHostService,
@@ -149,6 +152,9 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 		// Profiles
 		processChanged(this.productService.quality !== 'stable' && this.enablePPEExtensionsGallery.handleChange(config._extensionsGallery?.enablePPE));
 
+		// Disable Feedback
+		processChanged(this.telemetryDisableFeedback.handleChange(config.telemetry?.disableFeedback));
+
 		if (askToRelaunch && changed && this.hostService.hasFocus) {
 			this.doConfirm(
 				isNative ?
diff --git a/src/vs/workbench/contrib/surveys/browser/nps.contribution.ts b/src/vs/workbench/contrib/surveys/browser/nps.contribution.ts
index ba0e35ef8490..8d5e219219ed 100644
--- a/src/vs/workbench/contrib/surveys/browser/nps.contribution.ts
+++ b/src/vs/workbench/contrib/surveys/browser/nps.contribution.ts
@@ -15,6 +15,7 @@ import { Severity, INotificationService, NotificationPriority } from '../../../.
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { URI } from '../../../../base/common/uri.js';
 import { platform } from '../../../../base/common/process.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 
 const PROBABILITY = 0.15;
 const SESSION_COUNT_KEY = 'nps/sessionCount';
@@ -29,9 +30,10 @@ class NPSContribution implements IWorkbenchContribution {
 		@INotificationService notificationService: INotificationService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IOpenerService openerService: IOpenerService,
-		@IProductService productService: IProductService
+		@IProductService productService: IProductService,
+		@IConfigurationService configurationService: IConfigurationService
 	) {
-		if (!productService.npsSurveyUrl) {
+		if (!productService.npsSurveyUrl || configurationService.getValue<boolean>('telemetry.disableFeedback')) {
 			return;
 		}
 

From b46b9de02f27350d1644f59eb6a289250b00a680 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Fri, 21 Feb 2025 13:01:10 -0800
Subject: [PATCH 0877/1815] II of the `MarkersProvider` class

---
 .../utils/createPromptFile.ts                 |   2 +-
 .../languageFeatures/markersProvider.ts       | 144 ++++++++++++++++++
 .../chat/common/promptFileReferenceErrors.ts  |  28 ++--
 .../promptSyntax/parsers/basePromptParser.ts  |   1 -
 .../promptSyntax/utils/promptFilesLocator.ts  |   2 +-
 5 files changed, 160 insertions(+), 17 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/browser/promptSyntax/languageFeatures/markersProvider.ts

diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/utils/createPromptFile.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/utils/createPromptFile.ts
index d449726d917d..710637d2fdff 100644
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/utils/createPromptFile.ts
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/utils/createPromptFile.ts
@@ -9,8 +9,8 @@ import { assert } from '../../../../../../../../base/common/assert.js';
 import { VSBuffer } from '../../../../../../../../base/common/buffer.js';
 import { dirname } from '../../../../../../../../base/common/resources.js';
 import { IFileService } from '../../../../../../../../platform/files/common/files.js';
-import { isPromptFile, PROMPT_FILE_EXTENSION } from '../../../../../../../../platform/prompts/common/constants.js';
 import { ICommandService } from '../../../../../../../../platform/commands/common/commands.js';
+import { isPromptFile, PROMPT_FILE_EXTENSION } from '../../../../../../../../platform/prompts/common/constants.js';
 
 /**
  * Options for the {@link createPromptFile} utility.
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/languageFeatures/markersProvider.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/languageFeatures/markersProvider.ts
new file mode 100644
index 000000000000..a58c56320b8a
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/promptSyntax/languageFeatures/markersProvider.ts
@@ -0,0 +1,144 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 '../../../../../../base/common/assert.js';
+import { ITextModel } from '../../../../../../editor/common/model.js';
+import { assertDefined } from '../../../../../../base/common/types.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { IPromptsService } from '../../../common/promptSyntax/service/types.js';
+import { IPromptFileReference } from '../../../common/promptSyntax/parsers/types.js';
+import { TextModelPromptParser } from '../../../common/promptSyntax/parsers/textModelPromptParser.js';
+import { IMarkerData, IMarkerService, MarkerSeverity } from '../../../../../../platform/markers/common/markers.js';
+import { FailedToResolveContentsStream, NotPromptFile, ParseError, RecursiveReference } from '../../../common/promptFileReferenceErrors.js';
+
+/**
+ * TODO: @legomushroom
+ */
+const MARKERS_OWNER_ID = 'reusable-prompts-syntax';
+
+/**
+ * TODO: @legomushroom
+ */
+// TODO: @lego - move under /common
+export class MarkersProvider extends Disposable {
+	/**
+	 * TODO: @legomushroom
+	 */
+	private readonly parser: TextModelPromptParser;
+
+	constructor(
+		private readonly editor: ITextModel,
+		@IMarkerService private readonly markerService: IMarkerService,
+		@IPromptsService private readonly promptsService: IPromptsService,
+	) {
+		super();
+
+		this.parser = this.promptsService
+			.getSyntaxParserFor(this.editor)
+			.onUpdate(this.updateMarkers.bind(this))
+			.onDispose(this.dispose.bind(this));
+
+		// TODO @legomushroom - uncomment?
+		// this.updateMarkers();
+	}
+
+	/**
+	 * TODO: @legomushroom
+	 */
+	private async updateMarkers() {
+		// ensure that parsing process is settled
+		await this.parser.allSettled();
+
+		// clean up all previously added markers
+		this.markerService.remove(MARKERS_OWNER_ID, [this.editor.uri]);
+
+		const markers: IMarkerData[] = [];
+		for (const link of this.parser.allReferences) {
+			const { errorCondition, linkRange } = link;
+
+			if (!errorCondition || !linkRange) {
+				continue;
+			}
+
+			// the `NotPromptFile` error is allowed because we allow users
+			// to include non-prompt file links in the prompt files
+			// note! this check also handles the `FolderReference` error
+			if (errorCondition instanceof NotPromptFile) {
+				continue;
+			}
+
+			markers.push(toMarker(link));
+		}
+
+		this.markerService.changeOne(
+			MARKERS_OWNER_ID,
+			this.editor.uri,
+			markers,
+		);
+	}
+}
+
+/**
+ * TODO: @legomushroom
+ */
+// TODO: @legomushroom - add @throws info
+const toMarker = (
+	link: IPromptFileReference,
+): IMarkerData => {
+	const { errorCondition, linkRange } = link;
+
+	// a sanity check because this function must be
+	// used only if these attributes are present
+	assertDefined(
+		errorCondition,
+		'Error condition must to be defined.',
+	);
+	assertDefined(
+		linkRange,
+		'Link range must to be defined.',
+	);
+	assert(
+		!(errorCondition instanceof NotPromptFile),
+		'Error must not be of "not prompt file" type.',
+	);
+
+	// `FailedToResolveContentsStream` error check takes into account the `OpenFailed` error too
+	const severity = (errorCondition instanceof FailedToResolveContentsStream)
+		? MarkerSeverity.Error
+		: MarkerSeverity.Warning;
+
+	return {
+		message: getErrorMessage(errorCondition),
+		severity,
+		...linkRange,
+	};
+};
+
+/**
+ * TODO: @legomushroom
+ */
+// TODO: @legomushroom - add @throws info
+// TODO: @legomushroom - localize or reuse existing messages
+const getErrorMessage = (
+	error: ParseError,
+): string => {
+	// a sanity check because this function must be
+	// used only if error has correct type
+	assert(
+		!(error instanceof NotPromptFile),
+		'Error must not be of "not prompt file" type.',
+	);
+
+	// `FailedToResolveContentsStream` error takes into account the `OpenFailed` error too
+	if (error instanceof FailedToResolveContentsStream) {
+		return `The file '${error.uri.fsPath}' is not found.`;
+	}
+
+	if (error instanceof RecursiveReference) {
+		return 'The file contains recursive child reference that will be ignored.';
+	}
+
+	return `An unexpected error occurred: ${error.message}`;
+};
diff --git a/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
index 84e7d62551b6..5f75ba3da0d2 100644
--- a/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
+++ b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
@@ -41,36 +41,36 @@ export abstract class ParseError extends Error {
 }
 
 /**
- * A generic error for failing to resolve prompt contents stream.
+ * Base resolve error class used when file reference resolution fails.
  */
-export class FailedToResolveContentsStream extends ParseError {
-	public override errorType = 'FailedToResolveContentsStream';
+export abstract class ResolveError extends ParseError {
+	public abstract override errorType: string;
 
 	constructor(
 		public readonly uri: URI,
-		public readonly originalError: unknown,
-		message: string = `Failed to resolve prompt contents stream for '${uri.toString()}': ${originalError}.`,
+		message?: string,
+		options?: ErrorOptions,
 	) {
-		super(message);
+		super(message, options);
 	}
 }
 
-
 /**
- * Base resolve error class used when file reference resolution fails.
+ * A generic error for failing to resolve prompt contents stream.
  */
-export abstract class ResolveError extends ParseError {
-	public abstract override errorType: string;
+export class FailedToResolveContentsStream extends ResolveError {
+	public override errorType = 'FailedToResolveContentsStream';
 
 	constructor(
-		public readonly uri: URI,
-		message?: string,
-		options?: ErrorOptions,
+		uri: URI,
+		public readonly originalError: unknown,
+		message: string = `Failed to resolve prompt contents stream for '${uri.toString()}': ${originalError}.`,
 	) {
-		super(message, options);
+		super(uri, message);
 	}
 }
 
+
 /**
  * Error that reflects the case when attempt to open target file fails.
  */
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
index 22cb63c03eab..54dd59fe6a38 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
@@ -457,7 +457,6 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 			return undefined;
 		}
 
-
 		// if the first error is the error of the root reference,
 		// then return it as an `error` otherwise use `warning`
 		const [firstError, ...restErrors] = errors;
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 2d787402fbe1..348b9b628015 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.ts
@@ -13,7 +13,7 @@ import { IWorkspaceContextService } from '../../../../../../platform/workspace/c
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 
 /**
- * Class to locate prompt files.
+ * Utility class to locate prompt files.
  */
 export class PromptFilesLocator {
 	constructor(

From b846368cdf7c6cf7d95a6a1a369cb3d5c30439ff Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Fri, 21 Feb 2025 14:21:42 -0800
Subject: [PATCH 0878/1815] II of the `PromptsLinkDiagnosticsProvider`
 contribution

---
 .../contrib/chat/browser/chat.contribution.ts |   1 +
 .../languageFeatures/markersProvider.ts       | 144 ------------
 .../promptLinkDiagnosticsProvider.ts          | 220 ++++++++++++++++++
 3 files changed, 221 insertions(+), 144 deletions(-)
 delete mode 100644 src/vs/workbench/contrib/chat/browser/promptSyntax/languageFeatures/markersProvider.ts
 create mode 100644 src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.ts

diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index da8e0c2ff4a5..74625488a2e4 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -42,6 +42,7 @@ import { ILanguageModelStatsService, LanguageModelStatsService } from '../common
 import { ILanguageModelToolsService } from '../common/languageModelToolsService.js';
 import '../common/promptSyntax/languageFeatures/promptLinkProvider.js';
 import '../common/promptSyntax/languageFeatures/promptPathAutocompletion.js';
+import '../common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.js';
 import { PromptsService } from '../common/promptSyntax/service/promptsService.js';
 import { IPromptsService } from '../common/promptSyntax/service/types.js';
 import './promptSyntax/contributions/usePromptCommand.js';
diff --git a/src/vs/workbench/contrib/chat/browser/promptSyntax/languageFeatures/markersProvider.ts b/src/vs/workbench/contrib/chat/browser/promptSyntax/languageFeatures/markersProvider.ts
deleted file mode 100644
index a58c56320b8a..000000000000
--- a/src/vs/workbench/contrib/chat/browser/promptSyntax/languageFeatures/markersProvider.ts
+++ /dev/null
@@ -1,144 +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 '../../../../../../base/common/assert.js';
-import { ITextModel } from '../../../../../../editor/common/model.js';
-import { assertDefined } from '../../../../../../base/common/types.js';
-import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { IPromptsService } from '../../../common/promptSyntax/service/types.js';
-import { IPromptFileReference } from '../../../common/promptSyntax/parsers/types.js';
-import { TextModelPromptParser } from '../../../common/promptSyntax/parsers/textModelPromptParser.js';
-import { IMarkerData, IMarkerService, MarkerSeverity } from '../../../../../../platform/markers/common/markers.js';
-import { FailedToResolveContentsStream, NotPromptFile, ParseError, RecursiveReference } from '../../../common/promptFileReferenceErrors.js';
-
-/**
- * TODO: @legomushroom
- */
-const MARKERS_OWNER_ID = 'reusable-prompts-syntax';
-
-/**
- * TODO: @legomushroom
- */
-// TODO: @lego - move under /common
-export class MarkersProvider extends Disposable {
-	/**
-	 * TODO: @legomushroom
-	 */
-	private readonly parser: TextModelPromptParser;
-
-	constructor(
-		private readonly editor: ITextModel,
-		@IMarkerService private readonly markerService: IMarkerService,
-		@IPromptsService private readonly promptsService: IPromptsService,
-	) {
-		super();
-
-		this.parser = this.promptsService
-			.getSyntaxParserFor(this.editor)
-			.onUpdate(this.updateMarkers.bind(this))
-			.onDispose(this.dispose.bind(this));
-
-		// TODO @legomushroom - uncomment?
-		// this.updateMarkers();
-	}
-
-	/**
-	 * TODO: @legomushroom
-	 */
-	private async updateMarkers() {
-		// ensure that parsing process is settled
-		await this.parser.allSettled();
-
-		// clean up all previously added markers
-		this.markerService.remove(MARKERS_OWNER_ID, [this.editor.uri]);
-
-		const markers: IMarkerData[] = [];
-		for (const link of this.parser.allReferences) {
-			const { errorCondition, linkRange } = link;
-
-			if (!errorCondition || !linkRange) {
-				continue;
-			}
-
-			// the `NotPromptFile` error is allowed because we allow users
-			// to include non-prompt file links in the prompt files
-			// note! this check also handles the `FolderReference` error
-			if (errorCondition instanceof NotPromptFile) {
-				continue;
-			}
-
-			markers.push(toMarker(link));
-		}
-
-		this.markerService.changeOne(
-			MARKERS_OWNER_ID,
-			this.editor.uri,
-			markers,
-		);
-	}
-}
-
-/**
- * TODO: @legomushroom
- */
-// TODO: @legomushroom - add @throws info
-const toMarker = (
-	link: IPromptFileReference,
-): IMarkerData => {
-	const { errorCondition, linkRange } = link;
-
-	// a sanity check because this function must be
-	// used only if these attributes are present
-	assertDefined(
-		errorCondition,
-		'Error condition must to be defined.',
-	);
-	assertDefined(
-		linkRange,
-		'Link range must to be defined.',
-	);
-	assert(
-		!(errorCondition instanceof NotPromptFile),
-		'Error must not be of "not prompt file" type.',
-	);
-
-	// `FailedToResolveContentsStream` error check takes into account the `OpenFailed` error too
-	const severity = (errorCondition instanceof FailedToResolveContentsStream)
-		? MarkerSeverity.Error
-		: MarkerSeverity.Warning;
-
-	return {
-		message: getErrorMessage(errorCondition),
-		severity,
-		...linkRange,
-	};
-};
-
-/**
- * TODO: @legomushroom
- */
-// TODO: @legomushroom - add @throws info
-// TODO: @legomushroom - localize or reuse existing messages
-const getErrorMessage = (
-	error: ParseError,
-): string => {
-	// a sanity check because this function must be
-	// used only if error has correct type
-	assert(
-		!(error instanceof NotPromptFile),
-		'Error must not be of "not prompt file" type.',
-	);
-
-	// `FailedToResolveContentsStream` error takes into account the `OpenFailed` error too
-	if (error instanceof FailedToResolveContentsStream) {
-		return `The file '${error.uri.fsPath}' is not found.`;
-	}
-
-	if (error instanceof RecursiveReference) {
-		return 'The file contains recursive child reference that will be ignored.';
-	}
-
-	return `An unexpected error occurred: ${error.message}`;
-};
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.ts
new file mode 100644
index 000000000000..b3efbf3d20cc
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.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 { IPromptsService } from '../service/types.js';
+import { IPromptFileReference } from '../parsers/types.js';
+import { assert } from '../../../../../../base/common/assert.js';
+import { NotPromptFile } from '../../promptFileReferenceErrors.js';
+import { ITextModel } from '../../../../../../editor/common/model.js';
+import { assertDefined } from '../../../../../../base/common/types.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { IEditor } from '../../../../../../editor/common/editorCommon.js';
+import { ObjectCache } from '../../../../../../base/common/objectCache.js';
+import { TextModelPromptParser } from '../parsers/textModelPromptParser.js';
+import { Registry } from '../../../../../../platform/registry/common/platform.js';
+import { PromptsConfig } from '../../../../../../platform/prompts/common/config.js';
+import { isPromptFile } from '../../../../../../platform/prompts/common/constants.js';
+import { LifecyclePhase } from '../../../../../services/lifecycle/common/lifecycle.js';
+import { IEditorService } from '../../../../../services/editor/common/editorService.js';
+import { ObservableDisposable } from '../../../../../../base/common/observableDisposable.js';
+import { IWorkbenchContributionsRegistry, Extensions } from '../../../../../common/contributions.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+import { IMarkerData, IMarkerService, MarkerSeverity } from '../../../../../../platform/markers/common/markers.js';
+
+/**
+ * TODO: @legomushroom - list
+ *  - improve error messages
+ */
+
+/**
+ * TODO: @legomushroom
+ */
+const MARKERS_OWNER_ID = 'reusable-prompts-syntax';
+
+/**
+ * TODO: @legomushroom
+ */
+class PromptLinkDiagnosticsProvider extends ObservableDisposable {
+	/**
+	 * TODO: @legomushroom
+	 */
+	private readonly parser: TextModelPromptParser;
+
+	constructor(
+		private readonly editor: ITextModel,
+		@IMarkerService private readonly markerService: IMarkerService,
+		@IPromptsService private readonly promptsService: IPromptsService,
+	) {
+		super();
+
+		this.parser = this.promptsService
+			.getSyntaxParserFor(this.editor)
+			.onUpdate(this.updateMarkers.bind(this))
+			.onDispose(this.dispose.bind(this))
+			.start();
+
+		// initialize markers
+		this.updateMarkers();
+	}
+
+	/**
+	 * TODO: @legomushroom
+	 */
+	private async updateMarkers() {
+		// ensure that parsing process is settled
+		await this.parser.allSettled();
+
+		// clean up all previously added markers
+		this.markerService.remove(MARKERS_OWNER_ID, [this.editor.uri]);
+
+		const markers: IMarkerData[] = [];
+		for (const link of this.parser.references) {
+			const { topError, linkRange } = link;
+
+			if (!topError || !linkRange) {
+				continue;
+			}
+
+			// the `NotPromptFile` error is allowed because we allow users
+			// to include non-prompt file links in the prompt files
+			// note! this check also handles the `FolderReference` error
+			if (topError instanceof NotPromptFile) {
+				continue;
+			}
+
+			markers.push(toMarker(link));
+		}
+
+		this.markerService.changeOne(
+			MARKERS_OWNER_ID,
+			this.editor.uri,
+			markers,
+		);
+	}
+}
+
+/**
+ * TODO: @legomushroom
+ */
+// TODO: @legomushroom - add @throws info
+const toMarker = (
+	link: IPromptFileReference,
+): IMarkerData => {
+	const { topError, linkRange } = link;
+
+	// a sanity check because this function must be
+	// used only if these attributes are present
+	assertDefined(
+		topError,
+		'Error condition must to be defined.',
+	);
+	assertDefined(
+		linkRange,
+		'Link range must to be defined.',
+	);
+	assert(
+		!(topError instanceof NotPromptFile),
+		'Error must not be of "not prompt file" type.',
+	);
+
+	// use `error` severity if the error relates to the link itself, and use
+	// the `warning` severity if the error is related to one of its children
+	const severity = (topError.isRootError)
+		? MarkerSeverity.Error
+		: MarkerSeverity.Warning;
+
+	return {
+		message: topError.message,
+		severity,
+		...linkRange,
+	};
+};
+
+/**
+ * TODO: @legomushroom
+ */
+export class PromptsLinkDiagnosticsProvider extends Disposable {
+	/**
+	 * TODO: @legomushroom
+	 */
+	private readonly providers: ObjectCache<PromptLinkDiagnosticsProvider, ITextModel>;
+
+	constructor(
+		@IEditorService editorService: IEditorService,
+		@IInstantiationService initService: IInstantiationService,
+		@IConfigurationService configService: IConfigurationService,
+	) {
+		super();
+
+		// cache of prompt marker providers
+		this.providers = this._register(
+			new ObjectCache((editor: ITextModel) => {
+				const parser: PromptLinkDiagnosticsProvider = initService.createInstance(
+					PromptLinkDiagnosticsProvider,
+					editor,
+				);
+
+				// this is a sanity check and the contract of the object cache,
+				// we must return a non-disposed object from this factory function
+				parser.assertNotDisposed(
+					'Created prompt parser must not be disposed.',
+				);
+
+				return parser;
+			}),
+		);
+
+		// if the feature is disabled, do not create any providers
+		if (!PromptsConfig.enabled(configService)) {
+			return;
+		}
+
+		// subscribe to changes of the active editor
+		this._register(editorService.onDidActiveEditorChange(() => {
+			const { activeTextEditorControl } = editorService;
+			if (!activeTextEditorControl) {
+				return;
+			}
+
+			this.handleNewEditor(activeTextEditorControl);
+		}));
+
+		// handle existing visible text editors
+		editorService
+			.visibleTextEditorControls
+			.forEach(this.handleNewEditor.bind(this));
+	}
+
+	/**
+	 * TODO: @legomushroom
+	 */
+	private handleNewEditor(editor: IEditor): this {
+		const model = editor.getModel();
+		if (!model) {
+			return this;
+		}
+
+		// we support only `text editors` for now so filter out `diff` ones
+		if ('modified' in model || 'model' in model) {
+			return this;
+		}
+
+		// enable this only for prompt file editors
+		if (!isPromptFile(model.uri)) {
+			return this;
+		}
+
+		// note! calling `get` also creates a provider if it does not exist;
+		// 		and the provider is auto-removed when the model is disposed
+		this.providers.get(model);
+
+		return this;
+	}
+}
+
+// register the provider as a workbench contribution
+Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench)
+	.registerWorkbenchContribution(PromptsLinkDiagnosticsProvider, LifecyclePhase.Eventually);

From 92de76d4bc9a352726649b54d551b346a5583a1d Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Fri, 21 Feb 2025 18:38:20 -0800
Subject: [PATCH 0879/1815] improve error messages

---
 .../promptAttachmentWidget.ts                 |   2 +-
 .../chat/common/promptFileReferenceErrors.ts  |   2 +-
 .../filePromptContentsProvider.ts             |   4 +-
 .../promptContentsProviderBase.ts             |  12 +-
 .../promptLinkDiagnosticsProvider.ts          |  14 +-
 .../promptSyntax/parsers/basePromptParser.ts  | 183 ++++++++++++++----
 .../common/promptSyntax/parsers/types.d.ts    |  33 +++-
 .../testUtils/expectedReference.ts            |   8 +-
 8 files changed, 194 insertions(+), 64 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentWidget.ts b/src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentWidget.ts
index 4b07d7bacd62..d1306020729f 100644
--- a/src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentWidget.ts
@@ -118,7 +118,7 @@ export class PromptAttachmentWidget extends Disposable {
 		// add the issue details in the hover title for the attachment, one
 		// error/warning at a time because there is a limited space available
 		if (topError) {
-			const { isRootError, message: details } = topError;
+			const { isRootError, localizedMessage: details } = topError;
 			const isWarning = !isRootError;
 
 			this.domNode.classList.add(
diff --git a/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
index 5f75ba3da0d2..40cec4f0503f 100644
--- a/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
+++ b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
@@ -8,7 +8,7 @@ import { URI } from '../../../../base/common/uri.js';
 /**
  * Base prompt parsing error class.
  */
-export abstract class ParseError extends Error {
+abstract class ParseError extends Error {
 	/**
 	 * Error type name.
 	 */
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/filePromptContentsProvider.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/filePromptContentsProvider.ts
index 512c29e98c23..4f35897df0a9 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/filePromptContentsProvider.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/filePromptContentsProvider.ts
@@ -11,7 +11,7 @@ import { CancellationError } from '../../../../../../base/common/errors.js';
 import { PromptContentsProviderBase } from './promptContentsProviderBase.js';
 import { VSBufferReadableStream } from '../../../../../../base/common/buffer.js';
 import { CancellationToken } from '../../../../../../base/common/cancellation.js';
-import { OpenFailed, NotPromptFile, ParseError, FolderReference } from '../../promptFileReferenceErrors.js';
+import { OpenFailed, NotPromptFile, ResolveError, FolderReference } from '../../promptFileReferenceErrors.js';
 import { FileChangesEvent, FileChangeType, IFileService } from '../../../../../../platform/files/common/files.js';
 
 /**
@@ -81,7 +81,7 @@ export class FilePromptContentProvider extends PromptContentsProviderBase<FileCh
 
 			fileStream = await this.fileService.readFileStream(this.uri);
 		} catch (error) {
-			if (error instanceof ParseError) {
+			if (error instanceof ResolveError) {
 				throw error;
 			}
 
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/promptContentsProviderBase.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/promptContentsProviderBase.ts
index 11cb5f84f19b..2aa8a3d06281 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/promptContentsProviderBase.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/promptContentsProviderBase.ts
@@ -12,14 +12,14 @@ import { VSBufferReadableStream } from '../../../../../../base/common/buffer.js'
 import { CancellationToken } from '../../../../../../base/common/cancellation.js';
 import { isPromptFile } from '../../../../../../platform/prompts/common/constants.js';
 import { ObservableDisposable } from '../../../../../../base/common/observableDisposable.js';
-import { FailedToResolveContentsStream, ParseError } from '../../promptFileReferenceErrors.js';
+import { FailedToResolveContentsStream, ResolveError } from '../../promptFileReferenceErrors.js';
 import { cancelPreviousCalls } from '../../../../../../base/common/decorators/cancelPreviousCalls.js';
 
 /**
  * Base class for prompt contents providers. Classes that extend this one are responsible to:
  *
  * - implement the {@linkcode getContentsStream} method to provide the contents stream
- *   of a prompt; this method should throw a `ParseError` or its derivative if the contents
+ *   of a prompt; this method should throw a `ResolveError` or its derivative if the contents
  *   cannot be parsed for any reason
  * - fire a {@linkcode TChangeEvent} event on the {@linkcode onChangeEmitter} event when
  * 	 prompt contents change
@@ -49,7 +49,7 @@ export abstract class PromptContentsProviderBase<
 
 	/**
 	 * Function to get contents stream for the provider. This function should
-	 * throw a `ParseError` or its derivative if the contents cannot be parsed.
+	 * throw a `ResolveError` or its derivative if the contents cannot be parsed.
 	 *
 	 * @param changesEvent The event that triggered the change. The special
 	 * `'full'` value means  that everything has changed hence entire prompt
@@ -75,12 +75,12 @@ export abstract class PromptContentsProviderBase<
 	 * Event emitter for the prompt contents change event.
 	 * See {@linkcode onContentChanged} for more details.
 	 */
-	private readonly onContentChangedEmitter = this._register(new Emitter<VSBufferReadableStream | ParseError>());
+	private readonly onContentChangedEmitter = this._register(new Emitter<VSBufferReadableStream | ResolveError>());
 
 	/**
 	 * Event that fires when the prompt contents change. The event is either
 	 * a `VSBufferReadableStream` stream with changed contents or an instance of
-	 * the `ParseError` class representing a parsing failure case.
+	 * the `ResolveError` class representing a parsing failure case.
 	 *
 	 * `Note!` this field is meant to be used by the external consumers of the prompt
 	 *         contents provider that the classes that extend this abstract class.
@@ -112,7 +112,7 @@ export abstract class PromptContentsProviderBase<
 				this.onContentChangedEmitter.fire(stream);
 			})
 			.catch((error) => {
-				if (error instanceof ParseError) {
+				if (error instanceof ResolveError) {
 					this.onContentChangedEmitter.fire(error);
 
 					return;
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.ts
index b3efbf3d20cc..114687d46d78 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.ts
@@ -78,10 +78,12 @@ class PromptLinkDiagnosticsProvider extends ObservableDisposable {
 				continue;
 			}
 
+			const { originalError } = topError;
+
 			// the `NotPromptFile` error is allowed because we allow users
 			// to include non-prompt file links in the prompt files
 			// note! this check also handles the `FolderReference` error
-			if (topError instanceof NotPromptFile) {
+			if (originalError instanceof NotPromptFile) {
 				continue;
 			}
 
@@ -106,17 +108,19 @@ const toMarker = (
 	const { topError, linkRange } = link;
 
 	// a sanity check because this function must be
-	// used only if these attributes are present
+	// used only if these link attributes are present
 	assertDefined(
 		topError,
-		'Error condition must to be defined.',
+		'Top error must to be defined.',
 	);
 	assertDefined(
 		linkRange,
 		'Link range must to be defined.',
 	);
+
+	const { originalError } = topError;
 	assert(
-		!(topError instanceof NotPromptFile),
+		!(originalError instanceof NotPromptFile),
 		'Error must not be of "not prompt file" type.',
 	);
 
@@ -127,7 +131,7 @@ const toMarker = (
 		: MarkerSeverity.Warning;
 
 	return {
-		message: topError.message,
+		message: topError.localizedMessage,
 		severity,
 		...linkRange,
 	};
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
index 54dd59fe6a38..3a335afd802d 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
@@ -18,22 +18,70 @@ import { PromptVariableWithData } from '../codecs/tokens/promptVariable.js';
 import { basename, extUri } from '../../../../../../base/common/resources.js';
 import { assert, assertNever } from '../../../../../../base/common/assert.js';
 import { VSBufferReadableStream } from '../../../../../../base/common/buffer.js';
-import { IPromptFileReference, IPromptReference, IResolveError } from './types.js';
 import { isPromptFile } from '../../../../../../platform/prompts/common/constants.js';
 import { ObservableDisposable } from '../../../../../../base/common/observableDisposable.js';
 import { FilePromptContentProvider } from '../contentProviders/filePromptContentsProvider.js';
+import { IErrorWithLink, IPromptFileReference, IPromptReference, IResolveError } from './types.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { MarkdownLink } from '../../../../../../editor/common/codecs/markdownCodec/tokens/markdownLink.js';
-import { OpenFailed, NotPromptFile, RecursiveReference, FolderReference, ParseError, FailedToResolveContentsStream } from '../../promptFileReferenceErrors.js';
+import { OpenFailed, NotPromptFile, RecursiveReference, FolderReference, ResolveError, FailedToResolveContentsStream } from '../../promptFileReferenceErrors.js';
+
+/**
+ * TODO: @legomushroom - list
+ *
+ * - fix recursive reference case:
+ *   - it should not be an error, but warning
+ *   - [in `brokenChild`]: fix the error message
+ */
 
 /**
  * Well-known localized error messages.
  */
 const errorMessages = {
-	recursion: localize('chatPromptInstructionsRecursiveReference', 'Recursive reference found'),
-	fileOpenFailed: localize('chatPromptInstructionsFileOpenFailed', 'Failed to open file'),
-	streamOpenFailed: localize('chatPromptInstructionsStreamOpenFailed', 'Failed to open contents stream'),
-	brokenChild: localize('chatPromptInstructionsBrokenReference', 'Contains a broken reference that will be ignored'),
+	// TODO: @legomushroom - update localization IDs
+	recursion: localize('chatPromptInstructionsRecursiveReference', 'Recursive reference'),
+	openFailed: localize('chatPromptInstructionsFileOpenFailed', 'Cannot open'),
+	streamOpenFailed: localize('chatPromptInstructionsStreamOpenFailed', 'Cannot read'),
+
+	/**
+	 * TODO: @legomushroom - add @throws tag
+	 */
+	brokenChild: (
+		error: IErrorWithLink,
+		isDirectChild: boolean,
+		moreErrorsCount: number,
+	): string => {
+		// sanity check
+		assert(
+			moreErrorsCount >= 0,
+			`Additional errors count must be non-negative, got '${moreErrorsCount}'.`,
+		);
+
+		const subjectName = (isDirectChild)
+			? localize('chatPromptInstructionsBrokenReferenceFile', "Contains")
+			: localize(
+				'chatPromptInstructionsBrokenChildReference',
+				"Indirectly referenced file '{0}' contains",
+				basename(error.link.uri),
+			);
+
+		const linkErrorType = (error.error instanceof RecursiveReference)
+			? localize('chatPromptInstructionsBrokenReferenceFileRecursive', "recursive")
+			: localize('chatPromptInstructionsBrokenChildReferenceBroken', "broken");
+
+		const moreErrorsNote = (moreErrorsCount > 0)
+			? localize('chatPromptInstructionsBrokenReferenceSuffix', " (+{0} more warnings)", moreErrorsCount)
+			: '';
+
+		return localize(
+			'chatPromptInstructionsBrokenReference',
+			"{0} a {1} link '{2}' that will be ignored.{3}",
+			subjectName,
+			linkErrorType,
+			error.link.text,
+			moreErrorsNote,
+		);
+	},
 };
 
 /**
@@ -66,13 +114,13 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 		return this;
 	}
 
-	private _errorCondition?: ParseError;
+	private _errorCondition?: ResolveError;
 
 	/**
 	 * If file reference resolution fails, this attribute will be set
 	 * to an error instance that describes the error condition.
 	 */
-	public get errorCondition(): ParseError | undefined {
+	public get errorCondition(): ResolveError | undefined {
 		return this._errorCondition;
 	}
 
@@ -197,7 +245,7 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 	 * 						references recursion.
 	 */
 	private onContentsChanged(
-		streamOrError: VSBufferReadableStream | ParseError,
+		streamOrError: VSBufferReadableStream | ResolveError,
 		seenReferences: string[],
 	): void {
 		// dispose and cleanup the previously received stream
@@ -210,7 +258,7 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 		this.disposeReferences();
 
 		// if an error received, set up the error condition and stop
-		if (streamOrError instanceof ParseError) {
+		if (streamOrError instanceof ResolveError) {
 			this._errorCondition = streamOrError;
 			this._onUpdate.fire();
 
@@ -404,12 +452,47 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 			.map(child => child.uri);
 	}
 
+	/**
+	 * TODO: @legomushroom
+	 */
+	public get errors(): readonly IErrorWithLink[] {
+		// collect error conditions of direct child references
+		const childErrors = this
+			// get immediate references
+			.references
+			// filter out children without error conditions or
+			// the ones that are non-prompt snippet files
+			.filter((childReference) => {
+				const { errorCondition } = childReference;
+
+				return errorCondition && !(errorCondition instanceof NotPromptFile);
+			})
+			// map to error condition objects
+			.map((childReference): IErrorWithLink => {
+				const { errorCondition } = childReference;
+
+				// `must` always be `true` because of the `filter` call above
+				assertDefined(
+					errorCondition,
+					`Error condition must be present for '${childReference.uri.path}'.`,
+				);
+
+				return {
+					link: childReference,
+					error: errorCondition,
+				};
+			});
+
+		return childErrors;
+	}
+
 	/**
 	 * List of all errors that occurred while resolving the current
 	 * reference including all possible errors of nested children.
 	 */
-	public get allErrors(): ParseError[] {
-		const result: ParseError[] = [];
+	// TODO: @legomushroom - refactor to use `errors()` method above
+	public get allErrors(): readonly IErrorWithLink[] {
+		const result: IErrorWithLink[] = [];
 
 		// collect error conditions of all child references
 		const childErrorConditions = this
@@ -423,7 +506,7 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 				return errorCondition && !(errorCondition instanceof NotPromptFile);
 			})
 			// map to error condition objects
-			.map((childReference): ParseError => {
+			.map((childReference): IErrorWithLink => {
 				const { errorCondition } = childReference;
 
 				// `must` always be `true` because of the `filter` call above
@@ -432,7 +515,10 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 					`Error condition must be present for '${childReference.uri.path}'.`,
 				);
 
-				return errorCondition;
+				return {
+					link: childReference,
+					error: errorCondition,
+				};
 			});
 
 		result.push(...childErrorConditions);
@@ -445,49 +531,64 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 	 * possible child reference errors.
 	 */
 	public get topError(): IResolveError | undefined {
-		// get all errors, including error of this object
-		const errors = [];
 		if (this.errorCondition) {
-			errors.push(this.errorCondition);
+			return {
+				localizedMessage: this.getErrorMessage(this.errorCondition),
+				originalError: this.errorCondition,
+				isRootError: true,
+			};
 		}
-		errors.push(...this.allErrors);
 
-		// if no errors, nothing to do
-		if (errors.length === 0) {
-			return undefined;
+		const childErrors: IErrorWithLink[] = [];
+		for (const reference of this.references) {
+			const { errorCondition } = reference;
+
+			if (!errorCondition) {
+				continue;
+			}
+
+			childErrors.push({
+				link: reference,
+				error: errorCondition,
+			});
+		}
+
+		const nestedErrors: IErrorWithLink[] = [];
+		for (const reference of this.references) {
+			nestedErrors.push(...reference.allErrors);
 		}
 
-		// if the first error is the error of the root reference,
-		// then return it as an `error` otherwise use `warning`
-		const [firstError, ...restErrors] = errors;
-		const isRootError = (firstError === this.errorCondition);
+		if (childErrors.length === 0 && nestedErrors.length === 0) {
+			return undefined;
+		}
 
-		// if a child error - the error is somewhere in the nested references tree,
-		// then use message prefix to highlight that this is not a root error
-		const prefix = (!isRootError)
-			? `${errorMessages.brokenChild}: `
-			: '';
+		const firstChildError = childErrors[0] || nestedErrors[0];
+		const isDirectChildError = (childErrors.length > 0);
+		const totalErrorsCount = childErrors.length + nestedErrors.length;
 
-		const moreSuffix = restErrors.length > 0
-			? `\n-\n +${restErrors.length} more error${restErrors.length > 1 ? 's' : ''}`
-			: '';
+		const localizedMessage = errorMessages
+			.brokenChild(
+				firstChildError,
+				isDirectChildError,
+				totalErrorsCount - 1,
+			);
 
-		const errorMessage = this.getErrorMessage(firstError);
 		return {
-			isRootError,
-			message: `${prefix}${errorMessage}${moreSuffix}`,
+			localizedMessage,
+			originalError: firstChildError.error,
+			isRootError: false,
 		};
 	}
 
 	/**
 	 * Get message for the provided error condition object.
 	 *
-	 * @param error Error object that extends {@link ParseError}.
+	 * @param error Error object that extends {@link ResolveError}.
 	 * @returns Error message.
 	 */
-	protected getErrorMessage<TError extends ParseError>(error: TError): string {
+	protected getErrorMessage<TError extends ResolveError>(error: TError): string {
 		if (error instanceof OpenFailed) {
-			return `${errorMessages.fileOpenFailed} '${error.uri.path}'.`;
+			return `${errorMessages.openFailed} '${error.uri.path}'.`;
 		}
 
 		if (error instanceof FailedToResolveContentsStream) {
@@ -619,10 +720,10 @@ export class PromptFileReference extends BasePromptParser<FilePromptContentProvi
 	/**
 	 * @inheritdoc
 	 */
-	protected override getErrorMessage(error: ParseError): string {
+	protected override getErrorMessage(error: ResolveError): string {
 		// if failed to open a file, return appropriate message and the file path
 		if (error instanceof OpenFailed) {
-			return `${errorMessages.fileOpenFailed} '${error.uri.path}'.`;
+			return `${errorMessages.openFailed} '${error.uri.path}'.`;
 		}
 
 		return super.getErrorMessage(error);
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts
index 772d251f1a47..69bfb4c21ce6 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts
@@ -4,10 +4,25 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from '../../../../../../base/common/uri.js';
-import { ParseError } from '../../promptFileReferenceErrors.js';
+import { ResolveError } from '../../promptFileReferenceErrors.js';
 import { IDisposable } from '../../../../../../base/common/lifecycle.js';
 import { IRange, Range } from '../../../../../../editor/common/core/range.js';
 
+/**
+ * TODO: @legomushroom
+ */
+export interface IErrorWithLink {
+	/**
+	 * TODO: @legomushroom
+	 */
+	readonly error: ResolveError;
+
+	/**
+	 * TODO: @legomushroom
+	 */
+	readonly link: IPromptReference;
+}
+
 /**
  * Interface for a resolve error.
  */
@@ -15,7 +30,12 @@ export interface IResolveError {
 	/**
 	 * Localized error message.
 	 */
-	message: string;
+	localizedMessage: string;
+
+	/**
+	 * Original error object.
+	 */
+	originalError: ResolveError;
 
 	/**
 	 * Whether this error is for the root reference
@@ -86,13 +106,18 @@ interface IPromptReferenceBase extends IDisposable {
 	 *
 	 * See also {@linkcode resolveFailed}.
 	 */
-	readonly errorCondition: ParseError | undefined;
+	readonly errorCondition: ResolveError | undefined;
+
+	/**
+	 * TODO: @legomushroom
+	 */
+	readonly errors: readonly IErrorWithLink[];
 
 	/**
 	 * List of all errors that occurred while resolving the current
 	 * reference including all possible errors of nested children.
 	 */
-	readonly allErrors: readonly ParseError[];
+	readonly allErrors: readonly IErrorWithLink[];
 
 	/**
 	 * The top most error of the current reference or any of its
diff --git a/src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/expectedReference.ts b/src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/expectedReference.ts
index 4cd4232bcd47..d43123799e11 100644
--- a/src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/expectedReference.ts
+++ b/src/vs/workbench/contrib/chat/test/common/promptSyntax/testUtils/expectedReference.ts
@@ -7,7 +7,7 @@ import assert from 'assert';
 import { URI } from '../../../../../../../base/common/uri.js';
 import { Range } from '../../../../../../../editor/common/core/range.js';
 import { assertDefined } from '../../../../../../../base/common/types.js';
-import { ParseError } from '../../../../common/promptFileReferenceErrors.js';
+import { ResolveError } from '../../../../common/promptFileReferenceErrors.js';
 import { IPromptReference } from '../../../../common/promptSyntax/parsers/types.js';
 import { TErrorCondition } from '../../../../common/promptSyntax/parsers/basePromptParser.js';
 
@@ -130,7 +130,7 @@ export class ExpectedReference {
 		 * Next validate children or error condition.
 		 */
 
-		if (childrenOrError instanceof ParseError) {
+		if (childrenOrError instanceof ResolveError) {
 			const error = childrenOrError;
 			const { errorCondition } = other;
 			assertDefined(
@@ -139,8 +139,8 @@ export class ExpectedReference {
 			);
 
 			assert(
-				errorCondition instanceof ParseError,
-				`${errorPrefix} Expected 'errorCondition' to be a 'ParseError'.`,
+				errorCondition instanceof ResolveError,
+				`${errorPrefix} Expected 'errorCondition' to be a 'ResolveError'.`,
 			);
 
 			assert(

From 2da00ee663b120b48c5a97af37f0199fd0b8881f Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Mon, 24 Feb 2025 14:49:47 -0800
Subject: [PATCH 0880/1815] fix error messages content for both editor and
 in-chat attachment cases

---
 .../promptAttachmentWidget.ts                 |  16 +-
 .../chat/common/promptFileReferenceErrors.ts  |  52 ++++-
 .../promptSyntax/contentProviders/types.d.ts  |   6 +-
 .../promptLinkDiagnosticsProvider.ts          |  10 +-
 .../promptSyntax/parsers/basePromptParser.ts  | 220 ++++--------------
 .../common/promptSyntax/parsers/topError.ts   |  96 ++++++++
 .../common/promptSyntax/parsers/types.d.ts    |  38 +--
 7 files changed, 226 insertions(+), 212 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/common/promptSyntax/parsers/topError.ts

diff --git a/src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentWidget.ts b/src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentWidget.ts
index d1306020729f..ac4fcefcd206 100644
--- a/src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/attachments/promptAttachments/promptAttachmentWidget.ts
@@ -22,8 +22,8 @@ import { ILanguageService } from '../../../../../../editor/common/languages/lang
 import { FileKind, IFileService } from '../../../../../../platform/files/common/files.js';
 import { IMenuService, MenuId } from '../../../../../../platform/actions/common/actions.js';
 import { getCleanPromptName } from '../../../../../../platform/prompts/common/constants.js';
-import { ChatPromptAttachmentModel } from '../../chatAttachmentModel/chatPromptAttachmentModel.js';
 import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { ChatPromptAttachmentModel } from '../../chatAttachmentModel/chatPromptAttachmentModel.js';
 import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
 import { getDefaultHoverDelegate } from '../../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { getFlatContextMenuActions } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
@@ -118,18 +118,18 @@ export class PromptAttachmentWidget extends Disposable {
 		// add the issue details in the hover title for the attachment, one
 		// error/warning at a time because there is a limited space available
 		if (topError) {
-			const { isRootError, localizedMessage: details } = topError;
-			const isWarning = !isRootError;
+			const { errorSubject: subject } = topError;
+			const isError = (subject === 'root');
 
 			this.domNode.classList.add(
-				(isWarning) ? 'warning' : 'error',
+				(isError) ? 'error' : 'warning',
 			);
 
-			const errorCaption = (isWarning)
-				? localize('warning', "Warning")
-				: localize('error', "Error");
+			const severity = (isError)
+				? localize('error', "Error")
+				: localize('warning', "Warning");
 
-			title += `\n-\n[${errorCaption}]: ${details}`;
+			title += `\n[${severity}]: ${topError.localizedMessage}`;
 		}
 
 		const fileWithoutExtension = getCleanPromptName(file);
diff --git a/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
index 40cec4f0503f..dd1b93be160b 100644
--- a/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
+++ b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from '../../../../base/common/uri.js';
+import { basename } from '../../../../base/common/path.js';
+import { assert, assertNever } from '../../../../base/common/assert.js';
 
 /**
  * Base prompt parsing error class.
@@ -89,6 +91,12 @@ export class OpenFailed extends FailedToResolveContentsStream {
 	}
 }
 
+/**
+ * Character use to join filenames/paths in a chain of references that
+ * lead to recursion.
+ */
+const DEFAULT_RECURSIVE_PATH_JOIN_CHAR = ' -> ';
+
 /**
  * Error that reflects the case when attempt resolve nested file
  * references failes due to a recursive reference, e.g.,
@@ -106,23 +114,53 @@ export class OpenFailed extends FailedToResolveContentsStream {
 export class RecursiveReference extends ResolveError {
 	public override errorType = 'RecursiveReferenceError';
 
+	/**
+	 * Default string representation of the recursive path.
+	 */
+	public readonly recursivePathString: string;
+
 	constructor(
 		uri: URI,
 		public readonly recursivePath: string[],
 	) {
-		const references = recursivePath.join(' -> ');
+		// sanity check - a recursive path must always have at least
+		// two items in the list, otherwise it is not a recursive loop
+		assert(
+			recursivePath.length >= 2,
+			`Recursive path must contain at least two paths, got '${recursivePath.length}'.`,
+		);
 
+		const pathString = recursivePath.join(DEFAULT_RECURSIVE_PATH_JOIN_CHAR);
 		super(
 			uri,
-			`Recursive references found: ${references}.`,
+			`Recursive references found: ${pathString}.`,
 		);
+		this.recursivePathString = pathString;
 	}
 
 	/**
 	 * Returns a string representation of the recursive path.
 	 */
-	public get recursivePathString(): string {
-		return this.recursivePath.join(' -> ');
+	public getRecursivePathString(
+		filename: 'basename' | 'fullpath',
+		pathJoinCharacter: string = DEFAULT_RECURSIVE_PATH_JOIN_CHAR,
+	): string {
+		return this.recursivePath
+			.map((path) => {
+				if (filename === 'fullpath') {
+					return `'${path}'`;
+				}
+
+				if (filename === 'basename') {
+					return `'${basename(path)}'`;
+				}
+
+				assertNever(
+					filename,
+					`Unknown filename format '${filename}'.`,
+				);
+			})
+			.join(pathJoinCharacter);
 	}
 
 	/**
@@ -138,6 +176,12 @@ export class RecursiveReference extends ResolveError {
 			return false;
 		}
 
+		// performance optimization - if the paths lengths don't match,
+		// no need to compare entire strings as they must be different
+		if (this.recursivePathString.length !== other.recursivePathString.length) {
+			return false;
+		}
+
 		return this.recursivePathString === other.recursivePathString;
 	}
 
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/types.d.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/types.d.ts
index 5d03ef2848ce..3ff8c569b6dc 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/types.d.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/types.d.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from '../../../../../../base/common/uri.js';
-import { ParseError } from '../../promptFileReferenceErrors.js';
+import { ResolveError } from '../../promptFileReferenceErrors.js';
 import { IDisposable } from '../../../../../../base/common/lifecycle.js';
 import { VSBufferReadableStream } from '../../../../../../base/common/buffer.js';
 
@@ -27,9 +27,9 @@ export interface IPromptContentsProvider extends IDisposable {
 	/**
 	 * Event that fires when the prompt contents change. The event is either a
 	 * {@linkcode VSBufferReadableStream} stream with changed contents or
-	 * an instance of the {@linkcode ParseError} error.
+	 * an instance of the {@linkcode ResolveError} error.
 	 */
 	onContentChanged(
-		callback: (streamOrError: VSBufferReadableStream | ParseError) => void,
+		callback: (streamOrError: VSBufferReadableStream | ResolveError) => void,
 	): IDisposable;
 }
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.ts
index 114687d46d78..590c4ecf92dd 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.ts
@@ -24,11 +24,6 @@ import { IInstantiationService } from '../../../../../../platform/instantiation/
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { IMarkerData, IMarkerService, MarkerSeverity } from '../../../../../../platform/markers/common/markers.js';
 
-/**
- * TODO: @legomushroom - list
- *  - improve error messages
- */
-
 /**
  * TODO: @legomushroom
  */
@@ -124,9 +119,8 @@ const toMarker = (
 		'Error must not be of "not prompt file" type.',
 	);
 
-	// use `error` severity if the error relates to the link itself, and use
-	// the `warning` severity if the error is related to one of its children
-	const severity = (topError.isRootError)
+	// `error` severity for the link itself, `warning` for any of its children
+	const severity = (topError.errorSubject === 'root')
 		? MarkerSeverity.Error
 		: MarkerSeverity.Warning;
 
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
index 3a335afd802d..383aeb7971e2 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { localize } from '../../../../../../nls.js';
+import { TopError } from './topError.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import { ChatPromptCodec } from '../codecs/chatPromptCodec.js';
 import { Emitter } from '../../../../../../base/common/event.js';
@@ -21,68 +21,10 @@ import { VSBufferReadableStream } from '../../../../../../base/common/buffer.js'
 import { isPromptFile } from '../../../../../../platform/prompts/common/constants.js';
 import { ObservableDisposable } from '../../../../../../base/common/observableDisposable.js';
 import { FilePromptContentProvider } from '../contentProviders/filePromptContentsProvider.js';
-import { IErrorWithLink, IPromptFileReference, IPromptReference, IResolveError } from './types.js';
+import { IPromptFileReference, IPromptReference, IResolveError, ITopError } from './types.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { MarkdownLink } from '../../../../../../editor/common/codecs/markdownCodec/tokens/markdownLink.js';
-import { OpenFailed, NotPromptFile, RecursiveReference, FolderReference, ResolveError, FailedToResolveContentsStream } from '../../promptFileReferenceErrors.js';
-
-/**
- * TODO: @legomushroom - list
- *
- * - fix recursive reference case:
- *   - it should not be an error, but warning
- *   - [in `brokenChild`]: fix the error message
- */
-
-/**
- * Well-known localized error messages.
- */
-const errorMessages = {
-	// TODO: @legomushroom - update localization IDs
-	recursion: localize('chatPromptInstructionsRecursiveReference', 'Recursive reference'),
-	openFailed: localize('chatPromptInstructionsFileOpenFailed', 'Cannot open'),
-	streamOpenFailed: localize('chatPromptInstructionsStreamOpenFailed', 'Cannot read'),
-
-	/**
-	 * TODO: @legomushroom - add @throws tag
-	 */
-	brokenChild: (
-		error: IErrorWithLink,
-		isDirectChild: boolean,
-		moreErrorsCount: number,
-	): string => {
-		// sanity check
-		assert(
-			moreErrorsCount >= 0,
-			`Additional errors count must be non-negative, got '${moreErrorsCount}'.`,
-		);
-
-		const subjectName = (isDirectChild)
-			? localize('chatPromptInstructionsBrokenReferenceFile', "Contains")
-			: localize(
-				'chatPromptInstructionsBrokenChildReference',
-				"Indirectly referenced file '{0}' contains",
-				basename(error.link.uri),
-			);
-
-		const linkErrorType = (error.error instanceof RecursiveReference)
-			? localize('chatPromptInstructionsBrokenReferenceFileRecursive', "recursive")
-			: localize('chatPromptInstructionsBrokenChildReferenceBroken', "broken");
-
-		const moreErrorsNote = (moreErrorsCount > 0)
-			? localize('chatPromptInstructionsBrokenReferenceSuffix', " (+{0} more warnings)", moreErrorsCount)
-			: '';
-
-		return localize(
-			'chatPromptInstructionsBrokenReference',
-			"{0} a {1} link '{2}' that will be ignored.{3}",
-			subjectName,
-			linkErrorType,
-			error.link.text,
-			moreErrorsNote,
-		);
-	},
-};
+import { OpenFailed, NotPromptFile, RecursiveReference, FolderReference, ResolveError } from '../../promptFileReferenceErrors.js';
 
 /**
  * Error conditions that may happen during the file reference resolution.
@@ -206,7 +148,10 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 		if (seenReferences.includes(this.uri.path)) {
 			seenReferences.push(this.uri.path);
 
-			this._errorCondition = new RecursiveReference(this.uri, seenReferences);
+			this._errorCondition = new RecursiveReference(
+				this.uri,
+				seenReferences,
+			);
 			this._onUpdate.fire();
 			this.firstParseResult.complete();
 
@@ -455,7 +400,7 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 	/**
 	 * TODO: @legomushroom
 	 */
-	public get errors(): readonly IErrorWithLink[] {
+	public get errors(): readonly ResolveError[] {
 		// collect error conditions of direct child references
 		const childErrors = this
 			// get immediate references
@@ -468,7 +413,7 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 				return errorCondition && !(errorCondition instanceof NotPromptFile);
 			})
 			// map to error condition objects
-			.map((childReference): IErrorWithLink => {
+			.map((childReference): ResolveError => {
 				const { errorCondition } = childReference;
 
 				// `must` always be `true` because of the `filter` call above
@@ -477,10 +422,7 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 					`Error condition must be present for '${childReference.uri.path}'.`,
 				);
 
-				return {
-					link: childReference,
-					error: errorCondition,
-				};
+				return errorCondition;
 			});
 
 		return childErrors;
@@ -490,38 +432,22 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 	 * List of all errors that occurred while resolving the current
 	 * reference including all possible errors of nested children.
 	 */
-	// TODO: @legomushroom - refactor to use `errors()` method above
-	public get allErrors(): readonly IErrorWithLink[] {
-		const result: IErrorWithLink[] = [];
+	public get allErrors(): readonly IResolveError[] {
+		const result: IResolveError[] = [];
 
-		// collect error conditions of all child references
-		const childErrorConditions = this
-			// get entire reference tree
-			.allReferences
-			// filter out children without error conditions or
-			// the ones that are non-prompt snippet files
-			.filter((childReference) => {
-				const { errorCondition } = childReference;
-
-				return errorCondition && !(errorCondition instanceof NotPromptFile);
-			})
-			// map to error condition objects
-			.map((childReference): IErrorWithLink => {
-				const { errorCondition } = childReference;
-
-				// `must` always be `true` because of the `filter` call above
-				assertDefined(
-					errorCondition,
-					`Error condition must be present for '${childReference.uri.path}'.`,
-				);
+		for (const reference of this.references) {
+			const { errorCondition } = reference;
 
-				return {
-					link: childReference,
-					error: errorCondition,
-				};
-			});
+			if (errorCondition && (!(errorCondition instanceof NotPromptFile))) {
+				result.push({
+					originalError: errorCondition,
+					parentUri: this.uri,
+				});
+			}
 
-		result.push(...childErrorConditions);
+			// recursively collect all possible errors of its children
+			result.push(...reference.allErrors);
+		}
 
 		return result;
 	}
@@ -530,30 +456,17 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 	 * The top most error of the current reference or any of its
 	 * possible child reference errors.
 	 */
-	public get topError(): IResolveError | undefined {
+	public get topError(): ITopError | undefined {
 		if (this.errorCondition) {
-			return {
-				localizedMessage: this.getErrorMessage(this.errorCondition),
+			return new TopError({
+				errorSubject: 'root',
+				errorsCount: 1,
 				originalError: this.errorCondition,
-				isRootError: true,
-			};
-		}
-
-		const childErrors: IErrorWithLink[] = [];
-		for (const reference of this.references) {
-			const { errorCondition } = reference;
-
-			if (!errorCondition) {
-				continue;
-			}
-
-			childErrors.push({
-				link: reference,
-				error: errorCondition,
 			});
 		}
 
-		const nestedErrors: IErrorWithLink[] = [];
+		const childErrors: ResolveError[] = [...this.errors];
+		const nestedErrors: IResolveError[] = [];
 		for (const reference of this.references) {
 			nestedErrors.push(...reference.allErrors);
 		}
@@ -562,54 +475,29 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 			return undefined;
 		}
 
-		const firstChildError = childErrors[0] || nestedErrors[0];
-		const isDirectChildError = (childErrors.length > 0);
-		const totalErrorsCount = childErrors.length + nestedErrors.length;
-
-		const localizedMessage = errorMessages
-			.brokenChild(
-				firstChildError,
-				isDirectChildError,
-				totalErrorsCount - 1,
-			);
-
-		return {
-			localizedMessage,
-			originalError: firstChildError.error,
-			isRootError: false,
-		};
-	}
+		const firstDirectChildError = childErrors[0];
+		const firstNestedChildError = nestedErrors[0];
+		const hasDirectChildError = (firstDirectChildError !== undefined);
 
-	/**
-	 * Get message for the provided error condition object.
-	 *
-	 * @param error Error object that extends {@link ResolveError}.
-	 * @returns Error message.
-	 */
-	protected getErrorMessage<TError extends ResolveError>(error: TError): string {
-		if (error instanceof OpenFailed) {
-			return `${errorMessages.openFailed} '${error.uri.path}'.`;
-		}
-
-		if (error instanceof FailedToResolveContentsStream) {
-			return `${errorMessages.streamOpenFailed} '${error.uri.path}'.`;
-		}
-
-		// if a recursion, provide the entire recursion path so users
-		// can use it for the debugging purposes
-		if (error instanceof RecursiveReference) {
-			const { recursivePath } = error;
+		const firstChildError = (hasDirectChildError)
+			? {
+				originalError: firstDirectChildError,
+				parentUri: this.uri,
+			}
+			: firstNestedChildError;
 
-			const recursivePathString = recursivePath
-				.map((path) => {
-					return basename(URI.file(path));
-				})
-				.join(' -> ');
+		const totalErrorsCount = childErrors.length + nestedErrors.length;
 
-			return `${errorMessages.recursion}:\n${recursivePathString}`;
-		}
+		const subject = (hasDirectChildError)
+			? 'child'
+			: 'indirect-child';
 
-		return error.message;
+		return new TopError({
+			errorSubject: subject,
+			originalError: firstChildError.originalError,
+			parentUri: firstChildError.parentUri,
+			errorsCount: totalErrorsCount,
+		});
 	}
 
 	/**
@@ -716,18 +604,6 @@ export class PromptFileReference extends BasePromptParser<FilePromptContentProvi
 	public override toString() {
 		return `prompt-reference/${this.token}`;
 	}
-
-	/**
-	 * @inheritdoc
-	 */
-	protected override getErrorMessage(error: ResolveError): string {
-		// if failed to open a file, return appropriate message and the file path
-		if (error instanceof OpenFailed) {
-			return `${errorMessages.openFailed} '${error.uri.path}'.`;
-		}
-
-		return super.getErrorMessage(error);
-	}
 }
 
 /**
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/topError.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/topError.ts
new file mode 100644
index 000000000000..983c383a1e13
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/topError.ts
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ITopError } from './types.js';
+import { localize } from '../../../../../../nls.js';
+import { assert } from '../../../../../../base/common/assert.js';
+import { assertDefined } from '../../../../../../base/common/types.js';
+import { OpenFailed, RecursiveReference, FailedToResolveContentsStream } from '../../promptFileReferenceErrors.js';
+
+/**
+ * TODO: @lego
+ */
+export class TopError implements ITopError {
+	public readonly errorSubject = this.options.errorSubject;
+	public readonly originalError = this.options.originalError;
+	public readonly errorsCount = this.options.errorsCount;
+	public readonly parentUri = this.options.parentUri;
+
+	constructor(
+		private readonly options: Omit<ITopError, 'localizedMessage'>,
+	) { }
+
+
+	public get localizedMessage(): string {
+		// TODO: @legomushroom - update localization IDs
+		const { originalError, parentUri, errorSubject: subject, errorsCount } = this;
+
+		assert(
+			errorsCount >= 1,
+			`Error count must be at least 1, got '${errorsCount}'.`,
+		);
+
+		// a note about how many more link issues are there
+		const moreIssuesNote = (errorsCount > 1)
+			? localize('chatPromptInstructionsBrokenReferenceSuffix222222', "\n(+{0} more issues)", errorsCount - 1)
+			: '';
+
+		if (subject === 'root') {
+			if (originalError instanceof OpenFailed) {
+				return localize(
+					'chatPromptInstructionsFileOpenFailed111',
+					"Cannot open '{0}'.{1}",
+					originalError.uri.path,
+					moreIssuesNote,
+				);
+			}
+
+			if (originalError instanceof FailedToResolveContentsStream) {
+				return localize(
+					'chatPromptInstructionsStreamOpenFailed1111',
+					"Cannot read '{0}'.{1}",
+					originalError.uri.path,
+					moreIssuesNote,
+				);
+			}
+
+			if (originalError instanceof RecursiveReference) {
+				return localize(
+					'chatPromptInstructionsSelfRecursion4444',
+					"Recursion to itself.",
+				);
+			}
+
+			return originalError.message + moreIssuesNote;
+		}
+
+		// a sanity check - because the error subject is not `root`, the parent must set
+		assertDefined(
+			parentUri,
+			'Parent URI must be defined for error of non-root link.',
+		);
+
+		const errorMessageStart = (subject === 'child')
+			? localize('chatPromptInstructionsBrokenReferenceFile', "Contains")
+			: localize(
+				'chatPromptInstructionsBrokenChildReference',
+				"Indirectly referenced prompt '{0}' contains",
+				parentUri.path,
+			);
+
+		const linkIssueName = (originalError instanceof RecursiveReference)
+			? localize('chatPromptInstructionsBrokenChildRecursiveLink', "recursive")
+			: localize('chatPromptInstructionsBrokenChildBrokenLink', "broken");
+
+		return localize(
+			'chatPromptInstructionsBrokenReference111',
+			"{0} a {1} link to '{2}' that will be ignored.{3}",
+			errorMessageStart,
+			linkIssueName,
+			originalError.uri.path,
+			moreIssuesNote,
+		);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts
index 69bfb4c21ce6..49550473b674 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts
@@ -11,37 +11,41 @@ import { IRange, Range } from '../../../../../../editor/common/core/range.js';
 /**
  * TODO: @legomushroom
  */
-export interface IErrorWithLink {
+export interface IResolveError {
 	/**
-	 * TODO: @legomushroom
+	 * Original error instance.
 	 */
-	readonly error: ResolveError;
+	readonly originalError: ResolveError;
 
 	/**
-	 * TODO: @legomushroom
+	 * URI of the parent that references this error.
 	 */
-	readonly link: IPromptReference;
+	readonly parentUri?: URI;
 }
 
 /**
- * Interface for a resolve error.
+ * Top most error of the reference tree.
  */
-export interface IResolveError {
+export interface ITopError extends IResolveError {
 	/**
-	 * Localized error message.
+	 * Where does the error belong to:
+	 *
+	 *  - `root` - the error is the top most error of the entire tree
+	 *  - `child` - the error is a child of the root error
+	 *  - `indirect-child` - the error is a child of a child of the root error
 	 */
-	localizedMessage: string;
+	readonly errorSubject: 'root' | 'child' | 'indirect-child';
 
 	/**
-	 * Original error object.
+	 * Total number of all errors in the references tree, including the error
+	 * of the current reference and all possible errors of its children.
 	 */
-	originalError: ResolveError;
+	readonly errorsCount: number;
 
 	/**
-	 * Whether this error is for the root reference
-	 * object, or for one of its possible children.
+	 * Localized error message.
 	 */
-	isRootError: boolean;
+	readonly localizedMessage: string;
 }
 
 /**
@@ -111,19 +115,19 @@ interface IPromptReferenceBase extends IDisposable {
 	/**
 	 * TODO: @legomushroom
 	 */
-	readonly errors: readonly IErrorWithLink[];
+	readonly errors: readonly ResolveError[];
 
 	/**
 	 * List of all errors that occurred while resolving the current
 	 * reference including all possible errors of nested children.
 	 */
-	readonly allErrors: readonly IErrorWithLink[];
+	readonly allErrors: readonly IResolveError[];
 
 	/**
 	 * The top most error of the current reference or any of its
 	 * possible child reference errors.
 	 */
-	readonly topError: IResolveError | undefined;
+	readonly topError: ITopError | undefined;
 
 	/**
 	 * Direct references of the current reference.

From d2c2a224581da4b89544e04c76ea038ab229ca8b Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Mon, 24 Feb 2025 15:15:30 -0800
Subject: [PATCH 0881/1815] add more doc comments

---
 .../chat/common/promptFileReferenceErrors.ts  | 11 +++++-
 .../promptLinkDiagnosticsProvider.ts          | 28 +++++++++------
 .../promptSyntax/parsers/basePromptParser.ts  | 34 ++++++------------
 .../common/promptSyntax/parsers/topError.ts   | 36 ++++++++++---------
 .../common/promptSyntax/parsers/types.d.ts    |  4 +--
 5 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
index dd1b93be160b..9bae3eec666a 100644
--- a/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
+++ b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
@@ -135,7 +135,6 @@ export class RecursiveReference extends ResolveError {
 			uri,
 			`Recursive references found: ${pathString}.`,
 		);
-		this.recursivePathString = pathString;
 	}
 
 	/**
@@ -145,6 +144,14 @@ export class RecursiveReference extends ResolveError {
 		filename: 'basename' | 'fullpath',
 		pathJoinCharacter: string = DEFAULT_RECURSIVE_PATH_JOIN_CHAR,
 	): string {
+		/**
+		 * TODO: @lego - this not currently true though
+		 * TODO: @lego - cache
+		 */
+		if (filename === 'fullpath' && pathJoinCharacter === DEFAULT_RECURSIVE_PATH_JOIN_CHAR) {
+			return this.recursivePathString;
+		}
+
 		return this.recursivePath
 			.map((path) => {
 				if (filename === 'fullpath') {
@@ -176,6 +183,8 @@ export class RecursiveReference extends ResolveError {
 			return false;
 		}
 
+		// TODO: @lego - check array lengths first
+
 		// performance optimization - if the paths lengths don't match,
 		// no need to compare entire strings as they must be different
 		if (this.recursivePathString.length !== other.recursivePathString.length) {
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.ts
index 590c4ecf92dd..7d46c72dbbe0 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.ts
@@ -25,16 +25,16 @@ import { IConfigurationService } from '../../../../../../platform/configuration/
 import { IMarkerData, IMarkerService, MarkerSeverity } from '../../../../../../platform/markers/common/markers.js';
 
 /**
- * TODO: @legomushroom
+ * Unique ID of the markers provider class.
  */
 const MARKERS_OWNER_ID = 'reusable-prompts-syntax';
 
 /**
- * TODO: @legomushroom
+ * Prompt links diagnostics provider for a single text model.
  */
 class PromptLinkDiagnosticsProvider extends ObservableDisposable {
 	/**
-	 * TODO: @legomushroom
+	 * Reference to the current prompt syntax parser instance.
 	 */
 	private readonly parser: TextModelPromptParser;
 
@@ -56,7 +56,7 @@ class PromptLinkDiagnosticsProvider extends ObservableDisposable {
 	}
 
 	/**
-	 * TODO: @legomushroom
+	 * Update diagnostic markers for the current editor.
 	 */
 	private async updateMarkers() {
 		// ensure that parsing process is settled
@@ -94,9 +94,14 @@ class PromptLinkDiagnosticsProvider extends ObservableDisposable {
 }
 
 /**
- * TODO: @legomushroom
+ * Convert a prompt link with an issue to a marker data.
+ *
+ * @throws
+ *  - if there is no link issue (e.g., `topError` undefined)
+ *  - if there is no link range to highlight (e.g., `linkRange` undefined)
+ *  - if the original error is of `NotPromptFile` type - we don't want to
+ *    show diagnostic markers for non-prompt file links in the prompts
  */
-// TODO: @legomushroom - add @throws info
 const toMarker = (
 	link: IPromptFileReference,
 ): IMarkerData => {
@@ -132,11 +137,12 @@ const toMarker = (
 };
 
 /**
- * TODO: @legomushroom
+ * The class that manages creation and disposal of {@link PromptLinkDiagnosticsProvider}
+ * classes for each specific editor text model.
  */
-export class PromptsLinkDiagnosticsProvider extends Disposable {
+export class PromptLinkDiagnosticsInstanceManager extends Disposable {
 	/**
-	 * TODO: @legomushroom
+	 * Currently available {@link PromptLinkDiagnosticsProvider} instances.
 	 */
 	private readonly providers: ObjectCache<PromptLinkDiagnosticsProvider, ITextModel>;
 
@@ -187,7 +193,7 @@ export class PromptsLinkDiagnosticsProvider extends Disposable {
 	}
 
 	/**
-	 * TODO: @legomushroom
+	 * Initialize a new {@link PromptLinkDiagnosticsProvider} for the given editor.
 	 */
 	private handleNewEditor(editor: IEditor): this {
 		const model = editor.getModel();
@@ -215,4 +221,4 @@ export class PromptsLinkDiagnosticsProvider extends Disposable {
 
 // register the provider as a workbench contribution
 Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench)
-	.registerWorkbenchContribution(PromptsLinkDiagnosticsProvider, LifecyclePhase.Eventually);
+	.registerWorkbenchContribution(PromptLinkDiagnosticsInstanceManager, LifecyclePhase.Eventually);
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
index 383aeb7971e2..86b1833c96c1 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/basePromptParser.ts
@@ -398,32 +398,18 @@ export abstract class BasePromptParser<T extends IPromptContentsProvider> extend
 	}
 
 	/**
-	 * TODO: @legomushroom
+	 * Get list of errors for the direct links of the current reference.
 	 */
 	public get errors(): readonly ResolveError[] {
-		// collect error conditions of direct child references
-		const childErrors = this
-			// get immediate references
-			.references
-			// filter out children without error conditions or
-			// the ones that are non-prompt snippet files
-			.filter((childReference) => {
-				const { errorCondition } = childReference;
-
-				return errorCondition && !(errorCondition instanceof NotPromptFile);
-			})
-			// map to error condition objects
-			.map((childReference): ResolveError => {
-				const { errorCondition } = childReference;
-
-				// `must` always be `true` because of the `filter` call above
-				assertDefined(
-					errorCondition,
-					`Error condition must be present for '${childReference.uri.path}'.`,
-				);
-
-				return errorCondition;
-			});
+		const childErrors: ResolveError[] = [];
+
+		for (const reference of this.references) {
+			const { errorCondition } = reference;
+
+			if (errorCondition && (!(errorCondition instanceof NotPromptFile))) {
+				childErrors.push(errorCondition);
+			}
+		}
 
 		return childErrors;
 	}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/topError.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/topError.ts
index 983c383a1e13..0e6e4a9ad9c0 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/topError.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/topError.ts
@@ -10,11 +10,11 @@ import { assertDefined } from '../../../../../../base/common/types.js';
 import { OpenFailed, RecursiveReference, FailedToResolveContentsStream } from '../../promptFileReferenceErrors.js';
 
 /**
- * TODO: @lego
+ * The top-most error of the reference tree.
  */
 export class TopError implements ITopError {
-	public readonly errorSubject = this.options.errorSubject;
 	public readonly originalError = this.options.originalError;
+	public readonly errorSubject = this.options.errorSubject;
 	public readonly errorsCount = this.options.errorsCount;
 	public readonly parentUri = this.options.parentUri;
 
@@ -24,7 +24,6 @@ export class TopError implements ITopError {
 
 
 	public get localizedMessage(): string {
-		// TODO: @legomushroom - update localization IDs
 		const { originalError, parentUri, errorSubject: subject, errorsCount } = this;
 
 		assert(
@@ -33,37 +32,37 @@ export class TopError implements ITopError {
 		);
 
 		// a note about how many more link issues are there
-		const moreIssuesNote = (errorsCount > 1)
-			? localize('chatPromptInstructionsBrokenReferenceSuffix222222', "\n(+{0} more issues)", errorsCount - 1)
+		const moreIssuesLabel = (errorsCount > 1)
+			? localize('workbench.reusable-prompts.top-error.more-issues-label', "\n(+{0} more issues)", errorsCount - 1)
 			: '';
 
 		if (subject === 'root') {
 			if (originalError instanceof OpenFailed) {
 				return localize(
-					'chatPromptInstructionsFileOpenFailed111',
+					'workbench.reusable-prompts.top-error.open-failed',
 					"Cannot open '{0}'.{1}",
 					originalError.uri.path,
-					moreIssuesNote,
+					moreIssuesLabel,
 				);
 			}
 
 			if (originalError instanceof FailedToResolveContentsStream) {
 				return localize(
-					'chatPromptInstructionsStreamOpenFailed1111',
+					'workbench.reusable-prompts.top-error.cannot-read',
 					"Cannot read '{0}'.{1}",
 					originalError.uri.path,
-					moreIssuesNote,
+					moreIssuesLabel,
 				);
 			}
 
 			if (originalError instanceof RecursiveReference) {
 				return localize(
-					'chatPromptInstructionsSelfRecursion4444',
+					'workbench.reusable-prompts.top-error.recursive-reference',
 					"Recursion to itself.",
 				);
 			}
 
-			return originalError.message + moreIssuesNote;
+			return originalError.message + moreIssuesLabel;
 		}
 
 		// a sanity check - because the error subject is not `root`, the parent must set
@@ -73,24 +72,27 @@ export class TopError implements ITopError {
 		);
 
 		const errorMessageStart = (subject === 'child')
-			? localize('chatPromptInstructionsBrokenReferenceFile', "Contains")
+			? localize(
+				'workbench.reusable-prompts.top-error.child.direct',
+				"Contains",
+			)
 			: localize(
-				'chatPromptInstructionsBrokenChildReference',
+				'workbench.reusable-prompts.top-error.child.indirect',
 				"Indirectly referenced prompt '{0}' contains",
 				parentUri.path,
 			);
 
 		const linkIssueName = (originalError instanceof RecursiveReference)
-			? localize('chatPromptInstructionsBrokenChildRecursiveLink', "recursive")
-			: localize('chatPromptInstructionsBrokenChildBrokenLink', "broken");
+			? localize('recursive', "recursive")
+			: localize('broken', "broken");
 
 		return localize(
-			'chatPromptInstructionsBrokenReference111',
+			'workbench.reusable-prompts.top-error.child.final-message',
 			"{0} a {1} link to '{2}' that will be ignored.{3}",
 			errorMessageStart,
 			linkIssueName,
 			originalError.uri.path,
-			moreIssuesNote,
+			moreIssuesLabel,
 		);
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts
index 49550473b674..04f07f388b8e 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts
@@ -9,7 +9,7 @@ import { IDisposable } from '../../../../../../base/common/lifecycle.js';
 import { IRange, Range } from '../../../../../../editor/common/core/range.js';
 
 /**
- * TODO: @legomushroom
+ * A resolve error with a parent prompt URI, if any.
  */
 export interface IResolveError {
 	/**
@@ -113,7 +113,7 @@ interface IPromptReferenceBase extends IDisposable {
 	readonly errorCondition: ResolveError | undefined;
 
 	/**
-	 * TODO: @legomushroom
+	 * Get list of errors for the direct links of the current reference.
 	 */
 	readonly errors: readonly ResolveError[];
 

From 925d9b56be0303aac1da89582cd3be8452189092 Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Fri, 28 Feb 2025 14:57:03 -0800
Subject: [PATCH 0882/1815] improve recursive reference error

---
 .../chat/common/promptFileReferenceErrors.ts  | 46 ++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
index 9bae3eec666a..e19588df4e6a 100644
--- a/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
+++ b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
@@ -115,9 +115,9 @@ export class RecursiveReference extends ResolveError {
 	public override errorType = 'RecursiveReferenceError';
 
 	/**
-	 * Default string representation of the recursive path.
+	 * Cached default string representation of the recursive path.
 	 */
-	public readonly recursivePathString: string;
+	private defaultPathStringCache: string | undefined;
 
 	constructor(
 		uri: URI,
@@ -130,13 +130,15 @@ export class RecursiveReference extends ResolveError {
 			`Recursive path must contain at least two paths, got '${recursivePath.length}'.`,
 		);
 
-		const pathString = recursivePath.join(DEFAULT_RECURSIVE_PATH_JOIN_CHAR);
 		super(
-			uri,
-			`Recursive references found: ${pathString}.`,
+			uri, 'Recursive references found.',
 		);
 	}
 
+	public override get message(): string {
+		return `${super.message} ${this.getRecursivePathString('fullpath')}`;
+	}
+
 	/**
 	 * Returns a string representation of the recursive path.
 	 */
@@ -144,15 +146,14 @@ export class RecursiveReference extends ResolveError {
 		filename: 'basename' | 'fullpath',
 		pathJoinCharacter: string = DEFAULT_RECURSIVE_PATH_JOIN_CHAR,
 	): string {
-		/**
-		 * TODO: @lego - this not currently true though
-		 * TODO: @lego - cache
-		 */
-		if (filename === 'fullpath' && pathJoinCharacter === DEFAULT_RECURSIVE_PATH_JOIN_CHAR) {
-			return this.recursivePathString;
+		const isDefault = (filename === 'fullpath') &&
+			(pathJoinCharacter === DEFAULT_RECURSIVE_PATH_JOIN_CHAR);
+
+		if (isDefault && (this.defaultPathStringCache !== undefined)) {
+			return this.defaultPathStringCache;
 		}
 
-		return this.recursivePath
+		const result = this.recursivePath
 			.map((path) => {
 				if (filename === 'fullpath') {
 					return `'${path}'`;
@@ -168,6 +169,12 @@ export class RecursiveReference extends ResolveError {
 				);
 			})
 			.join(pathJoinCharacter);
+
+		if (isDefault) {
+			this.defaultPathStringCache = result;
+		}
+
+		return result;
 	}
 
 	/**
@@ -183,15 +190,22 @@ export class RecursiveReference extends ResolveError {
 			return false;
 		}
 
-		// TODO: @lego - check array lengths first
+		// performance optimization - compare number of paths in the
+		// recursive path chains first to avoid comparison of all strings
+		if (this.recursivePath.length !== other.recursivePath.length) {
+			return false;
+		}
+
+		const myRecursivePath = this.getRecursivePathString('fullpath');
+		const theirRecursivePath = other.getRecursivePathString('fullpath');
 
-		// performance optimization - if the paths lengths don't match,
+		// performance optimization - if the path lengths don't match,
 		// no need to compare entire strings as they must be different
-		if (this.recursivePathString.length !== other.recursivePathString.length) {
+		if (myRecursivePath.length !== theirRecursivePath.length) {
 			return false;
 		}
 
-		return this.recursivePathString === other.recursivePathString;
+		return myRecursivePath === theirRecursivePath;
 	}
 
 	/**

From 4926127b0691c8cb11324892ff87647c17306d8b Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Wed, 12 Mar 2025 15:25:21 -0700
Subject: [PATCH 0883/1815] fix linter issue

---
 .../common/promptSyntax/parsers/topError.ts    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/topError.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/topError.ts
index 0e6e4a9ad9c0..97584c8a917c 100644
--- a/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/topError.ts
+++ b/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/topError.ts
@@ -13,15 +13,19 @@ import { OpenFailed, RecursiveReference, FailedToResolveContentsStream } from '.
  * The top-most error of the reference tree.
  */
 export class TopError implements ITopError {
-	public readonly originalError = this.options.originalError;
-	public readonly errorSubject = this.options.errorSubject;
-	public readonly errorsCount = this.options.errorsCount;
-	public readonly parentUri = this.options.parentUri;
+	public readonly originalError: ITopError['originalError'];
+	public readonly errorSubject: ITopError['errorSubject'];
+	public readonly errorsCount: ITopError['errorsCount'];
+	public readonly parentUri: ITopError['parentUri'];
 
 	constructor(
-		private readonly options: Omit<ITopError, 'localizedMessage'>,
-	) { }
-
+		readonly options: Omit<ITopError, 'localizedMessage'>,
+	) {
+		this.originalError = options.originalError;
+		this.errorSubject = options.errorSubject;
+		this.errorsCount = options.errorsCount;
+		this.parentUri = options.parentUri;
+	}
 
 	public get localizedMessage(): string {
 		const { originalError, parentUri, errorSubject: subject, errorsCount } = this;

From 4560f083af9d56bbb72c324c00408792779a13f7 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 12 Mar 2025 16:32:31 -0700
Subject: [PATCH 0884/1815] mcp: add status indicator for mcp tools, discovery
 setting (#243402)

The tool indicator in chat now has:
- A "refresh" action if there are new MCP servers with undiscovered
  tools (clicking starts the servers)
- An error if any tool fails to start (clicking opens the first failing
  tool options quickpick)
- A loading indicator while they're starting (clicking opens output)

This also adds a `chat.mpc.discovery.enabled` setting, off by default
for now, to configure whether filesystem discovery is enabled. I expect
to turn this on as we gain confidence with the feature.

Refs #243229
---
 .../contrib/chat/browser/chat.contribution.ts |   7 +-
 .../contrib/chat/browser/media/chat.css       |  39 ++++++
 .../contrib/mcp/browser/mcpCommands.ts        | 119 ++++++++++++++++--
 .../common/discovery/configMcpDiscovery.ts    |   2 +
 .../discovery/nativeMcpDiscoveryAbstract.ts   |  24 +++-
 .../discovery/nativeMcpRemoteDiscovery.ts     |   4 +-
 .../contrib/mcp/common/mcpConfiguration.ts    |   1 +
 .../workbench/contrib/mcp/common/mcpServer.ts |  18 ++-
 .../workbench/contrib/mcp/common/mcpTypes.ts  |  15 ++-
 .../electron-sandbox/nativeMpcDiscovery.ts    |   4 +-
 10 files changed, 213 insertions(+), 20 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 74625488a2e4..9e9adc8ef437 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -101,7 +101,7 @@ import { ChatStatusBarEntry } from './chatStatus.js';
 import product from '../../../../platform/product/common/product.js';
 import { Event } from '../../../../base/common/event.js';
 import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditing/notebook/chatEditingNotebookFileSystemProvider.js';
-import { mcpConfigurationSection, mcpSchemaExampleServers } from '../../mcp/common/mcpConfiguration.js';
+import { mcpConfigurationSection, mcpDiscoverySection, mcpSchemaExampleServers } from '../../mcp/common/mcpConfiguration.js';
 import { mcpSchemaId } from '../../../services/configuration/common/configuration.js';
 import { ChatTransferService, IChatTransferService } from '../common/chatTransferService.js';
 import { ChatTransferContribution } from './actions/chatTransfer.js';
@@ -213,6 +213,11 @@ configurationRegistry.registerConfiguration({
 			description: nls.localize('workspaceConfig.mcp.description', "Model Context Protocol server configurations"),
 			$ref: mcpSchemaId
 		},
+		[mcpDiscoverySection]: {
+			type: 'boolean',
+			default: false,
+			description: nls.localize('mpc.discovery.enabled', "Enable discovery of Model Context Protocol servers on the machine."),
+		},
 		[PromptsConfig.CONFIG_KEY]: {
 			type: 'boolean',
 			title: nls.localize(
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 68deb3b7c60d..a0555fd2b9ff 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1149,6 +1149,45 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	gap: 5px;
 }
 
+.action-item.chat-mcp {
+	display: flex !important;
+
+	&.chat-mcp-has-action .action-label {
+		border-top-right-radius: 0;
+		border-bottom-right-radius: 0;
+		border-right: 0;
+	}
+
+	.chat-mcp-action {
+		align-self: stretch;
+		padding: 0 2px;
+		border-radius: 0;
+		outline: 0;
+		border: 0;
+		border-top-right-radius: 4px;
+		border-bottom-right-radius: 4px;
+		background: var(--vscode-button-background);
+		cursor: pointer;
+
+		.codicon {
+			width: fit-content;
+			color: var(--vscode-button-foreground);
+		}
+
+		.codicon::before {
+			font-size: 14px;
+		}
+
+		&.chat-mcp-action-error {
+			background: var(--vscode-activityErrorBadge-background);
+
+			.codicon {
+				color: var(--vscode-activityErrorBadge-foreground);
+			}
+		}
+	}
+}
+
 .action-item.chat-attached-context-attachment.chat-add-files .action-label.codicon::before {
 	font: normal normal normal 16px/1 codicon;
 }
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 7153741982b5..1ab507351fcf 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -3,15 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import './media/mcp.css';
-import { reset } from '../../../../base/browser/dom.js';
+import { addDisposableListener, EventType, h, reset } from '../../../../base/browser/dom.js';
 import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { assertNever } from '../../../../base/common/assert.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { diffSets, groupBy } from '../../../../base/common/collections.js';
 import { Event } from '../../../../base/common/event.js';
-import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { autorun, derived, transaction } from '../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 import { assertType } from '../../../../base/common/types.js';
 import { ILocalizedString, localize, localize2 } from '../../../../nls.js';
 import { IActionViewItemService } from '../../../../platform/actions/browser/actionViewItemService.js';
@@ -22,12 +23,14 @@ import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextke
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { spinningLoading } from '../../../../platform/theme/common/iconRegistry.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { CHAT_CATEGORY } from '../../chat/browser/actions/chatActions.js';
 import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
 import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
 import { McpContextKeys } from '../common/mcpContextKeys.js';
-import { IMcpServer, IMcpService, IMcpTool, McpConnectionState } from '../common/mcpTypes.js';
+import { IMcpServer, IMcpService, IMcpTool, McpConnectionState, McpServerToolsState } from '../common/mcpTypes.js';
+import './media/mcp.css';
 
 // acroynms do not get localized
 const category: ILocalizedString = {
@@ -65,7 +68,7 @@ export class ListMcpServerCommand extends Action2 {
 					...servers.map(server => ({
 						id: server.definition.id,
 						label: server.definition.label,
-						description: McpConnectionState.toString(server.state.read(reader)),
+						description: McpConnectionState.toString(server.connectionState.read(reader)),
 					})),
 				];
 			});
@@ -117,7 +120,7 @@ export class McpServerOptionsCommand extends Action2 {
 		}
 
 		const items: ActionItem[] = [];
-		const serverState = server.state.get();
+		const serverState = server.connectionState.get();
 
 		// Only show start when server is stopped or in error state
 		if (McpConnectionState.canBeStarted(serverState.state)) {
@@ -230,14 +233,14 @@ export class AttachMCPToolsAction extends Action2 {
 			}
 			picks.push({
 				type: 'separator',
-				label: localize('desc', "MCP Server - {0}", McpConnectionState.toString(server.state.get()))
+				label: localize('desc', "MCP Server - {0}", McpConnectionState.toString(server.connectionState.get()))
 			});
 
 			const item: ServerPick = {
 				server,
 				type: 'item',
 				label: `${server.definition.label}`,
-				description: localize('desc', "MCP Server - {0}", McpConnectionState.toString(server.state.get())),
+				description: localize('desc', "MCP Server - {0}", McpConnectionState.toString(server.connectionState.get())),
 				picked: tools.some(tool => tool.enabled.get()),
 				toolPicks: []
 			};
@@ -340,10 +343,17 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 	constructor(
 		@IActionViewItemService actionViewItemService: IActionViewItemService,
 		@IMcpService mcpService: IMcpService,
-		@IInstantiationService instaService: IInstantiationService
+		@IInstantiationService instaService: IInstantiationService,
+		@ICommandService commandService: ICommandService,
 	) {
 		super();
 
+		const enum DisplayedState {
+			None,
+			NewTools,
+			Error,
+			Refreshing,
+		}
 
 		const toolsCount = derived(r => {
 			let count = 0;
@@ -358,6 +368,30 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 			return { count, enabled };
 		});
 
+		const displayedState = derived(reader => {
+			const servers = mcpService.servers.read(reader);
+			const serversPerState: IMcpServer[][] = [];
+			for (const server of servers) {
+				let thisState = DisplayedState.None;
+				switch (server.toolsState.read(reader)) {
+					case McpServerToolsState.Unknown:
+						thisState = server.connectionState.read(reader).state === McpConnectionState.Kind.Error ? DisplayedState.Error : DisplayedState.NewTools;
+						break;
+					case McpServerToolsState.RefreshingFromUnknown:
+						thisState = DisplayedState.Refreshing;
+						break;
+					case McpServerToolsState.Cached:
+						thisState = server.connectionState.read(reader).state === McpConnectionState.Kind.Error ? DisplayedState.Error : DisplayedState.None;
+						break;
+				}
+
+				serversPerState[thisState] ??= [];
+				serversPerState[thisState].push(server);
+			}
+
+			const maxState = (serversPerState.length - 1) as DisplayedState;
+			return { state: maxState, servers: serversPerState[maxState] };
+		});
 
 		this._store.add(actionViewItemService.register(MenuId.ChatInputAttachmentToolbar, AttachMCPToolsAction.id, (action, options) => {
 			if (!(action instanceof MenuItemAction)) {
@@ -371,6 +405,73 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 					this.options.label = true;
 					container.classList.add('chat-mcp');
 					super.render(container);
+
+					const action = h('button.chat-mcp-action', [h('span@icon')]);
+
+					this._register(autorun(r => {
+						const { state, servers } = displayedState.read(r);
+						const { root, icon } = action;
+						this.updateTooltip();
+						container.classList.toggle('chat-mcp-has-action', state !== DisplayedState.None);
+
+						if (state === DisplayedState.None) {
+							root.remove();
+							return;
+						}
+
+						if (!root.parentElement) {
+							container.appendChild(root);
+						}
+
+						root.ariaLabel = this.getLabelForState({ state, servers });
+						root.className = 'chat-mcp-action';
+						icon.className = '';
+						if (state === DisplayedState.NewTools) {
+							root.classList.add('chat-mcp-action-new');
+							icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.refresh));
+						} else if (state === DisplayedState.Error) {
+							root.classList.add('chat-mcp-action-error');
+							icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.warning));
+						} else if (state === DisplayedState.Refreshing) {
+							root.classList.add('chat-mcp-action-refreshing');
+							icon.classList.add(...ThemeIcon.asClassNameArray(spinningLoading));
+						} else {
+							assertNever(state);
+						}
+					}));
+
+					this._register(addDisposableListener(action.root, EventType.CLICK, e => {
+						e.preventDefault();
+						e.stopPropagation();
+
+						const { state, servers } = displayedState.get();
+						if (state === DisplayedState.NewTools) {
+							servers.forEach(server => server.start());
+						} else if (state === DisplayedState.Refreshing) {
+							servers.at(-1)?.showOutput();
+						} else if (state === DisplayedState.Error) {
+							const server = servers.at(-1);
+							if (server) {
+								commandService.executeCommand(McpServerOptionsCommand.id, server.definition.id);
+							}
+						}
+					}));
+				}
+
+				protected override getTooltip(): string {
+					return this.getLabelForState() || super.getTooltip();
+				}
+
+				private getLabelForState({ state, servers } = displayedState.get()) {
+					if (state === DisplayedState.NewTools) {
+						return localize('mcp.newTools', "New tools available ({0})", servers.length);
+					} else if (state === DisplayedState.Error) {
+						return localize('mcp.toolError', "Error loading {0} tool(s)", servers.length);
+					} else if (state === DisplayedState.Refreshing) {
+						return localize('mcp.toolRefresh', "Discovering tools...");
+					} else {
+						return null;
+					}
 				}
 
 				protected override updateLabel(): void {
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts b/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
index c0ee83a78d3c..1e698b7e6b1d 100644
--- a/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
+++ b/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
@@ -119,8 +119,10 @@ export class ConfigMcpDiscovery extends Disposable implements IMcpDiscovery {
 				continue;
 			}
 
+
 			if (!nextDefinitions.length) {
 				src.disposable.clear();
+				src.serverDefinitions.set(nextDefinitions, undefined);
 			} else {
 				src.serverDefinitions.set(nextDefinitions, undefined);
 				src.disposable.value ??= this._mcpRegistry.registerCollection({
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.ts b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.ts
index 7fe18f5f4a4e..803439a8b83d 100644
--- a/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.ts
+++ b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.ts
@@ -6,15 +6,18 @@
 import { RunOnceScheduler } from '../../../../../base/common/async.js';
 import { Disposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../../base/common/network.js';
-import { observableValue } from '../../../../../base/common/observable.js';
+import { autorunWithStore, IObservable, observableValue } 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 { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { INativeMcpDiscoveryData } from '../../../../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
+import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
 import { StorageScope } from '../../../../../platform/storage/common/storage.js';
 import { Dto } from '../../../../services/extensions/common/proxyIdentifier.js';
+import { mcpDiscoverySection } from '../mcpConfiguration.js';
 import { IMcpRegistry } from '../mcpRegistryTypes.js';
 import { McpCollectionDefinition, McpCollectionSortOrder, McpServerDefinition } from '../mcpTypes.js';
 import { IMcpDiscovery } from './mcpDiscovery.js';
@@ -26,6 +29,7 @@ import { ClaudeDesktopMpcDiscoveryAdapter, NativeMpcDiscoveryAdapter } from './n
  */
 export abstract class FilesystemMpcDiscovery extends Disposable implements IMcpDiscovery {
 	private readonly adapters: readonly NativeMpcDiscoveryAdapter[];
+	private _fsDiscoveryEnabled: IObservable<boolean>;
 	private suffix = '';
 
 	constructor(
@@ -34,12 +38,15 @@ export abstract class FilesystemMpcDiscovery extends Disposable implements IMcpD
 		@IFileService private readonly fileService: IFileService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IMcpRegistry private readonly mcpRegistry: IMcpRegistry,
+		@IConfigurationService configurationService: IConfigurationService,
 	) {
 		super();
 		if (remoteAuthority) {
 			this.suffix = ' ' + localize('onRemoteLabel', ' on {0}', labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority));
 		}
 
+		this._fsDiscoveryEnabled = observableConfigValue(mcpDiscoverySection, false, configurationService);
+
 		this.adapters = [
 			instantiationService.createInstance(ClaudeDesktopMpcDiscoveryAdapter, remoteAuthority)
 		];
@@ -97,10 +104,17 @@ export abstract class FilesystemMpcDiscovery extends Disposable implements IMcpD
 				}
 			};
 
-			const watcher = this._register(this.fileService.createWatcher(file, { recursive: false, excludes: [] }));
-			const throttler = this._register(new RunOnceScheduler(updateFile, 500));
-			this._register(watcher.onDidChange(() => throttler.schedule()));
-			updateFile();
+			this._register(autorunWithStore((reader, store) => {
+				if (!this._fsDiscoveryEnabled.read(reader)) {
+					collectionRegistration.clear();
+					return;
+				}
+
+				const throttler = store.add(new RunOnceScheduler(updateFile, 500));
+				const watcher = store.add(this.fileService.createWatcher(file, { recursive: false, excludes: [] }));
+				store.add(watcher.onDidChange(() => throttler.schedule()));
+				updateFile();
+			}));
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpRemoteDiscovery.ts b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpRemoteDiscovery.ts
index 44e2ed08b5bc..4f525561f6f6 100644
--- a/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpRemoteDiscovery.ts
+++ b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpRemoteDiscovery.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ProxyChannel } from '../../../../../base/parts/ipc/common/ipc.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
@@ -24,8 +25,9 @@ export class RemoteNativeMpcDiscovery extends FilesystemMpcDiscovery {
 		@IFileService fileService: IFileService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IMcpRegistry mcpRegistry: IMcpRegistry,
+		@IConfigurationService configurationService: IConfigurationService,
 	) {
-		super(remoteAgent.getConnection()?.remoteAuthority || null, labelService, fileService, instantiationService, mcpRegistry);
+		super(remoteAgent.getConnection()?.remoteAuthority || null, labelService, fileService, instantiationService, mcpRegistry, configurationService);
 	}
 
 	public override async start() {
diff --git a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
index 25e58fa94858..5b14992c34cb 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
@@ -17,6 +17,7 @@ const mcpSchemaExampleServer = {
 };
 
 export const mcpConfigurationSection = 'mcp';
+export const mcpDiscoverySection = 'chat.mpc.discovery.enabled';
 
 export const mcpSchemaExampleServers = {
 	'mcp-server-time': {
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServer.ts b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
index e5fea1c89c20..e787b9fede00 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServer.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
@@ -12,7 +12,7 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../platfo
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { IMcpRegistry } from './mcpRegistryTypes.js';
 import { McpServerRequestHandler } from './mcpServerRequestHandler.js';
-import { McpCollectionDefinition, IMcpServer, IMcpServerConnection, McpServerDefinition, IMcpTool, McpConnectionFailedError, McpConnectionState } from './mcpTypes.js';
+import { McpCollectionDefinition, IMcpServer, IMcpServerConnection, McpServerDefinition, IMcpTool, McpConnectionFailedError, McpConnectionState, McpServerToolsState } from './mcpTypes.js';
 import { MCP } from './modelContextProtocol.js';
 
 
@@ -63,7 +63,7 @@ export class McpServer extends Disposable implements IMcpServer {
 	private readonly _connectionSequencer = new Sequencer();
 	private readonly _connection = this._register(disposableObservableValue<IMcpServerConnection | undefined>(this, undefined));
 
-	public readonly state: IObservable<McpConnectionState> = derived(reader => this._connection.read(reader)?.state.read(reader) ?? { state: McpConnectionState.Kind.Stopped });
+	public readonly connectionState: IObservable<McpConnectionState> = derived(reader => this._connection.read(reader)?.state.read(reader) ?? { state: McpConnectionState.Kind.Stopped });
 
 	private get toolsFromCache() {
 		return this._toolCache.getTools(this.definition.id);
@@ -77,6 +77,20 @@ export class McpServer extends Disposable implements IMcpServer {
 		return definitions.map(def => new McpTool(this, def));
 	});
 
+	public readonly toolsState = derived(reader => {
+		const fromServer = this.toolsFromServerPromise.read(reader);
+		if (!fromServer) {
+			return this.toolsFromCache ? McpServerToolsState.Cached : McpServerToolsState.Unknown;
+		}
+
+		const fromServerResult = fromServer?.promiseResult.read(reader);
+		if (!fromServerResult) {
+			return this.toolsFromCache ? McpServerToolsState.RefreshingFromCached : McpServerToolsState.RefreshingFromUnknown;
+		}
+
+		return fromServerResult.error ? (this.toolsFromCache ? McpServerToolsState.Cached : McpServerToolsState.Unknown) : McpServerToolsState.Live;
+	});
+
 	constructor(
 		public readonly collection: McpCollectionDefinition,
 		public readonly definition: McpServerDefinition,
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
index d7909a2f2d20..9b273ff5da0d 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
@@ -101,7 +101,7 @@ export const IMcpService = createDecorator<IMcpService>('IMcpService');
 export interface IMcpServer extends IDisposable {
 	readonly collection: McpCollectionDefinition;
 	readonly definition: McpServerDefinition;
-	readonly state: IObservable<McpConnectionState>;
+	readonly connectionState: IObservable<McpConnectionState>;
 	showOutput(): void;
 	/**
 	 * Starts the server and returns its resulting state. One of:
@@ -112,9 +112,22 @@ export interface IMcpServer extends IDisposable {
 	start(isFromInteraction?: boolean): Promise<McpConnectionState>;
 	stop(): Promise<void>;
 
+	readonly toolsState: IObservable<McpServerToolsState>;
 	readonly tools: IObservable<readonly IMcpTool[]>;
 }
 
+export const enum McpServerToolsState {
+	/** Tools have not been read before */
+	Unknown,
+	/** Tools were read from the cache */
+	Cached,
+	/** Tools are refreshing for the first time */
+	RefreshingFromUnknown,
+	/** Tools are refreshing and the current tools are cached */
+	RefreshingFromCached,
+	/** Tool state is live, server is connected */
+	Live,
+}
 
 export interface IMcpTool {
 
diff --git a/src/vs/workbench/contrib/mcp/electron-sandbox/nativeMpcDiscovery.ts b/src/vs/workbench/contrib/mcp/electron-sandbox/nativeMpcDiscovery.ts
index 3a05e75b7a05..11da0b14991f 100644
--- a/src/vs/workbench/contrib/mcp/electron-sandbox/nativeMpcDiscovery.ts
+++ b/src/vs/workbench/contrib/mcp/electron-sandbox/nativeMpcDiscovery.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ProxyChannel } from '../../../../base/parts/ipc/common/ipc.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 { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
@@ -21,8 +22,9 @@ export class NativeMcpDiscovery extends FilesystemMpcDiscovery {
 		@IFileService fileService: IFileService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IMcpRegistry mcpRegistry: IMcpRegistry,
+		@IConfigurationService configurationService: IConfigurationService,
 	) {
-		super(null, labelService, fileService, instantiationService, mcpRegistry);
+		super(null, labelService, fileService, instantiationService, mcpRegistry, configurationService);
 	}
 
 	public override start(): void {

From b61d46c3e494db5b590274d2455d9aa6ac4ea62e Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Wed, 12 Mar 2025 16:58:50 -0700
Subject: [PATCH 0885/1815] Add extra catch around package manager

---
 .../src/filesystems/autoInstallerFs.ts               | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/extensions/typescript-language-features/src/filesystems/autoInstallerFs.ts b/extensions/typescript-language-features/src/filesystems/autoInstallerFs.ts
index d639b7fe9990..1265b07450d7 100644
--- a/extensions/typescript-language-features/src/filesystems/autoInstallerFs.ts
+++ b/extensions/typescript-language-features/src/filesystems/autoInstallerFs.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { PackageManager } from '@vscode/ts-package-manager';
+import { PackageManager, ResolvedProject } from '@vscode/ts-package-manager';
 import { basename, join } from 'path';
 import * as vscode from 'vscode';
 import { URI } from 'vscode-uri';
@@ -161,12 +161,18 @@ export class AutoInstallerFs extends Disposable implements vscode.FileSystemProv
 		}
 
 		const installing = (async () => {
-			const proj = await this.packageManager.resolveProject(root, await this.getInstallOpts(incomingUri.original, root));
+			let proj: ResolvedProject;
+			try {
+				proj = await this.packageManager.resolveProject(root, await this.getInstallOpts(incomingUri.original, root));
+			} catch (e) {
+				console.error(`failed to resolve project at ${incomingUri.path}: `, e);
+				return;
+			}
+
 			try {
 				await proj.restore();
 			} catch (e) {
 				console.error(`failed to restore package at ${incomingUri.path}: `, e);
-				throw e;
 			}
 		})();
 		this._projectCache.set(root, installing);

From 8ef2f681ceaa60f8a9ea4dade22813c17940cbf2 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 12 Mar 2025 17:24:40 -0700
Subject: [PATCH 0886/1815] Chat view unification (#243285)

* Start enabling unified chat mode

* Move ChatAgentLocation to avoid import cycle. Update imports

* fix more imports

* More work

* Add ChatMode, make agent mode be session-specific, not global
Towards unifying chat views

* Fix mode for transferred session and request parser

* Fixes

* Fix defaultAgent, don't do intent detection

* Fixes

* Don't show mode picker in other locations

* Add chatMode context key

* Fix "new edit session" in unified

* Update context actions

* Update execute actions

* Title actions

* Update more commands
---
 .../api/browser/mainThreadChatAgents2.ts      |   3 +-
 .../workbench/api/common/extHost.protocol.ts  |   3 +-
 .../api/common/extHostChatAgents2.ts          |   9 +-
 .../api/common/extHostTypeConverters.ts       |   3 +-
 .../browser/actions/chatAccessibilityHelp.ts  |   2 +-
 .../chat/browser/actions/chatActions.ts       |   3 +-
 .../chat/browser/actions/chatClearActions.ts  |  39 +++---
 .../browser/actions/chatCodeblockActions.ts   |   2 +-
 .../browser/actions/chatContextActions.ts     |  60 ++++-----
 .../browser/actions/chatExecuteActions.ts     | 117 +++++++++++-------
 .../chat/browser/actions/chatTitleActions.ts  |  24 ++--
 .../contrib/chat/browser/chat.contribution.ts |  40 +++---
 src/vs/workbench/contrib/chat/browser/chat.ts |  16 ++-
 .../browser/chatEditing/chatEditingActions.ts |  69 +++++++----
 .../chatEditing/chatEditingServiceImpl.ts     |   3 +-
 .../contrib/chat/browser/chatEditor.ts        |   2 +-
 .../contrib/chat/browser/chatFollowups.ts     |   3 +-
 .../contrib/chat/browser/chatInputPart.ts     |  51 +++++---
 .../contrib/chat/browser/chatListRenderer.ts  |  26 ++--
 .../browser/chatParticipant.contribution.ts   |  14 ++-
 .../contrib/chat/browser/chatQuick.ts         |   2 +-
 .../contrib/chat/browser/chatVariables.ts     |   6 +-
 .../contrib/chat/browser/chatViewPane.ts      |  19 +--
 .../contrib/chat/browser/chatWidget.ts        |  33 +++--
 .../browser/contrib/chatImplicitContext.ts    |   2 +-
 .../browser/contrib/chatInputCompletions.ts   |   3 +-
 .../contrib/chat/browser/media/chat.css       |   5 -
 .../viewsWelcome/chatViewWelcomeController.ts |   3 +-
 src/vs/workbench/contrib/chat/common/chat.ts  |  16 +++
 .../contrib/chat/common/chatAgents.ts         |  32 ++---
 .../contrib/chat/common/chatContextKeys.ts    |  22 +++-
 .../contrib/chat/common/chatModel.ts          |   3 +-
 .../contrib/chat/common/chatParserTypes.ts    |   3 +-
 .../common/chatParticipantContribTypes.ts     |   4 +-
 .../contrib/chat/common/chatRequestParser.ts  |   4 +-
 .../contrib/chat/common/chatService.ts        |   7 +-
 .../contrib/chat/common/chatServiceImpl.ts    |  16 ++-
 .../contrib/chat/common/chatVariables.ts      |   2 +-
 .../chat/common/chatWidgetHistoryService.ts   |   3 +-
 .../contrib/chat/common/constants.ts          |  27 ++++
 .../test/browser/chatEditingService.test.ts   |   3 +-
 .../chat/test/common/chatModel.test.ts        |   3 +-
 .../chat/test/common/chatService.test.ts      |   3 +-
 .../chat/test/common/mockChatService.ts       |   5 +
 .../chat/test/common/mockChatVariables.ts     |   2 +-
 .../emptyTextEditorHint.ts                    |   3 +-
 .../browser/inlineChatController.ts           |   6 +-
 .../test/browser/inlineChatSession.test.ts    |   3 +-
 .../contrib/mcp/browser/mcpCommands.ts        |   8 +-
 .../chat/notebook.chat.contribution.ts        |   3 +-
 .../controller/chat/notebookChatController.ts |   2 +-
 .../browser/commandsQuickAccess.ts            |   3 +-
 .../browser/relauncher.contribution.ts        |   7 ++
 .../chat/browser/terminalChatWidget.ts        |   2 +-
 54 files changed, 471 insertions(+), 283 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/common/chat.ts

diff --git a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
index 37e32ea1a822..220e9c2854f6 100644
--- a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
+++ b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
@@ -24,11 +24,12 @@ import { ILogService } from '../../../platform/log/common/log.js';
 import { IChatWidgetService } from '../../contrib/chat/browser/chat.js';
 import { ChatInputPart } from '../../contrib/chat/browser/chatInputPart.js';
 import { AddDynamicVariableAction, IAddDynamicVariableContext } from '../../contrib/chat/browser/contrib/chatDynamicVariables.js';
-import { ChatAgentLocation, IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentRequest, IChatAgentService } from '../../contrib/chat/common/chatAgents.js';
+import { IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentRequest, IChatAgentService } from '../../contrib/chat/common/chatAgents.js';
 import { IChatEditingService, IChatRelatedFileProviderMetadata } from '../../contrib/chat/common/chatEditingService.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, IChatWarningMessage } from '../../contrib/chat/common/chatService.js';
+import { ChatAgentLocation } from '../../contrib/chat/common/constants.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';
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 498c1c1cb1d8..75e9a78f132f 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -51,12 +51,13 @@ 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 { ChatAgentLocation, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, IChatWelcomeMessageContent } from '../../contrib/chat/common/chatAgents.js';
+import { IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, IChatWelcomeMessageContent } from '../../contrib/chat/common/chatAgents.js';
 import { ICodeMapperRequest, ICodeMapperResult } from '../../contrib/chat/common/chatCodeMapperService.js';
 import { IChatRelatedFile, IChatRelatedFileProviderMetadata as IChatRelatedFilesProviderMetadata, IChatRequestDraft } from '../../contrib/chat/common/chatEditingService.js';
 import { IChatProgressHistoryResponseContent } from '../../contrib/chat/common/chatModel.js';
 import { IChatContentInlineReference, IChatFollowup, IChatNotebookEdit, IChatProgress, IChatResponseErrorDetails, IChatTask, IChatTaskDto, IChatUserActionEvent, IChatVoteAction } from '../../contrib/chat/common/chatService.js';
 import { IChatRequestVariableValue } from '../../contrib/chat/common/chatVariables.js';
+import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { IChatMessage, IChatResponseFragment, ILanguageModelChatMetadata, ILanguageModelChatSelector, ILanguageModelsChangeEvent } from '../../contrib/chat/common/languageModels.js';
 import { IPreparedToolInvocation, IToolData, IToolInvocation, IToolResult } from '../../contrib/chat/common/languageModelToolsService.js';
 import { DebugConfigurationProviderTriggerKind, IAdapterDescriptor, IConfig, IDebugSessionReplMode, IDebugTestRunReference, IDebugVisualization, IDebugVisualizationContext, IDebugVisualizationTreeItem, MainThreadDebugVisualization } from '../../contrib/debug/common/debug.js';
diff --git a/src/vs/workbench/api/common/extHostChatAgents2.ts b/src/vs/workbench/api/common/extHostChatAgents2.ts
index 1c7afac413a5..d765cceec7ce 100644
--- a/src/vs/workbench/api/common/extHostChatAgents2.ts
+++ b/src/vs/workbench/api/common/extHostChatAgents2.ts
@@ -20,19 +20,20 @@ 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 { ChatAgentLocation, IChatAgentRequest, IChatAgentResult, IChatAgentResultTimings, IChatWelcomeMessageContent } from '../../contrib/chat/common/chatAgents.js';
+import { isChatViewTitleActionContext } from '../../contrib/chat/common/chatActions.js';
+import { IChatAgentRequest, IChatAgentResult, IChatAgentResultTimings, IChatWelcomeMessageContent } 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 { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { Dto } from '../../services/extensions/common/proxyIdentifier.js';
 import { ExtHostChatAgentsShape2, IChatAgentCompletionItem, IChatAgentHistoryEntryDto, IChatProgressDto, IExtensionChatAgentMetadata, IMainContext, MainContext, MainThreadChatAgentsShape2 } from './extHost.protocol.js';
 import { CommandsConverter, ExtHostCommands } from './extHostCommands.js';
+import { ExtHostDiagnostics } from './extHostDiagnostics.js';
 import { ExtHostDocuments } from './extHostDocuments.js';
 import { ExtHostLanguageModels } from './extHostLanguageModels.js';
 import * as typeConvert from './extHostTypeConverters.js';
 import * as extHostTypes from './extHostTypes.js';
-import { isChatViewTitleActionContext } from '../../contrib/chat/common/chatActions.js';
-import { IChatRelatedFile, IChatRequestDraft } from '../../contrib/chat/common/chatEditingService.js';
-import { ExtHostDiagnostics } from './extHostDiagnostics.js';
 
 class ChatAgentResponseStream {
 
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
index 5e96a687c55f..f92096730c68 100644
--- a/src/vs/workbench/api/common/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -39,7 +39,7 @@ 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 { ChatAgentLocation, IChatAgentRequest, IChatAgentResult } from '../../contrib/chat/common/chatAgents.js';
+import { IChatAgentRequest, IChatAgentResult } from '../../contrib/chat/common/chatAgents.js';
 import { IChatRequestDraft } from '../../contrib/chat/common/chatEditingService.js';
 import { IChatRequestVariableEntry } from '../../contrib/chat/common/chatModel.js';
 import { IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatMarkdownContent, IChatMoveMessage, IChatProgressMessage, IChatResponseCodeblockUriPart, IChatTaskDto, IChatTaskResult, IChatTextEdit, IChatTreeData, IChatUserActionEvent, IChatWarningMessage } from '../../contrib/chat/common/chatService.js';
@@ -62,6 +62,7 @@ import { CommandsConverter } from './extHostCommands.js';
 import { getPrivateApiFor } from './extHostTestingPrivateApi.js';
 import * as types from './extHostTypes.js';
 import { LanguageModelPromptTsxPart, LanguageModelTextPart } from './extHostTypes.js';
+import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 
 export namespace Command {
 
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
index 2278a1752477..674c15f327f6 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
@@ -15,8 +15,8 @@ import { IKeybindingService } from '../../../../../platform/keybinding/common/ke
 import { ActiveAuxiliaryContext } from '../../../../common/contextkeys.js';
 import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
 import { INLINE_CHAT_ID } from '../../../inlineChat/common/inlineChat.js';
-import { ChatAgentLocation } from '../../common/chatAgents.js';
 import { ChatContextKeys } from '../../common/chatContextKeys.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 import { IChatWidgetService } from '../chat.js';
 
 export class PanelChatAccessibilityHelp implements IAccessibleViewImplementation {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index badc1e5967eb..cb5942d6accc 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -35,7 +35,8 @@ import { ACTIVE_GROUP, IEditorService } from '../../../../services/editor/common
 import { IHostService } from '../../../../services/host/browser/host.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { EXTENSIONS_CATEGORY, IExtensionsWorkbenchService } from '../../../extensions/common/extensions.js';
-import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
+import { IChatAgentService } from '../../common/chatAgents.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 import { ChatContextKeys } from '../../common/chatContextKeys.js';
 import { extractAgentAndCommand } from '../../common/chatParserTypes.js';
 import { IChatDetail, IChatService } from '../../common/chatService.js';
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
index 85b6746bd261..bb7d39aadf69 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
@@ -15,10 +15,10 @@ import { KeybindingWeight } from '../../../../../platform/keybinding/common/keyb
 import { ActiveEditorContext } from '../../../../common/contextkeys.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { isChatViewTitleActionContext } from '../../common/chatActions.js';
-import { ChatAgentLocation } from '../../common/chatAgents.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
+import { ChatContextKeyExprs, ChatContextKeys } from '../../common/chatContextKeys.js';
 import { hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, IChatEditingSession, WorkingSetEntryState } from '../../common/chatEditingService.js';
-import { ChatMode } from '../../common/constants.js';
+import { IChatService } from '../../common/chatService.js';
+import { ChatAgentLocation, ChatMode } from '../../common/constants.js';
 import { ChatViewId, EditsViewId, IChatWidget, IChatWidgetService } from '../chat.js';
 import { EditingSessionAction } from '../chatEditing/chatEditingActions.js';
 import { ctxIsGlobalEditingSession } from '../chatEditing/chatEditingEditorContextKeys.js';
@@ -95,7 +95,9 @@ export function registerNewChatActions() {
 				},
 				{
 					id: MenuId.ViewTitle,
-					when: ContextKeyExpr.equals('view', ChatViewId),
+					when: ContextKeyExpr.and(
+						ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel),
+						ChatContextKeys.inUnifiedChat.negate()),
 					group: 'navigation',
 					order: -1
 				}]
@@ -137,7 +139,7 @@ export function registerNewChatActions() {
 				},
 				{
 					id: MenuId.ViewTitle,
-					when: ContextKeyExpr.equals('view', EditsViewId),
+					when: ChatContextKeyExprs.inEditsOrUnified,
 					group: 'navigation',
 					order: -1
 				}],
@@ -147,7 +149,7 @@ export function registerNewChatActions() {
 					mac: {
 						primary: KeyMod.WinCtrl | KeyCode.KeyL
 					},
-					when: ContextKeyExpr.and(ChatContextKeys.inChatSession, ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession))
+					when: ContextKeyExpr.and(ChatContextKeys.inChatSession, ChatContextKeyExprs.inEditingMode)
 				}
 			});
 		}
@@ -199,6 +201,7 @@ export function registerNewChatActions() {
 			const widgetService = accessor.get(IChatWidgetService);
 			const dialogService = accessor.get(IDialogService);
 			const viewsService = accessor.get(IViewsService);
+			const chatService = accessor.get(IChatService);
 
 			if (!(await this._handleCurrentEditingSession(editingSession, dialogService))) {
 				return;
@@ -212,8 +215,9 @@ export function registerNewChatActions() {
 				widget = widgetService.getWidgetBySessionId(context.sessionId);
 			} else {
 				// Is running from f1 or keybinding
-				const chatView = await viewsService.openView(EditsViewId) as ChatViewPane;
-				widget = chatView.widget;
+				const view = chatService.unifiedViewEnabled ? ChatViewId : EditsViewId;
+				const chatView = await viewsService.openView<ChatViewPane>(view);
+				widget = chatView?.widget;
 			}
 
 			announceChatCleared(accessibilitySignalService);
@@ -256,7 +260,7 @@ export function registerNewChatActions() {
 				f1: false,
 				menu: [{
 					id: MenuId.ChatEditingWidgetToolbar,
-					when: ContextKeyExpr.and(hasUndecidedChatEditingResourceContextKey.negate(), hasAppliedChatEditsContextKey, ChatContextKeys.editingParticipantRegistered, ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)),
+					when: ContextKeyExpr.and(hasUndecidedChatEditingResourceContextKey.negate(), hasAppliedChatEditsContextKey, ChatContextKeys.editingParticipantRegistered, ChatContextKeyExprs.inEditsOrUnified),
 					group: 'navigation',
 					order: 0
 				}]
@@ -348,12 +352,16 @@ export function registerNewChatActions() {
 				precondition: ChatContextKeys.Setup.hidden.toNegated(),
 				menu: [{
 					id: MenuId.ViewTitle,
-					when: ContextKeyExpr.and(ContextKeyExpr.equals('view', ChatViewId), ChatContextKeys.editingParticipantRegistered,
+					when: ContextKeyExpr.and(
+						ContextKeyExpr.equals('view', ChatViewId),
+						ChatContextKeys.editingParticipantRegistered,
 						ContextKeyExpr.equals(`view.${EditsViewId}.visible`, false),
 						ContextKeyExpr.or(
 							ContextKeyExpr.and(ContextKeyExpr.equals(`workbench.panel.chat.defaultViewContainerLocation`, true), ContextKeyExpr.equals(`workbench.panel.chatEditing.defaultViewContainerLocation`, false)),
 							ContextKeyExpr.and(ContextKeyExpr.equals(`workbench.panel.chat.defaultViewContainerLocation`, false), ContextKeyExpr.equals(`workbench.panel.chatEditing.defaultViewContainerLocation`, true)),
-						)),
+						),
+						ChatContextKeys.inUnifiedChat.negate()
+					),
 					group: 'navigation',
 					order: 1
 				}, {
@@ -380,17 +388,18 @@ export function registerNewChatActions() {
 		async run(accessor: ServicesAccessor, opts?: string | IChatViewOpenOptions) {
 			opts = typeof opts === 'string' ? { query: opts } : opts;
 			const viewsService = accessor.get(IViewsService);
-			const chatView = await viewsService.openView(EditsViewId) as ChatViewPane;
+			const chatView = await viewsService.openView<ChatViewPane>(EditsViewId)
+				?? await viewsService.openView<ChatViewPane>(ChatViewId);
 
 			if (opts?.query) {
 				if (opts.isPartialQuery) {
-					chatView.widget.setInput(opts.query);
+					chatView?.widget.setInput(opts.query);
 				} else {
-					chatView.widget.acceptInput(opts.query);
+					chatView?.widget.acceptInput(opts.query);
 				}
 			}
 
-			chatView.widget.focusInput();
+			chatView?.widget.focusInput();
 		}
 	});
 }
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
index aa90fc63047d..7e6a74fba210 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
@@ -29,10 +29,10 @@ import { IEditorService } from '../../../../services/editor/common/editorService
 import { accessibleViewInCodeBlock } from '../../../accessibility/browser/accessibilityConfiguration.js';
 import { reviewEdits } from '../../../inlineChat/browser/inlineChatController.js';
 import { ITerminalEditorService, ITerminalGroupService, ITerminalService } from '../../../terminal/browser/terminal.js';
-import { ChatAgentLocation } from '../../common/chatAgents.js';
 import { ChatContextKeys } from '../../common/chatContextKeys.js';
 import { ChatCopyKind, IChatService } from '../../common/chatService.js';
 import { IChatResponseViewModel, isResponseVM } from '../../common/chatViewModel.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 import { IChatCodeBlockContextProviderService, IChatWidgetService } from '../chat.js';
 import { DefaultChatTextEditor, ICodeBlockActionContext, ICodeCompareBlockActionContext } from '../codeBlockPart.js';
 import { CHAT_CATEGORY } from './chatActions.js';
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index 5a8d84e93b08..af7a0f3b1368 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -49,7 +49,7 @@ import { SearchView } from '../../../search/browser/searchView.js';
 import { ISymbolQuickPickItem, SymbolsQuickAccessProvider } from '../../../search/browser/symbolsQuickAccess.js';
 import { SearchContext } from '../../../search/common/constants.js';
 import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
+import { ChatContextKeyExprs, ChatContextKeys } from '../../common/chatContextKeys.js';
 import { IChatEditingService } from '../../common/chatEditingService.js';
 import { IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData } from '../../common/chatModel.js';
 import { ChatRequestAgentPart } from '../../common/chatParserTypes.js';
@@ -292,11 +292,11 @@ class AttachFileToChatAction extends AttachResourceAction {
 			title: localize2('workbench.action.chat.attachFile.label', "Add File to Chat"),
 			category: CHAT_CATEGORY,
 			f1: false,
-			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.or(ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID), TextCompareEditorActiveContext)),
 			menu: [{
 				id: MenuId.SearchContext,
 				group: 'z_chat',
-				order: 1
+				order: 1,
+				when: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.or(ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID), TextCompareEditorActiveContext)),
 			}]
 		});
 	}
@@ -350,12 +350,6 @@ class AttachSelectionToChatAction extends Action2 {
 			title: localize2('workbench.action.chat.attachSelection.label', "Add Selection to Chat"),
 			category: CHAT_CATEGORY,
 			f1: false,
-			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.or(ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID), TextCompareEditorActiveContext)),
-			menu: [{
-				id: MenuId.SearchContext,
-				group: 'z_chat',
-				order: 2
-			}]
 		});
 	}
 
@@ -411,11 +405,14 @@ class AttachFileToEditingSessionAction extends AttachResourceAction {
 			title: localize2('workbench.action.edits.attachFile.label', "Add File to {0}", 'Copilot Edits'),
 			category: CHAT_CATEGORY,
 			f1: false,
-			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.or(ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID), TextCompareEditorActiveContext)),
 			menu: [{
 				id: MenuId.SearchContext,
 				group: 'z_chat',
-				order: 2
+				order: 2,
+				when: ContextKeyExpr.and(
+					ChatContextKeys.enabled,
+					ContextKeyExpr.or(ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID), TextCompareEditorActiveContext),
+					ChatContextKeyExprs.unifiedChatEnabled.negate()),
 			}]
 		});
 	}
@@ -443,6 +440,9 @@ class AttachFolderToEditingSessionAction extends AttachResourceAction {
 			title: localize2('workbench.action.edits.attachFolder.label', "Add Folder to {0}", 'Copilot Edits'),
 			category: CHAT_CATEGORY,
 			f1: false,
+			precondition: ContextKeyExpr.and(
+				ChatContextKeys.enabled,
+				ChatContextKeyExprs.unifiedChatEnabled.negate()),
 		});
 	}
 
@@ -469,7 +469,11 @@ class AttachSelectionToEditingSessionAction extends Action2 {
 			title: localize2('workbench.action.edits.attachSelection.label', "Add Selection to {0}", 'Copilot Edits'),
 			category: CHAT_CATEGORY,
 			f1: false,
-			precondition: ContextKeyExpr.and(ChatContextKeys.enabled, ContextKeyExpr.or(ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID), TextCompareEditorActiveContext))
+			precondition: ContextKeyExpr.and(
+				ChatContextKeys.enabled,
+				ContextKeyExpr.or(ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID), TextCompareEditorActiveContext),
+				ChatContextKeyExprs.unifiedChatEnabled.negate()
+			)
 		});
 	}
 
@@ -494,37 +498,25 @@ export class AttachContextAction extends Action2 {
 
 	static readonly ID = 'workbench.action.chat.attachContext';
 
-	// used to enable/disable the keybinding and defined menu containment
-	protected static _cdt = ContextKeyExpr.or(
-		ContextKeyExpr.and(ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)),
-		ContextKeyExpr.and(ChatContextKeys.location.isEqualTo(ChatAgentLocation.Editor)),
-		ContextKeyExpr.and(ChatContextKeys.location.isEqualTo(ChatAgentLocation.Notebook)),
-		ContextKeyExpr.and(ChatContextKeys.location.isEqualTo(ChatAgentLocation.Terminal)),
-	);
-
 	constructor(desc: Readonly<IAction2Options> = {
 		id: AttachContextAction.ID,
 		title: localize2('workbench.action.chat.attachContext.label.2', "Add Context"),
 		icon: Codicon.attach,
 		category: CHAT_CATEGORY,
-		precondition: ContextKeyExpr.or(AttachContextAction._cdt, ContextKeyExpr.and(ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession))),
 		keybinding: {
-			when: ContextKeyExpr.and(ChatContextKeys.location.notEqualsTo(ChatAgentLocation.EditingSession), ChatContextKeys.inChatInput),
+			when: ContextKeyExpr.and(
+				ChatContextKeys.location.notEqualsTo(ChatAgentLocation.EditingSession),
+				ChatContextKeys.inChatInput,
+				ChatContextKeyExprs.inNonUnifiedPanel),
 			primary: KeyMod.CtrlCmd | KeyCode.Slash,
 			weight: KeybindingWeight.EditorContrib
 		},
 		menu: [
 			{
-				when: ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel),
+				when: ChatContextKeyExprs.inNonUnifiedPanel,
 				id: MenuId.ChatInputAttachmentToolbar,
 				group: 'navigation'
-			},
-			{
-				when: ContextKeyExpr.and(ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel).negate(), AttachContextAction._cdt),
-				id: MenuId.ChatExecute,
-				group: 'navigation',
-				order: 1
-			},
+			}
 		]
 	}) {
 		super(desc);
@@ -748,7 +740,7 @@ export class AttachContextAction extends Action2 {
 		if (!widget) {
 			return;
 		}
-		const chatEditingService = widget.location === ChatAgentLocation.EditingSession ? accessor.get(IChatEditingService) : undefined;
+		const chatEditingService = widget.location === ChatAgentLocation.EditingSession || widget.isUnifiedPanelWidget ? accessor.get(IChatEditingService) : undefined;
 
 		const quickPickItems: IAttachmentQuickPickItem[] = [];
 		if (extensionService.extensions.some(ext => isProposedApiEnabled(ext, 'chatReferenceBinaryData'))) {
@@ -1033,14 +1025,14 @@ registerAction2(class AttachFilesAction extends AttachContextAction {
 			f1: false,
 			category: CHAT_CATEGORY,
 			menu: {
-				when: ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
+				when: ChatContextKeyExprs.inEditsOrUnified,
 				id: MenuId.ChatInputAttachmentToolbar,
 				group: 'navigation'
 			},
 			icon: Codicon.attach,
-			precondition: ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
+			precondition: ChatContextKeyExprs.inEditsOrUnified,
 			keybinding: {
-				when: ContextKeyExpr.and(ChatContextKeys.inChatInput, ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)),
+				when: ContextKeyExpr.and(ChatContextKeys.inChatInput, ChatContextKeyExprs.inEditsOrUnified),
 				primary: KeyMod.CtrlCmd | KeyCode.Slash,
 				weight: KeybindingWeight.EditorContrib
 			}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index b7ed71727479..078700c1e470 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -13,17 +13,17 @@ import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contex
 import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
-import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
+import { IChatAgentService } from '../../common/chatAgents.js';
+import { ChatContextKeyExprs, ChatContextKeys } from '../../common/chatContextKeys.js';
 import { IChatEditingService, IChatEditingSession, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { chatAgentLeader, extractAgentAndCommand } from '../../common/chatParserTypes.js';
 import { IChatService } from '../../common/chatService.js';
-import { ChatMode } from '../../common/constants.js';
+import { ChatAgentLocation, ChatMode } from '../../common/constants.js';
 import { EditsViewId, IChatWidget, IChatWidgetService } from '../chat.js';
-import { discardAllEditsWithConfirmation, EditingSessionAction } from '../chatEditing/chatEditingActions.js';
+import { discardAllEditsWithConfirmation, getEditingSessionContext } from '../chatEditing/chatEditingActions.js';
 import { ChatViewPane } from '../chatViewPane.js';
 import { CHAT_CATEGORY } from './chatActions.js';
-import { ChatDoneActionId } from './chatClearActions.js';
+import { ACTION_ID_NEW_CHAT, ChatDoneActionId } from './chatClearActions.js';
 
 export interface IVoiceChatExecuteActionContext {
 	readonly disableTimeout?: boolean;
@@ -56,7 +56,7 @@ export class ChatSubmitAction extends SubmitAction {
 			// without text present - having instructions is enough context for a request
 			ContextKeyExpr.or(ChatContextKeys.inputHasText, ChatContextKeys.instructionsAttached),
 			whenNotInProgressOrPaused,
-			ChatContextKeys.location.notEqualsTo(ChatAgentLocation.EditingSession),
+			ChatContextKeys.chatMode.isEqualTo(ChatMode.Chat),
 		);
 
 		super({
@@ -82,7 +82,7 @@ export class ChatSubmitAction extends SubmitAction {
 					order: 4,
 					when: ContextKeyExpr.and(
 						whenNotInProgressOrPaused,
-						ChatContextKeys.location.notEqualsTo(ChatAgentLocation.EditingSession),
+						ChatContextKeys.chatMode.isEqualTo(ChatMode.Chat),
 					),
 					group: 'navigation',
 				},
@@ -93,29 +93,31 @@ export class ChatSubmitAction extends SubmitAction {
 
 export const ToggleAgentModeActionId = 'workbench.action.chat.toggleAgentMode';
 
-export interface IToggleAgentModeArgs {
-	agentMode: boolean;
+export interface IToggleChatModeArgs {
+	mode: ChatMode;
 }
 
-export class ToggleAgentModeAction extends EditingSessionAction {
+class ToggleChatModeAction extends Action2 {
 
 	static readonly ID = ToggleAgentModeActionId;
 
 	constructor() {
 		super({
-			id: ToggleAgentModeAction.ID,
-			title: localize2('interactive.toggleMode.label', "Toggle Chat Mode (Experimental)"),
+			id: ToggleChatModeAction.ID,
+			title: localize2('interactive.toggleAgent.label', "Set Chat Mode (Experimental)"),
 			f1: true,
 			category: CHAT_CATEGORY,
 			precondition: ContextKeyExpr.and(
 				ChatContextKeys.enabled,
-				ChatContextKeys.Editing.hasToolsAgent,
+				ContextKeyExpr.or(
+					ChatContextKeys.Editing.hasToolsAgent,
+					ChatContextKeyExprs.unifiedChatEnabled),
 				ChatContextKeys.requestInProgress.negate()),
 			tooltip: localize('setChatMode', "Set Mode (Experimental)"),
 			keybinding: {
 				when: ContextKeyExpr.and(
 					ChatContextKeys.inChatInput,
-					ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)),
+					ChatContextKeyExprs.inEditsOrUnified),
 				primary: KeyMod.CtrlCmd | KeyCode.Period,
 				weight: KeybindingWeight.EditorContrib
 			},
@@ -123,33 +125,42 @@ export class ToggleAgentModeAction extends EditingSessionAction {
 				{
 					id: MenuId.ChatExecute,
 					order: 1,
-					when: ContextKeyExpr.and(
-						ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
-						ChatContextKeys.Editing.hasToolsAgent),
+					// Either in edits with agent mode available, or in unified chat view
+					when: ContextKeyExpr.or(
+						ContextKeyExpr.and(
+							ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
+							ChatContextKeys.Editing.hasToolsAgent,
+						),
+						ChatContextKeys.inUnifiedChat),
 					group: 'navigation',
 				},
 			]
 		});
 	}
 
-	override async runEditingSessionAction(accessor: ServicesAccessor, currentEditingSession: IChatEditingSession, chatWidget: IChatWidget, ...args: any[]) {
-
+	async run(accessor: ServicesAccessor, ...args: any[]) {
 		const chatService = accessor.get(IChatService);
 		const commandService = accessor.get(ICommandService);
 		const dialogService = accessor.get(IDialogService);
 
-		const entries = currentEditingSession.entries.get();
-		if (entries.length > 0 && entries.some(entry => entry.state.get() === WorkingSetEntryState.Modified)) {
-			if (!await discardAllEditsWithConfirmation(accessor, currentEditingSession)) {
+		const context = getEditingSessionContext(accessor, args);
+		if (!context?.chatWidget) {
+			return;
+		}
+
+		// TODO will not require discarding the session when we are able to switch modes mid-session
+		const entries = context.editingSession?.entries.get();
+		if (context.editingSession && entries && entries.length > 0 && entries.some(entry => entry.state.get() === WorkingSetEntryState.Modified)) {
+			if (!await discardAllEditsWithConfirmation(accessor, context.editingSession)) {
 				// User cancelled
 				return;
 			}
 		} else {
-			const chatSession = chatService.getSession(currentEditingSession.chatSessionId);
+			const chatSession = context.chatWidget.viewModel?.model;
 			if (chatSession?.getRequests().length) {
 				const confirmation = await dialogService.confirm({
 					title: localize('agent.newSession', "Start new session?"),
-					message: localize('agent.newSessionMessage', "Toggling agent mode will start a new session. Would you like to continue?"),
+					message: localize('agent.newSessionMessage', "Changing the chat mode will start a new session. Would you like to continue?"),
 					primaryButton: localize('agent.newSession.confirm', "Yes"),
 					type: 'info'
 				});
@@ -159,13 +170,24 @@ export class ToggleAgentModeAction extends EditingSessionAction {
 			}
 		}
 
-		const arg = args[0] as IToggleAgentModeArgs | undefined;
-		const setTo = arg ?
-			(arg.agentMode ? ChatMode.Agent : ChatMode.Edit) :
-			(chatWidget.input.toolsAgentModeEnabled ? ChatMode.Edit : ChatMode.Agent);
-		chatWidget.input.setChatMode(setTo);
+		const arg = args[0] as IToggleChatModeArgs | undefined;
+		if (arg?.mode) {
+			context.chatWidget.input.setChatMode(arg.mode);
+		} else {
+			const modes = [ChatMode.Agent, ChatMode.Edit];
+			if (context.chatWidget.location === ChatAgentLocation.Panel) {
+				modes.push(ChatMode.Chat);
+			}
+
+			const modeIndex = modes.indexOf(context.chatWidget.input.currentMode);
+			const newMode = modes[(modeIndex + 1) % modes.length];
+			context.chatWidget.input.setChatMode(newMode);
+		}
 
-		await commandService.executeCommand(ChatDoneActionId);
+		if (context.chatWidget.viewModel?.model.getRequests().length) {
+			const clearAction = chatService.unifiedViewEnabled ? ACTION_ID_NEW_CHAT : ChatDoneActionId;
+			await commandService.executeCommand(clearAction);
+		}
 	}
 }
 
@@ -191,8 +213,8 @@ export class ToggleRequestPausedAction extends Action2 {
 					order: 3.5,
 					when: ContextKeyExpr.and(
 						ChatContextKeys.canRequestBePaused,
-						ChatContextKeys.Editing.agentMode,
-						ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
+						ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent),
+						ChatContextKeyExprs.inEditsOrUnified,
 						ContextKeyExpr.or(ChatContextKeys.isRequestPaused.negate(), ChatContextKeys.inputHasText.negate()),
 					),
 					group: 'navigation',
@@ -259,7 +281,7 @@ export class ChatEditingSessionSubmitAction extends SubmitAction {
 			// without text present - having instructions is enough context for a request
 			ContextKeyExpr.or(ChatContextKeys.inputHasText, ChatContextKeys.instructionsAttached),
 			whenNotInProgressOrPaused,
-			ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
+			ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat),
 		);
 
 		super({
@@ -278,7 +300,7 @@ export class ChatEditingSessionSubmitAction extends SubmitAction {
 				{
 					id: MenuId.ChatExecuteSecondary,
 					group: 'group_1',
-					when: ContextKeyExpr.and(whenNotInProgressOrPaused, ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)),
+					when: ContextKeyExpr.and(whenNotInProgressOrPaused, ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat),),
 					order: 1
 				},
 				{
@@ -289,8 +311,7 @@ export class ChatEditingSessionSubmitAction extends SubmitAction {
 							ContextKeyExpr.and(ChatContextKeys.isRequestPaused, ChatContextKeys.inputHasText),
 							ChatContextKeys.requestInProgress.negate(),
 						),
-						ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
-					),
+						ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat),),
 					group: 'navigation',
 				},
 			]
@@ -307,10 +328,7 @@ class SubmitWithoutDispatchingAction extends Action2 {
 			// without text present - having instructions is enough context for a request
 			ContextKeyExpr.or(ChatContextKeys.inputHasText, ChatContextKeys.instructionsAttached),
 			whenNotInProgressOrPaused,
-			ContextKeyExpr.and(ContextKeyExpr.or(
-				ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel),
-				ChatContextKeys.location.isEqualTo(ChatAgentLocation.Editor),
-			)),
+			ChatContextKeys.chatMode.isEqualTo(ChatMode.Chat),
 		);
 
 		super({
@@ -328,8 +346,9 @@ class SubmitWithoutDispatchingAction extends Action2 {
 				{
 					id: MenuId.ChatExecuteSecondary,
 					group: 'group_1',
-					order: 2
-				} // need 'when'?
+					order: 2,
+					when: ChatContextKeys.chatMode.isEqualTo(ChatMode.Chat),
+				}
 			]
 		});
 	}
@@ -353,6 +372,7 @@ export class ChatSubmitSecondaryAgentAction extends Action2 {
 			ContextKeyExpr.or(ChatContextKeys.inputHasText, ChatContextKeys.instructionsAttached),
 			ChatContextKeys.inputHasAgent.negate(),
 			whenNotInProgressOrPaused,
+			ChatContextKeys.chatMode.isEqualTo(ChatMode.Chat),
 		);
 
 		super({
@@ -363,7 +383,10 @@ export class ChatSubmitSecondaryAgentAction extends Action2 {
 				id: MenuId.ChatExecuteSecondary,
 				group: 'group_1',
 				order: 3,
-				when: ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Panel)
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Panel),
+					ChatContextKeys.chatMode.isEqualTo(ChatMode.Chat),
+				),
 			},
 			keybinding: {
 				when: ChatContextKeys.inChatInput,
@@ -404,6 +427,7 @@ class SendToChatEditingAction extends Action2 {
 			ContextKeyExpr.or(ChatContextKeys.inputHasText, ChatContextKeys.instructionsAttached),
 			ChatContextKeys.inputHasAgent.negate(),
 			whenNotInProgressOrPaused,
+			ChatContextKeyExprs.inNonUnifiedPanel
 		);
 
 		super({
@@ -420,7 +444,8 @@ class SendToChatEditingAction extends Action2 {
 					ChatContextKeys.enabled,
 					ChatContextKeys.editingParticipantRegistered,
 					ChatContextKeys.location.notEqualsTo(ChatAgentLocation.EditingSession),
-					ChatContextKeys.location.notEqualsTo(ChatAgentLocation.Editor)
+					ChatContextKeys.location.notEqualsTo(ChatAgentLocation.Editor),
+					ChatContextKeyExprs.inNonUnifiedPanel
 				)
 			},
 			keybinding: {
@@ -430,7 +455,7 @@ class SendToChatEditingAction extends Action2 {
 					ChatContextKeys.enabled,
 					ChatContextKeys.editingParticipantRegistered,
 					ChatContextKeys.location.notEqualsTo(ChatAgentLocation.EditingSession),
-					ChatContextKeys.location.notEqualsTo(ChatAgentLocation.Editor),
+					ChatContextKeys.location.notEqualsTo(ChatAgentLocation.Editor)
 				)
 			}
 		});
@@ -577,7 +602,7 @@ export function registerChatExecuteActions() {
 	registerAction2(SendToNewChatAction);
 	registerAction2(ChatSubmitSecondaryAgentAction);
 	registerAction2(SendToChatEditingAction);
-	registerAction2(ToggleAgentModeAction);
+	registerAction2(ToggleChatModeAction);
 	registerAction2(ToggleRequestPausedAction);
 	registerAction2(SwitchToNextModelAction);
 }
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
index 511e7216583e..180d912b0308 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
@@ -29,12 +29,13 @@ 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 { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
+import { IChatAgentService } from '../../common/chatAgents.js';
+import { ChatContextKeyExprs, ChatContextKeys } from '../../common/chatContextKeys.js';
 import { applyingChatEditsFailedContextKey, ChatEditingSessionState, IChatEditingService, isChatEditingActionContext } from '../../common/chatEditingService.js';
 import { IChatRequestModel } from '../../common/chatModel.js';
 import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatService } from '../../common/chatService.js';
 import { isRequestVM, isResponseVM } from '../../common/chatViewModel.js';
+import { ChatAgentLocation, ChatMode } from '../../common/constants.js';
 import { ChatTreeItem, EditsViewId, IChatWidgetService } from '../chat.js';
 import { ChatViewPane } from '../chatViewPane.js';
 import { CHAT_CATEGORY } from './chatActions.js';
@@ -229,7 +230,9 @@ export function registerChatTitleActions() {
 				return;
 			}
 			const itemIndex = chatRequests?.findIndex(request => request.id === item.requestId);
-			if (chatModel?.initialLocation === ChatAgentLocation.EditingSession) {
+			const widget = chatWidgetService.getWidgetBySessionId(item.sessionId);
+			const mode = widget?.input.currentMode;
+			if (chatModel?.initialLocation === ChatAgentLocation.EditingSession || chatModel && (mode === ChatMode.Edit || mode === ChatMode.Agent)) {
 				const configurationService = accessor.get(IConfigurationService);
 				const dialogService = accessor.get(IDialogService);
 				const chatEditingService = accessor.get(IChatEditingService);
@@ -354,20 +357,20 @@ export function registerChatTitleActions() {
 				f1: false,
 				category: CHAT_CATEGORY,
 				icon: Codicon.x,
-				precondition: ChatContextKeys.location.notEqualsTo(ChatAgentLocation.EditingSession),
+				precondition: ChatContextKeys.chatMode.isEqualTo(ChatMode.Chat),
 				keybinding: {
 					primary: KeyCode.Delete,
 					mac: {
 						primary: KeyMod.CtrlCmd | KeyCode.Backspace,
 					},
-					when: ContextKeyExpr.and(ChatContextKeys.location.notEqualsTo(ChatAgentLocation.EditingSession), ChatContextKeys.inChatSession, ChatContextKeys.inChatInput.negate()),
+					when: ContextKeyExpr.and(ChatContextKeys.chatMode.isEqualTo(ChatMode.Chat), ChatContextKeys.inChatSession, ChatContextKeys.inChatInput.negate()),
 					weight: KeybindingWeight.WorkbenchContrib,
 				},
 				menu: {
 					id: MenuId.ChatMessageTitle,
 					group: 'navigation',
 					order: 2,
-					when: ContextKeyExpr.and(ChatContextKeys.location.notEqualsTo(ChatAgentLocation.EditingSession), ChatContextKeys.isRequest)
+					when: ContextKeyExpr.and(ChatContextKeys.chatMode.isEqualTo(ChatMode.Chat), ChatContextKeys.isRequest)
 				}
 			});
 		}
@@ -408,12 +411,17 @@ export function registerChatTitleActions() {
 				f1: false,
 				category: CHAT_CATEGORY,
 				icon: Codicon.goToEditingSession,
-				precondition: ContextKeyExpr.and(ChatContextKeys.editingParticipantRegistered, ChatContextKeys.requestInProgress.toNegated(), ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)),
+				precondition: ContextKeyExpr.and(
+					ChatContextKeys.editingParticipantRegistered,
+					ChatContextKeys.requestInProgress.toNegated(),
+					ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel),
+					ChatContextKeyExprs.unifiedChatEnabled.negate()
+				),
 				menu: {
 					id: MenuId.ChatMessageFooter,
 					group: 'navigation',
 					order: 4,
-					when: ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.isResponse, ChatContextKeys.editingParticipantRegistered, ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel))
+					when: ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.isResponse, ChatContextKeys.editingParticipantRegistered, ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel), ChatContextKeyExprs.unifiedChatEnabled.negate())
 				}
 			});
 		}
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 9e9adc8ef437..3b23bf3cb079 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { timeout } from '../../../../base/common/async.js';
+import { Event } from '../../../../base/common/event.js';
 import { MarkdownString, isMarkdownString } from '../../../../base/common/htmlContent.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../base/common/network.js';
@@ -17,36 +18,42 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import product from '../../../../platform/product/common/product.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
+import { PromptsConfig } from '../../../../platform/prompts/common/config.js';
+import { PROMPT_FILE_EXTENSION } from '../../../../platform/prompts/common/constants.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js';
 import { Extensions, IConfigurationMigrationRegistry } from '../../../common/configuration.js';
 import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
 import { EditorExtensions, IEditorFactoryRegistry } from '../../../common/editor.js';
 import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
+import { mcpSchemaId } from '../../../services/configuration/common/configuration.js';
 import { IEditorResolverService, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
+import { mcpConfigurationSection, mcpDiscoverySection, mcpSchemaExampleServers } from '../../mcp/common/mcpConfiguration.js';
 import { ChatAgentLocation, ChatAgentNameService, ChatAgentService, IChatAgentNameService, IChatAgentService } from '../common/chatAgents.js';
 import { CodeMapperService, ICodeMapperService } from '../common/chatCodeMapperService.js';
 import '../common/chatColors.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatEditingService } from '../common/chatEditingService.js';
+import { ChatEntitlement, ChatEntitlementService, IChatEntitlementService } from '../common/chatEntitlementService.js';
 import { chatVariableLeader } from '../common/chatParserTypes.js';
 import { IChatService } from '../common/chatService.js';
 import { ChatService } from '../common/chatServiceImpl.js';
 import { ChatSlashCommandService, IChatSlashCommandService } from '../common/chatSlashCommands.js';
+import { ChatTransferService, IChatTransferService } from '../common/chatTransferService.js';
 import { IChatVariablesService } from '../common/chatVariables.js';
 import { ChatWidgetHistoryService, IChatWidgetHistoryService } from '../common/chatWidgetHistoryService.js';
 import { ILanguageModelIgnoredFilesService, LanguageModelIgnoredFilesService } from '../common/ignoredFiles.js';
 import { ILanguageModelsService, LanguageModelsService } from '../common/languageModels.js';
 import { ILanguageModelStatsService, LanguageModelStatsService } from '../common/languageModelStats.js';
 import { ILanguageModelToolsService } from '../common/languageModelToolsService.js';
+import { DOCUMENTATION_URL } from '../common/promptSyntax/constants.js';
+import '../common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.js';
 import '../common/promptSyntax/languageFeatures/promptLinkProvider.js';
 import '../common/promptSyntax/languageFeatures/promptPathAutocompletion.js';
-import '../common/promptSyntax/languageFeatures/promptLinkDiagnosticsProvider.js';
 import { PromptsService } from '../common/promptSyntax/service/promptsService.js';
 import { IPromptsService } from '../common/promptSyntax/service/types.js';
-import './promptSyntax/contributions/usePromptCommand.js';
-import './promptSyntax/contributions/createPromptCommand/createPromptCommand.js';
 import { LanguageModelToolsExtensionPointHandler } from '../common/tools/languageModelToolsContribution.js';
 import { BuiltinToolsContribution } from '../common/tools/tools.js';
 import { IVoiceChatService, VoiceChatService } from '../common/voiceChatService.js';
@@ -64,6 +71,8 @@ import { registerChatExportActions } from './actions/chatImportExport.js';
 import { registerMoveActions } from './actions/chatMoveActions.js';
 import { registerQuickChatActions } from './actions/chatQuickInputActions.js';
 import { registerChatTitleActions } from './actions/chatTitleActions.js';
+import { registerChatToolActions } from './actions/chatToolActions.js';
+import { ChatTransferContribution } from './actions/chatTransfer.js';
 import { IChatAccessibilityService, IChatCodeBlockContextProviderService, IChatWidgetService, IQuickChatService } from './chat.js';
 import { ChatAccessibilityService } from './chatAccessibilityService.js';
 import './chatAttachmentModel.js';
@@ -71,8 +80,10 @@ import { ChatMarkdownAnchorService, IChatMarkdownAnchorService } from './chatCon
 import { ChatInputBoxContentProvider } from './chatEdinputInputContentProvider.js';
 import { ChatEditingEditorAccessibility } from './chatEditing/chatEditingEditorAccessibility.js';
 import { registerChatEditorActions } from './chatEditing/chatEditingEditorActions.js';
+import { ChatEditingEditorContextKeys } from './chatEditing/chatEditingEditorContextKeys.js';
 import { ChatEditingEditorOverlay } from './chatEditing/chatEditingEditorOverlay.js';
 import { ChatEditingService } from './chatEditing/chatEditingServiceImpl.js';
+import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditing/notebook/chatEditingNotebookFileSystemProvider.js';
 import { ChatEditor, IChatEditorOptions } from './chatEditor.js';
 import { ChatEditorInput, ChatEditorInputSerializer } from './chatEditorInput.js';
 import { agentSlashCommandToMarkdown, agentToMarkdown } from './chatMarkdownDecorationsRenderer.js';
@@ -81,7 +92,7 @@ import { ChatPasteProvidersFeature } from './chatPasteProviders.js';
 import { QuickChatService } from './chatQuick.js';
 import { ChatResponseAccessibleView } from './chatResponseAccessibleView.js';
 import { ChatSetupContribution } from './chatSetup.js';
-import { ChatEntitlement, ChatEntitlementService, IChatEntitlementService } from '../common/chatEntitlementService.js';
+import { ChatStatusBarEntry } from './chatStatus.js';
 import { ChatVariablesService } from './chatVariables.js';
 import { ChatWidgetService } from './chatWidget.js';
 import { ChatCodeBlockContextProviderService } from './codeBlockContextProviderService.js';
@@ -91,20 +102,9 @@ import './contrib/chatInputEditorContrib.js';
 import './contrib/chatInputEditorHover.js';
 import { ChatRelatedFilesContribution } from './contrib/chatInputRelatedFilesContrib.js';
 import { LanguageModelToolsService } from './languageModelToolsService.js';
+import './promptSyntax/contributions/createPromptCommand/createPromptCommand.js';
+import './promptSyntax/contributions/usePromptCommand.js';
 import { ChatViewsWelcomeHandler } from './viewsWelcome/chatViewsWelcomeHandler.js';
-import { ChatEditingEditorContextKeys } from './chatEditing/chatEditingEditorContextKeys.js';
-import { PromptsConfig } from '../../../../platform/prompts/common/config.js';
-import { PROMPT_FILE_EXTENSION } from '../../../../platform/prompts/common/constants.js';
-import { DOCUMENTATION_URL } from '../common/promptSyntax/constants.js';
-import { registerChatToolActions } from './actions/chatToolActions.js';
-import { ChatStatusBarEntry } from './chatStatus.js';
-import product from '../../../../platform/product/common/product.js';
-import { Event } from '../../../../base/common/event.js';
-import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditing/notebook/chatEditingNotebookFileSystemProvider.js';
-import { mcpConfigurationSection, mcpDiscoverySection, mcpSchemaExampleServers } from '../../mcp/common/mcpConfiguration.js';
-import { mcpSchemaId } from '../../../services/configuration/common/configuration.js';
-import { ChatTransferService, IChatTransferService } from '../common/chatTransferService.js';
-import { ChatTransferContribution } from './actions/chatTransfer.js';
 
 // Register configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -213,6 +213,12 @@ configurationRegistry.registerConfiguration({
 			description: nls.localize('workspaceConfig.mcp.description', "Model Context Protocol server configurations"),
 			$ref: mcpSchemaId
 		},
+		// [ChatConfiguration.UnifiedChatView]: {
+		// 	type: 'boolean',
+		// 	description: nls.localize('chat.experimental.unifiedChatView', "Enables the unified view with Chat, Edit, and Agent in one place."),
+		// 	default: false,
+		// 	tags: ['experimental'],
+		// },
 		[mcpDiscoverySection]: {
 			type: 'boolean',
 			default: false,
diff --git a/src/vs/workbench/contrib/chat/browser/chat.ts b/src/vs/workbench/contrib/chat/browser/chat.ts
index 250b763f4518..03216596a8a9 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.ts
@@ -14,11 +14,12 @@ import { createDecorator } from '../../../../platform/instantiation/common/insta
 import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
 import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
-import { ChatAgentLocation, IChatAgentCommand, IChatAgentData } from '../common/chatAgents.js';
+import { IChatAgentCommand, IChatAgentData } from '../common/chatAgents.js';
 import { IChatResponseModel } from '../common/chatModel.js';
 import { IParsedChatRequest } from '../common/chatParserTypes.js';
 import { CHAT_PROVIDER_ID } from '../common/chatParticipantContribTypes.js';
 import { IChatRequestViewModel, IChatResponseViewModel, IChatViewModel } from '../common/chatViewModel.js';
+import { ChatAgentLocation, ChatMode } from '../common/constants.js';
 import { ChatAttachmentModel } from './chatAttachmentModel.js';
 import { ChatInputPart } from './chatInputPart.js';
 import { ChatViewPane } from './chatViewPane.js';
@@ -155,17 +156,16 @@ export type ChatTreeItem = IChatRequestViewModel | IChatResponseViewModel;
 export interface IChatListItemRendererOptions {
 	readonly renderStyle?: 'compact' | 'minimal';
 	readonly noHeader?: boolean;
-	readonly noPadding?: boolean;
 	readonly editableCodeBlock?: boolean;
-	readonly renderCodeBlockPills?: boolean;
+	readonly renderCodeBlockPills?: boolean | ((mode: ChatMode) => boolean);
 	readonly renderDetectedCommandsWithRequest?: boolean;
 	readonly renderTextEditsAsSummary?: (uri: URI) => boolean;
-	readonly referencesExpandedWhenEmptyResponse?: boolean;
-	readonly progressMessageAtBottomOfResponse?: boolean;
+	readonly referencesExpandedWhenEmptyResponse?: boolean | ((mode: ChatMode) => boolean);
+	readonly progressMessageAtBottomOfResponse?: boolean | ((mode: ChatMode) => boolean);
 }
 
 export interface IChatWidgetViewOptions {
-	autoScroll?: boolean;
+	autoScroll?: boolean | ((mode: ChatMode) => boolean);
 	renderInputOnTop?: boolean;
 	renderFollowups?: boolean;
 	renderStyle?: 'compact' | 'minimal';
@@ -191,6 +191,7 @@ export interface IChatWidgetViewOptions {
 	editorOverflowWidgetsDomNode?: HTMLElement;
 	enableImplicitContext?: boolean;
 	enableWorkingSet?: 'explicit' | 'implicit';
+	supportsChangingModes?: boolean;
 }
 
 export interface IChatViewViewContext {
@@ -226,6 +227,9 @@ export interface IChatWidget {
 	readonly input: ChatInputPart;
 	readonly attachmentModel: ChatAttachmentModel;
 
+	// TODO I don't like this
+	readonly isUnifiedPanelWidget: boolean;
+
 	getContrib<T extends IChatWidgetContrib>(id: string): T | undefined;
 	reveal(item: ChatTreeItem): void;
 	focus(item: ChatTreeItem): void;
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
index 88eb081dff9d..e38245f82b86 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.ts
@@ -26,18 +26,15 @@ import { KeybindingWeight } from '../../../../../platform/keybinding/common/keyb
 import { IListService } from '../../../../../platform/list/browser/listService.js';
 import { GroupsOrder, IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
-import { ChatAgentLocation } from '../../common/chatAgents.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, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { IChatService } from '../../common/chatService.js';
 import { isRequestVM, isResponseVM } from '../../common/chatViewModel.js';
+import { ChatAgentLocation, ChatMode } from '../../common/constants.js';
 import { CHAT_CATEGORY } from '../actions/chatActions.js';
 import { ChatTreeItem, IChatWidget, IChatWidgetService } from '../chat.js';
 
-export interface IEditingSessionActionContext {
-	widget?: IChatWidget;
-}
-
 export abstract class EditingSessionAction extends Action2 {
 
 	constructor(opts: Readonly<IAction2Options>) {
@@ -48,26 +45,46 @@ export abstract class EditingSessionAction extends Action2 {
 	}
 
 	run(accessor: ServicesAccessor, ...args: any[]) {
-		const context: IEditingSessionActionContext | undefined = args[0];
-
-		const chatEditingService = accessor.get(IChatEditingService);
-		const chatWidget = context?.widget ?? accessor.get(IChatWidgetService).getWidgetsByLocations(ChatAgentLocation.EditingSession).at(0);
-
-		if (!chatWidget?.viewModel) {
+		const context = getEditingSessionContext(accessor, args);
+		if (!context || !context.editingSession) {
 			return;
 		}
 
-		const chatSessionId = chatWidget.viewModel.model.sessionId;
-		const editingSession = chatEditingService.getEditingSession(chatSessionId);
+		return this.runEditingSessionAction(accessor, context.editingSession, context.chatWidget, ...args);
+	}
 
-		if (!editingSession) {
-			return;
+	abstract runEditingSessionAction(accessor: ServicesAccessor, editingSession: IChatEditingSession, chatWidget: IChatWidget, ...args: any[]): any;
+}
+
+export function getEditingSessionContext(accessor: ServicesAccessor, args: any[]): { editingSession?: IChatEditingSession; chatWidget: IChatWidget } | undefined {
+	const arg0 = args.at(0);
+	const context = isChatViewTitleActionContext(arg0) ? arg0 : undefined;
+
+	const chatService = accessor.get(IChatService);
+	const chatWidgetService = accessor.get(IChatWidgetService);
+	const chatEditingService = accessor.get(IChatEditingService);
+	let chatWidget = context ? chatWidgetService.getWidgetBySessionId(context.sessionId) : undefined;
+	if (!chatWidget) {
+		if (chatService.unifiedViewEnabled) {
+			// TODO ugly
+			chatWidget = chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Panel).find(w => w.isUnifiedPanelWidget);
+		} else {
+			chatWidget = chatWidgetService.getWidgetsByLocations(ChatAgentLocation.EditingSession).at(0);
 		}
+	}
 
-		return this.runEditingSessionAction(accessor, editingSession, chatWidget, ...args);
+	if (!chatWidget?.viewModel) {
+		return;
 	}
 
-	abstract runEditingSessionAction(accessor: ServicesAccessor, editingSession: IChatEditingSession, chatWidget: IChatWidget, ...args: any[]): any;
+	const chatSessionId = chatWidget.viewModel.model.sessionId;
+	const editingSession = chatEditingService.getEditingSession(chatSessionId);
+
+	if (!editingSession) {
+		return;
+	}
+
+	return { editingSession, chatWidget };
 }
 
 
@@ -237,7 +254,7 @@ export class ChatEditingAcceptAllAction extends EditingSessionAction {
 			precondition: ContextKeyExpr.and(ChatContextKeys.requestInProgress.negate(), hasUndecidedChatEditingResourceContextKey),
 			keybinding: {
 				primary: KeyMod.CtrlCmd | KeyCode.Enter,
-				when: ContextKeyExpr.and(ChatContextKeys.requestInProgress.negate(), hasUndecidedChatEditingResourceContextKey, ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession), ChatContextKeys.inChatInput),
+				when: ContextKeyExpr.and(ChatContextKeys.requestInProgress.negate(), hasUndecidedChatEditingResourceContextKey, ChatContextKeys.inChatInput),
 				weight: KeybindingWeight.WorkbenchContrib,
 			},
 			menu: [
@@ -246,7 +263,7 @@ export class ChatEditingAcceptAllAction extends EditingSessionAction {
 					id: MenuId.ChatEditingWidgetToolbar,
 					group: 'navigation',
 					order: 0,
-					when: ContextKeyExpr.and(applyingChatEditsFailedContextKey.negate(), ContextKeyExpr.and(hasUndecidedChatEditingResourceContextKey, ContextKeyExpr.and(ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession))))
+					when: ContextKeyExpr.and(applyingChatEditsFailedContextKey.negate(), ContextKeyExpr.and(hasUndecidedChatEditingResourceContextKey))
 				}
 			]
 		});
@@ -272,11 +289,11 @@ export class ChatEditingDiscardAllAction extends EditingSessionAction {
 					id: MenuId.ChatEditingWidgetToolbar,
 					group: 'navigation',
 					order: 1,
-					when: ContextKeyExpr.and(applyingChatEditsFailedContextKey.negate(), ContextKeyExpr.and(ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession), hasUndecidedChatEditingResourceContextKey))
+					when: ContextKeyExpr.and(applyingChatEditsFailedContextKey.negate(), hasUndecidedChatEditingResourceContextKey)
 				}
 			],
 			keybinding: {
-				when: ContextKeyExpr.and(ChatContextKeys.requestInProgress.negate(), hasUndecidedChatEditingResourceContextKey, ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession), ChatContextKeys.inChatInput, ChatContextKeys.inputHasText.negate()),
+				when: ContextKeyExpr.and(ChatContextKeys.requestInProgress.negate(), hasUndecidedChatEditingResourceContextKey, ChatContextKeys.inChatInput, ChatContextKeys.inputHasText.negate()),
 				weight: KeybindingWeight.WorkbenchContrib,
 				primary: KeyMod.CtrlCmd | KeyCode.Backspace,
 			},
@@ -328,7 +345,7 @@ export class ChatEditingRemoveAllFilesAction extends EditingSessionAction {
 					id: MenuId.ChatEditingWidgetToolbar,
 					group: 'navigation',
 					order: 5,
-					when: ContextKeyExpr.and(hasAppliedChatEditsContextKey.negate(), ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession))
+					when: hasAppliedChatEditsContextKey.negate()
 				}
 			]
 		});
@@ -364,7 +381,7 @@ export class ChatEditingShowChangesAction extends EditingSessionAction {
 					id: MenuId.ChatEditingWidgetToolbar,
 					group: 'navigation',
 					order: 4,
-					when: ContextKeyExpr.and(applyingChatEditsFailedContextKey.negate(), ContextKeyExpr.and(hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)))
+					when: ContextKeyExpr.and(applyingChatEditsFailedContextKey.negate(), ContextKeyExpr.and(hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey))
 				}
 			],
 		});
@@ -431,7 +448,7 @@ registerAction2(class RemoveAction extends Action2 {
 				mac: {
 					primary: KeyMod.CtrlCmd | KeyCode.Backspace,
 				},
-				when: ContextKeyExpr.and(ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession), ChatContextKeys.inChatSession, ChatContextKeys.inChatInput.negate()),
+				when: ContextKeyExpr.and(ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat), ChatContextKeys.inChatSession, ChatContextKeys.inChatInput.negate()),
 				weight: KeybindingWeight.WorkbenchContrib,
 			},
 			menu: [
@@ -439,7 +456,7 @@ registerAction2(class RemoveAction extends Action2 {
 					id: MenuId.ChatMessageTitle,
 					group: 'navigation',
 					order: 2,
-					when: ContextKeyExpr.and(ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession), ChatContextKeys.isRequest)
+					when: ContextKeyExpr.and(ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat), ChatContextKeys.isRequest)
 				}
 			]
 		});
@@ -603,7 +620,7 @@ registerAction2(class ResolveSymbolsContextAction extends EditingSessionAction {
 				id: MenuId.ChatInputSymbolAttachmentContext,
 				group: 'navigation',
 				order: 1,
-				when: ContextKeyExpr.and(ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession), EditorContextKeys.hasReferenceProvider)
+				when: ContextKeyExpr.and(ChatContextKeys.chatMode.isEqualTo(ChatMode.Chat), EditorContextKeys.hasReferenceProvider)
 			}
 		});
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
index 34c2ac94cced..40e2e0d81ea2 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingServiceImpl.ts
@@ -33,10 +33,11 @@ import { IExtensionService } from '../../../../services/extensions/common/extens
 import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js';
 import { IMultiDiffSourceResolver, IMultiDiffSourceResolverService, IResolvedMultiDiffSource, MultiDiffEditorItem } from '../../../multiDiffEditor/browser/multiDiffSourceResolverService.js';
 import { CellUri } from '../../../notebook/common/notebookCommon.js';
-import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
+import { IChatAgentService } from '../../common/chatAgents.js';
 import { CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, chatEditingAgentSupportsReadonlyReferencesContextKey, chatEditingResourceContextKey, ChatEditingSessionState, chatEditingSnapshotScheme, IChatEditingService, IChatEditingSession, IChatRelatedFile, IChatRelatedFilesProvider, IModifiedFileEntry, inChatEditingSessionContextKey, IStreamingEdits, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { IChatResponseModel, isCellTextEditOperation } from '../../common/chatModel.js';
 import { IChatService } from '../../common/chatService.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 import { AbstractChatEditingModifiedFileEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingSession } from './chatEditingSession.js';
 import { ChatEditingSnapshotTextModelContentProvider, ChatEditingTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditor.ts b/src/vs/workbench/contrib/chat/browser/chatEditor.ts
index 19280d5133db..cccd397d87ed 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditor.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditor.ts
@@ -19,11 +19,11 @@ import { Memento } from '../../../common/memento.js';
 import { clearChatEditor } from './actions/chatClear.js';
 import { ChatEditorInput } from './chatEditorInput.js';
 import { ChatWidget, IChatViewState } from './chatWidget.js';
-import { ChatAgentLocation } from '../common/chatAgents.js';
 import { IChatModel, IExportableChatData, ISerializableChatData } from '../common/chatModel.js';
 import { CHAT_PROVIDER_ID } from '../common/chatParticipantContribTypes.js';
 import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
 import { EDITOR_DRAG_AND_DROP_BACKGROUND } from '../../../common/theme.js';
+import { ChatAgentLocation } from '../common/constants.js';
 
 export interface IChatEditorOptions extends IEditorOptions {
 	target?: { sessionId: string } | { data: IExportableChatData | ISerializableChatData };
diff --git a/src/vs/workbench/contrib/chat/browser/chatFollowups.ts b/src/vs/workbench/contrib/chat/browser/chatFollowups.ts
index d600d02a7905..f4d55df96e4a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatFollowups.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatFollowups.ts
@@ -8,9 +8,10 @@ import { Button, IButtonStyles } from '../../../../base/browser/ui/button/button
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { localize } from '../../../../nls.js';
-import { ChatAgentLocation, IChatAgentService } from '../common/chatAgents.js';
+import { 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.$;
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index d7d78d1cfb4c..55df7b479d60 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -72,13 +72,13 @@ import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatEditingSession } from '../common/chatEditingService.js';
 import { ChatEntitlement, IChatEntitlementService } from '../common/chatEntitlementService.js';
 import { IChatRequestVariableEntry, isImageVariableEntry, isLinkVariableEntry, isPasteVariableEntry } from '../common/chatModel.js';
-import { IChatFollowup } from '../common/chatService.js';
+import { IChatFollowup, IChatService } from '../common/chatService.js';
 import { IChatVariablesService } from '../common/chatVariables.js';
 import { IChatResponseViewModel } from '../common/chatViewModel.js';
 import { ChatInputHistoryMaxEntries, IChatHistoryEntry, IChatInputState, IChatWidgetHistoryService } from '../common/chatWidgetHistoryService.js';
 import { ChatMode } from '../common/constants.js';
 import { ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../common/languageModels.js';
-import { CancelAction, ChatSubmitAction, ChatSubmitSecondaryAgentAction, ChatSwitchToNextModelActionId, IChatExecuteActionContext, IToggleAgentModeArgs, ToggleAgentModeActionId } from './actions/chatExecuteActions.js';
+import { CancelAction, ChatSubmitAction, ChatSubmitSecondaryAgentAction, ChatSwitchToNextModelActionId, IChatExecuteActionContext, IToggleChatModeArgs, ToggleAgentModeActionId } from './actions/chatExecuteActions.js';
 import { ImplicitContextAttachmentWidget } from './attachments/implicitContextAttachment.js';
 import { PromptAttachmentsCollectionWidget } from './attachments/promptAttachments/promptAttachmentsCollectionWidget.js';
 import { IChatWidget } from './chat.js';
@@ -117,6 +117,7 @@ interface IChatInputPartOptions {
 	editorOverflowWidgetsDomNode?: HTMLElement;
 	renderWorkingSet?: boolean;
 	enableImplicitContext?: boolean;
+	supportsChangingModes?: boolean;
 }
 
 export interface IWorkingSetEntry {
@@ -293,6 +294,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	 * Context key is set when prompt instructions are attached.
 	 */
 	private promptInstructionsAttached: IContextKey<boolean>;
+	private chatMode: IContextKey<ChatMode>;
 
 	private readonly _waitForPersistedLanguageModel = this._register(new MutableDisposable<IDisposable>());
 	private _onDidChangeCurrentLanguageModel = this._register(new Emitter<ILanguageModelChatMetadataAndIdentifier>());
@@ -302,13 +304,17 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	}
 
 	private _onDidChangeCurrentChatMode = this._register(new Emitter<void>());
-	private _currentMode: ChatMode = ChatMode.Chat;
-	public get toolsAgentModeEnabled(): boolean {
-		return this._currentMode === ChatMode.Agent;
-	}
+	readonly onDidChangeCurrentChatMode = this._onDidChangeCurrentChatMode.event;
 
+	private _currentMode: ChatMode = ChatMode.Chat;
 	public get currentMode(): ChatMode {
-		return this._currentMode === ChatMode.Agent && !this.agentService.hasToolsAgent ? ChatMode.Edit : this._currentMode;
+		if (this.location === ChatAgentLocation.Panel && !this.chatService.unifiedViewEnabled) {
+			return ChatMode.Chat;
+		}
+
+		return this._currentMode === ChatMode.Agent && !this.agentService.hasToolsAgent ?
+			ChatMode.Edit :
+			this._currentMode;
 	}
 
 	private cachedDimensions: dom.Dimension | undefined;
@@ -373,6 +379,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		@ILabelService private readonly labelService: ILabelService,
 		@IChatVariablesService private readonly variableService: IChatVariablesService,
 		@IChatAgentService private readonly agentService: IChatAgentService,
+		@IChatService private readonly chatService: IChatService,
 	) {
 		super();
 
@@ -392,6 +399,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		this.chatCursorAtTop = ChatContextKeys.inputCursorAtTop.bindTo(contextKeyService);
 		this.inputEditorHasFocus = ChatContextKeys.inputHasFocus.bindTo(contextKeyService);
 		this.promptInstructionsAttached = ChatContextKeys.instructionsAttached.bindTo(contextKeyService);
+		this.chatMode = ChatContextKeys.chatMode.bindTo(contextKeyService);
 
 		this.history = this.loadHistory();
 		this._register(this.historyService.onDidClearHistory(() => this.history = new HistoryNavigator2([{ text: '' }], ChatInputHistoryMaxEntries, historyKeyFn)));
@@ -469,13 +477,18 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 	}
 
 	setChatMode(mode: ChatMode): void {
+		if (!this.options.supportsChangingModes) {
+			return;
+		}
+
 		this._currentMode = mode;
+		this.chatMode.set(mode);
 		this._onDidChangeCurrentChatMode.fire();
 	}
 
 	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._currentMode === ChatMode.Agent) {
+		if (this.currentMode === ChatMode.Agent) {
 			if (this.configurationService.getValue('chat.agent.allModels')) {
 				return true;
 			}
@@ -557,9 +570,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}
 
 		if (state.inputState?.chatMode) {
-			this._currentMode = state.inputState.chatMode;
+			this.setChatMode(state.inputState.chatMode);
 		} else if (this.location === ChatAgentLocation.EditingSession) {
-			this._currentMode = ChatMode.Edit;
+			this.setChatMode(ChatMode.Edit);
 		}
 	}
 
@@ -933,10 +946,10 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 					}
 				} else if (action.id === ToggleAgentModeActionId && action instanceof MenuItemAction) {
 					const delegate: IModePickerDelegate = {
-						getMode: () => this._currentMode,
+						getMode: () => this.currentMode,
 						onDidChangeMode: this._onDidChangeCurrentChatMode.event
 					};
-					return this.instantiationService.createInstance(ToggleAgentActionViewItem, action, delegate);
+					return this.instantiationService.createInstance(ToggleChatModeActionViewItem, action, delegate);
 				}
 
 				return undefined;
@@ -1501,13 +1514,14 @@ interface IModePickerDelegate {
 	getMode(): ChatMode;
 }
 
-class ToggleAgentActionViewItem extends DropdownMenuActionViewItemWithKeybinding {
+class ToggleChatModeActionViewItem extends DropdownMenuActionViewItemWithKeybinding {
 	constructor(
 		action: MenuItemAction,
 		private readonly delegate: IModePickerDelegate,
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IContextKeyService contextKeyService: IContextKeyService,
+		@IChatService chatService: IChatService,
 	) {
 		const makeAction = (mode: ChatMode): IAction => ({
 			...action,
@@ -1517,7 +1531,7 @@ class ToggleAgentActionViewItem extends DropdownMenuActionViewItemWithKeybinding
 			enabled: true,
 			checked: delegate.getMode() === mode,
 			run: async () => {
-				const result = await action.run({ agentMode: mode === ChatMode.Agent } satisfies IToggleAgentModeArgs);
+				const result = await action.run({ mode } satisfies IToggleChatModeArgs);
 				this.renderLabel(this.element!);
 				return result;
 			}
@@ -1529,12 +1543,15 @@ class ToggleAgentActionViewItem extends DropdownMenuActionViewItemWithKeybinding
 					makeAction(ChatMode.Agent),
 					makeAction(ChatMode.Edit),
 				];
+				if (chatService.unifiedViewEnabled) {
+					agentStateActions.unshift(makeAction(ChatMode.Chat));
+				}
+
 				return agentStateActions;
 			}
 		};
 
 		super(action, actionProvider, contextMenuService, undefined, keybindingService, contextKeyService);
-
 		this._register(delegate.onDidChangeMode(() => this.renderLabel(this.element!)));
 	}
 
@@ -1553,8 +1570,8 @@ class ToggleAgentActionViewItem extends DropdownMenuActionViewItemWithKeybinding
 		// Can't call super.renderLabel because it has a hack of forcing the 'codicon' class
 		this.setAriaLabelAttributes(element);
 
-		const state = this.delegate.getMode();
-		dom.reset(element, dom.$('span.chat-model-label', undefined, this.modeToString(state)), ...renderLabelWithIcons(`$(chevron-down)`));
+		const state = this.modeToString(this.delegate.getMode());
+		dom.reset(element, dom.$('span.chat-model-label', undefined, state), ...renderLabelWithIcons(`$(chevron-down)`));
 		return null;
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index 9751c788d42c..2ecff47e39b6 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -43,14 +43,16 @@ import { ColorScheme } from '../../../../platform/theme/common/theme.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { IWorkbenchIssueService } from '../../issue/common/issue.js';
 import { annotateSpecialMarkdownContent } from '../common/annotations.js';
-import { ChatAgentLocation, IChatAgentMetadata } from '../common/chatAgents.js';
+import { checkModeOption } from '../common/chat.js';
+import { IChatAgentMetadata } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatRequestVariableEntry, IChatTextEditGroup } from '../common/chatModel.js';
 import { chatSubcommandLeader } from '../common/chatParserTypes.js';
-import { ChatAgentVoteDirection, ChatAgentVoteDownReason, ChatErrorLevel, IChatConfirmation, IChatContentReference, IChatFollowup, IChatMarkdownContent, IChatTask, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop } from '../common/chatService.js';
+import { ChatAgentVoteDirection, ChatAgentVoteDownReason, ChatErrorLevel, IChatConfirmation, IChatContentReference, IChatFollowup, IChatMarkdownContent, IChatService, IChatTask, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop } from '../common/chatService.js';
 import { IChatCodeCitations, IChatReferences, IChatRendererContent, IChatRequestViewModel, IChatResponseViewModel, IChatWorkingProgress, isRequestVM, isResponseVM } from '../common/chatViewModel.js';
 import { getNWords } from '../common/chatWordCounter.js';
 import { CodeBlockModelCollection } from '../common/codeBlockModelCollection.js';
+import { ChatMode } 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';
@@ -105,6 +107,7 @@ const forceVerboseLayoutTracing = false
 export interface IChatRendererDelegate {
 	container: HTMLElement;
 	getListLength(): number;
+	currentChatMode(): ChatMode;
 
 	readonly onDidScroll?: Event<void>;
 }
@@ -162,6 +165,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		@ICommandService private readonly commandService: ICommandService,
 		@IHoverService private readonly hoverService: IHoverService,
 		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@IChatService private readonly chatService: IChatService,
 	) {
 		super();
 
@@ -243,7 +247,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 	}
 
 	layout(width: number): void {
-		this._currentLayoutWidth = width - (this.rendererOptions.noPadding ? 0 : 40); // padding
+		this._currentLayoutWidth = width - 40; // padding
 		for (const editor of this._editorPool.inUse()) {
 			editor.layout(this._currentLayoutWidth);
 		}
@@ -261,9 +265,6 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		if (this.rendererOptions.renderStyle === 'compact') {
 			rowContainer.classList.add('interactive-item-compact');
 		}
-		if (this.rendererOptions.noPadding) {
-			rowContainer.classList.add('no-padding');
-		}
 
 		let headerParent = rowContainer;
 		let valueParent = rowContainer;
@@ -294,7 +295,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		username.tabIndex = 0;
 		const detailContainer = dom.append(detailContainerParent ?? user, $('span.detail-container'));
 		const detail = dom.append(detailContainer, $('span.detail'));
-		if (!this.rendererOptions.progressMessageAtBottomOfResponse) {
+		if (!checkModeOption(this.delegate.currentChatMode(), this.rendererOptions.progressMessageAtBottomOfResponse)) {
 			dom.append(detailContainer, $('span.chat-animated-ellipsis'));
 		}
 		const value = dom.append(valueParent, $('.value'));
@@ -400,7 +401,8 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		const isFiltered = !!(isResponseVM(element) && element.errorDetails?.responseIsFiltered);
 		ChatContextKeys.responseIsFiltered.bindTo(templateData.contextKeyService).set(isFiltered);
 
-		templateData.rowContainer.classList.toggle('editing-session', this.chatWidgetService.getWidgetBySessionId(element.sessionId)?.location === ChatAgentLocation.EditingSession);
+		const location = this.chatWidgetService.getWidgetBySessionId(element.sessionId)?.location;
+		templateData.rowContainer.classList.toggle('editing-session', location && this.chatService.isEditingLocation(location));
 		templateData.rowContainer.classList.toggle('interactive-request', isRequestVM(element));
 		templateData.rowContainer.classList.toggle('interactive-response', isResponseVM(element));
 		templateData.rowContainer.classList.toggle('show-detail-progress', isResponseVM(element) && !element.isComplete && !element.progressMessages.length && !element.model.isPaused.get());
@@ -474,7 +476,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 				}
 			}));
 
-		} else if (this.rendererOptions.renderStyle !== 'minimal' && !element.isComplete && !this.rendererOptions.progressMessageAtBottomOfResponse) {
+		} else if (this.rendererOptions.renderStyle !== 'minimal' && !element.isComplete && !checkModeOption(this.delegate.currentChatMode(), this.rendererOptions.progressMessageAtBottomOfResponse)) {
 			if (element.model.isPaused.get()) {
 				templateData.detail.textContent = localize('paused', "Paused");
 			} else {
@@ -819,7 +821,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 	}
 
 	private shouldShowWorkingProgress(element: IChatResponseViewModel, partsToRender: IChatRendererContent[]): boolean {
-		if (element.agentOrSlashCommandDetected || this.rendererOptions.renderStyle === 'minimal' || element.isComplete || !this.rendererOptions.progressMessageAtBottomOfResponse) {
+		if (element.agentOrSlashCommandDetected || this.rendererOptions.renderStyle === 'minimal' || element.isComplete || !checkModeOption(this.delegate.currentChatMode(), this.rendererOptions.progressMessageAtBottomOfResponse)) {
 			return false;
 		}
 
@@ -946,7 +948,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 	}
 
 	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: this.rendererOptions.referencesExpandedWhenEmptyResponse });
+		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);
 		}));
@@ -1053,7 +1055,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 		const fillInIncompleteTokens = isResponseVM(element) && (!element.isComplete || element.isCanceled || element.errorDetails?.responseIsFiltered || element.errorDetails?.responseIsIncomplete || !!element.renderData);
 		const codeBlockStartIndex = this.getCodeBlockStartIndex(context);
 		const options: IChatMarkdownContentPartOptions = {
-			renderCodeBlockPills: this.rendererOptions.renderCodeBlockPills,
+			renderCodeBlockPills: checkModeOption(this.delegate.currentChatMode(), this.rendererOptions.renderCodeBlockPills),
 		};
 		const markdownPart = templateData.instantiationService.createInstance(ChatMarkdownContentPart, markdown, context, this._editorPool, fillInIncompleteTokens, codeBlockStartIndex, this.renderer, this._currentLayoutWidth, this.codeBlockModelCollection, options);
 		markdownPart.addDisposable(markdownPart.onDidChangeHeight(() => {
diff --git a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
index 3256369a754a..00b345093aeb 100644
--- a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
@@ -21,7 +21,7 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IViewContainersRegistry, IViewDescriptor, IViewsRegistry, ViewContainer, ViewContainerLocation, Extensions as ViewExtensions } from '../../../common/views.js';
-import { IExtensionFeatureTableRenderer, IRenderedData, ITableData, IRowData, IExtensionFeaturesRegistry, Extensions } from '../../../services/extensionManagement/common/extensionFeatures.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 { showExtensionsWithIdsCommandId } from '../../extensions/browser/extensionsActions.js';
@@ -29,6 +29,7 @@ import { IExtension, IExtensionsWorkbenchService } from '../../extensions/common
 import { ChatAgentLocation, IChatAgentData, IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IRawChatParticipantContribution } from '../common/chatParticipantContribTypes.js';
+import { ChatConfiguration } from '../common/constants.js';
 import { ChatViewId } from './chat.js';
 import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID, ChatViewPane } from './chatViewPane.js';
 
@@ -107,10 +108,13 @@ const editsViewDescriptor: IViewDescriptor[] = [{
 		order: 2
 	},
 	ctorDescriptor: new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.EditingSession }]),
-	when: ContextKeyExpr.or(
-		ChatContextKeys.Setup.hidden.negate(),
-		ChatContextKeys.Setup.installed,
-		ChatContextKeys.editingParticipantRegistered
+	when: ContextKeyExpr.and(
+		ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedChatView}`).negate(),
+		ContextKeyExpr.or(
+			ChatContextKeys.Setup.hidden.negate(),
+			ChatContextKeys.Setup.installed,
+			ChatContextKeys.editingParticipantRegistered
+		)
 	)
 }];
 Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).registerViews(editsViewDescriptor, editsViewContainer);
diff --git a/src/vs/workbench/contrib/chat/browser/chatQuick.ts b/src/vs/workbench/contrib/chat/browser/chatQuick.ts
index a4af4355058f..137fc14757b1 100644
--- a/src/vs/workbench/contrib/chat/browser/chatQuick.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatQuick.ts
@@ -19,12 +19,12 @@ import { IQuickInputService, IQuickWidget } from '../../../../platform/quickinpu
 import { editorBackground, inputBackground, quickInputBackground, quickInputForeground } from '../../../../platform/theme/common/colorRegistry.js';
 import { IQuickChatOpenOptions, IQuickChatService, showChatView } from './chat.js';
 import { ChatWidget } from './chatWidget.js';
-import { ChatAgentLocation } from '../common/chatAgents.js';
 import { ChatModel, isCellTextEditOperation } from '../common/chatModel.js';
 import { IParsedChatRequest } from '../common/chatParserTypes.js';
 import { IChatProgress, IChatService } from '../common/chatService.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { EDITOR_DRAG_AND_DROP_BACKGROUND } from '../../../common/theme.js';
+import { ChatAgentLocation } from '../common/constants.js';
 
 export class QuickChatService extends Disposable implements IQuickChatService {
 	readonly _serviceBrand: undefined;
diff --git a/src/vs/workbench/contrib/chat/browser/chatVariables.ts b/src/vs/workbench/contrib/chat/browser/chatVariables.ts
index 815db7821e75..75e7c2d38e5e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatVariables.ts
@@ -6,11 +6,13 @@
 import { coalesce } from '../../../../base/common/arrays.js';
 import { URI } from '../../../../base/common/uri.js';
 import { Location } from '../../../../editor/common/languages.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { ChatAgentLocation } from '../common/chatAgents.js';
 import { IChatRequestVariableData, IChatRequestVariableEntry } from '../common/chatModel.js';
 import { ChatRequestDynamicVariablePart, ChatRequestToolPart, IParsedChatRequest } from '../common/chatParserTypes.js';
 import { IChatVariablesService, IDynamicVariable } from '../common/chatVariables.js';
+import { ChatConfiguration } from '../common/constants.js';
 import { IChatWidgetService, showChatView, showEditsView } from './chat.js';
 import { ChatDynamicVariableModel } from './contrib/chatDynamicVariables.js';
 
@@ -20,6 +22,7 @@ export class ChatVariablesService implements IChatVariablesService {
 	constructor(
 		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
 		@IViewsService private readonly viewsService: IViewsService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
 	) {
 	}
 
@@ -73,7 +76,8 @@ export class ChatVariablesService implements IChatVariablesService {
 			return;
 		}
 
-		const widget = location === ChatAgentLocation.EditingSession
+		const unifiedViewEnabled = !!this.configurationService.getValue(ChatConfiguration.UnifiedChatView);
+		const widget = location === ChatAgentLocation.EditingSession && !unifiedViewEnabled
 			? await showEditsView(this.viewsService)
 			: (this.chatWidgetService.lastFocusedWidget ?? await showChatView(this.viewsService));
 		if (!widget || !widget.viewModel) {
diff --git a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
index 57b36dcfa1d0..3cf5196fdd41 100644
--- a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
@@ -25,12 +25,12 @@ import { Memento } from '../../../common/memento.js';
 import { SIDE_BAR_FOREGROUND } from '../../../common/theme.js';
 import { IViewDescriptorService } from '../../../common/views.js';
 import { IChatViewTitleActionContext } from '../common/chatActions.js';
-import { ChatAgentLocation, IChatAgentService } from '../common/chatAgents.js';
+import { IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { ChatModelInitState, IChatModel } from '../common/chatModel.js';
 import { CHAT_PROVIDER_ID } from '../common/chatParticipantContribTypes.js';
 import { IChatService } from '../common/chatService.js';
-import { ChatMode } from '../common/constants.js';
+import { ChatAgentLocation, ChatMode } from '../common/constants.js';
 import { ChatWidget, IChatViewState } from './chatWidget.js';
 import { ChatViewWelcomeController, IViewWelcomeDelegate } from './viewsWelcome/chatViewWelcomeController.js';
 
@@ -174,21 +174,22 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 				this.chatOptions.location,
 				{ viewId: this.id },
 				{
-					autoScroll: this.chatOptions.location === ChatAgentLocation.EditingSession,
+					autoScroll: mode => mode !== ChatMode.Chat,
 					renderFollowups: this.chatOptions.location === ChatAgentLocation.Panel,
 					supportsFileReferences: true,
 					supportsAdditionalParticipants: this.chatOptions.location === ChatAgentLocation.Panel,
 					rendererOptions: {
-						renderCodeBlockPills: this.chatOptions.location === ChatAgentLocation.EditingSession,
+						renderCodeBlockPills: mode => mode !== ChatMode.Chat,
 						renderTextEditsAsSummary: (uri) => {
-							return this.chatOptions.location === ChatAgentLocation.EditingSession;
+							return this.chatService.isEditingLocation(this.chatOptions.location);
 						},
-						referencesExpandedWhenEmptyResponse: this.chatOptions.location !== ChatAgentLocation.EditingSession,
-						progressMessageAtBottomOfResponse: this.chatOptions.location === ChatAgentLocation.EditingSession,
+						referencesExpandedWhenEmptyResponse: !this.chatService.isEditingLocation(this.chatOptions.location),
+						progressMessageAtBottomOfResponse: this.chatService.isEditingLocation(this.chatOptions.location),
 					},
 					editorOverflowWidgetsDomNode: editorOverflowNode,
-					enableImplicitContext: this.chatOptions.location === ChatAgentLocation.Panel || this.chatOptions.location === ChatAgentLocation.EditingSession,
-					enableWorkingSet: this.chatOptions.location === ChatAgentLocation.EditingSession ? 'explicit' : undefined
+					enableImplicitContext: this.chatOptions.location === ChatAgentLocation.Panel || this.chatService.isEditingLocation(this.chatOptions.location),
+					enableWorkingSet: this.chatService.isEditingLocation(this.chatOptions.location) ? 'explicit' : undefined,
+					supportsChangingModes: this.chatService.isEditingLocation(this.chatOptions.location),
 				},
 				{
 					listForeground: SIDE_BAR_FOREGROUND,
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index 0be625675db1..48510c469548 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -8,6 +8,7 @@ import { Button } from '../../../../base/browser/ui/button/button.js';
 import { ITreeContextMenuEvent, ITreeElement } from '../../../../base/browser/ui/tree/tree.js';
 import { disposableTimeout, timeout } from '../../../../base/common/async.js';
 import { Codicon } from '../../../../base/common/codicons.js';
+import { memoize } from '../../../../base/common/decorators.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { FuzzyScore } from '../../../../base/common/filters.js';
@@ -37,7 +38,8 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet
 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 { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentService, IChatWelcomeMessageContent, isChatWelcomeMessageContent } from '../common/chatAgents.js';
+import { checkModeOption } from '../common/chat.js';
+import { IChatAgentCommand, IChatAgentData, IChatAgentService, IChatWelcomeMessageContent, isChatWelcomeMessageContent } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { applyingChatEditsFailedContextKey, decidedChatEditingResourceContextKey, hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, IChatEditingService, IChatEditingSession, inChatEditingSessionContextKey, WorkingSetEntryState } from '../common/chatEditingService.js';
 import { ChatPauseState, IChatModel, IChatRequestVariableEntry, IChatResponseModel } from '../common/chatModel.js';
@@ -48,7 +50,7 @@ import { IChatSlashCommandService } from '../common/chatSlashCommands.js';
 import { ChatViewModel, IChatResponseViewModel, isRequestVM, isResponseVM } from '../common/chatViewModel.js';
 import { IChatInputState } from '../common/chatWidgetHistoryService.js';
 import { CodeBlockModelCollection } from '../common/codeBlockModelCollection.js';
-import { ChatMode } from '../common/constants.js';
+import { ChatAgentLocation, ChatConfiguration, ChatMode } from '../common/constants.js';
 import { ChatTreeItem, IChatAcceptInputOptions, IChatAccessibilityService, IChatCodeBlockInfo, IChatFileTreeInfo, IChatListItemRendererOptions, IChatWidget, IChatWidgetService, IChatWidgetViewContext, IChatWidgetViewOptions } from './chat.js';
 import { ChatAccessibilityProvider } from './chatAccessibilityProvider.js';
 import { ChatAttachmentModel } from './chatAttachmentModel.js';
@@ -158,6 +160,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	private canRequestBePaused: IContextKey<boolean>;
 	private agentInInput: IContextKey<boolean>;
 
+
 	private _visible = false;
 	public get visible() {
 		return this._visible;
@@ -218,6 +221,11 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 	readonly viewContext: IChatWidgetViewContext;
 
+	@memoize
+	get isUnifiedPanelWidget(): boolean {
+		return this._location.location === ChatAgentLocation.Panel && !!this.viewOptions.supportsChangingModes && this.configurationService.getValue(ChatConfiguration.UnifiedChatView);
+	}
+
 	constructor(
 		location: ChatAgentLocation | IChatWidgetLocationOptions,
 		_viewContext: IChatWidgetViewContext | undefined,
@@ -254,6 +262,8 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		ChatContextKeys.inChatSession.bindTo(contextKeyService).set(true);
 		ChatContextKeys.location.bindTo(contextKeyService).set(this._location.location);
 		ChatContextKeys.inQuickChat.bindTo(contextKeyService).set(isQuickChat(this));
+		ChatContextKeys.inUnifiedChat.bindTo(contextKeyService)
+			.set(this._location.location === ChatAgentLocation.Panel && !!this.viewOptions.supportsChangingModes && this.configurationService.getValue(ChatConfiguration.UnifiedChatView));
 		this.agentInInput = ChatContextKeys.inputHasAgent.bindTo(contextKeyService);
 		this.requestInProgress = ChatContextKeys.requestInProgress.bindTo(contextKeyService);
 		this.isRequestPaused = ChatContextKeys.isRequestPaused.bindTo(contextKeyService);
@@ -344,7 +354,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			this.renderChatEditingSessionState();
 		}));
 
-		if (this._location.location === ChatAgentLocation.EditingSession) {
+		if (this._location.location === ChatAgentLocation.EditingSession || this.chatService.unifiedViewEnabled) {
 			let currentEditSession: IChatEditingSession | undefined = undefined;
 			this._register(this.onDidChangeViewModel(async () => {
 				const sessionId = this._viewModel?.sessionId;
@@ -696,7 +706,8 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		const rendererDelegate: IChatRendererDelegate = {
 			getListLength: () => this.tree.getNode(null).visibleChildrenCount,
 			onDidScroll: this.onDidScroll,
-			container: listContainer
+			container: listContainer,
+			currentChatMode: () => this.input.currentMode,
 		};
 
 		// Create a dom element to hold UI from editor widgets embedded in chat messages
@@ -837,7 +848,8 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				menus: { executeToolbar: MenuId.ChatExecute, ...this.viewOptions.menus },
 				editorOverflowWidgetsDomNode: this.viewOptions.editorOverflowWidgetsDomNode,
 				enableImplicitContext: this.viewOptions.enableImplicitContext,
-				renderWorkingSet: this.viewOptions.enableWorkingSet === 'explicit'
+				renderWorkingSet: this.viewOptions.enableWorkingSet === 'explicit',
+				supportsChangingModes: this.viewOptions.supportsChangingModes,
 			},
 			this.styles,
 			() => this.collectInputState()
@@ -918,6 +930,9 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			// Tools agent loads -> welcome content changes
 			this.renderWelcomeViewContentIfNeeded();
 		}));
+		this._register(this.input.onDidChangeCurrentChatMode(() => {
+			this.renderWelcomeViewContentIfNeeded();
+		}));
 	}
 
 	private onDidStyleChange(): void {
@@ -1079,7 +1094,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 		if (this.viewModel) {
 			this._onDidAcceptInput.fire();
-			if (!this.viewOptions.autoScroll) {
+			if (!checkModeOption(this.input.currentMode, this.viewOptions.autoScroll)) {
 				this.scrollLock = false;
 			}
 
@@ -1211,8 +1226,10 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		const lastElementVisible = this.tree.scrollTop + this.tree.renderHeight >= this.tree.scrollHeight - 2;
 
 		const listHeight = Math.max(0, height - inputPartHeight);
-		if (!this.viewOptions.autoScroll) {
+		if (!checkModeOption(this.input.currentMode, this.viewOptions.autoScroll)) {
 			this.listContainer.style.setProperty('--chat-current-response-min-height', listHeight * .75 + 'px');
+		} else {
+			this.listContainer.style.removeProperty('--chat-current-response-min-height');
 		}
 
 		this.tree.layout(listHeight, width);
@@ -1231,7 +1248,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 		const lastItem = this.viewModel?.getItems().at(-1);
 		const lastResponseIsRendering = isResponseVM(lastItem) && lastItem.renderData;
-		if (lastElementVisible && (!lastResponseIsRendering || this.viewOptions.autoScroll)) {
+		if (lastElementVisible && (!lastResponseIsRendering || checkModeOption(this.input.currentMode, this.viewOptions.autoScroll))) {
 			this.scrollToEnd();
 		}
 
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
index dc70c779fc83..afcd62f22183 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
@@ -18,10 +18,10 @@ 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 { ChatAgentLocation } from '../../common/chatAgents.js';
 import { IChatEditingService } from '../../common/chatEditingService.js';
 import { IBaseChatRequestVariableEntry, IChatRequestImplicitVariableEntry } from '../../common/chatModel.js';
 import { IChatService } from '../../common/chatService.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 import { ILanguageModelIgnoredFilesService } from '../../common/ignoredFiles.js';
 import { IChatWidget, IChatWidgetService } from '../chat.js';
 
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
index 64853cc5daa2..475d9933e08b 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
@@ -41,6 +41,7 @@ import { IChatEditingService } from '../../common/chatEditingService.js';
 import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestTextPart, ChatRequestToolPart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from '../../common/chatParserTypes.js';
 import { IChatSlashCommandService } from '../../common/chatSlashCommands.js';
 import { IDynamicVariable } from '../../common/chatVariables.js';
+import { ChatMode } from '../../common/constants.js';
 import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
 import { ChatEditingSessionSubmitAction, ChatSubmitAction } from '../actions/chatExecuteActions.js';
 import { IChatWidget, IChatWidgetService } from '../chat.js';
@@ -691,7 +692,7 @@ class BuiltinDynamicCompletions extends Disposable {
 		const len = result.suggestions.length;
 
 		// RELATED FILES
-		if (widget.location === ChatAgentLocation.EditingSession && widget.viewModel && this._chatEditingService.getEditingSession(widget.viewModel.sessionId)) {
+		if (widget.input.currentMode !== ChatMode.Chat && widget.viewModel && this._chatEditingService.getEditingSession(widget.viewModel.sessionId)) {
 			const relatedFiles = (await raceTimeout(this._chatEditingService.getRelatedFiles(widget.viewModel.sessionId, widget.getInput(), widget.attachmentModel.fileAttachments, token), 200)) ?? [];
 			for (const relatedFileGroup of relatedFiles) {
 				for (const relatedFile of relatedFileGroup.files) {
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index a0555fd2b9ff..4f96f3610dbd 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -435,11 +435,6 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	padding: 8px 20px;
 }
 
-.interactive-item-container.interactive-item-compact.no-padding {
-	padding: unset;
-	gap: unset;
-}
-
 .interactive-item-container.interactive-item-compact .header {
 	height: 16px;
 }
diff --git a/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts b/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts
index bbe6404c8faf..aa765010ffae 100644
--- a/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts
+++ b/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts
@@ -17,7 +17,8 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { ILogService } from '../../../../../platform/log/common/log.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
 import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
-import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
+import { IChatAgentService } from '../../common/chatAgents.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 import { chatViewsWelcomeRegistry, IChatViewsWelcomeDescriptor } from './chatViewsWelcome.js';
 
 const $ = dom.$;
diff --git a/src/vs/workbench/contrib/chat/common/chat.ts b/src/vs/workbench/contrib/chat/common/chat.ts
new file mode 100644
index 000000000000..7e2b00c0c8f8
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/chat.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 { ChatMode } from './constants.js';
+
+export function checkModeOption(mode: ChatMode, option: boolean | ((mode: ChatMode) => boolean) | undefined): boolean | undefined {
+	if (option === undefined) {
+		return undefined;
+	}
+	if (typeof option === 'function') {
+		return option(mode);
+	}
+	return option;
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatAgents.ts b/src/vs/workbench/contrib/chat/common/chatAgents.ts
index dca99689801c..f50d851f493d 100644
--- a/src/vs/workbench/contrib/chat/common/chatAgents.ts
+++ b/src/vs/workbench/contrib/chat/common/chatAgents.ts
@@ -25,9 +25,9 @@ import { asJson, IRequestService } from '../../../../platform/request/common/req
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { ChatContextKeys } from './chatContextKeys.js';
 import { IChatProgressHistoryResponseContent, IChatRequestVariableData, ISerializableChatAgentData } from './chatModel.js';
-import { IRawChatCommandContribution, RawChatParticipantLocation } from './chatParticipantContribTypes.js';
+import { IRawChatCommandContribution } from './chatParticipantContribTypes.js';
 import { IChatFollowup, IChatLocationData, IChatProgress, IChatResponseErrorDetails, IChatTaskDto } from './chatService.js';
-import { ChatMode } from './constants.js';
+import { ChatAgentLocation, ChatMode } from './constants.js';
 
 //#region agent service, commands etc
 
@@ -37,27 +37,6 @@ export interface IChatAgentHistoryEntry {
 	result: IChatAgentResult;
 }
 
-export enum ChatAgentLocation {
-	Panel = 'panel',
-	Terminal = 'terminal',
-	Notebook = 'notebook',
-	Editor = 'editor',
-	EditingSession = 'editing-session',
-}
-
-export namespace ChatAgentLocation {
-	export function fromRaw(value: RawChatParticipantLocation | string): ChatAgentLocation {
-		switch (value) {
-			case 'panel': return ChatAgentLocation.Panel;
-			case 'terminal': return ChatAgentLocation.Terminal;
-			case 'notebook': return ChatAgentLocation.Notebook;
-			case 'editor': return ChatAgentLocation.Editor;
-			case 'editing-session': return ChatAgentLocation.EditingSession;
-		}
-		return ChatAgentLocation.Panel;
-	}
-}
-
 export interface IChatAgentData {
 	id: string;
 	name: string;
@@ -400,8 +379,12 @@ export class ChatAgentService extends Disposable implements IChatAgentService {
 	}
 
 	getDefaultAgent(location: ChatAgentLocation, mode?: ChatMode): IChatAgent | undefined {
+		if (mode === ChatMode.Edit || mode === ChatMode.Agent) {
+			location = ChatAgentLocation.EditingSession;
+		}
+
 		return findLast(this.getActivatedAgents(), a => {
-			if (location === ChatAgentLocation.EditingSession && ((mode === ChatMode.Agent) !== !!a.isToolsAgent)) {
+			if ((mode === ChatMode.Agent) !== !!a.isToolsAgent) {
 				return false;
 			}
 
@@ -765,3 +748,4 @@ export function reviveSerializedAgent(raw: ISerializableChatAgentData): IChatAge
 
 	return revive(agent);
 }
+export { ChatAgentLocation };
diff --git a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
index b88c1ac7673e..cb192f9987e2 100644
--- a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
@@ -7,7 +7,7 @@ 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 { ChatAgentLocation } from './chatAgents.js';
+import { ChatAgentLocation, ChatConfiguration, ChatMode } 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.") });
@@ -30,7 +30,9 @@ export namespace ChatContextKeys {
 	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 inUnifiedChat = new RawContextKey<boolean>('inUnifiedChat', false, { type: 'boolean', description: localize('inUnifiedChat', "True when focus is in the unified chat widget, false otherwise.") });
 	export const instructionsAttached = new RawContextKey<boolean>('chatInstructionsAttached', false, { type: 'boolean', description: localize('chatInstructionsAttachedContextDescription', "True when the chat has a prompt instructions attached.") });
+	export const chatMode = new RawContextKey<ChatMode>('chatMode', ChatMode.Chat, { type: 'string', description: localize('chatMode', "The current chat mode.") });
 
 	export const supported = ContextKeyExpr.or(IsWebContext.toNegated(), RemoteNameContext.notEqualsTo('')); // supported on desktop and in web only with a remote connection
 	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.") });
@@ -82,8 +84,24 @@ export namespace ChatContextKeys {
 
 	export const Editing = {
 		hasToolsAgent: new RawContextKey<boolean>('chatHasToolsAgent', false, { type: 'boolean', description: localize('chatEditingHasToolsAgent', "True when a tools agent is registered.") }),
-		agentMode: new RawContextKey<boolean>('chatAgentMode', false, { type: 'boolean', description: localize('chatEditingAgentMode', "True when edits is in agent mode.") }),
 		agentModeDisallowed: new RawContextKey<boolean>('chatAgentModeDisallowed', undefined, { type: 'boolean', description: localize('chatAgentModeDisallowed', "True when agent mode is not allowed.") }), // experiment-driven disablement
 		hasToolConfirmation: new RawContextKey<boolean>('chatHasToolConfirmation', false, { type: 'boolean', description: localize('chatEditingHasToolConfirmation', "True when a tool confirmation is present.") }),
 	};
 }
+
+export namespace ChatContextKeyExprs {
+	export const unifiedChatEnabled = ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedChatView}`);
+
+	export const inEditsOrUnified = ContextKeyExpr.or(
+		ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
+		ChatContextKeys.inUnifiedChat);
+
+	export const inNonUnifiedPanel = ContextKeyExpr.and(
+		ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel),
+		ChatContextKeys.inUnifiedChat.negate());
+
+	export const inEditingMode = ContextKeyExpr.or(
+		ChatContextKeys.chatMode.isEqualTo(ChatMode.Edit),
+		ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent),
+	);
+}
diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index 5fcbad47af10..8e0a33440ade 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -24,10 +24,11 @@ import { localize } from '../../../../nls.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IMarker, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { CellUri, ICellEditOperation } from '../../notebook/common/notebookCommon.js';
-import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentResult, IChatAgentService, IChatWelcomeMessageContent, reviveSerializedAgent } from './chatAgents.js';
+import { IChatAgentCommand, IChatAgentData, IChatAgentResult, IChatAgentService, IChatWelcomeMessageContent, reviveSerializedAgent } from './chatAgents.js';
 import { ChatRequestTextPart, IParsedChatRequest, reviveParsedChatRequest } from './chatParserTypes.js';
 import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatLocationData, IChatMarkdownContent, IChatNotebookEdit, IChatProgress, IChatProgressMessage, IChatResponseCodeblockUriPart, IChatResponseProgressFileTreeData, IChatTask, IChatTextEdit, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop, IChatUsedContext, IChatWarningMessage, isIUsedContext } from './chatService.js';
 import { IChatRequestVariableValue } from './chatVariables.js';
+import { ChatAgentLocation } from './constants.js';
 
 export interface IBaseChatRequestVariableEntry {
 	id: string;
diff --git a/src/vs/workbench/contrib/chat/common/chatParserTypes.ts b/src/vs/workbench/contrib/chat/common/chatParserTypes.ts
index 164b87785ef8..2542fa4ca674 100644
--- a/src/vs/workbench/contrib/chat/common/chatParserTypes.ts
+++ b/src/vs/workbench/contrib/chat/common/chatParserTypes.ts
@@ -7,10 +7,11 @@ import { revive } from '../../../../base/common/marshalling.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { IOffsetRange, OffsetRange } from '../../../../editor/common/core/offsetRange.js';
 import { IRange } from '../../../../editor/common/core/range.js';
-import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentService, reviveSerializedAgent } from './chatAgents.js';
+import { IChatAgentCommand, IChatAgentData, IChatAgentService, reviveSerializedAgent } from './chatAgents.js';
 import { IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData } from './chatModel.js';
 import { IChatSlashData } from './chatSlashCommands.js';
 import { IChatRequestProblemsVariable, IChatRequestVariableValue } from './chatVariables.js';
+import { ChatAgentLocation } from './constants.js';
 import { IToolData } from './languageModelToolsService.js';
 
 // These are in a separate file to avoid circular dependencies with the dependencies of the parser
diff --git a/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts b/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts
index 401211b3c4f1..92549dc2480d 100644
--- a/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts
+++ b/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { RawChatParticipantLocation } from './constants.js';
+
 export interface IRawChatCommandContribution {
 	name: string;
 	description: string;
@@ -13,8 +15,6 @@ export interface IRawChatCommandContribution {
 	disambiguation?: { category: string; categoryName?: string /** Deprecated */; description: string; examples: string[] }[];
 }
 
-export type RawChatParticipantLocation = 'panel' | 'terminal' | 'notebook' | 'editing-session';
-
 export interface IRawChatParticipantContribution {
 	id: string;
 	name: string;
diff --git a/src/vs/workbench/contrib/chat/common/chatRequestParser.ts b/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
index c6359f5c4ff5..3050adba33e9 100644
--- a/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
+++ b/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
@@ -6,11 +6,11 @@
 import { OffsetRange } from '../../../../editor/common/core/offsetRange.js';
 import { IPosition, Position } from '../../../../editor/common/core/position.js';
 import { Range } from '../../../../editor/common/core/range.js';
-import { ChatAgentLocation, IChatAgentData, IChatAgentService } from './chatAgents.js';
+import { IChatAgentData, IChatAgentService } from './chatAgents.js';
 import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestToolPart, IParsedChatRequest, IParsedChatRequestPart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from './chatParserTypes.js';
 import { IChatSlashCommandService } from './chatSlashCommands.js';
 import { IChatVariablesService, IDynamicVariable } from './chatVariables.js';
-import { ChatMode } from './constants.js';
+import { ChatAgentLocation, ChatMode } from './constants.js';
 import { ILanguageModelToolsService } from './languageModelToolsService.js';
 
 const agentReg = /^@([\w_\-\.]+)(?=(\s|$|\b))/i; // An @-agent
diff --git a/src/vs/workbench/contrib/chat/common/chatService.ts b/src/vs/workbench/contrib/chat/common/chatService.ts
index e777a648233d..0c0e740731df 100644
--- a/src/vs/workbench/contrib/chat/common/chatService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatService.ts
@@ -16,12 +16,12 @@ import { FileType } from '../../../../platform/files/common/files.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { ICellEditOperation } from '../../notebook/common/notebookCommon.js';
 import { IWorkspaceSymbol } from '../../search/common/search.js';
-import { ChatAgentLocation, IChatAgentCommand, IChatAgentData, IChatAgentResult } from './chatAgents.js';
+import { IChatAgentCommand, IChatAgentData, IChatAgentResult } from './chatAgents.js';
 import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IChatRequestVariableEntry, IChatResponseModel, IExportableChatData, ISerializableChatData } from './chatModel.js';
 import { IParsedChatRequest } from './chatParserTypes.js';
 import { IChatParserContext } from './chatRequestParser.js';
 import { IChatRequestVariableValue } from './chatVariables.js';
-import { ChatMode } from './constants.js';
+import { ChatAgentLocation, ChatMode } from './constants.js';
 import { IPreparedToolInvocation, IToolConfirmationMessages, IToolResult } from './languageModelToolsService.js';
 
 export interface IChatRequest {
@@ -507,6 +507,9 @@ export interface IChatService {
 	onDidDisposeSession: Event<{ sessionId: string; reason: 'initializationFailed' | 'cleared' }>;
 
 	transferChatSession(transferredSessionData: IChatTransferredSessionData, toWorkspace: URI): void;
+
+	readonly unifiedViewEnabled: boolean;
+	isEditingLocation(location: ChatAgentLocation): boolean;
 }
 
 export const KEYWORD_ACTIVIATION_SETTING_ID = 'accessibility.voice.keywordActivation';
diff --git a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
index 86c8b630ec6e..1111f0bae4b9 100644
--- a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
@@ -5,6 +5,7 @@
 
 import { DeferredPromise } from '../../../../base/common/async.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { memoize } from '../../../../base/common/decorators.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { ErrorNoTelemetry } from '../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
@@ -25,7 +26,7 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { ChatAgentLocation, IChatAgent, IChatAgentCommand, IChatAgentData, IChatAgentHistoryEntry, IChatAgentRequest, IChatAgentResult, IChatAgentService } from './chatAgents.js';
+import { IChatAgent, IChatAgentCommand, IChatAgentData, IChatAgentHistoryEntry, IChatAgentRequest, IChatAgentResult, IChatAgentService } from './chatAgents.js';
 import { ChatModel, ChatRequestModel, ChatRequestRemovalReason, IChatModel, IChatRequestModel, IChatRequestVariableData, IChatResponseModel, IExportableChatData, ISerializableChatData, ISerializableChatDataIn, ISerializableChatsData, normalizeSerializableChatData, toChatHistoryContent, updateRanges } from './chatModel.js';
 import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, IParsedChatRequest, chatAgentLeader, chatSubcommandLeader, getPromptText } from './chatParserTypes.js';
 import { ChatRequestParser } from './chatRequestParser.js';
@@ -33,7 +34,7 @@ import { IChatCompleteResponse, IChatDetail, IChatFollowup, IChatProgress, IChat
 import { ChatServiceTelemetry } from './chatServiceTelemetry.js';
 import { IChatSlashCommandService } from './chatSlashCommands.js';
 import { IChatVariablesService } from './chatVariables.js';
-import { ChatMode } from './constants.js';
+import { ChatAgentLocation, ChatConfiguration, ChatMode } from './constants.js';
 import { ChatMessageRole, IChatMessage } from './languageModels.js';
 import { ILanguageModelToolsService } from './languageModelToolsService.js';
 
@@ -135,6 +136,11 @@ export class ChatService extends Disposable implements IChatService {
 	private readonly _sessionFollowupCancelTokens = this._register(new DisposableMap<string, CancellationTokenSource>());
 	private readonly _chatServiceTelemetry: ChatServiceTelemetry;
 
+	@memoize
+	public get unifiedViewEnabled(): boolean {
+		return !!this.configurationService.getValue(ChatConfiguration.UnifiedChatView);
+	}
+
 	constructor(
 		@IStorageService private readonly storageService: IStorageService,
 		@ILogService private readonly logService: ILogService,
@@ -703,7 +709,7 @@ export class ChatService extends Disposable implements IChatService {
 						} satisfies IChatAgentRequest;
 					};
 
-					if (this.configurationService.getValue('chat.detectParticipant.enabled') !== false && this.chatAgentService.hasChatParticipantDetectionProviders() && !agentPart && !commandPart && !agentSlashCommandPart && enableCommandDetection) {
+					if (this.configurationService.getValue('chat.detectParticipant.enabled') !== false && this.chatAgentService.hasChatParticipantDetectionProviders() && !agentPart && !commandPart && !agentSlashCommandPart && enableCommandDetection && options?.mode !== ChatMode.Agent && options?.mode !== ChatMode.Edit) {
 						// 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);
 
@@ -1039,6 +1045,10 @@ export class ChatService extends Disposable implements IChatService {
 		this.storageService.store(globalChatKey, JSON.stringify(existingRaw), StorageScope.PROFILE, StorageTarget.MACHINE);
 		this.trace('transferChatSession', `Transferred session ${model.sessionId} to workspace ${toWorkspace.toString()}`);
 	}
+
+	isEditingLocation(location: ChatAgentLocation): boolean {
+		return location === ChatAgentLocation.EditingSession || this.unifiedViewEnabled;
+	}
 }
 
 function getCodeBlocks(text: string): string[] {
diff --git a/src/vs/workbench/contrib/chat/common/chatVariables.ts b/src/vs/workbench/contrib/chat/common/chatVariables.ts
index 2edc51c47865..809d5637c533 100644
--- a/src/vs/workbench/contrib/chat/common/chatVariables.ts
+++ b/src/vs/workbench/contrib/chat/common/chatVariables.ts
@@ -9,10 +9,10 @@ import { URI } from '../../../../base/common/uri.js';
 import { IRange } from '../../../../editor/common/core/range.js';
 import { Location } from '../../../../editor/common/languages.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { ChatAgentLocation } from './chatAgents.js';
 import { IChatModel, IChatRequestVariableData, IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData } from './chatModel.js';
 import { IParsedChatRequest } from './chatParserTypes.js';
 import { IChatContentReference, IChatProgressMessage } from './chatService.js';
+import { ChatAgentLocation } from './constants.js';
 
 export interface IChatVariableData {
 	id: string;
diff --git a/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts b/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts
index 82ba4748b999..4522c0b7bd33 100644
--- a/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts
@@ -8,11 +8,10 @@ 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 { ChatAgentLocation } from './chatAgents.js';
 import { WorkingSetEntryState } from './chatEditingService.js';
 import { IChatRequestVariableEntry } from './chatModel.js';
 import { CHAT_PROVIDER_ID } from './chatParticipantContribTypes.js';
-import { ChatMode } from './constants.js';
+import { ChatAgentLocation, ChatMode } from './constants.js';
 
 export interface IChatHistoryEntry {
 	text: string;
diff --git a/src/vs/workbench/contrib/chat/common/constants.ts b/src/vs/workbench/contrib/chat/common/constants.ts
index 9759e6c63168..9c42f7bc3041 100644
--- a/src/vs/workbench/contrib/chat/common/constants.ts
+++ b/src/vs/workbench/contrib/chat/common/constants.ts
@@ -3,8 +3,35 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+export enum ChatConfiguration {
+	UnifiedChatView = 'chat.experimental.unifiedChatView',
+}
+
 export enum ChatMode {
 	Chat = 'chat',
 	Edit = 'edit',
 	Agent = 'agent'
 }
+
+export type RawChatParticipantLocation = 'panel' | 'terminal' | 'notebook' | 'editing-session';
+
+export enum ChatAgentLocation {
+	Panel = 'panel',
+	Terminal = 'terminal',
+	Notebook = 'notebook',
+	Editor = 'editor',
+	EditingSession = 'editing-session',
+}
+
+export namespace ChatAgentLocation {
+	export function fromRaw(value: RawChatParticipantLocation | string): ChatAgentLocation {
+		switch (value) {
+			case 'panel': return ChatAgentLocation.Panel;
+			case 'terminal': return ChatAgentLocation.Terminal;
+			case 'notebook': return ChatAgentLocation.Notebook;
+			case 'editor': return ChatAgentLocation.Editor;
+			case 'editing-session': return ChatAgentLocation.EditingSession;
+		}
+		return ChatAgentLocation.Panel;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/test/browser/chatEditingService.test.ts b/src/vs/workbench/contrib/chat/test/browser/chatEditingService.test.ts
index 220f55e8e4e1..5fed1eb581a6 100644
--- a/src/vs/workbench/contrib/chat/test/browser/chatEditingService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/chatEditingService.test.ts
@@ -17,7 +17,7 @@ import { IChatEditingService } from '../../common/chatEditingService.js';
 import { assertThrowsAsync, ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 import { IChatVariablesService } from '../../common/chatVariables.js';
 import { MockChatVariablesService } from '../common/mockChatVariables.js';
-import { ChatAgentLocation, ChatAgentService, IChatAgentImplementation, IChatAgentService } from '../../common/chatAgents.js';
+import { ChatAgentService, IChatAgentImplementation, IChatAgentService } from '../../common/chatAgents.js';
 import { IChatSlashCommandService } from '../../common/chatSlashCommands.js';
 import { IWorkbenchAssignmentService } from '../../../../services/assignment/common/assignmentService.js';
 import { NullWorkbenchAssignmentService } from '../../../../services/assignment/test/common/nullAssignmentService.js';
@@ -31,6 +31,7 @@ import { isEqual } from '../../../../../base/common/resources.js';
 import { waitForState } from '../../../../../base/common/observable.js';
 import { INotebookService } from '../../../notebook/common/notebookService.js';
 import { Range } from '../../../../../editor/common/core/range.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 
 function getAgentData(id: string) {
 	return {
diff --git a/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts b/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
index b8e38fcb6cef..9f5444ca5cdf 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
@@ -16,11 +16,12 @@ import { TestInstantiationService } from '../../../../../platform/instantiation/
 import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js';
 import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
 import { IStorageService } from '../../../../../platform/storage/common/storage.js';
-import { ChatAgentLocation, ChatAgentService, IChatAgentService } from '../../common/chatAgents.js';
+import { ChatAgentService, IChatAgentService } from '../../common/chatAgents.js';
 import { ChatModel, ISerializableChatData1, ISerializableChatData2, ISerializableChatData3, normalizeSerializableChatData, Response } from '../../common/chatModel.js';
 import { ChatRequestTextPart } from '../../common/chatParserTypes.js';
 import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
 import { TestExtensionService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 
 suite('ChatModel', () => {
 	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
diff --git a/src/vs/workbench/contrib/chat/test/common/chatService.test.ts b/src/vs/workbench/contrib/chat/test/common/chatService.test.ts
index 8334b23f3baa..8f950258be99 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatService.test.ts
@@ -20,7 +20,7 @@ import { IStorageService } from '../../../../../platform/storage/common/storage.
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js';
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
-import { ChatAgentLocation, ChatAgentService, IChatAgent, IChatAgentImplementation, IChatAgentService } from '../../common/chatAgents.js';
+import { ChatAgentService, IChatAgent, IChatAgentImplementation, IChatAgentService } from '../../common/chatAgents.js';
 import { IChatModel, ISerializableChatData } from '../../common/chatModel.js';
 import { IChatFollowup, IChatService } from '../../common/chatService.js';
 import { ChatService } from '../../common/chatServiceImpl.js';
@@ -34,6 +34,7 @@ import { IExtensionService, nullExtensionDescription } from '../../../../service
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { TestContextService, TestExtensionService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 
 const chatAgentWithUsedContextId = 'ChatProviderWithUsedContext';
 const chatAgentWithUsedContext: IChatAgent = {
diff --git a/src/vs/workbench/contrib/chat/test/common/mockChatService.ts b/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
index 4797a66c721c..df0c99daaf4c 100644
--- a/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
+++ b/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
@@ -90,4 +90,9 @@ export class MockChatService implements IChatService {
 	setChatSessionTitle(sessionId: string, title: string): void {
 		throw new Error('Method not implemented.');
 	}
+
+	unifiedViewEnabled = false;
+	isEditingLocation(location: ChatAgentLocation): boolean {
+		throw new Error('Method not implemented.');
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/test/common/mockChatVariables.ts b/src/vs/workbench/contrib/chat/test/common/mockChatVariables.ts
index 9a59dc5e5ed9..267af76a9f11 100644
--- a/src/vs/workbench/contrib/chat/test/common/mockChatVariables.ts
+++ b/src/vs/workbench/contrib/chat/test/common/mockChatVariables.ts
@@ -3,10 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ChatAgentLocation } from '../../common/chatAgents.js';
 import { IChatRequestVariableData, IChatRequestVariableEntry } from '../../common/chatModel.js';
 import { IParsedChatRequest } from '../../common/chatParserTypes.js';
 import { IChatVariablesService, IDynamicVariable } from '../../common/chatVariables.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 
 export class MockChatVariablesService implements IChatVariablesService {
 	_serviceBrand: undefined;
diff --git a/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.ts b/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.ts
index 540a6deec5f7..e8aedfe3cc5e 100644
--- a/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.ts
+++ b/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.ts
@@ -33,9 +33,10 @@ import { LOG_MODE_ID, OUTPUT_MODE_ID } from '../../../../services/output/common/
 import { SEARCH_RESULT_LANGUAGE_ID } from '../../../../services/search/common/search.js';
 import { getDefaultHoverDelegate } from '../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
-import { ChatAgentLocation, IChatAgent, IChatAgentService } from '../../../chat/common/chatAgents.js';
+import { IChatAgent, IChatAgentService } from '../../../chat/common/chatAgents.js';
 import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
 import { StandardMouseEvent } from '../../../../../base/browser/mouseEvent.js';
+import { ChatAgentLocation } from '../../../chat/common/constants.js';
 
 const $ = dom.$;
 
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
index b42f3ded5761..e9181c51ce08 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
@@ -41,9 +41,6 @@ import { IEditorService, SIDE_GROUP } from '../../../services/editor/common/edit
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { showChatView } from '../../chat/browser/chat.js';
 import { IChatWidgetLocationOptions } from '../../chat/browser/chatWidget.js';
-import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
-import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
-import { IChatEditingService, WorkingSetEntryState } from '../../chat/common/chatEditingService.js';
 import { ChatModel, ChatRequestRemovalReason, IChatRequestModel, IChatTextEditGroup, IChatTextEditGroupState, IResponse } from '../../chat/common/chatModel.js';
 import { IChatService } from '../../chat/common/chatService.js';
 import { INotebookEditorService } from '../../notebook/browser/services/notebookEditorService.js';
@@ -54,6 +51,9 @@ import { InlineChatError } from './inlineChatSessionServiceImpl.js';
 import { HunkAction, IEditObserver, LiveStrategy, ProgressingEditsOptions } from './inlineChatStrategies.js';
 import { EditorBasedInlineChatWidget } from './inlineChatWidget.js';
 import { InlineChatZoneWidget } from './inlineChatZoneWidget.js';
+import { ChatAgentLocation } from '../../chat/common/constants.js';
+import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
+import { IChatEditingService, WorkingSetEntryState } from '../../chat/common/chatEditingService.js';
 
 export const enum State {
 	CREATE_SESSION = 'CREATE_SESSION',
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts
index f2d8cc86365b..5e2024222e7f 100644
--- a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts
@@ -49,7 +49,7 @@ import { IChatVariablesService } from '../../../chat/common/chatVariables.js';
 import { IChatWidgetHistoryService, ChatWidgetHistoryService } from '../../../chat/common/chatWidgetHistoryService.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { TestExtensionService, TestContextService } from '../../../../test/common/workbenchTestServices.js';
-import { IChatAgentService, ChatAgentService, ChatAgentLocation } from '../../../chat/common/chatAgents.js';
+import { IChatAgentService, ChatAgentService } from '../../../chat/common/chatAgents.js';
 import { ChatVariablesService } from '../../../chat/browser/chatVariables.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { TestCommandService } from '../../../../../editor/test/browser/editorTestServices.js';
@@ -62,6 +62,7 @@ import { IChatRequestModel } from '../../../chat/common/chatModel.js';
 import { assertSnapshot } from '../../../../../base/test/common/snapshot.js';
 import { IObservable, constObservable } from '../../../../../base/common/observable.js';
 import { IChatEditingService, IChatEditingSession } from '../../../chat/common/chatEditingService.js';
+import { ChatAgentLocation } from '../../../chat/common/constants.js';
 
 suite('InlineChatSession', function () {
 
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 1ab507351fcf..75b65f82c90a 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -26,8 +26,8 @@ import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../.
 import { spinningLoading } from '../../../../platform/theme/common/iconRegistry.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { CHAT_CATEGORY } from '../../chat/browser/actions/chatActions.js';
-import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
 import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
+import { ChatMode } from '../../chat/common/constants.js';
 import { McpContextKeys } from '../common/mcpContextKeys.js';
 import { IMcpServer, IMcpService, IMcpTool, McpConnectionState, McpServerToolsState } from '../common/mcpTypes.js';
 import './media/mcp.css';
@@ -185,18 +185,18 @@ export class AttachMCPToolsAction extends Action2 {
 			category: CHAT_CATEGORY,
 			precondition: ContextKeyExpr.and(
 				McpContextKeys.toolsCount.greater(0),
-				ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)
+				ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat)
 			),
 			menu: {
 				when: ContextKeyExpr.and(
 					McpContextKeys.toolsCount.greater(0),
-					ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)
+					ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat)
 				),
 				id: MenuId.ChatInputAttachmentToolbar,
 				group: 'navigation'
 			},
 			keybinding: {
-				when: ContextKeyExpr.and(ChatContextKeys.inChatInput, ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)),
+				when: ContextKeyExpr.and(ChatContextKeys.inChatInput, ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat)),
 				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Slash,
 				weight: KeybindingWeight.EditorContrib
 			}
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 91607d1621da..c2f474c10399 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
@@ -23,7 +23,8 @@ import { IChatWidget, IChatWidgetService } from '../../../../chat/browser/chat.j
 import { ChatInputPart } from '../../../../chat/browser/chatInputPart.js';
 import { ChatDynamicVariableModel } from '../../../../chat/browser/contrib/chatDynamicVariables.js';
 import { computeCompletionRanges } from '../../../../chat/browser/contrib/chatInputCompletions.js';
-import { ChatAgentLocation, IChatAgentService } from '../../../../chat/common/chatAgents.js';
+import { IChatAgentService } from '../../../../chat/common/chatAgents.js';
+import { ChatAgentLocation } from '../../../../chat/common/constants.js';
 import { ChatContextKeys } from '../../../../chat/common/chatContextKeys.js';
 import { IChatRequestPasteVariableEntry } from '../../../../chat/common/chatModel.js';
 import { chatVariableLeader } from '../../../../chat/common/chatParserTypes.js';
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.ts b/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.ts
index fd3cd47d6781..2296896d9d91 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.ts
@@ -29,7 +29,7 @@ import { localize } from '../../../../../../nls.js';
 import { IContextKey, IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
-import { ChatAgentLocation } from '../../../../chat/common/chatAgents.js';
+import { ChatAgentLocation } from '../../../../chat/common/constants.js';
 import { ChatModel, IChatModel } from '../../../../chat/common/chatModel.js';
 import { IChatService } from '../../../../chat/common/chatService.js';
 import { countWords } from '../../../../chat/common/chatWordCounter.js';
diff --git a/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts b/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts
index 3ab1684b9acc..3ae6694f9646 100644
--- a/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts
+++ b/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts
@@ -32,7 +32,8 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet
 import { IWorkbenchQuickAccessConfiguration } from '../../../browser/quickaccess.js';
 import { CHAT_OPEN_ACTION_ID } from '../../chat/browser/actions/chatActions.js';
 import { ASK_QUICK_QUESTION_ACTION_ID } from '../../chat/browser/actions/chatQuickInputActions.js';
-import { ChatAgentLocation, IChatAgentService } from '../../chat/common/chatAgents.js';
+import { IChatAgentService } from '../../chat/common/chatAgents.js';
+import { ChatAgentLocation } from '../../chat/common/constants.js';
 import { CommandInformationResult, IAiRelatedInformationService, RelatedInformationType } from '../../../services/aiRelatedInformation/common/aiRelatedInformation.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
diff --git a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
index aee4e52e6c37..f4f05b1f8fdc 100644
--- a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
+++ b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
@@ -22,6 +22,7 @@ import { IWorkbenchEnvironmentService } from '../../../services/environment/comm
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IUserDataSyncEnablementService, IUserDataSyncService, SyncStatus } from '../../../../platform/userDataSync/common/userDataSync.js';
 import { IUserDataSyncWorkbenchService } from '../../../services/userDataSync/common/userDataSync.js';
+import { ChatConfiguration } from '../../chat/common/constants.js';
 
 interface IConfiguration extends IWindowsConfiguration {
 	update?: { mode?: string };
@@ -33,6 +34,7 @@ interface IConfiguration extends IWindowsConfiguration {
 	telemetry?: { disableFeedback?: boolean };
 	_extensionsGallery?: { enablePPE?: boolean };
 	accessibility?: { verbosity?: { debug?: boolean } };
+	chat?: { experimental?: { unifiedChatView?: boolean } };
 }
 
 export class SettingsChangeRelauncher extends Disposable implements IWorkbenchContribution {
@@ -50,6 +52,7 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 		'_extensionsGallery.enablePPE',
 		'security.restrictUNCAccess',
 		'accessibility.verbosity.debug',
+		ChatConfiguration.UnifiedChatView,
 		'telemetry.disableFeedback'
 	];
 
@@ -65,6 +68,7 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 	private readonly enablePPEExtensionsGallery = new ChangeObserver('boolean');
 	private readonly restrictUNCAccess = new ChangeObserver('boolean');
 	private readonly accessibilityVerbosityDebug = new ChangeObserver('boolean');
+	private readonly unifiedChatView = new ChangeObserver('boolean');
 	private readonly telemetryDisableFeedback = new ChangeObserver('boolean');
 
 	constructor(
@@ -144,6 +148,9 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
 
 			// Debug accessibility verbosity
 			processChanged(this.accessibilityVerbosityDebug.handleChange(config?.accessibility?.verbosity?.debug));
+
+			// Unified chat view
+			processChanged(this.unifiedChatView.handleChange(config.chat?.experimental?.unifiedChatView));
 		}
 
 		// Experiments
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
index b2be6193f47c..25cbfeec6892 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
@@ -12,7 +12,6 @@ import './media/terminalChatWidget.css';
 import { localize } from '../../../../../nls.js';
 import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { ChatAgentLocation } from '../../../chat/common/chatAgents.js';
 import { InlineChatWidget } from '../../../inlineChat/browser/inlineChatWidget.js';
 import { ITerminalInstance, type IXtermTerminal } from '../../../terminal/browser/terminal.js';
 import { MENU_TERMINAL_CHAT_WIDGET_INPUT_SIDE_TOOLBAR, MENU_TERMINAL_CHAT_WIDGET_STATUS, TerminalChatCommandId, TerminalChatContextKeys } from './terminalChat.js';
@@ -28,6 +27,7 @@ import { CancellationTokenSource } from '../../../../../base/common/cancellation
 import { MenuId } from '../../../../../platform/actions/common/actions.js';
 import type { IChatViewState } from '../../../chat/browser/chatWidget.js';
 import { autorun, observableValue, type IObservable } from '../../../../../base/common/observable.js';
+import { ChatAgentLocation } from '../../../chat/common/constants.js';
 
 const enum Constants {
 	HorizontalMargin = 10,

From 747b90cfcd486731a1295563423b1ee66dd9b613 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 12 Mar 2025 19:12:14 -0700
Subject: [PATCH 0887/1815] mcp: fix setting typo (#243411)

---
 src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
index 5b14992c34cb..c81b1abe9a5b 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
@@ -17,7 +17,7 @@ const mcpSchemaExampleServer = {
 };
 
 export const mcpConfigurationSection = 'mcp';
-export const mcpDiscoverySection = 'chat.mpc.discovery.enabled';
+export const mcpDiscoverySection = 'chat.mcp.discovery.enabled';
 
 export const mcpSchemaExampleServers = {
 	'mcp-server-time': {

From 98a1e7ebef7beb80c06b63f06d2850fb1b7cecd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joaomoreno@users.noreply.github.com>
Date: Thu, 13 Mar 2025 09:07:42 +0100
Subject: [PATCH 0888/1815] DO NOT MERGE repro tree sitter bug

---
 build/lib/policies.js | 18 +++++++++---------
 build/lib/policies.ts | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/build/lib/policies.js b/build/lib/policies.js
index b76d9ffe00ae..5665d0b10a4f 100644
--- a/build/lib/policies.js
+++ b/build/lib/policies.js
@@ -290,17 +290,17 @@ const PolicyTypes = [
 function getPolicy(moduleName, configurationNode, settingNode, policyNode, categories) {
     const name = getStringProperty(policyNode, 'name');
     if (!name) {
-        throw new Error(`Missing required 'name' property.`);
+        throw new Error(`Missing required 'name' property. ${moduleName}.ts:${policyNode.startPosition.row + 1}`);
     }
     else if (isNlsString(name)) {
-        throw new Error(`Property 'name' should be a literal string.`);
+        throw new Error(`Property 'name' should be a literal string. ${moduleName}.ts:${policyNode.startPosition.row + 1}`);
     }
     const categoryName = getStringProperty(configurationNode, 'title');
     if (!categoryName) {
-        throw new Error(`Missing required 'title' property.`);
+        throw new Error(`Missing required 'title' property. ${moduleName}.ts:${configurationNode.startPosition.row + 1}`);
     }
     else if (!isNlsString(categoryName)) {
-        throw new Error(`Property 'title' should be localized.`);
+        throw new Error(`Property 'title' should be localized. ${moduleName}.ts:${configurationNode.startPosition.row + 1}`);
     }
     const categoryKey = `${categoryName.nlsKey}:${categoryName.value}`;
     let category = categories.get(categoryKey);
@@ -310,17 +310,17 @@ function getPolicy(moduleName, configurationNode, settingNode, policyNode, categ
     }
     const minimumVersion = getStringProperty(policyNode, 'minimumVersion');
     if (!minimumVersion) {
-        throw new Error(`Missing required 'minimumVersion' property.`);
+        throw new Error(`Missing required 'minimumVersion' property. ${moduleName}.ts:${policyNode.startPosition.row + 1}`);
     }
     else if (isNlsString(minimumVersion)) {
-        throw new Error(`Property 'minimumVersion' should be a literal string.`);
+        throw new Error(`Property 'minimumVersion' should be a literal string. ${moduleName}.ts:${policyNode.startPosition.row + 1}`);
     }
     const description = getStringProperty(settingNode, 'description');
     if (!description) {
-        throw new Error(`Missing required 'description' property.`);
+        throw new Error(`Missing required 'description' property. ${moduleName}.ts:${settingNode.startPosition.row + 1}`);
     }
     if (!isNlsString(description)) {
-        throw new Error(`Property 'description' should be localized.`);
+        throw new Error(`Property 'description' should be localized. ${moduleName}.ts:${settingNode.startPosition.row + 1}`);
     }
     let result;
     for (const policyType of PolicyTypes) {
@@ -329,7 +329,7 @@ function getPolicy(moduleName, configurationNode, settingNode, policyNode, categ
         }
     }
     if (!result) {
-        throw new Error(`Failed to parse policy '${name}'.`);
+        throw new Error(`Failed to parse policy '${name}'. ${moduleName}.ts:${settingNode.startPosition.row + 1}`);
     }
     return result;
 }
diff --git a/build/lib/policies.ts b/build/lib/policies.ts
index 2488920ce268..0fdb892c7ab8 100644
--- a/build/lib/policies.ts
+++ b/build/lib/policies.ts
@@ -453,17 +453,17 @@ function getPolicy(
 	const name = getStringProperty(policyNode, 'name');
 
 	if (!name) {
-		throw new Error(`Missing required 'name' property.`);
+		throw new Error(`Missing required 'name' property. ${moduleName}.ts:${policyNode.startPosition.row + 1}`);
 	} else if (isNlsString(name)) {
-		throw new Error(`Property 'name' should be a literal string.`);
+		throw new Error(`Property 'name' should be a literal string. ${moduleName}.ts:${policyNode.startPosition.row + 1}`);
 	}
 
 	const categoryName = getStringProperty(configurationNode, 'title');
 
 	if (!categoryName) {
-		throw new Error(`Missing required 'title' property.`);
+		throw new Error(`Missing required 'title' property. ${moduleName}.ts:${configurationNode.startPosition.row + 1}`);
 	} else if (!isNlsString(categoryName)) {
-		throw new Error(`Property 'title' should be localized.`);
+		throw new Error(`Property 'title' should be localized. ${moduleName}.ts:${configurationNode.startPosition.row + 1}`);
 	}
 
 	const categoryKey = `${categoryName.nlsKey}:${categoryName.value}`;
@@ -477,17 +477,17 @@ function getPolicy(
 	const minimumVersion = getStringProperty(policyNode, 'minimumVersion');
 
 	if (!minimumVersion) {
-		throw new Error(`Missing required 'minimumVersion' property.`);
+		throw new Error(`Missing required 'minimumVersion' property. ${moduleName}.ts:${policyNode.startPosition.row + 1}`);
 	} else if (isNlsString(minimumVersion)) {
-		throw new Error(`Property 'minimumVersion' should be a literal string.`);
+		throw new Error(`Property 'minimumVersion' should be a literal string. ${moduleName}.ts:${policyNode.startPosition.row + 1}`);
 	}
 
 	const description = getStringProperty(settingNode, 'description');
 
 	if (!description) {
-		throw new Error(`Missing required 'description' property.`);
+		throw new Error(`Missing required 'description' property. ${moduleName}.ts:${settingNode.startPosition.row + 1}`);
 	} if (!isNlsString(description)) {
-		throw new Error(`Property 'description' should be localized.`);
+		throw new Error(`Property 'description' should be localized. ${moduleName}.ts:${settingNode.startPosition.row + 1}`);
 	}
 
 	let result: Policy | undefined;
@@ -499,7 +499,7 @@ function getPolicy(
 	}
 
 	if (!result) {
-		throw new Error(`Failed to parse policy '${name}'.`);
+		throw new Error(`Failed to parse policy '${name}'. ${moduleName}.ts:${settingNode.startPosition.row + 1}`);
 	}
 
 	return result;

From a4027ce133806c7bffc4a85f8b89a24be8c025b6 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 13 Mar 2025 02:18:10 -0700
Subject: [PATCH 0889/1815] Enable terminal suggest in vscode settings

For natural team self hosting feedback
---
 .vscode/settings.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1116a4903f5c..594b10067b74 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -157,6 +157,7 @@
 	"application.experimental.rendererProfiling": true,
 	"editor.experimental.asyncTokenization": true,
 	"editor.experimental.asyncTokenizationVerification": true,
+	"terminal.integrated.suggest.enabled": true,
 	"typescript.preferences.autoImportFileExcludePatterns": [
 		"@xterm/xterm",
 		"@xterm/headless",

From b59ae26ad3882edfec6493e280784f5395978dbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joaomoreno@users.noreply.github.com>
Date: Thu, 13 Mar 2025 10:24:52 +0100
Subject: [PATCH 0890/1815] fix policy generation (#243429)

cc @justschen
---
 build/lib/policies.js                         | 119 ++++++-----
 build/lib/policies.ts                         | 123 ++++++-----
 build/package-lock.json                       | 198 +++++++++++++-----
 build/package.json                            |   4 +-
 .../common/configurationRegistry.ts           |   7 +-
 .../telemetry/common/telemetryService.ts      |  28 +--
 6 files changed, 306 insertions(+), 173 deletions(-)

diff --git a/build/lib/policies.js b/build/lib/policies.js
index b76d9ffe00ae..847ef5c8e471 100644
--- a/build/lib/policies.js
+++ b/build/lib/policies.js
@@ -27,7 +27,11 @@ function isNlsStringArray(value) {
 }
 var PolicyType;
 (function (PolicyType) {
-    PolicyType[PolicyType["StringEnum"] = 0] = "StringEnum";
+    PolicyType["Boolean"] = "boolean";
+    PolicyType["Number"] = "number";
+    PolicyType["Object"] = "object";
+    PolicyType["String"] = "string";
+    PolicyType["StringEnum"] = "stringEnum";
 })(PolicyType || (PolicyType = {}));
 function renderADMLString(prefix, moduleName, nlsString, translations) {
     let value;
@@ -43,14 +47,14 @@ function renderADMLString(prefix, moduleName, nlsString, translations) {
     return `<string id="${prefix}_${nlsString.nlsKey.replace(/\./g, '_')}">${value}</string>`;
 }
 class BasePolicy {
-    policyType;
+    type;
     name;
     category;
     minimumVersion;
     description;
     moduleName;
-    constructor(policyType, name, category, minimumVersion, description, moduleName) {
-        this.policyType = policyType;
+    constructor(type, name, category, minimumVersion, description, moduleName) {
+        this.type = type;
         this.name = name;
         this.category = category;
         this.minimumVersion = minimumVersion;
@@ -83,14 +87,14 @@ class BasePolicy {
 }
 class BooleanPolicy extends BasePolicy {
     static from(name, category, minimumVersion, description, moduleName, settingNode) {
-        const type = getStringProperty(settingNode, 'type');
+        const type = getStringProperty(moduleName, settingNode, 'type');
         if (type !== 'boolean') {
             return undefined;
         }
         return new BooleanPolicy(name, category, minimumVersion, description, moduleName);
     }
     constructor(name, category, minimumVersion, description, moduleName) {
-        super(PolicyType.StringEnum, name, category, minimumVersion, description, moduleName);
+        super(PolicyType.Boolean, name, category, minimumVersion, description, moduleName);
     }
     renderADMXElements() {
         return [
@@ -103,18 +107,23 @@ class BooleanPolicy extends BasePolicy {
         return `<checkBox refId="${this.name}">${this.name}</checkBox>`;
     }
 }
-class IntPolicy extends BasePolicy {
+class ParseError extends Error {
+    constructor(message, moduleName, node) {
+        super(`${message}. ${moduleName}.ts:${node.startPosition.row + 1}`);
+    }
+}
+class NumberPolicy extends BasePolicy {
     defaultValue;
     static from(name, category, minimumVersion, description, moduleName, settingNode) {
-        const type = getStringProperty(settingNode, 'type');
+        const type = getStringProperty(moduleName, settingNode, 'type');
         if (type !== 'number') {
             return undefined;
         }
-        const defaultValue = getIntProperty(settingNode, 'default');
+        const defaultValue = getNumberProperty(moduleName, settingNode, 'default');
         if (typeof defaultValue === 'undefined') {
-            throw new Error(`Missing required 'default' property.`);
+            throw new ParseError(`Missing required 'default' property.`, moduleName, settingNode);
         }
-        return new IntPolicy(name, category, minimumVersion, description, moduleName, defaultValue);
+        return new NumberPolicy(name, category, minimumVersion, description, moduleName, defaultValue);
     }
     constructor(name, category, minimumVersion, description, moduleName, defaultValue) {
         super(PolicyType.StringEnum, name, category, minimumVersion, description, moduleName);
@@ -132,14 +141,14 @@ class IntPolicy extends BasePolicy {
 }
 class StringPolicy extends BasePolicy {
     static from(name, category, minimumVersion, description, moduleName, settingNode) {
-        const type = getStringProperty(settingNode, 'type');
+        const type = getStringProperty(moduleName, settingNode, 'type');
         if (type !== 'string') {
             return undefined;
         }
         return new StringPolicy(name, category, minimumVersion, description, moduleName);
     }
     constructor(name, category, minimumVersion, description, moduleName) {
-        super(PolicyType.StringEnum, name, category, minimumVersion, description, moduleName);
+        super(PolicyType.String, name, category, minimumVersion, description, moduleName);
     }
     renderADMXElements() {
         return [`<text id="${this.name}" valueName="${this.name}" required="true" />`];
@@ -150,14 +159,14 @@ class StringPolicy extends BasePolicy {
 }
 class ObjectPolicy extends BasePolicy {
     static from(name, category, minimumVersion, description, moduleName, settingNode) {
-        const type = getStringProperty(settingNode, 'type');
+        const type = getStringProperty(moduleName, settingNode, 'type');
         if (type !== 'object' && type !== 'array') {
             return undefined;
         }
         return new ObjectPolicy(name, category, minimumVersion, description, moduleName);
     }
     constructor(name, category, minimumVersion, description, moduleName) {
-        super(PolicyType.StringEnum, name, category, minimumVersion, description, moduleName);
+        super(PolicyType.Object, name, category, minimumVersion, description, moduleName);
     }
     renderADMXElements() {
         return [`<multiText id="${this.name}" valueName="${this.name}" required="true" />`];
@@ -170,23 +179,23 @@ class StringEnumPolicy extends BasePolicy {
     enum_;
     enumDescriptions;
     static from(name, category, minimumVersion, description, moduleName, settingNode) {
-        const type = getStringProperty(settingNode, 'type');
+        const type = getStringProperty(moduleName, settingNode, 'type');
         if (type !== 'string') {
             return undefined;
         }
-        const enum_ = getStringArrayProperty(settingNode, 'enum');
+        const enum_ = getStringArrayProperty(moduleName, settingNode, 'enum');
         if (!enum_) {
             return undefined;
         }
         if (!isStringArray(enum_)) {
-            throw new Error(`Property 'enum' should not be localized.`);
+            throw new ParseError(`Property 'enum' should not be localized.`, moduleName, settingNode);
         }
-        const enumDescriptions = getStringArrayProperty(settingNode, 'enumDescriptions');
+        const enumDescriptions = getStringArrayProperty(moduleName, settingNode, 'enumDescriptions');
         if (!enumDescriptions) {
-            throw new Error(`Missing required 'enumDescriptions' property.`);
+            throw new ParseError(`Missing required 'enumDescriptions' property.`, moduleName, settingNode);
         }
         else if (!isNlsStringArray(enumDescriptions)) {
-            throw new Error(`Property 'enumDescriptions' should be localized.`);
+            throw new ParseError(`Property 'enumDescriptions' should be localized.`, moduleName, settingNode);
         }
         return new StringEnumPolicy(name, category, minimumVersion, description, moduleName, enum_, enumDescriptions);
     }
@@ -212,7 +221,7 @@ class StringEnumPolicy extends BasePolicy {
         return `<dropdownList refId="${this.name}" />`;
     }
 }
-const IntQ = {
+const NumberQ = {
     Q: `(number) @value`,
     value(matches) {
         const match = matches[0];
@@ -260,47 +269,52 @@ const StringArrayQ = {
         });
     }
 };
-function getProperty(qtype, node, key) {
+function getProperty(qtype, moduleName, node, key) {
     const query = new tree_sitter_1.default.Query(typescript, `(
 			(pair
 				key: [(property_identifier)(string)] @key
 				value: ${qtype.Q}
 			)
-			(#eq? @key ${key})
+			(#any-of? @key "${key}" "'${key}'")
 		)`);
-    return qtype.value(query.matches(node));
+    try {
+        return qtype.value(query.matches(node));
+    }
+    catch (e) {
+        throw new ParseError(e.message, moduleName, node);
+    }
 }
-function getIntProperty(node, key) {
-    return getProperty(IntQ, node, key);
+function getNumberProperty(moduleName, node, key) {
+    return getProperty(NumberQ, moduleName, node, key);
 }
-function getStringProperty(node, key) {
-    return getProperty(StringQ, node, key);
+function getStringProperty(moduleName, node, key) {
+    return getProperty(StringQ, moduleName, node, key);
 }
-function getStringArrayProperty(node, key) {
-    return getProperty(StringArrayQ, node, key);
+function getStringArrayProperty(moduleName, node, key) {
+    return getProperty(StringArrayQ, moduleName, node, key);
 }
 // TODO: add more policy types
 const PolicyTypes = [
     BooleanPolicy,
-    IntPolicy,
+    NumberPolicy,
     StringEnumPolicy,
     StringPolicy,
     ObjectPolicy
 ];
 function getPolicy(moduleName, configurationNode, settingNode, policyNode, categories) {
-    const name = getStringProperty(policyNode, 'name');
+    const name = getStringProperty(moduleName, policyNode, 'name');
     if (!name) {
-        throw new Error(`Missing required 'name' property.`);
+        throw new ParseError(`Missing required 'name' property`, moduleName, policyNode);
     }
     else if (isNlsString(name)) {
-        throw new Error(`Property 'name' should be a literal string.`);
+        throw new ParseError(`Property 'name' should be a literal string`, moduleName, policyNode);
     }
-    const categoryName = getStringProperty(configurationNode, 'title');
+    const categoryName = getStringProperty(moduleName, configurationNode, 'title');
     if (!categoryName) {
-        throw new Error(`Missing required 'title' property.`);
+        throw new ParseError(`Missing required 'title' property`, moduleName, configurationNode);
     }
     else if (!isNlsString(categoryName)) {
-        throw new Error(`Property 'title' should be localized.`);
+        throw new ParseError(`Property 'title' should be localized`, moduleName, configurationNode);
     }
     const categoryKey = `${categoryName.nlsKey}:${categoryName.value}`;
     let category = categories.get(categoryKey);
@@ -308,19 +322,19 @@ function getPolicy(moduleName, configurationNode, settingNode, policyNode, categ
         category = { moduleName, name: categoryName };
         categories.set(categoryKey, category);
     }
-    const minimumVersion = getStringProperty(policyNode, 'minimumVersion');
+    const minimumVersion = getStringProperty(moduleName, policyNode, 'minimumVersion');
     if (!minimumVersion) {
-        throw new Error(`Missing required 'minimumVersion' property.`);
+        throw new ParseError(`Missing required 'minimumVersion' property.`, moduleName, policyNode);
     }
     else if (isNlsString(minimumVersion)) {
-        throw new Error(`Property 'minimumVersion' should be a literal string.`);
+        throw new ParseError(`Property 'minimumVersion' should be a literal string.`, moduleName, policyNode);
     }
-    const description = getStringProperty(settingNode, 'description');
+    const description = getStringProperty(moduleName, policyNode, 'description') ?? getStringProperty(moduleName, settingNode, 'description');
     if (!description) {
-        throw new Error(`Missing required 'description' property.`);
+        throw new ParseError(`Missing required 'description' property.`, moduleName, settingNode);
     }
     if (!isNlsString(description)) {
-        throw new Error(`Property 'description' should be localized.`);
+        throw new ParseError(`Property 'description' should be localized.`, moduleName, settingNode);
     }
     let result;
     for (const policyType of PolicyTypes) {
@@ -329,7 +343,7 @@ function getPolicy(moduleName, configurationNode, settingNode, policyNode, categ
         }
     }
     if (!result) {
-        throw new Error(`Failed to parse policy '${name}'.`);
+        throw new ParseError(`Failed to parse policy '${name}'.`, moduleName, settingNode);
     }
     return result;
 }
@@ -339,11 +353,11 @@ function getPolicies(moduleName, node) {
 			(call_expression
 				function: (member_expression property: (property_identifier) @registerConfigurationFn) (#eq? @registerConfigurationFn registerConfiguration)
 				arguments: (arguments	(object	(pair
-					key: [(property_identifier)(string)] @propertiesKey (#eq? @propertiesKey properties)
+					key: [(property_identifier)(string)] @propertiesKey (#any-of? @propertiesKey "properties" "'properties'")
 					value: (object (pair
 						key: [(property_identifier)(string)(computed_property_name)]
 						value: (object (pair
-							key: [(property_identifier)(string)] @policyKey (#eq? @policyKey policy)
+							key: [(property_identifier)(string)] @policyKey (#any-of? @policyKey "policy" "'policy'")
 							value: (object) @policy
 						)) @setting
 					))
@@ -528,6 +542,10 @@ async function getTranslations() {
 }
 async function main() {
     const [policies, translations] = await Promise.all([parsePolicies(), getTranslations()]);
+    console.log(`Found ${policies.length} policies:`);
+    for (const policy of policies) {
+        console.log(`- ${policy.name} (${policy.type})`);
+    }
     const { admx, adml } = await renderGP(policies, translations);
     const root = '.build/policies/win32';
     await fs_1.promises.rm(root, { recursive: true, force: true });
@@ -541,7 +559,12 @@ async function main() {
 }
 if (require.main === module) {
     main().catch(err => {
-        console.error(err);
+        if (err instanceof ParseError) {
+            console.error(`Parse Error:`, err.message);
+        }
+        else {
+            console.error(err);
+        }
         process.exit(1);
     });
 }
diff --git a/build/lib/policies.ts b/build/lib/policies.ts
index 2488920ce268..e5d068870713 100644
--- a/build/lib/policies.ts
+++ b/build/lib/policies.ts
@@ -33,10 +33,16 @@ interface Category {
 }
 
 enum PolicyType {
-	StringEnum
+	Boolean = 'boolean',
+	Number = 'number',
+	Object = 'object',
+	String = 'string',
+	StringEnum = 'stringEnum',
 }
 
 interface Policy {
+	readonly name: string;
+	readonly type: PolicyType;
 	readonly category: Category;
 	readonly minimumVersion: string;
 	renderADMX(regKey: string): string[];
@@ -64,8 +70,8 @@ function renderADMLString(prefix: string, moduleName: string, nlsString: NlsStri
 
 abstract class BasePolicy implements Policy {
 	constructor(
-		protected policyType: PolicyType,
-		protected name: string,
+		readonly type: PolicyType,
+		readonly name: string,
 		readonly category: Category,
 		readonly minimumVersion: string,
 		protected description: NlsString,
@@ -114,7 +120,7 @@ class BooleanPolicy extends BasePolicy {
 		moduleName: string,
 		settingNode: Parser.SyntaxNode
 	): BooleanPolicy | undefined {
-		const type = getStringProperty(settingNode, 'type');
+		const type = getStringProperty(moduleName, settingNode, 'type');
 
 		if (type !== 'boolean') {
 			return undefined;
@@ -130,7 +136,7 @@ class BooleanPolicy extends BasePolicy {
 		description: NlsString,
 		moduleName: string,
 	) {
-		super(PolicyType.StringEnum, name, category, minimumVersion, description, moduleName);
+		super(PolicyType.Boolean, name, category, minimumVersion, description, moduleName);
 	}
 
 	protected renderADMXElements(): string[] {
@@ -146,7 +152,13 @@ class BooleanPolicy extends BasePolicy {
 	}
 }
 
-class IntPolicy extends BasePolicy {
+class ParseError extends Error {
+	constructor(message: string, moduleName: string, node: Parser.SyntaxNode) {
+		super(`${message}. ${moduleName}.ts:${node.startPosition.row + 1}`);
+	}
+}
+
+class NumberPolicy extends BasePolicy {
 
 	static from(
 		name: string,
@@ -155,20 +167,20 @@ class IntPolicy extends BasePolicy {
 		description: NlsString,
 		moduleName: string,
 		settingNode: Parser.SyntaxNode
-	): IntPolicy | undefined {
-		const type = getStringProperty(settingNode, 'type');
+	): NumberPolicy | undefined {
+		const type = getStringProperty(moduleName, settingNode, 'type');
 
 		if (type !== 'number') {
 			return undefined;
 		}
 
-		const defaultValue = getIntProperty(settingNode, 'default');
+		const defaultValue = getNumberProperty(moduleName, settingNode, 'default');
 
 		if (typeof defaultValue === 'undefined') {
-			throw new Error(`Missing required 'default' property.`);
+			throw new ParseError(`Missing required 'default' property.`, moduleName, settingNode);
 		}
 
-		return new IntPolicy(name, category, minimumVersion, description, moduleName, defaultValue);
+		return new NumberPolicy(name, category, minimumVersion, description, moduleName, defaultValue);
 	}
 
 	private constructor(
@@ -204,7 +216,7 @@ class StringPolicy extends BasePolicy {
 		moduleName: string,
 		settingNode: Parser.SyntaxNode
 	): StringPolicy | undefined {
-		const type = getStringProperty(settingNode, 'type');
+		const type = getStringProperty(moduleName, settingNode, 'type');
 
 		if (type !== 'string') {
 			return undefined;
@@ -220,7 +232,7 @@ class StringPolicy extends BasePolicy {
 		description: NlsString,
 		moduleName: string,
 	) {
-		super(PolicyType.StringEnum, name, category, minimumVersion, description, moduleName);
+		super(PolicyType.String, name, category, minimumVersion, description, moduleName);
 	}
 
 	protected renderADMXElements(): string[] {
@@ -242,7 +254,7 @@ class ObjectPolicy extends BasePolicy {
 		moduleName: string,
 		settingNode: Parser.SyntaxNode
 	): ObjectPolicy | undefined {
-		const type = getStringProperty(settingNode, 'type');
+		const type = getStringProperty(moduleName, settingNode, 'type');
 
 		if (type !== 'object' && type !== 'array') {
 			return undefined;
@@ -258,7 +270,7 @@ class ObjectPolicy extends BasePolicy {
 		description: NlsString,
 		moduleName: string,
 	) {
-		super(PolicyType.StringEnum, name, category, minimumVersion, description, moduleName);
+		super(PolicyType.Object, name, category, minimumVersion, description, moduleName);
 	}
 
 	protected renderADMXElements(): string[] {
@@ -280,28 +292,28 @@ class StringEnumPolicy extends BasePolicy {
 		moduleName: string,
 		settingNode: Parser.SyntaxNode
 	): StringEnumPolicy | undefined {
-		const type = getStringProperty(settingNode, 'type');
+		const type = getStringProperty(moduleName, settingNode, 'type');
 
 		if (type !== 'string') {
 			return undefined;
 		}
 
-		const enum_ = getStringArrayProperty(settingNode, 'enum');
+		const enum_ = getStringArrayProperty(moduleName, settingNode, 'enum');
 
 		if (!enum_) {
 			return undefined;
 		}
 
 		if (!isStringArray(enum_)) {
-			throw new Error(`Property 'enum' should not be localized.`);
+			throw new ParseError(`Property 'enum' should not be localized.`, moduleName, settingNode);
 		}
 
-		const enumDescriptions = getStringArrayProperty(settingNode, 'enumDescriptions');
+		const enumDescriptions = getStringArrayProperty(moduleName, settingNode, 'enumDescriptions');
 
 		if (!enumDescriptions) {
-			throw new Error(`Missing required 'enumDescriptions' property.`);
+			throw new ParseError(`Missing required 'enumDescriptions' property.`, moduleName, settingNode);
 		} else if (!isNlsStringArray(enumDescriptions)) {
-			throw new Error(`Property 'enumDescriptions' should be localized.`);
+			throw new ParseError(`Property 'enumDescriptions' should be localized.`, moduleName, settingNode);
 		}
 
 		return new StringEnumPolicy(name, category, minimumVersion, description, moduleName, enum_, enumDescriptions);
@@ -344,7 +356,7 @@ interface QType<T> {
 	value(matches: Parser.QueryMatch[]): T | undefined;
 }
 
-const IntQ: QType<number> = {
+const NumberQ: QType<number> = {
 	Q: `(number) @value`,
 
 	value(matches: Parser.QueryMatch[]): number | undefined {
@@ -407,7 +419,7 @@ const StringArrayQ: QType<(string | NlsString)[]> = {
 	}
 };
 
-function getProperty<T>(qtype: QType<T>, node: Parser.SyntaxNode, key: string): T | undefined {
+function getProperty<T>(qtype: QType<T>, moduleName: string, node: Parser.SyntaxNode, key: string): T | undefined {
 	const query = new Parser.Query(
 		typescript,
 		`(
@@ -415,29 +427,33 @@ function getProperty<T>(qtype: QType<T>, node: Parser.SyntaxNode, key: string):
 				key: [(property_identifier)(string)] @key
 				value: ${qtype.Q}
 			)
-			(#eq? @key ${key})
+			(#any-of? @key "${key}" "'${key}'")
 		)`
 	);
 
-	return qtype.value(query.matches(node));
+	try {
+		return qtype.value(query.matches(node));
+	} catch (e) {
+		throw new ParseError(e.message, moduleName, node);
+	}
 }
 
-function getIntProperty(node: Parser.SyntaxNode, key: string): number | undefined {
-	return getProperty(IntQ, node, key);
+function getNumberProperty(moduleName: string, node: Parser.SyntaxNode, key: string): number | undefined {
+	return getProperty(NumberQ, moduleName, node, key);
 }
 
-function getStringProperty(node: Parser.SyntaxNode, key: string): string | NlsString | undefined {
-	return getProperty(StringQ, node, key);
+function getStringProperty(moduleName: string, node: Parser.SyntaxNode, key: string): string | NlsString | undefined {
+	return getProperty(StringQ, moduleName, node, key);
 }
 
-function getStringArrayProperty(node: Parser.SyntaxNode, key: string): (string | NlsString)[] | undefined {
-	return getProperty(StringArrayQ, node, key);
+function getStringArrayProperty(moduleName: string, node: Parser.SyntaxNode, key: string): (string | NlsString)[] | undefined {
+	return getProperty(StringArrayQ, moduleName, node, key);
 }
 
 // TODO: add more policy types
 const PolicyTypes = [
 	BooleanPolicy,
-	IntPolicy,
+	NumberPolicy,
 	StringEnumPolicy,
 	StringPolicy,
 	ObjectPolicy
@@ -450,20 +466,20 @@ function getPolicy(
 	policyNode: Parser.SyntaxNode,
 	categories: Map<string, Category>
 ): Policy {
-	const name = getStringProperty(policyNode, 'name');
+	const name = getStringProperty(moduleName, policyNode, 'name');
 
 	if (!name) {
-		throw new Error(`Missing required 'name' property.`);
+		throw new ParseError(`Missing required 'name' property`, moduleName, policyNode);
 	} else if (isNlsString(name)) {
-		throw new Error(`Property 'name' should be a literal string.`);
+		throw new ParseError(`Property 'name' should be a literal string`, moduleName, policyNode);
 	}
 
-	const categoryName = getStringProperty(configurationNode, 'title');
+	const categoryName = getStringProperty(moduleName, configurationNode, 'title');
 
 	if (!categoryName) {
-		throw new Error(`Missing required 'title' property.`);
+		throw new ParseError(`Missing required 'title' property`, moduleName, configurationNode);
 	} else if (!isNlsString(categoryName)) {
-		throw new Error(`Property 'title' should be localized.`);
+		throw new ParseError(`Property 'title' should be localized`, moduleName, configurationNode);
 	}
 
 	const categoryKey = `${categoryName.nlsKey}:${categoryName.value}`;
@@ -474,20 +490,20 @@ function getPolicy(
 		categories.set(categoryKey, category);
 	}
 
-	const minimumVersion = getStringProperty(policyNode, 'minimumVersion');
+	const minimumVersion = getStringProperty(moduleName, policyNode, 'minimumVersion');
 
 	if (!minimumVersion) {
-		throw new Error(`Missing required 'minimumVersion' property.`);
+		throw new ParseError(`Missing required 'minimumVersion' property.`, moduleName, policyNode);
 	} else if (isNlsString(minimumVersion)) {
-		throw new Error(`Property 'minimumVersion' should be a literal string.`);
+		throw new ParseError(`Property 'minimumVersion' should be a literal string.`, moduleName, policyNode);
 	}
 
-	const description = getStringProperty(settingNode, 'description');
+	const description = getStringProperty(moduleName, policyNode, 'description') ?? getStringProperty(moduleName, settingNode, 'description');
 
 	if (!description) {
-		throw new Error(`Missing required 'description' property.`);
+		throw new ParseError(`Missing required 'description' property.`, moduleName, settingNode);
 	} if (!isNlsString(description)) {
-		throw new Error(`Property 'description' should be localized.`);
+		throw new ParseError(`Property 'description' should be localized.`, moduleName, settingNode);
 	}
 
 	let result: Policy | undefined;
@@ -499,7 +515,7 @@ function getPolicy(
 	}
 
 	if (!result) {
-		throw new Error(`Failed to parse policy '${name}'.`);
+		throw new ParseError(`Failed to parse policy '${name}'.`, moduleName, settingNode);
 	}
 
 	return result;
@@ -511,11 +527,11 @@ function getPolicies(moduleName: string, node: Parser.SyntaxNode): Policy[] {
 			(call_expression
 				function: (member_expression property: (property_identifier) @registerConfigurationFn) (#eq? @registerConfigurationFn registerConfiguration)
 				arguments: (arguments	(object	(pair
-					key: [(property_identifier)(string)] @propertiesKey (#eq? @propertiesKey properties)
+					key: [(property_identifier)(string)] @propertiesKey (#any-of? @propertiesKey "properties" "'properties'")
 					value: (object (pair
 						key: [(property_identifier)(string)(computed_property_name)]
 						value: (object (pair
-							key: [(property_identifier)(string)] @policyKey (#eq? @policyKey policy)
+							key: [(property_identifier)(string)] @policyKey (#any-of? @policyKey "policy" "'policy'")
 							value: (object) @policy
 						)) @setting
 					))
@@ -737,6 +753,13 @@ async function getTranslations(): Promise<Translations> {
 
 async function main() {
 	const [policies, translations] = await Promise.all([parsePolicies(), getTranslations()]);
+
+	console.log(`Found ${policies.length} policies:`);
+
+	for (const policy of policies) {
+		console.log(`- ${policy.name} (${policy.type})`);
+	}
+
 	const { admx, adml } = await renderGP(policies, translations);
 
 	const root = '.build/policies/win32';
@@ -754,7 +777,11 @@ async function main() {
 
 if (require.main === module) {
 	main().catch(err => {
-		console.error(err);
+		if (err instanceof ParseError) {
+			console.error(`Parse Error:`, err.message);
+		} else {
+			console.error(err);
+		}
 		process.exit(1);
 	});
 }
diff --git a/build/package-lock.json b/build/package-lock.json
index aa939e40375f..66092130f14d 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -8,6 +8,9 @@
       "name": "code-oss-dev-build",
       "version": "1.0.0",
       "license": "MIT",
+      "dependencies": {
+        "tree-sitter-typescript": "0.23.2"
+      },
       "devDependencies": {
         "@azure/core-auth": "^1.9.0",
         "@azure/cosmos": "^3",
@@ -57,13 +60,13 @@
         "source-map": "0.6.1",
         "ternary-stream": "^3.0.0",
         "through2": "^4.0.2",
-        "tree-sitter": "^0.20.5",
+        "tree-sitter": "^0.22.4",
         "vscode-universal-bundler": "^0.1.3",
         "workerpool": "^6.4.0",
         "yauzl": "^2.10.0"
       },
       "optionalDependencies": {
-        "tree-sitter-typescript": "^0.20.5",
+        "tree-sitter-typescript": "^0.23.2",
         "vscode-gulp-watch": "^5.0.3"
       }
     },
@@ -1551,7 +1554,7 @@
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "devOptional": true,
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -1580,7 +1583,8 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
       "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "devOptional": true,
+      "dev": true,
+      "optional": true,
       "dependencies": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
@@ -1632,7 +1636,7 @@
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
       "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "devOptional": true,
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -1647,6 +1651,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "optional": true,
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
@@ -1821,7 +1826,8 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "devOptional": true
+      "dev": true,
+      "optional": true
     },
     "node_modules/clone": {
       "version": "2.1.2",
@@ -1991,7 +1997,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
       "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "mimic-response": "^3.1.0"
       },
@@ -2006,7 +2012,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
       "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -2018,7 +2024,8 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "devOptional": true,
+      "dev": true,
+      "optional": true,
       "engines": {
         "node": ">=4.0.0"
       }
@@ -2075,7 +2082,8 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
       "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
-      "devOptional": true,
+      "dev": true,
+      "optional": true,
       "engines": {
         "node": ">=8"
       }
@@ -2214,7 +2222,7 @@
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "once": "^1.4.0"
       }
@@ -2331,7 +2339,8 @@
       "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==",
-      "devOptional": true,
+      "dev": true,
+      "optional": true,
       "engines": {
         "node": ">=6"
       }
@@ -2471,7 +2480,8 @@
       "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==",
-      "devOptional": true
+      "dev": true,
+      "optional": true
     },
     "node_modules/fs-extra": {
       "version": "8.1.0",
@@ -2553,7 +2563,8 @@
       "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==",
-      "devOptional": true
+      "dev": true,
+      "optional": true
     },
     "node_modules/glob": {
       "version": "7.2.3",
@@ -2867,7 +2878,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "devOptional": true,
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -2881,7 +2892,8 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "optional": true
     },
     "node_modules/inflight": {
       "version": "1.0.6",
@@ -2904,7 +2916,8 @@
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "devOptional": true
+      "dev": true,
+      "optional": true
     },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
@@ -3222,7 +3235,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -3330,13 +3343,14 @@
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
       "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "devOptional": true
+      "dev": true
     },
     "node_modules/mkdirp-classic": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-      "devOptional": true
+      "dev": true,
+      "optional": true
     },
     "node_modules/ms": {
       "version": "2.1.2",
@@ -3350,23 +3364,19 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
-    "node_modules/nan": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz",
-      "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==",
-      "devOptional": true
-    },
     "node_modules/napi-build-utils": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
       "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
-      "devOptional": true
+      "dev": true,
+      "optional": true
     },
     "node_modules/node-abi": {
       "version": "3.30.0",
       "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.30.0.tgz",
       "integrity": "sha512-qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw==",
-      "devOptional": true,
+      "dev": true,
+      "optional": true,
       "dependencies": {
         "semver": "^7.3.5"
       },
@@ -3378,7 +3388,8 @@
       "version": "7.5.4",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
       "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "devOptional": true,
+      "dev": true,
+      "optional": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -3402,6 +3413,18 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/node-gyp-build": {
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
+      "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
+      "devOptional": true,
+      "license": "MIT",
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -3470,7 +3493,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "wrappy": "1"
       }
@@ -3646,7 +3669,8 @@
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
       "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
-      "devOptional": true,
+      "dev": true,
+      "optional": true,
       "dependencies": {
         "detect-libc": "^2.0.0",
         "expand-template": "^2.0.3",
@@ -3700,7 +3724,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -3737,7 +3761,8 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "devOptional": true,
+      "dev": true,
+      "optional": true,
       "dependencies": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -3950,7 +3975,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
       "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-      "devOptional": true,
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -3964,13 +3989,14 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "optional": true
     },
     "node_modules/simple-get": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
       "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
-      "devOptional": true,
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -3985,6 +4011,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "optional": true,
       "dependencies": {
         "decompress-response": "^6.0.0",
         "once": "^1.3.1",
@@ -4079,7 +4106,8 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo= sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-      "devOptional": true,
+      "dev": true,
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4119,7 +4147,8 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
       "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-      "devOptional": true,
+      "dev": true,
+      "optional": true,
       "dependencies": {
         "chownr": "^1.1.1",
         "mkdirp-classic": "^0.5.2",
@@ -4131,7 +4160,8 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
       "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "devOptional": true,
+      "dev": true,
+      "optional": true,
       "dependencies": {
         "bl": "^4.0.3",
         "end-of-stream": "^1.4.1",
@@ -4211,25 +4241,86 @@
       }
     },
     "node_modules/tree-sitter": {
-      "version": "0.20.6",
-      "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.20.6.tgz",
-      "integrity": "sha512-GxJodajVpfgb3UREzzIbtA1hyRnTxVbWVXrbC6sk4xTMH5ERMBJk9HJNq4c8jOJeUaIOmLcwg+t6mez/PDvGqg==",
-      "devOptional": true,
+      "version": "0.22.4",
+      "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.22.4.tgz",
+      "integrity": "sha512-usbHZP9/oxNsUY65MQUsduGRqDHQOou1cagUSwjhoSYAmSahjQDAVsh9s+SlZkn8X8+O1FULRGwHu7AFP3kjzg==",
+      "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
-        "nan": "^2.18.0",
-        "prebuild-install": "^7.1.1"
+        "node-addon-api": "^8.3.0",
+        "node-gyp-build": "^4.8.4"
+      }
+    },
+    "node_modules/tree-sitter-javascript": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/tree-sitter-javascript/-/tree-sitter-javascript-0.23.1.tgz",
+      "integrity": "sha512-/bnhbrTD9frUYHQTiYnPcxyHORIw157ERBa6dqzaKxvR/x3PC4Yzd+D1pZIMS6zNg2v3a8BZ0oK7jHqsQo9fWA==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "node-addon-api": "^8.2.2",
+        "node-gyp-build": "^4.8.2"
+      },
+      "peerDependencies": {
+        "tree-sitter": "^0.21.1"
+      },
+      "peerDependenciesMeta": {
+        "tree-sitter": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tree-sitter-javascript/node_modules/node-addon-api": {
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.3.1.tgz",
+      "integrity": "sha512-lytcDEdxKjGJPTLEfW4mYMigRezMlyJY8W4wxJK8zE533Jlb8L8dRuObJFWg2P+AuOIxoCgKF+2Oq4d4Zd0OUA==",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": "^18 || ^20 || >= 21"
       }
     },
     "node_modules/tree-sitter-typescript": {
-      "version": "0.20.5",
-      "resolved": "https://registry.npmjs.org/tree-sitter-typescript/-/tree-sitter-typescript-0.20.5.tgz",
-      "integrity": "sha512-RzK/Pc6k4GiXvInIBlo8ZggekP6rODfW2P6KHFCTSUHENsw6ynh+iacFhfkJRa4MT8EIN2WHygFJ7076/+eHKg==",
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/tree-sitter-typescript/-/tree-sitter-typescript-0.23.2.tgz",
+      "integrity": "sha512-e04JUUKxTT53/x3Uq1zIL45DoYKVfHH4CZqwgZhPg5qYROl5nQjV+85ruFzFGZxu+QeFVbRTPDRnqL9UbU4VeA==",
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
-        "nan": "^2.18.0",
-        "tree-sitter": "^0.20.6"
+        "node-addon-api": "^8.2.2",
+        "node-gyp-build": "^4.8.2",
+        "tree-sitter-javascript": "^0.23.1"
+      },
+      "peerDependencies": {
+        "tree-sitter": "^0.21.0"
+      },
+      "peerDependenciesMeta": {
+        "tree-sitter": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tree-sitter-typescript/node_modules/node-addon-api": {
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.3.1.tgz",
+      "integrity": "sha512-lytcDEdxKjGJPTLEfW4mYMigRezMlyJY8W4wxJK8zE533Jlb8L8dRuObJFWg2P+AuOIxoCgKF+2Oq4d4Zd0OUA==",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": "^18 || ^20 || >= 21"
+      }
+    },
+    "node_modules/tree-sitter/node_modules/node-addon-api": {
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.3.1.tgz",
+      "integrity": "sha512-lytcDEdxKjGJPTLEfW4mYMigRezMlyJY8W4wxJK8zE533Jlb8L8dRuObJFWg2P+AuOIxoCgKF+2Oq4d4Zd0OUA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18 || ^20 || >= 21"
       }
     },
     "node_modules/tslib": {
@@ -4251,7 +4342,8 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-      "devOptional": true,
+      "dev": true,
+      "optional": true,
       "dependencies": {
         "safe-buffer": "^5.0.1"
       },
@@ -4500,7 +4592,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "devOptional": true
+      "dev": true
     },
     "node_modules/xml2js": {
       "version": "0.5.0",
@@ -4546,7 +4638,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "devOptional": true
+      "dev": true
     },
     "node_modules/yauzl": {
       "version": "2.10.0",
diff --git a/build/package.json b/build/package.json
index 3a435a8326bf..73d4f42e8433 100644
--- a/build/package.json
+++ b/build/package.json
@@ -51,7 +51,7 @@
     "source-map": "0.6.1",
     "ternary-stream": "^3.0.0",
     "through2": "^4.0.2",
-    "tree-sitter": "^0.20.5",
+    "tree-sitter": "^0.22.4",
     "vscode-universal-bundler": "^0.1.3",
     "workerpool": "^6.4.0",
     "yauzl": "^2.10.0"
@@ -63,7 +63,7 @@
     "npmCheckJs": "../node_modules/.bin/tsc --noEmit"
   },
   "optionalDependencies": {
-    "tree-sitter-typescript": "^0.20.5",
+    "tree-sitter-typescript": "^0.23.2",
     "vscode-gulp-watch": "^5.0.3"
   }
 }
diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts
index d2ba316398ee..70a1c98a370d 100644
--- a/src/vs/platform/configuration/common/configurationRegistry.ts
+++ b/src/vs/platform/configuration/common/configurationRegistry.ts
@@ -164,8 +164,13 @@ export interface IPolicy {
 
 	/**
 	 * The Code version in which this policy was introduced.
-	 */
+	*/
 	readonly minimumVersion: `${number}.${number}`;
+
+	/**
+	 * The policy description (optional).
+	 */
+	readonly description?: string;
 }
 
 export interface IConfigurationPropertySchema extends IJSONSchema {
diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts
index 7c83051f3e65..a41dd8814715 100644
--- a/src/vs/platform/telemetry/common/telemetryService.ts
+++ b/src/vs/platform/telemetry/common/telemetryService.ts
@@ -200,7 +200,8 @@ ${deprecatedSettingNote}
 	return telemetryDescription;
 }
 
-Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
+const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
+configurationRegistry.registerConfiguration({
 	'id': TELEMETRY_SECTION_ID,
 	'order': 1,
 	'type': 'object',
@@ -223,33 +224,19 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 			'policy': {
 				name: 'TelemetryLevel',
 				minimumVersion: '1.99',
+				description: localize('telemetry.telemetryLevel.policyDescription', "Controls the level of telemetry."),
 			}
-		}
-	},
-});
-
-Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
-	'id': TELEMETRY_SECTION_ID,
-	properties: {
+		},
 		'telemetry.disableFeedback': {
 			type: 'boolean',
 			default: false,
-			description: 'Disable feedback options.',
+			description: localize('telemetry.disableFeedback', "Disable feedback options."),
 			policy: {
 				name: 'DisableFeedback',
 				minimumVersion: '1.99',
 			}
 		},
-	},
-});
-
-// Deprecated telemetry setting
-Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
-	'id': TELEMETRY_SECTION_ID,
-	'order': 110,
-	'type': 'object',
-	'title': localize('telemetryConfigurationTitle', "Telemetry"),
-	'properties': {
+		// Deprecated telemetry setting
 		[TELEMETRY_OLD_SETTING_ID]: {
 			'type': 'boolean',
 			'markdownDescription':
@@ -262,6 +249,5 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
 			'scope': ConfigurationScope.APPLICATION,
 			'tags': ['usesOnlineServices', 'telemetry']
 		}
-	}
+	},
 });
-

From e52300f399d26282bd9ea139d4c284dd994aec5a Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 13 Mar 2025 02:32:02 -0700
Subject: [PATCH 0891/1815] Use correct registerTerminalAction call

---
 .../browser/terminal.suggest.contribution.ts  | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

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 81ffd8935a35..fce7396cf0ab 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
@@ -17,7 +17,7 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { GeneralShellType, TerminalLocation } from '../../../../../platform/terminal/common/terminal.js';
 import { ITerminalContribution, ITerminalInstance, IXtermTerminal } from '../../../terminal/browser/terminal.js';
-import { registerActiveInstanceAction } from '../../../terminal/browser/terminalActions.js';
+import { registerActiveInstanceAction, registerTerminalAction } from '../../../terminal/browser/terminalActions.js';
 import { registerTerminalContribution, type ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
 import { TerminalContextKeys } from '../../../terminal/common/terminalContextKey.js';
 import { TerminalSuggestCommandId } from '../common/terminal.suggest.js';
@@ -202,6 +202,23 @@ registerTerminalContribution(TerminalSuggestContribution.ID, TerminalSuggestCont
 
 // #region Actions
 
+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),
+	keybinding: {
+		primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Comma,
+		weight: KeybindingWeight.WorkbenchContrib
+	},
+	menu: {
+		id: MenuId.MenubarTerminalSuggestStatusMenu,
+		group: 'right',
+		order: 1
+	},
+	run: (c, accessor) => accessor.get(IPreferencesService).openSettings({ query: terminalSuggestConfigSection })
+});
+
 registerActiveInstanceAction({
 	id: TerminalSuggestCommandId.RequestCompletions,
 	title: localize2('workbench.action.terminal.requestCompletions', 'Request Completions'),
@@ -377,23 +394,6 @@ registerActiveInstanceAction({
 	}
 });
 
-registerActiveInstanceAction({
-	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),
-	keybinding: {
-		primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Comma,
-		weight: KeybindingWeight.WorkbenchContrib
-	},
-	menu: {
-		id: MenuId.MenubarTerminalSuggestStatusMenu,
-		group: 'right',
-		order: 1
-	},
-	run: (activeInstance, c, accessor) => accessor.get(IPreferencesService).openSettings({ query: terminalSuggestConfigSection })
-});
-
 registerActiveInstanceAction({
 	id: TerminalSuggestCommandId.ClearSuggestCache,
 	title: localize2('workbench.action.terminal.clearSuggestCache', 'Clear Suggest Cache'),

From 62b1b55bd893fa22af96428ba30383b4e6d4fc8c Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 13 Mar 2025 11:58:52 +0100
Subject: [PATCH 0892/1815] remove duplicated MCP status (#243439)

---
 src/vs/workbench/contrib/mcp/browser/mcpCommands.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 75b65f82c90a..913d3fb2b800 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -240,7 +240,6 @@ export class AttachMCPToolsAction extends Action2 {
 				server,
 				type: 'item',
 				label: `${server.definition.label}`,
-				description: localize('desc', "MCP Server - {0}", McpConnectionState.toString(server.connectionState.get())),
 				picked: tools.some(tool => tool.enabled.get()),
 				toolPicks: []
 			};

From ecdc8007ac081bb87e39b95066c1f6592ac5e88a Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 13 Mar 2025 12:07:48 +0100
Subject: [PATCH 0893/1815] add `ChatContextKeys.Editing.hasToolsAgent` to
 attach tools command (#243441)

---
 src/vs/workbench/contrib/mcp/browser/mcpCommands.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 913d3fb2b800..d74abe0ff16a 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -185,12 +185,14 @@ export class AttachMCPToolsAction extends Action2 {
 			category: CHAT_CATEGORY,
 			precondition: ContextKeyExpr.and(
 				McpContextKeys.toolsCount.greater(0),
-				ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat)
+				ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat),
+				ChatContextKeys.Editing.hasToolsAgent
 			),
 			menu: {
 				when: ContextKeyExpr.and(
 					McpContextKeys.toolsCount.greater(0),
-					ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat)
+					ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat),
+					ChatContextKeys.Editing.hasToolsAgent
 				),
 				id: MenuId.ChatInputAttachmentToolbar,
 				group: 'navigation'

From aabf5bd8150dbfed00165f013af2c4ae1abeb21b Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 13 Mar 2025 04:18:40 -0700
Subject: [PATCH 0894/1815] Support tracking sub-executions within a single
 executeCommand

Fixes #237208
---
 .../common/extHostTerminalShellIntegration.ts | 109 +++++++++++++++---
 1 file changed, 96 insertions(+), 13 deletions(-)

diff --git a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
index af013c0c7c5d..55d43d12c011 100644
--- a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
@@ -149,12 +149,19 @@ export class ExtHostTerminalShellIntegration extends Disposable implements IExtH
 	}
 }
 
+interface IExecutionProperties {
+	isMultiLine: boolean;
+	unresolvedCommandLines: string[] | undefined;
+}
+
 class InternalTerminalShellIntegration extends Disposable {
 	private _pendingExecutions: InternalTerminalShellExecution[] = [];
 
+	private _currentExecutionProperties: IExecutionProperties | undefined;
 	private _currentExecution: InternalTerminalShellExecution | undefined;
 	get currentExecution(): InternalTerminalShellExecution | undefined { return this._currentExecution; }
 
+
 	private _env: vscode.TerminalShellIntegrationEnvironment | undefined;
 	private _cwd: URI | undefined;
 	private _hasRichCommandDetection: boolean = false;
@@ -226,13 +233,42 @@ class InternalTerminalShellIntegration extends Disposable {
 
 	requestNewShellExecution(commandLine: vscode.TerminalShellExecutionCommandLine, cwd: URI | undefined) {
 		const execution = new InternalTerminalShellExecution(commandLine, cwd ?? this._cwd);
+		const unresolvedCommandLines = splitAndSanitizeCommandLine(commandLine.value);
+		if (unresolvedCommandLines.length > 0) {
+			this._currentExecutionProperties = {
+				isMultiLine: true,
+				unresolvedCommandLines: splitAndSanitizeCommandLine(commandLine.value),
+			};
+		}
 		this._pendingExecutions.push(execution);
 		this._onDidRequestNewExecution.fire(commandLine.value);
 		return execution;
 	}
 
-	startShellExecution(commandLine: vscode.TerminalShellExecutionCommandLine, cwd: URI | undefined): InternalTerminalShellExecution {
+	startShellExecution(commandLine: vscode.TerminalShellExecutionCommandLine, cwd: URI | undefined): undefined {
 		if (this._currentExecution) {
+			// If the current execution is multi-line, check if this command line is part of it.
+			if (this._currentExecutionProperties?.isMultiLine) {
+				const unresolvedCommandLines = this._currentExecutionProperties.unresolvedCommandLines;
+				const subExecutionLines = splitAndSanitizeCommandLine(commandLine.value);
+				if (unresolvedCommandLines && unresolvedCommandLines.length > 0) {
+					// If all sub-exeuction lines are in the command line, this is part of the
+					// multi-line execution.
+					for (let i = 0; i < unresolvedCommandLines.length; i++) {
+						if (unresolvedCommandLines[i] !== subExecutionLines[i]) {
+							break;
+						}
+						unresolvedCommandLines.shift();
+						subExecutionLines.shift();
+					}
+
+					if (subExecutionLines.length === 0) {
+						this._currentExecutionProperties.unresolvedCommandLines = unresolvedCommandLines;
+						return;
+					}
+				}
+			}
+
 			if (this._hasRichCommandDetection) {
 				console.warn('Rich command detection is enabled but an execution started before the last ended');
 			}
@@ -244,9 +280,43 @@ class InternalTerminalShellIntegration extends Disposable {
 		// command line
 		let currentExecution: InternalTerminalShellExecution | undefined;
 		if (commandLine.confidence === TerminalShellExecutionCommandLineConfidence.High) {
-			const index = this._pendingExecutions.findIndex(e => e.value.commandLine.value === commandLine.value);
-			if (index !== -1) {
-				currentExecution = this._pendingExecutions.splice(index, 1)[0];
+			for (const [i, execution] of this._pendingExecutions.entries()) {
+				if (execution.value.commandLine.value === commandLine.value) {
+					currentExecution = execution;
+					this._currentExecutionProperties = {
+						isMultiLine: false,
+						unresolvedCommandLines: undefined,
+					};
+					currentExecution = this._pendingExecutions.splice(i, 1)[0];
+					break;
+				} else {
+					// When executing something that the shell considers multiple commands, such as
+					// a comment followed by a command, this needs to all be tracked under a single
+					// execution.
+					if (execution.value.commandLine.value.includes('\n')) {
+						const unresolvedCommandLines = splitAndSanitizeCommandLine(execution.value.commandLine.value);
+						const subExecutionLines = splitAndSanitizeCommandLine(commandLine.value);
+
+						// If all sub-exeuction lines are in the command line, this is part of the
+						// multi-line execution.
+						for (let i = 0; i < unresolvedCommandLines.length; i++) {
+							if (unresolvedCommandLines[i] !== subExecutionLines[i]) {
+								break;
+							}
+							unresolvedCommandLines.shift();
+							subExecutionLines.shift();
+						}
+
+						if (subExecutionLines.length === 0) {
+							this._currentExecutionProperties = {
+								isMultiLine: true,
+								unresolvedCommandLines,
+							};
+							currentExecution = this._pendingExecutions.splice(i, 1)[0];
+							break;
+						}
+					}
+				}
 			}
 		} else {
 			currentExecution = this._pendingExecutions.shift();
@@ -259,9 +329,7 @@ class InternalTerminalShellIntegration extends Disposable {
 		}
 
 		this._currentExecution = currentExecution;
-
 		this._onDidStartTerminalShellExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value });
-		return this._currentExecution;
 	}
 
 	emitData(data: string): void {
@@ -269,8 +337,17 @@ class InternalTerminalShellIntegration extends Disposable {
 	}
 
 	endShellExecution(commandLine: vscode.TerminalShellExecutionCommandLine | undefined, exitCode: number | undefined): void {
+		// If the current execution is multi-line, don't end it until the next command line is
+		// confirmed to not be a part of it.
+		if (this._currentExecutionProperties?.isMultiLine) {
+			if (this._currentExecutionProperties.unresolvedCommandLines && this._currentExecutionProperties.unresolvedCommandLines.length > 0) {
+				return;
+			}
+		}
+
 		if (this._currentExecution) {
-			this._currentExecution.endExecution(commandLine);
+			const commandLineForEvent = this._currentExecutionProperties?.isMultiLine ? this._currentExecution.value.commandLine : commandLine;
+			this._currentExecution.endExecution(commandLineForEvent);
 			const currentExecution = this._currentExecution;
 			// IMPORTANT: Ensure the current execution's data events are flushed in order to
 			// prevent data events firing after the end event fires.
@@ -320,12 +397,11 @@ class InternalTerminalShellIntegration extends Disposable {
 }
 
 class InternalTerminalShellExecution {
-	private _dataStream: ShellExecutionDataStream | undefined;
-
-	private _ended: boolean = false;
-
 	readonly value: vscode.TerminalShellExecution;
 
+	private _dataStream: ShellExecutionDataStream | undefined;
+	private _isEnded: boolean = false;
+
 	constructor(
 		private _commandLine: vscode.TerminalShellExecutionCommandLine,
 		readonly cwd: URI | undefined,
@@ -346,7 +422,7 @@ class InternalTerminalShellExecution {
 
 	private _createDataStream(): AsyncIterable<string> {
 		if (!this._dataStream) {
-			if (this._ended) {
+			if (this._isEnded) {
 				return AsyncIterableObject.EMPTY;
 			}
 			this._dataStream = new ShellExecutionDataStream();
@@ -364,7 +440,7 @@ class InternalTerminalShellExecution {
 		}
 		this._dataStream?.endExecution();
 		this._dataStream = undefined;
-		this._ended = true;
+		this._isEnded = true;
 	}
 
 	async flush(): Promise<void> {
@@ -405,3 +481,10 @@ class ShellExecutionDataStream extends Disposable {
 		await Promise.all(this._iterables.map(e => e.toPromise()));
 	}
 }
+
+function splitAndSanitizeCommandLine(commandLine: string): string[] {
+	return commandLine
+		.split('\n')
+		.map(line => line.trim())
+		.filter(line => line.length > 0);
+}

From f1b2c2b84d20b12fb3fcad7b590f4b6fcb15f22c Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 13 Mar 2025 04:51:06 -0700
Subject: [PATCH 0895/1815] Reduce repetition

---
 .../common/extHostTerminalShellIntegration.ts | 89 ++++++++++---------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
index 55d43d12c011..0d82e2e8715a 100644
--- a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
@@ -248,24 +248,11 @@ class InternalTerminalShellIntegration extends Disposable {
 	startShellExecution(commandLine: vscode.TerminalShellExecutionCommandLine, cwd: URI | undefined): undefined {
 		if (this._currentExecution) {
 			// If the current execution is multi-line, check if this command line is part of it.
-			if (this._currentExecutionProperties?.isMultiLine) {
-				const unresolvedCommandLines = this._currentExecutionProperties.unresolvedCommandLines;
-				const subExecutionLines = splitAndSanitizeCommandLine(commandLine.value);
-				if (unresolvedCommandLines && unresolvedCommandLines.length > 0) {
-					// If all sub-exeuction lines are in the command line, this is part of the
-					// multi-line execution.
-					for (let i = 0; i < unresolvedCommandLines.length; i++) {
-						if (unresolvedCommandLines[i] !== subExecutionLines[i]) {
-							break;
-						}
-						unresolvedCommandLines.shift();
-						subExecutionLines.shift();
-					}
-
-					if (subExecutionLines.length === 0) {
-						this._currentExecutionProperties.unresolvedCommandLines = unresolvedCommandLines;
-						return;
-					}
+			if (this._currentExecutionProperties?.isMultiLine && this._currentExecutionProperties.unresolvedCommandLines) {
+				const subExecutionResult = isSubExecution(this._currentExecutionProperties.unresolvedCommandLines, commandLine);
+				if (subExecutionResult) {
+					this._currentExecutionProperties.unresolvedCommandLines = subExecutionResult.unresolvedCommandLines;
+					return;
 				}
 			}
 
@@ -287,34 +274,19 @@ class InternalTerminalShellIntegration extends Disposable {
 						isMultiLine: false,
 						unresolvedCommandLines: undefined,
 					};
-					currentExecution = this._pendingExecutions.splice(i, 1)[0];
+					currentExecution = execution;
+					this._pendingExecutions.splice(i, 1);
 					break;
 				} else {
-					// When executing something that the shell considers multiple commands, such as
-					// a comment followed by a command, this needs to all be tracked under a single
-					// execution.
-					if (execution.value.commandLine.value.includes('\n')) {
-						const unresolvedCommandLines = splitAndSanitizeCommandLine(execution.value.commandLine.value);
-						const subExecutionLines = splitAndSanitizeCommandLine(commandLine.value);
-
-						// If all sub-exeuction lines are in the command line, this is part of the
-						// multi-line execution.
-						for (let i = 0; i < unresolvedCommandLines.length; i++) {
-							if (unresolvedCommandLines[i] !== subExecutionLines[i]) {
-								break;
-							}
-							unresolvedCommandLines.shift();
-							subExecutionLines.shift();
-						}
-
-						if (subExecutionLines.length === 0) {
-							this._currentExecutionProperties = {
-								isMultiLine: true,
-								unresolvedCommandLines,
-							};
-							currentExecution = this._pendingExecutions.splice(i, 1)[0];
-							break;
-						}
+					const subExecutionResult = isSubExecution(splitAndSanitizeCommandLine(execution.value.commandLine.value), commandLine);
+					if (subExecutionResult) {
+						this._currentExecutionProperties = {
+							isMultiLine: true,
+							unresolvedCommandLines: subExecutionResult.unresolvedCommandLines,
+						};
+						currentExecution = execution;
+						this._pendingExecutions.splice(i, 1);
+						break;
 					}
 				}
 			}
@@ -488,3 +460,32 @@ function splitAndSanitizeCommandLine(commandLine: string): string[] {
 		.map(line => line.trim())
 		.filter(line => line.length > 0);
 }
+
+/**
+ * When executing something that the shell considers multiple commands, such as
+ * a comment followed by a command, this needs to all be tracked under a single
+ * execution.
+ */
+function isSubExecution(unresolvedCommandLines: string[], commandLine: vscode.TerminalShellExecutionCommandLine): { unresolvedCommandLines: string[] } | false {
+	if (unresolvedCommandLines.length === 0) {
+		return false;
+	}
+	const newUnresolvedCommandLines = [...unresolvedCommandLines];
+	const subExecutionLines = splitAndSanitizeCommandLine(commandLine.value);
+	if (newUnresolvedCommandLines && newUnresolvedCommandLines.length > 0) {
+		// If all sub-execution lines are in the command line, this is part of the
+		// multi-line execution.
+		for (let i = 0; i < newUnresolvedCommandLines.length; i++) {
+			if (newUnresolvedCommandLines[i] !== subExecutionLines[i]) {
+				break;
+			}
+			newUnresolvedCommandLines.shift();
+			subExecutionLines.shift();
+		}
+
+		if (subExecutionLines.length === 0) {
+			return { unresolvedCommandLines: newUnresolvedCommandLines };
+		}
+	}
+	return false;
+}

From 7a0085db5513607603ce08787de43e4a286aa751 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 13 Mar 2025 12:53:36 +0100
Subject: [PATCH 0896/1815] simpler CSS logic (#243447)

---
 src/vs/workbench/contrib/chat/browser/media/chat.css | 5 +++++
 src/vs/workbench/contrib/mcp/browser/mcpCommands.ts  | 1 -
 src/vs/workbench/contrib/mcp/browser/media/mcp.css   | 8 --------
 3 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 src/vs/workbench/contrib/mcp/browser/media/mcp.css

diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 4f96f3610dbd..25a25e870e9a 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1183,6 +1183,11 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	}
 }
 
+.quick-input-list .quick-input-list-rows > .quick-input-list-row .monaco-icon-label.mcp-tool .codicon[class*='codicon-'] {
+	font-size: 14px;
+}
+
+
 .action-item.chat-attached-context-attachment.chat-add-files .action-label.codicon::before {
 	font: normal normal normal 16px/1 codicon;
 }
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index d74abe0ff16a..db249716c313 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -30,7 +30,6 @@ import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
 import { ChatMode } from '../../chat/common/constants.js';
 import { McpContextKeys } from '../common/mcpContextKeys.js';
 import { IMcpServer, IMcpService, IMcpTool, McpConnectionState, McpServerToolsState } from '../common/mcpTypes.js';
-import './media/mcp.css';
 
 // acroynms do not get localized
 const category: ILocalizedString = {
diff --git a/src/vs/workbench/contrib/mcp/browser/media/mcp.css b/src/vs/workbench/contrib/mcp/browser/media/mcp.css
deleted file mode 100644
index f65fb9628f71..000000000000
--- a/src/vs/workbench/contrib/mcp/browser/media/mcp.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-.quick-input-list .quick-input-list-rows > .quick-input-list-row .monaco-icon-label.mcp-tool .codicon[class*='codicon-'] {
-	font-size: 14px;
-}

From 38d1f292632321d5a256a4f66480625a1e18e6d8 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 13 Mar 2025 13:05:31 +0100
Subject: [PATCH 0897/1815] Refactor titlebar update logic to check element
 existence (#243449)

refactor: ensure element exists before updating window controls
---
 .../parts/titlebar/titlebarPart.ts            | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts b/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
index 45fbdbf950da..cfd13ca9d037 100644
--- a/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts
@@ -235,17 +235,20 @@ export class NativeTitlebarPart extends BrowserTitlebarPart {
 	override updateStyles(): void {
 		super.updateStyles();
 
-		if (useWindowControlsOverlay(this.configurationService)) {
-			if (
-				!this.cachedWindowControlStyles ||
-				this.cachedWindowControlStyles.bgColor !== this.element.style.backgroundColor ||
-				this.cachedWindowControlStyles.fgColor !== this.element.style.color
-			) {
-				this.nativeHostService.updateWindowControls({
-					targetWindowId: getWindowId(getWindow(this.element)),
-					backgroundColor: this.element.style.backgroundColor,
-					foregroundColor: this.element.style.color
-				});
+		// Part container
+		if (this.element) {
+			if (useWindowControlsOverlay(this.configurationService)) {
+				if (
+					!this.cachedWindowControlStyles ||
+					this.cachedWindowControlStyles.bgColor !== this.element.style.backgroundColor ||
+					this.cachedWindowControlStyles.fgColor !== this.element.style.color
+				) {
+					this.nativeHostService.updateWindowControls({
+						targetWindowId: getWindowId(getWindow(this.element)),
+						backgroundColor: this.element.style.backgroundColor,
+						foregroundColor: this.element.style.color
+					});
+				}
 			}
 		}
 	}

From 79e31e78d2c2e020ed99216ef1fad79a843aadea Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 13 Mar 2025 06:51:12 -0700
Subject: [PATCH 0898/1815] Add test suite and fix some edge cases and
 lifecycle problems

---
 .../common/extHostTerminalShellIntegration.ts |  32 ++-
 .../extHostTerminalShellIntegration.test.ts   | 210 ++++++++++++++++++
 2 files changed, 234 insertions(+), 8 deletions(-)
 create mode 100644 src/vs/workbench/api/test/common/extHostTerminalShellIntegration.test.ts

diff --git a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
index 0d82e2e8715a..6314229802a9 100644
--- a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
@@ -154,8 +154,9 @@ interface IExecutionProperties {
 	unresolvedCommandLines: string[] | undefined;
 }
 
-class InternalTerminalShellIntegration extends Disposable {
+export class InternalTerminalShellIntegration extends Disposable {
 	private _pendingExecutions: InternalTerminalShellExecution[] = [];
+	private _pendingEndingExecution: InternalTerminalShellExecution | undefined;
 
 	private _currentExecutionProperties: IExecutionProperties | undefined;
 	private _currentExecution: InternalTerminalShellExecution | undefined;
@@ -234,7 +235,7 @@ class InternalTerminalShellIntegration extends Disposable {
 	requestNewShellExecution(commandLine: vscode.TerminalShellExecutionCommandLine, cwd: URI | undefined) {
 		const execution = new InternalTerminalShellExecution(commandLine, cwd ?? this._cwd);
 		const unresolvedCommandLines = splitAndSanitizeCommandLine(commandLine.value);
-		if (unresolvedCommandLines.length > 0) {
+		if (unresolvedCommandLines.length > 1) {
 			this._currentExecutionProperties = {
 				isMultiLine: true,
 				unresolvedCommandLines: splitAndSanitizeCommandLine(commandLine.value),
@@ -246,6 +247,14 @@ class InternalTerminalShellIntegration extends Disposable {
 	}
 
 	startShellExecution(commandLine: vscode.TerminalShellExecutionCommandLine, cwd: URI | undefined): undefined {
+		// Since an execution is starting, fire the end event for any execution that is awaiting to
+		// end. When this happens it means that the data stream may not be flushed and therefore may
+		// fire events after the end event.
+		if (this._pendingEndingExecution) {
+			this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._pendingEndingExecution.value, exitCode: undefined });
+			this._pendingEndingExecution = undefined;
+		}
+
 		if (this._currentExecution) {
 			// If the current execution is multi-line, check if this command line is part of it.
 			if (this._currentExecutionProperties?.isMultiLine && this._currentExecutionProperties.unresolvedCommandLines) {
@@ -255,11 +264,11 @@ class InternalTerminalShellIntegration extends Disposable {
 					return;
 				}
 			}
-
 			if (this._hasRichCommandDetection) {
 				console.warn('Rich command detection is enabled but an execution started before the last ended');
 			}
 			this._currentExecution.endExecution(undefined);
+			this._currentExecution.flush();
 			this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value, exitCode: undefined });
 		}
 
@@ -321,14 +330,16 @@ class InternalTerminalShellIntegration extends Disposable {
 			const commandLineForEvent = this._currentExecutionProperties?.isMultiLine ? this._currentExecution.value.commandLine : commandLine;
 			this._currentExecution.endExecution(commandLineForEvent);
 			const currentExecution = this._currentExecution;
+			this._pendingEndingExecution = currentExecution;
+			this._currentExecution = undefined;
 			// IMPORTANT: Ensure the current execution's data events are flushed in order to
 			// prevent data events firing after the end event fires.
 			currentExecution.flush().then(() => {
 				// Only fire if it's still the same execution, if it's changed it would have already
 				// been fired.
-				if (this._currentExecution === currentExecution) {
+				if (this._pendingEndingExecution === currentExecution) {
 					this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: currentExecution.value, exitCode });
-					this._currentExecution = undefined;
+					this._pendingEndingExecution = undefined;
 				}
 			});
 		}
@@ -403,7 +414,9 @@ class InternalTerminalShellExecution {
 	}
 
 	emitData(data: string): void {
-		this._dataStream?.emitData(data);
+		if (!this._isEnded) {
+			this._dataStream?.emitData(data);
+		}
 	}
 
 	endExecution(commandLine: vscode.TerminalShellExecutionCommandLine | undefined): void {
@@ -411,12 +424,15 @@ class InternalTerminalShellExecution {
 			this._commandLine = commandLine;
 		}
 		this._dataStream?.endExecution();
-		this._dataStream = undefined;
 		this._isEnded = true;
 	}
 
 	async flush(): Promise<void> {
-		await this._dataStream?.flush();
+		if (this._dataStream) {
+			await this._dataStream.flush();
+			this._dataStream.dispose();
+			this._dataStream = undefined;
+		}
 	}
 }
 
diff --git a/src/vs/workbench/api/test/common/extHostTerminalShellIntegration.test.ts b/src/vs/workbench/api/test/common/extHostTerminalShellIntegration.test.ts
new file mode 100644
index 000000000000..99fc1749ef02
--- /dev/null
+++ b/src/vs/workbench/api/test/common/extHostTerminalShellIntegration.test.ts
@@ -0,0 +1,210 @@
+/*---------------------------------------------------------------------------------------------
+ *  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, type TerminalShellExecution, type TerminalShellExecutionCommandLine, type TerminalShellExecutionStartEvent } from 'vscode';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { InternalTerminalShellIntegration } from '../../common/extHostTerminalShellIntegration.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { TerminalShellExecutionCommandLineConfidence } from '../../common/extHostTypes.js';
+import { deepStrictEqual, notStrictEqual, strictEqual } from 'assert';
+import type { URI } from '../../../../base/common/uri.js';
+import { DeferredPromise } from '../../../../base/common/async.js';
+
+function cmdLine(value: string): TerminalShellExecutionCommandLine {
+	return Object.freeze({
+		confidence: TerminalShellExecutionCommandLineConfidence.High,
+		value,
+		isTrusted: true,
+	});
+}
+function asCmdLine(value: string | TerminalShellExecutionCommandLine): TerminalShellExecutionCommandLine {
+	if (typeof value === 'string') {
+		return cmdLine(value);
+	}
+	return value;
+}
+
+const testCommandLine = 'echo hello world';
+const testCommandLine2 = 'echo goodbye world';
+
+interface ITrackedEvent {
+	type: 'start' | 'data' | 'end';
+	commandLine: string;
+	data?: string;
+}
+
+suite('InternalTerminalShellIntegration', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let si: InternalTerminalShellIntegration;
+	let terminal: Terminal;
+	let onDidStartTerminalShellExecution: Emitter<TerminalShellExecutionStartEvent>;
+	let trackedEvents: ITrackedEvent[];
+	let readIteratorsFlushed: Promise<void>[];
+
+	async function startExecutionAwaitObject(commandLine: string | TerminalShellExecutionCommandLine, cwd?: URI): Promise<TerminalShellExecution> {
+		return await new Promise<TerminalShellExecution>(r => {
+			store.add(onDidStartTerminalShellExecution.event(e => {
+				r(e.execution);
+			}));
+			si.startShellExecution(asCmdLine(commandLine), cwd);
+		});
+	}
+
+	async function endExecutionAwaitObject(commandLine: string | TerminalShellExecutionCommandLine): Promise<TerminalShellExecution> {
+		return await new Promise<TerminalShellExecution>(r => {
+			store.add(si.onDidRequestEndExecution(e => r(e.execution)));
+			si.endShellExecution(asCmdLine(commandLine), 0);
+		});
+	}
+
+	async function emitData(data: string): Promise<void> {
+		// AsyncIterableObjects are initialized in a microtask, this doesn't matter in practice
+		// since the events will always come through in different events.
+		await new Promise<void>(r => queueMicrotask(r));
+		si.emitData(data);
+	}
+
+	function assertTrackedEvents(expected: ITrackedEvent[]) {
+		deepStrictEqual(trackedEvents, expected);
+	}
+
+	function assertNonDataTrackedEvents(expected: ITrackedEvent[]) {
+		deepStrictEqual(trackedEvents.filter(e => e.type !== 'data'), expected);
+	}
+
+	function assertDataTrackedEvents(expected: ITrackedEvent[]) {
+		deepStrictEqual(trackedEvents.filter(e => e.type === 'data'), expected);
+	}
+
+	setup(() => {
+		terminal = Symbol('testTerminal') as any;
+		onDidStartTerminalShellExecution = store.add(new Emitter());
+		si = store.add(new InternalTerminalShellIntegration(terminal, onDidStartTerminalShellExecution));
+
+		trackedEvents = [];
+		readIteratorsFlushed = [];
+		store.add(onDidStartTerminalShellExecution.event(async e => {
+			trackedEvents.push({
+				type: 'start',
+				commandLine: e.execution.commandLine.value,
+			});
+			const stream = e.execution.read();
+			const readIteratorsFlushedDeferred = new DeferredPromise<void>();
+			readIteratorsFlushed.push(readIteratorsFlushedDeferred.p);
+			for await (const data of stream) {
+				trackedEvents.push({
+					type: 'data',
+					commandLine: e.execution.commandLine.value,
+					data,
+				});
+			}
+			readIteratorsFlushedDeferred.complete();
+		}));
+		store.add(si.onDidRequestEndExecution(e => trackedEvents.push({
+			type: 'end',
+			commandLine: e.execution.commandLine.value,
+		})));
+	});
+
+	test('simple execution', async () => {
+		const execution = await startExecutionAwaitObject(testCommandLine);
+		deepStrictEqual(execution.commandLine.value, testCommandLine);
+		const execution2 = await endExecutionAwaitObject(testCommandLine);
+		strictEqual(execution2, execution);
+
+		assertTrackedEvents([
+			{ commandLine: testCommandLine, type: 'start' },
+			{ commandLine: testCommandLine, type: 'end' },
+		]);
+	});
+
+	test('different execution unexpectedly ended', async () => {
+		const execution1 = await startExecutionAwaitObject(testCommandLine);
+		const execution2 = await endExecutionAwaitObject(testCommandLine2);
+		strictEqual(execution1, execution2, 'when a different execution is ended, the one that started first should end');
+
+		assertTrackedEvents([
+			{ commandLine: testCommandLine, type: 'start' },
+			// This looks weird, but it's the same execution behind the scenes, just the command
+			// line was updated
+			{ commandLine: testCommandLine2, type: 'end' },
+		]);
+	});
+
+	test('no end event', async () => {
+		const execution1 = await startExecutionAwaitObject(testCommandLine);
+		const endedExecution = await new Promise<TerminalShellExecution>(r => {
+			store.add(si.onDidRequestEndExecution(e => r(e.execution)));
+			startExecutionAwaitObject(testCommandLine2);
+		});
+		strictEqual(execution1, endedExecution, 'when no end event is fired, the current execution should end');
+
+		// Clean up disposables
+		await endExecutionAwaitObject(testCommandLine2);
+		await Promise.all(readIteratorsFlushed);
+
+		assertTrackedEvents([
+			{ commandLine: testCommandLine, type: 'start' },
+			{ commandLine: testCommandLine, type: 'end' },
+			{ commandLine: testCommandLine2, type: 'start' },
+			{ commandLine: testCommandLine2, type: 'end' },
+		]);
+	});
+
+	suite('executeCommand', () => {
+		test('^C to clear previous command', async () => {
+			const commandLine = 'foo';
+			const apiRequestedExecution = si.requestNewShellExecution(cmdLine(commandLine), undefined);
+			const firstExecution = await startExecutionAwaitObject('^C');
+			notStrictEqual(firstExecution, apiRequestedExecution.value);
+			si.emitData('SIGINT');
+			si.endShellExecution(cmdLine('^C'), 0);
+			si.startShellExecution(cmdLine(commandLine), undefined);
+			await emitData('1');
+			await endExecutionAwaitObject(commandLine);
+			// IMPORTANT: We cannot reliably assert the order of data events here because flushing
+			// of the async iterator is asynchronous and could happen after the execution's end
+			// event fires if an execution is started immediately afterwards.
+			await Promise.all(readIteratorsFlushed);
+
+			assertNonDataTrackedEvents([
+				{ commandLine: '^C', type: 'start' },
+				{ commandLine: '^C', type: 'end' },
+				{ commandLine, type: 'start' },
+				{ commandLine, type: 'end' },
+			]);
+			assertDataTrackedEvents([
+				{ commandLine: '^C', type: 'data', data: 'SIGINT' },
+				{ commandLine, type: 'data', data: '1' },
+			]);
+		});
+
+		test('multi-line command line', async () => {
+			const commandLine = 'foo\nbar';
+			const apiRequestedExecution = si.requestNewShellExecution(cmdLine(commandLine), undefined);
+			const startedExecution = await startExecutionAwaitObject('foo');
+			strictEqual(startedExecution, apiRequestedExecution.value);
+
+			si.emitData('1');
+			si.emitData('2');
+			si.endShellExecution(cmdLine('foo'), 0);
+			si.startShellExecution(cmdLine('bar'), undefined);
+			si.emitData('3');
+			si.emitData('4');
+			const endedExecution = await endExecutionAwaitObject('bar');
+			strictEqual(startedExecution, endedExecution);
+
+			assertTrackedEvents([
+				{ commandLine, type: 'start' },
+				{ commandLine, type: 'data', data: '1' },
+				{ commandLine, type: 'data', data: '2' },
+				{ commandLine, type: 'data', data: '3' },
+				{ commandLine, type: 'data', data: '4' },
+				{ commandLine, type: 'end' },
+			]);
+		});
+	});
+});

From 484d16126bc7dd51b6f68f3a63ffd23d80e78aab Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 13 Mar 2025 07:42:21 -0700
Subject: [PATCH 0899/1815] Only light up .shellIntegration API if it has rich
 command detection

Part of #242897
---
 .../common/extensionsApiProposals.ts          |  3 ---
 .../mainThreadTerminalShellIntegration.ts     | 20 ++++---------------
 .../workbench/api/common/extHost.protocol.ts  |  1 -
 .../common/extHostTerminalShellIntegration.ts | 18 -----------------
 ...proposed.terminalShellIntegrationRich.d.ts | 20 -------------------
 5 files changed, 4 insertions(+), 58 deletions(-)
 delete mode 100644 src/vscode-dts/vscode.proposed.terminalShellIntegrationRich.d.ts

diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index 7eebcbb224b6..7b91bd3f0c38 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -361,9 +361,6 @@ const _allApiProposals = {
 	terminalShellEnv: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts',
 	},
-	terminalShellIntegrationRich: {
-		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellIntegrationRich.d.ts',
-	},
 	terminalShellType: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellType.d.ts',
 	},
diff --git a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
index 20caecec3b5e..aa0fd7d8b17c 100644
--- a/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/browser/mainThreadTerminalShellIntegration.ts
@@ -36,9 +36,8 @@ export class MainThreadTerminalShellIntegration extends Disposable implements Ma
 		// onDidChangeTerminalShellIntegration initial state
 		for (const terminal of this._terminalService.instances) {
 			const cmdDetection = terminal.capabilities.get(TerminalCapability.CommandDetection);
-			if (cmdDetection) {
+			if (cmdDetection?.hasRichCommandDetection) {
 				this._proxy.$shellIntegrationChange(terminal.instanceId);
-				this._proxy.$setHasRichCommandDetection(terminal.instanceId, !!cmdDetection?.hasRichCommandDetection);
 			}
 			const cwdDetection = terminal.capabilities.get(TerminalCapability.CwdDetection);
 			if (cwdDetection) {
@@ -46,22 +45,11 @@ export class MainThreadTerminalShellIntegration extends Disposable implements Ma
 			}
 		}
 
-		// onDidChangeTerminalShellIntegration via command detection
-		const onDidAddCommandDetection = this._store.add(this._terminalService.createOnInstanceEvent(instance => {
-			return Event.map(
-				Event.filter(instance.capabilities.onDidAddCapabilityType, e => {
-					return (e === TerminalCapability.CwdDetection || e === TerminalCapability.CommandDetection);
-				}),
-				() => instance
-			);
-		})).event;
-		this._store.add(onDidAddCommandDetection(e => this._proxy.$shellIntegrationChange(e.instanceId)));
-
 		// onDidChangeTerminalShellIntegration via rich command detection
 		const onDidSetRichCommandDetection = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CommandDetection, e => e.onSetRichCommandDetection));
-		onDidSetRichCommandDetection.event(e => {
-			this._proxy.$setHasRichCommandDetection(e.instance.instanceId, e.data);
-		});
+		this._store.add(onDidSetRichCommandDetection.event(e => {
+			this._proxy.$shellIntegrationChange(e.instance.instanceId);
+		}));
 
 		// onDidChangeTerminalShellIntegration via cwd
 		const cwdChangeEvent = this._store.add(this._terminalService.createOnInstanceCapabilityEvent(TerminalCapability.CwdDetection, e => e.onDidChangeCwd));
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 75e9a78f132f..ce5c136d2de8 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -2525,7 +2525,6 @@ export interface ExtHostTerminalShellIntegrationShape {
 	$shellExecutionData(instanceId: number, data: string): void;
 	$shellEnvChange(instanceId: number, shellEnvKeys: string[], shellEnvValues: string[], isTrusted: boolean): void;
 	$cwdChange(instanceId: number, cwd: UriComponents | undefined): void;
-	$setHasRichCommandDetection(instanceId: number, value: boolean): void;
 	$closeTerminal(instanceId: number): void;
 }
 
diff --git a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
index 6314229802a9..dfcaba30c534 100644
--- a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
@@ -143,10 +143,6 @@ export class ExtHostTerminalShellIntegration extends Disposable implements IExtH
 		this._activeShellIntegrations.get(instanceId)?.dispose();
 		this._activeShellIntegrations.delete(instanceId);
 	}
-
-	public $setHasRichCommandDetection(instanceId: number, value: boolean): void {
-		this._activeShellIntegrations.get(instanceId)?.setHasRichCommandDetection(value);
-	}
 }
 
 interface IExecutionProperties {
@@ -165,7 +161,6 @@ export class InternalTerminalShellIntegration extends Disposable {
 
 	private _env: vscode.TerminalShellIntegrationEnvironment | undefined;
 	private _cwd: URI | undefined;
-	private _hasRichCommandDetection: boolean = false;
 
 	readonly store: DisposableStore = this._register(new DisposableStore());
 
@@ -200,9 +195,6 @@ export class InternalTerminalShellIntegration extends Disposable {
 					value: Object.freeze({ ...that._env.value })
 				});
 			},
-			get hasRichCommandDetection(): boolean {
-				return that._hasRichCommandDetection;
-			},
 			// executeCommand(commandLine: string): vscode.TerminalShellExecution;
 			// executeCommand(executable: string, args: string[]): vscode.TerminalShellExecution;
 			executeCommand(commandLineOrExecutable: string, args?: string[]): vscode.TerminalShellExecution {
@@ -264,9 +256,6 @@ export class InternalTerminalShellIntegration extends Disposable {
 					return;
 				}
 			}
-			if (this._hasRichCommandDetection) {
-				console.warn('Rich command detection is enabled but an execution started before the last ended');
-			}
 			this._currentExecution.endExecution(undefined);
 			this._currentExecution.flush();
 			this._onDidRequestEndExecution.fire({ terminal: this._terminal, shellIntegration: this.value, execution: this._currentExecution.value, exitCode: undefined });
@@ -345,13 +334,6 @@ export class InternalTerminalShellIntegration extends Disposable {
 		}
 	}
 
-	setHasRichCommandDetection(value: boolean): void {
-		if (this._hasRichCommandDetection !== value) {
-			this._hasRichCommandDetection = value;
-			this._fireChangeEvent();
-		}
-	}
-
 	setEnv(keys: string[], values: string[], isTrusted: boolean): void {
 		const env: { [key: string]: string | undefined } = {};
 		for (let i = 0; i < keys.length; i++) {
diff --git a/src/vscode-dts/vscode.proposed.terminalShellIntegrationRich.d.ts b/src/vscode-dts/vscode.proposed.terminalShellIntegrationRich.d.ts
deleted file mode 100644
index e1d3a4ce5a49..000000000000
--- a/src/vscode-dts/vscode.proposed.terminalShellIntegrationRich.d.ts
+++ /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.
- *--------------------------------------------------------------------------------------------*/
-
-declare module 'vscode' {
-	// @tyriar https://github.com/microsoft/vscode/issues/227467
-
-	export interface TerminalShellIntegration {
-		/**
-		 * Whether this shell supports rich command detection. This means that the shell has
-		 * declared that it will report the required shell integation sequences in the exact order
-		 * they're expected, so {@link TerminalShellExecutionCommandLine.value} should always be set
-		 * and {@link TerminalShellExecutionCommandLine.confidence} should always be
-		 * {@link TerminalShellExecutionCommandLineConfidence.High} at the time
-		 * {@link onDidStartTerminalShellExecution} fires.
-		 */
-		readonly hasRichCommandDetection: boolean;
-	}
-}

From 92815973e191ef9e7712191196843ea15b7fcdb8 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Thu, 13 Mar 2025 16:55:18 +0100
Subject: [PATCH 0900/1815] remoteIndicator: Debt - prepare for property
 initialisation order changes (#243463)

---
 build/lib/propertyInitOrderChecker.js         |  1 -
 build/lib/propertyInitOrderChecker.ts         |  1 -
 .../contrib/remote/browser/remoteIndicator.ts | 21 ++++++++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/build/lib/propertyInitOrderChecker.js b/build/lib/propertyInitOrderChecker.js
index 4c5b735d8a73..dbca887bc227 100644
--- a/build/lib/propertyInitOrderChecker.js
+++ b/build/lib/propertyInitOrderChecker.js
@@ -152,7 +152,6 @@ const ignored = new Set([
     'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts',
     'vs/workbench/contrib/output/browser/outputServices.ts',
     'vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts',
-    'vs/workbench/contrib/remote/browser/remoteIndicator.ts',
     'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts',
     'vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts',
     'vs/workbench/contrib/accessibilitySignals/browser/editorTextPropertySignalsContribution.ts',
diff --git a/build/lib/propertyInitOrderChecker.ts b/build/lib/propertyInitOrderChecker.ts
index 5b1582552125..dc18213566f5 100644
--- a/build/lib/propertyInitOrderChecker.ts
+++ b/build/lib/propertyInitOrderChecker.ts
@@ -121,7 +121,6 @@ const ignored = new Set([
 	'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts',
 	'vs/workbench/contrib/output/browser/outputServices.ts',
 	'vs/workbench/contrib/terminalContrib/typeAhead/browser/terminalTypeAheadAddon.ts',
-	'vs/workbench/contrib/remote/browser/remoteIndicator.ts',
 	'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.ts',
 	'vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts',
 	'vs/workbench/contrib/accessibilitySignals/browser/editorTextPropertySignalsContribution.ts',
diff --git a/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts b/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts
index d8f7af344b47..a3cab6f679ad 100644
--- a/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts
+++ b/src/vs/workbench/contrib/remote/browser/remoteIndicator.ts
@@ -8,11 +8,11 @@ import { IRemoteAgentService, remoteConnectionLatencyMeasurer } from '../../../s
 import { RunOnceScheduler, retry } from '../../../../base/common/async.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { MenuId, IMenuService, MenuItemAction, MenuRegistry, registerAction2, Action2, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { MenuId, IMenuService, MenuItemAction, MenuRegistry, registerAction2, Action2, SubmenuItemAction, IMenu } from '../../../../platform/actions/common/actions.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { StatusbarAlignment, IStatusbarService, IStatusbarEntryAccessor, IStatusbarEntry } from '../../../services/statusbar/browser/statusbar.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
-import { ContextKeyExpr, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
@@ -82,18 +82,16 @@ export class RemoteStatusIndicator extends Disposable implements IWorkbenchContr
 
 	private remoteStatusEntry: IStatusbarEntryAccessor | undefined;
 
-	private readonly legacyIndicatorMenu = this._register(this.menuService.createMenu(MenuId.StatusBarWindowIndicatorMenu, this.contextKeyService)); // to be removed once migration completed
-	private readonly remoteIndicatorMenu = this._register(this.menuService.createMenu(MenuId.StatusBarRemoteIndicatorMenu, this.contextKeyService));
+	private readonly legacyIndicatorMenu: IMenu; // to be removed once migration completed
+	private readonly remoteIndicatorMenu: IMenu;
 
 	private remoteMenuActionsGroups: ActionGroup[] | undefined;
 
-	private readonly remoteAuthority = this.environmentService.remoteAuthority;
-
 	private virtualWorkspaceLocation: { scheme: string; authority: string } | undefined = undefined;
 
 	private connectionState: 'initializing' | 'connected' | 'reconnecting' | 'disconnected' | undefined = undefined;
 	private connectionToken: string | undefined = undefined;
-	private readonly connectionStateContextKey = new RawContextKey<'' | 'initializing' | 'disconnected' | 'connected'>('remoteConnectionState', '').bindTo(this.contextKeyService);
+	private readonly connectionStateContextKey: IContextKey<'' | 'initializing' | 'disconnected' | 'connected'>;
 
 	private networkState: 'online' | 'offline' | 'high-latency' | undefined = undefined;
 	private measureNetworkConnectionLatencyScheduler: RunOnceScheduler | undefined = undefined;
@@ -125,6 +123,10 @@ export class RemoteStatusIndicator extends Disposable implements IWorkbenchContr
 		return this._remoteExtensionMetadata;
 	}
 
+	private get remoteAuthority(): string | undefined {
+		return this.environmentService.remoteAuthority;
+	}
+
 	private remoteMetadataInitialized: boolean = false;
 	private readonly _onDidChangeEntries = this._register(new Emitter<void>());
 	private readonly onDidChangeEntries: Event<void> = this._onDidChangeEntries.event;
@@ -152,6 +154,11 @@ export class RemoteStatusIndicator extends Disposable implements IWorkbenchContr
 	) {
 		super();
 
+		this.legacyIndicatorMenu = this._register(this.menuService.createMenu(MenuId.StatusBarWindowIndicatorMenu, this.contextKeyService)); // to be removed once migration completed
+		this.remoteIndicatorMenu = this._register(this.menuService.createMenu(MenuId.StatusBarRemoteIndicatorMenu, this.contextKeyService));
+
+		this.connectionStateContextKey = new RawContextKey<'' | 'initializing' | 'disconnected' | 'connected'>('remoteConnectionState', '').bindTo(this.contextKeyService);
+
 		// Set initial connection state
 		if (this.remoteAuthority) {
 			this.connectionState = 'initializing';

From 00d7e7b228a52d52b1ad7badeb9132480dc0db77 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Thu, 13 Mar 2025 17:57:32 +0100
Subject: [PATCH 0901/1815] wip up `McpConfigurationProvider` api

This allows to dynamically compute the well-known mcp configuration object so that config can be made simpler
---
 .../common/extensionsApiProposals.ts          |  3 +
 .../workbench/api/common/extHost.api.impl.ts  |  5 ++
 src/vs/workbench/api/common/extHostMcp.ts     | 61 ++++++++++++++++++-
 .../contrib/mcp/browser/mcpCommands.ts        |  1 +
 ...ode.proposed.mcpConfigurationProvider.d.ts | 33 ++++++++++
 5 files changed, 100 insertions(+), 3 deletions(-)
 create mode 100644 src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts

diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index 7eebcbb224b6..13471ee1b99b 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -235,6 +235,9 @@ const _allApiProposals = {
 	mappedEditsProvider: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts',
 	},
+	mcpConfigurationProvider: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts',
+	},
 	multiDocumentHighlightProvider: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.multiDocumentHighlightProvider.d.ts',
 	},
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index e8fa70f081f4..bc5d4a605a6d 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -146,6 +146,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	const extHostManagedSockets = accessor.get(IExtHostManagedSockets);
 	const extHostAuthentication = accessor.get(IExtHostAuthentication);
 	const extHostLanguageModels = accessor.get(IExtHostLanguageModels);
+	const extHostMcp = accessor.get(IExtHostMpcService);
 
 	// register addressable instances
 	rpcProtocol.set(ExtHostContext.ExtHostFileSystemInfo, extHostFileSystemInfo);
@@ -1514,6 +1515,10 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			},
 			registerIgnoredFileProvider(provider: vscode.LanguageModelIgnoredFileProvider) {
 				return extHostLanguageModels.registerIgnoredFileProvider(extension, provider);
+			},
+			registerMcpConfigurationProvider(provider, metadata) {
+				checkProposedApiEnabled(extension, 'mcpConfigurationProvider');
+				return extHostMcp.registerMcpConfigurationProvider(extension, provider, metadata);
 			}
 		};
 
diff --git a/src/vs/workbench/api/common/extHostMcp.ts b/src/vs/workbench/api/common/extHostMcp.ts
index da65186caea0..6347960d87ab 100644
--- a/src/vs/workbench/api/common/extHostMcp.ts
+++ b/src/vs/workbench/api/common/extHostMcp.ts
@@ -3,15 +3,21 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as vscode from 'vscode';
+import { DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
-import { McpServerLaunch } from '../../contrib/mcp/common/mcpTypes.js';
+import { McpCollectionDefinition, McpServerDefinition, McpServerLaunch, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
 import { ExtHostMcpShape, MainContext, MainThreadMcpShape } from './extHost.protocol.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
-
+import { StorageScope } from '../../../platform/storage/common/storage.js';
+import { CancellationToken } from '../../../base/common/cancellation.js';
 
 export const IExtHostMpcService = createDecorator<IExtHostMpcService>('IExtHostMpcService');
 
-export interface IExtHostMpcService extends ExtHostMcpShape { }
+export interface IExtHostMpcService extends ExtHostMcpShape {
+	registerMcpConfigurationProvider(extension: IExtensionDescription, provider: vscode.McpConfigurationProvider, metadata?: { label: string }): IDisposable;
+}
 
 export class ExtHostMcpService implements IExtHostMpcService {
 	protected _proxy: MainThreadMcpShape;
@@ -34,4 +40,53 @@ export class ExtHostMcpService implements IExtHostMpcService {
 	$sendMessage(id: number, message: string): void {
 		// no-op
 	}
+
+	registerMcpConfigurationProvider(extension: IExtensionDescription, provider: vscode.McpConfigurationProvider, metadata?: { label: string }): IDisposable {
+		const store = new DisposableStore();
+
+		const mcp: McpCollectionDefinition.FromExtHost = {
+			id: ExtensionIdentifier.toKey(extension.identifier),
+			isTrustedByDefault: true,
+			label: metadata?.label ?? extension.displayName ?? extension.name,
+			scope: StorageScope.WORKSPACE
+		};
+		const update = async () => {
+
+			const list = await provider.provideMcpServerDefinitions(CancellationToken.None);
+
+			if (!list) {
+				this._proxy.$deleteMcpCollection(mcp.id);
+			} else {
+
+				const arr: McpServerDefinition[] = [];
+				for (const item of list) {
+					arr.push({
+						id: ExtensionIdentifier.toKey(extension.identifier),
+						label: item.label,
+						launch: {
+							type: McpServerTransportType.Stdio,
+							cwd: item.cwd,
+							args: item.args,
+							command: item.command,
+							env: item.env
+						}
+					});
+				}
+
+				this._proxy.$upsertMcpCollection(mcp, arr);
+			}
+		};
+
+		store.add(toDisposable(() => {
+			this._proxy.$deleteMcpCollection(mcp.id);
+		}));
+
+		if (provider.onDidChange) {
+			store.add(provider.onDidChange(update));
+		}
+
+		setTimeout(update, 0);
+
+		return store;
+	}
 }
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index db249716c313..eecb71bf64b1 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -241,6 +241,7 @@ export class AttachMCPToolsAction extends Action2 {
 				server,
 				type: 'item',
 				label: `${server.definition.label}`,
+				description: server.collection.label,
 				picked: tools.some(tool => tool.enabled.get()),
 				toolPicks: []
 			};
diff --git a/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts b/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts
new file mode 100644
index 000000000000..42d59a6cb296
--- /dev/null
+++ b/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts
@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+declare module 'vscode' {
+
+	// TODO@API make this a class
+	export interface McpStdioServerDefinition {
+
+		label: string;
+
+		cwd?: Uri;
+		command: string;
+		args: readonly string[];
+		env: Record<string, string | number | null>;
+
+		// constructor(label: string, command: string, args: string[], env: { [key: string]: string });
+	}
+
+	export type McpServerDefinition = McpStdioServerDefinition;
+
+	export interface McpConfigurationProvider {
+
+		onDidChange?: Event<void>;
+
+		provideMcpServerDefinitions(token: CancellationToken): ProviderResult<McpServerDefinition[]>;
+
+	}
+
+	namespace lm {
+		export function registerMcpConfigurationProvider(provider: McpConfigurationProvider, metadata?: { label: string }): Disposable;
+	}
+}

From ccca5fd4b5a945dd74c370516f86cd4beb99a5b5 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Thu, 13 Mar 2025 18:04:20 +0100
Subject: [PATCH 0902/1815] also support SSE config

---
 src/vs/workbench/api/common/extHostMcp.ts     | 33 +++++++++++--------
 ...ode.proposed.mcpConfigurationProvider.d.ts | 11 ++++++-
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/vs/workbench/api/common/extHostMcp.ts b/src/vs/workbench/api/common/extHostMcp.ts
index 6347960d87ab..493fd86abb9d 100644
--- a/src/vs/workbench/api/common/extHostMcp.ts
+++ b/src/vs/workbench/api/common/extHostMcp.ts
@@ -54,27 +54,32 @@ export class ExtHostMcpService implements IExtHostMpcService {
 
 			const list = await provider.provideMcpServerDefinitions(CancellationToken.None);
 
-			if (!list) {
-				this._proxy.$deleteMcpCollection(mcp.id);
-			} else {
-
-				const arr: McpServerDefinition[] = [];
-				for (const item of list) {
-					arr.push({
-						id: ExtensionIdentifier.toKey(extension.identifier),
-						label: item.label,
-						launch: {
+			function isSSEConfig(candidate: vscode.McpServerDefinition): candidate is vscode.McpSSEServerDefinition {
+				return typeof (candidate as vscode.McpSSEServerDefinition).url === 'string';
+			}
+
+			const servers: McpServerDefinition[] = [];
+
+			for (const item of list ?? []) {
+				servers.push({
+					id: ExtensionIdentifier.toKey(extension.identifier),
+					label: item.label,
+					launch: isSSEConfig(item)
+						? {
+							type: McpServerTransportType.SSE,
+							url: item.url
+						}
+						: {
 							type: McpServerTransportType.Stdio,
 							cwd: item.cwd,
 							args: item.args,
 							command: item.command,
 							env: item.env
 						}
-					});
-				}
-
-				this._proxy.$upsertMcpCollection(mcp, arr);
+				});
 			}
+
+			this._proxy.$upsertMcpCollection(mcp, servers);
 		};
 
 		store.add(toDisposable(() => {
diff --git a/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts b/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts
index 42d59a6cb296..2e3425da2d19 100644
--- a/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts
@@ -17,7 +17,16 @@ declare module 'vscode' {
 		// constructor(label: string, command: string, args: string[], env: { [key: string]: string });
 	}
 
-	export type McpServerDefinition = McpStdioServerDefinition;
+	export interface McpSSEServerDefinition {
+
+		label: string;
+
+		url: string;
+
+		// constructor(label: string, url:string);
+	}
+
+	export type McpServerDefinition = McpStdioServerDefinition | McpSSEServerDefinition;
 
 	export interface McpConfigurationProvider {
 

From 2c7fff35cfe6d1aeeadc1ddce702bbc56349abd7 Mon Sep 17 00:00:00 2001
From: Josh Spicer <23246594+joshspicer@users.noreply.github.com>
Date: Thu, 13 Mar 2025 10:22:02 -0700
Subject: [PATCH 0903/1815] Add `remote.defaultExtensions` (#243400)

* add remote.defaultExtensions

* some nice suggestions
---
 src/vs/platform/remote/common/remote.ts       |  6 ++
 .../extensions.contribution.ts                |  4 +-
 .../electron-sandbox/remoteExtensionsInit.ts  | 64 ++++++++++++++++++-
 .../remote/common/remote.contribution.ts      | 19 +++++-
 4 files changed, 88 insertions(+), 5 deletions(-)
 create mode 100644 src/vs/platform/remote/common/remote.ts

diff --git a/src/vs/platform/remote/common/remote.ts b/src/vs/platform/remote/common/remote.ts
new file mode 100644
index 000000000000..a2d098fa8d1e
--- /dev/null
+++ b/src/vs/platform/remote/common/remote.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.
+ *--------------------------------------------------------------------------------------------*/
+
+export const REMOTE_DEFAULT_EXTENSIONS = 'remote.defaultExtensions';
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts
index d7ab04b698f4..e78c2df7839d 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts
@@ -23,7 +23,7 @@ import { DebugExtensionHostAction, DebugExtensionsContribution } from './debugEx
 import { ExtensionHostProfileService } from './extensionProfileService.js';
 import { CleanUpExtensionsFolderAction, OpenExtensionsFolderAction } from './extensionsActions.js';
 import { ExtensionsAutoProfiler } from './extensionsAutoProfiler.js';
-import { InstallFailedRemoteExtensionsContribution, RemoteExtensionsInitializerContribution } from './remoteExtensionsInit.js';
+import { InstallRemoteExtensionsContribution, RemoteExtensionsInitializerContribution } from './remoteExtensionsInit.js';
 import { IExtensionHostProfileService, OpenExtensionHostProfileACtion, RuntimeExtensionsEditor, SaveExtensionHostProfileAction, StartExtensionHostProfileAction, StopExtensionHostProfileAction } from './runtimeExtensionsEditor.js';
 
 // Singletons
@@ -71,7 +71,7 @@ const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(Workbench
 workbenchRegistry.registerWorkbenchContribution(ExtensionsContributions, LifecyclePhase.Restored);
 workbenchRegistry.registerWorkbenchContribution(ExtensionsAutoProfiler, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(RemoteExtensionsInitializerContribution, LifecyclePhase.Restored);
-workbenchRegistry.registerWorkbenchContribution(InstallFailedRemoteExtensionsContribution, LifecyclePhase.Restored);
+workbenchRegistry.registerWorkbenchContribution(InstallRemoteExtensionsContribution, LifecyclePhase.Restored);
 workbenchRegistry.registerWorkbenchContribution(DebugExtensionsContribution, LifecyclePhase.Restored);
 
 // Register Commands
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
index 9bdf631a0bc5..3895b7686946 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
 import { EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT, IExtensionGalleryService, IExtensionManagementService, InstallExtensionInfo } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
@@ -11,6 +12,8 @@ import { IFileService } from '../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
+import { REMOTE_DEFAULT_EXTENSIONS } from '../../../../platform/remote/common/remote.js';
 import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
 import { IRemoteExtensionsScannerService } from '../../../../platform/remote/common/remoteExtensionsScanner.js';
 import { IStorageService, IS_NEW_KEY, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
@@ -26,17 +29,74 @@ import { IExtensionManagementServerService } from '../../../services/extensionMa
 import { IExtensionManifestPropertiesService } from '../../../services/extensions/common/extensionManifestPropertiesService.js';
 import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
 
-export class InstallFailedRemoteExtensionsContribution implements IWorkbenchContribution {
+export class InstallRemoteExtensionsContribution implements IWorkbenchContribution {
 	constructor(
 		@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
 		@IRemoteExtensionsScannerService private readonly remoteExtensionsScannerService: IRemoteExtensionsScannerService,
 		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
 		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
-		@ILogService private readonly logService: ILogService
+		@ILogService private readonly logService: ILogService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IProductService private readonly productService: IProductService,
 	) {
+		this.installDefaultRemoteExtensions();
 		this.installFailedRemoteExtensions();
 	}
 
+	private async installDefaultRemoteExtensions(): Promise<void> {
+		if (!this.remoteAgentService.getConnection()) {
+			return;
+		}
+
+		if (!this.extensionManagementServerService.remoteExtensionManagementServer) {
+			this.logService.error('No remote extension management server available');
+			return;
+		}
+
+		const settingValue = this.configurationService.getValue<string[]>(REMOTE_DEFAULT_EXTENSIONS);
+		if (!settingValue?.length) {
+			return;
+		}
+
+		this.logService.info(`Installing '${settingValue.length}' default remote extensions`);
+
+		const preferPrerelease = this.productService.quality !== 'stable';
+		const galleryExtensions = await this.extensionGalleryService.getExtensions(settingValue.map((id) => ({ id })), CancellationToken.None);
+		const alreadyInstalledExtensions = await this.extensionManagementServerService.remoteExtensionManagementServer.extensionManagementService.getInstalled();
+
+		const prereleaseExtensionInfo: InstallExtensionInfo[] = [];
+		const extensionInfo: InstallExtensionInfo[] = [];
+		for (const id of settingValue) {
+			const alreadyInstalled = alreadyInstalledExtensions.some(e => areSameExtensions(e.identifier, { id }));
+			if (alreadyInstalled) {
+				this.logService.trace(`Default remote extension '${id}' is already installed`);
+				continue;
+			}
+
+			const extension = galleryExtensions.find(e => areSameExtensions(e.identifier, { id }));
+			if (!extension) {
+				this.logService.warn(`Default remote extension '${id}' is not found`);
+				continue;
+			}
+
+			const installPreReleaseVersion = preferPrerelease && extension.hasPreReleaseVersion;
+			(installPreReleaseVersion ? prereleaseExtensionInfo : extensionInfo).push({
+				extension, options: { installPreReleaseVersion },
+			});
+		}
+
+		// Install pre-release extensions first to avoid a situation where:
+		// An extension without a pre-release (A) is installed first and depends on an extension that has a pre-release version (B)
+		// If this happens, the extension A may result in the installation of the stable version of B
+		// A real life example of this is GitHub.copilot and GitHub.copilot-chat
+		if (prereleaseExtensionInfo.length) {
+			await Promise.allSettled(prereleaseExtensionInfo.map(e => this.extensionManagementServerService.remoteExtensionManagementServer!.extensionManagementService.installFromGallery(e.extension, e.options)));
+		}
+		if (extensionInfo.length) {
+			await Promise.allSettled(extensionInfo.map(e => this.extensionManagementServerService.remoteExtensionManagementServer!.extensionManagementService.installFromGallery(e.extension, e.options)));
+		}
+	}
+
 	private async installFailedRemoteExtensions(): Promise<void> {
 		if (!this.remoteAgentService.getConnection()) {
 			return;
diff --git a/src/vs/workbench/contrib/remote/common/remote.contribution.ts b/src/vs/workbench/contrib/remote/common/remote.contribution.ts
index f7c3020d89a8..a278220924f4 100644
--- a/src/vs/workbench/contrib/remote/common/remote.contribution.ts
+++ b/src/vs/workbench/contrib/remote/common/remote.contribution.ts
@@ -26,6 +26,10 @@ import { PersistentConnection } from '../../../../platform/remote/common/remoteA
 import { IDownloadService } from '../../../../platform/download/common/download.js';
 import { DownloadServiceChannel } from '../../../../platform/download/common/downloadIpc.js';
 import { RemoteLoggerChannelClient } from '../../../../platform/log/common/logIpc.js';
+import { REMOTE_DEFAULT_EXTENSIONS } from '../../../../platform/remote/common/remote.js';
+
+
+const EXTENSION_IDENTIFIER_PATTERN = '([a-z0-9A-Z][a-z0-9-A-Z]*)\\.([a-z0-9A-Z][a-z0-9-A-Z]*)$';
 
 export class LabelContribution implements IWorkbenchContribution {
 
@@ -205,7 +209,7 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 				type: 'object',
 				markdownDescription: localize('remote.extensionKind', "Override the kind of an extension. `ui` extensions are installed and run on the local machine while `workspace` extensions are run on the remote. By overriding an extension's default kind using this setting, you specify if that extension should be installed and enabled locally or remotely."),
 				patternProperties: {
-					'([a-z0-9A-Z][a-z0-9-A-Z]*)\\.([a-z0-9A-Z][a-z0-9-A-Z]*)$': {
+					[EXTENSION_IDENTIFIER_PATTERN]: {
 						oneOf: [{ type: 'array', items: extensionKindSchema }, extensionKindSchema],
 						default: ['ui'],
 					},
@@ -355,6 +359,19 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 				enum: ['localhost', 'allInterfaces'],
 				default: 'localhost',
 				description: localize('remote.localPortHost', "Specifies the local host name that will be used for port forwarding.")
+			},
+			[REMOTE_DEFAULT_EXTENSIONS]: {
+				type: 'array',
+				markdownDescription: localize('remote.defaultExtensions.markdownDescription', 'List of extensions to install automatically on all remotes.'),
+				default: [
+					'GitHub.copilot',
+					'GitHub.copilot-chat'
+				],
+				items: {
+					type: 'string',
+					pattern: EXTENSION_IDENTIFIER_PATTERN,
+					patternErrorMessage: localize('remote.defaultExtensions.invalidFormat', 'Extension identifier must be in format "publisher.name".')
+				},
 			}
 		}
 	});

From cc9c0a9c8dfcd187b2b7a91ad3faa8c17487eea0 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 13 Mar 2025 18:38:00 +0100
Subject: [PATCH 0904/1815] show "Select Tools" only for agent mode, swap
 position with "add context" (#243474)

---
 .../chat/browser/actions/chatContextActions.ts        |  6 ++++--
 src/vs/workbench/contrib/mcp/browser/mcpCommands.ts   | 11 +++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index af7a0f3b1368..3cc3f4270057 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -515,7 +515,8 @@ export class AttachContextAction extends Action2 {
 			{
 				when: ChatContextKeyExprs.inNonUnifiedPanel,
 				id: MenuId.ChatInputAttachmentToolbar,
-				group: 'navigation'
+				group: 'navigation',
+				order: 2
 			}
 		]
 	}) {
@@ -1027,7 +1028,8 @@ registerAction2(class AttachFilesAction extends AttachContextAction {
 			menu: {
 				when: ChatContextKeyExprs.inEditsOrUnified,
 				id: MenuId.ChatInputAttachmentToolbar,
-				group: 'navigation'
+				group: 'navigation',
+				order: 3
 			},
 			icon: Codicon.attach,
 			precondition: ChatContextKeyExprs.inEditsOrUnified,
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index db249716c313..8e1d520a65a2 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -184,20 +184,19 @@ export class AttachMCPToolsAction extends Action2 {
 			category: CHAT_CATEGORY,
 			precondition: ContextKeyExpr.and(
 				McpContextKeys.toolsCount.greater(0),
-				ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat),
-				ChatContextKeys.Editing.hasToolsAgent
+				ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent)
 			),
 			menu: {
 				when: ContextKeyExpr.and(
 					McpContextKeys.toolsCount.greater(0),
-					ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat),
-					ChatContextKeys.Editing.hasToolsAgent
+					ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent)
 				),
 				id: MenuId.ChatInputAttachmentToolbar,
-				group: 'navigation'
+				group: 'navigation',
+				order: 1
 			},
 			keybinding: {
-				when: ContextKeyExpr.and(ChatContextKeys.inChatInput, ChatContextKeys.chatMode.notEqualsTo(ChatMode.Chat)),
+				when: ContextKeyExpr.and(ChatContextKeys.inChatInput, ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent)),
 				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Slash,
 				weight: KeybindingWeight.EditorContrib
 			}

From 0d95f428752dfcd7c37b093f64763635f82cef26 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Thu, 13 Mar 2025 10:38:51 -0700
Subject: [PATCH 0905/1815] Exclude setup files from BinSkim (take 2) (#243475)

---
 build/azure-pipelines/product-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index c3e1342359ab..ff4f0db5679a 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -170,7 +170,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|**/VSCodeSetup*.exe'
+        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:

From 80f37c0e828bbc5e1a85b1e003cbdf6613cb26fe Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Thu, 13 Mar 2025 11:28:00 -0700
Subject: [PATCH 0906/1815] chat: fixed leaked disposable in marker quick input
 (#243481)

Fixes #243451
---
 .../chat/browser/contrib/chatDynamicVariables.ts      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
index 96c04a3fbba8..67848145eb8f 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
@@ -742,23 +742,24 @@ export async function createMarkersQuickPick(accessor: ServicesAccessor, level:
 	items.unshift({ type: 'item', label: localize('markers.panel.allErrors', 'All Problems'), entry: { filterSeverity: MarkerSeverity.Info } });
 
 	const quickInputService = accessor.get(IQuickInputService);
-	const quickPick = quickInputService.createQuickPick<MarkerPickItem>({ useSeparators: true });
+	const store = new DisposableStore();
+	const quickPick = store.add(quickInputService.createQuickPick<MarkerPickItem>({ useSeparators: true }));
 	quickPick.canAcceptInBackground = !onBackgroundAccept;
 	quickPick.placeholder = localize('pickAProblem', 'Pick a problem to attach...');
 	quickPick.items = items;
 
 	return new Promise<IDiagnosticVariableEntryFilterData | undefined>(resolve => {
-		quickPick.onDidHide(() => resolve(undefined));
-		quickPick.onDidAccept(ev => {
+		store.add(quickPick.onDidHide(() => resolve(undefined)));
+		store.add(quickPick.onDidAccept(ev => {
 			if (ev.inBackground) {
 				onBackgroundAccept?.(quickPick.selectedItems.map(i => i.entry));
 			} else {
 				resolve(quickPick.selectedItems[0]?.entry);
 				quickPick.dispose();
 			}
-		});
+		}));
 		quickPick.show();
-	}).finally(() => quickPick.dispose());
+	}).finally(() => store.dispose());
 }
 
 export class SelectAndInsertProblemAction extends Action2 {

From 43b1e930a24b456ad91ab1c6bca577857d0ae392 Mon Sep 17 00:00:00 2001
From: Lee Murray <mrleemurray@gmail.com>
Date: Thu, 13 Mar 2025 18:52:19 +0000
Subject: [PATCH 0907/1815] Update codicon font file to latest version with
 updated thumbs up and down styles (#243476)

Update codicon font file to latest version with updated thumbs up and down icons

Co-authored-by: lemurra_microsoft <Lee.Murray@microsoft.com>
---
 .../browser/ui/codicons/codicon/codicon.ttf   | Bin 84152 -> 84220 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf
index f38ab6d17c03ac7f5f88e450e177611791f0274f..872f328858f8a9c872b36ff0130e2a0b39b6788b 100644
GIT binary patch
delta 744
zcmaKp&yNdH9Khduee>RQ=4CqF{?JxCn66Q2HPT;m*lcZFI5aNeW+!Ar9E25gT5V^x
zB2I`VI3PG|LJ%Sn_OLEaB>Vy5;EHS_A=&JKjW_Kst%K8hhnMf?^FH5&p766LT%BUC
zv@iPs$jk$X5B6#${8az8uXjNo+W`Q8E3+q0pLy~4;V}U7E4_uC_}1nR*PkuTY&&rK
z>~cL<zi5x!mVLr@>?`&id$mz*IE^<=rRg*uG?&k{Td~&O*3H(tw%E4X_u5Mx)^R$o
z9qd?+<19L#-QDh?x$(Jc-AeaK_xt($^ZCr%uP)+b0243){2&d$)^f?n!bq`Dp&Fck
zlxT?GcfpETPU|E9Npu5@t1Ovh>Z+jnr$mHVP$Ci%CAGoAIE4_oYccgkFf7uXKctA1
z#FB|e3bVv9%2B>QJPj1Vqzgc3Fjzw)I8L2}B_jZJgVVW_cUHMlgitd~vann%L?gfM
zv#?J?NFGrM#J4b2J?fVgBtwF0lI%+%i8MB<GXhQ~u>j+Jp8(CdYl@k4Q0CenV?oKp
zRP|32S~qfsv2coDZaiE`2f&PkqZ808V&-8Mnw2~ne1dxAJm1j&8(m&c<o?@eB+(|Y
z9aK3kJw)K36!h?Y5C_w;QQ=wAx?xg<+myLLA?mG)zlqWxLpvITVSl5&-^2TOMLw+s
h8g90j9gWj(rihm;EX)c=rio}9x%FNzk4Ipw_#2wAhK&FK

delta 676
zcmew}k#)yJ)(H+g8s+gf85lH{Ffg)6O!P5fS(EXmX=00#kj@?k2F4!+`NbvM)~w24
zVAR_(afboR$;Y4GZhVuh9y+P?NtsYtN;y-xO}S5bOnFXuP5GS)nTnW-WfgBKV=CJ!
zuT(`<eXCZhuBcvB{jA2Ormp5x&8ym&+6A?b>TK#_>Som)t5>MEYhY?9Y7}YgX}r+H
zvw4Ze$yfD^3_!pr#mLSe&A?!;q{nE_sLZCvWNv0|$7pUW$0*Av!lup0&X&f($I2pP
z!p_6a$gIr4%*(Nyo1dRsGLJ)<TaZ(ek&T;=%}bn}laZ01+lh-mogHK>6O!3x*iEm8
z8n3Rz&c@CrW^ODl%FZUoXk^c1Y-DE3XriW!(_#r$CT;~L7FIh>5k^K9R;D6ONoH17
zW*qLh$SUv5!p_LUsmH|1%#^{*!tBJ%%D_+$^gNO)8HDAS_!*7O<d}fY;bYWh)MErX
z!pxe{-0T?E0FcV%U}R_H0tEp(H!mm%xS%1xh9v|rO|OR;FKz@3ax*n{Wpz_?Gd)Hn
uekNrlHgQolF=Lz-g91Pi=yO{xqyS)KWM#(Xq6=8U02m0{H;6L&7y|$>x^|iX


From 743031385d7f6dd88002a4fe72e67250b6bdd5e1 Mon Sep 17 00:00:00 2001
From: Anthony Stewart <150152+a-stewart@users.noreply.github.com>
Date: Thu, 13 Mar 2025 20:16:01 +0100
Subject: [PATCH 0908/1815] Add a 2 hour offset to tests to avoid being a day
 short after the clocks change (#243194)

---
 src/vs/base/test/common/date.test.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/vs/base/test/common/date.test.ts b/src/vs/base/test/common/date.test.ts
index 2260d6104b5f..d008c55f9180 100644
--- a/src/vs/base/test/common/date.test.ts
+++ b/src/vs/base/test/common/date.test.ts
@@ -37,11 +37,13 @@ suite('Date', () => {
 		test('yesterday', () => {
 			const yesterday = new Date();
 			yesterday.setDate(yesterday.getDate() - 1);
+			yesterday.setHours(yesterday.getHours() - 2); // 2 hours further to avoid DST issues.
 			strictEqual(fromNowByDay(yesterday), 'Yesterday');
 		});
 		test('daysAgo', () => {
 			const daysAgo = new Date();
 			daysAgo.setDate(daysAgo.getDate() - 5);
+			daysAgo.setHours(daysAgo.getHours() - 2); // 2 hours further to avoid DST issues.
 			strictEqual(fromNowByDay(daysAgo, true), '5 days ago');
 		});
 	});

From 73e6a5cf21b6bb2bf21ceda3de669373bef310e4 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Thu, 13 Mar 2025 12:31:26 -0700
Subject: [PATCH 0909/1815] mcp: various fixes around trust and indicator

- Show the tools indicator as spinning while a server is staring up
- Don't show it if there are unknown tools from untrusted servers
- Fix some state issues around the trust storage, don't pop multiple dialogs
- Add a reset trust command
---
 .../observable/common/observableMemento.ts    | 96 +++++++++++++++++++
 .../contrib/mcp/browser/mcp.contribution.ts   |  3 +-
 .../contrib/mcp/browser/mcpCommands.ts        | 31 +++++-
 .../contrib/mcp/common/mcpContextKeys.ts      | 18 +++-
 .../contrib/mcp/common/mcpRegistry.ts         | 61 +++++++++---
 .../contrib/mcp/common/mcpRegistryTypes.ts    |  6 ++
 .../workbench/contrib/mcp/common/mcpServer.ts |  8 +-
 .../workbench/contrib/mcp/common/mcpTypes.ts  |  6 ++
 .../mcp/test/common/mcpRegistry.test.ts       |  5 -
 9 files changed, 207 insertions(+), 27 deletions(-)
 create mode 100644 src/vs/platform/observable/common/observableMemento.ts

diff --git a/src/vs/platform/observable/common/observableMemento.ts b/src/vs/platform/observable/common/observableMemento.ts
new file mode 100644
index 000000000000..38aefce6fe78
--- /dev/null
+++ b/src/vs/platform/observable/common/observableMemento.ts
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { strictEquals } from '../../../base/common/equals.js';
+import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
+import { ISettableObservable } from '../../../base/common/observable.js';
+import { ObservableValue } from '../../../base/common/observableInternal/base.js';
+import { DebugNameData } from '../../../base/common/observableInternal/debugName.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
+
+interface IObservableMementoOpts<T> {
+	defaultValue: T;
+	key: string;
+	/** Storage options, defaults to JSON storage if the defaultValue is an object */
+	toStorage?: (value: T) => string;
+	fromStorage?: (value: string) => T;
+}
+
+/**
+ * Defines an observable memento. Returns a function that can be called with
+ * the specific storage scope, target, and service to use in a class.
+ *
+ * Note that the returned Observable is a disposable, because it interacts
+ * with storage service events, and must be tracked appropriately.
+ */
+export function observableMemento<T>(opts: IObservableMementoOpts<T>) {
+	return (scope: StorageScope, target: StorageTarget, storageService: IStorageService): ISettableObservable<T> & IDisposable => {
+		return new ObservableMemento<T>(opts, scope, target, storageService);
+	};
+}
+
+/**
+ * A value that is stored, and is also observable. Note: T should be readonly.
+ */
+class ObservableMemento<T> extends ObservableValue<T> implements IDisposable {
+	private readonly _store = new DisposableStore();
+	private _didChange = false;
+
+	constructor(
+		opts: IObservableMementoOpts<T>,
+		storageScope: StorageScope,
+		storageTarget: StorageTarget,
+		@IStorageService storageService: IStorageService,
+	) {
+		if (opts.defaultValue && typeof opts.defaultValue === 'object') {
+			opts.toStorage ??= (value: T) => JSON.stringify(value);
+			opts.fromStorage ??= (value: string) => JSON.parse(value);
+		}
+
+		let initialValue = opts.defaultValue;
+
+		const fromStorage = storageService.get(opts.key, storageScope);
+		if (fromStorage !== undefined) {
+			if (opts.fromStorage) {
+				try {
+					initialValue = opts.fromStorage(fromStorage);
+				} catch {
+					initialValue = opts.defaultValue;
+				}
+			}
+		}
+
+		super(new DebugNameData(undefined, `storage/${opts.key}`, undefined), initialValue, strictEquals);
+
+		const didChange = storageService.onDidChangeValue(storageScope, opts.key, this._store);
+		// only take external changes if there aren't local changes we've made
+		this._store.add(didChange((e) => {
+			if (e.external && e.key === opts.key && !this._didChange) {
+				this.set(opts.defaultValue, undefined);
+			}
+		}));
+
+		this._store.add(storageService.onWillSaveState(() => {
+			if (this._didChange) {
+				this._didChange = false;
+				const value = this.get();
+				if (opts.toStorage) {
+					storageService.store(opts.key, opts.toStorage(value), storageScope, storageTarget);
+				} else {
+					storageService.store(opts.key, String(value), storageScope, storageTarget);
+				}
+			}
+		}));
+	}
+
+	protected override _setValue(newValue: T): void {
+		super._setValue(newValue);
+		this._didChange = true;
+	}
+
+	dispose(): void {
+		this._store.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
index ce7d2c0b0ca5..81214342ad28 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
@@ -19,7 +19,7 @@ import { McpService } from '../common/mcpService.js';
 import { IMcpService } from '../common/mcpTypes.js';
 import { McpDiscovery } from './mcpDiscovery.js';
 
-import { AttachMCPToolsAction, AttachMCPToolsActionRendering, ListMcpServerCommand, McpServerOptionsCommand } from './mcpCommands.js';
+import { AttachMCPToolsAction, AttachMCPToolsActionRendering, ListMcpServerCommand, ResetMcpTrustCommand, McpServerOptionsCommand } from './mcpCommands.js';
 
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { McpContextKeysController } from '../common/mcpContextKeys.js';
@@ -36,6 +36,7 @@ registerWorkbenchContribution2('mcpContextKeys', McpContextKeysController, Workb
 registerAction2(ListMcpServerCommand);
 registerAction2(McpServerOptionsCommand);
 registerAction2(AttachMCPToolsAction);
+registerAction2(ResetMcpTrustCommand);
 registerWorkbenchContribution2('mcpActionRendering', AttachMCPToolsActionRendering, WorkbenchPhase.BlockRestore);
 
 const jsonRegistry = <jsonContributionRegistry.IJSONContributionRegistry>Registry.as(jsonContributionRegistry.Extensions.JSONContribution);
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 8e1d520a65a2..ec0a44d3ab06 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -29,6 +29,7 @@ import { CHAT_CATEGORY } from '../../chat/browser/actions/chatActions.js';
 import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
 import { ChatMode } from '../../chat/common/constants.js';
 import { McpContextKeys } from '../common/mcpContextKeys.js';
+import { IMcpRegistry } from '../common/mcpRegistryTypes.js';
 import { IMcpServer, IMcpService, IMcpTool, McpConnectionState, McpServerToolsState } from '../common/mcpTypes.js';
 
 // acroynms do not get localized
@@ -183,12 +184,12 @@ export class AttachMCPToolsAction extends Action2 {
 			f1: false,
 			category: CHAT_CATEGORY,
 			precondition: ContextKeyExpr.and(
-				McpContextKeys.toolsCount.greater(0),
+				ContextKeyExpr.or(McpContextKeys.toolsCount.greater(0), McpContextKeys.hasUnknownTools),
 				ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent)
 			),
 			menu: {
 				when: ContextKeyExpr.and(
-					McpContextKeys.toolsCount.greater(0),
+					ContextKeyExpr.or(McpContextKeys.toolsCount.greater(0), McpContextKeys.hasUnknownTools),
 					ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent)
 				),
 				id: MenuId.ChatInputAttachmentToolbar,
@@ -374,7 +375,11 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 				let thisState = DisplayedState.None;
 				switch (server.toolsState.read(reader)) {
 					case McpServerToolsState.Unknown:
-						thisState = server.connectionState.read(reader).state === McpConnectionState.Kind.Error ? DisplayedState.Error : DisplayedState.NewTools;
+						if (server.trusted.read(reader) === false) {
+							thisState = DisplayedState.None;
+						} else {
+							thisState = server.connectionState.read(reader).state === McpConnectionState.Kind.Error ? DisplayedState.Error : DisplayedState.NewTools;
+						}
 						break;
 					case McpServerToolsState.RefreshingFromUnknown:
 						thisState = DisplayedState.Refreshing;
@@ -496,3 +501,23 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 		}, Event.fromObservable(toolsCount)));
 	}
 }
+
+export class ResetMcpTrustCommand extends Action2 {
+	static readonly ID = 'workbench.mcp.resetTrust';
+
+	constructor() {
+		super({
+			id: ResetMcpTrustCommand.ID,
+			title: localize2('mcp.resetTrust', "Reset MCP Trust"),
+			category,
+			f1: true,
+			precondition: McpContextKeys.toolsCount.greater(0),
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const mcpService = accessor.get(IMcpRegistry);
+		mcpService.resetTrust();
+	}
+}
+
diff --git a/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts b/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
index 545c678a5c17..56b90c9126f6 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
@@ -9,12 +9,13 @@ import { autorun } from '../../../../base/common/observable.js';
 import { localize } from '../../../../nls.js';
 import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { IMcpService } from './mcpTypes.js';
+import { IMcpService, McpServerToolsState } from './mcpTypes.js';
 
 
 export namespace McpContextKeys {
 
 	export const serverCount = new RawContextKey<number>('mcp.serverCount', undefined, { type: 'number', description: localize('mcp.serverCount.description', "Context key that has the number of registered MCP servers") });
+	export const hasUnknownTools = new RawContextKey<boolean>('mcp.hasUnknownTools', undefined, { type: 'boolean', description: localize('mcp.hasUnknownTools.description', "Indicates whether there are MCP servers with unknown tools.") });
 	export const toolsCount = new RawContextKey<number>('mcp.toolsCount', undefined, { type: 'number', description: localize('mcp.toolsCount.description', "Context key that has the number of registered MCP tools") });
 }
 
@@ -31,10 +32,21 @@ export class McpContextKeysController extends Disposable implements IWorkbenchCo
 
 		const ctxServerCount = McpContextKeys.serverCount.bindTo(contextKeyService);
 		const ctxToolsCount = McpContextKeys.toolsCount.bindTo(contextKeyService);
+		const ctxHasUnknownTools = McpContextKeys.hasUnknownTools.bindTo(contextKeyService);
 
 		this._store.add(autorun(r => {
-			ctxServerCount.set(mcpService.servers.read(r).length);
-			ctxToolsCount.set(mcpService.servers.read(r).reduce((count, server) => count + server.tools.read(r).length, 0));
+			const servers = mcpService.servers.read(r);
+			const serverTools = servers.map(s => s.tools.read(r));
+			ctxServerCount.set(servers.length);
+			ctxToolsCount.set(serverTools.reduce((count, tools) => count + tools.length, 0));
+			ctxHasUnknownTools.set(servers.some(s => {
+				if (s.trusted.read(r) === false) {
+					return false;
+				}
+
+				const toolState = s.toolsState.read(r);
+				return toolState === McpServerToolsState.Unknown || toolState === McpServerToolsState.RefreshingFromUnknown;
+			}));
 		}));
 	}
 }
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
index b72dc8b61656..4b8681a588b7 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
@@ -6,21 +6,28 @@
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Lazy } from '../../../../base/common/lazy.js';
 import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
-import { IObservable, observableValue } from '../../../../base/common/observable.js';
+import { derived, IObservable, observableValue } from '../../../../base/common/observable.js';
 import { localize } from '../../../../nls.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { observableMemento } from '../../../../platform/observable/common/observableMemento.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { Memento } from '../../../common/memento.js';
 import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
 import { McpRegistryInputStorage } from './mcpRegistryInputStorage.js';
 import { IMcpHostDelegate, IMcpRegistry, IMcpResolveConnectionOptions } from './mcpRegistryTypes.js';
 import { McpServerConnection } from './mcpServerConnection.js';
 import { IMcpServerConnection, McpCollectionDefinition, McpServerDefinition } from './mcpTypes.js';
 
+const createTrustMemento = observableMemento<Readonly<Record<string, boolean>>>({
+	defaultValue: {},
+	key: 'mcp.trustedCollections'
+});
+
 export class McpRegistry extends Disposable implements IMcpRegistry {
 	declare public readonly _serviceBrand: undefined;
 
+	private readonly _trustPrompts = new Map</* collection ID */string, Promise<boolean | undefined>>();
+
 	private readonly _collections = observableValue<readonly McpCollectionDefinition[]>('collections', []);
 	private readonly _delegates: IMcpHostDelegate[] = [];
 
@@ -29,11 +36,7 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 	private readonly _workspaceStorage = new Lazy(() => this._register(this._instantiationService.createInstance(McpRegistryInputStorage, StorageScope.WORKSPACE, StorageTarget.USER)));
 	private readonly _profileStorage = new Lazy(() => this._register(this._instantiationService.createInstance(McpRegistryInputStorage, StorageScope.PROFILE, StorageTarget.USER)));
 
-	private readonly _trustMemento = new Lazy(() => {
-		const memento = new Memento('mcpTrustedServers', this._storageService);
-		this._register(this._storageService.onWillSaveState(() => memento.saveMemento()));
-		return memento.getMemento(StorageScope.APPLICATION, StorageTarget.MACHINE);
-	});
+	private readonly _trustMemento = new Lazy(() => this._register(createTrustMemento(StorageScope.APPLICATION, StorageTarget.MACHINE, this._storageService)));
 
 	public get delegates(): readonly IMcpHostDelegate[] {
 		return this._delegates;
@@ -77,11 +80,37 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 		this._workspaceStorage.value.clearAll();
 	}
 
-	private async promptForTrust(collection: McpCollectionDefinition, definition: McpServerDefinition): Promise<boolean | undefined> {
+	public resetTrust(): void {
+		this._trustMemento.value.set({}, undefined);
+	}
+
+	public getTrust(collection: McpCollectionDefinition): IObservable<boolean | undefined> {
+		return derived(reader => {
+			if (collection.isTrustedByDefault) {
+				return true;
+			}
+
+			const memento = this._trustMemento.value.read(reader);
+			return memento.hasOwnProperty(collection.id) ? memento[collection.id] : undefined;
+		});
+	}
+
+	private _promptForTrust(collection: McpCollectionDefinition, definition: McpServerDefinition): Promise<boolean | undefined> {
+		// Collect all trust prompts for a single config so that concurrently trying to start N
+		// servers in a config don't result in N different dialogs
+		let resultPromise = this._trustPrompts.get(collection.id);
+		resultPromise ??= this._promptForTrustOpenDialog(collection, definition).finally(() => {
+			this._trustPrompts.delete(collection.id);
+		});
+		this._trustPrompts.set(collection.id, resultPromise);
+
+		return resultPromise;
+	}
+
+	private async _promptForTrustOpenDialog(collection: McpCollectionDefinition, definition: McpServerDefinition): Promise<boolean | undefined> {
 		const labelWithOrigin = collection.presentation?.origin
 			? `[\`${collection.label}\`](${collection.presentation.origin})`
 			: collection.label;
-
 		const result = await this._dialogService.prompt(
 			{
 				message: 'Do you trust this server?',
@@ -108,15 +137,19 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 		}
 
 		if (!collection.isTrustedByDefault) {
-			const memento = this._trustMemento.value;
-			const trusted = memento.hasOwnProperty(definition.id) ? memento[definition.id] : undefined;
+			const memento = this._trustMemento.value.get();
+			const trusted = memento.hasOwnProperty(collection.id) ? memento[collection.id] : undefined;
 
 			if (trusted) {
 				// continue
 			} else if (trusted === undefined || forceTrust) {
-				const trustValue = await this.promptForTrust(collection, definition);
-				memento[definition.id] = trustValue;
-				if (!trustValue) { return; }
+				const trustValue = await this._promptForTrust(collection, definition);
+				if (trustValue !== undefined) {
+					this._trustMemento.value.set({ ...memento, [collection.id]: trustValue }, undefined);
+				}
+				if (!trustValue) {
+					return;
+				}
 			} else /** trusted === false && !forceTrust */ {
 				return undefined;
 			}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
index 8bb2c2d066ab..9e293e5b3514 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
@@ -42,6 +42,12 @@ export interface IMcpRegistry {
 	registerDelegate(delegate: IMcpHostDelegate): IDisposable;
 	registerCollection(collection: McpCollectionDefinition): IDisposable;
 
+	/** Resets the trust state of all collections. */
+	resetTrust(): void;
+
+	/** Gets whether the collection is trusted. */
+	getTrust(collection: McpCollectionDefinition): IObservable<boolean | undefined>;
+
 	/** Resets any saved inputs for the connection. */
 	clearSavedInputs(collection: McpCollectionDefinition, definition: McpServerDefinition): void;
 	/** Creates a connection for the collection and definition. */
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServer.ts b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
index e787b9fede00..d757f755645e 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServer.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
@@ -79,7 +79,9 @@ export class McpServer extends Disposable implements IMcpServer {
 
 	public readonly toolsState = derived(reader => {
 		const fromServer = this.toolsFromServerPromise.read(reader);
-		if (!fromServer) {
+		const connectionState = this.connectionState.read(reader);
+		const isIdle = McpConnectionState.canBeStarted(connectionState.state) && !fromServer;
+		if (isIdle) {
 			return this.toolsFromCache ? McpServerToolsState.Cached : McpServerToolsState.Unknown;
 		}
 
@@ -91,6 +93,10 @@ export class McpServer extends Disposable implements IMcpServer {
 		return fromServerResult.error ? (this.toolsFromCache ? McpServerToolsState.Cached : McpServerToolsState.Unknown) : McpServerToolsState.Live;
 	});
 
+	public get trusted() {
+		return this._mcpRegistry.getTrust(this.collection);
+	}
+
 	constructor(
 		public readonly collection: McpCollectionDefinition,
 		public readonly definition: McpServerDefinition,
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
index 9b273ff5da0d..825fc7313f41 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
@@ -102,6 +102,12 @@ export interface IMcpServer extends IDisposable {
 	readonly collection: McpCollectionDefinition;
 	readonly definition: McpServerDefinition;
 	readonly connectionState: IObservable<McpConnectionState>;
+	/**
+	 * Reflects the MCP server trust state. True if trusted, false if untrusted,
+	 * undefined if consent is required but not indicated.
+	 */
+	readonly trusted: IObservable<boolean | undefined>;
+
 	showOutput(): void;
 	/**
 	 * Starts the server and returns its resulting state. One of:
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 8b32ec67463e..cb5aeba14e88 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
@@ -26,7 +26,6 @@ import { IMcpHostDelegate, IMcpMessageTransport } from '../../common/mcpRegistry
 import { McpServerConnection } from '../../common/mcpServerConnection.js';
 import { McpCollectionDefinition, McpServerDefinition, McpServerTransportType } from '../../common/mcpTypes.js';
 import { TestMcpMessageTransport } from './mcpRegistryTypes.js';
-import { Memento } from '../../../../common/memento.js';
 
 class TestConfigurationResolverService implements Partial<IConfigurationResolverService> {
 	declare readonly _serviceBrand: undefined;
@@ -197,10 +196,6 @@ suite('Workbench - MCP - Registry', () => {
 		};
 	});
 
-	teardown(() => {
-		Memento.clear(StorageScope.APPLICATION);
-	});
-
 	test('registerCollection adds collection to registry', () => {
 		const disposable = registry.registerCollection(testCollection);
 		store.add(disposable);

From f397d79d10e7ba22d508d55f16acc92a197a1c0f Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 13 Mar 2025 12:59:50 -0700
Subject: [PATCH 0910/1815] Ensure PSReadLine does not activate implicitly

Fixes #243466
---
 .../terminal/common/scripts/shellIntegration.ps1   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1 b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
index b7409b45b113..f3d92e9c3d9f 100644
--- a/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
+++ b/src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1
@@ -149,6 +149,12 @@ if (Get-Module -Name PSReadLine) {
 
 		$CommandLine
 	}
+
+	# Set ContinuationPrompt property
+	$ContinuationPrompt = (Get-PSReadLineOption).ContinuationPrompt
+	if ($ContinuationPrompt) {
+		[Console]::Write("$([char]0x1b)]633;P;ContinuationPrompt=$(__VSCode-Escape-Value $ContinuationPrompt)`a")
+	}
 }
 
 # Set IsWindows property
@@ -160,14 +166,6 @@ else {
 	[Console]::Write("$([char]0x1b)]633;P;IsWindows=$IsWindows`a")
 }
 
-# Set ContinuationPrompt property
-if ($isStable -eq "0") {
-	$ContinuationPrompt = (Get-PSReadLineOption).ContinuationPrompt
-	if ($ContinuationPrompt) {
-		[Console]::Write("$([char]0x1b)]633;P;ContinuationPrompt=$(__VSCode-Escape-Value $ContinuationPrompt)`a")
-	}
-}
-
 # Set always on key handlers which map to default VS Code keybindings
 function Set-MappedKeyHandler {
 	param ([string[]] $Chord, [string[]]$Sequence)

From bc0a681451eea73d2eebb8ad2656949b34a2eed7 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Thu, 13 Mar 2025 23:27:15 +0100
Subject: [PATCH 0911/1815] Gutter indicator animation and checkmark based on
 hover (#243498)

gutter indicator animation and checkmark
---
 .../components/gutterIndicatorView.ts         | 97 +++++++++++++------
 1 file changed, 68 insertions(+), 29 deletions(-)

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 7707dca9ab13..77e3b3fc1b40 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
@@ -35,6 +35,10 @@ export class InlineEditsGutterIndicator extends Disposable {
 		return model;
 	}
 
+	private readonly _gutterIndicatorBackgroundColor: IObservable<string>;
+	private readonly _gutterIndicatorForegroundColor: IObservable<string>;
+	private readonly _isHoveredOverInlineEditDebounced: IObservable<boolean>;
+
 	constructor(
 		private readonly _editorObs: ObservableCodeEditor,
 		private readonly _originalRange: IObservable<LineRange | undefined>,
@@ -48,6 +52,21 @@ export class InlineEditsGutterIndicator extends Disposable {
 	) {
 		super();
 
+		this._gutterIndicatorBackgroundColor = this._tabAction.map(v => {
+			switch (v) {
+				case InlineEditTabAction.Inactive: return asCssVariable(inlineEditIndicatorSecondaryBackground);
+				case InlineEditTabAction.Jump: return asCssVariable(inlineEditIndicatorPrimaryBackground);
+				case InlineEditTabAction.Accept: return asCssVariable(inlineEditIndicatorsuccessfulBackground);
+			}
+		});
+		this._gutterIndicatorForegroundColor = this._tabAction.map(v => {
+			switch (v) {
+				case InlineEditTabAction.Inactive: return asCssVariable(inlineEditIndicatorSecondaryForeground);
+				case InlineEditTabAction.Jump: return asCssVariable(inlineEditIndicatorPrimaryForeground);
+				case InlineEditTabAction.Accept: return asCssVariable(inlineEditIndicatorsuccessfulForeground);
+			}
+		});
+
 		this._register(this._editorObs.createOverlayWidget({
 			domNode: this._indicator.element,
 			position: constObservable(null),
@@ -55,20 +74,37 @@ export class InlineEditsGutterIndicator extends Disposable {
 			minContentWidthInPx: constObservable(0),
 		}));
 
+		this._isHoveredOverInlineEditDebounced = debouncedObservable(this._isHoveringOverInlineEdit, 100);
+
 		if (!accessibilityService.isMotionReduced()) {
-			const debouncedIsHovering = debouncedObservable(this._isHoveringOverInlineEdit, 100);
-			this._register(runOnChange(debouncedIsHovering, (isHovering) => {
+			this._register(runOnChange(this._isHoveredOverInlineEditDebounced, (isHovering) => {
 				if (!isHovering) {
 					return;
 				}
-				this._iconRef.element.animate([
+
+				// WIGGLE ANIMATION:
+				/* this._iconRef.element.animate([
 					{ transform: 'rotate(0) scale(1)', offset: 0 },
 					{ transform: 'rotate(14.4deg) scale(1.1)', offset: 0.15 },
 					{ transform: 'rotate(-14.4deg) scale(1.2)', offset: 0.3 },
 					{ transform: 'rotate(14.4deg) scale(1.1)', offset: 0.45 },
 					{ transform: 'rotate(-14.4deg) scale(1.2)', offset: 0.6 },
 					{ transform: 'rotate(0) scale(1)', offset: 1 }
-				], { duration: 800 });
+				], { duration: 800 }); */
+
+				// PULSE ANIMATION:
+				this._iconRef.element.animate([
+					{
+						outline: `2px solid ${this._gutterIndicatorBackgroundColor.get()}`,
+						outlineOffset: '-1px',
+						offset: 0
+					},
+					{
+						outline: `2px solid transparent`,
+						outlineOffset: '10px',
+						offset: 1
+					},
+				], { duration: 500 });
 			}));
 		}
 	}
@@ -117,12 +153,32 @@ export class InlineEditsGutterIndicator extends Disposable {
 			? pillRectMoved
 			: pillRectMoved.moveToBeContainedIn(fullViewPort.intersect(targetRect.union(fullViewPort.withHeight(lineHeight)))!); //viewPortWithStickyScroll.intersect(rect)!;
 
+
+		const docked = rect.containsRect(iconRect) && viewPortWithStickyScroll.containsRect(iconRect);
+		let iconDirecion = (targetRect.containsRect(iconRect) ? 'right' as const
+			: iconRect.top > targetRect.top ? 'top' as const : 'bottom' as const);
+
+		let icon;
+		if (docked && (this._isHoveredOverIconDebounced.read(reader) || this._isHoveredOverInlineEditDebounced.read(reader))) {
+			icon = renderIcon(Codicon.check);
+			iconDirecion = 'right';
+		} else {
+			icon = this._tabAction.read(reader) === InlineEditTabAction.Accept ? renderIcon(Codicon.keyboardTab) : renderIcon(Codicon.arrowRight);
+		}
+
+		let rotation = 0;
+		switch (iconDirecion) {
+			case 'right': rotation = 0; break;
+			case 'bottom': rotation = 90; break;
+			case 'top': rotation = -90; break;
+		}
+
 		return {
 			rect,
+			icon,
+			rotation,
+			docked,
 			iconRect,
-			arrowDirection: (targetRect.containsRect(iconRect) ? 'right' as const
-				: iconRect.top > targetRect.top ? 'top' as const : 'bottom' as const),
-			docked: rect.containsRect(iconRect) && viewPortWithStickyScroll.containsRect(iconRect),
 		};
 	});
 
@@ -130,6 +186,7 @@ export class InlineEditsGutterIndicator extends Disposable {
 	private 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);
 
 	private _showHover(): void {
 		if (this._hoverVisible.get()) {
@@ -213,20 +270,8 @@ export class InlineEditsGutterIndicator extends Disposable {
 				cursor: 'pointer',
 				zIndex: '1000',
 				position: 'absolute',
-				backgroundColor: this._tabAction.map(v => {
-					switch (v) {
-						case InlineEditTabAction.Inactive: return asCssVariable(inlineEditIndicatorSecondaryBackground);
-						case InlineEditTabAction.Jump: return asCssVariable(inlineEditIndicatorPrimaryBackground);
-						case InlineEditTabAction.Accept: return asCssVariable(inlineEditIndicatorsuccessfulBackground);
-					}
-				}),
-				['--vscodeIconForeground' as any]: this._tabAction.map(v => {
-					switch (v) {
-						case InlineEditTabAction.Inactive: return asCssVariable(inlineEditIndicatorSecondaryForeground);
-						case InlineEditTabAction.Jump: return asCssVariable(inlineEditIndicatorPrimaryForeground);
-						case InlineEditTabAction.Accept: return asCssVariable(inlineEditIndicatorsuccessfulForeground);
-					}
-				}),
+				backgroundColor: this._gutterIndicatorBackgroundColor,
+				['--vscodeIconForeground' as any]: this._gutterIndicatorForegroundColor,
 				borderRadius: '4px',
 				display: 'flex',
 				justifyContent: 'center',
@@ -236,20 +281,14 @@ export class InlineEditsGutterIndicator extends Disposable {
 		}, [
 			n.div({
 				style: {
-					rotate: layout.map(l => {
-						switch (l.arrowDirection) {
-							case 'right': return '0deg';
-							case 'bottom': return '90deg';
-							case 'top': return '-90deg';
-						}
-					}),
+					rotate: layout.map(i => `${i.rotation}deg`),
 					transition: 'rotate 0.2s ease-in-out',
 					display: 'flex',
 					alignItems: 'center',
 					justifyContent: 'center',
 				}
 			}, [
-				this._tabAction.map(v => v === InlineEditTabAction.Accept ? renderIcon(Codicon.keyboardTab) : renderIcon(Codicon.arrowRight))
+				layout.map(i => i.icon),
 			])
 		]),
 	])).keepUpdated(this._store);

From 0eb916d682c1a76b9a388daf56284ff3a842dead Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 13 Mar 2025 18:28:20 -0400
Subject: [PATCH 0912/1815] add terminal suggest telemetry (#243478)

---
 .../suggest/browser/terminalSuggestAddon.ts   |  9 +-
 .../browser/terminalSuggestTelemetry.ts       | 97 +++++++++++++++++++
 2 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestTelemetry.ts

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index 2c854f922a50..e72a0151bf9d 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -37,6 +37,7 @@ import { TerminalCompletionModel } from './terminalCompletionModel.js';
 import { TerminalCompletionItem, TerminalCompletionItemKind, type ITerminalCompletion } from './terminalCompletionItem.js';
 import { IntervalTimer, TimeoutTimer } from '../../../../../base/common/async.js';
 import { localize } from '../../../../../nls.js';
+import { TerminalSuggestTelemetry } from './terminalSuggestTelemetry.js';
 
 export interface ISuggestController {
 	isPasting: boolean;
@@ -45,7 +46,7 @@ export interface ISuggestController {
 	selectNextSuggestion(): void;
 	selectNextPageSuggestion(): void;
 	acceptSelectedSuggestion(suggestion?: Pick<ISimpleSelectedSuggestion<TerminalCompletionItem>, 'item' | 'model'>): void;
-	hideSuggestWidget(cancelAnyRequests: boolean): void;
+	hideSuggestWidget(cancelAnyRequests: boolean, wasClosedByUser?: boolean): void;
 }
 export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggestController {
 	private _terminal?: Terminal;
@@ -131,6 +132,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 	private readonly _inlineCompletionItem = new TerminalCompletionItem(this._inlineCompletion);
 
 	private _shouldSyncWhenReady: boolean = false;
+	private _suggestTelemetry: TerminalSuggestTelemetry | undefined;
 
 	constructor(
 		shellType: TerminalShellType | undefined,
@@ -175,10 +177,10 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			if (commandDetection) {
 				if (this._promptInputModel !== commandDetection.promptInputModel) {
 					this._promptInputModel = commandDetection.promptInputModel;
+					this._suggestTelemetry = this._register(this._instantiationService.createInstance(TerminalSuggestTelemetry, commandDetection, this._promptInputModel));
 					this._promptInputModelSubscriptions.value = combinedDisposable(
 						this._promptInputModel.onDidChangeInput(e => this._sync(e)),
 						this._promptInputModel.onDidFinishInput(() => {
-							this._mostRecentPromptInputState = undefined;
 							this.hideSuggestWidget(true);
 						}),
 					);
@@ -711,6 +713,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		}
 		const initialPromptInputState = this._mostRecentPromptInputState;
 		if (!suggestion || !initialPromptInputState || this._leadingLineContent === undefined || !this._model) {
+			this._suggestTelemetry?.acceptCompletion(undefined, this._mostRecentPromptInputState?.value);
 			return;
 		}
 		SuggestAddon.lastAcceptedCompletionTimestamp = Date.now();
@@ -796,6 +799,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 
 		// Send the completion
 		this._onAcceptedCompletion.fire(resultSequence);
+		this._suggestTelemetry?.acceptCompletion(completion, this._mostRecentPromptInputState?.value);
 		this.hideSuggestWidget(true);
 	}
 
@@ -847,3 +851,4 @@ 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
new file mode 100644
index 000000000000..be5d761ebccd
--- /dev/null
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestTelemetry.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 { Disposable } from '../../../../../base/common/lifecycle.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';
+import { ITerminalCompletion } from './terminalCompletionItem.js';
+
+export class TerminalSuggestTelemetry extends Disposable {
+	private _acceptedCompletions: Array<{ label: string; kindLabel?: string }> | undefined;
+
+	constructor(
+		commandDetection: ICommandDetectionCapability,
+		private readonly _promptInputModel: IPromptInputModel,
+		@ITelemetryService private readonly _telemetryService: ITelemetryService,
+	) {
+		super();
+		this._register(commandDetection.onCommandFinished((e) => {
+			this._sendTelemetryInfo(false, e.exitCode);
+			this._acceptedCompletions = undefined;
+		}));
+		this._register(this._promptInputModel.onDidInterrupt(() => {
+			this._sendTelemetryInfo(true);
+			this._acceptedCompletions = undefined;
+		}));
+	}
+	acceptCompletion(completion: ITerminalCompletion | undefined, commandLine?: string): void {
+		if (!completion || !commandLine) {
+			this._acceptedCompletions = undefined;
+			return;
+		}
+		this._acceptedCompletions = this._acceptedCompletions || [];
+		this._acceptedCompletions.push({ label: typeof completion.label === 'string' ? completion.label : completion.label.label, kindLabel: completion.kindLabel });
+	}
+	private _sendTelemetryInfo(fromInterrupt?: boolean, exitCode?: number): void {
+		const commandLine = this._promptInputModel?.value;
+		for (const completion of this._acceptedCompletions || []) {
+			const label = completion?.label;
+			const kind = completion?.kindLabel;
+			if (label === undefined || commandLine === undefined || kind === undefined) {
+				return;
+			}
+
+			let outcome: CompletionOutcome;
+			if (fromInterrupt) {
+				outcome = CompletionOutcome.Interrupted;
+			} else if (commandLine.trim() && commandLine.includes(label)) {
+				outcome = CompletionOutcome.Accepted;
+			} else if (inputContainsFirstHalfOfLabel(commandLine, label)) {
+				outcome = CompletionOutcome.AcceptedWithEdit;
+			} else {
+				outcome = CompletionOutcome.Deleted;
+			}
+			this._telemetryService.publicLog2<{
+				kind: string | undefined;
+				outcome: CompletionOutcome;
+				exitCode: number | undefined;
+			}, {
+				owner: 'meganrogge';
+				comment: 'This data is collected to understand the outcome of a terminal completion acceptance.';
+				kind: {
+					classification: 'SystemMetaData';
+					purpose: 'FeatureInsight';
+					comment: 'The completion item\'s kind';
+				};
+				outcome: {
+					classification: 'SystemMetaData';
+					purpose: 'FeatureInsight';
+					comment: 'The outcome of the accepted completion';
+				};
+				exitCode: {
+					classification: 'SystemMetaData';
+					purpose: 'FeatureInsight';
+					comment: 'The exit code from the command';
+				};
+			}>('terminal.suggest.acceptedCompletion', {
+				kind,
+				outcome,
+				exitCode
+			});
+		}
+	}
+}
+
+function inputContainsFirstHalfOfLabel(commandLine: string, label: string): boolean {
+	return commandLine.includes(label.substring(0, Math.ceil(label.length / 2)));
+}
+
+const enum CompletionOutcome {
+	Accepted = 'Accepted',
+	Deleted = 'Deleted',
+	AcceptedWithEdit = 'AcceptedWithEdit',
+	Interrupted = 'Interrupted'
+}

From 8bbbc45f4f80e040f866f9d4c11499271de39851 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 13 Mar 2025 18:28:50 -0400
Subject: [PATCH 0913/1815] add builtin fish arg/description/documentation to
 suggestion  (#243271)

---
 .eslint-ignore                                |   1 +
 build/filters.js                              |   3 +
 .../terminal-suggest/ThirdPartyNotices.txt    |   2 -
 extensions/terminal-suggest/cgmanifest.json   |  57 ++++
 extensions/terminal-suggest/package.json      |   3 +-
 .../scripts/pullFishBuiltins.ts               | 260 +++++++++++++++
 .../scripts/pullZshBuiltins.ts                |  19 +-
 .../scripts/terminalScriptHelpers.ts          |  51 +++
 extensions/terminal-suggest/src/shell/fish.ts |  78 ++++-
 .../src/shell/fishBuiltinsCache.ts            | 301 ++++++++++++++++++
 10 files changed, 751 insertions(+), 24 deletions(-)
 create mode 100644 extensions/terminal-suggest/scripts/pullFishBuiltins.ts
 create mode 100644 extensions/terminal-suggest/scripts/terminalScriptHelpers.ts
 create mode 100644 extensions/terminal-suggest/src/shell/fishBuiltinsCache.ts

diff --git a/.eslint-ignore b/.eslint-ignore
index 233c9b3e6146..da66a76c3960 100644
--- a/.eslint-ignore
+++ b/.eslint-ignore
@@ -14,6 +14,7 @@
 **/extensions/simple-browser/media/index.js
 **/extensions/terminal-suggest/src/completions/upstream/**
 **/extensions/terminal-suggest/src/shell/zshBuiltinsCache.ts
+**/extensions/terminal-suggest/src/shell/fishBuiltinsCache.ts
 **/extensions/terminal-suggest/third_party/**
 **/extensions/typescript-language-features/test-workspace/**
 **/extensions/typescript-language-features/extension.webpack.config.js
diff --git a/build/filters.js b/build/filters.js
index 716d7be104c9..ece41209baf8 100644
--- a/build/filters.js
+++ b/build/filters.js
@@ -57,6 +57,7 @@ module.exports.unicodeFilter = [
 	'!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/**',
@@ -90,6 +91,7 @@ module.exports.indentationFilter = [
 	'!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/**',
@@ -195,6 +197,7 @@ module.exports.tsFormattingFilter = [
 	'!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 = [
diff --git a/extensions/terminal-suggest/ThirdPartyNotices.txt b/extensions/terminal-suggest/ThirdPartyNotices.txt
index 761d5b01a428..f6de57f6266a 100644
--- a/extensions/terminal-suggest/ThirdPartyNotices.txt
+++ b/extensions/terminal-suggest/ThirdPartyNotices.txt
@@ -28,5 +28,3 @@ 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.
-
-
diff --git a/extensions/terminal-suggest/cgmanifest.json b/extensions/terminal-suggest/cgmanifest.json
index f39b1fae3712..ead3479e6673 100644
--- a/extensions/terminal-suggest/cgmanifest.json
+++ b/extensions/terminal-suggest/cgmanifest.json
@@ -82,6 +82,63 @@
 				"SOFTWARE."
 			],
 			"version": "1.1.2"
+		},
+		{
+			"component": {
+				"type": "git",
+				"git": {
+					"repositoryUrl": "https://github.com/zsh-users/zsh",
+					"commitHash": "435cb1b748ce1f2f5c38edc1d64f4ee2424f9b3a"
+				}
+			},
+			"version": "5.9",
+			"licenseDetail": [
+				"Unless otherwise noted in the header of specific files, files in this distribution have the licence shown below.",
+				"",
+				"However, note that certain shell functions are licensed under versions of the GNU General Public Licence.  Anyone distributing the shell as a binary including those files needs to take account of this.  Search shell functions for \"Copyright\" for specific copyright information. None of the core functions are affected by this, so those files may simply be omitted.",
+				"",
+				"--",
+				"",
+				"The Z Shell is copyright (c) 1992-2017 Paul Falstad, Richard Coleman, Zoltán Hidvégi, Andrew Main, Peter Stephenson, Sven Wischnowsky, and others.  All rights reserved.  Individual authors, whether or not specifically named, retain copyright in all changes; in what follows, they are referred to as `the Zsh Development Group'.  This is for convenience only and this body has no legal status.  The Z shell is distributed under the following licence; any provisions made in individual files take precedence.",
+				"",
+				"Permission is hereby granted, without written agreement and without licence or royalty fees, to use, copy, modify, and distribute this software and to distribute modified versions of this software for any purpose, provided that the above copyright notice and the following two paragraphs appear in all copies of this software.",
+				"",
+				"In no event shall the Zsh Development Group be liable to any party for direct, indirect, special, incidental, or consequential damages arising out of the use of this software and its documentation, even if the Zsh Development Group have been advised of the possibility of such damage.",
+				"",
+				"The Zsh Development Group specifically disclaim any warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose.  The software provided hereunder is on an \"as is\" basis, and the Zsh Development Group have no obligation to provide maintenance, support, updates, enhancements, or modifications."
+			]
+		},
+		{
+			"component": {
+				"type": "git",
+				"git": {
+					"repositoryUrl": "https://github.com/fish-shell/fish-shell",
+					"commitHash": "6627d403d33b4e74b49aa4db2a4f17709628cdc8"
+				}
+			},
+			"version": "3.7.1",
+			"licenseDetail": [
+				"Fish is a smart and user-friendly command line shell.",
+				"",
+				"Copyright (C) 2005-2009 Axel Liljencrantz",
+				"Copyright (C) 2009- fish-shell contributors",
+				"",
+				"fish is free software.",
+				"",
+				"Most of fish is licensed under the GNU General Public License version 2, and",
+				"you can redistribute it and/or modify it under the terms of the GNU GPL as",
+				"published by the Free Software Foundation.",
+				"",
+				"fish also includes software licensed under the Python Software Foundation License version 2, the MIT",
+				"license, and the GNU Library General Public License version 2.",
+				"",
+				"Full licensing information is contained in doc_src/license.rst.",
+				"",
+				"This program is distributed in the hope that it will be useful, but WITHOUT",
+				"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or",
+				"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for",
+				"more details."
+			]
 		}
 	],
 	"version": 1
diff --git a/extensions/terminal-suggest/package.json b/extensions/terminal-suggest/package.json
index dcc02bff6a24..f2e4104823c8 100644
--- a/extensions/terminal-suggest/package.json
+++ b/extensions/terminal-suggest/package.json
@@ -21,7 +21,8 @@
   "scripts": {
     "compile": "npx gulp compile-extension:terminal-suggest",
     "watch": "npx gulp watch-extension:terminal-suggest",
-    "pull-zshbuiltins": "ts-node ./scripts/pullZshBuiltins.ts"
+    "pull-zshbuiltins": "ts-node ./scripts/pullZshBuiltins.ts",
+    "pull-fishbuiltins": "ts-node ./scripts/pullFishBuiltins.ts"
   },
   "main": "./out/terminalSuggestMain",
   "activationEvents": [
diff --git a/extensions/terminal-suggest/scripts/pullFishBuiltins.ts b/extensions/terminal-suggest/scripts/pullFishBuiltins.ts
new file mode 100644
index 000000000000..8ac6b870d451
--- /dev/null
+++ b/extensions/terminal-suggest/scripts/pullFishBuiltins.ts
@@ -0,0 +1,260 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import { cleanupText, checkWindows, execAsync, copyright } from './terminalScriptHelpers';
+
+checkWindows();
+
+interface ICommandDetails {
+	description: string;
+	args: string | undefined;
+	shortDescription?: string;
+}
+
+let fishBuiltinsCommandDescriptionsCache = new Map<string, ICommandDetails>();
+
+// Fallback descriptions for commands that don't return proper help information
+const fallbackDescriptions: Record<string, ICommandDetails> = {
+	'[': {
+		shortDescription: 'Test if a statement is true',
+		description: 'Evaluate an expression and return a status of true (0) or false (non-zero). Unlike the `test` command, the `[` command requires a closing `]`.',
+		args: 'EXPRESSION ]'
+	},
+	'break': {
+		shortDescription: 'Exit the current loop',
+		description: 'Terminate the execution of the nearest enclosing `while` or `for` loop and proceed with the next command after the loop.',
+		args: undefined
+	},
+	'breakpoint': {
+		shortDescription: 'Launch debug mode',
+		description: 'Pause execution and launch an interactive debug prompt. This is useful for inspecting the state of a script at a specific point.',
+		args: undefined
+	},
+	'case': {
+		shortDescription: 'Match a value against patterns',
+		description: 'Within a `switch` block, the `case` command specifies patterns to match against the given value, executing the associated block if a match is found.',
+		args: 'PATTERN...'
+	},
+	'continue': {
+		shortDescription: 'Skip to the next iteration of a loop',
+		description: 'Within a `while` or `for` loop, `continue` skips the remaining commands in the current iteration and proceeds to the next iteration of the loop.',
+		args: undefined
+	},
+	'else': {
+		shortDescription: 'Execute commands if the previous condition was false',
+		description: 'In an `if` block, the `else` section contains commands that execute if none of the preceding `if` or `else if` conditions were true.',
+		args: undefined
+	},
+	'end': {
+		shortDescription: 'Terminate a block of code',
+		description: 'Conclude a block of code initiated by constructs like `if`, `switch`, `while`, `for`, or `function`.',
+		args: undefined
+	},
+	'eval': {
+		shortDescription: 'Execute arguments as a command',
+		description: 'Concatenate all arguments into a single command and execute it. This allows for dynamic construction and execution of commands.',
+		args: 'COMMAND...'
+	},
+	'false': {
+		shortDescription: 'Return an unsuccessful result',
+		description: 'A command that returns a non-zero exit status, indicating failure. It is often used in scripts to represent a false condition.',
+		args: undefined
+	},
+	'realpath': {
+		shortDescription: 'Resolve and print the absolute path',
+		description: 'Convert each provided path to its absolute, canonical form by resolving symbolic links and relative path components.',
+		args: 'PATH...'
+	},
+	':': {
+		shortDescription: 'No operation command',
+		description: 'The `:` command is a no-op (no operation) command that returns a successful (zero) exit status. It can be used as a placeholder in scripts where a command is syntactically required but no action is desired.',
+		args: undefined
+	},
+	'test': {
+		shortDescription: 'Evaluate conditional expressions',
+		description: 'The `test` command evaluates conditional expressions and sets the exit status to 0 if the expression is true, and 1 if it is false. It supports various operators to evaluate expressions related to strings, numbers, and file attributes.',
+		args: 'EXPRESSION'
+	},
+	'true': {
+		shortDescription: 'Return a successful result',
+		description: 'The `true` command always returns a successful (zero) exit status. It is often used in scripts and conditional statements where an unconditional success result is needed.',
+		args: undefined
+	},
+	'printf': {
+		shortDescription: 'Display formatted text',
+		description: 'The `printf` command formats and prints text according to a specified format string. Unlike `echo`, `printf` does not append a newline unless explicitly included in the format.',
+		args: 'FORMAT [ARGUMENT...]'
+	}
+};
+
+
+async function createCommandDescriptionsCache(): Promise<void> {
+	const cachedCommandDescriptions: Map<string, { shortDescription?: string; description: string; args: string | undefined }> = new Map();
+
+	try {
+		// Get list of all builtins
+		const builtinsOutput = await execAsync('fish -c "builtin -n"').then(r => r.stdout.trim());
+		const builtins = builtinsOutput.split('\n');
+
+		console.log(`Found ${builtins.length} Fish builtin commands`);
+
+		for (const cmd of builtins) {
+			try {
+				// Get help info for each builtin
+				const helpOutput = await execAsync(`fish -c "${cmd} --help 2>&1"`).then(r => r.stdout);
+				let set = false;
+				if (helpOutput && !helpOutput.includes('No help for function') && !helpOutput.includes('See the web documentation')) {
+					const cleanHelpText = cleanupText(helpOutput);
+
+					// Split the text into lines to process
+					const lines = cleanHelpText.split('\n');
+
+
+					// Extract the short description, args, and full description
+					const { shortDescription, args, description } = extractHelpContent(cmd, lines);
+
+					cachedCommandDescriptions.set(cmd, {
+						shortDescription,
+						description,
+						args
+					});
+					set = description !== '';
+				}
+				if (!set) {
+					// Use fallback descriptions for commands that don't return proper help
+					if (fallbackDescriptions[cmd]) {
+						console.info(`Using fallback description for ${cmd}`);
+						cachedCommandDescriptions.set(cmd, fallbackDescriptions[cmd]);
+					} else {
+						console.info(`No fallback description exists for ${cmd}`);
+					}
+				}
+			} catch {
+				// Use fallback descriptions for commands that throw an error
+				if (fallbackDescriptions[cmd]) {
+					console.info('Using fallback description for', cmd);
+					cachedCommandDescriptions.set(cmd, fallbackDescriptions[cmd]);
+				} else {
+					console.info(`Error getting help for ${cmd}`);
+				}
+			}
+		}
+	} catch (e) {
+		console.error('Error creating Fish builtins cache:', e);
+		process.exit(1);
+	}
+
+	fishBuiltinsCommandDescriptionsCache = cachedCommandDescriptions;
+}
+
+/**
+ * Extracts short description, args, and full description from help text lines
+ */
+function extractHelpContent(cmd: string, lines: string[]): { shortDescription: string; args: string | undefined; description: string } {
+	let shortDescription = '';
+	let args: string | undefined;
+	let description = '';
+
+	// Skip the first line (usually just command name and basic usage)
+	let i = 1;
+
+	// Skip any leading empty lines
+	while (i < lines.length && lines[i].trim().length === 0) {
+		i++;
+	}
+
+	// The next non-empty line after the command name is typically
+	// either the short description or additional usage info
+	const startLine = i;
+
+	// Find where the short description starts
+	if (i < lines.length) {
+		// First, check if the line has a command prefix and remove it
+		let firstContentLine = lines[i].trim();
+		const cmdPrefixRegex = new RegExp(`^${cmd}\\s*-\\s*`, 'i');
+		firstContentLine = firstContentLine.replace(cmdPrefixRegex, '');
+
+		// First non-empty line is the short description
+		shortDescription = firstContentLine;
+		i++;
+
+		// Next non-empty line (after short description) is typically args
+		while (i < lines.length && lines[i].trim().length === 0) {
+			i++;
+		}
+
+		if (i < lines.length) {
+			// Found a line after the short description - that's our args
+			args = lines[i].trim();
+			i++;
+		}
+	}
+
+	// Find the DESCRIPTION marker which marks the end of args section
+	let descriptionIndex = -1;
+	for (let j = i; j < lines.length; j++) {
+		if (lines[j].trim() === 'DESCRIPTION') {
+			descriptionIndex = j;
+			break;
+		}
+	}
+
+	// If DESCRIPTION marker is found, consider everything between i and descriptionIndex as part of args
+	if (descriptionIndex > i) {
+		// Combine lines from i up to (but not including) descriptionIndex
+		const additionalArgs = lines.slice(i, descriptionIndex).join('\n').trim();
+		if (additionalArgs) {
+			args = args ? `${args}\n${additionalArgs}` : additionalArgs;
+		}
+		i = descriptionIndex + 1; // Move past the DESCRIPTION line
+	}
+
+	// The rest is the full description (skipping any empty lines after args)
+	while (i < lines.length && lines[i].trim().length === 0) {
+		i++;
+	}
+
+	// Combine the remaining lines into the full description
+	description = lines.slice(Math.max(i, startLine)).join('\n').trim();
+
+	// If description is empty, use the short description
+	if (!description && shortDescription) {
+		description = shortDescription;
+	}
+
+	// Extract just the first sentence for short description
+	const firstPeriodIndex = shortDescription.indexOf('.');
+	if (firstPeriodIndex > 0) {
+		shortDescription = shortDescription.substring(0, firstPeriodIndex + 1).trim();
+	} else if (shortDescription.length > 100) {
+		shortDescription = shortDescription.substring(0, 100) + '...';
+	}
+
+	return {
+		shortDescription,
+		args,
+		description
+	};
+}
+
+const main = async () => {
+	try {
+		await createCommandDescriptionsCache();
+		console.log('Created Fish command descriptions cache with', fishBuiltinsCommandDescriptionsCache.size, 'entries');
+
+		// Save the cache to a TypeScript file
+		const cacheFilePath = path.join(__dirname, '../src/shell/fishBuiltinsCache.ts');
+		const cacheObject = Object.fromEntries(fishBuiltinsCommandDescriptionsCache);
+		const tsContent = `${copyright}\n\nexport const fishBuiltinsCommandDescriptionsCache = ${JSON.stringify(cacheObject, null, 2)} as const;`;
+		await fs.writeFile(cacheFilePath, tsContent, 'utf8');
+		console.log('Saved Fish command descriptions cache to fishBuiltinsCache.ts with', Object.keys(cacheObject).length, 'entries');
+	} catch (error) {
+		console.error('Error:', error);
+	}
+};
+
+main();
diff --git a/extensions/terminal-suggest/scripts/pullZshBuiltins.ts b/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
index cedfc85cd138..a05866b16bc5 100644
--- a/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
+++ b/extensions/terminal-suggest/scripts/pullZshBuiltins.ts
@@ -3,16 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { exec } from 'child_process';
-import { promisify } from 'util';
 import * as fs from 'fs/promises';
 import * as path from 'path';
-import { platform } from 'os';
+import { checkWindows, execAsync, copyright } from './terminalScriptHelpers';
 
-if (platform() === 'win32') {
-	console.error('\x1b[31mThis command is not supported on Windows\x1b[0m');
-	process.exit(1);
-}
+checkWindows();
 
 const latestZshVersion = 5.9;
 
@@ -126,14 +121,14 @@ const shortDescriptions: Map<string, string> = new Map([
 	['ztcp', 'Manipulate TCP sockets'],
 ]);
 
-const execAsync = promisify(exec);
-
 interface ICommandDetails {
 	description: string;
 	args: string | undefined;
 	shortDescription?: string;
 }
+
 let zshBuiltinsCommandDescriptionsCache = new Map<string, ICommandDetails>();
+
 async function createCommandDescriptionsCache(): Promise<void> {
 	const cachedCommandDescriptions: Map<string, { shortDescription?: string; description: string; args: string | undefined }> = new Map();
 	let output = '';
@@ -259,10 +254,4 @@ const main = async () => {
 	}
 };
 
-const copyright = `
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/`;
-
 main();
diff --git a/extensions/terminal-suggest/scripts/terminalScriptHelpers.ts b/extensions/terminal-suggest/scripts/terminalScriptHelpers.ts
new file mode 100644
index 000000000000..402e6d5d288a
--- /dev/null
+++ b/extensions/terminal-suggest/scripts/terminalScriptHelpers.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 { platform } from 'os';
+import { exec } from 'child_process';
+import { promisify } from 'util';
+
+export const execAsync = promisify(exec);
+
+/**
+ * Cleans up text from terminal control sequences and formatting artifacts
+ */
+export function cleanupText(text: string): string {
+	// Remove ANSI escape codes
+	let cleanedText = text.replace(/\x1b\[\d+m/g, '');
+
+	// Remove backspace sequences (like a\bb which tries to print a, move back, print b)
+	// This regex looks for a character followed by a backspace and another character
+	const backspaceRegex = /.\x08./g;
+	while (backspaceRegex.test(cleanedText)) {
+		cleanedText = cleanedText.replace(backspaceRegex, match => match.charAt(2));
+	}
+
+	// Remove any remaining backspaces and their preceding characters
+	cleanedText = cleanedText.replace(/.\x08/g, '');
+
+	// Remove underscores that are used for formatting in some fish help output
+	cleanedText = cleanedText.replace(/_\b/g, '');
+
+	return cleanedText;
+}
+
+/**
+ * Copyright notice for generated files
+ */
+export const copyright = `/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/`;
+
+/**
+ * Checks if the script is running on Windows and exits if so
+ */
+export function checkWindows(): void {
+	if (platform() === 'win32') {
+		console.error('\x1b[31mThis command is not supported on Windows\x1b[0m');
+		process.exit(1);
+	}
+}
diff --git a/extensions/terminal-suggest/src/shell/fish.ts b/extensions/terminal-suggest/src/shell/fish.ts
index cc2fbaff6e0c..98c1ac09556a 100644
--- a/extensions/terminal-suggest/src/shell/fish.ts
+++ b/extensions/terminal-suggest/src/shell/fish.ts
@@ -3,21 +3,87 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as vscode from 'vscode';
 import type { ICompletionResource } from '../types';
-import { execHelper, getAliasesHelper } from './common';
+import { getAliasesHelper } from './common';
 import { type ExecOptionsWithStringEncoding } from 'node:child_process';
+import { fishBuiltinsCommandDescriptionsCache } from './fishBuiltinsCache';
+
+const commandDescriptionsCache: Map<string, { shortDescription?: string; description: string; args: string | undefined }> | undefined = parseCache(fishBuiltinsCommandDescriptionsCache);
 
 export async function getFishGlobals(options: ExecOptionsWithStringEncoding, existingCommands?: Set<string>): Promise<(string | ICompletionResource)[]> {
 	return [
 		...await getAliases(options),
-		...await getBuiltins(options, existingCommands),
+		...await getBuiltins(options),
 	];
 }
 
-async function getBuiltins(options: ExecOptionsWithStringEncoding, existingCommands?: Set<string>): Promise<string[]> {
-	const compgenOutput = await execHelper('functions -n', options);
-	const filter = (cmd: string) => cmd && !existingCommands?.has(cmd);
-	return compgenOutput.split(', ').filter(filter);
+async function getBuiltins(options: ExecOptionsWithStringEncoding): Promise<(string | ICompletionResource)[]> {
+	const completions: ICompletionResource[] = [];
+
+	// Use the cache directly for all commands
+	for (const cmd of [...commandDescriptionsCache!.keys()]) {
+		try {
+			const result = getCommandDescription(cmd);
+			if (result) {
+				completions.push({
+					label: { label: cmd, description: result.description },
+					detail: result.args,
+					documentation: new vscode.MarkdownString(result.documentation),
+					kind: vscode.TerminalCompletionItemKind.Method
+				});
+			} else {
+				console.warn(`Fish command "${cmd}" not found in cache.`);
+				completions.push({
+					label: cmd,
+					kind: vscode.TerminalCompletionItemKind.Method
+				});
+			}
+		} catch (e) {
+			// Ignore errors
+			completions.push({
+				label: cmd,
+				kind: vscode.TerminalCompletionItemKind.Method
+			});
+		}
+	}
+
+	return completions;
+}
+
+export function getCommandDescription(command: string): { documentation?: string; description?: string; args?: string | undefined } | undefined {
+	if (!commandDescriptionsCache) {
+		return undefined;
+	}
+	const result = commandDescriptionsCache.get(command);
+	if (!result) {
+		return undefined;
+	}
+
+	if (result.shortDescription) {
+		return {
+			description: result.shortDescription,
+			args: result.args,
+			documentation: result.description
+		};
+	} else {
+		return {
+			description: result.description,
+			args: result.args,
+			documentation: result.description
+		};
+	}
+}
+
+function parseCache(cache: Object): Map<string, { shortDescription?: string; description: string; args: string | undefined }> | undefined {
+	if (!cache) {
+		return undefined;
+	}
+	const result = new Map<string, { shortDescription?: string; description: string; args: string | undefined }>();
+	for (const [key, value] of Object.entries(cache)) {
+		result.set(key, value);
+	}
+	return result;
 }
 
 async function getAliases(options: ExecOptionsWithStringEncoding): Promise<ICompletionResource[]> {
diff --git a/extensions/terminal-suggest/src/shell/fishBuiltinsCache.ts b/extensions/terminal-suggest/src/shell/fishBuiltinsCache.ts
new file mode 100644
index 000000000000..2a5aefc4aa67
--- /dev/null
+++ b/extensions/terminal-suggest/src/shell/fishBuiltinsCache.ts
@@ -0,0 +1,301 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export const fishBuiltinsCommandDescriptionsCache = {
+  ".": {
+    "shortDescription": "source - evaluate contents of file",
+    "description": "source evaluates the commands of the specified FILE in the current\nshell as a new block of code. This is different from starting a new\nprocess to perform the commands (i.e. fish < FILE) since the commands\nwill be evaluated by the current shell, which means that changes in\nshell variables will affect the current shell. If additional\narguments are specified after the file name, they will be inserted\ninto the argv variable. The argv variable will not include the name\nof the sourced file.\n\nfish will search the working directory to resolve relative paths but\nwill not search PATH .\n\nIf no file is specified and stdin is not the terminal, or if the file\nname - is used, stdin will be read.\n\nThe exit status of source is the exit status of the last job to\nexecute. If something goes wrong while opening or reading the file,\nsource exits with a non-zero status.\n\n. (a single period) is an alias for the source command. The use of .\nis deprecated in favour of source, and . will be removed in a future\nversion of fish.\n\nsource creates a new local scope; set --local within a sourced block\nwill not affect variables in the enclosing scope.\n\nThe -h or --help option displays help about using this command.\n\nEXAMPLE\n\n   source ~/.config/fish/config.fish\n   # Causes fish to re-read its initialization file.\n\nCAVEATS\nIn fish versions prior to 2.3.0, the argv variable would have a\nsingle element (the name of the sourced file) if no arguments are\npresent. Otherwise, it would contain arguments without the name of\nthe sourced file. That behavior was very confusing and unlike other\nshells such as bash and zsh.",
+    "args": "source FILE [ARGUMENTS ...]\nSOMECOMMAND | source"
+  },
+  ":": {
+    "shortDescription": "No operation command",
+    "description": "The `:` command is a no-op (no operation) command that returns a successful (zero) exit status. It can be used as a placeholder in scripts where a command is syntactically required but no action is desired."
+  },
+  "[": {
+    "shortDescription": "Test if a statement is true",
+    "description": "Evaluate an expression and return a status of true (0) or false (non-zero). Unlike the `test` command, the `[` command requires a closing `]`.",
+    "args": "EXPRESSION ]"
+  },
+  "_": {
+    "shortDescription": "",
+    "description": ""
+  },
+  "abbr": {
+    "shortDescription": "manage fish abbreviations",
+    "description": "abbr manages abbreviations - user-defined words that are replaced\nwith longer phrases when entered.\n\nNOTE:\n   Only typed-in commands use abbreviations. Abbreviations are not\n   expanded in scripts.\n\nFor example, a frequently-run command like git checkout can be\nabbreviated to gco.  After entering gco and pressing Space or Enter,\nthe full text git checkout will appear in the command line.  To avoid\nexpanding something that looks like an abbreviation, the default\nControl+Space binding inserts a space without expanding.\n\nAn abbreviation may match a literal word, or it may match a pattern\ngiven by a regular expression. When an abbreviation matches a word,\nthat word is replaced by new text, called its expansion. This\nexpansion may be a fixed new phrase, or it can be dynamically created\nvia a fish function. This expansion occurs after pressing space or\nenter.\n\nCombining these features, it is possible to create custom syntaxes,\nwhere a regular expression recognizes matching tokens, and the\nexpansion function interprets them. See the Examples section.\n\nChanged in version 3.6.0: Previous versions of this allowed saving\nabbreviations in universal variables.  That's no longer possible.\nExisting variables will still be imported and abbr --erase will also\nerase the variables.  We recommend adding abbreviations to\nconfig.fish by just adding the abbr --add command.  When you run\nabbr, you will see output like this\n\n   > abbr\n   abbr -a -- foo bar # imported from a universal variable, see `help abbr`\n\nIn that case you should take the part before the # comment and save\nit in config.fish, then you can run abbr --erase to remove the\nuniversal variable:\n\n   > abbr >> ~/.config/fish/config.fish\n   > abbr --erase (abbr --list)\n\nADD SUBCOMMAND\nabbr [-a | --add] NAME [--position command | anywhere] [-r | --regex PATTERN]\n     [--set-cursor[=MARKER]] ([-f | --function FUNCTION] | EXPANSION)\n\nabbr --add creates a new abbreviation. With no other options, the\nstring NAME is replaced by EXPANSION.\n\nWith --position command, the abbreviation will only expand when it is\npositioned as a command, not as an argument to another command. With\n--position anywhere the abbreviation may expand anywhere in the\ncommand line. The default is command.\n\nWith --regex, the abbreviation matches using the regular expression\ngiven by PATTERN, instead of the literal NAME. The pattern is\ninterpreted using PCRE2 syntax and must match the entire token. If\nmultiple abbreviations match the same token, the last abbreviation\nadded is used.\n\nWith --set-cursor=MARKER, the cursor is moved to the first occurrence\nof MARKER in the expansion. The MARKER value is erased. The MARKER\nmay be omitted (i.e. simply --set-cursor), in which case it defaults\nto %.\n\nWith -f FUNCTION or --function FUNCTION, FUNCTION is treated as the\nname of a fish function instead of a literal replacement. When the\nabbreviation matches, the function will be called with the matching\ntoken as an argument. If the function's exit status is 0 (success),\nthe token will be replaced by the function's output; otherwise the\ntoken will be left unchanged. No EXPANSION may be given separately.\n\n   Examples\n\n   abbr --add gco git checkout\n\nAdd a new abbreviation where gco will be replaced with git checkout.\n\n   abbr -a --position anywhere -- -C --color\n\nAdd a new abbreviation where -C will be replaced with --color. The --\nallows -C to be treated as the name of the abbreviation, instead of\nan option.\n\n   abbr -a L --position anywhere --set-cursor \"% | less\"\n\nAdd a new abbreviation where L will be replaced with | less, placing\nthe cursor before the pipe.\n\n   function last_history_item\n       echo $history[1]\n   end\n   abbr -a !! --position anywhere --function last_history_item\n\nThis first creates a function last_history_item which outputs the\nlast entered command. It then adds an abbreviation which replaces !!\nwith the result of calling this function. Taken together, this is\nsimilar to the !! history expansion feature of bash.\n\n   function vim_edit\n       echo vim $argv\n   end\n   abbr -a vim_edit_texts --position command --regex \".+\\.txt\" --function vim_edit\n\nThis first creates a function vim_edit which prepends vim before its\nargument. It then adds an abbreviation which matches commands ending\nin .txt, and replaces the command with the result of calling this\nfunction. This allows text files to be \"executed\" as a command to\nopen them in vim, similar to the \"suffix alias\" feature in zsh.\n\n   abbr 4DIRS --set-cursor=! \"$(string join \\n -- 'for dir in */' 'cd $dir' '!' 'cd ..' 'end')\"\n\nThis creates an abbreviation \"4DIRS\" which expands to a multi-line\nloop \"template.\" The template enters each directory and then leaves\nit. The cursor is positioned ready to enter the command to run in\neach directory, at the location of the !, which is itself erased.\n\nOTHER SUBCOMMANDS\n\n   abbr --rename OLD_NAME NEW_NAME\n\nRenames an abbreviation, from OLD_NAME to NEW_NAME\n\n   abbr [-s | --show]\n\nShow all abbreviations in a manner suitable for import and export\n\n   abbr [-l | --list]\n\nPrints the names of all abbreviation\n\n   abbr [-e | --erase] NAME\n\nErases the abbreviation with the given name\n\n   abbr -q or --query [NAME...]\n\nReturn 0 (true) if one of the NAME is an abbreviation.\n\n   abbr -h or --help\n\nDisplays help for the abbr command.",
+    "args": "abbr --add NAME [--position command | anywhere] [-r | --regex PATTERN]\n[--set-cursor[=MARKER]] ([-f | --function FUNCTION] | EXPANSION)\nabbr --erase NAME ...\nabbr --rename OLD_WORD NEW_WORD\nabbr --show\nabbr --list\nabbr --query NAME ..."
+  },
+  "and": {
+    "shortDescription": "conditionally execute a command",
+    "description": "and is used to execute a command if the previous command was\nsuccessful (returned a status of 0).\n\nand statements may be used as part of the condition in an while or if\nblock.\n\nand does not change the current exit status itself, but the command\nit runs most likely will. The exit status of the last foreground\ncommand to exit can always be accessed using the $status variable.\n\nThe -h or --help option displays help about using this command.\n\nEXAMPLE\nThe following code runs the make command to build a program. If the\nbuild succeeds, make's exit status is 0, and the program is\ninstalled. If either step fails, the exit status is 1, and make clean\nis run, which removes the files created by the build process.\n\n   make; and make install; or make clean\n\nSEE ALSO\n\n• or command\n\n• not command",
+    "args": "PREVIOUS; and COMMAND"
+  },
+  "argparse": {
+    "shortDescription": "parse options passed to a fish script or function",
+    "description": "This command makes it easy for fish scripts and functions to handle\narguments. You pass arguments that define the known options, followed\nby a literal --, then the arguments to be parsed (which might also\ninclude a literal --). argparse then sets variables to indicate the\npassed options with their values, and sets $argv to the remaining\narguments. See the usage section below.\n\nEach option specification (OPTION_SPEC) is written in the domain\nspecific language described below. All OPTION_SPECs must appear after\nany argparse flags and before the -- that separates them from the\narguments to be parsed.\n\nEach option that is seen in the ARG list will result in variables\nnamed _flag_X, where X is the short flag letter and the long flag\nname (if they are defined). For example a --help option could cause\nargparse to define one variable called _flag_h and another called\n_flag_help.\n\nThe variables will be set with local scope (i.e., as if the script\nhad done set -l _flag_X). If the flag is a boolean (that is, it just\nis passed or not, it doesn't have a value) the values are the short\nand long flags seen. If the option is not a boolean the values will\nbe zero or more values corresponding to the values collected when the\nARG list is processed. If the flag was not seen the flag variable\nwill not be set.\n\nOPTIONS\nThe following argparse options are available. They must appear before\nall OPTION_SPECs:\n\n-n or --name\n       The command name for use in error messages. By default the\n       current function name will be used, or argparse if run outside\n       of a function.\n\n-x or --exclusive OPTIONS\n       A comma separated list of options that are mutually exclusive.\n       You can use this more than once to define multiple sets of\n       mutually exclusive options.  You give either the short or long\n       version of each option, and you still need to otherwise define\n       the options.\n\n-N or --min-args NUMBER\n       The minimum number of acceptable non-option arguments. The\n       default is zero.\n\n-X or --max-args NUMBER\n       The maximum number of acceptable non-option arguments. The\n       default is infinity.\n\n-i or --ignore-unknown\n       Ignores unknown options, keeping them and their arguments in\n       $argv instead.\n\n-s or --stop-nonopt\n       Causes scanning the arguments to stop as soon as the first\n       non-option argument is seen. Among other things, this is\n       useful to implement subcommands that have their own options.\n\n-h or --help\n       Displays help about using this command.\n\nUSAGE\nTo use this command, pass the option specifications (OPTION_SPEC), a\nmandatory --, and then the arguments to be parsed.\n\nA simple example:\n\n   argparse --name=my_function 'h/help' 'n/name=' -- $argv\n   or return\n\nIf $argv is empty then there is nothing to parse and argparse returns\nzero to indicate success. If $argv is not empty then it is checked\nfor flags -h, --help, -n and --name. If they are found they are\nremoved from the arguments and local variables called _flag_OPTION\nare set so the script can determine which options were seen. If $argv\ndoesn't have any errors, like a missing mandatory value for an\noption, then argparse exits with a status of zero. Otherwise it\nwrites appropriate error messages to stderr and exits with a status\nof one.\n\nThe or return means that the function returns argparse's status if it\nfailed, so if it goes on argparse succeeded.\n\nThe -- argument is required. You do not have to include any option\nspecifications or arguments after the -- but you must include the --.\nFor example, this is acceptable:\n\n   set -l argv foo\n   argparse 'h/help' 'n/name' -- $argv\n   argparse --min-args=1 -- $argv\n\nBut this is not:\n\n   set -l argv\n   argparse 'h/help' 'n/name' $argv\n\nThe first -- seen is what allows the argparse command to reliably\nseparate the option specifications and options to argparse itself\n(like --ignore-unknown) from the command arguments, so it is\nrequired.\n\nOPTION SPECIFICATIONS\nEach option specification consists of:\n\n• An optional alphanumeric short flag character, followed by a / if\n  the short flag can be used by someone invoking your command or, for\n  backwards compatibility, a - if it should not be exposed as a valid\n  short flag (in which case it will also not be exposed as a flag\n  variable).\n\n• An optional long flag name, which if not present the short flag can\n  be used, and if that is also not present, an error is reported\n\n• Nothing if the flag is a boolean that takes no argument or is an\n  integer flag, or\n\n     • = if it requires a value and only the last instance of the\n       flag is saved, or\n\n     • =? if it takes an optional value and only the last instance of\n       the flag is saved, or\n\n     • =+ if it requires a value and each instance of the flag is\n       saved.\n\n• Optionally a ! followed by fish script to validate the value.\n  Typically this will be a function to run. If the exit status is\n  zero the value for the flag is valid. If non-zero the value is\n  invalid. Any error messages should be written to stdout (not\n  stderr). See the section on Flag Value Validation for more\n  information.\n\nSee the fish_opt command for a friendlier but more verbose way to\ncreate option specifications.\n\nIf a flag is not seen when parsing the arguments then the\ncorresponding _flag_X var(s) will not be set.\n\nINTEGER FLAG\nSometimes commands take numbers directly as options, like foo -55. To\nallow this one option spec can have the # modifier so that any\ninteger will be understood as this flag, and the last number will be\ngiven as its value (as if = was used).\n\nThe # must follow the short flag letter (if any), and other modifiers\nlike = are not allowed, except for - (for backwards compatibility):\n\n   m#maximum\n\nThis does not read numbers given as +NNN, only those that look like\nflags - -NNN.\n\nNOTE: OPTIONAL ARGUMENTS\nAn option defined with =? can take optional arguments. Optional\narguments have to be directly attached to the option they belong to.\n\nThat means the argument will only be used for the option if you use\nit like:\n\n   cmd --flag=value\n   # or\n   cmd  -fvalue\n\nbut not if used like:\n\n   cmd --flag value\n   # \"value\" here will be used as a positional argument\n   # and \"--flag\" won't have an argument.\n\nIf this weren't the case, using an option without an optional\nargument would be difficult if you also wanted to use positional\narguments.\n\nFor example:\n\n   grep --color auto\n   # Here \"auto\" will be used as the search string,\n   # \"color\" will not have an argument and will fall back to the default,\n   # which also *happens to be* auto.\n   grep --color always\n   # Here grep will still only use color \"auto\"matically\n   # and search for the string \"always\".\n\nThis isn't specific to argparse but common to all things using\ngetopt(3) (if they have optional arguments at all). That grep example\nis how GNU grep actually behaves.\n\nFLAG VALUE VALIDATION\nSometimes you need to validate the option values. For example, that\nit is a valid integer within a specific range, or an ip address, or\nsomething entirely different. You can always do this after argparse\nreturns but you can also request that argparse perform the validation\nby executing arbitrary fish script. To do so simply append an !\n(exclamation-mark) then the fish script to be run. When that code is\nexecuted three vars will be defined:\n\n• _argparse_cmd will be set to the value of the value of the argparse\n  --name value.\n\n• _flag_name will be set to the short or long flag that being\n  processed.\n\n• _flag_value will be set to the value associated with the flag being\n  processed.\n\nThese variables are passed to the function as local exported\nvariables.\n\nThe script should write any error messages to stdout, not stderr. It\nshould return a status of zero if the flag value is valid otherwise a\nnon-zero status to indicate it is invalid.\n\nFish ships with a _validate_int function that accepts a --min and\n--max flag. Let's say your command accepts a -m or --max flag and the\nminimum allowable value is zero and the maximum is 5. You would\ndefine the option like this: m/max=!_validate_int --min 0 --max 5.\nThe default if you just call _validate_int without those flags is to\nsimply check that the value is a valid integer with no limits on the\nmin or max value allowed.\n\nHere are some examples of flag validations:\n\n   # validate that a path is a directory\n   argparse 'p/path=!test -d \"$_flag_value\"' -- --path $__fish_config_dir\n   # validate that a function does not exist\n   argparse 'f/func=!not functions -q \"$_flag_value\"' -- -f alias\n   # validate that a string matches a regex\n   argparse 'c/color=!string match -rq \\'^#?[0-9a-fA-F]{6}$\\' \"$_flag_value\"' -- -c 'c0ffee'\n   # validate with a validator function\n   argparse 'n/num=!_validate_int --min 0 --max 99' -- --num 42\n\nEXAMPLE OPTION_SPECS\nSome OPTION_SPEC examples:\n\n• h/help means that both -h and --help are valid. The flag is a\n  boolean and can be used more than once. If either flag is used then\n  _flag_h and _flag_help will be set to however either flag was seen,\n  as many times as it was seen. So it could be set to -h, -h and\n  --help, and count $_flag_h would yield \"3\".\n\n• help means that only --help is valid. The flag is a boolean and can\n  be used more than once. If it is used then _flag_help will be set\n  as above. Also h-help (with an arbitrary short letter) for\n  backwards compatibility.\n\n• longonly= is a flag --longonly that requires an option, there is no\n  short flag or even short flag variable.\n\n• n/name= means that both -n and --name are valid. It requires a\n  value and can be used at most once. If the flag is seen then\n  _flag_n and _flag_name will be set with the single mandatory value\n  associated with the flag.\n\n• n/name=? means that both -n and --name are valid. It accepts an\n  optional value and can be used at most once. If the flag is seen\n  then _flag_n and _flag_name will be set with the value associated\n  with the flag if one was provided else it will be set with no\n  values.\n\n• name=+ means that only --name is valid. It requires a value and can\n  be used more than once. If the flag is seen then _flag_name will be\n  set with the values associated with each occurrence.\n\n• x means that only -x is valid. It is a boolean that can be used\n  more than once. If it is seen then _flag_x will be set as above.\n\n• x=, x=?, and x=+ are similar to the n/name examples above but there\n  is no long flag alternative to the short flag -x.\n\n• #max (or #-max) means that flags matching the regex \"^--?\\d+$\" are\n  valid. When seen they are assigned to the variable _flag_max. This\n  allows any valid positive or negative integer to be specified by\n  prefixing it with a single \"-\". Many commands support this idiom.\n  For example head -3 /a/file to emit only the first three lines of\n  /a/file.\n\n• n#max means that flags matching the regex \"^--?\\d+$\" are valid.\n  When seen they are assigned to the variables _flag_n and _flag_max.\n  This allows any valid positive or negative integer to be specified\n  by prefixing it with a single \"-\". Many commands support this\n  idiom. For example head -3 /a/file to emit only the first three\n  lines of /a/file. You can also specify the value using either flag:\n  -n NNN or --max NNN in this example.\n\n• #longonly causes the last integer option to be stored in\n  _flag_longonly.\n\nAfter parsing the arguments the argv variable is set with local scope\nto any values not already consumed during flag processing. If there\nare no unbound values the variable is set but count $argv will be\nzero.\n\nIf an error occurs during argparse processing it will exit with a\nnon-zero status and print error messages to stderr.\n\nEXAMPLES\nA simple use:\n\n   argparse h/help -- $argv\n   or return\n\n   if set -q _flag_help\n       # TODO: Print help here\n       return 0\n   end\n\nThis just wants one option - -h / --help. Any other option is an\nerror. If it is given it prints help and exits.\n\nHow fish_add_path - add to the path parses its args:\n\n   argparse -x g,U -x P,U -x a,p g/global U/universal P/path p/prepend a/append h/help m/move v/verbose n/dry-run -- $argv\n\nThere are a variety of boolean flags, all with long and short\nversions. A few of these cannot be used together, and that is what\nthe -x flag is used for.  -x g,U means that --global and --universal\nor their short equivalents conflict, and if they are used together\nyou get an error.  In this case you only need to give the short or\nlong flag, not the full option specification.\n\nAfter this it figures out which variable it should operate on\naccording to the --path flag:\n\n   set -l var fish_user_paths\n   set -q _flag_path\n   and set var PATH\n\nLIMITATIONS\nOne limitation with --ignore-unknown is that, if an unknown option is\ngiven in a group with known options, the entire group will be kept in\n$argv. argparse will not do any permutations here.\n\nFor instance:\n\n   argparse --ignore-unknown h -- -ho\n   echo $_flag_h # is -h, because -h was given\n   echo $argv # is still -ho\n\nThis limitation may be lifted in future.\n\nAdditionally, it can only parse known options up to the first unknown\noption in the group - the unknown option could take options, so it\nisn't clear what any character after an unknown option means.",
+    "args": "argparse [OPTIONS] OPTION_SPEC ... -- [ARG ...]"
+  },
+  "begin": {
+    "shortDescription": "start a new block of code",
+    "description": "begin is used to create a new block of code.\n\nA block allows the introduction of a new variable scope, redirection\nof the input or output of a set of commands as a group, or to specify\nprecedence when using the conditional commands like and.\n\nThe block is unconditionally executed. begin; ...; end is equivalent\nto if true; ...; end.\n\nbegin does not change the current exit status itself. After the block\nhas completed, $status will be set to the status returned by the most\nrecent command.\n\nThe -h or --help option displays help about using this command.\n\nEXAMPLE\nThe following code sets a number of variables inside of a block\nscope. Since the variables are set inside the block and have local\nscope, they will be automatically deleted when the block ends.\n\n   begin\n       set -l PIRATE Yarrr\n\n       ...\n   end\n\n   echo $PIRATE\n   # This will not output anything, since the PIRATE variable\n   # went out of scope at the end of the block\n\nIn the following code, all output is redirected to the file out.html.\n\n   begin\n       echo $xml_header\n       echo $html_header\n       if test -e $file\n           ...\n       end\n       ...\n   end > out.html",
+    "args": "begin; [COMMANDS ...]; end"
+  },
+  "bg": {
+    "shortDescription": "send jobs to background",
+    "description": "bg sends jobs to the background, resuming them if they are stopped.\n\nA background job is executed simultaneously with fish, and does not\nhave access to the keyboard. If no job is specified, the last job to\nbe used is put in the background. If PID is specified, the jobs\ncontaining the specified process IDs are put in the background.\n\nFor compatibility with other shells, job expansion syntax is\nsupported for bg. A PID of the format %1 will be interpreted as the\nPID of job 1. Job numbers can be seen in the output of jobs.\n\nWhen at least one of the arguments isn't a valid job specifier, bg\nwill print an error without backgrounding anything.\n\nWhen all arguments are valid job specifiers, bg will background all\nmatching jobs that exist.\n\nThe -h or --help option displays help about using this command.\n\nEXAMPLE\nbg 123 456 789 will background the jobs that contain processes 123,\n456 and 789.\n\nIf only 123 and 789 exist, it will still background them and print an\nerror about 456.\n\nbg 123 banana or bg banana 123 will complain that \"banana\" is not a\nvalid job specifier.\n\nbg %1 will background job 1.",
+    "args": "bg [PID ...]"
+  },
+  "bind": {
+    "shortDescription": "handle fish key bindings",
+    "description": "bind manages bindings.\n\nIt can add bindings if given a SEQUENCE of characters to bind to.\nThese should be written as fish escape sequences. The most important\nof these are \\c for the control key, and \\e for escape, and because\nof historical reasons also the Alt key (sometimes also called\n\"Meta\").\n\nFor example, Alt+W can be written as \\ew, and Control+X (^X) can be\nwritten as \\cx. Note that Alt-based key bindings are case sensitive\nand Control-based key bindings are not. This is a constraint of\ntext-based terminals, not fish.\n\nThe generic key binding that matches if no other binding does can be\nset by specifying a SEQUENCE of the empty string (that is, '' ). For\nmost key bindings, it makes sense to bind this to the self-insert\nfunction (i.e. bind '' self-insert). This will insert any keystrokes\nnot specifically bound to into the editor. Non-printable characters\nare ignored by the editor, so this will not result in control\nsequences being inserted.\n\nIf the -k switch is used, the name of a key (such as 'down', 'up' or\n'backspace') is used instead of a sequence. The names used are the\nsame as the corresponding curses variables, but without the 'key'\nprefix. (See terminfo(5) for more information, or use bind\n--key-names for a list of all available named keys). Normally this\nwill print an error if the current $TERM entry doesn't have a given\nkey, unless the -s switch is given.\n\nTo find out what sequence a key combination sends, you can use\nfish_key_reader.\n\nCOMMAND can be any fish command, but it can also be one of a set of\nspecial input functions. These include functions for moving the\ncursor, operating on the kill-ring, performing tab completion, etc.\nUse bind --function-names for a complete list of these input\nfunctions.\n\nWhen COMMAND is a shellscript command, it is a good practice to put\nthe actual code into a function and simply bind to the function name.\nThis way it becomes significantly easier to test the function while\nediting, and the result is usually more readable as well.\n\nNOTE:\n   Special input functions cannot be combined with ordinary shell\n   script commands. The commands must be entirely a sequence of\n   special input functions (from bind -f) or all shell script\n   commands (i.e., valid fish script). To run special input functions\n   from regular fish script, use commandline -f (see also\n   commandline). If a script produces output, it should finish by\n   calling commandline -f repaint to tell fish that a repaint is in\n   order.\n\nIf no SEQUENCE is provided, all bindings (or just the bindings in the\ngiven MODE) are printed. If SEQUENCE is provided but no COMMAND, just\nthe binding matching that sequence is printed.\n\nTo save custom key bindings, put the bind statements into\nconfig.fish. Alternatively, fish also automatically executes a\nfunction called fish_user_key_bindings if it exists.\n\nKey bindings may use \"modes\", which mimics Vi's modal input behavior.\nThe default mode is \"default\". Every key binding applies to a single\nmode; you can specify which one with -M MODE. If the key binding\nshould change the mode, you can specify the new mode with -m\nNEW_MODE. The mode can be viewed and changed via the $fish_bind_mode\nvariable. If you want to change the mode from inside a fish function,\nuse set fish_bind_mode MODE.\n\nOPTIONS\nThe following options are available:\n\n-k or --key\n       Specify a key name, such as 'left' or 'backspace' instead of a\n       character sequence\n\n-K or --key-names\n       Display a list of available key names. Specifying -a or --all\n       includes keys that don't have a known mapping\n\n-f or --function-names\n       Display a list of available input functions\n\n-L or --list-modes\n       Display a list of defined bind modes\n\n-M MODE or --mode MODE\n       Specify a bind mode that the bind is used in. Defaults to\n       \"default\"\n\n-m NEW_MODE or --sets-mode NEW_MODE\n       Change the current mode to NEW_MODE after this binding is\n       executed\n\n-e or --erase\n       Erase the binding with the given sequence and mode instead of\n       defining a new one.  Multiple sequences can be specified with\n       this flag.  Specifying -a or --all with -M or --mode erases\n       all binds in the given mode regardless of sequence.\n       Specifying -a or --all without -M or --mode erases all binds\n       in all modes regardless of sequence.\n\n-a or --all\n       See --erase and --key-names\n\n--preset and --user\n       Specify if bind should operate on user or preset bindings.\n       User bindings take precedence over preset bindings when fish\n       looks up mappings.  By default, all bind invocations work on\n       the \"user\" level except for listing, which will show both\n       levels.  All invocations except for inserting new bindings can\n       operate on both levels at the same time (if both --preset and\n       --user are given).  --preset should only be used in full\n       binding sets (like when working on fish_vi_key_bindings).\n\n-s or --silent\n       Silences some of the error messages, including for unknown key\n       names and unbound sequences.\n\n-h or --help\n       Displays help about using this command.\n\nSPECIAL INPUT FUNCTIONS\nThe following special input functions are available:\n\nand    only execute the next function if the previous succeeded\n       (note: only some functions report success)\n\naccept-autosuggestion\n       accept the current autosuggestion\n\nbackward-char\n       move one character to the left.  If the completion pager is\n       active, select the previous completion instead.\n\nbackward-bigword\n       move one whitespace-delimited word to the left\n\nbackward-delete-char\n       deletes one character of input to the left of the cursor\n\nbackward-kill-bigword\n       move the whitespace-delimited word to the left of the cursor\n       to the killring\n\nbackward-kill-line\n       move everything from the beginning of the line to the cursor\n       to the killring\n\nbackward-kill-path-component\n       move one path component to the left of the cursor to the\n       killring. A path component is everything likely to belong to a\n       path component, i.e. not any of the following: /={,}'\":@\n       |;<>&, plus newlines and tabs.\n\nbackward-kill-word\n       move the word to the left of the cursor to the killring. The\n       \"word\" here is everything up to punctuation or whitespace.\n\nbackward-word\n       move one word to the left\n\nbeginning-of-buffer\n       moves to the beginning of the buffer, i.e. the start of the\n       first line\n\nbeginning-of-history\n       move to the beginning of the history\n\nbeginning-of-line\n       move to the beginning of the line\n\nbegin-selection\n       start selecting text\n\ncancel cancel the current commandline and replace it with a new empty\n       one\n\ncancel-commandline\n       cancel the current commandline and replace it with a new empty\n       one, leaving the old one in place with a marker to show that\n       it was cancelled\n\ncapitalize-word\n       make the current word begin with a capital letter\n\nclear-screen\n       clears the screen and redraws the prompt. if the terminal\n       doesn't support clearing the screen it is the same as repaint.\n\ncomplete\n       guess the remainder of the current token\n\ncomplete-and-search\n       invoke the searchable pager on completion options (for\n       convenience, this also moves backwards in the completion\n       pager)\n\ndelete-char\n       delete one character to the right of the cursor\n\ndelete-or-exit\n       delete one character to the right of the cursor, or exit the\n       shell if the commandline is empty\n\ndown-line\n       move down one line\n\ndowncase-word\n       make the current word lowercase\n\nend-of-buffer\n       moves to the end of the buffer, i.e. the end of the first line\n\nend-of-history\n       move to the end of the history\n\nend-of-line\n       move to the end of the line\n\nend-selection\n       end selecting text\n\nexpand-abbr\n       expands any abbreviation currently under the cursor\n\nexecute\n       run the current commandline\n\nexit   exit the shell\n\nforward-bigword\n       move one whitespace-delimited word to the right\n\nforward-char\n       move one character to the right; or if at the end of the\n       commandline, accept the current autosuggestion.  If the\n       completion pager is active, select the next completion\n       instead.\n\nforward-single-char\n       move one character to the right; or if at the end of the\n       commandline, accept a single char from the current\n       autosuggestion.\n\nforward-word\n       move one word to the right; or if at the end of the\n       commandline, accept one word from the current autosuggestion.\n\nhistory-pager\n       invoke the searchable pager on history (incremental search);\n       or if the history pager is already active, search further\n       backwards in time.\n\nhistory-pager-delete\n       permanently delete the history item selected in the history\n       pager\n\nhistory-search-backward\n       search the history for the previous match\n\nhistory-search-forward\n       search the history for the next match\n\nhistory-prefix-search-backward\n       search the history for the previous prefix match\n\nhistory-prefix-search-forward\n       search the history for the next prefix match\n\nhistory-token-search-backward\n       search the history for the previous matching argument\n\nhistory-token-search-forward\n       search the history for the next matching argument\n\nforward-jump and backward-jump\n       read another character and jump to its next occurence\n       after/before the cursor\n\nforward-jump-till and backward-jump-till\n       jump to right before the next occurence\n\nrepeat-jump and repeat-jump-reverse\n       redo the last jump in the same/opposite direction\n\nkill-bigword\n       move the next whitespace-delimited word to the killring\n\nkill-line\n       move everything from the cursor to the end of the line to the\n       killring\n\nkill-selection\n       move the selected text to the killring\n\nkill-whole-line\n       move the line (including the following newline) to the\n       killring. If the line is the last line, its preceeding newline\n       is also removed\n\nkill-inner-line\n       move the line (without the following newline) to the killring\n\nkill-word\n       move the next word to the killring\n\nnextd-or-forward-word\n       if the commandline is empty, then move forward in the\n       directory history, otherwise move one word to the right; or if\n       at the end of the commandline, accept one word from the\n       current autosuggestion.\n\nor     only execute the next function if the previous did not succeed\n       (note: only some functions report failure)\n\npager-toggle-search\n       toggles the search field if the completions pager is visible;\n       or if used after history-pager, search forwards in time.\n\nprevd-or-backward-word\n       if the commandline is empty, then move backward in the\n       directory history, otherwise move one word to the left\n\nrepaint\n       reexecutes the prompt functions and redraws the prompt (also\n       force-repaint for backwards-compatibility)\n\nrepaint-mode\n       reexecutes the fish_mode_prompt and redraws the prompt. This\n       is useful for vi-mode. If no fish_mode_prompt exists or it\n       prints nothing, it acts like a normal repaint.\n\nself-insert\n       inserts the matching sequence into the command line\n\nself-insert-notfirst\n       inserts the matching sequence into the command line, unless\n       the cursor is at the beginning\n\nsuppress-autosuggestion\n       remove the current autosuggestion. Returns true if there was a\n       suggestion to remove.\n\nswap-selection-start-stop\n       go to the other end of the highlighted text without changing\n       the selection\n\ntranspose-chars\n       transpose two characters to the left of the cursor\n\ntranspose-words\n       transpose two words to the left of the cursor\n\ntogglecase-char\n       toggle the capitalisation (case) of the character under the\n       cursor\n\ntogglecase-selection\n       toggle the capitalisation (case) of the selection\n\ninsert-line-under\n       add a new line under the current line\n\ninsert-line-over\n       add a new line over the current line\n\nup-line\n       move up one line\n\nundo and redo\n       revert or redo the most recent edits on the command line\n\nupcase-word\n       make the current word uppercase\n\nyank   insert the latest entry of the killring into the buffer\n\nyank-pop\n       rotate to the previous entry of the killring\n\nADDITIONAL FUNCTIONS\nThe following functions are included as normal functions, but are\nparticularly useful for input editing:\n\nup-or-search and down-or-search\n       move the cursor or search the history depending on the cursor\n       position and current mode\n\nedit_command_buffer\n       open the visual editor (controlled by the VISUAL or EDITOR\n       environment variables) with the current command-line contents\n\nfish_clipboard_copy\n       copy the current selection to the system clipboard\n\nfish_clipboard_paste\n       paste the current selection from the system clipboard before\n       the cursor\n\nfish_commandline_append\n       append the argument to the command-line. If the command-line\n       already ends with the argument, this removes the suffix\n       instead. Starts with the last command from history if the\n       command-line is empty.\n\nfish_commandline_prepend\n       prepend the argument to the command-line. If the command-line\n       already starts with the argument, this removes the prefix\n       instead. Starts with the last command from history if the\n       command-line is empty.\n\nEXAMPLES\nExit the shell when Control+D is pressed:\n\n   bind \\cd 'exit'\n\nPerform a history search when Page Up is pressed:\n\n   bind -k ppage history-search-backward\n\nTurn on Vi key bindings and rebind Control+C to clear the input line:\n\n   set -g fish_key_bindings fish_vi_key_bindings\n   bind -M insert \\cc kill-whole-line repaint\n\nLaunch git diff and repaint the commandline afterwards when Control+G\nis pressed:\n\n   bind \\cg 'git diff; commandline -f repaint'\n\nTERMINAL LIMITATIONS\nUnix terminals, like the ones fish operates in, are at heart 70s\ntechnology. They have some limitations that applications running\ninside them can't workaround.\n\nFor instance, the control key modifies a character by setting the top\nthree bits to 0. This means:\n\n• Many characters + control are indistinguishable from other keys.\n  Control+I is tab, Control+J is newline (\\n).\n\n• Control and shift don't work simultaneously\n\nOther keys don't have a direct encoding, and are sent as escape\nsequences. For example → (Right) often sends \\e\\[C. These can differ\nfrom terminal to terminal, and the mapping is typically available in\nterminfo(5). Sometimes however a terminal identifies as e.g.\nxterm-256color for compatibility, but then implements xterm's\nsequences incorrectly.\n\nSPECIAL CASE: THE ESCAPE CHARACTER\nThe escape key can be used standalone, for example, to switch from\ninsertion mode to normal mode when using Vi keybindings. Escape can\nalso be used as a \"meta\" key, to indicate the start of an escape\nsequence, like for function or arrow keys. Custom bindings can also\nbe defined that begin with an escape character.\n\nHolding alt and something else also typically sends escape, for\nexample holding alt+a will send an escape character and then an \"a\".\n\nfish waits for a period after receiving the escape character, to\ndetermine whether it is standalone or part of an escape sequence.\nWhile waiting, additional key presses make the escape key behave as a\nmeta key. If no other key presses come in, it is handled as a\nstandalone escape. The waiting period is set to 30 milliseconds (0.03\nseconds). It can be configured by setting the fish_escape_delay_ms\nvariable to a value between 10 and 5000 ms. This can be a universal\nvariable that you set once from an interactive session.  So the\nescape character has its own timeout configured with\nfish_escape_delay_ms.\n\nSee also Key sequences.",
+    "args": "bind [(-M | --mode) MODE] [(-m | --sets-mode) NEW_MODE] [--preset | --user] [-s | --silent] [-k | --key] SEQUENCE COMMAND ...\nbind [(-M | --mode) MODE] [-k | --key] [--preset] [--user] SEQUENCE\nbind (-K | --key-names) [-a | --all] [--preset] [--user]\nbind (-f | --function-names)\nbind (-L | --list-modes)\nbind (-e | --erase) [(-M | --mode) MODE] [--preset] [--user] [-a | --all] | [-k | --key] SEQUENCE ..."
+  },
+  "block": {
+    "shortDescription": "temporarily block delivery of events",
+    "description": "block prevents events triggered by fish or the emit command from\nbeing delivered and acted upon while the block is in place.\n\nIn functions, block can be useful while performing work that should\nnot be interrupted by the shell.\n\nThe block can be removed. Any events which triggered while the block\nwas in place will then be delivered.\n\nEvent blocks should not be confused with code blocks, which are\ncreated with begin, if, while or for\n\nWithout options, the block command acts with function scope.\n\nThe following options are available:\n\n-l or --local\n       Release the block automatically at the end of the current\n       innermost code block scope.\n\n-g or --global\n       Never automatically release the lock.\n\n-e or --erase\n       Release global block.\n\n-h or --help\n       Displays help about using this command.\n\nEXAMPLE\n\n   # Create a function that listens for events\n   function --on-event foo foo; echo 'foo fired'; end\n\n   # Block the delivery of events\n   block -g\n\n   emit foo\n   # No output will be produced\n\n   block -e\n   # 'foo fired' will now be printed\n\nNOTES\nEvents are only received from the current fish process as there is no\nway to send events from one fish process to another (yet).",
+    "args": "block [(--local | --global)]\nblock --erase"
+  },
+  "break": {
+    "shortDescription": "Exit the current loop",
+    "description": "Terminate the execution of the nearest enclosing `while` or `for` loop and proceed with the next command after the loop."
+  },
+  "breakpoint": {
+    "shortDescription": "Launch debug mode",
+    "description": "Pause execution and launch an interactive debug prompt. This is useful for inspecting the state of a script at a specific point."
+  },
+  "builtin": {
+    "shortDescription": "run a builtin command",
+    "description": "builtin forces the shell to use a builtin command named BUILTIN,\nrather than a function or external program.\n\nThe following options are available:\n\n-n or --names\n       Lists the names of all defined builtins.\n\n-q or --query BUILTIN\n       Tests if any of the specified builtins exist. If any exist, it\n       returns 0, 1 otherwise.\n\n-h or --help\n       Displays help about using this command.\n\nEXAMPLE\n\n   builtin jobs\n   # executes the jobs builtin, even if a function named jobs exists",
+    "args": "builtin [OPTIONS] BUILTINNAME\nbuiltin --query BUILTINNAME ...\nbuiltin --names"
+  },
+  "case": {
+    "shortDescription": "Match a value against patterns",
+    "description": "Within a `switch` block, the `case` command specifies patterns to match against the given value, executing the associated block if a match is found.",
+    "args": "PATTERN..."
+  },
+  "cd": {
+    "shortDescription": "change directory",
+    "description": "cd changes the current working directory.\n\nIf DIRECTORY is given, it will become the new directory. If no\nparameter is given, the HOME environment variable will be used.\n\nIf DIRECTORY is a relative path, all the paths in the CDPATH will be\ntried as prefixes for it, in addition to PWD.  It is recommended to\nkeep . as the first element of CDPATH, or PWD will be tried last.\n\nFish will also try to change directory if given a command that looks\nlike a directory (starting with ., / or ~, or ending with /), without\nexplicitly requiring cd.\n\nFish also ships a wrapper function around the builtin cd that\nunderstands cd - as changing to the previous directory.  See also\nprevd.  This wrapper function maintains a history of the 25 most\nrecently visited directories in the $dirprev and $dirnext global\nvariables.  If you make those universal variables your cd history is\nshared among all fish instances.\n\nAs a special case, cd . is equivalent to cd $PWD, which is useful in\ncases where a mountpoint has been recycled or a directory has been\nremoved and recreated.\n\nThe --help or -h option displays help about using this command, and\ndoes not change the directory.\n\nEXAMPLES\n\n   cd\n   # changes the working directory to your home directory.\n\n   cd /usr/src/fish-shell\n   # changes the working directory to /usr/src/fish-shell\n\nSEE ALSO\nNavigate directories using the directory history or the directory\nstack",
+    "args": "cd [DIRECTORY]"
+  },
+  "command": {
+    "shortDescription": "run a program",
+    "description": "command forces the shell to execute the program COMMANDNAME and\nignore any functions or builtins with the same name.\n\nThe following options are available:\n\n-a or --all\n       Prints all COMMAND found in PATH, in the order found.\n\n-q or --query\n       Silence output and print nothing, setting only exit status.\n       Implies --search.  For compatibility, this is also --quiet\n       (deprecated).\n\n-v (or -s or --search)\n       Prints the external command that would be executed, or prints\n       nothing if no file with the specified name could be found in\n       PATH.\n\n-h or --help\n       Displays help about using this command.\n\nWith the -v option, command treats every argument as a separate\ncommand to look up and sets the exit status to 0 if any of the\nspecified commands were found, or 127 if no commands could be found.\n--quiet used with -v prevents commands being printed, like type -q.\n\nEXAMPLES\ncommand ls executes the ls program, even if an ls function also exists.\ncommand -s ls prints the path to the ls program.\ncommand -q git; and command git log runs git log only if git exists.",
+    "args": "command [OPTIONS] [COMMANDNAME [ARG ...]]"
+  },
+  "commandline": {
+    "shortDescription": "set or get the current command line buffer",
+    "description": "commandline can be used to set or get the current contents of the\ncommand line buffer.\n\nWith no parameters, commandline returns the current value of the\ncommand line.\n\nWith CMD specified, the command line buffer is erased and replaced\nwith the contents of CMD.\n\nThe following options are available:\n\n-C or --cursor\n       Set or get the current cursor position, not the contents of\n       the buffer.  If no argument is given, the current cursor\n       position is printed, otherwise the argument is interpreted as\n       the new cursor position.  If one of the options -j, -p or -t\n       is given, the position is relative to the respective substring\n       instead of the entire command line buffer.\n\n-B or --selection-start\n       Get current position of the selection start in the buffer.\n\n-E or --selection-end\n       Get current position of the selection end in the buffer.\n\n-f or --function\n       Causes any additional arguments to be interpreted as input\n       functions, and puts them into the queue, so that they will be\n       read before any additional actual key presses are.  This\n       option cannot be combined with any other option.  See bind for\n       a list of input functions.\n\n-h or --help\n       Displays help about using this command.\n\nThe following options change the way commandline updates the command\nline buffer:\n\n-a or --append\n       Do not remove the current commandline, append the specified\n       string at the end of it.\n\n-i or --insert\n       Do not remove the current commandline, insert the specified\n       string at the current cursor position\n\n-r or --replace\n       Remove the current commandline and replace it with the\n       specified string (default)\n\nThe following options change what part of the commandline is printed\nor updated:\n\n-b or --current-buffer\n       Select the entire commandline, not including any displayed\n       autosuggestion (default).\n\n-j or --current-job\n       Select the current job - a job here is one pipeline.  Stops at\n       logical operators or terminators (;, &, and newlines).\n\n-p or --current-process\n       Select the current process - a process here is one command.\n       Stops at logical operators, terminators, and pipes.\n\n-s or --current-selection\n       Selects the current selection\n\n-t or --current-token\n       Selects the current token\n\nThe following options change the way commandline prints the current\ncommandline buffer:\n\n-c or --cut-at-cursor\n       Only print selection up until the current cursor position.  If\n       combined with --tokenize, this will print up until the last\n       completed token - excluding the token the cursor is in.  This\n       is typically what you would want for instance in completions.\n       To get both, use both commandline --cut-at-cursor --tokenize;\n       commandline --cut-at-cursor --current-token, or commandline\n       -co; commandline -ct for short.\n\n-o or --tokenize\n       Tokenize the selection and print one string-type token per\n       line.\n\nIf commandline is called during a call to complete a given string\nusing complete -C STRING, commandline will consider the specified\nstring to be the current contents of the command line.\n\nThe following options output metadata about the commandline state:\n\n-L or --line\n       Print the line that the cursor is on, with the topmost line\n       starting at 1.\n\n-S or --search-mode\n       Evaluates to true if the commandline is performing a history\n       search.\n\n-P or --paging-mode\n       Evaluates to true if the commandline is showing pager\n       contents, such as tab completions.\n\n--paging-full-mode\n       Evaluates to true if the commandline is showing pager\n       contents, such as tab completions and all lines are shown (no\n       \"<n> more rows\" message).\n\n--is-valid\n       Returns true when the commandline is syntactically valid and\n       complete.  If it is, it would be executed when the execute\n       bind function is called.  If the commandline is incomplete,\n       return 2, if erroneus, return 1.\n\nEXAMPLE\ncommandline -j $history[3] replaces the job under the cursor with the\nthird item from the command line history.\n\nIf the commandline contains\n\n   > echo $flounder >&2 | less; and echo $catfish\n\n(with the cursor on the \"o\" of \"flounder\")\n\nThe echo $flounder >& is the first process, less the second and and\necho $catfish the third.\n\necho $flounder >&2 | less is the first job, and echo $catfish the\nsecond.\n\n$flounder is the current token.\n\nThe most common use for something like completions is\n\n   set -l tokens (commandline -opc)\n\nwhich gives the current process (what is being completed), tokenized\ninto separate entries, up to but excluding the currently being\ncompleted token\n\nIf you are then also interested in the in-progress token, add\n\n::     set -l current (commandline -ct)\n\nNote that this makes it easy to render fish's infix matching moot -\nif possible it's best if the completions just print all possibilities\nand leave the matching to the current token up to fish's logic.\n\nMore examples:\n\n   > commandline -t\n   $flounder\n   > commandline -ct\n   $fl\n   > commandline -b # or just commandline\n   echo $flounder >&2 | less; and echo $catfish\n   > commandline -p\n   echo $flounder >&2\n   > commandline -j\n   echo $flounder >&2 | less",
+    "args": "commandline [OPTIONS] [CMD]"
+  },
+  "complete": {
+    "shortDescription": "edit command-specific tab-completions",
+    "description": "complete defines, removes or lists completions for a command.\n\nFor an introduction to writing your own completions, see Writing your\nown completions in the fish manual.\n\nThe following options are available:\n\n-c or --command COMMAND\n       Specifies that COMMAND is the name of the command. If there is\n       no -c or -p, one non-option argument will be used as the\n       command.\n\n-p or --path COMMAND\n       Specifies that COMMAND is the absolute path of the command\n       (optionally containing wildcards).\n\n-e or --erase\n       Deletes the specified completion.\n\n-s or --short-option SHORT_OPTION\n       Adds a short option to the completions list.\n\n-l or --long-option LONG_OPTION\n       Adds a GNU-style long option to the completions list.\n\n-o or --old-option OPTION\n       Adds an old-style short or long option (see below for\n       details).\n\n-a or --arguments ARGUMENTS\n       Adds the specified option arguments to the completions list.\n\n-k or --keep-order\n       Keeps the order of ARGUMENTS instead of sorting\n       alphabetically. Multiple complete calls with -k result in\n       arguments of the later ones displayed first.\n\n-f or --no-files\n       This completion may not be followed by a filename.\n\n-F or --force-files\n       This completion may be followed by a filename, even if another\n       applicable complete specified --no-files.\n\n-r or --require-parameter\n       This completion must have an option argument, i.e. may not be\n       followed by another option.\n\n-x or --exclusive\n       Short for -r and -f.\n\n-w or --wraps WRAPPED_COMMAND\n       Causes the specified command to inherit completions from\n       WRAPPED_COMMAND (see below for details).\n\n-n or --condition CONDITION\n       This completion should only be used if the CONDITION (a shell\n       command) returns 0. This makes it possible to specify\n       completions that should only be used in some cases. If\n       multiple conditions are specified, fish will try them in the\n       order they are specified until one fails or all succeeded.\n\n-C or --do-complete STRING\n       Makes complete try to find all possible completions for the\n       specified string. If there is no STRING, the current\n       commandline is used instead.\n\n--escape\n       When used with -C, escape special characters in completions.\n\n-h or --help\n       Displays help about using this command.\n\nCommand-specific tab-completions in fish are based on the notion of\noptions and arguments. An option is a parameter which begins with a\nhyphen, such as -h, -help or --help. Arguments are parameters that do\nnot begin with a hyphen. Fish recognizes three styles of options, the\nsame styles as the GNU getopt library. These styles are:\n\n• Short options, like -a. Short options are a single character long,\n  are preceded by a single hyphen and can be grouped together (like\n  -la, which is equivalent to -l -a). Option arguments may be\n  specified by appending the option with the value (-w32), or, if\n  --require-parameter is given, in the following parameter (-w 32).\n\n• Old-style options, long like -Wall or -name or even short like -a.\n  Old-style options can be more than one character long, are preceded\n  by a single hyphen and may not be grouped together. Option\n  arguments are specified by default following a space (-foo null) or\n  after = (-foo=null).\n\n• GNU-style long options, like --colors. GNU-style long options can\n  be more than one character long, are preceded by two hyphens, and\n  can't be grouped together. Option arguments may be specified after\n  a = (--quoting-style=shell), or, if --require-parameter is given,\n  in the following parameter (--quoting-style shell).\n\nMultiple commands and paths can be given in one call to define the\nsame completions for multiple commands.\n\nMultiple command switches and wrapped commands can also be given to\ndefine multiple completions in one call.\n\nInvoking complete multiple times for the same command adds the new\ndefinitions on top of any existing completions defined for the\ncommand.\n\nWhen -a or --arguments is specified in conjunction with long, short,\nor old-style options, the specified arguments are only completed as\narguments for any of the specified options. If -a or --arguments is\nspecified without any long, short, or old-style options, the\nspecified arguments are used when completing non-option arguments to\nthe command (except when completing an option argument that was\nspecified with -r or --require-parameter).\n\nCommand substitutions found in ARGUMENTS should return a\nnewline-separated list of arguments, and each argument may optionally\nhave a tab character followed by the argument description.\nDescription given this way override a description given with -d or\n--description.\n\nDescriptions given with --description are also used to group options\ngiven with -s, -o or -l. Options with the same (non-empty)\ndescription will be listed as one candidate, and one of them will be\npicked. If the description is empty or no description was given this\nis skipped.\n\nThe -w or --wraps options causes the specified command to inherit\ncompletions from another command, \"wrapping\" the other command. The\nwrapping command can also have additional completions. A command can\nwrap multiple commands, and wrapping is transitive: if A wraps B, and\nB wraps C, then A automatically inherits all of C's completions.\nWrapping can be removed using the -e or --erase options. Wrapping\nonly works for completions specified with -c or --command and are\nignored when specifying completions with -p or --path.\n\nWhen erasing completions, it is possible to either erase all\ncompletions for a specific command by specifying complete -c COMMAND\n-e, or by specifying a specific completion option to delete.\n\nWhen complete is called without anything that would define or erase\ncompletions (options, arguments, wrapping, ...), it shows matching\ncompletions instead. So complete without any arguments shows all\nloaded completions, complete -c foo shows all loaded completions for\nfoo. Since completions are autoloaded, you will have to trigger them\nfirst.\n\nEXAMPLES\nThe short-style option -o for the gcc command needs a file argument:\n\n   complete -c gcc -s o -r\n\nThe short-style option -d for the grep command requires one of read,\nskip or recurse:\n\n   complete -c grep -s d -x -a \"read skip recurse\"\n\nThe su command takes any username as an argument. Usernames are given\nas the first colon-separated field in the file /etc/passwd. This can\nbe specified as:\n\n   complete -x -c su -d \"Username\" -a \"(cat /etc/passwd | cut -d : -f 1)\"\n\nThe rpm command has several different modes. If the -e or --erase\nflag has been specified, rpm should delete one or more packages, in\nwhich case several switches related to deleting packages are valid,\nlike the nodeps switch.\n\nThis can be written as:\n\n   complete -c rpm -n \"__fish_contains_opt -s e erase\" -l nodeps -d \"Don't check dependencies\"\n\nwhere __fish_contains_opt is a function that checks the command line\nbuffer for the presence of a specified set of options.\n\nTo implement an alias, use the -w or --wraps option:\n\n   complete -c hub -w git\n\nNow hub inherits all of the completions from git. Note this can also\nbe specified in a function declaration (function thing -w\notherthing).\n\n   complete -c git\n\nShows all completions for git.\n\nAny command foo that doesn't support grouping multiple short options\nin one string (not supporting -xf as short for -x -f) or a short\noption and its value in one string (not supporting -d9 instead of -d\n9) should be specified as a single-character old-style option instead\nof as a short-style option; for example, complete -c foo -o s;\ncomplete -c foo -o v would never suggest foo -ov but rather foo -o\n-v.",
+    "args": "complete ((-c | --command) | (-p | --path)) COMMAND [OPTIONS]\ncomplete (-C | --do-complete) [--escape] STRING"
+  },
+  "contains": {
+    "shortDescription": "test if a word is present in a list",
+    "description": "contains tests whether the set VALUES contains the string KEY.  If\nso, contains exits with code 0; if not, it exits with code 1.\n\nThe following options are available:\n\n-i or --index\n       Print the index (number of the element in the set) of the\n       first matching element.\n\n-h or --help\n       Displays help about using this command.\n\nNote that contains interprets all arguments starting with a - as an\noption to contains, until an -- argument is reached.\n\nSee the examples below.\n\nEXAMPLE\nIf animals is a list of animals, the following will test if animals\ncontains \"cat\":\n\n   if contains cat $animals\n      echo Your animal list is evil!\n   end\n\nThis code will add some directories to PATH if they aren't yet\nincluded:\n\n   for i in ~/bin /usr/local/bin\n       if not contains $i $PATH\n           set PATH $PATH $i\n       end\n   end\n\nWhile this will check if function hasargs is being ran with the -q\noption:\n\n   function hasargs\n       if contains -- -q $argv\n           echo '$argv contains a -q option'\n       end\n   end\n\nThe -- here stops contains from treating -q to an option to itself.\nInstead it treats it as a normal string to check.",
+    "args": "contains [OPTIONS] KEY [VALUES ...]"
+  },
+  "continue": {
+    "shortDescription": "Skip to the next iteration of a loop",
+    "description": "Within a `while` or `for` loop, `continue` skips the remaining commands in the current iteration and proceeds to the next iteration of the loop."
+  },
+  "count": {
+    "shortDescription": "",
+    "description": ""
+  },
+  "disown": {
+    "shortDescription": "remove a process from the list of jobs",
+    "description": "disown removes the specified job from the list of jobs. The job\nitself continues to exist, but fish does not keep track of it any\nlonger.\n\nJobs in the list of jobs are sent a hang-up signal when fish\nterminates, which usually causes the job to terminate; disown allows\nthese processes to continue regardless.\n\nIf no process is specified, the most recently-used job is removed\n(like bg and fg).  If one or more PIDs are specified, jobs with the\nspecified process IDs are removed from the job list. Invalid jobs are\nignored and a warning is printed.\n\nIf a job is stopped, it is sent a signal to continue running, and a\nwarning is printed. It is not possible to use the bg builtin to\ncontinue a job once it has been disowned.\n\ndisown returns 0 if all specified jobs were disowned successfully,\nand 1 if any problems were encountered.\n\nThe --help or -h option displays help about using this command.\n\nEXAMPLE\nfirefox &; disown will start the Firefox web browser in the\nbackground and remove it from the job list, meaning it will not be\nclosed when the fish process is closed.\n\ndisown (jobs -p) removes all jobs from the job list without\nterminating them.",
+    "args": "disown [PID ...]"
+  },
+  "echo": {
+    "shortDescription": "",
+    "description": ""
+  },
+  "else": {
+    "shortDescription": "Execute commands if the previous condition was false",
+    "description": "In an `if` block, the `else` section contains commands that execute if none of the preceding `if` or `else if` conditions were true."
+  },
+  "emit": {
+    "shortDescription": "emit a generic event",
+    "description": "emit emits, or fires, an event. Events are delivered to, or caught\nby, special functions called event handlers. The arguments are passed\nto the event handlers as function arguments.\n\nThe --help or -h option displays help about using this command.\n\nEXAMPLE\nThe following code first defines an event handler for the generic\nevent named 'test_event', and then emits an event of that type.\n\n   function event_test --on-event test_event\n       echo event test: $argv\n   end\n\n   emit test_event something\n\nNOTES\nNote that events are only sent to the current fish process as there\nis no way to send events from one fish process to another.",
+    "args": "emit EVENT_NAME [ARGUMENTS ...]"
+  },
+  "end": {
+    "shortDescription": "Terminate a block of code",
+    "description": "Conclude a block of code initiated by constructs like `if`, `switch`, `while`, `for`, or `function`."
+  },
+  "eval": {
+    "shortDescription": "Execute arguments as a command",
+    "description": "Concatenate all arguments into a single command and execute it. This allows for dynamic construction and execution of commands.",
+    "args": "COMMAND..."
+  },
+  "exec": {
+    "shortDescription": "execute command in current process",
+    "description": "exec replaces the currently running shell with a new command. On\nsuccessful completion, exec never returns. exec cannot be used inside\na pipeline.\n\nThe --help or -h option displays help about using this command.\n\nEXAMPLE\nexec emacs starts up the emacs text editor, and exits fish. When\nemacs exits, the session will terminate.",
+    "args": "exec COMMAND"
+  },
+  "exit": {
+    "shortDescription": "exit the shell",
+    "description": "exit is a special builtin that causes the shell to exit. Either 255\nor the CODE supplied is used, whichever is lesser.  Otherwise, the\nexit status will be that of the last command executed.\n\nIf exit is called while sourcing a file (using the source builtin)\nthe rest of the file will be skipped, but the shell itself will not\nexit.\n\nThe --help or -h option displays help about using this command.",
+    "args": "exit [CODE]"
+  },
+  "false": {
+    "shortDescription": "Return an unsuccessful result",
+    "description": "A command that returns a non-zero exit status, indicating failure. It is often used in scripts to represent a false condition."
+  },
+  "fg": {
+    "shortDescription": "bring job to foreground",
+    "description": "The fg builtin brings the specified job to the foreground, resuming\nit if it is stopped.  While a foreground job is executed, fish is\nsuspended.  If no job is specified, the last job to be used is put in\nthe foreground.  If PID is specified, the job containing a process\nwith the specified process ID is put in the foreground.\n\nFor compatibility with other shells, job expansion syntax is\nsupported for fg. A PID of the format %1 will foreground job 1.  Job\nnumbers can be seen in the output of jobs.\n\nThe --help or -h option displays help about using this command.\n\nEXAMPLE\nfg will put the last job in the foreground.\n\nfg %3 will put job 3 into the foreground.",
+    "args": "fg [PID]"
+  },
+  "for": {
+    "shortDescription": "perform a set of commands multiple times",
+    "description": "for is a loop construct. It will perform the commands specified by\nCOMMANDS multiple times. On each iteration, the local variable\nspecified by VARNAME is assigned a new value from VALUES. If VALUES\nis empty, COMMANDS will not be executed at all. The VARNAME is\nvisible when the loop terminates and will contain the last value\nassigned to it. If VARNAME does not already exist it will be set in\nthe local scope. For our purposes if the for block is inside a\nfunction there must be a local variable with the same name. If the\nfor block is not nested inside a function then global and universal\nvariables of the same name will be used if they exist.\n\nMuch like set, for does not modify $status, but the evaluation of its\nsubordinate commands can.\n\nThe -h or --help option displays help about using this command.\n\nEXAMPLE\n\n   for i in foo bar baz; echo $i; end\n\n   # would output:\n   foo\n   bar\n   baz\n\nNOTES\nThe VARNAME was local to the for block in releases prior to 3.0.0.\nThis means that if you did something like this:\n\n   for var in a b c\n       if break_from_loop\n           break\n       end\n   end\n   echo $var\n\nThe last value assigned to var when the loop terminated would not be\navailable outside the loop. What echo $var would write depended on\nwhat it was set to before the loop was run. Likely nothing.",
+    "args": "for VARNAME in [VALUES ...]; COMMANDS ...; end"
+  },
+  "function": {
+    "shortDescription": "create a function",
+    "description": "function creates a new function NAME with the body BODY.\n\nA function is a list of commands that will be executed when the name\nof the function is given as a command.\n\nThe following options are available:\n\n-a NAMES or --argument-names NAMES\n       Assigns the value of successive command-line arguments to the\n       names given in NAMES. These are the same arguments given in\n       argv, and are still available there. See also Argument\n       Handling.\n\n-d DESCRIPTION or --description DESCRIPTION\n       A description of what the function does, suitable as a\n       completion description.\n\n-w WRAPPED_COMMAND or --wraps WRAPPED_COMMAND\n       Inherit completions from the given WRAPPED_COMMAND. See the\n       documentation for complete for more information.\n\n-e EVENT_NAME or --on-event EVENT_NAME\n       Run this function when the specified named event is emitted.\n       Fish internally generates named events, for example, when\n       showing the prompt. Custom events can be emitted using the\n       emit command.\n\n-v VARIABLE_NAME or --on-variable VARIABLE_NAME\n       Run this function when the variable VARIABLE_NAME changes\n       value. Note that fish makes no guarantees on any particular\n       timing or even that the function will be run for every single\n       set. Rather it will be run when the variable has been set at\n       least once, possibly skipping some values or being run when\n       the variable has been set to the same value (except for\n       universal variables set in other shells - only changes in the\n       value will be picked up for those).\n\n-j PID or --on-job-exit PID\n       Run this function when the job containing a child process with\n       the given process identifier PID exits. Instead of a PID, the\n       string 'caller' can be specified. This is only allowed when in\n       a command substitution, and will result in the handler being\n       triggered by the exit of the job which created this command\n       substitution.\n\n-p PID or --on-process-exit PID\n       Run this function when the fish child process with process ID\n       PID exits. Instead of a PID, for backward compatibility,\n       \"%self\" can be specified as an alias for $fish_pid, and the\n       function will be run when the current fish instance exits.\n\n-s SIGSPEC or --on-signal SIGSPEC\n       Run this function when the signal SIGSPEC is delivered.\n       SIGSPEC can be a signal number, or the signal name, such as\n       SIGHUP (or just HUP). Note that the signal must have been\n       delivered to fish; for example, Ctrl-C sends SIGINT to the\n       foreground process group, which will not be fish if you are\n       running another command at the time. Observing a signal will\n       prevent fish from exiting in response to that signal.\n\n-S or --no-scope-shadowing\n       Allows the function to access the variables of calling\n       functions. Normally, any variables inside the function that\n       have the same name as variables from the calling function are\n       \"shadowed\", and their contents are independent of the calling\n       function.\n\n       It's important to note that this does not capture referenced\n       variables or the scope at the time of function declaration! At\n       this time, fish does not have any concept of closures, and\n       variable lifetimes are never extended. In other words, by\n       using --no-scope-shadowing the scope of the function each time\n       it is run is shared with the scope it was called from rather\n       than the scope it was defined in.\n\n-V or --inherit-variable NAME\n       Snapshots the value of the variable NAME and defines a local\n       variable with that same name and value when the function is\n       defined. This is similar to a closure in other languages like\n       Python but a bit different. Note the word \"snapshot\" in the\n       first sentence. If you change the value of the variable after\n       defining the function, even if you do so in the same scope\n       (typically another function) the new value will not be used by\n       the function you just created using this option. See the\n       function notify example below for how this might be used.\n\nThe event handler switches (on-event, on-variable, on-job-exit,\non-process-exit and on-signal) cause a function to run automatically\nat specific events. New named events for --on-event can be fired\nusing the emit builtin. Fish already generates a few events, see\nEvent handlers for more.\n\nFunctions may not be named the same as a reserved keyword. These are\nelements of fish syntax or builtin commands which are essential for\nthe operations of the shell. Current reserved words are [, , and,\nargparse, begin, break, builtin, case, command, continue, else, end,\neval, exec, for, function, if, not, or, read, return, set, status,\nstring, switch, test, time, and while.\n\nEXAMPLE\n\n   function ll\n       ls -l $argv\n   end\n\nwill run the ls command, using the -l option, while passing on any\nadditional files and switches to ls.\n\n   function mkdir -d \"Create a directory and set CWD\"\n       command mkdir $argv\n       if test $status = 0\n           switch $argv[(count $argv)]\n               case '-*'\n\n               case '*'\n                   cd $argv[(count $argv)]\n                   return\n           end\n       end\n   end\n\nThis will run the mkdir command, and if it is successful, change the\ncurrent working directory to the one just created.\n\n   function notify\n       set -l job (jobs -l -g)\n       or begin; echo \"There are no jobs\" >&2; return 1; end\n\n       function _notify_job$job --on-job-exit $job --inherit-variable job\n           echo -n \\a # beep\n           functions -e _notify_job$job\n       end\n   end\n\nThis will beep when the most recent job completes.\n\nNOTES\nEvents are only received from the current fish process as there is no\nway to send events from one fish process to another.\n\nSEE MORE\nFor more explanation of how functions fit into fish, see Functions.",
+    "args": "function NAME [OPTIONS]; BODY; end"
+  },
+  "functions": {
+    "shortDescription": "print or erase functions",
+    "description": "functions prints or erases functions.\n\nThe following options are available:\n\n-a or --all\n       Lists all functions, even those whose name starts with an\n       underscore.\n\n-c or --copy OLDNAME NEWNAME\n       Creates a new function named NEWNAME, using the definition of\n       the OLDNAME function.\n\n-d or --description DESCRIPTION\n       Changes the description of this function.\n\n-e or --erase\n       Causes the specified functions to be erased. This also means\n       that it is prevented from autoloading in the current session.\n       Use funcsave to remove the saved copy.\n\n-D or --details\n       Reports the path name where the specified function is defined\n       or could be autoloaded, stdin if the function was defined\n       interactively or on the command line or by reading standard\n       input, - if the function was created via source, and n/a if\n       the function isn't available. (Functions created via alias\n       will return -, because alias uses source internally.) If the\n       --verbose option is also specified then five lines are\n       written:\n\n       • the pathname as already described,\n\n       • autoloaded, not-autoloaded or n/a,\n\n       • the line number within the file or zero if not applicable,\n\n       • scope-shadowing if the function shadows the vars in the\n         calling function (the normal case if it wasn't defined with\n         --no-scope-shadowing), else no-scope-shadowing, or n/a if\n         the function isn't defined,\n\n       • the function description minimally escaped so it is a single\n         line, or n/a if the function isn't defined or has no\n         description.\n\n       You should not assume that only five lines will be written\n       since we may add additional information to the output in the\n       future.\n\n--no-details\n       Turns off function path reporting, so just the definition will\n       be printed.\n\n-n or --names\n       Lists the names of all defined functions.\n\n-q or --query\n       Tests if the specified functions exist.\n\n-v or --verbose\n       Make some output more verbose.\n\n-H or --handlers\n       Show all event handlers.\n\n-t or --handlers-type TYPE\n       Show all event handlers matching the given TYPE.\n\n-h or --help\n       Displays help about using this command.\n\nThe default behavior of functions, when called with no arguments, is\nto print the names of all defined functions. Unless the -a option is\ngiven, no functions starting with underscores are included in the\noutput.\n\nIf any non-option parameters are given, the definition of the\nspecified functions are printed.\n\nCopying a function using -c copies only the body of the function, and\ndoes not attach any event notifications from the original function.\n\nOnly one function's description can be changed in a single invocation\nof functions -d.\n\nThe exit status of functions is the number of functions specified in\nthe argument list that do not exist, which can be used in concert\nwith the -q option.\n\nEXAMPLES\n\n   functions -n\n   # Displays a list of currently-defined functions\n\n   functions -c foo bar\n   # Copies the 'foo' function to a new function called 'bar'\n\n   functions -e bar\n   # Erases the function ``bar``\n\nSEE MORE\nFor more explanation of how functions fit into fish, see Functions.",
+    "args": "functions [-a | --all] [-n | --names]\nfunctions [-D | --details] [-v] FUNCTION\nfunctions -c OLDNAME NEWNAME\nfunctions -d DESCRIPTION FUNCTION\nfunctions [-e | -q] FUNCTION ..."
+  },
+  "history": {
+    "shortDescription": "show and manipulate command history",
+    "description": "history is used to search, delete, and otherwise manipulate the\nhistory of interactive commands.\n\nThe following operations (sub-commands) are available:\n\nsearch Returns history items matching the search string. If no search\n       string is provided it returns all history items. This is the\n       default operation if no other operation is specified. You only\n       have to explicitly say history search if you wish to search\n       for one of the subcommands. The --contains search option will\n       be used if you don't specify a different search option.\n       Entries are ordered newest to oldest unless you use the\n       --reverse flag. If stdout is attached to a tty the output will\n       be piped through your pager by the history function. The\n       history builtin simply writes the results to stdout.\n\ndelete Deletes history items. The --contains search option will be\n       used if you don't specify a different search option. If you\n       don't specify --exact a prompt will be displayed before any\n       items are deleted asking you which entries are to be deleted.\n       You can enter the word \"all\" to delete all matching entries.\n       You can enter a single ID (the number in square brackets) to\n       delete just that single entry. You can enter more than one ID,\n       or an ID range separated by a space to delete multiple\n       entries. Just press [enter] to not delete anything. Note that\n       the interactive delete behavior is a feature of the history\n       function. The history builtin only supports --exact\n       --case-sensitive deletion.\n\nmerge  Immediately incorporates history changes from other sessions.\n       Ordinarily fish ignores history changes from sessions started\n       after the current one. This command applies those changes\n       immediately.\n\nsave   Immediately writes all changes to the history file. The shell\n       automatically saves the history file; this option is provided\n       for internal use and should not normally need to be used by\n       the user.\n\nclear  Clears the history file. A prompt is displayed before the\n       history is erased asking you to confirm you really want to\n       clear all history unless builtin history is used.\n\nclear-session\n       Clears the history file from all activity of the current\n       session. Note: If history merge or builtin history merge is\n       run in a session, only the history after this will be erased.\n\nThe following options are available:\n\nThese flags can appear before or immediately after one of the\nsub-commands listed above.\n\n-C or --case-sensitive\n       Does a case-sensitive search. The default is case-insensitive.\n       Note that prior to fish 2.4.0 the default was case-sensitive.\n\n-c or --contains\n       Searches items in the history that contain the specified text\n       string. This is the default for the --search flag. This is not\n       currently supported by the delete subcommand.\n\n-e or --exact\n       Searches or deletes items in the history that exactly match\n       the specified text string. This is the default for the delete\n       subcommand. Note that the match is case-insensitive by\n       default. If you really want an exact match, including letter\n       case, you must use the -C or --case-sensitive flag.\n\n-p or --prefix\n       Searches items in the history that begin with the specified\n       text string. This is not currently supported by the delete\n       subcommand.\n\n-t or --show-time\n       Prepends each history entry with the date and time the entry\n       was recorded. By default it uses the strftime format # %c%n.\n       You can specify another format; e.g., --show-time=\"%Y-%m-%d\n       %H:%M:%S \" or --show-time=\"%a%I%p\". The short option, -t,\n       doesn't accept a strftime format string; it only uses the\n       default format. Any strftime format is allowed, including %s\n       to get the raw UNIX seconds since the epoch.\n\n-z or --null\n       Causes history entries written by the search operations to be\n       terminated by a NUL character rather than a newline. This\n       allows the output to be processed by read -z to correctly\n       handle multiline history entries.\n\n-*NUMBER* -n NUMBER or --max NUMBER\n       Limits the matched history items to the first NUMBER matching\n       entries. This is only valid for history search.\n\n-R or --reverse\n       Causes the history search results to be ordered oldest to\n       newest. Which is the order used by most shells. The default is\n       newest to oldest.\n\n-h or --help\n       Displays help for this command.\n\nEXAMPLE\n\n   history clear\n   # Deletes all history items\n\n   history search --contains \"foo\"\n   # Outputs a list of all previous commands containing the string \"foo\".\n\n   history delete --prefix \"foo\"\n   # Interactively deletes commands which start with \"foo\" from the history.\n   # You can select more than one entry by entering their IDs separated by a space.\n\nCUSTOMIZING THE NAME OF THE HISTORY FILE\nBy default interactive commands are logged to\n$XDG_DATA_HOME/fish/fish_history (typically\n~/.local/share/fish/fish_history).\n\nYou can set the fish_history variable to another name for the current\nshell session. The default value (when the variable is unset) is fish\nwhich corresponds to $XDG_DATA_HOME/fish/fish_history. If you set it\nto e.g. fun, the history would be written to\n$XDG_DATA_HOME/fish/fun_history. An empty string means history will\nnot be stored at all. This is similar to the private session features\nin web browsers.\n\nYou can change fish_history at any time (by using set -x fish_history\n\"session_name\") and it will take effect right away. If you set it to\n\"default\", it will use the default session name (which is \"fish\").\n\nOther shells such as bash and zsh use a variable named HISTFILE for a\nsimilar purpose. Fish uses a different name to avoid conflicts and\nsignal that the behavior is different (session name instead of a file\npath). Also, if you set the var to anything other than fish or\ndefault it will inhibit importing the bash history. That's because\nthe most common use case for this feature is to avoid leaking private\nor sensitive history when giving a presentation.\n\nNOTES\nIf you specify both --prefix and --contains the last flag seen is\nused.\n\nNote that for backwards compatibility each subcommand can also be\nspecified as a long option. For example, rather than history search\nyou can type history --search. Those long options are deprecated and\nwill be removed in a future release.",
+    "args": "history [search] [--show-time] [--case-sensitive]\n[--exact | --prefix | --contains] [--max N] [--null] [--reverse]\n                 [SEARCH_STRING ...]\nhistory delete [--case-sensitive]\n               [--exact | --prefix | --contains] SEARCH_STRING ...\nhistory merge\nhistory save\nhistory clear\nhistory clear-session"
+  },
+  "if": {
+    "shortDescription": "conditionally execute a command",
+    "description": "if will execute the command CONDITION. If the condition's exit status\nis 0, the commands COMMANDS_TRUE will execute.  If the exit status is\nnot 0 and else is given, COMMANDS_FALSE will be executed.\n\nYou can use and or or in the condition. See the second example below.\n\nThe exit status of the last foreground command to exit can always be\naccessed using the $status variable.\n\nThe -h or --help option displays help about using this command.\n\nEXAMPLE\nThe following code will print foo.txt exists if the file foo.txt\nexists and is a regular file, otherwise it will print bar.txt exists\nif the file bar.txt exists and is a regular file, otherwise it will\nprint foo.txt and bar.txt do not exist.\n\n   if test -f foo.txt\n       echo foo.txt exists\n   else if test -f bar.txt\n       echo bar.txt exists\n   else\n       echo foo.txt and bar.txt do not exist\n   end\n\nThe following code will print \"foo.txt exists and is readable\" if\nfoo.txt is a regular file and readable\n\n   if test -f foo.txt\n      and test -r foo.txt\n      echo \"foo.txt exists and is readable\"\n   end",
+    "args": "if CONDITION; COMMANDS_TRUE ...;\n[else if CONDITION2; COMMANDS_TRUE2 ...;]\n[else; COMMANDS_FALSE ...;]\nend"
+  },
+  "jobs": {
+    "shortDescription": "print currently running jobs",
+    "description": "jobs prints a list of the currently running jobs and their status.\n\njobs accepts the following options:\n\n-c or --command\n       Prints the command name for each process in jobs.\n\n-g or --group\n       Only prints the group ID of each job.\n\n-l or --last\n       Prints only the last job to be started.\n\n-p or --pid\n       Prints the process ID for each process in all jobs.\n\n-q or --query\n       Prints no output for evaluation of jobs by exit status only.\n       For compatibility with old fish versions this is also --quiet\n       (but this is deprecated).\n\n-h or --help\n       Displays help about using this command.\n\nOn systems that support this feature, jobs will print the CPU usage\nof each job since the last command was executed. The CPU usage is\nexpressed as a percentage of full CPU activity. Note that on\nmultiprocessor systems, the total activity may be more than 100%.\n\nArguments of the form PID or %JOBID restrict the output to jobs with\nthe selected process identifiers or job numbers respectively.\n\nIf the output of jobs is redirected or if it is part of a command\nsubstitution, the column header that is usually printed is omitted,\nmaking it easier to parse.\n\nThe exit status of jobs is 0 if there are running background jobs and\n1 otherwise.\n\nEXAMPLE\njobs outputs a summary of the current jobs, such as two long-running\ntasks in this example:\n\n   Job Group   State   Command\n   2   26012   running nc -l 55232 < /dev/random &\n   1   26011   running python tests/test_11.py &",
+    "args": "jobs [OPTIONS] [PID | %JOBID]"
+  },
+  "math": {
+    "shortDescription": "perform mathematics calculations",
+    "description": "math performs mathematical calculations.  It supports simple\noperations such as addition, subtraction, and so on, as well as\nfunctions like abs(), sqrt() and ln().\n\nBy default, the output shows up to 6 decimal places.  To change the\nnumber of decimal places, use the --scale option, including --scale=0\nfor integer output.  Trailing zeroes will always be trimmed.\n\nKeep in mind that parameter expansion happens before expressions are\nevaluated.  This can be very useful in order to perform calculations\ninvolving shell variables or the output of command substitutions, but\nit also means that parenthesis (()) and the asterisk (*) glob\ncharacter have to be escaped or quoted.  x can also be used to denote\nmultiplication, but it needs to be followed by whitespace to\ndistinguish it from hexadecimal numbers.\n\nParentheses for functions are optional - math sin pi prints 0.\nHowever, a comma will bind to the inner function, so math pow sin 3,\n5 is an error because it tries to give sin the arguments 3 and 5.\nWhen in doubt, use parentheses.\n\nmath ignores whitespace between arguments and takes its input as\nmultiple arguments (internally joined with a space), so math 2 +2 and\nmath \"2 +    2\" work the same.  math 2 2 is an error.\n\nThe following options are available:\n\n-s N or --scale N\n       Sets the scale of the result.  N must be an integer or the\n       word \"max\" for the maximum scale.  A scale of zero causes\n       results to be truncated, not rounded. Any non-integer\n       component is thrown away.  So 3/2 returns 1 rather than 2\n       which 1.5 would normally round to.  This is for compatibility\n       with bc which was the basis for this command prior to fish\n       3.0.0.  Scale values greater than zero causes the result to be\n       rounded using the usual rules to the specified number of\n       decimal places.\n\n-b BASE or --base BASE\n       Sets the numeric base used for output (math always understands\n       hexadecimal numbers as input).  It currently understands \"hex\"\n       or \"16\" for hexadecimal and \"octal\" or \"8\" for octal and\n       implies a scale of 0 (other scales cause an error), so it will\n       truncate the result down to an integer.  This might change in\n       the future.  Hex numbers will be printed with a 0x prefix.\n       Octal numbers will have a prefix of 0 but aren't understood by\n       math as input.\n\n-h or --help\n       Displays help about using this command.\n\nRETURN VALUES\nIf the expression is successfully evaluated and doesn't\nover/underflow or return NaN the return status is zero (success) else\none.\n\nSYNTAX\nmath knows some operators, constants, functions and can (obviously)\nread numbers.\n\nFor numbers, . is always the radix character regardless of locale -\n2.5, not 2,5.  Scientific notation (10e5) and hexadecimal (0xFF) are\nalso available.\n\nmath allows you to use underscores as visual separators for digit\ngrouping. For example, you can write 1_000_000, 0x_89_AB_CD_EF, and\n1.234_567_e89.\n\nOPERATORS\nmath knows the following operators:\n\n+      for addition\n\n-      for subtraction\n\n* or x for multiplication. * is the glob character and needs to be\n       quoted or escaped, x needs to be followed by whitespace or it\n       looks like 0x hexadecimal notation.\n\n/      for division\n\n^      for exponentiation\n\n%      for modulo\n\n( or ) for grouping. These need to be quoted or escaped because ()\n       denotes a command substitution.\n\nThey are all used in an infix manner - 5 + 2, not + 5 2.\n\nCONSTANTS\nmath knows the following constants:\n\ne      Euler's number\n\npi     π, you know this one.  Half of Tau\n\ntau    Equivalent to 2π, or the number of radians in a circle\n\nUse them without a leading $ - pi - 3 should be about 0.\n\nFUNCTIONS\nmath supports the following functions:\n\nabs    the absolute value, with positive sign\n\nacos   arc cosine\n\nasin   arc sine\n\natan   arc tangent\n\natan2  arc tangent of two variables\n\nbitand, bitor and bitxor\n       perform bitwise operations.  These will throw away any\n       non-integer parts and interpret the rest as an int.\n\n       Note: bitnot and bitnand don't exist. This is because numbers\n       in math don't really have a width in terms of bits, and these\n       operations necessarily care about leading zeroes.\n\n       If you need to negate a specific number you can do it with an\n       xor with a mask, e.g.:\n\n          > math --base=hex bitxor 0x0F, 0xFF\n          0xF0\n\n          > math --base=hex bitxor 0x2, 0x3\n          # Here we mask with 0x3 == 0b111, so our number is 3 bits wide\n          # Only the 1 bit isn't set.\n          0x1\n\nceil   round number up to the nearest integer\n\ncos    the cosine\n\ncosh   hyperbolic cosine\n\nexp    the base-e exponential function\n\nfac    factorial - also known as x! (x * (x - 1) * (x - 2) * ... * 1)\n\nfloor  round number down to the nearest integer\n\nln     the base-e logarithm\n\nlog or log10\n       the base-10 logarithm\n\nlog2   the base-2 logarithm\n\nmax    returns the largest of the given numbers - this takes an\n       arbitrary number of arguments (but at least one)\n\nmin    returns the smallest of the given numbers - this takes an\n       arbitrary number of arguments (but at least one)\n\nncr    \"from n choose r\" combination function - how many subsets of\n       size r can be taken from n (order doesn't matter)\n\nnpr    the number of subsets of size r that can be taken from a set\n       of n elements (including different order)\n\npow(x,y)\n       returns x to the y (and can be written as x ^ y)\n\nround  rounds to the nearest integer, away from 0\n\nsin    the sine function\n\nsinh   the hyperbolic sine\n\nsqrt   the square root - (can also be written as x ^ 0.5)\n\ntan    the tangent\n\ntanh   the hyperbolic tangent\n\nAll of the trigonometric functions use radians (the pi-based scale,\nnot 360°).\n\nEXAMPLES\nmath 1+1 outputs 2.\n\nmath $status - 128 outputs the numerical exit status of the last\ncommand minus 128.\n\nmath 10 / 6 outputs 1.666667.\n\nmath -s0 10.0 / 6.0 outputs 1.\n\nmath -s3 10 / 6 outputs 1.666.\n\nmath \"sin(pi)\" outputs 0.\n\nmath 5 \\* 2 or math \"5 * 2\" or math 5 \"*\" 2 all output 10.\n\nmath 0xFF outputs 255, math 0 x 3 outputs 0 (because it computes 0\nmultiplied by 3).\n\nmath bitand 0xFE, 0x2e outputs 46.\n\nmath \"bitor(9,2)\" outputs 11.\n\nmath --base=hex 192 prints 0xc0.\n\nmath 'ncr(49,6)' prints 13983816 - that's the number of possible\npicks in 6-from-49 lotto.\n\nmath max 5,2,3,1 prints 5.\n\nCOMPATIBILITY NOTES\nFish 1.x and 2.x releases relied on the bc command for handling math\nexpressions. Starting with fish 3.0.0 fish uses the tinyexpr library\nand evaluates the expression without the involvement of any external\ncommands.\n\nYou don't need to use -- before the expression, even if it begins\nwith a minus sign which might otherwise be interpreted as an invalid\noption. If you do insert -- before the expression, it will cause\noption scanning to stop just like for every other command and it\nwon't be part of the expression.",
+    "args": "math [(-s | --scale) N] [(-b | --base) BASE] EXPRESSION ..."
+  },
+  "not": {
+    "shortDescription": "negate the exit status of a job",
+    "description": "not negates the exit status of another command. If the exit status is\nzero, not returns 1. Otherwise, not returns 0.\n\nThe -h or --help option displays help about using this command.\n\nEXAMPLE\nThe following code reports an error and exits if no file named spoon\ncan be found.\n\n   if not test -f spoon\n       echo There is no spoon\n       exit 1\n   end",
+    "args": "not COMMAND [OPTIONS ...]"
+  },
+  "or": {
+    "shortDescription": "conditionally execute a command",
+    "description": "or is used to execute a command if the previous command was not\nsuccessful (returned a status of something other than 0).\n\nor statements may be used as part of the condition in an if or while\nblock.\n\nor does not change the current exit status itself, but the command it\nruns most likely will. The exit status of the last foreground command\nto exit can always be accessed using the $status variable.\n\nThe -h or --help option displays help about using this command.\n\nEXAMPLE\nThe following code runs the make command to build a program. If the\nbuild succeeds, the program is installed. If either step fails, make\nclean is run, which removes the files created by the build process.\n\n   make; and make install; or make clean\n\nSEE ALSO\n\n• and command",
+    "args": "COMMAND1; or COMMAND2"
+  },
+  "path": {
+    "shortDescription": "manipulate and check paths",
+    "description": "path performs operations on paths.\n\nPATH arguments are taken from the command line unless standard input\nis connected to a pipe or a file, in which case they are read from\nstandard input, one PATH per line. It is an error to supply PATH\narguments on both the command line and on standard input.\n\nArguments starting with - are normally interpreted as switches; --\ncauses the following arguments not to be treated as switches even if\nthey begin with -. Switches and required arguments are recognized\nonly on the command line.\n\nWhen a path starts with -, path filter and path normalize will\nprepend ./ on output to avoid it being interpreted as an option\notherwise, so it's safe to pass path's output to other commands that\ncan handle relative paths.\n\nAll subcommands accept a -q or --quiet switch, which suppresses the\nusual output but exits with the documented status. In this case these\ncommands will quit early, without reading all of the available input.\n\nAll subcommands also accept a -Z or --null-out switch, which makes\nthem print output separated with NUL instead of newlines. This is for\nfurther processing, e.g. passing to another path, or xargs -0. This\nis not recommended when the output goes to the terminal or a command\nsubstitution.\n\nAll subcommands also accept a -z or --null-in switch, which makes\nthem accept arguments from stdin separated with NULL-bytes. Since\nUnix paths can't contain NULL, that makes it possible to handle all\npossible paths and read input from e.g. find -print0. If arguments\nare given on the commandline this has no effect. This should mostly\nbe unnecessary since path automatically starts splitting on NULL if\none appears in the first PATH_MAX bytes, PATH_MAX being the operating\nsystem's maximum length for a path plus a NULL byte.\n\nSome subcommands operate on the paths as strings and so work on\nnonexistent paths, while others need to access the paths themselves\nand so filter out nonexistent paths.\n\nThe following subcommands are available.\n\nBASENAME SUBCOMMAND\n\n   path basename [-z | --null-in] [-Z | --null-out] [-q | --quiet] [PATH ...]\n\npath basename returns the last path component of the given path, by\nremoving the directory prefix and removing trailing slashes. In other\nwords, it is the part that is not the dirname. For files you might\ncall it the \"filename\".\n\nIt returns 0 if there was a basename, i.e. if the path wasn't empty\nor just slashes.\n\n   Examples\n\n   > path basename ./foo.mp4\n   foo.mp4\n\n   > path basename ../banana\n   banana\n\n   > path basename /usr/bin/\n   bin\n\n   > path basename /usr/bin/*\n   # This prints all files in /usr/bin/\n   # A selection:\n   cp\n   fish\n   grep\n   rm\n\nDIRNAME SUBCOMMAND\n\n   path dirname [-z | --null-in] [-Z | --null-out] [-q | --quiet] [PATH ...]\n\npath dirname returns the dirname for the given path. This is the part\nbefore the last \"/\", discounting trailing slashes. In other words, it\nis the part that is not the basename (discounting superfluous\nslashes).\n\nIt returns 0 if there was a dirname, i.e. if the path wasn't empty or\njust slashes.\n\n   Examples\n\n   > path dirname ./foo.mp4\n   .\n\n   > path dirname ../banana\n   ..\n\n   > path dirname /usr/bin/\n   /usr\n\nEXTENSION SUBCOMMAND\n\n   path extension [-z | --null-in] [-Z | --null-out] [-q | --quiet] [PATH ...]\n\npath extension returns the extension of the given path. This is the\npart after (and including) the last \".\", unless that \".\" followed a\n\"/\" or the basename is \".\" or \"..\", in which case there is no\nextension and an empty line is printed.\n\nIf the filename ends in a \".\", only a \".\" is printed.\n\nIt returns 0 if there was an extension.\n\n   Examples\n\n   > path extension ./foo.mp4\n   .mp4\n\n   > path extension ../banana\n   # an empty line, status 1\n\n   > path extension ~/.config\n   # an empty line, status 1\n\n   > path extension ~/.config.d\n   .d\n\n   > path extension ~/.config.\n   .\n\n   > set -l path (path change-extension '' ./foo.mp4)\n   > set -l extension (path extension ./foo.mp4)\n   > echo $path$extension\n   # reconstructs the original path again.\n   ./foo.mp4\n\nFILTER SUBCOMMAND\n\n   path filter [-z | --null-in] [-Z | --null-out] [-q | --quiet] \\\n       [-d] [-f] [-l] [-r] [-w] [-x] \\\n       [-v | --invert] [(-t | --type) TYPE] [(-p | --perm) PERMISSION] [PATH ...]\n\npath filter returns all of the given paths that match the given\nchecks. In all cases, the paths need to exist, nonexistent paths are\nalways filtered.\n\nThe available filters are:\n\n• -t or --type with the options: \"dir\", \"file\", \"link\", \"block\",\n  \"char\", \"fifo\" and \"socket\", in which case the path needs to be a\n  directory, file, link, block device, character device, named pipe\n  or socket, respectively.\n\n• -d, -f and -l are short for --type=dir, --type=file and\n  --type=link, respectively. There are no shortcuts for the other\n  types.\n\n• -p or --perm with the options: \"read\", \"write\", and \"exec\", as well\n  as \"suid\", \"sgid\", \"user\" (referring to the path owner) and \"group\"\n  (referring to the path's group), in which case the path needs to\n  have all of the given permissions for the current user.\n\n• -r, -w and -x are short for --perm=read, --perm=write and\n  --perm=exec, respectively. There are no shortcuts for the other\n  permissions.\n\nNote that the path needs to be any of the given types, but have all\nof the given permissions. This is because having a path that is both\nwritable and executable makes sense, but having a path that is both a\ndirectory and a file doesn't. Links will count as the type of the\nlinked-to file, so links to files count as files, links to\ndirectories count as directories.\n\nThe filter options can either be given as multiple options, or\ncomma-separated - path filter -t dir,file or path filter --type dir\n--type file are equivalent.\n\nWith --invert, the meaning of the filtering is inverted - any path\nthat wouldn't pass (including by not existing) passes, and any path\nthat would pass fails.\n\nWhen a path starts with -, path filter will prepend ./ to avoid it\nbeing interpreted as an option otherwise.\n\nIt returns 0 if at least one path passed the filter.\n\npath is is shorthand for path filter -q, i.e. just checking without\nproducing output, see The is subcommand.\n\n   Examples\n\n   > path filter /usr/bin /usr/argagagji\n   # The (hopefully) nonexistent argagagji is filtered implicitly:\n   /usr/bin\n\n   > path filter --type file /usr/bin /usr/bin/fish\n   # Only fish is a file\n   /usr/bin/fish\n\n   > path filter --type file,dir --perm exec,write /usr/bin/fish /home/me\n   # fish is a file, which passes, and executable, which passes,\n   # but probably not writable, which fails.\n   #\n   # $HOME is a directory and both writable and executable, typically.\n   # So it passes.\n   /home/me\n\n   > path filter -fdxw /usr/bin/fish /home/me\n   # This is the same as above: \"-f\" is \"--type=file\", \"-d\" is \"--type=dir\",\n   # \"-x\" is short for \"--perm=exec\" and \"-w\" short for \"--perm=write\"!\n   /home/me\n\n   > path filter -fx $PATH/*\n   # Prints all possible commands - the first entry of each name is what fish would execute!\n\nIS SUBCOMMAND\n\n   path is [-z | --null-in] [-Z | --null-out] [-q | --quiet] \\\n       [-d] [-f] [-l] [-r] [-w] [-x] \\\n       [-v | --invert] [(-t | --type) TYPE] [(-p | --perm) PERMISSION] [PATH ...]\n\npath is is short for path filter -q. It returns true if any of the\ngiven files passes the filter, but does not produce any output.\n\n--quiet can still be passed for compatibility but is redundant. The\noptions are the same as for path filter.\n\n   Examples\n\n   > path is /usr/bin /usr/argagagji\n   # /usr/bin exists, so this returns a status of 0 (true). It prints nothing.\n   > path is /usr/argagagji\n   # /usr/argagagji does not, so this returns a status of 1 (false). It also prints nothing.\n   > path is -fx /bin/sh\n   # /bin/sh is usually an executable file, so this returns true.\n\nMTIME SUBCOMMAND\n\n   path mtime [-z | --null-in] [-Z | --null-out] [-q | --quiet] [-R | --relative] [PATH ...]\n\npath mtime returns the last modification time (\"mtime\" in unix\njargon) of the given paths, in seconds since the unix epoch (the\nbeginning of the 1st of January 1970).\n\nWith --relative (or -R), it prints the number of seconds since the\nmodification time. It only reads the current time once at start, so\nin case multiple paths are given the times are all relative to the\nstart of path mtime -R running.\n\nIf you want to know if a file is newer or older than another file,\nconsider using test -nt instead. See the test documentation.\n\nIt returns 0 if reading mtime for any path succeeded.\n\n   Examples\n\n   > date +%s\n   # This prints the current time as seconds since the epoch\n   1657217847\n\n   > path mtime /etc/\n   1657213796\n\n   > path mtime -R /etc/\n   4078\n   # So /etc/ on this system was last modified a little over an hour ago\n\n   # This is the same as\n   > math (date +%s) - (path mtime /etc/)\n\nNORMALIZE SUBCOMMAND\n\n   path normalize [-z | --null-in] [-Z | --null-out] [-q | --quiet] [PATH ...]\n\npath normalize returns the normalized versions of all paths. That\nmeans it squashes duplicate \"/\" (except for two leading \"//\"),\ncollapses \"../\" with earlier components and removes \".\" components.\n\nUnlike realpath or path resolve, it does not make the paths absolute.\nIt also does not resolve any symlinks. As such it can operate on\nnon-existent paths.\n\nBecause it operates on paths as strings and doesn't resolve symlinks,\nit works sort of like pwd -L and cd. E.g. path normalize link/.. will\nreturn ., just like cd link; cd .. would return to the current\ndirectory. For a physical view of the filesystem, see path resolve.\n\nLeading \"./\" components are usually removed. But when a path starts\nwith -, path normalize will add it instead to avoid confusion with\noptions.\n\nIt returns 0 if any normalization was done, i.e. any given path\nwasn't in canonical form.\n\n   Examples\n\n   > path normalize /usr/bin//../../etc/fish\n   # The \"//\" is squashed and the \"..\" components neutralize the components before\n   /etc/fish\n\n   > path normalize /bin//bash\n   # The \"//\" is squashed, but /bin isn't resolved even if your system links it to /usr/bin.\n   /bin/bash\n\n   > path normalize ./my/subdirs/../sub2\n   my/sub2\n\n   > path normalize -- -/foo\n   ./-/foo\n\nRESOLVE SUBCOMMAND\n\n   path resolve [-z | --null-in] [-Z | --null-out] [-q | --quiet] [PATH ...]\n\npath resolve returns the normalized, physical and absolute versions\nof all paths. That means it resolves symlinks and does what path\nnormalize does: it squashes duplicate \"/\", collapses \"../\" with\nearlier components and removes \".\" components. Then it turns that\npath into the absolute path starting from the filesystem root \"/\".\n\nIt is similar to realpath, as it creates the \"real\", canonical\nversion of the path. However, for paths that can't be resolved, e.g.\nif they don't exist or form a symlink loop, it will resolve as far as\nit can and normalize the rest.\n\nBecause it resolves symlinks, it works sort of like pwd -P. E.g. path\nresolve link/.. will return the parent directory of what the link\npoints to, just like cd link; cd (pwd -P)/.. would go to it. For a\nlogical view of the filesystem, see path normalize.\n\nIt returns 0 if any normalization or resolution was done, i.e. any\ngiven path wasn't in canonical form.\n\n   Examples\n\n   > path resolve /bin//sh\n   # The \"//\" is squashed, and /bin is resolved if your system links it to /usr/bin.\n   # sh here is bash (this is common on linux systems)\n   /usr/bin/bash\n\n   > path resolve /bin/foo///bar/../baz\n   # Assuming /bin exists and is a symlink to /usr/bin, but /bin/foo doesn't.\n   # This resolves the /bin/ and normalizes the nonexistent rest:\n   /usr/bin/foo/baz\n\nCHANGE-EXTENSION SUBCOMMAND\n\n   path change-extension [-z | --null-in] [-Z | --null-out] \\\n       [-q | --quiet] EXTENSION [PATH ...]\n\npath change-extension returns the given paths, with their extension\nchanged to the given new extension. The extension is the part after\n(and including) the last \".\", unless that \".\" followed a \"/\" or the\nbasename is \".\" or \"..\", in which case there is no previous extension\nand the new one is simply added.\n\nIf the extension is empty, any previous extension is stripped, along\nwith the \".\". This is, of course, the inverse of path extension.\n\nOne leading dot on the extension is ignored, so \".mp3\" and \"mp3\" are\ntreated the same.\n\nIt returns 0 if it was given any paths.\n\n   Examples\n\n   > path change-extension mp4 ./foo.wmv\n   ./foo.mp4\n\n   > path change-extension .mp4 ./foo.wmv\n   ./foo.mp4\n\n   > path change-extension '' ../banana\n   ../banana\n   # but status 1, because there was no extension.\n\n   > path change-extension '' ~/.config\n   /home/alfa/.config\n   # status 1\n\n   > path change-extension '' ~/.config.d\n   /home/alfa/.config\n   # status 0\n\n   > path change-extension '' ~/.config.\n   /home/alfa/.config\n   # status 0\n\nSORT SUBCOMMAND\n\n   path sort [-z | --null-in] [-Z | --null-out] \\\n       [-q | --quiet] [-r | --reverse] \\\n       [--key=basename|dirname|path] [PATH ...]\n\npath sort returns the given paths in sorted order. They are sorted in\nthe same order as globs - alphabetically, but with runs of numerical\ndigits compared numerically.\n\nWith --reverse or -r the sort is reversed.\n\nWith --key= only the given part of the path is compared, e.g.\n--key=dirname causes only the dirname to be compared, --key=basename\nonly the basename and --key=path causes the entire path to be\ncompared (this is the default).\n\nWith --unique or -u the sort is deduplicated, meaning only the first\nof a run that have the same key is kept. So if you are sorting by\nbasename, then only the first of each basename is used.\n\nThe sort used is stable, so sorting first by basename and then by\ndirname works and causes the files to be grouped according to\ndirectory.\n\nIt currently returns 0 if it was given any paths.\n\n   Examples\n\n   > path sort 10-foo 2-bar\n   2-bar\n   10-foo\n\n   > path sort --reverse 10-foo 2-bar\n   10-foo\n   2-bar\n\n   > path sort --unique --key=basename $fish_function_path/*.fish\n   # prints a list of all function files fish would use, sorted by name.\n\nCOMBINING PATH\npath is meant to be easy to combine with itself, other tools and\nfish.\n\nThis is why\n\n• path's output is automatically split by fish if it goes into a\n  command substitution, so just doing (path ...) handles all paths,\n  even those containing newlines, correctly\n\n• path has --null-in to handle null-delimited input (typically\n  automatically detected!), and --null-out to pass on null-delimited\n  output\n\nSome examples of combining path:\n\n   # Expand all paths in the current directory, leave only executable files, and print their resolved path\n   path filter -zZ -xf -- * | path resolve -z\n\n   # The same thing, but using find (note -maxdepth needs to come first or find will scream)\n   # (this also depends on your particular version of find)\n   # Note the `-z` is unnecessary for any sensible version of find - if `path` sees a NULL,\n   # it will split on NULL automatically.\n   find . -maxdepth 1 -type f -executable -print0 | path resolve -z\n\n   set -l paths (path filter -p exec $PATH/fish -Z | path resolve)",
+    "args": "path basename GENERAL_OPTIONS [PATH ...]\npath dirname GENERAL_OPTIONS  [PATH ...]\npath extension GENERAL_OPTIONS [PATH ...]\npath filter GENERAL_OPTIONS [-v | --invert]\n    [-d] [-f] [-l] [-r] [-w] [-x]\n    [(-t | --type) TYPE] [(-p | --perm) PERMISSION] [PATH ...]\npath is GENERAL_OPTIONS [(-v | --invert)] [(-t | --type) TYPE]\n    [-d] [-f] [-l] [-r] [-w] [-x]\n    [(-p | --perm) PERMISSION] [PATH ...]\npath mtime GENERAL_OPTIONS [(-R | --relative)] [PATH ...]\npath normalize GENERAL_OPTIONS [PATH ...]\npath resolve GENERAL_OPTIONS [PATH ...]\npath change-extension GENERAL_OPTIONS EXTENSION [PATH ...]\npath sort GENERAL_OPTIONS [-r | --reverse]\n    [-u | --unique] [--key=basename|dirname|path] [PATH ...]\n\nGENERAL_OPTIONS\n    [-z | --null-in] [-Z | --null-out] [-q | --quiet]"
+  },
+  "printf": {
+    "shortDescription": "Display formatted text",
+    "description": "The `printf` command formats and prints text according to a specified format string. Unlike `echo`, `printf` does not append a newline unless explicitly included in the format.",
+    "args": "FORMAT [ARGUMENT...]"
+  },
+  "pwd": {
+    "shortDescription": "output the current working directory",
+    "description": "NOTE: This page documents the fish builtin pwd.  To see the\ndocumentation on the pwd command you might have, use command man pwd.\n\npwd outputs (prints) the current working directory.\n\nThe following options are available:\n\n-L or --logical\n       Output the logical working directory, without resolving\n       symlinks (default behavior).\n\n-P or --physical\n       Output the physical working directory, with symlinks resolved.\n\n-h or --help\n       Displays help about using this command.\n\nSEE ALSO\nNavigate directories using the directory history or the directory\nstack",
+    "args": "pwd [-P | --physical]\npwd [-L | --logical]"
+  },
+  "random": {
+    "shortDescription": "generate random number",
+    "description": "random generates a pseudo-random integer from a uniform distribution.\nThe range (inclusive) depends on the arguments.\n\nNo arguments indicate a range of 0 to 32767 (inclusive).\n\nIf one argument is specified, the internal engine will be seeded with\nthe argument for future invocations of random and no output will be\nproduced.\n\nTwo arguments indicate a range from START to END (both START and END\nincluded).\n\nThree arguments indicate a range from START to END with a spacing of\nSTEP between possible outputs.\n\nrandom choice will select one random item from the succeeding\narguments.\n\nThe -h or --help option displays help about using this command.\n\nNote that seeding the engine will NOT give the same result across\ndifferent systems.\n\nYou should not consider random cryptographically secure, or even\nstatistically accurate.\n\nEXAMPLE\nThe following code will count down from a random even number between\n10 and 20 to 1:\n\n   for i in (seq (random 10 2 20) -1 1)\n       echo $i\n   end\n\nAnd this will open a random picture from any of the subdirectories:\n\n   open (random choice **.jpg)\n\nOr, to only get even numbers from 2 to 20:\n\n   random 2 2 20\n\nOr odd numbers from 1 to 3:\n\n   random 1 2 3 # or 1 2 4",
+    "args": "random\nrandom SEED\nrandom START END\nrandom START STEP END\nrandom choice [ITEMS ...]"
+  },
+  "read": {
+    "shortDescription": "read line of input into variables",
+    "description": "read reads from standard input and either writes the result back to\nstandard output (for use in command substitution), or stores the\nresult in one or more shell variables. By default, read reads a\nsingle line and splits it into variables on spaces or tabs.\nAlternatively, a null character or a maximum number of characters can\nbe used to terminate the input, and other delimiters can be given.\nUnlike other shells, there is no default variable (such as REPLY) for\nstoring the result - instead, it is printed on standard output.\n\nThe following options are available:\n\n-c CMD or --command CMD\n       Sets the initial string in the interactive mode command buffer\n       to CMD.\n\n-d or --delimiter DELIMITER\n       Splits on DELIMITER. DELIMITER will be used as an entire\n       string to split on, not a set of characters.\n\n-g or --global\n       Makes the variables global.\n\n-s or --silent\n       Masks characters written to the terminal, replacing them with\n       asterisks. This is useful for reading things like passwords or\n       other sensitive information.\n\n-f or --function\n       Scopes the variable to the currently executing function. It is\n       erased when the function ends.\n\n-l or --local\n       Scopes the variable to the currently executing block. It is\n       erased when the block ends. Outside of a block, this is the\n       same as --function.\n\n-n or --nchars NCHARS\n       Makes read return after reading NCHARS characters or the end\n       of the line, whichever comes first.\n\n-p or --prompt PROMPT_CMD\n       Uses the output of the shell command PROMPT_CMD as the prompt\n       for the interactive mode. The default prompt command is\n       set_color green; echo read; set_color normal; echo \"> \"\n\n-P or --prompt-str PROMPT_STR\n       Uses the PROMPT_STR as the prompt for the interactive mode. It\n       is equivalent to echo $PROMPT_STR and is provided solely to\n       avoid the need to frame the prompt as a command. All special\n       characters in the string are automatically escaped before\n       being passed to the echo command.\n\n-R or --right-prompt RIGHT_PROMPT_CMD\n       Uses the output of the shell command RIGHT_PROMPT_CMD as the\n       right prompt for the interactive mode. There is no default\n       right prompt command.\n\n-S or --shell\n       Enables syntax highlighting, tab completions and command\n       termination suitable for entering shellscript code in the\n       interactive mode. NOTE: Prior to fish 3.0, the short opt for\n       --shell was -s, but it has been changed for compatibility with\n       bash's -s short opt for --silent.\n\n-t -or --tokenize\n       Causes read to split the input into variables by the shell's\n       tokenization rules. This means it will honor quotes and\n       escaping. This option is of course incompatible with other\n       options to control splitting like --delimiter and does not\n       honor IFS (like fish's tokenizer). It saves the tokens in the\n       manner they'd be passed to commands on the commandline, so\n       e.g. a\\ b is stored as a b. Note that currently it leaves\n       command substitutions intact along with the parentheses.\n\n-u or --unexport\n       Prevents the variables from being exported to child processes\n       (default behaviour).\n\n-U or --universal\n       Causes the specified shell variable to be made universal.\n\n-x or --export\n       Exports the variables to child processes.\n\n-a or --list\n       Stores the result as a list in a single variable. This option\n       is also available as --array for backwards compatibility.\n\n-z or --null\n       Marks the end of the line with the NUL character, instead of\n       newline. This also disables interactive mode.\n\n-L or --line\n       Reads each line into successive variables, and stops after\n       each variable has been filled. This cannot be combined with\n       the --delimiter option.\n\nWithout the --line option, read reads a single line of input from\nstandard input, breaks it into tokens, and then assigns one token to\neach variable specified in VARIABLES. If there are more tokens than\nvariables, the complete remainder is assigned to the last variable.\n\nIf no option to determine how to split like --delimiter, --line or\n--tokenize is given, the variable IFS is used as a list of characters\nto split on. Relying on the use of IFS is deprecated and this\nbehaviour will be removed in future versions. The default value of\nIFS contains space, tab and newline characters. As a special case, if\nIFS is set to the empty string, each character of the input is\nconsidered a separate token.\n\nWith the --line option, read reads a line of input from standard\ninput into each provided variable, stopping when each variable has\nbeen filled. The line is not tokenized.\n\nIf no variable names are provided, read enters a special case that\nsimply provides redirection from standard input to standard output,\nuseful for command substitution. For instance, the fish shell command\nbelow can be used to read data that should be provided via a command\nline argument from the console instead of hardcoding it in the\ncommand itself, allowing the command to both be reused as-is in\nvarious contexts with different input values and preventing possibly\nsensitive text from being included in the shell history:\n\n   mysql -uuser -p(read)\n\nWhen running in this mode, read does not split the input in any way\nand text is redirected to standard output without any further\nprocessing or manipulation.\n\nIf -a or --array is provided, only one variable name is allowed and\nthe tokens are stored as a list in this variable.\n\nSee the documentation for set for more details on the scoping rules\nfor variables.\n\nWhen read reaches the end-of-file (EOF) instead of the terminator,\nthe exit status is set to 1.  Otherwise, it is set to 0.\n\nIn order to protect the shell from consuming too many system\nresources, read will only consume a maximum of 100 MiB (104857600\nbytes); if the terminator is not reached before this limit then\nVARIABLE is set to empty and the exit status is set to 122. This\nlimit can be altered with the fish_read_limit variable. If set to 0\n(zero), the limit is removed.\n\nEXAMPLE\nread has a few separate uses.\n\nThe following code stores the value 'hello' in the shell variable\nfoo.\n\n   echo hello|read foo\n\nThe while command is a neat way to handle command output\nline-by-line:\n\n   printf '%s\\n' line1 line2 line3 line4 | while read -l foo\n                     echo \"This is another line: $foo\"\n                 end\n\nDelimiters given via \"-d\" are taken as one string:\n\n   echo a==b==c | read -d == -l a b c\n   echo $a # a\n   echo $b # b\n   echo $c # c\n\n--tokenize honors quotes and escaping like the shell's argument\npassing:\n\n   echo 'a\\ b' | read -t first second\n   echo $first # outputs \"a b\", $second is empty\n\n   echo 'a\"foo bar\"b (command echo wurst)*\" \"{a,b}' | read -lt -l a b c\n   echo $a # outputs 'afoo barb' (without the quotes)\n   echo $b # outputs '(command echo wurst)* {a,b}' (without the quotes)\n   echo $c # nothing\n\nFor an example on interactive use, see Querying for user input.",
+    "args": "read [OPTIONS] [VARIABLE ...]"
+  },
+  "realpath": {
+    "shortDescription": "Resolve and print the absolute path",
+    "description": "Convert each provided path to its absolute, canonical form by resolving symbolic links and relative path components.",
+    "args": "PATH..."
+  },
+  "return": {
+    "shortDescription": "stop the current inner function",
+    "description": "return halts a currently running function.  The exit status is set to\nN if it is given.  If return is invoked outside of a function or dot\nscript it is equivalent to exit.\n\nIt is often added inside of a conditional block such as an if\nstatement or a switch statement to conditionally stop the executing\nfunction and return to the caller; it can also be used to specify the\nexit status of a function.\n\nIf at the top level of a script, it exits with the given status, like\nexit.  If at the top level in an interactive session, it will set\nstatus, but not exit the shell.\n\nThe -h or --help option displays help about using this command.\n\nEXAMPLE\nAn implementation of the false command as a fish function:\n\n   function false\n       return 1\n   end",
+    "args": "return [N]"
+  },
+  "set": {
+    "shortDescription": "display and change shell variables",
+    "description": "set manipulates shell variables.\n\nIf both NAME and VALUE are provided, set assigns any values to\nvariable NAME.  Variables in fish are lists, multiple values are\nallowed.  One or more variable INDEX can be specified including\nranges (not for all options.)\n\nIf no VALUE is given, the variable will be set to the empty list.\n\nIf set is ran without arguments, it prints the names and values of\nall shell variables in sorted order.  Passing scope or export flags\nallows filtering this to only matching variables, so set --local\nwould only show local variables.\n\nWith --erase and optionally a scope flag set will erase the matching\nvariable (or the variable of that name in the smallest possible\nscope).\n\nWith --show, set will describe the given variable names, explaining\nhow they have been defined - in which scope with which values and\noptions.\n\nThe following options control variable scope:\n\n-U or --universal\n       Sets a universal variable.  The variable will be immediately\n       available to all the user's fish instances on the machine, and\n       will be persisted across restarts of the shell.\n\n-f or --function\n       Sets a variable scoped to the executing function.  It is\n       erased when the function ends.\n\n-l or --local\n       Sets a locally-scoped variable in this block.  It is erased\n       when the block ends.  Outside of a block, this is the same as\n       --function.\n\n-g or --global\n       Sets a globally-scoped variable.  Global variables are\n       available to all functions running in the same shell.  They\n       can be modified or erased.\n\nThese options modify how variables operate:\n\n--export or -x\n       Causes the specified shell variable to be exported to child\n       processes (making it an \"environment variable\").\n\n--unexport or -u\n       Causes the specified shell variable to NOT be exported to\n       child processes.\n\n--path Treat specified variable as a path variable; variable will be\n       split on colons (:) and will be displayed joined by colons\n       when quoted (echo \"$PATH\") or exported.\n\n--unpath\n       Causes variable to no longer be treated as a path variable.\n       Note: variables ending in \"PATH\" are automatically path\n       variables.\n\nFurther options:\n\n-a or --append NAME VALUE ...\n       Appends VALUES to the current set of values for variable NAME.\n       Can be used with --prepend to both append and prepend at the\n       same time.  This cannot be used when assigning to a variable\n       slice.\n\n-p or --prepend NAME VALUE ...\n       Prepends VALUES to the current set of values for variable\n       NAME.  This can be used with --append to both append and\n       prepend at the same time.  This cannot be used when assigning\n       to a variable slice.\n\n-e or --erase NAME*[*INDEX]\n       Causes the specified shell variables to be erased.  Supports\n       erasing from multiple scopes at once.  Individual items in a\n       variable at INDEX in brackets can be specified.\n\n-q or --query NAME*[*INDEX]\n       Test if the specified variable names are defined.  If an INDEX\n       is provided, check for items at that slot.  Does not output\n       anything, but the shell status is set to the number of\n       variables specified that were not defined, up to a maximum of\n       255.  If no variable was given, it also returns 255.\n\n-n or --names\n       List only the names of all defined variables, not their value.\n       The names are guaranteed to be sorted.\n\n-S or --show\n       Shows information about the given variables.  If no variable\n       names are given then all variables are shown in sorted order.\n       It shows the scopes the given variables are set in, along with\n       the values in each and whether or not it is exported.  No\n       other flags can be used with this option.\n\n-L or --long\n       Do not abbreviate long values when printing set variables.\n\n-h or --help\n       Displays help about using this command.\n\nIf a variable is set to more than one value, the variable will be a\nlist with the specified elements.  If a variable is set to zero\nelements, it will become a list with zero elements.\n\nIf the variable name is one or more list elements, such as PATH[1 3\n7], only those list elements specified will be changed.  If you\nspecify a negative index when expanding or assigning to a list\nvariable, the index will be calculated from the end of the list.  For\nexample, the index -1 means the last index of a list.\n\nThe scoping rules when creating or updating a variable are:\n\n• Variables may be explicitly set as universal, global, function, or\n  local.  Variables with the same name but in a different scope will\n  not be changed.\n\n• If the scope of a variable is not explicitly set but a variable by\n  that name has been previously defined, the scope of the existing\n  variable is used.  If the variable is already defined in multiple\n  scopes, the variable with the narrowest scope will be updated.\n\n• If a variable's scope is not explicitly set and there is no\n  existing variable by that name, the variable will be local to the\n  currently executing function.  Note that this is different from\n  using the -l or --local flag, in which case the variable will be\n  local to the most-inner currently executing block, while without\n  them the variable will be local to the function as a whole.  If no\n  function is executing, the variable will be set in the global\n  scope.\n\nThe exporting rules when creating or updating a variable are\nidentical to the scoping rules for variables:\n\n• Variables may be explicitly set to either exported or not exported.\n  When an exported variable goes out of scope, it is unexported.\n\n• If a variable is not explicitly set to be exported or not exported,\n  but has been previously defined, the previous exporting rule for\n  the variable is kept.\n\n• If a variable is not explicitly set to be either exported or\n  unexported and has never before been defined, the variable will not\n  be exported.\n\nIn query mode, the scope to be examined can be specified.  Whether\nthe variable has to be a path variable or exported can also be\nspecified.\n\nIn erase mode, if variable indices are specified, only the specified\nslices of the list variable will be erased.\n\nset requires all options to come before any other arguments.  For\nexample, set flags -l will have the effect of setting the value of\nthe variable flags to '-l', not making the variable local.\n\nEXIT STATUS\nIn assignment mode, set does not modify the exit status, but passes\nalong whatever status was set, including by command substitutions.\nThis allows capturing the output and exit status of a subcommand,\nlike in if set output (command).\n\nIn query mode, the exit status is the number of variables that were\nnot found.\n\nIn erase mode, set exits with a zero exit status in case of success,\nwith a non-zero exit status if the commandline was invalid, if any of\nthe variables did not exist or was a special read-only variable.\n\nEXAMPLES\nPrint all global, exported variables:\n\n   > set -gx\n\nSet the value of the variable $foo to be 'hi'.:\n\n   > set foo hi\n\nAppend the value \"there\" to the variable $foo:\n\n   > set -a foo there\n\nRemove $smurf from the scope:\n\n   > set -e smurf\n\nRemove $smurf from the global and universal scopes:\n\n   > set -e -Ug smurf\n\nChange the fourth element of the $PATH list to ~/bin:\n\n   > set PATH[4] ~/bin\n\nOutputs the path to Python if type -p returns true:\n\n   if set python_path (type -p python)\n       echo \"Python is at $python_path\"\n   end\n\nSetting a variable doesn't modify $status; a command substitution\nstill will, though:\n\n   > echo $status\n   0\n   > false\n   > set foo bar\n   > echo $status\n   1\n   > true\n   > set foo banana (false)\n   > echo $status\n   1\n\nVAR=VALUE command sets a variable for just one command, like other\nshells.  This runs fish with a temporary home directory:\n\n   > HOME=(mktemp -d) fish\n\n(which is essentially the same as):\n\n   > begin; set -lx HOME (mktemp -d); fish; end\n\nNOTES\n\n• Fish versions prior to 3.0 supported the syntax set PATH[1] PATH[4]\n  /bin /sbin, which worked like set PATH[1 4] /bin /sbin.",
+    "args": "set\nset (-f | --function) (-l | local) (-g | --global) (-U | --universal)\nset [-Uflg] NAME [VALUE ...]\nset [-Uflg] NAME[[INDEX ...]] [VALUE ...]\nset (-a | --append) [-flgU] NAME VALUE ...\nset (-q | --query) (-e | --erase) [-flgU] [NAME][[INDEX]] ...]\nset (-S | --show) [NAME ...]"
+  },
+  "set_color": {
+    "shortDescription": "set the terminal color",
+    "description": "set_color is used to control the color and styling of text in the\nterminal. VALUE describes that styling. VALUE can be a reserved color\nname like red or an RGB color value given as 3 or 6 hexadecimal\ndigits (\"F27\" or \"FF2277\"). A special keyword normal resets text\nformatting to terminal defaults.\n\nValid colors include:\n\n   • black, red, green, yellow, blue, magenta, cyan, white\n\n   • brblack, brred, brgreen, bryellow, brblue, brmagenta, brcyan,\n     brwhite\n\nThe br- (as in 'bright') forms are full-brightness variants of the 8\nstandard-brightness colors on many terminals. brblack has higher\nbrightness than black - towards gray.\n\nAn RGB value with three or six hex digits, such as A0FF33 or f2f can\nbe used. Fish will choose the closest supported color. A three digit\nvalue is equivalent to specifying each digit twice; e.g., set_color\n2BC is the same as set_color 22BBCC. Hexadecimal RGB values can be in\nlower or uppercase. Depending on the capabilities of your terminal\n(and the level of support set_color has for it) the actual color may\nbe approximated by a nearby matching reserved color name or set_color\nmay not have an effect on color.\n\nA second color may be given as a desired fallback color. e.g.\nset_color 124212 brblue will instruct set_color to use brblue if a\nterminal is not capable of the exact shade of grey desired. This is\nvery useful when an 8 or 16 color terminal might otherwise not use a\ncolor.\n\nThe following options are available:\n\n-b or --background COLOR\n       Sets the background color.\n\n-c or --print-colors\n       Prints the given colors or a colored list of the 16 named\n       colors.\n\n-o or --bold\n       Sets bold mode.\n\n-d or --dim\n       Sets dim mode.\n\n-i or --italics\n       Sets italics mode.\n\n-r or --reverse\n       Sets reverse mode.\n\n-u or --underline\n       Sets underlined mode.\n\n-h or --help\n       Displays help about using this command.\n\nUsing the normal keyword will reset foreground, background, and all\nformatting back to default.\n\nNOTES\n\n1. Using the normal keyword will reset both background and foreground\n   colors to whatever is the default for the terminal.\n\n2. Setting the background color only affects subsequently written\n   characters. Fish provides no way to set the background color for\n   the entire terminal window. Configuring the window background\n   color (and other attributes such as its opacity) has to be done\n   using whatever mechanisms the terminal provides. Look for a config\n   option.\n\n3. Some terminals use the --bold escape sequence to switch to a\n   brighter color set rather than increasing the weight of text.\n\n4. set_color works by printing sequences of characters to standard\n   output. If used in command substitution or a pipe, these\n   characters will also be captured. This may or may not be\n   desirable. Checking the exit status of isatty stdout before using\n   set_color can be useful to decide not to colorize output in a\n   script.\n\nEXAMPLES\n\n   set_color red; echo \"Roses are red\"\n   set_color blue; echo \"Violets are blue\"\n   set_color 62A; echo \"Eggplants are dark purple\"\n   set_color normal; echo \"Normal is nice\" # Resets the background too\n\nTERMINAL CAPABILITY DETECTION\nFish uses some heuristics to determine what colors a terminal\nsupports to avoid sending sequences that it won't understand.\n\nIn particular it will:\n\n• Enable 256 colors if TERM contains \"xterm\", except for known\n  exceptions (like MacOS 10.6 Terminal.app)\n\n• Enable 24-bit (\"true-color\") even if the $TERM entry only reports\n  256 colors. This includes modern xterm, VTE-based terminals like\n  Gnome Terminal, Konsole and iTerm2.\n\n• Detect support for italics, dim, reverse and other modes.\n\nIf terminfo reports 256 color support for a terminal, 256 color\nsupport will always be enabled.\n\nTo force true-color support on or off, set fish_term24bit to \"1\" for\non and 0 for off - set -g fish_term24bit 1.\n\nTo debug color palette problems, tput colors may be useful to see the\nnumber of colors in terminfo for a terminal. Fish launched as fish -d\nterm_support will include diagnostic messages that indicate the color\nsupport mode in use.\n\nThe set_color command uses the terminfo database to look up how to\nchange terminal colors on whatever terminal is in use. Some systems\nhave old and incomplete terminfo databases, and lack color\ninformation for terminals that support it. Fish assumes that all\nterminals can use the [ANSI\nX3.64](https://en.wikipedia.org/wiki/ANSI_escape_code) escape\nsequences if the terminfo definition indicates a color below 16 is\nnot supported.",
+    "args": "set_color [OPTIONS] VALUE"
+  },
+  "source": {
+    "shortDescription": "evaluate contents of file",
+    "description": "source evaluates the commands of the specified FILE in the current\nshell as a new block of code. This is different from starting a new\nprocess to perform the commands (i.e. fish < FILE) since the commands\nwill be evaluated by the current shell, which means that changes in\nshell variables will affect the current shell. If additional\narguments are specified after the file name, they will be inserted\ninto the argv variable. The argv variable will not include the name\nof the sourced file.\n\nfish will search the working directory to resolve relative paths but\nwill not search PATH .\n\nIf no file is specified and stdin is not the terminal, or if the file\nname - is used, stdin will be read.\n\nThe exit status of source is the exit status of the last job to\nexecute. If something goes wrong while opening or reading the file,\nsource exits with a non-zero status.\n\n. (a single period) is an alias for the source command. The use of .\nis deprecated in favour of source, and . will be removed in a future\nversion of fish.\n\nsource creates a new local scope; set --local within a sourced block\nwill not affect variables in the enclosing scope.\n\nThe -h or --help option displays help about using this command.\n\nEXAMPLE\n\n   source ~/.config/fish/config.fish\n   # Causes fish to re-read its initialization file.\n\nCAVEATS\nIn fish versions prior to 2.3.0, the argv variable would have a\nsingle element (the name of the sourced file) if no arguments are\npresent. Otherwise, it would contain arguments without the name of\nthe sourced file. That behavior was very confusing and unlike other\nshells such as bash and zsh.",
+    "args": "source FILE [ARGUMENTS ...]\nSOMECOMMAND | source"
+  },
+  "status": {
+    "shortDescription": "query fish runtime information",
+    "description": "With no arguments, status displays a summary of the current login and\njob control status of the shell.\n\nThe following operations (subcommands) are available:\n\nis-command-substitution, -c or --is-command-substitution\n       Returns 0 if fish is currently executing a command\n       substitution.\n\nis-block, -b or --is-block\n       Returns 0 if fish is currently executing a block of code.\n\nis-breakpoint\n       Returns 0 if fish is currently showing a prompt in the context\n       of a breakpoint command. See also the fish_breakpoint_prompt\n       function.\n\nis-interactive, -i or --is-interactive\n       Returns 0 if fish is interactive - that is, connected to a\n       keyboard.\n\nis-login, -l or --is-login\n       Returns 0 if fish is a login shell - that is, if fish should\n       perform login tasks such as setting up PATH.\n\nis-full-job-control or --is-full-job-control\n       Returns 0 if full job control is enabled.\n\nis-interactive-job-control or --is-interactive-job-control\n       Returns 0 if interactive job control is enabled.\n\nis-no-job-control or --is-no-job-control\n       Returns 0 if no job control is enabled.\n\ncurrent-command\n       Prints the name of the currently-running function or command,\n       like the deprecated  variable.\n\ncurrent-commandline\n       Prints the entirety of the currently-running commandline,\n       inclusive of all jobs and operators.\n\nfilename, current-filename, -f or --current-filename\n       Prints the filename of the currently-running script. If the\n       current script was called via a symlink, this will return the\n       symlink. If the current script was received by piping into\n       source, then this will return -.\n\nbasename\n       Prints just the filename of the running script, without any\n       path components before.\n\ndirname\n       Prints just the path to the running script, without the actual\n       filename itself. This can be relative to PWD (including just\n       \".\"), depending on how the script was called. This is the same\n       as passing the filename to dirname(3). It's useful if you want\n       to use other files in the current script's directory or\n       similar.\n\nfish-path\n       Prints the absolute path to the currently executing instance\n       of fish. This is a best-effort attempt and the exact output is\n       down to what the platform gives fish. In some cases you might\n       only get \"fish\".\n\nfunction or current-function\n       Prints the name of the currently called function if able, when\n       missing displays \"Not a function\" (or equivalent translated\n       string).\n\nline-number, current-line-number, -n or --current-line-number\n       Prints the line number of the currently running script.\n\nstack-trace, print-stack-trace, -t or --print-stack-trace\n       Prints a stack trace of all function calls on the call stack.\n\njob-control, -j or --job-control CONTROL_TYPE\n       Sets the job control type to CONTROL_TYPE, which can be none,\n       full, or interactive.\n\nfeatures\n       Lists all available feature flags.\n\ntest-feature FEATURE\n       Returns 0 when FEATURE is enabled, 1 if it is disabled, and 2\n       if it is not recognized.\n\nNOTES\nFor backwards compatibility most subcommands can also be specified as\na long or short option. For example, rather than status is-login you\ncan type status --is-login. The flag forms are deprecated and may be\nremoved in a future release (but not before fish 4.0).\n\nYou can only specify one subcommand per invocation even if you use\nthe flag form of the subcommand.",
+    "args": "status\nstatus is-login\nstatus is-interactive\nstatus is-block\nstatus is-breakpoint\nstatus is-command-substitution\nstatus is-no-job-control\nstatus is-full-job-control\nstatus is-interactive-job-control\nstatus current-command\nstatus current-commandline\nstatus filename\nstatus basename\nstatus dirname\nstatus fish-path\nstatus function\nstatus line-number\nstatus stack-trace\nstatus job-control CONTROL_TYPE\nstatus features\nstatus test-feature FEATURE"
+  },
+  "string": {
+    "shortDescription": "manipulate strings",
+    "description": "string performs operations on strings.\n\nSTRING arguments are taken from the command line unless standard\ninput is connected to a pipe or a file, in which case they are read\nfrom standard input, one STRING per line. It is an error to supply\nSTRING arguments on the command line and on standard input.\n\nArguments beginning with - are normally interpreted as switches; --\ncauses the following arguments not to be treated as switches even if\nthey begin with -. Switches and required arguments are recognized\nonly on the command line.\n\nMost subcommands accept a -q or --quiet switch, which suppresses the\nusual output but exits with the documented status. In this case these\ncommands will quit early, without reading all of the available input.\n\nThe following subcommands are available.\n\nCOLLECT SUBCOMMAND\nstring collect [-a | --allow-empty] [-N | --no-trim-newlines] [STRING ...]\n\nstring collect collects its input into a single output argument,\nwithout splitting the output when used in a command substitution.\nThis is useful when trying to collect multiline output from another\ncommand into a variable. Exit status: 0 if any output argument is\nnon-empty, or 1 otherwise.\n\nA command like echo (cmd | string collect) is mostly equivalent to a\nquoted command substitution (echo \"$(cmd)\"). The main difference is\nthat the former evaluates to zero or one elements whereas the quoted\ncommand substitution always evaluates to one element due to string\ninterpolation.\n\nIf invoked with multiple arguments instead of input, string collect\npreserves each argument separately, where the number of output\narguments is equal to the number of arguments given to string\ncollect.\n\nAny trailing newlines on the input are trimmed, just as with \"$(cmd)\"\nsubstitution. Use --no-trim-newlines to disable this behavior, which\nmay be useful when running a command such as set contents (cat\nfilename | string collect -N).\n\nWith --allow-empty, string collect always prints one (empty)\nargument. This can be used to prevent an argument from disappearing.\n\n   Examples\n\n   > echo \"zero $(echo one\\ntwo\\nthree) four\"\n   zero one\n   two\n   three four\n\n   > echo \\\"(echo one\\ntwo\\nthree | string collect)\\\"\n   \"one\n   two\n   three\"\n\n   > echo \\\"(echo one\\ntwo\\nthree | string collect -N)\\\"\n   \"one\n   two\n   three\n   \"\n\n   > echo foo(true | string collect --allow-empty)bar\n   foobar\n\nESCAPE AND UNESCAPE SUBCOMMANDS\nstring escape [-n | --no-quoted] [--style=] [STRING ...]\nstring unescape [--style=] [STRING ...]\n\nstring escape escapes each STRING in one of three ways. The first is\n--style=script. This is the default. It alters the string such that\nit can be passed back to eval to produce the original argument again.\nBy default, all special characters are escaped, and quotes are used\nto simplify the output when possible. If -n or --no-quoted is given,\nthe simplifying quoted format is not used. Exit status: 0 if at least\none string was escaped, or 1 otherwise.\n\n--style=var ensures the string can be used as a variable name by hex\nencoding any non-alphanumeric characters. The string is first\nconverted to UTF-8 before being encoded.\n\n--style=url ensures the string can be used as a URL by hex encoding\nany character which is not legal in a URL. The string is first\nconverted to UTF-8 before being encoded.\n\n--style=regex escapes an input string for literal matching within a\nregex expression. The string is first converted to UTF-8 before being\nencoded.\n\nstring unescape performs the inverse of the string escape command. If\nthe string to be unescaped is not properly formatted it is ignored.\nFor example, doing string unescape --style=var (string escape\n--style=var $str) will return the original string. There is no\nsupport for unescaping --style=regex.\n\n   Examples\n\n   > echo \\x07 | string escape\n   \\cg\n\n   > string escape --style=var 'a1 b2'\\u6161\n   a1_20_b2_E6_85_A1\n\nJOIN AND JOIN0 SUBCOMMANDS\nstring join [-q | --quiet] SEP [STRING ...]\nstring join0 [-q | --quiet] [STRING ...]\n\nstring join joins its STRING arguments into a single string separated\nby SEP, which can be an empty string. Exit status: 0 if at least one\njoin was performed, or 1 otherwise. If -n or --no-empty is specified,\nempty strings are excluded from consideration (e.g. string join -n +\na b \"\" c would expand to a+b+c not a+b++c).\n\nstring join0 joins its STRING arguments into a single string\nseparated by the zero byte (NUL), and adds a trailing NUL. This is\nmost useful in conjunction with tools that accept NUL-delimited\ninput, such as sort -z. Exit status: 0 if at least one join was\nperformed, or 1 otherwise.\n\nBecause Unix uses NUL as the string terminator, passing the output of\nstring join0 as an argument to a command (via a command substitution)\nwon't actually work. Fish will pass the correct bytes along, but the\ncommand won't be able to tell where the argument ends. This is a\nlimitation of Unix' argument passing.\n\n   Examples\n\n   > seq 3 | string join ...\n   1...2...3\n\n   # Give a list of NUL-separated filenames to du (this is a GNU extension)\n   > string join0 file1 file2 file\\nwith\\nmultiple\\nlines | du --files0-from=-\n\n   # Just put the strings together without a separator\n   > string join '' a b c\n   abc\n\nLENGTH SUBCOMMAND\nstring length [-q | --quiet] [-V | --visible] [STRING ...]\n\nstring length reports the length of each string argument in\ncharacters. Exit status: 0 if at least one non-empty STRING was\ngiven, or 1 otherwise.\n\nWith -V or --visible, it uses the visible width of the arguments.\nThat means it will discount escape sequences fish knows about,\naccount for $fish_emoji_width and $fish_ambiguous_width. It will also\ncount each line (separated by \\n) on its own, and with a carriage\nreturn (\\r) count only the widest stretch on a line. The intent is to\nmeasure the number of columns the STRING would occupy in the current\nterminal.\n\n   Examples\n\n   > string length 'hello, world'\n   12\n\n   > set str foo\n   > string length -q $str; echo $status\n   0\n   # Equivalent to test -n \"$str\"\n\n   > string length --visible (set_color red)foobar\n   # the set_color is discounted, so this is the width of \"foobar\"\n   6\n\n   > string length --visible 🐟🐟🐟🐟\n   # depending on $fish_emoji_width, this is either 4 or 8\n   # in new terminals it should be\n   8\n\n   > string length --visible abcdef\\r123\n   # this displays as \"123def\", so the width is 6\n   6\n\n   > string length --visible a\\nbc\n   # counts \"a\" and \"bc\" as separate lines, so it prints width for each\n   1\n   2\n\nLOWER SUBCOMMAND\nstring lower [-q | --quiet] [STRING ...]\n\nstring lower converts each string argument to lowercase. Exit status:\n0 if at least one string was converted to lowercase, else 1. This\nmeans that in conjunction with the -q flag you can readily test\nwhether a string is already lowercase.\n\nMATCH SUBCOMMAND\nstring match [-a | --all] [-e | --entire] [-i | --ignore-case]\n             [-g | --groups-only] [-r | --regex] [-n | --index]\n             [-q | --quiet] [-v | --invert]\n             PATTERN [STRING ...]\n\nstring match tests each STRING against PATTERN and prints matching\nsubstrings. Only the first match for each STRING is reported unless\n-a or --all is given, in which case all matches are reported.\n\nIf you specify the -e or --entire then each matching string is\nprinted including any prefix or suffix not matched by the pattern\n(equivalent to grep without the -o flag). You can, obviously, achieve\nthe same result by prepending and appending * or .* depending on\nwhether or not you have specified the --regex flag. The --entire flag\nis simply a way to avoid having to complicate the pattern in that\nfashion and make the intent of the string match clearer. Without\n--entire and --regex, a PATTERN will need to match the entire STRING\nbefore it will be reported.\n\nMatching can be made case-insensitive with --ignore-case or -i.\n\nIf --groups-only or -g is given, only the capturing groups will be\nreported - meaning the full match will be skipped. This is\nincompatible with --entire and --invert, and requires --regex. It is\nuseful as a simple cutting tool instead of string replace, so you can\nsimply choose \"this part\" of a string.\n\nIf --index or -n is given, each match is reported as a 1-based start\nposition and a length. By default, PATTERN is interpreted as a glob\npattern matched against each entire STRING argument. A glob pattern\nis only considered a valid match if it matches the entire STRING.\n\nIf --regex or -r is given, PATTERN is interpreted as a\nPerl-compatible regular expression, which does not have to match the\nentire STRING. For a regular expression containing capturing groups,\nmultiple items will be reported for each match, one for the entire\nmatch and one for each capturing group. With this, only the matching\npart of the STRING will be reported, unless --entire is given.\n\nWhen matching via regular expressions, string match automatically\nsets variables for all named capturing groups ((?<name>expression)).\nIt will create a variable with the name of the group, in the default\nscope, for each named capturing group, and set it to the value of the\ncapturing group in the first matched argument. If a named capture\ngroup matched an empty string, the variable will be set to the empty\nstring (like set var \"\"). If it did not match, the variable will be\nset to nothing (like set var).  When --regex is used with --all, this\nbehavior changes. Each named variable will contain a list of matches,\nwith the first match contained in the first element, the second match\nin the second, and so on. If the group was empty or did not match,\nthe corresponding element will be an empty string.\n\nIf --invert or -v is used the selected lines will be only those which\ndo not match the given glob pattern or regular expression.\n\nExit status: 0 if at least one match was found, or 1 otherwise.\n\n   Match Glob Examples\n\n   > string match '?' a\n   a\n\n   > string match 'a*b' axxb\n   axxb\n\n   > string match -i 'a??B' Axxb\n   Axxb\n\n   > string match -- '-*' -h foo --version bar\n   # To match things that look like options, we need a `--`\n   # to tell string its options end there.\n   -h\n   --version\n\n   > echo 'ok?' | string match '*\\?'\n   ok?\n\n   # Note that only the second STRING will match here.\n   > string match 'foo' 'foo1' 'foo' 'foo2'\n   foo\n\n   > string match -e 'foo' 'foo1' 'foo' 'foo2'\n   foo1\n   foo\n   foo2\n\n   > string match 'foo?' 'foo1' 'foo' 'foo2'\n   foo1\n   foo2\n\n   Match Regex Examples\n\n   > string match -r 'cat|dog|fish' 'nice dog'\n   dog\n\n   > string match -r -v \"c.*[12]\" {cat,dog}(seq 1 4)\n   dog1\n   dog2\n   cat3\n   dog3\n   cat4\n   dog4\n\n   > string match -r -- '-.*' -h foo --version bar\n   # To match things that look like options, we need a `--`\n   # to tell string its options end there.\n   -h\n   --version\n\n   > string match -r '(\\d\\d?):(\\d\\d):(\\d\\d)' 2:34:56\n   2:34:56\n   2\n   34\n   56\n\n   > string match -r '^(\\w{2,4})\\1$' papa mud murmur\n   papa\n   pa\n   murmur\n   mur\n\n   > string match -r -a -n at ratatat\n   2 2\n   4 2\n   6 2\n\n   > string match -r -i '0x[0-9a-f]{1,8}' 'int magic = 0xBadC0de;'\n   0xBadC0de\n\n   > echo $version\n   3.1.2-1575-ga2ff32d90\n   > string match -rq '(?<major>\\d+).(?<minor>\\d+).(?<revision>\\d+)' -- $version\n   > echo \"You are using fish $major!\"\n   You are using fish 3!\n\n   > string match -raq ' *(?<sentence>[^.!?]+)(?<punctuation>[.!?])?' \"hello, friend. goodbye\"\n   > printf \"%s\\n\" -- $sentence\n   hello, friend\n   goodbye\n   > printf \"%s\\n\" -- $punctuation\n   .\n\n   > string match -rq '(?<word>hello)' 'hi'\n   > count $word\n   0\n\nPAD AND SHORTEN SUBCOMMANDS\nstring pad [-r | --right] [(-c | --char) CHAR] [(-w | --width) INTEGER]\n           [STRING ...]\n\nstring pad extends each STRING to the given visible width by adding\nCHAR to the left. That means the width of all visible characters\nadded together, excluding escape sequences and accounting for\nfish_emoji_width and fish_ambiguous_width. It is the amount of\ncolumns in a terminal the STRING occupies.\n\nThe escape sequences reflect what fish knows about, and how it\ncomputes its output. Your terminal might support more escapes, or not\nsupport escape sequences that fish knows about.\n\nIf -r or --right is given, add the padding after a string.\n\nIf -c or --char is given, pad with CHAR instead of whitespace.\n\nThe output is padded to the maximum width of all input strings. If -w\nor --width is given, use at least that.\n\n   > string pad -w 10 abc abcdef\n          abc\n       abcdef\n\n   > string pad --right --char=🐟 \"fish are pretty\" \"rich. \"\n   fish are pretty\n   rich.  🐟🐟🐟🐟\n\n   > string pad -w$COLUMNS (date)\n   # Prints the current time on the right edge of the screen.\n\nSEE ALSO\n\n• The printf command can do simple padding, for example printf %10s\\n\n  works like string pad -w10.\n\n• string length with the --visible option can be used to show what\n  fish thinks the width is.\nstring shorten [(-c | --char) CHARS] [(-m | --max) INTEGER]\n               [-N | --no-newline] [-l | --left] [-q | --quiet] [STRING ...]\n\nstring shorten truncates each STRING to the given visible width and\nadds an ellipsis to indicate it. \"Visible width\" means the width of\nall visible characters added together, excluding escape sequences and\naccounting for fish_emoji_width and fish_ambiguous_width. It is the\namount of columns in a terminal the STRING occupies.\n\nThe escape sequences reflect what fish knows about, and how it\ncomputes its output. Your terminal might support more escapes, or not\nsupport escape sequences that fish knows about.\n\nIf -m or --max is given, truncate at the given width. Otherwise, the\nlowest non-zero width of all input strings is used. A max of 0 means\nno shortening takes place, all STRINGs are printed as-is.\n\nIf -N or --no-newline is given, only the first line (or last line\nwith --left) of each STRING is used, and an ellipsis is added if it\nwas multiline. This only works for STRINGs being given as arguments,\nmultiple lines given on stdin will be interpreted as separate STRINGs\ninstead.\n\nIf -c or --char is given, add CHAR instead of an ellipsis. This can\nalso be empty or more than one character.\n\nIf -l or --left is given, remove text from the left on instead, so\nthis prints the longest suffix of the string that fits. With\n--no-newline, this will take from the last line instead of the first.\n\nIf -q or --quiet is given, string shorten only runs for the return\nvalue - if anything would be shortened, it returns 0, else 1.\n\nThe default ellipsis is …. If fish thinks your system is incapable\nbecause of your locale, it will use ... instead.\n\nThe return value is 0 if any shortening occured, 1 otherwise.\n\n   > string shorten foo foobar\n   # No width was given, we infer, and \"foo\" is the shortest.\n   foo\n   fo…\n\n   > string shorten --char=\"...\" foo foobar\n   # The target width is 3 because of \"foo\",\n   # and our ellipsis is 3 too, so we can't really show anything.\n   # This is the default ellipsis if your locale doesn't allow \"…\".\n   foo\n   ...\n\n   > string shorten --char=\"\" --max 4 abcdef 123456\n   # Leaving the char empty makes us not add an ellipsis\n   # So this truncates at 4 columns:\n   abcd\n   1234\n\n   > touch \"a multiline\"\\n\"file\"\n   > for file in *; string shorten -N -- $file; end\n   # Shorten the multiline file so we only show one line per file:\n   a multiline…\n\n   > ss -p | string shorten -m$COLUMNS -c \"\"\n   # `ss` from Linux' iproute2 shows socket information, but prints extremely long lines.\n   # This shortens input so it fits on the screen without overflowing lines.\n\n   > git branch | string match -rg '^\\* (.*)' | string shorten -m20\n   # Take the current git branch and shorten it at 20 columns.\n   # Here the branch is \"builtin-path-with-expand\"\n   builtin-path-with-e…\n\n   > git branch | string match -rg '^\\* (.*)' | string shorten -m20 --left\n   # Taking 20 columns from the right instead:\n   …in-path-with-expand\n\nSEE ALSO\n\n• string's pad subcommand does the inverse of this command, adding\n  padding to a specific width instead.\n\n• The printf command can do simple padding, for example printf %10s\\n\n  works like string pad -w10.\n\n• string length with the --visible option can be used to show what\n  fish thinks the width is.\n\nREPEAT SUBCOMMAND\nstring repeat [(-n | --count) COUNT] [(-m | --max) MAX] [-N | --no-newline]\n              [-q | --quiet] [STRING ...]\n\nstring repeat repeats the STRING -n or --count times. The -m or --max\noption will limit the number of outputted characters (excluding the\nnewline). This option can be used by itself or in conjunction with\n--count. If both --count and --max are present, max char will be\noutputed unless the final repeated string size is less than max, in\nthat case, the string will repeat until count has been reached. Both\n--count and --max will accept a number greater than or equal to zero,\nin the case of zero, nothing will be outputed. If -N or --no-newline\nis given, the output won't contain a newline character at the end.\nExit status: 0 if yielded string is not empty, 1 otherwise.\n\n   Examples\n   Repeat Examples\n\n   > string repeat -n 2 'foo '\n   foo foo\n\n   > echo foo | string repeat -n 2\n   foofoo\n\n   > string repeat -n 2 -m 5 'foo'\n   foofo\n\n   > string repeat -m 5 'foo'\n   foofo\n\nREPLACE SUBCOMMAND\nstring replace [-a | --all] [-f | --filter] [-i | --ignore-case]\n               [-r | --regex] [-q | --quiet] PATTERN REPLACEMENT [STRING ...]\n\nstring replace is similar to string match but replaces\nnon-overlapping matching substrings with a replacement string and\nprints the result. By default, PATTERN is treated as a literal\nsubstring to be matched.\n\nIf -r or --regex is given, PATTERN is interpreted as a\nPerl-compatible regular expression, and REPLACEMENT can contain\nC-style escape sequences like t as well as references to capturing\ngroups by number or name as $n or ${n}.\n\nIf you specify the -f or --filter flag then each input string is\nprinted only if a replacement was done. This is useful where you\nwould otherwise use this idiom: a_cmd | string match pattern | string\nreplace pattern new_pattern. You can instead just write a_cmd |\nstring replace --filter pattern new_pattern.\n\nExit status: 0 if at least one replacement was performed, or 1\notherwise.\n\n   Replace Literal Examples\n\n   > string replace is was 'blue is my favorite'\n   blue was my favorite\n\n   > string replace 3rd last 1st 2nd 3rd\n   1st\n   2nd\n   last\n\n   > string replace -a ' '  'spaces to underscores'\n   spaces_to_underscores\n\n   Replace Regex Examples\n\n   > string replace -r -a '[^\\d.]+' ' ' '0 one two 3.14 four 5x'\n   0 3.14 5\n\n   > string replace -r '(\\w+)\\s+(\\w+)' '$2 $1 $$' 'left right'\n   right left $\n\n   > string replace -r '\\s*newline\\s*' '\\n' 'put a newline here'\n   put a\n   here\n\nSPLIT AND SPLIT0 SUBCOMMANDS\nstring split [(-f | --fields) FIELDS] [(-m | --max) MAX] [-n | --no-empty]\n             [-q | --quiet] [-r | --right] SEP [STRING ...]\nstring split0 [(-f | --fields) FIELDS] [(-m | --max) MAX] [-n | --no-empty]\n              [-q | --quiet] [-r | --right] [STRING ...]\n\nstring split splits each STRING on the separator SEP, which can be an\nempty string. If -m or --max is specified, at most MAX splits are\ndone on each STRING. If -r or --right is given, splitting is\nperformed right-to-left. This is useful in combination with -m or\n--max. With -n or --no-empty, empty results are excluded from\nconsideration (e.g. hello\\n\\nworld would expand to two strings and\nnot three). Exit status: 0 if at least one split was performed, or 1\notherwise.\n\nUse -f or --fields to print out specific fields. FIELDS is a\ncomma-separated string of field numbers and/or spans. Each field is\none-indexed, and will be printed on separate lines. If a given field\ndoes not exist, then the command exits with status 1 and does not\nprint anything, unless --allow-empty is used.\n\nSee also the --delimiter option of the read command.\n\nstring split0 splits each STRING on the zero byte (NUL). Options are\nthe same as string split except that no separator is given.\n\nsplit0 has the important property that its output is not further\nsplit when used in a command substitution, allowing for the command\nsubstitution to produce elements containing newlines. This is most\nuseful when used with Unix tools that produce zero bytes, such as\nfind -print0 or sort -z. See split0 examples below.\n\n   Examples\n\n   > string split . example.com\n   example\n   com\n\n   > string split -r -m1 / /usr/local/bin/fish\n   /usr/local/bin\n   fish\n\n   > string split '' abc\n   a\n   b\n   c\n\n   > string split --allow-empty -f1,3-4,5 '' abcd\n   a\n   c\n   d\n\n   NUL Delimited Examples\n\n   > # Count files in a directory, without being confused by newlines.\n   > count (find . -print0 | string split0)\n   42\n\n   > # Sort a list of elements which may contain newlines\n   > set foo beta alpha\\ngamma\n   > set foo (string join0 $foo | sort -z | string split0)\n   > string escape $foo[1]\n   alpha\\ngamma\n\nSUB SUBCOMMAND\nstring sub [(-s | --start) START] [(-e | --end) END] [(-l | --length) LENGTH]\n           [-q | --quiet] [STRING ...]\n\nstring sub prints a substring of each string argument. The start/end\nof the substring can be specified with -s/-e or --start/--end\nfollowed by a 1-based index value. Positive index values are relative\nto the start of the string and negative index values are relative to\nthe end of the string. The default start value is 1. The length of\nthe substring can be specified with -l or --length. If the length or\nend is not specified, the substring continues to the end of each\nSTRING. Exit status: 0 if at least one substring operation was\nperformed, 1 otherwise. --length is mutually exclusive with --end.\n\n   Examples\n\n   > string sub --length 2 abcde\n   ab\n\n   > string sub -s 2 -l 2 abcde\n   bc\n\n   > string sub --start=-2 abcde\n   de\n\n   > string sub --end=3 abcde\n   abc\n\n   > string sub -e -1 abcde\n   abcd\n\n   > string sub -s 2 -e -1 abcde\n   bcd\n\n   > string sub -s -3 -e -2 abcde\n   c\n\nTRIM SUBCOMMAND\nstring trim [-l | --left] [-r | --right] [(-c | --chars) CHARS]\n            [-q | --quiet] [STRING ...]\n\nstring trim removes leading and trailing whitespace from each STRING.\nIf -l or --left is given, only leading whitespace is removed. If -r\nor --right is given, only trailing whitespace is trimmed. The -c or\n--chars switch causes the characters in CHARS to be removed instead\nof whitespace. Exit status: 0 if at least one character was trimmed,\nor 1 otherwise.\n\n   Examples\n\n   > string trim ' abc  '\n   abc\n\n   > string trim --right --chars=yz xyzzy zany\n   x\n   zan\n\nUPPER SUBCOMMAND\nstring upper [-q | --quiet] [STRING ...]\n\nstring upper converts each string argument to uppercase. Exit status:\n0 if at least one string was converted to uppercase, else 1. This\nmeans that in conjunction with the -q flag you can readily test\nwhether a string is already uppercase.\n\nREGULAR EXPRESSIONS\nBoth the match and replace subcommand support regular expressions\nwhen used with the -r or --regex option. The dialect is that of\nPCRE2.\n\nIn general, special characters are special by default, so a+ matches\none or more \"a\"s, while a\\+ matches an \"a\" and then a \"+\". (a+)\nmatches one or more \"a\"s in a capturing group ((?:XXXX) denotes a\nnon-capturing group). For the replacement parameter of replace, $n\nrefers to the n-th group of the match. In the match parameter, \\n\n(e.g. \\1) refers back to groups.\n\nSome features include repetitions:\n\n• * refers to 0 or more repetitions of the previous expression\n\n• + 1 or more\n\n• ? 0 or 1.\n\n• {n} to exactly n (where n is a number)\n\n• {n,m} at least n, no more than m.\n\n• {n,} n or more\n\nCharacter classes, some of the more important:\n\n• . any character except newline\n\n• \\d a decimal digit and \\D, not a decimal digit\n\n• \\s whitespace and \\S, not whitespace\n\n• \\w a \"word\" character and \\W, a \"non-word\" character\n\n• [...] (where \"...\" is some characters) is a character set\n\n• [^...] is the inverse of the given character set\n\n• [x-y] is the range of characters from x-y\n\n• [[:xxx:]] is a named character set\n\n• [[:^xxx:]] is the inverse of a named character set\n\n• [[:alnum:]]  : \"alphanumeric\"\n\n• [[:alpha:]]  : \"alphabetic\"\n\n• [[:ascii:]]  : \"0-127\"\n\n• [[:blank:]]  : \"space or tab\"\n\n• [[:cntrl:]]  : \"control character\"\n\n• [[:digit:]]  : \"decimal digit\"\n\n• [[:graph:]]  : \"printing, excluding space\"\n\n• [[:lower:]]  : \"lower case letter\"\n\n• [[:print:]]  : \"printing, including space\"\n\n• [[:punct:]]  : \"printing, excluding alphanumeric\"\n\n• [[:space:]]  : \"white space\"\n\n• [[:upper:]]  : \"upper case letter\"\n\n• [[:word:]]   : \"same as w\"\n\n• [[:xdigit:]] : \"hexadecimal digit\"\n\nGroups:\n\n• (...) is a capturing group\n\n• (?:...) is a non-capturing group\n\n• \\n is a backreference (where n is the number of the group, starting\n  with 1)\n\n• $n is a reference from the replacement expression to a group in the\n  match expression.\n\nAnd some other things:\n\n• \\b denotes a word boundary, \\B is not a word boundary.\n\n• ^ is the start of the string or line, $ the end.\n\n• | is \"alternation\", i.e. the \"or\".\n\nCOMPARISON TO OTHER TOOLS\nMost operations string supports can also be done by external tools.\nSome of these include grep, sed and cut.\n\nIf you are familiar with these, it is useful to know how string\ndiffers from them.\n\nIn contrast to these classics, string reads input either from stdin\nor as arguments. string also does not deal with files, so it requires\nredirections to be used with them.\n\nIn contrast to grep, string's match defaults to glob-mode, while\nreplace defaults to literal matching. If set to regex-mode, they use\nPCRE regular expressions, which is comparable to grep's -P option.\nmatch defaults to printing just the match, which is like grep with -o\n(use --entire to enable grep-like behavior).\n\nLike sed's s/old/new/ command, string replace still prints strings\nthat don't match. sed's -n in combination with a /p modifier or\ncommand is like string replace -f.\n\nstring split somedelimiter is a replacement for tr somedelimiter \\n.",
+    "args": "string collect [-a | --allow-empty] [-N | --no-trim-newlines] [STRING ...]\nstring escape [-n | --no-quoted] [--style=] [STRING ...]\nstring join [-q | --quiet] [-n | --no-empty] SEP [STRING ...]\nstring join0 [-q | --quiet] [STRING ...]\nstring length [-q | --quiet] [STRING ...]\nstring lower [-q | --quiet] [STRING ...]\nstring match [-a | --all] [-e | --entire] [-i | --ignore-case]\n             [-g | --groups-only] [-r | --regex] [-n | --index]\n             [-q | --quiet] [-v | --invert]\n             PATTERN [STRING ...]\nstring pad [-r | --right] [(-c | --char) CHAR] [(-w | --width) INTEGER]\n           [STRING ...]\nstring repeat [(-n | --count) COUNT] [(-m | --max) MAX] [-N | --no-newline]\n              [-q | --quiet] [STRING ...]\nstring replace [-a | --all] [-f | --filter] [-i | --ignore-case]\n               [-r | --regex] [-q | --quiet] PATTERN REPLACE [STRING ...]\nstring shorten [(-c | --char) CHARS] [(-m | --max) INTEGER]\n               [-N | --no-newline] [-l | --left] [-q | --quiet] [STRING ...]\nstring split [(-f | --fields) FIELDS] [(-m | --max) MAX] [-n | --no-empty]\n             [-q | --quiet] [-r | --right] SEP [STRING ...]\nstring split0 [(-f | --fields) FIELDS] [(-m | --max) MAX] [-n | --no-empty]\n              [-q | --quiet] [-r | --right] [STRING ...]\nstring sub [(-s | --start) START] [(-e | --end) END] [(-l | --length) LENGTH]\n           [-q | --quiet] [STRING ...]\nstring trim [-l | --left] [-r | --right] [(-c | --chars) CHARS]\n            [-q | --quiet] [STRING ...]\nstring unescape [--style=] [STRING ...]\nstring upper [-q | --quiet] [STRING ...]"
+  },
+  "switch": {
+    "shortDescription": "conditionally execute a block of commands",
+    "description": "switch performs one of several blocks of commands, depending on\nwhether a specified value equals one of several globbed values. case\nis used together with the switch statement in order to determine\nwhich block should be executed.\n\nEach case command is given one or more parameters. The first case\ncommand with a parameter that matches the string specified in the\nswitch command will be evaluated. case parameters may contain globs.\nThese need to be escaped or quoted in order to avoid regular glob\nexpansion using filenames.\n\nNote that fish does not fall through on case statements. Only the\nfirst matching case is executed.\n\nNote that break cannot be used to exit a case/switch block early like\nin other languages. It can only be used in loops.\n\nNote that command substitutions in a case statement will be evaluated\neven if its body is not taken. All substitutions, including command\nsubstitutions, must be performed before the value can be compared\nagainst the parameter.\n\nEXAMPLE\nIf the variable $animal contains the name of an animal, the following\ncode would attempt to classify it:\n\n   switch $animal\n       case cat\n           echo evil\n       case wolf dog human moose dolphin whale\n           echo mammal\n       case duck goose albatross\n           echo bird\n       case shark trout stingray\n           echo fish\n       case '*'\n           echo I have no idea what a $animal is\n   end\n\nIf the above code was run with $animal set to whale, the output would\nbe mammal.",
+    "args": "switch VALUE; [case [GLOB ...]; [COMMANDS ...]; ...] end"
+  },
+  "test": {
+    "shortDescription": "Evaluate conditional expressions",
+    "description": "The `test` command evaluates conditional expressions and sets the exit status to 0 if the expression is true, and 1 if it is false. It supports various operators to evaluate expressions related to strings, numbers, and file attributes.",
+    "args": "EXPRESSION"
+  },
+  "time": {
+    "shortDescription": "measure how long a command or block takes",
+    "description": "NOTE: This page documents the fish keyword time.  To see the\ndocumentation on the time command you might have, use command man\ntime.\n\ntime causes fish to measure how long a command takes and print the\nresults afterwards. The command can be a simple fish command or a\nblock. The results can not currently be redirected.\n\nFor checking timing after a command has completed, check\n$CMD_DURATION.\n\nYour system most likely also has a time command. To use that use\nsomething like command time, as in command time sleep 10. Because\nit's not inside fish, it won't have access to fish functions and\nwon't be able to time blocks and such.\n\nHOW TO INTERPRET THE OUTPUT\nTime outputs a few different values. Let's look at an example:\n\n   > time string repeat -n 10000000 y\\n | command grep y >/dev/null\n   _______________________________________________________\n   Executed in  805.98 millis    fish           external\n      usr time  798.88 millis  763.88 millis   34.99 millis\n      sys time  141.22 millis   40.20 millis  101.02 millis\n\nThe time after \"Executed in\" is what is known as the \"wall-clock\ntime\". It is simply a measure of how long it took from the start of\nthe command until it finished. Typically it is reasonably close to\nCMD_DURATION, except for a slight skew because the two are taken at\nslightly different times.\n\nThe other times are all measures of CPU time. That means they measure\nhow long the CPU was used in this part, and they count multiple cores\nseparately. So a program with four threads using all CPU for a second\nwill have a time of 4 seconds.\n\nThe \"usr\" time is how much CPU time was spent inside the program\nitself, the \"sys\" time is how long was spent in the kernel on behalf\nof that program.\n\nThe \"fish\" time is how much CPU was spent in fish, the \"external\"\ntime how much was spent in external commands.\n\nSo in this example, since string is a builtin, everything that string\nrepeat did is accounted to fish. Any time it spends doing syscalls\nlike write() is accounted for in the fish/sys time.\n\nAnd grep here is explicitly invoked as an external command, so its\ntimes will be counted in the \"external\" column.\n\nNote that, as in this example, the CPU times can add up to more than\nthe execution time. This is because things can be done in parallel -\ngrep can match while string repeat writes.\n\nEXAMPLE\n(for obvious reasons exact results will vary on your system)\n\n   > time sleep 1s\n\n   _______________________________________________________\n   Executed in    1,01 secs   fish           external\n      usr time    2,32 millis    0,00 micros    2,32 millis\n      sys time    0,88 millis  877,00 micros    0,00 millis\n\n   > time for i in 1 2 3; sleep 1s; end\n\n   _______________________________________________________\n   Executed in    3,01 secs   fish           external\n      usr time    9,16 millis    2,94 millis    6,23 millis\n      sys time    0,23 millis    0,00 millis    0,23 millis\n\nInline variable assignments need to follow the time keyword:\n\n   > time a_moment=1.5m sleep $a_moment\n\n   _______________________________________________________\n   Executed in   90.00 secs      fish           external\n      usr time    4.62 millis    4.62 millis    0.00 millis\n      sys time    2.35 millis    0.41 millis    1.95 millis",
+    "args": "time COMMAND"
+  },
+  "true": {
+    "shortDescription": "Return a successful result",
+    "description": "The `true` command always returns a successful (zero) exit status. It is often used in scripts and conditional statements where an unconditional success result is needed."
+  },
+  "type": {
+    "shortDescription": "locate a command and describe its type",
+    "description": "With no options, type indicates how each NAME would be interpreted if\nused as a command name.\n\nThe following options are available:\n\n-a or --all\n       Prints all of possible definitions of the specified names.\n\n-s or --short\n       Suppresses function expansion when used with no options or\n       with -a/--all.\n\n-f or --no-functions\n       Suppresses function and builtin lookup.\n\n-t or --type\n       Prints function, builtin, or file if NAME is a shell function,\n       builtin, or disk file, respectively.\n\n-p or --path\n       Prints the path to NAME if NAME resolves to an executable file\n       in PATH, the path to the script containing the definition of\n       the function NAME if NAME resolves to a function loaded from a\n       file on disk (i.e. not interactively defined at the prompt),\n       or nothing otherwise.\n\n-P or --force-path\n       Returns the path to the executable file NAME, presuming NAME\n       is found in the PATH environment variable, or nothing\n       otherwise. --force-path explicitly resolves only the path to\n       executable files in  PATH, regardless of whether NAME is\n       shadowed by a function or builtin with the same name.\n\n-q or --query\n       Suppresses all output; this is useful when testing the exit\n       status. For compatibility with old fish versions this is also\n       --quiet.\n\n-h or --help\n       Displays help about using this command.\n\nThe -q, -p, -t and -P flags (and their long flag aliases) are\nmutually exclusive. Only one can be specified at a time.\n\ntype returns 0 if at least one entry was found, 1 otherwise, and 2\nfor invalid options or option combinations.\n\nEXAMPLE\n\n   > type fg\n   fg is a builtin",
+    "args": "type [OPTIONS] NAME [...]"
+  },
+  "ulimit": {
+    "shortDescription": "set or get resource usage limits",
+    "description": "ulimit sets or outputs the resource usage limits of the shell and any\nprocesses spawned by it. If a new limit value is omitted, the current\nvalue of the limit of the resource is printed; otherwise, the\nspecified limit is set to the new value.\n\nUse one of the following switches to specify which resource limit to\nset or report:\n\n-b or --socket-buffers\n       The maximum size of socket buffers.\n\n-c or --core-size\n       The maximum size of core files created. By setting this limit\n       to zero, core dumps can be disabled.\n\n-d or --data-size\n       The maximum size of a process' data segment.\n\n-e or --nice\n       Controls the maximum nice value; on Linux, this value is\n       subtracted from 20 to give the effective value.\n\n-f or --file-size\n       The maximum size of files created by a process.\n\n-i or --pending-signals\n       The maximum number of signals that may be queued.\n\n-l or --lock-size\n       The maximum size that may be locked into memory.\n\n-m or --resident-set-size\n       The maximum resident set size.\n\n-n or --file-descriptor-count\n       The maximum number of open file descriptors.\n\n-q or --queue-size\n       The maximum size of data in POSIX message queues.\n\n-r or --realtime-priority\n       The maximum realtime scheduling priority.\n\n-s or --stack-size\n       The maximum stack size.\n\n-t or --cpu-time\n       The maximum amount of CPU time in seconds.\n\n-u or --process-count\n       The maximum number of processes available to the current user.\n\n-w or --swap-size\n       The maximum swap space available to the current user.\n\n-v or --virtual-memory-size\n       The maximum amount of virtual memory available to the shell.\n\n-y or --realtime-maxtime\n       The maximum contiguous realtime CPU time in microseconds.\n\n-K or --kernel-queues\n       The maximum number of kqueues (kernel queues) for the current\n       user.\n\n-P or --ptys\n       The maximum number of pseudo-terminals for the current user.\n\n-T or --threads\n       The maximum number of simultaneous threads for the current\n       user.\n\nNote that not all these limits are available in all operating\nsystems; consult the documentation for setrlimit in your operating\nsystem.\n\nThe value of limit can be a number in the unit specified for the\nresource or one of the special values hard, soft, or unlimited, which\nstand for the current hard limit, the current soft limit, and no\nlimit, respectively.\n\nIf limit is given, it is the new value of the specified resource. If\nno option is given, then -f is assumed. Values are in kilobytes,\nexcept for -t, which is in seconds and -n and -u, which are unscaled\nvalues. The exit status is 0 unless an invalid option or argument is\nsupplied, or an error occurs while setting a new limit.\n\nulimit also accepts the following options that determine what type of\nlimit to set:\n\n-H or --hard\n       Sets hard resource limit.\n\n-S or --soft\n       Sets soft resource limit.\n\nA hard limit can only be decreased. Once it is set it cannot be\nincreased; a soft limit may be increased up to the value of the hard\nlimit. If neither -H nor -S is specified, both the soft and hard\nlimits are updated when assigning a new limit value, and the soft\nlimit is used when reporting the current value.\n\nThe following additional options are also understood by ulimit:\n\n-a or --all\n       Prints all current limits.\n\n-h or --help\n       Displays help about using this command.\n\nThe fish implementation of ulimit should behave identically to the\nimplementation in bash, except for these differences:\n\n• Fish ulimit supports GNU-style long options for all switches.\n\n• Fish ulimit does not support the -p option for getting the pipe\n  size. The bash implementation consists of a compile-time check that\n  empirically guesses this number by writing to a pipe and waiting\n  for SIGPIPE. Fish does not do this because this method of\n  determining pipe size is unreliable. Depending on bash version,\n  there may also be further additional limits to set in bash that do\n  not exist in fish.\n\n• Fish ulimit does not support getting or setting multiple limits in\n  one command, except reporting all values using the -a switch.\n\nEXAMPLE\nulimit -Hs 64 sets the hard stack size limit to 64 kB.",
+    "args": "ulimit [OPTIONS] [LIMIT]"
+  },
+  "wait": {
+    "shortDescription": "wait for jobs to complete",
+    "description": "wait waits for child jobs to complete.\n\nIf a PID is specified, the command waits for the job that the process\nwith that process ID belongs to.\n\nIf a PROCESS_NAME is specified, the command waits for the jobs that\nthe matched processes belong to.\n\nIf neither a pid nor a process name is specified, the command waits\nfor all background jobs.\n\nIf the -n or --any flag is provided, the command returns as soon as\nthe first job completes. If it is not provided, it returns after all\njobs complete.\n\nThe -h or --help option displays help about using this command.\n\nEXAMPLE\n\n   sleep 10 &\n   wait $last_pid\n\nspawns sleep in the background, and then waits until it finishes.\n\n   for i in (seq 1 5); sleep 10 &; end\n   wait\n\nspawns five jobs in the background, and then waits until all of them\nfinishes.\n\n   for i in (seq 1 5); sleep 10 &; end\n   hoge &\n   wait sleep\n\nspawns five jobs and hoge in the background, and then waits until all\nsleeps finish, and doesn't wait for hoge finishing.",
+    "args": "wait [-n | --any] [PID | PROCESS_NAME] ..."
+  },
+  "while": {
+    "shortDescription": "perform a set of commands multiple times",
+    "description": "while repeatedly executes CONDITION, and if the exit status is 0,\nthen executes COMMANDS.\n\nThe exit status of the while loop is the exit status of the last\niteration of the COMMANDS executed, or 0 if none were executed. (This\nmatches other shells and is POSIX-compatible.)\n\nYou can use and or or for complex conditions. Even more complex\ncontrol can be achieved with while true containing a break.\n\nThe -h or --help option displays help about using this command.\n\nEXAMPLE\n\n   while test -f foo.txt; or test -f bar.txt ; echo file exists; sleep 10; end\n   # outputs 'file exists' at 10 second intervals,\n   # as long as the file foo.txt or bar.txt exists.",
+    "args": "while CONDITION; COMMANDS; end"
+  }
+} as const;
\ No newline at end of file

From 27a2ca85f458bd2248ce28533f63fde3d0984c44 Mon Sep 17 00:00:00 2001
From: Josh Spicer <23246594+joshspicer@users.noreply.github.com>
Date: Thu, 13 Mar 2025 15:30:11 -0700
Subject: [PATCH 0914/1815] Install remote default extensions only if already
 installed locally (#243499)

remote default extensions only if local
---
 src/vs/platform/remote/common/remote.ts       |  2 +-
 .../electron-sandbox/remoteExtensionsInit.ts  | 21 +++++++++++++++----
 .../remote/common/remote.contribution.ts      |  8 +++----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/vs/platform/remote/common/remote.ts b/src/vs/platform/remote/common/remote.ts
index a2d098fa8d1e..eba717a7eb1d 100644
--- a/src/vs/platform/remote/common/remote.ts
+++ b/src/vs/platform/remote/common/remote.ts
@@ -3,4 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export const REMOTE_DEFAULT_EXTENSIONS = 'remote.defaultExtensions';
+export const REMOTE_DEFAULT_IF_LOCAL_EXTENSIONS = 'remote.defaultExtensionsIfInstalledLocally';
diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
index 3895b7686946..1b0fadda14f0 100644
--- a/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
+++ b/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts
@@ -8,12 +8,13 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
 import { EXTENSION_INSTALL_SKIP_PUBLISHER_TRUST_CONTEXT, IExtensionGalleryService, IExtensionManagementService, InstallExtensionInfo } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
+import { ExtensionType } from '../../../../platform/extensions/common/extensions.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
-import { REMOTE_DEFAULT_EXTENSIONS } from '../../../../platform/remote/common/remote.js';
+import { REMOTE_DEFAULT_IF_LOCAL_EXTENSIONS } from '../../../../platform/remote/common/remote.js';
 import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
 import { IRemoteExtensionsScannerService } from '../../../../platform/remote/common/remoteExtensionsScanner.js';
 import { IStorageService, IS_NEW_KEY, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
@@ -53,7 +54,12 @@ export class InstallRemoteExtensionsContribution implements IWorkbenchContributi
 			return;
 		}
 
-		const settingValue = this.configurationService.getValue<string[]>(REMOTE_DEFAULT_EXTENSIONS);
+		if (!this.extensionManagementServerService.localExtensionManagementServer) {
+			this.logService.error('No local extension management server available');
+			return;
+		}
+
+		const settingValue = this.configurationService.getValue<string[]>(REMOTE_DEFAULT_IF_LOCAL_EXTENSIONS);
 		if (!settingValue?.length) {
 			return;
 		}
@@ -62,17 +68,24 @@ export class InstallRemoteExtensionsContribution implements IWorkbenchContributi
 
 		const preferPrerelease = this.productService.quality !== 'stable';
 		const galleryExtensions = await this.extensionGalleryService.getExtensions(settingValue.map((id) => ({ id })), CancellationToken.None);
-		const alreadyInstalledExtensions = await this.extensionManagementServerService.remoteExtensionManagementServer.extensionManagementService.getInstalled();
+		const alreadyInstalledInRemote = await this.extensionManagementServerService.remoteExtensionManagementServer.extensionManagementService.getInstalled(ExtensionType.User);
+		const alreadyInstalledLocally = await this.extensionManagementServerService.localExtensionManagementServer.extensionManagementService.getInstalled(ExtensionType.User);
 
 		const prereleaseExtensionInfo: InstallExtensionInfo[] = [];
 		const extensionInfo: InstallExtensionInfo[] = [];
 		for (const id of settingValue) {
-			const alreadyInstalled = alreadyInstalledExtensions.some(e => areSameExtensions(e.identifier, { id }));
+			const alreadyInstalled = alreadyInstalledInRemote.some(e => areSameExtensions(e.identifier, { id }));
 			if (alreadyInstalled) {
 				this.logService.trace(`Default remote extension '${id}' is already installed`);
 				continue;
 			}
 
+			const installedLocally = alreadyInstalledLocally.some(e => areSameExtensions(e.identifier, { id }));
+			if (!installedLocally) {
+				this.logService.trace(`Default remote extension '${id}' is not already installed locally`);
+				continue;
+			}
+
 			const extension = galleryExtensions.find(e => areSameExtensions(e.identifier, { id }));
 			if (!extension) {
 				this.logService.warn(`Default remote extension '${id}' is not found`);
diff --git a/src/vs/workbench/contrib/remote/common/remote.contribution.ts b/src/vs/workbench/contrib/remote/common/remote.contribution.ts
index a278220924f4..f2bb13dad7ff 100644
--- a/src/vs/workbench/contrib/remote/common/remote.contribution.ts
+++ b/src/vs/workbench/contrib/remote/common/remote.contribution.ts
@@ -26,7 +26,7 @@ import { PersistentConnection } from '../../../../platform/remote/common/remoteA
 import { IDownloadService } from '../../../../platform/download/common/download.js';
 import { DownloadServiceChannel } from '../../../../platform/download/common/downloadIpc.js';
 import { RemoteLoggerChannelClient } from '../../../../platform/log/common/logIpc.js';
-import { REMOTE_DEFAULT_EXTENSIONS } from '../../../../platform/remote/common/remote.js';
+import { REMOTE_DEFAULT_IF_LOCAL_EXTENSIONS } from '../../../../platform/remote/common/remote.js';
 
 
 const EXTENSION_IDENTIFIER_PATTERN = '([a-z0-9A-Z][a-z0-9-A-Z]*)\\.([a-z0-9A-Z][a-z0-9-A-Z]*)$';
@@ -360,9 +360,9 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 				default: 'localhost',
 				description: localize('remote.localPortHost', "Specifies the local host name that will be used for port forwarding.")
 			},
-			[REMOTE_DEFAULT_EXTENSIONS]: {
+			[REMOTE_DEFAULT_IF_LOCAL_EXTENSIONS]: {
 				type: 'array',
-				markdownDescription: localize('remote.defaultExtensions.markdownDescription', 'List of extensions to install automatically on all remotes.'),
+				markdownDescription: localize('remote.defaultExtensionsIfInstalledLocally.markdownDescription', 'List of extensions to install automatically on all remotes if already installed locally.'),
 				default: [
 					'GitHub.copilot',
 					'GitHub.copilot-chat'
@@ -370,7 +370,7 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
 				items: {
 					type: 'string',
 					pattern: EXTENSION_IDENTIFIER_PATTERN,
-					patternErrorMessage: localize('remote.defaultExtensions.invalidFormat', 'Extension identifier must be in format "publisher.name".')
+					patternErrorMessage: localize('remote.defaultExtensionsIfInstalledLocally.invalidFormat', 'Extension identifier must be in format "publisher.name".')
 				},
 			}
 		}

From 78020d1b006fed4155de0e37fc912420e9a62bb6 Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Thu, 13 Mar 2025 15:34:05 -0700
Subject: [PATCH 0915/1815] check for applicable agent (#243491)

* check for applicable agent

* update test

---------

Co-authored-by: amunger <>
---
 .../cellDiagnostics/cellDiagnosticEditorContrib.ts   | 12 ++++++++----
 .../diagnosticCellStatusBarContrib.ts                | 10 +++++++---
 .../browser/contrib/notebookCellDiagnostics.test.ts  |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

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 00b45c45d822..2fec25ce46f9 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.ts
@@ -11,10 +11,9 @@ import { IConfigurationService } from '../../../../../../platform/configuration/
 import { CellKind, NotebookSetting } from '../../../common/notebookCommon.js';
 import { INotebookEditor, INotebookEditorContribution } from '../../notebookBrowser.js';
 import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
-import { Iterable } from '../../../../../../base/common/iterator.js';
 import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
 import { Event } from '../../../../../../base/common/event.js';
-import { IChatAgentService } from '../../../../chat/common/chatAgents.js';
+import { ChatAgentLocation, IChatAgentService } from '../../../../chat/common/chatAgents.js';
 
 export class CellDiagnostics extends Disposable implements INotebookEditorContribution {
 
@@ -43,12 +42,17 @@ export class CellDiagnostics extends Disposable implements INotebookEditorContri
 		}));
 	}
 
+	private hasNotebookAgent(): boolean {
+		const agents = this.chatAgentService.getAgents();
+		return !!agents.find(agent => agent.locations.includes(ChatAgentLocation.Notebook));
+	}
+
 	private updateEnabled() {
 		const settingEnabled = this.configurationService.getValue(NotebookSetting.cellFailureDiagnostics);
-		if (this.enabled && (!settingEnabled || Iterable.isEmpty(this.chatAgentService.getAgents()))) {
+		if (this.enabled && (!settingEnabled || !this.hasNotebookAgent())) {
 			this.enabled = false;
 			this.clearAll();
-		} else if (!this.enabled && settingEnabled && !Iterable.isEmpty(this.chatAgentService.getAgents())) {
+		} else if (!this.enabled && settingEnabled && this.hasNotebookAgent()) {
 			this.enabled = true;
 			if (!this.listening) {
 				this.listening = true;
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 0d7c0c3d00f1..b86b3cdeb68c 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/diagnosticCellStatusBarContrib.ts
@@ -15,8 +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 { Iterable } from '../../../../../../base/common/iterator.js';
+import { ChatAgentLocation, IChatAgentService } from '../../../../chat/common/chatAgents.js';
 
 export class DiagnosticCellStatusBarContrib extends Disposable implements INotebookEditorContribution {
 	static id: string = 'workbench.notebook.statusBar.diagtnostic';
@@ -49,10 +48,15 @@ class DiagnosticCellStatusBarItem extends Disposable {
 		this._register(autorun((reader) => this.updateSparkleItem(reader.readObservable(cell.executionErrorDiagnostic))));
 	}
 
+	private hasNotebookAgent(): boolean {
+		const agents = this.chatAgentService.getAgents();
+		return !!agents.find(agent => agent.locations.includes(ChatAgentLocation.Notebook));
+	}
+
 	private async updateSparkleItem(error: ICellExecutionError | undefined) {
 		let item: INotebookCellStatusBarItem | undefined;
 
-		if (error?.location && !Iterable.isEmpty(this.chatAgentService.getAgents())) {
+		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})`);
 
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 73ddc03a8d0a..1d4640062981 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
@@ -71,7 +71,7 @@ suite('notebookCellDiagnostics', () => {
 			extensionPublisherId: '',
 			name: 'testEditorAgent',
 			isDefault: true,
-			locations: [ChatAgentLocation.Editor],
+			locations: [ChatAgentLocation.Notebook],
 			metadata: {},
 			slashCommands: [],
 			disambiguation: [],

From d09fd2b5d78e10927937d2b24ee588a6c27b34eb Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Fri, 14 Mar 2025 00:00:08 +0100
Subject: [PATCH 0916/1815] render private extension (#243503)

* render private extension

* fix all repsitory signed flag
---
 .../common/extensionGalleryService.ts         |  25 +-
 .../common/extensionManagement.ts             |   3 +
 .../node/extensionManagementService.ts        |   2 +
 .../extensions/browser/extensionEditor.ts     |  97 +++-----
 .../extensions/browser/extensionsIcons.ts     |   1 +
 .../extensions/browser/extensionsList.ts      |  21 +-
 .../extensions/browser/extensionsWidgets.ts   | 228 +++++++++++++++---
 .../browser/extensionsWorkbenchService.ts     |   4 +
 .../extensions/browser/media/extension.css    |  21 +-
 .../browser/media/extensionEditor.css         |  15 +-
 .../browser/media/extensionsWidgets.css       |   4 +-
 .../contrib/extensions/common/extensions.ts   |   1 +
 .../common/extensionManagementService.ts      |   1 +
 .../common/webExtensionManagementService.ts   |   2 +
 14 files changed, 274 insertions(+), 151 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
index 17f5e9ede924..c436d227016d 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
@@ -48,8 +48,6 @@ const enum ExtensionGalleryResourceType {
 	PublisherViewUri = 'PublisherViewUriTemplate',
 	ExtensionDetailsViewUri = 'ExtensionDetailsViewUriTemplate',
 	ExtensionRatingViewUri = 'ExtensionRatingViewUriTemplate',
-	WebLanguagePackService = 'WebLanguagePackService',
-	ExtensionUriTemplate = 'ExtensionUriTemplate',
 }
 
 const enum Flag {
@@ -187,6 +185,7 @@ const PropertyType = {
 	SponsorLink: 'Microsoft.VisualStudio.Code.SponsorLink',
 	SupportLink: 'Microsoft.VisualStudio.Services.Links.Support',
 	ExecutesCode: 'Microsoft.VisualStudio.Code.ExecutesCode',
+	Private: 'PrivateMarketplace',
 };
 
 interface ICriterium {
@@ -402,6 +401,11 @@ function isPreReleaseVersion(version: IRawGalleryExtensionVersion): boolean {
 	return values.length > 0 && values[0].value === 'true';
 }
 
+function isPrivateExtension(version: IRawGalleryExtensionVersion): boolean {
+	const values = version.properties ? version.properties.filter(p => p.key === PropertyType.Private) : [];
+	return values.length > 0 && values[0].value === 'true';
+}
+
 function executesCode(version: IRawGalleryExtensionVersion): boolean | undefined {
 	const values = version.properties ? version.properties.filter(p => p.key === PropertyType.ExecutesCode) : [];
 	return values.length > 0 ? values[0].value === 'true' : undefined;
@@ -557,6 +561,7 @@ function toExtension(galleryExtension: IRawGalleryExtension, version: IRawGaller
 		},
 		hasPreReleaseVersion: isPreReleaseVersion(latestVersion),
 		hasReleaseVersion: true,
+		private: isPrivateExtension(latestVersion),
 		preview: getIsPreview(galleryExtension.flags),
 		isSigned: !!assets.signature,
 		queryContext,
@@ -646,7 +651,7 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 				sortBy,
 				filters
 			},
-			allRepositorySigned: !extensionGalleryManifest.capabilities.signing?.allRepositorySigned,
+			allRepositorySigned: !!extensionGalleryManifest.capabilities.signing?.allRepositorySigned,
 		};
 	}
 
@@ -1940,20 +1945,6 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			});
 		}
 
-		if (extensionsGallery.resourceUrlTemplate) {
-			resources.push({
-				id: extensionsGallery.resourceUrlTemplate,
-				type: ExtensionGalleryResourceType.ExtensionUriTemplate
-			});
-		}
-
-		if (extensionsGallery.nlsBaseUrl) {
-			resources.push({
-				id: extensionsGallery.nlsBaseUrl,
-				type: ExtensionGalleryResourceType.WebLanguagePackService
-			});
-		}
-
 		const filtering = [
 			{
 				name: FilterType.Tag,
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 1dd20692b3af..2a55c89dc5bc 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -229,6 +229,7 @@ export interface IGalleryExtension {
 	releaseDate: number;
 	lastUpdated: number;
 	preview: boolean;
+	private: boolean;
 	hasPreReleaseVersion: boolean;
 	hasReleaseVersion: boolean;
 	isSigned: boolean;
@@ -247,6 +248,7 @@ export type InstallSource = 'gallery' | 'vsix' | 'resource';
 export interface IGalleryMetadata {
 	id: string;
 	publisherId: string;
+	private: boolean;
 	publisherDisplayName: string;
 	isPreReleaseVersion: boolean;
 	targetPlatform?: TargetPlatform;
@@ -274,6 +276,7 @@ export interface ILocalExtension extends IExtension {
 	installedTimestamp?: number;
 	isPreReleaseVersion: boolean;
 	hasPreReleaseVersion: boolean;
+	private: boolean;
 	preRelease: boolean;
 	updated: boolean;
 	pinned: boolean;
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 28b058ee7826..1ed45d18af9e 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -869,6 +869,7 @@ export class ExtensionsScanner extends Disposable {
 			installedTimestamp: extension.metadata?.installedTimestamp,
 			updated: !!extension.metadata?.updated,
 			pinned: !!extension.metadata?.pinned,
+			private: !!extension.metadata?.private,
 			isWorkspaceScoped: false,
 			source: extension.metadata?.source ?? (extension.identifier.uuid ? 'gallery' : 'vsix'),
 			size: extension.metadata?.size ?? 0,
@@ -1041,6 +1042,7 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 			metadata.publisherDisplayName = this.source.publisherDisplayName;
 			metadata.targetPlatform = this.source.properties.targetPlatform;
 			metadata.updated = !!existingExtension;
+			metadata.private = this.source.private;
 			metadata.isPreReleaseVersion = this.source.properties.isPreReleaseVersion;
 			metadata.hasPreReleaseVersion = existingExtension?.hasPreReleaseVersion || this.source.properties.isPreReleaseVersion;
 			metadata.preRelease = isBoolean(this.options.preRelease)
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
index 300936902dc3..ee1dd4d9db41 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -42,7 +42,6 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet
 import { defaultCheckboxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { buttonForeground, buttonHoverBackground, editorBackground, textLinkActiveForeground, textLinkForeground } from '../../../../platform/theme/common/colorRegistry.js';
 import { IColorTheme, ICssStyleCollector, IThemeService, registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
-import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
 import { IEditorOpenContext } from '../../../common/editor.js';
 import { ExtensionFeaturesTab } from './extensionFeaturesTab.js';
@@ -73,18 +72,15 @@ import {
 } from './extensionsActions.js';
 import { Delegate } from './extensionsList.js';
 import { ExtensionData, ExtensionsGridView, ExtensionsTree, getExtensions } from './extensionsViewer.js';
-import { ExtensionRecommendationWidget, ExtensionStatusWidget, ExtensionWidget, InstallCountWidget, RatingsWidget, RemoteBadgeWidget, SponsorWidget, VerifiedPublisherWidget, onClick } from './extensionsWidgets.js';
+import { ExtensionRecommendationWidget, ExtensionStatusWidget, ExtensionWidget, InstallCountWidget, RatingsWidget, RemoteBadgeWidget, SponsorWidget, PublisherWidget, onClick, ExtensionKindIndicatorWidget } from './extensionsWidgets.js';
 import { ExtensionContainers, ExtensionEditorTab, ExtensionState, IExtension, IExtensionContainer, IExtensionsWorkbenchService } from '../common/extensions.js';
 import { ExtensionsInput, IExtensionEditorOptions } from '../common/extensionsInput.js';
-import { IExplorerService } from '../../files/browser/files.js';
 import { DEFAULT_MARKDOWN_STYLES, renderMarkdownDocument } from '../../markdown/browser/markdownDocumentRenderer.js';
 import { IWebview, IWebviewService, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from '../../webview/browser/webview.js';
 import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IExtensionRecommendationsService } from '../../../services/extensionRecommendations/common/extensionRecommendations.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { IViewsService } from '../../../services/views/common/viewsService.js';
-import { VIEW_ID as EXPLORER_VIEW_ID } from '../../files/common/files.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { ByteSize, IFileService } from '../../../../platform/files/common/files.js';
@@ -161,11 +157,6 @@ interface IExtensionEditorTemplate {
 	name: HTMLElement;
 	preview: HTMLElement;
 	builtin: HTMLElement;
-	publisher: HTMLElement;
-	publisherDisplayName: HTMLElement;
-	resource: HTMLElement;
-	installCount: HTMLElement;
-	rating: HTMLElement;
 	description: HTMLElement;
 	actionsAndStatusContainer: HTMLElement;
 	extensionActionBar: ActionBar;
@@ -257,10 +248,6 @@ export class ExtensionEditor extends EditorPane {
 		@ILanguageService private readonly languageService: ILanguageService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
-		@IExplorerService private readonly explorerService: IExplorerService,
-		@IViewsService private readonly viewsService: IViewsService,
-		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@IHoverService private readonly hoverService: IHoverService,
 	) {
 		super(ExtensionEditor.ID, group, telemetryService, themeService, storageService);
@@ -302,29 +289,33 @@ export class ExtensionEditor extends EditorPane {
 		builtin.textContent = localize('builtin', "Built-in");
 
 		const subtitle = append(details, $('.subtitle'));
-		const publisher = append(append(subtitle, $('.subtitle-entry')), $('.publisher.clickable', { tabIndex: 0 }));
-		publisher.setAttribute('role', 'button');
-		const publisherDisplayName = append(publisher, $('.publisher-name'));
-		const verifiedPublisherWidget = this.instantiationService.createInstance(VerifiedPublisherWidget, append(publisher, $('.verified-publisher')), false);
+		const subTitleEntryContainers: HTMLElement[] = [];
+
+		const publisherContainer = append(subtitle, $('.subtitle-entry'));
+		subTitleEntryContainers.push(publisherContainer);
+		const publisherWidget = this.instantiationService.createInstance(PublisherWidget, publisherContainer, false);
 
-		const resource = append(append(subtitle, $('.subtitle-entry.resource')), $('', { tabIndex: 0 }));
-		resource.setAttribute('role', 'button');
+		const extensionKindContainer = append(subtitle, $('.subtitle-entry'));
+		subTitleEntryContainers.push(extensionKindContainer);
+		const extensionKindWidget = this.instantiationService.createInstance(ExtensionKindIndicatorWidget, extensionKindContainer, false);
 
-		const installCount = append(append(subtitle, $('.subtitle-entry')), $('span.install', { tabIndex: 0 }));
-		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), installCount, localize('install count', "Install count")));
-		const installCountWidget = this.instantiationService.createInstance(InstallCountWidget, installCount, false);
+		const installCountContainer = append(subtitle, $('.subtitle-entry'));
+		subTitleEntryContainers.push(installCountContainer);
+		const installCountWidget = this.instantiationService.createInstance(InstallCountWidget, installCountContainer, false);
 
-		const rating = append(append(subtitle, $('.subtitle-entry')), $('span.rating.clickable', { tabIndex: 0 }));
-		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), rating, localize('rating', "Rating")));
-		rating.setAttribute('role', 'link'); // #132645
-		const ratingsWidget = this.instantiationService.createInstance(RatingsWidget, rating, false);
+		const ratingsContainer = append(subtitle, $('.subtitle-entry'));
+		subTitleEntryContainers.push(ratingsContainer);
+		const ratingsWidget = this.instantiationService.createInstance(RatingsWidget, ratingsContainer, false);
 
-		const sponsorWidget = this.instantiationService.createInstance(SponsorWidget, append(subtitle, $('.subtitle-entry')));
+		const sponsorContainer = append(subtitle, $('.subtitle-entry'));
+		subTitleEntryContainers.push(sponsorContainer);
+		const sponsorWidget = this.instantiationService.createInstance(SponsorWidget, sponsorContainer);
 
 		const widgets: ExtensionWidget[] = [
 			remoteBadge,
 			versionWidget,
-			verifiedPublisherWidget,
+			publisherWidget,
+			extensionKindWidget,
 			installCountWidget,
 			ratingsWidget,
 			sponsorWidget,
@@ -440,18 +431,23 @@ export class ExtensionEditor extends EditorPane {
 			header,
 			icon,
 			iconContainer,
-			installCount,
 			name,
 			navbar,
 			preview,
-			publisher,
-			publisherDisplayName,
-			resource,
-			rating,
 			actionsAndStatusContainer,
 			extensionActionBar,
 			set extension(extension: IExtension) {
 				extensionContainers.extension = extension;
+				let lastNonEmptySubtitleEntryContainer;
+				for (const subTitleEntryElement of subTitleEntryContainers) {
+					subTitleEntryElement.classList.remove('last-non-empty');
+					if (subTitleEntryElement.children.length > 0) {
+						lastNonEmptySubtitleEntryContainer = subTitleEntryElement;
+					}
+				}
+				if (lastNonEmptySubtitleEntryContainer) {
+					lastNonEmptySubtitleEntryContainer.classList.add('last-non-empty');
+				}
 			},
 			set gallery(gallery: IGalleryExtension | null) {
 				versionWidget.gallery = gallery;
@@ -559,41 +555,8 @@ export class ExtensionEditor extends EditorPane {
 
 		template.description.textContent = extension.description;
 
-		// subtitle
-		template.publisher.classList.toggle('clickable', !!extension.url);
-		template.publisherDisplayName.textContent = extension.publisherDisplayName;
-		template.publisher.parentElement?.classList.toggle('hide', !!extension.resourceExtension || extension.local?.source === 'resource');
-		this.transientDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), template.publisher, localize('publisher', "Publisher ({0})", extension.publisher)));
-
-		const location = extension.resourceExtension?.location ?? (extension.local?.source === 'resource' ? extension.local?.location : undefined);
-		template.resource.parentElement?.classList.toggle('hide', !location);
-		if (location) {
-			const workspaceFolder = this.contextService.getWorkspaceFolder(location);
-			if (workspaceFolder && extension.isWorkspaceScoped) {
-				template.resource.parentElement?.classList.add('clickable');
-				this.transientDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), template.resource, this.uriIdentityService.extUri.relativePath(workspaceFolder.uri, location)));
-				template.resource.textContent = localize('workspace extension', "Workspace Extension");
-				this.transientDisposables.add(onClick(template.resource, () => {
-					this.viewsService.openView(EXPLORER_VIEW_ID, true).then(() => this.explorerService.select(location, true));
-				}));
-			} else {
-				template.resource.parentElement?.classList.remove('clickable');
-				this.transientDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), template.resource, location.path));
-				template.resource.textContent = localize('local extension', "Local Extension");
-			}
-		}
-
-		template.installCount.parentElement?.classList.toggle('hide', !extension.url);
-		template.rating.parentElement?.classList.toggle('hide', !extension.url);
-		template.rating.classList.toggle('clickable', !!extension.url);
-
 		if (extension.url) {
 			this.transientDisposables.add(onClick(template.name, () => this.openerService.open(URI.parse(extension.url!))));
-			this.transientDisposables.add(onClick(template.publisher, () => this.extensionsWorkbenchService.openSearch(`publisher:"${extension.publisherDisplayName}"`)));
-		}
-
-		if (extension.ratingUrl) {
-			this.transientDisposables.add(onClick(template.rating, () => this.openerService.open(URI.parse(extension.ratingUrl!))));
 		}
 
 		const manifest = await this.extensionManifest.get().promise;
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsIcons.ts b/src/vs/workbench/contrib/extensions/browser/extensionsIcons.ts
index f7871ef4e2b7..ea1bc04ede84 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsIcons.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsIcons.ts
@@ -23,6 +23,7 @@ export const syncEnabledIcon = registerIcon('extensions-sync-enabled', Codicon.s
 export const syncIgnoredIcon = registerIcon('extensions-sync-ignored', Codicon.syncIgnored, localize('syncIgnoredIcon', 'Icon to indicate that an extension is ignored when syncing.'));
 export const remoteIcon = registerIcon('extensions-remote', Codicon.remote, localize('remoteIcon', 'Icon to indicate that an extension is remote in the extensions view and editor.'));
 export const installCountIcon = registerIcon('extensions-install-count', Codicon.cloudDownload, localize('installCountIcon', 'Icon shown along with the install count in the extensions view and editor.'));
+export const privateExtensionIcon = registerIcon('extensions-private', Codicon.lock, localize('lockIcon', 'Icon shown for private extensions in the extensions view and editor.'));
 export const ratingIcon = registerIcon('extensions-rating', Codicon.star, localize('ratingIcon', 'Icon shown along with the rating in the extensions view and editor.'));
 export const preReleaseIcon = registerIcon('extensions-pre-release', Codicon.versions, localize('preReleaseIcon', 'Icon shown for extensions having pre-release versions in extensions view and editor.'));
 export const sponsorIcon = registerIcon('extensions-sponsor', Codicon.heartFilled, localize('sponsorIcon', 'Icon used for sponsoring extensions in the extensions view and editor.'));
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsList.ts b/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
index 8e2e5ab9691c..97be5462cf64 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsList.ts
@@ -11,11 +11,10 @@ import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
 import { IPagedRenderer } from '../../../../base/browser/ui/list/listPaging.js';
-import { Event } from '../../../../base/common/event.js';
 import { IExtension, ExtensionContainers, ExtensionState, IExtensionsWorkbenchService, IExtensionsViewState } from '../common/extensions.js';
 import { ManageExtensionAction, ExtensionRuntimeStateAction, ExtensionStatusLabelAction, RemoteInstallAction, ExtensionStatusAction, LocalInstallAction, ButtonWithDropDownExtensionAction, InstallDropdownAction, InstallingLabelAction, ButtonWithDropdownExtensionActionViewItem, DropDownExtensionAction, WebInstallAction, MigrateDeprecatedExtensionAction, SetLanguageAction, ClearLanguageAction, UpdateAction } from './extensionsActions.js';
 import { areSameExtensions } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
-import { RatingsWidget, InstallCountWidget, RecommendationWidget, RemoteBadgeWidget, ExtensionPackCountWidget as ExtensionPackBadgeWidget, SyncIgnoredWidget, ExtensionHoverWidget, ExtensionRuntimeStatusWidget, PreReleaseBookmarkWidget, VerifiedPublisherWidget } from './extensionsWidgets.js';
+import { RatingsWidget, InstallCountWidget, RecommendationWidget, RemoteBadgeWidget, ExtensionPackCountWidget as ExtensionPackBadgeWidget, SyncIgnoredWidget, ExtensionHoverWidget, ExtensionRuntimeStatusWidget, PreReleaseBookmarkWidget, PublisherWidget, ExtensionKindIndicatorWidget } from './extensionsWidgets.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
@@ -34,7 +33,6 @@ export interface ITemplateData {
 	element: HTMLElement;
 	icon: HTMLImageElement;
 	name: HTMLElement;
-	publisherDisplayName: HTMLElement;
 	description: HTMLElement;
 	installCount: HTMLElement;
 	ratings: HTMLElement;
@@ -85,13 +83,12 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 		const installCount = append(header, $('span.install-count'));
 		const ratings = append(header, $('span.ratings'));
 		const syncIgnore = append(header, $('span.sync-ignored'));
+		const extensionKindIndicator = append(header, $('span'));
 		const activationStatus = append(header, $('span.activation-status'));
 		const headerRemoteBadgeWidget = this.instantiationService.createInstance(RemoteBadgeWidget, header, false);
 		const description = append(details, $('.description.ellipsis'));
 		const footer = append(details, $('.footer'));
-		const publisher = append(footer, $('.author.ellipsis'));
-		const verifiedPublisherWidget = this.instantiationService.createInstance(VerifiedPublisherWidget, append(publisher, $(`.verified-publisher`)), true);
-		const publisherDisplayName = append(publisher, $('.publisher-name.ellipsis'));
+		const publisherWidget = this.instantiationService.createInstance(PublisherWidget, append(footer, $('.publisher-container')), true);
 		const actionbar = new ActionBar(footer, {
 			actionViewItemProvider: (action: IAction, options: IActionViewItemOptions) => {
 				if (action instanceof ButtonWithDropDownExtensionAction) {
@@ -140,12 +137,13 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 			iconRemoteBadgeWidget,
 			extensionPackBadgeWidget,
 			headerRemoteBadgeWidget,
-			verifiedPublisherWidget,
+			publisherWidget,
 			extensionHoverWidget,
 			this.instantiationService.createInstance(SyncIgnoredWidget, syncIgnore),
 			this.instantiationService.createInstance(ExtensionRuntimeStatusWidget, this.extensionViewState, activationStatus),
 			this.instantiationService.createInstance(InstallCountWidget, installCount, true),
 			this.instantiationService.createInstance(RatingsWidget, ratings, true),
+			this.instantiationService.createInstance(ExtensionKindIndicatorWidget, extensionKindIndicator, true),
 		];
 		const extensionContainers: ExtensionContainers = this.instantiationService.createInstance(ExtensionContainers, [...actions, ...widgets]);
 
@@ -153,7 +151,7 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 		const disposable = combinedDisposable(...actions, ...widgets, actionbar, actionBarListener, extensionContainers);
 
 		return {
-			root, element, icon, name, installCount, ratings, description, publisherDisplayName, disposables: [disposable], actionbar,
+			root, element, icon, name, installCount, ratings, description, disposables: [disposable], actionbar,
 			extensionDisposables: [],
 			set extension(extension: IExtension) {
 				extensionContainers.extension = extension;
@@ -170,7 +168,6 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 		data.icon.src = '';
 		data.name.textContent = '';
 		data.description.textContent = '';
-		data.publisherDisplayName.textContent = '';
 		data.installCount.style.display = 'none';
 		data.ratings.style.display = 'none';
 		data.extension = null;
@@ -209,12 +206,6 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
 		data.name.textContent = extension.displayName;
 		data.description.textContent = extension.description;
 
-		const updatePublisher = () => {
-			data.publisherDisplayName.textContent = !extension.resourceExtension && extension.local?.source !== 'resource' ? extension.publisherDisplayName : '';
-		};
-		updatePublisher();
-		Event.filter(this.extensionsWorkbenchService.onChange, e => !!e && areSameExtensions(e.identifier, extension.identifier))(() => updatePublisher(), this, data.extensionDisposables);
-
 		data.installCount.style.display = '';
 		data.ratings.style.display = '';
 		data.extension = extension;
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
index 6fc27676d0e5..20325ef00d3f 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.ts
@@ -22,7 +22,7 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { CountBadge } from '../../../../base/browser/ui/countBadge/countBadge.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IUserDataSyncEnablementService } from '../../../../platform/userDataSync/common/userDataSync.js';
-import { activationTimeIcon, errorIcon, infoIcon, installCountIcon, preReleaseIcon, ratingIcon, remoteIcon, sponsorIcon, starEmptyIcon, starFullIcon, starHalfIcon, syncIgnoredIcon, warningIcon } from './extensionsIcons.js';
+import { activationTimeIcon, errorIcon, infoIcon, installCountIcon, preReleaseIcon, privateExtensionIcon, ratingIcon, remoteIcon, sponsorIcon, starEmptyIcon, starFullIcon, starHalfIcon, syncIgnoredIcon, warningIcon } from './extensionsIcons.js';
 import { registerColor, textLinkForeground } from '../../../../platform/theme/common/colorRegistry.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
@@ -46,6 +46,10 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Extensions, IExtensionFeaturesManagementService, IExtensionFeaturesRegistry } from '../../../services/extensionManagement/common/extensionFeatures.js';
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 import { extensionVerifiedPublisherIconColor, verifiedPublisherIcon } from '../../../services/extensionManagement/common/extensionsIcons.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { IExplorerService } from '../../files/browser/files.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { VIEW_ID as EXPLORER_VIEW_ID } from '../../files/common/files.js';
 
 export abstract class ExtensionWidget extends Disposable implements IExtensionContainer {
 	private _extension: IExtension | null = null;
@@ -71,17 +75,26 @@ export function onClick(element: HTMLElement, callback: () => void): IDisposable
 
 export class InstallCountWidget extends ExtensionWidget {
 
+	private readonly disposables = this._register(new DisposableStore());
+
 	constructor(
-		private container: HTMLElement,
+		readonly container: HTMLElement,
 		private small: boolean,
+		@IHoverService private readonly hoverService: IHoverService,
 	) {
 		super();
-		container.classList.add('extension-install-count');
 		this.render();
+
+		this._register(toDisposable(() => this.clear()));
 	}
 
-	render(): void {
+	private clear(): void {
 		this.container.innerText = '';
+		this.disposables.clear();
+	}
+
+	render(): void {
+		this.clear();
 
 		if (!this.extension) {
 			return;
@@ -96,9 +109,18 @@ export class InstallCountWidget extends ExtensionWidget {
 			return;
 		}
 
-		append(this.container, $('span' + ThemeIcon.asCSSSelector(installCountIcon)));
-		const count = append(this.container, $('span.count'));
+		if (!this.small && !this.extension.url) {
+			return;
+		}
+
+		const parent = this.small ? this.container : append(this.container, $('span.install', { tabIndex: 0 }));
+		append(parent, $('span' + ThemeIcon.asCSSSelector(installCountIcon)));
+		const count = append(parent, $('span.count'));
 		count.textContent = installLabel;
+
+		if (!this.small) {
+			this.disposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this.container, localize('install count', "Install count")));
+		}
 	}
 
 	static getInstallLabel(extension: IExtension, small: boolean): string | undefined {
@@ -129,12 +151,14 @@ export class InstallCountWidget extends ExtensionWidget {
 
 export class RatingsWidget extends ExtensionWidget {
 
-	private readonly containerHover: IManagedHover;
+	private containerHover: IManagedHover | undefined;
+	private readonly disposables = this._register(new DisposableStore());
 
 	constructor(
-		private container: HTMLElement,
+		readonly container: HTMLElement,
 		private small: boolean,
-		@IHoverService hoverService: IHoverService
+		@IHoverService private readonly hoverService: IHoverService,
+		@IOpenerService private readonly openerService: IOpenerService,
 	) {
 		super();
 		container.classList.add('extension-ratings');
@@ -143,13 +167,17 @@ export class RatingsWidget extends ExtensionWidget {
 			container.classList.add('small');
 		}
 
-		this.containerHover = this._register(hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), container, ''));
-
 		this.render();
+		this._register(toDisposable(() => this.clear()));
 	}
 
-	render(): void {
+	private clear(): void {
 		this.container.innerText = '';
+		this.disposables.clear();
+	}
+
+	render(): void {
+		this.clear();
 
 		if (!this.extension) {
 			return;
@@ -167,51 +195,71 @@ export class RatingsWidget extends ExtensionWidget {
 			return;
 		}
 
+		if (!this.extension.url) {
+			return;
+		}
+
 		const rating = Math.round(this.extension.rating * 2) / 2;
-		this.containerHover.update(localize('ratedLabel', "Average rating: {0} out of 5", rating));
 		if (this.small) {
 			append(this.container, $('span' + ThemeIcon.asCSSSelector(starFullIcon)));
 
 			const count = append(this.container, $('span.count'));
 			count.textContent = String(rating);
 		} else {
+			const element = append(this.container, $('span.rating.clickable', { tabIndex: 0 }));
 			for (let i = 1; i <= 5; i++) {
 				if (rating >= i) {
-					append(this.container, $('span' + ThemeIcon.asCSSSelector(starFullIcon)));
+					append(element, $('span' + ThemeIcon.asCSSSelector(starFullIcon)));
 				} else if (rating >= i - 0.5) {
-					append(this.container, $('span' + ThemeIcon.asCSSSelector(starHalfIcon)));
+					append(element, $('span' + ThemeIcon.asCSSSelector(starHalfIcon)));
 				} else {
-					append(this.container, $('span' + ThemeIcon.asCSSSelector(starEmptyIcon)));
+					append(element, $('span' + ThemeIcon.asCSSSelector(starEmptyIcon)));
 				}
 			}
 			if (this.extension.ratingCount) {
-				const ratingCountElemet = append(this.container, $('span', undefined, ` (${this.extension.ratingCount})`));
+				const ratingCountElemet = append(element, $('span', undefined, ` (${this.extension.ratingCount})`));
 				ratingCountElemet.style.paddingLeft = '1px';
 			}
+
+			this.containerHover = this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), element, ''));
+			this.containerHover.update(localize('ratedLabel', "Average rating: {0} out of 5", rating));
+			element.setAttribute('role', 'link');
+			if (this.extension.ratingUrl) {
+				this.disposables.add(onClick(element, () => this.openerService.open(URI.parse(this.extension!.ratingUrl!))));
+			}
 		}
 	}
+
 }
 
-export class VerifiedPublisherWidget extends ExtensionWidget {
+export class PublisherWidget extends ExtensionWidget {
+
+	private element: HTMLElement | undefined;
+	private containerHover: IManagedHover | undefined;
 
 	private readonly disposables = this._register(new DisposableStore());
-	private readonly containerHover: IManagedHover;
 
 	constructor(
-		private container: HTMLElement,
+		readonly container: HTMLElement,
 		private small: boolean,
-		@IHoverService hoverService: IHoverService,
+		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IHoverService private readonly hoverService: IHoverService,
 		@IOpenerService private readonly openerService: IOpenerService,
 	) {
 		super();
-		this.containerHover = this._register(hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), container, ''));
+
 		this.render();
+		this._register(toDisposable(() => this.clear()));
 	}
 
-	render(): void {
-		reset(this.container);
+	private clear(): void {
+		this.element?.remove();
 		this.disposables.clear();
-		if (!this.extension?.publisherDomain?.verified) {
+	}
+
+	render(): void {
+		this.clear();
+		if (!this.extension) {
 			return;
 		}
 
@@ -223,20 +271,45 @@ export class VerifiedPublisherWidget extends ExtensionWidget {
 			return;
 		}
 
-		const publisherDomainLink = URI.parse(this.extension.publisherDomain.link);
-		const verifiedPublisher = append(this.container, $('span.extension-verified-publisher.clickable'));
-		append(verifiedPublisher, renderIcon(verifiedPublisherIcon));
+		this.element = append(this.container, $('.publisher'));
+		const publisherDisplayName = $('.publisher-name.ellipsis');
+		publisherDisplayName.textContent = this.extension.publisherDisplayName;
 
-		if (!this.small) {
-			verifiedPublisher.tabIndex = 0;
-			this.containerHover.update(`Verified Domain: ${this.extension.publisherDomain.link}`);
-			verifiedPublisher.setAttribute('role', 'link');
+		const verifiedPublisher = $('.verified-publisher');
+		append(verifiedPublisher, $('span.extension-verified-publisher.clickable'), renderIcon(verifiedPublisherIcon));
+
+		if (this.small) {
+			if (this.extension.publisherDomain) {
+				append(this.element, verifiedPublisher);
+			}
+			append(this.element, publisherDisplayName);
+		} else {
+			this.element.classList.toggle('clickable', !!this.extension.url);
+			this.element.setAttribute('role', 'button');
+			this.element.tabIndex = 0;
+
+			this.containerHover = this.disposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this.element, localize('publisher', "Publisher ({0})", this.extension.publisherDisplayName)));
+			append(this.element, publisherDisplayName);
+
+			if (this.extension.publisherDomain) {
+				append(this.element, verifiedPublisher);
+				const publisherDomainLink = URI.parse(this.extension.publisherDomain.link);
+				verifiedPublisher.tabIndex = 0;
+				verifiedPublisher.setAttribute('role', 'button');
+				this.containerHover.update(localize('verified publisher', "This publisher has verified ownership of {0}", this.extension.publisherDomain.link));
+				verifiedPublisher.setAttribute('role', 'link');
+
+				append(verifiedPublisher, $('span.extension-verified-publisher-domain', undefined, publisherDomainLink.authority.startsWith('www.') ? publisherDomainLink.authority.substring(4) : publisherDomainLink.authority));
+				this.disposables.add(onClick(verifiedPublisher, () => this.openerService.open(publisherDomainLink)));
+			}
 
-			append(verifiedPublisher, $('span.extension-verified-publisher-domain', undefined, publisherDomainLink.authority.startsWith('www.') ? publisherDomainLink.authority.substring(4) : publisherDomainLink.authority));
-			this.disposables.add(onClick(verifiedPublisher, () => this.openerService.open(publisherDomainLink)));
+			if (this.extension.url) {
+				this.disposables.add(onClick(this.element, () => this.extensionsWorkbenchService.openSearch(`publisher:"${this.extension?.publisherDisplayName}"`)));
+			}
 		}
 
 	}
+
 }
 
 export class SponsorWidget extends ExtensionWidget {
@@ -244,7 +317,7 @@ export class SponsorWidget extends ExtensionWidget {
 	private readonly disposables = this._register(new DisposableStore());
 
 	constructor(
-		private container: HTMLElement,
+		readonly container: HTMLElement,
 		@IHoverService private readonly hoverService: IHoverService,
 		@IOpenerService private readonly openerService: IOpenerService,
 	) {
@@ -445,6 +518,73 @@ export class ExtensionPackCountWidget extends ExtensionWidget {
 	}
 }
 
+export class ExtensionKindIndicatorWidget extends ExtensionWidget {
+
+	private element: HTMLElement | undefined;
+
+	private readonly disposables = this._register(new DisposableStore());
+
+	constructor(
+		readonly container: HTMLElement,
+		private small: boolean,
+		@IHoverService private readonly hoverService: IHoverService,
+		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+		@IExplorerService private readonly explorerService: IExplorerService,
+		@IViewsService private readonly viewsService: IViewsService,
+	) {
+		super();
+		this.render();
+		this._register(toDisposable(() => this.clear()));
+	}
+
+	private clear(): void {
+		this.element?.remove();
+		this.disposables.clear();
+	}
+
+	render(): void {
+		this.clear();
+
+		if (this.small) {
+			return;
+		}
+
+		if (!this.extension) {
+			return;
+		}
+
+		if (this.extension?.private) {
+			this.element = append(this.container, $('.extension-kind-indicator'));
+			append(this.element, $('span' + ThemeIcon.asCSSSelector(privateExtensionIcon)));
+			if (!this.small) {
+				append(this.element, $('span.private-extension-label', undefined, localize('privateExtension', "Private Extension")));
+			}
+			return;
+		}
+
+		const location = this.extension.resourceExtension?.location ?? (this.extension.local?.source === 'resource' ? this.extension.local?.location : undefined);
+		if (!location) {
+			return;
+		}
+
+		this.element = append(this.container, $('.extension-kind-indicator'));
+		const workspaceFolder = this.contextService.getWorkspaceFolder(location);
+		if (workspaceFolder && this.extension.isWorkspaceScoped) {
+			this.element.textContent = localize('workspace extension', "Workspace Extension");
+			this.element.classList.add('clickable');
+			this.element.setAttribute('role', 'button');
+			this.disposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this.element, this.uriIdentityService.extUri.relativePath(workspaceFolder.uri, location)));
+			this.disposables.add(onClick(this.element, () => {
+				this.viewsService.openView(EXPLORER_VIEW_ID, true).then(() => this.explorerService.select(location, true));
+			}));
+		} else {
+			this.disposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this.element, location.path));
+			this.element.textContent = localize('local extension', "Local Extension");
+		}
+	}
+}
+
 export class SyncIgnoredWidget extends ExtensionWidget {
 
 	private readonly disposables = this._register(new DisposableStore());
@@ -595,8 +735,12 @@ export class ExtensionHoverWidget extends ExtensionWidget {
 		}
 		markdown.appendText(`\n`);
 
+		let addSeparator = false;
+		if (this.extension.private) {
+			markdown.appendMarkdown(`$(${privateExtensionIcon.id}) ${localize('privateExtension', "Private Extension")}`);
+			addSeparator = true;
+		}
 		if (this.extension.state === ExtensionState.Installed) {
-			let addSeparator = false;
 			const installLabel = InstallCountWidget.getInstallLabel(this.extension, true);
 			if (installLabel) {
 				if (addSeparator) {
@@ -620,9 +764,9 @@ export class ExtensionHoverWidget extends ExtensionWidget {
 				markdown.appendMarkdown(`$(${sponsorIcon.id}) [${localize('sponsor', "Sponsor")}](${this.extension.publisherSponsorLink})`);
 				addSeparator = true;
 			}
-			if (addSeparator) {
-				markdown.appendText(`\n`);
-			}
+		}
+		if (addSeparator) {
+			markdown.appendText(`\n`);
 		}
 
 		const location = this.extension.resourceExtension?.location ?? (this.extension.local?.source === 'resource' ? this.extension.local?.location : undefined);
@@ -862,6 +1006,7 @@ export class ExtensionRecommendationWidget extends ExtensionWidget {
 export const extensionRatingIconColor = registerColor('extensionIcon.starForeground', { light: '#DF6100', dark: '#FF8E00', hcDark: '#FF8E00', hcLight: textLinkForeground }, localize('extensionIconStarForeground', "The icon color for extension ratings."), false);
 export const extensionPreReleaseIconColor = registerColor('extensionIcon.preReleaseForeground', { dark: '#1d9271', light: '#1d9271', hcDark: '#1d9271', hcLight: textLinkForeground }, localize('extensionPreReleaseForeground', "The icon color for pre-release extension."), false);
 export const extensionSponsorIconColor = registerColor('extensionIcon.sponsorForeground', { light: '#B51E78', dark: '#D758B3', hcDark: null, hcLight: '#B51E78' }, localize('extensionIcon.sponsorForeground', "The icon color for extension sponsor."), false);
+export const extensionPrivateBadgeBackground = registerColor('extensionIcon.privateForeground', { dark: '#ffffff60', light: '#00000060', hcDark: '#ffffff60', hcLight: '#00000060' }, localize('extensionIcon.private', "The icon color for private extensions."));
 
 registerThemingParticipant((theme, collector) => {
 	const extensionRatingIcon = theme.getColor(extensionRatingIconColor);
@@ -877,4 +1022,9 @@ registerThemingParticipant((theme, collector) => {
 
 	collector.addRule(`.monaco-hover.extension-hover .markdown-hover .hover-contents ${ThemeIcon.asCSSSelector(sponsorIcon)} { color: var(--vscode-extensionIcon-sponsorForeground); }`);
 	collector.addRule(`.extension-editor > .header > .details > .subtitle .sponsor ${ThemeIcon.asCSSSelector(sponsorIcon)} { color: var(--vscode-extensionIcon-sponsorForeground); }`);
+
+	const privateBadgeBackground = theme.getColor(extensionPrivateBadgeBackground);
+	if (privateBadgeBackground) {
+		collector.addRule(`.extension-private-badge { color: ${privateBadgeBackground}; }`);
+	}
 });
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index b5a1450cca2c..90b805560e1b 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -211,6 +211,10 @@ export class Extension implements IExtension {
 		return this.local ? this.local.manifest.version : this.latestVersion;
 	}
 
+	get private(): boolean {
+		return this.local ? this.local.private : this.gallery ? this.gallery.private : false;
+	}
+
 	get pinned(): boolean {
 		return !!this.local?.pinned;
 	}
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extension.css b/src/vs/workbench/contrib/extensions/browser/media/extension.css
index 30bbba041adb..df7aaffb5e90 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extension.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extension.css
@@ -92,11 +92,17 @@
 
 .extension-list-item > .details > .header-container > .header > .activation-status,
 .extension-list-item > .details > .header-container > .header > .install-count,
+.extension-list-item > .details > .header-container > .header .extension-kind-indicator,
 .extension-list-item > .details > .header-container > .header > .ratings {
 	display: flex;
 	align-items: center;
 }
 
+.extension-list-item > .details > .header-container > .header .extension-kind-indicator {
+	font-size: 80%;
+	margin-left: 2px;
+}
+
 .extension-list-item > .details > .header-container > .header > .install-count:not(:empty) {
 	font-size: 80%;
 	margin: 0 6px;
@@ -179,24 +185,27 @@
 	align-items: center;
 }
 
-.extension-list-item > .details > .footer > .author {
+.extension-list-item > .details > .footer > .publisher-container {
 	flex: 1;
+	line-height: 24px;
+}
+
+.extension-list-item > .details > .footer .publisher {
 	display: flex;
 	align-items: center;
-	line-height: 24px;
 }
 
-.extension-list-item > .details > .footer > .author > .publisher-name {
+.extension-list-item > .details > .footer .publisher > .publisher-name {
 	font-size: 90%;
 	color: var(--vscode-descriptionForeground);
 	font-weight: 600;
 }
 
-.monaco-list-row.selected .extension-list-item > .details > .footer > .author > .publisher-name{
+.monaco-list-row.selected .extension-list-item > .details > .footer .publisher > .publisher-name{
 	color: unset;
 }
 
-.extension-list-item > .details > .footer > .author > .publisher-name:not(:first-child) {
+.extension-list-item > .details > .footer .publisher > .publisher-name:not(:first-child) {
 	padding-left: 1px;
 }
 
@@ -227,7 +236,7 @@
 	min-width: 0;
 }
 
-.monaco-list-row.disabled:not(.selected) .extension-list-item > .details > .footer > .author > .publisher-name {
+.monaco-list-row.disabled:not(.selected) .extension-list-item > .details > .footer .publisher > .publisher-name {
 	color: var(--vscode-disabledForeground);
 }
 
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
index 03023ddf5fef..62be7a0b84a1 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
@@ -148,6 +148,7 @@
 }
 
 .extension-editor > .header > .details > .subtitle,
+.extension-editor > .header > .details > .subtitle .extension-kind-indicator,
 .extension-editor > .header > .details > .subtitle .install,
 .extension-editor > .header > .details > .subtitle .rating,
 .extension-editor > .header > .details > .subtitle .sponsor {
@@ -163,10 +164,14 @@
 	margin-left: 6px;
 }
 
-.extension-editor > .header > .details > .subtitle > div:not(:first-child):not(:empty):not(.resource) {
-	border-left: 1px solid rgba(128, 128, 128, 0.7);
-	margin-left: 14px;
-	padding-left: 14px;
+.extension-editor > .header > .details > .subtitle .extension-kind-indicator > .codicon {
+	margin-right: 6px;
+}
+
+.extension-editor > .header > .details > .subtitle > .subtitle-entry:not(:empty):not(.last-non-empty) {
+	border-right: 1px solid rgba(128, 128, 128, 0.7);
+	margin-right: 14px;
+	padding-right: 14px;
 }
 
 .extension-editor > .header > .details > .description {
@@ -734,7 +739,7 @@
 	padding-top: 5px;
 }
 
-.extension-editor .subcontent .monaco-list-row .extension > .details > .footer > .author {
+.extension-editor .subcontent .monaco-list-row .extension > .details > .footer .publisher {
 	font-size: 90%;
 	font-weight: 600;
 	opacity: 0.6;
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css b/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css
index 6a7ab84a23a0..c5d81e6c9526 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionsWidgets.css
@@ -31,12 +31,12 @@
 	opacity: .75;
 }
 
-.extension-verified-publisher {
+.verified-publisher {
 	display: flex;
 	align-items: center;
 }
 
-.extension-verified-publisher > .extension-verified-publisher-domain {
+.verified-publisher > .extension-verified-publisher-domain {
 	padding-left: 2px;
 	color: var(--vscode-extensionIcon-verifiedForeground);
 	text-decoration: var(--text-link-decoration);
diff --git a/src/vs/workbench/contrib/extensions/common/extensions.ts b/src/vs/workbench/contrib/extensions/common/extensions.ts
index ad36a535de66..4a232d2d5603 100644
--- a/src/vs/workbench/contrib/extensions/common/extensions.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensions.ts
@@ -68,6 +68,7 @@ export interface IExtension {
 	readonly publisherSponsorLink?: URI;
 	readonly pinned: boolean;
 	readonly version: string;
+	readonly private: boolean;
 	readonly latestVersion: string;
 	readonly preRelease: boolean;
 	readonly isPreReleaseVersion: boolean;
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
index 2cb589f849f8..e77726ba5cca 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
@@ -1409,6 +1409,7 @@ class WorkspaceExtensionsManagementService extends Disposable {
 			updated: !!extension.metadata?.updated,
 			pinned: !!extension.metadata?.pinned,
 			isWorkspaceScoped: true,
+			private: false,
 			source: 'resource',
 			size: extension.metadata?.size ?? 0,
 		};
diff --git a/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
index c3e21ded56a6..1cde4cdfc682 100644
--- a/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
@@ -237,6 +237,7 @@ function toLocalExtension(extension: IExtension): ILocalExtension {
 		targetPlatform: TargetPlatform.WEB,
 		updated: !!metadata.updated,
 		pinned: !!metadata?.pinned,
+		private: !!metadata.private,
 		isWorkspaceScoped: false,
 		source: metadata?.source ?? (extension.identifier.uuid ? 'gallery' : 'resource'),
 		size: metadata.size ?? 0,
@@ -291,6 +292,7 @@ class InstallExtensionTask extends AbstractExtensionTask<ILocalExtension> implem
 			metadata.isSystem = existingExtension?.type === ExtensionType.System ? true : undefined;
 			metadata.updated = !!existingExtension;
 			metadata.isApplicationScoped = this.options.isApplicationScoped || metadata.isApplicationScoped;
+			metadata.private = this.extension.private;
 			metadata.preRelease = isBoolean(this.options.preRelease)
 				? this.options.preRelease
 				: this.options.installPreReleaseVersion || this.extension.properties.isPreReleaseVersion || metadata.preRelease;

From 9595934bdb5e7b1ab89f36282c73db42b806f82c Mon Sep 17 00:00:00 2001
From: Josh Spicer <23246594+joshspicer@users.noreply.github.com>
Date: Thu, 13 Mar 2025 17:12:25 -0700
Subject: [PATCH 0917/1815] Generate macOS configuration profiles (#241773)

* generate configuration policy and manifests

* add darwin pipeline job

* argument for per-platform generation of policy

* adopt argument in pipeline

* formatting tweaks in generated profile (+ check in .js file)

* tidy up output plists

* copy policy definitions

* implement the remaining renderProfileValue()

* remove unnecessary platform option

* copy to .app in vscode-darwin-$PLATFORM-min-ci gulp task

* add darwinProfileUUID and darwinProfilePayloadUUID to product.json

* better way to package in gulp script

* bump distro commit (https://github.com/microsoft/vscode-distro/commit/c3ec5ba4852b5682b94358c92bf31484d2739db9)

* Add bundles policy paths to macOS universal build 'filesToSkip'

Needs this when creating universal macOS app:

Expected all non-binary files to have identical SHAs when creating a universal build
but "Contents/Resources/app/policies/cs-cz/com.microsoft.VSCodeInsiders.plist" did not

See:
https://github.com/deepak1556/universal/blob/298a872f5f7d67eabb01d25464eef68edab14cd2/src/index.ts#L163-L172
---
 .../darwin/product-build-darwin.yml           |   5 +
 .../win32/product-build-win32.yml             |   2 +-
 build/darwin/create-universal-app.js          |   1 +
 build/darwin/create-universal-app.ts          |   1 +
 build/gulpfile.vscode.js                      |   5 +-
 build/lib/policies.js                         | 320 +++++++++++++++-
 build/lib/policies.ts                         | 360 +++++++++++++++++-
 package.json                                  |   2 +-
 product.json                                  |   2 +
 9 files changed, 677 insertions(+), 21 deletions(-)

diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index e77000d431b6..bd37d675aa2f 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -121,6 +121,11 @@ steps:
 
   - template: ../common/install-builtin-extensions.yml@self
 
+  - ${{ if and(ne(parameters.VSCODE_CIBUILD, true), ne(parameters.VSCODE_QUALITY, 'oss')) }}:
+    - script: node build/lib/policies darwin
+      displayName: Generate policy definitions
+      retryCountOnTaskFailure: 3
+
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - script: |
         set -e
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index f7389943dc7a..6251417f193d 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -124,7 +124,7 @@ steps:
   - template: ../common/install-builtin-extensions.yml@self
 
   - ${{ if and(ne(parameters.VSCODE_CIBUILD, true), ne(parameters.VSCODE_QUALITY, 'oss')) }}:
-    - powershell: node build\lib\policies
+    - powershell: node build\lib\policies win32
       displayName: Generate Group Policy definitions
       retryCountOnTaskFailure: 3
 
diff --git a/build/darwin/create-universal-app.js b/build/darwin/create-universal-app.js
index 535d46eb1745..7d3f9164d5f1 100644
--- a/build/darwin/create-universal-app.js
+++ b/build/darwin/create-universal-app.js
@@ -27,6 +27,7 @@ async function main(buildDir) {
     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'
     ];
diff --git a/build/darwin/create-universal-app.ts b/build/darwin/create-universal-app.ts
index 9e013cdb10ca..7872eccc63e3 100644
--- a/build/darwin/create-universal-app.ts
+++ b/build/darwin/create-universal-app.ts
@@ -28,6 +28,7 @@ async function main(buildDir?: string) {
 	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'
 	];
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index a63f693c95a6..0624f5f5a673 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -372,8 +372,9 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			const shortcut = gulp.src('resources/darwin/bin/code.sh')
 				.pipe(replace('@@APPNAME@@', product.applicationName))
 				.pipe(rename('bin/code'));
-
-			all = es.merge(all, shortcut);
+			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);
 		}
 
 		let result = all
diff --git a/build/lib/policies.js b/build/lib/policies.js
index 847ef5c8e471..bb7e45c1873f 100644
--- a/build/lib/policies.js
+++ b/build/lib/policies.js
@@ -46,6 +46,19 @@ function renderADMLString(prefix, moduleName, nlsString, translations) {
     }
     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;
+}
 class BasePolicy {
     type;
     name;
@@ -84,6 +97,14 @@ class BasePolicy {
     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>`;
+    }
 }
 class BooleanPolicy extends BasePolicy {
     static from(name, category, minimumVersion, description, moduleName, settingNode) {
@@ -106,6 +127,21 @@ class BooleanPolicy extends BasePolicy {
     renderADMLPresentationContents() {
         return `<checkBox refId="${this.name}">${this.name}</checkBox>`;
     }
+    renderProfileValue() {
+        return `<false/>`;
+    }
+    renderProfileManifestValue(translations) {
+        return `<key>pfm_default</key>
+<false/>
+<key>pfm_description</key>
+<string>${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>`;
+    }
 }
 class ParseError extends Error {
     constructor(message, moduleName, node) {
@@ -138,6 +174,21 @@ class NumberPolicy extends BasePolicy {
     renderADMLPresentationContents() {
         return `<decimalTextBox refId="${this.name}" defaultValue="${this.defaultValue}">${this.name}</decimalTextBox>`;
     }
+    renderProfileValue() {
+        return `<integer>${this.defaultValue}</integer>`;
+    }
+    renderProfileManifestValue(translations) {
+        return `<key>pfm_default</key>
+<integer>${this.defaultValue}</integer>
+<key>pfm_description</key>
+<string>${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>`;
+    }
 }
 class StringPolicy extends BasePolicy {
     static from(name, category, minimumVersion, description, moduleName, settingNode) {
@@ -156,6 +207,21 @@ class StringPolicy extends BasePolicy {
     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>${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>`;
+    }
 }
 class ObjectPolicy extends BasePolicy {
     static from(name, category, minimumVersion, description, moduleName, settingNode) {
@@ -174,6 +240,22 @@ class ObjectPolicy extends BasePolicy {
     renderADMLPresentationContents() {
         return `<multiTextBox refId="${this.name}" />`;
     }
+    renderProfileValue() {
+        return `<string></string>`;
+    }
+    renderProfileManifestValue(translations) {
+        return `<key>pfm_default</key>
+<string></string>
+<key>pfm_description</key>
+<string>${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>
+`;
+    }
 }
 class StringEnumPolicy extends BasePolicy {
     enum_;
@@ -220,6 +302,25 @@ class StringEnumPolicy extends BasePolicy {
     renderADMLPresentationContents() {
         return `<dropdownList refId="${this.name}" />`;
     }
+    renderProfileValue() {
+        return `<string>${this.enum_[0]}</string>`;
+    }
+    renderProfileManifestValue(translations) {
+        return `<key>pfm_default</key>
+<string>${this.enum_[0]}</string>
+<key>pfm_description</key>
+<string>${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>`;
+    }
 }
 const NumberQ = {
     Q: `(number) @value`,
@@ -425,6 +526,186 @@ function renderADML(appName, versions, categories, policies, translations) {
 </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(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(policies, translations) {
     const appName = product.nameLong;
     const regKey = product.win32RegValueName;
@@ -540,14 +821,9 @@ async function getTranslations() {
     return await Promise.all(languageIds.map(languageId => getNLS(extensionGalleryServiceUrl, resourceUrlTemplate, languageId, version)
         .then(languageTranslations => ({ languageId, languageTranslations }))));
 }
-async function main() {
-    const [policies, translations] = await Promise.all([parsePolicies(), getTranslations()]);
-    console.log(`Found ${policies.length} policies:`);
-    for (const policy of policies) {
-        console.log(`- ${policy.name} (${policy.type})`);
-    }
-    const { admx, adml } = await renderGP(policies, translations);
+async function windowsMain(policies, translations) {
     const root = '.build/policies/win32';
+    const { admx, adml } = await renderGP(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'));
@@ -557,6 +833,36 @@ async function main() {
         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 } = await renderMacOSPolicy(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' : 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 main() {
+    const [policies, translations] = await Promise.all([parsePolicies(), getTranslations()]);
+    const platform = process.argv[2];
+    if (platform === 'darwin') {
+        await darwinMain(policies, translations);
+    }
+    else if (platform === 'win32') {
+        await windowsMain(policies, translations);
+    }
+    else {
+        console.error(`Usage: node build/lib/policies <darwin|win32>`);
+        process.exit(1);
+    }
+}
 if (require.main === module) {
     main().catch(err => {
         if (err instanceof ParseError) {
diff --git a/build/lib/policies.ts b/build/lib/policies.ts
index e5d068870713..cf16ca2d5113 100644
--- a/build/lib/policies.ts
+++ b/build/lib/policies.ts
@@ -48,6 +48,9 @@ interface Policy {
 	renderADMX(regKey: string): string[];
 	renderADMLStrings(translations?: LanguageTranslations): string[];
 	renderADMLPresentation(): string;
+	renderProfile(): string[];
+	// https://github.com/ProfileManifests/ProfileManifests/wiki/Manifest-Format
+	renderProfileManifest(translations?: LanguageTranslations): string;
 }
 
 function renderADMLString(prefix: string, moduleName: string, nlsString: NlsString, translations?: LanguageTranslations): string {
@@ -68,6 +71,24 @@ function renderADMLString(prefix: string, moduleName: string, nlsString: NlsStri
 	return `<string id="${prefix}_${nlsString.nlsKey.replace(/\./g, '_')}">${value}</string>`;
 }
 
+function renderProfileString(_prefix: string, moduleName: string, nlsString: NlsString, translations?: LanguageTranslations): string {
+	let value: string | undefined;
+
+	if (translations) {
+		const moduleTranslations = translations[moduleName];
+
+		if (moduleTranslations) {
+			value = moduleTranslations[nlsString.nlsKey];
+		}
+	}
+
+	if (!value) {
+		value = nlsString.value;
+	}
+
+	return value;
+}
+
 abstract class BasePolicy implements Policy {
 	constructor(
 		readonly type: PolicyType,
@@ -108,6 +129,19 @@ abstract class BasePolicy implements Policy {
 	}
 
 	protected abstract renderADMLPresentationContents(): string;
+
+	renderProfile() {
+		return [`<key>${this.name}</key>`, this.renderProfileValue()];
+	}
+
+	renderProfileManifest(translations?: LanguageTranslations): string {
+		return `<dict>
+${this.renderProfileManifestValue(translations)}
+</dict>`;
+	}
+
+	abstract renderProfileValue(): string;
+	abstract renderProfileManifestValue(translations?: LanguageTranslations): string;
 }
 
 class BooleanPolicy extends BasePolicy {
@@ -150,6 +184,23 @@ class BooleanPolicy extends BasePolicy {
 	renderADMLPresentationContents() {
 		return `<checkBox refId="${this.name}">${this.name}</checkBox>`;
 	}
+
+	renderProfileValue(): string {
+		return `<false/>`;
+	}
+
+	renderProfileManifestValue(translations?: LanguageTranslations): string {
+		return `<key>pfm_default</key>
+<false/>
+<key>pfm_description</key>
+<string>${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>`;
+	}
 }
 
 class ParseError extends Error {
@@ -204,6 +255,23 @@ class NumberPolicy extends BasePolicy {
 	renderADMLPresentationContents() {
 		return `<decimalTextBox refId="${this.name}" defaultValue="${this.defaultValue}">${this.name}</decimalTextBox>`;
 	}
+
+	renderProfileValue() {
+		return `<integer>${this.defaultValue}</integer>`;
+	}
+
+	renderProfileManifestValue(translations?: LanguageTranslations) {
+		return `<key>pfm_default</key>
+<integer>${this.defaultValue}</integer>
+<key>pfm_description</key>
+<string>${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>`;
+	}
 }
 
 class StringPolicy extends BasePolicy {
@@ -242,6 +310,23 @@ class StringPolicy extends BasePolicy {
 	renderADMLPresentationContents() {
 		return `<textBox refId="${this.name}"><label>${this.name}:</label></textBox>`;
 	}
+
+	renderProfileValue(): string {
+		return `<string></string>`;
+	}
+
+	renderProfileManifestValue(translations?: LanguageTranslations): string {
+		return `<key>pfm_default</key>
+<string></string>
+<key>pfm_description</key>
+<string>${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>`;
+	}
 }
 
 class ObjectPolicy extends BasePolicy {
@@ -280,6 +365,24 @@ class ObjectPolicy extends BasePolicy {
 	renderADMLPresentationContents() {
 		return `<multiTextBox refId="${this.name}" />`;
 	}
+
+	renderProfileValue(): string {
+		return `<string></string>`;
+	}
+
+	renderProfileManifestValue(translations?: LanguageTranslations): string {
+		return `<key>pfm_default</key>
+<string></string>
+<key>pfm_description</key>
+<string>${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>
+`;
+	}
 }
 
 class StringEnumPolicy extends BasePolicy {
@@ -349,6 +452,27 @@ class StringEnumPolicy extends BasePolicy {
 	renderADMLPresentationContents() {
 		return `<dropdownList refId="${this.name}" />`;
 	}
+
+	renderProfileValue() {
+		return `<string>${this.enum_[0]}</string>`;
+	}
+
+	renderProfileManifestValue(translations?: LanguageTranslations): string {
+		return `<key>pfm_default</key>
+<string>${this.enum_[0]}</string>
+<key>pfm_description</key>
+<string>${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>`;
+	}
 }
 
 interface QType<T> {
@@ -606,6 +730,197 @@ function renderADML(appName: string, versions: string[], categories: Category[],
 `;
 }
 
+function renderProfileManifest(appName: string, bundleIdentifier: string, _versions: string[], _categories: Category[], policies: Policy[], translations?: LanguageTranslations) {
+
+	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(policies: Policy[], translations: 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(policies: Policy[], translations: Translations) {
 	const appName = product.nameLong;
 	const regKey = product.win32RegValueName;
@@ -751,18 +1066,10 @@ async function getTranslations(): Promise<Translations> {
 	));
 }
 
-async function main() {
-	const [policies, translations] = await Promise.all([parsePolicies(), getTranslations()]);
-
-	console.log(`Found ${policies.length} policies:`);
-
-	for (const policy of policies) {
-		console.log(`- ${policy.name} (${policy.type})`);
-	}
-
+async function windowsMain(policies: Policy[], translations: Translations) {
+	const root = '.build/policies/win32';
 	const { admx, adml } = await renderGP(policies, translations);
 
-	const root = '.build/policies/win32';
 	await fs.rm(root, { recursive: true, force: true });
 	await fs.mkdir(root, { recursive: true });
 
@@ -775,6 +1082,39 @@ async function main() {
 	}
 }
 
+async function darwinMain(policies: Policy[], translations: 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 } = await renderMacOSPolicy(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'));
+
+	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'));
+	}
+}
+
+async function main() {
+	const [policies, translations] = await Promise.all([parsePolicies(), getTranslations()]);
+	const platform = process.argv[2];
+
+	if (platform === 'darwin') {
+		await darwinMain(policies, translations);
+	} else if (platform === 'win32') {
+		await windowsMain(policies, translations);
+	} else {
+		console.error(`Usage: node build/lib/policies <darwin|win32>`);
+		process.exit(1);
+	}
+}
+
 if (require.main === module) {
 	main().catch(err => {
 		if (err instanceof ParseError) {
diff --git a/package.json b/package.json
index fc59723d77de..5f0138ef2a2f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.99.0",
-  "distro": "034ea95a21e3eb734fd22bf565a1e2e80d62ea9b",
+  "distro": "c3ec5ba4852b5682b94358c92bf31484d2739db9",
   "author": {
     "name": "Microsoft Corporation"
   },
diff --git a/product.json b/product.json
index 873ea0eaa13d..1d4dca8fc3fc 100644
--- a/product.json
+++ b/product.json
@@ -25,6 +25,8 @@
 	"win32TunnelServiceMutex": "vscodeoss-tunnelservice",
 	"win32TunnelMutex": "vscodeoss-tunnel",
 	"darwinBundleIdentifier": "com.visualstudio.code.oss",
+	"darwinProfileUUID": "47827DD9-4734-49A0-AF80-7E19B11495CC",
+	"darwinProfilePayloadUUID": "CF808BE7-53F3-46C6-A7E2-7EDB98A5E959",
 	"linuxIconName": "code-oss",
 	"licenseFileName": "LICENSE.txt",
 	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",

From a1e2602ab0f091468695829f5f68c8d6de3a9203 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Thu, 13 Mar 2025 18:17:39 -0700
Subject: [PATCH 0918/1815] wip on more extension-contributed collections

---
 .../platform/extensions/common/extensions.ts  |   6 +
 src/vs/workbench/api/browser/mainThreadMcp.ts |  19 +-
 .../workbench/api/common/extHost.api.impl.ts  |   4 +-
 src/vs/workbench/api/common/extHostMcp.ts     |  13 +-
 .../contrib/mcp/browser/mcp.contribution.ts   |   9 +-
 .../contrib/mcp/browser/mcpCommands.ts        |  34 ++-
 .../contrib/mcp/common/mcpConfiguration.ts    |  37 +++
 .../contrib/mcp/common/mcpContextKeys.ts      |   2 +-
 .../contrib/mcp/common/mcpRegistry.ts         |  15 +-
 .../contrib/mcp/common/mcpRegistryTypes.ts    |  10 +-
 .../workbench/contrib/mcp/common/mcpServer.ts |  70 ++++-
 .../contrib/mcp/common/mcpService.ts          | 156 +++++++++-
 .../workbench/contrib/mcp/common/mcpTypes.ts  | 109 ++++++-
 .../mcp/test/common/mcpRegistry.test.ts       |  51 ++--
 .../mcp/test/common/mcpService.test.ts        | 276 ++++++++++++++++++
 .../extensions/common/extensionsRegistry.ts   |   5 +
 ...ode.proposed.mcpConfigurationProvider.d.ts |   2 +-
 17 files changed, 722 insertions(+), 96 deletions(-)
 create mode 100644 src/vs/workbench/contrib/mcp/test/common/mcpService.test.ts

diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
index b2d6194419a1..b38ba82a1d9a 100644
--- a/src/vs/platform/extensions/common/extensions.ts
+++ b/src/vs/platform/extensions/common/extensions.ts
@@ -184,6 +184,11 @@ export interface IToolContribution {
 	userDescription?: string;
 }
 
+export interface IMcpCollectionContribution {
+	readonly id: string;
+	readonly label: string;
+}
+
 export interface IExtensionContributions {
 	commands?: ICommand[];
 	configuration?: any;
@@ -211,6 +216,7 @@ export interface IExtensionContributions {
 	readonly debugVisualizers?: IDebugVisualizationContribution[];
 	readonly chatParticipants?: ReadonlyArray<IChatParticipantContribution>;
 	readonly languageModelTools?: ReadonlyArray<IToolContribution>;
+	readonly modelContextServerCollections?: ReadonlyArray<IMcpCollectionContribution>;
 }
 
 export interface IExtensionCapabilities {
diff --git a/src/vs/workbench/api/browser/mainThreadMcp.ts b/src/vs/workbench/api/browser/mainThreadMcp.ts
index 357bb34c0315..30f43c09274a 100644
--- a/src/vs/workbench/api/browser/mainThreadMcp.ts
+++ b/src/vs/workbench/api/browser/mainThreadMcp.ts
@@ -6,13 +6,11 @@
 import { Emitter } from '../../../base/common/event.js';
 import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
 import { ISettableObservable, observableValue } from '../../../base/common/observable.js';
-import { URI } from '../../../base/common/uri.js';
 import { IMcpMessageTransport, IMcpRegistry } from '../../contrib/mcp/common/mcpRegistryTypes.js';
 import { McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
 import { MCP } from '../../contrib/mcp/common/modelContextProtocol.js';
 import { ExtensionHostKind } from '../../services/extensions/common/extensionHostKind.js';
 import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { Dto } from '../../services/extensions/common/proxyIdentifier.js';
 import { ExtHostContext, MainContext, MainThreadMcpShape } from '../common/extHost.protocol.js';
 
 @extHostNamedCustomer(MainContext.MainThreadMcp)
@@ -59,21 +57,8 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 		}));
 	}
 
-	$upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, serversDto: Dto<McpServerDefinition>[]): void {
-		const servers = serversDto.map((s): McpServerDefinition => ({
-			...s,
-			launch: s.launch.type === McpServerTransportType.Stdio
-				? { ...s.launch, cwd: URI.revive(s.launch.cwd) }
-				: s.launch,
-			variableReplacement: s.variableReplacement && {
-				...s.variableReplacement,
-				folder: s.variableReplacement.folder && {
-					...s.variableReplacement.folder,
-					uri: URI.revive(s.variableReplacement.folder.uri),
-				},
-			},
-		}));
-
+	$upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, serversDto: McpServerDefinition.Serialized[]): void {
+		const servers = serversDto.map(McpServerDefinition.fromSerialized);
 		const existing = this._collectionDefinitions.get(collection.id);
 		if (existing) {
 			existing.servers.set(servers, undefined);
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index bc5d4a605a6d..a1dfc9f9d9d2 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -1516,9 +1516,9 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			registerIgnoredFileProvider(provider: vscode.LanguageModelIgnoredFileProvider) {
 				return extHostLanguageModels.registerIgnoredFileProvider(extension, provider);
 			},
-			registerMcpConfigurationProvider(provider, metadata) {
+			registerMcpConfigurationProvider(id, provider) {
 				checkProposedApiEnabled(extension, 'mcpConfigurationProvider');
-				return extHostMcp.registerMcpConfigurationProvider(extension, provider, metadata);
+				return extHostMcp.registerMcpConfigurationProvider(extension, id, provider);
 			}
 		};
 
diff --git a/src/vs/workbench/api/common/extHostMcp.ts b/src/vs/workbench/api/common/extHostMcp.ts
index 493fd86abb9d..56d227152908 100644
--- a/src/vs/workbench/api/common/extHostMcp.ts
+++ b/src/vs/workbench/api/common/extHostMcp.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 import { DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
-import { McpCollectionDefinition, McpServerDefinition, McpServerLaunch, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
+import { extensionMcpCollectionPrefix, McpCollectionDefinition, McpServerDefinition, McpServerLaunch, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
 import { ExtHostMcpShape, MainContext, MainThreadMcpShape } from './extHost.protocol.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { StorageScope } from '../../../platform/storage/common/storage.js';
@@ -16,7 +16,7 @@ import { CancellationToken } from '../../../base/common/cancellation.js';
 export const IExtHostMpcService = createDecorator<IExtHostMpcService>('IExtHostMpcService');
 
 export interface IExtHostMpcService extends ExtHostMcpShape {
-	registerMcpConfigurationProvider(extension: IExtensionDescription, provider: vscode.McpConfigurationProvider, metadata?: { label: string }): IDisposable;
+	registerMcpConfigurationProvider(extension: IExtensionDescription, id: string, provider: vscode.McpConfigurationProvider): IDisposable;
 }
 
 export class ExtHostMcpService implements IExtHostMpcService {
@@ -41,11 +41,16 @@ export class ExtHostMcpService implements IExtHostMpcService {
 		// no-op
 	}
 
-	registerMcpConfigurationProvider(extension: IExtensionDescription, provider: vscode.McpConfigurationProvider, metadata?: { label: string }): IDisposable {
+	registerMcpConfigurationProvider(extension: IExtensionDescription, id: string, provider: vscode.McpConfigurationProvider): IDisposable {
 		const store = new DisposableStore();
 
+		const metadata = extension.contributes?.modelContextServerCollections?.find(m => m.id === id);
+		if (!metadata) {
+			throw new Error(`MCP configuration providers must be registered in the contributes.modelContextServerCollections array within your package.json, but "${id}" was not`);
+		}
+
 		const mcp: McpCollectionDefinition.FromExtHost = {
-			id: ExtensionIdentifier.toKey(extension.identifier),
+			id: extensionMcpCollectionPrefix + id,
 			isTrustedByDefault: true,
 			label: metadata?.label ?? extension.displayName ?? extension.name,
 			scope: StorageScope.WORKSPACE
diff --git a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
index 81214342ad28..b9214bb5d503 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
@@ -12,15 +12,15 @@ import { mcpSchemaId } from '../../../services/configuration/common/configuratio
 import { ConfigMcpDiscovery } from '../common/discovery/configMcpDiscovery.js';
 import { mcpDiscoveryRegistry } from '../common/discovery/mcpDiscovery.js';
 import { RemoteNativeMpcDiscovery } from '../common/discovery/nativeMcpRemoteDiscovery.js';
-import { mcpServerSchema } from '../common/mcpConfiguration.js';
+import { mcpContributionPoint, mcpServerSchema } from '../common/mcpConfiguration.js';
 import { McpRegistry } from '../common/mcpRegistry.js';
 import { IMcpRegistry } from '../common/mcpRegistryTypes.js';
 import { McpService } from '../common/mcpService.js';
 import { IMcpService } from '../common/mcpTypes.js';
 import { McpDiscovery } from './mcpDiscovery.js';
+import * as extensionsRegistry from '../../../services/extensions/common/extensionsRegistry.js';
 
-import { AttachMCPToolsAction, AttachMCPToolsActionRendering, ListMcpServerCommand, ResetMcpTrustCommand, McpServerOptionsCommand } from './mcpCommands.js';
-
+import { AttachMCPToolsAction, AttachMCPToolsActionRendering, ListMcpServerCommand, ResetMcpTrustCommand, McpServerOptionsCommand, ResetMcpCachedTools } from './mcpCommands.js';
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { McpContextKeysController } from '../common/mcpContextKeys.js';
 
@@ -37,7 +37,10 @@ registerAction2(ListMcpServerCommand);
 registerAction2(McpServerOptionsCommand);
 registerAction2(AttachMCPToolsAction);
 registerAction2(ResetMcpTrustCommand);
+registerAction2(ResetMcpCachedTools);
 registerWorkbenchContribution2('mcpActionRendering', AttachMCPToolsActionRendering, WorkbenchPhase.BlockRestore);
 
 const jsonRegistry = <jsonContributionRegistry.IJSONContributionRegistry>Registry.as(jsonContributionRegistry.Extensions.JSONContribution);
 jsonRegistry.registerSchema(mcpSchemaId, mcpServerSchema);
+
+extensionsRegistry.ExtensionsRegistry.registerExtensionPoint(mcpContributionPoint);
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 46f42936393d..97bbebd378cf 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -369,7 +369,7 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 			return { count, enabled };
 		});
 
-		const displayedState = derived(reader => {
+		const displayedState = derived((reader): { state: DisplayedState; servers: IMcpServer[]; extensions?: boolean } => {
 			const servers = mcpService.servers.read(reader);
 			const serversPerState: IMcpServer[][] = [];
 			for (const server of servers) {
@@ -394,8 +394,9 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 				serversPerState[thisState].push(server);
 			}
 
-			const maxState = (serversPerState.length - 1) as DisplayedState;
-			return { state: maxState, servers: serversPerState[maxState] };
+			const extensionNeedRefresh = mcpService.hasExtensionsWithUnknownServers.read(reader);
+			const maxState = extensionNeedRefresh ? DisplayedState.NewTools : (serversPerState.length - 1) as DisplayedState;
+			return { state: maxState, servers: serversPerState[maxState] || [], extensions: extensionNeedRefresh };
 		});
 
 		this._store.add(actionViewItemService.register(MenuId.ChatInputAttachmentToolbar, AttachMCPToolsAction.id, (action, options) => {
@@ -452,6 +453,7 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 						const { state, servers } = displayedState.get();
 						if (state === DisplayedState.NewTools) {
 							servers.forEach(server => server.start());
+							mcpService.activateExtensionServers();
 						} else if (state === DisplayedState.Refreshing) {
 							servers.at(-1)?.showOutput();
 						} else if (state === DisplayedState.Error) {
@@ -469,9 +471,9 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 
 				private getLabelForState({ state, servers } = displayedState.get()) {
 					if (state === DisplayedState.NewTools) {
-						return localize('mcp.newTools', "New tools available ({0})", servers.length);
+						return localize('mcp.newTools', "New tools available ({0})", servers.length || 1);
 					} else if (state === DisplayedState.Error) {
-						return localize('mcp.toolError', "Error loading {0} tool(s)", servers.length);
+						return localize('mcp.toolError', "Error loading {0} tool(s)", servers.length || 1);
 					} else if (state === DisplayedState.Refreshing) {
 						return localize('mcp.toolRefresh', "Discovering tools...");
 					} else {
@@ -509,7 +511,7 @@ export class ResetMcpTrustCommand extends Action2 {
 	constructor() {
 		super({
 			id: ResetMcpTrustCommand.ID,
-			title: localize2('mcp.resetTrust', "Reset MCP Trust"),
+			title: localize2('mcp.resetTrust', "Reset Trust"),
 			category,
 			f1: true,
 			precondition: McpContextKeys.toolsCount.greater(0),
@@ -522,3 +524,23 @@ export class ResetMcpTrustCommand extends Action2 {
 	}
 }
 
+
+export class ResetMcpCachedTools extends Action2 {
+	static readonly ID = 'workbench.mcp.resetCachedTools';
+
+	constructor() {
+		super({
+			id: ResetMcpCachedTools.ID,
+			title: localize2('mcp.resetCachedTools', "Reset Cached Tools"),
+			category,
+			f1: true,
+			precondition: McpContextKeys.toolsCount.greater(0),
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		const mcpService = accessor.get(IMcpService);
+		mcpService.resetCaches();
+	}
+}
+
diff --git a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
index c81b1abe9a5b..0c01707f9d76 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
@@ -5,11 +5,17 @@
 
 import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
 import { localize } from '../../../../nls.js';
+import { IMcpCollectionContribution } from '../../../../platform/extensions/common/extensions.js';
 import { mcpSchemaId } from '../../../services/configuration/common/configuration.js';
 import { inputsSchema } from '../../../services/configurationResolver/common/configurationResolverSchema.js';
+import { IExtensionPointDescriptor } from '../../../services/extensions/common/extensionsRegistry.js';
 
 export type { IMcpConfigurationServer, IMcpConfiguration } from '../../../../platform/mcp/common/mcpPlatformTypes.js';
 
+const mcpActivationEventPrefix = 'onMcpCollection:';
+
+export const mcpActivationEvent = (collectionId: string) => mcpActivationEventPrefix + collectionId;
+
 const mcpSchemaExampleServer = {
 	command: 'node',
 	args: ['my-mcp-server.js'],
@@ -69,3 +75,34 @@ export const mcpServerSchema: IJSONSchema = {
 		inputs: inputsSchema.definitions!.inputs
 	}
 };
+
+export const mcpContributionPoint: IExtensionPointDescriptor<IMcpCollectionContribution[]> = {
+	extensionPoint: 'modelContextServerCollections',
+	activationEventsGenerator(contribs, result) {
+		for (const contrib of contribs) {
+			if (contrib.id) {
+				result.push(mcpActivationEvent(contrib.id));
+			}
+		}
+	},
+	jsonSchema: {
+		description: localize('vscode.extension.contributes.mcp', 'Contributes Model Context Protocol servers. Users of this should also use `vscode.lm.registerMcpConfigurationProvider`.'),
+		type: 'array',
+		defaultSnippets: [{ body: [{ id: '', label: '' }] }],
+		items: {
+			additionalProperties: false,
+			type: 'object',
+			defaultSnippets: [{ body: { id: '', label: '' } }],
+			properties: {
+				id: {
+					description: localize('vscode.extension.contributes.mcp.id', "Unique ID for the collection."),
+					type: 'string'
+				},
+				label: {
+					description: localize('vscode.extension.contributes.mcp.label', "Display name for the collection."),
+					type: 'string'
+				}
+			}
+		}
+	}
+};
diff --git a/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts b/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
index 56b90c9126f6..23847fa75b13 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
@@ -39,7 +39,7 @@ export class McpContextKeysController extends Disposable implements IWorkbenchCo
 			const serverTools = servers.map(s => s.tools.read(r));
 			ctxServerCount.set(servers.length);
 			ctxToolsCount.set(serverTools.reduce((count, tools) => count + tools.length, 0));
-			ctxHasUnknownTools.set(servers.some(s => {
+			ctxHasUnknownTools.set(mcpService.hasExtensionsWithUnknownServers.read(r) || servers.some(s => {
 				if (s.trusted.read(r) === false) {
 					return false;
 				}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
index 4b8681a588b7..88ebdc0ba714 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
@@ -16,7 +16,7 @@ import { IConfigurationResolverService } from '../../../services/configurationRe
 import { McpRegistryInputStorage } from './mcpRegistryInputStorage.js';
 import { IMcpHostDelegate, IMcpRegistry, IMcpResolveConnectionOptions } from './mcpRegistryTypes.js';
 import { McpServerConnection } from './mcpServerConnection.js';
-import { IMcpServerConnection, McpCollectionDefinition, McpServerDefinition } from './mcpTypes.js';
+import { IMcpServerConnection, McpCollectionDefinition, McpCollectionReference, McpServerDefinition } from './mcpTypes.js';
 
 const createTrustMemento = observableMemento<Readonly<Record<string, boolean>>>({
 	defaultValue: {},
@@ -84,9 +84,10 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 		this._trustMemento.value.set({}, undefined);
 	}
 
-	public getTrust(collection: McpCollectionDefinition): IObservable<boolean | undefined> {
+	public getTrust(collectionRef: McpCollectionReference): IObservable<boolean | undefined> {
 		return derived(reader => {
-			if (collection.isTrustedByDefault) {
+			const collection = this._collections.read(reader).find(c => c.id === collectionRef.id);
+			if (!collection || collection.isTrustedByDefault) {
 				return true;
 			}
 
@@ -130,7 +131,13 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 		return result.result;
 	}
 
-	public async resolveConnection({ collection, definition, forceTrust }: IMcpResolveConnectionOptions): Promise<IMcpServerConnection | undefined> {
+	public async resolveConnection({ collectionRef, definitionRef, forceTrust }: IMcpResolveConnectionOptions): Promise<IMcpServerConnection | undefined> {
+		const collection = this._collections.get().find(c => c.id === collectionRef.id);
+		const definition = collection?.serverDefinitions.get().find(s => s.id === definitionRef.id);
+		if (!collection || !definition) {
+			throw new Error(`Collection or definition not found for ${collectionRef.id} and ${definitionRef.id}`);
+		}
+
 		const delegate = this._delegates.find(d => d.canStart(collection, definition));
 		if (!delegate) {
 			throw new Error('No delegate found that can handle the connection');
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
index 9e293e5b3514..3922d1883256 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
@@ -7,7 +7,7 @@ import { Event } from '../../../../base/common/event.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { IObservable } from '../../../../base/common/observable.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { McpCollectionDefinition, McpServerDefinition, McpServerLaunch, McpConnectionState, IMcpServerConnection } from './mcpTypes.js';
+import { McpCollectionDefinition, McpServerDefinition, McpServerLaunch, McpConnectionState, IMcpServerConnection, McpCollectionReference, McpDefinitionReference } from './mcpTypes.js';
 import { MCP } from './modelContextProtocol.js';
 
 export const IMcpRegistry = createDecorator<IMcpRegistry>('mcpRegistry');
@@ -27,8 +27,8 @@ export interface IMcpHostDelegate {
 }
 
 export interface IMcpResolveConnectionOptions {
-	collection: McpCollectionDefinition;
-	definition: McpServerDefinition;
+	collectionRef: McpCollectionReference;
+	definitionRef: McpDefinitionReference;
 	/** If set, the user will be asked to trust the collection even if they untrusted it previously */
 	forceTrust?: boolean;
 }
@@ -46,10 +46,10 @@ export interface IMcpRegistry {
 	resetTrust(): void;
 
 	/** Gets whether the collection is trusted. */
-	getTrust(collection: McpCollectionDefinition): IObservable<boolean | undefined>;
+	getTrust(collection: McpCollectionReference): IObservable<boolean | undefined>;
 
 	/** Resets any saved inputs for the connection. */
-	clearSavedInputs(collection: McpCollectionDefinition, definition: McpServerDefinition): void;
+	clearSavedInputs(collection: McpCollectionReference, definition: McpServerDefinition): void;
 	/** Creates a connection for the collection and definition. */
 	resolveConnection(options: IMcpResolveConnectionOptions): Promise<IMcpServerConnection | undefined>;
 }
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServer.ts b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
index d757f755645e..58145d597aa0 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServer.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
@@ -10,20 +10,27 @@ import { LRUCache } from '../../../../base/common/map.js';
 import { autorun, autorunWithStore, derived, disposableObservableValue, IObservable, ITransaction, observableFromEvent, ObservablePromise, observableValue, transaction } from '../../../../base/common/observable.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 { mcpActivationEvent } from './mcpConfiguration.js';
 import { IMcpRegistry } from './mcpRegistryTypes.js';
 import { McpServerRequestHandler } from './mcpServerRequestHandler.js';
-import { McpCollectionDefinition, IMcpServer, IMcpServerConnection, McpServerDefinition, IMcpTool, McpConnectionFailedError, McpConnectionState, McpServerToolsState } from './mcpTypes.js';
+import { IMcpServer, IMcpServerConnection, IMcpTool, McpCollectionReference, McpConnectionFailedError, McpConnectionState, McpDefinitionReference, McpServerDefinition, McpServerToolsState } from './mcpTypes.js';
 import { MCP } from './modelContextProtocol.js';
 
 
-interface IMetadataCacheEntry {
+interface IToolCacheEntry {
 	/** Cached tools so we can show what's available before it's started */
 	readonly tools: readonly MCP.Tool[];
 }
 
+interface IServerCacheEntry {
+	readonly servers: readonly McpServerDefinition.Serialized[];
+}
+
 export class McpServerMetadataCache extends Disposable {
 	private didChange = false;
-	private readonly cache = new LRUCache<string, IMetadataCacheEntry>(128);
+	private readonly cache = new LRUCache<string, IToolCacheEntry>(128);
+	private readonly extensionServers = new Map</* collection ID */string, IServerCacheEntry>();
 
 	constructor(
 		scope: StorageScope,
@@ -31,38 +38,70 @@ export class McpServerMetadataCache extends Disposable {
 	) {
 		super();
 
-		type StoredType = [string, IMetadataCacheEntry][];
+		type StoredType = {
+			extensionServers: [string, IServerCacheEntry][];
+			serverTools: [string, IToolCacheEntry][];
+		};
 
 		const storageKey = 'mcpToolCache';
 		this._register(storageService.onWillSaveState(() => {
 			if (this.didChange) {
-				storageService.store(storageKey, this.cache.toJSON() satisfies StoredType, scope, StorageTarget.MACHINE);
+				storageService.store(storageKey, {
+					extensionServers: [...this.extensionServers],
+					serverTools: this.cache.toJSON(),
+				} satisfies StoredType, scope, StorageTarget.MACHINE);
 				this.didChange = false;
 			}
 		}));
 
 		try {
 			const cached: StoredType | undefined = storageService.getObject(storageKey, scope);
-			cached?.forEach(([k, v]) => this.cache.set(k, v));
+			this.extensionServers = new Map(cached?.extensionServers ?? []);
+			cached?.serverTools?.forEach(([k, v]) => this.cache.set(k, v));
 		} catch {
 			// ignored
 		}
 	}
 
+	/** Resets the cache for tools and extension servers */
+	reset() {
+		this.cache.clear();
+		this.extensionServers.clear();
+		this.didChange = true;
+	}
+
+	/** Gets cached tools for a server (used before a server is running) */
 	getTools(definitionId: string): readonly MCP.Tool[] | undefined {
 		return this.cache.get(definitionId)?.tools;
 	}
 
+	/** Sets cached tools for a server */
 	storeTools(definitionId: string, tools: readonly MCP.Tool[]): void {
 		this.cache.set(definitionId, { ...this.cache.get(definitionId), tools });
 		this.didChange = true;
 	}
+
+	/** Gets cached servers for a collection (used for extensions, before the extension activates) */
+	getServers(collectionId: string) {
+		return this.extensionServers.get(collectionId);
+	}
+
+	/** Sets cached servers for a collection */
+	storeServers(collectionId: string, entry: IServerCacheEntry | undefined): void {
+		if (entry) {
+			this.extensionServers.set(collectionId, entry);
+		} else {
+			this.extensionServers.delete(collectionId);
+		}
+		this.didChange = true;
+	}
 }
 
 export class McpServer extends Disposable implements IMcpServer {
 	private readonly _connectionSequencer = new Sequencer();
 	private readonly _connection = this._register(disposableObservableValue<IMcpServerConnection | undefined>(this, undefined));
 
+	public readonly connection = this._connection;
 	public readonly connectionState: IObservable<McpConnectionState> = derived(reader => this._connection.read(reader)?.state.read(reader) ?? { state: McpConnectionState.Kind.Stopped });
 
 	private get toolsFromCache() {
@@ -98,11 +137,13 @@ export class McpServer extends Disposable implements IMcpServer {
 	}
 
 	constructor(
-		public readonly collection: McpCollectionDefinition,
-		public readonly definition: McpServerDefinition,
+		public readonly collection: McpCollectionReference,
+		public readonly definition: McpDefinitionReference,
+		private readonly _requiresExtensionActivation: boolean | undefined,
 		private readonly _toolCache: McpServerMetadataCache,
 		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry,
 		@IWorkspaceContextService workspacesService: IWorkspaceContextService,
+		@IExtensionService private readonly _extensionService: IExtensionService,
 	) {
 		super();
 
@@ -150,11 +191,20 @@ export class McpServer extends Disposable implements IMcpServer {
 
 	public start(isFromInteraction?: boolean): Promise<McpConnectionState> {
 		return this._connectionSequencer.queue(async () => {
+			if (this._requiresExtensionActivation && !this._extensionService.activationEventIsDone(mcpActivationEvent(this.collection.id))) {
+				await this._extensionService.activateByEvent(mcpActivationEvent(this.collection.id));
+				// This can happen if the server was created from a cached MCP server seen
+				// from an extension, but then it wasn't registered when the extension activated.
+				if (this._store.isDisposed) {
+					return { state: McpConnectionState.Kind.Stopped };
+				}
+			}
+
 			let connection = this._connection.get();
 			if (!connection) {
 				connection = await this._mcpRegistry.resolveConnection({
-					collection: this.collection,
-					definition: this.definition,
+					collectionRef: this.collection,
+					definitionRef: this.definition,
 					forceTrust: isFromInteraction,
 				});
 				if (!connection) {
diff --git a/src/vs/workbench/contrib/mcp/common/mcpService.ts b/src/vs/workbench/contrib/mcp/common/mcpService.ts
index f08e7af0f483..d97d8f328c2a 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpService.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpService.ts
@@ -6,38 +6,69 @@
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { autorun, autorunWithStore, derived, IObservable, observableValue } from '../../../../base/common/observable.js';
+import { autorun, autorunWithStore, derived, IObservable, observableValue, transaction } from '../../../../base/common/observable.js';
 import { localize } from '../../../../nls.js';
 import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier, IRelaxedExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
-import { StorageScope } from '../../../../platform/storage/common/storage.js';
+import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { ILanguageModelToolsService, IToolResult } from '../../chat/common/languageModelToolsService.js';
+import { mcpActivationEvent } from './mcpConfiguration.js';
 import { IMcpRegistry } from './mcpRegistryTypes.js';
 import { McpServer, McpServerMetadataCache } from './mcpServer.js';
-import { IMcpServer, IMcpService, McpCollectionDefinition, McpServerDefinition } from './mcpTypes.js';
+import { extensionMcpCollectionPrefix, IMcpServer, IMcpService, McpCollectionDefinition, McpCollectionSortOrder, McpServerDefinition } from './mcpTypes.js';
+
+interface IExtensionCollectionsRec {
+	extensionId: ExtensionIdentifier;
+	collectionId: string;
+	/**
+	 * Servers created from the cache. Servers are only here until the extension
+	 * activates and confirms they still exist. Undefined for new extensions
+	 * with unknown servers.
+	 */
+	pendingServers: IMcpServer[] | undefined;
+}
 
 export class McpService extends Disposable implements IMcpService {
 
 	declare _serviceBrand: undefined;
 
+	private readonly _extensionCollectionIdsToPersist = new Set<string>();
+	protected readonly _extensionServers = observableValue<readonly IExtensionCollectionsRec[]>(this, []);
 	private readonly _servers = observableValue<readonly IMcpServer[]>(this, []);
 	public readonly servers: IObservable<readonly IMcpServer[]> = this._servers;
 
-	private readonly userCache: McpServerMetadataCache;
-	private readonly workspaceCache: McpServerMetadataCache;
+	public readonly hasExtensionsWithUnknownServers = derived(reader => this._extensionServers.read(reader).some(r => r.pendingServers === undefined));
+
+	protected readonly userCache: McpServerMetadataCache;
+	protected readonly workspaceCache: McpServerMetadataCache;
 
 	constructor(
-		@IInstantiationService instantiationService: IInstantiationService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry,
 		@ILanguageModelToolsService toolsService: ILanguageModelToolsService,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IProductService productService: IProductService
+		@IProductService productService: IProductService,
+		@IExtensionService private readonly _extensionService: IExtensionService,
+		@IStorageService storageService: IStorageService,
 	) {
 		super();
 
-		this.userCache = instantiationService.createInstance(McpServerMetadataCache, StorageScope.PROFILE);
-		this.workspaceCache = instantiationService.createInstance(McpServerMetadataCache, StorageScope.WORKSPACE);
+		this._register(storageService.onWillSaveState(() => {
+			for (const collectionId of this._extensionCollectionIdsToPersist) {
+				const publishedServers = this._mcpRegistry.collections.get().find(c => c.id === collectionId)?.serverDefinitions.get();
+				if (publishedServers?.length) {
+					this.userCache.storeServers(collectionId, { servers: publishedServers.map(McpServerDefinition.toSerialized) });
+				} else {
+					this.userCache.storeServers(collectionId, undefined);
+				}
+			}
+		}));
+
+		this.userCache = this._register(_instantiationService.createInstance(McpServerMetadataCache, StorageScope.PROFILE));
+		this.workspaceCache = this._register(_instantiationService.createInstance(McpServerMetadataCache, StorageScope.WORKSPACE));
 
 		const definitionsObservable = derived(reader => {
 			const collections = this._mcpRegistry.collections.read(reader);
@@ -58,12 +89,17 @@ export class McpService extends Disposable implements IMcpService {
 				if (match) {
 					nextDefinitions.delete(match);
 					nextServers.push(server);
+					const connection = server.connection.get();
+					// if the definition was modified, stop the server; it'll be restarted again on-demand
+					if (connection && !McpServerDefinition.equals(connection.definition, match.serverDefinition)) {
+						server.stop();
+					}
 				} else {
 					server.dispose();
 				}
 			}
 			for (const def of nextDefinitions) {
-				nextServers.push(instantiationService.createInstance(McpServer, def.collectionDefinition, def.serverDefinition, def.collectionDefinition.scope === StorageScope.WORKSPACE ? this.workspaceCache : this.userCache));
+				nextServers.push(_instantiationService.createInstance(McpServer, def.collectionDefinition, def.serverDefinition, false, def.collectionDefinition.scope === StorageScope.WORKSPACE ? this.workspaceCache : this.userCache));
 			}
 
 			this._servers.set(nextServers, undefined);
@@ -76,9 +112,18 @@ export class McpService extends Disposable implements IMcpService {
 			updateThrottle.schedule(500);
 		}));
 
+		// Handle servers contributed by extensions.
+		this._register(_extensionService.onDidChangeExtensions(e => {
+			this._onExtensions(e.added);
+		}));
+		this._register(_extensionService.onDidChangeExtensionsStatus(() => {
+			this._onExtensionStatus();
+		}));
+		this._extensionService.whenInstalledExtensionsRegistered().then(() => {
+			this._onExtensions(_extensionService.extensions);
+		});
 
 		const tools = this._register(new MutableDisposable());
-
 		this._register(autorunWithStore((reader, store) => {
 
 			const servers = this._servers.read(reader);
@@ -99,7 +144,6 @@ export class McpService extends Disposable implements IMcpService {
 						ctxInst.set(tool.enabled.read(reader));
 					}));
 
-
 					newStore.add(toolsService.registerToolData({
 						id: tool.id,
 						displayName: tool.definition.name,
@@ -159,13 +203,97 @@ export class McpService extends Disposable implements IMcpService {
 		}));
 	}
 
+	public async activateExtensionServers(): Promise<void> {
+		const toActivate = new Set(this._extensionServers.get().filter(r => r.pendingServers === undefined).map(r => r.collectionId));
+
+		await Promise.all([...toActivate].map(collectionId =>
+			this._extensionService.activateByEvent(mcpActivationEvent(collectionId.slice(extensionMcpCollectionPrefix.length)))));
+
+		await Promise.all(this._servers.get()
+			.filter(s => toActivate.has(s.collection.id))
+			.map(server => server.start()));
+	}
+
+	resetCaches(): void {
+		this.userCache.reset();
+		this.workspaceCache.reset();
+	}
+
+	private _onExtensions(extensions: readonly Readonly<IRelaxedExtensionDescription>[]) {
+		const newRecs: IExtensionCollectionsRec[] = [];
+		let newServers: IMcpServer[] = [];
+		for (const extension of extensions) {
+			const collections = extension.contributes?.modelContextServerCollections;
+			if (!collections) {
+				continue;
+			}
+
+			for (const collection of collections) {
+				const id = extensionMcpCollectionPrefix + collection.id;
+				const pendingServers = this.userCache.getServers(id)?.servers.map(server =>
+					this._instantiationService.createInstance(McpServer, { id, label: collection.label, presentation: { order: McpCollectionSortOrder.Extension } }, McpServerDefinition.fromSerialized(server), false, this.userCache));
+
+				newServers = newServers.concat(pendingServers || []);
+				newRecs.push({
+					extensionId: extension.identifier,
+					collectionId: id,
+					pendingServers
+				});
+			}
+		}
+
+		if (newRecs.length) {
+			transaction(tx => {
+				this._extensionServers.set(this._extensionServers.get().concat(newRecs), tx);
+				this._servers.set(this._servers.get().concat(newServers), tx);
+			});
+		}
+	}
+
+	private _onExtensionStatus() {
+		const statuses = this._extensionService.getExtensionsStatus();
+
+		// we move servers out of _extensionServers as they're registered. Once
+		// an extension finishes being activated, if there are any orphaned servers,
+		// then they are removed.
+		const toRemove = new Set<IMcpServer>();
+		const toKeep: IExtensionCollectionsRec[] = [];
+		const currentRecs = this._extensionServers.get();
+		for (const rec of currentRecs) {
+			const isActive = !!statuses[rec.extensionId.value]?.activationTimes;
+			if (!isActive) {
+				toKeep.push(rec); // keep waiting
+				continue;
+			}
+
+			this._extensionCollectionIdsToPersist.add(rec.collectionId);
+			const publishedServers = new Set(this._mcpRegistry.collections.get().find(c => c.id === rec.collectionId)?.serverDefinitions.get().map(s => s.id));
+
+			if (rec.pendingServers) {
+				for (const server of rec.pendingServers) {
+					if (!publishedServers.has(server.definition.id)) {
+						toRemove.add(server);
+					}
+				}
+			}
+
+			if (toKeep.length !== currentRecs.length) {
+				transaction(tx => {
+					this._servers.set(this._servers.get().filter((server) => !toRemove.has(server)), tx);
+					this._extensionServers.set(toKeep, tx);
+				});
+				toRemove.forEach(s => s.dispose());
+			}
+		}
+	}
+
 	public override dispose(): void {
+		this._extensionServers.get().forEach(server => server.pendingServers?.forEach(s => s.dispose()));
 		this._servers.get().forEach(server => server.dispose());
 		super.dispose();
 	}
 }
 
 function defsEqual(server: IMcpServer, def: { serverDefinition: McpServerDefinition; collectionDefinition: McpCollectionDefinition }) {
-	return McpCollectionDefinition.equals(server.collection, def.collectionDefinition) &&
-		McpServerDefinition.equals(server.definition, def.serverDefinition);
+	return server.collection.id === def.collectionDefinition.id && server.definition.id === def.serverDefinition.id;
 }
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
index 825fc7313f41..a265823d0916 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
@@ -8,7 +8,7 @@ import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { equals as objectsEqual } from '../../../../base/common/objects.js';
 import { IObservable, ITransaction } from '../../../../base/common/observable.js';
-import { URI } from '../../../../base/common/uri.js';
+import { URI, UriComponents } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
 import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
@@ -17,6 +17,8 @@ import { IWorkspaceFolderData } from '../../../../platform/workspace/common/work
 import { McpServerRequestHandler } from './mcpServerRequestHandler.js';
 import { MCP } from './modelContextProtocol.js';
 
+export const extensionMcpCollectionPrefix = 'ext.';
+
 /**
  * An McpCollection contains McpServers. There may be multiple collections for
  * different locations servers are discovered.
@@ -46,7 +48,8 @@ export interface McpCollectionDefinition {
 export const enum McpCollectionSortOrder {
 	Workspace = 0,
 	User = 100,
-	Filesystem = 200,
+	Extension = 200,
+	Filesystem = 300,
 
 	RemotePenalty = 50,
 }
@@ -75,14 +78,30 @@ export interface McpServerDefinition {
 	/** Descriptor defining how the configuration should be launched. */
 	readonly launch: McpServerLaunch;
 	/** If set, allows configuration variables to be resolved in the {@link launch} with the given context */
-	readonly variableReplacement?: {
-		section?: string; // e.g. 'mcp'
-		folder?: IWorkspaceFolderData;
-		target?: ConfigurationTarget;
-	};
+	readonly variableReplacement?: McpServerDefinitionVariableReplacement;
 }
 
 export namespace McpServerDefinition {
+	export interface Serialized {
+		readonly id: string;
+		readonly label: string;
+		readonly launch: McpServerLaunch.Serialized;
+		readonly variableReplacement?: McpServerDefinitionVariableReplacement.Serialized;
+	}
+
+	export function toSerialized(def: McpServerDefinition): McpServerDefinition.Serialized {
+		return def;
+	}
+
+	export function fromSerialized(def: McpServerDefinition.Serialized): McpServerDefinition {
+		return {
+			id: def.id,
+			label: def.label,
+			launch: McpServerLaunch.fromSerialized(def.launch),
+			variableReplacement: def.variableReplacement ? McpServerDefinitionVariableReplacement.fromSerialized(def.variableReplacement) : undefined,
+		};
+	}
+
 	export function equals(a: McpServerDefinition, b: McpServerDefinition): boolean {
 		return a.id === b.id
 			&& a.label === b.label
@@ -91,16 +110,63 @@ export namespace McpServerDefinition {
 	}
 }
 
+
+export interface McpServerDefinitionVariableReplacement {
+	section?: string; // e.g. 'mcp'
+	folder?: IWorkspaceFolderData;
+	target?: ConfigurationTarget;
+}
+
+export namespace McpServerDefinitionVariableReplacement {
+	export interface Serialized {
+		section?: string;
+		folder?: { name: string; index: number; uri: UriComponents };
+		target?: ConfigurationTarget;
+	}
+
+	export function toSerialized(def: McpServerDefinitionVariableReplacement): McpServerDefinitionVariableReplacement.Serialized {
+		return def;
+	}
+
+	export function fromSerialized(def: McpServerDefinitionVariableReplacement.Serialized): McpServerDefinitionVariableReplacement {
+		return {
+			section: def.section,
+			folder: def.folder ? { ...def.folder, uri: URI.revive(def.folder.uri) } : undefined,
+			target: def.target,
+		};
+	}
+}
+
 export interface IMcpService {
 	_serviceBrand: undefined;
 	readonly servers: IObservable<readonly IMcpServer[]>;
+
+	/** Resets the cached tools. */
+	resetCaches(): void;
+
+	/** Set if there are extensions that register MCP servers that have never been activated. */
+	readonly hasExtensionsWithUnknownServers: IObservable<boolean>;
+	/** Activatese extensions and runs their MCP servers. */
+	activateExtensionServers(): Promise<void>;
 }
 
 export const IMcpService = createDecorator<IMcpService>('IMcpService');
 
+export interface McpCollectionReference {
+	id: string;
+	label: string;
+	presentation?: McpCollectionDefinition['presentation'];
+}
+
+export interface McpDefinitionReference {
+	id: string;
+	label: string;
+}
+
 export interface IMcpServer extends IDisposable {
-	readonly collection: McpCollectionDefinition;
-	readonly definition: McpServerDefinition;
+	readonly collection: McpCollectionReference;
+	readonly definition: McpDefinitionReference;
+	readonly connection: IObservable<IMcpServerConnection | undefined>;
 	readonly connectionState: IObservable<McpConnectionState>;
 	/**
 	 * Reflects the MCP server trust state. True if trusted, false if untrusted,
@@ -185,6 +251,31 @@ export type McpServerLaunch =
 	| McpServerTransportStdio
 	| McpServerTransportSSE;
 
+export namespace McpServerLaunch {
+	export type Serialized =
+		| { type: McpServerTransportType.SSE; url: string }
+		| { type: McpServerTransportType.Stdio; cwd: UriComponents | undefined; command: string; args: readonly string[]; env: Record<string, string | number | null> };
+
+	export function toSerialized(launch: McpServerLaunch): McpServerLaunch.Serialized {
+		return launch;
+	}
+
+	export function fromSerialized(launch: McpServerLaunch.Serialized): McpServerLaunch {
+		switch (launch.type) {
+			case McpServerTransportType.SSE:
+				return { type: launch.type, url: launch.url };
+			case McpServerTransportType.Stdio:
+				return {
+					type: launch.type,
+					cwd: launch.cwd ? URI.revive(launch.cwd) : undefined,
+					command: launch.command,
+					args: launch.args,
+					env: launch.env,
+				};
+		}
+	}
+}
+
 /**
  * An instance that manages a connection to an MCP server. It can be started,
  * stopped, and restarted. Once started and in a running state, it will
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 cb5aeba14e88..6782a028d8bf 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
@@ -6,7 +6,7 @@
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 import { cloneAndChange } from '../../../../../base/common/objects.js';
-import { observableValue } from '../../../../../base/common/observable.js';
+import { ISettableObservable, observableValue } from '../../../../../base/common/observable.js';
 import { upcast } from '../../../../../base/common/types.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
@@ -152,7 +152,7 @@ suite('Workbench - MCP - Registry', () => {
 	let testStorageService: TestStorageService;
 	let testConfigResolverService: TestConfigurationResolverService;
 	let testDialogService: TestDialogService;
-	let testCollection: McpCollectionDefinition;
+	let testCollection: McpCollectionDefinition & { serverDefinitions: ISettableObservable<McpServerDefinition[]> };
 	let baseDefinition: McpServerDefinition;
 
 	setup(() => {
@@ -238,8 +238,10 @@ suite('Workbench - MCP - Registry', () => {
 
 		const delegate = new TestMcpHostDelegate();
 		store.add(registry.registerDelegate(delegate));
+		testCollection.serverDefinitions.set([definition], undefined);
+		store.add(registry.registerCollection(testCollection));
 
-		const connection = await registry.resolveConnection({ collection: testCollection, definition }) as McpServerConnection;
+		const connection = await registry.resolveConnection({ collectionRef: testCollection, definitionRef: definition }) as McpServerConnection;
 
 		assert.ok(connection);
 		assert.strictEqual(connection.definition, definition);
@@ -247,7 +249,7 @@ suite('Workbench - MCP - Registry', () => {
 		assert.strictEqual((connection.launchDefinition as any).env.PATH, 'interactiveValue0');
 		connection.dispose();
 
-		const connection2 = await registry.resolveConnection({ collection: testCollection, definition }) as McpServerConnection;
+		const connection2 = await registry.resolveConnection({ collectionRef: testCollection, definitionRef: definition }) as McpServerConnection;
 
 		assert.ok(connection2);
 		assert.strictEqual((connection2.launchDefinition as any).env.PATH, 'interactiveValue0');
@@ -255,7 +257,7 @@ suite('Workbench - MCP - Registry', () => {
 
 		registry.clearSavedInputs();
 
-		const connection3 = await registry.resolveConnection({ collection: testCollection, definition }) as McpServerConnection;
+		const connection3 = await registry.resolveConnection({ collectionRef: testCollection, definitionRef: definition }) as McpServerConnection;
 
 		assert.ok(connection3);
 		assert.strictEqual((connection3.launchDefinition as any).env.PATH, 'interactiveValue4');
@@ -267,10 +269,13 @@ suite('Workbench - MCP - Registry', () => {
 			const delegate = new TestMcpHostDelegate();
 			store.add(registry.registerDelegate(delegate));
 		});
+
 		test('resolveConnection connects to server when trusted by default', async () => {
 			const definition = { ...baseDefinition };
+			store.add(registry.registerCollection(testCollection));
+			testCollection.serverDefinitions.set([definition], undefined);
 
-			const connection = await registry.resolveConnection({ collection: testCollection, definition });
+			const connection = await registry.resolveConnection({ collectionRef: testCollection, definitionRef: definition });
 
 			assert.ok(connection);
 			assert.strictEqual(testDialogService.promptSpy.called, false);
@@ -284,12 +289,14 @@ suite('Workbench - MCP - Registry', () => {
 			};
 
 			const definition = { ...baseDefinition };
+			store.add(registry.registerCollection(untrustedCollection));
+			testCollection.serverDefinitions.set([definition], undefined);
 
 			testDialogService.setPromptResult(true);
 
 			const connection = await registry.resolveConnection({
-				collection: untrustedCollection,
-				definition
+				collectionRef: untrustedCollection,
+				definitionRef: definition
 			});
 
 			assert.ok(connection);
@@ -298,8 +305,8 @@ suite('Workbench - MCP - Registry', () => {
 
 			testDialogService.promptSpy.resetHistory();
 			const connection2 = await registry.resolveConnection({
-				collection: untrustedCollection,
-				definition
+				collectionRef: untrustedCollection,
+				definitionRef: definition
 			});
 
 			assert.ok(connection2);
@@ -314,12 +321,14 @@ suite('Workbench - MCP - Registry', () => {
 			};
 
 			const definition = { ...baseDefinition };
+			store.add(registry.registerCollection(untrustedCollection));
+			testCollection.serverDefinitions.set([definition], undefined);
 
 			testDialogService.setPromptResult(false);
 
 			const connection = await registry.resolveConnection({
-				collection: untrustedCollection,
-				definition
+				collectionRef: untrustedCollection,
+				definitionRef: definition
 			});
 
 			assert.strictEqual(connection, undefined);
@@ -327,8 +336,8 @@ suite('Workbench - MCP - Registry', () => {
 
 			testDialogService.promptSpy.resetHistory();
 			const connection2 = await registry.resolveConnection({
-				collection: untrustedCollection,
-				definition
+				collectionRef: untrustedCollection,
+				definitionRef: definition
 			});
 
 			assert.strictEqual(connection2, undefined);
@@ -342,12 +351,14 @@ suite('Workbench - MCP - Registry', () => {
 			};
 
 			const definition = { ...baseDefinition };
+			store.add(registry.registerCollection(untrustedCollection));
+			testCollection.serverDefinitions.set([definition], undefined);
 
 			testDialogService.setPromptResult(false);
 
 			const connection1 = await registry.resolveConnection({
-				collection: untrustedCollection,
-				definition
+				collectionRef: untrustedCollection,
+				definitionRef: definition
 			});
 
 			assert.strictEqual(connection1, undefined);
@@ -356,8 +367,8 @@ suite('Workbench - MCP - Registry', () => {
 			testDialogService.setPromptResult(true);
 
 			const connection2 = await registry.resolveConnection({
-				collection: untrustedCollection,
-				definition,
+				collectionRef: untrustedCollection,
+				definitionRef: definition,
 				forceTrust: true
 			});
 
@@ -367,8 +378,8 @@ suite('Workbench - MCP - Registry', () => {
 
 			testDialogService.promptSpy.resetHistory();
 			const connection3 = await registry.resolveConnection({
-				collection: untrustedCollection,
-				definition
+				collectionRef: untrustedCollection,
+				definitionRef: definition
 			});
 
 			assert.ok(connection3);
diff --git a/src/vs/workbench/contrib/mcp/test/common/mcpService.test.ts b/src/vs/workbench/contrib/mcp/test/common/mcpService.test.ts
new file mode 100644
index 000000000000..50004b7424ef
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpService.test.ts
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { Emitter } from '../../../../../base/common/event.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { ISettableObservable, observableValue } from '../../../../../base/common/observable.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier, IExtensionDescription } from '../../../../../platform/extensions/common/extensions.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 { ILoggerService } from '../../../../../platform/log/common/log.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
+import { IStorageService, StorageScope } from '../../../../../platform/storage/common/storage.js';
+import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
+import { IExtensionService, IExtensionsStatus, NullExtensionService } from '../../../../services/extensions/common/extensions.js';
+import { TestContextService, TestLoggerService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
+import { ILanguageModelToolsService } from '../../../chat/common/languageModelToolsService.js';
+import { IMcpRegistry } from '../../common/mcpRegistryTypes.js';
+import { McpService } from '../../common/mcpService.js';
+import { McpCollectionSortOrder } from '../../common/mcpTypes.js';
+
+class TestExtensionService extends NullExtensionService {
+	private readonly store = new DisposableStore();
+
+	public extensionStatuses = new Map<string, { activationTimes?: object }>();
+	public firedActivationEvents = new Set<string>();
+
+	public onDidChangeExtensionsEmitter = this.store.add(new Emitter<{ added: IExtensionDescription[]; removed: IExtensionDescription[] }>());
+	public override onDidChangeExtensions = this.onDidChangeExtensionsEmitter.event;
+
+	public onDidChangeExtensionStatusEmitter = this.store.add(new Emitter<any>());
+	public override onDidChangeExtensionsStatus = this.onDidChangeExtensionStatusEmitter.event;
+
+	override getExtensionsStatus(): { [id: string]: IExtensionsStatus } {
+		const result: { [id: string]: IExtensionsStatus } = {};
+		this.extensionStatuses.forEach((status, id) => {
+			result[id] = status as Partial<IExtensionsStatus> as IExtensionsStatus;
+		});
+		return result;
+	}
+
+	override activateByEvent(activationEvent: string): Promise<void> {
+		this.firedActivationEvents.add(activationEvent);
+		return Promise.resolve();
+	}
+
+	dispose() {
+		this.store.dispose();
+	}
+}
+
+class TestMcpService extends McpService {
+	public get internalUserCache() {
+		return this.userCache;
+	}
+
+	public get internalExtensionServers() {
+		return this._extensionServers;
+	}
+}
+
+suite('Workbench - MCP - Service', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instantiationService: TestInstantiationService;
+	let mockExtensionService: TestExtensionService;
+	let mockMcpRegistry: Partial<IMcpRegistry>;
+	let mockLanguageModelToolsService: Partial<ILanguageModelToolsService>;
+	let testStorageService: TestStorageService;
+	let mcpService: TestMcpService;
+
+	// Utility function to create a mock extension
+	const createExtension = (id: string, collections?: Array<{ id: string; label: string }>) => {
+		return {
+			identifier: new ExtensionIdentifier(id),
+			contributes: collections ? {
+				modelContextServerCollections: collections
+			} : undefined
+		};
+	};
+
+	setup(() => {
+		// Mock extension service
+		mockExtensionService = store.add(new TestExtensionService());
+
+		// Mock MCP registry
+		mockMcpRegistry = {
+			collections: observableValue('collections', [])
+		};
+
+		// Mock language model tools service
+		mockLanguageModelToolsService = {
+			registerToolData: () => ({ dispose: () => { } }),
+			registerToolImplementation: () => ({ dispose: () => { } })
+		};
+
+		// Create test storage service
+		testStorageService = store.add(new TestStorageService());
+
+		// Create service collection
+		const services = new ServiceCollection(
+			[IExtensionService, mockExtensionService],
+			[IMcpRegistry, mockMcpRegistry],
+			[ILanguageModelToolsService, mockLanguageModelToolsService],
+			[IContextKeyService, new MockContextKeyService()],
+			[IStorageService, testStorageService],
+			[ILoggerService, store.add(new TestLoggerService())],
+			[IProductService, { nameShort: 'VSCode Test' } as IProductService],
+			[IWorkspaceContextService, new TestContextService()]
+		);
+
+		// Create instantiation service
+		instantiationService = store.add(new TestInstantiationService(services));
+
+		// Create McpService instance
+		mcpService = instantiationService.createInstance(TestMcpService);
+		store.add(mcpService);
+	});
+
+	test('should initialize with no servers', () => {
+		assert.strictEqual(mcpService.servers.get().length, 0);
+	});
+
+	test('should have extension servers when extensions with collections are loaded', async () => {
+		// Create a test extension with MCP collections
+		const ext1 = createExtension('ext1', [
+			{ id: 'collection1', label: 'Collection 1' }
+		]);
+
+		// Set cached servers for this collection
+		mcpService.internalUserCache.storeServers('collection1', {
+			servers: [{
+				id: 'server1',
+				label: 'Server 1',
+				launch: { type: 1, command: 'test', args: [], env: {}, cwd: undefined }
+			}]
+		});
+
+		// Trigger extension loaded
+		mockExtensionService.onDidChangeExtensionsEmitter.fire({ added: [ext1 as any], removed: [] });
+
+		// Should have one server in the servers list
+		assert.strictEqual(mcpService.servers.get().length, 1);
+		assert.strictEqual(mcpService.servers.get()[0].definition.id, 'server1');
+
+		// Should be loaded from cache but not activated yet
+		assert.strictEqual(mcpService.internalExtensionServers.get().length, 1);
+		assert.strictEqual(mcpService.internalExtensionServers.get()[0].collectionId, 'collection1');
+		assert.strictEqual(mcpService.internalExtensionServers.get()[0].pendingServers?.length, 1);
+	});
+
+	test('should remove pending servers once extension is activated', async () => {
+		// Create a test extension with MCP collections
+		const ext1 = createExtension('ext1', [
+			{ id: 'collection1', label: 'Collection 1' }
+		]);
+
+		// Set cached servers for this collection
+		mcpService.internalUserCache.storeServers('collection1', {
+			servers: [{
+				id: 'server1',
+				label: 'Server 1',
+				launch: { type: 1, command: 'test', args: [], env: {}, cwd: undefined }
+			}]
+		});
+
+		// Add the extension
+		mockExtensionService.onDidChangeExtensionsEmitter.fire({ added: [ext1 as any], removed: [] });
+
+		// Should have one server in the servers list (from cache)
+		assert.strictEqual(mcpService.servers.get().length, 1);
+		assert.strictEqual(mcpService.internalExtensionServers.get().length, 1);
+		assert.strictEqual(mcpService.internalExtensionServers.get()[0].pendingServers?.length, 1);
+
+		// Now simulate extension activation (but it doesn't register the server)
+		mockExtensionService.extensionStatuses.set('ext1', { activationTimes: {} });
+		mockExtensionService.onDidChangeExtensionStatusEmitter.fire(undefined);
+
+		// The server should be removed since it wasn't registered by the extension
+		assert.strictEqual(mcpService.servers.get().length, 0);
+		assert.strictEqual(mcpService.internalExtensionServers.get().length, 0);
+	});
+
+	test('should keep servers that are registered by activated extension', async () => {
+		// Create a test extension with MCP collections
+		const ext1 = createExtension('ext1', [
+			{ id: 'collection1', label: 'Collection 1' }
+		]);
+
+		// Set cached servers for this collection
+		mcpService.internalUserCache.storeServers('collection1', {
+			servers: [{
+				id: 'server1',
+				label: 'Server 1',
+				launch: { type: 1, command: 'test', args: [], env: {}, cwd: undefined }
+			}]
+		});
+
+		// Add the extension
+		mockExtensionService.onDidChangeExtensionsEmitter.fire({ added: [ext1 as any], removed: [] });
+
+
+		// Register a collection with the same server id through the registry
+		const mockCollection = {
+			id: 'collection1',
+			label: 'Collection 1',
+			remoteAuthority: null,
+			serverDefinitions: observableValue('serverDefs', [{
+				id: 'server1',
+				label: 'Server 1',
+				launch: { type: 1, command: 'test', args: [], env: {}, cwd: undefined }
+			}]),
+			isTrustedByDefault: true,
+			scope: StorageScope.APPLICATION,
+			presentation: { order: McpCollectionSortOrder.Extension }
+		};
+
+		(mockMcpRegistry!.collections as ISettableObservable<any>).set([mockCollection], undefined);
+
+		// Now simulate extension activation
+		mockExtensionService.extensionStatuses.set('ext1', { activationTimes: {} });
+		mockExtensionService.onDidChangeExtensionStatusEmitter.fire(undefined);
+
+		// The server should still be there since it was registered
+		assert.strictEqual(mcpService.servers.get().length, 1);
+		assert.strictEqual(mcpService.internalExtensionServers.get().length, 0); // But removed from extension servers
+	});
+
+	test('activateExtensionServers should activate all extension events', async () => {
+		// Create extensions with MCP collections
+		const ext1 = createExtension('ext1', [{ id: 'collection1', label: 'Collection 1' }]);
+		const ext2 = createExtension('ext2', [{ id: 'collection2', label: 'Collection 2' }]);
+
+		// Add the extensions
+		mockExtensionService.onDidChangeExtensionsEmitter.fire({ added: [ext1 as any, ext2 as any], removed: [] });
+
+		// Verify activation events aren't done yet
+		assert.strictEqual(mockExtensionService.firedActivationEvents.has('onMcpCollection:collection1'), false);
+		assert.strictEqual(mockExtensionService.firedActivationEvents.has('onMcpCollection:collection2'), false);
+
+		// Call activateExtensionServers
+		await mcpService.activateExtensionServers();
+
+		// Verify activation events were triggered
+		assert.strictEqual(mockExtensionService.firedActivationEvents.has('onMcpCollection:collection1'), true);
+		assert.strictEqual(mockExtensionService.firedActivationEvents.has('onMcpCollection:collection2'), true);
+	});
+
+	test('hasExtensionsWithUnknownServers should be true when extensions have unactivated servers', () => {
+		// Initially should be false
+		assert.strictEqual(mcpService.hasExtensionsWithUnknownServers.get(), false);
+
+		// Create a test extension with MCP collections
+		const ext1 = createExtension('ext1', [
+			{ id: 'collection1', label: 'Collection 1' }
+		]);
+
+		// Add the extension
+		mockExtensionService.onDidChangeExtensionsEmitter.fire({ added: [ext1 as any], removed: [] });
+
+		// Should be true now
+		assert.strictEqual(mcpService.hasExtensionsWithUnknownServers.get(), true);
+
+		// Activate the extension
+		mockExtensionService.extensionStatuses.set('ext1', { activationTimes: {} });
+		mockExtensionService.onDidChangeExtensionStatusEmitter.fire(undefined);
+
+		// Should be false again
+		assert.strictEqual(mcpService.hasExtensionsWithUnknownServers.get(), false);
+	});
+});
diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
index e4c9ad45922d..859b97691233 100644
--- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
+++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -403,6 +403,11 @@ export const schema: IJSONSchema = {
 						body: 'onTerminalCompletionsRequested',
 						description: nls.localize('vscode.extension.activationEvents.onTerminalCompletionsRequested', 'An activation event emitted when terminal completions are requested.'),
 					},
+					{
+						label: 'onMcpCollection',
+						description: nls.localize('vscode.extension.activationEvents.onMcpCollection', 'An activation event emitted whenver a tool from the MCP server is requested.'),
+						body: 'onMcpCollection:${2:collectionId}',
+					},
 					{
 						label: '*',
 						description: nls.localize('vscode.extension.activationEvents.star', 'An activation event emitted on VS Code startup. To ensure a great end user experience, please use this activation event in your extension only when no other activation events combination works in your use-case.'),
diff --git a/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts b/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts
index 2e3425da2d19..df57072d89d7 100644
--- a/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts
@@ -37,6 +37,6 @@ declare module 'vscode' {
 	}
 
 	namespace lm {
-		export function registerMcpConfigurationProvider(provider: McpConfigurationProvider, metadata?: { label: string }): Disposable;
+		export function registerMcpConfigurationProvider(id: string, provider: McpConfigurationProvider): Disposable;
 	}
 }

From 2c7a0283817355c81e1b106f34d911762950a4d9 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Thu, 13 Mar 2025 20:34:27 -0700
Subject: [PATCH 0919/1815] Fix inline chat after updating to use "edit2" in
 the extension (#243507)

Bump API version because these have to be aligned
---
 src/vs/platform/extensions/common/extensionsApiProposals.ts   | 2 +-
 .../inlineChat/browser/inlineChatSessionServiceImpl.ts        | 4 ++--
 src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index 7b91bd3f0c38..d098cd7c5aec 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -33,7 +33,7 @@ const _allApiProposals = {
 	},
 	chatParticipantPrivate: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts',
-		version: 5
+		version: 6
 	},
 	chatProvider: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatProvider.d.ts',
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
index 96f8fc6eedec..7765688673b9 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
@@ -409,10 +409,10 @@ export class InlineChatEnabler {
 
 		const updateAgent = () => {
 			const agent = chatAgentService.getDefaultAgent(ChatAgentLocation.Editor);
-			if (agent?.locations.length === 1) {
+			if (agent?.id === 'github.copilot.editor') {
 				this._ctxHasProvider.set(true);
 				this._ctxHasProvider2.reset();
-			} else if (agent?.locations.includes(ChatAgentLocation.EditingSession)) {
+			} else if (agent?.id === 'github.copilot.editingSessionEditor') {
 				this._ctxHasProvider.reset();
 				this._ctxHasProvider2.set(true);
 			} else {
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts
index 6a60318a2411..0ed00651e95a 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: 5
+// version: 6
 
 declare module 'vscode' {
 

From 76be4c5d6709c10c3e6e759b8a8e5841827aceb5 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Thu, 13 Mar 2025 22:03:16 -0700
Subject: [PATCH 0920/1815] Fix "open chat in editor" not working when no chats
 are open (#243519)

Fix microsoft/vscode-copilot-release#6438
---
 .../contrib/chat/browser/actions/chatMoveActions.ts      | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts
index e732c01efbbb..0d82ca6edf29 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts
@@ -100,17 +100,12 @@ async function executeMoveToAction(accessor: ServicesAccessor, moveTo: MoveToNew
 
 	const widget = (_sessionId ? widgetService.getWidgetBySessionId(_sessionId) : undefined)
 		?? widgetService.lastFocusedWidget;
-	if (!widget || widget.location !== ChatAgentLocation.Panel) {
+	if (!widget || !widget.viewModel || widget.location !== ChatAgentLocation.Panel) {
 		await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
 		return;
 	}
 
-	const viewModel = widget.viewModel;
-	if (!viewModel) {
-		return;
-	}
-
-	const sessionId = viewModel.sessionId;
+	const sessionId = widget.viewModel.sessionId;
 	const viewState = widget.getViewState();
 	widget.clear();
 

From 71fe9aa9d2c784cef9a5d70de62cc0ba67eecbed Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Thu, 13 Mar 2025 22:42:20 -0700
Subject: [PATCH 0921/1815] fixup the bugs

---
 src/vs/workbench/api/browser/mainThreadMcp.ts |   3 +
 .../workbench/api/common/extHost.protocol.ts  |   1 +
 src/vs/workbench/api/common/extHostMcp.ts     |  14 +-
 .../contrib/mcp/common/mcpRegistryTypes.ts    |   1 +
 .../workbench/contrib/mcp/common/mcpServer.ts |   9 +-
 .../contrib/mcp/common/mcpService.ts          | 170 +++++++++++-------
 6 files changed, 127 insertions(+), 71 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadMcp.ts b/src/vs/workbench/api/browser/mainThreadMcp.ts
index 30f43c09274a..b18bebf211f0 100644
--- a/src/vs/workbench/api/browser/mainThreadMcp.ts
+++ b/src/vs/workbench/api/browser/mainThreadMcp.ts
@@ -32,6 +32,9 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 		super();
 		const proxy = _extHostContext.getProxy(ExtHostContext.ExtHostMcp);
 		this._register(this._mcpRegistry.registerDelegate({
+			waitForInitialProviderPromises() {
+				return proxy.$waitForInitialCollectionProviders();
+			},
 			canStart(collection, serverDefinition) {
 				// todo: SSE MPC servers without a remote authority could be served from the renderer
 				if (collection.remoteAuthority !== _extHostContext.remoteAuthority) {
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 75e9a78f132f..6cdf404108b5 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -2974,6 +2974,7 @@ export interface ExtHostMcpShape {
 	$startMcp(id: number, launch: McpServerLaunch): void;
 	$stopMcp(id: number): void;
 	$sendMessage(id: number, message: string): void;
+	$waitForInitialCollectionProviders(): Promise<void>;
 }
 
 export interface MainThreadMcpShape {
diff --git a/src/vs/workbench/api/common/extHostMcp.ts b/src/vs/workbench/api/common/extHostMcp.ts
index 56d227152908..c5a3c011551c 100644
--- a/src/vs/workbench/api/common/extHostMcp.ts
+++ b/src/vs/workbench/api/common/extHostMcp.ts
@@ -21,6 +21,7 @@ export interface IExtHostMpcService extends ExtHostMcpShape {
 
 export class ExtHostMcpService implements IExtHostMpcService {
 	protected _proxy: MainThreadMcpShape;
+	private readonly _initialProviderPromises = new Set<Promise<void>>();
 
 	constructor(
 		@IExtHostRpcService extHostRpc: IExtHostRpcService,
@@ -41,6 +42,10 @@ export class ExtHostMcpService implements IExtHostMpcService {
 		// no-op
 	}
 
+	async $waitForInitialCollectionProviders(): Promise<void> {
+		await Promise.all(this._initialProviderPromises);
+	}
+
 	registerMcpConfigurationProvider(extension: IExtensionDescription, id: string, provider: vscode.McpConfigurationProvider): IDisposable {
 		const store = new DisposableStore();
 
@@ -95,7 +100,14 @@ export class ExtHostMcpService implements IExtHostMpcService {
 			store.add(provider.onDidChange(update));
 		}
 
-		setTimeout(update, 0);
+		const promise = new Promise<void>(resolve => {
+			setTimeout(() => update().finally(() => {
+				this._initialProviderPromises.delete(promise);
+				resolve();
+			}), 0);
+		});
+
+		this._initialProviderPromises.add(promise);
 
 		return store;
 	}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
index 3922d1883256..df58dce159d2 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
@@ -22,6 +22,7 @@ export interface IMcpMessageTransport extends IDisposable {
 }
 
 export interface IMcpHostDelegate {
+	waitForInitialProviderPromises(): Promise<void>;
 	canStart(collectionDefinition: McpCollectionDefinition, serverDefinition: McpServerDefinition): boolean;
 	start(collectionDefinition: McpCollectionDefinition, serverDefinition: McpServerDefinition, resolvedLaunch: McpServerLaunch): IMcpMessageTransport;
 }
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServer.ts b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
index 58145d597aa0..9577574bac6d 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServer.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
@@ -14,7 +14,7 @@ import { IExtensionService } from '../../../services/extensions/common/extension
 import { mcpActivationEvent } from './mcpConfiguration.js';
 import { IMcpRegistry } from './mcpRegistryTypes.js';
 import { McpServerRequestHandler } from './mcpServerRequestHandler.js';
-import { IMcpServer, IMcpServerConnection, IMcpTool, McpCollectionReference, McpConnectionFailedError, McpConnectionState, McpDefinitionReference, McpServerDefinition, McpServerToolsState } from './mcpTypes.js';
+import { extensionMcpCollectionPrefix, IMcpServer, IMcpServerConnection, IMcpTool, McpCollectionReference, McpConnectionFailedError, McpConnectionState, McpDefinitionReference, McpServerDefinition, McpServerToolsState } from './mcpTypes.js';
 import { MCP } from './modelContextProtocol.js';
 
 
@@ -191,8 +191,11 @@ export class McpServer extends Disposable implements IMcpServer {
 
 	public start(isFromInteraction?: boolean): Promise<McpConnectionState> {
 		return this._connectionSequencer.queue(async () => {
-			if (this._requiresExtensionActivation && !this._extensionService.activationEventIsDone(mcpActivationEvent(this.collection.id))) {
-				await this._extensionService.activateByEvent(mcpActivationEvent(this.collection.id));
+			const activationEvent = mcpActivationEvent(this.collection.id.slice(extensionMcpCollectionPrefix.length));
+			if (this._requiresExtensionActivation && !this._extensionService.activationEventIsDone(activationEvent)) {
+				await this._extensionService.activateByEvent(activationEvent);
+				await Promise.all(this._mcpRegistry.delegates
+					.map(r => r.waitForInitialProviderPromises()));
 				// This can happen if the server was created from a cached MCP server seen
 				// from an extension, but then it wasn't registered when the extension activated.
 				if (this._store.isDisposed) {
diff --git a/src/vs/workbench/contrib/mcp/common/mcpService.ts b/src/vs/workbench/contrib/mcp/common/mcpService.ts
index d97d8f328c2a..3908760c6ea5 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpService.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpService.ts
@@ -11,6 +11,7 @@ import { localize } from '../../../../nls.js';
 import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { ExtensionIdentifier, IRelaxedExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
@@ -37,8 +38,12 @@ export class McpService extends Disposable implements IMcpService {
 
 	private readonly _extensionCollectionIdsToPersist = new Set<string>();
 	protected readonly _extensionServers = observableValue<readonly IExtensionCollectionsRec[]>(this, []);
-	private readonly _servers = observableValue<readonly IMcpServer[]>(this, []);
-	public readonly servers: IObservable<readonly IMcpServer[]> = this._servers;
+	private readonly _publishedServers = observableValue<readonly IMcpServer[]>(this, []);
+	public readonly servers: IObservable<readonly IMcpServer[]> = derived(reader => {
+		const extensionServers = this._extensionServers.read(reader).flatMap(e => e.pendingServers || []);
+		const publishedServers = this._publishedServers.read(reader);
+		return [...extensionServers, ...publishedServers];
+	});
 
 	public readonly hasExtensionsWithUnknownServers = derived(reader => this._extensionServers.read(reader).some(r => r.pendingServers === undefined));
 
@@ -53,16 +58,15 @@ export class McpService extends Disposable implements IMcpService {
 		@IProductService productService: IProductService,
 		@IExtensionService private readonly _extensionService: IExtensionService,
 		@IStorageService storageService: IStorageService,
+		@ILogService private readonly _logService: ILogService,
 	) {
 		super();
 
 		this._register(storageService.onWillSaveState(() => {
 			for (const collectionId of this._extensionCollectionIdsToPersist) {
 				const publishedServers = this._mcpRegistry.collections.get().find(c => c.id === collectionId)?.serverDefinitions.get();
-				if (publishedServers?.length) {
+				if (publishedServers) {
 					this.userCache.storeServers(collectionId, { servers: publishedServers.map(McpServerDefinition.toSerialized) });
-				} else {
-					this.userCache.storeServers(collectionId, undefined);
 				}
 			}
 		}));
@@ -70,45 +74,15 @@ export class McpService extends Disposable implements IMcpService {
 		this.userCache = this._register(_instantiationService.createInstance(McpServerMetadataCache, StorageScope.PROFILE));
 		this.workspaceCache = this._register(_instantiationService.createInstance(McpServerMetadataCache, StorageScope.WORKSPACE));
 
-		const definitionsObservable = derived(reader => {
-			const collections = this._mcpRegistry.collections.read(reader);
-			return collections.flatMap(collectionDefinition => collectionDefinition.serverDefinitions.read(reader).map(serverDefinition => ({
-				serverDefinition,
-				collectionDefinition,
-			})));
-		});
-
-		const updateThrottle = this._store.add(new RunOnceScheduler(() => {
-			const definitions = definitionsObservable.get();
-
-			const nextDefinitions = new Set(definitions);
-			const currentServers = this._servers.get();
-			const nextServers: IMcpServer[] = [];
-			for (const server of currentServers) {
-				const match = definitions.find(d => defsEqual(server, d));
-				if (match) {
-					nextDefinitions.delete(match);
-					nextServers.push(server);
-					const connection = server.connection.get();
-					// if the definition was modified, stop the server; it'll be restarted again on-demand
-					if (connection && !McpServerDefinition.equals(connection.definition, match.serverDefinition)) {
-						server.stop();
-					}
-				} else {
-					server.dispose();
-				}
-			}
-			for (const def of nextDefinitions) {
-				nextServers.push(_instantiationService.createInstance(McpServer, def.collectionDefinition, def.serverDefinition, false, def.collectionDefinition.scope === StorageScope.WORKSPACE ? this.workspaceCache : this.userCache));
-			}
-
-			this._servers.set(nextServers, undefined);
-		}, 500));
+		const updateThrottle = this._store.add(new RunOnceScheduler(() => this._updateCollectedServers(), 500));
 
 		// Throttle changes so that if a collection is changed, or a server is
 		// unregistered/registered, we don't stop servers unnecessarily.
 		this._register(autorun(reader => {
-			definitionsObservable.read(reader);
+			for (const collection of this._mcpRegistry.collections.read(reader)) {
+				collection.serverDefinitions.read(reader);
+			}
+			this._extensionServers.read(reader);
 			updateThrottle.schedule(500);
 		}));
 
@@ -126,7 +100,7 @@ export class McpService extends Disposable implements IMcpService {
 		const tools = this._register(new MutableDisposable());
 		this._register(autorunWithStore((reader, store) => {
 
-			const servers = this._servers.read(reader);
+			const servers = this._publishedServers.read(reader);
 
 			// TODO@jrieken wasteful, needs some diff'ing/change-info
 			const newStore = new DisposableStore();
@@ -209,19 +183,84 @@ export class McpService extends Disposable implements IMcpService {
 		await Promise.all([...toActivate].map(collectionId =>
 			this._extensionService.activateByEvent(mcpActivationEvent(collectionId.slice(extensionMcpCollectionPrefix.length)))));
 
-		await Promise.all(this._servers.get()
+		await this._waitForInitialProvidersToPublish();
+
+		await Promise.all(this._publishedServers.get()
 			.filter(s => toActivate.has(s.collection.id))
 			.map(server => server.start()));
 	}
 
-	resetCaches(): void {
+	public resetCaches(): void {
 		this.userCache.reset();
 		this.workspaceCache.reset();
 	}
 
+	private async _waitForInitialProvidersToPublish() {
+		await Promise.all(this._mcpRegistry.delegates
+			.map(r => r.waitForInitialProviderPromises()));
+	}
+
+	private _updateCollectedServers() {
+		const definitions = this._mcpRegistry.collections.get().flatMap(collectionDefinition =>
+			collectionDefinition.serverDefinitions.get().map(serverDefinition => ({
+				serverDefinition,
+				collectionDefinition,
+			}))
+		);
+
+		const nextDefinitions = new Set(definitions);
+		const currentServers = this._publishedServers.get();
+		const nextServers: IMcpServer[] = [];
+		const pushMatch = (match: (typeof definitions)[0], server: IMcpServer) => {
+			nextDefinitions.delete(match);
+			nextServers.push(server);
+			const connection = server.connection.get();
+			// if the definition was modified, stop the server; it'll be restarted again on-demand
+			if (connection && !McpServerDefinition.equals(connection.definition, match.serverDefinition)) {
+				server.stop();
+				this._logService.debug(`MCP server ${server.definition.id} stopped because the definition changed`);
+			}
+		};
+
+		// Transfer over any servers that are still valid.
+		for (const server of currentServers) {
+			const match = definitions.find(d => defsEqual(server, d));
+			if (match) {
+				pushMatch(match, server);
+			} else {
+				server.dispose();
+			}
+		}
+
+		// Adopt any servers that are pending from extensions.
+		let extensionServers = this._extensionServers.get();
+		for (const definition of nextDefinitions) {
+			for (const rec of extensionServers) {
+				const server = rec.pendingServers?.find(s => defsEqual(s, definition));
+				if (server !== undefined) {
+					pushMatch(definition, server);
+					this._logService.debug(`MCP server ${server.definition.id} adopted from extension ${rec.extensionId.value}`);
+
+					const pendingServers = rec.pendingServers!.filter(s => s !== server);
+					extensionServers = extensionServers.map(rec2 => rec2 === rec ? { ...rec, pendingServers } : rec2);
+					break;
+				}
+			}
+		}
+
+		// Create any new servers that are needed.
+		for (const def of nextDefinitions) {
+			nextServers.push(this._instantiationService.createInstance(McpServer, def.collectionDefinition, def.serverDefinition, false, def.collectionDefinition.scope === StorageScope.WORKSPACE ? this.workspaceCache : this.userCache));
+		}
+
+		transaction(tx => {
+			this._publishedServers.set(nextServers, tx);
+			this._extensionServers.set(extensionServers, tx);
+		});
+	}
+
 	private _onExtensions(extensions: readonly Readonly<IRelaxedExtensionDescription>[]) {
 		const newRecs: IExtensionCollectionsRec[] = [];
-		let newServers: IMcpServer[] = [];
 		for (const extension of extensions) {
 			const collections = extension.contributes?.modelContextServerCollections;
 			if (!collections) {
@@ -231,9 +270,9 @@ export class McpService extends Disposable implements IMcpService {
 			for (const collection of collections) {
 				const id = extensionMcpCollectionPrefix + collection.id;
 				const pendingServers = this.userCache.getServers(id)?.servers.map(server =>
-					this._instantiationService.createInstance(McpServer, { id, label: collection.label, presentation: { order: McpCollectionSortOrder.Extension } }, McpServerDefinition.fromSerialized(server), false, this.userCache));
+					this._instantiationService.createInstance(McpServer, { id, label: collection.label, presentation: { order: McpCollectionSortOrder.Extension } }, McpServerDefinition.fromSerialized(server), true, this.workspaceCache));
+				this._logService.debug(`MCP collection ${collection.id} hydrated for extension ${extension.identifier.value} (${pendingServers?.length})`);
 
-				newServers = newServers.concat(pendingServers || []);
 				newRecs.push({
 					extensionId: extension.identifier,
 					collectionId: id,
@@ -243,53 +282,50 @@ export class McpService extends Disposable implements IMcpService {
 		}
 
 		if (newRecs.length) {
-			transaction(tx => {
-				this._extensionServers.set(this._extensionServers.get().concat(newRecs), tx);
-				this._servers.set(this._servers.get().concat(newServers), tx);
-			});
+			this._extensionServers.set(this._extensionServers.get().concat(newRecs), undefined);
 		}
 	}
 
-	private _onExtensionStatus() {
-		const statuses = this._extensionService.getExtensionsStatus();
+	private async _onExtensionStatus() {
+		// This fires on activation but before providers might have published.
+		// Take the extensions that are active now, wait for all them to publish,
+		// then prune inactive servers.
+		const wereActive = Object.entries(this._extensionService.getExtensionsStatus())
+			.filter(([, status]) => !!status.activationTimes)
+			.map(([id]) => id);
+		await this._waitForInitialProvidersToPublish();
+
+		this._updateCollectedServers(); // ensure any pendingServers we know about were handled
 
 		// we move servers out of _extensionServers as they're registered. Once
 		// an extension finishes being activated, if there are any orphaned servers,
 		// then they are removed.
-		const toRemove = new Set<IMcpServer>();
 		const toKeep: IExtensionCollectionsRec[] = [];
 		const currentRecs = this._extensionServers.get();
 		for (const rec of currentRecs) {
-			const isActive = !!statuses[rec.extensionId.value]?.activationTimes;
-			if (!isActive) {
+			if (!wereActive.includes(rec.extensionId.value)) {
 				toKeep.push(rec); // keep waiting
 				continue;
 			}
 
 			this._extensionCollectionIdsToPersist.add(rec.collectionId);
-			const publishedServers = new Set(this._mcpRegistry.collections.get().find(c => c.id === rec.collectionId)?.serverDefinitions.get().map(s => s.id));
 
 			if (rec.pendingServers) {
 				for (const server of rec.pendingServers) {
-					if (!publishedServers.has(server.definition.id)) {
-						toRemove.add(server);
-					}
+					this._logService.debug(`Cached MCP server ${server.definition.id} removed because the extension no longer publishes it`);
+					server.dispose();
 				}
 			}
+		}
 
-			if (toKeep.length !== currentRecs.length) {
-				transaction(tx => {
-					this._servers.set(this._servers.get().filter((server) => !toRemove.has(server)), tx);
-					this._extensionServers.set(toKeep, tx);
-				});
-				toRemove.forEach(s => s.dispose());
-			}
+		if (toKeep.length !== currentRecs.length) {
+			this._extensionServers.set(toKeep, undefined);
 		}
 	}
 
 	public override dispose(): void {
 		this._extensionServers.get().forEach(server => server.pendingServers?.forEach(s => s.dispose()));
-		this._servers.get().forEach(server => server.dispose());
+		this._publishedServers.get().forEach(server => server.dispose());
 		super.dispose();
 	}
 }

From 0f278b9a16efadd2a6a4af6e843fd612da7425e1 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Thu, 13 Mar 2025 23:05:14 -0700
Subject: [PATCH 0922/1815] fixup tests and to .d.ts todos

---
 .../workbench/api/common/extHost.api.impl.ts  |  2 ++
 src/vs/workbench/api/common/extHostMcp.ts     |  8 +++---
 src/vs/workbench/api/common/extHostTypes.ts   | 20 +++++++++++++++
 .../contrib/mcp/common/mcpService.ts          |  2 +-
 .../workbench/contrib/mcp/common/mcpTypes.ts  |  6 ++---
 .../mcp/test/common/mcpRegistry.test.ts       |  4 +++
 .../test/common/mcpServerConnection.test.ts   |  4 +++
 .../common/mcpServerRequestHandler.test.ts    |  4 +++
 .../mcp/test/common/mcpService.test.ts        | 25 +++++++++++++------
 ...ode.proposed.mcpConfigurationProvider.d.ts | 13 +++++-----
 10 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index a1dfc9f9d9d2..9a25bdddd313 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -1819,6 +1819,8 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			TextSearchMatch2: TextSearchMatch2,
 			TextSearchCompleteMessageTypeNew: TextSearchCompleteMessageType,
 			ChatErrorLevel: extHostTypes.ChatErrorLevel,
+			McpSSEServerDefinition: extHostTypes.McpSSEServerDefinition,
+			McpStdioServerDefinition: extHostTypes.McpStdioServerDefinition,
 		};
 	};
 }
diff --git a/src/vs/workbench/api/common/extHostMcp.ts b/src/vs/workbench/api/common/extHostMcp.ts
index c5a3c011551c..a948fa80dc8b 100644
--- a/src/vs/workbench/api/common/extHostMcp.ts
+++ b/src/vs/workbench/api/common/extHostMcp.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
+import { CancellationToken } from '../../../base/common/cancellation.js';
 import { DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
+import { StorageScope } from '../../../platform/storage/common/storage.js';
 import { extensionMcpCollectionPrefix, McpCollectionDefinition, McpServerDefinition, McpServerLaunch, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
 import { ExtHostMcpShape, MainContext, MainThreadMcpShape } from './extHost.protocol.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
-import { StorageScope } from '../../../platform/storage/common/storage.js';
-import { CancellationToken } from '../../../base/common/cancellation.js';
 
 export const IExtHostMpcService = createDecorator<IExtHostMpcService>('IExtHostMpcService');
 
@@ -65,7 +65,7 @@ export class ExtHostMcpService implements IExtHostMpcService {
 			const list = await provider.provideMcpServerDefinitions(CancellationToken.None);
 
 			function isSSEConfig(candidate: vscode.McpServerDefinition): candidate is vscode.McpSSEServerDefinition {
-				return typeof (candidate as vscode.McpSSEServerDefinition).url === 'string';
+				return !!(candidate as vscode.McpSSEServerDefinition).uri;
 			}
 
 			const servers: McpServerDefinition[] = [];
@@ -77,7 +77,7 @@ export class ExtHostMcpService implements IExtHostMpcService {
 					launch: isSSEConfig(item)
 						? {
 							type: McpServerTransportType.SSE,
-							url: item.url
+							uri: item.uri
 						}
 						: {
 							type: McpServerTransportType.Stdio,
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index 432ae5e6d256..cb861fedc0f5 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -5039,3 +5039,23 @@ export enum InlineEditTriggerKind {
 }
 
 //#endregion
+
+//#region MC
+export class McpStdioServerDefinition implements vscode.McpStdioServerDefinition {
+	cwd?: URI;
+
+	constructor(
+		public label: string,
+		public command: string,
+		public args: string[],
+		public env: Record<string, string | number | null>
+	) { }
+}
+
+export class McpSSEServerDefinition implements vscode.McpSSEServerDefinition {
+	constructor(
+		public label: string,
+		public uri: URI
+	) { }
+}
+//#endregion
diff --git a/src/vs/workbench/contrib/mcp/common/mcpService.ts b/src/vs/workbench/contrib/mcp/common/mcpService.ts
index 3908760c6ea5..fa5e30c3bb45 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpService.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpService.ts
@@ -269,7 +269,7 @@ export class McpService extends Disposable implements IMcpService {
 
 			for (const collection of collections) {
 				const id = extensionMcpCollectionPrefix + collection.id;
-				const pendingServers = this.userCache.getServers(id)?.servers.map(server =>
+				const pendingServers = this.workspaceCache.getServers(id)?.servers.map(server =>
 					this._instantiationService.createInstance(McpServer, { id, label: collection.label, presentation: { order: McpCollectionSortOrder.Extension } }, McpServerDefinition.fromSerialized(server), true, this.workspaceCache));
 				this._logService.debug(`MCP collection ${collection.id} hydrated for extension ${extension.identifier.value} (${pendingServers?.length})`);
 
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
index a265823d0916..57675ab2d8e6 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
@@ -244,7 +244,7 @@ export interface McpServerTransportStdio {
  */
 export interface McpServerTransportSSE {
 	readonly type: McpServerTransportType.SSE;
-	readonly url: string;
+	readonly uri: URI;
 }
 
 export type McpServerLaunch =
@@ -253,7 +253,7 @@ export type McpServerLaunch =
 
 export namespace McpServerLaunch {
 	export type Serialized =
-		| { type: McpServerTransportType.SSE; url: string }
+		| { type: McpServerTransportType.SSE; uri: UriComponents }
 		| { type: McpServerTransportType.Stdio; cwd: UriComponents | undefined; command: string; args: readonly string[]; env: Record<string, string | number | null> };
 
 	export function toSerialized(launch: McpServerLaunch): McpServerLaunch.Serialized {
@@ -263,7 +263,7 @@ export namespace McpServerLaunch {
 	export function fromSerialized(launch: McpServerLaunch.Serialized): McpServerLaunch {
 		switch (launch.type) {
 			case McpServerTransportType.SSE:
-				return { type: launch.type, url: launch.url };
+				return { type: launch.type, uri: URI.revive(launch.uri) };
 			case McpServerTransportType.Stdio:
 				return {
 					type: launch.type,
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 6782a028d8bf..6e330575c011 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
@@ -117,6 +117,10 @@ class TestMcpHostDelegate implements IMcpHostDelegate {
 	start(): IMcpMessageTransport {
 		return new TestMcpMessageTransport();
 	}
+
+	waitForInitialProviderPromises(): Promise<void> {
+		return Promise.resolve();
+	}
 }
 
 class TestDialogService implements Partial<IDialogService> {
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 dea177b77ff7..83b9933c3f25 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpServerConnection.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpServerConnection.test.ts
@@ -49,6 +49,10 @@ class TestMcpHostDelegate extends Disposable implements IMcpHostDelegate {
 	setCanStart(value: boolean): void {
 		this._canStartValue = value;
 	}
+
+	waitForInitialProviderPromises(): Promise<void> {
+		return Promise.resolve();
+	}
 }
 
 suite('Workbench - MCP - ServerConnection', () => {
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 1da6d3d88688..ebbfeb757981 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpServerRequestHandler.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpServerRequestHandler.test.ts
@@ -40,6 +40,10 @@ class TestMcpHostDelegate extends Disposable implements IMcpHostDelegate {
 	getTransport(): TestMcpMessageTransport {
 		return this._transport;
 	}
+
+	waitForInitialProviderPromises(): Promise<void> {
+		return Promise.resolve();
+	}
 }
 
 suite('Workbench - MCP - ServerRequestHandler', () => {
diff --git a/src/vs/workbench/contrib/mcp/test/common/mcpService.test.ts b/src/vs/workbench/contrib/mcp/test/common/mcpService.test.ts
index 50004b7424ef..5034b55dbc33 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpService.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpService.test.ts
@@ -13,7 +13,7 @@ import { ExtensionIdentifier, IExtensionDescription } from '../../../../../platf
 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 { ILoggerService } from '../../../../../platform/log/common/log.js';
+import { ILoggerService, ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
 import { IProductService } from '../../../../../platform/product/common/productService.js';
 import { IStorageService, StorageScope } from '../../../../../platform/storage/common/storage.js';
 import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
@@ -22,7 +22,8 @@ import { TestContextService, TestLoggerService, TestStorageService } from '../..
 import { ILanguageModelToolsService } from '../../../chat/common/languageModelToolsService.js';
 import { IMcpRegistry } from '../../common/mcpRegistryTypes.js';
 import { McpService } from '../../common/mcpService.js';
-import { McpCollectionSortOrder } from '../../common/mcpTypes.js';
+import { extensionMcpCollectionPrefix, McpCollectionSortOrder } from '../../common/mcpTypes.js';
+import { timeout } from '../../../../../base/common/async.js';
 
 class TestExtensionService extends NullExtensionService {
 	private readonly store = new DisposableStore();
@@ -58,6 +59,9 @@ class TestMcpService extends McpService {
 	public get internalUserCache() {
 		return this.userCache;
 	}
+	public get internalWorkspaceCache() {
+		return this.workspaceCache;
+	}
 
 	public get internalExtensionServers() {
 		return this._extensionServers;
@@ -90,6 +94,7 @@ suite('Workbench - MCP - Service', () => {
 
 		// Mock MCP registry
 		mockMcpRegistry = {
+			delegates: [],
 			collections: observableValue('collections', [])
 		};
 
@@ -111,7 +116,8 @@ suite('Workbench - MCP - Service', () => {
 			[IStorageService, testStorageService],
 			[ILoggerService, store.add(new TestLoggerService())],
 			[IProductService, { nameShort: 'VSCode Test' } as IProductService],
-			[IWorkspaceContextService, new TestContextService()]
+			[IWorkspaceContextService, new TestContextService()],
+			[ILogService, new NullLogService()],
 		);
 
 		// Create instantiation service
@@ -133,7 +139,7 @@ suite('Workbench - MCP - Service', () => {
 		]);
 
 		// Set cached servers for this collection
-		mcpService.internalUserCache.storeServers('collection1', {
+		mcpService.internalWorkspaceCache.storeServers(extensionMcpCollectionPrefix + 'collection1', {
 			servers: [{
 				id: 'server1',
 				label: 'Server 1',
@@ -150,7 +156,7 @@ suite('Workbench - MCP - Service', () => {
 
 		// Should be loaded from cache but not activated yet
 		assert.strictEqual(mcpService.internalExtensionServers.get().length, 1);
-		assert.strictEqual(mcpService.internalExtensionServers.get()[0].collectionId, 'collection1');
+		assert.strictEqual(mcpService.internalExtensionServers.get()[0].collectionId, extensionMcpCollectionPrefix + 'collection1');
 		assert.strictEqual(mcpService.internalExtensionServers.get()[0].pendingServers?.length, 1);
 	});
 
@@ -161,7 +167,7 @@ suite('Workbench - MCP - Service', () => {
 		]);
 
 		// Set cached servers for this collection
-		mcpService.internalUserCache.storeServers('collection1', {
+		mcpService.internalWorkspaceCache.storeServers(extensionMcpCollectionPrefix + 'collection1', {
 			servers: [{
 				id: 'server1',
 				label: 'Server 1',
@@ -180,6 +186,7 @@ suite('Workbench - MCP - Service', () => {
 		// Now simulate extension activation (but it doesn't register the server)
 		mockExtensionService.extensionStatuses.set('ext1', { activationTimes: {} });
 		mockExtensionService.onDidChangeExtensionStatusEmitter.fire(undefined);
+		await timeout(1); // wait for _waitForInitialProvidersToPublish to resolve
 
 		// The server should be removed since it wasn't registered by the extension
 		assert.strictEqual(mcpService.servers.get().length, 0);
@@ -193,7 +200,7 @@ suite('Workbench - MCP - Service', () => {
 		]);
 
 		// Set cached servers for this collection
-		mcpService.internalUserCache.storeServers('collection1', {
+		mcpService.internalWorkspaceCache.storeServers(extensionMcpCollectionPrefix + 'collection1', {
 			servers: [{
 				id: 'server1',
 				label: 'Server 1',
@@ -225,6 +232,7 @@ suite('Workbench - MCP - Service', () => {
 		// Now simulate extension activation
 		mockExtensionService.extensionStatuses.set('ext1', { activationTimes: {} });
 		mockExtensionService.onDidChangeExtensionStatusEmitter.fire(undefined);
+		await timeout(1); // wait for _waitForInitialProvidersToPublish to resolve
 
 		// The server should still be there since it was registered
 		assert.strictEqual(mcpService.servers.get().length, 1);
@@ -251,7 +259,7 @@ suite('Workbench - MCP - Service', () => {
 		assert.strictEqual(mockExtensionService.firedActivationEvents.has('onMcpCollection:collection2'), true);
 	});
 
-	test('hasExtensionsWithUnknownServers should be true when extensions have unactivated servers', () => {
+	test('hasExtensionsWithUnknownServers should be true when extensions have unactivated servers', async () => {
 		// Initially should be false
 		assert.strictEqual(mcpService.hasExtensionsWithUnknownServers.get(), false);
 
@@ -269,6 +277,7 @@ suite('Workbench - MCP - Service', () => {
 		// Activate the extension
 		mockExtensionService.extensionStatuses.set('ext1', { activationTimes: {} });
 		mockExtensionService.onDidChangeExtensionStatusEmitter.fire(undefined);
+		await timeout(1); // wait for _waitForInitialProvidersToPublish to resolve
 
 		// Should be false again
 		assert.strictEqual(mcpService.hasExtensionsWithUnknownServers.get(), false);
diff --git a/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts b/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts
index df57072d89d7..ac1c7e4de6d7 100644
--- a/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts
@@ -4,8 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 declare module 'vscode' {
 
-	// TODO@API make this a class
-	export interface McpStdioServerDefinition {
+	// https://github.com/microsoft/vscode/issues/243522
+
+	export class McpStdioServerDefinition {
 
 		label: string;
 
@@ -14,16 +15,16 @@ declare module 'vscode' {
 		args: readonly string[];
 		env: Record<string, string | number | null>;
 
-		// constructor(label: string, command: string, args: string[], env: { [key: string]: string });
+		constructor(label: string, command: string, args: string[], env: { [key: string]: string });
 	}
 
-	export interface McpSSEServerDefinition {
+	export class McpSSEServerDefinition {
 
 		label: string;
 
-		url: string;
+		uri: Uri;
 
-		// constructor(label: string, url:string);
+		constructor(label: string, uri: Uri);
 	}
 
 	export type McpServerDefinition = McpStdioServerDefinition | McpSSEServerDefinition;

From f31df357e88350a35ba9b646e7a5cd615e70196c Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Thu, 13 Mar 2025 23:53:02 -0700
Subject: [PATCH 0923/1815] mcp: include server context in qp title (#243525)

Closes https://github.com/microsoft/vscode-copilot/issues/14237
---
 src/vs/workbench/contrib/mcp/browser/mcpCommands.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index ec0a44d3ab06..7fd692bc2276 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -58,6 +58,7 @@ export class ListMcpServerCommand extends Action2 {
 
 		const store = new DisposableStore();
 		const pick = quickInput.createQuickPick<ItemType>({ useSeparators: true });
+		pick.title = localize('mcp.selectServer', 'Select an MCP Server');
 
 		store.add(pick);
 		store.add(autorun(reader => {
@@ -145,6 +146,7 @@ export class McpServerOptionsCommand extends Action2 {
 		});
 
 		const pick = await quickInputService.pick(items, {
+			title: server.definition.label,
 			placeHolder: localize('mcp.selectAction', 'Select Server Action')
 		});
 

From ec682f62efb07e4934fd7b2aac9254fdfb61986a Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Fri, 14 Mar 2025 10:15:20 +0100
Subject: [PATCH 0924/1815] Disable tree sitter for tyepscript (#243538)

---
 .vscode/settings.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 594b10067b74..20f0ebc45a6f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -179,5 +179,4 @@
 		"ts": "warning",
 		"eslint": "warning"
 	},
-	"editor.experimental.preferTreeSitter.typescript": true
 }

From 082c5d84479c087fd87c13d1be04ba6430157cfc Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Fri, 14 Mar 2025 13:14:03 +0100
Subject: [PATCH 0925/1815] Do no allow LineTokens with mismatch length
 (#243553)

Fixes #243450
---
 src/vs/editor/common/model/tokenStore.ts      | 19 +++++++++++++------
 .../model/treeSitterTokenStoreService.ts      |  2 +-
 .../editor/common/model/treeSitterTokens.ts   |  2 +-
 src/vs/editor/common/tokens/lineTokens.ts     |  5 +++++
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/vs/editor/common/model/tokenStore.ts b/src/vs/editor/common/model/tokenStore.ts
index 49264b40ae61..c180e1b15a3e 100644
--- a/src/vs/editor/common/model/tokenStore.ts
+++ b/src/vs/editor/common/model/tokenStore.ts
@@ -35,7 +35,9 @@ class ListNode implements IDisposable {
 
 		this._length += node.length;
 		this._updateParentLength(node.length);
-		node.parent = this;
+		if (!isLeaf(node)) {
+			node.parent = this;
+		}
 	}
 
 	private _updateParentLength(delta: number) {
@@ -61,7 +63,9 @@ class ListNode implements IDisposable {
 
 		this._length += node.length;
 		this._updateParentLength(node.length);
-		node.parent = this;
+		if (!isLeaf(node)) {
+			node.parent = this;
+		}
 	}
 
 	unprependChild(): Node {
@@ -91,7 +95,6 @@ type Node = ListNode | LeafNode;
 
 interface LeafNode {
 	readonly length: number;
-	parent?: ListNode;
 	token: number;
 	tokenQuality: TokenQuality;
 	height: 0;
@@ -270,7 +273,9 @@ export class TokenStore implements IDisposable {
 			const currentOffset = node.offset;
 
 			if (currentOffset < updateOffsetStart && currentOffset + node.node.length <= updateOffsetStart) {
-				node.node.parent = undefined;
+				if (!isLeaf(node.node)) {
+					node.node.parent = undefined;
+				}
 				precedingNodes.push(node.node);
 				continue;
 			} else if (isLeaf(node.node) && (currentOffset < updateOffsetStart)) {
@@ -284,7 +289,9 @@ export class TokenStore implements IDisposable {
 			}
 
 			if (currentOffset >= firstUnchangedOffsetAfterUpdate) {
-				node.node.parent = undefined;
+				if (!isLeaf(node.node)) {
+					node.node.parent = undefined;
+				}
 				postcedingNodes.push(node.node);
 				continue;
 			} else if (isLeaf(node.node) && (currentOffset + node.node.length >= firstUnchangedOffsetAfterUpdate)) {
@@ -492,7 +499,7 @@ export class TokenStore implements IDisposable {
 		while (stack.length > 0) {
 			const [node, visited] = stack.pop()!;
 			if (isLeaf(node)) {
-				node.parent = undefined;
+				// leaf node does not need to be disposed
 			} else if (!visited) {
 				stack.push([node, true]);
 				for (let i = node.children.length - 1; i >= 0; i--) {
diff --git a/src/vs/editor/common/model/treeSitterTokenStoreService.ts b/src/vs/editor/common/model/treeSitterTokenStoreService.ts
index 2af45e39bd3f..c304ad9309c8 100644
--- a/src/vs/editor/common/model/treeSitterTokenStoreService.ts
+++ b/src/vs/editor/common/model/treeSitterTokenStoreService.ts
@@ -72,7 +72,7 @@ class TreeSitterTokenizationStoreService implements ITreeSitterTokenizationStore
 					newToken = { startOffsetInclusive: oldToken.startOffsetInclusive, length: oldToken.length + change.text.length - change.rangeLength, token: oldToken.token };
 				} else {
 					// The document got larger and the change is at the end of the document.
-					newToken = { startOffsetInclusive: offset, length: change.text.length + 1, token: 0 };
+					newToken = { startOffsetInclusive: offset, length: change.text.length, token: 0 };
 				}
 				storeInfo.store.update(oldToken?.length ?? 0, [newToken], TokenQuality.EditGuess);
 			} else if (change.text.length < change.rangeLength) {
diff --git a/src/vs/editor/common/model/treeSitterTokens.ts b/src/vs/editor/common/model/treeSitterTokens.ts
index 321ee8d41f4a..566de4466fb8 100644
--- a/src/vs/editor/common/model/treeSitterTokens.ts
+++ b/src/vs/editor/common/model/treeSitterTokens.ts
@@ -56,7 +56,7 @@ export class TreeSitterTokens extends AbstractTokens {
 
 	public getLineTokens(lineNumber: number): LineTokens {
 		const content = this._textModel.getLineContent(lineNumber);
-		if (this._tokenizationSupport) {
+		if (this._tokenizationSupport && content.length > 0) {
 			const rawTokens = this._tokenStore.getTokens(this._textModel, lineNumber);
 			if (rawTokens) {
 				return new LineTokens(rawTokens, content, this._languageIdCodec);
diff --git a/src/vs/editor/common/tokens/lineTokens.ts b/src/vs/editor/common/tokens/lineTokens.ts
index 72d94d120d40..5546834b94dc 100644
--- a/src/vs/editor/common/tokens/lineTokens.ts
+++ b/src/vs/editor/common/tokens/lineTokens.ts
@@ -9,6 +9,7 @@ import { IPosition } from '../core/position.js';
 import { ITextModel } from '../model.js';
 import { OffsetRange } from '../core/offsetRange.js';
 import { TokenArray, TokenArrayBuilder } from './tokenArray.js';
+import { BugIndicatingError } from '../../../base/common/errors.js';
 
 
 export interface IViewLineTokens {
@@ -101,6 +102,10 @@ export class LineTokens implements IViewLineTokens {
 	) >>> 0;
 
 	constructor(tokens: Uint32Array, text: string, decoder: ILanguageIdCodec) {
+		const tokensLength = tokens.length > 1 ? tokens[tokens.length - 2] : 0;
+		if (tokensLength !== text.length) {
+			throw new BugIndicatingError('Token length and text length do not match!');
+		}
 		this._tokens = tokens;
 		this._tokensCount = (this._tokens.length >>> 1);
 		this._text = text;

From 6da38d10e9bff8fd1852225532e58a03172419ec Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 14 Mar 2025 13:41:18 +0100
Subject: [PATCH 0926/1815] make select tools for all tools, not just MCP tools
 (#243551)

* add `ChatRequest#tools`

* make select tools for all tools, not just MCP tools

* make the select tools work with all tools, group by MCP server, extension, and rest
* fill in the new ChatRequest#selectTools API with selected tools
* have the MCP server command be its own command with its own custom rendering

* remove old comment
---
 .../workbench/api/common/extHost.api.impl.ts  |   2 +-
 .../api/common/extHostChatAgents2.ts          |  22 +-
 .../api/common/extHostTypeConverters.ts       |   3 +-
 .../chat/browser/actions/chatToolActions.ts   | 233 ++++++++++++++-
 .../contrib/chat/browser/chatInputPart.ts     |  17 +-
 .../contrib/chat/browser/chatSelectedTools.ts |  90 ++++++
 .../contrib/chat/browser/chatWidget.ts        |   1 +
 .../chat/browser/languageModelToolsService.ts |  10 +-
 .../contrib/chat/browser/media/chat.css       |   4 +-
 .../contrib/chat/common/chatAgents.ts         |   1 +
 .../contrib/chat/common/chatContextKeys.ts    |   5 +
 .../contrib/chat/common/chatService.ts        |   1 +
 .../contrib/chat/common/chatServiceImpl.ts    |   3 +-
 .../contrib/mcp/browser/mcp.contribution.ts   |   5 +-
 .../contrib/mcp/browser/mcpCommands.ts        | 271 +++---------------
 .../workbench/contrib/mcp/common/mcpServer.ts |   8 -
 .../contrib/mcp/common/mcpService.ts          |  26 +-
 .../workbench/contrib/mcp/common/mcpTypes.ts  |   6 +-
 ...ode.proposed.chatParticipantAdditions.d.ts |  14 +
 19 files changed, 431 insertions(+), 291 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/browser/chatSelectedTools.ts

diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index e8fa70f081f4..e8f0fcb1c52c 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -212,8 +212,8 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 	const extHostUriOpeners = rpcProtocol.set(ExtHostContext.ExtHostUriOpeners, new ExtHostUriOpeners(rpcProtocol));
 	const extHostProfileContentHandlers = rpcProtocol.set(ExtHostContext.ExtHostProfileContentHandlers, new ExtHostProfileContentHandlers(rpcProtocol));
 	rpcProtocol.set(ExtHostContext.ExtHostInteractive, new ExtHostInteractive(rpcProtocol, extHostNotebook, extHostDocumentsAndEditors, extHostCommands, extHostLogService));
-	const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, new ExtHostChatAgents2(rpcProtocol, extHostLogService, extHostCommands, extHostDocuments, extHostLanguageModels, extHostDiagnostics));
 	const extHostLanguageModelTools = rpcProtocol.set(ExtHostContext.ExtHostLanguageModelTools, new ExtHostLanguageModelTools(rpcProtocol));
+	const extHostChatAgents2 = rpcProtocol.set(ExtHostContext.ExtHostChatAgents2, new ExtHostChatAgents2(rpcProtocol, extHostLogService, extHostCommands, extHostDocuments, extHostLanguageModels, extHostDiagnostics, extHostLanguageModelTools));
 	const extHostAiRelatedInformation = rpcProtocol.set(ExtHostContext.ExtHostAiRelatedInformation, new ExtHostRelatedInformation(rpcProtocol));
 	const extHostAiEmbeddingVector = rpcProtocol.set(ExtHostContext.ExtHostAiEmbeddingVector, new ExtHostAiEmbeddingVector(rpcProtocol));
 	const extHostStatusBar = rpcProtocol.set(ExtHostContext.ExtHostStatusBar, new ExtHostStatusBar(rpcProtocol, extHostCommands.converter));
diff --git a/src/vs/workbench/api/common/extHostChatAgents2.ts b/src/vs/workbench/api/common/extHostChatAgents2.ts
index d765cceec7ce..178aef64639b 100644
--- a/src/vs/workbench/api/common/extHostChatAgents2.ts
+++ b/src/vs/workbench/api/common/extHostChatAgents2.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as vscode from 'vscode';
-import { coalesce } from '../../../base/common/arrays.js';
+import { coalesce, isNonEmptyArray } from '../../../base/common/arrays.js';
 import { raceCancellation } from '../../../base/common/async.js';
 import { CancellationToken, CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { toErrorMessage } from '../../../base/common/errorMessage.js';
@@ -34,6 +34,7 @@ import { ExtHostDocuments } from './extHostDocuments.js';
 import { ExtHostLanguageModels } from './extHostLanguageModels.js';
 import * as typeConvert from './extHostTypeConverters.js';
 import * as extHostTypes from './extHostTypes.js';
+import { ExtHostLanguageModelTools } from './extHostLanguageModelTools.js';
 
 class ChatAgentResponseStream {
 
@@ -328,6 +329,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		private readonly _documents: ExtHostDocuments,
 		private readonly _languageModels: ExtHostLanguageModels,
 		private readonly _diagnostics: ExtHostDiagnostics,
+		private readonly _tools: ExtHostLanguageModelTools
 	) {
 		super();
 		this._proxy = mainContext.getProxy(MainContext.MainThreadChatAgents2);
@@ -406,7 +408,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 
 		const model = await this.getModelForRequest(request, detector.extension);
 		const includeInteractionId = isProposedApiEnabled(detector.extension, 'chatParticipantPrivate');
-		const extRequest = typeConvert.ChatAgentRequest.to(includeInteractionId ? request : { ...request, requestId: '' }, location, model, this.getDiagnosticsWhenEnabled(detector.extension));
+		const extRequest = typeConvert.ChatAgentRequest.to(includeInteractionId ? request : { ...request, requestId: '' }, location, model, this.getDiagnosticsWhenEnabled(detector.extension), this.getToolsForRequest(detector.extension, request));
 
 		return detector.provider.provideParticipantDetection(
 			extRequest,
@@ -491,7 +493,13 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 
 			const model = await this.getModelForRequest(request, agent.extension);
 			const includeInteractionId = isProposedApiEnabled(agent.extension, 'chatParticipantPrivate');
-			const extRequest = typeConvert.ChatAgentRequest.to(includeInteractionId ? request : { ...request, requestId: '' }, location, model, this.getDiagnosticsWhenEnabled(agent.extension));
+			const extRequest = typeConvert.ChatAgentRequest.to(
+				includeInteractionId ? request : { ...request, requestId: '' },
+				location,
+				model,
+				this.getDiagnosticsWhenEnabled(agent.extension),
+				this.getToolsForRequest(agent.extension, request)
+			);
 			inFlightRequest = { requestId: requestDto.requestId, extRequest };
 			this._inFlightRequests.add(inFlightRequest);
 
@@ -550,6 +558,14 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		return this._diagnostics.getDiagnostics();
 	}
 
+	private getToolsForRequest(extension: IExtensionDescription, request: Dto<IChatAgentRequest>) {
+		if (!isNonEmptyArray(request.userSelectedTools)) {
+			return undefined;
+		}
+		const selector = new Set(request.userSelectedTools);
+		return this._tools.getTools(extension).filter(candidate => selector.has(candidate.name));
+	}
+
 	private async prepareHistoryTurns(extension: Readonly<IRelaxedExtensionDescription>, agentId: string, context: { history: IChatAgentHistoryEntryDto[] }): Promise<(vscode.ChatRequestTurn | vscode.ChatResponseTurn)[]> {
 		const res: (vscode.ChatRequestTurn | vscode.ChatResponseTurn)[] = [];
 
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
index f92096730c68..55f3e4d1d5bb 100644
--- a/src/vs/workbench/api/common/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -2766,7 +2766,7 @@ 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[]][]): vscode.ChatRequest {
+	export function to(request: IChatAgentRequest, location2: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined, model: vscode.LanguageModelChat, diagnostics: readonly [vscode.Uri, readonly vscode.Diagnostic[]][], tools: vscode.LanguageModelToolInformation[] | undefined): vscode.ChatRequest {
 		const toolReferences = request.variables.variables.filter(v => v.isTool);
 		const variableReferences = request.variables.variables.filter(v => !v.isTool);
 		const requestWithoutId = {
@@ -2782,6 +2782,7 @@ export namespace ChatAgentRequest {
 			rejectedConfirmationData: request.rejectedConfirmationData,
 			location2,
 			toolInvocationToken: Object.freeze({ sessionId: request.sessionId }) as never,
+			tools,
 			model
 		};
 		if (request.requestId) {
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
index 56d1b4e5a199..b020d03d83e8 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
@@ -3,16 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Codicon } from '../../../../../base/common/codicons.js';
+import { diffSets } from '../../../../../base/common/collections.js';
+import { Event } from '../../../../../base/common/event.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
-import { localize2 } from '../../../../../nls.js';
-import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../../platform/quickinput/common/quickInput.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
+import { IMcpService, IMcpServer, McpConnectionState } from '../../../mcp/common/mcpTypes.js';
 import { ChatContextKeys } from '../../common/chatContextKeys.js';
 import { IChatToolInvocation } from '../../common/chatService.js';
 import { isResponseVM } from '../../common/chatViewModel.js';
-import { IChatWidgetService } from '../chat.js';
+import { ChatMode } from '../../common/constants.js';
+import { ILanguageModelToolsService, IToolData } from '../../common/languageModelToolsService.js';
+import { IChatWidget, IChatWidgetService } from '../chat.js';
 import { CHAT_CATEGORY } from './chatActions.js';
 
 export const AcceptToolConfirmationActionId = 'workbench.action.chat.acceptTool';
@@ -51,6 +61,223 @@ class AcceptToolConfirmation extends Action2 {
 	}
 }
 
+export class AttachToolsAction extends Action2 {
+
+	static readonly id = 'workbench.action.chat.attachTools';
+
+	constructor() {
+		super({
+			id: AttachToolsAction.id,
+			title: localize('label', "Select Tools..."),
+			icon: Codicon.tools,
+			f1: false,
+			category: CHAT_CATEGORY,
+			precondition: ContextKeyExpr.and(
+				ContextKeyExpr.or(ChatContextKeys.Tools.toolsCount.greater(0)),
+				ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent)
+			),
+			menu: {
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.or(ChatContextKeys.Tools.toolsCount.greater(0)),
+					ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent)
+				),
+				id: MenuId.ChatInputAttachmentToolbar,
+				group: 'navigation',
+				order: 1
+			},
+			keybinding: {
+				when: ContextKeyExpr.and(ChatContextKeys.inChatInput, ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent)),
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Slash,
+				weight: KeybindingWeight.EditorContrib
+			}
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
+
+		const quickPickService = accessor.get(IQuickInputService);
+		const mcpService = accessor.get(IMcpService);
+		const toolsService = accessor.get(ILanguageModelToolsService);
+		const extensionService = accessor.get(IExtensionService);
+		const chatWidgetService = accessor.get(IChatWidgetService);
+
+		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;
+			}
+		}
+
+		if (!widget) {
+			return;
+		}
+
+		const mcpServerByTool = new Map<string, IMcpServer>();
+		for (const server of mcpService.servers.get()) {
+			for (const tool of server.tools.get()) {
+				mcpServerByTool.set(tool.id, server);
+			}
+		}
+
+		const enum BucketOrdinal { Extension, Mcp, Other }
+		type BucketPick = IQuickPickItem & { picked: boolean; ordinal: BucketOrdinal; status?: string; children: ToolPick[] };
+		type ToolPick = IQuickPickItem & { picked: boolean; tool: IToolData; parent: BucketPick };
+		type MyPick = ToolPick | BucketPick;
+
+		const defaultBucket: BucketPick = {
+			type: 'item',
+			children: [],
+			label: localize('defaultBucketLabel', "Other Tools"),
+			ordinal: BucketOrdinal.Other,
+			picked: true,
+		};
+
+		const toolBuckets = new Map<string, BucketPick>();
+
+		for (const tool of toolsService.getTools()) {
+
+			if (!tool.canBeReferencedInPrompt) {
+				continue;
+			}
+
+			let bucket: BucketPick;
+
+			const mcpServer = mcpServerByTool.get(tool.id);
+			const ext = extensionService.extensions.find(value => ExtensionIdentifier.equals(value.identifier, tool.extensionId));
+			if (mcpServer) {
+				bucket = toolBuckets.get(mcpServer.definition.id) ?? {
+					type: 'item',
+					label: mcpServer.definition.label,
+					// description: mcpServer.definition.,
+					status: localize('desc', "MCP - {0} ({1})", mcpServer.collection.label, McpConnectionState.toString(mcpServer.connectionState.get())),
+					ordinal: BucketOrdinal.Mcp,
+					picked: true,
+					children: []
+				};
+				toolBuckets.set(mcpServer.definition.id, bucket);
+			} else if (ext) {
+				bucket = toolBuckets.get(ExtensionIdentifier.toKey(ext.identifier)) ?? {
+					type: 'item',
+					label: ext.displayName ?? ext.name,
+					ordinal: BucketOrdinal.Extension,
+					picked: true,
+					children: []
+				};
+				toolBuckets.set(ExtensionIdentifier.toKey(ext.identifier), bucket);
+			} else {
+				bucket = defaultBucket;
+			}
+
+			bucket.children.push({
+				tool,
+				parent: bucket,
+				type: 'item',
+				label: `$(tools) ${tool.displayName}`,
+				description: tool.userDescription,
+				picked: true,
+				iconClasses: ['tool-pick']
+			});
+		}
+
+		function isBucketPick(obj: any): obj is BucketPick {
+			return Boolean((obj as BucketPick).children);
+		}
+		function isToolPick(obj: any): obj is ToolPick {
+			return Boolean((obj as ToolPick).tool);
+		}
+
+		const store = new DisposableStore();
+		const picker = store.add(quickPickService.createQuickPick<MyPick>({ useSeparators: true }));
+
+		const picks: (MyPick | IQuickPickSeparator)[] = [];
+
+		for (const bucket of Array.from(toolBuckets.values()).sort((a, b) => a.ordinal - b.ordinal)) {
+			picks.push({
+				type: 'separator',
+				label: bucket.status
+			});
+
+			picks.push(bucket);
+			picks.push(...bucket.children);
+		}
+
+
+		picker.placeholder = localize('placeholder', "Select tools that are available to chat");
+		picker.canSelectMany = true;
+
+		let lastSelectedItems = new Set<MyPick>();
+		let ignoreEvent = false;
+
+		const _update = () => {
+			ignoreEvent = true;
+			try {
+				const items = picks.filter((p): p is MyPick => p.type === 'item' && Boolean(p.picked));
+				lastSelectedItems = new Set(items);
+				picker.items = picks;
+				picker.selectedItems = items;
+			} finally {
+				ignoreEvent = false;
+			}
+		};
+
+		_update();
+		picker.show();
+
+		store.add(picker.onDidChangeSelection(selectedPicks => {
+			if (ignoreEvent) {
+				return;
+			}
+
+			const { added, removed } = diffSets(lastSelectedItems, new Set(selectedPicks));
+
+			for (const item of added) {
+				item.picked = true;
+
+				if (isBucketPick(item)) {
+					// add server -> add back tools
+					for (const toolPick of item.children) {
+						toolPick.picked = true;
+					}
+				} else if (isToolPick(item)) {
+					// add server when tool is picked
+					item.parent.picked = true;
+				}
+			}
+
+			for (const item of removed) {
+				item.picked = false;
+
+				if (isBucketPick(item)) {
+					// removed server -> remove tools
+					for (const toolPick of item.children) {
+						toolPick.picked = false;
+					}
+				} else if (isToolPick(item) && item.parent.children.every(child => !child.picked)) {
+					// remove LAST tool -> remove server
+					item.parent.picked = false;
+				}
+			}
+
+			_update();
+		}));
+
+
+		await Promise.race([Event.toPromise(Event.any(picker.onDidAccept, picker.onDidHide))]);
+
+		const selectedTools = picker.selectedItems.filter(isToolPick);
+
+		store.dispose();
+
+		widget.input.selectedToolsModel.update(selectedTools.map(tool => tool.tool));
+	}
+}
+
 export function registerChatToolActions() {
 	registerAction2(AcceptToolConfirmation);
+	registerAction2(AttachToolsAction);
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 55df7b479d60..e910bcc96522 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -90,6 +90,7 @@ import { CollapsibleListPool, IChatCollapsibleListItem } from './chatContentPart
 import { ChatDragAndDrop } from './chatDragAndDrop.js';
 import { ChatEditingRemoveAllFilesAction, ChatEditingShowChangesAction } from './chatEditing/chatEditingActions.js';
 import { ChatFollowups } from './chatFollowups.js';
+import { ChatSelectedTools } from './chatSelectedTools.js';
 import { IChatViewState } from './chatWidget.js';
 import { ChatFileReference } from './contrib/chatDynamicVariables/chatFileReference.js';
 import { ChatImplicitContext } from './contrib/chatImplicitContext.js';
@@ -151,6 +152,8 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		return this._attachmentModel;
 	}
 
+	readonly selectedToolsModel: ChatSelectedTools;
+
 	public getAttachedAndImplicitContext(sessionId: string): IChatRequestVariableEntry[] {
 		const contextArr = [...this.attachmentModel.attachments];
 		if (this.implicitContext?.enabled && this.implicitContext.value) {
@@ -196,19 +199,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		contextArr
 			.push(...this.instructionAttachmentsPart.chatAttachments);
 
-
-		// // TODO@jrieken use only selected servers
-		// for (const server of this.mcpService.servers.get()) {
-		// 	for (const { id, definition } of server.tools.get()) {
-		// 		contextArr.push({
-		// 			isTool: true,
-		// 			id,
-		// 			name: definition.name,
-		// 			value: undefined
-		// 		});
-		// 	}
-		// }
-
 		return contextArr;
 	}
 
@@ -384,6 +374,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		super();
 
 		this._attachmentModel = this._register(this.instantiationService.createInstance(ChatAttachmentModel));
+		this.selectedToolsModel = this._register(this.instantiationService.createInstance(ChatSelectedTools));
 		this.dnd = this._register(this.instantiationService.createInstance(ChatDragAndDrop, this._attachmentModel, styles));
 
 		this.getInputState = (): IChatInputState => {
diff --git a/src/vs/workbench/contrib/chat/browser/chatSelectedTools.ts b/src/vs/workbench/contrib/chat/browser/chatSelectedTools.ts
new file mode 100644
index 000000000000..f3635c1a603d
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/chatSelectedTools.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 { reset } from '../../../../base/browser/dom.js';
+import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { autorun, derived, IObservable, observableFromEvent, observableValue } from '../../../../base/common/observable.js';
+import { assertType } from '../../../../base/common/types.js';
+import { localize } from '../../../../nls.js';
+import { IActionViewItemService } from '../../../../platform/actions/browser/actionViewItemService.js';
+import { MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILanguageModelToolsService, IToolData } from '../common/languageModelToolsService.js';
+import { AttachToolsAction } from './actions/chatToolActions.js';
+
+export class ChatSelectedTools extends Disposable {
+
+	private readonly _selectedTools = observableValue<IToolData[] | undefined>(this, undefined);
+
+	readonly tools: IObservable<IToolData[]>;
+
+	constructor(
+		@IActionViewItemService actionViewItemService: IActionViewItemService,
+		@ILanguageModelToolsService toolsService: ILanguageModelToolsService,
+		@IInstantiationService instaService: IInstantiationService
+	) {
+		super();
+
+		const allTools = observableFromEvent(
+			toolsService.onDidChangeTools,
+			() => Array.from(toolsService.getTools()).filter(t => t.canBeReferencedInPrompt)
+		);
+
+		this.tools = derived(r => {
+			const custom = this._selectedTools.read(r);
+			return custom ?? allTools.read(r);
+		});
+
+		const toolsCount = derived(r => {
+			const count = allTools.read(r).length;
+			const enabled = this.tools.read(r).length;
+			return { count, enabled };
+		});
+
+		this._store.add(actionViewItemService.register(MenuId.ChatInputAttachmentToolbar, AttachToolsAction.id, (action, options) => {
+			if (!(action instanceof MenuItemAction)) {
+				return undefined;
+			}
+
+			return instaService.createInstance(class extends MenuEntryActionViewItem {
+
+				override render(container: HTMLElement): void {
+					this.options.icon = false;
+					this.options.label = true;
+					container.classList.add('chat-mcp');
+					super.render(container);
+				}
+
+				protected override updateLabel(): void {
+					this._store.add(autorun(r => {
+						assertType(this.label);
+
+						const { enabled, count } = toolsCount.read(r);
+
+						if (count === 0) {
+							super.updateLabel();
+							return;
+						}
+
+						const message = enabled !== count
+							? localize('tool.1', "{0} {1} of {2}", '$(tools)', enabled, count)
+							: localize('tool.0', "{0} {1}", '$(tools)', count);
+						reset(this.label, ...renderLabelWithIcons(message));
+					}));
+				}
+
+			}, action, { ...options, keybindingNotRenderedWithLabel: true });
+
+		}, Event.fromObservable(toolsCount)));
+	}
+
+	update(tools: IToolData[] | undefined): void {
+		this._selectedTools.set(tools, undefined);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index 48510c469548..94776fb33b52 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -1161,6 +1161,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				attachedContext,
 				noCommandDetection: options?.noCommandDetection,
 				hasInstructionAttachments: this.inputPart.hasInstructionAttachments,
+				userSelectedTools: this.inputPart.selectedToolsModel.tools.get().map(tool => tool.id)
 			});
 
 			if (result) {
diff --git a/src/vs/workbench/contrib/chat/browser/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/browser/languageModelToolsService.ts
index ab12b8c94625..253d448671d4 100644
--- a/src/vs/workbench/contrib/chat/browser/languageModelToolsService.ts
+++ b/src/vs/workbench/contrib/chat/browser/languageModelToolsService.ts
@@ -10,11 +10,12 @@ import { CancellationError, isCancellationError } from '../../../../base/common/
 import { Emitter } from '../../../../base/common/event.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { 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 { ILogService } from '../../../../platform/log/common/log.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 { ChatToolInvocation } from '../common/chatProgressTypes/chatToolInvocation.js';
 import { IChatService } from '../common/chatService.js';
@@ -36,7 +37,7 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 
 	private _tools = new Map<string, IToolEntry>();
 	private _toolContextKeys = new Set<string>();
-
+	private readonly _ctxToolsCount: IContextKey<number>;
 
 	private _callsByRequestId = new Map<string, IDisposable[]>();
 
@@ -56,6 +57,8 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 				this._onDidChangeToolsScheduler.schedule();
 			}
 		}));
+
+		this._ctxToolsCount = ChatContextKeys.Tools.toolsCount.bindTo(_contextKeyService);
 	}
 
 	registerToolData(toolData: IToolData): IDisposable {
@@ -64,12 +67,14 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 		}
 
 		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));
 
 		return toDisposable(() => {
 			this._tools.delete(toolData.id);
+			this._ctxToolsCount.set(this._tools.size);
 			this._refreshAllToolContextKeys();
 			this._onDidChangeToolsScheduler.schedule();
 		});
@@ -267,6 +272,7 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 		super.dispose();
 
 		this._callsByRequestId.forEach(calls => dispose(calls));
+		this._ctxToolsCount.reset();
 	}
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 25a25e870e9a..750c1f0fb88c 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1137,7 +1137,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	max-width: 100%;
 	width: fit-content;
 }
-.action-item.chat-mcp .action-label,
+
 .action-item.chat-attached-context-attachment.chat-add-files .action-label {
 	color: var(--vscode-descriptionForeground);
 	font-family: unset;
@@ -1183,7 +1183,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	}
 }
 
-.quick-input-list .quick-input-list-rows > .quick-input-list-row .monaco-icon-label.mcp-tool .codicon[class*='codicon-'] {
+.quick-input-list .quick-input-list-rows > .quick-input-list-row .monaco-icon-label.tool-pick .codicon[class*='codicon-'] {
 	font-size: 14px;
 }
 
diff --git a/src/vs/workbench/contrib/chat/common/chatAgents.ts b/src/vs/workbench/contrib/chat/common/chatAgents.ts
index f50d851f493d..2cc324f68ec4 100644
--- a/src/vs/workbench/contrib/chat/common/chatAgents.ts
+++ b/src/vs/workbench/contrib/chat/common/chatAgents.ts
@@ -143,6 +143,7 @@ export interface IChatAgentRequest {
 	acceptedConfirmationData?: any[];
 	rejectedConfirmationData?: any[];
 	userSelectedModelId?: string;
+	userSelectedTools?: string[];
 }
 
 export interface IChatQuestion {
diff --git a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
index cb192f9987e2..875f7cf93a88 100644
--- a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
@@ -87,6 +87,11 @@ export namespace ChatContextKeys {
 		agentModeDisallowed: new RawContextKey<boolean>('chatAgentModeDisallowed', undefined, { type: 'boolean', description: localize('chatAgentModeDisallowed', "True when agent mode is not allowed.") }), // experiment-driven disablement
 		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 namespace ChatContextKeyExprs {
diff --git a/src/vs/workbench/contrib/chat/common/chatService.ts b/src/vs/workbench/contrib/chat/common/chatService.ts
index 0c0e740731df..de11ce552d02 100644
--- a/src/vs/workbench/contrib/chat/common/chatService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatService.ts
@@ -447,6 +447,7 @@ export type IChatLocationData = IChatEditorLocationData | IChatNotebookLocationD
 export interface IChatSendRequestOptions {
 	mode?: ChatMode;
 	userSelectedModelId?: string;
+	userSelectedTools?: string[];
 	location?: ChatAgentLocation;
 	locationData?: IChatLocationData;
 	parserContext?: IChatParserContext;
diff --git a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
index 1111f0bae4b9..caf1189982d6 100644
--- a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
@@ -705,7 +705,8 @@ export class ChatService extends Disposable implements IChatService {
 							locationData: request.locationData,
 							acceptedConfirmationData: options?.acceptedConfirmationData,
 							rejectedConfirmationData: options?.rejectedConfirmationData,
-							userSelectedModelId: options?.userSelectedModelId
+							userSelectedModelId: options?.userSelectedModelId,
+							userSelectedTools: options?.userSelectedTools
 						} satisfies IChatAgentRequest;
 					};
 
diff --git a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
index 81214342ad28..21fefc849edf 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
@@ -19,7 +19,7 @@ import { McpService } from '../common/mcpService.js';
 import { IMcpService } from '../common/mcpTypes.js';
 import { McpDiscovery } from './mcpDiscovery.js';
 
-import { AttachMCPToolsAction, AttachMCPToolsActionRendering, ListMcpServerCommand, ResetMcpTrustCommand, McpServerOptionsCommand } from './mcpCommands.js';
+import { MCPServerActionRendering, ListMcpServerCommand, ResetMcpTrustCommand, McpServerOptionsCommand } from './mcpCommands.js';
 
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { McpContextKeysController } from '../common/mcpContextKeys.js';
@@ -35,9 +35,8 @@ registerWorkbenchContribution2('mcpContextKeys', McpContextKeysController, Workb
 
 registerAction2(ListMcpServerCommand);
 registerAction2(McpServerOptionsCommand);
-registerAction2(AttachMCPToolsAction);
 registerAction2(ResetMcpTrustCommand);
-registerWorkbenchContribution2('mcpActionRendering', AttachMCPToolsActionRendering, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2('mcpActionRendering', MCPServerActionRendering, WorkbenchPhase.BlockRestore);
 
 const jsonRegistry = <jsonContributionRegistry.IJSONContributionRegistry>Registry.as(jsonContributionRegistry.Extensions.JSONContribution);
 jsonRegistry.registerSchema(mcpSchemaId, mcpServerSchema);
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 7fd692bc2276..414c2942bee8 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -3,17 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, EventType, h, reset } from '../../../../base/browser/dom.js';
-import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { assertNever } from '../../../../base/common/assert.js';
+import { h } from '../../../../base/browser/dom.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { diffSets, groupBy } from '../../../../base/common/collections.js';
+import { groupBy } from '../../../../base/common/collections.js';
 import { Event } from '../../../../base/common/event.js';
-import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { autorun, derived, transaction } from '../../../../base/common/observable.js';
+import { autorun, derived } from '../../../../base/common/observable.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-import { assertType } from '../../../../base/common/types.js';
 import { ILocalizedString, localize, localize2 } from '../../../../nls.js';
 import { IActionViewItemService } from '../../../../platform/actions/browser/actionViewItemService.js';
 import { MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
@@ -21,16 +17,14 @@ import { Action2, MenuId, MenuItemAction } from '../../../../platform/actions/co
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
-import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
 import { spinningLoading } from '../../../../platform/theme/common/iconRegistry.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { CHAT_CATEGORY } from '../../chat/browser/actions/chatActions.js';
 import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
 import { ChatMode } from '../../chat/common/constants.js';
 import { McpContextKeys } from '../common/mcpContextKeys.js';
 import { IMcpRegistry } from '../common/mcpRegistryTypes.js';
-import { IMcpServer, IMcpService, IMcpTool, McpConnectionState, McpServerToolsState } from '../common/mcpTypes.js';
+import { IMcpServer, IMcpService, McpConnectionState, McpServerToolsState } from '../common/mcpTypes.js';
 
 // acroynms do not get localized
 const category: ILocalizedString = {
@@ -44,6 +38,7 @@ export class ListMcpServerCommand extends Action2 {
 		super({
 			id: ListMcpServerCommand.id,
 			title: localize2('mcp.list', 'List Servers'),
+			icon: Codicon.server,
 			category,
 			f1: true,
 		});
@@ -104,7 +99,17 @@ export class McpServerOptionsCommand extends Action2 {
 			id: McpServerOptionsCommand.id,
 			title: localize2('mcp.options', 'Server Options'),
 			category,
+			icon: Codicon.server,
 			f1: true,
+			menu: {
+				when: ContextKeyExpr.and(
+					McpContextKeys.hasUnknownTools,
+					ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent)
+				),
+				id: MenuId.ChatInputAttachmentToolbar,
+				group: 'navigation',
+				order: 0
+			},
 		});
 	}
 
@@ -174,172 +179,7 @@ export class McpServerOptionsCommand extends Action2 {
 }
 
 
-export class AttachMCPToolsAction extends Action2 {
-
-	static readonly id = 'workbench.action.chat.mcp.attachMcpTools';
-
-	constructor() {
-		super({
-			id: AttachMCPToolsAction.id,
-			title: localize2('workbench.action.chat.editing.attachContext.shortLabel', "Select Tools..."),
-			icon: Codicon.tools,
-			f1: false,
-			category: CHAT_CATEGORY,
-			precondition: ContextKeyExpr.and(
-				ContextKeyExpr.or(McpContextKeys.toolsCount.greater(0), McpContextKeys.hasUnknownTools),
-				ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent)
-			),
-			menu: {
-				when: ContextKeyExpr.and(
-					ContextKeyExpr.or(McpContextKeys.toolsCount.greater(0), McpContextKeys.hasUnknownTools),
-					ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent)
-				),
-				id: MenuId.ChatInputAttachmentToolbar,
-				group: 'navigation',
-				order: 1
-			},
-			keybinding: {
-				when: ContextKeyExpr.and(ChatContextKeys.inChatInput, ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent)),
-				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Slash,
-				weight: KeybindingWeight.EditorContrib
-			}
-		});
-	}
-
-	override async run(accessor: ServicesAccessor, ...args: any[]): Promise<void> {
-
-		const quickPickService = accessor.get(IQuickInputService);
-		const mcpService = accessor.get(IMcpService);
-
-		type ToolPick = IQuickPickItem & { picked: boolean; tool: IMcpTool; parent: ServerPick };
-		type ServerPick = IQuickPickItem & { picked: boolean; server: IMcpServer; toolPicks: ToolPick[] };
-		type McpPick = ToolPick | ServerPick;
-
-		function isServerPick(obj: any): obj is ServerPick {
-			return Boolean((obj as ServerPick).server);
-		}
-		function isToolPick(obj: any): obj is ToolPick {
-			return Boolean((obj as ToolPick).tool);
-		}
-
-		const store = new DisposableStore();
-		const picker = store.add(quickPickService.createQuickPick<McpPick>({ useSeparators: true }));
-
-		const picks: (McpPick | IQuickPickSeparator)[] = [];
-
-		for (const server of mcpService.servers.get()) {
-
-			const tools = server.tools.get();
-
-			if (tools.length === 0) {
-				continue;
-			}
-			picks.push({
-				type: 'separator',
-				label: localize('desc', "MCP Server - {0}", McpConnectionState.toString(server.connectionState.get()))
-			});
-
-			const item: ServerPick = {
-				server,
-				type: 'item',
-				label: `${server.definition.label}`,
-				picked: tools.some(tool => tool.enabled.get()),
-				toolPicks: []
-			};
-
-			picks.push(item);
-
-			for (const tool of tools) {
-				const toolItem: ToolPick = {
-					tool,
-					parent: item,
-					type: 'item',
-					label: `$(tools) ${tool.definition.name}`,
-					description: tool.definition.description,
-					picked: tool.enabled.get(),
-					iconClasses: ['mcp-tool']
-				};
-				item.toolPicks.push(toolItem);
-				picks.push(toolItem);
-			}
-		}
-
-		picker.placeholder = localize('placeholder', "Select tools that are available to chat");
-		picker.canSelectMany = true;
-
-		let lastSelectedItems = new Set<McpPick>();
-		let ignoreEvent = false;
-
-		const _update = () => {
-			ignoreEvent = true;
-			try {
-				const items = picks.filter((p): p is McpPick => p.type === 'item' && Boolean(p.picked));
-				lastSelectedItems = new Set(items);
-				picker.items = picks;
-				picker.selectedItems = items;
-			} finally {
-				ignoreEvent = false;
-			}
-		};
-
-		_update();
-		picker.show();
-
-		store.add(picker.onDidChangeSelection(selectedPicks => {
-			if (ignoreEvent) {
-				return;
-			}
-
-			const { added, removed } = diffSets(lastSelectedItems, new Set(selectedPicks));
-
-			for (const item of added) {
-				item.picked = true;
-
-				if (isServerPick(item)) {
-					// add server -> add back tools
-					for (const toolPick of item.toolPicks) {
-						toolPick.picked = true;
-					}
-				} else if (isToolPick(item)) {
-					// add server when tool is picked
-					item.parent.picked = true;
-				}
-			}
-
-			for (const item of removed) {
-				item.picked = false;
-
-				if (isServerPick(item)) {
-					// removed server -> remove tools
-					for (const toolPick of item.toolPicks) {
-						toolPick.picked = false;
-					}
-				} else if (isToolPick(item) && item.parent.toolPicks.every(child => !child.picked)) {
-					// remove LAST tool -> remove server
-					item.parent.picked = false;
-				}
-			}
-
-			transaction(tx => {
-				for (const item of picks) {
-					if (isToolPick(item)) {
-						item.tool.updateEnablement(item.picked, tx);
-					}
-				}
-			});
-
-			_update();
-		}));
-
-
-		await Promise.race([Event.toPromise(Event.any(picker.onDidAccept, picker.onDidHide))]);
-
-		store.dispose();
-
-	}
-}
-
-export class AttachMCPToolsActionRendering extends Disposable implements IWorkbenchContribution {
+export class MCPServerActionRendering extends Disposable implements IWorkbenchContribution {
 	public static readonly ID = 'workbench.contrib.mcp.discovery';
 
 	constructor(
@@ -357,19 +197,6 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 			Refreshing,
 		}
 
-		const toolsCount = derived(r => {
-			let count = 0;
-			let enabled = 0;
-			const servers = mcpService.servers.read(r);
-			for (const server of servers) {
-				for (const tool of server.tools.read(r)) {
-					count += 1;
-					enabled += tool.enabled.read(r) ? 1 : 0;
-				}
-			}
-			return { count, enabled };
-		});
-
 		const displayedState = derived(reader => {
 			const servers = mcpService.servers.read(reader);
 			const serversPerState: IMcpServer[][] = [];
@@ -399,7 +226,7 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 			return { state: maxState, servers: serversPerState[maxState] };
 		});
 
-		this._store.add(actionViewItemService.register(MenuId.ChatInputAttachmentToolbar, AttachMCPToolsAction.id, (action, options) => {
+		this._store.add(actionViewItemService.register(MenuId.ChatInputAttachmentToolbar, McpServerOptionsCommand.id, (action, options) => {
 			if (!(action instanceof MenuItemAction)) {
 				return undefined;
 			}
@@ -407,10 +234,9 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 			return instaService.createInstance(class extends MenuEntryActionViewItem {
 
 				override render(container: HTMLElement): void {
-					this.options.icon = false;
-					this.options.label = true;
-					container.classList.add('chat-mcp');
+
 					super.render(container);
+					container.classList.add('chat-mcp');
 
 					const action = h('button.chat-mcp-action', [h('span@icon')]);
 
@@ -420,11 +246,6 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 						this.updateTooltip();
 						container.classList.toggle('chat-mcp-has-action', state !== DisplayedState.None);
 
-						if (state === DisplayedState.None) {
-							root.remove();
-							return;
-						}
-
 						if (!root.parentElement) {
 							container.appendChild(root);
 						}
@@ -442,26 +263,28 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 							root.classList.add('chat-mcp-action-refreshing');
 							icon.classList.add(...ThemeIcon.asClassNameArray(spinningLoading));
 						} else {
-							assertNever(state);
+							root.remove();
 						}
 					}));
+				}
 
-					this._register(addDisposableListener(action.root, EventType.CLICK, e => {
-						e.preventDefault();
-						e.stopPropagation();
+				override async onClick(e: MouseEvent): Promise<void> {
+					e.preventDefault();
+					e.stopPropagation();
 
-						const { state, servers } = displayedState.get();
-						if (state === DisplayedState.NewTools) {
-							servers.forEach(server => server.start());
-						} else if (state === DisplayedState.Refreshing) {
-							servers.at(-1)?.showOutput();
-						} else if (state === DisplayedState.Error) {
-							const server = servers.at(-1);
-							if (server) {
-								commandService.executeCommand(McpServerOptionsCommand.id, server.definition.id);
-							}
+					const { state, servers } = displayedState.get();
+					if (state === DisplayedState.NewTools) {
+						servers.forEach(server => server.start());
+					} else if (state === DisplayedState.Refreshing) {
+						servers.at(-1)?.showOutput();
+					} else if (state === DisplayedState.Error) {
+						const server = servers.at(-1);
+						if (server) {
+							commandService.executeCommand(McpServerOptionsCommand.id, server.definition.id);
 						}
-					}));
+					} else {
+						commandService.executeCommand(ListMcpServerCommand.id);
+					}
 				}
 
 				protected override getTooltip(): string {
@@ -480,27 +303,10 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 					}
 				}
 
-				protected override updateLabel(): void {
-					this._store.add(autorun(r => {
-						assertType(this.label);
-
-						const { enabled, count } = toolsCount.read(r);
-
-						if (count === 0) {
-							super.updateLabel();
-							return;
-						}
-
-						const message = enabled !== count
-							? localize('tool.1', "{0} {1} of {2}", '$(tools)', enabled, count)
-							: localize('tool.0', "{0} {1}", '$(tools)', count);
-						reset(this.label, ...renderLabelWithIcons(message));
-					}));
-				}
 
 			}, action, { ...options, keybindingNotRenderedWithLabel: true });
 
-		}, Event.fromObservable(toolsCount)));
+		}, Event.fromObservable(displayedState)));
 	}
 }
 
@@ -522,4 +328,3 @@ export class ResetMcpTrustCommand extends Action2 {
 		mcpService.resetTrust();
 	}
 }
-
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServer.ts b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
index d757f755645e..6dee0ceb3fea 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServer.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
@@ -247,10 +247,6 @@ export class McpTool implements IMcpTool {
 
 	readonly id: string;
 
-	private _enabled = observableValue<boolean>(this, true);
-
-	readonly enabled: IObservable<boolean> = this._enabled;
-
 	constructor(
 		private readonly _server: McpServer,
 		public readonly definition: MCP.Tool,
@@ -258,10 +254,6 @@ export class McpTool implements IMcpTool {
 		this.id = `${_server.definition.id}_${definition.name}`.replaceAll('.', '_');
 	}
 
-	updateEnablement(value: boolean, tx?: ITransaction): void {
-		this._enabled.set(value, tx);
-	}
-
 	call(params: Record<string, unknown>, token?: CancellationToken): Promise<MCP.CallToolResult> {
 		return this._server.callOn(h => h.callTool({ name: this.definition.name, arguments: params }), token);
 	}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpService.ts b/src/vs/workbench/contrib/mcp/common/mcpService.ts
index f08e7af0f483..6ebe4154db09 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpService.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpService.ts
@@ -5,10 +5,10 @@
 
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { autorun, autorunWithStore, derived, IObservable, observableValue } from '../../../../base/common/observable.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun, derived, IObservable, observableValue } from '../../../../base/common/observable.js';
 import { localize } from '../../../../nls.js';
-import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { StorageScope } from '../../../../platform/storage/common/storage.js';
@@ -79,9 +79,9 @@ export class McpService extends Disposable implements IMcpService {
 
 		const tools = this._register(new MutableDisposable());
 
-		this._register(autorunWithStore((reader, store) => {
+		this._register(autorun(r => {
 
-			const servers = this._servers.read(reader);
+			const servers = this._servers.read(r);
 
 			// TODO@jrieken wasteful, needs some diff'ing/change-info
 			const newStore = new DisposableStore();
@@ -90,23 +90,17 @@ export class McpService extends Disposable implements IMcpService {
 
 			for (const server of servers) {
 
-				for (const tool of server.tools.read(reader)) {
-
-					const ctxKey = new RawContextKey<boolean>(`mcp.tool.${tool.id}.enabled`, true);
-					const ctxInst = contextKeyService.createKey<boolean>(ctxKey.key, true);
-					store.add(toDisposable(() => ctxInst.reset()));
-					store.add(autorun(reader => {
-						ctxInst.set(tool.enabled.read(reader));
-					}));
-
+				for (const tool of server.tools.read(r)) {
 
 					newStore.add(toolsService.registerToolData({
 						id: tool.id,
 						displayName: tool.definition.name,
+						toolReferenceName: tool.definition.name,
 						modelDescription: tool.definition.description ?? '',
+						userDescription: tool.definition.description ?? '',
 						inputSchema: tool.definition.inputSchema,
-						when: ctxKey.isEqualTo(true),
-						tags: ['mcp', 'vscode_editing']
+						canBeReferencedInPrompt: true,
+						tags: ['mcp', 'vscode_editing'] // TODO@jrieken remove this tag
 					}));
 					newStore.add(toolsService.registerToolImplementation(tool.id, {
 
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
index 825fc7313f41..da778a2a6cf8 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
@@ -7,7 +7,7 @@ import { assertNever } from '../../../../base/common/assert.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { equals as objectsEqual } from '../../../../base/common/objects.js';
-import { IObservable, ITransaction } from '../../../../base/common/observable.js';
+import { IObservable } from '../../../../base/common/observable.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
 import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
@@ -141,10 +141,6 @@ export interface IMcpTool {
 
 	readonly definition: MCP.Tool;
 
-	readonly enabled: IObservable<boolean>;
-
-	updateEnablement(value: boolean, tx?: ITransaction): void;
-
 	/**
 	 * Calls a tool
 	 * @throws {@link MpcResponseError} if the tool fails to execute
diff --git a/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts b/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts
index 5859111049a0..24bdd2d404ad 100644
--- a/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts
+++ b/src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts
@@ -218,6 +218,20 @@ declare module 'vscode' {
 		Omitted = 3
 	}
 
+
+	export interface ChatRequest {
+
+		/**
+		 * A list of tools that the user selected for this request, when `undefined` any tool
+		 * from {@link lm.tools} should be used.
+		 *
+		 * Tools can be called with {@link lm.invokeTool} with input that match their
+		 * declared `inputSchema`.
+		 */
+		readonly tools: readonly LanguageModelToolInformation[] | undefined;
+	}
+
+
 	/**
 	 * Does this piggy-back on the existing ChatRequest, or is it a different type of request entirely?
 	 * Does it show up in history?

From 877af02b7fae00a1a20f5acca92af321b57f6f30 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 14 Mar 2025 14:16:31 +0100
Subject: [PATCH 0927/1815] polish tool picker (#243560)

* reset selected tools for new chat
* honor selected tools on subsequent pick
---
 .../chat/browser/actions/chatToolActions.ts   | 22 +++++++++++--------
 .../contrib/chat/browser/chatInputPart.ts     |  2 ++
 .../contrib/chat/browser/chatSelectedTools.ts |  6 ++++-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
index b020d03d83e8..5d71ac109d1e 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
@@ -137,6 +137,7 @@ export class AttachToolsAction extends Action2 {
 			picked: true,
 		};
 
+		const nowSelectedTools = new Set(widget.input.selectedToolsModel.tools.get());
 		const toolBuckets = new Map<string, BucketPick>();
 
 		for (const tool of toolsService.getTools()) {
@@ -156,7 +157,7 @@ export class AttachToolsAction extends Action2 {
 					// description: mcpServer.definition.,
 					status: localize('desc', "MCP - {0} ({1})", mcpServer.collection.label, McpConnectionState.toString(mcpServer.connectionState.get())),
 					ordinal: BucketOrdinal.Mcp,
-					picked: true,
+					picked: false,
 					children: []
 				};
 				toolBuckets.set(mcpServer.definition.id, bucket);
@@ -165,7 +166,7 @@ export class AttachToolsAction extends Action2 {
 					type: 'item',
 					label: ext.displayName ?? ext.name,
 					ordinal: BucketOrdinal.Extension,
-					picked: true,
+					picked: false,
 					children: []
 				};
 				toolBuckets.set(ExtensionIdentifier.toKey(ext.identifier), bucket);
@@ -173,15 +174,21 @@ export class AttachToolsAction extends Action2 {
 				bucket = defaultBucket;
 			}
 
+			const picked = nowSelectedTools.has(tool);
+
 			bucket.children.push({
 				tool,
 				parent: bucket,
 				type: 'item',
 				label: `$(tools) ${tool.displayName}`,
 				description: tool.userDescription,
-				picked: true,
+				picked,
 				iconClasses: ['tool-pick']
 			});
+
+			if (picked) {
+				bucket.picked = true;
+			}
 		}
 
 		function isBucketPick(obj: any): obj is BucketPick {
@@ -220,6 +227,9 @@ export class AttachToolsAction extends Action2 {
 				lastSelectedItems = new Set(items);
 				picker.items = picks;
 				picker.selectedItems = items;
+
+				widget.input.selectedToolsModel.update(items.filter(isToolPick).map(tool => tool.tool));
+
 			} finally {
 				ignoreEvent = false;
 			}
@@ -266,14 +276,8 @@ export class AttachToolsAction extends Action2 {
 			_update();
 		}));
 
-
 		await Promise.race([Event.toPromise(Event.any(picker.onDidAccept, picker.onDidHide))]);
-
-		const selectedTools = picker.selectedItems.filter(isToolPick);
-
 		store.dispose();
-
-		widget.input.selectedToolsModel.update(selectedTools.map(tool => tool.tool));
 	}
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index e910bcc96522..77c919afc17e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -565,6 +565,8 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		} else if (this.location === ChatAgentLocation.EditingSession) {
 			this.setChatMode(ChatMode.Edit);
 		}
+
+		this.selectedToolsModel.reset();
 	}
 
 	logInputHistory(): void {
diff --git a/src/vs/workbench/contrib/chat/browser/chatSelectedTools.ts b/src/vs/workbench/contrib/chat/browser/chatSelectedTools.ts
index f3635c1a603d..57ae4a9faf29 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSelectedTools.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSelectedTools.ts
@@ -84,7 +84,11 @@ export class ChatSelectedTools extends Disposable {
 		}, Event.fromObservable(toolsCount)));
 	}
 
-	update(tools: IToolData[] | undefined): void {
+	update(tools: IToolData[]): void {
 		this._selectedTools.set(tools, undefined);
 	}
+
+	reset(): void {
+		this._selectedTools.set(undefined, undefined);
+	}
 }

From f172409aa1aeef7249d5b8b002c6a7e83a73a2db Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 14 Mar 2025 06:25:36 -0700
Subject: [PATCH 0928/1815] Fix long multi-line command in sub-execution

Fixes #243562
---
 .../common/extHostTerminalShellIntegration.ts |  4 +-
 .../extHostTerminalShellIntegration.test.ts   | 59 +++++++++++++++++++
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
index dfcaba30c534..5ab8edeb955a 100644
--- a/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
+++ b/src/vs/workbench/api/common/extHostTerminalShellIntegration.ts
@@ -473,8 +473,8 @@ function isSubExecution(unresolvedCommandLines: string[], commandLine: vscode.Te
 	if (newUnresolvedCommandLines && newUnresolvedCommandLines.length > 0) {
 		// If all sub-execution lines are in the command line, this is part of the
 		// multi-line execution.
-		for (let i = 0; i < newUnresolvedCommandLines.length; i++) {
-			if (newUnresolvedCommandLines[i] !== subExecutionLines[i]) {
+		while (newUnresolvedCommandLines.length > 0) {
+			if (newUnresolvedCommandLines[0] !== subExecutionLines[0]) {
 				break;
 			}
 			newUnresolvedCommandLines.shift();
diff --git a/src/vs/workbench/api/test/common/extHostTerminalShellIntegration.test.ts b/src/vs/workbench/api/test/common/extHostTerminalShellIntegration.test.ts
index 99fc1749ef02..5c631e5f383f 100644
--- a/src/vs/workbench/api/test/common/extHostTerminalShellIntegration.test.ts
+++ b/src/vs/workbench/api/test/common/extHostTerminalShellIntegration.test.ts
@@ -25,6 +25,9 @@ function asCmdLine(value: string | TerminalShellExecutionCommandLine): TerminalS
 	}
 	return value;
 }
+function vsc(data: string) {
+	return `\x1b]633;${data}\x07`;
+}
 
 const testCommandLine = 'echo hello world';
 const testCommandLine2 = 'echo goodbye world';
@@ -206,5 +209,61 @@ suite('InternalTerminalShellIntegration', () => {
 				{ commandLine, type: 'end' },
 			]);
 		});
+
+		test('multi-line command with long second command', async () => {
+			const commandLine = 'echo foo\ncat << EOT\nline1\nline2\nline3\nEOT';
+			const subCommandLine1 = 'echo foo';
+			const subCommandLine2 = 'cat << EOT\nline1\nline2\nline3\nEOT';
+
+			const apiRequestedExecution = si.requestNewShellExecution(cmdLine(commandLine), undefined);
+			const startedExecution = await startExecutionAwaitObject(subCommandLine1);
+			strictEqual(startedExecution, apiRequestedExecution.value);
+
+			si.emitData(`${vsc('C')}foo`);
+			si.endShellExecution(cmdLine(subCommandLine1), 0);
+			si.startShellExecution(cmdLine(subCommandLine2), undefined);
+			si.emitData(`${vsc('C')}line1`);
+			si.emitData('line2');
+			si.emitData('line3');
+			const endedExecution = await endExecutionAwaitObject(subCommandLine2);
+			strictEqual(startedExecution, endedExecution);
+
+			assertTrackedEvents([
+				{ commandLine, type: 'start' },
+				{ commandLine, type: 'data', data: `${vsc('C')}foo` },
+				{ commandLine, type: 'data', data: `${vsc('C')}line1` },
+				{ commandLine, type: 'data', data: 'line2' },
+				{ commandLine, type: 'data', data: 'line3' },
+				{ commandLine, type: 'end' },
+			]);
+		});
+
+		test('multi-line command comment followed by long second command', async () => {
+			const commandLine = '# comment: foo\ncat << EOT\nline1\nline2\nline3\nEOT';
+			const subCommandLine1 = '# comment: foo';
+			const subCommandLine2 = 'cat << EOT\nline1\nline2\nline3\nEOT';
+
+			const apiRequestedExecution = si.requestNewShellExecution(cmdLine(commandLine), undefined);
+			const startedExecution = await startExecutionAwaitObject(subCommandLine1);
+			strictEqual(startedExecution, apiRequestedExecution.value);
+
+			si.emitData(`${vsc('C')}`);
+			si.endShellExecution(cmdLine(subCommandLine1), 0);
+			si.startShellExecution(cmdLine(subCommandLine2), undefined);
+			si.emitData(`${vsc('C')}line1`);
+			si.emitData('line2');
+			si.emitData('line3');
+			const endedExecution = await endExecutionAwaitObject(subCommandLine2);
+			strictEqual(startedExecution, endedExecution);
+
+			assertTrackedEvents([
+				{ commandLine, type: 'start' },
+				{ commandLine, type: 'data', data: `${vsc('C')}` },
+				{ commandLine, type: 'data', data: `${vsc('C')}line1` },
+				{ commandLine, type: 'data', data: 'line2' },
+				{ commandLine, type: 'data', data: 'line3' },
+				{ commandLine, type: 'end' },
+			]);
+		});
 	});
 });

From 8401a5d835f35504caea174732538523f6f92fb6 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 14 Mar 2025 06:34:51 -0700
Subject: [PATCH 0929/1815] Add more complex test case

---
 .../extHostTerminalShellIntegration.test.ts   | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/vs/workbench/api/test/common/extHostTerminalShellIntegration.test.ts b/src/vs/workbench/api/test/common/extHostTerminalShellIntegration.test.ts
index 5c631e5f383f..2b9b89da2250 100644
--- a/src/vs/workbench/api/test/common/extHostTerminalShellIntegration.test.ts
+++ b/src/vs/workbench/api/test/common/extHostTerminalShellIntegration.test.ts
@@ -265,5 +265,43 @@ suite('InternalTerminalShellIntegration', () => {
 				{ commandLine, type: 'end' },
 			]);
 		});
+
+		test('4 multi-line commands with output', async () => {
+			const commandLine = 'echo "\nfoo"\ngit commit -m "hello\n\nworld"\ncat << EOT\nline1\nline2\nline3\nEOT\n{\necho "foo"\n}';
+			const subCommandLine1 = 'echo "\nfoo"';
+			const subCommandLine2 = 'git commit -m "hello\n\nworld"';
+			const subCommandLine3 = 'cat << EOT\nline1\nline2\nline3\nEOT';
+			const subCommandLine4 = '{\necho "foo"\n}';
+
+			const apiRequestedExecution = si.requestNewShellExecution(cmdLine(commandLine), undefined);
+			const startedExecution = await startExecutionAwaitObject(subCommandLine1);
+			strictEqual(startedExecution, apiRequestedExecution.value);
+
+			si.emitData(`${vsc('C')}foo`);
+			si.endShellExecution(cmdLine(subCommandLine1), 0);
+			si.startShellExecution(cmdLine(subCommandLine2), undefined);
+			si.emitData(`${vsc('C')} 2 files changed, 61 insertions(+), 2 deletions(-)`);
+			si.endShellExecution(cmdLine(subCommandLine2), 0);
+			si.startShellExecution(cmdLine(subCommandLine3), undefined);
+			si.emitData(`${vsc('C')}line1`);
+			si.emitData('line2');
+			si.emitData('line3');
+			si.endShellExecution(cmdLine(subCommandLine3), 0);
+			si.emitData(`${vsc('C')}foo`);
+			si.startShellExecution(cmdLine(subCommandLine4), undefined);
+			const endedExecution = await endExecutionAwaitObject(subCommandLine4);
+			strictEqual(startedExecution, endedExecution);
+
+			assertTrackedEvents([
+				{ commandLine, type: 'start' },
+				{ commandLine, type: 'data', data: `${vsc('C')}foo` },
+				{ commandLine, type: 'data', data: `${vsc('C')} 2 files changed, 61 insertions(+), 2 deletions(-)` },
+				{ commandLine, type: 'data', data: `${vsc('C')}line1` },
+				{ commandLine, type: 'data', data: 'line2' },
+				{ commandLine, type: 'data', data: 'line3' },
+				{ commandLine, type: 'data', data: `${vsc('C')}foo` },
+				{ commandLine, type: 'end' },
+			]);
+		});
 	});
 });

From e1d002cb8664ebd34891287b937456516802a4cc Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Fri, 14 Mar 2025 15:14:53 +0100
Subject: [PATCH 0930/1815] * use `ExtensionPoint#setHandler` instead of custom
 logic * enforce in main thread that collection are registered

---
 src/vs/workbench/api/browser/mainThreadMcp.ts |  47 +++-----
 .../workbench/api/common/extHost.protocol.ts  |   5 +-
 src/vs/workbench/api/common/extHostMcp.ts     |  14 +--
 .../contrib/mcp/browser/mcp.contribution.ts   |   5 +-
 .../contrib/mcp/common/mcpRegistry.ts         |   1 -
 .../contrib/mcp/common/mcpService.ts          | 114 ++++++------------
 .../workbench/contrib/mcp/common/mcpTypes.ts  |   5 +
 7 files changed, 62 insertions(+), 129 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadMcp.ts b/src/vs/workbench/api/browser/mainThreadMcp.ts
index b18bebf211f0..bfa1a80cc050 100644
--- a/src/vs/workbench/api/browser/mainThreadMcp.ts
+++ b/src/vs/workbench/api/browser/mainThreadMcp.ts
@@ -4,10 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Emitter } from '../../../base/common/event.js';
-import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
 import { ISettableObservable, observableValue } from '../../../base/common/observable.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 import { IMcpMessageTransport, IMcpRegistry } from '../../contrib/mcp/common/mcpRegistryTypes.js';
-import { McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
+import { extensionPrefixedIdentifier, McpConnectionState, McpServerDefinition, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
 import { MCP } from '../../contrib/mcp/common/modelContextProtocol.js';
 import { ExtensionHostKind } from '../../services/extensions/common/extensionHostKind.js';
 import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
@@ -19,28 +20,23 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 	private _serverIdCounter = 0;
 
 	private readonly _servers: Map<number, ExtHostMcpServerLaunch> = new Map();
-	private readonly _collectionDefinitions = this._register(new DisposableMap<string, {
-		fromExtHost: McpCollectionDefinition.FromExtHost;
-		servers: ISettableObservable<readonly McpServerDefinition[]>;
-		dispose(): void;
-	}>());
 
 	constructor(
-		private readonly _extHostContext: IExtHostContext,
+		extHostContext: IExtHostContext,
 		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry,
 	) {
 		super();
-		const proxy = _extHostContext.getProxy(ExtHostContext.ExtHostMcp);
+		const proxy = extHostContext.getProxy(ExtHostContext.ExtHostMcp);
 		this._register(this._mcpRegistry.registerDelegate({
 			waitForInitialProviderPromises() {
 				return proxy.$waitForInitialCollectionProviders();
 			},
 			canStart(collection, serverDefinition) {
 				// todo: SSE MPC servers without a remote authority could be served from the renderer
-				if (collection.remoteAuthority !== _extHostContext.remoteAuthority) {
+				if (collection.remoteAuthority !== extHostContext.remoteAuthority) {
 					return false;
 				}
-				if (serverDefinition.launch.type === McpServerTransportType.Stdio && _extHostContext.extensionHostKind === ExtensionHostKind.LocalWebWorker) {
+				if (serverDefinition.launch.type === McpServerTransportType.Stdio && extHostContext.extensionHostKind === ExtensionHostKind.LocalWebWorker) {
 					return false;
 				}
 				return true;
@@ -60,29 +56,16 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 		}));
 	}
 
-	$upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, serversDto: McpServerDefinition.Serialized[]): void {
-		const servers = serversDto.map(McpServerDefinition.fromSerialized);
-		const existing = this._collectionDefinitions.get(collection.id);
-		if (existing) {
-			existing.servers.set(servers, undefined);
-		} else {
-			const serverDefinitions = observableValue<readonly McpServerDefinition[]>('mcpServers', servers);
-			const handle = this._mcpRegistry.registerCollection({
-				...collection,
-				remoteAuthority: this._extHostContext.remoteAuthority,
-				serverDefinitions,
-			});
-
-			this._collectionDefinitions.set(collection.id, {
-				fromExtHost: collection,
-				servers: serverDefinitions,
-				dispose: () => handle.dispose(),
-			});
+	$setMcpServers(extension: ExtensionIdentifier, id: string, serversDto: McpServerDefinition.Serialized[]): void {
+
+		const fid = extensionPrefixedIdentifier(extension, id);
+		const existing = this._mcpRegistry.collections.get().find(c => c.id === fid);
+		if (!existing) {
+			throw new Error(`[MCP] UNKNOWN collection ${fid}`);
 		}
-	}
 
-	$deleteMcpCollection(collectionId: string): void {
-		this._collectionDefinitions.deleteAndDispose(collectionId);
+		const servers = serversDto.map(McpServerDefinition.fromSerialized);
+		(existing.serverDefinitions as ISettableObservable<typeof servers>).set(servers, undefined);
 	}
 
 	$onDidChangeState(id: number, update: McpConnectionState): void {
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 02bb1cd048ba..3b9b8dd8013b 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -61,7 +61,7 @@ import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { IChatMessage, IChatResponseFragment, ILanguageModelChatMetadata, ILanguageModelChatSelector, ILanguageModelsChangeEvent } from '../../contrib/chat/common/languageModels.js';
 import { IPreparedToolInvocation, IToolData, IToolInvocation, IToolResult } from '../../contrib/chat/common/languageModelToolsService.js';
 import { DebugConfigurationProviderTriggerKind, IAdapterDescriptor, IConfig, IDebugSessionReplMode, IDebugTestRunReference, IDebugVisualization, IDebugVisualizationContext, IDebugVisualizationTreeItem, MainThreadDebugVisualization } from '../../contrib/debug/common/debug.js';
-import { McpServerLaunch, McpConnectionState, McpCollectionDefinition, McpServerDefinition } from '../../contrib/mcp/common/mcpTypes.js';
+import { McpServerLaunch, McpConnectionState, McpServerDefinition } from '../../contrib/mcp/common/mcpTypes.js';
 import * as notebookCommon from '../../contrib/notebook/common/notebookCommon.js';
 import { CellExecutionUpdateType } from '../../contrib/notebook/common/notebookExecutionService.js';
 import { ICellExecutionComplete, ICellExecutionStateUpdate } from '../../contrib/notebook/common/notebookExecutionStateService.js';
@@ -2980,8 +2980,7 @@ export interface MainThreadMcpShape {
 	$onDidChangeState(id: number, state: McpConnectionState): void;
 	$onDidPublishLog(id: number, log: string): void;
 	$onDidReceiveMessage(id: number, message: string): void;
-	$upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, servers: Dto<McpServerDefinition>[]): void;
-	$deleteMcpCollection(collectionId: string): void;
+	$setMcpServers(extension: ExtensionIdentifier, id: string, serversDto: McpServerDefinition.Serialized[]): void;
 }
 
 export interface ExtHostLocalizationShape {
diff --git a/src/vs/workbench/api/common/extHostMcp.ts b/src/vs/workbench/api/common/extHostMcp.ts
index a948fa80dc8b..26f9851f9bec 100644
--- a/src/vs/workbench/api/common/extHostMcp.ts
+++ b/src/vs/workbench/api/common/extHostMcp.ts
@@ -8,8 +8,7 @@ import { CancellationToken } from '../../../base/common/cancellation.js';
 import { DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
-import { StorageScope } from '../../../platform/storage/common/storage.js';
-import { extensionMcpCollectionPrefix, McpCollectionDefinition, McpServerDefinition, McpServerLaunch, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
+import { McpServerDefinition, McpServerLaunch, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
 import { ExtHostMcpShape, MainContext, MainThreadMcpShape } from './extHost.protocol.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 
@@ -54,12 +53,7 @@ export class ExtHostMcpService implements IExtHostMpcService {
 			throw new Error(`MCP configuration providers must be registered in the contributes.modelContextServerCollections array within your package.json, but "${id}" was not`);
 		}
 
-		const mcp: McpCollectionDefinition.FromExtHost = {
-			id: extensionMcpCollectionPrefix + id,
-			isTrustedByDefault: true,
-			label: metadata?.label ?? extension.displayName ?? extension.name,
-			scope: StorageScope.WORKSPACE
-		};
+
 		const update = async () => {
 
 			const list = await provider.provideMcpServerDefinitions(CancellationToken.None);
@@ -89,11 +83,11 @@ export class ExtHostMcpService implements IExtHostMpcService {
 				});
 			}
 
-			this._proxy.$upsertMcpCollection(mcp, servers);
+			this._proxy.$setMcpServers(extension.identifier, id, servers);
 		};
 
 		store.add(toDisposable(() => {
-			this._proxy.$deleteMcpCollection(mcp.id);
+			this._proxy.$setMcpServers(extension.identifier, id, []);
 		}));
 
 		if (provider.onDidChange) {
diff --git a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
index 6aef6e08d5a9..882f1bd09552 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
@@ -12,13 +12,12 @@ import { mcpSchemaId } from '../../../services/configuration/common/configuratio
 import { ConfigMcpDiscovery } from '../common/discovery/configMcpDiscovery.js';
 import { mcpDiscoveryRegistry } from '../common/discovery/mcpDiscovery.js';
 import { RemoteNativeMpcDiscovery } from '../common/discovery/nativeMcpRemoteDiscovery.js';
-import { mcpContributionPoint, mcpServerSchema } from '../common/mcpConfiguration.js';
+import { mcpServerSchema } from '../common/mcpConfiguration.js';
 import { McpRegistry } from '../common/mcpRegistry.js';
 import { IMcpRegistry } from '../common/mcpRegistryTypes.js';
 import { McpService } from '../common/mcpService.js';
 import { IMcpService } from '../common/mcpTypes.js';
 import { McpDiscovery } from './mcpDiscovery.js';
-import * as extensionsRegistry from '../../../services/extensions/common/extensionsRegistry.js';
 
 import { MCPServerActionRendering, ListMcpServerCommand, ResetMcpTrustCommand, McpServerOptionsCommand, ResetMcpCachedTools } from './mcpCommands.js';
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
@@ -41,5 +40,3 @@ registerWorkbenchContribution2('mcpActionRendering', MCPServerActionRendering, W
 
 const jsonRegistry = <jsonContributionRegistry.IJSONContributionRegistry>Registry.as(jsonContributionRegistry.Extensions.JSONContribution);
 jsonRegistry.registerSchema(mcpSchemaId, mcpServerSchema);
-
-extensionsRegistry.ExtensionsRegistry.registerExtensionPoint(mcpContributionPoint);
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
index 88ebdc0ba714..5ab82f0ec75c 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
@@ -191,4 +191,3 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 		);
 	}
 }
-
diff --git a/src/vs/workbench/contrib/mcp/common/mcpService.ts b/src/vs/workbench/contrib/mcp/common/mcpService.ts
index 0e64f1e6ff05..30b24c58a577 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpService.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpService.ts
@@ -5,21 +5,21 @@
 
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableMap, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { autorun, derived, IObservable, observableValue, transaction } from '../../../../base/common/observable.js';
 import { localize } from '../../../../nls.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { ExtensionIdentifier, IRelaxedExtensionDescription } from '../../../../platform/extensions/common/extensions.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 { IProductService } from '../../../../platform/product/common/productService.js';
 import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { ILanguageModelToolsService, IToolResult } from '../../chat/common/languageModelToolsService.js';
-import { mcpActivationEvent } from './mcpConfiguration.js';
+import { mcpActivationEvent, mcpContributionPoint } from './mcpConfiguration.js';
 import { IMcpRegistry } from './mcpRegistryTypes.js';
 import { McpServer, McpServerMetadataCache } from './mcpServer.js';
-import { extensionMcpCollectionPrefix, IMcpServer, IMcpService, McpCollectionDefinition, McpCollectionSortOrder, McpServerDefinition } from './mcpTypes.js';
+import { extensionMcpCollectionPrefix, extensionPrefixedIdentifier, IMcpServer, IMcpService, McpCollectionDefinition, McpServerDefinition } from './mcpTypes.js';
+import * as extensionsRegistry from '../../../services/extensions/common/extensionsRegistry.js';
 
 interface IExtensionCollectionsRec {
 	extensionId: ExtensionIdentifier;
@@ -32,6 +32,9 @@ interface IExtensionCollectionsRec {
 	pendingServers: IMcpServer[] | undefined;
 }
 
+
+const _mcpExtensionPoint = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint(mcpContributionPoint);
+
 export class McpService extends Disposable implements IMcpService {
 
 	declare _serviceBrand: undefined;
@@ -54,7 +57,6 @@ export class McpService extends Disposable implements IMcpService {
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry,
 		@ILanguageModelToolsService toolsService: ILanguageModelToolsService,
-		@IContextKeyService contextKeyService: IContextKeyService,
 		@IProductService productService: IProductService,
 		@IExtensionService private readonly _extensionService: IExtensionService,
 		@IStorageService storageService: IStorageService,
@@ -86,15 +88,33 @@ export class McpService extends Disposable implements IMcpService {
 			updateThrottle.schedule(500);
 		}));
 
-		// Handle servers contributed by extensions.
-		this._register(_extensionService.onDidChangeExtensions(e => {
-			this._onExtensions(e.added);
-		}));
-		this._register(_extensionService.onDidChangeExtensionsStatus(() => {
-			this._onExtensionStatus();
-		}));
-		this._extensionService.whenInstalledExtensionsRegistered().then(() => {
-			this._onExtensions(_extensionService.extensions);
+		const extensionCollections = this._register(new DisposableMap<string>());
+
+		_mcpExtensionPoint.setHandler((_extensions, delta) => {
+			const { added, removed } = delta;
+
+			for (const collections of removed) {
+				for (const coll of collections.value) {
+					extensionCollections.deleteAndDispose(extensionPrefixedIdentifier(collections.description.identifier, coll.id));
+				}
+			}
+
+			for (const collections of added) {
+				for (const coll of collections.value) {
+
+					const id = extensionPrefixedIdentifier(collections.description.identifier, coll.id);
+					const dispo = _mcpRegistry.registerCollection({
+						id,
+						label: coll.label,
+						remoteAuthority: null,
+						isTrustedByDefault: true,
+						scope: StorageScope.WORKSPACE,
+						serverDefinitions: observableValue<McpServerDefinition[]>(this, [])
+					});
+
+					extensionCollections.set(id, dispo);
+				}
+			}
 		});
 
 		const tools = this._register(new MutableDisposable());
@@ -254,70 +274,6 @@ export class McpService extends Disposable implements IMcpService {
 		});
 	}
 
-	private _onExtensions(extensions: readonly Readonly<IRelaxedExtensionDescription>[]) {
-		const newRecs: IExtensionCollectionsRec[] = [];
-		for (const extension of extensions) {
-			const collections = extension.contributes?.modelContextServerCollections;
-			if (!collections) {
-				continue;
-			}
-
-			for (const collection of collections) {
-				const id = extensionMcpCollectionPrefix + collection.id;
-				const pendingServers = this.workspaceCache.getServers(id)?.servers.map(server =>
-					this._instantiationService.createInstance(McpServer, { id, label: collection.label, presentation: { order: McpCollectionSortOrder.Extension } }, McpServerDefinition.fromSerialized(server), true, this.workspaceCache));
-				this._logService.debug(`MCP collection ${collection.id} hydrated for extension ${extension.identifier.value} (${pendingServers?.length})`);
-
-				newRecs.push({
-					extensionId: extension.identifier,
-					collectionId: id,
-					pendingServers
-				});
-			}
-		}
-
-		if (newRecs.length) {
-			this._extensionServers.set(this._extensionServers.get().concat(newRecs), undefined);
-		}
-	}
-
-	private async _onExtensionStatus() {
-		// This fires on activation but before providers might have published.
-		// Take the extensions that are active now, wait for all them to publish,
-		// then prune inactive servers.
-		const wereActive = Object.entries(this._extensionService.getExtensionsStatus())
-			.filter(([, status]) => !!status.activationTimes)
-			.map(([id]) => id);
-		await this._waitForInitialProvidersToPublish();
-
-		this._updateCollectedServers(); // ensure any pendingServers we know about were handled
-
-		// we move servers out of _extensionServers as they're registered. Once
-		// an extension finishes being activated, if there are any orphaned servers,
-		// then they are removed.
-		const toKeep: IExtensionCollectionsRec[] = [];
-		const currentRecs = this._extensionServers.get();
-		for (const rec of currentRecs) {
-			if (!wereActive.includes(rec.extensionId.value)) {
-				toKeep.push(rec); // keep waiting
-				continue;
-			}
-
-			this._extensionCollectionIdsToPersist.add(rec.collectionId);
-
-			if (rec.pendingServers) {
-				for (const server of rec.pendingServers) {
-					this._logService.debug(`Cached MCP server ${server.definition.id} removed because the extension no longer publishes it`);
-					server.dispose();
-				}
-			}
-		}
-
-		if (toKeep.length !== currentRecs.length) {
-			this._extensionServers.set(toKeep, undefined);
-		}
-	}
-
 	public override dispose(): void {
 		this._extensionServers.get().forEach(server => server.pendingServers?.forEach(s => s.dispose()));
 		this._publishedServers.get().forEach(server => server.dispose());
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
index 54ef1bd056fc..f2050a38c86b 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
@@ -11,6 +11,7 @@ import { IObservable } from '../../../../base/common/observable.js';
 import { URI, UriComponents } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
 import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { StorageScope } from '../../../../platform/storage/common/storage.js';
 import { IWorkspaceFolderData } from '../../../../platform/workspace/common/workspace.js';
@@ -19,6 +20,10 @@ import { MCP } from './modelContextProtocol.js';
 
 export const extensionMcpCollectionPrefix = 'ext.';
 
+export function extensionPrefixedIdentifier(identifier: ExtensionIdentifier, id: string): string {
+	return ExtensionIdentifier.toKey(identifier) + '/' + id;
+}
+
 /**
  * An McpCollection contains McpServers. There may be multiple collections for
  * different locations servers are discovered.

From 63637747724922f5f95604e7a6ca20ff32252a60 Mon Sep 17 00:00:00 2001
From: Joel Verhagen <joel.verhagen@gmail.com>
Date: Fri, 14 Mar 2025 10:32:10 -0400
Subject: [PATCH 0931/1815] Show support URL and license URL even if extension
 URL is not set (#243565)

---
 .../workbench/contrib/extensions/browser/extensionEditor.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
index ee1dd4d9db41..6c235d893935 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -1071,7 +1071,7 @@ class AdditionalDetailsWidget extends Disposable {
 		if (extension.url) {
 			resources.push([localize('Marketplace', "Marketplace"), URI.parse(extension.url)]);
 		}
-		if (extension.url && extension.supportUrl) {
+		if (extension.supportUrl) {
 			try {
 				resources.push([localize('issues', "Issues"), URI.parse(extension.supportUrl)]);
 			} catch (error) {/* Ignore */ }
@@ -1081,7 +1081,7 @@ class AdditionalDetailsWidget extends Disposable {
 				resources.push([localize('repository', "Repository"), URI.parse(extension.repository)]);
 			} catch (error) {/* Ignore */ }
 		}
-		if (extension.url && extension.licenseUrl) {
+		if (extension.licenseUrl) {
 			try {
 				resources.push([localize('license', "License"), URI.parse(extension.licenseUrl)]);
 			} catch (error) {/* Ignore */ }

From c17dd1da050e8af446ae11344c42ebb9c8729fec Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Fri, 14 Mar 2025 16:15:51 +0100
Subject: [PATCH 0932/1815] extension gallery manifest service (#243568)

- send gallery info from workbench to shared process
---
 .../sharedProcess/sharedProcessMain.ts        |   5 +-
 src/vs/code/node/cliProcessMain.ts            |   3 +
 .../common/extensionGalleryManifest.ts        |  69 ++++
 .../common/extensionGalleryManifestService.ts | 224 +++++++++++
 .../extensionGalleryManifestServiceIpc.ts     |  50 +++
 .../common/extensionGalleryService.ts         | 349 ++----------------
 .../common/extensionManagement.ts             |   1 -
 .../node/extensionManagementService.ts        |   4 +-
 .../node/remoteExtensionHostAgentCli.ts       |   3 +
 src/vs/server/node/serverServices.ts          |   3 +
 .../browser/extensions.contribution.ts        |  19 +-
 .../extensions/browser/extensionsActions.ts   |   9 +-
 .../browser/extensionsWorkbenchService.ts     |   4 +-
 .../common/extensionGalleryService.ts         |   4 +-
 .../extensionGalleryManifestService.ts        |  98 +++++
 src/vs/workbench/workbench.desktop.main.ts    |   1 +
 .../workbench/workbench.web.main.internal.ts  |   3 +
 17 files changed, 507 insertions(+), 342 deletions(-)
 create mode 100644 src/vs/platform/extensionManagement/common/extensionGalleryManifest.ts
 create mode 100644 src/vs/platform/extensionManagement/common/extensionGalleryManifestService.ts
 create mode 100644 src/vs/platform/extensionManagement/common/extensionGalleryManifestServiceIpc.ts
 create mode 100644 src/vs/workbench/services/extensionManagement/electron-sandbox/extensionGalleryManifestService.ts

diff --git a/src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts
index 16e9793483b5..e0240babbcf5 100644
--- a/src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts
+++ b/src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts
@@ -120,6 +120,8 @@ import { getCodeDisplayProtocol, getDisplayProtocol } from '../../../base/node/o
 import { RequestService } from '../../../platform/request/electron-utility/requestService.js';
 import { DefaultExtensionsInitializer } from './contrib/defaultExtensionsInitializer.js';
 import { AllowedExtensionsService } from '../../../platform/extensionManagement/common/allowedExtensionsService.js';
+import { IExtensionGalleryManifestService } from '../../../platform/extensionManagement/common/extensionGalleryManifest.js';
+import { ExtensionGalleryManifestIPCService } from '../../../platform/extensionManagement/common/extensionGalleryManifestServiceIpc.js';
 
 class SharedProcessMain extends Disposable implements IClientConnectionFilter {
 
@@ -331,6 +333,7 @@ class SharedProcessMain extends Disposable implements IClientConnectionFilter {
 		services.set(INativeServerExtensionManagementService, new SyncDescriptor(ExtensionManagementService, undefined, true));
 
 		// Extension Gallery
+		services.set(IExtensionGalleryManifestService, new ExtensionGalleryManifestIPCService(this.server, productService));
 		services.set(IExtensionGalleryService, new SyncDescriptor(ExtensionGalleryService, undefined, true));
 
 		// Extension Tips
@@ -376,8 +379,6 @@ class SharedProcessMain extends Disposable implements IClientConnectionFilter {
 
 	private initChannels(accessor: ServicesAccessor): void {
 
-		// const disposables = this._register(new DisposableStore());
-
 		// Extensions Management
 		const channel = new ExtensionManagementChannel(accessor.get(IExtensionManagementService), () => null);
 		this.server.registerChannel('extensions', channel);
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index 817baf739922..7087d2ac4318 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -66,6 +66,8 @@ import { FileUserDataProvider } from '../../platform/userData/common/fileUserDat
 import { addUNCHostToAllowlist, getUNCHost } from '../../base/node/unc.js';
 import { AllowedExtensionsService } from '../../platform/extensionManagement/common/allowedExtensionsService.js';
 import { McpManagementCli } from '../../platform/mcp/common/mcpManagementCli.js';
+import { IExtensionGalleryManifestService } from '../../platform/extensionManagement/common/extensionGalleryManifest.js';
+import { ExtensionGalleryManifestService } from '../../platform/extensionManagement/common/extensionGalleryManifestService.js';
 
 class CliMain extends Disposable {
 
@@ -209,6 +211,7 @@ class CliMain extends Disposable {
 		services.set(IExtensionSignatureVerificationService, new SyncDescriptor(ExtensionSignatureVerificationService, undefined, true));
 		services.set(IAllowedExtensionsService, new SyncDescriptor(AllowedExtensionsService, undefined, true));
 		services.set(INativeServerExtensionManagementService, new SyncDescriptor(ExtensionManagementService, undefined, true));
+		services.set(IExtensionGalleryManifestService, new SyncDescriptor(ExtensionGalleryManifestService));
 		services.set(IExtensionGalleryService, new SyncDescriptor(ExtensionGalleryServiceWithNoStorageService, undefined, true));
 
 		// Localizations
diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryManifest.ts b/src/vs/platform/extensionManagement/common/extensionGalleryManifest.ts
new file mode 100644
index 000000000000..e1d363506598
--- /dev/null
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryManifest.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 { Event } from '../../../base/common/event.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+
+export const enum ExtensionGalleryResourceType {
+	ExtensionQueryService = 'ExtensionQueryService',
+	ExtensionLatestVersionUri = 'ExtensionLatestVersionUriTemplate',
+	ExtensionStatisticsUri = 'ExtensionStatisticsUriTemplate',
+	WebExtensionStatisticsUri = 'WebExtensionStatisticsUriTemplate',
+	PublisherViewUri = 'PublisherViewUriTemplate',
+	ExtensionDetailsViewUri = 'ExtensionDetailsViewUriTemplate',
+	ExtensionRatingViewUri = 'ExtensionRatingViewUriTemplate',
+}
+
+export const enum Flag {
+	None = 'None',
+	IncludeVersions = 'IncludeVersions',
+	IncludeFiles = 'IncludeFiles',
+	IncludeCategoryAndTags = 'IncludeCategoryAndTags',
+	IncludeSharedAccounts = 'IncludeSharedAccounts',
+	IncludeVersionProperties = 'IncludeVersionProperties',
+	ExcludeNonValidated = 'ExcludeNonValidated',
+	IncludeInstallationTargets = 'IncludeInstallationTargets',
+	IncludeAssetUri = 'IncludeAssetUri',
+	IncludeStatistics = 'IncludeStatistics',
+	IncludeLatestVersionOnly = 'IncludeLatestVersionOnly',
+	Unpublished = 'Unpublished',
+	IncludeNameConflictInfo = 'IncludeNameConflictInfo',
+	IncludeLatestPrereleaseAndStableVersionOnly = 'IncludeLatestPrereleaseAndStableVersionOnly',
+}
+
+export type ExtensionGalleryManifestResource = {
+	readonly id: string;
+	readonly type: string;
+};
+
+export type ExtensionQueryCapabilityValue = {
+	readonly name: string;
+	readonly value: number;
+};
+
+export interface IExtensionGalleryManifest {
+	readonly version: string;
+	readonly resources: readonly ExtensionGalleryManifestResource[];
+	readonly capabilities: {
+		readonly extensionQuery: {
+			readonly filtering?: readonly ExtensionQueryCapabilityValue[];
+			readonly sorting?: readonly ExtensionQueryCapabilityValue[];
+			readonly flags?: readonly ExtensionQueryCapabilityValue[];
+		};
+		readonly signing?: {
+			readonly allRepositorySigned: boolean;
+		};
+	};
+}
+
+export const IExtensionGalleryManifestService = createDecorator<IExtensionGalleryManifestService>('IExtensionGalleryManifestService');
+
+export interface IExtensionGalleryManifestService {
+	readonly _serviceBrand: undefined;
+
+	readonly onDidChangeExtensionGalleryManifest: Event<IExtensionGalleryManifest | null>;
+	isEnabled(): boolean;
+	getExtensionGalleryManifest(): Promise<IExtensionGalleryManifest | null>;
+}
diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryManifestService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryManifestService.ts
new file mode 100644
index 000000000000..53d79c003c41
--- /dev/null
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryManifestService.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 { Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { IProductService } from '../../product/common/productService.js';
+import { ExtensionGalleryResourceType, Flag, IExtensionGalleryManifest, IExtensionGalleryManifestService } from './extensionGalleryManifest.js';
+import { FilterType, SortBy } from './extensionManagement.js';
+
+type ExtensionGalleryConfig = {
+	readonly serviceUrl: string;
+	readonly itemUrl: string;
+	readonly publisherUrl: string;
+	readonly resourceUrlTemplate: string;
+	readonly extensionUrlTemplate: string;
+	readonly controlUrl: string;
+	readonly nlsBaseUrl: string;
+};
+
+export class ExtensionGalleryManifestService extends Disposable implements IExtensionGalleryManifestService {
+
+	readonly _serviceBrand: undefined;
+	readonly onDidChangeExtensionGalleryManifest = Event.None;
+
+	constructor(
+		@IProductService private readonly productService: IProductService,
+	) {
+		super();
+	}
+
+	isEnabled(): boolean {
+		return !!this.productService.extensionsGallery?.serviceUrl;
+	}
+
+	async getExtensionGalleryManifest(): Promise<IExtensionGalleryManifest | null> {
+		const extensionsGallery = this.productService.extensionsGallery as ExtensionGalleryConfig | undefined;
+		if (!extensionsGallery?.serviceUrl) {
+			return null;
+		}
+
+		const resources = [
+			{
+				id: `${extensionsGallery.serviceUrl}/extensionquery`,
+				type: ExtensionGalleryResourceType.ExtensionQueryService
+			},
+			{
+				id: `${extensionsGallery.serviceUrl}/vscode/{publisher}/{name}/latest`,
+				type: ExtensionGalleryResourceType.ExtensionLatestVersionUri
+			},
+			{
+				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) {
+			resources.push({
+				id: `${extensionsGallery.publisherUrl}/{publisher}`,
+				type: ExtensionGalleryResourceType.PublisherViewUri
+			});
+		}
+
+		if (extensionsGallery.itemUrl) {
+			resources.push({
+				id: `${extensionsGallery.itemUrl}/?itemName={publisher}.{name}`,
+				type: ExtensionGalleryResourceType.ExtensionDetailsViewUri
+			});
+			resources.push({
+				id: `${extensionsGallery.itemUrl}/?itemName={publisher}.{name}&ssr=false#review-details`,
+				type: ExtensionGalleryResourceType.ExtensionRatingViewUri
+			});
+		}
+
+		const filtering = [
+			{
+				name: FilterType.Tag,
+				value: 1,
+			},
+			{
+				name: FilterType.ExtensionId,
+				value: 4,
+			},
+			{
+				name: FilterType.Category,
+				value: 5,
+			},
+			{
+				name: FilterType.ExtensionName,
+				value: 7,
+			},
+			{
+				name: FilterType.Target,
+				value: 8,
+			},
+			{
+				name: FilterType.Featured,
+				value: 9,
+			},
+			{
+				name: FilterType.SearchText,
+				value: 10,
+			},
+			{
+				name: FilterType.ExcludeWithFlags,
+				value: 12,
+			},
+		];
+
+		const sorting = [
+			{
+				name: SortBy.NoneOrRelevance,
+				value: 0,
+			},
+			{
+				name: SortBy.LastUpdatedDate,
+				value: 1,
+			},
+			{
+				name: SortBy.Title,
+				value: 2,
+			},
+			{
+				name: SortBy.PublisherName,
+				value: 3,
+			},
+			{
+				name: SortBy.InstallCount,
+				value: 4,
+			},
+			{
+				name: SortBy.AverageRating,
+				value: 6,
+			},
+			{
+				name: SortBy.PublishedDate,
+				value: 10,
+			},
+			{
+				name: SortBy.WeightedRating,
+				value: 12,
+			},
+		];
+
+		const flags = [
+			{
+				name: Flag.None,
+				value: 0x0,
+			},
+			{
+				name: Flag.IncludeVersions,
+				value: 0x1,
+			},
+			{
+				name: Flag.IncludeFiles,
+				value: 0x2,
+			},
+			{
+				name: Flag.IncludeCategoryAndTags,
+				value: 0x4,
+			},
+			{
+				name: Flag.IncludeSharedAccounts,
+				value: 0x8,
+			},
+			{
+				name: Flag.IncludeVersionProperties,
+				value: 0x10,
+			},
+			{
+				name: Flag.ExcludeNonValidated,
+				value: 0x20,
+			},
+			{
+				name: Flag.IncludeInstallationTargets,
+				value: 0x40,
+			},
+			{
+				name: Flag.IncludeAssetUri,
+				value: 0x80,
+			},
+			{
+				name: Flag.IncludeStatistics,
+				value: 0x100,
+			},
+			{
+				name: Flag.IncludeLatestVersionOnly,
+				value: 0x200,
+			},
+			{
+				name: Flag.Unpublished,
+				value: 0x1000,
+			},
+			{
+				name: Flag.IncludeNameConflictInfo,
+				value: 0x8000,
+			},
+			{
+				name: Flag.IncludeLatestPrereleaseAndStableVersionOnly,
+				value: 0x10000,
+			},
+		];
+
+		return {
+			version: '',
+			resources,
+			capabilities: {
+				extensionQuery: {
+					filtering,
+					sorting,
+					flags,
+				},
+				signing: {
+					allRepositorySigned: true,
+				}
+			}
+		};
+	}
+}
diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryManifestServiceIpc.ts b/src/vs/platform/extensionManagement/common/extensionGalleryManifestServiceIpc.ts
new file mode 100644
index 000000000000..2eb7b30b2ee8
--- /dev/null
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryManifestServiceIpc.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 { Barrier } from '../../../base/common/async.js';
+import { Emitter, Event } from '../../../base/common/event.js';
+import { IPCServer } from '../../../base/parts/ipc/common/ipc.js';
+import { IProductService } from '../../product/common/productService.js';
+import { IExtensionGalleryManifest, IExtensionGalleryManifestService } from './extensionGalleryManifest.js';
+import { ExtensionGalleryManifestService } from './extensionGalleryManifestService.js';
+
+export class ExtensionGalleryManifestIPCService extends ExtensionGalleryManifestService implements IExtensionGalleryManifestService {
+
+	declare readonly _serviceBrand: undefined;
+
+	private _onDidChangeExtensionGalleryManifest = this._register(new Emitter<IExtensionGalleryManifest | null>());
+	override readonly onDidChangeExtensionGalleryManifest = this._onDidChangeExtensionGalleryManifest.event;
+
+	private extensionGalleryManifest: IExtensionGalleryManifest | null | undefined;
+	private readonly barrier = new Barrier();
+
+	constructor(
+		server: IPCServer,
+		@IProductService productService: IProductService
+	) {
+		super(productService);
+		server.registerChannel('extensionGalleryManifest', {
+			listen: () => Event.None,
+			call: async (context: any, command: string, args?: any): Promise<any> => {
+				switch (command) {
+					case 'setExtensionGalleryManifest': return Promise.resolve(this.setExtensionGalleryManifest(args[0]));
+				}
+				throw new Error('Invalid call');
+			}
+		});
+	}
+
+	override async getExtensionGalleryManifest(): Promise<IExtensionGalleryManifest | null> {
+		await this.barrier.wait();
+		return this.extensionGalleryManifest ?? null;
+	}
+
+	private setExtensionGalleryManifest(manifest: IExtensionGalleryManifest | null): void {
+		this.barrier.open();
+		this.extensionGalleryManifest = manifest;
+		this._onDidChangeExtensionGalleryManifest.fire(manifest);
+	}
+
+}
diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
index c436d227016d..4ff64b25d5f3 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
@@ -15,7 +15,7 @@ import { URI } from '../../../base/common/uri.js';
 import { IHeaders, IRequestContext, IRequestOptions, isOfflineError } from '../../../base/parts/request/common/request.js';
 import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { IEnvironmentService } from '../../environment/common/environment.js';
-import { getTargetPlatform, IExtensionGalleryService, IExtensionIdentifier, IExtensionInfo, IGalleryExtension, IGalleryExtensionAsset, IGalleryExtensionAssets, IGalleryExtensionVersion, InstallOperation, IQueryOptions, IExtensionsControlManifest, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, ITranslation, SortOrder, StatisticType, toTargetPlatform, WEB_EXTENSION_TAG, IExtensionQueryOptions, IDeprecationInfo, ISearchPrefferedResults, ExtensionGalleryError, ExtensionGalleryErrorCode, IProductVersion, UseUnpkgResourceApiConfigKey, IAllowedExtensionsService, EXTENSION_IDENTIFIER_REGEX, SortBy, FilterType, IExtensionGalleryCapabilities } from './extensionManagement.js';
+import { getTargetPlatform, IExtensionGalleryService, IExtensionIdentifier, IExtensionInfo, IGalleryExtension, IGalleryExtensionAsset, IGalleryExtensionAssets, IGalleryExtensionVersion, InstallOperation, IQueryOptions, IExtensionsControlManifest, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, ITranslation, SortOrder, StatisticType, toTargetPlatform, WEB_EXTENSION_TAG, IExtensionQueryOptions, IDeprecationInfo, ISearchPrefferedResults, ExtensionGalleryError, ExtensionGalleryErrorCode, IProductVersion, UseUnpkgResourceApiConfigKey, IAllowedExtensionsService, EXTENSION_IDENTIFIER_REGEX, SortBy, FilterType } from './extensionManagement.js';
 import { adoptToGalleryExtensionId, areSameExtensions, getGalleryExtensionId, getGalleryExtensionTelemetryData } from './extensionManagementUtil.js';
 import { IExtensionManifest, TargetPlatform } from '../../extensions/common/extensions.js';
 import { areApiProposalsCompatible, isEngineValid } from '../../extensions/common/extensionValidator.js';
@@ -29,68 +29,7 @@ import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 import { StopWatch } from '../../../base/common/stopwatch.js';
 import { format2 } from '../../../base/common/strings.js';
 import { IAssignmentService } from '../../assignment/common/assignment.js';
-
-type ExtensionGalleryConfig = {
-	readonly serviceUrl: string;
-	readonly itemUrl: string;
-	readonly publisherUrl: string;
-	readonly resourceUrlTemplate: string;
-	readonly extensionUrlTemplate: string;
-	readonly controlUrl: string;
-	readonly nlsBaseUrl: string;
-};
-
-const enum ExtensionGalleryResourceType {
-	ExtensionQueryService = 'ExtensionQueryService',
-	ExtensionLatestVersionUri = 'ExtensionLatestVersionUriTemplate',
-	ExtensionStatisticsUri = 'ExtensionStatisticsUriTemplate',
-	WebExtensionStatisticsUri = 'WebExtensionStatisticsUriTemplate',
-	PublisherViewUri = 'PublisherViewUriTemplate',
-	ExtensionDetailsViewUri = 'ExtensionDetailsViewUriTemplate',
-	ExtensionRatingViewUri = 'ExtensionRatingViewUriTemplate',
-}
-
-const enum Flag {
-	None = 'None',
-	IncludeVersions = 'IncludeVersions',
-	IncludeFiles = 'IncludeFiles',
-	IncludeCategoryAndTags = 'IncludeCategoryAndTags',
-	IncludeSharedAccounts = 'IncludeSharedAccounts',
-	IncludeVersionProperties = 'IncludeVersionProperties',
-	ExcludeNonValidated = 'ExcludeNonValidated',
-	IncludeInstallationTargets = 'IncludeInstallationTargets',
-	IncludeAssetUri = 'IncludeAssetUri',
-	IncludeStatistics = 'IncludeStatistics',
-	IncludeLatestVersionOnly = 'IncludeLatestVersionOnly',
-	Unpublished = 'Unpublished',
-	IncludeNameConflictInfo = 'IncludeNameConflictInfo',
-	IncludeLatestPrereleaseAndStableVersionOnly = 'IncludeLatestPrereleaseAndStableVersionOnly',
-}
-
-type ExtensionGalleryManifestResource = {
-	readonly id: string;
-	readonly type: string;
-};
-
-type ExtensionQueryCapabilityValue = {
-	readonly name: string;
-	readonly value: number;
-};
-
-interface IExtensionGalleryManifest {
-	readonly version: string;
-	readonly resources: readonly ExtensionGalleryManifestResource[];
-	readonly capabilities: {
-		readonly extensionQuery: {
-			readonly filtering?: readonly ExtensionQueryCapabilityValue[];
-			readonly sorting?: readonly ExtensionQueryCapabilityValue[];
-			readonly flags?: readonly ExtensionQueryCapabilityValue[];
-		};
-		readonly signing?: {
-			readonly allRepositorySigned: boolean;
-		};
-	};
-}
+import { ExtensionGalleryResourceType, Flag, IExtensionGalleryManifest, IExtensionGalleryManifestService } from './extensionGalleryManifest.js';
 
 const CURRENT_TARGET_PLATFORM = isWeb ? TargetPlatform.WEB : getTargetPlatform(platform, arch);
 const ACTIVITY_HEADER_NAME = 'X-Market-Search-Activity-Id';
@@ -614,10 +553,10 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		@IProductService private readonly productService: IProductService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IAllowedExtensionsService private readonly allowedExtensionsService: IAllowedExtensionsService,
+		@IExtensionGalleryManifestService private readonly extensionGalleryManifestService: IExtensionGalleryManifestService,
 	) {
-		const config = productService.extensionsGallery;
-		this.extensionsControlUrl = config?.controlUrl;
-		this.unpkgResourceApi = config?.extensionUrlTemplate;
+		this.extensionsControlUrl = productService.extensionsGallery?.controlUrl;
+		this.unpkgResourceApi = productService.extensionsGallery?.extensionUrlTemplate;
 		this.extensionsEnabledWithApiProposalVersion = productService.extensionsEnabledWithApiProposalVersion?.map(id => id.toLowerCase()) ?? [];
 		this.commonHeadersPromise = resolveMarketplaceHeaders(
 			productService.version,
@@ -630,42 +569,20 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 	}
 
 	isEnabled(): boolean {
-		return !!this.productService.extensionsGallery?.serviceUrl;
-	}
-
-	async getCapabilities(): Promise<IExtensionGalleryCapabilities> {
-		const extensionGalleryManifest = await this.getExtensionGalleryManifest();
-
-		const filters: FilterType[] = [];
-		for (const capability of extensionGalleryManifest.capabilities.extensionQuery.filtering ?? []) {
-			filters.push(capability.name as FilterType);
-		}
-
-		const sortBy: SortBy[] = [];
-		for (const capability of extensionGalleryManifest.capabilities.extensionQuery.sorting ?? []) {
-			sortBy.push(capability.name as SortBy);
-		}
-
-		return {
-			query: {
-				sortBy,
-				filters
-			},
-			allRepositorySigned: !!extensionGalleryManifest.capabilities.signing?.allRepositorySigned,
-		};
+		return this.extensionGalleryManifestService.isEnabled();
 	}
 
 	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[]> {
-		if (!this.isEnabled()) {
+		const extensionGalleryManifest = await this.extensionGalleryManifestService.getExtensionGalleryManifest();
+		if (!extensionGalleryManifest) {
 			throw new Error('No extension gallery service configured.');
 		}
 
 		const options = CancellationToken.isCancellationToken(arg1) ? {} : arg1 as IExtensionQueryOptions;
 		const token = CancellationToken.isCancellationToken(arg1) ? arg1 : arg2 as CancellationToken;
 
-		const extensionGalleryManifest = await this.getExtensionGalleryManifest();
 		const resourceApi = (options.preferResourceApi && (this.configurationService.getValue(UseUnpkgResourceApiConfigKey) ?? false)) ? await this.getResourceApi(extensionGalleryManifest) : undefined;
 		const result = resourceApi
 			? await this.getExtensionsUsingResourceApi(extensionInfos, options, resourceApi, extensionGalleryManifest, token)
@@ -1023,7 +940,11 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 	}
 
 	async query(options: IQueryOptions, token: CancellationToken): Promise<IPager<IGalleryExtension>> {
-		const extensionGalleryManifest = await this.getExtensionGalleryManifest();
+		const extensionGalleryManifest = await this.extensionGalleryManifestService.getExtensionGalleryManifest();
+
+		if (!extensionGalleryManifest) {
+			throw new Error('No extension gallery service configured.');
+		}
 
 		let text = options.text || '';
 		const pageSize = options.pageSize ?? 50;
@@ -1528,11 +1449,11 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 	}
 
 	async reportStatistic(publisher: string, name: string, version: string, type: StatisticType): Promise<void> {
-		if (!this.isEnabled()) {
+		const manifest = await this.extensionGalleryManifestService.getExtensionGalleryManifest();
+		if (!manifest) {
 			return undefined;
 		}
 
-		const manifest = await this.getExtensionGalleryManifest();
 		let url: string;
 
 		if (isWeb) {
@@ -1669,6 +1590,11 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 	}
 
 	async getAllCompatibleVersions(extensionIdentifier: IExtensionIdentifier, includePreRelease: boolean, targetPlatform: TargetPlatform): Promise<IGalleryExtensionVersion[]> {
+		const extensionGalleryManifest = await this.extensionGalleryManifestService.getExtensionGalleryManifest();
+		if (!extensionGalleryManifest) {
+			throw new Error('No extension gallery service configured.');
+		}
+
 		let query = new Query()
 			.withFlags(Flag.IncludeVersions, Flag.IncludeCategoryAndTags, Flag.IncludeFiles, Flag.IncludeVersionProperties)
 			.withPage(1, 1);
@@ -1679,7 +1605,6 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 			query = query.withFilter(FilterType.ExtensionName, extensionIdentifier.id);
 		}
 
-		const extensionGalleryManifest = await this.getExtensionGalleryManifest();
 		const { galleryExtensions } = await this.queryRawGalleryExtensions(query, extensionGalleryManifest, CancellationToken.None);
 		if (!galleryExtensions.length) {
 			return [];
@@ -1861,234 +1786,6 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle
 		return { malicious, deprecated, search, extensionsEnabledWithPreRelease };
 	}
 
-	private extensionGalleryManifestPromise: Promise<IExtensionGalleryManifest> | undefined;
-	private async getExtensionGalleryManifest(): Promise<IExtensionGalleryManifest> {
-		if (!this.extensionGalleryManifestPromise) {
-			const configuredServiceUrl = this.configurationService.inspect<string>('extensions.gallery.serviceUrl').userLocalValue;
-			if (configuredServiceUrl) {
-				this.extensionGalleryManifestPromise = this.getExtensionGalleryManifestFromServiceUrl(configuredServiceUrl);
-			} else {
-				this.extensionGalleryManifestPromise = this.getExtensionGalleryManifestFromProduct();
-			}
-		}
-		return this.extensionGalleryManifestPromise;
-	}
-
-	private async getExtensionGalleryManifestFromServiceUrl(url: string): Promise<IExtensionGalleryManifest> {
-		const commonHeaders = await this.commonHeadersPromise;
-		const headers = {
-			...commonHeaders,
-			'Content-Type': 'application/json',
-			'Accept-Encoding': 'gzip',
-		};
-
-		try {
-			const context = await this.requestService.request({
-				type: 'GET',
-				url,
-				headers,
-			}, CancellationToken.None);
-
-			const extensionGalleryManifest = await asJson<IExtensionGalleryManifest>(context);
-
-			if (!extensionGalleryManifest) {
-				throw new Error('Unable to retrieve extension gallery manifest.');
-			}
-
-			return extensionGalleryManifest;
-		} catch (error) {
-			this.logService.error(error);
-			throw error;
-		}
-	}
-
-	private async getExtensionGalleryManifestFromProduct(): Promise<IExtensionGalleryManifest> {
-		const extensionsGallery = this.productService.extensionsGallery as ExtensionGalleryConfig | undefined;
-		if (!extensionsGallery?.serviceUrl) {
-			throw new Error('No extension gallery service configured.');
-		}
-
-		const resources = [
-			{
-				id: `${extensionsGallery.serviceUrl}/extensionquery`,
-				type: ExtensionGalleryResourceType.ExtensionQueryService
-			},
-			{
-				id: `${extensionsGallery.serviceUrl}/vscode/{publisher}/{name}/latest`,
-				type: ExtensionGalleryResourceType.ExtensionLatestVersionUri
-			},
-			{
-				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) {
-			resources.push({
-				id: `${extensionsGallery.publisherUrl}/{publisher}`,
-				type: ExtensionGalleryResourceType.PublisherViewUri
-			});
-		}
-
-		if (extensionsGallery.itemUrl) {
-			resources.push({
-				id: `${extensionsGallery.itemUrl}/?itemName={publisher}.{name}`,
-				type: ExtensionGalleryResourceType.ExtensionDetailsViewUri
-			});
-			resources.push({
-				id: `${extensionsGallery.itemUrl}/?itemName={publisher}.{name}&ssr=false#review-details`,
-				type: ExtensionGalleryResourceType.ExtensionRatingViewUri
-			});
-		}
-
-		const filtering = [
-			{
-				name: FilterType.Tag,
-				value: 1,
-			},
-			{
-				name: FilterType.ExtensionId,
-				value: 4,
-			},
-			{
-				name: FilterType.Category,
-				value: 5,
-			},
-			{
-				name: FilterType.ExtensionName,
-				value: 7,
-			},
-			{
-				name: FilterType.Target,
-				value: 8,
-			},
-			{
-				name: FilterType.Featured,
-				value: 9,
-			},
-			{
-				name: FilterType.SearchText,
-				value: 10,
-			},
-			{
-				name: FilterType.ExcludeWithFlags,
-				value: 12,
-			},
-		];
-
-		const sorting = [
-			{
-				name: SortBy.NoneOrRelevance,
-				value: 0,
-			},
-			{
-				name: SortBy.LastUpdatedDate,
-				value: 1,
-			},
-			{
-				name: SortBy.Title,
-				value: 2,
-			},
-			{
-				name: SortBy.PublisherName,
-				value: 3,
-			},
-			{
-				name: SortBy.InstallCount,
-				value: 4,
-			},
-			{
-				name: SortBy.AverageRating,
-				value: 6,
-			},
-			{
-				name: SortBy.PublishedDate,
-				value: 10,
-			},
-			{
-				name: SortBy.WeightedRating,
-				value: 12,
-			},
-		];
-
-		const flags = [
-			{
-				name: Flag.None,
-				value: 0x0,
-			},
-			{
-				name: Flag.IncludeVersions,
-				value: 0x1,
-			},
-			{
-				name: Flag.IncludeFiles,
-				value: 0x2,
-			},
-			{
-				name: Flag.IncludeCategoryAndTags,
-				value: 0x4,
-			},
-			{
-				name: Flag.IncludeSharedAccounts,
-				value: 0x8,
-			},
-			{
-				name: Flag.IncludeVersionProperties,
-				value: 0x10,
-			},
-			{
-				name: Flag.ExcludeNonValidated,
-				value: 0x20,
-			},
-			{
-				name: Flag.IncludeInstallationTargets,
-				value: 0x40,
-			},
-			{
-				name: Flag.IncludeAssetUri,
-				value: 0x80,
-			},
-			{
-				name: Flag.IncludeStatistics,
-				value: 0x100,
-			},
-			{
-				name: Flag.IncludeLatestVersionOnly,
-				value: 0x200,
-			},
-			{
-				name: Flag.Unpublished,
-				value: 0x1000,
-			},
-			{
-				name: Flag.IncludeNameConflictInfo,
-				value: 0x8000,
-			},
-			{
-				name: Flag.IncludeLatestPrereleaseAndStableVersionOnly,
-				value: 0x10000,
-			},
-		];
-
-		return {
-			version: '',
-			resources,
-			capabilities: {
-				extensionQuery: {
-					filtering,
-					sorting,
-					flags,
-				},
-				signing: {
-					allRepositorySigned: true,
-				}
-			}
-		};
-	}
 }
 
 export class ExtensionGalleryService extends AbstractExtensionGalleryService {
@@ -2103,8 +1800,9 @@ export class ExtensionGalleryService extends AbstractExtensionGalleryService {
 		@IProductService productService: IProductService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IAllowedExtensionsService allowedExtensionsService: IAllowedExtensionsService,
+		@IExtensionGalleryManifestService extensionGalleryManifestService: IExtensionGalleryManifestService,
 	) {
-		super(storageService, undefined, requestService, logService, environmentService, telemetryService, fileService, productService, configurationService, allowedExtensionsService);
+		super(storageService, undefined, requestService, logService, environmentService, telemetryService, fileService, productService, configurationService, allowedExtensionsService, extensionGalleryManifestService);
 	}
 }
 
@@ -2119,7 +1817,8 @@ export class ExtensionGalleryServiceWithNoStorageService extends AbstractExtensi
 		@IProductService productService: IProductService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IAllowedExtensionsService allowedExtensionsService: IAllowedExtensionsService,
+		@IExtensionGalleryManifestService extensionGalleryManifestService: IExtensionGalleryManifestService,
 	) {
-		super(undefined, undefined, requestService, logService, environmentService, telemetryService, fileService, productService, configurationService, allowedExtensionsService);
+		super(undefined, undefined, requestService, logService, environmentService, telemetryService, fileService, productService, configurationService, allowedExtensionsService, extensionGalleryManifestService);
 	}
 }
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 2a55c89dc5bc..ab30c7ca90c2 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -395,7 +395,6 @@ export const IExtensionGalleryService = createDecorator<IExtensionGalleryService
 export interface IExtensionGalleryService {
 	readonly _serviceBrand: undefined;
 	isEnabled(): boolean;
-	getCapabilities(): Promise<IExtensionGalleryCapabilities>;
 	query(options: IQueryOptions, token: CancellationToken): Promise<IPager<IGalleryExtension>>;
 	getExtensions(extensionInfos: ReadonlyArray<IExtensionInfo>, token: CancellationToken): Promise<IGalleryExtension[]>;
 	getExtensions(extensionInfos: ReadonlyArray<IExtensionInfo>, options: IExtensionQueryOptions, token: CancellationToken): Promise<IGalleryExtension[]>;
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 1ed45d18af9e..8d137c47d4e7 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -54,6 +54,7 @@ import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
 import { IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
 import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { isLinux } from '../../../base/common/platform.js';
+import { IExtensionGalleryManifestService } from '../common/extensionGalleryManifest.js';
 
 export const INativeServerExtensionManagementService = refineServiceDecorator<IExtensionManagementService, INativeServerExtensionManagementService>(IExtensionManagementService);
 export interface INativeServerExtensionManagementService extends IExtensionManagementService {
@@ -86,6 +87,7 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IFileService private readonly fileService: IFileService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IExtensionGalleryManifestService protected readonly extensionGalleryManifestService: IExtensionGalleryManifestService,
 		@IProductService productService: IProductService,
 		@IAllowedExtensionsService allowedExtensionsService: IAllowedExtensionsService,
 		@IUriIdentityService uriIdentityService: IUriIdentityService,
@@ -332,7 +334,7 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 			verifySignature = isBoolean(value) ? value : true;
 		}
 		const { location, verificationStatus } = await this.extensionsDownloader.download(extension, operation, verifySignature, clientTargetPlatform);
-		const shouldRequireSignature = (await this.galleryService.getCapabilities()).allRepositorySigned;
+		const shouldRequireSignature = (await this.extensionGalleryManifestService.getExtensionGalleryManifest())?.capabilities.signing?.allRepositorySigned;
 
 		if (
 			verificationStatus !== ExtensionSignatureVerificationCode.Success
diff --git a/src/vs/server/node/remoteExtensionHostAgentCli.ts b/src/vs/server/node/remoteExtensionHostAgentCli.ts
index df33289a964c..066f8f3a9aab 100644
--- a/src/vs/server/node/remoteExtensionHostAgentCli.ts
+++ b/src/vs/server/node/remoteExtensionHostAgentCli.ts
@@ -51,6 +51,8 @@ import { LoggerService } from '../../platform/log/node/loggerService.js';
 import { localize } from '../../nls.js';
 import { addUNCHostToAllowlist, disableUNCAccessRestrictions } from '../../base/node/unc.js';
 import { AllowedExtensionsService } from '../../platform/extensionManagement/common/allowedExtensionsService.js';
+import { IExtensionGalleryManifestService } from '../../platform/extensionManagement/common/extensionGalleryManifest.js';
+import { ExtensionGalleryManifestService } from '../../platform/extensionManagement/common/extensionGalleryManifestService.js';
 
 class CliMain extends Disposable {
 
@@ -132,6 +134,7 @@ class CliMain extends Disposable {
 		services.set(IRequestService, new SyncDescriptor(RequestService, ['remote']));
 		services.set(IDownloadService, new SyncDescriptor(DownloadService));
 		services.set(ITelemetryService, NullTelemetryService);
+		services.set(IExtensionGalleryManifestService, new SyncDescriptor(ExtensionGalleryManifestService));
 		services.set(IExtensionGalleryService, new SyncDescriptor(ExtensionGalleryServiceWithNoStorageService));
 		services.set(IExtensionsProfileScannerService, new SyncDescriptor(ExtensionsProfileScannerService));
 		services.set(IExtensionsScannerService, new SyncDescriptor(ExtensionsScannerService));
diff --git a/src/vs/server/node/serverServices.ts b/src/vs/server/node/serverServices.ts
index edb08e14d6dc..f813cd08904e 100644
--- a/src/vs/server/node/serverServices.ts
+++ b/src/vs/server/node/serverServices.ts
@@ -83,6 +83,8 @@ import { TelemetryLogAppender } from '../../platform/telemetry/common/telemetryL
 import { INativeMcpDiscoveryHelperService, NativeMcpDiscoveryHelperChannelName } from '../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
 import { NativeMcpDiscoveryHelperChannel } from '../../platform/mcp/node/nativeMcpDiscoveryHelperChannel.js';
 import { NativeMcpDiscoveryHelperService } from '../../platform/mcp/node/nativeMcpDiscoveryHelperService.js';
+import { IExtensionGalleryManifestService } from '../../platform/extensionManagement/common/extensionGalleryManifest.js';
+import { ExtensionGalleryManifestService } from '../../platform/extensionManagement/common/extensionGalleryManifestService.js';
 
 const eventPrefix = 'monacoworkbench';
 
@@ -186,6 +188,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 		services.set(IServerTelemetryService, ServerNullTelemetryService);
 	}
 
+	services.set(IExtensionGalleryManifestService, new SyncDescriptor(ExtensionGalleryManifestService));
 	services.set(IExtensionGalleryService, new SyncDescriptor(ExtensionGalleryServiceWithNoStorageService));
 
 	const downloadChannel = socketServer.getChannel('download', router);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index c1565b16c633..19926de31713 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -80,6 +80,7 @@ import { IConfigurationMigrationRegistry, Extensions as ConfigurationMigrationEx
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
 import product from '../../../../platform/product/common/product.js';
+import { IExtensionGalleryManifest, IExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
 
 // Singletons
 registerSingleton(IExtensionsWorkbenchService, ExtensionsWorkbenchService, InstantiationType.Eager /* Auto updates extensions */);
@@ -569,7 +570,8 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 
 	constructor(
 		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
-		@IExtensionGalleryService private readonly extensionGalleryService: IExtensionGalleryService,
+		@IExtensionGalleryService extensionGalleryService: IExtensionGalleryService,
+		@IExtensionGalleryManifestService extensionGalleryManifestService: IExtensionGalleryManifestService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IViewsService private readonly viewsService: IViewsService,
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
@@ -600,17 +602,20 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			hasWebServerContext.set(true);
 		}
 
-		this.registerGalleryCapabilitiesContexts();
+		extensionGalleryManifestService.getExtensionGalleryManifest()
+			.then(extensionGalleryManifest => {
+				this.registerGalleryCapabilitiesContexts(extensionGalleryManifest);
+				this._register(extensionGalleryManifestService.onDidChangeExtensionGalleryManifest(extensionGalleryManifest => this.registerGalleryCapabilitiesContexts(extensionGalleryManifest)));
+			});
 		this.registerGlobalActions();
 		this.registerContextMenuActions();
 		this.registerQuickAccessProvider();
 	}
 
-	private async registerGalleryCapabilitiesContexts(): Promise<void> {
-		const capabilities = await this.extensionGalleryService.getCapabilities();
-		CONTEXT_GALLERY_SORT_CAPABILITIES.bindTo(this.contextKeyService).set(`_${capabilities.query.sortBy.join('_')}_UpdateDate_`);
-		CONTEXT_GALLERY_FILTER_CAPABILITIES.bindTo(this.contextKeyService).set(`_${capabilities.query.filters.join('_')}_`);
-		CONTEXT_GALLERY_ALL_REPOSITORY_SIGNED.bindTo(this.contextKeyService).set(capabilities.allRepositorySigned);
+	private async registerGalleryCapabilitiesContexts(extensionGalleryManifest: IExtensionGalleryManifest | null): Promise<void> {
+		CONTEXT_GALLERY_SORT_CAPABILITIES.bindTo(this.contextKeyService).set(`_${extensionGalleryManifest?.capabilities.extensionQuery.sorting?.map(s => s.name)?.join('_')}_UpdateDate_`);
+		CONTEXT_GALLERY_FILTER_CAPABILITIES.bindTo(this.contextKeyService).set(`_${extensionGalleryManifest?.capabilities.extensionQuery.filtering?.map(s => s.name)?.join('_')}_`);
+		CONTEXT_GALLERY_ALL_REPOSITORY_SIGNED.bindTo(this.contextKeyService).set(!!extensionGalleryManifest?.capabilities?.signing?.allRepositorySigned);
 	}
 
 	private registerQuickAccessProvider(): void {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
index 3c33b2614d36..7b344ef9fb67 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
@@ -72,6 +72,7 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IUpdateService } from '../../../../platform/update/common/update.js';
 import { ActionWithDropdownActionViewItem, IActionWithDropdownActionViewItemOptions } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
 import { IAuthenticationUsageService } from '../../../services/authentication/browser/authenticationUsageService.js';
+import { IExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
 
 export class PromptExtensionInstallFailureAction extends Action {
 
@@ -420,7 +421,7 @@ export class InstallAction extends ExtensionAction {
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
 		@IAllowedExtensionsService private readonly allowedExtensionsService: IAllowedExtensionsService,
-		@IExtensionGalleryService private readonly galleryService: IExtensionGalleryService,
+		@IExtensionGalleryManifestService private readonly extensionGalleryManifestService: IExtensionGalleryManifestService,
 	) {
 		super('extensions.install', localize('install', "Install"), InstallAction.CLASS, false);
 		this.hideOnDisabled = false;
@@ -469,7 +470,7 @@ export class InstallAction extends ExtensionAction {
 			return;
 		}
 
-		if (this.extension.gallery && !this.extension.gallery.isSigned && (await this.galleryService.getCapabilities()).allRepositorySigned) {
+		if (this.extension.gallery && !this.extension.gallery.isSigned && (await this.extensionGalleryManifestService.getExtensionGalleryManifest())?.capabilities.signing?.allRepositorySigned) {
 			const { result } = await this.dialogService.prompt({
 				type: Severity.Warning,
 				message: localize('not signed', "'{0}' is an extension from an unknown source. Are you sure you want to install?", this.extension.displayName),
@@ -2524,7 +2525,7 @@ export class ExtensionStatusAction extends ExtensionAction {
 		@IAllowedExtensionsService private readonly allowedExtensionsService: IAllowedExtensionsService,
 		@IWorkbenchExtensionEnablementService private readonly workbenchExtensionEnablementService: IWorkbenchExtensionEnablementService,
 		@IExtensionFeaturesManagementService private readonly extensionFeaturesManagementService: IExtensionFeaturesManagementService,
-		@IExtensionGalleryService private readonly galleryService: IExtensionGalleryService,
+		@IExtensionGalleryManifestService private readonly extensionGalleryManifestService: IExtensionGalleryManifestService,
 	) {
 		super('extensions.status', '', `${ExtensionStatusAction.CLASS} hide`, false);
 		this._register(this.labelService.onDidChangeFormatters(() => this.update(), this));
@@ -2551,7 +2552,7 @@ export class ExtensionStatusAction extends ExtensionAction {
 			return;
 		}
 
-		if (this.extension.state === ExtensionState.Uninstalled && this.extension.gallery && !this.extension.gallery.isSigned && (await this.galleryService.getCapabilities()).allRepositorySigned) {
+		if (this.extension.state === ExtensionState.Uninstalled && this.extension.gallery && !this.extension.gallery.isSigned && (await this.extensionGalleryManifestService.getExtensionGalleryManifest())?.capabilities.signing?.allRepositorySigned) {
 			this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('not signed tooltip', "This extension is not signed by the Extension Marketplace.")) }, true);
 			return;
 		}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index 90b805560e1b..efd8a2732f13 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -66,6 +66,7 @@ import { ShowCurrentReleaseNotesActionId } from '../../update/common/update.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
 import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
+import { IExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
 
 interface IExtensionStateProvider<T> {
 	(extension: Extension): T;
@@ -942,6 +943,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		@IEditorService private readonly editorService: IEditorService,
 		@IWorkbenchExtensionManagementService private readonly extensionManagementService: IWorkbenchExtensionManagementService,
 		@IExtensionGalleryService private readonly galleryService: IExtensionGalleryService,
+		@IExtensionGalleryManifestService private readonly extensionGalleryManifestService: IExtensionGalleryManifestService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@INotificationService private readonly notificationService: INotificationService,
@@ -2282,7 +2284,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		}
 
 		if (extension.gallery) {
-			if (!extension.gallery.isSigned && (await this.galleryService.getCapabilities()).allRepositorySigned) {
+			if (!extension.gallery.isSigned && (await this.extensionGalleryManifestService.getExtensionGalleryManifest())?.capabilities.signing?.allRepositorySigned) {
 				return new MarkdownString().appendText(nls.localize('not signed', "This extension is not signed."));
 			}
 
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionGalleryService.ts b/src/vs/workbench/services/extensionManagement/common/extensionGalleryService.ts
index 6e28af1478f4..00e133b6d03c 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionGalleryService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionGalleryService.ts
@@ -15,6 +15,7 @@ import { IEnvironmentService } from '../../../../platform/environment/common/env
 import { AbstractExtensionGalleryService } from '../../../../platform/extensionManagement/common/extensionGalleryService.js';
 import { IWorkbenchAssignmentService } from '../../assignment/common/assignmentService.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
 
 export class WorkbenchExtensionGalleryService extends AbstractExtensionGalleryService {
 	constructor(
@@ -28,8 +29,9 @@ export class WorkbenchExtensionGalleryService extends AbstractExtensionGallerySe
 		@IProductService productService: IProductService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IAllowedExtensionsService allowedExtensionsService: IAllowedExtensionsService,
+		@IExtensionGalleryManifestService extensionGalleryManifestService: IExtensionGalleryManifestService,
 	) {
-		super(storageService, assignmentService, requestService, logService, environmentService, telemetryService, fileService, productService, configurationService, allowedExtensionsService);
+		super(storageService, assignmentService, requestService, logService, environmentService, telemetryService, fileService, productService, configurationService, allowedExtensionsService, extensionGalleryManifestService);
 	}
 }
 
diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionGalleryManifestService.ts b/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionGalleryManifestService.ts
new file mode 100644
index 000000000000..bb2ac6f4f305
--- /dev/null
+++ b/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionGalleryManifestService.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 { CancellationToken } from '../../../../base/common/cancellation.js';
+import { IChannel } from '../../../../base/parts/ipc/common/ipc.js';
+import { IHeaders } from '../../../../base/parts/request/common/request.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IExtensionGalleryManifestService, IExtensionGalleryManifest } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
+import { ExtensionGalleryManifestService as 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';
+import { ISharedProcessService } from '../../../../platform/ipc/electron-sandbox/services.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 } from '../../../../platform/storage/common/storage.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+
+export class WorkbenchExtensionGalleryManifestService extends ExtensionGalleryManifestService implements IExtensionGalleryManifestService {
+
+	private readonly channel: IChannel;
+	private readonly commonHeadersPromise: Promise<IHeaders>;
+
+	constructor(
+		@IProductService productService: IProductService,
+		@IEnvironmentService environmentService: IEnvironmentService,
+		@IFileService fileService: IFileService,
+		@ITelemetryService telemetryService: ITelemetryService,
+		@IStorageService storageService: IStorageService,
+		@ISharedProcessService sharedProcessService: ISharedProcessService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IRequestService private readonly requestService: IRequestService,
+		@ILogService private readonly logService: ILogService,
+	) {
+		super(productService);
+		this.commonHeadersPromise = resolveMarketplaceHeaders(
+			productService.version,
+			productService,
+			environmentService,
+			configurationService,
+			fileService,
+			storageService,
+			telemetryService);
+
+		this.channel = sharedProcessService.getChannel('extensionGalleryManifest');
+		this.getExtensionGalleryManifest().then(manifest => {
+			this.channel.call('setExtensionGalleryManifest', [manifest]);
+			this._register(this.onDidChangeExtensionGalleryManifest(manifest => this.channel.call('setExtensionGalleryManifest', [manifest])));
+		});
+	}
+
+	private extensionGalleryManifestPromise: Promise<IExtensionGalleryManifest | null> | undefined;
+	override getExtensionGalleryManifest(): Promise<IExtensionGalleryManifest | null> {
+		if (!this.extensionGalleryManifestPromise) {
+			const configuredServiceUrl = this.configurationService.inspect<string>('extensions.gallery.serviceUrl').userLocalValue;
+			if (configuredServiceUrl) {
+				this.extensionGalleryManifestPromise = this.getExtensionGalleryManifestFromServiceUrl(configuredServiceUrl);
+			} else {
+				this.extensionGalleryManifestPromise = super.getExtensionGalleryManifest();
+			}
+		}
+		return this.extensionGalleryManifestPromise;
+	}
+
+	private async getExtensionGalleryManifestFromServiceUrl(url: string): Promise<IExtensionGalleryManifest> {
+		const commonHeaders = await this.commonHeadersPromise;
+		const headers = {
+			...commonHeaders,
+			'Content-Type': 'application/json',
+			'Accept-Encoding': 'gzip',
+		};
+
+		try {
+			const context = await this.requestService.request({
+				type: 'GET',
+				url,
+				headers,
+			}, CancellationToken.None);
+
+			const extensionGalleryManifest = await asJson<IExtensionGalleryManifest>(context);
+
+			if (!extensionGalleryManifest) {
+				throw new Error('Unable to retrieve extension gallery manifest.');
+			}
+
+			return extensionGalleryManifest;
+		} catch (error) {
+			this.logService.error(error);
+			throw error;
+		}
+	}
+}
+
+registerSingleton(IExtensionGalleryManifestService, WorkbenchExtensionGalleryManifestService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts
index a71db4c88e5e..d5c6942a1e2c 100644
--- a/src/vs/workbench/workbench.desktop.main.ts
+++ b/src/vs/workbench/workbench.desktop.main.ts
@@ -62,6 +62,7 @@ import '../platform/extensionResourceLoader/common/extensionResourceLoaderServic
 import './services/localization/electron-sandbox/localeService.js';
 import './services/extensions/electron-sandbox/extensionsScannerService.js';
 import './services/extensionManagement/electron-sandbox/extensionManagementServerService.js';
+import './services/extensionManagement/electron-sandbox/extensionGalleryManifestService.js';
 import './services/extensionManagement/electron-sandbox/extensionTipsService.js';
 import './services/userDataSync/electron-sandbox/userDataSyncService.js';
 import './services/userDataSync/electron-sandbox/userDataAutoSyncService.js';
diff --git a/src/vs/workbench/workbench.web.main.internal.ts b/src/vs/workbench/workbench.web.main.internal.ts
index 402696a4a836..b9556400a5aa 100644
--- a/src/vs/workbench/workbench.web.main.internal.ts
+++ b/src/vs/workbench/workbench.web.main.internal.ts
@@ -92,6 +92,8 @@ import { ITimerService, TimerService } from './services/timer/browser/timerServi
 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 { IExtensionGalleryManifestService } from '../platform/extensionManagement/common/extensionGalleryManifest.js';
+import { ExtensionGalleryManifestService } from '../platform/extensionManagement/common/extensionGalleryManifestService.js';
 
 registerSingleton(IWorkbenchExtensionManagementService, ExtensionManagementService, InstantiationType.Delayed);
 registerSingleton(IAccessibilityService, AccessibilityService, InstantiationType.Delayed);
@@ -109,6 +111,7 @@ registerSingleton(ITimerService, TimerService, InstantiationType.Delayed);
 registerSingleton(ICustomEndpointTelemetryService, NullEndpointTelemetryService, InstantiationType.Delayed);
 registerSingleton(IDiagnosticsService, NullDiagnosticsService, InstantiationType.Delayed);
 registerSingleton(ILanguagePackService, WebLanguagePacksService, InstantiationType.Delayed);
+registerSingleton(IExtensionGalleryManifestService, ExtensionGalleryManifestService, InstantiationType.Delayed);
 
 //#endregion
 

From 0aa92ed833ccb26b1961884df2429bba6244237c Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 14 Mar 2025 16:24:36 +0100
Subject: [PATCH 0933/1815] chat - allow a setup from dialog (#243438)

---
 src/vs/platform/dialogs/common/dialogs.ts     |   6 +
 .../browser/parts/dialogs/dialogHandler.ts    |   8 +-
 .../chat/browser/actions/chatActions.ts       |  70 ++--
 .../contrib/chat/browser/chat.contribution.ts |   6 +
 .../contrib/chat/browser/chatSetup.ts         | 340 ++++++++++++++++--
 .../contrib/chat/browser/chatStatus.ts        |   2 +-
 .../chat/browser/media/chatViewSetup.css      |  21 +-
 .../contrib/chat/common/chatContextKeys.ts    |   6 +-
 8 files changed, 389 insertions(+), 70 deletions(-)

diff --git a/src/vs/platform/dialogs/common/dialogs.ts b/src/vs/platform/dialogs/common/dialogs.ts
index bb9270b9c287..d76e8e549745 100644
--- a/src/vs/platform/dialogs/common/dialogs.ts
+++ b/src/vs/platform/dialogs/common/dialogs.ts
@@ -17,6 +17,7 @@ import { mnemonicButtonLabel } from '../../../base/common/labels.js';
 import { isLinux, isMacintosh, isWindows } from '../../../base/common/platform.js';
 import { IProductService } from '../../product/common/productService.js';
 import { deepClone } from '../../../base/common/objects.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
 
 export interface IDialogArgs {
 	readonly confirmArgs?: IConfirmDialogArgs;
@@ -275,6 +276,7 @@ export const IDialogService = createDecorator<IDialogService>('dialogService');
 export interface ICustomDialogOptions {
 	readonly buttonDetails?: string[];
 	readonly markdownDetails?: ICustomDialogMarkdown[];
+	readonly htmlDetails?: ICustomDialogHTMLElement[];
 	readonly classes?: string[];
 	readonly icon?: ThemeIcon;
 	readonly disableCloseAction?: boolean;
@@ -286,6 +288,10 @@ export interface ICustomDialogMarkdown {
 	readonly dismissOnLinkClick?: boolean;
 }
 
+export interface ICustomDialogHTMLElement extends IDisposable {
+	readonly element: unknown /* HTMLElement */;
+}
+
 /**
  * A handler to bring up modal dialogs.
  */
diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
index e41d878f990a..97ab29bee2f0 100644
--- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
+++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
@@ -11,7 +11,7 @@ import Severity from '../../../../base/common/severity.js';
 import { Dialog, IDialogResult } from '../../../../base/browser/ui/dialog/dialog.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { EventHelper } from '../../../../base/browser/dom.js';
+import { EventHelper, isHTMLElement } from '../../../../base/browser/dom.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
@@ -130,6 +130,12 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
 				result.element.classList.add(...(markdownDetail.classes || []));
 				dialogDisposables.add(result);
 			});
+			customOptions.htmlDetails?.forEach(htmlDetail => {
+				if (isHTMLElement(htmlDetail.element)) {
+					parent.appendChild(htmlDetail.element);
+					dialogDisposables.add(htmlDetail);
+				}
+			});
 		} : undefined;
 
 		const dialog = new Dialog(
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index cb5942d6accc..7f9f9d3ff8d6 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -21,7 +21,7 @@ import { IActionViewItemService } from '../../../../../platform/actions/browser/
 import { DropdownWithPrimaryActionViewItem } from '../../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
 import { Action2, MenuId, MenuItemAction, MenuRegistry, registerAction2, SubmenuItemAction } from '../../../../../platform/actions/common/actions.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
-import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IsLinuxContext, IsWindowsContext } from '../../../../../platform/contextkey/common/contextkeys.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
@@ -56,17 +56,13 @@ import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { IWorkbenchLayoutService, Parts } from '../../../../services/layout/browser/layoutService.js';
 import { IViewDescriptorService, ViewContainerLocation } from '../../../../common/views.js';
 import { ChatEntitlement, IChatEntitlementService } from '../../common/chatEntitlementService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 
 export const CHAT_CATEGORY = localize2('chat.category', 'Chat');
 
 export const CHAT_OPEN_ACTION_ID = 'workbench.action.chat.open';
-export const CHAT_OPEN_ACTION_LABEL = localize2('openChat', "Open Chat");
-
 export const CHAT_SETUP_ACTION_ID = 'workbench.action.chat.triggerSetup';
-export const CHAT_SETUP_ACTION_LABEL = localize2('triggerChatSetup', "Use AI Features with Copilot for Free...");
-
-export const TOGGLE_CHAT_ACTION_ID = 'workbench.action.chat.toggle';
-export const TOGGLE_CHAT_ACTION_LABEL = localize('toggleChat', "Toggle Chat");
+const TOGGLE_CHAT_ACTION_ID = 'workbench.action.chat.toggle';
 
 export interface IChatViewOpenOptions {
 	/**
@@ -105,7 +101,7 @@ export function registerChatActions() {
 		constructor() {
 			super({
 				id: CHAT_OPEN_ACTION_ID,
-				title: CHAT_OPEN_ACTION_LABEL,
+				title: localize2('openChat', "Open Chat"),
 				icon: Codicon.copilot,
 				f1: true,
 				category: CHAT_CATEGORY,
@@ -516,7 +512,13 @@ export function registerChatActions() {
 				title: localize2('manageCopilot', "Manage Copilot"),
 				category: CHAT_CATEGORY,
 				f1: true,
-				precondition: nonEnterpriseCopilotUsers,
+				precondition: ContextKeyExpr.and(
+					ContextKeyExpr.or(
+						ChatContextKeys.Setup.limited,
+						ChatContextKeys.Setup.pro
+					),
+					nonEnterpriseCopilotUsers
+				),
 				menu: {
 					id: MenuId.ChatTitleBarMenu,
 					group: 'y_manage',
@@ -556,7 +558,7 @@ export function registerChatActions() {
 			super({
 				id: 'workbench.action.chat.configureCodeCompletions',
 				title: localize2('configureCompletions', "Configure Code Completions..."),
-				precondition: ChatContextKeys.enabled,
+				precondition: ChatContextKeys.Setup.installed,
 				menu: {
 					id: MenuId.ChatTitleBarMenu,
 					group: 'f_completions',
@@ -689,7 +691,9 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 		@IActionViewItemService actionViewItemService: IActionViewItemService,
 		@IChatAgentService agentService: IChatAgentService,
 		@IInstantiationService instantiationService: IInstantiationService,
-		@IChatEntitlementService chatEntitlementService: IChatEntitlementService
+		@IChatEntitlementService chatEntitlementService: IChatEntitlementService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IConfigurationService configurationService: IConfigurationService,
 	) {
 		super();
 
@@ -704,37 +708,36 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 				run() { }
 			});
 
-			const chatExtensionInstalled = agentService.getAgents().some(agent => agent.isDefault);
+			const chatExtensionInstalled = contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.installed.key) === true;
 			const { chatQuotaExceeded, completionsQuotaExceeded } = chatEntitlementService.quotas;
 			const signedOut = chatEntitlementService.entitlement === ChatEntitlement.Unknown;
+			const setupFromDialog = configurationService.getValue('chat.experimental.setupFromDialog');
 
 			let primaryActionId: string;
 			let primaryActionTitle: string;
 			let primaryActionIcon: ThemeIcon;
-			if (!chatExtensionInstalled) {
+			if (!chatExtensionInstalled && !setupFromDialog) {
 				primaryActionId = CHAT_SETUP_ACTION_ID;
-				primaryActionTitle = CHAT_SETUP_ACTION_LABEL.value;
+				primaryActionTitle = localize('triggerChatSetup', "Use AI Features with Copilot for Free...");
 				primaryActionIcon = Codicon.copilot;
-			} else {
-				if (signedOut) {
-					primaryActionId = TOGGLE_CHAT_ACTION_ID;
-					primaryActionTitle = localize('signInToChatSetup', "Sign in to Use Copilot...");
-					primaryActionIcon = Codicon.copilotNotConnected;
-				} else if (chatQuotaExceeded || completionsQuotaExceeded) {
-					primaryActionId = OPEN_CHAT_QUOTA_EXCEEDED_DIALOG;
-					if (chatQuotaExceeded && !completionsQuotaExceeded) {
-						primaryActionTitle = localize('chatQuotaExceededButton', "Monthly chat messages limit reached. Click for details.");
-					} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-						primaryActionTitle = localize('completionsQuotaExceededButton', "Monthly code completions limit reached. Click for details.");
-					} else {
-						primaryActionTitle = localize('chatAndCompletionsQuotaExceededButton', "Copilot Free plan limit reached. Click for details.");
-					}
-					primaryActionIcon = Codicon.copilotWarning;
+			} else if (chatExtensionInstalled && signedOut) {
+				primaryActionId = TOGGLE_CHAT_ACTION_ID;
+				primaryActionTitle = localize('signInToChatSetup', "Sign in to Use Copilot...");
+				primaryActionIcon = Codicon.copilotNotConnected;
+			} else if (chatExtensionInstalled && (chatQuotaExceeded || completionsQuotaExceeded)) {
+				primaryActionId = OPEN_CHAT_QUOTA_EXCEEDED_DIALOG;
+				if (chatQuotaExceeded && !completionsQuotaExceeded) {
+					primaryActionTitle = localize('chatQuotaExceededButton', "Monthly chat messages limit reached. Click for details.");
+				} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
+					primaryActionTitle = localize('completionsQuotaExceededButton', "Monthly code completions limit reached. Click for details.");
 				} else {
-					primaryActionId = TOGGLE_CHAT_ACTION_ID;
-					primaryActionTitle = TOGGLE_CHAT_ACTION_LABEL;
-					primaryActionIcon = Codicon.copilot;
+					primaryActionTitle = localize('chatAndCompletionsQuotaExceededButton', "Copilot Free plan limit reached. Click for details.");
 				}
+				primaryActionIcon = Codicon.copilotWarning;
+			} else {
+				primaryActionId = TOGGLE_CHAT_ACTION_ID;
+				primaryActionTitle = localize('toggleChat', "Toggle Chat");
+				primaryActionIcon = Codicon.copilot;
 			}
 			return instantiationService.createInstance(DropdownWithPrimaryActionViewItem, instantiationService.createInstance(MenuItemAction, {
 				id: primaryActionId,
@@ -744,7 +747,8 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 		}, Event.any(
 			agentService.onDidChangeAgents,
 			chatEntitlementService.onDidChangeQuotaExceeded,
-			chatEntitlementService.onDidChangeEntitlement
+			chatEntitlementService.onDidChangeEntitlement,
+			Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('chat.experimental.setupFromDialog'))
 		));
 
 		// Reduces flicker a bit on reload/restart
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 3b23bf3cb079..0eeff070bbbf 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -204,6 +204,12 @@ configurationRegistry.registerConfiguration({
 			default: product.quality !== 'stable',
 			tags: ['experimental', 'onExp']
 		},
+		'chat.experimental.setupFromDialog': { // TODO@bpasero remove this eventually
+			type: 'boolean',
+			description: nls.localize('chat.setupFromChat', "Controls whether Copilot setup starts from a dialog or from the welcome view."),
+			default: product.quality !== 'stable',
+			tags: ['experimental', 'onExp']
+		},
 		[mcpConfigurationSection]: {
 			type: 'object',
 			default: {
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index e4b57bc7d93c..c09f41a85bb4 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -14,7 +14,7 @@ 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, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { combinedDisposable, Disposable, DisposableStore, IDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
 import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { localize, localize2 } from '../../../../nls.js';
@@ -23,7 +23,7 @@ import { ICommandService } from '../../../../platform/commands/common/commands.j
 import { ConfigurationTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { ICustomDialogHTMLElement, IDialogService } from '../../../../platform/dialogs/common/dialogs.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';
@@ -39,9 +39,9 @@ import { AuthenticationSession, IAuthenticationService } from '../../../services
 import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
-import { IChatAgentService } from '../common/chatAgents.js';
+import { ChatAgentLocation, IChatAgentImplementation, IChatAgentRequest, IChatAgentResult, IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { CHAT_CATEGORY, CHAT_SETUP_ACTION_ID, CHAT_SETUP_ACTION_LABEL } from './actions/chatActions.js';
+import { CHAT_CATEGORY, CHAT_SETUP_ACTION_ID } from './actions/chatActions.js';
 import { ChatViewId, EditsViewId, ensureSideBarChatViewSize, preferCopilotEditsView, showCopilotView } from './chat.js';
 import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
 import { ChatViewsWelcomeExtensions, IChatViewsWelcomeContributionRegistry } from './viewsWelcome/chatViewsWelcome.js';
@@ -61,6 +61,8 @@ import { equalsIgnoreCase } from '../../../../base/common/strings.js';
 import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
 import { IChatEntitlementService, ChatEntitlement, ChatEntitlementService, ChatSetupContext, ChatSetupRequests } from '../common/chatEntitlementService.js';
 import { isObject } from '../../../../base/common/types.js';
+import { nullExtensionDescription } from '../../../services/extensions/common/extensions.js';
+import { IChatProgress, IChatProgressMessage, IChatWarningMessage } from '../common/chatService.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -85,6 +87,216 @@ const defaultChat = {
 
 //#region Contribution
 
+class SetupChatAgentImplementation implements IChatAgentImplementation {
+
+	static register(instantiationService: IInstantiationService, location: ChatAgentLocation, context: ChatSetupContext, controller: Lazy<ChatSetupController>): IDisposable {
+		return instantiationService.invokeFunction(accessor => {
+			const chatAgentService = accessor.get(IChatAgentService);
+
+			// TODO@bpasero: expand this to more cases (installed, not signed in / not signed up)
+			const setupChatAgentContext = ContextKeyExpr.and(
+				ChatContextKeys.Setup.hidden.negate(),
+				ChatContextKeys.Setup.installed.negate(),
+				ChatContextKeys.Setup.fromDialog
+			);
+
+			const id = location === ChatAgentLocation.Panel ? 'setup.chat' : 'setup.edits';
+
+			return combinedDisposable(
+				chatAgentService.registerAgent(id, {
+					id,
+					name: `${defaultChat.providerName} Copilot`,
+					isDefault: true,
+					when: setupChatAgentContext?.serialize(),
+					slashCommands: [],
+					disambiguation: [],
+					locations: [location],
+					metadata: {},
+					description: location === ChatAgentLocation.Panel ? localize('chatDescription', "Ask Copilot") : localize('editsDescription', "Edit files in your workspace"),
+					extensionId: nullExtensionDescription.identifier,
+					extensionDisplayName: nullExtensionDescription.name,
+					extensionPublisherId: nullExtensionDescription.publisher
+				}),
+				chatAgentService.registerAgentImplementation(id, instantiationService.createInstance(SetupChatAgentImplementation, location, context, controller))
+			);
+		});
+	}
+
+	constructor(
+		private readonly location: ChatAgentLocation,
+		private readonly context: ChatSetupContext,
+		private readonly controller: Lazy<ChatSetupController>,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ILogService private readonly logService: ILogService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+	) { }
+
+	async invoke(request: IChatAgentRequest, progress: (part: IChatProgress) => void): Promise<IChatAgentResult> {
+		this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'chat' });
+
+		const dialog = this.instantiationService.createInstance(ChatSetupDialog, this.context);
+		const result = await dialog.show();
+
+		// Proceed with setting up Copilot
+		if (result) {
+			const listener = this.controller.value.onDidChange(e => {
+				switch (this.controller.value.step) {
+					case ChatSetupStep.SigningIn:
+						progress({
+							kind: 'progressMessage',
+							content: new MarkdownString(localize('setupChatSignIn2', "Signing in to {0}...", ChatSetupRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName)),
+						} satisfies IChatProgressMessage);
+						break;
+					case ChatSetupStep.Installing:
+						progress({
+							kind: 'progressMessage',
+							content: new MarkdownString(localize('installingCopilot', "Getting Copilot Ready...")),
+						} satisfies IChatProgressMessage);
+						break;
+				}
+			});
+
+			let success = false;
+			try {
+				success = await this.controller.value.setup();
+			} catch (error) {
+				this.logService.error(localize('setupError', "Error during setup: {0}", toErrorMessage(error)));
+			} finally {
+				listener.dispose();
+			}
+
+			if (success) {
+				progress({
+					kind: 'progressMessage',
+					content: new MarkdownString(localize('copilotReady', "Copilot is ready to use.")),
+				} satisfies IChatProgressMessage);
+			}
+			else {
+				progress({
+					kind: 'warning',
+					content: new MarkdownString(localize('copilotSetupError', "Copilot setup failed. [Try again]({0} \"Retry\").", `command:${CHAT_SETUP_ACTION_ID}`), { isTrusted: true }),
+				} satisfies IChatWarningMessage);
+			}
+		}
+
+		// User has cancelled the setup
+		else {
+			progress({
+				kind: 'warning',
+				content: new MarkdownString(localize('settingUpCopilotWarning', "You need to [set up Copilot]({0} \"Set up Copilot\") to use Chat.", `command:${CHAT_SETUP_ACTION_ID}`), { isTrusted: true }),
+			} satisfies IChatWarningMessage);
+		}
+
+		return {};
+	}
+
+	provideWelcomeMessage() {
+		if (this.location === ChatAgentLocation.Panel) {
+			return {
+				title: localize('chatTitle', "Ask Copilot"),
+				message: new MarkdownString(localize('chatMessage', "Copilot is powered by AI, so mistakes are possible. Review output carefully before use.")),
+				icon: Codicon.copilotLarge
+			};
+		}
+
+		return {
+			title: localize('editsTitle', "Edit with Copilot"),
+			message: new MarkdownString(localize('editsMessage', "Start your editing session by defining a set of files that you want to work with. Then ask Copilot for the changes you want to make.")),
+			icon: Codicon.copilotLarge
+		};
+	}
+}
+
+class ChatSetupDialog {
+
+	constructor(
+		private readonly context: ChatSetupContext,
+		@IDialogService private readonly dialogService: IDialogService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService
+	) { }
+
+	async show(): Promise<boolean> {
+		const res = await this.dialogService.prompt<boolean>({
+			type: 'none',
+			message: localize('copilotFree', "Use AI Features with Copilot for Free"),
+			cancelButton: {
+				label: localize('cancel', "Cancel"),
+				run: () => false
+			},
+			buttons: [
+				{
+					label: this.getPrimaryButton(),
+					run: () => true
+				},
+			],
+			custom: {
+				icon: Codicon.copilotLarge,
+				htmlDetails: [this.create()]
+			}
+		});
+
+		return res.result;
+	}
+
+	private getPrimaryButton(): string {
+		switch (this.context.state.entitlement) {
+			case ChatEntitlement.Unknown:
+				return this.context.state.registered ? localize('signUp', "Sign in to Use Copilot") : localize('signUpFree', "Sign in to Use Copilot for Free");
+			case ChatEntitlement.Unresolved:
+				return this.context.state.registered ? localize('startUp', "Use Copilot") : localize('startUpLimited', "Use Copilot for Free");
+			case ChatEntitlement.Available:
+			case ChatEntitlement.Limited:
+				return localize('startUpLimited', "Use Copilot for Free");
+			case ChatEntitlement.Pro:
+			case ChatEntitlement.Unavailable:
+				return localize('startUp', "Use Copilot");
+		}
+	}
+
+	private create(): ICustomDialogHTMLElement {
+		const disposables = new DisposableStore();
+		const element = $('.chat-setup-view');
+
+		const markdown = this.instantiationService.createInstance(MarkdownRenderer, {});
+
+		// Header
+		const header = localize({ key: 'header', comment: ['{Locked="[Copilot]({0})"}'] }, "[Copilot]({0}) is your AI pair programmer.", defaultChat.documentationUrl);
+		element.appendChild($('p', undefined, disposables.add(markdown.render(new MarkdownString(header, { isTrusted: true }))).element));
+		element.appendChild(
+			$('div.chat-features-container', undefined,
+				$('div', undefined,
+					$('div.chat-feature-container', undefined,
+						renderIcon(Codicon.code),
+						$('span', undefined, localize('featureChat', "Code faster with Completions"))
+					),
+					$('div.chat-feature-container', undefined,
+						renderIcon(Codicon.editSession),
+						$('span', undefined, localize('featureEdits', "Build features with Copilot Edits"))
+					),
+					$('div.chat-feature-container', undefined,
+						renderIcon(Codicon.commentDiscussion),
+						$('span', undefined, localize('featureExplore', "Explore your codebase with Chat"))
+					)
+				)
+			)
+		);
+
+		// Terms
+		const terms = localize({ key: 'terms', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "By continuing, you agree to the [Terms]({0}) and [Privacy Policy]({1}).", defaultChat.termsStatementUrl, defaultChat.privacyStatementUrl);
+		element.appendChild($('p.legal', undefined, disposables.add(markdown.render(new MarkdownString(terms, { isTrusted: true }))).element));
+
+		// SKU Settings
+		if (this.telemetryService.telemetryLevel !== TelemetryLevel.NONE) {
+			const settings = localize({ key: 'settings', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "Copilot Free and Pro may show [public code]({0}) suggestions and we may use your data for product improvement. You can change these [settings]({1}) at any time.", defaultChat.publicCodeMatchesUrl, defaultChat.manageSettingsUrl);
+			element.appendChild($('p.legal', undefined, disposables.add(markdown.render(new MarkdownString(settings, { isTrusted: true }))).element));
+		}
+
+		return { element, dispose: () => disposables.dispose() };
+	}
+}
+
 export class ChatSetupContribution extends Disposable implements IWorkbenchContribution {
 
 	static readonly ID = 'workbench.chat.setup';
@@ -94,7 +306,8 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ICommandService private readonly commandService: ICommandService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IChatEntitlementService chatEntitlementService: ChatEntitlementService
+		@IChatEntitlementService chatEntitlementService: ChatEntitlementService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
 	) {
 		super();
 
@@ -106,12 +319,34 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 
 		const controller = new Lazy(() => this._register(this.instantiationService.createInstance(ChatSetupController, context, requests)));
 
-		this.registerChatWelcome(controller, context);
-		this.registerActions(context, requests);
+		this.registerSetupAgents(context, controller);
+		this.registerChatWelcome(context, controller);
+		this.registerActions(context, requests, controller);
 		this.registerUrlLinkHandler();
 	}
 
-	private registerChatWelcome(controller: Lazy<ChatSetupController>, context: ChatSetupContext): void {
+	private registerSetupAgents(context: ChatSetupContext, controller: Lazy<ChatSetupController>): void {
+		const registration = this._register(new MutableDisposable());
+
+		const updateRegistration = () => {
+			const disabled = context.state.installed || context.state.hidden || !this.configurationService.getValue('chat.experimental.setupFromDialog');
+			if (!disabled && !registration.value) {
+				registration.value = combinedDisposable(
+					SetupChatAgentImplementation.register(this.instantiationService, ChatAgentLocation.Panel, context, controller),
+					SetupChatAgentImplementation.register(this.instantiationService, ChatAgentLocation.EditingSession, context, controller)
+				);
+			} else if (disabled && registration.value) {
+				registration.clear();
+			}
+		};
+
+		this._register(Event.runAndSubscribe(Event.any(
+			context.onDidChange,
+			Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('chat.experimental.setupFromDialog'))
+		), () => updateRegistration()));
+	}
+
+	private registerChatWelcome(context: ChatSetupContext, controller: Lazy<ChatSetupController>): void {
 		Registry.as<IChatViewsWelcomeContributionRegistry>(ChatViewsWelcomeExtensions.ChatViewsWelcomeRegistry).register({
 			title: localize('welcomeChat', "Welcome to Copilot"),
 			when: ChatContextKeys.SetupViewCondition,
@@ -120,12 +355,14 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 		});
 	}
 
-	private registerActions(context: ChatSetupContext, requests: ChatSetupRequests): void {
+	private registerActions(context: ChatSetupContext, requests: ChatSetupRequests, controller: Lazy<ChatSetupController>): void {
 		const chatSetupTriggerContext = ContextKeyExpr.or(
 			ChatContextKeys.Setup.installed.negate(),
 			ChatContextKeys.Setup.canSignUp
 		);
 
+		const CHAT_SETUP_ACTION_LABEL = localize2('triggerChatSetup', "Use AI Features with Copilot for Free...");
+
 		class ChatSetupTriggerAction extends Action2 {
 
 			constructor() {
@@ -150,14 +387,50 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 				const configurationService = accessor.get(IConfigurationService);
 				const layoutService = accessor.get(IWorkbenchLayoutService);
 				const statusbarService = accessor.get(IStatusbarService);
+				const instantiationService = accessor.get(IInstantiationService);
+				const logService = accessor.get(ILogService);
+				const dialogService = accessor.get(IDialogService);
+				const commandService = accessor.get(ICommandService);
 
 				await context.update({ hidden: false });
 
-				showCopilotView(viewsService, layoutService);
-				ensureSideBarChatViewSize(viewDescriptorService, layoutService, viewsService);
+				const setupFromDialog = configurationService.getValue('chat.experimental.setupFromDialog');
+				if (!setupFromDialog) {
+					showCopilotView(viewsService, layoutService);
+					ensureSideBarChatViewSize(viewDescriptorService, layoutService, viewsService);
+				}
 
 				statusbarService.updateEntryVisibility('chat.statusBarEntry', true);
 				configurationService.updateValue('chat.commandCenter.enabled', true);
+
+				if (setupFromDialog) {
+					const dialog = instantiationService.createInstance(ChatSetupDialog, context);
+					const result = await dialog.show();
+					if (result) {
+						let success = false;
+						try {
+							success = await controller.value.setup({ notificationProgress: true });
+
+							if (success) {
+								showCopilotView(viewsService, layoutService);
+							}
+						} catch (error) {
+							logService.error(localize('setupError', "Error during setup: {0}", toErrorMessage(error)));
+						}
+
+						if (!success) {
+							const { confirmed } = await dialogService.confirm({
+								type: Severity.Error,
+								message: localize('setupErrorDialog', "Copilot setup failed. Would you like to try again?"),
+								primaryButton: localize('retry', "Retry"),
+							});
+
+							if (confirmed) {
+								commandService.executeCommand(CHAT_SETUP_ACTION_ID);
+							}
+						}
+					}
+				}
 			}
 		}
 
@@ -301,11 +574,13 @@ type InstallChatClassification = {
 	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.' };
+	setupFromDialog: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the setup was triggered from the dialog or not.' };
 };
 type InstallChatEvent = {
 	installResult: 'installed' | 'cancelled' | 'failedInstall' | 'failedNotSignedIn' | 'failedSignUp' | 'failedNotTrusted' | 'failedNoSession';
 	installDuration: number;
 	signUpErrorCode: number | undefined;
+	setupFromDialog: boolean;
 };
 
 enum ChatSetupStep {
@@ -362,7 +637,7 @@ class ChatSetupController extends Disposable {
 		this._onDidChange.fire();
 	}
 
-	async setup(options?: { forceSignIn: boolean }): Promise<void> {
+	async setup(options?: { forceSignIn?: boolean; notificationProgress?: boolean }): Promise<boolean> {
 		const watch = new StopWatch(false);
 		const title = localize('setupChatProgress', "Getting Copilot ready...");
 		const badge = this.activityService.showViewContainerActivity(preferCopilotEditsView(this.viewsService) ? CHAT_EDITING_SIDEBAR_PANEL_ID : CHAT_SIDEBAR_PANEL_ID, {
@@ -370,8 +645,8 @@ class ChatSetupController extends Disposable {
 		});
 
 		try {
-			await this.progressService.withProgress({
-				location: ProgressLocation.Window,
+			return await this.progressService.withProgress({
+				location: options?.notificationProgress ? ProgressLocation.Notification : ProgressLocation.Window,
 				command: CHAT_SETUP_ACTION_ID,
 				title,
 			}, () => this.doSetup(options?.forceSignIn ?? false, watch));
@@ -380,11 +655,13 @@ class ChatSetupController extends Disposable {
 		}
 	}
 
-	private async doSetup(forceSignIn: boolean, watch: StopWatch): Promise<void> {
+	private async doSetup(forceSignIn: boolean, watch: StopWatch): Promise<boolean> {
 		this.context.suspend();  // reduces flicker
 
 		let focusChatInput = false;
+		let success = false;
 		try {
+			const setupFromDialog = Boolean(this.configurationService.getValue('chat.experimental.setupFromDialog'));
 			const providerId = ChatSetupRequests.providerId(this.configurationService);
 			let session: AuthenticationSession | undefined;
 			let entitlement: ChatEntitlement | undefined;
@@ -394,8 +671,8 @@ class ChatSetupController extends Disposable {
 				this.setStep(ChatSetupStep.SigningIn);
 				const result = await this.signIn(providerId);
 				if (!result.session) {
-					this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedNotSignedIn', installDuration: watch.elapsed(), signUpErrorCode: undefined });
-					return;
+					this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedNotSignedIn', installDuration: watch.elapsed(), signUpErrorCode: undefined, setupFromDialog });
+					return false;
 				}
 
 				session = result.session;
@@ -406,15 +683,15 @@ class ChatSetupController extends Disposable {
 				message: localize('copilotWorkspaceTrust', "Copilot is currently only supported in trusted workspaces.")
 			});
 			if (!trusted) {
-				this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedNotTrusted', installDuration: watch.elapsed(), signUpErrorCode: undefined });
-				return;
+				this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedNotTrusted', installDuration: watch.elapsed(), signUpErrorCode: undefined, setupFromDialog });
+				return false;
 			}
 
 			const activeElement = getActiveElement();
 
 			// Install
 			this.setStep(ChatSetupStep.Installing);
-			await this.install(session, entitlement ?? this.context.state.entitlement, providerId, watch);
+			success = await this.install(session, entitlement ?? this.context.state.entitlement, providerId, watch);
 
 			const currentActiveElement = getActiveElement();
 			focusChatInput = activeElement === currentActiveElement || currentActiveElement === mainWindow.document.body;
@@ -426,6 +703,8 @@ class ChatSetupController extends Disposable {
 		if (focusChatInput) {
 			(await showCopilotView(this.viewsService, this.layoutService))?.focusInput();
 		}
+
+		return success;
 	}
 
 	private async signIn(providerId: string): Promise<{ session: AuthenticationSession | undefined; entitlement: ChatEntitlement | undefined }> {
@@ -455,9 +734,10 @@ class ChatSetupController extends Disposable {
 		return { session, entitlement: entitlements?.entitlement };
 	}
 
-	private async install(session: AuthenticationSession | undefined, entitlement: ChatEntitlement, providerId: string, watch: StopWatch,): Promise<void> {
+	private async install(session: AuthenticationSession | undefined, entitlement: ChatEntitlement, providerId: string, watch: StopWatch,): Promise<boolean> {
 		const wasInstalled = this.context.state.installed;
 		let signUpResult: boolean | { errorCode: number } | undefined = undefined;
+		const setupFromDialog = Boolean(this.configurationService.getValue('chat.experimental.setupFromDialog'));
 
 		try {
 			showCopilotView(this.viewsService, this.layoutService);
@@ -475,26 +755,26 @@ class ChatSetupController extends Disposable {
 					}
 
 					if (!session) {
-						this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedNoSession', installDuration: watch.elapsed(), signUpErrorCode: undefined });
-						return; // unexpected
+						this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedNoSession', installDuration: watch.elapsed(), signUpErrorCode: undefined, setupFromDialog });
+						return false; // unexpected
 					}
 				}
 
 				signUpResult = await this.requests.signUpLimited(session);
 
 				if (typeof signUpResult !== 'boolean' /* error */) {
-					this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedSignUp', installDuration: watch.elapsed(), signUpErrorCode: signUpResult.errorCode });
+					this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedSignUp', installDuration: watch.elapsed(), signUpErrorCode: signUpResult.errorCode, setupFromDialog });
 				}
 			}
 
 			await this.doInstall();
 		} 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 });
-			return;
+			this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: isCancellationError(error) ? 'cancelled' : 'failedInstall', installDuration: watch.elapsed(), signUpErrorCode: undefined, setupFromDialog });
+			return false;
 		}
 
-		this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'installed', installDuration: watch.elapsed(), signUpErrorCode: undefined });
+		this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'installed', installDuration: watch.elapsed(), signUpErrorCode: undefined, setupFromDialog });
 
 		if (wasInstalled && signUpResult === true) {
 			refreshTokens(this.commandService);
@@ -504,6 +784,8 @@ class ChatSetupController extends Disposable {
 			timeout(5000), 												// helps prevent flicker with sign-in welcome view
 			Event.toPromise(this.chatAgentService.onDidChangeAgents)	// https://github.com/microsoft/vscode-copilot/issues/9274
 		]);
+
+		return true;
 	}
 
 	private async doInstall(): Promise<void> {
@@ -660,7 +942,7 @@ class ChatSetupWelcomeContent extends Disposable {
 		button.enabled = this.controller.step === ChatSetupStep.Initial;
 	}
 
-	private async setupWithProvider(useEnterpriseProvider: boolean): Promise<void> {
+	private async setupWithProvider(useEnterpriseProvider: boolean): Promise<boolean> {
 		const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
 		registry.registerConfiguration({
 			'id': 'copilot.setup',
@@ -683,7 +965,7 @@ class ChatSetupWelcomeContent extends Disposable {
 		if (useEnterpriseProvider) {
 			const success = await this.handleEnterpriseInstance();
 			if (!success) {
-				return; // not properly configured, abort
+				return false; // not properly configured, abort
 			}
 		}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index ea5fd2617589..4405746333c2 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -281,7 +281,7 @@ class ChatStatusDashboard extends Disposable {
 			);
 
 			const button = disposables.add(new Button(setup, { ...defaultButtonStyles }));
-			button.label = newUser ? localize('setupCopilotForFreeButton', "Setup Copilot for Free") : localize('signInToUseCopilotButton', "Sign In to Use Copilot");
+			button.label = newUser ? localize('setupCopilotForFreeButton', "Set up Copilot for Free") : localize('signInToUseCopilotButton', "Sign In to Use Copilot");
 			disposables.add(button.onDidClick(() => this.runCommandAndClose(newUser ? { id: 'workbench.action.chat.triggerSetup' } : () => this.chatEntitlementService.requests?.value.signIn())));
 		}
 
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css b/src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css
index 785aeaa2fa70..0372805a40a4 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css
@@ -4,11 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 .chat-welcome-view .chat-setup-view {
-	text-align: center;
 
-	p {
-		width: 100%;
-	}
+	text-align: center;
 
 	.chat-features-container {
 		display: flex;
@@ -18,6 +15,22 @@
 		border: 1px solid var(--vscode-chat-requestBorder);
 		background-color: var(--vscode-chat-requestBackground);
 	}
+}
+
+.dialog-message-body .chat-setup-view {
+
+	p.legal {
+		font-size: 12px;
+		color: var(--vscode-descriptionForeground);
+	}
+}
+
+.dialog-message-body .chat-setup-view,
+.chat-welcome-view .chat-setup-view {
+
+	p {
+		width: 100%;
+	}
 
 	.chat-feature-container {
 		display: flex;
diff --git a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
index 875f7cf93a88..23a1a0825a2f 100644
--- a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
@@ -56,6 +56,7 @@ export namespace ChatContextKeys {
 		signedOut: new RawContextKey<boolean>('chatSetupSignedOut', false, true), 	// True when user is signed out.
 		hidden: new RawContextKey<boolean>('chatSetupHidden', false, true), 		// True when chat setup is explicitly hidden.
 		installed: new RawContextKey<boolean>('chatSetupInstalled', false, true),  	// True when the chat extension is installed.
+		fromDialog: ContextKeyExpr.has('config.chat.experimental.setupFromDialog'),
 
 		// Plans
 		canSignUp: new RawContextKey<boolean>('chatPlanCanSignUp', false, true), 	// True when user can sign up to be a chat limited user.
@@ -63,11 +64,12 @@ export namespace ChatContextKeys {
 		pro: new RawContextKey<boolean>('chatPlanPro', false, true) 				// True when user is a chat pro user.
 	};
 
-	export const SetupViewKeys = new Set([ChatContextKeys.Setup.hidden.key, ChatContextKeys.Setup.installed.key, ChatContextKeys.Setup.signedOut.key, ChatContextKeys.Setup.canSignUp.key]);
+	export const SetupViewKeys = new Set([ChatContextKeys.Setup.hidden.key, ChatContextKeys.Setup.installed.key, ChatContextKeys.Setup.signedOut.key, ChatContextKeys.Setup.canSignUp.key, ...Setup.fromDialog.keys()]);
 	export const SetupViewCondition = ContextKeyExpr.or(
 		ContextKeyExpr.and(
 			ChatContextKeys.Setup.hidden.negate(),
-			ChatContextKeys.Setup.installed.negate()
+			ChatContextKeys.Setup.installed.negate(),
+			Setup.fromDialog.negate()
 		),
 		ContextKeyExpr.and(
 			ChatContextKeys.Setup.canSignUp,

From 7c46bee91e05930081d977371b47ad80b8516a2f Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 14 Mar 2025 17:25:33 +0100
Subject: [PATCH 0934/1815] Git - handle both absolute and relative paths
 (#243571)

---
 extensions/git/src/git.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 2efa507ed663..09af8d0c3a57 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -356,7 +356,7 @@ function sanitizePath(path: string): string {
 }
 
 function sanitizeRelativePath(from: string, to: string): string {
-	return relativePath(from, to).replace(/\\/g, '/');
+	return path.isAbsolute(to) ? relativePath(from, to).replace(/\\/g, '/') : to;
 }
 
 const COMMIT_FORMAT = '%H%n%aN%n%aE%n%at%n%ct%n%P%n%D%n%B';

From a88dc0ad0be221ad28b2e884c36167af02883dbd Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 14 Mar 2025 17:43:09 +0100
Subject: [PATCH 0935/1815] editors - ensure to remove panes that fail to
 create (#243579)

---
 .../browser/parts/editor/editorPanes.ts          | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/browser/parts/editor/editorPanes.ts b/src/vs/workbench/browser/parts/editor/editorPanes.ts
index 0bbe03002a16..af5df2dd0b07 100644
--- a/src/vs/workbench/browser/parts/editor/editorPanes.ts
+++ b/src/vs/workbench/browser/parts/editor/editorPanes.ts
@@ -371,7 +371,21 @@ export class EditorPanes extends Disposable {
 			// right `window` can be determined in floating window cases.
 			this.editorPanesParent.appendChild(editorPaneContainer);
 
-			editorPane.create(editorPaneContainer);
+			try {
+				editorPane.create(editorPaneContainer);
+			} catch (error) {
+
+				// At this point the editor pane container is not healthy
+				// and as such, we remove it from the pane parent and hide
+				// it so that we have a chance to show an error placeholder.
+				// Not doing so would result in multiple `.editor-instance`
+				// lingering around in the DOM.
+
+				editorPaneContainer.remove();
+				hide(editorPaneContainer);
+
+				throw error;
+			}
 		}
 
 		return editorPane;

From 8c09c653cc7b8336a7fab6563515dc90bb781d08 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Fri, 14 Mar 2025 17:59:55 +0100
Subject: [PATCH 0936/1815] adopt gallery manifest in server (#243580)

---
 .../common/extensionGalleryManifestServiceIpc.ts   |  2 +-
 src/vs/server/node/serverServices.ts               |  4 ++--
 .../extensionGalleryManifestService.ts             | 14 +++++++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryManifestServiceIpc.ts b/src/vs/platform/extensionManagement/common/extensionGalleryManifestServiceIpc.ts
index 2eb7b30b2ee8..36ce53a0eaaf 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryManifestServiceIpc.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryManifestServiceIpc.ts
@@ -21,7 +21,7 @@ export class ExtensionGalleryManifestIPCService extends ExtensionGalleryManifest
 	private readonly barrier = new Barrier();
 
 	constructor(
-		server: IPCServer,
+		server: IPCServer<any>,
 		@IProductService productService: IProductService
 	) {
 		super(productService);
diff --git a/src/vs/server/node/serverServices.ts b/src/vs/server/node/serverServices.ts
index f813cd08904e..a0848a8bfc9c 100644
--- a/src/vs/server/node/serverServices.ts
+++ b/src/vs/server/node/serverServices.ts
@@ -84,7 +84,7 @@ import { INativeMcpDiscoveryHelperService, NativeMcpDiscoveryHelperChannelName }
 import { NativeMcpDiscoveryHelperChannel } from '../../platform/mcp/node/nativeMcpDiscoveryHelperChannel.js';
 import { NativeMcpDiscoveryHelperService } from '../../platform/mcp/node/nativeMcpDiscoveryHelperService.js';
 import { IExtensionGalleryManifestService } from '../../platform/extensionManagement/common/extensionGalleryManifest.js';
-import { ExtensionGalleryManifestService } from '../../platform/extensionManagement/common/extensionGalleryManifestService.js';
+import { ExtensionGalleryManifestIPCService } from '../../platform/extensionManagement/common/extensionGalleryManifestServiceIpc.js';
 
 const eventPrefix = 'monacoworkbench';
 
@@ -188,7 +188,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 		services.set(IServerTelemetryService, ServerNullTelemetryService);
 	}
 
-	services.set(IExtensionGalleryManifestService, new SyncDescriptor(ExtensionGalleryManifestService));
+	services.set(IExtensionGalleryManifestService, new ExtensionGalleryManifestIPCService(socketServer, productService));
 	services.set(IExtensionGalleryService, new SyncDescriptor(ExtensionGalleryServiceWithNoStorageService));
 
 	const downloadChannel = socketServer.getChannel('download', router);
diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionGalleryManifestService.ts b/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionGalleryManifestService.ts
index bb2ac6f4f305..9268bc19b004 100644
--- a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionGalleryManifestService.ts
+++ b/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionGalleryManifestService.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { IChannel } from '../../../../base/parts/ipc/common/ipc.js';
 import { IHeaders } from '../../../../base/parts/request/common/request.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
@@ -19,10 +18,10 @@ 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 { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
 
 export class WorkbenchExtensionGalleryManifestService extends ExtensionGalleryManifestService implements IExtensionGalleryManifestService {
 
-	private readonly channel: IChannel;
 	private readonly commonHeadersPromise: Promise<IHeaders>;
 
 	constructor(
@@ -31,6 +30,7 @@ export class WorkbenchExtensionGalleryManifestService extends ExtensionGalleryMa
 		@IFileService fileService: IFileService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IStorageService storageService: IStorageService,
+		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
 		@ISharedProcessService sharedProcessService: ISharedProcessService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IRequestService private readonly requestService: IRequestService,
@@ -46,10 +46,14 @@ export class WorkbenchExtensionGalleryManifestService extends ExtensionGalleryMa
 			storageService,
 			telemetryService);
 
-		this.channel = sharedProcessService.getChannel('extensionGalleryManifest');
+		const channels = [sharedProcessService.getChannel('extensionGalleryManifest')];
+		const remoteConnection = remoteAgentService.getConnection();
+		if (remoteConnection) {
+			channels.push(remoteConnection.getChannel('extensionGalleryManifest'));
+		}
 		this.getExtensionGalleryManifest().then(manifest => {
-			this.channel.call('setExtensionGalleryManifest', [manifest]);
-			this._register(this.onDidChangeExtensionGalleryManifest(manifest => this.channel.call('setExtensionGalleryManifest', [manifest])));
+			channels.forEach(channel => channel.call('setExtensionGalleryManifest', [manifest]));
+			this._register(this.onDidChangeExtensionGalleryManifest(manifest => channels.forEach(channel => channel.call('setExtensionGalleryManifest', [manifest]))));
 		});
 	}
 

From 80eac34bb185339b7ee5e3227f9dbbe3ae7d1f28 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Sat, 15 Mar 2025 02:07:50 +0900
Subject: [PATCH 0937/1815] fix: pass nodecommit_pooled_pages for the renderer
 (#243581)

---
 src/main.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main.ts b/src/main.ts
index c132c9b8b9bb..fdc424e10875 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -522,6 +522,18 @@ function getJSFlags(cliArgs: NativeParsedArgs): string | null {
 		jsFlags.push(cliArgs['js-flags']);
 	}
 
+	if (process.platform === 'linux') {
+		// Fix cppgc crash on Linux with 16KB page size.
+		// Refs https://issues.chromium.org/issues/378017037
+		// The fix from https://github.com/electron/electron/commit/6c5b2ef55e08dc0bede02384747549c1eadac0eb
+		// only affects non-renderer process.
+		// The following will ensure that the flag will be
+		// applied to the renderer process as well.
+		// TODO(deepak1556): Remove this once we update to
+		// Chromium >= 134.
+		jsFlags.push('--nodecommit_pooled_pages');
+	}
+
 	return jsFlags.length > 0 ? jsFlags.join(' ') : null;
 }
 

From f5d8885da8d98a553b1b9d6849f41f4dcab5cb0f Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 14 Mar 2025 10:17:10 -0700
Subject: [PATCH 0938/1815] cleanup wip

---
 .../observable/common/observableMemento.ts    |   9 +-
 .../contrib/mcp/browser/mcp.contribution.ts   |   2 +
 .../contrib/mcp/browser/mcpCommands.ts        |   4 +-
 .../common/discovery/extensionMcpDiscovery.ts |  94 ++++++
 .../contrib/mcp/common/mcpContextKeys.ts      |   2 +-
 .../contrib/mcp/common/mcpRegistry.ts         |  36 ++-
 .../contrib/mcp/common/mcpRegistryTypes.ts    |   5 +
 .../contrib/mcp/common/mcpService.ts          | 137 ++-------
 .../workbench/contrib/mcp/common/mcpTypes.ts  |  14 +-
 .../mcp/test/common/mcpService.test.ts        | 285 ------------------
 10 files changed, 186 insertions(+), 402 deletions(-)
 create mode 100644 src/vs/workbench/contrib/mcp/common/discovery/extensionMcpDiscovery.ts
 delete mode 100644 src/vs/workbench/contrib/mcp/test/common/mcpService.test.ts

diff --git a/src/vs/platform/observable/common/observableMemento.ts b/src/vs/platform/observable/common/observableMemento.ts
index 38aefce6fe78..c93edb483ba7 100644
--- a/src/vs/platform/observable/common/observableMemento.ts
+++ b/src/vs/platform/observable/common/observableMemento.ts
@@ -26,7 +26,7 @@ interface IObservableMementoOpts<T> {
  * with storage service events, and must be tracked appropriately.
  */
 export function observableMemento<T>(opts: IObservableMementoOpts<T>) {
-	return (scope: StorageScope, target: StorageTarget, storageService: IStorageService): ISettableObservable<T> & IDisposable => {
+	return (scope: StorageScope, target: StorageTarget, storageService: IStorageService): ObservableMemento<T> => {
 		return new ObservableMemento<T>(opts, scope, target, storageService);
 	};
 }
@@ -34,10 +34,13 @@ export function observableMemento<T>(opts: IObservableMementoOpts<T>) {
 /**
  * A value that is stored, and is also observable. Note: T should be readonly.
  */
-class ObservableMemento<T> extends ObservableValue<T> implements IDisposable {
+export class ObservableMemento<T> extends ObservableValue<T> implements IDisposable {
 	private readonly _store = new DisposableStore();
 	private _didChange = false;
 
+	/** Settable function called before persisting to storage. */
+	public onWillSave?: (value: T) => void;
+
 	constructor(
 		opts: IObservableMementoOpts<T>,
 		storageScope: StorageScope,
@@ -73,6 +76,8 @@ class ObservableMemento<T> extends ObservableValue<T> implements IDisposable {
 		}));
 
 		this._store.add(storageService.onWillSaveState(() => {
+			this.onWillSave?.(this.get());
+
 			if (this._didChange) {
 				this._didChange = false;
 				const value = this.get();
diff --git a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
index 882f1bd09552..7ab928aee109 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
@@ -22,12 +22,14 @@ import { McpDiscovery } from './mcpDiscovery.js';
 import { MCPServerActionRendering, ListMcpServerCommand, ResetMcpTrustCommand, McpServerOptionsCommand, ResetMcpCachedTools } from './mcpCommands.js';
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { McpContextKeysController } from '../common/mcpContextKeys.js';
+import { ExtensionMcpDiscovery } from '../common/discovery/extensionMcpDiscovery.js';
 
 registerSingleton(IMcpRegistry, McpRegistry, InstantiationType.Delayed);
 registerSingleton(IMcpService, McpService, InstantiationType.Delayed);
 
 mcpDiscoveryRegistry.register(new SyncDescriptor(RemoteNativeMpcDiscovery));
 mcpDiscoveryRegistry.register(new SyncDescriptor(ConfigMcpDiscovery));
+mcpDiscoveryRegistry.register(new SyncDescriptor(ExtensionMcpDiscovery));
 
 registerWorkbenchContribution2('mcpDiscovery', McpDiscovery, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2('mcpContextKeys', McpContextKeysController, WorkbenchPhase.BlockRestore);
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 53d3e2434c39..7bfda7ad730e 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -224,7 +224,7 @@ export class MCPServerActionRendering extends Disposable implements IWorkbenchCo
 				serversPerState[thisState].push(server);
 			}
 
-			const extensionNeedRefresh = mcpService.hasExtensionsWithUnknownServers.read(reader);
+			const extensionNeedRefresh = mcpService.hasCollectionsWithUnknownServers.read(reader);
 			const maxState = extensionNeedRefresh ? DisplayedState.NewTools : (serversPerState.length - 1) as DisplayedState;
 			return { state: maxState, servers: serversPerState[maxState] || [], extensions: extensionNeedRefresh };
 		});
@@ -278,7 +278,7 @@ export class MCPServerActionRendering extends Disposable implements IWorkbenchCo
 					const { state, servers } = displayedState.get();
 					if (state === DisplayedState.NewTools) {
 						servers.forEach(server => server.start());
-						mcpService.activateExtensionServers();
+						mcpService.activateCollections();
 					} else if (state === DisplayedState.Refreshing) {
 						servers.at(-1)?.showOutput();
 					} else if (state === DisplayedState.Error) {
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/extensionMcpDiscovery.ts b/src/vs/workbench/contrib/mcp/common/discovery/extensionMcpDiscovery.ts
new file mode 100644
index 000000000000..59fad99e698e
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/common/discovery/extensionMcpDiscovery.ts
@@ -0,0 +1,94 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable, DisposableMap } from '../../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../../base/common/observable.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
+import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
+import * as extensionsRegistry from '../../../../services/extensions/common/extensionsRegistry.js';
+import { mcpActivationEvent, mcpContributionPoint } from '../mcpConfiguration.js';
+import { IMcpRegistry } from '../mcpRegistryTypes.js';
+import { extensionMcpCollectionPrefix, extensionPrefixedIdentifier, McpServerDefinition } from '../mcpTypes.js';
+import { IMcpDiscovery } from './mcpDiscovery.js';
+
+
+const cacheKey = 'mcp.extCachedServers';
+
+interface IServerCacheEntry {
+	readonly servers: readonly McpServerDefinition.Serialized[];
+}
+
+const _mcpExtensionPoint = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint(mcpContributionPoint);
+
+export class ExtensionMcpDiscovery extends Disposable implements IMcpDiscovery {
+	private readonly _extensionCollectionIdsToPersist = new Set<string>();
+	private readonly cachedServers: { [collcetionId: string]: IServerCacheEntry };
+
+	constructor(
+		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry,
+		@IStorageService storageService: IStorageService,
+		@IExtensionService private readonly _extensionService: IExtensionService,
+	) {
+		super();
+		this.cachedServers = storageService.getObject(cacheKey, StorageScope.WORKSPACE, {});
+
+		this._register(storageService.onWillSaveState(() => {
+			let updated = false;
+			for (const collectionId of this._extensionCollectionIdsToPersist) {
+				const defs = this._mcpRegistry.collections.get().find(c => c.id === collectionId)?.serverDefinitions.get();
+				if (defs) {
+					updated = true;
+					this.cachedServers[collectionId] = { servers: defs.map(McpServerDefinition.toSerialized) };
+				}
+			}
+
+			if (updated) {
+				storageService.store(cacheKey, this.cachedServers, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+			}
+		}));
+	}
+
+	public start(): void {
+		const extensionCollections = this._register(new DisposableMap<string>());
+		_mcpExtensionPoint.setHandler((_extensions, delta) => {
+			const { added, removed } = delta;
+
+			for (const collections of removed) {
+				for (const coll of collections.value) {
+					extensionCollections.deleteAndDispose(extensionPrefixedIdentifier(collections.description.identifier, coll.id));
+				}
+			}
+
+			for (const collections of added) {
+				for (const coll of collections.value) {
+					const serverDefs = this.cachedServers.hasOwnProperty(coll.id) ? this.cachedServers[coll.id].servers : undefined;
+
+					const id = extensionPrefixedIdentifier(collections.description.identifier, coll.id);
+					const dispo = this._mcpRegistry.registerCollection({
+						id,
+						label: coll.label,
+						remoteAuthority: null,
+						isTrustedByDefault: true,
+						scope: StorageScope.WORKSPACE,
+						serverDefinitions: observableValue<McpServerDefinition[]>(this, serverDefs?.map(McpServerDefinition.fromSerialized) || []),
+						lazy: {
+							isCached: !!serverDefs,
+							load: () => this._activateExtensionServers(coll.id),
+							removed: () => extensionCollections.deleteAndDispose(id),
+						}
+					});
+
+					extensionCollections.set(id, dispo);
+				}
+			}
+		});
+	}
+
+	private async _activateExtensionServers(collectionId: string): Promise<void> {
+		await this._extensionService.activateByEvent(mcpActivationEvent(collectionId.slice(extensionMcpCollectionPrefix.length)));
+		await Promise.all(this._mcpRegistry.delegates
+			.map(r => r.waitForInitialProviderPromises()));
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts b/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
index 23847fa75b13..4d912ad1dac9 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
@@ -39,7 +39,7 @@ export class McpContextKeysController extends Disposable implements IWorkbenchCo
 			const serverTools = servers.map(s => s.tools.read(r));
 			ctxServerCount.set(servers.length);
 			ctxToolsCount.set(serverTools.reduce((count, tools) => count + tools.length, 0));
-			ctxHasUnknownTools.set(mcpService.hasExtensionsWithUnknownServers.read(r) || servers.some(s => {
+			ctxHasUnknownTools.set(mcpService.hasCollectionsWithUnknownServers.read(r) || servers.some(s => {
 				if (s.trusted.read(r) === false) {
 					return false;
 				}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
index 5ab82f0ec75c..5ebb780993df 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
@@ -30,13 +30,18 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 
 	private readonly _collections = observableValue<readonly McpCollectionDefinition[]>('collections', []);
 	private readonly _delegates: IMcpHostDelegate[] = [];
-
 	public readonly collections: IObservable<readonly McpCollectionDefinition[]> = this._collections;
 
 	private readonly _workspaceStorage = new Lazy(() => this._register(this._instantiationService.createInstance(McpRegistryInputStorage, StorageScope.WORKSPACE, StorageTarget.USER)));
 	private readonly _profileStorage = new Lazy(() => this._register(this._instantiationService.createInstance(McpRegistryInputStorage, StorageScope.PROFILE, StorageTarget.USER)));
 
 	private readonly _trustMemento = new Lazy(() => this._register(createTrustMemento(StorageScope.APPLICATION, StorageTarget.MACHINE, this._storageService)));
+	private readonly _lazyCollectionsToUpdate = new Set</* collection ID*/string>();
+
+	public readonly canDiscoverCollections = derived(reader => {
+		const collections = this._collections.read(reader);
+		return collections.some(c => c.lazy && c.lazy.isCached === false);
+	});
 
 	public get delegates(): readonly IMcpHostDelegate[] {
 		return this._delegates;
@@ -65,7 +70,13 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 
 	public registerCollection(collection: McpCollectionDefinition): IDisposable {
 		const currentCollections = this._collections.get();
-		this._collections.set([...currentCollections, collection], undefined);
+		const toReplace = currentCollections.find(c => c.lazy && c.id === collection.id);
+		if (toReplace) {
+			this._lazyCollectionsToUpdate.add(collection.id);
+			this._collections.set(currentCollections.map(c => c === toReplace ? collection : c), undefined);
+		} else {
+			this._collections.set([...currentCollections, collection], undefined);
+		}
 
 		return {
 			dispose: () => {
@@ -75,6 +86,27 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 		};
 	}
 
+	public async discoverCollections(): Promise<McpCollectionDefinition[]> {
+		const toDiscover = this._collections.get().filter(c => c.lazy && !c.lazy.isCached);
+		await Promise.all(toDiscover.map(c => c.lazy?.load()));
+
+		const found: McpCollectionDefinition[] = [];
+		const current = this._collections.get();
+		for (const collection of toDiscover) {
+			const rec = current.find(c => c.id === collection.id);
+			if (!rec) {
+				// ignored
+			} else if (rec.lazy) {
+				rec.lazy.removed?.(); // did not get replaced by the non-lazy version
+			} else {
+				found.push(rec);
+			}
+		}
+
+
+		return found;
+	}
+
 	public clearSavedInputs() {
 		this._profileStorage.value.clearAll();
 		this._workspaceStorage.value.clearAll();
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
index df58dce159d2..996a4c14f8ec 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
@@ -40,6 +40,11 @@ export interface IMcpRegistry {
 	readonly collections: IObservable<readonly McpCollectionDefinition[]>;
 	readonly delegates: readonly IMcpHostDelegate[];
 
+	/** Whether there are new collections that can be resolved with a discover() call */
+	readonly canDiscoverCollections: IObservable<boolean>;
+	/** Discover new collections, returning newly-discovered ones. */
+	discoverCollections(): Promise<McpCollectionDefinition[]>;
+
 	registerDelegate(delegate: IMcpHostDelegate): IDisposable;
 	registerCollection(collection: McpCollectionDefinition): IDisposable;
 
diff --git a/src/vs/workbench/contrib/mcp/common/mcpService.ts b/src/vs/workbench/contrib/mcp/common/mcpService.ts
index 30b24c58a577..305f00c2c9bf 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpService.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpService.ts
@@ -5,50 +5,27 @@
 
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { Disposable, DisposableMap, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { autorun, derived, IObservable, observableValue, transaction } from '../../../../base/common/observable.js';
+import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { autorun, IObservable, observableValue, transaction } from '../../../../base/common/observable.js';
 import { localize } from '../../../../nls.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 { IProductService } from '../../../../platform/product/common/productService.js';
-import { IStorageService, StorageScope } from '../../../../platform/storage/common/storage.js';
-import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { StorageScope } from '../../../../platform/storage/common/storage.js';
 import { ILanguageModelToolsService, IToolResult } from '../../chat/common/languageModelToolsService.js';
-import { mcpActivationEvent, mcpContributionPoint } from './mcpConfiguration.js';
 import { IMcpRegistry } from './mcpRegistryTypes.js';
 import { McpServer, McpServerMetadataCache } from './mcpServer.js';
-import { extensionMcpCollectionPrefix, extensionPrefixedIdentifier, IMcpServer, IMcpService, McpCollectionDefinition, McpServerDefinition } from './mcpTypes.js';
-import * as extensionsRegistry from '../../../services/extensions/common/extensionsRegistry.js';
-
-interface IExtensionCollectionsRec {
-	extensionId: ExtensionIdentifier;
-	collectionId: string;
-	/**
-	 * Servers created from the cache. Servers are only here until the extension
-	 * activates and confirms they still exist. Undefined for new extensions
-	 * with unknown servers.
-	 */
-	pendingServers: IMcpServer[] | undefined;
-}
-
+import { IMcpServer, IMcpService, McpCollectionDefinition, McpServerDefinition, McpServerToolsState } from './mcpTypes.js';
 
-const _mcpExtensionPoint = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint(mcpContributionPoint);
 
 export class McpService extends Disposable implements IMcpService {
 
 	declare _serviceBrand: undefined;
 
-	private readonly _extensionCollectionIdsToPersist = new Set<string>();
-	protected readonly _extensionServers = observableValue<readonly IExtensionCollectionsRec[]>(this, []);
-	private readonly _publishedServers = observableValue<readonly IMcpServer[]>(this, []);
-	public readonly servers: IObservable<readonly IMcpServer[]> = derived(reader => {
-		const extensionServers = this._extensionServers.read(reader).flatMap(e => e.pendingServers || []);
-		const publishedServers = this._publishedServers.read(reader);
-		return [...extensionServers, ...publishedServers];
-	});
+	private readonly _servers = observableValue<readonly IMcpServer[]>(this, []);
+	public readonly servers: IObservable<readonly IMcpServer[]> = this._servers;
 
-	public readonly hasExtensionsWithUnknownServers = derived(reader => this._extensionServers.read(reader).some(r => r.pendingServers === undefined));
+	public get hasCollectionsWithUnknownServers() { return this._mcpRegistry.canDiscoverCollections; }
 
 	protected readonly userCache: McpServerMetadataCache;
 	protected readonly workspaceCache: McpServerMetadataCache;
@@ -58,21 +35,10 @@ export class McpService extends Disposable implements IMcpService {
 		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry,
 		@ILanguageModelToolsService toolsService: ILanguageModelToolsService,
 		@IProductService productService: IProductService,
-		@IExtensionService private readonly _extensionService: IExtensionService,
-		@IStorageService storageService: IStorageService,
 		@ILogService private readonly _logService: ILogService,
 	) {
 		super();
 
-		this._register(storageService.onWillSaveState(() => {
-			for (const collectionId of this._extensionCollectionIdsToPersist) {
-				const publishedServers = this._mcpRegistry.collections.get().find(c => c.id === collectionId)?.serverDefinitions.get();
-				if (publishedServers) {
-					this.userCache.storeServers(collectionId, { servers: publishedServers.map(McpServerDefinition.toSerialized) });
-				}
-			}
-		}));
-
 		this.userCache = this._register(_instantiationService.createInstance(McpServerMetadataCache, StorageScope.PROFILE));
 		this.workspaceCache = this._register(_instantiationService.createInstance(McpServerMetadataCache, StorageScope.WORKSPACE));
 
@@ -84,43 +50,14 @@ export class McpService extends Disposable implements IMcpService {
 			for (const collection of this._mcpRegistry.collections.read(reader)) {
 				collection.serverDefinitions.read(reader);
 			}
-			this._extensionServers.read(reader);
 			updateThrottle.schedule(500);
 		}));
 
-		const extensionCollections = this._register(new DisposableMap<string>());
-
-		_mcpExtensionPoint.setHandler((_extensions, delta) => {
-			const { added, removed } = delta;
-
-			for (const collections of removed) {
-				for (const coll of collections.value) {
-					extensionCollections.deleteAndDispose(extensionPrefixedIdentifier(collections.description.identifier, coll.id));
-				}
-			}
-
-			for (const collections of added) {
-				for (const coll of collections.value) {
-
-					const id = extensionPrefixedIdentifier(collections.description.identifier, coll.id);
-					const dispo = _mcpRegistry.registerCollection({
-						id,
-						label: coll.label,
-						remoteAuthority: null,
-						isTrustedByDefault: true,
-						scope: StorageScope.WORKSPACE,
-						serverDefinitions: observableValue<McpServerDefinition[]>(this, [])
-					});
-
-					extensionCollections.set(id, dispo);
-				}
-			}
-		});
 
 		const tools = this._register(new MutableDisposable());
 		this._register(autorun(r => {
 
-			const servers = this._publishedServers.read(r);
+			const servers = this._servers.read(r);
 
 			// TODO@jrieken wasteful, needs some diff'ing/change-info
 			const newStore = new DisposableStore();
@@ -192,27 +129,29 @@ export class McpService extends Disposable implements IMcpService {
 		}));
 	}
 
-	public async activateExtensionServers(): Promise<void> {
-		const toActivate = new Set(this._extensionServers.get().filter(r => r.pendingServers === undefined).map(r => r.collectionId));
-
-		await Promise.all([...toActivate].map(collectionId =>
-			this._extensionService.activateByEvent(mcpActivationEvent(collectionId.slice(extensionMcpCollectionPrefix.length)))));
-
-		await this._waitForInitialProvidersToPublish();
-
-		await Promise.all(this._publishedServers.get()
-			.filter(s => toActivate.has(s.collection.id))
-			.map(server => server.start()));
-	}
-
 	public resetCaches(): void {
 		this.userCache.reset();
 		this.workspaceCache.reset();
 	}
 
-	private async _waitForInitialProvidersToPublish() {
-		await Promise.all(this._mcpRegistry.delegates
-			.map(r => r.waitForInitialProviderPromises()));
+	public async activateCollections(): Promise<void> {
+		const collections = await this._mcpRegistry.discoverCollections();
+		const collectionIds = new Set(collections.map(c => c.id));
+
+		this._updateCollectedServers();
+
+		// Discover any newly-collected servers with unknown tools
+		const todo: Promise<unknown>[] = [];
+		for (const server of this._servers.get()) {
+			if (collectionIds.has(server.collection.id)) {
+				const state = server.toolsState.get();
+				if (state === McpServerToolsState.Unknown) {
+					todo.push(server.start());
+				}
+			}
+		}
+
+		await Promise.all(todo);
 	}
 
 	private _updateCollectedServers() {
@@ -224,7 +163,7 @@ export class McpService extends Disposable implements IMcpService {
 		);
 
 		const nextDefinitions = new Set(definitions);
-		const currentServers = this._publishedServers.get();
+		const currentServers = this._servers.get();
 		const nextServers: IMcpServer[] = [];
 		const pushMatch = (match: (typeof definitions)[0], server: IMcpServer) => {
 			nextDefinitions.delete(match);
@@ -247,36 +186,18 @@ export class McpService extends Disposable implements IMcpService {
 			}
 		}
 
-		// Adopt any servers that are pending from extensions.
-		let extensionServers = this._extensionServers.get();
-		for (const definition of nextDefinitions) {
-			for (const rec of extensionServers) {
-				const server = rec.pendingServers?.find(s => defsEqual(s, definition));
-				if (server !== undefined) {
-					pushMatch(definition, server);
-					this._logService.debug(`MCP server ${server.definition.id} adopted from extension ${rec.extensionId.value}`);
-
-					const pendingServers = rec.pendingServers!.filter(s => s !== server);
-					extensionServers = extensionServers.map(rec2 => rec2 === rec ? { ...rec, pendingServers } : rec2);
-					break;
-				}
-			}
-		}
-
 		// Create any new servers that are needed.
 		for (const def of nextDefinitions) {
 			nextServers.push(this._instantiationService.createInstance(McpServer, def.collectionDefinition, def.serverDefinition, false, def.collectionDefinition.scope === StorageScope.WORKSPACE ? this.workspaceCache : this.userCache));
 		}
 
 		transaction(tx => {
-			this._publishedServers.set(nextServers, tx);
-			this._extensionServers.set(extensionServers, tx);
+			this._servers.set(nextServers, tx);
 		});
 	}
 
 	public override dispose(): void {
-		this._extensionServers.get().forEach(server => server.pendingServers?.forEach(s => s.dispose()));
-		this._publishedServers.get().forEach(server => server.dispose());
+		this._servers.get().forEach(server => server.dispose());
 		super.dispose();
 	}
 }
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
index f2050a38c86b..cc91d2ec53c1 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
@@ -42,6 +42,16 @@ export interface McpCollectionDefinition {
 	/** Scope where associated collection info should be stored. */
 	readonly scope: StorageScope;
 
+	/** For lazy-loaded collections only: */
+	readonly lazy?: {
+		/** True if `serverDefinitions` were loaded from the cache */
+		isCached: boolean;
+		/** Triggers a load of the real server definition, which should be pushed to the IMcpRegistry. If not this definition will be removed. */
+		load(): Promise<void>;
+		/** Called after `load()` if the extension is not found. */
+		removed?(): void;
+	};
+
 	readonly presentation?: {
 		/** Sort order of the collection. */
 		readonly order?: number;
@@ -150,9 +160,9 @@ export interface IMcpService {
 	resetCaches(): void;
 
 	/** Set if there are extensions that register MCP servers that have never been activated. */
-	readonly hasExtensionsWithUnknownServers: IObservable<boolean>;
+	readonly hasCollectionsWithUnknownServers: IObservable<boolean>;
 	/** Activatese extensions and runs their MCP servers. */
-	activateExtensionServers(): Promise<void>;
+	activateCollections(): Promise<void>;
 }
 
 export const IMcpService = createDecorator<IMcpService>('IMcpService');
diff --git a/src/vs/workbench/contrib/mcp/test/common/mcpService.test.ts b/src/vs/workbench/contrib/mcp/test/common/mcpService.test.ts
deleted file mode 100644
index 5034b55dbc33..000000000000
--- a/src/vs/workbench/contrib/mcp/test/common/mcpService.test.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 * as assert from 'assert';
-import { Emitter } from '../../../../../base/common/event.js';
-import { DisposableStore } from '../../../../../base/common/lifecycle.js';
-import { ISettableObservable, observableValue } from '../../../../../base/common/observable.js';
-import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
-import { ExtensionIdentifier, IExtensionDescription } from '../../../../../platform/extensions/common/extensions.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 { ILoggerService, ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
-import { IProductService } from '../../../../../platform/product/common/productService.js';
-import { IStorageService, StorageScope } from '../../../../../platform/storage/common/storage.js';
-import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js';
-import { IExtensionService, IExtensionsStatus, NullExtensionService } from '../../../../services/extensions/common/extensions.js';
-import { TestContextService, TestLoggerService, TestStorageService } from '../../../../test/common/workbenchTestServices.js';
-import { ILanguageModelToolsService } from '../../../chat/common/languageModelToolsService.js';
-import { IMcpRegistry } from '../../common/mcpRegistryTypes.js';
-import { McpService } from '../../common/mcpService.js';
-import { extensionMcpCollectionPrefix, McpCollectionSortOrder } from '../../common/mcpTypes.js';
-import { timeout } from '../../../../../base/common/async.js';
-
-class TestExtensionService extends NullExtensionService {
-	private readonly store = new DisposableStore();
-
-	public extensionStatuses = new Map<string, { activationTimes?: object }>();
-	public firedActivationEvents = new Set<string>();
-
-	public onDidChangeExtensionsEmitter = this.store.add(new Emitter<{ added: IExtensionDescription[]; removed: IExtensionDescription[] }>());
-	public override onDidChangeExtensions = this.onDidChangeExtensionsEmitter.event;
-
-	public onDidChangeExtensionStatusEmitter = this.store.add(new Emitter<any>());
-	public override onDidChangeExtensionsStatus = this.onDidChangeExtensionStatusEmitter.event;
-
-	override getExtensionsStatus(): { [id: string]: IExtensionsStatus } {
-		const result: { [id: string]: IExtensionsStatus } = {};
-		this.extensionStatuses.forEach((status, id) => {
-			result[id] = status as Partial<IExtensionsStatus> as IExtensionsStatus;
-		});
-		return result;
-	}
-
-	override activateByEvent(activationEvent: string): Promise<void> {
-		this.firedActivationEvents.add(activationEvent);
-		return Promise.resolve();
-	}
-
-	dispose() {
-		this.store.dispose();
-	}
-}
-
-class TestMcpService extends McpService {
-	public get internalUserCache() {
-		return this.userCache;
-	}
-	public get internalWorkspaceCache() {
-		return this.workspaceCache;
-	}
-
-	public get internalExtensionServers() {
-		return this._extensionServers;
-	}
-}
-
-suite('Workbench - MCP - Service', () => {
-	const store = ensureNoDisposablesAreLeakedInTestSuite();
-
-	let instantiationService: TestInstantiationService;
-	let mockExtensionService: TestExtensionService;
-	let mockMcpRegistry: Partial<IMcpRegistry>;
-	let mockLanguageModelToolsService: Partial<ILanguageModelToolsService>;
-	let testStorageService: TestStorageService;
-	let mcpService: TestMcpService;
-
-	// Utility function to create a mock extension
-	const createExtension = (id: string, collections?: Array<{ id: string; label: string }>) => {
-		return {
-			identifier: new ExtensionIdentifier(id),
-			contributes: collections ? {
-				modelContextServerCollections: collections
-			} : undefined
-		};
-	};
-
-	setup(() => {
-		// Mock extension service
-		mockExtensionService = store.add(new TestExtensionService());
-
-		// Mock MCP registry
-		mockMcpRegistry = {
-			delegates: [],
-			collections: observableValue('collections', [])
-		};
-
-		// Mock language model tools service
-		mockLanguageModelToolsService = {
-			registerToolData: () => ({ dispose: () => { } }),
-			registerToolImplementation: () => ({ dispose: () => { } })
-		};
-
-		// Create test storage service
-		testStorageService = store.add(new TestStorageService());
-
-		// Create service collection
-		const services = new ServiceCollection(
-			[IExtensionService, mockExtensionService],
-			[IMcpRegistry, mockMcpRegistry],
-			[ILanguageModelToolsService, mockLanguageModelToolsService],
-			[IContextKeyService, new MockContextKeyService()],
-			[IStorageService, testStorageService],
-			[ILoggerService, store.add(new TestLoggerService())],
-			[IProductService, { nameShort: 'VSCode Test' } as IProductService],
-			[IWorkspaceContextService, new TestContextService()],
-			[ILogService, new NullLogService()],
-		);
-
-		// Create instantiation service
-		instantiationService = store.add(new TestInstantiationService(services));
-
-		// Create McpService instance
-		mcpService = instantiationService.createInstance(TestMcpService);
-		store.add(mcpService);
-	});
-
-	test('should initialize with no servers', () => {
-		assert.strictEqual(mcpService.servers.get().length, 0);
-	});
-
-	test('should have extension servers when extensions with collections are loaded', async () => {
-		// Create a test extension with MCP collections
-		const ext1 = createExtension('ext1', [
-			{ id: 'collection1', label: 'Collection 1' }
-		]);
-
-		// Set cached servers for this collection
-		mcpService.internalWorkspaceCache.storeServers(extensionMcpCollectionPrefix + 'collection1', {
-			servers: [{
-				id: 'server1',
-				label: 'Server 1',
-				launch: { type: 1, command: 'test', args: [], env: {}, cwd: undefined }
-			}]
-		});
-
-		// Trigger extension loaded
-		mockExtensionService.onDidChangeExtensionsEmitter.fire({ added: [ext1 as any], removed: [] });
-
-		// Should have one server in the servers list
-		assert.strictEqual(mcpService.servers.get().length, 1);
-		assert.strictEqual(mcpService.servers.get()[0].definition.id, 'server1');
-
-		// Should be loaded from cache but not activated yet
-		assert.strictEqual(mcpService.internalExtensionServers.get().length, 1);
-		assert.strictEqual(mcpService.internalExtensionServers.get()[0].collectionId, extensionMcpCollectionPrefix + 'collection1');
-		assert.strictEqual(mcpService.internalExtensionServers.get()[0].pendingServers?.length, 1);
-	});
-
-	test('should remove pending servers once extension is activated', async () => {
-		// Create a test extension with MCP collections
-		const ext1 = createExtension('ext1', [
-			{ id: 'collection1', label: 'Collection 1' }
-		]);
-
-		// Set cached servers for this collection
-		mcpService.internalWorkspaceCache.storeServers(extensionMcpCollectionPrefix + 'collection1', {
-			servers: [{
-				id: 'server1',
-				label: 'Server 1',
-				launch: { type: 1, command: 'test', args: [], env: {}, cwd: undefined }
-			}]
-		});
-
-		// Add the extension
-		mockExtensionService.onDidChangeExtensionsEmitter.fire({ added: [ext1 as any], removed: [] });
-
-		// Should have one server in the servers list (from cache)
-		assert.strictEqual(mcpService.servers.get().length, 1);
-		assert.strictEqual(mcpService.internalExtensionServers.get().length, 1);
-		assert.strictEqual(mcpService.internalExtensionServers.get()[0].pendingServers?.length, 1);
-
-		// Now simulate extension activation (but it doesn't register the server)
-		mockExtensionService.extensionStatuses.set('ext1', { activationTimes: {} });
-		mockExtensionService.onDidChangeExtensionStatusEmitter.fire(undefined);
-		await timeout(1); // wait for _waitForInitialProvidersToPublish to resolve
-
-		// The server should be removed since it wasn't registered by the extension
-		assert.strictEqual(mcpService.servers.get().length, 0);
-		assert.strictEqual(mcpService.internalExtensionServers.get().length, 0);
-	});
-
-	test('should keep servers that are registered by activated extension', async () => {
-		// Create a test extension with MCP collections
-		const ext1 = createExtension('ext1', [
-			{ id: 'collection1', label: 'Collection 1' }
-		]);
-
-		// Set cached servers for this collection
-		mcpService.internalWorkspaceCache.storeServers(extensionMcpCollectionPrefix + 'collection1', {
-			servers: [{
-				id: 'server1',
-				label: 'Server 1',
-				launch: { type: 1, command: 'test', args: [], env: {}, cwd: undefined }
-			}]
-		});
-
-		// Add the extension
-		mockExtensionService.onDidChangeExtensionsEmitter.fire({ added: [ext1 as any], removed: [] });
-
-
-		// Register a collection with the same server id through the registry
-		const mockCollection = {
-			id: 'collection1',
-			label: 'Collection 1',
-			remoteAuthority: null,
-			serverDefinitions: observableValue('serverDefs', [{
-				id: 'server1',
-				label: 'Server 1',
-				launch: { type: 1, command: 'test', args: [], env: {}, cwd: undefined }
-			}]),
-			isTrustedByDefault: true,
-			scope: StorageScope.APPLICATION,
-			presentation: { order: McpCollectionSortOrder.Extension }
-		};
-
-		(mockMcpRegistry!.collections as ISettableObservable<any>).set([mockCollection], undefined);
-
-		// Now simulate extension activation
-		mockExtensionService.extensionStatuses.set('ext1', { activationTimes: {} });
-		mockExtensionService.onDidChangeExtensionStatusEmitter.fire(undefined);
-		await timeout(1); // wait for _waitForInitialProvidersToPublish to resolve
-
-		// The server should still be there since it was registered
-		assert.strictEqual(mcpService.servers.get().length, 1);
-		assert.strictEqual(mcpService.internalExtensionServers.get().length, 0); // But removed from extension servers
-	});
-
-	test('activateExtensionServers should activate all extension events', async () => {
-		// Create extensions with MCP collections
-		const ext1 = createExtension('ext1', [{ id: 'collection1', label: 'Collection 1' }]);
-		const ext2 = createExtension('ext2', [{ id: 'collection2', label: 'Collection 2' }]);
-
-		// Add the extensions
-		mockExtensionService.onDidChangeExtensionsEmitter.fire({ added: [ext1 as any, ext2 as any], removed: [] });
-
-		// Verify activation events aren't done yet
-		assert.strictEqual(mockExtensionService.firedActivationEvents.has('onMcpCollection:collection1'), false);
-		assert.strictEqual(mockExtensionService.firedActivationEvents.has('onMcpCollection:collection2'), false);
-
-		// Call activateExtensionServers
-		await mcpService.activateExtensionServers();
-
-		// Verify activation events were triggered
-		assert.strictEqual(mockExtensionService.firedActivationEvents.has('onMcpCollection:collection1'), true);
-		assert.strictEqual(mockExtensionService.firedActivationEvents.has('onMcpCollection:collection2'), true);
-	});
-
-	test('hasExtensionsWithUnknownServers should be true when extensions have unactivated servers', async () => {
-		// Initially should be false
-		assert.strictEqual(mcpService.hasExtensionsWithUnknownServers.get(), false);
-
-		// Create a test extension with MCP collections
-		const ext1 = createExtension('ext1', [
-			{ id: 'collection1', label: 'Collection 1' }
-		]);
-
-		// Add the extension
-		mockExtensionService.onDidChangeExtensionsEmitter.fire({ added: [ext1 as any], removed: [] });
-
-		// Should be true now
-		assert.strictEqual(mcpService.hasExtensionsWithUnknownServers.get(), true);
-
-		// Activate the extension
-		mockExtensionService.extensionStatuses.set('ext1', { activationTimes: {} });
-		mockExtensionService.onDidChangeExtensionStatusEmitter.fire(undefined);
-		await timeout(1); // wait for _waitForInitialProvidersToPublish to resolve
-
-		// Should be false again
-		assert.strictEqual(mcpService.hasExtensionsWithUnknownServers.get(), false);
-	});
-});

From 4800b15c46d34e2d694048d748b6a8120fcea0e8 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 14 Mar 2025 10:50:46 -0700
Subject: [PATCH 0939/1815] Move history restored message above the fold

Part of #241978
---
 src/vs/platform/terminal/node/ptyService.ts | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/vs/platform/terminal/node/ptyService.ts b/src/vs/platform/terminal/node/ptyService.ts
index cb01a77585de..840334c8d4cc 100644
--- a/src/vs/platform/terminal/node/ptyService.ts
+++ b/src/vs/platform/terminal/node/ptyService.ts
@@ -234,6 +234,21 @@ export class PtyService extends Disposable implements IPtyService {
 
 	private async _reviveTerminalProcess(workspaceId: string, terminal: ISerializedTerminalState): Promise<void> {
 		const restoreMessage = localize('terminal-history-restored', "History restored");
+
+		// Conpty v1.22+ uses passthrough and doesn't reprint the buffer often, this means that when
+		// the terminal is revived, the cursor would be at the bottom of the buffer then when
+		// PSReadLine requests `GetConsoleCursorInfo` it will be handled by conpty itself by design.
+		// This causes the cursor to move to the top into the replayed terminal contents. To avoid
+		// this, the post restore message will print new lines to get a clear viewport and put the
+		// cursor back at to top left.
+		let postRestoreMessage = '';
+		if (isWindows) {
+			const lastReplayEvent = terminal.replayEvent.events.length > 0 ? terminal.replayEvent.events.at(-1) : undefined;
+			if (lastReplayEvent) {
+				postRestoreMessage += '\r\n'.repeat(lastReplayEvent.rows - 1) + `\x1b[H`;
+			}
+		}
+
 		// TODO: We may at some point want to show date information in a hover via a custom sequence:
 		//   new Date(terminal.timestamp).toLocaleDateString(dateTimeFormatLocale)
 		//   new Date(terminal.timestamp).toLocaleTimeString(dateTimeFormatLocale)
@@ -244,7 +259,7 @@ export class PtyService extends Disposable implements IPtyService {
 				color: terminal.processDetails.color,
 				icon: terminal.processDetails.icon,
 				name: terminal.processDetails.titleSource === TitleEventSource.Api ? terminal.processDetails.title : undefined,
-				initialText: terminal.replayEvent.events[0].data + formatMessageForTerminal(restoreMessage, { loudFormatting: true })
+				initialText: terminal.replayEvent.events[0].data + formatMessageForTerminal(restoreMessage, { loudFormatting: true }) + postRestoreMessage
 			},
 			terminal.processDetails.cwd,
 			terminal.replayEvent.events[0].cols,

From 0a7b6a0f8be1faab762bea4ae4c8cb7120427551 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 14 Mar 2025 18:52:13 +0100
Subject: [PATCH 0940/1815] Git - add commit details to ref pickers (#243582)

* Refactor ref parsing

* Initial implementation of getting the commit details

* Show additional information in the pickers
---
 extensions/git/package.json     |  5 ++
 extensions/git/package.nls.json |  1 +
 extensions/git/src/api/git.d.ts |  2 +
 extensions/git/src/commands.ts  | 44 ++++++++++++++---
 extensions/git/src/git.ts       | 88 +++++++++++++++++++++++++--------
 5 files changed, 112 insertions(+), 28 deletions(-)

diff --git a/extensions/git/package.json b/extensions/git/package.json
index a117e45d0259..7d89571372bc 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3325,6 +3325,11 @@
           "type": "boolean",
           "default": true,
           "markdownDescription": "%config.discardUntrackedChangesToTrash%"
+        },
+        "git.showReferenceDetails": {
+          "type": "boolean",
+          "default": false,
+          "markdownDescription": "%config.showReferenceDetails%"
         }
       }
     },
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index 101618a8e451..52ba38198170 100644
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -289,6 +289,7 @@
 	"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`.",
 	"config.discardUntrackedChangesToTrash": "Controls whether discarding untracked changes moves the file(s) to the Recycle Bin (Windows), Trash (macOS, Linux) instead of deleting them permanently. **Note:** This setting has no effect when connected to a remote or when running in Linux as a snap package.",
+	"config.showReferenceDetails": "Controls whether to show the details of the last commit for Git refs in the checkout, branch, and tag pickers.",
 	"submenu.explorer": "Git",
 	"submenu.commit": "Commit",
 	"submenu.commit.amend": "Amend",
diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts
index 5bbb4b03a9c6..9562106f9c6d 100644
--- a/extensions/git/src/api/git.d.ts
+++ b/extensions/git/src/api/git.d.ts
@@ -30,6 +30,7 @@ export interface Ref {
 	readonly type: RefType;
 	readonly name?: string;
 	readonly commit?: string;
+	readonly commitDetails?: Commit;
 	readonly remote?: string;
 }
 
@@ -185,6 +186,7 @@ export interface RefQuery {
 	readonly contains?: string;
 	readonly count?: number;
 	readonly pattern?: string | string[];
+	readonly includeCommitDetails?: boolean;
 	readonly sort?: 'alphabetically' | 'committerdate';
 }
 
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index d94649559396..1094a438b07f 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -14,7 +14,7 @@ import { Model } from './model';
 import { GitResourceGroup, Repository, Resource, ResourceGroupType } from './repository';
 import { DiffEditorSelectionHunkToolbarContext, LineChange, applyLineChanges, getIndexDiffInformation, getModifiedRange, getWorkingTreeDiffInformation, intersectDiffWithRange, invertLineChange, toLineChanges, toLineRanges } from './staging';
 import { fromGitUri, toGitUri, isGitUri, toMergeUris, toMultiFileDiffEditorUris } from './uri';
-import { DiagnosticSeverityConfig, dispose, getCommitShortHash, grep, isDefined, isDescendant, isLinuxSnap, isRemote, isWindows, pathEquals, relativePath, toDiagnosticSeverity, truncate } from './util';
+import { DiagnosticSeverityConfig, dispose, fromNow, getCommitShortHash, grep, isDefined, isDescendant, isLinuxSnap, isRemote, isWindows, pathEquals, relativePath, toDiagnosticSeverity, truncate } from './util';
 import { GitTimelineItem } from './timelineProvider';
 import { ApiRepository } from './api/api1';
 import { getRemoteSourceActions, pickRemoteSource } from './remoteSource';
@@ -73,6 +73,10 @@ class RefItem implements QuickPickItem {
 	}
 
 	get description(): string {
+		if (this.ref.commitDetails?.authorDate) {
+			return fromNow(this.ref.commitDetails.authorDate, true, true);
+		}
+
 		switch (this.ref.type) {
 			case RefType.Head:
 				return this.shortCommit;
@@ -85,6 +89,14 @@ class RefItem implements QuickPickItem {
 		}
 	}
 
+	get detail(): string | undefined {
+		if (this.ref.commitDetails?.authorName && this.ref.commitDetails?.message) {
+			return `${this.ref.commitDetails?.authorName}  |  ${this.ref.commitDetails?.message}`;
+		}
+
+		return undefined;
+	}
+
 	get refName(): string | undefined { return this.ref.name; }
 	get refRemote(): string | undefined { return this.ref.remote; }
 	get shortCommit(): string { return (this.ref.commit || '').substr(0, 8); }
@@ -326,6 +338,8 @@ async function categorizeResourceByResolution(resources: Resource[]): Promise<{
 async function createCheckoutItems(repository: Repository, detached = false): Promise<QuickPickItem[]> {
 	const config = workspace.getConfiguration('git');
 	const checkoutTypeConfig = config.get<string | string[]>('checkoutType');
+	const showRefDetails = config.get<boolean>('showReferenceDetails') === true;
+
 	let checkoutTypes: string[];
 
 	if (checkoutTypeConfig === 'all' || !checkoutTypeConfig || checkoutTypeConfig.length === 0) {
@@ -341,7 +355,7 @@ async function createCheckoutItems(repository: Repository, detached = false): Pr
 		checkoutTypes = checkoutTypes.filter(t => t !== 'tags');
 	}
 
-	const refs = await repository.getRefs();
+	const refs = await repository.getRefs({ includeCommitDetails: showRefDetails });
 	const refProcessors = checkoutTypes.map(type => getCheckoutRefProcessor(repository, type))
 		.filter(p => !!p) as RefProcessor[];
 
@@ -2696,6 +2710,7 @@ export class CommandCenter {
 		const quickPick = window.createQuickPick();
 		quickPick.busy = true;
 		quickPick.sortByLabel = false;
+		quickPick.matchOnDetail = true;
 		quickPick.placeholder = opts?.detached
 			? l10n.t('Select a branch to checkout in detached mode')
 			: l10n.t('Select a branch or tag to checkout');
@@ -2916,9 +2931,12 @@ export class CommandCenter {
 	private async _branch(repository: Repository, defaultName?: string, from = false, target?: string): Promise<void> {
 		target = target ?? 'HEAD';
 
+		const config = workspace.getConfiguration('git');
+		const showRefDetails = config.get<boolean>('showReferenceDetails') === true;
+
 		if (from) {
 			const getRefPicks = async () => {
-				const refs = await repository.getRefs();
+				const refs = await repository.getRefs({ includeCommitDetails: showRefDetails });
 				const refProcessors = new RefItemsProcessor([
 					new RefProcessor(RefType.Head),
 					new RefProcessor(RefType.RemoteHead),
@@ -3021,6 +3039,9 @@ export class CommandCenter {
 	private async _deleteBranch(repository: Repository, remote: string | undefined, name: string | undefined, options: { remote: boolean; force?: boolean }): Promise<void> {
 		let run: (force?: boolean) => Promise<void>;
 
+		const config = workspace.getConfiguration('git');
+		const showRefDetails = config.get<boolean>('showReferenceDetails') === true;
+
 		if (!options.remote && typeof name === 'string') {
 			// Local branch
 			run = force => repository.deleteBranch(name!, force);
@@ -3030,7 +3051,7 @@ export class CommandCenter {
 		} else {
 			const getBranchPicks = async () => {
 				const pattern = options.remote ? 'refs/remotes' : 'refs/heads';
-				const refs = await repository.getRefs({ pattern });
+				const refs = await repository.getRefs({ pattern, includeCommitDetails: showRefDetails });
 
 				const refsToExclude: string[] = [];
 				if (options.remote) {
@@ -3108,8 +3129,11 @@ export class CommandCenter {
 
 	@command('git.merge', { repository: true })
 	async merge(repository: Repository): Promise<void> {
+		const config = workspace.getConfiguration('git');
+		const showRefDetails = config.get<boolean>('showReferenceDetails') === true;
+
 		const getQuickPickItems = async (): Promise<QuickPickItem[]> => {
-			const refs = await repository.getRefs();
+			const refs = await repository.getRefs({ includeCommitDetails: showRefDetails });
 			const itemsProcessor = new RefItemsProcessor([
 				new RefProcessor(RefType.Head, MergeItem),
 				new RefProcessor(RefType.RemoteHead, MergeItem),
@@ -3134,8 +3158,11 @@ export class CommandCenter {
 
 	@command('git.rebase', { repository: true })
 	async rebase(repository: Repository): Promise<void> {
+		const config = workspace.getConfiguration('git');
+		const showRefDetails = config.get<boolean>('showReferenceDetails') === true;
+
 		const getQuickPickItems = async (): Promise<QuickPickItem[]> => {
-			const refs = await repository.getRefs();
+			const refs = await repository.getRefs({ includeCommitDetails: showRefDetails });
 			const itemsProcessor = new RebaseItemsProcessors(repository);
 
 			return itemsProcessor.processRefs(refs);
@@ -3173,8 +3200,11 @@ export class CommandCenter {
 
 	@command('git.deleteTag', { repository: true })
 	async deleteTag(repository: Repository): Promise<void> {
+		const config = workspace.getConfiguration('git');
+		const showRefDetails = config.get<boolean>('showReferenceDetails') === true;
+
 		const tagPicks = async (): Promise<TagDeleteItem[] | QuickPickItem[]> => {
-			const remoteTags = await repository.getRefs({ pattern: 'refs/tags' });
+			const remoteTags = await repository.getRefs({ pattern: 'refs/tags', includeCommitDetails: showRefDetails });
 			return remoteTags.length === 0 ? [{ label: l10n.t('$(info) This repository has no tags.') }] : remoteTags.map(ref => new TagDeleteItem(ref));
 		};
 
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 09af8d0c3a57..4f64607aa6a1 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -15,7 +15,7 @@ import * as filetype from 'file-type';
 import { assign, groupBy, IDisposable, toDisposable, dispose, mkdirp, readBytes, detectUnicodeEncoding, Encoding, onceEvent, splitInChunks, Limiter, Versions, isWindows, pathEquals, isMacintosh, isDescendant, relativePath } from './util';
 import { CancellationError, CancellationToken, ConfigurationChangeEvent, LogOutputChannel, Progress, Uri, workspace } from 'vscode';
 import { detectEncoding } from './encoding';
-import { Ref, RefType, Branch, Remote, ForcePushMode, GitErrorCodes, LogOptions, Change, Status, CommitOptions, RefQuery, InitOptions } from './api/git';
+import { Commit as ApiCommit, Ref, RefType, Branch, Remote, ForcePushMode, GitErrorCodes, LogOptions, Change, Status, CommitOptions, RefQuery, InitOptions } from './api/git';
 import * as byline from 'byline';
 import { StringDecoder } from 'string_decoder';
 
@@ -1130,6 +1130,70 @@ function parseGitBlame(data: string): BlameInformation[] {
 	return Array.from(blameInformation.values());
 }
 
+const REFS_FORMAT = '%(refname)%00%(objectname)%00%(*objectname)';
+const REFS_WITH_DETAILS_FORMAT = `${REFS_FORMAT}%00%(parent)%00%(*parent)%00%(authorname)%00%(*authorname)%00%(authordate:unix)%00%(*authordate:unix)%00%(subject)%00%(*subject)`;
+
+const headRegex = /^refs\/heads\/([^ ]+)$/;
+const remoteHeadRegex = /^refs\/remotes\/([^/]+)\/([^ ]+)$/;
+const tagRegex = /^refs\/tags\/([^ ]+)$/;
+
+function parseRefs(data: string, includeCommitDetails: boolean): Ref[] {
+	const refs: Ref[] = [];
+	const refRegex = !includeCommitDetails
+		? /^(.*)\0([0-9a-f]{40})\0([0-9a-f]{40})?$/gm
+		: /^(.*)\0([0-9a-f]{40})\0([0-9a-f]{40})?\0(.*)\0(.*)\0(.*)\0(.*)\0(.*)\0(.*)\0(.*)\0(.*)$/gm;
+
+	let ref: string | undefined;
+	let commitHash: string | undefined;
+	let tagCommitHash: string | undefined;
+	let commitParents: string | undefined;
+	let tagCommitParents: string | undefined;
+	let commitSubject: string | undefined;
+	let tagCommitSubject: string | undefined;
+	let authorName: string | undefined;
+	let tagAuthorName: string | undefined;
+	let authorDate: string | undefined;
+	let tagAuthorDate: string | undefined;
+
+	let match: RegExpExecArray | null;
+	let refMatch: RegExpExecArray | null;
+
+	do {
+		match = refRegex.exec(data);
+		if (match === null) {
+			break;
+		}
+
+		let commitDetails: ApiCommit | undefined = undefined;
+		[, ref, commitHash, tagCommitHash, commitParents, tagCommitParents, authorName, tagAuthorName, authorDate, tagAuthorDate, commitSubject, tagCommitSubject] = match;
+
+		if (includeCommitDetails) {
+			const parents = tagCommitParents || commitParents;
+			const subject = tagCommitSubject || commitSubject;
+			const author = tagAuthorName || authorName;
+			const date = tagAuthorDate || authorDate;
+
+			commitDetails = {
+				hash: commitHash,
+				message: subject,
+				parents: parents ? parents.split(' ') : [],
+				authorName: author,
+				authorDate: date ? new Date(Number(date) * 1000) : undefined
+			} satisfies ApiCommit;
+		}
+
+		if (refMatch = headRegex.exec(ref)) {
+			refs.push({ name: refMatch[1], commit: commitHash, commitDetails, type: RefType.Head });
+		} else if (refMatch = remoteHeadRegex.exec(ref)) {
+			refs.push({ name: `${refMatch[1]}/${refMatch[2]}`, remote: refMatch[1], commit: commitHash, commitDetails, type: RefType.RemoteHead });
+		} else if (refMatch = tagRegex.exec(ref)) {
+			refs.push({ name: refMatch[1], commit: tagCommitHash ?? commitHash, commitDetails, type: RefType.Tag });
+		}
+	} while (true);
+
+	return refs;
+}
+
 export interface PullOptions {
 	readonly unshallow?: boolean;
 	readonly tags?: boolean;
@@ -2585,7 +2649,7 @@ export class Repository {
 			args.push('--sort', `-${query.sort}`);
 		}
 
-		args.push('--format', '%(refname) %(objectname) %(*objectname)');
+		args.push('--format', query.includeCommitDetails ? REFS_WITH_DETAILS_FORMAT : REFS_FORMAT);
 
 		if (query.pattern) {
 			const patterns = Array.isArray(query.pattern) ? query.pattern : [query.pattern];
@@ -2599,25 +2663,7 @@ export class Repository {
 		}
 
 		const result = await this.exec(args, { cancellationToken });
-
-		const fn = (line: string): Ref | null => {
-			let match: RegExpExecArray | null;
-
-			if (match = /^refs\/heads\/([^ ]+) ([0-9a-f]{40}) ([0-9a-f]{40})?$/.exec(line)) {
-				return { name: match[1], commit: match[2], type: RefType.Head };
-			} else if (match = /^refs\/remotes\/([^/]+)\/([^ ]+) ([0-9a-f]{40}) ([0-9a-f]{40})?$/.exec(line)) {
-				return { name: `${match[1]}/${match[2]}`, commit: match[3], type: RefType.RemoteHead, remote: match[1] };
-			} else if (match = /^refs\/tags\/([^ ]+) ([0-9a-f]{40}) ([0-9a-f]{40})?$/.exec(line)) {
-				return { name: match[1], commit: match[3] ?? match[2], type: RefType.Tag };
-			}
-
-			return null;
-		};
-
-		return result.stdout.split('\n')
-			.filter(line => !!line)
-			.map(fn)
-			.filter(ref => !!ref) as Ref[];
+		return parseRefs(result.stdout, query.includeCommitDetails === true);
 	}
 
 	async getRemoteRefs(remote: string, opts?: { heads?: boolean; tags?: boolean; cancellationToken?: CancellationToken }): Promise<Ref[]> {

From 5426dde42c3ad8032880a91b3d0b087e22653484 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 14 Mar 2025 10:58:01 -0700
Subject: [PATCH 0941/1815] Update xterm, bring in conpty resize improvements

See xtermjs/xterm.js#5321
Part of #241978
---
 package-lock.json            | 96 ++++++++++++++++++------------------
 package.json                 | 20 ++++----
 remote/package-lock.json     | 96 ++++++++++++++++++------------------
 remote/package.json          | 20 ++++----
 remote/web/package-lock.json | 88 ++++++++++++++++-----------------
 remote/web/package.json      | 18 +++----
 6 files changed, 169 insertions(+), 169 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5563f531f7fe..df98847095d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,16 +27,16 @@
         "@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.81",
-        "@xterm/addon-image": "^0.9.0-beta.98",
-        "@xterm/addon-ligatures": "^0.10.0-beta.98",
-        "@xterm/addon-progress": "^0.2.0-beta.4",
-        "@xterm/addon-search": "^0.16.0-beta.98",
-        "@xterm/addon-serialize": "^0.14.0-beta.98",
-        "@xterm/addon-unicode11": "^0.9.0-beta.98",
-        "@xterm/addon-webgl": "^0.19.0-beta.98",
-        "@xterm/headless": "^5.6.0-beta.98",
-        "@xterm/xterm": "^5.6.0-beta.98",
+        "@xterm/addon-clipboard": "^0.2.0-beta.82",
+        "@xterm/addon-image": "^0.9.0-beta.99",
+        "@xterm/addon-ligatures": "^0.10.0-beta.99",
+        "@xterm/addon-progress": "^0.2.0-beta.5",
+        "@xterm/addon-search": "^0.16.0-beta.99",
+        "@xterm/addon-serialize": "^0.14.0-beta.99",
+        "@xterm/addon-unicode11": "^0.9.0-beta.99",
+        "@xterm/addon-webgl": "^0.19.0-beta.99",
+        "@xterm/headless": "^5.6.0-beta.99",
+        "@xterm/xterm": "^5.6.0-beta.99",
         "http-proxy-agent": "^7.0.0",
         "https-proxy-agent": "^7.0.2",
         "jschardet": "3.1.4",
@@ -3442,30 +3442,30 @@
       }
     },
     "node_modules/@xterm/addon-clipboard": {
-      "version": "0.2.0-beta.81",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.81.tgz",
-      "integrity": "sha512-vDxRyBO9VHzsl+gUQsDlUM9o2ZxSJKzE2eYQtuILKcf5D0EXYI86aMwKT/1iguX41vcMg42WXQBQ0TLWZ2MyTQ==",
+      "version": "0.2.0-beta.82",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.82.tgz",
+      "integrity": "sha512-6PCRV0AHm/+ogeRdz2Txndau3l2Z7X7Buu8v5kpnNB30DKyvMh5p9J35maBPIwKF8XUSBvgywu+AW5x6mVqu9g==",
       "license": "MIT",
       "dependencies": {
         "js-base64": "^3.7.5"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
     "node_modules/@xterm/addon-image": {
-      "version": "0.9.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.98.tgz",
-      "integrity": "sha512-yJaezwUc1Y3QYCmYSpjFW9IzMTLPSqrRCgdPnQ0JbCAVASRVmH6DLRfeikheJCvoXW6VUwMmGkb3fSplTxiV1w==",
+      "version": "0.9.0-beta.99",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.99.tgz",
+      "integrity": "sha512-fU6VsnB3X6RUVo5Y2ZACEnbS/3CSFPhWxkDML6r+fgPz6pV4IwGBFLuyvUPxfyfpYt5+3muh6ChDDwUjxG1Ldg==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
     "node_modules/@xterm/addon-ligatures": {
-      "version": "0.10.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.98.tgz",
-      "integrity": "sha512-1zYeS9OUBR2ThG7dsxsGKOqeSlUo+DNTd5aaV5ZFbKQsQ1w+sQCaL73ZrXp1kuVK7pBiP5NCo4ffcXfzcztztA==",
+      "version": "0.10.0-beta.99",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.99.tgz",
+      "integrity": "sha512-QlhUtBlIC7ZgEykpWxFl5lc2MtIFJD41pT8bQVRD1wGShgUmceNTk4xd3CjiQdVOtTrHcgOTM75YmS5GOlobOA==",
       "license": "MIT",
       "dependencies": {
         "font-finder": "^1.1.0",
@@ -3475,64 +3475,64 @@
         "node": ">8.0.0"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
     "node_modules/@xterm/addon-progress": {
-      "version": "0.2.0-beta.4",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.4.tgz",
-      "integrity": "sha512-7t1nlaANdEjUBVvuTTs5gw6UQgB+unFLwSGGnYXIvdQroYdkXQXSSATSqpYKVCd/6QFhBerzdB2VwPM5L5lxIw==",
+      "version": "0.2.0-beta.5",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.5.tgz",
+      "integrity": "sha512-6dfUtCqK/anFiVilv1KNyVWbEql2hJwINlAXnl5YtIyEwR8F/i+zWBuzUj9152gT3rDASTmgXE5HG6mnyaUI9w==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
     "node_modules/@xterm/addon-search": {
-      "version": "0.16.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.98.tgz",
-      "integrity": "sha512-7gtx7eYvwFLxlb5q2IKxa7jG1KEinVwTlT3ijnSsPawwn7rGi6nR135rGiR8DAjEV0GUO406ICeoYyVbgiFNwQ==",
+      "version": "0.16.0-beta.99",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.99.tgz",
+      "integrity": "sha512-nyqGsZDR/l0Gp4gaS+Brrjm53dpaNAqOUtAC8BXmvuzK21sQgyLsC99MTLNR5yh3dYJAfWAAhG5ke/Re3AaamQ==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
     "node_modules/@xterm/addon-serialize": {
-      "version": "0.14.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.98.tgz",
-      "integrity": "sha512-Tsr8j3wnun2raYR1DgsNClQP/I5a85u/uW/5EiYH+/iPPua6EWJvPlr5Q6TCU/cdIKW1o27Z3L5/mw0pfMUXrQ==",
+      "version": "0.14.0-beta.99",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.99.tgz",
+      "integrity": "sha512-7ULW4BUUGL1Bv8vGBNylaBTpKFDm7rjMdkOwJt+LVd/oJkyL8RFSGgQSuYb+5DyiEhBSpeahg3bi8bStxufvMQ==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
     "node_modules/@xterm/addon-unicode11": {
-      "version": "0.9.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.98.tgz",
-      "integrity": "sha512-3GjjEYAPWAEGE1CaTFDjQxKcY5NiHHPmeufTsRp3IL5850ZiaMMq9bIL2WSdoFIbVgfbxh5mRy2cJPdu9m0uRQ==",
+      "version": "0.9.0-beta.99",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.99.tgz",
+      "integrity": "sha512-4epGzbOc7X+NyPIMPxnQxaUlZYhCRTEPRsvfuIx55+Yyzip/zGX5ahy/Z22YrGTVv7qjxhVsu1tCbCgiF9HtTA==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
     "node_modules/@xterm/addon-webgl": {
-      "version": "0.19.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.98.tgz",
-      "integrity": "sha512-09FbNHgN2ad/8JI+AEyg8C3msyk04ET1FihQIpTeWPfd2LJIAdps7G4St2+qzZbhlFkR6m9Dgrgh/AC2uegh8A==",
+      "version": "0.19.0-beta.99",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.99.tgz",
+      "integrity": "sha512-t4vTtwDLYWgzcH86s3hlCGaZWJWzTXLXUcgw/2l+Fkq9LFy4cLuQgWTVjOWLB0KOJ0FmT+g0sBWLApUw9bYa2w==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
     "node_modules/@xterm/headless": {
-      "version": "5.6.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.6.0-beta.98.tgz",
-      "integrity": "sha512-nRl5NyNHajvxNy1N/h0+vEO9tgBgYU8kN/SApBzezGYjcKhs81MYVr5uO1uMKb2eq5eTXBW8BtcyD3KqGoqkEA==",
+      "version": "5.6.0-beta.99",
+      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.6.0-beta.99.tgz",
+      "integrity": "sha512-E+TR7Cgdb9tHGYw96cexH9l5ghsQEFfw4LaXKxmdlogs43qk2HPwwI7fR/i7t7Ci9ScBXf2gMP76NPpfeX1hZQ==",
       "license": "MIT"
     },
     "node_modules/@xterm/xterm": {
-      "version": "5.6.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.98.tgz",
-      "integrity": "sha512-fJexj3XKDAMGsR8KKaiEhGrtJD1eRANbT3094E3KSgvbHRa3524tSFvDCx5+5KRE/hYaECmi0knAUIWJCvSPTg==",
+      "version": "5.6.0-beta.99",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.99.tgz",
+      "integrity": "sha512-TwBXSyio63Sr2+eJ24BtrPiwTA8JpRbdzhNBYzCXs32yWX30X47UAcdgkahjkyt4JHSqhu7614/w5FOzHsNc/g==",
       "license": "MIT"
     },
     "node_modules/@xtuc/ieee754": {
diff --git a/package.json b/package.json
index 5f0138ef2a2f..c5492c902e83 100644
--- a/package.json
+++ b/package.json
@@ -86,16 +86,16 @@
     "@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.81",
-    "@xterm/addon-image": "^0.9.0-beta.98",
-    "@xterm/addon-ligatures": "^0.10.0-beta.98",
-    "@xterm/addon-progress": "^0.2.0-beta.4",
-    "@xterm/addon-search": "^0.16.0-beta.98",
-    "@xterm/addon-serialize": "^0.14.0-beta.98",
-    "@xterm/addon-unicode11": "^0.9.0-beta.98",
-    "@xterm/addon-webgl": "^0.19.0-beta.98",
-    "@xterm/headless": "^5.6.0-beta.98",
-    "@xterm/xterm": "^5.6.0-beta.98",
+    "@xterm/addon-clipboard": "^0.2.0-beta.82",
+    "@xterm/addon-image": "^0.9.0-beta.99",
+    "@xterm/addon-ligatures": "^0.10.0-beta.99",
+    "@xterm/addon-progress": "^0.2.0-beta.5",
+    "@xterm/addon-search": "^0.16.0-beta.99",
+    "@xterm/addon-serialize": "^0.14.0-beta.99",
+    "@xterm/addon-unicode11": "^0.9.0-beta.99",
+    "@xterm/addon-webgl": "^0.19.0-beta.99",
+    "@xterm/headless": "^5.6.0-beta.99",
+    "@xterm/xterm": "^5.6.0-beta.99",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
     "jschardet": "3.1.4",
diff --git a/remote/package-lock.json b/remote/package-lock.json
index 6ccde5843bd3..e700567c7791 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -20,16 +20,16 @@
         "@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.81",
-        "@xterm/addon-image": "^0.9.0-beta.98",
-        "@xterm/addon-ligatures": "^0.10.0-beta.98",
-        "@xterm/addon-progress": "^0.2.0-beta.4",
-        "@xterm/addon-search": "^0.16.0-beta.98",
-        "@xterm/addon-serialize": "^0.14.0-beta.98",
-        "@xterm/addon-unicode11": "^0.9.0-beta.98",
-        "@xterm/addon-webgl": "^0.19.0-beta.98",
-        "@xterm/headless": "^5.6.0-beta.98",
-        "@xterm/xterm": "^5.6.0-beta.98",
+        "@xterm/addon-clipboard": "^0.2.0-beta.82",
+        "@xterm/addon-image": "^0.9.0-beta.99",
+        "@xterm/addon-ligatures": "^0.10.0-beta.99",
+        "@xterm/addon-progress": "^0.2.0-beta.5",
+        "@xterm/addon-search": "^0.16.0-beta.99",
+        "@xterm/addon-serialize": "^0.14.0-beta.99",
+        "@xterm/addon-unicode11": "^0.9.0-beta.99",
+        "@xterm/addon-webgl": "^0.19.0-beta.99",
+        "@xterm/headless": "^5.6.0-beta.99",
+        "@xterm/xterm": "^5.6.0-beta.99",
         "cookie": "^0.7.0",
         "http-proxy-agent": "^7.0.0",
         "https-proxy-agent": "^7.0.2",
@@ -523,30 +523,30 @@
       "hasInstallScript": true
     },
     "node_modules/@xterm/addon-clipboard": {
-      "version": "0.2.0-beta.81",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.81.tgz",
-      "integrity": "sha512-vDxRyBO9VHzsl+gUQsDlUM9o2ZxSJKzE2eYQtuILKcf5D0EXYI86aMwKT/1iguX41vcMg42WXQBQ0TLWZ2MyTQ==",
+      "version": "0.2.0-beta.82",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.82.tgz",
+      "integrity": "sha512-6PCRV0AHm/+ogeRdz2Txndau3l2Z7X7Buu8v5kpnNB30DKyvMh5p9J35maBPIwKF8XUSBvgywu+AW5x6mVqu9g==",
       "license": "MIT",
       "dependencies": {
         "js-base64": "^3.7.5"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
     "node_modules/@xterm/addon-image": {
-      "version": "0.9.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.98.tgz",
-      "integrity": "sha512-yJaezwUc1Y3QYCmYSpjFW9IzMTLPSqrRCgdPnQ0JbCAVASRVmH6DLRfeikheJCvoXW6VUwMmGkb3fSplTxiV1w==",
+      "version": "0.9.0-beta.99",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.99.tgz",
+      "integrity": "sha512-fU6VsnB3X6RUVo5Y2ZACEnbS/3CSFPhWxkDML6r+fgPz6pV4IwGBFLuyvUPxfyfpYt5+3muh6ChDDwUjxG1Ldg==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
     "node_modules/@xterm/addon-ligatures": {
-      "version": "0.10.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.98.tgz",
-      "integrity": "sha512-1zYeS9OUBR2ThG7dsxsGKOqeSlUo+DNTd5aaV5ZFbKQsQ1w+sQCaL73ZrXp1kuVK7pBiP5NCo4ffcXfzcztztA==",
+      "version": "0.10.0-beta.99",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.99.tgz",
+      "integrity": "sha512-QlhUtBlIC7ZgEykpWxFl5lc2MtIFJD41pT8bQVRD1wGShgUmceNTk4xd3CjiQdVOtTrHcgOTM75YmS5GOlobOA==",
       "license": "MIT",
       "dependencies": {
         "font-finder": "^1.1.0",
@@ -556,64 +556,64 @@
         "node": ">8.0.0"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
     "node_modules/@xterm/addon-progress": {
-      "version": "0.2.0-beta.4",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.4.tgz",
-      "integrity": "sha512-7t1nlaANdEjUBVvuTTs5gw6UQgB+unFLwSGGnYXIvdQroYdkXQXSSATSqpYKVCd/6QFhBerzdB2VwPM5L5lxIw==",
+      "version": "0.2.0-beta.5",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.5.tgz",
+      "integrity": "sha512-6dfUtCqK/anFiVilv1KNyVWbEql2hJwINlAXnl5YtIyEwR8F/i+zWBuzUj9152gT3rDASTmgXE5HG6mnyaUI9w==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
     "node_modules/@xterm/addon-search": {
-      "version": "0.16.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.98.tgz",
-      "integrity": "sha512-7gtx7eYvwFLxlb5q2IKxa7jG1KEinVwTlT3ijnSsPawwn7rGi6nR135rGiR8DAjEV0GUO406ICeoYyVbgiFNwQ==",
+      "version": "0.16.0-beta.99",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.99.tgz",
+      "integrity": "sha512-nyqGsZDR/l0Gp4gaS+Brrjm53dpaNAqOUtAC8BXmvuzK21sQgyLsC99MTLNR5yh3dYJAfWAAhG5ke/Re3AaamQ==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
     "node_modules/@xterm/addon-serialize": {
-      "version": "0.14.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.98.tgz",
-      "integrity": "sha512-Tsr8j3wnun2raYR1DgsNClQP/I5a85u/uW/5EiYH+/iPPua6EWJvPlr5Q6TCU/cdIKW1o27Z3L5/mw0pfMUXrQ==",
+      "version": "0.14.0-beta.99",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.99.tgz",
+      "integrity": "sha512-7ULW4BUUGL1Bv8vGBNylaBTpKFDm7rjMdkOwJt+LVd/oJkyL8RFSGgQSuYb+5DyiEhBSpeahg3bi8bStxufvMQ==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
     "node_modules/@xterm/addon-unicode11": {
-      "version": "0.9.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.98.tgz",
-      "integrity": "sha512-3GjjEYAPWAEGE1CaTFDjQxKcY5NiHHPmeufTsRp3IL5850ZiaMMq9bIL2WSdoFIbVgfbxh5mRy2cJPdu9m0uRQ==",
+      "version": "0.9.0-beta.99",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.99.tgz",
+      "integrity": "sha512-4epGzbOc7X+NyPIMPxnQxaUlZYhCRTEPRsvfuIx55+Yyzip/zGX5ahy/Z22YrGTVv7qjxhVsu1tCbCgiF9HtTA==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
     "node_modules/@xterm/addon-webgl": {
-      "version": "0.19.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.98.tgz",
-      "integrity": "sha512-09FbNHgN2ad/8JI+AEyg8C3msyk04ET1FihQIpTeWPfd2LJIAdps7G4St2+qzZbhlFkR6m9Dgrgh/AC2uegh8A==",
+      "version": "0.19.0-beta.99",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.99.tgz",
+      "integrity": "sha512-t4vTtwDLYWgzcH86s3hlCGaZWJWzTXLXUcgw/2l+Fkq9LFy4cLuQgWTVjOWLB0KOJ0FmT+g0sBWLApUw9bYa2w==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
     "node_modules/@xterm/headless": {
-      "version": "5.6.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.6.0-beta.98.tgz",
-      "integrity": "sha512-nRl5NyNHajvxNy1N/h0+vEO9tgBgYU8kN/SApBzezGYjcKhs81MYVr5uO1uMKb2eq5eTXBW8BtcyD3KqGoqkEA==",
+      "version": "5.6.0-beta.99",
+      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.6.0-beta.99.tgz",
+      "integrity": "sha512-E+TR7Cgdb9tHGYw96cexH9l5ghsQEFfw4LaXKxmdlogs43qk2HPwwI7fR/i7t7Ci9ScBXf2gMP76NPpfeX1hZQ==",
       "license": "MIT"
     },
     "node_modules/@xterm/xterm": {
-      "version": "5.6.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.98.tgz",
-      "integrity": "sha512-fJexj3XKDAMGsR8KKaiEhGrtJD1eRANbT3094E3KSgvbHRa3524tSFvDCx5+5KRE/hYaECmi0knAUIWJCvSPTg==",
+      "version": "5.6.0-beta.99",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.99.tgz",
+      "integrity": "sha512-TwBXSyio63Sr2+eJ24BtrPiwTA8JpRbdzhNBYzCXs32yWX30X47UAcdgkahjkyt4JHSqhu7614/w5FOzHsNc/g==",
       "license": "MIT"
     },
     "node_modules/agent-base": {
diff --git a/remote/package.json b/remote/package.json
index 47fe4472cc76..1cdd6ec37af2 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -15,16 +15,16 @@
     "@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.81",
-    "@xterm/addon-image": "^0.9.0-beta.98",
-    "@xterm/addon-ligatures": "^0.10.0-beta.98",
-    "@xterm/addon-progress": "^0.2.0-beta.4",
-    "@xterm/addon-search": "^0.16.0-beta.98",
-    "@xterm/addon-serialize": "^0.14.0-beta.98",
-    "@xterm/addon-unicode11": "^0.9.0-beta.98",
-    "@xterm/addon-webgl": "^0.19.0-beta.98",
-    "@xterm/headless": "^5.6.0-beta.98",
-    "@xterm/xterm": "^5.6.0-beta.98",
+    "@xterm/addon-clipboard": "^0.2.0-beta.82",
+    "@xterm/addon-image": "^0.9.0-beta.99",
+    "@xterm/addon-ligatures": "^0.10.0-beta.99",
+    "@xterm/addon-progress": "^0.2.0-beta.5",
+    "@xterm/addon-search": "^0.16.0-beta.99",
+    "@xterm/addon-serialize": "^0.14.0-beta.99",
+    "@xterm/addon-unicode11": "^0.9.0-beta.99",
+    "@xterm/addon-webgl": "^0.19.0-beta.99",
+    "@xterm/headless": "^5.6.0-beta.99",
+    "@xterm/xterm": "^5.6.0-beta.99",
     "cookie": "^0.7.0",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index e13c2c65e521..235d2d3ba460 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -13,15 +13,15 @@
 				"@vscode/iconv-lite-umd": "0.7.0",
 				"@vscode/tree-sitter-wasm": "^0.1.3",
 				"@vscode/vscode-languagedetection": "1.0.21",
-				"@xterm/addon-clipboard": "^0.2.0-beta.81",
-				"@xterm/addon-image": "^0.9.0-beta.98",
-				"@xterm/addon-ligatures": "^0.10.0-beta.98",
-				"@xterm/addon-progress": "^0.2.0-beta.4",
-				"@xterm/addon-search": "^0.16.0-beta.98",
-				"@xterm/addon-serialize": "^0.14.0-beta.98",
-				"@xterm/addon-unicode11": "^0.9.0-beta.98",
-				"@xterm/addon-webgl": "^0.19.0-beta.98",
-				"@xterm/xterm": "^5.6.0-beta.98",
+				"@xterm/addon-clipboard": "^0.2.0-beta.82",
+				"@xterm/addon-image": "^0.9.0-beta.99",
+				"@xterm/addon-ligatures": "^0.10.0-beta.99",
+				"@xterm/addon-progress": "^0.2.0-beta.5",
+				"@xterm/addon-search": "^0.16.0-beta.99",
+				"@xterm/addon-serialize": "^0.14.0-beta.99",
+				"@xterm/addon-unicode11": "^0.9.0-beta.99",
+				"@xterm/addon-webgl": "^0.19.0-beta.99",
+				"@xterm/xterm": "^5.6.0-beta.99",
 				"jschardet": "3.1.4",
 				"tas-client-umd": "0.2.0",
 				"vscode-oniguruma": "1.7.0",
@@ -90,30 +90,30 @@
 			}
 		},
 		"node_modules/@xterm/addon-clipboard": {
-			"version": "0.2.0-beta.81",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.81.tgz",
-			"integrity": "sha512-vDxRyBO9VHzsl+gUQsDlUM9o2ZxSJKzE2eYQtuILKcf5D0EXYI86aMwKT/1iguX41vcMg42WXQBQ0TLWZ2MyTQ==",
+			"version": "0.2.0-beta.82",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.82.tgz",
+			"integrity": "sha512-6PCRV0AHm/+ogeRdz2Txndau3l2Z7X7Buu8v5kpnNB30DKyvMh5p9J35maBPIwKF8XUSBvgywu+AW5x6mVqu9g==",
 			"license": "MIT",
 			"dependencies": {
 				"js-base64": "^3.7.5"
 			},
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.98"
+				"@xterm/xterm": "^5.6.0-beta.99"
 			}
 		},
 		"node_modules/@xterm/addon-image": {
-			"version": "0.9.0-beta.98",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.98.tgz",
-			"integrity": "sha512-yJaezwUc1Y3QYCmYSpjFW9IzMTLPSqrRCgdPnQ0JbCAVASRVmH6DLRfeikheJCvoXW6VUwMmGkb3fSplTxiV1w==",
+			"version": "0.9.0-beta.99",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.99.tgz",
+			"integrity": "sha512-fU6VsnB3X6RUVo5Y2ZACEnbS/3CSFPhWxkDML6r+fgPz6pV4IwGBFLuyvUPxfyfpYt5+3muh6ChDDwUjxG1Ldg==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.98"
+				"@xterm/xterm": "^5.6.0-beta.99"
 			}
 		},
 		"node_modules/@xterm/addon-ligatures": {
-			"version": "0.10.0-beta.98",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.98.tgz",
-			"integrity": "sha512-1zYeS9OUBR2ThG7dsxsGKOqeSlUo+DNTd5aaV5ZFbKQsQ1w+sQCaL73ZrXp1kuVK7pBiP5NCo4ffcXfzcztztA==",
+			"version": "0.10.0-beta.99",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.99.tgz",
+			"integrity": "sha512-QlhUtBlIC7ZgEykpWxFl5lc2MtIFJD41pT8bQVRD1wGShgUmceNTk4xd3CjiQdVOtTrHcgOTM75YmS5GOlobOA==",
 			"license": "MIT",
 			"dependencies": {
 				"font-finder": "^1.1.0",
@@ -123,58 +123,58 @@
 				"node": ">8.0.0"
 			},
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.98"
+				"@xterm/xterm": "^5.6.0-beta.99"
 			}
 		},
 		"node_modules/@xterm/addon-progress": {
-			"version": "0.2.0-beta.4",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.4.tgz",
-			"integrity": "sha512-7t1nlaANdEjUBVvuTTs5gw6UQgB+unFLwSGGnYXIvdQroYdkXQXSSATSqpYKVCd/6QFhBerzdB2VwPM5L5lxIw==",
+			"version": "0.2.0-beta.5",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.5.tgz",
+			"integrity": "sha512-6dfUtCqK/anFiVilv1KNyVWbEql2hJwINlAXnl5YtIyEwR8F/i+zWBuzUj9152gT3rDASTmgXE5HG6mnyaUI9w==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.98"
+				"@xterm/xterm": "^5.6.0-beta.99"
 			}
 		},
 		"node_modules/@xterm/addon-search": {
-			"version": "0.16.0-beta.98",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.98.tgz",
-			"integrity": "sha512-7gtx7eYvwFLxlb5q2IKxa7jG1KEinVwTlT3ijnSsPawwn7rGi6nR135rGiR8DAjEV0GUO406ICeoYyVbgiFNwQ==",
+			"version": "0.16.0-beta.99",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.99.tgz",
+			"integrity": "sha512-nyqGsZDR/l0Gp4gaS+Brrjm53dpaNAqOUtAC8BXmvuzK21sQgyLsC99MTLNR5yh3dYJAfWAAhG5ke/Re3AaamQ==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.98"
+				"@xterm/xterm": "^5.6.0-beta.99"
 			}
 		},
 		"node_modules/@xterm/addon-serialize": {
-			"version": "0.14.0-beta.98",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.98.tgz",
-			"integrity": "sha512-Tsr8j3wnun2raYR1DgsNClQP/I5a85u/uW/5EiYH+/iPPua6EWJvPlr5Q6TCU/cdIKW1o27Z3L5/mw0pfMUXrQ==",
+			"version": "0.14.0-beta.99",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.99.tgz",
+			"integrity": "sha512-7ULW4BUUGL1Bv8vGBNylaBTpKFDm7rjMdkOwJt+LVd/oJkyL8RFSGgQSuYb+5DyiEhBSpeahg3bi8bStxufvMQ==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.98"
+				"@xterm/xterm": "^5.6.0-beta.99"
 			}
 		},
 		"node_modules/@xterm/addon-unicode11": {
-			"version": "0.9.0-beta.98",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.98.tgz",
-			"integrity": "sha512-3GjjEYAPWAEGE1CaTFDjQxKcY5NiHHPmeufTsRp3IL5850ZiaMMq9bIL2WSdoFIbVgfbxh5mRy2cJPdu9m0uRQ==",
+			"version": "0.9.0-beta.99",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.99.tgz",
+			"integrity": "sha512-4epGzbOc7X+NyPIMPxnQxaUlZYhCRTEPRsvfuIx55+Yyzip/zGX5ahy/Z22YrGTVv7qjxhVsu1tCbCgiF9HtTA==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.98"
+				"@xterm/xterm": "^5.6.0-beta.99"
 			}
 		},
 		"node_modules/@xterm/addon-webgl": {
-			"version": "0.19.0-beta.98",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.98.tgz",
-			"integrity": "sha512-09FbNHgN2ad/8JI+AEyg8C3msyk04ET1FihQIpTeWPfd2LJIAdps7G4St2+qzZbhlFkR6m9Dgrgh/AC2uegh8A==",
+			"version": "0.19.0-beta.99",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.99.tgz",
+			"integrity": "sha512-t4vTtwDLYWgzcH86s3hlCGaZWJWzTXLXUcgw/2l+Fkq9LFy4cLuQgWTVjOWLB0KOJ0FmT+g0sBWLApUw9bYa2w==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.98"
+				"@xterm/xterm": "^5.6.0-beta.99"
 			}
 		},
 		"node_modules/@xterm/xterm": {
-			"version": "5.6.0-beta.98",
-			"resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.98.tgz",
-			"integrity": "sha512-fJexj3XKDAMGsR8KKaiEhGrtJD1eRANbT3094E3KSgvbHRa3524tSFvDCx5+5KRE/hYaECmi0knAUIWJCvSPTg==",
+			"version": "5.6.0-beta.99",
+			"resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.99.tgz",
+			"integrity": "sha512-TwBXSyio63Sr2+eJ24BtrPiwTA8JpRbdzhNBYzCXs32yWX30X47UAcdgkahjkyt4JHSqhu7614/w5FOzHsNc/g==",
 			"license": "MIT"
 		},
 		"node_modules/font-finder": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 78336aa2fa45..c54922cdb2e9 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -8,15 +8,15 @@
 		"@vscode/iconv-lite-umd": "0.7.0",
 		"@vscode/tree-sitter-wasm": "^0.1.3",
 		"@vscode/vscode-languagedetection": "1.0.21",
-		"@xterm/addon-clipboard": "^0.2.0-beta.81",
-		"@xterm/addon-image": "^0.9.0-beta.98",
-		"@xterm/addon-ligatures": "^0.10.0-beta.98",
-		"@xterm/addon-progress": "^0.2.0-beta.4",
-		"@xterm/addon-search": "^0.16.0-beta.98",
-		"@xterm/addon-serialize": "^0.14.0-beta.98",
-		"@xterm/addon-unicode11": "^0.9.0-beta.98",
-		"@xterm/addon-webgl": "^0.19.0-beta.98",
-		"@xterm/xterm": "^5.6.0-beta.98",
+		"@xterm/addon-clipboard": "^0.2.0-beta.82",
+		"@xterm/addon-image": "^0.9.0-beta.99",
+		"@xterm/addon-ligatures": "^0.10.0-beta.99",
+		"@xterm/addon-progress": "^0.2.0-beta.5",
+		"@xterm/addon-search": "^0.16.0-beta.99",
+		"@xterm/addon-serialize": "^0.14.0-beta.99",
+		"@xterm/addon-unicode11": "^0.9.0-beta.99",
+		"@xterm/addon-webgl": "^0.19.0-beta.99",
+		"@xterm/xterm": "^5.6.0-beta.99",
 		"jschardet": "3.1.4",
 		"tas-client-umd": "0.2.0",
 		"vscode-oniguruma": "1.7.0",

From 4f828d3fff3bc760c070b6adac59162e7f35f526 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 14 Mar 2025 14:42:32 +0100
Subject: [PATCH 0942/1815] inline completions refactoring

---
 .../browser/model/changeRecorder.ts           |   2 +-
 .../browser/model/inlineCompletionsSource.ts  | 205 +++++++-----------
 .../browser/model/provideInlineCompletions.ts |  20 --
 .../browser/structuredLogger.ts               |  57 +++++
 4 files changed, 133 insertions(+), 151 deletions(-)
 create mode 100644 src/vs/editor/contrib/inlineCompletions/browser/structuredLogger.ts

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/changeRecorder.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/changeRecorder.ts
index 2e91840d292b..91d80882aaf5 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/changeRecorder.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/changeRecorder.ts
@@ -8,7 +8,7 @@ import { autorunWithStore } from '../../../../../base/common/observable.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ICodeEditor } from '../../../../browser/editorBrowser.js';
 import { CodeEditorWidget } from '../../../../browser/widget/codeEditor/codeEditorWidget.js';
-import { IRecordableEditorLogEntry, StructuredLogger } from './inlineCompletionsSource.js';
+import { IRecordableEditorLogEntry, StructuredLogger } from '../structuredLogger.js';
 
 export class TextModelChangeRecorder extends Disposable {
 	private readonly _structuredLogger = this._register(this._instantiationService.createInstance(StructuredLogger.cast<IRecordableEditorLogEntry & { source: string }>(),
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
index da14a0b836b0..80306f351a8a 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
@@ -10,11 +10,9 @@ import { equalsIfDefined, itemEquals } from '../../../../../base/common/equals.j
 import { BugIndicatingError } from '../../../../../base/common/errors.js';
 import { matchesSubString } from '../../../../../base/common/filters.js';
 import { Disposable, IDisposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
-import { IObservable, IObservableWithChange, IReader, ITransaction, derived, derivedHandleChanges, disposableObservableValue, observableFromEvent, observableValue, transaction } from '../../../../../base/common/observable.js';
+import { IObservable, IObservableWithChange, IReader, ITransaction, derived, derivedHandleChanges, disposableObservableValue, observableValue, transaction } from '../../../../../base/common/observable.js';
 import { commonPrefixLength, commonSuffixLength, splitLines } from '../../../../../base/common/strings.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 { ILogService } from '../../../../../platform/log/common/log.js';
 import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
@@ -34,6 +32,7 @@ import { ILanguageFeaturesService } from '../../../../common/services/languageFe
 import { IModelContentChangedEvent } from '../../../../common/textModelEvents.js';
 import { InlineCompletionItem, InlineCompletionProviderResult, provideInlineCompletions } from './provideInlineCompletions.js';
 import { singleTextRemoveCommonPrefix } from './singleTextEditHelpers.js';
+import { StructuredLogger, IRecordableEditorLogEntry, IRecordableLogEntry, formatRecordableLogEntry } from '../structuredLogger.js';
 
 export class InlineCompletionsSource extends Disposable {
 	private static _requestId = 0;
@@ -318,21 +317,8 @@ export class InlineCompletionWithUpdatedRange extends Disposable {
 		return this.source.inlineCompletions.enableForwardStability ?? false;
 	}
 
-	private _updatedEdit: UpdatedEdit; // helper as derivedHandleChanges can not access previous value
-
-	public get updatedEdit(): IObservable<OffsetEdit | undefined> { return this._updatedEdit.offsetEdit; }
-
-	private readonly _updatedRange = derived(reader => {
-		const edit = this.updatedEdit.read(reader);
-		if (!edit || edit.edits.length === 0) {
-			return undefined;
-		}
-
-		return Range.fromPositions(
-			this._textModel.getPositionAt(edit.edits[0].replaceRange.start),
-			this._textModel.getPositionAt(edit.edits[edit.edits.length - 1].replaceRange.endExclusive)
-		);
-	});
+	private readonly _updatedEditObj: UpdatedEdit; // helper as derivedHandleChanges can not access previous value
+	public get updatedEdit(): IObservable<OffsetEdit | undefined> { return this._updatedEditObj.offsetEdit; }
 
 	public get source() { return this.inlineCompletion.source; }
 	public get sourceInlineCompletion() { return this.inlineCompletion.sourceInlineCompletion; }
@@ -347,65 +333,7 @@ export class InlineCompletionWithUpdatedRange extends Disposable {
 	) {
 		super();
 
-		this._updatedEdit = this._register(this._toUpdatedEdit(updatedRange ?? this.inlineCompletion.range, this.inlineCompletion.insertText));
-	}
-
-	private _toInlineCompletionEdit(editRange: Range, replaceText: string): UpdatedEdit {
-		const startOffset = this._textModel.getOffsetAt(editRange.getStartPosition());
-		const endOffset = this._textModel.getOffsetAt(editRange.getEndPosition());
-		const originalRange = OffsetRange.ofStartAndLength(startOffset, endOffset - startOffset);
-
-		const offsetEdit = new OffsetEdit([new SingleOffsetEdit(originalRange, replaceText)]);
-
-		return new UpdatedEdit(offsetEdit, this._textModel, this._modelVersion, false);
-	}
-
-	private _toUpdatedEdit(editRange: Range, replaceText: string): UpdatedEdit {
-		if (!this.isInlineEdit) {
-			return this._toInlineCompletionEdit(editRange, replaceText);
-		}
-
-		const eol = this._textModel.getEOL();
-		const editOriginalText = this._textModel.getValueInRange(editRange);
-		const editReplaceText = replaceText.replace(/\r\n|\r|\n/g, eol);
-
-		const diffAlgorithm = linesDiffComputers.getDefault();
-		const lineDiffs = diffAlgorithm.computeDiff(
-			splitLines(editOriginalText),
-			splitLines(editReplaceText),
-			{
-				ignoreTrimWhitespace: false,
-				computeMoves: false,
-				extendToSubwords: true,
-				maxComputationTimeMs: 500,
-			}
-		);
-
-		const innerChanges = lineDiffs.changes.flatMap(c => c.innerChanges ?? []);
-
-		function addRangeToPos(pos: Position, range: Range): Range {
-			const start = TextLength.fromPosition(range.getStartPosition());
-			return TextLength.ofRange(range).createRange(start.addToPosition(pos));
-		}
-
-		const modifiedText = new StringText(editReplaceText);
-
-		const offsetEdit = new OffsetEdit(
-			innerChanges.map(c => {
-				const range = addRangeToPos(editRange.getStartPosition(), c.originalRange);
-				const startOffset = this._textModel.getOffsetAt(range.getStartPosition());
-				const endOffset = this._textModel.getOffsetAt(range.getEndPosition());
-				const originalRange = OffsetRange.ofStartAndLength(startOffset, endOffset - startOffset);
-
-				const replaceText = modifiedText.getValueOfRange(c.modifiedRange);
-				const originalText = this._textModel.getValueInRange(range);
-				const edit = new SingleOffsetEdit(originalRange, replaceText);
-
-				return reshapeEdit(edit, originalText, innerChanges.length, this._textModel);
-			})
-		);
-
-		return new UpdatedEdit(offsetEdit, this._textModel, this._modelVersion, true);
+		this._updatedEditObj = this._register(this._toUpdatedEdit(updatedRange ?? this.inlineCompletion.range, this.inlineCompletion.insertText));
 	}
 
 	public toInlineCompletion(reader: IReader | undefined): InlineCompletionItem {
@@ -438,7 +366,7 @@ export class InlineCompletionWithUpdatedRange extends Disposable {
 	}
 
 	public isVisible(model: ITextModel, cursorPosition: Position, reader: IReader | undefined): boolean {
-		const minimizedReplacement = singleTextRemoveCommonPrefix(this._toFilterTextReplacement(reader), model);
+		const minimizedReplacement = singleTextRemoveCommonPrefix(this.toSingleTextEdit(reader), model);
 		const updatedRange = this._updatedRange.read(reader);
 		if (
 			!updatedRange
@@ -484,7 +412,7 @@ export class InlineCompletionWithUpdatedRange extends Disposable {
 		}
 
 		if (this.sourceInlineCompletion.isInlineEdit) {
-			return this._updatedEdit.lastChangePartOfInlineEdit;
+			return this._updatedEditObj.lastChangePartOfInlineEdit;
 		}
 
 		const updatedRange = this._updatedRange.read(undefined);
@@ -495,9 +423,74 @@ export class InlineCompletionWithUpdatedRange extends Disposable {
 		return result;
 	}
 
-	private _toFilterTextReplacement(reader: IReader | undefined): SingleTextEdit {
-		const inlineCompletion = this.toInlineCompletion(reader);
-		return new SingleTextEdit(inlineCompletion.range, inlineCompletion.filterText);
+	private readonly _updatedRange = derived(reader => {
+		const edit = this.updatedEdit.read(reader);
+		if (!edit || edit.edits.length === 0) {
+			return undefined;
+		}
+
+		return Range.fromPositions(
+			this._textModel.getPositionAt(edit.edits[0].replaceRange.start),
+			this._textModel.getPositionAt(edit.edits[edit.edits.length - 1].replaceRange.endExclusive)
+		);
+	});
+
+	private _toUpdatedEdit(editRange: Range, replaceText: string): UpdatedEdit {
+		return this.isInlineEdit
+			? this._toInlineEditEdit(editRange, replaceText)
+			: this._toInlineCompletionEdit(editRange, replaceText);
+	}
+
+	private _toInlineCompletionEdit(editRange: Range, replaceText: string): UpdatedEdit {
+		const startOffset = this._textModel.getOffsetAt(editRange.getStartPosition());
+		const endOffset = this._textModel.getOffsetAt(editRange.getEndPosition());
+		const originalRange = OffsetRange.ofStartAndLength(startOffset, endOffset - startOffset);
+		const offsetEdit = new OffsetEdit([new SingleOffsetEdit(originalRange, replaceText)]);
+		return new UpdatedEdit(offsetEdit, this._textModel, this._modelVersion, false);
+	}
+
+	private _toInlineEditEdit(editRange: Range, replaceText: string): UpdatedEdit {
+		const eol = this._textModel.getEOL();
+		const editOriginalText = this._textModel.getValueInRange(editRange);
+		const editReplaceText = replaceText.replace(/\r\n|\r|\n/g, eol);
+
+		const diffAlgorithm = linesDiffComputers.getDefault();
+		const lineDiffs = diffAlgorithm.computeDiff(
+			splitLines(editOriginalText),
+			splitLines(editReplaceText),
+			{
+				ignoreTrimWhitespace: false,
+				computeMoves: false,
+				extendToSubwords: true,
+				maxComputationTimeMs: 500,
+			}
+		);
+
+		const innerChanges = lineDiffs.changes.flatMap(c => c.innerChanges ?? []);
+
+		function addRangeToPos(pos: Position, range: Range): Range {
+			const start = TextLength.fromPosition(range.getStartPosition());
+			return TextLength.ofRange(range).createRange(start.addToPosition(pos));
+		}
+
+		const modifiedText = new StringText(editReplaceText);
+
+		const offsetEdit = new OffsetEdit(
+			innerChanges.map(c => {
+				const range = addRangeToPos(editRange.getStartPosition(), c.originalRange);
+				const startOffset = this._textModel.getOffsetAt(range.getStartPosition());
+				const endOffset = this._textModel.getOffsetAt(range.getEndPosition());
+				const originalRange = OffsetRange.ofStartAndLength(startOffset, endOffset - startOffset);
+
+				const replaceText = modifiedText.getValueOfRange(c.modifiedRange);
+				const originalText = this._textModel.getValueInRange(range);
+				const edit = new SingleOffsetEdit(originalRange, replaceText);
+
+				return reshapeEdit(edit, originalText, innerChanges.length, this._textModel);
+			})
+		);
+
+		return new UpdatedEdit(offsetEdit, this._textModel, this._modelVersion, true);
 	}
 }
 
@@ -734,54 +727,6 @@ class SingleUpdatedNextEdit extends SingleUpdatedEdit {
 
 const emptyRange = new Range(1, 1, 1, 1);
 
-interface IRecordableLogEntry {
-	sourceId: string;
-	time: number;
-}
-
-export interface IRecordableEditorLogEntry extends IRecordableLogEntry {
-	modelUri: string;
-	modelVersion: number;
-}
-
-/**
- * The sourceLabel must not contain '@'!
-*/
-export function formatRecordableLogEntry<T extends IRecordableLogEntry>(entry: T): string {
-	return entry.sourceId + ' @@ ' + JSON.stringify({ ...entry, sourceId: undefined });
-}
-
-export class StructuredLogger<T extends IRecordableLogEntry> extends Disposable {
-	public static cast<T extends IRecordableLogEntry>(): typeof StructuredLogger<T> {
-		return this as typeof StructuredLogger<T>;
-	}
-
-	private readonly _contextKeyValue = observableContextKey<string>(this._contextKey, this._contextKeyService).recomputeInitiallyAndOnChange(this._store);
-
-	constructor(
-		private readonly _contextKey: string,
-		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
-		@ICommandService private readonly _commandService: ICommandService,
-	) {
-		super();
-	}
-
-	public readonly isEnabled = this._contextKeyValue.map(v => v !== undefined);
-
-	public log(data: T): boolean {
-		const commandId = this._contextKeyValue.get();
-		if (!commandId) {
-			return false;
-		}
-		this._commandService.executeCommand(commandId, data);
-		return true;
-	}
-}
-
-export function observableContextKey<T>(key: string, contextKeyService: IContextKeyService): IObservable<T | undefined> {
-	return observableFromEvent(contextKeyService.onDidChangeContext, () => contextKeyService.getContextKeyValue<T>(key));
-}
-
 function reshapeEdit(edit: SingleOffsetEdit, originalText: string, totalInnerEdits: number, textModel: ITextModel): SingleOffsetEdit {
 	// TODO: EOL are not properly trimmed by the diffAlgorithm #12680
 	const eol = textModel.getEOL();
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
index 0f7691cbf87b..db0dad020cd0 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
@@ -370,9 +370,6 @@ export class InlineCompletionItem {
 
 		readonly id = `InlineCompletion:${InlineCompletionItem.ID++}`,
 	) {
-		// TODO: these statements are no-ops
-		filterText = filterText.replace(/\r\n|\r/g, '\n');
-		insertText = filterText.replace(/\r\n|\r/g, '\n');
 	}
 
 	public get didShow(): boolean {
@@ -382,23 +379,6 @@ export class InlineCompletionItem {
 		this._didCallShow = true;
 	}
 
-	public withRange(updatedRange: Range): InlineCompletionItem {
-		return new InlineCompletionItem(
-			this.filterText,
-			this.command,
-			this.shownCommand,
-			this.action,
-			updatedRange,
-			this.insertText,
-			this.snippetInfo,
-			this.cursorShowRange,
-			this.additionalTextEdits,
-			this.sourceInlineCompletion,
-			this.source,
-			this.id,
-		);
-	}
-
 	public withRangeInsertTextAndFilterText(updatedRange: Range, updatedInsertText: string, updatedFilterText: string): InlineCompletionItem {
 		return new InlineCompletionItem(
 			updatedFilterText,
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/structuredLogger.ts b/src/vs/editor/contrib/inlineCompletions/browser/structuredLogger.ts
new file mode 100644
index 000000000000..6422825090d8
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/structuredLogger.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 { Disposable } from '../../../../base/common/lifecycle.js';
+import { IObservable, observableFromEvent } from '../../../../base/common/observable.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+
+export interface IRecordableLogEntry {
+	sourceId: string;
+	time: number;
+}
+
+export interface IRecordableEditorLogEntry extends IRecordableLogEntry {
+	modelUri: string;
+	modelVersion: number;
+}
+
+/**
+ * The sourceLabel must not contain '@'!
+*/
+export function formatRecordableLogEntry<T extends IRecordableLogEntry>(entry: T): string {
+	return entry.sourceId + ' @@ ' + JSON.stringify({ ...entry, sourceId: undefined });
+}
+
+export class StructuredLogger<T extends IRecordableLogEntry> extends Disposable {
+	public static cast<T extends IRecordableLogEntry>(): typeof StructuredLogger<T> {
+		return this as typeof StructuredLogger<T>;
+	}
+
+	private readonly _contextKeyValue = observableContextKey<string>(this._contextKey, this._contextKeyService).recomputeInitiallyAndOnChange(this._store);
+
+	constructor(
+		private readonly _contextKey: string,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@ICommandService private readonly _commandService: ICommandService
+	) {
+		super();
+	}
+
+	public readonly isEnabled = this._contextKeyValue.map(v => v !== undefined);
+
+	public log(data: T): boolean {
+		const commandId = this._contextKeyValue.get();
+		if (!commandId) {
+			return false;
+		}
+		this._commandService.executeCommand(commandId, data);
+		return true;
+	}
+}
+
+function observableContextKey<T>(key: string, contextKeyService: IContextKeyService): IObservable<T | undefined> {
+	return observableFromEvent(contextKeyService.onDidChangeContext, () => contextKeyService.getContextKeyValue<T>(key));
+}

From 03f0dcae3397abbbb1beee788b2321b33e339e7f Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 14 Mar 2025 16:19:23 +0100
Subject: [PATCH 0943/1815] Inline completion property renames

---
 .../browser/model/inlineCompletionsSource.ts                  | 4 ++--
 .../contrib/inlineCompletions/browser/model/inlineEdit.ts     | 4 ++--
 .../browser/model/provideInlineCompletions.ts                 | 4 ++++
 .../browser/view/inlineEdits/inlineEditsViewProducer.ts       | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
index 80306f351a8a..c215dba8dc4f 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
@@ -144,7 +144,7 @@ export class InlineCompletionsSource extends Disposable {
 						const result = updatedCompletions?.completions.map(c => ({
 							range: c.range.toString(),
 							text: c.insertText,
-							isInlineEdit: !!c.sourceInlineCompletion.isInlineEdit,
+							isInlineEdit: !!c.isInlineEdit,
 							source: c.source.provider.groupId,
 						}));
 						this._log({ sourceId: 'InlineCompletions.fetch', kind: 'end', requestId, durationMs: (Date.now() - startTime.getTime()), error, result, time: Date.now() });
@@ -322,7 +322,7 @@ export class InlineCompletionWithUpdatedRange extends Disposable {
 
 	public get source() { return this.inlineCompletion.source; }
 	public get sourceInlineCompletion() { return this.inlineCompletion.sourceInlineCompletion; }
-	public get isInlineEdit() { return this.inlineCompletion.sourceInlineCompletion.isInlineEdit; }
+	public get isInlineEdit() { return this.inlineCompletion.isInlineEdit; }
 
 	constructor(
 		public readonly inlineCompletion: InlineCompletionItem,
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.ts
index 63e45b69ac7d..8ccfc9609b0c 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.ts
@@ -10,7 +10,7 @@ import { InlineCompletionItem } from './provideInlineCompletions.js';
 export class InlineEdit {
 	constructor(
 		public readonly edit: SingleTextEdit,
-		public readonly renderExplicitly: boolean,
+		public readonly jumpedTo: boolean,
 		public readonly commands: readonly Command[],
 		public readonly inlineCompletion: InlineCompletionItem,
 	) { }
@@ -25,7 +25,7 @@ export class InlineEdit {
 
 	public equals(other: InlineEdit): boolean {
 		return this.edit.equals(other.edit)
-			&& this.renderExplicitly === other.renderExplicitly
+			&& this.jumpedTo === other.jumpedTo
 			&& this.inlineCompletion === other.inlineCompletion;
 	}
 }
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
index db0dad020cd0..47cdd05852af 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
@@ -372,6 +372,10 @@ export class InlineCompletionItem {
 	) {
 	}
 
+	get isInlineEdit(): boolean {
+		return this.sourceInlineCompletion.isInlineEdit!!;
+	}
+
 	public get didShow(): boolean {
 		return this._didCallShow;
 	}
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 f63b071a0ffd..ad651d802192 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts
@@ -48,7 +48,7 @@ export class InlineEditsViewAndDiffProducer extends Disposable { // TODO: This c
 		const diffEdits = new TextEdit(edits);
 		const text = new TextModelText(textModel);
 
-		return new InlineEditWithChanges(text, diffEdits, model.primaryPosition.get(), inlineEdit.renderExplicitly, inlineEdit.commands, inlineEdit.inlineCompletion);
+		return new InlineEditWithChanges(text, diffEdits, model.primaryPosition.get(), inlineEdit.jumpedTo, inlineEdit.commands, inlineEdit.inlineCompletion);
 	});
 
 	private readonly _inlineEditModel = derived<InlineEditModel | undefined>(this, reader => {

From 3e8618636029e80f2f02ef4dfbbe38d0e5452f7c Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 14 Mar 2025 18:26:29 +0100
Subject: [PATCH 0944/1815] Fixes CI

---
 .../contrib/inlineCompletions/browser/structuredLogger.ts  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/structuredLogger.ts b/src/vs/editor/contrib/inlineCompletions/browser/structuredLogger.ts
index 6422825090d8..8a307df3bd30 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/structuredLogger.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/structuredLogger.ts
@@ -30,7 +30,8 @@ export class StructuredLogger<T extends IRecordableLogEntry> extends Disposable
 		return this as typeof StructuredLogger<T>;
 	}
 
-	private readonly _contextKeyValue = observableContextKey<string>(this._contextKey, this._contextKeyService).recomputeInitiallyAndOnChange(this._store);
+	public readonly isEnabled;
+	private readonly _contextKeyValue;
 
 	constructor(
 		private readonly _contextKey: string,
@@ -38,10 +39,10 @@ export class StructuredLogger<T extends IRecordableLogEntry> extends Disposable
 		@ICommandService private readonly _commandService: ICommandService
 	) {
 		super();
+		this._contextKeyValue = observableContextKey<string>(this._contextKey, this._contextKeyService).recomputeInitiallyAndOnChange(this._store);
+		this.isEnabled = this._contextKeyValue.map(v => v !== undefined);
 	}
 
-	public readonly isEnabled = this._contextKeyValue.map(v => v !== undefined);
-
 	public log(data: T): boolean {
 		const commandId = this._contextKeyValue.get();
 		if (!commandId) {

From 6feadd67bf6eedbd0c13a399c9d7a2554c4d1774 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Fri, 14 Mar 2025 11:20:27 -0700
Subject: [PATCH 0945/1815] Adjust agent experiment fallback (#243588)

---
 src/vs/workbench/contrib/chat/browser/chat.contribution.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 0eeff070bbbf..44e22da5cada 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -353,7 +353,8 @@ class ChatAgentSettingContribution extends Disposable implements IWorkbenchContr
 			if (enabled) {
 				this.registerEnablementSetting();
 				expDisabledKey.set(false);
-			} else if (enabled === false) {
+			} else if (this.productService.quality === 'stable') {
+				// undefined treatment- on stable, fall back to disabled
 				this.deregisterSetting();
 				expDisabledKey.set(true);
 			}

From 2d4d581cbbe14d4c1015de716d0593e3def1302a Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 14 Mar 2025 11:58:19 -0700
Subject: [PATCH 0946/1815] finish cleanup

---
 .../observable/common/observableMemento.ts    |   6 --
 src/vs/workbench/api/browser/mainThreadMcp.ts |  47 +++++---
 .../workbench/api/common/extHost.protocol.ts  |   5 +-
 src/vs/workbench/api/common/extHostMcp.ts     |  13 ++-
 .../contrib/mcp/browser/mcpCommands.ts        |  14 ++-
 .../common/discovery/extensionMcpDiscovery.ts |  21 ++--
 .../contrib/mcp/common/mcpContextKeys.ts      |   4 +-
 .../contrib/mcp/common/mcpRegistry.ts         |  18 +++-
 .../contrib/mcp/common/mcpRegistryTypes.ts    |   4 +-
 .../contrib/mcp/common/mcpService.ts          |   2 +-
 .../workbench/contrib/mcp/common/mcpTypes.ts  |   8 +-
 .../mcp/test/common/mcpRegistry.test.ts       | 101 +++++++++++++++++-
 12 files changed, 194 insertions(+), 49 deletions(-)

diff --git a/src/vs/platform/observable/common/observableMemento.ts b/src/vs/platform/observable/common/observableMemento.ts
index c93edb483ba7..cf38e2fb80b2 100644
--- a/src/vs/platform/observable/common/observableMemento.ts
+++ b/src/vs/platform/observable/common/observableMemento.ts
@@ -5,7 +5,6 @@
 
 import { strictEquals } from '../../../base/common/equals.js';
 import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
-import { ISettableObservable } from '../../../base/common/observable.js';
 import { ObservableValue } from '../../../base/common/observableInternal/base.js';
 import { DebugNameData } from '../../../base/common/observableInternal/debugName.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
@@ -38,9 +37,6 @@ export class ObservableMemento<T> extends ObservableValue<T> implements IDisposa
 	private readonly _store = new DisposableStore();
 	private _didChange = false;
 
-	/** Settable function called before persisting to storage. */
-	public onWillSave?: (value: T) => void;
-
 	constructor(
 		opts: IObservableMementoOpts<T>,
 		storageScope: StorageScope,
@@ -76,8 +72,6 @@ export class ObservableMemento<T> extends ObservableValue<T> implements IDisposa
 		}));
 
 		this._store.add(storageService.onWillSaveState(() => {
-			this.onWillSave?.(this.get());
-
 			if (this._didChange) {
 				this._didChange = false;
 				const value = this.get();
diff --git a/src/vs/workbench/api/browser/mainThreadMcp.ts b/src/vs/workbench/api/browser/mainThreadMcp.ts
index bfa1a80cc050..b18bebf211f0 100644
--- a/src/vs/workbench/api/browser/mainThreadMcp.ts
+++ b/src/vs/workbench/api/browser/mainThreadMcp.ts
@@ -4,11 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Emitter } from '../../../base/common/event.js';
-import { Disposable } from '../../../base/common/lifecycle.js';
+import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
 import { ISettableObservable, observableValue } from '../../../base/common/observable.js';
-import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 import { IMcpMessageTransport, IMcpRegistry } from '../../contrib/mcp/common/mcpRegistryTypes.js';
-import { extensionPrefixedIdentifier, McpConnectionState, McpServerDefinition, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
+import { McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
 import { MCP } from '../../contrib/mcp/common/modelContextProtocol.js';
 import { ExtensionHostKind } from '../../services/extensions/common/extensionHostKind.js';
 import { IExtHostContext, extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
@@ -20,23 +19,28 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 	private _serverIdCounter = 0;
 
 	private readonly _servers: Map<number, ExtHostMcpServerLaunch> = new Map();
+	private readonly _collectionDefinitions = this._register(new DisposableMap<string, {
+		fromExtHost: McpCollectionDefinition.FromExtHost;
+		servers: ISettableObservable<readonly McpServerDefinition[]>;
+		dispose(): void;
+	}>());
 
 	constructor(
-		extHostContext: IExtHostContext,
+		private readonly _extHostContext: IExtHostContext,
 		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry,
 	) {
 		super();
-		const proxy = extHostContext.getProxy(ExtHostContext.ExtHostMcp);
+		const proxy = _extHostContext.getProxy(ExtHostContext.ExtHostMcp);
 		this._register(this._mcpRegistry.registerDelegate({
 			waitForInitialProviderPromises() {
 				return proxy.$waitForInitialCollectionProviders();
 			},
 			canStart(collection, serverDefinition) {
 				// todo: SSE MPC servers without a remote authority could be served from the renderer
-				if (collection.remoteAuthority !== extHostContext.remoteAuthority) {
+				if (collection.remoteAuthority !== _extHostContext.remoteAuthority) {
 					return false;
 				}
-				if (serverDefinition.launch.type === McpServerTransportType.Stdio && extHostContext.extensionHostKind === ExtensionHostKind.LocalWebWorker) {
+				if (serverDefinition.launch.type === McpServerTransportType.Stdio && _extHostContext.extensionHostKind === ExtensionHostKind.LocalWebWorker) {
 					return false;
 				}
 				return true;
@@ -56,16 +60,29 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 		}));
 	}
 
-	$setMcpServers(extension: ExtensionIdentifier, id: string, serversDto: McpServerDefinition.Serialized[]): void {
-
-		const fid = extensionPrefixedIdentifier(extension, id);
-		const existing = this._mcpRegistry.collections.get().find(c => c.id === fid);
-		if (!existing) {
-			throw new Error(`[MCP] UNKNOWN collection ${fid}`);
+	$upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, serversDto: McpServerDefinition.Serialized[]): void {
+		const servers = serversDto.map(McpServerDefinition.fromSerialized);
+		const existing = this._collectionDefinitions.get(collection.id);
+		if (existing) {
+			existing.servers.set(servers, undefined);
+		} else {
+			const serverDefinitions = observableValue<readonly McpServerDefinition[]>('mcpServers', servers);
+			const handle = this._mcpRegistry.registerCollection({
+				...collection,
+				remoteAuthority: this._extHostContext.remoteAuthority,
+				serverDefinitions,
+			});
+
+			this._collectionDefinitions.set(collection.id, {
+				fromExtHost: collection,
+				servers: serverDefinitions,
+				dispose: () => handle.dispose(),
+			});
 		}
+	}
 
-		const servers = serversDto.map(McpServerDefinition.fromSerialized);
-		(existing.serverDefinitions as ISettableObservable<typeof servers>).set(servers, undefined);
+	$deleteMcpCollection(collectionId: string): void {
+		this._collectionDefinitions.deleteAndDispose(collectionId);
 	}
 
 	$onDidChangeState(id: number, update: McpConnectionState): void {
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 3b9b8dd8013b..f302808a52b4 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -61,7 +61,7 @@ import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { IChatMessage, IChatResponseFragment, ILanguageModelChatMetadata, ILanguageModelChatSelector, ILanguageModelsChangeEvent } from '../../contrib/chat/common/languageModels.js';
 import { IPreparedToolInvocation, IToolData, IToolInvocation, IToolResult } from '../../contrib/chat/common/languageModelToolsService.js';
 import { DebugConfigurationProviderTriggerKind, IAdapterDescriptor, IConfig, IDebugSessionReplMode, IDebugTestRunReference, IDebugVisualization, IDebugVisualizationContext, IDebugVisualizationTreeItem, MainThreadDebugVisualization } from '../../contrib/debug/common/debug.js';
-import { McpServerLaunch, McpConnectionState, McpServerDefinition } from '../../contrib/mcp/common/mcpTypes.js';
+import { McpServerLaunch, McpConnectionState, McpServerDefinition, McpCollectionDefinition } from '../../contrib/mcp/common/mcpTypes.js';
 import * as notebookCommon from '../../contrib/notebook/common/notebookCommon.js';
 import { CellExecutionUpdateType } from '../../contrib/notebook/common/notebookExecutionService.js';
 import { ICellExecutionComplete, ICellExecutionStateUpdate } from '../../contrib/notebook/common/notebookExecutionStateService.js';
@@ -2980,7 +2980,8 @@ export interface MainThreadMcpShape {
 	$onDidChangeState(id: number, state: McpConnectionState): void;
 	$onDidPublishLog(id: number, log: string): void;
 	$onDidReceiveMessage(id: number, message: string): void;
-	$setMcpServers(extension: ExtensionIdentifier, id: string, serversDto: McpServerDefinition.Serialized[]): void;
+	$upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, servers: Dto<McpServerDefinition>[]): void;
+	$deleteMcpCollection(collectionId: string): void;
 }
 
 export interface ExtHostLocalizationShape {
diff --git a/src/vs/workbench/api/common/extHostMcp.ts b/src/vs/workbench/api/common/extHostMcp.ts
index 26f9851f9bec..437ed6a978f4 100644
--- a/src/vs/workbench/api/common/extHostMcp.ts
+++ b/src/vs/workbench/api/common/extHostMcp.ts
@@ -8,7 +8,8 @@ import { CancellationToken } from '../../../base/common/cancellation.js';
 import { DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
-import { McpServerDefinition, McpServerLaunch, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
+import { StorageScope } from '../../../platform/storage/common/storage.js';
+import { extensionPrefixedIdentifier, McpCollectionDefinition, McpServerDefinition, McpServerLaunch, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
 import { ExtHostMcpShape, MainContext, MainThreadMcpShape } from './extHost.protocol.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 
@@ -53,6 +54,12 @@ export class ExtHostMcpService implements IExtHostMpcService {
 			throw new Error(`MCP configuration providers must be registered in the contributes.modelContextServerCollections array within your package.json, but "${id}" was not`);
 		}
 
+		const mcp: McpCollectionDefinition.FromExtHost = {
+			id: extensionPrefixedIdentifier(extension.identifier, id),
+			isTrustedByDefault: true,
+			label: metadata?.label ?? extension.displayName ?? extension.name,
+			scope: StorageScope.WORKSPACE
+		};
 
 		const update = async () => {
 
@@ -83,11 +90,11 @@ export class ExtHostMcpService implements IExtHostMpcService {
 				});
 			}
 
-			this._proxy.$setMcpServers(extension.identifier, id, servers);
+			this._proxy.$upsertMcpCollection(mcp, servers);
 		};
 
 		store.add(toDisposable(() => {
-			this._proxy.$setMcpServers(extension.identifier, id, []);
+			this._proxy.$deleteMcpCollection(mcp.id);
 		}));
 
 		if (provider.onDidChange) {
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 7bfda7ad730e..dc1cafa8395c 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -24,7 +24,7 @@ import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
 import { ChatMode } from '../../chat/common/constants.js';
 import { McpContextKeys } from '../common/mcpContextKeys.js';
 import { IMcpRegistry } from '../common/mcpRegistryTypes.js';
-import { IMcpServer, IMcpService, McpConnectionState, McpServerToolsState } from '../common/mcpTypes.js';
+import { LazyCollectionState, IMcpServer, IMcpService, McpConnectionState, McpServerToolsState } from '../common/mcpTypes.js';
 
 // acroynms do not get localized
 const category: ILocalizedString = {
@@ -224,9 +224,15 @@ export class MCPServerActionRendering extends Disposable implements IWorkbenchCo
 				serversPerState[thisState].push(server);
 			}
 
-			const extensionNeedRefresh = mcpService.hasCollectionsWithUnknownServers.read(reader);
-			const maxState = extensionNeedRefresh ? DisplayedState.NewTools : (serversPerState.length - 1) as DisplayedState;
-			return { state: maxState, servers: serversPerState[maxState] || [], extensions: extensionNeedRefresh };
+			const unknownServerStates = mcpService.lazyCollectionState.read(reader);
+			if (unknownServerStates === LazyCollectionState.LoadingUnknown) {
+				serversPerState[DisplayedState.Refreshing] ??= [];
+			} else if (unknownServerStates === LazyCollectionState.HasUnknown) {
+				serversPerState[DisplayedState.NewTools] ??= [];
+			}
+
+			const maxState = (serversPerState.length - 1) as DisplayedState;
+			return { state: maxState, servers: serversPerState[maxState] || [] };
 		});
 
 		this._store.add(actionViewItemService.register(MenuId.ChatInputAttachmentToolbar, McpServerOptionsCommand.id, (action, options) => {
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/extensionMcpDiscovery.ts b/src/vs/workbench/contrib/mcp/common/discovery/extensionMcpDiscovery.ts
index 59fad99e698e..75cbd2081f6d 100644
--- a/src/vs/workbench/contrib/mcp/common/discovery/extensionMcpDiscovery.ts
+++ b/src/vs/workbench/contrib/mcp/common/discovery/extensionMcpDiscovery.ts
@@ -10,10 +10,9 @@ import { IExtensionService } from '../../../../services/extensions/common/extens
 import * as extensionsRegistry from '../../../../services/extensions/common/extensionsRegistry.js';
 import { mcpActivationEvent, mcpContributionPoint } from '../mcpConfiguration.js';
 import { IMcpRegistry } from '../mcpRegistryTypes.js';
-import { extensionMcpCollectionPrefix, extensionPrefixedIdentifier, McpServerDefinition } from '../mcpTypes.js';
+import { extensionPrefixedIdentifier, McpServerDefinition } from '../mcpTypes.js';
 import { IMcpDiscovery } from './mcpDiscovery.js';
 
-
 const cacheKey = 'mcp.extCachedServers';
 
 interface IServerCacheEntry {
@@ -37,7 +36,12 @@ export class ExtensionMcpDiscovery extends Disposable implements IMcpDiscovery {
 		this._register(storageService.onWillSaveState(() => {
 			let updated = false;
 			for (const collectionId of this._extensionCollectionIdsToPersist) {
-				const defs = this._mcpRegistry.collections.get().find(c => c.id === collectionId)?.serverDefinitions.get();
+				const collection = this._mcpRegistry.collections.get().find(c => c.id === collectionId);
+				if (!collection || collection.lazy) {
+					continue;
+				}
+
+				const defs = collection.serverDefinitions.get();
 				if (defs) {
 					updated = true;
 					this.cachedServers[collectionId] = { servers: defs.map(McpServerDefinition.toSerialized) };
@@ -52,7 +56,7 @@ export class ExtensionMcpDiscovery extends Disposable implements IMcpDiscovery {
 
 	public start(): void {
 		const extensionCollections = this._register(new DisposableMap<string>());
-		_mcpExtensionPoint.setHandler((_extensions, delta) => {
+		this._register(_mcpExtensionPoint.setHandler((_extensions, delta) => {
 			const { added, removed } = delta;
 
 			for (const collections of removed) {
@@ -63,9 +67,10 @@ export class ExtensionMcpDiscovery extends Disposable implements IMcpDiscovery {
 
 			for (const collections of added) {
 				for (const coll of collections.value) {
-					const serverDefs = this.cachedServers.hasOwnProperty(coll.id) ? this.cachedServers[coll.id].servers : undefined;
-
 					const id = extensionPrefixedIdentifier(collections.description.identifier, coll.id);
+					this._extensionCollectionIdsToPersist.add(id);
+
+					const serverDefs = this.cachedServers.hasOwnProperty(id) ? this.cachedServers[id].servers : undefined;
 					const dispo = this._mcpRegistry.registerCollection({
 						id,
 						label: coll.label,
@@ -83,11 +88,11 @@ export class ExtensionMcpDiscovery extends Disposable implements IMcpDiscovery {
 					extensionCollections.set(id, dispo);
 				}
 			}
-		});
+		}));
 	}
 
 	private async _activateExtensionServers(collectionId: string): Promise<void> {
-		await this._extensionService.activateByEvent(mcpActivationEvent(collectionId.slice(extensionMcpCollectionPrefix.length)));
+		await this._extensionService.activateByEvent(mcpActivationEvent(collectionId));
 		await Promise.all(this._mcpRegistry.delegates
 			.map(r => r.waitForInitialProviderPromises()));
 	}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts b/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
index 4d912ad1dac9..6bade4f4f511 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
@@ -9,7 +9,7 @@ import { autorun } from '../../../../base/common/observable.js';
 import { localize } from '../../../../nls.js';
 import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { IMcpService, McpServerToolsState } from './mcpTypes.js';
+import { LazyCollectionState, IMcpService, McpServerToolsState } from './mcpTypes.js';
 
 
 export namespace McpContextKeys {
@@ -39,7 +39,7 @@ export class McpContextKeysController extends Disposable implements IWorkbenchCo
 			const serverTools = servers.map(s => s.tools.read(r));
 			ctxServerCount.set(servers.length);
 			ctxToolsCount.set(serverTools.reduce((count, tools) => count + tools.length, 0));
-			ctxHasUnknownTools.set(mcpService.hasCollectionsWithUnknownServers.read(r) || servers.some(s => {
+			ctxHasUnknownTools.set(mcpService.lazyCollectionState.read(r) !== LazyCollectionState.AllKnown || servers.some(s => {
 				if (s.trusted.read(r) === false) {
 					return false;
 				}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
index 5ebb780993df..7ffe8826dba8 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
@@ -16,7 +16,7 @@ import { IConfigurationResolverService } from '../../../services/configurationRe
 import { McpRegistryInputStorage } from './mcpRegistryInputStorage.js';
 import { IMcpHostDelegate, IMcpRegistry, IMcpResolveConnectionOptions } from './mcpRegistryTypes.js';
 import { McpServerConnection } from './mcpServerConnection.js';
-import { IMcpServerConnection, McpCollectionDefinition, McpCollectionReference, McpServerDefinition } from './mcpTypes.js';
+import { IMcpServerConnection, LazyCollectionState, McpCollectionDefinition, McpCollectionReference, McpServerDefinition } from './mcpTypes.js';
 
 const createTrustMemento = observableMemento<Readonly<Record<string, boolean>>>({
 	defaultValue: {},
@@ -37,10 +37,14 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 
 	private readonly _trustMemento = new Lazy(() => this._register(createTrustMemento(StorageScope.APPLICATION, StorageTarget.MACHINE, this._storageService)));
 	private readonly _lazyCollectionsToUpdate = new Set</* collection ID*/string>();
+	private readonly _ongoingLazyActivations = observableValue(this, 0);
 
-	public readonly canDiscoverCollections = derived(reader => {
+	public readonly lazyCollectionState = derived(reader => {
+		if (this._ongoingLazyActivations.read(reader) > 0) {
+			return LazyCollectionState.LoadingUnknown;
+		}
 		const collections = this._collections.read(reader);
-		return collections.some(c => c.lazy && c.lazy.isCached === false);
+		return collections.some(c => c.lazy && c.lazy.isCached === false) ? LazyCollectionState.HasUnknown : LazyCollectionState.AllKnown;
 	});
 
 	public get delegates(): readonly IMcpHostDelegate[] {
@@ -71,6 +75,8 @@ 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);
+
+		// Incoming collections replace the "lazy" versions. See `ExtensionMcpDiscovery` for an example.
 		if (toReplace) {
 			this._lazyCollectionsToUpdate.add(collection.id);
 			this._collections.set(currentCollections.map(c => c === toReplace ? collection : c), undefined);
@@ -88,7 +94,11 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 
 	public async discoverCollections(): Promise<McpCollectionDefinition[]> {
 		const toDiscover = this._collections.get().filter(c => c.lazy && !c.lazy.isCached);
-		await Promise.all(toDiscover.map(c => c.lazy?.load()));
+
+		this._ongoingLazyActivations.set(this._ongoingLazyActivations.get() + 1, undefined);
+		await Promise.all(toDiscover.map(c => c.lazy?.load())).finally(() => {
+			this._ongoingLazyActivations.set(this._ongoingLazyActivations.get() - 1, undefined);
+		});
 
 		const found: McpCollectionDefinition[] = [];
 		const current = this._collections.get();
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
index 996a4c14f8ec..3a09fdc6f2ac 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
@@ -7,7 +7,7 @@ import { Event } from '../../../../base/common/event.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { IObservable } from '../../../../base/common/observable.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { McpCollectionDefinition, McpServerDefinition, McpServerLaunch, McpConnectionState, IMcpServerConnection, McpCollectionReference, McpDefinitionReference } from './mcpTypes.js';
+import { McpCollectionDefinition, McpServerDefinition, McpServerLaunch, McpConnectionState, IMcpServerConnection, McpCollectionReference, McpDefinitionReference, LazyCollectionState } from './mcpTypes.js';
 import { MCP } from './modelContextProtocol.js';
 
 export const IMcpRegistry = createDecorator<IMcpRegistry>('mcpRegistry');
@@ -41,7 +41,7 @@ export interface IMcpRegistry {
 	readonly delegates: readonly IMcpHostDelegate[];
 
 	/** Whether there are new collections that can be resolved with a discover() call */
-	readonly canDiscoverCollections: IObservable<boolean>;
+	readonly lazyCollectionState: IObservable<LazyCollectionState>;
 	/** Discover new collections, returning newly-discovered ones. */
 	discoverCollections(): Promise<McpCollectionDefinition[]>;
 
diff --git a/src/vs/workbench/contrib/mcp/common/mcpService.ts b/src/vs/workbench/contrib/mcp/common/mcpService.ts
index 305f00c2c9bf..b9911400b109 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpService.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpService.ts
@@ -25,7 +25,7 @@ export class McpService extends Disposable implements IMcpService {
 	private readonly _servers = observableValue<readonly IMcpServer[]>(this, []);
 	public readonly servers: IObservable<readonly IMcpServer[]> = this._servers;
 
-	public get hasCollectionsWithUnknownServers() { return this._mcpRegistry.canDiscoverCollections; }
+	public get lazyCollectionState() { return this._mcpRegistry.lazyCollectionState; }
 
 	protected readonly userCache: McpServerMetadataCache;
 	protected readonly workspaceCache: McpServerMetadataCache;
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
index cc91d2ec53c1..4e9a22e75760 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
@@ -160,11 +160,17 @@ export interface IMcpService {
 	resetCaches(): void;
 
 	/** Set if there are extensions that register MCP servers that have never been activated. */
-	readonly hasCollectionsWithUnknownServers: IObservable<boolean>;
+	readonly lazyCollectionState: IObservable<LazyCollectionState>;
 	/** Activatese extensions and runs their MCP servers. */
 	activateCollections(): Promise<void>;
 }
 
+export const enum LazyCollectionState {
+	HasUnknown,
+	LoadingUnknown,
+	AllKnown,
+}
+
 export const IMcpService = createDecorator<IMcpService>('IMcpService');
 
 export interface McpCollectionReference {
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 6e330575c011..5b971ee6544b 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
@@ -24,8 +24,9 @@ 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 { McpCollectionDefinition, McpServerDefinition, McpServerTransportType } from '../../common/mcpTypes.js';
+import { LazyCollectionState, McpCollectionDefinition, McpServerDefinition, McpServerTransportType } from '../../common/mcpTypes.js';
 import { TestMcpMessageTransport } from './mcpRegistryTypes.js';
+import { timeout } from '../../../../../base/common/async.js';
 
 class TestConfigurationResolverService implements Partial<IConfigurationResolverService> {
 	declare readonly _serviceBrand: undefined;
@@ -391,4 +392,102 @@ suite('Workbench - MCP - Registry', () => {
 			connection3?.dispose();
 		});
 	});
+
+	suite('Lazy Collections', () => {
+		let lazyCollection: McpCollectionDefinition;
+		let normalCollection: McpCollectionDefinition;
+		let removedCalled: boolean;
+
+		setup(() => {
+			removedCalled = false;
+			lazyCollection = {
+				...testCollection,
+				id: 'lazy-collection',
+				lazy: {
+					isCached: false,
+					load: () => Promise.resolve(),
+					removed: () => { removedCalled = true; }
+				}
+			};
+			normalCollection = {
+				...testCollection,
+				id: 'lazy-collection',
+				serverDefinitions: observableValue('serverDefs', [baseDefinition])
+			};
+		});
+
+		test('registers lazy collection', () => {
+			const disposable = registry.registerCollection(lazyCollection);
+			store.add(disposable);
+
+			assert.strictEqual(registry.collections.get().length, 1);
+			assert.strictEqual(registry.collections.get()[0], lazyCollection);
+			assert.strictEqual(registry.lazyCollectionState.get(), LazyCollectionState.HasUnknown);
+		});
+
+		test('lazy collection is replaced by normal collection', () => {
+			store.add(registry.registerCollection(lazyCollection));
+			store.add(registry.registerCollection(normalCollection));
+
+			const collections = registry.collections.get();
+			assert.strictEqual(collections.length, 1);
+			assert.strictEqual(collections[0], normalCollection);
+			assert.strictEqual(collections[0].lazy, undefined);
+			assert.strictEqual(registry.lazyCollectionState.get(), LazyCollectionState.AllKnown);
+		});
+
+		test('lazyCollectionState updates correctly during loading', async () => {
+			lazyCollection = {
+				...lazyCollection,
+				lazy: {
+					...lazyCollection.lazy!,
+					load: async () => {
+						await timeout(0);
+						store.add(registry.registerCollection(normalCollection));
+						return Promise.resolve();
+					}
+				}
+			};
+
+			store.add(registry.registerCollection(lazyCollection));
+			assert.strictEqual(registry.lazyCollectionState.get(), LazyCollectionState.HasUnknown);
+
+			const loadingPromise = registry.discoverCollections();
+			assert.strictEqual(registry.lazyCollectionState.get(), LazyCollectionState.LoadingUnknown);
+
+			await loadingPromise;
+
+			// The collection wasn't replaced, so it should be removed
+			assert.strictEqual(registry.collections.get().length, 1);
+			assert.strictEqual(registry.lazyCollectionState.get(), LazyCollectionState.AllKnown);
+			assert.strictEqual(removedCalled, false);
+		});
+
+		test('removed callback is called when lazy collection is not replaced', async () => {
+			store.add(registry.registerCollection(lazyCollection));
+			await registry.discoverCollections();
+
+			assert.strictEqual(removedCalled, true);
+		});
+
+		test('cached lazy collections are tracked correctly', () => {
+			lazyCollection.lazy!.isCached = true;
+			store.add(registry.registerCollection(lazyCollection));
+
+			assert.strictEqual(registry.lazyCollectionState.get(), LazyCollectionState.AllKnown);
+
+			// Adding an uncached lazy collection changes the state
+			const uncachedLazy = {
+				...lazyCollection,
+				id: 'uncached-lazy',
+				lazy: {
+					...lazyCollection.lazy!,
+					isCached: false
+				}
+			};
+			store.add(registry.registerCollection(uncachedLazy));
+
+			assert.strictEqual(registry.lazyCollectionState.get(), LazyCollectionState.HasUnknown);
+		});
+	});
 });

From d6f552a887979d8e932df3ffee8b2ea406d8ebc6 Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Fri, 14 Mar 2025 12:27:31 -0700
Subject: [PATCH 0947/1815] dont reuse untitled uri of existing
 notebookEditorModel (#243591)

Co-authored-by: amunger <>
---
 .../common/notebookEditorModelResolverServiceImpl.ts  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts
index a21a95750b01..862ca633005e 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.ts
@@ -61,6 +61,15 @@ class NotebookModelReferenceCollection extends ReferenceCollection<Promise<IReso
 		return this._dirtyStates.get(resource) ?? false;
 	}
 
+	isListeningToModel(uri: URI): boolean {
+		for (const key of this._modelListener.keys()) {
+			if (key.resource.toString() === uri.toString()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	protected async createReferencedObject(key: string, notebookType: string, hasAssociatedFilePath: boolean, limits?: IFileReadLimits, isScratchpad?: boolean, viewType?: string): Promise<IResolvedNotebookEditorModel> {
 		// Untrack as being disposed
 		this.modelsToDispose.delete(key);
@@ -186,7 +195,7 @@ export class NotebookModelResolverServiceImpl implements INotebookEditorModelRes
 		const suffix = NotebookProviderInfo.possibleFileEnding(info.selectors) ?? '';
 		for (let counter = 1; ; counter++) {
 			const candidate = URI.from({ scheme: Schemas.untitled, path: `Untitled-${counter}${suffix}`, query: notebookType });
-			if (!this._notebookService.getNotebookTextModel(candidate)) {
+			if (!this._notebookService.getNotebookTextModel(candidate) && !this._data.isListeningToModel(candidate)) {
 				return candidate;
 			}
 		}

From 2f097f5998fe14557362133ef7d411925420cdea Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 14 Mar 2025 12:43:01 -0700
Subject: [PATCH 0948/1815] Ensure sorting is consistent by only entering file
 block for files

Fixes #243557
---
 .../browser/terminalCompletionModel.ts        | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionModel.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionModel.ts
index c83bbe13a7ce..4cb466f933c8 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionModel.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionModel.ts
@@ -47,7 +47,11 @@ const compareCompletionsFn = (leadingLineContent: string, a: TerminalCompletionI
 
 	// Sort files of the same name by extension
 	const isArg = leadingLineContent.includes(' ');
-	if (!isArg && a.labelLowExcludeFileExt === b.labelLowExcludeFileExt) {
+	if (!isArg && a.completion.kind === TerminalCompletionItemKind.File && b.completion.kind === TerminalCompletionItemKind.File) {
+		// If the file name excluding the extension is different, just do a regular sort
+		if (a.labelLowExcludeFileExt !== b.labelLowExcludeFileExt) {
+			return a.labelLowExcludeFileExt.localeCompare(b.labelLowExcludeFileExt, undefined, { ignorePunctuation: true });
+		}
 		// Then by label length ascending (excluding file extension if it's a file)
 		score = a.labelLowExcludeFileExt.length - b.labelLowExcludeFileExt.length;
 		if (score !== 0) {
@@ -81,20 +85,22 @@ const compareCompletionsFn = (leadingLineContent: string, a: TerminalCompletionI
 	}
 
 	// Sort by folder depth (eg. `vscode/` should come before `vscode-.../`)
-	if (a.labelLowNormalizedPath && b.labelLowNormalizedPath) {
-		// Directories
-		// Count depth of path (number of / or \ occurrences)
-		score = count(a.labelLowNormalizedPath, '/') - count(b.labelLowNormalizedPath, '/');
-		if (score !== 0) {
-			return score;
-		}
+	if (a.completion.kind === TerminalCompletionItemKind.Folder && b.completion.kind === TerminalCompletionItemKind.Folder) {
+		if (a.labelLowNormalizedPath && b.labelLowNormalizedPath) {
+			// Directories
+			// Count depth of path (number of / or \ occurrences)
+			score = count(a.labelLowNormalizedPath, '/') - count(b.labelLowNormalizedPath, '/');
+			if (score !== 0) {
+				return score;
+			}
 
-		// Ensure shorter prefixes appear first
-		if (b.labelLowNormalizedPath.startsWith(a.labelLowNormalizedPath)) {
-			return -1; // `a` is a prefix of `b`, so `a` should come first
-		}
-		if (a.labelLowNormalizedPath.startsWith(b.labelLowNormalizedPath)) {
-			return 1; // `b` is a prefix of `a`, so `b` should come first
+			// Ensure shorter prefixes appear first
+			if (b.labelLowNormalizedPath.startsWith(a.labelLowNormalizedPath)) {
+				return -1; // `a` is a prefix of `b`, so `a` should come first
+			}
+			if (a.labelLowNormalizedPath.startsWith(b.labelLowNormalizedPath)) {
+				return 1; // `b` is a prefix of `a`, so `b` should come first
+			}
 		}
 	}
 

From da8479d178458e732b74bd05ec30f73c8b0e010b Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Fri, 14 Mar 2025 15:53:07 -0400
Subject: [PATCH 0949/1815] timeout if terminal completion provider takes too
 long (#243487)

fix #243355
---
 .../terminal-suggest/src/helpers/promise.ts   |  8 ++++++++
 .../src/terminalSuggestMain.ts                | 20 ++++++++++++++++++-
 .../browser/terminalCompletionService.ts      |  6 +++++-
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 extensions/terminal-suggest/src/helpers/promise.ts

diff --git a/extensions/terminal-suggest/src/helpers/promise.ts b/extensions/terminal-suggest/src/helpers/promise.ts
new file mode 100644
index 000000000000..14e86bc04811
--- /dev/null
+++ b/extensions/terminal-suggest/src/helpers/promise.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.
+ *--------------------------------------------------------------------------------------------*/
+
+export function createTimeoutPromise<T>(timeout: number, defaultValue: T): Promise<T> {
+	return new Promise(resolve => setTimeout(() => resolve(defaultValue), timeout));
+}
diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index d152aa97ba8d..58354e223d07 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -25,6 +25,7 @@ import type { ICompletionResource } from './types';
 import { createCompletionItem } from './helpers/completionItem';
 import { getFigSuggestions } from './fig/figInterface';
 import { executeCommand, executeCommandTimeout, IFigExecuteExternals } from './fig/execute';
+import { createTimeoutPromise } from './helpers/promise';
 
 // TODO: remove once API is finalized
 export const enum TerminalShellType {
@@ -117,7 +118,24 @@ export async function activate(context: vscode.ExtensionContext) {
 			const prefix = getPrefix(terminalContext.commandLine, terminalContext.cursorPosition);
 			const pathSeparator = isWindows ? '\\' : '/';
 			const tokenType = getTokenType(terminalContext, shellType);
-			const result = await getCompletionItemsFromSpecs(availableSpecs, terminalContext, commands, prefix, tokenType, terminal.shellIntegration?.cwd, getEnvAsRecord(terminal.shellIntegration?.env?.value), terminal.name, token);
+			const result = await Promise.race([
+				getCompletionItemsFromSpecs(
+					availableSpecs,
+					terminalContext,
+					commands,
+					prefix,
+					tokenType,
+					terminal.shellIntegration?.cwd,
+					getEnvAsRecord(terminal.shellIntegration?.env?.value),
+					terminal.name,
+					token
+				),
+				createTimeoutPromise(300, undefined)
+			]);
+			if (!result) {
+				return;
+			}
+
 			if (terminal.shellIntegration?.env) {
 				const homeDirCompletion = result.items.find(i => i.label === '~');
 				if (homeDirCompletion && terminal.shellIntegration.env?.value?.HOME) {
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
index eb7f998cc39b..af55e2bf0ff1 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
@@ -16,6 +16,7 @@ import { TerminalSuggestSettingId } from '../common/terminalSuggestConfiguration
 import { TerminalCompletionItemKind, type ITerminalCompletion } from './terminalCompletionItem.js';
 import { env as processEnv } from '../../../../../base/common/process.js';
 import type { IProcessEnvironment } from '../../../../../base/common/platform.js';
+import { timeout } from '../../../../../base/common/async.js';
 
 export const ITerminalCompletionService = createDecorator<ITerminalCompletionService>('terminalCompletionService');
 
@@ -166,7 +167,10 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 			if (provider.shellTypes && !provider.shellTypes.includes(shellType)) {
 				return undefined;
 			}
-			const completions = await provider.provideCompletions(promptValue, cursorPosition, allowFallbackCompletions, token);
+			const completions = await Promise.race([
+				provider.provideCompletions(promptValue, cursorPosition, allowFallbackCompletions, token),
+				timeout(5000)
+			]);
 			if (!completions) {
 				return undefined;
 			}

From 3e6950ca7dfaffcc165af1a7b74b9c47481e88f1 Mon Sep 17 00:00:00 2001
From: Connor Peet <copeet@microsoft.com>
Date: Fri, 14 Mar 2025 13:55:21 -0700
Subject: [PATCH 0950/1815] MCP: fix "server options" doesn't seem to do
 anything (#243600)

Fixes #243583
---
 .../contrib/mcp/browser/mcpCommands.ts        | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index dc1cafa8395c..8cd4acc80517 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -41,6 +41,15 @@ export class ListMcpServerCommand extends Action2 {
 			icon: Codicon.server,
 			category,
 			f1: true,
+			menu: {
+				when: ContextKeyExpr.and(
+					McpContextKeys.hasUnknownTools,
+					ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent)
+				),
+				id: MenuId.ChatInputAttachmentToolbar,
+				group: 'navigation',
+				order: 0
+			},
 		});
 	}
 
@@ -99,17 +108,7 @@ export class McpServerOptionsCommand extends Action2 {
 			id: McpServerOptionsCommand.id,
 			title: localize2('mcp.options', 'Server Options'),
 			category,
-			icon: Codicon.server,
-			f1: true,
-			menu: {
-				when: ContextKeyExpr.and(
-					McpContextKeys.hasUnknownTools,
-					ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent)
-				),
-				id: MenuId.ChatInputAttachmentToolbar,
-				group: 'navigation',
-				order: 0
-			},
+			f1: false,
 		});
 	}
 
@@ -235,7 +234,7 @@ export class MCPServerActionRendering extends Disposable implements IWorkbenchCo
 			return { state: maxState, servers: serversPerState[maxState] || [] };
 		});
 
-		this._store.add(actionViewItemService.register(MenuId.ChatInputAttachmentToolbar, McpServerOptionsCommand.id, (action, options) => {
+		this._store.add(actionViewItemService.register(MenuId.ChatInputAttachmentToolbar, ListMcpServerCommand.id, (action, options) => {
 			if (!(action instanceof MenuItemAction)) {
 				return undefined;
 			}

From 647e41fe87c8c6fb8435fd01642748af6f5ebb57 Mon Sep 17 00:00:00 2001
From: Josh Spicer <23246594+joshspicer@users.noreply.github.com>
Date: Fri, 14 Mar 2025 14:19:35 -0700
Subject: [PATCH 0951/1815] Boolean policy (#243594)

boolean policy
---
 package-lock.json                                      | 8 ++++----
 package.json                                           | 2 +-
 src/vs/platform/configuration/common/configurations.ts | 4 ++--
 src/vs/platform/policy/common/policy.ts                | 4 ++--
 src/vs/platform/policy/common/policyIpc.ts             | 1 -
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5563f531f7fe..f0de7edaeb1e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
         "@types/semver": "^7.5.8",
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.0",
-        "@vscode/policy-watcher": "^1.2.1",
+        "@vscode/policy-watcher": "^1.3.0",
         "@vscode/proxy-agent": "^0.32.0",
         "@vscode/ripgrep": "^1.15.11",
         "@vscode/spdlog": "^0.15.0",
@@ -2830,9 +2830,9 @@
       }
     },
     "node_modules/@vscode/policy-watcher": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.2.1.tgz",
-      "integrity": "sha512-qOiIXyt0cSj2cngkhmU5VdpwoubRrsYzglaMW7NpSlvQ/IiX3xvmBXlzjmpSMPDLQ/CKyJkMz03CZmeXuGnmCQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.3.0.tgz",
+      "integrity": "sha512-a8pPxlZlMJWOOj2NZ/2ceXgHdDU/NXo+8Pn/InV/sPBfbvTnf/MpMc4pscm9pdU4UIrTGR5+OduQW7mTK8DK7Q==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 5f0138ef2a2f..749aa92d4ddb 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "@types/semver": "^7.5.8",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
-    "@vscode/policy-watcher": "^1.2.1",
+    "@vscode/policy-watcher": "^1.3.0",
     "@vscode/proxy-agent": "^0.32.0",
     "@vscode/ripgrep": "^1.15.11",
     "@vscode/spdlog": "^0.15.0",
diff --git a/src/vs/platform/configuration/common/configurations.ts b/src/vs/platform/configuration/common/configurations.ts
index 8d2671b4de95..785523cd54b2 100644
--- a/src/vs/platform/configuration/common/configurations.ts
+++ b/src/vs/platform/configuration/common/configurations.ts
@@ -124,12 +124,12 @@ export class PolicyConfiguration extends Disposable implements IPolicyConfigurat
 				continue;
 			}
 			if (config.policy) {
-				if (config.type !== 'string' && config.type !== 'number' && config.type !== 'array' && config.type !== 'object') {
+				if (config.type !== 'string' && config.type !== 'number' && config.type !== 'array' && config.type !== 'object' && config.type !== 'boolean') {
 					this.logService.warn(`Policy ${config.policy.name} has unsupported type ${config.type}`);
 					continue;
 				}
 				keys.push(key);
-				policyDefinitions[config.policy.name] = { type: config.type === 'number' ? 'number' : 'string' };
+				policyDefinitions[config.policy.name] = { type: config.type === 'number' ? 'number' : config.type === 'boolean' ? 'boolean' : 'string' };
 			}
 		}
 
diff --git a/src/vs/platform/policy/common/policy.ts b/src/vs/platform/policy/common/policy.ts
index 5da12a2a56a9..b7313ff03ccb 100644
--- a/src/vs/platform/policy/common/policy.ts
+++ b/src/vs/platform/policy/common/policy.ts
@@ -10,8 +10,8 @@ import { Disposable } from '../../../base/common/lifecycle.js';
 import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export type PolicyName = string;
-export type PolicyValue = string | number;
-export type PolicyDefinition = { type: 'string' | 'number' };
+export type PolicyValue = string | number | boolean;
+export type PolicyDefinition = { type: 'string' | 'number' | 'boolean' };
 
 export const IPolicyService = createDecorator<IPolicyService>('policy');
 
diff --git a/src/vs/platform/policy/common/policyIpc.ts b/src/vs/platform/policy/common/policyIpc.ts
index c95719592bce..803f140ae2d4 100644
--- a/src/vs/platform/policy/common/policyIpc.ts
+++ b/src/vs/platform/policy/common/policyIpc.ts
@@ -72,5 +72,4 @@ export class PolicyChannelClient extends AbstractPolicyService implements IPolic
 			this.policies.set(name, result[name]);
 		}
 	}
-
 }

From bbbddf72da1293b5348102e781d170e332aa89ed Mon Sep 17 00:00:00 2001
From: Connor Peet <copeet@microsoft.com>
Date: Fri, 14 Mar 2025 15:32:49 -0700
Subject: [PATCH 0952/1815] mcp: cleanup tool registration to diff (#243605)

---
 .../contrib/mcp/common/mcpService.ts          | 224 +++++++++++-------
 1 file changed, 133 insertions(+), 91 deletions(-)

diff --git a/src/vs/workbench/contrib/mcp/common/mcpService.ts b/src/vs/workbench/contrib/mcp/common/mcpService.ts
index b9911400b109..5845db905843 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpService.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpService.ts
@@ -4,26 +4,35 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { Disposable, DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, IDisposable, IReference, toDisposable } from '../../../../base/common/lifecycle.js';
+import { equals } from '../../../../base/common/objects.js';
 import { autorun, IObservable, observableValue, transaction } from '../../../../base/common/observable.js';
 import { localize } from '../../../../nls.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 { StorageScope } from '../../../../platform/storage/common/storage.js';
-import { ILanguageModelToolsService, IToolResult } from '../../chat/common/languageModelToolsService.js';
+import { CountTokensCallback, ILanguageModelToolsService, IToolData, IToolImpl, IToolInvocation, IToolResult } from '../../chat/common/languageModelToolsService.js';
 import { IMcpRegistry } from './mcpRegistryTypes.js';
 import { McpServer, McpServerMetadataCache } from './mcpServer.js';
-import { IMcpServer, IMcpService, McpCollectionDefinition, McpServerDefinition, McpServerToolsState } from './mcpTypes.js';
+import { IMcpServer, IMcpService, IMcpTool, McpCollectionDefinition, McpServerDefinition, McpServerToolsState } from './mcpTypes.js';
 
+interface ISyncedToolData {
+	toolData: IToolData;
+	toolDispose: IDisposable;
+	implDispose: IDisposable;
+}
+
+type IMcpServerRec = IReference<IMcpServer>;
 
 export class McpService extends Disposable implements IMcpService {
 
 	declare _serviceBrand: undefined;
 
-	private readonly _servers = observableValue<readonly IMcpServer[]>(this, []);
-	public readonly servers: IObservable<readonly IMcpServer[]> = this._servers;
+	private readonly _servers = observableValue<readonly IMcpServerRec[]>(this, []);
+	public readonly servers: IObservable<readonly IMcpServer[]> = this._servers.map(servers => servers.map(s => s.object));
 
 	public get lazyCollectionState() { return this._mcpRegistry.lazyCollectionState; }
 
@@ -33,7 +42,7 @@ export class McpService extends Disposable implements IMcpService {
 	constructor(
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IMcpRegistry private readonly _mcpRegistry: IMcpRegistry,
-		@ILanguageModelToolsService toolsService: ILanguageModelToolsService,
+		@ILanguageModelToolsService private readonly _toolsService: ILanguageModelToolsService,
 		@IProductService productService: IProductService,
 		@ILogService private readonly _logService: ILogService,
 	) {
@@ -52,81 +61,6 @@ export class McpService extends Disposable implements IMcpService {
 			}
 			updateThrottle.schedule(500);
 		}));
-
-
-		const tools = this._register(new MutableDisposable());
-		this._register(autorun(r => {
-
-			const servers = this._servers.read(r);
-
-			// TODO@jrieken wasteful, needs some diff'ing/change-info
-			const newStore = new DisposableStore();
-
-			tools.clear();
-
-			for (const server of servers) {
-
-				for (const tool of server.tools.read(r)) {
-
-					newStore.add(toolsService.registerToolData({
-						id: tool.id,
-						displayName: tool.definition.name,
-						toolReferenceName: tool.definition.name,
-						modelDescription: tool.definition.description ?? '',
-						userDescription: tool.definition.description ?? '',
-						inputSchema: tool.definition.inputSchema,
-						canBeReferencedInPrompt: true,
-						tags: ['mcp', 'vscode_editing'] // TODO@jrieken remove this tag
-					}));
-					newStore.add(toolsService.registerToolImplementation(tool.id, {
-
-						async prepareToolInvocation(parameters, token) {
-
-							const mcpToolWarning = localize(
-								'mcp.tool.warning',
-								"MCP servers or malicious conversation content may attempt to misuse '{0}' through the installed tools. Please carefully review any requested actions.",
-								productService.nameShort
-							);
-
-							return {
-								confirmationMessages: {
-									title: localize('msg.title', "Run `{0}` from $(server) `{1}` (MCP server)", tool.definition.name, server.definition.label),
-									message: new MarkdownString(localize('msg.msg', "{0}\n\nInput:\n\n```json\n{1}\n```\n\n$(warning) {2}", tool.definition.description, JSON.stringify(parameters, undefined, 2), mcpToolWarning), { supportThemeIcons: true })
-								},
-								invocationMessage: new MarkdownString(localize('msg.run', "Running `{0}`", tool.definition.name, server.definition.label)),
-								pastTenseMessage: new MarkdownString(localize('msg.ran', "Ran `{0}` ", tool.definition.name, server.definition.label))
-							};
-						},
-
-						async invoke(invocation, countTokens, token) {
-
-							const result: IToolResult = {
-								content: []
-							};
-
-							const callResult = await tool.call(invocation.parameters as Record<string, any>, token);
-							for (const item of callResult.content) {
-								if (item.type === 'text') {
-									result.content.push({
-										kind: 'text',
-										value: item.text
-									});
-								} else {
-									// TODO@jrieken handle different item types
-								}
-							}
-
-							// result.toolResultMessage = new MarkdownString(localize('reuslt.pattern', "```json\n{0}\n```", JSON.stringify(callResult, undefined, 2)));
-
-							return result;
-						},
-					}));
-				}
-			}
-
-			tools.value = newStore;
-
-		}));
 	}
 
 	public resetCaches(): void {
@@ -142,7 +76,7 @@ export class McpService extends Disposable implements IMcpService {
 
 		// Discover any newly-collected servers with unknown tools
 		const todo: Promise<unknown>[] = [];
-		for (const server of this._servers.get()) {
+		for (const { object: server } of this._servers.get()) {
 			if (collectionIds.has(server.collection.id)) {
 				const state = server.toolsState.get();
 				if (state === McpServerToolsState.Unknown) {
@@ -154,6 +88,58 @@ export class McpService extends Disposable implements IMcpService {
 		await Promise.all(todo);
 	}
 
+	private _syncTools(server: McpServer, store: DisposableStore) {
+		const tools = new Map</* tool ID */string, ISyncedToolData>();
+
+		store.add(autorun(reader => {
+			const toDelete = new Set(tools.keys());
+			for (const tool of server.tools.read(reader)) {
+				const existing = tools.get(tool.id);
+				const toolData: IToolData = {
+					id: tool.id,
+					displayName: tool.definition.name,
+					toolReferenceName: tool.definition.name,
+					modelDescription: tool.definition.description ?? '',
+					userDescription: tool.definition.description ?? '',
+					inputSchema: tool.definition.inputSchema,
+					canBeReferencedInPrompt: true,
+					tags: ['mcp', 'vscode_editing'], // TODO@jrieken remove this tag
+				};
+
+				if (existing) {
+					if (!equals(existing.toolData, toolData)) {
+						existing.toolData = toolData;
+						existing.toolDispose.dispose();
+						existing.toolDispose = this._toolsService.registerToolData(toolData);
+					}
+					toDelete.delete(tool.id);
+				} else {
+					tools.set(tool.id, {
+						toolData,
+						toolDispose: this._toolsService.registerToolData(toolData),
+						implDispose: this._toolsService.registerToolImplementation(tool.id, this._instantiationService.createInstance(McpToolImplementation, tool, server)),
+					});
+				}
+			}
+
+			for (const id of toDelete) {
+				const tool = tools.get(id);
+				if (tool) {
+					tool.toolDispose.dispose();
+					tool.implDispose.dispose();
+					tools.delete(id);
+				}
+			}
+		}));
+
+		store.add(toDisposable(() => {
+			for (const tool of tools.values()) {
+				tool.toolDispose.dispose();
+				tool.implDispose.dispose();
+			}
+		}));
+	}
+
 	private _updateCollectedServers() {
 		const definitions = this._mcpRegistry.collections.get().flatMap(collectionDefinition =>
 			collectionDefinition.serverDefinitions.get().map(serverDefinition => ({
@@ -164,21 +150,21 @@ export class McpService extends Disposable implements IMcpService {
 
 		const nextDefinitions = new Set(definitions);
 		const currentServers = this._servers.get();
-		const nextServers: IMcpServer[] = [];
-		const pushMatch = (match: (typeof definitions)[0], server: IMcpServer) => {
+		const nextServers: IMcpServerRec[] = [];
+		const pushMatch = (match: (typeof definitions)[0], rec: IMcpServerRec) => {
 			nextDefinitions.delete(match);
-			nextServers.push(server);
-			const connection = server.connection.get();
+			nextServers.push(rec);
+			const connection = rec.object.connection.get();
 			// if the definition was modified, stop the server; it'll be restarted again on-demand
 			if (connection && !McpServerDefinition.equals(connection.definition, match.serverDefinition)) {
-				server.stop();
-				this._logService.debug(`MCP server ${server.definition.id} stopped because the definition changed`);
+				rec.object.stop();
+				this._logService.debug(`MCP server ${rec.object.definition.id} stopped because the definition changed`);
 			}
 		};
 
 		// Transfer over any servers that are still valid.
 		for (const server of currentServers) {
-			const match = definitions.find(d => defsEqual(server, d));
+			const match = definitions.find(d => defsEqual(server.object, d));
 			if (match) {
 				pushMatch(match, server);
 			} else {
@@ -188,7 +174,12 @@ export class McpService extends Disposable implements IMcpService {
 
 		// Create any new servers that are needed.
 		for (const def of nextDefinitions) {
-			nextServers.push(this._instantiationService.createInstance(McpServer, def.collectionDefinition, def.serverDefinition, false, def.collectionDefinition.scope === StorageScope.WORKSPACE ? this.workspaceCache : this.userCache));
+			const store = new DisposableStore();
+			const object = this._instantiationService.createInstance(McpServer, def.collectionDefinition, def.serverDefinition, false, def.collectionDefinition.scope === StorageScope.WORKSPACE ? this.workspaceCache : this.userCache);
+			store.add(object);
+			this._syncTools(object, store);
+
+			nextServers.push({ object, dispose: () => store.dispose() });
 		}
 
 		transaction(tx => {
@@ -197,7 +188,7 @@ export class McpService extends Disposable implements IMcpService {
 	}
 
 	public override dispose(): void {
-		this._servers.get().forEach(server => server.dispose());
+		this._servers.get().forEach(s => s.dispose());
 		super.dispose();
 	}
 }
@@ -205,3 +196,54 @@ export class McpService extends Disposable implements IMcpService {
 function defsEqual(server: IMcpServer, def: { serverDefinition: McpServerDefinition; collectionDefinition: McpCollectionDefinition }) {
 	return server.collection.id === def.collectionDefinition.id && server.definition.id === def.serverDefinition.id;
 }
+
+class McpToolImplementation implements IToolImpl {
+	constructor(
+		private readonly _tool: IMcpTool,
+		private readonly _server: IMcpServer,
+		@IProductService private readonly _productService: IProductService,
+	) { }
+
+	async prepareToolInvocation(parameters: any, token: CancellationToken) {
+		const tool = this._tool;
+		const server = this._server;
+
+		const mcpToolWarning = localize(
+			'mcp.tool.warning',
+			"MCP servers or malicious conversation content may attempt to misuse '{0}' through the installed tools. Please carefully review any requested actions.",
+			this._productService.nameShort
+		);
+
+		return {
+			confirmationMessages: {
+				title: localize('msg.title', "Run `{0}` from $(server) `{1}` (MCP server)", tool.definition.name, server.definition.label),
+				message: new MarkdownString(localize('msg.msg', "{0}\n\nInput:\n\n```json\n{1}\n```\n\n$(warning) {2}", tool.definition.description, JSON.stringify(parameters, undefined, 2), mcpToolWarning), { supportThemeIcons: true })
+			},
+			invocationMessage: new MarkdownString(localize('msg.run', "Running `{0}`", tool.definition.name, server.definition.label)),
+			pastTenseMessage: new MarkdownString(localize('msg.ran', "Ran `{0}` ", tool.definition.name, server.definition.label))
+		};
+	}
+
+	async invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, token: CancellationToken) {
+
+		const result: IToolResult = {
+			content: []
+		};
+
+		const callResult = await this._tool.call(invocation.parameters as Record<string, any>, token);
+		for (const item of callResult.content) {
+			if (item.type === 'text') {
+				result.content.push({
+					kind: 'text',
+					value: item.text
+				});
+			} else {
+				// TODO@jrieken handle different item types
+			}
+		}
+
+		// result.toolResultMessage = new MarkdownString(localize('reuslt.pattern', "```json\n{0}\n```", JSON.stringify(callResult, undefined, 2)));
+
+		return result;
+	}
+}

From 9deea7a8b00bdc7a36296a8adc635934469be721 Mon Sep 17 00:00:00 2001
From: Connor Peet <copeet@microsoft.com>
Date: Fri, 14 Mar 2025 15:37:27 -0700
Subject: [PATCH 0953/1815] MCP: polish trust dialog (#243601)

* MCP: polish trust dialog

Also make sure dialog.show() resolves when it's disposed.

Fixes #243561

* fixup tests
---
 src/vs/base/browser/ui/dialog/dialog.ts       |  3 ++-
 .../contrib/mcp/common/mcpRegistry.ts         | 19 +++++++++++--------
 .../mcp/test/common/mcpRegistry.test.ts       |  4 +++-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/vs/base/browser/ui/dialog/dialog.ts b/src/vs/base/browser/ui/dialog/dialog.ts
index 0c357a671e78..469df8e4a0dc 100644
--- a/src/vs/base/browser/ui/dialog/dialog.ts
+++ b/src/vs/base/browser/ui/dialog/dialog.ts
@@ -14,7 +14,7 @@ import { Codicon } from '../../../common/codicons.js';
 import { ThemeIcon } from '../../../common/themables.js';
 import { KeyCode, KeyMod } from '../../../common/keyCodes.js';
 import { mnemonicButtonLabel } from '../../../common/labels.js';
-import { Disposable } from '../../../common/lifecycle.js';
+import { Disposable, toDisposable } from '../../../common/lifecycle.js';
 import { isLinux, isMacintosh, isWindows } from '../../../common/platform.js';
 import './dialog.css';
 import * as nls from '../../../../nls.js';
@@ -210,6 +210,7 @@ export class Dialog extends Disposable {
 				});
 				return;
 			};
+			this._register(toDisposable(close));
 
 			const buttonBar = this.buttonBar = this._register(new ButtonBar(this.buttonsContainer));
 			const buttonMap = this.rearrangeButtons(this.buttons, this.options.cancelId);
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
index 7ffe8826dba8..fcf908372bb9 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
@@ -7,16 +7,18 @@ import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Lazy } from '../../../../base/common/lazy.js';
 import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
 import { derived, IObservable, observableValue } from '../../../../base/common/observable.js';
+import { basename } from '../../../../base/common/resources.js';
 import { localize } from '../../../../nls.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { observableMemento } from '../../../../platform/observable/common/observableMemento.js';
+import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
 import { McpRegistryInputStorage } from './mcpRegistryInputStorage.js';
 import { IMcpHostDelegate, IMcpRegistry, IMcpResolveConnectionOptions } from './mcpRegistryTypes.js';
 import { McpServerConnection } from './mcpServerConnection.js';
-import { IMcpServerConnection, LazyCollectionState, McpCollectionDefinition, McpCollectionReference, McpServerDefinition } from './mcpTypes.js';
+import { IMcpServerConnection, LazyCollectionState, McpCollectionDefinition, McpCollectionReference } from './mcpTypes.js';
 
 const createTrustMemento = observableMemento<Readonly<Record<string, boolean>>>({
 	defaultValue: {},
@@ -56,6 +58,7 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 		@IConfigurationResolverService private readonly _configurationResolverService: IConfigurationResolverService,
 		@IDialogService private readonly _dialogService: IDialogService,
 		@IStorageService private readonly _storageService: IStorageService,
+		@IProductService private readonly _productService: IProductService,
 	) {
 		super();
 	}
@@ -138,11 +141,11 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 		});
 	}
 
-	private _promptForTrust(collection: McpCollectionDefinition, definition: McpServerDefinition): Promise<boolean | undefined> {
+	private _promptForTrust(collection: McpCollectionDefinition): Promise<boolean | undefined> {
 		// Collect all trust prompts for a single config so that concurrently trying to start N
 		// servers in a config don't result in N different dialogs
 		let resultPromise = this._trustPrompts.get(collection.id);
-		resultPromise ??= this._promptForTrustOpenDialog(collection, definition).finally(() => {
+		resultPromise ??= this._promptForTrustOpenDialog(collection).finally(() => {
 			this._trustPrompts.delete(collection.id);
 		});
 		this._trustPrompts.set(collection.id, resultPromise);
@@ -150,16 +153,16 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 		return resultPromise;
 	}
 
-	private async _promptForTrustOpenDialog(collection: McpCollectionDefinition, definition: McpServerDefinition): Promise<boolean | undefined> {
+	private async _promptForTrustOpenDialog(collection: McpCollectionDefinition): Promise<boolean | undefined> {
 		const labelWithOrigin = collection.presentation?.origin
-			? `[\`${collection.label}\`](${collection.presentation.origin})`
+			? `[\`${basename(collection.presentation.origin)}\`](${collection.presentation.origin})`
 			: collection.label;
 		const result = await this._dialogService.prompt(
 			{
-				message: 'Do you trust this server?',
+				message: localize('trustTitleWithOrigin', 'Trust MCP servers from {0}?', collection.label),
 				custom: {
 					markdownDetails: [{
-						markdown: new MarkdownString(localize('mcp.trust.details', 'The Model Context Protocol server `{0}` was found from {1}.\n\nDo you want to allow running MCP servers from {1}?', definition.label, labelWithOrigin)),
+						markdown: new MarkdownString(localize('mcp.trust.details', '{0} discovered Model Context Protocol servers from {1} (`{2}`). {0} can use their capabilities in Chat.\n\nDo you want to allow running MCP servers from {3}?', this._productService.nameShort, collection.label, collection.serverDefinitions.get().map(s => s.label).join('`, `'), labelWithOrigin)),
 						dismissOnLinkClick: true,
 					}]
 				},
@@ -192,7 +195,7 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 			if (trusted) {
 				// continue
 			} else if (trusted === undefined || forceTrust) {
-				const trustValue = await this._promptForTrust(collection, definition);
+				const trustValue = await this._promptForTrust(collection);
 				if (trustValue !== undefined) {
 					this._trustMemento.value.set({ ...memento, [collection.id]: trustValue }, undefined);
 				}
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 5b971ee6544b..53deccec060e 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
@@ -27,6 +27,7 @@ import { McpServerConnection } from '../../common/mcpServerConnection.js';
 import { LazyCollectionState, McpCollectionDefinition, McpServerDefinition, McpServerTransportType } from '../../common/mcpTypes.js';
 import { TestMcpMessageTransport } from './mcpRegistryTypes.js';
 import { timeout } from '../../../../../base/common/async.js';
+import { IProductService } from '../../../../../platform/product/common/productService.js';
 
 class TestConfigurationResolverService implements Partial<IConfigurationResolverService> {
 	declare readonly _serviceBrand: undefined;
@@ -171,7 +172,8 @@ suite('Workbench - MCP - Registry', () => {
 			[ISecretStorageService, new TestSecretStorageService()],
 			[ILoggerService, store.add(new TestLoggerService())],
 			[IOutputService, upcast({ showChannel: () => { } })],
-			[IDialogService, testDialogService]
+			[IDialogService, testDialogService],
+			[IProductService, {}],
 		);
 
 		const instaService = store.add(new TestInstantiationService(services));

From 3258e0cd7e19b78e04559162e9359534588ff672 Mon Sep 17 00:00:00 2001
From: Connor Peet <copeet@microsoft.com>
Date: Fri, 14 Mar 2025 15:53:36 -0700
Subject: [PATCH 0954/1815] mcp: compress tool prefix length (#243607)

* mcp: compress tool prefix length

Use a simple sha1 hash to avoid collisions between tool names instead of
the full collection ID, fixes https://github.com/microsoft/vscode/issues/243602

* fixup tests
---
 .../contrib/mcp/common/mcpRegistry.ts         | 40 ++++++++
 .../contrib/mcp/common/mcpRegistryTypes.ts    |  3 +
 .../workbench/contrib/mcp/common/mcpServer.ts | 18 ++--
 .../mcp/test/common/mcpRegistry.test.ts       | 98 ++++++++++++++++++-
 4 files changed, 152 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
index fcf908372bb9..6ae03b715b69 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { StringSHA1 } from '../../../../base/common/hash.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Lazy } from '../../../../base/common/lazy.js';
 import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
@@ -25,6 +26,8 @@ const createTrustMemento = observableMemento<Readonly<Record<string, boolean>>>(
 	key: 'mcp.trustedCollections'
 });
 
+const collectionPrefixLen = 3;
+
 export class McpRegistry extends Disposable implements IMcpRegistry {
 	declare public readonly _serviceBrand: undefined;
 
@@ -34,6 +37,39 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 	private readonly _delegates: IMcpHostDelegate[] = [];
 	public readonly collections: IObservable<readonly McpCollectionDefinition[]> = this._collections;
 
+	private readonly _collectionToPrefixes = this._collections.map(c => {
+		// This creates tool prefixes based on a hash of the collection ID. This is
+		// a short prefix because tool names that are too long can cause errors (#243602).
+		// So we take a hash (in order for tools to be stable, because randomized
+		// names can cause hallicinations if present in history) and then adjust
+		// them if there are any collisions.
+		type CollectionHash = { view: number; hash: string; collection: McpCollectionDefinition };
+
+		const hashes = c.map((collection): CollectionHash => {
+			const sha = new StringSHA1();
+			sha.update(collection.id);
+			return { view: 0, hash: sha.digest(), collection };
+		});
+
+		const view = (h: CollectionHash) => h.hash.slice(h.view, h.view + collectionPrefixLen);
+
+		let collided = false;
+		do {
+			hashes.sort((a, b) => view(a).localeCompare(view(b)) || a.collection.id.localeCompare(b.collection.id));
+			collided = false;
+			for (let i = 1; i < hashes.length; i++) {
+				const prev = hashes[i - 1];
+				const curr = hashes[i];
+				if (view(prev) === view(curr) && curr.view + collectionPrefixLen < curr.hash.length) {
+					curr.view++;
+					collided = true;
+				}
+			}
+		} while (collided);
+
+		return Object.fromEntries(hashes.map(h => [h.collection.id, view(h) + '.']));
+	});
+
 	private readonly _workspaceStorage = new Lazy(() => this._register(this._instantiationService.createInstance(McpRegistryInputStorage, StorageScope.WORKSPACE, StorageTarget.USER)));
 	private readonly _profileStorage = new Lazy(() => this._register(this._instantiationService.createInstance(McpRegistryInputStorage, StorageScope.PROFILE, StorageTarget.USER)));
 
@@ -95,6 +131,10 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 		};
 	}
 
+	public collectionToolPrefix(collection: McpCollectionReference): IObservable<string> {
+		return this._collectionToPrefixes.map(p => p[collection.id] ?? '');
+	}
+
 	public async discoverCollections(): Promise<McpCollectionDefinition[]> {
 		const toDiscover = this._collections.get().filter(c => c.lazy && !c.lazy.isCached);
 
diff --git a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
index 3a09fdc6f2ac..e835be770b88 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpRegistryTypes.ts
@@ -40,6 +40,9 @@ export interface IMcpRegistry {
 	readonly collections: IObservable<readonly McpCollectionDefinition[]>;
 	readonly delegates: readonly IMcpHostDelegate[];
 
+	/** Gets the prefix that should be applied to a collection's tools in order to avoid ID conflicts */
+	collectionToolPrefix(collection: McpCollectionReference): IObservable<string>;
+
 	/** Whether there are new collections that can be resolved with a discover() call */
 	readonly lazyCollectionState: IObservable<LazyCollectionState>;
 	/** Discover new collections, returning newly-discovered ones. */
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServer.ts b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
index da585218c974..d1bc0e53fe07 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServer.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
@@ -110,11 +110,7 @@ export class McpServer extends Disposable implements IMcpServer {
 	private readonly toolsFromServerPromise = observableValue<ObservablePromise<readonly MCP.Tool[]> | undefined>(this, undefined);
 	private readonly toolsFromServer = derived(reader => this.toolsFromServerPromise.read(reader)?.promiseResult.read(reader)?.data);
 
-	public readonly tools = derived(reader => {
-		const serverTools = this.toolsFromServer.read(reader);
-		const definitions = serverTools ?? this.toolsFromCache ?? [];
-		return definitions.map(def => new McpTool(this, def));
-	});
+	public readonly tools: IObservable<readonly IMcpTool[]>;
 
 	public readonly toolsState = derived(reader => {
 		const fromServer = this.toolsFromServerPromise.read(reader);
@@ -183,6 +179,15 @@ export class McpServer extends Disposable implements IMcpServer {
 				this._toolCache.storeTools(definition.id, tools);
 			}
 		}));
+
+		// 4. Publish tools
+		const toolPrefix = this._mcpRegistry.collectionToolPrefix(this.collection);
+		this.tools = derived(reader => {
+			const serverTools = this.toolsFromServer.read(reader);
+			const definitions = serverTools ?? this.toolsFromCache ?? [];
+			const prefix = toolPrefix.read(reader);
+			return definitions.map(def => new McpTool(this, prefix, def));
+		});
 	}
 
 	public showOutput(): void {
@@ -302,9 +307,10 @@ export class McpTool implements IMcpTool {
 
 	constructor(
 		private readonly _server: McpServer,
+		idPrefix: string,
 		public readonly definition: MCP.Tool,
 	) {
-		this.id = `${_server.definition.id}_${definition.name}`.replaceAll('.', '_');
+		this.id = (idPrefix + definition.name).replaceAll('.', '_');
 	}
 
 	call(params: Record<string, unknown>, token?: CancellationToken): Promise<MCP.CallToolResult> {
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 53deccec060e..774878b19d28 100644
--- a/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
+++ b/src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts
@@ -24,7 +24,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 { LazyCollectionState, McpCollectionDefinition, McpServerDefinition, McpServerTransportType } from '../../common/mcpTypes.js';
+import { LazyCollectionState, McpCollectionDefinition, McpCollectionReference, McpServerDefinition, McpServerTransportType } from '../../common/mcpTypes.js';
 import { TestMcpMessageTransport } from './mcpRegistryTypes.js';
 import { timeout } from '../../../../../base/common/async.js';
 import { IProductService } from '../../../../../platform/product/common/productService.js';
@@ -492,4 +492,100 @@ suite('Workbench - MCP - Registry', () => {
 			assert.strictEqual(registry.lazyCollectionState.get(), LazyCollectionState.HasUnknown);
 		});
 	});
+
+	suite('Collection Tool Prefixes', () => {
+		test('assigns unique prefixes to collections', () => {
+			const collection1: McpCollectionDefinition = {
+				id: 'collection1',
+				label: 'Collection 1',
+				remoteAuthority: null,
+				serverDefinitions: observableValue('serverDefs', []),
+				isTrustedByDefault: true,
+				scope: StorageScope.APPLICATION
+			};
+
+			const collection2: McpCollectionDefinition = {
+				id: 'collection2',
+				label: 'Collection 2',
+				remoteAuthority: null,
+				serverDefinitions: observableValue('serverDefs', []),
+				isTrustedByDefault: true,
+				scope: StorageScope.APPLICATION
+			};
+
+			store.add(registry.registerCollection(collection1));
+			store.add(registry.registerCollection(collection2));
+
+			const prefix1 = registry.collectionToolPrefix(collection1).get();
+			const prefix2 = registry.collectionToolPrefix(collection2).get();
+
+			assert.notStrictEqual(prefix1, prefix2);
+			assert.ok(/^[a-f0-9]{3}\.$/.test(prefix1));
+			assert.ok(/^[a-f0-9]{3}\.$/.test(prefix2));
+		});
+
+		test('handles hash collisions by incrementing view', () => {
+			// These strings are known to have SHA1 hash collisions in their first 3 characters
+			const collection1: McpCollectionDefinition = {
+				id: 'potato',
+				label: 'Collection 1',
+				remoteAuthority: null,
+				serverDefinitions: observableValue('serverDefs', []),
+				isTrustedByDefault: true,
+				scope: StorageScope.APPLICATION
+			};
+
+			const collection2: McpCollectionDefinition = {
+				id: 'candidate_83048',
+				label: 'Collection 2',
+				remoteAuthority: null,
+				serverDefinitions: observableValue('serverDefs', []),
+				isTrustedByDefault: true,
+				scope: StorageScope.APPLICATION
+			};
+
+			store.add(registry.registerCollection(collection1));
+			store.add(registry.registerCollection(collection2));
+
+			const prefix1 = registry.collectionToolPrefix(collection1).get();
+			const prefix2 = registry.collectionToolPrefix(collection2).get();
+
+			assert.notStrictEqual(prefix1, prefix2);
+			assert.ok(/^[a-f0-9]{3}\.$/.test(prefix1));
+			assert.ok(/^[a-f0-9]{3}\.$/.test(prefix2));
+		});
+
+		test('prefix changes when collections change', () => {
+			const collection1: McpCollectionDefinition = {
+				id: 'collection1',
+				label: 'Collection 1',
+				remoteAuthority: null,
+				serverDefinitions: observableValue('serverDefs', []),
+				isTrustedByDefault: true,
+				scope: StorageScope.APPLICATION
+			};
+
+			const disposable = registry.registerCollection(collection1);
+			store.add(disposable);
+
+			const prefix1 = registry.collectionToolPrefix(collection1).get();
+			assert.ok(!!prefix1);
+
+			disposable.dispose();
+
+			const prefix2 = registry.collectionToolPrefix(collection1).get();
+
+			assert.strictEqual(prefix2, '');
+		});
+
+		test('prefix is empty for unknown collections', () => {
+			const unknownCollection: McpCollectionReference = {
+				id: 'unknown',
+				label: 'Unknown'
+			};
+
+			const prefix = registry.collectionToolPrefix(unknownCollection).get();
+			assert.strictEqual(prefix, '');
+		});
+	});
 });

From f99a4603d65bb05fb6db7f5a5e7549bf5700e21d Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <2644648+TylerLeonhardt@users.noreply.github.com>
Date: Fri, 14 Mar 2025 16:25:06 -0700
Subject: [PATCH 0955/1815] Initial cut of WebContentExtractorService & a fetch
 tool (#243609)

* Initial cut of WebContentExtractorService & a fetch tool

I will likely move the tool into Copilot so it can take advantage of prompt-tsx and embeddings indexing... but this is the first cut to play around with it.

This leverages Chrome DevTools Protocol's `Accessibility.getFullAXTree` command in order to get a representation of a page while marking what is useful on the page and what is not. We take the output of the command and turn it into a string that the caller can easily consume. This transformer will get more sophisticated over time to make sure we keep content that's important, and ditch content that is not.

On the tool side of things... this implements a Confirmation flow that verifies if the urls being requested is a trusted domain. We are _rendering_ these urls (albiet, sandboxed without JS) so we want to make sure they're safe. If it's not trusted, they'll be asked to confirm.

* fix naming
---
 src/vs/code/electron-main/app.ts              |   9 +
 .../common/webContentExtractor.ts             |  27 +++
 .../electron-main/cdpAccessibilityDomain.ts   | 199 ++++++++++++++++++
 .../webContentExtractorService.ts             |  73 +++++++
 .../webContentExtractorService.ts             |   9 +
 .../electron-sandbox/chat.contribution.ts     |  23 +-
 .../electron-sandbox/tools/fetchPageTool.ts   | 155 ++++++++++++++
 src/vs/workbench/workbench.desktop.main.ts    |   1 +
 .../workbench/workbench.web.main.internal.ts  |   2 +
 9 files changed, 497 insertions(+), 1 deletion(-)
 create mode 100644 src/vs/platform/webContentExtractor/common/webContentExtractor.ts
 create mode 100644 src/vs/platform/webContentExtractor/electron-main/cdpAccessibilityDomain.ts
 create mode 100644 src/vs/platform/webContentExtractor/electron-main/webContentExtractorService.ts
 create mode 100644 src/vs/platform/webContentExtractor/electron-sandbox/webContentExtractorService.ts
 create mode 100644 src/vs/workbench/contrib/chat/electron-sandbox/tools/fetchPageTool.ts

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 5bcfbd5b6541..bc7834b4c413 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -120,6 +120,8 @@ import { normalizeNFC } from '../../base/common/normalization.js';
 import { ICSSDevelopmentService, CSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js';
 import { INativeMcpDiscoveryHelperService, NativeMcpDiscoveryHelperChannelName } from '../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
 import { NativeMcpDiscoveryHelperService } from '../../platform/mcp/node/nativeMcpDiscoveryHelperService.js';
+import { IWebContentExtractorService } from '../../platform/webContentExtractor/common/webContentExtractor.js';
+import { NativeWebContentExtractorService } from '../../platform/webContentExtractor/electron-main/webContentExtractorService.js';
 
 /**
  * The main VS Code application. There will only ever be one instance,
@@ -1048,6 +1050,9 @@ export class CodeApplication extends Disposable {
 		// Native Host
 		services.set(INativeHostMainService, new SyncDescriptor(NativeHostMainService, undefined, false /* proxied to other processes */));
 
+		// Web Contents Extractor
+		services.set(IWebContentExtractorService, new SyncDescriptor(NativeWebContentExtractorService, undefined, false /* proxied to other processes */));
+
 		// Webview Manager
 		services.set(IWebviewManagerService, new SyncDescriptor(WebviewMainService));
 
@@ -1195,6 +1200,10 @@ export class CodeApplication extends Disposable {
 		mainProcessElectronServer.registerChannel('nativeHost', nativeHostChannel);
 		sharedProcessClient.then(client => client.registerChannel('nativeHost', nativeHostChannel));
 
+		// Web Content Extractor
+		const webContentExtractorChannel = ProxyChannel.fromService(accessor.get(IWebContentExtractorService), disposables);
+		mainProcessElectronServer.registerChannel('webContentExtractor', webContentExtractorChannel);
+
 		// Workspaces
 		const workspacesChannel = ProxyChannel.fromService(accessor.get(IWorkspacesService), disposables);
 		mainProcessElectronServer.registerChannel('workspaces', workspacesChannel);
diff --git a/src/vs/platform/webContentExtractor/common/webContentExtractor.ts b/src/vs/platform/webContentExtractor/common/webContentExtractor.ts
new file mode 100644
index 000000000000..5c9ab27ed41f
--- /dev/null
+++ b/src/vs/platform/webContentExtractor/common/webContentExtractor.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 { URI } from '../../../base/common/uri.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+
+export const IWebContentExtractorService = createDecorator<IWebContentExtractorService>('IWebContentExtractorService');
+
+export interface IWebContentExtractorService {
+	_serviceBrand: undefined;
+	extract(uri: URI[]): Promise<string[]>;
+}
+
+/**
+ * A service that extracts web content from a given URI.
+ * This is a placeholder implementation that does not perform any actual extraction.
+ * It's intended to be used on platforms where web content extraction is not supported such as in the browser.
+ */
+export class NullWebContentExtractorService implements IWebContentExtractorService {
+	_serviceBrand: undefined;
+
+	extract(_uri: URI[]): Promise<string[]> {
+		throw new Error('Not implemented');
+	}
+}
diff --git a/src/vs/platform/webContentExtractor/electron-main/cdpAccessibilityDomain.ts b/src/vs/platform/webContentExtractor/electron-main/cdpAccessibilityDomain.ts
new file mode 100644
index 000000000000..9e7a7c87b17b
--- /dev/null
+++ b/src/vs/platform/webContentExtractor/electron-main/cdpAccessibilityDomain.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.
+ *--------------------------------------------------------------------------------------------*/
+
+/**
+ * Contains types from https://chromedevtools.github.io/devtools-protocol/tot/Accessibility/
+ */
+
+export interface AXProperty {
+	name: string;
+	value: AXValue;
+}
+
+export interface AXValue {
+	type: string;
+	value: any;
+}
+
+export interface AXNode {
+	nodeId: string;
+	ignored?: boolean;
+	ignoredReasons?: AXProperty[];
+	role?: AXValue;
+	chromeRole?: AXValue;
+	name?: AXValue;
+	description?: AXValue;
+	value?: AXValue;
+	properties?: AXProperty[];
+	parentId?: string;
+	childIds?: string[];
+	backendDOMNodeId?: number;
+	frameId?: string;
+}
+
+/**
+ * Converts an array of AXNode objects to a readable format.
+ * It processes the nodes to extract their text content, ignoring navigation elements and
+ * formatting them in a structured way.
+ *
+ * @remarks We can do more here, but this is a good start.
+ * @param axNodes - The array of AXNode objects to be converted to a readable format.
+ * @returns string
+ */
+export function convertToReadibleFormat(axNodes: AXNode[]): string {
+	if (!axNodes.length) {
+		return '';
+	}
+
+	const nodeMap = new Map<string, AXNode>();
+	const processedNodes = new Set<string>();
+	const rootNodes: AXNode[] = [];
+
+	// Build node map and identify root nodes
+	for (const node of axNodes) {
+		nodeMap.set(node.nodeId, node);
+		if (!node.parentId || !axNodes.some(n => n.nodeId === node.parentId)) {
+			rootNodes.push(node);
+		}
+	}
+
+	function isNavigationElement(node: AXNode): boolean {
+		// Skip navigation and UI elements that don't contribute to content
+		const skipRoles = [
+			'navigation',
+			'banner',
+			'complementary',
+			'toolbar',
+			'menu',
+			'menuitem',
+			'tab',
+			'tablist'
+		];
+		const skipTexts = [
+			'Skip to main content',
+			'Toggle navigation',
+			'Previous',
+			'Next',
+			'Copy',
+			'Direct link to',
+			'On this page',
+			'Edit this page',
+			'Search',
+			'Command+K'
+		];
+
+		const text = getNodeText(node);
+		const role = node.role?.value?.toString().toLowerCase() || '';
+		// allow-any-unicode-next-line
+		return skipRoles.includes(role) ||
+			skipTexts.some(skipText => text.includes(skipText)) ||
+			text.startsWith('Direct link to') ||
+			text.startsWith('\xAB ') || // Left-pointing double angle quotation mark
+			text.endsWith(' \xBB') || // Right-pointing double angle quotation mark
+			/^#\s*$/.test(text) || // Skip standalone # characters
+			text === '\u200B'; // Zero-width space character
+	}
+
+	function getNodeText(node: AXNode): string {
+		const parts: string[] = [];
+
+		// Add name if available
+		if (node.name?.value) {
+			parts.push(String(node.name.value));
+		}
+
+		// Add value if available and different from name
+		if (node.value?.value && node.value.value !== node.name?.value) {
+			parts.push(String(node.value.value));
+		}
+
+		// Add description if available and different from name and value
+		if (node.description?.value &&
+			node.description.value !== node.name?.value &&
+			node.description.value !== node.value?.value) {
+			parts.push(String(node.description.value));
+		}
+
+		return parts.join(' ').trim();
+	}
+
+	function isCodeBlock(node: AXNode): boolean {
+		return node.role?.value === 'code' ||
+			(node.properties || []).some(p => p.name === 'code-block' || p.name === 'pre');
+	}
+
+	function processNode(node: AXNode, depth: number = 0, parentContext: { inCodeBlock: boolean; codeText: string[] } = { inCodeBlock: false, codeText: [] }): string[] {
+		if (!node || node.ignored || processedNodes.has(node.nodeId)) {
+			return [];
+		}
+
+		if (isNavigationElement(node)) {
+			return [];
+		}
+
+		processedNodes.add(node.nodeId);
+		const lines: string[] = [];
+		const text = getNodeText(node);
+		const currentIsCode = isCodeBlock(node);
+		const context = currentIsCode ? { inCodeBlock: true, codeText: [] } : parentContext;
+
+		if (text) {
+			const indent = '  '.repeat(depth);
+			if (currentIsCode || context.inCodeBlock) {
+				// For code blocks, collect text without adding newlines
+				context.codeText.push(text.trim());
+			} else {
+				lines.push(indent + text);
+			}
+		}
+
+		// Process children
+		if (node.childIds) {
+			for (const childId of node.childIds) {
+				const child = nodeMap.get(childId);
+				if (child) {
+					const childLines = processNode(child, depth + 1, context);
+					lines.push(...childLines);
+				}
+			}
+		}
+
+		// If this is the root code block node, join all collected code text
+		if (currentIsCode && context.codeText.length > 0) {
+			const indent = '  '.repeat(depth);
+			lines.push(indent + context.codeText.join(' '));
+		}
+
+		return lines;
+	}
+
+	// Process all nodes starting from roots
+	const allLines: string[] = [];
+	for (const node of rootNodes) {
+		const nodeLines = processNode(node);
+		if (nodeLines.length > 0) {
+			allLines.push(...nodeLines);
+		}
+	}
+
+	// Process any remaining unprocessed nodes
+	for (const node of axNodes) {
+		if (!processedNodes.has(node.nodeId)) {
+			const nodeLines = processNode(node);
+			if (nodeLines.length > 0) {
+				allLines.push(...nodeLines);
+			}
+		}
+	}
+
+	// Clean up empty lines and trim
+	return allLines
+		.filter((line, index, array) => {
+			// Keep the line if it's not empty or if it's not adjacent to another empty line
+			return line.trim() || (index > 0 && array[index - 1].trim());
+		})
+		.join('\n')
+		.trim();
+}
diff --git a/src/vs/platform/webContentExtractor/electron-main/webContentExtractorService.ts b/src/vs/platform/webContentExtractor/electron-main/webContentExtractorService.ts
new file mode 100644
index 000000000000..0cbfd73e6d52
--- /dev/null
+++ b/src/vs/platform/webContentExtractor/electron-main/webContentExtractorService.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 { BrowserWindow } from 'electron';
+import { IWebContentExtractorService } from '../common/webContentExtractor.js';
+import { URI } from '../../../base/common/uri.js';
+import { AXNode, convertToReadibleFormat } from './cdpAccessibilityDomain.js';
+import { Limiter } from '../../../base/common/async.js';
+import { ResourceMap } from '../../../base/common/map.js';
+
+interface CacheEntry {
+	content: string;
+	timestamp: number;
+}
+
+export class NativeWebContentExtractorService implements IWebContentExtractorService {
+	_serviceBrand: undefined;
+
+	// Only allow 3 windows to be opened at a time
+	// to avoid overwhelming the system with too many processes.
+	private _limiter = new Limiter<string>(3);
+	private _webContentsCache = new ResourceMap<CacheEntry>();
+	private readonly _cacheDuration = 24 * 60 * 60 * 1000; // 1 day in milliseconds
+
+	private isExpired(entry: CacheEntry): boolean {
+		return Date.now() - entry.timestamp > this._cacheDuration;
+	}
+
+	extract(uris: URI[]): Promise<string[]> {
+		if (uris.length === 0) {
+			return Promise.resolve([]);
+		}
+		return Promise.all(uris.map((uri) => this._limiter.queue(() => this.doExtract(uri))));
+	}
+
+	async doExtract(uri: URI): Promise<string> {
+		const cached = this._webContentsCache.get(uri);
+		if (cached) {
+			if (this.isExpired(cached)) {
+				this._webContentsCache.delete(uri);
+			} else {
+				return cached.content;
+			}
+		}
+
+		const win = new BrowserWindow({
+			width: 800,
+			height: 600,
+			show: false,
+			webPreferences: {
+				javascript: false,
+				offscreen: true,
+				sandbox: true,
+				webgl: false
+			}
+		});
+		try {
+			await win.loadURL(uri.toString(true));
+			win.webContents.debugger.attach('1.1');
+			const result: { nodes: AXNode[] } = await win.webContents.debugger.sendCommand('Accessibility.getFullAXTree');
+			const str = convertToReadibleFormat(result.nodes);
+			this._webContentsCache.set(uri, { content: str, timestamp: Date.now() });
+			return str;
+		} catch (err) {
+			console.log(err);
+		} finally {
+			win.destroy();
+		}
+		return '';
+	}
+}
diff --git a/src/vs/platform/webContentExtractor/electron-sandbox/webContentExtractorService.ts b/src/vs/platform/webContentExtractor/electron-sandbox/webContentExtractorService.ts
new file mode 100644
index 000000000000..2f6d99645767
--- /dev/null
+++ b/src/vs/platform/webContentExtractor/electron-sandbox/webContentExtractorService.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 { registerMainProcessRemoteService } from '../../ipc/electron-sandbox/services.js';
+import { IWebContentExtractorService } from '../common/webContentExtractor.js';
+
+registerMainProcessRemoteService(IWebContentExtractorService, 'webContentExtractor');
diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/chat.contribution.ts b/src/vs/workbench/contrib/chat/electron-sandbox/chat.contribution.ts
index 0e888b7f8644..6c89bb022219 100644
--- a/src/vs/workbench/contrib/chat/electron-sandbox/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/electron-sandbox/chat.contribution.ts
@@ -5,7 +5,27 @@
 
 import { InlineVoiceChatAction, QuickVoiceChatAction, StartVoiceChatAction, VoiceChatInChatViewAction, StopListeningAction, StopListeningAndSubmitAction, KeywordActivationContribution, InstallSpeechProviderForVoiceChatAction, HoldToVoiceChatInChatViewAction, ReadChatResponseAloud, StopReadAloud, StopReadChatItemAloud } from './actions/voiceChatActions.js';
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
-import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ILanguageModelToolsService } from '../common/languageModelToolsService.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.registerToolData(FetchWebPageToolData));
+		this._register(toolsService.registerToolImplementation(FetchWebPageToolData.id, editTool));
+	}
+}
 
 registerAction2(StartVoiceChatAction);
 registerAction2(InstallSpeechProviderForVoiceChatAction);
@@ -23,3 +43,4 @@ registerAction2(StopReadChatItemAloud);
 registerAction2(StopReadAloud);
 
 registerWorkbenchContribution2(KeywordActivationContribution.ID, KeywordActivationContribution, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(NativeBuiltinToolsContribution.ID, NativeBuiltinToolsContribution, WorkbenchPhase.AfterRestored);
diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/tools/fetchPageTool.ts b/src/vs/workbench/contrib/chat/electron-sandbox/tools/fetchPageTool.ts
new file mode 100644
index 000000000000..30418d3b03dc
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/electron-sandbox/tools/fetchPageTool.ts
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from '../../../../../nls.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { URI } from '../../../../../base/common/uri.js';
+import { IWebContentExtractorService } from '../../../../../platform/webContentExtractor/common/webContentExtractor.js';
+import { ITrustedDomainService } from '../../../url/browser/trustedDomainService.js';
+import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolResult } from '../../common/languageModelToolsService.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+
+export const InternalFetchWebPageToolId = 'vscode_fetchWebPage_internal';
+export const FetchWebPageToolData: IToolData = {
+	id: InternalFetchWebPageToolId,
+	displayName: 'Fetch Web Page',
+	tags: ['vscode_editing'],
+	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.'),
+	userDescription: localize('fetchWebPage.userDescription', 'Fetch the main content from a web page. This tool is useful for summarizing or analyzing the content of a webpage.'),
+	inputSchema: {
+		type: 'object',
+		properties: {
+			urls: {
+				type: 'array',
+				items: {
+					type: 'string',
+				},
+				description: localize('fetchWebPage.urlsDescription', 'An array of URLs to fetch content from.')
+			}
+		},
+		required: ['urls']
+	}
+};
+
+export class FetchWebPageTool implements IToolImpl {
+	private _alreadyApprovedDomains = new Set<string>();
+
+	constructor(
+		@IWebContentExtractorService private readonly _readerModeService: IWebContentExtractorService,
+		@ITrustedDomainService private readonly _trustedDomainService: ITrustedDomainService,
+	) { }
+
+	async invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, _token: CancellationToken): Promise<IToolResult> {
+		const { valid } = this._parseUris((invocation.parameters as { urls?: string[] }).urls);
+		if (!valid.length) {
+			return {
+				content: [{ kind: 'text', value: localize('fetchWebPage.noValidUrls', 'No valid URLs provided.') }]
+			};
+		}
+
+		for (const uri of valid) {
+			if (!this._trustedDomainService.isValid(uri)) {
+				this._alreadyApprovedDomains.add(uri.toString(true));
+			}
+		}
+
+		const result = await this._readerModeService.extract(valid);
+		// Right now there's a bug when returning multiple text content parts so we're merging into one.
+		// When that's fixed we can use the helper function _getPromptPartForWebPageContents.
+		const value = result.map((content, index) => localize(
+			'fetchWebPage.promptPart',
+			'Below is the main content extracted from the webpage ({0}). Please read and analyze this content to assist with any follow-up questions:\n\n{1}',
+			valid[index].toString(),
+			content
+		)).join('\n\n---\n\n');
+		return { content: [{ kind: 'text', value }] };
+	}
+
+	async prepareToolInvocation(parameters: any, token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
+		const { invalid, valid } = this._parseUris(parameters.urls);
+		const urlsNeedingConfirmation = valid.filter(url => !this._trustedDomainService.isValid(url) && !this._alreadyApprovedDomains.has(url.toString(true)));
+
+		const pastTenseMessage = invalid.length
+			? invalid.length > 1
+				? new MarkdownString(
+					localize(
+						'fetchWebPage.pastTenseMessage.plural',
+						'Fetched {0} web pages, but the following were invalid URLs:\n\n{1}\n\n', valid.length, invalid.map(url => `- ${url}`).join('\n')
+					))
+				: new MarkdownString(
+					localize(
+						'fetchWebPage.pastTenseMessage.singular',
+						'Fetched web page, but the following was an invalid URL:\n\n{0}\n\n', invalid[0]
+					))
+			: new MarkdownString();
+		pastTenseMessage.appendMarkdown(valid.length > 1
+			? localize('fetchWebPage.pastTenseMessageResult.plural', 'Fetched {0} web pages', valid.length)
+			: localize('fetchWebPage.pastTenseMessageResult.singular', 'Fetched [web page]({0})', valid[0].toString())
+		);
+
+		const result: IPreparedToolInvocation = {
+			invocationMessage: valid.length > 1
+				? new MarkdownString(localize('fetchWebPage.invocationMessage.plural', 'Fetching {0} web pages', valid.length))
+				: new MarkdownString(localize('fetchWebPage.invocationMessage.singular', 'Fetching [web page]({0})', valid[0].toString())),
+			pastTenseMessage
+		};
+
+		if (urlsNeedingConfirmation.length) {
+			const confirmationTitle = urlsNeedingConfirmation.length > 1
+				? localize('fetchWebPage.confirmationTitle.plural', 'Fetch untrusted web pages?')
+				: localize('fetchWebPage.confirmationTitle.singular', 'Fetch untrusted web page?');
+
+			const managedTrustedDomainsCommand = 'workbench.action.manageTrustedDomain';
+			const confirmationMessage = new MarkdownString(
+				urlsNeedingConfirmation.length > 1
+					? urlsNeedingConfirmation.map(uri => `- ${uri.toString()}`).join('\n')
+					: urlsNeedingConfirmation[0].toString(),
+				{
+					isTrusted: { enabledCommands: [managedTrustedDomainsCommand] },
+					supportThemeIcons: true
+				}
+			);
+
+			confirmationMessage.appendMarkdown(
+				'\n\n$(info)' + localize(
+					'fetchWebPage.confirmationMessageManageTrustedDomains',
+					'You can [manage your trusted domains]({0}) to skip this confirmation in the future.',
+					`command:${managedTrustedDomainsCommand}`
+				)
+			);
+
+			result.confirmationMessages = { title: confirmationTitle, message: confirmationMessage };
+		}
+
+		return result;
+	}
+
+	private _parseUris(urls?: string[]): { invalid: string[]; valid: URI[] } {
+		const invalidUrls: string[] = [];
+		const validUrls: URI[] = [];
+		urls?.forEach(uri => {
+			try {
+				const uriObj = URI.parse(uri);
+				validUrls.push(uriObj);
+			} catch (e) {
+				invalidUrls.push(uri);
+			}
+		});
+
+		return { invalid: invalidUrls, valid: validUrls };
+	}
+
+	// private _getPromptPartForWebPageContents(webPageContents: string, uri: URI): IToolResultTextPart {
+	// 	return {
+	// 		kind: 'text',
+	// 		value: localize(
+	// 			'fetchWebPage.promptPart',
+	// 			'Below is the main content extracted from the webpage ({0}). Please read and analyze this content to assist with any follow-up questions:\n\n{1}',
+	// 			uri.toString(),
+	// 			webPageContents
+	// 		)
+	// 	};
+	// }
+}
diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts
index d5c6942a1e2c..a75ca518457a 100644
--- a/src/vs/workbench/workbench.desktop.main.ts
+++ b/src/vs/workbench/workbench.desktop.main.ts
@@ -85,6 +85,7 @@ import './services/extensions/electron-sandbox/nativeExtensionService.js';
 import '../platform/userDataProfile/electron-sandbox/userDataProfileStorageService.js';
 import './services/auxiliaryWindow/electron-sandbox/auxiliaryWindowService.js';
 import '../platform/extensionManagement/electron-sandbox/extensionsProfileScannerService.js';
+import '../platform/webContentExtractor/electron-sandbox/webContentExtractorService.js';
 
 import { registerSingleton } from '../platform/instantiation/common/extensions.js';
 import { IUserDataInitializationService, UserDataInitializationService } from './services/userData/browser/userDataInit.js';
diff --git a/src/vs/workbench/workbench.web.main.internal.ts b/src/vs/workbench/workbench.web.main.internal.ts
index b9556400a5aa..ef6219a12503 100644
--- a/src/vs/workbench/workbench.web.main.internal.ts
+++ b/src/vs/workbench/workbench.web.main.internal.ts
@@ -94,6 +94,7 @@ import { ILanguagePackService } from '../platform/languagePacks/common/languageP
 import { WebLanguagePacksService } from '../platform/languagePacks/browser/languagePacks.js';
 import { IExtensionGalleryManifestService } from '../platform/extensionManagement/common/extensionGalleryManifest.js';
 import { ExtensionGalleryManifestService } from '../platform/extensionManagement/common/extensionGalleryManifestService.js';
+import { IWebContentExtractorService, NullWebContentExtractorService } from '../platform/webContentExtractor/common/webContentExtractor.js';
 
 registerSingleton(IWorkbenchExtensionManagementService, ExtensionManagementService, InstantiationType.Delayed);
 registerSingleton(IAccessibilityService, AccessibilityService, InstantiationType.Delayed);
@@ -112,6 +113,7 @@ registerSingleton(ICustomEndpointTelemetryService, NullEndpointTelemetryService,
 registerSingleton(IDiagnosticsService, NullDiagnosticsService, InstantiationType.Delayed);
 registerSingleton(ILanguagePackService, WebLanguagePacksService, InstantiationType.Delayed);
 registerSingleton(IExtensionGalleryManifestService, ExtensionGalleryManifestService, InstantiationType.Delayed);
+registerSingleton(IWebContentExtractorService, NullWebContentExtractorService, InstantiationType.Delayed);
 
 //#endregion
 

From 33af281d7a77d048d50c4f81ef303e450d5e8ec1 Mon Sep 17 00:00:00 2001
From: Aaron Munger <2019016+amunger@users.noreply.github.com>
Date: Fri, 14 Mar 2025 16:25:53 -0700
Subject: [PATCH 0956/1815] enable incrementing change within cell without code
 editor integration (#243611)

Co-authored-by: amunger <>
---
 .../chatEditingNotebookEditorIntegration.ts   | 72 +++++++++++++------
 1 file changed, 52 insertions(+), 20 deletions(-)

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 024b4e642bef..bf56d1041055 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
@@ -296,27 +296,46 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 			return undefined;
 		}
 		const change = firstOrLast ? changes[0] : changes[changes.length - 1];
-		this._revealChange(change, firstOrLast);
+		this._revealFirstOrLast(change, firstOrLast);
 	}
 
-	private _revealChange(change: ICellDiffInfo, firstOrLast: boolean = true) {
+	private _revealFirstOrLast(change: ICellDiffInfo, firstOrLast: boolean = true) {
 		switch (change.type) {
 			case 'insert':
 			case 'modified':
 				{
 					const index = firstOrLast || change.type === 'insert' ? 0 : change.diff.get().changes.length - 1;
-					// TODO: check if this breaks for inserted cells
-					const textChange = change.diff.get().changes[index];
 					const cellIntegration = this.getCell(change.modifiedCellIndex);
 					if (cellIntegration) {
 						cellIntegration.reveal(firstOrLast);
 						this._currentChange.set({ change: change, index }, undefined);
+						return true;
 					} else {
-						const cellViewModel = this.getCellViewModel(change);
-						if (cellViewModel) {
-							this.revealChangeInView(cellViewModel, textChange.modified);
-							this._currentChange.set({ change: change, index }, undefined);
-						}
+						return this._revealChange(change, index);
+					}
+				}
+			case 'delete':
+				// reveal the deleted cell decorator
+				this.insertDeleteDecorators.get()?.deletedCellDecorator.reveal(change.originalCellIndex);
+				this._currentChange.set({ change: change, index: 0 }, undefined);
+				return true;
+			default:
+				break;
+		}
+
+		return false;
+	}
+
+	private _revealChange(change: ICellDiffInfo, indexInCell: number) {
+		switch (change.type) {
+			case 'insert':
+			case 'modified':
+				{
+					const textChange = change.diff.get().changes[indexInCell];
+					const cellViewModel = this.getCellViewModel(change);
+					if (cellViewModel) {
+						this.revealChangeInView(cellViewModel, textChange.modified);
+						this._currentChange.set({ change: change, index: indexInCell }, undefined);
 					}
 
 					return true;
@@ -354,7 +373,7 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 			const firstChange = changes[0];
 
 			if (firstChange) {
-				return this._revealChange(firstChange);
+				return this._revealFirstOrLast(firstChange);
 			}
 
 			return false;
@@ -373,9 +392,12 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 						}
 					}
 
-					const nextChange = changes[changes.indexOf(currentChange.change) + 1];
-					if (nextChange) {
-						return this._revealChange(nextChange, true);
+					const isLastChangeInCell = currentChange.index === lastChangeIndex(currentChange.change);
+					const index = isLastChangeInCell ? 0 : currentChange.index + 1;
+					const change = isLastChangeInCell ? changes[changes.indexOf(currentChange.change) + 1] : currentChange.change;
+
+					if (change) {
+						return this._revealChange(change, index);
 					}
 				}
 				break;
@@ -385,7 +407,7 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 					// go to next change directly
 					const nextChange = changes[changes.indexOf(currentChange.change) + 1];
 					if (nextChange) {
-						return this._revealChange(nextChange, true);
+						return this._revealFirstOrLast(nextChange, true);
 					}
 				}
 				break;
@@ -406,7 +428,7 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 		if (!currentChange) {
 			const lastChange = changes[changes.length - 1];
 			if (lastChange) {
-				return this._revealChange(lastChange, false);
+				return this._revealFirstOrLast(lastChange, false);
 			}
 
 			return false;
@@ -425,9 +447,12 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 						}
 					}
 
-					const nextChange = changes[changes.indexOf(currentChange.change) - 1];
-					if (nextChange) {
-						return this._revealChange(nextChange, false);
+					const isFirstChangeInCell = currentChange.index === 0;
+					const index = isFirstChangeInCell ? 0 : currentChange.index - 1;
+					const change = isFirstChangeInCell ? changes[changes.indexOf(currentChange.change) - 1] : currentChange.change;
+
+					if (change) {
+						return this._revealChange(change, index);
 					}
 				}
 				break;
@@ -437,7 +462,7 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 					// go to previous change directly
 					const prevChange = changes[changes.indexOf(currentChange.change) - 1];
 					if (prevChange) {
-						return this._revealChange(prevChange, false);
+						return this._revealFirstOrLast(prevChange, false);
 					}
 				}
 				break;
@@ -448,7 +473,7 @@ class ChatEditingNotebookEditorWidgetIntegration extends Disposable implements I
 		if (wrap) {
 			const lastChange = changes[changes.length - 1];
 			if (lastChange) {
-				return this._revealChange(lastChange, false);
+				return this._revealFirstOrLast(lastChange, false);
 			}
 		}
 
@@ -582,3 +607,10 @@ function areDocumentDiff2Equal(diff1: IDocumentDiff2, diff2: IDocumentDiff2): bo
 	}
 	return true;
 }
+
+function lastChangeIndex(change: ICellDiffInfo): number {
+	if (change.type === 'modified') {
+		return change.diff.get().changes.length - 1;
+	}
+	return 0;
+}

From e56325d50d38d42d118c6e4c69e4ba0cbebf6644 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Fri, 14 Mar 2025 16:26:17 -0700
Subject: [PATCH 0957/1815] Fix multiple chat views (#243610)

---
 .../contrib/chat/browser/actions/chatToolActions.ts      | 5 +++--
 src/vs/workbench/contrib/chat/browser/chatInputPart.ts   | 9 ++++++---
 src/vs/workbench/contrib/chat/browser/chatWidget.ts      | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
index 5d71ac109d1e..c68a4840f861 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
@@ -23,6 +23,7 @@ import { isResponseVM } from '../../common/chatViewModel.js';
 import { ChatMode } from '../../common/constants.js';
 import { ILanguageModelToolsService, IToolData } from '../../common/languageModelToolsService.js';
 import { IChatWidget, IChatWidgetService } from '../chat.js';
+import { ChatInputPart } from '../chatInputPart.js';
 import { CHAT_CATEGORY } from './chatActions.js';
 
 export const AcceptToolConfirmationActionId = 'workbench.action.chat.acceptTool';
@@ -137,7 +138,7 @@ export class AttachToolsAction extends Action2 {
 			picked: true,
 		};
 
-		const nowSelectedTools = new Set(widget.input.selectedToolsModel.tools.get());
+		const nowSelectedTools = new Set(ChatInputPart.selectedToolsModel.tools.get());
 		const toolBuckets = new Map<string, BucketPick>();
 
 		for (const tool of toolsService.getTools()) {
@@ -228,7 +229,7 @@ export class AttachToolsAction extends Action2 {
 				picker.items = picks;
 				picker.selectedItems = items;
 
-				widget.input.selectedToolsModel.update(items.filter(isToolPick).map(tool => tool.tool));
+				ChatInputPart.selectedToolsModel.update(items.filter(isToolPick).map(tool => tool.tool));
 
 			} finally {
 				ignoreEvent = false;
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 77c919afc17e..0cb257267c86 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -152,7 +152,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		return this._attachmentModel;
 	}
 
-	readonly selectedToolsModel: ChatSelectedTools;
+	static selectedToolsModel: ChatSelectedTools;
 
 	public getAttachedAndImplicitContext(sessionId: string): IChatRequestVariableEntry[] {
 		const contextArr = [...this.attachmentModel.attachments];
@@ -374,7 +374,10 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		super();
 
 		this._attachmentModel = this._register(this.instantiationService.createInstance(ChatAttachmentModel));
-		this.selectedToolsModel = this._register(this.instantiationService.createInstance(ChatSelectedTools));
+		if (!ChatInputPart.selectedToolsModel) {
+			ChatInputPart.selectedToolsModel = this._register(this.instantiationService.createInstance(ChatSelectedTools));
+		}
+
 		this.dnd = this._register(this.instantiationService.createInstance(ChatDragAndDrop, this._attachmentModel, styles));
 
 		this.getInputState = (): IChatInputState => {
@@ -566,7 +569,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			this.setChatMode(ChatMode.Edit);
 		}
 
-		this.selectedToolsModel.reset();
+		ChatInputPart.selectedToolsModel.reset();
 	}
 
 	logInputHistory(): void {
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index 94776fb33b52..28837cffb805 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -1161,7 +1161,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				attachedContext,
 				noCommandDetection: options?.noCommandDetection,
 				hasInstructionAttachments: this.inputPart.hasInstructionAttachments,
-				userSelectedTools: this.inputPart.selectedToolsModel.tools.get().map(tool => tool.id)
+				userSelectedTools: ChatInputPart.selectedToolsModel.tools.get().map(tool => tool.id)
 			});
 
 			if (result) {

From 580daf039aef1a0c68c5af4104259dbcdbd5cc11 Mon Sep 17 00:00:00 2001
From: Cristopher Claeys <47442230+c-claeys@users.noreply.github.com>
Date: Sat, 15 Mar 2025 01:54:45 +0100
Subject: [PATCH 0958/1815] Increment the request attempt in the chat retry
 action (#243471)

---
 .../workbench/contrib/chat/browser/actions/chatTitleActions.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
index 180d912b0308..af49c6b07364 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
@@ -272,7 +272,7 @@ export function registerChatTitleActions() {
 			}
 			const request = chatModel?.getRequests().find(candidate => candidate.id === item.requestId);
 			const languageModelId = chatWidgetService.getWidgetBySessionId(item.sessionId)?.input.currentLanguageModel;
-			chatService.resendRequest(request!, { userSelectedModelId: languageModelId });
+			chatService.resendRequest(request!, { userSelectedModelId: languageModelId, attempt: (request?.attempt ?? -1) + 1 });
 		}
 	});
 

From 248739282e907dce7840d594c3f30a6712870523 Mon Sep 17 00:00:00 2001
From: Connor Peet <copeet@microsoft.com>
Date: Fri, 14 Mar 2025 23:32:00 -0700
Subject: [PATCH 0959/1815] mcp: support sse (#243621)

* mcp: support sse

Didn't seem like Claude Desktop configs have SSE support yet, but I did
the obvious of having an object with a `url`. I also added a `type`
(optional for stdio) so we can better disambiguate types of configs.

Example .vscode/mcp.json:

```
{
  "servers": {
    "everything": {
      "type": "sse",
      "url": "http://localhost:3001/sse"
    }
	}
}
```

Closes #243242

* update layer check
---
 build/lib/layersChecker.js                    |   1 +
 build/lib/layersChecker.ts                    |   1 +
 build/package-lock.json                       |   3 -
 eslint.config.js                              |   1 +
 package-lock.json                             |  22 +++
 package.json                                  |   1 +
 .../platform/mcp/common/mcpManagementCli.ts   |  12 +-
 .../platform/mcp/common/mcpPlatformTypes.ts   |  13 +-
 .../workbench/api/common/extHost.protocol.ts  |   2 +-
 src/vs/workbench/api/common/extHostMcp.ts     | 143 ++++++++++++++++--
 src/vs/workbench/api/common/extHostTypes.ts   |   1 +
 src/vs/workbench/api/node/extHostMpcNode.ts   |   4 +-
 .../contrib/mcp/browser/mcpCommands.ts        |   4 +-
 .../common/discovery/configMcpDiscovery.ts    |   7 +-
 .../contrib/mcp/common/mcpConfiguration.ts    |  84 ++++++----
 .../contrib/mcp/common/mcpContextKeys.ts      |  13 +-
 .../workbench/contrib/mcp/common/mcpServer.ts |   6 +
 .../workbench/contrib/mcp/common/mcpTypes.ts  |   5 +-
 ...ode.proposed.mcpConfigurationProvider.d.ts |   2 +
 19 files changed, 269 insertions(+), 56 deletions(-)

diff --git a/build/lib/layersChecker.js b/build/lib/layersChecker.js
index 8e46cb715417..2cab7b818328 100644
--- a/build/lib/layersChecker.js
+++ b/build/lib/layersChecker.js
@@ -83,6 +83,7 @@ const CORE_TYPES = [
     'Crypto',
     'SubtleCrypto',
     'JsonWebKey',
+    'MessageEvent',
 ];
 // Types that are defined in a common layer but are known to be only
 // available in native environments should not be allowed in browser
diff --git a/build/lib/layersChecker.ts b/build/lib/layersChecker.ts
index 235d2d68dbed..685dd59cb36a 100644
--- a/build/lib/layersChecker.ts
+++ b/build/lib/layersChecker.ts
@@ -82,6 +82,7 @@ const CORE_TYPES = [
 	'Crypto',
 	'SubtleCrypto',
 	'JsonWebKey',
+	'MessageEvent',
 ];
 
 // Types that are defined in a common layer but are known to be only
diff --git a/build/package-lock.json b/build/package-lock.json
index 66092130f14d..445e842c5e32 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -8,9 +8,6 @@
       "name": "code-oss-dev-build",
       "version": "1.0.0",
       "license": "MIT",
-      "dependencies": {
-        "tree-sitter-typescript": "0.23.2"
-      },
       "devDependencies": {
         "@azure/core-auth": "^1.9.0",
         "@azure/cosmos": "^3",
diff --git a/eslint.config.js b/eslint.config.js
index 8e3d288967b3..2b005721dee1 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -997,6 +997,7 @@ export default tseslint.config(
 				{
 					'target': 'src/vs/workbench/api/~',
 					'restrictions': [
+						'@c4312/eventsource-umd',
 						'vscode',
 						'vs/base/~',
 						'vs/base/parts/*/~',
diff --git a/package-lock.json b/package-lock.json
index f0de7edaeb1e..287ffc81be5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
+        "@c4312/eventsource-umd": "^3.0.5",
         "@microsoft/1ds-core-js": "^3.2.13",
         "@microsoft/1ds-post-js": "^3.2.13",
         "@parcel/watcher": "2.5.1",
@@ -941,6 +942,18 @@
       "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",
@@ -6687,6 +6700,15 @@
         "node": ">=0.8.x"
       }
     },
+    "node_modules/eventsource-parser": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.0.tgz",
+      "integrity": "sha512-T1C0XCUimhxVQzW4zFipdx0SficT651NnkR0ZSH3yQwh+mFMdLfgjABVi4YtMTtaL4s168593DaoaRLMqryavA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
     "node_modules/expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
diff --git a/package.json b/package.json
index 749aa92d4ddb..b37a901c3ad2 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,7 @@
     "update-build-ts-version": "npm install typescript@next && tsc -p ./build/tsconfig.build.json"
   },
   "dependencies": {
+    "@c4312/eventsource-umd": "^3.0.5",
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
     "@parcel/watcher": "2.5.1",
diff --git a/src/vs/platform/mcp/common/mcpManagementCli.ts b/src/vs/platform/mcp/common/mcpManagementCli.ts
index 28ff0484bab0..f25efca69997 100644
--- a/src/vs/platform/mcp/common/mcpManagementCli.ts
+++ b/src/vs/platform/mcp/common/mcpManagementCli.ts
@@ -5,9 +5,9 @@
 
 import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { ILogger } from '../../log/common/log.js';
-import { IMcpConfiguration, IMcpConfigurationServer } from './mcpPlatformTypes.js';
+import { IMcpConfiguration, IMcpConfigurationSSE, IMcpConfigurationStdio } from './mcpPlatformTypes.js';
 
-type ValidatedConfig = { name: string; config: IMcpConfigurationServer };
+type ValidatedConfig = { name: string; config: IMcpConfigurationStdio | IMcpConfigurationSSE };
 
 export class McpManagementCli {
 	constructor(
@@ -35,7 +35,7 @@ export class McpManagementCli {
 	}
 
 	private validateConfiguration(config: string): ValidatedConfig {
-		let parsed: IMcpConfigurationServer & { name: string };
+		let parsed: (IMcpConfigurationStdio | IMcpConfigurationSSE) & { name: string };
 		try {
 			parsed = JSON.parse(config);
 		} catch (e) {
@@ -46,12 +46,12 @@ export class McpManagementCli {
 			throw new InvalidMcpOperationError(`Missing name property in ${config}`);
 		}
 
-		if (!parsed.command) {
-			throw new InvalidMcpOperationError(`Missing command property in ${config}`);
+		if (!('command' in parsed) && !('url' in parsed)) {
+			throw new InvalidMcpOperationError(`Missing command or URL property in ${config}`);
 		}
 
 		const { name, ...rest } = parsed;
-		return { name, config: rest };
+		return { name, config: rest as IMcpConfigurationStdio | IMcpConfigurationSSE };
 	}
 }
 
diff --git a/src/vs/platform/mcp/common/mcpPlatformTypes.ts b/src/vs/platform/mcp/common/mcpPlatformTypes.ts
index bee43d9672ba..815ee332b40d 100644
--- a/src/vs/platform/mcp/common/mcpPlatformTypes.ts
+++ b/src/vs/platform/mcp/common/mcpPlatformTypes.ts
@@ -6,12 +6,19 @@
 export interface IMcpConfiguration {
 	inputs: unknown[];
 	/** @deprecated Only for rough cross-compat with other formats */
-	mcpServers?: Record<string, IMcpConfigurationServer>;
-	servers: Record<string, IMcpConfigurationServer>;
+	mcpServers?: Record<string, IMcpConfigurationStdio>;
+	servers: Record<string, IMcpConfigurationStdio | IMcpConfigurationSSE>;
 }
 
-export interface IMcpConfigurationServer {
+export interface IMcpConfigurationStdio {
+	type?: 'stdio';
 	command: string;
 	args?: readonly string[];
 	env?: Record<string, string | number | null>;
 }
+
+export interface IMcpConfigurationSSE {
+	type: 'sse';
+	url: string;
+	headers?: Record<string, string>;
+}
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index f302808a52b4..2c88e4106a9b 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -2970,7 +2970,7 @@ export interface ExtHostTestingShape {
 }
 
 export interface ExtHostMcpShape {
-	$startMcp(id: number, launch: McpServerLaunch): void;
+	$startMcp(id: number, launch: McpServerLaunch.Serialized): void;
 	$stopMcp(id: number): void;
 	$sendMessage(id: number, message: string): void;
 	$waitForInitialCollectionProviders(): Promise<void>;
diff --git a/src/vs/workbench/api/common/extHostMcp.ts b/src/vs/workbench/api/common/extHostMcp.ts
index 437ed6a978f4..eead33f21feb 100644
--- a/src/vs/workbench/api/common/extHostMcp.ts
+++ b/src/vs/workbench/api/common/extHostMcp.ts
@@ -3,13 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import type * as ES from '@c4312/eventsource-umd';
 import * as vscode from 'vscode';
+import { importAMDNodeModule } from '../../../amdX.js';
+import { DeferredPromise, Sequencer } from '../../../base/common/async.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
-import { DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
+import { Lazy } from '../../../base/common/lazy.js';
+import { Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { StorageScope } from '../../../platform/storage/common/storage.js';
-import { extensionPrefixedIdentifier, McpCollectionDefinition, McpServerDefinition, McpServerLaunch, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
+import { extensionPrefixedIdentifier, McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpServerLaunch, McpServerTransportSSE, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
 import { ExtHostMcpShape, MainContext, MainThreadMcpShape } from './extHost.protocol.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 
@@ -19,34 +23,52 @@ export interface IExtHostMpcService extends ExtHostMcpShape {
 	registerMcpConfigurationProvider(extension: IExtensionDescription, id: string, provider: vscode.McpConfigurationProvider): IDisposable;
 }
 
-export class ExtHostMcpService implements IExtHostMpcService {
+export class ExtHostMcpService extends Disposable implements IExtHostMpcService {
 	protected _proxy: MainThreadMcpShape;
 	private readonly _initialProviderPromises = new Set<Promise<void>>();
+	private readonly _sseEventSources = this._register(new DisposableMap<number, McpSSEHandle>());
+	private readonly _eventSource = new Lazy(async () => {
+		const es = await importAMDNodeModule<typeof ES>('@c4312/eventsource-umd', 'dist/index.umd.js');
+		return es.EventSource;
+	});
 
 	constructor(
 		@IExtHostRpcService extHostRpc: IExtHostRpcService,
 	) {
+		super();
 		this._proxy = extHostRpc.getProxy(MainContext.MainThreadMcp);
 	}
 
-	$startMcp(id: number, launch: McpServerLaunch): void {
-		// todo: SSE launches can be implemented in this common layer
+	$startMcp(id: number, launch: McpServerLaunch.Serialized): void {
+		this._startMcp(id, McpServerLaunch.fromSerialized(launch));
+	}
+
+	protected _startMcp(id: number, launch: McpServerLaunch): void {
+		if (launch.type === McpServerTransportType.SSE) {
+			this._sseEventSources.set(id, new McpSSEHandle(this._eventSource.value, id, launch, this._proxy));
+			return;
+		}
+
 		throw new Error('not implemented');
 	}
 
 	$stopMcp(id: number): void {
-		// no-op
+		if (this._sseEventSources.has(id)) {
+			this._sseEventSources.deleteAndDispose(id);
+			this._proxy.$onDidChangeState(id, { state: McpConnectionState.Kind.Stopped });
+		}
 	}
 
 	$sendMessage(id: number, message: string): void {
-		// no-op
+		this._sseEventSources.get(id)?.send(message);
 	}
 
 	async $waitForInitialCollectionProviders(): Promise<void> {
 		await Promise.all(this._initialProviderPromises);
 	}
 
-	registerMcpConfigurationProvider(extension: IExtensionDescription, id: string, provider: vscode.McpConfigurationProvider): IDisposable {
+	/** {@link vscode.lm.registerMcpConfigurationProvider} */
+	public registerMcpConfigurationProvider(extension: IExtensionDescription, id: string, provider: vscode.McpConfigurationProvider): IDisposable {
 		const store = new DisposableStore();
 
 		const metadata = extension.contributes?.modelContextServerCollections?.find(m => m.id === id);
@@ -78,7 +100,8 @@ export class ExtHostMcpService implements IExtHostMpcService {
 					launch: isSSEConfig(item)
 						? {
 							type: McpServerTransportType.SSE,
-							uri: item.uri
+							uri: item.uri,
+							headers: item.headers,
 						}
 						: {
 							type: McpServerTransportType.Stdio,
@@ -113,3 +136,105 @@ export class ExtHostMcpService implements IExtHostMpcService {
 		return store;
 	}
 }
+
+class McpSSEHandle extends Disposable {
+	private readonly _requestSequencer = new Sequencer();
+	private readonly _postEndpoint = new DeferredPromise<string>();
+	constructor(
+		eventSourceCtor: Promise<typeof ES.EventSource>,
+		private readonly _id: number,
+		launch: McpServerTransportSSE,
+		private readonly _proxy: MainThreadMcpShape
+	) {
+		super();
+		eventSourceCtor.then(EventSourceCtor => this._attach(EventSourceCtor, launch));
+	}
+
+	private _attach(EventSourceCtor: typeof ES.EventSource, launch: McpServerTransportSSE) {
+		if (this._store.isDisposed) {
+			return;
+		}
+
+		const eventSource = new EventSourceCtor(launch.uri.toString(), {
+			// recommended way to do things https://github.com/EventSource/eventsource?tab=readme-ov-file#setting-http-request-headers
+			fetch: (input, init) =>
+				fetch(input, {
+					...init,
+					headers: {
+						...Object.fromEntries(launch.headers),
+						...init?.headers,
+					},
+				}).then(async res => {
+					// we get more details on failure at this point, so handle it explicitly:
+					if (res.status >= 300) {
+						this._proxy.$onDidChangeState(this._id, { state: McpConnectionState.Kind.Error, message: `${res.status} status connecting to ${launch.uri}: ${await this._getErrText(res)}` });
+						eventSource.close();
+					}
+					return res;
+				}, err => {
+					this._proxy.$onDidChangeState(this._id, { state: McpConnectionState.Kind.Error, message: `Error connecting to ${launch.uri}: ${String(err)}` });
+
+					eventSource.close();
+					return Promise.reject(err);
+				})
+		});
+
+		this._register(toDisposable(() => eventSource.close()));
+
+		// https://github.com/modelcontextprotocol/typescript-sdk/blob/0fa2397174eba309b54575294d56754c52b13a65/src/server/sse.ts#L52
+		eventSource.addEventListener('endpoint', e => {
+			this._postEndpoint.complete(new URL(e.data, launch.uri.toString()).toString());
+		});
+
+		// https://github.com/modelcontextprotocol/typescript-sdk/blob/0fa2397174eba309b54575294d56754c52b13a65/src/server/sse.ts#L133
+		eventSource.addEventListener('message', e => {
+			this._proxy.$onDidReceiveMessage(this._id, e.data);
+		});
+
+		eventSource.addEventListener('open', () => {
+			this._proxy.$onDidChangeState(this._id, { state: McpConnectionState.Kind.Running });
+		});
+
+		eventSource.addEventListener('error', (err) => {
+			this._postEndpoint.cancel();
+			this._proxy.$onDidChangeState(this._id, {
+				state: McpConnectionState.Kind.Error,
+				message: `Error connecting to ${launch.uri}: ${err.code || 0} ${err.message || JSON.stringify(err)}`,
+			});
+			eventSource.close();
+		});
+	}
+
+	async send(message: string) {
+		// only the sending of the request needs to be sequenced
+		try {
+			const res = await this._requestSequencer.queue(async () => {
+				const endpoint = await this._postEndpoint.p;
+				const asBytes = new TextEncoder().encode(message);
+
+				return fetch(endpoint, {
+					method: 'POST',
+					headers: {
+						'Content-Type': 'application/json',
+						'Content-Length': String(asBytes.length),
+					},
+					body: asBytes,
+				});
+			});
+
+			if (res.status >= 300) {
+				this._proxy.$onDidPublishLog(this._id, `${res.status} status sending message to ${this._postEndpoint}: ${await this._getErrText(res)}`);
+			}
+		} catch (err) {
+			// ignored
+		}
+	}
+
+	private async _getErrText(res: Response) {
+		try {
+			return await res.text();
+		} catch {
+			return res.statusText;
+		}
+	}
+}
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index cb861fedc0f5..9d28387e9cc9 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -5053,6 +5053,7 @@ export class McpStdioServerDefinition implements vscode.McpStdioServerDefinition
 }
 
 export class McpSSEServerDefinition implements vscode.McpSSEServerDefinition {
+	headers: [string, string][] = [];
 	constructor(
 		public label: string,
 		public uri: URI
diff --git a/src/vs/workbench/api/node/extHostMpcNode.ts b/src/vs/workbench/api/node/extHostMpcNode.ts
index 0ad54d3c5d1a..15fb24c0a842 100644
--- a/src/vs/workbench/api/node/extHostMpcNode.ts
+++ b/src/vs/workbench/api/node/extHostMpcNode.ts
@@ -25,11 +25,11 @@ export class NodeExtHostMpcService extends ExtHostMcpService {
 		child: ChildProcessWithoutNullStreams;
 	}>();
 
-	override $startMcp(id: number, launch: McpServerLaunch): void {
+	protected override _startMcp(id: number, launch: McpServerLaunch): void {
 		if (launch.type === McpServerTransportType.Stdio) {
 			this.startNodeMpc(id, launch);
 		} else {
-			super.$startMcp(id, launch);
+			super._startMcp(id, launch);
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 8cd4acc80517..7e6491406cbe 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -43,7 +43,7 @@ export class ListMcpServerCommand extends Action2 {
 			f1: true,
 			menu: {
 				when: ContextKeyExpr.and(
-					McpContextKeys.hasUnknownTools,
+					ContextKeyExpr.or(McpContextKeys.hasUnknownTools, McpContextKeys.hasServersWithErrors),
 					ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent)
 				),
 				id: MenuId.ChatInputAttachmentToolbar,
@@ -214,7 +214,7 @@ export class MCPServerActionRendering extends Disposable implements IWorkbenchCo
 					case McpServerToolsState.RefreshingFromUnknown:
 						thisState = DisplayedState.Refreshing;
 						break;
-					case McpServerToolsState.Cached:
+					default:
 						thisState = server.connectionState.read(reader).state === McpConnectionState.Kind.Error ? DisplayedState.Error : DisplayedState.None;
 						break;
 				}
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts b/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
index 1e698b7e6b1d..04931acfe3d7 100644
--- a/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
+++ b/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
@@ -7,6 +7,7 @@ import { equals as arrayEquals } from '../../../../../base/common/arrays.js';
 import { Disposable, IDisposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../../base/common/network.js';
 import { ISettableObservable, observableValue } from '../../../../../base/common/observable.js';
+import { URI } from '../../../../../base/common/uri.js';
 import { localize } from '../../../../../nls.js';
 import { ConfigurationTarget, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
@@ -102,7 +103,11 @@ export class ConfigMcpDiscovery extends Disposable implements IMcpDiscovery {
 			const nextDefinitions = Object.entries(value?.servers || {}).map(([name, value]): McpServerDefinition => ({
 				id: `${collectionId}.${name}`,
 				label: name,
-				launch: {
+				launch: 'type' in value && value.type === 'sse' ? {
+					type: McpServerTransportType.SSE,
+					uri: URI.parse(value.url),
+					headers: Object.entries(value.headers || {}),
+				} : {
 					type: McpServerTransportType.Stdio,
 					args: value.args || [],
 					command: value.command,
diff --git a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
index 0c01707f9d76..ca95443116f2 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
@@ -10,7 +10,7 @@ import { mcpSchemaId } from '../../../services/configuration/common/configuratio
 import { inputsSchema } from '../../../services/configurationResolver/common/configurationResolverSchema.js';
 import { IExtensionPointDescriptor } from '../../../services/extensions/common/extensionsRegistry.js';
 
-export type { IMcpConfigurationServer, IMcpConfiguration } from '../../../../platform/mcp/common/mcpPlatformTypes.js';
+export type { IMcpConfigurationStdio, IMcpConfiguration } from '../../../../platform/mcp/common/mcpPlatformTypes.js';
 
 const mcpActivationEventPrefix = 'onMcpCollection:';
 
@@ -44,32 +44,64 @@ export const mcpServerSchema: IJSONSchema = {
 		servers: {
 			examples: [mcpSchemaExampleServers],
 			additionalProperties: {
-				type: 'object',
-				additionalProperties: false,
-				examples: [mcpSchemaExampleServer],
-				properties: {
-					command: {
-						type: 'string',
-						description: localize('app.mcp.json.command', "The command to run the server.")
-					},
-					args: {
-						type: 'array',
-						description: localize('app.mcp.args.command', "Arguments passed to the server."),
-						items: {
-							type: 'string'
+				oneOf: [{
+					type: 'object',
+					additionalProperties: false,
+					examples: [mcpSchemaExampleServer],
+					properties: {
+						type: {
+							type: 'string',
+							enum: ['stdio'],
+							description: localize('app.mcp.json.type', "The type of the server.")
 						},
-					},
-					env: {
-						description: localize('app.mcp.env.command', "Environment variables passed to the server."),
-						additionalProperties: {
-							anyOf: [
-								{ type: 'null' },
-								{ type: 'string' },
-								{ type: 'number' },
-							]
-						}
-					},
-				}
+						command: {
+							type: 'string',
+							description: localize('app.mcp.json.command', "The command to run the server.")
+						},
+						args: {
+							type: 'array',
+							description: localize('app.mcp.args.command', "Arguments passed to the server."),
+							items: {
+								type: 'string'
+							},
+						},
+						env: {
+							description: localize('app.mcp.env.command', "Environment variables passed to the server."),
+							additionalProperties: {
+								anyOf: [
+									{ type: 'null' },
+									{ type: 'string' },
+									{ type: 'number' },
+								]
+							}
+						},
+					}
+				}, {
+					type: 'object',
+					additionalProperties: false,
+					required: ['url', 'type'],
+					examples: [{
+						type: 'sse',
+						url: 'http://localhost:3001',
+						headers: {},
+					}],
+					properties: {
+						type: {
+							type: 'string',
+							enum: ['sse'],
+							description: localize('app.mcp.json.type', "The type of the server.")
+						},
+						url: {
+							type: 'string',
+							format: 'uri',
+							description: localize('app.mcp.json.url', "The URL of the server-sent-event (SSE) server.")
+						},
+						env: {
+							description: localize('app.mcp.json.headers', "Additional headers sent to the server."),
+							additionalProperties: { type: 'string' },
+						},
+					}
+				}]
 			}
 		},
 		inputs: inputsSchema.definitions!.inputs
diff --git a/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts b/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
index 6bade4f4f511..0d0aff9aa6d3 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpContextKeys.ts
@@ -8,14 +8,23 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import { autorun } from '../../../../base/common/observable.js';
 import { localize } from '../../../../nls.js';
 import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { bindContextKey } from '../../../../platform/observable/common/platformObservableUtils.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { LazyCollectionState, IMcpService, McpServerToolsState } from './mcpTypes.js';
+import { LazyCollectionState, IMcpService, McpServerToolsState, McpConnectionState } from './mcpTypes.js';
 
 
 export namespace McpContextKeys {
 
 	export const serverCount = new RawContextKey<number>('mcp.serverCount', undefined, { type: 'number', description: localize('mcp.serverCount.description', "Context key that has the number of registered MCP servers") });
 	export const hasUnknownTools = new RawContextKey<boolean>('mcp.hasUnknownTools', undefined, { type: 'boolean', description: localize('mcp.hasUnknownTools.description', "Indicates whether there are MCP servers with unknown tools.") });
+	/**
+	 * A context key that indicates whether there are any servers with errors.
+	 *
+	 * @type {boolean}
+	 * @default undefined
+	 * @description This key is used to track the presence of servers with errors in the MCP context.
+	 */
+	export const hasServersWithErrors = new RawContextKey<boolean>('mcp.hasServersWithErrors', undefined, { type: 'boolean', description: localize('mcp.hasServersWithErrors.description', "Indicates whether there are any MCP servers with errors.") });
 	export const toolsCount = new RawContextKey<number>('mcp.toolsCount', undefined, { type: 'number', description: localize('mcp.toolsCount.description', "Context key that has the number of registered MCP tools") });
 }
 
@@ -34,6 +43,8 @@ export class McpContextKeysController extends Disposable implements IWorkbenchCo
 		const ctxToolsCount = McpContextKeys.toolsCount.bindTo(contextKeyService);
 		const ctxHasUnknownTools = McpContextKeys.hasUnknownTools.bindTo(contextKeyService);
 
+		this._store.add(bindContextKey(McpContextKeys.hasServersWithErrors, contextKeyService, r => mcpService.servers.read(r).some(c => c.connectionState.read(r).state === McpConnectionState.Kind.Error)));
+
 		this._store.add(autorun(r => {
 			const servers = mcpService.servers.read(r);
 			const serverTools = servers.map(s => s.tools.read(r));
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServer.ts b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
index d1bc0e53fe07..640f98da8ca3 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpServer.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
@@ -209,6 +209,12 @@ export class McpServer extends Disposable implements IMcpServer {
 			}
 
 			let connection = this._connection.get();
+			if (connection && McpConnectionState.canBeStarted(connection.state.get().state)) {
+				connection.dispose();
+				connection = undefined;
+				this._connection.set(connection, undefined);
+			}
+
 			if (!connection) {
 				connection = await this._mcpRegistry.resolveConnection({
 					collectionRef: this.collection,
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
index 4e9a22e75760..db12df70ab62 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
@@ -262,6 +262,7 @@ export interface McpServerTransportStdio {
 export interface McpServerTransportSSE {
 	readonly type: McpServerTransportType.SSE;
 	readonly uri: URI;
+	readonly headers: [string, string][];
 }
 
 export type McpServerLaunch =
@@ -270,7 +271,7 @@ export type McpServerLaunch =
 
 export namespace McpServerLaunch {
 	export type Serialized =
-		| { type: McpServerTransportType.SSE; uri: UriComponents }
+		| { type: McpServerTransportType.SSE; uri: UriComponents; headers: [string, string][] }
 		| { type: McpServerTransportType.Stdio; cwd: UriComponents | undefined; command: string; args: readonly string[]; env: Record<string, string | number | null> };
 
 	export function toSerialized(launch: McpServerLaunch): McpServerLaunch.Serialized {
@@ -280,7 +281,7 @@ export namespace McpServerLaunch {
 	export function fromSerialized(launch: McpServerLaunch.Serialized): McpServerLaunch {
 		switch (launch.type) {
 			case McpServerTransportType.SSE:
-				return { type: launch.type, uri: URI.revive(launch.uri) };
+				return { type: launch.type, uri: URI.revive(launch.uri), headers: launch.headers };
 			case McpServerTransportType.Stdio:
 				return {
 					type: launch.type,
diff --git a/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts b/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts
index ac1c7e4de6d7..28a9c7b2f36e 100644
--- a/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts
+++ b/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts
@@ -24,6 +24,8 @@ declare module 'vscode' {
 
 		uri: Uri;
 
+		headers: [string, string][];
+
 		constructor(label: string, uri: Uri);
 	}
 

From c45eab83be37d013e01f667697504e606c20ec28 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sat, 15 Mar 2025 00:22:40 -0700
Subject: [PATCH 0960/1815] Make agent welcome content declared on the agent as
 metadata (#243618)

* Make agent welcome content declared on the agent as metadata
To make it easier when switching modes

* Remove internal plumbing

* Fix sample questions

* bump version
---
 .../common/extensionsApiProposals.ts          |  2 +-
 .../api/browser/mainThreadChatAgents2.ts      |  3 -
 .../workbench/api/common/extHost.protocol.ts  |  5 +-
 .../api/common/extHostChatAgents2.ts          | 46 ++++--------
 .../browser/actions/chatExecuteActions.ts     |  6 +-
 .../contrib/chat/browser/chat.contribution.ts |  3 +-
 .../contrib/chat/browser/chatSetup.ts         | 75 +++++++++----------
 .../contrib/chat/browser/chatWidget.ts        | 29 ++++---
 .../viewsWelcome/chatViewWelcomeController.ts |  9 +--
 .../contrib/chat/common/chatAgents.ts         |  1 +
 .../contrib/chat/common/chatServiceImpl.ts    |  3 +-
 ...scode.proposed.defaultChatParticipant.d.ts |  4 +-
 12 files changed, 89 insertions(+), 97 deletions(-)

diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index b4b84ba3e389..8c447180ba47 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -151,7 +151,7 @@ const _allApiProposals = {
 	},
 	defaultChatParticipant: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts',
-		version: 2
+		version: 3
 	},
 	diffCommand: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.diffCommand.d.ts',
diff --git a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
index 220e9c2854f6..0da8d2a09f16 100644
--- a/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
+++ b/src/vs/workbench/api/browser/mainThreadChatAgents2.ts
@@ -175,9 +175,6 @@ export class MainThreadChatAgents2 extends Disposable implements MainThreadChatA
 
 				return this._proxy.$provideFollowups(request, handle, result, { history }, token);
 			},
-			provideWelcomeMessage: (token: CancellationToken) => {
-				return this._proxy.$provideWelcomeMessage(handle, token);
-			},
 			provideChatTitle: (history, token) => {
 				return this._proxy.$provideChatTitle(handle, history, token);
 			},
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 2c88e4106a9b..f95ba612466e 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -51,7 +51,7 @@ 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, IChatWelcomeMessageContent } from '../../contrib/chat/common/chatAgents.js';
+import { IChatAgentMetadata, IChatAgentRequest, IChatAgentResult } from '../../contrib/chat/common/chatAgents.js';
 import { ICodeMapperRequest, ICodeMapperResult } from '../../contrib/chat/common/chatCodeMapperService.js';
 import { IChatRelatedFile, IChatRelatedFileProviderMetadata as IChatRelatedFilesProviderMetadata, IChatRequestDraft } from '../../contrib/chat/common/chatEditingService.js';
 import { IChatProgressHistoryResponseContent } from '../../contrib/chat/common/chatModel.js';
@@ -61,7 +61,7 @@ import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { IChatMessage, IChatResponseFragment, ILanguageModelChatMetadata, ILanguageModelChatSelector, ILanguageModelsChangeEvent } from '../../contrib/chat/common/languageModels.js';
 import { IPreparedToolInvocation, IToolData, IToolInvocation, IToolResult } from '../../contrib/chat/common/languageModelToolsService.js';
 import { DebugConfigurationProviderTriggerKind, IAdapterDescriptor, IConfig, IDebugSessionReplMode, IDebugTestRunReference, IDebugVisualization, IDebugVisualizationContext, IDebugVisualizationTreeItem, MainThreadDebugVisualization } from '../../contrib/debug/common/debug.js';
-import { McpServerLaunch, McpConnectionState, McpServerDefinition, McpCollectionDefinition } from '../../contrib/mcp/common/mcpTypes.js';
+import { McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpServerLaunch } from '../../contrib/mcp/common/mcpTypes.js';
 import * as notebookCommon from '../../contrib/notebook/common/notebookCommon.js';
 import { CellExecutionUpdateType } from '../../contrib/notebook/common/notebookExecutionService.js';
 import { ICellExecutionComplete, ICellExecutionStateUpdate } from '../../contrib/notebook/common/notebookExecutionStateService.js';
@@ -1358,7 +1358,6 @@ export interface ExtHostChatAgentsShape2 {
 	$acceptFeedback(handle: number, result: IChatAgentResult, voteAction: IChatVoteAction): void;
 	$acceptAction(handle: number, result: IChatAgentResult, action: IChatUserActionEvent): void;
 	$invokeCompletionProvider(handle: number, query: string, token: CancellationToken): Promise<IChatAgentCompletionItem[]>;
-	$provideWelcomeMessage(handle: number, token: CancellationToken): Promise<IChatWelcomeMessageContent | undefined>;
 	$provideChatTitle(handle: number, context: IChatAgentHistoryEntryDto[], token: CancellationToken): Promise<string | undefined>;
 	$provideSampleQuestions(handle: number, location: ChatAgentLocation, token: CancellationToken): Promise<IChatFollowup[] | undefined>;
 	$releaseSession(sessionId: string): void;
diff --git a/src/vs/workbench/api/common/extHostChatAgents2.ts b/src/vs/workbench/api/common/extHostChatAgents2.ts
index 178aef64639b..d72fa520c153 100644
--- a/src/vs/workbench/api/common/extHostChatAgents2.ts
+++ b/src/vs/workbench/api/common/extHostChatAgents2.ts
@@ -13,7 +13,6 @@ import { Iterable } from '../../../base/common/iterator.js';
 import { Disposable, DisposableMap, DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
 import { revive } from '../../../base/common/marshalling.js';
 import { StopWatch } from '../../../base/common/stopwatch.js';
-import { ThemeIcon } from '../../../base/common/themables.js';
 import { assertType } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
 import { generateUuid } from '../../../base/common/uuid.js';
@@ -21,7 +20,7 @@ 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, IChatWelcomeMessageContent } from '../../contrib/chat/common/chatAgents.js';
+import { IChatAgentRequest, IChatAgentResult, IChatAgentResultTimings } 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 { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
@@ -32,9 +31,9 @@ import { CommandsConverter, ExtHostCommands } from './extHostCommands.js';
 import { ExtHostDiagnostics } from './extHostDiagnostics.js';
 import { ExtHostDocuments } from './extHostDocuments.js';
 import { ExtHostLanguageModels } from './extHostLanguageModels.js';
+import { ExtHostLanguageModelTools } from './extHostLanguageModelTools.js';
 import * as typeConvert from './extHostTypeConverters.js';
 import * as extHostTypes from './extHostTypes.js';
-import { ExtHostLanguageModelTools } from './extHostLanguageModelTools.js';
 
 class ChatAgentResponseStream {
 
@@ -682,15 +681,6 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		return items.map((i) => typeConvert.ChatAgentCompletionItem.from(i, this._commands.converter, disposables));
 	}
 
-	async $provideWelcomeMessage(handle: number, token: CancellationToken): Promise<IChatWelcomeMessageContent | undefined> {
-		const agent = this._agents.get(handle);
-		if (!agent) {
-			return;
-		}
-
-		return await agent.provideWelcomeMessage(token);
-	}
-
 	async $provideChatTitle(handle: number, context: IChatAgentHistoryEntryDto[], token: CancellationToken): Promise<string | undefined> {
 		const agent = this._agents.get(handle);
 		if (!agent) {
@@ -739,6 +729,7 @@ class ExtHostChatAgent {
 	private _supportIssueReporting: boolean | undefined;
 	private _agentVariableProvider?: { provider: vscode.ChatParticipantCompletionItemProvider; triggerCharacters: string[] };
 	private _welcomeMessageProvider?: vscode.ChatWelcomeMessageProvider | undefined;
+	private _welcomeMessageContent?: vscode.ChatWelcomeMessageContent | undefined;
 	private _titleProvider?: vscode.ChatTitleProvider | undefined;
 	private _requester: vscode.ChatRequesterInformation | undefined;
 	private _pauseStateEmitter = new Emitter<vscode.ChatParticipantPauseStateEvent>();
@@ -787,24 +778,6 @@ class ExtHostChatAgent {
 			.filter(f => !(f && 'message' in f));
 	}
 
-	async provideWelcomeMessage(token: CancellationToken): Promise<IChatWelcomeMessageContent | undefined> {
-		if (!this._welcomeMessageProvider?.provideWelcomeMessage) {
-			return undefined;
-		}
-
-		const content = await this._welcomeMessageProvider.provideWelcomeMessage(token);
-		const icon = content?.icon; // typescript
-		if (!content || !ThemeIcon.isThemeIcon(icon)) {
-			return undefined;
-		}
-
-		return {
-			...content,
-			icon,
-			message: typeConvert.MarkdownString.from(content.message),
-		};
-	}
-
 	async provideTitle(context: vscode.ChatContext, token: CancellationToken): Promise<string | undefined> {
 		if (!this._titleProvider) {
 			return;
@@ -853,6 +826,10 @@ class ExtHostChatAgent {
 					helpTextPostfix: (!this._helpTextPostfix || typeof this._helpTextPostfix === 'string') ? this._helpTextPostfix : typeConvert.MarkdownString.from(this._helpTextPostfix),
 					supportIssueReporting: this._supportIssueReporting,
 					requester: this._requester,
+					welcomeMessageContent: this._welcomeMessageContent && {
+						...this._welcomeMessageContent,
+						message: typeConvert.MarkdownString.from(this._welcomeMessageContent.message),
+					}
 				});
 				updateScheduled = false;
 			});
@@ -958,6 +935,15 @@ class ExtHostChatAgent {
 				checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
 				return that._welcomeMessageProvider;
 			},
+			set welcomeMessageContent(v) {
+				checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
+				that._welcomeMessageContent = v;
+				updateMetadataSoon();
+			},
+			get welcomeMessageContent() {
+				checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
+				return that._welcomeMessageContent;
+			},
 			set titleProvider(v) {
 				checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
 				that._titleProvider = v;
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index 078700c1e470..9574814ac931 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -148,6 +148,11 @@ class ToggleChatModeAction extends Action2 {
 			return;
 		}
 
+		const arg = args.at(0) as IToggleChatModeArgs | undefined;
+		if (arg?.mode === context.chatWidget.input.currentMode) {
+			return;
+		}
+
 		// TODO will not require discarding the session when we are able to switch modes mid-session
 		const entries = context.editingSession?.entries.get();
 		if (context.editingSession && entries && entries.length > 0 && entries.some(entry => entry.state.get() === WorkingSetEntryState.Modified)) {
@@ -170,7 +175,6 @@ class ToggleChatModeAction extends Action2 {
 			}
 		}
 
-		const arg = args[0] as IToggleChatModeArgs | undefined;
 		if (arg?.mode) {
 			context.chatWidget.input.setChatMode(arg.mode);
 		} else {
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 44e22da5cada..332ac088d7b3 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -207,7 +207,8 @@ configurationRegistry.registerConfiguration({
 		'chat.experimental.setupFromDialog': { // TODO@bpasero remove this eventually
 			type: 'boolean',
 			description: nls.localize('chat.setupFromChat', "Controls whether Copilot setup starts from a dialog or from the welcome view."),
-			default: product.quality !== 'stable',
+			// default: product.quality !== 'stable',
+			default: false,
 			tags: ['experimental', 'onExp']
 		},
 		[mcpConfigurationSection]: {
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index c09f41a85bb4..34b679d5840f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -3,66 +3,66 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import './media/chatViewSetup.css';
 import { $, getActiveElement, setVisibility } from '../../../../base/browser/dom.js';
 import { ButtonWithDropdown } from '../../../../base/browser/ui/button/button.js';
 import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { mainWindow } from '../../../../base/browser/window.js';
 import { toAction, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../base/common/actions.js';
 import { timeout } from '../../../../base/common/async.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 { combinedDisposable, Disposable, DisposableStore, IDisposable, 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 { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/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 } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { ICustomDialogHTMLElement, IDialogService } from '../../../../platform/dialogs/common/dialogs.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 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 { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { 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 { ExtensionUrlHandlerOverrideRegistry } from '../../../services/extensions/browser/extensionUrlHandler.js';
+import { 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 { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
-import { ChatAgentLocation, IChatAgentImplementation, IChatAgentRequest, IChatAgentResult, IChatAgentService } from '../common/chatAgents.js';
+import { ChatAgentLocation, IChatAgentImplementation, IChatAgentRequest, IChatAgentResult, IChatAgentService, IChatWelcomeMessageContent } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
+import { ChatEntitlement, ChatEntitlementService, ChatSetupContext, ChatSetupRequests, IChatEntitlementService } from '../common/chatEntitlementService.js';
+import { IChatProgress, IChatProgressMessage, IChatWarningMessage } from '../common/chatService.js';
 import { CHAT_CATEGORY, CHAT_SETUP_ACTION_ID } from './actions/chatActions.js';
 import { ChatViewId, EditsViewId, ensureSideBarChatViewSize, preferCopilotEditsView, showCopilotView } from './chat.js';
 import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
+import './media/chatViewSetup.css';
 import { ChatViewsWelcomeExtensions, IChatViewsWelcomeContributionRegistry } from './viewsWelcome/chatViewsWelcome.js';
-import { mainWindow } from '../../../../base/browser/window.js';
-import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { URI } from '../../../../base/common/uri.js';
-import { IHostService } from '../../../services/host/browser/host.js';
-import Severity from '../../../../base/common/severity.js';
-import { ExtensionUrlHandlerOverrideRegistry } from '../../../services/extensions/browser/extensionUrlHandler.js';
-import { IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js';
-import { toErrorMessage } from '../../../../base/common/errorMessage.js';
-import { StopWatch } from '../../../../base/common/stopwatch.js';
-import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
-import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
-import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
-import { equalsIgnoreCase } from '../../../../base/common/strings.js';
-import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
-import { IChatEntitlementService, ChatEntitlement, ChatEntitlementService, ChatSetupContext, ChatSetupRequests } from '../common/chatEntitlementService.js';
-import { isObject } from '../../../../base/common/types.js';
-import { nullExtensionDescription } from '../../../services/extensions/common/extensions.js';
-import { IChatProgress, IChatProgressMessage, IChatWarningMessage } from '../common/chatService.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -102,6 +102,18 @@ class SetupChatAgentImplementation implements IChatAgentImplementation {
 
 			const id = location === ChatAgentLocation.Panel ? 'setup.chat' : 'setup.edits';
 
+			const welcomeMessageContent: IChatWelcomeMessageContent = location === ChatAgentLocation.Panel ?
+				{
+					title: localize('chatTitle', "Ask Copilot"),
+					message: new MarkdownString(localize('chatMessage', "Copilot is powered by AI, so mistakes are possible. Review output carefully before use.")),
+					icon: Codicon.copilotLarge
+				} :
+				{
+					title: localize('editsTitle', "Edit with Copilot"),
+					message: new MarkdownString(localize('editsMessage', "Start your editing session by defining a set of files that you want to work with. Then ask Copilot for the changes you want to make.")),
+					icon: Codicon.copilotLarge
+				};
+
 			return combinedDisposable(
 				chatAgentService.registerAgent(id, {
 					id,
@@ -111,19 +123,20 @@ class SetupChatAgentImplementation implements IChatAgentImplementation {
 					slashCommands: [],
 					disambiguation: [],
 					locations: [location],
-					metadata: {},
+					metadata: {
+						welcomeMessageContent
+					},
 					description: location === ChatAgentLocation.Panel ? localize('chatDescription', "Ask Copilot") : localize('editsDescription', "Edit files in your workspace"),
 					extensionId: nullExtensionDescription.identifier,
 					extensionDisplayName: nullExtensionDescription.name,
 					extensionPublisherId: nullExtensionDescription.publisher
 				}),
-				chatAgentService.registerAgentImplementation(id, instantiationService.createInstance(SetupChatAgentImplementation, location, context, controller))
+				chatAgentService.registerAgentImplementation(id, instantiationService.createInstance(SetupChatAgentImplementation, context, controller))
 			);
 		});
 	}
 
 	constructor(
-		private readonly location: ChatAgentLocation,
 		private readonly context: ChatSetupContext,
 		private readonly controller: Lazy<ChatSetupController>,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -190,22 +203,6 @@ class SetupChatAgentImplementation implements IChatAgentImplementation {
 
 		return {};
 	}
-
-	provideWelcomeMessage() {
-		if (this.location === ChatAgentLocation.Panel) {
-			return {
-				title: localize('chatTitle', "Ask Copilot"),
-				message: new MarkdownString(localize('chatMessage', "Copilot is powered by AI, so mistakes are possible. Review output carefully before use.")),
-				icon: Codicon.copilotLarge
-			};
-		}
-
-		return {
-			title: localize('editsTitle', "Edit with Copilot"),
-			message: new MarkdownString(localize('editsMessage', "Start your editing session by defining a set of files that you want to work with. Then ask Copilot for the changes you want to make.")),
-			icon: Codicon.copilotLarge
-		};
-	}
 }
 
 class ChatSetupDialog {
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index 28837cffb805..7ef600cfe3e1 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -152,6 +152,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	private container!: HTMLElement;
 	private welcomeMessageContainer!: HTMLElement;
 	private persistedWelcomeMessage: IChatWelcomeMessageContent | undefined;
+	private readonly welcomePart: MutableDisposable<ChatViewWelcomePart> = this._register(new MutableDisposable());
 
 	private bodyDimension: dom.Dimension | undefined;
 	private visibleChangeCount = 0;
@@ -480,7 +481,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 		this.container = dom.append(parent, $('.interactive-session'));
 		this.welcomeMessageContainer = dom.append(this.container, $('.chat-welcome-view-container', { style: 'display: none' }));
-		this.renderWelcomeViewContentIfNeeded();
 		if (renderInputOnTop) {
 			this.createInput(this.container, { renderFollowups, renderStyle });
 			this.listContainer = dom.append(this.container, $(`.interactive-list`));
@@ -489,6 +489,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			this.createInput(this.container, { renderFollowups, renderStyle });
 		}
 
+		this.renderWelcomeViewContentIfNeeded();
 		this.createList(this.listContainer, { ...this.viewOptions.rendererOptions, renderStyle });
 
 		const scrollDownButton = this._register(new Button(this.listContainer, {
@@ -625,7 +626,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			if (this.lastItem && isResponseVM(this.lastItem) && this.lastItem.isComplete) {
 				this.renderFollowups(this.lastItem.replyFollowups, this.lastItem);
 			} else if (!treeItems.length && this.viewModel) {
-				this.renderFollowups(this.viewModel.model.sampleQuestions);
+				this.renderSampleQuestions();
 			} else {
 				this.renderFollowups(undefined);
 			}
@@ -638,21 +639,22 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		}
 
 		const numItems = this.viewModel?.getItems().length ?? 0;
-		const welcomeContent = this.viewModel?.model.welcomeMessage ?? this.persistedWelcomeMessage;
-		if (welcomeContent && !numItems && (this.welcomeMessageContainer.children.length === 0 || this.location === ChatAgentLocation.EditingSession)) {
+		const defaultAgent = this.chatAgentService.getDefaultAgent(this.location, this.input.currentMode);
+		const welcomeContent = defaultAgent?.metadata.welcomeMessageContent ?? this.persistedWelcomeMessage;
+		if (welcomeContent && !numItems && (this.welcomeMessageContainer.children.length === 0 || this.chatService.unifiedViewEnabled)) {
 			dom.clearNode(this.welcomeMessageContainer);
 			const tips = this.viewOptions.supportsAdditionalParticipants
 				? new MarkdownString(localize('chatWidget.tips', "{0} or type {1} to attach context\n\n{2} to chat with extensions\n\nType {3} to use commands", '$(attach)', '#', '$(mention)', '/'), { supportThemeIcons: true })
 				: new MarkdownString(localize('chatWidget.tips.withoutParticipants', "{0} or type {1} to attach context", '$(attach)', '#'), { supportThemeIcons: true });
-			const welcomePart = this._register(this.instantiationService.createInstance(
+			this.welcomePart.value = this.instantiationService.createInstance(
 				ChatViewWelcomePart,
 				{ ...welcomeContent, tips, },
 				{
 					location: this.location,
 					isWidgetAgentWelcomeViewContent: this.input?.currentMode === ChatMode.Agent
 				}
-			));
-			dom.append(this.welcomeMessageContainer, welcomePart.element);
+			);
+			dom.append(this.welcomeMessageContainer, this.welcomePart.value.element);
 		}
 
 		if (this.viewModel) {
@@ -672,6 +674,13 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		}
 	}
 
+	private renderSampleQuestions() {
+		if (this.viewModel) {
+			// TODO@roblourens hack- only Chat mode supports sample questions
+			this.renderFollowups(this.input.currentMode === ChatMode.Chat ? this.viewModel.model.sampleQuestions : undefined);
+		}
+	}
+
 	private async renderFollowups(items: IChatFollowup[] | undefined, response?: IChatResponseViewModel): Promise<void> {
 		this.inputPart.renderFollowups(items, response);
 
@@ -931,6 +940,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			this.renderWelcomeViewContentIfNeeded();
 		}));
 		this._register(this.input.onDidChangeCurrentChatMode(() => {
+			this.renderSampleQuestions();
 			this.renderWelcomeViewContentIfNeeded();
 		}));
 	}
@@ -1360,8 +1370,9 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	saveState(): void {
 		this.inputPart.saveState();
 
-		if (this.viewModel?.model.welcomeMessage) {
-			this.storageService.store(`${PersistWelcomeMessageContentKey}.${this.location}`, this.viewModel?.model.welcomeMessage, StorageScope.APPLICATION, StorageTarget.MACHINE);
+		const welcomeContent = this.chatAgentService.getDefaultAgent(this.location, this.input.currentMode)?.metadata.welcomeMessageContent;
+		if (welcomeContent) {
+			this.storageService.store(`${PersistWelcomeMessageContentKey}.${this.location}`, welcomeContent, StorageScope.APPLICATION, StorageTarget.MACHINE);
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts b/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts
index aa765010ffae..d4ff4fb01c6b 100644
--- a/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts
+++ b/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts
@@ -7,7 +7,7 @@ import * as dom from '../../../../../base/browser/dom.js';
 import { Button } from '../../../../../base/browser/ui/button/button.js';
 import { renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { Event } from '../../../../../base/common/event.js';
-import { IMarkdownString, MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { IMarkdownString } from '../../../../../base/common/htmlContent.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
@@ -124,7 +124,7 @@ export class ChatViewWelcomePart extends Disposable {
 	public readonly element: HTMLElement;
 
 	constructor(
-		content: IChatViewWelcomeContent,
+		public readonly content: IChatViewWelcomeContent,
 		options: IChatViewWelcomeRenderOptions | undefined,
 		@IOpenerService private openerService: IOpenerService,
 		@IInstantiationService private instantiationService: IInstantiationService,
@@ -148,10 +148,7 @@ export class ChatViewWelcomePart extends Disposable {
 			title.textContent = content.title;
 
 			// Preview indicator
-			if (options?.location === ChatAgentLocation.EditingSession && typeof content.message !== 'function' && options.isWidgetAgentWelcomeViewContent) {
-				// Override welcome message for the agent. Sort of a hack, should it come from the participant? This case is different because the welcome content typically doesn't change per ChatWidget
-				const agentMessage = localize({ key: 'agentMessage', comment: ['{Locked="["}', '{Locked="]({0})"}'] }, "Ask Copilot to edit your files in [agent mode]({0}). Copilot will automatically use multiple requests to pick files to edit, run terminal commands, and iterate on errors.\n\nCopilot is powered by AI, so mistakes are possible. Review output carefully before use.", 'https://aka.ms/vscode-copilot-agent');
-				content.message = new MarkdownString(agentMessage);
+			if (typeof content.message !== 'function' && options?.isWidgetAgentWelcomeViewContent) {
 				const container = dom.append(this.element, $('.chat-welcome-view-indicator-container'));
 				dom.append(container, $('.chat-welcome-view-subtitle', undefined, localize('agentModeSubtitle', "Agent Mode")));
 				dom.append(container, $('.chat-welcome-view-indicator', undefined, localize('experimental', "EXPERIMENTAL")));
diff --git a/src/vs/workbench/contrib/chat/common/chatAgents.ts b/src/vs/workbench/contrib/chat/common/chatAgents.ts
index 2cc324f68ec4..a1b5af3eb619 100644
--- a/src/vs/workbench/contrib/chat/common/chatAgents.ts
+++ b/src/vs/workbench/contrib/chat/common/chatAgents.ts
@@ -125,6 +125,7 @@ export interface IChatAgentMetadata {
 	followupPlaceholder?: string;
 	isSticky?: boolean;
 	requester?: IChatRequesterInformation;
+	welcomeMessageContent?: IChatWelcomeMessageContent;
 }
 
 
diff --git a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
index caf1189982d6..abb95f6e2844 100644
--- a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
@@ -449,9 +449,8 @@ export class ChatService extends Disposable implements IChatService {
 				throw new ErrorNoTelemetry('No default agent registered');
 			}
 
-			const welcomeMessage = await defaultAgent.provideWelcomeMessage?.(token) ?? undefined;
 			const sampleQuestions = await defaultAgent.provideSampleQuestions?.(model.initialLocation, token) ?? undefined;
-			model.initialize(welcomeMessage, sampleQuestions);
+			model.initialize(undefined, sampleQuestions);
 		} catch (err) {
 			this.trace('startSession', `initializeSession failed: ${err}`);
 			model.setInitializationError(err);
diff --git a/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts b/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts
index 927bc7518f49..3d35ae14dcf1 100644
--- a/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts
+++ b/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-// version: 2
+// version: 3
 
 declare module 'vscode' {
 
@@ -14,7 +14,6 @@ declare module 'vscode' {
 	}
 
 	export interface ChatWelcomeMessageProvider {
-		provideWelcomeMessage?(token: CancellationToken): ProviderResult<ChatWelcomeMessageContent>;
 		provideSampleQuestions?(location: ChatLocation, token: CancellationToken): ProviderResult<ChatFollowup[]>;
 	}
 
@@ -57,6 +56,7 @@ declare module 'vscode' {
 		helpTextPostfix?: string | MarkdownString;
 
 		welcomeMessageProvider?: ChatWelcomeMessageProvider;
+		welcomeMessageContent?: ChatWelcomeMessageContent;
 		titleProvider?: ChatTitleProvider;
 		requester?: ChatRequesterInformation;
 	}

From 968254b594f87e4043f8b64dd8ff11e54d76e849 Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <2644648+TylerLeonhardt@users.noreply.github.com>
Date: Sat, 15 Mar 2025 03:44:59 -0700
Subject: [PATCH 0961/1815] Include options in the key (#243512)

Fixes https://github.com/microsoft/vscode/issues/243511
---
 src/vs/workbench/api/common/extHostAuthentication.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/common/extHostAuthentication.ts b/src/vs/workbench/api/common/extHostAuthentication.ts
index 2400f8ecae65..e705e38df50d 100644
--- a/src/vs/workbench/api/common/extHostAuthentication.ts
+++ b/src/vs/workbench/api/common/extHostAuthentication.ts
@@ -58,7 +58,9 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
 	async getSession(requestingExtension: IExtensionDescription, providerId: string, scopes: readonly string[], options: vscode.AuthenticationGetSessionOptions = {}): Promise<vscode.AuthenticationSession | undefined> {
 		const extensionId = ExtensionIdentifier.toKey(requestingExtension.identifier);
 		const sortedScopes = [...scopes].sort().join(' ');
-		return await this._getSessionTaskSingler.getOrCreate(`${extensionId} ${providerId} ${sortedScopes}`, async () => {
+		const keys: (keyof vscode.AuthenticationGetSessionOptions)[] = Object.keys(options) as (keyof vscode.AuthenticationGetSessionOptions)[];
+		const optionsStr = keys.sort().map(key => `${key}:${!!options[key]}`).join(', ');
+		return await this._getSessionTaskSingler.getOrCreate(`${extensionId} ${providerId} ${sortedScopes} ${optionsStr}`, async () => {
 			await this._proxy.$ensureProvider(providerId);
 			const extensionName = requestingExtension.displayName || requestingExtension.name;
 			return this._proxy.$getSession(providerId, scopes, extensionId, extensionName, options);

From 59b20bb13f705d5c11b5471a5e813eeca9a13eb9 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sat, 15 Mar 2025 04:50:59 -0700
Subject: [PATCH 0962/1815] Only trigger quick suggestions when the last input
 didn't include ESC

Fixes #241588
---
 .../suggest/browser/terminalSuggestAddon.ts            | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index e72a0151bf9d..b977b74df96b 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -372,7 +372,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		if (!this._wasLastInputVerticalArrowKey()) {
 			// Only request on trigger character when it's a regular input, or on an arrow if the widget
 			// is already visible
-			if (!this._wasLastInputArrowKey() || this._terminalSuggestWidgetVisibleContextKey.get()) {
+			if (!this._wasLastInputIncludedEscape() || this._terminalSuggestWidgetVisibleContextKey.get()) {
 				this.requestCompletions();
 				return true;
 			}
@@ -388,6 +388,14 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		return !!this._lastUserData?.match(/^\x1b[\[O]?[A-B]$/);
 	}
 
+	/**
+	 * Whether the last input included the escape character. Typically this will mean it was more
+	 * than just a simple character, such as arrow keys, home, end, etc.
+	 */
+	private _wasLastInputIncludedEscape(): boolean {
+		return !!this._lastUserData?.includes('\x1b');
+	}
+
 	private _wasLastInputArrowKey(): boolean {
 		// Never request completions if the last key sequence was up or down as the user was likely
 		// navigating history

From d2a4b5a967d957c641a203d62e9a4294e36564b3 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sat, 15 Mar 2025 04:57:07 -0700
Subject: [PATCH 0963/1815] Don't request via trigger chars on cursor left
 unless widget is already visible

Fixes #241912
---
 .../suggest/browser/terminalSuggestAddon.ts   | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index e72a0151bf9d..3b524cfd8ec3 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -446,15 +446,19 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 
 			// If the cursor moved to the left
 			if (this._mostRecentPromptInputState && promptInputState.cursorIndex < this._mostRecentPromptInputState.cursorIndex && promptInputState.cursorIndex > 0) {
-				// Backspace or left past a trigger character
-				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(/[\\\/]$/)
-					) {
-						sent = this._requestTriggerCharQuickSuggestCompletions();
+				// We only want to refresh via trigger characters in this case if the widget is
+				// already visible
+				if (this._terminalSuggestWidgetVisibleContextKey.get()) {
+					// Backspace or left past a trigger character
+					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(/[\\\/]$/)
+						) {
+							sent = this._requestTriggerCharQuickSuggestCompletions();
+						}
 					}
 				}
 			}

From bf36be9c613fd1e19849c4f8d47152e59152cdb9 Mon Sep 17 00:00:00 2001
From: Anthony Kim <62267334+anthonykim1@users.noreply.github.com>
Date: Sat, 15 Mar 2025 15:28:19 -0700
Subject: [PATCH 0964/1815] Finalize Shell API  (#243274)

* Adopt terminal suggest to shell api change

* Internally bring string enum for terminal suggest to prevent Typos

* Better word description under api description

* Remove shell proposed api against vscode.d.ts

* Update `shell` description after looking at feedbacks.

* Update docs

* Change to a Map<TerminalShellTye, string[]>

* One last typo

---------

Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
---
 .../src/terminalSuggestMain.ts                | 66 ++++++++-----------
 extensions/terminal-suggest/src/tokens.ts     | 15 +++--
 .../src/singlefolder-tests/terminal.test.ts   |  4 +-
 .../common/extensionsApiProposals.ts          |  3 -
 .../api/common/extHostTerminalService.ts      | 28 ++------
 src/vscode-dts/vscode.d.ts                    | 12 ++++
 .../vscode.proposed.terminalShellType.d.ts    | 40 -----------
 7 files changed, 56 insertions(+), 112 deletions(-)
 delete mode 100644 src/vscode-dts/vscode.proposed.terminalShellType.d.ts

diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 58354e223d07..3abd2e8efd1b 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -27,21 +27,12 @@ import { getFigSuggestions } from './fig/figInterface';
 import { executeCommand, executeCommandTimeout, IFigExecuteExternals } from './fig/execute';
 import { createTimeoutPromise } from './helpers/promise';
 
-// TODO: remove once API is finalized
 export const enum TerminalShellType {
-	Sh = 1,
-	Bash = 2,
-	Fish = 3,
-	Csh = 4,
-	Ksh = 5,
-	Zsh = 6,
-	CommandPrompt = 7,
-	GitBash = 8,
-	PowerShell = 9,
-	Python = 10,
-	Julia = 11,
-	NuShell = 12,
-	Node = 13
+	Bash = 'bash',
+	Fish = 'fish',
+	Zsh = 'zsh',
+	PowerShell = 'pwsh',
+	Python = 'python'
 }
 
 const isWindows = osIsWindows();
@@ -73,11 +64,10 @@ async function getShellGlobals(shellType: TerminalShellType, existingCommands?:
 		if (cachedCommands) {
 			return cachedCommands;
 		}
-		const shell = getShell(shellType);
-		if (!shell) {
+		if (!shellType) {
 			return;
 		}
-		const options: ExecOptionsWithStringEncoding = { encoding: 'utf-8', shell };
+		const options: ExecOptionsWithStringEncoding = { encoding: 'utf-8', shell: shellType };
 		const mixedCommands: (string | ICompletionResource)[] | undefined = await getShellSpecificGlobals.get(shellType)?.(options, existingCommands);
 		const normalizedCommands = mixedCommands?.map(command => typeof command === 'string' ? ({ label: command }) : command);
 		cachedGlobals.set(shellType, normalizedCommands);
@@ -101,14 +91,15 @@ export async function activate(context: vscode.ExtensionContext) {
 				return;
 			}
 
-			const shellType: TerminalShellType | undefined = 'shellType' in terminal.state ? terminal.state.shellType as TerminalShellType : undefined;
-			if (!shellType) {
+			const shellType: string | undefined = 'shell' in terminal.state ? terminal.state.shell as string : undefined;
+			const terminalShellType = getTerminalShellType(shellType);
+			if (!terminalShellType) {
 				console.debug('#terminalCompletions No shell type found for terminal');
 				return;
 			}
 
 			const commandsInPath = await pathExecutableCache.getExecutablesInPath(terminal.shellIntegration?.env?.value);
-			const shellGlobals = await getShellGlobals(shellType, commandsInPath?.labels) ?? [];
+			const shellGlobals = await getShellGlobals(terminalShellType, commandsInPath?.labels) ?? [];
 			if (!commandsInPath?.completionResources) {
 				console.debug('#terminalCompletions No commands found in path');
 				return;
@@ -117,7 +108,7 @@ export async function activate(context: vscode.ExtensionContext) {
 			const commands = [...shellGlobals, ...commandsInPath.completionResources];
 			const prefix = getPrefix(terminalContext.commandLine, terminalContext.cursorPosition);
 			const pathSeparator = isWindows ? '\\' : '/';
-			const tokenType = getTokenType(terminalContext, shellType);
+			const tokenType = getTokenType(terminalContext, terminalShellType);
 			const result = await Promise.race([
 				getCompletionItemsFromSpecs(
 					availableSpecs,
@@ -320,22 +311,6 @@ function compareItems(existingItem: vscode.TerminalCompletionItem, command: ICom
 	}
 }
 
-function getShell(shellType: TerminalShellType): string | undefined {
-	switch (shellType) {
-		case TerminalShellType.Bash:
-			return 'bash';
-		case TerminalShellType.Fish:
-			return 'fish';
-		case TerminalShellType.Zsh:
-			return 'zsh';
-		case TerminalShellType.PowerShell:
-			return 'pwsh';
-		default: {
-			return undefined;
-		}
-	}
-}
-
 function getEnvAsRecord(shellIntegrationEnv: { [key: string]: string | undefined } | undefined): Record<string, string> {
 	const env: Record<string, string> = {};
 	for (const [key, value] of Object.entries(shellIntegrationEnv ?? process.env)) {
@@ -349,6 +324,23 @@ function getEnvAsRecord(shellIntegrationEnv: { [key: string]: string | undefined
 	return env;
 }
 
+function getTerminalShellType(shellType: string | undefined): TerminalShellType | undefined {
+	switch (shellType) {
+		case 'bash':
+			return TerminalShellType.Bash;
+		case 'zsh':
+			return TerminalShellType.Zsh;
+		case 'pwsh':
+			return TerminalShellType.PowerShell;
+		case 'fish':
+			return TerminalShellType.Fish;
+		case 'python':
+			return TerminalShellType.Python;
+		default:
+			return undefined;
+	}
+}
+
 export function sanitizeProcessEnvironment(env: Record<string, string>, ...preserve: string[]): void {
 	const set = preserve.reduce<Record<string, boolean>>((set, key) => {
 		set[key] = true;
diff --git a/extensions/terminal-suggest/src/tokens.ts b/extensions/terminal-suggest/src/tokens.ts
index a967aeb20545..0520a2315a44 100644
--- a/extensions/terminal-suggest/src/tokens.ts
+++ b/extensions/terminal-suggest/src/tokens.ts
@@ -5,18 +5,19 @@
 
 import { TerminalShellType } from './terminalSuggestMain';
 
+
 export const enum TokenType {
 	Command,
 	Argument,
 }
 
-const shellTypeResetChars: { [key: number]: string[] | undefined } = {
-	[TerminalShellType.Bash]: ['>', '>>', '<', '2>', '2>>', '&>', '&>>', '|', '|&', '&&', '||', '&', ';', '(', '{', '<<'],
-	[TerminalShellType.Zsh]: ['>', '>>', '<', '2>', '2>>', '&>', '&>>', '<>', '|', '|&', '&&', '||', '&', ';', '(', '{', '<<', '<<<', '<('],
-	[TerminalShellType.PowerShell]: ['>', '>>', '<', '2>', '2>>', '*>', '*>>', '|', '-and', '-or', '-not', '!', '&', '-eq', '-ne', '-gt', '-lt', '-ge', '-le', '-like', '-notlike', '-match', '-notmatch', '-contains', '-notcontains', '-in', '-notin']
-};
+const shellTypeResetChars = new Map<TerminalShellType, string[]>([
+	[TerminalShellType.Bash, ['>', '>>', '<', '2>', '2>>', '&>', '&>>', '|', '|&', '&&', '||', '&', ';', '(', '{', '<<']],
+	[TerminalShellType.Zsh, ['>', '>>', '<', '2>', '2>>', '&>', '&>>', '<>', '|', '|&', '&&', '||', '&', ';', '(', '{', '<<', '<<<', '<(']],
+	[TerminalShellType.PowerShell, ['>', '>>', '<', '2>', '2>>', '*>', '*>>', '|', '-and', '-or', '-not', '!', '&', '-eq', '-ne', '-gt', '-lt', '-ge', '-le', '-like', '-notlike', '-match', '-notmatch', '-contains', '-notcontains', '-in', '-notin']]
+]);
 
-const defaultShellTypeResetChars = shellTypeResetChars[TerminalShellType.Bash]!;
+const defaultShellTypeResetChars = shellTypeResetChars.get(TerminalShellType.Bash)!;
 
 export function getTokenType(ctx: { commandLine: string; cursorPosition: number }, shellType: TerminalShellType | undefined): TokenType {
 	const spaceIndex = ctx.commandLine.substring(0, ctx.cursorPosition).lastIndexOf(' ');
@@ -24,7 +25,7 @@ export function getTokenType(ctx: { commandLine: string; cursorPosition: number
 		return TokenType.Command;
 	}
 	const previousTokens = ctx.commandLine.substring(0, spaceIndex + 1).trim();
-	const commandResetChars = shellType === undefined ? defaultShellTypeResetChars : shellTypeResetChars[shellType] ?? defaultShellTypeResetChars;
+	const commandResetChars = shellType === undefined ? defaultShellTypeResetChars : shellTypeResetChars.get(shellType) ?? defaultShellTypeResetChars;
 	if (commandResetChars.some(e => previousTokens.endsWith(e))) {
 		return TokenType.Command;
 	}
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 9c1c097aab21..9e666879933c 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
@@ -257,12 +257,12 @@ import { assertNoRpc, poll } from '../utils';
 
 		test('onDidChangeTerminalState should fire with shellType when created', async () => {
 			const terminal = window.createTerminal();
-			if (terminal.state.shellType) {
+			if (terminal.state.shell) {
 				return;
 			}
 			await new Promise<void>(r => {
 				disposables.push(window.onDidChangeTerminalState(e => {
-					if (e === terminal && e.state.shellType) {
+					if (e === terminal && e.state.shell) {
 						r();
 					}
 				}));
diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index 8c447180ba47..069a1ad2fc79 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -364,9 +364,6 @@ const _allApiProposals = {
 	terminalShellEnv: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts',
 	},
-	terminalShellType: {
-		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellType.d.ts',
-	},
 	testObserver: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testObserver.d.ts',
 	},
diff --git a/src/vs/workbench/api/common/extHostTerminalService.ts b/src/vs/workbench/api/common/extHostTerminalService.ts
index c88dbbcaa35e..693cb1728a49 100644
--- a/src/vs/workbench/api/common/extHostTerminalService.ts
+++ b/src/vs/workbench/api/common/extHostTerminalService.ts
@@ -10,7 +10,7 @@ import { createDecorator } from '../../../platform/instantiation/common/instanti
 import { URI } from '../../../base/common/uri.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { IDisposable, DisposableStore, Disposable, MutableDisposable } from '../../../base/common/lifecycle.js';
-import { Disposable as VSCodeDisposable, EnvironmentVariableMutatorType, TerminalExitReason, TerminalCompletionItem, TerminalShellType as VSCodeTerminalShellType } from './extHostTypes.js';
+import { Disposable as VSCodeDisposable, EnvironmentVariableMutatorType, TerminalExitReason, TerminalCompletionItem } from './extHostTypes.js';
 import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import { localize } from '../../../nls.js';
 import { NotSupportedError } from '../../../base/common/errors.js';
@@ -18,7 +18,7 @@ import { serializeEnvironmentDescriptionMap, serializeEnvironmentVariableCollect
 import { CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { IEnvironmentVariableCollectionDescription, IEnvironmentVariableMutator, ISerializableEnvironmentVariableCollection } from '../../../platform/terminal/common/environmentVariable.js';
-import { ICreateContributedTerminalProfileOptions, IProcessReadyEvent, IShellLaunchConfigDto, ITerminalChildProcess, ITerminalLaunchError, ITerminalProfile, TerminalIcon, TerminalLocation, IProcessProperty, ProcessPropertyType, IProcessPropertyMap, TerminalShellType, PosixShellType, WindowsShellType, GeneralShellType } from '../../../platform/terminal/common/terminal.js';
+import { ICreateContributedTerminalProfileOptions, IProcessReadyEvent, IShellLaunchConfigDto, ITerminalChildProcess, ITerminalLaunchError, ITerminalProfile, TerminalIcon, TerminalLocation, IProcessProperty, ProcessPropertyType, IProcessPropertyMap, TerminalShellType } from '../../../platform/terminal/common/terminal.js';
 import { TerminalDataBufferer } from '../../../platform/terminal/common/terminalDataBuffering.js';
 import { ThemeColor } from '../../../base/common/themables.js';
 import { Promises } from '../../../base/common/async.js';
@@ -85,7 +85,7 @@ export class ExtHostTerminal extends Disposable {
 	private _pidPromiseComplete: ((value: number | undefined) => any) | undefined;
 	private _rows: number | undefined;
 	private _exitStatus: vscode.TerminalExitStatus | undefined;
-	private _state: vscode.TerminalState = { isInteractedWith: false, shellType: undefined };
+	private _state: vscode.TerminalState = { isInteractedWith: false, shell: undefined };
 	private _selection: string | undefined;
 
 	shellIntegration: vscode.TerminalShellIntegration | undefined;
@@ -269,28 +269,10 @@ export class ExtHostTerminal extends Disposable {
 
 	public setShellType(shellType: TerminalShellType | undefined): boolean {
 
-		let extHostType: VSCodeTerminalShellType | undefined;
-
-		switch (shellType) {
-			case PosixShellType.Sh: extHostType = VSCodeTerminalShellType.Sh; break;
-			case PosixShellType.Bash: extHostType = VSCodeTerminalShellType.Bash; break;
-			case PosixShellType.Fish: extHostType = VSCodeTerminalShellType.Fish; break;
-			case PosixShellType.Csh: extHostType = VSCodeTerminalShellType.Csh; break;
-			case PosixShellType.Ksh: extHostType = VSCodeTerminalShellType.Ksh; break;
-			case PosixShellType.Zsh: extHostType = VSCodeTerminalShellType.Zsh; break;
-			case WindowsShellType.CommandPrompt: extHostType = VSCodeTerminalShellType.CommandPrompt; break;
-			case WindowsShellType.GitBash: extHostType = VSCodeTerminalShellType.GitBash; break;
-			case GeneralShellType.PowerShell: extHostType = VSCodeTerminalShellType.PowerShell; break;
-			case GeneralShellType.Python: extHostType = VSCodeTerminalShellType.Python; break;
-			case GeneralShellType.Julia: extHostType = VSCodeTerminalShellType.Julia; break;
-			case GeneralShellType.NuShell: extHostType = VSCodeTerminalShellType.NuShell; break;
-			default: extHostType = undefined; break;
-		}
-
-		if (this._state.shellType !== shellType) {
+		if (this._state.shell !== shellType) {
 			this._state = {
 				...this._state,
-				shellType: extHostType
+				shell: shellType
 			};
 			return true;
 		}
diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts
index 87a4960333f5..a784194d43ce 100644
--- a/src/vscode-dts/vscode.d.ts
+++ b/src/vscode-dts/vscode.d.ts
@@ -7733,6 +7733,18 @@ declare module 'vscode' {
 		 * https://invisible-island.net/xterm/ctlseqs/ctlseqs.html
 		 */
 		readonly isInteractedWith: boolean;
+
+		/**
+		 * The detected shell type of the {@link Terminal}. This will be `undefined` when there is
+		 * not a clear signal as to what the shell is, or the shell is not supported yet. This
+		 * value should change to the shell type of a sub-shell when launched (for example, running
+		 * `bash` inside `zsh`).
+		 *
+		 * 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'.
+		 */
+		readonly shell: string | undefined;
 	}
 
 	/**
diff --git a/src/vscode-dts/vscode.proposed.terminalShellType.d.ts b/src/vscode-dts/vscode.proposed.terminalShellType.d.ts
deleted file mode 100644
index e76defc65683..000000000000
--- a/src/vscode-dts/vscode.proposed.terminalShellType.d.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.
- *--------------------------------------------------------------------------------------------*/
-
-declare module 'vscode' {
-
-	// https://github.com/microsoft/vscode/issues/230165
-
-	/**
-	 * Known terminal shell types.
-	 */
-	export enum TerminalShellType {
-		Sh = 1,
-		Bash = 2,
-		Fish = 3,
-		Csh = 4,
-		Ksh = 5,
-		Zsh = 6,
-		CommandPrompt = 7,
-		GitBash = 8,
-		PowerShell = 9,
-		Python = 10,
-		Julia = 11,
-		NuShell = 12,
-		Node = 13
-	}
-
-	// Part of TerminalState since the shellType can change multiple times and this comes with an event.
-	export interface TerminalState {
-		/**
-		 * The current detected shell type of the terminal. New shell types may be added in the
-		 * future in which case they will be returned as a number that is not part of
-		 * {@link TerminalShellType}.
-		 * Includes number type to prevent the breaking change when new enum members are added?
-		 */
-		readonly shellType?: TerminalShellType | number | undefined;
-	}
-
-}

From 67053d5626139d9dd04571732cffc3cf80f0d094 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sat, 15 Mar 2025 16:37:44 -0700
Subject: [PATCH 0965/1815] Put setting value back (#243654)

---
 src/vs/workbench/contrib/chat/browser/chat.contribution.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 332ac088d7b3..44e22da5cada 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -207,8 +207,7 @@ configurationRegistry.registerConfiguration({
 		'chat.experimental.setupFromDialog': { // TODO@bpasero remove this eventually
 			type: 'boolean',
 			description: nls.localize('chat.setupFromChat', "Controls whether Copilot setup starts from a dialog or from the welcome view."),
-			// default: product.quality !== 'stable',
-			default: false,
+			default: product.quality !== 'stable',
 			tags: ['experimental', 'onExp']
 		},
 		[mcpConfigurationSection]: {

From 7380c8d74bfbf0c02f5b30d1c4d617ae6164e5c4 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sat, 15 Mar 2025 16:38:29 -0700
Subject: [PATCH 0966/1815] Fix fromNowByDay test (#243619)

* Fix fromNowByDay test
It failed within a 2 hour window
Would be better to be able to test against a fixed Date instead of the current time

* Put 'daysAgo' test back
---
 src/vs/base/test/common/date.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/test/common/date.test.ts b/src/vs/base/test/common/date.test.ts
index d008c55f9180..287d192cea50 100644
--- a/src/vs/base/test/common/date.test.ts
+++ b/src/vs/base/test/common/date.test.ts
@@ -37,13 +37,13 @@ suite('Date', () => {
 		test('yesterday', () => {
 			const yesterday = new Date();
 			yesterday.setDate(yesterday.getDate() - 1);
-			yesterday.setHours(yesterday.getHours() - 2); // 2 hours further to avoid DST issues.
+			yesterday.setHours(12);
 			strictEqual(fromNowByDay(yesterday), 'Yesterday');
 		});
 		test('daysAgo', () => {
 			const daysAgo = new Date();
 			daysAgo.setDate(daysAgo.getDate() - 5);
-			daysAgo.setHours(daysAgo.getHours() - 2); // 2 hours further to avoid DST issues.
+			daysAgo.setHours(daysAgo.getHours() - 2); // 2 hours further to avoid DST issues
 			strictEqual(fromNowByDay(daysAgo, true), '5 days ago');
 		});
 	});

From 0364a7b4db656044ae3e11fc32eda75d5f551ea7 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Sun, 16 Mar 2025 15:04:23 +1100
Subject: [PATCH 0967/1815] Remove dead code (#243669)

---
 .../chatEditing/chatEditingModifiedNotebookEntry.ts      | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
index df32680d2c43..b21def982b1c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
@@ -83,7 +83,6 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 	private readonly cellEntryMap = new ResourceMap<ChatEditingNotebookCellEntry>();
 	private modifiedToOriginalCell = new ResourceMap<URI>();
 	private readonly _cellsDiffInfo = observableValue<ICellDiffInfo[]>('diffInfo', []);
-	private readonly _maxModifiedLineNumbers = observableValue<number[]>('changedMaxLineNumber', []);
 
 	get cellsDiffInfo(): IObservable<ICellDiffInfo[]> {
 		return this._cellsDiffInfo;
@@ -186,7 +185,6 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 		this.originalModel = this._register(originalResourceRef).object.notebook;
 		this.originalURI = this.originalModel.uri;
 		this.initialContent = initialContent;
-		this._maxModifiedLineNumbers.set(this.modifiedModel.cells.map(() => 0), undefined);
 		this.initializeModelsFromDiff();
 		this._register(this.modifiedModel.onDidChangeContent(this.mirrorNotebookEdits, this));
 	}
@@ -521,7 +519,8 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 			if (!isLastEdits) {
 				this._stateObs.set(WorkingSetEntryState.Modified, tx);
 				this._isCurrentlyBeingModifiedByObs.set(responseModel, tx);
-				this._rewriteRatioObs.set(Math.min(1, calculateNotebookRewriteRatio(this._cellsDiffInfo.get(), this.originalModel, this.modifiedModel)), tx);
+				const newRewriteRation = Math.max(this._rewriteRatioObs.get(), calculateNotebookRewriteRatio(this._cellsDiffInfo.get(), this.originalModel, this.modifiedModel));
+				this._rewriteRatioObs.set(Math.min(1, newRewriteRation), tx);
 
 			} else {
 				finishPreviousCells();
@@ -898,13 +897,9 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
 				};
 			}
 			diffs.splice(entryIndex, 1, { ...entry });
-			const maxModifiedLineNumber = cellEntry.maxModifiedLineNumber.read(r);
-			const maxModifiedLineNumbers = this._maxModifiedLineNumbers.get().slice();
-			maxModifiedLineNumbers[index] = maxModifiedLineNumber;
 
 			transaction(tx => {
 				this.updateCellDiffInfo(diffs, tx);
-				this._maxModifiedLineNumbers.set(maxModifiedLineNumbers, tx);
 			});
 		}));
 

From 6dd11490eb159a6afbf307cd05c4d16970c3cd50 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sat, 15 Mar 2025 23:05:23 -0700
Subject: [PATCH 0968/1815] Only allow tools in agent mode (#243663)

---
 src/vs/workbench/contrib/chat/browser/chatWidget.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index 7ef600cfe3e1..11a8e2e7f409 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -1171,7 +1171,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				attachedContext,
 				noCommandDetection: options?.noCommandDetection,
 				hasInstructionAttachments: this.inputPart.hasInstructionAttachments,
-				userSelectedTools: ChatInputPart.selectedToolsModel.tools.get().map(tool => tool.id)
+				userSelectedTools: this.input.currentMode === ChatMode.Agent ? ChatInputPart.selectedToolsModel.tools.get().map(tool => tool.id) : undefined
 			});
 
 			if (result) {

From a41a4ba14b3a983fc1ecd3a2fabe5b5d4a8b6575 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sat, 15 Mar 2025 23:06:03 -0700
Subject: [PATCH 0969/1815] Hide modelpicker when too small (#243666)

It gets very ugly at small sizes. Hiding at the point where you have just a few characters
---
 .../contrib/chat/browser/chatInputPart.ts     |  4 ++--
 .../contrib/chat/browser/media/chat.css       | 23 +++++++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 0cb257267c86..877589c639ba 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -1498,7 +1498,7 @@ class ModelPickerActionViewItem extends DropdownMenuActionViewItemWithKeybinding
 
 	override render(container: HTMLElement): void {
 		super.render(container);
-		container.classList.add('chat-modelPicker-item');
+		container.classList.add('chat-modelPicker-item', 'chat-dropdown-item');
 	}
 }
 
@@ -1573,7 +1573,7 @@ class ToggleChatModeActionViewItem extends DropdownMenuActionViewItemWithKeybind
 
 	override render(container: HTMLElement): void {
 		super.render(container);
-		container.classList.add('chat-modelPicker-item');
+		container.classList.add('chat-dropdown-item');
 	}
 }
 
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 750c1f0fb88c..56396183cc52 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -859,13 +859,28 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	display: flex;
 }
 
-.interactive-session .chat-input-toolbars :first-child {
-	margin-right: auto;
+@container chat-input-container (max-width: 130px) {
+	.interactive-session .chat-input-toolbars .chat-modelPicker-item {
+		/* Hides modelpicker when the container width is 130px or less */
+		display: none;
+	}
+}
+
+.interactive-session .interactive-input-part:not(.compact) .chat-input-toolbars > .chat-execute-toolbar {
+	container-type: inline-size;
+	container-name: chat-input-container;
+	flex: 1;
+	display: flex;
+	justify-content: flex-end;
 }
 
 .interactive-session .chat-input-toolbars > .chat-execute-toolbar {
 	min-width: 0px;
 
+	.monaco-action-bar {
+		min-width: 0px;
+	}
+
 	.chat-modelPicker-item {
 		min-width: 0px;
 
@@ -888,7 +903,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	color: var(--vscode-icon-foreground) !important;
 }
 
-.interactive-session .chat-input-toolbars .chat-modelPicker-item .action-label {
+.interactive-session .chat-input-toolbars .chat-dropdown-item .action-label {
 	height: 16px;
 	padding: 3px 0px 3px 6px;
 	display: flex;
@@ -896,7 +911,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 }
 
 
-.interactive-session .chat-input-toolbars .chat-modelPicker-item .action-label .codicon-chevron-down {
+.interactive-session .chat-input-toolbars .chat-dropdown-item .action-label .codicon-chevron-down {
 	font-size: 12px;
 	margin-left: 2px;
 }

From 9a8f8bbabf29b16395ea3046cc848fea9273ce87 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sat, 15 Mar 2025 23:06:32 -0700
Subject: [PATCH 0970/1815] Move terminal chat placeholder off welcome message
 (#243674)

---
 .../contrib/chat/common/chatModel.ts          | 11 ++-----
 .../contrib/chat/common/chatServiceImpl.ts    |  2 +-
 .../chat/browser/terminalChatWidget.ts        | 29 ++++++++++---------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index 8e0a33440ade..9b276befbe82 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -24,7 +24,7 @@ import { localize } from '../../../../nls.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IMarker, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { CellUri, ICellEditOperation } from '../../notebook/common/notebookCommon.js';
-import { IChatAgentCommand, IChatAgentData, IChatAgentResult, IChatAgentService, IChatWelcomeMessageContent, reviveSerializedAgent } from './chatAgents.js';
+import { IChatAgentCommand, IChatAgentData, IChatAgentResult, IChatAgentService, reviveSerializedAgent } from './chatAgents.js';
 import { ChatRequestTextPart, IParsedChatRequest, reviveParsedChatRequest } from './chatParserTypes.js';
 import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatFollowup, IChatLocationData, IChatMarkdownContent, IChatNotebookEdit, IChatProgress, IChatProgressMessage, IChatResponseCodeblockUriPart, IChatResponseProgressFileTreeData, IChatTask, IChatTextEdit, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop, IChatUsedContext, IChatWarningMessage, isIUsedContext } from './chatService.js';
 import { IChatRequestVariableValue } from './chatVariables.js';
@@ -948,7 +948,6 @@ export interface IChatModel {
 	readonly initState: ChatModelInitState;
 	readonly initialLocation: ChatAgentLocation;
 	readonly title: string;
-	readonly welcomeMessage: IChatWelcomeMessageContent | undefined;
 	readonly sampleQuestions: IChatFollowup[] | undefined;
 	readonly requestInProgress: boolean;
 	readonly requestPausibility: ChatPauseState;
@@ -1208,11 +1207,6 @@ export class ChatModel extends Disposable implements IChatModel {
 	private _initState: ChatModelInitState = ChatModelInitState.Created;
 	private _isInitializedDeferred = new DeferredPromise<void>();
 
-	private _welcomeMessage: IChatWelcomeMessageContent | undefined;
-	get welcomeMessage(): IChatWelcomeMessageContent | undefined {
-		return this._welcomeMessage;
-	}
-
 	private _sampleQuestions: IChatFollowup[] | undefined;
 	get sampleQuestions(): IChatFollowup[] | undefined {
 		return this._sampleQuestions;
@@ -1434,14 +1428,13 @@ export class ChatModel extends Disposable implements IChatModel {
 		this._isInitializedDeferred = new DeferredPromise<void>();
 	}
 
-	initialize(welcomeMessage?: IChatWelcomeMessageContent, sampleQuestions?: IChatFollowup[]): void {
+	initialize(sampleQuestions?: IChatFollowup[]): void {
 		if (this.initState !== ChatModelInitState.Initializing) {
 			// Must call startInitialize before initialize, and only call it once
 			throw new Error(`ChatModel is in the wrong state for initialize: ${ChatModelInitState[this.initState]}`);
 		}
 
 		this._initState = ChatModelInitState.Initialized;
-		this._welcomeMessage = welcomeMessage;
 		this._sampleQuestions = sampleQuestions;
 
 		this._isInitializedDeferred.complete();
diff --git a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
index abb95f6e2844..42f2d1d63867 100644
--- a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
@@ -450,7 +450,7 @@ export class ChatService extends Disposable implements IChatService {
 			}
 
 			const sampleQuestions = await defaultAgent.provideSampleQuestions?.(model.initialLocation, token) ?? undefined;
-			model.initialize(undefined, sampleQuestions);
+			model.initialize(sampleQuestions);
 		} catch (err) {
 			this.trace('startSession', `initializeSession failed: ${err}`);
 			model.setInitializationError(err);
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
index 25cbfeec6892..3a8cde6a9627 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
@@ -5,29 +5,30 @@
 
 import type { Terminal as RawXtermTerminal } from '@xterm/xterm';
 import { Dimension, getActiveWindow, IFocusTracker, trackFocus } from '../../../../../base/browser/dom.js';
+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 { autorun, observableValue, type IObservable } from '../../../../../base/common/observable.js';
 import { MicrotaskDelay } from '../../../../../base/common/symbols.js';
-import './media/terminalChatWidget.css';
 import { localize } from '../../../../../nls.js';
+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 { InlineChatWidget } from '../../../inlineChat/browser/inlineChatWidget.js';
-import { ITerminalInstance, type IXtermTerminal } from '../../../terminal/browser/terminal.js';
-import { MENU_TERMINAL_CHAT_WIDGET_INPUT_SIDE_TOOLBAR, MENU_TERMINAL_CHAT_WIDGET_STATUS, TerminalChatCommandId, TerminalChatContextKeys } from './terminalChat.js';
-import { TerminalStickyScrollContribution } from '../../stickyScroll/browser/terminalStickyScrollContribution.js';
-import { MENU_INLINE_CHAT_WIDGET_SECONDARY } from '../../../inlineChat/common/inlineChat.js';
-import { CancelablePromise, createCancelablePromise, DeferredPromise } from '../../../../../base/common/async.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { IChatAcceptInputOptions, showChatView } from '../../../chat/browser/chat.js';
-import { ChatModel, IChatResponseModel, isCellTextEditOperation } from '../../../chat/common/chatModel.js';
-import { IChatService, IChatProgress } from '../../../chat/common/chatService.js';
-import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
-import { MenuId } from '../../../../../platform/actions/common/actions.js';
 import type { IChatViewState } from '../../../chat/browser/chatWidget.js';
-import { autorun, observableValue, type IObservable } from '../../../../../base/common/observable.js';
+import { IChatAgentService } from '../../../chat/common/chatAgents.js';
+import { ChatModel, IChatResponseModel, isCellTextEditOperation } from '../../../chat/common/chatModel.js';
+import { IChatProgress, IChatService } from '../../../chat/common/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';
+import { ITerminalInstance, type IXtermTerminal } from '../../../terminal/browser/terminal.js';
+import { TerminalStickyScrollContribution } from '../../stickyScroll/browser/terminalStickyScrollContribution.js';
+import './media/terminalChatWidget.css';
+import { MENU_TERMINAL_CHAT_WIDGET_INPUT_SIDE_TOOLBAR, MENU_TERMINAL_CHAT_WIDGET_STATUS, TerminalChatCommandId, TerminalChatContextKeys } from './terminalChat.js';
 
 const enum Constants {
 	HorizontalMargin = 10,
@@ -100,6 +101,7 @@ export class TerminalChatWidget extends Disposable {
 		@IStorageService private readonly _storageService: IStorageService,
 		@IViewsService private readonly _viewsService: IViewsService,
 		@IInstantiationService instantiationService: IInstantiationService,
+		@IChatAgentService private readonly _chatAgentService: IChatAgentService,
 	) {
 		super();
 
@@ -225,7 +227,8 @@ export class TerminalChatWidget extends Disposable {
 	}
 
 	private _resetPlaceholder() {
-		this.inlineChatWidget.placeholder = this._model.value?.welcomeMessage?.title ?? localize('askAI', 'Ask AI');
+		const defaultAgent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Terminal);
+		this.inlineChatWidget.placeholder = defaultAgent?.description ?? localize('askAI', 'Ask AI');
 	}
 
 	async reveal(viewState?: IChatViewState): Promise<void> {

From 910ab9a6bd610663283168850a3f6e64680767f9 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sat, 15 Mar 2025 23:08:35 -0700
Subject: [PATCH 0971/1815] More unified mode fixes (#243658)

* More updates when in unified view mode

* More fixes

* Fix

* Fix tests

* Add test

* Update
---
 .../browser/actions/chatAccessibilityHelp.ts  |  9 ++++----
 .../chat/browser/actions/chatActions.ts       | 23 +++++++++++--------
 .../chat/browser/actions/chatClearActions.ts  | 19 +++++++++------
 .../browser/actions/chatExecuteActions.ts     | 14 ++++++-----
 .../contrib/chat/browser/chatInputPart.ts     |  2 +-
 .../browser/chatParticipant.contribution.ts   |  4 ++--
 .../contrib/chat/browser/chatWidget.ts        |  1 +
 .../browser/contrib/chatInputCompletions.ts   |  6 ++---
 .../contrib/chat/common/chatRequestParser.ts  |  2 +-
 ...atRequestParser_agent_but_edit_mode.0.snap | 19 +++++++++++++++
 .../test/common/chatRequestParser.test.ts     | 11 +++++++++
 11 files changed, 76 insertions(+), 34 deletions(-)
 create mode 100644 src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_but_edit_mode.0.snap

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
index 674c15f327f6..2ef911af34d7 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts
@@ -12,18 +12,17 @@ import { AccessibleContentProvider, AccessibleViewProviderId, AccessibleViewType
 import { IAccessibleViewImplementation } from '../../../../../platform/accessibility/browser/accessibleViewRegistry.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
-import { ActiveAuxiliaryContext } from '../../../../common/contextkeys.js';
 import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
 import { INLINE_CHAT_ID } from '../../../inlineChat/common/inlineChat.js';
-import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { ChatAgentLocation } from '../../common/constants.js';
+import { ChatContextKeyExprs, ChatContextKeys } from '../../common/chatContextKeys.js';
+import { ChatAgentLocation, ChatMode } from '../../common/constants.js';
 import { IChatWidgetService } from '../chat.js';
 
 export class PanelChatAccessibilityHelp implements IAccessibleViewImplementation {
 	readonly priority = 107;
 	readonly name = 'panelChat';
 	readonly type = AccessibleViewType.Help;
-	readonly when = ContextKeyExpr.and(ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel), ChatContextKeys.inQuickChat.negate(), ActiveAuxiliaryContext.isEqualTo('workbench.panel.chat'), ContextKeyExpr.or(ChatContextKeys.inChatSession, ChatContextKeys.isResponse, ChatContextKeys.isRequest));
+	readonly when = ContextKeyExpr.and(ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel), ChatContextKeys.inQuickChat.negate(), ChatContextKeys.chatMode.isEqualTo(ChatMode.Chat), ContextKeyExpr.or(ChatContextKeys.inChatSession, ChatContextKeys.isResponse, ChatContextKeys.isRequest));
 	getProvider(accessor: ServicesAccessor) {
 		const codeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor() || accessor.get(ICodeEditorService).getFocusedCodeEditor();
 		return getChatAccessibilityHelpProvider(accessor, codeEditor ?? undefined, 'panelChat');
@@ -45,7 +44,7 @@ export class EditsChatAccessibilityHelp implements IAccessibleViewImplementation
 	readonly priority = 119;
 	readonly name = 'editsView';
 	readonly type = AccessibleViewType.Help;
-	readonly when = ContextKeyExpr.and(ActiveAuxiliaryContext.isEqualTo('workbench.panel.chatEditing'), ChatContextKeys.inChatInput);
+	readonly when = ContextKeyExpr.and(ChatContextKeyExprs.inEditingMode, ChatContextKeys.inChatInput);
 	getProvider(accessor: ServicesAccessor) {
 		const codeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor() || accessor.get(ICodeEditorService).getFocusedCodeEditor();
 		return getChatAccessibilityHelpProvider(accessor, codeEditor ?? undefined, 'editsView');
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index 7f9f9d3ff8d6..5793a665744b 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -8,8 +8,10 @@ import { coalesce } from '../../../../../base/common/arrays.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { fromNowByDay, safeIntl } from '../../../../../base/common/date.js';
 import { Event } from '../../../../../base/common/event.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore, markAsSingleton } from '../../../../../base/common/lifecycle.js';
+import { language } from '../../../../../base/common/platform.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
@@ -21,8 +23,10 @@ import { IActionViewItemService } from '../../../../../platform/actions/browser/
 import { DropdownWithPrimaryActionViewItem } from '../../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
 import { Action2, MenuId, MenuItemAction, MenuRegistry, registerAction2, SubmenuItemAction } 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 { IsLinuxContext, IsWindowsContext } from '../../../../../platform/contextkey/common/contextkeys.js';
+import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
@@ -30,18 +34,21 @@ import product from '../../../../../platform/product/common/product.js';
 import { IQuickInputButton, IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../../platform/quickinput/common/quickInput.js';
 import { ToggleTitleBarConfigAction } from '../../../../browser/parts/titlebar/titlebarActions.js';
 import { IWorkbenchContribution } from '../../../../common/contributions.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../../../../common/views.js';
 import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
 import { ACTIVE_GROUP, 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 { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { EXTENSIONS_CATEGORY, IExtensionsWorkbenchService } from '../../../extensions/common/extensions.js';
 import { IChatAgentService } from '../../common/chatAgents.js';
-import { ChatAgentLocation } from '../../common/constants.js';
 import { ChatContextKeys } from '../../common/chatContextKeys.js';
+import { ChatEntitlement, IChatEntitlementService } from '../../common/chatEntitlementService.js';
 import { extractAgentAndCommand } from '../../common/chatParserTypes.js';
 import { IChatDetail, IChatService } from '../../common/chatService.js';
 import { IChatRequestViewModel, IChatResponseViewModel, isRequestVM } from '../../common/chatViewModel.js';
 import { IChatWidgetHistoryService } from '../../common/chatWidgetHistoryService.js';
+import { ChatMode } from '../../common/constants.js';
 import { CopilotUsageExtensionFeatureId } from '../../common/languageModelStats.js';
 import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
 import { ChatViewId, EditsViewId, IChatWidget, IChatWidgetService, showChatView, showCopilotView } from '../chat.js';
@@ -50,13 +57,6 @@ import { ChatEditorInput } from '../chatEditorInput.js';
 import { ChatViewPane } from '../chatViewPane.js';
 import { convertBufferToScreenshotVariable } from '../contrib/screenshot.js';
 import { clearChatEditor } from './chatClear.js';
-import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
-import { language } from '../../../../../base/common/platform.js';
-import { MarkdownString } from '../../../../../base/common/htmlContent.js';
-import { IWorkbenchLayoutService, Parts } from '../../../../services/layout/browser/layoutService.js';
-import { IViewDescriptorService, ViewContainerLocation } from '../../../../common/views.js';
-import { ChatEntitlement, IChatEntitlementService } from '../../common/chatEntitlementService.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 
 export const CHAT_CATEGORY = localize2('chat.category', 'Chat');
 
@@ -356,7 +356,7 @@ export function registerChatActions() {
 				category: CHAT_CATEGORY,
 				menu: {
 					id: MenuId.ChatInput,
-					when: ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel),
+					when: ChatContextKeys.chatMode.isEqualTo(ChatMode.Chat),
 					group: 'navigation',
 					order: 1
 				}
@@ -755,3 +755,8 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 		markAsSingleton(disposable);
 	}
 }
+
+export function getEditsViewId(accessor: ServicesAccessor): string {
+	const chatService = accessor.get(IChatService);
+	return chatService.unifiedViewEnabled ? ChatViewId : EditsViewId;
+}
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
index bb7d39aadf69..bd98444aefcd 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
@@ -11,20 +11,20 @@ import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../..
 import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.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 { ActiveEditorContext } from '../../../../common/contextkeys.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { isChatViewTitleActionContext } from '../../common/chatActions.js';
 import { ChatContextKeyExprs, ChatContextKeys } from '../../common/chatContextKeys.js';
 import { hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, IChatEditingSession, WorkingSetEntryState } from '../../common/chatEditingService.js';
-import { IChatService } from '../../common/chatService.js';
 import { ChatAgentLocation, ChatMode } from '../../common/constants.js';
 import { ChatViewId, EditsViewId, IChatWidget, IChatWidgetService } from '../chat.js';
 import { EditingSessionAction } from '../chatEditing/chatEditingActions.js';
 import { ctxIsGlobalEditingSession } from '../chatEditing/chatEditingEditorContextKeys.js';
 import { ChatEditorInput } from '../chatEditorInput.js';
 import { ChatViewPane } from '../chatViewPane.js';
-import { CHAT_CATEGORY, IChatViewOpenOptions } from './chatActions.js';
+import { CHAT_CATEGORY, getEditsViewId, IChatViewOpenOptions } from './chatActions.js';
 import { clearChatEditor } from './chatClear.js';
 
 export const ACTION_ID_NEW_CHAT = `workbench.action.chat.newChat`;
@@ -201,7 +201,7 @@ export function registerNewChatActions() {
 			const widgetService = accessor.get(IChatWidgetService);
 			const dialogService = accessor.get(IDialogService);
 			const viewsService = accessor.get(IViewsService);
-			const chatService = accessor.get(IChatService);
+			const instaSevice = accessor.get(IInstantiationService);
 
 			if (!(await this._handleCurrentEditingSession(editingSession, dialogService))) {
 				return;
@@ -215,7 +215,7 @@ export function registerNewChatActions() {
 				widget = widgetService.getWidgetBySessionId(context.sessionId);
 			} else {
 				// Is running from f1 or keybinding
-				const view = chatService.unifiedViewEnabled ? ChatViewId : EditsViewId;
+				const view = instaSevice.invokeFunction(getEditsViewId);
 				const chatView = await viewsService.openView<ChatViewPane>(view);
 				widget = chatView?.widget;
 			}
@@ -284,7 +284,12 @@ export function registerNewChatActions() {
 				// Is running from f1 or keybinding
 				const viewsService = accessor.get(IViewsService);
 
-				const chatView = await viewsService.openView(EditsViewId) as ChatViewPane;
+				const viewId = getEditsViewId(accessor);
+				const chatView = await viewsService.openView<ChatViewPane>(viewId);
+				if (!chatView) {
+					return;
+				}
+
 				const widget = chatView.widget;
 
 				announceChatCleared(accessibilitySignalService);
@@ -306,7 +311,7 @@ export function registerNewChatActions() {
 				f1: true,
 				menu: [{
 					id: MenuId.ViewTitle,
-					when: ContextKeyExpr.equals('view', EditsViewId),
+					when: ChatContextKeyExprs.inEditingMode,
 					group: 'navigation',
 					order: -3
 				}]
@@ -329,7 +334,7 @@ export function registerNewChatActions() {
 				f1: true,
 				menu: [{
 					id: MenuId.ViewTitle,
-					when: ContextKeyExpr.equals('view', EditsViewId),
+					when: ChatContextKeyExprs.inEditingMode,
 					group: 'navigation',
 					order: -2
 				}]
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
index 9574814ac931..e101b5f1a04b 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -126,12 +126,14 @@ class ToggleChatModeAction extends Action2 {
 					id: MenuId.ChatExecute,
 					order: 1,
 					// Either in edits with agent mode available, or in unified chat view
-					when: ContextKeyExpr.or(
-						ContextKeyExpr.and(
-							ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
-							ChatContextKeys.Editing.hasToolsAgent,
-						),
-						ChatContextKeys.inUnifiedChat),
+					when: ContextKeyExpr.and(
+						ChatContextKeys.enabled,
+						ContextKeyExpr.or(
+							ContextKeyExpr.and(
+								ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession),
+								ChatContextKeys.Editing.hasToolsAgent,
+							),
+							ChatContextKeys.inUnifiedChat)),
 					group: 'navigation',
 				},
 			]
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 877589c639ba..a4919cceeaac 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -482,7 +482,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 	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.currentMode === ChatMode.Agent) {
+		if (this.currentMode === ChatMode.Agent || (this.currentMode === ChatMode.Edit && this.chatService.unifiedViewEnabled)) {
 			if (this.configurationService.getValue('chat.agent.allModels')) {
 				return true;
 			}
diff --git a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
index 00b345093aeb..cc8326cca63c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
@@ -37,7 +37,7 @@ import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID, ChatViewPane } fr
 
 const chatViewContainer: ViewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({
 	id: CHAT_SIDEBAR_PANEL_ID,
-	title: localize2('chat.viewContainer.label', "Chat"),
+	title: { value: 'Copilot', original: 'Copilot' },
 	icon: Codicon.commentDiscussion,
 	ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [CHAT_SIDEBAR_PANEL_ID, { mergeViewWithContainerWhenSingleView: true }]),
 	storageId: CHAT_SIDEBAR_PANEL_ID,
@@ -50,7 +50,7 @@ const chatViewDescriptor: IViewDescriptor[] = [{
 	containerIcon: chatViewContainer.icon,
 	containerTitle: chatViewContainer.title.value,
 	singleViewPaneContainerTitle: chatViewContainer.title.value,
-	name: localize2('chat.viewContainer.label', "Chat"),
+	name: { value: 'Copilot', original: 'Copilot' },
 	canToggleVisibility: false,
 	canMoveView: true,
 	openCommandActionDescriptor: {
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index 11a8e2e7f409..2390d3247ed1 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -942,6 +942,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		this._register(this.input.onDidChangeCurrentChatMode(() => {
 			this.renderSampleQuestions();
 			this.renderWelcomeViewContentIfNeeded();
+			this.refreshParsedInput();
 		}));
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
index 475d9933e08b..92783d78ea06 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
@@ -216,7 +216,7 @@ class AgentCompletions extends Disposable {
 			provideCompletionItems: async (model: ITextModel, position: Position, _context: CompletionContext, token: CancellationToken) => {
 				const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
 				const viewModel = widget?.viewModel;
-				if (!widget || !viewModel) {
+				if (!widget || !viewModel || widget.input.currentMode !== ChatMode.Chat) {
 					return;
 				}
 
@@ -306,7 +306,7 @@ class AgentCompletions extends Disposable {
 			provideCompletionItems: async (model: ITextModel, position: Position, _context: CompletionContext, token: CancellationToken) => {
 				const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
 				const viewModel = widget?.viewModel;
-				if (!widget || !viewModel) {
+				if (!widget || !viewModel || widget.input.currentMode !== ChatMode.Chat) {
 					return;
 				}
 
@@ -367,7 +367,7 @@ class AgentCompletions extends Disposable {
 				}
 
 				const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
-				if (widget?.location !== ChatAgentLocation.Panel) {
+				if (widget?.location !== ChatAgentLocation.Panel || widget.input.currentMode !== ChatMode.Chat) {
 					return;
 				}
 
diff --git a/src/vs/workbench/contrib/chat/common/chatRequestParser.ts b/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
index 3050adba33e9..251e1fb291d7 100644
--- a/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
+++ b/src/vs/workbench/contrib/chat/common/chatRequestParser.ts
@@ -96,7 +96,7 @@ export class ChatRequestParser {
 
 	private tryToParseAgent(message: string, fullMessage: string, offset: number, position: IPosition, parts: Array<IParsedChatRequestPart>, location: ChatAgentLocation, context: IChatParserContext | undefined): ChatRequestAgentPart | undefined {
 		const nextAgentMatch = message.match(agentReg);
-		if (!nextAgentMatch) {
+		if (!nextAgentMatch || context?.mode !== undefined && context.mode !== ChatMode.Chat) {
 			return;
 		}
 
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/__snapshots__/ChatRequestParser_agent_but_edit_mode.0.snap
new file mode 100644
index 000000000000..c746469fe1ec
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/ChatRequestParser_agent_but_edit_mode.0.snap
@@ -0,0 +1,19 @@
+{
+  parts: [
+    {
+      range: {
+        start: 0,
+        endExclusive: 12
+      },
+      editorRange: {
+        startLineNumber: 1,
+        startColumn: 1,
+        endLineNumber: 1,
+        endColumn: 13
+      },
+      text: "@agent hello",
+      kind: "text"
+    }
+  ],
+  text: "@agent hello"
+}
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts b/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts
index 7a2714635a63..d85f3a17f38f 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts
@@ -18,6 +18,7 @@ import { ChatRequestParser } from '../../common/chatRequestParser.js';
 import { IChatService } from '../../common/chatService.js';
 import { IChatSlashCommandService } from '../../common/chatSlashCommands.js';
 import { IChatVariablesService } from '../../common/chatVariables.js';
+import { ChatMode } from '../../common/constants.js';
 import { ILanguageModelToolsService, IToolData } from '../../common/languageModelToolsService.js';
 import { MockChatService } from './mockChatService.js';
 import { MockChatVariablesService } from './mockChatVariables.js';
@@ -142,6 +143,16 @@ suite('ChatRequestParser', () => {
 		await assertSnapshot(result);
 	});
 
+	test('agent but edit mode', async () => {
+		const agentsService = mockObject<IChatAgentService>()({});
+		agentsService.getAgentsByName.returns([getAgentWithSlashCommands([])]);
+		instantiationService.stub(IChatAgentService, agentsService as any);
+
+		parser = instantiationService.createInstance(ChatRequestParser);
+		const result = parser.parseChatRequest('1', '@agent hello', undefined, { mode: ChatMode.Edit });
+		await assertSnapshot(result);
+	});
+
 	test('agent with question mark', async () => {
 		const agentsService = mockObject<IChatAgentService>()({});
 		agentsService.getAgentsByName.returns([getAgentWithSlashCommands([{ name: 'subCommand', description: '' }])]);

From 458154adbeadc54afe22c733e17c7a3df6e9d71e Mon Sep 17 00:00:00 2001
From: Connor Peet <copeet@microsoft.com>
Date: Sat, 15 Mar 2025 23:09:28 -0700
Subject: [PATCH 0972/1815] mcp: button/command for adding MCP servers
 (#243675)

An editor content button is shown on mcp.json to add a server.
Additionally, the command is accessible on the command palette and when
invoked from there will prompt the user to pick where to save their
config.

With registry support I envision the "Select Server Type" would list
servers in addition to letting users provide their own.

Closes #243617
---
 .../configuration/common/configuration.ts     |  24 +++
 .../platform/mcp/common/mcpPlatformTypes.ts   |   6 +-
 .../contrib/mcp/browser/mcp.contribution.ts   |  11 +-
 .../contrib/mcp/browser/mcpCommands.ts        | 177 +++++++++++++++++-
 .../contrib/mcp/common/mcpConfiguration.ts    |   2 +-
 .../common/configurationEditing.ts            |   7 +-
 6 files changed, 215 insertions(+), 12 deletions(-)

diff --git a/src/vs/platform/configuration/common/configuration.ts b/src/vs/platform/configuration/common/configuration.ts
index 177c4e43e9fe..342b3b956a0c 100644
--- a/src/vs/platform/configuration/common/configuration.ts
+++ b/src/vs/platform/configuration/common/configuration.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { assertNever } from '../../../base/common/assert.js';
 import { IStringDictionary } from '../../../base/common/collections.js';
 import { Event } from '../../../base/common/event.js';
 import * as types from '../../../base/common/types.js';
@@ -103,6 +104,29 @@ export interface IConfigurationValue<T> {
 	readonly overrideIdentifiers?: string[];
 }
 
+export function getConfigValueInTarget<T>(configValue: IConfigurationValue<T>, scope: ConfigurationTarget): T | undefined {
+	switch (scope) {
+		case ConfigurationTarget.APPLICATION:
+			return configValue.applicationValue;
+		case ConfigurationTarget.USER:
+			return configValue.userValue;
+		case ConfigurationTarget.USER_LOCAL:
+			return configValue.userLocalValue;
+		case ConfigurationTarget.USER_REMOTE:
+			return configValue.userRemoteValue;
+		case ConfigurationTarget.WORKSPACE:
+			return configValue.workspaceValue;
+		case ConfigurationTarget.WORKSPACE_FOLDER:
+			return configValue.workspaceFolderValue;
+		case ConfigurationTarget.DEFAULT:
+			return configValue.defaultValue;
+		case ConfigurationTarget.MEMORY:
+			return configValue.memoryValue;
+		default:
+			assertNever(scope);
+	}
+}
+
 export function isConfigured<T>(configValue: IConfigurationValue<T>): configValue is IConfigurationValue<T> & { value: T } {
 	return configValue.applicationValue !== undefined ||
 		configValue.userValue !== undefined ||
diff --git a/src/vs/platform/mcp/common/mcpPlatformTypes.ts b/src/vs/platform/mcp/common/mcpPlatformTypes.ts
index 815ee332b40d..47df96028fba 100644
--- a/src/vs/platform/mcp/common/mcpPlatformTypes.ts
+++ b/src/vs/platform/mcp/common/mcpPlatformTypes.ts
@@ -4,12 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 export interface IMcpConfiguration {
-	inputs: unknown[];
+	inputs?: unknown[];
 	/** @deprecated Only for rough cross-compat with other formats */
 	mcpServers?: Record<string, IMcpConfigurationStdio>;
-	servers: Record<string, IMcpConfigurationStdio | IMcpConfigurationSSE>;
+	servers?: Record<string, IMcpConfigurationStdio | IMcpConfigurationSSE>;
 }
 
+export type McpConfigurationServer = IMcpConfigurationStdio | IMcpConfigurationSSE;
+
 export interface IMcpConfigurationStdio {
 	type?: 'stdio';
 	command: string;
diff --git a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
index 7ab928aee109..f886d782765c 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcp.contribution.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import * as jsonContributionRegistry from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
@@ -10,20 +11,18 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
 import { mcpSchemaId } from '../../../services/configuration/common/configuration.js';
 import { ConfigMcpDiscovery } from '../common/discovery/configMcpDiscovery.js';
+import { ExtensionMcpDiscovery } from '../common/discovery/extensionMcpDiscovery.js';
 import { mcpDiscoveryRegistry } from '../common/discovery/mcpDiscovery.js';
 import { RemoteNativeMpcDiscovery } from '../common/discovery/nativeMcpRemoteDiscovery.js';
 import { mcpServerSchema } from '../common/mcpConfiguration.js';
+import { McpContextKeysController } from '../common/mcpContextKeys.js';
 import { McpRegistry } from '../common/mcpRegistry.js';
 import { IMcpRegistry } from '../common/mcpRegistryTypes.js';
 import { McpService } from '../common/mcpService.js';
 import { IMcpService } from '../common/mcpTypes.js';
+import { AddConfigurationAction, ListMcpServerCommand, MCPServerActionRendering, McpServerOptionsCommand, ResetMcpCachedTools, ResetMcpTrustCommand } from './mcpCommands.js';
 import { McpDiscovery } from './mcpDiscovery.js';
 
-import { MCPServerActionRendering, ListMcpServerCommand, ResetMcpTrustCommand, McpServerOptionsCommand, ResetMcpCachedTools } from './mcpCommands.js';
-import { registerAction2 } from '../../../../platform/actions/common/actions.js';
-import { McpContextKeysController } from '../common/mcpContextKeys.js';
-import { ExtensionMcpDiscovery } from '../common/discovery/extensionMcpDiscovery.js';
-
 registerSingleton(IMcpRegistry, McpRegistry, InstantiationType.Delayed);
 registerSingleton(IMcpService, McpService, InstantiationType.Delayed);
 
@@ -38,6 +37,8 @@ registerAction2(ListMcpServerCommand);
 registerAction2(McpServerOptionsCommand);
 registerAction2(ResetMcpTrustCommand);
 registerAction2(ResetMcpCachedTools);
+registerAction2(AddConfigurationAction);
+
 registerWorkbenchContribution2('mcpActionRendering', MCPServerActionRendering, WorkbenchPhase.BlockRestore);
 
 const jsonRegistry = <jsonContributionRegistry.IJSONContributionRegistry>Registry.as(jsonContributionRegistry.Extensions.JSONContribution);
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index 7e6491406cbe..fe14cebe3795 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -10,21 +10,31 @@ import { Event } from '../../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { autorun, derived } 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 { ILocalizedString, 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 } from '../../../../platform/actions/common/actions.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ConfigurationTarget, getConfigValueInTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IMcpConfiguration, IMcpConfigurationSSE } from '../../../../platform/mcp/common/mcpPlatformTypes.js';
 import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
 import { spinningLoading } from '../../../../platform/theme/common/iconRegistry.js';
+import { IWorkspace, IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { ActiveEditorContext, ResourceContextKey } from '../../../common/contextkeys.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { IJSONEditingService } from '../../../services/configuration/common/jsonEditing.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
 import { ChatMode } from '../../chat/common/constants.js';
+import { TEXT_FILE_EDITOR_ID } from '../../files/common/files.js';
+import { IMcpConfigurationStdio } from '../common/mcpConfiguration.js';
 import { McpContextKeys } from '../common/mcpContextKeys.js';
 import { IMcpRegistry } from '../common/mcpRegistryTypes.js';
-import { LazyCollectionState, IMcpServer, IMcpService, McpConnectionState, McpServerToolsState } from '../common/mcpTypes.js';
+import { IMcpServer, IMcpService, LazyCollectionState, McpConnectionState, McpServerToolsState } from '../common/mcpTypes.js';
 
 // acroynms do not get localized
 const category: ILocalizedString = {
@@ -357,3 +367,168 @@ export class ResetMcpCachedTools extends Action2 {
 		mcpService.resetCaches();
 	}
 }
+
+export class AddConfigurationAction extends Action2 {
+	static readonly ID = 'workbench.mcp.addConfiguration';
+
+	constructor() {
+		super({
+			id: AddConfigurationAction.ID,
+			title: localize2('mcp.addConfiguration', "Add Server..."),
+			metadata: {
+				description: localize2('mcp.addConfiguration.description', "Installs a new Model Context protocol to the mcp.json settings"),
+			},
+			category,
+			f1: true,
+			menu: {
+				id: MenuId.EditorContent,
+				when: ContextKeyExpr.and(
+					ContextKeyExpr.regex(ResourceContextKey.Path.key, /\.vscode[/\\]mcp\.json$/),
+					ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)
+				)
+			}
+		});
+	}
+
+	private async getServerType(quickInputService: IQuickInputService): Promise<{ id: 'stdio' | 'sse' } | undefined> {
+		return quickInputService.pick([
+			{ id: 'stdio', label: localize('mcp.serverType.command', "Command (stdio)"), description: localize('mcp.serverType.command.description', "Run a local command that implements the MCP protocol") },
+			{ id: 'sse', label: localize('mcp.serverType.http', "HTTP (server-sent events)"), description: localize('mcp.serverType.http.description', "Connect to a remote HTTP server that implements the MCP protocol") }
+		], {
+			title: localize('mcp.serverType.title', "Select Server Type"),
+			placeHolder: localize('mcp.serverType.placeholder', "Choose the type of MCP server to add")
+		}) as Promise<{ id: 'stdio' | 'sse' } | undefined>;
+	}
+
+	private async getStdioConfig(quickInputService: IQuickInputService): Promise<IMcpConfigurationStdio | undefined> {
+		const command = await quickInputService.input({
+			title: localize('mcp.command.title', "Enter Command"),
+			placeHolder: localize('mcp.command.placeholder', "Command to run (with optional arguments)"),
+			ignoreFocusLost: true,
+		});
+
+		if (!command) {
+			return undefined;
+		}
+
+		// Split command into command and args, handling quotes
+		const parts = command.match(/(?:[^\s"]+|"[^"]*")+/g)!;
+		return {
+			type: 'stdio',
+			command: parts[0].replace(/"/g, ''),
+			args: parts.slice(1).map(arg => arg.replace(/"/g, ''))
+		};
+	}
+
+	private async getSSEConfig(quickInputService: IQuickInputService): Promise<IMcpConfigurationSSE | undefined> {
+		const url = await quickInputService.input({
+			title: localize('mcp.url.title', "Enter Server URL"),
+			placeHolder: localize('mcp.url.placeholder', "URL of the MCP server (e.g., http://localhost:3000)"),
+			ignoreFocusLost: true,
+		});
+
+		if (!url) {
+			return undefined;
+		}
+
+		return {
+			type: 'sse',
+			url
+		};
+	}
+
+	private async getServerId(quickInputService: IQuickInputService): Promise<string | undefined> {
+		const suggestedId = `my-mcp-server-${generateUuid().split('-')[0]}`;
+		const id = await quickInputService.input({
+			title: localize('mcp.serverId.title', "Enter Server ID"),
+			placeHolder: localize('mcp.serverId.placeholder', "Unique identifier for this server"),
+			value: suggestedId,
+			ignoreFocusLost: true,
+		});
+
+		return id;
+	}
+
+	private async getConfigurationTarget(quickInputService: IQuickInputService, workspace: IWorkspace, isInRemote: boolean): Promise<ConfigurationTarget | undefined> {
+		const options: (IQuickPickItem & { target: ConfigurationTarget })[] = [
+			{ target: ConfigurationTarget.USER, label: localize('mcp.target.user', "User Settings"), description: localize('mcp.target.user.description', "Available in all workspaces") }
+		];
+
+		if (isInRemote) {
+			options.push({ target: ConfigurationTarget.USER_REMOTE, label: localize('mcp.target.remote', "Remote Settings"), description: localize('mcp.target..remote.description', "Available on this remote machine") });
+		}
+
+		if (workspace.folders.length > 0) {
+			options.push({ target: ConfigurationTarget.WORKSPACE, label: localize('mcp.target.workspace', "Workspace Settings"), description: localize('mcp.target.workspace.description', "Available in this workspace") });
+		}
+
+		if (options.length === 1) {
+			return options[0].target;
+		}
+
+
+		const targetPick = await quickInputService.pick(options, {
+			title: localize('mcp.target.title', "Choose where to save the configuration"),
+		});
+
+		return targetPick?.target;
+	}
+
+	async run(accessor: ServicesAccessor, configUri?: string): Promise<void> {
+		const quickInputService = accessor.get(IQuickInputService);
+		const configurationService = accessor.get(IConfigurationService);
+		const jsonEditingService = accessor.get(IJSONEditingService);
+		const workspaceService = accessor.get(IWorkspaceContextService);
+		const environmentService = accessor.get(IWorkbenchEnvironmentService);
+
+		// Step 1: Choose server type
+		const serverType = await this.getServerType(quickInputService);
+		if (!serverType) {
+			return;
+		}
+
+		// Step 2: Get server details based on type
+		const serverConfig = await (serverType.id === 'stdio'
+			? this.getStdioConfig(quickInputService)
+			: this.getSSEConfig(quickInputService));
+
+		if (!serverConfig) {
+			return;
+		}
+
+		// Step 3: Get server ID
+		const serverId = await this.getServerId(quickInputService);
+		if (!serverId) {
+			return;
+		}
+
+		// Step 4: Choose configuration target if no configUri provided
+		let target: ConfigurationTarget | undefined;
+		const workspace = workspaceService.getWorkspace();
+		if (!configUri) {
+			target = await this.getConfigurationTarget(quickInputService, workspace, !!environmentService.remoteAuthority);
+			if (!target) {
+				return;
+			}
+		}
+
+		// Step 5: Update configuration
+		const writeToUriDirect = configUri
+			? URI.parse(configUri)
+			: target === ConfigurationTarget.WORKSPACE && workspace.folders.length === 1
+				? URI.joinPath(workspace.folders[0].uri, '.vscode', 'mcp.json')
+				: undefined;
+
+		if (writeToUriDirect) {
+			await jsonEditingService.write(writeToUriDirect, [{
+				path: ['servers', serverId],
+				value: serverConfig
+			}], true);
+		} else {
+			const settings: IMcpConfiguration = { ...getConfigValueInTarget(configurationService.inspect<IMcpConfiguration>('mcp'), target!) };
+			settings.servers ??= {};
+			settings.servers[serverId] = serverConfig;
+			await configurationService.updateValue('mcp', settings, target!);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
index ca95443116f2..fcef4dc9d486 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
@@ -10,7 +10,7 @@ import { mcpSchemaId } from '../../../services/configuration/common/configuratio
 import { inputsSchema } from '../../../services/configurationResolver/common/configurationResolverSchema.js';
 import { IExtensionPointDescriptor } from '../../../services/extensions/common/extensionsRegistry.js';
 
-export type { IMcpConfigurationStdio, IMcpConfiguration } from '../../../../platform/mcp/common/mcpPlatformTypes.js';
+export type { McpConfigurationServer, IMcpConfigurationStdio, IMcpConfiguration } from '../../../../platform/mcp/common/mcpPlatformTypes.js';
 
 const mcpActivationEventPrefix = 'onMcpCollection:';
 
diff --git a/src/vs/workbench/services/configuration/common/configurationEditing.ts b/src/vs/workbench/services/configuration/common/configurationEditing.ts
index 2ecea1839655..18f3c329745d 100644
--- a/src/vs/workbench/services/configuration/common/configurationEditing.ts
+++ b/src/vs/workbench/services/configuration/common/configurationEditing.ts
@@ -531,7 +531,7 @@ export class ConfigurationEditing {
 
 		if (operation.workspaceStandAloneConfigurationKey) {
 			// Global launches are not supported
-			if ((operation.workspaceStandAloneConfigurationKey !== TASKS_CONFIGURATION_KEY) && (target === EditableConfigurationTarget.USER_LOCAL || target === EditableConfigurationTarget.USER_REMOTE)) {
+			if ((operation.workspaceStandAloneConfigurationKey !== TASKS_CONFIGURATION_KEY) && (operation.workspaceStandAloneConfigurationKey !== MCP_CONFIGURATION_KEY) && (target === EditableConfigurationTarget.USER_LOCAL || target === EditableConfigurationTarget.USER_REMOTE)) {
 				throw this.toConfigurationEditingError(ConfigurationEditingErrorCode.ERROR_INVALID_USER_TARGET, target, operation);
 			}
 		}
@@ -590,15 +590,16 @@ export class ConfigurationEditing {
 				const resource = this.getConfigurationFileResource(target, key, standaloneConfigurationMap[key], overrides.resource, undefined);
 
 				// Check for prefix
+				const keyRemainsNested = this.isWorkspaceConfigurationResource(resource) || resource?.fsPath === this.userDataProfileService.currentProfile.settingsResource.fsPath;
 				if (config.key === key) {
-					const jsonPath = this.isWorkspaceConfigurationResource(resource) ? [key] : [];
+					const jsonPath = keyRemainsNested ? [key] : [];
 					return { key: jsonPath[jsonPath.length - 1], jsonPath, value: config.value, resource: resource ?? undefined, workspaceStandAloneConfigurationKey: key, target };
 				}
 
 				// Check for prefix.<setting>
 				const keyPrefix = `${key}.`;
 				if (config.key.indexOf(keyPrefix) === 0) {
-					const jsonPath = this.isWorkspaceConfigurationResource(resource) ? [key, config.key.substr(keyPrefix.length)] : [config.key.substr(keyPrefix.length)];
+					const jsonPath = keyRemainsNested ? [key, config.key.substr(keyPrefix.length)] : [config.key.substr(keyPrefix.length)];
 					return { key: jsonPath[jsonPath.length - 1], jsonPath, value: config.value, resource: resource ?? undefined, workspaceStandAloneConfigurationKey: key, target };
 				}
 			}

From 116b986f778e4473bcd658e5fbb8d6c7d71c1be4 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sun, 16 Mar 2025 07:49:24 +0100
Subject: [PATCH 0973/1815] chat - status and setup cleanup (#243573)

---
 .../chat/browser/actions/chatActions.ts       |  13 +-
 .../contrib/chat/browser/chatSetup.ts         |  52 +++---
 .../contrib/chat/browser/chatStatus.ts        | 158 ++++++++----------
 .../contrib/chat/common/chatContextKeys.ts    |  13 +-
 .../chat/common/chatEntitlementService.ts     | 145 ++++++++++------
 5 files changed, 201 insertions(+), 180 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index 5793a665744b..e416d5d651f7 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -24,7 +24,7 @@ import { DropdownWithPrimaryActionViewItem } from '../../../../../platform/actio
 import { Action2, MenuId, MenuItemAction, MenuRegistry, registerAction2, SubmenuItemAction } 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 { IsLinuxContext, IsWindowsContext } from '../../../../../platform/contextkey/common/contextkeys.js';
 import { IDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
@@ -43,7 +43,7 @@ import { IViewsService } from '../../../../services/views/common/viewsService.js
 import { EXTENSIONS_CATEGORY, IExtensionsWorkbenchService } from '../../../extensions/common/extensions.js';
 import { IChatAgentService } from '../../common/chatAgents.js';
 import { ChatContextKeys } from '../../common/chatContextKeys.js';
-import { ChatEntitlement, IChatEntitlementService } from '../../common/chatEntitlementService.js';
+import { ChatEntitlement, ChatSentiment, IChatEntitlementService } from '../../common/chatEntitlementService.js';
 import { extractAgentAndCommand } from '../../common/chatParserTypes.js';
 import { IChatDetail, IChatService } from '../../common/chatService.js';
 import { IChatRequestViewModel, IChatResponseViewModel, isRequestVM } from '../../common/chatViewModel.js';
@@ -514,8 +514,8 @@ export function registerChatActions() {
 				f1: true,
 				precondition: ContextKeyExpr.and(
 					ContextKeyExpr.or(
-						ChatContextKeys.Setup.limited,
-						ChatContextKeys.Setup.pro
+						ChatContextKeys.Entitlement.limited,
+						ChatContextKeys.Entitlement.pro
 					),
 					nonEnterpriseCopilotUsers
 				),
@@ -692,7 +692,6 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 		@IChatAgentService agentService: IChatAgentService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IChatEntitlementService chatEntitlementService: IChatEntitlementService,
-		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConfigurationService configurationService: IConfigurationService,
 	) {
 		super();
@@ -708,7 +707,7 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 				run() { }
 			});
 
-			const chatExtensionInstalled = contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.installed.key) === true;
+			const chatExtensionInstalled = chatEntitlementService.sentiment === ChatSentiment.Installed;
 			const { chatQuotaExceeded, completionsQuotaExceeded } = chatEntitlementService.quotas;
 			const signedOut = chatEntitlementService.entitlement === ChatEntitlement.Unknown;
 			const setupFromDialog = configurationService.getValue('chat.experimental.setupFromDialog');
@@ -745,7 +744,7 @@ export class CopilotTitleBarMenuRendering extends Disposable implements IWorkben
 				icon: primaryActionIcon,
 			}, undefined, undefined, undefined, undefined), dropdownAction, action.actions, '', { ...options, skipTelemetry: true });
 		}, Event.any(
-			agentService.onDidChangeAgents,
+			chatEntitlementService.onDidChangeSentiment,
 			chatEntitlementService.onDidChangeQuotaExceeded,
 			chatEntitlementService.onDidChangeEntitlement,
 			Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('chat.experimental.setupFromDialog'))
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 34b679d5840f..887b98797477 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import './media/chatViewSetup.css';
 import { $, getActiveElement, setVisibility } from '../../../../base/browser/dom.js';
 import { ButtonWithDropdown } from '../../../../base/browser/ui/button/button.js';
 import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
@@ -56,12 +57,11 @@ import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
 import { ChatAgentLocation, IChatAgentImplementation, IChatAgentRequest, IChatAgentResult, IChatAgentService, IChatWelcomeMessageContent } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
-import { ChatEntitlement, ChatEntitlementService, ChatSetupContext, ChatSetupRequests, IChatEntitlementService } from '../common/chatEntitlementService.js';
+import { ChatEntitlement, ChatEntitlementContext, ChatEntitlementRequests, ChatEntitlementService, IChatEntitlementService } from '../common/chatEntitlementService.js';
 import { IChatProgress, IChatProgressMessage, IChatWarningMessage } from '../common/chatService.js';
 import { CHAT_CATEGORY, CHAT_SETUP_ACTION_ID } from './actions/chatActions.js';
 import { ChatViewId, EditsViewId, ensureSideBarChatViewSize, preferCopilotEditsView, showCopilotView } from './chat.js';
 import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
-import './media/chatViewSetup.css';
 import { ChatViewsWelcomeExtensions, IChatViewsWelcomeContributionRegistry } from './viewsWelcome/chatViewsWelcome.js';
 
 const defaultChat = {
@@ -89,7 +89,7 @@ const defaultChat = {
 
 class SetupChatAgentImplementation implements IChatAgentImplementation {
 
-	static register(instantiationService: IInstantiationService, location: ChatAgentLocation, context: ChatSetupContext, controller: Lazy<ChatSetupController>): IDisposable {
+	static register(instantiationService: IInstantiationService, location: ChatAgentLocation, context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): IDisposable {
 		return instantiationService.invokeFunction(accessor => {
 			const chatAgentService = accessor.get(IChatAgentService);
 
@@ -137,7 +137,7 @@ class SetupChatAgentImplementation implements IChatAgentImplementation {
 	}
 
 	constructor(
-		private readonly context: ChatSetupContext,
+		private readonly context: ChatEntitlementContext,
 		private readonly controller: Lazy<ChatSetupController>,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ILogService private readonly logService: ILogService,
@@ -158,7 +158,7 @@ class SetupChatAgentImplementation implements IChatAgentImplementation {
 					case ChatSetupStep.SigningIn:
 						progress({
 							kind: 'progressMessage',
-							content: new MarkdownString(localize('setupChatSignIn2', "Signing in to {0}...", ChatSetupRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName)),
+							content: new MarkdownString(localize('setupChatSignIn2', "Signing in to {0}...", ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName)),
 						} satisfies IChatProgressMessage);
 						break;
 					case ChatSetupStep.Installing:
@@ -208,7 +208,7 @@ class SetupChatAgentImplementation implements IChatAgentImplementation {
 class ChatSetupDialog {
 
 	constructor(
-		private readonly context: ChatSetupContext,
+		private readonly context: ChatEntitlementContext,
 		@IDialogService private readonly dialogService: IDialogService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService
@@ -217,7 +217,7 @@ class ChatSetupDialog {
 	async show(): Promise<boolean> {
 		const res = await this.dialogService.prompt<boolean>({
 			type: 'none',
-			message: localize('copilotFree', "Use AI Features with Copilot for Free"),
+			message: localize('copilotFree', "Welcome to Copilot"),
 			cancelButton: {
 				label: localize('cancel', "Cancel"),
 				run: () => false
@@ -280,6 +280,12 @@ class ChatSetupDialog {
 			)
 		);
 
+		// Limited SKU
+		if (this.context.state.entitlement !== ChatEntitlement.Pro && this.context.state.entitlement !== ChatEntitlement.Unavailable) {
+			const free = localize({ key: 'free', comment: ['{Locked="[]({0})"}'] }, "$(sparkle-filled) We now offer [Copilot for free]({0}).", defaultChat.skusDocumentationUrl);
+			element.appendChild($('p', undefined, disposables.add(markdown.render(new MarkdownString(free, { isTrusted: true, supportThemeIcons: true }))).element));
+		}
+
 		// Terms
 		const terms = localize({ key: 'terms', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "By continuing, you agree to the [Terms]({0}) and [Privacy Policy]({1}).", defaultChat.termsStatementUrl, defaultChat.privacyStatementUrl);
 		element.appendChild($('p.legal', undefined, disposables.add(markdown.render(new MarkdownString(terms, { isTrusted: true }))).element));
@@ -322,7 +328,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 		this.registerUrlLinkHandler();
 	}
 
-	private registerSetupAgents(context: ChatSetupContext, controller: Lazy<ChatSetupController>): void {
+	private registerSetupAgents(context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): void {
 		const registration = this._register(new MutableDisposable());
 
 		const updateRegistration = () => {
@@ -343,7 +349,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 		), () => updateRegistration()));
 	}
 
-	private registerChatWelcome(context: ChatSetupContext, controller: Lazy<ChatSetupController>): void {
+	private registerChatWelcome(context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): void {
 		Registry.as<IChatViewsWelcomeContributionRegistry>(ChatViewsWelcomeExtensions.ChatViewsWelcomeRegistry).register({
 			title: localize('welcomeChat', "Welcome to Copilot"),
 			when: ChatContextKeys.SetupViewCondition,
@@ -352,11 +358,13 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 		});
 	}
 
-	private registerActions(context: ChatSetupContext, requests: ChatSetupRequests, controller: Lazy<ChatSetupController>): void {
-		const chatSetupTriggerContext = ContextKeyExpr.or(
-			ChatContextKeys.Setup.installed.negate(),
-			ChatContextKeys.Setup.canSignUp
-		);
+	private registerActions(context: ChatEntitlementContext, requests: ChatEntitlementRequests, controller: Lazy<ChatSetupController>): void {
+		const chatSetupTriggerContext = ContextKeyExpr.and(
+			ChatContextKeys.Setup.fromDialog.negate(), // reduce noise when using the skeleton-view approach
+			ContextKeyExpr.or(
+				ChatContextKeys.Setup.installed.negate(),
+				ChatContextKeys.Entitlement.canSignUp
+			));
 
 		const CHAT_SETUP_ACTION_LABEL = localize2('triggerChatSetup', "Use AI Features with Copilot for Free...");
 
@@ -494,8 +502,8 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 					category: localize2('chat.category', 'Chat'),
 					f1: true,
 					precondition: ContextKeyExpr.or(
-						ChatContextKeys.Setup.canSignUp,
-						ChatContextKeys.Setup.limited,
+						ChatContextKeys.Entitlement.canSignUp,
+						ChatContextKeys.Entitlement.limited,
 					),
 					menu: {
 						id: MenuId.ChatTitleBarMenu,
@@ -597,8 +605,8 @@ class ChatSetupController extends Disposable {
 	private willShutdown = false;
 
 	constructor(
-		private readonly context: ChatSetupContext,
-		private readonly requests: ChatSetupRequests,
+		private readonly context: ChatEntitlementContext,
+		private readonly requests: ChatEntitlementRequests,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
 		@IViewsService private readonly viewsService: IViewsService,
@@ -659,7 +667,7 @@ class ChatSetupController extends Disposable {
 		let success = false;
 		try {
 			const setupFromDialog = Boolean(this.configurationService.getValue('chat.experimental.setupFromDialog'));
-			const providerId = ChatSetupRequests.providerId(this.configurationService);
+			const providerId = ChatEntitlementRequests.providerId(this.configurationService);
 			let session: AuthenticationSession | undefined;
 			let entitlement: ChatEntitlement | undefined;
 
@@ -718,7 +726,7 @@ class ChatSetupController extends Disposable {
 		if (!session && !this.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?", ChatSetupRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName),
+				message: localize('unknownSignInError', "Failed to sign in to {0}. Would you like to try again?", ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName),
 				detail: localize('unknownSignInErrorDetail', "You must be signed in to use Copilot."),
 				primaryButton: localize('retry', "Retry")
 			});
@@ -825,7 +833,7 @@ class ChatSetupWelcomeContent extends Disposable {
 
 	constructor(
 		private readonly controller: ChatSetupController,
-		private readonly context: ChatSetupContext,
+		private readonly context: ChatEntitlementContext,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -925,7 +933,7 @@ class ChatSetupWelcomeContent extends Disposable {
 
 		switch (this.controller.step) {
 			case ChatSetupStep.SigningIn:
-				buttonLabel = localize('setupChatSignIn', "$(loading~spin) Signing in to {0}...", ChatSetupRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName);
+				buttonLabel = localize('setupChatSignIn', "$(loading~spin) Signing in to {0}...", ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName);
 				break;
 			case ChatSetupStep.Installing:
 				buttonLabel = localize('setupChatInstalling', "$(loading~spin) Getting Copilot Ready...");
diff --git a/src/vs/workbench/contrib/chat/browser/chatStatus.ts b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
index 4405746333c2..6d1030537c48 100644
--- a/src/vs/workbench/contrib/chat/browser/chatStatus.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatStatus.ts
@@ -8,12 +8,10 @@ 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 { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, ShowTooltipCommand, StatusbarAlignment, StatusbarEntryKind } from '../../../services/statusbar/browser/statusbar.js';
-import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { $, addDisposableListener, append, clearNode, EventHelper, EventType } from '../../../../base/browser/dom.js';
-import { ChatEntitlement, ChatEntitlementService, IChatEntitlementService } from '../common/chatEntitlementService.js';
+import { ChatEntitlement, ChatEntitlementService, ChatSentiment, IChatEntitlementService } from '../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';
@@ -30,8 +28,6 @@ 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 { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { Codicon } from '../../../../base/common/codicons.js';
 
 //#region --- colors
 
@@ -105,7 +101,6 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	constructor(
 		@IStatusbarService private readonly statusbarService: IStatusbarService,
 		@IChatEntitlementService private readonly chatEntitlementService: ChatEntitlementService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
@@ -116,7 +111,7 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	}
 
 	private async create(): Promise<void> {
-		const hidden = this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.hidden.key) === true;
+		const hidden = this.chatEntitlementService.sentiment === ChatSentiment.Disabled;
 		const disabled = this.configurationService.getValue<boolean>(ChatStatusBarEntry.SETTING) === false;
 
 		if (!hidden && !disabled) {
@@ -139,18 +134,8 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 			}
 		}));
 
-		const contextKeysSet = new Set([ChatContextKeys.Setup.installed.key]);
-		this._register(this.contextKeyService.onDidChangeContext(e => {
-			if (!this.entry) {
-				return;
-			}
-
-			if (e.affectsSome(contextKeysSet)) {
-				this.entry.update(this.getEntryProps());
-			}
-		}));
-
 		this._register(this.chatEntitlementService.onDidChangeQuotaExceeded(() => this.entry?.update(this.getEntryProps())));
+		this._register(this.chatEntitlementService.onDidChangeSentiment(() => this.entry?.update(this.getEntryProps())));
 		this._register(this.chatEntitlementService.onDidChangeEntitlement(() => this.entry?.update(this.getEntryProps())));
 	}
 
@@ -159,36 +144,33 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 		let ariaLabel = localize('chatStatus', "Copilot Status");
 		let kind: StatusbarEntryKind | undefined;
 
-		const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatEntitlementService.quotas;
+		if (!isNewUser(this.chatEntitlementService)) {
+			const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatEntitlementService.quotas;
 
-		// New User
-		if (isNewUser(this.contextKeyService, this.chatEntitlementService)) {
-			ariaLabel = localize('triggerChatSetup', "Use AI Features with Copilot for Free");
-		}
+			// Signed out
+			if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
+				const signedOutWarning = localize('notSignedIntoCopilot', "Signed out");
 
-		// Signed out
-		else if (this.chatEntitlementService.entitlement === ChatEntitlement.Unknown) {
-			const signedOutWarning = localize('notSignedIntoCopilot', "Signed out");
+				text = `$(copilot-not-connected) ${signedOutWarning}`;
+				ariaLabel = signedOutWarning;
+				kind = 'prominent';
+			}
 
-			text = `$(copilot-not-connected) ${signedOutWarning}`;
-			ariaLabel = signedOutWarning;
-			kind = 'prominent';
-		}
+			// Quota Exceeded
+			else if (chatQuotaExceeded || completionsQuotaExceeded) {
+				let quotaWarning: string;
+				if (chatQuotaExceeded && !completionsQuotaExceeded) {
+					quotaWarning = localize('chatQuotaExceededStatus', "Chat limit reached");
+				} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
+					quotaWarning = localize('completionsQuotaExceededStatus', "Completions limit reached");
+				} else {
+					quotaWarning = localize('chatAndCompletionsQuotaExceededStatus', "Limit reached");
+				}
 
-		// Quota Exceeded
-		else if (chatQuotaExceeded || completionsQuotaExceeded) {
-			let quotaWarning: string;
-			if (chatQuotaExceeded && !completionsQuotaExceeded) {
-				quotaWarning = localize('chatQuotaExceededStatus', "Chat limit reached");
-			} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-				quotaWarning = localize('completionsQuotaExceededStatus', "Completions limit reached");
-			} else {
-				quotaWarning = localize('chatAndCompletionsQuotaExceededStatus', "Limit reached");
+				text = `$(copilot-warning) ${quotaWarning}`;
+				ariaLabel = quotaWarning;
+				kind = 'prominent';
 			}
-
-			text = `$(copilot-warning) ${quotaWarning}`;
-			ariaLabel = quotaWarning;
-			kind = 'prominent';
 		}
 
 		return {
@@ -210,13 +192,13 @@ export class ChatStatusBarEntry extends Disposable implements IWorkbenchContribu
 	}
 }
 
-function isNewUser(contextKeyService: IContextKeyService, chatEntitlementService: IChatEntitlementService): boolean {
-	return contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.installed.key) === false ||	// copilot not installed
-		chatEntitlementService.entitlement === ChatEntitlement.Available;									// not yet signed up to copilot
+function isNewUser(chatEntitlementService: IChatEntitlementService): boolean {
+	return chatEntitlementService.sentiment !== ChatSentiment.Installed ||	// copilot not installed
+		chatEntitlementService.entitlement === ChatEntitlement.Available;	// not yet signed up to copilot
 }
 
-function canUseCopilot(contextKeyService: IContextKeyService, chatEntitlementService: IChatEntitlementService): boolean {
-	const newUser = isNewUser(contextKeyService, chatEntitlementService);
+function canUseCopilot(chatEntitlementService: IChatEntitlementService): boolean {
+	const newUser = isNewUser(chatEntitlementService);
 	const signedOut = chatEntitlementService.entitlement === ChatEntitlement.Unknown;
 	const allQuotaReached = chatEntitlementService.quotas.chatQuotaExceeded && chatEntitlementService.quotas.completionsQuotaExceeded;
 
@@ -236,7 +218,6 @@ class ChatStatusDashboard extends Disposable {
 	private readonly entryDisposables = this._register(new MutableDisposable());
 
 	constructor(
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IChatEntitlementService private readonly chatEntitlementService: ChatEntitlementService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IHoverService private readonly hoverService: IHoverService,
@@ -253,44 +234,25 @@ class ChatStatusDashboard extends Disposable {
 		const disposables = this.entryDisposables.value = new DisposableStore();
 		disposables.add(token.onCancellationRequested(() => disposables.dispose()));
 
-		let addSeparator = false;
+		let needsSeparator = false;
+		const addSeparator = (label: string | undefined) => {
+			if (needsSeparator) {
+				this.element.appendChild($('hr'));
+				needsSeparator = false;
+			}
 
-		const newUser = isNewUser(this.contextKeyService, this.chatEntitlementService);
-		const signedOut = this.chatEntitlementService.entitlement === ChatEntitlement.Unknown;
+			if (label) {
+				this.element.appendChild($('div.header', undefined, label));
+			}
 
-		// New to Copilot / Signed out
-		if (newUser || signedOut) {
-			this.element.appendChild($('div.header', undefined, localize('setupCopilot', "Use AI Features with Copilot")));
-			addSeparator = true;
-
-			const setup = this.element.appendChild(
-				$('div.setup', undefined,
-					$('div.chat-feature-container', undefined,
-						renderIcon(Codicon.code),
-						$('span', undefined, localize('featureChat', "Code faster with Completions"))
-					),
-					$('div.chat-feature-container', undefined,
-						renderIcon(Codicon.editSession),
-						$('span', undefined, localize('featureEdits', "Build features with Copilot Edits"))
-					),
-					$('div.chat-feature-container', undefined,
-						renderIcon(Codicon.commentDiscussion),
-						$('span', undefined, localize('featureExplore', "Explore your codebase with Chat"))
-					)
-				)
-			);
-
-			const button = disposables.add(new Button(setup, { ...defaultButtonStyles }));
-			button.label = newUser ? localize('setupCopilotForFreeButton', "Set up Copilot for Free") : localize('signInToUseCopilotButton', "Sign In to Use Copilot");
-			disposables.add(button.onDidClick(() => this.runCommandAndClose(newUser ? { id: 'workbench.action.chat.triggerSetup' } : () => this.chatEntitlementService.requests?.value.signIn())));
-		}
+			needsSeparator = true;
+		};
 
 		// Quota Indicator
-		else if (this.chatEntitlementService.entitlement === ChatEntitlement.Limited) {
+		if (this.chatEntitlementService.entitlement === ChatEntitlement.Limited) {
 			const { chatTotal, chatRemaining, completionsTotal, completionsRemaining, quotaResetDate, chatQuotaExceeded, completionsQuotaExceeded } = this.chatEntitlementService.quotas;
 
-			this.element.appendChild($('div.header', undefined, localize('usageTitle', "Copilot Free Usage")));
-			addSeparator = true;
+			addSeparator(localize('usageTitle', "Copilot Free Usage"));
 
 			const chatQuotaIndicator = this.createQuotaIndicator(this.element, chatTotal, chatRemaining, localize('chatsLabel', "Chat messages"));
 			const completionsQuotaIndicator = this.createQuotaIndicator(this.element, completionsTotal, completionsRemaining, localize('completionsLabel', "Code completions"));
@@ -298,7 +260,7 @@ class ChatStatusDashboard extends Disposable {
 			this.element.appendChild($('div.description', undefined, localize('limitQuota', "Limits will reset on {0}.", this.dateFormatter.value.format(quotaResetDate))));
 
 			if (chatQuotaExceeded || completionsQuotaExceeded) {
-				const upgradePlanButton = disposables.add(new Button(this.element, { ...defaultButtonStyles, secondary: canUseCopilot(this.contextKeyService, this.chatEntitlementService) /* use secondary color when copilot can still be used */ }));
+				const upgradePlanButton = disposables.add(new Button(this.element, { ...defaultButtonStyles, secondary: canUseCopilot(this.chatEntitlementService) /* use secondary color when copilot can still be used */ }));
 				upgradePlanButton.label = localize('upgradeToCopilotPro', "Upgrade to Copilot Pro");
 				disposables.add(upgradePlanButton.onDidClick(() => this.runCommandAndClose({ id: 'workbench.action.chat.upgradePlan', args: ['chat-status'] })));
 			}
@@ -317,18 +279,27 @@ class ChatStatusDashboard extends Disposable {
 		}
 
 		// Settings
-		if (canUseCopilot(this.contextKeyService, this.chatEntitlementService)) {
-			if (addSeparator) {
-				this.element.appendChild($('hr'));
-				addSeparator = false;
-			}
-
-			this.element.appendChild($('div.header', undefined, localize('settingsTitle', "Settings")));
-			addSeparator = true;
+		{
+			addSeparator(localize('settingsTitle', "Settings"));
 
 			this.createSettings(this.element, disposables);
 		}
 
+		// New to Copilot / Signed out
+		{
+			const newUser = isNewUser(this.chatEntitlementService);
+			const signedOut = this.chatEntitlementService.entitlement === ChatEntitlement.Unknown;
+			if (newUser || signedOut) {
+				addSeparator(undefined);
+
+				this.element.appendChild($('div.description', undefined, newUser ? localize('activateDescription', "You need to set up Copilot.") : localize('signInDescription', "You need to sign in to use Copilot.")));
+
+				const button = disposables.add(new Button(this.element, { ...defaultButtonStyles }));
+				button.label = newUser ? localize('activateCopilotButton', "Set Up Copilot") : localize('signInToUseCopilotButton', "Sign In");
+				disposables.add(button.onDidClick(() => this.runCommandAndClose(newUser ? { id: 'workbench.action.chat.triggerSetup' } : () => this.chatEntitlementService.requests?.value.signIn())));
+			}
+		}
+
 		return this.element;
 	}
 
@@ -433,6 +404,11 @@ class ChatStatusDashboard extends Disposable {
 			}
 		}));
 
+		if (!canUseCopilot(this.chatEntitlementService)) {
+			container.classList.add('disabled');
+			checkbox.disable();
+		}
+
 		return checkbox;
 	}
 
@@ -493,7 +469,7 @@ class ChatStatusDashboard extends Disposable {
 
 		disposables.add(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(completionsSettingId)) {
-				if (completionsSettingAccessor.readSetting()) {
+				if (completionsSettingAccessor.readSetting() && canUseCopilot(this.chatEntitlementService)) {
 					checkbox.enable();
 					container.classList.remove('disabled');
 				} else {
diff --git a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
index 23a1a0825a2f..19b59301b571 100644
--- a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
@@ -51,20 +51,19 @@ export namespace ChatContextKeys {
 	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 Setup = {
-
-		// State
-		signedOut: new RawContextKey<boolean>('chatSetupSignedOut', false, true), 	// True when user is signed out.
 		hidden: new RawContextKey<boolean>('chatSetupHidden', false, true), 		// True when chat setup is explicitly hidden.
 		installed: new RawContextKey<boolean>('chatSetupInstalled', false, true),  	// True when the chat extension is installed.
 		fromDialog: ContextKeyExpr.has('config.chat.experimental.setupFromDialog'),
+	};
 
-		// Plans
+	export const Entitlement = {
+		signedOut: new RawContextKey<boolean>('chatSetupSignedOut', false, true), 	// True when user is signed out.
 		canSignUp: new RawContextKey<boolean>('chatPlanCanSignUp', false, true), 	// True when user can sign up to be a chat limited user.
 		limited: new RawContextKey<boolean>('chatPlanLimited', false, true),		// True when user is a chat limited user.
 		pro: new RawContextKey<boolean>('chatPlanPro', false, true) 				// True when user is a chat pro user.
 	};
 
-	export const SetupViewKeys = new Set([ChatContextKeys.Setup.hidden.key, ChatContextKeys.Setup.installed.key, ChatContextKeys.Setup.signedOut.key, ChatContextKeys.Setup.canSignUp.key, ...Setup.fromDialog.keys()]);
+	export const SetupViewKeys = new Set([ChatContextKeys.Setup.hidden.key, ChatContextKeys.Setup.installed.key, ChatContextKeys.Entitlement.signedOut.key, ChatContextKeys.Entitlement.canSignUp.key, ...Setup.fromDialog.keys()]);
 	export const SetupViewCondition = ContextKeyExpr.or(
 		ContextKeyExpr.and(
 			ChatContextKeys.Setup.hidden.negate(),
@@ -72,11 +71,11 @@ export namespace ChatContextKeys {
 			Setup.fromDialog.negate()
 		),
 		ContextKeyExpr.and(
-			ChatContextKeys.Setup.canSignUp,
+			ChatContextKeys.Entitlement.canSignUp,
 			ChatContextKeys.Setup.installed
 		),
 		ContextKeyExpr.and(
-			ChatContextKeys.Setup.signedOut,
+			ChatContextKeys.Entitlement.signedOut,
 			ChatContextKeys.Setup.installed
 		)
 	)!;
diff --git a/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts b/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
index 17a5c25b033a..ab6ffdb0324a 100644
--- a/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatEntitlementService.ts
@@ -49,6 +49,15 @@ export enum ChatEntitlement {
 	Pro
 }
 
+export enum ChatSentiment {
+	/** Out of the box value */
+	Standard = 1,
+	/** Explicitly disabled/hidden by user */
+	Disabled = 2,
+	/** Extensions installed */
+	Installed = 3
+}
+
 export interface IChatQuotas {
 	readonly chatQuotaExceeded: boolean;
 	readonly completionsQuotaExceeded: boolean;
@@ -75,6 +84,10 @@ export interface IChatEntitlementService {
 	readonly quotas: IChatQuotas;
 
 	update(token: CancellationToken): Promise<void>;
+
+	readonly onDidChangeSentiment: Event<void>;
+
+	readonly sentiment: ChatSentiment;
 }
 
 //#region Service Implementation
@@ -102,8 +115,8 @@ export class ChatEntitlementService extends Disposable implements IChatEntitleme
 
 	declare _serviceBrand: undefined;
 
-	readonly context: Lazy<ChatSetupContext> | undefined;
-	readonly requests: Lazy<ChatSetupRequests> | undefined;
+	readonly context: Lazy<ChatEntitlementContext> | undefined;
+	readonly requests: Lazy<ChatEntitlementRequests> | undefined;
 
 	constructor(
 		@IInstantiationService instantiationService: IInstantiationService,
@@ -119,10 +132,19 @@ export class ChatEntitlementService extends Disposable implements IChatEntitleme
 		this.onDidChangeEntitlement = Event.map(
 			Event.filter(
 				this.contextKeyService.onDidChangeContext, e => e.affectsSome(new Set([
-					ChatContextKeys.Setup.pro.key,
-					ChatContextKeys.Setup.limited.key,
-					ChatContextKeys.Setup.canSignUp.key,
-					ChatContextKeys.Setup.signedOut.key
+					ChatContextKeys.Entitlement.pro.key,
+					ChatContextKeys.Entitlement.limited.key,
+					ChatContextKeys.Entitlement.canSignUp.key,
+					ChatContextKeys.Entitlement.signedOut.key
+				])), this._store
+			), () => { }, this._store
+		);
+
+		this.onDidChangeSentiment = Event.map(
+			Event.filter(
+				this.contextKeyService.onDidChangeContext, e => e.affectsSome(new Set([
+					ChatContextKeys.Setup.hidden.key,
+					ChatContextKeys.Setup.installed.key
 				])), this._store
 			), () => { }, this._store
 		);
@@ -135,8 +157,8 @@ export class ChatEntitlementService extends Disposable implements IChatEntitleme
 			return;
 		}
 
-		const context = this.context = new Lazy(() => this._register(instantiationService.createInstance(ChatSetupContext)));
-		this.requests = new Lazy(() => this._register(instantiationService.createInstance(ChatSetupRequests, context.value, {
+		const context = this.context = new Lazy(() => this._register(instantiationService.createInstance(ChatEntitlementContext)));
+		this.requests = new Lazy(() => this._register(instantiationService.createInstance(ChatEntitlementRequests, context.value, {
 			clearQuotas: () => this.clearQuotas(),
 			acceptQuotas: quotas => this.acceptQuotas(quotas)
 		})));
@@ -149,13 +171,13 @@ export class ChatEntitlementService extends Disposable implements IChatEntitleme
 	readonly onDidChangeEntitlement: Event<void>;
 
 	get entitlement(): ChatEntitlement {
-		if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.pro.key) === true) {
+		if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Entitlement.pro.key) === true) {
 			return ChatEntitlement.Pro;
-		} else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.limited.key) === true) {
+		} else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Entitlement.limited.key) === true) {
 			return ChatEntitlement.Limited;
-		} else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.canSignUp.key) === true) {
+		} else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Entitlement.canSignUp.key) === true) {
 			return ChatEntitlement.Available;
-		} else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.signedOut.key) === true) {
+		} else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Entitlement.signedOut.key) === true) {
 			return ChatEntitlement.Unknown;
 		}
 
@@ -251,6 +273,23 @@ export class ChatEntitlementService extends Disposable implements IChatEntitleme
 
 	//#endregion
 
+	//#region --- Sentiment
+
+	private readonly _onDidChangeSentiment = this._register(new Emitter<void>());
+	readonly onDidChangeSentiment = this._onDidChangeSentiment.event;
+
+	get sentiment(): ChatSentiment {
+		if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.installed.key) === true) {
+			return ChatSentiment.Installed;
+		} else if (this.contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.hidden.key) === true) {
+			return ChatSentiment.Disabled;
+		}
+
+		return ChatSentiment.Standard;
+	}
+
+	//#endregion
+
 	async update(token: CancellationToken): Promise<void> {
 		await this.requests?.value.forceResolveEntitlement(undefined, token);
 	}
@@ -258,7 +297,7 @@ export class ChatEntitlementService extends Disposable implements IChatEntitleme
 
 //#endregion
 
-//#region Chat Setup Request Service
+//#region Chat Entitlement Request Service
 
 type EntitlementClassification = {
 	tid: { classification: 'EndUserPseudonymizedInformation'; purpose: 'BusinessInsight'; comment: 'The anonymized analytics id returned by the service'; endpoint: 'GoogleAnalyticsId' };
@@ -267,7 +306,7 @@ type EntitlementClassification = {
 	quotaCompletions: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The number of chat completions available to the user' };
 	quotaResetDate: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The date the quota will reset' };
 	owner: 'bpasero';
-	comment: 'Reporting chat setup entitlements';
+	comment: 'Reporting chat entitlements';
 };
 
 type EntitlementEvent = {
@@ -310,7 +349,7 @@ interface IQuotas {
 	readonly resetDate?: string;
 }
 
-export class ChatSetupRequests extends Disposable {
+export class ChatEntitlementRequests extends Disposable {
 
 	static providerId(configurationService: IConfigurationService): string {
 		if (configurationService.getValue<string | undefined>(`${defaultChat.completionsAdvancedSetting}.authProvider`) === defaultChat.enterpriseProviderId) {
@@ -326,7 +365,7 @@ export class ChatSetupRequests extends Disposable {
 	private didResolveEntitlements = false;
 
 	constructor(
-		private readonly context: ChatSetupContext,
+		private readonly context: ChatEntitlementContext,
 		private readonly chatQuotasAccessor: IChatQuotasAccessor,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
@@ -350,19 +389,19 @@ export class ChatSetupRequests extends Disposable {
 		this._register(this.authenticationService.onDidChangeDeclaredProviders(() => this.resolve()));
 
 		this._register(this.authenticationService.onDidChangeSessions(e => {
-			if (e.providerId === ChatSetupRequests.providerId(this.configurationService)) {
+			if (e.providerId === ChatEntitlementRequests.providerId(this.configurationService)) {
 				this.resolve();
 			}
 		}));
 
 		this._register(this.authenticationService.onDidRegisterAuthenticationProvider(e => {
-			if (e.id === ChatSetupRequests.providerId(this.configurationService)) {
+			if (e.id === ChatEntitlementRequests.providerId(this.configurationService)) {
 				this.resolve();
 			}
 		}));
 
 		this._register(this.authenticationService.onDidUnregisterAuthenticationProvider(e => {
-			if (e.id === ChatSetupRequests.providerId(this.configurationService)) {
+			if (e.id === ChatEntitlementRequests.providerId(this.configurationService)) {
 				this.resolve();
 			}
 		}));
@@ -409,7 +448,7 @@ export class ChatSetupRequests extends Disposable {
 	}
 
 	private async findMatchingProviderSession(token: CancellationToken): Promise<AuthenticationSession | undefined> {
-		const sessions = await this.doGetSessions(ChatSetupRequests.providerId(this.configurationService));
+		const sessions = await this.doGetSessions(ChatEntitlementRequests.providerId(this.configurationService));
 		if (token.isCancellationRequested) {
 			return undefined;
 		}
@@ -450,8 +489,8 @@ export class ChatSetupRequests extends Disposable {
 	}
 
 	private async doResolveEntitlement(session: AuthenticationSession, token: CancellationToken): Promise<IEntitlements | undefined> {
-		if (ChatSetupRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId) {
-			this.logService.trace('[chat setup] entitlement: enterprise provider, assuming Pro');
+		if (ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId) {
+			this.logService.trace('[chat entitlement]: enterprise provider, assuming Pro');
 			return { entitlement: ChatEntitlement.Pro };
 		}
 
@@ -465,12 +504,12 @@ export class ChatSetupRequests extends Disposable {
 		}
 
 		if (!response) {
-			this.logService.trace('[chat setup] entitlement: no response');
+			this.logService.trace('[chat entitlement]: no response');
 			return { entitlement: ChatEntitlement.Unresolved };
 		}
 
 		if (response.res.statusCode && response.res.statusCode !== 200) {
-			this.logService.trace(`[chat setup] entitlement: unexpected status code ${response.res.statusCode}`);
+			this.logService.trace(`[chat entitlement]: unexpected status code ${response.res.statusCode}`);
 			return { entitlement: ChatEntitlement.Unresolved };
 		}
 
@@ -485,16 +524,16 @@ export class ChatSetupRequests extends Disposable {
 		}
 
 		if (!responseText) {
-			this.logService.trace('[chat setup] entitlement: response has no content');
+			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 setup] entitlement: parsed result is ${JSON.stringify(entitlementsResponse)}`);
+			this.logService.trace(`[chat entitlement]: parsed result is ${JSON.stringify(entitlementsResponse)}`);
 		} catch (err) {
-			this.logService.trace(`[chat setup] entitlement: error parsing response (${err})`);
+			this.logService.trace(`[chat entitlement]: error parsing response (${err})`);
 			return { entitlement: ChatEntitlement.Unresolved };
 		}
 
@@ -523,7 +562,7 @@ export class ChatSetupRequests extends Disposable {
 			}
 		};
 
-		this.logService.trace(`[chat setup] entitlement: resolved to ${entitlements.entitlement}, quotas: ${JSON.stringify(entitlements.quotas)}`);
+		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,
@@ -550,7 +589,7 @@ export class ChatSetupRequests extends Disposable {
 			}, token);
 		} catch (error) {
 			if (!token.isCancellationRequested) {
-				this.logService.error(`[chat setup] request: error ${error}`);
+				this.logService.error(`[chat entitlement] request: error ${error}`);
 			}
 
 			return undefined;
@@ -595,7 +634,7 @@ export class ChatSetupRequests extends Disposable {
 
 		const response = await this.request(defaultChat.entitlementSignupLimitedUrl, 'POST', body, session, CancellationToken.None);
 		if (!response) {
-			const retry = await this.onUnknownSignUpError(localize('signUpNoResponseError', "No response received."), '[chat setup] sign-up: no response');
+			const retry = await this.onUnknownSignUpError(localize('signUpNoResponseError', "No response received."), '[chat entitlement] sign-up: no response');
 			return retry ? this.signUpLimited(session) : { errorCode: 1 };
 		}
 
@@ -606,7 +645,7 @@ export class ChatSetupRequests extends Disposable {
 					if (responseText) {
 						const responseError: { message: string } = JSON.parse(responseText);
 						if (typeof responseError.message === 'string' && responseError.message) {
-							this.onUnprocessableSignUpError(`[chat setup] sign-up: unprocessable entity (${responseError.message})`, responseError.message);
+							this.onUnprocessableSignUpError(`[chat entitlement] sign-up: unprocessable entity (${responseError.message})`, responseError.message);
 							return { errorCode: response.res.statusCode };
 						}
 					}
@@ -614,7 +653,7 @@ export class ChatSetupRequests extends Disposable {
 					// ignore - handled below
 				}
 			}
-			const retry = await this.onUnknownSignUpError(localize('signUpUnexpectedStatusError', "Unexpected status code {0}.", response.res.statusCode), `[chat setup] sign-up: unexpected status code ${response.res.statusCode}`);
+			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.signUpLimited(session) : { errorCode: response.res.statusCode };
 		}
 
@@ -626,16 +665,16 @@ export class ChatSetupRequests extends Disposable {
 		}
 
 		if (!responseText) {
-			const retry = await this.onUnknownSignUpError(localize('signUpNoResponseContentsError', "Response has no contents."), '[chat setup] sign-up: response has no content');
+			const retry = await this.onUnknownSignUpError(localize('signUpNoResponseContentsError', "Response has no contents."), '[chat entitlement] sign-up: response has no content');
 			return retry ? this.signUpLimited(session) : { errorCode: 2 };
 		}
 
 		let parsedResult: { subscribed: boolean } | undefined = undefined;
 		try {
 			parsedResult = JSON.parse(responseText);
-			this.logService.trace(`[chat setup] sign-up: response is ${responseText}`);
+			this.logService.trace(`[chat entitlement] sign-up: response is ${responseText}`);
 		} catch (err) {
-			const retry = await this.onUnknownSignUpError(localize('signUpInvalidResponseError', "Invalid response contents."), `[chat setup] sign-up: error parsing response (${err})`);
+			const retry = await this.onUnknownSignUpError(localize('signUpInvalidResponseError', "Invalid response contents."), `[chat entitlement] sign-up: error parsing response (${err})`);
 			return retry ? this.signUpLimited(session) : { errorCode: 3 };
 		}
 
@@ -680,7 +719,7 @@ export class ChatSetupRequests extends Disposable {
 	}
 
 	async signIn() {
-		const providerId = ChatSetupRequests.providerId(this.configurationService);
+		const providerId = ChatEntitlementRequests.providerId(this.configurationService);
 		const session = await this.authenticationService.createSession(providerId, defaultChat.providerScopes[0]);
 
 		this.authenticationExtensionsService.updateAccountPreference(defaultChat.extensionId, providerId, session.account);
@@ -702,16 +741,16 @@ export class ChatSetupRequests extends Disposable {
 
 //#region Context
 
-export interface IChatSetupContextState {
+export interface IChatEntitlementContextState {
 	entitlement: ChatEntitlement;
 	hidden?: boolean;
 	installed?: boolean;
 	registered?: boolean;
 }
 
-export class ChatSetupContext extends Disposable {
+export class ChatEntitlementContext extends Disposable {
 
-	private static readonly CHAT_SETUP_CONTEXT_STORAGE_KEY = 'chat.setupContext';
+	private static readonly CHAT_ENTITLEMENT_CONTEXT_STORAGE_KEY = 'chat.setupContext';
 
 	private readonly canSignUpContextKey: IContextKey<boolean>;
 	private readonly signedOutContextKey: IContextKey<boolean>;
@@ -720,9 +759,9 @@ export class ChatSetupContext extends Disposable {
 	private readonly hiddenContext: IContextKey<boolean>;
 	private readonly installedContext: IContextKey<boolean>;
 
-	private _state: IChatSetupContextState;
-	private suspendedState: IChatSetupContextState | undefined = undefined;
-	get state(): IChatSetupContextState {
+	private _state: IChatEntitlementContextState;
+	private suspendedState: IChatEntitlementContextState | undefined = undefined;
+	get state(): IChatEntitlementContextState {
 		return this.suspendedState ?? this._state;
 	}
 
@@ -741,14 +780,14 @@ export class ChatSetupContext extends Disposable {
 	) {
 		super();
 
-		this.canSignUpContextKey = ChatContextKeys.Setup.canSignUp.bindTo(contextKeyService);
-		this.signedOutContextKey = ChatContextKeys.Setup.signedOut.bindTo(contextKeyService);
-		this.limitedContextKey = ChatContextKeys.Setup.limited.bindTo(contextKeyService);
-		this.proContextKey = ChatContextKeys.Setup.pro.bindTo(contextKeyService);
+		this.canSignUpContextKey = ChatContextKeys.Entitlement.canSignUp.bindTo(contextKeyService);
+		this.signedOutContextKey = ChatContextKeys.Entitlement.signedOut.bindTo(contextKeyService);
+		this.limitedContextKey = ChatContextKeys.Entitlement.limited.bindTo(contextKeyService);
+		this.proContextKey = ChatContextKeys.Entitlement.pro.bindTo(contextKeyService);
 		this.hiddenContext = ChatContextKeys.Setup.hidden.bindTo(contextKeyService);
 		this.installedContext = ChatContextKeys.Setup.installed.bindTo(contextKeyService);
 
-		this._state = this.storageService.getObject<IChatSetupContextState>(ChatSetupContext.CHAT_SETUP_CONTEXT_STORAGE_KEY, StorageScope.PROFILE) ?? { entitlement: ChatEntitlement.Unknown };
+		this._state = this.storageService.getObject<IChatEntitlementContextState>(ChatEntitlementContext.CHAT_ENTITLEMENT_CONTEXT_STORAGE_KEY, StorageScope.PROFILE) ?? { entitlement: ChatEntitlement.Unknown };
 
 		this.checkExtensionInstallation();
 		this.updateContextSync();
@@ -774,13 +813,13 @@ export class ChatSetupContext extends Disposable {
 	update(context: { hidden: boolean }): Promise<void>;
 	update(context: { entitlement: ChatEntitlement }): Promise<void>;
 	update(context: { installed?: boolean; hidden?: boolean; entitlement?: ChatEntitlement }): Promise<void> {
-		this.logService.trace(`[chat setup] update(): ${JSON.stringify(context)}`);
+		this.logService.trace(`[chat entitlement context] update(): ${JSON.stringify(context)}`);
 
 		if (typeof context.installed === 'boolean') {
 			this._state.installed = context.installed;
 
 			if (context.installed) {
-				context.hidden = false; // allows to fallback to setup view if the extension is uninstalled
+				context.hidden = false; // allows to fallback if the extension is uninstalled
 			}
 		}
 
@@ -792,13 +831,13 @@ export class ChatSetupContext extends Disposable {
 			this._state.entitlement = context.entitlement;
 
 			if (this._state.entitlement === ChatEntitlement.Limited || this._state.entitlement === ChatEntitlement.Pro) {
-				this._state.registered = true; // remember that the user did register to improve setup screen
+				this._state.registered = true;
 			} else if (this._state.entitlement === ChatEntitlement.Available) {
-				this._state.registered = false; // only restore when signed-in user can sign-up for limited
+				this._state.registered = false; // only reset when signed-in user can sign-up for limited
 			}
 		}
 
-		this.storageService.store(ChatSetupContext.CHAT_SETUP_CONTEXT_STORAGE_KEY, this._state, StorageScope.PROFILE, StorageTarget.MACHINE);
+		this.storageService.store(ChatEntitlementContext.CHAT_ENTITLEMENT_CONTEXT_STORAGE_KEY, this._state, StorageScope.PROFILE, StorageTarget.MACHINE);
 
 		return this.updateContext();
 	}
@@ -810,7 +849,7 @@ export class ChatSetupContext extends Disposable {
 	}
 
 	private updateContextSync(): void {
-		this.logService.trace(`[chat setup] updateContext(): ${JSON.stringify(this._state)}`);
+		this.logService.trace(`[chat entitlement context] updateContext(): ${JSON.stringify(this._state)}`);
 
 		if (!this._state.hidden && !this._state.installed) {
 			// this is ugly but fixes flicker from a previous chat install

From ba8bbce0e888dae82aa5c1b49db666499a628085 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Sun, 16 Mar 2025 17:08:09 +0100
Subject: [PATCH 0974/1815] Go into collapsed mode when typing (#243691)

go into collapsed mode when typing
---
 src/vs/editor/common/config/editorOptions.ts  | 34 ----------------
 .../browser/model/inlineCompletionsModel.ts   | 25 ++++++++----
 .../browser/model/inlineCompletionsSource.ts  | 21 ++++------
 .../browser/model/inlineEdit.ts               |  2 -
 .../view/inlineEdits/inlineEditWithChanges.ts |  2 -
 .../view/inlineEdits/inlineEditsModel.ts      |  4 +-
 .../view/inlineEdits/inlineEditsView.ts       | 39 +++----------------
 .../inlineEdits/inlineEditsViewProducer.ts    |  5 +--
 .../originalEditorInlineDiffView.ts           |  8 +---
 9 files changed, 37 insertions(+), 103 deletions(-)

diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 6388b3c386c8..b887b7ac57c8 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -4269,14 +4269,6 @@ export interface IInlineSuggestOptions {
 		/**
 		* @internal
 		*/
-		useMixedLinesDiff?: 'never' | 'whenPossible' | 'forStableInsertions' | 'afterJumpWhenPossible';
-		/**
-		* @internal
-		*/
-		useInterleavedLinesDiff?: 'never' | 'always' | 'afterJump';
-		/**
-		* @internal
-		*/
 		useMultiLineGhostText?: boolean;
 	};
 }
@@ -4306,8 +4298,6 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 			edits: {
 				enabled: true,
 				showCollapsed: false,
-				useMixedLinesDiff: 'forStableInsertions',
-				useInterleavedLinesDiff: 'never',
 				renderSideBySide: 'auto',
 				allowCodeShifting: 'always',
 				useMultiLineGhostText: true
@@ -4348,12 +4338,6 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 					default: defaults.fontFamily,
 					description: nls.localize('inlineSuggest.fontFamily', "Controls the font family of the inline suggestions.")
 				},
-				/* 'editor.inlineSuggest.edits.useMixedLinesDiff': {
-					type: 'string',
-					default: defaults.edits.useMixedLinesDiff,
-					description: nls.localize('inlineSuggest.edits.useMixedLinesDiff', "Controls whether to enable mixed lines diff in inline suggestions."),
-					enum: ['never', 'whenPossible', 'forStableInsertions', 'afterJumpWhenPossible'],
-				}, */
 				'editor.inlineSuggest.edits.allowCodeShifting': {
 					type: 'string',
 					default: defaults.edits.allowCodeShifting,
@@ -4378,22 +4362,6 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 					description: nls.localize('inlineSuggest.edits.showCollapsed', "Controls whether the suggestion will show as collapsed until jumping to it."),
 					tags: ['nextEditSuggestions', 'preview']
 				},
-				/* 'editor.inlineSuggest.edits.useMultiLineGhostText': {
-					type: 'boolean',
-					default: defaults.edits.useMultiLineGhostText,
-					description: nls.localize('inlineSuggest.edits.useMultiLineGhostText', "Controls whether multi line insertions can be shown with Ghost text."),
-				}, */
-				/* 'editor.inlineSuggest.edits.useInterleavedLinesDiff': {
-					type: 'string',
-					default: defaults.edits.useInterleavedLinesDiff,
-					description: nls.localize('inlineSuggest.edits.useInterleavedLinesDiff', "Controls whether to enable interleaved lines diff in inline suggestions."),
-					enum: ['never', 'always', 'afterJump'],
-				}, */
-				/* 'editor.inlineSuggest.edits.useGutterIndicator': {
-					type: 'boolean',
-					default: defaults.edits.useGutterIndicator,
-					description: nls.localize('inlineSuggest.edits.useGutterIndicator', "Controls whether to show a gutter indicator for inline suggestions.")
-				}, */
 			}
 		);
 	}
@@ -4414,10 +4382,8 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 			edits: {
 				enabled: boolean(input.edits?.enabled, this.defaultValue.edits.enabled),
 				showCollapsed: boolean(input.edits?.showCollapsed, this.defaultValue.edits.showCollapsed),
-				useMixedLinesDiff: stringSet(input.edits?.useMixedLinesDiff, this.defaultValue.edits.useMixedLinesDiff, ['never', 'whenPossible', 'forStableInsertions', 'afterJumpWhenPossible']),
 				allowCodeShifting: stringSet(input.edits?.allowCodeShifting, this.defaultValue.edits.allowCodeShifting, ['always', 'horizontal', 'never']),
 				renderSideBySide: stringSet(input.edits?.renderSideBySide, this.defaultValue.edits.renderSideBySide, ['never', 'auto']),
-				useInterleavedLinesDiff: stringSet(input.edits?.useInterleavedLinesDiff, this.defaultValue.edits.useInterleavedLinesDiff, ['never', 'always', 'afterJump']),
 				useMultiLineGhostText: boolean(input.edits?.useMultiLineGhostText, this.defaultValue.edits.useMultiLineGhostText),
 			},
 		};
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
index 63deb8574a4d..73bfd7977bf9 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -62,7 +62,7 @@ export class InlineCompletionsModel extends Disposable {
 	private readonly _suggestPreviewMode = this._editorObs.getOption(EditorOption.suggest).map(v => v.previewMode);
 	private readonly _inlineSuggestMode = this._editorObs.getOption(EditorOption.inlineSuggest).map(v => v.mode);
 	private readonly _inlineEditsEnabled = this._editorObs.getOption(EditorOption.inlineSuggest).map(v => !!v.edits.enabled);
-	private readonly _inlineEditsShowCollapsed = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.showCollapsed);
+	private readonly _inlineEditsShowCollapsedEnabled = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.showCollapsed);
 
 	constructor(
 		public readonly textModel: ITextModel,
@@ -391,8 +391,7 @@ export class InlineCompletionsModel extends Disposable {
 			}
 
 			const commands = inlineEditResult.inlineCompletion.source.inlineCompletions.commands;
-			const renderExplicitly = this._jumpedTo.read(reader);
-			const inlineEdit = new InlineEdit(edit, renderExplicitly, commands ?? [], inlineEditResult.inlineCompletion);
+			const inlineEdit = new InlineEdit(edit, commands ?? [], inlineEditResult.inlineCompletion);
 
 			const edits = inlineEditResult.updatedEdit.read(reader);
 			const e = edits ? TextEdit.fromOffsetEdit(edits, new TextModelText(this.textModel)).edits : [edit];
@@ -510,6 +509,18 @@ export class InlineCompletionsModel extends Disposable {
 		return v?.primaryGhostText;
 	});
 
+	public readonly showCollapsed = derived<boolean>(this, reader => {
+		const state = this.state.read(reader);
+		if (!state || state.kind !== 'inlineEdit') {
+			return false;
+		}
+
+		const isCurrentModelVersion = state.inlineCompletion.updatedEditModelVersion === this._textModelVersionId.read(reader); // TODO: this is a hack
+		return (this._inlineEditsShowCollapsedEnabled.read(reader) || !isCurrentModelVersion)
+			&& !this._jumpedTo.read(reader)
+			&& !this._inAcceptFlow.read(reader);
+	});
+
 	private readonly _tabShouldIndent = derived(this, reader => {
 		if (this._inAcceptFlow.read(reader)) {
 			return false;
@@ -546,8 +557,8 @@ export class InlineCompletionsModel extends Disposable {
 			return false;
 		}
 
-		if (this._inlineEditsShowCollapsed.read(reader)) {
-			return !this._jumpedTo.read(reader);
+		if (this.showCollapsed.read(reader)) {
+			return true;
 		}
 
 		return !s.cursorAtInlineEdit;
@@ -558,8 +569,8 @@ export class InlineCompletionsModel extends Disposable {
 		if (!s) {
 			return false;
 		}
-		if (this._inlineEditsShowCollapsed.read(reader)) {
-			return this._jumpedTo.read(reader);
+		if (this.showCollapsed.read(reader)) {
+			return false;
 		}
 		if (s.inlineEdit.range.startLineNumber === this._editorObs.cursorLineNumber.read(reader)) {
 			return true;
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
index c215dba8dc4f..141271269958 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.ts
@@ -319,6 +319,7 @@ export class InlineCompletionWithUpdatedRange extends Disposable {
 
 	private readonly _updatedEditObj: UpdatedEdit; // helper as derivedHandleChanges can not access previous value
 	public get updatedEdit(): IObservable<OffsetEdit | undefined> { return this._updatedEditObj.offsetEdit; }
+	public get updatedEditModelVersion() { return this._updatedEditObj.modelVersion; }
 
 	public get source() { return this.inlineCompletion.source; }
 	public get sourceInlineCompletion() { return this.inlineCompletion.sourceInlineCompletion; }
@@ -497,7 +498,9 @@ export class InlineCompletionWithUpdatedRange extends Disposable {
 class UpdatedEdit extends Disposable {
 
 	private _innerEdits: SingleUpdatedEdit[];
-	private _invalidationTime: number | undefined = Date.now() + 3000;
+
+	private _inlineEditModelVersion: number;
+	public get modelVersion() { return this._inlineEditModelVersion; }
 
 	private _lastChangePartOfInlineEdit = false;
 	public get lastChangePartOfInlineEdit() { return this._lastChangePartOfInlineEdit; }
@@ -519,10 +522,6 @@ class UpdatedEdit extends Disposable {
 			this._innerEdits = this._applyTextModelChanges(change, this._innerEdits);
 		}
 
-		if (this._hasInvalidationTimePassed()) {
-			return undefined;
-		}
-
 		if (this._innerEdits.length === 0) {
 			return undefined;
 		}
@@ -544,6 +543,8 @@ class UpdatedEdit extends Disposable {
 	) {
 		super();
 
+		this._inlineEditModelVersion = this._modelVersion.get() ?? -1;
+
 		this._innerEdits = offsetEdit.edits.map(edit => {
 			if (isInlineEdit) {
 				const replacedRange = Range.fromPositions(textModel.getPositionAt(edit.replaceRange.start), textModel.getPositionAt(edit.replaceRange.endExclusive));
@@ -568,7 +569,7 @@ class UpdatedEdit extends Disposable {
 
 		this._lastChangePartOfInlineEdit = edits.some(edit => edit.lastChangeUpdatedEdit);
 		if (this._lastChangePartOfInlineEdit) {
-			this._cancelInvalidationTimer();
+			this._inlineEditModelVersion = this._modelVersion.get() ?? -1;
 		}
 
 		edits = edits.filter(innerEdit => !innerEdit.edit!.isEmpty);
@@ -578,14 +579,6 @@ class UpdatedEdit extends Disposable {
 
 		return edits;
 	}
-
-	private _cancelInvalidationTimer() {
-		this._invalidationTime = undefined;
-	}
-
-	private _hasInvalidationTimePassed(): boolean {
-		return !!this._invalidationTime && this._invalidationTime < Date.now();
-	}
 }
 
 abstract class SingleUpdatedEdit {
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.ts
index 8ccfc9609b0c..13e6d6edf742 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.ts
@@ -10,7 +10,6 @@ import { InlineCompletionItem } from './provideInlineCompletions.js';
 export class InlineEdit {
 	constructor(
 		public readonly edit: SingleTextEdit,
-		public readonly jumpedTo: boolean,
 		public readonly commands: readonly Command[],
 		public readonly inlineCompletion: InlineCompletionItem,
 	) { }
@@ -25,7 +24,6 @@ export class InlineEdit {
 
 	public equals(other: InlineEdit): boolean {
 		return this.edit.equals(other.edit)
-			&& this.jumpedTo === other.jumpedTo
 			&& this.inlineCompletion === other.inlineCompletion;
 	}
 }
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 7a31b034666a..0aac963340b8 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.ts
@@ -19,7 +19,6 @@ export class InlineEditWithChanges {
 		public readonly originalText: AbstractText,
 		public readonly edit: TextEdit,
 		public readonly cursorPosition: Position,
-		public readonly userJumpedToIt: boolean,
 		public readonly commands: readonly Command[],
 		public readonly inlineCompletion: InlineCompletionItem
 	) {
@@ -29,7 +28,6 @@ export class InlineEditWithChanges {
 		return this.originalText.getValue() === other.originalText.getValue() &&
 			this.edit.equals(other.edit) &&
 			this.cursorPosition.equals(other.cursorPosition) &&
-			this.userJumpedToIt === other.userJumpedToIt &&
 			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 2c8e66d72279..9556dfbce7a2 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.ts
@@ -21,6 +21,7 @@ export class InlineEditModel implements IInlineEditModel {
 	readonly displayName: string;
 	readonly extensionCommands: Command[];
 
+	readonly showCollapsed: IObservable<boolean>;
 	readonly inAcceptFlow: IObservable<boolean>;
 	readonly inPartialAcceptFlow: IObservable<boolean>;
 
@@ -35,6 +36,7 @@ export class InlineEditModel implements IInlineEditModel {
 
 		this.inAcceptFlow = this._model.inAcceptFlow;
 		this.inPartialAcceptFlow = this._model.inPartialAcceptFlow;
+		this.showCollapsed = this._model.showCollapsed;
 	}
 
 	accept() {
@@ -65,7 +67,6 @@ export class GhostTextIndicator {
 		model: InlineCompletionsModel,
 		readonly lineRange: LineRange,
 		inlineCompletion: InlineCompletionWithUpdatedRange,
-		renderExplicitly: boolean,
 	) {
 		const editorObs = observableCodeEditor(editor);
 		const tabAction = derived<InlineEditTabAction>(this, reader => {
@@ -83,7 +84,6 @@ export class GhostTextIndicator {
 				new StringText(''),
 				new TextEdit([]),
 				model.primaryPosition.get(),
-				renderExplicitly,
 				inlineCompletion.source.inlineCompletions.commands ?? [],
 				inlineCompletion.inlineCompletion
 			),
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 dad7dacaf497..6670696ecdc3 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
@@ -36,11 +36,8 @@ import './view.css';
 export class InlineEditsView extends Disposable {
 	private readonly _editorObs: ObservableCodeEditor = observableCodeEditor(this._editor);
 
-	private readonly _useMixedLinesDiff;
-	private readonly _useInterleavedLinesDiff;
 	private readonly _useCodeShifting;
 	private readonly _renderSideBySide;
-	private readonly _showCollapsed;
 	private readonly _useMultiLineGhostText;
 
 	private readonly _tabAction = derived<InlineEditTabAction>(reader => this._model.read(reader)?.tabAction.read(reader) ?? InlineEditTabAction.Inactive);
@@ -48,7 +45,6 @@ export class InlineEditsView extends Disposable {
 	private _previousView: {
 		id: string;
 		view: ReturnType<typeof InlineEditsView.prototype.determineView>;
-		userJumpedToIt: boolean;
 		editorWidth: number;
 		timestamp: number;
 	} | undefined;
@@ -62,11 +58,8 @@ export class InlineEditsView extends Disposable {
 	) {
 		super();
 
-		this._useMixedLinesDiff = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.useMixedLinesDiff);
-		this._useInterleavedLinesDiff = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.useInterleavedLinesDiff);
 		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._showCollapsed = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.showCollapsed);
 		this._useMultiLineGhostText = this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.useMultiLineGhostText);
 
 		this._register(autorunWithStore((reader, store) => {
@@ -146,7 +139,7 @@ export class InlineEditsView extends Disposable {
 			this._previewTextModel.setValue(newText);
 		}
 
-		if (this._showCollapsed.read(reader) && model.tabAction.read(reader) !== InlineEditTabAction.Accept && !this._indicator.read(reader)?.isHoverVisible.read(reader) && !model.inAcceptFlow.read(reader)) {
+		if (model.showCollapsed.read(reader) && !this._indicator.read(reader)?.isHoverVisible.read(reader)) {
 			state = { kind: 'hidden' };
 		}
 
@@ -306,18 +299,13 @@ export class InlineEditsView extends Disposable {
 		// 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);
-		const reconsiderViewAfterJump = inlineEdit.userJumpedToIt !== this._previousView?.userJumpedToIt &&
-			(
-				(this._useMixedLinesDiff.read(reader) === 'afterJumpWhenPossible' && this._previousView?.view !== 'mixedLines') ||
-				(this._useInterleavedLinesDiff.read(reader) === 'afterJump' && this._previousView?.view !== 'interleavedLines')
-			);
 		const reconsiderViewEditorWidthChange = this._previousView?.editorWidth !== this._editorObs.layoutInfoWidth.read(reader) &&
 			(
 				this._previousView?.view === 'sideBySide' ||
 				this._previousView?.view === 'lineReplacement'
 			);
 
-		if (canUseCache && !reconsiderViewAfterJump && !reconsiderViewEditorWidthChange) {
+		if (canUseCache && !reconsiderViewEditorWidthChange) {
 			return this._previousView!.view;
 		}
 
@@ -326,11 +314,9 @@ export class InlineEditsView extends Disposable {
 		const inner = diff.flatMap(d => d.innerChanges ?? []);
 		const isSingleInnerEdit = inner.length === 1;
 		if (
-			isSingleInnerEdit && (
-				this._useMixedLinesDiff.read(reader) === 'forStableInsertions'
-				&& this._useCodeShifting.read(reader) !== 'never'
-				&& isSingleLineInsertionAfterPosition(diff, inlineEdit.cursorPosition)
-			)
+			isSingleInnerEdit
+			&& this._useCodeShifting.read(reader) !== 'never'
+			&& isSingleLineInsertionAfterPosition(diff, inlineEdit.cursorPosition)
 		) {
 			return 'insertionInline';
 		}
@@ -364,17 +350,6 @@ export class InlineEditsView extends Disposable {
 			return 'lineReplacement';
 		}
 
-		if (
-			(this._useMixedLinesDiff.read(reader) === 'whenPossible' || (inlineEdit.userJumpedToIt && this._useMixedLinesDiff.read(reader) === 'afterJumpWhenPossible'))
-			&& diff.every(m => OriginalEditorInlineDiffView.supportsInlineDiffRendering(m))
-		) {
-			return 'mixedLines';
-		}
-
-		if (this._useInterleavedLinesDiff.read(reader) === 'always' || (inlineEdit.userJumpedToIt && this._useInterleavedLinesDiff.read(reader) === 'afterJump')) {
-			return 'interleavedLines';
-		}
-
 		return 'sideBySide';
 	}
 
@@ -383,12 +358,10 @@ export class InlineEditsView extends Disposable {
 
 		const view = this.determineView(model, reader, diff, newText, originalDisplayRange);
 
-		this._previousView = { id: this.getCacheId(model), view, userJumpedToIt: inlineEdit.userJumpedToIt, editorWidth: this._editor.getLayoutInfo().width, timestamp: Date.now() };
+		this._previousView = { id: this.getCacheId(model), view, editorWidth: this._editor.getLayoutInfo().width, timestamp: Date.now() };
 
 		switch (view) {
 			case 'insertionInline': return { kind: 'insertionInline' as const };
-			case 'mixedLines': return { kind: 'mixedLines' as const };
-			case 'interleavedLines': return { kind: 'interleavedLines' as const };
 			case 'sideBySide': return { kind: 'sideBySide' as const };
 			case 'hidden': return { kind: 'hidden' as const };
 		}
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 ad651d802192..c20a1bcf546f 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.ts
@@ -48,7 +48,7 @@ export class InlineEditsViewAndDiffProducer extends Disposable { // TODO: This c
 		const diffEdits = new TextEdit(edits);
 		const text = new TextModelText(textModel);
 
-		return new InlineEditWithChanges(text, diffEdits, model.primaryPosition.get(), inlineEdit.jumpedTo, inlineEdit.commands, inlineEdit.inlineCompletion);
+		return new InlineEditWithChanges(text, diffEdits, model.primaryPosition.get(), inlineEdit.commands, inlineEdit.inlineCompletion);
 	});
 
 	private readonly _inlineEditModel = derived<InlineEditModel | undefined>(this, reader => {
@@ -81,9 +81,8 @@ export class InlineEditsViewAndDiffProducer extends Disposable { // TODO: This c
 		}
 
 		const lineRange = LineRange.ofLength(state.primaryGhostText.lineNumber, 1);
-		const renderExplicitly = false;
 
-		return new GhostTextIndicator(this._editor, model, lineRange, inlineCompletion, renderExplicitly);
+		return new GhostTextIndicator(this._editor, model, lineRange, inlineCompletion);
 	});
 
 	constructor(
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 1ca0f662e92e..ae1d93bb639a 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
@@ -27,7 +27,7 @@ import { classNames } from '../utils/utils.js';
 export interface IOriginalEditorInlineDiffViewState {
 	diff: DetailedLineRangeMapping[];
 	modifiedText: AbstractText;
-	mode: 'mixedLines' | 'insertionInline' | 'interleavedLines' | 'sideBySide' | 'deletion';
+	mode: 'insertionInline' | 'sideBySide' | 'deletion';
 
 	modifiedCodeEditor: ICodeEditor;
 }
@@ -90,10 +90,6 @@ export class OriginalEditorInlineDiffView extends Disposable implements IInlineE
 			if (!s) { return origViewZones; }
 
 			for (const diff of s.diff) {
-				if (s.mode !== 'interleavedLines') {
-					continue;
-				}
-
 				this._tokenizationFinished.read(reader); // Update view-zones once tokenization completes
 
 				const source = new LineSource(diff.modified.mapToLineArray(l => this._modifiedTextModel.tokenization.getLineTokens(l)));
@@ -135,7 +131,7 @@ export class OriginalEditorInlineDiffView extends Disposable implements IInlineE
 		if (!diff) { return undefined; }
 
 		const modified = diff.modifiedText;
-		const showInline = diff.mode === 'mixedLines' || diff.mode === 'insertionInline';
+		const showInline = diff.mode === 'insertionInline';
 
 		const showEmptyDecorations = true;
 

From 4594828698dc64f00805398adb324ac3e11f8ea3 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sun, 16 Mar 2025 11:00:11 -0700
Subject: [PATCH 0975/1815] Fix remaining ChatAgentLocation imports (#243693)

* Fix more ChatAgentLocation imports

* Fix more
---
 .../contrib/chat/browser/actions/chatContextActions.ts        | 3 ++-
 .../workbench/contrib/chat/browser/actions/chatMoveActions.ts | 2 +-
 src/vs/workbench/contrib/chat/browser/chat.contribution.ts    | 3 ++-
 .../browser/chatEditing/chatEditingCodeEditorIntegration.ts   | 3 ++-
 .../notebook/chatEditingNotebookEditorIntegration.ts          | 3 ++-
 src/vs/workbench/contrib/chat/browser/chatEditorInput.ts      | 2 +-
 src/vs/workbench/contrib/chat/browser/chatInputPart.ts        | 4 ++--
 .../contrib/chat/browser/chatParticipant.contribution.ts      | 4 ++--
 src/vs/workbench/contrib/chat/browser/chatSetup.ts            | 3 ++-
 src/vs/workbench/contrib/chat/browser/chatVariables.ts        | 3 +--
 .../contrib/chat/browser/contrib/chatInputCompletions.ts      | 4 ++--
 src/vs/workbench/contrib/chat/common/chatAgents.ts            | 1 -
 src/vs/workbench/contrib/chat/common/chatSlashCommands.ts     | 2 +-
 .../contrib/chat/electron-sandbox/actions/voiceChatActions.ts | 3 ++-
 src/vs/workbench/contrib/chat/test/browser/mockChatWidget.ts  | 2 +-
 .../contrib/chat/test/common/chatRequestParser.test.ts        | 4 ++--
 src/vs/workbench/contrib/chat/test/common/mockChatService.ts  | 2 +-
 .../contrib/chat/test/common/voiceChatService.test.ts         | 3 ++-
 .../contrib/inlineChat/browser/inlineChatCurrentLine.ts       | 3 ++-
 .../inlineChat/browser/inlineChatSessionServiceImpl.ts        | 3 ++-
 .../inlineChat/test/browser/inlineChatController.test.ts      | 3 ++-
 .../contrib/cellDiagnostics/cellDiagnosticEditorContrib.ts    | 3 ++-
 .../contrib/cellDiagnostics/diagnosticCellStatusBarContrib.ts | 3 ++-
 .../test/browser/contrib/notebookCellDiagnostics.test.ts      | 3 ++-
 .../chat/browser/terminal.initialHint.contribution.ts         | 3 ++-
 .../terminalContrib/chat/browser/terminalChatActions.ts       | 2 +-
 .../terminalContrib/chat/browser/terminalChatEnabler.ts       | 3 ++-
 .../chat/test/browser/terminalInitialHint.test.ts             | 3 ++-
 28 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
index 3cc3f4270057..ed203d960c1e 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts
@@ -48,12 +48,13 @@ import { isSearchTreeFileMatch, isSearchTreeMatch } from '../../../search/browse
 import { SearchView } from '../../../search/browser/searchView.js';
 import { ISymbolQuickPickItem, SymbolsQuickAccessProvider } from '../../../search/browser/symbolsQuickAccess.js';
 import { SearchContext } from '../../../search/common/constants.js';
-import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
+import { IChatAgentService } from '../../common/chatAgents.js';
 import { ChatContextKeyExprs, ChatContextKeys } from '../../common/chatContextKeys.js';
 import { IChatEditingService } from '../../common/chatEditingService.js';
 import { IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData } from '../../common/chatModel.js';
 import { ChatRequestAgentPart } from '../../common/chatParserTypes.js';
 import { IChatVariablesService } from '../../common/chatVariables.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
 import { IChatWidget, IChatWidgetService, IQuickChatService, showChatView, showEditsView } from '../chat.js';
 import { imageToHash, isImage } from '../chatPasteProviders.js';
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts
index 0d82ca6edf29..5f89fe7ab7a8 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts
@@ -18,7 +18,7 @@ import { IEditorGroupsService } from '../../../../services/editor/common/editorG
 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 { ChatAgentLocation } from '../../common/chatAgents.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 
 enum MoveToNewLocation {
 	Editor = 'Editor',
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 44e22da5cada..a091ff5f4691 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -31,7 +31,7 @@ import { IWorkbenchAssignmentService } from '../../../services/assignment/common
 import { mcpSchemaId } from '../../../services/configuration/common/configuration.js';
 import { IEditorResolverService, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
 import { mcpConfigurationSection, mcpDiscoverySection, mcpSchemaExampleServers } from '../../mcp/common/mcpConfiguration.js';
-import { ChatAgentLocation, ChatAgentNameService, ChatAgentService, IChatAgentNameService, IChatAgentService } from '../common/chatAgents.js';
+import { ChatAgentNameService, ChatAgentService, IChatAgentNameService, IChatAgentService } from '../common/chatAgents.js';
 import { CodeMapperService, ICodeMapperService } from '../common/chatCodeMapperService.js';
 import '../common/chatColors.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
@@ -44,6 +44,7 @@ import { ChatSlashCommandService, IChatSlashCommandService } from '../common/cha
 import { ChatTransferService, IChatTransferService } from '../common/chatTransferService.js';
 import { IChatVariablesService } from '../common/chatVariables.js';
 import { ChatWidgetHistoryService, IChatWidgetHistoryService } from '../common/chatWidgetHistoryService.js';
+import { ChatAgentLocation } from '../common/constants.js';
 import { ILanguageModelIgnoredFilesService, LanguageModelIgnoredFilesService } from '../common/ignoredFiles.js';
 import { ILanguageModelsService, LanguageModelsService } from '../common/languageModels.js';
 import { ILanguageModelStatsService, LanguageModelStatsService } from '../common/languageModelStats.js';
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
index a79cfd9127d3..ba68a8321b5c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts
@@ -35,10 +35,11 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { EditorsOrder, IEditorIdentifier, isDiffEditorInput } from '../../../../common/editor.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { overviewRulerModifiedForeground, minimapGutterModifiedBackground, overviewRulerAddedForeground, minimapGutterAddedBackground, overviewRulerDeletedForeground, minimapGutterDeletedBackground } from '../../../scm/common/quickDiff.js';
-import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
+import { IChatAgentService } from '../../common/chatAgents.js';
 import { IChatEditingService, IModifiedFileEntry, IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { isTextDiffEditorForEntry } from './chatEditing.js';
 import { IEditorDecorationsCollection } from '../../../../../editor/common/editorCommon.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 
 export interface IDocumentDiff2 extends IDocumentDiff {
 
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 bf56d1041055..819d1329779a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingNotebookEditorIntegration.ts
@@ -23,8 +23,9 @@ import { getNotebookEditorFromEditorPane, ICellViewModel, INotebookEditor } from
 import { INotebookEditorService } from '../../../../notebook/browser/services/notebookEditorService.js';
 import { NotebookCellTextModel } from '../../../../notebook/common/model/notebookCellTextModel.js';
 import { NotebookTextModel } from '../../../../notebook/common/model/notebookTextModel.js';
-import { ChatAgentLocation, IChatAgentService } from '../../../common/chatAgents.js';
+import { IChatAgentService } from '../../../common/chatAgents.js';
 import { IModifiedFileEntryChangeHunk, IModifiedFileEntryEditorIntegration } from '../../../common/chatEditingService.js';
+import { ChatAgentLocation } from '../../../common/constants.js';
 import { ChatEditingCodeEditorIntegration, IDocumentDiff2 } from '../chatEditingCodeEditorIntegration.js';
 import { ChatEditingModifiedNotebookEntry } from '../chatEditingModifiedNotebookEntry.js';
 import { countChanges, ICellDiffInfo, sortCellChanges } from './notebookCellChanges.js';
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditorInput.ts b/src/vs/workbench/contrib/chat/browser/chatEditorInput.ts
index 5bac1b4a5a9e..4f539b30d19a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditorInput.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditorInput.ts
@@ -16,9 +16,9 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { EditorInputCapabilities, IEditorSerializer, IUntypedEditorInput } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import type { IChatEditorOptions } from './chatEditor.js';
-import { ChatAgentLocation } from '../common/chatAgents.js';
 import { IChatModel } from '../common/chatModel.js';
 import { IChatService } from '../common/chatService.js';
+import { ChatAgentLocation } from '../common/constants.js';
 
 const ChatEditorIcon = registerIcon('chat-editor-label-icon', Codicon.commentDiscussion, nls.localize('chatEditorLabelIcon', 'Icon of the chat editor label.'));
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index a4919cceeaac..3b65f8a0ff3c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -67,7 +67,7 @@ import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../services/edit
 import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
 import { getSimpleCodeEditorWidgetOptions, getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from '../../codeEditor/browser/simpleEditorOptions.js';
-import { ChatAgentLocation, IChatAgentService } from '../common/chatAgents.js';
+import { IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatEditingSession } from '../common/chatEditingService.js';
 import { ChatEntitlement, IChatEntitlementService } from '../common/chatEntitlementService.js';
@@ -76,7 +76,7 @@ import { IChatFollowup, IChatService } from '../common/chatService.js';
 import { IChatVariablesService } from '../common/chatVariables.js';
 import { IChatResponseViewModel } from '../common/chatViewModel.js';
 import { ChatInputHistoryMaxEntries, IChatHistoryEntry, IChatInputState, IChatWidgetHistoryService } from '../common/chatWidgetHistoryService.js';
-import { ChatMode } from '../common/constants.js';
+import { ChatAgentLocation, ChatMode } from '../common/constants.js';
 import { ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../common/languageModels.js';
 import { CancelAction, ChatSubmitAction, ChatSubmitSecondaryAgentAction, ChatSwitchToNextModelActionId, IChatExecuteActionContext, IToggleChatModeArgs, ToggleAgentModeActionId } from './actions/chatExecuteActions.js';
 import { ImplicitContextAttachmentWidget } from './attachments/implicitContextAttachment.js';
diff --git a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
index cc8326cca63c..f3cda6408937 100644
--- a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
@@ -26,10 +26,10 @@ 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 { ChatAgentLocation, IChatAgentData, IChatAgentService } from '../common/chatAgents.js';
+import { IChatAgentData, IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IRawChatParticipantContribution } from '../common/chatParticipantContribTypes.js';
-import { ChatConfiguration } from '../common/constants.js';
+import { ChatAgentLocation, ChatConfiguration } from '../common/constants.js';
 import { ChatViewId } from './chat.js';
 import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID, ChatViewPane } from './chatViewPane.js';
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 887b98797477..756a019ebb56 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -55,7 +55,7 @@ import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.
 import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
-import { ChatAgentLocation, IChatAgentImplementation, IChatAgentRequest, IChatAgentResult, IChatAgentService, IChatWelcomeMessageContent } from '../common/chatAgents.js';
+import { IChatAgentImplementation, IChatAgentRequest, IChatAgentResult, IChatAgentService, IChatWelcomeMessageContent } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { ChatEntitlement, ChatEntitlementContext, ChatEntitlementRequests, ChatEntitlementService, IChatEntitlementService } from '../common/chatEntitlementService.js';
 import { IChatProgress, IChatProgressMessage, IChatWarningMessage } from '../common/chatService.js';
@@ -63,6 +63,7 @@ import { CHAT_CATEGORY, CHAT_SETUP_ACTION_ID } from './actions/chatActions.js';
 import { ChatViewId, EditsViewId, ensureSideBarChatViewSize, preferCopilotEditsView, showCopilotView } from './chat.js';
 import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
 import { ChatViewsWelcomeExtensions, IChatViewsWelcomeContributionRegistry } from './viewsWelcome/chatViewsWelcome.js';
+import { ChatAgentLocation } from '../common/constants.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
diff --git a/src/vs/workbench/contrib/chat/browser/chatVariables.ts b/src/vs/workbench/contrib/chat/browser/chatVariables.ts
index 75e7c2d38e5e..81e667f8d37e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatVariables.ts
@@ -8,11 +8,10 @@ import { URI } from '../../../../base/common/uri.js';
 import { Location } from '../../../../editor/common/languages.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
-import { ChatAgentLocation } from '../common/chatAgents.js';
 import { IChatRequestVariableData, IChatRequestVariableEntry } from '../common/chatModel.js';
 import { ChatRequestDynamicVariablePart, ChatRequestToolPart, IParsedChatRequest } from '../common/chatParserTypes.js';
 import { IChatVariablesService, IDynamicVariable } from '../common/chatVariables.js';
-import { ChatConfiguration } from '../common/constants.js';
+import { ChatAgentLocation, ChatConfiguration } from '../common/constants.js';
 import { IChatWidgetService, showChatView, showEditsView } from './chat.js';
 import { ChatDynamicVariableModel } from './contrib/chatDynamicVariables.js';
 
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
index 92783d78ea06..61e0ce11612c 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
@@ -36,12 +36,12 @@ import { IHistoryService } from '../../../../services/history/common/history.js'
 import { LifecyclePhase } from '../../../../services/lifecycle/common/lifecycle.js';
 import { QueryBuilder } from '../../../../services/search/common/queryBuilder.js';
 import { ISearchService } from '../../../../services/search/common/search.js';
-import { ChatAgentLocation, IChatAgentData, IChatAgentNameService, IChatAgentService, getFullyQualifiedId } from '../../common/chatAgents.js';
+import { IChatAgentData, IChatAgentNameService, IChatAgentService, getFullyQualifiedId } from '../../common/chatAgents.js';
 import { IChatEditingService } from '../../common/chatEditingService.js';
 import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestTextPart, ChatRequestToolPart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from '../../common/chatParserTypes.js';
 import { IChatSlashCommandService } from '../../common/chatSlashCommands.js';
 import { IDynamicVariable } from '../../common/chatVariables.js';
-import { ChatMode } from '../../common/constants.js';
+import { ChatAgentLocation, ChatMode } from '../../common/constants.js';
 import { ILanguageModelToolsService } from '../../common/languageModelToolsService.js';
 import { ChatEditingSessionSubmitAction, ChatSubmitAction } from '../actions/chatExecuteActions.js';
 import { IChatWidget, IChatWidgetService } from '../chat.js';
diff --git a/src/vs/workbench/contrib/chat/common/chatAgents.ts b/src/vs/workbench/contrib/chat/common/chatAgents.ts
index a1b5af3eb619..ce8309c498af 100644
--- a/src/vs/workbench/contrib/chat/common/chatAgents.ts
+++ b/src/vs/workbench/contrib/chat/common/chatAgents.ts
@@ -750,4 +750,3 @@ export function reviveSerializedAgent(raw: ISerializableChatAgentData): IChatAge
 
 	return revive(agent);
 }
-export { ChatAgentLocation };
diff --git a/src/vs/workbench/contrib/chat/common/chatSlashCommands.ts b/src/vs/workbench/contrib/chat/common/chatSlashCommands.ts
index 20ec2affa73d..e258f8f5c629 100644
--- a/src/vs/workbench/contrib/chat/common/chatSlashCommands.ts
+++ b/src/vs/workbench/contrib/chat/common/chatSlashCommands.ts
@@ -11,7 +11,7 @@ import { IProgress } from '../../../../platform/progress/common/progress.js';
 import { IChatMessage } from './languageModels.js';
 import { IChatFollowup, IChatProgress, IChatResponseProgressFileTreeData } from './chatService.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { ChatAgentLocation } from './chatAgents.js';
+import { ChatAgentLocation } from './constants.js';
 
 //#region slash service, commands etc
 
diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
index 9a33d55ae7b8..a55199d97694 100644
--- a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
+++ b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
@@ -36,7 +36,7 @@ import { AccessibilityVoiceSettingId, SpeechTimeoutDefault, accessibilityConfigu
 import { CHAT_CATEGORY } from '../../browser/actions/chatActions.js';
 import { IChatExecuteActionContext } from '../../browser/actions/chatExecuteActions.js';
 import { IChatWidget, IChatWidgetService, IQuickChatService, showChatView } from '../../browser/chat.js';
-import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
+import { IChatAgentService } from '../../common/chatAgents.js';
 import { ChatContextKeys } from '../../common/chatContextKeys.js';
 import { KEYWORD_ACTIVIATION_SETTING_ID } from '../../common/chatService.js';
 import { ChatResponseViewModel, IChatResponseViewModel, isResponseVM } from '../../common/chatViewModel.js';
@@ -54,6 +54,7 @@ import { IViewsService } from '../../../../services/views/common/viewsService.js
 import { IChatResponseModel } from '../../common/chatModel.js';
 import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.js';
 import { renderStringAsPlaintext } from '../../../../../base/browser/markdownRenderer.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 
 //#region Speech to Text
 
diff --git a/src/vs/workbench/contrib/chat/test/browser/mockChatWidget.ts b/src/vs/workbench/contrib/chat/test/browser/mockChatWidget.ts
index cf64e8379ac5..4924c4714d22 100644
--- a/src/vs/workbench/contrib/chat/test/browser/mockChatWidget.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/mockChatWidget.ts
@@ -6,7 +6,7 @@
 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/chatAgents.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 
 export class MockChatWidgetService implements IChatWidgetService {
 	readonly onDidAddWidget: Event<IChatWidget> = Event.None;
diff --git a/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts b/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts
index d85f3a17f38f..b9dd31e234af 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatRequestParser.test.ts
@@ -13,12 +13,12 @@ import { ILogService, NullLogService } from '../../../../../platform/log/common/
 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 { ChatAgentLocation, ChatAgentService, IChatAgentCommand, IChatAgentData, IChatAgentService } from '../../common/chatAgents.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 { IChatVariablesService } from '../../common/chatVariables.js';
-import { ChatMode } from '../../common/constants.js';
+import { ChatMode, ChatAgentLocation } from '../../common/constants.js';
 import { ILanguageModelToolsService, IToolData } from '../../common/languageModelToolsService.js';
 import { MockChatService } from './mockChatService.js';
 import { MockChatVariablesService } from './mockChatVariables.js';
diff --git a/src/vs/workbench/contrib/chat/test/common/mockChatService.ts b/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
index df0c99daaf4c..833dbc57c4ad 100644
--- a/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
+++ b/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
@@ -6,10 +6,10 @@
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Event } from '../../../../../base/common/event.js';
 import { URI } from '../../../../../base/common/uri.js';
-import { ChatAgentLocation } from '../../common/chatAgents.js';
 import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, ISerializableChatData } from '../../common/chatModel.js';
 import { IParsedChatRequest } from '../../common/chatParserTypes.js';
 import { IChatCompleteResponse, IChatDetail, IChatProviderInfo, IChatSendRequestData, IChatSendRequestOptions, IChatService, IChatTransferredSessionData, IChatUserActionEvent } from '../../common/chatService.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 
 export class MockChatService implements IChatService {
 	_serviceBrand: undefined;
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 53def63d4901..16e504d20ac1 100644
--- a/src/vs/workbench/contrib/chat/test/common/voiceChatService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/voiceChatService.test.ts
@@ -13,10 +13,11 @@ 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 { ChatAgentLocation, IChatAgent, IChatAgentCommand, IChatAgentCompletionItem, IChatAgentData, IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, IChatAgentService, IChatParticipantDetectionProvider, IChatWelcomeMessageContent } from '../../common/chatAgents.js';
+import { IChatAgent, IChatAgentCommand, IChatAgentCompletionItem, IChatAgentData, IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, IChatAgentService, IChatParticipantDetectionProvider, IChatWelcomeMessageContent } from '../../common/chatAgents.js';
 import { IChatModel } from '../../common/chatModel.js';
 import { IChatFollowup, IChatProgress } from '../../common/chatService.js';
 import { IVoiceChatSessionOptions, IVoiceChatTextEvent, VoiceChatService } from '../../common/voiceChatService.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 
 suite('VoiceChat', () => {
 
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
index 0e6b7f98cee1..530120c5d973 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
@@ -27,7 +27,7 @@ import './media/inlineChat.css';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { InlineCompletionsController } from '../../../../editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js';
-import { ChatAgentLocation, IChatAgentService } from '../../chat/common/chatAgents.js';
+import { IChatAgentService } from '../../chat/common/chatAgents.js';
 import { IMarkerDecorationsService } from '../../../../editor/common/services/markerDecorations.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { toAction } from '../../../../base/common/actions.js';
@@ -39,6 +39,7 @@ import { createStyleSheet2 } from '../../../../base/browser/domStylesheets.js';
 import { stringValue } from '../../../../base/browser/cssValue.js';
 import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
 import { Emitter } from '../../../../base/common/event.js';
+import { ChatAgentLocation } from '../../chat/common/constants.js';
 
 export const CTX_INLINE_CHAT_SHOWING_HINT = new RawContextKey<boolean>('inlineChatShowingHint', false, localize('inlineChatShowingHint', "Whether inline chat shows a contextual hint"));
 
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
index 7765688673b9..f3b196eb244f 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
@@ -20,7 +20,7 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { DEFAULT_EDITOR_ASSOCIATION } from '../../../common/editor.js';
-import { ChatAgentLocation, IChatAgentService } from '../../chat/common/chatAgents.js';
+import { IChatAgentService } from '../../chat/common/chatAgents.js';
 import { IChatService } from '../../chat/common/chatService.js';
 import { CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_AGENT2, CTX_INLINE_CHAT_POSSIBLE } from '../common/inlineChat.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
@@ -35,6 +35,7 @@ import { assertType } from '../../../../base/common/types.js';
 import { autorun } from '../../../../base/common/observable.js';
 import { ResourceMap } from '../../../../base/common/map.js';
 import { IChatWidgetService } from '../../chat/browser/chat.js';
+import { ChatAgentLocation } from '../../chat/common/constants.js';
 
 
 type SessionData = {
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
index 185476fb7f84..49aa40744eeb 100644
--- a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
@@ -31,7 +31,7 @@ import { IView, IViewDescriptorService } from '../../../../common/views.js';
 import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
 import { IAccessibleViewService } from '../../../../../platform/accessibility/browser/accessibleView.js';
 import { IChatAccessibilityService, IChatWidget, IChatWidgetService } from '../../../chat/browser/chat.js';
-import { ChatAgentLocation, ChatAgentService, IChatAgentData, IChatAgentNameService, IChatAgentService } from '../../../chat/common/chatAgents.js';
+import { ChatAgentService, IChatAgentData, IChatAgentNameService, IChatAgentService } from '../../../chat/common/chatAgents.js';
 import { IChatResponseViewModel } from '../../../chat/common/chatViewModel.js';
 import { InlineChatController1, State } from '../../browser/inlineChatController.js';
 import { CTX_INLINE_CHAT_RESPONSE_TYPE, InlineChatConfigKeys, InlineChatResponseType } from '../../common/inlineChat.js';
@@ -71,6 +71,7 @@ import { ChatInputBoxContentProvider } from '../../../chat/browser/chatEdinputIn
 import { constObservable, IObservable } from '../../../../../base/common/observable.js';
 import { ILanguageModelToolsService } from '../../../chat/common/languageModelToolsService.js';
 import { MockLanguageModelToolsService } from '../../../chat/test/common/mockLanguageModelToolsService.js';
+import { ChatAgentLocation } from '../../../chat/common/constants.js';
 
 suite('InlineChatController', function () {
 
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 2fec25ce46f9..584fc890a929 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,8 @@ import { INotebookEditor, INotebookEditorContribution } from '../../notebookBrow
 import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
 import { CodeCellViewModel } from '../../viewModel/codeCellViewModel.js';
 import { Event } from '../../../../../../base/common/event.js';
-import { ChatAgentLocation, IChatAgentService } from '../../../../chat/common/chatAgents.js';
+import { IChatAgentService } from '../../../../chat/common/chatAgents.js';
+import { ChatAgentLocation } from '../../../../chat/common/constants.js';
 
 export class CellDiagnostics extends Disposable implements INotebookEditorContribution {
 
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 b86b3cdeb68c..f10ea92275cc 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,8 @@ 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 { ChatAgentLocation, IChatAgentService } from '../../../../chat/common/chatAgents.js';
+import { IChatAgentService } from '../../../../chat/common/chatAgents.js';
+import { ChatAgentLocation } from '../../../../chat/common/constants.js';
 
 export class DiagnosticCellStatusBarContrib extends Disposable implements INotebookEditorContribution {
 	static id: string = 'workbench.notebook.statusBar.diagtnostic';
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 1d4640062981..5c218da6ee78 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,13 +14,14 @@ 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 { ChatAgentLocation, IChatAgent, IChatAgentData, IChatAgentService } from '../../../../chat/common/chatAgents.js';
+import { IChatAgent, IChatAgentData, IChatAgentService } from '../../../../chat/common/chatAgents.js';
 import { CellDiagnostics } from '../../../browser/contrib/cellDiagnostics/cellDiagnosticEditorContrib.js';
 import { CodeCellViewModel } from '../../../browser/viewModel/codeCellViewModel.js';
 import { CellKind, NotebookSetting } from '../../../common/notebookCommon.js';
 import { ICellExecutionStateChangedEvent, IExecutionStateChangedEvent, INotebookCellExecution, INotebookExecutionStateService, NotebookExecutionType } from '../../../common/notebookExecutionStateService.js';
 import { setupInstantiationService, TestNotebookExecutionStateService, withTestNotebook } from '../testNotebookEditor.js';
 import { nullExtensionDescription } from '../../../../../services/extensions/common/extensions.js';
+import { ChatAgentLocation } from '../../../../chat/common/constants.js';
 
 
 suite('notebookCellDiagnostics', () => {
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.initialHint.contribution.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.initialHint.contribution.ts
index f29ac9f65121..4bef1ee66e5e 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.initialHint.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.initialHint.contribution.ts
@@ -23,13 +23,14 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../../pla
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js';
 import { ITerminalCapabilityStore, TerminalCapability } from '../../../../../platform/terminal/common/capabilities/capabilities.js';
 import { AccessibilityVerbositySettingId } from '../../../accessibility/browser/accessibilityConfiguration.js';
-import { ChatAgentLocation, IChatAgent, IChatAgentService } from '../../../chat/common/chatAgents.js';
+import { IChatAgent, IChatAgentService } from '../../../chat/common/chatAgents.js';
 import { IDetachedTerminalInstance, ITerminalContribution, ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalService, IXtermTerminal } from '../../../terminal/browser/terminal.js';
 import { registerTerminalContribution, type IDetachedCompatibleTerminalContributionContext, type ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
 import { TerminalInstance } from '../../../terminal/browser/terminalInstance.js';
 import { TerminalInitialHintSettingId } from '../common/terminalInitialHintConfiguration.js';
 import './media/terminalInitialHint.css';
 import { TerminalChatCommandId } from './terminalChat.js';
+import { ChatAgentLocation } from '../../../chat/common/constants.js';
 
 const $ = dom.$;
 
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
index a18ee7ae7dd9..5e19dbde312b 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
@@ -9,9 +9,9 @@ import { localize2 } from '../../../../../nls.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IChatWidgetService } from '../../../chat/browser/chat.js';
-import { ChatAgentLocation } from '../../../chat/common/chatAgents.js';
 import { ChatContextKeys } from '../../../chat/common/chatContextKeys.js';
 import { IChatService } from '../../../chat/common/chatService.js';
+import { ChatAgentLocation } from '../../../chat/common/constants.js';
 import { AbstractInline1ChatAction } from '../../../inlineChat/browser/inlineChatActions.js';
 import { isDetachedTerminalInstance } from '../../../terminal/browser/terminal.js';
 import { registerActiveXtermAction } from '../../../terminal/browser/terminalActions.js';
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatEnabler.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatEnabler.ts
index 868a887e3141..b0b1e25e6c34 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatEnabler.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatEnabler.ts
@@ -5,7 +5,8 @@
 
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
-import { IChatAgentService, ChatAgentLocation } from '../../../chat/common/chatAgents.js';
+import { IChatAgentService } from '../../../chat/common/chatAgents.js';
+import { ChatAgentLocation } from '../../../chat/common/constants.js';
 import { TerminalChatContextKeys } from './terminalChat.js';
 
 
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/test/browser/terminalInitialHint.test.ts b/src/vs/workbench/contrib/terminalContrib/chat/test/browser/terminalInitialHint.test.ts
index d69b250f91c7..ddf420a3539b 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/test/browser/terminalInitialHint.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/test/browser/terminalInitialHint.test.ts
@@ -13,8 +13,9 @@ 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 { ChatAgentLocation, IChatAgent } from '../../../../chat/common/chatAgents.js';
+import { IChatAgent } from '../../../../chat/common/chatAgents.js';
 import { importAMDNodeModule } from '../../../../../../amdX.js';
+import { ChatAgentLocation } from '../../../../chat/common/constants.js';
 
 suite('Terminal Initial Hint Addon', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();

From 97e0cb96185948ea8bc27e1f7d8b87e94735e5f9 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Sun, 16 Mar 2025 12:08:24 -0700
Subject: [PATCH 0976/1815] Fix 7z archiving too many files (#243695)

Fixes #243484
---
 .../win32/product-build-win32.yml               | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index 6251417f193d..ab0b6cbb4dff 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -247,13 +247,16 @@ steps:
         condition: succeededOrFailed()
         displayName: Get product version
 
-      - powershell:  |
+      - powershell: |
           . build/azure-pipelines/win32/exec.ps1
           $ErrorActionPreference = "Stop"
           $ArchivePath = ".build\win32-$(VSCODE_ARCH)\VSCode-win32-$(VSCODE_ARCH)-$(VSCODE_VERSION).zip"
           New-Item -ItemType Directory -Path .build\win32-$(VSCODE_ARCH) -Force
-          exec { 7z.exe a -tzip $ArchivePath -x!CodeSignSummary*.md ..\VSCode-win32-$(VSCODE_ARCH)\* -r }
+          exec { 7z.exe a -tzip $ArchivePath ..\VSCode-win32-$(VSCODE_ARCH)\* "-xr!CodeSignSummary*.md" }
           echo "##vso[task.setvariable variable=CLIENT_PATH]$ArchivePath"
+
+          echo "Listing archive contents"
+          7z.exe l $ArchivePath
         condition: and(succeededOrFailed(), eq(variables['BUILT_CLIENT'], 'true'))
         displayName: Package client
 
@@ -262,8 +265,11 @@ steps:
           $ErrorActionPreference = "Stop"
           $ArchivePath = ".build\win32-$(VSCODE_ARCH)\vscode-server-win32-$(VSCODE_ARCH).zip"
           New-Item -ItemType Directory -Path .build\win32-$(VSCODE_ARCH) -Force
-          exec { 7z.exe a -tzip $ArchivePath ..\vscode-server-win32-$(VSCODE_ARCH) -r }
+          exec { 7z.exe a -tzip $ArchivePath ..\vscode-server-win32-$(VSCODE_ARCH) }
           echo "##vso[task.setvariable variable=SERVER_PATH]$ArchivePath"
+
+          echo "Listing archive contents"
+          7z.exe l $ArchivePath
         condition: and(succeededOrFailed(), eq(variables['BUILT_SERVER'], 'true'))
         displayName: Package server
 
@@ -272,8 +278,11 @@ steps:
           $ErrorActionPreference = "Stop"
           $ArchivePath = ".build\win32-$(VSCODE_ARCH)\vscode-server-win32-$(VSCODE_ARCH)-web.zip"
           New-Item -ItemType Directory -Path .build\win32-$(VSCODE_ARCH) -Force
-          exec { 7z.exe a -tzip $ArchivePath ..\vscode-server-win32-$(VSCODE_ARCH)-web -r }
+          exec { 7z.exe a -tzip $ArchivePath ..\vscode-server-win32-$(VSCODE_ARCH)-web }
           echo "##vso[task.setvariable variable=WEB_PATH]$ArchivePath"
+
+          echo "Listing archive contents"
+          7z.exe l $ArchivePath
         condition: and(succeededOrFailed(), eq(variables['BUILT_WEB'], 'true'))
         displayName: Package server (web)
 

From da1f16ceaced7682eac0b6c8e3dac4dd0f8575a1 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sun, 16 Mar 2025 20:37:01 +0100
Subject: [PATCH 0977/1815] chat - submit request again when setup ready
 (#243696)

* chat - submit request again when setup ready

* supper agent mode
---
 .../contrib/chat/browser/chatSetup.ts         | 110 ++++++++++++------
 1 file changed, 72 insertions(+), 38 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 756a019ebb56..6173a39b8c98 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -58,12 +58,13 @@ import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.
 import { IChatAgentImplementation, IChatAgentRequest, IChatAgentResult, IChatAgentService, IChatWelcomeMessageContent } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { ChatEntitlement, ChatEntitlementContext, ChatEntitlementRequests, ChatEntitlementService, IChatEntitlementService } from '../common/chatEntitlementService.js';
-import { IChatProgress, IChatProgressMessage, IChatWarningMessage } from '../common/chatService.js';
+import { IChatProgress, IChatProgressMessage, IChatService, IChatWarningMessage } from '../common/chatService.js';
 import { CHAT_CATEGORY, CHAT_SETUP_ACTION_ID } from './actions/chatActions.js';
 import { ChatViewId, EditsViewId, ensureSideBarChatViewSize, preferCopilotEditsView, showCopilotView } from './chat.js';
 import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
 import { ChatViewsWelcomeExtensions, IChatViewsWelcomeContributionRegistry } from './viewsWelcome/chatViewsWelcome.js';
 import { ChatAgentLocation } from '../common/constants.js';
+import { ILanguageModelsService } from '../common/languageModels.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -88,9 +89,9 @@ const defaultChat = {
 
 //#region Contribution
 
-class SetupChatAgentImplementation implements IChatAgentImplementation {
+class SetupChatAgentImplementation extends Disposable implements IChatAgentImplementation {
 
-	static register(instantiationService: IInstantiationService, location: ChatAgentLocation, context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): IDisposable {
+	static register(instantiationService: IInstantiationService, location: ChatAgentLocation, isToolsAgent: boolean, context: ChatEntitlementContext, controller: Lazy<ChatSetupController>): IDisposable {
 		return instantiationService.invokeFunction(accessor => {
 			const chatAgentService = accessor.get(IChatAgentService);
 
@@ -101,39 +102,46 @@ class SetupChatAgentImplementation implements IChatAgentImplementation {
 				ChatContextKeys.Setup.fromDialog
 			);
 
-			const id = location === ChatAgentLocation.Panel ? 'setup.chat' : 'setup.edits';
+			const id = location === ChatAgentLocation.Panel ? 'setup.chat' : isToolsAgent ? 'setup.agent' : 'setup.edits';
 
 			const welcomeMessageContent: IChatWelcomeMessageContent = location === ChatAgentLocation.Panel ?
 				{
 					title: localize('chatTitle', "Ask Copilot"),
 					message: new MarkdownString(localize('chatMessage', "Copilot is powered by AI, so mistakes are possible. Review output carefully before use.")),
 					icon: Codicon.copilotLarge
-				} :
-				{
-					title: localize('editsTitle', "Edit with Copilot"),
-					message: new MarkdownString(localize('editsMessage', "Start your editing session by defining a set of files that you want to work with. Then ask Copilot for the changes you want to make.")),
-					icon: Codicon.copilotLarge
-				};
-
-			return combinedDisposable(
-				chatAgentService.registerAgent(id, {
-					id,
-					name: `${defaultChat.providerName} Copilot`,
-					isDefault: true,
-					when: setupChatAgentContext?.serialize(),
-					slashCommands: [],
-					disambiguation: [],
-					locations: [location],
-					metadata: {
-						welcomeMessageContent
-					},
-					description: location === ChatAgentLocation.Panel ? localize('chatDescription', "Ask Copilot") : localize('editsDescription', "Edit files in your workspace"),
-					extensionId: nullExtensionDescription.identifier,
-					extensionDisplayName: nullExtensionDescription.name,
-					extensionPublisherId: nullExtensionDescription.publisher
-				}),
-				chatAgentService.registerAgentImplementation(id, instantiationService.createInstance(SetupChatAgentImplementation, context, controller))
-			);
+				} : isToolsAgent ?
+					{
+						title: localize('editsTitle', "Edit with Copilot"),
+						message: new MarkdownString(localize('agentMessage', "Ask Copilot to edit your files in agent mode. Copilot will automatically use multiple requests to pick files to edit, run terminal commands, and iterate on errors.")),
+						icon: Codicon.copilotLarge
+					} :
+					{
+						title: localize('editsTitle', "Edit with Copilot"),
+						message: new MarkdownString(localize('editsMessage', "Start your editing session by defining a set of files that you want to work with. Then ask Copilot for the changes you want to make.")),
+						icon: Codicon.copilotLarge
+					};
+
+			const disposable = new DisposableStore();
+
+			disposable.add(chatAgentService.registerAgent(id, {
+				id,
+				name: `${defaultChat.providerName} Copilot`,
+				isDefault: true,
+				isToolsAgent,
+				when: setupChatAgentContext?.serialize(),
+				slashCommands: [],
+				disambiguation: [],
+				locations: [location],
+				metadata: { welcomeMessageContent },
+				description: location === ChatAgentLocation.Panel ? localize('chatDescription', "Ask Copilot") : isToolsAgent ? localize('agentDescription', "Edit files in your workspace in agent mode (Experimental)") : localize('editsDescription', "Edit files in your workspace"),
+				extensionId: nullExtensionDescription.identifier,
+				extensionDisplayName: nullExtensionDescription.name,
+				extensionPublisherId: nullExtensionDescription.publisher
+			}));
+
+			disposable.add(chatAgentService.registerAgentImplementation(id, disposable.add(instantiationService.createInstance(SetupChatAgentImplementation, context, controller))));
+
+			return disposable;
 		});
 	}
 
@@ -143,10 +151,21 @@ class SetupChatAgentImplementation implements IChatAgentImplementation {
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ILogService private readonly logService: ILogService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService,
-	) { }
+		@ITelemetryService private readonly telemetryService: ITelemetryService
+	) {
+		super();
+	}
 
 	async invoke(request: IChatAgentRequest, progress: (part: IChatProgress) => void): Promise<IChatAgentResult> {
+		return this.instantiationService.invokeFunction(async accessor => {
+			const chatService = accessor.get(IChatService);						// use accessor for lazy loading
+			const languageModelsService = accessor.get(ILanguageModelsService);	// of chat related services
+
+			return this.doInvoke(request, progress, chatService, languageModelsService);
+		});
+	}
+
+	private async doInvoke(request: IChatAgentRequest, progress: (part: IChatProgress) => void, chatService: IChatService, languageModelsService: ILanguageModelsService): Promise<IChatAgentResult> {
 		this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: CHAT_SETUP_ACTION_ID, from: 'chat' });
 
 		const dialog = this.instantiationService.createInstance(ChatSetupDialog, this.context);
@@ -154,30 +173,32 @@ class SetupChatAgentImplementation implements IChatAgentImplementation {
 
 		// Proceed with setting up Copilot
 		if (result) {
-			const listener = this.controller.value.onDidChange(e => {
+			const setupListener = 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.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName)),
+							content: new MarkdownString(localize('setupChatSignIn2', "Signing in to {0}.", ChatEntitlementRequests.providerId(this.configurationService) === defaultChat.enterpriseProviderId ? defaultChat.enterpriseProviderName : defaultChat.providerName)),
 						} satisfies IChatProgressMessage);
 						break;
 					case ChatSetupStep.Installing:
 						progress({
 							kind: 'progressMessage',
-							content: new MarkdownString(localize('installingCopilot', "Getting Copilot Ready...")),
+							content: new MarkdownString(localize('installingCopilot', "Getting Copilot ready.")),
 						} satisfies IChatProgressMessage);
 						break;
 				}
 			});
 
+			const whenDefaultModel = Event.toPromise(Event.filter(languageModelsService.onDidChangeLanguageModels, e => e.added?.some(added => added.metadata.isDefault) ?? false));
+
 			let success = false;
 			try {
 				success = await this.controller.value.setup();
 			} catch (error) {
 				this.logService.error(localize('setupError', "Error during setup: {0}", toErrorMessage(error)));
 			} finally {
-				listener.dispose();
+				setupListener.dispose();
 			}
 
 			if (success) {
@@ -185,6 +206,18 @@ class SetupChatAgentImplementation implements IChatAgentImplementation {
 					kind: 'progressMessage',
 					content: new MarkdownString(localize('copilotReady', "Copilot is ready to use.")),
 				} satisfies IChatProgressMessage);
+
+				// Await a default model to be present before attempting
+				// to re-submit the request. Otherwise, the request will fail.
+				const hasDefaultModel = await Promise.race([
+					timeout(5000),
+					whenDefaultModel
+				]);
+
+				if (hasDefaultModel) {
+					chatService.cancelCurrentRequestForSession(request.sessionId);
+					chatService.sendRequest(request.sessionId, request.message);
+				}
 			}
 			else {
 				progress({
@@ -336,8 +369,9 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 			const disabled = context.state.installed || context.state.hidden || !this.configurationService.getValue('chat.experimental.setupFromDialog');
 			if (!disabled && !registration.value) {
 				registration.value = combinedDisposable(
-					SetupChatAgentImplementation.register(this.instantiationService, ChatAgentLocation.Panel, context, controller),
-					SetupChatAgentImplementation.register(this.instantiationService, ChatAgentLocation.EditingSession, context, controller)
+					SetupChatAgentImplementation.register(this.instantiationService, ChatAgentLocation.Panel, false, context, controller),
+					SetupChatAgentImplementation.register(this.instantiationService, ChatAgentLocation.EditingSession, false, context, controller),
+					SetupChatAgentImplementation.register(this.instantiationService, ChatAgentLocation.EditingSession, true, context, controller)
 				);
 			} else if (disabled && registration.value) {
 				registration.clear();

From 02ae480316e547b9a51f3fe972e3f070d81a1b06 Mon Sep 17 00:00:00 2001
From: Connor Peet <copeet@microsoft.com>
Date: Sun, 16 Mar 2025 20:10:02 -0700
Subject: [PATCH 0978/1815] mcp: add ai-assisted setup for MCP servers
 (#243705)

---
 .../contrib/mcp/browser/mcpCommands.ts        | 149 +--------
 .../browser/mcpCommandsAddConfiguration.ts    | 292 ++++++++++++++++++
 .../contrib/mcp/common/mcpConfiguration.ts    |  68 ++--
 3 files changed, 329 insertions(+), 180 deletions(-)
 create mode 100644 src/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration.ts

diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
index fe14cebe3795..7e45d1506a46 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -10,31 +10,24 @@ import { Event } from '../../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { autorun, derived } 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 { ILocalizedString, 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 } from '../../../../platform/actions/common/actions.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { ConfigurationTarget, getConfigValueInTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
-import { IMcpConfiguration, IMcpConfigurationSSE } from '../../../../platform/mcp/common/mcpPlatformTypes.js';
 import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
 import { spinningLoading } from '../../../../platform/theme/common/iconRegistry.js';
-import { IWorkspace, IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { ActiveEditorContext, ResourceContextKey } from '../../../common/contextkeys.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { IJSONEditingService } from '../../../services/configuration/common/jsonEditing.js';
-import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
 import { ChatMode } from '../../chat/common/constants.js';
 import { TEXT_FILE_EDITOR_ID } from '../../files/common/files.js';
-import { IMcpConfigurationStdio } from '../common/mcpConfiguration.js';
 import { McpContextKeys } from '../common/mcpContextKeys.js';
 import { IMcpRegistry } from '../common/mcpRegistryTypes.js';
 import { IMcpServer, IMcpService, LazyCollectionState, McpConnectionState, McpServerToolsState } from '../common/mcpTypes.js';
+import { McpAddConfigurationCommand } from './mcpCommandsAddConfiguration.js';
 
 // acroynms do not get localized
 const category: ILocalizedString = {
@@ -390,145 +383,7 @@ export class AddConfigurationAction extends Action2 {
 		});
 	}
 
-	private async getServerType(quickInputService: IQuickInputService): Promise<{ id: 'stdio' | 'sse' } | undefined> {
-		return quickInputService.pick([
-			{ id: 'stdio', label: localize('mcp.serverType.command', "Command (stdio)"), description: localize('mcp.serverType.command.description', "Run a local command that implements the MCP protocol") },
-			{ id: 'sse', label: localize('mcp.serverType.http', "HTTP (server-sent events)"), description: localize('mcp.serverType.http.description', "Connect to a remote HTTP server that implements the MCP protocol") }
-		], {
-			title: localize('mcp.serverType.title', "Select Server Type"),
-			placeHolder: localize('mcp.serverType.placeholder', "Choose the type of MCP server to add")
-		}) as Promise<{ id: 'stdio' | 'sse' } | undefined>;
-	}
-
-	private async getStdioConfig(quickInputService: IQuickInputService): Promise<IMcpConfigurationStdio | undefined> {
-		const command = await quickInputService.input({
-			title: localize('mcp.command.title', "Enter Command"),
-			placeHolder: localize('mcp.command.placeholder', "Command to run (with optional arguments)"),
-			ignoreFocusLost: true,
-		});
-
-		if (!command) {
-			return undefined;
-		}
-
-		// Split command into command and args, handling quotes
-		const parts = command.match(/(?:[^\s"]+|"[^"]*")+/g)!;
-		return {
-			type: 'stdio',
-			command: parts[0].replace(/"/g, ''),
-			args: parts.slice(1).map(arg => arg.replace(/"/g, ''))
-		};
-	}
-
-	private async getSSEConfig(quickInputService: IQuickInputService): Promise<IMcpConfigurationSSE | undefined> {
-		const url = await quickInputService.input({
-			title: localize('mcp.url.title', "Enter Server URL"),
-			placeHolder: localize('mcp.url.placeholder', "URL of the MCP server (e.g., http://localhost:3000)"),
-			ignoreFocusLost: true,
-		});
-
-		if (!url) {
-			return undefined;
-		}
-
-		return {
-			type: 'sse',
-			url
-		};
-	}
-
-	private async getServerId(quickInputService: IQuickInputService): Promise<string | undefined> {
-		const suggestedId = `my-mcp-server-${generateUuid().split('-')[0]}`;
-		const id = await quickInputService.input({
-			title: localize('mcp.serverId.title', "Enter Server ID"),
-			placeHolder: localize('mcp.serverId.placeholder', "Unique identifier for this server"),
-			value: suggestedId,
-			ignoreFocusLost: true,
-		});
-
-		return id;
-	}
-
-	private async getConfigurationTarget(quickInputService: IQuickInputService, workspace: IWorkspace, isInRemote: boolean): Promise<ConfigurationTarget | undefined> {
-		const options: (IQuickPickItem & { target: ConfigurationTarget })[] = [
-			{ target: ConfigurationTarget.USER, label: localize('mcp.target.user', "User Settings"), description: localize('mcp.target.user.description', "Available in all workspaces") }
-		];
-
-		if (isInRemote) {
-			options.push({ target: ConfigurationTarget.USER_REMOTE, label: localize('mcp.target.remote', "Remote Settings"), description: localize('mcp.target..remote.description', "Available on this remote machine") });
-		}
-
-		if (workspace.folders.length > 0) {
-			options.push({ target: ConfigurationTarget.WORKSPACE, label: localize('mcp.target.workspace', "Workspace Settings"), description: localize('mcp.target.workspace.description', "Available in this workspace") });
-		}
-
-		if (options.length === 1) {
-			return options[0].target;
-		}
-
-
-		const targetPick = await quickInputService.pick(options, {
-			title: localize('mcp.target.title', "Choose where to save the configuration"),
-		});
-
-		return targetPick?.target;
-	}
-
 	async run(accessor: ServicesAccessor, configUri?: string): Promise<void> {
-		const quickInputService = accessor.get(IQuickInputService);
-		const configurationService = accessor.get(IConfigurationService);
-		const jsonEditingService = accessor.get(IJSONEditingService);
-		const workspaceService = accessor.get(IWorkspaceContextService);
-		const environmentService = accessor.get(IWorkbenchEnvironmentService);
-
-		// Step 1: Choose server type
-		const serverType = await this.getServerType(quickInputService);
-		if (!serverType) {
-			return;
-		}
-
-		// Step 2: Get server details based on type
-		const serverConfig = await (serverType.id === 'stdio'
-			? this.getStdioConfig(quickInputService)
-			: this.getSSEConfig(quickInputService));
-
-		if (!serverConfig) {
-			return;
-		}
-
-		// Step 3: Get server ID
-		const serverId = await this.getServerId(quickInputService);
-		if (!serverId) {
-			return;
-		}
-
-		// Step 4: Choose configuration target if no configUri provided
-		let target: ConfigurationTarget | undefined;
-		const workspace = workspaceService.getWorkspace();
-		if (!configUri) {
-			target = await this.getConfigurationTarget(quickInputService, workspace, !!environmentService.remoteAuthority);
-			if (!target) {
-				return;
-			}
-		}
-
-		// Step 5: Update configuration
-		const writeToUriDirect = configUri
-			? URI.parse(configUri)
-			: target === ConfigurationTarget.WORKSPACE && workspace.folders.length === 1
-				? URI.joinPath(workspace.folders[0].uri, '.vscode', 'mcp.json')
-				: undefined;
-
-		if (writeToUriDirect) {
-			await jsonEditingService.write(writeToUriDirect, [{
-				path: ['servers', serverId],
-				value: serverConfig
-			}], true);
-		} else {
-			const settings: IMcpConfiguration = { ...getConfigValueInTarget(configurationService.inspect<IMcpConfiguration>('mcp'), target!) };
-			settings.servers ??= {};
-			settings.servers[serverId] = serverConfig;
-			await configurationService.updateValue('mcp', settings, target!);
-		}
+		return accessor.get(IInstantiationService).createInstance(McpAddConfigurationCommand, configUri).run();
 	}
 }
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration.ts
new file mode 100644
index 000000000000..f759521b28e2
--- /dev/null
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration.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 { assertNever } from '../../../../base/common/assert.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+import { localize } from '../../../../nls.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { ConfigurationTarget, getConfigValueInTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IMcpConfiguration, IMcpConfigurationSSE, McpConfigurationServer } from '../../../../platform/mcp/common/mcpPlatformTypes.js';
+import { IQuickInputService, IQuickPickItem, QuickPickInput } from '../../../../platform/quickinput/common/quickInput.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IJSONEditingService } from '../../../services/configuration/common/jsonEditing.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IMcpConfigurationStdio, mcpStdioServerSchema } from '../common/mcpConfiguration.js';
+
+
+const enum AddConfigurationType {
+	Stdio,
+	SSE,
+
+	NpmPackage,
+	PipPackage,
+}
+
+const enum AddConfigurationCopilotCommand {
+	/** Returns whether MCP enhanced setup is enabled. */
+	IsSupported = 'github.copilot.chat.mcp.setup.check',
+
+	/** Takes an npm/pip package name, validates its owner. */
+	ValidatePackage = 'github.copilot.chat.mcp.setup.validatePackage',
+
+	/** Returns the resolved MCP configuration. */
+	StartFlow = 'github.copilot.chat.mcp.setup.flow',
+}
+
+type ValidatePackageResult = { state: 'ok'; publisher: string } | { state: 'error'; error: string };
+
+export class McpAddConfigurationCommand {
+	constructor(
+		private readonly _explicitConfigUri: string | undefined,
+		@IQuickInputService private readonly _quickInputService: IQuickInputService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
+		@IJSONEditingService private readonly _jsonEditingService: IJSONEditingService,
+		@IWorkspaceContextService private readonly _workspaceService: IWorkspaceContextService,
+		@IWorkbenchEnvironmentService private readonly _environmentService: IWorkbenchEnvironmentService,
+		@ICommandService private readonly _commandService: ICommandService,
+	) { }
+
+	private async getServerType(): Promise<AddConfigurationType | undefined> {
+		const items: QuickPickInput<{ kind: AddConfigurationType } & IQuickPickItem>[] = [
+			{ kind: AddConfigurationType.Stdio, label: localize('mcp.serverType.command', "Command (stdio)"), description: localize('mcp.serverType.command.description', "Run a local command that implements the MCP protocol") },
+			{ kind: AddConfigurationType.SSE, label: localize('mcp.serverType.http', "HTTP (server-sent events)"), description: localize('mcp.serverType.http.description', "Connect to a remote HTTP server that implements the MCP protocol") }
+		];
+
+		let aiSupported: boolean | undefined;
+		try {
+			aiSupported = await this._commandService.executeCommand<boolean>(AddConfigurationCopilotCommand.IsSupported);
+		} catch {
+			// ignored
+		}
+
+		if (aiSupported) {
+			items.unshift({ type: 'separator', label: localize('mcp.serverType.manual', "Manual Install") });
+			items.push(
+				{ type: 'separator', label: localize('mcp.serverType.copilot', "Model-Assisted") },
+				{ kind: AddConfigurationType.NpmPackage, label: localize('mcp.serverType.npm', "NPM Package"), description: localize('mcp.serverType.npm.description', "Install from an NPM package name") },
+				{ kind: AddConfigurationType.PipPackage, label: localize('mcp.serverType.pip', "PIP Package"), description: localize('mcp.serverType.pip.description', "Install from a PIP package name") }
+			);
+		}
+
+		const result = await this._quickInputService.pick<{ kind: AddConfigurationType } & IQuickPickItem>(items, {
+			title: localize('mcp.serverType.title', "Select Server Type"),
+			placeHolder: localize('mcp.serverType.placeholder', "Choose the type of MCP server to add")
+		});
+
+		return result?.kind;
+	}
+
+	private async getStdioConfig(): Promise<IMcpConfigurationStdio | undefined> {
+		const command = await this._quickInputService.input({
+			title: localize('mcp.command.title', "Enter Command"),
+			placeHolder: localize('mcp.command.placeholder', "Command to run (with optional arguments)"),
+			ignoreFocusLost: true,
+		});
+
+		if (!command) {
+			return undefined;
+		}
+
+		// Split command into command and args, handling quotes
+		const parts = command.match(/(?:[^\s"]+|"[^"]*")+/g)!;
+		return {
+			type: 'stdio',
+			command: parts[0].replace(/"/g, ''),
+
+			args: parts.slice(1).map(arg => arg.replace(/"/g, ''))
+		};
+	}
+
+	private async getSSEConfig(): Promise<IMcpConfigurationSSE | undefined> {
+		const url = await this._quickInputService.input({
+			title: localize('mcp.url.title', "Enter Server URL"),
+			placeHolder: localize('mcp.url.placeholder', "URL of the MCP server (e.g., http://localhost:3000)"),
+			ignoreFocusLost: true,
+		});
+
+		if (!url) {
+			return undefined;
+		}
+
+		return {
+			type: 'sse',
+			url
+		};
+	}
+
+	private async getServerId(): Promise<string | undefined> {
+		const suggestedId = `my-mcp-server-${generateUuid().split('-')[0]}`;
+		const id = await this._quickInputService.input({
+			title: localize('mcp.serverId.title', "Enter Server ID"),
+			placeHolder: localize('mcp.serverId.placeholder', "Unique identifier for this server"),
+			value: suggestedId,
+			ignoreFocusLost: true,
+		});
+
+		return id;
+	}
+
+	private async getConfigurationTarget(): Promise<ConfigurationTarget | undefined> {
+		const options: (IQuickPickItem & { target: ConfigurationTarget })[] = [
+			{ target: ConfigurationTarget.USER, label: localize('mcp.target.user', "User Settings"), description: localize('mcp.target.user.description', "Available in all workspaces") }
+		];
+
+		if (!!this._environmentService.remoteAuthority) {
+			options.push({ target: ConfigurationTarget.USER_REMOTE, label: localize('mcp.target.remote', "Remote Settings"), description: localize('mcp.target..remote.description', "Available on this remote machine") });
+		}
+
+		if (this._workspaceService.getWorkspace().folders.length > 0) {
+			options.push({ target: ConfigurationTarget.WORKSPACE, label: localize('mcp.target.workspace', "Workspace Settings"), description: localize('mcp.target.workspace.description', "Available in this workspace") });
+		}
+
+		if (options.length === 1) {
+			return options[0].target;
+		}
+
+
+		const targetPick = await this._quickInputService.pick(options, {
+			title: localize('mcp.target.title', "Choose where to save the configuration"),
+		});
+
+		return targetPick?.target;
+	}
+
+	private async getAssistedConfig(type: AddConfigurationType): Promise<McpConfigurationServer | undefined> {
+		const packageName = await this._quickInputService.input({
+			ignoreFocusLost: true,
+			title: type === AddConfigurationType.NpmPackage
+				? localize('mcp.npm.title', "Enter NPM Package Name")
+				: localize('mcp.pip.title', "Enter PIP Package Name"),
+			placeHolder: type === AddConfigurationType.NpmPackage
+				? localize('mcp.npm.placeholder', "Package name (e.g., @org/package)")
+				: localize('mcp.pip.placeholder', "Package name (e.g., package-name)")
+		});
+
+		if (!packageName) {
+			return undefined;
+		}
+
+		const enum LoadAction {
+			Retry = 'retry',
+			Cancel = 'cancel',
+			Allow = 'allow'
+		}
+
+		const loadingQuickPickStore = new DisposableStore();
+		const loadingQuickPick = loadingQuickPickStore.add(this._quickInputService.createQuickPick<IQuickPickItem & { id: LoadAction }>());
+		loadingQuickPick.title = localize('mcp.loading.title', "Loading package details...");
+		loadingQuickPick.busy = true;
+		loadingQuickPick.ignoreFocusOut = true;
+
+		this._commandService.executeCommand<ValidatePackageResult>(
+			AddConfigurationCopilotCommand.ValidatePackage,
+			{
+				type: type === AddConfigurationType.NpmPackage ? 'npm' : 'pip',
+				name: packageName,
+				targetConfig: mcpStdioServerSchema,
+			}
+		).then(result => {
+			if (!result || result.state === 'error') {
+				loadingQuickPick.title = result?.error || 'Unknown error loading package';
+				loadingQuickPick.items = [{ id: LoadAction.Retry, label: localize('mcp.error.retry', 'Try a different package') }, { id: LoadAction.Cancel, label: localize('cancel', 'Cancel') }];
+			} else {
+				loadingQuickPick.title = localize('mcp.confirmPublish', 'Install {0} from {1}?', packageName, result.publisher);
+				loadingQuickPick.items = [
+					{ id: LoadAction.Allow, label: localize('allow', "Allow") },
+					{ id: LoadAction.Cancel, label: localize('cancel', 'Cancel') }
+				];
+			}
+			loadingQuickPick.busy = false;
+		});
+
+		const loadingAction = await new Promise<LoadAction | undefined>(resolve => {
+			loadingQuickPick.onDidAccept(() => resolve(loadingQuickPick.selectedItems[0]?.id));
+			loadingQuickPick.onDidHide(() => resolve(undefined));
+			loadingQuickPick.show();
+		}).finally(() => loadingQuickPick.dispose());
+
+		switch (loadingAction) {
+			case LoadAction.Retry:
+				return this.getAssistedConfig(type);
+			case LoadAction.Allow:
+				break;
+			case LoadAction.Cancel:
+			default:
+				return undefined;
+		}
+
+		return await this._commandService.executeCommand<McpConfigurationServer>(
+			AddConfigurationCopilotCommand.StartFlow,
+			{ name: packageName }
+		);
+	}
+
+	public async run(): Promise<void> {
+		// Step 1: Choose server type
+		const serverType = await this.getServerType();
+		if (serverType === undefined) {
+			return;
+		}
+
+		// Step 2: Get server details based on type
+		let serverConfig: McpConfigurationServer | undefined;
+		switch (serverType) {
+			case AddConfigurationType.Stdio:
+				serverConfig = await this.getStdioConfig();
+				break;
+			case AddConfigurationType.SSE:
+				serverConfig = await this.getSSEConfig();
+				break;
+			case AddConfigurationType.NpmPackage:
+				serverConfig = await this.getAssistedConfig(AddConfigurationType.NpmPackage);
+				break;
+			case AddConfigurationType.PipPackage:
+				serverConfig = await this.getAssistedConfig(AddConfigurationType.PipPackage);
+				break;
+			default:
+				assertNever(serverType);
+		}
+
+		if (!serverConfig) {
+			return;
+		}
+
+		// Step 3: Get server ID
+		const serverId = await this.getServerId();
+		if (!serverId) {
+			return;
+		}
+
+		// Step 4: Choose configuration target if no configUri provided
+		let target: ConfigurationTarget | undefined;
+		const workspace = this._workspaceService.getWorkspace();
+		if (!this._explicitConfigUri) {
+			target = await this.getConfigurationTarget();
+			if (!target) {
+				return;
+			}
+		}
+
+		// Step 5: Update configuration
+		const writeToUriDirect = this._explicitConfigUri
+			? URI.parse(this._explicitConfigUri)
+			: target === ConfigurationTarget.WORKSPACE && workspace.folders.length === 1
+				? URI.joinPath(workspace.folders[0].uri, '.vscode', 'mcp.json')
+				: undefined;
+
+		if (writeToUriDirect) {
+			await this._jsonEditingService.write(writeToUriDirect, [{
+				path: ['servers', serverId],
+				value: serverConfig
+			}], true);
+		} else {
+			const settings: IMcpConfiguration = { ...getConfigValueInTarget(this._configurationService.inspect<IMcpConfiguration>('mcp'), target!) };
+			settings.servers = { ...settings.servers, [serverId]: serverConfig };
+			await this._configurationService.updateValue('mcp', settings, target!);
+		}
+	}
+}
diff --git a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
index fcef4dc9d486..46864f954c10 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
@@ -33,6 +33,40 @@ export const mcpSchemaExampleServers = {
 	}
 };
 
+export const mcpStdioServerSchema: IJSONSchema = {
+	type: 'object',
+	additionalProperties: false,
+	examples: [mcpSchemaExampleServer],
+	properties: {
+		type: {
+			type: 'string',
+			enum: ['stdio'],
+			description: localize('app.mcp.json.type', "The type of the server.")
+		},
+		command: {
+			type: 'string',
+			description: localize('app.mcp.json.command', "The command to run the server.")
+		},
+		args: {
+			type: 'array',
+			description: localize('app.mcp.args.command', "Arguments passed to the server."),
+			items: {
+				type: 'string'
+			},
+		},
+		env: {
+			description: localize('app.mcp.env.command', "Environment variables passed to the server."),
+			additionalProperties: {
+				anyOf: [
+					{ type: 'null' },
+					{ type: 'string' },
+					{ type: 'number' },
+				]
+			}
+		},
+	}
+};
+
 export const mcpServerSchema: IJSONSchema = {
 	id: mcpSchemaId,
 	type: 'object',
@@ -44,39 +78,7 @@ export const mcpServerSchema: IJSONSchema = {
 		servers: {
 			examples: [mcpSchemaExampleServers],
 			additionalProperties: {
-				oneOf: [{
-					type: 'object',
-					additionalProperties: false,
-					examples: [mcpSchemaExampleServer],
-					properties: {
-						type: {
-							type: 'string',
-							enum: ['stdio'],
-							description: localize('app.mcp.json.type', "The type of the server.")
-						},
-						command: {
-							type: 'string',
-							description: localize('app.mcp.json.command', "The command to run the server.")
-						},
-						args: {
-							type: 'array',
-							description: localize('app.mcp.args.command', "Arguments passed to the server."),
-							items: {
-								type: 'string'
-							},
-						},
-						env: {
-							description: localize('app.mcp.env.command', "Environment variables passed to the server."),
-							additionalProperties: {
-								anyOf: [
-									{ type: 'null' },
-									{ type: 'string' },
-									{ type: 'number' },
-								]
-							}
-						},
-					}
-				}, {
+				oneOf: [mcpStdioServerSchema, {
 					type: 'object',
 					additionalProperties: false,
 					required: ['url', 'type'],

From e747425ac067eea8cffe5fb7e745f27cd8abb49b Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Sun, 16 Mar 2025 20:16:59 -0700
Subject: [PATCH 0979/1815] Add shortcut for auto trigger ai search providers.
 (#243711)

---
 .../search/browser/searchActionsTopBar.ts     | 26 ++++++++++++++++++-
 .../contrib/search/browser/searchView.ts      | 26 +++++++++++++++++--
 .../contrib/search/common/constants.ts        |  1 +
 3 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts b/src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts
index 0776c52ed880..e6ddb0a7f7cb 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts
@@ -15,7 +15,7 @@ import { VIEW_ID } from '../../../services/search/common/search.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { SearchStateKey, SearchUIState } from '../common/search.js';
 import { category, getSearchView } from './searchActionsBase.js';
 import { isSearchTreeMatch, RenderableMatch, ISearchResult, isSearchTreeFolderMatch, isSearchTreeFolderMatchNoRoot, isSearchTreeFolderMatchWorkspaceRoot, isSearchResult, isTextSearchHeading, isSearchTreeFileMatch } from './searchTreeModel/searchTreeCommon.js';
@@ -205,6 +205,30 @@ registerAction2(class ViewAsListAction extends Action2 {
 	}
 });
 
+registerAction2(class SearchWithAIAction extends Action2 {
+	constructor() {
+		super({
+			id: Constants.SearchCommandIds.SearchWithAIActionId,
+			title: nls.localize2('SearchWithAIAction.label', "Search with AI"),
+			category,
+			f1: true,
+			precondition: Constants.SearchContext.hasAIResultProvider,
+			keybinding: {
+				weight: KeybindingWeight.WorkbenchContrib,
+				when: ContextKeyExpr.and(Constants.SearchContext.hasAIResultProvider),
+				primary: KeyMod.CtrlCmd | KeyCode.KeyI
+			}
+		});
+	}
+
+	async run(accessor: ServicesAccessor, ...args: any[]) {
+		const searchView = getSearchView(accessor.get(IViewsService));
+		if (searchView) {
+			const viewer = searchView.getControl();
+			await forcedExpandRecursively(viewer, searchView.model.searchResult.aiTextSearchResult);
+		}
+	}
+});
 
 //#endregion
 
diff --git a/src/vs/workbench/contrib/search/browser/searchView.ts b/src/vs/workbench/contrib/search/browser/searchView.ts
index e46972d43aaf..feb18420c0f9 100644
--- a/src/vs/workbench/contrib/search/browser/searchView.ts
+++ b/src/vs/workbench/contrib/search/browser/searchView.ts
@@ -71,7 +71,7 @@ import { createEditorFromSearchResult } from '../../searchEditor/browser/searchE
 import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
 import { IPreferencesService, ISettingsEditorOptions } from '../../../services/preferences/common/preferences.js';
 import { ITextQueryBuilderOptions, QueryBuilder } from '../../../services/search/common/queryBuilder.js';
-import { IPatternInfo, ISearchComplete, ISearchConfiguration, ISearchConfigurationProperties, ITextQuery, SearchCompletionExitCode, SearchSortOrder, TextSearchCompleteMessageType, ViewMode } from '../../../services/search/common/search.js';
+import { IPatternInfo, ISearchComplete, ISearchConfiguration, ISearchConfigurationProperties, ISearchService, ITextQuery, SearchCompletionExitCode, SearchSortOrder, TextSearchCompleteMessageType, ViewMode } from '../../../services/search/common/search.js';
 import { TextSearchCompleteMessage } from '../../../services/search/common/searchExtTypes.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
 import { INotebookService } from '../../notebook/common/notebookService.js';
@@ -194,6 +194,7 @@ export class SearchView extends ViewPane {
 		@IAccessibilityService private readonly accessibilityService: IAccessibilityService,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IStorageService private readonly storageService: IStorageService,
+		@ISearchService private readonly searchService: ISearchService,
 		@IOpenerService openerService: IOpenerService,
 		@IHoverService hoverService: IHoverService,
 		@INotebookService private readonly notebookService: INotebookService,
@@ -1663,8 +1664,29 @@ export class SearchView extends ViewPane {
 		}
 
 		// Special case for when we have an AI provider registered
-		if (this.shouldShowAIResults()) {
+		if (this.shouldShowAIResults() && !allResults) {
 			Constants.SearchContext.AIResultsRequested.bindTo(this.contextKeyService).set(!!aiResults);
+			const messageEl = this.clearMessage();
+			const noResultsMessage = nls.localize('noResultsFallback', "No results found. ");
+			dom.append(messageEl, noResultsMessage);
+
+			const aiName = await this.searchService.getAIName();
+
+			if (aiName) {
+				const kb = this.keybindingService.lookupKeybinding(Constants.SearchCommandIds.SearchWithAIActionId);
+				const searchWithAIButtonTooltip = kb ? nls.localize('searchWithAIButtonTooltipWithKB', "{0} to search", kb.getLabel())
+					: nls.localize('searchWithAIButtonTooltip', "Search");
+				const searchWithAIButton = this.messageDisposables.add(new SearchLinkButton(
+					searchWithAIButtonTooltip,
+					() => {
+						this.commandService.executeCommand(Constants.SearchCommandIds.SearchWithAIActionId);
+					}, this.hoverService));
+				dom.append(messageEl, searchWithAIButton.element);
+
+				const message = nls.localize('triggerAISearch', " with {0}.", aiName);
+				dom.append(messageEl, message);
+			}
+
 			if (!aiResults) {
 				return;
 			}
diff --git a/src/vs/workbench/contrib/search/common/constants.ts b/src/vs/workbench/contrib/search/common/constants.ts
index 5e736ecdbf8c..716e2f36eb33 100644
--- a/src/vs/workbench/contrib/search/common/constants.ts
+++ b/src/vs/workbench/contrib/search/common/constants.ts
@@ -44,6 +44,7 @@ export const enum SearchCommandIds {
 	ViewAsListActionId = 'search.action.viewAsList',
 	ShowAIResultsActionId = 'search.action.showAIResults',
 	HideAIResultsActionId = 'search.action.hideAIResults',
+	SearchWithAIActionId = 'search.action.searchWithAI',
 	ToggleQueryDetailsActionId = 'workbench.action.search.toggleQueryDetails',
 	ExcludeFolderFromSearchId = 'search.action.excludeFromSearch',
 	FocusNextInputActionId = 'search.focus.nextInputBox',

From 367abc7328fc140533c1058ba9ce0e26ece972d9 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Sun, 16 Mar 2025 22:09:45 -0700
Subject: [PATCH 0980/1815] Kernel extensions should be installed on remote eh.
 (#243715)

---
 .../notebookKernelQuickPickStrategy.ts        | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
index b8e8b2af29c5..3e08af275e0a 100644
--- a/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
+++ b/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.ts
@@ -33,7 +33,7 @@ import { URI } from '../../../../../base/common/uri.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
 import { INotebookTextModel } from '../../common/notebookCommon.js';
 import { SELECT_KERNEL_ID } from '../controller/coreActions.js';
-import { EnablementState } from '../../../../services/extensionManagement/common/extensionManagement.js';
+import { EnablementState, IExtensionManagementServerService } from '../../../../services/extensionManagement/common/extensionManagement.js';
 import { areSameExtensions } from '../../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 
 type KernelPick = IQuickPickItem & { kernel: INotebookKernel };
@@ -106,7 +106,8 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 		protected readonly _logService: ILogService,
 		protected readonly _extensionWorkbenchService: IExtensionsWorkbenchService,
 		protected readonly _extensionService: IExtensionService,
-		protected readonly _commandService: ICommandService
+		protected readonly _commandService: ICommandService,
+		protected readonly _extensionManagementServerService: IExtensionManagementServerService
 	) { }
 
 	async showQuickPick(editor: IActiveNotebookEditor, wantedId?: string, skipAutoRun?: boolean): Promise<boolean> {
@@ -255,6 +256,7 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 			await this._showKernelExtension(
 				this._extensionWorkbenchService,
 				this._extensionService,
+				this._extensionManagementServerService,
 				editor.textModel.viewType,
 				[]
 			);
@@ -263,6 +265,7 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 			await this._showKernelExtension(
 				this._extensionWorkbenchService,
 				this._extensionService,
+				this._extensionManagementServerService,
 				editor.textModel.viewType,
 				pick.extensionIds,
 				this._productService.quality !== 'stable'
@@ -282,12 +285,14 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 	protected async _showKernelExtension(
 		extensionWorkbenchService: IExtensionsWorkbenchService,
 		extensionService: IExtensionService,
+		extensionManagementServerService: IExtensionManagementServerService,
 		viewType: string,
 		extIds: string[],
 		isInsiders?: boolean
 	) {
 		// If extension id is provided attempt to install the extension as the user has requested the suggested ones be installed
 		const extensionsToInstall: IExtension[] = [];
+		const extensionsToInstallOnRemote: IExtension[] = [];
 		const extensionsToEnable: IExtension[] = [];
 
 		for (const extId of extIds) {
@@ -300,10 +305,22 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 				if (canInstall === true) {
 					extensionsToInstall.push(extension);
 				}
+			} else if (extensionManagementServerService.remoteExtensionManagementServer) {
+				// already installed, check if it should be installed on remote since we are not getting any kernels or kernel providers.
+				if (extensionWorkbenchService.installed.some(e => areSameExtensions(e.identifier, extension.identifier) && e.server === extensionManagementServerService.remoteExtensionManagementServer)) {
+					// extension exists on remote server. should not happen
+					continue;
+				} else {
+					// extension doesn't exist on remote server
+					const canInstall = await extensionWorkbenchService.canInstall(extension);
+					if (canInstall) {
+						extensionsToInstallOnRemote.push(extension);
+					}
+				}
 			}
 		}
 
-		if (extensionsToInstall.length || extensionsToEnable.length) {
+		if (extensionsToInstall.length || extensionsToEnable.length || extensionsToInstallOnRemote.length) {
 			await Promise.all([...extensionsToInstall.map(async extension => {
 				await extensionWorkbenchService.install(
 					extension,
@@ -327,6 +344,8 @@ abstract class KernelPickerStrategyBase implements IKernelPickerStrategy {
 					default:
 						break;
 				}
+			}), ...extensionsToInstallOnRemote.map(async extension => {
+				await extensionWorkbenchService.installInServer(extension, this._extensionManagementServerService.remoteExtensionManagementServer!);
 			})]);
 
 			await extensionService.activateByEvent(`onNotebook:${viewType}`);
@@ -437,6 +456,7 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 		@ILogService _logService: ILogService,
 		@IExtensionsWorkbenchService _extensionWorkbenchService: IExtensionsWorkbenchService,
 		@IExtensionService _extensionService: IExtensionService,
+		@IExtensionManagementServerService _extensionManagementServerService: IExtensionManagementServerService,
 		@ICommandService _commandService: ICommandService,
 		@INotebookKernelHistoryService private readonly _notebookKernelHistoryService: INotebookKernelHistoryService,
 		@IOpenerService private readonly _openerService: IOpenerService
@@ -451,6 +471,7 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 			_extensionWorkbenchService,
 			_extensionService,
 			_commandService,
+			_extensionManagementServerService,
 		);
 	}
 
@@ -611,6 +632,7 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 				await this._showKernelExtension(
 					this._extensionWorkbenchService,
 					this._extensionService,
+					this._extensionManagementServerService,
 					editor.textModel.viewType,
 					[]
 				);
@@ -619,6 +641,7 @@ export class KernelPickerMRUStrategy extends KernelPickerStrategyBase {
 				await this._showKernelExtension(
 					this._extensionWorkbenchService,
 					this._extensionService,
+					this._extensionManagementServerService,
 					editor.textModel.viewType,
 					selectedKernelPickItem.extensionIds,
 					this._productService.quality !== 'stable'

From 66e9fe0d6f306079121dbf95221e22351e2aa6b5 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Sun, 16 Mar 2025 22:10:34 -0700
Subject: [PATCH 0981/1815] render run all always / align with run button
 (#243716)

* render run all always / align with run button

* :lipstick:
---
 .../contrib/notebook/browser/controller/executeActions.ts     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/controller/executeActions.ts b/src/vs/workbench/contrib/notebook/browser/controller/executeActions.ts
index 57fc0cfc08f9..b3e1fcdacca0 100644
--- a/src/vs/workbench/contrib/notebook/browser/controller/executeActions.ts
+++ b/src/vs/workbench/contrib/notebook/browser/controller/executeActions.ts
@@ -20,7 +20,7 @@ import { IDebugService } from '../../../debug/common/debug.js';
 import { CTX_INLINE_CHAT_FOCUSED } from '../../../inlineChat/common/inlineChat.js';
 import { insertCell } from './cellOperations.js';
 import { NotebookChatController } from './chat/notebookChatController.js';
-import { CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder, INotebookActionContext, INotebookCellActionContext, INotebookCellToolbarActionContext, INotebookCommandContext, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NotebookAction, NotebookCellAction, NotebookMultiCellAction, cellExecutionArgs, executeNotebookCondition, getContextFromActiveEditor, getContextFromUri, parseMultiCellExecutionArgs } from './coreActions.js';
+import { CELL_TITLE_CELL_GROUP_ID, CellToolbarOrder, INotebookActionContext, INotebookCellActionContext, INotebookCellToolbarActionContext, INotebookCommandContext, NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT, NotebookAction, NotebookCellAction, NotebookMultiCellAction, cellExecutionArgs, getContextFromActiveEditor, getContextFromUri, parseMultiCellExecutionArgs } from './coreActions.js';
 import { CellEditState, CellFocusMode, EXECUTE_CELL_COMMAND_ID, IFocusNotebookCellOptions, ScrollToRevealBehavior } from '../notebookBrowser.js';
 import * as icons from '../notebookIcons.js';
 import { CellKind, CellUri, NotebookSetting } from '../../common/notebookCommon.js';
@@ -144,7 +144,6 @@ registerAction2(class ExecuteNotebookAction extends NotebookAction {
 					group: 'navigation',
 					when: ContextKeyExpr.and(
 						NOTEBOOK_IS_ACTIVE_EDITOR,
-						executeNotebookCondition,
 						ContextKeyExpr.or(NOTEBOOK_INTERRUPTIBLE_KERNEL.toNegated(), NOTEBOOK_HAS_SOMETHING_RUNNING.toNegated()),
 						ContextKeyExpr.notEquals('config.notebook.globalToolbar', true)
 					)
@@ -154,7 +153,6 @@ registerAction2(class ExecuteNotebookAction extends NotebookAction {
 					order: -1,
 					group: 'navigation/execute',
 					when: ContextKeyExpr.and(
-						executeNotebookCondition,
 						ContextKeyExpr.or(
 							NOTEBOOK_INTERRUPTIBLE_KERNEL.toNegated(),
 							NOTEBOOK_HAS_SOMETHING_RUNNING.toNegated(),

From a5a4b77d27c9e01abc49b496952ae44bdd8eea14 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Sun, 16 Mar 2025 22:44:44 -0700
Subject: [PATCH 0982/1815] fix cmd+i for search when clause (#243718)

---
 src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts b/src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts
index e6ddb0a7f7cb..9b862134d4fc 100644
--- a/src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts
+++ b/src/vs/workbench/contrib/search/browser/searchActionsTopBar.ts
@@ -215,7 +215,7 @@ registerAction2(class SearchWithAIAction extends Action2 {
 			precondition: Constants.SearchContext.hasAIResultProvider,
 			keybinding: {
 				weight: KeybindingWeight.WorkbenchContrib,
-				when: ContextKeyExpr.and(Constants.SearchContext.hasAIResultProvider),
+				when: ContextKeyExpr.and(Constants.SearchContext.hasAIResultProvider, Constants.SearchContext.SearchViewFocusedKey),
 				primary: KeyMod.CtrlCmd | KeyCode.KeyI
 			}
 		});

From 420bde3a4c932c519dc4e7b54cf7ac9518eacd4c Mon Sep 17 00:00:00 2001
From: Connor Peet <copeet@microsoft.com>
Date: Sun, 16 Mar 2025 22:50:29 -0700
Subject: [PATCH 0983/1815] mcp: allow ai-assisted setup to suggest name
 (#243720)

---
 .../browser/mcpCommandsAddConfiguration.ts    | 49 ++++++++++++++-----
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration.ts
index f759521b28e2..cdfb4803143e 100644
--- a/src/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration.ts
+++ b/src/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration.ts
@@ -74,7 +74,7 @@ export class McpAddConfigurationCommand {
 
 		const result = await this._quickInputService.pick<{ kind: AddConfigurationType } & IQuickPickItem>(items, {
 			title: localize('mcp.serverType.title', "Select Server Type"),
-			placeHolder: localize('mcp.serverType.placeholder', "Choose the type of MCP server to add")
+			placeHolder: localize('mcp.serverType.placeholder', "Choose the type of MCP server to add"),
 		});
 
 		return result?.kind;
@@ -118,12 +118,11 @@ export class McpAddConfigurationCommand {
 		};
 	}
 
-	private async getServerId(): Promise<string | undefined> {
-		const suggestedId = `my-mcp-server-${generateUuid().split('-')[0]}`;
+	private async getServerId(suggestion = `my-mcp-server-${generateUuid().split('-')[0]}`): Promise<string | undefined> {
 		const id = await this._quickInputService.input({
 			title: localize('mcp.serverId.title', "Enter Server ID"),
 			placeHolder: localize('mcp.serverId.placeholder', "Unique identifier for this server"),
-			value: suggestedId,
+			value: suggestion,
 			ignoreFocusLost: true,
 		});
 
@@ -155,12 +154,12 @@ export class McpAddConfigurationCommand {
 		return targetPick?.target;
 	}
 
-	private async getAssistedConfig(type: AddConfigurationType): Promise<McpConfigurationServer | undefined> {
+	private async getAssistedConfig(type: AddConfigurationType): Promise<{ name: string; config: McpConfigurationServer } | undefined> {
 		const packageName = await this._quickInputService.input({
 			ignoreFocusLost: true,
 			title: type === AddConfigurationType.NpmPackage
 				? localize('mcp.npm.title', "Enter NPM Package Name")
-				: localize('mcp.pip.title', "Enter PIP Package Name"),
+				: localize('mcp.pip.title', "Enter Pip Package Name"),
 			placeHolder: type === AddConfigurationType.NpmPackage
 				? localize('mcp.npm.placeholder', "Package name (e.g., @org/package)")
 				: localize('mcp.pip.placeholder', "Package name (e.g., package-name)")
@@ -187,7 +186,17 @@ export class McpAddConfigurationCommand {
 			{
 				type: type === AddConfigurationType.NpmPackage ? 'npm' : 'pip',
 				name: packageName,
-				targetConfig: mcpStdioServerSchema,
+				targetConfig: {
+					...mcpStdioServerSchema,
+					properties: {
+						...mcpStdioServerSchema.properties,
+						name: {
+							type: 'string',
+							description: 'Suggested name of the server, alphanumeric and hyphen only',
+						}
+					},
+					required: [...(mcpStdioServerSchema.required || []), 'name'],
+				},
 			}
 		).then(result => {
 			if (!result || result.state === 'error') {
@@ -219,10 +228,17 @@ export class McpAddConfigurationCommand {
 				return undefined;
 		}
 
-		return await this._commandService.executeCommand<McpConfigurationServer>(
+		const configWithName = await this._commandService.executeCommand<McpConfigurationServer & { name: string }>(
 			AddConfigurationCopilotCommand.StartFlow,
 			{ name: packageName }
 		);
+
+		if (!configWithName) {
+			return undefined;
+		}
+
+		const { name, ...config } = configWithName;
+		return { name, config };
 	}
 
 	public async run(): Promise<void> {
@@ -234,6 +250,7 @@ export class McpAddConfigurationCommand {
 
 		// Step 2: Get server details based on type
 		let serverConfig: McpConfigurationServer | undefined;
+		let suggestedName: string | undefined;
 		switch (serverType) {
 			case AddConfigurationType.Stdio:
 				serverConfig = await this.getStdioConfig();
@@ -241,12 +258,18 @@ export class McpAddConfigurationCommand {
 			case AddConfigurationType.SSE:
 				serverConfig = await this.getSSEConfig();
 				break;
-			case AddConfigurationType.NpmPackage:
-				serverConfig = await this.getAssistedConfig(AddConfigurationType.NpmPackage);
+			case AddConfigurationType.NpmPackage: {
+				const r = await this.getAssistedConfig(AddConfigurationType.NpmPackage);
+				serverConfig = r?.config;
+				suggestedName = r?.name;
 				break;
-			case AddConfigurationType.PipPackage:
-				serverConfig = await this.getAssistedConfig(AddConfigurationType.PipPackage);
+			}
+			case AddConfigurationType.PipPackage: {
+				const r = await this.getAssistedConfig(AddConfigurationType.PipPackage);
+				serverConfig = r?.config;
+				suggestedName = r?.name;
 				break;
+			}
 			default:
 				assertNever(serverType);
 		}
@@ -256,7 +279,7 @@ export class McpAddConfigurationCommand {
 		}
 
 		// Step 3: Get server ID
-		const serverId = await this.getServerId();
+		const serverId = await this.getServerId(suggestedName);
 		if (!serverId) {
 			return;
 		}

From d775ee6b55bf3269465da953737ac5e1ae658c94 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 17 Mar 2025 09:43:14 +0100
Subject: [PATCH 0984/1815] simpler fix for
 https://github.com/microsoft/vscode-copilot/issues/14269 (#243725)

* Revert "Fix multiple chat views (#243610)"

This reverts commit e56325d50d38d42d118c6e4c69e4ba0cbebf6644.

* simpler fix for https://github.com/microsoft/vscode-copilot/issues/14269
---
 .../contrib/chat/browser/actions/chatToolActions.ts |  5 ++---
 .../workbench/contrib/chat/browser/chatInputPart.ts | 13 +++++++------
 .../contrib/chat/browser/chatSelectedTools.ts       | 13 ++++++-------
 src/vs/workbench/contrib/chat/browser/chatWidget.ts |  2 +-
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
index c68a4840f861..5d71ac109d1e 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatToolActions.ts
@@ -23,7 +23,6 @@ import { isResponseVM } from '../../common/chatViewModel.js';
 import { ChatMode } from '../../common/constants.js';
 import { ILanguageModelToolsService, IToolData } from '../../common/languageModelToolsService.js';
 import { IChatWidget, IChatWidgetService } from '../chat.js';
-import { ChatInputPart } from '../chatInputPart.js';
 import { CHAT_CATEGORY } from './chatActions.js';
 
 export const AcceptToolConfirmationActionId = 'workbench.action.chat.acceptTool';
@@ -138,7 +137,7 @@ export class AttachToolsAction extends Action2 {
 			picked: true,
 		};
 
-		const nowSelectedTools = new Set(ChatInputPart.selectedToolsModel.tools.get());
+		const nowSelectedTools = new Set(widget.input.selectedToolsModel.tools.get());
 		const toolBuckets = new Map<string, BucketPick>();
 
 		for (const tool of toolsService.getTools()) {
@@ -229,7 +228,7 @@ export class AttachToolsAction extends Action2 {
 				picker.items = picks;
 				picker.selectedItems = items;
 
-				ChatInputPart.selectedToolsModel.update(items.filter(isToolPick).map(tool => tool.tool));
+				widget.input.selectedToolsModel.update(items.filter(isToolPick).map(tool => tool.tool));
 
 			} finally {
 				ignoreEvent = false;
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 3b65f8a0ff3c..c6111c8f621c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -79,6 +79,7 @@ import { ChatInputHistoryMaxEntries, IChatHistoryEntry, IChatInputState, IChatWi
 import { ChatAgentLocation, ChatMode } from '../common/constants.js';
 import { ILanguageModelChatMetadataAndIdentifier, ILanguageModelsService } from '../common/languageModels.js';
 import { CancelAction, ChatSubmitAction, ChatSubmitSecondaryAgentAction, ChatSwitchToNextModelActionId, IChatExecuteActionContext, IToggleChatModeArgs, ToggleAgentModeActionId } from './actions/chatExecuteActions.js';
+import { AttachToolsAction } from './actions/chatToolActions.js';
 import { ImplicitContextAttachmentWidget } from './attachments/implicitContextAttachment.js';
 import { PromptAttachmentsCollectionWidget } from './attachments/promptAttachments/promptAttachmentsCollectionWidget.js';
 import { IChatWidget } from './chat.js';
@@ -152,7 +153,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		return this._attachmentModel;
 	}
 
-	static selectedToolsModel: ChatSelectedTools;
+	readonly selectedToolsModel: ChatSelectedTools;
 
 	public getAttachedAndImplicitContext(sessionId: string): IChatRequestVariableEntry[] {
 		const contextArr = [...this.attachmentModel.attachments];
@@ -374,10 +375,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		super();
 
 		this._attachmentModel = this._register(this.instantiationService.createInstance(ChatAttachmentModel));
-		if (!ChatInputPart.selectedToolsModel) {
-			ChatInputPart.selectedToolsModel = this._register(this.instantiationService.createInstance(ChatSelectedTools));
-		}
-
+		this.selectedToolsModel = this._register(this.instantiationService.createInstance(ChatSelectedTools));
 		this.dnd = this._register(this.instantiationService.createInstance(ChatDragAndDrop, this._attachmentModel, styles));
 
 		this.getInputState = (): IChatInputState => {
@@ -569,7 +567,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			this.setChatMode(ChatMode.Edit);
 		}
 
-		ChatInputPart.selectedToolsModel.reset();
+		this.selectedToolsModel.reset();
 	}
 
 	logInputHistory(): void {
@@ -1029,6 +1027,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 					const viewItem = this.instantiationService.createInstance(AddFilesButton, undefined, action, options);
 					return viewItem;
 				}
+				if (action.id === AttachToolsAction.id) {
+					return this.selectedToolsModel.toolsActionItemViewItemProvider(action, options);
+				}
 				return undefined;
 			}
 		}));
diff --git a/src/vs/workbench/contrib/chat/browser/chatSelectedTools.ts b/src/vs/workbench/contrib/chat/browser/chatSelectedTools.ts
index 57ae4a9faf29..e3e71ba0b69b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSelectedTools.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSelectedTools.ts
@@ -5,18 +5,16 @@
 
 
 import { reset } from '../../../../base/browser/dom.js';
+import { IActionViewItemProvider } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { Event } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { autorun, derived, IObservable, observableFromEvent, observableValue } from '../../../../base/common/observable.js';
 import { assertType } from '../../../../base/common/types.js';
 import { localize } from '../../../../nls.js';
-import { IActionViewItemService } from '../../../../platform/actions/browser/actionViewItemService.js';
 import { MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
-import { MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { MenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILanguageModelToolsService, IToolData } from '../common/languageModelToolsService.js';
-import { AttachToolsAction } from './actions/chatToolActions.js';
 
 export class ChatSelectedTools extends Disposable {
 
@@ -24,8 +22,9 @@ export class ChatSelectedTools extends Disposable {
 
 	readonly tools: IObservable<IToolData[]>;
 
+	readonly toolsActionItemViewItemProvider: IActionViewItemProvider;
+
 	constructor(
-		@IActionViewItemService actionViewItemService: IActionViewItemService,
 		@ILanguageModelToolsService toolsService: ILanguageModelToolsService,
 		@IInstantiationService instaService: IInstantiationService
 	) {
@@ -47,7 +46,7 @@ export class ChatSelectedTools extends Disposable {
 			return { count, enabled };
 		});
 
-		this._store.add(actionViewItemService.register(MenuId.ChatInputAttachmentToolbar, AttachToolsAction.id, (action, options) => {
+		this.toolsActionItemViewItemProvider = (action, options) => {
 			if (!(action instanceof MenuItemAction)) {
 				return undefined;
 			}
@@ -81,7 +80,7 @@ export class ChatSelectedTools extends Disposable {
 
 			}, action, { ...options, keybindingNotRenderedWithLabel: true });
 
-		}, Event.fromObservable(toolsCount)));
+		};
 	}
 
 	update(tools: IToolData[]): void {
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index 2390d3247ed1..7828304eb924 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -1172,7 +1172,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				attachedContext,
 				noCommandDetection: options?.noCommandDetection,
 				hasInstructionAttachments: this.inputPart.hasInstructionAttachments,
-				userSelectedTools: this.input.currentMode === ChatMode.Agent ? ChatInputPart.selectedToolsModel.tools.get().map(tool => tool.id) : undefined
+				userSelectedTools: this.input.currentMode === ChatMode.Agent ? this.inputPart.selectedToolsModel.tools.get().map(tool => tool.id) : undefined
 			});
 
 			if (result) {

From e67b836a9d4bb7c695969b94ba9219aabd056864 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 17 Mar 2025 10:36:43 +0100
Subject: [PATCH 0985/1815] chat - add and use dropdown button in setup dialog
 (#243728)

---
 src/vs/base/browser/ui/dialog/dialog.css      |  15 +
 src/vs/base/browser/ui/dialog/dialog.ts       |  63 +++-
 src/vs/base/browser/ui/dropdown/dropdown.ts   |   6 +
 src/vs/platform/dialogs/common/dialogs.ts     |   6 -
 .../browser/parts/dialogs/dialogHandler.ts    |   8 +-
 .../contrib/chat/browser/chatSetup.ts         | 357 +++++++++++-------
 6 files changed, 278 insertions(+), 177 deletions(-)

diff --git a/src/vs/base/browser/ui/dialog/dialog.css b/src/vs/base/browser/ui/dialog/dialog.css
index ff25e129d893..bdca8bcfd742 100644
--- a/src/vs/base/browser/ui/dialog/dialog.css
+++ b/src/vs/base/browser/ui/dialog/dialog.css
@@ -157,3 +157,18 @@
 	margin: 4px 5px; /* allows button focus outline to be visible */
 	outline-offset: 2px !important;
 }
+
+/** Dialog: Dropdown */
+.monaco-dialog-box > .dialog-buttons-row > .dialog-buttons > .monaco-button-dropdown {
+	margin: 4px 5px;
+}
+
+.monaco-dialog-box > .dialog-buttons-row > .dialog-buttons > .monaco-button-dropdown > .monaco-text-button {
+	padding-left: 10px;
+	padding-right: 10px;
+}
+
+.monaco-dialog-box > .dialog-buttons-row > .dialog-buttons > .monaco-button-dropdown > .monaco-dropdown-button {
+	padding-left: 5px;
+	padding-right: 5px;
+}
diff --git a/src/vs/base/browser/ui/dialog/dialog.ts b/src/vs/base/browser/ui/dialog/dialog.ts
index 469df8e4a0dc..bed93a10859a 100644
--- a/src/vs/base/browser/ui/dialog/dialog.ts
+++ b/src/vs/base/browser/ui/dialog/dialog.ts
@@ -3,21 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import './dialog.css';
+import { localize } from '../../../../nls.js';
 import { $, addDisposableListener, clearNode, EventHelper, EventType, getWindow, hide, isActiveElement, isAncestor, show } from '../../dom.js';
 import { StandardKeyboardEvent } from '../../keyboardEvent.js';
 import { ActionBar } from '../actionbar/actionbar.js';
-import { ButtonBar, ButtonWithDescription, IButtonStyles } from '../button/button.js';
+import { ButtonBar, ButtonWithDescription, IButton, IButtonStyles, IButtonWithDropdownOptions } from '../button/button.js';
 import { ICheckboxStyles, Checkbox } from '../toggle/toggle.js';
 import { IInputBoxStyles, InputBox } from '../inputbox/inputBox.js';
-import { Action } from '../../../common/actions.js';
+import { Action, toAction } from '../../../common/actions.js';
 import { Codicon } from '../../../common/codicons.js';
 import { ThemeIcon } from '../../../common/themables.js';
 import { KeyCode, KeyMod } from '../../../common/keyCodes.js';
 import { mnemonicButtonLabel } from '../../../common/labels.js';
 import { Disposable, toDisposable } from '../../../common/lifecycle.js';
 import { isLinux, isMacintosh, isWindows } from '../../../common/platform.js';
-import './dialog.css';
-import * as nls from '../../../../nls.js';
+import { isActionProvider } from '../dropdown/dropdown.js';
 
 export interface IDialogInputOptions {
 	readonly placeholder?: string;
@@ -36,6 +37,7 @@ export interface IDialogOptions {
 	readonly renderBody?: (container: HTMLElement) => void;
 	readonly icon?: ThemeIcon;
 	readonly buttonDetails?: string[];
+	readonly primaryButtonDropdown?: IButtonWithDropdownOptions;
 	readonly disableCloseAction?: boolean;
 	readonly disableDefaultAction?: boolean;
 	readonly buttonStyles: IButtonStyles;
@@ -97,7 +99,7 @@ export class Dialog extends Disposable {
 		if (Array.isArray(buttons) && buttons.length > 0) {
 			this.buttons = buttons;
 		} else if (!this.options.disableDefaultAction) {
-			this.buttons = [nls.localize('ok', "OK")];
+			this.buttons = [localize('ok', "OK")];
 		} else {
 			this.buttons = [];
 		}
@@ -172,16 +174,16 @@ export class Dialog extends Disposable {
 	}
 
 	private getIconAriaLabel(): string {
-		let typeLabel = nls.localize('dialogInfoMessage', 'Info');
+		let typeLabel = localize('dialogInfoMessage', 'Info');
 		switch (this.options.type) {
 			case 'error':
-				typeLabel = nls.localize('dialogErrorMessage', 'Error');
+				typeLabel = localize('dialogErrorMessage', 'Error');
 				break;
 			case 'warning':
-				typeLabel = nls.localize('dialogWarningMessage', 'Warning');
+				typeLabel = localize('dialogWarningMessage', 'Warning');
 				break;
 			case 'pending':
-				typeLabel = nls.localize('dialogPendingMessage', 'In Progress');
+				typeLabel = localize('dialogPendingMessage', 'In Progress');
 				break;
 			case 'none':
 			case 'info':
@@ -200,7 +202,7 @@ export class Dialog extends Disposable {
 	async show(): Promise<IDialogResult> {
 		this.focusToReturn = this.container.ownerDocument.activeElement as HTMLElement;
 
-		return new Promise<IDialogResult>((resolve) => {
+		return new Promise<IDialogResult>(resolve => {
 			clearNode(this.buttonsContainer);
 
 			const close = () => {
@@ -215,10 +217,39 @@ export class Dialog extends Disposable {
 			const buttonBar = this.buttonBar = this._register(new ButtonBar(this.buttonsContainer));
 			const buttonMap = this.rearrangeButtons(this.buttons, this.options.cancelId);
 
+			const onButtonClick = (index: number) => {
+				resolve({
+					button: buttonMap[index].index,
+					checkboxChecked: this.checkbox ? this.checkbox.checked : undefined,
+					values: this.inputs.length > 0 ? this.inputs.map(input => input.value) : undefined
+				});
+			};
+
 			// Handle button clicks
-			buttonMap.forEach((entry, index) => {
+			buttonMap.forEach((_, index) => {
 				const primary = buttonMap[index].index === 0;
-				const button = this.options.buttonDetails ? this._register(buttonBar.addButtonWithDescription({ secondary: !primary, ...this.buttonStyles })) : this._register(buttonBar.addButton({ secondary: !primary, ...this.buttonStyles }));
+
+				let button: IButton;
+				if (primary && this.options?.primaryButtonDropdown) {
+					const actions = isActionProvider(this.options.primaryButtonDropdown.actions) ? this.options.primaryButtonDropdown.actions.getActions() : this.options.primaryButtonDropdown.actions;
+					button = this._register(buttonBar.addButtonWithDropdown({
+						...this.options.primaryButtonDropdown,
+						...this.buttonStyles,
+						actions: actions.map(action => toAction({
+							...action,
+							run: async () => {
+								await action.run();
+
+								onButtonClick(index);
+							}
+						}))
+					}));
+				} else if (this.options.buttonDetails) {
+					button = this._register(buttonBar.addButtonWithDescription({ secondary: !primary, ...this.buttonStyles }));
+				} else {
+					button = this._register(buttonBar.addButton({ secondary: !primary, ...this.buttonStyles }));
+				}
+
 				button.label = mnemonicButtonLabel(buttonMap[index].label, true);
 				if (button instanceof ButtonWithDescription) {
 					button.description = this.options.buttonDetails![buttonMap[index].index];
@@ -228,11 +259,7 @@ export class Dialog extends Disposable {
 						EventHelper.stop(e);
 					}
 
-					resolve({
-						button: buttonMap[index].index,
-						checkboxChecked: this.checkbox ? this.checkbox.checked : undefined,
-						values: this.inputs.length > 0 ? this.inputs.map(input => input.value) : undefined
-					});
+					onButtonClick(index);
 				}));
 			});
 
@@ -408,7 +435,7 @@ export class Dialog extends Disposable {
 			if (!this.options.disableCloseAction) {
 				const actionBar = this._register(new ActionBar(this.toolbarContainer, {}));
 
-				const action = this._register(new Action('dialog.close', nls.localize('dialogClose', "Close Dialog"), ThemeIcon.asClassName(Codicon.dialogClose), true, async () => {
+				const action = this._register(new Action('dialog.close', localize('dialogClose', "Close Dialog"), ThemeIcon.asClassName(Codicon.dialogClose), true, async () => {
 					resolve({
 						button: this.options.cancelId || 0,
 						checkboxChecked: this.checkbox ? this.checkbox.checked : undefined
diff --git a/src/vs/base/browser/ui/dropdown/dropdown.ts b/src/vs/base/browser/ui/dropdown/dropdown.ts
index dabab279dab7..b4a7d38a6fb4 100644
--- a/src/vs/base/browser/ui/dropdown/dropdown.ts
+++ b/src/vs/base/browser/ui/dropdown/dropdown.ts
@@ -161,6 +161,12 @@ export interface IActionProvider {
 	getActions(): readonly IAction[];
 }
 
+export function isActionProvider(obj: unknown): obj is IActionProvider {
+	const candidate = obj as IActionProvider | undefined;
+
+	return typeof candidate?.getActions === 'function';
+}
+
 export interface IDropdownMenuOptions extends IBaseDropdownOptions {
 	contextMenuProvider: IContextMenuProvider;
 	readonly actions?: IAction[];
diff --git a/src/vs/platform/dialogs/common/dialogs.ts b/src/vs/platform/dialogs/common/dialogs.ts
index d76e8e549745..bb9270b9c287 100644
--- a/src/vs/platform/dialogs/common/dialogs.ts
+++ b/src/vs/platform/dialogs/common/dialogs.ts
@@ -17,7 +17,6 @@ import { mnemonicButtonLabel } from '../../../base/common/labels.js';
 import { isLinux, isMacintosh, isWindows } from '../../../base/common/platform.js';
 import { IProductService } from '../../product/common/productService.js';
 import { deepClone } from '../../../base/common/objects.js';
-import { IDisposable } from '../../../base/common/lifecycle.js';
 
 export interface IDialogArgs {
 	readonly confirmArgs?: IConfirmDialogArgs;
@@ -276,7 +275,6 @@ export const IDialogService = createDecorator<IDialogService>('dialogService');
 export interface ICustomDialogOptions {
 	readonly buttonDetails?: string[];
 	readonly markdownDetails?: ICustomDialogMarkdown[];
-	readonly htmlDetails?: ICustomDialogHTMLElement[];
 	readonly classes?: string[];
 	readonly icon?: ThemeIcon;
 	readonly disableCloseAction?: boolean;
@@ -288,10 +286,6 @@ export interface ICustomDialogMarkdown {
 	readonly dismissOnLinkClick?: boolean;
 }
 
-export interface ICustomDialogHTMLElement extends IDisposable {
-	readonly element: unknown /* HTMLElement */;
-}
-
 /**
  * A handler to bring up modal dialogs.
  */
diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
index 97ab29bee2f0..e41d878f990a 100644
--- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
+++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
@@ -11,7 +11,7 @@ import Severity from '../../../../base/common/severity.js';
 import { Dialog, IDialogResult } from '../../../../base/browser/ui/dialog/dialog.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { EventHelper, isHTMLElement } from '../../../../base/browser/dom.js';
+import { EventHelper } from '../../../../base/browser/dom.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
@@ -130,12 +130,6 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
 				result.element.classList.add(...(markdownDetail.classes || []));
 				dialogDisposables.add(result);
 			});
-			customOptions.htmlDetails?.forEach(htmlDetail => {
-				if (isHTMLElement(htmlDetail.element)) {
-					parent.appendChild(htmlDetail.element);
-					dialogDisposables.add(htmlDetail);
-				}
-			});
 		} : undefined;
 
 		const dialog = new Dialog(
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 6173a39b8c98..35acb1038100 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import './media/chatViewSetup.css';
-import { $, getActiveElement, setVisibility } from '../../../../base/browser/dom.js';
+import { $, EventHelper, getActiveElement, setVisibility } from '../../../../base/browser/dom.js';
 import { ButtonWithDropdown } from '../../../../base/browser/ui/button/button.js';
 import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { mainWindow } from '../../../../base/browser/window.js';
@@ -31,7 +31,7 @@ import { ConfigurationTarget, IConfigurationService } from '../../../../platform
 import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { ICustomDialogHTMLElement, IDialogService } from '../../../../platform/dialogs/common/dialogs.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 { IOpenerService } from '../../../../platform/opener/common/opener.js';
@@ -41,7 +41,7 @@ import { IProgressService, ProgressLocation } from '../../../../platform/progres
 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 { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { defaultButtonStyles, defaultCheckboxStyles, defaultDialogStyles, defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
@@ -65,6 +65,11 @@ import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID } from './chatView
 import { ChatViewsWelcomeExtensions, IChatViewsWelcomeContributionRegistry } from './viewsWelcome/chatViewsWelcome.js';
 import { ChatAgentLocation } from '../common/constants.js';
 import { ILanguageModelsService } from '../common/languageModels.js';
+import { Dialog } from '../../../../base/browser/ui/dialog/dialog.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -194,7 +199,17 @@ class SetupChatAgentImplementation extends Disposable implements IChatAgentImple
 
 			let success = false;
 			try {
-				success = await this.controller.value.setup();
+				switch (result) {
+					case ChatSetupDialogResult.SetupWithEnterpriseProvider:
+						success = await this.controller.value.setupWithProvider(true);
+						break;
+					case ChatSetupDialogResult.SetupWithoutEnterpriseProvider:
+						success = await this.controller.value.setupWithProvider(false);
+						break;
+					case ChatSetupDialogResult.DefaultSetup:
+						success = await this.controller.value.setup();
+						break;
+				}
 			} catch (error) {
 				this.logService.error(localize('setupError', "Error during setup: {0}", toErrorMessage(error)));
 			} finally {
@@ -239,36 +254,78 @@ class SetupChatAgentImplementation extends Disposable implements IChatAgentImple
 	}
 }
 
+enum ChatSetupDialogResult {
+	Canceled = 0,
+	DefaultSetup = 1,
+	SetupWithoutEnterpriseProvider = 2,
+	SetupWithEnterpriseProvider = 3
+}
+
 class ChatSetupDialog {
 
 	constructor(
 		private readonly context: ChatEntitlementContext,
-		@IDialogService private readonly dialogService: IDialogService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@ITelemetryService private readonly telemetryService: ITelemetryService
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
+		@IContextMenuService private readonly contextMenuService: IContextMenuService,
+		@ILayoutService private readonly layoutService: IWorkbenchLayoutService,
+		@IKeybindingService private readonly keybindingService: IKeybindingService,
 	) { }
 
-	async show(): Promise<boolean> {
-		const res = await this.dialogService.prompt<boolean>({
-			type: 'none',
-			message: localize('copilotFree', "Welcome to Copilot"),
-			cancelButton: {
-				label: localize('cancel', "Cancel"),
-				run: () => false
-			},
-			buttons: [
-				{
-					label: this.getPrimaryButton(),
-					run: () => true
+	async show(): Promise<ChatSetupDialogResult> {
+		const allowableCommands = [
+			'copy',
+			'cut',
+			'editor.action.selectAll',
+			'editor.action.clipboardCopyAction',
+			'editor.action.clipboardCutAction',
+			'editor.action.clipboardPasteAction'
+		];
+
+		const buttons = [
+			this.getPrimaryButton(),
+			localize('cancelButton', "Cancel")
+		];
+		const disposables = new DisposableStore();
+
+		let result: ChatSetupDialogResult | undefined = undefined;
+
+		const dialog = disposables.add(new Dialog(
+			this.layoutService.activeContainer,
+			localize('copilotFree', "Welcome to Copilot"),
+			buttons,
+			{
+				type: 'none',
+				cancelId: buttons.length - 1,
+				renderBody: body => body.appendChild(this.create(disposables)),
+				keyEventProcessor: (event: StandardKeyboardEvent) => {
+					const resolved = this.keybindingService.softDispatch(event, this.layoutService.activeContainer);
+					if (resolved.kind === ResultKind.KbFound && resolved.commandId) {
+						if (!allowableCommands.includes(resolved.commandId)) {
+							EventHelper.stop(event, true);
+						}
+					}
 				},
-			],
-			custom: {
+				buttonStyles: defaultButtonStyles,
+				checkboxStyles: defaultCheckboxStyles,
+				inputBoxStyles: defaultInputBoxStyles,
+				dialogStyles: defaultDialogStyles,
 				icon: Codicon.copilotLarge,
-				htmlDetails: [this.create()]
+				primaryButtonDropdown: {
+					contextMenuProvider: this.contextMenuService,
+					addPrimaryActionToDropdown: false,
+					actions: [
+						toAction({ id: 'setupWithProvider', label: localize('setupWithProvider', "Sign in with a {0} Account", defaultChat.providerName), run: () => result = ChatSetupDialogResult.SetupWithoutEnterpriseProvider }),
+						toAction({ id: 'setupWithEnterpriseProvider', label: localize('setupWithEnterpriseProvider', "Sign in with a {0} Account", defaultChat.enterpriseProviderName), run: () => result = ChatSetupDialogResult.SetupWithEnterpriseProvider }),
+					]
+				}
 			}
-		});
+		));
+
+		const { button } = await dialog.show();
+		disposables.dispose();
 
-		return res.result;
+		return button === 0 ? result ?? ChatSetupDialogResult.DefaultSetup : ChatSetupDialogResult.Canceled;
 	}
 
 	private getPrimaryButton(): string {
@@ -286,8 +343,7 @@ class ChatSetupDialog {
 		}
 	}
 
-	private create(): ICustomDialogHTMLElement {
-		const disposables = new DisposableStore();
+	private create(disposables: DisposableStore): HTMLElement {
 		const element = $('.chat-setup-view');
 
 		const markdown = this.instantiationService.createInstance(MarkdownRenderer, {});
@@ -330,7 +386,7 @@ class ChatSetupDialog {
 			element.appendChild($('p.legal', undefined, disposables.add(markdown.render(new MarkdownString(settings, { isTrusted: true }))).element));
 		}
 
-		return { element, dispose: () => disposables.dispose() };
+		return element;
 	}
 }
 
@@ -449,7 +505,17 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 					if (result) {
 						let success = false;
 						try {
-							success = await controller.value.setup({ notificationProgress: true });
+							switch (result) {
+								case ChatSetupDialogResult.SetupWithEnterpriseProvider:
+									success = await controller.value.setupWithProvider(true);
+									break;
+								case ChatSetupDialogResult.SetupWithoutEnterpriseProvider:
+									success = await controller.value.setupWithProvider(false);
+									break;
+								case ChatSetupDialogResult.DefaultSetup:
+									success = await controller.value.setup();
+									break;
+							}
 
 							if (success) {
 								showCopilotView(viewsService, layoutService);
@@ -657,6 +723,7 @@ class ChatSetupController extends Disposable {
 		@IDialogService private readonly dialogService: IDialogService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@ILifecycleService private readonly lifecycleService: ILifecycleService,
+		@IQuickInputService private readonly quickInputService: IQuickInputService,
 	) {
 		super();
 
@@ -860,6 +927,121 @@ class ChatSetupController extends Disposable {
 			throw error;
 		}
 	}
+
+	async setupWithProvider(useEnterpriseProvider: boolean): Promise<boolean> {
+		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 (useEnterpriseProvider) {
+			const success = await this.handleEnterpriseInstance();
+			if (!success) {
+				return false; // not properly configured, abort
+			}
+		}
+
+		let existingAdvancedSetting = this.configurationService.inspect(defaultChat.completionsAdvancedSetting).user?.value;
+		if (!isObject(existingAdvancedSetting)) {
+			existingAdvancedSetting = {};
+		}
+
+		if (useEnterpriseProvider) {
+			await this.configurationService.updateValue(`${defaultChat.completionsAdvancedSetting}`, {
+				...existingAdvancedSetting,
+				'authProvider': defaultChat.enterpriseProviderId
+			}, ConfigurationTarget.USER);
+		} else {
+			await this.configurationService.updateValue(`${defaultChat.completionsAdvancedSetting}`, Object.keys(existingAdvancedSetting).length > 0 ? {
+				...existingAdvancedSetting,
+				'authProvider': undefined
+			} : undefined, ConfigurationTarget.USER);
+			await this.configurationService.updateValue(defaultChat.providerUriSetting, undefined, ConfigurationTarget.USER);
+		}
+
+		return this.setup({ forceSignIn: true });
+	}
+
+	private async handleEnterpriseInstance(): Promise<boolean /* success */> {
+		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.enterpriseProviderName),
+			placeHolder: localize('enterpriseInstancePlaceholder', 'i.e. "octocat" or "https://octocat.ghe.com"...'),
+			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', 'Please enter a valid {0} instance (i.e. "octocat" or "https://octocat.ghe.com")', defaultChat.enterpriseProviderName),
+						severity: Severity.Error
+					};
+				}
+
+				return undefined;
+			}
+		});
+
+		if (!result) {
+			const { confirmed } = await this.dialogService.confirm({
+				type: Severity.Error,
+				message: localize('enterpriseSetupError', "The provided {0} instance is invalid. Would you like to enter it again?", defaultChat.enterpriseProviderName),
+				primaryButton: localize('retry', "Retry")
+			});
+
+			if (confirmed) {
+				return this.handleEnterpriseInstance();
+			}
+
+			return false;
+		}
+
+		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;
+	}
 }
 
 class ChatSetupWelcomeContent extends Disposable {
@@ -873,8 +1055,6 @@ class ChatSetupWelcomeContent extends Disposable {
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
-		@IQuickInputService private readonly quickInputService: IQuickInputService,
-		@IDialogService private readonly dialogService: IDialogService,
 	) {
 		super();
 
@@ -918,8 +1098,8 @@ class ChatSetupWelcomeContent extends Disposable {
 		buttonContainer.classList.add('button-container');
 		const button = this._register(new ButtonWithDropdown(buttonContainer, {
 			actions: [
-				toAction({ id: 'chatSetup.setupWithProvider', label: localize('setupWithProvider', "Sign in with a {0} Account", defaultChat.providerName), run: () => this.setupWithProvider(false) }),
-				toAction({ id: 'chatSetup.setupWithEnterpriseProvider', label: localize('setupWithEnterpriseProvider', "Sign in with a {0} Account", defaultChat.enterpriseProviderName), run: () => this.setupWithProvider(true) })
+				toAction({ id: 'chatSetup.setupWithProvider', label: localize('setupWithProvider', "Sign in with a {0} Account", defaultChat.providerName), run: () => this.controller.setupWithProvider(false) }),
+				toAction({ id: 'chatSetup.setupWithEnterpriseProvider', label: localize('setupWithEnterpriseProvider', "Sign in with a {0} Account", defaultChat.enterpriseProviderName), run: () => this.controller.setupWithProvider(true) })
 			],
 			addPrimaryActionToDropdown: false,
 			contextMenuProvider: this.contextMenuService,
@@ -981,121 +1161,6 @@ class ChatSetupWelcomeContent extends Disposable {
 		button.label = buttonLabel;
 		button.enabled = this.controller.step === ChatSetupStep.Initial;
 	}
-
-	private async setupWithProvider(useEnterpriseProvider: boolean): Promise<boolean> {
-		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 (useEnterpriseProvider) {
-			const success = await this.handleEnterpriseInstance();
-			if (!success) {
-				return false; // not properly configured, abort
-			}
-		}
-
-		let existingAdvancedSetting = this.configurationService.inspect(defaultChat.completionsAdvancedSetting).user?.value;
-		if (!isObject(existingAdvancedSetting)) {
-			existingAdvancedSetting = {};
-		}
-
-		if (useEnterpriseProvider) {
-			await this.configurationService.updateValue(`${defaultChat.completionsAdvancedSetting}`, {
-				...existingAdvancedSetting,
-				'authProvider': defaultChat.enterpriseProviderId
-			}, ConfigurationTarget.USER);
-		} else {
-			await this.configurationService.updateValue(`${defaultChat.completionsAdvancedSetting}`, Object.keys(existingAdvancedSetting).length > 0 ? {
-				...existingAdvancedSetting,
-				'authProvider': undefined
-			} : undefined, ConfigurationTarget.USER);
-			await this.configurationService.updateValue(defaultChat.providerUriSetting, undefined, ConfigurationTarget.USER);
-		}
-
-		return this.controller.setup({ forceSignIn: true });
-	}
-
-	private async handleEnterpriseInstance(): Promise<boolean /* success */> {
-		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.enterpriseProviderName),
-			placeHolder: localize('enterpriseInstancePlaceholder', 'i.e. "octocat" or "https://octocat.ghe.com"...'),
-			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', 'Please enter a valid {0} instance (i.e. "octocat" or "https://octocat.ghe.com")', defaultChat.enterpriseProviderName),
-						severity: Severity.Error
-					};
-				}
-
-				return undefined;
-			}
-		});
-
-		if (!result) {
-			const { confirmed } = await this.dialogService.confirm({
-				type: Severity.Error,
-				message: localize('enterpriseSetupError', "The provided {0} instance is invalid. Would you like to enter it again?", defaultChat.enterpriseProviderName),
-				primaryButton: localize('retry', "Retry")
-			});
-
-			if (confirmed) {
-				return this.handleEnterpriseInstance();
-			}
-
-			return false;
-		}
-
-		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

From c74829e0c7057452b6fc157d6507e0ee9f5d7c3a Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 17 Mar 2025 10:38:27 +0100
Subject: [PATCH 0986/1815] adopt gallery manifest in server (web) (#243729)

---
 .../extensionGalleryManifestService.ts        | 31 +++++++++++++++++++
 .../workbench/workbench.web.main.internal.ts  |  4 +--
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 src/vs/workbench/services/extensionManagement/browser/extensionGalleryManifestService.ts

diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionGalleryManifestService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionGalleryManifestService.ts
new file mode 100644
index 000000000000..f79e5389edb9
--- /dev/null
+++ b/src/vs/workbench/services/extensionManagement/browser/extensionGalleryManifestService.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 { IExtensionGalleryManifestService } from '../../../../platform/extensionManagement/common/extensionGalleryManifest.js';
+import { ExtensionGalleryManifestService as 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';
+
+class WebExtensionGalleryManifestService extends ExtensionGalleryManifestService implements IExtensionGalleryManifestService {
+
+	constructor(
+		@IProductService productService: IProductService,
+		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
+	) {
+		super(productService);
+		const remoteConnection = remoteAgentService.getConnection();
+		if (remoteConnection) {
+			const channel = remoteConnection.getChannel('extensionGalleryManifest');
+			this.getExtensionGalleryManifest().then(manifest => {
+				channel.call('setExtensionGalleryManifest', [manifest]);
+				this._register(this.onDidChangeExtensionGalleryManifest(manifest => channel.call('setExtensionGalleryManifest', [manifest])));
+			});
+		}
+	}
+
+}
+
+registerSingleton(IExtensionGalleryManifestService, WebExtensionGalleryManifestService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/workbench.web.main.internal.ts b/src/vs/workbench/workbench.web.main.internal.ts
index ef6219a12503..98629bedadf1 100644
--- a/src/vs/workbench/workbench.web.main.internal.ts
+++ b/src/vs/workbench/workbench.web.main.internal.ts
@@ -43,6 +43,7 @@ import './services/extensionManagement/browser/extensionsProfileScannerService.j
 import './services/extensions/browser/extensionsScannerService.js';
 import './services/extensionManagement/browser/webExtensionsScannerService.js';
 import './services/extensionManagement/common/extensionManagementServerService.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';
@@ -92,8 +93,6 @@ import { ITimerService, TimerService } from './services/timer/browser/timerServi
 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 { IExtensionGalleryManifestService } from '../platform/extensionManagement/common/extensionGalleryManifest.js';
-import { ExtensionGalleryManifestService } from '../platform/extensionManagement/common/extensionGalleryManifestService.js';
 import { IWebContentExtractorService, NullWebContentExtractorService } from '../platform/webContentExtractor/common/webContentExtractor.js';
 
 registerSingleton(IWorkbenchExtensionManagementService, ExtensionManagementService, InstantiationType.Delayed);
@@ -112,7 +111,6 @@ registerSingleton(ITimerService, TimerService, InstantiationType.Delayed);
 registerSingleton(ICustomEndpointTelemetryService, NullEndpointTelemetryService, InstantiationType.Delayed);
 registerSingleton(IDiagnosticsService, NullDiagnosticsService, InstantiationType.Delayed);
 registerSingleton(ILanguagePackService, WebLanguagePacksService, InstantiationType.Delayed);
-registerSingleton(IExtensionGalleryManifestService, ExtensionGalleryManifestService, InstantiationType.Delayed);
 registerSingleton(IWebContentExtractorService, NullWebContentExtractorService, InstantiationType.Delayed);
 
 //#endregion

From 3a0a16c1577efb075808d9a8f77eeb7e074d9c0f Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 17 Mar 2025 11:52:05 +0100
Subject: [PATCH 0987/1815] dialog - share more common workbench options
 (#243736)

---
 src/vs/platform/dialogs/browser/dialog.ts     | 41 +++++++++++++++++++
 .../browser/parts/dialogs/dialogHandler.ts    | 23 ++---------
 .../contrib/chat/browser/chatSetup.ts         | 32 +++------------
 .../progress/browser/progressService.ts       | 33 ++-------------
 4 files changed, 54 insertions(+), 75 deletions(-)
 create mode 100644 src/vs/platform/dialogs/browser/dialog.ts

diff --git a/src/vs/platform/dialogs/browser/dialog.ts b/src/vs/platform/dialogs/browser/dialog.ts
new file mode 100644
index 000000000000..91e6d519dc3d
--- /dev/null
+++ b/src/vs/platform/dialogs/browser/dialog.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 { EventHelper } from '../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
+import { IDialogOptions } from '../../../base/browser/ui/dialog/dialog.js';
+import { IKeybindingService } from '../../keybinding/common/keybinding.js';
+import { ResultKind } from '../../keybinding/common/keybindingResolver.js';
+import { ILayoutService } from '../../layout/browser/layoutService.js';
+import { defaultButtonStyles, defaultCheckboxStyles, defaultInputBoxStyles, defaultDialogStyles } from '../../theme/browser/defaultStyles.js';
+
+const defaultDialogAllowableCommands = [
+	'workbench.action.quit',
+	'workbench.action.reloadWindow',
+	'copy',
+	'cut',
+	'editor.action.selectAll',
+	'editor.action.clipboardCopyAction',
+	'editor.action.clipboardCutAction',
+	'editor.action.clipboardPasteAction'
+];
+
+export function createWorkbenchDialogOptions(options: Partial<IDialogOptions>, keybindingService: IKeybindingService, layoutService: ILayoutService, allowableCommands = defaultDialogAllowableCommands): IDialogOptions {
+	return {
+		keyEventProcessor: (event: StandardKeyboardEvent) => {
+			const resolved = keybindingService.softDispatch(event, layoutService.activeContainer);
+			if (resolved.kind === ResultKind.KbFound && resolved.commandId) {
+				if (!allowableCommands.includes(resolved.commandId)) {
+					EventHelper.stop(event, true);
+				}
+			}
+		},
+		buttonStyles: defaultButtonStyles,
+		checkboxStyles: defaultCheckboxStyles,
+		inputBoxStyles: defaultInputBoxStyles,
+		dialogStyles: defaultDialogStyles,
+		...options
+	};
+}
diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
index e41d878f990a..ac461ef94384 100644
--- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
+++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
@@ -10,17 +10,14 @@ import { ILogService } from '../../../../platform/log/common/log.js';
 import Severity from '../../../../base/common/severity.js';
 import { Dialog, IDialogResult } from '../../../../base/browser/ui/dialog/dialog.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
-import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { EventHelper } from '../../../../base/browser/dom.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
 import { fromNow } from '../../../../base/common/date.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { MarkdownRenderer, openLinkFromMarkdown } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
-import { defaultButtonStyles, defaultCheckboxStyles, defaultDialogStyles, defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { createWorkbenchDialogOptions } from '../../../../platform/dialogs/browser/dialog.js';
 
 export class BrowserDialogHandler extends AbstractDialogHandler {
 
@@ -136,30 +133,18 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
 			this.layoutService.activeContainer,
 			message,
 			buttons,
-			{
+			createWorkbenchDialogOptions({
 				detail,
 				cancelId,
 				type: this.getDialogType(type),
-				keyEventProcessor: (event: StandardKeyboardEvent) => {
-					const resolved = this.keybindingService.softDispatch(event, this.layoutService.activeContainer);
-					if (resolved.kind === ResultKind.KbFound && resolved.commandId) {
-						if (BrowserDialogHandler.ALLOWABLE_COMMANDS.indexOf(resolved.commandId) === -1) {
-							EventHelper.stop(event, true);
-						}
-					}
-				},
 				renderBody,
 				icon: customOptions?.icon,
 				disableCloseAction: customOptions?.disableCloseAction,
 				buttonDetails: customOptions?.buttonDetails,
 				checkboxLabel: checkbox?.label,
 				checkboxChecked: checkbox?.checked,
-				inputs,
-				buttonStyles: defaultButtonStyles,
-				checkboxStyles: defaultCheckboxStyles,
-				inputBoxStyles: defaultInputBoxStyles,
-				dialogStyles: defaultDialogStyles
-			}
+				inputs
+			}, this.keybindingService, this.layoutService, BrowserDialogHandler.ALLOWABLE_COMMANDS)
 		);
 
 		dialogDisposables.add(dialog);
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 35acb1038100..c7701df9dc05 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import './media/chatViewSetup.css';
-import { $, EventHelper, getActiveElement, setVisibility } from '../../../../base/browser/dom.js';
+import { $, getActiveElement, setVisibility } from '../../../../base/browser/dom.js';
 import { ButtonWithDropdown } from '../../../../base/browser/ui/button/button.js';
 import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { mainWindow } from '../../../../base/browser/window.js';
@@ -41,7 +41,7 @@ import { IProgressService, ProgressLocation } from '../../../../platform/progres
 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 { defaultButtonStyles, defaultCheckboxStyles, defaultDialogStyles, defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
@@ -67,9 +67,8 @@ import { ChatAgentLocation } from '../common/constants.js';
 import { ILanguageModelsService } from '../common/languageModels.js';
 import { Dialog } from '../../../../base/browser/ui/dialog/dialog.js';
 import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
-import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
+import { createWorkbenchDialogOptions } from '../../../../platform/dialogs/browser/dialog.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -273,15 +272,6 @@ class ChatSetupDialog {
 	) { }
 
 	async show(): Promise<ChatSetupDialogResult> {
-		const allowableCommands = [
-			'copy',
-			'cut',
-			'editor.action.selectAll',
-			'editor.action.clipboardCopyAction',
-			'editor.action.clipboardCutAction',
-			'editor.action.clipboardPasteAction'
-		];
-
 		const buttons = [
 			this.getPrimaryButton(),
 			localize('cancelButton', "Cancel")
@@ -294,22 +284,10 @@ class ChatSetupDialog {
 			this.layoutService.activeContainer,
 			localize('copilotFree', "Welcome to Copilot"),
 			buttons,
-			{
+			createWorkbenchDialogOptions({
 				type: 'none',
 				cancelId: buttons.length - 1,
 				renderBody: body => body.appendChild(this.create(disposables)),
-				keyEventProcessor: (event: StandardKeyboardEvent) => {
-					const resolved = this.keybindingService.softDispatch(event, this.layoutService.activeContainer);
-					if (resolved.kind === ResultKind.KbFound && resolved.commandId) {
-						if (!allowableCommands.includes(resolved.commandId)) {
-							EventHelper.stop(event, true);
-						}
-					}
-				},
-				buttonStyles: defaultButtonStyles,
-				checkboxStyles: defaultCheckboxStyles,
-				inputBoxStyles: defaultInputBoxStyles,
-				dialogStyles: defaultDialogStyles,
 				icon: Codicon.copilotLarge,
 				primaryButtonDropdown: {
 					contextMenuProvider: this.contextMenuService,
@@ -319,7 +297,7 @@ class ChatSetupDialog {
 						toAction({ id: 'setupWithEnterpriseProvider', label: localize('setupWithEnterpriseProvider', "Sign in with a {0} Account", defaultChat.enterpriseProviderName), run: () => result = ChatSetupDialogResult.SetupWithEnterpriseProvider }),
 					]
 				}
-			}
+			}, this.keybindingService, this.layoutService)
 		));
 
 		const { button } = await dialog.show();
diff --git a/src/vs/workbench/services/progress/browser/progressService.ts b/src/vs/workbench/services/progress/browser/progressService.ts
index 18bffc2561db..8a02c908e63d 100644
--- a/src/vs/workbench/services/progress/browser/progressService.ts
+++ b/src/vs/workbench/services/progress/browser/progressService.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import './media/progressService.css';
-
 import { localize } from '../../../../nls.js';
 import { IDisposable, dispose, DisposableStore, Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { IProgressService, IProgressOptions, IProgressStep, ProgressLocation, IProgress, Progress, IProgressCompositeOptions, IProgressNotificationOptions, IProgressRunner, IProgressIndicator, IProgressWindowOptions, IProgressDialogOptions } from '../../../../platform/progress/common/progress.js';
@@ -18,16 +17,13 @@ import { InstantiationType, registerSingleton } from '../../../../platform/insta
 import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
 import { Dialog } from '../../../../base/browser/ui/dialog/dialog.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { EventHelper } from '../../../../base/browser/dom.js';
 import { parseLinkedText } from '../../../../base/common/linkedText.js';
 import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
 import { IViewsService } from '../../views/common/viewsService.js';
 import { IPaneCompositePartService } from '../../panecomposite/browser/panecomposite.js';
 import { stripIcons } from '../../../../base/common/iconLabels.js';
-import { defaultButtonStyles, defaultCheckboxStyles, defaultDialogStyles, defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
 import { IUserActivityService } from '../../userActivity/common/userActivityService.js';
+import { createWorkbenchDialogOptions } from '../../../../platform/dialogs/browser/dialog.js';
 
 export class ProgressService extends Disposable implements IProgressService {
 
@@ -548,15 +544,6 @@ export class ProgressService extends Disposable implements IProgressService {
 	private withDialogProgress<P extends Promise<R>, R = unknown>(options: IProgressDialogOptions, task: (progress: IProgress<IProgressStep>) => P, onDidCancel?: (choice?: number) => void): P {
 		const disposables = new DisposableStore();
 
-		const allowableCommands = [
-			'workbench.action.quit',
-			'workbench.action.reloadWindow',
-			'copy',
-			'cut',
-			'editor.action.clipboardCopyAction',
-			'editor.action.clipboardCutAction'
-		];
-
 		let dialog: Dialog;
 
 		const createDialog = (message: string) => {
@@ -572,25 +559,13 @@ export class ProgressService extends Disposable implements IProgressService {
 				this.layoutService.activeContainer,
 				message,
 				buttons,
-				{
+				createWorkbenchDialogOptions({
 					type: 'pending',
 					detail: options.detail,
 					cancelId: buttons.length - 1,
 					disableCloseAction: options.sticky,
-					disableDefaultAction: options.sticky,
-					keyEventProcessor: (event: StandardKeyboardEvent) => {
-						const resolved = this.keybindingService.softDispatch(event, this.layoutService.activeContainer);
-						if (resolved.kind === ResultKind.KbFound && resolved.commandId) {
-							if (!allowableCommands.includes(resolved.commandId)) {
-								EventHelper.stop(event, true);
-							}
-						}
-					},
-					buttonStyles: defaultButtonStyles,
-					checkboxStyles: defaultCheckboxStyles,
-					inputBoxStyles: defaultInputBoxStyles,
-					dialogStyles: defaultDialogStyles
-				}
+					disableDefaultAction: options.sticky
+				}, this.keybindingService, this.layoutService)
 			);
 
 			disposables.add(dialog);

From 5b778ceb0fd58f9cfebbf5ea071e4ebbae751401 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 17 Mar 2025 12:01:52 +0100
Subject: [PATCH 0988/1815] Remove unused mixed lines from the codebase
 (#243737)

remove the rest of nes mixed lines
---
 .../originalEditorInlineDiffView.ts           | 54 -------------------
 1 file changed, 54 deletions(-)

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 ae1d93bb639a..6af87b7dff85 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
@@ -10,17 +10,12 @@ import { autorunWithStore, derived, IObservable, observableFromEvent } from '../
 import { ICodeEditor, MouseTargetType } from '../../../../../../browser/editorBrowser.js';
 import { observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
 import { rangeIsSingleLine } from '../../../../../../browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.js';
-import { LineSource, renderLines, RenderOptions } from '../../../../../../browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
-import { diffAddDecoration } from '../../../../../../browser/widget/diffEditor/registrations.contribution.js';
-import { applyViewZones, IObservableViewZone } from '../../../../../../browser/widget/diffEditor/utils.js';
-import { EditorOption } from '../../../../../../common/config/editorOptions.js';
 import { OffsetRange } from '../../../../../../common/core/offsetRange.js';
 import { Range } from '../../../../../../common/core/range.js';
 import { AbstractText } from '../../../../../../common/core/textEdit.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 { InlineDecoration, InlineDecorationType } from '../../../../../../common/viewModel.js';
 import { IInlineEditsView } from '../inlineEditsViewInterface.js';
 import { classNames } from '../utils/utils.js';
 
@@ -66,8 +61,6 @@ export class OriginalEditorInlineDiffView extends Disposable implements IInlineE
 			}
 		}));
 
-		const editor = observableCodeEditor(this._originalEditor);
-
 		this._register(this._originalEditor.onMouseUp(e => {
 			if (e.target.type !== MouseTargetType.CONTENT_TEXT) {
 				return;
@@ -77,53 +70,6 @@ export class OriginalEditorInlineDiffView extends Disposable implements IInlineE
 				this._onDidClick.fire(e.event);
 			}
 		}));
-
-		const originalViewZones = derived(this, (reader) => {
-			const originalModel = editor.model.read(reader);
-			if (!originalModel) { return []; }
-
-			const origViewZones: IObservableViewZone[] = [];
-			const renderOptions = RenderOptions.fromEditor(this._originalEditor);
-			const modLineHeight = editor.getOption(EditorOption.lineHeight).read(reader);
-
-			const s = this._state.read(reader);
-			if (!s) { return origViewZones; }
-
-			for (const diff of s.diff) {
-				this._tokenizationFinished.read(reader); // Update view-zones once tokenization completes
-
-				const source = new LineSource(diff.modified.mapToLineArray(l => this._modifiedTextModel.tokenization.getLineTokens(l)));
-
-				const decorations: InlineDecoration[] = [];
-				for (const i of diff.innerChanges || []) {
-					decorations.push(new InlineDecoration(
-						i.modifiedRange.delta(-(diff.original.startLineNumber - 1)),
-						diffAddDecoration.className!,
-						InlineDecorationType.Regular,
-					));
-				}
-
-				const deletedCodeDomNode = document.createElement('div');
-				deletedCodeDomNode.classList.add('view-lines', 'line-insert', 'monaco-mouse-cursor-text');
-				// .inline-deleted-margin-view-zone
-
-				const result = renderLines(source, renderOptions, decorations, deletedCodeDomNode);
-
-				origViewZones.push({
-					afterLineNumber: diff.original.endLineNumberExclusive - 1,
-					domNode: deletedCodeDomNode,
-					heightInPx: result.heightInLines * modLineHeight,
-					minWidthInPx: result.minWidthInPx,
-
-					showInHiddenAreas: true,
-					suppressMouseDown: true,
-				});
-			}
-
-			return origViewZones;
-		});
-
-		this._register(applyViewZones(this._originalEditor, originalViewZones));
 	}
 
 	private readonly _decorations = derived(this, reader => {

From 7248ff1cc2494a324f792e27c9f956f97ddcb1a0 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 17 Mar 2025 12:39:04 +0100
Subject: [PATCH 0989/1815] Fix editor tabs drag and drop (#243543)

* Fix editor tabs drag and drop

* fix more

* align dnd across workbench

* move applyDragImage into ui/dnd

---------

Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
---
 src/vs/base/browser/dnd.ts                    | 25 +------------
 src/vs/base/browser/ui/dnd/dnd.css            | 28 +++++++++++++++
 src/vs/base/browser/ui/dnd/dnd.ts             | 31 ++++++++++++++++
 src/vs/base/browser/ui/list/list.css          | 10 ------
 src/vs/base/browser/ui/list/listView.ts       | 36 ++++++-------------
 src/vs/base/browser/ui/list/listWidget.ts     |  8 ++---
 src/vs/base/browser/ui/splitview/paneview.ts  |  9 ++---
 .../parts/editor/breadcrumbsControl.ts        | 18 ++--------
 .../browser/parts/editor/editorTabsControl.ts |  6 ++--
 .../parts/editor/media/editortabscontrol.css  | 18 ----------
 .../parts/editor/multiEditorTabsControl.ts    |  6 ++--
 .../notebook/browser/diff/notebookDiffList.ts |  6 ++--
 .../notebook/browser/view/notebookCellList.ts |  6 ++--
 .../preferences/browser/settingsWidgets.ts    | 16 ++-------
 14 files changed, 96 insertions(+), 127 deletions(-)
 create mode 100644 src/vs/base/browser/ui/dnd/dnd.css
 create mode 100644 src/vs/base/browser/ui/dnd/dnd.ts

diff --git a/src/vs/base/browser/dnd.ts b/src/vs/base/browser/dnd.ts
index 879426cfb0cc..6ba1f767ae61 100644
--- a/src/vs/base/browser/dnd.ts
+++ b/src/vs/base/browser/dnd.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { addDisposableListener, getWindow } from './dom.js';
+import { addDisposableListener } from './dom.js';
 import { Disposable } from '../common/lifecycle.js';
 import { Mimes } from '../common/mime.js';
 
@@ -81,29 +81,6 @@ export const DataTransfers = {
 	INTERNAL_URI_LIST: 'application/vnd.code.uri-list',
 };
 
-export function applyDragImage(event: DragEvent, label: string | null, clazz: string, backgroundColor?: string | null, foregroundColor?: string | null): void {
-	const dragImage = document.createElement('div');
-	dragImage.className = clazz;
-	dragImage.textContent = label;
-
-	if (foregroundColor) {
-		dragImage.style.color = foregroundColor;
-	}
-
-	if (backgroundColor) {
-		dragImage.style.background = backgroundColor;
-	}
-
-	if (event.dataTransfer) {
-		const ownerDocument = getWindow(event).document;
-		ownerDocument.body.appendChild(dragImage);
-		event.dataTransfer.setDragImage(dragImage, -10, -10);
-
-		// Removes the element when the DND operation is done
-		setTimeout(() => dragImage.remove(), 0);
-	}
-}
-
 export interface IDragAndDropData {
 	update(dataTransfer: DataTransfer): void;
 	getData(): unknown;
diff --git a/src/vs/base/browser/ui/dnd/dnd.css b/src/vs/base/browser/ui/dnd/dnd.css
new file mode 100644
index 000000000000..3dbd92dce256
--- /dev/null
+++ b/src/vs/base/browser/ui/dnd/dnd.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-drag-image {
+	display: inline-block;
+	padding: 1px 7px;
+	border-radius: 10px;
+	font-size: 12px;
+	position: absolute;
+	z-index: 1000;
+
+	/* Default styles */
+	background-color: var(--vscode-list-activeSelectionBackground);
+	color: var(--vscode-list-activeSelectionForeground);
+	outline: 1px solid var(--vscode-list-focusOutline);
+	outline-offset: -1px;
+
+	/*
+	 * Browsers apply an effect to the drag image when the div becomes too
+	 * large which makes them unreadable. Use max width so it does not happen
+	 */
+	max-width: 120px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
diff --git a/src/vs/base/browser/ui/dnd/dnd.ts b/src/vs/base/browser/ui/dnd/dnd.ts
new file mode 100644
index 000000000000..39ce04a13a80
--- /dev/null
+++ b/src/vs/base/browser/ui/dnd/dnd.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 { $ } from '../../dom.js';
+import './dnd.css';
+
+export function applyDragImage(event: DragEvent, container: HTMLElement, label: string, extraClasses: string[] = []): void {
+	if (!event.dataTransfer) {
+		return;
+	}
+
+	const dragImage = $('.monaco-drag-image');
+	dragImage.textContent = label;
+	dragImage.classList.add(...extraClasses);
+
+	const getDragImageContainer = (e: HTMLElement | null) => {
+		while (e && !e.classList.contains('monaco-workbench')) {
+			e = e.parentElement;
+		}
+		return e || container.ownerDocument.body;
+	};
+
+	const dragContainer = getDragImageContainer(container);
+	dragContainer.appendChild(dragImage);
+	event.dataTransfer.setDragImage(dragImage, -10, -10);
+
+	// Removes the element when the DND operation is done
+	setTimeout(() => dragImage.remove(), 0);
+}
diff --git a/src/vs/base/browser/ui/list/list.css b/src/vs/base/browser/ui/list/list.css
index be273a61823d..672f03e42f04 100644
--- a/src/vs/base/browser/ui/list/list.css
+++ b/src/vs/base/browser/ui/list/list.css
@@ -60,16 +60,6 @@
 	outline: 0 !important;
 }
 
-/* Dnd */
-.monaco-drag-image {
-	display: inline-block;
-	padding: 1px 7px;
-	border-radius: 10px;
-	font-size: 12px;
-	position: absolute;
-	z-index: 1000;
-}
-
 /* Filter */
 
 .monaco-list-type-filter-message {
diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
index 67bad0de33f1..2db1250ff861 100644
--- a/src/vs/base/browser/ui/list/listView.ts
+++ b/src/vs/base/browser/ui/list/listView.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { DataTransfers, IDragAndDropData } from '../../dnd.js';
-import { $, addDisposableListener, animate, Dimension, getActiveElement, getContentHeight, getContentWidth, getDocument, getTopLeftOffset, getWindow, isAncestor, isHTMLElement, isSVGElement, scheduleAtNextAnimationFrame } from '../../dom.js';
+import { addDisposableListener, animate, Dimension, getActiveElement, getContentHeight, getContentWidth, getDocument, getTopLeftOffset, getWindow, isAncestor, isHTMLElement, isSVGElement, scheduleAtNextAnimationFrame } from '../../dom.js';
 import { DomEmitter } from '../../event.js';
 import { IMouseWheelEvent } from '../../mouseEvent.js';
 import { EventType as TouchEventType, Gesture, GestureEvent } from '../../touch.js';
@@ -24,6 +24,7 @@ import { BugIndicatingError } from '../../../common/errors.js';
 import { AriaRole } from '../aria/aria.js';
 import { ScrollableElementChangeOptions } from '../scrollbar/scrollableElementOptions.js';
 import { clamp } from '../../../common/numbers.js';
+import { applyDragImage } from '../dnd/dnd.js';
 
 interface IItem<T> {
 	readonly id: string;
@@ -1180,32 +1181,15 @@ export class ListView<T> implements IListView<T> {
 		event.dataTransfer.effectAllowed = 'copyMove';
 		event.dataTransfer.setData(DataTransfers.TEXT, uri);
 
-		if (event.dataTransfer.setDragImage) {
-			let label: string | undefined;
-
-			if (this.dnd.getDragLabel) {
-				label = this.dnd.getDragLabel(elements, event);
-			}
-
-			if (typeof label === 'undefined') {
-				label = String(elements.length);
-			}
-
-			const dragImage = $('.monaco-drag-image');
-			dragImage.textContent = label;
-
-			const getDragImageContainer = (e: HTMLElement | null) => {
-				while (e && !e.classList.contains('monaco-workbench')) {
-					e = e.parentElement;
-				}
-				return e || this.domNode.ownerDocument;
-			};
-
-			const container = getDragImageContainer(this.domNode);
-			container.appendChild(dragImage);
-			event.dataTransfer.setDragImage(dragImage, -10, -10);
-			setTimeout(() => dragImage.remove(), 0);
+		let label: string | undefined;
+		if (this.dnd.getDragLabel) {
+			label = this.dnd.getDragLabel(elements, event);
 		}
+		if (typeof label === 'undefined') {
+			label = String(elements.length);
+		}
+
+		applyDragImage(event, this.domNode, label, [this.domId /* add domId to get list specific styling */]);
 
 		this.domNode.classList.add('dragging');
 		this.currentDragData = new ElementsDragAndDropData(elements);
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index 78932044f96e..44b59334606e 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -899,14 +899,14 @@ export class DefaultStyleController implements IStyleController {
 
 		if (styles.listFocusAndSelectionBackground) {
 			content.push(`
-				.monaco-drag-image,
+				.monaco-drag-image${suffix},
 				.monaco-list${suffix}:focus .monaco-list-row.selected.focused { background-color: ${styles.listFocusAndSelectionBackground}; }
 			`);
 		}
 
 		if (styles.listFocusAndSelectionForeground) {
 			content.push(`
-				.monaco-drag-image,
+				.monaco-drag-image${suffix},
 				.monaco-list${suffix}:focus .monaco-list-row.selected.focused { color: ${styles.listFocusAndSelectionForeground}; }
 			`);
 		}
@@ -952,8 +952,8 @@ export class DefaultStyleController implements IStyleController {
 
 		if (styles.listFocusOutline) { // default: set
 			content.push(`
-				.monaco-drag-image,
-				.monaco-list${suffix}:focus .monaco-list-row.focused { outline: 1px solid ${styles.listFocusOutline}; outline-offset: -1px; }
+				.monaco-drag-image${suffix},
+				.monaco-list${suffix}:focus .monaco-list-row.focused,
 				.monaco-workbench.context-menu-visible .monaco-list${suffix}.last-focused .monaco-list-row.focused { outline: 1px solid ${styles.listFocusOutline}; outline-offset: -1px; }
 			`);
 		}
diff --git a/src/vs/base/browser/ui/splitview/paneview.ts b/src/vs/base/browser/ui/splitview/paneview.ts
index 9dd4bb3d8974..42d2234a1316 100644
--- a/src/vs/base/browser/ui/splitview/paneview.ts
+++ b/src/vs/base/browser/ui/splitview/paneview.ts
@@ -18,6 +18,7 @@ import { ScrollEvent } from '../../../common/scrollable.js';
 import './paneview.css';
 import { localize } from '../../../../nls.js';
 import { IView, Sizing, SplitView } from './splitview.js';
+import { applyDragImage } from '../dnd/dnd.js';
 
 export interface IPaneOptions {
 	minimumBodySize?: number;
@@ -381,16 +382,16 @@ class PaneDraggable extends Disposable {
 			return;
 		}
 
+		const label = this.pane.draggableElement?.textContent || '';
+
 		e.dataTransfer.effectAllowed = 'move';
 
 		if (isFirefox) {
 			// Firefox: requires to set a text data transfer to get going
-			e.dataTransfer?.setData(DataTransfers.TEXT, this.pane.draggableElement?.textContent || '');
+			e.dataTransfer?.setData(DataTransfers.TEXT, label);
 		}
 
-		const dragImage = append(this.pane.element.ownerDocument.body, $('.monaco-drag-image', {}, this.pane.draggableElement?.textContent || ''));
-		e.dataTransfer.setDragImage(dragImage, -10, -10);
-		setTimeout(() => dragImage.remove(), 0);
+		applyDragImage(e, this.pane.element, label);
 
 		this.context.draggable = this;
 	}
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
index 2792e624c1d6..351252cecda0 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as dom from '../../../../base/browser/dom.js';
-import { $ } from '../../../../base/browser/dom.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { PixelRatio } from '../../../../base/browser/pixelRatio.js';
 import { BreadcrumbsItem, BreadcrumbsWidget, IBreadcrumbsItemEvent, IBreadcrumbsWidgetStyles } from '../../../../base/browser/ui/breadcrumbs/breadcrumbsWidget.js';
+import { applyDragImage } from '../../../../base/browser/ui/dnd/dnd.js';
 import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { timeout } from '../../../../base/common/async.js';
@@ -190,21 +190,7 @@ function createBreadcrumbDndObserver(accessor: ServicesAccessor, container: HTML
 				}
 			});
 
-			// Create drag image and remove when dropped
-			const dragImage = $('.monaco-drag-image');
-			dragImage.textContent = label;
-
-			const getDragImageContainer = (e: HTMLElement | null) => {
-				while (e && !e.classList.contains('monaco-workbench')) {
-					e = e.parentElement;
-				}
-				return e || container.ownerDocument;
-			};
-
-			const dragContainer = getDragImageContainer(container);
-			dragContainer.appendChild(dragImage);
-			event.dataTransfer.setDragImage(dragImage, -10, -10);
-			setTimeout(() => dragImage.remove(), 0);
+			applyDragImage(event, container, label);
 		}
 	});
 }
diff --git a/src/vs/workbench/browser/parts/editor/editorTabsControl.ts b/src/vs/workbench/browser/parts/editor/editorTabsControl.ts
index 51e7736fe03d..4d4573776a73 100644
--- a/src/vs/workbench/browser/parts/editor/editorTabsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/editorTabsControl.ts
@@ -5,7 +5,7 @@
 
 import './media/editortabscontrol.css';
 import { localize } from '../../../../nls.js';
-import { applyDragImage, DataTransfers } from '../../../../base/browser/dnd.js';
+import { DataTransfers } from '../../../../base/browser/dnd.js';
 import { $, Dimension, getActiveWindow, getWindow, isMouseEvent } from '../../../../base/browser/dom.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { ActionsOrientation, IActionViewItem, prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
@@ -20,7 +20,6 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
-import { listActiveSelectionBackground, listActiveSelectionForeground } from '../../../../platform/theme/common/colorRegistry.js';
 import { IThemeService, Themable } from '../../../../platform/theme/common/themeService.js';
 import { DraggedEditorGroupIdentifier, DraggedEditorIdentifier, fillEditorsDragData, isWindowDraggedOver } from '../../dnd.js';
 import { EditorPane } from './editorPane.js';
@@ -47,6 +46,7 @@ import { ServiceCollection } from '../../../../platform/instantiation/common/ser
 import { IBaseActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { IManagedHoverTooltipMarkdownString } from '../../../../base/browser/ui/hover/hover.js';
+import { applyDragImage } from '../../../../base/browser/ui/dnd/dnd.js';
 
 export class EditorCommandsContextActionRunner extends ActionRunner {
 
@@ -317,7 +317,7 @@ export abstract class EditorTabsControl extends Themable implements IEditorTabsC
 				label = localize('draggedEditorGroup', "{0} (+{1})", label, this.groupView.count - 1);
 			}
 
-			applyDragImage(e, label, 'monaco-editor-group-drag-image', this.getColor(listActiveSelectionBackground), this.getColor(listActiveSelectionForeground));
+			applyDragImage(e, element, label);
 		}
 
 		return isNewWindowOperation;
diff --git a/src/vs/workbench/browser/parts/editor/media/editortabscontrol.css b/src/vs/workbench/browser/parts/editor/media/editortabscontrol.css
index aa684a520bb4..37b90640ac59 100644
--- a/src/vs/workbench/browser/parts/editor/media/editortabscontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/editortabscontrol.css
@@ -42,21 +42,3 @@
 .monaco-workbench .part.editor > .content .editor-group-container > .title.tabs .monaco-icon-label::after {
 	margin-right: 0; /* by default the icon label has a padding right and this isn't wanted when not showing tabs and not showing breadcrumbs */
 }
-
-/* Drag and Drop */
-
-.monaco-editor-group-drag-image {
-	display: inline-block;
-	padding: 1px 7px;
-	border-radius: 10px;
-	font-size: 12px;
-	position: absolute;
-	/*
-	 * Browsers apply an effect to the drag image when the div becomes too
-	 * large which makes them unreadable. Use max width so it does not happen
-	 */
-	max-width: 120px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
diff --git a/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts b/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
index b6cbb625b7a3..04f6aefec26f 100644
--- a/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
@@ -27,7 +27,7 @@ import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
 import { getOrSet } from '../../../../base/common/map.js';
 import { IThemeService, registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
 import { TAB_INACTIVE_BACKGROUND, TAB_ACTIVE_BACKGROUND, TAB_BORDER, EDITOR_DRAG_AND_DROP_BACKGROUND, TAB_UNFOCUSED_ACTIVE_BACKGROUND, TAB_UNFOCUSED_ACTIVE_BORDER, TAB_ACTIVE_BORDER, TAB_HOVER_BACKGROUND, TAB_HOVER_BORDER, TAB_UNFOCUSED_HOVER_BACKGROUND, TAB_UNFOCUSED_HOVER_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, WORKBENCH_BACKGROUND, TAB_ACTIVE_BORDER_TOP, TAB_UNFOCUSED_ACTIVE_BORDER_TOP, TAB_ACTIVE_MODIFIED_BORDER, TAB_INACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_ACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_INACTIVE_MODIFIED_BORDER, TAB_UNFOCUSED_INACTIVE_BACKGROUND, TAB_HOVER_FOREGROUND, TAB_UNFOCUSED_HOVER_FOREGROUND, EDITOR_GROUP_HEADER_TABS_BORDER, TAB_LAST_PINNED_BORDER, TAB_SELECTED_BORDER_TOP } from '../../../common/theme.js';
-import { activeContrastBorder, contrastBorder, editorBackground, listActiveSelectionBackground, listActiveSelectionForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { activeContrastBorder, contrastBorder, editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
 import { ResourcesDropHandler, DraggedEditorIdentifier, DraggedEditorGroupIdentifier, extractTreeDropData, isWindowDraggedOver } from '../../dnd.js';
 import { Color } from '../../../../base/common/color.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
@@ -57,7 +57,7 @@ import { StickyEditorGroupModel, UnstickyEditorGroupModel } from '../../../commo
 import { IReadonlyEditorGroupModel } from '../../../common/editor/editorGroupModel.js';
 import { IHostService } from '../../../services/host/browser/host.js';
 import { BugIndicatingError } from '../../../../base/common/errors.js';
-import { applyDragImage } from '../../../../base/browser/dnd.js';
+import { applyDragImage } from '../../../../base/browser/ui/dnd/dnd.js';
 
 interface IEditorInputLabel {
 	readonly editor: EditorInput;
@@ -1083,7 +1083,7 @@ export class MultiEditorTabsControl extends EditorTabsControl {
 					e.dataTransfer.effectAllowed = 'copyMove';
 					if (selectedEditors.length > 1) {
 						const label = `${editor.getName()} + ${selectedEditors.length - 1}`;
-						applyDragImage(e, label, 'monaco-editor-group-drag-image', this.getColor(listActiveSelectionBackground), this.getColor(listActiveSelectionForeground));
+						applyDragImage(e, tab, label);
 					} else {
 						e.dataTransfer.setDragImage(tab, 0, 0); // top left corner of dragged tab set to cursor position to make room for drop-border feedback
 					}
diff --git a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
index 37a6a4d2b4a9..5cd62062e26f 100644
--- a/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
+++ b/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.ts
@@ -511,14 +511,14 @@ export class NotebookTextDiffList extends WorkbenchList<IDiffElementViewModelBas
 
 		if (styles.listFocusAndSelectionBackground) {
 			content.push(`
-				.monaco-drag-image,
+				.monaco-drag-image${suffix},
 				.monaco-list${suffix}:focus > div.monaco-scrollable-element > .monaco-list-rows > .monaco-list-row.selected.focused { background-color: ${styles.listFocusAndSelectionBackground}; }
 			`);
 		}
 
 		if (styles.listFocusAndSelectionForeground) {
 			content.push(`
-				.monaco-drag-image,
+				.monaco-drag-image${suffix},
 				.monaco-list${suffix}:focus > div.monaco-scrollable-element > .monaco-list-rows > .monaco-list-row.selected.focused { color: ${styles.listFocusAndSelectionForeground}; }
 			`);
 		}
@@ -551,7 +551,7 @@ export class NotebookTextDiffList extends WorkbenchList<IDiffElementViewModelBas
 
 		if (styles.listFocusOutline) {
 			content.push(`
-				.monaco-drag-image,
+				.monaco-drag-image${suffix},
 				.monaco-list${suffix}:focus > div.monaco-scrollable-element > .monaco-list-rows > .monaco-list-row.focused { outline: 1px solid ${styles.listFocusOutline}; outline-offset: -1px; }
 			`);
 		}
diff --git a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
index eea24dd3d151..ff0678e8b251 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.ts
@@ -1347,14 +1347,14 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 
 		if (styles.listFocusAndSelectionBackground) {
 			content.push(`
-				.monaco-drag-image,
+				.monaco-drag-image${suffix},
 				.monaco-list${suffix}:focus > div.monaco-scrollable-element > .monaco-list-rows > .monaco-list-row.selected.focused { background-color: ${styles.listFocusAndSelectionBackground}; }
 			`);
 		}
 
 		if (styles.listFocusAndSelectionForeground) {
 			content.push(`
-				.monaco-drag-image,
+				.monaco-drag-image${suffix},
 				.monaco-list${suffix}:focus > div.monaco-scrollable-element > .monaco-list-rows > .monaco-list-row.selected.focused { color: ${styles.listFocusAndSelectionForeground}; }
 			`);
 		}
@@ -1387,7 +1387,7 @@ export class NotebookCellList extends WorkbenchList<CellViewModel> implements ID
 
 		if (styles.listFocusOutline) {
 			content.push(`
-				.monaco-drag-image,
+				.monaco-drag-image${suffix},
 				.monaco-list${suffix}:focus > div.monaco-scrollable-element > .monaco-list-rows > .monaco-list-row.focused { outline: 1px solid ${styles.listFocusOutline}; outline-offset: -1px; }
 			`);
 		}
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts b/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
index 98702b1b4a78..c6f874d2938f 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
@@ -8,6 +8,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 { Button } from '../../../../base/browser/ui/button/button.js';
+import { applyDragImage } from '../../../../base/browser/ui/dnd/dnd.js';
 import { InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
 import { SelectBox } from '../../../../base/browser/ui/selectBox/selectBox.js';
 import { Toggle, unthemedToggleStyles } from '../../../../base/browser/ui/toggle/toggle.js';
@@ -506,12 +507,6 @@ export class ListSettingWidget<TListDataItem extends IListDataItem> extends Abst
 
 	private dragDetails: ListSettingWidgetDragDetails<TListDataItem> | undefined;
 
-	private getDragImage(item: TListDataItem): HTMLElement {
-		const dragImage = $('.monaco-drag-image');
-		dragImage.textContent = item.value.data;
-		return dragImage;
-	}
-
 	protected renderItem(item: TListDataItem, idx: number): RowElementGroup {
 		const rowElement = $('.setting-list-row');
 		const valueElement = DOM.append(rowElement, $('.setting-list-value'));
@@ -539,13 +534,8 @@ export class ListSettingWidget<TListDataItem extends IListDataItem> extends Abst
 				item,
 				itemIndex: idx
 			};
-			if (ev.dataTransfer) {
-				ev.dataTransfer.dropEffect = 'move';
-				const dragImage = this.getDragImage(item);
-				rowElement.ownerDocument.body.appendChild(dragImage);
-				ev.dataTransfer.setDragImage(dragImage, -10, -10);
-				setTimeout(() => dragImage.remove(), 0);
-			}
+
+			applyDragImage(ev, rowElement, item.value.data);
 		}));
 		this.listDisposables.add(DOM.addDisposableListener(rowElement, DOM.EventType.DRAG_OVER, (ev) => {
 			if (!this.dragDetails) {

From fa48b788cfbefda4bab1b20179185ebd178a174b Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Mon, 17 Mar 2025 12:45:44 +0100
Subject: [PATCH 0990/1815] String inside an array isn't colored correctly
 (#243742)

Fixes #243345
---
 src/vs/editor/common/languages/highlights/typescript.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/common/languages/highlights/typescript.scm b/src/vs/editor/common/languages/highlights/typescript.scm
index 7b789592f614..813ce090dcc9 100644
--- a/src/vs/editor/common/languages/highlights/typescript.scm
+++ b/src/vs/editor/common/languages/highlights/typescript.scm
@@ -19,10 +19,10 @@
 (escape_sequence) @constant.character.escape.ts
 
 ((string) @string.quoted.single.ts
-  (#match? @string.quoted.single.ts "^'[^']*'$"))
+  (#match? @string.quoted.single.ts "^'.*'$"))
 
 ((string) @string.quoted.double.ts
-  (#match? @string.quoted.double.ts "^\"[^\"]*\"$"))
+  (#match? @string.quoted.double.ts "^\".*\"$"))
 
 ([
   (template_string)

From b245a2da69a2b93a29dd266722fe44560658103f Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Mon, 17 Mar 2025 13:11:54 +0100
Subject: [PATCH 0991/1815] Fixes #241147 (#243743)

---
 .../browser/mergeEditorInputModel.ts          | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts
index c0c4acc617b7..a110faf6a993 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { assertFn } from '../../../../base/common/assert.js';
-import { BugIndicatingError } from '../../../../base/common/errors.js';
+import { BugIndicatingError, onUnexpectedError } from '../../../../base/common/errors.js';
 import { Event } from '../../../../base/common/event.js';
-import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.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 Severity from '../../../../base/common/severity.js';
@@ -27,6 +27,8 @@ import { MergeEditorTelemetry } from './telemetry.js';
 import { StorageCloseWithConflicts } from '../common/mergeEditor.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { ITextFileEditorModel, ITextFileSaveOptions, ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
 
 export interface MergeEditorArgs {
 	base: URI;
@@ -273,6 +275,8 @@ export class WorkspaceMergeEditorModeFactory implements IMergeEditorInputModelFa
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@ITextModelService private readonly _textModelService: ITextModelService,
 		@ITextFileService private readonly textFileService: ITextFileService,
+		@IModelService private readonly _modelService: IModelService,
+		@ILanguageService private readonly _languageService: ILanguageService,
 	) {
 	}
 
@@ -292,18 +296,33 @@ export class WorkspaceMergeEditorModeFactory implements IMergeEditorInputModelFa
 		modelListener.add(this.textFileService.files.onDidCreate(handleDidCreate));
 		this.textFileService.files.models.forEach(handleDidCreate);
 
-		const [
+		let [
 			base,
 			result,
 			input1Data,
 			input2Data,
 		] = await Promise.all([
-			this._textModelService.createModelReference(args.base),
+			this._textModelService.createModelReference(args.base).then<IReference<ITextModel>>(v => ({
+				object: v.object.textEditorModel,
+				dispose: () => v.dispose(),
+			})).catch(e => {
+				onUnexpectedError(e);
+				console.error(e); // Only file not found error should be handled ideally
+				return undefined;
+			}),
 			this._textModelService.createModelReference(args.result),
 			toInputData(args.input1, this._textModelService, store),
 			toInputData(args.input2, this._textModelService, store),
 		]);
 
+		if (base === undefined) {
+			const tm = this._modelService.createModel('', this._languageService.createById(result.object.getLanguageId()));
+			base = {
+				dispose: () => { tm.dispose(); },
+				object: tm
+			};
+		}
+
 		store.add(base);
 		store.add(result);
 
@@ -321,7 +340,7 @@ export class WorkspaceMergeEditorModeFactory implements IMergeEditorInputModelFa
 
 		const model = this._instantiationService.createInstance(
 			MergeEditorModel,
-			base.object.textEditorModel,
+			base.object,
 			input1Data,
 			input2Data,
 			result.object.textEditorModel,

From e3e0347a0906c5df44643d22f22b5247bceca71b Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Mon, 17 Mar 2025 13:20:42 +0100
Subject: [PATCH 0992/1815] Tree Sitter throws after switching branch (#243740)

Fixes #243724
---
 .../services/treeSitter/browser/treeSitterCodeEditors.ts    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterCodeEditors.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterCodeEditors.ts
index 62abcbb881c2..e8df3a5f6a84 100644
--- a/src/vs/workbench/services/treeSitter/browser/treeSitterCodeEditors.ts
+++ b/src/vs/workbench/services/treeSitter/browser/treeSitterCodeEditors.ts
@@ -100,7 +100,11 @@ export class TreeSitterCodeEditors extends Disposable {
 
 	private async _onViewportChange(editor: ICodeEditor): Promise<void> {
 		const ranges = this._nonIntersectingViewPortRanges(editor);
-		this._onDidChangeViewport.fire({ model: editor.getModel()!, ranges });
+		const model = await this.getEditorModel(editor);
+		if (!model) {
+			return;
+		}
+		this._onDidChangeViewport.fire({ model: model, ranges });
 	}
 
 	private _nonIntersectingViewPortRanges(editor: ICodeEditor) {

From 2b5460278d13f0657f37b7c95e1cde43daf1f6d1 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Mon, 17 Mar 2025 13:26:13 +0100
Subject: [PATCH 0993/1815] prep: rewriting sticky scroll for variable line
 height adoption (#243745)

refactoring editor sticky scroll for line height issue
---
 .../stickyScroll/browser/stickyScroll.css     |  3 +++
 .../browser/stickyScrollController.ts         | 21 ++++++-------------
 .../browser/stickyScrollProvider.ts           | 13 +++++++-----
 .../browser/stickyScrollWidget.ts             | 17 ++++++++-------
 .../test/browser/stickyScroll.test.ts         |  6 +++---
 5 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css b/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
index 12480664119e..aa580483cdad 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
@@ -50,6 +50,9 @@
 .monaco-editor .sticky-line-number-inner {
 	display: inline-block;
 	text-align: right;
+	line-height: normal;
+	position: absolute;
+	bottom: 0;
 }
 
 .monaco-editor .sticky-widget {
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
index 38e4419456bc..c407471b340f 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
@@ -584,7 +584,6 @@ export class StickyScrollController extends Disposable implements IEditorContrib
 	}
 
 	findScrollWidgetState(): StickyScrollWidgetState {
-		const lineHeight: number = this._editor.getOption(EditorOption.lineHeight);
 		const maxNumberStickyLines = Math.min(this._maxStickyLines, this._editor.getOption(EditorOption.stickyScroll).maxLineCount);
 		const scrollTop: number = this._editor.getScrollTop();
 		let lastLineRelativePosition: number = 0;
@@ -597,26 +596,18 @@ export class StickyScrollController extends Disposable implements IEditorContrib
 			for (const range of candidateRanges) {
 				const start = range.startLineNumber;
 				const end = range.endLineNumber;
-				const depth = range.nestingDepth;
 				if (end - start > 0) {
-					const topOfElementAtDepth = (depth - 1) * lineHeight;
-					const bottomOfElementAtDepth = depth * lineHeight;
+					const topOfElement = range.top;
+					const bottomOfElement = topOfElement + range.height;
 
-					const bottomOfBeginningLine = this._editor.getBottomForLineNumber(start) - scrollTop;
-					const topOfEndLine = this._editor.getTopForLineNumber(end) - scrollTop;
+					const topOfBeginningLine = this._editor.getTopForLineNumber(start) - scrollTop;
 					const bottomOfEndLine = this._editor.getBottomForLineNumber(end) - scrollTop;
-
-					if (topOfElementAtDepth > topOfEndLine && topOfElementAtDepth <= bottomOfEndLine) {
+					if (topOfElement > topOfBeginningLine && topOfElement <= bottomOfEndLine) {
 						startLineNumbers.push(start);
 						endLineNumbers.push(end + 1);
-						if (topOfElementAtDepth > bottomOfEndLine - lineHeight) {
-							lastLineRelativePosition = bottomOfEndLine - bottomOfElementAtDepth;
+						if (bottomOfElement > bottomOfEndLine) {
+							lastLineRelativePosition = bottomOfEndLine - bottomOfElement;
 						}
-						break;
-					}
-					else if (bottomOfElementAtDepth > bottomOfBeginningLine && bottomOfElementAtDepth <= bottomOfEndLine) {
-						startLineNumbers.push(start);
-						endLineNumbers.push(end + 1);
 					}
 					if (startLineNumbers.length === maxNumberStickyLines) {
 						break;
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.ts
index 77cd911f9f46..ff98493b58ee 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.ts
@@ -20,7 +20,8 @@ export class StickyLineCandidate {
 	constructor(
 		public readonly startLineNumber: number,
 		public readonly endLineNumber: number,
-		public readonly nestingDepth: number,
+		public readonly top: number,
+		public readonly height: number,
 	) { }
 }
 
@@ -150,6 +151,7 @@ export class StickyLineCandidateProvider extends Disposable implements IStickyLi
 		outlineModel: StickyElement,
 		result: StickyLineCandidate[],
 		depth: number,
+		top: number,
 		lastStartLineNumber: number
 	): void {
 		if (outlineModel.children.length === 0) {
@@ -177,11 +179,12 @@ export class StickyLineCandidateProvider extends Disposable implements IStickyLi
 				const childEndLine = child.range.endLineNumber;
 				if (range.startLineNumber <= childEndLine + 1 && childStartLine - 1 <= range.endLineNumber && childStartLine !== lastLine) {
 					lastLine = childStartLine;
-					result.push(new StickyLineCandidate(childStartLine, childEndLine - 1, depth + 1));
-					this.getCandidateStickyLinesIntersectingFromStickyModel(range, child, result, depth + 1, childStartLine);
+					const lineHeight = this._editor.getOption(EditorOption.lineHeight);
+					result.push(new StickyLineCandidate(childStartLine, childEndLine - 1, top, lineHeight));
+					this.getCandidateStickyLinesIntersectingFromStickyModel(range, child, result, depth + 1, top + lineHeight, childStartLine);
 				}
 			} else {
-				this.getCandidateStickyLinesIntersectingFromStickyModel(range, child, result, depth, lastStartLineNumber);
+				this.getCandidateStickyLinesIntersectingFromStickyModel(range, child, result, depth, top, lastStartLineNumber);
 			}
 		}
 	}
@@ -191,7 +194,7 @@ export class StickyLineCandidateProvider extends Disposable implements IStickyLi
 			return [];
 		}
 		let stickyLineCandidates: StickyLineCandidate[] = [];
-		this.getCandidateStickyLinesIntersectingFromStickyModel(range, this._model.element, stickyLineCandidates, 0, -1);
+		this.getCandidateStickyLinesIntersectingFromStickyModel(range, this._model.element, stickyLineCandidates, 0, 0, -1);
 		const hiddenRanges: Range[] | undefined = this._editor._getViewModel()?.getHiddenAreas();
 
 		if (hiddenRanges) {
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
index c672613d27fc..69ebc1f12841 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
@@ -307,6 +307,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 			actualInlineDecorations = [];
 		}
 
+		const lineHeight = this._lineHeight;
 		const renderLineInput: RenderLineInput = new RenderLineInput(true, true, lineRenderingData.content,
 			lineRenderingData.continuesWithWrappedLine,
 			lineRenderingData.isBasicASCII, lineRenderingData.containsRTL, 0,
@@ -332,14 +333,14 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 		lineHTMLNode.tabIndex = 0;
 		lineHTMLNode.className = 'sticky-line-content';
 		lineHTMLNode.classList.add(`stickyLine${line}`);
-		lineHTMLNode.style.lineHeight = `${this._lineHeight}px`;
+		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 = `${this._lineHeight}px`;
+		lineNumberHTMLNode.style.lineHeight = `${lineHeight}px`;
 		const lineNumbersWidth = layoutInfo.contentLeft;
 		lineNumberHTMLNode.style.width = `${lineNumbersWidth}px`;
 
@@ -350,7 +351,6 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 			innerLineNumberHTML.innerText = Math.abs(line - this._editor.getPosition()!.lineNumber).toString();
 		}
 		innerLineNumberHTML.className = 'sticky-line-number-inner';
-		innerLineNumberHTML.style.lineHeight = `${this._lineHeight}px`;
 		innerLineNumberHTML.style.width = `${layoutInfo.lineNumbersWidth}px`;
 		innerLineNumberHTML.style.paddingLeft = `${layoutInfo.lineNumbersLeft}px`;
 
@@ -365,12 +365,12 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 		this._editor.applyFontInfo(lineNumberHTMLNode);
 
 
-		lineNumberHTMLNode.style.lineHeight = `${this._lineHeight}px`;
-		lineHTMLNode.style.lineHeight = `${this._lineHeight}px`;
-		lineNumberHTMLNode.style.height = `${this._lineHeight}px`;
-		lineHTMLNode.style.height = `${this._lineHeight}px`;
+		lineNumberHTMLNode.style.lineHeight = `${lineHeight}px`;
+		lineHTMLNode.style.lineHeight = `${lineHeight}px`;
+		lineNumberHTMLNode.style.height = `${lineHeight}px`;
+		lineHTMLNode.style.height = `${lineHeight}px`;
 
-		const renderedLine = new RenderedStickyLine(index, line, lineHTMLNode, lineNumberHTMLNode, foldingIcon, renderOutput.characterMapping, lineHTMLNode.scrollWidth);
+		const renderedLine = new RenderedStickyLine(index, line, lineHTMLNode, lineNumberHTMLNode, foldingIcon, renderOutput.characterMapping, lineHTMLNode.scrollWidth, lineHeight);
 		return this._updateTopAndZIndexOfStickyLine(renderedLine);
 	}
 
@@ -516,6 +516,7 @@ class RenderedStickyLine {
 		public readonly foldingIcon: StickyFoldingIcon | undefined,
 		public readonly characterMapping: CharacterMapping,
 		public readonly scrollWidth: number,
+		public readonly height: number
 	) { }
 }
 
diff --git a/src/vs/editor/contrib/stickyScroll/test/browser/stickyScroll.test.ts b/src/vs/editor/contrib/stickyScroll/test/browser/stickyScroll.test.ts
index 7ac055817329..07493f907149 100644
--- a/src/vs/editor/contrib/stickyScroll/test/browser/stickyScroll.test.ts
+++ b/src/vs/editor/contrib/stickyScroll/test/browser/stickyScroll.test.ts
@@ -148,9 +148,9 @@ suite('Sticky Scroll Tests', () => {
 				disposables.add(languageService.documentSymbolProvider.register('*', documentSymbolProviderForTestModel()));
 				const provider: StickyLineCandidateProvider = new StickyLineCandidateProvider(editor, languageService, languageConfigurationService);
 				await provider.update();
-				assert.deepStrictEqual(provider.getCandidateStickyLinesIntersecting({ startLineNumber: 1, endLineNumber: 4 }), [new StickyLineCandidate(1, 2, 1)]);
-				assert.deepStrictEqual(provider.getCandidateStickyLinesIntersecting({ startLineNumber: 8, endLineNumber: 10 }), [new StickyLineCandidate(7, 11, 1), new StickyLineCandidate(9, 11, 2), new StickyLineCandidate(10, 10, 3)]);
-				assert.deepStrictEqual(provider.getCandidateStickyLinesIntersecting({ startLineNumber: 10, endLineNumber: 13 }), [new StickyLineCandidate(7, 11, 1), new StickyLineCandidate(9, 11, 2), new StickyLineCandidate(10, 10, 3)]);
+				assert.deepStrictEqual(provider.getCandidateStickyLinesIntersecting({ startLineNumber: 1, endLineNumber: 4 }), [new StickyLineCandidate(1, 2, 0, 19)]);
+				assert.deepStrictEqual(provider.getCandidateStickyLinesIntersecting({ startLineNumber: 8, endLineNumber: 10 }), [new StickyLineCandidate(7, 11, 0, 19), new StickyLineCandidate(9, 11, 19, 19), new StickyLineCandidate(10, 10, 38, 19)]);
+				assert.deepStrictEqual(provider.getCandidateStickyLinesIntersecting({ startLineNumber: 10, endLineNumber: 13 }), [new StickyLineCandidate(7, 11, 0, 19), new StickyLineCandidate(9, 11, 19, 19), new StickyLineCandidate(10, 10, 38, 19)]);
 
 				provider.dispose();
 				model.dispose();

From 072494a374e5ed63c9f39b40481fb65d32507fdb Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Mon, 17 Mar 2025 13:49:37 +0100
Subject: [PATCH 0994/1815] WIP - render input being tool confirmation title

---
 .../chatConfirmationWidget.ts                 | 36 +++++++++++++++++--
 .../chatToolInvocationPart.ts                 | 16 +++++----
 .../media/chatConfirmationWidget.css          | 34 ++++++++++++++++++
 .../chat/common/languageModelToolsService.ts  |  1 +
 .../contrib/mcp/common/mcpService.ts          |  7 ++--
 5 files changed, 82 insertions(+), 12 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
index 7bdb9b234992..f95fd944049a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
@@ -12,6 +12,8 @@ import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
+import { renderIcon } from '../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Codicon } from '../../../../../base/common/codicons.js';
 
 export interface IChatConfirmationButton {
 	label: string;
@@ -41,13 +43,18 @@ abstract class BaseChatConfirmationWidget extends Disposable {
 
 	constructor(
 		title: string,
+		rawInput: object | undefined,
 		buttons: IChatConfirmationButton[],
 		@IInstantiationService protected readonly instantiationService: IInstantiationService,
 	) {
 		super();
 
 		const elements = dom.h('.chat-confirmation-widget@root', [
-			dom.h('.chat-confirmation-widget-title@title'),
+			dom.h('.chat-confirmation-widget-title-container@titleContainer', [
+				dom.h('.chat-confirmation-widget-expando@expando'),
+				dom.h('.chat-confirmation-widget-title@title'),
+				dom.h('.chat-confirmation-widget-input-value@inputValue'),
+			]),
 			dom.h('.chat-confirmation-widget-message@message'),
 			dom.h('.chat-confirmation-buttons-container@buttonsContainer'),
 		]);
@@ -58,6 +65,27 @@ abstract class BaseChatConfirmationWidget extends Disposable {
 			asyncRenderCallback: () => this._onDidChangeHeight.fire(),
 		}));
 		elements.title.append(renderedTitle.element);
+
+		elements.titleContainer.classList.toggle('input', !!rawInput);
+
+		if (rawInput) {
+
+			dom.reset(elements.expando, renderIcon(Codicon.chevronRight));
+
+			const inputMDStr = new MarkdownString().appendCodeblock('json', JSON.stringify(rawInput, undefined, 2));
+			const renderedInput = this._register(this.markdownRenderer.render(inputMDStr, { asyncRenderCallback: () => this._onDidChangeHeight.fire() }));
+			elements.inputValue.append(renderedInput.element);
+
+			let expanded = false;
+
+			this._register(dom.addStandardDisposableListener(elements.titleContainer, 'click', () => {
+				expanded = !expanded;
+				elements.titleContainer.classList.toggle('expanded', expanded);
+				this._onDidChangeHeight.fire();
+				dom.reset(elements.expando, expanded ? renderIcon(Codicon.chevronDown) : renderIcon(Codicon.chevronRight));
+			}));
+		}
+
 		this.messageElement = elements.message;
 		buttons.forEach(buttonData => {
 			const button = this._register(new Button(elements.buttonsContainer, { ...defaultButtonStyles, secondary: buttonData.isSecondary, title: buttonData.tooltip }));
@@ -75,10 +103,11 @@ export class ChatConfirmationWidget extends BaseChatConfirmationWidget {
 	constructor(
 		title: string,
 		private readonly message: string | IMarkdownString,
+		rawInput: object | undefined,
 		buttons: IChatConfirmationButton[],
 		@IInstantiationService instantiationService: IInstantiationService,
 	) {
-		super(title, buttons, instantiationService);
+		super(title, rawInput, buttons, instantiationService);
 
 		const renderedMessage = this._register(this.markdownRenderer.render(
 			typeof this.message === 'string' ? new MarkdownString(this.message) : this.message,
@@ -92,10 +121,11 @@ export class ChatCustomConfirmationWidget extends BaseChatConfirmationWidget {
 	constructor(
 		title: string,
 		messageElement: HTMLElement,
+		rawInput: object | undefined,
 		buttons: IChatConfirmationButton[],
 		@IInstantiationService instantiationService: IInstantiationService,
 	) {
-		super(title, buttons, instantiationService);
+		super(title, rawInput, buttons, instantiationService);
 		this.renderMessage(messageElement);
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
index d9070aa16184..c1b412df2e73 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.ts
@@ -9,6 +9,7 @@ import { Emitter } from '../../../../../base/common/event.js';
 import { IMarkdownString, MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { Disposable, DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { assertType } from '../../../../../base/common/types.js';
 import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { ILanguageService } from '../../../../../editor/common/languages/language.js';
 import { IModelService } from '../../../../../editor/common/services/model.js';
@@ -153,11 +154,12 @@ class ChatToolInvocationSubPart extends Disposable {
 	}
 
 	private createConfirmationWidget(toolInvocation: IChatToolInvocation): HTMLElement {
-		if (!toolInvocation.confirmationMessages) {
-			throw new Error('Confirmation messages are missing');
-		}
+		assertType(toolInvocation.confirmationMessages, 'Confirmation messages are missing');
+
 		const title = toolInvocation.confirmationMessages.title;
 		const message = toolInvocation.confirmationMessages.message;
+		const toolInput = toolInvocation.confirmationMessages.toolInput;
+
 		const continueLabel = localize('continue', "Continue");
 		const continueKeybinding = this.keybindingService.lookupKeybinding(AcceptToolConfirmationActionId)?.getLabel();
 		const continueTooltip = continueKeybinding ? `${continueLabel} (${continueKeybinding})` : continueLabel;
@@ -183,6 +185,7 @@ class ChatToolInvocationSubPart extends Disposable {
 				ChatConfirmationWidget,
 				title,
 				message,
+				toolInput,
 				buttons
 			));
 		} else {
@@ -204,6 +207,7 @@ class ChatToolInvocationSubPart extends Disposable {
 				ChatCustomConfirmationWidget,
 				title,
 				this.markdownPart.domNode,
+				toolInput,
 				buttons
 			));
 		}
@@ -219,9 +223,8 @@ class ChatToolInvocationSubPart extends Disposable {
 	}
 
 	private createTerminalConfirmationWidget(toolInvocation: IChatToolInvocation, terminalData: IChatTerminalToolInvocationData): HTMLElement {
-		if (!toolInvocation.confirmationMessages) {
-			throw new Error('Confirmation messages are missing');
-		}
+		assertType(toolInvocation.confirmationMessages, 'Confirmation messages are missing');
+
 		const title = toolInvocation.confirmationMessages.title;
 		const message = toolInvocation.confirmationMessages.message;
 		const continueLabel = localize('continue', "Continue");
@@ -291,6 +294,7 @@ class ChatToolInvocationSubPart extends Disposable {
 			ChatCustomConfirmationWidget,
 			title,
 			element,
+			undefined,
 			buttons
 		));
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css b/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css
index 4d711ebf7838..b8b7e1bab5bd 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css
@@ -39,3 +39,37 @@
 .chat-confirmation-widget.hideButtons .chat-confirmation-buttons-container {
 	display: none;
 }
+
+.chat-confirmation-widget .chat-confirmation-widget-title-container.input {
+	cursor: pointer;
+	display: flex;
+	flex-wrap: wrap;
+}
+
+.chat-confirmation-widget .chat-confirmation-widget-title-container.input .chat-confirmation-widget-title {
+	display: inline-flex;
+}
+
+.chat-confirmation-widget .chat-confirmation-widget-title-container .chat-confirmation-widget-expando {
+	display: none;
+}
+
+.chat-confirmation-widget .chat-confirmation-widget-title-container.input .chat-confirmation-widget-expando {
+	display: inline-flex;
+}
+
+.chat-confirmation-widget .chat-confirmation-widget-title-container .chat-confirmation-widget-input-value {
+	display: none;
+	flex-basis: 100%;
+	width: 100%;
+}
+
+.chat-confirmation-widget .chat-confirmation-widget-title-container .chat-confirmation-widget-input-value .rendered-markdown{
+	width: 100%;
+}
+
+.chat-confirmation-widget .chat-confirmation-widget-title-container.expanded .chat-confirmation-widget-input-value {
+	display: inherit;
+	overflow: scroll;
+	max-height: 400px;
+}
diff --git a/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
index 4e8731110146..24869cbc2b61 100644
--- a/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
+++ b/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
@@ -68,6 +68,7 @@ export interface IToolResultTextPart {
 export interface IToolConfirmationMessages {
 	title: string;
 	message: string | IMarkdownString;
+	toolInput?: object;
 }
 
 export interface IPreparedToolInvocation {
diff --git a/src/vs/workbench/contrib/mcp/common/mcpService.ts b/src/vs/workbench/contrib/mcp/common/mcpService.ts
index 5845db905843..8def1af9e27b 100644
--- a/src/vs/workbench/contrib/mcp/common/mcpService.ts
+++ b/src/vs/workbench/contrib/mcp/common/mcpService.ts
@@ -14,7 +14,7 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { StorageScope } from '../../../../platform/storage/common/storage.js';
-import { CountTokensCallback, ILanguageModelToolsService, IToolData, IToolImpl, IToolInvocation, IToolResult } from '../../chat/common/languageModelToolsService.js';
+import { CountTokensCallback, ILanguageModelToolsService, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolResult } from '../../chat/common/languageModelToolsService.js';
 import { IMcpRegistry } from './mcpRegistryTypes.js';
 import { McpServer, McpServerMetadataCache } from './mcpServer.js';
 import { IMcpServer, IMcpService, IMcpTool, McpCollectionDefinition, McpServerDefinition, McpServerToolsState } from './mcpTypes.js';
@@ -217,11 +217,12 @@ class McpToolImplementation implements IToolImpl {
 		return {
 			confirmationMessages: {
 				title: localize('msg.title', "Run `{0}` from $(server) `{1}` (MCP server)", tool.definition.name, server.definition.label),
-				message: new MarkdownString(localize('msg.msg', "{0}\n\nInput:\n\n```json\n{1}\n```\n\n$(warning) {2}", tool.definition.description, JSON.stringify(parameters, undefined, 2), mcpToolWarning), { supportThemeIcons: true })
+				message: new MarkdownString(localize('msg.msg', "{0}\n\n$(warning) {1}", tool.definition.description, mcpToolWarning), { supportThemeIcons: true }),
+				toolInput: parameters
 			},
 			invocationMessage: new MarkdownString(localize('msg.run', "Running `{0}`", tool.definition.name, server.definition.label)),
 			pastTenseMessage: new MarkdownString(localize('msg.ran', "Ran `{0}` ", tool.definition.name, server.definition.label))
-		};
+		} satisfies IPreparedToolInvocation;
 	}
 
 	async invoke(invocation: IToolInvocation, _countTokens: CountTokensCallback, token: CancellationToken) {

From a85f319c368d914b12ed9546694cbe93bba8297d Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Fri, 5 Sep 2025 00:40:50 -0600
Subject: [PATCH 0995/1815] Update dependabot.yml

Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .github/dependabot.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5ace4600a1f2..a49bf40fff10 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,3 +4,4 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+ 

From e476af60db1c94c50a23e021e61f977bb069ac00 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Sep 2025 06:58:05 +0000
Subject: [PATCH 0996/1815] Bump actions/setup-python from 5 to 6

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5 to 6.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 344213e0ca88..ab3984507df2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           node-version-file: .nvmrc
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.x"
 

From 1a24e1521bd1a4118a8d7732081a7f583ed0a47a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Sep 2025 06:58:32 +0000
Subject: [PATCH 0997/1815] Bump actions/setup-node from 4 to 5

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4 to 5.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/basic.yml         | 6 +++---
 .github/workflows/ci.yml            | 8 ++++----
 .github/workflows/monaco-editor.yml | 2 +-
 .github/workflows/telemetry.yml     | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
index d5f166a4aae8..f286d3b6bf86 100644
--- a/.github/workflows/basic.yml
+++ b/.github/workflows/basic.yml
@@ -29,7 +29,7 @@ jobs:
           sudo update-rc.d xvfb defaults
           sudo service xvfb start
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version-file: .nvmrc
 
@@ -81,7 +81,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version-file: .nvmrc
 
@@ -144,7 +144,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version-file: .nvmrc
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 344213e0ca88..c63a7e811657 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version-file: .nvmrc
 
@@ -114,7 +114,7 @@ jobs:
           sudo update-rc.d xvfb defaults
           sudo service xvfb start
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version-file: .nvmrc
 
@@ -186,7 +186,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version-file: .nvmrc
 
@@ -259,7 +259,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version-file: .nvmrc
 
diff --git a/.github/workflows/monaco-editor.yml b/.github/workflows/monaco-editor.yml
index 426999ce43b4..61dc4c5a7d77 100644
--- a/.github/workflows/monaco-editor.yml
+++ b/.github/workflows/monaco-editor.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version-file: .nvmrc
 
diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml
index d29ea6c58dac..eb42d280911d 100644
--- a/.github/workflows/telemetry.yml
+++ b/.github/workflows/telemetry.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: 'actions/checkout@v4'
 
-      - uses: 'actions/setup-node@v4'
+      - uses: 'actions/setup-node@v5'
         with:
           node-version: 'lts/*'
 

From 0f31371879c17a74b35fa6ef4e401af0041ccccc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Sep 2025 21:23:36 +0000
Subject: [PATCH 0998/1815] Bump the npm_and_yarn group across 14 directories
 with 12 updates

Bumps the npm_and_yarn group with 11 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [electron](https://github.com/electron/electron) | `34.3.2` | `35.7.5` |
| [postcss](https://github.com/postcss/postcss) | `8.4.38` | `8.4.39` |
| [xml2js](https://github.com/Leonidas-from-XIV/node-xml2js) | `0.5.0` | `0.6.0` |
| [brace-expansion](https://github.com/juliangruber/brace-expansion) | `1.1.11` | `1.1.12` |
| [form-data](https://github.com/form-data/form-data) | `3.0.1` | `3.0.4` |
| [form-data](https://github.com/form-data/form-data) | `4.0.0` | `4.0.4` |
| [braces](https://github.com/micromatch/braces) | `2.3.2` | `3.0.3` |
| [gulp](https://github.com/gulpjs/gulp) | `4.0.2` | `5.0.1` |
| [on-headers](https://github.com/jshttp/on-headers) | `1.0.2` | `1.1.0` |
| [morgan](https://github.com/expressjs/morgan) | `1.10.0` | `1.10.1` |
| [tar-fs](https://github.com/mafintosh/tar-fs) | `2.1.1` | `2.1.3` |
| [tar-fs](https://github.com/mafintosh/tar-fs) | `3.0.6` | `3.1.0` |
| [undici](https://github.com/nodejs/undici) | `7.2.3` | `7.15.0` |

Bumps the npm_and_yarn group with 3 updates in the /build directory: [brace-expansion](https://github.com/juliangruber/brace-expansion), [tar-fs](https://github.com/mafintosh/tar-fs) and [tmp](https://github.com/raszi/node-tmp).
Bumps the npm_and_yarn group with 1 update in the /extensions/css-language-features directory: [brace-expansion](https://github.com/juliangruber/brace-expansion).
Bumps the npm_and_yarn group with 1 update in the /extensions/github-authentication directory: [form-data](https://github.com/form-data/form-data).
Bumps the npm_and_yarn group with 1 update in the /extensions/html-language-features directory: [brace-expansion](https://github.com/juliangruber/brace-expansion).
Bumps the npm_and_yarn group with 1 update in the /extensions/json-language-features directory: [brace-expansion](https://github.com/juliangruber/brace-expansion).
Bumps the npm_and_yarn group with 1 update in the /extensions/markdown-language-features directory: [brace-expansion](https://github.com/juliangruber/brace-expansion).
Bumps the npm_and_yarn group with 1 update in the /extensions/microsoft-authentication directory: [form-data](https://github.com/form-data/form-data).
Bumps the npm_and_yarn group with 1 update in the /extensions/notebook-renderers directory: [form-data](https://github.com/form-data/form-data).
Bumps the npm_and_yarn group with 1 update in the /extensions/npm directory: [brace-expansion](https://github.com/juliangruber/brace-expansion).
Bumps the npm_and_yarn group with 2 updates in the /remote directory: [tar-fs](https://github.com/mafintosh/tar-fs) and [undici](https://github.com/nodejs/undici).
Bumps the npm_and_yarn group with 2 updates in the /test/automation directory: [brace-expansion](https://github.com/juliangruber/brace-expansion) and [tmp](https://github.com/raszi/node-tmp).
Bumps the npm_and_yarn group with 2 updates in the /test/integration/browser directory: [brace-expansion](https://github.com/juliangruber/brace-expansion) and [tmp](https://github.com/raszi/node-tmp).
Bumps the npm_and_yarn group with 2 updates in the /test/smoke directory: [brace-expansion](https://github.com/juliangruber/brace-expansion) and [form-data](https://github.com/form-data/form-data).


Updates `electron` from 34.3.2 to 35.7.5
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v34.3.2...v35.7.5)

Updates `postcss` from 8.4.38 to 8.4.39
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.38...8.4.39)

Updates `xml2js` from 0.5.0 to 0.6.0
- [Commits](https://github.com/Leonidas-from-XIV/node-xml2js/compare/0.5.0...0.6.0)

Updates `brace-expansion` from 1.1.11 to 1.1.12
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.12)

Updates `form-data` from 3.0.1 to 3.0.4
- [Release notes](https://github.com/form-data/form-data/releases)
- [Changelog](https://github.com/form-data/form-data/blob/v3.0.4/CHANGELOG.md)
- [Commits](https://github.com/form-data/form-data/compare/v3.0.1...v3.0.4)

Updates `form-data` from 4.0.0 to 4.0.4
- [Release notes](https://github.com/form-data/form-data/releases)
- [Changelog](https://github.com/form-data/form-data/blob/v3.0.4/CHANGELOG.md)
- [Commits](https://github.com/form-data/form-data/compare/v3.0.1...v3.0.4)

Updates `braces` from 2.3.2 to 3.0.3
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/commits/3.0.3)

Updates `gulp` from 4.0.2 to 5.0.1
- [Release notes](https://github.com/gulpjs/gulp/releases)
- [Changelog](https://github.com/gulpjs/gulp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gulpjs/gulp/compare/v4.0.2...v5.0.1)

Updates `on-headers` from 1.0.2 to 1.1.0
- [Release notes](https://github.com/jshttp/on-headers/releases)
- [Changelog](https://github.com/jshttp/on-headers/blob/master/HISTORY.md)
- [Commits](https://github.com/jshttp/on-headers/compare/v1.0.2...v1.1.0)

Updates `morgan` from 1.10.0 to 1.10.1
- [Release notes](https://github.com/expressjs/morgan/releases)
- [Changelog](https://github.com/expressjs/morgan/blob/master/HISTORY.md)
- [Commits](https://github.com/expressjs/morgan/compare/1.10.0...1.10.1)

Updates `tar-fs` from 2.1.1 to 2.1.3
- [Commits](https://github.com/mafintosh/tar-fs/compare/v2.1.1...v2.1.3)

Updates `tar-fs` from 3.0.6 to 3.1.0
- [Commits](https://github.com/mafintosh/tar-fs/compare/v2.1.1...v2.1.3)

Updates `undici` from 7.2.3 to 7.15.0
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](https://github.com/nodejs/undici/compare/v7.2.3...v7.15.0)

Updates `brace-expansion` from 1.1.11 to 1.1.12
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.12)

Updates `brace-expansion` from 2.0.1 to 2.0.2
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.12)

Updates `tar-fs` from 2.1.1 to 2.1.3
- [Commits](https://github.com/mafintosh/tar-fs/compare/v2.1.1...v2.1.3)

Updates `tmp` from 0.2.3 to 0.2.5
- [Changelog](https://github.com/raszi/node-tmp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/raszi/node-tmp/compare/v0.2.3...v0.2.5)

Updates `brace-expansion` from 2.0.1 to 2.0.2
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.12)

Updates `form-data` from 3.0.0 to 3.0.4
- [Release notes](https://github.com/form-data/form-data/releases)
- [Changelog](https://github.com/form-data/form-data/blob/v3.0.4/CHANGELOG.md)
- [Commits](https://github.com/form-data/form-data/compare/v3.0.1...v3.0.4)

Updates `brace-expansion` from 2.0.1 to 2.0.2
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.12)

Updates `brace-expansion` from 2.0.1 to 2.0.2
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.12)

Updates `brace-expansion` from 1.1.11 to 1.1.12
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.12)

Updates `form-data` from 3.0.0 to 3.0.4
- [Release notes](https://github.com/form-data/form-data/releases)
- [Changelog](https://github.com/form-data/form-data/blob/v3.0.4/CHANGELOG.md)
- [Commits](https://github.com/form-data/form-data/compare/v3.0.1...v3.0.4)

Updates `form-data` from 4.0.0 to 4.0.4
- [Release notes](https://github.com/form-data/form-data/releases)
- [Changelog](https://github.com/form-data/form-data/blob/v3.0.4/CHANGELOG.md)
- [Commits](https://github.com/form-data/form-data/compare/v3.0.1...v3.0.4)

Updates `brace-expansion` from 2.0.1 to 2.0.2
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.12)

Updates `tar-fs` from 2.1.1 to 2.1.3
- [Commits](https://github.com/mafintosh/tar-fs/compare/v2.1.1...v2.1.3)

Updates `undici` from 7.3.0 to 7.15.0
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](https://github.com/nodejs/undici/compare/v7.2.3...v7.15.0)

Updates `brace-expansion` from 1.1.11 to 1.1.12
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.12)

Updates `tmp` from 0.2.1 to 0.2.4
- [Changelog](https://github.com/raszi/node-tmp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/raszi/node-tmp/compare/v0.2.3...v0.2.5)

Updates `brace-expansion` from 1.1.11 to 1.1.12
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.12)

Updates `tmp` from 0.0.33 to 0.2.4
- [Changelog](https://github.com/raszi/node-tmp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/raszi/node-tmp/compare/v0.2.3...v0.2.5)

Updates `brace-expansion` from 1.1.11 to 1.1.12
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.12)

Updates `form-data` from 3.0.1 to 3.0.4
- [Release notes](https://github.com/form-data/form-data/releases)
- [Changelog](https://github.com/form-data/form-data/blob/v3.0.4/CHANGELOG.md)
- [Commits](https://github.com/form-data/form-data/compare/v3.0.1...v3.0.4)

---
updated-dependencies:
- dependency-name: electron
  dependency-version: 35.7.5
  dependency-type: direct:development
  dependency-group: npm_and_yarn
- dependency-name: postcss
  dependency-version: 8.4.39
  dependency-type: direct:development
  dependency-group: npm_and_yarn
- dependency-name: xml2js
  dependency-version: 0.6.0
  dependency-type: direct:development
  dependency-group: npm_and_yarn
- dependency-name: brace-expansion
  dependency-version: 1.1.12
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: form-data
  dependency-version: 3.0.4
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: form-data
  dependency-version: 4.0.4
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: braces
  dependency-version: 3.0.3
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: gulp
  dependency-version: 5.0.1
  dependency-type: direct:development
  dependency-group: npm_and_yarn
- dependency-name: on-headers
  dependency-version: 1.1.0
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: morgan
  dependency-version: 1.10.1
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: tar-fs
  dependency-version: 2.1.3
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: tar-fs
  dependency-version: 3.1.0
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: undici
  dependency-version: 7.15.0
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: brace-expansion
  dependency-version: 1.1.12
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: brace-expansion
  dependency-version: 2.0.2
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: tar-fs
  dependency-version: 2.1.3
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: tmp
  dependency-version: 0.2.5
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: brace-expansion
  dependency-version: 2.0.2
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: form-data
  dependency-version: 3.0.4
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: brace-expansion
  dependency-version: 2.0.2
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: brace-expansion
  dependency-version: 2.0.2
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: brace-expansion
  dependency-version: 1.1.12
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: form-data
  dependency-version: 3.0.4
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: form-data
  dependency-version: 4.0.4
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: brace-expansion
  dependency-version: 2.0.2
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: tar-fs
  dependency-version: 2.1.3
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: undici
  dependency-version: 7.15.0
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: brace-expansion
  dependency-version: 1.1.12
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: tmp
  dependency-version: 0.2.4
  dependency-type: direct:production
  dependency-group: npm_and_yarn
- dependency-name: brace-expansion
  dependency-version: 1.1.12
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: tmp
  dependency-version: 0.2.4
  dependency-type: direct:development
  dependency-group: npm_and_yarn
- dependency-name: brace-expansion
  dependency-version: 1.1.12
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: form-data
  dependency-version: 3.0.4
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json                       |   28 +-
 .../css-language-features/package-lock.json   |    7 +-
 .../github-authentication/package-lock.json   |  219 +-
 .../html-language-features/package-lock.json  |    7 +-
 .../json-language-features/package-lock.json  |    7 +-
 .../package-lock.json                         |    7 +-
 .../package-lock.json                         |  219 +-
 .../notebook-renderers/package-lock.json      |  201 +-
 extensions/npm/package-lock.json              |    7 +-
 package-lock.json                             | 4013 +++++------------
 package.json                                  |    8 +-
 remote/package-lock.json                      |   13 +-
 test/automation/package-lock.json             |   57 +-
 test/automation/package.json                  |    2 +-
 test/integration/browser/package-lock.json    |   30 +-
 test/integration/browser/package.json         |    2 +-
 test/smoke/package-lock.json                  |  220 +-
 17 files changed, 1906 insertions(+), 3141 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index aa939e40375f..940ab861a34d 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -1607,10 +1607,11 @@
       "optional": true
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "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"
@@ -4116,10 +4117,11 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz",
+      "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "chownr": "^1.1.1",
         "mkdirp-classic": "^0.5.2",
@@ -4190,10 +4192,11 @@
       }
     },
     "node_modules/tmp": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
-      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
+      "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=14.14"
       }
@@ -4417,10 +4420,11 @@
       }
     },
     "node_modules/vscode-universal-bundler/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "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"
       }
diff --git a/extensions/css-language-features/package-lock.json b/extensions/css-language-features/package-lock.json
index a645c2ab11af..cee5706d59db 100644
--- a/extensions/css-language-features/package-lock.json
+++ b/extensions/css-language-features/package-lock.json
@@ -34,9 +34,10 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "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"
       }
diff --git a/extensions/github-authentication/package-lock.json b/extensions/github-authentication/package-lock.json
index cbc9e16b75f3..2aa199e80407 100644
--- a/extensions/github-authentication/package-lock.json
+++ b/extensions/github-authentication/package-lock.json
@@ -191,6 +191,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",
@@ -212,36 +226,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/html-language-features/package-lock.json b/extensions/html-language-features/package-lock.json
index 20b145615338..b4c79e11ea3f 100644
--- a/extensions/html-language-features/package-lock.json
+++ b/extensions/html-language-features/package-lock.json
@@ -173,9 +173,10 @@
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg=="
     },
     "node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "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"
       }
diff --git a/extensions/json-language-features/package-lock.json b/extensions/json-language-features/package-lock.json
index bde80cbfbe47..458716c614f4 100644
--- a/extensions/json-language-features/package-lock.json
+++ b/extensions/json-language-features/package-lock.json
@@ -173,9 +173,10 @@
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg=="
     },
     "node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "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"
       }
diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index 63d93c4070a0..c0605808d40e 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -278,9 +278,10 @@
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 4aae40c5f170..69a49fe4a8c6 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -269,6 +269,20 @@
       "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
       "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
     },
+    "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",
@@ -290,6 +304,21 @@
         "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/ecdsa-sig-formatter": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
@@ -298,20 +327,176 @@
         "safe-buffer": "^5.0.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/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/jsonwebtoken": {
       "version": "9.0.2",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
@@ -391,22 +576,34 @@
       "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
       "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
     },
+    "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/notebook-renderers/package-lock.json b/extensions/notebook-renderers/package-lock.json
index 8dbc5f5ad4c2..7f7e0270ed27 100644
--- a/extensions/notebook-renderers/package-lock.json
+++ b/extensions/notebook-renderers/package-lock.json
@@ -111,6 +111,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",
@@ -200,6 +214,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",
@@ -212,6 +241,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",
@@ -272,19 +350,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.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": ">= 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",
@@ -400,6 +585,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/npm/package-lock.json b/extensions/npm/package-lock.json
index 4ee7ee7a0e34..49c2d76843e0 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -62,9 +62,10 @@
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg=="
     },
     "node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "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"
       }
diff --git a/package-lock.json b/package-lock.json
index a6f99636b8f6..d5f5fb23029e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -96,7 +96,7 @@
         "cssnano": "^6.0.3",
         "debounce": "^1.0.0",
         "deemon": "^1.8.0",
-        "electron": "34.3.2",
+        "electron": "35.7.5",
         "eslint": "^9.11.1",
         "eslint-formatter-compact": "^8.40.0",
         "eslint-plugin-header": "3.1.1",
@@ -106,7 +106,7 @@
         "fancy-log": "^1.3.3",
         "file-loader": "^6.2.0",
         "glob": "^5.0.13",
-        "gulp": "^4.0.0",
+        "gulp": "^5.0.1",
         "gulp-azure-storage": "^0.12.1",
         "gulp-bom": "^3.0.0",
         "gulp-buffer": "0.0.2",
@@ -140,7 +140,7 @@
         "os-browserify": "^0.3.0",
         "p-all": "^1.0.0",
         "path-browserify": "^1.0.1",
-        "postcss": "^8.4.33",
+        "postcss": "^8.4.39",
         "postcss-nesting": "^12.0.2",
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
@@ -160,7 +160,7 @@
         "webpack": "^5.94.0",
         "webpack-cli": "^5.1.4",
         "webpack-stream": "^7.0.0",
-        "xml2js": "^0.5.0",
+        "xml2js": "^0.6.0",
         "yaserver": "^0.4.0"
       },
       "optionalDependencies": {
@@ -318,15 +318,6 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/@azure/core-http/node_modules/xmlbuilder": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/@azure/core-lro": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.2.1.tgz",
@@ -1280,6 +1271,29 @@
         "xtend": "~4.0.1"
       }
     },
+    "node_modules/@gulpjs/messages": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@gulpjs/messages/-/messages-1.1.0.tgz",
+      "integrity": "sha512-Ys9sazDatyTgZVb4xPlDufLweJ/Os2uHWOv+Caxvy2O85JcnT4M3vc73bi8pdLWlv3fdWQz3pdI9tVwo8rQQSg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/@gulpjs/to-absolute-glob": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz",
+      "integrity": "sha512-kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-negated-glob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -2216,10 +2230,11 @@
       }
     },
     "node_modules/@ts-morph/common/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "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"
       }
@@ -2442,14 +2457,17 @@
       }
     },
     "node_modules/@types/node-fetch/node_modules/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "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"
@@ -2630,10 +2648,11 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "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"
       }
@@ -2784,10 +2803,11 @@
       }
     },
     "node_modules/@vscode/l10n-dev/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "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"
       }
@@ -2829,6 +2849,20 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/@vscode/l10n-dev/node_modules/xml2js": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
     "node_modules/@vscode/policy-watcher": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.2.0.tgz",
@@ -2966,10 +3000,11 @@
       "dev": true
     },
     "node_modules/@vscode/test-cli/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "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"
       }
@@ -3058,10 +3093,11 @@
       }
     },
     "node_modules/@vscode/test-web/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "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"
       }
@@ -3775,10 +3811,11 @@
       "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==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -3799,12 +3836,6 @@
         "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",
@@ -3835,18 +3866,6 @@
         "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",
@@ -3856,18 +3875,6 @@
         "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",
@@ -3898,51 +3905,9 @@
     "node_modules/array-each": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8= sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-initial": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U= sha512-BC4Yl89vneCYfpLrs5JU2aAu9/a+xWbeKhvISg9PT7eWFB9UlRvI+rKEtk6mgxWr3dSkk9gQ8hCrdqt06NXPdw==",
-      "dev": true,
-      "dependencies": {
-        "array-slice": "^1.0.0",
-        "is-number": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-initial/node_modules/is-number": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-last": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/array-last/node_modules/is-number": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-      "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+      "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3952,20 +3917,7 @@
       "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"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3979,15 +3931,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/arrify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
@@ -4059,36 +4002,31 @@
       }
     },
     "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==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/async-done/-/async-done-2.0.0.tgz",
+      "integrity": "sha512-j0s3bzYq9yKIVLKGE/tWlCpa3PfFLcrDZLTSVdnnCTGagXuXBJO4SsY9Xdk/fQBirCkH4evW5xOeJXqlAQFdsw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.2",
-        "process-nextick-args": "^2.0.0",
-        "stream-exhaust": "^1.0.1"
+        "end-of-stream": "^1.4.4",
+        "once": "^1.4.0",
+        "stream-exhaust": "^1.0.2"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 10.13.0"
       }
     },
-    "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==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-2.0.0.tgz",
+      "integrity": "sha512-Obu/KE8FurfQRN6ODdHN9LuXqwC+JFIM9NRyZqJJ4ZfLJmIYN9Rg0/kb+wF70VV5+fJusTMQlJ1t5rF7J/ETdg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "async-done": "^1.2.2"
+        "async-done": "^2.0.0"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/asynckit": {
@@ -4128,23 +4066,31 @@
       "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==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/bach/-/bach-2.0.1.tgz",
+      "integrity": "sha512-A7bvGMGiTOxGMpNupYl9HQTf0FFDNF4VCmks4PJpFyN1AX2pdKuxuwdvUz2Hu388wcgp+OvGFNsumBfFNkR7eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "async-done": "^2.0.0",
+        "async-settle": "^2.0.0",
+        "now-and-later": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/bach/node_modules/now-and-later": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-3.0.0.tgz",
+      "integrity": "sha512-pGO4pzSdaxhWTGkfSfHx3hVzJVslFPwBp2Myq9MYN/ChfJZF87ochMAXnvz6/58RJSf5ik2q9tXprBBrk2cpcg==",
       "dev": true,
+      "license": "MIT",
       "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"
+        "once": "^1.4.0"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/balanced-match": {
@@ -4154,79 +4100,80 @@
       "dev": true
     },
     "node_modules/bare-events": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
-      "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.6.1.tgz",
+      "integrity": "sha512-AuTJkq9XmE6Vk0FJVNq5QxETrSA/vKHarWVBG5l/JbdCL1prJemiyJqUS0jrlXO0MftuPq4m3YVYhoNc5+aE/g==",
       "dev": true,
+      "license": "Apache-2.0",
       "optional": true
     },
     "node_modules/bare-fs": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.1.tgz",
-      "integrity": "sha512-W/Hfxc/6VehXlsgFtbB5B4xFcsCl+pAh30cYhoFyXErf6oGrwjh8SwiPAdHgpmWonKuYpZgGywN0SXt7dgsADA==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.2.3.tgz",
+      "integrity": "sha512-1aGs5pRVLToMQ79elP+7cc0u0s/wXAzfBv/7hDloT7WFggLqECCas5qqPky7WHCFdsBH5WDq6sD4fAoz5sJbtA==",
       "dev": true,
+      "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
-        "bare-events": "^2.0.0",
-        "bare-path": "^2.0.0",
-        "bare-stream": "^2.0.0"
+        "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": "2.4.0",
-      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.0.tgz",
-      "integrity": "sha512-v8DTT08AS/G0F9xrhyLtepoo9EJBJ85FRSMbu1pQUlAf6A8T0tEEQGMVObWeqpjhSPXsE0VGlluFBJu2fdoTNg==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.2.tgz",
+      "integrity": "sha512-T+V1+1srU2qYNBmJCXZkUY5vQ0B4FSlL3QDROnKQYOqeiQR8UbjNHlPa+TIbM4cuidiN9GaTaOZgSEgsvPbh5A==",
       "dev": true,
-      "optional": true
+      "license": "Apache-2.0",
+      "optional": true,
+      "engines": {
+        "bare": ">=1.14.0"
+      }
     },
     "node_modules/bare-path": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-2.1.3.tgz",
-      "integrity": "sha512-lh/eITfU8hrj9Ru5quUp0Io1kJWIk1bTjzo7JH1P5dWmQ2EL4hFUlfI8FonAhSlgIfhn63p84CDY/x+PisgcXA==",
+      "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": "^2.1.0"
+        "bare-os": "^3.0.1"
       }
     },
     "node_modules/bare-stream": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.1.3.tgz",
-      "integrity": "sha512-tiDAH9H/kP+tvNO5sczyn9ZAA7utrSMobyDchsnyyXBuUe2FSQWbxhtuHB8jwpHYYevVo2UJpcmvvjrbHboUUQ==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.7.0.tgz",
+      "integrity": "sha512-oyXQNicV1y8nc2aKffH+BUHFRXmx6VrPzlnaEvMhram0nPBrKcEdcyBg5r08D0i8VxngHFAiVyn1QKXpSG0B8A==",
       "dev": true,
+      "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
-        "streamx": "^2.18.0"
-      }
-    },
-    "node_modules/base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "dependencies": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
+        "streamx": "^2.21.0"
       },
-      "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"
+      "peerDependencies": {
+        "bare-buffer": "*",
+        "bare-events": "*"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependenciesMeta": {
+        "bare-buffer": {
+          "optional": true
+        },
+        "bare-events": {
+          "optional": true
+        }
       }
     },
     "node_modules/base64-js": {
@@ -4334,10 +4281,11 @@
       "optional": true
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "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"
@@ -4482,26 +4430,6 @@
         "node": ">=14.14.0"
       }
     },
-    "node_modules/cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "dependencies": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/cache-content-type": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz",
@@ -4561,6 +4489,20 @@
         "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",
+      "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/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -4764,136 +4706,45 @@
       "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/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": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
+        "restore-cursor": "^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/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/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,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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/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": {
-        "kind-of": "^3.0.2"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "deprecated": "Please upgrade to v0.1.5",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cli-cursor": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz",
-      "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==",
-      "dev": true,
-      "dependencies": {
-        "restore-cursor": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cli-spinners": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
-      "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
+        "node": ">=12"
       }
     },
     "node_modules/cliui/node_modules/emoji-regex": {
@@ -5026,42 +4877,6 @@
       "integrity": "sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==",
       "dev": true
     },
-    "node_modules/code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/collection-map": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw= sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA==",
-      "dev": true,
-      "dependencies": {
-        "arr-map": "^2.0.2",
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
-      "dev": true,
-      "dependencies": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -5156,48 +4971,12 @@
         "node": ">= 12.0.0"
       }
     },
-    "node_modules/component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
-    "node_modules/concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8"
-      ],
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "node_modules/concat-stream/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
     "node_modules/config-chain": {
       "version": "1.1.12",
       "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz",
@@ -5280,23 +5059,18 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/copy-props": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
-      "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-4.0.0.tgz",
+      "integrity": "sha512-bVWtw1wQLzzKiYROtvNlbJgxgBYt2bMJpkCbKmXM3xyijvcjjWXEk5nyrrT3bgJ7ODb19ZohE2T0Y3FgNPyoTw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "each-props": "^1.3.2",
+        "each-props": "^3.0.0",
         "is-plain-object": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/copy-webpack-plugin": {
@@ -5748,27 +5522,6 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/default-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^5.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-resolution": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ= sha512-2xaP6GiwVwOEbXCGoJ4ufgC76m8cj805jrghScewJC2ZDsb9U0b4BIrba+xt/Uytyd0HvQ6+WymSRTfnYj59GQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
     "node_modules/defer-to-connect": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
@@ -5815,19 +5568,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/delayed-stream": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.6.tgz",
@@ -5871,8 +5611,9 @@
     "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==",
+      "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5987,6 +5728,21 @@
         "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==",
+      "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/duplexer": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
@@ -6021,25 +5777,17 @@
       }
     },
     "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==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/each-props/-/each-props-3.0.0.tgz",
+      "integrity": "sha512-IYf1hpuWrdzse/s/YJOrFmU15lyhSzxelNVAHTEG3DtP4QsLTWZUzcUL3HMXmKQxXpa4EIrBPpwRgj0aehdvAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-plain-object": "^2.0.1",
+        "is-plain-object": "^5.0.0",
         "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": ">= 10.13.0"
       }
     },
     "node_modules/eastasianwidth": {
@@ -6099,15 +5847,15 @@
       "dev": true
     },
     "node_modules/electron": {
-      "version": "34.3.2",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-34.3.2.tgz",
-      "integrity": "sha512-n9tzmFexVLxipZXwMTY30H10f0X9k2OP0SkpSwL5VvnDZi0l/Hc+8CEArKkQPbbSf/IS7nxgc96gtTaR+XoSBg==",
+      "version": "35.7.5",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-35.7.5.tgz",
+      "integrity": "sha512-dnL+JvLraKZl7iusXTVTGYs10TKfzUi30uEDTqsmTm0guN9V2tbOjTzyIZbh9n3ygUjgEYyo+igAwMRXIi3IPw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@electron/get": "^2.0.0",
-        "@types/node": "^20.9.0",
+        "@types/node": "^22.7.7",
         "extract-zip": "^2.0.1"
       },
       "bin": {
@@ -6124,6 +5872,23 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/electron/node_modules/@types/node": {
+      "version": "22.18.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.1.tgz",
+      "integrity": "sha512-rzSDyhn4cYznVG+PCzGe1lwuMYJrcBS1fc3JqSa2PvtABwWo+dZ1ij5OVok3tqfpEBCBoaR4d7upFJk73HRJDw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.21.0"
+      }
+    },
+    "node_modules/electron/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/emoji-regex": {
       "version": "10.3.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz",
@@ -6250,13 +6015,11 @@
       }
     },
     "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "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": {
-        "get-intrinsic": "^1.2.4"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -6276,6 +6039,35 @@
       "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
       "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==",
+      "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/es-to-primitive": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
@@ -6687,251 +6479,70 @@
         "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==",
+    "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": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "homedir-polyfill": "^1.0.1"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "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": {
-        "ms": "2.0.0"
+        "type": "^2.0.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+    "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": {
-        "is-descriptor": "^0.1.0"
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/extend-shallow": {
+    "node_modules/extract-zip": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
       "dev": true,
       "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "deprecated": "Please upgrade to v0.1.7",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "deprecated": "Please upgrade to v0.1.5",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/expand-template": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
-      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
-      "dev": true,
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ext": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
-      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
-      "dev": true,
-      "dependencies": {
-        "type": "^2.0.0"
-      }
-    },
-    "node_modules/ext/node_modules/type": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz",
-      "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==",
-      "dev": true
-    },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
-      "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY= sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extglob/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extract-zip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
       },
       "bin": {
         "extract-zip": "cli.js"
@@ -7015,10 +6626,11 @@
       "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==",
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -7132,194 +6744,46 @@
       }
     },
     "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==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz",
+      "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "detect-file": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "micromatch": "^3.0.4",
+        "is-glob": "^4.0.3",
+        "micromatch": "^4.0.4",
         "resolve-dir": "^1.0.1"
       },
       "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/findup-sync/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/findup-sync/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/fined": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fined/-/fined-2.0.0.tgz",
+      "integrity": "sha512-OFRzsL6ZMHz5s0JrsEr+TpdGNCtrVtnuG3x1yzGNiQHT0yaDnXAj8V/lWcpJVrnoDpcwXcASxAZYbuXda2Y82A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "expand-tilde": "^2.0.2",
-        "is-plain-object": "^2.0.3",
+        "is-plain-object": "^5.0.0",
         "object.defaults": "^1.1.0",
-        "object.pick": "^1.2.0",
-        "parse-filepath": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/fined/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
+        "object.pick": "^1.3.0",
+        "parse-filepath": "^1.0.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 10.13.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==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-2.0.0.tgz",
+      "integrity": "sha512-Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/flat": {
@@ -7432,8 +6896,9 @@
     "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==",
+      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7441,8 +6906,9 @@
     "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==",
+      "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "for-in": "^1.0.1"
       },
@@ -7467,31 +6933,22 @@
       }
     },
     "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.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": ">= 6"
       }
     },
-    "node_modules/fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
-      "dev": true,
-      "dependencies": {
-        "map-cache": "^0.2.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
@@ -7666,16 +7123,22 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "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",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "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"
@@ -7684,6 +7147,20 @@
         "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/get-stdin": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz",
@@ -7727,15 +7204,6 @@
         "node": ">8.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==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/github-from-package": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
@@ -7856,296 +7324,17 @@
       "dev": true
     },
     "node_modules/glob-watcher": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
-      "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-done": "^1.2.0",
-        "chokidar": "^2.0.0",
-        "is-negated-glob": "^1.0.0",
-        "just-debounce": "^1.0.0",
-        "normalize-path": "^3.0.0",
-        "object.defaults": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "dependencies": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/anymatch/node_modules/normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-      "dev": true,
-      "dependencies": {
-        "remove-trailing-separator": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "dependencies": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/braces/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "deprecated": "Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies",
-      "dev": true,
-      "dependencies": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "optionalDependencies": {
-        "fsevents": "^1.2.7"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/fill-range/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/glob-parent/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
-      "dev": true,
-      "dependencies": {
-        "binary-extensions": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/micromatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/glob-watcher/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-6.0.0.tgz",
+      "integrity": "sha512-wGM28Ehmcnk2NqRORXFOTOR064L4imSw3EeOqU5bIwUf62eXGwg89WivH6VMahL8zlQHeodzvHpXplrqzrz3Nw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
+        "async-done": "^2.0.0",
+        "chokidar": "^3.5.3"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/global-agent": {
@@ -8171,6 +7360,7 @@
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
       "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "global-prefix": "^1.0.1",
         "is-windows": "^1.0.1",
@@ -8183,8 +7373,9 @@
     "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==",
+      "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "expand-tilde": "^2.0.2",
         "homedir-polyfill": "^1.0.1",
@@ -8201,6 +7392,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -8237,24 +7429,26 @@
       }
     },
     "node_modules/glogg": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-2.2.0.tgz",
+      "integrity": "sha512-eWv1ds/zAlz+M1ioHsyKJomfY7jbDDPpwSkv14KQj89bycx1nvK5/2Cj/T9g7kzJcX5Bc7Yv22FjfBZS/jl94A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "sparkles": "^1.0.0"
+        "sparkles": "^2.1.0"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -8297,21 +7491,22 @@
       "dev": true
     },
     "node_modules/gulp": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
-      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-5.0.1.tgz",
+      "integrity": "sha512-PErok3DZSA5WGMd6XXV3IRNO0mlB+wW3OzhFJLEec1jSERg2j1bxJ6e5Fh6N6fn3FH2T9AP4UYNb/pYlADB9sA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "glob-watcher": "^5.0.3",
-        "gulp-cli": "^2.2.0",
-        "undertaker": "^1.2.1",
-        "vinyl-fs": "^3.0.0"
+        "glob-watcher": "^6.0.0",
+        "gulp-cli": "^3.1.0",
+        "undertaker": "^2.0.0",
+        "vinyl-fs": "^4.0.2"
       },
       "bin": {
         "gulp": "bin/gulp.js"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=10.13.0"
       }
     },
     "node_modules/gulp-azure-storage": {
@@ -8600,191 +7795,93 @@
       }
     },
     "node_modules/gulp-cli": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
-      "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-3.1.0.tgz",
+      "integrity": "sha512-zZzwlmEsTfXcxRKiCHsdyjZZnFvXWM4v1NqBJSYbuApkvVKivjcmOS2qruAJ+PkEHLFavcDKH40DPc1+t12a9Q==",
       "dev": true,
+      "license": "MIT",
       "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"
+        "@gulpjs/messages": "^1.1.0",
+        "chalk": "^4.1.2",
+        "copy-props": "^4.0.0",
+        "gulplog": "^2.2.0",
+        "interpret": "^3.1.1",
+        "liftoff": "^5.0.1",
+        "mute-stdout": "^2.0.0",
+        "replace-homedir": "^2.0.0",
+        "semver-greatest-satisfied-range": "^2.0.0",
+        "string-width": "^4.2.3",
+        "v8flags": "^4.0.0",
+        "yargs": "^16.2.0"
       },
       "bin": {
         "gulp": "bin/gulp.js"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=10.13.0"
       }
     },
-    "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==",
+    "node_modules/gulp-cli/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,
+      "license": "ISC",
       "dependencies": {
-        "ansi-wrap": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
       }
     },
-    "node_modules/gulp-cli/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-      "dev": true
-    },
-    "node_modules/gulp-cli/node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs= sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+    "node_modules/gulp-cli/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,
-      "dependencies": {
-        "number-is-nan": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE= sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==",
-      "dev": true
+      "license": "MIT"
     },
     "node_modules/gulp-cli/node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
-      "dev": true,
-      "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8= sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==",
-      "dev": true
-    },
-    "node_modules/gulp-cli/node_modules/wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==",
+      "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": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "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==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
       "dev": true,
+      "license": "MIT",
       "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",
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
         "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"
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "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==",
+      "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,
-      "dependencies": {
-        "camelcase": "^3.0.0",
-        "object.assign": "^4.1.0"
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/gulp-filter": {
@@ -9605,16 +8702,174 @@
         "fd-slicer": "~1.0.1"
       }
     },
+    "node_modules/gulp/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/gulp/node_modules/fs-mkdirp-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-2.0.1.tgz",
+      "integrity": "sha512-UTOY+59K6IA94tec8Wjqm0FSh5OVudGNB0NL/P6fB3HiE3bYOY3VYBGijsnOHNkQSwC1FKkU77pmq7xp9CskLw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.8",
+        "streamx": "^2.12.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/gulp/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/gulp/node_modules/glob-stream": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-8.0.3.tgz",
+      "integrity": "sha512-fqZVj22LtFJkHODT+M4N1RJQ3TjnnQhfE9GwZI8qXscYarnhpip70poMldRnP8ipQ/w0B621kOhfc53/J9bd/A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@gulpjs/to-absolute-glob": "^4.0.0",
+        "anymatch": "^3.1.3",
+        "fastq": "^1.13.0",
+        "glob-parent": "^6.0.2",
+        "is-glob": "^4.0.3",
+        "is-negated-glob": "^1.0.0",
+        "normalize-path": "^3.0.0",
+        "streamx": "^2.12.5"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/gulp/node_modules/lead": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/lead/-/lead-4.0.0.tgz",
+      "integrity": "sha512-DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/gulp/node_modules/now-and-later": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-3.0.0.tgz",
+      "integrity": "sha512-pGO4pzSdaxhWTGkfSfHx3hVzJVslFPwBp2Myq9MYN/ChfJZF87ochMAXnvz6/58RJSf5ik2q9tXprBBrk2cpcg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "once": "^1.4.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/gulp/node_modules/resolve-options": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-2.0.0.tgz",
+      "integrity": "sha512-/FopbmmFOQCfsCx77BRFdKOniglTiHumLgwvd6IDPihy1GKkadZbgQJBcTb2lMzSR1pndzd96b1nZrreZ7+9/A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "value-or-function": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/gulp/node_modules/to-through": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/to-through/-/to-through-3.0.0.tgz",
+      "integrity": "sha512-y8MN937s/HVhEoBU1SxfHC+wxCHkV1a9gW8eAdTadYh/bGyesZIVcbjI+mSpFbSVwQici/XjBjuUyri1dnXwBw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "streamx": "^2.12.5"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/gulp/node_modules/value-or-function": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-4.0.0.tgz",
+      "integrity": "sha512-aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/gulp/node_modules/vinyl-fs": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.2.tgz",
+      "integrity": "sha512-XRFwBLLTl8lRAOYiBqxY279wY46tVxLaRhSwo3GzKEuLz1giffsOquWWboD/haGf5lx+JyTigCFfe7DWHoARIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fs-mkdirp-stream": "^2.0.1",
+        "glob-stream": "^8.0.3",
+        "graceful-fs": "^4.2.11",
+        "iconv-lite": "^0.6.3",
+        "is-valid-glob": "^1.0.0",
+        "lead": "^4.0.0",
+        "normalize-path": "3.0.0",
+        "resolve-options": "^2.0.0",
+        "stream-composer": "^1.0.2",
+        "streamx": "^2.14.0",
+        "to-through": "^3.0.0",
+        "value-or-function": "^4.0.0",
+        "vinyl": "^3.0.1",
+        "vinyl-sourcemap": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/gulp/node_modules/vinyl-sourcemap": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz",
+      "integrity": "sha512-BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "convert-source-map": "^2.0.0",
+        "graceful-fs": "^4.2.10",
+        "now-and-later": "^3.0.0",
+        "streamx": "^2.12.5",
+        "vinyl": "^3.0.0",
+        "vinyl-contents": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "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==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-2.2.0.tgz",
+      "integrity": "sha512-V2FaKiOhpR3DRXZuYdRLn/qiY0yI5XmqbTKrYbdemJ+xOh2d2MOweI/XFgMzd/9+1twdvMwllnZbWZNJ+BOm4A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "glogg": "^1.0.0"
+        "glogg": "^2.2.0"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/gunzip-maybe": {
@@ -9713,23 +8968,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "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"
       },
@@ -9738,12 +8982,13 @@
       }
     },
     "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "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.2"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9752,97 +8997,35 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
+    "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": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
+        "function-bind": "^1.1.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "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/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,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "he": "bin/he"
       }
     },
-    "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/homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-values/node_modules/kind-of": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-      "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc= sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
-      "bin": {
-        "he": "bin/he"
-      }
-    },
-    "node_modules/homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-      "dev": true,
-      "dependencies": {
-        "parse-passwd": "^1.0.0"
+        "parse-passwd": "^1.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
@@ -10053,6 +9236,19 @@
         "node": ">=0.8.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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/icss-utils": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
@@ -10174,21 +9370,13 @@
       }
     },
     "node_modules/interpret": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY= sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
+      "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10.13.0"
       }
     },
     "node_modules/ip-address": {
@@ -10216,28 +9404,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "deprecated": "Please upgrade to v1.0.1",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-arguments": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
@@ -10314,28 +9480,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "deprecated": "Please upgrade to v1.0.1",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-date-object": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
@@ -10354,29 +9498,6 @@
       "integrity": "sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ==",
       "dev": true
     },
-    "node_modules/is-descriptor": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-docker": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
@@ -11042,12 +10163,6 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "node_modules/just-debounce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
-      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo= sha512-/QLqfspz7WJ+TPmzDp5WJOlm2r3j+/12rGo7dG5uwD9vGM5sWg8p251b7Us0p19JqjddJzcYOK2v6FN92nREmg==",
-      "dev": true
-    },
     "node_modules/just-extend": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz",
@@ -11089,15 +10204,6 @@
         "json-buffer": "3.0.1"
       }
     },
-    "node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/koa": {
       "version": "2.15.4",
       "resolved": "https://registry.npmjs.org/koa/-/koa-2.15.4.tgz",
@@ -11279,16 +10385,13 @@
       }
     },
     "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==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/last-run/-/last-run-2.0.0.tgz",
+      "integrity": "sha512-j+y6WhTLN4Itnf9j5ZQos1BGPCS8DAwmgMroR3OzfxAsBxam0hMw7J8M3KqZl0pLQJ1jNnwIexg5DYpC/ctwEQ==",
       "dev": true,
-      "dependencies": {
-        "default-resolution": "^2.0.0",
-        "es6-weak-map": "^2.0.1"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/lazy.js": {
@@ -11324,18 +10427,6 @@
         "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",
@@ -11371,34 +10462,22 @@
       }
     },
     "node_modules/liftoff": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
-      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
-      "dev": true,
-      "dependencies": {
-        "extend": "^3.0.0",
-        "findup-sync": "^3.0.0",
-        "fined": "^1.0.1",
-        "flagged-respawn": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "object.map": "^1.0.0",
-        "rechoir": "^0.6.2",
-        "resolve": "^1.1.7"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/liftoff/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-5.0.1.tgz",
+      "integrity": "sha512-wwLXMbuxSF8gMvubFcFRp56lkFV69twvbU5vDPbaw+Q+/rF8j0HKjGbIdlSi+LuJm9jf7k9PB+nTxnsLMPcv2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "isobject": "^3.0.1"
+        "extend": "^3.0.2",
+        "findup-sync": "^5.0.0",
+        "fined": "^2.0.0",
+        "flagged-respawn": "^2.0.0",
+        "is-plain-object": "^5.0.0",
+        "rechoir": "^0.8.0",
+        "resolve": "^1.20.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10.13.0"
       }
     },
     "node_modules/lilconfig": {
@@ -11597,32 +10676,12 @@
       "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
       "dev": true
     },
-    "node_modules/make-iterator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^6.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/make-iterator/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+      "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -11633,18 +10692,6 @@
       "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ= sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==",
       "dev": true
     },
-    "node_modules/map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
-      "dev": true,
-      "dependencies": {
-        "object-visit": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/markdown-it": {
       "version": "14.1.0",
       "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
@@ -11662,259 +10709,88 @@
         "markdown-it": "bin/markdown-it.mjs"
       }
     },
-    "node_modules/matchdep": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4= sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA==",
+    "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": {
-        "findup-sync": "^2.0.0",
-        "micromatch": "^3.0.4",
-        "resolve": "^1.4.0",
-        "stack-trace": "0.0.10"
+        "escape-string-regexp": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": ">=10"
       }
     },
-    "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/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": {
-        "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/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/md5": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
+      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
       "dev": true,
       "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
+        "charenc": "0.0.2",
+        "crypt": "0.0.2",
+        "is-buffer": "~1.1.6"
+      }
+    },
+    "node_modules/mdn-data": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+      "dev": true
+    },
+    "node_modules/mdurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+      "dev": true
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.6"
       }
     },
-    "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/memoizee": {
+      "version": "0.4.15",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
+      "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
       "dev": true,
       "dependencies": {
-        "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"
+        "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/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/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": {
-        "is-extendable": "^0.1.0"
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/findup-sync": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw= sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g==",
-      "dev": true,
-      "dependencies": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^3.1.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/matchdep/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/is-glob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-      "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/is-number/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matchdep/node_modules/to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/matcher": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
-      "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "escape-string-regexp": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/md5": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
-      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
-      "dev": true,
-      "dependencies": {
-        "charenc": "0.0.2",
-        "crypt": "0.0.2",
-        "is-buffer": "~1.1.6"
-      }
-    },
-    "node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-      "dev": true
-    },
-    "node_modules/mdurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
-      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
-      "dev": true
-    },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/memoizee": {
-      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
-      "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
-      "dev": true,
-      "dependencies": {
-        "d": "^1.0.1",
-        "es5-ext": "^0.10.53",
-        "es6-weak-map": "^2.0.3",
-        "event-emitter": "^0.3.5",
-        "is-promise": "^2.2.2",
-        "lru-queue": "^0.1.0",
-        "next-tick": "^1.1.0",
-        "timers-ext": "^0.1.7"
-      }
-    },
-    "node_modules/memory-fs": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
-      "dev": true,
-      "dependencies": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=4.3.0 <5.0.0 || >=5.10"
+        "node": ">=4.3.0 <5.0.0 || >=5.10"
       }
     },
     "node_modules/memory-fs/node_modules/readable-stream": {
@@ -11994,21 +10870,23 @@
       }
     },
     "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==",
+      "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.28",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz",
-      "integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==",
+      "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.45.0"
+        "mime-db": "1.52.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -12088,19 +10966,6 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
-    "node_modules/mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
-      "dependencies": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/mkdirp": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -12211,9 +11076,9 @@
       }
     },
     "node_modules/mocha/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": {
@@ -12338,16 +11203,17 @@
       }
     },
     "node_modules/morgan": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
-      "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
+      "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": {
         "basic-auth": "~2.0.1",
         "debug": "2.6.9",
         "depd": "~2.0.0",
         "on-finished": "~2.3.0",
-        "on-headers": "~1.0.2"
+        "on-headers": "~1.1.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -12414,21 +11280,15 @@
       }
     },
     "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==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-2.0.0.tgz",
+      "integrity": "sha512-32GSKM3Wyc8dg/p39lWPKYu8zci9mJFzV1Np9Of0ZEpe6Fhssn/FbI7ywAMd40uX+p3ZKh3T5EeCFv81qS3HmQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 10.13.0"
       }
     },
-    "node_modules/nan": {
-      "version": "2.14.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/nanoid": {
       "version": "3.3.8",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
@@ -12448,37 +11308,6 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
-    "node_modules/nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dev": true,
-      "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/nanomatch/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/napi-build-utils": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
@@ -12875,15 +11704,6 @@
         "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
-    "node_modules/number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -12893,93 +11713,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw= sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
-      "dev": true,
-      "dependencies": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "deprecated": "Please upgrade to v0.1.7",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "deprecated": "Please upgrade to v0.1.5",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-copy/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object-inspect": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
@@ -13001,18 +11734,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/object.assign": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
@@ -13034,8 +11755,9 @@
     "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==",
+      "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-each": "^1.0.1",
         "array-slice": "^1.0.0",
@@ -13046,39 +11768,14 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object.map": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc= sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==",
+    "node_modules/object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object.reduce": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
-      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60= sha512-naLhxxpUESbNkRqc35oQ2scZSJueHGQNUfMW/0U37IgN6tE2dgDWg3whf+NEliy3F/QysrO48XKUz/nGPe+AQw==",
-      "dev": true,
-      "dependencies": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
+        "isobject": "^3.0.1"
       },
       "engines": {
         "node": ">=0.10.0"
@@ -13097,10 +11794,11 @@
       }
     },
     "node_modules/on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "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": ">= 0.8"
       }
@@ -13308,18 +12006,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==",
-      "dev": true,
-      "dependencies": {
-        "lcid": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -13436,8 +12122,9 @@
     "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==",
+      "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-absolute": "^1.0.0",
         "map-cache": "^0.2.0",
@@ -13485,8 +12172,9 @@
     "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==",
+      "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13500,15 +12188,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/path-browserify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
@@ -13557,8 +12236,9 @@
     "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==",
+      "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-root-regex": "^0.1.0"
       },
@@ -13569,8 +12249,9 @@
     "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==",
+      "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -13705,27 +12386,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA= sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o= sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
-      "dev": true,
-      "dependencies": {
-        "pinkie": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/pkg-dir": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
@@ -13884,19 +12544,10 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/postcss": {
-      "version": "8.4.38",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
-      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+      "version": "8.4.39",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
+      "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
       "dev": true,
       "funding": [
         {
@@ -13912,9 +12563,10 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
+        "picocolors": "^1.0.1",
         "source-map-js": "^1.2.0"
       },
       "engines": {
@@ -14593,9 +13245,10 @@
       }
     },
     "node_modules/prebuild-install/node_modules/tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz",
+      "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",
+      "license": "MIT",
       "dependencies": {
         "chownr": "^1.1.1",
         "mkdirp-classic": "^0.5.2",
@@ -14627,15 +13280,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/pretty-hrtime": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE= sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -14781,12 +13425,6 @@
         "inherits": "~2.0.0"
       }
     },
-    "node_modules/queue-tick": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
-      "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==",
-      "dev": true
-    },
     "node_modules/quick-lru": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
@@ -14850,121 +13488,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI= sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
-      "dev": true,
-      "dependencies": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA= sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
-      "dev": true,
-      "dependencies": {
-        "error-ex": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
-      "dev": true,
-      "dependencies": {
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE= sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg= sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
-      "dev": true,
-      "dependencies": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
-      "dev": true,
-      "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/read-pkg/node_modules/path-type": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
@@ -15003,28 +13526,16 @@
       }
     },
     "node_modules/rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==",
-      "dev": true,
-      "dependencies": {
-        "resolve": "^1.1.6"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
+      "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
+        "resolve": "^1.20.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/remove-bom-buffer": {
@@ -15085,24 +13596,6 @@
       "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8= sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
       "dev": true
     },
-    "node_modules/repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc= sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/replace-ext": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
@@ -15113,17 +13606,13 @@
       }
     },
     "node_modules/replace-homedir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
-      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw= sha512-CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-2.0.0.tgz",
+      "integrity": "sha512-bgEuQQ/BHW0XkkJtawzrfzHFSN70f/3cNOiHa2QsYxqrjaC30X1k74FJ6xswVBP0sr0SpGIdVFuPwfrYziVeyw==",
       "dev": true,
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1",
-        "is-absolute": "^1.0.0",
-        "remove-trailing-separator": "^1.1.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/replacestream": {
@@ -15238,8 +13727,9 @@
     "node_modules/resolve-dir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
+      "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "expand-tilde": "^2.0.0",
         "global-modules": "^1.0.0"
@@ -15327,13 +13817,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
-      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
-      "dev": true
-    },
     "node_modules/responselike": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
@@ -15368,15 +13851,6 @@
       "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
       "dev": true
     },
-    "node_modules/ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -15464,14 +13938,12 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
-    "node_modules/safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4= sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
+    "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,
-      "dependencies": {
-        "ret": "~0.1.10"
-      }
+      "license": "MIT"
     },
     "node_modules/sax": {
       "version": "1.2.4",
@@ -15551,15 +14023,16 @@
       "optional": true
     },
     "node_modules/semver-greatest-satisfied-range": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
-      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els= sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-2.0.0.tgz",
+      "integrity": "sha512-lH3f6kMbwyANB7HuOWRMlLCa2itaCrZJ+SAqqkSZrZKO/cAsk2EOyaKHUtNkVLFyFW9pct22SFesFp3Z7zpA0g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "sver-compat": "^1.5.0"
+        "sver": "^1.8.3"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/serialize-error": {
@@ -15624,54 +14097,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/set-value/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/setimmediate": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
@@ -15866,210 +14291,6 @@
         "npm": ">= 3.0.0"
       }
     },
-    "node_modules/snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
-      "dependencies": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-node/node_modules/define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY= sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon-util/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "deprecated": "Please upgrade to v0.1.7",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "deprecated": "Please upgrade to v0.1.5",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/snapdragon/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/snapdragon/node_modules/source-map-resolve": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
-      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
-      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
-      "dev": true,
-      "dependencies": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
     "node_modules/socks": {
       "version": "2.8.3",
       "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
@@ -16146,20 +14367,14 @@
         "node": ">=0.8.0"
       }
     },
-    "node_modules/source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= sha512-liJwHPI9x9d9w5WSIjM58MqGmmb7XzNqwdUA3kSBQ4lmDngexlKwawGzK3J1mKXi6+sysoMDlpVyZh9sv5vRfw==",
-      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
-      "dev": true
-    },
     "node_modules/sparkles": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-2.1.0.tgz",
+      "integrity": "sha512-r7iW1bDw8R/cFifrD3JnQJX0K1jqT0kprL48BiBpLZLJPmAm34zsVBsK5lc7HirZYZqMW65dOXZgbAGt/I6frg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/spdx-correct": {
@@ -16169,165 +14384,55 @@
       "dev": true,
       "dependencies": {
         "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
-      "dev": true
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
-      "dev": true
-    },
-    "node_modules/split": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-      "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8= sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
-      "dev": true,
-      "dependencies": {
-        "through": "2"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "dependencies": {
-        "extend-shallow": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
-    },
-    "node_modules/stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
-      "dev": true
-    },
-    "node_modules/stack-trace": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "deprecated": "Please upgrade to v0.1.7",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/static-extend/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "deprecated": "Please upgrade to v0.1.5",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "spdx-license-ids": "^3.0.0"
       }
     },
-    "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+    "node_modules/spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+      "dev": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
       "dev": true,
       "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
       }
     },
-    "node_modules/static-extend/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+      "dev": true
+    },
+    "node_modules/split": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8= sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
       "dev": true,
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "through": "2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "*"
       }
     },
+    "node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
+    },
+    "node_modules/stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
+      "dev": true
+    },
     "node_modules/statuses": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
@@ -16397,11 +14502,22 @@
         "duplexer": "~0.1.1"
       }
     },
+    "node_modules/stream-composer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stream-composer/-/stream-composer-1.0.2.tgz",
+      "integrity": "sha512-bnBselmwfX5K10AH6L4c8+S5lgZMWI7ZYrz2rvYjCPB2DIMC4Ig8OpxGpNJSxRZ58oti7y1IcNvjBAz9vW5m4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "streamx": "^2.13.2"
+      }
+    },
     "node_modules/stream-exhaust": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
       "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/stream-shift": {
       "version": "1.0.1",
@@ -16452,13 +14568,13 @@
       }
     },
     "node_modules/streamx": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.18.0.tgz",
-      "integrity": "sha512-LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==",
+      "version": "2.22.1",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.1.tgz",
+      "integrity": "sha512-znKXEBxfatz2GBNK02kRnCXjV+AA4kjZIUxeWSr3UGirZMJfTE9uiwKHobnbgxWyL/JWro8tTq+vOqAK1/qbSA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-fifo": "^1.3.2",
-        "queue-tick": "^1.0.1",
         "text-decoder": "^1.1.0"
       },
       "optionalDependencies": {
@@ -16705,14 +14821,25 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/sver-compat": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
-      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg= sha512-aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg==",
+    "node_modules/sver": {
+      "version": "1.8.4",
+      "resolved": "https://registry.npmjs.org/sver/-/sver-1.8.4.tgz",
+      "integrity": "sha512-71o1zfzyawLfIWBOmw8brleKyvnbn73oVHNCsu51uPMz/HWiKkkXsI31JjHW5zqXEqnPYkIiHd8ZmL7FCimLEA==",
       "dev": true,
-      "dependencies": {
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
+      "license": "MIT",
+      "optionalDependencies": {
+        "semver": "^6.3.0"
+      }
+    },
+    "node_modules/sver/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",
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
     "node_modules/svgo": {
@@ -16867,17 +14994,18 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz",
-      "integrity": "sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.0.tgz",
+      "integrity": "sha512-5Mty5y/sOF1YWj1J6GiBodjlDc05CUR8PKXrsnFAiSG0xA+GHeWLovaZPYUDXkH/1iKRf2+M5+OrRgzC7O9b7w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pump": "^3.0.0",
         "tar-stream": "^3.1.5"
       },
       "optionalDependencies": {
-        "bare-fs": "^2.1.1",
-        "bare-path": "^2.1.0"
+        "bare-fs": "^4.0.1",
+        "bare-path": "^3.0.0"
       }
     },
     "node_modules/tar-fs/node_modules/pump": {
@@ -17172,45 +15300,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-object-path/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
-      "dependencies": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -17533,12 +15622,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==",
-      "dev": true
-    },
     "node_modules/typescript": {
       "version": "5.8.0-dev.20250207",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.0-dev.20250207.tgz",
@@ -17686,45 +15769,45 @@
       }
     },
     "node_modules/undertaker": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
-      "integrity": "sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-2.0.0.tgz",
+      "integrity": "sha512-tO/bf30wBbTsJ7go80j0RzA2rcwX6o7XPBpeFcb+jzoeb4pfMM2zUeSDIkY1AWqeZabWxaQZ/h8N9t35QKDLPQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "bach": "^1.0.0",
-        "collection-map": "^1.0.0",
-        "es6-weak-map": "^2.0.1",
-        "fast-levenshtein": "^1.0.0",
-        "last-run": "^1.1.0",
-        "object.defaults": "^1.0.0",
-        "object.reduce": "^1.0.0",
-        "undertaker-registry": "^1.0.0"
+        "bach": "^2.0.1",
+        "fast-levenshtein": "^3.0.0",
+        "last-run": "^2.0.0",
+        "undertaker-registry": "^2.0.0"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=10.13.0"
       }
     },
     "node_modules/undertaker-registry": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA= sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-2.0.0.tgz",
+      "integrity": "sha512-+hhVICbnp+rlzZMgxXenpvTxpuvA67Bfgtt+O9WOE5jo7w/dyiF1VmoZVIHvP2EkUjsyKyTwYKlLhA+j47m1Ew==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/undertaker/node_modules/fast-levenshtein": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
-      "integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk= sha512-Ia0sQNrMPXXkqVFt6w6M1n1oKo3NfKs+mvaV811Jwir7vAk9a6PVV9VPYf6X3BU97QiLEmuW3uXH9u87zDFfdw==",
-      "dev": true
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-3.0.0.tgz",
+      "integrity": "sha512-hKKNajm46uNmTlhHSyZkmToAc56uZJwYq7yrciZjqOxnlfQwERDQJmHPUp7m1m9wx8vgOe8IaCKZ5Kv2k1DdCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fastest-levenshtein": "^1.0.7"
+      }
     },
     "node_modules/undici": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.2.3.tgz",
-      "integrity": "sha512-2oSLHaDalSt2/O/wHA9M+/ZPAOcU2yrSP/cdBYJ+YxZskiPYDSqHbysLSlD7gq3JMqOoJI5O31RVU3BxX/MnAA==",
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.15.0.tgz",
+      "integrity": "sha512-7oZJCPvvMvTd0OlqWsIxTuItTpJBpU1tcbVl24FMn3xt3+VSunwUasmfPJRE57oNO1KsZ4PgA1xTdAX4hq8NyQ==",
       "license": "MIT",
       "engines": {
         "node": ">=20.18.1"
@@ -17736,30 +15819,6 @@
       "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
       "dev": true
     },
-    "node_modules/union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
-      "dependencies": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/union-value/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/unique-stream": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
@@ -17784,64 +15843,6 @@
         "node": ">= 10.0.0"
       }
     },
-    "node_modules/unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
-      "dev": true,
-      "dependencies": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-      "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
-      "dev": true,
-      "dependencies": {
-        "get-value": "^2.0.3",
-        "has-values": "^0.1.4",
-        "isobject": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
-      "dev": true,
-      "dependencies": {
-        "isarray": "1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/unset-value/node_modules/has-values": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-      "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E= sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4",
-        "yarn": "*"
-      }
-    },
     "node_modules/update-browserslist-db": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
@@ -17891,13 +15892,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
-      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
-      "dev": true
-    },
     "node_modules/url-parse": {
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
@@ -17908,15 +15902,6 @@
         "requires-port": "^1.0.0"
       }
     },
-    "node_modules/use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/util": {
       "version": "0.12.5",
       "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
@@ -17982,15 +15967,13 @@
       "dev": true
     },
     "node_modules/v8flags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
-      "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-4.0.1.tgz",
+      "integrity": "sha512-fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==",
       "dev": true,
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.10"
+        "node": ">= 10.13.0"
       }
     },
     "node_modules/validate-npm-package-license": {
@@ -18022,13 +16005,13 @@
       }
     },
     "node_modules/vinyl": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
-      "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz",
+      "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "clone": "^2.1.2",
-        "clone-stats": "^1.0.0",
         "remove-trailing-separator": "^1.1.0",
         "replace-ext": "^2.0.0",
         "teex": "^1.0.1"
@@ -18037,6 +16020,57 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/vinyl-contents": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/vinyl-contents/-/vinyl-contents-2.0.0.tgz",
+      "integrity": "sha512-cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bl": "^5.0.0",
+        "vinyl": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/vinyl-contents/node_modules/bl": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz",
+      "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer": "^6.0.3",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/vinyl-contents/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
     "node_modules/vinyl-fs": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
@@ -18325,27 +16359,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/webpack-cli/node_modules/interpret": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
-      "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack-cli/node_modules/rechoir": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
-      "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
-      "dev": true,
-      "dependencies": {
-        "resolve": "^1.20.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
     "node_modules/webpack-merge": {
       "version": "5.8.0",
       "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
@@ -18646,10 +16659,11 @@
       "dev": true
     },
     "node_modules/xml2js": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
-      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.0.tgz",
+      "integrity": "sha512-eLTh0kA8uHceqesPqSE+VvO1CDDJWMwlQfB6LuN6T8w6MaDJ8Txm8P7s5cHD0miF0V+GGTZrDQfxPZQVsur33w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "sax": ">=0.6.0",
         "xmlbuilder": "~11.0.0"
@@ -18658,11 +16672,12 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/xml2js/node_modules/xmlbuilder": {
+    "node_modules/xmlbuilder": {
       "version": "11.0.1",
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
       "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       }
diff --git a/package.json b/package.json
index c6a731a184ad..cfb958d1681b 100644
--- a/package.json
+++ b/package.json
@@ -155,7 +155,7 @@
     "cssnano": "^6.0.3",
     "debounce": "^1.0.0",
     "deemon": "^1.8.0",
-    "electron": "34.3.2",
+    "electron": "35.7.5",
     "eslint": "^9.11.1",
     "eslint-formatter-compact": "^8.40.0",
     "eslint-plugin-header": "3.1.1",
@@ -165,7 +165,7 @@
     "fancy-log": "^1.3.3",
     "file-loader": "^6.2.0",
     "glob": "^5.0.13",
-    "gulp": "^4.0.0",
+    "gulp": "^5.0.1",
     "gulp-azure-storage": "^0.12.1",
     "gulp-bom": "^3.0.0",
     "gulp-buffer": "0.0.2",
@@ -199,7 +199,7 @@
     "os-browserify": "^0.3.0",
     "p-all": "^1.0.0",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.4.33",
+    "postcss": "^8.4.39",
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",
@@ -219,7 +219,7 @@
     "webpack": "^5.94.0",
     "webpack-cli": "^5.1.4",
     "webpack-stream": "^7.0.0",
-    "xml2js": "^0.5.0",
+    "xml2js": "^0.6.0",
     "yaserver": "^0.4.0"
   },
   "overrides": {
diff --git a/remote/package-lock.json b/remote/package-lock.json
index 6ccde5843bd3..96ec8d454ce0 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -1351,9 +1351,10 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz",
+      "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",
+      "license": "MIT",
       "dependencies": {
         "chownr": "^1.1.1",
         "mkdirp-classic": "^0.5.2",
@@ -1410,9 +1411,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.3.0.tgz",
-      "integrity": "sha512-Qy96NND4Dou5jKoSJ2gm8ax8AJM/Ey9o9mz7KN1bb9GP+G0l20Zw8afxTnY2f4b7hmhn/z8aC2kfArVQlAhFBw==",
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.15.0.tgz",
+      "integrity": "sha512-7oZJCPvvMvTd0OlqWsIxTuItTpJBpU1tcbVl24FMn3xt3+VSunwUasmfPJRE57oNO1KsZ4PgA1xTdAX4hq8NyQ==",
       "license": "MIT",
       "engines": {
         "node": ">=20.18.1"
diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
index 6bf5b31ed494..600dfed9f4cd 100644
--- a/test/automation/package-lock.json
+++ b/test/automation/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "ncp": "^2.0.0",
-        "tmp": "0.2.1",
+        "tmp": "0.2.4",
         "tree-kill": "1.2.2",
         "vscode-uri": "3.0.2"
       },
@@ -85,7 +85,8 @@
     "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=="
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg==",
+      "dev": true
     },
     "node_modules/binary-extensions": {
       "version": "2.3.0",
@@ -101,9 +102,11 @@
       }
     },
     "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"
@@ -202,7 +205,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=="
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
     },
     "node_modules/cpx2": {
       "version": "3.0.0",
@@ -385,7 +389,8 @@
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
@@ -427,6 +432,7 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
       "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -524,6 +530,7 @@
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dev": true,
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -532,7 +539,8 @@
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
     },
     "node_modules/is-arrayish": {
       "version": "0.2.1",
@@ -716,6 +724,7 @@
       "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"
       },
@@ -878,6 +887,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dev": true,
       "dependencies": {
         "wrappy": "1"
       }
@@ -899,6 +909,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18= sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1011,21 +1022,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -1214,14 +1210,12 @@
       }
     },
     "node_modules/tmp": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-      "dependencies": {
-        "rimraf": "^3.0.0"
-      },
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.4.tgz",
+      "integrity": "sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==",
+      "license": "MIT",
       "engines": {
-        "node": ">=8.17.0"
+        "node": ">=14.14"
       }
     },
     "node_modules/to-regex-range": {
@@ -1307,7 +1301,8 @@
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
     }
   }
 }
diff --git a/test/automation/package.json b/test/automation/package.json
index cf8f9c861cb2..0b7e28976206 100644
--- a/test/automation/package.json
+++ b/test/automation/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "ncp": "^2.0.0",
-    "tmp": "0.2.1",
+    "tmp": "0.2.4",
     "tree-kill": "1.2.2",
     "vscode-uri": "3.0.2"
   },
diff --git a/test/integration/browser/package-lock.json b/test/integration/browser/package-lock.json
index bdec916fb4be..eca71464ade3 100644
--- a/test/integration/browser/package-lock.json
+++ b/test/integration/browser/package-lock.json
@@ -13,7 +13,7 @@
         "@types/rimraf": "^2.0.4",
         "@types/tmp": "0.1.0",
         "rimraf": "^2.6.1",
-        "tmp": "0.0.33",
+        "tmp": "0.2.4",
         "tree-kill": "1.2.2",
         "vscode-uri": "^3.0.2"
       }
@@ -73,10 +73,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"
@@ -153,15 +154,6 @@
         "wrappy": "1"
       }
     },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -185,15 +177,13 @@
       }
     },
     "node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.4.tgz",
+      "integrity": "sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==",
       "dev": true,
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=0.6.0"
+        "node": ">=14.14"
       }
     },
     "node_modules/tree-kill": {
diff --git a/test/integration/browser/package.json b/test/integration/browser/package.json
index 728d02763d19..771489469faf 100644
--- a/test/integration/browser/package.json
+++ b/test/integration/browser/package.json
@@ -11,7 +11,7 @@
     "@types/rimraf": "^2.0.4",
     "@types/tmp": "0.1.0",
     "rimraf": "^2.6.1",
-    "tmp": "0.0.33",
+    "tmp": "0.2.4",
     "tree-kill": "1.2.2",
     "vscode-uri": "^3.0.2"
   }
diff --git a/test/smoke/package-lock.json b/test/smoke/package-lock.json
index ecbe39deabbe..8ebcdf5298f1 100644
--- a/test/smoke/package-lock.json
+++ b/test/smoke/package-lock.json
@@ -113,9 +113,10 @@
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg=="
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -134,6 +135,20 @@
         "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",
+      "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/chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -217,6 +232,21 @@
         "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/error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -252,6 +282,55 @@
         "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==",
+      "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/es-to-primitive": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
@@ -279,14 +358,17 @@
       }
     },
     "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"
@@ -298,25 +380,54 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "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.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.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",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.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"
       },
       "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/glob": {
       "version": "7.1.6",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
@@ -337,6 +448,19 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "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/graceful-fs": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
@@ -365,10 +489,11 @@
       }
     },
     "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==",
+      "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"
       },
@@ -376,6 +501,35 @@
         "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/hosted-git-info": {
       "version": "2.8.9",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
@@ -508,6 +662,16 @@
         "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==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/memorystream": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
@@ -518,21 +682,23 @@
       }
     },
     "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"

From 22f9b9317bf6c6b3b792eccccf5334296f030de7 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sun, 14 Sep 2025 05:53:19 -0600
Subject: [PATCH 0999/1815] Delete .github/workflows/no-yarn-lock-changes.yml

Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .github/workflows/no-yarn-lock-changes.yml | 31 ----------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 .github/workflows/no-yarn-lock-changes.yml

diff --git a/.github/workflows/no-yarn-lock-changes.yml b/.github/workflows/no-yarn-lock-changes.yml
deleted file mode 100644
index 57082a28b1cc..000000000000
--- a/.github/workflows/no-yarn-lock-changes.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Prevent yarn.lock changes in PRs
-on: [pull_request]
-
-jobs:
-  main:
-    name: Prevent yarn.lock changes in PRs
-    runs-on: ubuntu-latest
-    steps:
-      - uses: octokit/request-action@v2.x
-        id: get_permissions
-        with:
-          route: GET /repos/microsoft/vscode/collaborators/{username}/permission
-          username: ${{ github.event.pull_request.user.login }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Set control output variable
-        id: control
-        run: |
-          echo "user: ${{ github.event.pull_request.user.login }}"
-          echo "role: ${{ fromJson(steps.get_permissions.outputs.data).permission }}"
-          echo "is dependabot: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}"
-          echo "should_run: ${{ !contains(fromJson('["admin", "maintain", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) }}"
-          echo "should_run=${{ !contains(fromJson('["admin", "maintain", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) && github.event.pull_request.user.login != 'dependabot[bot]' }}" >> $GITHUB_OUTPUT
-      - name: Get file changes
-        uses: trilom/file-changes-action@ce38c8ce2459ca3c303415eec8cb0409857b4272
-        if: ${{ steps.control.outputs.should_run == 'true' }}
-      - name: Check for lockfile changes
-        if: ${{ steps.control.outputs.should_run == 'true' }}
-        run: |
-          cat $HOME/files.json | jq -e 'any(test("yarn\\.lock$|Cargo\\.lock$")) | not' \
-            || (echo "Changes to yarn.lock/Cargo.lock files aren't allowed in PRs." && exit 1)

From c8ff5e12bb73abcb135ee03b98e2316321011dd1 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sun, 14 Sep 2025 05:58:53 -0600
Subject: [PATCH 1000/1815] Potential fix for code scanning alert no. 74:
 Incomplete URL substring sanitization

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .../src/completions/upstream/git.ts           | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/extensions/terminal-suggest/src/completions/upstream/git.ts b/extensions/terminal-suggest/src/completions/upstream/git.ts
index 56468610acce..10b01f8c9bf4 100644
--- a/extensions/terminal-suggest/src/completions/upstream/git.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/git.ts
@@ -1,3 +1,5 @@
+// If running under NodeJS, URL is a global class (since v10) but for older compatibility, import may be required
+// import { URL } from "url";
 function ai(...args: any[]): undefined { return undefined; }
 
 const filterMessages = (out: string): string => {
@@ -310,15 +312,25 @@ export const gitGenerators: Record<string, Fig.Generator> = {
 			return Object.keys(remoteURLs).map((remote) => {
 				const url = remoteURLs[remote];
 				let icon = "box";
-				if (url.includes("github.com")) {
-					icon = "github";
+				let host = "";
+				try {
+					if (url.startsWith("git@")) {
+						// SSH remote, format: git@host:repo.git
+						const sshMatch = url.match(/^git@([^:]+):/);
+						if (sshMatch) host = sshMatch[1];
+					} else {
+						// Attempt to parse as URL
+						host = new URL(url).hostname;
+					}
+				} catch (e) {
+					// fallback: treat as plain string
+					host = url;
 				}
-
-				if (url.includes("gitlab.com")) {
+				if (host === "github.com") {
+					icon = "github";
+				} else if (host === "gitlab.com") {
 					icon = "gitlab";
-				}
-
-				if (url.includes("heroku.com")) {
+				} else if (host === "heroku.com") {
 					icon = "heroku";
 				}
 				return {

From ab044d1b308dfb93c80f9d447238ed5ccdc92b16 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sun, 14 Sep 2025 06:00:23 -0600
Subject: [PATCH 1001/1815] Potential fix for code scanning alert no. 73:
 Incomplete URL substring sanitization

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .../src/completions/upstream/git.ts           | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/extensions/terminal-suggest/src/completions/upstream/git.ts b/extensions/terminal-suggest/src/completions/upstream/git.ts
index 56468610acce..b93684486fac 100644
--- a/extensions/terminal-suggest/src/completions/upstream/git.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/git.ts
@@ -296,6 +296,21 @@ export const gitGenerators: Record<string, Fig.Generator> = {
 	remotes: {
 		script: ["git", "--no-optional-locks", "remote", "-v"],
 		postProcess: function (out) {
+			// Helper to extract hostname from remote URL (HTTP/S or SSH-type)
+			function getHostnameFromRemoteURL(url: string): string {
+				try {
+					// Handle HTTP/HTTPS/SSH URL using URL constructor.
+					if (/^https?:\/\//i.test(url) || /^ssh:\/\//i.test(url)) {
+						return new URL(url).hostname;
+					}
+					// Handle git SSH format: git@host:path.git
+					const sshMatch = url.match(/^([^@]+@)?([^:]+):/);
+					if (sshMatch) {
+						return sshMatch[2];
+					}
+				} catch (e) {}
+				return "";
+			}
 			const remoteURLs = out
 				.split("\n")
 				.reduce<Record<string, string>>((dict, line) => {
@@ -310,15 +325,14 @@ export const gitGenerators: Record<string, Fig.Generator> = {
 			return Object.keys(remoteURLs).map((remote) => {
 				const url = remoteURLs[remote];
 				let icon = "box";
-				if (url.includes("github.com")) {
+				const hostname = getHostnameFromRemoteURL(url);
+				if (hostname === "github.com") {
 					icon = "github";
 				}
-
-				if (url.includes("gitlab.com")) {
+				if (hostname === "gitlab.com") {
 					icon = "gitlab";
 				}
-
-				if (url.includes("heroku.com")) {
+				if (hostname === "heroku.com") {
 					icon = "heroku";
 				}
 				return {

From 99740239b6a722515d0fe3dedcd3ab4fccae5d34 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sun, 14 Sep 2025 06:01:32 -0600
Subject: [PATCH 1002/1815] Delete
 .github/workflows/no-package-lock-changes.yml

Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .github/workflows/no-package-lock-changes.yml | 31 -------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 .github/workflows/no-package-lock-changes.yml

diff --git a/.github/workflows/no-package-lock-changes.yml b/.github/workflows/no-package-lock-changes.yml
deleted file mode 100644
index 45d5d17407bf..000000000000
--- a/.github/workflows/no-package-lock-changes.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Prevent package-lock.json changes in PRs
-on: [pull_request]
-
-jobs:
-  main:
-    name: Prevent package-lock.json changes in PRs
-    runs-on: ubuntu-latest
-    steps:
-      - uses: octokit/request-action@v2.x
-        id: get_permissions
-        with:
-          route: GET /repos/microsoft/vscode/collaborators/{username}/permission
-          username: ${{ github.event.pull_request.user.login }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Set control output variable
-        id: control
-        run: |
-          echo "user: ${{ github.event.pull_request.user.login }}"
-          echo "role: ${{ fromJson(steps.get_permissions.outputs.data).permission }}"
-          echo "is dependabot: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}"
-          echo "should_run: ${{ !contains(fromJson('["admin", "maintain", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) }}"
-          echo "should_run=${{ !contains(fromJson('["admin", "maintain", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) && github.event.pull_request.user.login != 'dependabot[bot]' }}" >> $GITHUB_OUTPUT
-      - name: Get file changes
-        uses: trilom/file-changes-action@ce38c8ce2459ca3c303415eec8cb0409857b4272
-        if: ${{ steps.control.outputs.should_run == 'true' }}
-      - name: Check for lockfile changes
-        if: ${{ steps.control.outputs.should_run == 'true' }}
-        run: |
-          cat $HOME/files.json | jq -e 'any(test("package-lock\\.json$|Cargo\\.lock$")) | not' \
-            || (echo "Changes to package-lock.json/Cargo.lock files aren't allowed in PRs." && exit 1)

From 7a287f53fad655f150ed0c59f992b752dee2697b Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sun, 14 Sep 2025 23:34:53 -0600
Subject: [PATCH 1003/1815] Potential fix for code scanning alert no. 59:
 Inefficient regular expression

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 extensions/git/src/gitEditor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/git/src/gitEditor.ts b/extensions/git/src/gitEditor.ts
index 6291e5152a72..7d59cd6591df 100644
--- a/extensions/git/src/gitEditor.ts
+++ b/extensions/git/src/gitEditor.ts
@@ -67,7 +67,7 @@ export class GitEditor implements IIPCHandler, ITerminalEnvironmentProvider {
 }
 
 export class GitEditorDocumentLinkProvider implements DocumentLinkProvider {
-	private readonly _regex = /^#\s+(modified|new file|deleted|renamed|copied|type change):\s+(?<file1>.*?)(?:\s+->\s+(?<file2>.*))*$/gm;
+	private readonly _regex = /^#\s+(modified|new file|deleted|renamed|copied|type change):\s+(?<file1>[^\r\n]+?)(?:\s+->\s+(?<file2>[^\r\n]+?))*$/gm;
 
 	constructor(private readonly _model: Model) { }
 

From 2ec31ddeb034d748fc0a2e3eb3877c0765853466 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Mon, 15 Sep 2025 01:54:39 -0600
Subject: [PATCH 1004/1815] Potential fix for code scanning alert no. 70: Clear
 text storage of sensitive information

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 src/vs/code/browser/workbench/workbench.ts | 60 ++++++++++++++++++++--
 1 file changed, 56 insertions(+), 4 deletions(-)

diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts
index ab9671491fb0..66e6a9ea6a93 100644
--- a/src/vs/code/browser/workbench/workbench.ts
+++ b/src/vs/code/browser/workbench/workbench.ts
@@ -27,14 +27,66 @@ interface ISecretStorageCrypto {
 	unseal(data: string): Promise<string>;
 }
 
-class TransparentCrypto implements ISecretStorageCrypto {
+// Secure crypto provider using Web Crypto API (AES-GCM)
+class WebCryptoProvider implements ISecretStorageCrypto {
+	private readonly keyPromise: Promise<CryptoKey>;
+
+	constructor(secret: string) {
+		// Derive key from secret using PBKDF2 and SHA-256
+		this.keyPromise = (async () => {
+			const enc = new TextEncoder();
+			const keyMaterial = await window.crypto.subtle.importKey(
+				"raw",
+				enc.encode(secret),
+				"PBKDF2",
+				false,
+				["deriveKey"]
+			);
+			const salt = enc.encode('vscode-secret-storage-salt');
+			const key = await window.crypto.subtle.deriveKey(
+				{
+					name: "PBKDF2",
+					salt,
+					iterations: 100000,
+					hash: "SHA-256"
+				},
+				keyMaterial,
+				{ name: "AES-GCM", length: 256 },
+				false,
+				["encrypt", "decrypt"]
+			);
+			return key;
+		})();
+	}
 
 	async seal(data: string): Promise<string> {
-		return data;
+		const key = await this.keyPromise;
+		const enc = new TextEncoder();
+		const iv = window.crypto.getRandomValues(new Uint8Array(12));
+		const encrypted = await window.crypto.subtle.encrypt(
+			{ name: "AES-GCM", iv },
+			key,
+			enc.encode(data)
+		);
+		// Store iv + encrypted data as base64
+		const buffer = new Uint8Array(iv.length + encrypted.byteLength);
+		buffer.set(iv, 0);
+		buffer.set(new Uint8Array(encrypted), iv.length);
+		return encodeBase64(VSBuffer.wrap(buffer));
 	}
 
 	async unseal(data: string): Promise<string> {
-		return data;
+		const key = await this.keyPromise;
+		const buf = VSBuffer.wrap(decodeBase64(data)).buffer;
+		const iv = new Uint8Array(buf.slice(0, 12));
+		const encryptedBytes = buf.slice(12);
+		const decrypted = await window.crypto.subtle.decrypt(
+			{ name: "AES-GCM", iv },
+			key,
+			encryptedBytes
+		);
+		const dec = new TextDecoder();
+		return dec.decode(decrypted);
 	}
 }
 
@@ -194,7 +246,7 @@ export class LocalStorageSecretStorageProvider implements ISecretStorageProvider
 	type: 'in-memory' | 'persisted' | 'unknown' = 'persisted';
 
 	constructor(
-		private readonly crypto: ISecretStorageCrypto,
+		private readonly crypto: ISecretStorageCrypto = new WebCryptoProvider('vscode_default_secret'),
 	) {
 		this.secretsPromise = this.load();
 	}

From 4a571889cf8a2b5253f8a140303176e5b4d6e408 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Mon, 15 Sep 2025 07:37:45 -0600
Subject: [PATCH 1005/1815] Potential fix for code scanning alert no. 65:
 Incomplete string escaping or encoding

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 extensions/terminal-suggest/src/completions/upstream/pnpm.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/terminal-suggest/src/completions/upstream/pnpm.ts b/extensions/terminal-suggest/src/completions/upstream/pnpm.ts
index 9ce7c798208e..c3be72676017 100644
--- a/extensions/terminal-suggest/src/completions/upstream/pnpm.ts
+++ b/extensions/terminal-suggest/src/completions/upstream/pnpm.ts
@@ -25,7 +25,7 @@ const searchBranches: Fig.Generator = {
 				if (parts[0] == "*") {
 					// Current branch.
 					return {
-						name: elm.replace("*", "").trim(),
+						name: elm.replace(/^\*\s*/, "").trim(),
 						description: "Current branch",
 						icon: "⭐️",
 					};

From 3c8d3002aef2df114d33d886caf9996e447cb50e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Sep 2025 14:43:37 +0000
Subject: [PATCH 1006/1815] Bump the npm_and_yarn group across 1 directory with
 2 updates

Bumps the npm_and_yarn group with 2 updates in the / directory: [postcss](https://github.com/postcss/postcss) and [xml2js](https://github.com/Leonidas-from-XIV/node-xml2js).


Updates `postcss` from 8.4.39 to 8.4.40
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.39...8.4.40)

Updates `xml2js` from 0.6.0 to 0.6.1
- [Commits](https://github.com/Leonidas-from-XIV/node-xml2js/compare/0.6.0...0.6.1)

---
updated-dependencies:
- dependency-name: postcss
  dependency-version: 8.4.40
  dependency-type: direct:development
  dependency-group: npm_and_yarn
- dependency-name: xml2js
  dependency-version: 0.6.1
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 16 ++++++++--------
 package.json      |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d5f5fb23029e..88661ae94230 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,7 +140,7 @@
         "os-browserify": "^0.3.0",
         "p-all": "^1.0.0",
         "path-browserify": "^1.0.1",
-        "postcss": "^8.4.39",
+        "postcss": "^8.4.40",
         "postcss-nesting": "^12.0.2",
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
@@ -160,7 +160,7 @@
         "webpack": "^5.94.0",
         "webpack-cli": "^5.1.4",
         "webpack-stream": "^7.0.0",
-        "xml2js": "^0.6.0",
+        "xml2js": "^0.6.1",
         "yaserver": "^0.4.0"
       },
       "optionalDependencies": {
@@ -12545,9 +12545,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
-      "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
+      "version": "8.4.40",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz",
+      "integrity": "sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==",
       "dev": true,
       "funding": [
         {
@@ -16659,9 +16659,9 @@
       "dev": true
     },
     "node_modules/xml2js": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.0.tgz",
-      "integrity": "sha512-eLTh0kA8uHceqesPqSE+VvO1CDDJWMwlQfB6LuN6T8w6MaDJ8Txm8P7s5cHD0miF0V+GGTZrDQfxPZQVsur33w==",
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.1.tgz",
+      "integrity": "sha512-wksiZCYEDvrdwNhv1OIp0IALJdxWF9/ykG85DRkTLjqLIkcadRZxY05dwOX+zTM9aK+7rmtbNRnf3nC7MEqcvQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index cfb958d1681b..960c0f093be6 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "os-browserify": "^0.3.0",
     "p-all": "^1.0.0",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.4.39",
+    "postcss": "^8.4.40",
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",
@@ -219,7 +219,7 @@
     "webpack": "^5.94.0",
     "webpack-cli": "^5.1.4",
     "webpack-stream": "^7.0.0",
-    "xml2js": "^0.6.0",
+    "xml2js": "^0.6.1",
     "yaserver": "^0.4.0"
   },
   "overrides": {

From bc328b14c4aee46d23d62222552000c9ac0386a1 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Mon, 15 Sep 2025 09:08:28 -0600
Subject: [PATCH 1007/1815] Potential fix for code scanning alert no. 64:
 Inefficient regular expression

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts b/src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts
index 4db2d7eb8c77..455682400498 100644
--- a/src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts
@@ -71,7 +71,7 @@ export function handleANSIOutput(text: string, linkDetector: ILinkDetector, work
 				 * Certain ranges that are matched here do not contain real graphics rendition sequences. For
 				 * the sake of having a simpler expression, they have been included anyway.
 				 */
-				if (ansiSequence.match(/^(?:[34][0-8]|9[0-7]|10[0-7]|[0-9]|2[1-5,7-9]|[34]9|5[8,9]|1[0-9])(?:;[349][0-7]|10[0-7]|[013]|[245]|[34]9)?(?:;[012]?[0-9]?[0-9])*;?m$/)) {
+				if (ansiSequence.match(/^(?:[34][0-8]|9[0-7]|10[0-7]|[0-9]|2[1-5,7-9]|[34]9|5[8,9]|1[0-9])(?:;[349][0-7]|10[0-7]|[013]|[245]|[34]9)?(?:;[0-9]{1,3})*;?m$/)) {
 
 					const styleCodes: number[] = ansiSequence.slice(0, -1) // Remove final 'm' character.
 						.split(';')										   // Separate style codes.

From 1f66f7635ef9d0a9ae0a36ad4d2fdb20001ca978 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Sep 2025 15:43:06 +0000
Subject: [PATCH 1008/1815] Bump the cargo group across 1 directory with 3
 updates

Bumps the cargo group with 3 updates in the /cli directory: [tokio](https://github.com/tokio-rs/tokio), [crossbeam-channel](https://github.com/crossbeam-rs/crossbeam) and [openssl](https://github.com/sfackler/rust-openssl).


Updates `tokio` from 1.37.0 to 1.38.2
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.37.0...tokio-1.38.2)

Updates `crossbeam-channel` from 0.5.13 to 0.5.15
- [Release notes](https://github.com/crossbeam-rs/crossbeam/releases)
- [Changelog](https://github.com/crossbeam-rs/crossbeam/blob/master/CHANGELOG.md)
- [Commits](https://github.com/crossbeam-rs/crossbeam/compare/crossbeam-channel-0.5.13...crossbeam-channel-0.5.15)

Updates `openssl` from 0.10.70 to 0.10.73
- [Release notes](https://github.com/sfackler/rust-openssl/releases)
- [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.70...openssl-v0.10.73)

---
updated-dependencies:
- dependency-name: tokio
  dependency-version: 1.38.2
  dependency-type: direct:production
  dependency-group: cargo
- dependency-name: crossbeam-channel
  dependency-version: 0.5.15
  dependency-type: indirect
  dependency-group: cargo
- dependency-name: openssl
  dependency-version: 0.10.73
  dependency-type: indirect
  dependency-group: cargo
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 22 +++++++++++-----------
 cli/Cargo.toml |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index ff45765a0c1d..c5f398e34876 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -536,9 +536,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.13"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1717,9 +1717,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.70"
+version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61cfb4e166a8bb8c9b55c500bc2308550148ece889be90f609377e58140f42c6"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
  "bitflags 2.5.0",
  "cfg-if",
@@ -1749,9 +1749,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.105"
+version = "0.9.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b22d5b84be05a8d6947c7cb71f7c849aa0f112acd4bf51c2a7c1c988ac0a9dc"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
 dependencies = [
  "cc",
  "libc",
@@ -2676,9 +2676,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.38.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "68722da18b0fc4a05fdc1120b302b82051265792a1e1b399086e9b204b10ad3d"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2696,9 +2696,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 2c87d662e073..95efef30d75f 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -16,7 +16,7 @@ futures = "0.3.28"
 clap = { version = "4.3.0", features = ["derive", "env"] }
 open = "4.1.0"
 reqwest = { version = "0.11.22", default-features = false, features = ["json", "stream", "native-tls"] }
-tokio = { version = "1.28.2", features = ["full"] }
+tokio = { version = "1.38.2", features = ["full"] }
 tokio-util = { version = "0.7.8", features = ["compat", "codec"] }
 flate2 = { version = "1.0.26", default-features = false, features = ["zlib"] }
 zip = { version = "0.6.6", default-features = false, features = ["time", "deflate-zlib"] }

From 7cf2593e52e9117d8fedcb3925c070530b7378be Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Mon, 15 Sep 2025 18:40:32 -0600
Subject: [PATCH 1009/1815] Potential fix for code scanning alert no. 63:
 Inefficient regular expression

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 extensions/notebook-renderers/src/ansi.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/notebook-renderers/src/ansi.ts b/extensions/notebook-renderers/src/ansi.ts
index ee26d37d1f6d..90abdb73b5f1 100644
--- a/extensions/notebook-renderers/src/ansi.ts
+++ b/extensions/notebook-renderers/src/ansi.ts
@@ -59,7 +59,7 @@ export function handleANSIOutput(text: string, linkOptions: LinkOptions): HTMLSp
 				 * Certain ranges that are matched here do not contain real graphics rendition sequences. For
 				 * the sake of having a simpler expression, they have been included anyway.
 				 */
-				if (ansiSequence.match(/^(?:[34][0-8]|9[0-7]|10[0-7]|[0-9]|2[1-5,7-9]|[34]9|5[8,9]|1[0-9])(?:;[349][0-7]|10[0-7]|[013]|[245]|[34]9)?(?:;[012]?[0-9]?[0-9])*;?m$/)) {
+				if (ansiSequence.match(/^(?:[34][0-8]|9[0-7]|10[0-7]|[0-9]|2[1-5,7-9]|[34]9|5[8,9]|1[0-9])(?:;[349][0-7]|10[0-7]|[013]|[245]|[34]9)?(?:;[0-9]{1,3})*;?m$/)) {
 
 					const styleCodes: number[] = ansiSequence.slice(0, -1) // Remove final 'm' character.
 						.split(';')										   // Separate style codes.

From 7a07badc8c0b427f48864a279c568da90ed71760 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Mon, 15 Sep 2025 18:49:25 -0600
Subject: [PATCH 1010/1815] Potential fix for code scanning alert no. 61:
 Inefficient regular expression

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .../src/languageFeatures/copyFiles/snippets.ts                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/snippets.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/snippets.ts
index 854cf2175d0c..2430d21c342d 100644
--- a/extensions/markdown-language-features/src/languageFeatures/copyFiles/snippets.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/snippets.ts
@@ -7,7 +7,7 @@
  * Resolves variables in a VS Code snippet style string
  */
 export function resolveSnippet(snippetString: string, vars: ReadonlyMap<string, string>): string {
-	return snippetString.replaceAll(/(?<escape>\\\$)|(?<!\\)\$\{(?<name>\w+)(?:\/(?<pattern>(?:\\\/|[^\}])+?)\/(?<replacement>(?:\\\/|[^\}])+?)\/)?\}/g, (match, _escape, name, pattern, replacement, _offset, _str, groups) => {
+	return snippetString.replaceAll(/(?<escape>\\\$)|(?<!\\)\$\{(?<name>\w+)(?:\/(?<pattern>(?:\\\/|[^\/}])+?)\/(?<replacement>(?:\\\/|[^\/}])+?)\/)?\}/g, (match, _escape, name, pattern, replacement, _offset, _str, groups) => {
 		if (groups?.['escape']) {
 			return '$';
 		}

From e0a3ead4fb1394d5e8c9346c6ac9b4986fed44ca Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Mon, 15 Sep 2025 19:12:39 -0600
Subject: [PATCH 1011/1815] Potential fix for code scanning alert no. 60:
 Inefficient regular expression

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 extensions/git/src/gitEditor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/git/src/gitEditor.ts b/extensions/git/src/gitEditor.ts
index 6291e5152a72..27a42af4b820 100644
--- a/extensions/git/src/gitEditor.ts
+++ b/extensions/git/src/gitEditor.ts
@@ -67,7 +67,7 @@ export class GitEditor implements IIPCHandler, ITerminalEnvironmentProvider {
 }
 
 export class GitEditorDocumentLinkProvider implements DocumentLinkProvider {
-	private readonly _regex = /^#\s+(modified|new file|deleted|renamed|copied|type change):\s+(?<file1>.*?)(?:\s+->\s+(?<file2>.*))*$/gm;
+	private readonly _regex = /^#\s+(modified|new file|deleted|renamed|copied|type change):\s+(?<file1>[^\n]*?)(?:\s+->\s+(?<file2>[^\n]*))*$/gm;
 
 	constructor(private readonly _model: Model) { }
 

From 9c37ea17e5b7c1f35454d23c03a50ea179eab17f Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Mon, 15 Sep 2025 19:52:51 -0600
Subject: [PATCH 1012/1815] Potential fix for code scanning alert no. 51:
 Client-side cross-site scripting

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .../browser/view/renderers/webviewPreloads.ts | 42 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 2 deletions(-)

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 5b7077bf1d11..41ce3c0d3f02 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
@@ -19,6 +19,43 @@ import type * as rendererApi from 'vscode-notebook-renderer';
 // function. Imports are not allowed. This is stringified and injected into
 // the webview.
 
+// Minimal HTML sanitizer implementation using browser's DOMParser, 
+// which removes <script> and dangerous attributes. For strong security 
+// consider DOMPurify. Here we use basic sanitization to mitigate XSS risk.
+function sanitizeHTML(dirty: string): string {
+	const parser = new DOMParser();
+	const doc = parser.parseFromString(dirty, 'text/html');
+
+	// Remove script/style/iframe tags
+	const forbiddenTags = ['script', 'style', 'iframe', 'object', 'embed'];
+	for (const tag of forbiddenTags) {
+		const elements = doc.getElementsByTagName(tag);
+		while (elements.length > 0) {
+			elements[0].remove();
+		}
+	}
+
+	// Remove dangerous attributes
+	function sanitizeElement(el: Element) {
+		const dangerousAttrs = ['onerror', 'onload', 'onclick', 'onmouseover', 'onfocus', 'srcdoc', 'onmouseenter', 'onmouseleave'];
+		for (const attr of dangerousAttrs) {
+			if (el.hasAttribute(attr)) {
+				el.removeAttribute(attr);
+			}
+		}
+
+		// Recursively sanitize children
+		for (const child of Array.from(el.children)) {
+			sanitizeElement(child);
+		}
+	}
+	for (const el of Array.from(doc.body.children)) {
+		sanitizeElement(el);
+	}
+
+	return doc.body.innerHTML;
+}
+
 declare module globalThis {
 	const acquireVsCodeApi: () => ({
 		getState(): { [key: string]: unknown };
@@ -2917,8 +2954,9 @@ async function webviewPreloads(ctx: PreloadContext) {
 
 			this._content = { preferredRendererId, preloadErrors };
 			if (content.type === 0 /* RenderOutputType.Html */) {
-				const trustedHtml = ttPolicy?.createHTML(content.htmlContent) ?? content.htmlContent;
-				this.element.innerHTML = trustedHtml as string;  // CodeQL [SM03712] The content comes from renderer extensions, not from direct user input.
+				const sanitizedHtml = sanitizeHTML(content.htmlContent);
+				const trustedHtml = ttPolicy?.createHTML(sanitizedHtml) ?? sanitizedHtml;
+				this.element.innerHTML = trustedHtml as string;
 			} else if (preloadErrors.some(e => e instanceof Error)) {
 				const errors = preloadErrors.filter((e): e is Error => e instanceof Error);
 				showRenderError(`Error loading preloads`, this.element, errors);

From b58981d8764467d9a5f974c2f751bbb7988ac6e7 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Mon, 15 Sep 2025 19:56:42 -0600
Subject: [PATCH 1013/1815] Potential fix for code scanning alert no. 50:
 Client-side cross-site scripting

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .../browser/view/renderers/webviewPreloads.ts | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

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 5b7077bf1d11..16b7ea6a3732 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
@@ -2424,6 +2424,27 @@ async function webviewPreloads(ctx: PreloadContext) {
 		}
 	}();
 
+	// --- Begin DOMPurify Minimal Implementation ---
+	// NOTE: In a production scenario, the full DOMPurify min.js should be included here or loaded up-front wherever allowed. This is a minimal, very basic, example for the notebook webview context.
+	function sanitizeHTML(dirty) {
+		const template = document.createElement('template');
+		template.innerHTML = dirty;
+		// Remove all <script> elements
+		for (const script of template.content.querySelectorAll('script')) {
+			script.remove();
+		}
+		// Remove event handler attributes (on*)
+		for (const el of template.content.querySelectorAll('*')) {
+			for (const attr of Array.from(el.attributes)) {
+				if (/^on/i.test(attr.name)) {
+					el.removeAttribute(attr.name);
+				}
+			}
+		}
+		return template.innerHTML;
+	}
+	// --- End DOMPurify Minimal Implementation ---
+
 	class MarkdownCodeBlock {
 		private static pendingCodeBlocksToHighlight = new Map<string, HTMLElement>();
 
@@ -2432,8 +2453,10 @@ async function webviewPreloads(ctx: PreloadContext) {
 			if (!el) {
 				return;
 			}
-			const trustedHtml = ttPolicy?.createHTML(html) ?? html;
-			el.innerHTML = trustedHtml as string; // CodeQL [SM03712] The rendered content comes from VS Code's tokenizer and is considered safe
+			// Sanitize untrusted HTML before injecting
+			const safeHtml = sanitizeHTML(html);
+			const trustedHtml = ttPolicy?.createHTML(safeHtml) ?? safeHtml;
+			el.innerHTML = trustedHtml as string; // safeHtml is sanitized
 			const root = el.getRootNode();
 			if (root instanceof ShadowRoot) {
 				if (!root.adoptedStyleSheets.includes(tokenizationStyle)) {

From cfbc58176278a9ba6dc01a4261b5f25e2145b9e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Sep 2025 01:38:58 +0000
Subject: [PATCH 1014/1815] Bump the npm_and_yarn group across 1 directory with
 2 updates

Bumps the npm_and_yarn group with 2 updates in the / directory: [postcss](https://github.com/postcss/postcss) and [xml2js](https://github.com/Leonidas-from-XIV/node-xml2js).


Updates `postcss` from 8.4.40 to 8.4.41
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.40...8.4.41)

Updates `xml2js` from 0.6.1 to 0.6.2
- [Commits](https://github.com/Leonidas-from-XIV/node-xml2js/compare/0.6.1...0.6.2)

---
updated-dependencies:
- dependency-name: postcss
  dependency-version: 8.4.41
  dependency-type: direct:development
  dependency-group: npm_and_yarn
- dependency-name: xml2js
  dependency-version: 0.6.2
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 16 ++++++++--------
 package.json      |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 88661ae94230..b2db188dac76 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,7 +140,7 @@
         "os-browserify": "^0.3.0",
         "p-all": "^1.0.0",
         "path-browserify": "^1.0.1",
-        "postcss": "^8.4.40",
+        "postcss": "^8.4.41",
         "postcss-nesting": "^12.0.2",
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
@@ -160,7 +160,7 @@
         "webpack": "^5.94.0",
         "webpack-cli": "^5.1.4",
         "webpack-stream": "^7.0.0",
-        "xml2js": "^0.6.1",
+        "xml2js": "^0.6.2",
         "yaserver": "^0.4.0"
       },
       "optionalDependencies": {
@@ -12545,9 +12545,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.40",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz",
-      "integrity": "sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==",
+      "version": "8.4.41",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
+      "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
       "dev": true,
       "funding": [
         {
@@ -16659,9 +16659,9 @@
       "dev": true
     },
     "node_modules/xml2js": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.1.tgz",
-      "integrity": "sha512-wksiZCYEDvrdwNhv1OIp0IALJdxWF9/ykG85DRkTLjqLIkcadRZxY05dwOX+zTM9aK+7rmtbNRnf3nC7MEqcvQ==",
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
+      "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 960c0f093be6..759cfc08d246 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "os-browserify": "^0.3.0",
     "p-all": "^1.0.0",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.4.40",
+    "postcss": "^8.4.41",
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",
@@ -219,7 +219,7 @@
     "webpack": "^5.94.0",
     "webpack-cli": "^5.1.4",
     "webpack-stream": "^7.0.0",
-    "xml2js": "^0.6.1",
+    "xml2js": "^0.6.2",
     "yaserver": "^0.4.0"
   },
   "overrides": {

From 764761de094e0087c008a9bb82e72a741bdf2af8 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Wed, 17 Sep 2025 19:41:36 -0600
Subject: [PATCH 1015/1815] Potential fix for code scanning alert no. 49:
 Client-side cross-site scripting

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 extensions/markdown-language-features/preview-src/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extensions/markdown-language-features/preview-src/index.ts b/extensions/markdown-language-features/preview-src/index.ts
index 7e5aee5e277e..8153953b606b 100644
--- a/extensions/markdown-language-features/preview-src/index.ts
+++ b/extensions/markdown-language-features/preview-src/index.ts
@@ -10,6 +10,7 @@ import { getEditorLineNumberForPageOffset, scrollToRevealSourceLine, getLineElem
 import { SettingsManager, getData, getRawData } from './settings';
 import throttle = require('lodash.throttle');
 import morphdom from 'morphdom';
+import DOMPurify from 'dompurify';
 import type { ToWebviewMessage } from '../types/previewMessaging';
 import { isOfScheme, Schemes } from '../src/util/schemes';
 
@@ -206,7 +207,8 @@ window.addEventListener('message', async event => {
 			const root = document.querySelector('.markdown-body')!;
 
 			const parser = new DOMParser();
-			const newContent = parser.parseFromString(data.content, 'text/html'); // CodeQL [SM03712] This renderers content from the workspace into the Markdown preview. Webviews (and the markdown preview) have many other security measures in place to make this safe
+			const sanitizedContent = DOMPurify.sanitize(data.content);
+			const newContent = parser.parseFromString(sanitizedContent, 'text/html'); // CodeQL [SM03712] This renderers content from the workspace into the Markdown preview. Webviews (and the markdown preview) have many other security measures in place to make this safe
 
 			// Strip out meta http-equiv tags
 			for (const metaElement of Array.from(newContent.querySelectorAll('meta'))) {

From aee9e03db34281d35db462f2f5636c7559c362e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Sep 2025 01:38:05 +0000
Subject: [PATCH 1016/1815] Bump postcss in the npm_and_yarn group across 1
 directory

Bumps the npm_and_yarn group with 1 update in the / directory: [postcss](https://github.com/postcss/postcss).


Updates `postcss` from 8.4.41 to 8.4.42
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.41...8.4.42)

---
updated-dependencies:
- dependency-name: postcss
  dependency-version: 8.4.42
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b2db188dac76..d9daf596c1df 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,7 +140,7 @@
         "os-browserify": "^0.3.0",
         "p-all": "^1.0.0",
         "path-browserify": "^1.0.1",
-        "postcss": "^8.4.41",
+        "postcss": "^8.4.42",
         "postcss-nesting": "^12.0.2",
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
@@ -12545,9 +12545,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.41",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
-      "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
+      "version": "8.4.42",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.42.tgz",
+      "integrity": "sha512-hywKUQB9Ra4dR1mGhldy5Aj1X3MWDSIA1cEi+Uy0CjheLvP6Ual5RlwMCh8i/X121yEDLDIKBsrCQ8ba3FDMfQ==",
       "dev": true,
       "funding": [
         {
diff --git a/package.json b/package.json
index 759cfc08d246..44bc3ef89547 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "os-browserify": "^0.3.0",
     "p-all": "^1.0.0",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.4.41",
+    "postcss": "^8.4.42",
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",

From 932cd98c4a8985cdb6e69c622a2964f04c2de1ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Sep 2025 01:46:11 +0000
Subject: [PATCH 1017/1815] Bump postcss in the npm_and_yarn group across 1
 directory

Bumps the npm_and_yarn group with 1 update in the / directory: [postcss](https://github.com/postcss/postcss).


Updates `postcss` from 8.4.42 to 8.4.43
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.42...8.4.43)

---
updated-dependencies:
- dependency-name: postcss
  dependency-version: 8.4.43
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d9daf596c1df..fe30a8caa21f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,7 +140,7 @@
         "os-browserify": "^0.3.0",
         "p-all": "^1.0.0",
         "path-browserify": "^1.0.1",
-        "postcss": "^8.4.42",
+        "postcss": "^8.4.43",
         "postcss-nesting": "^12.0.2",
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
@@ -12545,9 +12545,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.42",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.42.tgz",
-      "integrity": "sha512-hywKUQB9Ra4dR1mGhldy5Aj1X3MWDSIA1cEi+Uy0CjheLvP6Ual5RlwMCh8i/X121yEDLDIKBsrCQ8ba3FDMfQ==",
+      "version": "8.4.43",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.43.tgz",
+      "integrity": "sha512-gJAQVYbh5R3gYm33FijzCZj7CHyQ3hWMgJMprLUlIYqCwTeZhBQ19wp0e9mA25BUbEvY5+EXuuaAjqQsrBxQBQ==",
       "dev": true,
       "funding": [
         {
diff --git a/package.json b/package.json
index 44bc3ef89547..c17294cb9d88 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "os-browserify": "^0.3.0",
     "p-all": "^1.0.0",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.4.42",
+    "postcss": "^8.4.43",
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",

From 381e7bea766866d6a43493688b29f9a27780c064 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sat, 20 Sep 2025 20:55:06 -0600
Subject: [PATCH 1018/1815] Potential fix for code scanning alert no. 19: Use
 of a broken or weak cryptographic algorithm

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 src/vs/platform/languagePacks/node/languagePacks.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/platform/languagePacks/node/languagePacks.ts b/src/vs/platform/languagePacks/node/languagePacks.ts
index 9527de9f2c3d..f666ed0ddb19 100644
--- a/src/vs/platform/languagePacks/node/languagePacks.ts
+++ b/src/vs/platform/languagePacks/node/languagePacks.ts
@@ -170,11 +170,11 @@ class LanguagePacksCache extends Disposable {
 
 	private updateHash(languagePack: ILanguagePack): void {
 		if (languagePack) {
-			const md5 = createHash('md5'); // CodeQL [SM04514] Used to create an hash for language pack extension version, which is not a security issue
+			const sha256 = createHash('sha256'); // Secure hash algorithm for language pack extension version
 			for (const extension of languagePack.extensions) {
-				md5.update(extension.extensionIdentifier.uuid || extension.extensionIdentifier.id).update(extension.version); // CodeQL [SM01510] The extension UUID is not sensitive info and is not manually created by a user
+				sha256.update(extension.extensionIdentifier.uuid || extension.extensionIdentifier.id).update(extension.version); // Using secure hash for identifier
 			}
-			languagePack.hash = md5.digest('hex');
+			languagePack.hash = sha256.digest('hex');
 		}
 	}
 

From a94fb6a2815a4c90ae0c4888459703a9f6f6f1c8 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sat, 20 Sep 2025 21:30:42 -0600
Subject: [PATCH 1019/1815] Potential fix for code scanning alert no. 41:
 Useless regular-expression character escape

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 extensions/json/build/update-grammars.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/json/build/update-grammars.js b/extensions/json/build/update-grammars.js
index 2b7f76f8f909..13356a2c4c4e 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);

From eb8f8e8149deffdd93fad7ad25fe8aaa1274deb5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Sep 2025 03:31:09 +0000
Subject: [PATCH 1020/1815] Bump postcss in the npm_and_yarn group across 1
 directory

Bumps the npm_and_yarn group with 1 update in the / directory: [postcss](https://github.com/postcss/postcss).


Updates `postcss` from 8.4.43 to 8.4.44
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.43...8.4.44)

---
updated-dependencies:
- dependency-name: postcss
  dependency-version: 8.4.44
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fe30a8caa21f..a6183a0abdbf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,7 +140,7 @@
         "os-browserify": "^0.3.0",
         "p-all": "^1.0.0",
         "path-browserify": "^1.0.1",
-        "postcss": "^8.4.43",
+        "postcss": "^8.4.44",
         "postcss-nesting": "^12.0.2",
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
@@ -12545,9 +12545,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.43",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.43.tgz",
-      "integrity": "sha512-gJAQVYbh5R3gYm33FijzCZj7CHyQ3hWMgJMprLUlIYqCwTeZhBQ19wp0e9mA25BUbEvY5+EXuuaAjqQsrBxQBQ==",
+      "version": "8.4.44",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.44.tgz",
+      "integrity": "sha512-Aweb9unOEpQ3ezu4Q00DPvvM2ZTUitJdNKeP/+uQgr1IBIqu574IaZoURId7BKtWMREwzKa9OgzPzezWGPWFQw==",
       "dev": true,
       "funding": [
         {
diff --git a/package.json b/package.json
index c17294cb9d88..a89b49c93c2a 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "os-browserify": "^0.3.0",
     "p-all": "^1.0.0",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.4.43",
+    "postcss": "^8.4.44",
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",

From ca60cee51f6b751b19d0a24c35b306efa52a3067 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sun, 21 Sep 2025 00:43:17 -0600
Subject: [PATCH 1021/1815] Potential fix for code scanning alert no. 1: Bad
 HTML filtering regexp

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 src/vs/base/common/marked/marked.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/base/common/marked/marked.js b/src/vs/base/common/marked/marked.js
index b7b6ecccd163..9b3c3630e8f0 100644
--- a/src/vs/base/common/marked/marked.js
+++ b/src/vs/base/common/marked/marked.js
@@ -1008,7 +1008,7 @@ const html = edit('^ {0,3}(?:' // optional indentation
     .replace('tag', _tag)
     .replace('attribute', / +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/)
     .getRegex();
-const paragraph = edit(_paragraph)
+const paragraph = edit(_paragraph, 'i') // <-- add 'i' flag for case-insensitivity
     .replace('hr', hr)
     .replace('heading', ' {0,3}#{1,6}(?:\\s|$)')
     .replace('|lheading', '') // setext headings don't interrupt commonmark paragraphs

From d7839ae47010f2e7e55867b1070be4d5d54d7bd2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Sep 2025 06:45:11 +0000
Subject: [PATCH 1022/1815] Bump postcss in the npm_and_yarn group across 1
 directory

Bumps the npm_and_yarn group with 1 update in the / directory: [postcss](https://github.com/postcss/postcss).


Updates `postcss` from 8.4.44 to 8.4.45
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.44...8.4.45)

---
updated-dependencies:
- dependency-name: postcss
  dependency-version: 8.4.45
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a6183a0abdbf..7b9d247a9369 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,7 +140,7 @@
         "os-browserify": "^0.3.0",
         "p-all": "^1.0.0",
         "path-browserify": "^1.0.1",
-        "postcss": "^8.4.44",
+        "postcss": "^8.4.45",
         "postcss-nesting": "^12.0.2",
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
@@ -12545,9 +12545,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.44",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.44.tgz",
-      "integrity": "sha512-Aweb9unOEpQ3ezu4Q00DPvvM2ZTUitJdNKeP/+uQgr1IBIqu574IaZoURId7BKtWMREwzKa9OgzPzezWGPWFQw==",
+      "version": "8.4.45",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz",
+      "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==",
       "dev": true,
       "funding": [
         {
diff --git a/package.json b/package.json
index a89b49c93c2a..f01a0466ab40 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "os-browserify": "^0.3.0",
     "p-all": "^1.0.0",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.4.44",
+    "postcss": "^8.4.45",
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",

From 516f1b32caf8d307197672c4f523653a289118ba Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sun, 21 Sep 2025 00:46:33 -0600
Subject: [PATCH 1023/1815] Potential fix for code scanning alert no. 9:
 Incomplete string escaping or encoding

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 src/vs/base/common/htmlContent.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/base/common/htmlContent.ts b/src/vs/base/common/htmlContent.ts
index 070103b838d2..4fa81895fa27 100644
--- a/src/vs/base/common/htmlContent.ts
+++ b/src/vs/base/common/htmlContent.ts
@@ -70,6 +70,7 @@ export class MarkdownString implements IMarkdownString {
 
 	appendText(value: string, newlineStyle: MarkdownStringTextNewlineStyle = MarkdownStringTextNewlineStyle.Paragraph): MarkdownString {
 		this.value += escapeMarkdownSyntaxTokens(this.supportThemeIcons ? escapeIcons(value) : value) // CodeQL [SM02383] The Markdown is fully sanitized after being rendered.
+			.replace(/\\/g, '\\\\') // Escape backslash characters
 			.replace(/([ \t]+)/g, (_match, g1) => '&nbsp;'.repeat(g1.length)) // CodeQL [SM02383] The Markdown is fully sanitized after being rendered.
 			.replace(/\>/gm, '\\>') // CodeQL [SM02383] The Markdown is fully sanitized after being rendered.
 			.replace(/\n/g, newlineStyle === MarkdownStringTextNewlineStyle.Break ? '\\\n' : '\n\n'); // CodeQL [SM02383] The Markdown is fully sanitized after being rendered.

From 56686c24f0d8c55bb405d02fda359038062f56f5 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sun, 21 Sep 2025 00:48:36 -0600
Subject: [PATCH 1024/1815] Potential fix for code scanning alert no. 13:
 Incomplete string escaping or encoding

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 src/vs/workbench/contrib/debug/node/debugAdapter.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/debug/node/debugAdapter.ts b/src/vs/workbench/contrib/debug/node/debugAdapter.ts
index 4892338a1c1a..c6cdb3c6979e 100644
--- a/src/vs/workbench/contrib/debug/node/debugAdapter.ts
+++ b/src/vs/workbench/contrib/debug/node/debugAdapter.ts
@@ -240,7 +240,10 @@ export class ExecutableDebugAdapter extends StreamDebugAdapter {
 					spawnOptions.shell = true;
 					spawnCommand = `"${command}"`;
 					spawnArgs = args.map(a => {
-						a = a.replace(/"/g, '\\"'); // Escape existing double quotes with \
+						// Escape backslashes first
+						a = a.replace(/\\/g, '\\\\');
+						// Then escape double quotes
+						a = a.replace(/"/g, '\\"');
 						// Wrap in double quotes
 						return `"${a}"`;
 					});

From 6bb4b18dcf37f1532c8e60f3a9bd30bb82941f49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Sep 2025 23:20:57 +0000
Subject: [PATCH 1025/1815] Bump postcss in the npm_and_yarn group across 1
 directory

Bumps the npm_and_yarn group with 1 update in the / directory: [postcss](https://github.com/postcss/postcss).


Updates `postcss` from 8.4.45 to 8.4.46
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.45...8.4.46)

---
updated-dependencies:
- dependency-name: postcss
  dependency-version: 8.4.46
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 19 ++++++++++---------
 package.json      |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7b9d247a9369..1836a776d5a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,7 +140,7 @@
         "os-browserify": "^0.3.0",
         "p-all": "^1.0.0",
         "path-browserify": "^1.0.1",
-        "postcss": "^8.4.45",
+        "postcss": "^8.4.46",
         "postcss-nesting": "^12.0.2",
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
@@ -12545,9 +12545,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.45",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz",
-      "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==",
+      "version": "8.4.46",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.46.tgz",
+      "integrity": "sha512-73x4XLhY0QNN+87/u6F7TRq+yl3xPAjlbRRvhly1mAKJgNO4q5fiqegez/Yi3u+ez8wbBXXqY9N1+RAJAVCzEw==",
       "dev": true,
       "funding": [
         {
@@ -12566,8 +12566,8 @@
       "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.7",
-        "picocolors": "^1.0.1",
-        "source-map-js": "^1.2.0"
+        "picocolors": "^1.1.0",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -14327,10 +14327,11 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "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"
       }
diff --git a/package.json b/package.json
index f01a0466ab40..64a6a2a3e512 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "os-browserify": "^0.3.0",
     "p-all": "^1.0.0",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.4.45",
+    "postcss": "^8.4.46",
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",

From b74e1deb365dc9524c7c6501b58640065897b9dc Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sun, 21 Sep 2025 17:21:57 -0600
Subject: [PATCH 1026/1815] Potential fix for code scanning alert no. 42:
 Useless regular-expression character escape

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .../workbench/contrib/replNotebook/browser/replEditorInput.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/replNotebook/browser/replEditorInput.ts b/src/vs/workbench/contrib/replNotebook/browser/replEditorInput.ts
index 271af8eac541..eb0dc144a1a0 100644
--- a/src/vs/workbench/contrib/replNotebook/browser/replEditorInput.ts
+++ b/src/vs/workbench/contrib/replNotebook/browser/replEditorInput.ts
@@ -69,7 +69,7 @@ export class ReplEditorInput extends NotebookEditorInput implements ICompositeNo
 		}
 
 		if (resource.scheme === 'untitled') {
-			const match = new RegExp('Untitled-(\\d+)\.').exec(resource.path);
+			const match = new RegExp('Untitled-(\\d+)\\.').exec(resource.path);
 			if (match?.length === 2) {
 				return `REPL - ${match[1]}`;
 			}

From adf1228ffa06909eb4acef82e139ba6610d6a613 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sun, 21 Sep 2025 19:01:20 -0600
Subject: [PATCH 1027/1815] Potential fix for code scanning alert no. 48: DOM
 text reinterpreted as HTML

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .../simple-browser/preview-src/index.ts       | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/extensions/simple-browser/preview-src/index.ts b/extensions/simple-browser/preview-src/index.ts
index 3d804aa60fa4..0e16b0b24695 100644
--- a/extensions/simple-browser/preview-src/index.ts
+++ b/extensions/simple-browser/preview-src/index.ts
@@ -90,18 +90,27 @@ onceDocumentLoaded(() => {
 	toggleFocusLockIndicatorEnabled(settings.focusLockIndicatorEnabled);
 
 	function navigateTo(rawUrl: string): void {
+		let safeUrl: string | null = null;
 		try {
 			const url = new URL(rawUrl);
-
-			// Try to bust the cache for the iframe
-			// There does not appear to be any way to reliably do this except modifying the url
-			url.searchParams.append('vscodeBrowserReqId', Date.now().toString());
-
-			iframe.src = url.toString();
+			if (url.protocol === 'http:' || url.protocol === 'https:') {
+				// Try to bust the cache for the iframe
+				url.searchParams.append('vscodeBrowserReqId', Date.now().toString());
+				safeUrl = url.toString();
+			}
 		} catch {
-			iframe.src = rawUrl;
+			// Fallback if URL parsing fails
+			// Try to match http/https only
+			if (/^(https?:\/\/)/i.test(rawUrl)) {
+				safeUrl = rawUrl;
+			}
+		}
+		if (safeUrl) {
+			iframe.src = safeUrl;
+		} else {
+			// Optionally, display an error or set to about:blank
+			iframe.src = 'about:blank';
 		}
-
 		vscode.setState({ url: rawUrl });
 	}
 });

From 9fbe30808efa4913ae6665479b4e995dc9c1710a Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sun, 21 Sep 2025 20:55:10 -0600
Subject: [PATCH 1028/1815] Potential fix for code scanning alert no. 20:
 Regular expression injection

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 src/vs/base/common/marshalling.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/vs/base/common/marshalling.ts b/src/vs/base/common/marshalling.ts
index 82fcd1234d09..f32bbd68ff30 100644
--- a/src/vs/base/common/marshalling.ts
+++ b/src/vs/base/common/marshalling.ts
@@ -33,6 +33,10 @@ function replacer(key: string, value: any): any {
 	return value;
 }
 
+// Utility function to escape RegExp special characters
+function escapeRegExp(string: string): string {
+	return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
+}
 
 type Deserialize<T> = T extends UriComponents ? URI
 	: T extends VSBuffer ? VSBuffer
@@ -51,7 +55,7 @@ export function revive<T = any>(obj: any, depth = 0): Revived<T> {
 
 		switch ((<MarshalledObject>obj).$mid) {
 			case MarshalledId.Uri: return <any>URI.revive(obj);
-			case MarshalledId.Regexp: return <any>new RegExp(obj.source, obj.flags);
+			case MarshalledId.Regexp: return <any>new RegExp(escapeRegExp(obj.source), obj.flags);
 			case MarshalledId.Date: return <any>new Date(obj.source);
 		}
 

From 144689735fe84aa79c01cad445a25b17c92d861e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Sep 2025 02:55:45 +0000
Subject: [PATCH 1029/1815] Bump postcss in the npm_and_yarn group across 1
 directory

Bumps the npm_and_yarn group with 1 update in the / directory: [postcss](https://github.com/postcss/postcss).


Updates `postcss` from 8.4.46 to 8.4.47
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.46...8.4.47)

---
updated-dependencies:
- dependency-name: postcss
  dependency-version: 8.4.47
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1836a776d5a5..27b384d59b6a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,7 +140,7 @@
         "os-browserify": "^0.3.0",
         "p-all": "^1.0.0",
         "path-browserify": "^1.0.1",
-        "postcss": "^8.4.46",
+        "postcss": "^8.4.47",
         "postcss-nesting": "^12.0.2",
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
@@ -12545,9 +12545,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.46",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.46.tgz",
-      "integrity": "sha512-73x4XLhY0QNN+87/u6F7TRq+yl3xPAjlbRRvhly1mAKJgNO4q5fiqegez/Yi3u+ez8wbBXXqY9N1+RAJAVCzEw==",
+      "version": "8.4.47",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
       "dev": true,
       "funding": [
         {
diff --git a/package.json b/package.json
index 64a6a2a3e512..1761adc81015 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "os-browserify": "^0.3.0",
     "p-all": "^1.0.0",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.4.46",
+    "postcss": "^8.4.47",
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",

From f0fe825edeb79734c85a8e092bda5c40dd85e98c Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sun, 21 Sep 2025 20:56:27 -0600
Subject: [PATCH 1030/1815] Potential fix for code scanning alert no. 8:
 Incomplete string escaping or encoding

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .../src/languageFeatures/util/textRendering.ts                 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts b/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts
index f44ac0c4f407..b0acc74db201 100644
--- a/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/util/textRendering.ts
@@ -210,7 +210,8 @@ function convertLinkTags(
 }
 
 function escapeMarkdownSyntaxTokensForCode(text: string): string {
-	return text.replace(/`/g, '\\$&'); // CodeQL [SM02383] This is only meant to escape backticks. The Markdown is fully sanitized after being rendered.
+	// First escape backslashes, then backticks
+	return text.replace(/\\/g, '\\\\').replace(/`/g, '\\$&'); // CodeQL [SM02383] This now escapes backticks and backslashes.
 }
 
 export function tagsToMarkdown(

From b19c101d47141e672c7f1bc7306afcc6d243ab97 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sun, 21 Sep 2025 21:00:55 -0600
Subject: [PATCH 1031/1815] Potential fix for code scanning alert no. 18:
 Information exposure through a stack trace

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 src/vs/workbench/api/node/extHostCLIServer.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/vs/workbench/api/node/extHostCLIServer.ts b/src/vs/workbench/api/node/extHostCLIServer.ts
index 01bc190d579f..0b040acb868a 100644
--- a/src/vs/workbench/api/node/extHostCLIServer.ts
+++ b/src/vs/workbench/api/node/extHostCLIServer.ts
@@ -112,8 +112,7 @@ export class CLIServerBase {
 				}
 				sendResponse(200, returnObj);
 			} catch (e) {
-				const message = e instanceof Error ? e.message : JSON.stringify(e);
-				sendResponse(500, message);
+				sendResponse(500, "An internal server error occurred.");
 				this.logService.error('Error while processing pipe request', e);
 			}
 		});

From 929159a6a185f4769498e3618dc7a479d7e17aff Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sun, 21 Sep 2025 22:55:04 -0600
Subject: [PATCH 1032/1815] Potential fix for code scanning alert no. 78:
 Workflow does not contain permissions

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .github/workflows/monaco-editor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/monaco-editor.yml b/.github/workflows/monaco-editor.yml
index 842e327735f5..83159b8c5f3b 100644
--- a/.github/workflows/monaco-editor.yml
+++ b/.github/workflows/monaco-editor.yml
@@ -1,4 +1,6 @@
 name: Monaco Editor checks
+permissions:
+  contents: read
 
 on:
   push:

From 36c1b5b4ecbb821629283b9d02564201d762a8cb Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sun, 21 Sep 2025 22:56:03 -0600
Subject: [PATCH 1033/1815] Potential fix for code scanning alert no. 15:
 Incomplete string escaping or encoding

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .../contrib/terminal/browser/terminalProfileQuickpick.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProfileQuickpick.ts b/src/vs/workbench/contrib/terminal/browser/terminalProfileQuickpick.ts
index eff79840baf6..78f4ea23fede 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProfileQuickpick.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProfileQuickpick.ts
@@ -275,7 +275,7 @@ export class TerminalProfileQuickpick {
 			}
 			const argsString = profile.args.map(e => {
 				if (e.includes(' ')) {
-					return `"${e.replace(/"/g, '\\"')}"`; // CodeQL [SM02383] js/incomplete-sanitization This is only used as a label on the UI so this isn't a problem
+					return `"${e.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`; // First escape backslashes, then quotes for correct display
 				}
 				return e;
 			}).join(' ');

From 093e6166e08ec69c329ca6363f8f5edab6ea731a Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sun, 21 Sep 2025 22:56:16 -0600
Subject: [PATCH 1034/1815] Potential fix for code scanning alert no. 7:
 Incomplete string escaping or encoding

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .../src/languageFeatures/jsDocCompletions.ts                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/typescript-language-features/src/languageFeatures/jsDocCompletions.ts b/extensions/typescript-language-features/src/languageFeatures/jsDocCompletions.ts
index f2c1b49c67f2..7bf3eb47da71 100644
--- a/extensions/typescript-language-features/src/languageFeatures/jsDocCompletions.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/jsDocCompletions.ts
@@ -103,7 +103,7 @@ class JsDocCompletionProvider implements vscode.CompletionItemProvider {
 export function templateToSnippet(template: string): vscode.SnippetString {
 	// TODO: use append placeholder
 	let snippetIndex = 1;
-	template = template.replace(/\$/g, '\\$'); // CodeQL [SM02383] This is only used for text which is put into the editor. It is not for rendered html
+	template = template.replace(/\\/g, '\\\\').replace(/\$/g, '\\$'); // Escape backslash and dollar for VSCode snippets
 	template = template.replace(/^[ \t]*(?=(\/|[ ]\*))/gm, '');
 	template = template.replace(/^(\/\*\*\s*\*[ ]*)$/m, (x) => x + `\$0`);
 	template = template.replace(/\* @param([ ]\{\S+\})?\s+(\S+)[ \t]*$/gm, (_param, type, post) => {

From da1a0d5ce1555cf2c6faafd08879e4f8e59095e8 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sun, 21 Sep 2025 22:57:23 -0600
Subject: [PATCH 1035/1815] Potential fix for code scanning alert no. 81:
 Workflow does not contain permissions

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .github/workflows/basic.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
index a1a5c5ad477f..7b3ead417366 100644
--- a/.github/workflows/basic.yml
+++ b/.github/workflows/basic.yml
@@ -1,4 +1,6 @@
 name: Basic checks
+permissions:
+  contents: read
 
 on: workflow_dispatch
 

From 594cf4bbe28e9557978a3461fb56b8185b70bfd8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Sep 2025 20:46:17 +0000
Subject: [PATCH 1036/1815] Bump postcss in the npm_and_yarn group across 1
 directory

Bumps the npm_and_yarn group with 1 update in the / directory: [postcss](https://github.com/postcss/postcss).


Updates `postcss` from 8.4.47 to 8.4.48
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.47...8.4.48)

---
updated-dependencies:
- dependency-name: postcss
  dependency-version: 8.4.48
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 16 ++++++++--------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 27b384d59b6a..0c50b3e3d652 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,7 +140,7 @@
         "os-browserify": "^0.3.0",
         "p-all": "^1.0.0",
         "path-browserify": "^1.0.1",
-        "postcss": "^8.4.47",
+        "postcss": "^8.4.48",
         "postcss-nesting": "^12.0.2",
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
@@ -12348,9 +12348,9 @@
       "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA= sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
     },
     "node_modules/picocolors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
-      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
+      "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"
     },
@@ -12545,9 +12545,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.47",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
-      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+      "version": "8.4.48",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.48.tgz",
+      "integrity": "sha512-GCRK8F6+Dl7xYniR5a4FYbpBzU8XnZVeowqsQFYdcXuSbChgiks7qybSkbvnaeqv0G0B+dd9/jJgH8kkLDQeEA==",
       "dev": true,
       "funding": [
         {
@@ -12566,7 +12566,7 @@
       "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.7",
-        "picocolors": "^1.1.0",
+        "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
       "engines": {
diff --git a/package.json b/package.json
index 1761adc81015..2418d62ac339 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "os-browserify": "^0.3.0",
     "p-all": "^1.0.0",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.4.47",
+    "postcss": "^8.4.48",
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",

From 7dd199ab01c1172fa3e00d4dcfb5029f07b369f2 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Tue, 23 Sep 2025 14:46:42 -0600
Subject: [PATCH 1037/1815] Potential fix for code scanning alert no. 92: DOM
 text reinterpreted as HTML

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 extensions/simple-browser/preview-src/index.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/extensions/simple-browser/preview-src/index.ts b/extensions/simple-browser/preview-src/index.ts
index 0e16b0b24695..106146f86579 100644
--- a/extensions/simple-browser/preview-src/index.ts
+++ b/extensions/simple-browser/preview-src/index.ts
@@ -99,11 +99,7 @@ onceDocumentLoaded(() => {
 				safeUrl = url.toString();
 			}
 		} catch {
-			// Fallback if URL parsing fails
-			// Try to match http/https only
-			if (/^(https?:\/\/)/i.test(rawUrl)) {
-				safeUrl = rawUrl;
-			}
+			// On parse error, do not attempt to match with regex; keep safeUrl as null.
 		}
 		if (safeUrl) {
 			iframe.src = safeUrl;

From e60a883e9b356530ec2c13f87227b960b1605af9 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Tue, 23 Sep 2025 15:03:59 -0600
Subject: [PATCH 1038/1815] Potential fix for code scanning alert no. 39:
 Prototype-polluting function

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 src/vs/base/common/objects.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/base/common/objects.ts b/src/vs/base/common/objects.ts
index 94c2fb717d2b..20b08dbe69fb 100644
--- a/src/vs/base/common/objects.ts
+++ b/src/vs/base/common/objects.ts
@@ -93,6 +93,10 @@ export function mixin(destination: any, source: any, overwrite: boolean = true):
 
 	if (isObject(source)) {
 		Object.keys(source).forEach(key => {
+			if (key === '__proto__' || key === 'constructor') {
+				// Prevent prototype pollution
+				return;
+			}
 			if (key in destination) {
 				if (overwrite) {
 					if (isObject(destination[key]) && isObject(source[key])) {

From eaccbc5faff69c5ca5ecb0ee942208435c39e769 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Tue, 23 Sep 2025 15:06:07 -0600
Subject: [PATCH 1039/1815] Potential fix for code scanning alert no. 46: DOM
 text reinterpreted as HTML

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 extensions/media-preview/media/videoPreview.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/extensions/media-preview/media/videoPreview.js b/extensions/media-preview/media/videoPreview.js
index eeed26972a31..8ff6ddcb8d52 100644
--- a/extensions/media-preview/media/videoPreview.js
+++ b/extensions/media-preview/media/videoPreview.js
@@ -5,6 +5,18 @@
 // @ts-check
 "use strict";
 
+// Returns true if src is a safe URL for video.src
+function isSafeVideoSrc(src) {
+	try {
+		const allowedProtocols = ['http:', 'https:', 'blob:', 'filesystem:', ''];
+		// If relative URL, use document.baseURI as base
+		const url = new URL(src, document.baseURI);
+		return allowedProtocols.includes(url.protocol);
+	} catch {
+		return false;
+	}
+}
+
 (function () {
 	// @ts-ignore
 	const vscode = acquireVsCodeApi();
@@ -28,7 +40,7 @@
 
 	// Elements
 	const video = document.createElement('video');
-	if (settings.src !== null) {
+	if (settings.src !== null && isSafeVideoSrc(settings.src)) {
 		video.src = settings.src;
 	}
 	video.playsInline = true;

From 0037645dac4ce5002a914ce0d7054c2da1b4edaa Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Tue, 23 Sep 2025 15:58:41 -0600
Subject: [PATCH 1040/1815] Potential fix for code scanning alert no. 85:
 Workflow does not contain permissions

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a860f588616..d87bd3621d06 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,6 @@
 name: CI
+permissions:
+  contents: read
 
 on: workflow_dispatch
 

From a9e156b9f8960d9e1ec0f8d3785d5bd63ecb6d43 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Tue, 23 Sep 2025 16:05:20 -0600
Subject: [PATCH 1041/1815] Potential fix for code scanning alert no. 40:
 Prototype-polluting function

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 src/vs/editor/common/config/editorOptions.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 6388b3c386c8..d77ebf0f3bf4 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -1082,6 +1082,9 @@ function applyUpdate<T>(value: T | undefined, update: T): ApplyUpdateResult<T> {
 	let didChange = false;
 	for (const key in update) {
 		if ((update as T & object).hasOwnProperty(key)) {
+			if (key === '__proto__' || key === 'constructor' || key === 'prototype') {
+				continue;
+			}
 			const result = applyUpdate(value[key], update[key]);
 			if (result.didChange) {
 				value[key] = result.newValue;

From c9d683e4fe42d4f51f20d269a71b2611def84ca4 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Tue, 23 Sep 2025 16:08:02 -0600
Subject: [PATCH 1042/1815] Potential fix for code scanning alert no. 37: Shell
 command built from environment values

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 build/azure-pipelines/publish-types/update-types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/azure-pipelines/publish-types/update-types.ts b/build/azure-pipelines/publish-types/update-types.ts
index 0f99b07cf9a3..3bb02b7adabd 100644
--- a/build/azure-pipelines/publish-types/update-types.ts
+++ b/build/azure-pipelines/publish-types/update-types.ts
@@ -16,7 +16,7 @@ try {
 
 	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}`);
+	cp.execFileSync('curl', [dtsUri, '--output', outPath]);
 
 	updateDTSFile(outPath, tag);
 

From 97a1df3a287b3292df434ebe84cf5ff9abc352d0 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Tue, 23 Sep 2025 19:13:49 -0600
Subject: [PATCH 1043/1815] Potential fix for code scanning alert no. 47: DOM
 text reinterpreted as HTML

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .../media-preview/media/imagePreview.js       | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/extensions/media-preview/media/imagePreview.js b/extensions/media-preview/media/imagePreview.js
index ab8ad542a2d9..e400a0cd2bcf 100644
--- a/extensions/media-preview/media/imagePreview.js
+++ b/extensions/media-preview/media/imagePreview.js
@@ -311,7 +311,44 @@
 		document.body.classList.remove('loading');
 	});
 
-	image.src = settings.src;
+	/**
+	 * Validate and ensure only safe image sources can be used.
+	 * @param {string} src
+	 * @return {boolean}
+	 */
+	function isSafeImageSrc(src) {
+		try {
+			if (typeof src !== 'string' || src.length > 2048) {
+				return false;
+			}
+			// Allow http, https, file, and data URIs for images only
+			const allowedSchemes = ['http:', 'https:', 'file:'];
+			const urlMatch = src.match(/^([a-zA-Z0-9+.-]+):/);
+			if (!urlMatch) {
+				return false;
+			}
+			const scheme = urlMatch[1].toLowerCase() + ':';
+			if (allowedSchemes.includes(scheme)) {
+				return true;
+			}
+			if (scheme === 'data:') {
+				// Allow only image media types in data URLs
+				return /^data:image\/(png|jpe?g|gif|bmp|webp|svg\+xml);base64,/.test(src);
+			}
+			return false;
+		} catch {
+			return false;
+		}
+	}
+
+	if (isSafeImageSrc(settings.src)) {
+		image.src = settings.src;
+	} else {
+		console.error('Unsafe image src detected:', settings.src);
+		image.src = '';
+		document.body.classList.add('error');
+		document.body.classList.remove('loading');
+	}
 
 	document.querySelector('.open-file-link')?.addEventListener('click', (e) => {
 		e.preventDefault();

From a97406bac907ea5ab9e5c4282d017ad96da89279 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Tue, 23 Sep 2025 19:16:14 -0600
Subject: [PATCH 1044/1815] Potential fix for code scanning alert no. 71:
 Prototype-polluting function

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .../common/observableInternal/logging/debugger/utils.ts     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/vs/base/common/observableInternal/logging/debugger/utils.ts b/src/vs/base/common/observableInternal/logging/debugger/utils.ts
index 2648b82cffdd..be076beded13 100644
--- a/src/vs/base/common/observableInternal/logging/debugger/utils.ts
+++ b/src/vs/base/common/observableInternal/logging/debugger/utils.ts
@@ -96,6 +96,9 @@ export class Throttler implements IDisposable {
 
 export function deepAssign<T>(target: T, source: T): void {
 	for (const key in source) {
+		if (key === '__proto__' || key === 'constructor' || key === 'prototype') {
+			continue;
+		}
 		if (!!target[key] && typeof target[key] === 'object' && !!source[key] && typeof source[key] === 'object') {
 			deepAssign(target[key], source[key]);
 		} else {
@@ -106,6 +109,9 @@ export function deepAssign<T>(target: T, source: T): void {
 
 export function deepAssignDeleteNulls<T>(target: T, source: T): void {
 	for (const key in source) {
+		if (key === '__proto__' || key === 'constructor' || key === 'prototype') {
+			continue;
+		}
 		if (source[key] === null) {
 			delete target[key];
 		} else if (!!target[key] && typeof target[key] === 'object' && !!source[key] && typeof source[key] === 'object') {

From da75f831f499b685abfe3f29b9f079d019cc2bb1 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Tue, 23 Sep 2025 19:17:02 -0600
Subject: [PATCH 1045/1815] Potential fix for code scanning alert no. 72:
 Prototype-polluting function

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .../base/common/observableInternal/logging/debugger/utils.ts   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/vs/base/common/observableInternal/logging/debugger/utils.ts b/src/vs/base/common/observableInternal/logging/debugger/utils.ts
index 2648b82cffdd..891be7ea9e72 100644
--- a/src/vs/base/common/observableInternal/logging/debugger/utils.ts
+++ b/src/vs/base/common/observableInternal/logging/debugger/utils.ts
@@ -106,6 +106,9 @@ export function deepAssign<T>(target: T, source: T): void {
 
 export function deepAssignDeleteNulls<T>(target: T, source: T): void {
 	for (const key in source) {
+		if (key === '__proto__' || key === 'constructor') {
+			continue;
+		}
 		if (source[key] === null) {
 			delete target[key];
 		} else if (!!target[key] && typeof target[key] === 'object' && !!source[key] && typeof source[key] === 'object') {

From 4341e3b6dde742586c24c452bdda18aa8b2941ad Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Tue, 23 Sep 2025 19:17:50 -0600
Subject: [PATCH 1046/1815] Potential fix for code scanning alert no. 82:
 Workflow does not contain permissions

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .github/workflows/telemetry.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml
index 8b28897b16fe..8863d52e8194 100644
--- a/.github/workflows/telemetry.yml
+++ b/.github/workflows/telemetry.yml
@@ -4,6 +4,8 @@ on:
 jobs:
   check-metdata:
     name: 'Check metadata'
+    permissions:
+      contents: read
     runs-on: 'ubuntu-latest'
 
     steps:

From 2cac66f6cfd1011bced26dedb80a3ab76dc0a6ac Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Tue, 23 Sep 2025 21:17:21 -0600
Subject: [PATCH 1047/1815] Potential fix for code scanning alert no. 2: Bad
 HTML filtering regexp

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 src/vs/base/common/marked/marked.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/common/marked/marked.js b/src/vs/base/common/marked/marked.js
index 9b3c3630e8f0..3f45884d5d25 100644
--- a/src/vs/base/common/marked/marked.js
+++ b/src/vs/base/common/marked/marked.js
@@ -1045,7 +1045,7 @@ const blockNormal = {
  */
 const gfmTable = edit('^ *([^\\n ].*)\\n' // Header
     + ' {0,3}((?:\\| *)?:?-+:? *(?:\\| *:?-+:? *)*(?:\\| *)?)' // Align
-    + '(?:\\n((?:(?! *\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)') // Cells
+    + '(?:\\n((?:(?! *\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)', 'i') // Cells: add case-insensitive flag
     .replace('hr', hr)
     .replace('heading', ' {0,3}#{1,6}(?:\\s|$)')
     .replace('blockquote', ' {0,3}>')
@@ -1058,7 +1058,7 @@ const gfmTable = edit('^ *([^\\n ].*)\\n' // Header
 const blockGfm = {
     ...blockNormal,
     table: gfmTable,
-    paragraph: edit(_paragraph)
+    paragraph: edit(_paragraph, 'i') // add case-insensitive flag
         .replace('hr', hr)
         .replace('heading', ' {0,3}#{1,6}(?:\\s|$)')
         .replace('|lheading', '') // setext headings don't interrupt commonmark paragraphs

From 95a3f735f81320b9fc411aba9adaa14997021b57 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Tue, 23 Sep 2025 23:19:34 -0600
Subject: [PATCH 1048/1815] Potential fix for code scanning alert no. 93: DOM
 text reinterpreted as HTML

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 extensions/media-preview/media/imagePreview.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/media-preview/media/imagePreview.js b/extensions/media-preview/media/imagePreview.js
index e400a0cd2bcf..282e2a82cb94 100644
--- a/extensions/media-preview/media/imagePreview.js
+++ b/extensions/media-preview/media/imagePreview.js
@@ -333,7 +333,8 @@
 			}
 			if (scheme === 'data:') {
 				// Allow only image media types in data URLs
-				return /^data:image\/(png|jpe?g|gif|bmp|webp|svg\+xml);base64,/.test(src);
+				// Disallow SVG images for data URIs to mitigate XSS
+				return /^data:image\/(png|jpe?g|gif|bmp|webp);base64,/.test(src);
 			}
 			return false;
 		} catch {

From dd94758a48e80e568176e8cd0ccd073d34272514 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Tue, 23 Sep 2025 23:28:06 -0600
Subject: [PATCH 1049/1815] Potential fix for code scanning alert no. 5: Bad
 HTML filtering regexp

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 src/vs/editor/test/common/modes/supports/indentationRules.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/test/common/modes/supports/indentationRules.ts b/src/vs/editor/test/common/modes/supports/indentationRules.ts
index 0967de48bff7..996d990d6696 100644
--- a/src/vs/editor/test/common/modes/supports/indentationRules.ts
+++ b/src/vs/editor/test/common/modes/supports/indentationRules.ts
@@ -27,7 +27,7 @@ export const goIndentationRules = {
 };
 
 export const htmlIndentationRules = {
-	decreaseIndentPattern: /^\s*(<\/(?!html)[-_\.A-Za-z0-9]+\b[^>]*>|-->|\})/,
+	decreaseIndentPattern: /^\s*(<\/(?!html)[-_\.A-Za-z0-9]+\b[^>]*>|--!?>|\})/,
 	increaseIndentPattern: /<(?!\?|(?:area|base|br|col|frame|hr|html|img|input|keygen|link|menuitem|meta|param|source|track|wbr)\b|[^>]*\/>)([-_\.A-Za-z0-9]+)(?=\s|>)\b[^>]*>(?!.*<\/\1>)|<!--(?!.*-->)|\{[^}"']*$/,
 };
 

From 51b8d78304bc71c2b6995874a7231ca9aedb21ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Sep 2025 20:15:19 +0000
Subject: [PATCH 1050/1815] Bump postcss in the npm_and_yarn group across 1
 directory

Bumps the npm_and_yarn group with 1 update in the / directory: [postcss](https://github.com/postcss/postcss).


Updates `postcss` from 8.4.48 to 8.4.49
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.48...8.4.49)

---
updated-dependencies:
- dependency-name: postcss
  dependency-version: 8.4.49
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 20 ++++++++++----------
 package.json      |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0c50b3e3d652..f06f4f2878c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,7 +140,7 @@
         "os-browserify": "^0.3.0",
         "p-all": "^1.0.0",
         "path-browserify": "^1.0.1",
-        "postcss": "^8.4.48",
+        "postcss": "^8.4.49",
         "postcss-nesting": "^12.0.2",
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
@@ -12545,9 +12545,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.48",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.48.tgz",
-      "integrity": "sha512-GCRK8F6+Dl7xYniR5a4FYbpBzU8XnZVeowqsQFYdcXuSbChgiks7qybSkbvnaeqv0G0B+dd9/jJgH8kkLDQeEA==",
+      "version": "8.4.49",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
       "dev": true,
       "funding": [
         {
@@ -13245,9 +13245,9 @@
       }
     },
     "node_modules/prebuild-install/node_modules/tar-fs": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz",
-      "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
+      "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
       "license": "MIT",
       "dependencies": {
         "chownr": "^1.1.1",
@@ -14995,9 +14995,9 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.0.tgz",
-      "integrity": "sha512-5Mty5y/sOF1YWj1J6GiBodjlDc05CUR8PKXrsnFAiSG0xA+GHeWLovaZPYUDXkH/1iKRf2+M5+OrRgzC7O9b7w==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.1.tgz",
+      "integrity": "sha512-LZA0oaPOc2fVo82Txf3gw+AkEd38szODlptMYejQUhndHMLQ9M059uXR+AfS7DNo0NpINvSqDsvyaCrBVkptWg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 2418d62ac339..70de746baf8d 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "os-browserify": "^0.3.0",
     "p-all": "^1.0.0",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.4.48",
+    "postcss": "^8.4.49",
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",

From 021c828699e1d88410cb0666609432f3e5ce8734 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Wed, 24 Sep 2025 17:02:57 -0600
Subject: [PATCH 1051/1815] Potential fix for code scanning alert no. 4: Bad
 HTML filtering regexp

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 src/vs/base/common/marked/marked.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/base/common/marked/marked.js b/src/vs/base/common/marked/marked.js
index 3f45884d5d25..d3f5308839b1 100644
--- a/src/vs/base/common/marked/marked.js
+++ b/src/vs/base/common/marked/marked.js
@@ -1143,7 +1143,7 @@ const autolink = edit(/^<(scheme:[^\s\x00-\x1f<>]*|email)>/)
     .replace('scheme', /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/)
     .replace('email', /[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/)
     .getRegex();
-const _inlineComment = edit(_comment).replace('(?:-->|$)', '-->').getRegex();
+const _inlineComment = edit(_comment).replace('(?:-->|$)', '(?:-->|--!>|$)').getRegex();
 const tag = edit('^comment'
     + '|^</[a-zA-Z][\\w:-]*\\s*>' // self-closing tag
     + '|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>' // open tag

From e9e53730f3ef9df7694263c9800d511297083854 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Wed, 24 Sep 2025 17:45:58 -0600
Subject: [PATCH 1052/1815] Potential fix for code scanning alert no. 6:
 Incomplete string escaping or encoding

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .../src/languageFeatures/copyFiles/shared.ts                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts
index 273fa56a6bb5..17f7ad1b8050 100644
--- a/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts
@@ -302,7 +302,7 @@ function escapeMarkdownLinkPath(mdPath: string): string {
 }
 
 function escapeBrackets(value: string): string {
-	value = value.replace(/[\[\]]/g, '\\$&'); // CodeQL [SM02383] The Markdown is fully sanitized after being rendered.
+	value = value.replace(/\\/g, '\\\\').replace(/[\[\]]/g, '\\$&'); // CodeQL [SM02383] The Markdown is fully sanitized after being rendered.
 	return value;
 }
 

From a944d8d032834bb792659ba71aec2a8ecfc069f9 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Thu, 25 Sep 2025 20:27:24 -0600
Subject: [PATCH 1053/1815] Potential fix for code scanning alert no. 11:
 Incomplete string escaping or encoding

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .../editor/contrib/smartSelect/test/browser/smartSelect.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/smartSelect/test/browser/smartSelect.test.ts b/src/vs/editor/contrib/smartSelect/test/browser/smartSelect.test.ts
index 3e774fc932f4..ff60c2733b20 100644
--- a/src/vs/editor/contrib/smartSelect/test/browser/smartSelect.test.ts
+++ b/src/vs/editor/contrib/smartSelect/test/browser/smartSelect.test.ts
@@ -214,7 +214,7 @@ suite('SmartSelect', () => {
 
 	async function assertRanges(provider: SelectionRangeProvider, value: string, ...expected: IRange[]): Promise<void> {
 		const index = value.indexOf('|');
-		value = value.replace('|', ''); // CodeQL [SM02383] js/incomplete-sanitization this is purpose only the first | character
+		value = value.replace(/\|/g, ''); // Remove all '|' characters, not just the first
 
 		const model = modelService.createModel(value, new StaticLanguageSelector(languageId), URI.parse('fake:lang'));
 		const pos = model.getPositionAt(index);

From 43e7a73839fd8f771bb02cd00ec58e54c65557e3 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Thu, 25 Sep 2025 20:28:03 -0600
Subject: [PATCH 1054/1815] Potential fix for code scanning alert no. 14:
 Incomplete string escaping or encoding

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 src/vs/workbench/contrib/files/browser/fileActions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/files/browser/fileActions.ts b/src/vs/workbench/contrib/files/browser/fileActions.ts
index 50f786ea2f7e..bc7f9549458a 100644
--- a/src/vs/workbench/contrib/files/browser/fileActions.ts
+++ b/src/vs/workbench/contrib/files/browser/fileActions.ts
@@ -756,7 +756,7 @@ export function validateFileName(pathService: IPathService, item: ExplorerItem,
 	// Check for invalid file name.
 	if (names.some(folderName => !pathService.hasValidBasename(item.resource, os, folderName))) {
 		// Escape * characters
-		const escapedName = name.replace(/\*/g, '\\*'); // CodeQL [SM02383] This only processes filenames which are enforced against having backslashes in them farther up in the stack.
+		const escapedName = name.replace(/\\/g, '\\\\').replace(/\*/g, '\\*'); // Escapes backslashes first, then asterisks.
 		return {
 			content: nls.localize('invalidFileNameError', "The name **{0}** is not valid as a file or folder name. Please choose a different name.", trimLongName(escapedName)),
 			severity: Severity.Error

From 39704b12a0322ccfea8f60cd74ee60d601076e21 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Sep 2025 02:28:11 +0000
Subject: [PATCH 1055/1815] Bump postcss in the npm_and_yarn group across 1
 directory

Bumps the npm_and_yarn group with 1 update in the / directory: [postcss](https://github.com/postcss/postcss).


Updates `postcss` from 8.4.49 to 8.5.0
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.49...8.5.0)

---
updated-dependencies:
- dependency-name: postcss
  dependency-version: 8.5.0
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 10 +++++-----
 package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f06f4f2878c1..ea793cb9daa9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,7 +140,7 @@
         "os-browserify": "^0.3.0",
         "p-all": "^1.0.0",
         "path-browserify": "^1.0.1",
-        "postcss": "^8.4.49",
+        "postcss": "^8.5.0",
         "postcss-nesting": "^12.0.2",
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
@@ -12545,9 +12545,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.49",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
-      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.0.tgz",
+      "integrity": "sha512-27VKOqrYfPncKA2NrFOVhP5MGAfHKLYn/Q0mz9cNQyRAKYi3VNHwYU2qKKqPCqgBmeeJ0uAFB56NumXZ5ZReXg==",
       "dev": true,
       "funding": [
         {
@@ -12565,7 +12565,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.7",
+        "nanoid": "^3.3.8",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
diff --git a/package.json b/package.json
index 70de746baf8d..b3a9aa57b816 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "os-browserify": "^0.3.0",
     "p-all": "^1.0.0",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.4.49",
+    "postcss": "^8.5.0",
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",

From b6ebd8e722f6518fb0588c52ebb0c795eb6b5b1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Sep 2025 18:25:40 +0000
Subject: [PATCH 1056/1815] Bump the npm_and_yarn group across 2 directories
 with 2 updates

Bumps the npm_and_yarn group with 1 update in the / directory: [postcss](https://github.com/postcss/postcss).
Bumps the npm_and_yarn group with 1 update in the /remote directory: [tar-fs](https://github.com/mafintosh/tar-fs).


Updates `postcss` from 8.5.0 to 8.5.1
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.5.0...8.5.1)

Updates `tar-fs` from 2.1.3 to 2.1.4
- [Commits](https://github.com/mafintosh/tar-fs/compare/v2.1.3...v2.1.4)

---
updated-dependencies:
- dependency-name: postcss
  dependency-version: 8.5.1
  dependency-type: direct:development
  dependency-group: npm_and_yarn
- dependency-name: tar-fs
  dependency-version: 2.1.4
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json  | 6 +++---
 package-lock.json        | 8 ++++----
 package.json             | 2 +-
 remote/package-lock.json | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 940ab861a34d..93fdaa4335e7 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -4117,9 +4117,9 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz",
-      "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
+      "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package-lock.json b/package-lock.json
index ea793cb9daa9..e66e2c6d7b18 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,7 +140,7 @@
         "os-browserify": "^0.3.0",
         "p-all": "^1.0.0",
         "path-browserify": "^1.0.1",
-        "postcss": "^8.5.0",
+        "postcss": "^8.5.1",
         "postcss-nesting": "^12.0.2",
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
@@ -12545,9 +12545,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.0.tgz",
-      "integrity": "sha512-27VKOqrYfPncKA2NrFOVhP5MGAfHKLYn/Q0mz9cNQyRAKYi3VNHwYU2qKKqPCqgBmeeJ0uAFB56NumXZ5ZReXg==",
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
+      "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",
       "dev": true,
       "funding": [
         {
diff --git a/package.json b/package.json
index b3a9aa57b816..030bc2761de3 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "os-browserify": "^0.3.0",
     "p-all": "^1.0.0",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.5.0",
+    "postcss": "^8.5.1",
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",
diff --git a/remote/package-lock.json b/remote/package-lock.json
index 96ec8d454ce0..7996a5deea8b 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -1351,9 +1351,9 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.3.tgz",
-      "integrity": "sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
+      "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
       "license": "MIT",
       "dependencies": {
         "chownr": "^1.1.1",

From 17d7841e13a9aba64d4b363ebabd0e51e6d4f1d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 28 Sep 2025 05:21:44 +0000
Subject: [PATCH 1057/1815] Bump postcss in the npm_and_yarn group across 1
 directory

Bumps the npm_and_yarn group with 1 update in the / directory: [postcss](https://github.com/postcss/postcss).


Updates `postcss` from 8.5.1 to 8.5.2
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.5.1...8.5.2)

---
updated-dependencies:
- dependency-name: postcss
  dependency-version: 8.5.2
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e66e2c6d7b18..389d11d1d3ff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,7 +140,7 @@
         "os-browserify": "^0.3.0",
         "p-all": "^1.0.0",
         "path-browserify": "^1.0.1",
-        "postcss": "^8.5.1",
+        "postcss": "^8.5.2",
         "postcss-nesting": "^12.0.2",
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
@@ -12545,9 +12545,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
-      "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",
+      "version": "8.5.2",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz",
+      "integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==",
       "dev": true,
       "funding": [
         {
diff --git a/package.json b/package.json
index 030bc2761de3..b5f974f942dc 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "os-browserify": "^0.3.0",
     "p-all": "^1.0.0",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.5.1",
+    "postcss": "^8.5.2",
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",

From 5c7d623c5dffbede492d0387c060da67af50810f Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Wed, 1 Oct 2025 02:12:39 -0600
Subject: [PATCH 1058/1815] Delete .github/workflows/monaco-editor.yml

Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .github/workflows/monaco-editor.yml | 99 -----------------------------
 1 file changed, 99 deletions(-)
 delete mode 100644 .github/workflows/monaco-editor.yml

diff --git a/.github/workflows/monaco-editor.yml b/.github/workflows/monaco-editor.yml
deleted file mode 100644
index 83159b8c5f3b..000000000000
--- a/.github/workflows/monaco-editor.yml
+++ /dev/null
@@ -1,99 +0,0 @@
-name: Monaco Editor checks
-permissions:
-  contents: read
-
-on:
-  push:
-    branches:
-      - main
-      - release/*
-  pull_request:
-    branches:
-      - main
-      - release/*
-
-jobs:
-  main:
-    name: Monaco Editor checks
-    runs-on: ubuntu-latest
-    timeout-minutes: 40
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v5
-        with:
-          node-version-file: .nvmrc
-
-      - name: Compute node modules cache key
-        id: nodeModulesCacheKey
-        run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
-      - name: Cache node modules
-        id: cacheNodeModules
-        uses: actions/cache@v4
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-cacheNodeModules20-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-cacheNodeModules20-
-      - name: Get npm cache directory path
-        id: npmCacheDirPath
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
-      - name: Cache npm directory
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.npmCacheDirPath.outputs.dir }}
-          key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-npmCacheDir-
-      - name: Install system dependencies
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: |
-          sudo apt update
-          sudo apt install -y libxkbfile-dev pkg-config libkrb5-dev libxss1
-      - name: Execute npm
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        env:
-          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        run: |
-          npm ci
-
-      - name: Download Playwright
-        run: npm run playwright-install
-
-      - name: Run Monaco Editor Checks
-        run: npm run monaco-compile-check
-
-      - name: Editor Distro & ESM
-        run: npm run gulp editor-esm
-
-      - name: Editor ESM sources check
-        working-directory: ./test/monaco
-        run: npm run esm-check
-
-      - name: Typings validation prep
-        run: |
-          mkdir typings-test
-
-      - name: Typings validation
-        working-directory: ./typings-test
-        run: |
-          npm init -yp
-          ../node_modules/.bin/tsc --init
-          echo "import '../out-monaco-editor-core';" > a.ts
-          ../node_modules/.bin/tsc --noEmit
-
-      - name: Package Editor with Webpack
-        working-directory: ./test/monaco
-        run: npm run bundle-webpack
-
-      - name: Compile Editor Tests
-        working-directory: ./test/monaco
-        run: npm run compile
-
-      - name: Run Editor Tests
-        timeout-minutes: 5
-        working-directory: ./test/monaco
-        run: npm run test

From 0614da575e0749011dd936a6cd8c4f8f1977482a Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Wed, 1 Oct 2025 02:13:03 -0600
Subject: [PATCH 1059/1815] Delete .github/workflows/basic.yml

Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .github/workflows/basic.yml | 181 ------------------------------------
 1 file changed, 181 deletions(-)
 delete mode 100644 .github/workflows/basic.yml

diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
deleted file mode 100644
index 7b3ead417366..000000000000
--- a/.github/workflows/basic.yml
+++ /dev/null
@@ -1,181 +0,0 @@
-name: Basic checks
-permissions:
-  contents: read
-
-on: workflow_dispatch
-
-# on:
-#   push:
-#     branches:
-#       - main
-#   pull_request:
-#     branches:
-#       - main
-
-jobs:
-  main:
-    if: github.ref != 'refs/heads/main'
-    name: Compilation, Unit and Integration Tests
-    runs-on: ubuntu-latest
-    timeout-minutes: 40
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - uses: actions/checkout@v4
-
-      # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
-      - name: Setup Build Environment
-        run: |
-          sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
-          sudo chmod +x /etc/init.d/xvfb
-          sudo update-rc.d xvfb defaults
-          sudo service xvfb start
-
-      - uses: actions/setup-node@v5
-        with:
-          node-version-file: .nvmrc
-
-      - name: Compute node modules cache key
-        id: nodeModulesCacheKey
-        run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
-      - name: Cache node modules
-        id: cacheNodeModules
-        uses: actions/cache@v4
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
-      - name: Get npm cache directory path
-        id: npmCacheDirPath
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
-      - name: Cache npm directory
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.npmCacheDirPath.outputs.dir }}
-          key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-npmCacheDir-
-      - name: Execute npm
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        env:
-          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        run: npm ci
-
-      - name: Compile and Download
-        run: npm exec -- npm-run-all -lp compile "electron x64"
-
-      - name: Run Unit Tests
-        id: electron-unit-tests
-        run: DISPLAY=:10 ./scripts/test.sh
-
-      - name: Run Integration Tests (Electron)
-        id: electron-integration-tests
-        run: DISPLAY=:10 ./scripts/test-integration.sh
-
-  hygiene:
-    if: github.ref != 'refs/heads/main'
-    name: Hygiene and Layering
-    runs-on: ubuntu-latest
-    timeout-minutes: 40
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v5
-        with:
-          node-version-file: .nvmrc
-
-      - name: Compute node modules cache key
-        id: nodeModulesCacheKey
-        run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
-      - name: Cache node modules
-        id: cacheNodeModules
-        uses: actions/cache@v4
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
-      - name: Get npm cache directory path
-        id: npmCacheDirPath
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
-      - name: Cache npm directory
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.npmCacheDirPath.outputs.dir }}
-          key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-npmCacheDir-
-      - name: Execute npm
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        env:
-          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        run: npm ci
-
-      - name: Run Hygiene Checks
-        run: npm run gulp hygiene
-
-      - name: Run Valid Layers Checks
-        run: npm run valid-layers-check
-
-      - name: Run Property Init Order Checks
-        run: npm run property-init-order-check
-
-      - name: Compile /build/
-        run: npm run compile
-        working-directory: build
-
-      - name: Check clean git state
-        run: ./.github/workflows/check-clean-git-state.sh
-
-      - name: Run eslint
-        run: npm run eslint
-
-      - name: Run vscode-dts Compile Checks
-        run: npm run vscode-dts-compile-check
-
-      - name: Run Trusted Types Checks
-        run: npm run tsec-compile-check
-
-  warm-cache:
-    name: Warm up node modules cache
-    if: github.ref == 'refs/heads/main'
-    runs-on: ubuntu-latest
-    timeout-minutes: 40
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v5
-        with:
-          node-version-file: .nvmrc
-
-      - name: Compute node modules cache key
-        id: nodeModulesCacheKey
-        run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
-      - name: Cache node modules
-        id: cacheNodeModules
-        uses: actions/cache@v4
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
-      - name: Get npm cache directory path
-        id: npmCacheDirPath
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
-      - name: Cache npm directory
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.npmCacheDirPath.outputs.dir }}
-          key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-npmCacheDir-
-      - name: Execute npm
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        env:
-          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        run: npm ci

From a55b8b452d54beb00d4be542a46a958757c5c790 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Wed, 1 Oct 2025 02:13:19 -0600
Subject: [PATCH 1060/1815] Delete .github/workflows/ci.yml

Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .github/workflows/ci.yml | 321 ---------------------------------------
 1 file changed, 321 deletions(-)
 delete mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index d87bd3621d06..000000000000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,321 +0,0 @@
-name: CI
-permissions:
-  contents: read
-
-on: workflow_dispatch
-
-# on:
-#   push:
-#     branches:
-#       - main
-#       - release/*
-#   pull_request:
-#     branches:
-#       - main
-#       - release/*
-
-jobs:
-  windows:
-    name: Windows
-    runs-on: windows-2022
-    timeout-minutes: 60
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v5
-        with:
-          node-version-file: .nvmrc
-
-      - uses: actions/setup-python@v6
-        with:
-          python-version: "3.x"
-
-      - name: Compute node modules cache key
-        id: nodeModulesCacheKey
-        run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
-      - name: Cache node_modules archive
-        id: cacheNodeModules
-        uses: actions/cache@v4
-        with:
-          path: ".build/node_modules_cache"
-          key: "${{ runner.os }}-cacheNodeModulesArchive-${{ steps.nodeModulesCacheKey.outputs.value }}"
-      - name: Extract node_modules archive
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit == 'true' }}
-        run: 7z.exe x .build/node_modules_cache/cache.7z -aos
-      - name: Get npm cache directory path
-        id: npmCacheDirPath
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
-      - name: Cache npm directory
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.npmCacheDirPath.outputs.dir }}
-          key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-npmCacheDir-
-      - name: Execute npm
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        env:
-          npm_config_foreground_scripts: "true"
-          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        run: npm ci
-      - name: Create node_modules archive
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: |
-          mkdir -Force .build
-          node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
-          mkdir -Force .build/node_modules_cache
-          7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt
-
-      - name: Compile and Download
-        run: npm exec -- npm-run-all -lp compile "electron x64" playwright-install download-builtin-extensions
-
-      - name: Compile Integration Tests
-        run: npm run compile
-        working-directory: test/integration/browser
-
-      - name: Run Unit Tests (Electron)
-        run: .\scripts\test.bat
-
-      - name: Run Unit Tests (node.js)
-        run: npm run test-node
-
-      - name: Run Unit Tests (Browser, Chromium)
-        run: npm run test-browser-no-install -- --browser chromium
-
-      - name: Run Integration Tests (Electron)
-        run: .\scripts\test-integration.bat
-
-      - name: Run Integration Tests (Browser, Firefox)
-        timeout-minutes: 20
-        run: .\scripts\test-web-integration.bat --browser firefox
-
-      - name: Run Integration Tests (Remote)
-        timeout-minutes: 20
-        run: .\scripts\test-remote-integration.bat
-
-  linux:
-    name: Linux
-    runs-on: ubuntu-latest
-    timeout-minutes: 40
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - uses: actions/checkout@v4
-
-      # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
-      - name: Setup Build Environment
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libxkbfile-dev pkg-config libkrb5-dev libxss1 dbus xvfb libgtk-3-0 libgbm1
-          sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
-          sudo chmod +x /etc/init.d/xvfb
-          sudo update-rc.d xvfb defaults
-          sudo service xvfb start
-
-      - uses: actions/setup-node@v5
-        with:
-          node-version-file: .nvmrc
-
-      - name: Compute node modules cache key
-        id: nodeModulesCacheKey
-        run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
-      - name: Cache node modules
-        id: cacheNodeModules
-        uses: actions/cache@v4
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
-      - name: Get npm cache directory path
-        id: npmCacheDirPath
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
-      - name: Cache npm directory
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.npmCacheDirPath.outputs.dir }}
-          key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-npmCacheDir-
-      - name: Execute npm
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        env:
-          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        run: npm ci
-
-      - name: Compile and Download
-        run: npm exec -- npm-run-all -lp compile "electron x64" playwright-install download-builtin-extensions
-
-      - name: Compile Integration Tests
-        run: npm run compile
-        working-directory: test/integration/browser
-
-      - name: Run Unit Tests (Electron)
-        id: electron-unit-tests
-        run: DISPLAY=:10 ./scripts/test.sh
-
-      - name: Run Unit Tests (node.js)
-        id: nodejs-unit-tests
-        run: npm run test-node
-
-      - name: Run Unit Tests (Browser, Chromium)
-        id: browser-unit-tests
-        run: DISPLAY=:10 npm run test-browser-no-install -- --browser chromium
-
-      - name: Run Integration Tests (Electron)
-        id: electron-integration-tests
-        run: DISPLAY=:10 ./scripts/test-integration.sh
-
-      - name: Run Integration Tests (Browser, Chromium)
-        id: browser-integration-tests
-        run: DISPLAY=:10 ./scripts/test-web-integration.sh --browser chromium
-
-      - name: Run Integration Tests (Remote)
-        id: electron-remote-integration-tests
-        timeout-minutes: 15
-        run: DISPLAY=:10 ./scripts/test-remote-integration.sh
-
-  darwin:
-    name: macOS
-    runs-on: macos-latest
-    timeout-minutes: 40
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v5
-        with:
-          node-version-file: .nvmrc
-
-      - name: Compute node modules cache key
-        id: nodeModulesCacheKey
-        run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
-      - name: Cache node modules
-        id: cacheNodeModules
-        uses: actions/cache@v4
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-cacheNodeModulesMacOS-${{ steps.nodeModulesCacheKey.outputs.value }}
-      - name: Get npm cache directory path
-        id: npmCacheDirPath
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
-      - name: Cache npm directory
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.npmCacheDirPath.outputs.dir }}
-          key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-npmCacheDir-
-      - name: Execute npm
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        env:
-          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        run: npm ci
-
-      - name: Compile and Download
-        run: npm exec -- npm-run-all -lp compile "electron x64" playwright-install download-builtin-extensions
-
-      - name: Compile Integration Tests
-        run: npm run compile
-        working-directory: test/integration/browser
-
-      # This is required for SecretStorage unittests
-      - name: Create temporary keychain
-        run: |
-          security create-keychain -p pwd $RUNNER_TEMP/buildagent.keychain
-          security default-keychain -s $RUNNER_TEMP/buildagent.keychain
-          security unlock-keychain -p pwd $RUNNER_TEMP/buildagent.keychain
-
-      - name: Run Unit Tests (Electron)
-        run: DISPLAY=:10 ./scripts/test.sh
-
-      - name: Run Unit Tests (node.js)
-        run: npm run test-node
-
-      - name: Run Unit Tests (Browser, Chromium)
-        run: DISPLAY=:10 npm run test-browser-no-install -- --browser chromium
-
-      - name: Run Integration Tests (Electron)
-        run: DISPLAY=:10 ./scripts/test-integration.sh
-
-      - name: Run Integration Tests (Browser, Webkit)
-        run: DISPLAY=:10 ./scripts/test-web-integration.sh --browser webkit
-
-      - name: Run Integration Tests (Remote)
-        timeout-minutes: 15
-        run: DISPLAY=:10 ./scripts/test-remote-integration.sh
-
-  hygiene:
-    name: Hygiene and Layering
-    runs-on: ubuntu-latest
-    timeout-minutes: 40
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v5
-        with:
-          node-version-file: .nvmrc
-
-      - name: Compute node modules cache key
-        id: nodeModulesCacheKey
-        run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
-      - name: Cache node modules
-        id: cacheNodeModules
-        uses: actions/cache@v4
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
-      - name: Get npm cache directory path
-        id: npmCacheDirPath
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
-      - name: Cache npm directory
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.npmCacheDirPath.outputs.dir }}
-          key: ${{ runner.os }}-npmCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
-          restore-keys: ${{ runner.os }}-npmCacheDir-
-      - name: Execute npm
-        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        env:
-          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-        run: npm ci
-
-      - name: Download Playwright
-        run: npm run playwright-install
-
-      - name: Run Hygiene Checks
-        run: npm run gulp hygiene
-
-      - name: Run Valid Layers Checks
-        run: npm run valid-layers-check
-
-      - name: Run Property Init Order Checks
-        run: npm run property-init-order-check
-
-      - name: Compile /build/
-        run: npm run compile
-        working-directory: build
-
-      - name: Check clean git state
-        run: ./.github/workflows/check-clean-git-state.sh
-
-      - name: Run eslint
-        run: npm run eslint
-
-      - name: Run vscode-dts Compile Checks
-        run: npm run vscode-dts-compile-check
-
-      - name: Run Trusted Types Checks
-        run: npm run tsec-compile-check

From 37cc9d2e51454da45e38903d30954b64ca0e17da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Oct 2025 10:20:16 +0000
Subject: [PATCH 1061/1815] Bump postcss in the npm_and_yarn group across 1
 directory

Bumps the npm_and_yarn group with 1 update in the / directory: [postcss](https://github.com/postcss/postcss).


Updates `postcss` from 8.5.2 to 8.5.3
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.5.2...8.5.3)

---
updated-dependencies:
- dependency-name: postcss
  dependency-version: 8.5.3
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 389d11d1d3ff..f8fd5526daa9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -140,7 +140,7 @@
         "os-browserify": "^0.3.0",
         "p-all": "^1.0.0",
         "path-browserify": "^1.0.1",
-        "postcss": "^8.5.2",
+        "postcss": "^8.5.3",
         "postcss-nesting": "^12.0.2",
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
@@ -12545,9 +12545,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.2",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz",
-      "integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==",
+      "version": "8.5.3",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
+      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
       "dev": true,
       "funding": [
         {
diff --git a/package.json b/package.json
index b5f974f942dc..98c27429a685 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "os-browserify": "^0.3.0",
     "p-all": "^1.0.0",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.5.2",
+    "postcss": "^8.5.3",
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",

From 13bbb423b957ce5627dfd1e0be14d73af876cb04 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 13:30:12 +0000
Subject: [PATCH 1062/1815] Bump actions/setup-node from 5 to 6

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 5 to 6.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/telemetry.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml
index 8863d52e8194..c28342952976 100644
--- a/.github/workflows/telemetry.yml
+++ b/.github/workflows/telemetry.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: 'actions/checkout@v4'
 
-      - uses: 'actions/setup-node@v5'
+      - uses: 'actions/setup-node@v6'
         with:
           node-version: 'lts/*'
 

From d524600380378b2ab29957ef23728a5bf5cd8a22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 19:04:41 +0000
Subject: [PATCH 1063/1815] Bump playwright in the npm_and_yarn group across 1
 directory

Bumps the npm_and_yarn group with 1 update in the / directory: [playwright](https://github.com/microsoft/playwright).


Updates `playwright` from 1.50.0 to 1.56.1
- [Release notes](https://github.com/microsoft/playwright/releases)
- [Commits](https://github.com/microsoft/playwright/compare/v1.50.0...v1.56.1)

---
updated-dependencies:
- dependency-name: playwright
  dependency-version: 1.56.1
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 24 ++++++++++++------------
 package.json      |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f8fd5526daa9..a716dd6a4a3c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -56,7 +56,7 @@
         "yazl": "^2.4.3"
       },
       "devDependencies": {
-        "@playwright/test": "^1.50.0",
+        "@playwright/test": "^1.56.1",
         "@stylistic/eslint-plugin-ts": "^2.8.0",
         "@types/cookie": "^0.3.3",
         "@types/debug": "^4.1.5",
@@ -2085,13 +2085,13 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.50.0",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.50.0.tgz",
-      "integrity": "sha512-ZGNXbt+d65EGjBORQHuYKj+XhCewlwpnSd/EDuLPZGSiEWmgOJB5RmMCCYGy5aMfTs9wx61RivfDKi8H/hcMvw==",
+      "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.50.0"
+        "playwright": "1.56.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -12451,13 +12451,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.50.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.50.0.tgz",
-      "integrity": "sha512-+GinGfGTrd2IfX1TA4N2gNmeIksSb+IAe589ZH+FlmpV3MYTx6+buChGIuDLQwrGNCw2lWibqV50fU510N7S+w==",
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.56.1.tgz",
+      "integrity": "sha512-aFi5B0WovBHTEvpM3DzXTUaeN6eN0qWnTkKx4NQaH4Wvcmc153PdaY2UBdSYKaGYw+UyWXSVyxDUg5DoPEttjw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.50.0"
+        "playwright-core": "1.56.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -12483,9 +12483,9 @@
       }
     },
     "node_modules/playwright/node_modules/playwright-core": {
-      "version": "1.50.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.50.0.tgz",
-      "integrity": "sha512-CXkSSlr4JaZs2tZHI40DsZUN/NIwgaUPsyLuOAaIZp2CyF2sN5MM5NJsyB188lFSSozFxQ5fPT4qM+f0tH/6wQ==",
+      "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": "Apache-2.0",
       "bin": {
diff --git a/package.json b/package.json
index 98c27429a685..1041b1ff3898 100644
--- a/package.json
+++ b/package.json
@@ -115,7 +115,7 @@
     "yazl": "^2.4.3"
   },
   "devDependencies": {
-    "@playwright/test": "^1.50.0",
+    "@playwright/test": "^1.56.1",
     "@stylistic/eslint-plugin-ts": "^2.8.0",
     "@types/cookie": "^0.3.3",
     "@types/debug": "^4.1.5",

From 8a3c498894fe39995f5135c36ef60e9013d9f140 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 16 Nov 2025 14:39:06 +0000
Subject: [PATCH 1064/1815] Bump js-yaml in the npm_and_yarn group across 1
 directory

Bumps the npm_and_yarn group with 1 update in the / directory: [js-yaml](https://github.com/nodeca/js-yaml).


Updates `js-yaml` from 4.1.0 to 4.1.1
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/4.1.0...4.1.1)

---
updated-dependencies:
- dependency-name: js-yaml
  dependency-version: 4.1.1
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a716dd6a4a3c..196b19e41ff3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10024,10 +10024,11 @@
       "dev": true
     },
     "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "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"
       },

From b37c280f7c2f5e4069bfa5991a5c2a0ef46c8a6f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Nov 2025 02:06:43 +0000
Subject: [PATCH 1065/1815] Bump glob in the npm_and_yarn group across 1
 directory

Bumps the npm_and_yarn group with 1 update in the /build/npm/gyp directory: [glob](https://github.com/isaacs/node-glob).


Updates `glob` from 10.4.2 to 11.1.0
- [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/node-glob/compare/v10.4.2...v11.1.0)

---
updated-dependencies:
- dependency-name: glob
  dependency-version: 11.1.0
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/npm/gyp/package-lock.json | 652 ++++++++++++++------------------
 build/npm/gyp/package.json      |   2 +-
 package-lock.json               |  60 ++-
 package.json                    |   2 +-
 4 files changed, 337 insertions(+), 379 deletions(-)

diff --git a/build/npm/gyp/package-lock.json b/build/npm/gyp/package-lock.json
index a20d85c70dca..af64f402f659 100644
--- a/build/npm/gyp/package-lock.json
+++ b/build/npm/gyp/package-lock.json
@@ -9,7 +9,30 @@
       "version": "1.0.0",
       "license": "MIT",
       "devDependencies": {
-        "node-gyp": "^10.1.0"
+        "node-gyp": "^12.1.0"
+      }
+    },
+    "node_modules/@isaacs/balanced-match": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/brace-expansion": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@isaacs/balanced-match": "^4.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
       }
     },
     "node_modules/@isaacs/cliui": {
@@ -30,88 +53,73 @@
         "node": ">=12"
       }
     },
+    "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,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.4"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
     "node_modules/@npmcli/agent": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz",
-      "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-4.0.0.tgz",
+      "integrity": "sha512-kAQTcEN9E8ERLVg5AsGwLNoFb+oEG6engbqAU2P43gD4JEIkNGMHdVQ096FsOAAYpZPB0RSt0zgInKIAS1l5QA==",
       "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",
+        "lru-cache": "^11.2.1",
         "socks-proxy-agent": "^8.0.3"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/@npmcli/fs": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz",
-      "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==",
+      "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": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@pkgjs/parseargs": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=14"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/abbrev": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
-      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-4.0.0.tgz",
+      "integrity": "sha512-a1wflyaL0tHtJSmLSOVybYhy22vRih4eduhhrkcjgrWGnRfrZtovJ2FRjxuTtkkj47O/baf0R86QU5OuYpz8fA==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.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"
       }
     },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -122,9 +130,9 @@
       }
     },
     "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==",
+      "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": {
@@ -134,65 +142,37 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
     "node_modules/cacache": {
-      "version": "18.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.3.tgz",
-      "integrity": "sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg==",
+      "version": "20.0.2",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-20.0.2.tgz",
+      "integrity": "sha512-rVWvqtWcgSzB22wImrVto+7PmE+lUqv5dYzRHD0QJsfpSwTkW+GIqA4ykSt/CCjQlQle8USn8CO8vcWNrIqktg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/fs": "^3.1.0",
+        "@npmcli/fs": "^4.0.0",
         "fs-minipass": "^3.0.0",
-        "glob": "^10.2.2",
-        "lru-cache": "^10.0.1",
+        "glob": "^11.0.3",
+        "lru-cache": "^11.1.0",
         "minipass": "^7.0.3",
         "minipass-collect": "^2.0.1",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
-        "p-map": "^4.0.0",
-        "ssri": "^10.0.0",
-        "tar": "^6.1.11",
-        "unique-filename": "^3.0.0"
+        "p-map": "^7.0.2",
+        "ssri": "^13.0.0",
+        "unique-filename": "^4.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "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": "MIT",
+      "license": "BlueOak-1.0.0",
       "engines": {
-        "node": ">=6"
+        "node": ">=18"
       }
     },
     "node_modules/color-convert": {
@@ -216,9 +196,9 @@
       "license": "MIT"
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "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": {
@@ -254,13 +234,13 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -320,14 +300,32 @@
       "dev": true,
       "license": "Apache-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/foreground-child": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz",
-      "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "cross-spawn": "^7.0.0",
+        "cross-spawn": "^7.0.6",
         "signal-exit": "^4.0.1"
       },
       "engines": {
@@ -351,24 +349,24 @@
       }
     },
     "node_modules/glob": {
-      "version": "10.4.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.2.tgz",
-      "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==",
+      "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.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
+        "foreground-child": "^3.3.1",
+        "jackspeak": "^4.1.1",
+        "minimatch": "^10.1.1",
         "minipass": "^7.1.2",
         "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
+        "path-scurry": "^2.0.0"
       },
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.18"
+        "node": "20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -382,9 +380,9 @@
       "license": "ISC"
     },
     "node_modules/http-cache-semantics": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
+      "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
       "dev": true,
       "license": "BSD-2-Clause"
     },
@@ -403,13 +401,13 @@
       }
     },
     "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==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "agent-base": "^7.0.2",
+        "agent-base": "^7.1.2",
         "debug": "4"
       },
       "engines": {
@@ -440,26 +438,12 @@
         "node": ">=0.8.19"
       }
     },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ip-address": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
-      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "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",
-      "dependencies": {
-        "jsbn": "1.1.0",
-        "sprintf-js": "^1.1.3"
-      },
       "engines": {
         "node": ">= 12"
       }
@@ -474,13 +458,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/is-lambda": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
-      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/isexe": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
@@ -492,86 +469,65 @@
       }
     },
     "node_modules/jackspeak": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz",
-      "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.1.tgz",
+      "integrity": "sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
       },
       "engines": {
-        "node": ">=14"
+        "node": "20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
-      },
-      "optionalDependencies": {
-        "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/jsbn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/lru-cache": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.3.0.tgz",
-      "integrity": "sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ==",
+      "version": "11.2.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.2.tgz",
+      "integrity": "sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "14 || >=16.14"
+        "node": "20 || >=22"
       }
     },
     "node_modules/make-fetch-happen": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz",
-      "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==",
+      "version": "15.0.3",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-15.0.3.tgz",
+      "integrity": "sha512-iyyEpDty1mwW3dGlYXAJqC/azFn5PPvgKVwXayOGBSmKLxhKZ9fg4qIan2ePpp1vJIwfFiO34LAPZgq9SZW9Aw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "@npmcli/agent": "^2.0.0",
-        "cacache": "^18.0.0",
+        "@npmcli/agent": "^4.0.0",
+        "cacache": "^20.0.1",
         "http-cache-semantics": "^4.1.1",
-        "is-lambda": "^1.0.1",
         "minipass": "^7.0.2",
-        "minipass-fetch": "^3.0.0",
+        "minipass-fetch": "^5.0.0",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
-        "negotiator": "^0.6.3",
-        "proc-log": "^4.2.0",
+        "negotiator": "^1.0.0",
+        "proc-log": "^6.0.0",
         "promise-retry": "^2.0.1",
-        "ssri": "^10.0.0"
+        "ssri": "^13.0.0"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "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": {
-        "brace-expansion": "^2.0.1"
+        "@isaacs/brace-expansion": "^5.0.0"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -601,18 +557,18 @@
       }
     },
     "node_modules/minipass-fetch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz",
-      "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-5.0.0.tgz",
+      "integrity": "sha512-fiCdUALipqgPWrOVTz9fw0XhcazULXOSU6ie40DDbX1F49p1dBrSRBuswndTx1x3vEb/g0FT7vC4c4C2u/mh3A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "minipass": "^7.0.3",
         "minipass-sized": "^1.0.3",
-        "minizlib": "^2.1.2"
+        "minizlib": "^3.0.1"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       },
       "optionalDependencies": {
         "encoding": "^0.1.13"
@@ -644,6 +600,13 @@
         "node": ">=8"
       }
     },
+    "node_modules/minipass-flush/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/minipass-pipeline": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
@@ -670,6 +633,13 @@
         "node": ">=8"
       }
     },
+    "node_modules/minipass-pipeline/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/minipass-sized": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
@@ -696,57 +666,37 @@
         "node": ">=8"
       }
     },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/minizlib/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+    "node_modules/minipass-sized/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+      "license": "ISC"
     },
-    "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+    "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,
       "license": "MIT",
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+      "dependencies": {
+        "minipass": "^7.1.2"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 18"
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "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": {
@@ -754,66 +704,63 @@
       }
     },
     "node_modules/node-gyp": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.1.0.tgz",
-      "integrity": "sha512-B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA==",
+      "version": "12.1.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.1.0.tgz",
+      "integrity": "sha512-W+RYA8jBnhSr2vrTtlPYPc1K+CSjGpVDRZxcqJcERZ8ND3A1ThWPHRwctTx3qC3oW99jt726jhdz3Y6ky87J4g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "env-paths": "^2.2.0",
         "exponential-backoff": "^3.1.1",
-        "glob": "^10.3.10",
         "graceful-fs": "^4.2.6",
-        "make-fetch-happen": "^13.0.0",
-        "nopt": "^7.0.0",
-        "proc-log": "^3.0.0",
+        "make-fetch-happen": "^15.0.0",
+        "nopt": "^9.0.0",
+        "proc-log": "^6.0.0",
         "semver": "^7.3.5",
-        "tar": "^6.1.2",
-        "which": "^4.0.0"
+        "tar": "^7.5.2",
+        "tinyglobby": "^0.2.12",
+        "which": "^6.0.0"
       },
       "bin": {
         "node-gyp": "bin/node-gyp.js"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/nopt": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz",
-      "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-9.0.0.tgz",
+      "integrity": "sha512-Zhq3a+yFKrYwSBluL4H9XP3m3y5uvQkB/09CwDruCiRmR/UJYnn9W4R48ry0uGC70aeTPKLynBtscP9efFFcPw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "abbrev": "^2.0.0"
+        "abbrev": "^4.0.0"
       },
       "bin": {
         "nopt": "bin/nopt.js"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz",
+      "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/package-json-from-dist": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
-      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "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": "BlueOak-1.0.0"
     },
@@ -828,30 +775,43 @@
       }
     },
     "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==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz",
+      "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "lru-cache": "^10.2.0",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.18"
+        "node": "20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "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/proc-log": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz",
-      "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.0.0.tgz",
+      "integrity": "sha512-KG/XsTDN901PNfPfAMmj6N/Ywg9tM+bHK8pAz+27fS4N4Pcr+4zoYBOcGSBu6ceXYNPxkLpa4ohtfxV1XcLAfA==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/promise-retry": {
@@ -887,14 +847,11 @@
       "optional": true
     },
     "node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "dev": true,
       "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -902,19 +859,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/semver/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -963,13 +907,13 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
-      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "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": "^9.0.5",
+        "ip-address": "^10.0.1",
         "smart-buffer": "^4.2.0"
       },
       "engines": {
@@ -978,13 +922,13 @@
       }
     },
     "node_modules/socks-proxy-agent": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
-      "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
+      "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.1",
+        "agent-base": "^7.1.2",
         "debug": "^4.3.4",
         "socks": "^2.8.3"
       },
@@ -992,24 +936,17 @@
         "node": ">= 14"
       }
     },
-    "node_modules/sprintf-js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
     "node_modules/ssri": {
-      "version": "10.0.6",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
-      "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-13.0.0.tgz",
+      "integrity": "sha512-yizwGBpbCn4YomB2lzhZqrHLJoqFGXihNbib3ozhqF/cIp5ue+xSmOQrjNasEE62hFxsCcg/V/z23t4n8jMEng==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "minipass": "^7.0.3"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/string-width": {
@@ -1077,9 +1014,9 @@
       }
     },
     "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==",
+      "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",
       "dependencies": {
@@ -1117,89 +1054,69 @@
       }
     },
     "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==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.2.tgz",
+      "integrity": "sha512-7NyxrTE4Anh8km8iEy7o0QYPs+0JKBTj5ZaqHg6B39erLg0qYXN3BijtShwbsNSvQ+LN75+KV+C4QR/f6Gwnpg==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "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"
+        "@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/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==",
+    "node_modules/tinyglobby": {
+      "version": "0.2.15",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "minipass": "^3.0.0"
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.3"
       },
       "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
+        "node": ">=12.0.0"
       },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tar/node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/sponsors/SuperchupuDev"
       }
     },
     "node_modules/unique-filename": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
-      "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
+      "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": "^4.0.0"
+        "unique-slug": "^5.0.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/unique-slug": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
-      "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
+      "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": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-6.0.0.tgz",
+      "integrity": "sha512-f+gEpIKMR9faW/JgAgPK1D7mekkFoqbmiwvNzuhsHetni20QSgzg9Vhn0g2JSJkkfehQnqdUAx7/e15qS1lPxg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -1209,7 +1126,7 @@
         "node-which": "bin/which.js"
       },
       "engines": {
-        "node": "^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/wrap-ansi": {
@@ -1311,11 +1228,14 @@
       }
     },
     "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==",
       "dev": true,
-      "license": "ISC"
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
+      }
     }
   }
 }
diff --git a/build/npm/gyp/package.json b/build/npm/gyp/package.json
index a1564133a1ee..1b869649d321 100644
--- a/build/npm/gyp/package.json
+++ b/build/npm/gyp/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "license": "MIT",
   "devDependencies": {
-    "node-gyp": "^10.1.0"
+    "node-gyp": "^12.1.0"
   },
   "scripts": {}
 }
diff --git a/package-lock.json b/package-lock.json
index 196b19e41ff3..fd8be7b02faa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -105,7 +105,7 @@
         "event-stream": "3.3.4",
         "fancy-log": "^1.3.3",
         "file-loader": "^6.2.0",
-        "glob": "^5.0.13",
+        "glob": "^9.0.0",
         "gulp": "^5.0.1",
         "gulp-azure-storage": "^0.12.1",
         "gulp-bom": "^3.0.0",
@@ -7210,20 +7210,22 @@
       "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",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-9.0.0.tgz",
+      "integrity": "sha512-7rdoWzT8/4f1yEe/cMdBug2lmzmYMYU9h4RNNiavPHajhcxt7kkxrOvwSnIPkZMjLQb9BXv7nFoKmTnPPklMyA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "2 || 3",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "fs.realpath": "^1.0.0",
+        "minimatch": "^7.3.0",
+        "minipass": "^4.2.4",
+        "path-scurry": "^1.5.0"
       },
       "engines": {
-        "node": "*"
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/glob-parent": {
@@ -7337,6 +7339,42 @@
         "node": ">= 10.13.0"
       }
     },
+    "node_modules/glob/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/glob/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,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob/node_modules/minipass": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz",
+      "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/global-agent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
diff --git a/package.json b/package.json
index 1041b1ff3898..77f3e926a28f 100644
--- a/package.json
+++ b/package.json
@@ -164,7 +164,7 @@
     "event-stream": "3.3.4",
     "fancy-log": "^1.3.3",
     "file-loader": "^6.2.0",
-    "glob": "^5.0.13",
+    "glob": "^9.0.0",
     "gulp": "^5.0.1",
     "gulp-azure-storage": "^0.12.1",
     "gulp-bom": "^3.0.0",

From 41bd7045fe8e53e3a1e29d6d6f879bcd98fa307d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Nov 2025 14:34:10 +0000
Subject: [PATCH 1066/1815] Bump js-yaml in the npm_and_yarn group across 1
 directory

Bumps the npm_and_yarn group with 1 update in the /extensions/npm directory: [js-yaml](https://github.com/nodeca/js-yaml).


Updates `js-yaml` from 3.14.0 to 3.14.2
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/3.14.0...3.14.2)

---
updated-dependencies:
- dependency-name: js-yaml
  dependency-version: 3.14.2
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/npm/package-lock.json |  7 ++++---
 package-lock.json                | 10 +++++-----
 package.json                     |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index 49c2d76843e0..cb927dbd26db 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -149,9 +149,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/package-lock.json b/package-lock.json
index fd8be7b02faa..9338e4ee6d98 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -105,7 +105,7 @@
         "event-stream": "3.3.4",
         "fancy-log": "^1.3.3",
         "file-loader": "^6.2.0",
-        "glob": "^9.0.0",
+        "glob": "^9.0.1",
         "gulp": "^5.0.1",
         "gulp-azure-storage": "^0.12.1",
         "gulp-bom": "^3.0.0",
@@ -7210,9 +7210,9 @@
       "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
     },
     "node_modules/glob": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-9.0.0.tgz",
-      "integrity": "sha512-7rdoWzT8/4f1yEe/cMdBug2lmzmYMYU9h4RNNiavPHajhcxt7kkxrOvwSnIPkZMjLQb9BXv7nFoKmTnPPklMyA==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-9.0.1.tgz",
+      "integrity": "sha512-psRdn8MI0gRcH0xow0VOhYxXD/6ZaRGmgtfN0oWN/hCgjxpRQBMCl7wE4JRJSAUTdJsW+FmD0EtE0CgJhKqSVw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -7222,7 +7222,7 @@
         "path-scurry": "^1.5.0"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
diff --git a/package.json b/package.json
index 77f3e926a28f..4657b25e4475 100644
--- a/package.json
+++ b/package.json
@@ -164,7 +164,7 @@
     "event-stream": "3.3.4",
     "fancy-log": "^1.3.3",
     "file-loader": "^6.2.0",
-    "glob": "^9.0.0",
+    "glob": "^9.0.1",
     "gulp": "^5.0.1",
     "gulp-azure-storage": "^0.12.1",
     "gulp-bom": "^3.0.0",

From ec0ca9e48d15ed0d9a1c8459c55ac06f8e160cd2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Nov 2025 14:06:28 +0000
Subject: [PATCH 1067/1815] Bump actions/checkout from 4 to 6

Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/telemetry.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml
index c28342952976..720b30d13b63 100644
--- a/.github/workflows/telemetry.yml
+++ b/.github/workflows/telemetry.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: 'ubuntu-latest'
 
     steps:
-      - uses: 'actions/checkout@v4'
+      - uses: 'actions/checkout@v6'
 
       - uses: 'actions/setup-node@v6'
         with:

From f2cdcabacbebafd4a537b4d6f5e3ccc6f14a46b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Nov 2025 08:22:10 +0000
Subject: [PATCH 1068/1815] Bump node-forge

Bumps the npm_and_yarn group with 1 update in the /extensions/vscode-api-tests directory: [node-forge](https://github.com/digitalbazaar/forge).


Updates `node-forge` from 1.3.1 to 1.3.2
- [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md)
- [Commits](https://github.com/digitalbazaar/forge/compare/v1.3.1...v1.3.2)

---
updated-dependencies:
- dependency-name: node-forge
  dependency-version: 1.3.2
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-api-tests/package-lock.json | 9 +++++----
 extensions/vscode-api-tests/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/vscode-api-tests/package-lock.json b/extensions/vscode-api-tests/package-lock.json
index cd90b33ca496..e28b852b6227 100644
--- a/extensions/vscode-api-tests/package-lock.json
+++ b/extensions/vscode-api-tests/package-lock.json
@@ -12,7 +12,7 @@
         "@types/mocha": "^9.1.1",
         "@types/node": "20.x",
         "@types/node-forge": "^1.3.11",
-        "node-forge": "^1.3.1",
+        "node-forge": "^1.3.2",
         "straightforward": "^4.2.2"
       },
       "engines": {
@@ -156,10 +156,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 66a80b8867f8..9436688fd7c6 100644
--- a/extensions/vscode-api-tests/package.json
+++ b/extensions/vscode-api-tests/package.json
@@ -254,7 +254,7 @@
     "@types/mocha": "^9.1.1",
     "@types/node": "20.x",
     "@types/node-forge": "^1.3.11",
-    "node-forge": "^1.3.1",
+    "node-forge": "^1.3.2",
     "straightforward": "^4.2.2"
   },
   "repository": {

From d5a570b8875419da7f9531f81255ca5bb0b39011 Mon Sep 17 00:00:00 2001
From: StepSecurity Bot <bot@stepsecurity.io>
Date: Fri, 28 Nov 2025 05:32:24 +0000
Subject: [PATCH 1069/1815] [StepSecurity] ci: Harden GitHub Actions

Signed-off-by: StepSecurity Bot <bot@stepsecurity.io>
---
 .devcontainer/Dockerfile                      |   2 +-
 .github/dependabot.yml                        | 590 ++++++++++++++++++
 .github/workflows/codeql.yml                  |  78 +++
 .github/workflows/dependency-review.yml       |  27 +
 .github/workflows/scorecards.yml              |  81 +++
 .github/workflows/telemetry.yml               |  12 +-
 .pre-commit-config.yaml                       |  39 ++
 .../test/colorize-fixtures/Dockerfile         |   2 +-
 8 files changed, 827 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/codeql.yml
 create mode 100644 .github/workflows/dependency-review.yml
 create mode 100644 .github/workflows/scorecards.yml
 create mode 100644 .pre-commit-config.yaml

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 9be15a6afa1e..0555ba4ceccc 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/typescript-node:20-bookworm
+FROM mcr.microsoft.com/devcontainers/typescript-node:20-bookworm@sha256:2f10af40f21987546aca157c618f8fb749db97b5f90cb5bd7c9df687fffb4ede
 
 ADD install-vscode.sh /root/
 RUN /root/install-vscode.sh
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a49bf40fff10..1e1402fa5aea 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,3 +5,593 @@ updates:
     schedule:
       interval: "weekly"
  
+
+  - package-ecosystem: docker
+    directory: /.devcontainer
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /.eslint-plugin-local
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /.vscode/extensions/vscode-selfhost-import-aid
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /.vscode/extensions/vscode-selfhost-test-provider
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /build/builtin
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /build/monaco
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /build/npm/gyp
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /build
+    schedule:
+      interval: daily
+
+  - package-ecosystem: cargo
+    directory: /build/win32
+    schedule:
+      interval: daily
+
+  - package-ecosystem: cargo
+    directory: /cli
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/bat
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/clojure
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/coffeescript
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/configuration-editing
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/cpp
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/csharp
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/css-language-features
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/css-language-features/server
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/css
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/dart
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/debug-auto-launch
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/debug-server-ready
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/diff
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/docker
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/emmet
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/extension-editing
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/fsharp
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/git-base
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/git
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/github-authentication
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/github
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/go
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/groovy
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/grunt
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/gulp
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/handlebars
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/hlsl
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/html-language-features
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/html-language-features/server
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/html
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/ini
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/ipynb
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/jake
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/java
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/javascript
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/json-language-features
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/json-language-features/server
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/json
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/julia
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/latex
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/less
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/log
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/lua
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/make
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/markdown-basics
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/markdown-language-features
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/markdown-math
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/media-preview
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/merge-conflict
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/microsoft-authentication
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/microsoft-authentication/packageMocks/keytar
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/notebook-renderers
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/npm
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/objective-c
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/perl
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/php-language-features
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/php
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/powershell
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/pug
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/python
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/r
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/razor
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/references-view
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/restructuredtext
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/ruby
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/rust
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/scss
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/search-result
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/shaderlab
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/shellscript
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/simple-browser
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/sql
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/swift
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/terminal-suggest
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/theme-abyss
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/theme-defaults
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/theme-kimbie-dark
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/theme-monokai-dimmed
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/theme-monokai
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/theme-quietlight
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/theme-red
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/theme-seti
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/theme-solarized-dark
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/theme-solarized-light
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/theme-tomorrow-night-blue
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/tunnel-forwarding
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/typescript-basics
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/typescript-language-features
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/vb
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/vscode-api-tests
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/vscode-colorize-perf-tests
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/vscode-colorize-tests
+    schedule:
+      interval: daily
+
+  - package-ecosystem: docker
+    directory: /extensions/vscode-colorize-tests/test/colorize-fixtures
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/vscode-test-resolver
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/xml
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /extensions/yaml
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /remote
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /remote/web
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /scripts
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /test/automation
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /test/integration/browser
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /test/leaks
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /test/monaco
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /test
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /test/smoke
+    schedule:
+      interval: daily
+
+  - package-ecosystem: npm
+    directory: /test/unit/node
+    schedule:
+      interval: daily
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 000000000000..a0bb0c77fe77
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,78 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: ["Main"]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: ["Main"]
+  schedule:
+    - cron: "0 0 * * 1"
+
+permissions:
+  contents: read
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ["cpp", "csharp", "go", "java", "javascript", "python", "ruby", "typescript"]
+        # CodeQL supports [ $supported-codeql-languages ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        with:
+          egress-policy: audit
+
+      - name: Checkout repository
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@d3ced5c96c16c4332e2a61eb6f3649d6f1b20bb8 # v3.31.5
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@d3ced5c96c16c4332e2a61eb6f3649d6f1b20bb8 # v3.31.5
+
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+      #   If the Autobuild fails above, remove it and uncomment the following three lines.
+      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+      # - run: |
+      #   echo "Run, Build Application using script"
+      #   ./location_of_script_within_repo/buildscript.sh
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@d3ced5c96c16c4332e2a61eb6f3649d6f1b20bb8 # v3.31.5
+        with:
+          category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
new file mode 100644
index 000000000000..cccd92955da3
--- /dev/null
+++ b/.github/workflows/dependency-review.yml
@@ -0,0 +1,27 @@
+# Dependency Review Action
+#
+# This Action will scan dependency manifest files that change as part of a Pull Request,
+# surfacing known-vulnerable versions of the packages declared or updated in the PR.
+# Once installed, if the workflow run is marked as required,
+# PRs introducing known-vulnerable packages will be blocked from merging.
+#
+# Source repository: https://github.com/actions/dependency-review-action
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        with:
+          egress-policy: audit
+
+      - name: 'Checkout Repository'
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
new file mode 100644
index 000000000000..264c25e49ed9
--- /dev/null
+++ b/.github/workflows/scorecards.yml
@@ -0,0 +1,81 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '20 7 * * 2'
+  push:
+    branches: ["Main"]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      contents: read
+      actions: read
+      # To allow GraphQL ListCommits to work
+      issues: read
+      pull-requests: read
+      # To detect SAST tools
+      checks: read
+
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        with:
+          egress-policy: audit
+
+      - name: "Checkout code"
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecards on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
+          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories:
+          #   - `publish_results` will always be set to `false`, regardless
+          #     of the value entered here.
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@d3ced5c96c16c4332e2a61eb6f3649d6f1b20bb8 # v3.31.5
+        with:
+          sarif_file: results.sarif
diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml
index 720b30d13b63..4d9f6a00d83f 100644
--- a/.github/workflows/telemetry.yml
+++ b/.github/workflows/telemetry.yml
@@ -1,6 +1,9 @@
 name: 'Telemetry'
 on:
   pull_request:
+permissions:
+  contents: read
+
 jobs:
   check-metdata:
     name: 'Check metadata'
@@ -9,9 +12,14 @@ jobs:
     runs-on: 'ubuntu-latest'
 
     steps:
-      - uses: 'actions/checkout@v6'
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        with:
+          egress-policy: audit
+
+      - uses: 'actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3' # v6.0.0
 
-      - uses: 'actions/setup-node@v6'
+      - uses: 'actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903' # v6.0.0
         with:
           node-version: 'lts/*'
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 000000000000..43c74cd8f368
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,39 @@
+repos:
+- repo: https://github.com/digitalpulp/pre-commit-php
+  rev: 1.4.0
+  hooks:
+  - id: php-lint-all
+- repo: https://github.com/gherynos/pre-commit-java
+  rev: v0.2.4
+  hooks:
+  - id: Checkstyle
+- repo: https://github.com/gitleaks/gitleaks
+  rev: v8.16.3
+  hooks:
+  - id: gitleaks
+- repo: https://github.com/golangci/golangci-lint
+  rev: v1.52.2
+  hooks:
+  - id: golangci-lint
+- repo: https://github.com/jumanjihouse/pre-commit-hooks
+  rev: 3.0.0
+  hooks:
+  - id: RuboCop
+  - id: shellcheck
+- repo: https://github.com/pocc/pre-commit-hooks
+  rev: v1.3.5
+  hooks:
+  - id: cpplint
+- repo: https://github.com/pre-commit/mirrors-eslint
+  rev: v8.38.0
+  hooks:
+  - id: eslint
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.4.0
+  hooks:
+  - id: end-of-file-fixer
+  - id: trailing-whitespace
+- repo: https://github.com/pylint-dev/pylint
+  rev: v2.17.2
+  hooks:
+  - id: pylint
diff --git a/extensions/vscode-colorize-tests/test/colorize-fixtures/Dockerfile b/extensions/vscode-colorize-tests/test/colorize-fixtures/Dockerfile
index 096488908cd6..2b51cb587227 100644
--- a/extensions/vscode-colorize-tests/test/colorize-fixtures/Dockerfile
+++ b/extensions/vscode-colorize-tests/test/colorize-fixtures/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/base:ubuntu
+FROM mcr.microsoft.com/devcontainers/base:ubuntu@sha256:8d68bbf458958747a7f41756f60de95d5b404f374f05cd42969957653fad0cfe
 MAINTAINER Microsoft
 
 RUN apt-get install -y software-properties-common python

From efd673a0da47156f61d3c5edf3cc6379f1cc35e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:04:01 +0000
Subject: [PATCH 1070/1815] Bump devcontainers/typescript-node in
 /.devcontainer

Bumps devcontainers/typescript-node from 20-bookworm to 24-bookworm.

---
updated-dependencies:
- dependency-name: devcontainers/typescript-node
  dependency-version: 24-bookworm
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .devcontainer/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 0555ba4ceccc..650c936a6966 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/typescript-node:20-bookworm@sha256:2f10af40f21987546aca157c618f8fb749db97b5f90cb5bd7c9df687fffb4ede
+FROM mcr.microsoft.com/devcontainers/typescript-node:24-bookworm@sha256:2baba848f88e02278bcf59e072752f7371534ccfc67afcd8e0ee6b293865c6f9
 
 ADD install-vscode.sh /root/
 RUN /root/install-vscode.sh

From b1200ae825f00815f680211044802588e271bc99 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:04:01 +0000
Subject: [PATCH 1071/1815] Bump ossf/scorecard-action from 2.4.0 to 2.4.3

Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.4.0 to 2.4.3.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/62b2cac7ed8198b15735ed49ab1e5cf35480ba46...4eaacf0543bb3f2c246792bd56e8cdeffafb205a)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-version: 2.4.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/scorecards.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 264c25e49ed9..cd83ccfdf8da 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -46,7 +46,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
+        uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
         with:
           results_file: results.sarif
           results_format: sarif

From 64d7c8fc5b7616c2e4d6b9e6bd1b542c958bb740 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:04:04 +0000
Subject: [PATCH 1072/1815] Bump actions/upload-artifact from 4.6.2 to 5.0.0

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.2 to 5.0.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/ea165f8d65b6e75b540449e92b4886f43607fa02...330a01c490aca151604b8cf639adc76d48f6c5d4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/scorecards.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 264c25e49ed9..547e9f6bfecd 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -68,7 +68,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: SARIF file
           path: results.sarif

From d2b01dd0880cb95bec0a4da6ec4a6e8cf7bc9162 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:04:52 +0000
Subject: [PATCH 1073/1815] Bump typescript in
 /.vscode/extensions/vscode-selfhost-import-aid

Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.5.4 to 5.9.3.
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Commits](https://github.com/microsoft/TypeScript/compare/v5.5.4...v5.9.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-version: 5.9.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../vscode-selfhost-import-aid/package-lock.json         | 9 +++++----
 .../extensions/vscode-selfhost-import-aid/package.json   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.vscode/extensions/vscode-selfhost-import-aid/package-lock.json b/.vscode/extensions/vscode-selfhost-import-aid/package-lock.json
index 5f526aca3e9e..899595c323f7 100644
--- a/.vscode/extensions/vscode-selfhost-import-aid/package-lock.json
+++ b/.vscode/extensions/vscode-selfhost-import-aid/package-lock.json
@@ -9,16 +9,17 @@
       "version": "0.0.1",
       "license": "MIT",
       "dependencies": {
-        "typescript": "5.5.4"
+        "typescript": "5.9.3"
       },
       "engines": {
         "vscode": "^1.88.0"
       }
     },
     "node_modules/typescript": {
-      "version": "5.5.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
diff --git a/.vscode/extensions/vscode-selfhost-import-aid/package.json b/.vscode/extensions/vscode-selfhost-import-aid/package.json
index 30f09f9c8e5b..396eba235d1f 100644
--- a/.vscode/extensions/vscode-selfhost-import-aid/package.json
+++ b/.vscode/extensions/vscode-selfhost-import-aid/package.json
@@ -24,6 +24,6 @@
     "watch": "gulp watch-extension:vscode-selfhost-import-aid"
   },
   "dependencies": {
-    "typescript": "5.5.4"
+    "typescript": "5.9.3"
   }
 }

From 02413b7286ba480366da4b93a91be0fa5e79d0a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:05:09 +0000
Subject: [PATCH 1074/1815] Bump core-foundation from 0.9.4 to 0.10.1 in /cli

Bumps [core-foundation](https://github.com/servo/core-foundation-rs) from 0.9.4 to 0.10.1.
- [Commits](https://github.com/servo/core-foundation-rs/commits)

---
updated-dependencies:
- dependency-name: core-foundation
  dependency-version: 0.10.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 16 +++++++++++++---
 cli/Cargo.toml |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index c5f398e34876..fd2d0255fdf8 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -413,7 +413,7 @@ dependencies = [
  "clap_lex",
  "console",
  "const_format",
- "core-foundation",
+ "core-foundation 0.10.1",
  "dialoguer",
  "dirs 5.0.1",
  "flate2",
@@ -510,6 +510,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.6"
@@ -2347,7 +2357,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
  "bitflags 2.5.0",
- "core-foundation",
+ "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -2588,7 +2598,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
  "system-configuration-sys",
 ]
 
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 95efef30d75f..a813142aaacc 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -64,7 +64,7 @@ winreg = "0.50.0"
 winapi = "0.3.9"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-core-foundation = "0.9.3"
+core-foundation = "0.10.1"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 zbus = { version = "3.13.1", default-features = false, features = ["tokio"] }

From a4715d590eb67cb31f5fe7e0872c2b5fda17c27a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:05:10 +0000
Subject: [PATCH 1075/1815] Bump crc from 3.0.1 to 3.4.0 in /build/win32

Bumps [crc](https://github.com/mrhooray/crc-rs) from 3.0.1 to 3.4.0.
- [Commits](https://github.com/mrhooray/crc-rs/compare/3.0.1...3.4.0)

---
updated-dependencies:
- dependency-name: crc
  dependency-version: 3.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/win32/Cargo.lock | 8 ++++----
 build/win32/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/win32/Cargo.lock b/build/win32/Cargo.lock
index 5437686ef940..59c7a64b9bfc 100644
--- a/build/win32/Cargo.lock
+++ b/build/win32/Cargo.lock
@@ -22,18 +22,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "crc"
-version = "3.0.1"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe"
+checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d"
 dependencies = [
  "crc-catalog",
 ]
 
 [[package]]
 name = "crc-catalog"
-version = "2.2.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
 [[package]]
 name = "crossbeam-channel"
diff --git a/build/win32/Cargo.toml b/build/win32/Cargo.toml
index 42958b3124a9..761f8c790898 100644
--- a/build/win32/Cargo.toml
+++ b/build/win32/Cargo.toml
@@ -6,7 +6,7 @@ build = "build.rs"
 
 [dependencies]
 byteorder = "1.4.3"
-crc = "3.0.1"
+crc = "3.4.0"
 slog = "2.7.0"
 slog-async = "2.7.0"
 slog-term = "2.9.1"

From 1f02791d9219e73ff43d6fd00f5b6075e6b714f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:05:12 +0000
Subject: [PATCH 1076/1815] Bump @jridgewell/trace-mapping

Bumps [@jridgewell/trace-mapping](https://github.com/jridgewell/sourcemaps/tree/HEAD/packages/trace-mapping) from 0.3.25 to 0.3.31.
- [Changelog](https://github.com/jridgewell/sourcemaps/blob/main/packages/trace-mapping/CHANGELOG.md)
- [Commits](https://github.com/jridgewell/sourcemaps/commits/trace-mapping/0.3.31/packages/trace-mapping)

---
updated-dependencies:
- dependency-name: "@jridgewell/trace-mapping"
  dependency-version: 0.3.31
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../vscode-selfhost-test-provider/package-lock.json      | 9 +++++----
 .../vscode-selfhost-test-provider/package.json           | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
index a71a68e4e365..26880158e7c9 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.4.0",
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.25",
+        "@jridgewell/trace-mapping": "^0.3.31",
         "ansi-styles": "^5.2.0",
         "cockatiel": "^3.1.3",
         "istanbul-to-vscode": "^2.0.1"
@@ -36,9 +36,10 @@
       "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package.json b/.vscode/extensions/vscode-selfhost-test-provider/package.json
index 71b5ee73c60d..1ad35ad73d46 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package.json
@@ -81,7 +81,7 @@
     "@types/node": "20.x"
   },
   "dependencies": {
-    "@jridgewell/trace-mapping": "^0.3.25",
+    "@jridgewell/trace-mapping": "^0.3.31",
     "ansi-styles": "^5.2.0",
     "cockatiel": "^3.1.3",
     "istanbul-to-vscode": "^2.0.1"

From 6014ba2da5fff9a5c3256d427ed54bf9be2678bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:05:20 +0000
Subject: [PATCH 1077/1815] Bump uuid from 1.8.0 to 1.16.0 in /cli

Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.8.0 to 1.16.0.
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.8.0...v1.16.0)

---
updated-dependencies:
- dependency-name: uuid
  dependency-version: 1.16.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 39 ++++++++++++++++++++++++++++++++++++---
 cli/Cargo.toml |  2 +-
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index c5f398e34876..1a2eef005d94 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -995,6 +995,18 @@ dependencies = [
  "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasip2",
+]
+
 [[package]]
 name = "gimli"
 version = "0.28.1"
@@ -2003,6 +2015,12 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
 [[package]]
 name = "rand"
 version = "0.7.3"
@@ -2940,11 +2958,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.8.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.3.4",
  "serde",
 ]
 
@@ -2987,6 +3005,15 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen",
+]
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.92"
@@ -3274,6 +3301,12 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
 [[package]]
 name = "write16"
 version = "1.0.0"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 95efef30d75f..4bf238687ac0 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -26,7 +26,7 @@ sysinfo = { version = "0.29.0", default-features = false }
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 rmp-serde = "1.1.1"
-uuid = { version = "1.4", features = ["serde", "v4"] }
+uuid = { version = "1.16", features = ["serde", "v4"] }
 dirs = "5.0.1"
 rand = "0.8.5"
 opentelemetry = { version = "0.19.0", features = ["rt-tokio"] }

From 510ca6016a6ed3d87667451385d29626bb794bb8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:05:20 +0000
Subject: [PATCH 1078/1815] Bump @octokit/rest in
 /extensions/configuration-editing

Bumps [@octokit/rest](https://github.com/octokit/rest.js) from 21.1.1 to 22.0.1.
- [Release notes](https://github.com/octokit/rest.js/releases)
- [Commits](https://github.com/octokit/rest.js/compare/v21.1.1...v22.0.1)

---
updated-dependencies:
- dependency-name: "@octokit/rest"
  dependency-version: 22.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../configuration-editing/package-lock.json   | 154 +++++++++---------
 extensions/configuration-editing/package.json |   2 +-
 2 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/extensions/configuration-editing/package-lock.json b/extensions/configuration-editing/package-lock.json
index cba3a0fece64..71eae8dd4ca7 100644
--- a/extensions/configuration-editing/package-lock.json
+++ b/extensions/configuration-editing/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@octokit/rest": "^21.1.1",
+        "@octokit/rest": "^22.0.1",
         "jsonc-parser": "^3.2.0",
         "tunnel": "^0.0.6"
       },
@@ -21,157 +21,157 @@
       }
     },
     "node_modules/@octokit/auth-token": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-5.1.2.tgz",
-      "integrity": "sha512-JcQDsBdg49Yky2w2ld20IHAlwr8d/d8N6NiOXbtuoPCqzbsiJgF633mVUw3x4mo0H5ypataQIX7SFu3yy44Mpw==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-6.0.0.tgz",
+      "integrity": "sha512-P4YJBPdPSpWTQ1NU4XYdvHvXJJDxM6YwpS0FZHRgP7YFkdVxsWcpWGy/NVqlAA7PcPCnMacXlRm1y2PFZRWL/w==",
       "license": "MIT",
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/core": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.4.tgz",
-      "integrity": "sha512-lAS9k7d6I0MPN+gb9bKDt7X8SdxknYqAMh44S5L+lNqIN2NuV8nvv3g8rPp7MuRxcOpxpUIATWprO0C34a8Qmg==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-7.0.6.tgz",
+      "integrity": "sha512-DhGl4xMVFGVIyMwswXeyzdL4uXD5OGILGX5N8Y+f6W7LhC1Ze2poSNrkF/fedpVDHEEZ+PHFW0vL14I+mm8K3Q==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/auth-token": "^5.0.0",
-        "@octokit/graphql": "^8.1.2",
-        "@octokit/request": "^9.2.1",
-        "@octokit/request-error": "^6.1.7",
-        "@octokit/types": "^13.6.2",
-        "before-after-hook": "^3.0.2",
+        "@octokit/auth-token": "^6.0.0",
+        "@octokit/graphql": "^9.0.3",
+        "@octokit/request": "^10.0.6",
+        "@octokit/request-error": "^7.0.2",
+        "@octokit/types": "^16.0.0",
+        "before-after-hook": "^4.0.0",
         "universal-user-agent": "^7.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/endpoint": {
-      "version": "10.1.3",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.3.tgz",
-      "integrity": "sha512-nBRBMpKPhQUxCsQQeW+rCJ/OPSMcj3g0nfHn01zGYZXuNDvvXudF/TYY6APj5THlurerpFN4a/dQAIAaM6BYhA==",
+      "version": "11.0.2",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-11.0.2.tgz",
+      "integrity": "sha512-4zCpzP1fWc7QlqunZ5bSEjxc6yLAlRTnDwKtgXfcI/FxxGoqedDG8V2+xJ60bV2kODqcGB+nATdtap/XYq2NZQ==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^13.6.2",
+        "@octokit/types": "^16.0.0",
         "universal-user-agent": "^7.0.2"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/graphql": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.2.1.tgz",
-      "integrity": "sha512-n57hXtOoHrhwTWdvhVkdJHdhTv0JstjDbDRhJfwIRNfFqmSo1DaK/mD2syoNUoLCyqSjBpGAKOG0BuwF392slw==",
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-9.0.3.tgz",
+      "integrity": "sha512-grAEuupr/C1rALFnXTv6ZQhFuL1D8G5y8CN04RgrO4FIPMrtm+mcZzFG7dcBm+nq+1ppNixu+Jd78aeJOYxlGA==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/request": "^9.2.2",
-        "@octokit/types": "^13.8.0",
+        "@octokit/request": "^10.0.6",
+        "@octokit/types": "^16.0.0",
         "universal-user-agent": "^7.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/openapi-types": {
-      "version": "23.0.1",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-23.0.1.tgz",
-      "integrity": "sha512-izFjMJ1sir0jn0ldEKhZ7xegCTj/ObmEDlEfpFrx4k/JyZSMRHbO3/rBwgE7f3m2DHt+RrNGIVw4wSmwnm3t/g==",
+      "version": "27.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-27.0.0.tgz",
+      "integrity": "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==",
       "license": "MIT"
     },
     "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "11.4.2",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.4.2.tgz",
-      "integrity": "sha512-BXJ7XPCTDXFF+wxcg/zscfgw2O/iDPtNSkwwR1W1W5c4Mb3zav/M2XvxQ23nVmKj7jpweB4g8viMeCQdm7LMVA==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-14.0.0.tgz",
+      "integrity": "sha512-fNVRE7ufJiAA3XUrha2omTA39M6IXIc6GIZLvlbsm8QOQCYvpq/LkMNGyFlB1d8hTDzsAXa3OKtybdMAYsV/fw==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^13.7.0"
+        "@octokit/types": "^16.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       },
       "peerDependencies": {
         "@octokit/core": ">=6"
       }
     },
     "node_modules/@octokit/plugin-request-log": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-5.3.1.tgz",
-      "integrity": "sha512-n/lNeCtq+9ofhC15xzmJCNKP2BWTv8Ih2TTy+jatNCCq/gQP/V7rK3fjIfuz0pDWDALO/o/4QY4hyOF6TQQFUw==",
+      "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==",
       "license": "MIT",
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       },
       "peerDependencies": {
         "@octokit/core": ">=6"
       }
     },
     "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "13.3.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-13.3.1.tgz",
-      "integrity": "sha512-o8uOBdsyR+WR8MK9Cco8dCgvG13H1RlM1nWnK/W7TEACQBFux/vPREgKucxUfuDQ5yi1T3hGf4C5ZmZXAERgwQ==",
+      "version": "17.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-17.0.0.tgz",
+      "integrity": "sha512-B5yCyIlOJFPqUUeiD0cnBJwWJO8lkJs5d8+ze9QDP6SvfiXSz1BF+91+0MeI1d2yxgOhU/O+CvtiZ9jSkHhFAw==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^13.8.0"
+        "@octokit/types": "^16.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       },
       "peerDependencies": {
         "@octokit/core": ">=6"
       }
     },
     "node_modules/@octokit/request": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.2.2.tgz",
-      "integrity": "sha512-dZl0ZHx6gOQGcffgm1/Sf6JfEpmh34v3Af2Uci02vzUYz6qEN6zepoRtmybWXIGXFIK8K9ylE3b+duCWqhArtg==",
+      "version": "10.0.7",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-10.0.7.tgz",
+      "integrity": "sha512-v93h0i1yu4idj8qFPZwjehoJx4j3Ntn+JhXsdJrG9pYaX6j/XRz2RmasMUHtNgQD39nrv/VwTWSqK0RNXR8upA==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/endpoint": "^10.1.3",
-        "@octokit/request-error": "^6.1.7",
-        "@octokit/types": "^13.6.2",
-        "fast-content-type-parse": "^2.0.0",
+        "@octokit/endpoint": "^11.0.2",
+        "@octokit/request-error": "^7.0.2",
+        "@octokit/types": "^16.0.0",
+        "fast-content-type-parse": "^3.0.0",
         "universal-user-agent": "^7.0.2"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/request-error": {
-      "version": "6.1.7",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.7.tgz",
-      "integrity": "sha512-69NIppAwaauwZv6aOzb+VVLwt+0havz9GT5YplkeJv7fG7a40qpLt/yZKyiDxAhgz0EtgNdNcb96Z0u+Zyuy2g==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-7.1.0.tgz",
+      "integrity": "sha512-KMQIfq5sOPpkQYajXHwnhjCC0slzCNScLHs9JafXc4RAJI+9f+jNDlBNaIMTvazOPLgb4BnlhGJOTbnN0wIjPw==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^13.6.2"
+        "@octokit/types": "^16.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/rest": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-21.1.1.tgz",
-      "integrity": "sha512-sTQV7va0IUVZcntzy1q3QqPm/r8rWtDCqpRAmb8eXXnKkjoQEtFe3Nt5GTVsHft+R6jJoHeSiVLcgcvhtue/rg==",
+      "version": "22.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-22.0.1.tgz",
+      "integrity": "sha512-Jzbhzl3CEexhnivb1iQ0KJ7s5vvjMWcmRtq5aUsKmKDrRW6z3r84ngmiFKFvpZjpiU/9/S6ITPFRpn5s/3uQJw==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/core": "^6.1.4",
-        "@octokit/plugin-paginate-rest": "^11.4.2",
-        "@octokit/plugin-request-log": "^5.3.1",
-        "@octokit/plugin-rest-endpoint-methods": "^13.3.0"
+        "@octokit/core": "^7.0.6",
+        "@octokit/plugin-paginate-rest": "^14.0.0",
+        "@octokit/plugin-request-log": "^6.0.0",
+        "@octokit/plugin-rest-endpoint-methods": "^17.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/types": {
-      "version": "13.8.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.8.0.tgz",
-      "integrity": "sha512-x7DjTIbEpEWXK99DMd01QfWy0hd5h4EN+Q7shkdKds3otGQP+oWE/y0A76i1OvH9fygo4ddvNf7ZvF0t78P98A==",
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-16.0.0.tgz",
+      "integrity": "sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/openapi-types": "^23.0.1"
+        "@octokit/openapi-types": "^27.0.0"
       }
     },
     "node_modules/@types/node": {
@@ -184,15 +184,15 @@
       }
     },
     "node_modules/before-after-hook": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-3.0.2.tgz",
-      "integrity": "sha512-Nik3Sc0ncrMK4UUdXQmAnRtzmNQTAAXmXIopizwZ1W1t8QmfJj+zL4OA2I7XPTPW5z5TDqv4hRo/JzouDJnX3A==",
+      "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==",
       "license": "Apache-2.0"
     },
     "node_modules/fast-content-type-parse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-2.0.1.tgz",
-      "integrity": "sha512-nGqtvLrj5w0naR6tDPfB4cUmYCqouzyQiz6C5y/LtcDllJdrcc6WaWW6iXyIIOErTa/XRybj28aasdn4LkVk6Q==",
+      "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==",
       "funding": [
         {
           "type": "github",
@@ -225,9 +225,9 @@
       "dev": true
     },
     "node_modules/universal-user-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.2.tgz",
-      "integrity": "sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.3.tgz",
+      "integrity": "sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==",
       "license": "ISC"
     }
   }
diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json
index 531ba21fe063..6c4e0c8edc9b 100644
--- a/extensions/configuration-editing/package.json
+++ b/extensions/configuration-editing/package.json
@@ -25,7 +25,7 @@
     "watch": "gulp watch-extension:configuration-editing"
   },
   "dependencies": {
-    "@octokit/rest": "^21.1.1",
+    "@octokit/rest": "^22.0.1",
     "jsonc-parser": "^3.2.0",
     "tunnel": "^0.0.6"
   },

From 245e9c9c0633bd1e8e49f8a4eef8d7413707a01a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:05:34 +0000
Subject: [PATCH 1079/1815] Bump @azure/core-auth from 1.9.0 to 1.10.1 in
 /build

Bumps [@azure/core-auth](https://github.com/Azure/azure-sdk-for-js) from 1.9.0 to 1.10.1.
- [Release notes](https://github.com/Azure/azure-sdk-for-js/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-js/blob/main/documentation/Changelog-for-next-generation.md)
- [Commits](https://github.com/Azure/azure-sdk-for-js/compare/@azure/core-auth_1.9.0...@azure/core-auth_1.10.1)

---
updated-dependencies:
- dependency-name: "@azure/core-auth"
  dependency-version: 1.10.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 40 ++++++++++++++++++++++++++++------------
 build/package.json      |  2 +-
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 93fdaa4335e7..3ce081fd0eef 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "devDependencies": {
-        "@azure/core-auth": "^1.9.0",
+        "@azure/core-auth": "^1.10.1",
         "@azure/cosmos": "^3",
         "@azure/identity": "^4.2.1",
         "@azure/msal-node": "^2.16.1",
@@ -80,18 +80,18 @@
       }
     },
     "node_modules/@azure/core-auth": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.9.0.tgz",
-      "integrity": "sha512-FPwHpZywuyasDSLMqJ6fhbOK3TqUdviZNF8OqRGA4W5Ewib2lEEZ+pBsYcBa88B2NGO/SEnYPGhyBqNlE8ilSw==",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.10.1.tgz",
+      "integrity": "sha512-ykRMW8PjVAn+RS6ww5cmK9U2CyH9p4Q88YJwvUslfuMmN98w/2rdGRLPqJYObapBCdzBVeDgYWdJnFPFb7qzpg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@azure/abort-controller": "^2.0.0",
-        "@azure/core-util": "^1.11.0",
+        "@azure/abort-controller": "^2.1.2",
+        "@azure/core-util": "^1.13.0",
         "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/@azure/core-auth/node_modules/@azure/abort-controller": {
@@ -256,17 +256,18 @@
       }
     },
     "node_modules/@azure/core-util": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.11.0.tgz",
-      "integrity": "sha512-DxOSLua+NdpWoSqULhjDyAZTXFdP/LKkqtYuxxz1SCN289zk3OG8UOpnCQAz/tygyACBtWp/BoO72ptK7msY8g==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.13.1.tgz",
+      "integrity": "sha512-XPArKLzsvl0Hf0CaGyKHUyVgF7oDnhKoP85Xv6M4StF/1AhfORhZudHtOyf2s+FcbuQ9dPRAjB8J2KvRRMUK2A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@azure/abort-controller": "^2.0.0",
+        "@azure/abort-controller": "^2.1.2",
+        "@typespec/ts-http-runtime": "^0.3.0",
         "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/@azure/core-util/node_modules/@azure/abort-controller": {
@@ -1310,6 +1311,21 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@typespec/ts-http-runtime": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@typespec/ts-http-runtime/-/ts-http-runtime-0.3.2.tgz",
+      "integrity": "sha512-IlqQ/Gv22xUC1r/WQm4StLkYQmaaTsXAhUVsNE0+xiyf0yRFiH5++q78U3bw6bLKDCTmh0uqKB9eG9+Bt75Dkg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
     "node_modules/@vscode/iconv-lite-umd": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
diff --git a/build/package.json b/build/package.json
index 3a435a8326bf..483a652388c8 100644
--- a/build/package.json
+++ b/build/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "license": "MIT",
   "devDependencies": {
-    "@azure/core-auth": "^1.9.0",
+    "@azure/core-auth": "^1.10.1",
     "@azure/cosmos": "^3",
     "@azure/identity": "^4.2.1",
     "@azure/msal-node": "^2.16.1",

From 9fd47af30095cd154b368a7fe869fbaccb2a7773 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:05:42 +0000
Subject: [PATCH 1080/1815] Bump @types/node in
 /extensions/css-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 24.10.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.10.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../css-language-features/package-lock.json   | 20 ++++++++++---------
 extensions/css-language-features/package.json |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/css-language-features/package-lock.json b/extensions/css-language-features/package-lock.json
index cee5706d59db..bf02e031ae64 100644
--- a/extensions/css-language-features/package-lock.json
+++ b/extensions/css-language-features/package-lock.json
@@ -13,19 +13,20 @@
         "vscode-uri": "^3.0.8"
       },
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "24.x"
       },
       "engines": {
         "vscode": "^1.77.0"
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "24.10.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
+      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/balanced-match": {
@@ -82,10 +83,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vscode-jsonrpc": {
       "version": "9.0.0-next.6",
diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json
index 0533881380c1..7d000e3252ab 100644
--- a/extensions/css-language-features/package.json
+++ b/extensions/css-language-features/package.json
@@ -998,7 +998,7 @@
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "24.x"
   },
   "repository": {
     "type": "git",

From 2ebdd134de5f31604a8e16272e6d2b4b770eb9a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:05:53 +0000
Subject: [PATCH 1081/1815] Bump vscode-languageclient in
 /extensions/css-language-features

Bumps [vscode-languageclient](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/client) from 10.0.0-next.13 to 10.0.0-next.18.
- [Release notes](https://github.com/Microsoft/vscode-languageserver-node/releases)
- [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/client/10.0.0-next.18/client)

---
updated-dependencies:
- dependency-name: vscode-languageclient
  dependency-version: 10.0.0-next.18
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../css-language-features/package-lock.json   | 111 ++++++++----------
 extensions/css-language-features/package.json |   2 +-
 2 files changed, 53 insertions(+), 60 deletions(-)

diff --git a/extensions/css-language-features/package-lock.json b/extensions/css-language-features/package-lock.json
index cee5706d59db..8b000b18141d 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.13",
+        "vscode-languageclient": "^10.0.0-next.18",
         "vscode-uri": "^3.0.8"
       },
       "devDependencies": {
@@ -19,61 +19,56 @@
         "vscode": "^1.77.0"
       }
     },
-    "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
-      "dev": true,
-      "dependencies": {
-        "undici-types": "~5.26.4"
+    "node_modules/@isaacs/balanced-match": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+      "license": "MIT",
+      "engines": {
+        "node": "20 || >=22"
       }
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+    "node_modules/@isaacs/brace-expansion": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "@isaacs/balanced-match": "^4.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
       }
     },
-    "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==",
+    "node_modules/@types/node": {
+      "version": "20.11.24",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
+      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "dev": true,
       "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "undici-types": "~5.26.4"
       }
     },
     "node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
+      "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "@isaacs/brace-expansion": "^5.0.0"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -88,50 +83,48 @@
       "dev": true
     },
     "node_modules/vscode-jsonrpc": {
-      "version": "9.0.0-next.6",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.6.tgz",
-      "integrity": "sha512-KCSvUNsFiVciG9iqjJKBZOd66CN3ZKohDlYRmoOi+pd8l15MFLZ8wRG4c+wuzePGba/8WcCG2TM+C/GVlvuaeA==",
+      "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.13",
-      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.13.tgz",
-      "integrity": "sha512-KLsOMJoYpkk36PIgcOjyZ4AekOfzp4kdWdRRbVKeVvSIrwrn/4RSZr0NlD6EvUBBJSsJW4WDrYY7Y3znkqa6+w==",
+      "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": "^9.0.3",
-        "semver": "^7.6.0",
-        "vscode-languageserver-protocol": "3.17.6-next.11"
+        "minimatch": "^10.0.3",
+        "semver": "^7.7.1",
+        "vscode-languageserver-protocol": "3.17.6-next.15"
       },
       "engines": {
         "vscode": "^1.91.0"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "version": "3.17.6-next.11",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.11.tgz",
-      "integrity": "sha512-GeJxEp1TiLsp79f8WG5n10wLViXfgFKb99hU9K8m7KDWM95/QFEqWkm79f9LVm54tUK74I91a9EeiQLCS/FABQ==",
+      "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.6",
-        "vscode-languageserver-types": "3.17.6-next.5"
+        "vscode-jsonrpc": "9.0.0-next.10",
+        "vscode-languageserver-types": "3.17.6-next.6"
       }
     },
     "node_modules/vscode-languageserver-types": {
-      "version": "3.17.6-next.5",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.5.tgz",
-      "integrity": "sha512-QFmf3Yl1tCgUQfA77N9Me/LXldJXkIVypQbty2rJ1DNHQkC+iwvm4Z2tXg9czSwlhvv0pD4pbF5mT7WhAglolw=="
+      "version": "3.17.6-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.6.tgz",
+      "integrity": "sha512-aiJY5/yW+xzw7KPNlwi3gQtddq/3EIn5z8X8nCgJfaiAij2R1APKePngv+MUdLdYJBVTLu+Qa0ODsT+pHgYguQ==",
+      "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=="
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     }
   }
 }
diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json
index 0533881380c1..672bfefd828c 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.13",
+    "vscode-languageclient": "^10.0.0-next.18",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {

From 798f3b641f2a1f9f923dd9ce5127f2623d5a5320 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:06:13 +0000
Subject: [PATCH 1082/1815] Bump @emmetio/html-matcher from 0.3.3 to 1.3.0 in
 /extensions/emmet

Bumps [@emmetio/html-matcher](https://github.com/emmetio/html-matcher) from 0.3.3 to 1.3.0.
- [Commits](https://github.com/emmetio/html-matcher/commits)

---
updated-dependencies:
- dependency-name: "@emmetio/html-matcher"
  dependency-version: 1.3.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/emmet/package-lock.json | 11 +++++------
 extensions/emmet/package.json      |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/extensions/emmet/package-lock.json b/extensions/emmet/package-lock.json
index cadbf5387a8f..65aee46eb715 100644
--- a/extensions/emmet/package-lock.json
+++ b/extensions/emmet/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
-        "@emmetio/html-matcher": "^0.3.3",
+        "@emmetio/html-matcher": "^1.3.0",
         "@emmetio/math-expression": "^1.0.5",
         "@vscode/emmet-helper": "^2.8.8",
         "image-size": "~1.0.0",
@@ -48,13 +48,12 @@
       }
     },
     "node_modules/@emmetio/html-matcher": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@emmetio/html-matcher/-/html-matcher-0.3.3.tgz",
-      "integrity": "sha512-+aeGmFXoR36nk2qzqPhBnWjnB38BV+dreTh/tsfbWP9kHv7fqRa9XuG1BSQFbPtKzsjUsBvGXkgGU3G8MkMw6A==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@emmetio/html-matcher/-/html-matcher-1.3.0.tgz",
+      "integrity": "sha512-NTbsvppE5eVyBMuyGfVu2CRrLvo7J4YHb6t9sBFLyY03WYhXET37qA4zOYUjBWFCRHO7pS1B9khERtY0f5JXPQ==",
       "license": "ISC",
       "dependencies": {
-        "@emmetio/stream-reader": "^2.0.0",
-        "@emmetio/stream-reader-utils": "^0.1.0"
+        "@emmetio/scanner": "^1.0.0"
       }
     },
     "node_modules/@emmetio/math-expression": {
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index a390a86fc2ec..d4943101c7b2 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -483,7 +483,7 @@
   },
   "dependencies": {
     "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",
-    "@emmetio/html-matcher": "^0.3.3",
+    "@emmetio/html-matcher": "^1.3.0",
     "@emmetio/math-expression": "^1.0.5",
     "@vscode/emmet-helper": "^2.8.8",
     "image-size": "~1.0.0",

From 3c77aa15d56b67abaeda34a71633b3e436efd346 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:06:26 +0000
Subject: [PATCH 1083/1815] Bump image-size from 1.0.0 to 2.0.2 in
 /extensions/emmet

Bumps [image-size](https://github.com/image-size/image-size) from 1.0.0 to 2.0.2.
- [Release notes](https://github.com/image-size/image-size/releases)
- [Commits](https://github.com/image-size/image-size/compare/v1.0.0...v2.0.2)

---
updated-dependencies:
- dependency-name: image-size
  dependency-version: 2.0.2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/emmet/package-lock.json | 27 ++++++---------------------
 extensions/emmet/package.json      |  2 +-
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/extensions/emmet/package-lock.json b/extensions/emmet/package-lock.json
index cadbf5387a8f..b9fe9da58892 100644
--- a/extensions/emmet/package-lock.json
+++ b/extensions/emmet/package-lock.json
@@ -13,7 +13,7 @@
         "@emmetio/html-matcher": "^0.3.3",
         "@emmetio/math-expression": "^1.0.5",
         "@vscode/emmet-helper": "^2.8.8",
-        "image-size": "~1.0.0",
+        "image-size": "~2.0.2",
         "vscode-languageserver-textdocument": "^1.0.1"
       },
       "devDependencies": {
@@ -119,37 +119,22 @@
       }
     },
     "node_modules/image-size": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.0.0.tgz",
-      "integrity": "sha512-JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw==",
-      "dependencies": {
-        "queue": "6.0.2"
-      },
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-2.0.2.tgz",
+      "integrity": "sha512-IRqXKlaXwgSMAMtpNzZa1ZAe8m+Sa1770Dhk8VkSsP9LS+iHD62Zd8FQKs8fbPiagBE7BzoFX23cxFnwshpV6w==",
+      "license": "MIT",
       "bin": {
         "image-size": "bin/image-size.js"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=16.x"
       }
     },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
     "node_modules/jsonc-parser": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
       "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="
     },
-    "node_modules/queue": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz",
-      "integrity": "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==",
-      "dependencies": {
-        "inherits": "~2.0.3"
-      }
-    },
     "node_modules/undici-types": {
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index a390a86fc2ec..e2a24d114de3 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -486,7 +486,7 @@
     "@emmetio/html-matcher": "^0.3.3",
     "@emmetio/math-expression": "^1.0.5",
     "@vscode/emmet-helper": "^2.8.8",
-    "image-size": "~1.0.0",
+    "image-size": "~2.0.2",
     "vscode-languageserver-textdocument": "^1.0.1"
   },
   "capabilities": {

From de79518c772de989aa707d19c471156602d765ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:06:50 +0000
Subject: [PATCH 1084/1815] Bump parse5 from 3.0.2 to 8.0.0 in
 /extensions/extension-editing

Bumps [parse5](https://github.com/inikulin/parse5) from 3.0.2 to 8.0.0.
- [Release notes](https://github.com/inikulin/parse5/releases)
- [Commits](https://github.com/inikulin/parse5/compare/v3.0.2...v8.0.0)

---
updated-dependencies:
- dependency-name: parse5
  dependency-version: 8.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../extension-editing/package-lock.json       | 29 +++++++++++++------
 extensions/extension-editing/package.json     |  2 +-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/extensions/extension-editing/package-lock.json b/extensions/extension-editing/package-lock.json
index 3fa0c35e2d06..34c89587c452 100644
--- a/extensions/extension-editing/package-lock.json
+++ b/extensions/extension-editing/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "jsonc-parser": "^3.2.0",
         "markdown-it": "^12.3.2",
-        "parse5": "^3.0.2"
+        "parse5": "^8.0.0"
       },
       "devDependencies": {
         "@types/markdown-it": "0.0.2",
@@ -83,17 +83,28 @@
       "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
     },
     "node_modules/parse5": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.2.tgz",
-      "integrity": "sha1-Be/1fw70V3+xRKefi5qWemzERRA= sha512-yQW05f47bKFJa0WdnyzP7vh7+B+w8jhVsFBBiaEbIfNDSSt8GADBhcQgsdYxatQ7rVs1nU9cmsYXURGWBH3Siw==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-8.0.0.tgz",
+      "integrity": "sha512-9m4m5GSgXjL4AjumKzq1Fgfp3Z8rsvjRNbnkVwfu2ImRqE5D0LnY2QfDen18FSY9C573YU5XxSapdHZTZ2WolA==",
+      "license": "MIT",
       "dependencies": {
-        "@types/node": "^6.0.46"
+        "entities": "^6.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
       }
     },
-    "node_modules/parse5/node_modules/@types/node": {
-      "version": "6.0.78",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.78.tgz",
-      "integrity": "sha512-+vD6E8ixntRzzZukoF3uP1iV+ZjVN3koTcaeK+BEoc/kSfGbLDIGC7RmCaUgVpUfN6cWvfczFRERCyKM9mkvXg=="
+    "node_modules/parse5/node_modules/entities": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
+      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
     },
     "node_modules/uc.micro": {
       "version": "1.0.6",
diff --git a/extensions/extension-editing/package.json b/extensions/extension-editing/package.json
index 184d28e8df0c..c807e796fc7d 100644
--- a/extensions/extension-editing/package.json
+++ b/extensions/extension-editing/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "jsonc-parser": "^3.2.0",
     "markdown-it": "^12.3.2",
-    "parse5": "^3.0.2"
+    "parse5": "^8.0.0"
   },
   "contributes": {
     "jsonValidation": [

From db6814a6f5812cf48e4c2852f18a471fc9d8e990 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:07:50 +0000
Subject: [PATCH 1085/1815] Bump @octokit/graphql-schema in /extensions/github

Bumps [@octokit/graphql-schema](https://github.com/octokit/graphql-schema) from 14.4.0 to 15.26.1.
- [Release notes](https://github.com/octokit/graphql-schema/releases)
- [Commits](https://github.com/octokit/graphql-schema/compare/v14.4.0...v15.26.1)

---
updated-dependencies:
- dependency-name: "@octokit/graphql-schema"
  dependency-version: 15.26.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github/package-lock.json | 9 +++++----
 extensions/github/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/github/package-lock.json b/extensions/github/package-lock.json
index cf7317a40a42..c503a7ccc2c9 100644
--- a/extensions/github/package-lock.json
+++ b/extensions/github/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@octokit/graphql": "8.2.0",
-        "@octokit/graphql-schema": "14.4.0",
+        "@octokit/graphql-schema": "15.26.1",
         "@octokit/rest": "21.1.0",
         "@vscode/extension-telemetry": "^0.9.8",
         "tunnel": "^0.0.6"
@@ -201,9 +201,10 @@
       }
     },
     "node_modules/@octokit/graphql-schema": {
-      "version": "14.4.0",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql-schema/-/graphql-schema-14.4.0.tgz",
-      "integrity": "sha512-+O6/dsLlR6V9gv+t1lqsN+x73TLwyQWZpd3M8/eYnuny7VaznV9TAyUxf18tX8WBBS5IqtlLDk1nG+aSTPRZzQ==",
+      "version": "15.26.1",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql-schema/-/graphql-schema-15.26.1.tgz",
+      "integrity": "sha512-RFDC2MpRBd4AxSRvUeBIVeBU7ojN/SxDfALUd7iVYOSeEK3gZaqR2MGOysj4Zh2xj2RY5fQAUT+Oqq7hWTraMA==",
+      "license": "MIT",
       "dependencies": {
         "graphql": "^16.0.0",
         "graphql-tag": "^2.10.3"
diff --git a/extensions/github/package.json b/extensions/github/package.json
index 86adc2ddc4ed..f8bab02b1320 100644
--- a/extensions/github/package.json
+++ b/extensions/github/package.json
@@ -228,7 +228,7 @@
   },
   "dependencies": {
     "@octokit/graphql": "8.2.0",
-    "@octokit/graphql-schema": "14.4.0",
+    "@octokit/graphql-schema": "15.26.1",
     "@octokit/rest": "21.1.0",
     "tunnel": "^0.0.6",
     "@vscode/extension-telemetry": "^0.9.8"

From 659298d187912813d6f73a31d1c3eed00661b400 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:08:36 +0000
Subject: [PATCH 1086/1815] Bump node-fetch from 2.6.7 to 3.3.2 in
 /extensions/github-authentication

Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.7 to 3.3.2.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.7...v3.3.2)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-version: 3.3.2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../github-authentication/package-lock.json   | 113 +++++++++++++-----
 extensions/github-authentication/package.json |   2 +-
 2 files changed, 84 insertions(+), 31 deletions(-)

diff --git a/extensions/github-authentication/package-lock.json b/extensions/github-authentication/package-lock.json
index 2aa199e80407..87ceaa3adfaa 100644
--- a/extensions/github-authentication/package-lock.json
+++ b/extensions/github-authentication/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@vscode/extension-telemetry": "^0.9.8",
-        "node-fetch": "2.6.7",
+        "node-fetch": "3.3.2",
         "vscode-tas-client": "^0.1.84"
       },
       "devDependencies": {
@@ -217,6 +217,15 @@
         "node": ">= 0.8"
       }
     },
+    "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/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -290,6 +299,29 @@
         "node": ">= 0.4"
       }
     },
+    "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/form-data": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.4.tgz",
@@ -307,6 +339,18 @@
         "node": ">= 6"
       }
     },
+    "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/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -444,23 +488,42 @@
         "node": ">= 0.6"
       }
     },
+    "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": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "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": {
-        "whatwg-url": "^5.0.0"
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
       },
       "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
       }
     },
     "node_modules/tas-client": {
@@ -468,11 +531,6 @@
       "resolved": "https://registry.npmjs.org/tas-client/-/tas-client-0.2.33.tgz",
       "integrity": "sha512-V+uqV66BOQnWxvI6HjDnE4VkInmYZUQ4dgB7gzaDyFyFSK1i1nF/j7DpS9UbQAgV9NaF1XpcyuavnM1qOeiEIg=="
     },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
     "node_modules/undici-types": {
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
@@ -490,18 +548,13 @@
         "vscode": "^1.85.0"
       }
     },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0= sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
+    "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"
       }
     }
   }
diff --git a/extensions/github-authentication/package.json b/extensions/github-authentication/package.json
index 96fbcd75d400..ceeed4733eda 100644
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@@ -61,7 +61,7 @@
     "vscode:prepublish": "npm run compile"
   },
   "dependencies": {
-    "node-fetch": "2.6.7",
+    "node-fetch": "3.3.2",
     "@vscode/extension-telemetry": "^0.9.8",
     "vscode-tas-client": "^0.1.84"
   },

From 47b39b3e1a437a43373256bb06ffc3c01357e2de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:09:53 +0000
Subject: [PATCH 1087/1815] Bump @vscode/extension-telemetry in
 /extensions/html-language-features

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 0.9.8 to 1.2.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v0.9.8...v1.2.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.2.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../html-language-features/package-lock.json  | 94 +++++++++----------
 .../html-language-features/package.json       |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/extensions/html-language-features/package-lock.json b/extensions/html-language-features/package-lock.json
index b4c79e11ea3f..110fb47dd5ad 100644
--- a/extensions/html-language-features/package-lock.json
+++ b/extensions/html-language-features/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^0.9.8",
+        "@vscode/extension-telemetry": "^1.2.0",
         "vscode-languageclient": "^10.0.0-next.13",
         "vscode-uri": "^3.0.8"
       },
@@ -21,73 +21,73 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
-      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
+      "integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
-      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.10.tgz",
+      "integrity": "sha512-VSLjc9cT+Y+eTiSfYltJHJCejn8oYr0E6Pq2BMhOEO7F6IyLGYIxzKKvo78ze9x+iHX7KPTATcZ+PFgjGXuNqg==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.3.4",
+        "@microsoft/1ds-core-js": "4.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
-      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.10.tgz",
+      "integrity": "sha512-iolFLz1ocWAzIQqHIEjjov3gNTPkgFQ4ArHnBcJEYoffOGWlJt6copaevS5YPI5rHzmbySsengZ8cLJJBBrXzQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
-      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.10.tgz",
+      "integrity": "sha512-RVIenPIvNgZCbjJdALvLM4rNHgAFuHI7faFzHCgnI6S2WCUNGHeXlQTs9EUUrL+n2TPp9/cd0KKMILU5VVyYiA==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
-      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.10.tgz",
+      "integrity": "sha512-5yKeyassZTq2l+SAO4npu6LPnbS++UD+M+Ghjm9uRzoBwD8tumFx0/F8AkSVqbniSREd+ztH/2q2foewa2RZyg==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -103,18 +103,18 @@
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
-      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.10.tgz",
+      "integrity": "sha512-AZib5DAT3NU0VT0nLWEwXrnoMDDgZ/5S4dso01CNU5ELNxLdg+1fvchstlVdMy4FrAnxzs8Wf/GIQNFYOVgpAw==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.3.4",
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.10",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -139,9 +139,9 @@
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
-      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
+      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
       "license": "MIT"
     },
     "node_modules/@types/node": {
@@ -154,14 +154,14 @@
       }
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.8",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
-      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
+      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.3.4",
-        "@microsoft/1ds-post-js": "^4.3.4",
-        "@microsoft/applicationinsights-web-basic": "^3.3.4"
+        "@microsoft/1ds-core-js": "^4.3.10",
+        "@microsoft/1ds-post-js": "^4.3.10",
+        "@microsoft/applicationinsights-web-basic": "^3.3.10"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json
index be411fe63a2b..a1a811bc9d93 100644
--- a/extensions/html-language-features/package.json
+++ b/extensions/html-language-features/package.json
@@ -258,7 +258,7 @@
     ]
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^0.9.8",
+    "@vscode/extension-telemetry": "^1.2.0",
     "vscode-languageclient": "^10.0.0-next.13",
     "vscode-uri": "^3.0.8"
   },

From 3fc9023858584823de8512c670868ac29cd7359f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:09:57 +0000
Subject: [PATCH 1088/1815] Bump vscode-uri in
 /extensions/html-language-features

Bumps [vscode-uri](https://github.com/microsoft/vscode-uri) from 3.0.8 to 3.1.0.
- [Release notes](https://github.com/microsoft/vscode-uri/releases)
- [Commits](https://github.com/microsoft/vscode-uri/compare/v3.0.8...v3.1.0)

---
updated-dependencies:
- dependency-name: vscode-uri
  dependency-version: 3.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/html-language-features/package-lock.json | 9 +++++----
 extensions/html-language-features/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/html-language-features/package-lock.json b/extensions/html-language-features/package-lock.json
index b4c79e11ea3f..e46065e67b94 100644
--- a/extensions/html-language-features/package-lock.json
+++ b/extensions/html-language-features/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@vscode/extension-telemetry": "^0.9.8",
         "vscode-languageclient": "^10.0.0-next.13",
-        "vscode-uri": "^3.0.8"
+        "vscode-uri": "^3.1.0"
       },
       "devDependencies": {
         "@types/node": "20.x"
@@ -263,9 +263,10 @@
       "integrity": "sha512-QFmf3Yl1tCgUQfA77N9Me/LXldJXkIVypQbty2rJ1DNHQkC+iwvm4Z2tXg9czSwlhvv0pD4pbF5mT7WhAglolw=="
     },
     "node_modules/vscode-uri": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
-      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="
+      "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==",
+      "license": "MIT"
     },
     "node_modules/yallist": {
       "version": "4.0.0",
diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json
index be411fe63a2b..71d0501534c2 100644
--- a/extensions/html-language-features/package.json
+++ b/extensions/html-language-features/package.json
@@ -260,7 +260,7 @@
   "dependencies": {
     "@vscode/extension-telemetry": "^0.9.8",
     "vscode-languageclient": "^10.0.0-next.13",
-    "vscode-uri": "^3.0.8"
+    "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
     "@types/node": "20.x"

From dc5c30961927aabf40e72aac849bf04ca72f3a94 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:10:21 +0000
Subject: [PATCH 1089/1815] Bump @types/markdown-it from 12.2.3 to 14.1.2 in
 /extensions/ipynb

Bumps [@types/markdown-it](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/markdown-it) from 12.2.3 to 14.1.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/markdown-it)

---
updated-dependencies:
- dependency-name: "@types/markdown-it"
  dependency-version: 14.1.2
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/ipynb/package-lock.json | 31 ++++++++++++++++--------------
 extensions/ipynb/package.json      |  2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/extensions/ipynb/package-lock.json b/extensions/ipynb/package-lock.json
index 7042d6a22b2e..260aa53f4041 100644
--- a/extensions/ipynb/package-lock.json
+++ b/extensions/ipynb/package-lock.json
@@ -14,7 +14,7 @@
       },
       "devDependencies": {
         "@jupyterlab/nbformat": "^3.2.9",
-        "@types/markdown-it": "12.2.3"
+        "@types/markdown-it": "14.1.2"
       },
       "engines": {
         "vscode": "^1.57.0"
@@ -44,26 +44,29 @@
       }
     },
     "node_modules/@types/linkify-it": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
-      "integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==",
-      "dev": true
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/markdown-it": {
-      "version": "12.2.3",
-      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
-      "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+      "version": "14.1.2",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
+      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/linkify-it": "*",
-        "@types/mdurl": "*"
+        "@types/linkify-it": "^5",
+        "@types/mdurl": "^2"
       }
     },
     "node_modules/@types/mdurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
-      "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/detect-indent": {
       "version": "6.1.0",
diff --git a/extensions/ipynb/package.json b/extensions/ipynb/package.json
index f43a494f66b0..12372308dfef 100644
--- a/extensions/ipynb/package.json
+++ b/extensions/ipynb/package.json
@@ -166,7 +166,7 @@
   },
   "devDependencies": {
     "@jupyterlab/nbformat": "^3.2.9",
-    "@types/markdown-it": "12.2.3"
+    "@types/markdown-it": "14.1.2"
   },
   "repository": {
     "type": "git",

From 6fb6932951cef3eb0420f0ab71291a4070e8c5cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:10:26 +0000
Subject: [PATCH 1090/1815] Bump detect-indent from 6.1.0 to 7.0.2 in
 /extensions/ipynb

Bumps [detect-indent](https://github.com/sindresorhus/detect-indent) from 6.1.0 to 7.0.2.
- [Release notes](https://github.com/sindresorhus/detect-indent/releases)
- [Commits](https://github.com/sindresorhus/detect-indent/compare/v6.1.0...v7.0.2)

---
updated-dependencies:
- dependency-name: detect-indent
  dependency-version: 7.0.2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/ipynb/package-lock.json | 14 +++++++++-----
 extensions/ipynb/package.json      |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/extensions/ipynb/package-lock.json b/extensions/ipynb/package-lock.json
index 7042d6a22b2e..7b248019017a 100644
--- a/extensions/ipynb/package-lock.json
+++ b/extensions/ipynb/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@enonic/fnv-plus": "^1.3.0",
-        "detect-indent": "^6.0.0"
+        "detect-indent": "^7.0.2"
       },
       "devDependencies": {
         "@jupyterlab/nbformat": "^3.2.9",
@@ -66,11 +66,15 @@
       "dev": true
     },
     "node_modules/detect-indent": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
-      "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-7.0.2.tgz",
+      "integrity": "sha512-y+8xyqdGLL+6sh0tVeHcfP/QDd8gUgbasolJJpY7NgeQGSZ739bDtSiaiDgtoicy+mtYB81dKLxO9xRhCyIB3A==",
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     }
   }
diff --git a/extensions/ipynb/package.json b/extensions/ipynb/package.json
index f43a494f66b0..550539cc5bee 100644
--- a/extensions/ipynb/package.json
+++ b/extensions/ipynb/package.json
@@ -162,7 +162,7 @@
   },
   "dependencies": {
     "@enonic/fnv-plus": "^1.3.0",
-    "detect-indent": "^6.0.0"
+    "detect-indent": "^7.0.2"
   },
   "devDependencies": {
     "@jupyterlab/nbformat": "^3.2.9",

From 4469a11c9a9d35128e6c49da6367fbaa995e5fdf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:15:08 +0000
Subject: [PATCH 1091/1815] Bump vscode-languageserver in
 /extensions/html-language-features/server

Bumps [vscode-languageserver](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/server) from 10.0.0-next.11 to 10.0.0-next.15.
- [Release notes](https://github.com/Microsoft/vscode-languageserver-node/releases)
- [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/client/10.0.0-next.15/server)

---
updated-dependencies:
- dependency-name: vscode-languageserver
  dependency-version: 10.0.0-next.15
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../server/package-lock.json                  | 35 ++++++++++---------
 .../server/package.json                       |  2 +-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/extensions/html-language-features/server/package-lock.json b/extensions/html-language-features/server/package-lock.json
index 5795436cf942..52dc4119914d 100644
--- a/extensions/html-language-features/server/package-lock.json
+++ b/extensions/html-language-features/server/package-lock.json
@@ -12,7 +12,7 @@
         "@vscode/l10n": "^0.0.18",
         "vscode-css-languageservice": "^6.3.2",
         "vscode-html-languageservice": "^5.3.2",
-        "vscode-languageserver": "^10.0.0-next.11",
+        "vscode-languageserver": "^10.0.0-next.15",
         "vscode-languageserver-textdocument": "^1.0.12",
         "vscode-uri": "^3.0.8"
       },
@@ -75,38 +75,41 @@
       }
     },
     "node_modules/vscode-jsonrpc": {
-      "version": "9.0.0-next.6",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.6.tgz",
-      "integrity": "sha512-KCSvUNsFiVciG9iqjJKBZOd66CN3ZKohDlYRmoOi+pd8l15MFLZ8wRG4c+wuzePGba/8WcCG2TM+C/GVlvuaeA==",
+      "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.11",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.11.tgz",
-      "integrity": "sha512-cmobSrVDYhlh/t02vz/bV8nNpds8mus5HnILULae2iAvOjoaJPnTAp0jJWoYdUqTpIVzT9JV6JMKqLEvdqpeqg==",
+      "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.11"
+        "vscode-languageserver-protocol": "3.17.6-next.15"
       },
       "bin": {
         "installServerIntoExtension": "bin/installServerIntoExtension"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "version": "3.17.6-next.11",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.11.tgz",
-      "integrity": "sha512-GeJxEp1TiLsp79f8WG5n10wLViXfgFKb99hU9K8m7KDWM95/QFEqWkm79f9LVm54tUK74I91a9EeiQLCS/FABQ==",
+      "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.6",
-        "vscode-languageserver-types": "3.17.6-next.5"
+        "vscode-jsonrpc": "9.0.0-next.10",
+        "vscode-languageserver-types": "3.17.6-next.6"
       }
     },
     "node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": {
-      "version": "3.17.6-next.5",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.5.tgz",
-      "integrity": "sha512-QFmf3Yl1tCgUQfA77N9Me/LXldJXkIVypQbty2rJ1DNHQkC+iwvm4Z2tXg9czSwlhvv0pD4pbF5mT7WhAglolw=="
+      "version": "3.17.6-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.6.tgz",
+      "integrity": "sha512-aiJY5/yW+xzw7KPNlwi3gQtddq/3EIn5z8X8nCgJfaiAij2R1APKePngv+MUdLdYJBVTLu+Qa0ODsT+pHgYguQ==",
+      "license": "MIT"
     },
     "node_modules/vscode-languageserver-textdocument": {
       "version": "1.0.12",
diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index 7017ee857218..9a40c5f97a78 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -12,7 +12,7 @@
     "@vscode/l10n": "^0.0.18",
     "vscode-css-languageservice": "^6.3.2",
     "vscode-html-languageservice": "^5.3.2",
-    "vscode-languageserver": "^10.0.0-next.11",
+    "vscode-languageserver": "^10.0.0-next.15",
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.0.8"
   },

From 55482ae00c5ebfcf14f0583d016715e9deade72f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:18:51 +0000
Subject: [PATCH 1092/1815] Bump vscode-languageclient in
 /extensions/json-language-features

Bumps [vscode-languageclient](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/client) from 10.0.0-next.13 to 10.0.0-next.18.
- [Release notes](https://github.com/Microsoft/vscode-languageserver-node/releases)
- [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/client/10.0.0-next.18/client)

---
updated-dependencies:
- dependency-name: vscode-languageclient
  dependency-version: 10.0.0-next.18
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../json-language-features/package-lock.json  | 111 ++++++++----------
 .../json-language-features/package.json       |   2 +-
 2 files changed, 53 insertions(+), 60 deletions(-)

diff --git a/extensions/json-language-features/package-lock.json b/extensions/json-language-features/package-lock.json
index 458716c614f4..1705a44c2136 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.13"
+        "vscode-languageclient": "^10.0.0-next.18"
       },
       "devDependencies": {
         "@types/node": "20.x"
@@ -20,6 +20,27 @@
         "vscode": "^1.77.0"
       }
     },
+    "node_modules/@isaacs/balanced-match": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+      "license": "MIT",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/brace-expansion": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "license": "MIT",
+      "dependencies": {
+        "@isaacs/balanced-match": "^4.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/@microsoft/1ds-core-js": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
@@ -167,40 +188,16 @@
         "vscode": "^1.75.0"
       }
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg=="
-    },
-    "node_modules/brace-expansion": {
-      "version": "2.0.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/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
+      "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "@isaacs/brace-expansion": "^5.0.0"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -212,12 +209,10 @@
       "integrity": "sha512-bH6E4PMmsEXYrLX6Kr1vu+xI3HproB1vECAwaPSJeroLE1kpWE3HR27uB4icx+6YORu1ajqBJXxuedv8ZQg5Lw=="
     },
     "node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -232,45 +227,43 @@
       "dev": true
     },
     "node_modules/vscode-jsonrpc": {
-      "version": "9.0.0-next.6",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.6.tgz",
-      "integrity": "sha512-KCSvUNsFiVciG9iqjJKBZOd66CN3ZKohDlYRmoOi+pd8l15MFLZ8wRG4c+wuzePGba/8WcCG2TM+C/GVlvuaeA==",
+      "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.13",
-      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.13.tgz",
-      "integrity": "sha512-KLsOMJoYpkk36PIgcOjyZ4AekOfzp4kdWdRRbVKeVvSIrwrn/4RSZr0NlD6EvUBBJSsJW4WDrYY7Y3znkqa6+w==",
+      "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": "^9.0.3",
-        "semver": "^7.6.0",
-        "vscode-languageserver-protocol": "3.17.6-next.11"
+        "minimatch": "^10.0.3",
+        "semver": "^7.7.1",
+        "vscode-languageserver-protocol": "3.17.6-next.15"
       },
       "engines": {
         "vscode": "^1.91.0"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "version": "3.17.6-next.11",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.11.tgz",
-      "integrity": "sha512-GeJxEp1TiLsp79f8WG5n10wLViXfgFKb99hU9K8m7KDWM95/QFEqWkm79f9LVm54tUK74I91a9EeiQLCS/FABQ==",
+      "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.6",
-        "vscode-languageserver-types": "3.17.6-next.5"
+        "vscode-jsonrpc": "9.0.0-next.10",
+        "vscode-languageserver-types": "3.17.6-next.6"
       }
     },
     "node_modules/vscode-languageserver-types": {
-      "version": "3.17.6-next.5",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.5.tgz",
-      "integrity": "sha512-QFmf3Yl1tCgUQfA77N9Me/LXldJXkIVypQbty2rJ1DNHQkC+iwvm4Z2tXg9czSwlhvv0pD4pbF5mT7WhAglolw=="
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "version": "3.17.6-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.6.tgz",
+      "integrity": "sha512-aiJY5/yW+xzw7KPNlwi3gQtddq/3EIn5z8X8nCgJfaiAij2R1APKePngv+MUdLdYJBVTLu+Qa0ODsT+pHgYguQ==",
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json
index cf4a7f162dab..c7c65b825dc2 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -169,7 +169,7 @@
   "dependencies": {
     "@vscode/extension-telemetry": "^0.9.8",
     "request-light": "^0.8.0",
-    "vscode-languageclient": "^10.0.0-next.13"
+    "vscode-languageclient": "^10.0.0-next.18"
   },
   "devDependencies": {
     "@types/node": "20.x"

From 5ccab7c6083fb021cc2c6d738a50d8c7f130d4f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:29:11 +0000
Subject: [PATCH 1093/1815] Bump @types/vscode-notebook-renderer in
 /extensions/markdown-math

Bumps [@types/vscode-notebook-renderer](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/vscode-notebook-renderer) from 1.72.0 to 1.72.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/vscode-notebook-renderer)

---
updated-dependencies:
- dependency-name: "@types/vscode-notebook-renderer"
  dependency-version: 1.72.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/markdown-math/package-lock.json | 11 ++++++-----
 extensions/markdown-math/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/markdown-math/package-lock.json b/extensions/markdown-math/package-lock.json
index 73ae907e680a..d2d98e2f4971 100644
--- a/extensions/markdown-math/package-lock.json
+++ b/extensions/markdown-math/package-lock.json
@@ -13,7 +13,7 @@
       },
       "devDependencies": {
         "@types/markdown-it": "^0.0.0",
-        "@types/vscode-notebook-renderer": "^1.60.0"
+        "@types/vscode-notebook-renderer": "^1.72.4"
       },
       "engines": {
         "vscode": "^1.54.0"
@@ -26,10 +26,11 @@
       "dev": true
     },
     "node_modules/@types/vscode-notebook-renderer": {
-      "version": "1.72.0",
-      "resolved": "https://registry.npmjs.org/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.72.0.tgz",
-      "integrity": "sha512-5iTjb39DpLn03ULUwrDR3L2Dy59RV4blSUHy0oLdQuIY11PhgWO4mXIcoFS0VxY1GZQ4IcjSf3ooT2Jrrcahnw==",
-      "dev": true
+      "version": "1.72.4",
+      "resolved": "https://registry.npmjs.org/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.72.4.tgz",
+      "integrity": "sha512-bdKO41c6Dc24pH/O/eM/jqfCwGH4zc76o/g/6Gt1y/eg/bvvqP2/VpbV+Sa5Te2sZekFRcbYnSSFTKo3wcVGUg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@vscode/markdown-it-katex": {
       "version": "1.1.1",
diff --git a/extensions/markdown-math/package.json b/extensions/markdown-math/package.json
index 6e599ae2a0eb..308a8c0a18e7 100644
--- a/extensions/markdown-math/package.json
+++ b/extensions/markdown-math/package.json
@@ -112,7 +112,7 @@
   },
   "devDependencies": {
     "@types/markdown-it": "^0.0.0",
-    "@types/vscode-notebook-renderer": "^1.60.0"
+    "@types/vscode-notebook-renderer": "^1.72.4"
   },
   "repository": {
     "type": "git",

From 824f6971f1f799706b70ce8483f42e21a78c31d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:31:44 +0000
Subject: [PATCH 1094/1815] Bump @types/lodash.throttle in
 /extensions/markdown-language-features

Bumps [@types/lodash.throttle](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/lodash.throttle) from 4.1.3 to 4.1.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/lodash.throttle)

---
updated-dependencies:
- dependency-name: "@types/lodash.throttle"
  dependency-version: 4.1.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/markdown-language-features/package-lock.json | 9 +++++----
 extensions/markdown-language-features/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index c0605808d40e..3cd8daec67c2 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -24,7 +24,7 @@
       },
       "devDependencies": {
         "@types/dompurify": "^3.0.5",
-        "@types/lodash.throttle": "^4.1.3",
+        "@types/lodash.throttle": "^4.1.9",
         "@types/markdown-it": "12.2.3",
         "@types/picomatch": "^2.3.0",
         "@types/vscode-notebook-renderer": "^1.60.0",
@@ -184,10 +184,11 @@
       "dev": true
     },
     "node_modules/@types/lodash.throttle": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@types/lodash.throttle/-/lodash.throttle-4.1.3.tgz",
-      "integrity": "sha512-FUm7uMuYRX7dzqmgX02bxdBwC75owUxGA4dDKtFePDLJ6N1ofXxkRX3NhJV8wOrNs/wCjaY6sDVJrD1lbyERoQ==",
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@types/lodash.throttle/-/lodash.throttle-4.1.9.tgz",
+      "integrity": "sha512-PCPVfpfueguWZQB7pJQK890F2scYKoDUL3iM522AptHWn7d5NQmeS/LTEHIcLr5PaTzl3dK2Z0xSUHHTHwaL5g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/lodash": "*"
       }
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 51b9f80eb3a0..ee8c5d81816b 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -778,7 +778,7 @@
   },
   "devDependencies": {
     "@types/dompurify": "^3.0.5",
-    "@types/lodash.throttle": "^4.1.3",
+    "@types/lodash.throttle": "^4.1.9",
     "@types/markdown-it": "12.2.3",
     "@types/picomatch": "^2.3.0",
     "@types/vscode-notebook-renderer": "^1.60.0",

From 2a86caa77b170b7a02a2ce0ac49073bfeed87d47 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:31:49 +0000
Subject: [PATCH 1095/1815] Bump vscode-uri from 3.0.6 to 3.1.0 in
 /extensions/media-preview

Bumps [vscode-uri](https://github.com/microsoft/vscode-uri) from 3.0.6 to 3.1.0.
- [Release notes](https://github.com/microsoft/vscode-uri/releases)
- [Commits](https://github.com/microsoft/vscode-uri/compare/v3.0.6...v3.1.0)

---
updated-dependencies:
- dependency-name: vscode-uri
  dependency-version: 3.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/media-preview/package-lock.json | 9 +++++----
 extensions/media-preview/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/media-preview/package-lock.json b/extensions/media-preview/package-lock.json
index d26855f3ad25..2325dbeaf554 100644
--- a/extensions/media-preview/package-lock.json
+++ b/extensions/media-preview/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@vscode/extension-telemetry": "^0.9.8",
-        "vscode-uri": "^3.0.6"
+        "vscode-uri": "^3.1.0"
       },
       "engines": {
         "vscode": "^1.70.0"
@@ -155,9 +155,10 @@
       }
     },
     "node_modules/vscode-uri": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.6.tgz",
-      "integrity": "sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ=="
+      "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==",
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/media-preview/package.json b/extensions/media-preview/package.json
index 7e2b70293fc3..6676dbcad798 100644
--- a/extensions/media-preview/package.json
+++ b/extensions/media-preview/package.json
@@ -127,7 +127,7 @@
   },
   "dependencies": {
     "@vscode/extension-telemetry": "^0.9.8",
-    "vscode-uri": "^3.0.6"
+    "vscode-uri": "^3.1.0"
   },
   "repository": {
     "type": "git",

From c6492ee75e22facb1a58a23c45dc07835a58f9a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:31:55 +0000
Subject: [PATCH 1096/1815] Bump @vscode/extension-telemetry in
 /extensions/media-preview

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 0.9.8 to 1.2.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v0.9.8...v1.2.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.2.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/media-preview/package-lock.json | 94 +++++++++++-----------
 extensions/media-preview/package.json      |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/extensions/media-preview/package-lock.json b/extensions/media-preview/package-lock.json
index d26855f3ad25..4c55207e2ab1 100644
--- a/extensions/media-preview/package-lock.json
+++ b/extensions/media-preview/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^0.9.8",
+        "@vscode/extension-telemetry": "^1.2.0",
         "vscode-uri": "^3.0.6"
       },
       "engines": {
@@ -17,73 +17,73 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
-      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
+      "integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
-      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.10.tgz",
+      "integrity": "sha512-VSLjc9cT+Y+eTiSfYltJHJCejn8oYr0E6Pq2BMhOEO7F6IyLGYIxzKKvo78ze9x+iHX7KPTATcZ+PFgjGXuNqg==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.3.4",
+        "@microsoft/1ds-core-js": "4.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
-      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.10.tgz",
+      "integrity": "sha512-iolFLz1ocWAzIQqHIEjjov3gNTPkgFQ4ArHnBcJEYoffOGWlJt6copaevS5YPI5rHzmbySsengZ8cLJJBBrXzQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
-      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.10.tgz",
+      "integrity": "sha512-RVIenPIvNgZCbjJdALvLM4rNHgAFuHI7faFzHCgnI6S2WCUNGHeXlQTs9EUUrL+n2TPp9/cd0KKMILU5VVyYiA==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
-      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.10.tgz",
+      "integrity": "sha512-5yKeyassZTq2l+SAO4npu6LPnbS++UD+M+Ghjm9uRzoBwD8tumFx0/F8AkSVqbniSREd+ztH/2q2foewa2RZyg==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -99,18 +99,18 @@
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
-      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.10.tgz",
+      "integrity": "sha512-AZib5DAT3NU0VT0nLWEwXrnoMDDgZ/5S4dso01CNU5ELNxLdg+1fvchstlVdMy4FrAnxzs8Wf/GIQNFYOVgpAw==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.3.4",
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.10",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -135,20 +135,20 @@
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
-      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
+      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
       "license": "MIT"
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.8",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
-      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
+      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.3.4",
-        "@microsoft/1ds-post-js": "^4.3.4",
-        "@microsoft/applicationinsights-web-basic": "^3.3.4"
+        "@microsoft/1ds-core-js": "^4.3.10",
+        "@microsoft/1ds-post-js": "^4.3.10",
+        "@microsoft/applicationinsights-web-basic": "^3.3.10"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/media-preview/package.json b/extensions/media-preview/package.json
index 7e2b70293fc3..3f43fcad0f79 100644
--- a/extensions/media-preview/package.json
+++ b/extensions/media-preview/package.json
@@ -126,7 +126,7 @@
     "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^0.9.8",
+    "@vscode/extension-telemetry": "^1.2.0",
     "vscode-uri": "^3.0.6"
   },
   "repository": {

From c5ca9aa6aae2dbf92d509ea9bc9e671865835362 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:32:46 +0000
Subject: [PATCH 1097/1815] Bump @types/uuid in
 /extensions/microsoft-authentication

Bumps [@types/uuid](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/uuid) from 8.0.0 to 11.0.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/uuid)

---
updated-dependencies:
- dependency-name: "@types/uuid"
  dependency-version: 11.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../microsoft-authentication/package-lock.json    | 15 ++++++++++-----
 extensions/microsoft-authentication/package.json  |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 69a49fe4a8c6..a02c217f04a7 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -21,7 +21,7 @@
         "@types/node-fetch": "^2.5.7",
         "@types/randombytes": "^2.0.0",
         "@types/sha.js": "^2.4.0",
-        "@types/uuid": "8.0.0"
+        "@types/uuid": "11.0.0"
       },
       "engines": {
         "vscode": "^1.42.0"
@@ -239,10 +239,15 @@
       }
     },
     "node_modules/@types/uuid": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.0.0.tgz",
-      "integrity": "sha512-xSQfNcvOiE5f9dyd4Kzxbof1aTrLobL278pGLKOZI6esGfZ7ts9Ka16CzIN6Y8hFHE1C7jIBZokULhK1bOgjRw==",
-      "dev": true
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-11.0.0.tgz",
+      "integrity": "sha512-HVyk8nj2m+jcFRNazzqyVKiZezyhDKrGUA3jlEcg/nZ6Ms+qHwocba1Y/AaVaznJTAM9xpdFSh+ptbNrhOGvZA==",
+      "deprecated": "This is a stub types definition. uuid provides its own type definitions, so you do not need this installed.",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "uuid": "*"
+      }
     },
     "node_modules/@vscode/extension-telemetry": {
       "version": "0.9.8",
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 928ffa688899..24ee5adea599 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -135,7 +135,7 @@
     "@types/node-fetch": "^2.5.7",
     "@types/randombytes": "^2.0.0",
     "@types/sha.js": "^2.4.0",
-    "@types/uuid": "8.0.0"
+    "@types/uuid": "11.0.0"
   },
   "dependencies": {
     "@azure/ms-rest-azure-env": "^2.0.0",

From 1f22cf955eb7f7231ece1550bcec17c28daf9dc9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:32:46 +0000
Subject: [PATCH 1098/1815] Bump @vscode/extension-telemetry in
 /extensions/merge-conflict

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 0.9.8 to 1.2.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v0.9.8...v1.2.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.2.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/merge-conflict/package-lock.json | 94 ++++++++++-----------
 extensions/merge-conflict/package.json      |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/extensions/merge-conflict/package-lock.json b/extensions/merge-conflict/package-lock.json
index 5ee68d290f01..c9811471ebac 100644
--- a/extensions/merge-conflict/package-lock.json
+++ b/extensions/merge-conflict/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^0.9.8"
+        "@vscode/extension-telemetry": "^1.2.0"
       },
       "devDependencies": {
         "@types/node": "20.x"
@@ -19,73 +19,73 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
-      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
+      "integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
-      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.10.tgz",
+      "integrity": "sha512-VSLjc9cT+Y+eTiSfYltJHJCejn8oYr0E6Pq2BMhOEO7F6IyLGYIxzKKvo78ze9x+iHX7KPTATcZ+PFgjGXuNqg==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.3.4",
+        "@microsoft/1ds-core-js": "4.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
-      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.10.tgz",
+      "integrity": "sha512-iolFLz1ocWAzIQqHIEjjov3gNTPkgFQ4ArHnBcJEYoffOGWlJt6copaevS5YPI5rHzmbySsengZ8cLJJBBrXzQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
-      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.10.tgz",
+      "integrity": "sha512-RVIenPIvNgZCbjJdALvLM4rNHgAFuHI7faFzHCgnI6S2WCUNGHeXlQTs9EUUrL+n2TPp9/cd0KKMILU5VVyYiA==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
-      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.10.tgz",
+      "integrity": "sha512-5yKeyassZTq2l+SAO4npu6LPnbS++UD+M+Ghjm9uRzoBwD8tumFx0/F8AkSVqbniSREd+ztH/2q2foewa2RZyg==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -101,18 +101,18 @@
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
-      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.10.tgz",
+      "integrity": "sha512-AZib5DAT3NU0VT0nLWEwXrnoMDDgZ/5S4dso01CNU5ELNxLdg+1fvchstlVdMy4FrAnxzs8Wf/GIQNFYOVgpAw==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.3.4",
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.10",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -137,9 +137,9 @@
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
-      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
+      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
       "license": "MIT"
     },
     "node_modules/@types/node": {
@@ -152,14 +152,14 @@
       }
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.8",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
-      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
+      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.3.4",
-        "@microsoft/1ds-post-js": "^4.3.4",
-        "@microsoft/applicationinsights-web-basic": "^3.3.4"
+        "@microsoft/1ds-core-js": "^4.3.10",
+        "@microsoft/1ds-post-js": "^4.3.10",
+        "@microsoft/applicationinsights-web-basic": "^3.3.10"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
index de56c9c22cfe..42544730e1c7 100644
--- a/extensions/merge-conflict/package.json
+++ b/extensions/merge-conflict/package.json
@@ -166,7 +166,7 @@
     }
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^0.9.8"
+    "@vscode/extension-telemetry": "^1.2.0"
   },
   "devDependencies": {
     "@types/node": "20.x"

From 0d52acc2031b8b6a3ac44d31a9932f116941cca0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:36:27 +0000
Subject: [PATCH 1099/1815] Bump @types/vscode-notebook-renderer in
 /extensions/notebook-renderers

Bumps [@types/vscode-notebook-renderer](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/vscode-notebook-renderer) from 1.60.0 to 1.72.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/vscode-notebook-renderer)

---
updated-dependencies:
- dependency-name: "@types/vscode-notebook-renderer"
  dependency-version: 1.72.4
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/notebook-renderers/package-lock.json | 11 ++++++-----
 extensions/notebook-renderers/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/notebook-renderers/package-lock.json b/extensions/notebook-renderers/package-lock.json
index 7f7e0270ed27..879e2cfeda61 100644
--- a/extensions/notebook-renderers/package-lock.json
+++ b/extensions/notebook-renderers/package-lock.json
@@ -10,7 +10,7 @@
 			"license": "MIT",
 			"devDependencies": {
 				"@types/jsdom": "^21.1.0",
-				"@types/vscode-notebook-renderer": "^1.60.0",
+				"@types/vscode-notebook-renderer": "^1.72.4",
 				"jsdom": "^21.1.1"
 			},
 			"engines": {
@@ -50,10 +50,11 @@
 			"dev": true
 		},
 		"node_modules/@types/vscode-notebook-renderer": {
-			"version": "1.60.0",
-			"resolved": "https://registry.npmjs.org/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.60.0.tgz",
-			"integrity": "sha512-u7TD2uuEZTVuitx0iijOJdKI0JLiQP6PsSBSRy2XmHXUOXcp5p1S56NrjOEDoF+PIHd3NL3eO6KTRSf5nukDqQ==",
-			"dev": true
+			"version": "1.72.4",
+			"resolved": "https://registry.npmjs.org/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.72.4.tgz",
+			"integrity": "sha512-bdKO41c6Dc24pH/O/eM/jqfCwGH4zc76o/g/6Gt1y/eg/bvvqP2/VpbV+Sa5Te2sZekFRcbYnSSFTKo3wcVGUg==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/abab": {
 			"version": "2.0.6",
diff --git a/extensions/notebook-renderers/package.json b/extensions/notebook-renderers/package.json
index d6ece35af112..391bf5b79094 100644
--- a/extensions/notebook-renderers/package.json
+++ b/extensions/notebook-renderers/package.json
@@ -49,7 +49,7 @@
 	"dependencies": {},
 	"devDependencies": {
 		"@types/jsdom": "^21.1.0",
-		"@types/vscode-notebook-renderer": "^1.60.0",
+		"@types/vscode-notebook-renderer": "^1.72.4",
 		"jsdom": "^21.1.1"
 	},
 	"repository": {

From 60a6f0a5ad8efebf0e2cec063c8e2f1d9d1ed8d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:37:20 +0000
Subject: [PATCH 1100/1815] Bump which-pm from 2.1.1 to 3.0.1 in
 /extensions/npm

Bumps [which-pm](https://github.com/zkochan/packages) from 2.1.1 to 3.0.1.
- [Commits](https://github.com/zkochan/packages/compare/write-json5-file/2.1.1...run-groups/3.0.1)

---
updated-dependencies:
- dependency-name: which-pm
  dependency-version: 3.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/npm/package-lock.json | 14 +++++++-------
 extensions/npm/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index cb927dbd26db..f34f78cb3295 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -16,7 +16,7 @@
         "request-light": "^0.7.0",
         "vscode-uri": "^3.0.8",
         "which": "^4.0.0",
-        "which-pm": "^2.1.1"
+        "which-pm": "^3.0.1"
       },
       "devDependencies": {
         "@types/minimatch": "^5.1.2",
@@ -329,15 +329,15 @@
       }
     },
     "node_modules/which-pm": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/which-pm/-/which-pm-2.1.1.tgz",
-      "integrity": "sha512-xzzxNw2wMaoCWXiGE8IJ9wuPMU+EYhFksjHxrRT8kMT5SnocBPRg69YAMtyV4D12fP582RA+k3P8H9J5EMdIxQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/which-pm/-/which-pm-3.0.1.tgz",
+      "integrity": "sha512-v2JrMq0waAI4ju1xU5x3blsxBBMgdgZve580iYMN5frDaLGjbA24fok7wKCsya8KLVO19Ju4XDc5+zTZCJkQfg==",
+      "license": "MIT",
       "dependencies": {
-        "load-yaml-file": "^0.2.0",
-        "path-exists": "^4.0.0"
+        "load-yaml-file": "^0.2.0"
       },
       "engines": {
-        "node": ">=8.15"
+        "node": ">=18.12"
       }
     },
     "node_modules/yocto-queue": {
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index 847a48194659..a53ac97d8c30 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -27,7 +27,7 @@
     "minimatch": "^5.1.6",
     "request-light": "^0.7.0",
     "which": "^4.0.0",
-    "which-pm": "^2.1.1",
+    "which-pm": "^3.0.1",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {

From acc45b4372bdbe329f1f28567b9b6ad6365a90da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:38:55 +0000
Subject: [PATCH 1101/1815] Bump @types/node in
 /extensions/php-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 24.10.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.10.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../php-language-features/package-lock.json   | 20 ++++++++++---------
 extensions/php-language-features/package.json |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/php-language-features/package-lock.json b/extensions/php-language-features/package-lock.json
index 21fdb6b8e9f6..980830fa9df3 100644
--- a/extensions/php-language-features/package-lock.json
+++ b/extensions/php-language-features/package-lock.json
@@ -12,7 +12,7 @@
         "which": "^2.0.2"
       },
       "devDependencies": {
-        "@types/node": "20.x",
+        "@types/node": "24.x",
         "@types/which": "^2.0.0"
       },
       "engines": {
@@ -20,12 +20,13 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "24.10.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
+      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@types/which": {
@@ -40,10 +41,11 @@
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/which": {
       "version": "2.0.2",
diff --git a/extensions/php-language-features/package.json b/extensions/php-language-features/package.json
index 989213b6c0c0..7b87a81240bf 100644
--- a/extensions/php-language-features/package.json
+++ b/extensions/php-language-features/package.json
@@ -77,7 +77,7 @@
     "which": "^2.0.2"
   },
   "devDependencies": {
-    "@types/node": "20.x",
+    "@types/node": "24.x",
     "@types/which": "^2.0.0"
   },
   "repository": {

From a0a79e54a606c705d5d9195586641460e12c9e01 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:47:05 +0000
Subject: [PATCH 1102/1815] Bump typescript from 5.8.2 to 5.9.3 in /extensions

Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.8.2 to 5.9.3.
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Commits](https://github.com/microsoft/TypeScript/compare/v5.8.2...v5.9.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-version: 5.9.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/package-lock.json | 8 ++++----
 extensions/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/package-lock.json b/extensions/package-lock.json
index e3e87e1f52d3..2f9afaef15ed 100644
--- a/extensions/package-lock.json
+++ b/extensions/package-lock.json
@@ -10,7 +10,7 @@
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "typescript": "^5.8.2"
+        "typescript": "^5.9.3"
       },
       "devDependencies": {
         "@parcel/watcher": "2.5.1",
@@ -940,9 +940,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.8.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz",
-      "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==",
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
diff --git a/extensions/package.json b/extensions/package.json
index d24575b17f50..3c70c0b17519 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -4,7 +4,7 @@
   "license": "MIT",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "typescript": "^5.8.2"
+    "typescript": "^5.9.3"
   },
   "scripts": {
     "postinstall": "node ./postinstall.mjs"

From 6585e2d231554c25f7b7bc802644f46cfa36ab14 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 06:54:08 +0000
Subject: [PATCH 1103/1815] Bump @types/node from 20.11.24 to 24.10.1 in
 /extensions/references-view

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 24.10.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.10.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/references-view/package-lock.json | 20 +++++++++++---------
 extensions/references-view/package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/references-view/package-lock.json b/extensions/references-view/package-lock.json
index bb5c5e10e1fe..95ed53e535c5 100644
--- a/extensions/references-view/package-lock.json
+++ b/extensions/references-view/package-lock.json
@@ -9,26 +9,28 @@
       "version": "1.0.0",
       "license": "MIT",
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "24.x"
       },
       "engines": {
         "vscode": "^1.67.0"
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "24.10.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
+      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/references-view/package.json b/extensions/references-view/package.json
index 9566a965c760..9580a16ceb8a 100644
--- a/extensions/references-view/package.json
+++ b/extensions/references-view/package.json
@@ -399,6 +399,6 @@
     "watch": "npx gulp watch-extension:references-view"
   },
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "24.x"
   }
 }

From 9830c800e7e38976580e844255c973e4dcaa16a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 07:00:28 +0000
Subject: [PATCH 1104/1815] Bump @vscode/codicons in /extensions/simple-browser

Bumps [@vscode/codicons](https://github.com/microsoft/vscode-codicons) from 0.0.36 to 0.0.43.
- [Release notes](https://github.com/microsoft/vscode-codicons/releases)
- [Commits](https://github.com/microsoft/vscode-codicons/compare/0.0.36...v0.0.43)

---
updated-dependencies:
- dependency-name: "@vscode/codicons"
  dependency-version: 0.0.43
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/simple-browser/package-lock.json | 8 ++++----
 extensions/simple-browser/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/simple-browser/package-lock.json b/extensions/simple-browser/package-lock.json
index c6d9b23636a9..d9b5bd84c02e 100644
--- a/extensions/simple-browser/package-lock.json
+++ b/extensions/simple-browser/package-lock.json
@@ -13,7 +13,7 @@
       },
       "devDependencies": {
         "@types/vscode-webview": "^1.57.0",
-        "@vscode/codicons": "^0.0.36"
+        "@vscode/codicons": "^0.0.43"
       },
       "engines": {
         "vscode": "^1.70.0"
@@ -150,9 +150,9 @@
       "dev": 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==",
+      "version": "0.0.43",
+      "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.43.tgz",
+      "integrity": "sha512-8sf8WOBoZkyUi8ogCm5ycHJJGhwOEG3E9b64+JIx+m6bCExdkc30VwCwr94cXUU1opmRD0CTCWLcN46I8WLJIg==",
       "dev": true,
       "license": "CC-BY-4.0"
     },
diff --git a/extensions/simple-browser/package.json b/extensions/simple-browser/package.json
index 9aba9ad25036..7b5569222dcc 100644
--- a/extensions/simple-browser/package.json
+++ b/extensions/simple-browser/package.json
@@ -70,7 +70,7 @@
   },
   "devDependencies": {
     "@types/vscode-webview": "^1.57.0",
-    "@vscode/codicons": "^0.0.36"
+    "@vscode/codicons": "^0.0.43"
   },
   "repository": {
     "type": "git",

From a4e7c33033f2d5ad9eaff25b637075368e0123a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 07:00:39 +0000
Subject: [PATCH 1105/1815] Bump @vscode/extension-telemetry in
 /extensions/simple-browser

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 0.9.8 to 1.2.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v0.9.8...v1.2.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.2.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/simple-browser/package-lock.json | 94 ++++++++++-----------
 extensions/simple-browser/package.json      |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/extensions/simple-browser/package-lock.json b/extensions/simple-browser/package-lock.json
index c6d9b23636a9..90edd8435771 100644
--- a/extensions/simple-browser/package-lock.json
+++ b/extensions/simple-browser/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^0.9.8"
+        "@vscode/extension-telemetry": "^1.2.0"
       },
       "devDependencies": {
         "@types/vscode-webview": "^1.57.0",
@@ -20,73 +20,73 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
-      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
+      "integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
-      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.10.tgz",
+      "integrity": "sha512-VSLjc9cT+Y+eTiSfYltJHJCejn8oYr0E6Pq2BMhOEO7F6IyLGYIxzKKvo78ze9x+iHX7KPTATcZ+PFgjGXuNqg==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.3.4",
+        "@microsoft/1ds-core-js": "4.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
-      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.10.tgz",
+      "integrity": "sha512-iolFLz1ocWAzIQqHIEjjov3gNTPkgFQ4ArHnBcJEYoffOGWlJt6copaevS5YPI5rHzmbySsengZ8cLJJBBrXzQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
-      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.10.tgz",
+      "integrity": "sha512-RVIenPIvNgZCbjJdALvLM4rNHgAFuHI7faFzHCgnI6S2WCUNGHeXlQTs9EUUrL+n2TPp9/cd0KKMILU5VVyYiA==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
-      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.10.tgz",
+      "integrity": "sha512-5yKeyassZTq2l+SAO4npu6LPnbS++UD+M+Ghjm9uRzoBwD8tumFx0/F8AkSVqbniSREd+ztH/2q2foewa2RZyg==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -102,18 +102,18 @@
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
-      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.10.tgz",
+      "integrity": "sha512-AZib5DAT3NU0VT0nLWEwXrnoMDDgZ/5S4dso01CNU5ELNxLdg+1fvchstlVdMy4FrAnxzs8Wf/GIQNFYOVgpAw==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.3.4",
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.10",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -138,9 +138,9 @@
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
-      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
+      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
       "license": "MIT"
     },
     "node_modules/@types/vscode-webview": {
@@ -157,14 +157,14 @@
       "license": "CC-BY-4.0"
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.8",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
-      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
+      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.3.4",
-        "@microsoft/1ds-post-js": "^4.3.4",
-        "@microsoft/applicationinsights-web-basic": "^3.3.4"
+        "@microsoft/1ds-core-js": "^4.3.10",
+        "@microsoft/1ds-post-js": "^4.3.10",
+        "@microsoft/applicationinsights-web-basic": "^3.3.10"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/simple-browser/package.json b/extensions/simple-browser/package.json
index 9aba9ad25036..19612bf56bca 100644
--- a/extensions/simple-browser/package.json
+++ b/extensions/simple-browser/package.json
@@ -66,7 +66,7 @@
     "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^0.9.8"
+    "@vscode/extension-telemetry": "^1.2.0"
   },
   "devDependencies": {
     "@types/vscode-webview": "^1.57.0",

From 97af2e9798304a28b9532730785cbdce3d3f67c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 07:41:16 +0000
Subject: [PATCH 1106/1815] Bump @types/node in
 /extensions/vscode-colorize-perf-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 24.10.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.10.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 20 ++++++++++---------
 .../vscode-colorize-perf-tests/package.json   |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/vscode-colorize-perf-tests/package-lock.json b/extensions/vscode-colorize-perf-tests/package-lock.json
index b0516cc1e280..feaf320fec5f 100644
--- a/extensions/vscode-colorize-perf-tests/package-lock.json
+++ b/extensions/vscode-colorize-perf-tests/package-lock.json
@@ -12,19 +12,20 @@
         "jsonc-parser": "^3.2.0"
       },
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "24.x"
       },
       "engines": {
         "vscode": "*"
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "24.10.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
+      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/jsonc-parser": {
@@ -33,10 +34,11 @@
       "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/vscode-colorize-perf-tests/package.json b/extensions/vscode-colorize-perf-tests/package.json
index 2e72152e2847..794f6915c4dd 100644
--- a/extensions/vscode-colorize-perf-tests/package.json
+++ b/extensions/vscode-colorize-perf-tests/package.json
@@ -22,7 +22,7 @@
     "jsonc-parser": "^3.2.0"
   },
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "24.x"
   },
   "repository": {
     "type": "git",

From c641413b8a4101e3972ee0f6802d5896b0a81edc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 07:51:12 +0000
Subject: [PATCH 1107/1815] Bump @types/node in /extensions/vscode-api-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 24.10.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.10.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-api-tests/package-lock.json | 20 ++++++++++---------
 extensions/vscode-api-tests/package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/vscode-api-tests/package-lock.json b/extensions/vscode-api-tests/package-lock.json
index e28b852b6227..0d4552531a53 100644
--- a/extensions/vscode-api-tests/package-lock.json
+++ b/extensions/vscode-api-tests/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "devDependencies": {
         "@types/mocha": "^9.1.1",
-        "@types/node": "20.x",
+        "@types/node": "24.x",
         "@types/node-forge": "^1.3.11",
         "node-forge": "^1.3.2",
         "straightforward": "^4.2.2"
@@ -26,12 +26,13 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "24.10.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
+      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@types/node-forge": {
@@ -217,10 +218,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
index 9436688fd7c6..212336f37e6e 100644
--- a/extensions/vscode-api-tests/package.json
+++ b/extensions/vscode-api-tests/package.json
@@ -252,7 +252,7 @@
   },
   "devDependencies": {
     "@types/mocha": "^9.1.1",
-    "@types/node": "20.x",
+    "@types/node": "24.x",
     "@types/node-forge": "^1.3.11",
     "node-forge": "^1.3.2",
     "straightforward": "^4.2.2"

From 553ba242d4cb291286267ad4a31c5efcbc5fd32a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 07:51:45 +0000
Subject: [PATCH 1108/1815] Bump @types/node in
 /extensions/vscode-colorize-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 24.10.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.10.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../vscode-colorize-tests/package-lock.json   | 20 ++++++++++---------
 extensions/vscode-colorize-tests/package.json |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/vscode-colorize-tests/package-lock.json b/extensions/vscode-colorize-tests/package-lock.json
index 4011d73bcac0..2fd220bf39d7 100644
--- a/extensions/vscode-colorize-tests/package-lock.json
+++ b/extensions/vscode-colorize-tests/package-lock.json
@@ -12,19 +12,20 @@
         "jsonc-parser": "^3.2.0"
       },
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "24.x"
       },
       "engines": {
         "vscode": "*"
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "24.10.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
+      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/jsonc-parser": {
@@ -33,10 +34,11 @@
       "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/vscode-colorize-tests/package.json b/extensions/vscode-colorize-tests/package.json
index b416aeee1039..aab27e4a5fe3 100644
--- a/extensions/vscode-colorize-tests/package.json
+++ b/extensions/vscode-colorize-tests/package.json
@@ -22,7 +22,7 @@
     "jsonc-parser": "^3.2.0"
   },
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "24.x"
   },
   "contributes": {
     "semanticTokenTypes": [

From d22dc9dc756892f66bb737310d0f930e24fb4288 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 07:51:58 +0000
Subject: [PATCH 1109/1815] Bump @types/node in
 /extensions/vscode-test-resolver

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 24.10.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.10.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../vscode-test-resolver/package-lock.json    | 20 ++++++++++---------
 extensions/vscode-test-resolver/package.json  |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/vscode-test-resolver/package-lock.json b/extensions/vscode-test-resolver/package-lock.json
index 367c4dca2e0e..24d76eba539c 100644
--- a/extensions/vscode-test-resolver/package-lock.json
+++ b/extensions/vscode-test-resolver/package-lock.json
@@ -9,26 +9,28 @@
       "version": "0.0.1",
       "license": "MIT",
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "24.x"
       },
       "engines": {
         "vscode": "^1.25.0"
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "24.10.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
+      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/vscode-test-resolver/package.json b/extensions/vscode-test-resolver/package.json
index 8ab2171ddaaa..a38a2d8eac77 100644
--- a/extensions/vscode-test-resolver/package.json
+++ b/extensions/vscode-test-resolver/package.json
@@ -33,7 +33,7 @@
   "main": "./out/extension",
   "browser": "./dist/browser/testResolverMain",
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "24.x"
   },
   "capabilities": {
     "untrustedWorkspaces": {

From 0c091be796767db68671c123d14288ecea3642a1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 07:53:59 +0000
Subject: [PATCH 1110/1815] Bump node-pty from 1.1.0-beta31 to 1.1.0-beta39 in
 /remote

Bumps [node-pty](https://github.com/microsoft/node-pty) from 1.1.0-beta31 to 1.1.0-beta39.
- [Release notes](https://github.com/microsoft/node-pty/releases)
- [Commits](https://github.com/microsoft/node-pty/compare/v1.1.0-beta31...v1.1.0-beta39)

---
updated-dependencies:
- dependency-name: node-pty
  dependency-version: 1.1.0-beta39
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 7996a5deea8b..bbdd604d6cd6 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -37,7 +37,7 @@
         "kerberos": "2.1.1",
         "minimist": "^1.2.6",
         "native-watchdog": "^1.4.1",
-        "node-pty": "1.1.0-beta31",
+        "node-pty": "1.1.0-beta39",
         "tas-client-umd": "0.2.0",
         "vscode-oniguruma": "1.7.0",
         "vscode-regexpp": "^3.1.0",
@@ -1098,9 +1098,9 @@
       }
     },
     "node_modules/node-pty": {
-      "version": "1.1.0-beta31",
-      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta31.tgz",
-      "integrity": "sha512-DwNyk7nQ8NfHX7NrIqvNQ5GiK6eBbsRYJ+hvHK04PTzZ6o5j1Qsc67g0QxXW8tki/ZJmE9Zxw6PEGncvDshdVw==",
+      "version": "1.1.0-beta39",
+      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta39.tgz",
+      "integrity": "sha512-1xnN2dbS0QngT4xenpS/6Q77QtaDQo5vE6f4slATgZsFIv3NP4ObE7vAjYnZtMFG5OEh3jyDRZc+hy1DjDF7dg==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/remote/package.json b/remote/package.json
index 47fe4472cc76..0cc0e7fc0c94 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -32,7 +32,7 @@
     "kerberos": "2.1.1",
     "minimist": "^1.2.6",
     "native-watchdog": "^1.4.1",
-    "node-pty": "1.1.0-beta31",
+    "node-pty": "1.1.0-beta39",
     "tas-client-umd": "0.2.0",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",

From 435de5887ba267feb5321b1a237f525c96a106a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 07:54:54 +0000
Subject: [PATCH 1111/1815] Bump sinon and @types/sinon

Bumps [sinon](https://github.com/sinonjs/sinon) and [@types/sinon](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/sinon). These dependencies needed to be updated together.

Updates `sinon` from 12.0.1 to 21.0.0
- [Release notes](https://github.com/sinonjs/sinon/releases)
- [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md)
- [Commits](https://github.com/sinonjs/sinon/commits)

Updates `@types/sinon` from 10.0.2 to 21.0.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/sinon)

---
updated-dependencies:
- dependency-name: sinon
  dependency-version: 21.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
- dependency-name: "@types/sinon"
  dependency-version: 21.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 133 +++++++++++++++++++---------------------------
 package.json      |   4 +-
 2 files changed, 56 insertions(+), 81 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9338e4ee6d98..aba2ce54c9a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -67,7 +67,7 @@
         "@types/minimist": "^1.2.1",
         "@types/mocha": "^9.1.1",
         "@types/node": "20.x",
-        "@types/sinon": "^10.0.2",
+        "@types/sinon": "^21.0.0",
         "@types/sinon-test": "^2.4.2",
         "@types/trusted-types": "^1.0.6",
         "@types/vscode-notebook-renderer": "^1.72.0",
@@ -145,7 +145,7 @@
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
         "rimraf": "^2.2.8",
-        "sinon": "^12.0.1",
+        "sinon": "^21.0.0",
         "sinon-test": "^3.1.3",
         "source-map": "0.6.1",
         "source-map-support": "^0.3.2",
@@ -2113,39 +2113,45 @@
       }
     },
     "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==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+      "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "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==",
+      "version": "13.0.5",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz",
+      "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@sinonjs/commons": "^1.7.0"
+        "@sinonjs/commons": "^3.0.1"
       }
     },
     "node_modules/@sinonjs/samsam": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.0.2.tgz",
-      "integrity": "sha512-jxPRPp9n93ci7b8hMfJOFDPRLFYadN6FSpeROFTR4UNF4i5b+EK6m4QXPO46BDhFgRy1JuS87zAnFOzCUwMJcQ==",
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.3.tgz",
+      "integrity": "sha512-hw6HbX+GyVZzmaYNh82Ecj1vdGZrqVIn/keDTg63IgAwiQPO+xCz99uG6Woqgb4tM0mUiFENKZ4cqd7IX94AXQ==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@sinonjs/commons": "^1.6.0",
-        "lodash.get": "^4.4.2",
-        "type-detect": "^4.0.8"
+        "@sinonjs/commons": "^3.0.1",
+        "type-detect": "^4.1.0"
       }
     },
-    "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/@sinonjs/samsam/node_modules/type-detect": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz",
+      "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
     },
     "node_modules/@stylistic/eslint-plugin-ts": {
       "version": "2.8.0",
@@ -2488,12 +2494,13 @@
       "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==",
+      "version": "21.0.0",
+      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-21.0.0.tgz",
+      "integrity": "sha512-+oHKZ0lTI+WVLxx1IbJDNmReQaIsQJjN2e7UUrJHEeByG7bFeKJYsv1E75JxTQ9QKJDp21bAa/0W2Xo4srsDnw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@sinonjs/fake-timers": "^7.1.0"
+        "@types/sinonjs__fake-timers": "*"
       }
     },
     "node_modules/@types/sinon-test": {
@@ -2505,6 +2512,13 @@
         "@types/sinon": "*"
       }
     },
+    "node_modules/@types/sinonjs__fake-timers": {
+      "version": "15.0.1",
+      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-15.0.1.tgz",
+      "integrity": "sha512-Ko2tjWJq8oozHzHV+reuvS5KYIRAokHnGbDwGh/J64LntgpbuylF74ipEL24HCyRjf9FOlBiBHWBR1RlVKsI1w==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/svgo": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/@types/svgo/-/svgo-1.3.6.tgz",
@@ -10202,12 +10216,6 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "node_modules/just-extend": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz",
-      "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==",
-      "dev": true
-    },
     "node_modules/kerberos": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-2.1.1.tgz",
@@ -10618,12 +10626,6 @@
       "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",
@@ -11403,34 +11405,6 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
-    "node_modules/nise": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.0.tgz",
-      "integrity": "sha512-W5WlHu+wvo3PaKLsJJkgPup2LrsXCcm7AWwyNZkUnn5rwPkuPBi3Iwk5SQtN0mv+K65k7nKKjwNQ30wg3wLAQQ==",
-      "dev": true,
-      "dependencies": {
-        "@sinonjs/commons": "^1.7.0",
-        "@sinonjs/fake-timers": "^7.0.4",
-        "@sinonjs/text-encoding": "^0.7.1",
-        "just-extend": "^4.0.2",
-        "path-to-regexp": "^1.7.0"
-      }
-    },
-    "node_modules/nise/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-      "dev": true
-    },
-    "node_modules/nise/node_modules/path-to-regexp": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz",
-      "integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==",
-      "dev": true,
-      "dependencies": {
-        "isarray": "0.0.1"
-      }
-    },
     "node_modules/node-abi": {
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.8.0.tgz",
@@ -14258,17 +14232,16 @@
       }
     },
     "node_modules/sinon": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-12.0.1.tgz",
-      "integrity": "sha512-iGu29Xhym33ydkAT+aNQFBINakjq69kKO6ByPvTsm3yyIACfyQttRTP03aBP/I8GfhFmLzrnKwNNkr0ORb1udg==",
-      "deprecated": "16.1.1",
+      "version": "21.0.0",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-21.0.0.tgz",
+      "integrity": "sha512-TOgRcwFPbfGtpqvZw+hyqJDvqfapr1qUlOizROIk4bBLjlsjlB00Pg6wMFXNtJRpu+eCZuVOaLatG7M8105kAw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@sinonjs/commons": "^1.8.3",
-        "@sinonjs/fake-timers": "^8.1.0",
-        "@sinonjs/samsam": "^6.0.2",
-        "diff": "^5.0.0",
-        "nise": "^5.1.0",
+        "@sinonjs/commons": "^3.0.1",
+        "@sinonjs/fake-timers": "^13.0.5",
+        "@sinonjs/samsam": "^8.0.1",
+        "diff": "^7.0.0",
         "supports-color": "^7.2.0"
       },
       "funding": {
@@ -14285,13 +14258,14 @@
         "sinon": "2.x - 13.x"
       }
     },
-    "node_modules/sinon/node_modules/@sinonjs/fake-timers": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+    "node_modules/sinon/node_modules/diff": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz",
+      "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==",
       "dev": true,
-      "dependencies": {
-        "@sinonjs/commons": "^1.7.0"
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.3.1"
       }
     },
     "node_modules/sinon/node_modules/has-flag": {
@@ -15645,6 +15619,7 @@
       "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
       "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
diff --git a/package.json b/package.json
index 4657b25e4475..60d42e9bab6c 100644
--- a/package.json
+++ b/package.json
@@ -126,7 +126,7 @@
     "@types/minimist": "^1.2.1",
     "@types/mocha": "^9.1.1",
     "@types/node": "20.x",
-    "@types/sinon": "^10.0.2",
+    "@types/sinon": "^21.0.0",
     "@types/sinon-test": "^2.4.2",
     "@types/trusted-types": "^1.0.6",
     "@types/vscode-notebook-renderer": "^1.72.0",
@@ -204,7 +204,7 @@
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",
     "rimraf": "^2.2.8",
-    "sinon": "^12.0.1",
+    "sinon": "^21.0.0",
     "sinon-test": "^3.1.3",
     "source-map": "0.6.1",
     "source-map-support": "^0.3.2",

From 2901d747bed3b4284847bf38805c3e45b8b66b20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 07:55:02 +0000
Subject: [PATCH 1112/1815] Bump @vscode/vscode-languagedetection from 1.0.21
 to 1.0.22

Bumps [@vscode/vscode-languagedetection](https://github.com/microsoft/vscode-languagedetection) from 1.0.21 to 1.0.22.
- [Commits](https://github.com/microsoft/vscode-languagedetection/commits)

---
updated-dependencies:
- dependency-name: "@vscode/vscode-languagedetection"
  dependency-version: 1.0.22
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9338e4ee6d98..d3a7eec372d5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "@vscode/sqlite3": "5.1.8-vscode",
         "@vscode/sudo-prompt": "9.3.1",
         "@vscode/tree-sitter-wasm": "^0.1.3",
-        "@vscode/vscode-languagedetection": "1.0.21",
+        "@vscode/vscode-languagedetection": "1.0.22",
         "@vscode/windows-mutex": "^0.5.0",
         "@vscode/windows-process-tree": "^0.6.0",
         "@vscode/windows-registry": "^1.1.0",
@@ -3205,9 +3205,10 @@
       "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==",
+      "version": "1.0.22",
+      "resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.22.tgz",
+      "integrity": "sha512-rQ/BgMyLuIXSmbA0MSkIPHtcOw14QkeDbAq19sjvaS9LTRr905yij0S8lsyqN5JgOsbtIx7pAcyOxFMzPmqhZQ==",
+      "license": "MIT",
       "bin": {
         "vscode-languagedetection": "cli/index.js"
       }
diff --git a/package.json b/package.json
index 4657b25e4475..faecebbd0846 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "@vscode/sqlite3": "5.1.8-vscode",
     "@vscode/sudo-prompt": "9.3.1",
     "@vscode/tree-sitter-wasm": "^0.1.3",
-    "@vscode/vscode-languagedetection": "1.0.21",
+    "@vscode/vscode-languagedetection": "1.0.22",
     "@vscode/windows-mutex": "^0.5.0",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",

From a307082ecbc646bd5800c69569d7b8bdd4018e59 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 07:55:21 +0000
Subject: [PATCH 1113/1815] Bump @vscode/vscode-perf from 0.0.19 to 0.0.24

Bumps [@vscode/vscode-perf](https://github.com/microsoft/vscode-perf) from 0.0.19 to 0.0.24.
- [Release notes](https://github.com/microsoft/vscode-perf/releases)
- [Commits](https://github.com/microsoft/vscode-perf/compare/v0.0.19...v0.0.24)

---
updated-dependencies:
- dependency-name: "@vscode/vscode-perf"
  dependency-version: 0.0.24
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9338e4ee6d98..bb73b785f050 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -85,7 +85,7 @@
         "@vscode/test-electron": "^2.4.0",
         "@vscode/test-web": "^0.0.62",
         "@vscode/v8-heap-parser": "^0.1.0",
-        "@vscode/vscode-perf": "^0.0.19",
+        "@vscode/vscode-perf": "^0.0.24",
         "@webgpu/types": "^0.1.44",
         "ansi-colors": "^3.2.3",
         "asar": "^3.0.3",
@@ -3213,10 +3213,11 @@
       }
     },
     "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==",
+      "version": "0.0.24",
+      "resolved": "https://registry.npmjs.org/@vscode/vscode-perf/-/vscode-perf-0.0.24.tgz",
+      "integrity": "sha512-0VwvtHTuF3B7m+FngggeM/8mGlvJpSowICJdFOX2jjujucNC7gQpXckNFnXmxMRLEfh9/3joJdnTavupI7aA/Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.x",
         "commander": "^9.4.0",
diff --git a/package.json b/package.json
index 4657b25e4475..fce05838918e 100644
--- a/package.json
+++ b/package.json
@@ -144,7 +144,7 @@
     "@vscode/test-electron": "^2.4.0",
     "@vscode/test-web": "^0.0.62",
     "@vscode/v8-heap-parser": "^0.1.0",
-    "@vscode/vscode-perf": "^0.0.19",
+    "@vscode/vscode-perf": "^0.0.24",
     "@webgpu/types": "^0.1.44",
     "ansi-colors": "^3.2.3",
     "asar": "^3.0.3",

From 4307240ce4717571cb651c60158eb8c4e5af9323 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 07:55:29 +0000
Subject: [PATCH 1114/1815] Bump @types/trusted-types from 1.0.6 to 2.0.7

Bumps [@types/trusted-types](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/trusted-types) from 1.0.6 to 2.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/trusted-types)

---
updated-dependencies:
- dependency-name: "@types/trusted-types"
  dependency-version: 2.0.7
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 11 ++++++-----
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9338e4ee6d98..9a68c4614c7b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -69,7 +69,7 @@
         "@types/node": "20.x",
         "@types/sinon": "^10.0.2",
         "@types/sinon-test": "^2.4.2",
-        "@types/trusted-types": "^1.0.6",
+        "@types/trusted-types": "^2.0.7",
         "@types/vscode-notebook-renderer": "^1.72.0",
         "@types/webpack": "^5.28.5",
         "@types/wicg-file-system-access": "^2020.9.6",
@@ -2512,10 +2512,11 @@
       "dev": true
     },
     "node_modules/@types/trusted-types": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-1.0.6.tgz",
-      "integrity": "sha512-230RC8sFeHoT6sSUlRO6a8cAnclO06eeiq1QDfiv2FGCLWFvvERWgwIQD4FWqD9A69BN7Lzee4OXwoMVnnsWDw==",
-      "dev": true
+      "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",
diff --git a/package.json b/package.json
index 4657b25e4475..0b4d35766e87 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "@types/node": "20.x",
     "@types/sinon": "^10.0.2",
     "@types/sinon-test": "^2.4.2",
-    "@types/trusted-types": "^1.0.6",
+    "@types/trusted-types": "^2.0.7",
     "@types/vscode-notebook-renderer": "^1.72.0",
     "@types/webpack": "^5.28.5",
     "@types/wicg-file-system-access": "^2020.9.6",

From 1312cba06b4c9ad7e60d170ea2229a2555a8cd2b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 07:59:06 +0000
Subject: [PATCH 1115/1815] Bump vscode-uri from 3.0.3 to 3.1.0 in
 /test/integration/browser

Bumps [vscode-uri](https://github.com/microsoft/vscode-uri) from 3.0.3 to 3.1.0.
- [Release notes](https://github.com/microsoft/vscode-uri/releases)
- [Commits](https://github.com/microsoft/vscode-uri/compare/v3.0.3...v3.1.0)

---
updated-dependencies:
- dependency-name: vscode-uri
  dependency-version: 3.1.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/integration/browser/package-lock.json | 11 ++++++-----
 test/integration/browser/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/integration/browser/package-lock.json b/test/integration/browser/package-lock.json
index eca71464ade3..c30ebdd5e63e 100644
--- a/test/integration/browser/package-lock.json
+++ b/test/integration/browser/package-lock.json
@@ -15,7 +15,7 @@
         "rimraf": "^2.6.1",
         "tmp": "0.2.4",
         "tree-kill": "1.2.2",
-        "vscode-uri": "^3.0.2"
+        "vscode-uri": "^3.1.0"
       }
     },
     "node_modules/@types/events": {
@@ -202,10 +202,11 @@
       "dev": true
     },
     "node_modules/vscode-uri": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz",
-      "integrity": "sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==",
-      "dev": true
+      "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/wrappy": {
       "version": "1.0.2",
diff --git a/test/integration/browser/package.json b/test/integration/browser/package.json
index 771489469faf..13a8009262d0 100644
--- a/test/integration/browser/package.json
+++ b/test/integration/browser/package.json
@@ -13,6 +13,6 @@
     "rimraf": "^2.6.1",
     "tmp": "0.2.4",
     "tree-kill": "1.2.2",
-    "vscode-uri": "^3.0.2"
+    "vscode-uri": "^3.1.0"
   }
 }

From 3ef2ccfad71972d5b2ae8ffdbb34584469847731 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 07:59:18 +0000
Subject: [PATCH 1116/1815] Bump tmp from 0.2.4 to 0.2.5 in
 /test/integration/browser

Bumps [tmp](https://github.com/raszi/node-tmp) from 0.2.4 to 0.2.5.
- [Changelog](https://github.com/raszi/node-tmp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/raszi/node-tmp/compare/v0.2.4...v0.2.5)

---
updated-dependencies:
- dependency-name: tmp
  dependency-version: 0.2.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/integration/browser/package-lock.json | 8 ++++----
 test/integration/browser/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/integration/browser/package-lock.json b/test/integration/browser/package-lock.json
index eca71464ade3..4f1e9a41d40a 100644
--- a/test/integration/browser/package-lock.json
+++ b/test/integration/browser/package-lock.json
@@ -13,7 +13,7 @@
         "@types/rimraf": "^2.0.4",
         "@types/tmp": "0.1.0",
         "rimraf": "^2.6.1",
-        "tmp": "0.2.4",
+        "tmp": "0.2.5",
         "tree-kill": "1.2.2",
         "vscode-uri": "^3.0.2"
       }
@@ -177,9 +177,9 @@
       }
     },
     "node_modules/tmp": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.4.tgz",
-      "integrity": "sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
+      "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
       "dev": true,
       "license": "MIT",
       "engines": {
diff --git a/test/integration/browser/package.json b/test/integration/browser/package.json
index 771489469faf..0a4dc39f3496 100644
--- a/test/integration/browser/package.json
+++ b/test/integration/browser/package.json
@@ -11,7 +11,7 @@
     "@types/rimraf": "^2.0.4",
     "@types/tmp": "0.1.0",
     "rimraf": "^2.6.1",
-    "tmp": "0.2.4",
+    "tmp": "0.2.5",
     "tree-kill": "1.2.2",
     "vscode-uri": "^3.0.2"
   }

From 1b983040754d50ba3fbde9b7665e375c850ed7b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 07:59:22 +0000
Subject: [PATCH 1117/1815] Bump rimraf from 2.7.1 to 6.1.2 in
 /test/integration/browser

Bumps [rimraf](https://github.com/isaacs/rimraf) from 2.7.1 to 6.1.2.
- [Changelog](https://github.com/isaacs/rimraf/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/rimraf/compare/v2.7.1...v6.1.2)

---
updated-dependencies:
- dependency-name: rimraf
  dependency-version: 6.1.2
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/integration/browser/package-lock.json | 169 +++++++++++----------
 test/integration/browser/package.json      |   2 +-
 2 files changed, 88 insertions(+), 83 deletions(-)

diff --git a/test/integration/browser/package-lock.json b/test/integration/browser/package-lock.json
index eca71464ade3..7f985fe4185e 100644
--- a/test/integration/browser/package-lock.json
+++ b/test/integration/browser/package-lock.json
@@ -12,12 +12,35 @@
         "@types/node": "20.x",
         "@types/rimraf": "^2.0.4",
         "@types/tmp": "0.1.0",
-        "rimraf": "^2.6.1",
+        "rimraf": "^6.1.2",
         "tmp": "0.2.4",
         "tree-kill": "1.2.2",
         "vscode-uri": "^3.0.2"
       }
     },
+    "node_modules/@isaacs/balanced-match": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/brace-expansion": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@isaacs/balanced-match": "^4.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/@types/events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
@@ -66,114 +89,102 @@
       "integrity": "sha512-6IwZ9HzWbCq6XoQWhxLpDjuADodH/MKXRUIDFudvgjcVdjFknvmR+DNsoUeer4XPrEnrZs04Jj+kfV9pFsrhmA==",
       "dev": true
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg==",
-      "dev": true
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.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"
-      }
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
     "node_modules/glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.0.tgz",
+      "integrity": "sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==",
       "dev": true,
+      "license": "BlueOak-1.0.0",
       "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"
+        "minimatch": "^10.1.1",
+        "minipass": "^7.1.2",
+        "path-scurry": "^2.0.0"
       },
       "engines": {
-        "node": "*"
+        "node": "20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+    "node_modules/lru-cache": {
+      "version": "11.2.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.2.tgz",
+      "integrity": "sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==",
       "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+      "license": "ISC",
+      "engines": {
+        "node": "20 || >=22"
       }
     },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
     "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "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": {
-        "brace-expansion": "^1.1.7"
+        "@isaacs/brace-expansion": "^5.0.0"
       },
       "engines": {
-        "node": "*"
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "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/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "dev": true,
-      "dependencies": {
-        "wrappy": "1"
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/path-is-absolute": {
+    "node_modules/package-json-from-dist": {
       "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==",
+      "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": "BlueOak-1.0.0"
+    },
+    "node_modules/path-scurry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz",
+      "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.2.tgz",
+      "integrity": "sha512-cFCkPslJv7BAXJsYlK1dZsbP8/ZNLkCAQ0bi1hf5EKX2QHegmDFEFA6QhuYJlk7UDdc+02JjO80YSOrWPpw06g==",
       "dev": true,
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "glob": "^7.1.3"
+        "glob": "^13.0.0",
+        "package-json-from-dist": "^1.0.1"
       },
       "bin": {
-        "rimraf": "bin.js"
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/tmp": {
@@ -206,12 +217,6 @@
       "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz",
       "integrity": "sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==",
       "dev": true
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
     }
   }
 }
diff --git a/test/integration/browser/package.json b/test/integration/browser/package.json
index 771489469faf..246e706e0a42 100644
--- a/test/integration/browser/package.json
+++ b/test/integration/browser/package.json
@@ -10,7 +10,7 @@
     "@types/node": "20.x",
     "@types/rimraf": "^2.0.4",
     "@types/tmp": "0.1.0",
-    "rimraf": "^2.6.1",
+    "rimraf": "^6.1.2",
     "tmp": "0.2.4",
     "tree-kill": "1.2.2",
     "vscode-uri": "^3.0.2"

From 7c01b2252ffd95646a56235019d35db22a950ce4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 07:59:25 +0000
Subject: [PATCH 1118/1815] Bump @types/mocha from 9.1.1 to 10.0.10 in
 /test/smoke

Bumps [@types/mocha](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mocha) from 9.1.1 to 10.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mocha)

---
updated-dependencies:
- dependency-name: "@types/mocha"
  dependency-version: 10.0.10
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/smoke/package-lock.json | 11 ++++++-----
 test/smoke/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/smoke/package-lock.json b/test/smoke/package-lock.json
index 8ebcdf5298f1..6684323041b2 100644
--- a/test/smoke/package-lock.json
+++ b/test/smoke/package-lock.json
@@ -14,7 +14,7 @@
         "rimraf": "3.0.2"
       },
       "devDependencies": {
-        "@types/mocha": "^9.1.1",
+        "@types/mocha": "^10.0.10",
         "@types/ncp": "2.0.1",
         "@types/node": "20.x",
         "@types/node-fetch": "^2.5.10",
@@ -46,10 +46,11 @@
       "dev": true
     },
     "node_modules/@types/mocha": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
-      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
-      "dev": true
+      "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/ncp": {
       "version": "2.0.1",
diff --git a/test/smoke/package.json b/test/smoke/package.json
index 22266dd559c1..6f5b1883df7f 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -16,7 +16,7 @@
     "rimraf": "3.0.2"
   },
   "devDependencies": {
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.10",
     "@types/ncp": "2.0.1",
     "@types/node": "20.x",
     "@types/node-fetch": "^2.5.10",

From 0ddac4c4e645a5ce676c4ea00855823520e95fd3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 07:59:52 +0000
Subject: [PATCH 1119/1815] Bump koa from 2.16.3 to 3.1.1 in /test/leaks

Bumps [koa](https://github.com/koajs/koa) from 2.16.3 to 3.1.1.
- [Release notes](https://github.com/koajs/koa/releases)
- [Changelog](https://github.com/koajs/koa/blob/master/History.md)
- [Commits](https://github.com/koajs/koa/compare/v2.16.3...v3.1.1)

---
updated-dependencies:
- dependency-name: koa
  dependency-version: 3.1.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/leaks/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/leaks/package.json b/test/leaks/package.json
index 07bdd1d18301..9c7c1a26c36d 100644
--- a/test/leaks/package.json
+++ b/test/leaks/package.json
@@ -4,7 +4,7 @@
   "main": "index.js",
   "license": "MIT",
   "devDependencies": {
-    "koa": "^2.13.1",
+    "koa": "^3.1.1",
     "koa-mount": "^4.0.0",
     "koa-static": "^5.0.0"
   }

From 02ed8fa655a983dad66f4c3d5ba74e8df0429ba6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 08:09:56 +0000
Subject: [PATCH 1120/1815] Bump chai from 4.2.0 to 6.2.1 in /test/monaco

Bumps [chai](https://github.com/chaijs/chai) from 4.2.0 to 6.2.1.
- [Release notes](https://github.com/chaijs/chai/releases)
- [Changelog](https://github.com/chaijs/chai/blob/main/History.md)
- [Commits](https://github.com/chaijs/chai/compare/4.2.0...v6.2.1)

---
updated-dependencies:
- dependency-name: chai
  dependency-version: 6.2.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/monaco/package-lock.json | 76 +++--------------------------------
 test/monaco/package.json      |  2 +-
 2 files changed, 7 insertions(+), 71 deletions(-)

diff --git a/test/monaco/package-lock.json b/test/monaco/package-lock.json
index 224680dd5972..33865e07972d 100644
--- a/test/monaco/package-lock.json
+++ b/test/monaco/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "devDependencies": {
         "@types/chai": "^4.2.14",
-        "chai": "^4.2.0",
+        "chai": "^6.2.1",
         "warnings-to-errors-webpack-plugin": "^2.3.0"
       }
     },
@@ -20,78 +20,14 @@
       "integrity": "sha512-G+ITQPXkwTrslfG5L/BksmbLUA0M1iybEsmCWPqzSxsRRhJZimBKJkoMi8fr/CPygPTj4zO5pJH7I2/cm9M7SQ==",
       "dev": true
     },
-    "node_modules/assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/chai": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
-      "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
-      "dev": true,
-      "dependencies": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^3.0.1",
-        "get-func-name": "^2.0.0",
-        "pathval": "^1.1.0",
-        "type-detect": "^4.0.5"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/deep-eql": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
-      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
-      "dev": true,
-      "dependencies": {
-        "type-detect": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=0.12"
-      }
-    },
-    "node_modules/get-func-name": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
-      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.1.tgz",
+      "integrity": "sha512-p4Z49OGG5W/WBCPSS/dH3jQ73kD6tiMmUM+bckNK6Jr5JHMG3k9bg/BvKR8lKmtVBKmOiuVaV2ws8s9oSbwysg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=18"
       }
     },
     "node_modules/warnings-to-errors-webpack-plugin": {
diff --git a/test/monaco/package.json b/test/monaco/package.json
index 2d48ca1a73f2..787ffcf9d624 100644
--- a/test/monaco/package.json
+++ b/test/monaco/package.json
@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "@types/chai": "^4.2.14",
-    "chai": "^4.2.0",
+    "chai": "^6.2.1",
     "warnings-to-errors-webpack-plugin": "^2.3.0"
   }
 }

From 2920402122964f72494836c6af196b04d2a648e0 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Fri, 28 Nov 2025 16:45:16 -0700
Subject: [PATCH 1121/1815] Delete .github/workflows/codeql.yml

Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .github/workflows/codeql.yml | 78 ------------------------------------
 1 file changed, 78 deletions(-)
 delete mode 100644 .github/workflows/codeql.yml

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
deleted file mode 100644
index a0bb0c77fe77..000000000000
--- a/.github/workflows/codeql.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: ["Main"]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: ["Main"]
-  schedule:
-    - cron: "0 0 * * 1"
-
-permissions:
-  contents: read
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ["cpp", "csharp", "go", "java", "javascript", "python", "ruby", "typescript"]
-        # CodeQL supports [ $supported-codeql-languages ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
-        with:
-          egress-policy: audit
-
-      - name: Checkout repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@d3ced5c96c16c4332e2a61eb6f3649d6f1b20bb8 # v3.31.5
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@d3ced5c96c16c4332e2a61eb6f3649d6f1b20bb8 # v3.31.5
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-      #   If the Autobuild fails above, remove it and uncomment the following three lines.
-      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-      # - run: |
-      #   echo "Run, Build Application using script"
-      #   ./location_of_script_within_repo/buildscript.sh
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@d3ced5c96c16c4332e2a61eb6f3649d6f1b20bb8 # v3.31.5
-        with:
-          category: "/language:${{matrix.language}}"

From 767043c035b797e2cb5679c05f6d08dcf001038f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 23:46:11 +0000
Subject: [PATCH 1122/1815] Bump actions/checkout from 4.3.1 to 6.0.0

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.3.1 to 6.0.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.3.1...1af3b93b6815bc44a9784bd300feb67ff0d1eeb3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/dependency-review.yml | 2 +-
 .github/workflows/scorecards.yml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index cccd92955da3..7e24594f265c 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -22,6 +22,6 @@ jobs:
           egress-policy: audit
 
       - name: 'Checkout Repository'
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 264c25e49ed9..e1d0af8c1006 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -41,7 +41,7 @@ jobs:
           egress-policy: audit
 
       - name: "Checkout code"
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 

From 233d4f54fccf2499f1330f03423a024eb0fd5abd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 23:46:13 +0000
Subject: [PATCH 1123/1815] Bump github/codeql-action from 3.31.5 to 4.31.5

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.31.5 to 4.31.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/d3ced5c96c16c4332e2a61eb6f3649d6f1b20bb8...fdbfb4d2750291e159f0156def62b853c2798ca2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.5
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/scorecards.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 264c25e49ed9..05b3e7f32513 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -76,6 +76,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@d3ced5c96c16c4332e2a61eb6f3649d6f1b20bb8 # v3.31.5
+        uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
         with:
           sarif_file: results.sarif

From c5a065ade900eb723ca7d5c1bb3c16334c66516f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Dec 2025 13:12:12 +0000
Subject: [PATCH 1124/1815] Bump @vscode/ripgrep from 1.15.11 to 1.17.0

Bumps [@vscode/ripgrep](https://github.com/microsoft/vscode-ripgrep) from 1.15.11 to 1.17.0.
- [Release notes](https://github.com/microsoft/vscode-ripgrep/releases)
- [Commits](https://github.com/microsoft/vscode-ripgrep/compare/v1.15.11...v1.17.0)

---
updated-dependencies:
- dependency-name: "@vscode/ripgrep"
  dependency-version: 1.17.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d3a7eec372d5..c0ffb3cd8cde 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
         "@vscode/iconv-lite-umd": "0.7.0",
         "@vscode/policy-watcher": "^1.2.0",
         "@vscode/proxy-agent": "^0.32.0",
-        "@vscode/ripgrep": "^1.15.11",
+        "@vscode/ripgrep": "^1.17.0",
         "@vscode/spdlog": "^0.15.0",
         "@vscode/sqlite3": "5.1.8-vscode",
         "@vscode/sudo-prompt": "9.3.1",
@@ -2902,9 +2902,9 @@
       }
     },
     "node_modules/@vscode/ripgrep": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.11.tgz",
-      "integrity": "sha512-G/VqtA6kR50mJkIH4WA+I2Q78V5blovgPPq0VPYM0QIRp57lYMkdV+U9VrY80b3AvaC72A1z8STmyxc8ZKiTsw==",
+      "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": {
diff --git a/package.json b/package.json
index faecebbd0846..500c058fcde4 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "@vscode/iconv-lite-umd": "0.7.0",
     "@vscode/policy-watcher": "^1.2.0",
     "@vscode/proxy-agent": "^0.32.0",
-    "@vscode/ripgrep": "^1.15.11",
+    "@vscode/ripgrep": "^1.17.0",
     "@vscode/spdlog": "^0.15.0",
     "@vscode/sqlite3": "5.1.8-vscode",
     "@vscode/sudo-prompt": "9.3.1",

From 888c3c3c71b5c892860f9811747a4fee4030cbc7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Dec 2025 13:30:17 +0000
Subject: [PATCH 1125/1815] Bump @types/chai from 4.2.14 to 5.2.3 in
 /test/monaco

Bumps [@types/chai](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chai) from 4.2.14 to 5.2.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chai)

---
updated-dependencies:
- dependency-name: "@types/chai"
  dependency-version: 5.2.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/monaco/package-lock.json | 32 +++++++++++++++++++++++++++-----
 test/monaco/package.json      |  2 +-
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/test/monaco/package-lock.json b/test/monaco/package-lock.json
index 33865e07972d..6da1955fbd14 100644
--- a/test/monaco/package-lock.json
+++ b/test/monaco/package-lock.json
@@ -9,16 +9,38 @@
       "version": "1.0.0",
       "license": "MIT",
       "devDependencies": {
-        "@types/chai": "^4.2.14",
+        "@types/chai": "^5.2.3",
         "chai": "^6.2.1",
         "warnings-to-errors-webpack-plugin": "^2.3.0"
       }
     },
     "node_modules/@types/chai": {
-      "version": "4.2.14",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.14.tgz",
-      "integrity": "sha512-G+ITQPXkwTrslfG5L/BksmbLUA0M1iybEsmCWPqzSxsRRhJZimBKJkoMi8fr/CPygPTj4zO5pJH7I2/cm9M7SQ==",
-      "dev": true
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz",
+      "integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/deep-eql": "*",
+        "assertion-error": "^2.0.1"
+      }
+    },
+    "node_modules/@types/deep-eql": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
+      "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/assertion-error": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/chai": {
       "version": "6.2.1",
diff --git a/test/monaco/package.json b/test/monaco/package.json
index 787ffcf9d624..8edd11439157 100644
--- a/test/monaco/package.json
+++ b/test/monaco/package.json
@@ -11,7 +11,7 @@
     "test": "node runner.js"
   },
   "devDependencies": {
-    "@types/chai": "^4.2.14",
+    "@types/chai": "^5.2.3",
     "chai": "^6.2.1",
     "warnings-to-errors-webpack-plugin": "^2.3.0"
   }

From c0559ed04e361836aaf7e0cf0bc2c2cce68fc58f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Dec 2025 15:15:29 +0000
Subject: [PATCH 1126/1815] Bump @vscode/windows-process-tree from 0.6.0 to
 0.6.2 in /remote

Bumps [@vscode/windows-process-tree](https://github.com/microsoft/vscode-windows-process-tree) from 0.6.0 to 0.6.2.
- [Release notes](https://github.com/microsoft/vscode-windows-process-tree/releases)
- [Commits](https://github.com/microsoft/vscode-windows-process-tree/compare/v0.6.0...v0.6.2)

---
updated-dependencies:
- dependency-name: "@vscode/windows-process-tree"
  dependency-version: 0.6.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 9 +++++----
 remote/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 7996a5deea8b..9e84aeddbb3c 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -18,7 +18,7 @@
         "@vscode/spdlog": "^0.15.0",
         "@vscode/tree-sitter-wasm": "^0.1.3",
         "@vscode/vscode-languagedetection": "1.0.21",
-        "@vscode/windows-process-tree": "^0.6.0",
+        "@vscode/windows-process-tree": "^0.6.2",
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.2.0-beta.81",
         "@xterm/addon-image": "^0.9.0-beta.98",
@@ -508,10 +508,11 @@
       }
     },
     "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.2",
+      "resolved": "https://registry.npmjs.org/@vscode/windows-process-tree/-/windows-process-tree-0.6.2.tgz",
+      "integrity": "sha512-uzyUuQ93m7K1jSPrB/72m4IspOyeGpvvghNwFCay/McZ+y4Hk2BnLdZPb6EJ8HLRa3GwCvYjH/MQZzcnLOVnaQ==",
       "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
         "node-addon-api": "7.1.0"
       }
diff --git a/remote/package.json b/remote/package.json
index 47fe4472cc76..ead017442b4d 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -13,7 +13,7 @@
     "@vscode/spdlog": "^0.15.0",
     "@vscode/tree-sitter-wasm": "^0.1.3",
     "@vscode/vscode-languagedetection": "1.0.21",
-    "@vscode/windows-process-tree": "^0.6.0",
+    "@vscode/windows-process-tree": "^0.6.2",
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.2.0-beta.81",
     "@xterm/addon-image": "^0.9.0-beta.98",

From 971920f80cd21d4e0f1b8a50c3fa7dac45863b10 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Dec 2025 15:35:37 +0000
Subject: [PATCH 1127/1815] Bump github/codeql-action from 4.31.5 to 4.31.6

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.5 to 4.31.6.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/fdbfb4d2750291e159f0156def62b853c2798ca2...fe4161a26a8629af62121b670040955b330f9af2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/scorecards.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 6ca614a9c058..49de8e0e68e5 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -76,6 +76,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
+        uses: github/codeql-action/upload-sarif@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
         with:
           sarif_file: results.sarif

From 2daeb7153ba0e09b1d30c5d325f420b90dc84e75 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 12:35:18 +0000
Subject: [PATCH 1128/1815] Bump gulp-untar from 0.0.7 to 0.0.8

Bumps [gulp-untar](https://github.com/jmerrifield/gulp-untar) from 0.0.7 to 0.0.8.
- [Commits](https://github.com/jmerrifield/gulp-untar/commits)

---
updated-dependencies:
- dependency-name: gulp-untar
  dependency-version: 0.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 11 ++++++-----
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c0ffb3cd8cde..b2eb63eaddac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -120,7 +120,7 @@
         "gulp-replace": "^0.5.4",
         "gulp-sourcemaps": "^3.0.0",
         "gulp-svgmin": "^4.1.0",
-        "gulp-untar": "^0.0.7",
+        "gulp-untar": "^0.0.8",
         "husky": "^0.13.1",
         "innosetup": "^6.4.1",
         "istanbul-lib-coverage": "^3.2.0",
@@ -8559,12 +8559,13 @@
       }
     },
     "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==",
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/gulp-untar/-/gulp-untar-0.0.8.tgz",
+      "integrity": "sha512-mqW7v2uvrxd8IoCCwJ04sPYgWjR3Gsi6yfhVWBK3sFMDP7FuoT7GNmxrCMwkk4RWqQohx8DRv+cDq4SRDXATGA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "event-stream": "~3.3.4",
+        "event-stream": "3.3.4",
         "streamifier": "~0.1.1",
         "tar": "^2.2.1",
         "through2": "~2.0.3",
diff --git a/package.json b/package.json
index 500c058fcde4..a226d17af1fe 100644
--- a/package.json
+++ b/package.json
@@ -179,7 +179,7 @@
     "gulp-replace": "^0.5.4",
     "gulp-sourcemaps": "^3.0.0",
     "gulp-svgmin": "^4.1.0",
-    "gulp-untar": "^0.0.7",
+    "gulp-untar": "^0.0.8",
     "husky": "^0.13.1",
     "innosetup": "^6.4.1",
     "istanbul-lib-coverage": "^3.2.0",

From 2e9710bb86fc4514b8073796148c93eed3038a05 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 12:35:21 +0000
Subject: [PATCH 1129/1815] Bump @xterm/addon-ligatures in /remote

Bumps [@xterm/addon-ligatures](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.98 to 0.10.0-beta.140.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-ligatures"
  dependency-version: 0.10.0-beta.140
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 9e84aeddbb3c..e43e471e22ae 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -22,7 +22,7 @@
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.2.0-beta.81",
         "@xterm/addon-image": "^0.9.0-beta.98",
-        "@xterm/addon-ligatures": "^0.10.0-beta.98",
+        "@xterm/addon-ligatures": "^0.10.0-beta.140",
         "@xterm/addon-progress": "^0.2.0-beta.4",
         "@xterm/addon-search": "^0.16.0-beta.98",
         "@xterm/addon-serialize": "^0.14.0-beta.98",
@@ -545,9 +545,9 @@
       }
     },
     "node_modules/@xterm/addon-ligatures": {
-      "version": "0.10.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.98.tgz",
-      "integrity": "sha512-1zYeS9OUBR2ThG7dsxsGKOqeSlUo+DNTd5aaV5ZFbKQsQ1w+sQCaL73ZrXp1kuVK7pBiP5NCo4ffcXfzcztztA==",
+      "version": "0.10.0-beta.140",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.140.tgz",
+      "integrity": "sha512-ps/M90wXHEec8nQ8UJXNLccrJGRADKLVcw4F81DPgzdTNLe4iPcGZ5ASFIB1WZkSO0k28nTes7uAPLGjvWS4ig==",
       "license": "MIT",
       "dependencies": {
         "font-finder": "^1.1.0",
@@ -557,7 +557,7 @@
         "node": ">8.0.0"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.140"
       }
     },
     "node_modules/@xterm/addon-progress": {
diff --git a/remote/package.json b/remote/package.json
index ead017442b4d..790ac8b0562c 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -17,7 +17,7 @@
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.2.0-beta.81",
     "@xterm/addon-image": "^0.9.0-beta.98",
-    "@xterm/addon-ligatures": "^0.10.0-beta.98",
+    "@xterm/addon-ligatures": "^0.10.0-beta.140",
     "@xterm/addon-progress": "^0.2.0-beta.4",
     "@xterm/addon-search": "^0.16.0-beta.98",
     "@xterm/addon-serialize": "^0.14.0-beta.98",

From a4e66b5706882edd13d382c9c43dec7bfefb577c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 12:35:44 +0000
Subject: [PATCH 1130/1815] Bump @vscode/iconv-lite-umd from 0.7.0 to 0.7.1 in
 /remote/web

Bumps [@vscode/iconv-lite-umd](https://github.com/Microsoft/vscode-iconv-lite-umd) from 0.7.0 to 0.7.1.
- [Release notes](https://github.com/Microsoft/vscode-iconv-lite-umd/releases)
- [Commits](https://github.com/Microsoft/vscode-iconv-lite-umd/commits/v0.7.1)

---
updated-dependencies:
- dependency-name: "@vscode/iconv-lite-umd"
  dependency-version: 0.7.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 9 +++++----
 remote/web/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index e13c2c65e521..3af038b8c4a9 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -10,7 +10,7 @@
 			"dependencies": {
 				"@microsoft/1ds-core-js": "^3.2.13",
 				"@microsoft/1ds-post-js": "^3.2.13",
-				"@vscode/iconv-lite-umd": "0.7.0",
+				"@vscode/iconv-lite-umd": "0.7.1",
 				"@vscode/tree-sitter-wasm": "^0.1.3",
 				"@vscode/vscode-languagedetection": "1.0.21",
 				"@xterm/addon-clipboard": "^0.2.0-beta.81",
@@ -71,9 +71,10 @@
 			"integrity": "sha512-n1VPsljTSkthsAFYdiWfC+DKzK2WwcRp83Y1YAqdX552BstvsDjft9YXppjUzp11BPsapDoO1LDgrDB0XVsfNQ=="
 		},
 		"node_modules/@vscode/iconv-lite-umd": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
-			"integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg=="
+			"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/tree-sitter-wasm": {
 			"version": "0.1.3",
diff --git a/remote/web/package.json b/remote/web/package.json
index 78336aa2fa45..3d3d61bd68dc 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -5,7 +5,7 @@
 	"dependencies": {
 		"@microsoft/1ds-core-js": "^3.2.13",
 		"@microsoft/1ds-post-js": "^3.2.13",
-		"@vscode/iconv-lite-umd": "0.7.0",
+		"@vscode/iconv-lite-umd": "0.7.1",
 		"@vscode/tree-sitter-wasm": "^0.1.3",
 		"@vscode/vscode-languagedetection": "1.0.21",
 		"@xterm/addon-clipboard": "^0.2.0-beta.81",

From 43e6a415bcff468438939dbfb02228246f66861a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 12:35:51 +0000
Subject: [PATCH 1131/1815] Bump @vscode/vscode-languagedetection in
 /remote/web

Bumps [@vscode/vscode-languagedetection](https://github.com/microsoft/vscode-languagedetection) from 1.0.21 to 1.0.22.
- [Commits](https://github.com/microsoft/vscode-languagedetection/commits)

---
updated-dependencies:
- dependency-name: "@vscode/vscode-languagedetection"
  dependency-version: 1.0.22
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 9 +++++----
 remote/web/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index e13c2c65e521..ceaeea37ae57 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -12,7 +12,7 @@
 				"@microsoft/1ds-post-js": "^3.2.13",
 				"@vscode/iconv-lite-umd": "0.7.0",
 				"@vscode/tree-sitter-wasm": "^0.1.3",
-				"@vscode/vscode-languagedetection": "1.0.21",
+				"@vscode/vscode-languagedetection": "1.0.22",
 				"@xterm/addon-clipboard": "^0.2.0-beta.81",
 				"@xterm/addon-image": "^0.9.0-beta.98",
 				"@xterm/addon-ligatures": "^0.10.0-beta.98",
@@ -82,9 +82,10 @@
 			"license": "MIT"
 		},
 		"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==",
+			"version": "1.0.22",
+			"resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.22.tgz",
+			"integrity": "sha512-rQ/BgMyLuIXSmbA0MSkIPHtcOw14QkeDbAq19sjvaS9LTRr905yij0S8lsyqN5JgOsbtIx7pAcyOxFMzPmqhZQ==",
+			"license": "MIT",
 			"bin": {
 				"vscode-languagedetection": "cli/index.js"
 			}
diff --git a/remote/web/package.json b/remote/web/package.json
index 78336aa2fa45..547c2d24a859 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -7,7 +7,7 @@
 		"@microsoft/1ds-post-js": "^3.2.13",
 		"@vscode/iconv-lite-umd": "0.7.0",
 		"@vscode/tree-sitter-wasm": "^0.1.3",
-		"@vscode/vscode-languagedetection": "1.0.21",
+		"@vscode/vscode-languagedetection": "1.0.22",
 		"@xterm/addon-clipboard": "^0.2.0-beta.81",
 		"@xterm/addon-image": "^0.9.0-beta.98",
 		"@xterm/addon-ligatures": "^0.10.0-beta.98",

From 659f156e7ce512c3ab4ffdfafe7ff5d5ada83fa3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 16:54:30 +0000
Subject: [PATCH 1132/1815] Bump @xterm/addon-image from 0.9.0-beta.98 to
 0.9.0-beta.140 in /remote

Bumps [@xterm/addon-image](https://github.com/xtermjs/xterm.js) from 0.9.0-beta.98 to 0.9.0-beta.140.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-image"
  dependency-version: 0.9.0-beta.140
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index e43e471e22ae..ff4160e528be 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -21,7 +21,7 @@
         "@vscode/windows-process-tree": "^0.6.2",
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.2.0-beta.81",
-        "@xterm/addon-image": "^0.9.0-beta.98",
+        "@xterm/addon-image": "^0.9.0-beta.140",
         "@xterm/addon-ligatures": "^0.10.0-beta.140",
         "@xterm/addon-progress": "^0.2.0-beta.4",
         "@xterm/addon-search": "^0.16.0-beta.98",
@@ -536,12 +536,12 @@
       }
     },
     "node_modules/@xterm/addon-image": {
-      "version": "0.9.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.98.tgz",
-      "integrity": "sha512-yJaezwUc1Y3QYCmYSpjFW9IzMTLPSqrRCgdPnQ0JbCAVASRVmH6DLRfeikheJCvoXW6VUwMmGkb3fSplTxiV1w==",
+      "version": "0.9.0-beta.140",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.140.tgz",
+      "integrity": "sha512-9FG1ke2lAkDqvw7K/BY/UCjwF1OS3ME6s+FBpBQIMIA+Bhexm8TjhvYjQMK1aJgX39Y6vvmWflbiC4Xz20H38w==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.140"
       }
     },
     "node_modules/@xterm/addon-ligatures": {
diff --git a/remote/package.json b/remote/package.json
index 790ac8b0562c..c90182197eb9 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -16,7 +16,7 @@
     "@vscode/windows-process-tree": "^0.6.2",
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.2.0-beta.81",
-    "@xterm/addon-image": "^0.9.0-beta.98",
+    "@xterm/addon-image": "^0.9.0-beta.140",
     "@xterm/addon-ligatures": "^0.10.0-beta.140",
     "@xterm/addon-progress": "^0.2.0-beta.4",
     "@xterm/addon-search": "^0.16.0-beta.98",

From 2239f793ce3a13d3661d3e6b637ff27bd6eef208 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 17:05:06 +0000
Subject: [PATCH 1133/1815] Bump @xterm/addon-ligatures in /remote/web

Bumps [@xterm/addon-ligatures](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.98 to 0.10.0-beta.140.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-ligatures"
  dependency-version: 0.10.0-beta.140
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 3af038b8c4a9..f2574d0af314 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -15,7 +15,7 @@
 				"@vscode/vscode-languagedetection": "1.0.21",
 				"@xterm/addon-clipboard": "^0.2.0-beta.81",
 				"@xterm/addon-image": "^0.9.0-beta.98",
-				"@xterm/addon-ligatures": "^0.10.0-beta.98",
+				"@xterm/addon-ligatures": "^0.10.0-beta.140",
 				"@xterm/addon-progress": "^0.2.0-beta.4",
 				"@xterm/addon-search": "^0.16.0-beta.98",
 				"@xterm/addon-serialize": "^0.14.0-beta.98",
@@ -112,9 +112,9 @@
 			}
 		},
 		"node_modules/@xterm/addon-ligatures": {
-			"version": "0.10.0-beta.98",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.98.tgz",
-			"integrity": "sha512-1zYeS9OUBR2ThG7dsxsGKOqeSlUo+DNTd5aaV5ZFbKQsQ1w+sQCaL73ZrXp1kuVK7pBiP5NCo4ffcXfzcztztA==",
+			"version": "0.10.0-beta.140",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.140.tgz",
+			"integrity": "sha512-ps/M90wXHEec8nQ8UJXNLccrJGRADKLVcw4F81DPgzdTNLe4iPcGZ5ASFIB1WZkSO0k28nTes7uAPLGjvWS4ig==",
 			"license": "MIT",
 			"dependencies": {
 				"font-finder": "^1.1.0",
@@ -124,7 +124,7 @@
 				"node": ">8.0.0"
 			},
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.98"
+				"@xterm/xterm": "^5.6.0-beta.140"
 			}
 		},
 		"node_modules/@xterm/addon-progress": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 3d3d61bd68dc..190ab1076643 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -10,7 +10,7 @@
 		"@vscode/vscode-languagedetection": "1.0.21",
 		"@xterm/addon-clipboard": "^0.2.0-beta.81",
 		"@xterm/addon-image": "^0.9.0-beta.98",
-		"@xterm/addon-ligatures": "^0.10.0-beta.98",
+		"@xterm/addon-ligatures": "^0.10.0-beta.140",
 		"@xterm/addon-progress": "^0.2.0-beta.4",
 		"@xterm/addon-search": "^0.16.0-beta.98",
 		"@xterm/addon-serialize": "^0.14.0-beta.98",

From d0ea1ab9c4d3d453ff17b41282f1bc51dfc362bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 17:06:28 +0000
Subject: [PATCH 1134/1815] Bump @vscode/tree-sitter-wasm from 0.1.3 to 0.3.0
 in /remote/web

Bumps [@vscode/tree-sitter-wasm](https://github.com/Microsoft/vscode-tree-sitter-wasm) from 0.1.3 to 0.3.0.
- [Release notes](https://github.com/Microsoft/vscode-tree-sitter-wasm/releases)
- [Changelog](https://github.com/microsoft/vscode-tree-sitter-wasm/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/vscode-tree-sitter-wasm/compare/v0.1.3...v0.3.0)

---
updated-dependencies:
- dependency-name: "@vscode/tree-sitter-wasm"
  dependency-version: 0.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 8 ++++----
 remote/web/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 3af038b8c4a9..8c53c84e8fa0 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -11,7 +11,7 @@
 				"@microsoft/1ds-core-js": "^3.2.13",
 				"@microsoft/1ds-post-js": "^3.2.13",
 				"@vscode/iconv-lite-umd": "0.7.1",
-				"@vscode/tree-sitter-wasm": "^0.1.3",
+				"@vscode/tree-sitter-wasm": "^0.3.0",
 				"@vscode/vscode-languagedetection": "1.0.21",
 				"@xterm/addon-clipboard": "^0.2.0-beta.81",
 				"@xterm/addon-image": "^0.9.0-beta.98",
@@ -77,9 +77,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@vscode/tree-sitter-wasm": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.1.3.tgz",
-			"integrity": "sha512-gs0+tlOfriWc6h1kXTCZvmPTuusN+SeDs7yDVZn/kKLGgqlhXFbl/gWKItxaTeryTDalN8N+ikneni6+3UDOag==",
+			"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": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 3d3d61bd68dc..0ff9beeb0e85 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -6,7 +6,7 @@
 		"@microsoft/1ds-core-js": "^3.2.13",
 		"@microsoft/1ds-post-js": "^3.2.13",
 		"@vscode/iconv-lite-umd": "0.7.1",
-		"@vscode/tree-sitter-wasm": "^0.1.3",
+		"@vscode/tree-sitter-wasm": "^0.3.0",
 		"@vscode/vscode-languagedetection": "1.0.21",
 		"@xterm/addon-clipboard": "^0.2.0-beta.81",
 		"@xterm/addon-image": "^0.9.0-beta.98",

From 785be5b6169b6e347298d5caa67f252158250397 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 17:49:21 +0000
Subject: [PATCH 1135/1815] Bump @xterm/addon-search in /remote/web

Bumps [@xterm/addon-search](https://github.com/xtermjs/xterm.js) from 0.16.0-beta.98 to 0.16.0-beta.140.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-search"
  dependency-version: 0.16.0-beta.140
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index f2574d0af314..f6671cd1d8d7 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -17,7 +17,7 @@
 				"@xterm/addon-image": "^0.9.0-beta.98",
 				"@xterm/addon-ligatures": "^0.10.0-beta.140",
 				"@xterm/addon-progress": "^0.2.0-beta.4",
-				"@xterm/addon-search": "^0.16.0-beta.98",
+				"@xterm/addon-search": "^0.16.0-beta.140",
 				"@xterm/addon-serialize": "^0.14.0-beta.98",
 				"@xterm/addon-unicode11": "^0.9.0-beta.98",
 				"@xterm/addon-webgl": "^0.19.0-beta.98",
@@ -137,12 +137,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-search": {
-			"version": "0.16.0-beta.98",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.98.tgz",
-			"integrity": "sha512-7gtx7eYvwFLxlb5q2IKxa7jG1KEinVwTlT3ijnSsPawwn7rGi6nR135rGiR8DAjEV0GUO406ICeoYyVbgiFNwQ==",
+			"version": "0.16.0-beta.140",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.140.tgz",
+			"integrity": "sha512-HhoIXMKX/uqCazRRiT/0QWFcnKVJ5/GgUDYFM/FMSW/OILzsnu/PAsp2FyNAzjI6pruH32WmnLIRbxeaUv4z7A==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.98"
+				"@xterm/xterm": "^5.6.0-beta.140"
 			}
 		},
 		"node_modules/@xterm/addon-serialize": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 190ab1076643..76de6c719826 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -12,7 +12,7 @@
 		"@xterm/addon-image": "^0.9.0-beta.98",
 		"@xterm/addon-ligatures": "^0.10.0-beta.140",
 		"@xterm/addon-progress": "^0.2.0-beta.4",
-		"@xterm/addon-search": "^0.16.0-beta.98",
+		"@xterm/addon-search": "^0.16.0-beta.140",
 		"@xterm/addon-serialize": "^0.14.0-beta.98",
 		"@xterm/addon-unicode11": "^0.9.0-beta.98",
 		"@xterm/addon-webgl": "^0.19.0-beta.98",

From 77725fe05ef4cd9d259a1c54fcb98b76a56bb957 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 18:08:54 +0000
Subject: [PATCH 1136/1815] Bump @vscode/iconv-lite-umd from 0.7.0 to 0.7.1 in
 /remote

Bumps [@vscode/iconv-lite-umd](https://github.com/Microsoft/vscode-iconv-lite-umd) from 0.7.0 to 0.7.1.
- [Release notes](https://github.com/Microsoft/vscode-iconv-lite-umd/releases)
- [Commits](https://github.com/Microsoft/vscode-iconv-lite-umd/commits/v0.7.1)

---
updated-dependencies:
- dependency-name: "@vscode/iconv-lite-umd"
  dependency-version: 0.7.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 9 +++++----
 remote/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index ff4160e528be..1afe97cd2002 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -12,7 +12,7 @@
         "@microsoft/1ds-post-js": "^3.2.13",
         "@parcel/watcher": "2.5.1",
         "@vscode/deviceid": "^0.1.1",
-        "@vscode/iconv-lite-umd": "0.7.0",
+        "@vscode/iconv-lite-umd": "0.7.1",
         "@vscode/proxy-agent": "^0.32.0",
         "@vscode/ripgrep": "^1.15.11",
         "@vscode/spdlog": "^0.15.0",
@@ -414,9 +414,10 @@
       }
     },
     "node_modules/@vscode/iconv-lite-umd": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
-      "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg=="
+      "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/proxy-agent": {
       "version": "0.32.0",
diff --git a/remote/package.json b/remote/package.json
index c90182197eb9..f481430f0386 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -7,7 +7,7 @@
     "@microsoft/1ds-post-js": "^3.2.13",
     "@parcel/watcher": "2.5.1",
     "@vscode/deviceid": "^0.1.1",
-    "@vscode/iconv-lite-umd": "0.7.0",
+    "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/proxy-agent": "^0.32.0",
     "@vscode/ripgrep": "^1.15.11",
     "@vscode/spdlog": "^0.15.0",

From 2c978c66295fdb1208af90e0efdcc71e3532db7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 18:47:41 +0000
Subject: [PATCH 1137/1815] Bump @vscode/deviceid from 0.1.1 to 0.1.2 in
 /remote

Bumps [@vscode/deviceid](https://github.com/Microsoft/vscode-deviceid) from 0.1.1 to 0.1.2.
- [Commits](https://github.com/Microsoft/vscode-deviceid/commits)

---
updated-dependencies:
- dependency-name: "@vscode/deviceid"
  dependency-version: 0.1.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 1afe97cd2002..230ea49e05e7 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -11,7 +11,7 @@
         "@microsoft/1ds-core-js": "^3.2.13",
         "@microsoft/1ds-post-js": "^3.2.13",
         "@parcel/watcher": "2.5.1",
-        "@vscode/deviceid": "^0.1.1",
+        "@vscode/deviceid": "^0.1.2",
         "@vscode/iconv-lite-umd": "0.7.1",
         "@vscode/proxy-agent": "^0.32.0",
         "@vscode/ripgrep": "^1.15.11",
@@ -404,10 +404,10 @@
       }
     },
     "node_modules/@vscode/deviceid": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@vscode/deviceid/-/deviceid-0.1.1.tgz",
-      "integrity": "sha512-ErpoMeKKNYAkR1IT3zxB5RtiTqEECdh8fxggupWvzuxpTAX77hwOI2NdJ7um+vupnXRBZVx4ugo0+dVHJWUkag==",
-      "hasInstallScript": true,
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@vscode/deviceid/-/deviceid-0.1.2.tgz",
+      "integrity": "sha512-QZsbcKGd5JMBVoKIVT+HD9o8YWWqcmKRNWvR3qWj3iXuDo8fKaZXY3k3ZGMdOAK36fCgL0zGTDkt9vWmeBwNvQ==",
+      "license": "MIT",
       "dependencies": {
         "fs-extra": "^11.2.0",
         "uuid": "^9.0.1"
diff --git a/remote/package.json b/remote/package.json
index f481430f0386..7d15d14359eb 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -6,7 +6,7 @@
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
     "@parcel/watcher": "2.5.1",
-    "@vscode/deviceid": "^0.1.1",
+    "@vscode/deviceid": "^0.1.2",
     "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/proxy-agent": "^0.32.0",
     "@vscode/ripgrep": "^1.15.11",

From c430a76510eb96d2948902d5e25cbe7adc05da77 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 19:48:43 +0000
Subject: [PATCH 1138/1815] Bump @types/ncp from 2.0.1 to 2.0.8 in /test/smoke

Bumps [@types/ncp](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/ncp) from 2.0.1 to 2.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/ncp)

---
updated-dependencies:
- dependency-name: "@types/ncp"
  dependency-version: 2.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/smoke/package-lock.json | 9 +++++----
 test/smoke/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/smoke/package-lock.json b/test/smoke/package-lock.json
index 6684323041b2..788175aeea91 100644
--- a/test/smoke/package-lock.json
+++ b/test/smoke/package-lock.json
@@ -15,7 +15,7 @@
       },
       "devDependencies": {
         "@types/mocha": "^10.0.10",
-        "@types/ncp": "2.0.1",
+        "@types/ncp": "2.0.8",
         "@types/node": "20.x",
         "@types/node-fetch": "^2.5.10",
         "@types/rimraf": "3.0.2",
@@ -53,10 +53,11 @@
       "license": "MIT"
     },
     "node_modules/@types/ncp": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/ncp/-/ncp-2.0.1.tgz",
-      "integrity": "sha512-TeiJ7uvv/92ugSqZ0v9l0eNXzutlki0aK+R1K5bfA5SYUil46ITlxLW4iNTCf55P4L5weCmaOdtxGeGWvudwPg==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@types/ncp/-/ncp-2.0.8.tgz",
+      "integrity": "sha512-pLNWVLCVWBLVM4F2OPjjK6FWFtByFKD7LhHryF+MbVLws7ENj09mKxRFlhkGPOXfJuaBAG+2iADKJsZwnAbYDw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
diff --git a/test/smoke/package.json b/test/smoke/package.json
index 6f5b1883df7f..f71c2e53591d 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@types/mocha": "^10.0.10",
-    "@types/ncp": "2.0.1",
+    "@types/ncp": "2.0.8",
     "@types/node": "20.x",
     "@types/node-fetch": "^2.5.10",
     "@types/rimraf": "3.0.2",

From 4cb2575c66da371a768c98660334b3f235d0ce45 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 19:48:48 +0000
Subject: [PATCH 1139/1815] Bump node-fetch from 2.6.7 to 3.3.2 in /test/smoke

Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.7 to 3.3.2.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.7...v3.3.2)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-version: 3.3.2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/smoke/package-lock.json | 113 +++++++++++++++++++++++++----------
 test/smoke/package.json      |   2 +-
 2 files changed, 84 insertions(+), 31 deletions(-)

diff --git a/test/smoke/package-lock.json b/test/smoke/package-lock.json
index 6684323041b2..afa3ffd2e86f 100644
--- a/test/smoke/package-lock.json
+++ b/test/smoke/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "ncp": "^2.0.0",
-        "node-fetch": "^2.6.7",
+        "node-fetch": "^3.3.2",
         "rimraf": "3.0.2"
       },
       "devDependencies": {
@@ -212,6 +212,15 @@
         "node": ">=4.8"
       }
     },
+    "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/define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -358,6 +367,29 @@
         "node": ">=0.8.0"
       }
     },
+    "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/form-data": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.4.tgz",
@@ -375,6 +407,18 @@
         "node": ">= 6"
       }
     },
+    "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/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -730,23 +774,42 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
+    "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": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "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": {
-        "whatwg-url": "^5.0.0"
+        "data-uri-to-buffer": "^4.0.0",
+        "fetch-blob": "^3.1.4",
+        "formdata-polyfill": "^4.0.10"
       },
       "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/node-fetch"
       }
     },
     "node_modules/normalize-package-data": {
@@ -1073,11 +1136,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
     "node_modules/undici-types": {
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
@@ -1094,18 +1152,13 @@
         "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",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0= sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
+    "node_modules/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": {
diff --git a/test/smoke/package.json b/test/smoke/package.json
index 6f5b1883df7f..8c5d4ddd24d6 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "ncp": "^2.0.0",
-    "node-fetch": "^2.6.7",
+    "node-fetch": "^3.3.2",
     "rimraf": "3.0.2"
   },
   "devDependencies": {

From a47e502e09ae703d7a3785e9d916e387512ab78e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 21:16:23 +0000
Subject: [PATCH 1140/1815] Bump @types/node from 20.11.24 to 24.10.1 in
 /test/smoke

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 24.10.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.10.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/smoke/package-lock.json | 20 +++++++++++---------
 test/smoke/package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/test/smoke/package-lock.json b/test/smoke/package-lock.json
index 788175aeea91..d3c63e940c37 100644
--- a/test/smoke/package-lock.json
+++ b/test/smoke/package-lock.json
@@ -16,7 +16,7 @@
       "devDependencies": {
         "@types/mocha": "^10.0.10",
         "@types/ncp": "2.0.8",
-        "@types/node": "20.x",
+        "@types/node": "24.x",
         "@types/node-fetch": "^2.5.10",
         "@types/rimraf": "3.0.2",
         "npm-run-all": "^4.1.5"
@@ -63,12 +63,13 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "24.10.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
+      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@types/node-fetch": {
@@ -1080,10 +1081,11 @@
       "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/validate-npm-package-license": {
       "version": "3.0.4",
diff --git a/test/smoke/package.json b/test/smoke/package.json
index f71c2e53591d..0d2ac64c4106 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -18,7 +18,7 @@
   "devDependencies": {
     "@types/mocha": "^10.0.10",
     "@types/ncp": "2.0.8",
-    "@types/node": "20.x",
+    "@types/node": "24.x",
     "@types/node-fetch": "^2.5.10",
     "@types/rimraf": "3.0.2",
     "npm-run-all": "^4.1.5"

From 360c0c1d2b113257cec51505b7667026527c8e23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 21:34:13 +0000
Subject: [PATCH 1141/1815] Bump rimraf from 3.0.2 to 6.1.2 in /test/smoke

Bumps [rimraf](https://github.com/isaacs/rimraf) from 3.0.2 to 6.1.2.
- [Changelog](https://github.com/isaacs/rimraf/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/rimraf/compare/v3.0.2...v6.1.2)

---
updated-dependencies:
- dependency-name: rimraf
  dependency-version: 6.1.2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/smoke/package-lock.json | 160 ++++++++++++++++++++++-------------
 test/smoke/package.json      |   2 +-
 2 files changed, 101 insertions(+), 61 deletions(-)

diff --git a/test/smoke/package-lock.json b/test/smoke/package-lock.json
index 52daec87fb33..8138fdccec09 100644
--- a/test/smoke/package-lock.json
+++ b/test/smoke/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "ncp": "^2.0.0",
         "node-fetch": "^3.3.2",
-        "rimraf": "3.0.2"
+        "rimraf": "6.1.2"
       },
       "devDependencies": {
         "@types/mocha": "^10.0.10",
@@ -22,6 +22,27 @@
         "npm-run-all": "^4.1.5"
       }
     },
+    "node_modules/@isaacs/balanced-match": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+      "license": "MIT",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/brace-expansion": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "license": "MIT",
+      "dependencies": {
+        "@isaacs/balanced-match": "^4.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/@types/events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
@@ -112,12 +133,14 @@
     "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=="
+      "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==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -195,7 +218,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=="
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
     },
     "node_modules/cross-spawn": {
       "version": "6.0.5",
@@ -420,11 +444,6 @@
         "node": ">=12.20.0"
       }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -475,20 +494,32 @@
       }
     },
     "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",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.0.tgz",
+      "integrity": "sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==",
+      "license": "BlueOak-1.0.0",
       "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"
+        "minimatch": "^10.1.1",
+        "minipass": "^7.1.2",
+        "path-scurry": "^2.0.0"
       },
       "engines": {
-        "node": "*"
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
+      "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/brace-expansion": "^5.0.0"
+      },
+      "engines": {
+        "node": "20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -582,21 +613,6 @@
       "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
       "dev": true
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
     "node_modules/is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -708,6 +724,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/lru-cache": {
+      "version": "11.2.4",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz",
+      "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -754,6 +779,7 @@
       "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"
       },
@@ -761,6 +787,15 @@
         "node": "*"
       }
     },
+    "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/ncp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
@@ -886,13 +921,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dependencies": {
-        "wrappy": "1"
-      }
+    "node_modules/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/parse-json": {
       "version": "4.0.0",
@@ -907,14 +940,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18= sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
@@ -930,6 +955,22 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
+    "node_modules/path-scurry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz",
+      "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/path-type": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
@@ -991,15 +1032,19 @@
       }
     },
     "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.2.tgz",
+      "integrity": "sha512-cFCkPslJv7BAXJsYlK1dZsbP8/ZNLkCAQ0bi1hf5EKX2QHegmDFEFA6QhuYJlk7UDdc+02JjO80YSOrWPpw06g==",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "glob": "^7.1.3"
+        "glob": "^13.0.0",
+        "package-json-from-dist": "^1.0.1"
       },
       "bin": {
-        "rimraf": "bin.js"
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": "20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -1173,11 +1218,6 @@
       "bin": {
         "which": "bin/which"
       }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     }
   }
 }
diff --git a/test/smoke/package.json b/test/smoke/package.json
index 8aa629a96dda..1ad72caa65a9 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "ncp": "^2.0.0",
     "node-fetch": "^3.3.2",
-    "rimraf": "3.0.2"
+    "rimraf": "6.1.2"
   },
   "devDependencies": {
     "@types/mocha": "^10.0.10",

From 7263415072e17c8dbda3e22a814b0785418fffc7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 00:26:36 +0000
Subject: [PATCH 1142/1815] Bump @types/node in
 /extensions/html-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.12.5 to 24.10.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.10.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../server/package-lock.json                  | 20 ++++++++++---------
 .../server/package.json                       |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/html-language-features/server/package-lock.json b/extensions/html-language-features/server/package-lock.json
index 52dc4119914d..710e72f1bb63 100644
--- a/extensions/html-language-features/server/package-lock.json
+++ b/extensions/html-language-features/server/package-lock.json
@@ -18,7 +18,7 @@
       },
       "devDependencies": {
         "@types/mocha": "^9.1.1",
-        "@types/node": "20.x"
+        "@types/node": "24.x"
       },
       "engines": {
         "node": "*"
@@ -31,12 +31,13 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.12.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.5.tgz",
-      "integrity": "sha512-BD+BjQ9LS/D8ST9p5uqBxghlN+S42iuNxjsUGjeZobe/ciXzk2qb1B6IXc6AnRLS+yFJRpN2IPEHMzwspfDJNw==",
+      "version": "24.10.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
+      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@vscode/l10n": {
@@ -45,10 +46,11 @@
       "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ=="
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vscode-css-languageservice": {
       "version": "6.3.2",
diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index 9a40c5f97a78..bbbac85f8c05 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -18,7 +18,7 @@
   },
   "devDependencies": {
     "@types/mocha": "^9.1.1",
-    "@types/node": "20.x"
+    "@types/node": "24.x"
   },
   "scripts": {
     "compile": "npx gulp compile-extension:html-language-features-server",

From 898c6f216325593f1d4798a8629ac56416f7fa84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 00:26:46 +0000
Subject: [PATCH 1143/1815] Bump vscode-css-languageservice

Bumps [vscode-css-languageservice](https://github.com/Microsoft/vscode-css-languageservice) from 6.3.2 to 6.3.8.
- [Release notes](https://github.com/Microsoft/vscode-css-languageservice/releases)
- [Changelog](https://github.com/microsoft/vscode-css-languageservice/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/vscode-css-languageservice/compare/v6.3.2...v6.3.8)

---
updated-dependencies:
- dependency-name: vscode-css-languageservice
  dependency-version: 6.3.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../server/package-lock.json                    | 17 +++++++++--------
 .../html-language-features/server/package.json  |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/extensions/html-language-features/server/package-lock.json b/extensions/html-language-features/server/package-lock.json
index 52dc4119914d..e7f02dd33db4 100644
--- a/extensions/html-language-features/server/package-lock.json
+++ b/extensions/html-language-features/server/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.18",
-        "vscode-css-languageservice": "^6.3.2",
+        "vscode-css-languageservice": "^6.3.9",
         "vscode-html-languageservice": "^5.3.2",
         "vscode-languageserver": "^10.0.0-next.15",
         "vscode-languageserver-textdocument": "^1.0.12",
@@ -51,15 +51,15 @@
       "dev": true
     },
     "node_modules/vscode-css-languageservice": {
-      "version": "6.3.2",
-      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.2.tgz",
-      "integrity": "sha512-GEpPxrUTAeXWdZWHev1OJU9lz2Q2/PPBxQ2TIRmLGvQiH3WZbqaNoute0n0ewxlgtjzTW3AKZT+NHySk5Rf4Eg==",
+      "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",
         "vscode-languageserver-textdocument": "^1.0.12",
         "vscode-languageserver-types": "3.17.5",
-        "vscode-uri": "^3.0.8"
+        "vscode-uri": "^3.1.0"
       }
     },
     "node_modules/vscode-html-languageservice": {
@@ -122,9 +122,10 @@
       "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="
     },
     "node_modules/vscode-uri": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
-      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="
+      "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==",
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index 9a40c5f97a78..fa9c4d52a22a 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -10,7 +10,7 @@
   "main": "./out/node/htmlServerMain",
   "dependencies": {
     "@vscode/l10n": "^0.0.18",
-    "vscode-css-languageservice": "^6.3.2",
+    "vscode-css-languageservice": "^6.3.9",
     "vscode-html-languageservice": "^5.3.2",
     "vscode-languageserver": "^10.0.0-next.15",
     "vscode-languageserver-textdocument": "^1.0.12",

From 8c1ef6337de639636b4884a8cd639800e621503e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 03:18:16 +0000
Subject: [PATCH 1144/1815] Bump @types/mocha in
 /extensions/html-language-features/server

Bumps [@types/mocha](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mocha) from 9.1.1 to 10.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mocha)

---
updated-dependencies:
- dependency-name: "@types/mocha"
  dependency-version: 10.0.10
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../html-language-features/server/package-lock.json   | 11 ++++++-----
 extensions/html-language-features/server/package.json |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/html-language-features/server/package-lock.json b/extensions/html-language-features/server/package-lock.json
index 710e72f1bb63..afb1b4f1c101 100644
--- a/extensions/html-language-features/server/package-lock.json
+++ b/extensions/html-language-features/server/package-lock.json
@@ -17,7 +17,7 @@
         "vscode-uri": "^3.0.8"
       },
       "devDependencies": {
-        "@types/mocha": "^9.1.1",
+        "@types/mocha": "^10.0.10",
         "@types/node": "24.x"
       },
       "engines": {
@@ -25,10 +25,11 @@
       }
     },
     "node_modules/@types/mocha": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
-      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
-      "dev": true
+      "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": "24.10.1",
diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index bbbac85f8c05..a4745176bde9 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -17,7 +17,7 @@
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.10",
     "@types/node": "24.x"
   },
   "scripts": {

From d4f75b0ea520f6d153be0db917b04e6a05539bfb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 12:34:12 +0000
Subject: [PATCH 1145/1815] build(deps): Bump vscode-html-languageservice

Bumps [vscode-html-languageservice](https://github.com/Microsoft/vscode-html-languageservice) from 5.3.2 to 5.6.1.
- [Release notes](https://github.com/Microsoft/vscode-html-languageservice/releases)
- [Changelog](https://github.com/microsoft/vscode-html-languageservice/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/vscode-html-languageservice/compare/v5.3.2...v5.6.1)

---
updated-dependencies:
- dependency-name: vscode-html-languageservice
  dependency-version: 5.6.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../html-language-features/server/package-lock.json    | 10 +++++-----
 extensions/html-language-features/server/package.json  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extensions/html-language-features/server/package-lock.json b/extensions/html-language-features/server/package-lock.json
index 4542203f69ad..13a0dd80a061 100644
--- a/extensions/html-language-features/server/package-lock.json
+++ b/extensions/html-language-features/server/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@vscode/l10n": "^0.0.18",
         "vscode-css-languageservice": "^6.3.9",
-        "vscode-html-languageservice": "^5.3.2",
+        "vscode-html-languageservice": "^5.6.1",
         "vscode-languageserver": "^10.0.0-next.15",
         "vscode-languageserver-textdocument": "^1.0.12",
         "vscode-uri": "^3.0.8"
@@ -66,15 +66,15 @@
       }
     },
     "node_modules/vscode-html-languageservice": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.2.tgz",
-      "integrity": "sha512-3MgFQqVG+iQVNG7QI/slaoL7lJpne0nssX082kjUF1yn/YJa8BWCLeCJjM0YpTlp8A7JT1+J22mk4qSPx3NjSQ==",
+      "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",
         "vscode-languageserver-textdocument": "^1.0.12",
         "vscode-languageserver-types": "^3.17.5",
-        "vscode-uri": "^3.0.8"
+        "vscode-uri": "^3.1.0"
       }
     },
     "node_modules/vscode-jsonrpc": {
diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index 25762f142759..5cd6de26bc3c 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@vscode/l10n": "^0.0.18",
     "vscode-css-languageservice": "^6.3.9",
-    "vscode-html-languageservice": "^5.3.2",
+    "vscode-html-languageservice": "^5.6.1",
     "vscode-languageserver": "^10.0.0-next.15",
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.0.8"

From 147bf9323aeb1a23d64bb15421792d54333b8a34 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 12:35:51 +0000
Subject: [PATCH 1146/1815] build(deps): Bump vscode-oniguruma from 1.7.0 to
 2.0.1 in /remote/web

Bumps [vscode-oniguruma](https://github.com/microsoft/vscode-oniguruma) from 1.7.0 to 2.0.1.
- [Commits](https://github.com/microsoft/vscode-oniguruma/compare/v1.7.0...v2.0.1)

---
updated-dependencies:
- dependency-name: vscode-oniguruma
  dependency-version: 2.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 15 ++++++++-------
 remote/web/package.json      |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index d96ca18a579d..1445965965ff 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -24,7 +24,7 @@
 				"@xterm/xterm": "^5.6.0-beta.98",
 				"jschardet": "3.1.4",
 				"tas-client-umd": "0.2.0",
-				"vscode-oniguruma": "1.7.0",
+				"vscode-oniguruma": "2.0.1",
 				"vscode-textmate": "9.2.0"
 			}
 		},
@@ -83,9 +83,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@vscode/vscode-languagedetection": {
-			"version": "1.0.22",
-			"resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.22.tgz",
-			"integrity": "sha512-rQ/BgMyLuIXSmbA0MSkIPHtcOw14QkeDbAq19sjvaS9LTRr905yij0S8lsyqN5JgOsbtIx7pAcyOxFMzPmqhZQ==",
+			"version": "1.0.21",
+			"resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz",
+			"integrity": "sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g==",
 			"license": "MIT",
 			"bin": {
 				"vscode-languagedetection": "cli/index.js"
@@ -274,9 +274,10 @@
 			"license": "MIT"
 		},
 		"node_modules/vscode-oniguruma": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
-			"integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA=="
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-2.0.1.tgz",
+			"integrity": "sha512-poJU8iHIWnC3vgphJnrLZyI3YdqRlR27xzqDmpPXYzA93R4Gk8z7T6oqDzDoHjoikA2aS82crdXFkjELCdJsjQ==",
+			"license": "MIT"
 		},
 		"node_modules/vscode-textmate": {
 			"version": "9.2.0",
diff --git a/remote/web/package.json b/remote/web/package.json
index f3ad3fa60475..1e99bce736bb 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -19,7 +19,7 @@
 		"@xterm/xterm": "^5.6.0-beta.98",
 		"jschardet": "3.1.4",
 		"tas-client-umd": "0.2.0",
-		"vscode-oniguruma": "1.7.0",
+		"vscode-oniguruma": "2.0.1",
 		"vscode-textmate": "9.2.0"
 	}
 }

From 9bff60fb4652a213e1ca3a9629fd7891173361be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 12:36:32 +0000
Subject: [PATCH 1147/1815] build(deps): Bump @xterm/addon-serialize in /remote

Bumps [@xterm/addon-serialize](https://github.com/xtermjs/xterm.js) from 0.14.0-beta.98 to 0.14.0-beta.140.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-serialize"
  dependency-version: 0.14.0-beta.140
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 230ea49e05e7..1a1d76c0c12d 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -25,7 +25,7 @@
         "@xterm/addon-ligatures": "^0.10.0-beta.140",
         "@xterm/addon-progress": "^0.2.0-beta.4",
         "@xterm/addon-search": "^0.16.0-beta.98",
-        "@xterm/addon-serialize": "^0.14.0-beta.98",
+        "@xterm/addon-serialize": "^0.14.0-beta.140",
         "@xterm/addon-unicode11": "^0.9.0-beta.98",
         "@xterm/addon-webgl": "^0.19.0-beta.98",
         "@xterm/headless": "^5.6.0-beta.98",
@@ -580,12 +580,12 @@
       }
     },
     "node_modules/@xterm/addon-serialize": {
-      "version": "0.14.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.98.tgz",
-      "integrity": "sha512-Tsr8j3wnun2raYR1DgsNClQP/I5a85u/uW/5EiYH+/iPPua6EWJvPlr5Q6TCU/cdIKW1o27Z3L5/mw0pfMUXrQ==",
+      "version": "0.14.0-beta.140",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.140.tgz",
+      "integrity": "sha512-HpQ+r/L1uvfZPCVzrxzwMlOcFaMFg0pvrmow/1ZBpYwJellOgPtvYA9pgS4dCSatv0S7hCgUnqb0eLEnzaX7ig==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.140"
       }
     },
     "node_modules/@xterm/addon-unicode11": {
diff --git a/remote/package.json b/remote/package.json
index 7d15d14359eb..bdeb52ef42b3 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -20,7 +20,7 @@
     "@xterm/addon-ligatures": "^0.10.0-beta.140",
     "@xterm/addon-progress": "^0.2.0-beta.4",
     "@xterm/addon-search": "^0.16.0-beta.98",
-    "@xterm/addon-serialize": "^0.14.0-beta.98",
+    "@xterm/addon-serialize": "^0.14.0-beta.140",
     "@xterm/addon-unicode11": "^0.9.0-beta.98",
     "@xterm/addon-webgl": "^0.19.0-beta.98",
     "@xterm/headless": "^5.6.0-beta.98",

From e66e8b2551372410431cccc2085767aa29f674dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 12:36:35 +0000
Subject: [PATCH 1148/1815] build(deps): Bump https-proxy-agent from 7.0.5 to
 7.0.6

Bumps [https-proxy-agent](https://github.com/TooTallNate/proxy-agents/tree/HEAD/packages/https-proxy-agent) from 7.0.5 to 7.0.6.
- [Release notes](https://github.com/TooTallNate/proxy-agents/releases)
- [Changelog](https://github.com/TooTallNate/proxy-agents/blob/main/packages/https-proxy-agent/CHANGELOG.md)
- [Commits](https://github.com/TooTallNate/proxy-agents/commits/https-proxy-agent@7.0.6/packages/https-proxy-agent)

---
updated-dependencies:
- dependency-name: https-proxy-agent
  dependency-version: 7.0.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 21 ++++++++++-----------
 package.json      |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b2eb63eaddac..ddba789a6652 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,7 +38,7 @@
         "@xterm/headless": "^5.6.0-beta.98",
         "@xterm/xterm": "^5.6.0-beta.98",
         "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.6",
         "jschardet": "3.1.4",
         "kerberos": "2.1.1",
         "minimist": "^1.2.6",
@@ -3643,12 +3643,10 @@
       }
     },
     "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"
-      },
+      "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": ">= 14"
       }
@@ -9179,11 +9177,12 @@
       }
     },
     "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==",
+      "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.0.2",
+        "agent-base": "^7.1.2",
         "debug": "4"
       },
       "engines": {
diff --git a/package.json b/package.json
index a226d17af1fe..2cf0ff420d08 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "@xterm/headless": "^5.6.0-beta.98",
     "@xterm/xterm": "^5.6.0-beta.98",
     "http-proxy-agent": "^7.0.0",
-    "https-proxy-agent": "^7.0.2",
+    "https-proxy-agent": "^7.0.6",
     "jschardet": "3.1.4",
     "kerberos": "2.1.1",
     "minimist": "^1.2.6",

From 9e05a2d5901e990db8f3c3a098fbf75b9208f901 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 12:36:39 +0000
Subject: [PATCH 1149/1815] build(deps): Bump @microsoft/1ds-core-js in /remote

Bumps [@microsoft/1ds-core-js](https://github.com/microsoft/ApplicationInsights-JS) from 3.2.13 to 4.3.10.
- [Release notes](https://github.com/microsoft/ApplicationInsights-JS/releases)
- [Changelog](https://github.com/microsoft/ApplicationInsights-JS/blob/main/RELEASES.md)
- [Commits](https://github.com/microsoft/ApplicationInsights-JS/commits)

---
updated-dependencies:
- dependency-name: "@microsoft/1ds-core-js"
  dependency-version: 4.3.10
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 97 ++++++++++++++++++++++++++++++++++++----
 remote/package.json      |  2 +-
 2 files changed, 90 insertions(+), 9 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 230ea49e05e7..26be46186f5a 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -8,7 +8,7 @@
       "name": "vscode-reh",
       "version": "0.0.0",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^3.2.13",
+        "@microsoft/1ds-core-js": "^4.3.10",
         "@microsoft/1ds-post-js": "^3.2.13",
         "@parcel/watcher": "2.5.1",
         "@vscode/deviceid": "^0.1.2",
@@ -47,13 +47,34 @@
       }
     },
     "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==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
+      "integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "2.8.15",
-        "@microsoft/applicationinsights-shims": "^2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.7"
+        "@microsoft/applicationinsights-core-js": "3.3.10",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-core-js/node_modules/@microsoft/applicationinsights-shims": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "license": "MIT",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-core-js/node_modules/@microsoft/dynamicproto-js": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "license": "MIT",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
@@ -66,10 +87,22 @@
         "@microsoft/dynamicproto-js": "^1.1.7"
       }
     },
-    "node_modules/@microsoft/applicationinsights-core-js": {
+    "node_modules/@microsoft/1ds-post-js/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==",
+      "license": "MIT",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "2.8.15",
+        "@microsoft/applicationinsights-shims": "^2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.7"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js/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==",
+      "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "2.0.2",
         "@microsoft/dynamicproto-js": "^1.1.9"
@@ -78,6 +111,39 @@
         "tslib": "*"
       }
     },
+    "node_modules/@microsoft/applicationinsights-core-js": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.10.tgz",
+      "integrity": "sha512-5yKeyassZTq2l+SAO4npu6LPnbS++UD+M+Ghjm9uRzoBwD8tumFx0/F8AkSVqbniSREd+ztH/2q2foewa2RZyg==",
+      "license": "MIT",
+      "dependencies": {
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": ">= 1.0.0"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-core-js/node_modules/@microsoft/applicationinsights-shims": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "license": "MIT",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-core-js/node_modules/@microsoft/dynamicproto-js": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "license": "MIT",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
+      }
+    },
     "node_modules/@microsoft/applicationinsights-shims": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz",
@@ -88,6 +154,21 @@
       "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.9.tgz",
       "integrity": "sha512-n1VPsljTSkthsAFYdiWfC+DKzK2WwcRp83Y1YAqdX552BstvsDjft9YXppjUzp11BPsapDoO1LDgrDB0XVsfNQ=="
     },
+    "node_modules/@nevware21/ts-async": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
+      "integrity": "sha512-IBTyj29GwGlxfzXw2NPnzty+w0Adx61Eze1/lknH/XIVdxtF9UnOpk76tnrHXWa6j84a1RR9hsOcHQPFv9qJjA==",
+      "license": "MIT",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.11.6 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-utils": {
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
+      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
+      "license": "MIT"
+    },
     "node_modules/@parcel/watcher": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
diff --git a/remote/package.json b/remote/package.json
index 7d15d14359eb..ec8ca6c86c82 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@microsoft/1ds-core-js": "^3.2.13",
+    "@microsoft/1ds-core-js": "^4.3.10",
     "@microsoft/1ds-post-js": "^3.2.13",
     "@parcel/watcher": "2.5.1",
     "@vscode/deviceid": "^0.1.2",

From 47af53f2b1d4f667c04f96cc1e88375a86a7dfa8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 12:36:44 +0000
Subject: [PATCH 1150/1815] build(deps-dev): Bump @types/node-fetch in
 /test/smoke

Bumps [@types/node-fetch](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node-fetch) from 2.5.10 to 2.6.13.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node-fetch)

---
updated-dependencies:
- dependency-name: "@types/node-fetch"
  dependency-version: 2.6.13
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/smoke/package-lock.json | 28 ++++++++++++++++------------
 test/smoke/package.json      |  2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/test/smoke/package-lock.json b/test/smoke/package-lock.json
index 91904b5ac2d9..06c76287b2ae 100644
--- a/test/smoke/package-lock.json
+++ b/test/smoke/package-lock.json
@@ -17,7 +17,7 @@
         "@types/mocha": "^10.0.10",
         "@types/ncp": "2.0.8",
         "@types/node": "24.x",
-        "@types/node-fetch": "^2.5.10",
+        "@types/node-fetch": "^2.6.13",
         "@types/rimraf": "3.0.2",
         "npm-run-all": "^4.1.5"
       }
@@ -94,13 +94,14 @@
       }
     },
     "node_modules/@types/node-fetch": {
-      "version": "2.5.10",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.10.tgz",
-      "integrity": "sha512-IpkX0AasN44hgEad0gEF/V6EgR5n69VEqPEgnmoM8GsIGro3PowbWs4tR6IhxUTyPLpOn+fiGG6nrQhcmoCuIQ==",
+      "version": "2.6.13",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.13.tgz",
+      "integrity": "sha512-QGpRVpzSaUs30JBSGPjOg4Uveu384erbHBoT1zeONvyCfwQxIkUshLAOqN/k9EjGviPRmWTTe6aH2qySWKTVSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
-        "form-data": "^3.0.0"
+        "form-data": "^4.0.4"
       }
     },
     "node_modules/@types/rimraf": {
@@ -128,8 +129,9 @@
     "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
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/balanced-match": {
       "version": "1.0.0",
@@ -209,6 +211,7 @@
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -262,8 +265,9 @@
     "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==",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -417,9 +421,9 @@
       }
     },
     "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==",
+      "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": {
@@ -427,7 +431,7 @@
         "combined-stream": "^1.0.8",
         "es-set-tostringtag": "^2.1.0",
         "hasown": "^2.0.2",
-        "mime-types": "^2.1.35"
+        "mime-types": "^2.1.12"
       },
       "engines": {
         "node": ">= 6"
diff --git a/test/smoke/package.json b/test/smoke/package.json
index 541dfd941219..2eb961957917 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -19,7 +19,7 @@
     "@types/mocha": "^10.0.10",
     "@types/ncp": "2.0.8",
     "@types/node": "24.x",
-    "@types/node-fetch": "^2.5.10",
+    "@types/node-fetch": "^2.6.13",
     "@types/rimraf": "3.0.2",
     "npm-run-all": "^4.1.5"
   }

From 008a09f750d93494aba07101a9fca83078a571a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 12:36:47 +0000
Subject: [PATCH 1151/1815] build(deps): Bump @xterm/addon-clipboard in /remote

Bumps [@xterm/addon-clipboard](https://github.com/xtermjs/xterm.js) from 0.2.0-beta.81 to 0.2.0-beta.123.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-clipboard"
  dependency-version: 0.2.0-beta.123
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 230ea49e05e7..44065698be49 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -20,7 +20,7 @@
         "@vscode/vscode-languagedetection": "1.0.21",
         "@vscode/windows-process-tree": "^0.6.2",
         "@vscode/windows-registry": "^1.1.0",
-        "@xterm/addon-clipboard": "^0.2.0-beta.81",
+        "@xterm/addon-clipboard": "^0.2.0-beta.123",
         "@xterm/addon-image": "^0.9.0-beta.140",
         "@xterm/addon-ligatures": "^0.10.0-beta.140",
         "@xterm/addon-progress": "^0.2.0-beta.4",
@@ -525,15 +525,15 @@
       "hasInstallScript": true
     },
     "node_modules/@xterm/addon-clipboard": {
-      "version": "0.2.0-beta.81",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.81.tgz",
-      "integrity": "sha512-vDxRyBO9VHzsl+gUQsDlUM9o2ZxSJKzE2eYQtuILKcf5D0EXYI86aMwKT/1iguX41vcMg42WXQBQ0TLWZ2MyTQ==",
+      "version": "0.2.0-beta.123",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.123.tgz",
+      "integrity": "sha512-gMlaxEpToN5CThRVf0+zf8m69PHd+y/o/IgEmMMEquFWddl58QDxG2cBdiJRwYMq7K23KdtJasitYE80Ygn88Q==",
       "license": "MIT",
       "dependencies": {
         "js-base64": "^3.7.5"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^5.6.0-beta.140"
       }
     },
     "node_modules/@xterm/addon-image": {
diff --git a/remote/package.json b/remote/package.json
index 7d15d14359eb..f367bd2506d8 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -15,7 +15,7 @@
     "@vscode/vscode-languagedetection": "1.0.21",
     "@vscode/windows-process-tree": "^0.6.2",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-clipboard": "^0.2.0-beta.81",
+    "@xterm/addon-clipboard": "^0.2.0-beta.123",
     "@xterm/addon-image": "^0.9.0-beta.140",
     "@xterm/addon-ligatures": "^0.10.0-beta.140",
     "@xterm/addon-progress": "^0.2.0-beta.4",

From 934408bb6cd9d2e25cda8d77bed9a63f10423670 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 12:37:10 +0000
Subject: [PATCH 1152/1815] Bump vscode-languageserver in
 /extensions/json-language-features/server

Bumps [vscode-languageserver](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/server) from 10.0.0-next.11 to 10.0.0-next.15.
- [Release notes](https://github.com/Microsoft/vscode-languageserver-node/releases)
- [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/client/10.0.0-next.15/server)

---
updated-dependencies:
- dependency-name: vscode-languageserver
  dependency-version: 10.0.0-next.15
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../server/package-lock.json                  | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/extensions/json-language-features/server/package-lock.json b/extensions/json-language-features/server/package-lock.json
index 384ce045c9c6..99f830466552 100644
--- a/extensions/json-language-features/server/package-lock.json
+++ b/extensions/json-language-features/server/package-lock.json
@@ -77,38 +77,41 @@
       }
     },
     "node_modules/vscode-jsonrpc": {
-      "version": "9.0.0-next.6",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.6.tgz",
-      "integrity": "sha512-KCSvUNsFiVciG9iqjJKBZOd66CN3ZKohDlYRmoOi+pd8l15MFLZ8wRG4c+wuzePGba/8WcCG2TM+C/GVlvuaeA==",
+      "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.11",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.11.tgz",
-      "integrity": "sha512-cmobSrVDYhlh/t02vz/bV8nNpds8mus5HnILULae2iAvOjoaJPnTAp0jJWoYdUqTpIVzT9JV6JMKqLEvdqpeqg==",
+      "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.11"
+        "vscode-languageserver-protocol": "3.17.6-next.15"
       },
       "bin": {
         "installServerIntoExtension": "bin/installServerIntoExtension"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "version": "3.17.6-next.11",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.11.tgz",
-      "integrity": "sha512-GeJxEp1TiLsp79f8WG5n10wLViXfgFKb99hU9K8m7KDWM95/QFEqWkm79f9LVm54tUK74I91a9EeiQLCS/FABQ==",
+      "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.6",
-        "vscode-languageserver-types": "3.17.6-next.5"
+        "vscode-jsonrpc": "9.0.0-next.10",
+        "vscode-languageserver-types": "3.17.6-next.6"
       }
     },
     "node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": {
-      "version": "3.17.6-next.5",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.5.tgz",
-      "integrity": "sha512-QFmf3Yl1tCgUQfA77N9Me/LXldJXkIVypQbty2rJ1DNHQkC+iwvm4Z2tXg9czSwlhvv0pD4pbF5mT7WhAglolw=="
+      "version": "3.17.6-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.6.tgz",
+      "integrity": "sha512-aiJY5/yW+xzw7KPNlwi3gQtddq/3EIn5z8X8nCgJfaiAij2R1APKePngv+MUdLdYJBVTLu+Qa0ODsT+pHgYguQ==",
+      "license": "MIT"
     },
     "node_modules/vscode-languageserver-textdocument": {
       "version": "1.0.12",

From 5a8d55c10f2a2c69c0ef50df87a0fc559f4c1195 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 12:37:14 +0000
Subject: [PATCH 1153/1815] Bump vscode-languageserver in
 /extensions/css-language-features/server

Bumps [vscode-languageserver](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/server) from 10.0.0-next.11 to 10.0.0-next.15.
- [Release notes](https://github.com/Microsoft/vscode-languageserver-node/releases)
- [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/client/10.0.0-next.15/server)

---
updated-dependencies:
- dependency-name: vscode-languageserver
  dependency-version: 10.0.0-next.15
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../server/package-lock.json                  | 35 ++++++++++---------
 .../css-language-features/server/package.json |  2 +-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/extensions/css-language-features/server/package-lock.json b/extensions/css-language-features/server/package-lock.json
index b9c936d84bf8..a1f019c5731b 100644
--- a/extensions/css-language-features/server/package-lock.json
+++ b/extensions/css-language-features/server/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@vscode/l10n": "^0.0.18",
         "vscode-css-languageservice": "^6.3.2",
-        "vscode-languageserver": "^10.0.0-next.11",
+        "vscode-languageserver": "^10.0.0-next.15",
         "vscode-uri": "^3.0.8"
       },
       "devDependencies": {
@@ -61,38 +61,41 @@
       }
     },
     "node_modules/vscode-jsonrpc": {
-      "version": "9.0.0-next.6",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.6.tgz",
-      "integrity": "sha512-KCSvUNsFiVciG9iqjJKBZOd66CN3ZKohDlYRmoOi+pd8l15MFLZ8wRG4c+wuzePGba/8WcCG2TM+C/GVlvuaeA==",
+      "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.11",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.11.tgz",
-      "integrity": "sha512-cmobSrVDYhlh/t02vz/bV8nNpds8mus5HnILULae2iAvOjoaJPnTAp0jJWoYdUqTpIVzT9JV6JMKqLEvdqpeqg==",
+      "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.11"
+        "vscode-languageserver-protocol": "3.17.6-next.15"
       },
       "bin": {
         "installServerIntoExtension": "bin/installServerIntoExtension"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "version": "3.17.6-next.11",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.11.tgz",
-      "integrity": "sha512-GeJxEp1TiLsp79f8WG5n10wLViXfgFKb99hU9K8m7KDWM95/QFEqWkm79f9LVm54tUK74I91a9EeiQLCS/FABQ==",
+      "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.6",
-        "vscode-languageserver-types": "3.17.6-next.5"
+        "vscode-jsonrpc": "9.0.0-next.10",
+        "vscode-languageserver-types": "3.17.6-next.6"
       }
     },
     "node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": {
-      "version": "3.17.6-next.5",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.5.tgz",
-      "integrity": "sha512-QFmf3Yl1tCgUQfA77N9Me/LXldJXkIVypQbty2rJ1DNHQkC+iwvm4Z2tXg9czSwlhvv0pD4pbF5mT7WhAglolw=="
+      "version": "3.17.6-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.6.tgz",
+      "integrity": "sha512-aiJY5/yW+xzw7KPNlwi3gQtddq/3EIn5z8X8nCgJfaiAij2R1APKePngv+MUdLdYJBVTLu+Qa0ODsT+pHgYguQ==",
+      "license": "MIT"
     },
     "node_modules/vscode-languageserver-textdocument": {
       "version": "1.0.12",
diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json
index 9b6a8b47d6b8..324c331747e0 100644
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@vscode/l10n": "^0.0.18",
     "vscode-css-languageservice": "^6.3.2",
-    "vscode-languageserver": "^10.0.0-next.11",
+    "vscode-languageserver": "^10.0.0-next.15",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {

From ca9085b886b88ad99f071fffcfb36affe10daf13 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 12:37:56 +0000
Subject: [PATCH 1154/1815] Bump vscode-uri in
 /extensions/json-language-features/server

Bumps [vscode-uri](https://github.com/microsoft/vscode-uri) from 3.0.8 to 3.1.0.
- [Release notes](https://github.com/microsoft/vscode-uri/releases)
- [Commits](https://github.com/microsoft/vscode-uri/compare/v3.0.8...v3.1.0)

---
updated-dependencies:
- dependency-name: vscode-uri
  dependency-version: 3.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/json-language-features/server/package-lock.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/extensions/json-language-features/server/package-lock.json b/extensions/json-language-features/server/package-lock.json
index 384ce045c9c6..e8ef5a1535bc 100644
--- a/extensions/json-language-features/server/package-lock.json
+++ b/extensions/json-language-features/server/package-lock.json
@@ -121,9 +121,10 @@
       "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="
     },
     "node_modules/vscode-uri": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
-      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="
+      "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==",
+      "license": "MIT"
     }
   }
 }

From df2ac50d0322f064bc546ec07bd4a318f40769a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 12:38:24 +0000
Subject: [PATCH 1155/1815] Bump vscode-uri from 2.0.0 to 3.1.0 in
 /extensions/git

Bumps [vscode-uri](https://github.com/microsoft/vscode-uri) from 2.0.0 to 3.1.0.
- [Release notes](https://github.com/microsoft/vscode-uri/releases)
- [Commits](https://github.com/microsoft/vscode-uri/compare/v2.0.0...v3.1.0)

---
updated-dependencies:
- dependency-name: vscode-uri
  dependency-version: 3.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 9 +++++----
 extensions/git/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index bc150555c70c..6b7350d12599 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -16,7 +16,7 @@
         "file-type": "16.5.4",
         "jschardet": "3.1.4",
         "picomatch": "2.3.1",
-        "vscode-uri": "^2.0.0",
+        "vscode-uri": "^3.1.0",
         "which": "4.0.0"
       },
       "devDependencies": {
@@ -410,9 +410,10 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "node_modules/vscode-uri": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.0.0.tgz",
-      "integrity": "sha512-lWXWofDSYD8r/TIyu64MdwB4FaSirQ608PP/TzUyslyOeHGwQ0eTHUZeJrK1ILOmwUHaJtV693m2JoUYroUDpw=="
+      "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==",
+      "license": "MIT"
     },
     "node_modules/which": {
       "version": "4.0.0",
diff --git a/extensions/git/package.json b/extensions/git/package.json
index a117e45d0259..b12a426f1c0e 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3567,7 +3567,7 @@
     "file-type": "16.5.4",
     "jschardet": "3.1.4",
     "picomatch": "2.3.1",
-    "vscode-uri": "^2.0.0",
+    "vscode-uri": "^3.1.0",
     "which": "4.0.0"
   },
   "devDependencies": {

From 67bbdbcf609cdd42fa943567c3f6bf6b26645f6c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 12:38:55 +0000
Subject: [PATCH 1156/1815] Bump @types/node in
 /extensions/typescript-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 24.10.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.10.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 20 ++++++++++---------
 .../typescript-language-features/package.json |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/typescript-language-features/package-lock.json b/extensions/typescript-language-features/package-lock.json
index 4f97eb1048c4..98b19d93a77a 100644
--- a/extensions/typescript-language-features/package-lock.json
+++ b/extensions/typescript-language-features/package-lock.json
@@ -20,7 +20,7 @@
         "vscode-uri": "^3.0.3"
       },
       "devDependencies": {
-        "@types/node": "20.x",
+        "@types/node": "24.x",
         "@types/semver": "^5.5.0"
       },
       "engines": {
@@ -152,12 +152,13 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "24.10.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
+      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@types/semver": {
@@ -257,10 +258,11 @@
       "integrity": "sha512-V+uqV66BOQnWxvI6HjDnE4VkInmYZUQ4dgB7gzaDyFyFSK1i1nF/j7DpS9UbQAgV9NaF1XpcyuavnM1qOeiEIg=="
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vscode-tas-client": {
       "version": "0.1.84",
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 322bab13b1cf..cdef9fc8662f 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -48,7 +48,7 @@
     "vscode-uri": "^3.0.3"
   },
   "devDependencies": {
-    "@types/node": "20.x",
+    "@types/node": "24.x",
     "@types/semver": "^5.5.0"
   },
   "scripts": {

From e3fdc813ffc9c8898c203f44a2a16240f29bf02f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 12:39:08 +0000
Subject: [PATCH 1157/1815] Bump vscode-uri in
 /extensions/typescript-language-features

Bumps [vscode-uri](https://github.com/microsoft/vscode-uri) from 3.0.3 to 3.1.0.
- [Release notes](https://github.com/microsoft/vscode-uri/releases)
- [Commits](https://github.com/microsoft/vscode-uri/compare/v3.0.3...v3.1.0)

---
updated-dependencies:
- dependency-name: vscode-uri
  dependency-version: 3.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 21 +++++++++++++++----
 .../typescript-language-features/package.json |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/extensions/typescript-language-features/package-lock.json b/extensions/typescript-language-features/package-lock.json
index 4f97eb1048c4..1ec39aef86a6 100644
--- a/extensions/typescript-language-features/package-lock.json
+++ b/extensions/typescript-language-features/package-lock.json
@@ -17,7 +17,7 @@
         "jsonc-parser": "^3.2.0",
         "semver": "7.5.2",
         "vscode-tas-client": "^0.1.84",
-        "vscode-uri": "^3.0.3"
+        "vscode-uri": "^3.1.0"
       },
       "devDependencies": {
         "@types/node": "20.x",
@@ -192,6 +192,12 @@
         "node": ">=16.15.1"
       }
     },
+    "node_modules/@vscode/sync-api-client/node_modules/vscode-uri": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz",
+      "integrity": "sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==",
+      "license": "MIT"
+    },
     "node_modules/@vscode/sync-api-common": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/@vscode/sync-api-common/-/sync-api-common-0.7.2.tgz",
@@ -213,6 +219,12 @@
         "vscode": "^1.67.0"
       }
     },
+    "node_modules/@vscode/sync-api-service/node_modules/vscode-uri": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz",
+      "integrity": "sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==",
+      "license": "MIT"
+    },
     "node_modules/@vscode/ts-package-manager": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/@vscode/ts-package-manager/-/ts-package-manager-0.0.2.tgz",
@@ -274,9 +286,10 @@
       }
     },
     "node_modules/vscode-uri": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz",
-      "integrity": "sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA=="
+      "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==",
+      "license": "MIT"
     },
     "node_modules/yallist": {
       "version": "4.0.0",
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 322bab13b1cf..1ad3e2f06aa1 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -45,7 +45,7 @@
     "jsonc-parser": "^3.2.0",
     "semver": "7.5.2",
     "vscode-tas-client": "^0.1.84",
-    "vscode-uri": "^3.0.3"
+    "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
     "@types/node": "20.x",

From 77193cd5c8d88dc17466d1b6ce3b4cad6a82b917 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 12:39:32 +0000
Subject: [PATCH 1158/1815] Bump @types/node from 20.11.24 to 24.10.1 in
 /test/automation

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 24.10.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.10.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/automation/package-lock.json | 20 +++++++++++---------
 test/automation/package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
index 600dfed9f4cd..dcd267ade731 100644
--- a/test/automation/package-lock.json
+++ b/test/automation/package-lock.json
@@ -16,7 +16,7 @@
       },
       "devDependencies": {
         "@types/ncp": "2.0.1",
-        "@types/node": "20.x",
+        "@types/node": "24.x",
         "@types/tmp": "0.2.2",
         "cpx2": "3.0.0",
         "nodemon": "^3.1.9",
@@ -33,12 +33,13 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "24.10.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
+      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@types/tmp": {
@@ -1257,10 +1258,11 @@
       "license": "MIT"
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/universalify": {
       "version": "2.0.0",
diff --git a/test/automation/package.json b/test/automation/package.json
index 0b7e28976206..4915bf72483f 100644
--- a/test/automation/package.json
+++ b/test/automation/package.json
@@ -25,7 +25,7 @@
   },
   "devDependencies": {
     "@types/ncp": "2.0.1",
-    "@types/node": "20.x",
+    "@types/node": "24.x",
     "@types/tmp": "0.2.2",
     "cpx2": "3.0.0",
     "nodemon": "^3.1.9",

From 0fef2501bea971ac97aab51b2859ce37ddc2187a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 18:56:36 +0000
Subject: [PATCH 1159/1815] Bump file-type from 16.5.4 to 21.1.1 in
 /extensions/git

Bumps [file-type](https://github.com/sindresorhus/file-type) from 16.5.4 to 21.1.1.
- [Release notes](https://github.com/sindresorhus/file-type/releases)
- [Commits](https://github.com/sindresorhus/file-type/compare/v16.5.4...v21.1.1)

---
updated-dependencies:
- dependency-name: file-type
  dependency-version: 21.1.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 179 +++++++++++++++----------------
 extensions/git/package.json      |   2 +-
 2 files changed, 86 insertions(+), 95 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index 6b7350d12599..e0b5d9036b9f 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -13,7 +13,7 @@
         "@vscode/extension-telemetry": "^0.9.8",
         "@vscode/iconv-lite-umd": "0.7.0",
         "byline": "^5.0.0",
-        "file-type": "16.5.4",
+        "file-type": "21.1.1",
         "jschardet": "3.1.4",
         "picomatch": "2.3.1",
         "vscode-uri": "^3.1.0",
@@ -30,6 +30,16 @@
         "vscode": "^1.5.0"
       }
     },
+    "node_modules/@borewit/text-codec": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@borewit/text-codec/-/text-codec-0.1.1.tgz",
+      "integrity": "sha512-5L/uBxmjaCIX5h8Z+uu+kA9BQLkc/Wl06UGR5ajNRxu+/XjonB5i8JpgFMrPj3LXTCPA0pv8yxUvbUi+QthGGA==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
     "node_modules/@joaomoreno/unique-names-generator": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/@joaomoreno/unique-names-generator/-/unique-names-generator-5.2.0.tgz",
@@ -163,10 +173,28 @@
       "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
       "license": "MIT"
     },
+    "node_modules/@tokenizer/inflate": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@tokenizer/inflate/-/inflate-0.4.1.tgz",
+      "integrity": "sha512-2mAv+8pkG6GIZiF1kNg1jAjh27IDxEPKwdGul3snfztFerfPGI1LjDezZp3i7BElXompqEtPmoPx6c2wgtWsOA==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.4.3",
+        "token-types": "^6.1.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Borewit"
+      }
+    },
     "node_modules/@tokenizer/token": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz",
-      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="
+      "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==",
+      "license": "MIT"
     },
     "node_modules/@types/byline": {
       "version": "4.2.31",
@@ -231,17 +259,36 @@
         "node": ">=0.10.0"
       }
     },
+    "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/file-type": {
-      "version": "16.5.4",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz",
-      "integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-21.1.1.tgz",
+      "integrity": "sha512-ifJXo8zUqbQ/bLbl9sFoqHNTNWbnPY1COImFfM6CCy7z+E+jC1eY9YfOKkx0fckIg+VljAy2/87T61fp0+eEkg==",
+      "license": "MIT",
       "dependencies": {
-        "readable-web-to-node-stream": "^3.0.0",
-        "strtok3": "^6.2.4",
-        "token-types": "^4.1.1"
+        "@tokenizer/inflate": "^0.4.1",
+        "strtok3": "^10.3.4",
+        "token-types": "^6.1.1",
+        "uint8array-extras": "^1.4.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sindresorhus/file-type?sponsor=1"
@@ -264,12 +311,8 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+      ],
+      "license": "BSD-3-Clause"
     },
     "node_modules/isexe": {
       "version": "3.1.1",
@@ -288,17 +331,11 @@
         "node": ">=0.1.90"
       }
     },
-    "node_modules/peek-readable": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz",
-      "integrity": "sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Borewit"
-      }
+    "node_modules/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/picomatch": {
       "version": "2.3.1",
@@ -311,91 +348,50 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/readable-web-to-node-stream": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
-      "integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
+    "node_modules/strtok3": {
+      "version": "10.3.4",
+      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-10.3.4.tgz",
+      "integrity": "sha512-KIy5nylvC5le1OdaaoCJ07L+8iQzJHGH6pWDuzS+d07Cu7n1MZ2x26P8ZKIWfbK02+XIL8Mp4RkWeqdUCrDMfg==",
+      "license": "MIT",
       "dependencies": {
-        "readable-stream": "^3.6.0"
+        "@tokenizer/token": "^0.3.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/Borewit"
       }
     },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/strtok3": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz",
-      "integrity": "sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==",
+    "node_modules/token-types": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/token-types/-/token-types-6.1.1.tgz",
+      "integrity": "sha512-kh9LVIWH5CnL63Ipf0jhlBIy0UsrMj/NJDfpsy1SqOXlLKEVyXXYrnFxFT1yOOYVGBSApeVnjPw/sBz5BfEjAQ==",
+      "license": "MIT",
       "dependencies": {
+        "@borewit/text-codec": "^0.1.0",
         "@tokenizer/token": "^0.3.0",
-        "peek-readable": "^4.1.0"
+        "ieee754": "^1.2.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=14.16"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/Borewit"
       }
     },
-    "node_modules/token-types": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/token-types/-/token-types-4.2.0.tgz",
-      "integrity": "sha512-P0rrp4wUpefLncNamWIef62J0v0kQR/GfDVji9WKY7GDCWy5YbVSrKUTam07iWPZQGy0zWNOfstYTykMmPNR7w==",
-      "dependencies": {
-        "@tokenizer/token": "^0.3.0",
-        "ieee754": "^1.2.1"
-      },
+    "node_modules/uint8array-extras": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/uint8array-extras/-/uint8array-extras-1.5.0.tgz",
+      "integrity": "sha512-rvKSBiC5zqCCiDZ9kAOszZcDvdAHwwIKJG33Ykj43OKcWsnmcBRL09YTU4nOeHZ8Y2a7l1MgTd08SBe9A8Qj6A==",
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/Borewit"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/undici-types": {
@@ -404,11 +400,6 @@
       "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
       "dev": true
     },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-    },
     "node_modules/vscode-uri": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
diff --git a/extensions/git/package.json b/extensions/git/package.json
index b12a426f1c0e..6dcaac256c0e 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3564,7 +3564,7 @@
     "@vscode/extension-telemetry": "^0.9.8",
     "@vscode/iconv-lite-umd": "0.7.0",
     "byline": "^5.0.0",
-    "file-type": "16.5.4",
+    "file-type": "21.1.1",
     "jschardet": "3.1.4",
     "picomatch": "2.3.1",
     "vscode-uri": "^3.1.0",

From 2baa864d314373dc675e103168226a51c521a319 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 19:09:00 +0000
Subject: [PATCH 1160/1815] Bump nodemon from 3.1.9 to 3.1.11 in
 /test/automation

Bumps [nodemon](https://github.com/remy/nodemon) from 3.1.9 to 3.1.11.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v3.1.9...v3.1.11)

---
updated-dependencies:
- dependency-name: nodemon
  dependency-version: 3.1.11
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/automation/package-lock.json | 8 ++++----
 test/automation/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
index dcd267ade731..f1bf3fed7068 100644
--- a/test/automation/package-lock.json
+++ b/test/automation/package-lock.json
@@ -19,7 +19,7 @@
         "@types/node": "24.x",
         "@types/tmp": "0.2.2",
         "cpx2": "3.0.0",
-        "nodemon": "^3.1.9",
+        "nodemon": "^3.1.11",
         "npm-run-all": "^4.1.5"
       }
     },
@@ -760,9 +760,9 @@
       "dev": true
     },
     "node_modules/nodemon": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.9.tgz",
-      "integrity": "sha512-hdr1oIb2p6ZSxu3PB2JWWYS7ZQ0qvaZsc3hK8DR8f02kRzc8rjYmxAIvdz+aYC+8F2IjNaB7HMcSDg8nQpJxyg==",
+      "version": "3.1.11",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.11.tgz",
+      "integrity": "sha512-is96t8F/1//UHAjNPHpbsNY46ELPpftGUoSVNXwUfMk/qdjSylYrWSu1XavVTBOn526kFiOR733ATgNBCQyH0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/test/automation/package.json b/test/automation/package.json
index 4915bf72483f..63b0cfeafbc9 100644
--- a/test/automation/package.json
+++ b/test/automation/package.json
@@ -28,7 +28,7 @@
     "@types/node": "24.x",
     "@types/tmp": "0.2.2",
     "cpx2": "3.0.0",
-    "nodemon": "^3.1.9",
+    "nodemon": "^3.1.11",
     "npm-run-all": "^4.1.5"
   }
 }

From 11c5bc75483abc81fc0520f5f4b17c9d4267db26 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 19:19:49 +0000
Subject: [PATCH 1161/1815] build(deps-dev): Bump @types/rimraf from 3.0.2 to
 4.0.5 in /test/smoke

Bumps [@types/rimraf](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/rimraf) from 3.0.2 to 4.0.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/rimraf)

---
updated-dependencies:
- dependency-name: "@types/rimraf"
  dependency-version: 4.0.5
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/smoke/package-lock.json | 36 +++++++-----------------------------
 test/smoke/package.json      |  2 +-
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/test/smoke/package-lock.json b/test/smoke/package-lock.json
index 06c76287b2ae..f8c61ee4e913 100644
--- a/test/smoke/package-lock.json
+++ b/test/smoke/package-lock.json
@@ -18,7 +18,7 @@
         "@types/ncp": "2.0.8",
         "@types/node": "24.x",
         "@types/node-fetch": "^2.6.13",
-        "@types/rimraf": "3.0.2",
+        "@types/rimraf": "4.0.5",
         "npm-run-all": "^4.1.5"
       }
     },
@@ -43,29 +43,6 @@
         "node": "20 || >=22"
       }
     },
-    "node_modules/@types/events": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
-      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
-      "dev": true
-    },
-    "node_modules/@types/glob": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
-      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
-      "dev": true,
-      "dependencies": {
-        "@types/events": "*",
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/minimatch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
-      "dev": true
-    },
     "node_modules/@types/mocha": {
       "version": "10.0.10",
       "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.10.tgz",
@@ -105,13 +82,14 @@
       }
     },
     "node_modules/@types/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-4.0.5.tgz",
+      "integrity": "sha512-DTCZoIQotB2SUJnYgrEx43cQIUYOlNZz0AZPbKU4PSLYTUdML5Gox0++z4F9kQocxStrCmRNhi4x5x/UlwtKUA==",
+      "deprecated": "This is a stub types definition. rimraf provides its own type definitions, so you do not need this installed.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/glob": "*",
-        "@types/node": "*"
+        "rimraf": "*"
       }
     },
     "node_modules/ansi-styles": {
diff --git a/test/smoke/package.json b/test/smoke/package.json
index 2eb961957917..df38b61e2c4f 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -20,7 +20,7 @@
     "@types/ncp": "2.0.8",
     "@types/node": "24.x",
     "@types/node-fetch": "^2.6.13",
-    "@types/rimraf": "3.0.2",
+    "@types/rimraf": "4.0.5",
     "npm-run-all": "^4.1.5"
   }
 }

From e808a9ba83b08330ea80f39d1ebe5272a76f1f12 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 20:33:52 +0000
Subject: [PATCH 1162/1815] Bump cpx2 from 3.0.0 to 8.0.0 in /test/automation

Bumps [cpx2](https://github.com/bcomnes/cpx2) from 3.0.0 to 8.0.0.
- [Release notes](https://github.com/bcomnes/cpx2/releases)
- [Changelog](https://github.com/bcomnes/cpx2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bcomnes/cpx2/compare/v3.0.0...v8.0.0)

---
updated-dependencies:
- dependency-name: cpx2
  dependency-version: 8.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/automation/package-lock.json | 684 +++++++++++++++++++++++++-----
 test/automation/package.json      |   2 +-
 2 files changed, 582 insertions(+), 104 deletions(-)

diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
index f1bf3fed7068..29487951ba38 100644
--- a/test/automation/package-lock.json
+++ b/test/automation/package-lock.json
@@ -18,11 +18,52 @@
         "@types/ncp": "2.0.1",
         "@types/node": "24.x",
         "@types/tmp": "0.2.2",
-        "cpx2": "3.0.0",
+        "cpx2": "8.0.0",
         "nodemon": "^3.1.11",
         "npm-run-all": "^4.1.5"
       }
     },
+    "node_modules/@isaacs/balanced-match": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/brace-expansion": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@isaacs/balanced-match": "^4.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@types/ncp": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@types/ncp/-/ncp-2.0.1.tgz",
@@ -48,6 +89,19 @@
       "integrity": "sha512-MhSa0yylXtVMsyT8qFpHA1DLHj4DvQGH5ntxrhHSh8PxUVNi35Wk+P5hVgqbO2qZqOotqr9jaoPRL+iRjWYm/A==",
       "dev": true
     },
+    "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",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
     "node_modules/ansi-styles": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -74,15 +128,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/at-least-node": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
     "node_modules/balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -178,16 +223,6 @@
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-      "dev": true,
-      "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
-      }
-    },
     "node_modules/color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -210,29 +245,48 @@
       "dev": true
     },
     "node_modules/cpx2": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cpx2/-/cpx2-3.0.0.tgz",
-      "integrity": "sha512-WVI69l0qqlDboGngiggQitRyto20og3YNNZp6ySva9dRMYpy9OQd5ep7mQvkvuBeUkIluOKR6jBOek7FRS7X0w==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/cpx2/-/cpx2-8.0.0.tgz",
+      "integrity": "sha512-RxD9jrSVNSOmfcbiPlr3XnKbUKH9K1w2HCv0skczUKhsZTueiDBecxuaSAKQkYSLQaGVA4ZQJZlTj5hVNNEvKg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "co": "^4.6.0",
-        "debounce": "^1.2.0",
+        "debounce": "^2.0.0",
         "debug": "^4.1.1",
         "duplexer": "^0.1.1",
-        "fs-extra": "^9.0.1",
-        "glob": "^7.1.4",
+        "fs-extra": "^11.1.0",
+        "glob": "^11.0.0",
         "glob2base": "0.0.12",
-        "minimatch": "^3.0.4",
+        "ignore": "^6.0.2",
+        "minimatch": "^10.0.1",
+        "p-map": "^7.0.0",
         "resolve": "^1.12.0",
         "safe-buffer": "^5.2.0",
-        "shell-quote": "^1.7.1",
+        "shell-quote": "^1.8.0",
         "subarg": "^1.0.0"
       },
       "bin": {
         "cpx": "bin/index.js"
       },
       "engines": {
-        "node": ">=6.5"
+        "node": "^20.0.0 || >=22.0.0",
+        "npm": ">=10"
+      }
+    },
+    "node_modules/cpx2/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/cross-spawn": {
@@ -252,10 +306,17 @@
       }
     },
     "node_modules/debounce": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
-      "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==",
-      "dev": true
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-2.2.0.tgz",
+      "integrity": "sha512-Xks6RUDLZFdz8LIdR6q0MTH44k7FikOmnh5xkSjMig6ch45afc8sjTjRQf3P6ax8dMgcQrYO/AR2RGWURrruqw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/debug": {
       "version": "4.3.4",
@@ -292,6 +353,20 @@
       "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
       "dev": true
     },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -372,27 +447,102 @@
       "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ= sha512-uJ5vWrfBKMcE6y2Z8834dwEZj9mNGxYa3t3I53OwFeuZ8D9oc2E5zcsrkuhX6h4iYrjhiv0T3szQmxlAV9uxDg==",
       "dev": true
     },
+    "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==",
+      "dev": true,
+      "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/foreground-child/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": ">= 8"
+      }
+    },
+    "node_modules/foreground-child/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/foreground-child/node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/foreground-child/node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/foreground-child/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/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==",
+      "version": "11.3.2",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.2.tgz",
+      "integrity": "sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==",
       "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": ">=14.14"
       }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
@@ -429,21 +579,24 @@
       }
     },
     "node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-11.1.0.tgz",
+      "integrity": "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==",
       "dev": true,
+      "license": "BlueOak-1.0.0",
       "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"
+        "foreground-child": "^3.3.1",
+        "jackspeak": "^4.1.1",
+        "minimatch": "^10.1.1",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^2.0.0"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": "*"
+        "node": "20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -462,6 +615,22 @@
         "node": ">= 6"
       }
     },
+    "node_modules/glob/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/glob2base": {
       "version": "0.0.12",
       "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
@@ -519,6 +688,16 @@
       "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
       "dev": true
     },
+    "node_modules/ignore": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-6.0.2.tgz",
+      "integrity": "sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/ignore-by-default": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
@@ -526,23 +705,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
     "node_modules/is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -608,6 +770,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -679,6 +851,22 @@
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
+    "node_modules/jackspeak": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.1.tgz",
+      "integrity": "sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "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",
@@ -686,10 +874,11 @@
       "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==",
+      "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"
       },
@@ -712,6 +901,16 @@
         "node": ">=4"
       }
     },
+    "node_modules/lru-cache": {
+      "version": "11.2.4",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz",
+      "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/memorystream": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
@@ -739,6 +938,16 @@
       "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
+    "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/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -884,15 +1093,26 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+    "node_modules/p-map": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz",
+      "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==",
       "dev": true,
-      "dependencies": {
-        "wrappy": "1"
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "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==",
+      "dev": true,
+      "license": "BlueOak-1.0.0"
+    },
     "node_modules/parse-json": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
@@ -906,15 +1126,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18= sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
@@ -930,6 +1141,23 @@
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
+    "node_modules/path-scurry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz",
+      "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/path-type": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
@@ -1074,10 +1302,30 @@
       }
     },
     "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
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
+      "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
     },
     "node_modules/simple-update-notifier": {
       "version": "2.0.0",
@@ -1137,6 +1385,70 @@
       "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
       "dev": true
     },
+    "node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/string.prototype.padend": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.1.tgz",
@@ -1180,6 +1492,46 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "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",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -1265,10 +1617,11 @@
       "license": "MIT"
     },
     "node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "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"
       }
@@ -1300,11 +1653,136 @@
         "which": "bin/which"
       }
     },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/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/wrap-ansi-cjs/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/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/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==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
     }
   }
 }
diff --git a/test/automation/package.json b/test/automation/package.json
index 63b0cfeafbc9..640a2ec6795c 100644
--- a/test/automation/package.json
+++ b/test/automation/package.json
@@ -27,7 +27,7 @@
     "@types/ncp": "2.0.1",
     "@types/node": "24.x",
     "@types/tmp": "0.2.2",
-    "cpx2": "3.0.0",
+    "cpx2": "8.0.0",
     "nodemon": "^3.1.11",
     "npm-run-all": "^4.1.5"
   }

From 1a3e2fdef960e7ca31496ee059a9675601ad070a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 01:42:50 +0000
Subject: [PATCH 1163/1815] Bump @vscode/extension-telemetry

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 0.9.8 to 1.2.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v0.9.8...v1.2.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.2.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 94 +++++++++----------
 .../typescript-language-features/package.json |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/extensions/typescript-language-features/package-lock.json b/extensions/typescript-language-features/package-lock.json
index 98b19d93a77a..af89c90eaea5 100644
--- a/extensions/typescript-language-features/package-lock.json
+++ b/extensions/typescript-language-features/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^0.9.8",
+        "@vscode/extension-telemetry": "^1.2.0",
         "@vscode/sync-api-client": "^0.7.2",
         "@vscode/sync-api-common": "^0.7.2",
         "@vscode/sync-api-service": "^0.7.3",
@@ -28,73 +28,73 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
-      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
+      "integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
-      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.10.tgz",
+      "integrity": "sha512-VSLjc9cT+Y+eTiSfYltJHJCejn8oYr0E6Pq2BMhOEO7F6IyLGYIxzKKvo78ze9x+iHX7KPTATcZ+PFgjGXuNqg==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.3.4",
+        "@microsoft/1ds-core-js": "4.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
-      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.10.tgz",
+      "integrity": "sha512-iolFLz1ocWAzIQqHIEjjov3gNTPkgFQ4ArHnBcJEYoffOGWlJt6copaevS5YPI5rHzmbySsengZ8cLJJBBrXzQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
-      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.10.tgz",
+      "integrity": "sha512-RVIenPIvNgZCbjJdALvLM4rNHgAFuHI7faFzHCgnI6S2WCUNGHeXlQTs9EUUrL+n2TPp9/cd0KKMILU5VVyYiA==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
-      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.10.tgz",
+      "integrity": "sha512-5yKeyassZTq2l+SAO4npu6LPnbS++UD+M+Ghjm9uRzoBwD8tumFx0/F8AkSVqbniSREd+ztH/2q2foewa2RZyg==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -110,18 +110,18 @@
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
-      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.10.tgz",
+      "integrity": "sha512-AZib5DAT3NU0VT0nLWEwXrnoMDDgZ/5S4dso01CNU5ELNxLdg+1fvchstlVdMy4FrAnxzs8Wf/GIQNFYOVgpAw==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.3.4",
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.10",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -146,9 +146,9 @@
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
-      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
+      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
       "license": "MIT"
     },
     "node_modules/@types/node": {
@@ -168,14 +168,14 @@
       "dev": true
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.8",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
-      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
+      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.3.4",
-        "@microsoft/1ds-post-js": "^4.3.4",
-        "@microsoft/applicationinsights-web-basic": "^3.3.4"
+        "@microsoft/1ds-core-js": "^4.3.10",
+        "@microsoft/1ds-post-js": "^4.3.10",
+        "@microsoft/applicationinsights-web-basic": "^3.3.10"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index cdef9fc8662f..5933cef8cc4e 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -37,7 +37,7 @@
     "Programming Languages"
   ],
   "dependencies": {
-    "@vscode/extension-telemetry": "^0.9.8",
+    "@vscode/extension-telemetry": "^1.2.0",
     "@vscode/sync-api-client": "^0.7.2",
     "@vscode/sync-api-common": "^0.7.2",
     "@vscode/sync-api-service": "^0.7.3",

From ce15a1d6f7656797ba9f67d9b41c685acebedfe7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 01:58:29 +0000
Subject: [PATCH 1164/1815] Bump jsonc-parser in
 /extensions/typescript-language-features

Bumps [jsonc-parser](https://github.com/microsoft/node-jsonc-parser) from 3.2.0 to 3.3.1.
- [Release notes](https://github.com/microsoft/node-jsonc-parser/releases)
- [Changelog](https://github.com/microsoft/node-jsonc-parser/blob/main/CHANGELOG.md)
- [Commits](https://github.com/microsoft/node-jsonc-parser/compare/v3.2.0...v3.3.1)

---
updated-dependencies:
- dependency-name: jsonc-parser
  dependency-version: 3.3.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../typescript-language-features/package-lock.json       | 9 +++++----
 extensions/typescript-language-features/package.json     | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/typescript-language-features/package-lock.json b/extensions/typescript-language-features/package-lock.json
index 33868e962df1..94577e7a9c1d 100644
--- a/extensions/typescript-language-features/package-lock.json
+++ b/extensions/typescript-language-features/package-lock.json
@@ -14,7 +14,7 @@
         "@vscode/sync-api-common": "^0.7.2",
         "@vscode/sync-api-service": "^0.7.3",
         "@vscode/ts-package-manager": "^0.0.2",
-        "jsonc-parser": "^3.2.0",
+        "jsonc-parser": "^3.3.1",
         "semver": "7.5.2",
         "vscode-tas-client": "^0.1.84",
         "vscode-uri": "^3.1.0"
@@ -235,9 +235,10 @@
       }
     },
     "node_modules/jsonc-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "license": "MIT"
     },
     "node_modules/lru-cache": {
       "version": "6.0.0",
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 7f11ec24084c..51a6cdf48369 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -42,7 +42,7 @@
     "@vscode/sync-api-common": "^0.7.2",
     "@vscode/sync-api-service": "^0.7.3",
     "@vscode/ts-package-manager": "^0.0.2",
-    "jsonc-parser": "^3.2.0",
+    "jsonc-parser": "^3.3.1",
     "semver": "7.5.2",
     "vscode-tas-client": "^0.1.84",
     "vscode-uri": "^3.1.0"

From bb86593e0749468b279266befcb15d5343f2a7d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 02:08:52 +0000
Subject: [PATCH 1165/1815] Bump vscode-uri from 3.0.2 to 3.1.0 in
 /test/automation

Bumps [vscode-uri](https://github.com/microsoft/vscode-uri) from 3.0.2 to 3.1.0.
- [Release notes](https://github.com/microsoft/vscode-uri/releases)
- [Commits](https://github.com/microsoft/vscode-uri/compare/v3.0.2...v3.1.0)

---
updated-dependencies:
- dependency-name: vscode-uri
  dependency-version: 3.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/automation/package-lock.json | 9 +++++----
 test/automation/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
index 29487951ba38..8a7c55fa154b 100644
--- a/test/automation/package-lock.json
+++ b/test/automation/package-lock.json
@@ -12,7 +12,7 @@
         "ncp": "^2.0.0",
         "tmp": "0.2.4",
         "tree-kill": "1.2.2",
-        "vscode-uri": "3.0.2"
+        "vscode-uri": "3.1.0"
       },
       "devDependencies": {
         "@types/ncp": "2.0.1",
@@ -1637,9 +1637,10 @@
       }
     },
     "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=="
+      "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==",
+      "license": "MIT"
     },
     "node_modules/which": {
       "version": "1.3.1",
diff --git a/test/automation/package.json b/test/automation/package.json
index 640a2ec6795c..a1f5939bd511 100644
--- a/test/automation/package.json
+++ b/test/automation/package.json
@@ -21,7 +21,7 @@
     "ncp": "^2.0.0",
     "tmp": "0.2.4",
     "tree-kill": "1.2.2",
-    "vscode-uri": "3.0.2"
+    "vscode-uri": "3.1.0"
   },
   "devDependencies": {
     "@types/ncp": "2.0.1",

From 54dbbdb085c39233d83dfa77aae06dd03080e36d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 02:34:49 +0000
Subject: [PATCH 1166/1815] Bump @vscode/sync-api-client in
 /extensions/typescript-language-features

Bumps [@vscode/sync-api-client](https://github.com/microsoft/vscode-wasm) from 0.7.2 to 0.8.1.
- [Release notes](https://github.com/microsoft/vscode-wasm/releases)
- [Commits](https://github.com/microsoft/vscode-wasm/commits)

---
updated-dependencies:
- dependency-name: "@vscode/sync-api-client"
  dependency-version: 0.8.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 28 +++++++++++--------
 .../typescript-language-features/package.json |  2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/extensions/typescript-language-features/package-lock.json b/extensions/typescript-language-features/package-lock.json
index b6b608080f77..5e65637eed62 100644
--- a/extensions/typescript-language-features/package-lock.json
+++ b/extensions/typescript-language-features/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@vscode/extension-telemetry": "^1.2.0",
-        "@vscode/sync-api-client": "^0.7.2",
+        "@vscode/sync-api-client": "^0.8.1",
         "@vscode/sync-api-common": "^0.7.2",
         "@vscode/sync-api-service": "^0.7.3",
         "@vscode/ts-package-manager": "^0.0.2",
@@ -182,22 +182,26 @@
       }
     },
     "node_modules/@vscode/sync-api-client": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/@vscode/sync-api-client/-/sync-api-client-0.7.2.tgz",
-      "integrity": "sha512-HQHz57RVKmR8sTEen1Y/T3r6mzDX7IaUJz/O2RJkn0Qu9ThvCsakLP0N+1iiwPnPfUfmNSwQXbSw8bEQFPcpYQ==",
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@vscode/sync-api-client/-/sync-api-client-0.8.1.tgz",
+      "integrity": "sha512-82NRZpZlvRtlFoqi/J8xGw964F8ZfJJeJu2D9QMAAzq8BMDCXqkhO2qHApnyEV4gG2mQSaHtfw0f30GOPExgUg==",
+      "license": "MIT",
       "dependencies": {
-        "@vscode/sync-api-common": "0.7.2",
-        "vscode-uri": "3.0.3"
+        "@vscode/sync-api-common": "0.8.1",
+        "vscode-uri": "^3.0.6"
       },
       "engines": {
-        "node": ">=16.15.1"
+        "node": ">=16.14.2"
       }
     },
-    "node_modules/@vscode/sync-api-client/node_modules/vscode-uri": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz",
-      "integrity": "sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==",
-      "license": "MIT"
+    "node_modules/@vscode/sync-api-client/node_modules/@vscode/sync-api-common": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@vscode/sync-api-common/-/sync-api-common-0.8.1.tgz",
+      "integrity": "sha512-XfanQNxkUlCpAsQ2+1SzNEdoY7jtcu48jYBR0n864ZWAWrH7m2QBK32YoNlrDN2V0eh8tdF0WH1NuHOm3Y021A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=16.14.2"
+      }
     },
     "node_modules/@vscode/sync-api-common": {
       "version": "0.7.2",
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 76f89f1f68ec..096fe9d9e717 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@vscode/extension-telemetry": "^1.2.0",
-    "@vscode/sync-api-client": "^0.7.2",
+    "@vscode/sync-api-client": "^0.8.1",
     "@vscode/sync-api-common": "^0.7.2",
     "@vscode/sync-api-service": "^0.7.3",
     "@vscode/ts-package-manager": "^0.0.2",

From faa52169182821627b53e1cd1ee0712199d7dd51 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 04:05:16 +0000
Subject: [PATCH 1167/1815] build(deps): Bump @xterm/xterm in /remote/web

Bumps [@xterm/xterm](https://github.com/xtermjs/xterm.js) from 5.6.0-beta.98 to 5.6.0-beta.140.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/xterm"
  dependency-version: 5.6.0-beta.140
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 13 ++++++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 1445965965ff..3f9f14de3e63 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -21,7 +21,7 @@
 				"@xterm/addon-serialize": "^0.14.0-beta.98",
 				"@xterm/addon-unicode11": "^0.9.0-beta.98",
 				"@xterm/addon-webgl": "^0.19.0-beta.98",
-				"@xterm/xterm": "^5.6.0-beta.98",
+				"@xterm/xterm": "^5.6.0-beta.140",
 				"jschardet": "3.1.4",
 				"tas-client-umd": "0.2.0",
 				"vscode-oniguruma": "2.0.1",
@@ -174,10 +174,13 @@
 			}
 		},
 		"node_modules/@xterm/xterm": {
-			"version": "5.6.0-beta.98",
-			"resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.98.tgz",
-			"integrity": "sha512-fJexj3XKDAMGsR8KKaiEhGrtJD1eRANbT3094E3KSgvbHRa3524tSFvDCx5+5KRE/hYaECmi0knAUIWJCvSPTg==",
-			"license": "MIT"
+			"version": "5.6.0-beta.140",
+			"resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.140.tgz",
+			"integrity": "sha512-zqMxdVN+kEoKoCySae+uHIkJhYYifr2GG2KIiU/WvCLSTpr28aRzzsajNvaWj+2jVts20QXOMfHeHZsggDETmA==",
+			"license": "MIT",
+			"workspaces": [
+				"addons/*"
+			]
 		},
 		"node_modules/font-finder": {
 			"version": "1.1.0",
diff --git a/remote/web/package.json b/remote/web/package.json
index 1e99bce736bb..e02d8ae95bf9 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -16,7 +16,7 @@
 		"@xterm/addon-serialize": "^0.14.0-beta.98",
 		"@xterm/addon-unicode11": "^0.9.0-beta.98",
 		"@xterm/addon-webgl": "^0.19.0-beta.98",
-		"@xterm/xterm": "^5.6.0-beta.98",
+		"@xterm/xterm": "^5.6.0-beta.140",
 		"jschardet": "3.1.4",
 		"tas-client-umd": "0.2.0",
 		"vscode-oniguruma": "2.0.1",

From dd3229e375651fbc0a592ea3e284a8c8640ff82e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 04:05:18 +0000
Subject: [PATCH 1168/1815] build(deps): Bump @microsoft/1ds-core-js in
 /remote/web

Bumps [@microsoft/1ds-core-js](https://github.com/microsoft/ApplicationInsights-JS) from 3.2.13 to 4.3.10.
- [Release notes](https://github.com/microsoft/ApplicationInsights-JS/releases)
- [Changelog](https://github.com/microsoft/ApplicationInsights-JS/blob/main/RELEASES.md)
- [Commits](https://github.com/microsoft/ApplicationInsights-JS/commits)

---
updated-dependencies:
- dependency-name: "@microsoft/1ds-core-js"
  dependency-version: 4.3.10
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 97 +++++++++++++++++++++++++++++++++---
 remote/web/package.json      |  2 +-
 2 files changed, 90 insertions(+), 9 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 1445965965ff..0d4e7ee32444 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -8,7 +8,7 @@
 			"name": "vscode-web",
 			"version": "0.0.0",
 			"dependencies": {
-				"@microsoft/1ds-core-js": "^3.2.13",
+				"@microsoft/1ds-core-js": "^4.3.10",
 				"@microsoft/1ds-post-js": "^3.2.13",
 				"@vscode/iconv-lite-umd": "0.7.1",
 				"@vscode/tree-sitter-wasm": "^0.3.0",
@@ -29,13 +29,34 @@
 			}
 		},
 		"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==",
+			"version": "4.3.10",
+			"resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
+			"integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==",
+			"license": "MIT",
 			"dependencies": {
-				"@microsoft/applicationinsights-core-js": "2.8.15",
-				"@microsoft/applicationinsights-shims": "^2.0.2",
-				"@microsoft/dynamicproto-js": "^1.1.7"
+				"@microsoft/applicationinsights-core-js": "3.3.10",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.4 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+			}
+		},
+		"node_modules/@microsoft/1ds-core-js/node_modules/@microsoft/applicationinsights-shims": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+			"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+			"license": "MIT",
+			"dependencies": {
+				"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+			}
+		},
+		"node_modules/@microsoft/1ds-core-js/node_modules/@microsoft/dynamicproto-js": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+			"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+			"license": "MIT",
+			"dependencies": {
+				"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
 			}
 		},
 		"node_modules/@microsoft/1ds-post-js": {
@@ -48,10 +69,22 @@
 				"@microsoft/dynamicproto-js": "^1.1.7"
 			}
 		},
-		"node_modules/@microsoft/applicationinsights-core-js": {
+		"node_modules/@microsoft/1ds-post-js/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==",
+			"license": "MIT",
+			"dependencies": {
+				"@microsoft/applicationinsights-core-js": "2.8.15",
+				"@microsoft/applicationinsights-shims": "^2.0.2",
+				"@microsoft/dynamicproto-js": "^1.1.7"
+			}
+		},
+		"node_modules/@microsoft/1ds-post-js/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==",
+			"license": "MIT",
 			"dependencies": {
 				"@microsoft/applicationinsights-shims": "2.0.2",
 				"@microsoft/dynamicproto-js": "^1.1.9"
@@ -60,6 +93,39 @@
 				"tslib": "*"
 			}
 		},
+		"node_modules/@microsoft/applicationinsights-core-js": {
+			"version": "3.3.10",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.10.tgz",
+			"integrity": "sha512-5yKeyassZTq2l+SAO4npu6LPnbS++UD+M+Ghjm9uRzoBwD8tumFx0/F8AkSVqbniSREd+ztH/2q2foewa2RZyg==",
+			"license": "MIT",
+			"dependencies": {
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.4 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+			},
+			"peerDependencies": {
+				"tslib": ">= 1.0.0"
+			}
+		},
+		"node_modules/@microsoft/applicationinsights-core-js/node_modules/@microsoft/applicationinsights-shims": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+			"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+			"license": "MIT",
+			"dependencies": {
+				"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+			}
+		},
+		"node_modules/@microsoft/applicationinsights-core-js/node_modules/@microsoft/dynamicproto-js": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+			"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+			"license": "MIT",
+			"dependencies": {
+				"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
+			}
+		},
 		"node_modules/@microsoft/applicationinsights-shims": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz",
@@ -70,6 +136,21 @@
 			"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.9.tgz",
 			"integrity": "sha512-n1VPsljTSkthsAFYdiWfC+DKzK2WwcRp83Y1YAqdX552BstvsDjft9YXppjUzp11BPsapDoO1LDgrDB0XVsfNQ=="
 		},
+		"node_modules/@nevware21/ts-async": {
+			"version": "0.5.4",
+			"resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
+			"integrity": "sha512-IBTyj29GwGlxfzXw2NPnzty+w0Adx61Eze1/lknH/XIVdxtF9UnOpk76tnrHXWa6j84a1RR9hsOcHQPFv9qJjA==",
+			"license": "MIT",
+			"dependencies": {
+				"@nevware21/ts-utils": ">= 0.11.6 < 2.x"
+			}
+		},
+		"node_modules/@nevware21/ts-utils": {
+			"version": "0.12.5",
+			"resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
+			"integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
+			"license": "MIT"
+		},
 		"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",
diff --git a/remote/web/package.json b/remote/web/package.json
index 1e99bce736bb..c88e24b76e40 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -3,7 +3,7 @@
 	"version": "0.0.0",
 	"private": true,
 	"dependencies": {
-		"@microsoft/1ds-core-js": "^3.2.13",
+		"@microsoft/1ds-core-js": "^4.3.10",
 		"@microsoft/1ds-post-js": "^3.2.13",
 		"@vscode/iconv-lite-umd": "0.7.1",
 		"@vscode/tree-sitter-wasm": "^0.3.0",

From 4cf3ff0ee0e96ef4f45b567f2440df0b136ebbd6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 12:34:26 +0000
Subject: [PATCH 1169/1815] Bump vscode-json-languageservice

Bumps [vscode-json-languageservice](https://github.com/Microsoft/vscode-json-languageservice) from 5.4.3 to 5.6.4.
- [Release notes](https://github.com/Microsoft/vscode-json-languageservice/releases)
- [Changelog](https://github.com/microsoft/vscode-json-languageservice/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/vscode-json-languageservice/compare/v5.4.3...v5.6.4)

---
updated-dependencies:
- dependency-name: vscode-json-languageservice
  dependency-version: 5.6.4
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../json-language-features/server/package-lock.json       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/json-language-features/server/package-lock.json b/extensions/json-language-features/server/package-lock.json
index 9a41dbe85c55..db67f51ee2f9 100644
--- a/extensions/json-language-features/server/package-lock.json
+++ b/extensions/json-language-features/server/package-lock.json
@@ -64,16 +64,16 @@
       "dev": true
     },
     "node_modules/vscode-json-languageservice": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.4.3.tgz",
-      "integrity": "sha512-NVSEQDloP9NYccuqKg4eI46kutZpwucBY4csBB6FCxbM7AZVoBt0oxTItPVA+ZwhnG1bg/fmiBRAwcGJyNQoPA==",
+      "version": "5.6.4",
+      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.6.4.tgz",
+      "integrity": "sha512-i0MhkFmnQAbYr+PiE6Th067qa3rwvvAErCEUo0ql+ghFXHvxbwG3kLbwMaIUrrbCLUDEeULiLgROJjtuyYoIsA==",
       "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.18",
         "jsonc-parser": "^3.3.1",
         "vscode-languageserver-textdocument": "^1.0.12",
         "vscode-languageserver-types": "^3.17.5",
-        "vscode-uri": "^3.0.8"
+        "vscode-uri": "^3.1.0"
       }
     },
     "node_modules/vscode-jsonrpc": {

From 479f1762e4a5b15b380e978c1e782d6f42388661 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 12:36:25 +0000
Subject: [PATCH 1170/1815] Bump semver and @types/semver

Bumps [semver](https://github.com/npm/node-semver) and [@types/semver](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/semver). These dependencies needed to be updated together.

Updates `semver` from 7.5.2 to 7.7.3
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v7.5.2...v7.7.3)

Updates `@types/semver` from 5.5.0 to 7.7.1
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/semver)

---
updated-dependencies:
- dependency-name: semver
  dependency-version: 7.7.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: "@types/semver"
  dependency-version: 7.7.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 39 ++++++-------------
 .../typescript-language-features/package.json |  4 +-
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/extensions/typescript-language-features/package-lock.json b/extensions/typescript-language-features/package-lock.json
index 5e65637eed62..78d5fd0bac9a 100644
--- a/extensions/typescript-language-features/package-lock.json
+++ b/extensions/typescript-language-features/package-lock.json
@@ -15,13 +15,13 @@
         "@vscode/sync-api-service": "^0.7.3",
         "@vscode/ts-package-manager": "^0.0.2",
         "jsonc-parser": "^3.3.1",
-        "semver": "7.5.2",
+        "semver": "7.7.3",
         "vscode-tas-client": "^0.1.84",
         "vscode-uri": "^3.1.0"
       },
       "devDependencies": {
         "@types/node": "24.x",
-        "@types/semver": "^5.5.0"
+        "@types/semver": "^7.7.1"
       },
       "engines": {
         "vscode": "^1.30.0"
@@ -162,10 +162,11 @@
       }
     },
     "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
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@vscode/extension-telemetry": {
       "version": "1.2.0",
@@ -244,24 +245,11 @@
       "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
       "license": "MIT"
     },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/semver": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -297,11 +285,6 @@
       "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
       "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
       "license": "MIT"
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     }
   }
 }
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 096fe9d9e717..915b11390010 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -43,13 +43,13 @@
     "@vscode/sync-api-service": "^0.7.3",
     "@vscode/ts-package-manager": "^0.0.2",
     "jsonc-parser": "^3.3.1",
-    "semver": "7.5.2",
+    "semver": "7.7.3",
     "vscode-tas-client": "^0.1.84",
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
     "@types/node": "24.x",
-    "@types/semver": "^5.5.0"
+    "@types/semver": "^7.7.1"
   },
   "scripts": {
     "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:typescript-language-features",

From 4cd3d6fad361634b5de5510286f33d65d0d67536 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 18:37:14 +0000
Subject: [PATCH 1171/1815] Bump the npm_and_yarn group across 1 directory with
 1 update

Bumps the npm_and_yarn group with 1 update in the /build directory: [jws](https://github.com/brianloveswords/node-jws).


Updates `jws` from 3.2.2 to 3.2.3
- [Release notes](https://github.com/brianloveswords/node-jws/releases)
- [Changelog](https://github.com/auth0/node-jws/blob/master/CHANGELOG.md)
- [Commits](https://github.com/brianloveswords/node-jws/compare/v3.2.2...v3.2.3)

Updates `jws` from 4.0.0 to 4.0.1
- [Release notes](https://github.com/brianloveswords/node-jws/releases)
- [Changelog](https://github.com/auth0/node-jws/blob/master/CHANGELOG.md)
- [Commits](https://github.com/brianloveswords/node-jws/compare/v3.2.2...v3.2.3)

---
updated-dependencies:
- dependency-name: jws
  dependency-version: 3.2.3
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: jws
  dependency-version: 4.0.1
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 37 ++++++++++++++++++++-----------------
 build/package.json      |  2 +-
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 93fdaa4335e7..1fe9e8e7c78e 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -52,7 +52,7 @@
         "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",
@@ -3102,23 +3102,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"
       }
     },
@@ -3138,24 +3140,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"
       }
     },
diff --git a/build/package.json b/build/package.json
index 3a435a8326bf..434f5ec81b96 100644
--- a/build/package.json
+++ b/build/package.json
@@ -46,7 +46,7 @@
     "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",

From f1772be6d135b0b08e6c4c2aca83ec701f01e768 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 21:16:17 +0000
Subject: [PATCH 1172/1815] Bump jws

Bumps the npm_and_yarn group with 1 update in the /extensions/microsoft-authentication directory: [jws](https://github.com/brianloveswords/node-jws).


Updates `jws` from 3.2.2 to 3.2.3
- [Release notes](https://github.com/brianloveswords/node-jws/releases)
- [Changelog](https://github.com/auth0/node-jws/blob/master/CHANGELOG.md)
- [Commits](https://github.com/brianloveswords/node-jws/compare/v3.2.2...v3.2.3)

---
updated-dependencies:
- dependency-name: jws
  dependency-version: 3.2.3
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 69a49fe4a8c6..d5f46205375a 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -267,7 +267,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",
@@ -323,6 +324,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"
       }
@@ -519,21 +521,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"
       }
     },
@@ -634,7 +638,8 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/semver": {
       "version": "7.6.2",

From 78c8f31b6c1db75b5239d74b71f71a02f6b6deb1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 21:18:20 +0000
Subject: [PATCH 1173/1815] Bump mime and @types/mime in /build

Bumps [mime](https://github.com/broofa/mime) and [@types/mime](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mime). These dependencies needed to be updated together.

Updates `mime` from 1.6.0 to 4.1.0
- [Release notes](https://github.com/broofa/mime/releases)
- [Changelog](https://github.com/broofa/mime/blob/main/CHANGELOG.md)
- [Commits](https://github.com/broofa/mime/compare/v1.6.0...v4.1.0)

Updates `@types/mime` from 0.0.29 to 4.0.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mime)

---
updated-dependencies:
- dependency-name: mime
  dependency-version: 4.1.0
  dependency-type: direct:development
  update-type: version-update:semver-major
- dependency-name: "@types/mime"
  dependency-version: 4.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 44 ++++++++++++++++++++++++++++++-----------
 build/package.json      |  4 ++--
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 1fe9e8e7c78e..f0efc4d4d2f8 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -30,7 +30,7 @@
         "@types/gulp-sort": "^2.0.4",
         "@types/gulp-sourcemaps": "^0.0.32",
         "@types/jws": "^3.2.10",
-        "@types/mime": "0.0.29",
+        "@types/mime": "4.0.0",
         "@types/minimatch": "^3.0.3",
         "@types/minimist": "^1.2.1",
         "@types/mocha": "^9.1.1",
@@ -53,7 +53,7 @@
         "gulp-sort": "^2.0.0",
         "jsonc-parser": "^2.3.0",
         "jws": "^4.0.1",
-        "mime": "^1.4.1",
+        "mime": "^4.1.0",
         "source-map": "0.6.1",
         "ternary-stream": "^3.0.0",
         "through2": "^4.0.2",
@@ -1162,10 +1162,15 @@
       }
     },
     "node_modules/@types/mime": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-0.0.29.tgz",
-      "integrity": "sha1-+8/TMFc7kS71nu7hRgK/rOYwdUs= sha512-EqWQSlonwbNgLMq2dMkokuzv/pwevb4q0JrPjfc7zzieG/cpqt+HsCE9dYoQd1snp2zlksl6k3rQ4LLfyQbQdA==",
-      "dev": true
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-4.0.0.tgz",
+      "integrity": "sha512-5eEkJZ/BLvTE3vXGKkWlyTSUVZuzj23Wj8PoyOq2lt5I3CYbiLBOPb3XmCW6QcuOibIUE6emHXHt9E/F/rCa6w==",
+      "deprecated": "This is a stub types definition. mime provides its own type definitions, so you do not need this installed.",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime": "*"
+      }
     },
     "node_modules/@types/minimatch": {
       "version": "3.0.3",
@@ -1381,6 +1386,19 @@
       "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
       "dev": true
     },
+    "node_modules/@vscode/vsce/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,
+      "license": "MIT",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@vscode/vsce/node_modules/semver": {
       "version": "7.6.3",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
@@ -3298,15 +3316,19 @@
       "dev": true
     },
     "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-4.1.0.tgz",
+      "integrity": "sha512-X5ju04+cAzsojXKes0B/S4tcYtFAJ6tTMuSPBEn9CPGlrWr8Fiw7qYeLT0XyH80HSoAoqWCaz+MWKh22P7G1cw==",
       "dev": true,
+      "funding": [
+        "https://github.com/sponsors/broofa"
+      ],
+      "license": "MIT",
       "bin": {
-        "mime": "cli.js"
+        "mime": "bin/cli.js"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=16"
       }
     },
     "node_modules/mimic-response": {
diff --git a/build/package.json b/build/package.json
index 434f5ec81b96..be7f4b283121 100644
--- a/build/package.json
+++ b/build/package.json
@@ -24,7 +24,7 @@
     "@types/gulp-sort": "^2.0.4",
     "@types/gulp-sourcemaps": "^0.0.32",
     "@types/jws": "^3.2.10",
-    "@types/mime": "0.0.29",
+    "@types/mime": "4.0.0",
     "@types/minimatch": "^3.0.3",
     "@types/minimist": "^1.2.1",
     "@types/mocha": "^9.1.1",
@@ -47,7 +47,7 @@
     "gulp-sort": "^2.0.0",
     "jsonc-parser": "^2.3.0",
     "jws": "^4.0.1",
-    "mime": "^1.4.1",
+    "mime": "^4.1.0",
     "source-map": "0.6.1",
     "ternary-stream": "^3.0.0",
     "through2": "^4.0.2",

From 14a7cd1e21a6edba55e32a927aa85e5490f76940 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 21:48:33 +0000
Subject: [PATCH 1174/1815] Bump @types/gulp from 4.0.17 to 4.0.18 in /build

Bumps [@types/gulp](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/gulp) from 4.0.17 to 4.0.18.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/gulp)

---
updated-dependencies:
- dependency-name: "@types/gulp"
  dependency-version: 4.0.18
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 9 +++++----
 build/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index f0efc4d4d2f8..4b532ded39a8 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -22,7 +22,7 @@
         "@types/fancy-log": "^1.3.0",
         "@types/fs-extra": "^9.0.12",
         "@types/glob": "^7.1.1",
-        "@types/gulp": "^4.0.17",
+        "@types/gulp": "^4.0.18",
         "@types/gulp-filter": "^3.0.32",
         "@types/gulp-gzip": "^0.0.31",
         "@types/gulp-json-editor": "^2.2.31",
@@ -1049,10 +1049,11 @@
       }
     },
     "node_modules/@types/gulp": {
-      "version": "4.0.17",
-      "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.17.tgz",
-      "integrity": "sha512-+pKQynu2C/HS16kgmDlAicjtFYP8kaa86eE9P0Ae7GB5W29we/E2TIdbOWtEZD5XkpY+jr8fyqfwO6SWZecLpQ==",
+      "version": "4.0.18",
+      "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.18.tgz",
+      "integrity": "sha512-IqkYa4sXkwH2uwqO2aXYOoAisJpLX13BPaS6lmEAoG4BbgOay3qqGQFsT9LMSSQVMQlEKU7wTUW0sPV46V0olw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "@types/undertaker": ">=1.2.6",
diff --git a/build/package.json b/build/package.json
index be7f4b283121..ba366daff310 100644
--- a/build/package.json
+++ b/build/package.json
@@ -16,7 +16,7 @@
     "@types/fancy-log": "^1.3.0",
     "@types/fs-extra": "^9.0.12",
     "@types/glob": "^7.1.1",
-    "@types/gulp": "^4.0.17",
+    "@types/gulp": "^4.0.18",
     "@types/gulp-filter": "^3.0.32",
     "@types/gulp-gzip": "^0.0.31",
     "@types/gulp-json-editor": "^2.2.31",

From ae6c8badcd74bcc36535ecafe9aaf3610f95b5db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 21:48:35 +0000
Subject: [PATCH 1175/1815] Bump @types/jws from 3.2.10 to 3.2.11 in /build

Bumps [@types/jws](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jws) from 3.2.10 to 3.2.11.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jws)

---
updated-dependencies:
- dependency-name: "@types/jws"
  dependency-version: 3.2.11
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 8 ++++----
 build/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index f0efc4d4d2f8..5c2b4a01fd55 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -29,7 +29,7 @@
         "@types/gulp-rename": "^0.0.33",
         "@types/gulp-sort": "^2.0.4",
         "@types/gulp-sourcemaps": "^0.0.32",
-        "@types/jws": "^3.2.10",
+        "@types/jws": "^3.2.11",
         "@types/mime": "4.0.0",
         "@types/minimatch": "^3.0.3",
         "@types/minimist": "^1.2.1",
@@ -1143,9 +1143,9 @@
       "dev": true
     },
     "node_modules/@types/jws": {
-      "version": "3.2.10",
-      "resolved": "https://registry.npmjs.org/@types/jws/-/jws-3.2.10.tgz",
-      "integrity": "sha512-cOevhttJmssERB88/+XvZXvsq5m9JLKZNUiGfgjUb5lcPRdV2ZQciU6dU76D/qXXFYpSqkP3PrSg4hMTiafTZw==",
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/@types/jws/-/jws-3.2.11.tgz",
+      "integrity": "sha512-OOaTrLV6XdF1XvBgMeH1MjNuOaGCrRZWNSIds1AQaRgLdOWlAk2yMsfrJn+ekLgUow3xksWIM231lyFab7mHHw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/build/package.json b/build/package.json
index be7f4b283121..e5594822a349 100644
--- a/build/package.json
+++ b/build/package.json
@@ -23,7 +23,7 @@
     "@types/gulp-rename": "^0.0.33",
     "@types/gulp-sort": "^2.0.4",
     "@types/gulp-sourcemaps": "^0.0.32",
-    "@types/jws": "^3.2.10",
+    "@types/jws": "^3.2.11",
     "@types/mime": "4.0.0",
     "@types/minimatch": "^3.0.3",
     "@types/minimist": "^1.2.1",

From a90bca79a01eb4eb02e5e126a39f3c2014495e6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 22:06:10 +0000
Subject: [PATCH 1176/1815] Bump @types/ncp from 2.0.1 to 2.0.8 in
 /test/automation

Bumps [@types/ncp](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/ncp) from 2.0.1 to 2.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/ncp)

---
updated-dependencies:
- dependency-name: "@types/ncp"
  dependency-version: 2.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/automation/package-lock.json | 9 +++++----
 test/automation/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
index 8a7c55fa154b..0b31a51deda6 100644
--- a/test/automation/package-lock.json
+++ b/test/automation/package-lock.json
@@ -15,7 +15,7 @@
         "vscode-uri": "3.1.0"
       },
       "devDependencies": {
-        "@types/ncp": "2.0.1",
+        "@types/ncp": "2.0.8",
         "@types/node": "24.x",
         "@types/tmp": "0.2.2",
         "cpx2": "8.0.0",
@@ -65,10 +65,11 @@
       }
     },
     "node_modules/@types/ncp": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/ncp/-/ncp-2.0.1.tgz",
-      "integrity": "sha512-TeiJ7uvv/92ugSqZ0v9l0eNXzutlki0aK+R1K5bfA5SYUil46ITlxLW4iNTCf55P4L5weCmaOdtxGeGWvudwPg==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@types/ncp/-/ncp-2.0.8.tgz",
+      "integrity": "sha512-pLNWVLCVWBLVM4F2OPjjK6FWFtByFKD7LhHryF+MbVLws7ENj09mKxRFlhkGPOXfJuaBAG+2iADKJsZwnAbYDw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
diff --git a/test/automation/package.json b/test/automation/package.json
index a1f5939bd511..11ef29956037 100644
--- a/test/automation/package.json
+++ b/test/automation/package.json
@@ -24,7 +24,7 @@
     "vscode-uri": "3.1.0"
   },
   "devDependencies": {
-    "@types/ncp": "2.0.1",
+    "@types/ncp": "2.0.8",
     "@types/node": "24.x",
     "@types/tmp": "0.2.2",
     "cpx2": "8.0.0",

From 87c1085c162fa93c373b26da6290064ed92093e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 22:10:00 +0000
Subject: [PATCH 1177/1815] Bump tmp from 0.2.4 to 0.2.5 in /test/automation

Bumps [tmp](https://github.com/raszi/node-tmp) from 0.2.4 to 0.2.5.
- [Changelog](https://github.com/raszi/node-tmp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/raszi/node-tmp/compare/v0.2.4...v0.2.5)

---
updated-dependencies:
- dependency-name: tmp
  dependency-version: 0.2.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/automation/package-lock.json | 8 ++++----
 test/automation/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
index 0b31a51deda6..cf887c6d6521 100644
--- a/test/automation/package-lock.json
+++ b/test/automation/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "ncp": "^2.0.0",
-        "tmp": "0.2.4",
+        "tmp": "0.2.5",
         "tree-kill": "1.2.2",
         "vscode-uri": "3.1.0"
       },
@@ -1564,9 +1564,9 @@
       }
     },
     "node_modules/tmp": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.4.tgz",
-      "integrity": "sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
+      "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
       "license": "MIT",
       "engines": {
         "node": ">=14.14"
diff --git a/test/automation/package.json b/test/automation/package.json
index 11ef29956037..646527656163 100644
--- a/test/automation/package.json
+++ b/test/automation/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "ncp": "^2.0.0",
-    "tmp": "0.2.4",
+    "tmp": "0.2.5",
     "tree-kill": "1.2.2",
     "vscode-uri": "3.1.0"
   },

From f5c144f4018104846905b8d3f8b364eea6970b83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 22:20:25 +0000
Subject: [PATCH 1178/1815] Bump @vscode/sync-api-service

Bumps [@vscode/sync-api-service](https://github.com/microsoft/vscode-wasm) from 0.7.3 to 0.8.1.
- [Release notes](https://github.com/microsoft/vscode-wasm/releases)
- [Commits](https://github.com/microsoft/vscode-wasm/commits)

---
updated-dependencies:
- dependency-name: "@vscode/sync-api-service"
  dependency-version: 0.8.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 44 +++++++++++++------
 .../typescript-language-features/package.json |  2 +-
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/extensions/typescript-language-features/package-lock.json b/extensions/typescript-language-features/package-lock.json
index 78d5fd0bac9a..1cca96cb16f3 100644
--- a/extensions/typescript-language-features/package-lock.json
+++ b/extensions/typescript-language-features/package-lock.json
@@ -12,7 +12,7 @@
         "@vscode/extension-telemetry": "^1.2.0",
         "@vscode/sync-api-client": "^0.8.1",
         "@vscode/sync-api-common": "^0.7.2",
-        "@vscode/sync-api-service": "^0.7.3",
+        "@vscode/sync-api-service": "^0.8.1",
         "@vscode/ts-package-manager": "^0.0.2",
         "jsonc-parser": "^3.3.1",
         "semver": "7.7.3",
@@ -213,23 +213,28 @@
       }
     },
     "node_modules/@vscode/sync-api-service": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/@vscode/sync-api-service/-/sync-api-service-0.7.3.tgz",
-      "integrity": "sha512-m2AmmfG4uzfjLMgWRHQ3xnBkdwCiUTO68vdw1XuzMsOb39Jwm9xr5bVVxwOFR9lPC0FfO1H6FUxBhZQvg7itPA==",
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@vscode/sync-api-service/-/sync-api-service-0.8.1.tgz",
+      "integrity": "sha512-W9mWVJcnxqqmGIgYKwddMuBsCFff+nxkA67nGlnRGUjpu6Mb+CoYaYLwFriq2c74zpRyMsON7Nfhh5zlFvTAeg==",
+      "license": "MIT",
       "dependencies": {
-        "@vscode/sync-api-common": "0.7.2",
-        "vscode-uri": "3.0.3"
+        "@vscode/sync-api-common": "0.8.1",
+        "uuid": "^9.0.0",
+        "vscode-uri": "^3.0.6"
       },
       "engines": {
-        "node": ">=16.15.1",
-        "vscode": "^1.67.0"
+        "node": ">=16.14.2",
+        "vscode": "^1.71.0"
       }
     },
-    "node_modules/@vscode/sync-api-service/node_modules/vscode-uri": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz",
-      "integrity": "sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==",
-      "license": "MIT"
+    "node_modules/@vscode/sync-api-service/node_modules/@vscode/sync-api-common": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@vscode/sync-api-common/-/sync-api-common-0.8.1.tgz",
+      "integrity": "sha512-XfanQNxkUlCpAsQ2+1SzNEdoY7jtcu48jYBR0n864ZWAWrH7m2QBK32YoNlrDN2V0eh8tdF0WH1NuHOm3Y021A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=16.14.2"
+      }
     },
     "node_modules/@vscode/ts-package-manager": {
       "version": "0.0.2",
@@ -269,6 +274,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/vscode-tas-client": {
       "version": "0.1.84",
       "resolved": "https://registry.npmjs.org/vscode-tas-client/-/vscode-tas-client-0.1.84.tgz",
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 915b11390010..92a679408822 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -40,7 +40,7 @@
     "@vscode/extension-telemetry": "^1.2.0",
     "@vscode/sync-api-client": "^0.8.1",
     "@vscode/sync-api-common": "^0.7.2",
-    "@vscode/sync-api-service": "^0.7.3",
+    "@vscode/sync-api-service": "^0.8.1",
     "@vscode/ts-package-manager": "^0.0.2",
     "jsonc-parser": "^3.3.1",
     "semver": "7.7.3",

From 726b7257310d620079ebb7a1ca8c1ff815e0234a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 23:32:08 +0000
Subject: [PATCH 1179/1815] build(deps): Bump @xterm/addon-webgl in /remote/web

Bumps [@xterm/addon-webgl](https://github.com/xtermjs/xterm.js) from 0.19.0-beta.98 to 0.19.0-beta.140.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-webgl"
  dependency-version: 0.19.0-beta.140
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 3f9f14de3e63..54905b8aac54 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -20,7 +20,7 @@
 				"@xterm/addon-search": "^0.16.0-beta.140",
 				"@xterm/addon-serialize": "^0.14.0-beta.98",
 				"@xterm/addon-unicode11": "^0.9.0-beta.98",
-				"@xterm/addon-webgl": "^0.19.0-beta.98",
+				"@xterm/addon-webgl": "^0.19.0-beta.140",
 				"@xterm/xterm": "^5.6.0-beta.140",
 				"jschardet": "3.1.4",
 				"tas-client-umd": "0.2.0",
@@ -165,12 +165,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-webgl": {
-			"version": "0.19.0-beta.98",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.98.tgz",
-			"integrity": "sha512-09FbNHgN2ad/8JI+AEyg8C3msyk04ET1FihQIpTeWPfd2LJIAdps7G4St2+qzZbhlFkR6m9Dgrgh/AC2uegh8A==",
+			"version": "0.19.0-beta.140",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.140.tgz",
+			"integrity": "sha512-CV10uRnoAUeAKOYES+0/Mh6IPEhtIH+agC1J3PCCL6y9TAnXN67YQMziG18FYn8cTQYgeSpsXx/Q+suBCGbfkA==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.98"
+				"@xterm/xterm": "^5.6.0-beta.140"
 			}
 		},
 		"node_modules/@xterm/xterm": {
diff --git a/remote/web/package.json b/remote/web/package.json
index e02d8ae95bf9..f8e66fe2f477 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -15,7 +15,7 @@
 		"@xterm/addon-search": "^0.16.0-beta.140",
 		"@xterm/addon-serialize": "^0.14.0-beta.98",
 		"@xterm/addon-unicode11": "^0.9.0-beta.98",
-		"@xterm/addon-webgl": "^0.19.0-beta.98",
+		"@xterm/addon-webgl": "^0.19.0-beta.140",
 		"@xterm/xterm": "^5.6.0-beta.140",
 		"jschardet": "3.1.4",
 		"tas-client-umd": "0.2.0",

From c2467b5facbc6052a6617a1a43ac0213435a6cfd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 23:32:09 +0000
Subject: [PATCH 1180/1815] Bump @xterm/addon-image in /remote/web

Bumps [@xterm/addon-image](https://github.com/xtermjs/xterm.js) from 0.9.0-beta.98 to 0.9.0-beta.140.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-image"
  dependency-version: 0.9.0-beta.140
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 3f9f14de3e63..22b77f60191d 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -14,7 +14,7 @@
 				"@vscode/tree-sitter-wasm": "^0.3.0",
 				"@vscode/vscode-languagedetection": "1.0.21",
 				"@xterm/addon-clipboard": "^0.2.0-beta.81",
-				"@xterm/addon-image": "^0.9.0-beta.98",
+				"@xterm/addon-image": "^0.9.0-beta.140",
 				"@xterm/addon-ligatures": "^0.10.0-beta.140",
 				"@xterm/addon-progress": "^0.2.0-beta.4",
 				"@xterm/addon-search": "^0.16.0-beta.140",
@@ -104,12 +104,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-image": {
-			"version": "0.9.0-beta.98",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.98.tgz",
-			"integrity": "sha512-yJaezwUc1Y3QYCmYSpjFW9IzMTLPSqrRCgdPnQ0JbCAVASRVmH6DLRfeikheJCvoXW6VUwMmGkb3fSplTxiV1w==",
+			"version": "0.9.0-beta.140",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.140.tgz",
+			"integrity": "sha512-9FG1ke2lAkDqvw7K/BY/UCjwF1OS3ME6s+FBpBQIMIA+Bhexm8TjhvYjQMK1aJgX39Y6vvmWflbiC4Xz20H38w==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.98"
+				"@xterm/xterm": "^5.6.0-beta.140"
 			}
 		},
 		"node_modules/@xterm/addon-ligatures": {
diff --git a/remote/web/package.json b/remote/web/package.json
index e02d8ae95bf9..ecfb8874adbd 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -9,7 +9,7 @@
 		"@vscode/tree-sitter-wasm": "^0.3.0",
 		"@vscode/vscode-languagedetection": "1.0.21",
 		"@xterm/addon-clipboard": "^0.2.0-beta.81",
-		"@xterm/addon-image": "^0.9.0-beta.98",
+		"@xterm/addon-image": "^0.9.0-beta.140",
 		"@xterm/addon-ligatures": "^0.10.0-beta.140",
 		"@xterm/addon-progress": "^0.2.0-beta.4",
 		"@xterm/addon-search": "^0.16.0-beta.140",

From a232407d653f15b65e96e1f31ad561ab3c81540b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 07:43:56 +0000
Subject: [PATCH 1181/1815] build(deps): Bump vscode-textmate from 9.2.0 to
 9.3.0 in /remote/web

Bumps [vscode-textmate](https://github.com/microsoft/vscode-textmate) from 9.2.0 to 9.3.0.
- [Release notes](https://github.com/microsoft/vscode-textmate/releases)
- [Commits](https://github.com/microsoft/vscode-textmate/compare/v9.2.0...v9.3.0)

---
updated-dependencies:
- dependency-name: vscode-textmate
  dependency-version: 9.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 8 ++++----
 remote/web/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 5b3a23c569aa..617c0e9d6fb2 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -25,7 +25,7 @@
 				"jschardet": "3.1.4",
 				"tas-client-umd": "0.2.0",
 				"vscode-oniguruma": "2.0.1",
-				"vscode-textmate": "9.2.0"
+				"vscode-textmate": "9.3.0"
 			}
 		},
 		"node_modules/@microsoft/1ds-core-js": {
@@ -364,9 +364,9 @@
 			"license": "MIT"
 		},
 		"node_modules/vscode-textmate": {
-			"version": "9.2.0",
-			"resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.2.0.tgz",
-			"integrity": "sha512-rkvG4SraZQaPSN/5XjwKswdU0OP9MF28QjrYzUBbhb8QyG3ljB1Ky996m++jiI7KdiAP2CkBiQZd9pqEDTClqA==",
+			"version": "9.3.0",
+			"resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.3.0.tgz",
+			"integrity": "sha512-zHiZZOdb9xqj5/X1C4a29sbgT2HngdWxPLSl3PyHRQF+5visI4uNM020OHiLJjsMxUssyk/pGVAg/9LCIobrVg==",
 			"license": "MIT"
 		},
 		"node_modules/yallist": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 3afc69b6d8cc..8eb6258e0804 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -20,6 +20,6 @@
 		"jschardet": "3.1.4",
 		"tas-client-umd": "0.2.0",
 		"vscode-oniguruma": "2.0.1",
-		"vscode-textmate": "9.2.0"
+		"vscode-textmate": "9.3.0"
 	}
 }

From c4befc1a49f584eece54754d6003352fa3a72efa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 12:31:25 +0000
Subject: [PATCH 1182/1815] build(deps-dev): Bump tree-sitter from 0.20.6 to
 0.25.0 in /build

Bumps [tree-sitter](https://github.com/tree-sitter/node-tree-sitter) from 0.20.6 to 0.25.0.
- [Release notes](https://github.com/tree-sitter/node-tree-sitter/releases)
- [Commits](https://github.com/tree-sitter/node-tree-sitter/compare/v0.20.6...v0.25.0)

---
updated-dependencies:
- dependency-name: tree-sitter
  dependency-version: 0.25.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 99 ++++++++++++++++++++++++++++-------------
 build/package.json      |  2 +-
 2 files changed, 68 insertions(+), 33 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index f0efc4d4d2f8..99891542b30e 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -57,7 +57,7 @@
         "source-map": "0.6.1",
         "ternary-stream": "^3.0.0",
         "through2": "^4.0.2",
-        "tree-sitter": "^0.20.5",
+        "tree-sitter": "^0.25.0",
         "vscode-universal-bundler": "^0.1.3",
         "workerpool": "^6.4.0",
         "yauzl": "^2.10.0"
@@ -1598,7 +1598,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
       "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "devOptional": true,
+      "optional": true,
       "dependencies": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
@@ -1651,7 +1651,6 @@
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
       "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "devOptional": true,
       "funding": [
         {
           "type": "github",
@@ -1666,6 +1665,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "optional": true,
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
@@ -1840,7 +1840,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "devOptional": true
+      "optional": true
     },
     "node_modules/clone": {
       "version": "2.1.2",
@@ -2037,7 +2037,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "devOptional": true,
+      "optional": true,
       "engines": {
         "node": ">=4.0.0"
       }
@@ -2094,7 +2094,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
       "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
-      "devOptional": true,
+      "optional": true,
       "engines": {
         "node": ">=8"
       }
@@ -2350,7 +2350,7 @@
       "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==",
-      "devOptional": true,
+      "optional": true,
       "engines": {
         "node": ">=6"
       }
@@ -2490,7 +2490,7 @@
       "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==",
-      "devOptional": true
+      "optional": true
     },
     "node_modules/fs-extra": {
       "version": "8.1.0",
@@ -2572,7 +2572,7 @@
       "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==",
-      "devOptional": true
+      "optional": true
     },
     "node_modules/glob": {
       "version": "7.2.3",
@@ -2886,7 +2886,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "devOptional": true,
       "funding": [
         {
           "type": "github",
@@ -2900,7 +2899,8 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "optional": true
     },
     "node_modules/inflight": {
       "version": "1.0.6",
@@ -2923,7 +2923,7 @@
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "devOptional": true
+      "optional": true
     },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
@@ -3362,7 +3362,7 @@
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-      "devOptional": true
+      "optional": true
     },
     "node_modules/ms": {
       "version": "2.1.2",
@@ -3380,19 +3380,19 @@
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz",
       "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==",
-      "devOptional": true
+      "optional": true
     },
     "node_modules/napi-build-utils": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
       "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
-      "devOptional": true
+      "optional": true
     },
     "node_modules/node-abi": {
       "version": "3.30.0",
       "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.30.0.tgz",
       "integrity": "sha512-qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw==",
-      "devOptional": true,
+      "optional": true,
       "dependencies": {
         "semver": "^7.3.5"
       },
@@ -3404,7 +3404,7 @@
       "version": "7.5.4",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
       "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "devOptional": true,
+      "optional": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -3428,6 +3428,18 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/node-gyp-build": {
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
+      "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -3672,7 +3684,7 @@
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
       "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
-      "devOptional": true,
+      "optional": true,
       "dependencies": {
         "detect-libc": "^2.0.0",
         "expand-template": "^2.0.3",
@@ -3763,7 +3775,7 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "devOptional": true,
+      "optional": true,
       "dependencies": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -3976,7 +3988,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
       "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-      "devOptional": true,
       "funding": [
         {
           "type": "github",
@@ -3990,13 +4001,13 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "optional": true
     },
     "node_modules/simple-get": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
       "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
-      "devOptional": true,
       "funding": [
         {
           "type": "github",
@@ -4011,6 +4022,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "optional": true,
       "dependencies": {
         "decompress-response": "^6.0.0",
         "once": "^1.3.1",
@@ -4105,7 +4117,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo= sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-      "devOptional": true,
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4145,8 +4157,8 @@
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
       "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
-      "devOptional": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "chownr": "^1.1.1",
         "mkdirp-classic": "^0.5.2",
@@ -4158,7 +4170,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
       "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "devOptional": true,
+      "optional": true,
       "dependencies": {
         "bl": "^4.0.3",
         "end-of-stream": "^1.4.1",
@@ -4239,14 +4251,15 @@
       }
     },
     "node_modules/tree-sitter": {
-      "version": "0.20.6",
-      "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.20.6.tgz",
-      "integrity": "sha512-GxJodajVpfgb3UREzzIbtA1hyRnTxVbWVXrbC6sk4xTMH5ERMBJk9HJNq4c8jOJeUaIOmLcwg+t6mez/PDvGqg==",
-      "devOptional": true,
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.25.0.tgz",
+      "integrity": "sha512-PGZZzFW63eElZJDe/b/R/LbsjDDYJa5UEjLZJB59RQsMX+fo0j54fqBPn1MGKav/QNa0JR0zBiVaikYDWCj5KQ==",
+      "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
-        "nan": "^2.18.0",
-        "prebuild-install": "^7.1.1"
+        "node-addon-api": "^8.3.0",
+        "node-gyp-build": "^4.8.4"
       }
     },
     "node_modules/tree-sitter-typescript": {
@@ -4260,6 +4273,28 @@
         "tree-sitter": "^0.20.6"
       }
     },
+    "node_modules/tree-sitter-typescript/node_modules/tree-sitter": {
+      "version": "0.20.6",
+      "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.20.6.tgz",
+      "integrity": "sha512-GxJodajVpfgb3UREzzIbtA1hyRnTxVbWVXrbC6sk4xTMH5ERMBJk9HJNq4c8jOJeUaIOmLcwg+t6mez/PDvGqg==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "nan": "^2.18.0",
+        "prebuild-install": "^7.1.1"
+      }
+    },
+    "node_modules/tree-sitter/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==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18 || ^20 || >= 21"
+      }
+    },
     "node_modules/tslib": {
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
@@ -4279,7 +4314,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-      "devOptional": true,
+      "optional": true,
       "dependencies": {
         "safe-buffer": "^5.0.1"
       },
diff --git a/build/package.json b/build/package.json
index be7f4b283121..c6ed13781448 100644
--- a/build/package.json
+++ b/build/package.json
@@ -51,7 +51,7 @@
     "source-map": "0.6.1",
     "ternary-stream": "^3.0.0",
     "through2": "^4.0.2",
-    "tree-sitter": "^0.20.5",
+    "tree-sitter": "^0.25.0",
     "vscode-universal-bundler": "^0.1.3",
     "workerpool": "^6.4.0",
     "yauzl": "^2.10.0"

From 8556d4e1cf2f06dcf9951d56594a3b8e76558285 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 12:35:09 +0000
Subject: [PATCH 1183/1815] build(deps): Bump @vscode/vscode-languagedetection
 in /remote

Bumps [@vscode/vscode-languagedetection](https://github.com/microsoft/vscode-languagedetection) from 1.0.21 to 1.0.22.
- [Commits](https://github.com/microsoft/vscode-languagedetection/commits)

---
updated-dependencies:
- dependency-name: "@vscode/vscode-languagedetection"
  dependency-version: 1.0.22
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 9 +++++----
 remote/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 44065698be49..3ff6302fad03 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -17,7 +17,7 @@
         "@vscode/ripgrep": "^1.15.11",
         "@vscode/spdlog": "^0.15.0",
         "@vscode/tree-sitter-wasm": "^0.1.3",
-        "@vscode/vscode-languagedetection": "1.0.21",
+        "@vscode/vscode-languagedetection": "1.0.22",
         "@vscode/windows-process-tree": "^0.6.2",
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.2.0-beta.123",
@@ -477,9 +477,10 @@
       "license": "MIT"
     },
     "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==",
+      "version": "1.0.22",
+      "resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.22.tgz",
+      "integrity": "sha512-rQ/BgMyLuIXSmbA0MSkIPHtcOw14QkeDbAq19sjvaS9LTRr905yij0S8lsyqN5JgOsbtIx7pAcyOxFMzPmqhZQ==",
+      "license": "MIT",
       "bin": {
         "vscode-languagedetection": "cli/index.js"
       }
diff --git a/remote/package.json b/remote/package.json
index f367bd2506d8..c36125b4a8b0 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -12,7 +12,7 @@
     "@vscode/ripgrep": "^1.15.11",
     "@vscode/spdlog": "^0.15.0",
     "@vscode/tree-sitter-wasm": "^0.1.3",
-    "@vscode/vscode-languagedetection": "1.0.21",
+    "@vscode/vscode-languagedetection": "1.0.22",
     "@vscode/windows-process-tree": "^0.6.2",
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.2.0-beta.123",

From d01f6f899527b97dcd5738c4c0214951670de3b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 12:35:41 +0000
Subject: [PATCH 1184/1815] Bump which from 4.0.0 to 6.0.0 in /extensions/git

Bumps [which](https://github.com/npm/node-which) from 4.0.0 to 6.0.0.
- [Release notes](https://github.com/npm/node-which/releases)
- [Changelog](https://github.com/npm/node-which/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-which/compare/v4.0.0...v6.0.0)

---
updated-dependencies:
- dependency-name: which
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 11 ++++++-----
 extensions/git/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index e0b5d9036b9f..2aca987f6f2c 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -17,7 +17,7 @@
         "jschardet": "3.1.4",
         "picomatch": "2.3.1",
         "vscode-uri": "^3.1.0",
-        "which": "4.0.0"
+        "which": "6.0.0"
       },
       "devDependencies": {
         "@types/byline": "4.2.31",
@@ -407,9 +407,10 @@
       "license": "MIT"
     },
     "node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-6.0.0.tgz",
+      "integrity": "sha512-f+gEpIKMR9faW/JgAgPK1D7mekkFoqbmiwvNzuhsHetni20QSgzg9Vhn0g2JSJkkfehQnqdUAx7/e15qS1lPxg==",
+      "license": "ISC",
       "dependencies": {
         "isexe": "^3.1.1"
       },
@@ -417,7 +418,7 @@
         "node-which": "bin/which.js"
       },
       "engines": {
-        "node": "^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     }
   }
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 6dcaac256c0e..5f589d585e08 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3568,7 +3568,7 @@
     "jschardet": "3.1.4",
     "picomatch": "2.3.1",
     "vscode-uri": "^3.1.0",
-    "which": "4.0.0"
+    "which": "6.0.0"
   },
   "devDependencies": {
     "@types/byline": "4.2.31",

From 64dca887c2edcd0838f005ec7edeb5b795ae88cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Dec 2025 02:17:44 +0000
Subject: [PATCH 1185/1815] Bump @types/byline from 4.2.31 to 4.2.36 in
 /extensions/git

Bumps [@types/byline](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/byline) from 4.2.31 to 4.2.36.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/byline)

---
updated-dependencies:
- dependency-name: "@types/byline"
  dependency-version: 4.2.36
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 9 +++++----
 extensions/git/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index 2aca987f6f2c..19d31dc7bcfa 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -20,7 +20,7 @@
         "which": "6.0.0"
       },
       "devDependencies": {
-        "@types/byline": "4.2.31",
+        "@types/byline": "4.2.36",
         "@types/mocha": "^9.1.1",
         "@types/node": "20.x",
         "@types/picomatch": "2.3.0",
@@ -197,10 +197,11 @@
       "license": "MIT"
     },
     "node_modules/@types/byline": {
-      "version": "4.2.31",
-      "resolved": "https://registry.npmjs.org/@types/byline/-/byline-4.2.31.tgz",
-      "integrity": "sha1-DmH8ucA+BH0hxEllVMcRYperYM0= sha512-TC6Ljn7tALesQMQyTNoMWoM44SNvWtCLkJDrA/TxcwE5ILkWt4zi5wbEokqiDk42S75eykAY1onPImWDybOkmQ==",
+      "version": "4.2.36",
+      "resolved": "https://registry.npmjs.org/@types/byline/-/byline-4.2.36.tgz",
+      "integrity": "sha512-dO55KDSaOSE+3T8TwP66mzn0u/PM/aSedVMr1tby7WBNjfLIuS6IbYXi1mlau49sVSVB+gXKJscWE0JO3tlXDw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 5f589d585e08..648845cff5a3 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3571,7 +3571,7 @@
     "which": "6.0.0"
   },
   "devDependencies": {
-    "@types/byline": "4.2.31",
+    "@types/byline": "4.2.36",
     "@types/mocha": "^9.1.1",
     "@types/node": "20.x",
     "@types/picomatch": "2.3.0",

From 7b1afab6d6649b12429712efc7d5f196c6ab808b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Dec 2025 02:27:54 +0000
Subject: [PATCH 1186/1815] Bump @types/node in
 /extensions/json-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.12.5 to 24.10.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.10.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../server/package-lock.json                  | 20 ++++++++++---------
 .../server/package.json                       |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/json-language-features/server/package-lock.json b/extensions/json-language-features/server/package-lock.json
index db67f51ee2f9..50f18461418f 100644
--- a/extensions/json-language-features/server/package-lock.json
+++ b/extensions/json-language-features/server/package-lock.json
@@ -21,7 +21,7 @@
       },
       "devDependencies": {
         "@types/mocha": "^9.1.1",
-        "@types/node": "20.x"
+        "@types/node": "24.x"
       },
       "engines": {
         "node": "*"
@@ -34,12 +34,13 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.12.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.5.tgz",
-      "integrity": "sha512-BD+BjQ9LS/D8ST9p5uqBxghlN+S42iuNxjsUGjeZobe/ciXzk2qb1B6IXc6AnRLS+yFJRpN2IPEHMzwspfDJNw==",
+      "version": "24.10.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
+      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@vscode/l10n": {
@@ -58,10 +59,11 @@
       "integrity": "sha512-bH6E4PMmsEXYrLX6Kr1vu+xI3HproB1vECAwaPSJeroLE1kpWE3HR27uB4icx+6YORu1ajqBJXxuedv8ZQg5Lw=="
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vscode-json-languageservice": {
       "version": "5.6.4",
diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json
index 6dcd82930d23..b768b3324cbf 100644
--- a/extensions/json-language-features/server/package.json
+++ b/extensions/json-language-features/server/package.json
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "@types/mocha": "^9.1.1",
-    "@types/node": "20.x"
+    "@types/node": "24.x"
   },
   "scripts": {
     "prepublishOnly": "npm run clean && npm run compile",

From 58bdbf8a56dd7adf01fad542764a6142ec7677d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Dec 2025 03:40:35 +0000
Subject: [PATCH 1187/1815] Bump @types/mocha from 9.1.1 to 10.0.10 in
 /extensions/git

Bumps [@types/mocha](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mocha) from 9.1.1 to 10.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mocha)

---
updated-dependencies:
- dependency-name: "@types/mocha"
  dependency-version: 10.0.10
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 11 ++++++-----
 extensions/git/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index 19d31dc7bcfa..062a443e4029 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -21,7 +21,7 @@
       },
       "devDependencies": {
         "@types/byline": "4.2.36",
-        "@types/mocha": "^9.1.1",
+        "@types/mocha": "^10.0.10",
         "@types/node": "20.x",
         "@types/picomatch": "2.3.0",
         "@types/which": "3.0.0"
@@ -207,10 +207,11 @@
       }
     },
     "node_modules/@types/mocha": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
-      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
-      "dev": true
+      "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": "20.11.24",
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 648845cff5a3..1942320e8bb3 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3572,7 +3572,7 @@
   },
   "devDependencies": {
     "@types/byline": "4.2.36",
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.10",
     "@types/node": "20.x",
     "@types/picomatch": "2.3.0",
     "@types/which": "3.0.0"

From 3b1c37d0da7d22ee5143fec8d0f99245704e0d8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Dec 2025 03:58:04 +0000
Subject: [PATCH 1188/1815] Bump @types/mocha in
 /extensions/json-language-features/server

Bumps [@types/mocha](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mocha) from 9.1.1 to 10.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mocha)

---
updated-dependencies:
- dependency-name: "@types/mocha"
  dependency-version: 10.0.10
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../json-language-features/server/package-lock.json   | 11 ++++++-----
 extensions/json-language-features/server/package.json |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/json-language-features/server/package-lock.json b/extensions/json-language-features/server/package-lock.json
index 50f18461418f..3cd5c6cd61cd 100644
--- a/extensions/json-language-features/server/package-lock.json
+++ b/extensions/json-language-features/server/package-lock.json
@@ -20,7 +20,7 @@
         "vscode-json-languageserver": "bin/vscode-json-languageserver"
       },
       "devDependencies": {
-        "@types/mocha": "^9.1.1",
+        "@types/mocha": "^10.0.10",
         "@types/node": "24.x"
       },
       "engines": {
@@ -28,10 +28,11 @@
       }
     },
     "node_modules/@types/mocha": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
-      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
-      "dev": true
+      "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": "24.10.1",
diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json
index b768b3324cbf..34018cb2b28f 100644
--- a/extensions/json-language-features/server/package.json
+++ b/extensions/json-language-features/server/package.json
@@ -20,7 +20,7 @@
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.10",
     "@types/node": "24.x"
   },
   "scripts": {

From 3244ec25516ec7501c31d0088ca957a4b9151c25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Dec 2025 20:30:22 +0000
Subject: [PATCH 1189/1815] Bump picomatch and @types/picomatch in
 /extensions/git

Bumps [picomatch](https://github.com/micromatch/picomatch) and [@types/picomatch](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/picomatch). These dependencies needed to be updated together.

Updates `picomatch` from 2.3.1 to 4.0.3
- [Release notes](https://github.com/micromatch/picomatch/releases)
- [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/picomatch/compare/2.3.1...4.0.3)

Updates `@types/picomatch` from 2.3.0 to 4.0.2
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/picomatch)

---
updated-dependencies:
- dependency-name: picomatch
  dependency-version: 4.0.3
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: "@types/picomatch"
  dependency-version: 4.0.2
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 22 ++++++++++++----------
 extensions/git/package.json      |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index 062a443e4029..db8b152cf012 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -15,7 +15,7 @@
         "byline": "^5.0.0",
         "file-type": "21.1.1",
         "jschardet": "3.1.4",
-        "picomatch": "2.3.1",
+        "picomatch": "4.0.3",
         "vscode-uri": "^3.1.0",
         "which": "6.0.0"
       },
@@ -23,7 +23,7 @@
         "@types/byline": "4.2.36",
         "@types/mocha": "^10.0.10",
         "@types/node": "20.x",
-        "@types/picomatch": "2.3.0",
+        "@types/picomatch": "4.0.2",
         "@types/which": "3.0.0"
       },
       "engines": {
@@ -223,10 +223,11 @@
       }
     },
     "node_modules/@types/picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@types/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-O397rnSS9iQI4OirieAtsDqvCj4+3eY1J+EPdNTKuHuRWIfUoGyzX294o8C4KJYaLqgSrd2o60c5EqCU8Zv02g==",
-      "dev": true
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-qHHxQ+P9PysNEGbALT8f8YOSHW0KJu6l2xU8DYY0fu/EmGxXdVnuTLvFUvBgPJMSqXq29SYHveejeAha+4AYgA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/which": {
       "version": "3.0.0",
@@ -340,11 +341,12 @@
       "license": "MIT"
     },
     "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"
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 1942320e8bb3..d347a466084e 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3566,7 +3566,7 @@
     "byline": "^5.0.0",
     "file-type": "21.1.1",
     "jschardet": "3.1.4",
-    "picomatch": "2.3.1",
+    "picomatch": "4.0.3",
     "vscode-uri": "^3.1.0",
     "which": "6.0.0"
   },
@@ -3574,7 +3574,7 @@
     "@types/byline": "4.2.36",
     "@types/mocha": "^10.0.10",
     "@types/node": "20.x",
-    "@types/picomatch": "2.3.0",
+    "@types/picomatch": "4.0.2",
     "@types/which": "3.0.0"
   },
   "repository": {

From fcbfe41bff4d1c2dc256a5bdaf87ff35081a562c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Dec 2025 22:40:44 +0000
Subject: [PATCH 1190/1815] build(deps): Bump @xterm/headless in /remote

Bumps [@xterm/headless](https://github.com/xtermjs/xterm.js) from 5.6.0-beta.98 to 5.6.0-beta.140.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/headless"
  dependency-version: 5.6.0-beta.140
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 13 ++++++++-----
 remote/package.json      |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 2f5f184c3240..ea92d0cc5c75 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -28,7 +28,7 @@
         "@xterm/addon-serialize": "^0.14.0-beta.140",
         "@xterm/addon-unicode11": "^0.9.0-beta.98",
         "@xterm/addon-webgl": "^0.19.0-beta.98",
-        "@xterm/headless": "^5.6.0-beta.98",
+        "@xterm/headless": "^5.6.0-beta.140",
         "@xterm/xterm": "^5.6.0-beta.98",
         "cookie": "^0.7.0",
         "http-proxy-agent": "^7.0.0",
@@ -607,10 +607,13 @@
       }
     },
     "node_modules/@xterm/headless": {
-      "version": "5.6.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.6.0-beta.98.tgz",
-      "integrity": "sha512-nRl5NyNHajvxNy1N/h0+vEO9tgBgYU8kN/SApBzezGYjcKhs81MYVr5uO1uMKb2eq5eTXBW8BtcyD3KqGoqkEA==",
-      "license": "MIT"
+      "version": "5.6.0-beta.140",
+      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.6.0-beta.140.tgz",
+      "integrity": "sha512-gPXOQQ1pepFt6+9gsKWfKFDMATFUbU754SsL0CzAsgKzNSHbu+2vvF2sFXWuMvY8aqMg+mq4nmNaDgyls4/SYA==",
+      "license": "MIT",
+      "workspaces": [
+        "addons/*"
+      ]
     },
     "node_modules/@xterm/xterm": {
       "version": "5.6.0-beta.98",
diff --git a/remote/package.json b/remote/package.json
index 0cf6dccbed02..167017051ac4 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -23,7 +23,7 @@
     "@xterm/addon-serialize": "^0.14.0-beta.140",
     "@xterm/addon-unicode11": "^0.9.0-beta.98",
     "@xterm/addon-webgl": "^0.19.0-beta.98",
-    "@xterm/headless": "^5.6.0-beta.98",
+    "@xterm/headless": "^5.6.0-beta.140",
     "@xterm/xterm": "^5.6.0-beta.98",
     "cookie": "^0.7.0",
     "http-proxy-agent": "^7.0.0",

From 74c9e1fe52cf9b92db5546d31aeb7403b93c14ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 7 Dec 2025 04:06:19 +0000
Subject: [PATCH 1191/1815] Bump @types/mocha from 9.1.1 to 10.0.10 in
 /extensions/vscode-api-tests

Bumps [@types/mocha](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mocha) from 9.1.1 to 10.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mocha)

---
updated-dependencies:
- dependency-name: "@types/mocha"
  dependency-version: 10.0.10
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-api-tests/package-lock.json | 11 ++++++-----
 extensions/vscode-api-tests/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/vscode-api-tests/package-lock.json b/extensions/vscode-api-tests/package-lock.json
index 0d4552531a53..e1e592265b86 100644
--- a/extensions/vscode-api-tests/package-lock.json
+++ b/extensions/vscode-api-tests/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.0.1",
       "license": "MIT",
       "devDependencies": {
-        "@types/mocha": "^9.1.1",
+        "@types/mocha": "^10.0.10",
         "@types/node": "24.x",
         "@types/node-forge": "^1.3.11",
         "node-forge": "^1.3.2",
@@ -20,10 +20,11 @@
       }
     },
     "node_modules/@types/mocha": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
-      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
-      "dev": true
+      "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": "24.10.1",
diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
index 212336f37e6e..9ffbaf0dbaef 100644
--- a/extensions/vscode-api-tests/package.json
+++ b/extensions/vscode-api-tests/package.json
@@ -251,7 +251,7 @@
     "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-api-tests ./tsconfig.json"
   },
   "devDependencies": {
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.10",
     "@types/node": "24.x",
     "@types/node-forge": "^1.3.11",
     "node-forge": "^1.3.2",

From 2177b67685fd2f42a0e88d8cb870ff766b364a53 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 7 Dec 2025 06:32:00 +0000
Subject: [PATCH 1192/1815] Bump jsonc-parser in
 /extensions/vscode-colorize-perf-tests

Bumps [jsonc-parser](https://github.com/microsoft/node-jsonc-parser) from 3.2.0 to 3.3.1.
- [Release notes](https://github.com/microsoft/node-jsonc-parser/releases)
- [Changelog](https://github.com/microsoft/node-jsonc-parser/blob/main/CHANGELOG.md)
- [Commits](https://github.com/microsoft/node-jsonc-parser/compare/v3.2.0...v3.3.1)

---
updated-dependencies:
- dependency-name: jsonc-parser
  dependency-version: 3.3.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-colorize-perf-tests/package-lock.json | 9 +++++----
 extensions/vscode-colorize-perf-tests/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/vscode-colorize-perf-tests/package-lock.json b/extensions/vscode-colorize-perf-tests/package-lock.json
index feaf320fec5f..446dd2fad4fd 100644
--- a/extensions/vscode-colorize-perf-tests/package-lock.json
+++ b/extensions/vscode-colorize-perf-tests/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.0.1",
       "license": "MIT",
       "dependencies": {
-        "jsonc-parser": "^3.2.0"
+        "jsonc-parser": "^3.3.1"
       },
       "devDependencies": {
         "@types/node": "24.x"
@@ -29,9 +29,10 @@
       }
     },
     "node_modules/jsonc-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "license": "MIT"
     },
     "node_modules/undici-types": {
       "version": "7.16.0",
diff --git a/extensions/vscode-colorize-perf-tests/package.json b/extensions/vscode-colorize-perf-tests/package.json
index 794f6915c4dd..34246267561e 100644
--- a/extensions/vscode-colorize-perf-tests/package.json
+++ b/extensions/vscode-colorize-perf-tests/package.json
@@ -19,7 +19,7 @@
     "compile": "gulp compile-extension:vscode-colorize-perf-tests"
   },
   "dependencies": {
-    "jsonc-parser": "^3.2.0"
+    "jsonc-parser": "^3.3.1"
   },
   "devDependencies": {
     "@types/node": "24.x"

From 590d2dca838b17646b4f2d5ae23df18f04395117 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 7 Dec 2025 15:32:23 +0000
Subject: [PATCH 1193/1815] Bump jsonc-parser in
 /extensions/vscode-colorize-tests

Bumps [jsonc-parser](https://github.com/microsoft/node-jsonc-parser) from 3.2.0 to 3.3.1.
- [Release notes](https://github.com/microsoft/node-jsonc-parser/releases)
- [Changelog](https://github.com/microsoft/node-jsonc-parser/blob/main/CHANGELOG.md)
- [Commits](https://github.com/microsoft/node-jsonc-parser/compare/v3.2.0...v3.3.1)

---
updated-dependencies:
- dependency-name: jsonc-parser
  dependency-version: 3.3.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-colorize-tests/package-lock.json | 9 +++++----
 extensions/vscode-colorize-tests/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/vscode-colorize-tests/package-lock.json b/extensions/vscode-colorize-tests/package-lock.json
index 2fd220bf39d7..913d4bc586eb 100644
--- a/extensions/vscode-colorize-tests/package-lock.json
+++ b/extensions/vscode-colorize-tests/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.0.1",
       "license": "MIT",
       "dependencies": {
-        "jsonc-parser": "^3.2.0"
+        "jsonc-parser": "^3.3.1"
       },
       "devDependencies": {
         "@types/node": "24.x"
@@ -29,9 +29,10 @@
       }
     },
     "node_modules/jsonc-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "license": "MIT"
     },
     "node_modules/undici-types": {
       "version": "7.16.0",
diff --git a/extensions/vscode-colorize-tests/package.json b/extensions/vscode-colorize-tests/package.json
index aab27e4a5fe3..1951b483045b 100644
--- a/extensions/vscode-colorize-tests/package.json
+++ b/extensions/vscode-colorize-tests/package.json
@@ -19,7 +19,7 @@
     "compile": "gulp compile-extension:vscode-colorize-tests"
   },
   "dependencies": {
-    "jsonc-parser": "^3.2.0"
+    "jsonc-parser": "^3.3.1"
   },
   "devDependencies": {
     "@types/node": "24.x"

From c4b8dba8aae1d6c3babe7323df368233e7e96715 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Dec 2025 02:24:44 +0000
Subject: [PATCH 1194/1815] Bump @types/vscode-webview in
 /extensions/simple-browser

Bumps [@types/vscode-webview](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/vscode-webview) from 1.57.0 to 1.57.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/vscode-webview)

---
updated-dependencies:
- dependency-name: "@types/vscode-webview"
  dependency-version: 1.57.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/simple-browser/package-lock.json | 11 ++++++-----
 extensions/simple-browser/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/simple-browser/package-lock.json b/extensions/simple-browser/package-lock.json
index fb330ae152a0..2150b48e2932 100644
--- a/extensions/simple-browser/package-lock.json
+++ b/extensions/simple-browser/package-lock.json
@@ -12,7 +12,7 @@
         "@vscode/extension-telemetry": "^1.2.0"
       },
       "devDependencies": {
-        "@types/vscode-webview": "^1.57.0",
+        "@types/vscode-webview": "^1.57.5",
         "@vscode/codicons": "^0.0.43"
       },
       "engines": {
@@ -144,10 +144,11 @@
       "license": "MIT"
     },
     "node_modules/@types/vscode-webview": {
-      "version": "1.57.0",
-      "resolved": "https://registry.npmjs.org/@types/vscode-webview/-/vscode-webview-1.57.0.tgz",
-      "integrity": "sha512-x3Cb/SMa1IwRHfSvKaZDZOTh4cNoG505c3NjTqGlMC082m++x/ETUmtYniDsw6SSmYzZXO8KBNhYxR0+VqymqA==",
-      "dev": true
+      "version": "1.57.5",
+      "resolved": "https://registry.npmjs.org/@types/vscode-webview/-/vscode-webview-1.57.5.tgz",
+      "integrity": "sha512-iBAUYNYkz+uk1kdsq05fEcoh8gJmwT3lqqFPN7MGyjQ3HVloViMdo7ZJ8DFIP8WOK74PjOEilosqAyxV2iUFUw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@vscode/codicons": {
       "version": "0.0.43",
diff --git a/extensions/simple-browser/package.json b/extensions/simple-browser/package.json
index f4d1997a0778..eac3630e2990 100644
--- a/extensions/simple-browser/package.json
+++ b/extensions/simple-browser/package.json
@@ -69,7 +69,7 @@
     "@vscode/extension-telemetry": "^1.2.0"
   },
   "devDependencies": {
-    "@types/vscode-webview": "^1.57.0",
+    "@types/vscode-webview": "^1.57.5",
     "@vscode/codicons": "^0.0.43"
   },
   "repository": {

From f22e2235682c59367cbb51a16824ab74b49523a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Dec 2025 03:23:06 +0000
Subject: [PATCH 1195/1815] Bump which from 2.0.2 to 6.0.0 in
 /extensions/php-language-features

Bumps [which](https://github.com/npm/node-which) from 2.0.2 to 6.0.0.
- [Release notes](https://github.com/npm/node-which/releases)
- [Changelog](https://github.com/npm/node-which/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-which/compare/v2.0.2...v6.0.0)

---
updated-dependencies:
- dependency-name: which
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../php-language-features/package-lock.json   | 25 +++++++++++--------
 extensions/php-language-features/package.json |  2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/extensions/php-language-features/package-lock.json b/extensions/php-language-features/package-lock.json
index 980830fa9df3..cf17a4b9807a 100644
--- a/extensions/php-language-features/package-lock.json
+++ b/extensions/php-language-features/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "which": "^2.0.2"
+        "which": "^6.0.0"
       },
       "devDependencies": {
         "@types/node": "24.x",
@@ -36,9 +36,13 @@
       "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=="
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+      "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=16"
+      }
     },
     "node_modules/undici-types": {
       "version": "7.16.0",
@@ -48,17 +52,18 @@
       "license": "MIT"
     },
     "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-6.0.0.tgz",
+      "integrity": "sha512-f+gEpIKMR9faW/JgAgPK1D7mekkFoqbmiwvNzuhsHetni20QSgzg9Vhn0g2JSJkkfehQnqdUAx7/e15qS1lPxg==",
+      "license": "ISC",
       "dependencies": {
-        "isexe": "^2.0.0"
+        "isexe": "^3.1.1"
       },
       "bin": {
-        "node-which": "bin/node-which"
+        "node-which": "bin/which.js"
       },
       "engines": {
-        "node": ">= 8"
+        "node": "^20.17.0 || >=22.9.0"
       }
     }
   }
diff --git a/extensions/php-language-features/package.json b/extensions/php-language-features/package.json
index 7b87a81240bf..df521b5eb87b 100644
--- a/extensions/php-language-features/package.json
+++ b/extensions/php-language-features/package.json
@@ -74,7 +74,7 @@
     "watch": "npx gulp watch-extension:php-language-features"
   },
   "dependencies": {
-    "which": "^2.0.2"
+    "which": "^6.0.0"
   },
   "devDependencies": {
     "@types/node": "24.x",

From a8d4e3a2560913aab97561c54cc35624bf1fb2f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Dec 2025 12:27:06 +0000
Subject: [PATCH 1196/1815] Bump actions/checkout from 6.0.0 to 6.0.1

Bumps [actions/checkout](https://github.com/actions/checkout) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/1af3b93b6815bc44a9784bd300feb67ff0d1eeb3...8e8c483db84b4bee98b60c0593521ed34d9990e8)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/dependency-review.yml | 2 +-
 .github/workflows/scorecards.yml        | 2 +-
 .github/workflows/telemetry.yml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index 7e24594f265c..8408da3c7399 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -22,6 +22,6 @@ jobs:
           egress-policy: audit
 
       - name: 'Checkout Repository'
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 49de8e0e68e5..9cc589007a7b 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -41,7 +41,7 @@ jobs:
           egress-policy: audit
 
       - name: "Checkout code"
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 
diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml
index 4d9f6a00d83f..706f229fd854 100644
--- a/.github/workflows/telemetry.yml
+++ b/.github/workflows/telemetry.yml
@@ -17,7 +17,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: 'actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3' # v6.0.0
+      - uses: 'actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8' # v6.0.1
 
       - uses: 'actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903' # v6.0.0
         with:

From 973dd1e319bdc66a59592ea7c9c64083e0385928 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Dec 2025 12:27:17 +0000
Subject: [PATCH 1197/1815] Bump github/codeql-action from 4.31.6 to 4.31.7

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.6 to 4.31.7.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/fe4161a26a8629af62121b670040955b330f9af2...cf1bb45a277cb3c205638b2cd5c984db1c46a412)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/scorecards.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 49de8e0e68e5..be78ab70127a 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -76,6 +76,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
+        uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
         with:
           sarif_file: results.sarif

From cab4c72fa7fb35934f41c4f259fe4866467972a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Dec 2025 12:33:11 +0000
Subject: [PATCH 1198/1815] Bump istanbul-reports from 3.1.6 to 3.2.0

Bumps [istanbul-reports](https://github.com/istanbuljs/istanbuljs/tree/HEAD/packages/istanbul-reports) from 3.1.6 to 3.2.0.
- [Release notes](https://github.com/istanbuljs/istanbuljs/releases)
- [Changelog](https://github.com/istanbuljs/istanbuljs/blob/main/packages/istanbul-reports/CHANGELOG.md)
- [Commits](https://github.com/istanbuljs/istanbuljs/commits/istanbul-reports-v3.2.0/packages/istanbul-reports)

---
updated-dependencies:
- dependency-name: istanbul-reports
  dependency-version: 3.2.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a9d9973fac95..f32b7013dbd7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -127,7 +127,7 @@
         "istanbul-lib-instrument": "^6.0.1",
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.1",
-        "istanbul-reports": "^3.1.5",
+        "istanbul-reports": "^3.2.0",
         "lazy.js": "^0.4.2",
         "merge-options": "^1.0.1",
         "mime": "^1.4.1",
@@ -9921,10 +9921,11 @@
       }
     },
     "node_modules/istanbul-reports": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
-      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
+      "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
diff --git a/package.json b/package.json
index a525b64f80cb..031dfa01cc21 100644
--- a/package.json
+++ b/package.json
@@ -186,7 +186,7 @@
     "istanbul-lib-instrument": "^6.0.1",
     "istanbul-lib-report": "^3.0.0",
     "istanbul-lib-source-maps": "^4.0.1",
-    "istanbul-reports": "^3.1.5",
+    "istanbul-reports": "^3.2.0",
     "lazy.js": "^0.4.2",
     "merge-options": "^1.0.1",
     "mime": "^1.4.1",

From 61c7956f42aa78585a50a21446884d8dea4bddfe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Dec 2025 12:33:17 +0000
Subject: [PATCH 1199/1815] Bump @types/mocha in
 /.vscode/extensions/vscode-selfhost-test-provider

Bumps [@types/mocha](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mocha) from 10.0.6 to 10.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mocha)

---
updated-dependencies:
- dependency-name: "@types/mocha"
  dependency-version: 10.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../vscode-selfhost-test-provider/package-lock.json   | 11 ++++++-----
 .../vscode-selfhost-test-provider/package.json        |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
index a71a68e4e365..52032a7c4639 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
@@ -15,7 +15,7 @@
         "istanbul-to-vscode": "^2.0.1"
       },
       "devDependencies": {
-        "@types/mocha": "^10.0.6",
+        "@types/mocha": "^10.0.10",
         "@types/node": "20.x"
       },
       "engines": {
@@ -50,10 +50,11 @@
       "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
     },
     "node_modules/@types/mocha": {
-      "version": "10.0.6",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.6.tgz",
-      "integrity": "sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==",
-      "dev": true
+      "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": "20.12.11",
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package.json b/.vscode/extensions/vscode-selfhost-test-provider/package.json
index 71b5ee73c60d..62f9d53636c0 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package.json
@@ -77,7 +77,7 @@
     "test": "npx mocha --ui tdd 'out/*.test.js'"
   },
   "devDependencies": {
-    "@types/mocha": "^10.0.6",
+    "@types/mocha": "^10.0.10",
     "@types/node": "20.x"
   },
   "dependencies": {

From bc776d39ce6c1b9cdb18cedfd70e87235bc33ef3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Dec 2025 12:33:50 +0000
Subject: [PATCH 1200/1815] Bump jsonc-parser from 3.2.0 to 3.3.1 in
 /extensions/npm

Bumps [jsonc-parser](https://github.com/microsoft/node-jsonc-parser) from 3.2.0 to 3.3.1.
- [Release notes](https://github.com/microsoft/node-jsonc-parser/releases)
- [Changelog](https://github.com/microsoft/node-jsonc-parser/blob/main/CHANGELOG.md)
- [Commits](https://github.com/microsoft/node-jsonc-parser/compare/v3.2.0...v3.3.1)

---
updated-dependencies:
- dependency-name: jsonc-parser
  dependency-version: 3.3.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/npm/package-lock.json | 9 +++++----
 extensions/npm/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index cb927dbd26db..97260ad512d2 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "find-up": "^5.0.0",
         "find-yarn-workspace-root": "^2.0.0",
-        "jsonc-parser": "^3.2.0",
+        "jsonc-parser": "^3.3.1",
         "minimatch": "^5.1.6",
         "request-light": "^0.7.0",
         "vscode-uri": "^3.0.8",
@@ -162,9 +162,10 @@
       }
     },
     "node_modules/jsonc-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "license": "MIT"
     },
     "node_modules/load-yaml-file": {
       "version": "0.2.0",
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index 847a48194659..716a9d0bef81 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "find-up": "^5.0.0",
     "find-yarn-workspace-root": "^2.0.0",
-    "jsonc-parser": "^3.2.0",
+    "jsonc-parser": "^3.3.1",
     "minimatch": "^5.1.6",
     "request-light": "^0.7.0",
     "which": "^4.0.0",

From df22163a6ff0ea6177f625a46e9f5d352d3d0930 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Dec 2025 21:34:07 +0000
Subject: [PATCH 1201/1815] Bump istanbul-to-vscode

Bumps [istanbul-to-vscode](https://github.com/connor4312/istanbul-to-vscode) from 2.0.1 to 2.1.1.
- [Commits](https://github.com/connor4312/istanbul-to-vscode/compare/v2.0.1...v2.1.1)

---
updated-dependencies:
- dependency-name: istanbul-to-vscode
  dependency-version: 2.1.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../vscode-selfhost-test-provider/package-lock.json      | 9 +++++----
 .../vscode-selfhost-test-provider/package.json           | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
index 52032a7c4639..6b40ebc340e3 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
@@ -12,7 +12,7 @@
         "@jridgewell/trace-mapping": "^0.3.25",
         "ansi-styles": "^5.2.0",
         "cockatiel": "^3.1.3",
-        "istanbul-to-vscode": "^2.0.1"
+        "istanbul-to-vscode": "^2.1.1"
       },
       "devDependencies": {
         "@types/mocha": "^10.0.10",
@@ -85,9 +85,10 @@
       }
     },
     "node_modules/istanbul-to-vscode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-to-vscode/-/istanbul-to-vscode-2.0.1.tgz",
-      "integrity": "sha512-V9Hhr7kX3UvkvkaT1lK3AmCRPkaIAIogQBrduTpNiLTkp1eVsybnJhWiDSVeCQap/3aGeZ2019oIivhX9MNsCQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/istanbul-to-vscode/-/istanbul-to-vscode-2.1.1.tgz",
+      "integrity": "sha512-F4IvCWYzWJkFfbYFjLUgxndE6g4EVWQH+rObEQ8OexBGTLhQ7e6VQ8p9f4BVrQmbNmo0nRGIGF34XqARXXgMjA==",
+      "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.6"
       }
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package.json b/.vscode/extensions/vscode-selfhost-test-provider/package.json
index 62f9d53636c0..66c3ead9988e 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package.json
@@ -84,6 +84,6 @@
     "@jridgewell/trace-mapping": "^0.3.25",
     "ansi-styles": "^5.2.0",
     "cockatiel": "^3.1.3",
-    "istanbul-to-vscode": "^2.0.1"
+    "istanbul-to-vscode": "^2.1.1"
   }
 }

From c4b94705e2e2ab4c26e4d85c1ac8a2f2b952b00b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 12:32:35 +0000
Subject: [PATCH 1202/1815] Bump @vscode/gulp-electron from 1.36.0 to 1.38.2

Bumps [@vscode/gulp-electron](https://github.com/microsoft/vscode-gulp-electron) from 1.36.0 to 1.38.2.
- [Release notes](https://github.com/microsoft/vscode-gulp-electron/releases)
- [Commits](https://github.com/microsoft/vscode-gulp-electron/compare/v1.36.0...v1.38.2)

---
updated-dependencies:
- dependency-name: "@vscode/gulp-electron"
  dependency-version: 1.38.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 638 +++++++++++++++++++++++++++++++++++++---------
 package.json      |   2 +-
 2 files changed, 523 insertions(+), 117 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6aa851cf2037..506a988b65bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -78,7 +78,7 @@
         "@types/yauzl": "^2.10.0",
         "@types/yazl": "^2.4.2",
         "@typescript-eslint/utils": "^8.8.0",
-        "@vscode/gulp-electron": "^1.36.0",
+        "@vscode/gulp-electron": "^1.38.2",
         "@vscode/l10n-dev": "0.0.35",
         "@vscode/telemetry-extractor": "^1.10.2",
         "@vscode/test-cli": "^0.0.6",
@@ -1496,6 +1496,13 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@keyv/serialize": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.1.1.tgz",
+      "integrity": "sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@koa/cors": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/@koa/cors/-/cors-5.0.0.tgz",
@@ -1523,6 +1530,29 @@
         "node": ">= 18"
       }
     },
+    "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": {
+        "cross-spawn": "^7.0.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "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",
@@ -1601,135 +1631,169 @@
       }
     },
     "node_modules/@octokit/auth-token": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz",
-      "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==",
+      "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,
-      "dependencies": {
-        "@octokit/types": "^6.0.3"
+      "license": "MIT",
+      "engines": {
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/core": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
-      "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-7.0.6.tgz",
+      "integrity": "sha512-DhGl4xMVFGVIyMwswXeyzdL4uXD5OGILGX5N8Y+f6W7LhC1Ze2poSNrkF/fedpVDHEEZ+PHFW0vL14I+mm8K3Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@octokit/auth-token": "^2.4.4",
-        "@octokit/graphql": "^4.5.8",
-        "@octokit/request": "^5.6.3",
-        "@octokit/request-error": "^2.0.5",
-        "@octokit/types": "^6.0.3",
-        "before-after-hook": "^2.2.0",
-        "universal-user-agent": "^6.0.0"
+        "@octokit/auth-token": "^6.0.0",
+        "@octokit/graphql": "^9.0.3",
+        "@octokit/request": "^10.0.6",
+        "@octokit/request-error": "^7.0.2",
+        "@octokit/types": "^16.0.0",
+        "before-after-hook": "^4.0.0",
+        "universal-user-agent": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/endpoint": {
-      "version": "6.0.12",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz",
-      "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==",
+      "version": "11.0.2",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-11.0.2.tgz",
+      "integrity": "sha512-4zCpzP1fWc7QlqunZ5bSEjxc6yLAlRTnDwKtgXfcI/FxxGoqedDG8V2+xJ60bV2kODqcGB+nATdtap/XYq2NZQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^6.0.3",
-        "is-plain-object": "^5.0.0",
-        "universal-user-agent": "^6.0.0"
+        "@octokit/types": "^16.0.0",
+        "universal-user-agent": "^7.0.2"
+      },
+      "engines": {
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/graphql": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
-      "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==",
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-9.0.3.tgz",
+      "integrity": "sha512-grAEuupr/C1rALFnXTv6ZQhFuL1D8G5y8CN04RgrO4FIPMrtm+mcZzFG7dcBm+nq+1ppNixu+Jd78aeJOYxlGA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@octokit/request": "^5.6.0",
-        "@octokit/types": "^6.0.3",
-        "universal-user-agent": "^6.0.0"
+        "@octokit/request": "^10.0.6",
+        "@octokit/types": "^16.0.0",
+        "universal-user-agent": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/openapi-types": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz",
-      "integrity": "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==",
-      "dev": true
+      "version": "27.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-27.0.0.tgz",
+      "integrity": "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz",
-      "integrity": "sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-14.0.0.tgz",
+      "integrity": "sha512-fNVRE7ufJiAA3XUrha2omTA39M6IXIc6GIZLvlbsm8QOQCYvpq/LkMNGyFlB1d8hTDzsAXa3OKtybdMAYsV/fw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^6.34.0"
+        "@octokit/types": "^16.0.0"
+      },
+      "engines": {
+        "node": ">= 20"
       },
       "peerDependencies": {
-        "@octokit/core": ">=2"
+        "@octokit/core": ">=6"
       }
     },
     "node_modules/@octokit/plugin-request-log": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz",
-      "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==",
+      "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": ">=3"
+        "@octokit/core": ">=6"
       }
     },
     "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "5.13.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz",
-      "integrity": "sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA==",
+      "version": "17.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-17.0.0.tgz",
+      "integrity": "sha512-B5yCyIlOJFPqUUeiD0cnBJwWJO8lkJs5d8+ze9QDP6SvfiXSz1BF+91+0MeI1d2yxgOhU/O+CvtiZ9jSkHhFAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^6.34.0",
-        "deprecation": "^2.3.1"
+        "@octokit/types": "^16.0.0"
+      },
+      "engines": {
+        "node": ">= 20"
       },
       "peerDependencies": {
-        "@octokit/core": ">=3"
+        "@octokit/core": ">=6"
       }
     },
     "node_modules/@octokit/request": {
-      "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
-      "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
+      "version": "10.0.7",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-10.0.7.tgz",
+      "integrity": "sha512-v93h0i1yu4idj8qFPZwjehoJx4j3Ntn+JhXsdJrG9pYaX6j/XRz2RmasMUHtNgQD39nrv/VwTWSqK0RNXR8upA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@octokit/endpoint": "^6.0.1",
-        "@octokit/request-error": "^2.1.0",
-        "@octokit/types": "^6.16.1",
-        "is-plain-object": "^5.0.0",
-        "node-fetch": "^2.6.7",
-        "universal-user-agent": "^6.0.0"
+        "@octokit/endpoint": "^11.0.2",
+        "@octokit/request-error": "^7.0.2",
+        "@octokit/types": "^16.0.0",
+        "fast-content-type-parse": "^3.0.0",
+        "universal-user-agent": "^7.0.2"
+      },
+      "engines": {
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/request-error": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz",
-      "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-7.1.0.tgz",
+      "integrity": "sha512-KMQIfq5sOPpkQYajXHwnhjCC0slzCNScLHs9JafXc4RAJI+9f+jNDlBNaIMTvazOPLgb4BnlhGJOTbnN0wIjPw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^6.0.3",
-        "deprecation": "^2.0.0",
-        "once": "^1.4.0"
+        "@octokit/types": "^16.0.0"
+      },
+      "engines": {
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/rest": {
-      "version": "18.12.0",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz",
-      "integrity": "sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==",
+      "version": "22.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-22.0.1.tgz",
+      "integrity": "sha512-Jzbhzl3CEexhnivb1iQ0KJ7s5vvjMWcmRtq5aUsKmKDrRW6z3r84ngmiFKFvpZjpiU/9/S6ITPFRpn5s/3uQJw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@octokit/core": "^3.5.1",
-        "@octokit/plugin-paginate-rest": "^2.16.8",
-        "@octokit/plugin-request-log": "^1.0.4",
-        "@octokit/plugin-rest-endpoint-methods": "^5.12.0"
+        "@octokit/core": "^7.0.6",
+        "@octokit/plugin-paginate-rest": "^14.0.0",
+        "@octokit/plugin-request-log": "^6.0.0",
+        "@octokit/plugin-rest-endpoint-methods": "^17.0.0"
+      },
+      "engines": {
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/types": {
-      "version": "6.34.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz",
-      "integrity": "sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==",
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-16.0.0.tgz",
+      "integrity": "sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@octokit/openapi-types": "^11.2.0"
+        "@octokit/openapi-types": "^27.0.0"
       }
     },
     "node_modules/@opentelemetry/api": {
@@ -2100,6 +2164,13 @@
         "node": ">=18"
       }
     },
+    "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",
@@ -2371,10 +2442,11 @@
       }
     },
     "node_modules/@types/http-cache-semantics": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-      "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
-      "dev": true
+      "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",
@@ -2722,13 +2794,14 @@
       }
     },
     "node_modules/@vscode/gulp-electron": {
-      "version": "1.36.0",
-      "resolved": "https://registry.npmjs.org/@vscode/gulp-electron/-/gulp-electron-1.36.0.tgz",
-      "integrity": "sha512-zGNnxN2mccAa0fgyjUn0+HUX4sv4syUfoLQru3/QAQYki1oeqnkPpCXZxhismFmWpXwTwsf5sXeh1AOs8uyU0g==",
+      "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": "^2.0.2",
-        "@octokit/rest": "^18.0.14",
+        "@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",
@@ -2737,16 +2810,236 @@
         "mkdirp": "^0.5.1",
         "plist": "^3.0.1",
         "progress": "^1.1.8",
-        "rcedit": "^0.3.0",
+        "rcedit": "^4.0.1",
         "rimraf": "^2.4.2",
-        "semver": "^4.3.4",
+        "semver": "^7.7.2",
         "sumchecker": "^3.0.1",
         "temp": "^0.8.3",
         "vinyl": "^3.0.0",
         "vinyl-fs": "^3.0.3"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=22"
+      }
+    },
+    "node_modules/@vscode/gulp-electron/node_modules/@electron/get": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@electron/get/-/get-4.0.2.tgz",
+      "integrity": "sha512-n9fRt/nzzOOZdDtTP3kT6GVdo0ro9FgMKCoS520kQMIiKBhpGmPny6yK/lER3tOCKr+wLYW1O25D9oI6ZinwCA==",
+      "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.1.1",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-7.1.1.tgz",
+      "integrity": "sha512-rO92VvpgMc3kfiTjGT52LEtJ8Yc5kCWhZjLQ3LwlA4pSgPpQO7bVpYXParOD8Jwf+cVQECJo3yP/4I8aZtUQTQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
+      }
+    },
+    "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": "13.0.16",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-13.0.16.tgz",
+      "integrity": "sha512-qwRRfUu3bPhPEgKoLAXpYJfm1E2VuHT4DCzl579k2ODyFG+43jv3iMi2wbHlreIZR3+9Sp1lp4fsaXZ9VIlmzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/http-cache-semantics": "4.0.4",
+        "get-stream": "9.0.1",
+        "http-cache-semantics": "4.2.0",
+        "keyv": "5.5.4",
+        "mimic-response": "4.0.0",
+        "normalize-url": "8.1.0",
+        "responselike": "4.0.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@vscode/gulp-electron/node_modules/cacheable-request/node_modules/keyv": {
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.5.4.tgz",
+      "integrity": "sha512-eohl3hKTiVyD1ilYdw9T0OiB4hnjef89e3dMYKz+mVKDzj+5IteTseASUsOB+EU9Tf6VNTCjDePcP6wkDGmLKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@keyv/serialize": "^1.1.1"
+      }
+    },
+    "node_modules/@vscode/gulp-electron/node_modules/decompress-response": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-10.0.0.tgz",
+      "integrity": "sha512-oj7KWToJuuxlPr7VV0vabvxEIiqNMo+q0NueIiL3XhtwC6FVOX7Hr1c0C4eD0bmf7Zr+S/dSf2xvkH3Ad6sU3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-response": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "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.6.5",
+      "resolved": "https://registry.npmjs.org/got/-/got-14.6.5.tgz",
+      "integrity": "sha512-Su87c0NNeg97de1sO02gy9I8EmE7DCJ1gzcFLcgGpYeq2PnLg4xz73MWrp6HjqbSsjb6Glf4UBDW6JNyZA6uSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sindresorhus/is": "^7.0.1",
+        "byte-counter": "^0.1.0",
+        "cacheable-lookup": "^7.0.0",
+        "cacheable-request": "^13.0.12",
+        "decompress-response": "^10.0.0",
+        "form-data-encoder": "^4.0.2",
+        "http2-wrapper": "^2.2.1",
+        "keyv": "^5.5.3",
+        "lowercase-keys": "^3.0.0",
+        "p-cancelable": "^4.0.1",
+        "responselike": "^4.0.2",
+        "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/keyv": {
+      "version": "5.5.5",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.5.5.tgz",
+      "integrity": "sha512-FA5LmZVF1VziNc0bIdCSA1IoSVnDCqE8HJIZZv2/W8YmoAM50+tnUgJR/gQZwEeIMleuIOnRnHA/UaZRNeV4iQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@keyv/serialize": "^1.1.1"
+      }
+    },
+    "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": {
@@ -2761,19 +3054,56 @@
         "mkdirp": "bin/cmd.js"
       }
     },
+    "node_modules/@vscode/gulp-electron/node_modules/normalize-url": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.1.0.tgz",
+      "integrity": "sha512-X06Mfd/5aKsRHc0O0J5CUedwnPmnDtLF2+nq+KN9KSDlJHkPuh0JUviWjEWMe0SW/9TDdSLVPuk7L5gGTIA1/w==",
+      "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": "0.3.0",
-      "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-0.3.0.tgz",
-      "integrity": "sha1-y17uGF5Ub57aWXwkjJkGGG+pa84= sha512-6cFo8dgNFf92BPdBNEKtwCl321wSVW6HYn3+QRQMGf0sclBMerCyMAreQDdIchfR8ECG0pAYD33NIODaJEnv4w==",
-      "dev": true
+      "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/semver": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-      "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
+    "node_modules/@vscode/gulp-electron/node_modules/responselike": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-4.0.2.tgz",
+      "integrity": "sha512-cGk8IbWEAnaCpdAt1BHzJ3Ahz5ewDJa0KseTsE3qIRMJ3C698W8psM7byCeWVpd/Ha7FUYzuRVzXoKoM6nRUbA==",
       "dev": true,
-      "bin": {
-        "semver": "bin/semver"
+      "license": "MIT",
+      "dependencies": {
+        "lowercase-keys": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/@vscode/iconv-lite-umd": {
@@ -4208,10 +4538,11 @@
       }
     },
     "node_modules/before-after-hook": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz",
-      "integrity": "sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==",
-      "dev": true
+      "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",
@@ -4396,6 +4727,19 @@
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
+    "node_modules/byte-counter": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/byte-counter/-/byte-counter-0.1.0.tgz",
+      "integrity": "sha512-jheRLVMeUKrDBjVw2O5+k4EvR4t9wtxHL+bo/LxfkxsVeuGMy3a5SEGgXdAFA4FSzTrU8rQXQIrsZ3oBq5a0pQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -5166,6 +5510,31 @@
         "node": ">= 8"
       }
     },
+    "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": {
+        "@malept/cross-spawn-promise": "^1.1.0",
+        "is-wsl": "^2.2.0",
+        "which": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/crypt": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
@@ -5592,12 +5961,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/deprecation": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
-      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
-      "dev": true
-    },
     "node_modules/destroy": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
@@ -6579,6 +6942,23 @@
         "node": ">= 0.10"
       }
     },
+    "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",
@@ -6949,6 +7329,16 @@
         "node": ">= 6"
       }
     },
+    "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,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
@@ -9130,10 +9520,11 @@
       }
     },
     "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
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
+      "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
+      "dev": true,
+      "license": "BSD-2-Clause"
     },
     "node_modules/http-errors": {
       "version": "2.0.0",
@@ -14047,9 +14438,10 @@
       "dev": true
     },
     "node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -15652,6 +16044,19 @@
         "node": ">=4"
       }
     },
+    "node_modules/type-fest": {
+      "version": "4.41.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -15873,10 +16278,11 @@
       }
     },
     "node_modules/universal-user-agent": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
-      "dev": true
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.3.tgz",
+      "integrity": "sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/universalify": {
       "version": "2.0.1",
diff --git a/package.json b/package.json
index 2a5d58886d83..a2f039417561 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
     "@types/yauzl": "^2.10.0",
     "@types/yazl": "^2.4.2",
     "@typescript-eslint/utils": "^8.8.0",
-    "@vscode/gulp-electron": "^1.36.0",
+    "@vscode/gulp-electron": "^1.38.2",
     "@vscode/l10n-dev": "0.0.35",
     "@vscode/telemetry-extractor": "^1.10.2",
     "@vscode/test-cli": "^0.0.6",

From e56ce148e1e87c1161869d05b8280b4036d2c95e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 12:32:44 +0000
Subject: [PATCH 1203/1815] Bump istanbul-lib-source-maps from 4.0.1 to 5.0.6

Bumps [istanbul-lib-source-maps](https://github.com/istanbuljs/istanbuljs/tree/HEAD/packages/istanbul-lib-source-maps) from 4.0.1 to 5.0.6.
- [Release notes](https://github.com/istanbuljs/istanbuljs/releases)
- [Changelog](https://github.com/istanbuljs/istanbuljs/blob/main/packages/istanbul-lib-source-maps/CHANGELOG.md)
- [Commits](https://github.com/istanbuljs/istanbuljs/commits/istanbul-lib-source-maps-v5.0.6/packages/istanbul-lib-source-maps)

---
updated-dependencies:
- dependency-name: istanbul-lib-source-maps
  dependency-version: 5.0.6
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 13 +++++++------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6aa851cf2037..6b7644764cf1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -126,7 +126,7 @@
         "istanbul-lib-coverage": "^3.2.0",
         "istanbul-lib-instrument": "^6.0.1",
         "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.1",
+        "istanbul-lib-source-maps": "^5.0.6",
         "istanbul-reports": "^3.2.0",
         "lazy.js": "^0.4.2",
         "merge-options": "^1.0.1",
@@ -9906,14 +9906,15 @@
       }
     },
     "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==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz",
+      "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.23",
         "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
+        "istanbul-lib-coverage": "^3.0.0"
       },
       "engines": {
         "node": ">=10"
diff --git a/package.json b/package.json
index 2a5d58886d83..84a55bafd828 100644
--- a/package.json
+++ b/package.json
@@ -185,7 +185,7 @@
     "istanbul-lib-coverage": "^3.2.0",
     "istanbul-lib-instrument": "^6.0.1",
     "istanbul-lib-report": "^3.0.0",
-    "istanbul-lib-source-maps": "^4.0.1",
+    "istanbul-lib-source-maps": "^5.0.6",
     "istanbul-reports": "^3.2.0",
     "lazy.js": "^0.4.2",
     "merge-options": "^1.0.1",

From 1b04d4450afc5deb863c8cde230bd8a0273fc455 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 12:32:56 +0000
Subject: [PATCH 1204/1815] Bump vscode-uri in
 /extensions/css-language-features/server

Bumps [vscode-uri](https://github.com/microsoft/vscode-uri) from 3.0.8 to 3.1.0.
- [Release notes](https://github.com/microsoft/vscode-uri/releases)
- [Commits](https://github.com/microsoft/vscode-uri/compare/v3.0.8...v3.1.0)

---
updated-dependencies:
- dependency-name: vscode-uri
  dependency-version: 3.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../css-language-features/server/package-lock.json       | 9 +++++----
 extensions/css-language-features/server/package.json     | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/css-language-features/server/package-lock.json b/extensions/css-language-features/server/package-lock.json
index a1f019c5731b..29c87b367adc 100644
--- a/extensions/css-language-features/server/package-lock.json
+++ b/extensions/css-language-features/server/package-lock.json
@@ -12,7 +12,7 @@
         "@vscode/l10n": "^0.0.18",
         "vscode-css-languageservice": "^6.3.2",
         "vscode-languageserver": "^10.0.0-next.15",
-        "vscode-uri": "^3.0.8"
+        "vscode-uri": "^3.1.0"
       },
       "devDependencies": {
         "@types/mocha": "^9.1.1",
@@ -108,9 +108,10 @@
       "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="
     },
     "node_modules/vscode-uri": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
-      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="
+      "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==",
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json
index 324c331747e0..9d4b1976484e 100644
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@@ -13,7 +13,7 @@
     "@vscode/l10n": "^0.0.18",
     "vscode-css-languageservice": "^6.3.2",
     "vscode-languageserver": "^10.0.0-next.15",
-    "vscode-uri": "^3.0.8"
+    "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
     "@types/mocha": "^9.1.1",

From 5b376e7810f44401bface501a3af7ae3abe75068 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 12:33:30 +0000
Subject: [PATCH 1205/1815] build(deps): Bump @xterm/addon-unicode11 in
 /remote/web

Bumps [@xterm/addon-unicode11](https://github.com/xtermjs/xterm.js) from 0.9.0-beta.98 to 0.9.0-beta.140.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-unicode11"
  dependency-version: 0.9.0-beta.140
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 617c0e9d6fb2..52fb99a6c313 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -19,7 +19,7 @@
 				"@xterm/addon-progress": "^0.2.0-beta.4",
 				"@xterm/addon-search": "^0.16.0-beta.140",
 				"@xterm/addon-serialize": "^0.14.0-beta.98",
-				"@xterm/addon-unicode11": "^0.9.0-beta.98",
+				"@xterm/addon-unicode11": "^0.9.0-beta.140",
 				"@xterm/addon-webgl": "^0.19.0-beta.140",
 				"@xterm/xterm": "^5.6.0-beta.140",
 				"jschardet": "3.1.4",
@@ -237,12 +237,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-unicode11": {
-			"version": "0.9.0-beta.98",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.98.tgz",
-			"integrity": "sha512-3GjjEYAPWAEGE1CaTFDjQxKcY5NiHHPmeufTsRp3IL5850ZiaMMq9bIL2WSdoFIbVgfbxh5mRy2cJPdu9m0uRQ==",
+			"version": "0.9.0-beta.140",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.140.tgz",
+			"integrity": "sha512-sfpw89by14QzAe7rlmOy8Y/BYtHBpIlsNeCyumwTw0zIs7BvbUx0UQSGDyOzOaimujWEhrXiJLT4siC/mVYu3A==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.98"
+				"@xterm/xterm": "^5.6.0-beta.140"
 			}
 		},
 		"node_modules/@xterm/addon-webgl": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 8eb6258e0804..112a670ebe1f 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -14,7 +14,7 @@
 		"@xterm/addon-progress": "^0.2.0-beta.4",
 		"@xterm/addon-search": "^0.16.0-beta.140",
 		"@xterm/addon-serialize": "^0.14.0-beta.98",
-		"@xterm/addon-unicode11": "^0.9.0-beta.98",
+		"@xterm/addon-unicode11": "^0.9.0-beta.140",
 		"@xterm/addon-webgl": "^0.19.0-beta.140",
 		"@xterm/xterm": "^5.6.0-beta.140",
 		"jschardet": "3.1.4",

From b97479636b771f62a8a76ef8395652d90246e729 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 13 Dec 2025 06:35:14 +0000
Subject: [PATCH 1206/1815] Bump clap_lex from 0.7.0 to 0.7.6 in /cli

Bumps [clap_lex](https://github.com/clap-rs/clap) from 0.7.0 to 0.7.6.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_lex-v0.7.0...clap_lex-v0.7.6)

---
updated-dependencies:
- dependency-name: clap_lex
  dependency-version: 0.7.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 4 ++--
 cli/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index fd2d0255fdf8..14291af2c32f 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -396,9 +396,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 
 [[package]]
 name = "code-cli"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index a813142aaacc..5e36bc1c8f5a 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -40,7 +40,7 @@ dialoguer = "0.10.4"
 hyper = { version = "0.14.26", features = ["server", "http1", "runtime"] }
 indicatif = "0.17.4"
 tempfile = "3.5.0"
-clap_lex = "0.7.0"
+clap_lex = "0.7.6"
 url = "2.5.4"
 async-trait = "0.1.68"
 log = "0.4.18"

From 1a655841cf4bfb6802f1d72d081b372240b42ce2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 13 Dec 2025 07:31:06 +0000
Subject: [PATCH 1207/1815] Bump slog-async from 2.7.0 to 2.8.0 in /build/win32

Bumps [slog-async](https://github.com/slog-rs/async) from 2.7.0 to 2.8.0.
- [Changelog](https://github.com/slog-rs/async/blob/master/CHANGELOG.md)
- [Commits](https://github.com/slog-rs/async/compare/v2.7.0...v2.8.0)

---
updated-dependencies:
- dependency-name: slog-async
  dependency-version: 2.8.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/win32/Cargo.lock | 4 ++--
 build/win32/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/win32/Cargo.lock b/build/win32/Cargo.lock
index 59c7a64b9bfc..0be99b37e69f 100644
--- a/build/win32/Cargo.lock
+++ b/build/win32/Cargo.lock
@@ -195,9 +195,9 @@ checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06"
 
 [[package]]
 name = "slog-async"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "766c59b252e62a34651412870ff55d8c4e6d04df19b43eecb2703e417b097ffe"
+checksum = "72c8038f898a2c79507940990f05386455b3a317d8f18d4caea7cbc3d5096b84"
 dependencies = [
  "crossbeam-channel",
  "slog",
diff --git a/build/win32/Cargo.toml b/build/win32/Cargo.toml
index 761f8c790898..2f61a51ef908 100644
--- a/build/win32/Cargo.toml
+++ b/build/win32/Cargo.toml
@@ -8,7 +8,7 @@ build = "build.rs"
 byteorder = "1.4.3"
 crc = "3.4.0"
 slog = "2.7.0"
-slog-async = "2.7.0"
+slog-async = "2.8.0"
 slog-term = "2.9.1"
 
 [target.'cfg(windows)'.dependencies.windows-sys]

From 84ca4d44e2782c5544ac5bb58f2d573c8247f4a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 13 Dec 2025 07:52:06 +0000
Subject: [PATCH 1208/1815] Bump ansi-styles in
 /.vscode/extensions/vscode-selfhost-test-provider

Bumps [ansi-styles](https://github.com/chalk/ansi-styles) from 5.2.0 to 6.2.3.
- [Release notes](https://github.com/chalk/ansi-styles/releases)
- [Commits](https://github.com/chalk/ansi-styles/compare/v5.2.0...v6.2.3)

---
updated-dependencies:
- dependency-name: ansi-styles
  dependency-version: 6.2.3
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../vscode-selfhost-test-provider/package-lock.json   | 11 ++++++-----
 .../vscode-selfhost-test-provider/package.json        |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
index 5251d2b5a9d8..f2e0868f6985 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.31",
-        "ansi-styles": "^5.2.0",
+        "ansi-styles": "^6.2.3",
         "cockatiel": "^3.1.3",
         "istanbul-to-vscode": "^2.1.1"
       },
@@ -67,11 +67,12 @@
       }
     },
     "node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "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": ">=10"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package.json b/.vscode/extensions/vscode-selfhost-test-provider/package.json
index 81eb09a9e078..e5e7624cac7d 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package.json
@@ -82,7 +82,7 @@
   },
   "dependencies": {
     "@jridgewell/trace-mapping": "^0.3.31",
-    "ansi-styles": "^5.2.0",
+    "ansi-styles": "^6.2.3",
     "cockatiel": "^3.1.3",
     "istanbul-to-vscode": "^2.1.1"
   }

From 01c7b114528cc718e8c41ef7a6c8feebe9ce6d61 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 13 Dec 2025 08:01:49 +0000
Subject: [PATCH 1209/1815] Bump byteorder from 1.4.3 to 1.5.0 in /build/win32

Bumps [byteorder](https://github.com/BurntSushi/byteorder) from 1.4.3 to 1.5.0.
- [Changelog](https://github.com/BurntSushi/byteorder/blob/master/CHANGELOG.md)
- [Commits](https://github.com/BurntSushi/byteorder/compare/1.4.3...1.5.0)

---
updated-dependencies:
- dependency-name: byteorder
  dependency-version: 1.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/win32/Cargo.lock | 4 ++--
 build/win32/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/win32/Cargo.lock b/build/win32/Cargo.lock
index 0be99b37e69f..632fea4209f2 100644
--- a/build/win32/Cargo.lock
+++ b/build/win32/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cfg-if"
diff --git a/build/win32/Cargo.toml b/build/win32/Cargo.toml
index 2f61a51ef908..13e1ce212917 100644
--- a/build/win32/Cargo.toml
+++ b/build/win32/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Microsoft <monacotools@microsoft.com>"]
 build = "build.rs"
 
 [dependencies]
-byteorder = "1.4.3"
+byteorder = "1.5.0"
 crc = "3.4.0"
 slog = "2.7.0"
 slog-async = "2.8.0"

From ffa36115649c835940c9a6bf44719a6f8e9d6483 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 13 Dec 2025 08:01:53 +0000
Subject: [PATCH 1210/1815] Bump windows-sys from 0.42.0 to 0.52.0 in
 /build/win32

Bumps [windows-sys](https://github.com/microsoft/windows-rs) from 0.42.0 to 0.52.0.
- [Release notes](https://github.com/microsoft/windows-rs/releases)
- [Commits](https://github.com/microsoft/windows-rs/compare/0.42.0...0.52.0)

---
updated-dependencies:
- dependency-name: windows-sys
  dependency-version: 0.52.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/win32/Cargo.lock | 75 +++++-------------------------------------
 build/win32/Cargo.toml |  2 +-
 2 files changed, 10 insertions(+), 67 deletions(-)

diff --git a/build/win32/Cargo.lock b/build/win32/Cargo.lock
index 0be99b37e69f..15c653fb03db 100644
--- a/build/win32/Cargo.lock
+++ b/build/win32/Cargo.lock
@@ -102,7 +102,7 @@ dependencies = [
  "slog",
  "slog-async",
  "slog-term",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -113,7 +113,7 @@ checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -327,21 +327,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@@ -357,46 +342,28 @@ version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.5"
@@ -409,48 +376,24 @@ version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.5"
diff --git a/build/win32/Cargo.toml b/build/win32/Cargo.toml
index 2f61a51ef908..ea0b0b5e53d0 100644
--- a/build/win32/Cargo.toml
+++ b/build/win32/Cargo.toml
@@ -12,7 +12,7 @@ slog-async = "2.8.0"
 slog-term = "2.9.1"
 
 [target.'cfg(windows)'.dependencies.windows-sys]
-version = "0.42"
+version = "0.52"
 features = [
     "Win32_Foundation",
     "Win32_System_Shutdown",

From 8865c7f0105cdb50c9616dfa181f8f3ff616b3fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 13 Dec 2025 08:37:17 +0000
Subject: [PATCH 1211/1815] Bump cockatiel in
 /.vscode/extensions/vscode-selfhost-test-provider

Bumps [cockatiel](https://github.com/connor4312/cockatiel) from 3.1.3 to 3.2.1.
- [Release notes](https://github.com/connor4312/cockatiel/releases)
- [Changelog](https://github.com/connor4312/cockatiel/blob/master/changelog.md)
- [Commits](https://github.com/connor4312/cockatiel/compare/v3.1.3...v3.2.1)

---
updated-dependencies:
- dependency-name: cockatiel
  dependency-version: 3.2.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../vscode-selfhost-test-provider/package-lock.json      | 9 +++++----
 .../vscode-selfhost-test-provider/package.json           | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
index f2e0868f6985..f6d4b14e1adf 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.31",
         "ansi-styles": "^6.2.3",
-        "cockatiel": "^3.1.3",
+        "cockatiel": "^3.2.1",
         "istanbul-to-vscode": "^2.1.1"
       },
       "devDependencies": {
@@ -79,9 +79,10 @@
       }
     },
     "node_modules/cockatiel": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/cockatiel/-/cockatiel-3.1.3.tgz",
-      "integrity": "sha512-xC759TpZ69d7HhfDp8m2WkRwEUiCkxY8Ee2OQH/3H6zmy2D/5Sm+zSTbPRa+V2QyjDtpMvjOIAOVjA2gp6N1kQ==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/cockatiel/-/cockatiel-3.2.1.tgz",
+      "integrity": "sha512-gfrHV6ZPkquExvMh9IOkKsBzNDk6sDuZ6DdBGUBkvFnTCqCxzpuq48RySgP0AnaqQkw2zynOFj9yly6T1Q2G5Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=16"
       }
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package.json b/.vscode/extensions/vscode-selfhost-test-provider/package.json
index e5e7624cac7d..269fbdfdd91f 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package.json
@@ -83,7 +83,7 @@
   "dependencies": {
     "@jridgewell/trace-mapping": "^0.3.31",
     "ansi-styles": "^6.2.3",
-    "cockatiel": "^3.1.3",
+    "cockatiel": "^3.2.1",
     "istanbul-to-vscode": "^2.1.1"
   }
 }

From 83faf761c2ccf17d5d7baec90ba7845f2266adce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 13 Dec 2025 08:48:50 +0000
Subject: [PATCH 1212/1815] Bump @types/mocha from 9.1.1 to 10.0.10 in /build

Bumps [@types/mocha](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mocha) from 9.1.1 to 10.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mocha)

---
updated-dependencies:
- dependency-name: "@types/mocha"
  dependency-version: 10.0.10
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 11 ++++++-----
 build/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 4b532ded39a8..b8ed021d5a32 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -33,7 +33,7 @@
         "@types/mime": "4.0.0",
         "@types/minimatch": "^3.0.3",
         "@types/minimist": "^1.2.1",
-        "@types/mocha": "^9.1.1",
+        "@types/mocha": "^10.0.10",
         "@types/node": "20.x",
         "@types/pump": "^1.0.1",
         "@types/rimraf": "^2.0.4",
@@ -1186,10 +1186,11 @@
       "dev": true
     },
     "node_modules/@types/mocha": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
-      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
-      "dev": true
+      "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",
diff --git a/build/package.json b/build/package.json
index ba366daff310..430bc6a5027a 100644
--- a/build/package.json
+++ b/build/package.json
@@ -27,7 +27,7 @@
     "@types/mime": "4.0.0",
     "@types/minimatch": "^3.0.3",
     "@types/minimist": "^1.2.1",
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.10",
     "@types/node": "20.x",
     "@types/pump": "^1.0.1",
     "@types/rimraf": "^2.0.4",

From d1806533c50ac55a5fc8496fbb6af2fc58006162 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 13 Dec 2025 09:19:59 +0000
Subject: [PATCH 1213/1815] Bump tokio from 1.38.2 to 1.42.1 in /cli

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.38.2 to 1.42.1.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.38.2...tokio-1.42.1)

---
updated-dependencies:
- dependency-name: tokio
  dependency-version: 1.42.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 46 +++++++++++++++++++++++++---------------------
 cli/Cargo.toml |  2 +-
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 6d91c806be7f..29ead1a5aa71 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -1451,9 +1451,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.178"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
 
 [[package]]
 name = "libredox"
@@ -1567,13 +1567,13 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
 dependencies = [
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1695,16 +1695,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
 [[package]]
 name = "number_prefix"
 version = "0.4.0"
@@ -2704,29 +2694,28 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.38.2"
+version = "1.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68722da18b0fc4a05fdc1120b302b82051265792a1e1b399086e9b204b10ad3d"
+checksum = "2209a14885b74764cce87ffa777ffa1b8ce81a3f3166c6f886b83337fe7e077f"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
- "num_cpus",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2 0.5.7",
  "tokio-macros",
  "tracing",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3144,6 +3133,12 @@ dependencies = [
  "windows-targets 0.52.5",
 ]
 
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -3162,6 +3157,15 @@ dependencies = [
  "windows-targets 0.52.5",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 6467980ca56a..4a472bfeb2d3 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -16,7 +16,7 @@ futures = "0.3.28"
 clap = { version = "4.3.0", features = ["derive", "env"] }
 open = "4.1.0"
 reqwest = { version = "0.11.22", default-features = false, features = ["json", "stream", "native-tls"] }
-tokio = { version = "1.38.2", features = ["full"] }
+tokio = { version = "1.42.1", features = ["full"] }
 tokio-util = { version = "0.7.8", features = ["compat", "codec"] }
 flate2 = { version = "1.0.26", default-features = false, features = ["zlib"] }
 zip = { version = "0.6.6", default-features = false, features = ["time", "deflate-zlib"] }

From bc79b342e0e36c1e09c2b804fca9523875e8708a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 13 Dec 2025 09:30:53 +0000
Subject: [PATCH 1214/1815] Bump jsonc-parser in
 /extensions/configuration-editing

Bumps [jsonc-parser](https://github.com/microsoft/node-jsonc-parser) from 3.2.0 to 3.3.1.
- [Release notes](https://github.com/microsoft/node-jsonc-parser/releases)
- [Changelog](https://github.com/microsoft/node-jsonc-parser/blob/main/CHANGELOG.md)
- [Commits](https://github.com/microsoft/node-jsonc-parser/compare/v3.2.0...v3.3.1)

---
updated-dependencies:
- dependency-name: jsonc-parser
  dependency-version: 3.3.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/configuration-editing/package-lock.json | 9 +++++----
 extensions/configuration-editing/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/configuration-editing/package-lock.json b/extensions/configuration-editing/package-lock.json
index 71eae8dd4ca7..641f0390d206 100644
--- a/extensions/configuration-editing/package-lock.json
+++ b/extensions/configuration-editing/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@octokit/rest": "^22.0.1",
-        "jsonc-parser": "^3.2.0",
+        "jsonc-parser": "^3.3.1",
         "tunnel": "^0.0.6"
       },
       "devDependencies": {
@@ -206,9 +206,10 @@
       "license": "MIT"
     },
     "node_modules/jsonc-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "license": "MIT"
     },
     "node_modules/tunnel": {
       "version": "0.0.6",
diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json
index 6c4e0c8edc9b..f878224218f9 100644
--- a/extensions/configuration-editing/package.json
+++ b/extensions/configuration-editing/package.json
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@octokit/rest": "^22.0.1",
-    "jsonc-parser": "^3.2.0",
+    "jsonc-parser": "^3.3.1",
     "tunnel": "^0.0.6"
   },
   "capabilities": {

From e955c313d8f8ed403add3aaf7a579e1e7e8cdcb2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 13 Dec 2025 09:41:11 +0000
Subject: [PATCH 1215/1815] Bump slog-term from 2.9.1 to 2.9.2 in /build/win32

Bumps [slog-term](https://github.com/slog-rs/term) from 2.9.1 to 2.9.2.
- [Release notes](https://github.com/slog-rs/term/releases)
- [Changelog](https://github.com/slog-rs/term/blob/master/CHANGELOG.md)
- [Commits](https://github.com/slog-rs/term/compare/v2.9.1...v2.9.2)

---
updated-dependencies:
- dependency-name: slog-term
  dependency-version: 2.9.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/win32/Cargo.lock | 313 ++++++++++++++++++++++++++++-------------
 build/win32/Cargo.toml |   2 +-
 2 files changed, 216 insertions(+), 99 deletions(-)

diff --git a/build/win32/Cargo.lock b/build/win32/Cargo.lock
index 15c653fb03db..942db99d298a 100644
--- a/build/win32/Cargo.lock
+++ b/build/win32/Cargo.lock
@@ -3,10 +3,25 @@
 version = 4
 
 [[package]]
-name = "bitflags"
-version = "1.3.2"
+name = "android_system_properties"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "byteorder"
@@ -14,12 +29,41 @@ version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
+[[package]]
+name = "cc"
+version = "1.2.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "chrono"
+version = "0.4.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+dependencies = [
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-link",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
 [[package]]
 name = "crc"
 version = "3.4.0"
@@ -56,42 +100,40 @@ dependencies = [
 ]
 
 [[package]]
-name = "dirs-next"
-version = "2.0.0"
+name = "find-msvc-tools"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if",
- "dirs-sys-next",
-]
+checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
 
 [[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
+name = "hermit-abi"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
-name = "getrandom"
-version = "0.2.7"
+name = "iana-time-zone"
+version = "0.1.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
 dependencies = [
- "cfg-if",
- "libc",
- "wasi",
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core",
 ]
 
 [[package]]
-name = "hermit-abi"
-version = "0.3.9"
+name = "iana-time-zone-haiku"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
 
 [[package]]
 name = "inno_updater"
@@ -102,7 +144,7 @@ dependencies = [
  "slog",
  "slog-async",
  "slog-term",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -113,7 +155,7 @@ checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -122,12 +164,37 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
 
+[[package]]
+name = "js-sys"
+version = "0.3.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
 
+[[package]]
+name = "log"
+version = "0.4.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "num_threads"
 version = "0.1.6"
@@ -145,48 +212,34 @@ checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.40"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.20"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
 dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
-dependencies = [
- "getrandom",
- "redox_syscall",
- "thiserror",
-]
-
 [[package]]
 name = "rustversion"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0a5f7c728f5d284929a1cccb5bc19884422bfe6ef4d6c409da2c41838983fcf"
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "slog"
 version = "2.7.0"
@@ -207,10 +260,11 @@ dependencies = [
 
 [[package]]
 name = "slog-term"
-version = "2.9.1"
+version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6e022d0b998abfe5c3782c1f03551a596269450ccd677ea51c56f8b214610e8"
+checksum = "5cb1fc680b38eed6fad4c02b3871c09d2c81db8c96aa4e9c0a34904c830f09b5"
 dependencies = [
+ "chrono",
  "is-terminal",
  "slog",
  "term",
@@ -220,9 +274,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.98"
+version = "2.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
+checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -237,33 +291,11 @@ checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 
 [[package]]
 name = "term"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
-dependencies = [
- "dirs-next",
- "rustversion",
- "winapi",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.31"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
+checksum = "d8c27177b12a6399ffc08b98f76f7c9a1f4fe9fc967c784c5a071fa8d93cf7e1"
 dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -295,37 +327,113 @@ checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.1"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
+checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
 
 [[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+name = "wasm-bindgen-macro-support"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40"
+dependencies = [
+ "bumpalo",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
 
 [[package]]
-name = "winapi"
-version = "0.3.9"
+name = "wasm-bindgen-shared"
+version = "0.2.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
+name = "windows-link"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
+name = "windows-result"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link",
+]
 
 [[package]]
 name = "windows-sys"
@@ -336,6 +444,15 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.52.5"
diff --git a/build/win32/Cargo.toml b/build/win32/Cargo.toml
index ea0b0b5e53d0..1bb24717c32a 100644
--- a/build/win32/Cargo.toml
+++ b/build/win32/Cargo.toml
@@ -9,7 +9,7 @@ byteorder = "1.4.3"
 crc = "3.4.0"
 slog = "2.7.0"
 slog-async = "2.8.0"
-slog-term = "2.9.1"
+slog-term = "2.9.2"
 
 [target.'cfg(windows)'.dependencies.windows-sys]
 version = "0.52"

From e59de9a350d400c313a60d426788c602358678fb Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Sat, 13 Dec 2025 05:24:34 -0700
Subject: [PATCH 1216/1815] Potential fix for code scanning alert no. 91:
 Client-side cross-site scripting

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .../browser/view/renderers/webviewPreloads.ts | 42 +++++++++++++++----
 1 file changed, 35 insertions(+), 7 deletions(-)

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 9e48566e258a..092a3bfe7b17 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
@@ -2466,15 +2466,43 @@ async function webviewPreloads(ctx: PreloadContext) {
 	function sanitizeHTML(dirty) {
 		const template = document.createElement('template');
 		template.innerHTML = dirty;
-		// Remove all <script> elements
-		for (const script of template.content.querySelectorAll('script')) {
-			script.remove();
-		}
-		// Remove event handler attributes (on*)
+
+		// Remove potentially dangerous elements
+		const forbiddenTags = [
+			'script', 'style', 'iframe', 'object', 'embed', 'link', 'base', 'meta', 'form', 'input', 'button'
+		];
+		forbiddenTags.forEach(tag => {
+			for (const el of Array.from(template.content.querySelectorAll(tag))) {
+				el.remove();
+			}
+		});
+
+		// Remove event handler attributes (on*), style, srcdoc, javascript: URLs
 		for (const el of template.content.querySelectorAll('*')) {
 			for (const attr of Array.from(el.attributes)) {
-				if (/^on/i.test(attr.name)) {
-					el.removeAttribute(attr.name);
+				const name = attr.name;
+				const value = attr.value;
+
+				// Remove inline event handlers
+				if (/^on/i.test(name)) {
+					el.removeAttribute(name);
+					continue;
+				}
+				// Remove style attributes (CSS attacks)
+				if (/^style$/i.test(name)) {
+					el.removeAttribute(name);
+					continue;
+				}
+				// Remove srcdoc attribute
+				if (/^srcdoc$/i.test(name)) {
+					el.removeAttribute(name);
+					continue;
+				}
+				// Remove javascript: URIs in src/href/data attrs
+				if (/^(src|href|data)$/i.test(name) &&
+					/^javascript:/i.test(value.trim())) {
+					el.removeAttribute(name);
+					continue;
 				}
 			}
 		}

From 20b1816337bef616116529bd92c7d8741126868e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 13 Dec 2025 12:25:06 +0000
Subject: [PATCH 1217/1815] Bump @types/node in
 /extensions/configuration-editing

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../configuration-editing/package-lock.json   | 20 ++++++++++---------
 extensions/configuration-editing/package.json |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/configuration-editing/package-lock.json b/extensions/configuration-editing/package-lock.json
index 641f0390d206..ac6049eb0fcd 100644
--- a/extensions/configuration-editing/package-lock.json
+++ b/extensions/configuration-editing/package-lock.json
@@ -14,7 +14,7 @@
         "tunnel": "^0.0.6"
       },
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "^1.0.0"
@@ -175,12 +175,13 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.1.tgz",
+      "integrity": "sha512-czWPzKIAXucn9PtsttxmumiQ9N0ok9FrBwgRWrwmVLlp86BrMExzvXRLFYRJ+Ex3g6yqj+KuaxfX1JTgV2lpfg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/before-after-hook": {
@@ -220,10 +221,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/universal-user-agent": {
       "version": "7.0.3",
diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json
index f878224218f9..66e18bcab14b 100644
--- a/extensions/configuration-editing/package.json
+++ b/extensions/configuration-editing/package.json
@@ -169,7 +169,7 @@
     ]
   },
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "25.x"
   },
   "repository": {
     "type": "git",

From f0bf35b10babe5b92a1276dbd5bfa806190a5044 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 14 Dec 2025 05:35:12 +0000
Subject: [PATCH 1218/1815] Bump tokio in /cli in the cargo group across 1
 directory

Bumps the cargo group with 1 update in the /cli directory: [tokio](https://github.com/tokio-rs/tokio).


Updates `tokio` from 1.42.1 to 1.43.1
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.42.1...tokio-1.43.1)

---
updated-dependencies:
- dependency-name: tokio
  dependency-version: 1.43.1
  dependency-type: direct:production
  dependency-group: cargo
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 8 ++++----
 cli/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 29ead1a5aa71..b2ded2625572 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -2694,9 +2694,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.42.1"
+version = "1.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2209a14885b74764cce87ffa777ffa1b8ce81a3f3166c6f886b83337fe7e077f"
+checksum = "492a604e2fd7f814268a378409e6c92b5525d747d10db9a229723f55a417958c"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2713,9 +2713,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 4a472bfeb2d3..e71996335dbd 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -16,7 +16,7 @@ futures = "0.3.28"
 clap = { version = "4.3.0", features = ["derive", "env"] }
 open = "4.1.0"
 reqwest = { version = "0.11.22", default-features = false, features = ["json", "stream", "native-tls"] }
-tokio = { version = "1.42.1", features = ["full"] }
+tokio = { version = "1.43.1", features = ["full"] }
 tokio-util = { version = "0.7.8", features = ["compat", "codec"] }
 flate2 = { version = "1.0.26", default-features = false, features = ["zlib"] }
 zip = { version = "0.6.6", default-features = false, features = ["time", "deflate-zlib"] }

From d9a9ce5546a656fd88c93b2c35115469a0d3581b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 14 Dec 2025 05:59:33 +0000
Subject: [PATCH 1219/1815] Bump bytes from 1.6.0 to 1.11.0 in /cli

Bumps [bytes](https://github.com/tokio-rs/bytes) from 1.6.0 to 1.11.0.
- [Release notes](https://github.com/tokio-rs/bytes/releases)
- [Changelog](https://github.com/tokio-rs/bytes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tokio-rs/bytes/compare/v1.6.0...v1.11.0)

---
updated-dependencies:
- dependency-name: bytes
  dependency-version: 1.11.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 4 ++--
 cli/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index b2ded2625572..1d682464c6da 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -331,9 +331,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
 
 [[package]]
 name = "cc"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index e71996335dbd..c0b7697d3bd3 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -52,7 +52,7 @@ thiserror = "1.0.40"
 cfg-if = "1.0.0"
 pin-project = "1.1.0"
 console = "0.15.7"
-bytes = "1.4.0"
+bytes = "1.11.0"
 tar = "0.4.38"
 
 [build-dependencies]

From b89b6b862de57dadef5520ca72c83a008d362d6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 14 Dec 2025 21:48:17 +0000
Subject: [PATCH 1220/1815] Bump @types/node in
 /extensions/css-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/css-language-features/package-lock.json | 8 ++++----
 extensions/css-language-features/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/css-language-features/package-lock.json b/extensions/css-language-features/package-lock.json
index bf02e031ae64..c77a8285d47f 100644
--- a/extensions/css-language-features/package-lock.json
+++ b/extensions/css-language-features/package-lock.json
@@ -13,16 +13,16 @@
         "vscode-uri": "^3.0.8"
       },
       "devDependencies": {
-        "@types/node": "24.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "^1.77.0"
       }
     },
     "node_modules/@types/node": {
-      "version": "24.10.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
-      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
+      "version": "25.0.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.2.tgz",
+      "integrity": "sha512-gWEkeiyYE4vqjON/+Obqcoeffmk0NF15WSBwSs7zwVA2bAbTaE0SJ7P0WNGoJn8uE7fiaV5a7dKYIJriEqOrmA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json
index 7d000e3252ab..605b0a603bc9 100644
--- a/extensions/css-language-features/package.json
+++ b/extensions/css-language-features/package.json
@@ -998,7 +998,7 @@
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
-    "@types/node": "24.x"
+    "@types/node": "25.x"
   },
   "repository": {
     "type": "git",

From 47db1c3b47f1223abf6b5c2236b9dc9274cf87e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 12:31:30 +0000
Subject: [PATCH 1221/1815] Bump slog from 2.7.0 to 2.8.2 in /build/win32

Bumps [slog](https://github.com/slog-rs/slog) from 2.7.0 to 2.8.2.
- [Release notes](https://github.com/slog-rs/slog/releases)
- [Changelog](https://github.com/slog-rs/slog/blob/master/CHANGELOG.md)
- [Commits](https://github.com/slog-rs/slog/compare/v2.7.0...v2.8.2)

---
updated-dependencies:
- dependency-name: slog
  dependency-version: 2.8.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/win32/Cargo.lock | 54 ++++++++++++++++++++++++++++++++++++++++--
 build/win32/Cargo.toml |  2 +-
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/build/win32/Cargo.lock b/build/win32/Cargo.lock
index 34f5a9e10720..582e5dcb1cbb 100644
--- a/build/win32/Cargo.lock
+++ b/build/win32/Cargo.lock
@@ -11,6 +11,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "anyhow"
+version = "1.0.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
+
 [[package]]
 name = "autocfg"
 version = "1.5.0"
@@ -99,6 +105,15 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "erased-serde"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "find-msvc-tools"
 version = "0.1.5"
@@ -234,6 +249,35 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0a5f7c728f5d284929a1cccb5bc19884422bfe6ef4d6c409da2c41838983fcf"
 
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -242,9 +286,15 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "slog"
-version = "2.7.0"
+version = "2.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06"
+checksum = "9b3b8565691b22d2bdfc066426ed48f837fc0c5f2c8cad8d9718f7f99d6995c1"
+dependencies = [
+ "anyhow",
+ "erased-serde",
+ "rustversion",
+ "serde_core",
+]
 
 [[package]]
 name = "slog-async"
diff --git a/build/win32/Cargo.toml b/build/win32/Cargo.toml
index 332b4f7a0621..52f05ae29138 100644
--- a/build/win32/Cargo.toml
+++ b/build/win32/Cargo.toml
@@ -7,7 +7,7 @@ build = "build.rs"
 [dependencies]
 byteorder = "1.5.0"
 crc = "3.4.0"
-slog = "2.7.0"
+slog = "2.8.2"
 slog-async = "2.8.0"
 slog-term = "2.9.2"
 

From 619c14ef70690749188bf74c6c83a7c9df59b424 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 12:31:31 +0000
Subject: [PATCH 1222/1815] Bump async-trait from 0.1.80 to 0.1.89 in /cli

Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.80 to 0.1.89.
- [Release notes](https://github.com/dtolnay/async-trait/releases)
- [Commits](https://github.com/dtolnay/async-trait/compare/0.1.80...0.1.89)

---
updated-dependencies:
- dependency-name: async-trait
  dependency-version: 0.1.89
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 4 ++--
 cli/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index de924a689d8f..814b3a49164b 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -225,9 +225,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.80"
+version = "0.1.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 63297f4585ce..0b65ff72a3be 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -42,7 +42,7 @@ indicatif = "0.17.4"
 tempfile = "3.5.0"
 clap_lex = "0.7.6"
 url = "2.5.4"
-async-trait = "0.1.68"
+async-trait = "0.1.89"
 log = "0.4.18"
 const_format = "0.2.31"
 sha2 = "0.10.6"

From 38339ec0f70f2578762bc941fff6d3c2410f63d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 12:31:36 +0000
Subject: [PATCH 1223/1815] Bump windows-sys from 0.52.0 to 0.61.2 in
 /build/win32

Bumps [windows-sys](https://github.com/microsoft/windows-rs) from 0.52.0 to 0.61.2.
- [Release notes](https://github.com/microsoft/windows-rs/releases)
- [Commits](https://github.com/microsoft/windows-rs/commits)

---
updated-dependencies:
- dependency-name: windows-sys
  dependency-version: 0.61.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/win32/Cargo.lock | 2 +-
 build/win32/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/win32/Cargo.lock b/build/win32/Cargo.lock
index 34f5a9e10720..f45c58525303 100644
--- a/build/win32/Cargo.lock
+++ b/build/win32/Cargo.lock
@@ -144,7 +144,7 @@ dependencies = [
  "slog",
  "slog-async",
  "slog-term",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
diff --git a/build/win32/Cargo.toml b/build/win32/Cargo.toml
index 332b4f7a0621..7b1c40f24660 100644
--- a/build/win32/Cargo.toml
+++ b/build/win32/Cargo.toml
@@ -12,7 +12,7 @@ slog-async = "2.8.0"
 slog-term = "2.9.2"
 
 [target.'cfg(windows)'.dependencies.windows-sys]
-version = "0.52"
+version = "0.61"
 features = [
     "Win32_Foundation",
     "Win32_System_Shutdown",

From e6abdefd6bb29e854470002dffb3ac076fcd882f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 12:31:41 +0000
Subject: [PATCH 1224/1815] Bump gethostname from 0.4.3 to 1.0.0 in /cli

Bumps gethostname from 0.4.3 to 1.0.0.

---
updated-dependencies:
- dependency-name: gethostname
  dependency-version: 1.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 8 ++++----
 cli/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index de924a689d8f..19e92e0a1464 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -975,12 +975,12 @@ dependencies = [
 
 [[package]]
 name = "gethostname"
-version = "0.4.3"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
+checksum = "4fd4b8790c0792e3b11895efdf5f289ebe8b59107a6624f1cce68f24ff8c7035"
 dependencies = [
- "libc",
- "windows-targets 0.48.5",
+ "rustix 0.38.34",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 63297f4585ce..66c9942af9e5 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -32,7 +32,7 @@ rand = "0.8.5"
 opentelemetry = { version = "0.19.0", features = ["rt-tokio"] }
 serde_bytes = "0.11.9"
 chrono = { version = "0.4.26", features = ["serde", "std", "clock"], default-features = false }
-gethostname = "0.4.3"
+gethostname = "1.0.0"
 libc = "0.2.144"
 tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "8cae9b2a24c65c6c1958f5a0e77d72b23b5c6c30", default-features = false, features = ["connections"] }
 keyring = { version = "2.0.3", default-features = false, features = ["linux-secret-service-rt-tokio-crypto-openssl", "platform-windows", "platform-macos", "linux-keyutils"] }

From bd4a5eb0765a54429260f3e8341eee06892c59f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 12:31:53 +0000
Subject: [PATCH 1225/1815] Bump base64 from 0.21.7 to 0.22.1 in /cli

Bumps [base64](https://github.com/marshallpierce/rust-base64) from 0.21.7 to 0.22.1.
- [Changelog](https://github.com/marshallpierce/rust-base64/blob/master/RELEASE-NOTES.md)
- [Commits](https://github.com/marshallpierce/rust-base64/compare/v0.21.7...v0.22.1)

---
updated-dependencies:
- dependency-name: base64
  dependency-version: 0.22.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 12 +++++++++---
 cli/Cargo.toml |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index de924a689d8f..4d97d3036b98 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -267,6 +267,12 @@ version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
 [[package]]
 name = "bit-vec"
 version = "0.6.3"
@@ -405,7 +411,7 @@ name = "code-cli"
 version = "0.1.0"
 dependencies = [
  "async-trait",
- "base64",
+ "base64 0.22.1",
  "bytes",
  "cfg-if",
  "chrono",
@@ -2156,7 +2162,7 @@ version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
- "base64",
+ "base64 0.21.7",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -2318,7 +2324,7 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
- "base64",
+ "base64 0.21.7",
 ]
 
 [[package]]
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 63297f4585ce..c12b68b503cc 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -46,7 +46,7 @@ async-trait = "0.1.68"
 log = "0.4.18"
 const_format = "0.2.31"
 sha2 = "0.10.6"
-base64 = "0.21.2"
+base64 = "0.22.1"
 shell-escape = "0.1.5"
 thiserror = "1.0.40"
 cfg-if = "1.0.0"

From 098bfcd8987a78555fd578bea61899bda6a7f1a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 12:32:05 +0000
Subject: [PATCH 1226/1815] Bump lazy_static from 1.4.0 to 1.5.0 in /cli

Bumps [lazy_static](https://github.com/rust-lang-nursery/lazy-static.rs) from 1.4.0 to 1.5.0.
- [Release notes](https://github.com/rust-lang-nursery/lazy-static.rs/releases)
- [Commits](https://github.com/rust-lang-nursery/lazy-static.rs/compare/1.4.0...1.5.0)

---
updated-dependencies:
- dependency-name: lazy_static
  dependency-version: 1.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 4 ++--
 cli/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index de924a689d8f..dd20930e3d9f 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -1445,9 +1445,9 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 63297f4585ce..4cbeab129b6b 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -21,7 +21,7 @@ tokio-util = { version = "0.7.8", features = ["compat", "codec"] }
 flate2 = { version = "1.0.26", default-features = false, features = ["zlib"] }
 zip = { version = "0.6.6", default-features = false, features = ["time", "deflate-zlib"] }
 regex = "1.8.3"
-lazy_static = "1.4.0"
+lazy_static = "1.5.0"
 sysinfo = { version = "0.29.0", default-features = false }
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"

From c0a5f975820eb7b3ba4963475cdab3e6b770294a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 12:33:55 +0000
Subject: [PATCH 1227/1815] Bump @types/through from 0.0.29 to 0.0.33 in /build

Bumps [@types/through](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/through) from 0.0.29 to 0.0.33.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/through)

---
updated-dependencies:
- dependency-name: "@types/through"
  dependency-version: 0.0.33
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 9 +++++----
 build/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 6920fe85d0a4..2a086b2b1799 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -37,7 +37,7 @@
         "@types/node": "20.x",
         "@types/pump": "^1.0.1",
         "@types/rimraf": "^2.0.4",
-        "@types/through": "^0.0.29",
+        "@types/through": "^0.0.33",
         "@types/through2": "^2.0.36",
         "@types/workerpool": "^6.4.0",
         "@types/xml2js": "0.0.33",
@@ -1237,10 +1237,11 @@
       }
     },
     "node_modules/@types/through": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.29.tgz",
-      "integrity": "sha512-9a7C5VHh+1BKblaYiq+7Tfc+EOmjMdZaD1MYtkQjSoxgB69tBjW98ry6SKsi4zEIWztLOMRuL87A3bdT/Fc/4w==",
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.33.tgz",
+      "integrity": "sha512-HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
diff --git a/build/package.json b/build/package.json
index d2f852bc85a5..ad762e11e7a2 100644
--- a/build/package.json
+++ b/build/package.json
@@ -31,7 +31,7 @@
     "@types/node": "20.x",
     "@types/pump": "^1.0.1",
     "@types/rimraf": "^2.0.4",
-    "@types/through": "^0.0.29",
+    "@types/through": "^0.0.33",
     "@types/through2": "^2.0.36",
     "@types/workerpool": "^6.4.0",
     "@types/xml2js": "0.0.33",

From 9bb78652df8f1c0052647f275bce1a299534290b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 12:33:59 +0000
Subject: [PATCH 1228/1815] Bump @types/gulp-json-editor from 2.2.31 to 2.2.36
 in /build

Bumps [@types/gulp-json-editor](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/gulp-json-editor) from 2.2.31 to 2.2.36.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/gulp-json-editor)

---
updated-dependencies:
- dependency-name: "@types/gulp-json-editor"
  dependency-version: 2.2.36
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 9 +++++----
 build/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 6920fe85d0a4..4eefd88cca2d 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -25,7 +25,7 @@
         "@types/gulp": "^4.0.18",
         "@types/gulp-filter": "^3.0.32",
         "@types/gulp-gzip": "^0.0.31",
-        "@types/gulp-json-editor": "^2.2.31",
+        "@types/gulp-json-editor": "^2.2.36",
         "@types/gulp-rename": "^0.0.33",
         "@types/gulp-sort": "^2.0.4",
         "@types/gulp-sourcemaps": "^0.0.32",
@@ -1083,10 +1083,11 @@
       }
     },
     "node_modules/@types/gulp-json-editor": {
-      "version": "2.2.31",
-      "resolved": "https://registry.npmjs.org/@types/gulp-json-editor/-/gulp-json-editor-2.2.31.tgz",
-      "integrity": "sha512-piis0ImYAy0dt18R4EtTbAY+RV8jwTq5VisnUV6OfP8kD4743aHGkAdAd08No4NY3rFa5mD6ytIu8L0YU7nL9w==",
+      "version": "2.2.36",
+      "resolved": "https://registry.npmjs.org/@types/gulp-json-editor/-/gulp-json-editor-2.2.36.tgz",
+      "integrity": "sha512-BX6KjseCoZ09thBmF1QPZnDGtsLndNuhAziUbKqX8x+UDvlFjv2JLX5IeNOqMU2Sc5RkgaClyAU6JA0r19FEKw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/js-beautify": "*",
         "@types/node": "*"
diff --git a/build/package.json b/build/package.json
index d2f852bc85a5..1d8845464a96 100644
--- a/build/package.json
+++ b/build/package.json
@@ -19,7 +19,7 @@
     "@types/gulp": "^4.0.18",
     "@types/gulp-filter": "^3.0.32",
     "@types/gulp-gzip": "^0.0.31",
-    "@types/gulp-json-editor": "^2.2.31",
+    "@types/gulp-json-editor": "^2.2.36",
     "@types/gulp-rename": "^0.0.33",
     "@types/gulp-sort": "^2.0.4",
     "@types/gulp-sourcemaps": "^0.0.32",

From 5e2883c062176dbb916ea6300d7fe9a4aa6b77df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 12:34:04 +0000
Subject: [PATCH 1229/1815] Bump @types/glob from 7.1.1 to 9.0.0 in /build

Bumps [@types/glob](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/glob) from 7.1.1 to 9.0.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/glob)

---
updated-dependencies:
- dependency-name: "@types/glob"
  dependency-version: 9.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 14 +++++++-------
 build/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 6920fe85d0a4..d842b00d8325 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -21,7 +21,7 @@
         "@types/debug": "^4.1.5",
         "@types/fancy-log": "^1.3.0",
         "@types/fs-extra": "^9.0.12",
-        "@types/glob": "^7.1.1",
+        "@types/glob": "^9.0.0",
         "@types/gulp": "^4.0.18",
         "@types/gulp-filter": "^3.0.32",
         "@types/gulp-gzip": "^0.0.31",
@@ -1029,14 +1029,14 @@
       }
     },
     "node_modules/@types/glob": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
-      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-9.0.0.tgz",
+      "integrity": "sha512-00UxlRaIUvYm4R4W9WYkN8/J+kV8fmOQ7okeH6YFtGWFMt3odD45tpG5yA5wnL7HE6lLgjaTW5n14ju2hl2NNA==",
+      "deprecated": "This is a stub types definition. glob provides its own type definitions, so you do not need this installed.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/events": "*",
-        "@types/minimatch": "*",
-        "@types/node": "*"
+        "glob": "*"
       }
     },
     "node_modules/@types/glob-stream": {
diff --git a/build/package.json b/build/package.json
index d2f852bc85a5..5ca93e032c45 100644
--- a/build/package.json
+++ b/build/package.json
@@ -15,7 +15,7 @@
     "@types/debug": "^4.1.5",
     "@types/fancy-log": "^1.3.0",
     "@types/fs-extra": "^9.0.12",
-    "@types/glob": "^7.1.1",
+    "@types/glob": "^9.0.0",
     "@types/gulp": "^4.0.18",
     "@types/gulp-filter": "^3.0.32",
     "@types/gulp-gzip": "^0.0.31",

From 6ce91a37d6726f11d42a3c90e5cbb602ea5359eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 12:34:09 +0000
Subject: [PATCH 1230/1815] Bump @types/fancy-log from 1.3.0 to 2.0.2 in /build

Bumps [@types/fancy-log](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/fancy-log) from 1.3.0 to 2.0.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/fancy-log)

---
updated-dependencies:
- dependency-name: "@types/fancy-log"
  dependency-version: 2.0.2
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 11 ++++++-----
 build/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 6920fe85d0a4..7d59e2a0fc47 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -19,7 +19,7 @@
         "@types/byline": "^4.2.32",
         "@types/debounce": "^1.0.0",
         "@types/debug": "^4.1.5",
-        "@types/fancy-log": "^1.3.0",
+        "@types/fancy-log": "^2.0.2",
         "@types/fs-extra": "^9.0.12",
         "@types/glob": "^7.1.1",
         "@types/gulp": "^4.0.18",
@@ -1014,10 +1014,11 @@
       "dev": true
     },
     "node_modules/@types/fancy-log": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@types/fancy-log/-/fancy-log-1.3.0.tgz",
-      "integrity": "sha512-mQjDxyOM1Cpocd+vm1kZBP7smwKZ4TNokFeds9LV7OZibmPJFEzY3+xZMrKfUdNT71lv8GoCPD6upKwHxubClw==",
-      "dev": true
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/fancy-log/-/fancy-log-2.0.2.tgz",
+      "integrity": "sha512-SXVJvqWjsl90VwBfp7w4iQ0iO+vxAjQImglcpwbV9GkqNoUD5/p9Wsgetl40F1WL7pzWFN/eZPTF1g5FZXJsIw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/fs-extra": {
       "version": "9.0.12",
diff --git a/build/package.json b/build/package.json
index d2f852bc85a5..42fc7cf96b43 100644
--- a/build/package.json
+++ b/build/package.json
@@ -13,7 +13,7 @@
     "@types/byline": "^4.2.32",
     "@types/debounce": "^1.0.0",
     "@types/debug": "^4.1.5",
-    "@types/fancy-log": "^1.3.0",
+    "@types/fancy-log": "^2.0.2",
     "@types/fs-extra": "^9.0.12",
     "@types/glob": "^7.1.1",
     "@types/gulp": "^4.0.18",

From d10d5fff9eac094ac702924a1a335b5c6aa75aa0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 12:37:55 +0000
Subject: [PATCH 1231/1815] Bump http-proxy-agent from 7.0.0 to 7.0.2 in
 /remote

Bumps [http-proxy-agent](https://github.com/TooTallNate/proxy-agents/tree/HEAD/packages/http-proxy-agent) from 7.0.0 to 7.0.2.
- [Release notes](https://github.com/TooTallNate/proxy-agents/releases)
- [Changelog](https://github.com/TooTallNate/proxy-agents/blob/main/packages/http-proxy-agent/CHANGELOG.md)
- [Commits](https://github.com/TooTallNate/proxy-agents/commits/http-proxy-agent@7.0.2/packages/http-proxy-agent)

---
updated-dependencies:
- dependency-name: http-proxy-agent
  dependency-version: 7.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 9 +++++----
 remote/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 248033133b35..af2db2cf3172 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -31,7 +31,7 @@
         "@xterm/headless": "^5.6.0-beta.140",
         "@xterm/xterm": "^5.6.0-beta.98",
         "cookie": "^0.7.0",
-        "http-proxy-agent": "^7.0.0",
+        "http-proxy-agent": "^7.0.2",
         "https-proxy-agent": "^7.0.2",
         "jschardet": "3.1.4",
         "kerberos": "2.1.1",
@@ -957,9 +957,10 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
     "node_modules/http-proxy-agent": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
-      "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
+      "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==",
+      "license": "MIT",
       "dependencies": {
         "agent-base": "^7.1.0",
         "debug": "^4.3.4"
diff --git a/remote/package.json b/remote/package.json
index b738d7a6f5ca..9ad564604c27 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -26,7 +26,7 @@
     "@xterm/headless": "^5.6.0-beta.140",
     "@xterm/xterm": "^5.6.0-beta.98",
     "cookie": "^0.7.0",
-    "http-proxy-agent": "^7.0.0",
+    "http-proxy-agent": "^7.0.2",
     "https-proxy-agent": "^7.0.2",
     "jschardet": "3.1.4",
     "kerberos": "2.1.1",

From 95991935001c12bb76020af49cedd5d66f4bf033 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 12:38:02 +0000
Subject: [PATCH 1232/1815] Bump fancy-log from 1.3.3 to 2.0.0

Bumps [fancy-log](https://github.com/gulpjs/fancy-log) from 1.3.3 to 2.0.0.
- [Release notes](https://github.com/gulpjs/fancy-log/releases)
- [Changelog](https://github.com/gulpjs/fancy-log/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gulpjs/fancy-log/compare/v1.3.3...v2.0.0)

---
updated-dependencies:
- dependency-name: fancy-log
  dependency-version: 2.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 71 +++++++++++++++++++++++++++++++++++++++--------
 package.json      |  2 +-
 2 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6aa851cf2037..fdb66ca6f325 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -103,7 +103,7 @@
         "eslint-plugin-jsdoc": "^50.3.1",
         "eslint-plugin-local": "^6.0.0",
         "event-stream": "3.3.4",
-        "fancy-log": "^1.3.3",
+        "fancy-log": "^2.0.0",
         "file-loader": "^6.2.0",
         "glob": "^9.0.1",
         "gulp": "^5.0.1",
@@ -3749,8 +3749,9 @@
     "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==",
+      "integrity": "sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-wrap": "0.1.0"
       },
@@ -6565,18 +6566,16 @@
       }
     },
     "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==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-2.0.0.tgz",
+      "integrity": "sha512-9CzxZbACXMUXW13tS0tI8XsGGmxWzO2DmYrGuBJOJ8k8q2K7hwfJA5qHjuPPe8wtsco33YR9wc+Rlr5wYFvhSA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "parse-node-version": "^1.0.0",
-        "time-stamp": "^1.0.0"
+        "color-support": "^1.1.3"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=10.13.0"
       }
     },
     "node_modules/fast-deep-equal": {
@@ -8210,6 +8209,22 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/gulp-gzip/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,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/gulp-gzip/node_modules/readable-stream": {
       "version": "2.3.7",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -8353,6 +8368,22 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/gulp-plumber/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,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/gulp-plumber/node_modules/kind-of": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
@@ -12207,6 +12238,7 @@
       "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
       "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.10"
       }
@@ -15299,8 +15331,9 @@
     "node_modules/time-stamp": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM= sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==",
+      "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16446,6 +16479,22 @@
         "webpack": "^5.21.2"
       }
     },
+    "node_modules/webpack-stream/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,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-gray": "^0.1.1",
+        "color-support": "^1.1.3",
+        "parse-node-version": "^1.0.0",
+        "time-stamp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/webpack-stream/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
diff --git a/package.json b/package.json
index 2a5d58886d83..3bce27e90577 100644
--- a/package.json
+++ b/package.json
@@ -162,7 +162,7 @@
     "eslint-plugin-jsdoc": "^50.3.1",
     "eslint-plugin-local": "^6.0.0",
     "event-stream": "3.3.4",
-    "fancy-log": "^1.3.3",
+    "fancy-log": "^2.0.0",
     "file-loader": "^6.2.0",
     "glob": "^9.0.1",
     "gulp": "^5.0.1",

From 885466590fd39ca0acd4f53128938381ee7831b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 12:55:07 +0000
Subject: [PATCH 1233/1815] Bump step-security/harden-runner from 2.13.2 to
 2.14.0

Bumps [step-security/harden-runner](https://github.com/step-security/harden-runner) from 2.13.2 to 2.14.0.
- [Release notes](https://github.com/step-security/harden-runner/releases)
- [Commits](https://github.com/step-security/harden-runner/compare/95d9a5deda9de15063e7595e9719c11c38c90ae2...20cf305ff2072d973412fa9b1e3a4f227bda3c76)

---
updated-dependencies:
- dependency-name: step-security/harden-runner
  dependency-version: 2.14.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/dependency-review.yml | 2 +-
 .github/workflows/scorecards.yml        | 2 +-
 .github/workflows/telemetry.yml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index 7e24594f265c..aecbfd277c0d 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index fc76bdf81195..1a872ab69165 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml
index 4d9f6a00d83f..796ac5f0e686 100644
--- a/.github/workflows/telemetry.yml
+++ b/.github/workflows/telemetry.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
         with:
           egress-policy: audit
 

From da091cf9925c7e99527b0c7e425c8dfcd4f255cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Dec 2025 12:33:13 +0000
Subject: [PATCH 1234/1815] Bump @types/node in
 /extensions/css-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 24.10.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.10.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../server/package-lock.json                  | 20 ++++++++++---------
 .../css-language-features/server/package.json |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/css-language-features/server/package-lock.json b/extensions/css-language-features/server/package-lock.json
index 29c87b367adc..7102f95a3a41 100644
--- a/extensions/css-language-features/server/package-lock.json
+++ b/extensions/css-language-features/server/package-lock.json
@@ -16,7 +16,7 @@
       },
       "devDependencies": {
         "@types/mocha": "^9.1.1",
-        "@types/node": "20.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "node": "*"
@@ -29,12 +29,13 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.2.tgz",
+      "integrity": "sha512-gWEkeiyYE4vqjON/+Obqcoeffmk0NF15WSBwSs7zwVA2bAbTaE0SJ7P0WNGoJn8uE7fiaV5a7dKYIJriEqOrmA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@vscode/l10n": {
@@ -43,10 +44,11 @@
       "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ=="
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vscode-css-languageservice": {
       "version": "6.3.2",
diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json
index 9d4b1976484e..0bc94cf2ce99 100644
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@types/mocha": "^9.1.1",
-    "@types/node": "20.x"
+    "@types/node": "25.x"
   },
   "scripts": {
     "compile": "gulp compile-extension:css-language-features-server",

From 8d47372eb3c172de133b8a9757ae3161c5becc8c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Dec 2025 12:28:16 +0000
Subject: [PATCH 1235/1815] Bump @types/node in /extensions/debug-auto-launch

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../debug-auto-launch/package-lock.json       | 20 ++++++++++---------
 extensions/debug-auto-launch/package.json     |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/debug-auto-launch/package-lock.json b/extensions/debug-auto-launch/package-lock.json
index 84a1daab83bb..82a7515bf49e 100644
--- a/extensions/debug-auto-launch/package-lock.json
+++ b/extensions/debug-auto-launch/package-lock.json
@@ -9,26 +9,28 @@
       "version": "1.0.0",
       "license": "MIT",
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "^1.5.0"
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/debug-auto-launch/package.json b/extensions/debug-auto-launch/package.json
index 4a5d3361f95e..23514f6e87a5 100644
--- a/extensions/debug-auto-launch/package.json
+++ b/extensions/debug-auto-launch/package.json
@@ -33,7 +33,7 @@
     ]
   },
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "25.x"
   },
   "prettier": {
     "printWidth": 100,

From 049844abd39a152476e3928a27949381f7ca39c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Dec 2025 12:28:20 +0000
Subject: [PATCH 1236/1815] Bump @types/node from 20.11.24 to 25.0.3 in
 /extensions/git-base

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git-base/package-lock.json | 20 +++++++++++---------
 extensions/git-base/package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/git-base/package-lock.json b/extensions/git-base/package-lock.json
index f4b29739ca63..efbdbfc93c3a 100644
--- a/extensions/git-base/package-lock.json
+++ b/extensions/git-base/package-lock.json
@@ -9,26 +9,28 @@
       "version": "1.0.0",
       "license": "MIT",
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "0.10.x"
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/git-base/package.json b/extensions/git-base/package.json
index 3c9b07a13e8f..139b8d064fd7 100644
--- a/extensions/git-base/package.json
+++ b/extensions/git-base/package.json
@@ -104,7 +104,7 @@
     ]
   },
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "25.x"
   },
   "repository": {
     "type": "git",

From 3d9c8d09b56b290523496b0489fd974b71401524 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Dec 2025 12:28:25 +0000
Subject: [PATCH 1237/1815] Bump @types/node in
 /.vscode/extensions/vscode-selfhost-test-provider

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.12.11 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 20 ++++++++++---------
 .../package.json                              |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
index f6d4b14e1adf..4df90fe6a802 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
@@ -16,7 +16,7 @@
       },
       "devDependencies": {
         "@types/mocha": "^10.0.10",
-        "@types/node": "20.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "^1.88.0"
@@ -58,12 +58,13 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.12.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.11.tgz",
-      "integrity": "sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/ansi-styles": {
@@ -97,10 +98,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     }
   }
 }
diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package.json b/.vscode/extensions/vscode-selfhost-test-provider/package.json
index 269fbdfdd91f..2a579793a118 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package.json
@@ -78,7 +78,7 @@
   },
   "devDependencies": {
     "@types/mocha": "^10.0.10",
-    "@types/node": "20.x"
+    "@types/node": "25.x"
   },
   "dependencies": {
     "@jridgewell/trace-mapping": "^0.3.31",

From bc953a417acd3cebcb8a92eb7fbf6492d8205f05 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Dec 2025 12:29:01 +0000
Subject: [PATCH 1238/1815] Bump @types/node in
 /extensions/configuration-editing

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.1 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/configuration-editing/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/configuration-editing/package-lock.json b/extensions/configuration-editing/package-lock.json
index ac6049eb0fcd..bbeff99f881e 100644
--- a/extensions/configuration-editing/package-lock.json
+++ b/extensions/configuration-editing/package-lock.json
@@ -175,9 +175,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.1.tgz",
-      "integrity": "sha512-czWPzKIAXucn9PtsttxmumiQ9N0ok9FrBwgRWrwmVLlp86BrMExzvXRLFYRJ+Ex3g6yqj+KuaxfX1JTgV2lpfg==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 0cf7a5129a3aa769e0b6a7671241de7fd0b379ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Dec 2025 12:29:03 +0000
Subject: [PATCH 1239/1815] Bump @types/node in /extensions/debug-server-ready

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../debug-server-ready/package-lock.json      | 20 ++++++++++---------
 extensions/debug-server-ready/package.json    |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/debug-server-ready/package-lock.json b/extensions/debug-server-ready/package-lock.json
index 29a149e0e16a..59f5733bfdbc 100644
--- a/extensions/debug-server-ready/package-lock.json
+++ b/extensions/debug-server-ready/package-lock.json
@@ -9,26 +9,28 @@
       "version": "1.0.0",
       "license": "MIT",
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "^1.32.0"
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/debug-server-ready/package.json b/extensions/debug-server-ready/package.json
index 2afe977a9fc5..d2a061e06d18 100644
--- a/extensions/debug-server-ready/package.json
+++ b/extensions/debug-server-ready/package.json
@@ -212,7 +212,7 @@
     ]
   },
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "25.x"
   },
   "repository": {
     "type": "git",

From 91a635484316d2d8666bb0afb3e93505e7382b23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Dec 2025 12:29:11 +0000
Subject: [PATCH 1240/1815] Bump @types/node from 20.11.24 to 25.0.3 in
 /extensions/jake

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/jake/package-lock.json | 20 +++++++++++---------
 extensions/jake/package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/jake/package-lock.json b/extensions/jake/package-lock.json
index ff50538c25e2..615ad3830ae7 100644
--- a/extensions/jake/package-lock.json
+++ b/extensions/jake/package-lock.json
@@ -9,26 +9,28 @@
       "version": "1.0.0",
       "license": "MIT",
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "*"
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/jake/package.json b/extensions/jake/package.json
index 1d5d1250db0e..234bc2d3723c 100644
--- a/extensions/jake/package.json
+++ b/extensions/jake/package.json
@@ -18,7 +18,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "25.x"
   },
   "main": "./out/main",
   "activationEvents": [

From cb7f2177ceb266901c75cc07fe1010147a537280 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Dec 2025 12:29:11 +0000
Subject: [PATCH 1241/1815] Bump @types/node from 20.11.24 to 25.0.3 in
 /extensions/gulp

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/gulp/package-lock.json | 20 +++++++++++---------
 extensions/gulp/package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/gulp/package-lock.json b/extensions/gulp/package-lock.json
index 9311609f962c..fc7633c6b448 100644
--- a/extensions/gulp/package-lock.json
+++ b/extensions/gulp/package-lock.json
@@ -9,26 +9,28 @@
       "version": "1.0.0",
       "license": "MIT",
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "*"
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/gulp/package.json b/extensions/gulp/package.json
index 0c19b6884778..b1f5beff55fb 100644
--- a/extensions/gulp/package.json
+++ b/extensions/gulp/package.json
@@ -18,7 +18,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "25.x"
   },
   "main": "./out/main",
   "activationEvents": [

From a7da15f415f0b9646138a16fdd7baa3babf2f855 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Dec 2025 12:29:50 +0000
Subject: [PATCH 1242/1815] Bump @types/node from 20.11.24 to 25.0.3 in
 /extensions/grunt

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/grunt/package-lock.json | 20 +++++++++++---------
 extensions/grunt/package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/grunt/package-lock.json b/extensions/grunt/package-lock.json
index f0431ef8c852..2aaf4fb54348 100644
--- a/extensions/grunt/package-lock.json
+++ b/extensions/grunt/package-lock.json
@@ -9,26 +9,28 @@
       "version": "1.0.0",
       "license": "MIT",
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "*"
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/grunt/package.json b/extensions/grunt/package.json
index ae533cc0e47f..2c54ec24feb8 100644
--- a/extensions/grunt/package.json
+++ b/extensions/grunt/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "25.x"
   },
   "main": "./out/main",
   "activationEvents": [

From a76c73db56c50fadd86158b8092253e58c40d028 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Dec 2025 12:31:31 +0000
Subject: [PATCH 1243/1815] Bump @types/node from 24.10.1 to 25.0.3 in
 /extensions/references-view

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 24.10.1 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/references-view/package-lock.json | 8 ++++----
 extensions/references-view/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/references-view/package-lock.json b/extensions/references-view/package-lock.json
index 95ed53e535c5..3deca5263124 100644
--- a/extensions/references-view/package-lock.json
+++ b/extensions/references-view/package-lock.json
@@ -9,16 +9,16 @@
       "version": "1.0.0",
       "license": "MIT",
       "devDependencies": {
-        "@types/node": "24.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "^1.67.0"
       }
     },
     "node_modules/@types/node": {
-      "version": "24.10.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
-      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/extensions/references-view/package.json b/extensions/references-view/package.json
index 9580a16ceb8a..97b98648c001 100644
--- a/extensions/references-view/package.json
+++ b/extensions/references-view/package.json
@@ -399,6 +399,6 @@
     "watch": "npx gulp watch-extension:references-view"
   },
   "devDependencies": {
-    "@types/node": "24.x"
+    "@types/node": "25.x"
   }
 }

From b3a35b460b8a22419aa38e2fd119d3445ec21983 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Dec 2025 12:32:17 +0000
Subject: [PATCH 1244/1815] Bump @types/node in
 /extensions/vscode-colorize-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 24.10.1 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-colorize-tests/package-lock.json | 8 ++++----
 extensions/vscode-colorize-tests/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/vscode-colorize-tests/package-lock.json b/extensions/vscode-colorize-tests/package-lock.json
index 913d4bc586eb..d47673a0770a 100644
--- a/extensions/vscode-colorize-tests/package-lock.json
+++ b/extensions/vscode-colorize-tests/package-lock.json
@@ -12,16 +12,16 @@
         "jsonc-parser": "^3.3.1"
       },
       "devDependencies": {
-        "@types/node": "24.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "*"
       }
     },
     "node_modules/@types/node": {
-      "version": "24.10.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
-      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/extensions/vscode-colorize-tests/package.json b/extensions/vscode-colorize-tests/package.json
index 1951b483045b..443aa726dd6f 100644
--- a/extensions/vscode-colorize-tests/package.json
+++ b/extensions/vscode-colorize-tests/package.json
@@ -22,7 +22,7 @@
     "jsonc-parser": "^3.3.1"
   },
   "devDependencies": {
-    "@types/node": "24.x"
+    "@types/node": "25.x"
   },
   "contributes": {
     "semanticTokenTypes": [

From c8a8fc5729c36642b471434b44acf94e861e09ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Dec 2025 12:32:25 +0000
Subject: [PATCH 1245/1815] Bump @types/node in
 /extensions/vscode-test-resolver

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 24.10.1 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-test-resolver/package-lock.json | 8 ++++----
 extensions/vscode-test-resolver/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/vscode-test-resolver/package-lock.json b/extensions/vscode-test-resolver/package-lock.json
index 24d76eba539c..a576dc5a213f 100644
--- a/extensions/vscode-test-resolver/package-lock.json
+++ b/extensions/vscode-test-resolver/package-lock.json
@@ -9,16 +9,16 @@
       "version": "0.0.1",
       "license": "MIT",
       "devDependencies": {
-        "@types/node": "24.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "^1.25.0"
       }
     },
     "node_modules/@types/node": {
-      "version": "24.10.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
-      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/extensions/vscode-test-resolver/package.json b/extensions/vscode-test-resolver/package.json
index a38a2d8eac77..d70deef0dba6 100644
--- a/extensions/vscode-test-resolver/package.json
+++ b/extensions/vscode-test-resolver/package.json
@@ -33,7 +33,7 @@
   "main": "./out/extension",
   "browser": "./dist/browser/testResolverMain",
   "devDependencies": {
-    "@types/node": "24.x"
+    "@types/node": "25.x"
   },
   "capabilities": {
     "untrustedWorkspaces": {

From e9525629c41c2b8d2dcfca43f9457dd0e6641e77 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Dec 2025 12:32:27 +0000
Subject: [PATCH 1246/1815] Bump @types/node in
 /extensions/vscode-colorize-perf-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 24.10.1 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-colorize-perf-tests/package-lock.json | 8 ++++----
 extensions/vscode-colorize-perf-tests/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/vscode-colorize-perf-tests/package-lock.json b/extensions/vscode-colorize-perf-tests/package-lock.json
index 446dd2fad4fd..f142b3c5445a 100644
--- a/extensions/vscode-colorize-perf-tests/package-lock.json
+++ b/extensions/vscode-colorize-perf-tests/package-lock.json
@@ -12,16 +12,16 @@
         "jsonc-parser": "^3.3.1"
       },
       "devDependencies": {
-        "@types/node": "24.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "*"
       }
     },
     "node_modules/@types/node": {
-      "version": "24.10.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
-      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/extensions/vscode-colorize-perf-tests/package.json b/extensions/vscode-colorize-perf-tests/package.json
index 34246267561e..475b206a57fe 100644
--- a/extensions/vscode-colorize-perf-tests/package.json
+++ b/extensions/vscode-colorize-perf-tests/package.json
@@ -22,7 +22,7 @@
     "jsonc-parser": "^3.3.1"
   },
   "devDependencies": {
-    "@types/node": "24.x"
+    "@types/node": "25.x"
   },
   "repository": {
     "type": "git",

From a7d6cf16b71b8300bcdf22ea0f436f36a370f065 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Dec 2025 12:32:30 +0000
Subject: [PATCH 1247/1815] Bump @types/node in /extensions/tunnel-forwarding

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../tunnel-forwarding/package-lock.json       | 20 ++++++++++---------
 extensions/tunnel-forwarding/package.json     |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/tunnel-forwarding/package-lock.json b/extensions/tunnel-forwarding/package-lock.json
index 57accdc3b8d8..b52990d7c1c2 100644
--- a/extensions/tunnel-forwarding/package-lock.json
+++ b/extensions/tunnel-forwarding/package-lock.json
@@ -9,26 +9,28 @@
       "version": "1.0.0",
       "license": "MIT",
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "^1.82.0"
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/tunnel-forwarding/package.json b/extensions/tunnel-forwarding/package.json
index 315baa03598e..4dc127134c7c 100644
--- a/extensions/tunnel-forwarding/package.json
+++ b/extensions/tunnel-forwarding/package.json
@@ -44,7 +44,7 @@
     "watch": "gulp watch-extension:tunnel-forwarding"
   },
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "25.x"
   },
   "prettier": {
     "printWidth": 100,

From da1580bcd1b550a128472e9ff13207367e3d182f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Dec 2025 12:32:31 +0000
Subject: [PATCH 1248/1815] Bump @types/node from 24.10.1 to 25.0.3 in
 /extensions/vscode-api-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 24.10.1 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-api-tests/package-lock.json | 8 ++++----
 extensions/vscode-api-tests/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/vscode-api-tests/package-lock.json b/extensions/vscode-api-tests/package-lock.json
index e1e592265b86..269133c7b25d 100644
--- a/extensions/vscode-api-tests/package-lock.json
+++ b/extensions/vscode-api-tests/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "devDependencies": {
         "@types/mocha": "^10.0.10",
-        "@types/node": "24.x",
+        "@types/node": "25.x",
         "@types/node-forge": "^1.3.11",
         "node-forge": "^1.3.2",
         "straightforward": "^4.2.2"
@@ -27,9 +27,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "24.10.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
-      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
index 9ffbaf0dbaef..b3c8f0cd1bfa 100644
--- a/extensions/vscode-api-tests/package.json
+++ b/extensions/vscode-api-tests/package.json
@@ -252,7 +252,7 @@
   },
   "devDependencies": {
     "@types/mocha": "^10.0.10",
-    "@types/node": "24.x",
+    "@types/node": "25.x",
     "@types/node-forge": "^1.3.11",
     "node-forge": "^1.3.2",
     "straightforward": "^4.2.2"

From 4ff69d19f5c752ca64e265feeb229cde67ee3931 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Dec 2025 12:33:05 +0000
Subject: [PATCH 1249/1815] Bump @types/node from 24.10.1 to 25.0.3 in
 /test/smoke

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 24.10.1 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/smoke/package-lock.json | 8 ++++----
 test/smoke/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/smoke/package-lock.json b/test/smoke/package-lock.json
index f8c61ee4e913..55f92ab9348b 100644
--- a/test/smoke/package-lock.json
+++ b/test/smoke/package-lock.json
@@ -16,7 +16,7 @@
       "devDependencies": {
         "@types/mocha": "^10.0.10",
         "@types/ncp": "2.0.8",
-        "@types/node": "24.x",
+        "@types/node": "25.x",
         "@types/node-fetch": "^2.6.13",
         "@types/rimraf": "4.0.5",
         "npm-run-all": "^4.1.5"
@@ -61,9 +61,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "24.10.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
-      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/test/smoke/package.json b/test/smoke/package.json
index df38b61e2c4f..a726c6f9f535 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -18,7 +18,7 @@
   "devDependencies": {
     "@types/mocha": "^10.0.10",
     "@types/ncp": "2.0.8",
-    "@types/node": "24.x",
+    "@types/node": "25.x",
     "@types/node-fetch": "^2.6.13",
     "@types/rimraf": "4.0.5",
     "npm-run-all": "^4.1.5"

From 5f8903163ba2de294dd4754ab23d256428bf663f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Dec 2025 12:26:40 +0000
Subject: [PATCH 1250/1815] Bump devcontainers/typescript-node in
 /.devcontainer

Bumps devcontainers/typescript-node from `2baba84` to `634d3ff`.

---
updated-dependencies:
- dependency-name: devcontainers/typescript-node
  dependency-version: 24-bookworm
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .devcontainer/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 650c936a6966..d68cd2b2f9ca 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/typescript-node:24-bookworm@sha256:2baba848f88e02278bcf59e072752f7371534ccfc67afcd8e0ee6b293865c6f9
+FROM mcr.microsoft.com/devcontainers/typescript-node:24-bookworm@sha256:634d3ffc8c37508259a23462b838fd85a9e5bb80dcdd0b31d673aa33dc4c8592
 
 ADD install-vscode.sh /root/
 RUN /root/install-vscode.sh

From 8cd9ac737be4847845c9040e3942910a4de6321c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Dec 2025 12:27:46 +0000
Subject: [PATCH 1251/1815] Bump vscode-languageserver in
 /extensions/html-language-features/server

Bumps [vscode-languageserver](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/server) from 10.0.0-next.15 to 10.0.0-next.16.
- [Release notes](https://github.com/Microsoft/vscode-languageserver-node/releases)
- [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/client/10.0.0-next.16/server)

---
updated-dependencies:
- dependency-name: vscode-languageserver
  dependency-version: 10.0.0-next.16
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../server/package-lock.json                  | 24 +++++++++----------
 .../server/package.json                       |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/extensions/html-language-features/server/package-lock.json b/extensions/html-language-features/server/package-lock.json
index 13a0dd80a061..6abfa9b458fb 100644
--- a/extensions/html-language-features/server/package-lock.json
+++ b/extensions/html-language-features/server/package-lock.json
@@ -12,7 +12,7 @@
         "@vscode/l10n": "^0.0.18",
         "vscode-css-languageservice": "^6.3.9",
         "vscode-html-languageservice": "^5.6.1",
-        "vscode-languageserver": "^10.0.0-next.15",
+        "vscode-languageserver": "^10.0.0-next.16",
         "vscode-languageserver-textdocument": "^1.0.12",
         "vscode-uri": "^3.0.8"
       },
@@ -78,33 +78,33 @@
       }
     },
     "node_modules/vscode-jsonrpc": {
-      "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==",
+      "version": "9.0.0-next.11",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.11.tgz",
+      "integrity": "sha512-u6LElQNbSiE9OugEEmrUKwH6+8BpPz2S5MDHvQUqHL//I4Q8GPikKLOUf856UnbLkZdhxaPrExac1lA3XwpIPA==",
       "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/vscode-languageserver": {
-      "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==",
+      "version": "10.0.0-next.16",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.16.tgz",
+      "integrity": "sha512-RbsYDOhddv1NtBCAR7+oVxxCmOpQUHhrtgUE0xz6J+BJGSCkfOqBCyLUIwSjKk2rK9llxUj/pR5aL8QCsXrxow==",
       "license": "MIT",
       "dependencies": {
-        "vscode-languageserver-protocol": "3.17.6-next.15"
+        "vscode-languageserver-protocol": "3.17.6-next.16"
       },
       "bin": {
         "installServerIntoExtension": "bin/installServerIntoExtension"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "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==",
+      "version": "3.17.6-next.16",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.16.tgz",
+      "integrity": "sha512-kQTjXEuyxMbdmmZ3U+Lib3oUl12xEKNc73RtWxPSDS3TFtjVwt98Q1CUzfDA9EUpsA24M46Bl6q3sLe9AUOKyw==",
       "license": "MIT",
       "dependencies": {
-        "vscode-jsonrpc": "9.0.0-next.10",
+        "vscode-jsonrpc": "9.0.0-next.11",
         "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 5cd6de26bc3c..ceddacf04318 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -12,7 +12,7 @@
     "@vscode/l10n": "^0.0.18",
     "vscode-css-languageservice": "^6.3.9",
     "vscode-html-languageservice": "^5.6.1",
-    "vscode-languageserver": "^10.0.0-next.15",
+    "vscode-languageserver": "^10.0.0-next.16",
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.0.8"
   },

From 533e78e6b67f70cce0f78b9097c4479ac37a9618 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Dec 2025 12:29:34 +0000
Subject: [PATCH 1252/1815] Bump devcontainers/base

Bumps devcontainers/base from `8d68bbf` to `c1613db`.

---
updated-dependencies:
- dependency-name: devcontainers/base
  dependency-version: ubuntu
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../vscode-colorize-tests/test/colorize-fixtures/Dockerfile     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/vscode-colorize-tests/test/colorize-fixtures/Dockerfile b/extensions/vscode-colorize-tests/test/colorize-fixtures/Dockerfile
index 2b51cb587227..8de1648b0a52 100644
--- a/extensions/vscode-colorize-tests/test/colorize-fixtures/Dockerfile
+++ b/extensions/vscode-colorize-tests/test/colorize-fixtures/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/base:ubuntu@sha256:8d68bbf458958747a7f41756f60de95d5b404f374f05cd42969957653fad0cfe
+FROM mcr.microsoft.com/devcontainers/base:ubuntu@sha256:c1613dbcdafe28e4b36ede9f3cb84a96e76765f50b3aeee87cb589eeb4c6dbca
 MAINTAINER Microsoft
 
 RUN apt-get install -y software-properties-common python

From d503aa51afca845e7ab38b1acf8c681670408a6c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Dec 2025 01:35:34 +0000
Subject: [PATCH 1253/1815] Bump vscode-uri from 3.0.8 to 3.1.0 in
 /extensions/css-language-features

Bumps [vscode-uri](https://github.com/microsoft/vscode-uri) from 3.0.8 to 3.1.0.
- [Release notes](https://github.com/microsoft/vscode-uri/releases)
- [Commits](https://github.com/microsoft/vscode-uri/compare/v3.0.8...v3.1.0)

---
updated-dependencies:
- dependency-name: vscode-uri
  dependency-version: 3.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/css-language-features/package-lock.json | 9 +++++----
 extensions/css-language-features/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/css-language-features/package-lock.json b/extensions/css-language-features/package-lock.json
index 3eb8c8cc1375..3985891c6cfe 100644
--- a/extensions/css-language-features/package-lock.json
+++ b/extensions/css-language-features/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "vscode-languageclient": "^10.0.0-next.18",
-        "vscode-uri": "^3.0.8"
+        "vscode-uri": "^3.1.0"
       },
       "devDependencies": {
         "@types/node": "25.x"
@@ -124,9 +124,10 @@
       "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=="
+      "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==",
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json
index 919f974580cd..0478fa4d79e1 100644
--- a/extensions/css-language-features/package.json
+++ b/extensions/css-language-features/package.json
@@ -995,7 +995,7 @@
   },
   "dependencies": {
     "vscode-languageclient": "^10.0.0-next.18",
-    "vscode-uri": "^3.0.8"
+    "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
     "@types/node": "25.x"

From 5c287c02c3f4312ac2ee23a6aa093b0cce275f99 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Dec 2025 02:03:49 +0000
Subject: [PATCH 1254/1815] Bump @types/node from 20.11.24 to 25.0.3 in
 /extensions/emmet

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/emmet/package-lock.json | 20 +++++++++++---------
 extensions/emmet/package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/emmet/package-lock.json b/extensions/emmet/package-lock.json
index 65aee46eb715..a29ea0485484 100644
--- a/extensions/emmet/package-lock.json
+++ b/extensions/emmet/package-lock.json
@@ -17,7 +17,7 @@
         "vscode-languageserver-textdocument": "^1.0.1"
       },
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "^1.13.0"
@@ -80,12 +80,13 @@
       "integrity": "sha1-JEywLHfsLnT3ipvTGCGKvJxQCmE= sha512-ZsZ2I9Vzso3Ho/pjZFsmmZ++FWeEd/txqybHTm4OgaZzdS8V9V/YYWQwg5TC38Z7uLWUV1vavpLLbjJtKubR1A=="
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@vscode/emmet-helper": {
@@ -150,10 +151,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vscode-languageserver-textdocument": {
       "version": "1.0.12",
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index d4943101c7b2..fcbc5203e56e 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -479,7 +479,7 @@
     "deps": "npm install @vscode/emmet-helper"
   },
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "25.x"
   },
   "dependencies": {
     "@emmetio/css-parser": "ramya-rao-a/css-parser#vscode",

From 54e47a7eac1032e8fd5da7473176d2bfc1a6223b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Dec 2025 02:39:04 +0000
Subject: [PATCH 1255/1815] Bump markdown-it and @types/markdown-it in
 /extensions/extension-editing

Bumps [markdown-it](https://github.com/markdown-it/markdown-it) and [@types/markdown-it](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/markdown-it). These dependencies needed to be updated together.

Updates `markdown-it` from 12.3.2 to 14.1.0
- [Changelog](https://github.com/markdown-it/markdown-it/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/markdown-it/compare/12.3.2...14.1.0)

Updates `@types/markdown-it` from 0.0.2 to 14.1.2
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/markdown-it)

---
updated-dependencies:
- dependency-name: markdown-it
  dependency-version: 14.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: "@types/markdown-it"
  dependency-version: 14.1.2
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../extension-editing/package-lock.json       | 91 +++++++++++++------
 extensions/extension-editing/package.json     |  4 +-
 2 files changed, 66 insertions(+), 29 deletions(-)

diff --git a/extensions/extension-editing/package-lock.json b/extensions/extension-editing/package-lock.json
index 34c89587c452..ca038ebd7b42 100644
--- a/extensions/extension-editing/package-lock.json
+++ b/extensions/extension-editing/package-lock.json
@@ -10,22 +10,41 @@
       "license": "MIT",
       "dependencies": {
         "jsonc-parser": "^3.2.0",
-        "markdown-it": "^12.3.2",
+        "markdown-it": "^14.1.0",
         "parse5": "^8.0.0"
       },
       "devDependencies": {
-        "@types/markdown-it": "0.0.2",
+        "@types/markdown-it": "14.1.2",
         "@types/node": "20.x"
       },
       "engines": {
         "vscode": "^1.4.0"
       }
     },
+    "node_modules/@types/linkify-it": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/markdown-it": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-0.0.2.tgz",
-      "integrity": "sha1-XZrRnm5lCM3S8llt+G/Qqt5ZhmA= sha512-A2seE+zJYSjGHy7L/v0EN/xRfgv2A60TuXOwI8tt5aZxF4UeoYIkM2jERnNH8w4VFr7oFEm0lElGOao7fZgygQ==",
-      "dev": true
+      "version": "14.1.2",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
+      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/linkify-it": "^5",
+        "@types/mdurl": "^2"
+      }
+    },
+    "node_modules/@types/mdurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/node": {
       "version": "20.11.24",
@@ -42,9 +61,13 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/entities": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
@@ -55,32 +78,36 @@
       "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
     },
     "node_modules/linkify-it": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
-      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "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==",
+      "license": "MIT",
       "dependencies": {
-        "uc.micro": "^1.0.1"
+        "uc.micro": "^2.0.0"
       }
     },
     "node_modules/markdown-it": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
-      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
+      "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1",
-        "entities": "~2.1.0",
-        "linkify-it": "^3.0.1",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
+        "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.js"
+        "markdown-it": "bin/markdown-it.mjs"
       }
     },
     "node_modules/mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+      "license": "MIT"
     },
     "node_modules/parse5": {
       "version": "8.0.0",
@@ -106,10 +133,20 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/punycode.js": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
+      "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/uc.micro": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+      "license": "MIT"
     },
     "node_modules/undici-types": {
       "version": "5.26.5",
diff --git a/extensions/extension-editing/package.json b/extensions/extension-editing/package.json
index c807e796fc7d..0f358f070de7 100644
--- a/extensions/extension-editing/package.json
+++ b/extensions/extension-editing/package.json
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "jsonc-parser": "^3.2.0",
-    "markdown-it": "^12.3.2",
+    "markdown-it": "^14.1.0",
     "parse5": "^8.0.0"
   },
   "contributes": {
@@ -66,7 +66,7 @@
     ]
   },
   "devDependencies": {
-    "@types/markdown-it": "0.0.2",
+    "@types/markdown-it": "14.1.2",
     "@types/node": "20.x"
   },
   "repository": {

From 457655beb34a324db76aff8a4799eb4d2f8f40d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Dec 2025 02:39:10 +0000
Subject: [PATCH 1256/1815] Bump jsonc-parser from 3.2.0 to 3.3.1 in
 /extensions/extension-editing

Bumps [jsonc-parser](https://github.com/microsoft/node-jsonc-parser) from 3.2.0 to 3.3.1.
- [Release notes](https://github.com/microsoft/node-jsonc-parser/releases)
- [Changelog](https://github.com/microsoft/node-jsonc-parser/blob/main/CHANGELOG.md)
- [Commits](https://github.com/microsoft/node-jsonc-parser/compare/v3.2.0...v3.3.1)

---
updated-dependencies:
- dependency-name: jsonc-parser
  dependency-version: 3.3.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/extension-editing/package-lock.json | 9 +++++----
 extensions/extension-editing/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/extension-editing/package-lock.json b/extensions/extension-editing/package-lock.json
index 34c89587c452..415ff5bb0e92 100644
--- a/extensions/extension-editing/package-lock.json
+++ b/extensions/extension-editing/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "jsonc-parser": "^3.2.0",
+        "jsonc-parser": "^3.3.1",
         "markdown-it": "^12.3.2",
         "parse5": "^8.0.0"
       },
@@ -50,9 +50,10 @@
       }
     },
     "node_modules/jsonc-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "license": "MIT"
     },
     "node_modules/linkify-it": {
       "version": "3.0.3",
diff --git a/extensions/extension-editing/package.json b/extensions/extension-editing/package.json
index c807e796fc7d..462cf135b109 100644
--- a/extensions/extension-editing/package.json
+++ b/extensions/extension-editing/package.json
@@ -26,7 +26,7 @@
     "watch": "gulp watch-extension:extension-editing"
   },
   "dependencies": {
-    "jsonc-parser": "^3.2.0",
+    "jsonc-parser": "^3.3.1",
     "markdown-it": "^12.3.2",
     "parse5": "^8.0.0"
   },

From cbe1e2f0810853d20013ef6bce85036e73fc795d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Dec 2025 03:19:49 +0000
Subject: [PATCH 1257/1815] Bump vscode-css-languageservice

Bumps [vscode-css-languageservice](https://github.com/Microsoft/vscode-css-languageservice) from 6.3.2 to 6.3.8.
- [Release notes](https://github.com/Microsoft/vscode-css-languageservice/releases)
- [Changelog](https://github.com/microsoft/vscode-css-languageservice/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/vscode-css-languageservice/compare/v6.3.2...v6.3.8)

---
updated-dependencies:
- dependency-name: vscode-css-languageservice
  dependency-version: 6.3.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../css-language-features/server/package-lock.json     | 10 +++++-----
 extensions/css-language-features/server/package.json   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extensions/css-language-features/server/package-lock.json b/extensions/css-language-features/server/package-lock.json
index 7102f95a3a41..3efe00891d14 100644
--- a/extensions/css-language-features/server/package-lock.json
+++ b/extensions/css-language-features/server/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.18",
-        "vscode-css-languageservice": "^6.3.2",
+        "vscode-css-languageservice": "^6.3.9",
         "vscode-languageserver": "^10.0.0-next.15",
         "vscode-uri": "^3.1.0"
       },
@@ -51,15 +51,15 @@
       "license": "MIT"
     },
     "node_modules/vscode-css-languageservice": {
-      "version": "6.3.2",
-      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.2.tgz",
-      "integrity": "sha512-GEpPxrUTAeXWdZWHev1OJU9lz2Q2/PPBxQ2TIRmLGvQiH3WZbqaNoute0n0ewxlgtjzTW3AKZT+NHySk5Rf4Eg==",
+      "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",
         "vscode-languageserver-textdocument": "^1.0.12",
         "vscode-languageserver-types": "3.17.5",
-        "vscode-uri": "^3.0.8"
+        "vscode-uri": "^3.1.0"
       }
     },
     "node_modules/vscode-jsonrpc": {
diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json
index 0bc94cf2ce99..c928bdc75174 100644
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@@ -11,7 +11,7 @@
   "browser": "./dist/browser/cssServerMain",
   "dependencies": {
     "@vscode/l10n": "^0.0.18",
-    "vscode-css-languageservice": "^6.3.2",
+    "vscode-css-languageservice": "^6.3.9",
     "vscode-languageserver": "^10.0.0-next.15",
     "vscode-uri": "^3.1.0"
   },

From c1ca6f5da5dd84bca1c425358656fb109a359f1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Dec 2025 03:19:51 +0000
Subject: [PATCH 1258/1815] Bump @types/mocha in
 /extensions/css-language-features/server

Bumps [@types/mocha](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mocha) from 9.1.1 to 10.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mocha)

---
updated-dependencies:
- dependency-name: "@types/mocha"
  dependency-version: 10.0.10
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../css-language-features/server/package-lock.json    | 11 ++++++-----
 extensions/css-language-features/server/package.json  |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/css-language-features/server/package-lock.json b/extensions/css-language-features/server/package-lock.json
index 7102f95a3a41..df1145f69ae7 100644
--- a/extensions/css-language-features/server/package-lock.json
+++ b/extensions/css-language-features/server/package-lock.json
@@ -15,7 +15,7 @@
         "vscode-uri": "^3.1.0"
       },
       "devDependencies": {
-        "@types/mocha": "^9.1.1",
+        "@types/mocha": "^10.0.10",
         "@types/node": "25.x"
       },
       "engines": {
@@ -23,10 +23,11 @@
       }
     },
     "node_modules/@types/mocha": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
-      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
-      "dev": true
+      "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": "25.0.2",
diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json
index 0bc94cf2ce99..bfc7067b7ca7 100644
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@@ -16,7 +16,7 @@
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.10",
     "@types/node": "25.x"
   },
   "scripts": {

From 4fe4485dffd13b91d3100215e85c65f3fad1dc42 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Dec 2025 03:37:13 +0000
Subject: [PATCH 1259/1815] Bump @octokit/rest from 21.1.0 to 22.0.1 in
 /extensions/github

Bumps [@octokit/rest](https://github.com/octokit/rest.js) from 21.1.0 to 22.0.1.
- [Release notes](https://github.com/octokit/rest.js/releases)
- [Commits](https://github.com/octokit/rest.js/compare/v21.1.0...v22.0.1)

---
updated-dependencies:
- dependency-name: "@octokit/rest"
  dependency-version: 22.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github/package-lock.json | 196 ++++++++++++++++++++++------
 extensions/github/package.json      |   2 +-
 2 files changed, 157 insertions(+), 41 deletions(-)

diff --git a/extensions/github/package-lock.json b/extensions/github/package-lock.json
index c503a7ccc2c9..9e8992c7caaf 100644
--- a/extensions/github/package-lock.json
+++ b/extensions/github/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@octokit/graphql": "8.2.0",
         "@octokit/graphql-schema": "15.26.1",
-        "@octokit/rest": "21.1.0",
+        "@octokit/rest": "22.0.1",
         "@vscode/extension-telemetry": "^0.9.8",
         "tunnel": "^0.0.6"
       },
@@ -147,32 +147,118 @@
       "license": "MIT"
     },
     "node_modules/@octokit/auth-token": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-5.1.2.tgz",
-      "integrity": "sha512-JcQDsBdg49Yky2w2ld20IHAlwr8d/d8N6NiOXbtuoPCqzbsiJgF633mVUw3x4mo0H5ypataQIX7SFu3yy44Mpw==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-6.0.0.tgz",
+      "integrity": "sha512-P4YJBPdPSpWTQ1NU4XYdvHvXJJDxM6YwpS0FZHRgP7YFkdVxsWcpWGy/NVqlAA7PcPCnMacXlRm1y2PFZRWL/w==",
       "license": "MIT",
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/core": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.4.tgz",
-      "integrity": "sha512-lAS9k7d6I0MPN+gb9bKDt7X8SdxknYqAMh44S5L+lNqIN2NuV8nvv3g8rPp7MuRxcOpxpUIATWprO0C34a8Qmg==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-7.0.6.tgz",
+      "integrity": "sha512-DhGl4xMVFGVIyMwswXeyzdL4uXD5OGILGX5N8Y+f6W7LhC1Ze2poSNrkF/fedpVDHEEZ+PHFW0vL14I+mm8K3Q==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/auth-token": "^5.0.0",
-        "@octokit/graphql": "^8.1.2",
-        "@octokit/request": "^9.2.1",
-        "@octokit/request-error": "^6.1.7",
-        "@octokit/types": "^13.6.2",
-        "before-after-hook": "^3.0.2",
+        "@octokit/auth-token": "^6.0.0",
+        "@octokit/graphql": "^9.0.3",
+        "@octokit/request": "^10.0.6",
+        "@octokit/request-error": "^7.0.2",
+        "@octokit/types": "^16.0.0",
+        "before-after-hook": "^4.0.0",
         "universal-user-agent": "^7.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/endpoint": {
+      "version": "11.0.2",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-11.0.2.tgz",
+      "integrity": "sha512-4zCpzP1fWc7QlqunZ5bSEjxc6yLAlRTnDwKtgXfcI/FxxGoqedDG8V2+xJ60bV2kODqcGB+nATdtap/XYq2NZQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^16.0.0",
+        "universal-user-agent": "^7.0.2"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/graphql": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-9.0.3.tgz",
+      "integrity": "sha512-grAEuupr/C1rALFnXTv6ZQhFuL1D8G5y8CN04RgrO4FIPMrtm+mcZzFG7dcBm+nq+1ppNixu+Jd78aeJOYxlGA==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/request": "^10.0.6",
+        "@octokit/types": "^16.0.0",
+        "universal-user-agent": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/openapi-types": {
+      "version": "27.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-27.0.0.tgz",
+      "integrity": "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==",
+      "license": "MIT"
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/request": {
+      "version": "10.0.7",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-10.0.7.tgz",
+      "integrity": "sha512-v93h0i1yu4idj8qFPZwjehoJx4j3Ntn+JhXsdJrG9pYaX6j/XRz2RmasMUHtNgQD39nrv/VwTWSqK0RNXR8upA==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/endpoint": "^11.0.2",
+        "@octokit/request-error": "^7.0.2",
+        "@octokit/types": "^16.0.0",
+        "fast-content-type-parse": "^3.0.0",
+        "universal-user-agent": "^7.0.2"
+      },
+      "engines": {
+        "node": ">= 20"
+      }
+    },
+    "node_modules/@octokit/core/node_modules/@octokit/request-error": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-7.1.0.tgz",
+      "integrity": "sha512-KMQIfq5sOPpkQYajXHwnhjCC0slzCNScLHs9JafXc4RAJI+9f+jNDlBNaIMTvazOPLgb4BnlhGJOTbnN0wIjPw==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^16.0.0"
+      },
+      "engines": {
+        "node": ">= 20"
       }
     },
+    "node_modules/@octokit/core/node_modules/@octokit/types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-16.0.0.tgz",
+      "integrity": "sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^27.0.0"
+      }
+    },
+    "node_modules/@octokit/core/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==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/@octokit/endpoint": {
       "version": "10.1.3",
       "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.3.tgz",
@@ -217,47 +303,77 @@
       "license": "MIT"
     },
     "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "11.4.2",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.4.2.tgz",
-      "integrity": "sha512-BXJ7XPCTDXFF+wxcg/zscfgw2O/iDPtNSkwwR1W1W5c4Mb3zav/M2XvxQ23nVmKj7jpweB4g8viMeCQdm7LMVA==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-14.0.0.tgz",
+      "integrity": "sha512-fNVRE7ufJiAA3XUrha2omTA39M6IXIc6GIZLvlbsm8QOQCYvpq/LkMNGyFlB1d8hTDzsAXa3OKtybdMAYsV/fw==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^13.7.0"
+        "@octokit/types": "^16.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       },
       "peerDependencies": {
         "@octokit/core": ">=6"
       }
     },
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
+      "version": "27.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-27.0.0.tgz",
+      "integrity": "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==",
+      "license": "MIT"
+    },
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-16.0.0.tgz",
+      "integrity": "sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^27.0.0"
+      }
+    },
     "node_modules/@octokit/plugin-request-log": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-5.3.1.tgz",
-      "integrity": "sha512-n/lNeCtq+9ofhC15xzmJCNKP2BWTv8Ih2TTy+jatNCCq/gQP/V7rK3fjIfuz0pDWDALO/o/4QY4hyOF6TQQFUw==",
+      "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==",
       "license": "MIT",
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       },
       "peerDependencies": {
         "@octokit/core": ">=6"
       }
     },
     "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "13.3.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-13.3.1.tgz",
-      "integrity": "sha512-o8uOBdsyR+WR8MK9Cco8dCgvG13H1RlM1nWnK/W7TEACQBFux/vPREgKucxUfuDQ5yi1T3hGf4C5ZmZXAERgwQ==",
+      "version": "17.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-17.0.0.tgz",
+      "integrity": "sha512-B5yCyIlOJFPqUUeiD0cnBJwWJO8lkJs5d8+ze9QDP6SvfiXSz1BF+91+0MeI1d2yxgOhU/O+CvtiZ9jSkHhFAw==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^13.8.0"
+        "@octokit/types": "^16.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       },
       "peerDependencies": {
         "@octokit/core": ">=6"
       }
     },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
+      "version": "27.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-27.0.0.tgz",
+      "integrity": "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==",
+      "license": "MIT"
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-16.0.0.tgz",
+      "integrity": "sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^27.0.0"
+      }
+    },
     "node_modules/@octokit/request": {
       "version": "9.2.1",
       "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.2.1.tgz",
@@ -287,18 +403,18 @@
       }
     },
     "node_modules/@octokit/rest": {
-      "version": "21.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-21.1.0.tgz",
-      "integrity": "sha512-93iLxcKDJboUpmnUyeJ6cRIi7z7cqTZT1K7kRK4LobGxwTwpsa+2tQQbRQNGy7IFDEAmrtkf4F4wBj3D5rVlJQ==",
+      "version": "22.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-22.0.1.tgz",
+      "integrity": "sha512-Jzbhzl3CEexhnivb1iQ0KJ7s5vvjMWcmRtq5aUsKmKDrRW6z3r84ngmiFKFvpZjpiU/9/S6ITPFRpn5s/3uQJw==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/core": "^6.1.3",
-        "@octokit/plugin-paginate-rest": "^11.4.0",
-        "@octokit/plugin-request-log": "^5.3.1",
-        "@octokit/plugin-rest-endpoint-methods": "^13.3.0"
+        "@octokit/core": "^7.0.6",
+        "@octokit/plugin-paginate-rest": "^14.0.0",
+        "@octokit/plugin-request-log": "^6.0.0",
+        "@octokit/plugin-rest-endpoint-methods": "^17.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/types": {
@@ -334,9 +450,9 @@
       }
     },
     "node_modules/before-after-hook": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-3.0.2.tgz",
-      "integrity": "sha512-Nik3Sc0ncrMK4UUdXQmAnRtzmNQTAAXmXIopizwZ1W1t8QmfJj+zL4OA2I7XPTPW5z5TDqv4hRo/JzouDJnX3A==",
+      "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==",
       "license": "Apache-2.0"
     },
     "node_modules/fast-content-type-parse": {
diff --git a/extensions/github/package.json b/extensions/github/package.json
index f8bab02b1320..8585ee7a32c7 100644
--- a/extensions/github/package.json
+++ b/extensions/github/package.json
@@ -229,7 +229,7 @@
   "dependencies": {
     "@octokit/graphql": "8.2.0",
     "@octokit/graphql-schema": "15.26.1",
-    "@octokit/rest": "21.1.0",
+    "@octokit/rest": "22.0.1",
     "tunnel": "^0.0.6",
     "@vscode/extension-telemetry": "^0.9.8"
   },

From edcd4345592f48042c815fdf607c9040cfced108 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Dec 2025 03:46:58 +0000
Subject: [PATCH 1260/1815] Bump @types/markdown-it in
 /extensions/markdown-math

Bumps [@types/markdown-it](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/markdown-it) from 0.0.0 to 14.1.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/markdown-it)

---
updated-dependencies:
- dependency-name: "@types/markdown-it"
  dependency-version: 14.1.2
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/markdown-math/package-lock.json | 29 ++++++++++++++++++----
 extensions/markdown-math/package.json      |  2 +-
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/extensions/markdown-math/package-lock.json b/extensions/markdown-math/package-lock.json
index d2d98e2f4971..d37a6bc33e0a 100644
--- a/extensions/markdown-math/package-lock.json
+++ b/extensions/markdown-math/package-lock.json
@@ -12,18 +12,37 @@
         "@vscode/markdown-it-katex": "^1.1.1"
       },
       "devDependencies": {
-        "@types/markdown-it": "^0.0.0",
+        "@types/markdown-it": "^14.1.2",
         "@types/vscode-notebook-renderer": "^1.72.4"
       },
       "engines": {
         "vscode": "^1.54.0"
       }
     },
+    "node_modules/@types/linkify-it": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/markdown-it": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-0.0.0.tgz",
-      "integrity": "sha512-rLEOTm6Wi9M8GFnIK7VczXSEThIN/eVoevpTYVk+FD/DPX3N15Sj9b3vkjjDY63U0Zw1yawf13CI92CCHpC5kw==",
-      "dev": true
+      "version": "14.1.2",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
+      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/linkify-it": "^5",
+        "@types/mdurl": "^2"
+      }
+    },
+    "node_modules/@types/mdurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/vscode-notebook-renderer": {
       "version": "1.72.4",
diff --git a/extensions/markdown-math/package.json b/extensions/markdown-math/package.json
index 308a8c0a18e7..f405bba1e614 100644
--- a/extensions/markdown-math/package.json
+++ b/extensions/markdown-math/package.json
@@ -111,7 +111,7 @@
     "build-notebook": "node ./esbuild"
   },
   "devDependencies": {
-    "@types/markdown-it": "^0.0.0",
+    "@types/markdown-it": "^14.1.2",
     "@types/vscode-notebook-renderer": "^1.72.4"
   },
   "repository": {

From 13ddd2f1c4fc7887d56ae941bd550ec96c506ba5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Dec 2025 04:29:42 +0000
Subject: [PATCH 1261/1815] Bump @vscode/extension-telemetry in
 /extensions/json-language-features

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 0.9.8 to 1.2.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v0.9.8...v1.2.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.2.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../json-language-features/package-lock.json  | 94 +++++++++----------
 .../json-language-features/package.json       |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/extensions/json-language-features/package-lock.json b/extensions/json-language-features/package-lock.json
index 1705a44c2136..75f690a7de7e 100644
--- a/extensions/json-language-features/package-lock.json
+++ b/extensions/json-language-features/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^0.9.8",
+        "@vscode/extension-telemetry": "^1.2.0",
         "request-light": "^0.8.0",
         "vscode-languageclient": "^10.0.0-next.18"
       },
@@ -42,73 +42,73 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
-      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
+      "integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
-      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.10.tgz",
+      "integrity": "sha512-VSLjc9cT+Y+eTiSfYltJHJCejn8oYr0E6Pq2BMhOEO7F6IyLGYIxzKKvo78ze9x+iHX7KPTATcZ+PFgjGXuNqg==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.3.4",
+        "@microsoft/1ds-core-js": "4.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
-      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.10.tgz",
+      "integrity": "sha512-iolFLz1ocWAzIQqHIEjjov3gNTPkgFQ4ArHnBcJEYoffOGWlJt6copaevS5YPI5rHzmbySsengZ8cLJJBBrXzQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
-      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.10.tgz",
+      "integrity": "sha512-RVIenPIvNgZCbjJdALvLM4rNHgAFuHI7faFzHCgnI6S2WCUNGHeXlQTs9EUUrL+n2TPp9/cd0KKMILU5VVyYiA==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
-      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.10.tgz",
+      "integrity": "sha512-5yKeyassZTq2l+SAO4npu6LPnbS++UD+M+Ghjm9uRzoBwD8tumFx0/F8AkSVqbniSREd+ztH/2q2foewa2RZyg==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -124,18 +124,18 @@
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
-      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.10.tgz",
+      "integrity": "sha512-AZib5DAT3NU0VT0nLWEwXrnoMDDgZ/5S4dso01CNU5ELNxLdg+1fvchstlVdMy4FrAnxzs8Wf/GIQNFYOVgpAw==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.3.4",
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.10",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -160,9 +160,9 @@
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
-      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
+      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
       "license": "MIT"
     },
     "node_modules/@types/node": {
@@ -175,14 +175,14 @@
       }
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.8",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
-      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
+      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.3.4",
-        "@microsoft/1ds-post-js": "^4.3.4",
-        "@microsoft/applicationinsights-web-basic": "^3.3.4"
+        "@microsoft/1ds-core-js": "^4.3.10",
+        "@microsoft/1ds-post-js": "^4.3.10",
+        "@microsoft/applicationinsights-web-basic": "^3.3.10"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json
index c7c65b825dc2..c7ff9899c33d 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -167,7 +167,7 @@
     ]
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^0.9.8",
+    "@vscode/extension-telemetry": "^1.2.0",
     "request-light": "^0.8.0",
     "vscode-languageclient": "^10.0.0-next.18"
   },

From 2e31417d0576485ee30bc1179a8b636cdae6b8a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Dec 2025 00:14:52 +0000
Subject: [PATCH 1262/1815] Bump @vscode/extension-telemetry in
 /extensions/github-authentication

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 0.9.8 to 1.2.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v0.9.8...v1.2.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.2.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../github-authentication/package-lock.json   | 94 +++++++++----------
 extensions/github-authentication/package.json |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/extensions/github-authentication/package-lock.json b/extensions/github-authentication/package-lock.json
index 87ceaa3adfaa..54ca477cd672 100644
--- a/extensions/github-authentication/package-lock.json
+++ b/extensions/github-authentication/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.0.2",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^0.9.8",
+        "@vscode/extension-telemetry": "^1.2.0",
         "node-fetch": "3.3.2",
         "vscode-tas-client": "^0.1.84"
       },
@@ -23,73 +23,73 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
-      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
+      "integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
-      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.10.tgz",
+      "integrity": "sha512-VSLjc9cT+Y+eTiSfYltJHJCejn8oYr0E6Pq2BMhOEO7F6IyLGYIxzKKvo78ze9x+iHX7KPTATcZ+PFgjGXuNqg==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.3.4",
+        "@microsoft/1ds-core-js": "4.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
-      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.10.tgz",
+      "integrity": "sha512-iolFLz1ocWAzIQqHIEjjov3gNTPkgFQ4ArHnBcJEYoffOGWlJt6copaevS5YPI5rHzmbySsengZ8cLJJBBrXzQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
-      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.10.tgz",
+      "integrity": "sha512-RVIenPIvNgZCbjJdALvLM4rNHgAFuHI7faFzHCgnI6S2WCUNGHeXlQTs9EUUrL+n2TPp9/cd0KKMILU5VVyYiA==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
-      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.10.tgz",
+      "integrity": "sha512-5yKeyassZTq2l+SAO4npu6LPnbS++UD+M+Ghjm9uRzoBwD8tumFx0/F8AkSVqbniSREd+ztH/2q2foewa2RZyg==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -105,18 +105,18 @@
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
-      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.10.tgz",
+      "integrity": "sha512-AZib5DAT3NU0VT0nLWEwXrnoMDDgZ/5S4dso01CNU5ELNxLdg+1fvchstlVdMy4FrAnxzs8Wf/GIQNFYOVgpAw==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.3.4",
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.10",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -141,9 +141,9 @@
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
-      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
+      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
       "license": "MIT"
     },
     "node_modules/@types/mocha": {
@@ -172,14 +172,14 @@
       }
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.8",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
-      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
+      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.3.4",
-        "@microsoft/1ds-post-js": "^4.3.4",
-        "@microsoft/applicationinsights-web-basic": "^3.3.4"
+        "@microsoft/1ds-core-js": "^4.3.10",
+        "@microsoft/1ds-post-js": "^4.3.10",
+        "@microsoft/applicationinsights-web-basic": "^3.3.10"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/github-authentication/package.json b/extensions/github-authentication/package.json
index ceeed4733eda..dec2d12e0b92 100644
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@@ -62,7 +62,7 @@
   },
   "dependencies": {
     "node-fetch": "3.3.2",
-    "@vscode/extension-telemetry": "^0.9.8",
+    "@vscode/extension-telemetry": "^1.2.0",
     "vscode-tas-client": "^0.1.84"
   },
   "devDependencies": {

From 32d5bd708578a931c939225584d4246e9e63011d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Dec 2025 00:14:55 +0000
Subject: [PATCH 1263/1815] Bump @types/mocha in
 /extensions/github-authentication

Bumps [@types/mocha](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mocha) from 9.1.1 to 10.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mocha)

---
updated-dependencies:
- dependency-name: "@types/mocha"
  dependency-version: 10.0.10
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github-authentication/package-lock.json | 11 ++++++-----
 extensions/github-authentication/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/github-authentication/package-lock.json b/extensions/github-authentication/package-lock.json
index 87ceaa3adfaa..fe9bf5d8b623 100644
--- a/extensions/github-authentication/package-lock.json
+++ b/extensions/github-authentication/package-lock.json
@@ -14,7 +14,7 @@
         "vscode-tas-client": "^0.1.84"
       },
       "devDependencies": {
-        "@types/mocha": "^9.1.1",
+        "@types/mocha": "^10.0.10",
         "@types/node": "20.x",
         "@types/node-fetch": "^2.5.7"
       },
@@ -147,10 +147,11 @@
       "license": "MIT"
     },
     "node_modules/@types/mocha": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
-      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
-      "dev": true
+      "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": "20.11.24",
diff --git a/extensions/github-authentication/package.json b/extensions/github-authentication/package.json
index ceeed4733eda..019b558704c7 100644
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@@ -66,7 +66,7 @@
     "vscode-tas-client": "^0.1.84"
   },
   "devDependencies": {
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.10",
     "@types/node": "20.x",
     "@types/node-fetch": "^2.5.7"
   },

From 182340a446f492a6f212e42afc034daabb2cd0d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Dec 2025 00:46:12 +0000
Subject: [PATCH 1264/1815] Bump vscode-languageclient in
 /extensions/html-language-features

Bumps [vscode-languageclient](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/client) from 10.0.0-next.13 to 10.0.0-next.18.
- [Release notes](https://github.com/Microsoft/vscode-languageserver-node/releases)
- [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/client/10.0.0-next.18/client)

---
updated-dependencies:
- dependency-name: vscode-languageclient
  dependency-version: 10.0.0-next.18
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../html-language-features/package-lock.json  | 111 ++++++++----------
 .../html-language-features/package.json       |   2 +-
 2 files changed, 53 insertions(+), 60 deletions(-)

diff --git a/extensions/html-language-features/package-lock.json b/extensions/html-language-features/package-lock.json
index 5b4153231556..4ac515107173 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": "^1.2.0",
-        "vscode-languageclient": "^10.0.0-next.13",
+        "vscode-languageclient": "^10.0.0-next.19",
         "vscode-uri": "^3.1.0"
       },
       "devDependencies": {
@@ -20,6 +20,27 @@
         "vscode": "^1.77.0"
       }
     },
+    "node_modules/@isaacs/balanced-match": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+      "license": "MIT",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/brace-expansion": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "license": "MIT",
+      "dependencies": {
+        "@isaacs/balanced-match": "^4.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/@microsoft/1ds-core-js": {
       "version": "4.3.10",
       "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
@@ -167,52 +188,26 @@
         "vscode": "^1.75.0"
       }
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg=="
-    },
-    "node_modules/brace-expansion": {
-      "version": "2.0.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/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
+      "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "@isaacs/brace-expansion": "^5.0.0"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -227,51 +222,49 @@
       "dev": true
     },
     "node_modules/vscode-jsonrpc": {
-      "version": "9.0.0-next.6",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.6.tgz",
-      "integrity": "sha512-KCSvUNsFiVciG9iqjJKBZOd66CN3ZKohDlYRmoOi+pd8l15MFLZ8wRG4c+wuzePGba/8WcCG2TM+C/GVlvuaeA==",
+      "version": "9.0.0-next.11",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.11.tgz",
+      "integrity": "sha512-u6LElQNbSiE9OugEEmrUKwH6+8BpPz2S5MDHvQUqHL//I4Q8GPikKLOUf856UnbLkZdhxaPrExac1lA3XwpIPA==",
+      "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/vscode-languageclient": {
-      "version": "10.0.0-next.13",
-      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.13.tgz",
-      "integrity": "sha512-KLsOMJoYpkk36PIgcOjyZ4AekOfzp4kdWdRRbVKeVvSIrwrn/4RSZr0NlD6EvUBBJSsJW4WDrYY7Y3znkqa6+w==",
+      "version": "10.0.0-next.19",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.19.tgz",
+      "integrity": "sha512-sJtO8y0Dxs4ue/DK0QgO/ATBfZwQdee3TqvCsoqUej/GZrBA01DTf4pbfswRxHsTxN2yH0haImUnMafWHtE4CQ==",
       "license": "MIT",
       "dependencies": {
-        "minimatch": "^9.0.3",
-        "semver": "^7.6.0",
-        "vscode-languageserver-protocol": "3.17.6-next.11"
+        "minimatch": "^10.0.3",
+        "semver": "^7.7.1",
+        "vscode-languageserver-protocol": "3.17.6-next.16"
       },
       "engines": {
         "vscode": "^1.91.0"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "version": "3.17.6-next.11",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.11.tgz",
-      "integrity": "sha512-GeJxEp1TiLsp79f8WG5n10wLViXfgFKb99hU9K8m7KDWM95/QFEqWkm79f9LVm54tUK74I91a9EeiQLCS/FABQ==",
+      "version": "3.17.6-next.16",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.16.tgz",
+      "integrity": "sha512-kQTjXEuyxMbdmmZ3U+Lib3oUl12xEKNc73RtWxPSDS3TFtjVwt98Q1CUzfDA9EUpsA24M46Bl6q3sLe9AUOKyw==",
+      "license": "MIT",
       "dependencies": {
-        "vscode-jsonrpc": "9.0.0-next.6",
-        "vscode-languageserver-types": "3.17.6-next.5"
+        "vscode-jsonrpc": "9.0.0-next.11",
+        "vscode-languageserver-types": "3.17.6-next.6"
       }
     },
     "node_modules/vscode-languageserver-types": {
-      "version": "3.17.6-next.5",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.5.tgz",
-      "integrity": "sha512-QFmf3Yl1tCgUQfA77N9Me/LXldJXkIVypQbty2rJ1DNHQkC+iwvm4Z2tXg9czSwlhvv0pD4pbF5mT7WhAglolw=="
+      "version": "3.17.6-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.6-next.6.tgz",
+      "integrity": "sha512-aiJY5/yW+xzw7KPNlwi3gQtddq/3EIn5z8X8nCgJfaiAij2R1APKePngv+MUdLdYJBVTLu+Qa0ODsT+pHgYguQ==",
+      "license": "MIT"
     },
     "node_modules/vscode-uri": {
       "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==",
       "license": "MIT"
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     }
   }
 }
diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json
index 428871cf1709..8c95c2382e2c 100644
--- a/extensions/html-language-features/package.json
+++ b/extensions/html-language-features/package.json
@@ -259,7 +259,7 @@
   },
   "dependencies": {
     "@vscode/extension-telemetry": "^1.2.0",
-    "vscode-languageclient": "^10.0.0-next.13",
+    "vscode-languageclient": "^10.0.0-next.19",
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {

From f42bd6fd3613a87fb0ab825403f5d2b3689ed056 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Dec 2025 02:45:41 +0000
Subject: [PATCH 1265/1815] Bump @jupyterlab/nbformat from 3.4.3 to 4.5.0 in
 /extensions/ipynb

Bumps [@jupyterlab/nbformat](https://github.com/jupyterlab/jupyterlab) from 3.4.3 to 4.5.0.
- [Release notes](https://github.com/jupyterlab/jupyterlab/releases)
- [Changelog](https://github.com/jupyterlab/jupyterlab/blob/main/RELEASE.md)
- [Commits](https://github.com/jupyterlab/jupyterlab/compare/@jupyterlab/nbformat@3.4.3...@jupyterlab/nbformat@4.5.0)

---
updated-dependencies:
- dependency-name: "@jupyterlab/nbformat"
  dependency-version: 4.5.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/ipynb/package-lock.json | 29 +++++++++++++++++++----------
 extensions/ipynb/package.json      |  2 +-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/extensions/ipynb/package-lock.json b/extensions/ipynb/package-lock.json
index ef7314f20b56..d246d427a5d5 100644
--- a/extensions/ipynb/package-lock.json
+++ b/extensions/ipynb/package-lock.json
@@ -13,7 +13,7 @@
         "detect-indent": "^7.0.2"
       },
       "devDependencies": {
-        "@jupyterlab/nbformat": "^3.2.9",
+        "@jupyterlab/nbformat": "^4.5.1",
         "@types/markdown-it": "14.1.2"
       },
       "engines": {
@@ -26,21 +26,30 @@
       "integrity": "sha512-BCN9uNWH8AmiP7BXBJqEinUY9KXalmRzo+L0cB/mQsmFfzODxwQrbvxCHXUNH2iP+qKkWYtB4vyy8N62PViMFw=="
     },
     "node_modules/@jupyterlab/nbformat": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/@jupyterlab/nbformat/-/nbformat-3.4.3.tgz",
-      "integrity": "sha512-i/yADrwhhAJJCUOTa+fEBMyJO7fvX9Y73I0B7V6dQhGcrmrEKLC3wk4yOo63+jRntd5+dupbiOtz3w1ncIXwIA==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/@jupyterlab/nbformat/-/nbformat-4.5.1.tgz",
+      "integrity": "sha512-aVPqZ7ao/RIwfPHNtTWy38J99zSi1/NZWOEfcnsb3Ap6p6HiCPI2LCKHk4SvBLIDzaFD68DesCA+ofac0P0bWw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@lumino/coreutils": "^1.11.0"
+        "@lumino/coreutils": "^2.2.2"
       }
     },
+    "node_modules/@lumino/algorithm": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@lumino/algorithm/-/algorithm-2.0.4.tgz",
+      "integrity": "sha512-gddBhESPqu25KWLeAK9Kz8tS9Ph7P45i0CNG7Ia4XMhK9PHLtTsBdJTC9jP+MqhbzC8zDT/4ekvYRV9ojRPj7Q==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
     "node_modules/@lumino/coreutils": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/@lumino/coreutils/-/coreutils-1.12.0.tgz",
-      "integrity": "sha512-DSglh4ylmLi820CNx9soJmDJCpUgymckdWeGWuN0Ash5g60oQvrQDfosVxEhzmNvtvXv45WZEqSBzDP6E5SEmQ==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@lumino/coreutils/-/coreutils-2.2.2.tgz",
+      "integrity": "sha512-zaKJaK7rawPATn2BGHkbMrR6oK3s9PxNe9KreLwWF2dB4ZBHDiEmNLRyHRorfJ7XqVOEXAsAAj0jFn+qJPC/4Q==",
       "dev": true,
-      "peerDependencies": {
-        "crypto": "1.0.1"
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@lumino/algorithm": "^2.0.4"
       }
     },
     "node_modules/@types/linkify-it": {
diff --git a/extensions/ipynb/package.json b/extensions/ipynb/package.json
index 6e63588c7dbd..02d3c6178538 100644
--- a/extensions/ipynb/package.json
+++ b/extensions/ipynb/package.json
@@ -165,7 +165,7 @@
     "detect-indent": "^7.0.2"
   },
   "devDependencies": {
-    "@jupyterlab/nbformat": "^3.2.9",
+    "@jupyterlab/nbformat": "^4.5.1",
     "@types/markdown-it": "14.1.2"
   },
   "repository": {

From c9a5a1c1e7f3be72fb182f038b75362812eaf677 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Dec 2025 02:58:56 +0000
Subject: [PATCH 1266/1815] Bump @octokit/graphql from 8.2.0 to 9.0.3 in
 /extensions/github

Bumps [@octokit/graphql](https://github.com/octokit/graphql.js) from 8.2.0 to 9.0.3.
- [Release notes](https://github.com/octokit/graphql.js/releases)
- [Commits](https://github.com/octokit/graphql.js/compare/v8.2.0...v9.0.3)

---
updated-dependencies:
- dependency-name: "@octokit/graphql"
  dependency-version: 9.0.3
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github/package-lock.json | 170 +++++-----------------------
 extensions/github/package.json      |   2 +-
 2 files changed, 28 insertions(+), 144 deletions(-)

diff --git a/extensions/github/package-lock.json b/extensions/github/package-lock.json
index 9e8992c7caaf..11b6bbc5be48 100644
--- a/extensions/github/package-lock.json
+++ b/extensions/github/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.0.1",
       "license": "MIT",
       "dependencies": {
-        "@octokit/graphql": "8.2.0",
+        "@octokit/graphql": "9.0.3",
         "@octokit/graphql-schema": "15.26.1",
         "@octokit/rest": "22.0.1",
         "@vscode/extension-telemetry": "^0.9.8",
@@ -162,7 +162,7 @@
       "license": "MIT",
       "dependencies": {
         "@octokit/auth-token": "^6.0.0",
-        "@octokit/graphql": "^9.0.3",
+        "@octokit/graphql": "9.0.3",
         "@octokit/request": "^10.0.6",
         "@octokit/request-error": "^7.0.2",
         "@octokit/types": "^16.0.0",
@@ -173,7 +173,7 @@
         "node": ">= 20"
       }
     },
-    "node_modules/@octokit/core/node_modules/@octokit/endpoint": {
+    "node_modules/@octokit/endpoint": {
       "version": "11.0.2",
       "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-11.0.2.tgz",
       "integrity": "sha512-4zCpzP1fWc7QlqunZ5bSEjxc6yLAlRTnDwKtgXfcI/FxxGoqedDG8V2+xJ60bV2kODqcGB+nATdtap/XYq2NZQ==",
@@ -186,7 +186,7 @@
         "node": ">= 20"
       }
     },
-    "node_modules/@octokit/core/node_modules/@octokit/graphql": {
+    "node_modules/@octokit/graphql": {
       "version": "9.0.3",
       "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-9.0.3.tgz",
       "integrity": "sha512-grAEuupr/C1rALFnXTv6ZQhFuL1D8G5y8CN04RgrO4FIPMrtm+mcZzFG7dcBm+nq+1ppNixu+Jd78aeJOYxlGA==",
@@ -200,92 +200,6 @@
         "node": ">= 20"
       }
     },
-    "node_modules/@octokit/core/node_modules/@octokit/openapi-types": {
-      "version": "27.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-27.0.0.tgz",
-      "integrity": "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==",
-      "license": "MIT"
-    },
-    "node_modules/@octokit/core/node_modules/@octokit/request": {
-      "version": "10.0.7",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-10.0.7.tgz",
-      "integrity": "sha512-v93h0i1yu4idj8qFPZwjehoJx4j3Ntn+JhXsdJrG9pYaX6j/XRz2RmasMUHtNgQD39nrv/VwTWSqK0RNXR8upA==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/endpoint": "^11.0.2",
-        "@octokit/request-error": "^7.0.2",
-        "@octokit/types": "^16.0.0",
-        "fast-content-type-parse": "^3.0.0",
-        "universal-user-agent": "^7.0.2"
-      },
-      "engines": {
-        "node": ">= 20"
-      }
-    },
-    "node_modules/@octokit/core/node_modules/@octokit/request-error": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-7.1.0.tgz",
-      "integrity": "sha512-KMQIfq5sOPpkQYajXHwnhjCC0slzCNScLHs9JafXc4RAJI+9f+jNDlBNaIMTvazOPLgb4BnlhGJOTbnN0wIjPw==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^16.0.0"
-      },
-      "engines": {
-        "node": ">= 20"
-      }
-    },
-    "node_modules/@octokit/core/node_modules/@octokit/types": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-16.0.0.tgz",
-      "integrity": "sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^27.0.0"
-      }
-    },
-    "node_modules/@octokit/core/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==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fastify"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fastify"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/@octokit/endpoint": {
-      "version": "10.1.3",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.3.tgz",
-      "integrity": "sha512-nBRBMpKPhQUxCsQQeW+rCJ/OPSMcj3g0nfHn01zGYZXuNDvvXudF/TYY6APj5THlurerpFN4a/dQAIAaM6BYhA==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^13.6.2",
-        "universal-user-agent": "^7.0.2"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/graphql": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.2.0.tgz",
-      "integrity": "sha512-gejfDywEml/45SqbWTWrhfwvLBrcGYhOn50sPOjIeVvH6i7D16/9xcFA8dAJNp2HMcd+g4vru41g4E2RBiZvfQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/request": "^9.1.4",
-        "@octokit/types": "^13.8.0",
-        "universal-user-agent": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
     "node_modules/@octokit/graphql-schema": {
       "version": "15.26.1",
       "resolved": "https://registry.npmjs.org/@octokit/graphql-schema/-/graphql-schema-15.26.1.tgz",
@@ -297,9 +211,9 @@
       }
     },
     "node_modules/@octokit/openapi-types": {
-      "version": "23.0.1",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-23.0.1.tgz",
-      "integrity": "sha512-izFjMJ1sir0jn0ldEKhZ7xegCTj/ObmEDlEfpFrx4k/JyZSMRHbO3/rBwgE7f3m2DHt+RrNGIVw4wSmwnm3t/g==",
+      "version": "27.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-27.0.0.tgz",
+      "integrity": "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==",
       "license": "MIT"
     },
     "node_modules/@octokit/plugin-paginate-rest": {
@@ -317,21 +231,6 @@
         "@octokit/core": ">=6"
       }
     },
-    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
-      "version": "27.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-27.0.0.tgz",
-      "integrity": "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==",
-      "license": "MIT"
-    },
-    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-16.0.0.tgz",
-      "integrity": "sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^27.0.0"
-      }
-    },
     "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",
@@ -359,47 +258,32 @@
         "@octokit/core": ">=6"
       }
     },
-    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
-      "version": "27.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-27.0.0.tgz",
-      "integrity": "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==",
-      "license": "MIT"
-    },
-    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-16.0.0.tgz",
-      "integrity": "sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^27.0.0"
-      }
-    },
     "node_modules/@octokit/request": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.2.1.tgz",
-      "integrity": "sha512-TqHLIdw1KFvx8WvLc7Jv94r3C3+AzKY2FWq7c20zvrxmCIa6MCVkLCE/826NCXnml3LFJjLsidDh1BhMaGEDQw==",
+      "version": "10.0.7",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-10.0.7.tgz",
+      "integrity": "sha512-v93h0i1yu4idj8qFPZwjehoJx4j3Ntn+JhXsdJrG9pYaX6j/XRz2RmasMUHtNgQD39nrv/VwTWSqK0RNXR8upA==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/endpoint": "^10.1.3",
-        "@octokit/request-error": "^6.1.6",
-        "@octokit/types": "^13.6.2",
-        "fast-content-type-parse": "^2.0.0",
+        "@octokit/endpoint": "^11.0.2",
+        "@octokit/request-error": "^7.0.2",
+        "@octokit/types": "^16.0.0",
+        "fast-content-type-parse": "^3.0.0",
         "universal-user-agent": "^7.0.2"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/request-error": {
-      "version": "6.1.7",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.7.tgz",
-      "integrity": "sha512-69NIppAwaauwZv6aOzb+VVLwt+0havz9GT5YplkeJv7fG7a40qpLt/yZKyiDxAhgz0EtgNdNcb96Z0u+Zyuy2g==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-7.1.0.tgz",
+      "integrity": "sha512-KMQIfq5sOPpkQYajXHwnhjCC0slzCNScLHs9JafXc4RAJI+9f+jNDlBNaIMTvazOPLgb4BnlhGJOTbnN0wIjPw==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^13.6.2"
+        "@octokit/types": "^16.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/rest": {
@@ -418,12 +302,12 @@
       }
     },
     "node_modules/@octokit/types": {
-      "version": "13.8.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.8.0.tgz",
-      "integrity": "sha512-x7DjTIbEpEWXK99DMd01QfWy0hd5h4EN+Q7shkdKds3otGQP+oWE/y0A76i1OvH9fygo4ddvNf7ZvF0t78P98A==",
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-16.0.0.tgz",
+      "integrity": "sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/openapi-types": "^23.0.1"
+        "@octokit/openapi-types": "^27.0.0"
       }
     },
     "node_modules/@types/node": {
@@ -456,9 +340,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/fast-content-type-parse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-2.0.1.tgz",
-      "integrity": "sha512-nGqtvLrj5w0naR6tDPfB4cUmYCqouzyQiz6C5y/LtcDllJdrcc6WaWW6iXyIIOErTa/XRybj28aasdn4LkVk6Q==",
+      "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==",
       "funding": [
         {
           "type": "github",
diff --git a/extensions/github/package.json b/extensions/github/package.json
index 8585ee7a32c7..0f9371946ee6 100644
--- a/extensions/github/package.json
+++ b/extensions/github/package.json
@@ -227,7 +227,7 @@
     "watch": "gulp watch-extension:github"
   },
   "dependencies": {
-    "@octokit/graphql": "8.2.0",
+    "@octokit/graphql": "9.0.3",
     "@octokit/graphql-schema": "15.26.1",
     "@octokit/rest": "22.0.1",
     "tunnel": "^0.0.6",

From 2fc9765e5328f0b7b8706ebd4b4aa4676697c5dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Dec 2025 02:58:58 +0000
Subject: [PATCH 1267/1815] Bump @types/node from 20.11.24 to 24.10.1 in
 /extensions/github

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 24.10.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.10.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github/package-lock.json | 20 +++++++++++---------
 extensions/github/package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/github/package-lock.json b/extensions/github/package-lock.json
index 9e8992c7caaf..abf5d6570494 100644
--- a/extensions/github/package-lock.json
+++ b/extensions/github/package-lock.json
@@ -16,7 +16,7 @@
         "tunnel": "^0.0.6"
       },
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "^1.41.0"
@@ -427,12 +427,13 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@vscode/extension-telemetry": {
@@ -507,10 +508,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/universal-user-agent": {
       "version": "7.0.2",
diff --git a/extensions/github/package.json b/extensions/github/package.json
index 8585ee7a32c7..906a3fb464ce 100644
--- a/extensions/github/package.json
+++ b/extensions/github/package.json
@@ -234,7 +234,7 @@
     "@vscode/extension-telemetry": "^0.9.8"
   },
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "25.x"
   },
   "repository": {
     "type": "git",

From d58b33e18570fc9aeb81658d2c04cc9c880ddfde Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Dec 2025 02:59:00 +0000
Subject: [PATCH 1268/1815] Bump @vscode/extension-telemetry in
 /extensions/github

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 0.9.8 to 1.2.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v0.9.8...v1.2.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.2.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github/package-lock.json | 94 ++++++++++++++---------------
 extensions/github/package.json      |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/extensions/github/package-lock.json b/extensions/github/package-lock.json
index 9e8992c7caaf..c74bfeeb6014 100644
--- a/extensions/github/package-lock.json
+++ b/extensions/github/package-lock.json
@@ -12,7 +12,7 @@
         "@octokit/graphql": "8.2.0",
         "@octokit/graphql-schema": "15.26.1",
         "@octokit/rest": "22.0.1",
-        "@vscode/extension-telemetry": "^0.9.8",
+        "@vscode/extension-telemetry": "^1.2.0",
         "tunnel": "^0.0.6"
       },
       "devDependencies": {
@@ -23,73 +23,73 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
-      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
+      "integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
-      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.10.tgz",
+      "integrity": "sha512-VSLjc9cT+Y+eTiSfYltJHJCejn8oYr0E6Pq2BMhOEO7F6IyLGYIxzKKvo78ze9x+iHX7KPTATcZ+PFgjGXuNqg==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.3.4",
+        "@microsoft/1ds-core-js": "4.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
-      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.10.tgz",
+      "integrity": "sha512-iolFLz1ocWAzIQqHIEjjov3gNTPkgFQ4ArHnBcJEYoffOGWlJt6copaevS5YPI5rHzmbySsengZ8cLJJBBrXzQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
-      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.10.tgz",
+      "integrity": "sha512-RVIenPIvNgZCbjJdALvLM4rNHgAFuHI7faFzHCgnI6S2WCUNGHeXlQTs9EUUrL+n2TPp9/cd0KKMILU5VVyYiA==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
-      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.10.tgz",
+      "integrity": "sha512-5yKeyassZTq2l+SAO4npu6LPnbS++UD+M+Ghjm9uRzoBwD8tumFx0/F8AkSVqbniSREd+ztH/2q2foewa2RZyg==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -105,18 +105,18 @@
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
-      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.10.tgz",
+      "integrity": "sha512-AZib5DAT3NU0VT0nLWEwXrnoMDDgZ/5S4dso01CNU5ELNxLdg+1fvchstlVdMy4FrAnxzs8Wf/GIQNFYOVgpAw==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.3.4",
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.10",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -141,9 +141,9 @@
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
-      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
+      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
       "license": "MIT"
     },
     "node_modules/@octokit/auth-token": {
@@ -436,14 +436,14 @@
       }
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.8",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
-      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
+      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.3.4",
-        "@microsoft/1ds-post-js": "^4.3.4",
-        "@microsoft/applicationinsights-web-basic": "^3.3.4"
+        "@microsoft/1ds-core-js": "^4.3.10",
+        "@microsoft/1ds-post-js": "^4.3.10",
+        "@microsoft/applicationinsights-web-basic": "^3.3.10"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/github/package.json b/extensions/github/package.json
index 8585ee7a32c7..e1c439b60a78 100644
--- a/extensions/github/package.json
+++ b/extensions/github/package.json
@@ -231,7 +231,7 @@
     "@octokit/graphql-schema": "15.26.1",
     "@octokit/rest": "22.0.1",
     "tunnel": "^0.0.6",
-    "@vscode/extension-telemetry": "^0.9.8"
+    "@vscode/extension-telemetry": "^1.2.0"
   },
   "devDependencies": {
     "@types/node": "20.x"

From 853500257fb1e111111e603528ae3b13c03bf6ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Dec 2025 19:40:24 +0000
Subject: [PATCH 1269/1815] Bump @types/node in
 /extensions/css-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.2 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/css-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/css-language-features/package-lock.json b/extensions/css-language-features/package-lock.json
index 3985891c6cfe..b9236f2180ba 100644
--- a/extensions/css-language-features/package-lock.json
+++ b/extensions/css-language-features/package-lock.json
@@ -41,9 +41,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.2.tgz",
-      "integrity": "sha512-gWEkeiyYE4vqjON/+Obqcoeffmk0NF15WSBwSs7zwVA2bAbTaE0SJ7P0WNGoJn8uE7fiaV5a7dKYIJriEqOrmA==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 7958a5f42d0fda20a52fb84888736760649457af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Dec 2025 21:09:31 +0000
Subject: [PATCH 1270/1815] Bump @types/node in /extensions/extension-editing

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../extension-editing/package-lock.json       | 75 ++++++++-----------
 extensions/extension-editing/package.json     |  2 +-
 2 files changed, 33 insertions(+), 44 deletions(-)

diff --git a/extensions/extension-editing/package-lock.json b/extensions/extension-editing/package-lock.json
index 30acf53b4a8b..9cb66a5d7e00 100644
--- a/extensions/extension-editing/package-lock.json
+++ b/extensions/extension-editing/package-lock.json
@@ -15,7 +15,7 @@
       },
       "devDependencies": {
         "@types/markdown-it": "14.1.2",
-        "@types/node": "20.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "^1.4.0"
@@ -47,12 +47,13 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/argparse": {
@@ -61,13 +62,10 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
       "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.12"
-      },
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
@@ -79,35 +77,34 @@
       "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==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
       "license": "MIT",
       "dependencies": {
-        "uc.micro": "^2.0.0"
+        "uc.micro": "^1.0.1"
       }
     },
     "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==",
+      "version": "12.3.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
       "license": "MIT",
       "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"
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
       },
       "bin": {
-        "markdown-it": "bin/markdown-it.mjs"
+        "markdown-it": "bin/markdown-it.js"
       }
     },
     "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==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
       "license": "MIT"
     },
     "node_modules/parse5": {
@@ -134,26 +131,18 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/punycode.js": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
-      "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/uc.micro": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
-      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
       "license": "MIT"
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/extension-editing/package.json b/extensions/extension-editing/package.json
index d2fc400d0e53..26e9f9f8d446 100644
--- a/extensions/extension-editing/package.json
+++ b/extensions/extension-editing/package.json
@@ -67,7 +67,7 @@
   },
   "devDependencies": {
     "@types/markdown-it": "14.1.2",
-    "@types/node": "20.x"
+    "@types/node": "25.x"
   },
   "repository": {
     "type": "git",

From eb5ee7c897b5c114f5c17e8456fa3414373a15e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Dec 2025 21:41:32 +0000
Subject: [PATCH 1271/1815] Bump @types/which from 3.0.0 to 3.0.4 in
 /extensions/git

Bumps [@types/which](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/which) from 3.0.0 to 3.0.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/which)

---
updated-dependencies:
- dependency-name: "@types/which"
  dependency-version: 3.0.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 11 ++++++-----
 extensions/git/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index db8b152cf012..9a5fc4899709 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -24,7 +24,7 @@
         "@types/mocha": "^10.0.10",
         "@types/node": "20.x",
         "@types/picomatch": "4.0.2",
-        "@types/which": "3.0.0"
+        "@types/which": "3.0.4"
       },
       "engines": {
         "vscode": "^1.5.0"
@@ -230,10 +230,11 @@
       "license": "MIT"
     },
     "node_modules/@types/which": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/which/-/which-3.0.0.tgz",
-      "integrity": "sha512-ASCxdbsrwNfSMXALlC3Decif9rwDMu+80KGp5zI2RLRotfMsTv7fHL8W8VDp24wymzDyIFudhUeSCugrgRFfHQ==",
-      "dev": true
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-3.0.4.tgz",
+      "integrity": "sha512-liyfuo/106JdlgSchJzXEQCVArk0CvevqPote8F8HgWgJ3dRCcTHgJIsLDuee0kxk/mhbInzIZk3QWSZJ8R+2w==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@vscode/extension-telemetry": {
       "version": "0.9.8",
diff --git a/extensions/git/package.json b/extensions/git/package.json
index d347a466084e..e392773b6fd6 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3575,7 +3575,7 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "20.x",
     "@types/picomatch": "4.0.2",
-    "@types/which": "3.0.0"
+    "@types/which": "3.0.4"
   },
   "repository": {
     "type": "git",

From fcd7b4d76ba019a711d28da8ab5549a36570c5cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Dec 2025 21:41:34 +0000
Subject: [PATCH 1272/1815] Bump @vscode/extension-telemetry from 0.9.8 to
 1.2.0 in /extensions/git

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 0.9.8 to 1.2.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v0.9.8...v1.2.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.2.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 94 ++++++++++++++++----------------
 extensions/git/package.json      |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index db8b152cf012..80b6dd8dacb8 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@joaomoreno/unique-names-generator": "^5.2.0",
-        "@vscode/extension-telemetry": "^0.9.8",
+        "@vscode/extension-telemetry": "^1.2.0",
         "@vscode/iconv-lite-umd": "0.7.0",
         "byline": "^5.0.0",
         "file-type": "21.1.1",
@@ -50,73 +50,73 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
-      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
+      "integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
-      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.10.tgz",
+      "integrity": "sha512-VSLjc9cT+Y+eTiSfYltJHJCejn8oYr0E6Pq2BMhOEO7F6IyLGYIxzKKvo78ze9x+iHX7KPTATcZ+PFgjGXuNqg==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.3.4",
+        "@microsoft/1ds-core-js": "4.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
-      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.10.tgz",
+      "integrity": "sha512-iolFLz1ocWAzIQqHIEjjov3gNTPkgFQ4ArHnBcJEYoffOGWlJt6copaevS5YPI5rHzmbySsengZ8cLJJBBrXzQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
-      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.10.tgz",
+      "integrity": "sha512-RVIenPIvNgZCbjJdALvLM4rNHgAFuHI7faFzHCgnI6S2WCUNGHeXlQTs9EUUrL+n2TPp9/cd0KKMILU5VVyYiA==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
-      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.10.tgz",
+      "integrity": "sha512-5yKeyassZTq2l+SAO4npu6LPnbS++UD+M+Ghjm9uRzoBwD8tumFx0/F8AkSVqbniSREd+ztH/2q2foewa2RZyg==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -132,18 +132,18 @@
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
-      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.10.tgz",
+      "integrity": "sha512-AZib5DAT3NU0VT0nLWEwXrnoMDDgZ/5S4dso01CNU5ELNxLdg+1fvchstlVdMy4FrAnxzs8Wf/GIQNFYOVgpAw==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.3.4",
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.10",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -168,9 +168,9 @@
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
-      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
+      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
       "license": "MIT"
     },
     "node_modules/@tokenizer/inflate": {
@@ -236,14 +236,14 @@
       "dev": true
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.8",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
-      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
+      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.3.4",
-        "@microsoft/1ds-post-js": "^4.3.4",
-        "@microsoft/applicationinsights-web-basic": "^3.3.4"
+        "@microsoft/1ds-core-js": "^4.3.10",
+        "@microsoft/1ds-post-js": "^4.3.10",
+        "@microsoft/applicationinsights-web-basic": "^3.3.10"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/git/package.json b/extensions/git/package.json
index d347a466084e..3b4b43f695db 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3561,7 +3561,7 @@
   },
   "dependencies": {
     "@joaomoreno/unique-names-generator": "^5.2.0",
-    "@vscode/extension-telemetry": "^0.9.8",
+    "@vscode/extension-telemetry": "^1.2.0",
     "@vscode/iconv-lite-umd": "0.7.0",
     "byline": "^5.0.0",
     "file-type": "21.1.1",

From f6ffec705ba305e3cd65661c1e00c591e17ceee9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Dec 2025 00:02:09 +0000
Subject: [PATCH 1273/1815] Bump @types/node in
 /extensions/github-authentication

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../github-authentication/package-lock.json   | 20 ++++++++++---------
 extensions/github-authentication/package.json |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/github-authentication/package-lock.json b/extensions/github-authentication/package-lock.json
index 5de0b91ee1a0..1ec8f24f7bed 100644
--- a/extensions/github-authentication/package-lock.json
+++ b/extensions/github-authentication/package-lock.json
@@ -15,7 +15,7 @@
       },
       "devDependencies": {
         "@types/mocha": "^10.0.10",
-        "@types/node": "20.x",
+        "@types/node": "25.x",
         "@types/node-fetch": "^2.5.7"
       },
       "engines": {
@@ -154,12 +154,13 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@types/node-fetch": {
@@ -533,10 +534,11 @@
       "integrity": "sha512-V+uqV66BOQnWxvI6HjDnE4VkInmYZUQ4dgB7gzaDyFyFSK1i1nF/j7DpS9UbQAgV9NaF1XpcyuavnM1qOeiEIg=="
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vscode-tas-client": {
       "version": "0.1.84",
diff --git a/extensions/github-authentication/package.json b/extensions/github-authentication/package.json
index c2a7b3b31535..fb7c9f4a487a 100644
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@@ -67,7 +67,7 @@
   },
   "devDependencies": {
     "@types/mocha": "^10.0.10",
-    "@types/node": "20.x",
+    "@types/node": "25.x",
     "@types/node-fetch": "^2.5.7"
   },
   "repository": {

From e69d610f9922cffdc0bd1c19de20aac495c02069 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Dec 2025 00:13:07 +0000
Subject: [PATCH 1274/1815] Bump @types/node in
 /extensions/html-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../html-language-features/package-lock.json  | 20 ++++++++++---------
 .../html-language-features/package.json       |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/html-language-features/package-lock.json b/extensions/html-language-features/package-lock.json
index 4ac515107173..d3a21e50c3de 100644
--- a/extensions/html-language-features/package-lock.json
+++ b/extensions/html-language-features/package-lock.json
@@ -14,7 +14,7 @@
         "vscode-uri": "^3.1.0"
       },
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "^1.77.0"
@@ -166,12 +166,13 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@vscode/extension-telemetry": {
@@ -216,10 +217,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vscode-jsonrpc": {
       "version": "9.0.0-next.11",
diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json
index 8c95c2382e2c..8fd3626c57b0 100644
--- a/extensions/html-language-features/package.json
+++ b/extensions/html-language-features/package.json
@@ -263,7 +263,7 @@
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "25.x"
   },
   "repository": {
     "type": "git",

From 5e624bedea32c1fd1642f6f5deae96263f973837 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Dec 2025 01:08:10 +0000
Subject: [PATCH 1275/1815] Bump @types/node in
 /extensions/json-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../json-language-features/package-lock.json  | 20 ++++++++++---------
 .../json-language-features/package.json       |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/json-language-features/package-lock.json b/extensions/json-language-features/package-lock.json
index 75f690a7de7e..9fada55f0f42 100644
--- a/extensions/json-language-features/package-lock.json
+++ b/extensions/json-language-features/package-lock.json
@@ -14,7 +14,7 @@
         "vscode-languageclient": "^10.0.0-next.18"
       },
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "^1.77.0"
@@ -166,12 +166,13 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@vscode/extension-telemetry": {
@@ -221,10 +222,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vscode-jsonrpc": {
       "version": "9.0.0-next.10",
diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json
index c7ff9899c33d..d9c1ca3335d8 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -172,7 +172,7 @@
     "vscode-languageclient": "^10.0.0-next.18"
   },
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "25.x"
   },
   "repository": {
     "type": "git",

From 98ad163988229d323ceef8ed1fa2200c5fc7ab2b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Dec 2025 01:18:54 +0000
Subject: [PATCH 1276/1815] Bump @types/node in
 /extensions/json-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 24.10.1 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../json-language-features/server/package-lock.json       | 8 ++++----
 extensions/json-language-features/server/package.json     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/json-language-features/server/package-lock.json b/extensions/json-language-features/server/package-lock.json
index 3cd5c6cd61cd..0d09981914cb 100644
--- a/extensions/json-language-features/server/package-lock.json
+++ b/extensions/json-language-features/server/package-lock.json
@@ -21,7 +21,7 @@
       },
       "devDependencies": {
         "@types/mocha": "^10.0.10",
-        "@types/node": "24.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "node": "*"
@@ -35,9 +35,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "24.10.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
-      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json
index 34018cb2b28f..cd0a660c53b9 100644
--- a/extensions/json-language-features/server/package.json
+++ b/extensions/json-language-features/server/package.json
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "@types/mocha": "^10.0.10",
-    "@types/node": "24.x"
+    "@types/node": "25.x"
   },
   "scripts": {
     "prepublishOnly": "npm run clean && npm run compile",

From 3a3c1842248c22a70e3080fb9f5cb0223a400d0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Dec 2025 01:30:03 +0000
Subject: [PATCH 1277/1815] Bump @vscode/markdown-it-katex in
 /extensions/markdown-math

Bumps [@vscode/markdown-it-katex](https://github.com/microsoft/vscode-markdown-it-katex) from 1.1.1 to 1.1.2.
- [Release notes](https://github.com/microsoft/vscode-markdown-it-katex/releases)
- [Changelog](https://github.com/microsoft/vscode-markdown-it-katex/blob/main/CHANGELOG.md)
- [Commits](https://github.com/microsoft/vscode-markdown-it-katex/compare/v1.1.1...v1.1.2)

---
updated-dependencies:
- dependency-name: "@vscode/markdown-it-katex"
  dependency-version: 1.1.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/markdown-math/package-lock.json | 8 ++++----
 extensions/markdown-math/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/markdown-math/package-lock.json b/extensions/markdown-math/package-lock.json
index d37a6bc33e0a..869798dc0689 100644
--- a/extensions/markdown-math/package-lock.json
+++ b/extensions/markdown-math/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/markdown-it-katex": "^1.1.1"
+        "@vscode/markdown-it-katex": "^1.1.2"
       },
       "devDependencies": {
         "@types/markdown-it": "^14.1.2",
@@ -52,9 +52,9 @@
       "license": "MIT"
     },
     "node_modules/@vscode/markdown-it-katex": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@vscode/markdown-it-katex/-/markdown-it-katex-1.1.1.tgz",
-      "integrity": "sha512-3KTlbsRBPJQLE2YmLL7K6nunTlU+W9T5+FjfNdWuIUKgxSS6HWLQHaO3L4MkJi7z7MpIPpY+g4N+cWNBPE/MSA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@vscode/markdown-it-katex/-/markdown-it-katex-1.1.2.tgz",
+      "integrity": "sha512-+4IIv5PgrmhKvW/3LpkpkGg257OViEhXkOOgCyj5KMsjsOfnRXkni8XAuuF9Ui5p3B8WnUovlDXAQNb8RJ/RaQ==",
       "license": "MIT",
       "dependencies": {
         "katex": "^0.16.4"
diff --git a/extensions/markdown-math/package.json b/extensions/markdown-math/package.json
index f405bba1e614..f397c9ca66be 100644
--- a/extensions/markdown-math/package.json
+++ b/extensions/markdown-math/package.json
@@ -119,6 +119,6 @@
     "url": "https://github.com/microsoft/vscode.git"
   },
   "dependencies": {
-    "@vscode/markdown-it-katex": "^1.1.1"
+    "@vscode/markdown-it-katex": "^1.1.2"
   }
 }

From 9a08abb38fe01df4ff80fbc8f373e560ab9a61aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Dec 2025 12:18:42 +0000
Subject: [PATCH 1278/1815] Bump github/codeql-action from 4.31.7 to 4.31.9

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.7 to 4.31.9.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/cf1bb45a277cb3c205638b2cd5c984db1c46a412...5d4e8d1aca955e8d8589aabd499c5cae939e33c7)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/scorecards.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index fc76bdf81195..21715db81bd8 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -76,6 +76,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
+        uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
         with:
           sarif_file: results.sarif

From 9c8f3f1c8593b6c42d78de4c27a94693dab0c085 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Dec 2025 12:27:22 +0000
Subject: [PATCH 1279/1815] Bump @types/node in
 /extensions/css-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.2 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/css-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/css-language-features/server/package-lock.json b/extensions/css-language-features/server/package-lock.json
index cd78ef736035..152881553f17 100644
--- a/extensions/css-language-features/server/package-lock.json
+++ b/extensions/css-language-features/server/package-lock.json
@@ -30,9 +30,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.2.tgz",
-      "integrity": "sha512-gWEkeiyYE4vqjON/+Obqcoeffmk0NF15WSBwSs7zwVA2bAbTaE0SJ7P0WNGoJn8uE7fiaV5a7dKYIJriEqOrmA==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 331219e5ea40b637374407476de1985df6a6a02e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Dec 2025 12:27:27 +0000
Subject: [PATCH 1280/1815] Bump vscode-languageserver in
 /extensions/css-language-features/server

Bumps [vscode-languageserver](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/server) from 10.0.0-next.15 to 10.0.0-next.16.
- [Release notes](https://github.com/Microsoft/vscode-languageserver-node/releases)
- [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/client/10.0.0-next.16/server)

---
updated-dependencies:
- dependency-name: vscode-languageserver
  dependency-version: 10.0.0-next.16
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../server/package-lock.json                  | 24 +++++++++----------
 .../css-language-features/server/package.json |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/extensions/css-language-features/server/package-lock.json b/extensions/css-language-features/server/package-lock.json
index cd78ef736035..9c190419081a 100644
--- a/extensions/css-language-features/server/package-lock.json
+++ b/extensions/css-language-features/server/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@vscode/l10n": "^0.0.18",
         "vscode-css-languageservice": "^6.3.9",
-        "vscode-languageserver": "^10.0.0-next.15",
+        "vscode-languageserver": "^10.0.0-next.16",
         "vscode-uri": "^3.1.0"
       },
       "devDependencies": {
@@ -64,33 +64,33 @@
       }
     },
     "node_modules/vscode-jsonrpc": {
-      "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==",
+      "version": "9.0.0-next.11",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.11.tgz",
+      "integrity": "sha512-u6LElQNbSiE9OugEEmrUKwH6+8BpPz2S5MDHvQUqHL//I4Q8GPikKLOUf856UnbLkZdhxaPrExac1lA3XwpIPA==",
       "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/vscode-languageserver": {
-      "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==",
+      "version": "10.0.0-next.16",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.16.tgz",
+      "integrity": "sha512-RbsYDOhddv1NtBCAR7+oVxxCmOpQUHhrtgUE0xz6J+BJGSCkfOqBCyLUIwSjKk2rK9llxUj/pR5aL8QCsXrxow==",
       "license": "MIT",
       "dependencies": {
-        "vscode-languageserver-protocol": "3.17.6-next.15"
+        "vscode-languageserver-protocol": "3.17.6-next.16"
       },
       "bin": {
         "installServerIntoExtension": "bin/installServerIntoExtension"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "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==",
+      "version": "3.17.6-next.16",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.16.tgz",
+      "integrity": "sha512-kQTjXEuyxMbdmmZ3U+Lib3oUl12xEKNc73RtWxPSDS3TFtjVwt98Q1CUzfDA9EUpsA24M46Bl6q3sLe9AUOKyw==",
       "license": "MIT",
       "dependencies": {
-        "vscode-jsonrpc": "9.0.0-next.10",
+        "vscode-jsonrpc": "9.0.0-next.11",
         "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 85f1102f56d2..1e6bc0311b8e 100644
--- a/extensions/css-language-features/server/package.json
+++ b/extensions/css-language-features/server/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@vscode/l10n": "^0.0.18",
     "vscode-css-languageservice": "^6.3.9",
-    "vscode-languageserver": "^10.0.0-next.15",
+    "vscode-languageserver": "^10.0.0-next.16",
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {

From 550be1044418fb0bfe66d54eab80812c6729277e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Dec 2025 12:25:10 +0000
Subject: [PATCH 1281/1815] Bump chai from 6.2.1 to 6.2.2 in /test/monaco

Bumps [chai](https://github.com/chaijs/chai) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/chaijs/chai/releases)
- [Changelog](https://github.com/chaijs/chai/blob/main/History.md)
- [Commits](https://github.com/chaijs/chai/compare/v6.2.1...v6.2.2)

---
updated-dependencies:
- dependency-name: chai
  dependency-version: 6.2.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/monaco/package-lock.json | 8 ++++----
 test/monaco/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/monaco/package-lock.json b/test/monaco/package-lock.json
index 6da1955fbd14..7c14afa17905 100644
--- a/test/monaco/package-lock.json
+++ b/test/monaco/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "devDependencies": {
         "@types/chai": "^5.2.3",
-        "chai": "^6.2.1",
+        "chai": "^6.2.2",
         "warnings-to-errors-webpack-plugin": "^2.3.0"
       }
     },
@@ -43,9 +43,9 @@
       }
     },
     "node_modules/chai": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.1.tgz",
-      "integrity": "sha512-p4Z49OGG5W/WBCPSS/dH3jQ73kD6tiMmUM+bckNK6Jr5JHMG3k9bg/BvKR8lKmtVBKmOiuVaV2ws8s9oSbwysg==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz",
+      "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==",
       "dev": true,
       "license": "MIT",
       "engines": {
diff --git a/test/monaco/package.json b/test/monaco/package.json
index 8edd11439157..b6777f0854ba 100644
--- a/test/monaco/package.json
+++ b/test/monaco/package.json
@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "@types/chai": "^5.2.3",
-    "chai": "^6.2.1",
+    "chai": "^6.2.2",
     "warnings-to-errors-webpack-plugin": "^2.3.0"
   }
 }

From db8e69c1fdec8ce78e3266e71258f444b71fb6b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Dec 2025 12:25:48 +0000
Subject: [PATCH 1282/1815] Bump vscode-languageserver-types

Bumps [vscode-languageserver-types](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/types) from 3.17.2 to 3.17.5.
- [Release notes](https://github.com/Microsoft/vscode-languageserver-node/releases)
- [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/types/3.17.5/types)

---
updated-dependencies:
- dependency-name: vscode-languageserver-types
  dependency-version: 3.17.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 20 ++++++++++---------
 .../markdown-language-features/package.json   |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index 3cd8daec67c2..1923330bd20a 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -31,7 +31,7 @@
         "@types/vscode-webview": "^1.57.0",
         "@vscode/markdown-it-katex": "^1.1.1",
         "lodash.throttle": "^4.1.1",
-        "vscode-languageserver-types": "^3.17.2",
+        "vscode-languageserver-types": "^3.17.5",
         "vscode-markdown-languageservice": "^0.3.0-alpha.3"
       },
       "engines": {
@@ -606,15 +606,22 @@
         "vscode-languageserver-types": "3.17.2"
       }
     },
+    "node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": {
+      "version": "3.17.2",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz",
+      "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==",
+      "license": "MIT"
+    },
     "node_modules/vscode-languageserver-textdocument": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz",
       "integrity": "sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA=="
     },
     "node_modules/vscode-languageserver-types": {
-      "version": "3.17.2",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz",
-      "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA=="
+      "version": "3.17.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
+      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==",
+      "license": "MIT"
     },
     "node_modules/vscode-languageserver/node_modules/vscode-jsonrpc": {
       "version": "8.1.0",
@@ -654,11 +661,6 @@
         "node": "*"
       }
     },
-    "node_modules/vscode-markdown-languageserver/node_modules/vscode-languageserver-types": {
-      "version": "3.17.5",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
-      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="
-    },
     "node_modules/vscode-markdown-languageserver/node_modules/vscode-markdown-languageservice": {
       "version": "0.5.0-alpha.8",
       "resolved": "https://registry.npmjs.org/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.5.0-alpha.8.tgz",
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index ee8c5d81816b..52aaba391a34 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -785,7 +785,7 @@
     "@types/vscode-webview": "^1.57.0",
     "@vscode/markdown-it-katex": "^1.1.1",
     "lodash.throttle": "^4.1.1",
-    "vscode-languageserver-types": "^3.17.2",
+    "vscode-languageserver-types": "^3.17.5",
     "vscode-markdown-languageservice": "^0.3.0-alpha.3"
   },
   "repository": {

From e886e33d6f8aadcfdba3c6a9bbaf9df81188cbdf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Dec 2025 12:25:52 +0000
Subject: [PATCH 1283/1815] Bump vscode-languageclient in
 /extensions/markdown-language-features

Bumps [vscode-languageclient](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/client) from 8.0.2 to 9.0.1.
- [Release notes](https://github.com/Microsoft/vscode-languageserver-node/releases)
- [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/client/9.0.1/client)

---
updated-dependencies:
- dependency-name: vscode-languageclient
  dependency-version: 9.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 75 +++++++++----------
 .../markdown-language-features/package.json   |  2 +-
 2 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index 3cd8daec67c2..2d65f4f3bc7d 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -17,7 +17,7 @@
         "morphdom": "^2.6.1",
         "picomatch": "^2.3.1",
         "punycode": "^2.3.1",
-        "vscode-languageclient": "^8.0.2",
+        "vscode-languageclient": "^9.0.1",
         "vscode-languageserver-textdocument": "^1.0.11",
         "vscode-markdown-languageserver": "^0.5.0-alpha.9",
         "vscode-uri": "^3.0.3"
@@ -271,7 +271,8 @@
     "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=="
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "license": "MIT"
     },
     "node_modules/boolbase": {
       "version": "1.0.0",
@@ -279,13 +280,12 @@
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
     },
     "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==",
+      "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",
-        "concat-map": "0.0.1"
+        "balanced-match": "^1.0.0"
       }
     },
     "node_modules/commander": {
@@ -298,11 +298,6 @@
         "node": ">= 12"
       }
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-    },
     "node_modules/css-select": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
@@ -492,14 +487,15 @@
       "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
     },
     "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">=10"
       }
     },
     "node_modules/morphdom": {
@@ -566,24 +562,26 @@
       "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
     },
     "node_modules/vscode-jsonrpc": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz",
-      "integrity": "sha512-RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz",
+      "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==",
+      "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/vscode-languageclient": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.2.tgz",
-      "integrity": "sha512-lHlthJtphG9gibGb/y72CKqQUxwPsMXijJVpHEC2bvbFqxmkj9LwQ3aGU9dwjBLqsX1S4KjShYppLvg1UJDF/Q==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-9.0.1.tgz",
+      "integrity": "sha512-JZiimVdvimEuHh5olxhxkht09m3JzUGwggb5eRUkzzJhZ2KjCN0nh55VfiED9oez9DyF8/fz1g1iBV3h+0Z2EA==",
+      "license": "MIT",
       "dependencies": {
-        "minimatch": "^3.0.4",
-        "semver": "^7.3.5",
-        "vscode-languageserver-protocol": "3.17.2"
+        "minimatch": "^5.1.0",
+        "semver": "^7.3.7",
+        "vscode-languageserver-protocol": "3.17.5"
       },
       "engines": {
-        "vscode": "^1.67.0"
+        "vscode": "^1.82.0"
       }
     },
     "node_modules/vscode-languageserver": {
@@ -598,12 +596,13 @@
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "version": "3.17.2",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2.tgz",
-      "integrity": "sha512-8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg==",
+      "version": "3.17.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz",
+      "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==",
+      "license": "MIT",
       "dependencies": {
-        "vscode-jsonrpc": "8.0.2",
-        "vscode-languageserver-types": "3.17.2"
+        "vscode-jsonrpc": "8.2.0",
+        "vscode-languageserver-types": "3.17.5"
       }
     },
     "node_modules/vscode-languageserver-textdocument": {
@@ -612,9 +611,10 @@
       "integrity": "sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA=="
     },
     "node_modules/vscode-languageserver-types": {
-      "version": "3.17.2",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz",
-      "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA=="
+      "version": "3.17.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
+      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==",
+      "license": "MIT"
     },
     "node_modules/vscode-languageserver/node_modules/vscode-jsonrpc": {
       "version": "8.1.0",
@@ -654,11 +654,6 @@
         "node": "*"
       }
     },
-    "node_modules/vscode-markdown-languageserver/node_modules/vscode-languageserver-types": {
-      "version": "3.17.5",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
-      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="
-    },
     "node_modules/vscode-markdown-languageserver/node_modules/vscode-markdown-languageservice": {
       "version": "0.5.0-alpha.8",
       "resolved": "https://registry.npmjs.org/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.5.0-alpha.8.tgz",
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index ee8c5d81816b..0fa6d3560536 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -771,7 +771,7 @@
     "morphdom": "^2.6.1",
     "picomatch": "^2.3.1",
     "punycode": "^2.3.1",
-    "vscode-languageclient": "^8.0.2",
+    "vscode-languageclient": "^9.0.1",
     "vscode-languageserver-textdocument": "^1.0.11",
     "vscode-markdown-languageserver": "^0.5.0-alpha.9",
     "vscode-uri": "^3.0.3"

From e5be0b4e189421859ad42e99cd727b3db179af80 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Dec 2025 01:44:02 +0000
Subject: [PATCH 1284/1815] Bump vscode-languageserver-textdocument

Bumps [vscode-languageserver-textdocument](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/textDocument) from 1.0.11 to 1.0.12.
- [Release notes](https://github.com/Microsoft/vscode-languageserver-node/releases)
- [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/textDocument/1.0.12/textDocument)

---
updated-dependencies:
- dependency-name: vscode-languageserver-textdocument
  dependency-version: 1.0.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/markdown-language-features/package-lock.json | 9 +++++----
 extensions/markdown-language-features/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index 1923330bd20a..fac7a7a97ee7 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -18,7 +18,7 @@
         "picomatch": "^2.3.1",
         "punycode": "^2.3.1",
         "vscode-languageclient": "^8.0.2",
-        "vscode-languageserver-textdocument": "^1.0.11",
+        "vscode-languageserver-textdocument": "^1.0.12",
         "vscode-markdown-languageserver": "^0.5.0-alpha.9",
         "vscode-uri": "^3.0.3"
       },
@@ -613,9 +613,10 @@
       "license": "MIT"
     },
     "node_modules/vscode-languageserver-textdocument": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz",
-      "integrity": "sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA=="
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
+      "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==",
+      "license": "MIT"
     },
     "node_modules/vscode-languageserver-types": {
       "version": "3.17.5",
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 52aaba391a34..7e5438588e9d 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -772,7 +772,7 @@
     "picomatch": "^2.3.1",
     "punycode": "^2.3.1",
     "vscode-languageclient": "^8.0.2",
-    "vscode-languageserver-textdocument": "^1.0.11",
+    "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-markdown-languageserver": "^0.5.0-alpha.9",
     "vscode-uri": "^3.0.3"
   },

From 8d0b7f8b6ae4773ab236241c3d919c70b6633bb2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Dec 2025 01:44:12 +0000
Subject: [PATCH 1285/1815] Bump markdown-it and @types/markdown-it

Bumps [markdown-it](https://github.com/markdown-it/markdown-it) and [@types/markdown-it](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/markdown-it). These dependencies needed to be updated together.

Updates `markdown-it` from 12.3.2 to 14.1.0
- [Changelog](https://github.com/markdown-it/markdown-it/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/markdown-it/compare/12.3.2...14.1.0)

Updates `@types/markdown-it` from 12.2.3 to 14.1.2
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/markdown-it)

---
updated-dependencies:
- dependency-name: markdown-it
  dependency-version: 14.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: "@types/markdown-it"
  dependency-version: 14.1.2
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 73 ++++++++++---------
 .../markdown-language-features/package.json   |  4 +-
 2 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index 1923330bd20a..cabe8a3b9396 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -12,7 +12,7 @@
         "@vscode/extension-telemetry": "^0.9.8",
         "dompurify": "^3.2.4",
         "highlight.js": "^11.8.0",
-        "markdown-it": "^12.3.2",
+        "markdown-it": "^14.1.0",
         "markdown-it-front-matter": "^0.2.4",
         "morphdom": "^2.6.1",
         "picomatch": "^2.3.1",
@@ -25,7 +25,7 @@
       "devDependencies": {
         "@types/dompurify": "^3.0.5",
         "@types/lodash.throttle": "^4.1.9",
-        "@types/markdown-it": "12.2.3",
+        "@types/markdown-it": "14.1.2",
         "@types/picomatch": "^2.3.0",
         "@types/vscode-notebook-renderer": "^1.60.0",
         "@types/vscode-webview": "^1.57.0",
@@ -194,13 +194,14 @@
       }
     },
     "node_modules/@types/markdown-it": {
-      "version": "12.2.3",
-      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
-      "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+      "version": "14.1.2",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
+      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/linkify-it": "*",
-        "@types/mdurl": "*"
+        "@types/linkify-it": "^5",
+        "@types/mdurl": "^2"
       }
     },
     "node_modules/@types/mdurl": {
@@ -434,11 +435,12 @@
       }
     },
     "node_modules/linkify-it": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
-      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "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==",
+      "license": "MIT",
       "dependencies": {
-        "uc.micro": "^1.0.1"
+        "uc.micro": "^2.0.0"
       }
     },
     "node_modules/lodash.throttle": {
@@ -459,18 +461,20 @@
       }
     },
     "node_modules/markdown-it": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
-      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
+      "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1",
-        "entities": "~2.1.0",
-        "linkify-it": "^3.0.1",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
+        "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.js"
+        "markdown-it": "bin/markdown-it.mjs"
       }
     },
     "node_modules/markdown-it-front-matter": {
@@ -478,18 +482,11 @@
       "resolved": "https://registry.npmjs.org/markdown-it-front-matter/-/markdown-it-front-matter-0.2.4.tgz",
       "integrity": "sha512-25GUs0yjS2hLl8zAemVndeEzThB1p42yxuDEKbd4JlL3jiz+jsm6e56Ya8B0VREOkNxLYB4TTwaoPJ3ElMmW+w=="
     },
-    "node_modules/markdown-it/node_modules/entities": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
     "node_modules/mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+      "license": "MIT"
     },
     "node_modules/minimatch": {
       "version": "3.1.2",
@@ -546,6 +543,15 @@
         "node": ">=6"
       }
     },
+    "node_modules/punycode.js": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
+      "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/semver": {
       "version": "7.5.4",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
@@ -561,9 +567,10 @@
       }
     },
     "node_modules/uc.micro": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+      "license": "MIT"
     },
     "node_modules/vscode-jsonrpc": {
       "version": "8.0.2",
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 52aaba391a34..0f59f3b98fea 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -766,7 +766,7 @@
     "@vscode/extension-telemetry": "^0.9.8",
     "dompurify": "^3.2.4",
     "highlight.js": "^11.8.0",
-    "markdown-it": "^12.3.2",
+    "markdown-it": "^14.1.0",
     "markdown-it-front-matter": "^0.2.4",
     "morphdom": "^2.6.1",
     "picomatch": "^2.3.1",
@@ -779,7 +779,7 @@
   "devDependencies": {
     "@types/dompurify": "^3.0.5",
     "@types/lodash.throttle": "^4.1.9",
-    "@types/markdown-it": "12.2.3",
+    "@types/markdown-it": "14.1.2",
     "@types/picomatch": "^2.3.0",
     "@types/vscode-notebook-renderer": "^1.60.0",
     "@types/vscode-webview": "^1.57.0",

From 791357b32400e576b9fe6d7215127534770f6657 Mon Sep 17 00:00:00 2001
From: Christopher Birnie-Browne
 <153604499+Git-Hub-Chris@users.noreply.github.com>
Date: Tue, 23 Dec 2025 19:37:04 -0700
Subject: [PATCH 1286/1815] Potential fix for code scanning alert no. 109:
 Client-side cross-site scripting

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Signed-off-by: Christopher Birnie-Browne <153604499+Git-Hub-Chris@users.noreply.github.com>
---
 .../notebook/browser/view/renderers/webviewPreloads.ts     | 7 +++++++
 1 file changed, 7 insertions(+)

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 092a3bfe7b17..f13d9a5e510b 100644
--- a/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
+++ b/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
@@ -2464,6 +2464,13 @@ async function webviewPreloads(ctx: PreloadContext) {
 	// --- Begin DOMPurify Minimal Implementation ---
 	// NOTE: In a production scenario, the full DOMPurify min.js should be included here or loaded up-front wherever allowed. This is a minimal, very basic, example for the notebook webview context.
 	function sanitizeHTML(dirty) {
+		// Ensure we only ever process strings to avoid unexpected DOM parsing behavior
+		if (dirty === undefined || dirty === null) {
+			dirty = '';
+		} else if (typeof dirty !== 'string') {
+			dirty = String(dirty);
+		}
+
 		const template = document.createElement('template');
 		template.innerHTML = dirty;
 

From 09905d9adebae9d07b42da6bbaa091a0757f461f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Dec 2025 09:13:39 +0000
Subject: [PATCH 1287/1815] Bump @types/randombytes in
 /extensions/microsoft-authentication

Bumps [@types/randombytes](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/randombytes) from 2.0.0 to 2.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/randombytes)

---
updated-dependencies:
- dependency-name: "@types/randombytes"
  dependency-version: 2.0.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/microsoft-authentication/package-lock.json | 9 +++++----
 extensions/microsoft-authentication/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 26638e92bb0d..328b825ef0aa 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -19,7 +19,7 @@
       "devDependencies": {
         "@types/node": "20.x",
         "@types/node-fetch": "^2.5.7",
-        "@types/randombytes": "^2.0.0",
+        "@types/randombytes": "^2.0.3",
         "@types/sha.js": "^2.4.0",
         "@types/uuid": "11.0.0"
       },
@@ -221,10 +221,11 @@
       }
     },
     "node_modules/@types/randombytes": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/randombytes/-/randombytes-2.0.0.tgz",
-      "integrity": "sha512-bz8PhAVlwN72vqefzxa14DKNT8jK/mV66CSjwdVQM/k3Th3EPKfUtdMniwZgMedQTFuywAsfjnZsg+pEnltaMA==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/randombytes/-/randombytes-2.0.3.tgz",
+      "integrity": "sha512-+NRgihTfuURllWCiIAhm1wsJqzsocnqXM77V/CalsdJIYSRGEHMnritxh+6EsBklshC+clo1KgnN14qgSGeQdw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 24ee5adea599..402c649718cf 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -133,7 +133,7 @@
   "devDependencies": {
     "@types/node": "20.x",
     "@types/node-fetch": "^2.5.7",
-    "@types/randombytes": "^2.0.0",
+    "@types/randombytes": "^2.0.3",
     "@types/sha.js": "^2.4.0",
     "@types/uuid": "11.0.0"
   },

From 9448f8d5c8d92c838d81354bce202460049087c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Dec 2025 09:13:41 +0000
Subject: [PATCH 1288/1815] Bump @vscode/extension-telemetry in
 /extensions/microsoft-authentication

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 0.9.8 to 1.2.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v0.9.8...v1.2.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.2.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 94 +++++++++----------
 .../microsoft-authentication/package.json     |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 26638e92bb0d..7026ce43f541 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -12,7 +12,7 @@
         "@azure/ms-rest-azure-env": "^2.0.0",
         "@azure/msal-node": "^2.16.2",
         "@azure/msal-node-extensions": "^1.5.0",
-        "@vscode/extension-telemetry": "^0.9.8",
+        "@vscode/extension-telemetry": "^1.2.0",
         "keytar": "file:./packageMocks/keytar",
         "vscode-tas-client": "^0.1.84"
       },
@@ -78,73 +78,73 @@
       "license": "MIT"
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
-      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
+      "integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
-      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.10.tgz",
+      "integrity": "sha512-VSLjc9cT+Y+eTiSfYltJHJCejn8oYr0E6Pq2BMhOEO7F6IyLGYIxzKKvo78ze9x+iHX7KPTATcZ+PFgjGXuNqg==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.3.4",
+        "@microsoft/1ds-core-js": "4.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
-      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.10.tgz",
+      "integrity": "sha512-iolFLz1ocWAzIQqHIEjjov3gNTPkgFQ4ArHnBcJEYoffOGWlJt6copaevS5YPI5rHzmbySsengZ8cLJJBBrXzQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
-      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.10.tgz",
+      "integrity": "sha512-RVIenPIvNgZCbjJdALvLM4rNHgAFuHI7faFzHCgnI6S2WCUNGHeXlQTs9EUUrL+n2TPp9/cd0KKMILU5VVyYiA==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
-      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.10.tgz",
+      "integrity": "sha512-5yKeyassZTq2l+SAO4npu6LPnbS++UD+M+Ghjm9uRzoBwD8tumFx0/F8AkSVqbniSREd+ztH/2q2foewa2RZyg==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -160,18 +160,18 @@
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
-      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.10.tgz",
+      "integrity": "sha512-AZib5DAT3NU0VT0nLWEwXrnoMDDgZ/5S4dso01CNU5ELNxLdg+1fvchstlVdMy4FrAnxzs8Wf/GIQNFYOVgpAw==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.3.4",
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.10",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -196,9 +196,9 @@
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
-      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
+      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
       "license": "MIT"
     },
     "node_modules/@types/node": {
@@ -250,14 +250,14 @@
       }
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.8",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
-      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
+      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.3.4",
-        "@microsoft/1ds-post-js": "^4.3.4",
-        "@microsoft/applicationinsights-web-basic": "^3.3.4"
+        "@microsoft/1ds-core-js": "^4.3.10",
+        "@microsoft/1ds-post-js": "^4.3.10",
+        "@microsoft/applicationinsights-web-basic": "^3.3.10"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 24ee5adea599..8eec55b04cab 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -141,7 +141,7 @@
     "@azure/ms-rest-azure-env": "^2.0.0",
     "@azure/msal-node": "^2.16.2",
     "@azure/msal-node-extensions": "^1.5.0",
-    "@vscode/extension-telemetry": "^0.9.8",
+    "@vscode/extension-telemetry": "^1.2.0",
     "keytar": "file:./packageMocks/keytar",
     "vscode-tas-client": "^0.1.84"
   },

From 2ea6794f7b799d07d293de4b3d6844f3d51a4042 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Dec 2025 09:27:33 +0000
Subject: [PATCH 1289/1815] Bump @types/node from 20.11.24 to 25.0.3 in
 /extensions/merge-conflict

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/merge-conflict/package-lock.json | 20 +++++++++++---------
 extensions/merge-conflict/package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/merge-conflict/package-lock.json b/extensions/merge-conflict/package-lock.json
index c9811471ebac..ee393f4148a2 100644
--- a/extensions/merge-conflict/package-lock.json
+++ b/extensions/merge-conflict/package-lock.json
@@ -12,7 +12,7 @@
         "@vscode/extension-telemetry": "^1.2.0"
       },
       "devDependencies": {
-        "@types/node": "20.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "vscode": "^1.5.0"
@@ -143,12 +143,13 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@vscode/extension-telemetry": {
@@ -166,10 +167,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     }
   }
 }
diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
index 42544730e1c7..c4273cd805b6 100644
--- a/extensions/merge-conflict/package.json
+++ b/extensions/merge-conflict/package.json
@@ -169,7 +169,7 @@
     "@vscode/extension-telemetry": "^1.2.0"
   },
   "devDependencies": {
-    "@types/node": "20.x"
+    "@types/node": "25.x"
   },
   "repository": {
     "type": "git",

From 35589c439ec991f272a333eecdf2af3d604b0c64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Dec 2025 09:38:30 +0000
Subject: [PATCH 1290/1815] Bump @types/node in
 /extensions/microsoft-authentication

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 24.10.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.10.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 20 ++++++++++---------
 .../microsoft-authentication/package.json     |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 7026ce43f541..005fbcdd8113 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -17,7 +17,7 @@
         "vscode-tas-client": "^0.1.84"
       },
       "devDependencies": {
-        "@types/node": "20.x",
+        "@types/node": "25.x",
         "@types/node-fetch": "^2.5.7",
         "@types/randombytes": "^2.0.0",
         "@types/sha.js": "^2.4.0",
@@ -202,12 +202,13 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@types/node-fetch": {
@@ -663,10 +664,11 @@
       "integrity": "sha512-V+uqV66BOQnWxvI6HjDnE4VkInmYZUQ4dgB7gzaDyFyFSK1i1nF/j7DpS9UbQAgV9NaF1XpcyuavnM1qOeiEIg=="
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/uuid": {
       "version": "8.3.2",
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 8eec55b04cab..d570083c1c86 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -131,7 +131,7 @@
     "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
   },
   "devDependencies": {
-    "@types/node": "20.x",
+    "@types/node": "25.x",
     "@types/node-fetch": "^2.5.7",
     "@types/randombytes": "^2.0.0",
     "@types/sha.js": "^2.4.0",

From 543709d36b42e01d9db5b28566e2e7a918292a9d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Dec 2025 10:08:30 +0000
Subject: [PATCH 1291/1815] Bump @types/node-fetch in
 /extensions/microsoft-authentication

Bumps [@types/node-fetch](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node-fetch) from 2.5.7 to 2.6.13.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node-fetch)

---
updated-dependencies:
- dependency-name: "@types/node-fetch"
  dependency-version: 2.6.13
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 28 +++++++++++--------
 .../microsoft-authentication/package.json     |  2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 2acf0d234067..61873e3f934d 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -18,7 +18,7 @@
       },
       "devDependencies": {
         "@types/node": "25.x",
-        "@types/node-fetch": "^2.5.7",
+        "@types/node-fetch": "^2.6.13",
         "@types/randombytes": "^2.0.3",
         "@types/sha.js": "^2.4.0",
         "@types/uuid": "11.0.0"
@@ -212,13 +212,14 @@
       }
     },
     "node_modules/@types/node-fetch": {
-      "version": "2.5.7",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz",
-      "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==",
+      "version": "2.6.13",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.13.tgz",
+      "integrity": "sha512-QGpRVpzSaUs30JBSGPjOg4Uveu384erbHBoT1zeONvyCfwQxIkUshLAOqN/k9EjGviPRmWTTe6aH2qySWKTVSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
-        "form-data": "^3.0.0"
+        "form-data": "^4.0.4"
       }
     },
     "node_modules/@types/randombytes": {
@@ -268,8 +269,9 @@
     "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
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/buffer-equal-constant-time": {
       "version": "1.0.1",
@@ -296,6 +298,7 @@
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -306,8 +309,9 @@
     "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==",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -386,9 +390,9 @@
       }
     },
     "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==",
+      "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": {
@@ -396,7 +400,7 @@
         "combined-stream": "^1.0.8",
         "es-set-tostringtag": "^2.1.0",
         "hasown": "^2.0.2",
-        "mime-types": "^2.1.35"
+        "mime-types": "^2.1.12"
       },
       "engines": {
         "node": ">= 6"
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 6319c66488f9..48123e1fe014 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -132,7 +132,7 @@
   },
   "devDependencies": {
     "@types/node": "25.x",
-    "@types/node-fetch": "^2.5.7",
+    "@types/node-fetch": "^2.6.13",
     "@types/randombytes": "^2.0.3",
     "@types/sha.js": "^2.4.0",
     "@types/uuid": "11.0.0"

From 376543c965d58005a111619b86a3f93c40e8bdf8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Dec 2025 12:20:22 +0000
Subject: [PATCH 1292/1815] Bump @azure/msal-node-extensions in
 /extensions/microsoft-authentication

Bumps [@azure/msal-node-extensions](https://github.com/AzureAD/microsoft-authentication-library-for-js) from 1.5.0 to 1.5.26.
- [Release notes](https://github.com/AzureAD/microsoft-authentication-library-for-js/releases)
- [Commits](https://github.com/AzureAD/microsoft-authentication-library-for-js/compare/msal-node-v1.5.0...msal-node-extensions-v1.5.26)

---
updated-dependencies:
- dependency-name: "@azure/msal-node-extensions"
  dependency-version: 1.5.26
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 27 ++++++++++++-------
 .../microsoft-authentication/package.json     |  2 +-
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 2acf0d234067..448e74c8977b 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@azure/ms-rest-azure-env": "^2.0.0",
         "@azure/msal-node": "^2.16.2",
-        "@azure/msal-node-extensions": "^1.5.0",
+        "@azure/msal-node-extensions": "^1.5.26",
         "@vscode/extension-telemetry": "^1.2.0",
         "keytar": "file:./packageMocks/keytar",
         "vscode-tas-client": "^0.1.84"
@@ -56,24 +56,33 @@
       }
     },
     "node_modules/@azure/msal-node-extensions": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node-extensions/-/msal-node-extensions-1.5.0.tgz",
-      "integrity": "sha512-UfEyh2xmJHKH64zPS/SbN1bd9adV4ZWGp1j2OSwIuhVraqpUXyXZ1LpDpiUqg/peTgLLtx20qrHOzYT0kKzmxQ==",
+      "version": "1.5.26",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node-extensions/-/msal-node-extensions-1.5.26.tgz",
+      "integrity": "sha512-ncPY7e4C4qDcvSd3qDW8JL6NTo/pf/hjl9Sj+js0PcmvT9FA2gmu3TS6s16OHNmKOpHfOIT4pHT+reSjV8iZbg==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@azure/msal-common": "14.16.0",
-        "@azure/msal-node-runtime": "^0.17.1",
+        "@azure/msal-common": "15.13.3",
+        "@azure/msal-node-runtime": "^0.20.0",
         "keytar": "^7.8.0"
       },
       "engines": {
         "node": ">=16"
       }
     },
+    "node_modules/@azure/msal-node-extensions/node_modules/@azure/msal-common": {
+      "version": "15.13.3",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.13.3.tgz",
+      "integrity": "sha512-shSDU7Ioecya+Aob5xliW9IGq1Ui8y4EVSdWGyI1Gbm4Vg61WpP95LuzcY214/wEjSn6w4PZYD4/iVldErHayQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/@azure/msal-node-runtime": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node-runtime/-/msal-node-runtime-0.17.1.tgz",
-      "integrity": "sha512-qAfTg+iGJsg+XvD9nmknI63+XuoX32oT+SX4wJdFz7CS6ETVpSHoroHVaUmsTU1H7H0+q1/ZkP988gzPRMYRsg==",
+      "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"
     },
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 6319c66488f9..448e8fff6a50 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -140,7 +140,7 @@
   "dependencies": {
     "@azure/ms-rest-azure-env": "^2.0.0",
     "@azure/msal-node": "^2.16.2",
-    "@azure/msal-node-extensions": "^1.5.0",
+    "@azure/msal-node-extensions": "^1.5.26",
     "@vscode/extension-telemetry": "^1.2.0",
     "keytar": "file:./packageMocks/keytar",
     "vscode-tas-client": "^0.1.84"

From cda2a105ae260d0420e3c3bf3a1921db62b52774 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Dec 2025 12:20:33 +0000
Subject: [PATCH 1293/1815] Bump @azure/msal-node in
 /extensions/microsoft-authentication

Bumps [@azure/msal-node](https://github.com/AzureAD/microsoft-authentication-library-for-js) from 2.16.2 to 3.8.4.
- [Release notes](https://github.com/AzureAD/microsoft-authentication-library-for-js/releases)
- [Commits](https://github.com/AzureAD/microsoft-authentication-library-for-js/compare/msal-node-v2.16.2...msal-node-v3.8.4)

---
updated-dependencies:
- dependency-name: "@azure/msal-node"
  dependency-version: 3.8.4
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 19 ++++++++++++++-----
 .../microsoft-authentication/package.json     |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 2acf0d234067..ca69072138f7 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@azure/ms-rest-azure-env": "^2.0.0",
-        "@azure/msal-node": "^2.16.2",
+        "@azure/msal-node": "^3.8.4",
         "@azure/msal-node-extensions": "^1.5.0",
         "@vscode/extension-telemetry": "^1.2.0",
         "keytar": "file:./packageMocks/keytar",
@@ -42,12 +42,12 @@
       }
     },
     "node_modules/@azure/msal-node": {
-      "version": "2.16.2",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.16.2.tgz",
-      "integrity": "sha512-An7l1hEr0w1HMMh1LU+rtDtqL7/jw74ORlc9Wnh06v7TU/xpG39/Zdr1ZJu3QpjUfKJ+E0/OXMW8DRSWTlh7qQ==",
+      "version": "3.8.4",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.4.tgz",
+      "integrity": "sha512-lvuAwsDpPDE/jSuVQOBMpLbXuVuLsPNRwWCyK3/6bPlBk0fGWegqoZ0qjZclMWyQ2JNvIY3vHY7hoFmFmFQcOw==",
       "license": "MIT",
       "dependencies": {
-        "@azure/msal-common": "14.16.0",
+        "@azure/msal-common": "15.13.3",
         "jsonwebtoken": "^9.0.0",
         "uuid": "^8.3.0"
       },
@@ -77,6 +77,15 @@
       "hasInstallScript": true,
       "license": "MIT"
     },
+    "node_modules/@azure/msal-node/node_modules/@azure/msal-common": {
+      "version": "15.13.3",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.13.3.tgz",
+      "integrity": "sha512-shSDU7Ioecya+Aob5xliW9IGq1Ui8y4EVSdWGyI1Gbm4Vg61WpP95LuzcY214/wEjSn6w4PZYD4/iVldErHayQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/@microsoft/1ds-core-js": {
       "version": "4.3.10",
       "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 6319c66488f9..07f9b9c857bf 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -139,7 +139,7 @@
   },
   "dependencies": {
     "@azure/ms-rest-azure-env": "^2.0.0",
-    "@azure/msal-node": "^2.16.2",
+    "@azure/msal-node": "^3.8.4",
     "@azure/msal-node-extensions": "^1.5.0",
     "@vscode/extension-telemetry": "^1.2.0",
     "keytar": "file:./packageMocks/keytar",

From 5c8e5e377bbefff15c23b07e711fec4ca06a4a6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Dec 2025 12:20:43 +0000
Subject: [PATCH 1294/1815] Bump dompurify and @types/dompurify

Bumps [dompurify](https://github.com/cure53/DOMPurify) and [@types/dompurify](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/dompurify). These dependencies needed to be updated together.

Updates `dompurify` from 3.2.4 to 3.3.1
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](https://github.com/cure53/DOMPurify/compare/3.2.4...3.3.1)

Updates `@types/dompurify` from 3.0.5 to 3.2.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/dompurify)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-version: 3.3.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: "@types/dompurify"
  dependency-version: 3.2.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 65 ++++++++++++-------
 .../markdown-language-features/package.json   |  4 +-
 2 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index a4106ab44cd2..ebe0878c82ed 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@vscode/extension-telemetry": "^0.9.8",
-        "dompurify": "^3.2.4",
+        "dompurify": "^3.3.1",
         "highlight.js": "^11.8.0",
         "markdown-it": "^14.1.0",
         "markdown-it-front-matter": "^0.2.4",
@@ -23,7 +23,7 @@
         "vscode-uri": "^3.0.3"
       },
       "devDependencies": {
-        "@types/dompurify": "^3.0.5",
+        "@types/dompurify": "^3.2.0",
         "@types/lodash.throttle": "^4.1.9",
         "@types/markdown-it": "14.1.2",
         "@types/picomatch": "^2.3.0",
@@ -163,12 +163,14 @@
       "license": "MIT"
     },
     "node_modules/@types/dompurify": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.0.5.tgz",
-      "integrity": "sha512-1Wg0g3BtQF7sSb27fJQAKck1HECM6zV1EB66j8JH9i3LCjYabJa0FSdiSgsD5K/RbrsR0SiraKacLB+T8ZVYAg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.2.0.tgz",
+      "integrity": "sha512-Fgg31wv9QbLDA0SpTOXO3MaxySc4DKGLi8sna4/Utjo4r3ZRPdCt4UQee8BWr+Q5z21yifghREPJGYaEOEIACg==",
+      "deprecated": "This is a stub types definition. dompurify provides its own type definitions, so you do not need this installed.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/trusted-types": "*"
+        "dompurify": "*"
       }
     },
     "node_modules/@types/linkify-it": {
@@ -220,8 +222,8 @@
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
       "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
-      "devOptional": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
     },
     "node_modules/@types/vscode-notebook-renderer": {
       "version": "1.60.0",
@@ -364,9 +366,9 @@
       }
     },
     "node_modules/dompurify": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz",
-      "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.3.1.tgz",
+      "integrity": "sha512-qkdCKzLNtrgPFP1Vo+98FRzJnBRGe4ffyCea9IwHB1fyxPOeNTHpLKYGd4Uk9xvNoH0ZoOjwZxNptyMwqrId1Q==",
       "license": "(MPL-2.0 OR Apache-2.0)",
       "optionalDependencies": {
         "@types/trusted-types": "^2.0.7"
@@ -578,19 +580,44 @@
       }
     },
     "node_modules/vscode-languageclient": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-9.0.1.tgz",
-      "integrity": "sha512-JZiimVdvimEuHh5olxhxkht09m3JzUGwggb5eRUkzzJhZ2KjCN0nh55VfiED9oez9DyF8/fz1g1iBV3h+0Z2EA==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.1.0.tgz",
+      "integrity": "sha512-GL4QdbYUF/XxQlAsvYWZRV3V34kOkpRlvV60/72ghHfsYFnS/v2MANZ9P6sHmxFcZKOse8O+L9G7Czg0NUWing==",
       "license": "MIT",
       "dependencies": {
         "minimatch": "^5.1.0",
         "semver": "^7.3.7",
-        "vscode-languageserver-protocol": "3.17.5"
+        "vscode-languageserver-protocol": "3.17.3"
       },
       "engines": {
-        "vscode": "^1.82.0"
+        "vscode": "^1.67.0"
+      }
+    },
+    "node_modules/vscode-languageclient/node_modules/vscode-jsonrpc": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz",
+      "integrity": "sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/vscode-languageclient/node_modules/vscode-languageserver-protocol": {
+      "version": "3.17.3",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz",
+      "integrity": "sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==",
+      "license": "MIT",
+      "dependencies": {
+        "vscode-jsonrpc": "8.1.0",
+        "vscode-languageserver-types": "3.17.3"
       }
     },
+    "node_modules/vscode-languageclient/node_modules/vscode-languageserver-types": {
+      "version": "3.17.3",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz",
+      "integrity": "sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==",
+      "license": "MIT"
+    },
     "node_modules/vscode-languageserver": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.1.0.tgz",
@@ -612,12 +639,6 @@
         "vscode-languageserver-types": "3.17.5"
       }
     },
-    "node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": {
-      "version": "3.17.2",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz",
-      "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==",
-      "license": "MIT"
-    },
     "node_modules/vscode-languageserver-textdocument": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index ce9f446f94b9..ad16863cdadc 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -764,7 +764,7 @@
   },
   "dependencies": {
     "@vscode/extension-telemetry": "^0.9.8",
-    "dompurify": "^3.2.4",
+    "dompurify": "^3.3.1",
     "highlight.js": "^11.8.0",
     "markdown-it": "^14.1.0",
     "markdown-it-front-matter": "^0.2.4",
@@ -777,7 +777,7 @@
     "vscode-uri": "^3.0.3"
   },
   "devDependencies": {
-    "@types/dompurify": "^3.0.5",
+    "@types/dompurify": "^3.2.0",
     "@types/lodash.throttle": "^4.1.9",
     "@types/markdown-it": "14.1.2",
     "@types/picomatch": "^2.3.0",

From 4c4e8af504235524b37e04914c863abea2529e32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Dec 2025 12:20:48 +0000
Subject: [PATCH 1295/1815] Bump highlight.js in
 /extensions/markdown-language-features

Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 11.8.0 to 11.11.1.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/main/CHANGES.md)
- [Commits](https://github.com/highlightjs/highlight.js/compare/11.8.0...11.11.1)

---
updated-dependencies:
- dependency-name: highlight.js
  dependency-version: 11.11.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 50 +++++++++++++------
 .../markdown-language-features/package.json   |  2 +-
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index a4106ab44cd2..877774d578aa 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@vscode/extension-telemetry": "^0.9.8",
         "dompurify": "^3.2.4",
-        "highlight.js": "^11.8.0",
+        "highlight.js": "^11.11.1",
         "markdown-it": "^14.1.0",
         "markdown-it-front-matter": "^0.2.4",
         "morphdom": "^2.6.1",
@@ -405,9 +405,10 @@
       }
     },
     "node_modules/highlight.js": {
-      "version": "11.8.0",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.8.0.tgz",
-      "integrity": "sha512-MedQhoqVdr0U6SSnWPzfiadUcDHfN/Wzq25AkXiQv9oiOO/sG0S7XkvpFIqWBl9Yq1UYyYOOVORs5UW2XlPyzg==",
+      "version": "11.11.1",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.11.1.tgz",
+      "integrity": "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=12.0.0"
       }
@@ -578,19 +579,44 @@
       }
     },
     "node_modules/vscode-languageclient": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-9.0.1.tgz",
-      "integrity": "sha512-JZiimVdvimEuHh5olxhxkht09m3JzUGwggb5eRUkzzJhZ2KjCN0nh55VfiED9oez9DyF8/fz1g1iBV3h+0Z2EA==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.1.0.tgz",
+      "integrity": "sha512-GL4QdbYUF/XxQlAsvYWZRV3V34kOkpRlvV60/72ghHfsYFnS/v2MANZ9P6sHmxFcZKOse8O+L9G7Czg0NUWing==",
       "license": "MIT",
       "dependencies": {
         "minimatch": "^5.1.0",
         "semver": "^7.3.7",
-        "vscode-languageserver-protocol": "3.17.5"
+        "vscode-languageserver-protocol": "3.17.3"
       },
       "engines": {
-        "vscode": "^1.82.0"
+        "vscode": "^1.67.0"
       }
     },
+    "node_modules/vscode-languageclient/node_modules/vscode-jsonrpc": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz",
+      "integrity": "sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/vscode-languageclient/node_modules/vscode-languageserver-protocol": {
+      "version": "3.17.3",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz",
+      "integrity": "sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==",
+      "license": "MIT",
+      "dependencies": {
+        "vscode-jsonrpc": "8.1.0",
+        "vscode-languageserver-types": "3.17.3"
+      }
+    },
+    "node_modules/vscode-languageclient/node_modules/vscode-languageserver-types": {
+      "version": "3.17.3",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz",
+      "integrity": "sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==",
+      "license": "MIT"
+    },
     "node_modules/vscode-languageserver": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.1.0.tgz",
@@ -612,12 +638,6 @@
         "vscode-languageserver-types": "3.17.5"
       }
     },
-    "node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": {
-      "version": "3.17.2",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz",
-      "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==",
-      "license": "MIT"
-    },
     "node_modules/vscode-languageserver-textdocument": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index ce9f446f94b9..0fd6d2eb4be6 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -765,7 +765,7 @@
   "dependencies": {
     "@vscode/extension-telemetry": "^0.9.8",
     "dompurify": "^3.2.4",
-    "highlight.js": "^11.8.0",
+    "highlight.js": "^11.11.1",
     "markdown-it": "^14.1.0",
     "markdown-it-front-matter": "^0.2.4",
     "morphdom": "^2.6.1",

From 3ea6f95089c51554008536952ca975fe615364be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Dec 2025 12:11:52 +0000
Subject: [PATCH 1296/1815] Bump request-light from 0.7.0 to 0.8.0 in
 /extensions/npm

Bumps [request-light](https://github.com/microsoft/node-request-light) from 0.7.0 to 0.8.0.
- [Release notes](https://github.com/microsoft/node-request-light/releases)
- [Changelog](https://github.com/microsoft/node-request-light/blob/main/CHANGELOG.md)
- [Commits](https://github.com/microsoft/node-request-light/commits/v0.8.0)

---
updated-dependencies:
- dependency-name: request-light
  dependency-version: 0.8.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/npm/package-lock.json | 9 +++++----
 extensions/npm/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index d929353cc299..aef0c88a15cc 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -13,7 +13,7 @@
         "find-yarn-workspace-root": "^2.0.0",
         "jsonc-parser": "^3.3.1",
         "minimatch": "^5.1.6",
-        "request-light": "^0.7.0",
+        "request-light": "^0.8.0",
         "vscode-uri": "^3.0.8",
         "which": "^4.0.0",
         "which-pm": "^3.0.1"
@@ -276,9 +276,10 @@
       }
     },
     "node_modules/request-light": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.7.0.tgz",
-      "integrity": "sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q=="
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.8.0.tgz",
+      "integrity": "sha512-bH6E4PMmsEXYrLX6Kr1vu+xI3HproB1vECAwaPSJeroLE1kpWE3HR27uB4icx+6YORu1ajqBJXxuedv8ZQg5Lw==",
+      "license": "MIT"
     },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index 3b2d0569edb3..d3a2e9211298 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -25,7 +25,7 @@
     "find-yarn-workspace-root": "^2.0.0",
     "jsonc-parser": "^3.3.1",
     "minimatch": "^5.1.6",
-    "request-light": "^0.7.0",
+    "request-light": "^0.8.0",
     "which": "^4.0.0",
     "which-pm": "^3.0.1",
     "vscode-uri": "^3.0.8"

From 8aebef74450d8d5c7db8d15dd0a11291e0dba979 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Dec 2025 12:11:54 +0000
Subject: [PATCH 1297/1815] Bump minimatch from 5.1.6 to 10.1.1 in
 /extensions/npm

Bumps [minimatch](https://github.com/isaacs/minimatch) from 5.1.6 to 10.1.1.
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/minimatch/compare/v5.1.6...v10.1.1)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-version: 10.1.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/npm/package-lock.json | 51 +++++++++++++++++++-------------
 extensions/npm/package.json      |  2 +-
 2 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index d929353cc299..4435c0f7df20 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -12,7 +12,7 @@
         "find-up": "^5.0.0",
         "find-yarn-workspace-root": "^2.0.0",
         "jsonc-parser": "^3.3.1",
-        "minimatch": "^5.1.6",
+        "minimatch": "^10.1.1",
         "request-light": "^0.7.0",
         "vscode-uri": "^3.0.8",
         "which": "^4.0.0",
@@ -27,6 +27,27 @@
         "vscode": "0.10.x"
       }
     },
+    "node_modules/@isaacs/balanced-match": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+      "license": "MIT",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/brace-expansion": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "license": "MIT",
+      "dependencies": {
+        "@isaacs/balanced-match": "^4.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/@types/minimatch": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
@@ -56,20 +77,6 @@
         "sprintf-js": "~1.0.2"
       }
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg=="
-    },
-    "node_modules/brace-expansion": {
-      "version": "2.0.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/braces": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
@@ -209,14 +216,18 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
+      "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "@isaacs/brace-expansion": "^5.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/p-limit": {
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index 3b2d0569edb3..a656817505fc 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -24,7 +24,7 @@
     "find-up": "^5.0.0",
     "find-yarn-workspace-root": "^2.0.0",
     "jsonc-parser": "^3.3.1",
-    "minimatch": "^5.1.6",
+    "minimatch": "^10.1.1",
     "request-light": "^0.7.0",
     "which": "^4.0.0",
     "which-pm": "^3.0.1",

From 2badb014b0b74683ea6fed7c17c216ab4de079aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Dec 2025 04:16:23 +0000
Subject: [PATCH 1298/1815] Bump @types/sha.js in
 /extensions/microsoft-authentication

Bumps [@types/sha.js](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/sha.js) from 2.4.0 to 2.4.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/sha.js)

---
updated-dependencies:
- dependency-name: "@types/sha.js"
  dependency-version: 2.4.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/microsoft-authentication/package-lock.json | 9 +++++----
 extensions/microsoft-authentication/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 61873e3f934d..3b537a155289 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -20,7 +20,7 @@
         "@types/node": "25.x",
         "@types/node-fetch": "^2.6.13",
         "@types/randombytes": "^2.0.3",
-        "@types/sha.js": "^2.4.0",
+        "@types/sha.js": "^2.4.4",
         "@types/uuid": "11.0.0"
       },
       "engines": {
@@ -233,10 +233,11 @@
       }
     },
     "node_modules/@types/sha.js": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/sha.js/-/sha.js-2.4.0.tgz",
-      "integrity": "sha512-amxKgPy6WJTKuw8mpUwjX2BSxuBtBmZfRwIUDIuPJKNwGN8CWDli8JTg5ONTWOtcTkHIstvT7oAhhYXqEjStHQ==",
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/@types/sha.js/-/sha.js-2.4.4.tgz",
+      "integrity": "sha512-Qukd+D6S2Hm0wLVt2Vh+/eWBIoUt+wF8jWjBsG4F8EFQRwKtYvtXCPcNl2OEUQ1R+eTr3xuSaBYUyM3WD1x/Qw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 48123e1fe014..79115499cec7 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -134,7 +134,7 @@
     "@types/node": "25.x",
     "@types/node-fetch": "^2.6.13",
     "@types/randombytes": "^2.0.3",
-    "@types/sha.js": "^2.4.0",
+    "@types/sha.js": "^2.4.4",
     "@types/uuid": "11.0.0"
   },
   "dependencies": {

From 7ead00926d145fc9efaebdf9d3de8938e1e6dbc5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Dec 2025 06:27:13 +0000
Subject: [PATCH 1299/1815] Bump vscode-uri from 3.0.8 to 3.1.0 in
 /extensions/npm

Bumps [vscode-uri](https://github.com/microsoft/vscode-uri) from 3.0.8 to 3.1.0.
- [Release notes](https://github.com/microsoft/vscode-uri/releases)
- [Commits](https://github.com/microsoft/vscode-uri/compare/v3.0.8...v3.1.0)

---
updated-dependencies:
- dependency-name: vscode-uri
  dependency-version: 3.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/npm/package-lock.json | 9 +++++----
 extensions/npm/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index 4435c0f7df20..a7221e23ce91 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -14,7 +14,7 @@
         "jsonc-parser": "^3.3.1",
         "minimatch": "^10.1.1",
         "request-light": "^0.7.0",
-        "vscode-uri": "^3.0.8",
+        "vscode-uri": "^3.1.0",
         "which": "^4.0.0",
         "which-pm": "^3.0.1"
       },
@@ -322,9 +322,10 @@
       "dev": true
     },
     "node_modules/vscode-uri": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
-      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="
+      "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==",
+      "license": "MIT"
     },
     "node_modules/which": {
       "version": "4.0.0",
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index a656817505fc..2ffb4dfb5a95 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -28,7 +28,7 @@
     "request-light": "^0.7.0",
     "which": "^4.0.0",
     "which-pm": "^3.0.1",
-    "vscode-uri": "^3.0.8"
+    "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
     "@types/minimatch": "^5.1.2",

From 8be1db167deb0c97161123c38e8d2b4941a1d488 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Dec 2025 07:00:37 +0000
Subject: [PATCH 1300/1815] Bump @types/node in
 /extensions/php-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 24.10.1 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/php-language-features/package-lock.json | 8 ++++----
 extensions/php-language-features/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/php-language-features/package-lock.json b/extensions/php-language-features/package-lock.json
index cf17a4b9807a..fa876d6b2e01 100644
--- a/extensions/php-language-features/package-lock.json
+++ b/extensions/php-language-features/package-lock.json
@@ -12,7 +12,7 @@
         "which": "^6.0.0"
       },
       "devDependencies": {
-        "@types/node": "24.x",
+        "@types/node": "25.x",
         "@types/which": "^2.0.0"
       },
       "engines": {
@@ -20,9 +20,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "24.10.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
-      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/extensions/php-language-features/package.json b/extensions/php-language-features/package.json
index df521b5eb87b..dd5591bbf5c9 100644
--- a/extensions/php-language-features/package.json
+++ b/extensions/php-language-features/package.json
@@ -77,7 +77,7 @@
     "which": "^6.0.0"
   },
   "devDependencies": {
-    "@types/node": "24.x",
+    "@types/node": "25.x",
     "@types/which": "^2.0.0"
   },
   "repository": {

From 573b4b39636cfc23a5942cc599790dcaa552e709 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Dec 2025 12:20:55 +0000
Subject: [PATCH 1301/1815] Bump find-up from 5.0.0 to 8.0.0 in /extensions/npm

Bumps [find-up](https://github.com/sindresorhus/find-up) from 5.0.0 to 8.0.0.
- [Release notes](https://github.com/sindresorhus/find-up/releases)
- [Commits](https://github.com/sindresorhus/find-up/compare/v5.0.0...v8.0.0)

---
updated-dependencies:
- dependency-name: find-up
  dependency-version: 8.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/npm/package-lock.json | 83 ++++++++++++++++++--------------
 extensions/npm/package.json      |  2 +-
 2 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index edb94b31eb04..f2bcf2c2a94e 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.1",
       "license": "MIT",
       "dependencies": {
-        "find-up": "^5.0.0",
+        "find-up": "^8.0.0",
         "find-yarn-workspace-root": "^2.0.0",
         "jsonc-parser": "^3.3.1",
         "minimatch": "^10.1.1",
@@ -112,15 +112,16 @@
       }
     },
     "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==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-8.0.0.tgz",
+      "integrity": "sha512-JGG8pvDi2C+JxidYdIwQDyS/CgcrIdh18cvgxcBge3wSHRQOrooMD3GlFBcmMJAN9M42SAZjDp5zv1dglJjwww==",
+      "license": "MIT",
       "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
+        "locate-path": "^8.0.0",
+        "unicorn-magic": "^0.3.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -189,14 +190,15 @@
       }
     },
     "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==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-8.0.0.tgz",
+      "integrity": "sha512-XT9ewWAC43tiAV7xDAPflMkG0qOPn2QjHqlgX8FOqmWa/rxnyYDulF9T0F7tRy1u+TVTmK/M//6VIOye+2zDXg==",
+      "license": "MIT",
       "dependencies": {
-        "p-locate": "^5.0.0"
+        "p-locate": "^6.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -231,41 +233,35 @@
       }
     },
     "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==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
+      "license": "MIT",
       "dependencies": {
-        "yocto-queue": "^0.1.0"
+        "yocto-queue": "^1.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "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==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+      "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
+      "license": "MIT",
       "dependencies": {
-        "p-limit": "^3.0.2"
+        "p-limit": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
@@ -287,9 +283,9 @@
       }
     },
     "node_modules/request-light": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.8.0.tgz",
-      "integrity": "sha512-bH6E4PMmsEXYrLX6Kr1vu+xI3HproB1vECAwaPSJeroLE1kpWE3HR27uB4icx+6YORu1ajqBJXxuedv8ZQg5Lw==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.7.0.tgz",
+      "integrity": "sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q==",
       "license": "MIT"
     },
     "node_modules/sprintf-js": {
@@ -322,6 +318,18 @@
       "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
       "dev": true
     },
+    "node_modules/unicorn-magic": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz",
+      "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/vscode-uri": {
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
@@ -354,11 +362,12 @@
       }
     },
     "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==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.2.tgz",
+      "integrity": "sha512-4LCcse/U2MHZ63HAJVE+v71o7yOdIe4cZ70Wpf8D/IyjDKYQLV5GD46B+hSTjJsvV5PztjvHoU580EftxjDZFQ==",
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=12.20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index a656817505fc..92883cb14530 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -21,7 +21,7 @@
     "watch": "npx gulp watch-extension:npm"
   },
   "dependencies": {
-    "find-up": "^5.0.0",
+    "find-up": "^8.0.0",
     "find-yarn-workspace-root": "^2.0.0",
     "jsonc-parser": "^3.3.1",
     "minimatch": "^10.1.1",

From f5d7d6ad5d540e9f15de559bee6f1975e1dae6df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Dec 2025 12:21:42 +0000
Subject: [PATCH 1302/1815] Bump jsdom and @types/jsdom in
 /extensions/notebook-renderers

Bumps [jsdom](https://github.com/jsdom/jsdom) and [@types/jsdom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jsdom). These dependencies needed to be updated together.

Updates `jsdom` from 21.1.1 to 27.4.0
- [Release notes](https://github.com/jsdom/jsdom/releases)
- [Changelog](https://github.com/jsdom/jsdom/blob/main/Changelog.md)
- [Commits](https://github.com/jsdom/jsdom/compare/21.1.1...27.4.0)

Updates `@types/jsdom` from 21.1.0 to 27.0.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jsdom)

---
updated-dependencies:
- dependency-name: jsdom
  dependency-version: 27.4.0
  dependency-type: direct:development
  update-type: version-update:semver-major
- dependency-name: "@types/jsdom"
  dependency-version: 27.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../notebook-renderers/package-lock.json      | 981 +++++++-----------
 extensions/notebook-renderers/package.json    |   4 +-
 2 files changed, 382 insertions(+), 603 deletions(-)

diff --git a/extensions/notebook-renderers/package-lock.json b/extensions/notebook-renderers/package-lock.json
index 879e2cfeda61..ad0178475cd6 100644
--- a/extensions/notebook-renderers/package-lock.json
+++ b/extensions/notebook-renderers/package-lock.json
@@ -9,517 +9,379 @@
 			"version": "1.0.0",
 			"license": "MIT",
 			"devDependencies": {
-				"@types/jsdom": "^21.1.0",
+				"@types/jsdom": "^27.0.0",
 				"@types/vscode-notebook-renderer": "^1.72.4",
-				"jsdom": "^21.1.1"
+				"jsdom": "^27.4.0"
 			},
 			"engines": {
 				"vscode": "^1.57.0"
 			}
 		},
-		"node_modules/@tootallnate/once": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-			"integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+		"node_modules/@acemir/cssom": {
+			"version": "0.9.30",
+			"resolved": "https://registry.npmjs.org/@acemir/cssom/-/cssom-0.9.30.tgz",
+			"integrity": "sha512-9CnlMCI0LmCIq0olalQqdWrJHPzm0/tw3gzOA9zJSgvFX7Xau3D24mAGa4BtwxwY69nsuJW6kQqqCzf/mEcQgg==",
 			"dev": true,
-			"engines": {
-				"node": ">= 10"
-			}
+			"license": "MIT"
 		},
-		"node_modules/@types/jsdom": {
-			"version": "21.1.0",
-			"resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-21.1.0.tgz",
-			"integrity": "sha512-leWreJOdnuIxq9Y70tBVm/bvTuh31DSlF/r4l7Cfi4uhVQqLHD0Q4v301GMisEMwwbMgF7ZKxuZ+Jbd4NcdmRw==",
+		"node_modules/@asamuzakjp/css-color": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-4.1.1.tgz",
+			"integrity": "sha512-B0Hv6G3gWGMn0xKJ0txEi/jM5iFpT3MfDxmhZFb4W047GvytCf1DHQ1D69W3zHI4yWe2aTZAA0JnbMZ7Xc8DuQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"@types/node": "*",
-				"@types/tough-cookie": "*",
-				"parse5": "^7.0.0"
+				"@csstools/css-calc": "^2.1.4",
+				"@csstools/css-color-parser": "^3.1.0",
+				"@csstools/css-parser-algorithms": "^3.0.5",
+				"@csstools/css-tokenizer": "^3.0.4",
+				"lru-cache": "^11.2.4"
 			}
 		},
-		"node_modules/@types/node": {
-			"version": "18.15.3",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz",
-			"integrity": "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==",
-			"dev": true
-		},
-		"node_modules/@types/tough-cookie": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz",
-			"integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==",
-			"dev": true
-		},
-		"node_modules/@types/vscode-notebook-renderer": {
-			"version": "1.72.4",
-			"resolved": "https://registry.npmjs.org/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.72.4.tgz",
-			"integrity": "sha512-bdKO41c6Dc24pH/O/eM/jqfCwGH4zc76o/g/6Gt1y/eg/bvvqP2/VpbV+Sa5Te2sZekFRcbYnSSFTKo3wcVGUg==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/abab": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-			"integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-			"deprecated": "Use your platform's native atob() and btoa() methods instead",
-			"dev": true
-		},
-		"node_modules/acorn": {
-			"version": "8.8.2",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-			"integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+		"node_modules/@asamuzakjp/dom-selector": {
+			"version": "6.7.6",
+			"resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.7.6.tgz",
+			"integrity": "sha512-hBaJER6A9MpdG3WgdlOolHmbOYvSk46y7IQN/1+iqiCuUu6iWdQrs9DGKF8ocqsEqWujWf/V7b7vaDgiUmIvUg==",
 			"dev": true,
-			"bin": {
-				"acorn": "bin/acorn"
-			},
-			"engines": {
-				"node": ">=0.4.0"
+			"license": "MIT",
+			"dependencies": {
+				"@asamuzakjp/nwsapi": "^2.3.9",
+				"bidi-js": "^1.0.3",
+				"css-tree": "^3.1.0",
+				"is-potential-custom-element-name": "^1.0.1",
+				"lru-cache": "^11.2.4"
 			}
 		},
-		"node_modules/acorn-globals": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
-			"integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
+		"node_modules/@asamuzakjp/nwsapi": {
+			"version": "2.3.9",
+			"resolved": "https://registry.npmjs.org/@asamuzakjp/nwsapi/-/nwsapi-2.3.9.tgz",
+			"integrity": "sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==",
 			"dev": true,
-			"dependencies": {
-				"acorn": "^8.1.0",
-				"acorn-walk": "^8.0.2"
-			}
+			"license": "MIT"
 		},
-		"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==",
+		"node_modules/@csstools/color-helpers": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz",
+			"integrity": "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==",
 			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"license": "MIT-0",
 			"engines": {
-				"node": ">=0.4.0"
+				"node": ">=18"
 			}
 		},
-		"node_modules/agent-base": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+		"node_modules/@csstools/css-calc": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz",
+			"integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==",
 			"dev": true,
-			"dependencies": {
-				"debug": "4"
-			},
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"license": "MIT",
 			"engines": {
-				"node": ">= 6.0.0"
+				"node": ">=18"
+			},
+			"peerDependencies": {
+				"@csstools/css-parser-algorithms": "^3.0.5",
+				"@csstools/css-tokenizer": "^3.0.4"
 			}
 		},
-		"node_modules/asynckit": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-			"dev": true
-		},
-		"node_modules/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==",
+		"node_modules/@csstools/css-color-parser": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz",
+			"integrity": "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==",
 			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
 			"license": "MIT",
 			"dependencies": {
-				"es-errors": "^1.3.0",
-				"function-bind": "^1.1.2"
+				"@csstools/color-helpers": "^5.1.0",
+				"@csstools/css-calc": "^2.1.4"
 			},
 			"engines": {
-				"node": ">= 0.4"
+				"node": ">=18"
+			},
+			"peerDependencies": {
+				"@csstools/css-parser-algorithms": "^3.0.5",
+				"@csstools/css-tokenizer": "^3.0.4"
 			}
 		},
-		"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==",
+		"node_modules/@csstools/css-parser-algorithms": {
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
+			"integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
 			"dev": true,
-			"dependencies": {
-				"delayed-stream": "~1.0.0"
-			},
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"license": "MIT",
 			"engines": {
-				"node": ">= 0.8"
+				"node": ">=18"
+			},
+			"peerDependencies": {
+				"@csstools/css-tokenizer": "^3.0.4"
 			}
 		},
-		"node_modules/cssstyle": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz",
-			"integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==",
+		"node_modules/@csstools/css-syntax-patches-for-csstree": {
+			"version": "1.0.22",
+			"resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.22.tgz",
+			"integrity": "sha512-qBcx6zYlhleiFfdtzkRgwNC7VVoAwfK76Vmsw5t+PbvtdknO9StgRk7ROvq9so1iqbdW4uLIDAsXRsTfUrIoOw==",
 			"dev": true,
-			"dependencies": {
-				"rrweb-cssom": "^0.6.0"
-			},
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"license": "MIT-0",
 			"engines": {
-				"node": ">=14"
+				"node": ">=18"
 			}
 		},
-		"node_modules/data-urls": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz",
-			"integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==",
+		"node_modules/@csstools/css-tokenizer": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
+			"integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
 			"dev": true,
-			"dependencies": {
-				"abab": "^2.0.6",
-				"whatwg-mimetype": "^3.0.0",
-				"whatwg-url": "^12.0.0"
-			},
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/csstools"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/csstools"
+				}
+			],
+			"license": "MIT",
 			"engines": {
-				"node": ">=14"
+				"node": ">=18"
 			}
 		},
-		"node_modules/debug": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+		"node_modules/@exodus/bytes": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.6.0.tgz",
+			"integrity": "sha512-y32mI9627q5LR/L8fLc4YyDRJQOi+jK0D9okzLilAdiU3F9we3zC7Y7CFrR/8vAvUyv7FgBAYcNHtvbmhKCFcw==",
 			"dev": true,
-			"dependencies": {
-				"ms": "2.1.2"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=6.0"
+				"node": "^20.19.0 || ^22.12.0 || >=24.0.0"
+			},
+			"peerDependencies": {
+				"@exodus/crypto": "^1.0.0-rc.4"
 			},
 			"peerDependenciesMeta": {
-				"supports-color": {
+				"@exodus/crypto": {
 					"optional": true
 				}
 			}
 		},
-		"node_modules/decimal.js": {
-			"version": "10.4.3",
-			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-			"integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
-			"dev": true
-		},
-		"node_modules/deep-is": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-			"dev": true
-		},
-		"node_modules/delayed-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
-		"node_modules/domexception": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-			"integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-			"deprecated": "Use your platform's native DOMException instead",
-			"dev": true,
-			"dependencies": {
-				"webidl-conversions": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/dunder-proto": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
-			"integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+		"node_modules/@types/jsdom": {
+			"version": "27.0.0",
+			"resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-27.0.0.tgz",
+			"integrity": "sha512-NZyFl/PViwKzdEkQg96gtnB8wm+1ljhdDay9ahn4hgb+SfVtPCbm3TlmDUFXTA+MGN3CijicnMhG18SI5H3rFw==",
 			"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"
+				"@types/node": "*",
+				"@types/tough-cookie": "*",
+				"parse5": "^7.0.0"
 			}
 		},
-		"node_modules/entities": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
-			"integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.12"
-			},
-			"funding": {
-				"url": "https://github.com/fb55/entities?sponsor=1"
-			}
+		"node_modules/@types/node": {
+			"version": "18.15.3",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz",
+			"integrity": "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==",
+			"dev": true
 		},
-		"node_modules/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/@types/tough-cookie": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz",
+			"integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==",
+			"dev": true
 		},
-		"node_modules/es-errors": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-			"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+		"node_modules/@types/vscode-notebook-renderer": {
+			"version": "1.72.4",
+			"resolved": "https://registry.npmjs.org/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.72.4.tgz",
+			"integrity": "sha512-bdKO41c6Dc24pH/O/eM/jqfCwGH4zc76o/g/6Gt1y/eg/bvvqP2/VpbV+Sa5Te2sZekFRcbYnSSFTKo3wcVGUg==",
 			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			}
+			"license": "MIT"
 		},
-		"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==",
+		"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==",
 			"dev": true,
 			"license": "MIT",
-			"dependencies": {
-				"es-errors": "^1.3.0"
-			},
 			"engines": {
-				"node": ">= 0.4"
+				"node": ">= 14"
 			}
 		},
-		"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==",
+		"node_modules/bidi-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz",
+			"integrity": "sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==",
 			"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"
+				"require-from-string": "^2.0.2"
 			}
 		},
-		"node_modules/escodegen": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-			"integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+		"node_modules/css-tree": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.1.0.tgz",
+			"integrity": "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"esprima": "^4.0.1",
-				"estraverse": "^5.2.0",
-				"esutils": "^2.0.2",
-				"optionator": "^0.8.1"
-			},
-			"bin": {
-				"escodegen": "bin/escodegen.js",
-				"esgenerate": "bin/esgenerate.js"
+				"mdn-data": "2.12.2",
+				"source-map-js": "^1.0.1"
 			},
 			"engines": {
-				"node": ">=6.0"
-			},
-			"optionalDependencies": {
-				"source-map": "~0.6.1"
-			}
-		},
-		"node_modules/esprima": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-			"dev": true,
-			"bin": {
-				"esparse": "bin/esparse.js",
-				"esvalidate": "bin/esvalidate.js"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/estraverse": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-			"dev": true,
-			"engines": {
-				"node": ">=4.0"
-			}
-		},
-		"node_modules/esutils": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
+				"node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
 			}
 		},
-		"node_modules/fast-levenshtein": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-			"dev": true
-		},
-		"node_modules/form-data": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
-			"integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+		"node_modules/cssstyle": {
+			"version": "5.3.5",
+			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-5.3.5.tgz",
+			"integrity": "sha512-GlsEptulso7Jg0VaOZ8BXQi3AkYM5BOJKEO/rjMidSCq70FkIC5y0eawrCXeYzxgt3OCf4Ls+eoxN+/05vN0Ag==",
 			"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"
+				"@asamuzakjp/css-color": "^4.1.1",
+				"@csstools/css-syntax-patches-for-csstree": "^1.0.21",
+				"css-tree": "^3.1.0"
 			},
 			"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": ">=20"
 			}
 		},
-		"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==",
+		"node_modules/data-urls": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-6.0.0.tgz",
+			"integrity": "sha512-BnBS08aLUM+DKamupXs3w2tJJoqU+AkaE/+6vQxi/G/DPmIZFJJp9Dkb1kM03AZx8ADehDUZgsNxju3mPXZYIA==",
 			"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"
+				"whatwg-mimetype": "^4.0.0",
+				"whatwg-url": "^15.0.0"
 			},
 			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
+				"node": ">=20"
 			}
 		},
-		"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==",
+		"node_modules/debug": {
+			"version": "4.4.3",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+			"integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"dunder-proto": "^1.0.1",
-				"es-object-atoms": "^1.0.0"
+				"ms": "^2.1.3"
 			},
 			"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"
+				"node": ">=6.0"
 			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
+				}
 			}
 		},
-		"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/decimal.js": {
+			"version": "10.6.0",
+			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
+			"integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
 			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
+			"license": "MIT"
 		},
-		"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==",
+		"node_modules/entities": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
+			"integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
 			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"has-symbols": "^1.0.3"
-			},
 			"engines": {
-				"node": ">= 0.4"
+				"node": ">=0.12"
 			},
 			"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"
+				"url": "https://github.com/fb55/entities?sponsor=1"
 			}
 		},
 		"node_modules/html-encoding-sniffer": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-			"integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-6.0.0.tgz",
+			"integrity": "sha512-CV9TW3Y3f8/wT0BRFc1/KAVQ3TUHiXmaAb6VW9vtiMFf7SLoMd1PdAc4W3KFOFETBJUb90KatHqlsZMWV+R9Gg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"whatwg-encoding": "^2.0.0"
+				"@exodus/bytes": "^1.6.0"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": "^20.19.0 || ^22.12.0 || >=24.0.0"
 			}
 		},
 		"node_modules/http-proxy-agent": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-			"integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+			"version": "7.0.2",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+			"integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"@tootallnate/once": "2",
-				"agent-base": "6",
-				"debug": "4"
+				"agent-base": "^7.1.0",
+				"debug": "^4.3.4"
 			},
 			"engines": {
-				"node": ">= 6"
+				"node": ">= 14"
 			}
 		},
 		"node_modules/https-proxy-agent": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-			"integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+			"version": "7.0.6",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+			"integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"agent-base": "6",
+				"agent-base": "^7.1.2",
 				"debug": "4"
 			},
 			"engines": {
-				"node": ">= 6"
-			}
-		},
-		"node_modules/iconv-lite": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-			"dev": true,
-			"dependencies": {
-				"safer-buffer": ">= 2.1.2 < 3.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 14"
 			}
 		},
 		"node_modules/is-potential-custom-element-name": {
@@ -529,43 +391,38 @@
 			"dev": true
 		},
 		"node_modules/jsdom": {
-			"version": "21.1.1",
-			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-21.1.1.tgz",
-			"integrity": "sha512-Jjgdmw48RKcdAIQyUD1UdBh2ecH7VqwaXPN3ehoZN6MqgVbMn+lRm1aAT1AsdJRAJpwfa4IpwgzySn61h2qu3w==",
+			"version": "27.4.0",
+			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-27.4.0.tgz",
+			"integrity": "sha512-mjzqwWRD9Y1J1KUi7W97Gja1bwOOM5Ug0EZ6UDK3xS7j7mndrkwozHtSblfomlzyB4NepioNt+B2sOSzczVgtQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"abab": "^2.0.6",
-				"acorn": "^8.8.2",
-				"acorn-globals": "^7.0.0",
-				"cssstyle": "^3.0.0",
-				"data-urls": "^4.0.0",
-				"decimal.js": "^10.4.3",
-				"domexception": "^4.0.0",
-				"escodegen": "^2.0.0",
-				"form-data": "^4.0.0",
-				"html-encoding-sniffer": "^3.0.0",
-				"http-proxy-agent": "^5.0.0",
-				"https-proxy-agent": "^5.0.1",
+				"@acemir/cssom": "^0.9.28",
+				"@asamuzakjp/dom-selector": "^6.7.6",
+				"@exodus/bytes": "^1.6.0",
+				"cssstyle": "^5.3.4",
+				"data-urls": "^6.0.0",
+				"decimal.js": "^10.6.0",
+				"html-encoding-sniffer": "^6.0.0",
+				"http-proxy-agent": "^7.0.2",
+				"https-proxy-agent": "^7.0.6",
 				"is-potential-custom-element-name": "^1.0.1",
-				"nwsapi": "^2.2.2",
-				"parse5": "^7.1.2",
-				"rrweb-cssom": "^0.6.0",
+				"parse5": "^8.0.0",
 				"saxes": "^6.0.0",
 				"symbol-tree": "^3.2.4",
-				"tough-cookie": "^4.1.2",
-				"w3c-xmlserializer": "^4.0.0",
-				"webidl-conversions": "^7.0.0",
-				"whatwg-encoding": "^2.0.0",
-				"whatwg-mimetype": "^3.0.0",
-				"whatwg-url": "^12.0.1",
-				"ws": "^8.13.0",
-				"xml-name-validator": "^4.0.0"
+				"tough-cookie": "^6.0.0",
+				"w3c-xmlserializer": "^5.0.0",
+				"webidl-conversions": "^8.0.0",
+				"whatwg-mimetype": "^4.0.0",
+				"whatwg-url": "^15.1.0",
+				"ws": "^8.18.3",
+				"xml-name-validator": "^5.0.0"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": "^20.19.0 || ^22.12.0 || >=24.0.0"
 			},
 			"peerDependencies": {
-				"canvas": "^2.5.0"
+				"canvas": "^3.0.0"
 			},
 			"peerDependenciesMeta": {
 				"canvas": {
@@ -573,78 +430,55 @@
 				}
 			}
 		},
-		"node_modules/levn": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-			"integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+		"node_modules/jsdom/node_modules/entities": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
+			"integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
 			"dev": true,
-			"dependencies": {
-				"prelude-ls": "~1.1.2",
-				"type-check": "~0.3.2"
-			},
+			"license": "BSD-2-Clause",
 			"engines": {
-				"node": ">= 0.8.0"
+				"node": ">=0.12"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
 			}
 		},
-		"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==",
+		"node_modules/jsdom/node_modules/parse5": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-8.0.0.tgz",
+			"integrity": "sha512-9m4m5GSgXjL4AjumKzq1Fgfp3Z8rsvjRNbnkVwfu2ImRqE5D0LnY2QfDen18FSY9C573YU5XxSapdHZTZ2WolA==",
 			"dev": true,
 			"license": "MIT",
-			"engines": {
-				"node": ">= 0.4"
+			"dependencies": {
+				"entities": "^6.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/inikulin/parse5?sponsor=1"
 			}
 		},
-		"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==",
+		"node_modules/lru-cache": {
+			"version": "11.2.4",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz",
+			"integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==",
 			"dev": true,
+			"license": "BlueOak-1.0.0",
 			"engines": {
-				"node": ">= 0.6"
+				"node": "20 || >=22"
 			}
 		},
-		"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==",
+		"node_modules/mdn-data": {
+			"version": "2.12.2",
+			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.2.tgz",
+			"integrity": "sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==",
 			"dev": true,
-			"dependencies": {
-				"mime-db": "1.52.0"
-			},
-			"engines": {
-				"node": ">= 0.6"
-			}
+			"license": "CC0-1.0"
 		},
 		"node_modules/ms": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-			"dev": true
-		},
-		"node_modules/nwsapi": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz",
-			"integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==",
-			"dev": true
-		},
-		"node_modules/optionator": {
-			"version": "0.8.3",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-			"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
 			"dev": true,
-			"dependencies": {
-				"deep-is": "~0.1.3",
-				"fast-levenshtein": "~2.0.6",
-				"levn": "~0.3.0",
-				"prelude-ls": "~1.1.2",
-				"type-check": "~0.3.2",
-				"word-wrap": "~1.2.3"
-			},
-			"engines": {
-				"node": ">= 0.8.0"
-			}
+			"license": "MIT"
 		},
 		"node_modules/parse5": {
 			"version": "7.1.2",
@@ -658,54 +492,26 @@
 				"url": "https://github.com/inikulin/parse5?sponsor=1"
 			}
 		},
-		"node_modules/prelude-ls": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-			"integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+		"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": ">= 0.8.0"
+				"node": ">=6"
 			}
 		},
-		"node_modules/psl": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-			"integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-			"dev": true
-		},
-		"node_modules/punycode": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-			"integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+		"node_modules/require-from-string": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=6"
+				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/querystringify": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-			"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-			"dev": true
-		},
-		"node_modules/requires-port": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-			"dev": true
-		},
-		"node_modules/rrweb-cssom": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
-			"integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==",
-			"dev": true
-		},
-		"node_modules/safer-buffer": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-			"dev": true
-		},
 		"node_modules/saxes": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
@@ -718,12 +524,12 @@
 				"node": ">=v12.22.7"
 			}
 		},
-		"node_modules/source-map": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+		"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,
-			"optional": true,
+			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -734,133 +540,105 @@
 			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
 			"dev": true
 		},
-		"node_modules/tough-cookie": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-			"integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
+		"node_modules/tldts": {
+			"version": "7.0.19",
+			"resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.19.tgz",
+			"integrity": "sha512-8PWx8tvC4jDB39BQw1m4x8y5MH1BcQ5xHeL2n7UVFulMPH/3Q0uiamahFJ3lXA0zO2SUyRXuVVbWSDmstlt9YA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"psl": "^1.1.33",
-				"punycode": "^2.1.1",
-				"universalify": "^0.2.0",
-				"url-parse": "^1.5.3"
+				"tldts-core": "^7.0.19"
 			},
-			"engines": {
-				"node": ">=6"
+			"bin": {
+				"tldts": "bin/cli.js"
 			}
 		},
-		"node_modules/tr46": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
-			"integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
+		"node_modules/tldts-core": {
+			"version": "7.0.19",
+			"resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.19.tgz",
+			"integrity": "sha512-lJX2dEWx0SGH4O6p+7FPwYmJ/bu1JbcGJ8RLaG9b7liIgZ85itUVEPbMtWRVrde/0fnDPEPHW10ZsKW3kVsE9A==",
 			"dev": true,
-			"dependencies": {
-				"punycode": "^2.3.0"
-			},
-			"engines": {
-				"node": ">=14"
-			}
+			"license": "MIT"
 		},
-		"node_modules/type-check": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-			"integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+		"node_modules/tough-cookie": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.0.tgz",
+			"integrity": "sha512-kXuRi1mtaKMrsLUxz3sQYvVl37B0Ns6MzfrtV5DvJceE9bPyspOqk9xxv7XbZWcfLWbFmm997vl83qUWVJA64w==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"dependencies": {
-				"prelude-ls": "~1.1.2"
+				"tldts": "^7.0.5"
 			},
 			"engines": {
-				"node": ">= 0.8.0"
+				"node": ">=16"
 			}
 		},
-		"node_modules/universalify": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-			"integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-			"dev": true,
-			"engines": {
-				"node": ">= 4.0.0"
-			}
-		},
-		"node_modules/url-parse": {
-			"version": "1.5.10",
-			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+		"node_modules/tr46": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-6.0.0.tgz",
+			"integrity": "sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"querystringify": "^2.1.1",
-				"requires-port": "^1.0.0"
+				"punycode": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=20"
 			}
 		},
 		"node_modules/w3c-xmlserializer": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
-			"integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
+			"integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"xml-name-validator": "^4.0.0"
+				"xml-name-validator": "^5.0.0"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=18"
 			}
 		},
 		"node_modules/webidl-conversions": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-			"integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-			"dev": true,
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/whatwg-encoding": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
-			"integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-8.0.0.tgz",
+			"integrity": "sha512-n4W4YFyz5JzOfQeA8oN7dUYpR+MBP3PIUsn2jLjWXwK5ASUzt0Jc/A5sAUZoCYFJRGF0FBKJ+1JjN43rNdsQzA==",
 			"dev": true,
-			"dependencies": {
-				"iconv-lite": "0.6.3"
-			},
+			"license": "BSD-2-Clause",
 			"engines": {
-				"node": ">=12"
+				"node": ">=20"
 			}
 		},
 		"node_modules/whatwg-mimetype": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
-			"integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
+			"integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/whatwg-url": {
-			"version": "12.0.1",
-			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
-			"integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
+			"version": "15.1.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-15.1.0.tgz",
+			"integrity": "sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"tr46": "^4.1.1",
-				"webidl-conversions": "^7.0.0"
+				"tr46": "^6.0.0",
+				"webidl-conversions": "^8.0.0"
 			},
 			"engines": {
-				"node": ">=14"
-			}
-		},
-		"node_modules/word-wrap": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
-			"integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=20"
 			}
 		},
 		"node_modules/ws": {
-			"version": "8.17.1",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-			"integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+			"version": "8.18.3",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
+			"integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=10.0.0"
 			},
@@ -878,12 +656,13 @@
 			}
 		},
 		"node_modules/xml-name-validator": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-			"integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
+			"integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==",
 			"dev": true,
+			"license": "Apache-2.0",
 			"engines": {
-				"node": ">=12"
+				"node": ">=18"
 			}
 		},
 		"node_modules/xmlchars": {
diff --git a/extensions/notebook-renderers/package.json b/extensions/notebook-renderers/package.json
index 391bf5b79094..6420afcea5c5 100644
--- a/extensions/notebook-renderers/package.json
+++ b/extensions/notebook-renderers/package.json
@@ -48,9 +48,9 @@
 	},
 	"dependencies": {},
 	"devDependencies": {
-		"@types/jsdom": "^21.1.0",
+		"@types/jsdom": "^27.0.0",
 		"@types/vscode-notebook-renderer": "^1.72.4",
-		"jsdom": "^21.1.1"
+		"jsdom": "^27.4.0"
 	},
 	"repository": {
 		"type": "git",

From 22df6d97fd4d6b7f16c47530dfc68a19345e0251 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 28 Dec 2025 08:16:16 +0000
Subject: [PATCH 1303/1815] Bump esbuild from 0.25.0 to 0.27.2 in /extensions

Bumps [esbuild](https://github.com/evanw/esbuild) from 0.25.0 to 0.27.2.
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md)
- [Commits](https://github.com/evanw/esbuild/compare/v0.25.0...v0.27.2)

---
updated-dependencies:
- dependency-name: esbuild
  dependency-version: 0.27.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/package-lock.json | 226 +++++++++++++++++++----------------
 extensions/package.json      |   2 +-
 2 files changed, 123 insertions(+), 105 deletions(-)

diff --git a/extensions/package-lock.json b/extensions/package-lock.json
index 2f9afaef15ed..4c77cda2de7a 100644
--- a/extensions/package-lock.json
+++ b/extensions/package-lock.json
@@ -14,14 +14,14 @@
       },
       "devDependencies": {
         "@parcel/watcher": "2.5.1",
-        "esbuild": "0.25.0",
+        "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"
       ],
@@ -803,9 +820,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",
@@ -816,31 +833,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": {
diff --git a/extensions/package.json b/extensions/package.json
index 3c70c0b17519..c3e7d25a3b64 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@parcel/watcher": "2.5.1",
-    "esbuild": "0.25.0",
+    "esbuild": "0.27.2",
     "vscode-grammar-updater": "^1.1.0"
   },
   "overrides": {

From b26172b10e6f1f0ae9c751221bf0b0cb8a86ff26 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 28 Dec 2025 08:43:33 +0000
Subject: [PATCH 1304/1815] Bump @vscode/codicons in /extensions/simple-browser

Bumps [@vscode/codicons](https://github.com/microsoft/vscode-codicons) from 0.0.43 to 0.0.44.
- [Release notes](https://github.com/microsoft/vscode-codicons/releases)
- [Commits](https://github.com/microsoft/vscode-codicons/compare/v0.0.43...v0.0.44)

---
updated-dependencies:
- dependency-name: "@vscode/codicons"
  dependency-version: 0.0.44
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/simple-browser/package-lock.json | 8 ++++----
 extensions/simple-browser/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/simple-browser/package-lock.json b/extensions/simple-browser/package-lock.json
index 2150b48e2932..d00ca5d995ba 100644
--- a/extensions/simple-browser/package-lock.json
+++ b/extensions/simple-browser/package-lock.json
@@ -13,7 +13,7 @@
       },
       "devDependencies": {
         "@types/vscode-webview": "^1.57.5",
-        "@vscode/codicons": "^0.0.43"
+        "@vscode/codicons": "^0.0.44"
       },
       "engines": {
         "vscode": "^1.70.0"
@@ -151,9 +151,9 @@
       "license": "MIT"
     },
     "node_modules/@vscode/codicons": {
-      "version": "0.0.43",
-      "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.43.tgz",
-      "integrity": "sha512-8sf8WOBoZkyUi8ogCm5ycHJJGhwOEG3E9b64+JIx+m6bCExdkc30VwCwr94cXUU1opmRD0CTCWLcN46I8WLJIg==",
+      "version": "0.0.44",
+      "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.44.tgz",
+      "integrity": "sha512-F7qPRumUK3EHjNdopfICLGRf3iNPoZQt+McTHAn4AlOWPB3W2kL4H0S7uqEqbyZ6rCxaeDjpAn3MCUnwTu/VJQ==",
       "dev": true,
       "license": "CC-BY-4.0"
     },
diff --git a/extensions/simple-browser/package.json b/extensions/simple-browser/package.json
index eac3630e2990..e70ac07ad0ec 100644
--- a/extensions/simple-browser/package.json
+++ b/extensions/simple-browser/package.json
@@ -70,7 +70,7 @@
   },
   "devDependencies": {
     "@types/vscode-webview": "^1.57.5",
-    "@vscode/codicons": "^0.0.43"
+    "@vscode/codicons": "^0.0.44"
   },
   "repository": {
     "type": "git",

From c549a65c0111276fd92fddd94ae06248ba1dcb75 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 28 Dec 2025 11:52:53 +0000
Subject: [PATCH 1305/1815] Bump @types/node from 20.11.24 to 25.0.3 in
 /test/integration/browser

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/integration/browser/package-lock.json | 20 +++++++++++---------
 test/integration/browser/package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/test/integration/browser/package-lock.json b/test/integration/browser/package-lock.json
index c30ebdd5e63e..2848d2de06a4 100644
--- a/test/integration/browser/package-lock.json
+++ b/test/integration/browser/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "license": "MIT",
       "devDependencies": {
-        "@types/node": "20.x",
+        "@types/node": "25.x",
         "@types/rimraf": "^2.0.4",
         "@types/tmp": "0.1.0",
         "rimraf": "^2.6.1",
@@ -42,12 +42,13 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@types/rimraf": {
@@ -196,10 +197,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vscode-uri": {
       "version": "3.1.0",
diff --git a/test/integration/browser/package.json b/test/integration/browser/package.json
index 13a8009262d0..c20b64db81f8 100644
--- a/test/integration/browser/package.json
+++ b/test/integration/browser/package.json
@@ -7,7 +7,7 @@
     "compile": "node ../../../node_modules/typescript/bin/tsc"
   },
   "devDependencies": {
-    "@types/node": "20.x",
+    "@types/node": "25.x",
     "@types/rimraf": "^2.0.4",
     "@types/tmp": "0.1.0",
     "rimraf": "^2.6.1",

From 61d7cfdbf5f214822c4136c6cab416869ea1cdb5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 04:16:40 +0000
Subject: [PATCH 1306/1815] Bump @vscode/iconv-lite-umd from 0.7.0 to 0.7.1 in
 /extensions/git

Bumps [@vscode/iconv-lite-umd](https://github.com/Microsoft/vscode-iconv-lite-umd) from 0.7.0 to 0.7.1.
- [Release notes](https://github.com/Microsoft/vscode-iconv-lite-umd/releases)
- [Commits](https://github.com/Microsoft/vscode-iconv-lite-umd/commits/v0.7.1)

---
updated-dependencies:
- dependency-name: "@vscode/iconv-lite-umd"
  dependency-version: 0.7.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 9 +++++----
 extensions/git/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index 80b6dd8dacb8..70915b8539fe 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@joaomoreno/unique-names-generator": "^5.2.0",
         "@vscode/extension-telemetry": "^1.2.0",
-        "@vscode/iconv-lite-umd": "0.7.0",
+        "@vscode/iconv-lite-umd": "0.7.1",
         "byline": "^5.0.0",
         "file-type": "21.1.1",
         "jschardet": "3.1.4",
@@ -250,9 +250,10 @@
       }
     },
     "node_modules/@vscode/iconv-lite-umd": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
-      "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg=="
+      "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/byline": {
       "version": "5.0.0",
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 3b4b43f695db..4d48f94e479f 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3562,7 +3562,7 @@
   "dependencies": {
     "@joaomoreno/unique-names-generator": "^5.2.0",
     "@vscode/extension-telemetry": "^1.2.0",
-    "@vscode/iconv-lite-umd": "0.7.0",
+    "@vscode/iconv-lite-umd": "0.7.1",
     "byline": "^5.0.0",
     "file-type": "21.1.1",
     "jschardet": "3.1.4",

From aac0483b51990180fbec8d1ac975cc0b35999c66 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 04:26:59 +0000
Subject: [PATCH 1307/1815] Bump @types/node from 24.10.1 to 25.0.3 in
 /test/automation

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 24.10.1 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/automation/package-lock.json | 8 ++++----
 test/automation/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
index cf887c6d6521..3ab2784bc88d 100644
--- a/test/automation/package-lock.json
+++ b/test/automation/package-lock.json
@@ -16,7 +16,7 @@
       },
       "devDependencies": {
         "@types/ncp": "2.0.8",
-        "@types/node": "24.x",
+        "@types/node": "25.x",
         "@types/tmp": "0.2.2",
         "cpx2": "8.0.0",
         "nodemon": "^3.1.11",
@@ -75,9 +75,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "24.10.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
-      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/test/automation/package.json b/test/automation/package.json
index 646527656163..3d9a4ba14cdb 100644
--- a/test/automation/package.json
+++ b/test/automation/package.json
@@ -25,7 +25,7 @@
   },
   "devDependencies": {
     "@types/ncp": "2.0.8",
-    "@types/node": "24.x",
+    "@types/node": "25.x",
     "@types/tmp": "0.2.2",
     "cpx2": "8.0.0",
     "nodemon": "^3.1.11",

From 2976fe33ea50859300883ee7d410ef4837876cbb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 04:37:26 +0000
Subject: [PATCH 1308/1815] build(deps): Bump @xterm/addon-clipboard in
 /remote/web

Bumps [@xterm/addon-clipboard](https://github.com/xtermjs/xterm.js) from 0.2.0-beta.81 to 0.2.0-beta.123.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-clipboard"
  dependency-version: 0.2.0-beta.123
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 953493781d86..ab9abf1d6da2 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -13,7 +13,7 @@
 				"@vscode/iconv-lite-umd": "0.7.1",
 				"@vscode/tree-sitter-wasm": "^0.3.0",
 				"@vscode/vscode-languagedetection": "1.0.21",
-				"@xterm/addon-clipboard": "^0.2.0-beta.81",
+				"@xterm/addon-clipboard": "^0.3.0-beta.56",
 				"@xterm/addon-image": "^0.9.0-beta.140",
 				"@xterm/addon-ligatures": "^0.10.0-beta.140",
 				"@xterm/addon-progress": "^0.2.0-beta.4",
@@ -173,15 +173,15 @@
 			}
 		},
 		"node_modules/@xterm/addon-clipboard": {
-			"version": "0.2.0-beta.81",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.81.tgz",
-			"integrity": "sha512-vDxRyBO9VHzsl+gUQsDlUM9o2ZxSJKzE2eYQtuILKcf5D0EXYI86aMwKT/1iguX41vcMg42WXQBQ0TLWZ2MyTQ==",
+			"version": "0.3.0-beta.56",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.56.tgz",
+			"integrity": "sha512-NHwA74cC+WAXJkcF/pQXHZFalGdhcUXefmatRJkRjiRGAwjn+JZYDATEnkkdgiGEWagjegalyRSBh+++hogvtQ==",
 			"license": "MIT",
 			"dependencies": {
 				"js-base64": "^3.7.5"
 			},
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.98"
+				"@xterm/xterm": "^6.1.0-beta.56"
 			}
 		},
 		"node_modules/@xterm/addon-image": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 9cd617beb425..0094d434cabd 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -8,7 +8,7 @@
 		"@vscode/iconv-lite-umd": "0.7.1",
 		"@vscode/tree-sitter-wasm": "^0.3.0",
 		"@vscode/vscode-languagedetection": "1.0.21",
-		"@xterm/addon-clipboard": "^0.2.0-beta.81",
+		"@xterm/addon-clipboard": "^0.3.0-beta.56",
 		"@xterm/addon-image": "^0.9.0-beta.140",
 		"@xterm/addon-ligatures": "^0.10.0-beta.140",
 		"@xterm/addon-progress": "^0.2.0-beta.4",

From b92f47c448aa265e957b07e6f98ee3f9962e95da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 04:47:11 +0000
Subject: [PATCH 1309/1815] Bump @vscode/sync-api-common in
 /extensions/typescript-language-features

Bumps [@vscode/sync-api-common](https://github.com/microsoft/vscode-wasm) from 0.7.2 to 0.8.1.
- [Release notes](https://github.com/microsoft/vscode-wasm/releases)
- [Commits](https://github.com/microsoft/vscode-wasm/commits)

---
updated-dependencies:
- dependency-name: "@vscode/sync-api-common"
  dependency-version: 0.8.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 21 ++-----------------
 .../typescript-language-features/package.json |  2 +-
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/extensions/typescript-language-features/package-lock.json b/extensions/typescript-language-features/package-lock.json
index 1cca96cb16f3..71b23e08647b 100644
--- a/extensions/typescript-language-features/package-lock.json
+++ b/extensions/typescript-language-features/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@vscode/extension-telemetry": "^1.2.0",
         "@vscode/sync-api-client": "^0.8.1",
-        "@vscode/sync-api-common": "^0.7.2",
+        "@vscode/sync-api-common": "^0.8.1",
         "@vscode/sync-api-service": "^0.8.1",
         "@vscode/ts-package-manager": "^0.0.2",
         "jsonc-parser": "^3.3.1",
@@ -195,7 +195,7 @@
         "node": ">=16.14.2"
       }
     },
-    "node_modules/@vscode/sync-api-client/node_modules/@vscode/sync-api-common": {
+    "node_modules/@vscode/sync-api-common": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/@vscode/sync-api-common/-/sync-api-common-0.8.1.tgz",
       "integrity": "sha512-XfanQNxkUlCpAsQ2+1SzNEdoY7jtcu48jYBR0n864ZWAWrH7m2QBK32YoNlrDN2V0eh8tdF0WH1NuHOm3Y021A==",
@@ -204,14 +204,6 @@
         "node": ">=16.14.2"
       }
     },
-    "node_modules/@vscode/sync-api-common": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/@vscode/sync-api-common/-/sync-api-common-0.7.2.tgz",
-      "integrity": "sha512-ne1XEeDIYA3mp4oo1QoF1fqFedd0Vf4ybMmLb9HixbTyXy/qwMNL2p6OjXjOsmx6w2q9eqzGA5W/OPRSJxTTIQ==",
-      "engines": {
-        "node": ">=16.15.1"
-      }
-    },
     "node_modules/@vscode/sync-api-service": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/@vscode/sync-api-service/-/sync-api-service-0.8.1.tgz",
@@ -227,15 +219,6 @@
         "vscode": "^1.71.0"
       }
     },
-    "node_modules/@vscode/sync-api-service/node_modules/@vscode/sync-api-common": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@vscode/sync-api-common/-/sync-api-common-0.8.1.tgz",
-      "integrity": "sha512-XfanQNxkUlCpAsQ2+1SzNEdoY7jtcu48jYBR0n864ZWAWrH7m2QBK32YoNlrDN2V0eh8tdF0WH1NuHOm3Y021A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=16.14.2"
-      }
-    },
     "node_modules/@vscode/ts-package-manager": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/@vscode/ts-package-manager/-/ts-package-manager-0.0.2.tgz",
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 92a679408822..e784b2fb8c1b 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -39,7 +39,7 @@
   "dependencies": {
     "@vscode/extension-telemetry": "^1.2.0",
     "@vscode/sync-api-client": "^0.8.1",
-    "@vscode/sync-api-common": "^0.7.2",
+    "@vscode/sync-api-common": "^0.8.1",
     "@vscode/sync-api-service": "^0.8.1",
     "@vscode/ts-package-manager": "^0.0.2",
     "jsonc-parser": "^3.3.1",

From cfa5862dbf973f8ab812178c4755157356425f5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 04:47:16 +0000
Subject: [PATCH 1310/1815] Bump @types/node in
 /extensions/typescript-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 24.10.1 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/typescript-language-features/package-lock.json | 8 ++++----
 extensions/typescript-language-features/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/typescript-language-features/package-lock.json b/extensions/typescript-language-features/package-lock.json
index 1cca96cb16f3..820bd255fd26 100644
--- a/extensions/typescript-language-features/package-lock.json
+++ b/extensions/typescript-language-features/package-lock.json
@@ -20,7 +20,7 @@
         "vscode-uri": "^3.1.0"
       },
       "devDependencies": {
-        "@types/node": "24.x",
+        "@types/node": "25.x",
         "@types/semver": "^7.7.1"
       },
       "engines": {
@@ -152,9 +152,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "24.10.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
-      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 92a679408822..4f7ecb63e43c 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -48,7 +48,7 @@
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
-    "@types/node": "24.x",
+    "@types/node": "25.x",
     "@types/semver": "^7.7.1"
   },
   "scripts": {

From 95015810d6d306970154e50262d2ed24d7e4ac51 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 08:33:32 +0000
Subject: [PATCH 1311/1815] Bump @types/node in
 /extensions/html-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 24.10.1 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../html-language-features/server/package-lock.json       | 8 ++++----
 extensions/html-language-features/server/package.json     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/html-language-features/server/package-lock.json b/extensions/html-language-features/server/package-lock.json
index 6abfa9b458fb..58117c168d06 100644
--- a/extensions/html-language-features/server/package-lock.json
+++ b/extensions/html-language-features/server/package-lock.json
@@ -18,7 +18,7 @@
       },
       "devDependencies": {
         "@types/mocha": "^10.0.10",
-        "@types/node": "24.x"
+        "@types/node": "25.x"
       },
       "engines": {
         "node": "*"
@@ -32,9 +32,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "24.10.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
-      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json
index ceddacf04318..34d2016e15ea 100644
--- a/extensions/html-language-features/server/package.json
+++ b/extensions/html-language-features/server/package.json
@@ -18,7 +18,7 @@
   },
   "devDependencies": {
     "@types/mocha": "^10.0.10",
-    "@types/node": "24.x"
+    "@types/node": "25.x"
   },
   "scripts": {
     "compile": "npx gulp compile-extension:html-language-features-server",

From 4a1656d6697004f58be1ef1dcd52922c11a0b8c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 08:43:38 +0000
Subject: [PATCH 1312/1815] build(deps): Bump @xterm/addon-progress in
 /remote/web

Bumps [@xterm/addon-progress](https://github.com/xtermjs/xterm.js) from 0.2.0-beta.4 to 0.2.0-beta.46.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-progress"
  dependency-version: 0.2.0-beta.46
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 2a7bcb1eee4f..eb31276d343a 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -16,7 +16,7 @@
 				"@xterm/addon-clipboard": "^0.2.0-beta.81",
 				"@xterm/addon-image": "^0.9.0-beta.140",
 				"@xterm/addon-ligatures": "^0.10.0-beta.140",
-				"@xterm/addon-progress": "^0.2.0-beta.4",
+				"@xterm/addon-progress": "^0.3.0-beta.56",
 				"@xterm/addon-search": "^0.16.0-beta.140",
 				"@xterm/addon-serialize": "^0.14.0-beta.98",
 				"@xterm/addon-unicode11": "^0.9.0-beta.140",
@@ -210,12 +210,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-progress": {
-			"version": "0.2.0-beta.4",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.4.tgz",
-			"integrity": "sha512-7t1nlaANdEjUBVvuTTs5gw6UQgB+unFLwSGGnYXIvdQroYdkXQXSSATSqpYKVCd/6QFhBerzdB2VwPM5L5lxIw==",
+			"version": "0.3.0-beta.56",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.56.tgz",
+			"integrity": "sha512-AgCCqziSDuszTrUdobG5HAN1kTRrMI7AWWWajSkTPKLYUMsD9grDSYKHDSUPHz/HC19AYaOZATgu4dFZ0zcOhw==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.98"
+				"@xterm/xterm": "^6.1.0-beta.56"
 			}
 		},
 		"node_modules/@xterm/addon-search": {
diff --git a/remote/web/package.json b/remote/web/package.json
index e76f7bb1cc0a..9efd7f457cb0 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -11,7 +11,7 @@
 		"@xterm/addon-clipboard": "^0.2.0-beta.81",
 		"@xterm/addon-image": "^0.9.0-beta.140",
 		"@xterm/addon-ligatures": "^0.10.0-beta.140",
-		"@xterm/addon-progress": "^0.2.0-beta.4",
+		"@xterm/addon-progress": "^0.3.0-beta.56",
 		"@xterm/addon-search": "^0.16.0-beta.140",
 		"@xterm/addon-serialize": "^0.14.0-beta.98",
 		"@xterm/addon-unicode11": "^0.9.0-beta.140",

From 5d6c411ddb66a45fa7f960c044b28081b81331e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 08:54:00 +0000
Subject: [PATCH 1313/1815] Bump @vscode/ripgrep from 1.15.11 to 1.17.0 in
 /remote

Bumps [@vscode/ripgrep](https://github.com/microsoft/vscode-ripgrep) from 1.15.11 to 1.17.0.
- [Release notes](https://github.com/microsoft/vscode-ripgrep/releases)
- [Commits](https://github.com/microsoft/vscode-ripgrep/compare/v1.15.11...v1.17.0)

---
updated-dependencies:
- dependency-name: "@vscode/ripgrep"
  dependency-version: 1.17.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index b2e9c941c8ea..5d54dc797781 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -14,7 +14,7 @@
         "@vscode/deviceid": "^0.1.2",
         "@vscode/iconv-lite-umd": "0.7.1",
         "@vscode/proxy-agent": "^0.32.0",
-        "@vscode/ripgrep": "^1.15.11",
+        "@vscode/ripgrep": "^1.17.0",
         "@vscode/spdlog": "^0.15.0",
         "@vscode/tree-sitter-wasm": "^0.1.3",
         "@vscode/vscode-languagedetection": "1.0.22",
@@ -519,9 +519,9 @@
       }
     },
     "node_modules/@vscode/ripgrep": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.11.tgz",
-      "integrity": "sha512-G/VqtA6kR50mJkIH4WA+I2Q78V5blovgPPq0VPYM0QIRp57lYMkdV+U9VrY80b3AvaC72A1z8STmyxc8ZKiTsw==",
+      "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": {
diff --git a/remote/package.json b/remote/package.json
index 03d255968950..fad908147a8b 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -9,7 +9,7 @@
     "@vscode/deviceid": "^0.1.2",
     "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/proxy-agent": "^0.32.0",
-    "@vscode/ripgrep": "^1.15.11",
+    "@vscode/ripgrep": "^1.17.0",
     "@vscode/spdlog": "^0.15.0",
     "@vscode/tree-sitter-wasm": "^0.1.3",
     "@vscode/vscode-languagedetection": "1.0.22",

From da1e6326bf24e6209e0c43570fa26645e65415d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 08:54:03 +0000
Subject: [PATCH 1314/1815] Bump @vscode/tree-sitter-wasm from 0.1.3 to 0.3.0
 in /remote

Bumps [@vscode/tree-sitter-wasm](https://github.com/Microsoft/vscode-tree-sitter-wasm) from 0.1.3 to 0.3.0.
- [Release notes](https://github.com/Microsoft/vscode-tree-sitter-wasm/releases)
- [Changelog](https://github.com/microsoft/vscode-tree-sitter-wasm/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/vscode-tree-sitter-wasm/compare/v0.1.3...v0.3.0)

---
updated-dependencies:
- dependency-name: "@vscode/tree-sitter-wasm"
  dependency-version: 0.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index b2e9c941c8ea..c0bf548d8b2b 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -16,7 +16,7 @@
         "@vscode/proxy-agent": "^0.32.0",
         "@vscode/ripgrep": "^1.15.11",
         "@vscode/spdlog": "^0.15.0",
-        "@vscode/tree-sitter-wasm": "^0.1.3",
+        "@vscode/tree-sitter-wasm": "^0.3.0",
         "@vscode/vscode-languagedetection": "1.0.22",
         "@vscode/windows-process-tree": "^0.6.2",
         "@vscode/windows-registry": "^1.1.0",
@@ -552,9 +552,9 @@
       }
     },
     "node_modules/@vscode/tree-sitter-wasm": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.1.3.tgz",
-      "integrity": "sha512-gs0+tlOfriWc6h1kXTCZvmPTuusN+SeDs7yDVZn/kKLGgqlhXFbl/gWKItxaTeryTDalN8N+ikneni6+3UDOag==",
+      "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": {
diff --git a/remote/package.json b/remote/package.json
index 03d255968950..b20e477b3c2d 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -11,7 +11,7 @@
     "@vscode/proxy-agent": "^0.32.0",
     "@vscode/ripgrep": "^1.15.11",
     "@vscode/spdlog": "^0.15.0",
-    "@vscode/tree-sitter-wasm": "^0.1.3",
+    "@vscode/tree-sitter-wasm": "^0.3.0",
     "@vscode/vscode-languagedetection": "1.0.22",
     "@vscode/windows-process-tree": "^0.6.2",
     "@vscode/windows-registry": "^1.1.0",

From c7f201155c0c8fadaa2fce24059d54f0ba979fd0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 09:15:49 +0000
Subject: [PATCH 1315/1815] Bump @xterm/addon-serialize in /remote/web

Bumps [@xterm/addon-serialize](https://github.com/xtermjs/xterm.js) from 0.14.0-beta.98 to 0.14.0-beta.140.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-serialize"
  dependency-version: 0.14.0-beta.140
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 4ccad62d10d9..92d9e227900f 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -18,7 +18,7 @@
 				"@xterm/addon-ligatures": "^0.10.0-beta.140",
 				"@xterm/addon-progress": "^0.3.0-beta.56",
 				"@xterm/addon-search": "^0.16.0-beta.140",
-				"@xterm/addon-serialize": "^0.14.0-beta.98",
+				"@xterm/addon-serialize": "^0.15.0-beta.56",
 				"@xterm/addon-unicode11": "^0.9.0-beta.140",
 				"@xterm/addon-webgl": "^0.19.0-beta.140",
 				"@xterm/xterm": "^5.6.0-beta.140",
@@ -228,12 +228,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-serialize": {
-			"version": "0.14.0-beta.98",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.98.tgz",
-			"integrity": "sha512-Tsr8j3wnun2raYR1DgsNClQP/I5a85u/uW/5EiYH+/iPPua6EWJvPlr5Q6TCU/cdIKW1o27Z3L5/mw0pfMUXrQ==",
+			"version": "0.15.0-beta.56",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.56.tgz",
+			"integrity": "sha512-nn7HB0A5e6pZAGjmgE+Uur3GNtGM29XdAjm+vsaACaYlNwyMsYt2wBf/wklHH9TTReKLsag/RWawglrtMXP7HQ==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.98"
+				"@xterm/xterm": "^6.1.0-beta.56"
 			}
 		},
 		"node_modules/@xterm/addon-unicode11": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 12c7ec2fa0cb..48c1f0ef01c4 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -13,7 +13,7 @@
 		"@xterm/addon-ligatures": "^0.10.0-beta.140",
 		"@xterm/addon-progress": "^0.3.0-beta.56",
 		"@xterm/addon-search": "^0.16.0-beta.140",
-		"@xterm/addon-serialize": "^0.14.0-beta.98",
+		"@xterm/addon-serialize": "^0.15.0-beta.56",
 		"@xterm/addon-unicode11": "^0.9.0-beta.140",
 		"@xterm/addon-webgl": "^0.19.0-beta.140",
 		"@xterm/xterm": "^5.6.0-beta.140",

From 54af24089ca1a18c905a1e9808d8fdde1f4dbb82 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 09:28:35 +0000
Subject: [PATCH 1316/1815] Bump actions/setup-node from 6.0.0 to 6.1.0

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/2028fbc5c25fe9cf00d9f06a71cc4710d4507903...395ad3262231945c25e8478fd5baf05154b1d79f)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-version: 6.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/telemetry.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml
index 706f229fd854..95492cf164c3 100644
--- a/.github/workflows/telemetry.yml
+++ b/.github/workflows/telemetry.yml
@@ -19,7 +19,7 @@ jobs:
 
       - uses: 'actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8' # v6.0.1
 
-      - uses: 'actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903' # v6.0.0
+      - uses: 'actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f' # v6.1.0
         with:
           node-version: 'lts/*'
 

From 13e82a6ca063f7e8e1135a3bd64d95b06eb98c23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 11:36:48 +0000
Subject: [PATCH 1317/1815] Bump file-type from 21.1.1 to 21.2.0 in
 /extensions/git

Bumps [file-type](https://github.com/sindresorhus/file-type) from 21.1.1 to 21.2.0.
- [Release notes](https://github.com/sindresorhus/file-type/releases)
- [Commits](https://github.com/sindresorhus/file-type/compare/v21.1.1...v21.2.0)

---
updated-dependencies:
- dependency-name: file-type
  dependency-version: 21.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 8 ++++----
 extensions/git/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index 70915b8539fe..298715228591 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -13,7 +13,7 @@
         "@vscode/extension-telemetry": "^1.2.0",
         "@vscode/iconv-lite-umd": "0.7.1",
         "byline": "^5.0.0",
-        "file-type": "21.1.1",
+        "file-type": "21.2.0",
         "jschardet": "3.1.4",
         "picomatch": "4.0.3",
         "vscode-uri": "^3.1.0",
@@ -281,9 +281,9 @@
       }
     },
     "node_modules/file-type": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-21.1.1.tgz",
-      "integrity": "sha512-ifJXo8zUqbQ/bLbl9sFoqHNTNWbnPY1COImFfM6CCy7z+E+jC1eY9YfOKkx0fckIg+VljAy2/87T61fp0+eEkg==",
+      "version": "21.2.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-21.2.0.tgz",
+      "integrity": "sha512-vCYBgFOrJQLoTzDyAXAL/RFfKnXXpUYt4+tipVy26nJJhT7ftgGETf2tAQF59EEL61i3MrorV/PG6tf7LJK7eg==",
       "license": "MIT",
       "dependencies": {
         "@tokenizer/inflate": "^0.4.1",
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 4d48f94e479f..2cb548c56f2d 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3564,7 +3564,7 @@
     "@vscode/extension-telemetry": "^1.2.0",
     "@vscode/iconv-lite-umd": "0.7.1",
     "byline": "^5.0.0",
-    "file-type": "21.1.1",
+    "file-type": "21.2.0",
     "jschardet": "3.1.4",
     "picomatch": "4.0.3",
     "vscode-uri": "^3.1.0",

From 9852ea8ac87e8972f21efc1decd8179102a04a47 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 11:52:27 +0000
Subject: [PATCH 1318/1815] Bump @types/node from 20.11.24 to 25.0.3 in
 /extensions/git

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 20 +++++++++++---------
 extensions/git/package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index 8713483a4845..f8bc9c26b954 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -22,7 +22,7 @@
       "devDependencies": {
         "@types/byline": "4.2.36",
         "@types/mocha": "^10.0.10",
-        "@types/node": "20.x",
+        "@types/node": "25.x",
         "@types/picomatch": "4.0.2",
         "@types/which": "3.0.4"
       },
@@ -214,12 +214,13 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@types/picomatch": {
@@ -401,10 +402,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vscode-uri": {
       "version": "3.1.0",
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 35bc50810b27..ffa9a3f30142 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3573,7 +3573,7 @@
   "devDependencies": {
     "@types/byline": "4.2.36",
     "@types/mocha": "^10.0.10",
-    "@types/node": "20.x",
+    "@types/node": "25.x",
     "@types/picomatch": "4.0.2",
     "@types/which": "3.0.4"
   },

From 2e2d973674de5a3897eee94e096da6cb03d36209 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 12:20:23 +0000
Subject: [PATCH 1319/1815] Bump electron-osx-sign from 0.4.16 to 0.6.0 in
 /build

Bumps [electron-osx-sign](https://github.com/electron-userland/electron-osx-sign) from 0.4.16 to 0.6.0.
- [Release notes](https://github.com/electron-userland/electron-osx-sign/releases)
- [Commits](https://github.com/electron-userland/electron-osx-sign/compare/v0.4.16...v0.6.0)

---
updated-dependencies:
- dependency-name: electron-osx-sign
  dependency-version: 0.6.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 9 +++++----
 build/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 8199bbaaae61..25814d7d95a5 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -46,7 +46,7 @@
         "@vscode/vsce": "2.20.1",
         "byline": "^5.0.0",
         "debug": "^4.3.2",
-        "electron-osx-sign": "^0.4.16",
+        "electron-osx-sign": "^0.6.0",
         "esbuild": "0.25.0",
         "extract-zip": "^2.0.1",
         "gulp-merge-json": "^2.1.1",
@@ -2211,11 +2211,12 @@
       }
     },
     "node_modules/electron-osx-sign": {
-      "version": "0.4.16",
-      "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.16.tgz",
-      "integrity": "sha512-ziMWfc3NmQlwnWLW6EaZq8nH2BWVng/atX5GWsGwhexJYpdW6hsg//MkAfRTRx1kR3Veiqkeiog1ibkbA4x0rg==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz",
+      "integrity": "sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg==",
       "deprecated": "Please use @electron/osx-sign moving forward. Be aware the API is slightly different",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "bluebird": "^3.5.0",
         "compare-version": "^0.1.2",
diff --git a/build/package.json b/build/package.json
index 935b7be8d07e..32f6317f3436 100644
--- a/build/package.json
+++ b/build/package.json
@@ -40,7 +40,7 @@
     "@vscode/vsce": "2.20.1",
     "byline": "^5.0.0",
     "debug": "^4.3.2",
-    "electron-osx-sign": "^0.4.16",
+    "electron-osx-sign": "^0.6.0",
     "esbuild": "0.25.0",
     "extract-zip": "^2.0.1",
     "gulp-merge-json": "^2.1.1",

From c73f14ba8c3c3726756ea15375f5c87967b88e1c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 12:24:19 +0000
Subject: [PATCH 1320/1815] Bump @vscode/proxy-agent from 0.32.0 to 0.36.0 in
 /remote

Bumps [@vscode/proxy-agent](https://github.com/microsoft/vscode-proxy-agent) from 0.32.0 to 0.36.0.
- [Release notes](https://github.com/microsoft/vscode-proxy-agent/releases)
- [Changelog](https://github.com/microsoft/vscode-proxy-agent/blob/main/CHANGELOG.md)
- [Commits](https://github.com/microsoft/vscode-proxy-agent/compare/v0.32.0...v0.36.0)

---
updated-dependencies:
- dependency-name: "@vscode/proxy-agent"
  dependency-version: 0.36.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 11 +++++++----
 remote/package.json      |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index c6b6fba28efe..0da4e725eace 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -13,7 +13,7 @@
         "@parcel/watcher": "2.5.1",
         "@vscode/deviceid": "^0.1.2",
         "@vscode/iconv-lite-umd": "0.7.1",
-        "@vscode/proxy-agent": "^0.32.0",
+        "@vscode/proxy-agent": "^0.36.0",
         "@vscode/ripgrep": "^1.17.0",
         "@vscode/spdlog": "^0.15.0",
         "@vscode/tree-sitter-wasm": "^0.3.0",
@@ -501,9 +501,9 @@
       "license": "MIT"
     },
     "node_modules/@vscode/proxy-agent": {
-      "version": "0.32.0",
-      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.32.0.tgz",
-      "integrity": "sha512-n6h2+WVMJ3ByfGUakDbBNpR25J2JpLQabofiTKHIcLpXfxhT5TQSEH4OcjesZZfqw1zDpd7oBgcgqToWIiaBrQ==",
+      "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",
@@ -514,6 +514,9 @@
         "socks-proxy-agent": "^8.0.1",
         "undici": "^7.2.0"
       },
+      "engines": {
+        "node": ">=22.15.0"
+      },
       "optionalDependencies": {
         "@vscode/windows-ca-certs": "^0.3.1"
       }
diff --git a/remote/package.json b/remote/package.json
index 178b5009b1d1..9538eb97fabb 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -8,7 +8,7 @@
     "@parcel/watcher": "2.5.1",
     "@vscode/deviceid": "^0.1.2",
     "@vscode/iconv-lite-umd": "0.7.1",
-    "@vscode/proxy-agent": "^0.32.0",
+    "@vscode/proxy-agent": "^0.36.0",
     "@vscode/ripgrep": "^1.17.0",
     "@vscode/spdlog": "^0.15.0",
     "@vscode/tree-sitter-wasm": "^0.3.0",

From 12e490ca11e299a89855a77ab23a5ec2c57d0e64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 12:24:35 +0000
Subject: [PATCH 1321/1815] Bump @vscode/vscode-languagedetection in
 /remote/web

Bumps [@vscode/vscode-languagedetection](https://github.com/microsoft/vscode-languagedetection) from 1.0.21 to 1.0.22.
- [Commits](https://github.com/microsoft/vscode-languagedetection/commits)

---
updated-dependencies:
- dependency-name: "@vscode/vscode-languagedetection"
  dependency-version: 1.0.22
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 8 ++++----
 remote/web/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 92d9e227900f..2916eb36d888 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -12,7 +12,7 @@
 				"@microsoft/1ds-post-js": "^3.2.13",
 				"@vscode/iconv-lite-umd": "0.7.1",
 				"@vscode/tree-sitter-wasm": "^0.3.0",
-				"@vscode/vscode-languagedetection": "1.0.21",
+				"@vscode/vscode-languagedetection": "1.0.22",
 				"@xterm/addon-clipboard": "^0.3.0-beta.56",
 				"@xterm/addon-image": "^0.9.0-beta.140",
 				"@xterm/addon-ligatures": "^0.10.0-beta.140",
@@ -164,9 +164,9 @@
 			"license": "MIT"
 		},
 		"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==",
+			"version": "1.0.22",
+			"resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.22.tgz",
+			"integrity": "sha512-rQ/BgMyLuIXSmbA0MSkIPHtcOw14QkeDbAq19sjvaS9LTRr905yij0S8lsyqN5JgOsbtIx7pAcyOxFMzPmqhZQ==",
 			"license": "MIT",
 			"bin": {
 				"vscode-languagedetection": "cli/index.js"
diff --git a/remote/web/package.json b/remote/web/package.json
index 48c1f0ef01c4..a2d88eeae040 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -7,7 +7,7 @@
 		"@microsoft/1ds-post-js": "^3.2.13",
 		"@vscode/iconv-lite-umd": "0.7.1",
 		"@vscode/tree-sitter-wasm": "^0.3.0",
-		"@vscode/vscode-languagedetection": "1.0.21",
+		"@vscode/vscode-languagedetection": "1.0.22",
 		"@xterm/addon-clipboard": "^0.3.0-beta.56",
 		"@xterm/addon-image": "^0.9.0-beta.140",
 		"@xterm/addon-ligatures": "^0.10.0-beta.140",

From bca99efe64a2d43cdc7304754199e62e0f85b9e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 12:24:39 +0000
Subject: [PATCH 1322/1815] Bump @xterm/addon-progress in /remote/web

Bumps [@xterm/addon-progress](https://github.com/xtermjs/xterm.js) from 0.3.0-beta.56 to 0.3.0-beta.57.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-progress"
  dependency-version: 0.3.0-beta.57
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 92d9e227900f..e1591fd6524e 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -16,7 +16,7 @@
 				"@xterm/addon-clipboard": "^0.3.0-beta.56",
 				"@xterm/addon-image": "^0.9.0-beta.140",
 				"@xterm/addon-ligatures": "^0.10.0-beta.140",
-				"@xterm/addon-progress": "^0.3.0-beta.56",
+				"@xterm/addon-progress": "^0.3.0-beta.57",
 				"@xterm/addon-search": "^0.16.0-beta.140",
 				"@xterm/addon-serialize": "^0.15.0-beta.56",
 				"@xterm/addon-unicode11": "^0.9.0-beta.140",
@@ -210,12 +210,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-progress": {
-			"version": "0.3.0-beta.56",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.56.tgz",
-			"integrity": "sha512-AgCCqziSDuszTrUdobG5HAN1kTRrMI7AWWWajSkTPKLYUMsD9grDSYKHDSUPHz/HC19AYaOZATgu4dFZ0zcOhw==",
+			"version": "0.3.0-beta.57",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.57.tgz",
+			"integrity": "sha512-F8EY51I/Xl/dYpiMA6+lTRWUr5vk631z6vMyRrW3KlKA92FHlID9qR8tmRNgpYQnhrHenw00I1whL2G8DeO4Mg==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.56"
+				"@xterm/xterm": "^6.1.0-beta.57"
 			}
 		},
 		"node_modules/@xterm/addon-search": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 48c1f0ef01c4..63a56d6c2b13 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -11,7 +11,7 @@
 		"@xterm/addon-clipboard": "^0.3.0-beta.56",
 		"@xterm/addon-image": "^0.9.0-beta.140",
 		"@xterm/addon-ligatures": "^0.10.0-beta.140",
-		"@xterm/addon-progress": "^0.3.0-beta.56",
+		"@xterm/addon-progress": "^0.3.0-beta.57",
 		"@xterm/addon-search": "^0.16.0-beta.140",
 		"@xterm/addon-serialize": "^0.15.0-beta.56",
 		"@xterm/addon-unicode11": "^0.9.0-beta.140",

From d1a0384463a6f4bab062c261fb8184cad266eb39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 12:24:44 +0000
Subject: [PATCH 1323/1815] Bump actions/upload-artifact from 5.0.0 to 6.0.0

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 5.0.0 to 6.0.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/330a01c490aca151604b8cf639adc76d48f6c5d4...b7c566a772e6b6bfb58ed0dc250532a479d7789f)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/scorecards.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 63cd789ece61..1a8aec920ae6 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -68,7 +68,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: SARIF file
           path: results.sarif

From 5137d6eb54bea02175d6c8d1980747a0b77e35b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 12:24:50 +0000
Subject: [PATCH 1324/1815] Bump @vscode/test-web from 0.0.62 to 0.0.77

Bumps [@vscode/test-web](https://github.com/microsoft/vscode-test-web) from 0.0.62 to 0.0.77.
- [Release notes](https://github.com/microsoft/vscode-test-web/releases)
- [Changelog](https://github.com/microsoft/vscode-test-web/blob/main/CHANGELOG.md)
- [Commits](https://github.com/microsoft/vscode-test-web/compare/v0.0.62...v0.0.77)

---
updated-dependencies:
- dependency-name: "@vscode/test-web"
  dependency-version: 0.0.77
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 519 ++++++++++++++++++++++------------------------
 package.json      |   2 +-
 2 files changed, 245 insertions(+), 276 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7eb7b0f59563..e5a684815b66 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -83,7 +83,7 @@
         "@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.77",
         "@vscode/v8-heap-parser": "^0.1.0",
         "@vscode/vscode-perf": "^0.0.24",
         "@webgpu/types": "^0.1.44",
@@ -1509,18 +1509,27 @@
       }
     },
     "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==",
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/@koa/router/-/router-15.1.1.tgz",
+      "integrity": "sha512-trYxL4VOx8r92f8luqpN83xkN0DMTsp/HBJIxoDZH/a2I1Hxvoe+jjjhyJRQUQIHmsNQjCM+Xj6nCqSvnDnlCw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "http-errors": "^2.0.0",
+        "debug": "^4.4.3",
+        "http-errors": "^2.0.1",
         "koa-compose": "^4.1.0",
-        "path-to-regexp": "^6.3.0"
+        "path-to-regexp": "^8.3.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
+      },
+      "peerDependencies": {
+        "koa": "^2.0.0 || ^3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "koa": {
+          "optional": false
+        }
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
@@ -2071,14 +2080,14 @@
       }
     },
     "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==",
+      "version": "1.57.0",
+      "resolved": "https://registry.npmjs.org/@playwright/browser-chromium/-/browser-chromium-1.57.0.tgz",
+      "integrity": "sha512-pUg+2p6HwewLp8KCD9G6VYaS2iewdkNkyqMcSIxXBXOlp1ojTxLF6/bwyR4ixLMy6tyv75jhE8PzzMZiX5KzwQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.47.2"
+        "playwright-core": "1.57.0"
       },
       "engines": {
         "node": ">=18"
@@ -3078,133 +3087,52 @@
       }
     },
     "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==",
+      "version": "0.0.77",
+      "resolved": "https://registry.npmjs.org/@vscode/test-web/-/test-web-0.0.77.tgz",
+      "integrity": "sha512-jeHvZn2crMdX6ICX7vZYeDx6DLxyW07b9EU3cV8zT+coEVQpf4C8zIN6uEBV67xFOUmOi4C1bzFZF5oUkDD7+w==",
       "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",
+        "@koa/router": "^15.0.0",
+        "@playwright/browser-chromium": "^1.57.0",
         "gunzip-maybe": "^1.4.2",
         "http-proxy-agent": "^7.0.2",
-        "https-proxy-agent": "^7.0.5",
-        "koa": "^2.15.3",
+        "https-proxy-agent": "^7.0.6",
+        "koa": "^3.1.1",
         "koa-morgan": "^1.0.1",
-        "koa-mount": "^4.0.0",
+        "koa-mount": "^4.2.0",
         "koa-static": "^5.0.0",
         "minimist": "^1.2.8",
-        "playwright": "^1.47.2",
-        "tar-fs": "^3.0.6",
-        "vscode-uri": "^3.0.8"
+        "playwright": "^1.57.0",
+        "tar-fs": "^3.1.1",
+        "tinyglobby": "^0.2.15",
+        "vscode-uri": "^3.1.0"
       },
       "bin": {
         "vscode-test-web": "out/server/index.js"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=20"
       }
     },
-    "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==",
+    "node_modules/@vscode/test-web/node_modules/playwright": {
+      "version": "1.57.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.57.0.tgz",
+      "integrity": "sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==",
       "dev": true,
+      "license": "Apache-2.0",
       "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"
+        "playwright-core": "1.57.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"
+        "playwright": "cli.js"
       },
       "engines": {
-        "node": "20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">=18"
       },
       "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"
+        "fsevents": "2.3.2"
       }
     },
     "node_modules/@vscode/tree-sitter-wasm": {
@@ -3607,13 +3535,14 @@
       "dev": true
     },
     "node_modules/accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "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": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       },
       "engines": {
         "node": ">= 0.6"
@@ -4446,19 +4375,6 @@
         "node": ">=14.14.0"
       }
     },
-    "node_modules/cache-content-type": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz",
-      "integrity": "sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==",
-      "dev": true,
-      "dependencies": {
-        "mime-types": "^2.1.18",
-        "ylru": "^1.2.0"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
     "node_modules/cacheable-lookup": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
@@ -4877,16 +4793,6 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "node_modules/co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-      "dev": true,
-      "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
-      }
-    },
     "node_modules/code-block-writer": {
       "version": "12.0.0",
       "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-12.0.0.tgz",
@@ -5008,6 +4914,7 @@
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
       "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "5.2.1"
       },
@@ -5033,13 +4940,15 @@
           "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.6"
       }
@@ -5067,6 +4976,7 @@
       "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.9.1.tgz",
       "integrity": "sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "depd": "~2.0.0",
         "keygrip": "~1.1.0"
@@ -5402,9 +5312,9 @@
       "dev": true
     },
     "node_modules/debug": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "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"
@@ -5503,8 +5413,9 @@
     "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
+      "integrity": "sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/deep-extend": {
       "version": "0.6.0",
@@ -5596,8 +5507,9 @@
     "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
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/depd": {
       "version": "2.0.0",
@@ -5619,6 +5531,7 @@
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8",
         "npm": "1.2.8000 || >= 1.4.16"
@@ -5921,10 +5834,11 @@
       }
     },
     "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==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -6171,7 +6085,8 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/escape-string-regexp": {
       "version": "4.0.0",
@@ -6657,6 +6572,24 @@
         "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/file-entry-cache": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
@@ -6966,8 +6899,9 @@
     "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==",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -9133,6 +9067,7 @@
       "resolved": "https://registry.npmjs.org/http-assert/-/http-assert-1.5.0.tgz",
       "integrity": "sha512-uPpH7OKX4H25hBmU6G1jWNaqJGpTXxey+YOUizJUAgu0AjLUeC8D73hTrhvDS5D+GJN1DN1+hhc/eF/wpxtp0w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "deep-equal": "~1.0.1",
         "http-errors": "~1.8.0"
@@ -9144,8 +9079,9 @@
     "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==",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -9155,6 +9091,7 @@
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
       "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "depd": "~1.1.2",
         "inherits": "2.0.4",
@@ -9169,8 +9106,9 @@
     "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==",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -9182,20 +9120,24 @@
       "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==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
+      "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.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/http-proxy-agent": {
@@ -10269,7 +10211,9 @@
       "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,
+      "license": "MIT",
       "dependencies": {
         "tsscmp": "1.0.6"
       },
@@ -10287,58 +10231,41 @@
       }
     },
     "node_modules/koa": {
-      "version": "2.15.4",
-      "resolved": "https://registry.npmjs.org/koa/-/koa-2.15.4.tgz",
-      "integrity": "sha512-7fNBIdrU2PEgLljXoPWoyY4r1e+ToWCmzS/wwMPbUNs7X+5MMET1ObhJBlUkF5uZG9B6QhM2zS1TsH6adegkiQ==",
+      "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.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",
+        "accepts": "^1.3.8",
+        "content-disposition": "~0.5.4",
+        "content-type": "^1.0.5",
+        "cookies": "~0.9.1",
         "delegates": "^1.0.0",
-        "depd": "^2.0.0",
-        "destroy": "^1.0.4",
-        "encodeurl": "^1.0.2",
+        "destroy": "^1.2.0",
+        "encodeurl": "^2.0.0",
         "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",
+        "http-assert": "^1.5.0",
+        "http-errors": "^2.0.0",
         "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",
+        "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": "^4.8.4 || ^6.10.1 || ^7.10.1 || >= 8.1.4"
+        "node": ">= 18"
       }
     },
     "node_modules/koa-compose": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz",
       "integrity": "sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==",
-      "dev": true
-    },
-    "node_modules/koa-convert": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/koa-convert/-/koa-convert-2.0.0.tgz",
-      "integrity": "sha512-asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA==",
       "dev": true,
-      "dependencies": {
-        "co": "^4.6.0",
-        "koa-compose": "^4.1.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
+      "license": "MIT"
     },
     "node_modules/koa-morgan": {
       "version": "1.0.1",
@@ -10350,10 +10277,11 @@
       }
     },
     "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==",
+      "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": {
         "debug": "^4.0.1",
         "koa-compose": "^4.1.0"
@@ -10432,38 +10360,31 @@
         "ms": "^2.1.1"
       }
     },
-    "node_modules/koa/node_modules/http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
-      "dev": true,
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/koa/node_modules/http-errors/node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+    "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": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
-    "node_modules/koa/node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+    "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": "MIT",
+      "dependencies": {
+        "mime-db": "^1.54.0"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/last-run": {
@@ -10832,12 +10753,13 @@
       "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==",
+      "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.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/memoizee": {
@@ -11414,10 +11336,11 @@
       "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==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -11834,6 +11757,7 @@
       "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"
       },
@@ -11874,12 +11798,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/only": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/only/-/only-0.0.2.tgz",
-      "integrity": "sha1-Kv3oTQPlC5qO3EROMGEKcCle37Q= sha512-Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ==",
-      "dev": true
-    },
     "node_modules/open": {
       "version": "8.4.2",
       "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
@@ -12143,12 +12061,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/package-json-from-dist": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
-      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
-      "dev": true
-    },
     "node_modules/pako": {
       "version": "0.2.9",
       "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
@@ -12233,6 +12145,7 @@
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -12331,11 +12244,15 @@
       }
     },
     "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==",
+      "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,
-      "license": "MIT"
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
     },
     "node_modules/path-type": {
       "version": "4.0.0",
@@ -12519,9 +12436,9 @@
       }
     },
     "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==",
+      "version": "1.57.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.57.0.tgz",
+      "integrity": "sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -14484,9 +14401,9 @@
       "dev": true
     },
     "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": {
@@ -15329,6 +15246,36 @@
       "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==",
       "license": "MIT"
     },
+    "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/to-absolute-glob": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
@@ -15609,6 +15556,7 @@
       "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz",
       "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.6.x"
       }
@@ -15662,18 +15610,47 @@
       }
     },
     "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,
+      "license": "MIT",
       "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
+        "content-type": "^1.0.5",
+        "media-typer": "^1.1.0",
+        "mime-types": "^3.0.0"
       },
       "engines": {
         "node": ">= 0.6"
       }
     },
+    "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",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "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": {
+        "mime-db": "^1.54.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
     "node_modules/typescript": {
       "version": "5.8.0-dev.20250207",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.0-dev.20250207.tgz",
@@ -16281,10 +16258,11 @@
       "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",
@@ -16874,15 +16852,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",
diff --git a/package.json b/package.json
index 5e72815a603c..18ecbbb04cbf 100644
--- a/package.json
+++ b/package.json
@@ -142,7 +142,7 @@
     "@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.77",
     "@vscode/v8-heap-parser": "^0.1.0",
     "@vscode/vscode-perf": "^0.0.24",
     "@webgpu/types": "^0.1.44",

From d3b349f2ec6d22727841d4776aa7d902351eca59 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 12:24:55 +0000
Subject: [PATCH 1325/1815] Bump @types/node from 20.11.24 to 25.0.3 in
 /extensions/npm

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/npm/package-lock.json | 26 ++++++++++++++------------
 extensions/npm/package.json      |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index edb94b31eb04..3a3ef9af987a 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -20,7 +20,7 @@
       },
       "devDependencies": {
         "@types/minimatch": "^5.1.2",
-        "@types/node": "20.x",
+        "@types/node": "25.x",
         "@types/which": "^3.0.0"
       },
       "engines": {
@@ -55,12 +55,13 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@types/which": {
@@ -287,9 +288,9 @@
       }
     },
     "node_modules/request-light": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.8.0.tgz",
-      "integrity": "sha512-bH6E4PMmsEXYrLX6Kr1vu+xI3HproB1vECAwaPSJeroLE1kpWE3HR27uB4icx+6YORu1ajqBJXxuedv8ZQg5Lw==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.7.0.tgz",
+      "integrity": "sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q==",
       "license": "MIT"
     },
     "node_modules/sprintf-js": {
@@ -317,10 +318,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/vscode-uri": {
       "version": "3.0.8",
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index a656817505fc..dfb6faf9f662 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "@types/minimatch": "^5.1.2",
-    "@types/node": "20.x",
+    "@types/node": "25.x",
     "@types/which": "^3.0.0"
   },
   "main": "./out/npmMain",

From 48b6184f8ab855e41833d681b1e83ffe38c8984f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 12:25:07 +0000
Subject: [PATCH 1326/1815] Bump gulp-plumber from 1.2.0 to 1.2.1

Bumps [gulp-plumber](https://github.com/floatdrop/gulp-plumber) from 1.2.0 to 1.2.1.
- [Commits](https://github.com/floatdrop/gulp-plumber/compare/v1.2.0...v1.2.1)

---
updated-dependencies:
- dependency-name: gulp-plumber
  dependency-version: 1.2.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7eb7b0f59563..45e4cdfcf20a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -115,7 +115,7 @@
         "gulp-gunzip": "^1.0.0",
         "gulp-gzip": "^1.4.2",
         "gulp-json-editor": "^2.5.0",
-        "gulp-plumber": "^1.2.0",
+        "gulp-plumber": "^1.2.1",
         "gulp-rename": "^1.2.0",
         "gulp-replace": "^0.5.4",
         "gulp-sourcemaps": "^3.0.0",
@@ -8282,10 +8282,11 @@
       }
     },
     "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==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.2.1.tgz",
+      "integrity": "sha512-mctAi9msEAG7XzW5ytDVZ9PxWMzzi1pS2rBH7lA095DhMa6KEXjm+St0GOCc567pJKJ/oCvosVAZEpAey0q2eQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^1.1.3",
         "fancy-log": "^1.3.2",
diff --git a/package.json b/package.json
index 5e72815a603c..ddb4461351e0 100644
--- a/package.json
+++ b/package.json
@@ -174,7 +174,7 @@
     "gulp-gunzip": "^1.0.0",
     "gulp-gzip": "^1.4.2",
     "gulp-json-editor": "^2.5.0",
-    "gulp-plumber": "^1.2.0",
+    "gulp-plumber": "^1.2.1",
     "gulp-rename": "^1.2.0",
     "gulp-replace": "^0.5.4",
     "gulp-sourcemaps": "^3.0.0",

From dfa238ca9dae269b93dafb2c82d60aba879855b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 15:02:04 +0000
Subject: [PATCH 1327/1815] Bump https-proxy-agent from 7.0.2 to 7.0.6 in
 /remote

Bumps [https-proxy-agent](https://github.com/TooTallNate/proxy-agents/tree/HEAD/packages/https-proxy-agent) from 7.0.2 to 7.0.6.
- [Release notes](https://github.com/TooTallNate/proxy-agents/releases)
- [Changelog](https://github.com/TooTallNate/proxy-agents/blob/main/packages/https-proxy-agent/CHANGELOG.md)
- [Commits](https://github.com/TooTallNate/proxy-agents/commits/https-proxy-agent@7.0.6/packages/https-proxy-agent)

---
updated-dependencies:
- dependency-name: https-proxy-agent
  dependency-version: 7.0.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 21 ++++++++++-----------
 remote/package.json      |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index ab3b34a082da..635693f9a420 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -32,7 +32,7 @@
         "@xterm/xterm": "^5.6.0-beta.98",
         "cookie": "^0.7.0",
         "http-proxy-agent": "^7.0.2",
-        "https-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.6",
         "jschardet": "3.1.4",
         "kerberos": "2.1.1",
         "minimist": "^1.2.6",
@@ -704,12 +704,10 @@
       "license": "MIT"
     },
     "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"
-      },
+      "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": ">= 14"
       }
@@ -971,11 +969,12 @@
       }
     },
     "node_modules/https-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
+      "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.0.2",
+        "agent-base": "^7.1.2",
         "debug": "4"
       },
       "engines": {
diff --git a/remote/package.json b/remote/package.json
index 5c0a9c605139..29b59b983235 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -27,7 +27,7 @@
     "@xterm/xterm": "^5.6.0-beta.98",
     "cookie": "^0.7.0",
     "http-proxy-agent": "^7.0.2",
-    "https-proxy-agent": "^7.0.2",
+    "https-proxy-agent": "^7.0.6",
     "jschardet": "3.1.4",
     "kerberos": "2.1.1",
     "minimist": "^1.2.6",

From f46f3325f373dd66bc200dbe0c8f6adcf1f06393 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 15:40:23 +0000
Subject: [PATCH 1328/1815] Bump source-map from 0.6.1 to 0.7.6

Bumps [source-map](https://github.com/mozilla/source-map) from 0.6.1 to 0.7.6.
- [Release notes](https://github.com/mozilla/source-map/releases)
- [Changelog](https://github.com/mozilla/source-map/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mozilla/source-map/compare/0.6.1...0.7.6)

---
updated-dependencies:
- dependency-name: source-map
  dependency-version: 0.7.6
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 70 +++++++++++++++++++++++++++++++++++++----------
 package.json      |  2 +-
 2 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b30b07a248f5..42a746d9e130 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -147,7 +147,7 @@
         "rimraf": "^2.2.8",
         "sinon": "^21.0.0",
         "sinon-test": "^3.1.3",
-        "source-map": "0.6.1",
+        "source-map": "0.7.6",
         "source-map-support": "^0.3.2",
         "style-loader": "^3.3.2",
         "ts-loader": "^9.5.1",
@@ -1221,6 +1221,16 @@
         "url": "https://opencollective.com/postcss/"
       }
     },
+    "node_modules/@gulp-sourcemaps/identity-map/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "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",
@@ -5639,6 +5649,16 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/css-tree/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/css-what": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
@@ -5651,6 +5671,16 @@
         "url": "https://github.com/sponsors/fb55"
       }
     },
+    "node_modules/css/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/cssesc": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
@@ -8949,6 +8979,16 @@
         "util-deprecate": "~1.0.1"
       }
     },
+    "node_modules/gulp-sourcemaps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/gulp-sourcemaps/node_modules/through2": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
@@ -14761,12 +14801,13 @@
       }
     },
     "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "version": "0.7.6",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz",
+      "integrity": "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 12"
       }
     },
     "node_modules/source-map-js": {
@@ -15580,6 +15621,16 @@
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
+    "node_modules/terser/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/terser/node_modules/source-map-support": {
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
@@ -15882,15 +15933,6 @@
         "webpack": "^5.0.0"
       }
     },
-    "node_modules/ts-loader/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/ts-morph": {
       "version": "19.0.0",
       "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-19.0.0.tgz",
diff --git a/package.json b/package.json
index bb7cb922b8ee..47d6add3236c 100644
--- a/package.json
+++ b/package.json
@@ -206,7 +206,7 @@
     "rimraf": "^2.2.8",
     "sinon": "^21.0.0",
     "sinon-test": "^3.1.3",
-    "source-map": "0.6.1",
+    "source-map": "0.7.6",
     "source-map-support": "^0.3.2",
     "style-loader": "^3.3.2",
     "ts-loader": "^9.5.1",

From 4f15d4efc85474de3a612e53739c0df99b557950 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 16:35:32 +0000
Subject: [PATCH 1329/1815] Bump sha2 from 0.10.8 to 0.10.9 in /cli

Bumps [sha2](https://github.com/RustCrypto/hashes) from 0.10.8 to 0.10.9.
- [Commits](https://github.com/RustCrypto/hashes/compare/sha2-v0.10.8...sha2-v0.10.9)

---
updated-dependencies:
- dependency-name: sha2
  dependency-version: 0.10.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 4 ++--
 cli/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index e054cf6c88fe..2d7d856480dc 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -2463,9 +2463,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.8"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
  "cpufeatures",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index a2afc4641d75..f31632d93936 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -45,7 +45,7 @@ url = "2.5.4"
 async-trait = "0.1.89"
 log = "0.4.18"
 const_format = "0.2.31"
-sha2 = "0.10.6"
+sha2 = "0.10.9"
 base64 = "0.22.1"
 shell-escape = "0.1.5"
 thiserror = "1.0.40"

From 22077a79225b8b6580462f762f6d05dab9f6da7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 21:12:48 +0000
Subject: [PATCH 1330/1815] Bump @types/minimatch from 5.1.2 to 6.0.0 in
 /extensions/npm

Bumps [@types/minimatch](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/minimatch) from 5.1.2 to 6.0.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/minimatch)

---
updated-dependencies:
- dependency-name: "@types/minimatch"
  dependency-version: 6.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/npm/package-lock.json | 15 ++++++++++-----
 extensions/npm/package.json      |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index c414d47e0ab1..0d2bbbaaf0fe 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -19,7 +19,7 @@
         "which-pm": "^3.0.1"
       },
       "devDependencies": {
-        "@types/minimatch": "^5.1.2",
+        "@types/minimatch": "^6.0.0",
         "@types/node": "25.x",
         "@types/which": "^3.0.0"
       },
@@ -49,10 +49,15 @@
       }
     },
     "node_modules/@types/minimatch": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
-      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
-      "dev": true
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-6.0.0.tgz",
+      "integrity": "sha512-zmPitbQ8+6zNutpwgcQuLcsEpn/Cj54Kbn7L5pX0Os5kdWplB7xPgEh/g+SWOB/qmows2gpuCaPyduq8ZZRnxA==",
+      "deprecated": "This is a stub types definition. minimatch provides its own type definitions, so you do not need this installed.",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimatch": "*"
+      }
     },
     "node_modules/@types/node": {
       "version": "25.0.3",
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index ec8896429f6e..bdd44436afb0 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -31,7 +31,7 @@
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
-    "@types/minimatch": "^5.1.2",
+    "@types/minimatch": "^6.0.0",
     "@types/node": "25.x",
     "@types/which": "^3.0.0"
   },

From 9b5d78ac00efc6aef167644ba59bab8b562bde18 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 21:12:56 +0000
Subject: [PATCH 1331/1815] Bump which from 4.0.0 to 6.0.0 in /extensions/npm

Bumps [which](https://github.com/npm/node-which) from 4.0.0 to 6.0.0.
- [Release notes](https://github.com/npm/node-which/releases)
- [Changelog](https://github.com/npm/node-which/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-which/compare/v4.0.0...v6.0.0)

---
updated-dependencies:
- dependency-name: which
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/npm/package-lock.json | 11 ++++++-----
 extensions/npm/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index c414d47e0ab1..9fbb65acd97f 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -15,7 +15,7 @@
         "minimatch": "^10.1.1",
         "request-light": "^0.7.0",
         "vscode-uri": "^3.1.0",
-        "which": "^4.0.0",
+        "which": "^6.0.0",
         "which-pm": "^3.0.1"
       },
       "devDependencies": {
@@ -331,9 +331,10 @@
       "license": "MIT"
     },
     "node_modules/which": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
-      "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-6.0.0.tgz",
+      "integrity": "sha512-f+gEpIKMR9faW/JgAgPK1D7mekkFoqbmiwvNzuhsHetni20QSgzg9Vhn0g2JSJkkfehQnqdUAx7/e15qS1lPxg==",
+      "license": "ISC",
       "dependencies": {
         "isexe": "^3.1.1"
       },
@@ -341,7 +342,7 @@
         "node-which": "bin/which.js"
       },
       "engines": {
-        "node": "^16.13.0 || >=18.0.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/which-pm": {
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index ec8896429f6e..7c77b47d3653 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -26,7 +26,7 @@
     "jsonc-parser": "^3.3.1",
     "minimatch": "^10.1.1",
     "request-light": "^0.7.0",
-    "which": "^4.0.0",
+    "which": "^6.0.0",
     "which-pm": "^3.0.1",
     "vscode-uri": "^3.1.0"
   },

From 1812966406318a98df688ced4e2a4e2c67e4c71c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 21:22:53 +0000
Subject: [PATCH 1332/1815] Bump @types/vscode-webview in
 /extensions/markdown-language-features

Bumps [@types/vscode-webview](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/vscode-webview) from 1.57.0 to 1.57.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/vscode-webview)

---
updated-dependencies:
- dependency-name: "@types/vscode-webview"
  dependency-version: 1.57.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../markdown-language-features/package-lock.json      | 11 ++++++-----
 extensions/markdown-language-features/package.json    |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index 877774d578aa..922fe8cc6713 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -28,7 +28,7 @@
         "@types/markdown-it": "14.1.2",
         "@types/picomatch": "^2.3.0",
         "@types/vscode-notebook-renderer": "^1.60.0",
-        "@types/vscode-webview": "^1.57.0",
+        "@types/vscode-webview": "^1.57.5",
         "@vscode/markdown-it-katex": "^1.1.1",
         "lodash.throttle": "^4.1.1",
         "vscode-languageserver-types": "^3.17.5",
@@ -230,10 +230,11 @@
       "dev": true
     },
     "node_modules/@types/vscode-webview": {
-      "version": "1.57.0",
-      "resolved": "https://registry.npmjs.org/@types/vscode-webview/-/vscode-webview-1.57.0.tgz",
-      "integrity": "sha512-x3Cb/SMa1IwRHfSvKaZDZOTh4cNoG505c3NjTqGlMC082m++x/ETUmtYniDsw6SSmYzZXO8KBNhYxR0+VqymqA==",
-      "dev": true
+      "version": "1.57.5",
+      "resolved": "https://registry.npmjs.org/@types/vscode-webview/-/vscode-webview-1.57.5.tgz",
+      "integrity": "sha512-iBAUYNYkz+uk1kdsq05fEcoh8gJmwT3lqqFPN7MGyjQ3HVloViMdo7ZJ8DFIP8WOK74PjOEilosqAyxV2iUFUw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@vscode/extension-telemetry": {
       "version": "0.9.8",
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 0fd6d2eb4be6..a1bc88bb0af2 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -782,7 +782,7 @@
     "@types/markdown-it": "14.1.2",
     "@types/picomatch": "^2.3.0",
     "@types/vscode-notebook-renderer": "^1.60.0",
-    "@types/vscode-webview": "^1.57.0",
+    "@types/vscode-webview": "^1.57.5",
     "@vscode/markdown-it-katex": "^1.1.1",
     "lodash.throttle": "^4.1.1",
     "vscode-languageserver-types": "^3.17.5",

From ea8fda15eff5c11c96b3177d4675b5c87ed018a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 21:22:53 +0000
Subject: [PATCH 1333/1815] Bump morphdom in
 /extensions/markdown-language-features

Bumps [morphdom](https://github.com/patrick-steele-idem/morphdom) from 2.6.1 to 2.7.7.
- [Changelog](https://github.com/patrick-steele-idem/morphdom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/patrick-steele-idem/morphdom/compare/v2.6.1...v2.7.7)

---
updated-dependencies:
- dependency-name: morphdom
  dependency-version: 2.7.7
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/markdown-language-features/package-lock.json | 9 +++++----
 extensions/markdown-language-features/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index 877774d578aa..f9a4fdad6ace 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -14,7 +14,7 @@
         "highlight.js": "^11.11.1",
         "markdown-it": "^14.1.0",
         "markdown-it-front-matter": "^0.2.4",
-        "morphdom": "^2.6.1",
+        "morphdom": "^2.7.7",
         "picomatch": "^2.3.1",
         "punycode": "^2.3.1",
         "vscode-languageclient": "^8.0.2",
@@ -497,9 +497,10 @@
       }
     },
     "node_modules/morphdom": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/morphdom/-/morphdom-2.6.1.tgz",
-      "integrity": "sha512-Y8YRbAEP3eKykroIBWrjcfMw7mmwJfjhqdpSvoqinu8Y702nAwikpXcNFDiIkyvfCLxLM9Wu95RZqo4a9jFBaA=="
+      "version": "2.7.7",
+      "resolved": "https://registry.npmjs.org/morphdom/-/morphdom-2.7.7.tgz",
+      "integrity": "sha512-04GmsiBcalrSCNmzfo+UjU8tt3PhZJKzcOy+r1FlGA7/zri8wre3I1WkYN9PT3sIeIKfW9bpyElA+VzOg2E24g==",
+      "license": "MIT"
     },
     "node_modules/node-html-parser": {
       "version": "6.1.13",
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 0fd6d2eb4be6..a87fc5e4e519 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -768,7 +768,7 @@
     "highlight.js": "^11.11.1",
     "markdown-it": "^14.1.0",
     "markdown-it-front-matter": "^0.2.4",
-    "morphdom": "^2.6.1",
+    "morphdom": "^2.7.7",
     "picomatch": "^2.3.1",
     "punycode": "^2.3.1",
     "vscode-languageclient": "^8.0.2",

From d246cc377e943de7493a8f08542da40b8eae0d7b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 21:34:30 +0000
Subject: [PATCH 1334/1815] Bump vscode-uri in
 /extensions/markdown-language-features

Bumps [vscode-uri](https://github.com/microsoft/vscode-uri) from 3.0.8 to 3.1.0.
- [Release notes](https://github.com/microsoft/vscode-uri/releases)
- [Commits](https://github.com/microsoft/vscode-uri/compare/v3.0.8...v3.1.0)

---
updated-dependencies:
- dependency-name: vscode-uri
  dependency-version: 3.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/markdown-language-features/package-lock.json | 9 +++++----
 extensions/markdown-language-features/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index 24cde72f1309..3f4ba34b5782 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -20,7 +20,7 @@
         "vscode-languageclient": "^8.0.2",
         "vscode-languageserver-textdocument": "^1.0.12",
         "vscode-markdown-languageserver": "^0.5.0-alpha.9",
-        "vscode-uri": "^3.0.3"
+        "vscode-uri": "^3.1.0"
       },
       "devDependencies": {
         "@types/dompurify": "^3.2.0",
@@ -734,9 +734,10 @@
       "dev": true
     },
     "node_modules/vscode-uri": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
-      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="
+      "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==",
+      "license": "MIT"
     },
     "node_modules/yallist": {
       "version": "4.0.0",
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index be3973e29f3f..33ea121e9d99 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -774,7 +774,7 @@
     "vscode-languageclient": "^8.0.2",
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-markdown-languageserver": "^0.5.0-alpha.9",
-    "vscode-uri": "^3.0.3"
+    "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
     "@types/dompurify": "^3.2.0",

From b58148c8b6d0f58b3cf3ae729ee1840fea2f1a70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Dec 2025 12:21:56 +0000
Subject: [PATCH 1335/1815] Bump @azure/cosmos from 3.17.3 to 4.9.0 in /build

Bumps [@azure/cosmos](https://github.com/Azure/azure-sdk-for-js) from 3.17.3 to 4.9.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-js/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-js/blob/main/documentation/Changelog-for-next-generation.md)
- [Commits](https://github.com/Azure/azure-sdk-for-js/compare/@azure/cosmos_3.17.3...@azure/cosmos_4.9.0)

---
updated-dependencies:
- dependency-name: "@azure/cosmos"
  dependency-version: 4.9.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 258 +++++++++++++++++++++++++++-------------
 build/package.json      |   2 +-
 2 files changed, 179 insertions(+), 81 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 96f1498b64d9..81b60992276d 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "devDependencies": {
         "@azure/core-auth": "^1.10.1",
-        "@azure/cosmos": "^3",
+        "@azure/cosmos": "^4",
         "@azure/identity": "^4.2.1",
         "@azure/msal-node": "^2.16.1",
         "@azure/storage-blob": "^12.25.0",
@@ -67,6 +67,37 @@
         "vscode-gulp-watch": "^5.0.3"
       }
     },
+    "node_modules/@azure-rest/core-client": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@azure-rest/core-client/-/core-client-2.5.1.tgz",
+      "integrity": "sha512-EHaOXW0RYDKS5CFffnixdyRPak5ytiCtU7uXDcP/uiY+A6jFRwNGzzJBiznkCzvi5EYpY+YWinieqHb0oY916A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@azure/abort-controller": "^2.1.2",
+        "@azure/core-auth": "^1.10.0",
+        "@azure/core-rest-pipeline": "^1.22.0",
+        "@azure/core-tracing": "^1.3.0",
+        "@typespec/ts-http-runtime": "^0.3.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@azure-rest/core-client/node_modules/@azure/abort-controller": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
+      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
     "node_modules/@azure/abort-controller": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.0.2.tgz",
@@ -108,22 +139,22 @@
       }
     },
     "node_modules/@azure/core-client": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.9.2.tgz",
-      "integrity": "sha512-kRdry/rav3fUKHl/aDLd/pDLcB+4pOFwPPTVEExuMyaI5r+JBbMWqRbCY1pn5BniDaU3lRxO9eaQ1AmSMehl/w==",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.10.1.tgz",
+      "integrity": "sha512-Nh5PhEOeY6PrnxNPsEHRr9eimxLwgLlpmguQaHKBinFYA/RU9+kOYVOQqOrTsCL+KSxrLLl1gD8Dk5BFW/7l/w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@azure/abort-controller": "^2.0.0",
-        "@azure/core-auth": "^1.4.0",
-        "@azure/core-rest-pipeline": "^1.9.1",
-        "@azure/core-tracing": "^1.0.0",
-        "@azure/core-util": "^1.6.1",
-        "@azure/logger": "^1.0.0",
+        "@azure/abort-controller": "^2.1.2",
+        "@azure/core-auth": "^1.10.0",
+        "@azure/core-rest-pipeline": "^1.22.0",
+        "@azure/core-tracing": "^1.3.0",
+        "@azure/core-util": "^1.13.0",
+        "@azure/logger": "^1.3.0",
         "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/@azure/core-client/node_modules/@azure/abort-controller": {
@@ -140,18 +171,18 @@
       }
     },
     "node_modules/@azure/core-http-compat": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@azure/core-http-compat/-/core-http-compat-2.1.2.tgz",
-      "integrity": "sha512-5MnV1yqzZwgNLLjlizsU3QqOeQChkIXw781Fwh1xdAqJR5AA32IUaq6xv1BICJvfbHoa+JYcaij2HFkhLbNTJQ==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@azure/core-http-compat/-/core-http-compat-2.3.1.tgz",
+      "integrity": "sha512-az9BkXND3/d5VgdRRQVkiJb2gOmDU8Qcq4GvjtBmDICNiQ9udFmDk4ZpSB5Qq1OmtDJGlQAfBaS4palFsazQ5g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@azure/abort-controller": "^2.0.0",
-        "@azure/core-client": "^1.3.0",
-        "@azure/core-rest-pipeline": "^1.3.0"
+        "@azure/abort-controller": "^2.1.2",
+        "@azure/core-client": "^1.10.0",
+        "@azure/core-rest-pipeline": "^1.22.0"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/@azure/core-http-compat/node_modules/@azure/abort-controller": {
@@ -210,23 +241,22 @@
       }
     },
     "node_modules/@azure/core-rest-pipeline": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.18.0.tgz",
-      "integrity": "sha512-QSoGUp4Eq/gohEFNJaUOwTN7BCc2nHTjjbm75JT0aD7W65PWM1H/tItz0GsABn22uaKyGxiMhWQLt2r+FGU89Q==",
+      "version": "1.22.2",
+      "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.22.2.tgz",
+      "integrity": "sha512-MzHym+wOi8CLUlKCQu12de0nwcq9k9Kuv43j4Wa++CsCpJwps2eeBQwD2Bu8snkxTtDKDx4GwjuR9E8yC8LNrg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@azure/abort-controller": "^2.0.0",
-        "@azure/core-auth": "^1.8.0",
-        "@azure/core-tracing": "^1.0.1",
-        "@azure/core-util": "^1.11.0",
-        "@azure/logger": "^1.0.0",
-        "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.0",
+        "@azure/abort-controller": "^2.1.2",
+        "@azure/core-auth": "^1.10.0",
+        "@azure/core-tracing": "^1.3.0",
+        "@azure/core-util": "^1.13.0",
+        "@azure/logger": "^1.3.0",
+        "@typespec/ts-http-runtime": "^0.3.0",
         "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/@azure/core-rest-pipeline/node_modules/@azure/abort-controller": {
@@ -243,16 +273,16 @@
       }
     },
     "node_modules/@azure/core-tracing": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.2.0.tgz",
-      "integrity": "sha512-UKTiEJPkWcESPYJz3X5uKRYyOcJD+4nYph+KpfdPRnQJVrZfk0KJgdnaAWKfhsBBtAf/D58Az4AvCJEmWgIBAg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.3.1.tgz",
+      "integrity": "sha512-9MWKevR7Hz8kNzzPLfX4EAtGM2b8mr50HPDBvio96bURP/9C+HjdH3sBlLSNNrvRAr5/k/svoH457gB5IKpmwQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/@azure/core-util": {
@@ -297,27 +327,39 @@
       }
     },
     "node_modules/@azure/cosmos": {
-      "version": "3.17.3",
-      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-3.17.3.tgz",
-      "integrity": "sha512-wBglkQ6Irjv5Vo2iw8fd6eYj60WYRSSg4/0DBkeOP6BwQ4RA91znsOHd6s3qG6UAbNgYuzC9Nnq07vlFFZkHEw==",
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-4.9.0.tgz",
+      "integrity": "sha512-3LzLibuVgbhWEv6B9Hz7bMn0KAKKlr3Rn9xPulZ6Xx69GuwgWmQ4qmkrfYBBBFCJDQXoVAvVGBYkt9VlW8hmOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@azure/abort-controller": "^1.0.0",
-        "@azure/core-auth": "^1.3.0",
-        "@azure/core-rest-pipeline": "^1.2.0",
-        "@azure/core-tracing": "^1.0.0",
-        "debug": "^4.1.1",
+        "@azure/abort-controller": "^2.1.2",
+        "@azure/core-auth": "^1.9.0",
+        "@azure/core-rest-pipeline": "^1.19.1",
+        "@azure/core-tracing": "^1.2.0",
+        "@azure/core-util": "^1.11.0",
+        "@azure/keyvault-keys": "^4.9.0",
+        "@azure/logger": "^1.1.4",
         "fast-json-stable-stringify": "^2.1.0",
-        "jsbi": "^3.1.3",
-        "node-abort-controller": "^3.0.0",
-        "priorityqueuejs": "^1.0.0",
-        "semaphore": "^1.0.5",
-        "tslib": "^2.2.0",
-        "universal-user-agent": "^6.0.0",
-        "uuid": "^8.3.0"
+        "priorityqueuejs": "^2.0.0",
+        "semaphore": "^1.1.0",
+        "tslib": "^2.8.1"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@azure/cosmos/node_modules/@azure/abort-controller": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
+      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@azure/identity": {
@@ -345,16 +387,88 @@
         "node": ">=18.0.0"
       }
     },
+    "node_modules/@azure/keyvault-common": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@azure/keyvault-common/-/keyvault-common-2.0.0.tgz",
+      "integrity": "sha512-wRLVaroQtOqfg60cxkzUkGKrKMsCP6uYXAOomOIysSMyt1/YM0eUn9LqieAWM8DLcU4+07Fio2YGpPeqUbpP9w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@azure/abort-controller": "^2.0.0",
+        "@azure/core-auth": "^1.3.0",
+        "@azure/core-client": "^1.5.0",
+        "@azure/core-rest-pipeline": "^1.8.0",
+        "@azure/core-tracing": "^1.0.0",
+        "@azure/core-util": "^1.10.0",
+        "@azure/logger": "^1.1.4",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/keyvault-common/node_modules/@azure/abort-controller": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
+      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/keyvault-keys": {
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/@azure/keyvault-keys/-/keyvault-keys-4.10.0.tgz",
+      "integrity": "sha512-eDT7iXoBTRZ2n3fLiftuGJFD+yjkiB1GNqzU2KbY1TLYeXeSPVTVgn2eJ5vmRTZ11978jy2Kg2wI7xa9Tyr8ag==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@azure-rest/core-client": "^2.3.3",
+        "@azure/abort-controller": "^2.1.2",
+        "@azure/core-auth": "^1.9.0",
+        "@azure/core-http-compat": "^2.2.0",
+        "@azure/core-lro": "^2.7.2",
+        "@azure/core-paging": "^1.6.2",
+        "@azure/core-rest-pipeline": "^1.19.0",
+        "@azure/core-tracing": "^1.2.0",
+        "@azure/core-util": "^1.11.0",
+        "@azure/keyvault-common": "^2.0.0",
+        "@azure/logger": "^1.1.4",
+        "tslib": "^2.8.1"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/keyvault-keys/node_modules/@azure/abort-controller": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
+      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
     "node_modules/@azure/logger": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.0.1.tgz",
-      "integrity": "sha512-QYQeaJ+A5x6aMNu8BG5qdsVBnYBop9UMwgUvGihSjf1PdZZXB+c/oMdM2ajKwzobLBh9e9QuMQkN9iL+IxLBLA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.3.0.tgz",
+      "integrity": "sha512-fCqPIfOcLE+CGqGPd66c8bZpwAji98tZ4JI9i/mlTNTlsIWslCfpg48s/ypyLxZTump5sypjrKn2/kY7q8oAbA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "tslib": "^2.0.0"
+        "@typespec/ts-http-runtime": "^0.3.0",
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/@azure/msal-browser": {
@@ -3078,12 +3192,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/jsbi": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/jsbi/-/jsbi-3.1.4.tgz",
-      "integrity": "sha512-52QRRFSsi9impURE8ZUbzAMCLjPm4THO7H2fcuIvaaeFTbSysvkodbQQXIVsNgq/ypDbq6dJiuGKL0vZ/i9hUg==",
-      "dev": true
-    },
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
@@ -3436,12 +3544,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/node-abort-controller": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz",
-      "integrity": "sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==",
-      "dev": true
-    },
     "node_modules/node-addon-api": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz",
@@ -3728,10 +3830,11 @@
       }
     },
     "node_modules/priorityqueuejs": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/priorityqueuejs/-/priorityqueuejs-1.0.0.tgz",
-      "integrity": "sha1-LuTyPCVgkT4IwHzlzN1t498sWvg= sha512-lg++21mreCEOuGWTbO5DnJKAdxfjrdN0S9ysoW9SzdSJvbkWpkaDdpG/cdsPCsEnoLUwmd9m3WcZhngW7yKA2g==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/priorityqueuejs/-/priorityqueuejs-2.0.0.tgz",
+      "integrity": "sha512-19BMarhgpq3x4ccvVi8k2QpJZcymo/iFUcrhPd4V96kYGovOdTsWwy7fxChYi4QY+m2EnGBWSX9Buakz+tWNQQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
@@ -4317,10 +4420,11 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
-      "dev": true
+      "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/tunnel": {
       "version": "0.0.6",
@@ -4385,12 +4489,6 @@
       "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
       "dev": true
     },
-    "node_modules/universal-user-agent": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
-      "dev": true
-    },
     "node_modules/universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
diff --git a/build/package.json b/build/package.json
index e1948bd069ec..18fe26dbc79e 100644
--- a/build/package.json
+++ b/build/package.json
@@ -4,7 +4,7 @@
   "license": "MIT",
   "devDependencies": {
     "@azure/core-auth": "^1.10.1",
-    "@azure/cosmos": "^3",
+    "@azure/cosmos": "^4",
     "@azure/identity": "^4.2.1",
     "@azure/msal-node": "^2.16.1",
     "@azure/storage-blob": "^12.25.0",

From 6c9dbc3948bef578bdb03eda0ad958fd6730ed59 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Dec 2025 12:22:07 +0000
Subject: [PATCH 1336/1815] Bump @types/gulp-rename from 0.0.33 to 2.0.7 in
 /build

Bumps [@types/gulp-rename](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/gulp-rename) from 0.0.33 to 2.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/gulp-rename)

---
updated-dependencies:
- dependency-name: "@types/gulp-rename"
  dependency-version: 2.0.7
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 12 +++++++-----
 build/package.json      |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 96f1498b64d9..7deb9360fd84 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -26,7 +26,7 @@
         "@types/gulp-filter": "^3.0.32",
         "@types/gulp-gzip": "^0.0.31",
         "@types/gulp-json-editor": "^2.2.36",
-        "@types/gulp-rename": "^0.0.33",
+        "@types/gulp-rename": "^2.0.7",
         "@types/gulp-sort": "^2.0.4",
         "@types/gulp-sourcemaps": "^0.0.32",
         "@types/jws": "^3.2.11",
@@ -1095,12 +1095,14 @@
       }
     },
     "node_modules/@types/gulp-rename": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/@types/gulp-rename/-/gulp-rename-0.0.33.tgz",
-      "integrity": "sha512-FIZQvbZJj6V1gHPTzO+g/BCWpDur7fJrroae4gwV3LaoHBQ+MrR9sB+2HssK8fHv4WdY6hVNxkcft9bYatuPIA==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@types/gulp-rename/-/gulp-rename-2.0.7.tgz",
+      "integrity": "sha512-W1xIGdui1w4AB1ylt/b8jrpV1MTNfeKmMFfJXsN/NOtSHjRg2w4Wp9H96J+Ld9tZenTtU0u5LatpGFJvOBN5EA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "@types/node": "*",
+        "@types/vinyl": "*"
       }
     },
     "node_modules/@types/gulp-sort": {
diff --git a/build/package.json b/build/package.json
index e1948bd069ec..f93a42c03733 100644
--- a/build/package.json
+++ b/build/package.json
@@ -20,7 +20,7 @@
     "@types/gulp-filter": "^3.0.32",
     "@types/gulp-gzip": "^0.0.31",
     "@types/gulp-json-editor": "^2.2.36",
-    "@types/gulp-rename": "^0.0.33",
+    "@types/gulp-rename": "^2.0.7",
     "@types/gulp-sort": "^2.0.4",
     "@types/gulp-sourcemaps": "^0.0.32",
     "@types/jws": "^3.2.11",

From 63f6043e4003a1e0a538bf0cb7547d64cee6d271 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Dec 2025 12:22:12 +0000
Subject: [PATCH 1337/1815] Bump @types/gulp-gzip from 0.0.31 to 0.0.36 in
 /build

Bumps [@types/gulp-gzip](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/gulp-gzip) from 0.0.31 to 0.0.36.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/gulp-gzip)

---
updated-dependencies:
- dependency-name: "@types/gulp-gzip"
  dependency-version: 0.0.36
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 9 +++++----
 build/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 96f1498b64d9..db7653418377 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -24,7 +24,7 @@
         "@types/glob": "^9.0.0",
         "@types/gulp": "^4.0.18",
         "@types/gulp-filter": "^3.0.32",
-        "@types/gulp-gzip": "^0.0.31",
+        "@types/gulp-gzip": "^0.0.36",
         "@types/gulp-json-editor": "^2.2.36",
         "@types/gulp-rename": "^0.0.33",
         "@types/gulp-sort": "^2.0.4",
@@ -1075,10 +1075,11 @@
       }
     },
     "node_modules/@types/gulp-gzip": {
-      "version": "0.0.31",
-      "resolved": "https://registry.npmjs.org/@types/gulp-gzip/-/gulp-gzip-0.0.31.tgz",
-      "integrity": "sha512-KQjHz1FTqLse8/EiktfhN/vo33vamX4gVAQhMTp55STDBA7UToW5CJqYyP7iRorkHK9/aJ2nL2hLkNZkY4M8+w==",
+      "version": "0.0.36",
+      "resolved": "https://registry.npmjs.org/@types/gulp-gzip/-/gulp-gzip-0.0.36.tgz",
+      "integrity": "sha512-zGdc+LGAvcqVXu9ydx0OJLL39C23QYmlptqkVEnWz+03YfPMWBBjMGE0VOvr6AApm08r1G4r5QItRJaGjJQWuA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
diff --git a/build/package.json b/build/package.json
index e1948bd069ec..915737b9a4c7 100644
--- a/build/package.json
+++ b/build/package.json
@@ -18,7 +18,7 @@
     "@types/glob": "^9.0.0",
     "@types/gulp": "^4.0.18",
     "@types/gulp-filter": "^3.0.32",
-    "@types/gulp-gzip": "^0.0.31",
+    "@types/gulp-gzip": "^0.0.36",
     "@types/gulp-json-editor": "^2.2.36",
     "@types/gulp-rename": "^0.0.33",
     "@types/gulp-sort": "^2.0.4",

From a8c19112928886065fe13abc834673595ae38aed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Dec 2025 12:22:40 +0000
Subject: [PATCH 1338/1815] Bump reqwest from 0.11.27 to 0.12.5 in /cli

Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.27 to 0.12.5.
- [Release notes](https://github.com/seanmonstar/reqwest/releases)
- [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.27...v0.12.5)

---
updated-dependencies:
- dependency-name: reqwest
  dependency-version: 0.12.5
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 194 ++++++++++++++++++++++++++++++++++++++++++++-----
 cli/Cargo.toml |   2 +-
 2 files changed, 178 insertions(+), 18 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 6335267ac81e..2369a144fc98 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -425,7 +425,7 @@ dependencies = [
  "flate2",
  "futures",
  "gethostname",
- "hyper",
+ "hyper 0.14.28",
  "indicatif",
  "keyring",
  "lazy_static",
@@ -436,7 +436,7 @@ dependencies = [
  "pin-project",
  "rand 0.8.5",
  "regex",
- "reqwest",
+ "reqwest 0.12.5",
  "rmp-serde",
  "serde",
  "serde_bytes",
@@ -1040,7 +1040,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http",
+ "http 0.2.12",
  "indexmap 2.2.6",
  "slab",
  "tokio",
@@ -1104,6 +1104,16 @@ dependencies = [
  "itoa",
 ]
 
+[[package]]
+name = "http"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
+dependencies = [
+ "bytes",
+ "itoa",
+]
+
 [[package]]
 name = "http-body"
 version = "0.4.6"
@@ -1111,7 +1121,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
- "http",
+ "http 0.2.12",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http 1.4.0",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http 1.4.0",
+ "http-body 1.0.1",
  "pin-project-lite",
 ]
 
@@ -1138,8 +1171,8 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2",
- "http",
- "http-body",
+ "http 0.2.12",
+ "http-body 0.4.6",
  "httparse",
  "httpdate",
  "itoa",
@@ -1151,6 +1184,25 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.4.0",
+ "http-body 1.0.1",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
 [[package]]
 name = "hyper-tls"
 version = "0.5.0"
@@ -1158,10 +1210,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper",
+ "hyper 0.14.28",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper 1.5.2",
+ "hyper-util",
  "native-tls",
  "tokio",
  "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.4.0",
+ "http-body 1.0.1",
+ "hyper 1.5.2",
+ "pin-project-lite",
+ "socket2 0.5.7",
+ "tokio",
+ "tower-service",
+ "tracing",
 ]
 
 [[package]]
@@ -2168,10 +2255,10 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-tls",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.28",
+ "hyper-tls 0.5.0",
  "ipnet",
  "js-sys",
  "log",
@@ -2180,14 +2267,53 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls-pemfile",
+ "rustls-pemfile 1.0.4",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper",
+ "sync_wrapper 0.1.2",
  "system-configuration",
  "tokio",
  "tokio-native-tls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "winreg 0.50.0",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http 1.4.0",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.5.2",
+ "hyper-tls 0.6.0",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile 2.2.0",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper 1.0.2",
+ "tokio",
+ "tokio-native-tls",
  "tokio-util",
  "tower-service",
  "url",
@@ -2195,7 +2321,7 @@ dependencies = [
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "winreg 0.50.0",
+ "winreg 0.52.0",
 ]
 
 [[package]]
@@ -2327,6 +2453,24 @@ dependencies = [
  "base64 0.21.7",
 ]
 
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282"
+dependencies = [
+ "zeroize",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.18"
@@ -2580,6 +2724,12 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+
 [[package]]
 name = "synstructure"
 version = "0.13.1"
@@ -2846,7 +2996,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http",
+ "http 0.2.12",
  "httparse",
  "log",
  "native-tls",
@@ -2865,11 +3015,11 @@ dependencies = [
  "async-trait",
  "chrono",
  "futures",
- "hyper",
+ "hyper 0.14.28",
  "log",
  "os_info",
  "rand 0.8.5",
- "reqwest",
+ "reqwest 0.11.27",
  "russh",
  "russh-keys",
  "serde",
@@ -3321,6 +3471,16 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "wit-bindgen"
 version = "0.46.0"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index f8883401b8cc..ae31b55a216b 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -15,7 +15,7 @@ name = "code"
 futures = "0.3.28"
 clap = { version = "4.3.0", features = ["derive", "env"] }
 open = "4.1.0"
-reqwest = { version = "0.11.22", default-features = false, features = ["json", "stream", "native-tls"] }
+reqwest = { version = "0.12.5", default-features = false, features = ["json", "stream", "native-tls"] }
 tokio = { version = "1.43.1", features = ["full"] }
 tokio-util = { version = "0.7.8", features = ["compat", "codec"] }
 flate2 = { version = "1.0.26", default-features = false, features = ["zlib"] }

From fb8c9e857e4d0c81532b59715c34d97f3a54e2f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Dec 2025 12:22:43 +0000
Subject: [PATCH 1339/1815] Bump vscode-markdown-languageservice

Bumps [vscode-markdown-languageservice](https://github.com/microsoft/vscode-markdown-languageservice) from 0.3.0-alpha.3 to 0.4.0.
- [Release notes](https://github.com/microsoft/vscode-markdown-languageservice/releases)
- [Changelog](https://github.com/microsoft/vscode-markdown-languageservice/blob/main/CHANGELOG.md)
- [Commits](https://github.com/microsoft/vscode-markdown-languageservice/commits/v0.4.0)

---
updated-dependencies:
- dependency-name: vscode-markdown-languageservice
  dependency-version: 0.4.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../markdown-language-features/package-lock.json | 16 +++++++++-------
 .../markdown-language-features/package.json      |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index 3f4ba34b5782..2f0fb11df670 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -32,7 +32,7 @@
         "@vscode/markdown-it-katex": "^1.1.1",
         "lodash.throttle": "^4.1.1",
         "vscode-languageserver-types": "^3.17.5",
-        "vscode-markdown-languageservice": "^0.3.0-alpha.3"
+        "vscode-markdown-languageservice": "^0.4.0"
       },
       "engines": {
         "vscode": "^1.70.0"
@@ -712,16 +712,18 @@
       "integrity": "sha512-E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ=="
     },
     "node_modules/vscode-markdown-languageservice": {
-      "version": "0.3.0-alpha.3",
-      "resolved": "https://registry.npmjs.org/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.3.0-alpha.3.tgz",
-      "integrity": "sha512-KPjIuCkSqabkzci7TnlLKep5FYIC45tS7UC5H8zoOii7aoKJru5mZBDXJt86bM3XTgnfpW7rUYqhNnvXbbCBbw==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.4.0.tgz",
+      "integrity": "sha512-3C8pZlC0ofHEYmWwHgenxL6//XrpkrgyytrqNpMlft46q9uBxSUfcXtEGt7wIDNLWsvmgqPqHBwEnBFtLwrWFA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.10",
+        "node-html-parser": "^6.1.5",
         "picomatch": "^2.3.1",
-        "vscode-languageserver-textdocument": "^1.0.5",
-        "vscode-languageserver-types": "^3.17.1",
-        "vscode-uri": "^3.0.3"
+        "vscode-languageserver-textdocument": "^1.0.8",
+        "vscode-languageserver-types": "^3.17.3",
+        "vscode-uri": "^3.0.7"
       },
       "engines": {
         "node": "*"
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 33ea121e9d99..712da9e82d9d 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -786,7 +786,7 @@
     "@vscode/markdown-it-katex": "^1.1.1",
     "lodash.throttle": "^4.1.1",
     "vscode-languageserver-types": "^3.17.5",
-    "vscode-markdown-languageservice": "^0.3.0-alpha.3"
+    "vscode-markdown-languageservice": "^0.4.0"
   },
   "repository": {
     "type": "git",

From b3a05f50918619cecac4bdc1af7b82aeb3c63e32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Dec 2025 12:23:15 +0000
Subject: [PATCH 1340/1815] Bump console from 0.15.8 to 0.16.2 in /cli

Bumps [console](https://github.com/console-rs/console) from 0.15.8 to 0.16.2.
- [Release notes](https://github.com/console-rs/console/releases)
- [Changelog](https://github.com/console-rs/console/blob/main/CHANGELOG.md)
- [Commits](https://github.com/console-rs/console/compare/0.15.8...0.16.2)

---
updated-dependencies:
- dependency-name: console
  dependency-version: 0.16.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 37 +++++++++++++++++++++++++++++++------
 cli/Cargo.toml |  2 +-
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 6335267ac81e..587f241a6afb 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -417,7 +417,7 @@ dependencies = [
  "chrono",
  "clap",
  "clap_lex",
- "console",
+ "console 0.16.2",
  "const_format",
  "core-foundation 0.10.1",
  "dialoguer",
@@ -479,13 +479,26 @@ version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
- "encode_unicode",
+ "encode_unicode 0.3.6",
  "lazy_static",
  "libc",
- "unicode-width",
+ "unicode-width 0.1.12",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "console"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03e45a4a8926227e4197636ba97a9fc9b00477e9f4bd711395687c5f0734bec4"
+dependencies = [
+ "encode_unicode 1.0.0",
+ "libc",
+ "once_cell",
+ "unicode-width 0.2.2",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "const_format"
 version = "0.2.32"
@@ -607,7 +620,7 @@ version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87"
 dependencies = [
- "console",
+ "console 0.15.8",
  "shell-words",
  "tempfile",
  "zeroize",
@@ -682,6 +695,12 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
+[[package]]
+name = "encode_unicode"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
+
 [[package]]
 name = "encoding_rs"
 version = "0.8.34"
@@ -1352,11 +1371,11 @@ version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
 dependencies = [
- "console",
+ "console 0.15.8",
  "instant",
  "number_prefix",
  "portable-atomic",
- "unicode-width",
+ "unicode-width 0.1.12",
 ]
 
 [[package]]
@@ -2914,6 +2933,12 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
 
+[[package]]
+name = "unicode-width"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
+
 [[package]]
 name = "unicode-xid"
 version = "0.2.4"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index f8883401b8cc..b47e13b0da79 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -51,7 +51,7 @@ shell-escape = "0.1.5"
 thiserror = "1.0.40"
 cfg-if = "1.0.0"
 pin-project = "1.1.0"
-console = "0.15.7"
+console = "0.16.2"
 bytes = "1.11.0"
 tar = "0.4.38"
 

From 25288e54a9e6d1fe67ae7d75ea5bb177feb0dccf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Dec 2025 12:26:53 +0000
Subject: [PATCH 1341/1815] Bump eslint-plugin-jsdoc from 50.3.1 to 61.5.0

Bumps [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) from 50.3.1 to 61.5.0.
- [Release notes](https://github.com/gajus/eslint-plugin-jsdoc/releases)
- [Commits](https://github.com/gajus/eslint-plugin-jsdoc/compare/v50.3.1...v61.5.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-jsdoc
  dependency-version: 61.5.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 236 ++++++++++++++++++++++++++++++----------------
 package.json      |   2 +-
 2 files changed, 156 insertions(+), 82 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b30b07a248f5..907f7e925701 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -100,7 +100,7 @@
         "eslint": "^9.11.1",
         "eslint-formatter-compact": "^8.40.0",
         "eslint-plugin-header": "3.1.1",
-        "eslint-plugin-jsdoc": "^50.3.1",
+        "eslint-plugin-jsdoc": "^61.5.0",
         "eslint-plugin-local": "^6.0.0",
         "event-stream": "3.3.4",
         "fancy-log": "^2.0.0",
@@ -1057,17 +1057,44 @@
       }
     },
     "node_modules/@es-joy/jsdoccomment": {
-      "version": "0.48.0",
-      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.48.0.tgz",
-      "integrity": "sha512-G6QUWIcC+KvSwXNsJyDTHvqUdNoAVJPPgkc3+Uk4WBKqZvoXhlvazOgm9aL0HwihJLQf0l+tOE2UFzXBqCqgDw==",
+      "version": "0.76.0",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.76.0.tgz",
+      "integrity": "sha512-g+RihtzFgGTx2WYCuTHbdOXJeAlGnROws0TeALx9ow/ZmOROOZkVg5wp/B44n0WJgI4SQFP1eWM2iRPlU2Y14w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
+        "@types/estree": "^1.0.8",
+        "@typescript-eslint/types": "^8.46.0",
         "comment-parser": "1.4.1",
         "esquery": "^1.6.0",
-        "jsdoc-type-pratt-parser": "~4.1.0"
+        "jsdoc-type-pratt-parser": "~6.10.0"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=20.11.0"
+      }
+    },
+    "node_modules/@es-joy/jsdoccomment/node_modules/@typescript-eslint/types": {
+      "version": "8.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.51.0.tgz",
+      "integrity": "sha512-TizAvWYFM6sSscmEakjY3sPqGwxZRSywSsPEiuZF6d5GmGD9Gvlsv0f6N8FvAAA0CD06l3rIcWNbsN1e5F/9Ag==",
+      "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/@es-joy/resolve.exports": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@es-joy/resolve.exports/-/resolve.exports-1.2.0.tgz",
+      "integrity": "sha512-Q9hjxWI5xBM+qW2enxfe8wDKdFWMfd0Z29k5ZJnuBqD/CasY5Zryj09aCA6owbGATWz+39p5uIdaHXpopOcG8g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
@@ -2122,18 +2149,6 @@
         "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",
@@ -2171,6 +2186,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@sindresorhus/base62": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/base62/-/base62-1.0.0.tgz",
+      "integrity": "sha512-TeheYy0ILzBEI/CO55CP6zJCSdSWeRtGnHy8U8dWSUH4I68iqTsy7HkMktR4xakThc9jotkPQUXT4ITdbV7cHA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@sindresorhus/is": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
@@ -2414,10 +2442,11 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
-      "dev": true
+      "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",
@@ -3950,10 +3979,11 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "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"
       },
@@ -5327,6 +5357,7 @@
       "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz",
       "integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 12.0.0"
       }
@@ -5771,9 +5802,9 @@
       "dev": true
     },
     "node_modules/debug": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "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"
@@ -6629,25 +6660,29 @@
       }
     },
     "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==",
+      "version": "61.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-61.5.0.tgz",
+      "integrity": "sha512-PR81eOGq4S7diVnV9xzFSBE4CDENRQGP0Lckkek8AdHtbj+6Bm0cItwlFnxsLFriJHspiE3mpu8U20eODyToIg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@es-joy/jsdoccomment": "~0.48.0",
+        "@es-joy/jsdoccomment": "~0.76.0",
+        "@es-joy/resolve.exports": "1.2.0",
         "are-docs-informative": "^0.0.2",
         "comment-parser": "1.4.1",
-        "debug": "^4.3.6",
+        "debug": "^4.4.3",
         "escape-string-regexp": "^4.0.0",
-        "espree": "^10.1.0",
+        "espree": "^10.4.0",
         "esquery": "^1.6.0",
-        "parse-imports": "^2.1.1",
-        "semver": "^7.6.3",
+        "html-entities": "^2.6.0",
+        "object-deep-merge": "^2.0.0",
+        "parse-imports-exports": "^0.2.4",
+        "semver": "^7.7.3",
         "spdx-expression-parse": "^4.0.0",
-        "synckit": "^0.9.1"
+        "to-valid-identifier": "^1.0.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20.11.0"
       },
       "peerDependencies": {
         "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
@@ -6754,14 +6789,15 @@
       "dev": true
     },
     "node_modules/espree": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.2.0.tgz",
-      "integrity": "sha512-upbkBJbckcCNBDBDXEbuhjbP68n+scUd3k/U2EkyM9nw+I/jPiL4cLF/Al06CF96wRltFda16sxDFrxsI1v0/g==",
+      "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": {
-        "acorn": "^8.12.0",
+        "acorn": "^8.15.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.1.0"
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6771,10 +6807,11 @@
       }
     },
     "node_modules/espree/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==",
+      "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"
       },
@@ -9513,6 +9550,23 @@
       "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
       "dev": true
     },
+    "node_modules/html-entities": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.6.0.tgz",
+      "integrity": "sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/mdevils"
+        },
+        {
+          "type": "patreon",
+          "url": "https://patreon.com/mdevils"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/html-escaper": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.0.tgz",
@@ -10531,12 +10585,13 @@
       }
     },
     "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==",
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-6.10.0.tgz",
+      "integrity": "sha512-+LexoTRyYui5iOhJGn13N9ZazL23nAHGkXsa1p/C8yeq79WRfLBag6ZZ0FQG2aRoc9yfo59JT9EYCQonOkHKkQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/jsesc": {
@@ -12154,6 +12209,13 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/object-deep-merge": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/object-deep-merge/-/object-deep-merge-2.0.0.tgz",
+      "integrity": "sha512-3DC3UMpeffLTHiuXSy/UG4NOIYTLlY9u3V82+djSCLYClWobZiS4ivYzpIUWrRY/nfsJ8cWsKyG3QfyLePmhvg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/object-inspect": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
@@ -12575,17 +12637,14 @@
         "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==",
+    "node_modules/parse-imports-exports": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/parse-imports-exports/-/parse-imports-exports-0.2.4.tgz",
+      "integrity": "sha512-4s6vd6dx1AotCx/RCI2m7t7GCh5bDRUtGNvRfHSP2wbBQdMi67pPe7mtzmgwcaQ8VKK/6IB7Glfyu3qdZJPybQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "es-module-lexer": "^1.5.3",
-        "slashes": "^3.0.12"
-      },
-      "engines": {
-        "node": ">= 18"
+        "parse-statements": "1.0.11"
       }
     },
     "node_modules/parse-json": {
@@ -12621,6 +12680,13 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/parse-statements": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/parse-statements/-/parse-statements-1.0.11.tgz",
+      "integrity": "sha512-HlsyYdMBnbPQ9Jr/VgJ1YF4scnldvJpJxCVx6KgqPL4dxppsWrJHCIIxQXMJrqGnsRkNPATbeMJ8Yxu7JMsYcA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -14122,6 +14188,19 @@
       "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
       "dev": true
     },
+    "node_modules/reserved-identifiers": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/reserved-identifiers/-/reserved-identifiers-1.2.0.tgz",
+      "integrity": "sha512-yE7KUfFvaBFzGPs5H3Ops1RevfUEsDc5Iz65rOwWg4lE8HJSYtle77uul3+573457oHvBKuHYDl/xqUkKpEEdw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/resolve": {
       "version": "1.22.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -14719,12 +14798,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/slashes": {
-      "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/slashes/-/slashes-3.0.12.tgz",
-      "integrity": "sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==",
-      "dev": true
-    },
     "node_modules/smart-buffer": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
@@ -15396,22 +15469,6 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/synckit": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz",
-      "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==",
-      "dev": true,
-      "dependencies": {
-        "@pkgr/core": "^0.1.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": "^14.18.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/unts"
-      }
-    },
     "node_modules/tapable": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
@@ -15793,6 +15850,23 @@
         "xtend": "~4.0.1"
       }
     },
+    "node_modules/to-valid-identifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-valid-identifier/-/to-valid-identifier-1.0.0.tgz",
+      "integrity": "sha512-41wJyvKep3yT2tyPqX/4blcfybknGB4D+oETKLs7Q76UiPqRpUJK3hr1nxelyYO0PHKVzJwlu0aCeEAsGI6rpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sindresorhus/base62": "^1.0.0",
+        "reserved-identifiers": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/toidentifier": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
diff --git a/package.json b/package.json
index bb7cb922b8ee..1604d35e1eca 100644
--- a/package.json
+++ b/package.json
@@ -159,7 +159,7 @@
     "eslint": "^9.11.1",
     "eslint-formatter-compact": "^8.40.0",
     "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-jsdoc": "^50.3.1",
+    "eslint-plugin-jsdoc": "^61.5.0",
     "eslint-plugin-local": "^6.0.0",
     "event-stream": "3.3.4",
     "fancy-log": "^2.0.0",

From 72891df5a5f5235fdecabccd20f5a2015e4fee03 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Dec 2025 02:41:29 +0000
Subject: [PATCH 1342/1815] Bump qs in /build in the npm_and_yarn group across
 1 directory

Bumps the npm_and_yarn group with 1 update in the /build directory: [qs](https://github.com/ljharb/qs).


Updates `qs` from 6.13.0 to 6.14.1
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.13.0...v6.14.1)

---
updated-dependencies:
- dependency-name: qs
  dependency-version: 6.14.1
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 273 +++++++++++++++++++++++++---------------
 1 file changed, 174 insertions(+), 99 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 96f1498b64d9..cbb34fc38355 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -1765,17 +1765,29 @@
         "node": ">=8"
       }
     },
-    "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+    "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-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"
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2072,23 +2084,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-      "dev": true,
-      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/define-lazy-prop": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
@@ -2192,6 +2187,21 @@
         "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==",
+      "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/duplexify": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz",
@@ -2281,13 +2291,11 @@
       }
     },
     "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "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": {
-        "get-intrinsic": "^1.2.4"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -2297,6 +2305,20 @@
       "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"
       }
@@ -2551,21 +2573,28 @@
       "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.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "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",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "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"
@@ -2574,6 +2603,20 @@
         "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/get-stream": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
@@ -2679,12 +2722,13 @@
       }
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2777,35 +2821,12 @@
         "node": ">=4"
       }
     },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-      "dev": true,
-      "dependencies": {
-        "es-define-property": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "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"
       },
@@ -2818,6 +2839,7 @@
       "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"
       },
@@ -3324,6 +3346,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "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/mdurl": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
@@ -3504,10 +3536,11 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -3766,12 +3799,13 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "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": {
-        "side-channel": "^1.0.6"
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">=0.6"
@@ -3949,23 +3983,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/set-function-length": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-      "dev": true,
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -3988,15 +4005,73 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "dev": true,
+      "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==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"

From 3a8e9c1e76b505683b14a5532cdb1fef894d9dfb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Dec 2025 02:41:31 +0000
Subject: [PATCH 1343/1815] Bump vscode-languageclient in
 /extensions/css-language-features

Bumps [vscode-languageclient](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/client) from 10.0.0-next.13 to 10.0.0-next.19.
- [Release notes](https://github.com/Microsoft/vscode-languageserver-node/releases)
- [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/client/10.0.0-next.19/client)

---
updated-dependencies:
- dependency-name: vscode-languageclient
  dependency-version: 10.0.0-next.19
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../css-language-features/package-lock.json   | 24 +++++++++----------
 extensions/css-language-features/package.json |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/extensions/css-language-features/package-lock.json b/extensions/css-language-features/package-lock.json
index b9236f2180ba..6e56d0542a7c 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.18",
+        "vscode-languageclient": "^10.0.0-next.19",
         "vscode-uri": "^3.1.0"
       },
       "devDependencies": {
@@ -85,35 +85,35 @@
       "license": "MIT"
     },
     "node_modules/vscode-jsonrpc": {
-      "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==",
+      "version": "9.0.0-next.11",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.11.tgz",
+      "integrity": "sha512-u6LElQNbSiE9OugEEmrUKwH6+8BpPz2S5MDHvQUqHL//I4Q8GPikKLOUf856UnbLkZdhxaPrExac1lA3XwpIPA==",
       "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/vscode-languageclient": {
-      "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==",
+      "version": "10.0.0-next.19",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.19.tgz",
+      "integrity": "sha512-sJtO8y0Dxs4ue/DK0QgO/ATBfZwQdee3TqvCsoqUej/GZrBA01DTf4pbfswRxHsTxN2yH0haImUnMafWHtE4CQ==",
       "license": "MIT",
       "dependencies": {
         "minimatch": "^10.0.3",
         "semver": "^7.7.1",
-        "vscode-languageserver-protocol": "3.17.6-next.15"
+        "vscode-languageserver-protocol": "3.17.6-next.16"
       },
       "engines": {
         "vscode": "^1.91.0"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "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==",
+      "version": "3.17.6-next.16",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.16.tgz",
+      "integrity": "sha512-kQTjXEuyxMbdmmZ3U+Lib3oUl12xEKNc73RtWxPSDS3TFtjVwt98Q1CUzfDA9EUpsA24M46Bl6q3sLe9AUOKyw==",
       "license": "MIT",
       "dependencies": {
-        "vscode-jsonrpc": "9.0.0-next.10",
+        "vscode-jsonrpc": "9.0.0-next.11",
         "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 0478fa4d79e1..0779d640a7fa 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.18",
+    "vscode-languageclient": "^10.0.0-next.19",
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {

From fa35ecb443f955a3db3ba24914d9f1f987f5bf9c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Dec 2025 03:14:00 +0000
Subject: [PATCH 1344/1815] Bump @types/node-fetch in
 /extensions/github-authentication

Bumps [@types/node-fetch](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node-fetch) from 2.5.7 to 2.6.13.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node-fetch)

---
updated-dependencies:
- dependency-name: "@types/node-fetch"
  dependency-version: 2.6.13
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../github-authentication/package-lock.json   | 28 +++++++++++--------
 extensions/github-authentication/package.json |  2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/extensions/github-authentication/package-lock.json b/extensions/github-authentication/package-lock.json
index 1ec8f24f7bed..5ec3a0e9e9b4 100644
--- a/extensions/github-authentication/package-lock.json
+++ b/extensions/github-authentication/package-lock.json
@@ -16,7 +16,7 @@
       "devDependencies": {
         "@types/mocha": "^10.0.10",
         "@types/node": "25.x",
-        "@types/node-fetch": "^2.5.7"
+        "@types/node-fetch": "^2.6.13"
       },
       "engines": {
         "vscode": "^1.41.0"
@@ -164,13 +164,14 @@
       }
     },
     "node_modules/@types/node-fetch": {
-      "version": "2.5.7",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz",
-      "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==",
+      "version": "2.6.13",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.13.tgz",
+      "integrity": "sha512-QGpRVpzSaUs30JBSGPjOg4Uveu384erbHBoT1zeONvyCfwQxIkUshLAOqN/k9EjGviPRmWTTe6aH2qySWKTVSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
-        "form-data": "^3.0.0"
+        "form-data": "^4.0.4"
       }
     },
     "node_modules/@vscode/extension-telemetry": {
@@ -190,8 +191,9 @@
     "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
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/call-bind-apply-helpers": {
       "version": "1.0.2",
@@ -212,6 +214,7 @@
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -231,8 +234,9 @@
     "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==",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -325,9 +329,9 @@
       }
     },
     "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==",
+      "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": {
@@ -335,7 +339,7 @@
         "combined-stream": "^1.0.8",
         "es-set-tostringtag": "^2.1.0",
         "hasown": "^2.0.2",
-        "mime-types": "^2.1.35"
+        "mime-types": "^2.1.12"
       },
       "engines": {
         "node": ">= 6"
diff --git a/extensions/github-authentication/package.json b/extensions/github-authentication/package.json
index fb7c9f4a487a..4928e15f51ba 100644
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@@ -68,7 +68,7 @@
   "devDependencies": {
     "@types/mocha": "^10.0.10",
     "@types/node": "25.x",
-    "@types/node-fetch": "^2.5.7"
+    "@types/node-fetch": "^2.6.13"
   },
   "repository": {
     "type": "git",

From 42d4cc870b8f4c17763c81f73071c7308ae809ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Dec 2025 03:35:32 +0000
Subject: [PATCH 1345/1815] Bump vscode-languageserver in
 /extensions/json-language-features/server

Bumps [vscode-languageserver](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/server) from 10.0.0-next.15 to 10.0.0-next.16.
- [Release notes](https://github.com/Microsoft/vscode-languageserver-node/releases)
- [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/client/10.0.0-next.16/server)

---
updated-dependencies:
- dependency-name: vscode-languageserver
  dependency-version: 10.0.0-next.16
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../server/package-lock.json                  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/extensions/json-language-features/server/package-lock.json b/extensions/json-language-features/server/package-lock.json
index 0d09981914cb..a73d433327a6 100644
--- a/extensions/json-language-features/server/package-lock.json
+++ b/extensions/json-language-features/server/package-lock.json
@@ -80,33 +80,33 @@
       }
     },
     "node_modules/vscode-jsonrpc": {
-      "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==",
+      "version": "9.0.0-next.11",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.11.tgz",
+      "integrity": "sha512-u6LElQNbSiE9OugEEmrUKwH6+8BpPz2S5MDHvQUqHL//I4Q8GPikKLOUf856UnbLkZdhxaPrExac1lA3XwpIPA==",
       "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/vscode-languageserver": {
-      "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==",
+      "version": "10.0.0-next.16",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-10.0.0-next.16.tgz",
+      "integrity": "sha512-RbsYDOhddv1NtBCAR7+oVxxCmOpQUHhrtgUE0xz6J+BJGSCkfOqBCyLUIwSjKk2rK9llxUj/pR5aL8QCsXrxow==",
       "license": "MIT",
       "dependencies": {
-        "vscode-languageserver-protocol": "3.17.6-next.15"
+        "vscode-languageserver-protocol": "3.17.6-next.16"
       },
       "bin": {
         "installServerIntoExtension": "bin/installServerIntoExtension"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "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==",
+      "version": "3.17.6-next.16",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.16.tgz",
+      "integrity": "sha512-kQTjXEuyxMbdmmZ3U+Lib3oUl12xEKNc73RtWxPSDS3TFtjVwt98Q1CUzfDA9EUpsA24M46Bl6q3sLe9AUOKyw==",
       "license": "MIT",
       "dependencies": {
-        "vscode-jsonrpc": "9.0.0-next.10",
+        "vscode-jsonrpc": "9.0.0-next.11",
         "vscode-languageserver-types": "3.17.6-next.6"
       }
     },

From ee40a877b4d623f80b2412b7ed1cb6386088208d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Dec 2025 04:14:22 +0000
Subject: [PATCH 1346/1815] Bump vscode-languageclient in
 /extensions/json-language-features

Bumps [vscode-languageclient](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/client) from 10.0.0-next.13 to 10.0.0-next.19.
- [Release notes](https://github.com/Microsoft/vscode-languageserver-node/releases)
- [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/client/10.0.0-next.19/client)

---
updated-dependencies:
- dependency-name: vscode-languageclient
  dependency-version: 10.0.0-next.19
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../json-language-features/package-lock.json  | 24 +++++++++----------
 .../json-language-features/package.json       |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/extensions/json-language-features/package-lock.json b/extensions/json-language-features/package-lock.json
index 9fada55f0f42..dd8c744df39d 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": "^1.2.0",
         "request-light": "^0.8.0",
-        "vscode-languageclient": "^10.0.0-next.18"
+        "vscode-languageclient": "^10.0.0-next.19"
       },
       "devDependencies": {
         "@types/node": "25.x"
@@ -229,35 +229,35 @@
       "license": "MIT"
     },
     "node_modules/vscode-jsonrpc": {
-      "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==",
+      "version": "9.0.0-next.11",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.0-next.11.tgz",
+      "integrity": "sha512-u6LElQNbSiE9OugEEmrUKwH6+8BpPz2S5MDHvQUqHL//I4Q8GPikKLOUf856UnbLkZdhxaPrExac1lA3XwpIPA==",
       "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/vscode-languageclient": {
-      "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==",
+      "version": "10.0.0-next.19",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-10.0.0-next.19.tgz",
+      "integrity": "sha512-sJtO8y0Dxs4ue/DK0QgO/ATBfZwQdee3TqvCsoqUej/GZrBA01DTf4pbfswRxHsTxN2yH0haImUnMafWHtE4CQ==",
       "license": "MIT",
       "dependencies": {
         "minimatch": "^10.0.3",
         "semver": "^7.7.1",
-        "vscode-languageserver-protocol": "3.17.6-next.15"
+        "vscode-languageserver-protocol": "3.17.6-next.16"
       },
       "engines": {
         "vscode": "^1.91.0"
       }
     },
     "node_modules/vscode-languageserver-protocol": {
-      "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==",
+      "version": "3.17.6-next.16",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.6-next.16.tgz",
+      "integrity": "sha512-kQTjXEuyxMbdmmZ3U+Lib3oUl12xEKNc73RtWxPSDS3TFtjVwt98Q1CUzfDA9EUpsA24M46Bl6q3sLe9AUOKyw==",
       "license": "MIT",
       "dependencies": {
-        "vscode-jsonrpc": "9.0.0-next.10",
+        "vscode-jsonrpc": "9.0.0-next.11",
         "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 d9c1ca3335d8..64e5a781fa30 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -169,7 +169,7 @@
   "dependencies": {
     "@vscode/extension-telemetry": "^1.2.0",
     "request-light": "^0.8.0",
-    "vscode-languageclient": "^10.0.0-next.18"
+    "vscode-languageclient": "^10.0.0-next.19"
   },
   "devDependencies": {
     "@types/node": "25.x"

From 51bf973703020a753bd26d9af0e37c7ea4b1b7c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Dec 2025 04:28:40 +0000
Subject: [PATCH 1347/1815] Bump @types/which in
 /extensions/php-language-features

Bumps [@types/which](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/which) from 2.0.0 to 3.0.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/which)

---
updated-dependencies:
- dependency-name: "@types/which"
  dependency-version: 3.0.4
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/php-language-features/package-lock.json | 11 ++++++-----
 extensions/php-language-features/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/php-language-features/package-lock.json b/extensions/php-language-features/package-lock.json
index fa876d6b2e01..53c10b8f62aa 100644
--- a/extensions/php-language-features/package-lock.json
+++ b/extensions/php-language-features/package-lock.json
@@ -13,7 +13,7 @@
       },
       "devDependencies": {
         "@types/node": "25.x",
-        "@types/which": "^2.0.0"
+        "@types/which": "^3.0.4"
       },
       "engines": {
         "vscode": "0.10.x"
@@ -30,10 +30,11 @@
       }
     },
     "node_modules/@types/which": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/which/-/which-2.0.0.tgz",
-      "integrity": "sha512-JHTNOEpZnACQdsTojWggn+SQ8IucfqEhtz7g8Z0G67WdSj4x3F0X5I2c/CVcl8z/QukGrIHeQ/N49v1au74XFQ==",
-      "dev": true
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-3.0.4.tgz",
+      "integrity": "sha512-liyfuo/106JdlgSchJzXEQCVArk0CvevqPote8F8HgWgJ3dRCcTHgJIsLDuee0kxk/mhbInzIZk3QWSZJ8R+2w==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/isexe": {
       "version": "3.1.1",
diff --git a/extensions/php-language-features/package.json b/extensions/php-language-features/package.json
index dd5591bbf5c9..0194aeda2a9c 100644
--- a/extensions/php-language-features/package.json
+++ b/extensions/php-language-features/package.json
@@ -78,7 +78,7 @@
   },
   "devDependencies": {
     "@types/node": "25.x",
-    "@types/which": "^2.0.0"
+    "@types/which": "^3.0.4"
   },
   "repository": {
     "type": "git",

From fdfa9841a61178b1c856a30ccc202c8a3c141457 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Dec 2025 10:34:19 +0000
Subject: [PATCH 1348/1815] Bump @types/tmp from 0.2.2 to 0.2.6 in
 /test/automation

Bumps [@types/tmp](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/tmp) from 0.2.2 to 0.2.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/tmp)

---
updated-dependencies:
- dependency-name: "@types/tmp"
  dependency-version: 0.2.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/automation/package-lock.json | 11 ++++++-----
 test/automation/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
index 3ab2784bc88d..88fcf1d3b372 100644
--- a/test/automation/package-lock.json
+++ b/test/automation/package-lock.json
@@ -17,7 +17,7 @@
       "devDependencies": {
         "@types/ncp": "2.0.8",
         "@types/node": "25.x",
-        "@types/tmp": "0.2.2",
+        "@types/tmp": "0.2.6",
         "cpx2": "8.0.0",
         "nodemon": "^3.1.11",
         "npm-run-all": "^4.1.5"
@@ -85,10 +85,11 @@
       }
     },
     "node_modules/@types/tmp": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.2.tgz",
-      "integrity": "sha512-MhSa0yylXtVMsyT8qFpHA1DLHj4DvQGH5ntxrhHSh8PxUVNi35Wk+P5hVgqbO2qZqOotqr9jaoPRL+iRjWYm/A==",
-      "dev": true
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.6.tgz",
+      "integrity": "sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/ansi-regex": {
       "version": "6.2.2",
diff --git a/test/automation/package.json b/test/automation/package.json
index 3d9a4ba14cdb..349e67554fd5 100644
--- a/test/automation/package.json
+++ b/test/automation/package.json
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@types/ncp": "2.0.8",
     "@types/node": "25.x",
-    "@types/tmp": "0.2.2",
+    "@types/tmp": "0.2.6",
     "cpx2": "8.0.0",
     "nodemon": "^3.1.11",
     "npm-run-all": "^4.1.5"

From 86a0929eec02978e1f0c62140455e36e472e6a07 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Dec 2025 11:01:03 +0000
Subject: [PATCH 1349/1815] Bump @types/tmp from 0.1.0 to 0.2.6 in
 /test/integration/browser

Bumps [@types/tmp](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/tmp) from 0.1.0 to 0.2.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/tmp)

---
updated-dependencies:
- dependency-name: "@types/tmp"
  dependency-version: 0.2.6
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/integration/browser/package-lock.json | 178 ++++++++++-----------
 test/integration/browser/package.json      |   2 +-
 2 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/test/integration/browser/package-lock.json b/test/integration/browser/package-lock.json
index 3680f00e6e80..8dc10163f03d 100644
--- a/test/integration/browser/package-lock.json
+++ b/test/integration/browser/package-lock.json
@@ -11,36 +11,13 @@
       "devDependencies": {
         "@types/node": "25.x",
         "@types/rimraf": "^2.0.4",
-        "@types/tmp": "0.1.0",
+        "@types/tmp": "0.2.6",
         "rimraf": "^2.6.1",
         "tmp": "0.2.5",
         "tree-kill": "1.2.2",
         "vscode-uri": "^3.1.0"
       }
     },
-    "node_modules/@isaacs/balanced-match": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
-      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
-    "node_modules/@isaacs/brace-expansion": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
-      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@isaacs/balanced-match": "^4.0.1"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
     "node_modules/@types/events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
@@ -85,107 +62,130 @@
       }
     },
     "node_modules/@types/tmp": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.1.0.tgz",
-      "integrity": "sha512-6IwZ9HzWbCq6XoQWhxLpDjuADodH/MKXRUIDFudvgjcVdjFknvmR+DNsoUeer4XPrEnrZs04Jj+kfV9pFsrhmA==",
-      "dev": true
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.6.tgz",
+      "integrity": "sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/brace-expansion": {
+      "version": "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"
+      }
+    },
+    "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/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/glob": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.0.tgz",
-      "integrity": "sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==",
+      "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": "BlueOak-1.0.0",
+      "license": "ISC",
       "dependencies": {
-        "minimatch": "^10.1.1",
-        "minipass": "^7.1.2",
-        "path-scurry": "^2.0.0"
+        "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": "20 || >=22"
+        "node": "*"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/lru-cache": {
-      "version": "11.2.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.2.tgz",
-      "integrity": "sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==",
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "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,
       "license": "ISC",
-      "engines": {
-        "node": "20 || >=22"
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/minimatch": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
-      "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "license": "BlueOak-1.0.0",
+      "license": "ISC",
       "dependencies": {
-        "@isaacs/brace-expansion": "^5.0.0"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": "20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": "*"
       }
     },
-    "node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
       "license": "ISC",
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
+      "dependencies": {
+        "wrappy": "1"
       }
     },
-    "node_modules/package-json-from-dist": {
+    "node_modules/path-is-absolute": {
       "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==",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true,
-      "license": "BlueOak-1.0.0"
-    },
-    "node_modules/path-scurry": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz",
-      "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "lru-cache": "^11.0.0",
-        "minipass": "^7.1.2"
-      },
+      "license": "MIT",
       "engines": {
-        "node": "20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/rimraf": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.2.tgz",
-      "integrity": "sha512-cFCkPslJv7BAXJsYlK1dZsbP8/ZNLkCAQ0bi1hf5EKX2QHegmDFEFA6QhuYJlk7UDdc+02JjO80YSOrWPpw06g==",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
-      "license": "BlueOak-1.0.0",
+      "license": "ISC",
       "dependencies": {
-        "glob": "^13.0.0",
-        "package-json-from-dist": "^1.0.1"
+        "glob": "^7.1.3"
       },
       "bin": {
-        "rimraf": "dist/esm/bin.mjs"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "rimraf": "bin.js"
       }
     },
     "node_modules/tmp": {
diff --git a/test/integration/browser/package.json b/test/integration/browser/package.json
index eeefdf3fa7c9..57b952fa7f31 100644
--- a/test/integration/browser/package.json
+++ b/test/integration/browser/package.json
@@ -9,7 +9,7 @@
   "devDependencies": {
     "@types/node": "25.x",
     "@types/rimraf": "^2.0.4",
-    "@types/tmp": "0.1.0",
+    "@types/tmp": "0.2.6",
     "rimraf": "^2.6.1",
     "tmp": "0.2.5",
     "tree-kill": "1.2.2",

From 1c01566a047f036713787c323dbc375866046474 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Dec 2025 12:24:22 +0000
Subject: [PATCH 1350/1815] Bump markdown-it from 12.3.2 to 14.1.0 in
 /extensions/extension-editing

Bumps [markdown-it](https://github.com/markdown-it/markdown-it) from 12.3.2 to 14.1.0.
- [Changelog](https://github.com/markdown-it/markdown-it/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/markdown-it/compare/12.3.2...14.1.0)

---
updated-dependencies:
- dependency-name: markdown-it
  dependency-version: 14.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../extension-editing/package-lock.json       | 57 ++++++++++++-------
 extensions/extension-editing/package.json     |  2 +-
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/extensions/extension-editing/package-lock.json b/extensions/extension-editing/package-lock.json
index 9cb66a5d7e00..a25cfb632b3b 100644
--- a/extensions/extension-editing/package-lock.json
+++ b/extensions/extension-editing/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "jsonc-parser": "^3.3.1",
-        "markdown-it": "^12.3.2",
+        "markdown-it": "^14.1.0",
         "parse5": "^8.0.0"
       },
       "devDependencies": {
@@ -62,10 +62,13 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/entities": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
@@ -77,34 +80,35 @@
       "license": "MIT"
     },
     "node_modules/linkify-it": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
-      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "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==",
       "license": "MIT",
       "dependencies": {
-        "uc.micro": "^1.0.1"
+        "uc.micro": "^2.0.0"
       }
     },
     "node_modules/markdown-it": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
-      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
+      "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1",
-        "entities": "~2.1.0",
-        "linkify-it": "^3.0.1",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
+        "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.js"
+        "markdown-it": "bin/markdown-it.mjs"
       }
     },
     "node_modules/mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
       "license": "MIT"
     },
     "node_modules/parse5": {
@@ -131,10 +135,19 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/punycode.js": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
+      "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/uc.micro": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
       "license": "MIT"
     },
     "node_modules/undici-types": {
diff --git a/extensions/extension-editing/package.json b/extensions/extension-editing/package.json
index 26e9f9f8d446..03f7f6398836 100644
--- a/extensions/extension-editing/package.json
+++ b/extensions/extension-editing/package.json
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "jsonc-parser": "^3.3.1",
-    "markdown-it": "^12.3.2",
+    "markdown-it": "^14.1.0",
     "parse5": "^8.0.0"
   },
   "contributes": {

From eed21bb1a16fa7df51f3cea2a28ad4806afca9b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Dec 2025 12:28:25 +0000
Subject: [PATCH 1351/1815] Bump @types/semver from 7.5.8 to 7.7.1

Bumps [@types/semver](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/semver) from 7.5.8 to 7.7.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/semver)

---
updated-dependencies:
- dependency-name: "@types/semver"
  dependency-version: 7.7.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b30b07a248f5..7756f88ce7b8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "@microsoft/1ds-core-js": "^3.2.13",
         "@microsoft/1ds-post-js": "^3.2.13",
         "@parcel/watcher": "2.5.1",
-        "@types/semver": "^7.5.8",
+        "@types/semver": "^7.7.1",
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.0",
         "@vscode/policy-watcher": "^1.2.0",
@@ -2561,9 +2561,10 @@
       }
     },
     "node_modules/@types/semver": {
-      "version": "7.5.8",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
-      "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ=="
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==",
+      "license": "MIT"
     },
     "node_modules/@types/sinon": {
       "version": "21.0.0",
diff --git a/package.json b/package.json
index bb7cb922b8ee..6fca14849270 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
     "@parcel/watcher": "2.5.1",
-    "@types/semver": "^7.5.8",
+    "@types/semver": "^7.7.1",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
     "@vscode/policy-watcher": "^1.2.0",

From 4063fce1461a77723f768015289e2aba13ee5470 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Dec 2025 17:55:16 +0000
Subject: [PATCH 1352/1815] Bump @types/vscode-notebook-renderer

Bumps [@types/vscode-notebook-renderer](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/vscode-notebook-renderer) from 1.60.0 to 1.72.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/vscode-notebook-renderer)

---
updated-dependencies:
- dependency-name: "@types/vscode-notebook-renderer"
  dependency-version: 1.72.4
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../markdown-language-features/package-lock.json      | 11 ++++++-----
 extensions/markdown-language-features/package.json    |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index eaaea2e86ec6..d1e44f5a3f62 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -27,7 +27,7 @@
         "@types/lodash.throttle": "^4.1.9",
         "@types/markdown-it": "14.1.2",
         "@types/picomatch": "^2.3.0",
-        "@types/vscode-notebook-renderer": "^1.60.0",
+        "@types/vscode-notebook-renderer": "^1.72.4",
         "@types/vscode-webview": "^1.57.5",
         "@vscode/markdown-it-katex": "^1.1.1",
         "lodash.throttle": "^4.1.1",
@@ -226,10 +226,11 @@
       "optional": true
     },
     "node_modules/@types/vscode-notebook-renderer": {
-      "version": "1.60.0",
-      "resolved": "https://registry.npmjs.org/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.60.0.tgz",
-      "integrity": "sha512-u7TD2uuEZTVuitx0iijOJdKI0JLiQP6PsSBSRy2XmHXUOXcp5p1S56NrjOEDoF+PIHd3NL3eO6KTRSf5nukDqQ==",
-      "dev": true
+      "version": "1.72.4",
+      "resolved": "https://registry.npmjs.org/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.72.4.tgz",
+      "integrity": "sha512-bdKO41c6Dc24pH/O/eM/jqfCwGH4zc76o/g/6Gt1y/eg/bvvqP2/VpbV+Sa5Te2sZekFRcbYnSSFTKo3wcVGUg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/vscode-webview": {
       "version": "1.57.5",
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 3cbb8495e4b5..56cbb1cce8f9 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -781,7 +781,7 @@
     "@types/lodash.throttle": "^4.1.9",
     "@types/markdown-it": "14.1.2",
     "@types/picomatch": "^2.3.0",
-    "@types/vscode-notebook-renderer": "^1.60.0",
+    "@types/vscode-notebook-renderer": "^1.72.4",
     "@types/vscode-webview": "^1.57.5",
     "@vscode/markdown-it-katex": "^1.1.1",
     "lodash.throttle": "^4.1.1",

From 227b5868f5420ccfa30ade9f8b8b7dbe88127260 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Dec 2025 23:42:25 +0000
Subject: [PATCH 1353/1815] Bump request-light from 0.7.0 to 0.8.0 in
 /extensions/npm

Bumps [request-light](https://github.com/microsoft/node-request-light) from 0.7.0 to 0.8.0.
- [Release notes](https://github.com/microsoft/node-request-light/releases)
- [Changelog](https://github.com/microsoft/node-request-light/blob/main/CHANGELOG.md)
- [Commits](https://github.com/microsoft/node-request-light/commits/v0.8.0)

---
updated-dependencies:
- dependency-name: request-light
  dependency-version: 0.8.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/npm/package-lock.json | 8 ++++----
 extensions/npm/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index c7b0b62c2206..a85cd6a6718f 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -13,7 +13,7 @@
         "find-yarn-workspace-root": "^2.0.0",
         "jsonc-parser": "^3.3.1",
         "minimatch": "^10.1.1",
-        "request-light": "^0.7.0",
+        "request-light": "^0.8.0",
         "vscode-uri": "^3.1.0",
         "which": "^6.0.0",
         "which-pm": "^3.0.1"
@@ -284,9 +284,9 @@
       }
     },
     "node_modules/request-light": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.7.0.tgz",
-      "integrity": "sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q==",
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.8.0.tgz",
+      "integrity": "sha512-bH6E4PMmsEXYrLX6Kr1vu+xI3HproB1vECAwaPSJeroLE1kpWE3HR27uB4icx+6YORu1ajqBJXxuedv8ZQg5Lw==",
       "license": "MIT"
     },
     "node_modules/sprintf-js": {
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index fb10c198a7eb..1c2e03d223ff 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -25,7 +25,7 @@
     "find-yarn-workspace-root": "^2.0.0",
     "jsonc-parser": "^3.3.1",
     "minimatch": "^10.1.1",
-    "request-light": "^0.7.0",
+    "request-light": "^0.8.0",
     "which": "^6.0.0",
     "which-pm": "^3.0.1",
     "vscode-uri": "^3.1.0"

From c34c9e1127ffeb98d55dc95d09eb4e4d1547ff5b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 00:21:21 +0000
Subject: [PATCH 1354/1815] Bump @types/node from 20.11.24 to 25.0.3 in /build

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 20 +++++++++++---------
 build/package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 9fd1b99a630f..90903d8bcaed 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -34,7 +34,7 @@
         "@types/minimatch": "^3.0.3",
         "@types/minimist": "^1.2.1",
         "@types/mocha": "^10.0.10",
-        "@types/node": "20.x",
+        "@types/node": "25.x",
         "@types/pump": "^1.0.1",
         "@types/rimraf": "^2.0.4",
         "@types/through": "^0.0.33",
@@ -1202,12 +1202,13 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.11.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.24.tgz",
-      "integrity": "sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==",
+      "version": "25.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
+      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@types/pump": {
@@ -4456,10 +4457,11 @@
       "dev": true
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/universal-user-agent": {
       "version": "6.0.0",
diff --git a/build/package.json b/build/package.json
index 698a34b54f19..92d35ba0b7a6 100644
--- a/build/package.json
+++ b/build/package.json
@@ -28,7 +28,7 @@
     "@types/minimatch": "^3.0.3",
     "@types/minimist": "^1.2.1",
     "@types/mocha": "^10.0.10",
-    "@types/node": "20.x",
+    "@types/node": "25.x",
     "@types/pump": "^1.0.1",
     "@types/rimraf": "^2.0.4",
     "@types/through": "^0.0.33",

From 5673d4be6b2f6ae61c2acafdb979938ca4cf3943 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 03:38:26 +0000
Subject: [PATCH 1355/1815] Bump @xterm/xterm from 5.6.0-beta.140 to 6.0.0 in
 /remote/web

Bumps [@xterm/xterm](https://github.com/xtermjs/xterm.js) from 5.6.0-beta.140 to 6.0.0.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits/6.0.0)

---
updated-dependencies:
- dependency-name: "@xterm/xterm"
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 8 ++++----
 remote/web/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 2916eb36d888..44d724818689 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -21,7 +21,7 @@
 				"@xterm/addon-serialize": "^0.15.0-beta.56",
 				"@xterm/addon-unicode11": "^0.9.0-beta.140",
 				"@xterm/addon-webgl": "^0.19.0-beta.140",
-				"@xterm/xterm": "^5.6.0-beta.140",
+				"@xterm/xterm": "^6.0.0",
 				"jschardet": "3.1.4",
 				"tas-client-umd": "0.2.0",
 				"vscode-oniguruma": "2.0.1",
@@ -255,9 +255,9 @@
 			}
 		},
 		"node_modules/@xterm/xterm": {
-			"version": "5.6.0-beta.140",
-			"resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.140.tgz",
-			"integrity": "sha512-zqMxdVN+kEoKoCySae+uHIkJhYYifr2GG2KIiU/WvCLSTpr28aRzzsajNvaWj+2jVts20QXOMfHeHZsggDETmA==",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.0.0.tgz",
+			"integrity": "sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg==",
 			"license": "MIT",
 			"workspaces": [
 				"addons/*"
diff --git a/remote/web/package.json b/remote/web/package.json
index a2d88eeae040..558cd1bfe9d0 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -16,7 +16,7 @@
 		"@xterm/addon-serialize": "^0.15.0-beta.56",
 		"@xterm/addon-unicode11": "^0.9.0-beta.140",
 		"@xterm/addon-webgl": "^0.19.0-beta.140",
-		"@xterm/xterm": "^5.6.0-beta.140",
+		"@xterm/xterm": "^6.0.0",
 		"jschardet": "3.1.4",
 		"tas-client-umd": "0.2.0",
 		"vscode-oniguruma": "2.0.1",

From e7f4c7574de4b5da4ed6f20a57096cbc3b822553 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 03:49:15 +0000
Subject: [PATCH 1356/1815] Bump @xterm/addon-ligatures in /remote/web

Bumps [@xterm/addon-ligatures](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.140 to 0.11.0-beta.57.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-ligatures"
  dependency-version: 0.11.0-beta.57
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 849fc8b4eaae..15cc49d4cc0a 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -15,7 +15,7 @@
 				"@vscode/vscode-languagedetection": "1.0.22",
 				"@xterm/addon-clipboard": "^0.3.0-beta.56",
 				"@xterm/addon-image": "^0.9.0-beta.140",
-				"@xterm/addon-ligatures": "^0.10.0-beta.140",
+				"@xterm/addon-ligatures": "^0.11.0-beta.76",
 				"@xterm/addon-progress": "^0.3.0-beta.57",
 				"@xterm/addon-search": "^0.16.0-beta.140",
 				"@xterm/addon-serialize": "^0.15.0-beta.56",
@@ -194,9 +194,9 @@
 			}
 		},
 		"node_modules/@xterm/addon-ligatures": {
-			"version": "0.10.0-beta.140",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.140.tgz",
-			"integrity": "sha512-ps/M90wXHEec8nQ8UJXNLccrJGRADKLVcw4F81DPgzdTNLe4iPcGZ5ASFIB1WZkSO0k28nTes7uAPLGjvWS4ig==",
+			"version": "0.11.0-beta.76",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.76.tgz",
+			"integrity": "sha512-j8FTZMPK+TiwqBBHbXHDbOZYh6h/MJB1ZSPyfHuaodglyAwjbk3/S/IuWMGfA7zftX05ucpcUYyejzZJvWPFgA==",
 			"license": "MIT",
 			"dependencies": {
 				"font-finder": "^1.1.0",
@@ -206,7 +206,7 @@
 				"node": ">8.0.0"
 			},
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.140"
+				"@xterm/xterm": "^6.1.0-beta.76"
 			}
 		},
 		"node_modules/@xterm/addon-progress": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 419d3f3d77a9..d513a721de16 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -10,7 +10,7 @@
 		"@vscode/vscode-languagedetection": "1.0.22",
 		"@xterm/addon-clipboard": "^0.3.0-beta.56",
 		"@xterm/addon-image": "^0.9.0-beta.140",
-		"@xterm/addon-ligatures": "^0.10.0-beta.140",
+		"@xterm/addon-ligatures": "^0.11.0-beta.76",
 		"@xterm/addon-progress": "^0.3.0-beta.57",
 		"@xterm/addon-search": "^0.16.0-beta.140",
 		"@xterm/addon-serialize": "^0.15.0-beta.56",

From 0c304fd867d29a8b68bc6359bc9887b4a5fc1705 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 04:04:18 +0000
Subject: [PATCH 1357/1815] Bump @xterm/addon-webgl in /remote/web

Bumps [@xterm/addon-webgl](https://github.com/xtermjs/xterm.js) from 0.19.0-beta.140 to 0.20.0-beta.56.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-webgl"
  dependency-version: 0.20.0-beta.56
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 129d8715872a..8e0b32fc40a1 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -20,7 +20,7 @@
 				"@xterm/addon-search": "^0.16.0-beta.140",
 				"@xterm/addon-serialize": "^0.15.0-beta.56",
 				"@xterm/addon-unicode11": "^0.9.0-beta.140",
-				"@xterm/addon-webgl": "^0.19.0-beta.140",
+				"@xterm/addon-webgl": "^0.20.0-beta.75",
 				"@xterm/xterm": "^6.0.0",
 				"jschardet": "3.1.4",
 				"tas-client-umd": "0.2.0",
@@ -246,12 +246,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-webgl": {
-			"version": "0.19.0-beta.140",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.140.tgz",
-			"integrity": "sha512-CV10uRnoAUeAKOYES+0/Mh6IPEhtIH+agC1J3PCCL6y9TAnXN67YQMziG18FYn8cTQYgeSpsXx/Q+suBCGbfkA==",
+			"version": "0.20.0-beta.75",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.75.tgz",
+			"integrity": "sha512-GW1nkyO8xeIotTGbdl6a/ZxV4scFTqz5fJ6dAid85Y3U6iM62htJC/1Gjn0xTnga32Qq86jm2JND8OhYYONqsg==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.140"
+				"@xterm/xterm": "^6.1.0-beta.76"
 			}
 		},
 		"node_modules/@xterm/xterm": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 96510e75fca0..5cc5746072da 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -15,7 +15,7 @@
 		"@xterm/addon-search": "^0.16.0-beta.140",
 		"@xterm/addon-serialize": "^0.15.0-beta.56",
 		"@xterm/addon-unicode11": "^0.9.0-beta.140",
-		"@xterm/addon-webgl": "^0.19.0-beta.140",
+		"@xterm/addon-webgl": "^0.20.0-beta.75",
 		"@xterm/xterm": "^6.0.0",
 		"jschardet": "3.1.4",
 		"tas-client-umd": "0.2.0",

From 01f1cf87fab3be240edef7ec8f28df83a6ace5a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 12:25:47 +0000
Subject: [PATCH 1358/1815] Bump @vscode/vsce from 2.20.1 to 3.7.1 in /build

Bumps [@vscode/vsce](https://github.com/Microsoft/vsce) from 2.20.1 to 3.7.1.
- [Release notes](https://github.com/Microsoft/vsce/releases)
- [Commits](https://github.com/Microsoft/vsce/compare/v2.20.1...v3.7.1)

---
updated-dependencies:
- dependency-name: "@vscode/vsce"
  dependency-version: 3.7.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 2649 +++++++++++++++++++++++++++++++++++----
 build/package.json      |    2 +-
 2 files changed, 2396 insertions(+), 255 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index f034674714cb..d1f435f05815 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -43,7 +43,7 @@
         "@types/xml2js": "0.0.33",
         "@vscode/iconv-lite-umd": "0.7.0",
         "@vscode/ripgrep": "^1.15.10",
-        "@vscode/vsce": "2.20.1",
+        "@vscode/vsce": "3.7.1",
         "byline": "^5.0.0",
         "debug": "^4.3.2",
         "electron-osx-sign": "^0.6.0",
@@ -67,6 +67,23 @@
         "vscode-gulp-watch": "^5.0.3"
       }
     },
+    "node_modules/@azu/format-text": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@azu/format-text/-/format-text-1.0.2.tgz",
+      "integrity": "sha512-Swi4N7Edy1Eqq82GxgEECXSSLyn6GOb5htRFPzBDdUkECGXtlf12ynO5oJSpWKPwCaUssOu7NfhDcCWpIC6Ywg==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@azu/style-format": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@azu/style-format/-/style-format-1.0.1.tgz",
+      "integrity": "sha512-AHcTojlNBdD/3/KxIKlg8sxIWHfOtQszLvOpagLTO+bjC3u7SAszu1lf//u7JJC50aUSH+BVWDD/KvaA6Gfn5g==",
+      "dev": true,
+      "license": "WTFPL",
+      "dependencies": {
+        "@azu/format-text": "^1.0.1"
+      }
+    },
     "node_modules/@azure-rest/core-client": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/@azure-rest/core-client/-/core-client-2.5.1.tgz",
@@ -555,6 +572,31 @@
         "node": ">=18.0.0"
       }
     },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@electron/asar": {
       "version": "3.2.10",
       "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.10.tgz",
@@ -1027,6 +1069,72 @@
         "node": ">=18"
       }
     },
+    "node_modules/@isaacs/balanced-match": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/brace-expansion": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@isaacs/balanced-match": "^4.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@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",
+      "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/@malept/cross-spawn-promise": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz",
@@ -1049,178 +1157,563 @@
         "node": ">= 12.13.0"
       }
     },
-    "node_modules/@sindresorhus/is": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
-      "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
+    "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,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
       "engines": {
-        "node": ">=10"
+        "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,
+      "license": "MIT",
+      "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,
+      "license": "MIT",
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
       },
-      "funding": {
-        "url": "https://github.com/sindresorhus/is?sponsor=1"
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "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==",
+    "node_modules/@secretlint/config-creator": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/@secretlint/config-creator/-/config-creator-10.2.2.tgz",
+      "integrity": "sha512-BynOBe7Hn3LJjb3CqCHZjeNB09s/vgf0baBaHVw67w7gHF0d25c3ZsZ5+vv8TgwSchRdUCRrbbcq5i2B1fJ2QQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "defer-to-connect": "^2.0.0"
+        "@secretlint/types": "^10.2.2"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=20.0.0"
       }
     },
-    "node_modules/@types/ansi-colors": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@types/ansi-colors/-/ansi-colors-3.2.0.tgz",
-      "integrity": "sha512-0caWAhXht9N2lOdMzJLXybsSkYCx1QOdxx6pae48tswI9QV3DFX26AoOpy0JxwhCb+zISTqmd6H8t9Zby9BoZg==",
-      "dev": true
+    "node_modules/@secretlint/config-loader": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/@secretlint/config-loader/-/config-loader-10.2.2.tgz",
+      "integrity": "sha512-ndjjQNgLg4DIcMJp4iaRD6xb9ijWQZVbd9694Ol2IszBIbGPPkwZHzJYKICbTBmh6AH/pLr0CiCaWdGJU7RbpQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@secretlint/profiler": "^10.2.2",
+        "@secretlint/resolver": "^10.2.2",
+        "@secretlint/types": "^10.2.2",
+        "ajv": "^8.17.1",
+        "debug": "^4.4.1",
+        "rc-config-loader": "^4.1.3"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
     },
-    "node_modules/@types/byline": {
-      "version": "4.2.32",
-      "resolved": "https://registry.npmjs.org/@types/byline/-/byline-4.2.32.tgz",
-      "integrity": "sha512-qtlm/J6XOO9p+Ep/ZB5+mCFEDhzWDDHWU4a1eReN7lkPZXW9rkloq2jcAhvKKmlO5tL2GSvKROb+PTsNVhBiyQ==",
+    "node_modules/@secretlint/core": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/@secretlint/core/-/core-10.2.2.tgz",
+      "integrity": "sha512-6rdwBwLP9+TO3rRjMVW1tX+lQeo5gBbxl1I5F8nh8bgGtKwdlCMhMKsBWzWg1ostxx/tIG7OjZI0/BxsP8bUgw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "@secretlint/profiler": "^10.2.2",
+        "@secretlint/types": "^10.2.2",
+        "debug": "^4.4.1",
+        "structured-source": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=20.0.0"
       }
     },
-    "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==",
+    "node_modules/@secretlint/formatter": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/@secretlint/formatter/-/formatter-10.2.2.tgz",
+      "integrity": "sha512-10f/eKV+8YdGKNQmoDUD1QnYL7TzhI2kzyx95vsJKbEa8akzLAR5ZrWIZ3LbcMmBLzxlSQMMccRmi05yDQ5YDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/http-cache-semantics": "*",
-        "@types/keyv": "^3.1.4",
-        "@types/node": "*",
-        "@types/responselike": "^1.0.0"
+        "@secretlint/resolver": "^10.2.2",
+        "@secretlint/types": "^10.2.2",
+        "@textlint/linter-formatter": "^15.2.0",
+        "@textlint/module-interop": "^15.2.0",
+        "@textlint/types": "^15.2.0",
+        "chalk": "^5.4.1",
+        "debug": "^4.4.1",
+        "pluralize": "^8.0.0",
+        "strip-ansi": "^7.1.0",
+        "table": "^6.9.0",
+        "terminal-link": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=20.0.0"
       }
     },
-    "node_modules/@types/debounce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/debounce/-/debounce-1.0.0.tgz",
-      "integrity": "sha1-QXVgIAMx4buE1y2oU5EQLC/NYbc= sha512-B7FcD9ry40L831t7iuHQyDfYi+qVEV75qkEI2ROOyfjb2PfkAspL+NK6B2A0BceMuNhiYRmtKTNnNP7Ul4N2Pg==",
-      "dev": true
+    "node_modules/@secretlint/formatter/node_modules/chalk": {
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
+      "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
     },
-    "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==",
+    "node_modules/@secretlint/node": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/@secretlint/node/-/node-10.2.2.tgz",
+      "integrity": "sha512-eZGJQgcg/3WRBwX1bRnss7RmHHK/YlP/l7zOQsrjexYt6l+JJa5YhUmHbuGXS94yW0++3YkEJp0kQGYhiw1DMQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/ms": "*"
+        "@secretlint/config-loader": "^10.2.2",
+        "@secretlint/core": "^10.2.2",
+        "@secretlint/formatter": "^10.2.2",
+        "@secretlint/profiler": "^10.2.2",
+        "@secretlint/source-creator": "^10.2.2",
+        "@secretlint/types": "^10.2.2",
+        "debug": "^4.4.1",
+        "p-map": "^7.0.3"
+      },
+      "engines": {
+        "node": ">=20.0.0"
       }
     },
-    "node_modules/@types/events": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
-      "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==",
-      "dev": true
-    },
-    "node_modules/@types/expect": {
-      "version": "1.20.4",
-      "resolved": "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz",
-      "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==",
-      "dev": true
+    "node_modules/@secretlint/profiler": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/@secretlint/profiler/-/profiler-10.2.2.tgz",
+      "integrity": "sha512-qm9rWfkh/o8OvzMIfY8a5bCmgIniSpltbVlUVl983zDG1bUuQNd1/5lUEeWx5o/WJ99bXxS7yNI4/KIXfHexig==",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/@types/fancy-log": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@types/fancy-log/-/fancy-log-2.0.2.tgz",
-      "integrity": "sha512-SXVJvqWjsl90VwBfp7w4iQ0iO+vxAjQImglcpwbV9GkqNoUD5/p9Wsgetl40F1WL7pzWFN/eZPTF1g5FZXJsIw==",
+    "node_modules/@secretlint/resolver": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/@secretlint/resolver/-/resolver-10.2.2.tgz",
+      "integrity": "sha512-3md0cp12e+Ae5V+crPQYGd6aaO7ahw95s28OlULGyclyyUtf861UoRGS2prnUrKh7MZb23kdDOyGCYb9br5e4w==",
       "dev": true,
       "license": "MIT"
     },
-    "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==",
+    "node_modules/@secretlint/secretlint-formatter-sarif": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/@secretlint/secretlint-formatter-sarif/-/secretlint-formatter-sarif-10.2.2.tgz",
+      "integrity": "sha512-ojiF9TGRKJJw308DnYBucHxkpNovDNu1XvPh7IfUp0A12gzTtxuWDqdpuVezL7/IP8Ua7mp5/VkDMN9OLp1doQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "node-sarif-builder": "^3.2.0"
       }
     },
-    "node_modules/@types/glob": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-9.0.0.tgz",
-      "integrity": "sha512-00UxlRaIUvYm4R4W9WYkN8/J+kV8fmOQ7okeH6YFtGWFMt3odD45tpG5yA5wnL7HE6lLgjaTW5n14ju2hl2NNA==",
-      "deprecated": "This is a stub types definition. glob provides its own type definitions, so you do not need this installed.",
+    "node_modules/@secretlint/secretlint-rule-no-dotenv": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/@secretlint/secretlint-rule-no-dotenv/-/secretlint-rule-no-dotenv-10.2.2.tgz",
+      "integrity": "sha512-KJRbIShA9DVc5Va3yArtJ6QDzGjg3PRa1uYp9As4RsyKtKSSZjI64jVca57FZ8gbuk4em0/0Jq+uy6485wxIdg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "glob": "*"
+        "@secretlint/types": "^10.2.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
       }
     },
-    "node_modules/@types/glob-stream": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@types/glob-stream/-/glob-stream-6.1.0.tgz",
-      "integrity": "sha512-RHv6ZQjcTncXo3thYZrsbAVwoy4vSKosSWhuhuQxLOTv74OJuFQxXkmUuZCr3q9uNBEVCvIzmZL/FeRNbHZGUg==",
+    "node_modules/@secretlint/secretlint-rule-preset-recommend": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/@secretlint/secretlint-rule-preset-recommend/-/secretlint-rule-preset-recommend-10.2.2.tgz",
+      "integrity": "sha512-K3jPqjva8bQndDKJqctnGfwuAxU2n9XNCPtbXVI5JvC7FnQiNg/yWlQPbMUlBXtBoBGFYp08A94m6fvtc9v+zA==",
       "dev": true,
-      "dependencies": {
-        "@types/glob": "*",
-        "@types/node": "*"
+      "license": "MIT",
+      "engines": {
+        "node": ">=20.0.0"
       }
     },
-    "node_modules/@types/gulp": {
-      "version": "4.0.18",
-      "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.18.tgz",
-      "integrity": "sha512-IqkYa4sXkwH2uwqO2aXYOoAisJpLX13BPaS6lmEAoG4BbgOay3qqGQFsT9LMSSQVMQlEKU7wTUW0sPV46V0olw==",
+    "node_modules/@secretlint/source-creator": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/@secretlint/source-creator/-/source-creator-10.2.2.tgz",
+      "integrity": "sha512-h6I87xJfwfUTgQ7irWq7UTdq/Bm1RuQ/fYhA3dtTIAop5BwSFmZyrchph4WcoEvbN460BWKmk4RYSvPElIIvxw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/node": "*",
-        "@types/undertaker": ">=1.2.6",
-        "@types/vinyl-fs": "*",
-        "chokidar": "^3.3.1"
+        "@secretlint/types": "^10.2.2",
+        "istextorbinary": "^9.5.0"
+      },
+      "engines": {
+        "node": ">=20.0.0"
       }
     },
-    "node_modules/@types/gulp-filter": {
-      "version": "3.0.32",
-      "resolved": "https://registry.npmjs.org/@types/gulp-filter/-/gulp-filter-3.0.32.tgz",
-      "integrity": "sha512-JvY4qTxXehoK2yCUxYVxTMvckVbDM5TWHWeUoYJyX31gwFqw4YDD6JNzhuTxI3yHPUTY4BBRTqgm6puQEZVCNg==",
+    "node_modules/@secretlint/types": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/@secretlint/types/-/types-10.2.2.tgz",
+      "integrity": "sha512-Nqc90v4lWCXyakD6xNyNACBJNJ0tNCwj2WNk/7ivyacYHxiITVgmLUFXTBOeCdy79iz6HtN9Y31uw/jbLrdOAg==",
       "dev": true,
-      "dependencies": {
-        "@types/minimatch": "*",
-        "@types/node": "*",
-        "@types/vinyl": "*"
+      "license": "MIT",
+      "engines": {
+        "node": ">=20.0.0"
       }
     },
-    "node_modules/@types/gulp-gzip": {
-      "version": "0.0.31",
-      "resolved": "https://registry.npmjs.org/@types/gulp-gzip/-/gulp-gzip-0.0.31.tgz",
-      "integrity": "sha512-KQjHz1FTqLse8/EiktfhN/vo33vamX4gVAQhMTp55STDBA7UToW5CJqYyP7iRorkHK9/aJ2nL2hLkNZkY4M8+w==",
+    "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,
-      "dependencies": {
-        "@types/node": "*"
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
       }
     },
-    "node_modules/@types/gulp-json-editor": {
-      "version": "2.2.36",
-      "resolved": "https://registry.npmjs.org/@types/gulp-json-editor/-/gulp-json-editor-2.2.36.tgz",
-      "integrity": "sha512-BX6KjseCoZ09thBmF1QPZnDGtsLndNuhAziUbKqX8x+UDvlFjv2JLX5IeNOqMU2Sc5RkgaClyAU6JA0r19FEKw==",
+    "node_modules/@sindresorhus/merge-streams": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
+      "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/js-beautify": "*",
-        "@types/node": "*"
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@types/gulp-rename": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/@types/gulp-rename/-/gulp-rename-0.0.33.tgz",
-      "integrity": "sha512-FIZQvbZJj6V1gHPTzO+g/BCWpDur7fJrroae4gwV3LaoHBQ+MrR9sB+2HssK8fHv4WdY6hVNxkcft9bYatuPIA==",
+    "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": {
-        "@types/node": "*"
+        "defer-to-connect": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/@types/gulp-sort": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/gulp-sort/-/gulp-sort-2.0.4.tgz",
-      "integrity": "sha512-HUHxH+oMox1ct0SnxPqCXBni0MSws1ygcSAoLO4ISRmR/UuvNIz40rgNveZxwxQk+p78kw09z/qKQkgKJmNUOQ==",
+    "node_modules/@textlint/ast-node-types": {
+      "version": "15.5.0",
+      "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-15.5.0.tgz",
+      "integrity": "sha512-K0LEuuTo4rza8yDrlYkRdXLao8Iz/QBMsQdIxRrOOrLYb4HAtZaypZ78c+J6rDA1UlGxadZVLmkkiv4KV5fMKQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@textlint/linter-formatter": {
+      "version": "15.5.0",
+      "resolved": "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-15.5.0.tgz",
+      "integrity": "sha512-DPTm2+VXKID41qKQWagg/4JynM6hEEpvbq0PlGsEoC4Xm7IqXIxFym3mSf5+ued0cuiIV1hR9kgXjqGdP035tw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@azu/format-text": "^1.0.2",
+        "@azu/style-format": "^1.0.1",
+        "@textlint/module-interop": "15.5.0",
+        "@textlint/resolver": "15.5.0",
+        "@textlint/types": "15.5.0",
+        "chalk": "^4.1.2",
+        "debug": "^4.4.3",
+        "js-yaml": "^4.1.1",
+        "lodash": "^4.17.21",
+        "pluralize": "^2.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "table": "^6.9.0",
+        "text-table": "^0.2.0"
+      }
+    },
+    "node_modules/@textlint/linter-formatter/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/@textlint/linter-formatter/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/@textlint/linter-formatter/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/@textlint/linter-formatter/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/@textlint/linter-formatter/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/@textlint/linter-formatter/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/@textlint/linter-formatter/node_modules/pluralize": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-2.0.0.tgz",
+      "integrity": "sha512-TqNZzQCD4S42De9IfnnBvILN7HAW7riLqsCyp8lgjXeysyPlX5HhqKAcJHHHb9XskE4/a+7VGC9zzx8Ls0jOAw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@textlint/linter-formatter/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/@textlint/linter-formatter/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/@textlint/module-interop": {
+      "version": "15.5.0",
+      "resolved": "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-15.5.0.tgz",
+      "integrity": "sha512-rqfouEhBEgZlR9umswWXXRBcmmSM28Trpr9b0duzgehKYVc7wSQCuQMagr6YBJa2NRMfRNinupusbJXMg0ij2A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@textlint/resolver": {
+      "version": "15.5.0",
+      "resolved": "https://registry.npmjs.org/@textlint/resolver/-/resolver-15.5.0.tgz",
+      "integrity": "sha512-kK5nFbg5N3kVoZExQI/dnYjCInmTltvXDnuCRrBxHI01i6kO/o8R7Lc2aFkAZ6/NUZuRPalkyDdwZJke4/R2wg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@textlint/types": {
+      "version": "15.5.0",
+      "resolved": "https://registry.npmjs.org/@textlint/types/-/types-15.5.0.tgz",
+      "integrity": "sha512-EjAPbuA+3NyQ9WyFP7iUlddi35F3mGrf4tb4cZM0nWywbtEJ3+XAYqL+5RsF0qFeSguxGir09NdZOWrG9wVOUQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@textlint/ast-node-types": "15.5.0"
+      }
+    },
+    "node_modules/@types/ansi-colors": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@types/ansi-colors/-/ansi-colors-3.2.0.tgz",
+      "integrity": "sha512-0caWAhXht9N2lOdMzJLXybsSkYCx1QOdxx6pae48tswI9QV3DFX26AoOpy0JxwhCb+zISTqmd6H8t9Zby9BoZg==",
+      "dev": true
+    },
+    "node_modules/@types/byline": {
+      "version": "4.2.32",
+      "resolved": "https://registry.npmjs.org/@types/byline/-/byline-4.2.32.tgz",
+      "integrity": "sha512-qtlm/J6XOO9p+Ep/ZB5+mCFEDhzWDDHWU4a1eReN7lkPZXW9rkloq2jcAhvKKmlO5tL2GSvKROb+PTsNVhBiyQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/cacheable-request": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
+      "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
+      "dev": true,
+      "dependencies": {
+        "@types/http-cache-semantics": "*",
+        "@types/keyv": "^3.1.4",
+        "@types/node": "*",
+        "@types/responselike": "^1.0.0"
+      }
+    },
+    "node_modules/@types/debounce": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/debounce/-/debounce-1.0.0.tgz",
+      "integrity": "sha1-QXVgIAMx4buE1y2oU5EQLC/NYbc= sha512-B7FcD9ry40L831t7iuHQyDfYi+qVEV75qkEI2ROOyfjb2PfkAspL+NK6B2A0BceMuNhiYRmtKTNnNP7Ul4N2Pg==",
+      "dev": true
+    },
+    "node_modules/@types/debug": {
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.9.tgz",
+      "integrity": "sha512-8Hz50m2eoS56ldRlepxSBa6PWEVCtzUo/92HgLc2qTMnotJNIm7xP+UZhyWoYsyOdd5dxZ+NZLb24rsKyFs2ow==",
+      "dev": true,
+      "dependencies": {
+        "@types/ms": "*"
+      }
+    },
+    "node_modules/@types/events": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
+      "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==",
+      "dev": true
+    },
+    "node_modules/@types/expect": {
+      "version": "1.20.4",
+      "resolved": "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz",
+      "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==",
+      "dev": true
+    },
+    "node_modules/@types/fancy-log": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/fancy-log/-/fancy-log-2.0.2.tgz",
+      "integrity": "sha512-SXVJvqWjsl90VwBfp7w4iQ0iO+vxAjQImglcpwbV9GkqNoUD5/p9Wsgetl40F1WL7pzWFN/eZPTF1g5FZXJsIw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/fs-extra": {
+      "version": "9.0.12",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.12.tgz",
+      "integrity": "sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/glob": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-9.0.0.tgz",
+      "integrity": "sha512-00UxlRaIUvYm4R4W9WYkN8/J+kV8fmOQ7okeH6YFtGWFMt3odD45tpG5yA5wnL7HE6lLgjaTW5n14ju2hl2NNA==",
+      "deprecated": "This is a stub types definition. glob provides its own type definitions, so you do not need this installed.",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "glob": "*"
+      }
+    },
+    "node_modules/@types/glob-stream": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@types/glob-stream/-/glob-stream-6.1.0.tgz",
+      "integrity": "sha512-RHv6ZQjcTncXo3thYZrsbAVwoy4vSKosSWhuhuQxLOTv74OJuFQxXkmUuZCr3q9uNBEVCvIzmZL/FeRNbHZGUg==",
+      "dev": true,
+      "dependencies": {
+        "@types/glob": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/gulp": {
+      "version": "4.0.18",
+      "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.18.tgz",
+      "integrity": "sha512-IqkYa4sXkwH2uwqO2aXYOoAisJpLX13BPaS6lmEAoG4BbgOay3qqGQFsT9LMSSQVMQlEKU7wTUW0sPV46V0olw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "@types/undertaker": ">=1.2.6",
+        "@types/vinyl-fs": "*",
+        "chokidar": "^3.3.1"
+      }
+    },
+    "node_modules/@types/gulp-filter": {
+      "version": "3.0.32",
+      "resolved": "https://registry.npmjs.org/@types/gulp-filter/-/gulp-filter-3.0.32.tgz",
+      "integrity": "sha512-JvY4qTxXehoK2yCUxYVxTMvckVbDM5TWHWeUoYJyX31gwFqw4YDD6JNzhuTxI3yHPUTY4BBRTqgm6puQEZVCNg==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimatch": "*",
+        "@types/node": "*",
+        "@types/vinyl": "*"
+      }
+    },
+    "node_modules/@types/gulp-gzip": {
+      "version": "0.0.31",
+      "resolved": "https://registry.npmjs.org/@types/gulp-gzip/-/gulp-gzip-0.0.31.tgz",
+      "integrity": "sha512-KQjHz1FTqLse8/EiktfhN/vo33vamX4gVAQhMTp55STDBA7UToW5CJqYyP7iRorkHK9/aJ2nL2hLkNZkY4M8+w==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/gulp-json-editor": {
+      "version": "2.2.36",
+      "resolved": "https://registry.npmjs.org/@types/gulp-json-editor/-/gulp-json-editor-2.2.36.tgz",
+      "integrity": "sha512-BX6KjseCoZ09thBmF1QPZnDGtsLndNuhAziUbKqX8x+UDvlFjv2JLX5IeNOqMU2Sc5RkgaClyAU6JA0r19FEKw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/js-beautify": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/gulp-rename": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/@types/gulp-rename/-/gulp-rename-0.0.33.tgz",
+      "integrity": "sha512-FIZQvbZJj6V1gHPTzO+g/BCWpDur7fJrroae4gwV3LaoHBQ+MrR9sB+2HssK8fHv4WdY6hVNxkcft9bYatuPIA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/gulp-sort": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/gulp-sort/-/gulp-sort-2.0.4.tgz",
+      "integrity": "sha512-HUHxH+oMox1ct0SnxPqCXBni0MSws1ygcSAoLO4ISRmR/UuvNIz40rgNveZxwxQk+p78kw09z/qKQkgKJmNUOQ==",
       "dev": true,
       "dependencies": {
         "@types/gulp-util": "*",
@@ -1324,6 +1817,13 @@
         "undici-types": "~5.26.4"
       }
     },
+    "node_modules/@types/normalize-package-data": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
+      "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/pump": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@types/pump/-/pump-1.0.1.tgz",
@@ -1352,6 +1852,13 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/sarif": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/@types/sarif/-/sarif-2.1.7.tgz",
+      "integrity": "sha512-kRz0VEkJqWLf1LLVN4pT1cg1Z9wAuvI6L97V3m2f5B76Tg8d413ddvLBPTEHAZJlnn4XSvu0FkZtViCQGVyrXQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/through": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.33.tgz",
@@ -1432,87 +1939,336 @@
       "dev": true,
       "optional": true,
       "dependencies": {
-        "@types/node": "*"
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@typespec/ts-http-runtime": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@typespec/ts-http-runtime/-/ts-http-runtime-0.3.2.tgz",
+      "integrity": "sha512-IlqQ/Gv22xUC1r/WQm4StLkYQmaaTsXAhUVsNE0+xiyf0yRFiH5++q78U3bw6bLKDCTmh0uqKB9eG9+Bt75Dkg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@vscode/iconv-lite-umd": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
+      "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==",
+      "dev": true
+    },
+    "node_modules/@vscode/ripgrep": {
+      "version": "1.15.10",
+      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.10.tgz",
+      "integrity": "sha512-83Q6qFrELpFgf88bPOcwSWDegfY2r/cb6bIfdLTSZvN73Dg1wviSfO+1v6lTFMd0mAvUYYcTUu+Mn5xMroZMxA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "https-proxy-agent": "^7.0.2",
+        "proxy-from-env": "^1.1.0",
+        "yauzl": "^2.9.2"
+      }
+    },
+    "node_modules/@vscode/vsce": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-3.7.1.tgz",
+      "integrity": "sha512-OTm2XdMt2YkpSn2Nx7z2EJtSuhRHsTPYsSK59hr3v8jRArK+2UEoju4Jumn1CmpgoBLGI6ReHLJ/czYltNUW3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@azure/identity": "^4.1.0",
+        "@secretlint/node": "^10.1.2",
+        "@secretlint/secretlint-formatter-sarif": "^10.1.2",
+        "@secretlint/secretlint-rule-no-dotenv": "^10.1.2",
+        "@secretlint/secretlint-rule-preset-recommend": "^10.1.2",
+        "@vscode/vsce-sign": "^2.0.0",
+        "azure-devops-node-api": "^12.5.0",
+        "chalk": "^4.1.2",
+        "cheerio": "^1.0.0-rc.9",
+        "cockatiel": "^3.1.2",
+        "commander": "^12.1.0",
+        "form-data": "^4.0.0",
+        "glob": "^11.0.0",
+        "hosted-git-info": "^4.0.2",
+        "jsonc-parser": "^3.2.0",
+        "leven": "^3.1.0",
+        "markdown-it": "^14.1.0",
+        "mime": "^1.3.4",
+        "minimatch": "^3.0.3",
+        "parse-semver": "^1.1.1",
+        "read": "^1.0.7",
+        "secretlint": "^10.1.2",
+        "semver": "^7.5.2",
+        "tmp": "^0.2.3",
+        "typed-rest-client": "^1.8.4",
+        "url-join": "^4.0.1",
+        "xml2js": "^0.5.0",
+        "yauzl": "^2.3.1",
+        "yazl": "^2.2.2"
+      },
+      "bin": {
+        "vsce": "vsce"
+      },
+      "engines": {
+        "node": ">= 20"
+      },
+      "optionalDependencies": {
+        "keytar": "^7.7.0"
+      }
+    },
+    "node_modules/@vscode/vsce-sign": {
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign/-/vsce-sign-2.0.9.tgz",
+      "integrity": "sha512-8IvaRvtFyzUnGGl3f5+1Cnor3LqaUWvhaUjAYO8Y39OUYlOf3cRd+dowuQYLpZcP3uwSG+mURwjEBOSq4SOJ0g==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "SEE LICENSE IN LICENSE.txt",
+      "optionalDependencies": {
+        "@vscode/vsce-sign-alpine-arm64": "2.0.6",
+        "@vscode/vsce-sign-alpine-x64": "2.0.6",
+        "@vscode/vsce-sign-darwin-arm64": "2.0.6",
+        "@vscode/vsce-sign-darwin-x64": "2.0.6",
+        "@vscode/vsce-sign-linux-arm": "2.0.6",
+        "@vscode/vsce-sign-linux-arm64": "2.0.6",
+        "@vscode/vsce-sign-linux-x64": "2.0.6",
+        "@vscode/vsce-sign-win32-arm64": "2.0.6",
+        "@vscode/vsce-sign-win32-x64": "2.0.6"
+      }
+    },
+    "node_modules/@vscode/vsce-sign-alpine-arm64": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-alpine-arm64/-/vsce-sign-alpine-arm64-2.0.6.tgz",
+      "integrity": "sha512-wKkJBsvKF+f0GfsUuGT0tSW0kZL87QggEiqNqK6/8hvqsXvpx8OsTEc3mnE1kejkh5r+qUyQ7PtF8jZYN0mo8Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "SEE LICENSE IN LICENSE.txt",
+      "optional": true,
+      "os": [
+        "alpine"
+      ]
+    },
+    "node_modules/@vscode/vsce-sign-alpine-x64": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-alpine-x64/-/vsce-sign-alpine-x64-2.0.6.tgz",
+      "integrity": "sha512-YoAGlmdK39vKi9jA18i4ufBbd95OqGJxRvF3n6ZbCyziwy3O+JgOpIUPxv5tjeO6gQfx29qBivQ8ZZTUF2Ba0w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "SEE LICENSE IN LICENSE.txt",
+      "optional": true,
+      "os": [
+        "alpine"
+      ]
+    },
+    "node_modules/@vscode/vsce-sign-darwin-arm64": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-darwin-arm64/-/vsce-sign-darwin-arm64-2.0.6.tgz",
+      "integrity": "sha512-5HMHaJRIQuozm/XQIiJiA0W9uhdblwwl2ZNDSSAeXGO9YhB9MH5C4KIHOmvyjUnKy4UCuiP43VKpIxW1VWP4tQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "SEE LICENSE IN LICENSE.txt",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@vscode/vsce-sign-darwin-x64": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-darwin-x64/-/vsce-sign-darwin-x64-2.0.6.tgz",
+      "integrity": "sha512-25GsUbTAiNfHSuRItoQafXOIpxlYj+IXb4/qarrXu7kmbH94jlm5sdWSCKrrREs8+GsXF1b+l3OB7VJy5jsykw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "SEE LICENSE IN LICENSE.txt",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@vscode/vsce-sign-linux-arm": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-linux-arm/-/vsce-sign-linux-arm-2.0.6.tgz",
+      "integrity": "sha512-UndEc2Xlq4HsuMPnwu7420uqceXjs4yb5W8E2/UkaHBB9OWCwMd3/bRe/1eLe3D8kPpxzcaeTyXiK3RdzS/1CA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "SEE LICENSE IN LICENSE.txt",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@vscode/vsce-sign-linux-arm64": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-linux-arm64/-/vsce-sign-linux-arm64-2.0.6.tgz",
+      "integrity": "sha512-cfb1qK7lygtMa4NUl2582nP7aliLYuDEVpAbXJMkDq1qE+olIw/es+C8j1LJwvcRq1I2yWGtSn3EkDp9Dq5FdA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "SEE LICENSE IN LICENSE.txt",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@vscode/vsce-sign-linux-x64": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-linux-x64/-/vsce-sign-linux-x64-2.0.6.tgz",
+      "integrity": "sha512-/olerl1A4sOqdP+hjvJ1sbQjKN07Y3DVnxO4gnbn/ahtQvFrdhUi0G1VsZXDNjfqmXw57DmPi5ASnj/8PGZhAA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "SEE LICENSE IN LICENSE.txt",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@vscode/vsce-sign-win32-arm64": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-win32-arm64/-/vsce-sign-win32-arm64-2.0.6.tgz",
+      "integrity": "sha512-ivM/MiGIY0PJNZBoGtlRBM/xDpwbdlCWomUWuLmIxbi1Cxe/1nooYrEQoaHD8ojVRgzdQEUzMsRbyF5cJJgYOg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "SEE LICENSE IN LICENSE.txt",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@vscode/vsce-sign-win32-x64": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-win32-x64/-/vsce-sign-win32-x64-2.0.6.tgz",
+      "integrity": "sha512-mgth9Kvze+u8CruYMmhHw6Zgy3GRX2S+Ed5oSokDEK5vPEwGGKnmuXua9tmFhomeAnhgJnL4DCna3TiNuGrBTQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "SEE LICENSE IN LICENSE.txt",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@vscode/vsce/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/@typespec/ts-http-runtime": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@typespec/ts-http-runtime/-/ts-http-runtime-0.3.2.tgz",
-      "integrity": "sha512-IlqQ/Gv22xUC1r/WQm4StLkYQmaaTsXAhUVsNE0+xiyf0yRFiH5++q78U3bw6bLKDCTmh0uqKB9eG9+Bt75Dkg==",
+    "node_modules/@vscode/vsce/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": {
-        "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.0",
-        "tslib": "^2.6.2"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@vscode/iconv-lite-umd": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
-      "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==",
-      "dev": true
-    },
-    "node_modules/@vscode/ripgrep": {
-      "version": "1.15.10",
-      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.10.tgz",
-      "integrity": "sha512-83Q6qFrELpFgf88bPOcwSWDegfY2r/cb6bIfdLTSZvN73Dg1wviSfO+1v6lTFMd0mAvUYYcTUu+Mn5xMroZMxA==",
+    "node_modules/@vscode/vsce/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,
-      "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "https-proxy-agent": "^7.0.2",
-        "proxy-from-env": "^1.1.0",
-        "yauzl": "^2.9.2"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/@vscode/vsce": {
-      "version": "2.20.1",
-      "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.20.1.tgz",
-      "integrity": "sha512-ilbvoqvR/1/zseRPBAzYR6aKqSJ+jvda4/BqIwOqTxajpvLtEpK3kMLs77+dJdrlygS+VrP7Yhad8j0ukyD96g==",
+    "node_modules/@vscode/vsce/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/@vscode/vsce/node_modules/glob": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-11.1.0.tgz",
+      "integrity": "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "azure-devops-node-api": "^11.0.1",
-        "chalk": "^2.4.2",
-        "cheerio": "^1.0.0-rc.9",
-        "commander": "^6.1.0",
-        "glob": "^7.0.6",
-        "hosted-git-info": "^4.0.2",
-        "jsonc-parser": "^3.2.0",
-        "leven": "^3.1.0",
-        "markdown-it": "^12.3.2",
-        "mime": "^1.3.4",
-        "minimatch": "^3.0.3",
-        "parse-semver": "^1.1.1",
-        "read": "^1.0.7",
-        "semver": "^7.5.2",
-        "tmp": "^0.2.1",
-        "typed-rest-client": "^1.8.4",
-        "url-join": "^4.0.1",
-        "xml2js": "^0.5.0",
-        "yauzl": "^2.3.1",
-        "yazl": "^2.2.2"
+        "foreground-child": "^3.3.1",
+        "jackspeak": "^4.1.1",
+        "minimatch": "^10.1.1",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^2.0.0"
       },
       "bin": {
-        "vsce": "vsce"
+        "glob": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": ">= 14"
+        "node": "20 || >=22"
       },
-      "optionalDependencies": {
-        "keytar": "^7.7.0"
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@vscode/vsce/node_modules/commander": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+    "node_modules/@vscode/vsce/node_modules/glob/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": ">= 6"
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@vscode/vsce/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/@vscode/vsce/node_modules/jsonc-parser": {
@@ -1546,6 +2302,19 @@
         "node": ">=10"
       }
     },
+    "node_modules/@vscode/vsce/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/@vscode/vsce/node_modules/yazl": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
@@ -1578,6 +2347,23 @@
         "node": ">= 14"
       }
     },
+    "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==",
+      "dev": true,
+      "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/ansi-colors": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
@@ -1590,6 +2376,22 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ansi-escapes": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.2.0.tgz",
+      "integrity": "sha512-g6LhBsl+GBPRWGWsBtutpzBYuIIdBkLEvad5C/va/74Db018+5TZiyA26cZJAr3Rft5lprVqOIPxf5Vid6tqAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "environment": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/ansi-gray": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
@@ -1602,6 +2404,19 @@
         "node": ">=0.10.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==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
     "node_modules/ansi-styles": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -1640,7 +2455,8 @@
       "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
+      "dev": true,
+      "license": "Python-2.0"
     },
     "node_modules/arr-diff": {
       "version": "4.0.0",
@@ -1669,6 +2485,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/async-done": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
@@ -1684,11 +2510,19 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/azure-devops-node-api": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.2.0.tgz",
-      "integrity": "sha512-XdiGPhrpaT5J8wdERRKs5g8E0Zy1pvOYTli7z9E8nmOn3YGp4FhtjhrOyFmX/8veWCwdI69mCHKJw6l+4J/bHA==",
+      "version": "12.5.0",
+      "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-12.5.0.tgz",
+      "integrity": "sha512-R5eFskGvOm3U/GzeAuxRkUsAl0hrAwGgWn6zAd2KrZmrEhWZVqLew4OOupbQlXUuojUzpGtq62SmdhJ06N88og==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "tunnel": "0.0.6",
         "typed-rest-client": "^1.8.4"
@@ -1729,6 +2563,22 @@
         "node": ">=8"
       }
     },
+    "node_modules/binaryextensions": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-6.11.0.tgz",
+      "integrity": "sha512-sXnYK/Ij80TO3lcqZVV2YgfKN5QjUWIRk/XSm2J/4bd/lPko3lvk0O4ZppH6m+6hB2/GTu+ptNwVFe1xh+QLQw==",
+      "dev": true,
+      "license": "Artistic-2.0",
+      "dependencies": {
+        "editions": "^6.21.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "funding": {
+        "url": "https://bevry.me/fund"
+      }
+    },
     "node_modules/bl": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
@@ -1759,6 +2609,13 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/boundary": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/boundary/-/boundary-2.0.0.tgz",
+      "integrity": "sha512-rJKn5ooC9u8q13IMCrW0RSp31pxBCHE3y9V/tp3TdWSLf8Em3p6Di4NBpfzbJge9YjjFEsD0RtFEjtvHL5VyEA==",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.12",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
@@ -2048,6 +2905,16 @@
         "util-deprecate": "~1.0.1"
       }
     },
+    "node_modules/cockatiel": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/cockatiel/-/cockatiel-3.2.1.tgz",
+      "integrity": "sha512-gfrHV6ZPkquExvMh9IOkKsBzNDk6sDuZ6DdBGUBkvFnTCqCxzpuq48RySgP0AnaqQkw2zynOFj9yly6T1Q2G5Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      }
+    },
     "node_modules/color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -2072,6 +2939,29 @@
         "color-support": "bin.js"
       }
     },
+    "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,
+      "license": "MIT",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "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/compare-version": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
@@ -2137,12 +3027,13 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -2220,6 +3111,16 @@
         "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": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/detect-libc": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
@@ -2328,6 +3229,13 @@
         "stream-shift": "^1.0.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,
+      "license": "MIT"
+    },
     "node_modules/ecdsa-sig-formatter": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
@@ -2337,6 +3245,23 @@
         "safe-buffer": "^5.0.1"
       }
     },
+    "node_modules/editions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/editions/-/editions-6.22.0.tgz",
+      "integrity": "sha512-UgGlf8IW75je7HZjNDpJdCv4cGJWIi6yumFdZ0R7A8/CIhQiWUjyGLCxdHpd8bmyD1gnkfUNK0oeOXqUS2cpfQ==",
+      "dev": true,
+      "license": "Artistic-2.0",
+      "dependencies": {
+        "version-range": "^4.15.0"
+      },
+      "engines": {
+        "ecmascript": ">= es5",
+        "node": ">=4"
+      },
+      "funding": {
+        "url": "https://bevry.me/fund"
+      }
+    },
     "node_modules/electron-osx-sign": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz",
@@ -2375,6 +3300,13 @@
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -2405,6 +3337,19 @@
         "node": ">=6"
       }
     },
+    "node_modules/environment": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz",
+      "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/es-define-property": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
@@ -2438,6 +3383,22 @@
         "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/es6-error": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
@@ -2561,12 +3522,53 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "dev": true,
+      "license": "MIT",
+      "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.8"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
       "dev": true
     },
+    "node_modules/fast-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
+      "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
     "node_modules/fast-xml-parser": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz",
@@ -2590,6 +3592,16 @@
         "fxparser": "src/cli/cli.js"
       }
     },
+    "node_modules/fastq": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
+      "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
     "node_modules/fd-slicer": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
@@ -2638,12 +3650,46 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "node_modules/fork-stream": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz",
-      "integrity": "sha512-Pqq5NnT78ehvUnAk/We/Jr22vSvanRlFTpAmQ88xBY/M1TlHe+P0ILuEyXS595ysdGfaj22634LBkGMA2GTcpA==",
-      "dev": true
-    },
+    "node_modules/foreground-child": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+      "dev": true,
+      "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/fork-stream": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz",
+      "integrity": "sha512-Pqq5NnT78ehvUnAk/We/Jr22vSvanRlFTpAmQ88xBY/M1TlHe+P0ILuEyXS595ysdGfaj22634LBkGMA2GTcpA==",
+      "dev": true
+    },
+    "node_modules/form-data": {
+      "version": "4.0.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/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -2836,6 +3882,27 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/globby": {
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-14.1.0.tgz",
+      "integrity": "sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@sindresorhus/merge-streams": "^2.1.0",
+        "fast-glob": "^3.3.3",
+        "ignore": "^7.0.3",
+        "path-type": "^6.0.0",
+        "slash": "^5.1.0",
+        "unicorn-magic": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/gopd": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
@@ -2949,6 +4016,22 @@
         "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",
@@ -3060,6 +4143,29 @@
       ],
       "optional": true
     },
+    "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/index-to-position": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-1.2.0.tgz",
+      "integrity": "sha512-Yg7+ztRkqslMAS2iFaU+Oa4KTSidr63OsFGlOrJoW981kIYO3CGCS3wA95P1mUi/IVSJkn0D479KTJpVpvFNuw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -3131,6 +4237,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -3215,12 +4331,73 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/istextorbinary": {
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-9.5.0.tgz",
+      "integrity": "sha512-5mbUj3SiZXCuRf9fT3ibzbSSEWiy63gFfksmGfdOzujPjW3k+z8WvIBxcJHBoQNlaZaiyB25deviif2+osLmLw==",
+      "dev": true,
+      "license": "Artistic-2.0",
+      "dependencies": {
+        "binaryextensions": "^6.11.0",
+        "editions": "^6.21.0",
+        "textextensions": "^6.11.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "funding": {
+        "url": "https://bevry.me/fund"
+      }
+    },
+    "node_modules/jackspeak": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.1.tgz",
+      "integrity": "sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "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": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
     "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-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,
+      "license": "MIT"
+    },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -3363,12 +4540,13 @@
       }
     },
     "node_modules/linkify-it": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
-      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "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,
+      "license": "MIT",
       "dependencies": {
-        "uc.micro": "^1.0.1"
+        "uc.micro": "^2.0.0"
       }
     },
     "node_modules/lodash": {
@@ -3383,6 +4561,13 @@
       "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==",
       "dev": true
     },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/lowercase-keys": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
@@ -3405,28 +4590,21 @@
       }
     },
     "node_modules/markdown-it": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
-      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz",
+      "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1",
-        "entities": "~2.1.0",
-        "linkify-it": "^3.0.1",
-        "mdurl": "^1.0.1",
-        "uc.micro": "^1.0.5"
+        "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.js"
-      }
-    },
-    "node_modules/markdown-it/node_modules/entities": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+        "markdown-it": "bin/markdown-it.mjs"
       }
     },
     "node_modules/matcher": {
@@ -3466,10 +4644,11 @@
       }
     },
     "node_modules/mdurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
@@ -3477,6 +4656,30 @@
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
       "dev": true
     },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
     "node_modules/mime": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-4.1.0.tgz",
@@ -3493,6 +4696,29 @@
         "node": ">=16"
       }
     },
+    "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,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/mimic-response": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
@@ -3520,6 +4746,16 @@
       "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "devOptional": true
     },
+    "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/mkdirp-classic": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
@@ -3527,10 +4763,11 @@
       "optional": true
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/mute-stream": {
       "version": "0.0.8",
@@ -3596,6 +4833,106 @@
         "node-gyp-build-test": "build-test.js"
       }
     },
+    "node_modules/node-sarif-builder": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/node-sarif-builder/-/node-sarif-builder-3.4.0.tgz",
+      "integrity": "sha512-tGnJW6OKRii9u/b2WiUViTJS+h7Apxx17qsMUjsUeNDiMMX5ZFf8F8Fcz7PAQ6omvOxHZtvDTmOYKJQwmfpjeg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/sarif": "^2.1.7",
+        "fs-extra": "^11.1.1"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/node-sarif-builder/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/node-sarif-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/node-sarif-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/normalize-package-data": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz",
+      "integrity": "sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "hosted-git-info": "^7.0.0",
+        "semver": "^7.3.5",
+        "validate-npm-package-license": "^3.0.4"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/hosted-git-info": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
+      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^10.0.1"
+      },
+      "engines": {
+        "node": "^16.14.0 || >=18.0.0"
+      }
+    },
+    "node_modules/normalize-package-data/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/normalize-package-data/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/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -3711,6 +5048,57 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/p-map": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz",
+      "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "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==",
+      "dev": true,
+      "license": "BlueOak-1.0.0"
+    },
+    "node_modules/parse-json": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.3.0.tgz",
+      "integrity": "sha512-ybiGyvspI+fAoRQbIPRddCcSTV9/LsJbf0e/S85VLowVGzRmokfneg2kwVW/KU5rOXrPSbF1qAKPMgNTqqROQQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.26.2",
+        "index-to-position": "^1.1.0",
+        "type-fest": "^4.39.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse-json/node_modules/type-fest": {
+      "version": "4.41.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/parse-node-version": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
@@ -3781,17 +5169,65 @@
         "node": ">=8"
       }
     },
+    "node_modules/path-scurry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz",
+      "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "11.2.4",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz",
+      "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/path-type": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-6.0.0.tgz",
+      "integrity": "sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
       "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA= sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
       "dev": true
     },
+    "node_modules/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.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "devOptional": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -3837,6 +5273,16 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/pluralize": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
+      "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/prebuild-install": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
@@ -3902,6 +5348,16 @@
         "once": "^1.3.1"
       }
     },
+    "node_modules/punycode.js": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
+      "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/qs": {
       "version": "6.14.1",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz",
@@ -3918,6 +5374,27 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "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/quick-lru": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
@@ -3945,6 +5422,19 @@
         "rc": "cli.js"
       }
     },
+    "node_modules/rc-config-loader": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.1.3.tgz",
+      "integrity": "sha512-kD7FqML7l800i6pS6pvLyIE2ncbk9Du8Q0gp/4hMPhJU6ZxApkoLcGD8ZeqgiAlfwZ6BlETq6qqe+12DUL207w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.4",
+        "js-yaml": "^4.1.0",
+        "json5": "^2.2.2",
+        "require-from-string": "^2.0.2"
+      }
+    },
     "node_modules/read": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
@@ -3957,6 +5447,52 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/read-pkg": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-9.0.1.tgz",
+      "integrity": "sha512-9viLL4/n1BJUCT1NXVTdS1jtm80yDEgR5T4yCelII49Mbj0v1rZdKqj7zCiYdbB0CuCgdrvHcNogAKTFPBocFA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.3",
+        "normalize-package-data": "^6.0.0",
+        "parse-json": "^8.0.0",
+        "type-fest": "^4.6.0",
+        "unicorn-magic": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg/node_modules/type-fest": {
+      "version": "4.41.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg/node_modules/unicorn-magic": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
+      "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/readable-stream": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -3998,6 +5534,16 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/resolve-alpn": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
@@ -4016,6 +5562,17 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/reusify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/roarr": {
       "version": "2.15.4",
       "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
@@ -4034,6 +5591,30 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "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",
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
     "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -4046,6 +5627,28 @@
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
       "dev": true
     },
+    "node_modules/secretlint": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/secretlint/-/secretlint-10.2.2.tgz",
+      "integrity": "sha512-xVpkeHV/aoWe4vP4TansF622nBEImzCY73y/0042DuJ29iKIaqgoJ8fGxre3rVSHHbxar4FdJobmTnLp9AU0eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@secretlint/config-creator": "^10.2.2",
+        "@secretlint/formatter": "^10.2.2",
+        "@secretlint/node": "^10.2.2",
+        "@secretlint/profiler": "^10.2.2",
+        "debug": "^4.4.1",
+        "globby": "^14.1.0",
+        "read-pkg": "^9.0.1"
+      },
+      "bin": {
+        "secretlint": "bin/secretlint.js"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
     "node_modules/semaphore": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/semaphore/-/semaphore-1.1.0.tgz",
@@ -4184,6 +5787,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/simple-concat": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
@@ -4229,51 +5845,271 @@
         "simple-concat": "^1.0.0"
       }
     },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/slash": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
+      "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/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/slice-ansi/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/slice-ansi/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/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/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/sprintf-js": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+      "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/stoppable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz",
+      "integrity": "sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4",
+        "npm": ">=6"
+      }
+    },
+    "node_modules/stream-exhaust": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
+      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
+      "dev": true
+    },
+    "node_modules/stream-shift": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "dev": true
+    },
+    "node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "devOptional": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/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/string-width/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": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/sprintf-js": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-      "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
+    "node_modules/string-width/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,
-      "optional": true
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/stoppable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz",
-      "integrity": "sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==",
+    "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",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
       "engines": {
-        "node": ">=4",
-        "npm": ">=6"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/stream-exhaust": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
-      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
-      "dev": true
-    },
-    "node_modules/stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-      "dev": true
-    },
-    "node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "devOptional": true,
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "safe-buffer": "~5.1.0"
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/strip-bom": {
@@ -4329,6 +6165,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/structured-source": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/structured-source/-/structured-source-4.0.0.tgz",
+      "integrity": "sha512-qGzRFNJDjFieQkl/sVOI2dUjHKRyL9dAJi2gCPGJLbJHBIkyOHxjuocpIEfbLioX+qSJpvbYdT49/YCdMznKxA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boundary": "^2.0.0"
+      }
+    },
     "node_modules/sumchecker": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
@@ -4353,6 +6199,86 @@
         "node": ">=4"
       }
     },
+    "node_modules/supports-hyperlinks": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.2.0.tgz",
+      "integrity": "sha512-zFObLMyZeEwzAoKCyu1B91U79K2t7ApXuQfo8OuxwXLDgcKxuwM+YvcbIhm6QWqz7mHUH1TVytR1PwVVjEuMig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-hyperlinks?sponsor=1"
+      }
+    },
+    "node_modules/supports-hyperlinks/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/supports-hyperlinks/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/table": {
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.9.0.tgz",
+      "integrity": "sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/table/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/table/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/tar-fs": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
@@ -4382,6 +6308,23 @@
         "node": ">=6"
       }
     },
+    "node_modules/terminal-link": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-4.0.0.tgz",
+      "integrity": "sha512-lk+vH+MccxNqgVqSnkMVKx4VLJfnLjDBGzH16JVZjKE2DoxP57s6/vt6JmXV5I3jBcfGrxNrYtC+mPtU7WJztA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-escapes": "^7.0.0",
+        "supports-hyperlinks": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/ternary-stream": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-3.0.0.tgz",
@@ -4404,6 +6347,29 @@
         "readable-stream": "2 || 3"
       }
     },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/textextensions": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-6.11.0.tgz",
+      "integrity": "sha512-tXJwSr9355kFJI3lbCkPpUH5cP8/M0GGy2xLO34aZCjMXBaK3SoPnZwr/oWmo1FdCnELcs4npdCIOFtq9W3ruQ==",
+      "dev": true,
+      "license": "Artistic-2.0",
+      "dependencies": {
+        "editions": "^6.21.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "funding": {
+        "url": "https://bevry.me/fund"
+      }
+    },
     "node_modules/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -4507,6 +6473,7 @@
       "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
       "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
       }
@@ -4541,6 +6508,7 @@
       "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.11.tgz",
       "integrity": "sha512-5UvfMpd1oelmUPRbbaVnq+rHP7ng2cE4qoQkQeAqxRL6PklkxsM0g32/HL0yfvruK6ojQ5x8EE+HF4YV6DtuCA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "qs": "^6.9.1",
         "tunnel": "0.0.6",
@@ -4548,16 +6516,18 @@
       }
     },
     "node_modules/uc.micro": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-      "dev": true
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/underscore": {
       "version": "1.13.7",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz",
       "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/undici-types": {
       "version": "5.26.5",
@@ -4565,6 +6535,19 @@
       "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
       "dev": true
     },
+    "node_modules/unicorn-magic": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz",
+      "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -4595,6 +6578,30 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "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/version-range": {
+      "version": "4.15.0",
+      "resolved": "https://registry.npmjs.org/version-range/-/version-range-4.15.0.tgz",
+      "integrity": "sha512-Ck0EJbAGxHwprkzFO966t4/5QkRuzh+/I1RxhLgUKKwEn+Cd8NwM60mE3AqBZg5gYODoXW0EFsQvbZjRlvdqbg==",
+      "dev": true,
+      "license": "Artistic-2.0",
+      "engines": {
+        "node": ">=4"
+      },
+      "funding": {
+        "url": "https://bevry.me/fund"
+      }
+    },
     "node_modules/vinyl": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
@@ -4755,6 +6762,140 @@
       "integrity": "sha512-r64Ea3glXY2RVzMeNxB+4J+0YHAVzUdV4cM5nHi4BBC2LvnO1pWFAIYKYuGcPElbg1/7eEiaPtZ/jzCjIUuGBg==",
       "dev": true
     },
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/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/wrap-ansi-cjs/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/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/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==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/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/wrap-ansi/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/build/package.json b/build/package.json
index 94907182665a..4df1c3a6e64e 100644
--- a/build/package.json
+++ b/build/package.json
@@ -37,7 +37,7 @@
     "@types/xml2js": "0.0.33",
     "@vscode/iconv-lite-umd": "0.7.0",
     "@vscode/ripgrep": "^1.15.10",
-    "@vscode/vsce": "2.20.1",
+    "@vscode/vsce": "3.7.1",
     "byline": "^5.0.0",
     "debug": "^4.3.2",
     "electron-osx-sign": "^0.6.0",

From 0d9f454f3fc46efe35f0db35f3ee27f7f1bb3023 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 12:25:55 +0000
Subject: [PATCH 1359/1815] Bump @types/debounce from 1.0.0 to 1.2.4 in /build

Bumps [@types/debounce](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/debounce) from 1.0.0 to 1.2.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/debounce)

---
updated-dependencies:
- dependency-name: "@types/debounce"
  dependency-version: 1.2.4
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 11 ++++++-----
 build/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index f034674714cb..51e65b42a2b3 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -17,7 +17,7 @@
         "@electron/get": "^2.0.0",
         "@types/ansi-colors": "^3.2.0",
         "@types/byline": "^4.2.32",
-        "@types/debounce": "^1.0.0",
+        "@types/debounce": "^1.2.4",
         "@types/debug": "^4.1.5",
         "@types/fancy-log": "^2.0.2",
         "@types/fs-extra": "^9.0.12",
@@ -1101,10 +1101,11 @@
       }
     },
     "node_modules/@types/debounce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/debounce/-/debounce-1.0.0.tgz",
-      "integrity": "sha1-QXVgIAMx4buE1y2oU5EQLC/NYbc= sha512-B7FcD9ry40L831t7iuHQyDfYi+qVEV75qkEI2ROOyfjb2PfkAspL+NK6B2A0BceMuNhiYRmtKTNnNP7Ul4N2Pg==",
-      "dev": true
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@types/debounce/-/debounce-1.2.4.tgz",
+      "integrity": "sha512-jBqiORIzKDOToaF63Fm//haOCHuwQuLa2202RK4MozpA6lh93eCBc+/8+wZn5OzjJt3ySdc+74SXWXB55Ewtyw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/debug": {
       "version": "4.1.9",
diff --git a/build/package.json b/build/package.json
index 94907182665a..874d644eb37a 100644
--- a/build/package.json
+++ b/build/package.json
@@ -11,7 +11,7 @@
     "@electron/get": "^2.0.0",
     "@types/ansi-colors": "^3.2.0",
     "@types/byline": "^4.2.32",
-    "@types/debounce": "^1.0.0",
+    "@types/debounce": "^1.2.4",
     "@types/debug": "^4.1.5",
     "@types/fancy-log": "^2.0.2",
     "@types/fs-extra": "^9.0.12",

From 5db39cac552253f49709fa15fc29910efd9bf1b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 12:29:53 +0000
Subject: [PATCH 1360/1815] Bump typescript from 5.8.0-dev.20250207 to 5.9.3

Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.8.0-dev.20250207 to 5.9.3.
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Commits](https://github.com/microsoft/TypeScript/commits/v5.9.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-version: 5.9.3
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6d4c3d13268f..bed336b06da6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -154,7 +154,7 @@
         "ts-node": "^10.9.1",
         "tsec": "0.2.7",
         "tslib": "^2.6.3",
-        "typescript": "^5.8.0-dev.20250207",
+        "typescript": "^5.9.3",
         "typescript-eslint": "^8.8.0",
         "util": "^0.12.4",
         "webpack": "^5.94.0",
@@ -16101,9 +16101,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.8.0-dev.20250207",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.0-dev.20250207.tgz",
-      "integrity": "sha512-bRCO1GkVxTLd/UFJWOg9R1oRiSMidcfpICzuQlDJlHspv6hlcJvvIJP0BvQxrBYpu4dbzqp/Fh8rRYIkEjbSlQ==",
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
diff --git a/package.json b/package.json
index 771ba3f4d564..bd8970dafb59 100644
--- a/package.json
+++ b/package.json
@@ -213,7 +213,7 @@
     "ts-node": "^10.9.1",
     "tsec": "0.2.7",
     "tslib": "^2.6.3",
-    "typescript": "^5.8.0-dev.20250207",
+    "typescript": "^5.9.3",
     "typescript-eslint": "^8.8.0",
     "util": "^0.12.4",
     "webpack": "^5.94.0",

From ebf4a50c6eaacd1ddd39f3f718b9f28d285d64f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 12:30:07 +0000
Subject: [PATCH 1361/1815] Bump @vscode/windows-process-tree from 0.6.0 to
 0.6.2

Bumps [@vscode/windows-process-tree](https://github.com/microsoft/vscode-windows-process-tree) from 0.6.0 to 0.6.2.
- [Release notes](https://github.com/microsoft/vscode-windows-process-tree/releases)
- [Commits](https://github.com/microsoft/vscode-windows-process-tree/compare/v0.6.0...v0.6.2)

---
updated-dependencies:
- dependency-name: "@vscode/windows-process-tree"
  dependency-version: 0.6.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6d4c3d13268f..41e903db3f9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
         "@vscode/tree-sitter-wasm": "^0.1.3",
         "@vscode/vscode-languagedetection": "1.0.22",
         "@vscode/windows-mutex": "^0.5.0",
-        "@vscode/windows-process-tree": "^0.6.0",
+        "@vscode/windows-process-tree": "^0.6.2",
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.2.0-beta.81",
         "@xterm/addon-image": "^0.9.0-beta.98",
@@ -3552,10 +3552,11 @@
       }
     },
     "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.2",
+      "resolved": "https://registry.npmjs.org/@vscode/windows-process-tree/-/windows-process-tree-0.6.2.tgz",
+      "integrity": "sha512-uzyUuQ93m7K1jSPrB/72m4IspOyeGpvvghNwFCay/McZ+y4Hk2BnLdZPb6EJ8HLRa3GwCvYjH/MQZzcnLOVnaQ==",
       "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
         "node-addon-api": "7.1.0"
       }
diff --git a/package.json b/package.json
index 771ba3f4d564..3a0a1c2d5833 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
     "@vscode/tree-sitter-wasm": "^0.1.3",
     "@vscode/vscode-languagedetection": "1.0.22",
     "@vscode/windows-mutex": "^0.5.0",
-    "@vscode/windows-process-tree": "^0.6.0",
+    "@vscode/windows-process-tree": "^0.6.2",
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.2.0-beta.81",
     "@xterm/addon-image": "^0.9.0-beta.98",

From e672ec1d7b7dfd6d8219502a1d70127860e887c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 12:30:19 +0000
Subject: [PATCH 1362/1815] Bump rimraf from 2.7.1 to 6.1.2 in
 /test/integration/browser

Bumps [rimraf](https://github.com/isaacs/rimraf) from 2.7.1 to 6.1.2.
- [Changelog](https://github.com/isaacs/rimraf/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/rimraf/compare/v2.7.1...v6.1.2)

---
updated-dependencies:
- dependency-name: rimraf
  dependency-version: 6.1.2
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/integration/browser/package-lock.json | 177 ++++++++++-----------
 test/integration/browser/package.json      |   2 +-
 2 files changed, 87 insertions(+), 92 deletions(-)

diff --git a/test/integration/browser/package-lock.json b/test/integration/browser/package-lock.json
index 8dc10163f03d..f46652cce140 100644
--- a/test/integration/browser/package-lock.json
+++ b/test/integration/browser/package-lock.json
@@ -12,12 +12,35 @@
         "@types/node": "25.x",
         "@types/rimraf": "^2.0.4",
         "@types/tmp": "0.2.6",
-        "rimraf": "^2.6.1",
+        "rimraf": "^6.1.2",
         "tmp": "0.2.5",
         "tree-kill": "1.2.2",
         "vscode-uri": "^3.1.0"
       }
     },
+    "node_modules/@isaacs/balanced-match": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/brace-expansion": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@isaacs/balanced-match": "^4.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/@types/events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
@@ -68,124 +91,102 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/brace-expansion": {
-      "version": "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"
-      }
-    },
-    "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/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true,
-      "license": "ISC"
-    },
     "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",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.0.tgz",
+      "integrity": "sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "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"
+        "minimatch": "^10.1.1",
+        "minipass": "^7.1.2",
+        "path-scurry": "^2.0.0"
       },
       "engines": {
-        "node": "*"
+        "node": "20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "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/lru-cache": {
+      "version": "11.2.4",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz",
+      "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
       }
     },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "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": {
-        "brace-expansion": "^1.1.7"
+        "@isaacs/brace-expansion": "^5.0.0"
       },
       "engines": {
-        "node": "*"
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+    "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",
-      "dependencies": {
-        "wrappy": "1"
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/path-is-absolute": {
+    "node_modules/package-json-from-dist": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "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",
+      "license": "BlueOak-1.0.0"
+    },
+    "node_modules/path-scurry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz",
+      "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.2.tgz",
+      "integrity": "sha512-cFCkPslJv7BAXJsYlK1dZsbP8/ZNLkCAQ0bi1hf5EKX2QHegmDFEFA6QhuYJlk7UDdc+02JjO80YSOrWPpw06g==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "glob": "^7.1.3"
+        "glob": "^13.0.0",
+        "package-json-from-dist": "^1.0.1"
       },
       "bin": {
-        "rimraf": "bin.js"
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/tmp": {
@@ -220,12 +221,6 @@
       "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
       "dev": true,
       "license": "MIT"
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
     }
   }
 }
diff --git a/test/integration/browser/package.json b/test/integration/browser/package.json
index 57b952fa7f31..2550e61032a4 100644
--- a/test/integration/browser/package.json
+++ b/test/integration/browser/package.json
@@ -10,7 +10,7 @@
     "@types/node": "25.x",
     "@types/rimraf": "^2.0.4",
     "@types/tmp": "0.2.6",
-    "rimraf": "^2.6.1",
+    "rimraf": "^6.1.2",
     "tmp": "0.2.5",
     "tree-kill": "1.2.2",
     "vscode-uri": "^3.1.0"

From 7295fc94741e2e58284743809603e9608ed76744 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 12:30:29 +0000
Subject: [PATCH 1363/1815] Bump @vscode/spdlog from 0.15.1 to 0.15.4 in
 /remote

Bumps [@vscode/spdlog](https://github.com/microsoft/node-spdlog) from 0.15.1 to 0.15.4.
- [Release notes](https://github.com/microsoft/node-spdlog/releases)
- [Commits](https://github.com/microsoft/node-spdlog/compare/v0.15.1...v0.15.4)

---
updated-dependencies:
- dependency-name: "@vscode/spdlog"
  dependency-version: 0.15.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 533a80b60230..26996d7da317 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -15,7 +15,7 @@
         "@vscode/iconv-lite-umd": "0.7.1",
         "@vscode/proxy-agent": "^0.36.0",
         "@vscode/ripgrep": "^1.17.0",
-        "@vscode/spdlog": "^0.15.0",
+        "@vscode/spdlog": "^0.15.4",
         "@vscode/tree-sitter-wasm": "^0.3.0",
         "@vscode/vscode-languagedetection": "1.0.22",
         "@vscode/windows-process-tree": "^0.6.2",
@@ -543,9 +543,9 @@
       }
     },
     "node_modules/@vscode/spdlog": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@vscode/spdlog/-/spdlog-0.15.1.tgz",
-      "integrity": "sha512-tVPeXmyz3/4NKqtNfNQxqcrBSSEZVIbF4lVDuDh9Nik5xhuHVceCU6cTpwmJ6yVBs+jv51SGF622txOQv95sZA==",
+      "version": "0.15.4",
+      "resolved": "https://registry.npmjs.org/@vscode/spdlog/-/spdlog-0.15.4.tgz",
+      "integrity": "sha512-NmFasVWjn/6BjHMAjqalsbG2srQCt8yfC0EczP5wzNQFawv74rhvuarhWi44x3St9LB8bZBxrpbT7igPaTJwcw==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/remote/package.json b/remote/package.json
index b547a0b91468..b3571dc3464b 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -10,7 +10,7 @@
     "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/proxy-agent": "^0.36.0",
     "@vscode/ripgrep": "^1.17.0",
-    "@vscode/spdlog": "^0.15.0",
+    "@vscode/spdlog": "^0.15.4",
     "@vscode/tree-sitter-wasm": "^0.3.0",
     "@vscode/vscode-languagedetection": "1.0.22",
     "@vscode/windows-process-tree": "^0.6.2",

From b234e4444223534d293d8e1a65f36c8637b096a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 12:30:34 +0000
Subject: [PATCH 1364/1815] Bump @xterm/addon-image from 0.9.0-beta.140 to
 0.10.0-beta.76 in /remote

Bumps [@xterm/addon-image](https://github.com/xtermjs/xterm.js) from 0.9.0-beta.140 to 0.10.0-beta.76.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-image"
  dependency-version: 0.10.0-beta.76
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 533a80b60230..659910c8e8da 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -21,7 +21,7 @@
         "@vscode/windows-process-tree": "^0.6.2",
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.2.0-beta.123",
-        "@xterm/addon-image": "^0.9.0-beta.140",
+        "@xterm/addon-image": "^0.10.0-beta.76",
         "@xterm/addon-ligatures": "^0.10.0-beta.140",
         "@xterm/addon-progress": "^0.2.0-beta.4",
         "@xterm/addon-search": "^0.16.0-beta.98",
@@ -622,12 +622,12 @@
       }
     },
     "node_modules/@xterm/addon-image": {
-      "version": "0.9.0-beta.140",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.140.tgz",
-      "integrity": "sha512-9FG1ke2lAkDqvw7K/BY/UCjwF1OS3ME6s+FBpBQIMIA+Bhexm8TjhvYjQMK1aJgX39Y6vvmWflbiC4Xz20H38w==",
+      "version": "0.10.0-beta.76",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.76.tgz",
+      "integrity": "sha512-YdHv4jOEnu92g6X3Z9TKD+TQp9SvcMRiLKrvLHO7quH10IymhzUU/37LnpyMTSYsoCuUbNr/rHfYcdbR6hZqug==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.140"
+        "@xterm/xterm": "^6.1.0-beta.76"
       }
     },
     "node_modules/@xterm/addon-ligatures": {
diff --git a/remote/package.json b/remote/package.json
index b547a0b91468..f3672e952762 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -16,7 +16,7 @@
     "@vscode/windows-process-tree": "^0.6.2",
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.2.0-beta.123",
-    "@xterm/addon-image": "^0.9.0-beta.140",
+    "@xterm/addon-image": "^0.10.0-beta.76",
     "@xterm/addon-ligatures": "^0.10.0-beta.140",
     "@xterm/addon-progress": "^0.2.0-beta.4",
     "@xterm/addon-search": "^0.16.0-beta.98",

From 9678767d23834ca8d116e34ac0f8f3493ea9bcea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 12:30:40 +0000
Subject: [PATCH 1365/1815] Bump @microsoft/1ds-post-js from 3.2.13 to 4.3.10
 in /remote/web

Bumps [@microsoft/1ds-post-js](https://github.com/microsoft/ApplicationInsights-JS) from 3.2.13 to 4.3.10.
- [Release notes](https://github.com/microsoft/ApplicationInsights-JS/releases)
- [Changelog](https://github.com/microsoft/ApplicationInsights-JS/blob/main/RELEASES.md)
- [Commits](https://github.com/microsoft/ApplicationInsights-JS/commits)

---
updated-dependencies:
- dependency-name: "@microsoft/1ds-post-js"
  dependency-version: 4.3.10
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 71 ++++++------------------------------
 remote/web/package.json      |  2 +-
 2 files changed, 12 insertions(+), 61 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index ee6e73ced5be..c09de11a93df 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -9,7 +9,7 @@
 			"version": "0.0.0",
 			"dependencies": {
 				"@microsoft/1ds-core-js": "^4.3.10",
-				"@microsoft/1ds-post-js": "^3.2.13",
+				"@microsoft/1ds-post-js": "^4.3.10",
 				"@vscode/iconv-lite-umd": "0.7.1",
 				"@vscode/tree-sitter-wasm": "^0.3.0",
 				"@vscode/vscode-languagedetection": "1.0.22",
@@ -41,56 +41,17 @@
 				"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
 			}
 		},
-		"node_modules/@microsoft/1ds-core-js/node_modules/@microsoft/applicationinsights-shims": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
-			"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
-			"license": "MIT",
-			"dependencies": {
-				"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
-			}
-		},
-		"node_modules/@microsoft/1ds-core-js/node_modules/@microsoft/dynamicproto-js": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
-			"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
-			"license": "MIT",
-			"dependencies": {
-				"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
-			}
-		},
 		"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/1ds-post-js/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==",
-			"license": "MIT",
-			"dependencies": {
-				"@microsoft/applicationinsights-core-js": "2.8.15",
-				"@microsoft/applicationinsights-shims": "^2.0.2",
-				"@microsoft/dynamicproto-js": "^1.1.7"
-			}
-		},
-		"node_modules/@microsoft/1ds-post-js/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==",
+			"version": "4.3.10",
+			"resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.10.tgz",
+			"integrity": "sha512-VSLjc9cT+Y+eTiSfYltJHJCejn8oYr0E6Pq2BMhOEO7F6IyLGYIxzKKvo78ze9x+iHX7KPTATcZ+PFgjGXuNqg==",
 			"license": "MIT",
 			"dependencies": {
-				"@microsoft/applicationinsights-shims": "2.0.2",
-				"@microsoft/dynamicproto-js": "^1.1.9"
-			},
-			"peerDependencies": {
-				"tslib": "*"
+				"@microsoft/1ds-core-js": "4.3.10",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.4 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
 			}
 		},
 		"node_modules/@microsoft/applicationinsights-core-js": {
@@ -108,7 +69,7 @@
 				"tslib": ">= 1.0.0"
 			}
 		},
-		"node_modules/@microsoft/applicationinsights-core-js/node_modules/@microsoft/applicationinsights-shims": {
+		"node_modules/@microsoft/applicationinsights-shims": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
 			"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
@@ -117,7 +78,7 @@
 				"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
 			}
 		},
-		"node_modules/@microsoft/applicationinsights-core-js/node_modules/@microsoft/dynamicproto-js": {
+		"node_modules/@microsoft/dynamicproto-js": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
 			"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
@@ -126,16 +87,6 @@
 				"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
 			}
 		},
-		"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/@nevware21/ts-async": {
 			"version": "0.5.4",
 			"resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
diff --git a/remote/web/package.json b/remote/web/package.json
index 9e3fd3b95bda..bee7cb761656 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"dependencies": {
 		"@microsoft/1ds-core-js": "^4.3.10",
-		"@microsoft/1ds-post-js": "^3.2.13",
+		"@microsoft/1ds-post-js": "^4.3.10",
 		"@vscode/iconv-lite-umd": "0.7.1",
 		"@vscode/tree-sitter-wasm": "^0.3.0",
 		"@vscode/vscode-languagedetection": "1.0.22",

From c903cbeaeb0363f21487aeda173de8c2f66c80c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 12:30:44 +0000
Subject: [PATCH 1366/1815] Bump @xterm/addon-unicode11 in /remote/web

Bumps [@xterm/addon-unicode11](https://github.com/xtermjs/xterm.js) from 0.9.0-beta.140 to 0.10.0-beta.76.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-unicode11"
  dependency-version: 0.10.0-beta.76
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index ee6e73ced5be..5fb8fec41403 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -19,7 +19,7 @@
 				"@xterm/addon-progress": "^0.3.0-beta.57",
 				"@xterm/addon-search": "^0.16.0-beta.140",
 				"@xterm/addon-serialize": "^0.15.0-beta.56",
-				"@xterm/addon-unicode11": "^0.9.0-beta.140",
+				"@xterm/addon-unicode11": "^0.10.0-beta.76",
 				"@xterm/addon-webgl": "^0.20.0-beta.75",
 				"@xterm/xterm": "^6.0.0",
 				"jschardet": "3.1.4",
@@ -237,12 +237,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-unicode11": {
-			"version": "0.9.0-beta.140",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.140.tgz",
-			"integrity": "sha512-sfpw89by14QzAe7rlmOy8Y/BYtHBpIlsNeCyumwTw0zIs7BvbUx0UQSGDyOzOaimujWEhrXiJLT4siC/mVYu3A==",
+			"version": "0.10.0-beta.76",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.76.tgz",
+			"integrity": "sha512-zn7J+1y27d9evbFNrVBQGpf9eEUeknJ9mlf1cRPXKdueRd+SatQa1SK+/3L7yDAhBk1PUuWXiLI5IAEWa8p2tA==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.140"
+				"@xterm/xterm": "^6.1.0-beta.76"
 			}
 		},
 		"node_modules/@xterm/addon-webgl": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 9e3fd3b95bda..5deadf01a0ca 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -14,7 +14,7 @@
 		"@xterm/addon-progress": "^0.3.0-beta.57",
 		"@xterm/addon-search": "^0.16.0-beta.140",
 		"@xterm/addon-serialize": "^0.15.0-beta.56",
-		"@xterm/addon-unicode11": "^0.9.0-beta.140",
+		"@xterm/addon-unicode11": "^0.10.0-beta.76",
 		"@xterm/addon-webgl": "^0.20.0-beta.75",
 		"@xterm/xterm": "^6.0.0",
 		"jschardet": "3.1.4",

From 7dcff94b6776bd325a4e15566ba3ce2e30054425 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 12:31:29 +0000
Subject: [PATCH 1367/1815] Bump @xterm/addon-unicode11 in /remote

Bumps [@xterm/addon-unicode11](https://github.com/xtermjs/xterm.js) from 0.9.0-beta.98 to 0.10.0-beta.76.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-unicode11"
  dependency-version: 0.10.0-beta.76
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 533a80b60230..882f47cbd2f4 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -26,7 +26,7 @@
         "@xterm/addon-progress": "^0.2.0-beta.4",
         "@xterm/addon-search": "^0.16.0-beta.98",
         "@xterm/addon-serialize": "^0.14.0-beta.140",
-        "@xterm/addon-unicode11": "^0.9.0-beta.98",
+        "@xterm/addon-unicode11": "^0.10.0-beta.76",
         "@xterm/addon-webgl": "^0.19.0-beta.98",
         "@xterm/headless": "^5.6.0-beta.140",
         "@xterm/xterm": "^5.6.0-beta.98",
@@ -674,12 +674,12 @@
       }
     },
     "node_modules/@xterm/addon-unicode11": {
-      "version": "0.9.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.98.tgz",
-      "integrity": "sha512-3GjjEYAPWAEGE1CaTFDjQxKcY5NiHHPmeufTsRp3IL5850ZiaMMq9bIL2WSdoFIbVgfbxh5mRy2cJPdu9m0uRQ==",
+      "version": "0.10.0-beta.76",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.76.tgz",
+      "integrity": "sha512-zn7J+1y27d9evbFNrVBQGpf9eEUeknJ9mlf1cRPXKdueRd+SatQa1SK+/3L7yDAhBk1PUuWXiLI5IAEWa8p2tA==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^6.1.0-beta.76"
       }
     },
     "node_modules/@xterm/addon-webgl": {
diff --git a/remote/package.json b/remote/package.json
index b547a0b91468..f099b1ac73b6 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -21,7 +21,7 @@
     "@xterm/addon-progress": "^0.2.0-beta.4",
     "@xterm/addon-search": "^0.16.0-beta.98",
     "@xterm/addon-serialize": "^0.14.0-beta.140",
-    "@xterm/addon-unicode11": "^0.9.0-beta.98",
+    "@xterm/addon-unicode11": "^0.10.0-beta.76",
     "@xterm/addon-webgl": "^0.19.0-beta.98",
     "@xterm/headless": "^5.6.0-beta.140",
     "@xterm/xterm": "^5.6.0-beta.98",

From 8ae971c8d54f603e6d1ec79f755f92153c61e8d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 15:21:29 +0000
Subject: [PATCH 1368/1815] Bump open from 4.2.0 to 5.3.3 in /cli

Bumps [open](https://github.com/Byron/open-rs) from 4.2.0 to 5.3.3.
- [Release notes](https://github.com/Byron/open-rs/releases)
- [Changelog](https://github.com/Byron/open-rs/blob/main/changelog.md)
- [Commits](https://github.com/Byron/open-rs/compare/v4.2.0...v5.3.3)

---
updated-dependencies:
- dependency-name: open
  dependency-version: 5.3.3
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 4 ++--
 cli/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 27ef32fe1bc8..d2ed558ad054 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -1811,9 +1811,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "open"
-version = "4.2.0"
+version = "5.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a083c0c7e5e4a8ec4176346cf61f67ac674e8bfb059d9226e1c54a96b377c12"
+checksum = "43bb73a7fa3799b198970490a51174027ba0d4ec504b03cd08caf513d40024bc"
 dependencies = [
  "is-wsl",
  "libc",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 4fc8c6171c10..16ccd688079c 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -14,7 +14,7 @@ name = "code"
 [dependencies]
 futures = "0.3.28"
 clap = { version = "4.3.0", features = ["derive", "env"] }
-open = "4.1.0"
+open = "5.3.3"
 reqwest = { version = "0.12.5", default-features = false, features = ["json", "stream", "native-tls"] }
 tokio = { version = "1.43.1", features = ["full"] }
 tokio-util = { version = "0.7.8", features = ["compat", "codec"] }

From ef340cbf02ec1ec6a06c73a0898d0126afedc40a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 15:21:38 +0000
Subject: [PATCH 1369/1815] Bump rmp-serde from 1.3.0 to 1.3.1 in /cli

Bumps [rmp-serde](https://github.com/3Hren/msgpack-rust) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/3Hren/msgpack-rust/releases)
- [Commits](https://github.com/3Hren/msgpack-rust/commits)

---
updated-dependencies:
- dependency-name: rmp-serde
  dependency-version: 1.3.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 67 ++++++++++++++++++++++++++++----------------------
 cli/Cargo.toml |  2 +-
 2 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 27ef32fe1bc8..b3d536678696 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -196,7 +196,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -231,7 +231,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -397,7 +397,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -673,7 +673,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -709,7 +709,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -936,7 +936,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1389,7 +1389,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1843,7 +1843,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1999,7 +1999,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2337,11 +2337,10 @@ dependencies = [
 
 [[package]]
 name = "rmp-serde"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
+checksum = "72f81bee8c8ef9b577d1681a70ebbc962c232461e397b22c208c43c04b67a155"
 dependencies = [
- "byteorder",
  "rmp",
  "serde",
 ]
@@ -2533,10 +2532,11 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.202"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
+ "serde_core",
  "serde_derive",
 ]
 
@@ -2549,15 +2549,24 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
 [[package]]
 name = "serde_derive"
-version = "1.0.202"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2579,7 +2588,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2709,9 +2718,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.65"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2738,7 +2747,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2816,7 +2825,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2875,7 +2884,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2969,7 +2978,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3190,7 +3199,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
  "wasm-bindgen-shared",
 ]
 
@@ -3224,7 +3233,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -3550,7 +3559,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
  "synstructure",
 ]
 
@@ -3632,7 +3641,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
  "synstructure",
 ]
 
@@ -3661,7 +3670,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.65",
+ "syn 2.0.87",
 ]
 
 [[package]]
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 4fc8c6171c10..a38c33b3cc2f 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -25,7 +25,7 @@ lazy_static = "1.5.0"
 sysinfo = { version = "0.29.0", default-features = false }
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
-rmp-serde = "1.1.1"
+rmp-serde = "1.3.1"
 uuid = { version = "1.16", features = ["serde", "v4"] }
 dirs = "5.0.1"
 rand = "0.8.5"

From ea09464a125f91146d6f57c5de72bb0185e2be9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 15:21:45 +0000
Subject: [PATCH 1370/1815] Bump flate2 from 1.0.30 to 1.1.5 in /cli

Bumps [flate2](https://github.com/rust-lang/flate2-rs) from 1.0.30 to 1.1.5.
- [Release notes](https://github.com/rust-lang/flate2-rs/releases)
- [Commits](https://github.com/rust-lang/flate2-rs/compare/1.0.30...1.1.5)

---
updated-dependencies:
- dependency-name: flate2
  dependency-version: 1.1.5
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 34 ++++++++++++++++++++++++++++------
 cli/Cargo.toml |  2 +-
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 27ef32fe1bc8..562d66baf597 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -17,6 +17,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
 [[package]]
 name = "aho-corasick"
 version = "1.1.3"
@@ -256,7 +262,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.7.3",
  "object",
  "rustc-demangle",
 ]
@@ -816,13 +822,13 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.30"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
 dependencies = [
  "crc32fast",
  "libz-sys",
- "miniz_oxide",
+ "miniz_oxide 0.8.9",
 ]
 
 [[package]]
@@ -1560,9 +1566,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.16"
+version = "1.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9"
+checksum = "15d118bbf3771060e7311cc7bb0545b01d08a8b4a7de949198dec1fa0ca1c0f7"
 dependencies = [
  "cc",
  "pkg-config",
@@ -1658,6 +1664,16 @@ dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
 [[package]]
 name = "mio"
 version = "1.1.1"
@@ -2637,6 +2653,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
+
 [[package]]
 name = "slab"
 version = "0.4.9"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 4fc8c6171c10..ed4b0cb84622 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -18,7 +18,7 @@ open = "4.1.0"
 reqwest = { version = "0.12.5", default-features = false, features = ["json", "stream", "native-tls"] }
 tokio = { version = "1.43.1", features = ["full"] }
 tokio-util = { version = "0.7.8", features = ["compat", "codec"] }
-flate2 = { version = "1.0.26", default-features = false, features = ["zlib"] }
+flate2 = { version = "1.1.5", default-features = false, features = ["zlib"] }
 zip = { version = "0.6.6", default-features = false, features = ["time", "deflate-zlib"] }
 regex = "1.8.3"
 lazy_static = "1.5.0"

From f9e08f11ca42584f67d6669c15481c169ecea5d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jan 2026 06:12:40 +0000
Subject: [PATCH 1371/1815] Bump picomatch and @types/picomatch

Bumps [picomatch](https://github.com/micromatch/picomatch) and [@types/picomatch](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/picomatch). These dependencies needed to be updated together.

Updates `picomatch` from 2.3.1 to 4.0.3
- [Release notes](https://github.com/micromatch/picomatch/releases)
- [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/picomatch/compare/2.3.1...4.0.3)

Updates `@types/picomatch` from 2.3.0 to 4.0.2
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/picomatch)

---
updated-dependencies:
- dependency-name: picomatch
  dependency-version: 4.0.3
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: "@types/picomatch"
  dependency-version: 4.0.2
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 47 +++++++++++++++----
 .../markdown-language-features/package.json   |  4 +-
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index a2be6b5322f6..87261a31f99f 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -15,7 +15,7 @@
         "markdown-it": "^14.1.0",
         "markdown-it-front-matter": "^0.2.4",
         "morphdom": "^2.7.7",
-        "picomatch": "^2.3.1",
+        "picomatch": "^4.0.3",
         "punycode": "^2.3.1",
         "vscode-languageclient": "^8.0.2",
         "vscode-languageserver-textdocument": "^1.0.12",
@@ -26,7 +26,7 @@
         "@types/dompurify": "^3.2.0",
         "@types/lodash.throttle": "^4.1.9",
         "@types/markdown-it": "14.1.2",
-        "@types/picomatch": "^2.3.0",
+        "@types/picomatch": "^4.0.2",
         "@types/vscode-notebook-renderer": "^1.72.4",
         "@types/vscode-webview": "^1.57.5",
         "@vscode/markdown-it-katex": "^1.1.1",
@@ -213,10 +213,11 @@
       "dev": true
     },
     "node_modules/@types/picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@types/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-O397rnSS9iQI4OirieAtsDqvCj4+3eY1J+EPdNTKuHuRWIfUoGyzX294o8C4KJYaLqgSrd2o60c5EqCU8Zv02g==",
-      "dev": true
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-qHHxQ+P9PysNEGbALT8f8YOSHW0KJu6l2xU8DYY0fu/EmGxXdVnuTLvFUvBgPJMSqXq29SYHveejeAha+4AYgA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/trusted-types": {
       "version": "2.0.7",
@@ -527,11 +528,12 @@
       }
     },
     "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"
@@ -693,6 +695,18 @@
         "node": "*"
       }
     },
+    "node_modules/vscode-markdown-languageserver/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/vscode-markdown-languageserver/node_modules/vscode-markdown-languageservice": {
       "version": "0.5.0-alpha.8",
       "resolved": "https://registry.npmjs.org/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.5.0-alpha.8.tgz",
@@ -738,6 +752,19 @@
       "integrity": "sha512-E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ==",
       "dev": true
     },
+    "node_modules/vscode-markdown-languageservice/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/vscode-uri": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index e12d2351a9c1..b14b81e81c4f 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -769,7 +769,7 @@
     "markdown-it": "^14.1.0",
     "markdown-it-front-matter": "^0.2.4",
     "morphdom": "^2.7.7",
-    "picomatch": "^2.3.1",
+    "picomatch": "^4.0.3",
     "punycode": "^2.3.1",
     "vscode-languageclient": "^8.0.2",
     "vscode-languageserver-textdocument": "^1.0.12",
@@ -780,7 +780,7 @@
     "@types/dompurify": "^3.2.0",
     "@types/lodash.throttle": "^4.1.9",
     "@types/markdown-it": "14.1.2",
-    "@types/picomatch": "^2.3.0",
+    "@types/picomatch": "^4.0.2",
     "@types/vscode-notebook-renderer": "^1.72.4",
     "@types/vscode-webview": "^1.57.5",
     "@vscode/markdown-it-katex": "^1.1.1",

From 84cf6eda1d390ead28d9530e97be4a6e7a43f85b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jan 2026 12:23:30 +0000
Subject: [PATCH 1372/1815] Bump @vscode/extension-telemetry

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 0.9.8 to 1.2.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v0.9.8...v1.2.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.2.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 94 +++++++++----------
 .../markdown-language-features/package.json   |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index a2be6b5322f6..7f361a0ac85a 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^0.9.8",
+        "@vscode/extension-telemetry": "^1.2.0",
         "dompurify": "^3.2.4",
         "highlight.js": "^11.11.1",
         "markdown-it": "^14.1.0",
@@ -39,73 +39,73 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
-      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
+      "integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
-      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "version": "4.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.10.tgz",
+      "integrity": "sha512-VSLjc9cT+Y+eTiSfYltJHJCejn8oYr0E6Pq2BMhOEO7F6IyLGYIxzKKvo78ze9x+iHX7KPTATcZ+PFgjGXuNqg==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.3.4",
+        "@microsoft/1ds-core-js": "4.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
-      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.10.tgz",
+      "integrity": "sha512-iolFLz1ocWAzIQqHIEjjov3gNTPkgFQ4ArHnBcJEYoffOGWlJt6copaevS5YPI5rHzmbySsengZ8cLJJBBrXzQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
-      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.10.tgz",
+      "integrity": "sha512-RVIenPIvNgZCbjJdALvLM4rNHgAFuHI7faFzHCgnI6S2WCUNGHeXlQTs9EUUrL+n2TPp9/cd0KKMILU5VVyYiA==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
-      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.10.tgz",
+      "integrity": "sha512-5yKeyassZTq2l+SAO4npu6LPnbS++UD+M+Ghjm9uRzoBwD8tumFx0/F8AkSVqbniSREd+ztH/2q2foewa2RZyg==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -121,18 +121,18 @@
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
-      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.10.tgz",
+      "integrity": "sha512-AZib5DAT3NU0VT0nLWEwXrnoMDDgZ/5S4dso01CNU5ELNxLdg+1fvchstlVdMy4FrAnxzs8Wf/GIQNFYOVgpAw==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.3.4",
-        "@microsoft/applicationinsights-common": "3.3.4",
-        "@microsoft/applicationinsights-core-js": "3.3.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.10",
+        "@microsoft/applicationinsights-common": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.10",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       },
       "peerDependencies": {
         "tslib": ">= 1.0.0"
@@ -157,9 +157,9 @@
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
-      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
+      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
       "license": "MIT"
     },
     "node_modules/@types/dompurify": {
@@ -240,14 +240,14 @@
       "license": "MIT"
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.8",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
-      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
+      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.3.4",
-        "@microsoft/1ds-post-js": "^4.3.4",
-        "@microsoft/applicationinsights-web-basic": "^3.3.4"
+        "@microsoft/1ds-core-js": "^4.3.10",
+        "@microsoft/1ds-post-js": "^4.3.10",
+        "@microsoft/applicationinsights-web-basic": "^3.3.10"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index e12d2351a9c1..b219e392b0c7 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -763,7 +763,7 @@
     "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^0.9.8",
+    "@vscode/extension-telemetry": "^1.2.0",
     "dompurify": "^3.2.4",
     "highlight.js": "^11.11.1",
     "markdown-it": "^14.1.0",

From 19a6f520c736263362c6979d452d7c91246b1614 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jan 2026 12:26:00 +0000
Subject: [PATCH 1373/1815] Bump minimist from 1.2.6 to 1.2.8 in /remote

Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.6 to 1.2.8.
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/minimistjs/minimist/compare/v1.2.6...v1.2.8)

---
updated-dependencies:
- dependency-name: minimist
  dependency-version: 1.2.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 12 ++++++++----
 remote/package.json      |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 533a80b60230..037a5410671e 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -35,7 +35,7 @@
         "https-proxy-agent": "^7.0.6",
         "jschardet": "3.1.4",
         "kerberos": "2.1.1",
-        "minimist": "^1.2.6",
+        "minimist": "^1.2.8",
         "native-watchdog": "^1.4.1",
         "node-pty": "1.1.0-beta39",
         "tas-client-umd": "0.2.0",
@@ -1131,9 +1131,13 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
+      "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/mkdirp": {
       "version": "1.0.4",
diff --git a/remote/package.json b/remote/package.json
index b547a0b91468..30778d5b2845 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -30,7 +30,7 @@
     "https-proxy-agent": "^7.0.6",
     "jschardet": "3.1.4",
     "kerberos": "2.1.1",
-    "minimist": "^1.2.6",
+    "minimist": "^1.2.8",
     "native-watchdog": "^1.4.1",
     "node-pty": "1.1.0-beta39",
     "tas-client-umd": "0.2.0",

From 2384dad69a81ac673a6f1a82975748b3802d39e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jan 2026 17:17:18 +0000
Subject: [PATCH 1374/1815] Bump futures from 0.3.30 to 0.3.31 in /cli

Bumps [futures](https://github.com/rust-lang/futures-rs) from 0.3.30 to 0.3.31.
- [Release notes](https://github.com/rust-lang/futures-rs/releases)
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.30...0.3.31)

---
updated-dependencies:
- dependency-name: futures
  dependency-version: 0.3.31
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 36 ++++++++++++++++++------------------
 cli/Cargo.toml |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 3bdcead72808..72aad4611ca9 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -863,9 +863,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -878,9 +878,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -888,15 +888,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -905,9 +905,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
@@ -936,9 +936,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -947,21 +947,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 7d564418aa37..bf850d51f8f3 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -12,7 +12,7 @@ path = "src/lib.rs"
 name = "code"
 
 [dependencies]
-futures = "0.3.28"
+futures = "0.3.31"
 clap = { version = "4.3.0", features = ["derive", "env"] }
 open = "5.3.3"
 reqwest = { version = "0.12.5", default-features = false, features = ["json", "stream", "native-tls"] }

From ff95da1289bd014f4bda7742494b04d0b41ef434 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jan 2026 18:30:20 +0000
Subject: [PATCH 1375/1815] Bump @types/which from 3.0.0 to 3.0.4 in
 /extensions/npm

Bumps [@types/which](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/which) from 3.0.0 to 3.0.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/which)

---
updated-dependencies:
- dependency-name: "@types/which"
  dependency-version: 3.0.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/npm/package-lock.json | 11 ++++++-----
 extensions/npm/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index 54aaed8484bf..1ec9d69eb876 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -21,7 +21,7 @@
       "devDependencies": {
         "@types/minimatch": "^6.0.0",
         "@types/node": "25.x",
-        "@types/which": "^3.0.0"
+        "@types/which": "^3.0.4"
       },
       "engines": {
         "vscode": "0.10.x"
@@ -70,10 +70,11 @@
       }
     },
     "node_modules/@types/which": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/which/-/which-3.0.0.tgz",
-      "integrity": "sha512-ASCxdbsrwNfSMXALlC3Decif9rwDMu+80KGp5zI2RLRotfMsTv7fHL8W8VDp24wymzDyIFudhUeSCugrgRFfHQ==",
-      "dev": true
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-3.0.4.tgz",
+      "integrity": "sha512-liyfuo/106JdlgSchJzXEQCVArk0CvevqPote8F8HgWgJ3dRCcTHgJIsLDuee0kxk/mhbInzIZk3QWSZJ8R+2w==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/argparse": {
       "version": "1.0.9",
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
index 981ccd565bea..e4d1b7aa7a7b 100644
--- a/extensions/npm/package.json
+++ b/extensions/npm/package.json
@@ -33,7 +33,7 @@
   "devDependencies": {
     "@types/minimatch": "^6.0.0",
     "@types/node": "25.x",
-    "@types/which": "^3.0.0"
+    "@types/which": "^3.0.4"
   },
   "main": "./out/npmMain",
   "browser": "./dist/browser/npmBrowserMain",

From fdb8a95e6b988f246aac6f9295d34d6da7f58f1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jan 2026 18:41:53 +0000
Subject: [PATCH 1376/1815] Bump vscode-languageclient in
 /extensions/markdown-language-features

Bumps [vscode-languageclient](https://github.com/Microsoft/vscode-languageserver-node/tree/HEAD/client) from 8.1.0 to 9.0.1.
- [Release notes](https://github.com/Microsoft/vscode-languageserver-node/releases)
- [Commits](https://github.com/Microsoft/vscode-languageserver-node/commits/release/client/9.0.1/client)

---
updated-dependencies:
- dependency-name: vscode-languageclient
  dependency-version: 9.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 37 +++----------------
 .../markdown-language-features/package.json   |  2 +-
 2 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index 87261a31f99f..20848801e224 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -17,7 +17,7 @@
         "morphdom": "^2.7.7",
         "picomatch": "^4.0.3",
         "punycode": "^2.3.1",
-        "vscode-languageclient": "^8.0.2",
+        "vscode-languageclient": "^9.0.1",
         "vscode-languageserver-textdocument": "^1.0.12",
         "vscode-markdown-languageserver": "^0.5.0-alpha.9",
         "vscode-uri": "^3.1.0"
@@ -586,44 +586,19 @@
       }
     },
     "node_modules/vscode-languageclient": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.1.0.tgz",
-      "integrity": "sha512-GL4QdbYUF/XxQlAsvYWZRV3V34kOkpRlvV60/72ghHfsYFnS/v2MANZ9P6sHmxFcZKOse8O+L9G7Czg0NUWing==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-9.0.1.tgz",
+      "integrity": "sha512-JZiimVdvimEuHh5olxhxkht09m3JzUGwggb5eRUkzzJhZ2KjCN0nh55VfiED9oez9DyF8/fz1g1iBV3h+0Z2EA==",
       "license": "MIT",
       "dependencies": {
         "minimatch": "^5.1.0",
         "semver": "^7.3.7",
-        "vscode-languageserver-protocol": "3.17.3"
+        "vscode-languageserver-protocol": "3.17.5"
       },
       "engines": {
-        "vscode": "^1.67.0"
-      }
-    },
-    "node_modules/vscode-languageclient/node_modules/vscode-jsonrpc": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz",
-      "integrity": "sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0"
+        "vscode": "^1.82.0"
       }
     },
-    "node_modules/vscode-languageclient/node_modules/vscode-languageserver-protocol": {
-      "version": "3.17.3",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz",
-      "integrity": "sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==",
-      "license": "MIT",
-      "dependencies": {
-        "vscode-jsonrpc": "8.1.0",
-        "vscode-languageserver-types": "3.17.3"
-      }
-    },
-    "node_modules/vscode-languageclient/node_modules/vscode-languageserver-types": {
-      "version": "3.17.3",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz",
-      "integrity": "sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==",
-      "license": "MIT"
-    },
     "node_modules/vscode-languageserver": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.1.0.tgz",
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index b14b81e81c4f..dd9f51908f2d 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -771,7 +771,7 @@
     "morphdom": "^2.7.7",
     "picomatch": "^4.0.3",
     "punycode": "^2.3.1",
-    "vscode-languageclient": "^8.0.2",
+    "vscode-languageclient": "^9.0.1",
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-markdown-languageserver": "^0.5.0-alpha.9",
     "vscode-uri": "^3.1.0"

From faa1b4b0e3e00e5c9895242248fe7c86b070f934 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jan 2026 18:41:56 +0000
Subject: [PATCH 1377/1815] Bump @vscode/markdown-it-katex in
 /extensions/markdown-language-features

Bumps [@vscode/markdown-it-katex](https://github.com/microsoft/vscode-markdown-it-katex) from 1.1.1 to 1.1.2.
- [Release notes](https://github.com/microsoft/vscode-markdown-it-katex/releases)
- [Changelog](https://github.com/microsoft/vscode-markdown-it-katex/blob/main/CHANGELOG.md)
- [Commits](https://github.com/microsoft/vscode-markdown-it-katex/compare/v1.1.1...v1.1.2)

---
updated-dependencies:
- dependency-name: "@vscode/markdown-it-katex"
  dependency-version: 1.1.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/markdown-language-features/package-lock.json | 8 ++++----
 extensions/markdown-language-features/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index 87261a31f99f..aab358b37dd3 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -29,7 +29,7 @@
         "@types/picomatch": "^4.0.2",
         "@types/vscode-notebook-renderer": "^1.72.4",
         "@types/vscode-webview": "^1.57.5",
-        "@vscode/markdown-it-katex": "^1.1.1",
+        "@vscode/markdown-it-katex": "^1.1.2",
         "lodash.throttle": "^4.1.1",
         "vscode-languageserver-types": "^3.17.5",
         "vscode-markdown-languageservice": "^0.4.0"
@@ -260,9 +260,9 @@
       "integrity": "sha512-ukOMWnCg1tCvT7WnDfsUKQOFDQGsyR5tNgRpwmqi+5/vzU3ghdDXzvIM4IOPdSb3OeSsBNvmSL8nxIVOqi2WXA=="
     },
     "node_modules/@vscode/markdown-it-katex": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@vscode/markdown-it-katex/-/markdown-it-katex-1.1.1.tgz",
-      "integrity": "sha512-3KTlbsRBPJQLE2YmLL7K6nunTlU+W9T5+FjfNdWuIUKgxSS6HWLQHaO3L4MkJi7z7MpIPpY+g4N+cWNBPE/MSA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@vscode/markdown-it-katex/-/markdown-it-katex-1.1.2.tgz",
+      "integrity": "sha512-+4IIv5PgrmhKvW/3LpkpkGg257OViEhXkOOgCyj5KMsjsOfnRXkni8XAuuF9Ui5p3B8WnUovlDXAQNb8RJ/RaQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index b14b81e81c4f..09beb5987ec2 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -783,7 +783,7 @@
     "@types/picomatch": "^4.0.2",
     "@types/vscode-notebook-renderer": "^1.72.4",
     "@types/vscode-webview": "^1.57.5",
-    "@vscode/markdown-it-katex": "^1.1.1",
+    "@vscode/markdown-it-katex": "^1.1.2",
     "lodash.throttle": "^4.1.1",
     "vscode-languageserver-types": "^3.17.5",
     "vscode-markdown-languageservice": "^0.4.0"

From 62617fb2b3818f044ca77deb824c71a71656a32e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jan 2026 19:13:08 +0000
Subject: [PATCH 1378/1815] Bump @vscode/policy-watcher from 1.2.0 to 1.3.5

Bumps [@vscode/policy-watcher](https://github.com/microsoft/vscode-policy-watcher) from 1.2.0 to 1.3.5.
- [Release notes](https://github.com/microsoft/vscode-policy-watcher/releases)
- [Commits](https://github.com/microsoft/vscode-policy-watcher/compare/v1.2.0...v1.3.5)

---
updated-dependencies:
- dependency-name: "@vscode/policy-watcher"
  dependency-version: 1.3.5
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fc79e5e27267..06aac8e77f05 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
         "@types/semver": "^7.7.1",
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.0",
-        "@vscode/policy-watcher": "^1.2.0",
+        "@vscode/policy-watcher": "^1.3.5",
         "@vscode/proxy-agent": "^0.32.0",
         "@vscode/ripgrep": "^1.17.0",
         "@vscode/spdlog": "^0.15.0",
@@ -3229,9 +3229,9 @@
       }
     },
     "node_modules/@vscode/policy-watcher": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.2.0.tgz",
-      "integrity": "sha512-6QwVEx5ibKW/hXEiDHKcqF4jv5dE8QQUgfVX2J0sDg0YCPReo+MG1oxxKTsxP8XAH11xBgDIDM0TA0ZAYpJKHw==",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.3.5.tgz",
+      "integrity": "sha512-k1n9gaDBjyVRy5yJLABbZCnyFwgQ8OA4sR3vXmXnmB+mO9JA0nsl/XOXQfVCoLasBu3UHCOfAnDWGn2sRzCR+A==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 4bf39128dbc8..19e0c6a1488a 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "@types/semver": "^7.7.1",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
-    "@vscode/policy-watcher": "^1.2.0",
+    "@vscode/policy-watcher": "^1.3.5",
     "@vscode/proxy-agent": "^0.32.0",
     "@vscode/ripgrep": "^1.17.0",
     "@vscode/spdlog": "^0.15.0",

From f49a0960cbd390f448565a6e24635f088cb6be74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jan 2026 20:54:23 +0000
Subject: [PATCH 1379/1815] Bump yauzl from 2.10.0 to 3.2.0 in /build

Bumps [yauzl](https://github.com/thejoshwolfe/yauzl) from 2.10.0 to 3.2.0.
- [Commits](https://github.com/thejoshwolfe/yauzl/compare/2.10.0...3.2.0)

---
updated-dependencies:
- dependency-name: yauzl
  dependency-version: 3.2.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 55 +++++++++++++++++++++++++++++++++++------
 build/package.json      |  2 +-
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 3b49ca58e33f..5d0a871ad43b 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -60,7 +60,7 @@
         "tree-sitter": "^0.25.0",
         "vscode-universal-bundler": "^0.1.3",
         "workerpool": "^6.4.0",
-        "yauzl": "^2.10.0"
+        "yauzl": "^3.2.0"
       },
       "optionalDependencies": {
         "tree-sitter-typescript": "^0.20.5",
@@ -1980,6 +1980,17 @@
         "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": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
     "node_modules/@vscode/vsce": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-3.7.1.tgz",
@@ -2319,6 +2330,17 @@
         "node": ">=8"
       }
     },
+    "node_modules/@vscode/vsce/node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
     "node_modules/@vscode/vsce/node_modules/yazl": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
@@ -3511,6 +3533,17 @@
         "@types/yauzl": "^2.9.1"
       }
     },
+    "node_modules/extract-zip/node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
     "node_modules/fancy-log": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
@@ -3609,8 +3642,9 @@
     "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==",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pend": "~1.2.0"
       }
@@ -5216,8 +5250,9 @@
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA= sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-      "dev": true
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/picocolors": {
       "version": "1.1.1",
@@ -6954,13 +6989,17 @@
       "devOptional": true
     },
     "node_modules/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.2.0.tgz",
+      "integrity": "sha512-Ow9nuGZE+qp1u4JIPvg+uCiUr7xGQWdff7JQSk5VGYTAZMDe2q8lxJ10ygv10qmSj031Ty/6FNJpLO4o1Sgc+w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
+        "pend": "~1.2.0"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/yocto-queue": {
diff --git a/build/package.json b/build/package.json
index e290de7f1111..007d91f713a5 100644
--- a/build/package.json
+++ b/build/package.json
@@ -54,7 +54,7 @@
     "tree-sitter": "^0.25.0",
     "vscode-universal-bundler": "^0.1.3",
     "workerpool": "^6.4.0",
-    "yauzl": "^2.10.0"
+    "yauzl": "^3.2.0"
   },
   "type": "commonjs",
   "scripts": {

From 6c86f6aa62736739b64b55febf870d1835cb9660 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jan 2026 20:54:31 +0000
Subject: [PATCH 1380/1815] Bump @types/minimatch from 3.0.3 to 6.0.0 in /build

Bumps [@types/minimatch](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/minimatch) from 3.0.3 to 6.0.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/minimatch)

---
updated-dependencies:
- dependency-name: "@types/minimatch"
  dependency-version: 6.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 15 ++++++++++-----
 build/package.json      |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 3b49ca58e33f..fd9359bbd3de 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -31,7 +31,7 @@
         "@types/gulp-sourcemaps": "^0.0.32",
         "@types/jws": "^3.2.11",
         "@types/mime": "4.0.0",
-        "@types/minimatch": "^3.0.3",
+        "@types/minimatch": "^6.0.0",
         "@types/minimist": "^1.2.1",
         "@types/mocha": "^10.0.10",
         "@types/node": "25.x",
@@ -1787,10 +1787,15 @@
       }
     },
     "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
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-6.0.0.tgz",
+      "integrity": "sha512-zmPitbQ8+6zNutpwgcQuLcsEpn/Cj54Kbn7L5pX0Os5kdWplB7xPgEh/g+SWOB/qmows2gpuCaPyduq8ZZRnxA==",
+      "deprecated": "This is a stub types definition. minimatch provides its own type definitions, so you do not need this installed.",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimatch": "*"
+      }
     },
     "node_modules/@types/minimist": {
       "version": "1.2.1",
diff --git a/build/package.json b/build/package.json
index e290de7f1111..cbef3f75bd99 100644
--- a/build/package.json
+++ b/build/package.json
@@ -25,7 +25,7 @@
     "@types/gulp-sourcemaps": "^0.0.32",
     "@types/jws": "^3.2.11",
     "@types/mime": "4.0.0",
-    "@types/minimatch": "^3.0.3",
+    "@types/minimatch": "^6.0.0",
     "@types/minimist": "^1.2.1",
     "@types/mocha": "^10.0.10",
     "@types/node": "25.x",

From f03ab7035b7e4f32094087253236ea7169b98023 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jan 2026 21:26:13 +0000
Subject: [PATCH 1381/1815] Bump vscode-markdown-languageserver

Bumps vscode-markdown-languageserver from 0.5.0-alpha.9 to 0.5.0-alpha.12.

---
updated-dependencies:
- dependency-name: vscode-markdown-languageserver
  dependency-version: 0.5.0-alpha.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 21 +++++++++++--------
 .../markdown-language-features/package.json   |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index 20848801e224..b8c09c8b2474 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -19,7 +19,7 @@
         "punycode": "^2.3.1",
         "vscode-languageclient": "^9.0.1",
         "vscode-languageserver-textdocument": "^1.0.12",
-        "vscode-markdown-languageserver": "^0.5.0-alpha.9",
+        "vscode-markdown-languageserver": "^0.5.0-alpha.12",
         "vscode-uri": "^3.1.0"
       },
       "devDependencies": {
@@ -655,15 +655,16 @@
       "integrity": "sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA=="
     },
     "node_modules/vscode-markdown-languageserver": {
-      "version": "0.5.0-alpha.9",
-      "resolved": "https://registry.npmjs.org/vscode-markdown-languageserver/-/vscode-markdown-languageserver-0.5.0-alpha.9.tgz",
-      "integrity": "sha512-60jiPHgkstgkyODCN8qCJ4xAOrP/EoKyISmEAcJ7ILT5k2kAJF9JFEl3LvVZ+11HGGMJ2lm1L+lT2/JHvu5Pgg==",
+      "version": "0.5.0-alpha.12",
+      "resolved": "https://registry.npmjs.org/vscode-markdown-languageserver/-/vscode-markdown-languageserver-0.5.0-alpha.12.tgz",
+      "integrity": "sha512-cDRJKwWPZBHrrwufTHrhuZqGgBEGJcYo29Iwhvgh2BgTnIB+fp6Vs62LlqNUu25qsDjmZLLkIEQxntcX4kbfUQ==",
+      "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.11",
         "vscode-languageserver": "^8.1.0",
         "vscode-languageserver-textdocument": "^1.0.8",
         "vscode-languageserver-types": "^3.17.3",
-        "vscode-markdown-languageservice": "^0.5.0-alpha.8",
+        "vscode-markdown-languageservice": "^0.5.0-alpha.11",
         "vscode-uri": "^3.0.7"
       },
       "engines": {
@@ -683,9 +684,10 @@
       }
     },
     "node_modules/vscode-markdown-languageserver/node_modules/vscode-markdown-languageservice": {
-      "version": "0.5.0-alpha.8",
-      "resolved": "https://registry.npmjs.org/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.5.0-alpha.8.tgz",
-      "integrity": "sha512-b2NgVMZvzI/7hRL32Kcu9neAAPFQzkcf/Fqwlxbz9p1/Q7aIorGACOGGo00s72AJtwjkCJ29eVJwUlFMFbPKqA==",
+      "version": "0.5.0-alpha.11",
+      "resolved": "https://registry.npmjs.org/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.5.0-alpha.11.tgz",
+      "integrity": "sha512-P1uBMAD5iylgpcweWCU1kQwk8SZngktnljXsZk1vFPorXv1mrEI7BkBpOUU0fhVssKgvFlCNLkI7KmwZLC7pdA==",
+      "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.10",
         "node-html-parser": "^6.1.5",
@@ -701,7 +703,8 @@
     "node_modules/vscode-markdown-languageserver/node_modules/vscode-markdown-languageservice/node_modules/@vscode/l10n": {
       "version": "0.0.10",
       "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.10.tgz",
-      "integrity": "sha512-E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ=="
+      "integrity": "sha512-E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ==",
+      "license": "MIT"
     },
     "node_modules/vscode-markdown-languageservice": {
       "version": "0.4.0",
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index dd9f51908f2d..1218f22b9dad 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -773,7 +773,7 @@
     "punycode": "^2.3.1",
     "vscode-languageclient": "^9.0.1",
     "vscode-languageserver-textdocument": "^1.0.12",
-    "vscode-markdown-languageserver": "^0.5.0-alpha.9",
+    "vscode-markdown-languageserver": "^0.5.0-alpha.12",
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {

From 675fd194e5e7150c81e38a217b2436fdad60e49a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 3 Jan 2026 00:41:09 +0000
Subject: [PATCH 1382/1815] Bump @xterm/addon-search in /remote

Bumps [@xterm/addon-search](https://github.com/xtermjs/xterm.js) from 0.16.0-beta.98 to 0.17.0-beta.76.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-search"
  dependency-version: 0.17.0-beta.76
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index eedf4c715401..2d2abfbab0ee 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -24,7 +24,7 @@
         "@xterm/addon-image": "^0.10.0-beta.76",
         "@xterm/addon-ligatures": "^0.10.0-beta.140",
         "@xterm/addon-progress": "^0.2.0-beta.4",
-        "@xterm/addon-search": "^0.16.0-beta.98",
+        "@xterm/addon-search": "^0.17.0-beta.77",
         "@xterm/addon-serialize": "^0.14.0-beta.140",
         "@xterm/addon-unicode11": "^0.9.0-beta.98",
         "@xterm/addon-webgl": "^0.19.0-beta.98",
@@ -656,12 +656,12 @@
       }
     },
     "node_modules/@xterm/addon-search": {
-      "version": "0.16.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.98.tgz",
-      "integrity": "sha512-7gtx7eYvwFLxlb5q2IKxa7jG1KEinVwTlT3ijnSsPawwn7rGi6nR135rGiR8DAjEV0GUO406ICeoYyVbgiFNwQ==",
+      "version": "0.17.0-beta.77",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.77.tgz",
+      "integrity": "sha512-GZ/B/ox/JwQTkuak6lba3JvqvEW1GaJ1p/e+WdYlyC343H7rxkls1VvA+y4KajFw+8WWYSIJn6KtvfNH+IKLww==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^6.1.0-beta.77"
       }
     },
     "node_modules/@xterm/addon-serialize": {
diff --git a/remote/package.json b/remote/package.json
index 62fdd1527061..327be2b7707e 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -19,7 +19,7 @@
     "@xterm/addon-image": "^0.10.0-beta.76",
     "@xterm/addon-ligatures": "^0.10.0-beta.140",
     "@xterm/addon-progress": "^0.2.0-beta.4",
-    "@xterm/addon-search": "^0.16.0-beta.98",
+    "@xterm/addon-search": "^0.17.0-beta.77",
     "@xterm/addon-serialize": "^0.14.0-beta.140",
     "@xterm/addon-unicode11": "^0.9.0-beta.98",
     "@xterm/addon-webgl": "^0.19.0-beta.98",

From ba537a999b6e0314c4c1e7b08f7009074fe8739c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 3 Jan 2026 01:23:48 +0000
Subject: [PATCH 1383/1815] Bump @xterm/addon-image in /remote/web

Bumps [@xterm/addon-image](https://github.com/xtermjs/xterm.js) from 0.9.0-beta.140 to 0.10.0-beta.76.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-image"
  dependency-version: 0.10.0-beta.76
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index c09de11a93df..206edfc62a4a 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -14,7 +14,7 @@
 				"@vscode/tree-sitter-wasm": "^0.3.0",
 				"@vscode/vscode-languagedetection": "1.0.22",
 				"@xterm/addon-clipboard": "^0.3.0-beta.56",
-				"@xterm/addon-image": "^0.9.0-beta.140",
+				"@xterm/addon-image": "^0.10.0-beta.77",
 				"@xterm/addon-ligatures": "^0.11.0-beta.76",
 				"@xterm/addon-progress": "^0.3.0-beta.57",
 				"@xterm/addon-search": "^0.16.0-beta.140",
@@ -136,12 +136,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-image": {
-			"version": "0.9.0-beta.140",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.140.tgz",
-			"integrity": "sha512-9FG1ke2lAkDqvw7K/BY/UCjwF1OS3ME6s+FBpBQIMIA+Bhexm8TjhvYjQMK1aJgX39Y6vvmWflbiC4Xz20H38w==",
+			"version": "0.10.0-beta.77",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.77.tgz",
+			"integrity": "sha512-85lYTKFgkXpMVwfSiFpdgXp4cNREr8BAIImFbnovZcmFdqDQn4QoiOywORXYos6on52oeFAyuPVEEa/GMHuHZw==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.140"
+				"@xterm/xterm": "^6.1.0-beta.77"
 			}
 		},
 		"node_modules/@xterm/addon-ligatures": {
diff --git a/remote/web/package.json b/remote/web/package.json
index bee7cb761656..5dea162f2af9 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -9,7 +9,7 @@
 		"@vscode/tree-sitter-wasm": "^0.3.0",
 		"@vscode/vscode-languagedetection": "1.0.22",
 		"@xterm/addon-clipboard": "^0.3.0-beta.56",
-		"@xterm/addon-image": "^0.9.0-beta.140",
+		"@xterm/addon-image": "^0.10.0-beta.77",
 		"@xterm/addon-ligatures": "^0.11.0-beta.76",
 		"@xterm/addon-progress": "^0.3.0-beta.57",
 		"@xterm/addon-search": "^0.16.0-beta.140",

From f9c60c05a34e70e1c86428052a67cf8b852c92da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 3 Jan 2026 01:42:29 +0000
Subject: [PATCH 1384/1815] Bump @xterm/addon-serialize in /remote/web

Bumps [@xterm/addon-serialize](https://github.com/xtermjs/xterm.js) from 0.15.0-beta.56 to 0.15.0-beta.76.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-serialize"
  dependency-version: 0.15.0-beta.76
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 8af07d61e925..98d61ee6ef17 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -18,7 +18,7 @@
 				"@xterm/addon-ligatures": "^0.11.0-beta.76",
 				"@xterm/addon-progress": "^0.3.0-beta.57",
 				"@xterm/addon-search": "^0.16.0-beta.140",
-				"@xterm/addon-serialize": "^0.15.0-beta.56",
+				"@xterm/addon-serialize": "^0.15.0-beta.77",
 				"@xterm/addon-unicode11": "^0.10.0-beta.76",
 				"@xterm/addon-webgl": "^0.20.0-beta.75",
 				"@xterm/xterm": "^6.0.0",
@@ -179,12 +179,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-serialize": {
-			"version": "0.15.0-beta.56",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.56.tgz",
-			"integrity": "sha512-nn7HB0A5e6pZAGjmgE+Uur3GNtGM29XdAjm+vsaACaYlNwyMsYt2wBf/wklHH9TTReKLsag/RWawglrtMXP7HQ==",
+			"version": "0.15.0-beta.77",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.77.tgz",
+			"integrity": "sha512-wNzJvUr2j/6p7VqBnhHSHhnimih7TE00RCPQtNo5JnWE1g7dx1ftDvojEW4X7g+Hz/TFCSCJ/JxNaps7W7Ymhw==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.56"
+				"@xterm/xterm": "^6.1.0-beta.77"
 			}
 		},
 		"node_modules/@xterm/addon-unicode11": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 8e50b1b43d97..70ac50468935 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -13,7 +13,7 @@
 		"@xterm/addon-ligatures": "^0.11.0-beta.76",
 		"@xterm/addon-progress": "^0.3.0-beta.57",
 		"@xterm/addon-search": "^0.16.0-beta.140",
-		"@xterm/addon-serialize": "^0.15.0-beta.56",
+		"@xterm/addon-serialize": "^0.15.0-beta.77",
 		"@xterm/addon-unicode11": "^0.10.0-beta.76",
 		"@xterm/addon-webgl": "^0.20.0-beta.75",
 		"@xterm/xterm": "^6.0.0",

From 5f5fd2a35362d19c9dda0c041869ebe14b796b8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 3 Jan 2026 01:42:31 +0000
Subject: [PATCH 1385/1815] Bump @xterm/addon-search in /remote/web

Bumps [@xterm/addon-search](https://github.com/xtermjs/xterm.js) from 0.16.0-beta.140 to 0.17.0-beta.76.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-search"
  dependency-version: 0.17.0-beta.76
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 8af07d61e925..54391e50bd61 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -17,7 +17,7 @@
 				"@xterm/addon-image": "^0.9.0-beta.140",
 				"@xterm/addon-ligatures": "^0.11.0-beta.76",
 				"@xterm/addon-progress": "^0.3.0-beta.57",
-				"@xterm/addon-search": "^0.16.0-beta.140",
+				"@xterm/addon-search": "^0.17.0-beta.77",
 				"@xterm/addon-serialize": "^0.15.0-beta.56",
 				"@xterm/addon-unicode11": "^0.10.0-beta.76",
 				"@xterm/addon-webgl": "^0.20.0-beta.75",
@@ -170,12 +170,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-search": {
-			"version": "0.16.0-beta.140",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.140.tgz",
-			"integrity": "sha512-HhoIXMKX/uqCazRRiT/0QWFcnKVJ5/GgUDYFM/FMSW/OILzsnu/PAsp2FyNAzjI6pruH32WmnLIRbxeaUv4z7A==",
+			"version": "0.17.0-beta.77",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.77.tgz",
+			"integrity": "sha512-GZ/B/ox/JwQTkuak6lba3JvqvEW1GaJ1p/e+WdYlyC343H7rxkls1VvA+y4KajFw+8WWYSIJn6KtvfNH+IKLww==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.140"
+				"@xterm/xterm": "^6.1.0-beta.77"
 			}
 		},
 		"node_modules/@xterm/addon-serialize": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 8e50b1b43d97..964053c86ec6 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -12,7 +12,7 @@
 		"@xterm/addon-image": "^0.9.0-beta.140",
 		"@xterm/addon-ligatures": "^0.11.0-beta.76",
 		"@xterm/addon-progress": "^0.3.0-beta.57",
-		"@xterm/addon-search": "^0.16.0-beta.140",
+		"@xterm/addon-search": "^0.17.0-beta.77",
 		"@xterm/addon-serialize": "^0.15.0-beta.56",
 		"@xterm/addon-unicode11": "^0.10.0-beta.76",
 		"@xterm/addon-webgl": "^0.20.0-beta.75",

From 222e76f0c4be4c1a5722c1d8c668996b4c1eb6f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 3 Jan 2026 05:07:48 +0000
Subject: [PATCH 1386/1815] Bump @types/gulp-sourcemaps from 0.0.32 to 0.0.38
 in /build

Bumps [@types/gulp-sourcemaps](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/gulp-sourcemaps) from 0.0.32 to 0.0.38.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/gulp-sourcemaps)

---
updated-dependencies:
- dependency-name: "@types/gulp-sourcemaps"
  dependency-version: 0.0.38
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 12 +++++++-----
 build/package.json      |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index d62e61e0d3f5..9cc505451227 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -28,7 +28,7 @@
         "@types/gulp-json-editor": "^2.2.36",
         "@types/gulp-rename": "^2.0.7",
         "@types/gulp-sort": "^2.0.4",
-        "@types/gulp-sourcemaps": "^0.0.32",
+        "@types/gulp-sourcemaps": "^0.0.38",
         "@types/jws": "^3.2.11",
         "@types/mime": "4.0.0",
         "@types/minimatch": "^6.0.0",
@@ -1725,12 +1725,14 @@
       }
     },
     "node_modules/@types/gulp-sourcemaps": {
-      "version": "0.0.32",
-      "resolved": "https://registry.npmjs.org/@types/gulp-sourcemaps/-/gulp-sourcemaps-0.0.32.tgz",
-      "integrity": "sha512-+7BAmptW2bxyJnJcCEuie7vLoop3FwWgCdBMzyv7MYXED/HeNMeQuX7uPCkp4vfU1TTu4CYFH0IckNPvo0VePA==",
+      "version": "0.0.38",
+      "resolved": "https://registry.npmjs.org/@types/gulp-sourcemaps/-/gulp-sourcemaps-0.0.38.tgz",
+      "integrity": "sha512-9wm+P44eM/VKZSYwGDwalOH6rnvNckwfPgz0gEUlTzjKH1OsSbexdvE8aKBt+8syEkq827Fu+4gV17/EyUtH9w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "@types/node": "*",
+        "@types/vinyl": "*"
       }
     },
     "node_modules/@types/gulp-util": {
diff --git a/build/package.json b/build/package.json
index 870a985d765b..d907feca31a6 100644
--- a/build/package.json
+++ b/build/package.json
@@ -22,7 +22,7 @@
     "@types/gulp-json-editor": "^2.2.36",
     "@types/gulp-rename": "^2.0.7",
     "@types/gulp-sort": "^2.0.4",
-    "@types/gulp-sourcemaps": "^0.0.32",
+    "@types/gulp-sourcemaps": "^0.0.38",
     "@types/jws": "^3.2.11",
     "@types/mime": "4.0.0",
     "@types/minimatch": "^6.0.0",

From 9ae0d76ba83ee770ca24e45f99f401278cd52a74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:25:19 +0000
Subject: [PATCH 1387/1815] Bump cfg-if from 1.0.0 to 1.0.4 in /cli

Bumps [cfg-if](https://github.com/rust-lang/cfg-if) from 1.0.0 to 1.0.4.
- [Release notes](https://github.com/rust-lang/cfg-if/releases)
- [Changelog](https://github.com/rust-lang/cfg-if/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/cfg-if/compare/1.0.0...v1.0.4)

---
updated-dependencies:
- dependency-name: cfg-if
  dependency-version: 1.0.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 4 ++--
 cli/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 3ac535e49c53..694759327dd1 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -355,9 +355,9 @@ checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "chrono"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index abe4ed0f5444..16de0122f921 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -49,7 +49,7 @@ sha2 = "0.10.9"
 base64 = "0.22.1"
 shell-escape = "0.1.5"
 thiserror = "1.0.40"
-cfg-if = "1.0.0"
+cfg-if = "1.0.4"
 pin-project = "1.1.0"
 console = "0.16.2"
 bytes = "1.11.0"

From b48268c542563b2df1fd549e1c0e2ff1611d6edb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:25:31 +0000
Subject: [PATCH 1388/1815] Bump dialoguer from 0.10.4 to 0.12.0 in /cli

Bumps [dialoguer](https://github.com/console-rs/dialoguer) from 0.10.4 to 0.12.0.
- [Release notes](https://github.com/console-rs/dialoguer/releases)
- [Changelog](https://github.com/console-rs/dialoguer/blob/main/CHANGELOG-OLD.md)
- [Commits](https://github.com/console-rs/dialoguer/compare/v0.10.4...v0.12.0)

---
updated-dependencies:
- dependency-name: dialoguer
  dependency-version: 0.12.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 6 +++---
 cli/Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 3ac535e49c53..881403cac291 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -622,11 +622,11 @@ dependencies = [
 
 [[package]]
 name = "dialoguer"
-version = "0.10.4"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87"
+checksum = "25f104b501bf2364e78d0d3974cbc774f738f5865306ed128e1e0d7499c0ad96"
 dependencies = [
- "console 0.15.8",
+ "console 0.16.2",
  "shell-words",
  "tempfile",
  "zeroize",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index abe4ed0f5444..05e8a5252cb1 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -36,7 +36,7 @@ gethostname = "1.0.0"
 libc = "0.2.144"
 tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "8cae9b2a24c65c6c1958f5a0e77d72b23b5c6c30", default-features = false, features = ["connections"] }
 keyring = { version = "2.0.3", default-features = false, features = ["linux-secret-service-rt-tokio-crypto-openssl", "platform-windows", "platform-macos", "linux-keyutils"] }
-dialoguer = "0.10.4"
+dialoguer = "0.12.0"
 hyper = { version = "0.14.26", features = ["server", "http1", "runtime"] }
 indicatif = "0.17.4"
 tempfile = "3.5.0"

From ea255f1c9b3f28f031f2508d007f2257db793823 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:25:53 +0000
Subject: [PATCH 1389/1815] Bump gethostname from 1.0.0 to 1.1.0 in /cli

Bumps gethostname from 1.0.0 to 1.1.0.

---
updated-dependencies:
- dependency-name: gethostname
  dependency-version: 1.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 33 ++++++++++++++++++++++++++-------
 cli/Cargo.toml |  2 +-
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 3ac535e49c53..1355b7dcfa92 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -745,12 +745,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1006,12 +1006,12 @@ dependencies = [
 
 [[package]]
 name = "gethostname"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fd4b8790c0792e3b11895efdf5f289ebe8b59107a6624f1cce68f24ff8c7035"
+checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
 dependencies = [
- "rustix 0.38.34",
- "windows-targets 0.52.5",
+ "rustix 1.1.3",
+ "windows-link",
 ]
 
 [[package]]
@@ -1616,6 +1616,12 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+
 [[package]]
 name = "litemap"
 version = "0.7.4"
@@ -2478,6 +2484,19 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rustix"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
+dependencies = [
+ "bitflags 2.5.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.11.0",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "1.0.4"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index abe4ed0f5444..b40fd775cca0 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -32,7 +32,7 @@ rand = "0.8.5"
 opentelemetry = { version = "0.19.0", features = ["rt-tokio"] }
 serde_bytes = "0.11.9"
 chrono = { version = "0.4.26", features = ["serde", "std", "clock"], default-features = false }
-gethostname = "1.0.0"
+gethostname = "1.1.0"
 libc = "0.2.144"
 tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "8cae9b2a24c65c6c1958f5a0e77d72b23b5c6c30", default-features = false, features = ["connections"] }
 keyring = { version = "2.0.3", default-features = false, features = ["linux-secret-service-rt-tokio-crypto-openssl", "platform-windows", "platform-macos", "linux-keyutils"] }

From e5dfd4083942d071d49467310ff6a781354924c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:26:04 +0000
Subject: [PATCH 1390/1815] Bump @azure/identity from 4.2.1 to 4.13.0 in /build

Bumps [@azure/identity](https://github.com/Azure/azure-sdk-for-js) from 4.2.1 to 4.13.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-js/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-js/blob/main/documentation/Changelog-for-next-generation.md)
- [Commits](https://github.com/Azure/azure-sdk-for-js/compare/@azure/identity_4.2.1...@azure/identity_4.13.0)

---
updated-dependencies:
- dependency-name: "@azure/identity"
  dependency-version: 4.13.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 353 ++++++++++++++++++----------------------
 build/package.json      |   2 +-
 2 files changed, 162 insertions(+), 193 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index fe36e6dedbfb..7b06623529e2 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -11,7 +11,7 @@
       "devDependencies": {
         "@azure/core-auth": "^1.10.1",
         "@azure/cosmos": "^4",
-        "@azure/identity": "^4.2.1",
+        "@azure/identity": "^4.13.0",
         "@azure/msal-node": "^2.16.1",
         "@azure/storage-blob": "^12.25.0",
         "@electron/get": "^2.0.0",
@@ -102,7 +102,7 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@azure-rest/core-client/node_modules/@azure/abort-controller": {
+    "node_modules/@azure/abort-controller": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
       "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
@@ -115,18 +115,6 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@azure/abort-controller": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.0.2.tgz",
-      "integrity": "sha512-XUyTo+bcyxHEf+jlN2MXA7YU9nxVehaubngHV1MIZZaqYmZqykkoeAz/JMMEeR7t3TcyDwbFa3Zw8BZywmIx4g==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/@azure/core-auth": {
       "version": "1.10.1",
       "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.10.1.tgz",
@@ -142,19 +130,6 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@azure/core-auth/node_modules/@azure/abort-controller": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
-      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
     "node_modules/@azure/core-client": {
       "version": "1.10.1",
       "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.10.1.tgz",
@@ -174,19 +149,6 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@azure/core-client/node_modules/@azure/abort-controller": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
-      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
     "node_modules/@azure/core-http-compat": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/@azure/core-http-compat/-/core-http-compat-2.3.1.tgz",
@@ -202,19 +164,6 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@azure/core-http-compat/node_modules/@azure/abort-controller": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
-      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
     "node_modules/@azure/core-lro": {
       "version": "2.7.2",
       "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.7.2.tgz",
@@ -231,19 +180,6 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@azure/core-lro/node_modules/@azure/abort-controller": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
-      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
     "node_modules/@azure/core-paging": {
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.6.2.tgz",
@@ -276,19 +212,6 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@azure/core-rest-pipeline/node_modules/@azure/abort-controller": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
-      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
     "node_modules/@azure/core-tracing": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.3.1.tgz",
@@ -317,18 +240,6 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@azure/core-util/node_modules/@azure/abort-controller": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
-      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
     "node_modules/@azure/core-xml": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/@azure/core-xml/-/core-xml-1.4.4.tgz",
@@ -366,42 +277,42 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@azure/cosmos/node_modules/@azure/abort-controller": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
-      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
+    "node_modules/@azure/identity": {
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.13.0.tgz",
+      "integrity": "sha512-uWC0fssc+hs1TGGVkkghiaFkkS7NkTxfnCH+Hdg+yTehTpMcehpok4PgUKKdyCH+9ldu6FhiHRv84Ntqj1vVcw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tslib": "^2.6.2"
+        "@azure/abort-controller": "^2.0.0",
+        "@azure/core-auth": "^1.9.0",
+        "@azure/core-client": "^1.9.2",
+        "@azure/core-rest-pipeline": "^1.17.0",
+        "@azure/core-tracing": "^1.0.0",
+        "@azure/core-util": "^1.11.0",
+        "@azure/logger": "^1.0.0",
+        "@azure/msal-browser": "^4.2.0",
+        "@azure/msal-node": "^3.5.0",
+        "open": "^10.1.0",
+        "tslib": "^2.2.0"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
       }
     },
-    "node_modules/@azure/identity": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.2.1.tgz",
-      "integrity": "sha512-U8hsyC9YPcEIzoaObJlRDvp7KiF0MGS7xcWbyJSVvXRkC/HXo1f0oYeBYmEvVgRfacw7GHf6D6yAoh9JHz6A5Q==",
+    "node_modules/@azure/identity/node_modules/@azure/msal-node": {
+      "version": "3.8.4",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.4.tgz",
+      "integrity": "sha512-lvuAwsDpPDE/jSuVQOBMpLbXuVuLsPNRwWCyK3/6bPlBk0fGWegqoZ0qjZclMWyQ2JNvIY3vHY7hoFmFmFQcOw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@azure/abort-controller": "^1.0.0",
-        "@azure/core-auth": "^1.5.0",
-        "@azure/core-client": "^1.4.0",
-        "@azure/core-rest-pipeline": "^1.1.0",
-        "@azure/core-tracing": "^1.0.0",
-        "@azure/core-util": "^1.3.0",
-        "@azure/logger": "^1.0.0",
-        "@azure/msal-browser": "^3.11.1",
-        "@azure/msal-node": "^2.9.2",
-        "events": "^3.0.0",
-        "jws": "^4.0.0",
-        "open": "^8.0.0",
-        "stoppable": "^1.1.0",
-        "tslib": "^2.2.0"
+        "@azure/msal-common": "15.13.3",
+        "jsonwebtoken": "^9.0.0",
+        "uuid": "^8.3.0"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=16"
       }
     },
     "node_modules/@azure/keyvault-common": {
@@ -424,19 +335,6 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@azure/keyvault-common/node_modules/@azure/abort-controller": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
-      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
     "node_modules/@azure/keyvault-keys": {
       "version": "4.10.0",
       "resolved": "https://registry.npmjs.org/@azure/keyvault-keys/-/keyvault-keys-4.10.0.tgz",
@@ -461,19 +359,6 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@azure/keyvault-keys/node_modules/@azure/abort-controller": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
-      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
     "node_modules/@azure/logger": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.3.0.tgz",
@@ -489,22 +374,24 @@
       }
     },
     "node_modules/@azure/msal-browser": {
-      "version": "3.17.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.17.0.tgz",
-      "integrity": "sha512-csccKXmW2z7EkZ0I3yAoW/offQt+JECdTIV/KrnRoZyM7wCSsQWODpwod8ZhYy7iOyamcHApR9uCh0oD1M+0/A==",
+      "version": "4.27.0",
+      "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-4.27.0.tgz",
+      "integrity": "sha512-bZ8Pta6YAbdd0o0PEaL1/geBsPrLEnyY/RDWqvF1PP9RUH8EMLvUMGoZFYS6jSlUan6KZ9IMTLCnwpWWpQRK/w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@azure/msal-common": "14.12.0"
+        "@azure/msal-common": "15.13.3"
       },
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/@azure/msal-common": {
-      "version": "14.12.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.12.0.tgz",
-      "integrity": "sha512-IDDXmzfdwmDkv4SSmMEyAniJf6fDu3FJ7ncOjlxkDuT85uSnLEhZi3fGZpoR7T4XZpOMx9teM9GXBgrfJgyeBw==",
+      "version": "15.13.3",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.13.3.tgz",
+      "integrity": "sha512-shSDU7Ioecya+Aob5xliW9IGq1Ui8y4EVSdWGyI1Gbm4Vg61WpP95LuzcY214/wEjSn6w4PZYD4/iVldErHayQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
@@ -559,19 +446,6 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@azure/storage-blob/node_modules/@azure/abort-controller": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
-      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
     "node_modules/@babel/code-frame": {
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
@@ -2734,6 +2608,22 @@
       "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw= sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==",
       "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "run-applescript": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/byline": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz",
@@ -3114,6 +3004,36 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/default-browser": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.4.0.tgz",
+      "integrity": "sha512-XDuvSq38Hr1MdN47EDvYtx3U0MTqpCEn+F6ft8z2vYDzMrvQhVp0ui9oQdqW3MvK3vqUETglt1tVGgjLuJ5izg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bundle-name": "^4.1.0",
+        "default-browser-id": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-browser-id": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.1.tgz",
+      "integrity": "sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/defer-to-connect": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
@@ -3124,12 +3044,16 @@
       }
     },
     "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
+      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/define-properties": {
@@ -4248,15 +4172,16 @@
       }
     },
     "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==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
+      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "is-docker": "cli.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -4305,6 +4230,25 @@
         "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^3.0.0"
+      },
+      "bin": {
+        "is-inside-container": "cli.js"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -4333,15 +4277,19 @@
       "optional": true
     },
     "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
+      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-docker": "^2.0.0"
+        "is-inside-container": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/isarray": {
@@ -5054,17 +5002,19 @@
       }
     },
     "node_modules/open": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-10.2.0.tgz",
+      "integrity": "sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
+        "default-browser": "^5.2.1",
+        "define-lazy-prop": "^3.0.0",
+        "is-inside-container": "^1.0.0",
+        "wsl-utils": "^0.1.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -5638,6 +5588,19 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/run-applescript": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.1.0.tgz",
+      "integrity": "sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -6011,16 +5974,6 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/stoppable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz",
-      "integrity": "sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4",
-        "npm": ">=6"
-      }
-    },
     "node_modules/stream-exhaust": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
@@ -6950,6 +6903,22 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "devOptional": true
     },
+    "node_modules/wsl-utils": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/wsl-utils/-/wsl-utils-0.1.0.tgz",
+      "integrity": "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-wsl": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/xml2js": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
diff --git a/build/package.json b/build/package.json
index c0c5e82c7fd2..4dc7601cc79c 100644
--- a/build/package.json
+++ b/build/package.json
@@ -5,7 +5,7 @@
   "devDependencies": {
     "@azure/core-auth": "^1.10.1",
     "@azure/cosmos": "^4",
-    "@azure/identity": "^4.2.1",
+    "@azure/identity": "^4.13.0",
     "@azure/msal-node": "^2.16.1",
     "@azure/storage-blob": "^12.25.0",
     "@electron/get": "^2.0.0",

From e5796d477a1af6a4454356209caaac5e15c44b93 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:26:09 +0000
Subject: [PATCH 1391/1815] Bump @types/gulp-filter from 3.0.32 to 3.0.41 in
 /build

Bumps [@types/gulp-filter](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/gulp-filter) from 3.0.32 to 3.0.41.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/gulp-filter)

---
updated-dependencies:
- dependency-name: "@types/gulp-filter"
  dependency-version: 3.0.41
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 18 +++++++++++++-----
 build/package.json      |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index fe36e6dedbfb..0080076217d4 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -23,7 +23,7 @@
         "@types/fs-extra": "^9.0.12",
         "@types/glob": "^9.0.0",
         "@types/gulp": "^4.0.18",
-        "@types/gulp-filter": "^3.0.32",
+        "@types/gulp-filter": "^3.0.41",
         "@types/gulp-gzip": "^0.0.36",
         "@types/gulp-json-editor": "^2.2.36",
         "@types/gulp-rename": "^2.0.7",
@@ -1672,16 +1672,24 @@
       }
     },
     "node_modules/@types/gulp-filter": {
-      "version": "3.0.32",
-      "resolved": "https://registry.npmjs.org/@types/gulp-filter/-/gulp-filter-3.0.32.tgz",
-      "integrity": "sha512-JvY4qTxXehoK2yCUxYVxTMvckVbDM5TWHWeUoYJyX31gwFqw4YDD6JNzhuTxI3yHPUTY4BBRTqgm6puQEZVCNg==",
+      "version": "3.0.41",
+      "resolved": "https://registry.npmjs.org/@types/gulp-filter/-/gulp-filter-3.0.41.tgz",
+      "integrity": "sha512-v+7p521daAT0lXbMqciybyAktHF8plxW5+OHez7cM2JZitJN7DPw0QaU6FQkeLjBTZHEhQS/1HeQOwMiBlRFEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/minimatch": "*",
+        "@types/minimatch": "<=5",
         "@types/node": "*",
         "@types/vinyl": "*"
       }
     },
+    "node_modules/@types/gulp-filter/node_modules/@types/minimatch": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
+      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/gulp-gzip": {
       "version": "0.0.36",
       "resolved": "https://registry.npmjs.org/@types/gulp-gzip/-/gulp-gzip-0.0.36.tgz",
diff --git a/build/package.json b/build/package.json
index c0c5e82c7fd2..93c50b503b64 100644
--- a/build/package.json
+++ b/build/package.json
@@ -17,7 +17,7 @@
     "@types/fs-extra": "^9.0.12",
     "@types/glob": "^9.0.0",
     "@types/gulp": "^4.0.18",
-    "@types/gulp-filter": "^3.0.32",
+    "@types/gulp-filter": "^3.0.41",
     "@types/gulp-gzip": "^0.0.36",
     "@types/gulp-json-editor": "^2.2.36",
     "@types/gulp-rename": "^2.0.7",

From 696f0a110b1780a03e58a78a3cf21e3bf2bd11f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:26:14 +0000
Subject: [PATCH 1392/1815] Bump @types/xml2js from 0.0.33 to 0.4.14 in /build

Bumps [@types/xml2js](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/xml2js) from 0.0.33 to 0.4.14.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/xml2js)

---
updated-dependencies:
- dependency-name: "@types/xml2js"
  dependency-version: 0.4.14
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 14 +++++++++-----
 build/package.json      |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index fe36e6dedbfb..e2e1739b3bff 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -40,7 +40,7 @@
         "@types/through": "^0.0.33",
         "@types/through2": "^2.0.36",
         "@types/workerpool": "^6.4.0",
-        "@types/xml2js": "0.0.33",
+        "@types/xml2js": "0.4.14",
         "@vscode/iconv-lite-umd": "0.7.0",
         "@vscode/ripgrep": "^1.15.10",
         "@vscode/vsce": "3.7.1",
@@ -1939,10 +1939,14 @@
       }
     },
     "node_modules/@types/xml2js": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.0.33.tgz",
-      "integrity": "sha1-IMXdZGAkUoTWSlVpABW5XkCft94= sha512-6dx6V6EdddqLjhxGdQrNdSu+O+3F7tOlyj660SpkO4/5uDSZM+LXcGQKAFnIJbvTzkQ6d2g3rWxyEXVwYAUoJg==",
-      "dev": true
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.14.tgz",
+      "integrity": "sha512-4YnrRemBShWRO2QjvUin8ESA41rH+9nQGLUGZV/1IDhi3SL9OhdpNC/MrulTWuptXKwhx/aDxE7toV0f/ypIXQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
     },
     "node_modules/@types/yauzl": {
       "version": "2.9.2",
diff --git a/build/package.json b/build/package.json
index c0c5e82c7fd2..d01053242125 100644
--- a/build/package.json
+++ b/build/package.json
@@ -34,7 +34,7 @@
     "@types/through": "^0.0.33",
     "@types/through2": "^2.0.36",
     "@types/workerpool": "^6.4.0",
-    "@types/xml2js": "0.0.33",
+    "@types/xml2js": "0.4.14",
     "@vscode/iconv-lite-umd": "0.7.0",
     "@vscode/ripgrep": "^1.15.10",
     "@vscode/vsce": "3.7.1",

From 0379307452fddb0dbb4bf338974d270ccff77ea8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:26:22 +0000
Subject: [PATCH 1393/1815] Bump jsonc-parser from 2.3.0 to 3.3.1 in /build

Bumps [jsonc-parser](https://github.com/microsoft/node-jsonc-parser) from 2.3.0 to 3.3.1.
- [Release notes](https://github.com/microsoft/node-jsonc-parser/releases)
- [Changelog](https://github.com/microsoft/node-jsonc-parser/blob/main/CHANGELOG.md)
- [Commits](https://github.com/microsoft/node-jsonc-parser/compare/v2.3.0...v3.3.1)

---
updated-dependencies:
- dependency-name: jsonc-parser
  dependency-version: 3.3.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 17 ++++++-----------
 build/package.json      |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index fe36e6dedbfb..12f6b35b8753 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -51,7 +51,7 @@
         "extract-zip": "^2.0.1",
         "gulp-merge-json": "^2.1.1",
         "gulp-sort": "^2.0.0",
-        "jsonc-parser": "^2.3.0",
+        "jsonc-parser": "^3.3.1",
         "jws": "^4.0.1",
         "mime": "^4.1.0",
         "source-map": "0.6.1",
@@ -2294,12 +2294,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@vscode/vsce/node_modules/jsonc-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
-      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
-      "dev": true
-    },
     "node_modules/@vscode/vsce/node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -4464,10 +4458,11 @@
       }
     },
     "node_modules/jsonc-parser": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.0.tgz",
-      "integrity": "sha512-b0EBt8SWFNnixVdvoR2ZtEGa9ZqLhbJnOjezn+WP+8kspFm+PFYDN8Z4Bc7pRlDjvuVcADSUkroIuTWWn/YiIA==",
-      "dev": true
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/jsonfile": {
       "version": "4.0.0",
diff --git a/build/package.json b/build/package.json
index c0c5e82c7fd2..298c920cb4c5 100644
--- a/build/package.json
+++ b/build/package.json
@@ -45,7 +45,7 @@
     "extract-zip": "^2.0.1",
     "gulp-merge-json": "^2.1.1",
     "gulp-sort": "^2.0.0",
-    "jsonc-parser": "^2.3.0",
+    "jsonc-parser": "^3.3.1",
     "jws": "^4.0.1",
     "mime": "^4.1.0",
     "source-map": "0.6.1",

From 218f6a8f51cff1fc6ae9c910d0b4dc98fdeaea4d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:26:27 +0000
Subject: [PATCH 1394/1815] Bump @types/fs-extra from 9.0.12 to 11.0.4 in
 /build

Bumps [@types/fs-extra](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/fs-extra) from 9.0.12 to 11.0.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/fs-extra)

---
updated-dependencies:
- dependency-name: "@types/fs-extra"
  dependency-version: 11.0.4
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 20 ++++++++++++++++----
 build/package.json      |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index fe36e6dedbfb..1464dc7915ee 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -20,7 +20,7 @@
         "@types/debounce": "^1.2.4",
         "@types/debug": "^4.1.5",
         "@types/fancy-log": "^2.0.2",
-        "@types/fs-extra": "^9.0.12",
+        "@types/fs-extra": "^11.0.4",
         "@types/glob": "^9.0.0",
         "@types/gulp": "^4.0.18",
         "@types/gulp-filter": "^3.0.32",
@@ -1629,11 +1629,13 @@
       "license": "MIT"
     },
     "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": "11.0.4",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.4.tgz",
+      "integrity": "sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
+        "@types/jsonfile": "*",
         "@types/node": "*"
       }
     },
@@ -1759,6 +1761,16 @@
       "integrity": "sha512-/siF86XrwDKLuHe8l7h6NhrAWgLdgqbxmjZv9NvGWmgYRZoTipkjKiWb0SQHy/jcR+ee0GvbG6uGd+LEBMGNvA==",
       "dev": true
     },
+    "node_modules/@types/jsonfile": {
+      "version": "6.1.4",
+      "resolved": "https://registry.npmjs.org/@types/jsonfile/-/jsonfile-6.1.4.tgz",
+      "integrity": "sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/jws": {
       "version": "3.2.11",
       "resolved": "https://registry.npmjs.org/@types/jws/-/jws-3.2.11.tgz",
diff --git a/build/package.json b/build/package.json
index c0c5e82c7fd2..c7df19b3a033 100644
--- a/build/package.json
+++ b/build/package.json
@@ -14,7 +14,7 @@
     "@types/debounce": "^1.2.4",
     "@types/debug": "^4.1.5",
     "@types/fancy-log": "^2.0.2",
-    "@types/fs-extra": "^9.0.12",
+    "@types/fs-extra": "^11.0.4",
     "@types/glob": "^9.0.0",
     "@types/gulp": "^4.0.18",
     "@types/gulp-filter": "^3.0.32",

From f814cb5716a40ad0432878804307e44a4d6cf209 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:26:36 +0000
Subject: [PATCH 1395/1815] Bump file-type from 21.2.0 to 21.3.0 in
 /extensions/git

Bumps [file-type](https://github.com/sindresorhus/file-type) from 21.2.0 to 21.3.0.
- [Release notes](https://github.com/sindresorhus/file-type/releases)
- [Commits](https://github.com/sindresorhus/file-type/compare/v21.2.0...v21.3.0)

---
updated-dependencies:
- dependency-name: file-type
  dependency-version: 21.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 8 ++++----
 extensions/git/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index 2e64b56d4106..7d677c634432 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -13,7 +13,7 @@
         "@vscode/extension-telemetry": "^1.2.0",
         "@vscode/iconv-lite-umd": "0.7.1",
         "byline": "^5.0.0",
-        "file-type": "21.2.0",
+        "file-type": "21.3.0",
         "jschardet": "3.1.4",
         "picomatch": "4.0.3",
         "vscode-uri": "^3.1.0",
@@ -283,9 +283,9 @@
       }
     },
     "node_modules/file-type": {
-      "version": "21.2.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-21.2.0.tgz",
-      "integrity": "sha512-vCYBgFOrJQLoTzDyAXAL/RFfKnXXpUYt4+tipVy26nJJhT7ftgGETf2tAQF59EEL61i3MrorV/PG6tf7LJK7eg==",
+      "version": "21.3.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-21.3.0.tgz",
+      "integrity": "sha512-8kPJMIGz1Yt/aPEwOsrR97ZyZaD1Iqm8PClb1nYFclUCkBi0Ma5IsYNQzvSFS9ib51lWyIw5mIT9rWzI/xjpzA==",
       "license": "MIT",
       "dependencies": {
         "@tokenizer/inflate": "^0.4.1",
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 803af8ef1947..39966138be49 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3564,7 +3564,7 @@
     "@vscode/extension-telemetry": "^1.2.0",
     "@vscode/iconv-lite-umd": "0.7.1",
     "byline": "^5.0.0",
-    "file-type": "21.2.0",
+    "file-type": "21.3.0",
     "jschardet": "3.1.4",
     "picomatch": "4.0.3",
     "vscode-uri": "^3.1.0",

From 7e76640ae8f96bf0a6aef14edc8f390193842a57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:29:00 +0000
Subject: [PATCH 1396/1815] Bump mocha from 10.8.2 to 11.7.5

Bumps [mocha](https://github.com/mochajs/mocha) from 10.8.2 to 11.7.5.
- [Release notes](https://github.com/mochajs/mocha/releases)
- [Changelog](https://github.com/mochajs/mocha/blob/v11.7.5/CHANGELOG.md)
- [Commits](https://github.com/mochajs/mocha/compare/v10.8.2...v11.7.5)

---
updated-dependencies:
- dependency-name: mocha
  dependency-version: 11.7.5
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 384 +++++++++++++++++++++++++++++++++-------------
 package.json      |   2 +-
 2 files changed, 280 insertions(+), 106 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 56014bcd3b3d..919161ead75c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -133,7 +133,7 @@
         "mime": "^1.4.1",
         "minimatch": "^3.0.4",
         "minimist": "^1.2.6",
-        "mocha": "^10.8.2",
+        "mocha": "^11.7.5",
         "mocha-junit-reporter": "^2.2.1",
         "mocha-multi-reporters": "^1.5.1",
         "npm-run-all": "^4.1.5",
@@ -3393,6 +3393,16 @@
       "integrity": "sha512-NaHL0+0lLNhX6d9rs+NSt97WH/gIlRHmszXbQ/8/MV/eVcFNdeJ/GYhrFuUc8K7WuPhRhTSdMkCp8VMzhUq85w==",
       "dev": true
     },
+    "node_modules/@vscode/test-cli/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_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",
@@ -3403,6 +3413,35 @@
         "balanced-match": "^1.0.0"
       }
     },
+    "node_modules/@vscode/test-cli/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,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/@vscode/test-cli/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/@vscode/test-cli/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@vscode/test-cli/node_modules/glob": {
       "version": "10.3.10",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
@@ -3425,6 +3464,16 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/@vscode/test-cli/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/@vscode/test-cli/node_modules/minimatch": {
       "version": "9.0.3",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
@@ -3440,6 +3489,143 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/@vscode/test-cli/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": {
+        "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": ">= 14.0.0"
+      }
+    },
+    "node_modules/@vscode/test-cli/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": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@vscode/test-cli/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": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@vscode/test-cli/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,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/@vscode/test-cli/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,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@vscode/test-cli/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@vscode/test-cli/node_modules/workerpool": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz",
+      "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/@vscode/test-cli/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": ">=10"
+      }
+    },
     "node_modules/@vscode/test-electron": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.4.0.tgz",
@@ -6007,9 +6193,9 @@
       "optional": true
     },
     "node_modules/diff": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
-      "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz",
+      "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
@@ -11471,31 +11657,32 @@
       "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==",
+      "version": "11.7.5",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.5.tgz",
+      "integrity": "sha512-mTT6RgopEYABzXWFx+GcJ+ZQ32kp4fMf0xvpZIIfSq9Z8lC/++MtcCnQ9t5FP2veYEP95FIYSvW+U9fV4xrlig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-colors": "^4.1.3",
         "browser-stdout": "^1.3.1",
-        "chokidar": "^3.5.3",
+        "chokidar": "^4.0.1",
         "debug": "^4.3.5",
-        "diff": "^5.2.0",
+        "diff": "^7.0.0",
         "escape-string-regexp": "^4.0.0",
         "find-up": "^5.0.0",
-        "glob": "^8.1.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": "^5.1.6",
+        "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": "^6.5.1",
-        "yargs": "^16.2.0",
-        "yargs-parser": "^20.2.9",
+        "workerpool": "^9.2.0",
+        "yargs": "^17.7.2",
+        "yargs-parser": "^21.1.1",
         "yargs-unparser": "^2.0.0"
       },
       "bin": {
@@ -11503,7 +11690,7 @@
         "mocha": "bin/mocha.js"
       },
       "engines": {
-        "node": ">= 14.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/mocha-junit-reporter": {
@@ -11553,16 +11740,6 @@
         "mocha": ">=3.1.2"
       }
     },
-    "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_modules/mocha/node_modules/brace-expansion": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
@@ -11573,39 +11750,38 @@
         "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==",
+    "node_modules/mocha/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": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
+        "readdirp": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
       }
     },
-    "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",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^5.0.1",
-        "once": "^1.3.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"
       },
-      "engines": {
-        "node": ">=12"
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -11620,31 +11796,60 @@
         "node": ">=8"
       }
     },
+    "node_modules/mocha/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/mocha/node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "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": ">=10"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "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/mocha/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": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
+      "license": "ISC",
       "engines": {
-        "node": ">=8"
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/mocha/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==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.18.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/mocha/node_modules/supports-color": {
@@ -11662,34 +11867,6 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/mocha/node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/mocha/node_modules/yargs-parser": {
-      "version": "20.2.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": ">=10"
-      }
-    },
     "node_modules/morgan": {
       "version": "1.10.1",
       "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz",
@@ -12558,6 +12735,13 @@
         "node": ">=6"
       }
     },
+    "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": "BlueOak-1.0.0"
+    },
     "node_modules/pako": {
       "version": "0.2.9",
       "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
@@ -14726,16 +14910,6 @@
         "sinon": "2.x - 13.x"
       }
     },
-    "node_modules/sinon/node_modules/diff": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz",
-      "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==",
-      "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",
@@ -17138,9 +17312,9 @@
       }
     },
     "node_modules/workerpool": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz",
-      "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==",
+      "version": "9.3.4",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.4.tgz",
+      "integrity": "sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==",
       "dev": true,
       "license": "Apache-2.0"
     },
diff --git a/package.json b/package.json
index c9f875d1ebf7..d71276694e05 100644
--- a/package.json
+++ b/package.json
@@ -192,7 +192,7 @@
     "mime": "^1.4.1",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.6",
-    "mocha": "^10.8.2",
+    "mocha": "^11.7.5",
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
     "npm-run-all": "^4.1.5",

From c2fe8591fd422613c940173f5148abef463925f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:29:09 +0000
Subject: [PATCH 1397/1815] Bump @xterm/addon-ligatures from 0.10.0-beta.98 to
 0.11.0-beta.89

Bumps [@xterm/addon-ligatures](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.98 to 0.11.0-beta.89.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-ligatures"
  dependency-version: 0.11.0-beta.89
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 95 +++++++++++++----------------------------------
 package.json      |  2 +-
 2 files changed, 26 insertions(+), 71 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 56014bcd3b3d..f234fe0be7bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,7 +29,7 @@
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.2.0-beta.81",
         "@xterm/addon-image": "^0.9.0-beta.98",
-        "@xterm/addon-ligatures": "^0.10.0-beta.98",
+        "@xterm/addon-ligatures": "^0.11.0-beta.89",
         "@xterm/addon-progress": "^0.2.0-beta.4",
         "@xterm/addon-search": "^0.16.0-beta.98",
         "@xterm/addon-serialize": "^0.14.0-beta.98",
@@ -3815,21 +3815,39 @@
       }
     },
     "node_modules/@xterm/addon-ligatures": {
-      "version": "0.10.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.98.tgz",
-      "integrity": "sha512-1zYeS9OUBR2ThG7dsxsGKOqeSlUo+DNTd5aaV5ZFbKQsQ1w+sQCaL73ZrXp1kuVK7pBiP5NCo4ffcXfzcztztA==",
+      "version": "0.11.0-beta.89",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.89.tgz",
+      "integrity": "sha512-UbADhN/PBC0GpjXm8rKH3ZQhm4PVGwOO2DBi8ZemIK+3BfD9QEF+S1ukoKROmAODhQ5xnjus6DkUVJD92ELhbA==",
       "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.98"
+        "@xterm/xterm": "^6.1.0-beta.89"
       }
     },
+    "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": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "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/@xterm/addon-progress": {
       "version": "0.2.0-beta.4",
       "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.4.tgz",
@@ -7235,51 +7253,6 @@
         "util-deprecate": "~1.0.1"
       }
     },
-    "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/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",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/font-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/for-each": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
@@ -7602,15 +7575,6 @@
         "once": "^1.3.1"
       }
     },
-    "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",
@@ -13771,15 +13735,6 @@
         "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/proto-list": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
diff --git a/package.json b/package.json
index c9f875d1ebf7..5d91c5b53e27 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.2.0-beta.81",
     "@xterm/addon-image": "^0.9.0-beta.98",
-    "@xterm/addon-ligatures": "^0.10.0-beta.98",
+    "@xterm/addon-ligatures": "^0.11.0-beta.89",
     "@xterm/addon-progress": "^0.2.0-beta.4",
     "@xterm/addon-search": "^0.16.0-beta.98",
     "@xterm/addon-serialize": "^0.14.0-beta.98",

From b4ba1527da137923e5eff4dff54cb57f44ca6405 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:29:27 +0000
Subject: [PATCH 1398/1815] Bump vscode-oniguruma from 1.7.0 to 2.0.1 in
 /remote

Bumps [vscode-oniguruma](https://github.com/microsoft/vscode-oniguruma) from 1.7.0 to 2.0.1.
- [Commits](https://github.com/microsoft/vscode-oniguruma/compare/v1.7.0...v2.0.1)

---
updated-dependencies:
- dependency-name: vscode-oniguruma
  dependency-version: 2.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 9 +++++----
 remote/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 59d9db1ca169..aa6dd00aeb7b 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -39,7 +39,7 @@
         "native-watchdog": "^1.4.1",
         "node-pty": "1.1.0-beta39",
         "tas-client-umd": "0.2.0",
-        "vscode-oniguruma": "1.7.0",
+        "vscode-oniguruma": "2.0.1",
         "vscode-regexpp": "^3.1.0",
         "vscode-textmate": "9.2.0",
         "yauzl": "^3.0.0",
@@ -1539,9 +1539,10 @@
       }
     },
     "node_modules/vscode-oniguruma": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
-      "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-2.0.1.tgz",
+      "integrity": "sha512-poJU8iHIWnC3vgphJnrLZyI3YdqRlR27xzqDmpPXYzA93R4Gk8z7T6oqDzDoHjoikA2aS82crdXFkjELCdJsjQ==",
+      "license": "MIT"
     },
     "node_modules/vscode-regexpp": {
       "version": "3.1.0",
diff --git a/remote/package.json b/remote/package.json
index 5bc87eed87da..54dffb16af89 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -34,7 +34,7 @@
     "native-watchdog": "^1.4.1",
     "node-pty": "1.1.0-beta39",
     "tas-client-umd": "0.2.0",
-    "vscode-oniguruma": "1.7.0",
+    "vscode-oniguruma": "2.0.1",
     "vscode-regexpp": "^3.1.0",
     "vscode-textmate": "9.2.0",
     "yauzl": "^3.0.0",

From 3ea7a8d9631a9b055e09e77388b64f6f8cac60e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:29:32 +0000
Subject: [PATCH 1399/1815] Bump vscode-textmate from 9.2.0 to 9.3.0 in /remote

Bumps [vscode-textmate](https://github.com/microsoft/vscode-textmate) from 9.2.0 to 9.3.0.
- [Release notes](https://github.com/microsoft/vscode-textmate/releases)
- [Commits](https://github.com/microsoft/vscode-textmate/compare/v9.2.0...v9.3.0)

---
updated-dependencies:
- dependency-name: vscode-textmate
  dependency-version: 9.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 59d9db1ca169..b38f6e1393e3 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -41,7 +41,7 @@
         "tas-client-umd": "0.2.0",
         "vscode-oniguruma": "1.7.0",
         "vscode-regexpp": "^3.1.0",
-        "vscode-textmate": "9.2.0",
+        "vscode-textmate": "9.3.0",
         "yauzl": "^3.0.0",
         "yazl": "^2.4.3"
       }
@@ -1555,9 +1555,9 @@
       }
     },
     "node_modules/vscode-textmate": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.2.0.tgz",
-      "integrity": "sha512-rkvG4SraZQaPSN/5XjwKswdU0OP9MF28QjrYzUBbhb8QyG3ljB1Ky996m++jiI7KdiAP2CkBiQZd9pqEDTClqA==",
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.3.0.tgz",
+      "integrity": "sha512-zHiZZOdb9xqj5/X1C4a29sbgT2HngdWxPLSl3PyHRQF+5visI4uNM020OHiLJjsMxUssyk/pGVAg/9LCIobrVg==",
       "license": "MIT"
     },
     "node_modules/wrappy": {
diff --git a/remote/package.json b/remote/package.json
index 5bc87eed87da..3a32936be8bc 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -36,7 +36,7 @@
     "tas-client-umd": "0.2.0",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",
-    "vscode-textmate": "9.2.0",
+    "vscode-textmate": "9.3.0",
     "yauzl": "^3.0.0",
     "yazl": "^2.4.3"
   },

From 624c2e45cb6ba559d4709affbeff330177807377 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:29:36 +0000
Subject: [PATCH 1400/1815] Bump @xterm/addon-search in /remote

Bumps [@xterm/addon-search](https://github.com/xtermjs/xterm.js) from 0.17.0-beta.77 to 0.17.0-beta.89.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-search"
  dependency-version: 0.17.0-beta.89
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 59d9db1ca169..42511a15f2b7 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -24,7 +24,7 @@
         "@xterm/addon-image": "^0.10.0-beta.76",
         "@xterm/addon-ligatures": "^0.10.0-beta.140",
         "@xterm/addon-progress": "^0.2.0-beta.4",
-        "@xterm/addon-search": "^0.17.0-beta.77",
+        "@xterm/addon-search": "^0.17.0-beta.89",
         "@xterm/addon-serialize": "^0.14.0-beta.140",
         "@xterm/addon-unicode11": "^0.10.0-beta.76",
         "@xterm/addon-webgl": "^0.19.0-beta.98",
@@ -656,12 +656,12 @@
       }
     },
     "node_modules/@xterm/addon-search": {
-      "version": "0.17.0-beta.77",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.77.tgz",
-      "integrity": "sha512-GZ/B/ox/JwQTkuak6lba3JvqvEW1GaJ1p/e+WdYlyC343H7rxkls1VvA+y4KajFw+8WWYSIJn6KtvfNH+IKLww==",
+      "version": "0.17.0-beta.89",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.89.tgz",
+      "integrity": "sha512-LvGWGNeHetQ7Gqr2uNANJ4sflWLiUxAIqEMdLTFr/zNBOT2SdJveK3hdhhOvMeYW6I0GHcFEeqEh5yBVgBchOA==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.77"
+        "@xterm/xterm": "^6.1.0-beta.89"
       }
     },
     "node_modules/@xterm/addon-serialize": {
diff --git a/remote/package.json b/remote/package.json
index 5bc87eed87da..02ce432f8880 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -19,7 +19,7 @@
     "@xterm/addon-image": "^0.10.0-beta.76",
     "@xterm/addon-ligatures": "^0.10.0-beta.140",
     "@xterm/addon-progress": "^0.2.0-beta.4",
-    "@xterm/addon-search": "^0.17.0-beta.77",
+    "@xterm/addon-search": "^0.17.0-beta.89",
     "@xterm/addon-serialize": "^0.14.0-beta.140",
     "@xterm/addon-unicode11": "^0.10.0-beta.76",
     "@xterm/addon-webgl": "^0.19.0-beta.98",

From 389a1cfbbf54f87cc7f3b7a04f7d7ce39ff30b09 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:29:43 +0000
Subject: [PATCH 1401/1815] Bump kerberos from 2.1.1 to 7.0.0 in /remote

Bumps [kerberos](https://github.com/mongodb-js/kerberos) from 2.1.1 to 7.0.0.
- [Release notes](https://github.com/mongodb-js/kerberos/releases)
- [Changelog](https://github.com/mongodb-js/kerberos/blob/main/HISTORY.md)
- [Commits](https://github.com/mongodb-js/kerberos/compare/v2.1.1...v7.0.0)

---
updated-dependencies:
- dependency-name: kerberos
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 141 +++++++++++++++++++++++++--------------
 remote/package.json      |   2 +-
 2 files changed, 91 insertions(+), 52 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 59d9db1ca169..92422db5fa13 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -34,7 +34,7 @@
         "http-proxy-agent": "^7.0.2",
         "https-proxy-agent": "^7.0.6",
         "jschardet": "3.1.4",
-        "kerberos": "2.1.1",
+        "kerberos": "7.0.0",
         "minimist": "^1.2.8",
         "native-watchdog": "^1.4.1",
         "node-pty": "1.1.0-beta39",
@@ -732,7 +732,8 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/bindings": {
       "version": "1.5.0",
@@ -746,6 +747,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
       "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "license": "MIT",
       "dependencies": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
@@ -781,6 +783,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
@@ -797,7 +800,8 @@
     "node_modules/chownr": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "license": "ISC"
     },
     "node_modules/cookie": {
       "version": "0.7.2",
@@ -828,6 +832,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
       "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+      "license": "MIT",
       "dependencies": {
         "mimic-response": "^3.1.0"
       },
@@ -842,22 +847,25 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "license": "MIT",
       "engines": {
         "node": ">=4.0.0"
       }
     },
     "node_modules/detect-libc": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
-      "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+      "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",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+      "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
+      "license": "MIT",
       "dependencies": {
         "once": "^1.4.0"
       }
@@ -866,6 +874,7 @@
       "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==",
+      "license": "(MIT OR WTFPL)",
       "engines": {
         "node": ">=6"
       }
@@ -924,7 +933,8 @@
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "license": "MIT"
     },
     "node_modules/fs-extra": {
       "version": "11.2.0",
@@ -951,7 +961,8 @@
     "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=="
+      "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
+      "license": "MIT"
     },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
@@ -1001,17 +1012,20 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "BSD-3-Clause"
     },
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "license": "ISC"
     },
     "node_modules/ini": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "license": "ISC"
     },
     "node_modules/ip-address": {
       "version": "9.0.5",
@@ -1083,17 +1097,26 @@
       }
     },
     "node_modules/kerberos": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-2.1.1.tgz",
-      "integrity": "sha512-414s1G/qgK2T60cXnZsHbtRj8Ynjg0DBlQWeY99tkyqQ2e8vGgFHvxRdvjTlLHg/SxBA0zLQcGE6Pk6Dfq/BCA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/kerberos/-/kerberos-7.0.0.tgz",
+      "integrity": "sha512-Q8yUNeCM5fSXkURaa05WugXFsH6c57hDHDmsupMFCPaQEPym9FGwFp/2XSTcMuLldtEeBOsQ/9VGQ55lfHTT3Q==",
       "hasInstallScript": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "bindings": "^1.5.0",
-        "node-addon-api": "^6.1.0",
-        "prebuild-install": "^7.1.2"
+        "node-addon-api": "^8.5.0",
+        "prebuild-install": "^7.1.3"
       },
       "engines": {
-        "node": ">=12.9.0"
+        "node": ">=20.19.0"
+      }
+    },
+    "node_modules/kerberos/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/lru-cache": {
@@ -1123,6 +1146,7 @@
       "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==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -1153,7 +1177,8 @@
     "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=="
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "license": "MIT"
     },
     "node_modules/ms": {
       "version": "2.1.2",
@@ -1161,9 +1186,10 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/napi-build-utils": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
-      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz",
+      "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==",
+      "license": "MIT"
     },
     "node_modules/native-watchdog": {
       "version": "1.4.2",
@@ -1172,9 +1198,10 @@
       "hasInstallScript": true
     },
     "node_modules/node-abi": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.8.0.tgz",
-      "integrity": "sha512-tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw==",
+      "version": "3.85.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.85.0.tgz",
+      "integrity": "sha512-zsFhmbkAzwhTft6nd3VxcG0cvJsT70rL+BIGHWVq5fi6MwGrHwzqKaxXE+Hl2GmnGItnDKPPkO5/LQqjVkIdFg==",
+      "license": "MIT",
       "dependencies": {
         "semver": "^7.3.5"
       },
@@ -1204,7 +1231,8 @@
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
@@ -1238,16 +1266,17 @@
       }
     },
     "node_modules/prebuild-install": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz",
-      "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
+      "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==",
+      "license": "MIT",
       "dependencies": {
         "detect-libc": "^2.0.0",
         "expand-template": "^2.0.3",
         "github-from-package": "0.0.0",
         "minimist": "^1.2.3",
         "mkdirp-classic": "^0.5.3",
-        "napi-build-utils": "^1.0.1",
+        "napi-build-utils": "^2.0.0",
         "node-abi": "^3.3.0",
         "pump": "^3.0.0",
         "rc": "^1.2.7",
@@ -1277,9 +1306,10 @@
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
     "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
+      "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
+      "license": "MIT",
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -1289,6 +1319,7 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
       "dependencies": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -1300,9 +1331,10 @@
       }
     },
     "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -1329,15 +1361,14 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -1362,7 +1393,8 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/simple-get": {
       "version": "4.0.1",
@@ -1382,6 +1414,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "decompress-response": "^6.0.0",
         "once": "^1.3.1",
@@ -1432,6 +1465,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.2.0"
       }
@@ -1439,7 +1473,8 @@
     "node_modules/strip-json-comments": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo= sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1460,6 +1495,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
       "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "license": "MIT",
       "dependencies": {
         "bl": "^4.0.3",
         "end-of-stream": "^1.4.1",
@@ -1496,7 +1532,8 @@
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "license": "Apache-2.0",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       },
@@ -1524,7 +1561,8 @@
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "license": "MIT"
     },
     "node_modules/uuid": {
       "version": "9.0.1",
@@ -1563,7 +1601,8 @@
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "license": "ISC"
     },
     "node_modules/yallist": {
       "version": "4.0.0",
diff --git a/remote/package.json b/remote/package.json
index 5bc87eed87da..251ed2fbb928 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -29,7 +29,7 @@
     "http-proxy-agent": "^7.0.2",
     "https-proxy-agent": "^7.0.6",
     "jschardet": "3.1.4",
-    "kerberos": "2.1.1",
+    "kerberos": "7.0.0",
     "minimist": "^1.2.8",
     "native-watchdog": "^1.4.1",
     "node-pty": "1.1.0-beta39",

From 70c24560bfe29103b0c4353e436ea3b9ccdbc564 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:29:52 +0000
Subject: [PATCH 1402/1815] Bump @xterm/addon-clipboard in /remote/web

Bumps [@xterm/addon-clipboard](https://github.com/xtermjs/xterm.js) from 0.3.0-beta.56 to 0.3.0-beta.89.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-clipboard"
  dependency-version: 0.3.0-beta.89
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 6635e6811949..7b4fe3a91900 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -13,7 +13,7 @@
 				"@vscode/iconv-lite-umd": "0.7.1",
 				"@vscode/tree-sitter-wasm": "^0.3.0",
 				"@vscode/vscode-languagedetection": "1.0.22",
-				"@xterm/addon-clipboard": "^0.3.0-beta.56",
+				"@xterm/addon-clipboard": "^0.3.0-beta.89",
 				"@xterm/addon-image": "^0.10.0-beta.77",
 				"@xterm/addon-ligatures": "^0.11.0-beta.76",
 				"@xterm/addon-progress": "^0.3.0-beta.57",
@@ -124,15 +124,15 @@
 			}
 		},
 		"node_modules/@xterm/addon-clipboard": {
-			"version": "0.3.0-beta.56",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.56.tgz",
-			"integrity": "sha512-NHwA74cC+WAXJkcF/pQXHZFalGdhcUXefmatRJkRjiRGAwjn+JZYDATEnkkdgiGEWagjegalyRSBh+++hogvtQ==",
+			"version": "0.3.0-beta.89",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.89.tgz",
+			"integrity": "sha512-1weXTZ0dSvO94gsP++7XwaIVA2+6EC92EEiWI+FpBiGQCz261DjMdo4+8dBwmkovuxBvSdy0L6bTB9EJv94haw==",
 			"license": "MIT",
 			"dependencies": {
 				"js-base64": "^3.7.5"
 			},
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.56"
+				"@xterm/xterm": "^6.1.0-beta.89"
 			}
 		},
 		"node_modules/@xterm/addon-image": {
diff --git a/remote/web/package.json b/remote/web/package.json
index b582219b290f..89359d5ab6a4 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -8,7 +8,7 @@
 		"@vscode/iconv-lite-umd": "0.7.1",
 		"@vscode/tree-sitter-wasm": "^0.3.0",
 		"@vscode/vscode-languagedetection": "1.0.22",
-		"@xterm/addon-clipboard": "^0.3.0-beta.56",
+		"@xterm/addon-clipboard": "^0.3.0-beta.89",
 		"@xterm/addon-image": "^0.10.0-beta.77",
 		"@xterm/addon-ligatures": "^0.11.0-beta.76",
 		"@xterm/addon-progress": "^0.3.0-beta.57",

From 7dc10378778a39089832e66be9bd62ae6150540d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:30:07 +0000
Subject: [PATCH 1403/1815] Bump @xterm/addon-unicode11 in /remote/web

Bumps [@xterm/addon-unicode11](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.76 to 0.10.0-beta.89.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-unicode11"
  dependency-version: 0.10.0-beta.89
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 6635e6811949..8d51c88fc4bb 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -19,7 +19,7 @@
 				"@xterm/addon-progress": "^0.3.0-beta.57",
 				"@xterm/addon-search": "^0.17.0-beta.77",
 				"@xterm/addon-serialize": "^0.15.0-beta.56",
-				"@xterm/addon-unicode11": "^0.10.0-beta.76",
+				"@xterm/addon-unicode11": "^0.10.0-beta.89",
 				"@xterm/addon-webgl": "^0.20.0-beta.75",
 				"@xterm/xterm": "^6.0.0",
 				"jschardet": "3.1.4",
@@ -188,12 +188,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-unicode11": {
-			"version": "0.10.0-beta.76",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.76.tgz",
-			"integrity": "sha512-zn7J+1y27d9evbFNrVBQGpf9eEUeknJ9mlf1cRPXKdueRd+SatQa1SK+/3L7yDAhBk1PUuWXiLI5IAEWa8p2tA==",
+			"version": "0.10.0-beta.89",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.89.tgz",
+			"integrity": "sha512-P/XnHwrQ0faKGNpiLxfWPqAB03SfZ3R+HfzGjMBeQu+O27kwBUrRXRE1DasQsfUL/BU0O/nEJTLF7HoKYd0KZg==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.76"
+				"@xterm/xterm": "^6.1.0-beta.89"
 			}
 		},
 		"node_modules/@xterm/addon-webgl": {
diff --git a/remote/web/package.json b/remote/web/package.json
index b582219b290f..cc6c87c1bd0f 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -14,7 +14,7 @@
 		"@xterm/addon-progress": "^0.3.0-beta.57",
 		"@xterm/addon-search": "^0.17.0-beta.77",
 		"@xterm/addon-serialize": "^0.15.0-beta.56",
-		"@xterm/addon-unicode11": "^0.10.0-beta.76",
+		"@xterm/addon-unicode11": "^0.10.0-beta.89",
 		"@xterm/addon-webgl": "^0.20.0-beta.75",
 		"@xterm/xterm": "^6.0.0",
 		"jschardet": "3.1.4",

From a12b6b0ba5a96b06093b44608ef728ebba8b9c33 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 11 Jan 2026 04:04:13 +0000
Subject: [PATCH 1404/1815] Bump chrono from 0.4.38 to 0.4.42 in /cli

Bumps [chrono](https://github.com/chronotope/chrono) from 0.4.38 to 0.4.42.
- [Release notes](https://github.com/chronotope/chrono/releases)
- [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md)
- [Commits](https://github.com/chronotope/chrono/compare/v0.4.38...v0.4.42)

---
updated-dependencies:
- dependency-name: chrono
  dependency-version: 0.4.42
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 13 +++----------
 cli/Cargo.toml |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index c4d1ee1930ea..2290c9f8367e 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -32,12 +32,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -361,15 +355,14 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
 dependencies = [
- "android-tzdata",
  "iana-time-zone",
  "num-traits",
  "serde",
- "windows-targets 0.52.5",
+ "windows-link",
 ]
 
 [[package]]
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 61ec3c442f07..77fd01c1dda2 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -31,7 +31,7 @@ dirs = "5.0.1"
 rand = "0.8.5"
 opentelemetry = { version = "0.19.0", features = ["rt-tokio"] }
 serde_bytes = "0.11.9"
-chrono = { version = "0.4.26", features = ["serde", "std", "clock"], default-features = false }
+chrono = { version = "0.4.42", features = ["serde", "std", "clock"], default-features = false }
 gethostname = "1.1.0"
 libc = "0.2.144"
 tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "8cae9b2a24c65c6c1958f5a0e77d72b23b5c6c30", default-features = false, features = ["connections"] }

From e97b4b7b115a1236f037ad643d99ebf6a6c77961 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 11 Jan 2026 04:17:08 +0000
Subject: [PATCH 1405/1815] Bump @types/node from 20.14.13 to 25.0.3

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.14.13 to 25.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 20 +++++++++++---------
 package.json      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 919161ead75c..ad8973cc22e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -66,7 +66,7 @@
         "@types/kerberos": "^1.1.2",
         "@types/minimist": "^1.2.1",
         "@types/mocha": "^9.1.1",
-        "@types/node": "20.x",
+        "@types/node": "25.x",
         "@types/sinon": "^21.0.0",
         "@types/sinon-test": "^2.4.2",
         "@types/trusted-types": "^2.0.7",
@@ -2564,12 +2564,13 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.14.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.13.tgz",
-      "integrity": "sha512-+bHoGiZb8UiQ0+WEtmph2IWQCjIqg8MDZMAV+ppRRhUZnquF5mQkP/9vpSwJClEiSM/C7fZZExPzfU0vJTyp8w==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~7.16.0"
       }
     },
     "node_modules/@types/node-fetch": {
@@ -16542,10 +16543,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+      "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/unique-stream": {
       "version": "2.3.1",
diff --git a/package.json b/package.json
index d71276694e05..baeb601b9a31 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
     "@types/kerberos": "^1.1.2",
     "@types/minimist": "^1.2.1",
     "@types/mocha": "^9.1.1",
-    "@types/node": "20.x",
+    "@types/node": "25.x",
     "@types/sinon": "^21.0.0",
     "@types/sinon-test": "^2.4.2",
     "@types/trusted-types": "^2.0.7",

From 14dd313af334ba1dfd94d121209573ab16a9b598 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 11 Jan 2026 04:32:11 +0000
Subject: [PATCH 1406/1815] Bump @xterm/addon-progress from 0.2.0-beta.4 to
 0.3.0-beta.89 in /remote

Bumps [@xterm/addon-progress](https://github.com/xtermjs/xterm.js) from 0.2.0-beta.4 to 0.3.0-beta.89.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-progress"
  dependency-version: 0.3.0-beta.89
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index cc9aefae191d..0ba1a5360591 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -23,7 +23,7 @@
         "@xterm/addon-clipboard": "^0.2.0-beta.123",
         "@xterm/addon-image": "^0.10.0-beta.76",
         "@xterm/addon-ligatures": "^0.10.0-beta.140",
-        "@xterm/addon-progress": "^0.2.0-beta.4",
+        "@xterm/addon-progress": "^0.3.0-beta.100",
         "@xterm/addon-search": "^0.17.0-beta.89",
         "@xterm/addon-serialize": "^0.14.0-beta.140",
         "@xterm/addon-unicode11": "^0.10.0-beta.76",
@@ -647,12 +647,12 @@
       }
     },
     "node_modules/@xterm/addon-progress": {
-      "version": "0.2.0-beta.4",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.4.tgz",
-      "integrity": "sha512-7t1nlaANdEjUBVvuTTs5gw6UQgB+unFLwSGGnYXIvdQroYdkXQXSSATSqpYKVCd/6QFhBerzdB2VwPM5L5lxIw==",
+      "version": "0.3.0-beta.100",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.100.tgz",
+      "integrity": "sha512-mbZCJfkaRIOnBUwdOB7YLBHBSx8w8//7lLVT1T+9kJy+B4SazqMCXdfNKTI77S36C0L72tH303u9Umqigkex0g==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^6.1.0-beta.100"
       }
     },
     "node_modules/@xterm/addon-search": {
diff --git a/remote/package.json b/remote/package.json
index 1b546ba9188a..5b75c4ca8788 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -18,7 +18,7 @@
     "@xterm/addon-clipboard": "^0.2.0-beta.123",
     "@xterm/addon-image": "^0.10.0-beta.76",
     "@xterm/addon-ligatures": "^0.10.0-beta.140",
-    "@xterm/addon-progress": "^0.2.0-beta.4",
+    "@xterm/addon-progress": "^0.3.0-beta.100",
     "@xterm/addon-search": "^0.17.0-beta.89",
     "@xterm/addon-serialize": "^0.14.0-beta.140",
     "@xterm/addon-unicode11": "^0.10.0-beta.76",

From d4e42dae4f60860f3ee31b7d47bf1a02510e76a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 11 Jan 2026 04:33:26 +0000
Subject: [PATCH 1407/1815] Bump @xterm/addon-progress in /remote/web

Bumps [@xterm/addon-progress](https://github.com/xtermjs/xterm.js) from 0.3.0-beta.57 to 0.3.0-beta.89.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-progress"
  dependency-version: 0.3.0-beta.89
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 8921fe10d463..cfa98f809a6e 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -16,7 +16,7 @@
 				"@xterm/addon-clipboard": "^0.3.0-beta.89",
 				"@xterm/addon-image": "^0.10.0-beta.77",
 				"@xterm/addon-ligatures": "^0.11.0-beta.76",
-				"@xterm/addon-progress": "^0.3.0-beta.57",
+				"@xterm/addon-progress": "^0.3.0-beta.100",
 				"@xterm/addon-search": "^0.17.0-beta.77",
 				"@xterm/addon-serialize": "^0.15.0-beta.56",
 				"@xterm/addon-unicode11": "^0.10.0-beta.89",
@@ -161,12 +161,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-progress": {
-			"version": "0.3.0-beta.57",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.57.tgz",
-			"integrity": "sha512-F8EY51I/Xl/dYpiMA6+lTRWUr5vk631z6vMyRrW3KlKA92FHlID9qR8tmRNgpYQnhrHenw00I1whL2G8DeO4Mg==",
+			"version": "0.3.0-beta.100",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.100.tgz",
+			"integrity": "sha512-mbZCJfkaRIOnBUwdOB7YLBHBSx8w8//7lLVT1T+9kJy+B4SazqMCXdfNKTI77S36C0L72tH303u9Umqigkex0g==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.57"
+				"@xterm/xterm": "^6.1.0-beta.100"
 			}
 		},
 		"node_modules/@xterm/addon-search": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 72d9f1b751b7..d048bca55735 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -11,7 +11,7 @@
 		"@xterm/addon-clipboard": "^0.3.0-beta.89",
 		"@xterm/addon-image": "^0.10.0-beta.77",
 		"@xterm/addon-ligatures": "^0.11.0-beta.76",
-		"@xterm/addon-progress": "^0.3.0-beta.57",
+		"@xterm/addon-progress": "^0.3.0-beta.100",
 		"@xterm/addon-search": "^0.17.0-beta.77",
 		"@xterm/addon-serialize": "^0.15.0-beta.56",
 		"@xterm/addon-unicode11": "^0.10.0-beta.89",

From b47b32960f5550fe04da55fdf15339a17404da0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 11 Jan 2026 04:33:26 +0000
Subject: [PATCH 1408/1815] Bump @xterm/addon-serialize in /remote/web

Bumps [@xterm/addon-serialize](https://github.com/xtermjs/xterm.js) from 0.15.0-beta.77 to 0.15.0-beta.89.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-serialize"
  dependency-version: 0.15.0-beta.89
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 8921fe10d463..53d9821c7842 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -18,7 +18,7 @@
 				"@xterm/addon-ligatures": "^0.11.0-beta.76",
 				"@xterm/addon-progress": "^0.3.0-beta.57",
 				"@xterm/addon-search": "^0.17.0-beta.77",
-				"@xterm/addon-serialize": "^0.15.0-beta.56",
+				"@xterm/addon-serialize": "^0.15.0-beta.100",
 				"@xterm/addon-unicode11": "^0.10.0-beta.89",
 				"@xterm/addon-webgl": "^0.20.0-beta.75",
 				"@xterm/xterm": "^6.0.0",
@@ -179,12 +179,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-serialize": {
-			"version": "0.15.0-beta.77",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.77.tgz",
-			"integrity": "sha512-wNzJvUr2j/6p7VqBnhHSHhnimih7TE00RCPQtNo5JnWE1g7dx1ftDvojEW4X7g+Hz/TFCSCJ/JxNaps7W7Ymhw==",
+			"version": "0.15.0-beta.100",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.100.tgz",
+			"integrity": "sha512-FKTTfCdcosQwbfp1xTj2gUhsNsi0gfF2iO0D8oaDgRTooHK4s3Mvg8VzRqbnrBjf8DbHS0Re6IBrx7ZxH/wRMw==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.77"
+				"@xterm/xterm": "^6.1.0-beta.100"
 			}
 		},
 		"node_modules/@xterm/addon-unicode11": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 72d9f1b751b7..7d2b0f43fd20 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -13,7 +13,7 @@
 		"@xterm/addon-ligatures": "^0.11.0-beta.76",
 		"@xterm/addon-progress": "^0.3.0-beta.57",
 		"@xterm/addon-search": "^0.17.0-beta.77",
-		"@xterm/addon-serialize": "^0.15.0-beta.56",
+		"@xterm/addon-serialize": "^0.15.0-beta.100",
 		"@xterm/addon-unicode11": "^0.10.0-beta.89",
 		"@xterm/addon-webgl": "^0.20.0-beta.75",
 		"@xterm/xterm": "^6.0.0",

From f2025a8a0935b2597d0db43b9c606cc5dbc37f62 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 11 Jan 2026 04:38:02 +0000
Subject: [PATCH 1409/1815] Bump rand from 0.8.5 to 0.9.2 in /cli

Bumps [rand](https://github.com/rust-random/rand) from 0.8.5 to 0.9.2.
- [Release notes](https://github.com/rust-random/rand/releases)
- [Changelog](https://github.com/rust-random/rand/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-random/rand/compare/0.8.5...rand_core-0.9.2)

---
updated-dependencies:
- dependency-name: rand
  dependency-version: 0.9.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 31 ++++++++++++++++++++++++++++++-
 cli/Cargo.toml |  2 +-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 2290c9f8367e..1e318f83d292 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -433,7 +433,7 @@ dependencies = [
  "open",
  "opentelemetry",
  "pin-project",
- "rand 0.8.5",
+ "rand 0.9.2",
  "regex",
  "reqwest 0.12.5",
  "rmp-serde",
@@ -2172,6 +2172,16 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "rand"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.3",
+]
+
 [[package]]
 name = "rand_chacha"
 version = "0.2.2"
@@ -2192,6 +2202,16 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.3",
+]
+
 [[package]]
 name = "rand_core"
 version = "0.5.1"
@@ -2210,6 +2230,15 @@ dependencies = [
  "getrandom 0.2.15",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.4",
+]
+
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 77fd01c1dda2..e620264e52df 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -28,7 +28,7 @@ serde_json = "1.0.96"
 rmp-serde = "1.3.1"
 uuid = { version = "1.16", features = ["serde", "v4"] }
 dirs = "5.0.1"
-rand = "0.8.5"
+rand = "0.9.2"
 opentelemetry = { version = "0.19.0", features = ["rt-tokio"] }
 serde_bytes = "0.11.9"
 chrono = { version = "0.4.42", features = ["serde", "std", "clock"], default-features = false }

From 9c6ed5696f0084ebb4203b92be2ceb2e378eadf2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 11 Jan 2026 04:38:18 +0000
Subject: [PATCH 1410/1815] Bump pump from 1.0.2 to 3.0.3

Bumps [pump](https://github.com/mafintosh/pump) from 1.0.2 to 3.0.3.
- [Commits](https://github.com/mafintosh/pump/compare/v1.0.2...v3.0.3)

---
updated-dependencies:
- dependency-name: pump
  dependency-version: 3.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 29 +++++------------------------
 package.json      |  2 +-
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 420e161f061f..39e4ce0136ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -142,7 +142,7 @@
         "path-browserify": "^1.0.1",
         "postcss": "^8.5.3",
         "postcss-nesting": "^12.0.2",
-        "pump": "^1.0.1",
+        "pump": "^3.0.3",
         "rcedit": "^1.1.0",
         "rimraf": "^2.2.8",
         "sinon": "^21.0.0",
@@ -7752,16 +7752,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/get-stream/node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
     "node_modules/github-from-package": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
@@ -13978,10 +13968,11 @@
       "dev": true
     },
     "node_modules/pump": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz",
-      "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE= sha512-0l9Rf87wCGXiNCxHxjixpBTPa0iLYFp6an+fwXp7Yz6Fxyhdo7YiBsV76yqzwajT/2+XjKdiCaCDVIcvyEHqCA==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
+      "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -15599,16 +15590,6 @@
         "bare-path": "^3.0.0"
       }
     },
-    "node_modules/tar-fs/node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
     "node_modules/tar-stream": {
       "version": "3.1.6",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
diff --git a/package.json b/package.json
index f702a124bb9b..313564195edd 100644
--- a/package.json
+++ b/package.json
@@ -201,7 +201,7 @@
     "path-browserify": "^1.0.1",
     "postcss": "^8.5.3",
     "postcss-nesting": "^12.0.2",
-    "pump": "^1.0.1",
+    "pump": "^3.0.3",
     "rcedit": "^1.1.0",
     "rimraf": "^2.2.8",
     "sinon": "^21.0.0",

From adfc79282c78e8b74f90a1b1653716537372fc41 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 11 Jan 2026 04:38:24 +0000
Subject: [PATCH 1411/1815] Bump @vscode/iconv-lite-umd from 0.7.0 to 0.7.1

Bumps [@vscode/iconv-lite-umd](https://github.com/Microsoft/vscode-iconv-lite-umd) from 0.7.0 to 0.7.1.
- [Release notes](https://github.com/Microsoft/vscode-iconv-lite-umd/releases)
- [Commits](https://github.com/Microsoft/vscode-iconv-lite-umd/commits/v0.7.1)

---
updated-dependencies:
- dependency-name: "@vscode/iconv-lite-umd"
  dependency-version: 0.7.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 420e161f061f..016757a413ad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@parcel/watcher": "2.5.1",
         "@types/semver": "^7.7.1",
         "@vscode/deviceid": "^0.1.1",
-        "@vscode/iconv-lite-umd": "0.7.0",
+        "@vscode/iconv-lite-umd": "0.7.1",
         "@vscode/policy-watcher": "^1.3.5",
         "@vscode/proxy-agent": "^0.32.0",
         "@vscode/ripgrep": "^1.17.0",
@@ -3172,9 +3172,10 @@
       }
     },
     "node_modules/@vscode/iconv-lite-umd": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
-      "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg=="
+      "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",
diff --git a/package.json b/package.json
index f702a124bb9b..063fddf2b999 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "@parcel/watcher": "2.5.1",
     "@types/semver": "^7.7.1",
     "@vscode/deviceid": "^0.1.1",
-    "@vscode/iconv-lite-umd": "0.7.0",
+    "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/policy-watcher": "^1.3.5",
     "@vscode/proxy-agent": "^0.32.0",
     "@vscode/ripgrep": "^1.17.0",

From ad232da5defb6d04dcb1a177dbc8648081ea3f32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 11 Jan 2026 04:49:05 +0000
Subject: [PATCH 1412/1815] Bump @xterm/addon-webgl in /remote/web

Bumps [@xterm/addon-webgl](https://github.com/xtermjs/xterm.js) from 0.20.0-beta.75 to 0.20.0-beta.88.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-webgl"
  dependency-version: 0.20.0-beta.88
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 0857630f0278..ad6160a0a58e 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -20,7 +20,7 @@
 				"@xterm/addon-search": "^0.17.0-beta.77",
 				"@xterm/addon-serialize": "^0.15.0-beta.100",
 				"@xterm/addon-unicode11": "^0.10.0-beta.89",
-				"@xterm/addon-webgl": "^0.20.0-beta.75",
+				"@xterm/addon-webgl": "^0.20.0-beta.99",
 				"@xterm/xterm": "^6.0.0",
 				"jschardet": "3.1.4",
 				"tas-client-umd": "0.2.0",
@@ -197,12 +197,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-webgl": {
-			"version": "0.20.0-beta.75",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.75.tgz",
-			"integrity": "sha512-GW1nkyO8xeIotTGbdl6a/ZxV4scFTqz5fJ6dAid85Y3U6iM62htJC/1Gjn0xTnga32Qq86jm2JND8OhYYONqsg==",
+			"version": "0.20.0-beta.99",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.99.tgz",
+			"integrity": "sha512-p4zE4quuFw4sfuFjQQibFQL3wusruksx3ORzSE+qRUdqPlm+ndXoX8fO2T8lEOsq1pr2rhabDMDUo1OQM5aowA==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.76"
+				"@xterm/xterm": "^6.1.0-beta.100"
 			}
 		},
 		"node_modules/@xterm/xterm": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 6e86b524057e..9f96411491b5 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -15,7 +15,7 @@
 		"@xterm/addon-search": "^0.17.0-beta.77",
 		"@xterm/addon-serialize": "^0.15.0-beta.100",
 		"@xterm/addon-unicode11": "^0.10.0-beta.89",
-		"@xterm/addon-webgl": "^0.20.0-beta.75",
+		"@xterm/addon-webgl": "^0.20.0-beta.99",
 		"@xterm/xterm": "^6.0.0",
 		"jschardet": "3.1.4",
 		"tas-client-umd": "0.2.0",

From c266bc7c91619ff419514c59ee031888505c1658 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:19:14 +0000
Subject: [PATCH 1413/1815] Bump github/codeql-action from 4.31.9 to 4.31.10

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.9 to 4.31.10.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/5d4e8d1aca955e8d8589aabd499c5cae939e33c7...cdefb33c0f6224e58673d9004f47f7cb3e328b89)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/scorecards.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 6182877f91f9..aba535cf52fc 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -76,6 +76,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
+        uses: github/codeql-action/upload-sarif@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
         with:
           sarif_file: results.sarif

From 0664b0e5dd1486c02847c03f215cadf85bab193f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:21:14 +0000
Subject: [PATCH 1414/1815] Bump regex from 1.10.4 to 1.12.2 in /cli

Bumps [regex](https://github.com/rust-lang/regex) from 1.10.4 to 1.12.2.
- [Release notes](https://github.com/rust-lang/regex/releases)
- [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/regex/compare/1.10.4...1.12.2)

---
updated-dependencies:
- dependency-name: regex
  dependency-version: 1.12.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 12 ++++++------
 cli/Cargo.toml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 1e318f83d292..c23c6c1b9051 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -2279,9 +2279,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2291,9 +2291,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2302,9 +2302,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "reqwest"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index e620264e52df..961472a59baf 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -20,7 +20,7 @@ tokio = { version = "1.43.1", features = ["full"] }
 tokio-util = { version = "0.7.8", features = ["compat", "codec"] }
 flate2 = { version = "1.1.5", default-features = false, features = ["zlib"] }
 zip = { version = "0.6.6", default-features = false, features = ["time", "deflate-zlib"] }
-regex = "1.8.3"
+regex = "1.12.2"
 lazy_static = "1.5.0"
 sysinfo = { version = "0.29.0", default-features = false }
 serde = { version = "1.0.163", features = ["derive"] }

From 470454de1443c358837c8ff5ab55334789b981c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:21:15 +0000
Subject: [PATCH 1415/1815] Bump @types/node in
 /.vscode/extensions/vscode-selfhost-test-provider

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../vscode-selfhost-test-provider/package-lock.json         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
index 4df90fe6a802..6066448e23e7 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
@@ -58,9 +58,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From b22f59e8187a51bd2fe858fe775e76cda193a013 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:21:16 +0000
Subject: [PATCH 1416/1815] Bump @types/node in
 /extensions/css-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/css-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/css-language-features/server/package-lock.json b/extensions/css-language-features/server/package-lock.json
index c103a02119cb..984e4d07d8ba 100644
--- a/extensions/css-language-features/server/package-lock.json
+++ b/extensions/css-language-features/server/package-lock.json
@@ -30,9 +30,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From caf97ec64498087a4b72216ce7a7f7de7ee344c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:21:16 +0000
Subject: [PATCH 1417/1815] Bump @types/through2 from 2.0.36 to 2.0.41 in
 /build

Bumps [@types/through2](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/through2) from 2.0.36 to 2.0.41.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/through2)

---
updated-dependencies:
- dependency-name: "@types/through2"
  dependency-version: 2.0.41
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 9 +++++----
 build/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 20122685017f..84607d9fc010 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -38,7 +38,7 @@
         "@types/pump": "^1.0.1",
         "@types/rimraf": "^2.0.4",
         "@types/through": "^0.0.33",
-        "@types/through2": "^2.0.36",
+        "@types/through2": "^2.0.41",
         "@types/workerpool": "^6.4.0",
         "@types/xml2js": "0.4.14",
         "@vscode/iconv-lite-umd": "0.7.0",
@@ -1776,10 +1776,11 @@
       }
     },
     "node_modules/@types/through2": {
-      "version": "2.0.36",
-      "resolved": "https://registry.npmjs.org/@types/through2/-/through2-2.0.36.tgz",
-      "integrity": "sha512-vuifQksQHJXhV9McpVsXKuhnf3lsoX70PnhcqIAbs9dqLH2NgrGz0DzZPDY3+Yh6eaRqcE1gnCQ6QhBn1/PT5A==",
+      "version": "2.0.41",
+      "resolved": "https://registry.npmjs.org/@types/through2/-/through2-2.0.41.tgz",
+      "integrity": "sha512-ryQ0tidWkb1O1JuYvWKyMLYEtOWDqF5mHerJzKz/gQpoAaJq2l/dsMPBF0B5BNVT34rbARYJ5/tsZwLfUi2kwQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
diff --git a/build/package.json b/build/package.json
index 5926b7646a30..8287e85925b0 100644
--- a/build/package.json
+++ b/build/package.json
@@ -32,7 +32,7 @@
     "@types/pump": "^1.0.1",
     "@types/rimraf": "^2.0.4",
     "@types/through": "^0.0.33",
-    "@types/through2": "^2.0.36",
+    "@types/through2": "^2.0.41",
     "@types/workerpool": "^6.4.0",
     "@types/xml2js": "0.4.14",
     "@vscode/iconv-lite-umd": "0.7.0",

From 9fc66dcfa114dc27f9e391a91e95fa79038064aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:21:18 +0000
Subject: [PATCH 1418/1815] Bump @types/node in
 /extensions/css-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/css-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/css-language-features/package-lock.json b/extensions/css-language-features/package-lock.json
index 6e56d0542a7c..857844fe1844 100644
--- a/extensions/css-language-features/package-lock.json
+++ b/extensions/css-language-features/package-lock.json
@@ -41,9 +41,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 6a40155261b0ec415905b8326862cc4ee7236e84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:21:19 +0000
Subject: [PATCH 1419/1815] Bump @types/node in
 /extensions/configuration-editing

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/configuration-editing/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/configuration-editing/package-lock.json b/extensions/configuration-editing/package-lock.json
index bbeff99f881e..52f48084adeb 100644
--- a/extensions/configuration-editing/package-lock.json
+++ b/extensions/configuration-editing/package-lock.json
@@ -175,9 +175,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 6cd3a9f8a8fc215b88d76089aaa12f9c5088ca7e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:21:22 +0000
Subject: [PATCH 1420/1815] Bump @types/debug from 4.1.9 to 4.1.12 in /build

Bumps [@types/debug](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/debug) from 4.1.9 to 4.1.12.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/debug)

---
updated-dependencies:
- dependency-name: "@types/debug"
  dependency-version: 4.1.12
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 9 +++++----
 build/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 20122685017f..efbfaf310916 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -18,7 +18,7 @@
         "@types/ansi-colors": "^3.2.0",
         "@types/byline": "^4.2.32",
         "@types/debounce": "^1.2.4",
-        "@types/debug": "^4.1.5",
+        "@types/debug": "^4.1.12",
         "@types/fancy-log": "^2.0.2",
         "@types/fs-extra": "^11.0.4",
         "@types/glob": "^9.0.0",
@@ -1475,10 +1475,11 @@
       "license": "MIT"
     },
     "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==",
+      "version": "4.1.12",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
+      "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/ms": "*"
       }
diff --git a/build/package.json b/build/package.json
index 5926b7646a30..bf381cafbdb6 100644
--- a/build/package.json
+++ b/build/package.json
@@ -12,7 +12,7 @@
     "@types/ansi-colors": "^3.2.0",
     "@types/byline": "^4.2.32",
     "@types/debounce": "^1.2.4",
-    "@types/debug": "^4.1.5",
+    "@types/debug": "^4.1.12",
     "@types/fancy-log": "^2.0.2",
     "@types/fs-extra": "^11.0.4",
     "@types/glob": "^9.0.0",

From f401ec07ae8bd3917c41e97703c963d066d47926 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:21:27 +0000
Subject: [PATCH 1421/1815] Bump gulp-merge-json from 2.1.1 to 2.2.1 in /build

Bumps [gulp-merge-json](https://github.com/joshswan/gulp-merge-json) from 2.1.1 to 2.2.1.
- [Release notes](https://github.com/joshswan/gulp-merge-json/releases)
- [Commits](https://github.com/joshswan/gulp-merge-json/compare/v2.1.1...v2.2.1)

---
updated-dependencies:
- dependency-name: gulp-merge-json
  dependency-version: 2.2.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 176 ++++++++++++++++++++++++++++++++++------
 build/package.json      |   2 +-
 2 files changed, 153 insertions(+), 25 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 20122685017f..36d8f340b3d4 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -49,7 +49,7 @@
         "electron-osx-sign": "^0.6.0",
         "esbuild": "0.25.0",
         "extract-zip": "^2.0.1",
-        "gulp-merge-json": "^2.1.1",
+        "gulp-merge-json": "^2.2.1",
         "gulp-sort": "^2.0.0",
         "jsonc-parser": "^3.3.1",
         "jws": "^4.0.1",
@@ -2388,7 +2388,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
       "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "devOptional": true,
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2397,7 +2397,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
       "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
-      "devOptional": true,
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2406,7 +2406,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
-      "devOptional": true,
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2454,12 +2454,42 @@
         "typed-rest-client": "^1.8.4"
       }
     },
+    "node_modules/b4a": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.7.3.tgz",
+      "integrity": "sha512-5Q2mfq2WfGuFp3uS//0s6baOJLMoVduPYVeNmDYxu5OUA1/cBfvr2RIS7vi62LdNj/urk1hfmj867I3qt6uZ7Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peerDependencies": {
+        "react-native-b4a": "*"
+      },
+      "peerDependenciesMeta": {
+        "react-native-b4a": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
+    "node_modules/bare-events": {
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz",
+      "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peerDependencies": {
+        "bare-abort-controller": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-abort-controller": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -2801,7 +2831,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
       "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg= sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==",
-      "devOptional": true,
+      "optional": true,
       "engines": {
         "node": ">= 0.10"
       }
@@ -2819,13 +2849,13 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
       "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA= sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==",
-      "devOptional": true
+      "optional": true
     },
     "node_modules/cloneable-readable": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
       "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-      "devOptional": true,
+      "optional": true,
       "dependencies": {
         "inherits": "^2.0.1",
         "process-nextick-args": "^2.0.0",
@@ -2836,7 +2866,7 @@
       "version": "2.3.7",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
       "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "devOptional": true,
+      "optional": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -3441,6 +3471,16 @@
         "node": ">=0.8.x"
       }
     },
+    "node_modules/events-universal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.1.tgz",
+      "integrity": "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-events": "^2.7.0"
+      }
+    },
     "node_modules/expand-template": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
@@ -3454,7 +3494,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
-      "devOptional": true,
+      "optional": true,
       "dependencies": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
@@ -3516,6 +3556,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "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,
+      "license": "MIT"
+    },
     "node_modules/fast-glob": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
@@ -3936,16 +3983,57 @@
       "devOptional": true
     },
     "node_modules/gulp-merge-json": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/gulp-merge-json/-/gulp-merge-json-2.1.1.tgz",
-      "integrity": "sha512-VhvAlcf+dcCb94j/2yDPWxJ3X7x4P/Xwcrv1dhjYuRgvADwFJmaQwl4zbuq+GDZvzMacbVncWtEdsETpUSkhYw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/gulp-merge-json/-/gulp-merge-json-2.2.1.tgz",
+      "integrity": "sha512-w1+ka0xPu/VSEAVxvYlwEASpyZuHGVpBBtYakd4xpw+dF5QiwNh81qkNGnhGvtUINh94IInleQNs0rzy8KdyRg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "json5": "^2.1.3",
+        "json5": "^2.2.3",
+        "lodash.clonedeep": "^4.5.0",
         "lodash.mergewith": "^4.6.1",
-        "plugin-error": "^1.0.1",
+        "plugin-error": "^2.0.1",
         "through": "^2.3.8",
-        "vinyl": "^2.1.0"
+        "vinyl": "^3.0.0"
+      }
+    },
+    "node_modules/gulp-merge-json/node_modules/plugin-error": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-2.0.1.tgz",
+      "integrity": "sha512-zMakqvIDyY40xHOvzXka0kUvf40nYIuwRE8dWhti2WtjQZ31xAgBZBhxsK7vK3QbRXS1Xms/LO7B5cuAsfB2Gg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-colors": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/gulp-merge-json/node_modules/replace-ext": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz",
+      "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/gulp-merge-json/node_modules/vinyl": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz",
+      "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clone": "^2.1.2",
+        "remove-trailing-separator": "^1.1.0",
+        "replace-ext": "^2.0.0",
+        "teex": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10.13.0"
       }
     },
     "node_modules/gulp-sort": {
@@ -4209,7 +4297,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
       "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "devOptional": true,
+      "optional": true,
       "dependencies": {
         "is-plain-object": "^2.0.4"
       },
@@ -4280,7 +4368,7 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "devOptional": true,
+      "optional": true,
       "dependencies": {
         "isobject": "^3.0.1"
       },
@@ -4338,7 +4426,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8= sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "devOptional": true,
+      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4418,10 +4506,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"
       },
@@ -4568,6 +4657,13 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
+    "node_modules/lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/lodash.mergewith": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
@@ -5278,7 +5374,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
       "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
-      "devOptional": true,
+      "optional": true,
       "dependencies": {
         "ansi-colors": "^1.0.1",
         "arr-diff": "^4.0.0",
@@ -5545,7 +5641,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
       "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
-      "devOptional": true,
+      "optional": true,
       "engines": {
         "node": ">= 0.10"
       }
@@ -6005,6 +6101,18 @@
       "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
       "dev": true
     },
+    "node_modules/streamx": {
+      "version": "2.23.0",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz",
+      "integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "events-universal": "^1.0.0",
+        "fast-fifo": "^1.3.2",
+        "text-decoder": "^1.1.0"
+      }
+    },
     "node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -6327,6 +6435,16 @@
         "node": ">=6"
       }
     },
+    "node_modules/teex": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz",
+      "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "streamx": "^2.12.5"
+      }
+    },
     "node_modules/terminal-link": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-4.0.0.tgz",
@@ -6366,6 +6484,16 @@
         "readable-stream": "2 || 3"
       }
     },
+    "node_modules/text-decoder": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz",
+      "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "b4a": "^1.6.4"
+      }
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -6626,7 +6754,7 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
       "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
-      "devOptional": true,
+      "optional": true,
       "dependencies": {
         "clone": "^2.1.1",
         "clone-buffer": "^1.0.0",
diff --git a/build/package.json b/build/package.json
index 5926b7646a30..6ad52f9aa4f5 100644
--- a/build/package.json
+++ b/build/package.json
@@ -43,7 +43,7 @@
     "electron-osx-sign": "^0.6.0",
     "esbuild": "0.25.0",
     "extract-zip": "^2.0.1",
-    "gulp-merge-json": "^2.1.1",
+    "gulp-merge-json": "^2.2.1",
     "gulp-sort": "^2.0.0",
     "jsonc-parser": "^3.3.1",
     "jws": "^4.0.1",

From 775231751b40dca9171f0277d445cb094209fa1a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:21:30 +0000
Subject: [PATCH 1422/1815] Bump serde_bytes from 0.11.14 to 0.11.19 in /cli

Bumps [serde_bytes](https://github.com/serde-rs/bytes) from 0.11.14 to 0.11.19.
- [Release notes](https://github.com/serde-rs/bytes/releases)
- [Commits](https://github.com/serde-rs/bytes/compare/0.11.14...0.11.19)

---
updated-dependencies:
- dependency-name: serde_bytes
  dependency-version: 0.11.19
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 5 +++--
 cli/Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 1e318f83d292..d3ee72675e14 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -2618,11 +2618,12 @@ dependencies = [
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.14"
+version = "0.11.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
+checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8"
 dependencies = [
  "serde",
+ "serde_core",
 ]
 
 [[package]]
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index e620264e52df..e7b5fb08398c 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -30,7 +30,7 @@ uuid = { version = "1.16", features = ["serde", "v4"] }
 dirs = "5.0.1"
 rand = "0.9.2"
 opentelemetry = { version = "0.19.0", features = ["rt-tokio"] }
-serde_bytes = "0.11.9"
+serde_bytes = "0.11.19"
 chrono = { version = "0.4.42", features = ["serde", "std", "clock"], default-features = false }
 gethostname = "1.1.0"
 libc = "0.2.144"

From 7609e218b9f92445ca66ace01d0a6ef16a7ce6d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:21:35 +0000
Subject: [PATCH 1423/1815] Bump @types/minimist from 1.2.1 to 1.2.5 in /build

Bumps [@types/minimist](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/minimist) from 1.2.1 to 1.2.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/minimist)

---
updated-dependencies:
- dependency-name: "@types/minimist"
  dependency-version: 1.2.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 11 ++++++-----
 build/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 20122685017f..bb62df5ade8e 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -32,7 +32,7 @@
         "@types/jws": "^3.2.11",
         "@types/mime": "4.0.0",
         "@types/minimatch": "^6.0.0",
-        "@types/minimist": "^1.2.1",
+        "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",
         "@types/node": "25.x",
         "@types/pump": "^1.0.1",
@@ -1695,10 +1695,11 @@
       }
     },
     "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
+      "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",
diff --git a/build/package.json b/build/package.json
index 5926b7646a30..ccba9d556668 100644
--- a/build/package.json
+++ b/build/package.json
@@ -26,7 +26,7 @@
     "@types/jws": "^3.2.11",
     "@types/mime": "4.0.0",
     "@types/minimatch": "^6.0.0",
-    "@types/minimist": "^1.2.1",
+    "@types/minimist": "^1.2.5",
     "@types/mocha": "^10.0.10",
     "@types/node": "25.x",
     "@types/pump": "^1.0.1",

From a4299eda930a41dacfa48b49b38a4369de90a98e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:21:47 +0000
Subject: [PATCH 1424/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /extensions/extension-editing

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/extension-editing/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/extension-editing/package-lock.json b/extensions/extension-editing/package-lock.json
index a25cfb632b3b..ba488cb93562 100644
--- a/extensions/extension-editing/package-lock.json
+++ b/extensions/extension-editing/package-lock.json
@@ -47,9 +47,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 531feb8a0f237a97243f30aa5402597f27b26d2d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:21:48 +0000
Subject: [PATCH 1425/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /extensions/git-base

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git-base/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/git-base/package-lock.json b/extensions/git-base/package-lock.json
index efbdbfc93c3a..9756cb0cdfbf 100644
--- a/extensions/git-base/package-lock.json
+++ b/extensions/git-base/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From ff94043cbf809cc71e015450d03ba939a682e6e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:21:56 +0000
Subject: [PATCH 1426/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /extensions/debug-auto-launch

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/debug-auto-launch/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/debug-auto-launch/package-lock.json b/extensions/debug-auto-launch/package-lock.json
index 82a7515bf49e..101e1c51e803 100644
--- a/extensions/debug-auto-launch/package-lock.json
+++ b/extensions/debug-auto-launch/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 9bb4dc4554c84531a0dce7c2ef442ce7d997798d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:21:58 +0000
Subject: [PATCH 1427/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /extensions/debug-server-ready

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/debug-server-ready/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/debug-server-ready/package-lock.json b/extensions/debug-server-ready/package-lock.json
index 59f5733bfdbc..96063121ceff 100644
--- a/extensions/debug-server-ready/package-lock.json
+++ b/extensions/debug-server-ready/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 0ffa5c69594ef41707705265cff264d2621be1ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:22:02 +0000
Subject: [PATCH 1428/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /extensions/gulp

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/gulp/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/gulp/package-lock.json b/extensions/gulp/package-lock.json
index fc7633c6b448..ded93dde3def 100644
--- a/extensions/gulp/package-lock.json
+++ b/extensions/gulp/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From b1afa0b94fb786dfea9371959b14db40e8478cf0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:22:04 +0000
Subject: [PATCH 1429/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /extensions/emmet

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/emmet/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/emmet/package-lock.json b/extensions/emmet/package-lock.json
index 34943baca02f..4bc4ce60892f 100644
--- a/extensions/emmet/package-lock.json
+++ b/extensions/emmet/package-lock.json
@@ -80,9 +80,9 @@
       "integrity": "sha1-JEywLHfsLnT3ipvTGCGKvJxQCmE= sha512-ZsZ2I9Vzso3Ho/pjZFsmmZ++FWeEd/txqybHTm4OgaZzdS8V9V/YYWQwg5TC38Z7uLWUV1vavpLLbjJtKubR1A=="
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 57a3216d49c7a5b7409d263aac798ba3d14e0e2b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:22:05 +0000
Subject: [PATCH 1430/1815] Bump @jupyterlab/nbformat from 4.5.1 to 4.5.2 in
 /extensions/ipynb

---
updated-dependencies:
- dependency-name: "@jupyterlab/nbformat"
  dependency-version: 4.5.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/ipynb/package-lock.json | 8 ++++----
 extensions/ipynb/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/ipynb/package-lock.json b/extensions/ipynb/package-lock.json
index d246d427a5d5..3061d126538f 100644
--- a/extensions/ipynb/package-lock.json
+++ b/extensions/ipynb/package-lock.json
@@ -13,7 +13,7 @@
         "detect-indent": "^7.0.2"
       },
       "devDependencies": {
-        "@jupyterlab/nbformat": "^4.5.1",
+        "@jupyterlab/nbformat": "^4.5.2",
         "@types/markdown-it": "14.1.2"
       },
       "engines": {
@@ -26,9 +26,9 @@
       "integrity": "sha512-BCN9uNWH8AmiP7BXBJqEinUY9KXalmRzo+L0cB/mQsmFfzODxwQrbvxCHXUNH2iP+qKkWYtB4vyy8N62PViMFw=="
     },
     "node_modules/@jupyterlab/nbformat": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/@jupyterlab/nbformat/-/nbformat-4.5.1.tgz",
-      "integrity": "sha512-aVPqZ7ao/RIwfPHNtTWy38J99zSi1/NZWOEfcnsb3Ap6p6HiCPI2LCKHk4SvBLIDzaFD68DesCA+ofac0P0bWw==",
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/@jupyterlab/nbformat/-/nbformat-4.5.2.tgz",
+      "integrity": "sha512-1qNgz3T2FmV7cnRUmw8ApSPvlthI7nxQzXDRlpNQmQHTuGHnNJkyahqXaoO6pI5vt+5RK6jRCvME75xFdVwZ+w==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
diff --git a/extensions/ipynb/package.json b/extensions/ipynb/package.json
index 02d3c6178538..c0ca5cfad1ba 100644
--- a/extensions/ipynb/package.json
+++ b/extensions/ipynb/package.json
@@ -165,7 +165,7 @@
     "detect-indent": "^7.0.2"
   },
   "devDependencies": {
-    "@jupyterlab/nbformat": "^4.5.1",
+    "@jupyterlab/nbformat": "^4.5.2",
     "@types/markdown-it": "14.1.2"
   },
   "repository": {

From 1850106886312b19074012f0d73935a083f6787e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:22:05 +0000
Subject: [PATCH 1431/1815] Bump @types/node in
 /extensions/github-authentication

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github-authentication/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/github-authentication/package-lock.json b/extensions/github-authentication/package-lock.json
index 5ec3a0e9e9b4..2997d94021ba 100644
--- a/extensions/github-authentication/package-lock.json
+++ b/extensions/github-authentication/package-lock.json
@@ -154,9 +154,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 381117dc9e1a0c07a50fe14518d827cbbf796ffd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:22:07 +0000
Subject: [PATCH 1432/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /extensions/grunt

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/grunt/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/grunt/package-lock.json b/extensions/grunt/package-lock.json
index 2aaf4fb54348..97b8ef8725b2 100644
--- a/extensions/grunt/package-lock.json
+++ b/extensions/grunt/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 19d66089b36099957f497edd06d5f139969d151c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:22:08 +0000
Subject: [PATCH 1433/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /extensions/git

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index 7d677c634432..0b8977af3536 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -214,9 +214,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From a8c4a5221e756c2a2d6457bbb96efadd3bd33fff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:22:09 +0000
Subject: [PATCH 1434/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /extensions/github

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/github/package-lock.json b/extensions/github/package-lock.json
index 27232d70b093..e4cc42ea34e4 100644
--- a/extensions/github/package-lock.json
+++ b/extensions/github/package-lock.json
@@ -311,9 +311,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 3043baf8719410a0c43ff58e4342af81ab62ecec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:23:49 +0000
Subject: [PATCH 1435/1815] Bump @types/node in
 /extensions/json-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/json-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/json-language-features/server/package-lock.json b/extensions/json-language-features/server/package-lock.json
index a73d433327a6..86628b4b72ab 100644
--- a/extensions/json-language-features/server/package-lock.json
+++ b/extensions/json-language-features/server/package-lock.json
@@ -35,9 +35,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 896edbd09744155e3206a1d9272f817814c85963 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:23:58 +0000
Subject: [PATCH 1436/1815] Bump @types/node in
 /extensions/html-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/html-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/html-language-features/package-lock.json b/extensions/html-language-features/package-lock.json
index d3a21e50c3de..6f14c2d47e6f 100644
--- a/extensions/html-language-features/package-lock.json
+++ b/extensions/html-language-features/package-lock.json
@@ -166,9 +166,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 0eaa772e2c7d444798d5241239d6f30c38c8ee9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:24:04 +0000
Subject: [PATCH 1437/1815] Bump @types/node in
 /extensions/html-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/html-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/html-language-features/server/package-lock.json b/extensions/html-language-features/server/package-lock.json
index 58117c168d06..d8a5ba1c34aa 100644
--- a/extensions/html-language-features/server/package-lock.json
+++ b/extensions/html-language-features/server/package-lock.json
@@ -32,9 +32,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From fdad3ac5b7634120c212a27cf0b7d8fe9a669ee0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:24:08 +0000
Subject: [PATCH 1438/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /extensions/jake

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/jake/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/jake/package-lock.json b/extensions/jake/package-lock.json
index 615ad3830ae7..dc5d91b8184e 100644
--- a/extensions/jake/package-lock.json
+++ b/extensions/jake/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 4cf20d7913ca97612e8dada75f4ca987dd1a860d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:24:15 +0000
Subject: [PATCH 1439/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /extensions/merge-conflict

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/merge-conflict/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/merge-conflict/package-lock.json b/extensions/merge-conflict/package-lock.json
index ee393f4148a2..c9eaf07fb6b8 100644
--- a/extensions/merge-conflict/package-lock.json
+++ b/extensions/merge-conflict/package-lock.json
@@ -143,9 +143,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From e94427920278b3f154baab4e78cc15f3c2bede68 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:24:18 +0000
Subject: [PATCH 1440/1815] Bump @types/node in
 /extensions/json-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/json-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/json-language-features/package-lock.json b/extensions/json-language-features/package-lock.json
index dd8c744df39d..1b3e39344f1a 100644
--- a/extensions/json-language-features/package-lock.json
+++ b/extensions/json-language-features/package-lock.json
@@ -166,9 +166,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 47dc4807b61acda9f5ebe90f75ee9ee9a3b5c89b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:24:38 +0000
Subject: [PATCH 1441/1815] Bump @types/node in
 /extensions/microsoft-authentication

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 29 +++++++------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 8333e1b03b4d..2249af1bb45c 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -33,21 +33,21 @@
       "integrity": "sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="
     },
     "node_modules/@azure/msal-common": {
-      "version": "14.16.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.16.0.tgz",
-      "integrity": "sha512-1KOZj9IpcDSwpNiQNjt0jDYZpQvNZay7QAEi/5DLubay40iGYtLzya/jbjRPLyOTZhEKyL1MzPuw2HqBCjceYA==",
+      "version": "14.16.1",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.16.1.tgz",
+      "integrity": "sha512-nyxsA6NA4SVKh5YyRpbSXiMr7oQbwark7JU9LMeg6tJYTSPyAGkdx61wPT4gyxZfxlSxMMEyAsWaubBlNyIa1w==",
       "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/@azure/msal-node": {
-      "version": "3.8.4",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.4.tgz",
-      "integrity": "sha512-lvuAwsDpPDE/jSuVQOBMpLbXuVuLsPNRwWCyK3/6bPlBk0fGWegqoZ0qjZclMWyQ2JNvIY3vHY7hoFmFmFQcOw==",
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.16.3.tgz",
+      "integrity": "sha512-CO+SE4weOsfJf+C5LM8argzvotrXw252/ZU6SM2Tz63fEblhH1uuVaaO4ISYFuN4Q6BhTo7I3qIdi8ydUQCqhw==",
       "license": "MIT",
       "dependencies": {
-        "@azure/msal-common": "15.13.3",
+        "@azure/msal-common": "14.16.1",
         "jsonwebtoken": "^9.0.0",
         "uuid": "^8.3.0"
       },
@@ -86,15 +86,6 @@
       "hasInstallScript": true,
       "license": "MIT"
     },
-    "node_modules/@azure/msal-node/node_modules/@azure/msal-common": {
-      "version": "15.13.3",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.13.3.tgz",
-      "integrity": "sha512-shSDU7Ioecya+Aob5xliW9IGq1Ui8y4EVSdWGyI1Gbm4Vg61WpP95LuzcY214/wEjSn6w4PZYD4/iVldErHayQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/@microsoft/1ds-core-js": {
       "version": "4.3.10",
       "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
@@ -220,9 +211,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From d7bc7d3d6ffb82489a2567ba216903b208dfff15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:24:49 +0000
Subject: [PATCH 1442/1815] Bump @parcel/watcher from 2.5.1 to 2.5.4 in
 /extensions

Bumps [@parcel/watcher](https://github.com/parcel-bundler/watcher) from 2.5.1 to 2.5.4.
- [Release notes](https://github.com/parcel-bundler/watcher/releases)
- [Commits](https://github.com/parcel-bundler/watcher/compare/v2.5.1...v2.5.4)

---
updated-dependencies:
- dependency-name: "@parcel/watcher"
  dependency-version: 2.5.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/package-lock.json | 197 ++++++++++++-----------------------
 extensions/package.json      |   2 +-
 2 files changed, 69 insertions(+), 130 deletions(-)

diff --git a/extensions/package-lock.json b/extensions/package-lock.json
index 4c77cda2de7a..777be8409ab7 100644
--- a/extensions/package-lock.json
+++ b/extensions/package-lock.json
@@ -13,7 +13,7 @@
         "typescript": "^5.9.3"
       },
       "devDependencies": {
-        "@parcel/watcher": "2.5.1",
+        "@parcel/watcher": "2.5.4",
         "esbuild": "0.27.2",
         "vscode-grammar-updater": "^1.1.0"
       }
@@ -461,17 +461,17 @@
       }
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
-      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.4.tgz",
+      "integrity": "sha512-WYa2tUVV5HiArWPB3ydlOc4R2ivq0IDrlqhMi3l7mVsFEXNcTfxYFPIHXHXIh/ca/y/V5N4E1zecyxdIBjYnkQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "detect-libc": "^1.0.3",
+        "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"
@@ -481,25 +481,25 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.1",
-        "@parcel/watcher-darwin-arm64": "2.5.1",
-        "@parcel/watcher-darwin-x64": "2.5.1",
-        "@parcel/watcher-freebsd-x64": "2.5.1",
-        "@parcel/watcher-linux-arm-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm-musl": "2.5.1",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm64-musl": "2.5.1",
-        "@parcel/watcher-linux-x64-glibc": "2.5.1",
-        "@parcel/watcher-linux-x64-musl": "2.5.1",
-        "@parcel/watcher-win32-arm64": "2.5.1",
-        "@parcel/watcher-win32-ia32": "2.5.1",
-        "@parcel/watcher-win32-x64": "2.5.1"
+        "@parcel/watcher-android-arm64": "2.5.4",
+        "@parcel/watcher-darwin-arm64": "2.5.4",
+        "@parcel/watcher-darwin-x64": "2.5.4",
+        "@parcel/watcher-freebsd-x64": "2.5.4",
+        "@parcel/watcher-linux-arm-glibc": "2.5.4",
+        "@parcel/watcher-linux-arm-musl": "2.5.4",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.4",
+        "@parcel/watcher-linux-arm64-musl": "2.5.4",
+        "@parcel/watcher-linux-x64-glibc": "2.5.4",
+        "@parcel/watcher-linux-x64-musl": "2.5.4",
+        "@parcel/watcher-win32-arm64": "2.5.4",
+        "@parcel/watcher-win32-ia32": "2.5.4",
+        "@parcel/watcher-win32-x64": "2.5.4"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
-      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.4.tgz",
+      "integrity": "sha512-hoh0vx4v+b3BNI7Cjoy2/B0ARqcwVNrzN/n7DLq9ZB4I3lrsvhrkCViJyfTj/Qi5xM9YFiH4AmHGK6pgH1ss7g==",
       "cpu": [
         "arm64"
       ],
@@ -518,9 +518,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
-      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.4.tgz",
+      "integrity": "sha512-kphKy377pZiWpAOyTgQYPE5/XEKVMaj6VUjKT5VkNyUJlr2qZAn8gIc7CPzx+kbhvqHDT9d7EqdOqRXT6vk0zw==",
       "cpu": [
         "arm64"
       ],
@@ -539,9 +539,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
-      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.4.tgz",
+      "integrity": "sha512-UKaQFhCtNJW1A9YyVz3Ju7ydf6QgrpNQfRZ35wNKUhTQ3dxJ/3MULXN5JN/0Z80V/KUBDGa3RZaKq1EQT2a2gg==",
       "cpu": [
         "x64"
       ],
@@ -560,9 +560,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
-      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.4.tgz",
+      "integrity": "sha512-Dib0Wv3Ow/m2/ttvLdeI2DBXloO7t3Z0oCp4bAb2aqyqOjKPPGrg10pMJJAQ7tt8P4V2rwYwywkDhUia/FgS+Q==",
       "cpu": [
         "x64"
       ],
@@ -581,9 +581,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
-      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.4.tgz",
+      "integrity": "sha512-I5Vb769pdf7Q7Sf4KNy8Pogl/URRCKu9ImMmnVKYayhynuyGYMzuI4UOWnegQNa2sGpsPSbzDsqbHNMyeyPCgw==",
       "cpu": [
         "arm"
       ],
@@ -602,9 +602,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
-      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.4.tgz",
+      "integrity": "sha512-kGO8RPvVrcAotV4QcWh8kZuHr9bXi9a3bSZw7kFarYR0+fGliU7hd/zevhjw8fnvIKG3J9EO5G6sXNGCSNMYPQ==",
       "cpu": [
         "arm"
       ],
@@ -623,9 +623,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
-      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.4.tgz",
+      "integrity": "sha512-KU75aooXhqGFY2W5/p8DYYHt4hrjHZod8AhcGAmhzPn/etTa+lYCDB2b1sJy3sWJ8ahFVTdy+EbqSBvMx3iFlw==",
       "cpu": [
         "arm64"
       ],
@@ -644,9 +644,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
-      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.4.tgz",
+      "integrity": "sha512-Qx8uNiIekVutnzbVdrgSanM+cbpDD3boB1f8vMtnuG5Zau4/bdDbXyKwIn0ToqFhIuob73bcxV9NwRm04/hzHQ==",
       "cpu": [
         "arm64"
       ],
@@ -665,9 +665,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
-      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.4.tgz",
+      "integrity": "sha512-UYBQvhYmgAv61LNUn24qGQdjtycFBKSK3EXr72DbJqX9aaLbtCOO8+1SkKhD/GNiJ97ExgcHBrukcYhVjrnogA==",
       "cpu": [
         "x64"
       ],
@@ -686,9 +686,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
-      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.4.tgz",
+      "integrity": "sha512-YoRWCVgxv8akZrMhdyVi6/TyoeeMkQ0PGGOf2E4omODrvd1wxniXP+DBynKoHryStks7l+fDAMUBRzqNHrVOpg==",
       "cpu": [
         "x64"
       ],
@@ -707,9 +707,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
-      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.4.tgz",
+      "integrity": "sha512-iby+D/YNXWkiQNYcIhg8P5hSjzXEHaQrk2SLrWOUD7VeC4Ohu0WQvmV+HDJokZVJ2UjJ4AGXW3bx7Lls9Ln4TQ==",
       "cpu": [
         "arm64"
       ],
@@ -728,9 +728,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
-      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.4.tgz",
+      "integrity": "sha512-vQN+KIReG0a2ZDpVv8cgddlf67J8hk1WfZMMP7sMeZmJRSmEax5xNDNWKdgqSe2brOKTQQAs3aCCUal2qBHAyg==",
       "cpu": [
         "ia32"
       ],
@@ -749,9 +749,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
-      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.4.tgz",
+      "integrity": "sha512-3A6efb6BOKwyw7yk9ro2vus2YTt2nvcd56AuzxdMiVOxL9umDyN5PKkKfZ/gZ9row41SjVmTVQNWQhaRRGpOKw==",
       "cpu": [
         "x64"
       ],
@@ -769,18 +769,6 @@
         "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/coffeescript": {
       "version": "1.12.7",
       "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-1.12.7.tgz",
@@ -807,16 +795,13 @@
       }
     },
     "node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
       "dev": true,
       "license": "Apache-2.0",
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
       "engines": {
-        "node": ">=0.10"
+        "node": ">=8"
       }
     },
     "node_modules/esbuild": {
@@ -867,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",
@@ -900,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",
@@ -934,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 c3e7d25a3b64..44d8bd728362 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -10,7 +10,7 @@
     "postinstall": "node ./postinstall.mjs"
   },
   "devDependencies": {
-    "@parcel/watcher": "2.5.1",
+    "@parcel/watcher": "2.5.4",
     "esbuild": "0.27.2",
     "vscode-grammar-updater": "^1.1.0"
   },

From bb07774d247ca5bf5a315ce5c8cdd92e64778a3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:24:52 +0000
Subject: [PATCH 1443/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /extensions/references-view

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/references-view/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/references-view/package-lock.json b/extensions/references-view/package-lock.json
index 3deca5263124..e4ce1e4867a8 100644
--- a/extensions/references-view/package-lock.json
+++ b/extensions/references-view/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 4cdb06d17961216c1801d56c3dcbe29a3a798727 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:25:25 +0000
Subject: [PATCH 1444/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /extensions/npm

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/npm/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index 1ec9d69eb876..134eadffe2af 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -60,9 +60,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 5dad347234de0209cc5fb49efdf87f7194877ea5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:26:17 +0000
Subject: [PATCH 1445/1815] Bump @types/node in
 /extensions/typescript-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/typescript-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/typescript-language-features/package-lock.json b/extensions/typescript-language-features/package-lock.json
index 4d2d6bc87117..edfd54f5de82 100644
--- a/extensions/typescript-language-features/package-lock.json
+++ b/extensions/typescript-language-features/package-lock.json
@@ -152,9 +152,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 4d7f4ccc7a746a75e1fb017ca4a7a6bf03418fd4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:26:22 +0000
Subject: [PATCH 1446/1815] Bump @types/node in
 /extensions/php-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/php-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/php-language-features/package-lock.json b/extensions/php-language-features/package-lock.json
index 53c10b8f62aa..f9b8fc63016b 100644
--- a/extensions/php-language-features/package-lock.json
+++ b/extensions/php-language-features/package-lock.json
@@ -20,9 +20,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 8c138fb31150388f4a46bd0d84ee4414eed26eed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:26:28 +0000
Subject: [PATCH 1447/1815] Bump @types/node in
 /extensions/vscode-colorize-perf-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-colorize-perf-tests/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-colorize-perf-tests/package-lock.json b/extensions/vscode-colorize-perf-tests/package-lock.json
index f142b3c5445a..28e3366329b7 100644
--- a/extensions/vscode-colorize-perf-tests/package-lock.json
+++ b/extensions/vscode-colorize-perf-tests/package-lock.json
@@ -19,9 +19,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 6db1a4e67c6125c80aa737cb6a9fa6f1530d79ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:26:28 +0000
Subject: [PATCH 1448/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /extensions/tunnel-forwarding

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/tunnel-forwarding/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/tunnel-forwarding/package-lock.json b/extensions/tunnel-forwarding/package-lock.json
index b52990d7c1c2..0a6a1932bc79 100644
--- a/extensions/tunnel-forwarding/package-lock.json
+++ b/extensions/tunnel-forwarding/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 6083d1ea69fc11d858300f6f2ab9bca99c883849 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:26:40 +0000
Subject: [PATCH 1449/1815] Bump @types/node in
 /extensions/vscode-colorize-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-colorize-tests/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-colorize-tests/package-lock.json b/extensions/vscode-colorize-tests/package-lock.json
index d47673a0770a..07dbdd7a2901 100644
--- a/extensions/vscode-colorize-tests/package-lock.json
+++ b/extensions/vscode-colorize-tests/package-lock.json
@@ -19,9 +19,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From cce7cbaf6e181dfc7030e692112136631e5e5abe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:26:45 +0000
Subject: [PATCH 1450/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /extensions/vscode-api-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-api-tests/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-api-tests/package-lock.json b/extensions/vscode-api-tests/package-lock.json
index 269133c7b25d..22c7461a20c3 100644
--- a/extensions/vscode-api-tests/package-lock.json
+++ b/extensions/vscode-api-tests/package-lock.json
@@ -27,9 +27,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From ede13baec6f464c1c9b5e14ad125f0e681510ad7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:26:46 +0000
Subject: [PATCH 1451/1815] Bump deemon from 1.8.0 to 1.13.6

Bumps [deemon](https://github.com/joaomoreno/deemon) from 1.8.0 to 1.13.6.
- [Commits](https://github.com/joaomoreno/deemon/compare/v1.8.0...v1.13.6)

---
updated-dependencies:
- dependency-name: deemon
  dependency-version: 1.13.6
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 11 ++++++-----
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c9b638942411..118319cd100b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -95,7 +95,7 @@
         "css-loader": "^6.9.1",
         "cssnano": "^6.0.3",
         "debounce": "^1.0.0",
-        "deemon": "^1.8.0",
+        "deemon": "^1.13.6",
         "electron": "35.7.5",
         "eslint": "^9.11.1",
         "eslint-formatter-compact": "^8.40.0",
@@ -6033,10 +6033,11 @@
       }
     },
     "node_modules/deemon": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/deemon/-/deemon-1.8.0.tgz",
-      "integrity": "sha512-qcuSMls/W5DdoEKKAF0PiNQrc8+tItFjvszfjNm1YqNv1p5wwEt+6qILA9sws6eM81nmNwD38ducqlgIXzQlsQ==",
+      "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": {
         "bl": "^4.0.2",
         "tree-kill": "^1.2.2"
@@ -6045,7 +6046,7 @@
         "deemon": "src/deemon.js"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=22"
       }
     },
     "node_modules/deep-equal": {
diff --git a/package.json b/package.json
index 6c1259182b87..330900448065 100644
--- a/package.json
+++ b/package.json
@@ -154,7 +154,7 @@
     "css-loader": "^6.9.1",
     "cssnano": "^6.0.3",
     "debounce": "^1.0.0",
-    "deemon": "^1.8.0",
+    "deemon": "^1.13.6",
     "electron": "35.7.5",
     "eslint": "^9.11.1",
     "eslint-formatter-compact": "^8.40.0",

From 4cbf6a997e0d6a476a4f0bc9b9ebd7a525140d3f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:26:55 +0000
Subject: [PATCH 1452/1815] Bump vscode-oniguruma from 1.7.0 to 2.0.1

Bumps [vscode-oniguruma](https://github.com/microsoft/vscode-oniguruma) from 1.7.0 to 2.0.1.
- [Commits](https://github.com/microsoft/vscode-oniguruma/compare/v1.7.0...v2.0.1)

---
updated-dependencies:
- dependency-name: vscode-oniguruma
  dependency-version: 2.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c9b638942411..0e27b034da7b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -49,7 +49,7 @@
         "open": "^8.4.2",
         "tas-client-umd": "0.2.0",
         "v8-inspect-profiler": "^0.1.1",
-        "vscode-oniguruma": "1.7.0",
+        "vscode-oniguruma": "2.0.1",
         "vscode-regexpp": "^3.1.0",
         "vscode-textmate": "9.2.0",
         "yauzl": "^3.0.0",
@@ -16875,9 +16875,10 @@
       }
     },
     "node_modules/vscode-oniguruma": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz",
-      "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-2.0.1.tgz",
+      "integrity": "sha512-poJU8iHIWnC3vgphJnrLZyI3YdqRlR27xzqDmpPXYzA93R4Gk8z7T6oqDzDoHjoikA2aS82crdXFkjELCdJsjQ==",
+      "license": "MIT"
     },
     "node_modules/vscode-regexpp": {
       "version": "3.1.0",
diff --git a/package.json b/package.json
index 6c1259182b87..a5d64e8358b5 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "open": "^8.4.2",
     "tas-client-umd": "0.2.0",
     "v8-inspect-profiler": "^0.1.1",
-    "vscode-oniguruma": "1.7.0",
+    "vscode-oniguruma": "2.0.1",
     "vscode-regexpp": "^3.1.0",
     "vscode-textmate": "9.2.0",
     "yauzl": "^3.0.0",

From 3e35dd19a65a1a776c76f469e8da114518cd559e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:26:58 +0000
Subject: [PATCH 1453/1815] Bump @xterm/addon-image in /remote/web

Bumps [@xterm/addon-image](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.77 to 0.10.0-beta.101.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-image"
  dependency-version: 0.10.0-beta.101
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index ad6160a0a58e..c55e0b8fa920 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -14,7 +14,7 @@
 				"@vscode/tree-sitter-wasm": "^0.3.0",
 				"@vscode/vscode-languagedetection": "1.0.22",
 				"@xterm/addon-clipboard": "^0.3.0-beta.89",
-				"@xterm/addon-image": "^0.10.0-beta.77",
+				"@xterm/addon-image": "^0.10.0-beta.101",
 				"@xterm/addon-ligatures": "^0.11.0-beta.76",
 				"@xterm/addon-progress": "^0.3.0-beta.100",
 				"@xterm/addon-search": "^0.17.0-beta.77",
@@ -136,12 +136,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-image": {
-			"version": "0.10.0-beta.77",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.77.tgz",
-			"integrity": "sha512-85lYTKFgkXpMVwfSiFpdgXp4cNREr8BAIImFbnovZcmFdqDQn4QoiOywORXYos6on52oeFAyuPVEEa/GMHuHZw==",
+			"version": "0.10.0-beta.101",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.101.tgz",
+			"integrity": "sha512-Gd8ZpfyzvisG+08+mXynufQHfaWWxGhhtRMSQXV2FyPNa3MNXNrowgjeXhpaRObOOsxSZnAlB8qDW8OHTjzG6A==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.77"
+				"@xterm/xterm": "^6.1.0-beta.101"
 			}
 		},
 		"node_modules/@xterm/addon-ligatures": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 9f96411491b5..9e187d2b5334 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -9,7 +9,7 @@
 		"@vscode/tree-sitter-wasm": "^0.3.0",
 		"@vscode/vscode-languagedetection": "1.0.22",
 		"@xterm/addon-clipboard": "^0.3.0-beta.89",
-		"@xterm/addon-image": "^0.10.0-beta.77",
+		"@xterm/addon-image": "^0.10.0-beta.101",
 		"@xterm/addon-ligatures": "^0.11.0-beta.76",
 		"@xterm/addon-progress": "^0.3.0-beta.100",
 		"@xterm/addon-search": "^0.17.0-beta.77",

From 9f1d508081af949b06d8627f41c2c729026d0786 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:26:59 +0000
Subject: [PATCH 1454/1815] Bump @types/node in
 /extensions/vscode-test-resolver

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-test-resolver/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-test-resolver/package-lock.json b/extensions/vscode-test-resolver/package-lock.json
index a576dc5a213f..72993c938012 100644
--- a/extensions/vscode-test-resolver/package-lock.json
+++ b/extensions/vscode-test-resolver/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 501eb149d7fa2b72be0167497c3656a1786d7112 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:26:59 +0000
Subject: [PATCH 1455/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /test/automation

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/automation/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
index 88fcf1d3b372..b0190426bf3a 100644
--- a/test/automation/package-lock.json
+++ b/test/automation/package-lock.json
@@ -75,9 +75,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 27998b8105841c4f37ff35f9ee05056f2d4fd712 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:27:02 +0000
Subject: [PATCH 1456/1815] Bump @xterm/addon-webgl in /remote/web

Bumps [@xterm/addon-webgl](https://github.com/xtermjs/xterm.js) from 0.20.0-beta.99 to 0.20.0-beta.100.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-webgl"
  dependency-version: 0.20.0-beta.100
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index ad6160a0a58e..9a85314936a1 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -20,7 +20,7 @@
 				"@xterm/addon-search": "^0.17.0-beta.77",
 				"@xterm/addon-serialize": "^0.15.0-beta.100",
 				"@xterm/addon-unicode11": "^0.10.0-beta.89",
-				"@xterm/addon-webgl": "^0.20.0-beta.99",
+				"@xterm/addon-webgl": "^0.20.0-beta.100",
 				"@xterm/xterm": "^6.0.0",
 				"jschardet": "3.1.4",
 				"tas-client-umd": "0.2.0",
@@ -197,12 +197,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-webgl": {
-			"version": "0.20.0-beta.99",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.99.tgz",
-			"integrity": "sha512-p4zE4quuFw4sfuFjQQibFQL3wusruksx3ORzSE+qRUdqPlm+ndXoX8fO2T8lEOsq1pr2rhabDMDUo1OQM5aowA==",
+			"version": "0.20.0-beta.100",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.100.tgz",
+			"integrity": "sha512-h17XiyERE+LpuYEPUAm2ux6g2Iy34BT/tfwxOckZ+RrhjM8bZMeN3u6/q28viBqAKWhhD3JbxlcDfKMN8sE3sg==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.100"
+				"@xterm/xterm": "^6.1.0-beta.101"
 			}
 		},
 		"node_modules/@xterm/xterm": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 9f96411491b5..3327db807d1b 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -15,7 +15,7 @@
 		"@xterm/addon-search": "^0.17.0-beta.77",
 		"@xterm/addon-serialize": "^0.15.0-beta.100",
 		"@xterm/addon-unicode11": "^0.10.0-beta.89",
-		"@xterm/addon-webgl": "^0.20.0-beta.99",
+		"@xterm/addon-webgl": "^0.20.0-beta.100",
 		"@xterm/xterm": "^6.0.0",
 		"jschardet": "3.1.4",
 		"tas-client-umd": "0.2.0",

From e93ce23f6f923aaf746b40e54bea5565b85f18e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:27:03 +0000
Subject: [PATCH 1457/1815] Bump @xterm/addon-progress in /remote

Bumps [@xterm/addon-progress](https://github.com/xtermjs/xterm.js) from 0.3.0-beta.100 to 0.3.0-beta.101.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-progress"
  dependency-version: 0.3.0-beta.101
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 74dcdfb8c2fb..2c2e64068e7b 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -23,7 +23,7 @@
         "@xterm/addon-clipboard": "^0.2.0-beta.123",
         "@xterm/addon-image": "^0.10.0-beta.76",
         "@xterm/addon-ligatures": "^0.10.0-beta.140",
-        "@xterm/addon-progress": "^0.3.0-beta.100",
+        "@xterm/addon-progress": "^0.3.0-beta.101",
         "@xterm/addon-search": "^0.17.0-beta.89",
         "@xterm/addon-serialize": "^0.14.0-beta.140",
         "@xterm/addon-unicode11": "^0.10.0-beta.76",
@@ -647,12 +647,12 @@
       }
     },
     "node_modules/@xterm/addon-progress": {
-      "version": "0.3.0-beta.100",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.100.tgz",
-      "integrity": "sha512-mbZCJfkaRIOnBUwdOB7YLBHBSx8w8//7lLVT1T+9kJy+B4SazqMCXdfNKTI77S36C0L72tH303u9Umqigkex0g==",
+      "version": "0.3.0-beta.101",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.101.tgz",
+      "integrity": "sha512-QsJLvH3tc9KywOXb9O/mxkPoYmL2cCvKUa/YckriuZmEh5WMw+3cgNa+BC0aA73htdWE8UMUBvigE786KErajA==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.100"
+        "@xterm/xterm": "^6.1.0-beta.101"
       }
     },
     "node_modules/@xterm/addon-search": {
diff --git a/remote/package.json b/remote/package.json
index f231f6421229..ca60b361b421 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -18,7 +18,7 @@
     "@xterm/addon-clipboard": "^0.2.0-beta.123",
     "@xterm/addon-image": "^0.10.0-beta.76",
     "@xterm/addon-ligatures": "^0.10.0-beta.140",
-    "@xterm/addon-progress": "^0.3.0-beta.100",
+    "@xterm/addon-progress": "^0.3.0-beta.101",
     "@xterm/addon-search": "^0.17.0-beta.89",
     "@xterm/addon-serialize": "^0.14.0-beta.140",
     "@xterm/addon-unicode11": "^0.10.0-beta.76",

From ff50bf1f1acaa026c01023af7be4d5c6f832d877 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:27:04 +0000
Subject: [PATCH 1458/1815] Bump @vscode/windows-process-tree from 0.6.2 to
 0.6.3

Bumps [@vscode/windows-process-tree](https://github.com/microsoft/vscode-windows-process-tree) from 0.6.2 to 0.6.3.
- [Release notes](https://github.com/microsoft/vscode-windows-process-tree/releases)
- [Commits](https://github.com/microsoft/vscode-windows-process-tree/compare/v0.6.2...v0.6.3)

---
updated-dependencies:
- dependency-name: "@vscode/windows-process-tree"
  dependency-version: 0.6.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c9b638942411..589b93671e7f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
         "@vscode/tree-sitter-wasm": "^0.1.3",
         "@vscode/vscode-languagedetection": "1.0.22",
         "@vscode/windows-mutex": "^0.5.0",
-        "@vscode/windows-process-tree": "^0.6.2",
+        "@vscode/windows-process-tree": "^0.6.3",
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.2.0-beta.81",
         "@xterm/addon-image": "^0.9.0-beta.98",
@@ -3770,9 +3770,9 @@
       }
     },
     "node_modules/@vscode/windows-process-tree": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/@vscode/windows-process-tree/-/windows-process-tree-0.6.2.tgz",
-      "integrity": "sha512-uzyUuQ93m7K1jSPrB/72m4IspOyeGpvvghNwFCay/McZ+y4Hk2BnLdZPb6EJ8HLRa3GwCvYjH/MQZzcnLOVnaQ==",
+      "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": {
diff --git a/package.json b/package.json
index 6c1259182b87..4b0ad53570ac 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
     "@vscode/tree-sitter-wasm": "^0.1.3",
     "@vscode/vscode-languagedetection": "1.0.22",
     "@vscode/windows-mutex": "^0.5.0",
-    "@vscode/windows-process-tree": "^0.6.2",
+    "@vscode/windows-process-tree": "^0.6.3",
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.2.0-beta.81",
     "@xterm/addon-image": "^0.9.0-beta.98",

From 2f10a394349fa5b18bdf5c5dc5576209131fe843 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:27:12 +0000
Subject: [PATCH 1459/1815] Bump node-pty from 1.1.0-beta39 to 1.1.0 in /remote

Bumps [node-pty](https://github.com/microsoft/node-pty) from 1.1.0-beta39 to 1.1.0.
- [Release notes](https://github.com/microsoft/node-pty/releases)
- [Commits](https://github.com/microsoft/node-pty/compare/v1.1.0-beta39...v1.1.0)

---
updated-dependencies:
- dependency-name: node-pty
  dependency-version: 1.1.0
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 74dcdfb8c2fb..444c0f904129 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -37,7 +37,7 @@
         "kerberos": "7.0.0",
         "minimist": "^1.2.8",
         "native-watchdog": "^1.4.1",
-        "node-pty": "1.1.0-beta39",
+        "node-pty": "1.1.0",
         "tas-client-umd": "0.2.0",
         "vscode-oniguruma": "2.0.1",
         "vscode-regexpp": "^3.1.0",
@@ -1219,9 +1219,9 @@
       }
     },
     "node_modules/node-pty": {
-      "version": "1.1.0-beta39",
-      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta39.tgz",
-      "integrity": "sha512-1xnN2dbS0QngT4xenpS/6Q77QtaDQo5vE6f4slATgZsFIv3NP4ObE7vAjYnZtMFG5OEh3jyDRZc+hy1DjDF7dg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0.tgz",
+      "integrity": "sha512-20JqtutY6JPXTUnL0ij1uad7Qe1baT46lyolh2sSENDd4sTzKZ4nmAFkeAARDKwmlLjPx6XKRlwRUxwjOy+lUg==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/remote/package.json b/remote/package.json
index f231f6421229..e705537f2e1b 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -32,7 +32,7 @@
     "kerberos": "7.0.0",
     "minimist": "^1.2.8",
     "native-watchdog": "^1.4.1",
-    "node-pty": "1.1.0-beta39",
+    "node-pty": "1.1.0",
     "tas-client-umd": "0.2.0",
     "vscode-oniguruma": "2.0.1",
     "vscode-regexpp": "^3.1.0",

From 8af1bea7da924163d053183d353efab5ecacc426 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:27:15 +0000
Subject: [PATCH 1460/1815] Bump @types/gulp-svgmin from 1.2.1 to 1.2.5

Bumps [@types/gulp-svgmin](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/gulp-svgmin) from 1.2.1 to 1.2.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/gulp-svgmin)

---
updated-dependencies:
- dependency-name: "@types/gulp-svgmin"
  dependency-version: 1.2.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 11 ++++++-----
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c9b638942411..9a2cb0a453b4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -61,7 +61,7 @@
         "@types/cookie": "^0.3.3",
         "@types/debug": "^4.1.5",
         "@types/eslint": "^9.6.1",
-        "@types/gulp-svgmin": "^1.2.1",
+        "@types/gulp-svgmin": "^1.2.5",
         "@types/http-proxy-agent": "^2.0.1",
         "@types/kerberos": "^1.1.2",
         "@types/minimist": "^1.2.1",
@@ -2485,13 +2485,14 @@
       }
     },
     "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==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@types/gulp-svgmin/-/gulp-svgmin-1.2.5.tgz",
+      "integrity": "sha512-Vp5rfl/6xG2H9ipXdJrox+H3ymWKrG0iuyxdYTfJpEizzFsCGLD9VygWZ/UfYvPb3KuS787ZYhD3EveIQgmXuw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
-        "@types/svgo": "^1",
+        "@types/svgo": "1",
         "@types/vinyl": "*"
       }
     },
diff --git a/package.json b/package.json
index 6c1259182b87..e0933e7068a7 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
     "@types/cookie": "^0.3.3",
     "@types/debug": "^4.1.5",
     "@types/eslint": "^9.6.1",
-    "@types/gulp-svgmin": "^1.2.1",
+    "@types/gulp-svgmin": "^1.2.5",
     "@types/http-proxy-agent": "^2.0.1",
     "@types/kerberos": "^1.1.2",
     "@types/minimist": "^1.2.1",

From 120d79500e1598e0ff3f811a72db9f4682e37daf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:27:15 +0000
Subject: [PATCH 1461/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /test/integration/browser

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/integration/browser/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integration/browser/package-lock.json b/test/integration/browser/package-lock.json
index f46652cce140..c479f3b1f73c 100644
--- a/test/integration/browser/package-lock.json
+++ b/test/integration/browser/package-lock.json
@@ -65,9 +65,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 1bd11c5b2ec901a6b3779e0621cc370af0f0e8a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:27:16 +0000
Subject: [PATCH 1462/1815] Bump @types/node from 25.0.3 to 25.0.6 in
 /test/smoke

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/smoke/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/smoke/package-lock.json b/test/smoke/package-lock.json
index 55f92ab9348b..33029518f78a 100644
--- a/test/smoke/package-lock.json
+++ b/test/smoke/package-lock.json
@@ -61,9 +61,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
+      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From f7d2ca6d8b99d1663bed340351f11df407cbe038 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:27:24 +0000
Subject: [PATCH 1463/1815] Bump gulp-replace from 0.5.4 to 1.1.4

Bumps [gulp-replace](https://github.com/lazd/gulp-replace) from 0.5.4 to 1.1.4.
- [Release notes](https://github.com/lazd/gulp-replace/releases)
- [Commits](https://github.com/lazd/gulp-replace/compare/v0.5.4...v1.1.4)

---
updated-dependencies:
- dependency-name: gulp-replace
  dependency-version: 1.1.4
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 80 +++++++++++++++++++++++++----------------------
 package.json      |  2 +-
 2 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c9b638942411..c20da4ae5a5b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -117,7 +117,7 @@
         "gulp-json-editor": "^2.5.0",
         "gulp-plumber": "^1.2.1",
         "gulp-rename": "^1.2.0",
-        "gulp-replace": "^0.5.4",
+        "gulp-replace": "^1.1.4",
         "gulp-sourcemaps": "^3.0.0",
         "gulp-svgmin": "^4.1.0",
         "gulp-untar": "^0.0.8",
@@ -4756,10 +4756,17 @@
       }
     },
     "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
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.3.0.tgz",
+      "integrity": "sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8"
+      },
+      "funding": {
+        "url": "https://bevry.me/fund"
+      }
     },
     "node_modules/bindings": {
       "version": "1.5.0",
@@ -9017,32 +9024,20 @@
       }
     },
     "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==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.4.tgz",
+      "integrity": "sha512-SVSF7ikuWKhpAW4l4wapAqPPSToJoiNKsbDoUnRrSgwZHH7lH8pbPeQj1aOVYQrbZKhfSVBxVW+Py7vtulRktw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "istextorbinary": "1.0.2",
-        "readable-stream": "^2.0.1",
-        "replacestream": "^4.0.0"
+        "@types/node": "*",
+        "@types/vinyl": "^2.0.4",
+        "istextorbinary": "^3.0.0",
+        "replacestream": "^4.0.3",
+        "yargs-parser": ">=5.0.0-security.0"
       },
       "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/gulp-replace/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
+        "node": ">=10"
       }
     },
     "node_modules/gulp-sourcemaps": {
@@ -10553,16 +10548,20 @@
       }
     },
     "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==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-3.3.0.tgz",
+      "integrity": "sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "binaryextensions": "~1.0.0",
-        "textextensions": "~1.0.0"
+        "binaryextensions": "^2.2.0",
+        "textextensions": "^3.2.0"
       },
       "engines": {
-        "node": ">=0.4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://bevry.me/fund"
       }
     },
     "node_modules/jackspeak": {
@@ -15780,10 +15779,17 @@
       "dev": true
     },
     "node_modules/textextensions": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-1.0.2.tgz",
-      "integrity": "sha1-ZUhjk+4fK7A5pgy7oFsLaL2VAdI= sha512-jm9KjEWiDmtGLBrTqXEduGzlYTTlPaoDKdq5YRQhD0rYjo61ZNTYKZ/x5J4ajPSBH9wIYY5qm9GNG5otIKjtOA==",
-      "dev": true
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-3.3.0.tgz",
+      "integrity": "sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://bevry.me/fund"
+      }
     },
     "node_modules/through": {
       "version": "2.3.8",
diff --git a/package.json b/package.json
index 6c1259182b87..16940ff28f53 100644
--- a/package.json
+++ b/package.json
@@ -176,7 +176,7 @@
     "gulp-json-editor": "^2.5.0",
     "gulp-plumber": "^1.2.1",
     "gulp-rename": "^1.2.0",
-    "gulp-replace": "^0.5.4",
+    "gulp-replace": "^1.1.4",
     "gulp-sourcemaps": "^3.0.0",
     "gulp-svgmin": "^4.1.0",
     "gulp-untar": "^0.0.8",

From 8e33bd6419319e01e04f5083fb440bd7a9a17490 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 18:10:58 +0000
Subject: [PATCH 1464/1815] Bump sysinfo from 0.29.11 to 0.37.2 in /cli

Bumps [sysinfo](https://github.com/GuillaumeGomez/sysinfo) from 0.29.11 to 0.37.2.
- [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/main/CHANGELOG.md)
- [Commits](https://github.com/GuillaumeGomez/sysinfo/compare/v0.29.11...v0.37.2)

---
updated-dependencies:
- dependency-name: sysinfo
  dependency-version: 0.37.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 18 ++----------------
 cli/Cargo.toml |  2 +-
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index c23c6c1b9051..38e067b369d3 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -1733,15 +1733,6 @@ dependencies = [
  "memoffset 0.7.1",
 ]
 
-[[package]]
-name = "ntapi"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "num"
 version = "0.4.3"
@@ -2834,16 +2825,11 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.29.11"
+version = "0.37.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666"
+checksum = "16607d5caffd1c07ce073528f9ed972d88db15dd44023fa57142963be3feb11f"
 dependencies = [
- "cfg-if",
- "core-foundation-sys",
  "libc",
- "ntapi",
- "once_cell",
- "winapi",
 ]
 
 [[package]]
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 961472a59baf..75ead3f00e40 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -22,7 +22,7 @@ flate2 = { version = "1.1.5", default-features = false, features = ["zlib"] }
 zip = { version = "0.6.6", default-features = false, features = ["time", "deflate-zlib"] }
 regex = "1.12.2"
 lazy_static = "1.5.0"
-sysinfo = { version = "0.29.0", default-features = false }
+sysinfo = { version = "0.37.2", default-features = false }
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 rmp-serde = "1.3.1"

From 4538e789d3e026beac801b4c22e84201ff00fbc2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 18:14:42 +0000
Subject: [PATCH 1465/1815] Bump @vscode/iconv-lite-umd from 0.7.0 to 0.7.1 in
 /build

Bumps [@vscode/iconv-lite-umd](https://github.com/Microsoft/vscode-iconv-lite-umd) from 0.7.0 to 0.7.1.
- [Release notes](https://github.com/Microsoft/vscode-iconv-lite-umd/releases)
- [Commits](https://github.com/Microsoft/vscode-iconv-lite-umd/commits/v0.7.1)

---
updated-dependencies:
- dependency-name: "@vscode/iconv-lite-umd"
  dependency-version: 0.7.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 11 ++++++-----
 build/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 704979db240d..60358a429992 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -41,7 +41,7 @@
         "@types/through2": "^2.0.41",
         "@types/workerpool": "^6.4.0",
         "@types/xml2js": "0.4.14",
-        "@vscode/iconv-lite-umd": "0.7.0",
+        "@vscode/iconv-lite-umd": "0.7.1",
         "@vscode/ripgrep": "^1.15.10",
         "@vscode/vsce": "3.7.1",
         "byline": "^5.0.0",
@@ -1870,10 +1870,11 @@
       }
     },
     "node_modules/@vscode/iconv-lite-umd": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
-      "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==",
-      "dev": true
+      "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==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@vscode/ripgrep": {
       "version": "1.15.10",
diff --git a/build/package.json b/build/package.json
index 9fd17fdcf8b2..4ed0a1d5529b 100644
--- a/build/package.json
+++ b/build/package.json
@@ -35,7 +35,7 @@
     "@types/through2": "^2.0.41",
     "@types/workerpool": "^6.4.0",
     "@types/xml2js": "0.4.14",
-    "@vscode/iconv-lite-umd": "0.7.0",
+    "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/ripgrep": "^1.15.10",
     "@vscode/vsce": "3.7.1",
     "byline": "^5.0.0",

From 72c6bd43e88a9aa34b0d335e8250aa16195a5399 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 18:29:33 +0000
Subject: [PATCH 1466/1815] Bump opentelemetry from 0.19.0 to 0.20.0 in /cli

Bumps [opentelemetry](https://github.com/open-telemetry/opentelemetry-rust) from 0.19.0 to 0.20.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-rust/blob/main/docs/release_0.30.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/opentelemetry-0.19.0...opentelemetry-0.20.0)

---
updated-dependencies:
- dependency-name: opentelemetry
  dependency-version: 0.20.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 23 +++++++++++++++++------
 cli/Cargo.toml |  2 +-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 48f965cc9489..c5d47095df93 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -1900,9 +1900,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4b8347cc26099d3aeee044065ecc3ae11469796b4d65d065a23a584ed92a6f"
+checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54"
 dependencies = [
  "opentelemetry_api",
  "opentelemetry_sdk",
@@ -1910,13 +1910,14 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry_api"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed41783a5bf567688eb38372f2b7a8530f5a607a4b49d38dd7573236c23ca7e2"
+checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b"
 dependencies = [
  "futures-channel",
  "futures-util",
  "indexmap 1.9.3",
+ "js-sys",
  "once_cell",
  "pin-project-lite",
  "thiserror",
@@ -1925,9 +1926,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry_sdk"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b3a2a91fdbfdd4d212c0dcc2ab540de2c2bcbbd90be17de7a7daf8822d010c1"
+checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026"
 dependencies = [
  "async-trait",
  "crossbeam-channel",
@@ -1936,6 +1937,7 @@ dependencies = [
  "futures-util",
  "once_cell",
  "opentelemetry_api",
+ "ordered-float",
  "percent-encoding",
  "rand 0.8.5",
  "thiserror",
@@ -1949,6 +1951,15 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
+[[package]]
+name = "ordered-float"
+version = "3.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "ordered-stream"
 version = "0.2.0"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 7fd3e3119aa1..4ecde253ec45 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -29,7 +29,7 @@ rmp-serde = "1.3.1"
 uuid = { version = "1.16", features = ["serde", "v4"] }
 dirs = "5.0.1"
 rand = "0.9.2"
-opentelemetry = { version = "0.19.0", features = ["rt-tokio"] }
+opentelemetry = { version = "0.20.0", features = ["rt-tokio"] }
 serde_bytes = "0.11.19"
 chrono = { version = "0.4.42", features = ["serde", "std", "clock"], default-features = false }
 gethostname = "1.1.0"

From e5ae9de1d95e3a88adfd0334ef41beb29b67c37c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 18:34:46 +0000
Subject: [PATCH 1467/1815] Bump tokio from 1.43.1 to 1.49.0 in /cli

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.43.1 to 1.49.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.43.1...tokio-1.49.0)

---
updated-dependencies:
- dependency-name: tokio
  dependency-version: 1.49.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 161 ++++++++++++++++++++++++++++---------------------
 cli/Cargo.toml |   2 +-
 2 files changed, 93 insertions(+), 70 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index e9112c0391bb..1b5836f528fa 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -2,21 +2,6 @@
 # It is not intended for manual editing.
 version = 4
 
-[[package]]
-name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
 [[package]]
 name = "adler2"
 version = "2.0.1"
@@ -246,21 +231,6 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
-[[package]]
-name = "backtrace"
-version = "0.3.71"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide 0.7.3",
- "object",
- "rustc-demangle",
-]
-
 [[package]]
 name = "base64"
 version = "0.21.7"
@@ -840,7 +810,7 @@ checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
 dependencies = [
  "crc32fast",
  "libz-sys",
- "miniz_oxide 0.8.9",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -1041,12 +1011,6 @@ dependencies = [
  "wasip2",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
-
 [[package]]
 name = "h2"
 version = "0.3.26"
@@ -1673,15 +1637,6 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -1819,15 +1774,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
-[[package]]
-name = "object"
-version = "0.32.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.19.0"
@@ -2475,12 +2421,6 @@ dependencies = [
  "yasna",
 ]
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
 [[package]]
 name = "rustix"
 version = "0.37.27"
@@ -2766,6 +2706,16 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -2939,28 +2889,27 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.43.1"
+version = "1.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "492a604e2fd7f814268a378409e6c92b5525d747d10db9a229723f55a417958c"
+checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
 dependencies = [
- "backtrace",
  "bytes",
  "libc",
  "mio",
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.7",
+ "socket2 0.6.1",
  "tokio-macros",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3408,6 +3357,15 @@ dependencies = [
  "windows-targets 0.52.5",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.5",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.61.2"
@@ -3441,13 +3399,30 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.5",
  "windows_aarch64_msvc 0.52.5",
  "windows_i686_gnu 0.52.5",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.5",
  "windows_i686_msvc 0.52.5",
  "windows_x86_64_gnu 0.52.5",
  "windows_x86_64_gnullvm 0.52.5",
  "windows_x86_64_msvc 0.52.5",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -3460,6 +3435,12 @@ version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -3472,6 +3453,12 @@ version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -3484,12 +3471,24 @@ version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -3502,6 +3501,12 @@ version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -3514,6 +3519,12 @@ version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -3526,6 +3537,12 @@ version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -3538,6 +3555,12 @@ version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
 [[package]]
 name = "winnow"
 version = "0.5.40"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 68a0971c79b9..b4728cad8cb3 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -16,7 +16,7 @@ futures = "0.3.31"
 clap = { version = "4.3.0", features = ["derive", "env"] }
 open = "5.3.3"
 reqwest = { version = "0.12.5", default-features = false, features = ["json", "stream", "native-tls"] }
-tokio = { version = "1.43.1", features = ["full"] }
+tokio = { version = "1.49.0", features = ["full"] }
 tokio-util = { version = "0.7.8", features = ["compat", "codec"] }
 flate2 = { version = "1.1.5", default-features = false, features = ["zlib"] }
 zip = { version = "0.6.6", default-features = false, features = ["time", "deflate-zlib"] }

From a5c55231f043b56bf38687a03d4bb4e6f3340c60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 19:09:18 +0000
Subject: [PATCH 1468/1815] Bump @xterm/addon-search in /remote

Bumps [@xterm/addon-search](https://github.com/xtermjs/xterm.js) from 0.17.0-beta.89 to 0.17.0-beta.101.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-search"
  dependency-version: 0.17.0-beta.101
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 2c2e64068e7b..7e0803571d8e 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -24,7 +24,7 @@
         "@xterm/addon-image": "^0.10.0-beta.76",
         "@xterm/addon-ligatures": "^0.10.0-beta.140",
         "@xterm/addon-progress": "^0.3.0-beta.101",
-        "@xterm/addon-search": "^0.17.0-beta.89",
+        "@xterm/addon-search": "^0.17.0-beta.101",
         "@xterm/addon-serialize": "^0.14.0-beta.140",
         "@xterm/addon-unicode11": "^0.10.0-beta.76",
         "@xterm/addon-webgl": "^0.19.0-beta.98",
@@ -656,12 +656,12 @@
       }
     },
     "node_modules/@xterm/addon-search": {
-      "version": "0.17.0-beta.89",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.89.tgz",
-      "integrity": "sha512-LvGWGNeHetQ7Gqr2uNANJ4sflWLiUxAIqEMdLTFr/zNBOT2SdJveK3hdhhOvMeYW6I0GHcFEeqEh5yBVgBchOA==",
+      "version": "0.17.0-beta.101",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.101.tgz",
+      "integrity": "sha512-Y1yWv2baZdqP6AH/aKmMXSs6VNr7FGrpOe+DKNKq77H+QZbUoUXfgI/qKZpqlByl7FGuo8OT9g0AqH3zykkkUw==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.89"
+        "@xterm/xterm": "^6.1.0-beta.101"
       }
     },
     "node_modules/@xterm/addon-serialize": {
diff --git a/remote/package.json b/remote/package.json
index ca60b361b421..dad047827a63 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -19,7 +19,7 @@
     "@xterm/addon-image": "^0.10.0-beta.76",
     "@xterm/addon-ligatures": "^0.10.0-beta.140",
     "@xterm/addon-progress": "^0.3.0-beta.101",
-    "@xterm/addon-search": "^0.17.0-beta.89",
+    "@xterm/addon-search": "^0.17.0-beta.101",
     "@xterm/addon-serialize": "^0.14.0-beta.140",
     "@xterm/addon-unicode11": "^0.10.0-beta.76",
     "@xterm/addon-webgl": "^0.19.0-beta.98",

From 6619668b56d72cc085af76b62e87d703c9463149 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 19:09:22 +0000
Subject: [PATCH 1469/1815] Bump @xterm/addon-unicode11 in /remote/web

Bumps [@xterm/addon-unicode11](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.89 to 0.10.0-beta.101.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-unicode11"
  dependency-version: 0.10.0-beta.101
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 62cd4c4252b8..b2aeb5c0daaf 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -19,7 +19,7 @@
 				"@xterm/addon-progress": "^0.3.0-beta.100",
 				"@xterm/addon-search": "^0.17.0-beta.77",
 				"@xterm/addon-serialize": "^0.15.0-beta.100",
-				"@xterm/addon-unicode11": "^0.10.0-beta.89",
+				"@xterm/addon-unicode11": "^0.10.0-beta.101",
 				"@xterm/addon-webgl": "^0.20.0-beta.100",
 				"@xterm/xterm": "^6.0.0",
 				"jschardet": "3.1.4",
@@ -188,12 +188,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-unicode11": {
-			"version": "0.10.0-beta.89",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.89.tgz",
-			"integrity": "sha512-P/XnHwrQ0faKGNpiLxfWPqAB03SfZ3R+HfzGjMBeQu+O27kwBUrRXRE1DasQsfUL/BU0O/nEJTLF7HoKYd0KZg==",
+			"version": "0.10.0-beta.101",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.101.tgz",
+			"integrity": "sha512-WM9Rs8ZBQ1nY5nb4OxXsOLVIZ2DQvGmtSIKkUueDB9mSQOg05mz2dHbEdW63MrX8sMQAbEx+o/kyxvl7oFDS/A==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.89"
+				"@xterm/xterm": "^6.1.0-beta.101"
 			}
 		},
 		"node_modules/@xterm/addon-webgl": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 92d155787236..5760e8d3a951 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -14,7 +14,7 @@
 		"@xterm/addon-progress": "^0.3.0-beta.100",
 		"@xterm/addon-search": "^0.17.0-beta.77",
 		"@xterm/addon-serialize": "^0.15.0-beta.100",
-		"@xterm/addon-unicode11": "^0.10.0-beta.89",
+		"@xterm/addon-unicode11": "^0.10.0-beta.101",
 		"@xterm/addon-webgl": "^0.20.0-beta.100",
 		"@xterm/xterm": "^6.0.0",
 		"jschardet": "3.1.4",

From 3f8a020aa1192a9b436f24da0c4e92eaeb035bca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 19:09:25 +0000
Subject: [PATCH 1470/1815] Bump vscode-textmate from 9.3.0 to 9.3.1 in /remote

Bumps [vscode-textmate](https://github.com/microsoft/vscode-textmate) from 9.3.0 to 9.3.1.
- [Release notes](https://github.com/microsoft/vscode-textmate/releases)
- [Commits](https://github.com/microsoft/vscode-textmate/compare/v9.3.0...v9.3.1)

---
updated-dependencies:
- dependency-name: vscode-textmate
  dependency-version: 9.3.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 2c2e64068e7b..f39c4b7ef601 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -41,7 +41,7 @@
         "tas-client-umd": "0.2.0",
         "vscode-oniguruma": "2.0.1",
         "vscode-regexpp": "^3.1.0",
-        "vscode-textmate": "9.3.0",
+        "vscode-textmate": "9.3.1",
         "yauzl": "^3.0.0",
         "yazl": "^2.4.3"
       }
@@ -1594,9 +1594,9 @@
       }
     },
     "node_modules/vscode-textmate": {
-      "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.3.0.tgz",
-      "integrity": "sha512-zHiZZOdb9xqj5/X1C4a29sbgT2HngdWxPLSl3PyHRQF+5visI4uNM020OHiLJjsMxUssyk/pGVAg/9LCIobrVg==",
+      "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.3.1.tgz",
+      "integrity": "sha512-U19nFkCraZF9/bkQKQYsb9mRqM9NwpToQQFl40nGiioZTH9gRtdtCHwp48cubayVfreX3ivnoxgxQgNwrTVmQg==",
       "license": "MIT"
     },
     "node_modules/wrappy": {
diff --git a/remote/package.json b/remote/package.json
index ca60b361b421..b44fb996aa20 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -36,7 +36,7 @@
     "tas-client-umd": "0.2.0",
     "vscode-oniguruma": "2.0.1",
     "vscode-regexpp": "^3.1.0",
-    "vscode-textmate": "9.3.0",
+    "vscode-textmate": "9.3.1",
     "yauzl": "^3.0.0",
     "yazl": "^2.4.3"
   },

From a82a34e460fd3c9e5c88a5100564ad0512bd4e1a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 19:39:58 +0000
Subject: [PATCH 1471/1815] Bump @xterm/addon-unicode11 in /remote

Bumps [@xterm/addon-unicode11](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.76 to 0.10.0-beta.101.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-unicode11"
  dependency-version: 0.10.0-beta.101
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 344b4ca661b6..759f49e639b0 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -26,7 +26,7 @@
         "@xterm/addon-progress": "^0.3.0-beta.101",
         "@xterm/addon-search": "^0.17.0-beta.101",
         "@xterm/addon-serialize": "^0.14.0-beta.140",
-        "@xterm/addon-unicode11": "^0.10.0-beta.76",
+        "@xterm/addon-unicode11": "^0.10.0-beta.101",
         "@xterm/addon-webgl": "^0.19.0-beta.98",
         "@xterm/headless": "^5.6.0-beta.140",
         "@xterm/xterm": "^5.6.0-beta.98",
@@ -674,12 +674,12 @@
       }
     },
     "node_modules/@xterm/addon-unicode11": {
-      "version": "0.10.0-beta.76",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.76.tgz",
-      "integrity": "sha512-zn7J+1y27d9evbFNrVBQGpf9eEUeknJ9mlf1cRPXKdueRd+SatQa1SK+/3L7yDAhBk1PUuWXiLI5IAEWa8p2tA==",
+      "version": "0.10.0-beta.101",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.101.tgz",
+      "integrity": "sha512-WM9Rs8ZBQ1nY5nb4OxXsOLVIZ2DQvGmtSIKkUueDB9mSQOg05mz2dHbEdW63MrX8sMQAbEx+o/kyxvl7oFDS/A==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.76"
+        "@xterm/xterm": "^6.1.0-beta.101"
       }
     },
     "node_modules/@xterm/addon-webgl": {
diff --git a/remote/package.json b/remote/package.json
index 2ef5e4ac1a33..c4ec21f02555 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -21,7 +21,7 @@
     "@xterm/addon-progress": "^0.3.0-beta.101",
     "@xterm/addon-search": "^0.17.0-beta.101",
     "@xterm/addon-serialize": "^0.14.0-beta.140",
-    "@xterm/addon-unicode11": "^0.10.0-beta.76",
+    "@xterm/addon-unicode11": "^0.10.0-beta.101",
     "@xterm/addon-webgl": "^0.19.0-beta.98",
     "@xterm/headless": "^5.6.0-beta.140",
     "@xterm/xterm": "^5.6.0-beta.98",

From 2d9f12681922037dfd1335eeaf4148f39fc74e46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 19:40:23 +0000
Subject: [PATCH 1472/1815] Bump @xterm/addon-progress in /remote/web

Bumps [@xterm/addon-progress](https://github.com/xtermjs/xterm.js) from 0.3.0-beta.100 to 0.3.0-beta.101.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-progress"
  dependency-version: 0.3.0-beta.101
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index b2aeb5c0daaf..406a915b9580 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -16,7 +16,7 @@
 				"@xterm/addon-clipboard": "^0.3.0-beta.89",
 				"@xterm/addon-image": "^0.10.0-beta.101",
 				"@xterm/addon-ligatures": "^0.11.0-beta.76",
-				"@xterm/addon-progress": "^0.3.0-beta.100",
+				"@xterm/addon-progress": "^0.3.0-beta.101",
 				"@xterm/addon-search": "^0.17.0-beta.77",
 				"@xterm/addon-serialize": "^0.15.0-beta.100",
 				"@xterm/addon-unicode11": "^0.10.0-beta.101",
@@ -161,12 +161,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-progress": {
-			"version": "0.3.0-beta.100",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.100.tgz",
-			"integrity": "sha512-mbZCJfkaRIOnBUwdOB7YLBHBSx8w8//7lLVT1T+9kJy+B4SazqMCXdfNKTI77S36C0L72tH303u9Umqigkex0g==",
+			"version": "0.3.0-beta.101",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.101.tgz",
+			"integrity": "sha512-QsJLvH3tc9KywOXb9O/mxkPoYmL2cCvKUa/YckriuZmEh5WMw+3cgNa+BC0aA73htdWE8UMUBvigE786KErajA==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.100"
+				"@xterm/xterm": "^6.1.0-beta.101"
 			}
 		},
 		"node_modules/@xterm/addon-search": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 5760e8d3a951..db81dbddbbc7 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -11,7 +11,7 @@
 		"@xterm/addon-clipboard": "^0.3.0-beta.89",
 		"@xterm/addon-image": "^0.10.0-beta.101",
 		"@xterm/addon-ligatures": "^0.11.0-beta.76",
-		"@xterm/addon-progress": "^0.3.0-beta.100",
+		"@xterm/addon-progress": "^0.3.0-beta.101",
 		"@xterm/addon-search": "^0.17.0-beta.77",
 		"@xterm/addon-serialize": "^0.15.0-beta.100",
 		"@xterm/addon-unicode11": "^0.10.0-beta.101",

From b4bd86ef47ce1a1a3e0cfea6c98e3ecc4dca7929 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 19:52:17 +0000
Subject: [PATCH 1473/1815] Bump @xterm/addon-search in /remote/web

Bumps [@xterm/addon-search](https://github.com/xtermjs/xterm.js) from 0.17.0-beta.77 to 0.17.0-beta.101.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-search"
  dependency-version: 0.17.0-beta.101
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 406a915b9580..25522fb42760 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -17,7 +17,7 @@
 				"@xterm/addon-image": "^0.10.0-beta.101",
 				"@xterm/addon-ligatures": "^0.11.0-beta.76",
 				"@xterm/addon-progress": "^0.3.0-beta.101",
-				"@xterm/addon-search": "^0.17.0-beta.77",
+				"@xterm/addon-search": "^0.17.0-beta.101",
 				"@xterm/addon-serialize": "^0.15.0-beta.100",
 				"@xterm/addon-unicode11": "^0.10.0-beta.101",
 				"@xterm/addon-webgl": "^0.20.0-beta.100",
@@ -170,12 +170,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-search": {
-			"version": "0.17.0-beta.77",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.77.tgz",
-			"integrity": "sha512-GZ/B/ox/JwQTkuak6lba3JvqvEW1GaJ1p/e+WdYlyC343H7rxkls1VvA+y4KajFw+8WWYSIJn6KtvfNH+IKLww==",
+			"version": "0.17.0-beta.101",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.101.tgz",
+			"integrity": "sha512-Y1yWv2baZdqP6AH/aKmMXSs6VNr7FGrpOe+DKNKq77H+QZbUoUXfgI/qKZpqlByl7FGuo8OT9g0AqH3zykkkUw==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.77"
+				"@xterm/xterm": "^6.1.0-beta.101"
 			}
 		},
 		"node_modules/@xterm/addon-serialize": {
diff --git a/remote/web/package.json b/remote/web/package.json
index db81dbddbbc7..1d56955be76a 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -12,7 +12,7 @@
 		"@xterm/addon-image": "^0.10.0-beta.101",
 		"@xterm/addon-ligatures": "^0.11.0-beta.76",
 		"@xterm/addon-progress": "^0.3.0-beta.101",
-		"@xterm/addon-search": "^0.17.0-beta.77",
+		"@xterm/addon-search": "^0.17.0-beta.101",
 		"@xterm/addon-serialize": "^0.15.0-beta.100",
 		"@xterm/addon-unicode11": "^0.10.0-beta.101",
 		"@xterm/addon-webgl": "^0.20.0-beta.100",

From 3ebc75bf322ef868c90e70a159fa5435f80faa82 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:22:24 +0000
Subject: [PATCH 1474/1815] Bump @types/rimraf from 2.0.4 to 4.0.5 in /build

Bumps [@types/rimraf](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/rimraf) from 2.0.4 to 4.0.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/rimraf)

---
updated-dependencies:
- dependency-name: "@types/rimraf"
  dependency-version: 4.0.5
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 67 +++++++++++++++++++++++++++++++++++++----
 build/package.json      |  2 +-
 2 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 1dac2cc7aa21..daf380d086fc 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -36,7 +36,7 @@
         "@types/mocha": "^10.0.10",
         "@types/node": "25.x",
         "@types/pump": "^1.0.1",
-        "@types/rimraf": "^2.0.4",
+        "@types/rimraf": "^4.0.5",
         "@types/through": "^0.0.33",
         "@types/through2": "^2.0.41",
         "@types/workerpool": "^6.4.0",
@@ -1751,13 +1751,14 @@
       }
     },
     "node_modules/@types/rimraf": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.4.tgz",
-      "integrity": "sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-4.0.5.tgz",
+      "integrity": "sha512-DTCZoIQotB2SUJnYgrEx43cQIUYOlNZz0AZPbKU4PSLYTUdML5Gox0++z4F9kQocxStrCmRNhi4x5x/UlwtKUA==",
+      "deprecated": "This is a stub types definition. rimraf provides its own type definitions, so you do not need this installed.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/glob": "*",
-        "@types/node": "*"
+        "rimraf": "*"
       }
     },
     "node_modules/@types/sarif": {
@@ -5689,6 +5690,60 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/rimraf": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.2.tgz",
+      "integrity": "sha512-cFCkPslJv7BAXJsYlK1dZsbP8/ZNLkCAQ0bi1hf5EKX2QHegmDFEFA6QhuYJlk7UDdc+02JjO80YSOrWPpw06g==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "glob": "^13.0.0",
+        "package-json-from-dist": "^1.0.1"
+      },
+      "bin": {
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rimraf/node_modules/glob": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.0.tgz",
+      "integrity": "sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "minimatch": "^10.1.1",
+        "minipass": "^7.1.2",
+        "path-scurry": "^2.0.0"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rimraf/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/roarr": {
       "version": "2.15.4",
       "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
diff --git a/build/package.json b/build/package.json
index a0d36895884a..782ba8372e43 100644
--- a/build/package.json
+++ b/build/package.json
@@ -30,7 +30,7 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "25.x",
     "@types/pump": "^1.0.1",
-    "@types/rimraf": "^2.0.4",
+    "@types/rimraf": "^4.0.5",
     "@types/through": "^0.0.33",
     "@types/through2": "^2.0.41",
     "@types/workerpool": "^6.4.0",

From 16c537f84e8ede861dd25f3976322f75cd7bbd9e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:22:25 +0000
Subject: [PATCH 1475/1815] Bump @types/node in
 /extensions/configuration-editing

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/configuration-editing/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/configuration-editing/package-lock.json b/extensions/configuration-editing/package-lock.json
index 52f48084adeb..c878869f47f3 100644
--- a/extensions/configuration-editing/package-lock.json
+++ b/extensions/configuration-editing/package-lock.json
@@ -175,9 +175,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From adde0c305a86c87285b6e9fe4d2d8e8094ee8ef7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:22:26 +0000
Subject: [PATCH 1476/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /extensions/github

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/github/package-lock.json b/extensions/github/package-lock.json
index e4cc42ea34e4..50c32a2c6e87 100644
--- a/extensions/github/package-lock.json
+++ b/extensions/github/package-lock.json
@@ -311,9 +311,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 8c4dd8359b1732bb368d00e78971c2663569d81a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:22:26 +0000
Subject: [PATCH 1477/1815] Bump @types/node in
 /.vscode/extensions/vscode-selfhost-test-provider

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../vscode-selfhost-test-provider/package-lock.json         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
index 6066448e23e7..9a32fe514d05 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
@@ -58,9 +58,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From bd2df61896a0cf5351c53243b6fe4f8cb064d192 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:22:27 +0000
Subject: [PATCH 1478/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /extensions/debug-server-ready

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/debug-server-ready/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/debug-server-ready/package-lock.json b/extensions/debug-server-ready/package-lock.json
index 96063121ceff..a3c151cb0f2a 100644
--- a/extensions/debug-server-ready/package-lock.json
+++ b/extensions/debug-server-ready/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 0a42d73908e8a572f03a3602606cfb8f2744dbd1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:22:27 +0000
Subject: [PATCH 1479/1815] Bump pin-project from 1.1.5 to 1.1.10 in /cli

Bumps [pin-project](https://github.com/taiki-e/pin-project) from 1.1.5 to 1.1.10.
- [Release notes](https://github.com/taiki-e/pin-project/releases)
- [Changelog](https://github.com/taiki-e/pin-project/blob/main/CHANGELOG.md)
- [Commits](https://github.com/taiki-e/pin-project/compare/v1.1.5...v1.1.10)

---
updated-dependencies:
- dependency-name: pin-project
  dependency-version: 1.1.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 8 ++++----
 cli/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 1b5836f528fa..62a6cf2d9dc0 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -1966,18 +1966,18 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index b4728cad8cb3..3311e7522a0e 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -50,7 +50,7 @@ base64 = "0.22.1"
 shell-escape = "0.1.5"
 thiserror = "1.0.40"
 cfg-if = "1.0.4"
-pin-project = "1.1.0"
+pin-project = "1.1.10"
 console = "0.16.2"
 bytes = "1.11.0"
 tar = "0.4.38"

From 94061f3e95202c14fa9357b42d198c7ffea6f287 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:22:28 +0000
Subject: [PATCH 1480/1815] Bump @types/node in
 /extensions/css-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/css-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/css-language-features/server/package-lock.json b/extensions/css-language-features/server/package-lock.json
index 984e4d07d8ba..a043ebb4799a 100644
--- a/extensions/css-language-features/server/package-lock.json
+++ b/extensions/css-language-features/server/package-lock.json
@@ -30,9 +30,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From c2250c3cef099ab60b3b4db66a125c3fe2dc391b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:22:35 +0000
Subject: [PATCH 1481/1815] Bump @types/byline from 4.2.32 to 4.2.36 in /build

Bumps [@types/byline](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/byline) from 4.2.32 to 4.2.36.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/byline)

---
updated-dependencies:
- dependency-name: "@types/byline"
  dependency-version: 4.2.36
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 9 +++++----
 build/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 1dac2cc7aa21..0a3be0c173dc 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -16,7 +16,7 @@
         "@azure/storage-blob": "^12.25.0",
         "@electron/get": "^2.0.0",
         "@types/ansi-colors": "^3.2.0",
-        "@types/byline": "^4.2.32",
+        "@types/byline": "^4.2.36",
         "@types/debounce": "^1.2.4",
         "@types/debug": "^4.1.12",
         "@types/fancy-log": "^2.0.2",
@@ -1447,10 +1447,11 @@
       "dev": true
     },
     "node_modules/@types/byline": {
-      "version": "4.2.32",
-      "resolved": "https://registry.npmjs.org/@types/byline/-/byline-4.2.32.tgz",
-      "integrity": "sha512-qtlm/J6XOO9p+Ep/ZB5+mCFEDhzWDDHWU4a1eReN7lkPZXW9rkloq2jcAhvKKmlO5tL2GSvKROb+PTsNVhBiyQ==",
+      "version": "4.2.36",
+      "resolved": "https://registry.npmjs.org/@types/byline/-/byline-4.2.36.tgz",
+      "integrity": "sha512-dO55KDSaOSE+3T8TwP66mzn0u/PM/aSedVMr1tby7WBNjfLIuS6IbYXi1mlau49sVSVB+gXKJscWE0JO3tlXDw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
diff --git a/build/package.json b/build/package.json
index a0d36895884a..447ed5b1546b 100644
--- a/build/package.json
+++ b/build/package.json
@@ -10,7 +10,7 @@
     "@azure/storage-blob": "^12.25.0",
     "@electron/get": "^2.0.0",
     "@types/ansi-colors": "^3.2.0",
-    "@types/byline": "^4.2.32",
+    "@types/byline": "^4.2.36",
     "@types/debounce": "^1.2.4",
     "@types/debug": "^4.1.12",
     "@types/fancy-log": "^2.0.2",

From e6371de4c7d5f3c6b4f49b7eb499d06d6e69170c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:22:42 +0000
Subject: [PATCH 1482/1815] Bump tree-sitter-typescript from 0.20.5 to 0.23.2
 in /build

Bumps [tree-sitter-typescript](https://github.com/tree-sitter/tree-sitter-typescript) from 0.20.5 to 0.23.2.
- [Release notes](https://github.com/tree-sitter/tree-sitter-typescript/releases)
- [Commits](https://github.com/tree-sitter/tree-sitter-typescript/compare/v0.20.5...v0.23.2)

---
updated-dependencies:
- dependency-name: tree-sitter-typescript
  dependency-version: 0.23.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 117 +++++++++++++++++++++++++++++-----------
 build/package.json      |   2 +-
 2 files changed, 88 insertions(+), 31 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 1dac2cc7aa21..5fe34a497770 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -8,6 +8,9 @@
       "name": "code-oss-dev-build",
       "version": "1.0.0",
       "license": "MIT",
+      "dependencies": {
+        "tree-sitter-typescript": "0.23.2"
+      },
       "devDependencies": {
         "@azure/core-auth": "^1.10.1",
         "@azure/cosmos": "^4",
@@ -63,7 +66,7 @@
         "yauzl": "^3.2.0"
       },
       "optionalDependencies": {
-        "tree-sitter-typescript": "^0.20.5",
+        "tree-sitter-typescript": "^0.23.2",
         "vscode-gulp-watch": "^5.0.3"
       }
     },
@@ -2498,7 +2501,7 @@
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "devOptional": true,
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -2543,6 +2546,7 @@
       "version": "4.1.0",
       "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",
@@ -2603,6 +2607,7 @@
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
       "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -2820,6 +2825,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true,
       "optional": true
     },
     "node_modules/clone": {
@@ -3024,7 +3030,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
       "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "mimic-response": "^3.1.0"
       },
@@ -3039,7 +3045,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
       "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -3051,6 +3057,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "dev": true,
       "optional": true,
       "engines": {
         "node": ">=4.0.0"
@@ -3135,6 +3142,7 @@
       "version": "2.0.1",
       "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"
@@ -3321,7 +3329,7 @@
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "once": "^1.4.0"
       }
@@ -3489,6 +3497,7 @@
       "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==",
+      "dev": true,
       "optional": true,
       "engines": {
         "node": ">=6"
@@ -3733,6 +3742,7 @@
       "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==",
+      "dev": true,
       "optional": true
     },
     "node_modules/fs-extra": {
@@ -3836,6 +3846,7 @@
       "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==",
+      "dev": true,
       "optional": true
     },
     "node_modules/glob": {
@@ -4207,6 +4218,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -4267,6 +4279,7 @@
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true,
       "optional": true
     },
     "node_modules/is-binary-path": {
@@ -4694,7 +4707,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -4857,7 +4870,7 @@
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
       "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "devOptional": true
+      "dev": true
     },
     "node_modules/minipass": {
       "version": "7.1.2",
@@ -4873,6 +4886,7 @@
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "dev": true,
       "optional": true
     },
     "node_modules/ms": {
@@ -4888,22 +4902,18 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
-    "node_modules/nan": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz",
-      "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==",
-      "optional": true
-    },
     "node_modules/napi-build-utils": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
       "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
+      "dev": true,
       "optional": true
     },
     "node_modules/node-abi": {
       "version": "3.30.0",
       "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.30.0.tgz",
       "integrity": "sha512-qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw==",
+      "dev": true,
       "optional": true,
       "dependencies": {
         "semver": "^7.3.5"
@@ -4916,6 +4926,7 @@
       "version": "7.5.4",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
       "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
       "optional": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -4938,7 +4949,7 @@
       "version": "4.8.4",
       "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
       "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "bin": {
         "node-gyp-build": "bin.js",
@@ -5115,7 +5126,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "wrappy": "1"
       }
@@ -5403,6 +5414,7 @@
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
       "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
+      "dev": true,
       "optional": true,
       "dependencies": {
         "detect-libc": "^2.0.0",
@@ -5458,7 +5470,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -5527,6 +5539,7 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "dev": true,
       "optional": true,
       "dependencies": {
         "deep-extend": "^0.6.0",
@@ -5933,6 +5946,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
       "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -5953,6 +5967,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz",
       "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -6284,6 +6299,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo= sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+      "dev": true,
       "optional": true,
       "engines": {
         "node": ">=0.10.0"
@@ -6414,6 +6430,7 @@
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
       "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -6427,6 +6444,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
       "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dev": true,
       "optional": true,
       "dependencies": {
         "bl": "^4.0.3",
@@ -6579,27 +6597,65 @@
         "node-gyp-build": "^4.8.4"
       }
     },
-    "node_modules/tree-sitter-typescript": {
-      "version": "0.20.5",
-      "resolved": "https://registry.npmjs.org/tree-sitter-typescript/-/tree-sitter-typescript-0.20.5.tgz",
-      "integrity": "sha512-RzK/Pc6k4GiXvInIBlo8ZggekP6rODfW2P6KHFCTSUHENsw6ynh+iacFhfkJRa4MT8EIN2WHygFJ7076/+eHKg==",
+    "node_modules/tree-sitter-javascript": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/tree-sitter-javascript/-/tree-sitter-javascript-0.23.1.tgz",
+      "integrity": "sha512-/bnhbrTD9frUYHQTiYnPcxyHORIw157ERBa6dqzaKxvR/x3PC4Yzd+D1pZIMS6zNg2v3a8BZ0oK7jHqsQo9fWA==",
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
-        "nan": "^2.18.0",
-        "tree-sitter": "^0.20.6"
+        "node-addon-api": "^8.2.2",
+        "node-gyp-build": "^4.8.2"
+      },
+      "peerDependencies": {
+        "tree-sitter": "^0.21.1"
+      },
+      "peerDependenciesMeta": {
+        "tree-sitter": {
+          "optional": true
+        }
       }
     },
-    "node_modules/tree-sitter-typescript/node_modules/tree-sitter": {
-      "version": "0.20.6",
-      "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.20.6.tgz",
-      "integrity": "sha512-GxJodajVpfgb3UREzzIbtA1hyRnTxVbWVXrbC6sk4xTMH5ERMBJk9HJNq4c8jOJeUaIOmLcwg+t6mez/PDvGqg==",
+    "node_modules/tree-sitter-javascript/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",
+      "optional": true,
+      "engines": {
+        "node": "^18 || ^20 || >= 21"
+      }
+    },
+    "node_modules/tree-sitter-typescript": {
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/tree-sitter-typescript/-/tree-sitter-typescript-0.23.2.tgz",
+      "integrity": "sha512-e04JUUKxTT53/x3Uq1zIL45DoYKVfHH4CZqwgZhPg5qYROl5nQjV+85ruFzFGZxu+QeFVbRTPDRnqL9UbU4VeA==",
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "nan": "^2.18.0",
-        "prebuild-install": "^7.1.1"
+        "node-addon-api": "^8.2.2",
+        "node-gyp-build": "^4.8.2",
+        "tree-sitter-javascript": "^0.23.1"
+      },
+      "peerDependencies": {
+        "tree-sitter": "^0.21.0"
+      },
+      "peerDependenciesMeta": {
+        "tree-sitter": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tree-sitter-typescript/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",
+      "optional": true,
+      "engines": {
+        "node": "^18 || ^20 || >= 21"
       }
     },
     "node_modules/tree-sitter/node_modules/node-addon-api": {
@@ -6633,6 +6689,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "dev": true,
       "optional": true,
       "dependencies": {
         "safe-buffer": "^5.0.1"
@@ -7052,7 +7109,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "devOptional": true
+      "dev": true
     },
     "node_modules/wsl-utils": {
       "version": "0.1.0",
@@ -7114,7 +7171,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "devOptional": true
+      "dev": true
     },
     "node_modules/yauzl": {
       "version": "3.2.0",
diff --git a/build/package.json b/build/package.json
index a0d36895884a..9aa4ab1a9b95 100644
--- a/build/package.json
+++ b/build/package.json
@@ -63,7 +63,7 @@
     "npmCheckJs": "../node_modules/.bin/tsc --noEmit"
   },
   "optionalDependencies": {
-    "tree-sitter-typescript": "^0.20.5",
+    "tree-sitter-typescript": "^0.23.2",
     "vscode-gulp-watch": "^5.0.3"
   }
 }

From cd2da4bfc43f8f14f7feac0ca2f690baa87aa4f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:22:43 +0000
Subject: [PATCH 1483/1815] Bump tempfile from 3.10.1 to 3.11.0 in /cli

Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.10.1 to 3.11.0.
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.10.1...v3.11.0)

---
updated-dependencies:
- dependency-name: tempfile
  dependency-version: 3.11.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 5 +++--
 cli/Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 1b5836f528fa..8fbe716c1d74 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -2828,12 +2828,13 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.10.1"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53"
 dependencies = [
  "cfg-if",
  "fastrand 2.1.0",
+ "once_cell",
  "rustix 0.38.34",
  "windows-sys 0.52.0",
 ]
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index b4728cad8cb3..b81f5c2c60cc 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -39,7 +39,7 @@ keyring = { version = "2.0.3", default-features = false, features = ["linux-secr
 dialoguer = "0.12.0"
 hyper = { version = "0.14.26", features = ["server", "http1", "runtime"] }
 indicatif = "0.17.4"
-tempfile = "3.5.0"
+tempfile = "3.11.0"
 clap_lex = "0.7.6"
 url = "2.5.4"
 async-trait = "0.1.89"

From 86bbd2525727d8dcec74630528658c16b2337f5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:22:51 +0000
Subject: [PATCH 1484/1815] Bump esbuild from 0.25.0 to 0.27.2 in /build

Bumps [esbuild](https://github.com/evanw/esbuild) from 0.25.0 to 0.27.2.
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md)
- [Commits](https://github.com/evanw/esbuild/compare/v0.25.0...v0.27.2)

---
updated-dependencies:
- dependency-name: esbuild
  dependency-version: 0.27.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 226 ++++++++++++++++++++++------------------
 build/package.json      |   2 +-
 2 files changed, 123 insertions(+), 105 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 1dac2cc7aa21..c8db702a513b 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -47,7 +47,7 @@
         "byline": "^5.0.0",
         "debug": "^4.3.2",
         "electron-osx-sign": "^0.6.0",
-        "esbuild": "0.25.0",
+        "esbuild": "0.27.2",
         "extract-zip": "^2.0.1",
         "gulp-merge-json": "^2.2.1",
         "gulp-sort": "^2.0.0",
@@ -519,9 +519,9 @@
       }
     },
     "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"
       ],
@@ -536,9 +536,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"
       ],
@@ -553,9 +553,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"
       ],
@@ -570,9 +570,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"
       ],
@@ -587,9 +587,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"
       ],
@@ -604,9 +604,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"
       ],
@@ -621,9 +621,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"
       ],
@@ -638,9 +638,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"
       ],
@@ -655,9 +655,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"
       ],
@@ -672,9 +672,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"
       ],
@@ -689,9 +689,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"
       ],
@@ -706,9 +706,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"
       ],
@@ -723,9 +723,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"
       ],
@@ -740,9 +740,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"
       ],
@@ -757,9 +757,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"
       ],
@@ -774,9 +774,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"
       ],
@@ -791,9 +791,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"
       ],
@@ -808,9 +808,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"
       ],
@@ -825,9 +825,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"
       ],
@@ -842,9 +842,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"
       ],
@@ -859,9 +859,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"
       ],
@@ -875,10 +875,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"
       ],
@@ -893,9 +910,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"
       ],
@@ -910,9 +927,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"
       ],
@@ -927,9 +944,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"
       ],
@@ -3417,9 +3434,9 @@
       "optional": true
     },
     "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",
@@ -3430,31 +3447,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/escape-string-regexp": {
diff --git a/build/package.json b/build/package.json
index a0d36895884a..e6aa96ed4e63 100644
--- a/build/package.json
+++ b/build/package.json
@@ -41,7 +41,7 @@
     "byline": "^5.0.0",
     "debug": "^4.3.2",
     "electron-osx-sign": "^0.6.0",
-    "esbuild": "0.25.0",
+    "esbuild": "0.27.2",
     "extract-zip": "^2.0.1",
     "gulp-merge-json": "^2.2.1",
     "gulp-sort": "^2.0.0",

From 45a8a59589351474d9e69e5663ad8eddde197d47 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:22:53 +0000
Subject: [PATCH 1485/1815] Bump dirs from 5.0.1 to 6.0.0 in /cli

Bumps [dirs](https://github.com/soc/dirs-rs) from 5.0.1 to 6.0.0.
- [Commits](https://github.com/soc/dirs-rs/commits)

---
updated-dependencies:
- dependency-name: dirs
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 67 ++++++++++++++++++++++++++++++++++++--------------
 cli/Cargo.toml |  2 +-
 2 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 1b5836f528fa..8111cb396282 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -390,7 +390,7 @@ dependencies = [
  "const_format",
  "core-foundation 0.10.1",
  "dialoguer",
- "dirs 5.0.1",
+ "dirs 6.0.0",
  "flate2",
  "futures",
  "gethostname",
@@ -415,7 +415,7 @@ dependencies = [
  "sysinfo",
  "tar",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.61",
  "tokio",
  "tokio-util",
  "tunnels",
@@ -617,11 +617,11 @@ dependencies = [
 
 [[package]]
 name = "dirs"
-version = "5.0.1"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
 dependencies = [
- "dirs-sys 0.4.1",
+ "dirs-sys 0.5.0",
 ]
 
 [[package]]
@@ -631,20 +631,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
 dependencies = [
  "libc",
- "redox_users",
+ "redox_users 0.4.5",
  "winapi",
 ]
 
 [[package]]
 name = "dirs-sys"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
 dependencies = [
  "libc",
  "option-ext",
- "redox_users",
- "windows-sys 0.48.0",
+ "redox_users 0.5.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1857,7 +1857,7 @@ dependencies = [
  "js-sys",
  "once_cell",
  "pin-project-lite",
- "thiserror",
+ "thiserror 1.0.61",
  "urlencoding",
 ]
 
@@ -1877,7 +1877,7 @@ dependencies = [
  "ordered-float",
  "percent-encoding",
  "rand 0.8.5",
- "thiserror",
+ "thiserror 1.0.61",
  "tokio",
  "tokio-stream",
 ]
@@ -2222,7 +2222,18 @@ checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
 dependencies = [
  "getrandom 0.2.15",
  "libredox",
- "thiserror",
+ "thiserror 1.0.61",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
+dependencies = [
+ "getrandom 0.2.15",
+ "libredox",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -2380,7 +2391,7 @@ dependencies = [
  "sha1",
  "sha2",
  "subtle",
- "thiserror",
+ "thiserror 1.0.61",
  "tokio",
  "tokio-util",
 ]
@@ -2415,7 +2426,7 @@ dependencies = [
  "russh-cryptovec",
  "serde",
  "sha2",
- "thiserror",
+ "thiserror 1.0.61",
  "tokio",
  "tokio-stream",
  "yasna",
@@ -2844,7 +2855,16 @@ version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.61",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+dependencies = [
+ "thiserror-impl 2.0.17",
 ]
 
 [[package]]
@@ -2858,6 +2878,17 @@ dependencies = [
  "syn 2.0.87",
 ]
 
+[[package]]
+name = "thiserror-impl"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "time"
 version = "0.3.36"
@@ -3040,7 +3071,7 @@ dependencies = [
  "native-tls",
  "rand 0.8.5",
  "sha1",
- "thiserror",
+ "thiserror 1.0.61",
  "url",
  "utf-8",
 ]
@@ -3062,7 +3093,7 @@ dependencies = [
  "russh-keys",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.61",
  "tokio",
  "tokio-tungstenite",
  "tokio-util",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index b4728cad8cb3..6a6aa1b04a4e 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -27,7 +27,7 @@ serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 rmp-serde = "1.3.1"
 uuid = { version = "1.16", features = ["serde", "v4"] }
-dirs = "5.0.1"
+dirs = "6.0.0"
 rand = "0.9.2"
 opentelemetry = { version = "0.20.0", features = ["rt-tokio"] }
 serde_bytes = "0.11.19"

From 103a2f2616d353a918e76cb021c938e6388de714 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:22:53 +0000
Subject: [PATCH 1486/1815] Bump @types/node in
 /extensions/css-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/css-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/css-language-features/package-lock.json b/extensions/css-language-features/package-lock.json
index 857844fe1844..35577f8c0400 100644
--- a/extensions/css-language-features/package-lock.json
+++ b/extensions/css-language-features/package-lock.json
@@ -41,9 +41,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 90177fb4de92709a59ecc670566203f6d3f96cbb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:23:02 +0000
Subject: [PATCH 1487/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /extensions/git-base

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git-base/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/git-base/package-lock.json b/extensions/git-base/package-lock.json
index 9756cb0cdfbf..d99ac86dce38 100644
--- a/extensions/git-base/package-lock.json
+++ b/extensions/git-base/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From e655a0b33e572658b686b2d76c861fa894848cf4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:23:02 +0000
Subject: [PATCH 1488/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /extensions/grunt

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/grunt/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/grunt/package-lock.json b/extensions/grunt/package-lock.json
index 97b8ef8725b2..4d2f4ba76b54 100644
--- a/extensions/grunt/package-lock.json
+++ b/extensions/grunt/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 12b6146b81ad13f79e51279f81938ca6ce4284f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:23:03 +0000
Subject: [PATCH 1489/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /extensions/debug-auto-launch

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/debug-auto-launch/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/debug-auto-launch/package-lock.json b/extensions/debug-auto-launch/package-lock.json
index 101e1c51e803..05918ee8a6c8 100644
--- a/extensions/debug-auto-launch/package-lock.json
+++ b/extensions/debug-auto-launch/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 848e91009270bbbe51b70f1171b92fe972bc9463 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:23:05 +0000
Subject: [PATCH 1490/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /extensions/extension-editing

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/extension-editing/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/extension-editing/package-lock.json b/extensions/extension-editing/package-lock.json
index ba488cb93562..d1ebd81b9778 100644
--- a/extensions/extension-editing/package-lock.json
+++ b/extensions/extension-editing/package-lock.json
@@ -47,9 +47,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From a9a4295dd46309064c3c780f9b289a55c412552f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:23:05 +0000
Subject: [PATCH 1491/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /extensions/gulp

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/gulp/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/gulp/package-lock.json b/extensions/gulp/package-lock.json
index ded93dde3def..ed03ed439f07 100644
--- a/extensions/gulp/package-lock.json
+++ b/extensions/gulp/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 33700cd17d0c1c80ccb5146cedfe690e5020c51a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:23:14 +0000
Subject: [PATCH 1492/1815] Bump @types/node in
 /extensions/github-authentication

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github-authentication/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/github-authentication/package-lock.json b/extensions/github-authentication/package-lock.json
index 2997d94021ba..387fc5f5a6e3 100644
--- a/extensions/github-authentication/package-lock.json
+++ b/extensions/github-authentication/package-lock.json
@@ -154,9 +154,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 64e2302c1db72819de9226160cada29aab19323b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:23:19 +0000
Subject: [PATCH 1493/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /extensions/git

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index 0b8977af3536..2c4342028d77 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -214,9 +214,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 6399f95d5f6917483f32c2e9e706215153b808d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:23:43 +0000
Subject: [PATCH 1494/1815] Bump @types/node in
 /extensions/html-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/html-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/html-language-features/package-lock.json b/extensions/html-language-features/package-lock.json
index 6f14c2d47e6f..e48111749556 100644
--- a/extensions/html-language-features/package-lock.json
+++ b/extensions/html-language-features/package-lock.json
@@ -166,9 +166,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 9306e08f7900eac4a6c98ab70df3d36cc5449a14 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:23:58 +0000
Subject: [PATCH 1495/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /extensions/emmet

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/emmet/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/emmet/package-lock.json b/extensions/emmet/package-lock.json
index 4bc4ce60892f..0ba8ec6c59d9 100644
--- a/extensions/emmet/package-lock.json
+++ b/extensions/emmet/package-lock.json
@@ -80,9 +80,9 @@
       "integrity": "sha1-JEywLHfsLnT3ipvTGCGKvJxQCmE= sha512-ZsZ2I9Vzso3Ho/pjZFsmmZ++FWeEd/txqybHTm4OgaZzdS8V9V/YYWQwg5TC38Z7uLWUV1vavpLLbjJtKubR1A=="
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 891b4ffd3b0ed26b5fc5fcc2159071c7565d6119 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:25:04 +0000
Subject: [PATCH 1496/1815] Bump @types/node in
 /extensions/html-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/html-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/html-language-features/server/package-lock.json b/extensions/html-language-features/server/package-lock.json
index d8a5ba1c34aa..9d008dd2b40f 100644
--- a/extensions/html-language-features/server/package-lock.json
+++ b/extensions/html-language-features/server/package-lock.json
@@ -32,9 +32,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 6fbdb370fc558a5ac10805b22a94223215cde54c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:25:11 +0000
Subject: [PATCH 1497/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /extensions/jake

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/jake/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/jake/package-lock.json b/extensions/jake/package-lock.json
index dc5d91b8184e..b81ec63c85fd 100644
--- a/extensions/jake/package-lock.json
+++ b/extensions/jake/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 24c6eded464d916184c726114f6aec590c162221 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:25:13 +0000
Subject: [PATCH 1498/1815] Bump @types/node in
 /extensions/json-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/json-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/json-language-features/package-lock.json b/extensions/json-language-features/package-lock.json
index 1b3e39344f1a..e72459c00a51 100644
--- a/extensions/json-language-features/package-lock.json
+++ b/extensions/json-language-features/package-lock.json
@@ -166,9 +166,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From ea51fedeac925f170bc9d3d6cee5b6b83d6a3978 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:25:16 +0000
Subject: [PATCH 1499/1815] Bump @types/node in
 /extensions/json-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/json-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/json-language-features/server/package-lock.json b/extensions/json-language-features/server/package-lock.json
index 86628b4b72ab..0a5b70a4b796 100644
--- a/extensions/json-language-features/server/package-lock.json
+++ b/extensions/json-language-features/server/package-lock.json
@@ -35,9 +35,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 2a86fa3e0c5bce3b531b75d37948577d4f865236 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:25:22 +0000
Subject: [PATCH 1500/1815] Bump vscode-json-languageservice

Bumps [vscode-json-languageservice](https://github.com/Microsoft/vscode-json-languageservice) from 5.6.4 to 5.7.0.
- [Release notes](https://github.com/Microsoft/vscode-json-languageservice/releases)
- [Changelog](https://github.com/microsoft/vscode-json-languageservice/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/vscode-json-languageservice/compare/v5.6.4...v5.7.0)

---
updated-dependencies:
- dependency-name: vscode-json-languageservice
  dependency-version: 5.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/json-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/json-language-features/server/package-lock.json b/extensions/json-language-features/server/package-lock.json
index 86628b4b72ab..9d214fdf44e6 100644
--- a/extensions/json-language-features/server/package-lock.json
+++ b/extensions/json-language-features/server/package-lock.json
@@ -67,9 +67,9 @@
       "license": "MIT"
     },
     "node_modules/vscode-json-languageservice": {
-      "version": "5.6.4",
-      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.6.4.tgz",
-      "integrity": "sha512-i0MhkFmnQAbYr+PiE6Th067qa3rwvvAErCEUo0ql+ghFXHvxbwG3kLbwMaIUrrbCLUDEeULiLgROJjtuyYoIsA==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.7.0.tgz",
+      "integrity": "sha512-AgHOBlgkv2L88eaoFUyYBDSL+OxetTA3DnJ+EnOHW4wuoO8gby4dTx4QUcJgD+qERVdq/BQQDA/vzIC3JZGHZw==",
       "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.18",

From d235da713d9450a44e7977182220c508c16109b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:25:26 +0000
Subject: [PATCH 1501/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /extensions/npm

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/npm/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index 134eadffe2af..1b73971d74f6 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -60,9 +60,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 201ae94da3718d5c9a5beaedf5c9327136fb414a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:25:34 +0000
Subject: [PATCH 1502/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /extensions/merge-conflict

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/merge-conflict/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/merge-conflict/package-lock.json b/extensions/merge-conflict/package-lock.json
index c9eaf07fb6b8..849db1b20bbe 100644
--- a/extensions/merge-conflict/package-lock.json
+++ b/extensions/merge-conflict/package-lock.json
@@ -143,9 +143,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 4ab09f8ad413a4d11fcaa5b4d33e6701fd85d7a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:25:53 +0000
Subject: [PATCH 1503/1815] Bump @types/node in
 /extensions/php-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/php-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/php-language-features/package-lock.json b/extensions/php-language-features/package-lock.json
index f9b8fc63016b..d7c561ec0f03 100644
--- a/extensions/php-language-features/package-lock.json
+++ b/extensions/php-language-features/package-lock.json
@@ -20,9 +20,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From b5219804bd3b5583fc9b6801efe6c9fb08599cbe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:26:17 +0000
Subject: [PATCH 1504/1815] Bump @azure/msal-node in
 /extensions/microsoft-authentication

Bumps [@azure/msal-node](https://github.com/AzureAD/microsoft-authentication-library-for-js) from 2.16.3 to 3.8.4.
- [Release notes](https://github.com/AzureAD/microsoft-authentication-library-for-js/releases)
- [Commits](https://github.com/AzureAD/microsoft-authentication-library-for-js/commits/msal-node-v3.8.4)

---
updated-dependencies:
- dependency-name: "@azure/msal-node"
  dependency-version: 3.8.4
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 25 ++++++-------------
 .../microsoft-authentication/package.json     |  2 +-
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 2249af1bb45c..8f5d27d080c5 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@azure/ms-rest-azure-env": "^2.0.0",
-        "@azure/msal-node": "^2.16.2",
+        "@azure/msal-node": "^3.8.4",
         "@azure/msal-node-extensions": "^1.5.26",
         "@vscode/extension-telemetry": "^1.2.0",
         "keytar": "file:./packageMocks/keytar",
@@ -33,21 +33,21 @@
       "integrity": "sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="
     },
     "node_modules/@azure/msal-common": {
-      "version": "14.16.1",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.16.1.tgz",
-      "integrity": "sha512-nyxsA6NA4SVKh5YyRpbSXiMr7oQbwark7JU9LMeg6tJYTSPyAGkdx61wPT4gyxZfxlSxMMEyAsWaubBlNyIa1w==",
+      "version": "15.13.3",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.13.3.tgz",
+      "integrity": "sha512-shSDU7Ioecya+Aob5xliW9IGq1Ui8y4EVSdWGyI1Gbm4Vg61WpP95LuzcY214/wEjSn6w4PZYD4/iVldErHayQ==",
       "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/@azure/msal-node": {
-      "version": "2.16.3",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.16.3.tgz",
-      "integrity": "sha512-CO+SE4weOsfJf+C5LM8argzvotrXw252/ZU6SM2Tz63fEblhH1uuVaaO4ISYFuN4Q6BhTo7I3qIdi8ydUQCqhw==",
+      "version": "3.8.4",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.4.tgz",
+      "integrity": "sha512-lvuAwsDpPDE/jSuVQOBMpLbXuVuLsPNRwWCyK3/6bPlBk0fGWegqoZ0qjZclMWyQ2JNvIY3vHY7hoFmFmFQcOw==",
       "license": "MIT",
       "dependencies": {
-        "@azure/msal-common": "14.16.1",
+        "@azure/msal-common": "15.13.3",
         "jsonwebtoken": "^9.0.0",
         "uuid": "^8.3.0"
       },
@@ -70,15 +70,6 @@
         "node": ">=16"
       }
     },
-    "node_modules/@azure/msal-node-extensions/node_modules/@azure/msal-common": {
-      "version": "15.13.3",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.13.3.tgz",
-      "integrity": "sha512-shSDU7Ioecya+Aob5xliW9IGq1Ui8y4EVSdWGyI1Gbm4Vg61WpP95LuzcY214/wEjSn6w4PZYD4/iVldErHayQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/@azure/msal-node-runtime": {
       "version": "0.20.1",
       "resolved": "https://registry.npmjs.org/@azure/msal-node-runtime/-/msal-node-runtime-0.20.1.tgz",
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 85dd2b1e7524..80586920042e 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -139,7 +139,7 @@
   },
   "dependencies": {
     "@azure/ms-rest-azure-env": "^2.0.0",
-    "@azure/msal-node": "^2.16.2",
+    "@azure/msal-node": "^3.8.4",
     "@azure/msal-node-extensions": "^1.5.26",
     "@vscode/extension-telemetry": "^1.2.0",
     "keytar": "file:./packageMocks/keytar",

From f2a4cd374ecfc0d38dd6e5e2fbc9ad14155182a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:26:23 +0000
Subject: [PATCH 1505/1815] Bump @types/node in
 /extensions/microsoft-authentication

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/microsoft-authentication/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 2249af1bb45c..74b7310b9e35 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -211,9 +211,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 7cd9200709d1327e2357254dc9c3876054b933b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:26:41 +0000
Subject: [PATCH 1506/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /extensions/references-view

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/references-view/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/references-view/package-lock.json b/extensions/references-view/package-lock.json
index e4ce1e4867a8..e5ff89f96525 100644
--- a/extensions/references-view/package-lock.json
+++ b/extensions/references-view/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 48c59019ad32d5a29923537d3202b39f13587ea7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:27:16 +0000
Subject: [PATCH 1507/1815] Bump @types/node in
 /extensions/vscode-colorize-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-colorize-tests/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-colorize-tests/package-lock.json b/extensions/vscode-colorize-tests/package-lock.json
index 07dbdd7a2901..a0105e2baf6d 100644
--- a/extensions/vscode-colorize-tests/package-lock.json
+++ b/extensions/vscode-colorize-tests/package-lock.json
@@ -19,9 +19,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From df0734b822dcc57e80e3213c51b73397a49ab1b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:27:33 +0000
Subject: [PATCH 1508/1815] Bump @types/node in
 /extensions/typescript-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/typescript-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/typescript-language-features/package-lock.json b/extensions/typescript-language-features/package-lock.json
index edfd54f5de82..017dec06cd26 100644
--- a/extensions/typescript-language-features/package-lock.json
+++ b/extensions/typescript-language-features/package-lock.json
@@ -152,9 +152,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 8bf2181df4ecd2418dd348de65c183ef82aa3e31 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:27:39 +0000
Subject: [PATCH 1509/1815] Bump @types/node in
 /extensions/vscode-colorize-perf-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-colorize-perf-tests/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-colorize-perf-tests/package-lock.json b/extensions/vscode-colorize-perf-tests/package-lock.json
index 28e3366329b7..27a8404729ae 100644
--- a/extensions/vscode-colorize-perf-tests/package-lock.json
+++ b/extensions/vscode-colorize-perf-tests/package-lock.json
@@ -19,9 +19,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 340356cd1f16dd2833f4e3d2ff6d534b1d073f5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:27:46 +0000
Subject: [PATCH 1510/1815] Bump @microsoft/1ds-core-js from 4.3.10 to 4.3.11
 in /remote/web

Bumps [@microsoft/1ds-core-js](https://github.com/microsoft/ApplicationInsights-JS) from 4.3.10 to 4.3.11.
- [Release notes](https://github.com/microsoft/ApplicationInsights-JS/releases)
- [Changelog](https://github.com/microsoft/ApplicationInsights-JS/blob/main/RELEASES.md)
- [Commits](https://github.com/microsoft/ApplicationInsights-JS/commits)

---
updated-dependencies:
- dependency-name: "@microsoft/1ds-core-js"
  dependency-version: 4.3.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 40 ++++++++++++++++++++++++++++++------
 remote/web/package.json      |  2 +-
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 25522fb42760..68f68eb1a455 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -8,7 +8,7 @@
 			"name": "vscode-web",
 			"version": "0.0.0",
 			"dependencies": {
-				"@microsoft/1ds-core-js": "^4.3.10",
+				"@microsoft/1ds-core-js": "^4.3.11",
 				"@microsoft/1ds-post-js": "^4.3.10",
 				"@vscode/iconv-lite-umd": "0.7.1",
 				"@vscode/tree-sitter-wasm": "^0.3.0",
@@ -29,12 +29,12 @@
 			}
 		},
 		"node_modules/@microsoft/1ds-core-js": {
-			"version": "4.3.10",
-			"resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
-			"integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==",
+			"version": "4.3.11",
+			"resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.11.tgz",
+			"integrity": "sha512-QyQE/YzFYB+31WEpX9hvDoXZOIXA7308Z5uuL1mSsyDSkNPl24hBWz9O3vZL+/p9shy756eKLI2nFLwwIAhXyw==",
 			"license": "MIT",
 			"dependencies": {
-				"@microsoft/applicationinsights-core-js": "3.3.10",
+				"@microsoft/applicationinsights-core-js": "3.3.11",
 				"@microsoft/applicationinsights-shims": "3.0.1",
 				"@microsoft/dynamicproto-js": "^2.0.3",
 				"@nevware21/ts-async": ">= 0.5.4 < 2.x",
@@ -54,7 +54,20 @@
 				"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
 			}
 		},
-		"node_modules/@microsoft/applicationinsights-core-js": {
+		"node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/1ds-core-js": {
+			"version": "4.3.10",
+			"resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
+			"integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==",
+			"license": "MIT",
+			"dependencies": {
+				"@microsoft/applicationinsights-core-js": "3.3.10",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.4 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+			}
+		},
+		"node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-core-js": {
 			"version": "3.3.10",
 			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.10.tgz",
 			"integrity": "sha512-5yKeyassZTq2l+SAO4npu6LPnbS++UD+M+Ghjm9uRzoBwD8tumFx0/F8AkSVqbniSREd+ztH/2q2foewa2RZyg==",
@@ -69,6 +82,21 @@
 				"tslib": ">= 1.0.0"
 			}
 		},
+		"node_modules/@microsoft/applicationinsights-core-js": {
+			"version": "3.3.11",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.11.tgz",
+			"integrity": "sha512-WlBY1sKDNL62T++NifgFCyDuOoNUNrVILfnHubOzgU/od7MFEQYWU8EZyDcBC/+Z8e3TD6jfixurYtWoUC+6Eg==",
+			"license": "MIT",
+			"dependencies": {
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.4 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+			},
+			"peerDependencies": {
+				"tslib": ">= 1.0.0"
+			}
+		},
 		"node_modules/@microsoft/applicationinsights-shims": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
diff --git a/remote/web/package.json b/remote/web/package.json
index 1d56955be76a..7f8f347effd0 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -3,7 +3,7 @@
 	"version": "0.0.0",
 	"private": true,
 	"dependencies": {
-		"@microsoft/1ds-core-js": "^4.3.10",
+		"@microsoft/1ds-core-js": "^4.3.11",
 		"@microsoft/1ds-post-js": "^4.3.10",
 		"@vscode/iconv-lite-umd": "0.7.1",
 		"@vscode/tree-sitter-wasm": "^0.3.0",

From ffbc0db4ff699eadd5be79a75b94afcf29ee4356 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:27:52 +0000
Subject: [PATCH 1511/1815] Bump @xterm/addon-ligatures in /remote/web

Bumps [@xterm/addon-ligatures](https://github.com/xtermjs/xterm.js) from 0.11.0-beta.76 to 0.11.0-beta.101.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-ligatures"
  dependency-version: 0.11.0-beta.101
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 59 +++++-------------------------------
 remote/web/package.json      |  2 +-
 2 files changed, 8 insertions(+), 53 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 25522fb42760..29ea729ac581 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -15,7 +15,7 @@
 				"@vscode/vscode-languagedetection": "1.0.22",
 				"@xterm/addon-clipboard": "^0.3.0-beta.89",
 				"@xterm/addon-image": "^0.10.0-beta.101",
-				"@xterm/addon-ligatures": "^0.11.0-beta.76",
+				"@xterm/addon-ligatures": "^0.11.0-beta.101",
 				"@xterm/addon-progress": "^0.3.0-beta.101",
 				"@xterm/addon-search": "^0.17.0-beta.101",
 				"@xterm/addon-serialize": "^0.15.0-beta.100",
@@ -145,19 +145,19 @@
 			}
 		},
 		"node_modules/@xterm/addon-ligatures": {
-			"version": "0.11.0-beta.76",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.76.tgz",
-			"integrity": "sha512-j8FTZMPK+TiwqBBHbXHDbOZYh6h/MJB1ZSPyfHuaodglyAwjbk3/S/IuWMGfA7zftX05ucpcUYyejzZJvWPFgA==",
+			"version": "0.11.0-beta.101",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.101.tgz",
+			"integrity": "sha512-FIO3S/f3K1nnmQs/oJ3ILI9p1Vb4sSK7J4UhROBj5JOyZtmRwhdUFr9MozfPVdc2VZPRJJJJq6vaPDdLioeJyQ==",
 			"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": "^6.1.0-beta.76"
+				"@xterm/xterm": "^6.1.0-beta.101"
 			}
 		},
 		"node_modules/@xterm/addon-progress": {
@@ -214,42 +214,6 @@
 				"addons/*"
 			]
 		},
-		"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",
@@ -288,15 +252,6 @@
 				"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==",
-			"license": "MIT",
-			"engines": {
-				"node": ">8.0.0"
-			}
-		},
 		"node_modules/tas-client-umd": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/tas-client-umd/-/tas-client-umd-0.2.0.tgz",
diff --git a/remote/web/package.json b/remote/web/package.json
index 1d56955be76a..debe0825daf8 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -10,7 +10,7 @@
 		"@vscode/vscode-languagedetection": "1.0.22",
 		"@xterm/addon-clipboard": "^0.3.0-beta.89",
 		"@xterm/addon-image": "^0.10.0-beta.101",
-		"@xterm/addon-ligatures": "^0.11.0-beta.76",
+		"@xterm/addon-ligatures": "^0.11.0-beta.101",
 		"@xterm/addon-progress": "^0.3.0-beta.101",
 		"@xterm/addon-search": "^0.17.0-beta.101",
 		"@xterm/addon-serialize": "^0.15.0-beta.100",

From a9def76f6774c5129e91e0401afaa10ee33c6bf7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:27:52 +0000
Subject: [PATCH 1512/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /extensions/tunnel-forwarding

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/tunnel-forwarding/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/tunnel-forwarding/package-lock.json b/extensions/tunnel-forwarding/package-lock.json
index 0a6a1932bc79..3c9d38b9ff18 100644
--- a/extensions/tunnel-forwarding/package-lock.json
+++ b/extensions/tunnel-forwarding/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 28d24d269af908868d4891e24b8eace6348dfe63 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:27:52 +0000
Subject: [PATCH 1513/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /extensions/vscode-api-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-api-tests/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-api-tests/package-lock.json b/extensions/vscode-api-tests/package-lock.json
index 22c7461a20c3..23826828bd6e 100644
--- a/extensions/vscode-api-tests/package-lock.json
+++ b/extensions/vscode-api-tests/package-lock.json
@@ -27,9 +27,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 230d170f1e7819350c76ac4a006be228957fdda4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:27:58 +0000
Subject: [PATCH 1514/1815] Bump @xterm/addon-serialize in /remote/web

Bumps [@xterm/addon-serialize](https://github.com/xtermjs/xterm.js) from 0.15.0-beta.100 to 0.15.0-beta.101.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-serialize"
  dependency-version: 0.15.0-beta.101
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 25522fb42760..a2ba72ef4ee4 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -18,7 +18,7 @@
 				"@xterm/addon-ligatures": "^0.11.0-beta.76",
 				"@xterm/addon-progress": "^0.3.0-beta.101",
 				"@xterm/addon-search": "^0.17.0-beta.101",
-				"@xterm/addon-serialize": "^0.15.0-beta.100",
+				"@xterm/addon-serialize": "^0.15.0-beta.101",
 				"@xterm/addon-unicode11": "^0.10.0-beta.101",
 				"@xterm/addon-webgl": "^0.20.0-beta.100",
 				"@xterm/xterm": "^6.0.0",
@@ -179,12 +179,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-serialize": {
-			"version": "0.15.0-beta.100",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.100.tgz",
-			"integrity": "sha512-FKTTfCdcosQwbfp1xTj2gUhsNsi0gfF2iO0D8oaDgRTooHK4s3Mvg8VzRqbnrBjf8DbHS0Re6IBrx7ZxH/wRMw==",
+			"version": "0.15.0-beta.101",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.101.tgz",
+			"integrity": "sha512-NJXY4WBV9tG2IG85xMlmUX6YFIa63NO0qF+JzDM9+3AaNDEmTXd+Lg5ucWtJjZRDW3AHUOLAQos4osLvBfyhYQ==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.100"
+				"@xterm/xterm": "^6.1.0-beta.101"
 			}
 		},
 		"node_modules/@xterm/addon-unicode11": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 1d56955be76a..481796f604ff 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -13,7 +13,7 @@
 		"@xterm/addon-ligatures": "^0.11.0-beta.76",
 		"@xterm/addon-progress": "^0.3.0-beta.101",
 		"@xterm/addon-search": "^0.17.0-beta.101",
-		"@xterm/addon-serialize": "^0.15.0-beta.100",
+		"@xterm/addon-serialize": "^0.15.0-beta.101",
 		"@xterm/addon-unicode11": "^0.10.0-beta.101",
 		"@xterm/addon-webgl": "^0.20.0-beta.100",
 		"@xterm/xterm": "^6.0.0",

From eb8481ea65e7558478aa65a521b7b86e50095971 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:28:02 +0000
Subject: [PATCH 1515/1815] Bump @types/node in
 /extensions/vscode-test-resolver

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-test-resolver/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-test-resolver/package-lock.json b/extensions/vscode-test-resolver/package-lock.json
index 72993c938012..1f9b9d188b23 100644
--- a/extensions/vscode-test-resolver/package-lock.json
+++ b/extensions/vscode-test-resolver/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 102962f1c4e0077cedf1471a4ab55437c816df7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:28:03 +0000
Subject: [PATCH 1516/1815] Bump husky from 0.13.4 to 9.1.7

Bumps [husky](https://github.com/typicode/husky) from 0.13.4 to 9.1.7.
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](https://github.com/typicode/husky/compare/v0.13.4...v9.1.7)

---
updated-dependencies:
- dependency-name: husky
  dependency-version: 9.1.7
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 114 ++++------------------------------------------
 package.json      |   2 +-
 2 files changed, 11 insertions(+), 105 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ae68d9266a16..4f1938cea64f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -121,7 +121,7 @@
         "gulp-sourcemaps": "^3.0.0",
         "gulp-svgmin": "^4.1.0",
         "gulp-untar": "^0.0.8",
-        "husky": "^0.13.1",
+        "husky": "^9.1.7",
         "innosetup": "^6.4.1",
         "istanbul-lib-coverage": "^3.2.0",
         "istanbul-lib-instrument": "^6.0.1",
@@ -5232,12 +5232,6 @@
       "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/cli-cursor": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz",
@@ -7320,12 +7314,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/find-parent-dir": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.1.tgz",
-      "integrity": "sha512-o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A==",
-      "dev": true
-    },
     "node_modules/find-replace": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz",
@@ -9806,89 +9794,19 @@
       }
     },
     "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==",
+      "version": "9.1.7",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz",
+      "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==",
       "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "chalk": "^1.1.3",
-        "find-parent-dir": "^0.3.0",
-        "is-ci": "^1.0.9",
-        "normalize-path": "^1.0.0"
-      }
-    },
-    "node_modules/husky/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/husky/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/husky/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
+      "license": "MIT",
+      "bin": {
+        "husky": "bin.js"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/husky/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/husky/node_modules/normalize-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz",
-      "integrity": "sha512-7WyT0w8jhpDStXRq5836AMmihQwq2nrUVQrgjvUo/p/NZf9uy/MeJ246lBJVmWuYXMlJuG9BNZHF0hWjfTbQUA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/husky/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
+        "node": ">=18"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/husky/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
+      "funding": {
+        "url": "https://github.com/sponsors/typicode"
       }
     },
     "node_modules/iconv-lite": {
@@ -10111,18 +10029,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-ci": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
-      "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
-      "dev": true,
-      "dependencies": {
-        "ci-info": "^1.5.0"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
     "node_modules/is-core-module": {
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
diff --git a/package.json b/package.json
index c1d5e8d2069d..b0c1a2072271 100644
--- a/package.json
+++ b/package.json
@@ -180,7 +180,7 @@
     "gulp-sourcemaps": "^3.0.0",
     "gulp-svgmin": "^4.1.0",
     "gulp-untar": "^0.0.8",
-    "husky": "^0.13.1",
+    "husky": "^9.1.7",
     "innosetup": "^6.4.1",
     "istanbul-lib-coverage": "^3.2.0",
     "istanbul-lib-instrument": "^6.0.1",

From 93652c5d4bf0aadda7be8996f56cb0d60d46bf3d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:28:04 +0000
Subject: [PATCH 1517/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /test/automation

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/automation/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
index b0190426bf3a..009f0e4fc3b9 100644
--- a/test/automation/package-lock.json
+++ b/test/automation/package-lock.json
@@ -75,9 +75,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From bf3fdc3275d997eea152294f5f227d4991a4c285 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:28:12 +0000
Subject: [PATCH 1518/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /test/integration/browser

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/integration/browser/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integration/browser/package-lock.json b/test/integration/browser/package-lock.json
index c479f3b1f73c..8a7727f5de17 100644
--- a/test/integration/browser/package-lock.json
+++ b/test/integration/browser/package-lock.json
@@ -65,9 +65,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From ff5ad4bcc67bc64fe6b4592593e396c1b9045874 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:28:14 +0000
Subject: [PATCH 1519/1815] Bump eslint from 9.11.1 to 9.39.2

Bumps [eslint](https://github.com/eslint/eslint) from 9.11.1 to 9.39.2.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Commits](https://github.com/eslint/eslint/compare/v9.11.1...v9.39.2)

---
updated-dependencies:
- dependency-name: eslint
  dependency-version: 9.39.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 193 +++++++++++++++++++++++++++++-----------------
 package.json      |   2 +-
 2 files changed, 125 insertions(+), 70 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ae68d9266a16..026cb93d05c5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -97,7 +97,7 @@
         "debounce": "^1.0.0",
         "deemon": "^1.13.6",
         "electron": "35.7.5",
-        "eslint": "^9.11.1",
+        "eslint": "^9.39.2",
         "eslint-formatter-compact": "^8.40.0",
         "eslint-plugin-header": "3.1.1",
         "eslint-plugin-jsdoc": "^61.5.0",
@@ -1098,36 +1098,42 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz",
+      "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
         "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/@eslint-community/regexpp": {
-      "version": "4.11.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz",
-      "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==",
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
+      "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz",
-      "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==",
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz",
+      "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/object-schema": "^2.1.4",
+        "@eslint/object-schema": "^2.1.7",
         "debug": "^4.3.1",
         "minimatch": "^3.1.2"
       },
@@ -1135,20 +1141,38 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@eslint/config-helpers": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz",
+      "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^0.17.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@eslint/core": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.6.0.tgz",
-      "integrity": "sha512-8I2Q8ykA4J0x0o7cg67FPVnehcqWTBehu/lmY+bolPFHGjh49YzGBMXTvpqVgEbBdvNCSxj6iFgiIyHzf03lzg==",
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz",
+      "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==",
       "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_modules/@eslint/eslintrc": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz",
-      "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.3.tgz",
+      "integrity": "sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
@@ -1156,7 +1180,7 @@
         "globals": "^14.0.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
+        "js-yaml": "^4.1.1",
         "minimatch": "^3.1.2",
         "strip-json-comments": "^3.1.1"
       },
@@ -1168,29 +1192,36 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.11.1",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.11.1.tgz",
-      "integrity": "sha512-/qu+TWz8WwPWc7/HcIJKi+c+MOm46GdVaSlTTQcaqaL53+GsoA6MxWp5PtTx48qbSP7ylM1Kn7nhvkugfJvRSA==",
+      "version": "9.39.2",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.2.tgz",
+      "integrity": "sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://eslint.org/donate"
       }
     },
     "node_modules/@eslint/object-schema": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz",
-      "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==",
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz",
+      "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.0.tgz",
-      "integrity": "sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz",
+      "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
+        "@eslint/core": "^0.17.0",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -1331,6 +1362,30 @@
         "node": ">=10.13.0"
       }
     },
+    "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": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "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": "Apache-2.0",
+      "dependencies": {
+        "@humanfs/core": "^0.19.1",
+        "@humanwhocodes/retry": "^0.4.0"
+      },
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -1345,10 +1400,11 @@
       }
     },
     "node_modules/@humanwhocodes/retry": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz",
-      "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
+      "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=18.18"
       },
@@ -5040,6 +5096,7 @@
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -6742,31 +6799,32 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.11.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.11.1.tgz",
-      "integrity": "sha512-MobhYKIoAO1s1e4VUrgx1l1Sk2JBR/Gqjjgw8+mfgoLE2xwsHur4gdfTxyTgShrhvdVFTaJSgMiQBl1jv/AWxg==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.11.0",
-        "@eslint/config-array": "^0.18.0",
-        "@eslint/core": "^0.6.0",
-        "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.11.1",
-        "@eslint/plugin-kit": "^0.2.0",
+      "version": "9.39.2",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.2.tgz",
+      "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.8.0",
+        "@eslint-community/regexpp": "^4.12.1",
+        "@eslint/config-array": "^0.21.1",
+        "@eslint/config-helpers": "^0.4.2",
+        "@eslint/core": "^0.17.0",
+        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/js": "9.39.2",
+        "@eslint/plugin-kit": "^0.4.1",
+        "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
-        "@humanwhocodes/retry": "^0.3.0",
-        "@nodelib/fs.walk": "^1.2.8",
+        "@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.2",
+        "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.0.2",
-        "eslint-visitor-keys": "^4.0.0",
-        "espree": "^10.1.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",
@@ -6776,14 +6834,11 @@
         "ignore": "^5.2.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
         "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",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
+        "optionator": "^0.9.3"
       },
       "bin": {
         "eslint": "bin/eslint.js"
@@ -6878,10 +6933,11 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.1.0.tgz",
-      "integrity": "sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==",
+      "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": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
@@ -6906,10 +6962,11 @@
       }
     },
     "node_modules/eslint/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==",
+      "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"
       },
@@ -8001,6 +8058,7 @@
       "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
       "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -9951,10 +10009,11 @@
       "dev": true
     },
     "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "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": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -12710,6 +12769,7 @@
       "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": {
         "callsites": "^3.0.0"
       },
@@ -14356,6 +14416,7 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -15774,12 +15835,6 @@
         "b4a": "^1.6.4"
       }
     },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
     "node_modules/textextensions": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-3.3.0.tgz",
diff --git a/package.json b/package.json
index c1d5e8d2069d..323308a18dd7 100644
--- a/package.json
+++ b/package.json
@@ -156,7 +156,7 @@
     "debounce": "^1.0.0",
     "deemon": "^1.13.6",
     "electron": "35.7.5",
-    "eslint": "^9.11.1",
+    "eslint": "^9.39.2",
     "eslint-formatter-compact": "^8.40.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-jsdoc": "^61.5.0",

From b219941b2b724175c1179e3b544c04b2ff8abee4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:28:17 +0000
Subject: [PATCH 1520/1815] Bump @types/node from 25.0.6 to 25.0.7 in
 /test/smoke

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/smoke/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/smoke/package-lock.json b/test/smoke/package-lock.json
index 33029518f78a..157193b5a9f3 100644
--- a/test/smoke/package-lock.json
+++ b/test/smoke/package-lock.json
@@ -61,9 +61,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
+      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 23aff6668612c1769114a069cbba389d78b25f96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:28:19 +0000
Subject: [PATCH 1521/1815] Bump @xterm/addon-webgl in /remote

Bumps [@xterm/addon-webgl](https://github.com/xtermjs/xterm.js) from 0.19.0-beta.98 to 0.20.0-beta.100.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-webgl"
  dependency-version: 0.20.0-beta.100
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 759f49e639b0..77a31ee2816b 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -27,7 +27,7 @@
         "@xterm/addon-search": "^0.17.0-beta.101",
         "@xterm/addon-serialize": "^0.14.0-beta.140",
         "@xterm/addon-unicode11": "^0.10.0-beta.101",
-        "@xterm/addon-webgl": "^0.19.0-beta.98",
+        "@xterm/addon-webgl": "^0.20.0-beta.100",
         "@xterm/headless": "^5.6.0-beta.140",
         "@xterm/xterm": "^5.6.0-beta.98",
         "cookie": "^0.7.0",
@@ -683,12 +683,12 @@
       }
     },
     "node_modules/@xterm/addon-webgl": {
-      "version": "0.19.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.98.tgz",
-      "integrity": "sha512-09FbNHgN2ad/8JI+AEyg8C3msyk04ET1FihQIpTeWPfd2LJIAdps7G4St2+qzZbhlFkR6m9Dgrgh/AC2uegh8A==",
+      "version": "0.20.0-beta.100",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.100.tgz",
+      "integrity": "sha512-h17XiyERE+LpuYEPUAm2ux6g2Iy34BT/tfwxOckZ+RrhjM8bZMeN3u6/q28viBqAKWhhD3JbxlcDfKMN8sE3sg==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.98"
+        "@xterm/xterm": "^6.1.0-beta.101"
       }
     },
     "node_modules/@xterm/headless": {
diff --git a/remote/package.json b/remote/package.json
index c4ec21f02555..356b35a7862a 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -22,7 +22,7 @@
     "@xterm/addon-search": "^0.17.0-beta.101",
     "@xterm/addon-serialize": "^0.14.0-beta.140",
     "@xterm/addon-unicode11": "^0.10.0-beta.101",
-    "@xterm/addon-webgl": "^0.19.0-beta.98",
+    "@xterm/addon-webgl": "^0.20.0-beta.100",
     "@xterm/headless": "^5.6.0-beta.140",
     "@xterm/xterm": "^5.6.0-beta.98",
     "cookie": "^0.7.0",

From 866f84667be256c735997dba15fdd305e55ca7e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:28:23 +0000
Subject: [PATCH 1522/1815] Bump @parcel/watcher from 2.5.1 to 2.5.4

Bumps [@parcel/watcher](https://github.com/parcel-bundler/watcher) from 2.5.1 to 2.5.4.
- [Release notes](https://github.com/parcel-bundler/watcher/releases)
- [Commits](https://github.com/parcel-bundler/watcher/compare/v2.5.1...v2.5.4)

---
updated-dependencies:
- dependency-name: "@parcel/watcher"
  dependency-version: 2.5.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 149 ++++++++++++++++++++++++----------------------
 package.json      |   2 +-
 2 files changed, 79 insertions(+), 72 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ae68d9266a16..e6a395583cad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
       "dependencies": {
         "@microsoft/1ds-core-js": "^3.2.13",
         "@microsoft/1ds-post-js": "^3.2.13",
-        "@parcel/watcher": "2.5.1",
+        "@parcel/watcher": "2.5.4",
         "@types/semver": "^7.7.1",
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.1",
@@ -1852,16 +1852,16 @@
       }
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
-      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.4.tgz",
+      "integrity": "sha512-WYa2tUVV5HiArWPB3ydlOc4R2ivq0IDrlqhMi3l7mVsFEXNcTfxYFPIHXHXIh/ca/y/V5N4E1zecyxdIBjYnkQ==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "detect-libc": "^1.0.3",
+        "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"
@@ -1871,25 +1871,25 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.1",
-        "@parcel/watcher-darwin-arm64": "2.5.1",
-        "@parcel/watcher-darwin-x64": "2.5.1",
-        "@parcel/watcher-freebsd-x64": "2.5.1",
-        "@parcel/watcher-linux-arm-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm-musl": "2.5.1",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm64-musl": "2.5.1",
-        "@parcel/watcher-linux-x64-glibc": "2.5.1",
-        "@parcel/watcher-linux-x64-musl": "2.5.1",
-        "@parcel/watcher-win32-arm64": "2.5.1",
-        "@parcel/watcher-win32-ia32": "2.5.1",
-        "@parcel/watcher-win32-x64": "2.5.1"
+        "@parcel/watcher-android-arm64": "2.5.4",
+        "@parcel/watcher-darwin-arm64": "2.5.4",
+        "@parcel/watcher-darwin-x64": "2.5.4",
+        "@parcel/watcher-freebsd-x64": "2.5.4",
+        "@parcel/watcher-linux-arm-glibc": "2.5.4",
+        "@parcel/watcher-linux-arm-musl": "2.5.4",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.4",
+        "@parcel/watcher-linux-arm64-musl": "2.5.4",
+        "@parcel/watcher-linux-x64-glibc": "2.5.4",
+        "@parcel/watcher-linux-x64-musl": "2.5.4",
+        "@parcel/watcher-win32-arm64": "2.5.4",
+        "@parcel/watcher-win32-ia32": "2.5.4",
+        "@parcel/watcher-win32-x64": "2.5.4"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
-      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.4.tgz",
+      "integrity": "sha512-hoh0vx4v+b3BNI7Cjoy2/B0ARqcwVNrzN/n7DLq9ZB4I3lrsvhrkCViJyfTj/Qi5xM9YFiH4AmHGK6pgH1ss7g==",
       "cpu": [
         "arm64"
       ],
@@ -1907,9 +1907,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
-      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.4.tgz",
+      "integrity": "sha512-kphKy377pZiWpAOyTgQYPE5/XEKVMaj6VUjKT5VkNyUJlr2qZAn8gIc7CPzx+kbhvqHDT9d7EqdOqRXT6vk0zw==",
       "cpu": [
         "arm64"
       ],
@@ -1927,9 +1927,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
-      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.4.tgz",
+      "integrity": "sha512-UKaQFhCtNJW1A9YyVz3Ju7ydf6QgrpNQfRZ35wNKUhTQ3dxJ/3MULXN5JN/0Z80V/KUBDGa3RZaKq1EQT2a2gg==",
       "cpu": [
         "x64"
       ],
@@ -1947,9 +1947,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
-      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.4.tgz",
+      "integrity": "sha512-Dib0Wv3Ow/m2/ttvLdeI2DBXloO7t3Z0oCp4bAb2aqyqOjKPPGrg10pMJJAQ7tt8P4V2rwYwywkDhUia/FgS+Q==",
       "cpu": [
         "x64"
       ],
@@ -1967,9 +1967,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
-      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.4.tgz",
+      "integrity": "sha512-I5Vb769pdf7Q7Sf4KNy8Pogl/URRCKu9ImMmnVKYayhynuyGYMzuI4UOWnegQNa2sGpsPSbzDsqbHNMyeyPCgw==",
       "cpu": [
         "arm"
       ],
@@ -1987,9 +1987,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
-      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.4.tgz",
+      "integrity": "sha512-kGO8RPvVrcAotV4QcWh8kZuHr9bXi9a3bSZw7kFarYR0+fGliU7hd/zevhjw8fnvIKG3J9EO5G6sXNGCSNMYPQ==",
       "cpu": [
         "arm"
       ],
@@ -2007,9 +2007,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
-      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.4.tgz",
+      "integrity": "sha512-KU75aooXhqGFY2W5/p8DYYHt4hrjHZod8AhcGAmhzPn/etTa+lYCDB2b1sJy3sWJ8ahFVTdy+EbqSBvMx3iFlw==",
       "cpu": [
         "arm64"
       ],
@@ -2027,9 +2027,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
-      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.4.tgz",
+      "integrity": "sha512-Qx8uNiIekVutnzbVdrgSanM+cbpDD3boB1f8vMtnuG5Zau4/bdDbXyKwIn0ToqFhIuob73bcxV9NwRm04/hzHQ==",
       "cpu": [
         "arm64"
       ],
@@ -2047,9 +2047,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
-      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.4.tgz",
+      "integrity": "sha512-UYBQvhYmgAv61LNUn24qGQdjtycFBKSK3EXr72DbJqX9aaLbtCOO8+1SkKhD/GNiJ97ExgcHBrukcYhVjrnogA==",
       "cpu": [
         "x64"
       ],
@@ -2067,9 +2067,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
-      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.4.tgz",
+      "integrity": "sha512-YoRWCVgxv8akZrMhdyVi6/TyoeeMkQ0PGGOf2E4omODrvd1wxniXP+DBynKoHryStks7l+fDAMUBRzqNHrVOpg==",
       "cpu": [
         "x64"
       ],
@@ -2087,9 +2087,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
-      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.4.tgz",
+      "integrity": "sha512-iby+D/YNXWkiQNYcIhg8P5hSjzXEHaQrk2SLrWOUD7VeC4Ohu0WQvmV+HDJokZVJ2UjJ4AGXW3bx7Lls9Ln4TQ==",
       "cpu": [
         "arm64"
       ],
@@ -2107,9 +2107,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
-      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.4.tgz",
+      "integrity": "sha512-vQN+KIReG0a2ZDpVv8cgddlf67J8hk1WfZMMP7sMeZmJRSmEax5xNDNWKdgqSe2brOKTQQAs3aCCUal2qBHAyg==",
       "cpu": [
         "ia32"
       ],
@@ -2127,9 +2127,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
-      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.4.tgz",
+      "integrity": "sha512-3A6efb6BOKwyw7yk9ro2vus2YTt2nvcd56AuzxdMiVOxL9umDyN5PKkKfZ/gZ9row41SjVmTVQNWQhaRRGpOKw==",
       "cpu": [
         "x64"
       ],
@@ -2146,16 +2146,16 @@
         "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@parcel/watcher/node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "license": "Apache-2.0",
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
+    "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": ">=0.10"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
     "node_modules/@pkgjs/parseargs": {
@@ -4827,6 +4827,7 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -6198,9 +6199,10 @@
       }
     },
     "node_modules/detect-libc": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
-      "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+      "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",
       "engines": {
         "node": ">=8"
       }
@@ -7313,6 +7315,7 @@
       "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"
       },
@@ -10277,6 +10280,7 @@
       "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"
       }
@@ -11479,6 +11483,7 @@
       "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",
@@ -12966,6 +12971,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -15926,6 +15932,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"
       },
diff --git a/package.json b/package.json
index c1d5e8d2069d..3087d8fa82cb 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
-    "@parcel/watcher": "2.5.1",
+    "@parcel/watcher": "2.5.4",
     "@types/semver": "^7.7.1",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.1",

From 4422e60f34310ca28377d51b3a1e29fcafa8a039 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:28:27 +0000
Subject: [PATCH 1523/1815] Bump @microsoft/1ds-post-js from 3.2.13 to 4.3.11
 in /remote

Bumps [@microsoft/1ds-post-js](https://github.com/microsoft/ApplicationInsights-JS) from 3.2.13 to 4.3.11.
- [Release notes](https://github.com/microsoft/ApplicationInsights-JS/releases)
- [Changelog](https://github.com/microsoft/ApplicationInsights-JS/blob/main/RELEASES.md)
- [Commits](https://github.com/microsoft/ApplicationInsights-JS/commits)

---
updated-dependencies:
- dependency-name: "@microsoft/1ds-post-js"
  dependency-version: 4.3.11
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 85 +++++++++-------------------------------
 remote/package.json      |  2 +-
 2 files changed, 19 insertions(+), 68 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 759f49e639b0..50fdd920f648 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.0.0",
       "dependencies": {
         "@microsoft/1ds-core-js": "^4.3.10",
-        "@microsoft/1ds-post-js": "^3.2.13",
+        "@microsoft/1ds-post-js": "^4.3.11",
         "@parcel/watcher": "2.5.1",
         "@vscode/deviceid": "^0.1.2",
         "@vscode/iconv-lite-umd": "0.7.1",
@@ -47,74 +47,35 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.10",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
-      "integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==",
+      "version": "4.3.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.11.tgz",
+      "integrity": "sha512-QyQE/YzFYB+31WEpX9hvDoXZOIXA7308Z5uuL1mSsyDSkNPl24hBWz9O3vZL+/p9shy756eKLI2nFLwwIAhXyw==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.10",
+        "@microsoft/applicationinsights-core-js": "3.3.11",
         "@microsoft/applicationinsights-shims": "3.0.1",
         "@microsoft/dynamicproto-js": "^2.0.3",
         "@nevware21/ts-async": ">= 0.5.4 < 2.x",
         "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
-    "node_modules/@microsoft/1ds-core-js/node_modules/@microsoft/applicationinsights-shims": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
-      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
-      }
-    },
-    "node_modules/@microsoft/1ds-core-js/node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
-      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
-      }
-    },
     "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/1ds-post-js/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==",
-      "license": "MIT",
-      "dependencies": {
-        "@microsoft/applicationinsights-core-js": "2.8.15",
-        "@microsoft/applicationinsights-shims": "^2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.7"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/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==",
+      "version": "4.3.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.11.tgz",
+      "integrity": "sha512-V0ZeeALy/Pj8HWgNHDsK+yDeCYnJ9bCgTWhcrna/ZiAT+sGfWs6mDBjAVcG03uP7TDjdWLf8w79lgbXJ3+s3DA==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-shims": "2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.9"
-      },
-      "peerDependencies": {
-        "tslib": "*"
+        "@microsoft/1ds-core-js": "4.3.11",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.10",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.10.tgz",
-      "integrity": "sha512-5yKeyassZTq2l+SAO4npu6LPnbS++UD+M+Ghjm9uRzoBwD8tumFx0/F8AkSVqbniSREd+ztH/2q2foewa2RZyg==",
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.11.tgz",
+      "integrity": "sha512-WlBY1sKDNL62T++NifgFCyDuOoNUNrVILfnHubOzgU/od7MFEQYWU8EZyDcBC/+Z8e3TD6jfixurYtWoUC+6Eg==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
@@ -126,7 +87,7 @@
         "tslib": ">= 1.0.0"
       }
     },
-    "node_modules/@microsoft/applicationinsights-core-js/node_modules/@microsoft/applicationinsights-shims": {
+    "node_modules/@microsoft/applicationinsights-shims": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
       "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
@@ -135,7 +96,7 @@
         "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
       }
     },
-    "node_modules/@microsoft/applicationinsights-core-js/node_modules/@microsoft/dynamicproto-js": {
+    "node_modules/@microsoft/dynamicproto-js": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
       "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
@@ -144,16 +105,6 @@
         "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
       }
     },
-    "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/@nevware21/ts-async": {
       "version": "0.5.4",
       "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
diff --git a/remote/package.json b/remote/package.json
index c4ec21f02555..88992e11a5aa 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@microsoft/1ds-core-js": "^4.3.10",
-    "@microsoft/1ds-post-js": "^3.2.13",
+    "@microsoft/1ds-post-js": "^4.3.11",
     "@parcel/watcher": "2.5.1",
     "@vscode/deviceid": "^0.1.2",
     "@vscode/iconv-lite-umd": "0.7.1",

From 8ca25483f6b1077ed60331a77197897ba925d155 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:28:32 +0000
Subject: [PATCH 1524/1815] Bump @xterm/addon-image in /remote

Bumps [@xterm/addon-image](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.76 to 0.10.0-beta.101.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-image"
  dependency-version: 0.10.0-beta.101
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 759f49e639b0..af56297c3f4e 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -21,7 +21,7 @@
         "@vscode/windows-process-tree": "^0.6.2",
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.2.0-beta.123",
-        "@xterm/addon-image": "^0.10.0-beta.76",
+        "@xterm/addon-image": "^0.10.0-beta.101",
         "@xterm/addon-ligatures": "^0.10.0-beta.140",
         "@xterm/addon-progress": "^0.3.0-beta.101",
         "@xterm/addon-search": "^0.17.0-beta.101",
@@ -622,12 +622,12 @@
       }
     },
     "node_modules/@xterm/addon-image": {
-      "version": "0.10.0-beta.76",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.76.tgz",
-      "integrity": "sha512-YdHv4jOEnu92g6X3Z9TKD+TQp9SvcMRiLKrvLHO7quH10IymhzUU/37LnpyMTSYsoCuUbNr/rHfYcdbR6hZqug==",
+      "version": "0.10.0-beta.101",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.101.tgz",
+      "integrity": "sha512-Gd8ZpfyzvisG+08+mXynufQHfaWWxGhhtRMSQXV2FyPNa3MNXNrowgjeXhpaRObOOsxSZnAlB8qDW8OHTjzG6A==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.76"
+        "@xterm/xterm": "^6.1.0-beta.101"
       }
     },
     "node_modules/@xterm/addon-ligatures": {
diff --git a/remote/package.json b/remote/package.json
index c4ec21f02555..f6c444d9c673 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -16,7 +16,7 @@
     "@vscode/windows-process-tree": "^0.6.2",
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.2.0-beta.123",
-    "@xterm/addon-image": "^0.10.0-beta.76",
+    "@xterm/addon-image": "^0.10.0-beta.101",
     "@xterm/addon-ligatures": "^0.10.0-beta.140",
     "@xterm/addon-progress": "^0.3.0-beta.101",
     "@xterm/addon-search": "^0.17.0-beta.101",

From bb63980cff39c9a0b6fcaae8bfb3f88078f5f413 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:28:34 +0000
Subject: [PATCH 1525/1815] Bump @vscode/telemetry-extractor from 1.10.2 to
 1.18.0

Bumps [@vscode/telemetry-extractor](https://github.com/microsoft/vscode-telemetry-extractor) from 1.10.2 to 1.18.0.
- [Release notes](https://github.com/microsoft/vscode-telemetry-extractor/releases)
- [Commits](https://github.com/microsoft/vscode-telemetry-extractor/compare/v1.10.2...v1.18.0)

---
updated-dependencies:
- dependency-name: "@vscode/telemetry-extractor"
  dependency-version: 1.18.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 137 ++++++++++++++++++++++++----------------------
 package.json      |   2 +-
 2 files changed, 73 insertions(+), 66 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ae68d9266a16..c47302f16094 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -80,7 +80,7 @@
         "@typescript-eslint/utils": "^8.8.0",
         "@vscode/gulp-electron": "^1.38.2",
         "@vscode/l10n-dev": "0.0.35",
-        "@vscode/telemetry-extractor": "^1.10.2",
+        "@vscode/telemetry-extractor": "^1.18.0",
         "@vscode/test-cli": "^0.0.6",
         "@vscode/test-electron": "^2.4.0",
         "@vscode/test-web": "^0.0.77",
@@ -2342,14 +2342,14 @@
       }
     },
     "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==",
+      "version": "0.26.1",
+      "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.26.1.tgz",
+      "integrity": "sha512-Sn28TGl/4cFpcM+jwsH1wLncYq3FtN/BIpem+HOygfBWPT5pAeS5dB4VFVzV8FbnOKHpDLZmvAl4AjPEev5idA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "fast-glob": "^3.2.12",
-        "minimatch": "^7.4.3",
-        "mkdirp": "^2.1.6",
+        "fast-glob": "^3.3.2",
+        "minimatch": "^9.0.4",
         "path-browserify": "^1.0.1"
       }
     },
@@ -2364,30 +2364,16 @@
       }
     },
     "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==",
+      "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": ">=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"
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -3357,14 +3343,15 @@
       "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==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/@vscode/telemetry-extractor/-/telemetry-extractor-1.18.0.tgz",
+      "integrity": "sha512-bj/+tFpdgZHCynotGY/4FxF9rqmLL1geuLyitLkRfiS2BN89B7WQ14g2Q+B7ZOg5G8ZcLIOjnF0p5JNO2HE4hQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@vscode/ripgrep": "^1.15.9",
-        "command-line-args": "^5.2.1",
-        "ts-morph": "^19.0.0"
+        "@vscode/ripgrep": "^1.15.10",
+        "command-line-args": "^6.0.1",
+        "ts-morph": "^25.0.1"
       },
       "bin": {
         "vscode-telemetry-extractor": "out/extractor.js"
@@ -4409,12 +4396,13 @@
       }
     },
     "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==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/array-back/-/array-back-6.2.2.tgz",
+      "integrity": "sha512-gUAZ7HPyb4SJczXAMUXMGAvI976JoK3qEx9v1FTmeYuJj0IBiaKttG1ydtGKdkfqWkIkouke7nG8ufGy77+Cvw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">=12.17"
       }
     },
     "node_modules/array-differ": {
@@ -5394,10 +5382,11 @@
       }
     },
     "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
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-13.0.3.tgz",
+      "integrity": "sha512-Oofo0pq3IKnsFtuHqSF7TqBfr71aeyZDVJ0HpmqB7FBM2qEigL0iPONSCZSO9pE9dZTAxANe5XHG9Uy0YMv8cg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/color-convert": {
       "version": "2.0.1",
@@ -5461,18 +5450,27 @@
       }
     },
     "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==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-6.0.1.tgz",
+      "integrity": "sha512-Jr3eByUjqyK0qd8W0SGFW1nZwqCaNCtbXjRo2cRJC1OYxWl3MZ5t1US3jq+cO4sPavqgw4l9BMGX0CBe+trepg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "array-back": "^3.1.0",
-        "find-replace": "^3.0.0",
+        "array-back": "^6.2.2",
+        "find-replace": "^5.0.2",
         "lodash.camelcase": "^4.3.0",
-        "typical": "^4.0.0"
+        "typical": "^7.2.0"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=12.20"
+      },
+      "peerDependencies": {
+        "@75lb/nature": "latest"
+      },
+      "peerDependenciesMeta": {
+        "@75lb/nature": {
+          "optional": true
+        }
       }
     },
     "node_modules/commander": {
@@ -7327,15 +7325,21 @@
       "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==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-5.0.2.tgz",
+      "integrity": "sha512-Y45BAiE3mz2QsrN2fb5QEtO4qb44NcS7en/0y9PEVsg351HsLeVclP8QPMH79Le9sH3rs5RSwJu99W0WPZO43Q==",
       "dev": true,
-      "dependencies": {
-        "array-back": "^3.0.1"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@75lb/nature": "latest"
+      },
+      "peerDependenciesMeta": {
+        "@75lb/nature": {
+          "optional": true
+        }
       }
     },
     "node_modules/find-up": {
@@ -11200,8 +11204,9 @@
     "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
+      "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.clone": {
       "version": "4.5.0",
@@ -16077,13 +16082,14 @@
       }
     },
     "node_modules/ts-morph": {
-      "version": "19.0.0",
-      "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-19.0.0.tgz",
-      "integrity": "sha512-D6qcpiJdn46tUqV45vr5UGM2dnIEuTGNxVhg0sk5NX11orcouwj6i1bMqZIz2mZTZB1Hcgy7C3oEVhAT+f6mbQ==",
+      "version": "25.0.1",
+      "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-25.0.1.tgz",
+      "integrity": "sha512-QJEiTdnz1YjrB3JFhd626gX4rKHDLSjSVMvGGG4v7ONc3RBwa0Eei98G9AT9uNFDMtV54JyuXsFeC+OH0n6bXQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@ts-morph/common": "~0.20.0",
-        "code-block-writer": "^12.0.0"
+        "@ts-morph/common": "~0.26.0",
+        "code-block-writer": "^13.0.3"
       }
     },
     "node_modules/ts-node": {
@@ -16419,12 +16425,13 @@
       }
     },
     "node_modules/typical": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz",
-      "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/typical/-/typical-7.3.0.tgz",
+      "integrity": "sha512-ya4mg/30vm+DOWfBg4YK3j2WD6TWtRkCbasOJr40CseYENzCUby/7rIvXA99JGsQHeNxLbnXdyLLxKSv3tauFw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=12.17"
       }
     },
     "node_modules/uc.micro": {
diff --git a/package.json b/package.json
index c1d5e8d2069d..eb80abe215c3 100644
--- a/package.json
+++ b/package.json
@@ -139,7 +139,7 @@
     "@typescript-eslint/utils": "^8.8.0",
     "@vscode/gulp-electron": "^1.38.2",
     "@vscode/l10n-dev": "0.0.35",
-    "@vscode/telemetry-extractor": "^1.10.2",
+    "@vscode/telemetry-extractor": "^1.18.0",
     "@vscode/test-cli": "^0.0.6",
     "@vscode/test-electron": "^2.4.0",
     "@vscode/test-web": "^0.0.77",

From eacaca23177c44a00b70c2e5f6c626c4b7dffc8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:28:37 +0000
Subject: [PATCH 1526/1815] Bump @vscode/windows-process-tree from 0.6.2 to
 0.6.3 in /remote

Bumps [@vscode/windows-process-tree](https://github.com/microsoft/vscode-windows-process-tree) from 0.6.2 to 0.6.3.
- [Release notes](https://github.com/microsoft/vscode-windows-process-tree/releases)
- [Commits](https://github.com/microsoft/vscode-windows-process-tree/compare/v0.6.2...v0.6.3)

---
updated-dependencies:
- dependency-name: "@vscode/windows-process-tree"
  dependency-version: 0.6.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 759f49e639b0..acd91777820e 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -18,7 +18,7 @@
         "@vscode/spdlog": "^0.15.4",
         "@vscode/tree-sitter-wasm": "^0.3.0",
         "@vscode/vscode-languagedetection": "1.0.22",
-        "@vscode/windows-process-tree": "^0.6.2",
+        "@vscode/windows-process-tree": "^0.6.3",
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.2.0-beta.123",
         "@xterm/addon-image": "^0.10.0-beta.76",
@@ -594,9 +594,9 @@
       }
     },
     "node_modules/@vscode/windows-process-tree": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/@vscode/windows-process-tree/-/windows-process-tree-0.6.2.tgz",
-      "integrity": "sha512-uzyUuQ93m7K1jSPrB/72m4IspOyeGpvvghNwFCay/McZ+y4Hk2BnLdZPb6EJ8HLRa3GwCvYjH/MQZzcnLOVnaQ==",
+      "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": {
diff --git a/remote/package.json b/remote/package.json
index c4ec21f02555..599a41ca0ea4 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -13,7 +13,7 @@
     "@vscode/spdlog": "^0.15.4",
     "@vscode/tree-sitter-wasm": "^0.3.0",
     "@vscode/vscode-languagedetection": "1.0.22",
-    "@vscode/windows-process-tree": "^0.6.2",
+    "@vscode/windows-process-tree": "^0.6.3",
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.2.0-beta.123",
     "@xterm/addon-image": "^0.10.0-beta.76",

From 97cb7e23f96199dedfab6ebbbd62e0e8820eacd7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:28:41 +0000
Subject: [PATCH 1527/1815] Bump yazl from 2.4.3 to 3.3.1 in /remote

Bumps [yazl](https://github.com/thejoshwolfe/yazl) from 2.4.3 to 3.3.1.
- [Commits](https://github.com/thejoshwolfe/yazl/compare/2.4.3...3.3.1)

---
updated-dependencies:
- dependency-name: yazl
  dependency-version: 3.3.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 20 +++++++++++++++-----
 remote/package.json      |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 759f49e639b0..d0e5f91014cc 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -43,7 +43,7 @@
         "vscode-regexpp": "^3.1.0",
         "vscode-textmate": "9.3.1",
         "yauzl": "^3.0.0",
-        "yazl": "^2.4.3"
+        "yazl": "^3.3.1"
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
@@ -1623,11 +1623,21 @@
       }
     },
     "node_modules/yazl": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.3.tgz",
-      "integrity": "sha1-7CblzIfVYBud+EMtvdPNLlFzoHE= sha512-cIUrm3/81iF/BzuyORI7ppz1vGHAhA62JYzAFFC+rwJ2jQF1LcYxY9UXx4XyUXojkCnol0SvPuc+Toc7FO4W8g==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/yazl/-/yazl-3.3.1.tgz",
+      "integrity": "sha512-BbETDVWG+VcMUle37k5Fqp//7SDOK2/1+T7X8TD96M3D9G8jK5VLUdQVdVjGi8im7FGkazX7kk5hkU8X4L5Bng==",
+      "license": "MIT",
       "dependencies": {
-        "buffer-crc32": "~0.2.3"
+        "buffer-crc32": "^1.0.0"
+      }
+    },
+    "node_modules/yazl/node_modules/buffer-crc32": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz",
+      "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.0.0"
       }
     }
   }
diff --git a/remote/package.json b/remote/package.json
index c4ec21f02555..679237b0afc8 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -38,7 +38,7 @@
     "vscode-regexpp": "^3.1.0",
     "vscode-textmate": "9.3.1",
     "yauzl": "^3.0.0",
-    "yazl": "^2.4.3"
+    "yazl": "^3.3.1"
   },
   "overrides": {
     "node-gyp-build": "4.8.1",

From 522e036d0ef0a9ce7c5658a6f633d85c2d9dfc0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 12:28:43 +0000
Subject: [PATCH 1528/1815] Bump gulp-rename from 1.2.2 to 2.1.0

Bumps [gulp-rename](https://github.com/hparra/gulp-rename) from 1.2.2 to 2.1.0.
- [Release notes](https://github.com/hparra/gulp-rename/releases)
- [Changelog](https://github.com/hparra/gulp-rename/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hparra/gulp-rename/compare/v1.2.2...v2.1.0)

---
updated-dependencies:
- dependency-name: gulp-rename
  dependency-version: 2.1.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 22 ++++++++++++++++------
 package.json      |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ae68d9266a16..d36f09c81f73 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -116,7 +116,7 @@
         "gulp-gzip": "^1.4.2",
         "gulp-json-editor": "^2.5.0",
         "gulp-plumber": "^1.2.1",
-        "gulp-rename": "^1.2.0",
+        "gulp-rename": "^2.1.0",
         "gulp-replace": "^1.1.4",
         "gulp-sourcemaps": "^3.0.0",
         "gulp-svgmin": "^4.1.0",
@@ -3045,6 +3045,16 @@
         "url": "https://github.com/sindresorhus/got?sponsor=1"
       }
     },
+    "node_modules/@vscode/gulp-electron/node_modules/gulp-rename": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz",
+      "integrity": "sha512-qhfUlYwq5zIP4cpRjx+np2vZVnr0xCRQrF3RsGel8uqL47Gu3yjmllSfnvJyl/39zYuxS68e1nnxImbm7388vw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0",
+        "npm": ">=1.2.10"
+      }
+    },
     "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",
@@ -9016,13 +9026,13 @@
       }
     },
     "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==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.1.0.tgz",
+      "integrity": "sha512-dGuzuH8jQGqCMqC544IEPhs5+O2l+IkdoSZsgd4kY97M1CxQeI3qrmweQBIrxLBbjbe/8uEWK8HHcNBc3OCy4g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0",
-        "npm": ">=1.2.10"
+        "node": ">=4"
       }
     },
     "node_modules/gulp-replace": {
diff --git a/package.json b/package.json
index c1d5e8d2069d..a177be968725 100644
--- a/package.json
+++ b/package.json
@@ -175,7 +175,7 @@
     "gulp-gzip": "^1.4.2",
     "gulp-json-editor": "^2.5.0",
     "gulp-plumber": "^1.2.1",
-    "gulp-rename": "^1.2.0",
+    "gulp-rename": "^2.1.0",
     "gulp-replace": "^1.1.4",
     "gulp-sourcemaps": "^3.0.0",
     "gulp-svgmin": "^4.1.0",

From df3c84a1cc0480a32fd9d00d5310282cc9e03efb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 17:24:38 +0000
Subject: [PATCH 1529/1815] Bump workerpool from 6.5.0 to 10.0.1 in /build

Bumps [workerpool](https://github.com/josdejong/workerpool) from 6.5.0 to 10.0.1.
- [Changelog](https://github.com/josdejong/workerpool/blob/master/HISTORY.md)
- [Commits](https://github.com/josdejong/workerpool/compare/v6.5.0...v10.0.1)

---
updated-dependencies:
- dependency-name: workerpool
  dependency-version: 10.0.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 11 ++++++-----
 build/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index daf380d086fc..31e239f70db5 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -59,7 +59,7 @@
         "through2": "^4.0.2",
         "tree-sitter": "^0.25.0",
         "vscode-universal-bundler": "^0.1.3",
-        "workerpool": "^6.4.0",
+        "workerpool": "^10.0.1",
         "yauzl": "^3.2.0"
       },
       "optionalDependencies": {
@@ -6964,10 +6964,11 @@
       }
     },
     "node_modules/workerpool": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.0.tgz",
-      "integrity": "sha512-r64Ea3glXY2RVzMeNxB+4J+0YHAVzUdV4cM5nHi4BBC2LvnO1pWFAIYKYuGcPElbg1/7eEiaPtZ/jzCjIUuGBg==",
-      "dev": true
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-10.0.1.tgz",
+      "integrity": "sha512-NAnKwZJxWlj/U1cp6ZkEtPE+GQY1S6KtOS3AlCiPfPFLxV3m64giSp7g2LsNJxzYCocDT7TSl+7T0sgrDp3KoQ==",
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/wrap-ansi": {
       "version": "8.1.0",
diff --git a/build/package.json b/build/package.json
index 782ba8372e43..a177601b97c6 100644
--- a/build/package.json
+++ b/build/package.json
@@ -53,7 +53,7 @@
     "through2": "^4.0.2",
     "tree-sitter": "^0.25.0",
     "vscode-universal-bundler": "^0.1.3",
-    "workerpool": "^6.4.0",
+    "workerpool": "^10.0.1",
     "yauzl": "^3.2.0"
   },
   "type": "commonjs",

From 80c718acb87da2cb7eb7faca2150a87c2fdd779d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 17:38:06 +0000
Subject: [PATCH 1530/1815] Bump clap from 4.5.4 to 4.5.54 in /cli

Bumps [clap](https://github.com/clap-rs/clap) from 4.5.4 to 4.5.54.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.4...clap_complete-v4.5.54)

---
updated-dependencies:
- dependency-name: clap
  dependency-version: 4.5.54
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 16 ++++++++--------
 cli/Cargo.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index f225d8d69d77..27667acad6cc 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -43,9 +43,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.7"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
 
 [[package]]
 name = "anstyle-parse"
@@ -337,9 +337,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.4"
+version = "4.5.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -347,9 +347,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00"
 dependencies = [
  "anstream",
  "anstyle",
@@ -359,9 +359,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.4"
+version = "4.5.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
 dependencies = [
  "heck",
  "proc-macro2",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index bab24354c6ef..f315c5d54a83 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -13,7 +13,7 @@ name = "code"
 
 [dependencies]
 futures = "0.3.31"
-clap = { version = "4.3.0", features = ["derive", "env"] }
+clap = { version = "4.5.54", features = ["derive", "env"] }
 open = "5.3.3"
 reqwest = { version = "0.12.5", default-features = false, features = ["json", "stream", "native-tls"] }
 tokio = { version = "1.49.0", features = ["full"] }

From fac41a9a2c9cb6b7965115d3cb262e578da3e9aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 17:38:15 +0000
Subject: [PATCH 1531/1815] Bump zip from 0.6.6 to 2.3.0 in /cli

Bumps [zip](https://github.com/zip-rs/zip2) from 0.6.6 to 2.3.0.
- [Release notes](https://github.com/zip-rs/zip2/releases)
- [Changelog](https://github.com/zip-rs/zip2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zip-rs/zip2/commits/v2.3.0)

---
updated-dependencies:
- dependency-name: zip
  dependency-version: 2.3.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 30 +++++++++++++++++++++++++++---
 cli/Cargo.toml |  2 +-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index f225d8d69d77..64986cb58c22 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -75,6 +75,15 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "arbitrary"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
+dependencies = [
+ "derive_arbitrary",
+]
+
 [[package]]
 name = "async-broadcast"
 version = "0.5.1"
@@ -583,6 +592,17 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "derive_arbitrary"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "dialoguer"
 version = "0.12.0"
@@ -3816,14 +3836,18 @@ dependencies = [
 
 [[package]]
 name = "zip"
-version = "0.6.6"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+checksum = "84e9a772a54b54236b9b744aaaf8d7be01b4d6e99725523cb82cb32d1c81b1d7"
 dependencies = [
- "byteorder",
+ "arbitrary",
  "crc32fast",
  "crossbeam-utils",
+ "displaydoc",
  "flate2",
+ "indexmap 2.2.6",
+ "memchr",
+ "thiserror 2.0.17",
  "time",
 ]
 
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index bab24354c6ef..4333ac87ef67 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -19,7 +19,7 @@ reqwest = { version = "0.12.5", default-features = false, features = ["json", "s
 tokio = { version = "1.49.0", features = ["full"] }
 tokio-util = { version = "0.7.8", features = ["compat", "codec"] }
 flate2 = { version = "1.1.5", default-features = false, features = ["zlib"] }
-zip = { version = "0.6.6", default-features = false, features = ["time", "deflate-zlib"] }
+zip = { version = "2.3.0", default-features = false, features = ["time", "deflate-zlib"] }
 regex = "1.12.2"
 lazy_static = "1.5.0"
 sysinfo = { version = "0.37.2", default-features = false }

From e3f50270db0e0154fa03812752ea34c573edbf6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 18:29:37 +0000
Subject: [PATCH 1532/1815] Bump @xterm/addon-clipboard in /remote/web

Bumps [@xterm/addon-clipboard](https://github.com/xtermjs/xterm.js) from 0.3.0-beta.89 to 0.3.0-beta.101.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-clipboard"
  dependency-version: 0.3.0-beta.101
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 9065ee7e6e24..e34a03a1a105 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -13,7 +13,7 @@
 				"@vscode/iconv-lite-umd": "0.7.1",
 				"@vscode/tree-sitter-wasm": "^0.3.0",
 				"@vscode/vscode-languagedetection": "1.0.22",
-				"@xterm/addon-clipboard": "^0.3.0-beta.89",
+				"@xterm/addon-clipboard": "^0.3.0-beta.103",
 				"@xterm/addon-image": "^0.10.0-beta.101",
 				"@xterm/addon-ligatures": "^0.11.0-beta.101",
 				"@xterm/addon-progress": "^0.3.0-beta.101",
@@ -152,15 +152,15 @@
 			}
 		},
 		"node_modules/@xterm/addon-clipboard": {
-			"version": "0.3.0-beta.89",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.89.tgz",
-			"integrity": "sha512-1weXTZ0dSvO94gsP++7XwaIVA2+6EC92EEiWI+FpBiGQCz261DjMdo4+8dBwmkovuxBvSdy0L6bTB9EJv94haw==",
+			"version": "0.3.0-beta.103",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.103.tgz",
+			"integrity": "sha512-L3h9GEiNhopTF3TnacebbrtgrcObw1Of8NMJFx65OYtyIxW1JqTuFHcFayQg2gksdQnoUIpfqQiMauo16dp0Nw==",
 			"license": "MIT",
 			"dependencies": {
 				"js-base64": "^3.7.5"
 			},
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.89"
+				"@xterm/xterm": "^6.1.0-beta.103"
 			}
 		},
 		"node_modules/@xterm/addon-image": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 05f7bea29088..62b616492152 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -8,7 +8,7 @@
 		"@vscode/iconv-lite-umd": "0.7.1",
 		"@vscode/tree-sitter-wasm": "^0.3.0",
 		"@vscode/vscode-languagedetection": "1.0.22",
-		"@xterm/addon-clipboard": "^0.3.0-beta.89",
+		"@xterm/addon-clipboard": "^0.3.0-beta.103",
 		"@xterm/addon-image": "^0.10.0-beta.101",
 		"@xterm/addon-ligatures": "^0.11.0-beta.101",
 		"@xterm/addon-progress": "^0.3.0-beta.101",

From 8dd8cdcfbfb9831941df2f449589d2b718401e0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jan 2026 18:32:03 +0000
Subject: [PATCH 1533/1815] Bump @microsoft/1ds-post-js from 4.3.10 to 4.3.11
 in /remote/web

Bumps [@microsoft/1ds-post-js](https://github.com/microsoft/ApplicationInsights-JS) from 4.3.10 to 4.3.11.
- [Release notes](https://github.com/microsoft/ApplicationInsights-JS/releases)
- [Changelog](https://github.com/microsoft/ApplicationInsights-JS/blob/main/RELEASES.md)
- [Commits](https://github.com/microsoft/ApplicationInsights-JS/commits)

---
updated-dependencies:
- dependency-name: "@microsoft/1ds-post-js"
  dependency-version: 4.3.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 38 +++++-------------------------------
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 9065ee7e6e24..0ca648dd9cb3 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -9,7 +9,7 @@
 			"version": "0.0.0",
 			"dependencies": {
 				"@microsoft/1ds-core-js": "^4.3.11",
-				"@microsoft/1ds-post-js": "^4.3.10",
+				"@microsoft/1ds-post-js": "^4.3.11",
 				"@vscode/iconv-lite-umd": "0.7.1",
 				"@vscode/tree-sitter-wasm": "^0.3.0",
 				"@vscode/vscode-languagedetection": "1.0.22",
@@ -42,44 +42,16 @@
 			}
 		},
 		"node_modules/@microsoft/1ds-post-js": {
-			"version": "4.3.10",
-			"resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.10.tgz",
-			"integrity": "sha512-VSLjc9cT+Y+eTiSfYltJHJCejn8oYr0E6Pq2BMhOEO7F6IyLGYIxzKKvo78ze9x+iHX7KPTATcZ+PFgjGXuNqg==",
-			"license": "MIT",
-			"dependencies": {
-				"@microsoft/1ds-core-js": "4.3.10",
-				"@microsoft/applicationinsights-shims": "3.0.1",
-				"@microsoft/dynamicproto-js": "^2.0.3",
-				"@nevware21/ts-async": ">= 0.5.4 < 2.x",
-				"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
-			}
-		},
-		"node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/1ds-core-js": {
-			"version": "4.3.10",
-			"resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz",
-			"integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==",
-			"license": "MIT",
-			"dependencies": {
-				"@microsoft/applicationinsights-core-js": "3.3.10",
-				"@microsoft/applicationinsights-shims": "3.0.1",
-				"@microsoft/dynamicproto-js": "^2.0.3",
-				"@nevware21/ts-async": ">= 0.5.4 < 2.x",
-				"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
-			}
-		},
-		"node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-core-js": {
-			"version": "3.3.10",
-			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.10.tgz",
-			"integrity": "sha512-5yKeyassZTq2l+SAO4npu6LPnbS++UD+M+Ghjm9uRzoBwD8tumFx0/F8AkSVqbniSREd+ztH/2q2foewa2RZyg==",
+			"version": "4.3.11",
+			"resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.11.tgz",
+			"integrity": "sha512-V0ZeeALy/Pj8HWgNHDsK+yDeCYnJ9bCgTWhcrna/ZiAT+sGfWs6mDBjAVcG03uP7TDjdWLf8w79lgbXJ3+s3DA==",
 			"license": "MIT",
 			"dependencies": {
+				"@microsoft/1ds-core-js": "4.3.11",
 				"@microsoft/applicationinsights-shims": "3.0.1",
 				"@microsoft/dynamicproto-js": "^2.0.3",
 				"@nevware21/ts-async": ">= 0.5.4 < 2.x",
 				"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
-			},
-			"peerDependencies": {
-				"tslib": ">= 1.0.0"
 			}
 		},
 		"node_modules/@microsoft/applicationinsights-core-js": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 05f7bea29088..0bd64e3a7c37 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"dependencies": {
 		"@microsoft/1ds-core-js": "^4.3.11",
-		"@microsoft/1ds-post-js": "^4.3.10",
+		"@microsoft/1ds-post-js": "^4.3.11",
 		"@vscode/iconv-lite-umd": "0.7.1",
 		"@vscode/tree-sitter-wasm": "^0.3.0",
 		"@vscode/vscode-languagedetection": "1.0.22",

From e86bbed688bac999aacc1b9faa9b1a0d81a4e5fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:15:23 +0000
Subject: [PATCH 1534/1815] Bump @types/node in
 /extensions/configuration-editing

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/configuration-editing/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/configuration-editing/package-lock.json b/extensions/configuration-editing/package-lock.json
index c878869f47f3..1d94a6a0c735 100644
--- a/extensions/configuration-editing/package-lock.json
+++ b/extensions/configuration-editing/package-lock.json
@@ -175,9 +175,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From e76a28b821b6aab0ccb69fea4e453d7d7460ab72 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:15:24 +0000
Subject: [PATCH 1535/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /extensions/debug-auto-launch

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/debug-auto-launch/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/debug-auto-launch/package-lock.json b/extensions/debug-auto-launch/package-lock.json
index 05918ee8a6c8..b7e344e46b96 100644
--- a/extensions/debug-auto-launch/package-lock.json
+++ b/extensions/debug-auto-launch/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 4c276967404ae9f3d76ab17dd34d9016d9087882 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:15:25 +0000
Subject: [PATCH 1536/1815] Bump @types/node in
 /extensions/css-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/css-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/css-language-features/server/package-lock.json b/extensions/css-language-features/server/package-lock.json
index a043ebb4799a..4f3030a76936 100644
--- a/extensions/css-language-features/server/package-lock.json
+++ b/extensions/css-language-features/server/package-lock.json
@@ -30,9 +30,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 5e640e296722d14a7eabfa7bc2e9481d82840b81 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:15:26 +0000
Subject: [PATCH 1537/1815] Bump @types/node in
 /.vscode/extensions/vscode-selfhost-test-provider

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../vscode-selfhost-test-provider/package-lock.json         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
index 9a32fe514d05..d4d136af9777 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
@@ -58,9 +58,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 5acd8f4fafeaf5511fdc728e02967fc8fa4502f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:15:26 +0000
Subject: [PATCH 1538/1815] Bump @electron/get from 2.0.3 to 4.0.2 in /build

Bumps [@electron/get](https://github.com/electron/get) from 2.0.3 to 4.0.2.
- [Release notes](https://github.com/electron/get/releases)
- [Commits](https://github.com/electron/get/compare/v2.0.3...v4.0.2)

---
updated-dependencies:
- dependency-name: "@electron/get"
  dependency-version: 4.0.2
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 482 ++++++++++++++++++----------------------
 build/package.json      |   2 +-
 2 files changed, 222 insertions(+), 262 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 5c316f64be73..f295d7a7c66b 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -8,16 +8,13 @@
       "name": "code-oss-dev-build",
       "version": "1.0.0",
       "license": "MIT",
-      "dependencies": {
-        "tree-sitter-typescript": "0.23.2"
-      },
       "devDependencies": {
         "@azure/core-auth": "^1.10.1",
         "@azure/cosmos": "^4",
         "@azure/identity": "^4.13.0",
         "@azure/msal-node": "^2.16.1",
         "@azure/storage-blob": "^12.25.0",
-        "@electron/get": "^2.0.0",
+        "@electron/get": "^4.0.2",
         "@types/ansi-colors": "^3.2.0",
         "@types/byline": "^4.2.36",
         "@types/debounce": "^1.2.4",
@@ -501,21 +498,22 @@
       }
     },
     "node_modules/@electron/get": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz",
-      "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@electron/get/-/get-4.0.2.tgz",
+      "integrity": "sha512-n9fRt/nzzOOZdDtTP3kT6GVdo0ro9FgMKCoS520kQMIiKBhpGmPny6yK/lER3tOCKr+wLYW1O25D9oI6ZinwCA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.1.1",
-        "env-paths": "^2.2.0",
-        "fs-extra": "^8.1.0",
-        "got": "^11.8.5",
+        "env-paths": "^3.0.0",
+        "got": "^14.4.5",
+        "graceful-fs": "^4.2.11",
         "progress": "^2.0.3",
-        "semver": "^6.2.0",
+        "semver": "^7.6.3",
         "sumchecker": "^3.0.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=22.12.0"
       },
       "optionalDependencies": {
         "global-agent": "^3.0.0"
@@ -1029,6 +1027,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@keyv/serialize": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.1.1.tgz",
+      "integrity": "sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "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",
@@ -1089,6 +1094,13 @@
         "node": ">= 8"
       }
     },
+    "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/@secretlint/config-creator": {
       "version": "10.2.2",
       "resolved": "https://registry.npmjs.org/@secretlint/config-creator/-/config-creator-10.2.2.tgz",
@@ -1264,12 +1276,13 @@
       }
     },
     "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==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-7.2.0.tgz",
+      "integrity": "sha512-P1Cz1dWaFfR4IR+U13mqqiGsLFf1KbayybWwdd2vfctdV6hDpUkgCY0nKOLLTMSoRd/jJNjtbqzf13K8DCCXQw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sindresorhus/is?sponsor=1"
@@ -1288,18 +1301,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "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/@textlint/ast-node-types": {
       "version": "15.5.0",
       "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-15.5.0.tgz",
@@ -1476,18 +1477,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/cacheable-request": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
-      "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
-      "dev": true,
-      "dependencies": {
-        "@types/http-cache-semantics": "*",
-        "@types/keyv": "^3.1.4",
-        "@types/node": "*",
-        "@types/responselike": "^1.0.0"
-      }
-    },
     "node_modules/@types/debounce": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/@types/debounce/-/debounce-1.2.4.tgz",
@@ -1657,7 +1646,8 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/js-beautify": {
       "version": "1.8.0",
@@ -1685,15 +1675,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/keyv": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
-      "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/mime": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-4.0.0.tgz",
@@ -1762,15 +1743,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/responselike": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz",
-      "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/rimraf": {
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-4.0.5.tgz",
@@ -2231,18 +2203,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/@vscode/vsce/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@vscode/vsce/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -2709,31 +2669,63 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/byte-counter": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/byte-counter/-/byte-counter-0.1.0.tgz",
+      "integrity": "sha512-jheRLVMeUKrDBjVw2O5+k4EvR4t9wtxHL+bo/LxfkxsVeuGMy3a5SEGgXdAFA4FSzTrU8rQXQIrsZ3oBq5a0pQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "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==",
+      "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": ">=10.6.0"
+        "node": ">=14.16"
       }
     },
     "node_modules/cacheable-request": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
-      "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
+      "version": "13.0.18",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-13.0.18.tgz",
+      "integrity": "sha512-rFWadDRKJs3s2eYdXlGggnBZKG7MTblkFBB0YllFds+UYnfogDp2wcR6JN97FhRkHTvq59n2vhNoHNZn29dh/Q==",
       "dev": true,
+      "license": "MIT",
       "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"
+        "@types/http-cache-semantics": "^4.0.4",
+        "get-stream": "^9.0.1",
+        "http-cache-semantics": "^4.2.0",
+        "keyv": "^5.5.5",
+        "mimic-response": "^4.0.0",
+        "normalize-url": "^8.1.1",
+        "responselike": "^4.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
+      }
+    },
+    "node_modules/cacheable-request/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/call-bind-apply-helpers": {
@@ -2865,15 +2857,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q==",
-      "dev": true,
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      }
-    },
     "node_modules/clone-stats": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
@@ -3050,6 +3033,7 @@
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
       "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
       "dev": true,
+      "optional": true,
       "dependencies": {
         "mimic-response": "^3.1.0"
       },
@@ -3065,6 +3049,7 @@
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
       "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
       "dev": true,
+      "optional": true,
       "engines": {
         "node": ">=10"
       },
@@ -3112,15 +3097,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/defer-to-connect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/define-lazy-prop": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
@@ -3366,12 +3342,16 @@
       }
     },
     "node_modules/env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "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": ">=6"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/environment": {
@@ -3758,6 +3738,16 @@
         "node": ">= 6"
       }
     },
+    "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,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -3765,20 +3755,6 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=6 <7 || >=8"
-      }
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -3920,22 +3896,6 @@
         "node": ">=10.0"
       }
     },
-    "node_modules/global-agent/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/globalthis": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz",
@@ -3987,35 +3947,67 @@
       }
     },
     "node_modules/got": {
-      "version": "11.8.6",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
-      "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
+      "version": "14.6.6",
+      "resolved": "https://registry.npmjs.org/got/-/got-14.6.6.tgz",
+      "integrity": "sha512-QLV1qeYSo5l13mQzWgP/y0LbMr5Plr5fJilgAIwgnwseproEbtNym8xpLsDzeZ6MWXgNE6kdWGBjdh3zT/Qerg==",
       "dev": true,
+      "license": "MIT",
       "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"
+        "@sindresorhus/is": "^7.0.1",
+        "byte-counter": "^0.1.0",
+        "cacheable-lookup": "^7.0.0",
+        "cacheable-request": "^13.0.12",
+        "decompress-response": "^10.0.0",
+        "form-data-encoder": "^4.0.2",
+        "http2-wrapper": "^2.2.1",
+        "keyv": "^5.5.3",
+        "lowercase-keys": "^3.0.0",
+        "p-cancelable": "^4.0.1",
+        "responselike": "^4.0.2",
+        "type-fest": "^4.26.1"
       },
       "engines": {
-        "node": ">=10.19.0"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sindresorhus/got?sponsor=1"
       }
     },
+    "node_modules/got/node_modules/decompress-response": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-10.0.0.tgz",
+      "integrity": "sha512-oj7KWToJuuxlPr7VV0vabvxEIiqNMo+q0NueIiL3XhtwC6FVOX7Hr1c0C4eD0bmf7Zr+S/dSf2xvkH3Ad6sU3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-response": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/got/node_modules/type-fest": {
+      "version": "4.41.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz",
+      "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/graceful-fs": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
-      "devOptional": true
+      "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==",
+      "devOptional": true,
+      "license": "ISC"
     },
     "node_modules/gulp-merge-json": {
       "version": "2.2.1",
@@ -4188,10 +4180,11 @@
       }
     },
     "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
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
+      "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
+      "dev": true,
+      "license": "BSD-2-Clause"
     },
     "node_modules/http-proxy-agent": {
       "version": "7.0.2",
@@ -4208,13 +4201,14 @@
       }
     },
     "node_modules/http2-wrapper": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-      "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+      "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.0.0"
+        "resolve-alpn": "^1.2.0"
       },
       "engines": {
         "node": ">=10.19.0"
@@ -4413,6 +4407,19 @@
         "node": ">=0.10.0"
       }
     },
+    "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/is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
@@ -4522,12 +4529,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "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-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
@@ -4562,15 +4563,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-      "dev": true,
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
     "node_modules/jsonwebtoken": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
@@ -4610,21 +4602,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/jsonwebtoken/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/jwa": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz",
@@ -4661,12 +4638,13 @@
       }
     },
     "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==",
+      "version": "5.5.5",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.5.5.tgz",
+      "integrity": "sha512-FA5LmZVF1VziNc0bIdCSA1IoSVnDCqE8HJIZZv2/W8YmoAM50+tnUgJR/gQZwEeIMleuIOnRnHA/UaZRNeV4iQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "json-buffer": "3.0.1"
+        "@keyv/serialize": "^1.1.1"
       }
     },
     "node_modules/leven": {
@@ -4715,12 +4693,16 @@
       "license": "MIT"
     },
     "node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+      "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": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/lru-cache": {
@@ -4866,12 +4848,16 @@
       }
     },
     "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==",
+      "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": ">=4"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/minimatch": {
@@ -4942,22 +4928,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/node-abi/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/node-addon-api": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz",
@@ -5064,19 +5034,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/normalize-package-data/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/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -5087,12 +5044,13 @@
       }
     },
     "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==",
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.1.1.tgz",
+      "integrity": "sha512-JYc0DPlpGWB40kH5g07gGTrYuMqV653k3uBKY6uITPWds3M0ov3GaWGp9lbE3Bzngx8+XkfzgvASb9vk9JDFXQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -5171,12 +5129,13 @@
       }
     },
     "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==",
+      "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": ">=8"
+        "node": ">=14.16"
       }
     },
     "node_modules/p-limit": {
@@ -5548,6 +5507,7 @@
       "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
       "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -5697,15 +5657,20 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
       "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/responselike": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
-      "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-4.0.2.tgz",
+      "integrity": "sha512-cGk8IbWEAnaCpdAt1BHzJ3Ahz5ewDJa0KseTsE3qIRMJ3C698W8psM7byCeWVpd/Ha7FUYzuRVzXoKoM6nRUbA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "lowercase-keys": "^2.0.0"
+        "lowercase-keys": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -5875,12 +5840,16 @@
       }
     },
     "node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "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/semver-compare": {
@@ -6831,15 +6800,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
     "node_modules/url-join": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
diff --git a/build/package.json b/build/package.json
index 010de92d8882..119f8ca66a76 100644
--- a/build/package.json
+++ b/build/package.json
@@ -8,7 +8,7 @@
     "@azure/identity": "^4.13.0",
     "@azure/msal-node": "^2.16.1",
     "@azure/storage-blob": "^12.25.0",
-    "@electron/get": "^2.0.0",
+    "@electron/get": "^4.0.2",
     "@types/ansi-colors": "^3.2.0",
     "@types/byline": "^4.2.36",
     "@types/debounce": "^1.2.4",

From d1185b32199ef1b69cc6e2994d9812d8705b66d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:15:27 +0000
Subject: [PATCH 1539/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /extensions/debug-server-ready

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/debug-server-ready/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/debug-server-ready/package-lock.json b/extensions/debug-server-ready/package-lock.json
index a3c151cb0f2a..1cd9ddc59300 100644
--- a/extensions/debug-server-ready/package-lock.json
+++ b/extensions/debug-server-ready/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 89f05e3d1a034cf6989ab5fd8a227dc0f83460d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:15:35 +0000
Subject: [PATCH 1540/1815] Bump @types/node from 25.0.3 to 25.0.8 in /build

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.3 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 5c316f64be73..60d8edea664b 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -8,9 +8,6 @@
       "name": "code-oss-dev-build",
       "version": "1.0.0",
       "license": "MIT",
-      "dependencies": {
-        "tree-sitter-typescript": "0.23.2"
-      },
       "devDependencies": {
         "@azure/core-auth": "^1.10.1",
         "@azure/cosmos": "^4",
@@ -1737,9 +1734,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "25.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.3.tgz",
-      "integrity": "sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 74a7d2eecb3c9a5b099fbfa9551cd187ef8d185f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:15:55 +0000
Subject: [PATCH 1541/1815] Bump clap_lex from 0.7.6 to 0.7.7 in /cli

Bumps [clap_lex](https://github.com/clap-rs/clap) from 0.7.6 to 0.7.7.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_lex-v0.7.6...clap_lex-v0.7.7)

---
updated-dependencies:
- dependency-name: clap_lex
  dependency-version: 0.7.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 4 ++--
 cli/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 3987d5923175..db4822b11f65 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -380,9 +380,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
+checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
 
 [[package]]
 name = "code-cli"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 0983546d892c..5a675d5712b5 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -40,7 +40,7 @@ dialoguer = "0.12.0"
 hyper = { version = "0.14.26", features = ["server", "http1", "runtime"] }
 indicatif = "0.17.4"
 tempfile = "3.11.0"
-clap_lex = "0.7.6"
+clap_lex = "0.7.7"
 url = "2.5.4"
 async-trait = "0.1.89"
 log = "0.4.18"

From b588a62f6e8a6518a01f138de3d648b9f475020c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:15:58 +0000
Subject: [PATCH 1542/1815] Bump @types/pump from 1.0.1 to 1.1.3 in /build

Bumps [@types/pump](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/pump) from 1.0.1 to 1.1.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/pump)

---
updated-dependencies:
- dependency-name: "@types/pump"
  dependency-version: 1.1.3
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 12 +++++-------
 build/package.json      |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 5c316f64be73..7fa26a222db6 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -8,9 +8,6 @@
       "name": "code-oss-dev-build",
       "version": "1.0.0",
       "license": "MIT",
-      "dependencies": {
-        "tree-sitter-typescript": "0.23.2"
-      },
       "devDependencies": {
         "@azure/core-auth": "^1.10.1",
         "@azure/cosmos": "^4",
@@ -38,7 +35,7 @@
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",
         "@types/node": "25.x",
-        "@types/pump": "^1.0.1",
+        "@types/pump": "^1.1.3",
         "@types/rimraf": "^4.0.5",
         "@types/through": "^0.0.33",
         "@types/through2": "^2.0.41",
@@ -1754,10 +1751,11 @@
       "license": "MIT"
     },
     "node_modules/@types/pump": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/pump/-/pump-1.0.1.tgz",
-      "integrity": "sha1-roFXzv7wTRpNJMHMkdQDwvXaXNA= sha512-WGcg4jdczx60mEh0pWLUhw/2215BFYfSob5fHp/fJFZ+UFOiOxIqCnqRGSLWRsJ6Hvh4u2SBokxHDQ0wF9ujqQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@types/pump/-/pump-1.1.3.tgz",
+      "integrity": "sha512-ZyooTTivmOwPfOwLVaszkF8Zq6mvavgjuHYitZhrIjfQAJDH+kIP3N+MzpG1zDAslsHvVz6Q8ECfivix3qLJaQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
diff --git a/build/package.json b/build/package.json
index 010de92d8882..19228630ebae 100644
--- a/build/package.json
+++ b/build/package.json
@@ -29,7 +29,7 @@
     "@types/minimist": "^1.2.5",
     "@types/mocha": "^10.0.10",
     "@types/node": "25.x",
-    "@types/pump": "^1.0.1",
+    "@types/pump": "^1.1.3",
     "@types/rimraf": "^4.0.5",
     "@types/through": "^0.0.33",
     "@types/through2": "^2.0.41",

From 38a15ac312abbdd777214dbeb360a30672e6f954 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:16:06 +0000
Subject: [PATCH 1543/1815] Bump tokio-util from 0.7.11 to 0.7.18 in /cli

Bumps [tokio-util](https://github.com/tokio-rs/tokio) from 0.7.11 to 0.7.18.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-util-0.7.11...tokio-util-0.7.18)

---
updated-dependencies:
- dependency-name: tokio-util
  dependency-version: 0.7.18
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 4 ++--
 cli/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 3987d5923175..16003622156c 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -3005,9 +3005,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098"
 dependencies = [
  "bytes",
  "futures-core",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 0983546d892c..7bba20b1d6c6 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -17,7 +17,7 @@ clap = { version = "4.5.54", features = ["derive", "env"] }
 open = "5.3.3"
 reqwest = { version = "0.12.5", default-features = false, features = ["json", "stream", "native-tls"] }
 tokio = { version = "1.49.0", features = ["full"] }
-tokio-util = { version = "0.7.8", features = ["compat", "codec"] }
+tokio-util = { version = "0.7.18", features = ["compat", "codec"] }
 flate2 = { version = "1.1.5", default-features = false, features = ["zlib"] }
 zip = { version = "2.3.0", default-features = false, features = ["time", "deflate-zlib"] }
 regex = "1.12.2"

From 11c5eea3395c042fe101a820439597bd7c001938 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:16:06 +0000
Subject: [PATCH 1544/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /extensions/extension-editing

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/extension-editing/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/extension-editing/package-lock.json b/extensions/extension-editing/package-lock.json
index d1ebd81b9778..6e6595f4a996 100644
--- a/extensions/extension-editing/package-lock.json
+++ b/extensions/extension-editing/package-lock.json
@@ -47,9 +47,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 89d4b12a3e063116858252ff2bbab2c6a2f13276 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:16:08 +0000
Subject: [PATCH 1545/1815] Bump @types/node in
 /extensions/github-authentication

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github-authentication/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/github-authentication/package-lock.json b/extensions/github-authentication/package-lock.json
index 387fc5f5a6e3..d0fa22783d8f 100644
--- a/extensions/github-authentication/package-lock.json
+++ b/extensions/github-authentication/package-lock.json
@@ -154,9 +154,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 921321afaa669b12cdee8d611c553cfe40f9bc29 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:16:09 +0000
Subject: [PATCH 1546/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /extensions/git

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index 2c4342028d77..6e8852cd59c0 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -214,9 +214,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From eec232e43bcf43061c4990f8be939e1a5d39afa1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:16:10 +0000
Subject: [PATCH 1547/1815] Bump @types/node in
 /extensions/css-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/css-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/css-language-features/package-lock.json b/extensions/css-language-features/package-lock.json
index 35577f8c0400..6ac97c834939 100644
--- a/extensions/css-language-features/package-lock.json
+++ b/extensions/css-language-features/package-lock.json
@@ -41,9 +41,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 4ab18914acabf23d3ce88936ab6209ce4f2e00a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:16:12 +0000
Subject: [PATCH 1548/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /extensions/emmet

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/emmet/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/emmet/package-lock.json b/extensions/emmet/package-lock.json
index 0ba8ec6c59d9..a6cf528560e8 100644
--- a/extensions/emmet/package-lock.json
+++ b/extensions/emmet/package-lock.json
@@ -80,9 +80,9 @@
       "integrity": "sha1-JEywLHfsLnT3ipvTGCGKvJxQCmE= sha512-ZsZ2I9Vzso3Ho/pjZFsmmZ++FWeEd/txqybHTm4OgaZzdS8V9V/YYWQwg5TC38Z7uLWUV1vavpLLbjJtKubR1A=="
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From cc5e6b9d4932b8996301aec07560961da3fb791b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:16:16 +0000
Subject: [PATCH 1549/1815] Bump @types/node in
 /extensions/html-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/html-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/html-language-features/server/package-lock.json b/extensions/html-language-features/server/package-lock.json
index 9d008dd2b40f..18354d211e7f 100644
--- a/extensions/html-language-features/server/package-lock.json
+++ b/extensions/html-language-features/server/package-lock.json
@@ -32,9 +32,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 24a6779e5f48a7190134675296cb3d1987b90e0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:16:19 +0000
Subject: [PATCH 1550/1815] Bump zbus from 3.15.2 to 4.4.0 in /cli

Bumps [zbus](https://github.com/z-galaxy/zbus) from 3.15.2 to 4.4.0.
- [Release notes](https://github.com/z-galaxy/zbus/releases)
- [Changelog](https://github.com/z-galaxy/zbus/blob/main/release-plz.toml)
- [Commits](https://github.com/z-galaxy/zbus/compare/zbus-3.15.2...zbus-4.4.0)

---
updated-dependencies:
- dependency-name: zbus
  dependency-version: 4.4.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 250 ++++++++++++++++++++++++++++++++++++++++++++-----
 cli/Cargo.toml |   2 +-
 2 files changed, 226 insertions(+), 26 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 3987d5923175..9d553733ade2 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -94,6 +94,18 @@ dependencies = [
  "futures-core",
 ]
 
+[[package]]
+name = "async-broadcast"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532"
+dependencies = [
+ "event-listener 5.3.0",
+ "event-listener-strategy 0.5.2",
+ "futures-core",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "async-channel"
 version = "2.3.1"
@@ -182,6 +194,24 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "async-process"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75"
+dependencies = [
+ "async-channel",
+ "async-io 2.3.2",
+ "async-lock 3.3.0",
+ "async-signal",
+ "async-task",
+ "blocking",
+ "cfg-if",
+ "event-listener 5.3.0",
+ "futures-lite 2.3.0",
+ "rustix 1.1.3",
+]
+
 [[package]]
 name = "async-recursion"
 version = "1.1.1"
@@ -332,6 +362,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
 version = "0.4.42"
@@ -432,7 +468,7 @@ dependencies = [
  "uuid",
  "winapi",
  "winreg 0.50.0",
- "zbus",
+ "zbus 4.4.0",
  "zip",
 ]
 
@@ -699,6 +735,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "endi"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099"
+
 [[package]]
 name = "enumflags2"
 version = "0.7.9"
@@ -932,7 +974,10 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
 dependencies = [
+ "fastrand 2.1.0",
  "futures-core",
+ "futures-io",
+ "parking",
  "pin-project-lite",
 ]
 
@@ -1043,7 +1088,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.2.6",
+ "indexmap 2.13.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -1058,9 +1103,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 
 [[package]]
 name = "heck"
@@ -1427,12 +1472,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.16.1",
 ]
 
 [[package]]
@@ -1708,6 +1753,19 @@ dependencies = [
  "memoffset 0.7.1",
 ]
 
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.5.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+ "memoffset 0.9.1",
+]
+
 [[package]]
 name = "num"
 version = "0.4.3"
@@ -2089,7 +2147,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
- "toml_edit",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
+dependencies = [
+ "toml_edit 0.23.10+spec-1.0.0",
 ]
 
 [[package]]
@@ -2553,7 +2620,7 @@ dependencies = [
  "openssl",
  "rand 0.8.5",
  "serde",
- "zbus",
+ "zbus 3.15.2",
 ]
 
 [[package]]
@@ -3023,15 +3090,45 @@ version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 
+[[package]]
+name = "toml_datetime"
+version = "0.7.5+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
+dependencies = [
+ "serde_core",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.2.6",
- "toml_datetime",
- "winnow",
+ "indexmap 2.13.0",
+ "toml_datetime 0.6.6",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.23.10+spec-1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
+dependencies = [
+ "indexmap 2.13.0",
+ "toml_datetime 0.7.5+spec-1.1.0",
+ "toml_parser",
+ "winnow 0.7.14",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.6+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
+dependencies = [
+ "winnow 0.7.14",
 ]
 
 [[package]]
@@ -3622,6 +3719,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winnow"
+version = "0.7.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winreg"
 version = "0.8.0"
@@ -3730,8 +3836,8 @@ version = "3.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6"
 dependencies = [
- "async-broadcast",
- "async-process",
+ "async-broadcast 0.5.1",
+ "async-process 1.8.1",
  "async-recursion",
  "async-trait",
  "byteorder",
@@ -3742,7 +3848,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "hex",
- "nix",
+ "nix 0.26.4",
  "once_cell",
  "ordered-stream",
  "rand 0.8.5",
@@ -3755,9 +3861,42 @@ dependencies = [
  "uds_windows",
  "winapi",
  "xdg-home",
- "zbus_macros",
- "zbus_names",
- "zvariant",
+ "zbus_macros 3.15.2",
+ "zbus_names 2.6.1",
+ "zvariant 3.15.2",
+]
+
+[[package]]
+name = "zbus"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
+dependencies = [
+ "async-broadcast 0.7.2",
+ "async-process 2.5.0",
+ "async-recursion",
+ "async-trait",
+ "enumflags2",
+ "event-listener 5.3.0",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "hex",
+ "nix 0.29.0",
+ "ordered-stream",
+ "rand 0.8.5",
+ "serde",
+ "serde_repr",
+ "sha1",
+ "static_assertions",
+ "tokio",
+ "tracing",
+ "uds_windows",
+ "windows-sys 0.52.0",
+ "xdg-home",
+ "zbus_macros 4.4.0",
+ "zbus_names 3.0.0",
+ "zvariant 4.2.0",
 ]
 
 [[package]]
@@ -3766,12 +3905,25 @@ version = "3.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "regex",
  "syn 1.0.109",
- "zvariant_utils",
+ "zvariant_utils 1.0.1",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
+dependencies = [
+ "proc-macro-crate 3.4.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "zvariant_utils 2.1.0",
 ]
 
 [[package]]
@@ -3782,7 +3934,18 @@ checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d"
 dependencies = [
  "serde",
  "static_assertions",
- "zvariant",
+ "zvariant 3.15.2",
+]
+
+[[package]]
+name = "zbus_names"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "zvariant 4.2.0",
 ]
 
 [[package]]
@@ -3845,7 +4008,7 @@ dependencies = [
  "crossbeam-utils",
  "displaydoc",
  "flate2",
- "indexmap 2.2.6",
+ "indexmap 2.13.0",
  "memchr",
  "thiserror 2.0.17",
  "time",
@@ -3862,7 +4025,20 @@ dependencies = [
  "libc",
  "serde",
  "static_assertions",
- "zvariant_derive",
+ "zvariant_derive 3.15.2",
+]
+
+[[package]]
+name = "zvariant"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "static_assertions",
+ "zvariant_derive 4.2.0",
 ]
 
 [[package]]
@@ -3871,11 +4047,24 @@ version = "3.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
- "zvariant_utils",
+ "zvariant_utils 1.0.1",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
+dependencies = [
+ "proc-macro-crate 3.4.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+ "zvariant_utils 2.1.0",
 ]
 
 [[package]]
@@ -3888,3 +4077,14 @@ dependencies = [
  "quote",
  "syn 1.0.109",
 ]
+
+[[package]]
+name = "zvariant_utils"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.87",
+]
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 0983546d892c..b1d8fcc0105e 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -67,7 +67,7 @@ winapi = "0.3.9"
 core-foundation = "0.10.1"
 
 [target.'cfg(target_os = "linux")'.dependencies]
-zbus = { version = "3.13.1", default-features = false, features = ["tokio"] }
+zbus = { version = "4.4.0", default-features = false, features = ["tokio"] }
 
 [patch.crates-io]
 russh = { git = "https://github.com/microsoft/vscode-russh", branch = "main" }

From 3e0da66467a195f1af70847abca314fbd0efa2d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:16:19 +0000
Subject: [PATCH 1551/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /extensions/git-base

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git-base/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/git-base/package-lock.json b/extensions/git-base/package-lock.json
index d99ac86dce38..0108169f3aa8 100644
--- a/extensions/git-base/package-lock.json
+++ b/extensions/git-base/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 5ffb12f8ded78bb31878c06ab32e910a591e49e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:16:37 +0000
Subject: [PATCH 1552/1815] Bump thiserror from 1.0.61 to 2.0.17 in /cli

Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.61 to 2.0.17.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.61...2.0.17)

---
updated-dependencies:
- dependency-name: thiserror
  dependency-version: 2.0.17
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 26 +++++++++++++-------------
 cli/Cargo.toml |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 3987d5923175..7fd1a2cf226e 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -424,7 +424,7 @@ dependencies = [
  "sysinfo",
  "tar",
  "tempfile",
- "thiserror 1.0.61",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-util",
  "tunnels",
@@ -1877,7 +1877,7 @@ dependencies = [
  "js-sys",
  "once_cell",
  "pin-project-lite",
- "thiserror 1.0.61",
+ "thiserror 1.0.69",
  "urlencoding",
 ]
 
@@ -1897,7 +1897,7 @@ dependencies = [
  "ordered-float",
  "percent-encoding",
  "rand 0.8.5",
- "thiserror 1.0.61",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
 ]
@@ -2242,7 +2242,7 @@ checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
 dependencies = [
  "getrandom 0.2.15",
  "libredox",
- "thiserror 1.0.61",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -2411,7 +2411,7 @@ dependencies = [
  "sha1",
  "sha2",
  "subtle",
- "thiserror 1.0.61",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-util",
 ]
@@ -2446,7 +2446,7 @@ dependencies = [
  "russh-cryptovec",
  "serde",
  "sha2",
- "thiserror 1.0.61",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "yasna",
@@ -2872,11 +2872,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.61"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl 1.0.61",
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
@@ -2890,9 +2890,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3092,7 +3092,7 @@ dependencies = [
  "native-tls",
  "rand 0.8.5",
  "sha1",
- "thiserror 1.0.61",
+ "thiserror 1.0.69",
  "url",
  "utf-8",
 ]
@@ -3114,7 +3114,7 @@ dependencies = [
  "russh-keys",
  "serde",
  "serde_json",
- "thiserror 1.0.61",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-tungstenite",
  "tokio-util",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 0983546d892c..ec6f38d6623c 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -48,7 +48,7 @@ const_format = "0.2.31"
 sha2 = "0.10.9"
 base64 = "0.22.1"
 shell-escape = "0.1.5"
-thiserror = "1.0.40"
+thiserror = "2.0.17"
 cfg-if = "1.0.4"
 pin-project = "1.1.10"
 console = "0.16.2"

From 2587a43f7cf3dcc1e136675e560dbd26d6f0d58b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:17:11 +0000
Subject: [PATCH 1553/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /extensions/gulp

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/gulp/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/gulp/package-lock.json b/extensions/gulp/package-lock.json
index ed03ed439f07..a740db539ad4 100644
--- a/extensions/gulp/package-lock.json
+++ b/extensions/gulp/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 5669ffece14b3e4c294ed23a37ba0489919bab30 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:17:29 +0000
Subject: [PATCH 1554/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /extensions/github

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/github/package-lock.json b/extensions/github/package-lock.json
index 50c32a2c6e87..b91b7bdfd090 100644
--- a/extensions/github/package-lock.json
+++ b/extensions/github/package-lock.json
@@ -311,9 +311,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From c198f1c186ee600bd755a45fe38eaf110712cb84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:17:41 +0000
Subject: [PATCH 1555/1815] Bump @types/node in
 /extensions/json-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/json-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/json-language-features/server/package-lock.json b/extensions/json-language-features/server/package-lock.json
index 2f3e3973168e..946d05e9c774 100644
--- a/extensions/json-language-features/server/package-lock.json
+++ b/extensions/json-language-features/server/package-lock.json
@@ -35,9 +35,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From b721c0c26b4f0faa415c0b5ebcf5e430a6a5181f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:17:48 +0000
Subject: [PATCH 1556/1815] Bump vscode-json-languageservice

Bumps [vscode-json-languageservice](https://github.com/Microsoft/vscode-json-languageservice) from 5.7.0 to 5.7.1.
- [Release notes](https://github.com/Microsoft/vscode-json-languageservice/releases)
- [Changelog](https://github.com/microsoft/vscode-json-languageservice/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/vscode-json-languageservice/compare/v5.7.0...v5.7.1)

---
updated-dependencies:
- dependency-name: vscode-json-languageservice
  dependency-version: 5.7.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/json-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/json-language-features/server/package-lock.json b/extensions/json-language-features/server/package-lock.json
index 2f3e3973168e..40fb8e7ae030 100644
--- a/extensions/json-language-features/server/package-lock.json
+++ b/extensions/json-language-features/server/package-lock.json
@@ -67,9 +67,9 @@
       "license": "MIT"
     },
     "node_modules/vscode-json-languageservice": {
-      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.7.0.tgz",
-      "integrity": "sha512-AgHOBlgkv2L88eaoFUyYBDSL+OxetTA3DnJ+EnOHW4wuoO8gby4dTx4QUcJgD+qERVdq/BQQDA/vzIC3JZGHZw==",
+      "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",

From fbb3e09c1bab18fec25b60fe1034b421d2084fdc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:17:49 +0000
Subject: [PATCH 1557/1815] Bump @types/node in
 /extensions/html-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/html-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/html-language-features/package-lock.json b/extensions/html-language-features/package-lock.json
index e48111749556..fa58afdef425 100644
--- a/extensions/html-language-features/package-lock.json
+++ b/extensions/html-language-features/package-lock.json
@@ -166,9 +166,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From d1ca7c45309208a0f01114515a28090f0b89be25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:18:06 +0000
Subject: [PATCH 1558/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /extensions/jake

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/jake/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/jake/package-lock.json b/extensions/jake/package-lock.json
index b81ec63c85fd..430dcd7485cd 100644
--- a/extensions/jake/package-lock.json
+++ b/extensions/jake/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 44b272d17b6b911c26ee1262ad3582866c840170 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:18:10 +0000
Subject: [PATCH 1559/1815] Bump @types/node in
 /extensions/json-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/json-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/json-language-features/package-lock.json b/extensions/json-language-features/package-lock.json
index e72459c00a51..5c3b1d56b8a9 100644
--- a/extensions/json-language-features/package-lock.json
+++ b/extensions/json-language-features/package-lock.json
@@ -166,9 +166,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 86dc31dc3ae19fdd5ba00544a27d6f2d3b437253 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:18:30 +0000
Subject: [PATCH 1560/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /extensions/merge-conflict

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/merge-conflict/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/merge-conflict/package-lock.json b/extensions/merge-conflict/package-lock.json
index 849db1b20bbe..801ca287170c 100644
--- a/extensions/merge-conflict/package-lock.json
+++ b/extensions/merge-conflict/package-lock.json
@@ -143,9 +143,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 664305ccddaea87e78b2d7f3790fd6f3e153dd78 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:18:38 +0000
Subject: [PATCH 1561/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /extensions/grunt

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/grunt/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/grunt/package-lock.json b/extensions/grunt/package-lock.json
index 4d2f4ba76b54..dbb31881cb2c 100644
--- a/extensions/grunt/package-lock.json
+++ b/extensions/grunt/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 0cf6dc7b2636aea8c82340fdc89583c7fb7bfd0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:18:41 +0000
Subject: [PATCH 1562/1815] Bump @types/node in
 /extensions/php-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/php-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/php-language-features/package-lock.json b/extensions/php-language-features/package-lock.json
index d7c561ec0f03..391428909155 100644
--- a/extensions/php-language-features/package-lock.json
+++ b/extensions/php-language-features/package-lock.json
@@ -20,9 +20,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 93d7ce6c535bc1ce2ba689a6739a5ada4ee32fcb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:18:43 +0000
Subject: [PATCH 1563/1815] Bump @types/node in
 /extensions/microsoft-authentication

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/microsoft-authentication/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 1d8c76ce0b8d..5f2474ac1026 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -202,9 +202,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From b3fc83e829ff0220a25b09fa4c8a8a1dc0227735 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:18:55 +0000
Subject: [PATCH 1564/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /extensions/npm

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/npm/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index 1b73971d74f6..ded02e74d4be 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -60,9 +60,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 231c70819ff4665d5a411f0bece68d0f290ec76b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:18:57 +0000
Subject: [PATCH 1565/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /extensions/references-view

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/references-view/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/references-view/package-lock.json b/extensions/references-view/package-lock.json
index e5ff89f96525..720e9569540a 100644
--- a/extensions/references-view/package-lock.json
+++ b/extensions/references-view/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 4279a427329f0f46b8eddda19f260861aa9e930a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:20:25 +0000
Subject: [PATCH 1566/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /extensions/tunnel-forwarding

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/tunnel-forwarding/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/tunnel-forwarding/package-lock.json b/extensions/tunnel-forwarding/package-lock.json
index 3c9d38b9ff18..6d67b23ce7a7 100644
--- a/extensions/tunnel-forwarding/package-lock.json
+++ b/extensions/tunnel-forwarding/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 16d3560f51dff05b043665e3828f09e059c6ba0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:20:26 +0000
Subject: [PATCH 1567/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /extensions/vscode-api-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-api-tests/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-api-tests/package-lock.json b/extensions/vscode-api-tests/package-lock.json
index 23826828bd6e..0b7aea70876a 100644
--- a/extensions/vscode-api-tests/package-lock.json
+++ b/extensions/vscode-api-tests/package-lock.json
@@ -27,9 +27,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 8e08def4e0fccffc58da13824ef06759182ef95f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:20:32 +0000
Subject: [PATCH 1568/1815] Bump @xterm/headless from 5.6.0-beta.98 to 6.0.0

Bumps [@xterm/headless](https://github.com/xtermjs/xterm.js) from 5.6.0-beta.98 to 6.0.0.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits/6.0.0)

---
updated-dependencies:
- dependency-name: "@xterm/headless"
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 13 ++++++++-----
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 130d73d0e790..f78ad02872dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
         "@xterm/addon-serialize": "^0.14.0-beta.98",
         "@xterm/addon-unicode11": "^0.9.0-beta.98",
         "@xterm/addon-webgl": "^0.19.0-beta.98",
-        "@xterm/headless": "^5.6.0-beta.98",
+        "@xterm/headless": "^6.0.0",
         "@xterm/xterm": "^5.6.0-beta.98",
         "http-proxy-agent": "^7.0.0",
         "https-proxy-agent": "^7.0.6",
@@ -4136,10 +4136,13 @@
       }
     },
     "node_modules/@xterm/headless": {
-      "version": "5.6.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.6.0-beta.98.tgz",
-      "integrity": "sha512-nRl5NyNHajvxNy1N/h0+vEO9tgBgYU8kN/SApBzezGYjcKhs81MYVr5uO1uMKb2eq5eTXBW8BtcyD3KqGoqkEA==",
-      "license": "MIT"
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.0.0.tgz",
+      "integrity": "sha512-5Yj1QINYCyzrZtf8OFIHi47iQtI+0qYFPHmouEfG8dHNxbZ9Tb9YGSuLcsEwj9Z+OL75GJqPyJbyoFer80a2Hw==",
+      "license": "MIT",
+      "workspaces": [
+        "addons/*"
+      ]
     },
     "node_modules/@xterm/xterm": {
       "version": "5.6.0-beta.98",
diff --git a/package.json b/package.json
index c272c0c1ec2f..ae2c1167ef66 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "@xterm/addon-serialize": "^0.14.0-beta.98",
     "@xterm/addon-unicode11": "^0.9.0-beta.98",
     "@xterm/addon-webgl": "^0.19.0-beta.98",
-    "@xterm/headless": "^5.6.0-beta.98",
+    "@xterm/headless": "^6.0.0",
     "@xterm/xterm": "^5.6.0-beta.98",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.6",

From 00397014e3f725b293870ed60b63ef725c8919aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:20:41 +0000
Subject: [PATCH 1569/1815] Bump @xterm/addon-ligatures from 0.11.0-beta.89 to
 0.11.0-beta.103

Bumps [@xterm/addon-ligatures](https://github.com/xtermjs/xterm.js) from 0.11.0-beta.89 to 0.11.0-beta.103.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-ligatures"
  dependency-version: 0.11.0-beta.103
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 10 +++++-----
 package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 130d73d0e790..c3ba4f46d52b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,7 +29,7 @@
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.2.0-beta.81",
         "@xterm/addon-image": "^0.9.0-beta.98",
-        "@xterm/addon-ligatures": "^0.11.0-beta.89",
+        "@xterm/addon-ligatures": "^0.11.0-beta.103",
         "@xterm/addon-progress": "^0.2.0-beta.4",
         "@xterm/addon-search": "^0.16.0-beta.98",
         "@xterm/addon-serialize": "^0.14.0-beta.98",
@@ -4057,9 +4057,9 @@
       }
     },
     "node_modules/@xterm/addon-ligatures": {
-      "version": "0.11.0-beta.89",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.89.tgz",
-      "integrity": "sha512-UbADhN/PBC0GpjXm8rKH3ZQhm4PVGwOO2DBi8ZemIK+3BfD9QEF+S1ukoKROmAODhQ5xnjus6DkUVJD92ELhbA==",
+      "version": "0.11.0-beta.103",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.103.tgz",
+      "integrity": "sha512-+Nyq0CUJ6ZKj82D/6KGD3xnsgqEmnbaS3Jh/dFKBZxlICzGiJjQ8zlUCWabbdpgwQyCg4BHGuM+qC8P9FF9rsA==",
       "license": "MIT",
       "dependencies": {
         "lru-cache": "^6.0.0",
@@ -4069,7 +4069,7 @@
         "node": ">8.0.0"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.89"
+        "@xterm/xterm": "^6.1.0-beta.103"
       }
     },
     "node_modules/@xterm/addon-ligatures/node_modules/lru-cache": {
diff --git a/package.json b/package.json
index c272c0c1ec2f..b767e0040a13 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.2.0-beta.81",
     "@xterm/addon-image": "^0.9.0-beta.98",
-    "@xterm/addon-ligatures": "^0.11.0-beta.89",
+    "@xterm/addon-ligatures": "^0.11.0-beta.103",
     "@xterm/addon-progress": "^0.2.0-beta.4",
     "@xterm/addon-search": "^0.16.0-beta.98",
     "@xterm/addon-serialize": "^0.14.0-beta.98",

From d5bd1ce6e4203a999b2b0db693a92ec1683ffd78 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:20:43 +0000
Subject: [PATCH 1570/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /test/automation

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/automation/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
index 009f0e4fc3b9..4392fd5e7ba0 100644
--- a/test/automation/package-lock.json
+++ b/test/automation/package-lock.json
@@ -75,9 +75,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 72e7eda8aa1081eb4a0df89a49f96d01f4d6d8ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:20:44 +0000
Subject: [PATCH 1571/1815] Bump @types/node in
 /extensions/vscode-colorize-perf-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-colorize-perf-tests/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-colorize-perf-tests/package-lock.json b/extensions/vscode-colorize-perf-tests/package-lock.json
index 27a8404729ae..f4fbf71d7e33 100644
--- a/extensions/vscode-colorize-perf-tests/package-lock.json
+++ b/extensions/vscode-colorize-perf-tests/package-lock.json
@@ -19,9 +19,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From d7f58ff9b88c4c32ecfdbb2e448dde8c7977911b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:20:47 +0000
Subject: [PATCH 1572/1815] Bump @types/node in
 /extensions/typescript-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/typescript-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/typescript-language-features/package-lock.json b/extensions/typescript-language-features/package-lock.json
index 017dec06cd26..899db573c257 100644
--- a/extensions/typescript-language-features/package-lock.json
+++ b/extensions/typescript-language-features/package-lock.json
@@ -152,9 +152,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 729883be669ddef32c44853c0344c1c9f35db8b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:20:48 +0000
Subject: [PATCH 1573/1815] Bump @types/node in
 /extensions/vscode-test-resolver

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-test-resolver/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-test-resolver/package-lock.json b/extensions/vscode-test-resolver/package-lock.json
index 1f9b9d188b23..79756b7427e0 100644
--- a/extensions/vscode-test-resolver/package-lock.json
+++ b/extensions/vscode-test-resolver/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 42fbd96b262a5a2a01132aea12ee78676908d1df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:20:49 +0000
Subject: [PATCH 1574/1815] Bump @types/node in
 /extensions/vscode-colorize-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-colorize-tests/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-colorize-tests/package-lock.json b/extensions/vscode-colorize-tests/package-lock.json
index a0105e2baf6d..90350573bc79 100644
--- a/extensions/vscode-colorize-tests/package-lock.json
+++ b/extensions/vscode-colorize-tests/package-lock.json
@@ -19,9 +19,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 72d8bb1ffb788a685e425c74ce31abd27d8a777e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:20:50 +0000
Subject: [PATCH 1575/1815] Bump @vscode/deviceid from 0.1.1 to 0.1.4

Bumps [@vscode/deviceid](https://github.com/Microsoft/vscode-deviceid) from 0.1.1 to 0.1.4.
- [Commits](https://github.com/Microsoft/vscode-deviceid/commits)

---
updated-dependencies:
- dependency-name: "@vscode/deviceid"
  dependency-version: 0.1.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 130d73d0e790..6f9f2c783fd9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
         "@microsoft/1ds-post-js": "^3.2.13",
         "@parcel/watcher": "2.5.4",
         "@types/semver": "^7.7.1",
-        "@vscode/deviceid": "^0.1.1",
+        "@vscode/deviceid": "^0.1.4",
         "@vscode/iconv-lite-umd": "0.7.1",
         "@vscode/policy-watcher": "^1.3.5",
         "@vscode/proxy-agent": "^0.32.0",
@@ -2892,10 +2892,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"
diff --git a/package.json b/package.json
index c272c0c1ec2f..12b31e4dcabc 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "@microsoft/1ds-post-js": "^3.2.13",
     "@parcel/watcher": "2.5.4",
     "@types/semver": "^7.7.1",
-    "@vscode/deviceid": "^0.1.1",
+    "@vscode/deviceid": "^0.1.4",
     "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/policy-watcher": "^1.3.5",
     "@vscode/proxy-agent": "^0.32.0",

From 34514d1c25837632eab90a4732213fee3399b73e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:20:52 +0000
Subject: [PATCH 1576/1815] Bump @xterm/addon-serialize in /remote/web

Bumps [@xterm/addon-serialize](https://github.com/xtermjs/xterm.js) from 0.15.0-beta.101 to 0.15.0-beta.103.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-serialize"
  dependency-version: 0.15.0-beta.103
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 22925018595a..5798061ceeb1 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -18,7 +18,7 @@
 				"@xterm/addon-ligatures": "^0.11.0-beta.101",
 				"@xterm/addon-progress": "^0.3.0-beta.101",
 				"@xterm/addon-search": "^0.17.0-beta.101",
-				"@xterm/addon-serialize": "^0.15.0-beta.101",
+				"@xterm/addon-serialize": "^0.15.0-beta.103",
 				"@xterm/addon-unicode11": "^0.10.0-beta.101",
 				"@xterm/addon-webgl": "^0.20.0-beta.100",
 				"@xterm/xterm": "^6.0.0",
@@ -179,12 +179,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-serialize": {
-			"version": "0.15.0-beta.101",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.101.tgz",
-			"integrity": "sha512-NJXY4WBV9tG2IG85xMlmUX6YFIa63NO0qF+JzDM9+3AaNDEmTXd+Lg5ucWtJjZRDW3AHUOLAQos4osLvBfyhYQ==",
+			"version": "0.15.0-beta.103",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.103.tgz",
+			"integrity": "sha512-U8pa+okuIey9/lLFdgkbcKzqgPsG6saYE+TKpoX5povVMSEEZGu5fC/QZyWeNwaDzAgQK8gW6D5cGrxPUN9Vwg==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.101"
+				"@xterm/xterm": "^6.1.0-beta.103"
 			}
 		},
 		"node_modules/@xterm/addon-unicode11": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 0063e637c96b..fbd20dbfaa1d 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -13,7 +13,7 @@
 		"@xterm/addon-ligatures": "^0.11.0-beta.101",
 		"@xterm/addon-progress": "^0.3.0-beta.101",
 		"@xterm/addon-search": "^0.17.0-beta.101",
-		"@xterm/addon-serialize": "^0.15.0-beta.101",
+		"@xterm/addon-serialize": "^0.15.0-beta.103",
 		"@xterm/addon-unicode11": "^0.10.0-beta.101",
 		"@xterm/addon-webgl": "^0.20.0-beta.100",
 		"@xterm/xterm": "^6.0.0",

From 24e413b7af391b274086d02a5074de42cb7d95ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:20:55 +0000
Subject: [PATCH 1577/1815] Bump @xterm/addon-image in /remote/web

Bumps [@xterm/addon-image](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.101 to 0.10.0-beta.103.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-image"
  dependency-version: 0.10.0-beta.103
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 22925018595a..717cb5432f68 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -14,7 +14,7 @@
 				"@vscode/tree-sitter-wasm": "^0.3.0",
 				"@vscode/vscode-languagedetection": "1.0.22",
 				"@xterm/addon-clipboard": "^0.3.0-beta.103",
-				"@xterm/addon-image": "^0.10.0-beta.101",
+				"@xterm/addon-image": "^0.10.0-beta.103",
 				"@xterm/addon-ligatures": "^0.11.0-beta.101",
 				"@xterm/addon-progress": "^0.3.0-beta.101",
 				"@xterm/addon-search": "^0.17.0-beta.101",
@@ -136,12 +136,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-image": {
-			"version": "0.10.0-beta.101",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.101.tgz",
-			"integrity": "sha512-Gd8ZpfyzvisG+08+mXynufQHfaWWxGhhtRMSQXV2FyPNa3MNXNrowgjeXhpaRObOOsxSZnAlB8qDW8OHTjzG6A==",
+			"version": "0.10.0-beta.103",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.103.tgz",
+			"integrity": "sha512-CVb7DQM8sT+MbbBESR/aJ2oJbR5KrN1nL/UexvxQmR3gizcV3TwRMNx9HBNLq6W+cnX81aRCot90xctSyGNfNA==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.101"
+				"@xterm/xterm": "^6.1.0-beta.103"
 			}
 		},
 		"node_modules/@xterm/addon-ligatures": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 0063e637c96b..d8527da2cfd5 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -9,7 +9,7 @@
 		"@vscode/tree-sitter-wasm": "^0.3.0",
 		"@vscode/vscode-languagedetection": "1.0.22",
 		"@xterm/addon-clipboard": "^0.3.0-beta.103",
-		"@xterm/addon-image": "^0.10.0-beta.101",
+		"@xterm/addon-image": "^0.10.0-beta.103",
 		"@xterm/addon-ligatures": "^0.11.0-beta.101",
 		"@xterm/addon-progress": "^0.3.0-beta.101",
 		"@xterm/addon-search": "^0.17.0-beta.101",

From 270ebffa2cad47fc6bac86bee49444ae43673af8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:20:57 +0000
Subject: [PATCH 1578/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /test/integration/browser

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/integration/browser/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integration/browser/package-lock.json b/test/integration/browser/package-lock.json
index 8a7727f5de17..45b88753ed49 100644
--- a/test/integration/browser/package-lock.json
+++ b/test/integration/browser/package-lock.json
@@ -65,9 +65,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From a293ff23b5810669970c20fafb92b9094668905f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:21:00 +0000
Subject: [PATCH 1579/1815] Bump @xterm/addon-search in /remote

Bumps [@xterm/addon-search](https://github.com/xtermjs/xterm.js) from 0.17.0-beta.101 to 0.17.0-beta.103.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-search"
  dependency-version: 0.17.0-beta.103
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 6bd822665d21..020b078a5be4 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -24,7 +24,7 @@
         "@xterm/addon-image": "^0.10.0-beta.101",
         "@xterm/addon-ligatures": "^0.10.0-beta.140",
         "@xterm/addon-progress": "^0.3.0-beta.101",
-        "@xterm/addon-search": "^0.17.0-beta.101",
+        "@xterm/addon-search": "^0.17.0-beta.103",
         "@xterm/addon-serialize": "^0.14.0-beta.140",
         "@xterm/addon-unicode11": "^0.10.0-beta.101",
         "@xterm/addon-webgl": "^0.20.0-beta.100",
@@ -607,12 +607,12 @@
       }
     },
     "node_modules/@xterm/addon-search": {
-      "version": "0.17.0-beta.101",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.101.tgz",
-      "integrity": "sha512-Y1yWv2baZdqP6AH/aKmMXSs6VNr7FGrpOe+DKNKq77H+QZbUoUXfgI/qKZpqlByl7FGuo8OT9g0AqH3zykkkUw==",
+      "version": "0.17.0-beta.103",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.103.tgz",
+      "integrity": "sha512-dG7GnhFWoRG1etFRk6J4J1mVJIyoY/kRQx3pxE4eHsuW5X+BhIxbbOAiniPZwFdGCkZx5aehnuVx2SM+O0FFBQ==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.101"
+        "@xterm/xterm": "^6.1.0-beta.103"
       }
     },
     "node_modules/@xterm/addon-serialize": {
diff --git a/remote/package.json b/remote/package.json
index 5df95b1f6215..114614a11062 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -19,7 +19,7 @@
     "@xterm/addon-image": "^0.10.0-beta.101",
     "@xterm/addon-ligatures": "^0.10.0-beta.140",
     "@xterm/addon-progress": "^0.3.0-beta.101",
-    "@xterm/addon-search": "^0.17.0-beta.101",
+    "@xterm/addon-search": "^0.17.0-beta.103",
     "@xterm/addon-serialize": "^0.14.0-beta.140",
     "@xterm/addon-unicode11": "^0.10.0-beta.101",
     "@xterm/addon-webgl": "^0.20.0-beta.100",

From eecdf93dc395e628dad1b39090fa8b2acf5007e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:21:03 +0000
Subject: [PATCH 1580/1815] Bump cookie and @types/cookie

Bumps [cookie](https://github.com/jshttp/cookie) and [@types/cookie](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/cookie). These dependencies needed to be updated together.

Updates `cookie` from 0.7.2 to 1.1.1
- [Release notes](https://github.com/jshttp/cookie/releases)
- [Commits](https://github.com/jshttp/cookie/compare/v0.7.2...v1.1.1)

Updates `@types/cookie` from 0.3.3 to 1.0.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/cookie)

---
updated-dependencies:
- dependency-name: cookie
  dependency-version: 1.1.1
  dependency-type: direct:development
  update-type: version-update:semver-major
- dependency-name: "@types/cookie"
  dependency-version: 1.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 40 ++++++++++++++++++++++++++++++----------
 package.json      |  4 ++--
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 130d73d0e790..cebf744fdefc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -58,7 +58,7 @@
       "devDependencies": {
         "@playwright/test": "^1.56.1",
         "@stylistic/eslint-plugin-ts": "^2.8.0",
-        "@types/cookie": "^0.3.3",
+        "@types/cookie": "^1.0.0",
         "@types/debug": "^4.1.5",
         "@types/eslint": "^9.6.1",
         "@types/gulp-svgmin": "^1.2.5",
@@ -90,7 +90,7 @@
         "ansi-colors": "^3.2.3",
         "asar": "^3.0.3",
         "chromium-pickle-js": "^0.2.0",
-        "cookie": "^0.7.2",
+        "cookie": "^1.1.1",
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^6.9.1",
         "cssnano": "^6.0.3",
@@ -2478,10 +2478,15 @@
       "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
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-1.0.0.tgz",
+      "integrity": "sha512-mGFXbkDQJ6kAXByHS7QAggRXgols0mAdP4MuXgloGY1tXokvzaFFM4SMqWvf7AH0oafI7zlFJwoGWzmhDqTZ9w==",
+      "deprecated": "This is a stub types definition. cookie provides its own type definitions, so you do not need this installed.",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cookie": "*"
+      }
     },
     "node_modules/@types/debug": {
       "version": "4.1.9",
@@ -3789,6 +3794,16 @@
         "node": ">= 16"
       }
     },
+    "node_modules/@vscode/vscode-perf/node_modules/cookie": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "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",
@@ -5624,12 +5639,17 @@
       }
     },
     "node_modules/cookie": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
-      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz",
+      "integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/cookies": {
diff --git a/package.json b/package.json
index c272c0c1ec2f..411bb07a462a 100644
--- a/package.json
+++ b/package.json
@@ -117,7 +117,7 @@
   "devDependencies": {
     "@playwright/test": "^1.56.1",
     "@stylistic/eslint-plugin-ts": "^2.8.0",
-    "@types/cookie": "^0.3.3",
+    "@types/cookie": "^1.0.0",
     "@types/debug": "^4.1.5",
     "@types/eslint": "^9.6.1",
     "@types/gulp-svgmin": "^1.2.5",
@@ -149,7 +149,7 @@
     "ansi-colors": "^3.2.3",
     "asar": "^3.0.3",
     "chromium-pickle-js": "^0.2.0",
-    "cookie": "^0.7.2",
+    "cookie": "^1.1.1",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.9.1",
     "cssnano": "^6.0.3",

From c0d541139024127c095ab3ef06dba9c16016ee5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:21:08 +0000
Subject: [PATCH 1581/1815] Bump vscode-textmate from 9.3.0 to 9.3.1 in
 /remote/web

Bumps [vscode-textmate](https://github.com/microsoft/vscode-textmate) from 9.3.0 to 9.3.1.
- [Release notes](https://github.com/microsoft/vscode-textmate/releases)
- [Commits](https://github.com/microsoft/vscode-textmate/compare/v9.3.0...v9.3.1)

---
updated-dependencies:
- dependency-name: vscode-textmate
  dependency-version: 9.3.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 8 ++++----
 remote/web/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 22925018595a..ff9d98a07c80 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -25,7 +25,7 @@
 				"jschardet": "3.1.4",
 				"tas-client-umd": "0.2.0",
 				"vscode-oniguruma": "2.0.1",
-				"vscode-textmate": "9.3.0"
+				"vscode-textmate": "9.3.1"
 			}
 		},
 		"node_modules/@microsoft/1ds-core-js": {
@@ -270,9 +270,9 @@
 			"license": "MIT"
 		},
 		"node_modules/vscode-textmate": {
-			"version": "9.3.0",
-			"resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.3.0.tgz",
-			"integrity": "sha512-zHiZZOdb9xqj5/X1C4a29sbgT2HngdWxPLSl3PyHRQF+5visI4uNM020OHiLJjsMxUssyk/pGVAg/9LCIobrVg==",
+			"version": "9.3.1",
+			"resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.3.1.tgz",
+			"integrity": "sha512-U19nFkCraZF9/bkQKQYsb9mRqM9NwpToQQFl40nGiioZTH9gRtdtCHwp48cubayVfreX3ivnoxgxQgNwrTVmQg==",
 			"license": "MIT"
 		},
 		"node_modules/yallist": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 0063e637c96b..c66a9bb498c3 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -20,6 +20,6 @@
 		"jschardet": "3.1.4",
 		"tas-client-umd": "0.2.0",
 		"vscode-oniguruma": "2.0.1",
-		"vscode-textmate": "9.3.0"
+		"vscode-textmate": "9.3.1"
 	}
 }

From fbf701791596027f98ddd732c7fec7aff7e243d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 12:21:17 +0000
Subject: [PATCH 1582/1815] Bump @types/node from 25.0.7 to 25.0.8 in
 /test/smoke

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.7 to 25.0.8.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/smoke/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/smoke/package-lock.json b/test/smoke/package-lock.json
index 157193b5a9f3..405cc1655900 100644
--- a/test/smoke/package-lock.json
+++ b/test/smoke/package-lock.json
@@ -61,9 +61,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
-      "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
+      "version": "25.0.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
+      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From f1c5a91950b072dec88bd24650cd6462187225de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 15:54:46 +0000
Subject: [PATCH 1583/1815] Bump @types/ansi-colors from 3.2.0 to 3.2.6 in
 /build

Bumps [@types/ansi-colors](https://github.com/DefinitelyTyped/DefinitelyTyped) from 3.2.0 to 3.2.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits)

---
updated-dependencies:
- dependency-name: "@types/ansi-colors"
  dependency-version: 3.2.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 15 ++++++++++-----
 build/package.json      |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 9bc09ceda351..750f466c5594 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -15,7 +15,7 @@
         "@azure/msal-node": "^2.16.1",
         "@azure/storage-blob": "^12.25.0",
         "@electron/get": "^4.0.2",
-        "@types/ansi-colors": "^3.2.0",
+        "@types/ansi-colors": "^3.2.6",
         "@types/byline": "^4.2.36",
         "@types/debounce": "^1.2.4",
         "@types/debug": "^4.1.12",
@@ -1462,10 +1462,15 @@
       }
     },
     "node_modules/@types/ansi-colors": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@types/ansi-colors/-/ansi-colors-3.2.0.tgz",
-      "integrity": "sha512-0caWAhXht9N2lOdMzJLXybsSkYCx1QOdxx6pae48tswI9QV3DFX26AoOpy0JxwhCb+zISTqmd6H8t9Zby9BoZg==",
-      "dev": true
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@types/ansi-colors/-/ansi-colors-3.2.6.tgz",
+      "integrity": "sha512-IAfWMGE7pYvqt22qPZ5Amtd16XtAHipTFlJ1S+ztpUu3WudDbqGna40ktsOQcTrLOO+DODGRCJFFrqfV+0fNQA==",
+      "deprecated": "This is a stub types definition. ansi-colors provides its own type definitions, so you do not need this installed.",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-colors": "*"
+      }
     },
     "node_modules/@types/byline": {
       "version": "4.2.36",
diff --git a/build/package.json b/build/package.json
index 119f8ca66a76..be0ece686dd7 100644
--- a/build/package.json
+++ b/build/package.json
@@ -9,7 +9,7 @@
     "@azure/msal-node": "^2.16.1",
     "@azure/storage-blob": "^12.25.0",
     "@electron/get": "^4.0.2",
-    "@types/ansi-colors": "^3.2.0",
+    "@types/ansi-colors": "^3.2.6",
     "@types/byline": "^4.2.36",
     "@types/debounce": "^1.2.4",
     "@types/debug": "^4.1.12",

From 7018685b06c51ca268143ca6e54888a9b42e0ad2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 16:05:11 +0000
Subject: [PATCH 1584/1815] Bump @azure/storage-blob from 12.25.0 to 12.29.1 in
 /build

Bumps [@azure/storage-blob](https://github.com/Azure/azure-sdk-for-js) from 12.25.0 to 12.29.1.
- [Release notes](https://github.com/Azure/azure-sdk-for-js/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-js/blob/main/documentation/Changelog-for-next-generation.md)
- [Commits](https://github.com/Azure/azure-sdk-for-js/compare/@azure/storage-blob_12.25.0...@azure/storage-blob_12.29.1)

---
updated-dependencies:
- dependency-name: "@azure/storage-blob"
  dependency-version: 12.29.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 95 ++++++++++++++++++++++++++---------------
 build/package.json      |  2 +-
 2 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 6fd285643b4d..35bcc935d800 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -13,7 +13,7 @@
         "@azure/cosmos": "^4",
         "@azure/identity": "^4.13.0",
         "@azure/msal-node": "^2.16.1",
-        "@azure/storage-blob": "^12.25.0",
+        "@azure/storage-blob": "^12.29.1",
         "@electron/get": "^4.0.2",
         "@types/ansi-colors": "^3.2.6",
         "@types/byline": "^4.2.36",
@@ -241,17 +241,17 @@
       }
     },
     "node_modules/@azure/core-xml": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/@azure/core-xml/-/core-xml-1.4.4.tgz",
-      "integrity": "sha512-J4FYAqakGXcbfeZjwjMzjNcpcH4E+JtEBv+xcV1yL0Ydn/6wbQfeFKTCHh9wttAi0lmajHw7yBbHPRG+YHckZQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-xml/-/core-xml-1.5.0.tgz",
+      "integrity": "sha512-D/sdlJBMJfx7gqoj66PKVmhDDaU6TKA49ptcolxdas29X7AfvLTmfAGLjAcIMBK7UZ2o4lygHIqVckOlQU3xWw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fast-xml-parser": "^4.4.1",
-        "tslib": "^2.6.2"
+        "fast-xml-parser": "^5.0.7",
+        "tslib": "^2.8.1"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/@azure/cosmos": {
@@ -422,28 +422,50 @@
       }
     },
     "node_modules/@azure/storage-blob": {
-      "version": "12.25.0",
-      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.25.0.tgz",
-      "integrity": "sha512-oodouhA3nCCIh843tMMbxty3WqfNT+Vgzj3Xo5jqR9UPnzq3d7mzLjlHAYz7lW+b4km3SIgz+NAgztvhm7Z6kQ==",
+      "version": "12.29.1",
+      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.29.1.tgz",
+      "integrity": "sha512-7ktyY0rfTM0vo7HvtK6E3UvYnI9qfd6Oz6z/+92VhGRveWng3kJwMKeUpqmW/NmwcDNbxHpSlldG+vsUnRFnBg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@azure/abort-controller": "^2.1.2",
-        "@azure/core-auth": "^1.4.0",
-        "@azure/core-client": "^1.6.2",
-        "@azure/core-http-compat": "^2.0.0",
+        "@azure/core-auth": "^1.9.0",
+        "@azure/core-client": "^1.9.3",
+        "@azure/core-http-compat": "^2.2.0",
         "@azure/core-lro": "^2.2.0",
-        "@azure/core-paging": "^1.1.1",
-        "@azure/core-rest-pipeline": "^1.10.1",
-        "@azure/core-tracing": "^1.1.2",
-        "@azure/core-util": "^1.6.1",
-        "@azure/core-xml": "^1.4.3",
-        "@azure/logger": "^1.0.0",
+        "@azure/core-paging": "^1.6.2",
+        "@azure/core-rest-pipeline": "^1.19.1",
+        "@azure/core-tracing": "^1.2.0",
+        "@azure/core-util": "^1.11.0",
+        "@azure/core-xml": "^1.4.5",
+        "@azure/logger": "^1.1.4",
+        "@azure/storage-common": "^12.1.1",
         "events": "^3.0.0",
-        "tslib": "^2.2.0"
+        "tslib": "^2.8.1"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@azure/storage-common": {
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/@azure/storage-common/-/storage-common-12.1.1.tgz",
+      "integrity": "sha512-eIOH1pqFwI6UmVNnDQvmFeSg0XppuzDLFeUNO/Xht7ODAzRLgGDh7h550pSxoA+lPDxBl1+D2m/KG3jWzCUjTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@azure/abort-controller": "^2.1.2",
+        "@azure/core-auth": "^1.9.0",
+        "@azure/core-http-compat": "^2.2.0",
+        "@azure/core-rest-pipeline": "^1.19.1",
+        "@azure/core-tracing": "^1.2.0",
+        "@azure/core-util": "^1.11.0",
+        "@azure/logger": "^1.1.4",
+        "events": "^3.3.0",
+        "tslib": "^2.8.1"
+      },
+      "engines": {
+        "node": ">=20.0.0"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -3481,10 +3503,11 @@
       }
     },
     "node_modules/events": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
-      "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.x"
       }
@@ -3623,23 +3646,19 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/fast-xml-parser": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz",
-      "integrity": "sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.3.3.tgz",
+      "integrity": "sha512-2O3dkPAAC6JavuMm8+4+pgTk+5hoAs+CjZ+sWcQLkX9+/tHRuTkQh/Oaifr8qDmZ8iEHb771Ea6G8CdwkrgvYA==",
       "dev": true,
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/NaturalIntelligence"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/naturalintelligence"
         }
       ],
       "license": "MIT",
       "dependencies": {
-        "strnum": "^1.0.5"
+        "strnum": "^2.1.0"
       },
       "bin": {
         "fxparser": "src/cli/cli.js"
@@ -6355,10 +6374,16 @@
       }
     },
     "node_modules/strnum": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
-      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.2.tgz",
+      "integrity": "sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
       "license": "MIT"
     },
     "node_modules/structured-source": {
diff --git a/build/package.json b/build/package.json
index 5c2e2039ede2..cf6bfe526614 100644
--- a/build/package.json
+++ b/build/package.json
@@ -7,7 +7,7 @@
     "@azure/cosmos": "^4",
     "@azure/identity": "^4.13.0",
     "@azure/msal-node": "^2.16.1",
-    "@azure/storage-blob": "^12.25.0",
+    "@azure/storage-blob": "^12.29.1",
     "@electron/get": "^4.0.2",
     "@types/ansi-colors": "^3.2.6",
     "@types/byline": "^4.2.36",

From 910abcbbf338285d5078f1c06047f73303ca2275 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 17:56:44 +0000
Subject: [PATCH 1585/1815] Bump flate2 from 1.1.5 to 1.1.8 in /cli

Bumps [flate2](https://github.com/rust-lang/flate2-rs) from 1.1.5 to 1.1.8.
- [Release notes](https://github.com/rust-lang/flate2-rs/releases)
- [Commits](https://github.com/rust-lang/flate2-rs/compare/1.1.5...1.1.8)

---
updated-dependencies:
- dependency-name: flate2
  dependency-version: 1.1.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 4 ++--
 cli/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 7bcd00a9743c..573880720649 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -866,9 +866,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.1.5"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
+checksum = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369"
 dependencies = [
  "crc32fast",
  "libz-sys",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index a698cd93e37c..041daa52c9e9 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -18,7 +18,7 @@ open = "5.3.3"
 reqwest = { version = "0.12.5", default-features = false, features = ["json", "stream", "native-tls"] }
 tokio = { version = "1.49.0", features = ["full"] }
 tokio-util = { version = "0.7.18", features = ["compat", "codec"] }
-flate2 = { version = "1.1.5", default-features = false, features = ["zlib"] }
+flate2 = { version = "1.1.8", default-features = false, features = ["zlib"] }
 zip = { version = "2.3.0", default-features = false, features = ["time", "deflate-zlib"] }
 regex = "1.12.2"
 lazy_static = "1.5.0"

From f68c217a74cddbb7c167133dee9b7e5d75773fb5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 18:11:11 +0000
Subject: [PATCH 1586/1815] Bump @xterm/addon-unicode11 in /remote/web

Bumps [@xterm/addon-unicode11](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.101 to 0.10.0-beta.103.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-unicode11"
  dependency-version: 0.10.0-beta.103
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 5116bd1252eb..45a1a43e4fe2 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -19,7 +19,7 @@
 				"@xterm/addon-progress": "^0.3.0-beta.101",
 				"@xterm/addon-search": "^0.17.0-beta.101",
 				"@xterm/addon-serialize": "^0.15.0-beta.103",
-				"@xterm/addon-unicode11": "^0.10.0-beta.101",
+				"@xterm/addon-unicode11": "^0.10.0-beta.103",
 				"@xterm/addon-webgl": "^0.20.0-beta.100",
 				"@xterm/xterm": "^6.0.0",
 				"jschardet": "3.1.4",
@@ -188,12 +188,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-unicode11": {
-			"version": "0.10.0-beta.101",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.101.tgz",
-			"integrity": "sha512-WM9Rs8ZBQ1nY5nb4OxXsOLVIZ2DQvGmtSIKkUueDB9mSQOg05mz2dHbEdW63MrX8sMQAbEx+o/kyxvl7oFDS/A==",
+			"version": "0.10.0-beta.103",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.103.tgz",
+			"integrity": "sha512-p/ZWXOO30k7rMmmxwhnC+vchFtu9G+F226btvRvc0BwzTqG+NW8ZZoOs0ywJ2HwBKsI/4vRXVCEk1sSlZtgh/A==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.101"
+				"@xterm/xterm": "^6.1.0-beta.103"
 			}
 		},
 		"node_modules/@xterm/addon-webgl": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 55bde2cad818..edf19536f701 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -14,7 +14,7 @@
 		"@xterm/addon-progress": "^0.3.0-beta.101",
 		"@xterm/addon-search": "^0.17.0-beta.101",
 		"@xterm/addon-serialize": "^0.15.0-beta.103",
-		"@xterm/addon-unicode11": "^0.10.0-beta.101",
+		"@xterm/addon-unicode11": "^0.10.0-beta.103",
 		"@xterm/addon-webgl": "^0.20.0-beta.100",
 		"@xterm/xterm": "^6.0.0",
 		"jschardet": "3.1.4",

From cd7c7999cfcd0a9ce085628db3740ee5e483f615 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 18:11:35 +0000
Subject: [PATCH 1587/1815] Bump @xterm/addon-ligatures in /remote/web

Bumps [@xterm/addon-ligatures](https://github.com/xtermjs/xterm.js) from 0.11.0-beta.101 to 0.11.0-beta.103.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-ligatures"
  dependency-version: 0.11.0-beta.103
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 5116bd1252eb..b2acb67b242f 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -15,7 +15,7 @@
 				"@vscode/vscode-languagedetection": "1.0.22",
 				"@xterm/addon-clipboard": "^0.3.0-beta.103",
 				"@xterm/addon-image": "^0.10.0-beta.103",
-				"@xterm/addon-ligatures": "^0.11.0-beta.101",
+				"@xterm/addon-ligatures": "^0.11.0-beta.103",
 				"@xterm/addon-progress": "^0.3.0-beta.101",
 				"@xterm/addon-search": "^0.17.0-beta.101",
 				"@xterm/addon-serialize": "^0.15.0-beta.103",
@@ -145,9 +145,9 @@
 			}
 		},
 		"node_modules/@xterm/addon-ligatures": {
-			"version": "0.11.0-beta.101",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.101.tgz",
-			"integrity": "sha512-FIO3S/f3K1nnmQs/oJ3ILI9p1Vb4sSK7J4UhROBj5JOyZtmRwhdUFr9MozfPVdc2VZPRJJJJq6vaPDdLioeJyQ==",
+			"version": "0.11.0-beta.103",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.103.tgz",
+			"integrity": "sha512-+Nyq0CUJ6ZKj82D/6KGD3xnsgqEmnbaS3Jh/dFKBZxlICzGiJjQ8zlUCWabbdpgwQyCg4BHGuM+qC8P9FF9rsA==",
 			"license": "MIT",
 			"dependencies": {
 				"lru-cache": "^6.0.0",
@@ -157,7 +157,7 @@
 				"node": ">8.0.0"
 			},
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.101"
+				"@xterm/xterm": "^6.1.0-beta.103"
 			}
 		},
 		"node_modules/@xterm/addon-progress": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 55bde2cad818..5765081e1e33 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -10,7 +10,7 @@
 		"@vscode/vscode-languagedetection": "1.0.22",
 		"@xterm/addon-clipboard": "^0.3.0-beta.103",
 		"@xterm/addon-image": "^0.10.0-beta.103",
-		"@xterm/addon-ligatures": "^0.11.0-beta.101",
+		"@xterm/addon-ligatures": "^0.11.0-beta.103",
 		"@xterm/addon-progress": "^0.3.0-beta.101",
 		"@xterm/addon-search": "^0.17.0-beta.101",
 		"@xterm/addon-serialize": "^0.15.0-beta.103",

From de2f6c8e237fd6f843d9087854b8105beb7a9839 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 18:14:47 +0000
Subject: [PATCH 1588/1815] Bump @xterm/addon-webgl in /remote

Bumps [@xterm/addon-webgl](https://github.com/xtermjs/xterm.js) from 0.20.0-beta.100 to 0.20.0-beta.102.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-webgl"
  dependency-version: 0.20.0-beta.102
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 020b078a5be4..a6ad78639aad 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -27,7 +27,7 @@
         "@xterm/addon-search": "^0.17.0-beta.103",
         "@xterm/addon-serialize": "^0.14.0-beta.140",
         "@xterm/addon-unicode11": "^0.10.0-beta.101",
-        "@xterm/addon-webgl": "^0.20.0-beta.100",
+        "@xterm/addon-webgl": "^0.20.0-beta.102",
         "@xterm/headless": "^5.6.0-beta.140",
         "@xterm/xterm": "^5.6.0-beta.98",
         "cookie": "^0.7.0",
@@ -634,12 +634,12 @@
       }
     },
     "node_modules/@xterm/addon-webgl": {
-      "version": "0.20.0-beta.100",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.100.tgz",
-      "integrity": "sha512-h17XiyERE+LpuYEPUAm2ux6g2Iy34BT/tfwxOckZ+RrhjM8bZMeN3u6/q28viBqAKWhhD3JbxlcDfKMN8sE3sg==",
+      "version": "0.20.0-beta.102",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.102.tgz",
+      "integrity": "sha512-xorsFnfF6rpJUILiRVzknUVfi66f7hdUjtb4FtDF4msMOHLsIEFOzXTegD01PcnSGmUaHkfTldmOAV6oPMWX8w==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.101"
+        "@xterm/xterm": "^6.1.0-beta.103"
       }
     },
     "node_modules/@xterm/headless": {
diff --git a/remote/package.json b/remote/package.json
index 114614a11062..c28de64eee12 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -22,7 +22,7 @@
     "@xterm/addon-search": "^0.17.0-beta.103",
     "@xterm/addon-serialize": "^0.14.0-beta.140",
     "@xterm/addon-unicode11": "^0.10.0-beta.101",
-    "@xterm/addon-webgl": "^0.20.0-beta.100",
+    "@xterm/addon-webgl": "^0.20.0-beta.102",
     "@xterm/headless": "^5.6.0-beta.140",
     "@xterm/xterm": "^5.6.0-beta.98",
     "cookie": "^0.7.0",

From d9f0c0fcd48c93075a5684bc21aabc910f3c4359 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 18:15:37 +0000
Subject: [PATCH 1589/1815] Bump @xterm/xterm from 5.6.0-beta.98 to 6.0.0 in
 /remote

Bumps [@xterm/xterm](https://github.com/xtermjs/xterm.js) from 5.6.0-beta.98 to 6.0.0.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits/6.0.0)

---
updated-dependencies:
- dependency-name: "@xterm/xterm"
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 13 ++++++++-----
 remote/package.json      |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 020b078a5be4..7787be19f44e 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -29,7 +29,7 @@
         "@xterm/addon-unicode11": "^0.10.0-beta.101",
         "@xterm/addon-webgl": "^0.20.0-beta.100",
         "@xterm/headless": "^5.6.0-beta.140",
-        "@xterm/xterm": "^5.6.0-beta.98",
+        "@xterm/xterm": "^6.0.0",
         "cookie": "^0.7.0",
         "http-proxy-agent": "^7.0.2",
         "https-proxy-agent": "^7.0.6",
@@ -652,10 +652,13 @@
       ]
     },
     "node_modules/@xterm/xterm": {
-      "version": "5.6.0-beta.98",
-      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.98.tgz",
-      "integrity": "sha512-fJexj3XKDAMGsR8KKaiEhGrtJD1eRANbT3094E3KSgvbHRa3524tSFvDCx5+5KRE/hYaECmi0knAUIWJCvSPTg==",
-      "license": "MIT"
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.0.0.tgz",
+      "integrity": "sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg==",
+      "license": "MIT",
+      "workspaces": [
+        "addons/*"
+      ]
     },
     "node_modules/agent-base": {
       "version": "7.1.4",
diff --git a/remote/package.json b/remote/package.json
index 114614a11062..8cf80a253b1d 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -24,7 +24,7 @@
     "@xterm/addon-unicode11": "^0.10.0-beta.101",
     "@xterm/addon-webgl": "^0.20.0-beta.100",
     "@xterm/headless": "^5.6.0-beta.140",
-    "@xterm/xterm": "^5.6.0-beta.98",
+    "@xterm/xterm": "^6.0.0",
     "cookie": "^0.7.0",
     "http-proxy-agent": "^7.0.2",
     "https-proxy-agent": "^7.0.6",

From a9c9677bcd8d1b6bd1a952e819364e0c54a516f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 18:15:55 +0000
Subject: [PATCH 1590/1815] Bump @parcel/watcher from 2.5.1 to 2.5.4 in /remote

Bumps [@parcel/watcher](https://github.com/parcel-bundler/watcher) from 2.5.1 to 2.5.4.
- [Release notes](https://github.com/parcel-bundler/watcher/releases)
- [Commits](https://github.com/parcel-bundler/watcher/compare/v2.5.1...v2.5.4)

---
updated-dependencies:
- dependency-name: "@parcel/watcher"
  dependency-version: 2.5.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 192 +++++++++++++--------------------------
 remote/package.json      |   2 +-
 2 files changed, 65 insertions(+), 129 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 020b078a5be4..c802752157c1 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -10,7 +10,7 @@
       "dependencies": {
         "@microsoft/1ds-core-js": "^4.3.10",
         "@microsoft/1ds-post-js": "^4.3.11",
-        "@parcel/watcher": "2.5.1",
+        "@parcel/watcher": "2.5.4",
         "@vscode/deviceid": "^0.1.2",
         "@vscode/iconv-lite-umd": "0.7.1",
         "@vscode/proxy-agent": "^0.36.0",
@@ -121,16 +121,16 @@
       "license": "MIT"
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
-      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.4.tgz",
+      "integrity": "sha512-WYa2tUVV5HiArWPB3ydlOc4R2ivq0IDrlqhMi3l7mVsFEXNcTfxYFPIHXHXIh/ca/y/V5N4E1zecyxdIBjYnkQ==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "detect-libc": "^1.0.3",
+        "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"
@@ -140,25 +140,25 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.1",
-        "@parcel/watcher-darwin-arm64": "2.5.1",
-        "@parcel/watcher-darwin-x64": "2.5.1",
-        "@parcel/watcher-freebsd-x64": "2.5.1",
-        "@parcel/watcher-linux-arm-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm-musl": "2.5.1",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm64-musl": "2.5.1",
-        "@parcel/watcher-linux-x64-glibc": "2.5.1",
-        "@parcel/watcher-linux-x64-musl": "2.5.1",
-        "@parcel/watcher-win32-arm64": "2.5.1",
-        "@parcel/watcher-win32-ia32": "2.5.1",
-        "@parcel/watcher-win32-x64": "2.5.1"
+        "@parcel/watcher-android-arm64": "2.5.4",
+        "@parcel/watcher-darwin-arm64": "2.5.4",
+        "@parcel/watcher-darwin-x64": "2.5.4",
+        "@parcel/watcher-freebsd-x64": "2.5.4",
+        "@parcel/watcher-linux-arm-glibc": "2.5.4",
+        "@parcel/watcher-linux-arm-musl": "2.5.4",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.4",
+        "@parcel/watcher-linux-arm64-musl": "2.5.4",
+        "@parcel/watcher-linux-x64-glibc": "2.5.4",
+        "@parcel/watcher-linux-x64-musl": "2.5.4",
+        "@parcel/watcher-win32-arm64": "2.5.4",
+        "@parcel/watcher-win32-ia32": "2.5.4",
+        "@parcel/watcher-win32-x64": "2.5.4"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
-      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.4.tgz",
+      "integrity": "sha512-hoh0vx4v+b3BNI7Cjoy2/B0ARqcwVNrzN/n7DLq9ZB4I3lrsvhrkCViJyfTj/Qi5xM9YFiH4AmHGK6pgH1ss7g==",
       "cpu": [
         "arm64"
       ],
@@ -176,9 +176,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
-      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.4.tgz",
+      "integrity": "sha512-kphKy377pZiWpAOyTgQYPE5/XEKVMaj6VUjKT5VkNyUJlr2qZAn8gIc7CPzx+kbhvqHDT9d7EqdOqRXT6vk0zw==",
       "cpu": [
         "arm64"
       ],
@@ -196,9 +196,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
-      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.4.tgz",
+      "integrity": "sha512-UKaQFhCtNJW1A9YyVz3Ju7ydf6QgrpNQfRZ35wNKUhTQ3dxJ/3MULXN5JN/0Z80V/KUBDGa3RZaKq1EQT2a2gg==",
       "cpu": [
         "x64"
       ],
@@ -216,9 +216,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
-      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.4.tgz",
+      "integrity": "sha512-Dib0Wv3Ow/m2/ttvLdeI2DBXloO7t3Z0oCp4bAb2aqyqOjKPPGrg10pMJJAQ7tt8P4V2rwYwywkDhUia/FgS+Q==",
       "cpu": [
         "x64"
       ],
@@ -236,9 +236,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
-      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.4.tgz",
+      "integrity": "sha512-I5Vb769pdf7Q7Sf4KNy8Pogl/URRCKu9ImMmnVKYayhynuyGYMzuI4UOWnegQNa2sGpsPSbzDsqbHNMyeyPCgw==",
       "cpu": [
         "arm"
       ],
@@ -256,9 +256,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
-      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.4.tgz",
+      "integrity": "sha512-kGO8RPvVrcAotV4QcWh8kZuHr9bXi9a3bSZw7kFarYR0+fGliU7hd/zevhjw8fnvIKG3J9EO5G6sXNGCSNMYPQ==",
       "cpu": [
         "arm"
       ],
@@ -276,9 +276,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
-      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.4.tgz",
+      "integrity": "sha512-KU75aooXhqGFY2W5/p8DYYHt4hrjHZod8AhcGAmhzPn/etTa+lYCDB2b1sJy3sWJ8ahFVTdy+EbqSBvMx3iFlw==",
       "cpu": [
         "arm64"
       ],
@@ -296,9 +296,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
-      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.4.tgz",
+      "integrity": "sha512-Qx8uNiIekVutnzbVdrgSanM+cbpDD3boB1f8vMtnuG5Zau4/bdDbXyKwIn0ToqFhIuob73bcxV9NwRm04/hzHQ==",
       "cpu": [
         "arm64"
       ],
@@ -316,9 +316,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
-      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.4.tgz",
+      "integrity": "sha512-UYBQvhYmgAv61LNUn24qGQdjtycFBKSK3EXr72DbJqX9aaLbtCOO8+1SkKhD/GNiJ97ExgcHBrukcYhVjrnogA==",
       "cpu": [
         "x64"
       ],
@@ -336,9 +336,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
-      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.4.tgz",
+      "integrity": "sha512-YoRWCVgxv8akZrMhdyVi6/TyoeeMkQ0PGGOf2E4omODrvd1wxniXP+DBynKoHryStks7l+fDAMUBRzqNHrVOpg==",
       "cpu": [
         "x64"
       ],
@@ -356,9 +356,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
-      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.4.tgz",
+      "integrity": "sha512-iby+D/YNXWkiQNYcIhg8P5hSjzXEHaQrk2SLrWOUD7VeC4Ohu0WQvmV+HDJokZVJ2UjJ4AGXW3bx7Lls9Ln4TQ==",
       "cpu": [
         "arm64"
       ],
@@ -376,9 +376,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
-      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.4.tgz",
+      "integrity": "sha512-vQN+KIReG0a2ZDpVv8cgddlf67J8hk1WfZMMP7sMeZmJRSmEax5xNDNWKdgqSe2brOKTQQAs3aCCUal2qBHAyg==",
       "cpu": [
         "ia32"
       ],
@@ -396,9 +396,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
-      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.4.tgz",
+      "integrity": "sha512-3A6efb6BOKwyw7yk9ro2vus2YTt2nvcd56AuzxdMiVOxL9umDyN5PKkKfZ/gZ9row41SjVmTVQNWQhaRRGpOKw==",
       "cpu": [
         "x64"
       ],
@@ -415,18 +415,6 @@
         "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@parcel/watcher/node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "license": "Apache-2.0",
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/@tootallnate/once": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-3.0.0.tgz",
@@ -705,17 +693,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",
@@ -843,17 +820,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",
@@ -1009,14 +975,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",
@@ -1081,18 +1039,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",
@@ -1206,11 +1152,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"
@@ -1469,17 +1416,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",
diff --git a/remote/package.json b/remote/package.json
index 114614a11062..4b933568b1f7 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@microsoft/1ds-core-js": "^4.3.10",
     "@microsoft/1ds-post-js": "^4.3.11",
-    "@parcel/watcher": "2.5.1",
+    "@parcel/watcher": "2.5.4",
     "@vscode/deviceid": "^0.1.2",
     "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/proxy-agent": "^0.36.0",

From 7d33d7d7ef5bd687161a183cae60908b7fff3c6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 19:55:55 +0000
Subject: [PATCH 1591/1815] Bump @stylistic/eslint-plugin-ts from 2.8.0 to
 4.4.1

Bumps [@stylistic/eslint-plugin-ts](https://github.com/eslint-stylistic/eslint-stylistic/tree/HEAD/packages/eslint-plugin-ts) from 2.8.0 to 4.4.1.
- [Release notes](https://github.com/eslint-stylistic/eslint-stylistic/releases)
- [Changelog](https://github.com/eslint-stylistic/eslint-stylistic/blob/v4.4.1/CHANGELOG.md)
- [Commits](https://github.com/eslint-stylistic/eslint-stylistic/commits/v4.4.1/packages/eslint-plugin-ts)

---
updated-dependencies:
- dependency-name: "@stylistic/eslint-plugin-ts"
  dependency-version: 4.4.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 218 +++++++++++++++++++++++++++++++++++++++++++---
 package.json      |   2 +-
 2 files changed, 208 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 69bfca306468..fab8ef8cd16d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -57,7 +57,7 @@
       },
       "devDependencies": {
         "@playwright/test": "^1.56.1",
-        "@stylistic/eslint-plugin-ts": "^2.8.0",
+        "@stylistic/eslint-plugin-ts": "^4.4.1",
         "@types/cookie": "^1.0.0",
         "@types/debug": "^4.1.5",
         "@types/eslint": "^9.6.1",
@@ -2328,27 +2328,141 @@
       }
     },
     "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==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-ts/-/eslint-plugin-ts-4.4.1.tgz",
+      "integrity": "sha512-2r6cLcmdF6til66lx8esBYvBvsn7xCmLT50gw/n1rGGlTq/OxeNjBIh4c3VEaDGMa/5TybrZTia6sQUHdIWx1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/utils": "^8.32.1",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=9.0.0"
+      }
+    },
+    "node_modules/@stylistic/eslint-plugin-ts/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.53.0.tgz",
+      "integrity": "sha512-kWNj3l01eOGSdVBnfAF2K1BTh06WS0Yet6JUgb9Cmkqaz3Jlu0fdVUjj9UI8gPidBWSMqDIglmEXifSgDT/D0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.53.0",
+        "@typescript-eslint/visitor-keys": "8.53.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@stylistic/eslint-plugin-ts/node_modules/@typescript-eslint/types": {
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.53.0.tgz",
+      "integrity": "sha512-Bmh9KX31Vlxa13+PqPvt4RzKRN1XORYSLlAE+sO1i28NkisGbTtSLFVB3l7PWdHtR3E0mVMuC7JilWJ99m2HxQ==",
+      "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/@stylistic/eslint-plugin-ts/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.53.0.tgz",
+      "integrity": "sha512-pw0c0Gdo7Z4xOG987u3nJ8akL9093yEEKv8QTJ+Bhkghj1xyj8cgPaavlr9rq8h7+s6plUJ4QJYw2gCZodqmGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/project-service": "8.53.0",
+        "@typescript-eslint/tsconfig-utils": "8.53.0",
+        "@typescript-eslint/types": "8.53.0",
+        "@typescript-eslint/visitor-keys": "8.53.0",
+        "debug": "^4.4.3",
+        "minimatch": "^9.0.5",
+        "semver": "^7.7.3",
+        "tinyglobby": "^0.2.15",
+        "ts-api-utils": "^2.4.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/@stylistic/eslint-plugin-ts/node_modules/@typescript-eslint/utils": {
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.53.0.tgz",
+      "integrity": "sha512-XDY4mXTez3Z1iRDI5mbRhH4DFSt46oaIFsLg+Zn97+sYrXACziXSQcSelMybnVZ5pa1P6xYkPr5cMJyunM1ZDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/utils": "^8.4.0",
-        "eslint-visitor-keys": "^4.0.0",
-        "espree": "^10.1.0"
+        "@eslint-community/eslint-utils": "^4.9.1",
+        "@typescript-eslint/scope-manager": "8.53.0",
+        "@typescript-eslint/types": "8.53.0",
+        "@typescript-eslint/typescript-estree": "8.53.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
       "peerDependencies": {
-        "eslint": ">=8.40.0"
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@stylistic/eslint-plugin-ts/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.53.0.tgz",
+      "integrity": "sha512-LZ2NqIHFhvFwxG0qZeLL9DvdNAHPGCY5dIRwBhyYeU+LfLhcStE1ImjsuTG/WaVh3XysGaeLW8Rqq7cGkPCFvw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.53.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/@stylistic/eslint-plugin-ts/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/@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==",
+      "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"
       },
@@ -2356,6 +2470,35 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/@stylistic/eslint-plugin-ts/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/@stylistic/eslint-plugin-ts/node_modules/ts-api-utils": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz",
+      "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.12"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4"
+      }
+    },
     "node_modules/@szmarczak/http-timer": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
@@ -2774,6 +2917,42 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.53.0.tgz",
+      "integrity": "sha512-Bl6Gdr7NqkqIP5yP9z1JU///Nmes4Eose6L1HwpuVHwScgDPPuEWbUVhvlZmb8hy0vX9syLk5EGNL700WcBlbg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.53.0",
+        "@typescript-eslint/types": "^8.53.0",
+        "debug": "^4.4.3"
+      },
+      "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/project-service/node_modules/@typescript-eslint/types": {
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.53.0.tgz",
+      "integrity": "sha512-Bmh9KX31Vlxa13+PqPvt4RzKRN1XORYSLlAE+sO1i28NkisGbTtSLFVB3l7PWdHtR3E0mVMuC7JilWJ99m2HxQ==",
+      "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/scope-manager": {
       "version": "8.8.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.8.0.tgz",
@@ -2791,6 +2970,23 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.53.0.tgz",
+      "integrity": "sha512-K6Sc0R5GIG6dNoPdOooQ+KtvT5KCKAvTcY8h2rIuul19vxH5OTQk7ArKkd4yTzkw66WnNY0kPPzzcmWA+XRmiA==",
+      "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/types": {
       "version": "8.8.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.8.0.tgz",
diff --git a/package.json b/package.json
index f47ff17c1b26..ef464dd56d90 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
   },
   "devDependencies": {
     "@playwright/test": "^1.56.1",
-    "@stylistic/eslint-plugin-ts": "^2.8.0",
+    "@stylistic/eslint-plugin-ts": "^4.4.1",
     "@types/cookie": "^1.0.0",
     "@types/debug": "^4.1.5",
     "@types/eslint": "^9.6.1",

From 81e9bd949ae7d1c69812808c05710c3bff029560 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 21:17:53 +0000
Subject: [PATCH 1592/1815] Bump undici in /remote in the npm_and_yarn group
 across 1 directory

Bumps the npm_and_yarn group with 1 update in the /remote directory: [undici](https://github.com/nodejs/undici).


Updates `undici` from 7.15.0 to 7.18.2
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](https://github.com/nodejs/undici/compare/v7.15.0...v7.18.2)

---
updated-dependencies:
- dependency-name: undici
  dependency-version: 7.18.2
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 713253417027..ce1fada926fe 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -1432,9 +1432,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.15.0.tgz",
-      "integrity": "sha512-7oZJCPvvMvTd0OlqWsIxTuItTpJBpU1tcbVl24FMn3xt3+VSunwUasmfPJRE57oNO1KsZ4PgA1xTdAX4hq8NyQ==",
+      "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"

From de749fdbb71efa243b8d703a362a6f43311b4cb2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 21:18:05 +0000
Subject: [PATCH 1593/1815] Bump undici in the npm_and_yarn group across 1
 directory

Bumps the npm_and_yarn group with 1 update in the / directory: [undici](https://github.com/nodejs/undici).


Updates `undici` from 7.15.0 to 7.18.2
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](https://github.com/nodejs/undici/compare/v7.15.0...v7.18.2)

---
updated-dependencies:
- dependency-name: undici
  dependency-version: 7.18.2
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fab8ef8cd16d..c66673c344c4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16684,9 +16684,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.15.0.tgz",
-      "integrity": "sha512-7oZJCPvvMvTd0OlqWsIxTuItTpJBpU1tcbVl24FMn3xt3+VSunwUasmfPJRE57oNO1KsZ4PgA1xTdAX4hq8NyQ==",
+      "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"

From 2f37dd92d3ae498f1c8094e8ce10314d6c14385b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Jan 2026 22:41:04 +0000
Subject: [PATCH 1594/1815] Bump @xterm/addon-ligatures in /remote

Bumps [@xterm/addon-ligatures](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.140 to 0.11.0-beta.103.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-ligatures"
  dependency-version: 0.11.0-beta.103
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 63 +++++++---------------------------------
 remote/package.json      |  2 +-
 2 files changed, 11 insertions(+), 54 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index ce1fada926fe..51a379a1399b 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -22,7 +22,7 @@
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.2.0-beta.123",
         "@xterm/addon-image": "^0.10.0-beta.101",
-        "@xterm/addon-ligatures": "^0.10.0-beta.140",
+        "@xterm/addon-ligatures": "^0.11.0-beta.103",
         "@xterm/addon-progress": "^0.3.0-beta.101",
         "@xterm/addon-search": "^0.17.0-beta.103",
         "@xterm/addon-serialize": "^0.14.0-beta.140",
@@ -570,19 +570,19 @@
       }
     },
     "node_modules/@xterm/addon-ligatures": {
-      "version": "0.10.0-beta.140",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.140.tgz",
-      "integrity": "sha512-ps/M90wXHEec8nQ8UJXNLccrJGRADKLVcw4F81DPgzdTNLe4iPcGZ5ASFIB1WZkSO0k28nTes7uAPLGjvWS4ig==",
+      "version": "0.11.0-beta.103",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.103.tgz",
+      "integrity": "sha512-+Nyq0CUJ6ZKj82D/6KGD3xnsgqEmnbaS3Jh/dFKBZxlICzGiJjQ8zlUCWabbdpgwQyCg4BHGuM+qC8P9FF9rsA==",
       "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.140"
+        "@xterm/xterm": "^6.1.0-beta.103"
       }
     },
     "node_modules/@xterm/addon-progress": {
@@ -823,33 +823,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/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",
@@ -869,15 +842,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",
@@ -1035,6 +999,7 @@
       "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": {
         "yallist": "^4.0.0"
       },
@@ -1192,15 +1157,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",
@@ -1498,7 +1454,8 @@
     "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "license": "ISC"
     },
     "node_modules/yauzl": {
       "version": "3.1.1",
diff --git a/remote/package.json b/remote/package.json
index b79eea549791..1cdfb38a8f9e 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -17,7 +17,7 @@
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.2.0-beta.123",
     "@xterm/addon-image": "^0.10.0-beta.101",
-    "@xterm/addon-ligatures": "^0.10.0-beta.140",
+    "@xterm/addon-ligatures": "^0.11.0-beta.103",
     "@xterm/addon-progress": "^0.3.0-beta.101",
     "@xterm/addon-search": "^0.17.0-beta.103",
     "@xterm/addon-serialize": "^0.14.0-beta.140",

From 1f41e23b7df1d80b31196412693f0c744ea6bf88 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:16:16 +0000
Subject: [PATCH 1595/1815] Bump @azure/msal-node from 2.16.1 to 3.8.5 in
 /build

Bumps [@azure/msal-node](https://github.com/AzureAD/microsoft-authentication-library-for-js) from 2.16.1 to 3.8.5.
- [Release notes](https://github.com/AzureAD/microsoft-authentication-library-for-js/releases)
- [Commits](https://github.com/AzureAD/microsoft-authentication-library-for-js/compare/msal-node-v2.16.1...msal-node-v3.8.5)

---
updated-dependencies:
- dependency-name: "@azure/msal-node"
  dependency-version: 3.8.5
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 31 ++++++++-----------------------
 build/package.json      |  2 +-
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 35bcc935d800..7530769942d5 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -12,7 +12,7 @@
         "@azure/core-auth": "^1.10.1",
         "@azure/cosmos": "^4",
         "@azure/identity": "^4.13.0",
-        "@azure/msal-node": "^2.16.1",
+        "@azure/msal-node": "^3.8.5",
         "@azure/storage-blob": "^12.29.1",
         "@electron/get": "^4.0.2",
         "@types/ansi-colors": "^3.2.6",
@@ -300,21 +300,6 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@azure/identity/node_modules/@azure/msal-node": {
-      "version": "3.8.4",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.4.tgz",
-      "integrity": "sha512-lvuAwsDpPDE/jSuVQOBMpLbXuVuLsPNRwWCyK3/6bPlBk0fGWegqoZ0qjZclMWyQ2JNvIY3vHY7hoFmFmFQcOw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@azure/msal-common": "15.13.3",
-        "jsonwebtoken": "^9.0.0",
-        "uuid": "^8.3.0"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
     "node_modules/@azure/keyvault-common": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@azure/keyvault-common/-/keyvault-common-2.0.0.tgz",
@@ -397,13 +382,13 @@
       }
     },
     "node_modules/@azure/msal-node": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.16.1.tgz",
-      "integrity": "sha512-1NEFpTmMMT2A7RnZuvRl/hUmJU+GLPjh+ShyIqPktG2PvSd2yvPnzGd/BxIBAAvJG5nr9lH4oYcQXepDbaE7fg==",
+      "version": "3.8.5",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.5.tgz",
+      "integrity": "sha512-xRSAfH27bIp3vtjtTFyyhdm18lq2pzdoNG7DA2IH1fXzJ30mymryv0wK/Gph+x4y0Rx+5mMLU5JTPiCeQ75Aug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@azure/msal-common": "14.16.0",
+        "@azure/msal-common": "15.14.0",
         "jsonwebtoken": "^9.0.0",
         "uuid": "^8.3.0"
       },
@@ -412,9 +397,9 @@
       }
     },
     "node_modules/@azure/msal-node/node_modules/@azure/msal-common": {
-      "version": "14.16.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.16.0.tgz",
-      "integrity": "sha512-1KOZj9IpcDSwpNiQNjt0jDYZpQvNZay7QAEi/5DLubay40iGYtLzya/jbjRPLyOTZhEKyL1MzPuw2HqBCjceYA==",
+      "version": "15.14.0",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.14.0.tgz",
+      "integrity": "sha512-aNuorSQxzsJQ6IUjJtN+rCInLfLOo3VpNYiXaHBK9XL8Ieg1y4F5ZFjI19GErbVvwqvwGNyJ9AZ/sAxOWhoSUw==",
       "dev": true,
       "license": "MIT",
       "engines": {
diff --git a/build/package.json b/build/package.json
index cf6bfe526614..282ad3572194 100644
--- a/build/package.json
+++ b/build/package.json
@@ -6,7 +6,7 @@
     "@azure/core-auth": "^1.10.1",
     "@azure/cosmos": "^4",
     "@azure/identity": "^4.13.0",
-    "@azure/msal-node": "^2.16.1",
+    "@azure/msal-node": "^3.8.5",
     "@azure/storage-blob": "^12.29.1",
     "@electron/get": "^4.0.2",
     "@types/ansi-colors": "^3.2.6",

From cc63a53b030a6cb0d6143ca5bd31352bde246756 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:16:22 +0000
Subject: [PATCH 1596/1815] Bump libc from 0.2.178 to 0.2.180 in /cli

Bumps [libc](https://github.com/rust-lang/libc) from 0.2.178 to 0.2.180.
- [Release notes](https://github.com/rust-lang/libc/releases)
- [Changelog](https://github.com/rust-lang/libc/blob/0.2.180/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/libc/compare/0.2.178...0.2.180)

---
updated-dependencies:
- dependency-name: libc
  dependency-version: 0.2.180
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 4 ++--
 cli/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 573880720649..9ca6833cb2e6 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -1591,9 +1591,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.178"
+version = "0.2.180"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
+checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
 
 [[package]]
 name = "libredox"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 041daa52c9e9..dec17fc018b9 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -33,7 +33,7 @@ opentelemetry = { version = "0.20.0", features = ["rt-tokio"] }
 serde_bytes = "0.11.19"
 chrono = { version = "0.4.42", features = ["serde", "std", "clock"], default-features = false }
 gethostname = "1.1.0"
-libc = "0.2.144"
+libc = "0.2.180"
 tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "8cae9b2a24c65c6c1958f5a0e77d72b23b5c6c30", default-features = false, features = ["connections"] }
 keyring = { version = "2.0.3", default-features = false, features = ["linux-secret-service-rt-tokio-crypto-openssl", "platform-windows", "platform-macos", "linux-keyutils"] }
 dialoguer = "0.12.0"

From 38303d649a375533bac36a09c0ea7f380a85237d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:16:29 +0000
Subject: [PATCH 1597/1815] Bump @types/workerpool from 6.4.0 to 9.0.0 in
 /build

Bumps [@types/workerpool](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/workerpool) from 6.4.0 to 9.0.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/workerpool)

---
updated-dependencies:
- dependency-name: "@types/workerpool"
  dependency-version: 9.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 12 +++++++-----
 build/package.json      |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 35bcc935d800..57835594ebf5 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -39,7 +39,7 @@
         "@types/rimraf": "^4.0.5",
         "@types/through": "^0.0.33",
         "@types/through2": "^2.0.41",
-        "@types/workerpool": "^6.4.0",
+        "@types/workerpool": "^9.0.0",
         "@types/xml2js": "0.4.14",
         "@vscode/iconv-lite-umd": "0.7.1",
         "@vscode/ripgrep": "^1.15.10",
@@ -1849,12 +1849,14 @@
       }
     },
     "node_modules/@types/workerpool": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@types/workerpool/-/workerpool-6.4.0.tgz",
-      "integrity": "sha512-SIF2/169pDsLKeM8GQGHkOFifGalDbZgiBSaLUnnlVSRsAOenkAvQ6h4uhV2W+PZZczS+8LQxACwNkSykdT91A==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@types/workerpool/-/workerpool-9.0.0.tgz",
+      "integrity": "sha512-gEiZU7P4NzkhqcSwHlSx1CddtzzEjFD/uWegp2tV5DXQABOE4qlH4H8ptCm/S5DDvCViqFj7yMrN3yMBh1pkQg==",
+      "deprecated": "This is a stub types definition. workerpool provides its own type definitions, so you do not need this installed.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "workerpool": "*"
       }
     },
     "node_modules/@types/xml2js": {
diff --git a/build/package.json b/build/package.json
index cf6bfe526614..a929c14f5a35 100644
--- a/build/package.json
+++ b/build/package.json
@@ -33,7 +33,7 @@
     "@types/rimraf": "^4.0.5",
     "@types/through": "^0.0.33",
     "@types/through2": "^2.0.41",
-    "@types/workerpool": "^6.4.0",
+    "@types/workerpool": "^9.0.0",
     "@types/xml2js": "0.4.14",
     "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/ripgrep": "^1.15.10",

From 01c4ddf17e529d9e270a1818cee9cffbf930d77b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:16:34 +0000
Subject: [PATCH 1598/1815] Bump indicatif from 0.17.8 to 0.18.3 in /cli

Bumps [indicatif](https://github.com/console-rs/indicatif) from 0.17.8 to 0.18.3.
- [Release notes](https://github.com/console-rs/indicatif/releases)
- [Commits](https://github.com/console-rs/indicatif/compare/0.17.8...0.18.3)

---
updated-dependencies:
- dependency-name: indicatif
  dependency-version: 0.18.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 67 ++++++++++++++++++++------------------------------
 cli/Cargo.toml |  2 +-
 2 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 573880720649..e9ac855427b6 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -431,7 +431,7 @@ dependencies = [
  "chrono",
  "clap",
  "clap_lex",
- "console 0.16.2",
+ "console",
  "const_format",
  "core-foundation 0.10.1",
  "dialoguer",
@@ -487,29 +487,16 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "console"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
-dependencies = [
- "encode_unicode 0.3.6",
- "lazy_static",
- "libc",
- "unicode-width 0.1.12",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "console"
 version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03e45a4a8926227e4197636ba97a9fc9b00477e9f4bd711395687c5f0734bec4"
 dependencies = [
- "encode_unicode 1.0.0",
+ "encode_unicode",
  "libc",
  "once_cell",
- "unicode-width 0.2.2",
+ "unicode-width",
  "windows-sys 0.61.2",
 ]
 
@@ -645,7 +632,7 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25f104b501bf2364e78d0d3974cbc774f738f5865306ed128e1e0d7499c0ad96"
 dependencies = [
- "console 0.16.2",
+ "console",
  "shell-words",
  "tempfile",
  "zeroize",
@@ -714,12 +701,6 @@ dependencies = [
  "syn 2.0.87",
 ]
 
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
 [[package]]
 name = "encode_unicode"
 version = "1.0.0"
@@ -1482,15 +1463,15 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.17.8"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
+checksum = "9375e112e4b463ec1b1c6c011953545c65a30164fbab5b581df32b3abf0dcb88"
 dependencies = [
- "console 0.15.8",
- "instant",
- "number_prefix",
+ "console",
  "portable-atomic",
- "unicode-width 0.1.12",
+ "unicode-width",
+ "unit-prefix",
+ "web-time",
 ]
 
 [[package]]
@@ -1846,12 +1827,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "number_prefix"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
-
 [[package]]
 name = "once_cell"
 version = "1.19.0"
@@ -3245,12 +3220,6 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
-[[package]]
-name = "unicode-width"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
-
 [[package]]
 name = "unicode-width"
 version = "0.2.2"
@@ -3263,6 +3232,12 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
+[[package]]
+name = "unit-prefix"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81e544489bf3d8ef66c953931f56617f423cd4b5494be343d9b9d3dda037b9a3"
+
 [[package]]
 name = "url"
 version = "2.5.4"
@@ -3451,6 +3426,16 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 041daa52c9e9..0216a309a91e 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -38,7 +38,7 @@ tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "8cae9b2a24c
 keyring = { version = "2.0.3", default-features = false, features = ["linux-secret-service-rt-tokio-crypto-openssl", "platform-windows", "platform-macos", "linux-keyutils"] }
 dialoguer = "0.12.0"
 hyper = { version = "0.14.26", features = ["server", "http1", "runtime"] }
-indicatif = "0.17.4"
+indicatif = "0.18.3"
 tempfile = "3.11.0"
 clap_lex = "0.7.7"
 url = "2.5.4"

From 0b7b188d339df8a5433f787475ac8f3209cd79e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:16:35 +0000
Subject: [PATCH 1599/1815] Bump source-map from 0.6.1 to 0.7.6 in /build

Bumps [source-map](https://github.com/mozilla/source-map) from 0.6.1 to 0.7.6.
- [Release notes](https://github.com/mozilla/source-map/releases)
- [Changelog](https://github.com/mozilla/source-map/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mozilla/source-map/compare/0.6.1...0.7.6)

---
updated-dependencies:
- dependency-name: source-map
  dependency-version: 0.7.6
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 11 ++++++-----
 build/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 35bcc935d800..60e4c11b6a27 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -54,7 +54,7 @@
         "jsonc-parser": "^3.3.1",
         "jws": "^4.0.1",
         "mime": "^4.1.0",
-        "source-map": "0.6.1",
+        "source-map": "0.7.6",
         "ternary-stream": "^3.0.0",
         "through2": "^4.0.2",
         "tree-sitter": "^0.25.0",
@@ -6125,12 +6125,13 @@
       "license": "MIT"
     },
     "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "version": "0.7.6",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz",
+      "integrity": "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 12"
       }
     },
     "node_modules/spdx-correct": {
diff --git a/build/package.json b/build/package.json
index cf6bfe526614..c88e89e95697 100644
--- a/build/package.json
+++ b/build/package.json
@@ -48,7 +48,7 @@
     "jsonc-parser": "^3.3.1",
     "jws": "^4.0.1",
     "mime": "^4.1.0",
-    "source-map": "0.6.1",
+    "source-map": "0.7.6",
     "ternary-stream": "^3.0.0",
     "through2": "^4.0.2",
     "tree-sitter": "^0.25.0",

From 0d99c9bb0b45b3af34e0413d35bc4b366a3bc16a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:17:01 +0000
Subject: [PATCH 1600/1815] Bump tar from 0.4.40 to 0.4.44 in /cli

Bumps [tar](https://github.com/alexcrichton/tar-rs) from 0.4.40 to 0.4.44.
- [Commits](https://github.com/alexcrichton/tar-rs/compare/0.4.40...0.4.44)

---
updated-dependencies:
- dependency-name: tar
  dependency-version: 0.4.44
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 4 ++--
 cli/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 573880720649..8998aaa7b408 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -2915,9 +2915,9 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.40"
+version = "0.4.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
+checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a"
 dependencies = [
  "filetime",
  "libc",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 041daa52c9e9..f48aaa6cb4c3 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -53,7 +53,7 @@ cfg-if = "1.0.4"
 pin-project = "1.1.10"
 console = "0.16.2"
 bytes = "1.11.0"
-tar = "0.4.38"
+tar = "0.4.44"
 
 [build-dependencies]
 serde = { version="1.0.163", features = ["derive"] }

From f5367d1e897cf992f4d26b4a03c6d024166f27f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:17:19 +0000
Subject: [PATCH 1601/1815] Bump winreg from 0.50.0 to 0.52.0 in /cli

Bumps [winreg](https://github.com/gentoo90/winreg-rs) from 0.50.0 to 0.52.0.
- [Release notes](https://github.com/gentoo90/winreg-rs/releases)
- [Changelog](https://github.com/gentoo90/winreg-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gentoo90/winreg-rs/compare/v0.50.0...v0.52.0)

---
updated-dependencies:
- dependency-name: winreg
  dependency-version: 0.52.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 2 +-
 cli/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 573880720649..d0bfb43f87d8 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -467,7 +467,7 @@ dependencies = [
  "url",
  "uuid",
  "winapi",
- "winreg 0.50.0",
+ "winreg 0.52.0",
  "zbus 4.4.0",
  "zip",
 ]
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 041daa52c9e9..c3b73242d818 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -60,7 +60,7 @@ serde = { version="1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 
 [target.'cfg(windows)'.dependencies]
-winreg = "0.50.0"
+winreg = "0.52.0"
 winapi = "0.3.9"
 
 [target.'cfg(target_os = "macos")'.dependencies]

From a0751110399d7aabddcd1727b3efd38097e6252a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:18:47 +0000
Subject: [PATCH 1602/1815] Bump morphdom in
 /extensions/markdown-language-features

Bumps [morphdom](https://github.com/patrick-steele-idem/morphdom) from 2.7.7 to 2.7.8.
- [Changelog](https://github.com/patrick-steele-idem/morphdom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/patrick-steele-idem/morphdom/compare/v2.7.7...v2.7.8)

---
updated-dependencies:
- dependency-name: morphdom
  dependency-version: 2.7.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/markdown-language-features/package-lock.json | 8 ++++----
 extensions/markdown-language-features/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index 217edd9e2212..47b802993268 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -14,7 +14,7 @@
         "highlight.js": "^11.11.1",
         "markdown-it": "^14.1.0",
         "markdown-it-front-matter": "^0.2.4",
-        "morphdom": "^2.7.7",
+        "morphdom": "^2.7.8",
         "picomatch": "^4.0.3",
         "punycode": "^2.3.1",
         "vscode-languageclient": "^9.0.1",
@@ -502,9 +502,9 @@
       }
     },
     "node_modules/morphdom": {
-      "version": "2.7.7",
-      "resolved": "https://registry.npmjs.org/morphdom/-/morphdom-2.7.7.tgz",
-      "integrity": "sha512-04GmsiBcalrSCNmzfo+UjU8tt3PhZJKzcOy+r1FlGA7/zri8wre3I1WkYN9PT3sIeIKfW9bpyElA+VzOg2E24g==",
+      "version": "2.7.8",
+      "resolved": "https://registry.npmjs.org/morphdom/-/morphdom-2.7.8.tgz",
+      "integrity": "sha512-D/fR4xgGUyVRbdMGU6Nejea1RFzYxYtyurG4Fbv2Fi/daKlWKuXGLOdXtl+3eIwL110cI2hz1ZojGICjjFLgTg==",
       "license": "MIT"
     },
     "node_modules/node-html-parser": {
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index d17a07cfbfc2..09d6ee785b77 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -768,7 +768,7 @@
     "highlight.js": "^11.11.1",
     "markdown-it": "^14.1.0",
     "markdown-it-front-matter": "^0.2.4",
-    "morphdom": "^2.7.7",
+    "morphdom": "^2.7.8",
     "picomatch": "^4.0.3",
     "punycode": "^2.3.1",
     "vscode-languageclient": "^9.0.1",

From 049f6ceddeb791d5457cfd41eff895fa310ac094 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:18:51 +0000
Subject: [PATCH 1603/1815] Bump @azure/msal-node-extensions in
 /extensions/microsoft-authentication

Bumps [@azure/msal-node-extensions](https://github.com/AzureAD/microsoft-authentication-library-for-js) from 1.5.26 to 1.5.27.
- [Release notes](https://github.com/AzureAD/microsoft-authentication-library-for-js/releases)
- [Commits](https://github.com/AzureAD/microsoft-authentication-library-for-js/compare/msal-node-extensions-v1.5.26...msal-node-extensions-v1.5.27)

---
updated-dependencies:
- dependency-name: "@azure/msal-node-extensions"
  dependency-version: 1.5.27
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 19 ++++++++++++++-----
 .../microsoft-authentication/package.json     |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 5f2474ac1026..3c8f879d040e 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@azure/ms-rest-azure-env": "^2.0.0",
         "@azure/msal-node": "^3.8.4",
-        "@azure/msal-node-extensions": "^1.5.26",
+        "@azure/msal-node-extensions": "^1.5.27",
         "@vscode/extension-telemetry": "^1.2.0",
         "keytar": "file:./packageMocks/keytar",
         "vscode-tas-client": "^0.1.84"
@@ -56,13 +56,13 @@
       }
     },
     "node_modules/@azure/msal-node-extensions": {
-      "version": "1.5.26",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node-extensions/-/msal-node-extensions-1.5.26.tgz",
-      "integrity": "sha512-ncPY7e4C4qDcvSd3qDW8JL6NTo/pf/hjl9Sj+js0PcmvT9FA2gmu3TS6s16OHNmKOpHfOIT4pHT+reSjV8iZbg==",
+      "version": "1.5.27",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node-extensions/-/msal-node-extensions-1.5.27.tgz",
+      "integrity": "sha512-rO6hlq7//frGRiBxL1sHLINIRpvjZ3OhHdJKtYEOQB9lAsFiPHsBmUYkwtjyqMbgKpoYq/36y0ic8ZfVuoGl3A==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@azure/msal-common": "15.13.3",
+        "@azure/msal-common": "15.14.0",
         "@azure/msal-node-runtime": "^0.20.0",
         "keytar": "^7.8.0"
       },
@@ -70,6 +70,15 @@
         "node": ">=16"
       }
     },
+    "node_modules/@azure/msal-node-extensions/node_modules/@azure/msal-common": {
+      "version": "15.14.0",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.14.0.tgz",
+      "integrity": "sha512-aNuorSQxzsJQ6IUjJtN+rCInLfLOo3VpNYiXaHBK9XL8Ieg1y4F5ZFjI19GErbVvwqvwGNyJ9AZ/sAxOWhoSUw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/@azure/msal-node-runtime": {
       "version": "0.20.1",
       "resolved": "https://registry.npmjs.org/@azure/msal-node-runtime/-/msal-node-runtime-0.20.1.tgz",
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 80586920042e..c6a6eb2557c5 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -140,7 +140,7 @@
   "dependencies": {
     "@azure/ms-rest-azure-env": "^2.0.0",
     "@azure/msal-node": "^3.8.4",
-    "@azure/msal-node-extensions": "^1.5.26",
+    "@azure/msal-node-extensions": "^1.5.27",
     "@vscode/extension-telemetry": "^1.2.0",
     "keytar": "file:./packageMocks/keytar",
     "vscode-tas-client": "^0.1.84"

From c437ab28634b670302f57da8fec4b10d9a2a9d92 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:20:19 +0000
Subject: [PATCH 1604/1815] Bump @vscode/windows-mutex from 0.5.0 to 0.5.3

Bumps [@vscode/windows-mutex](https://github.com/microsoft/node-windows-mutex) from 0.5.0 to 0.5.3.
- [Release notes](https://github.com/microsoft/node-windows-mutex/releases)
- [Commits](https://github.com/microsoft/node-windows-mutex/compare/v0.5.0...v0.5.3)

---
updated-dependencies:
- dependency-name: "@vscode/windows-mutex"
  dependency-version: 0.5.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c66673c344c4..8b100bfe896e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,7 +24,7 @@
         "@vscode/sudo-prompt": "9.3.1",
         "@vscode/tree-sitter-wasm": "^0.1.3",
         "@vscode/vscode-languagedetection": "1.0.22",
-        "@vscode/windows-mutex": "^0.5.0",
+        "@vscode/windows-mutex": "^0.5.3",
         "@vscode/windows-process-tree": "^0.6.3",
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.2.0-beta.81",
@@ -4026,10 +4026,11 @@
       }
     },
     "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==",
+      "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"
diff --git a/package.json b/package.json
index ef464dd56d90..e9b83b90fa73 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "@vscode/sudo-prompt": "9.3.1",
     "@vscode/tree-sitter-wasm": "^0.1.3",
     "@vscode/vscode-languagedetection": "1.0.22",
-    "@vscode/windows-mutex": "^0.5.0",
+    "@vscode/windows-mutex": "^0.5.3",
     "@vscode/windows-process-tree": "^0.6.3",
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.2.0-beta.81",

From bca5f5c505ba908e29bdf7a06d8cb68ab381c0ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:20:22 +0000
Subject: [PATCH 1605/1815] Bump @xterm/addon-unicode11 in /remote

Bumps [@xterm/addon-unicode11](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.101 to 0.10.0-beta.103.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-unicode11"
  dependency-version: 0.10.0-beta.103
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 51a379a1399b..981e20630752 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -26,7 +26,7 @@
         "@xterm/addon-progress": "^0.3.0-beta.101",
         "@xterm/addon-search": "^0.17.0-beta.103",
         "@xterm/addon-serialize": "^0.14.0-beta.140",
-        "@xterm/addon-unicode11": "^0.10.0-beta.101",
+        "@xterm/addon-unicode11": "^0.10.0-beta.103",
         "@xterm/addon-webgl": "^0.20.0-beta.102",
         "@xterm/headless": "^5.6.0-beta.140",
         "@xterm/xterm": "^6.0.0",
@@ -613,12 +613,12 @@
       }
     },
     "node_modules/@xterm/addon-unicode11": {
-      "version": "0.10.0-beta.101",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.101.tgz",
-      "integrity": "sha512-WM9Rs8ZBQ1nY5nb4OxXsOLVIZ2DQvGmtSIKkUueDB9mSQOg05mz2dHbEdW63MrX8sMQAbEx+o/kyxvl7oFDS/A==",
+      "version": "0.10.0-beta.103",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.103.tgz",
+      "integrity": "sha512-p/ZWXOO30k7rMmmxwhnC+vchFtu9G+F226btvRvc0BwzTqG+NW8ZZoOs0ywJ2HwBKsI/4vRXVCEk1sSlZtgh/A==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.101"
+        "@xterm/xterm": "^6.1.0-beta.103"
       }
     },
     "node_modules/@xterm/addon-webgl": {
diff --git a/remote/package.json b/remote/package.json
index 1cdfb38a8f9e..0fe341f45dbd 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -21,7 +21,7 @@
     "@xterm/addon-progress": "^0.3.0-beta.101",
     "@xterm/addon-search": "^0.17.0-beta.103",
     "@xterm/addon-serialize": "^0.14.0-beta.140",
-    "@xterm/addon-unicode11": "^0.10.0-beta.101",
+    "@xterm/addon-unicode11": "^0.10.0-beta.103",
     "@xterm/addon-webgl": "^0.20.0-beta.102",
     "@xterm/headless": "^5.6.0-beta.140",
     "@xterm/xterm": "^6.0.0",

From 38d7ab13de992151ccc8384139f99be038532cd3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:20:23 +0000
Subject: [PATCH 1606/1815] Bump @xterm/addon-webgl in /remote/web

Bumps [@xterm/addon-webgl](https://github.com/xtermjs/xterm.js) from 0.20.0-beta.100 to 0.20.0-beta.102.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-webgl"
  dependency-version: 0.20.0-beta.102
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 91df9a19fe2b..a39ee938a7c7 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -20,7 +20,7 @@
 				"@xterm/addon-search": "^0.17.0-beta.101",
 				"@xterm/addon-serialize": "^0.15.0-beta.103",
 				"@xterm/addon-unicode11": "^0.10.0-beta.103",
-				"@xterm/addon-webgl": "^0.20.0-beta.100",
+				"@xterm/addon-webgl": "^0.20.0-beta.102",
 				"@xterm/xterm": "^6.0.0",
 				"jschardet": "3.1.4",
 				"tas-client-umd": "0.2.0",
@@ -197,12 +197,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-webgl": {
-			"version": "0.20.0-beta.100",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.100.tgz",
-			"integrity": "sha512-h17XiyERE+LpuYEPUAm2ux6g2Iy34BT/tfwxOckZ+RrhjM8bZMeN3u6/q28viBqAKWhhD3JbxlcDfKMN8sE3sg==",
+			"version": "0.20.0-beta.102",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.102.tgz",
+			"integrity": "sha512-xorsFnfF6rpJUILiRVzknUVfi66f7hdUjtb4FtDF4msMOHLsIEFOzXTegD01PcnSGmUaHkfTldmOAV6oPMWX8w==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.101"
+				"@xterm/xterm": "^6.1.0-beta.103"
 			}
 		},
 		"node_modules/@xterm/xterm": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 0e4eef3cc1cf..ddefc892d201 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -15,7 +15,7 @@
 		"@xterm/addon-search": "^0.17.0-beta.101",
 		"@xterm/addon-serialize": "^0.15.0-beta.103",
 		"@xterm/addon-unicode11": "^0.10.0-beta.103",
-		"@xterm/addon-webgl": "^0.20.0-beta.100",
+		"@xterm/addon-webgl": "^0.20.0-beta.102",
 		"@xterm/xterm": "^6.0.0",
 		"jschardet": "3.1.4",
 		"tas-client-umd": "0.2.0",

From 3ff9160568a45a40514d185f76df4b29685ce34d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:20:28 +0000
Subject: [PATCH 1607/1815] Bump @xterm/addon-search in /remote/web

Bumps [@xterm/addon-search](https://github.com/xtermjs/xterm.js) from 0.17.0-beta.101 to 0.17.0-beta.103.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-search"
  dependency-version: 0.17.0-beta.103
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 91df9a19fe2b..f7bca6ff5ccf 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -17,7 +17,7 @@
 				"@xterm/addon-image": "^0.10.0-beta.103",
 				"@xterm/addon-ligatures": "^0.11.0-beta.103",
 				"@xterm/addon-progress": "^0.3.0-beta.101",
-				"@xterm/addon-search": "^0.17.0-beta.101",
+				"@xterm/addon-search": "^0.17.0-beta.103",
 				"@xterm/addon-serialize": "^0.15.0-beta.103",
 				"@xterm/addon-unicode11": "^0.10.0-beta.103",
 				"@xterm/addon-webgl": "^0.20.0-beta.100",
@@ -170,12 +170,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-search": {
-			"version": "0.17.0-beta.101",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.101.tgz",
-			"integrity": "sha512-Y1yWv2baZdqP6AH/aKmMXSs6VNr7FGrpOe+DKNKq77H+QZbUoUXfgI/qKZpqlByl7FGuo8OT9g0AqH3zykkkUw==",
+			"version": "0.17.0-beta.103",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.103.tgz",
+			"integrity": "sha512-dG7GnhFWoRG1etFRk6J4J1mVJIyoY/kRQx3pxE4eHsuW5X+BhIxbbOAiniPZwFdGCkZx5aehnuVx2SM+O0FFBQ==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.101"
+				"@xterm/xterm": "^6.1.0-beta.103"
 			}
 		},
 		"node_modules/@xterm/addon-serialize": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 0e4eef3cc1cf..9ca6c08b78f9 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -12,7 +12,7 @@
 		"@xterm/addon-image": "^0.10.0-beta.103",
 		"@xterm/addon-ligatures": "^0.11.0-beta.103",
 		"@xterm/addon-progress": "^0.3.0-beta.101",
-		"@xterm/addon-search": "^0.17.0-beta.101",
+		"@xterm/addon-search": "^0.17.0-beta.103",
 		"@xterm/addon-serialize": "^0.15.0-beta.103",
 		"@xterm/addon-unicode11": "^0.10.0-beta.103",
 		"@xterm/addon-webgl": "^0.20.0-beta.100",

From ec05d0b7e7cad013ea6906daf51730f5362a7a57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:20:28 +0000
Subject: [PATCH 1608/1815] Bump @vscode/spdlog from 0.15.4 to 0.15.6 in
 /remote

Bumps [@vscode/spdlog](https://github.com/microsoft/node-spdlog) from 0.15.4 to 0.15.6.
- [Release notes](https://github.com/microsoft/node-spdlog/releases)
- [Commits](https://github.com/microsoft/node-spdlog/compare/v0.15.4...v0.15.6)

---
updated-dependencies:
- dependency-name: "@vscode/spdlog"
  dependency-version: 0.15.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 51a379a1399b..b4a42d568cda 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -15,7 +15,7 @@
         "@vscode/iconv-lite-umd": "0.7.1",
         "@vscode/proxy-agent": "^0.36.0",
         "@vscode/ripgrep": "^1.17.0",
-        "@vscode/spdlog": "^0.15.4",
+        "@vscode/spdlog": "^0.15.6",
         "@vscode/tree-sitter-wasm": "^0.3.0",
         "@vscode/vscode-languagedetection": "1.0.22",
         "@vscode/windows-process-tree": "^0.6.3",
@@ -482,9 +482,9 @@
       }
     },
     "node_modules/@vscode/spdlog": {
-      "version": "0.15.4",
-      "resolved": "https://registry.npmjs.org/@vscode/spdlog/-/spdlog-0.15.4.tgz",
-      "integrity": "sha512-NmFasVWjn/6BjHMAjqalsbG2srQCt8yfC0EczP5wzNQFawv74rhvuarhWi44x3St9LB8bZBxrpbT7igPaTJwcw==",
+      "version": "0.15.6",
+      "resolved": "https://registry.npmjs.org/@vscode/spdlog/-/spdlog-0.15.6.tgz",
+      "integrity": "sha512-s0ei7I0rLrNlsGTa8EVoAXe4qvbsfXrHebQ5dNbu7dc1Zs/DbnJNSADpHUy8vtNvTJukBWjOXFhAYUfXxGk+Bg==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/remote/package.json b/remote/package.json
index 1cdfb38a8f9e..79c95695df81 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -10,7 +10,7 @@
     "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/proxy-agent": "^0.36.0",
     "@vscode/ripgrep": "^1.17.0",
-    "@vscode/spdlog": "^0.15.4",
+    "@vscode/spdlog": "^0.15.6",
     "@vscode/tree-sitter-wasm": "^0.3.0",
     "@vscode/vscode-languagedetection": "1.0.22",
     "@vscode/windows-process-tree": "^0.6.3",

From 75059866aa3855eb5d0048f2164d12f31ecfde1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:20:29 +0000
Subject: [PATCH 1609/1815] Bump gulp-json-editor from 2.5.0 to 2.6.0

Bumps [gulp-json-editor](https://github.com/gulp-community/gulp-json-editor) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/gulp-community/gulp-json-editor/releases)
- [Changelog](https://github.com/gulp-community/gulp-json-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gulp-community/gulp-json-editor/compare/v2.5.0...v2.6.0)

---
updated-dependencies:
- dependency-name: gulp-json-editor
  dependency-version: 2.6.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 350 +++++++++++++++++++++++++++-------------------
 package.json      |   2 +-
 2 files changed, 206 insertions(+), 146 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c66673c344c4..6a5b7989e3e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -114,7 +114,7 @@
         "gulp-flatmap": "^1.0.2",
         "gulp-gunzip": "^1.0.0",
         "gulp-gzip": "^1.4.2",
-        "gulp-json-editor": "^2.5.0",
+        "gulp-json-editor": "^2.6.0",
         "gulp-plumber": "^1.2.1",
         "gulp-rename": "^2.1.0",
         "gulp-replace": "^1.1.4",
@@ -1898,6 +1898,13 @@
         "@octokit/openapi-types": "^27.0.0"
       }
     },
+    "node_modules/@one-ini/wasm": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz",
+      "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@opentelemetry/api": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.3.tgz",
@@ -4375,10 +4382,14 @@
       "dev": true
     },
     "node_modules/abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
+      "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
     },
     "node_modules/accepts": {
       "version": "1.3.8",
@@ -5776,10 +5787,11 @@
       "dev": true
     },
     "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==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ini": "^1.3.4",
         "proto-list": "~1.2.1"
@@ -6359,10 +6371,11 @@
       "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==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6469,12 +6482,13 @@
       }
     },
     "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==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
+      "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/detect-libc": {
@@ -6648,47 +6662,58 @@
       "dev": true
     },
     "node_modules/editorconfig": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.2.tgz",
-      "integrity": "sha512-GWjSI19PVJAM9IZRGOS+YKI8LN+/sjkSjNyvxL5ucqP9/IqtYNXBaQ/6c/hkPNYQHyOHra2KoXZI/JVpuqwmcQ==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz",
+      "integrity": "sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==",
       "dev": true,
+      "license": "MIT",
       "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"
+        "@one-ini/wasm": "0.1.1",
+        "commander": "^10.0.0",
+        "minimatch": "9.0.1",
+        "semver": "^7.5.3"
       },
       "bin": {
         "editorconfig": "bin/editorconfig"
+      },
+      "engines": {
+        "node": ">=14"
       }
     },
-    "node_modules/editorconfig/node_modules/@types/node": {
-      "version": "10.12.21",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.21.tgz",
-      "integrity": "sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==",
-      "dev": true
-    },
-    "node_modules/editorconfig/node_modules/@types/semver": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==",
-      "dev": true
+    "node_modules/editorconfig/node_modules/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/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
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      }
     },
-    "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/editorconfig/node_modules/minimatch": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz",
+      "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==",
       "dev": true,
-      "bin": {
-        "semver": "bin/semver"
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/ee-first": {
@@ -9093,19 +9118,53 @@
       }
     },
     "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==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/gulp-json-editor/-/gulp-json-editor-2.6.0.tgz",
+      "integrity": "sha512-Ni0ZUpNrhesHiTlHQth/Nv1rXCn0LUicEvzA5XuGy186C4PVeNoRjfuAIQrbmt3scKv8dgGbCs0hd77ScTw7hA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "deepmerge": "^3.0.0",
-        "detect-indent": "^5.0.0",
-        "js-beautify": "^1.8.9",
-        "plugin-error": "^1.0.1",
-        "through2": "^3.0.0"
+        "deepmerge": "^4.3.1",
+        "detect-indent": "^6.1.0",
+        "js-beautify": "^1.14.11",
+        "plugin-error": "^2.0.1",
+        "through2": "^4.0.2"
+      }
+    },
+    "node_modules/gulp-json-editor/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": {
+        "ansi-wrap": "^0.1.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/gulp-json-editor/node_modules/plugin-error": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-2.0.1.tgz",
+      "integrity": "sha512-zMakqvIDyY40xHOvzXka0kUvf40nYIuwRE8dWhti2WtjQZ31xAgBZBhxsK7vK3QbRXS1Xms/LO7B5cuAsfB2Gg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-colors": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/gulp-json-editor/node_modules/through2": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "readable-stream": "3"
       }
     },
     "node_modules/gulp-plumber": {
@@ -10831,54 +10890,108 @@
       "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==",
+      "version": "1.15.4",
+      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.4.tgz",
+      "integrity": "sha512-9/KXeZUKKJwqCXUdBxFJ3vPh467OCckSBmYDwSK/EtV090K+iMJ7zx2S3HLVDIWFQdqMIsZWbnaGiba18aWhaA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "config-chain": "^1.1.12",
-        "editorconfig": "^0.15.2",
-        "glob": "^7.1.3",
-        "mkdirp": "~0.5.0",
-        "nopt": "~4.0.1"
+        "config-chain": "^1.1.13",
+        "editorconfig": "^1.0.4",
+        "glob": "^10.4.2",
+        "js-cookie": "^3.0.5",
+        "nopt": "^7.2.1"
       },
       "bin": {
         "css-beautify": "js/bin/css-beautify.js",
         "html-beautify": "js/bin/html-beautify.js",
         "js-beautify": "js/bin/js-beautify.js"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/js-beautify/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/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",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
       "dev": true,
+      "license": "ISC",
       "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"
+        "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"
       },
-      "engines": {
-        "node": "*"
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/js-beautify/node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+    "node_modules/js-beautify/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": {
-        "minimist": "^1.2.5"
+        "@isaacs/cliui": "^8.0.2"
       },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/js-beautify/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/js-beautify/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/js-cookie": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
+      "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
       }
     },
     "node_modules/js-tokens": {
@@ -11470,16 +11583,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dev": true,
-      "dependencies": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
     "node_modules/lru-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
@@ -12272,16 +12375,19 @@
       "license": "MIT"
     },
     "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==",
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz",
+      "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "abbrev": "1",
-        "osenv": "^0.1.4"
+        "abbrev": "^2.0.0"
       },
       "bin": {
         "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/normalize-package-data": {
@@ -12799,35 +12905,6 @@
       "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==",
       "dev": true
     },
-    "node_modules/os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M= sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/osenv": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "deprecated": "This package is no longer supported.",
-      "dev": true,
-      "dependencies": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
     "node_modules/p-all": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-all/-/p-all-1.0.0.tgz",
@@ -14122,8 +14199,9 @@
     "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
+      "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
@@ -14164,12 +14242,6 @@
         "node": ">=4.2.0"
       }
     },
-    "node_modules/pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM= sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
-      "dev": true
-    },
     "node_modules/psl": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
@@ -14979,12 +15051,6 @@
       "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
       "dev": true
     },
-    "node_modules/sigmund": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA= sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==",
-      "dev": true
-    },
     "node_modules/signal-exit": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
@@ -17599,12 +17665,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
-      "dev": true
-    },
     "node_modules/yargs": {
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
diff --git a/package.json b/package.json
index ef464dd56d90..d450b4fb6707 100644
--- a/package.json
+++ b/package.json
@@ -173,7 +173,7 @@
     "gulp-flatmap": "^1.0.2",
     "gulp-gunzip": "^1.0.0",
     "gulp-gzip": "^1.4.2",
-    "gulp-json-editor": "^2.5.0",
+    "gulp-json-editor": "^2.6.0",
     "gulp-plumber": "^1.2.1",
     "gulp-rename": "^2.1.0",
     "gulp-replace": "^1.1.4",

From 6ee7edc6e170f36b65e73aa4725196216393545b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:20:33 +0000
Subject: [PATCH 1610/1815] Bump yauzl from 3.1.1 to 3.2.0 in /remote

Bumps [yauzl](https://github.com/thejoshwolfe/yauzl) from 3.1.1 to 3.2.0.
- [Commits](https://github.com/thejoshwolfe/yauzl/compare/3.1.1...3.2.0)

---
updated-dependencies:
- dependency-name: yauzl
  dependency-version: 3.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 9 +++++----
 remote/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 51a379a1399b..43e59022787a 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -42,7 +42,7 @@
         "vscode-oniguruma": "2.0.1",
         "vscode-regexpp": "^3.1.0",
         "vscode-textmate": "9.3.1",
-        "yauzl": "^3.0.0",
+        "yauzl": "^3.2.0",
         "yazl": "^3.3.1"
       }
     },
@@ -1458,9 +1458,10 @@
       "license": "ISC"
     },
     "node_modules/yauzl": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.1.1.tgz",
-      "integrity": "sha512-MPxA7oN5cvGV0wzfkeHKF2/+Q4TkMpHSWGRy/96I4Cozljmx0ph91+Muxh6HegEtDC4GftJ8qYDE51vghFiEYA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.2.0.tgz",
+      "integrity": "sha512-Ow9nuGZE+qp1u4JIPvg+uCiUr7xGQWdff7JQSk5VGYTAZMDe2q8lxJ10ygv10qmSj031Ty/6FNJpLO4o1Sgc+w==",
+      "license": "MIT",
       "dependencies": {
         "buffer-crc32": "~0.2.3",
         "pend": "~1.2.0"
diff --git a/remote/package.json b/remote/package.json
index 1cdfb38a8f9e..07fb0e3b5d42 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -37,7 +37,7 @@
     "vscode-oniguruma": "2.0.1",
     "vscode-regexpp": "^3.1.0",
     "vscode-textmate": "9.3.1",
-    "yauzl": "^3.0.0",
+    "yauzl": "^3.2.0",
     "yazl": "^3.3.1"
   },
   "overrides": {

From 8aa9b706273af7a5a3987e723aad33acb4ee730d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:20:39 +0000
Subject: [PATCH 1611/1815] Bump @types/mocha from 9.1.1 to 10.0.10

Bumps [@types/mocha](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mocha) from 9.1.1 to 10.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mocha)

---
updated-dependencies:
- dependency-name: "@types/mocha"
  dependency-version: 10.0.10
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 17 ++++++-----------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c66673c344c4..68696854bc74 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -65,7 +65,7 @@
         "@types/http-proxy-agent": "^2.0.1",
         "@types/kerberos": "^1.1.2",
         "@types/minimist": "^1.2.1",
-        "@types/mocha": "^9.1.1",
+        "@types/mocha": "^10.0.10",
         "@types/node": "25.x",
         "@types/sinon": "^21.0.0",
         "@types/sinon-test": "^2.4.2",
@@ -2743,10 +2743,11 @@
       "dev": true
     },
     "node_modules/@types/mocha": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz",
-      "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==",
-      "dev": true
+      "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",
@@ -3645,12 +3646,6 @@
         "vscode-test": "out/bin.mjs"
       }
     },
-    "node_modules/@vscode/test-cli/node_modules/@types/mocha": {
-      "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.2.tgz",
-      "integrity": "sha512-NaHL0+0lLNhX6d9rs+NSt97WH/gIlRHmszXbQ/8/MV/eVcFNdeJ/GYhrFuUc8K7WuPhRhTSdMkCp8VMzhUq85w==",
-      "dev": true
-    },
     "node_modules/@vscode/test-cli/node_modules/ansi-colors": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
diff --git a/package.json b/package.json
index ef464dd56d90..89ecef439e5f 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
     "@types/http-proxy-agent": "^2.0.1",
     "@types/kerberos": "^1.1.2",
     "@types/minimist": "^1.2.1",
-    "@types/mocha": "^9.1.1",
+    "@types/mocha": "^10.0.10",
     "@types/node": "25.x",
     "@types/sinon": "^21.0.0",
     "@types/sinon-test": "^2.4.2",

From 88f905e669012c19c1f1dd678642458e3d5b0a31 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:20:47 +0000
Subject: [PATCH 1612/1815] Bump @types/vscode-notebook-renderer from 1.72.0 to
 1.72.4

Bumps [@types/vscode-notebook-renderer](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/vscode-notebook-renderer) from 1.72.0 to 1.72.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/vscode-notebook-renderer)

---
updated-dependencies:
- dependency-name: "@types/vscode-notebook-renderer"
  dependency-version: 1.72.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 11 ++++++-----
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c66673c344c4..38e9a6170840 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -70,7 +70,7 @@
         "@types/sinon": "^21.0.0",
         "@types/sinon-test": "^2.4.2",
         "@types/trusted-types": "^2.0.7",
-        "@types/vscode-notebook-renderer": "^1.72.0",
+        "@types/vscode-notebook-renderer": "^1.72.4",
         "@types/webpack": "^5.28.5",
         "@types/wicg-file-system-access": "^2020.9.6",
         "@types/windows-foreground-love": "^0.3.0",
@@ -2865,10 +2865,11 @@
       }
     },
     "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
+      "version": "1.72.4",
+      "resolved": "https://registry.npmjs.org/@types/vscode-notebook-renderer/-/vscode-notebook-renderer-1.72.4.tgz",
+      "integrity": "sha512-bdKO41c6Dc24pH/O/eM/jqfCwGH4zc76o/g/6Gt1y/eg/bvvqP2/VpbV+Sa5Te2sZekFRcbYnSSFTKo3wcVGUg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/webpack": {
       "version": "5.28.5",
diff --git a/package.json b/package.json
index ef464dd56d90..e7531ac20bff 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
     "@types/sinon": "^21.0.0",
     "@types/sinon-test": "^2.4.2",
     "@types/trusted-types": "^2.0.7",
-    "@types/vscode-notebook-renderer": "^1.72.0",
+    "@types/vscode-notebook-renderer": "^1.72.4",
     "@types/webpack": "^5.28.5",
     "@types/wicg-file-system-access": "^2020.9.6",
     "@types/windows-foreground-love": "^0.3.0",

From ced79b2ea65ffaa42f248d5449c4e729012e1d95 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 12:20:57 +0000
Subject: [PATCH 1613/1815] Bump rcedit from 1.1.0 to 5.0.2

Bumps [rcedit](https://github.com/electron/node-rcedit) from 1.1.0 to 5.0.2.
- [Release notes](https://github.com/electron/node-rcedit/releases)
- [Commits](https://github.com/electron/node-rcedit/compare/v1.1.0...v5.0.2)

---
updated-dependencies:
- dependency-name: rcedit
  dependency-version: 5.0.2
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 17 ++++++++++++-----
 package.json      |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c66673c344c4..a3d2d723147d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -143,7 +143,7 @@
         "postcss": "^8.5.3",
         "postcss-nesting": "^12.0.2",
         "pump": "^3.0.3",
-        "rcedit": "^1.1.0",
+        "rcedit": "^5.0.2",
         "rimraf": "^2.2.8",
         "sinon": "^21.0.0",
         "sinon-test": "^3.1.3",
@@ -14276,10 +14276,17 @@
       }
     },
     "node_modules/rcedit": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-1.1.0.tgz",
-      "integrity": "sha512-JkXJ0IrUcdupLoIx6gE4YcFaMVSGtu7kQf4NJoDJUnfBZGuATmJ2Yal2v55KTltp+WV8dGr7A0RtOzx6jmtM6Q==",
-      "dev": true
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-5.0.2.tgz",
+      "integrity": "sha512-dgysxaeXZ4snLpPjn8aVtHvZDCx+aRcvZbaWBgl1poU6OPustMvOkj9a9ZqASQ6i5Y5szJ13LSvglEOwrmgUxA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn-windows-exe": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 22.12.0"
+      }
     },
     "node_modules/read-pkg": {
       "version": "3.0.0",
diff --git a/package.json b/package.json
index ef464dd56d90..c26ad9d70b28 100644
--- a/package.json
+++ b/package.json
@@ -202,7 +202,7 @@
     "postcss": "^8.5.3",
     "postcss-nesting": "^12.0.2",
     "pump": "^3.0.3",
-    "rcedit": "^1.1.0",
+    "rcedit": "^5.0.2",
     "rimraf": "^2.2.8",
     "sinon": "^21.0.0",
     "sinon-test": "^3.1.3",

From b8410984f621e38fdf2fddef5fd54c1a4bf4fb2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 16:57:20 +0000
Subject: [PATCH 1614/1815] Bump @vscode/ripgrep from 1.15.10 to 1.17.0 in
 /build

Bumps [@vscode/ripgrep](https://github.com/microsoft/vscode-ripgrep) from 1.15.10 to 1.17.0.
- [Release notes](https://github.com/microsoft/vscode-ripgrep/releases)
- [Commits](https://github.com/microsoft/vscode-ripgrep/compare/v1.15.10...v1.17.0)

---
updated-dependencies:
- dependency-name: "@vscode/ripgrep"
  dependency-version: 1.17.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 8 ++++----
 build/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index e68afca0bcc9..e58159b8bbf5 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -42,7 +42,7 @@
         "@types/workerpool": "^9.0.0",
         "@types/xml2js": "0.4.14",
         "@vscode/iconv-lite-umd": "0.7.1",
-        "@vscode/ripgrep": "^1.15.10",
+        "@vscode/ripgrep": "^1.17.0",
         "@vscode/vsce": "3.7.1",
         "byline": "^5.0.0",
         "debug": "^4.3.2",
@@ -1887,9 +1887,9 @@
       "license": "MIT"
     },
     "node_modules/@vscode/ripgrep": {
-      "version": "1.15.10",
-      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.10.tgz",
-      "integrity": "sha512-83Q6qFrELpFgf88bPOcwSWDegfY2r/cb6bIfdLTSZvN73Dg1wviSfO+1v6lTFMd0mAvUYYcTUu+Mn5xMroZMxA==",
+      "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",
diff --git a/build/package.json b/build/package.json
index 92220c53d974..f2128b7d6f80 100644
--- a/build/package.json
+++ b/build/package.json
@@ -36,7 +36,7 @@
     "@types/workerpool": "^9.0.0",
     "@types/xml2js": "0.4.14",
     "@vscode/iconv-lite-umd": "0.7.1",
-    "@vscode/ripgrep": "^1.15.10",
+    "@vscode/ripgrep": "^1.17.0",
     "@vscode/vsce": "3.7.1",
     "byline": "^5.0.0",
     "debug": "^4.3.2",

From 5857499a3984189f25318ddae26d8a93b9f01374 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 16:57:37 +0000
Subject: [PATCH 1615/1815] Bump const_format from 0.2.32 to 0.2.35 in /cli

Bumps [const_format](https://github.com/rodrimati1992/const_format_crates) from 0.2.32 to 0.2.35.
- [Release notes](https://github.com/rodrimati1992/const_format_crates/releases)
- [Changelog](https://github.com/rodrimati1992/const_format_crates/blob/master/Changelog.md)
- [Commits](https://github.com/rodrimati1992/const_format_crates/commits)

---
updated-dependencies:
- dependency-name: const_format
  dependency-version: 0.2.35
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 8 ++++----
 cli/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 598b778bba8d..de5611ba6b8b 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -502,18 +502,18 @@ dependencies = [
 
 [[package]]
 name = "const_format"
-version = "0.2.32"
+version = "0.2.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
+checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad"
 dependencies = [
  "const_format_proc_macros",
 ]
 
 [[package]]
 name = "const_format_proc_macros"
-version = "0.2.32"
+version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
+checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 9da63c9c4e9b..38be7596c241 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -44,7 +44,7 @@ clap_lex = "0.7.7"
 url = "2.5.4"
 async-trait = "0.1.89"
 log = "0.4.18"
-const_format = "0.2.31"
+const_format = "0.2.35"
 sha2 = "0.10.9"
 base64 = "0.22.1"
 shell-escape = "0.1.5"

From 520ed06e0b3100933898d153132b024d7bb77090 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 17:46:22 +0000
Subject: [PATCH 1616/1815] Bump @azure/msal-node in
 /extensions/microsoft-authentication

Bumps [@azure/msal-node](https://github.com/AzureAD/microsoft-authentication-library-for-js) from 3.8.4 to 3.8.5.
- [Release notes](https://github.com/AzureAD/microsoft-authentication-library-for-js/releases)
- [Commits](https://github.com/AzureAD/microsoft-authentication-library-for-js/compare/msal-node-v3.8.4...msal-node-v3.8.5)

---
updated-dependencies:
- dependency-name: "@azure/msal-node"
  dependency-version: 3.8.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 25 ++++++-------------
 .../microsoft-authentication/package.json     |  2 +-
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 3c8f879d040e..7a37999665ca 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@azure/ms-rest-azure-env": "^2.0.0",
-        "@azure/msal-node": "^3.8.4",
+        "@azure/msal-node": "^3.8.5",
         "@azure/msal-node-extensions": "^1.5.27",
         "@vscode/extension-telemetry": "^1.2.0",
         "keytar": "file:./packageMocks/keytar",
@@ -33,21 +33,21 @@
       "integrity": "sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="
     },
     "node_modules/@azure/msal-common": {
-      "version": "15.13.3",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.13.3.tgz",
-      "integrity": "sha512-shSDU7Ioecya+Aob5xliW9IGq1Ui8y4EVSdWGyI1Gbm4Vg61WpP95LuzcY214/wEjSn6w4PZYD4/iVldErHayQ==",
+      "version": "15.14.0",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.14.0.tgz",
+      "integrity": "sha512-aNuorSQxzsJQ6IUjJtN+rCInLfLOo3VpNYiXaHBK9XL8Ieg1y4F5ZFjI19GErbVvwqvwGNyJ9AZ/sAxOWhoSUw==",
       "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/@azure/msal-node": {
-      "version": "3.8.4",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.4.tgz",
-      "integrity": "sha512-lvuAwsDpPDE/jSuVQOBMpLbXuVuLsPNRwWCyK3/6bPlBk0fGWegqoZ0qjZclMWyQ2JNvIY3vHY7hoFmFmFQcOw==",
+      "version": "3.8.5",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.5.tgz",
+      "integrity": "sha512-xRSAfH27bIp3vtjtTFyyhdm18lq2pzdoNG7DA2IH1fXzJ30mymryv0wK/Gph+x4y0Rx+5mMLU5JTPiCeQ75Aug==",
       "license": "MIT",
       "dependencies": {
-        "@azure/msal-common": "15.13.3",
+        "@azure/msal-common": "15.14.0",
         "jsonwebtoken": "^9.0.0",
         "uuid": "^8.3.0"
       },
@@ -70,15 +70,6 @@
         "node": ">=16"
       }
     },
-    "node_modules/@azure/msal-node-extensions/node_modules/@azure/msal-common": {
-      "version": "15.14.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.14.0.tgz",
-      "integrity": "sha512-aNuorSQxzsJQ6IUjJtN+rCInLfLOo3VpNYiXaHBK9XL8Ieg1y4F5ZFjI19GErbVvwqvwGNyJ9AZ/sAxOWhoSUw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/@azure/msal-node-runtime": {
       "version": "0.20.1",
       "resolved": "https://registry.npmjs.org/@azure/msal-node-runtime/-/msal-node-runtime-0.20.1.tgz",
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index c6a6eb2557c5..b4f630f77263 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -139,7 +139,7 @@
   },
   "dependencies": {
     "@azure/ms-rest-azure-env": "^2.0.0",
-    "@azure/msal-node": "^3.8.4",
+    "@azure/msal-node": "^3.8.5",
     "@azure/msal-node-extensions": "^1.5.27",
     "@vscode/extension-telemetry": "^1.2.0",
     "keytar": "file:./packageMocks/keytar",

From e2ff6271a0f7652faddb8023adb4611396f32634 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 20:27:25 +0000
Subject: [PATCH 1617/1815] Bump @xterm/addon-clipboard in /remote

Bumps [@xterm/addon-clipboard](https://github.com/xtermjs/xterm.js) from 0.2.0-beta.123 to 0.3.0-beta.103.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-clipboard"
  dependency-version: 0.3.0-beta.103
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 8d038a1477c8..48a5afed478e 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -20,7 +20,7 @@
         "@vscode/vscode-languagedetection": "1.0.22",
         "@vscode/windows-process-tree": "^0.6.3",
         "@vscode/windows-registry": "^1.1.0",
-        "@xterm/addon-clipboard": "^0.2.0-beta.123",
+        "@xterm/addon-clipboard": "^0.3.0-beta.103",
         "@xterm/addon-image": "^0.10.0-beta.101",
         "@xterm/addon-ligatures": "^0.11.0-beta.103",
         "@xterm/addon-progress": "^0.3.0-beta.101",
@@ -549,15 +549,15 @@
       "hasInstallScript": true
     },
     "node_modules/@xterm/addon-clipboard": {
-      "version": "0.2.0-beta.123",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.123.tgz",
-      "integrity": "sha512-gMlaxEpToN5CThRVf0+zf8m69PHd+y/o/IgEmMMEquFWddl58QDxG2cBdiJRwYMq7K23KdtJasitYE80Ygn88Q==",
+      "version": "0.3.0-beta.103",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.103.tgz",
+      "integrity": "sha512-L3h9GEiNhopTF3TnacebbrtgrcObw1Of8NMJFx65OYtyIxW1JqTuFHcFayQg2gksdQnoUIpfqQiMauo16dp0Nw==",
       "license": "MIT",
       "dependencies": {
         "js-base64": "^3.7.5"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.140"
+        "@xterm/xterm": "^6.1.0-beta.103"
       }
     },
     "node_modules/@xterm/addon-image": {
diff --git a/remote/package.json b/remote/package.json
index 5cb451bf7c7f..519dfc6a59a6 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -15,7 +15,7 @@
     "@vscode/vscode-languagedetection": "1.0.22",
     "@vscode/windows-process-tree": "^0.6.3",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-clipboard": "^0.2.0-beta.123",
+    "@xterm/addon-clipboard": "^0.3.0-beta.103",
     "@xterm/addon-image": "^0.10.0-beta.101",
     "@xterm/addon-ligatures": "^0.11.0-beta.103",
     "@xterm/addon-progress": "^0.3.0-beta.101",

From b1b21a2e35909c04712f5d2ec4c99ea75d2ff549 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 20:29:04 +0000
Subject: [PATCH 1618/1815] Bump @xterm/headless from 5.6.0-beta.140 to 6.0.0
 in /remote

Bumps [@xterm/headless](https://github.com/xtermjs/xterm.js) from 5.6.0-beta.140 to 6.0.0.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits/6.0.0)

---
updated-dependencies:
- dependency-name: "@xterm/headless"
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 48a5afed478e..53a6213ca5b5 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -28,7 +28,7 @@
         "@xterm/addon-serialize": "^0.14.0-beta.140",
         "@xterm/addon-unicode11": "^0.10.0-beta.103",
         "@xterm/addon-webgl": "^0.20.0-beta.102",
-        "@xterm/headless": "^5.6.0-beta.140",
+        "@xterm/headless": "^6.0.0",
         "@xterm/xterm": "^6.0.0",
         "cookie": "^0.7.0",
         "http-proxy-agent": "^7.0.2",
@@ -631,9 +631,9 @@
       }
     },
     "node_modules/@xterm/headless": {
-      "version": "5.6.0-beta.140",
-      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.6.0-beta.140.tgz",
-      "integrity": "sha512-gPXOQQ1pepFt6+9gsKWfKFDMATFUbU754SsL0CzAsgKzNSHbu+2vvF2sFXWuMvY8aqMg+mq4nmNaDgyls4/SYA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.0.0.tgz",
+      "integrity": "sha512-5Yj1QINYCyzrZtf8OFIHi47iQtI+0qYFPHmouEfG8dHNxbZ9Tb9YGSuLcsEwj9Z+OL75GJqPyJbyoFer80a2Hw==",
       "license": "MIT",
       "workspaces": [
         "addons/*"
diff --git a/remote/package.json b/remote/package.json
index 519dfc6a59a6..8dd77c84989c 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -23,7 +23,7 @@
     "@xterm/addon-serialize": "^0.14.0-beta.140",
     "@xterm/addon-unicode11": "^0.10.0-beta.103",
     "@xterm/addon-webgl": "^0.20.0-beta.102",
-    "@xterm/headless": "^5.6.0-beta.140",
+    "@xterm/headless": "^6.0.0",
     "@xterm/xterm": "^6.0.0",
     "cookie": "^0.7.0",
     "http-proxy-agent": "^7.0.2",

From 073910e40eaf3462cba0ddf816895edd712135c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 20:29:32 +0000
Subject: [PATCH 1619/1815] Bump @xterm/addon-progress in /remote/web

Bumps [@xterm/addon-progress](https://github.com/xtermjs/xterm.js) from 0.3.0-beta.101 to 0.3.0-beta.103.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-progress"
  dependency-version: 0.3.0-beta.103
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index ca7eaeeb8478..c0d9b21e93cc 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -16,7 +16,7 @@
 				"@xterm/addon-clipboard": "^0.3.0-beta.103",
 				"@xterm/addon-image": "^0.10.0-beta.103",
 				"@xterm/addon-ligatures": "^0.11.0-beta.103",
-				"@xterm/addon-progress": "^0.3.0-beta.101",
+				"@xterm/addon-progress": "^0.3.0-beta.103",
 				"@xterm/addon-search": "^0.17.0-beta.103",
 				"@xterm/addon-serialize": "^0.15.0-beta.103",
 				"@xterm/addon-unicode11": "^0.10.0-beta.103",
@@ -161,12 +161,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-progress": {
-			"version": "0.3.0-beta.101",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.101.tgz",
-			"integrity": "sha512-QsJLvH3tc9KywOXb9O/mxkPoYmL2cCvKUa/YckriuZmEh5WMw+3cgNa+BC0aA73htdWE8UMUBvigE786KErajA==",
+			"version": "0.3.0-beta.103",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.103.tgz",
+			"integrity": "sha512-sUwQG7IwL6rkNqsLPlUmvJ3iy6v16e3zgle8hxC4jebTNSLSzpk7cRrNBVysXOCz73+GZuuOwwFuYjVRmj3nEg==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.101"
+				"@xterm/xterm": "^6.1.0-beta.103"
 			}
 		},
 		"node_modules/@xterm/addon-search": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 8a023a9a1649..2ddc2774c79b 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -11,7 +11,7 @@
 		"@xterm/addon-clipboard": "^0.3.0-beta.103",
 		"@xterm/addon-image": "^0.10.0-beta.103",
 		"@xterm/addon-ligatures": "^0.11.0-beta.103",
-		"@xterm/addon-progress": "^0.3.0-beta.101",
+		"@xterm/addon-progress": "^0.3.0-beta.103",
 		"@xterm/addon-search": "^0.17.0-beta.103",
 		"@xterm/addon-serialize": "^0.15.0-beta.103",
 		"@xterm/addon-unicode11": "^0.10.0-beta.103",

From a653bfe00fac374bc04ecae3441ba417bb0e84b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:15:48 +0000
Subject: [PATCH 1620/1815] Bump @types/node in
 /extensions/configuration-editing

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/configuration-editing/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/configuration-editing/package-lock.json b/extensions/configuration-editing/package-lock.json
index 1d94a6a0c735..de424e969872 100644
--- a/extensions/configuration-editing/package-lock.json
+++ b/extensions/configuration-editing/package-lock.json
@@ -175,9 +175,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From d9ebf84c0ef8b60f27654fecf1afd4c1e7a1ae5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:15:48 +0000
Subject: [PATCH 1621/1815] Bump @types/node in
 /.vscode/extensions/vscode-selfhost-test-provider

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../vscode-selfhost-test-provider/package-lock.json         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
index d4d136af9777..e73c42b1eab0 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
@@ -58,9 +58,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From c064b28967d450fc6aa58ad0dad21aa9a96a5f11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:15:48 +0000
Subject: [PATCH 1622/1815] Bump @types/node in
 /extensions/css-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/css-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/css-language-features/package-lock.json b/extensions/css-language-features/package-lock.json
index 6ac97c834939..1725ea2a8683 100644
--- a/extensions/css-language-features/package-lock.json
+++ b/extensions/css-language-features/package-lock.json
@@ -41,9 +41,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From b540b0431c15990a839d857faa3f152b5f15d878 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:15:50 +0000
Subject: [PATCH 1623/1815] Bump @types/node in
 /extensions/css-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/css-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/css-language-features/server/package-lock.json b/extensions/css-language-features/server/package-lock.json
index 4f3030a76936..15dbd7c65835 100644
--- a/extensions/css-language-features/server/package-lock.json
+++ b/extensions/css-language-features/server/package-lock.json
@@ -30,9 +30,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 9349e846cdec25b073c0672911afe98e4f39dae5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:15:51 +0000
Subject: [PATCH 1624/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /extensions/debug-auto-launch

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/debug-auto-launch/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/debug-auto-launch/package-lock.json b/extensions/debug-auto-launch/package-lock.json
index b7e344e46b96..77cadfe9ff56 100644
--- a/extensions/debug-auto-launch/package-lock.json
+++ b/extensions/debug-auto-launch/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From de2fefb07ce4299a80169a7c27dfac7beb5ed48d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:16:01 +0000
Subject: [PATCH 1625/1815] Bump chrono from 0.4.42 to 0.4.43 in /cli

Bumps [chrono](https://github.com/chronotope/chrono) from 0.4.42 to 0.4.43.
- [Release notes](https://github.com/chronotope/chrono/releases)
- [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md)
- [Commits](https://github.com/chronotope/chrono/compare/v0.4.42...v0.4.43)

---
updated-dependencies:
- dependency-name: chrono
  dependency-version: 0.4.43
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 4 ++--
 cli/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 1a952c0f1ad5..dcc8aa97b9fd 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -370,9 +370,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.42"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118"
 dependencies = [
  "iana-time-zone",
  "num-traits",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index fb2f08cb8460..169ad97a1494 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -31,7 +31,7 @@ dirs = "6.0.0"
 rand = "0.9.2"
 opentelemetry = { version = "0.20.0", features = ["rt-tokio"] }
 serde_bytes = "0.11.19"
-chrono = { version = "0.4.42", features = ["serde", "std", "clock"], default-features = false }
+chrono = { version = "0.4.43", features = ["serde", "std", "clock"], default-features = false }
 gethostname = "1.1.0"
 libc = "0.2.180"
 tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "8cae9b2a24c65c6c1958f5a0e77d72b23b5c6c30", default-features = false, features = ["connections"] }

From 8299b307f70f29cfbb3ebddb3476d18a0da038f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:16:13 +0000
Subject: [PATCH 1626/1815] Bump @types/node from 25.0.8 to 25.0.9 in /build

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index d4c2bfb44977..a6286af8937a 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -1730,9 +1730,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 5e0cf61f1cfa296db22e856caaca879cb1b2219f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:16:21 +0000
Subject: [PATCH 1627/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /extensions/grunt

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/grunt/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/grunt/package-lock.json b/extensions/grunt/package-lock.json
index dbb31881cb2c..dcdd06124c3e 100644
--- a/extensions/grunt/package-lock.json
+++ b/extensions/grunt/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 45482d3b3c7da73c7f93ca46473442310950a44d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:16:22 +0000
Subject: [PATCH 1628/1815] Bump winreg from 0.52.0 to 0.54.0 in /cli

Bumps [winreg](https://github.com/gentoo90/winreg-rs) from 0.52.0 to 0.54.0.
- [Release notes](https://github.com/gentoo90/winreg-rs/releases)
- [Changelog](https://github.com/gentoo90/winreg-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gentoo90/winreg-rs/compare/v0.52.0...v0.54.0)

---
updated-dependencies:
- dependency-name: winreg
  dependency-version: 0.54.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 12 +++++++++++-
 cli/Cargo.toml |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 1a952c0f1ad5..451a51ca3d94 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -467,7 +467,7 @@ dependencies = [
  "url",
  "uuid",
  "winapi",
- "winreg 0.52.0",
+ "winreg 0.54.0",
  "zbus 4.4.0",
  "zip",
 ]
@@ -3742,6 +3742,16 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.54.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a69204ea7f8a24058ba4db40fe57c77eb650a6dd82815355be8da442f21165ae"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "wit-bindgen"
 version = "0.46.0"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index fb2f08cb8460..a61e9acae1df 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -60,7 +60,7 @@ serde = { version="1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 
 [target.'cfg(windows)'.dependencies]
-winreg = "0.52.0"
+winreg = "0.54.0"
 winapi = "0.3.9"
 
 [target.'cfg(target_os = "macos")'.dependencies]

From 7cfe495c06ce6c17780feb6c73db667e8c5ee54c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:16:27 +0000
Subject: [PATCH 1629/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /extensions/git-base

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git-base/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/git-base/package-lock.json b/extensions/git-base/package-lock.json
index 0108169f3aa8..2aff9022ffd8 100644
--- a/extensions/git-base/package-lock.json
+++ b/extensions/git-base/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 80af933f32f6a03022a05c616518e359c430af49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:16:29 +0000
Subject: [PATCH 1630/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /extensions/extension-editing

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/extension-editing/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/extension-editing/package-lock.json b/extensions/extension-editing/package-lock.json
index 6e6595f4a996..5b96c0f69c05 100644
--- a/extensions/extension-editing/package-lock.json
+++ b/extensions/extension-editing/package-lock.json
@@ -47,9 +47,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From dfe404e8c4312114911f081431d37d5f635c3b43 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:16:30 +0000
Subject: [PATCH 1631/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /extensions/debug-server-ready

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/debug-server-ready/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/debug-server-ready/package-lock.json b/extensions/debug-server-ready/package-lock.json
index 1cd9ddc59300..fcdb91f25af9 100644
--- a/extensions/debug-server-ready/package-lock.json
+++ b/extensions/debug-server-ready/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 0499af5330db48f1cbae5520ed16f9d3bfa3867f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:16:37 +0000
Subject: [PATCH 1632/1815] Bump @types/node in
 /extensions/html-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/html-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/html-language-features/package-lock.json b/extensions/html-language-features/package-lock.json
index fa58afdef425..a0c8471e5529 100644
--- a/extensions/html-language-features/package-lock.json
+++ b/extensions/html-language-features/package-lock.json
@@ -166,9 +166,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 4dadb7b506ab8a8e8122690876b740c0336f8d41 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:16:40 +0000
Subject: [PATCH 1633/1815] Bump @types/node in
 /extensions/github-authentication

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github-authentication/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/github-authentication/package-lock.json b/extensions/github-authentication/package-lock.json
index d0fa22783d8f..aa581c02152c 100644
--- a/extensions/github-authentication/package-lock.json
+++ b/extensions/github-authentication/package-lock.json
@@ -154,9 +154,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 95402ea82c732825650b63d156e9d662ff6adf7c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:16:41 +0000
Subject: [PATCH 1634/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /extensions/emmet

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/emmet/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/emmet/package-lock.json b/extensions/emmet/package-lock.json
index a6cf528560e8..6a777964d33f 100644
--- a/extensions/emmet/package-lock.json
+++ b/extensions/emmet/package-lock.json
@@ -80,9 +80,9 @@
       "integrity": "sha1-JEywLHfsLnT3ipvTGCGKvJxQCmE= sha512-ZsZ2I9Vzso3Ho/pjZFsmmZ++FWeEd/txqybHTm4OgaZzdS8V9V/YYWQwg5TC38Z7uLWUV1vavpLLbjJtKubR1A=="
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 83ceafb581db85462a70dcbfda607813939390b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:16:56 +0000
Subject: [PATCH 1635/1815] Bump log from 0.4.21 to 0.4.29 in /cli

Bumps [log](https://github.com/rust-lang/log) from 0.4.21 to 0.4.29.
- [Release notes](https://github.com/rust-lang/log/releases)
- [Changelog](https://github.com/rust-lang/log/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/log/compare/0.4.21...0.4.29)

---
updated-dependencies:
- dependency-name: log
  dependency-version: 0.4.29
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 4 ++--
 cli/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 1a952c0f1ad5..c178423f3b6f 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -1643,9 +1643,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
 name = "md5"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index fb2f08cb8460..62777c2b3f26 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -43,7 +43,7 @@ tempfile = "3.11.0"
 clap_lex = "0.7.7"
 url = "2.5.4"
 async-trait = "0.1.89"
-log = "0.4.18"
+log = "0.4.29"
 const_format = "0.2.35"
 sha2 = "0.10.9"
 base64 = "0.22.1"

From 82f41013974a510d8ad819840d38dcfb5dca1893 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:17:11 +0000
Subject: [PATCH 1636/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /extensions/github

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/github/package-lock.json b/extensions/github/package-lock.json
index b91b7bdfd090..c556d0ab5e87 100644
--- a/extensions/github/package-lock.json
+++ b/extensions/github/package-lock.json
@@ -311,9 +311,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From e5ecbaed9152caf10e496b689a6dc43f4ddf590f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:17:12 +0000
Subject: [PATCH 1637/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /extensions/gulp

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/gulp/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/gulp/package-lock.json b/extensions/gulp/package-lock.json
index a740db539ad4..dcf99a155e7f 100644
--- a/extensions/gulp/package-lock.json
+++ b/extensions/gulp/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 20bc5463ca863918e38da302d008e525ee11fdfb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:17:33 +0000
Subject: [PATCH 1638/1815] Bump @types/node in
 /extensions/json-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/json-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/json-language-features/package-lock.json b/extensions/json-language-features/package-lock.json
index 5c3b1d56b8a9..0571a745ed35 100644
--- a/extensions/json-language-features/package-lock.json
+++ b/extensions/json-language-features/package-lock.json
@@ -166,9 +166,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 5ae835f1faa53036b34b05e3c2cca332a2efab72 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:18:04 +0000
Subject: [PATCH 1639/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /extensions/git

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index 6e8852cd59c0..bbfef19e00f9 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -214,9 +214,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 42a1c2ace5bd5f37075d1387139c01a02d09c42a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:18:04 +0000
Subject: [PATCH 1640/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /extensions/jake

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/jake/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/jake/package-lock.json b/extensions/jake/package-lock.json
index 430dcd7485cd..8494d8c65bcd 100644
--- a/extensions/jake/package-lock.json
+++ b/extensions/jake/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From be70504b10a2ddbed1d002624a2a39f94e4cc3f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:18:08 +0000
Subject: [PATCH 1641/1815] Bump @types/node in
 /extensions/html-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/html-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/html-language-features/server/package-lock.json b/extensions/html-language-features/server/package-lock.json
index 18354d211e7f..f89adb52b14b 100644
--- a/extensions/html-language-features/server/package-lock.json
+++ b/extensions/html-language-features/server/package-lock.json
@@ -32,9 +32,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 3a978b669d04843e099406d632b074bf2931e87c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:18:22 +0000
Subject: [PATCH 1642/1815] Bump @types/node in
 /extensions/microsoft-authentication

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/microsoft-authentication/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 7a37999665ca..cc9891e7e775 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -202,9 +202,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 4e19999c1322d621b9a3bf7d9ba9de5c1bb9e7b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:18:29 +0000
Subject: [PATCH 1643/1815] Bump @types/node in
 /extensions/json-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/json-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/json-language-features/server/package-lock.json b/extensions/json-language-features/server/package-lock.json
index a62c95eb99bd..beda4d2ff584 100644
--- a/extensions/json-language-features/server/package-lock.json
+++ b/extensions/json-language-features/server/package-lock.json
@@ -35,9 +35,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From e723afd23c54ab77ea3d91657cb762e890140fbc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:18:47 +0000
Subject: [PATCH 1644/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /extensions/npm

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/npm/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index ded02e74d4be..6f80b1a0fad9 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -60,9 +60,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 5911e2871ac25ad29ae3ab0cdbcf3432de752b9e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:18:55 +0000
Subject: [PATCH 1645/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /extensions/merge-conflict

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/merge-conflict/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/merge-conflict/package-lock.json b/extensions/merge-conflict/package-lock.json
index 801ca287170c..9c3005b00e93 100644
--- a/extensions/merge-conflict/package-lock.json
+++ b/extensions/merge-conflict/package-lock.json
@@ -143,9 +143,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 978a61c01e83c0ea0e8586cf619083dfae9101c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:19:02 +0000
Subject: [PATCH 1646/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /extensions/references-view

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/references-view/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/references-view/package-lock.json b/extensions/references-view/package-lock.json
index 720e9569540a..a52729864602 100644
--- a/extensions/references-view/package-lock.json
+++ b/extensions/references-view/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From d349e8f5d96c834ef7657ebaa17dd208b171edff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:19:06 +0000
Subject: [PATCH 1647/1815] Bump @types/node in
 /extensions/php-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/php-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/php-language-features/package-lock.json b/extensions/php-language-features/package-lock.json
index 391428909155..1ad4d90327cd 100644
--- a/extensions/php-language-features/package-lock.json
+++ b/extensions/php-language-features/package-lock.json
@@ -20,9 +20,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From d7146c60a218e539ae2eff3dd37819b5048d9443 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:20:18 +0000
Subject: [PATCH 1648/1815] Bump @xterm/addon-progress in /remote

Bumps [@xterm/addon-progress](https://github.com/xtermjs/xterm.js) from 0.3.0-beta.101 to 0.3.0-beta.103.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-progress"
  dependency-version: 0.3.0-beta.103
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 53a6213ca5b5..11f43711d3f2 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -23,7 +23,7 @@
         "@xterm/addon-clipboard": "^0.3.0-beta.103",
         "@xterm/addon-image": "^0.10.0-beta.101",
         "@xterm/addon-ligatures": "^0.11.0-beta.103",
-        "@xterm/addon-progress": "^0.3.0-beta.101",
+        "@xterm/addon-progress": "^0.3.0-beta.103",
         "@xterm/addon-search": "^0.17.0-beta.103",
         "@xterm/addon-serialize": "^0.14.0-beta.140",
         "@xterm/addon-unicode11": "^0.10.0-beta.103",
@@ -586,12 +586,12 @@
       }
     },
     "node_modules/@xterm/addon-progress": {
-      "version": "0.3.0-beta.101",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.101.tgz",
-      "integrity": "sha512-QsJLvH3tc9KywOXb9O/mxkPoYmL2cCvKUa/YckriuZmEh5WMw+3cgNa+BC0aA73htdWE8UMUBvigE786KErajA==",
+      "version": "0.3.0-beta.103",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.103.tgz",
+      "integrity": "sha512-sUwQG7IwL6rkNqsLPlUmvJ3iy6v16e3zgle8hxC4jebTNSLSzpk7cRrNBVysXOCz73+GZuuOwwFuYjVRmj3nEg==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.101"
+        "@xterm/xterm": "^6.1.0-beta.103"
       }
     },
     "node_modules/@xterm/addon-search": {
diff --git a/remote/package.json b/remote/package.json
index 8dd77c84989c..c3cb9db1c8a6 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -18,7 +18,7 @@
     "@xterm/addon-clipboard": "^0.3.0-beta.103",
     "@xterm/addon-image": "^0.10.0-beta.101",
     "@xterm/addon-ligatures": "^0.11.0-beta.103",
-    "@xterm/addon-progress": "^0.3.0-beta.101",
+    "@xterm/addon-progress": "^0.3.0-beta.103",
     "@xterm/addon-search": "^0.17.0-beta.103",
     "@xterm/addon-serialize": "^0.14.0-beta.140",
     "@xterm/addon-unicode11": "^0.10.0-beta.103",

From a9a9e8d89998efa44721d6861be0fe8f5eee8cbf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:20:19 +0000
Subject: [PATCH 1649/1815] Bump @types/node in
 /extensions/vscode-colorize-perf-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-colorize-perf-tests/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-colorize-perf-tests/package-lock.json b/extensions/vscode-colorize-perf-tests/package-lock.json
index f4fbf71d7e33..18c4ef96dd37 100644
--- a/extensions/vscode-colorize-perf-tests/package-lock.json
+++ b/extensions/vscode-colorize-perf-tests/package-lock.json
@@ -19,9 +19,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From d969ddf8aecc5075f2220d6dedc3cfe0c131f9d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:20:23 +0000
Subject: [PATCH 1650/1815] Bump cookie from 0.7.2 to 1.1.1 in /remote

Bumps [cookie](https://github.com/jshttp/cookie) from 0.7.2 to 1.1.1.
- [Release notes](https://github.com/jshttp/cookie/releases)
- [Commits](https://github.com/jshttp/cookie/compare/v0.7.2...v1.1.1)

---
updated-dependencies:
- dependency-name: cookie
  dependency-version: 1.1.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 14 +++++++++-----
 remote/package.json      |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 53a6213ca5b5..2ab2e5cf8bc0 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -30,7 +30,7 @@
         "@xterm/addon-webgl": "^0.20.0-beta.102",
         "@xterm/headless": "^6.0.0",
         "@xterm/xterm": "^6.0.0",
-        "cookie": "^0.7.0",
+        "cookie": "^1.1.1",
         "http-proxy-agent": "^7.0.2",
         "https-proxy-agent": "^7.0.6",
         "jschardet": "3.1.4",
@@ -735,12 +735,16 @@
       "license": "ISC"
     },
     "node_modules/cookie": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
-      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz",
+      "integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==",
       "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/debug": {
diff --git a/remote/package.json b/remote/package.json
index 8dd77c84989c..bbeea78787d2 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -25,7 +25,7 @@
     "@xterm/addon-webgl": "^0.20.0-beta.102",
     "@xterm/headless": "^6.0.0",
     "@xterm/xterm": "^6.0.0",
-    "cookie": "^0.7.0",
+    "cookie": "^1.1.1",
     "http-proxy-agent": "^7.0.2",
     "https-proxy-agent": "^7.0.6",
     "jschardet": "3.1.4",

From 3587bd280abba66335352d7fc9badb036c981c73 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:20:30 +0000
Subject: [PATCH 1651/1815] Bump @types/node in
 /extensions/vscode-colorize-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-colorize-tests/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-colorize-tests/package-lock.json b/extensions/vscode-colorize-tests/package-lock.json
index 90350573bc79..194753bd5ccc 100644
--- a/extensions/vscode-colorize-tests/package-lock.json
+++ b/extensions/vscode-colorize-tests/package-lock.json
@@ -19,9 +19,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From f0f947e83e887df2e90b9f23eb1b4cedc1468622 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:20:30 +0000
Subject: [PATCH 1652/1815] Bump @vscode/windows-registry from 1.1.0 to 1.1.3
 in /remote

Bumps [@vscode/windows-registry](https://github.com/Microsoft/vscode-windows-registry) from 1.1.0 to 1.1.3.
- [Release notes](https://github.com/Microsoft/vscode-windows-registry/releases)
- [Commits](https://github.com/Microsoft/vscode-windows-registry/compare/v1.1.0...v1.1.3)

---
updated-dependencies:
- dependency-name: "@vscode/windows-registry"
  dependency-version: 1.1.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 11 ++++++-----
 remote/package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 53a6213ca5b5..9fc06f687f95 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -19,7 +19,7 @@
         "@vscode/tree-sitter-wasm": "^0.3.0",
         "@vscode/vscode-languagedetection": "1.0.22",
         "@vscode/windows-process-tree": "^0.6.3",
-        "@vscode/windows-registry": "^1.1.0",
+        "@vscode/windows-registry": "^1.1.3",
         "@xterm/addon-clipboard": "^0.3.0-beta.103",
         "@xterm/addon-image": "^0.10.0-beta.101",
         "@xterm/addon-ligatures": "^0.11.0-beta.103",
@@ -543,10 +543,11 @@
       }
     },
     "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.3.0-beta.103",
diff --git a/remote/package.json b/remote/package.json
index 8dd77c84989c..1b0e20062e0d 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -14,7 +14,7 @@
     "@vscode/tree-sitter-wasm": "^0.3.0",
     "@vscode/vscode-languagedetection": "1.0.22",
     "@vscode/windows-process-tree": "^0.6.3",
-    "@vscode/windows-registry": "^1.1.0",
+    "@vscode/windows-registry": "^1.1.3",
     "@xterm/addon-clipboard": "^0.3.0-beta.103",
     "@xterm/addon-image": "^0.10.0-beta.101",
     "@xterm/addon-ligatures": "^0.11.0-beta.103",

From 1decf179d4185c50f65123b8a0f3295a434a9114 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:20:31 +0000
Subject: [PATCH 1653/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /extensions/vscode-api-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-api-tests/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-api-tests/package-lock.json b/extensions/vscode-api-tests/package-lock.json
index 0b7aea70876a..5f890da72b4b 100644
--- a/extensions/vscode-api-tests/package-lock.json
+++ b/extensions/vscode-api-tests/package-lock.json
@@ -27,9 +27,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From ffe0e1e04bcde5920bfa1e99d275febcacfe15f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:20:36 +0000
Subject: [PATCH 1654/1815] Bump @types/node in
 /extensions/typescript-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/typescript-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/typescript-language-features/package-lock.json b/extensions/typescript-language-features/package-lock.json
index 899db573c257..c855d2a11dab 100644
--- a/extensions/typescript-language-features/package-lock.json
+++ b/extensions/typescript-language-features/package-lock.json
@@ -152,9 +152,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From b4b7c9460def8efaa670d8cbbe3ee01b0516ea34 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:20:38 +0000
Subject: [PATCH 1655/1815] Bump @vscode/deviceid from 0.1.2 to 0.1.4 in
 /remote

Bumps [@vscode/deviceid](https://github.com/Microsoft/vscode-deviceid) from 0.1.2 to 0.1.4.
- [Commits](https://github.com/Microsoft/vscode-deviceid/commits)

---
updated-dependencies:
- dependency-name: "@vscode/deviceid"
  dependency-version: 0.1.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 9 +++++----
 remote/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 53a6213ca5b5..49955d91317a 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -11,7 +11,7 @@
         "@microsoft/1ds-core-js": "^4.3.10",
         "@microsoft/1ds-post-js": "^4.3.11",
         "@parcel/watcher": "2.5.4",
-        "@vscode/deviceid": "^0.1.2",
+        "@vscode/deviceid": "^0.1.4",
         "@vscode/iconv-lite-umd": "0.7.1",
         "@vscode/proxy-agent": "^0.36.0",
         "@vscode/ripgrep": "^1.17.0",
@@ -424,9 +424,10 @@
       }
     },
     "node_modules/@vscode/deviceid": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@vscode/deviceid/-/deviceid-0.1.2.tgz",
-      "integrity": "sha512-QZsbcKGd5JMBVoKIVT+HD9o8YWWqcmKRNWvR3qWj3iXuDo8fKaZXY3k3ZGMdOAK36fCgL0zGTDkt9vWmeBwNvQ==",
+      "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",
diff --git a/remote/package.json b/remote/package.json
index 8dd77c84989c..f6ee18e77392 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -6,7 +6,7 @@
     "@microsoft/1ds-core-js": "^4.3.10",
     "@microsoft/1ds-post-js": "^4.3.11",
     "@parcel/watcher": "2.5.4",
-    "@vscode/deviceid": "^0.1.2",
+    "@vscode/deviceid": "^0.1.4",
     "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/proxy-agent": "^0.36.0",
     "@vscode/ripgrep": "^1.17.0",

From 7b62b6e504a7066759b1fbdae69350afdef75282 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:20:45 +0000
Subject: [PATCH 1656/1815] Bump @types/minimist from 1.2.1 to 1.2.5

Bumps [@types/minimist](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/minimist) from 1.2.1 to 1.2.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/minimist)

---
updated-dependencies:
- dependency-name: "@types/minimist"
  dependency-version: 1.2.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 11 ++++++-----
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 77c9174bea86..465ecbc35dd0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -64,7 +64,7 @@
         "@types/gulp-svgmin": "^1.2.5",
         "@types/http-proxy-agent": "^2.0.1",
         "@types/kerberos": "^1.1.2",
-        "@types/minimist": "^1.2.1",
+        "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",
         "@types/node": "25.x",
         "@types/sinon": "^21.0.0",
@@ -2744,10 +2744,11 @@
       "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
+      "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",
diff --git a/package.json b/package.json
index 89099807bdac..3ea1769c6f56 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
     "@types/gulp-svgmin": "^1.2.5",
     "@types/http-proxy-agent": "^2.0.1",
     "@types/kerberos": "^1.1.2",
-    "@types/minimist": "^1.2.1",
+    "@types/minimist": "^1.2.5",
     "@types/mocha": "^10.0.10",
     "@types/node": "25.x",
     "@types/sinon": "^21.0.0",

From 13f6e19dba779630f773f321df9933689615b84a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:20:51 +0000
Subject: [PATCH 1657/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /extensions/tunnel-forwarding

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/tunnel-forwarding/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/tunnel-forwarding/package-lock.json b/extensions/tunnel-forwarding/package-lock.json
index 6d67b23ce7a7..32eeb2a098ba 100644
--- a/extensions/tunnel-forwarding/package-lock.json
+++ b/extensions/tunnel-forwarding/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 7ec7a8354293a553bebb984ed9f52559b56a9800 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:20:54 +0000
Subject: [PATCH 1658/1815] Bump @webgpu/types from 0.1.44 to 0.1.69

Bumps [@webgpu/types](https://github.com/gpuweb/types) from 0.1.44 to 0.1.69.
- [Commits](https://github.com/gpuweb/types/compare/v0.1.44...v0.1.69)

---
updated-dependencies:
- dependency-name: "@webgpu/types"
  dependency-version: 0.1.69
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 11 ++++++-----
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 77c9174bea86..604f848b56be 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -86,7 +86,7 @@
         "@vscode/test-web": "^0.0.77",
         "@vscode/v8-heap-parser": "^0.1.0",
         "@vscode/vscode-perf": "^0.0.24",
-        "@webgpu/types": "^0.1.44",
+        "@webgpu/types": "^0.1.69",
         "ansi-colors": "^3.2.3",
         "asar": "^3.0.3",
         "chromium-pickle-js": "^0.2.0",
@@ -4202,10 +4202,11 @@
       }
     },
     "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
+      "version": "0.1.69",
+      "resolved": "https://registry.npmjs.org/@webgpu/types/-/types-0.1.69.tgz",
+      "integrity": "sha512-RPmm6kgRbI8e98zSD3RVACvnuktIja5+yLgDAkTmxLr90BEwdTXRQWNLF3ETTTyH/8mKhznZuN5AveXYFEsMGQ==",
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/@webpack-cli/configtest": {
       "version": "2.1.1",
diff --git a/package.json b/package.json
index 89099807bdac..b2e5f70bf8b7 100644
--- a/package.json
+++ b/package.json
@@ -145,7 +145,7 @@
     "@vscode/test-web": "^0.0.77",
     "@vscode/v8-heap-parser": "^0.1.0",
     "@vscode/vscode-perf": "^0.0.24",
-    "@webgpu/types": "^0.1.44",
+    "@webgpu/types": "^0.1.69",
     "ansi-colors": "^3.2.3",
     "asar": "^3.0.3",
     "chromium-pickle-js": "^0.2.0",

From 12ddf2fecb4d28b20487f0a4fb4be9d2717893b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:20:57 +0000
Subject: [PATCH 1659/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /test/smoke

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/smoke/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/smoke/package-lock.json b/test/smoke/package-lock.json
index 405cc1655900..3b8fded1fc2f 100644
--- a/test/smoke/package-lock.json
+++ b/test/smoke/package-lock.json
@@ -61,9 +61,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From ba53af706a1bcb5bf10c19d4c8ca75732c0c93ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:20:59 +0000
Subject: [PATCH 1660/1815] Bump @types/node in
 /extensions/vscode-test-resolver

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-test-resolver/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-test-resolver/package-lock.json b/extensions/vscode-test-resolver/package-lock.json
index 79756b7427e0..80ee93cd121a 100644
--- a/extensions/vscode-test-resolver/package-lock.json
+++ b/extensions/vscode-test-resolver/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 1dbf24cb5d4b48e09840dac9b3698b93e2d9777d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:21:05 +0000
Subject: [PATCH 1661/1815] Bump debounce from 1.1.0 to 3.0.0

Bumps [debounce](https://github.com/sindresorhus/debounce) from 1.1.0 to 3.0.0.
- [Release notes](https://github.com/sindresorhus/debounce/releases)
- [Commits](https://github.com/sindresorhus/debounce/compare/1.1.0...v3.0.0)

---
updated-dependencies:
- dependency-name: debounce
  dependency-version: 3.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 17 ++++++++++++-----
 package.json      |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 77c9174bea86..0cbff09a4f4b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -94,7 +94,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^6.9.1",
         "cssnano": "^6.0.3",
-        "debounce": "^1.0.0",
+        "debounce": "^3.0.0",
         "deemon": "^1.13.6",
         "electron": "35.7.5",
         "eslint": "^9.39.2",
@@ -6241,10 +6241,17 @@
       }
     },
     "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
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/debounce/-/debounce-3.0.0.tgz",
+      "integrity": "sha512-64byRbF0/AirwbuHqB3/ZpMG9/nckDa6ZA0yd6UnaQNwbbemCOwvz2sL5sjXLHhZHADyiwLm0M5qMhltUUx+TA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/debug": {
       "version": "4.4.3",
diff --git a/package.json b/package.json
index 89099807bdac..1e13c8380f98 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.9.1",
     "cssnano": "^6.0.3",
-    "debounce": "^1.0.0",
+    "debounce": "^3.0.0",
     "deemon": "^1.13.6",
     "electron": "35.7.5",
     "eslint": "^9.39.2",

From c469c7e6057f304b28761028e7c612b929bec35a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:21:06 +0000
Subject: [PATCH 1662/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /test/integration/browser

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/integration/browser/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integration/browser/package-lock.json b/test/integration/browser/package-lock.json
index 45b88753ed49..abdb2a5d293e 100644
--- a/test/integration/browser/package-lock.json
+++ b/test/integration/browser/package-lock.json
@@ -65,9 +65,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 58c649434859c2d5cfe1222e1e2fa8d23ed86b3d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 12:21:21 +0000
Subject: [PATCH 1663/1815] Bump @types/node from 25.0.8 to 25.0.9 in
 /test/automation

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.8 to 25.0.9.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/automation/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
index 4392fd5e7ba0..05f5c47c05a1 100644
--- a/test/automation/package-lock.json
+++ b/test/automation/package-lock.json
@@ -75,9 +75,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.8.tgz",
-      "integrity": "sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg==",
+      "version": "25.0.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
+      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 3371c331d8a806cabdcf262e9431840bfb84ac7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 18:00:37 +0000
Subject: [PATCH 1664/1815] Bump serde_json from 1.0.117 to 1.0.149 in /cli

Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.117 to 1.0.149.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.117...v1.0.149)

---
updated-dependencies:
- dependency-name: serde_json
  dependency-version: 1.0.149
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 14 +++++++++++---
 cli/Cargo.toml |  4 ++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 6243a0aeb787..bccf054ca78e 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -2663,13 +2663,15 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
 dependencies = [
  "itoa",
- "ryu",
+ "memchr",
  "serde",
+ "serde_core",
+ "zmij",
 ]
 
 [[package]]
@@ -4009,6 +4011,12 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "zmij"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd8f3f50b848df28f887acb68e41201b5aea6bc8a8dacc00fb40635ff9a72fea"
+
 [[package]]
 name = "zvariant"
 version = "3.15.2"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 2dafb5bfbebe..b67aa2a9b405 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -24,7 +24,7 @@ regex = "1.12.2"
 lazy_static = "1.5.0"
 sysinfo = { version = "0.37.2", default-features = false }
 serde = { version = "1.0.163", features = ["derive"] }
-serde_json = "1.0.96"
+serde_json = "1.0.149"
 rmp-serde = "1.3.1"
 uuid = { version = "1.16", features = ["serde", "v4"] }
 dirs = "6.0.0"
@@ -57,7 +57,7 @@ tar = "0.4.44"
 
 [build-dependencies]
 serde = { version="1.0.163", features = ["derive"] }
-serde_json = "1.0.96"
+serde_json = "1.0.149"
 
 [target.'cfg(windows)'.dependencies]
 winreg = "0.54.0"

From 771775c9668a21051d0796d4fe013afcf6cc71b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 21:06:10 +0000
Subject: [PATCH 1665/1815] Bump @xterm/addon-image in /remote

Bumps [@xterm/addon-image](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.101 to 0.10.0-beta.103.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-image"
  dependency-version: 0.10.0-beta.103
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index c2565a7f63e8..8a6c7bfb2e76 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -21,7 +21,7 @@
         "@vscode/windows-process-tree": "^0.6.3",
         "@vscode/windows-registry": "^1.1.3",
         "@xterm/addon-clipboard": "^0.3.0-beta.103",
-        "@xterm/addon-image": "^0.10.0-beta.101",
+        "@xterm/addon-image": "^0.10.0-beta.104",
         "@xterm/addon-ligatures": "^0.11.0-beta.103",
         "@xterm/addon-progress": "^0.3.0-beta.103",
         "@xterm/addon-search": "^0.17.0-beta.103",
@@ -562,12 +562,12 @@
       }
     },
     "node_modules/@xterm/addon-image": {
-      "version": "0.10.0-beta.101",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.101.tgz",
-      "integrity": "sha512-Gd8ZpfyzvisG+08+mXynufQHfaWWxGhhtRMSQXV2FyPNa3MNXNrowgjeXhpaRObOOsxSZnAlB8qDW8OHTjzG6A==",
+      "version": "0.10.0-beta.104",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.104.tgz",
+      "integrity": "sha512-rYr5lQUKlnduDIdrJmEDCrv4FpLBj3VFHjP/4RnL6AQOf05EyCF1MEQWvElhBnEyW+4LrWuq/y358/9SlZX4ug==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.101"
+        "@xterm/xterm": "^6.1.0-beta.104"
       }
     },
     "node_modules/@xterm/addon-ligatures": {
diff --git a/remote/package.json b/remote/package.json
index 769b8e4d3ee8..51887e42ab1e 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -16,7 +16,7 @@
     "@vscode/windows-process-tree": "^0.6.3",
     "@vscode/windows-registry": "^1.1.3",
     "@xterm/addon-clipboard": "^0.3.0-beta.103",
-    "@xterm/addon-image": "^0.10.0-beta.101",
+    "@xterm/addon-image": "^0.10.0-beta.104",
     "@xterm/addon-ligatures": "^0.11.0-beta.103",
     "@xterm/addon-progress": "^0.3.0-beta.103",
     "@xterm/addon-search": "^0.17.0-beta.103",

From 31ab97c63c5b4e6310745fd8b4c90e155abab02b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 21:08:39 +0000
Subject: [PATCH 1666/1815] Bump @microsoft/1ds-post-js from 3.2.13 to 4.3.11

Bumps [@microsoft/1ds-post-js](https://github.com/microsoft/ApplicationInsights-JS) from 3.2.13 to 4.3.11.
- [Release notes](https://github.com/microsoft/ApplicationInsights-JS/releases)
- [Changelog](https://github.com/microsoft/ApplicationInsights-JS/blob/main/RELEASES.md)
- [Commits](https://github.com/microsoft/ApplicationInsights-JS/commits)

---
updated-dependencies:
- dependency-name: "@microsoft/1ds-post-js"
  dependency-version: 4.3.11
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 78 ++++++++++++++++++++++++++++++++++++++++++-----
 package.json      |  2 +-
 2 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 465ecbc35dd0..8b48b810b8d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
       "license": "MIT",
       "dependencies": {
         "@microsoft/1ds-core-js": "^3.2.13",
-        "@microsoft/1ds-post-js": "^3.2.13",
+        "@microsoft/1ds-post-js": "^4.3.11",
         "@parcel/watcher": "2.5.4",
         "@types/semver": "^7.7.1",
         "@vscode/deviceid": "^0.1.4",
@@ -1666,13 +1666,62 @@
       }
     },
     "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==",
+      "version": "4.3.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.11.tgz",
+      "integrity": "sha512-V0ZeeALy/Pj8HWgNHDsK+yDeCYnJ9bCgTWhcrna/ZiAT+sGfWs6mDBjAVcG03uP7TDjdWLf8w79lgbXJ3+s3DA==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "3.2.13",
-        "@microsoft/applicationinsights-shims": "^2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.7"
+        "@microsoft/1ds-core-js": "4.3.11",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/1ds-core-js": {
+      "version": "4.3.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.11.tgz",
+      "integrity": "sha512-QyQE/YzFYB+31WEpX9hvDoXZOIXA7308Z5uuL1mSsyDSkNPl24hBWz9O3vZL+/p9shy756eKLI2nFLwwIAhXyw==",
+      "license": "MIT",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.3.11",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-core-js": {
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.11.tgz",
+      "integrity": "sha512-WlBY1sKDNL62T++NifgFCyDuOoNUNrVILfnHubOzgU/od7MFEQYWU8EZyDcBC/+Z8e3TD6jfixurYtWoUC+6Eg==",
+      "license": "MIT",
+      "dependencies": {
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": ">= 1.0.0"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-shims": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "license": "MIT",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/dynamicproto-js": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "license": "MIT",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
@@ -1697,6 +1746,21 @@
       "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.9.tgz",
       "integrity": "sha512-n1VPsljTSkthsAFYdiWfC+DKzK2WwcRp83Y1YAqdX552BstvsDjft9YXppjUzp11BPsapDoO1LDgrDB0XVsfNQ=="
     },
+    "node_modules/@nevware21/ts-async": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.5.tgz",
+      "integrity": "sha512-vwqaL05iJPjLeh5igPi8MeeAu10i+Aq7xko1fbo9F5Si6MnVN5505qaV7AhSdk5MCBJVT/UYMk3kgInNjDb4Ig==",
+      "license": "MIT",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.12.2 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-utils": {
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
+      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
+      "license": "MIT"
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
diff --git a/package.json b/package.json
index 3ea1769c6f56..1f5557bcc24c 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
   },
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.13",
-    "@microsoft/1ds-post-js": "^3.2.13",
+    "@microsoft/1ds-post-js": "^4.3.11",
     "@parcel/watcher": "2.5.4",
     "@types/semver": "^7.7.1",
     "@vscode/deviceid": "^0.1.4",

From 19e330078b2c146fc4369e06bab0c228ac3e9004 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 21:15:11 +0000
Subject: [PATCH 1667/1815] Bump copy-webpack-plugin from 11.0.0 to 13.0.1

Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin) from 11.0.0 to 13.0.1.
- [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases)
- [Changelog](https://github.com/webpack/copy-webpack-plugin/blob/main/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/copy-webpack-plugin/compare/v11.0.0...v13.0.1)

---
updated-dependencies:
- dependency-name: copy-webpack-plugin
  dependency-version: 13.0.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 135 +++++++++++++++++++---------------------------
 package.json      |   2 +-
 2 files changed, 55 insertions(+), 82 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e53da4d86859..c725144529e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -91,7 +91,7 @@
         "asar": "^3.0.3",
         "chromium-pickle-js": "^0.2.0",
         "cookie": "^1.1.1",
-        "copy-webpack-plugin": "^11.0.0",
+        "copy-webpack-plugin": "^13.0.1",
         "css-loader": "^6.9.1",
         "cssnano": "^6.0.3",
         "debounce": "^3.0.0",
@@ -4474,6 +4474,7 @@
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ajv": "^8.0.0"
       },
@@ -4487,15 +4488,16 @@
       }
     },
     "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==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
         "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "require-from-string": "^2.0.2"
       },
       "funding": {
         "type": "github",
@@ -4506,7 +4508,8 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/ajv-keywords": {
       "version": "3.5.2",
@@ -5892,20 +5895,20 @@
       }
     },
     "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==",
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-13.0.1.tgz",
+      "integrity": "sha512-J+YV3WfhY6W/Xf9h+J1znYuqTye2xkBUIGyTPWuBAT27qajBa5mR4f8WBmfDY3YjRftT2kqZZiLi1qf0H+UOFw==",
       "dev": true,
+      "license": "MIT",
       "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"
+        "schema-utils": "^4.2.0",
+        "serialize-javascript": "^6.0.2",
+        "tinyglobby": "^0.2.12"
       },
       "engines": {
-        "node": ">= 14.15.0"
+        "node": ">= 18.12.0"
       },
       "funding": {
         "type": "opencollective",
@@ -5927,37 +5930,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/globby": {
-      "version": "13.1.3",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
-      "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
-      "dev": true,
-      "dependencies": {
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.11",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -6532,18 +6504,6 @@
         "node": ">=0.3.1"
       }
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/dom-serializer": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
@@ -7524,6 +7484,23 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
       "dev": true
     },
+    "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==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
     "node_modules/fastest-levenshtein": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
@@ -13185,15 +13162,6 @@
         "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": ">=8"
-      }
-    },
     "node_modules/pause-stream": {
       "version": "0.0.11",
       "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
@@ -14556,6 +14524,7 @@
       "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,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14858,18 +14827,19 @@
       "dev": true
     },
     "node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
+      "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
+        "ajv": "^8.9.0",
         "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 10.13.0"
       },
       "funding": {
         "type": "opencollective",
@@ -14877,15 +14847,16 @@
       }
     },
     "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==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
         "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "require-from-string": "^2.0.2"
       },
       "funding": {
         "type": "github",
@@ -14897,6 +14868,7 @@
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
       "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3"
       },
@@ -14908,7 +14880,8 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/semver": {
       "version": "7.7.3",
diff --git a/package.json b/package.json
index ed1e35c2ac5f..f9b686405902 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,7 @@
     "asar": "^3.0.3",
     "chromium-pickle-js": "^0.2.0",
     "cookie": "^1.1.1",
-    "copy-webpack-plugin": "^11.0.0",
+    "copy-webpack-plugin": "^13.0.1",
     "css-loader": "^6.9.1",
     "cssnano": "^6.0.3",
     "debounce": "^3.0.0",

From 67f062b3d268ff1643645502608996cd9e497ab5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Jan 2026 21:18:53 +0000
Subject: [PATCH 1668/1815] Bump tar in /build/npm/gyp in the npm_and_yarn
 group across 1 directory

Bumps the npm_and_yarn group with 1 update in the /build/npm/gyp directory: [tar](https://github.com/isaacs/node-tar).


Updates `tar` from 7.5.2 to 7.5.3
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-tar/compare/v7.5.2...v7.5.3)

---
updated-dependencies:
- dependency-name: tar
  dependency-version: 7.5.3
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/npm/gyp/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/npm/gyp/package-lock.json b/build/npm/gyp/package-lock.json
index af64f402f659..655d8e58b6c6 100644
--- a/build/npm/gyp/package-lock.json
+++ b/build/npm/gyp/package-lock.json
@@ -1054,9 +1054,9 @@
       }
     },
     "node_modules/tar": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.2.tgz",
-      "integrity": "sha512-7NyxrTE4Anh8km8iEy7o0QYPs+0JKBTj5ZaqHg6B39erLg0qYXN3BijtShwbsNSvQ+LN75+KV+C4QR/f6Gwnpg==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.3.tgz",
+      "integrity": "sha512-ENg5JUHUm2rDD7IvKNFGzyElLXNjachNLp6RaGf4+JOgxXHkqA+gq81ZAMCUmtMtqBsoU62lcp6S27g1LCYGGQ==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {

From 13059734d7a925cbbc60d7940d2844b24a43840a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 18 Jan 2026 05:01:34 +0000
Subject: [PATCH 1669/1815] Bump tar-fs in /build in the npm_and_yarn group
 across 1 directory

Bumps the npm_and_yarn group with 1 update in the /build directory: [tar-fs](https://github.com/mafintosh/tar-fs).


Updates `tar-fs` from 2.1.1 to 2.1.4
- [Commits](https://github.com/mafintosh/tar-fs/compare/v2.1.1...v2.1.4)

---
updated-dependencies:
- dependency-name: tar-fs
  dependency-version: 2.1.4
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 208 +++++++++++++++++++++++-----------------
 1 file changed, 120 insertions(+), 88 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 8afc9b5c04d1..32a669368bea 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -3048,6 +3048,7 @@
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
       "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
       "dev": true,
+      "optional": true,
       "dependencies": {
         "mimic-response": "^3.1.0"
       },
@@ -3063,6 +3064,7 @@
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
       "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
       "dev": true,
+      "optional": true,
       "engines": {
         "node": ">=10"
       },
@@ -3731,17 +3733,10 @@
       "integrity": "sha512-Pqq5NnT78ehvUnAk/We/Jr22vSvanRlFTpAmQ88xBY/M1TlHe+P0ILuEyXS595ysdGfaj22634LBkGMA2GTcpA==",
       "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==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+    "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==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3772,6 +3767,21 @@
       "dev": true,
       "optional": true
     },
+    "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/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -4266,6 +4276,29 @@
       ],
       "optional": true
     },
+    "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/index-to-position": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-1.2.0.tgz",
+      "integrity": "sha512-Yg7+ztRkqslMAS2iFaU+Oa4KTSidr63OsFGlOrJoW981kIYO3CGCS3wA95P1mUi/IVSJkn0D479KTJpVpvFNuw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -4557,6 +4590,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "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/jsonwebtoken": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
@@ -4872,6 +4918,16 @@
       "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
+    "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/mkdirp-classic": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
@@ -4926,42 +4982,38 @@
         "node": ">=20"
       }
     },
-    "node_modules/node-sarif-builder/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==",
+    "node_modules/node-addon-api": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz",
+      "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14.14"
-      }
+      "optional": true
     },
-    "node_modules/node-sarif-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,
+    "node_modules/node-gyp-build": {
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
+      "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
+      "devOptional": true,
       "license": "MIT",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
       }
     },
-    "node_modules/node-sarif-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==",
+    "node_modules/node-sarif-builder": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/node-sarif-builder/-/node-sarif-builder-3.4.0.tgz",
+      "integrity": "sha512-tGnJW6OKRii9u/b2WiUViTJS+h7Apxx17qsMUjsUeNDiMMX5ZFf8F8Fcz7PAQ6omvOxHZtvDTmOYKJQwmfpjeg==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@types/sarif": "^2.1.7",
+        "fs-extra": "^11.1.1"
+      },
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">=20"
       }
     },
     "node_modules/normalize-package-data": {
@@ -4999,18 +5051,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/node-gyp-build": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
-      "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
-      "devOptional": true,
-      "license": "MIT",
-      "bin": {
-        "node-gyp-build": "bin.js",
-        "node-gyp-build-optional": "optional.js",
-        "node-gyp-build-test": "build-test.js"
-      }
-    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -6454,10 +6494,11 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz",
+      "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "chownr": "^1.1.1",
@@ -6783,6 +6824,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "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/url-join": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
@@ -6917,32 +6968,6 @@
         "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/vscode-universal-bundler/node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
-    "node_modules/vscode-universal-bundler/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
     "node_modules/vscode-universal-bundler/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
@@ -6958,15 +6983,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/vscode-universal-bundler/node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -7129,6 +7145,22 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true
     },
+    "node_modules/wsl-utils": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/wsl-utils/-/wsl-utils-0.1.0.tgz",
+      "integrity": "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-wsl": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/xml2js": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",

From 90eebed8eab36b136aa265446356fc0172436093 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 13:57:36 +0000
Subject: [PATCH 1670/1815] Bump actions/setup-node from 6.1.0 to 6.2.0

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/395ad3262231945c25e8478fd5baf05154b1d79f...6044e13b5dc448c55e2357c09f80417699197238)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-version: 6.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/telemetry.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml
index ecc99772b799..64d557f4a042 100644
--- a/.github/workflows/telemetry.yml
+++ b/.github/workflows/telemetry.yml
@@ -19,7 +19,7 @@ jobs:
 
       - uses: 'actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8' # v6.0.1
 
-      - uses: 'actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f' # v6.1.0
+      - uses: 'actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238' # v6.2.0
         with:
           node-version: 'lts/*'
 

From d6a18063719a913c866ca8d1acd39d6bb12f73dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 13:59:31 +0000
Subject: [PATCH 1671/1815] Bump tree-sitter from 0.22.4 to 0.25.0 in /build

Bumps [tree-sitter](https://github.com/tree-sitter/node-tree-sitter) from 0.22.4 to 0.25.0.
- [Release notes](https://github.com/tree-sitter/node-tree-sitter/releases)
- [Commits](https://github.com/tree-sitter/node-tree-sitter/compare/v0.22.4...v0.25.0)

---
updated-dependencies:
- dependency-name: tree-sitter
  dependency-version: 0.25.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 8 ++++----
 build/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 32a669368bea..e1fa6d6b4102 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -57,7 +57,7 @@
         "source-map": "0.7.6",
         "ternary-stream": "^3.0.0",
         "through2": "^4.0.2",
-        "tree-sitter": "^0.22.4",
+        "tree-sitter": "^0.25.0",
         "vscode-universal-bundler": "^0.1.3",
         "workerpool": "^10.0.1",
         "yauzl": "^3.2.0"
@@ -6653,9 +6653,9 @@
       }
     },
     "node_modules/tree-sitter": {
-      "version": "0.22.4",
-      "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.22.4.tgz",
-      "integrity": "sha512-usbHZP9/oxNsUY65MQUsduGRqDHQOou1cagUSwjhoSYAmSahjQDAVsh9s+SlZkn8X8+O1FULRGwHu7AFP3kjzg==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.25.0.tgz",
+      "integrity": "sha512-PGZZzFW63eElZJDe/b/R/LbsjDDYJa5UEjLZJB59RQsMX+fo0j54fqBPn1MGKav/QNa0JR0zBiVaikYDWCj5KQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
diff --git a/build/package.json b/build/package.json
index 8746e3772b6b..90f193e4b5ae 100644
--- a/build/package.json
+++ b/build/package.json
@@ -51,7 +51,7 @@
     "source-map": "0.7.6",
     "ternary-stream": "^3.0.0",
     "through2": "^4.0.2",
-    "tree-sitter": "^0.22.4",
+    "tree-sitter": "^0.25.0",
     "vscode-universal-bundler": "^0.1.3",
     "workerpool": "^10.0.1",
     "yauzl": "^3.2.0"

From ba420a3001f87faaded4bf0095a556dfd652e456 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 13:59:39 +0000
Subject: [PATCH 1672/1815] Bump winreg from 0.54.0 to 0.55.0 in /cli

Bumps [winreg](https://github.com/gentoo90/winreg-rs) from 0.54.0 to 0.55.0.
- [Release notes](https://github.com/gentoo90/winreg-rs/releases)
- [Changelog](https://github.com/gentoo90/winreg-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/gentoo90/winreg-rs/compare/v0.54.0...v0.55.0)

---
updated-dependencies:
- dependency-name: winreg
  dependency-version: 0.55.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 75 ++++++++++++++++++++++++++++----------------------
 cli/Cargo.toml |  2 +-
 2 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index c9241aa91202..72b673647da4 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -467,7 +467,7 @@ dependencies = [
  "url",
  "uuid",
  "winapi",
- "winreg 0.54.0",
+ "winreg 0.55.0",
  "zbus 4.4.0",
  "zip",
 ]
@@ -1996,7 +1996,7 @@ dependencies = [
  "libc",
  "redox_syscall 0.5.1",
  "smallvec",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3466,7 +3466,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3490,7 +3490,16 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3528,18 +3537,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
- "windows_i686_gnullvm 0.52.5",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -3567,9 +3576,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
@@ -3585,9 +3594,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -3603,9 +3612,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -3615,9 +3624,9 @@ checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_gnullvm"
@@ -3633,9 +3642,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -3651,9 +3660,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -3669,9 +3678,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -3687,9 +3696,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -3746,12 +3755,12 @@ dependencies = [
 
 [[package]]
 name = "winreg"
-version = "0.54.0"
+version = "0.55.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a69204ea7f8a24058ba4db40fe57c77eb650a6dd82815355be8da442f21165ae"
+checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97"
 dependencies = [
  "cfg-if",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index fee527ac86ad..7afb3a6de300 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -60,7 +60,7 @@ serde = { version="1.0.163", features = ["derive"] }
 serde_json = "1.0.149"
 
 [target.'cfg(windows)'.dependencies]
-winreg = "0.54.0"
+winreg = "0.55.0"
 winapi = "0.3.9"
 
 [target.'cfg(target_os = "macos")'.dependencies]

From 28ac221939a06ada781088f07569493854fc47ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 13:59:42 +0000
Subject: [PATCH 1673/1815] Bump @azure/msal-node from 3.8.5 to 5.0.2 in /build

Bumps [@azure/msal-node](https://github.com/AzureAD/microsoft-authentication-library-for-js) from 3.8.5 to 5.0.2.
- [Release notes](https://github.com/AzureAD/microsoft-authentication-library-for-js/releases)
- [Commits](https://github.com/AzureAD/microsoft-authentication-library-for-js/commits)

---
updated-dependencies:
- dependency-name: "@azure/msal-node"
  dependency-version: 5.0.2
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 43 ++++++++++++++++++++++++++++++++---------
 build/package.json      |  2 +-
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 32a669368bea..d53b4ecbf8a0 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -12,7 +12,7 @@
         "@azure/core-auth": "^1.10.1",
         "@azure/cosmos": "^4",
         "@azure/identity": "^4.13.0",
-        "@azure/msal-node": "^3.8.5",
+        "@azure/msal-node": "^5.0.2",
         "@azure/storage-blob": "^12.29.1",
         "@electron/get": "^4.0.2",
         "@types/ansi-colors": "^3.2.6",
@@ -300,6 +300,31 @@
         "node": ">=20.0.0"
       }
     },
+    "node_modules/@azure/identity/node_modules/@azure/msal-common": {
+      "version": "15.14.1",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.14.1.tgz",
+      "integrity": "sha512-IkzF7Pywt6QKTS0kwdCv/XV8x8JXknZDvSjj/IccooxnP373T5jaadO3FnOrbWo3S0UqkfIDyZNTaQ/oAgRdXw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@azure/identity/node_modules/@azure/msal-node": {
+      "version": "3.8.6",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.6.tgz",
+      "integrity": "sha512-XTmhdItcBckcVVTy65Xp+42xG4LX5GK+9AqAsXPXk4IqUNv+LyQo5TMwNjuFYBfAB2GTG9iSQGk+QLc03vhf3w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@azure/msal-common": "15.14.1",
+        "jsonwebtoken": "^9.0.0",
+        "uuid": "^8.3.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
     "node_modules/@azure/keyvault-common": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@azure/keyvault-common/-/keyvault-common-2.0.0.tgz",
@@ -382,24 +407,24 @@
       }
     },
     "node_modules/@azure/msal-node": {
-      "version": "3.8.5",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.5.tgz",
-      "integrity": "sha512-xRSAfH27bIp3vtjtTFyyhdm18lq2pzdoNG7DA2IH1fXzJ30mymryv0wK/Gph+x4y0Rx+5mMLU5JTPiCeQ75Aug==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-5.0.2.tgz",
+      "integrity": "sha512-3tHeJghckgpTX98TowJoXOjKGuds0L+FKfeHJtoZFl2xvwE6RF65shZJzMQ5EQZWXzh3sE1i9gE+m3aRMachjA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@azure/msal-common": "15.14.0",
+        "@azure/msal-common": "16.0.2",
         "jsonwebtoken": "^9.0.0",
         "uuid": "^8.3.0"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=20"
       }
     },
     "node_modules/@azure/msal-node/node_modules/@azure/msal-common": {
-      "version": "15.14.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.14.0.tgz",
-      "integrity": "sha512-aNuorSQxzsJQ6IUjJtN+rCInLfLOo3VpNYiXaHBK9XL8Ieg1y4F5ZFjI19GErbVvwqvwGNyJ9AZ/sAxOWhoSUw==",
+      "version": "16.0.2",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-16.0.2.tgz",
+      "integrity": "sha512-ZJ/UR7lyqIntURrIJCyvScwJFanM9QhJYcJCheB21jZofGKpP9QxWgvADANo7UkresHKzV+6YwoeZYP7P7HvUg==",
       "dev": true,
       "license": "MIT",
       "engines": {
diff --git a/build/package.json b/build/package.json
index 8746e3772b6b..644fa7138a3b 100644
--- a/build/package.json
+++ b/build/package.json
@@ -6,7 +6,7 @@
     "@azure/core-auth": "^1.10.1",
     "@azure/cosmos": "^4",
     "@azure/identity": "^4.13.0",
-    "@azure/msal-node": "^3.8.5",
+    "@azure/msal-node": "^5.0.2",
     "@azure/storage-blob": "^12.29.1",
     "@electron/get": "^4.0.2",
     "@types/ansi-colors": "^3.2.6",

From 01778491a1eb0c83a00d4bd315873234682e6470 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 13:59:57 +0000
Subject: [PATCH 1674/1815] Bump thiserror from 2.0.17 to 2.0.18 in /cli

Bumps [thiserror](https://github.com/dtolnay/thiserror) from 2.0.17 to 2.0.18.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/2.0.17...2.0.18)

---
updated-dependencies:
- dependency-name: thiserror
  dependency-version: 2.0.18
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 16 ++++++++--------
 cli/Cargo.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index c9241aa91202..6305b3e45323 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -460,7 +460,7 @@ dependencies = [
  "sysinfo",
  "tar",
  "tempfile",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-util",
  "tunnels",
@@ -2295,7 +2295,7 @@ checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
 dependencies = [
  "getrandom 0.2.15",
  "libredox",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -2925,11 +2925,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.17"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
 dependencies = [
- "thiserror-impl 2.0.17",
+ "thiserror-impl 2.0.18",
 ]
 
 [[package]]
@@ -2945,9 +2945,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.17"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4007,7 +4007,7 @@ dependencies = [
  "flate2",
  "indexmap 2.13.0",
  "memchr",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "time",
 ]
 
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index fee527ac86ad..e51e12c6db03 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -48,7 +48,7 @@ const_format = "0.2.35"
 sha2 = "0.10.9"
 base64 = "0.22.1"
 shell-escape = "0.1.5"
-thiserror = "2.0.17"
+thiserror = "2.0.18"
 cfg-if = "1.0.4"
 pin-project = "1.1.10"
 console = "0.16.2"

From 29ab51070ba6a670989f6d0a85bfaf115bc9f6a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:02:03 +0000
Subject: [PATCH 1675/1815] Bump @azure/msal-node-extensions in
 /extensions/microsoft-authentication

Bumps [@azure/msal-node-extensions](https://github.com/AzureAD/microsoft-authentication-library-for-js) from 1.5.27 to 5.0.2.
- [Release notes](https://github.com/AzureAD/microsoft-authentication-library-for-js/releases)
- [Commits](https://github.com/AzureAD/microsoft-authentication-library-for-js/commits)

---
updated-dependencies:
- dependency-name: "@azure/msal-node-extensions"
  dependency-version: 5.0.2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 21 +++++++++++++------
 .../microsoft-authentication/package.json     |  2 +-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index cc9891e7e775..9f61c6084567 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@azure/ms-rest-azure-env": "^2.0.0",
         "@azure/msal-node": "^3.8.5",
-        "@azure/msal-node-extensions": "^1.5.27",
+        "@azure/msal-node-extensions": "^5.0.2",
         "@vscode/extension-telemetry": "^1.2.0",
         "keytar": "file:./packageMocks/keytar",
         "vscode-tas-client": "^0.1.84"
@@ -56,18 +56,27 @@
       }
     },
     "node_modules/@azure/msal-node-extensions": {
-      "version": "1.5.27",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node-extensions/-/msal-node-extensions-1.5.27.tgz",
-      "integrity": "sha512-rO6hlq7//frGRiBxL1sHLINIRpvjZ3OhHdJKtYEOQB9lAsFiPHsBmUYkwtjyqMbgKpoYq/36y0ic8ZfVuoGl3A==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node-extensions/-/msal-node-extensions-5.0.2.tgz",
+      "integrity": "sha512-695boK9IFmHrYPviFgj5DaeJ65iUGjzHiSIAgzyIRfwTO8k3J4KrF+xbFy2uC9JZ2U8HHEobi7UGloc768HhUQ==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@azure/msal-common": "15.14.0",
+        "@azure/msal-common": "16.0.2",
         "@azure/msal-node-runtime": "^0.20.0",
         "keytar": "^7.8.0"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=20"
+      }
+    },
+    "node_modules/@azure/msal-node-extensions/node_modules/@azure/msal-common": {
+      "version": "16.0.2",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-16.0.2.tgz",
+      "integrity": "sha512-ZJ/UR7lyqIntURrIJCyvScwJFanM9QhJYcJCheB21jZofGKpP9QxWgvADANo7UkresHKzV+6YwoeZYP7P7HvUg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
     "node_modules/@azure/msal-node-runtime": {
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index b4f630f77263..51f7908233ac 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -140,7 +140,7 @@
   "dependencies": {
     "@azure/ms-rest-azure-env": "^2.0.0",
     "@azure/msal-node": "^3.8.5",
-    "@azure/msal-node-extensions": "^1.5.27",
+    "@azure/msal-node-extensions": "^5.0.2",
     "@vscode/extension-telemetry": "^1.2.0",
     "keytar": "file:./packageMocks/keytar",
     "vscode-tas-client": "^0.1.84"

From 79df62c370c3ceb6d70844076a4fcea807ef8ac3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:03:15 +0000
Subject: [PATCH 1676/1815] Bump open from 8.4.2 to 11.0.0

Bumps [open](https://github.com/sindresorhus/open) from 8.4.2 to 11.0.0.
- [Release notes](https://github.com/sindresorhus/open/releases)
- [Commits](https://github.com/sindresorhus/open/compare/v8.4.2...v11.0.0)

---
updated-dependencies:
- dependency-name: open
  dependency-version: 11.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 586 +++++++++++++++++++++-------------------------
 package.json      |   2 +-
 2 files changed, 274 insertions(+), 314 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 01d03daf195c..115e809692eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -47,7 +47,7 @@
         "native-keymap": "^3.3.5",
         "native-watchdog": "^1.4.1",
         "node-pty": "1.1.0-beta31",
-        "open": "^8.4.2",
+        "open": "^11.0.0",
         "tas-client-umd": "0.2.0",
         "v8-inspect-profiler": "^0.1.1",
         "vscode-oniguruma": "2.0.1",
@@ -1669,81 +1669,35 @@
       }
     },
     "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==",
+      "version": "3.2.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.18.tgz",
+      "integrity": "sha512-ytlFv3dfb8OGqvbZP8tSIlNvn3QNYxdsF0k6ikRMWSr6CmBxBi1sliaxc2Q5KuYOuaeWkd8WRm25Rx/UtHcyMg==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "2.8.15",
+        "@microsoft/applicationinsights-core-js": "2.8.18",
         "@microsoft/applicationinsights-shims": "^2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.7"
+        "@microsoft/dynamicproto-js": "^1.1.11"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.11.tgz",
-      "integrity": "sha512-V0ZeeALy/Pj8HWgNHDsK+yDeCYnJ9bCgTWhcrna/ZiAT+sGfWs6mDBjAVcG03uP7TDjdWLf8w79lgbXJ3+s3DA==",
-      "license": "MIT",
-      "dependencies": {
-        "@microsoft/1ds-core-js": "4.3.11",
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.11.tgz",
-      "integrity": "sha512-QyQE/YzFYB+31WEpX9hvDoXZOIXA7308Z5uuL1mSsyDSkNPl24hBWz9O3vZL+/p9shy756eKLI2nFLwwIAhXyw==",
-      "license": "MIT",
-      "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.11",
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.11.tgz",
-      "integrity": "sha512-WlBY1sKDNL62T++NifgFCyDuOoNUNrVILfnHubOzgU/od7MFEQYWU8EZyDcBC/+Z8e3TD6jfixurYtWoUC+6Eg==",
-      "license": "MIT",
-      "dependencies": {
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
-      },
-      "peerDependencies": {
-        "tslib": ">= 1.0.0"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-shims": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
-      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
-      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "version": "3.2.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-3.2.18.tgz",
+      "integrity": "sha512-Tzjcja4SMyws3UP58kD2edFPNb7BJtx5uCgwf/PWXwDyfbUY1/crsTQdEyR98wy/vorvLDZdQlcL++VMChfYnQ==",
       "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
+        "@microsoft/1ds-core-js": "3.2.18",
+        "@microsoft/applicationinsights-shims": "^2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.11"
       }
     },
     "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==",
+      "version": "2.8.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.18.tgz",
+      "integrity": "sha512-yPHRZFLpnEO0uSgFPM1BLMRRwjoten9YBbn4pJRbCT4PigLnj748knmWsMwXIdcehtkRTYz78kPYa/LWP7nvmA==",
+      "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.9"
+        "@microsoft/dynamicproto-js": "^1.1.11"
       },
       "peerDependencies": {
         "tslib": "*"
@@ -1755,23 +1709,9 @@
       "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/@nevware21/ts-async": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.5.tgz",
-      "integrity": "sha512-vwqaL05iJPjLeh5igPi8MeeAu10i+Aq7xko1fbo9F5Si6MnVN5505qaV7AhSdk5MCBJVT/UYMk3kgInNjDb4Ig==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.12.2 < 2.x"
-      }
-    },
-    "node_modules/@nevware21/ts-utils": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
-      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.11.tgz",
+      "integrity": "sha512-gNw9z9LbqLV+WadZ6/MMrWwO3e0LuoUH1wve/1iPsBNbgqeVCiB0EZFNNj2lysxS2gkqoF9hmyVaG3MoM1BkxA==",
       "license": "MIT"
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -1992,16 +1932,16 @@
       }
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.4.tgz",
-      "integrity": "sha512-WYa2tUVV5HiArWPB3ydlOc4R2ivq0IDrlqhMi3l7mVsFEXNcTfxYFPIHXHXIh/ca/y/V5N4E1zecyxdIBjYnkQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
+      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "detect-libc": "^2.0.3",
+        "detect-libc": "^1.0.3",
         "is-glob": "^4.0.3",
-        "node-addon-api": "^7.0.0",
-        "picomatch": "^4.0.3"
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
       },
       "engines": {
         "node": ">= 10.0.0"
@@ -2011,25 +1951,25 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.4",
-        "@parcel/watcher-darwin-arm64": "2.5.4",
-        "@parcel/watcher-darwin-x64": "2.5.4",
-        "@parcel/watcher-freebsd-x64": "2.5.4",
-        "@parcel/watcher-linux-arm-glibc": "2.5.4",
-        "@parcel/watcher-linux-arm-musl": "2.5.4",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.4",
-        "@parcel/watcher-linux-arm64-musl": "2.5.4",
-        "@parcel/watcher-linux-x64-glibc": "2.5.4",
-        "@parcel/watcher-linux-x64-musl": "2.5.4",
-        "@parcel/watcher-win32-arm64": "2.5.4",
-        "@parcel/watcher-win32-ia32": "2.5.4",
-        "@parcel/watcher-win32-x64": "2.5.4"
+        "@parcel/watcher-android-arm64": "2.5.1",
+        "@parcel/watcher-darwin-arm64": "2.5.1",
+        "@parcel/watcher-darwin-x64": "2.5.1",
+        "@parcel/watcher-freebsd-x64": "2.5.1",
+        "@parcel/watcher-linux-arm-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm-musl": "2.5.1",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm64-musl": "2.5.1",
+        "@parcel/watcher-linux-x64-glibc": "2.5.1",
+        "@parcel/watcher-linux-x64-musl": "2.5.1",
+        "@parcel/watcher-win32-arm64": "2.5.1",
+        "@parcel/watcher-win32-ia32": "2.5.1",
+        "@parcel/watcher-win32-x64": "2.5.1"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.4.tgz",
-      "integrity": "sha512-hoh0vx4v+b3BNI7Cjoy2/B0ARqcwVNrzN/n7DLq9ZB4I3lrsvhrkCViJyfTj/Qi5xM9YFiH4AmHGK6pgH1ss7g==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
+      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
       "cpu": [
         "arm64"
       ],
@@ -2047,9 +1987,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.4.tgz",
-      "integrity": "sha512-kphKy377pZiWpAOyTgQYPE5/XEKVMaj6VUjKT5VkNyUJlr2qZAn8gIc7CPzx+kbhvqHDT9d7EqdOqRXT6vk0zw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
+      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
       "cpu": [
         "arm64"
       ],
@@ -2067,9 +2007,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.4.tgz",
-      "integrity": "sha512-UKaQFhCtNJW1A9YyVz3Ju7ydf6QgrpNQfRZ35wNKUhTQ3dxJ/3MULXN5JN/0Z80V/KUBDGa3RZaKq1EQT2a2gg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
+      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
       "cpu": [
         "x64"
       ],
@@ -2087,9 +2027,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.4.tgz",
-      "integrity": "sha512-Dib0Wv3Ow/m2/ttvLdeI2DBXloO7t3Z0oCp4bAb2aqyqOjKPPGrg10pMJJAQ7tt8P4V2rwYwywkDhUia/FgS+Q==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
+      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
       "cpu": [
         "x64"
       ],
@@ -2107,9 +2047,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.4.tgz",
-      "integrity": "sha512-I5Vb769pdf7Q7Sf4KNy8Pogl/URRCKu9ImMmnVKYayhynuyGYMzuI4UOWnegQNa2sGpsPSbzDsqbHNMyeyPCgw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
+      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
       "cpu": [
         "arm"
       ],
@@ -2127,9 +2067,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.4.tgz",
-      "integrity": "sha512-kGO8RPvVrcAotV4QcWh8kZuHr9bXi9a3bSZw7kFarYR0+fGliU7hd/zevhjw8fnvIKG3J9EO5G6sXNGCSNMYPQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
+      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
       "cpu": [
         "arm"
       ],
@@ -2147,9 +2087,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.4.tgz",
-      "integrity": "sha512-KU75aooXhqGFY2W5/p8DYYHt4hrjHZod8AhcGAmhzPn/etTa+lYCDB2b1sJy3sWJ8ahFVTdy+EbqSBvMx3iFlw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
+      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
       "cpu": [
         "arm64"
       ],
@@ -2167,9 +2107,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.4.tgz",
-      "integrity": "sha512-Qx8uNiIekVutnzbVdrgSanM+cbpDD3boB1f8vMtnuG5Zau4/bdDbXyKwIn0ToqFhIuob73bcxV9NwRm04/hzHQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
+      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
       "cpu": [
         "arm64"
       ],
@@ -2187,9 +2127,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.4.tgz",
-      "integrity": "sha512-UYBQvhYmgAv61LNUn24qGQdjtycFBKSK3EXr72DbJqX9aaLbtCOO8+1SkKhD/GNiJ97ExgcHBrukcYhVjrnogA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
+      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
       "cpu": [
         "x64"
       ],
@@ -2207,9 +2147,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.4.tgz",
-      "integrity": "sha512-YoRWCVgxv8akZrMhdyVi6/TyoeeMkQ0PGGOf2E4omODrvd1wxniXP+DBynKoHryStks7l+fDAMUBRzqNHrVOpg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
+      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
       "cpu": [
         "x64"
       ],
@@ -2227,9 +2167,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.4.tgz",
-      "integrity": "sha512-iby+D/YNXWkiQNYcIhg8P5hSjzXEHaQrk2SLrWOUD7VeC4Ohu0WQvmV+HDJokZVJ2UjJ4AGXW3bx7Lls9Ln4TQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
+      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
       "cpu": [
         "arm64"
       ],
@@ -2247,9 +2187,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.4.tgz",
-      "integrity": "sha512-vQN+KIReG0a2ZDpVv8cgddlf67J8hk1WfZMMP7sMeZmJRSmEax5xNDNWKdgqSe2brOKTQQAs3aCCUal2qBHAyg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
+      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
       "cpu": [
         "ia32"
       ],
@@ -2267,9 +2207,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.4.tgz",
-      "integrity": "sha512-3A6efb6BOKwyw7yk9ro2vus2YTt2nvcd56AuzxdMiVOxL9umDyN5PKkKfZ/gZ9row41SjVmTVQNWQhaRRGpOKw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
+      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
       "cpu": [
         "x64"
       ],
@@ -2286,16 +2226,16 @@
         "url": "https://opencollective.com/parcel"
       }
     },
-    "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": ">=12"
+    "node_modules/@parcel/watcher/node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "license": "Apache-2.0",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+      "engines": {
+        "node": ">=0.10"
       }
     },
     "node_modules/@pkgjs/parseargs": {
@@ -3514,9 +3454,9 @@
       }
     },
     "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==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
+      "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==",
       "license": "MIT"
     },
     "node_modules/@vscode/l10n-dev": {
@@ -4367,12 +4307,6 @@
         "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
-    "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/@xterm/addon-progress": {
       "version": "0.2.0-beta.5",
       "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.5.tgz",
@@ -5171,7 +5105,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dev": true,
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -5273,6 +5206,21 @@
       "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": {
+        "run-applescript": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/byte-counter": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/byte-counter/-/byte-counter-0.1.0.tgz",
@@ -6429,6 +6377,34 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/default-browser": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.4.0.tgz",
+      "integrity": "sha512-XDuvSq38Hr1MdN47EDvYtx3U0MTqpCEn+F6ft8z2vYDzMrvQhVp0ui9oQdqW3MvK3vqUETglt1tVGgjLuJ5izg==",
+      "license": "MIT",
+      "dependencies": {
+        "bundle-name": "^4.1.0",
+        "default-browser-id": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-browser-id": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.1.tgz",
+      "integrity": "sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/defer-to-connect": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
@@ -6456,11 +6432,15 @@
       }
     },
     "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "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"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/define-properties": {
@@ -7400,130 +7380,6 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI= sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "deprecated": "Please upgrade to v0.1.7",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "deprecated": "Please upgrade to v0.1.5",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/expand-template": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
@@ -7797,7 +7653,6 @@
       "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"
       },
@@ -8066,11 +7921,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/fs-minipass/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/fs-mkdirp-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
@@ -10596,6 +10446,7 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
       "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
       "bin": {
         "is-docker": "cli.js"
       },
@@ -10679,6 +10530,51 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-in-ssh": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-in-ssh/-/is-in-ssh-1.0.0.tgz",
+      "integrity": "sha512-jYa6Q9rH90kR1vKB6NM7qqd1mge3Fx4Dhw5TVlK1MUBqhEOuCagrEHMevNuCcbECmXZ0ThXkRm+Ymr51HwEPAw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "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": {
+        "is-docker": "^3.0.0"
+      },
+      "bin": {
+        "is-inside-container": "cli.js"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-inside-container/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": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-interactive": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz",
@@ -10716,7 +10612,6 @@
       "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"
       }
@@ -10872,6 +10767,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
       "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
       "dependencies": {
         "is-docker": "^2.0.0"
       },
@@ -11761,6 +11657,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/lru-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
@@ -11964,7 +11872,6 @@
       "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",
@@ -12078,11 +11985,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/minizlib/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/mkdirp": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -12919,16 +12821,20 @@
       }
     },
     "node_modules/open": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-11.0.0.tgz",
+      "integrity": "sha512-smsWv2LzFjP03xmvFoJ331ss6h+jixfA4UUV/Bsiyuu4YJPfN+FIQGOIiv4w9/+MoHkfkJ22UIaQWRVFRfH6Vw==",
+      "license": "MIT",
       "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
+        "default-browser": "^5.4.0",
+        "define-lazy-prop": "^3.0.0",
+        "is-in-ssh": "^1.0.0",
+        "is-inside-container": "^1.0.0",
+        "powershell-utils": "^0.1.0",
+        "wsl-utils": "^0.3.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -13418,7 +13324,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -14266,6 +14171,18 @@
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
       "dev": true
     },
+    "node_modules/powershell-utils": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/powershell-utils/-/powershell-utils-0.1.0.tgz",
+      "integrity": "sha512-dM0jVuXJPsDN6DvRpea484tCUaMiXWjuCn++HGTqUWzGDjv5tZkEZldAJ/UMlqRYGFrD/etByo4/xOuC/snX2A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/prebuild-install": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz",
@@ -14983,6 +14900,18 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/run-applescript": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.1.0.tgz",
+      "integrity": "sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/run-parallel": {
       "version": "1.1.10",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz",
@@ -16058,11 +15987,6 @@
         "streamx": "^2.15.0"
       }
     },
-    "node_modules/tar/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/tas-client-umd": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/tas-client-umd/-/tas-client-umd-0.2.0.tgz",
@@ -16375,7 +16299,6 @@
       "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"
       },
@@ -17798,6 +17721,37 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
+    "node_modules/wsl-utils": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/wsl-utils/-/wsl-utils-0.3.1.tgz",
+      "integrity": "sha512-g/eziiSUNBSsdDJtCLB8bdYEUMj4jR7AGeUo96p/3dTafgjHhpF4RiCFPiRILwjQoDXx5MqkBr4fwWtR3Ky4Wg==",
+      "license": "MIT",
+      "dependencies": {
+        "is-wsl": "^3.1.0",
+        "powershell-utils": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/wsl-utils/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/xml": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
@@ -17846,6 +17800,12 @@
         "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==",
+      "license": "ISC"
+    },
     "node_modules/yargs": {
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
diff --git a/package.json b/package.json
index ada780f8c497..545c0c7c61f6 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "native-keymap": "^3.3.5",
     "native-watchdog": "^1.4.1",
     "node-pty": "1.1.0-beta31",
-    "open": "^8.4.2",
+    "open": "^11.0.0",
     "tas-client-umd": "0.2.0",
     "v8-inspect-profiler": "^0.1.1",
     "vscode-oniguruma": "2.0.1",

From 0260301f7139acae9dd32a0ab6b50afbd7b7ea79 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:03:23 +0000
Subject: [PATCH 1677/1815] Bump @xterm/addon-unicode11 from 0.9.0-beta.99 to
 0.10.0-beta.105

Bumps [@xterm/addon-unicode11](https://github.com/xtermjs/xterm.js) from 0.9.0-beta.99 to 0.10.0-beta.105.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-unicode11"
  dependency-version: 0.10.0-beta.105
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 419 +++++++++++++---------------------------------
 package.json      |   2 +-
 2 files changed, 114 insertions(+), 307 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 01d03daf195c..896ef696bd69 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
         "@xterm/addon-progress": "^0.2.0-beta.5",
         "@xterm/addon-search": "^0.16.0-beta.99",
         "@xterm/addon-serialize": "^0.14.0-beta.99",
-        "@xterm/addon-unicode11": "^0.9.0-beta.99",
+        "@xterm/addon-unicode11": "^0.10.0-beta.105",
         "@xterm/addon-webgl": "^0.19.0-beta.99",
         "@xterm/headless": "^5.6.0-beta.99",
         "@xterm/xterm": "^5.6.0-beta.99",
@@ -1669,81 +1669,35 @@
       }
     },
     "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==",
+      "version": "3.2.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.18.tgz",
+      "integrity": "sha512-ytlFv3dfb8OGqvbZP8tSIlNvn3QNYxdsF0k6ikRMWSr6CmBxBi1sliaxc2Q5KuYOuaeWkd8WRm25Rx/UtHcyMg==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "2.8.15",
+        "@microsoft/applicationinsights-core-js": "2.8.18",
         "@microsoft/applicationinsights-shims": "^2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.7"
+        "@microsoft/dynamicproto-js": "^1.1.11"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.11.tgz",
-      "integrity": "sha512-V0ZeeALy/Pj8HWgNHDsK+yDeCYnJ9bCgTWhcrna/ZiAT+sGfWs6mDBjAVcG03uP7TDjdWLf8w79lgbXJ3+s3DA==",
-      "license": "MIT",
-      "dependencies": {
-        "@microsoft/1ds-core-js": "4.3.11",
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.11.tgz",
-      "integrity": "sha512-QyQE/YzFYB+31WEpX9hvDoXZOIXA7308Z5uuL1mSsyDSkNPl24hBWz9O3vZL+/p9shy756eKLI2nFLwwIAhXyw==",
-      "license": "MIT",
-      "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.11",
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.11.tgz",
-      "integrity": "sha512-WlBY1sKDNL62T++NifgFCyDuOoNUNrVILfnHubOzgU/od7MFEQYWU8EZyDcBC/+Z8e3TD6jfixurYtWoUC+6Eg==",
-      "license": "MIT",
-      "dependencies": {
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
-      },
-      "peerDependencies": {
-        "tslib": ">= 1.0.0"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-shims": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
-      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "version": "3.2.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-3.2.18.tgz",
+      "integrity": "sha512-Tzjcja4SMyws3UP58kD2edFPNb7BJtx5uCgwf/PWXwDyfbUY1/crsTQdEyR98wy/vorvLDZdQlcL++VMChfYnQ==",
       "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
-      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
+        "@microsoft/1ds-core-js": "3.2.18",
+        "@microsoft/applicationinsights-shims": "^2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.11"
       }
     },
     "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==",
+      "version": "2.8.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.18.tgz",
+      "integrity": "sha512-yPHRZFLpnEO0uSgFPM1BLMRRwjoten9YBbn4pJRbCT4PigLnj748knmWsMwXIdcehtkRTYz78kPYa/LWP7nvmA==",
+      "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.9"
+        "@microsoft/dynamicproto-js": "^1.1.11"
       },
       "peerDependencies": {
         "tslib": "*"
@@ -1755,23 +1709,9 @@
       "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/@nevware21/ts-async": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.5.tgz",
-      "integrity": "sha512-vwqaL05iJPjLeh5igPi8MeeAu10i+Aq7xko1fbo9F5Si6MnVN5505qaV7AhSdk5MCBJVT/UYMk3kgInNjDb4Ig==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.12.2 < 2.x"
-      }
-    },
-    "node_modules/@nevware21/ts-utils": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
-      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.11.tgz",
+      "integrity": "sha512-gNw9z9LbqLV+WadZ6/MMrWwO3e0LuoUH1wve/1iPsBNbgqeVCiB0EZFNNj2lysxS2gkqoF9hmyVaG3MoM1BkxA==",
       "license": "MIT"
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -1992,16 +1932,16 @@
       }
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.4.tgz",
-      "integrity": "sha512-WYa2tUVV5HiArWPB3ydlOc4R2ivq0IDrlqhMi3l7mVsFEXNcTfxYFPIHXHXIh/ca/y/V5N4E1zecyxdIBjYnkQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
+      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "detect-libc": "^2.0.3",
+        "detect-libc": "^1.0.3",
         "is-glob": "^4.0.3",
-        "node-addon-api": "^7.0.0",
-        "picomatch": "^4.0.3"
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
       },
       "engines": {
         "node": ">= 10.0.0"
@@ -2011,25 +1951,25 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.4",
-        "@parcel/watcher-darwin-arm64": "2.5.4",
-        "@parcel/watcher-darwin-x64": "2.5.4",
-        "@parcel/watcher-freebsd-x64": "2.5.4",
-        "@parcel/watcher-linux-arm-glibc": "2.5.4",
-        "@parcel/watcher-linux-arm-musl": "2.5.4",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.4",
-        "@parcel/watcher-linux-arm64-musl": "2.5.4",
-        "@parcel/watcher-linux-x64-glibc": "2.5.4",
-        "@parcel/watcher-linux-x64-musl": "2.5.4",
-        "@parcel/watcher-win32-arm64": "2.5.4",
-        "@parcel/watcher-win32-ia32": "2.5.4",
-        "@parcel/watcher-win32-x64": "2.5.4"
+        "@parcel/watcher-android-arm64": "2.5.1",
+        "@parcel/watcher-darwin-arm64": "2.5.1",
+        "@parcel/watcher-darwin-x64": "2.5.1",
+        "@parcel/watcher-freebsd-x64": "2.5.1",
+        "@parcel/watcher-linux-arm-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm-musl": "2.5.1",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm64-musl": "2.5.1",
+        "@parcel/watcher-linux-x64-glibc": "2.5.1",
+        "@parcel/watcher-linux-x64-musl": "2.5.1",
+        "@parcel/watcher-win32-arm64": "2.5.1",
+        "@parcel/watcher-win32-ia32": "2.5.1",
+        "@parcel/watcher-win32-x64": "2.5.1"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.4.tgz",
-      "integrity": "sha512-hoh0vx4v+b3BNI7Cjoy2/B0ARqcwVNrzN/n7DLq9ZB4I3lrsvhrkCViJyfTj/Qi5xM9YFiH4AmHGK6pgH1ss7g==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
+      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
       "cpu": [
         "arm64"
       ],
@@ -2047,9 +1987,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.4.tgz",
-      "integrity": "sha512-kphKy377pZiWpAOyTgQYPE5/XEKVMaj6VUjKT5VkNyUJlr2qZAn8gIc7CPzx+kbhvqHDT9d7EqdOqRXT6vk0zw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
+      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
       "cpu": [
         "arm64"
       ],
@@ -2067,9 +2007,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.4.tgz",
-      "integrity": "sha512-UKaQFhCtNJW1A9YyVz3Ju7ydf6QgrpNQfRZ35wNKUhTQ3dxJ/3MULXN5JN/0Z80V/KUBDGa3RZaKq1EQT2a2gg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
+      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
       "cpu": [
         "x64"
       ],
@@ -2087,9 +2027,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.4.tgz",
-      "integrity": "sha512-Dib0Wv3Ow/m2/ttvLdeI2DBXloO7t3Z0oCp4bAb2aqyqOjKPPGrg10pMJJAQ7tt8P4V2rwYwywkDhUia/FgS+Q==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
+      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
       "cpu": [
         "x64"
       ],
@@ -2107,9 +2047,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.4.tgz",
-      "integrity": "sha512-I5Vb769pdf7Q7Sf4KNy8Pogl/URRCKu9ImMmnVKYayhynuyGYMzuI4UOWnegQNa2sGpsPSbzDsqbHNMyeyPCgw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
+      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
       "cpu": [
         "arm"
       ],
@@ -2127,9 +2067,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.4.tgz",
-      "integrity": "sha512-kGO8RPvVrcAotV4QcWh8kZuHr9bXi9a3bSZw7kFarYR0+fGliU7hd/zevhjw8fnvIKG3J9EO5G6sXNGCSNMYPQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
+      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
       "cpu": [
         "arm"
       ],
@@ -2147,9 +2087,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.4.tgz",
-      "integrity": "sha512-KU75aooXhqGFY2W5/p8DYYHt4hrjHZod8AhcGAmhzPn/etTa+lYCDB2b1sJy3sWJ8ahFVTdy+EbqSBvMx3iFlw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
+      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
       "cpu": [
         "arm64"
       ],
@@ -2167,9 +2107,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.4.tgz",
-      "integrity": "sha512-Qx8uNiIekVutnzbVdrgSanM+cbpDD3boB1f8vMtnuG5Zau4/bdDbXyKwIn0ToqFhIuob73bcxV9NwRm04/hzHQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
+      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
       "cpu": [
         "arm64"
       ],
@@ -2187,9 +2127,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.4.tgz",
-      "integrity": "sha512-UYBQvhYmgAv61LNUn24qGQdjtycFBKSK3EXr72DbJqX9aaLbtCOO8+1SkKhD/GNiJ97ExgcHBrukcYhVjrnogA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
+      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
       "cpu": [
         "x64"
       ],
@@ -2207,9 +2147,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.4.tgz",
-      "integrity": "sha512-YoRWCVgxv8akZrMhdyVi6/TyoeeMkQ0PGGOf2E4omODrvd1wxniXP+DBynKoHryStks7l+fDAMUBRzqNHrVOpg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
+      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
       "cpu": [
         "x64"
       ],
@@ -2227,9 +2167,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.4.tgz",
-      "integrity": "sha512-iby+D/YNXWkiQNYcIhg8P5hSjzXEHaQrk2SLrWOUD7VeC4Ohu0WQvmV+HDJokZVJ2UjJ4AGXW3bx7Lls9Ln4TQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
+      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
       "cpu": [
         "arm64"
       ],
@@ -2247,9 +2187,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.4.tgz",
-      "integrity": "sha512-vQN+KIReG0a2ZDpVv8cgddlf67J8hk1WfZMMP7sMeZmJRSmEax5xNDNWKdgqSe2brOKTQQAs3aCCUal2qBHAyg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
+      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
       "cpu": [
         "ia32"
       ],
@@ -2267,9 +2207,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.4.tgz",
-      "integrity": "sha512-3A6efb6BOKwyw7yk9ro2vus2YTt2nvcd56AuzxdMiVOxL9umDyN5PKkKfZ/gZ9row41SjVmTVQNWQhaRRGpOKw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
+      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
       "cpu": [
         "x64"
       ],
@@ -2286,16 +2226,16 @@
         "url": "https://opencollective.com/parcel"
       }
     },
-    "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": ">=12"
+    "node_modules/@parcel/watcher/node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "license": "Apache-2.0",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+      "engines": {
+        "node": ">=0.10"
       }
     },
     "node_modules/@pkgjs/parseargs": {
@@ -3514,9 +3454,9 @@
       }
     },
     "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==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
+      "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==",
       "license": "MIT"
     },
     "node_modules/@vscode/l10n-dev": {
@@ -4367,12 +4307,6 @@
         "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
-    "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/@xterm/addon-progress": {
       "version": "0.2.0-beta.5",
       "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.5.tgz",
@@ -4401,12 +4335,12 @@
       }
     },
     "node_modules/@xterm/addon-unicode11": {
-      "version": "0.9.0-beta.99",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.99.tgz",
-      "integrity": "sha512-4epGzbOc7X+NyPIMPxnQxaUlZYhCRTEPRsvfuIx55+Yyzip/zGX5ahy/Z22YrGTVv7qjxhVsu1tCbCgiF9HtTA==",
+      "version": "0.10.0-beta.105",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.105.tgz",
+      "integrity": "sha512-zMepG3Wa44+n8SQbNZ8jnpASh9zDEuDlk/0+bpPaRRc4UkiR6UbhzZos+qC8glxu1QGLd/4dFMuypnNxWonkpQ==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.99"
+        "@xterm/xterm": "^6.1.0-beta.105"
       }
     },
     "node_modules/@xterm/addon-webgl": {
@@ -5171,7 +5105,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dev": true,
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -7400,130 +7333,6 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI= sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "deprecated": "Please upgrade to v0.1.7",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "deprecated": "Please upgrade to v0.1.5",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/expand-template": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
@@ -7797,7 +7606,6 @@
       "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"
       },
@@ -8066,11 +7874,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/fs-minipass/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/fs-mkdirp-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
@@ -10716,7 +10519,6 @@
       "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"
       }
@@ -11761,6 +11563,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/lru-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
@@ -11964,7 +11778,6 @@
       "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",
@@ -12078,11 +11891,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/minizlib/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/mkdirp": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -13418,7 +13226,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -16058,11 +15865,6 @@
         "streamx": "^2.15.0"
       }
     },
-    "node_modules/tar/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/tas-client-umd": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/tas-client-umd/-/tas-client-umd-0.2.0.tgz",
@@ -16375,7 +16177,6 @@
       "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"
       },
@@ -17846,6 +17647,12 @@
         "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==",
+      "license": "ISC"
+    },
     "node_modules/yargs": {
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
diff --git a/package.json b/package.json
index ada780f8c497..1f321d4ab221 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "@xterm/addon-progress": "^0.2.0-beta.5",
     "@xterm/addon-search": "^0.16.0-beta.99",
     "@xterm/addon-serialize": "^0.14.0-beta.99",
-    "@xterm/addon-unicode11": "^0.9.0-beta.99",
+    "@xterm/addon-unicode11": "^0.10.0-beta.105",
     "@xterm/addon-webgl": "^0.19.0-beta.99",
     "@xterm/headless": "^5.6.0-beta.99",
     "@xterm/xterm": "^5.6.0-beta.99",

From 2b7ba5d79ff978c9d1d7aa9a54e3fbf16373f07d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:03:35 +0000
Subject: [PATCH 1678/1815] Bump @xterm/addon-webgl in /remote

Bumps [@xterm/addon-webgl](https://github.com/xtermjs/xterm.js) from 0.19.0-beta.99 to 0.20.0-beta.104.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-webgl"
  dependency-version: 0.20.0-beta.104
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 320 ++++++++++++++++++++++-----------------
 remote/package.json      |   2 +-
 2 files changed, 179 insertions(+), 143 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 126433d54b95..dcfd2d269778 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -27,7 +27,7 @@
         "@xterm/addon-search": "^0.16.0-beta.99",
         "@xterm/addon-serialize": "^0.14.0-beta.99",
         "@xterm/addon-unicode11": "^0.9.0-beta.99",
-        "@xterm/addon-webgl": "^0.19.0-beta.99",
+        "@xterm/addon-webgl": "^0.20.0-beta.104",
         "@xterm/headless": "^5.6.0-beta.99",
         "@xterm/xterm": "^5.6.0-beta.99",
         "cookie": "^0.7.0",
@@ -47,90 +47,63 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.11.tgz",
-      "integrity": "sha512-QyQE/YzFYB+31WEpX9hvDoXZOIXA7308Z5uuL1mSsyDSkNPl24hBWz9O3vZL+/p9shy756eKLI2nFLwwIAhXyw==",
+      "version": "3.2.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.18.tgz",
+      "integrity": "sha512-ytlFv3dfb8OGqvbZP8tSIlNvn3QNYxdsF0k6ikRMWSr6CmBxBi1sliaxc2Q5KuYOuaeWkd8WRm25Rx/UtHcyMg==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.11",
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+        "@microsoft/applicationinsights-core-js": "2.8.18",
+        "@microsoft/applicationinsights-shims": "^2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.11"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.11.tgz",
-      "integrity": "sha512-V0ZeeALy/Pj8HWgNHDsK+yDeCYnJ9bCgTWhcrna/ZiAT+sGfWs6mDBjAVcG03uP7TDjdWLf8w79lgbXJ3+s3DA==",
+      "version": "3.2.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-3.2.18.tgz",
+      "integrity": "sha512-Tzjcja4SMyws3UP58kD2edFPNb7BJtx5uCgwf/PWXwDyfbUY1/crsTQdEyR98wy/vorvLDZdQlcL++VMChfYnQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.3.11",
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+        "@microsoft/1ds-core-js": "3.2.18",
+        "@microsoft/applicationinsights-shims": "^2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.11"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.11.tgz",
-      "integrity": "sha512-WlBY1sKDNL62T++NifgFCyDuOoNUNrVILfnHubOzgU/od7MFEQYWU8EZyDcBC/+Z8e3TD6jfixurYtWoUC+6Eg==",
+      "version": "2.8.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.18.tgz",
+      "integrity": "sha512-yPHRZFLpnEO0uSgFPM1BLMRRwjoten9YBbn4pJRbCT4PigLnj748knmWsMwXIdcehtkRTYz78kPYa/LWP7nvmA==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+        "@microsoft/applicationinsights-shims": "2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.11"
       },
       "peerDependencies": {
-        "tslib": ">= 1.0.0"
+        "tslib": "*"
       }
     },
     "node_modules/@microsoft/applicationinsights-shims": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
-      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
-      }
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz",
+      "integrity": "sha512-PoHEgsnmcqruLNHZ/amACqdJ6YYQpED0KSRe6J7gIJTtpZC1FfFU9b1fmDKDKtFoUSrPzEh1qzO3kmRZP0betg==",
+      "license": "MIT"
     },
     "node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
-      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
-      }
-    },
-    "node_modules/@nevware21/ts-async": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
-      "integrity": "sha512-IBTyj29GwGlxfzXw2NPnzty+w0Adx61Eze1/lknH/XIVdxtF9UnOpk76tnrHXWa6j84a1RR9hsOcHQPFv9qJjA==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.11.6 < 2.x"
-      }
-    },
-    "node_modules/@nevware21/ts-utils": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
-      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.11.tgz",
+      "integrity": "sha512-gNw9z9LbqLV+WadZ6/MMrWwO3e0LuoUH1wve/1iPsBNbgqeVCiB0EZFNNj2lysxS2gkqoF9hmyVaG3MoM1BkxA==",
       "license": "MIT"
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.4.tgz",
-      "integrity": "sha512-WYa2tUVV5HiArWPB3ydlOc4R2ivq0IDrlqhMi3l7mVsFEXNcTfxYFPIHXHXIh/ca/y/V5N4E1zecyxdIBjYnkQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
+      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "detect-libc": "^2.0.3",
+        "detect-libc": "^1.0.3",
         "is-glob": "^4.0.3",
-        "node-addon-api": "^7.0.0",
-        "picomatch": "^4.0.3"
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
       },
       "engines": {
         "node": ">= 10.0.0"
@@ -140,25 +113,25 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.4",
-        "@parcel/watcher-darwin-arm64": "2.5.4",
-        "@parcel/watcher-darwin-x64": "2.5.4",
-        "@parcel/watcher-freebsd-x64": "2.5.4",
-        "@parcel/watcher-linux-arm-glibc": "2.5.4",
-        "@parcel/watcher-linux-arm-musl": "2.5.4",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.4",
-        "@parcel/watcher-linux-arm64-musl": "2.5.4",
-        "@parcel/watcher-linux-x64-glibc": "2.5.4",
-        "@parcel/watcher-linux-x64-musl": "2.5.4",
-        "@parcel/watcher-win32-arm64": "2.5.4",
-        "@parcel/watcher-win32-ia32": "2.5.4",
-        "@parcel/watcher-win32-x64": "2.5.4"
+        "@parcel/watcher-android-arm64": "2.5.1",
+        "@parcel/watcher-darwin-arm64": "2.5.1",
+        "@parcel/watcher-darwin-x64": "2.5.1",
+        "@parcel/watcher-freebsd-x64": "2.5.1",
+        "@parcel/watcher-linux-arm-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm-musl": "2.5.1",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm64-musl": "2.5.1",
+        "@parcel/watcher-linux-x64-glibc": "2.5.1",
+        "@parcel/watcher-linux-x64-musl": "2.5.1",
+        "@parcel/watcher-win32-arm64": "2.5.1",
+        "@parcel/watcher-win32-ia32": "2.5.1",
+        "@parcel/watcher-win32-x64": "2.5.1"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.4.tgz",
-      "integrity": "sha512-hoh0vx4v+b3BNI7Cjoy2/B0ARqcwVNrzN/n7DLq9ZB4I3lrsvhrkCViJyfTj/Qi5xM9YFiH4AmHGK6pgH1ss7g==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
+      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
       "cpu": [
         "arm64"
       ],
@@ -176,9 +149,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.4.tgz",
-      "integrity": "sha512-kphKy377pZiWpAOyTgQYPE5/XEKVMaj6VUjKT5VkNyUJlr2qZAn8gIc7CPzx+kbhvqHDT9d7EqdOqRXT6vk0zw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
+      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
       "cpu": [
         "arm64"
       ],
@@ -196,9 +169,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.4.tgz",
-      "integrity": "sha512-UKaQFhCtNJW1A9YyVz3Ju7ydf6QgrpNQfRZ35wNKUhTQ3dxJ/3MULXN5JN/0Z80V/KUBDGa3RZaKq1EQT2a2gg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
+      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
       "cpu": [
         "x64"
       ],
@@ -216,9 +189,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.4.tgz",
-      "integrity": "sha512-Dib0Wv3Ow/m2/ttvLdeI2DBXloO7t3Z0oCp4bAb2aqyqOjKPPGrg10pMJJAQ7tt8P4V2rwYwywkDhUia/FgS+Q==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
+      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
       "cpu": [
         "x64"
       ],
@@ -236,9 +209,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.4.tgz",
-      "integrity": "sha512-I5Vb769pdf7Q7Sf4KNy8Pogl/URRCKu9ImMmnVKYayhynuyGYMzuI4UOWnegQNa2sGpsPSbzDsqbHNMyeyPCgw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
+      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
       "cpu": [
         "arm"
       ],
@@ -256,9 +229,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.4.tgz",
-      "integrity": "sha512-kGO8RPvVrcAotV4QcWh8kZuHr9bXi9a3bSZw7kFarYR0+fGliU7hd/zevhjw8fnvIKG3J9EO5G6sXNGCSNMYPQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
+      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
       "cpu": [
         "arm"
       ],
@@ -276,9 +249,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.4.tgz",
-      "integrity": "sha512-KU75aooXhqGFY2W5/p8DYYHt4hrjHZod8AhcGAmhzPn/etTa+lYCDB2b1sJy3sWJ8ahFVTdy+EbqSBvMx3iFlw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
+      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
       "cpu": [
         "arm64"
       ],
@@ -296,9 +269,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.4.tgz",
-      "integrity": "sha512-Qx8uNiIekVutnzbVdrgSanM+cbpDD3boB1f8vMtnuG5Zau4/bdDbXyKwIn0ToqFhIuob73bcxV9NwRm04/hzHQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
+      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
       "cpu": [
         "arm64"
       ],
@@ -316,9 +289,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.4.tgz",
-      "integrity": "sha512-UYBQvhYmgAv61LNUn24qGQdjtycFBKSK3EXr72DbJqX9aaLbtCOO8+1SkKhD/GNiJ97ExgcHBrukcYhVjrnogA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
+      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
       "cpu": [
         "x64"
       ],
@@ -336,9 +309,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.4.tgz",
-      "integrity": "sha512-YoRWCVgxv8akZrMhdyVi6/TyoeeMkQ0PGGOf2E4omODrvd1wxniXP+DBynKoHryStks7l+fDAMUBRzqNHrVOpg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
+      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
       "cpu": [
         "x64"
       ],
@@ -356,9 +329,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.4.tgz",
-      "integrity": "sha512-iby+D/YNXWkiQNYcIhg8P5hSjzXEHaQrk2SLrWOUD7VeC4Ohu0WQvmV+HDJokZVJ2UjJ4AGXW3bx7Lls9Ln4TQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
+      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
       "cpu": [
         "arm64"
       ],
@@ -376,9 +349,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.4.tgz",
-      "integrity": "sha512-vQN+KIReG0a2ZDpVv8cgddlf67J8hk1WfZMMP7sMeZmJRSmEax5xNDNWKdgqSe2brOKTQQAs3aCCUal2qBHAyg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
+      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
       "cpu": [
         "ia32"
       ],
@@ -396,9 +369,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.4.tgz",
-      "integrity": "sha512-3A6efb6BOKwyw7yk9ro2vus2YTt2nvcd56AuzxdMiVOxL9umDyN5PKkKfZ/gZ9row41SjVmTVQNWQhaRRGpOKw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
+      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
       "cpu": [
         "x64"
       ],
@@ -415,6 +388,18 @@
         "url": "https://opencollective.com/parcel"
       }
     },
+    "node_modules/@parcel/watcher/node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "license": "Apache-2.0",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/@tootallnate/once": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-3.0.0.tgz",
@@ -435,15 +420,15 @@
       }
     },
     "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==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
+      "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==",
       "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.32.0",
+      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.32.0.tgz",
+      "integrity": "sha512-n6h2+WVMJ3ByfGUakDbBNpR25J2JpLQabofiTKHIcLpXfxhT5TQSEH4OcjesZZfqw1zDpd7oBgcgqToWIiaBrQ==",
       "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "^3.0.0",
@@ -454,9 +439,6 @@
         "socks-proxy-agent": "^8.0.1",
         "undici": "^7.2.0"
       },
-      "engines": {
-        "node": ">=22.15.0"
-      },
       "optionalDependencies": {
         "@vscode/windows-ca-certs": "^0.3.1"
       }
@@ -495,15 +477,15 @@
       }
     },
     "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==",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.1.5.tgz",
+      "integrity": "sha512-l1NG9/mMDO2MFtaByKlAXKW9fF9P/9gbfpKIg5HHNVR8BFlwf4HvwVWJG4qlpy6hM9YZ2fsKTawQSryolwPpSQ==",
       "license": "MIT"
     },
     "node_modules/@vscode/vscode-languagedetection": {
-      "version": "1.0.22",
-      "resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.22.tgz",
-      "integrity": "sha512-rQ/BgMyLuIXSmbA0MSkIPHtcOw14QkeDbAq19sjvaS9LTRr905yij0S8lsyqN5JgOsbtIx7pAcyOxFMzPmqhZQ==",
+      "version": "1.0.21",
+      "resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz",
+      "integrity": "sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g==",
       "license": "MIT",
       "bin": {
         "vscode-languagedetection": "cli/index.js"
@@ -624,12 +606,12 @@
       }
     },
     "node_modules/@xterm/addon-webgl": {
-      "version": "0.19.0-beta.99",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.99.tgz",
-      "integrity": "sha512-t4vTtwDLYWgzcH86s3hlCGaZWJWzTXLXUcgw/2l+Fkq9LFy4cLuQgWTVjOWLB0KOJ0FmT+g0sBWLApUw9bYa2w==",
+      "version": "0.20.0-beta.104",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.104.tgz",
+      "integrity": "sha512-S9zSxwnLXeF8RK1HZXLIdqZELF83ZHVyFJtqNj6b9SdjVMSFrQpa1wwWuJR1McW54hShX3aC9zLj1/1RKiwAxQ==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.99"
+        "@xterm/xterm": "^6.1.0-beta.105"
       }
     },
     "node_modules/@xterm/headless": {
@@ -692,6 +674,18 @@
         "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==",
+      "license": "MIT",
+      "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",
@@ -731,16 +725,12 @@
       "license": "ISC"
     },
     "node_modules/cookie": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz",
-      "integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
       "license": "MIT",
       "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
+        "node": ">= 0.6"
       }
     },
     "node_modules/debug": {
@@ -823,6 +813,18 @@
       "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==",
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -942,6 +944,15 @@
         "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==",
+      "license": "MIT",
+      "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",
@@ -1007,6 +1018,19 @@
         "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==",
+      "license": "MIT",
+      "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",
@@ -1120,12 +1144,12 @@
       "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA= sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
     },
     "node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=8.6"
       },
       "funding": {
         "url": "https://github.com/sponsors/jonschlinkert"
@@ -1375,6 +1399,18 @@
       "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==",
+      "license": "MIT",
+      "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",
diff --git a/remote/package.json b/remote/package.json
index 2e9a2921418b..80a384696a3b 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -22,7 +22,7 @@
     "@xterm/addon-search": "^0.16.0-beta.99",
     "@xterm/addon-serialize": "^0.14.0-beta.99",
     "@xterm/addon-unicode11": "^0.9.0-beta.99",
-    "@xterm/addon-webgl": "^0.19.0-beta.99",
+    "@xterm/addon-webgl": "^0.20.0-beta.104",
     "@xterm/headless": "^5.6.0-beta.99",
     "@xterm/xterm": "^5.6.0-beta.99",
     "cookie": "^0.7.0",

From 6068bea5852b1f7aa54117720ef419bd6d361b0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:03:39 +0000
Subject: [PATCH 1679/1815] Bump @xterm/addon-clipboard in /remote

Bumps [@xterm/addon-clipboard](https://github.com/xtermjs/xterm.js) from 0.2.0-beta.82 to 0.3.0-beta.105.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-clipboard"
  dependency-version: 0.3.0-beta.105
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 320 ++++++++++++++++++++++-----------------
 remote/package.json      |   2 +-
 2 files changed, 179 insertions(+), 143 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 126433d54b95..80c1b0387b56 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -20,7 +20,7 @@
         "@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.82",
+        "@xterm/addon-clipboard": "^0.3.0-beta.105",
         "@xterm/addon-image": "^0.9.0-beta.99",
         "@xterm/addon-ligatures": "^0.10.0-beta.99",
         "@xterm/addon-progress": "^0.2.0-beta.5",
@@ -47,90 +47,63 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.11.tgz",
-      "integrity": "sha512-QyQE/YzFYB+31WEpX9hvDoXZOIXA7308Z5uuL1mSsyDSkNPl24hBWz9O3vZL+/p9shy756eKLI2nFLwwIAhXyw==",
+      "version": "3.2.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.18.tgz",
+      "integrity": "sha512-ytlFv3dfb8OGqvbZP8tSIlNvn3QNYxdsF0k6ikRMWSr6CmBxBi1sliaxc2Q5KuYOuaeWkd8WRm25Rx/UtHcyMg==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.11",
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+        "@microsoft/applicationinsights-core-js": "2.8.18",
+        "@microsoft/applicationinsights-shims": "^2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.11"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.11.tgz",
-      "integrity": "sha512-V0ZeeALy/Pj8HWgNHDsK+yDeCYnJ9bCgTWhcrna/ZiAT+sGfWs6mDBjAVcG03uP7TDjdWLf8w79lgbXJ3+s3DA==",
+      "version": "3.2.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-3.2.18.tgz",
+      "integrity": "sha512-Tzjcja4SMyws3UP58kD2edFPNb7BJtx5uCgwf/PWXwDyfbUY1/crsTQdEyR98wy/vorvLDZdQlcL++VMChfYnQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.3.11",
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+        "@microsoft/1ds-core-js": "3.2.18",
+        "@microsoft/applicationinsights-shims": "^2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.11"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.11.tgz",
-      "integrity": "sha512-WlBY1sKDNL62T++NifgFCyDuOoNUNrVILfnHubOzgU/od7MFEQYWU8EZyDcBC/+Z8e3TD6jfixurYtWoUC+6Eg==",
+      "version": "2.8.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.18.tgz",
+      "integrity": "sha512-yPHRZFLpnEO0uSgFPM1BLMRRwjoten9YBbn4pJRbCT4PigLnj748knmWsMwXIdcehtkRTYz78kPYa/LWP7nvmA==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+        "@microsoft/applicationinsights-shims": "2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.11"
       },
       "peerDependencies": {
-        "tslib": ">= 1.0.0"
+        "tslib": "*"
       }
     },
     "node_modules/@microsoft/applicationinsights-shims": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
-      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
-      }
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz",
+      "integrity": "sha512-PoHEgsnmcqruLNHZ/amACqdJ6YYQpED0KSRe6J7gIJTtpZC1FfFU9b1fmDKDKtFoUSrPzEh1qzO3kmRZP0betg==",
+      "license": "MIT"
     },
     "node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
-      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
-      }
-    },
-    "node_modules/@nevware21/ts-async": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
-      "integrity": "sha512-IBTyj29GwGlxfzXw2NPnzty+w0Adx61Eze1/lknH/XIVdxtF9UnOpk76tnrHXWa6j84a1RR9hsOcHQPFv9qJjA==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.11.6 < 2.x"
-      }
-    },
-    "node_modules/@nevware21/ts-utils": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
-      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.11.tgz",
+      "integrity": "sha512-gNw9z9LbqLV+WadZ6/MMrWwO3e0LuoUH1wve/1iPsBNbgqeVCiB0EZFNNj2lysxS2gkqoF9hmyVaG3MoM1BkxA==",
       "license": "MIT"
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.4.tgz",
-      "integrity": "sha512-WYa2tUVV5HiArWPB3ydlOc4R2ivq0IDrlqhMi3l7mVsFEXNcTfxYFPIHXHXIh/ca/y/V5N4E1zecyxdIBjYnkQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
+      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "detect-libc": "^2.0.3",
+        "detect-libc": "^1.0.3",
         "is-glob": "^4.0.3",
-        "node-addon-api": "^7.0.0",
-        "picomatch": "^4.0.3"
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
       },
       "engines": {
         "node": ">= 10.0.0"
@@ -140,25 +113,25 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.4",
-        "@parcel/watcher-darwin-arm64": "2.5.4",
-        "@parcel/watcher-darwin-x64": "2.5.4",
-        "@parcel/watcher-freebsd-x64": "2.5.4",
-        "@parcel/watcher-linux-arm-glibc": "2.5.4",
-        "@parcel/watcher-linux-arm-musl": "2.5.4",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.4",
-        "@parcel/watcher-linux-arm64-musl": "2.5.4",
-        "@parcel/watcher-linux-x64-glibc": "2.5.4",
-        "@parcel/watcher-linux-x64-musl": "2.5.4",
-        "@parcel/watcher-win32-arm64": "2.5.4",
-        "@parcel/watcher-win32-ia32": "2.5.4",
-        "@parcel/watcher-win32-x64": "2.5.4"
+        "@parcel/watcher-android-arm64": "2.5.1",
+        "@parcel/watcher-darwin-arm64": "2.5.1",
+        "@parcel/watcher-darwin-x64": "2.5.1",
+        "@parcel/watcher-freebsd-x64": "2.5.1",
+        "@parcel/watcher-linux-arm-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm-musl": "2.5.1",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm64-musl": "2.5.1",
+        "@parcel/watcher-linux-x64-glibc": "2.5.1",
+        "@parcel/watcher-linux-x64-musl": "2.5.1",
+        "@parcel/watcher-win32-arm64": "2.5.1",
+        "@parcel/watcher-win32-ia32": "2.5.1",
+        "@parcel/watcher-win32-x64": "2.5.1"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.4.tgz",
-      "integrity": "sha512-hoh0vx4v+b3BNI7Cjoy2/B0ARqcwVNrzN/n7DLq9ZB4I3lrsvhrkCViJyfTj/Qi5xM9YFiH4AmHGK6pgH1ss7g==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
+      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
       "cpu": [
         "arm64"
       ],
@@ -176,9 +149,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.4.tgz",
-      "integrity": "sha512-kphKy377pZiWpAOyTgQYPE5/XEKVMaj6VUjKT5VkNyUJlr2qZAn8gIc7CPzx+kbhvqHDT9d7EqdOqRXT6vk0zw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
+      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
       "cpu": [
         "arm64"
       ],
@@ -196,9 +169,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.4.tgz",
-      "integrity": "sha512-UKaQFhCtNJW1A9YyVz3Ju7ydf6QgrpNQfRZ35wNKUhTQ3dxJ/3MULXN5JN/0Z80V/KUBDGa3RZaKq1EQT2a2gg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
+      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
       "cpu": [
         "x64"
       ],
@@ -216,9 +189,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.4.tgz",
-      "integrity": "sha512-Dib0Wv3Ow/m2/ttvLdeI2DBXloO7t3Z0oCp4bAb2aqyqOjKPPGrg10pMJJAQ7tt8P4V2rwYwywkDhUia/FgS+Q==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
+      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
       "cpu": [
         "x64"
       ],
@@ -236,9 +209,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.4.tgz",
-      "integrity": "sha512-I5Vb769pdf7Q7Sf4KNy8Pogl/URRCKu9ImMmnVKYayhynuyGYMzuI4UOWnegQNa2sGpsPSbzDsqbHNMyeyPCgw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
+      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
       "cpu": [
         "arm"
       ],
@@ -256,9 +229,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.4.tgz",
-      "integrity": "sha512-kGO8RPvVrcAotV4QcWh8kZuHr9bXi9a3bSZw7kFarYR0+fGliU7hd/zevhjw8fnvIKG3J9EO5G6sXNGCSNMYPQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
+      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
       "cpu": [
         "arm"
       ],
@@ -276,9 +249,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.4.tgz",
-      "integrity": "sha512-KU75aooXhqGFY2W5/p8DYYHt4hrjHZod8AhcGAmhzPn/etTa+lYCDB2b1sJy3sWJ8ahFVTdy+EbqSBvMx3iFlw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
+      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
       "cpu": [
         "arm64"
       ],
@@ -296,9 +269,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.4.tgz",
-      "integrity": "sha512-Qx8uNiIekVutnzbVdrgSanM+cbpDD3boB1f8vMtnuG5Zau4/bdDbXyKwIn0ToqFhIuob73bcxV9NwRm04/hzHQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
+      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
       "cpu": [
         "arm64"
       ],
@@ -316,9 +289,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.4.tgz",
-      "integrity": "sha512-UYBQvhYmgAv61LNUn24qGQdjtycFBKSK3EXr72DbJqX9aaLbtCOO8+1SkKhD/GNiJ97ExgcHBrukcYhVjrnogA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
+      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
       "cpu": [
         "x64"
       ],
@@ -336,9 +309,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.4.tgz",
-      "integrity": "sha512-YoRWCVgxv8akZrMhdyVi6/TyoeeMkQ0PGGOf2E4omODrvd1wxniXP+DBynKoHryStks7l+fDAMUBRzqNHrVOpg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
+      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
       "cpu": [
         "x64"
       ],
@@ -356,9 +329,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.4.tgz",
-      "integrity": "sha512-iby+D/YNXWkiQNYcIhg8P5hSjzXEHaQrk2SLrWOUD7VeC4Ohu0WQvmV+HDJokZVJ2UjJ4AGXW3bx7Lls9Ln4TQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
+      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
       "cpu": [
         "arm64"
       ],
@@ -376,9 +349,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.4.tgz",
-      "integrity": "sha512-vQN+KIReG0a2ZDpVv8cgddlf67J8hk1WfZMMP7sMeZmJRSmEax5xNDNWKdgqSe2brOKTQQAs3aCCUal2qBHAyg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
+      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
       "cpu": [
         "ia32"
       ],
@@ -396,9 +369,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.4.tgz",
-      "integrity": "sha512-3A6efb6BOKwyw7yk9ro2vus2YTt2nvcd56AuzxdMiVOxL9umDyN5PKkKfZ/gZ9row41SjVmTVQNWQhaRRGpOKw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
+      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
       "cpu": [
         "x64"
       ],
@@ -415,6 +388,18 @@
         "url": "https://opencollective.com/parcel"
       }
     },
+    "node_modules/@parcel/watcher/node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "license": "Apache-2.0",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/@tootallnate/once": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-3.0.0.tgz",
@@ -435,15 +420,15 @@
       }
     },
     "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==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
+      "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==",
       "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.32.0",
+      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.32.0.tgz",
+      "integrity": "sha512-n6h2+WVMJ3ByfGUakDbBNpR25J2JpLQabofiTKHIcLpXfxhT5TQSEH4OcjesZZfqw1zDpd7oBgcgqToWIiaBrQ==",
       "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "^3.0.0",
@@ -454,9 +439,6 @@
         "socks-proxy-agent": "^8.0.1",
         "undici": "^7.2.0"
       },
-      "engines": {
-        "node": ">=22.15.0"
-      },
       "optionalDependencies": {
         "@vscode/windows-ca-certs": "^0.3.1"
       }
@@ -495,15 +477,15 @@
       }
     },
     "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==",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.1.5.tgz",
+      "integrity": "sha512-l1NG9/mMDO2MFtaByKlAXKW9fF9P/9gbfpKIg5HHNVR8BFlwf4HvwVWJG4qlpy6hM9YZ2fsKTawQSryolwPpSQ==",
       "license": "MIT"
     },
     "node_modules/@vscode/vscode-languagedetection": {
-      "version": "1.0.22",
-      "resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.22.tgz",
-      "integrity": "sha512-rQ/BgMyLuIXSmbA0MSkIPHtcOw14QkeDbAq19sjvaS9LTRr905yij0S8lsyqN5JgOsbtIx7pAcyOxFMzPmqhZQ==",
+      "version": "1.0.21",
+      "resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz",
+      "integrity": "sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g==",
       "license": "MIT",
       "bin": {
         "vscode-languagedetection": "cli/index.js"
@@ -551,15 +533,15 @@
       "license": "MIT"
     },
     "node_modules/@xterm/addon-clipboard": {
-      "version": "0.2.0-beta.82",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.82.tgz",
-      "integrity": "sha512-6PCRV0AHm/+ogeRdz2Txndau3l2Z7X7Buu8v5kpnNB30DKyvMh5p9J35maBPIwKF8XUSBvgywu+AW5x6mVqu9g==",
+      "version": "0.3.0-beta.105",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.105.tgz",
+      "integrity": "sha512-bAnnpjz1+7S5LLvv3pEyWAfhDvdZaufSkVMNBEt/LKpUkQlJRk1qoDWLANqQGVILxCWz/FanI566an0+zjANgA==",
       "license": "MIT",
       "dependencies": {
         "js-base64": "^3.7.5"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.99"
+        "@xterm/xterm": "^6.1.0-beta.105"
       }
     },
     "node_modules/@xterm/addon-image": {
@@ -692,6 +674,18 @@
         "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==",
+      "license": "MIT",
+      "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",
@@ -731,16 +725,12 @@
       "license": "ISC"
     },
     "node_modules/cookie": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz",
-      "integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
       "license": "MIT",
       "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
+        "node": ">= 0.6"
       }
     },
     "node_modules/debug": {
@@ -823,6 +813,18 @@
       "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==",
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -942,6 +944,15 @@
         "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==",
+      "license": "MIT",
+      "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",
@@ -1007,6 +1018,19 @@
         "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==",
+      "license": "MIT",
+      "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",
@@ -1120,12 +1144,12 @@
       "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA= sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
     },
     "node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=8.6"
       },
       "funding": {
         "url": "https://github.com/sponsors/jonschlinkert"
@@ -1375,6 +1399,18 @@
       "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==",
+      "license": "MIT",
+      "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",
diff --git a/remote/package.json b/remote/package.json
index 2e9a2921418b..51224922b68f 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -15,7 +15,7 @@
     "@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.82",
+    "@xterm/addon-clipboard": "^0.3.0-beta.105",
     "@xterm/addon-image": "^0.9.0-beta.99",
     "@xterm/addon-ligatures": "^0.10.0-beta.99",
     "@xterm/addon-progress": "^0.2.0-beta.5",

From a2894ce34422d3a86ff4c2b7cc61d83724ed9790 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:03:53 +0000
Subject: [PATCH 1680/1815] Bump @xterm/addon-clipboard in /remote/web

Bumps [@xterm/addon-clipboard](https://github.com/xtermjs/xterm.js) from 0.2.0-beta.82 to 0.3.0-beta.105.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-clipboard"
  dependency-version: 0.3.0-beta.105
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 141 ++++++++++-------------------------
 remote/web/package.json      |   2 +-
 2 files changed, 40 insertions(+), 103 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 1967e1ed2cbf..d494417feb8d 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -13,7 +13,7 @@
 				"@vscode/iconv-lite-umd": "0.7.0",
 				"@vscode/tree-sitter-wasm": "^0.1.3",
 				"@vscode/vscode-languagedetection": "1.0.21",
-				"@xterm/addon-clipboard": "^0.2.0-beta.82",
+				"@xterm/addon-clipboard": "^0.3.0-beta.105",
 				"@xterm/addon-image": "^0.9.0-beta.99",
 				"@xterm/addon-ligatures": "^0.10.0-beta.99",
 				"@xterm/addon-progress": "^0.2.0-beta.5",
@@ -29,110 +29,83 @@
 			}
 		},
 		"node_modules/@microsoft/1ds-core-js": {
-			"version": "4.3.11",
-			"resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.11.tgz",
-			"integrity": "sha512-QyQE/YzFYB+31WEpX9hvDoXZOIXA7308Z5uuL1mSsyDSkNPl24hBWz9O3vZL+/p9shy756eKLI2nFLwwIAhXyw==",
+			"version": "3.2.18",
+			"resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.18.tgz",
+			"integrity": "sha512-ytlFv3dfb8OGqvbZP8tSIlNvn3QNYxdsF0k6ikRMWSr6CmBxBi1sliaxc2Q5KuYOuaeWkd8WRm25Rx/UtHcyMg==",
 			"license": "MIT",
 			"dependencies": {
-				"@microsoft/applicationinsights-core-js": "3.3.11",
-				"@microsoft/applicationinsights-shims": "3.0.1",
-				"@microsoft/dynamicproto-js": "^2.0.3",
-				"@nevware21/ts-async": ">= 0.5.4 < 2.x",
-				"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+				"@microsoft/applicationinsights-core-js": "2.8.18",
+				"@microsoft/applicationinsights-shims": "^2.0.2",
+				"@microsoft/dynamicproto-js": "^1.1.11"
 			}
 		},
 		"node_modules/@microsoft/1ds-post-js": {
-			"version": "4.3.11",
-			"resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.11.tgz",
-			"integrity": "sha512-V0ZeeALy/Pj8HWgNHDsK+yDeCYnJ9bCgTWhcrna/ZiAT+sGfWs6mDBjAVcG03uP7TDjdWLf8w79lgbXJ3+s3DA==",
+			"version": "3.2.18",
+			"resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-3.2.18.tgz",
+			"integrity": "sha512-Tzjcja4SMyws3UP58kD2edFPNb7BJtx5uCgwf/PWXwDyfbUY1/crsTQdEyR98wy/vorvLDZdQlcL++VMChfYnQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@microsoft/1ds-core-js": "4.3.11",
-				"@microsoft/applicationinsights-shims": "3.0.1",
-				"@microsoft/dynamicproto-js": "^2.0.3",
-				"@nevware21/ts-async": ">= 0.5.4 < 2.x",
-				"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+				"@microsoft/1ds-core-js": "3.2.18",
+				"@microsoft/applicationinsights-shims": "^2.0.2",
+				"@microsoft/dynamicproto-js": "^1.1.11"
 			}
 		},
 		"node_modules/@microsoft/applicationinsights-core-js": {
-			"version": "3.3.11",
-			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.11.tgz",
-			"integrity": "sha512-WlBY1sKDNL62T++NifgFCyDuOoNUNrVILfnHubOzgU/od7MFEQYWU8EZyDcBC/+Z8e3TD6jfixurYtWoUC+6Eg==",
+			"version": "2.8.18",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.18.tgz",
+			"integrity": "sha512-yPHRZFLpnEO0uSgFPM1BLMRRwjoten9YBbn4pJRbCT4PigLnj748knmWsMwXIdcehtkRTYz78kPYa/LWP7nvmA==",
 			"license": "MIT",
 			"dependencies": {
-				"@microsoft/applicationinsights-shims": "3.0.1",
-				"@microsoft/dynamicproto-js": "^2.0.3",
-				"@nevware21/ts-async": ">= 0.5.4 < 2.x",
-				"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+				"@microsoft/applicationinsights-shims": "2.0.2",
+				"@microsoft/dynamicproto-js": "^1.1.11"
 			},
 			"peerDependencies": {
-				"tslib": ">= 1.0.0"
+				"tslib": "*"
 			}
 		},
 		"node_modules/@microsoft/applicationinsights-shims": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
-			"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
-			"license": "MIT",
-			"dependencies": {
-				"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
-			}
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz",
+			"integrity": "sha512-PoHEgsnmcqruLNHZ/amACqdJ6YYQpED0KSRe6J7gIJTtpZC1FfFU9b1fmDKDKtFoUSrPzEh1qzO3kmRZP0betg==",
+			"license": "MIT"
 		},
 		"node_modules/@microsoft/dynamicproto-js": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
-			"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
-			"license": "MIT",
-			"dependencies": {
-				"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
-			}
-		},
-		"node_modules/@nevware21/ts-async": {
-			"version": "0.5.4",
-			"resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
-			"integrity": "sha512-IBTyj29GwGlxfzXw2NPnzty+w0Adx61Eze1/lknH/XIVdxtF9UnOpk76tnrHXWa6j84a1RR9hsOcHQPFv9qJjA==",
-			"license": "MIT",
-			"dependencies": {
-				"@nevware21/ts-utils": ">= 0.11.6 < 2.x"
-			}
-		},
-		"node_modules/@nevware21/ts-utils": {
-			"version": "0.12.5",
-			"resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
-			"integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.11.tgz",
+			"integrity": "sha512-gNw9z9LbqLV+WadZ6/MMrWwO3e0LuoUH1wve/1iPsBNbgqeVCiB0EZFNNj2lysxS2gkqoF9hmyVaG3MoM1BkxA==",
 			"license": "MIT"
 		},
 		"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==",
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
+			"integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==",
 			"license": "MIT"
 		},
 		"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==",
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.1.5.tgz",
+			"integrity": "sha512-l1NG9/mMDO2MFtaByKlAXKW9fF9P/9gbfpKIg5HHNVR8BFlwf4HvwVWJG4qlpy6hM9YZ2fsKTawQSryolwPpSQ==",
 			"license": "MIT"
 		},
 		"node_modules/@vscode/vscode-languagedetection": {
-			"version": "1.0.22",
-			"resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.22.tgz",
-			"integrity": "sha512-rQ/BgMyLuIXSmbA0MSkIPHtcOw14QkeDbAq19sjvaS9LTRr905yij0S8lsyqN5JgOsbtIx7pAcyOxFMzPmqhZQ==",
+			"version": "1.0.21",
+			"resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz",
+			"integrity": "sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g==",
 			"license": "MIT",
 			"bin": {
 				"vscode-languagedetection": "cli/index.js"
 			}
 		},
 		"node_modules/@xterm/addon-clipboard": {
-			"version": "0.2.0-beta.82",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.82.tgz",
-			"integrity": "sha512-6PCRV0AHm/+ogeRdz2Txndau3l2Z7X7Buu8v5kpnNB30DKyvMh5p9J35maBPIwKF8XUSBvgywu+AW5x6mVqu9g==",
+			"version": "0.3.0-beta.105",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.105.tgz",
+			"integrity": "sha512-bAnnpjz1+7S5LLvv3pEyWAfhDvdZaufSkVMNBEt/LKpUkQlJRk1qoDWLANqQGVILxCWz/FanI566an0+zjANgA==",
 			"license": "MIT",
 			"dependencies": {
 				"js-base64": "^3.7.5"
 			},
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.99"
+				"@xterm/xterm": "^6.1.0-beta.105"
 			}
 		},
 		"node_modules/@xterm/addon-image": {
@@ -211,42 +184,6 @@
 			"integrity": "sha512-TwBXSyio63Sr2+eJ24BtrPiwTA8JpRbdzhNBYzCXs32yWX30X47UAcdgkahjkyt4JHSqhu7614/w5FOzHsNc/g==",
 			"license": "MIT"
 		},
-		"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",
-			"workspaces": [
-				"addons/*"
-			]
-		},
 		"node_modules/js-base64": {
 			"version": "3.7.7",
 			"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.7.tgz",
diff --git a/remote/web/package.json b/remote/web/package.json
index cc971e49830a..e48ba3e9565b 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -8,7 +8,7 @@
 		"@vscode/iconv-lite-umd": "0.7.0",
 		"@vscode/tree-sitter-wasm": "^0.1.3",
 		"@vscode/vscode-languagedetection": "1.0.21",
-		"@xterm/addon-clipboard": "^0.2.0-beta.82",
+		"@xterm/addon-clipboard": "^0.3.0-beta.105",
 		"@xterm/addon-image": "^0.9.0-beta.99",
 		"@xterm/addon-ligatures": "^0.10.0-beta.99",
 		"@xterm/addon-progress": "^0.2.0-beta.5",

From 53015f36a8fb23004b95e664a68b926877f26abb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:04:03 +0000
Subject: [PATCH 1681/1815] Bump p-all from 1.0.0 to 5.0.1

Bumps [p-all](https://github.com/sindresorhus/p-all) from 1.0.0 to 5.0.1.
- [Release notes](https://github.com/sindresorhus/p-all/releases)
- [Commits](https://github.com/sindresorhus/p-all/compare/v1.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: p-all
  dependency-version: 5.0.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 437 +++++++++++++---------------------------------
 package.json      |   2 +-
 2 files changed, 127 insertions(+), 312 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 01d03daf195c..59eb8a4612d1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -139,7 +139,7 @@
         "mocha-multi-reporters": "^1.5.1",
         "npm-run-all": "^4.1.5",
         "os-browserify": "^0.3.0",
-        "p-all": "^1.0.0",
+        "p-all": "^5.0.1",
         "path-browserify": "^1.0.1",
         "postcss": "^8.5.3",
         "postcss-nesting": "^12.0.2",
@@ -1669,81 +1669,35 @@
       }
     },
     "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==",
+      "version": "3.2.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.18.tgz",
+      "integrity": "sha512-ytlFv3dfb8OGqvbZP8tSIlNvn3QNYxdsF0k6ikRMWSr6CmBxBi1sliaxc2Q5KuYOuaeWkd8WRm25Rx/UtHcyMg==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "2.8.15",
+        "@microsoft/applicationinsights-core-js": "2.8.18",
         "@microsoft/applicationinsights-shims": "^2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.7"
+        "@microsoft/dynamicproto-js": "^1.1.11"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.11.tgz",
-      "integrity": "sha512-V0ZeeALy/Pj8HWgNHDsK+yDeCYnJ9bCgTWhcrna/ZiAT+sGfWs6mDBjAVcG03uP7TDjdWLf8w79lgbXJ3+s3DA==",
-      "license": "MIT",
-      "dependencies": {
-        "@microsoft/1ds-core-js": "4.3.11",
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.11.tgz",
-      "integrity": "sha512-QyQE/YzFYB+31WEpX9hvDoXZOIXA7308Z5uuL1mSsyDSkNPl24hBWz9O3vZL+/p9shy756eKLI2nFLwwIAhXyw==",
-      "license": "MIT",
-      "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.11",
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.11.tgz",
-      "integrity": "sha512-WlBY1sKDNL62T++NifgFCyDuOoNUNrVILfnHubOzgU/od7MFEQYWU8EZyDcBC/+Z8e3TD6jfixurYtWoUC+6Eg==",
-      "license": "MIT",
-      "dependencies": {
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
-      },
-      "peerDependencies": {
-        "tslib": ">= 1.0.0"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-shims": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
-      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "version": "3.2.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-3.2.18.tgz",
+      "integrity": "sha512-Tzjcja4SMyws3UP58kD2edFPNb7BJtx5uCgwf/PWXwDyfbUY1/crsTQdEyR98wy/vorvLDZdQlcL++VMChfYnQ==",
       "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
-      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
+        "@microsoft/1ds-core-js": "3.2.18",
+        "@microsoft/applicationinsights-shims": "^2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.11"
       }
     },
     "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==",
+      "version": "2.8.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.18.tgz",
+      "integrity": "sha512-yPHRZFLpnEO0uSgFPM1BLMRRwjoten9YBbn4pJRbCT4PigLnj748knmWsMwXIdcehtkRTYz78kPYa/LWP7nvmA==",
+      "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.9"
+        "@microsoft/dynamicproto-js": "^1.1.11"
       },
       "peerDependencies": {
         "tslib": "*"
@@ -1755,23 +1709,9 @@
       "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/@nevware21/ts-async": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.5.tgz",
-      "integrity": "sha512-vwqaL05iJPjLeh5igPi8MeeAu10i+Aq7xko1fbo9F5Si6MnVN5505qaV7AhSdk5MCBJVT/UYMk3kgInNjDb4Ig==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.12.2 < 2.x"
-      }
-    },
-    "node_modules/@nevware21/ts-utils": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
-      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.11.tgz",
+      "integrity": "sha512-gNw9z9LbqLV+WadZ6/MMrWwO3e0LuoUH1wve/1iPsBNbgqeVCiB0EZFNNj2lysxS2gkqoF9hmyVaG3MoM1BkxA==",
       "license": "MIT"
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -1992,16 +1932,16 @@
       }
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.4.tgz",
-      "integrity": "sha512-WYa2tUVV5HiArWPB3ydlOc4R2ivq0IDrlqhMi3l7mVsFEXNcTfxYFPIHXHXIh/ca/y/V5N4E1zecyxdIBjYnkQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
+      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "detect-libc": "^2.0.3",
+        "detect-libc": "^1.0.3",
         "is-glob": "^4.0.3",
-        "node-addon-api": "^7.0.0",
-        "picomatch": "^4.0.3"
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
       },
       "engines": {
         "node": ">= 10.0.0"
@@ -2011,25 +1951,25 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.4",
-        "@parcel/watcher-darwin-arm64": "2.5.4",
-        "@parcel/watcher-darwin-x64": "2.5.4",
-        "@parcel/watcher-freebsd-x64": "2.5.4",
-        "@parcel/watcher-linux-arm-glibc": "2.5.4",
-        "@parcel/watcher-linux-arm-musl": "2.5.4",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.4",
-        "@parcel/watcher-linux-arm64-musl": "2.5.4",
-        "@parcel/watcher-linux-x64-glibc": "2.5.4",
-        "@parcel/watcher-linux-x64-musl": "2.5.4",
-        "@parcel/watcher-win32-arm64": "2.5.4",
-        "@parcel/watcher-win32-ia32": "2.5.4",
-        "@parcel/watcher-win32-x64": "2.5.4"
+        "@parcel/watcher-android-arm64": "2.5.1",
+        "@parcel/watcher-darwin-arm64": "2.5.1",
+        "@parcel/watcher-darwin-x64": "2.5.1",
+        "@parcel/watcher-freebsd-x64": "2.5.1",
+        "@parcel/watcher-linux-arm-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm-musl": "2.5.1",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm64-musl": "2.5.1",
+        "@parcel/watcher-linux-x64-glibc": "2.5.1",
+        "@parcel/watcher-linux-x64-musl": "2.5.1",
+        "@parcel/watcher-win32-arm64": "2.5.1",
+        "@parcel/watcher-win32-ia32": "2.5.1",
+        "@parcel/watcher-win32-x64": "2.5.1"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.4.tgz",
-      "integrity": "sha512-hoh0vx4v+b3BNI7Cjoy2/B0ARqcwVNrzN/n7DLq9ZB4I3lrsvhrkCViJyfTj/Qi5xM9YFiH4AmHGK6pgH1ss7g==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
+      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
       "cpu": [
         "arm64"
       ],
@@ -2047,9 +1987,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.4.tgz",
-      "integrity": "sha512-kphKy377pZiWpAOyTgQYPE5/XEKVMaj6VUjKT5VkNyUJlr2qZAn8gIc7CPzx+kbhvqHDT9d7EqdOqRXT6vk0zw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
+      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
       "cpu": [
         "arm64"
       ],
@@ -2067,9 +2007,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.4.tgz",
-      "integrity": "sha512-UKaQFhCtNJW1A9YyVz3Ju7ydf6QgrpNQfRZ35wNKUhTQ3dxJ/3MULXN5JN/0Z80V/KUBDGa3RZaKq1EQT2a2gg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
+      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
       "cpu": [
         "x64"
       ],
@@ -2087,9 +2027,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.4.tgz",
-      "integrity": "sha512-Dib0Wv3Ow/m2/ttvLdeI2DBXloO7t3Z0oCp4bAb2aqyqOjKPPGrg10pMJJAQ7tt8P4V2rwYwywkDhUia/FgS+Q==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
+      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
       "cpu": [
         "x64"
       ],
@@ -2107,9 +2047,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.4.tgz",
-      "integrity": "sha512-I5Vb769pdf7Q7Sf4KNy8Pogl/URRCKu9ImMmnVKYayhynuyGYMzuI4UOWnegQNa2sGpsPSbzDsqbHNMyeyPCgw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
+      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
       "cpu": [
         "arm"
       ],
@@ -2127,9 +2067,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.4.tgz",
-      "integrity": "sha512-kGO8RPvVrcAotV4QcWh8kZuHr9bXi9a3bSZw7kFarYR0+fGliU7hd/zevhjw8fnvIKG3J9EO5G6sXNGCSNMYPQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
+      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
       "cpu": [
         "arm"
       ],
@@ -2147,9 +2087,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.4.tgz",
-      "integrity": "sha512-KU75aooXhqGFY2W5/p8DYYHt4hrjHZod8AhcGAmhzPn/etTa+lYCDB2b1sJy3sWJ8ahFVTdy+EbqSBvMx3iFlw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
+      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
       "cpu": [
         "arm64"
       ],
@@ -2167,9 +2107,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.4.tgz",
-      "integrity": "sha512-Qx8uNiIekVutnzbVdrgSanM+cbpDD3boB1f8vMtnuG5Zau4/bdDbXyKwIn0ToqFhIuob73bcxV9NwRm04/hzHQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
+      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
       "cpu": [
         "arm64"
       ],
@@ -2187,9 +2127,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.4.tgz",
-      "integrity": "sha512-UYBQvhYmgAv61LNUn24qGQdjtycFBKSK3EXr72DbJqX9aaLbtCOO8+1SkKhD/GNiJ97ExgcHBrukcYhVjrnogA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
+      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
       "cpu": [
         "x64"
       ],
@@ -2207,9 +2147,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.4.tgz",
-      "integrity": "sha512-YoRWCVgxv8akZrMhdyVi6/TyoeeMkQ0PGGOf2E4omODrvd1wxniXP+DBynKoHryStks7l+fDAMUBRzqNHrVOpg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
+      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
       "cpu": [
         "x64"
       ],
@@ -2227,9 +2167,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.4.tgz",
-      "integrity": "sha512-iby+D/YNXWkiQNYcIhg8P5hSjzXEHaQrk2SLrWOUD7VeC4Ohu0WQvmV+HDJokZVJ2UjJ4AGXW3bx7Lls9Ln4TQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
+      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
       "cpu": [
         "arm64"
       ],
@@ -2247,9 +2187,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.4.tgz",
-      "integrity": "sha512-vQN+KIReG0a2ZDpVv8cgddlf67J8hk1WfZMMP7sMeZmJRSmEax5xNDNWKdgqSe2brOKTQQAs3aCCUal2qBHAyg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
+      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
       "cpu": [
         "ia32"
       ],
@@ -2267,9 +2207,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.4.tgz",
-      "integrity": "sha512-3A6efb6BOKwyw7yk9ro2vus2YTt2nvcd56AuzxdMiVOxL9umDyN5PKkKfZ/gZ9row41SjVmTVQNWQhaRRGpOKw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
+      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
       "cpu": [
         "x64"
       ],
@@ -2286,16 +2226,16 @@
         "url": "https://opencollective.com/parcel"
       }
     },
-    "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": ">=12"
+    "node_modules/@parcel/watcher/node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "license": "Apache-2.0",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+      "engines": {
+        "node": ">=0.10"
       }
     },
     "node_modules/@pkgjs/parseargs": {
@@ -3514,9 +3454,9 @@
       }
     },
     "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==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
+      "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==",
       "license": "MIT"
     },
     "node_modules/@vscode/l10n-dev": {
@@ -4367,12 +4307,6 @@
         "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
-    "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/@xterm/addon-progress": {
       "version": "0.2.0-beta.5",
       "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.5.tgz",
@@ -5171,7 +5105,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dev": true,
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -7400,130 +7333,6 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI= sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "deprecated": "Please upgrade to v0.1.7",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "deprecated": "Please upgrade to v0.1.5",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/expand-template": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
@@ -7797,7 +7606,6 @@
       "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"
       },
@@ -8066,11 +7874,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/fs-minipass/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/fs-mkdirp-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
@@ -10716,7 +10519,6 @@
       "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"
       }
@@ -11761,6 +11563,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/lru-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
@@ -11964,7 +11778,6 @@
       "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",
@@ -12078,11 +11891,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/minizlib/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/mkdirp": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -13084,15 +12892,19 @@
       "dev": true
     },
     "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==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/p-all/-/p-all-5.0.1.tgz",
+      "integrity": "sha512-LMT7WX9ZSaq3J1zjloApkIVmtz0ZdMFSIqbuiEa3txGYPLjUPOvgOPOx3nFjo+f37ZYL+1aY666I2SG7GVwLOA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "p-map": "^1.0.0"
+        "p-map": "^6.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/p-cancelable": {
@@ -13135,12 +12947,16 @@
       }
     },
     "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==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-6.0.0.tgz",
+      "integrity": "sha512-T8BatKGY+k5rU+Q/GTYgrEf2r4xRMevAN5mtXc2aPc4rS1j3s+vWTaO2Wag94neXuCAUAs8cxBL9EeB5EA6diw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/p-try": {
@@ -13418,7 +13234,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -16058,11 +15873,6 @@
         "streamx": "^2.15.0"
       }
     },
-    "node_modules/tar/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/tas-client-umd": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/tas-client-umd/-/tas-client-umd-0.2.0.tgz",
@@ -16375,7 +16185,6 @@
       "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"
       },
@@ -17846,6 +17655,12 @@
         "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==",
+      "license": "ISC"
+    },
     "node_modules/yargs": {
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
diff --git a/package.json b/package.json
index ada780f8c497..113e537d43ef 100644
--- a/package.json
+++ b/package.json
@@ -198,7 +198,7 @@
     "mocha-multi-reporters": "^1.5.1",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
-    "p-all": "^1.0.0",
+    "p-all": "^5.0.1",
     "path-browserify": "^1.0.1",
     "postcss": "^8.5.3",
     "postcss-nesting": "^12.0.2",

From 145cac39c03e78f87153f008445fd4bf784f3ede Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 14:04:13 +0000
Subject: [PATCH 1682/1815] Bump css-loader from 6.9.1 to 7.1.2

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 6.9.1 to 7.1.2.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack/css-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v6.9.1...v7.1.2)

---
updated-dependencies:
- dependency-name: css-loader
  dependency-version: 7.1.2
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 490 ++++++++++++++++------------------------------
 package.json      |   2 +-
 2 files changed, 170 insertions(+), 322 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 01d03daf195c..95b68c30e040 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -93,7 +93,7 @@
         "chromium-pickle-js": "^0.2.0",
         "cookie": "^1.1.1",
         "copy-webpack-plugin": "^13.0.1",
-        "css-loader": "^6.9.1",
+        "css-loader": "^7.1.2",
         "cssnano": "^6.0.3",
         "debounce": "^3.0.0",
         "deemon": "^1.13.6",
@@ -1669,81 +1669,35 @@
       }
     },
     "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==",
+      "version": "3.2.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.18.tgz",
+      "integrity": "sha512-ytlFv3dfb8OGqvbZP8tSIlNvn3QNYxdsF0k6ikRMWSr6CmBxBi1sliaxc2Q5KuYOuaeWkd8WRm25Rx/UtHcyMg==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "2.8.15",
+        "@microsoft/applicationinsights-core-js": "2.8.18",
         "@microsoft/applicationinsights-shims": "^2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.7"
+        "@microsoft/dynamicproto-js": "^1.1.11"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.11.tgz",
-      "integrity": "sha512-V0ZeeALy/Pj8HWgNHDsK+yDeCYnJ9bCgTWhcrna/ZiAT+sGfWs6mDBjAVcG03uP7TDjdWLf8w79lgbXJ3+s3DA==",
+      "version": "3.2.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-3.2.18.tgz",
+      "integrity": "sha512-Tzjcja4SMyws3UP58kD2edFPNb7BJtx5uCgwf/PWXwDyfbUY1/crsTQdEyR98wy/vorvLDZdQlcL++VMChfYnQ==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.3.11",
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/1ds-core-js": {
-      "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.11.tgz",
-      "integrity": "sha512-QyQE/YzFYB+31WEpX9hvDoXZOIXA7308Z5uuL1mSsyDSkNPl24hBWz9O3vZL+/p9shy756eKLI2nFLwwIAhXyw==",
-      "license": "MIT",
-      "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.3.11",
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.11.tgz",
-      "integrity": "sha512-WlBY1sKDNL62T++NifgFCyDuOoNUNrVILfnHubOzgU/od7MFEQYWU8EZyDcBC/+Z8e3TD6jfixurYtWoUC+6Eg==",
-      "license": "MIT",
-      "dependencies": {
-        "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.3",
-        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
-        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
-      },
-      "peerDependencies": {
-        "tslib": ">= 1.0.0"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-shims": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
-      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
-      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
+        "@microsoft/1ds-core-js": "3.2.18",
+        "@microsoft/applicationinsights-shims": "^2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.11"
       }
     },
     "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==",
+      "version": "2.8.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.18.tgz",
+      "integrity": "sha512-yPHRZFLpnEO0uSgFPM1BLMRRwjoten9YBbn4pJRbCT4PigLnj748knmWsMwXIdcehtkRTYz78kPYa/LWP7nvmA==",
+      "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.9"
+        "@microsoft/dynamicproto-js": "^1.1.11"
       },
       "peerDependencies": {
         "tslib": "*"
@@ -1755,23 +1709,9 @@
       "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/@nevware21/ts-async": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.5.tgz",
-      "integrity": "sha512-vwqaL05iJPjLeh5igPi8MeeAu10i+Aq7xko1fbo9F5Si6MnVN5505qaV7AhSdk5MCBJVT/UYMk3kgInNjDb4Ig==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.12.2 < 2.x"
-      }
-    },
-    "node_modules/@nevware21/ts-utils": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
-      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.11.tgz",
+      "integrity": "sha512-gNw9z9LbqLV+WadZ6/MMrWwO3e0LuoUH1wve/1iPsBNbgqeVCiB0EZFNNj2lysxS2gkqoF9hmyVaG3MoM1BkxA==",
       "license": "MIT"
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -1992,16 +1932,16 @@
       }
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.4.tgz",
-      "integrity": "sha512-WYa2tUVV5HiArWPB3ydlOc4R2ivq0IDrlqhMi3l7mVsFEXNcTfxYFPIHXHXIh/ca/y/V5N4E1zecyxdIBjYnkQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
+      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "detect-libc": "^2.0.3",
+        "detect-libc": "^1.0.3",
         "is-glob": "^4.0.3",
-        "node-addon-api": "^7.0.0",
-        "picomatch": "^4.0.3"
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
       },
       "engines": {
         "node": ">= 10.0.0"
@@ -2011,25 +1951,25 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.4",
-        "@parcel/watcher-darwin-arm64": "2.5.4",
-        "@parcel/watcher-darwin-x64": "2.5.4",
-        "@parcel/watcher-freebsd-x64": "2.5.4",
-        "@parcel/watcher-linux-arm-glibc": "2.5.4",
-        "@parcel/watcher-linux-arm-musl": "2.5.4",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.4",
-        "@parcel/watcher-linux-arm64-musl": "2.5.4",
-        "@parcel/watcher-linux-x64-glibc": "2.5.4",
-        "@parcel/watcher-linux-x64-musl": "2.5.4",
-        "@parcel/watcher-win32-arm64": "2.5.4",
-        "@parcel/watcher-win32-ia32": "2.5.4",
-        "@parcel/watcher-win32-x64": "2.5.4"
+        "@parcel/watcher-android-arm64": "2.5.1",
+        "@parcel/watcher-darwin-arm64": "2.5.1",
+        "@parcel/watcher-darwin-x64": "2.5.1",
+        "@parcel/watcher-freebsd-x64": "2.5.1",
+        "@parcel/watcher-linux-arm-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm-musl": "2.5.1",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm64-musl": "2.5.1",
+        "@parcel/watcher-linux-x64-glibc": "2.5.1",
+        "@parcel/watcher-linux-x64-musl": "2.5.1",
+        "@parcel/watcher-win32-arm64": "2.5.1",
+        "@parcel/watcher-win32-ia32": "2.5.1",
+        "@parcel/watcher-win32-x64": "2.5.1"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.4.tgz",
-      "integrity": "sha512-hoh0vx4v+b3BNI7Cjoy2/B0ARqcwVNrzN/n7DLq9ZB4I3lrsvhrkCViJyfTj/Qi5xM9YFiH4AmHGK6pgH1ss7g==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
+      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
       "cpu": [
         "arm64"
       ],
@@ -2047,9 +1987,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.4.tgz",
-      "integrity": "sha512-kphKy377pZiWpAOyTgQYPE5/XEKVMaj6VUjKT5VkNyUJlr2qZAn8gIc7CPzx+kbhvqHDT9d7EqdOqRXT6vk0zw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
+      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
       "cpu": [
         "arm64"
       ],
@@ -2067,9 +2007,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.4.tgz",
-      "integrity": "sha512-UKaQFhCtNJW1A9YyVz3Ju7ydf6QgrpNQfRZ35wNKUhTQ3dxJ/3MULXN5JN/0Z80V/KUBDGa3RZaKq1EQT2a2gg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
+      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
       "cpu": [
         "x64"
       ],
@@ -2087,9 +2027,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.4.tgz",
-      "integrity": "sha512-Dib0Wv3Ow/m2/ttvLdeI2DBXloO7t3Z0oCp4bAb2aqyqOjKPPGrg10pMJJAQ7tt8P4V2rwYwywkDhUia/FgS+Q==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
+      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
       "cpu": [
         "x64"
       ],
@@ -2107,9 +2047,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.4.tgz",
-      "integrity": "sha512-I5Vb769pdf7Q7Sf4KNy8Pogl/URRCKu9ImMmnVKYayhynuyGYMzuI4UOWnegQNa2sGpsPSbzDsqbHNMyeyPCgw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
+      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
       "cpu": [
         "arm"
       ],
@@ -2127,9 +2067,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.4.tgz",
-      "integrity": "sha512-kGO8RPvVrcAotV4QcWh8kZuHr9bXi9a3bSZw7kFarYR0+fGliU7hd/zevhjw8fnvIKG3J9EO5G6sXNGCSNMYPQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
+      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
       "cpu": [
         "arm"
       ],
@@ -2147,9 +2087,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.4.tgz",
-      "integrity": "sha512-KU75aooXhqGFY2W5/p8DYYHt4hrjHZod8AhcGAmhzPn/etTa+lYCDB2b1sJy3sWJ8ahFVTdy+EbqSBvMx3iFlw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
+      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
       "cpu": [
         "arm64"
       ],
@@ -2167,9 +2107,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.4.tgz",
-      "integrity": "sha512-Qx8uNiIekVutnzbVdrgSanM+cbpDD3boB1f8vMtnuG5Zau4/bdDbXyKwIn0ToqFhIuob73bcxV9NwRm04/hzHQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
+      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
       "cpu": [
         "arm64"
       ],
@@ -2187,9 +2127,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.4.tgz",
-      "integrity": "sha512-UYBQvhYmgAv61LNUn24qGQdjtycFBKSK3EXr72DbJqX9aaLbtCOO8+1SkKhD/GNiJ97ExgcHBrukcYhVjrnogA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
+      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
       "cpu": [
         "x64"
       ],
@@ -2207,9 +2147,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.4.tgz",
-      "integrity": "sha512-YoRWCVgxv8akZrMhdyVi6/TyoeeMkQ0PGGOf2E4omODrvd1wxniXP+DBynKoHryStks7l+fDAMUBRzqNHrVOpg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
+      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
       "cpu": [
         "x64"
       ],
@@ -2227,9 +2167,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.4.tgz",
-      "integrity": "sha512-iby+D/YNXWkiQNYcIhg8P5hSjzXEHaQrk2SLrWOUD7VeC4Ohu0WQvmV+HDJokZVJ2UjJ4AGXW3bx7Lls9Ln4TQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
+      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
       "cpu": [
         "arm64"
       ],
@@ -2247,9 +2187,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.4.tgz",
-      "integrity": "sha512-vQN+KIReG0a2ZDpVv8cgddlf67J8hk1WfZMMP7sMeZmJRSmEax5xNDNWKdgqSe2brOKTQQAs3aCCUal2qBHAyg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
+      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
       "cpu": [
         "ia32"
       ],
@@ -2267,9 +2207,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.4.tgz",
-      "integrity": "sha512-3A6efb6BOKwyw7yk9ro2vus2YTt2nvcd56AuzxdMiVOxL9umDyN5PKkKfZ/gZ9row41SjVmTVQNWQhaRRGpOKw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
+      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
       "cpu": [
         "x64"
       ],
@@ -2286,16 +2226,16 @@
         "url": "https://opencollective.com/parcel"
       }
     },
-    "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": ">=12"
+    "node_modules/@parcel/watcher/node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "license": "Apache-2.0",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+      "engines": {
+        "node": ">=0.10"
       }
     },
     "node_modules/@pkgjs/parseargs": {
@@ -3514,9 +3454,9 @@
       }
     },
     "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==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
+      "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==",
       "license": "MIT"
     },
     "node_modules/@vscode/l10n-dev": {
@@ -4367,12 +4307,6 @@
         "@xterm/xterm": "^5.6.0-beta.99"
       }
     },
-    "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/@xterm/addon-progress": {
       "version": "0.2.0-beta.5",
       "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.5.tgz",
@@ -5171,7 +5105,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dev": true,
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -6077,29 +6010,39 @@
       }
     },
     "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==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
+      "integrity": "sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==",
       "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-extract-imports": "^3.1.0",
+        "postcss-modules-local-by-default": "^4.0.5",
+        "postcss-modules-scope": "^3.2.0",
         "postcss-modules-values": "^4.0.0",
         "postcss-value-parser": "^4.2.0",
         "semver": "^7.5.4"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 18.12.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "webpack": "^5.0.0"
+        "@rspack/core": "0.x || 1.x",
+        "webpack": "^5.27.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
       }
     },
     "node_modules/css-select": {
@@ -7400,130 +7343,6 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI= sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
-      "dev": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dev": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
-      "deprecated": "Please upgrade to v0.1.7",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
-      "deprecated": "Please upgrade to v0.1.5",
-      "dev": true,
-      "dependencies": {
-        "kind-of": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
-      "dev": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/expand-brackets/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/expand-template": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
@@ -7797,7 +7616,6 @@
       "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"
       },
@@ -8066,11 +7884,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/fs-minipass/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/fs-mkdirp-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
@@ -10716,7 +10529,6 @@
       "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"
       }
@@ -11761,6 +11573,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/lru-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
@@ -11964,7 +11788,6 @@
       "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",
@@ -12078,11 +11901,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/minizlib/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/mkdirp": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -13418,7 +13236,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -13844,10 +13661,11 @@
       }
     },
     "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==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+      "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": "^10 || ^12 || >= 14"
       },
@@ -13856,13 +13674,14 @@
       }
     },
     "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==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
+      "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
+        "postcss-selector-parser": "^7.0.0",
         "postcss-value-parser": "^4.1.0"
       },
       "engines": {
@@ -13872,13 +13691,28 @@
         "postcss": "^8.1.0"
       }
     },
+    "node_modules/postcss-modules-local-by-default/node_modules/postcss-selector-parser": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz",
+      "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "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==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+      "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
+        "postcss-selector-parser": "^7.0.0"
       },
       "engines": {
         "node": "^10 || ^12 || >= 14"
@@ -13887,6 +13721,20 @@
         "postcss": "^8.1.0"
       }
     },
+    "node_modules/postcss-modules-scope/node_modules/postcss-selector-parser": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz",
+      "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-modules-values": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
@@ -16058,11 +15906,6 @@
         "streamx": "^2.15.0"
       }
     },
-    "node_modules/tar/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
     "node_modules/tas-client-umd": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/tas-client-umd/-/tas-client-umd-0.2.0.tgz",
@@ -16375,7 +16218,6 @@
       "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"
       },
@@ -17846,6 +17688,12 @@
         "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==",
+      "license": "ISC"
+    },
     "node_modules/yargs": {
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
diff --git a/package.json b/package.json
index ada780f8c497..a0f7c60deaad 100644
--- a/package.json
+++ b/package.json
@@ -152,7 +152,7 @@
     "chromium-pickle-js": "^0.2.0",
     "cookie": "^1.1.1",
     "copy-webpack-plugin": "^13.0.1",
-    "css-loader": "^6.9.1",
+    "css-loader": "^7.1.2",
     "cssnano": "^6.0.3",
     "debounce": "^3.0.0",
     "deemon": "^1.13.6",

From ad3c0b30ad2bdfcc08d01b1d41c648c21d2cdc24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 16:46:15 +0000
Subject: [PATCH 1683/1815] Bump @azure/storage-blob from 12.29.1 to 12.30.0 in
 /build

Bumps [@azure/storage-blob](https://github.com/Azure/azure-sdk-for-js) from 12.29.1 to 12.30.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-js/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-js/blob/main/documentation/Changelog-for-next-generation.md)
- [Commits](https://github.com/Azure/azure-sdk-for-js/compare/@azure/storage-blob_12.29.1...@azure/storage-blob_12.30.0)

---
updated-dependencies:
- dependency-name: "@azure/storage-blob"
  dependency-version: 12.30.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 16 ++++++++--------
 build/package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 25f1dc881230..9e6b16ca3ec8 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -13,7 +13,7 @@
         "@azure/cosmos": "^4",
         "@azure/identity": "^4.13.0",
         "@azure/msal-node": "^5.0.2",
-        "@azure/storage-blob": "^12.29.1",
+        "@azure/storage-blob": "^12.30.0",
         "@electron/get": "^4.0.2",
         "@types/ansi-colors": "^3.2.6",
         "@types/byline": "^4.2.36",
@@ -432,9 +432,9 @@
       }
     },
     "node_modules/@azure/storage-blob": {
-      "version": "12.29.1",
-      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.29.1.tgz",
-      "integrity": "sha512-7ktyY0rfTM0vo7HvtK6E3UvYnI9qfd6Oz6z/+92VhGRveWng3kJwMKeUpqmW/NmwcDNbxHpSlldG+vsUnRFnBg==",
+      "version": "12.30.0",
+      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.30.0.tgz",
+      "integrity": "sha512-peDCR8blSqhsAKDbpSP/o55S4sheNwSrblvCaHUZ5xUI73XA7ieUGGwrONgD/Fng0EoDe1VOa3fAQ7+WGB3Ocg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -449,7 +449,7 @@
         "@azure/core-util": "^1.11.0",
         "@azure/core-xml": "^1.4.5",
         "@azure/logger": "^1.1.4",
-        "@azure/storage-common": "^12.1.1",
+        "@azure/storage-common": "^12.2.0",
         "events": "^3.0.0",
         "tslib": "^2.8.1"
       },
@@ -458,9 +458,9 @@
       }
     },
     "node_modules/@azure/storage-common": {
-      "version": "12.1.1",
-      "resolved": "https://registry.npmjs.org/@azure/storage-common/-/storage-common-12.1.1.tgz",
-      "integrity": "sha512-eIOH1pqFwI6UmVNnDQvmFeSg0XppuzDLFeUNO/Xht7ODAzRLgGDh7h550pSxoA+lPDxBl1+D2m/KG3jWzCUjTg==",
+      "version": "12.2.0",
+      "resolved": "https://registry.npmjs.org/@azure/storage-common/-/storage-common-12.2.0.tgz",
+      "integrity": "sha512-YZLxiJ3vBAAnFbG3TFuAMUlxZRexjQX5JDQxOkFGb6e2TpoxH3xyHI6idsMe/QrWtj41U/KoqBxlayzhS+LlwA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/build/package.json b/build/package.json
index a1789a20465d..398a3074dcb8 100644
--- a/build/package.json
+++ b/build/package.json
@@ -7,7 +7,7 @@
     "@azure/cosmos": "^4",
     "@azure/identity": "^4.13.0",
     "@azure/msal-node": "^5.0.2",
-    "@azure/storage-blob": "^12.29.1",
+    "@azure/storage-blob": "^12.30.0",
     "@electron/get": "^4.0.2",
     "@types/ansi-colors": "^3.2.6",
     "@types/byline": "^4.2.36",

From 4672f8dfe7badb540399945d9be914443ed1ce16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 16:47:03 +0000
Subject: [PATCH 1684/1815] Bump @azure/msal-node in
 /extensions/microsoft-authentication

Bumps [@azure/msal-node](https://github.com/AzureAD/microsoft-authentication-library-for-js) from 3.8.5 to 5.0.2.
- [Release notes](https://github.com/AzureAD/microsoft-authentication-library-for-js/releases)
- [Commits](https://github.com/AzureAD/microsoft-authentication-library-for-js/commits)

---
updated-dependencies:
- dependency-name: "@azure/msal-node"
  dependency-version: 5.0.2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 27 +++++++------------
 .../microsoft-authentication/package.json     |  2 +-
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 9f61c6084567..995d4dac7038 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@azure/ms-rest-azure-env": "^2.0.0",
-        "@azure/msal-node": "^3.8.5",
+        "@azure/msal-node": "^5.0.2",
         "@azure/msal-node-extensions": "^5.0.2",
         "@vscode/extension-telemetry": "^1.2.0",
         "keytar": "file:./packageMocks/keytar",
@@ -33,26 +33,26 @@
       "integrity": "sha512-dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="
     },
     "node_modules/@azure/msal-common": {
-      "version": "15.14.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.14.0.tgz",
-      "integrity": "sha512-aNuorSQxzsJQ6IUjJtN+rCInLfLOo3VpNYiXaHBK9XL8Ieg1y4F5ZFjI19GErbVvwqvwGNyJ9AZ/sAxOWhoSUw==",
+      "version": "16.0.2",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-16.0.2.tgz",
+      "integrity": "sha512-ZJ/UR7lyqIntURrIJCyvScwJFanM9QhJYcJCheB21jZofGKpP9QxWgvADANo7UkresHKzV+6YwoeZYP7P7HvUg==",
       "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/@azure/msal-node": {
-      "version": "3.8.5",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.5.tgz",
-      "integrity": "sha512-xRSAfH27bIp3vtjtTFyyhdm18lq2pzdoNG7DA2IH1fXzJ30mymryv0wK/Gph+x4y0Rx+5mMLU5JTPiCeQ75Aug==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-5.0.2.tgz",
+      "integrity": "sha512-3tHeJghckgpTX98TowJoXOjKGuds0L+FKfeHJtoZFl2xvwE6RF65shZJzMQ5EQZWXzh3sE1i9gE+m3aRMachjA==",
       "license": "MIT",
       "dependencies": {
-        "@azure/msal-common": "15.14.0",
+        "@azure/msal-common": "16.0.2",
         "jsonwebtoken": "^9.0.0",
         "uuid": "^8.3.0"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=20"
       }
     },
     "node_modules/@azure/msal-node-extensions": {
@@ -70,15 +70,6 @@
         "node": ">=20"
       }
     },
-    "node_modules/@azure/msal-node-extensions/node_modules/@azure/msal-common": {
-      "version": "16.0.2",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-16.0.2.tgz",
-      "integrity": "sha512-ZJ/UR7lyqIntURrIJCyvScwJFanM9QhJYcJCheB21jZofGKpP9QxWgvADANo7UkresHKzV+6YwoeZYP7P7HvUg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/@azure/msal-node-runtime": {
       "version": "0.20.1",
       "resolved": "https://registry.npmjs.org/@azure/msal-node-runtime/-/msal-node-runtime-0.20.1.tgz",
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 51f7908233ac..2e64ed511fb6 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -139,7 +139,7 @@
   },
   "dependencies": {
     "@azure/ms-rest-azure-env": "^2.0.0",
-    "@azure/msal-node": "^3.8.5",
+    "@azure/msal-node": "^5.0.2",
     "@azure/msal-node-extensions": "^5.0.2",
     "@vscode/extension-telemetry": "^1.2.0",
     "keytar": "file:./packageMocks/keytar",

From 98370c0860738becafea760596f7bdc8e6f53c56 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 16:48:25 +0000
Subject: [PATCH 1685/1815] Bump electron from 35.7.5 to 40.0.0

Bumps [electron](https://github.com/electron/electron) from 35.7.5 to 40.0.0.
- [Release notes](https://github.com/electron/electron/releases)
- [Commits](https://github.com/electron/electron/compare/v35.7.5...v40.0.0)

---
updated-dependencies:
- dependency-name: electron
  dependency-version: 40.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 25 +++++++++----------------
 package.json      |  2 +-
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6ac02cdb5fbc..cffabeb088d3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -97,7 +97,7 @@
         "cssnano": "^6.0.3",
         "debounce": "^3.0.0",
         "deemon": "^1.13.6",
-        "electron": "35.7.5",
+        "electron": "40.0.0",
         "eslint": "^9.39.2",
         "eslint-formatter-compact": "^8.40.0",
         "eslint-plugin-header": "3.1.1",
@@ -6731,15 +6731,15 @@
       "dev": true
     },
     "node_modules/electron": {
-      "version": "35.7.5",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-35.7.5.tgz",
-      "integrity": "sha512-dnL+JvLraKZl7iusXTVTGYs10TKfzUi30uEDTqsmTm0guN9V2tbOjTzyIZbh9n3ygUjgEYyo+igAwMRXIi3IPw==",
+      "version": "40.0.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-40.0.0.tgz",
+      "integrity": "sha512-UyBy5yJ0/wm4gNugCtNPjvddjAknMTuXR2aCHioXicH7aKRKGDBPp4xqTEi/doVcB3R+MN3wfU9o8d/9pwgK2A==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@electron/get": "^2.0.0",
-        "@types/node": "^22.7.7",
+        "@types/node": "^24.9.0",
         "extract-zip": "^2.0.1"
       },
       "bin": {
@@ -6757,22 +6757,15 @@
       "license": "ISC"
     },
     "node_modules/electron/node_modules/@types/node": {
-      "version": "22.18.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.1.tgz",
-      "integrity": "sha512-rzSDyhn4cYznVG+PCzGe1lwuMYJrcBS1fc3JqSa2PvtABwWo+dZ1ij5OVok3tqfpEBCBoaR4d7upFJk73HRJDw==",
+      "version": "24.10.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.9.tgz",
+      "integrity": "sha512-ne4A0IpG3+2ETuREInjPNhUGis1SFjv1d5asp8MzEAGtOZeTeHVDOYqOgqfhvseqg/iXty2hjBf1zAOb7RNiNw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~6.21.0"
+        "undici-types": "~7.16.0"
       }
     },
-    "node_modules/electron/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/emoji-regex": {
       "version": "10.3.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz",
diff --git a/package.json b/package.json
index 5e7f0177bd2f..bbcd8851217c 100644
--- a/package.json
+++ b/package.json
@@ -156,7 +156,7 @@
     "cssnano": "^6.0.3",
     "debounce": "^3.0.0",
     "deemon": "^1.13.6",
-    "electron": "35.7.5",
+    "electron": "40.0.0",
     "eslint": "^9.39.2",
     "eslint-formatter-compact": "^8.40.0",
     "eslint-plugin-header": "3.1.1",

From 232371ed717c9858983ce1ed0034c8bf8c0ff85e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 16:57:01 +0000
Subject: [PATCH 1686/1815] Bump @xterm/xterm from 5.6.0-beta.99 to 6.0.0 in
 /remote

Bumps [@xterm/xterm](https://github.com/xtermjs/xterm.js) from 5.6.0-beta.99 to 6.0.0.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits/6.0.0)

---
updated-dependencies:
- dependency-name: "@xterm/xterm"
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 13 ++++++++-----
 remote/package.json      |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index dc5cf9c509d5..88245456e651 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -29,7 +29,7 @@
         "@xterm/addon-unicode11": "^0.9.0-beta.99",
         "@xterm/addon-webgl": "^0.20.0-beta.104",
         "@xterm/headless": "^5.6.0-beta.99",
-        "@xterm/xterm": "^5.6.0-beta.99",
+        "@xterm/xterm": "^6.0.0",
         "cookie": "^0.7.0",
         "http-proxy-agent": "^7.0.0",
         "https-proxy-agent": "^7.0.2",
@@ -621,10 +621,13 @@
       "license": "MIT"
     },
     "node_modules/@xterm/xterm": {
-      "version": "5.6.0-beta.99",
-      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.99.tgz",
-      "integrity": "sha512-TwBXSyio63Sr2+eJ24BtrPiwTA8JpRbdzhNBYzCXs32yWX30X47UAcdgkahjkyt4JHSqhu7614/w5FOzHsNc/g==",
-      "license": "MIT"
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.0.0.tgz",
+      "integrity": "sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg==",
+      "license": "MIT",
+      "workspaces": [
+        "addons/*"
+      ]
     },
     "node_modules/agent-base": {
       "version": "7.1.4",
diff --git a/remote/package.json b/remote/package.json
index 5a5059ca4437..957e9847a2fa 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -24,7 +24,7 @@
     "@xterm/addon-unicode11": "^0.9.0-beta.99",
     "@xterm/addon-webgl": "^0.20.0-beta.104",
     "@xterm/headless": "^5.6.0-beta.99",
-    "@xterm/xterm": "^5.6.0-beta.99",
+    "@xterm/xterm": "^6.0.0",
     "cookie": "^0.7.0",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",

From cc36a7661708007ad18e7cfbe2d0f49b1dda5147 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 17:01:42 +0000
Subject: [PATCH 1687/1815] Bump @xterm/addon-unicode11 in /remote/web

Bumps [@xterm/addon-unicode11](https://github.com/xtermjs/xterm.js) from 0.9.0-beta.99 to 0.10.0-beta.105.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-unicode11"
  dependency-version: 0.10.0-beta.105
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index d494417feb8d..bafdfc30ec0c 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -19,7 +19,7 @@
 				"@xterm/addon-progress": "^0.2.0-beta.5",
 				"@xterm/addon-search": "^0.16.0-beta.99",
 				"@xterm/addon-serialize": "^0.14.0-beta.99",
-				"@xterm/addon-unicode11": "^0.9.0-beta.99",
+				"@xterm/addon-unicode11": "^0.10.0-beta.105",
 				"@xterm/addon-webgl": "^0.19.0-beta.99",
 				"@xterm/xterm": "^5.6.0-beta.99",
 				"jschardet": "3.1.4",
@@ -161,12 +161,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-unicode11": {
-			"version": "0.9.0-beta.99",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.99.tgz",
-			"integrity": "sha512-4epGzbOc7X+NyPIMPxnQxaUlZYhCRTEPRsvfuIx55+Yyzip/zGX5ahy/Z22YrGTVv7qjxhVsu1tCbCgiF9HtTA==",
+			"version": "0.10.0-beta.105",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.105.tgz",
+			"integrity": "sha512-zMepG3Wa44+n8SQbNZ8jnpASh9zDEuDlk/0+bpPaRRc4UkiR6UbhzZos+qC8glxu1QGLd/4dFMuypnNxWonkpQ==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.99"
+				"@xterm/xterm": "^6.1.0-beta.105"
 			}
 		},
 		"node_modules/@xterm/addon-webgl": {
diff --git a/remote/web/package.json b/remote/web/package.json
index e48ba3e9565b..16c894d962a8 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -14,7 +14,7 @@
 		"@xterm/addon-progress": "^0.2.0-beta.5",
 		"@xterm/addon-search": "^0.16.0-beta.99",
 		"@xterm/addon-serialize": "^0.14.0-beta.99",
-		"@xterm/addon-unicode11": "^0.9.0-beta.99",
+		"@xterm/addon-unicode11": "^0.10.0-beta.105",
 		"@xterm/addon-webgl": "^0.19.0-beta.99",
 		"@xterm/xterm": "^5.6.0-beta.99",
 		"jschardet": "3.1.4",

From 9df304c683ae42b131d48cb347f4b708dd5f8b5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 17:02:54 +0000
Subject: [PATCH 1688/1815] Bump @xterm/addon-image in /remote/web

Bumps [@xterm/addon-image](https://github.com/xtermjs/xterm.js) from 0.9.0-beta.99 to 0.10.0-beta.105.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-image"
  dependency-version: 0.10.0-beta.105
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index d494417feb8d..69945bfa4d73 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -14,7 +14,7 @@
 				"@vscode/tree-sitter-wasm": "^0.1.3",
 				"@vscode/vscode-languagedetection": "1.0.21",
 				"@xterm/addon-clipboard": "^0.3.0-beta.105",
-				"@xterm/addon-image": "^0.9.0-beta.99",
+				"@xterm/addon-image": "^0.10.0-beta.105",
 				"@xterm/addon-ligatures": "^0.10.0-beta.99",
 				"@xterm/addon-progress": "^0.2.0-beta.5",
 				"@xterm/addon-search": "^0.16.0-beta.99",
@@ -109,12 +109,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-image": {
-			"version": "0.9.0-beta.99",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.99.tgz",
-			"integrity": "sha512-fU6VsnB3X6RUVo5Y2ZACEnbS/3CSFPhWxkDML6r+fgPz6pV4IwGBFLuyvUPxfyfpYt5+3muh6ChDDwUjxG1Ldg==",
+			"version": "0.10.0-beta.105",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.105.tgz",
+			"integrity": "sha512-N/IYH+whr+4GG1J/1o4q2H6JVG56FX5hdm1ffjWjrhgyZl1qSOm8AHhozq3pssWljvtoTQRcAlHRAmEbrYT8jA==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.99"
+				"@xterm/xterm": "^6.1.0-beta.105"
 			}
 		},
 		"node_modules/@xterm/addon-ligatures": {
diff --git a/remote/web/package.json b/remote/web/package.json
index e48ba3e9565b..6ce925d21a04 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -9,7 +9,7 @@
 		"@vscode/tree-sitter-wasm": "^0.1.3",
 		"@vscode/vscode-languagedetection": "1.0.21",
 		"@xterm/addon-clipboard": "^0.3.0-beta.105",
-		"@xterm/addon-image": "^0.9.0-beta.99",
+		"@xterm/addon-image": "^0.10.0-beta.105",
 		"@xterm/addon-ligatures": "^0.10.0-beta.99",
 		"@xterm/addon-progress": "^0.2.0-beta.5",
 		"@xterm/addon-search": "^0.16.0-beta.99",

From 4d6041f2f5a56102562125390c87aadd175b69c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 17:05:36 +0000
Subject: [PATCH 1689/1815] Bump @xterm/addon-image from 0.9.0-beta.99 to
 0.10.0-beta.105 in /remote

Bumps [@xterm/addon-image](https://github.com/xtermjs/xterm.js) from 0.9.0-beta.99 to 0.10.0-beta.105.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-image"
  dependency-version: 0.10.0-beta.105
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 88245456e651..a7132e562510 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -21,7 +21,7 @@
         "@vscode/windows-process-tree": "^0.6.0",
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.3.0-beta.105",
-        "@xterm/addon-image": "^0.9.0-beta.99",
+        "@xterm/addon-image": "^0.10.0-beta.105",
         "@xterm/addon-ligatures": "^0.10.0-beta.99",
         "@xterm/addon-progress": "^0.2.0-beta.5",
         "@xterm/addon-search": "^0.16.0-beta.99",
@@ -545,12 +545,12 @@
       }
     },
     "node_modules/@xterm/addon-image": {
-      "version": "0.9.0-beta.99",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.9.0-beta.99.tgz",
-      "integrity": "sha512-fU6VsnB3X6RUVo5Y2ZACEnbS/3CSFPhWxkDML6r+fgPz6pV4IwGBFLuyvUPxfyfpYt5+3muh6ChDDwUjxG1Ldg==",
+      "version": "0.10.0-beta.105",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.105.tgz",
+      "integrity": "sha512-N/IYH+whr+4GG1J/1o4q2H6JVG56FX5hdm1ffjWjrhgyZl1qSOm8AHhozq3pssWljvtoTQRcAlHRAmEbrYT8jA==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.99"
+        "@xterm/xterm": "^6.1.0-beta.105"
       }
     },
     "node_modules/@xterm/addon-ligatures": {
diff --git a/remote/package.json b/remote/package.json
index 957e9847a2fa..98e001b2555f 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -16,7 +16,7 @@
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.3.0-beta.105",
-    "@xterm/addon-image": "^0.9.0-beta.99",
+    "@xterm/addon-image": "^0.10.0-beta.105",
     "@xterm/addon-ligatures": "^0.10.0-beta.99",
     "@xterm/addon-progress": "^0.2.0-beta.5",
     "@xterm/addon-search": "^0.16.0-beta.99",

From 95ab8240a528651f067a2e8697d27036fbfbdabe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 17:06:03 +0000
Subject: [PATCH 1690/1815] Bump @xterm/addon-webgl in /remote/web

Bumps [@xterm/addon-webgl](https://github.com/xtermjs/xterm.js) from 0.19.0-beta.99 to 0.20.0-beta.104.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-webgl"
  dependency-version: 0.20.0-beta.104
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index dd8d9ac8264e..dee5de1a7bf4 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -20,7 +20,7 @@
 				"@xterm/addon-search": "^0.16.0-beta.99",
 				"@xterm/addon-serialize": "^0.14.0-beta.99",
 				"@xterm/addon-unicode11": "^0.10.0-beta.105",
-				"@xterm/addon-webgl": "^0.19.0-beta.99",
+				"@xterm/addon-webgl": "^0.20.0-beta.104",
 				"@xterm/xterm": "^5.6.0-beta.99",
 				"jschardet": "3.1.4",
 				"tas-client-umd": "0.2.0",
@@ -170,12 +170,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-webgl": {
-			"version": "0.19.0-beta.99",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.99.tgz",
-			"integrity": "sha512-t4vTtwDLYWgzcH86s3hlCGaZWJWzTXLXUcgw/2l+Fkq9LFy4cLuQgWTVjOWLB0KOJ0FmT+g0sBWLApUw9bYa2w==",
+			"version": "0.20.0-beta.104",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.104.tgz",
+			"integrity": "sha512-S9zSxwnLXeF8RK1HZXLIdqZELF83ZHVyFJtqNj6b9SdjVMSFrQpa1wwWuJR1McW54hShX3aC9zLj1/1RKiwAxQ==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.99"
+				"@xterm/xterm": "^6.1.0-beta.105"
 			}
 		},
 		"node_modules/@xterm/xterm": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 33ce1160a9ab..d694434ee65e 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -15,7 +15,7 @@
 		"@xterm/addon-search": "^0.16.0-beta.99",
 		"@xterm/addon-serialize": "^0.14.0-beta.99",
 		"@xterm/addon-unicode11": "^0.10.0-beta.105",
-		"@xterm/addon-webgl": "^0.19.0-beta.99",
+		"@xterm/addon-webgl": "^0.20.0-beta.104",
 		"@xterm/xterm": "^5.6.0-beta.99",
 		"jschardet": "3.1.4",
 		"tas-client-umd": "0.2.0",

From c601d7575f3a741a4e4a59dcc31e024c810309b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 17:06:08 +0000
Subject: [PATCH 1691/1815] Bump @xterm/addon-serialize in /remote/web

Bumps [@xterm/addon-serialize](https://github.com/xtermjs/xterm.js) from 0.14.0-beta.99 to 0.15.0-beta.105.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-serialize"
  dependency-version: 0.15.0-beta.105
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index dd8d9ac8264e..fa23d121897f 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -18,7 +18,7 @@
 				"@xterm/addon-ligatures": "^0.10.0-beta.99",
 				"@xterm/addon-progress": "^0.2.0-beta.5",
 				"@xterm/addon-search": "^0.16.0-beta.99",
-				"@xterm/addon-serialize": "^0.14.0-beta.99",
+				"@xterm/addon-serialize": "^0.15.0-beta.105",
 				"@xterm/addon-unicode11": "^0.10.0-beta.105",
 				"@xterm/addon-webgl": "^0.19.0-beta.99",
 				"@xterm/xterm": "^5.6.0-beta.99",
@@ -152,12 +152,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-serialize": {
-			"version": "0.14.0-beta.99",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.99.tgz",
-			"integrity": "sha512-7ULW4BUUGL1Bv8vGBNylaBTpKFDm7rjMdkOwJt+LVd/oJkyL8RFSGgQSuYb+5DyiEhBSpeahg3bi8bStxufvMQ==",
+			"version": "0.15.0-beta.105",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.105.tgz",
+			"integrity": "sha512-VK8gvMwtJbZ5NXAmE3lsnz3lWo0s/dn52Yppq9pm03BSCPVs6zF8zqHU+gkiXuGR2e0+oNAnu1A66+cLR83RGw==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.99"
+				"@xterm/xterm": "^6.1.0-beta.105"
 			}
 		},
 		"node_modules/@xterm/addon-unicode11": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 33ce1160a9ab..b8067a2a34ff 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -13,7 +13,7 @@
 		"@xterm/addon-ligatures": "^0.10.0-beta.99",
 		"@xterm/addon-progress": "^0.2.0-beta.5",
 		"@xterm/addon-search": "^0.16.0-beta.99",
-		"@xterm/addon-serialize": "^0.14.0-beta.99",
+		"@xterm/addon-serialize": "^0.15.0-beta.105",
 		"@xterm/addon-unicode11": "^0.10.0-beta.105",
 		"@xterm/addon-webgl": "^0.19.0-beta.99",
 		"@xterm/xterm": "^5.6.0-beta.99",

From f2940e2daca424b31dcbdfe68ec2272ae6a6fe80 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 17:10:04 +0000
Subject: [PATCH 1692/1815] Bump @xterm/addon-ligatures in /remote

Bumps [@xterm/addon-ligatures](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.99 to 0.11.0-beta.105.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-ligatures"
  dependency-version: 0.11.0-beta.105
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index a7132e562510..788f3c33ab99 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -22,7 +22,7 @@
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.3.0-beta.105",
         "@xterm/addon-image": "^0.10.0-beta.105",
-        "@xterm/addon-ligatures": "^0.10.0-beta.99",
+        "@xterm/addon-ligatures": "^0.11.0-beta.105",
         "@xterm/addon-progress": "^0.2.0-beta.5",
         "@xterm/addon-search": "^0.16.0-beta.99",
         "@xterm/addon-serialize": "^0.14.0-beta.99",
@@ -554,9 +554,9 @@
       }
     },
     "node_modules/@xterm/addon-ligatures": {
-      "version": "0.10.0-beta.99",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.99.tgz",
-      "integrity": "sha512-QlhUtBlIC7ZgEykpWxFl5lc2MtIFJD41pT8bQVRD1wGShgUmceNTk4xd3CjiQdVOtTrHcgOTM75YmS5GOlobOA==",
+      "version": "0.11.0-beta.105",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.105.tgz",
+      "integrity": "sha512-6ycj4nMyqLoBLtmQlxDOj1dxqDpwTO16/SUt87zZX/DWtj095xxH3FcRPN2ZNnda33NgUC8s4MhxROLZ7Q09SA==",
       "license": "MIT",
       "dependencies": {
         "lru-cache": "^6.0.0",
@@ -566,7 +566,7 @@
         "node": ">8.0.0"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.99"
+        "@xterm/xterm": "^6.1.0-beta.105"
       }
     },
     "node_modules/@xterm/addon-progress": {
diff --git a/remote/package.json b/remote/package.json
index 98e001b2555f..8ceade811c8f 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -17,7 +17,7 @@
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.3.0-beta.105",
     "@xterm/addon-image": "^0.10.0-beta.105",
-    "@xterm/addon-ligatures": "^0.10.0-beta.99",
+    "@xterm/addon-ligatures": "^0.11.0-beta.105",
     "@xterm/addon-progress": "^0.2.0-beta.5",
     "@xterm/addon-search": "^0.16.0-beta.99",
     "@xterm/addon-serialize": "^0.14.0-beta.99",

From dcae7fccb126df5c34325412e98658c1af9f51d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 12:19:21 +0000
Subject: [PATCH 1693/1815] Bump reqwest from 0.12.5 to 0.12.9 in /cli

Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.12.5 to 0.12.9.
- [Release notes](https://github.com/seanmonstar/reqwest/releases)
- [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/seanmonstar/reqwest/compare/v0.12.5...v0.12.9)

---
updated-dependencies:
- dependency-name: reqwest
  dependency-version: 0.12.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 51 ++++++++++++++++++++++++++++++++++++--------------
 cli/Cargo.toml |  2 +-
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index ca40ecd29123..d611618c6df3 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -450,7 +450,7 @@ dependencies = [
  "pin-project",
  "rand 0.9.2",
  "regex",
- "reqwest 0.12.5",
+ "reqwest 0.12.9",
  "rmp-serde",
  "serde",
  "serde_bytes",
@@ -2369,9 +2369,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.5"
+version = "0.12.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -2405,7 +2405,7 @@ dependencies = [
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "winreg 0.52.0",
+ "windows-registry",
 ]
 
 [[package]]
@@ -2848,6 +2848,9 @@ name = "sync_wrapper"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
 
 [[package]]
 name = "synstructure"
@@ -3475,6 +3478,36 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -3743,16 +3776,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "winreg"
 version = "0.55.0"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 633373303b70..a0a21ae4bee3 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -15,7 +15,7 @@ name = "code"
 futures = "0.3.31"
 clap = { version = "4.5.54", features = ["derive", "env"] }
 open = "5.3.3"
-reqwest = { version = "0.12.5", default-features = false, features = ["json", "stream", "native-tls"] }
+reqwest = { version = "0.12.9", default-features = false, features = ["json", "stream", "native-tls"] }
 tokio = { version = "1.49.0", features = ["full"] }
 tokio-util = { version = "0.7.18", features = ["compat", "codec"] }
 flate2 = { version = "1.1.8", default-features = false, features = ["zlib"] }

From b6b46b2c13c2af587aeb416afcac363924154f45 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 12:19:39 +0000
Subject: [PATCH 1694/1815] Bump zbus from 4.4.0 to 5.4.0 in /cli

Bumps [zbus](https://github.com/z-galaxy/zbus) from 4.4.0 to 5.4.0.
- [Release notes](https://github.com/z-galaxy/zbus/releases)
- [Changelog](https://github.com/z-galaxy/zbus/blob/main/release-plz.toml)
- [Commits](https://github.com/z-galaxy/zbus/compare/zbus-4.4.0...zbus-5.4.0)

---
updated-dependencies:
- dependency-name: zbus
  dependency-version: 5.4.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 79 +++++++++++++++++++-------------------------------
 cli/Cargo.toml |  2 +-
 2 files changed, 31 insertions(+), 50 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index ca40ecd29123..fadd7f11c034 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -194,24 +194,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "async-process"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75"
-dependencies = [
- "async-channel",
- "async-io 2.3.2",
- "async-lock 3.3.0",
- "async-signal",
- "async-task",
- "blocking",
- "cfg-if",
- "event-listener 5.3.0",
- "futures-lite 2.3.0",
- "rustix 1.1.3",
-]
-
 [[package]]
 name = "async-recursion"
 version = "1.1.1"
@@ -468,7 +450,7 @@ dependencies = [
  "uuid",
  "winapi",
  "winreg 0.55.0",
- "zbus 4.4.0",
+ "zbus 5.4.0",
  "zip",
 ]
 
@@ -955,10 +937,7 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
 dependencies = [
- "fastrand 2.1.0",
  "futures-core",
- "futures-io",
- "parking",
  "pin-project-lite",
 ]
 
@@ -3843,7 +3822,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6"
 dependencies = [
  "async-broadcast 0.5.1",
- "async-process 1.8.1",
+ "async-process",
  "async-recursion",
  "async-trait",
  "byteorder",
@@ -3874,35 +3853,32 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "4.4.0"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
+checksum = "cbddd8b6cb25d5d8ec1b23277b45299a98bfb220f1761ca11e186d5c702507f8"
 dependencies = [
  "async-broadcast 0.7.2",
- "async-process 2.5.0",
  "async-recursion",
  "async-trait",
  "enumflags2",
  "event-listener 5.3.0",
  "futures-core",
- "futures-sink",
  "futures-util",
  "hex",
  "nix 0.29.0",
  "ordered-stream",
- "rand 0.8.5",
  "serde",
  "serde_repr",
- "sha1",
  "static_assertions",
  "tokio",
  "tracing",
  "uds_windows",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
+ "winnow 0.7.14",
  "xdg-home",
- "zbus_macros 4.4.0",
- "zbus_names 3.0.0",
- "zvariant 4.2.0",
+ "zbus_macros 5.4.0",
+ "zbus_names 4.3.1",
+ "zvariant 5.9.2",
 ]
 
 [[package]]
@@ -3921,15 +3897,17 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "4.4.0"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
+checksum = "dac404d48b4e9cf193c8b49589f3280ceca5ff63519e7e64f55b4cf9c47ce146"
 dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
  "syn 2.0.87",
- "zvariant_utils 2.1.0",
+ "zbus_names 4.3.1",
+ "zvariant 5.9.2",
+ "zvariant_utils 3.3.0",
 ]
 
 [[package]]
@@ -3945,13 +3923,13 @@ dependencies = [
 
 [[package]]
 name = "zbus_names"
-version = "3.0.0"
+version = "4.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
+checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f"
 dependencies = [
  "serde",
- "static_assertions",
- "zvariant 4.2.0",
+ "winnow 0.7.14",
+ "zvariant 5.9.2",
 ]
 
 [[package]]
@@ -4042,15 +4020,16 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "4.2.0"
+version = "5.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
+checksum = "68b64ef4f40c7951337ddc7023dd03528a57a3ce3408ee9da5e948bd29b232c4"
 dependencies = [
  "endi",
  "enumflags2",
  "serde",
- "static_assertions",
- "zvariant_derive 4.2.0",
+ "winnow 0.7.14",
+ "zvariant_derive 5.9.2",
+ "zvariant_utils 3.3.0",
 ]
 
 [[package]]
@@ -4068,15 +4047,15 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "4.2.0"
+version = "5.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
+checksum = "484d5d975eb7afb52cc6b929c13d3719a20ad650fea4120e6310de3fc55e415c"
 dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
  "syn 2.0.87",
- "zvariant_utils 2.1.0",
+ "zvariant_utils 3.3.0",
 ]
 
 [[package]]
@@ -4092,11 +4071,13 @@ dependencies = [
 
 [[package]]
 name = "zvariant_utils"
-version = "2.1.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
+checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9"
 dependencies = [
  "proc-macro2",
  "quote",
+ "serde",
  "syn 2.0.87",
+ "winnow 0.7.14",
 ]
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 633373303b70..77d7af1be977 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -67,7 +67,7 @@ winapi = "0.3.9"
 core-foundation = "0.10.1"
 
 [target.'cfg(target_os = "linux")'.dependencies]
-zbus = { version = "4.4.0", default-features = false, features = ["tokio"] }
+zbus = { version = "5.4.0", default-features = false, features = ["tokio"] }
 
 [patch.crates-io]
 russh = { git = "https://github.com/microsoft/vscode-russh", branch = "main" }

From 5415e49ea0f2bd40ea0dd31742ce68ea4ac36753 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 12:20:02 +0000
Subject: [PATCH 1695/1815] Bump tempfile from 3.11.0 to 3.12.0 in /cli

Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.11.0 to 3.12.0.
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.11.0...v3.12.0)

---
updated-dependencies:
- dependency-name: tempfile
  dependency-version: 3.12.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 6 +++---
 cli/Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index ca40ecd29123..dda052cfad9f 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -2903,15 +2903,15 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.11.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
 dependencies = [
  "cfg-if",
  "fastrand 2.1.0",
  "once_cell",
  "rustix 0.38.34",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 633373303b70..5184b24bb967 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -39,7 +39,7 @@ keyring = { version = "2.0.3", default-features = false, features = ["linux-secr
 dialoguer = "0.12.0"
 hyper = { version = "0.14.26", features = ["server", "http1", "runtime"] }
 indicatif = "0.18.3"
-tempfile = "3.11.0"
+tempfile = "3.12.0"
 clap_lex = "0.7.7"
 url = "2.5.4"
 async-trait = "0.1.89"

From c6a4f4f8b7de649517b5593553aaaa8ef36de99c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 12:21:57 +0000
Subject: [PATCH 1696/1815] Bump @vscode/iconv-lite-umd from 0.7.0 to 0.7.1 in
 /remote

Bumps [@vscode/iconv-lite-umd](https://github.com/Microsoft/vscode-iconv-lite-umd) from 0.7.0 to 0.7.1.
- [Release notes](https://github.com/Microsoft/vscode-iconv-lite-umd/releases)
- [Commits](https://github.com/Microsoft/vscode-iconv-lite-umd/commits/v0.7.1)

---
updated-dependencies:
- dependency-name: "@vscode/iconv-lite-umd"
  dependency-version: 0.7.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 788f3c33ab99..7dec04023520 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -12,7 +12,7 @@
         "@microsoft/1ds-post-js": "^3.2.13",
         "@parcel/watcher": "2.5.1",
         "@vscode/deviceid": "^0.1.1",
-        "@vscode/iconv-lite-umd": "0.7.0",
+        "@vscode/iconv-lite-umd": "0.7.1",
         "@vscode/proxy-agent": "^0.32.0",
         "@vscode/ripgrep": "^1.15.11",
         "@vscode/spdlog": "^0.15.0",
@@ -420,9 +420,9 @@
       }
     },
     "node_modules/@vscode/iconv-lite-umd": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
-      "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==",
+      "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/proxy-agent": {
diff --git a/remote/package.json b/remote/package.json
index 8ceade811c8f..44b739b057b9 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -7,7 +7,7 @@
     "@microsoft/1ds-post-js": "^3.2.13",
     "@parcel/watcher": "2.5.1",
     "@vscode/deviceid": "^0.1.1",
-    "@vscode/iconv-lite-umd": "0.7.0",
+    "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/proxy-agent": "^0.32.0",
     "@vscode/ripgrep": "^1.15.11",
     "@vscode/spdlog": "^0.15.0",

From 68bfdb7770114075cc0dec3e653c3af82835c751 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 12:21:58 +0000
Subject: [PATCH 1697/1815] Bump @vscode/vscode-languagedetection in
 /remote/web

Bumps [@vscode/vscode-languagedetection](https://github.com/microsoft/vscode-languagedetection) from 1.0.21 to 1.0.23.
- [Release notes](https://github.com/microsoft/vscode-languagedetection/releases)
- [Commits](https://github.com/microsoft/vscode-languagedetection/commits/v1.0.23)

---
updated-dependencies:
- dependency-name: "@vscode/vscode-languagedetection"
  dependency-version: 1.0.23
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 8 ++++----
 remote/web/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 36b6d2581179..d43d8173c20e 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -12,7 +12,7 @@
 				"@microsoft/1ds-post-js": "^3.2.13",
 				"@vscode/iconv-lite-umd": "0.7.0",
 				"@vscode/tree-sitter-wasm": "^0.1.3",
-				"@vscode/vscode-languagedetection": "1.0.21",
+				"@vscode/vscode-languagedetection": "1.0.23",
 				"@xterm/addon-clipboard": "^0.3.0-beta.105",
 				"@xterm/addon-image": "^0.10.0-beta.105",
 				"@xterm/addon-ligatures": "^0.10.0-beta.99",
@@ -88,9 +88,9 @@
 			"license": "MIT"
 		},
 		"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==",
+			"version": "1.0.23",
+			"resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.23.tgz",
+			"integrity": "sha512-Ywk6vXC81nUHvc9WX3uFJG/UHFLXDYJgNeUVirBLJGvmchXHdapsGeAYclNqO1thQLmykmJhSouIZV+JJS8o1A==",
 			"license": "MIT",
 			"bin": {
 				"vscode-languagedetection": "cli/index.js"
diff --git a/remote/web/package.json b/remote/web/package.json
index ac65d0027ba3..8feb33e186e9 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -7,7 +7,7 @@
 		"@microsoft/1ds-post-js": "^3.2.13",
 		"@vscode/iconv-lite-umd": "0.7.0",
 		"@vscode/tree-sitter-wasm": "^0.1.3",
-		"@vscode/vscode-languagedetection": "1.0.21",
+		"@vscode/vscode-languagedetection": "1.0.23",
 		"@xterm/addon-clipboard": "^0.3.0-beta.105",
 		"@xterm/addon-image": "^0.10.0-beta.105",
 		"@xterm/addon-ligatures": "^0.10.0-beta.99",

From a0847af3378fdb752fef10b62296ec21dbebe7ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 12:22:01 +0000
Subject: [PATCH 1698/1815] Bump @vscode/vscode-languagedetection from 1.0.21
 to 1.0.23 in /remote

Bumps [@vscode/vscode-languagedetection](https://github.com/microsoft/vscode-languagedetection) from 1.0.21 to 1.0.23.
- [Release notes](https://github.com/microsoft/vscode-languagedetection/releases)
- [Commits](https://github.com/microsoft/vscode-languagedetection/commits/v1.0.23)

---
updated-dependencies:
- dependency-name: "@vscode/vscode-languagedetection"
  dependency-version: 1.0.23
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 788f3c33ab99..567f008a511c 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -17,7 +17,7 @@
         "@vscode/ripgrep": "^1.15.11",
         "@vscode/spdlog": "^0.15.0",
         "@vscode/tree-sitter-wasm": "^0.1.3",
-        "@vscode/vscode-languagedetection": "1.0.21",
+        "@vscode/vscode-languagedetection": "1.0.23",
         "@vscode/windows-process-tree": "^0.6.0",
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.3.0-beta.105",
@@ -483,9 +483,9 @@
       "license": "MIT"
     },
     "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==",
+      "version": "1.0.23",
+      "resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.23.tgz",
+      "integrity": "sha512-Ywk6vXC81nUHvc9WX3uFJG/UHFLXDYJgNeUVirBLJGvmchXHdapsGeAYclNqO1thQLmykmJhSouIZV+JJS8o1A==",
       "license": "MIT",
       "bin": {
         "vscode-languagedetection": "cli/index.js"
diff --git a/remote/package.json b/remote/package.json
index 8ceade811c8f..5efc719b2a6f 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -12,7 +12,7 @@
     "@vscode/ripgrep": "^1.15.11",
     "@vscode/spdlog": "^0.15.0",
     "@vscode/tree-sitter-wasm": "^0.1.3",
-    "@vscode/vscode-languagedetection": "1.0.21",
+    "@vscode/vscode-languagedetection": "1.0.23",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.3.0-beta.105",

From 09c02fcc8671ec23160d576eb9ebc1013d3355b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 12:22:06 +0000
Subject: [PATCH 1699/1815] Bump @xterm/addon-serialize in /remote

Bumps [@xterm/addon-serialize](https://github.com/xtermjs/xterm.js) from 0.14.0-beta.99 to 0.15.0-beta.105.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-serialize"
  dependency-version: 0.15.0-beta.105
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 788f3c33ab99..36d114e8d99f 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -25,7 +25,7 @@
         "@xterm/addon-ligatures": "^0.11.0-beta.105",
         "@xterm/addon-progress": "^0.2.0-beta.5",
         "@xterm/addon-search": "^0.16.0-beta.99",
-        "@xterm/addon-serialize": "^0.14.0-beta.99",
+        "@xterm/addon-serialize": "^0.15.0-beta.105",
         "@xterm/addon-unicode11": "^0.9.0-beta.99",
         "@xterm/addon-webgl": "^0.20.0-beta.104",
         "@xterm/headless": "^5.6.0-beta.99",
@@ -588,12 +588,12 @@
       }
     },
     "node_modules/@xterm/addon-serialize": {
-      "version": "0.14.0-beta.99",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.99.tgz",
-      "integrity": "sha512-7ULW4BUUGL1Bv8vGBNylaBTpKFDm7rjMdkOwJt+LVd/oJkyL8RFSGgQSuYb+5DyiEhBSpeahg3bi8bStxufvMQ==",
+      "version": "0.15.0-beta.105",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.105.tgz",
+      "integrity": "sha512-VK8gvMwtJbZ5NXAmE3lsnz3lWo0s/dn52Yppq9pm03BSCPVs6zF8zqHU+gkiXuGR2e0+oNAnu1A66+cLR83RGw==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.99"
+        "@xterm/xterm": "^6.1.0-beta.105"
       }
     },
     "node_modules/@xterm/addon-unicode11": {
diff --git a/remote/package.json b/remote/package.json
index 8ceade811c8f..36c1a4ee00e8 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -20,7 +20,7 @@
     "@xterm/addon-ligatures": "^0.11.0-beta.105",
     "@xterm/addon-progress": "^0.2.0-beta.5",
     "@xterm/addon-search": "^0.16.0-beta.99",
-    "@xterm/addon-serialize": "^0.14.0-beta.99",
+    "@xterm/addon-serialize": "^0.15.0-beta.105",
     "@xterm/addon-unicode11": "^0.9.0-beta.99",
     "@xterm/addon-webgl": "^0.20.0-beta.104",
     "@xterm/headless": "^5.6.0-beta.99",

From 6d713026bf23590d85f0f1e8ba996bfd662e308e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 12:22:07 +0000
Subject: [PATCH 1700/1815] Bump @xterm/addon-search in /remote/web

Bumps [@xterm/addon-search](https://github.com/xtermjs/xterm.js) from 0.16.0-beta.99 to 0.17.0-beta.105.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-search"
  dependency-version: 0.17.0-beta.105
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 36b6d2581179..8d0ff73394be 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -17,7 +17,7 @@
 				"@xterm/addon-image": "^0.10.0-beta.105",
 				"@xterm/addon-ligatures": "^0.10.0-beta.99",
 				"@xterm/addon-progress": "^0.2.0-beta.5",
-				"@xterm/addon-search": "^0.16.0-beta.99",
+				"@xterm/addon-search": "^0.17.0-beta.105",
 				"@xterm/addon-serialize": "^0.15.0-beta.105",
 				"@xterm/addon-unicode11": "^0.10.0-beta.105",
 				"@xterm/addon-webgl": "^0.20.0-beta.104",
@@ -143,12 +143,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-search": {
-			"version": "0.16.0-beta.99",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.99.tgz",
-			"integrity": "sha512-nyqGsZDR/l0Gp4gaS+Brrjm53dpaNAqOUtAC8BXmvuzK21sQgyLsC99MTLNR5yh3dYJAfWAAhG5ke/Re3AaamQ==",
+			"version": "0.17.0-beta.105",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.105.tgz",
+			"integrity": "sha512-HkjOQiPWKnKnyeBJm1Q4Dt/JexT1DOPlT5yBylg0r8iCmZBAf3BIt5IDXCgjLrS31WF210Ho1rAstN9kwCNttw==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.99"
+				"@xterm/xterm": "^6.1.0-beta.105"
 			}
 		},
 		"node_modules/@xterm/addon-serialize": {
diff --git a/remote/web/package.json b/remote/web/package.json
index ac65d0027ba3..74218ad7a669 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -12,7 +12,7 @@
 		"@xterm/addon-image": "^0.10.0-beta.105",
 		"@xterm/addon-ligatures": "^0.10.0-beta.99",
 		"@xterm/addon-progress": "^0.2.0-beta.5",
-		"@xterm/addon-search": "^0.16.0-beta.99",
+		"@xterm/addon-search": "^0.17.0-beta.105",
 		"@xterm/addon-serialize": "^0.15.0-beta.105",
 		"@xterm/addon-unicode11": "^0.10.0-beta.105",
 		"@xterm/addon-webgl": "^0.20.0-beta.104",

From c3f253fefdf01e06de246bf5eb06973dfbc85c98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 12:22:10 +0000
Subject: [PATCH 1701/1815] Bump @xterm/headless from 5.6.0-beta.99 to 6.0.0 in
 /remote

Bumps [@xterm/headless](https://github.com/xtermjs/xterm.js) from 5.6.0-beta.99 to 6.0.0.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits/6.0.0)

---
updated-dependencies:
- dependency-name: "@xterm/headless"
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 13 ++++++++-----
 remote/package.json      |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 788f3c33ab99..d308a52b3fac 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -28,7 +28,7 @@
         "@xterm/addon-serialize": "^0.14.0-beta.99",
         "@xterm/addon-unicode11": "^0.9.0-beta.99",
         "@xterm/addon-webgl": "^0.20.0-beta.104",
-        "@xterm/headless": "^5.6.0-beta.99",
+        "@xterm/headless": "^6.0.0",
         "@xterm/xterm": "^6.0.0",
         "cookie": "^0.7.0",
         "http-proxy-agent": "^7.0.0",
@@ -615,10 +615,13 @@
       }
     },
     "node_modules/@xterm/headless": {
-      "version": "5.6.0-beta.99",
-      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-5.6.0-beta.99.tgz",
-      "integrity": "sha512-E+TR7Cgdb9tHGYw96cexH9l5ghsQEFfw4LaXKxmdlogs43qk2HPwwI7fR/i7t7Ci9ScBXf2gMP76NPpfeX1hZQ==",
-      "license": "MIT"
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@xterm/headless/-/headless-6.0.0.tgz",
+      "integrity": "sha512-5Yj1QINYCyzrZtf8OFIHi47iQtI+0qYFPHmouEfG8dHNxbZ9Tb9YGSuLcsEwj9Z+OL75GJqPyJbyoFer80a2Hw==",
+      "license": "MIT",
+      "workspaces": [
+        "addons/*"
+      ]
     },
     "node_modules/@xterm/xterm": {
       "version": "6.0.0",
diff --git a/remote/package.json b/remote/package.json
index 8ceade811c8f..692cd5f24d81 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -23,7 +23,7 @@
     "@xterm/addon-serialize": "^0.14.0-beta.99",
     "@xterm/addon-unicode11": "^0.9.0-beta.99",
     "@xterm/addon-webgl": "^0.20.0-beta.104",
-    "@xterm/headless": "^5.6.0-beta.99",
+    "@xterm/headless": "^6.0.0",
     "@xterm/xterm": "^6.0.0",
     "cookie": "^0.7.0",
     "http-proxy-agent": "^7.0.0",

From 3718f9850f4b438021345c674488e52889bd7cab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 12:22:13 +0000
Subject: [PATCH 1702/1815] Bump lazy.js from 0.4.3 to 0.5.1

Bumps [lazy.js](https://github.com/dtao/lazy.js) from 0.4.3 to 0.5.1.
- [Changelog](https://github.com/dtao/lazy.js/blob/master/CHANGES.md)
- [Commits](https://github.com/dtao/lazy.js/compare/0.4.3...0.5.1)

---
updated-dependencies:
- dependency-name: lazy.js
  dependency-version: 0.5.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 11 ++++++-----
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 69bc344f0370..8c6948fcba78 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -129,7 +129,7 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^5.0.6",
         "istanbul-reports": "^3.2.0",
-        "lazy.js": "^0.4.2",
+        "lazy.js": "^0.5.1",
         "merge-options": "^1.0.1",
         "mime": "^1.4.1",
         "minimatch": "^3.0.4",
@@ -11424,10 +11424,11 @@
       }
     },
     "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
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/lazy.js/-/lazy.js-0.5.1.tgz",
+      "integrity": "sha512-p9v24vaKrzS2mEx3yuzva/3M6I3+HwvXd0pB1Xf/IvsFIMdhQgmym7JBO0e7c0OZmKTo07sCuiCIm6jazSWFNw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lazystream": {
       "version": "1.0.0",
diff --git a/package.json b/package.json
index d56241bfa11a..28714ab40632 100644
--- a/package.json
+++ b/package.json
@@ -188,7 +188,7 @@
     "istanbul-lib-report": "^3.0.0",
     "istanbul-lib-source-maps": "^5.0.6",
     "istanbul-reports": "^3.2.0",
-    "lazy.js": "^0.4.2",
+    "lazy.js": "^0.5.1",
     "merge-options": "^1.0.1",
     "mime": "^1.4.1",
     "minimatch": "^3.0.4",

From 3846e478a25b33760eaa2c09b05267f724cfdb86 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 12:22:46 +0000
Subject: [PATCH 1703/1815] Bump tslib from 2.6.3 to 2.8.1

Bumps [tslib](https://github.com/Microsoft/tslib) from 2.6.3 to 2.8.1.
- [Release notes](https://github.com/Microsoft/tslib/releases)
- [Commits](https://github.com/Microsoft/tslib/compare/v2.6.3...v2.8.1)

---
updated-dependencies:
- dependency-name: tslib
  dependency-version: 2.8.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 11 ++++++-----
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 69bc344f0370..e1427370936f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -154,7 +154,7 @@
         "ts-loader": "^9.5.1",
         "ts-node": "^10.9.1",
         "tsec": "0.2.7",
-        "tslib": "^2.6.3",
+        "tslib": "^2.8.1",
         "typescript": "^5.9.3",
         "typescript-eslint": "^8.8.0",
         "util": "^0.12.4",
@@ -16594,10 +16594,11 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
-      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
-      "dev": true
+      "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",
diff --git a/package.json b/package.json
index d56241bfa11a..983da927edf3 100644
--- a/package.json
+++ b/package.json
@@ -213,7 +213,7 @@
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.1",
     "tsec": "0.2.7",
-    "tslib": "^2.6.3",
+    "tslib": "^2.8.1",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.8.0",
     "util": "^0.12.4",

From 78d5ff899e957ba7a494dfc8823841aff5e98f75 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 12:22:57 +0000
Subject: [PATCH 1704/1815] Bump istanbul-lib-instrument from 6.0.1 to 6.0.3

Bumps [istanbul-lib-instrument](https://github.com/istanbuljs/istanbuljs/tree/HEAD/packages/istanbul-lib-instrument) from 6.0.1 to 6.0.3.
- [Release notes](https://github.com/istanbuljs/istanbuljs/releases)
- [Changelog](https://github.com/istanbuljs/istanbuljs/blob/main/packages/istanbul-lib-instrument/CHANGELOG.md)
- [Commits](https://github.com/istanbuljs/istanbuljs/commits/istanbul-lib-instrument-v6.0.3/packages/istanbul-lib-instrument)

---
updated-dependencies:
- dependency-name: istanbul-lib-instrument
  dependency-version: 6.0.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 565 +++++++++++++++-------------------------------
 package.json      |   2 +-
 2 files changed, 183 insertions(+), 384 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 69bc344f0370..cd1f72383b80 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -125,7 +125,7 @@
         "husky": "^9.1.7",
         "innosetup": "^6.4.1",
         "istanbul-lib-coverage": "^3.2.0",
-        "istanbul-lib-instrument": "^6.0.1",
+        "istanbul-lib-instrument": "^6.0.3",
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^5.0.6",
         "istanbul-reports": "^3.2.0",
@@ -168,19 +168,6 @@
         "windows-foreground-love": "0.5.0"
       }
     },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@azure-rest/ai-translation-text": {
       "version": "1.0.0-beta.1",
       "resolved": "https://registry.npmjs.org/@azure-rest/ai-translation-text/-/ai-translation-text-1.0.0-beta.1.tgz",
@@ -473,110 +460,52 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
-      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.28.6.tgz",
+      "integrity": "sha512-JYgintcMjRiCvS8mMECzaEn+m3PfoQiyqukOMCCVQtoJGYJw8j/8LBJEiqkHLkfwCcs74E3pbAUFNg7d9VNJ+Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.22.13",
-        "chalk": "^2.4.2"
+        "@babel/helper-validator-identifier": "^7.28.5",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/code-frame/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/code-frame/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/compat-data": {
-      "version": "7.18.8",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz",
-      "integrity": "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.6.tgz",
+      "integrity": "sha512-2lfu57JtzctfIrcGMz992hyLlByuzgIk58+hhGCxjKZ3rWI82NnVLjXcaTqkI2NvlcvOskZaiZ5kjUALo3Lpxg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz",
-      "integrity": "sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.18.10",
-        "@babel/helper-compilation-targets": "^7.18.9",
-        "@babel/helper-module-transforms": "^7.18.9",
-        "@babel/helpers": "^7.18.9",
-        "@babel/parser": "^7.18.10",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.18.10",
-        "@babel/types": "^7.18.10",
-        "convert-source-map": "^1.7.0",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.6.tgz",
+      "integrity": "sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.28.6",
+        "@babel/generator": "^7.28.6",
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-module-transforms": "^7.28.6",
+        "@babel/helpers": "^7.28.6",
+        "@babel/parser": "^7.28.6",
+        "@babel/template": "^7.28.6",
+        "@babel/traverse": "^7.28.6",
+        "@babel/types": "^7.28.6",
+        "@jridgewell/remapping": "^2.3.5",
+        "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -586,60 +515,65 @@
         "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",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.6.tgz",
+      "integrity": "sha512-lOoVRwADj8hjf7al89tvQ2a1lf53Z+7tiXMgpZJL3maQPDxh0DgLMN62B2MKUOFcoodBHLMbDM6WAbKgNy5Suw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.23.0",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jsesc": "^2.5.1"
+        "@babel/parser": "^7.28.6",
+        "@babel/types": "^7.28.6",
+        "@jridgewell/gen-mapping": "^0.3.12",
+        "@jridgewell/trace-mapping": "^0.3.28",
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz",
+      "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@babel/compat-data": "^7.28.6",
+        "@babel/helper-validator-option": "^7.27.1",
+        "browserslist": "^4.24.0",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz",
-      "integrity": "sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==",
+    "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": {
-        "@babel/compat-data": "^7.18.8",
-        "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.20.2",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "yallist": "^3.0.2"
       }
     },
     "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
@@ -647,221 +581,113 @@
       "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-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+    "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==",
       "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
+      "license": "ISC"
     },
-    "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==",
+    "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==",
       "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz",
+      "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/traverse": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz",
-      "integrity": "sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "@babel/template": "^7.18.6",
-        "@babel/traverse": "^7.18.9",
-        "@babel/types": "^7.18.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz",
-      "integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz",
+      "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/helper-module-imports": "^7.28.6",
+        "@babel/helper-validator-identifier": "^7.28.5",
+        "@babel/traverse": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz",
-      "integrity": "sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.18.6",
-        "@babel/traverse": "^7.18.9",
-        "@babel/types": "^7.18.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
-      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.6.tgz",
+      "integrity": "sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
+        "@babel/template": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/@babel/parser": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.6.tgz",
+      "integrity": "sha512-TeR9zWR18BvbfPmGbLampPMW+uW1NZnJlRuuHso8i87QZNq2JRF9i6RgxRqtEq+wQGsS19NNTWr2duhnE49mfQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "@babel/types": "^7.28.6"
       },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
-      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
-      "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -870,58 +696,48 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
+      "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
+        "@babel/code-frame": "^7.28.6",
+        "@babel/parser": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.0",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.0",
-        "@babel/types": "^7.23.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.6.tgz",
+      "integrity": "sha512-fgWX62k02qtjqdSNTAGxmKYY/7FSL9WAS1o2Hu5+I5m9T0yxZzr4cnrfXQ/MX0rIifthCSs6FKTlzYbJcPtMNg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.28.6",
+        "@babel/generator": "^7.28.6",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/parser": "^7.28.6",
+        "@babel/template": "^7.28.6",
+        "@babel/types": "^7.28.6",
+        "debug": "^4.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/traverse/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/types": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
-      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.6.tgz",
+      "integrity": "sha512-0ZrskXVEHSWIqZM/sQZ4EV3jZJXRkio/WCxaqKZP1g//CEWEPSfeZFcms4XeKBCHU0ZKnIkdJeU/kF+eRp5lBg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1532,16 +1348,25 @@
       }
     },
     "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==",
+      "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==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      },
-      "engines": {
-        "node": ">=6.0.0"
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
@@ -1553,15 +1378,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@jridgewell/source-map": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
@@ -1572,31 +1388,19 @@
         "@jridgewell/trace-mapping": "^0.3.25"
       }
     },
-    "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-      "dev": true
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "dev": true,
+      "license": "MIT"
     },
     "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==",
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -8024,6 +7828,7 @@
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -10809,14 +10614,15 @@
       }
     },
     "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==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+      "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
+        "@babel/core": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@istanbuljs/schema": "^0.1.3",
         "istanbul-lib-coverage": "^3.2.0",
         "semver": "^7.5.4"
       },
@@ -11075,7 +10881,8 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "4.1.1",
@@ -11115,15 +10922,16 @@
       }
     },
     "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/json-buffer": {
@@ -16328,15 +16136,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
diff --git a/package.json b/package.json
index d56241bfa11a..a4cd10afca12 100644
--- a/package.json
+++ b/package.json
@@ -184,7 +184,7 @@
     "husky": "^9.1.7",
     "innosetup": "^6.4.1",
     "istanbul-lib-coverage": "^3.2.0",
-    "istanbul-lib-instrument": "^6.0.1",
+    "istanbul-lib-instrument": "^6.0.3",
     "istanbul-lib-report": "^3.0.0",
     "istanbul-lib-source-maps": "^5.0.6",
     "istanbul-reports": "^3.2.0",

From 3029fcd409c5bb81a54ed5c6dc157ad6ec889725 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 16:43:42 +0000
Subject: [PATCH 1705/1815] Bump @vscode/tree-sitter-wasm from 0.1.5 to 0.3.0
 in /remote

Bumps [@vscode/tree-sitter-wasm](https://github.com/Microsoft/vscode-tree-sitter-wasm) from 0.1.5 to 0.3.0.
- [Release notes](https://github.com/Microsoft/vscode-tree-sitter-wasm/releases)
- [Changelog](https://github.com/microsoft/vscode-tree-sitter-wasm/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/vscode-tree-sitter-wasm/compare/v0.1.5...v0.3.0)

---
updated-dependencies:
- dependency-name: "@vscode/tree-sitter-wasm"
  dependency-version: 0.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 4df0ec878096..db5c462b6f67 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -16,7 +16,7 @@
         "@vscode/proxy-agent": "^0.32.0",
         "@vscode/ripgrep": "^1.15.11",
         "@vscode/spdlog": "^0.15.0",
-        "@vscode/tree-sitter-wasm": "^0.1.3",
+        "@vscode/tree-sitter-wasm": "^0.3.0",
         "@vscode/vscode-languagedetection": "1.0.23",
         "@vscode/windows-process-tree": "^0.6.0",
         "@vscode/windows-registry": "^1.1.0",
@@ -477,9 +477,9 @@
       }
     },
     "node_modules/@vscode/tree-sitter-wasm": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.1.5.tgz",
-      "integrity": "sha512-l1NG9/mMDO2MFtaByKlAXKW9fF9P/9gbfpKIg5HHNVR8BFlwf4HvwVWJG4qlpy6hM9YZ2fsKTawQSryolwPpSQ==",
+      "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": {
diff --git a/remote/package.json b/remote/package.json
index 97b7199fb40d..c493a6cbcba6 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -11,7 +11,7 @@
     "@vscode/proxy-agent": "^0.32.0",
     "@vscode/ripgrep": "^1.15.11",
     "@vscode/spdlog": "^0.15.0",
-    "@vscode/tree-sitter-wasm": "^0.1.3",
+    "@vscode/tree-sitter-wasm": "^0.3.0",
     "@vscode/vscode-languagedetection": "1.0.23",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",

From 8b9b160e249ba8bf808114afc2a51fb96f8b4ee1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 16:44:44 +0000
Subject: [PATCH 1706/1815] Bump @vscode/tree-sitter-wasm from 0.1.5 to 0.3.0
 in /remote/web

Bumps [@vscode/tree-sitter-wasm](https://github.com/Microsoft/vscode-tree-sitter-wasm) from 0.1.5 to 0.3.0.
- [Release notes](https://github.com/Microsoft/vscode-tree-sitter-wasm/releases)
- [Changelog](https://github.com/microsoft/vscode-tree-sitter-wasm/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/vscode-tree-sitter-wasm/compare/v0.1.5...v0.3.0)

---
updated-dependencies:
- dependency-name: "@vscode/tree-sitter-wasm"
  dependency-version: 0.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 8 ++++----
 remote/web/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 3ae9cc2b70eb..5daeeb868a9f 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -11,7 +11,7 @@
 				"@microsoft/1ds-core-js": "^3.2.13",
 				"@microsoft/1ds-post-js": "^3.2.13",
 				"@vscode/iconv-lite-umd": "0.7.0",
-				"@vscode/tree-sitter-wasm": "^0.1.3",
+				"@vscode/tree-sitter-wasm": "^0.3.0",
 				"@vscode/vscode-languagedetection": "1.0.23",
 				"@xterm/addon-clipboard": "^0.3.0-beta.105",
 				"@xterm/addon-image": "^0.10.0-beta.105",
@@ -82,9 +82,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@vscode/tree-sitter-wasm": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/@vscode/tree-sitter-wasm/-/tree-sitter-wasm-0.1.5.tgz",
-			"integrity": "sha512-l1NG9/mMDO2MFtaByKlAXKW9fF9P/9gbfpKIg5HHNVR8BFlwf4HvwVWJG4qlpy6hM9YZ2fsKTawQSryolwPpSQ==",
+			"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": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 61d71858df41..3854c9ec6f5a 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -6,7 +6,7 @@
 		"@microsoft/1ds-core-js": "^3.2.13",
 		"@microsoft/1ds-post-js": "^3.2.13",
 		"@vscode/iconv-lite-umd": "0.7.0",
-		"@vscode/tree-sitter-wasm": "^0.1.3",
+		"@vscode/tree-sitter-wasm": "^0.3.0",
 		"@vscode/vscode-languagedetection": "1.0.23",
 		"@xterm/addon-clipboard": "^0.3.0-beta.105",
 		"@xterm/addon-image": "^0.10.0-beta.105",

From 4005d61b56c45579703d6c0013ceaf30983b1f13 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 16:46:21 +0000
Subject: [PATCH 1707/1815] Bump @xterm/addon-progress in /remote/web

Bumps [@xterm/addon-progress](https://github.com/xtermjs/xterm.js) from 0.2.0-beta.5 to 0.3.0-beta.105.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-progress"
  dependency-version: 0.3.0-beta.105
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 3ae9cc2b70eb..bef116856d05 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -16,7 +16,7 @@
 				"@xterm/addon-clipboard": "^0.3.0-beta.105",
 				"@xterm/addon-image": "^0.10.0-beta.105",
 				"@xterm/addon-ligatures": "^0.10.0-beta.99",
-				"@xterm/addon-progress": "^0.2.0-beta.5",
+				"@xterm/addon-progress": "^0.3.0-beta.105",
 				"@xterm/addon-search": "^0.17.0-beta.105",
 				"@xterm/addon-serialize": "^0.15.0-beta.105",
 				"@xterm/addon-unicode11": "^0.10.0-beta.105",
@@ -134,12 +134,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-progress": {
-			"version": "0.2.0-beta.5",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.5.tgz",
-			"integrity": "sha512-6dfUtCqK/anFiVilv1KNyVWbEql2hJwINlAXnl5YtIyEwR8F/i+zWBuzUj9152gT3rDASTmgXE5HG6mnyaUI9w==",
+			"version": "0.3.0-beta.105",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.105.tgz",
+			"integrity": "sha512-1VW3D0VA5DS7n7pa8cFA57emhijt/10mM7sK7Ll22AYNmNyNdUiXWm1ORgzI2U1ApBADm117W5QiEkkDEu+F0w==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.99"
+				"@xterm/xterm": "^6.1.0-beta.105"
 			}
 		},
 		"node_modules/@xterm/addon-search": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 61d71858df41..641b024d9faa 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -11,7 +11,7 @@
 		"@xterm/addon-clipboard": "^0.3.0-beta.105",
 		"@xterm/addon-image": "^0.10.0-beta.105",
 		"@xterm/addon-ligatures": "^0.10.0-beta.99",
-		"@xterm/addon-progress": "^0.2.0-beta.5",
+		"@xterm/addon-progress": "^0.3.0-beta.105",
 		"@xterm/addon-search": "^0.17.0-beta.105",
 		"@xterm/addon-serialize": "^0.15.0-beta.105",
 		"@xterm/addon-unicode11": "^0.10.0-beta.105",

From faf9736ac73d5ddbba89820fb295efb62d586204 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 16:47:44 +0000
Subject: [PATCH 1708/1815] Bump @vscode/vscode-languagedetection from 1.0.22
 to 1.0.23

Bumps [@vscode/vscode-languagedetection](https://github.com/microsoft/vscode-languagedetection) from 1.0.22 to 1.0.23.
- [Release notes](https://github.com/microsoft/vscode-languagedetection/releases)
- [Commits](https://github.com/microsoft/vscode-languagedetection/commits/v1.0.23)

---
updated-dependencies:
- dependency-name: "@vscode/vscode-languagedetection"
  dependency-version: 1.0.23
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8c6948fcba78..52344567c8f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,7 +24,7 @@
         "@vscode/sqlite3": "5.1.8-vscode",
         "@vscode/sudo-prompt": "9.3.1",
         "@vscode/tree-sitter-wasm": "^0.1.3",
-        "@vscode/vscode-languagedetection": "1.0.22",
+        "@vscode/vscode-languagedetection": "1.0.23",
         "@vscode/windows-mutex": "^0.5.3",
         "@vscode/windows-process-tree": "^0.6.3",
         "@vscode/windows-registry": "^1.1.0",
@@ -3983,9 +3983,9 @@
       "dev": true
     },
     "node_modules/@vscode/vscode-languagedetection": {
-      "version": "1.0.22",
-      "resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.22.tgz",
-      "integrity": "sha512-rQ/BgMyLuIXSmbA0MSkIPHtcOw14QkeDbAq19sjvaS9LTRr905yij0S8lsyqN5JgOsbtIx7pAcyOxFMzPmqhZQ==",
+      "version": "1.0.23",
+      "resolved": "https://registry.npmjs.org/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.23.tgz",
+      "integrity": "sha512-Ywk6vXC81nUHvc9WX3uFJG/UHFLXDYJgNeUVirBLJGvmchXHdapsGeAYclNqO1thQLmykmJhSouIZV+JJS8o1A==",
       "license": "MIT",
       "bin": {
         "vscode-languagedetection": "cli/index.js"
diff --git a/package.json b/package.json
index 28714ab40632..caff948be684 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "@vscode/sqlite3": "5.1.8-vscode",
     "@vscode/sudo-prompt": "9.3.1",
     "@vscode/tree-sitter-wasm": "^0.1.3",
-    "@vscode/vscode-languagedetection": "1.0.22",
+    "@vscode/vscode-languagedetection": "1.0.23",
     "@vscode/windows-mutex": "^0.5.3",
     "@vscode/windows-process-tree": "^0.6.3",
     "@vscode/windows-registry": "^1.1.0",

From 2f7ae908840a7ef4720a2ce2bc9e09958f053fc6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 16:48:05 +0000
Subject: [PATCH 1709/1815] Bump @xterm/xterm from 5.6.0-beta.99 to 6.0.0

Bumps [@xterm/xterm](https://github.com/xtermjs/xterm.js) from 5.6.0-beta.99 to 6.0.0.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits/6.0.0)

---
updated-dependencies:
- dependency-name: "@xterm/xterm"
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 13 ++++++++-----
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8c6948fcba78..a597ec96df65 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,7 +37,7 @@
         "@xterm/addon-unicode11": "^0.10.0-beta.105",
         "@xterm/addon-webgl": "^0.19.0-beta.99",
         "@xterm/headless": "^5.6.0-beta.99",
-        "@xterm/xterm": "^5.6.0-beta.99",
+        "@xterm/xterm": "^6.0.0",
         "http-proxy-agent": "^7.0.0",
         "https-proxy-agent": "^7.0.6",
         "jschardet": "3.1.4",
@@ -4359,10 +4359,13 @@
       "license": "MIT"
     },
     "node_modules/@xterm/xterm": {
-      "version": "5.6.0-beta.99",
-      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.99.tgz",
-      "integrity": "sha512-TwBXSyio63Sr2+eJ24BtrPiwTA8JpRbdzhNBYzCXs32yWX30X47UAcdgkahjkyt4JHSqhu7614/w5FOzHsNc/g==",
-      "license": "MIT"
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.0.0.tgz",
+      "integrity": "sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg==",
+      "license": "MIT",
+      "workspaces": [
+        "addons/*"
+      ]
     },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
diff --git a/package.json b/package.json
index 28714ab40632..272a1a93636a 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "@xterm/addon-unicode11": "^0.10.0-beta.105",
     "@xterm/addon-webgl": "^0.19.0-beta.99",
     "@xterm/headless": "^5.6.0-beta.99",
-    "@xterm/xterm": "^5.6.0-beta.99",
+    "@xterm/xterm": "^6.0.0",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.6",
     "jschardet": "3.1.4",

From 63a8777f1c0972d129ebb095576516f1ec226e51 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jan 2026 16:56:35 +0000
Subject: [PATCH 1710/1815] Bump @xterm/addon-ligatures in /remote/web

Bumps [@xterm/addon-ligatures](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.99 to 0.11.0-beta.105.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-ligatures"
  dependency-version: 0.11.0-beta.105
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 33f593197d5f..b026eaaf9530 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -15,7 +15,7 @@
 				"@vscode/vscode-languagedetection": "1.0.23",
 				"@xterm/addon-clipboard": "^0.3.0-beta.105",
 				"@xterm/addon-image": "^0.10.0-beta.105",
-				"@xterm/addon-ligatures": "^0.10.0-beta.99",
+				"@xterm/addon-ligatures": "^0.11.0-beta.105",
 				"@xterm/addon-progress": "^0.3.0-beta.105",
 				"@xterm/addon-search": "^0.17.0-beta.105",
 				"@xterm/addon-serialize": "^0.15.0-beta.105",
@@ -118,9 +118,9 @@
 			}
 		},
 		"node_modules/@xterm/addon-ligatures": {
-			"version": "0.10.0-beta.99",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.99.tgz",
-			"integrity": "sha512-QlhUtBlIC7ZgEykpWxFl5lc2MtIFJD41pT8bQVRD1wGShgUmceNTk4xd3CjiQdVOtTrHcgOTM75YmS5GOlobOA==",
+			"version": "0.11.0-beta.105",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.105.tgz",
+			"integrity": "sha512-6ycj4nMyqLoBLtmQlxDOj1dxqDpwTO16/SUt87zZX/DWtj095xxH3FcRPN2ZNnda33NgUC8s4MhxROLZ7Q09SA==",
 			"license": "MIT",
 			"dependencies": {
 				"lru-cache": "^6.0.0",
@@ -130,7 +130,7 @@
 				"node": ">8.0.0"
 			},
 			"peerDependencies": {
-				"@xterm/xterm": "^5.6.0-beta.99"
+				"@xterm/xterm": "^6.1.0-beta.105"
 			}
 		},
 		"node_modules/@xterm/addon-progress": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 705c423e436d..0311945192a6 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -10,7 +10,7 @@
 		"@vscode/vscode-languagedetection": "1.0.23",
 		"@xterm/addon-clipboard": "^0.3.0-beta.105",
 		"@xterm/addon-image": "^0.10.0-beta.105",
-		"@xterm/addon-ligatures": "^0.10.0-beta.99",
+		"@xterm/addon-ligatures": "^0.11.0-beta.105",
 		"@xterm/addon-progress": "^0.3.0-beta.105",
 		"@xterm/addon-search": "^0.17.0-beta.105",
 		"@xterm/addon-serialize": "^0.15.0-beta.105",

From 6e520475021af0619a6e51830dcf4c0d51ba44b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jan 2026 12:19:10 +0000
Subject: [PATCH 1711/1815] Bump @typescript-eslint/utils from 8.8.0 to 8.53.1

Bumps [@typescript-eslint/utils](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/utils) from 8.8.0 to 8.53.1.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/utils/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.53.1/packages/utils)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/utils"
  dependency-version: 8.53.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 336 ++++++++++++++++++++++++----------------------
 package.json      |   2 +-
 2 files changed, 176 insertions(+), 162 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c40f838976a4..3dec48db8c70 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -78,7 +78,7 @@
         "@types/winreg": "^1.2.30",
         "@types/yauzl": "^2.10.0",
         "@types/yazl": "^2.4.2",
-        "@typescript-eslint/utils": "^8.8.0",
+        "@typescript-eslint/utils": "^8.53.1",
         "@vscode/gulp-electron": "^1.38.2",
         "@vscode/l10n-dev": "0.0.35",
         "@vscode/telemetry-extractor": "^1.18.0",
@@ -2173,118 +2173,6 @@
         "eslint": ">=9.0.0"
       }
     },
-    "node_modules/@stylistic/eslint-plugin-ts/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.53.0.tgz",
-      "integrity": "sha512-kWNj3l01eOGSdVBnfAF2K1BTh06WS0Yet6JUgb9Cmkqaz3Jlu0fdVUjj9UI8gPidBWSMqDIglmEXifSgDT/D0g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.53.0",
-        "@typescript-eslint/visitor-keys": "8.53.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@stylistic/eslint-plugin-ts/node_modules/@typescript-eslint/types": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.53.0.tgz",
-      "integrity": "sha512-Bmh9KX31Vlxa13+PqPvt4RzKRN1XORYSLlAE+sO1i28NkisGbTtSLFVB3l7PWdHtR3E0mVMuC7JilWJ99m2HxQ==",
-      "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/@stylistic/eslint-plugin-ts/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.53.0.tgz",
-      "integrity": "sha512-pw0c0Gdo7Z4xOG987u3nJ8akL9093yEEKv8QTJ+Bhkghj1xyj8cgPaavlr9rq8h7+s6plUJ4QJYw2gCZodqmGw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/project-service": "8.53.0",
-        "@typescript-eslint/tsconfig-utils": "8.53.0",
-        "@typescript-eslint/types": "8.53.0",
-        "@typescript-eslint/visitor-keys": "8.53.0",
-        "debug": "^4.4.3",
-        "minimatch": "^9.0.5",
-        "semver": "^7.7.3",
-        "tinyglobby": "^0.2.15",
-        "ts-api-utils": "^2.4.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/@stylistic/eslint-plugin-ts/node_modules/@typescript-eslint/utils": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.53.0.tgz",
-      "integrity": "sha512-XDY4mXTez3Z1iRDI5mbRhH4DFSt46oaIFsLg+Zn97+sYrXACziXSQcSelMybnVZ5pa1P6xYkPr5cMJyunM1ZDA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.53.0",
-        "@typescript-eslint/types": "8.53.0",
-        "@typescript-eslint/typescript-estree": "8.53.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/@stylistic/eslint-plugin-ts/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.53.0.tgz",
-      "integrity": "sha512-LZ2NqIHFhvFwxG0qZeLL9DvdNAHPGCY5dIRwBhyYeU+LfLhcStE1ImjsuTG/WaVh3XysGaeLW8Rqq7cGkPCFvw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.53.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/@stylistic/eslint-plugin-ts/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/@stylistic/eslint-plugin-ts/node_modules/eslint-visitor-keys": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
@@ -2298,35 +2186,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@stylistic/eslint-plugin-ts/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/@stylistic/eslint-plugin-ts/node_modules/ts-api-utils": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz",
-      "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.12"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.8.4"
-      }
-    },
     "node_modules/@szmarczak/http-timer": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
@@ -2749,14 +2608,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.53.0.tgz",
-      "integrity": "sha512-Bl6Gdr7NqkqIP5yP9z1JU///Nmes4Eose6L1HwpuVHwScgDPPuEWbUVhvlZmb8hy0vX9syLk5EGNL700WcBlbg==",
+      "version": "8.53.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.53.1.tgz",
+      "integrity": "sha512-WYC4FB5Ra0xidsmlPb+1SsnaSKPmS3gsjIARwbEkHkoWloQmuzcfypljaJcR78uyLA1h8sHdWWPHSLDI+MtNog==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.53.0",
-        "@typescript-eslint/types": "^8.53.0",
+        "@typescript-eslint/tsconfig-utils": "^8.53.1",
+        "@typescript-eslint/types": "^8.53.1",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -2771,9 +2630,9 @@
       }
     },
     "node_modules/@typescript-eslint/project-service/node_modules/@typescript-eslint/types": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.53.0.tgz",
-      "integrity": "sha512-Bmh9KX31Vlxa13+PqPvt4RzKRN1XORYSLlAE+sO1i28NkisGbTtSLFVB3l7PWdHtR3E0mVMuC7JilWJ99m2HxQ==",
+      "version": "8.53.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.53.1.tgz",
+      "integrity": "sha512-jr/swrr2aRmUAUjW5/zQHbMaui//vQlsZcJKijZf3M26bnmLj8LyZUpj8/Rd6uzaek06OWsqdofN/Thenm5O8A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2802,9 +2661,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.53.0.tgz",
-      "integrity": "sha512-K6Sc0R5GIG6dNoPdOooQ+KtvT5KCKAvTcY8h2rIuul19vxH5OTQk7ArKkd4yTzkw66WnNY0kPPzzcmWA+XRmiA==",
+      "version": "8.53.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.53.1.tgz",
+      "integrity": "sha512-qfvLXS6F6b1y43pnf0pPbXJ+YoXIC7HKg0UGZ27uMIemKMKA6XH2DTxsEDdpdN29D+vHV07x/pnlPNVLhdhWiA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2885,15 +2744,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.8.0.tgz",
-      "integrity": "sha512-QE2MgfOTem00qrlPgyByaCHay9yb1+9BjnMFnSFkUKQfu7adBXDTnCAivURnuPPAG/qiB+kzKkZKmKfaMT0zVg==",
+      "version": "8.53.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.53.1.tgz",
+      "integrity": "sha512-c4bMvGVWW4hv6JmDUEG7fSYlWOl3II2I4ylt0NM+seinYQlZMQIaKaXIIVJWt9Ofh6whrpM+EdDQXKXjNovvrg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.8.0",
-        "@typescript-eslint/types": "8.8.0",
-        "@typescript-eslint/typescript-estree": "8.8.0"
+        "@eslint-community/eslint-utils": "^4.9.1",
+        "@typescript-eslint/scope-manager": "8.53.1",
+        "@typescript-eslint/types": "8.53.1",
+        "@typescript-eslint/typescript-estree": "8.53.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2903,7 +2763,138 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0"
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.53.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.53.1.tgz",
+      "integrity": "sha512-Lu23yw1uJMFY8cUeq7JlrizAgeQvWugNQzJp8C3x8Eo5Jw5Q2ykMdiiTB9vBVOOUBysMzmRRmUfwFrZuI2C4SQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.53.1",
+        "@typescript-eslint/visitor-keys": "8.53.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/utils/node_modules/@typescript-eslint/types": {
+      "version": "8.53.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.53.1.tgz",
+      "integrity": "sha512-jr/swrr2aRmUAUjW5/zQHbMaui//vQlsZcJKijZf3M26bnmLj8LyZUpj8/Rd6uzaek06OWsqdofN/Thenm5O8A==",
+      "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/utils/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.53.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.53.1.tgz",
+      "integrity": "sha512-RGlVipGhQAG4GxV1s34O91cxQ/vWiHJTDHbXRr0li2q/BGg3RR/7NM8QDWgkEgrwQYCvmJV9ichIwyoKCQ+DTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/project-service": "8.53.1",
+        "@typescript-eslint/tsconfig-utils": "8.53.1",
+        "@typescript-eslint/types": "8.53.1",
+        "@typescript-eslint/visitor-keys": "8.53.1",
+        "debug": "^4.4.3",
+        "minimatch": "^9.0.5",
+        "semver": "^7.7.3",
+        "tinyglobby": "^0.2.15",
+        "ts-api-utils": "^2.4.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/utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.53.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.53.1.tgz",
+      "integrity": "sha512-oy+wV7xDKFPRyNggmXuZQSBzvoLnpmJs+GhzRhPjrxl2b/jIlyjVokzm47CZCDUdXKr2zd7ZLodPfOBpOPyPlg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.53.1",
+        "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/utils/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/utils/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-eslint/utils/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/node_modules/ts-api-utils": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz",
+      "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.12"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4"
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
@@ -16638,6 +16629,29 @@
         }
       }
     },
+    "node_modules/typescript-eslint/node_modules/@typescript-eslint/utils": {
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.8.0.tgz",
+      "integrity": "sha512-QE2MgfOTem00qrlPgyByaCHay9yb1+9BjnMFnSFkUKQfu7adBXDTnCAivURnuPPAG/qiB+kzKkZKmKfaMT0zVg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "8.8.0",
+        "@typescript-eslint/types": "8.8.0",
+        "@typescript-eslint/typescript-estree": "8.8.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"
+      }
+    },
     "node_modules/typical": {
       "version": "7.3.0",
       "resolved": "https://registry.npmjs.org/typical/-/typical-7.3.0.tgz",
diff --git a/package.json b/package.json
index 1ad5459adc74..6040bbcdccdd 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
     "@types/winreg": "^1.2.30",
     "@types/yauzl": "^2.10.0",
     "@types/yazl": "^2.4.2",
-    "@typescript-eslint/utils": "^8.8.0",
+    "@typescript-eslint/utils": "^8.53.1",
     "@vscode/gulp-electron": "^1.38.2",
     "@vscode/l10n-dev": "0.0.35",
     "@vscode/telemetry-extractor": "^1.18.0",

From f112a89ca64136bed63e08887855a986019fcefc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jan 2026 12:19:24 +0000
Subject: [PATCH 1712/1815] Bump ts-loader from 9.5.1 to 9.5.4

Bumps [ts-loader](https://github.com/TypeStrong/ts-loader) from 9.5.1 to 9.5.4.
- [Release notes](https://github.com/TypeStrong/ts-loader/releases)
- [Changelog](https://github.com/TypeStrong/ts-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/TypeStrong/ts-loader/compare/v9.5.1...v9.5.4)

---
updated-dependencies:
- dependency-name: ts-loader
  dependency-version: 9.5.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c40f838976a4..81185d7e201b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -151,7 +151,7 @@
         "source-map": "0.7.6",
         "source-map-support": "^0.3.2",
         "style-loader": "^3.3.2",
-        "ts-loader": "^9.5.1",
+        "ts-loader": "^9.5.4",
         "ts-node": "^10.9.1",
         "tsec": "0.2.7",
         "tslib": "^2.8.1",
@@ -16275,10 +16275,11 @@
       }
     },
     "node_modules/ts-loader": {
-      "version": "9.5.1",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz",
-      "integrity": "sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==",
+      "version": "9.5.4",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.4.tgz",
+      "integrity": "sha512-nCz0rEwunlTZiy6rXFByQU1kVVpCIgUpc/psFiKVrUwrizdnIbRFu8w7bxhUF0X613DYwT4XzrZHpVyMe758hQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.1.0",
         "enhanced-resolve": "^5.0.0",
diff --git a/package.json b/package.json
index 1ad5459adc74..b89be035b858 100644
--- a/package.json
+++ b/package.json
@@ -210,7 +210,7 @@
     "source-map": "0.7.6",
     "source-map-support": "^0.3.2",
     "style-loader": "^3.3.2",
-    "ts-loader": "^9.5.1",
+    "ts-loader": "^9.5.4",
     "ts-node": "^10.9.1",
     "tsec": "0.2.7",
     "tslib": "^2.8.1",

From 6762d32fc71bdb47828a50ef3a12b6c6cd7ef390 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jan 2026 12:19:34 +0000
Subject: [PATCH 1713/1815] Bump @xterm/addon-search from 0.16.0-beta.99 to
 0.17.0-beta.105

Bumps [@xterm/addon-search](https://github.com/xtermjs/xterm.js) from 0.16.0-beta.99 to 0.17.0-beta.105.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-search"
  dependency-version: 0.17.0-beta.105
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 10 +++++-----
 package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c40f838976a4..1054c746c8c5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
         "@xterm/addon-image": "^0.9.0-beta.99",
         "@xterm/addon-ligatures": "^0.10.0-beta.99",
         "@xterm/addon-progress": "^0.2.0-beta.5",
-        "@xterm/addon-search": "^0.16.0-beta.99",
+        "@xterm/addon-search": "^0.17.0-beta.105",
         "@xterm/addon-serialize": "^0.14.0-beta.99",
         "@xterm/addon-unicode11": "^0.10.0-beta.105",
         "@xterm/addon-webgl": "^0.19.0-beta.99",
@@ -4121,12 +4121,12 @@
       }
     },
     "node_modules/@xterm/addon-search": {
-      "version": "0.16.0-beta.99",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.99.tgz",
-      "integrity": "sha512-nyqGsZDR/l0Gp4gaS+Brrjm53dpaNAqOUtAC8BXmvuzK21sQgyLsC99MTLNR5yh3dYJAfWAAhG5ke/Re3AaamQ==",
+      "version": "0.17.0-beta.105",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.105.tgz",
+      "integrity": "sha512-HkjOQiPWKnKnyeBJm1Q4Dt/JexT1DOPlT5yBylg0r8iCmZBAf3BIt5IDXCgjLrS31WF210Ho1rAstN9kwCNttw==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.99"
+        "@xterm/xterm": "^6.1.0-beta.105"
       }
     },
     "node_modules/@xterm/addon-serialize": {
diff --git a/package.json b/package.json
index 1ad5459adc74..2599499b3e82 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "@xterm/addon-image": "^0.9.0-beta.99",
     "@xterm/addon-ligatures": "^0.10.0-beta.99",
     "@xterm/addon-progress": "^0.2.0-beta.5",
-    "@xterm/addon-search": "^0.16.0-beta.99",
+    "@xterm/addon-search": "^0.17.0-beta.105",
     "@xterm/addon-serialize": "^0.14.0-beta.99",
     "@xterm/addon-unicode11": "^0.10.0-beta.105",
     "@xterm/addon-webgl": "^0.19.0-beta.99",

From 97821655fb0cdc2b54dbbd64bf3cbe781bfbfac3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jan 2026 12:19:42 +0000
Subject: [PATCH 1714/1815] Bump @microsoft/1ds-core-js from 3.2.18 to 4.3.11
 in /remote

Bumps [@microsoft/1ds-core-js](https://github.com/microsoft/ApplicationInsights-JS) from 3.2.18 to 4.3.11.
- [Release notes](https://github.com/microsoft/ApplicationInsights-JS/releases)
- [Changelog](https://github.com/microsoft/ApplicationInsights-JS/blob/main/RELEASES.md)
- [Commits](https://github.com/microsoft/ApplicationInsights-JS/commits)

---
updated-dependencies:
- dependency-name: "@microsoft/1ds-core-js"
  dependency-version: 4.3.11
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 95 ++++++++++++++++++++++++++++++++++++----
 remote/package.json      |  2 +-
 2 files changed, 88 insertions(+), 9 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index b66c22d07aad..7b314153b5c2 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -8,7 +8,7 @@
       "name": "vscode-reh",
       "version": "0.0.0",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^3.2.13",
+        "@microsoft/1ds-core-js": "^4.3.11",
         "@microsoft/1ds-post-js": "^3.2.13",
         "@parcel/watcher": "2.5.1",
         "@vscode/deviceid": "^0.1.1",
@@ -47,14 +47,34 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "3.2.18",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.18.tgz",
-      "integrity": "sha512-ytlFv3dfb8OGqvbZP8tSIlNvn3QNYxdsF0k6ikRMWSr6CmBxBi1sliaxc2Q5KuYOuaeWkd8WRm25Rx/UtHcyMg==",
+      "version": "4.3.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.11.tgz",
+      "integrity": "sha512-QyQE/YzFYB+31WEpX9hvDoXZOIXA7308Z5uuL1mSsyDSkNPl24hBWz9O3vZL+/p9shy756eKLI2nFLwwIAhXyw==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "2.8.18",
-        "@microsoft/applicationinsights-shims": "^2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.11"
+        "@microsoft/applicationinsights-core-js": "3.3.11",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-core-js/node_modules/@microsoft/applicationinsights-shims": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "license": "MIT",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-core-js/node_modules/@microsoft/dynamicproto-js": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "license": "MIT",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
@@ -68,7 +88,18 @@
         "@microsoft/dynamicproto-js": "^1.1.11"
       }
     },
-    "node_modules/@microsoft/applicationinsights-core-js": {
+    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/1ds-core-js": {
+      "version": "3.2.18",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.18.tgz",
+      "integrity": "sha512-ytlFv3dfb8OGqvbZP8tSIlNvn3QNYxdsF0k6ikRMWSr6CmBxBi1sliaxc2Q5KuYOuaeWkd8WRm25Rx/UtHcyMg==",
+      "license": "MIT",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "2.8.18",
+        "@microsoft/applicationinsights-shims": "^2.0.2",
+        "@microsoft/dynamicproto-js": "^1.1.11"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-core-js": {
       "version": "2.8.18",
       "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.18.tgz",
       "integrity": "sha512-yPHRZFLpnEO0uSgFPM1BLMRRwjoten9YBbn4pJRbCT4PigLnj748knmWsMwXIdcehtkRTYz78kPYa/LWP7nvmA==",
@@ -81,6 +112,39 @@
         "tslib": "*"
       }
     },
+    "node_modules/@microsoft/applicationinsights-core-js": {
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.11.tgz",
+      "integrity": "sha512-WlBY1sKDNL62T++NifgFCyDuOoNUNrVILfnHubOzgU/od7MFEQYWU8EZyDcBC/+Z8e3TD6jfixurYtWoUC+6Eg==",
+      "license": "MIT",
+      "dependencies": {
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": ">= 1.0.0"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-core-js/node_modules/@microsoft/applicationinsights-shims": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "license": "MIT",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/applicationinsights-core-js/node_modules/@microsoft/dynamicproto-js": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "license": "MIT",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
+      }
+    },
     "node_modules/@microsoft/applicationinsights-shims": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz",
@@ -93,6 +157,21 @@
       "integrity": "sha512-gNw9z9LbqLV+WadZ6/MMrWwO3e0LuoUH1wve/1iPsBNbgqeVCiB0EZFNNj2lysxS2gkqoF9hmyVaG3MoM1BkxA==",
       "license": "MIT"
     },
+    "node_modules/@nevware21/ts-async": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.5.tgz",
+      "integrity": "sha512-vwqaL05iJPjLeh5igPi8MeeAu10i+Aq7xko1fbo9F5Si6MnVN5505qaV7AhSdk5MCBJVT/UYMk3kgInNjDb4Ig==",
+      "license": "MIT",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.12.2 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-utils": {
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
+      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
+      "license": "MIT"
+    },
     "node_modules/@parcel/watcher": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
diff --git a/remote/package.json b/remote/package.json
index a417ff349816..752ef1f2f5c1 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@microsoft/1ds-core-js": "^3.2.13",
+    "@microsoft/1ds-core-js": "^4.3.11",
     "@microsoft/1ds-post-js": "^3.2.13",
     "@parcel/watcher": "2.5.1",
     "@vscode/deviceid": "^0.1.1",

From c81f15bfa5269dc8c7d5060dbc332ca4345787b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jan 2026 12:19:44 +0000
Subject: [PATCH 1715/1815] Bump gulp-bom from 3.0.0 to 5.0.0

Bumps [gulp-bom](https://github.com/sindresorhus/gulp-bom) from 3.0.0 to 5.0.0.
- [Release notes](https://github.com/sindresorhus/gulp-bom/releases)
- [Commits](https://github.com/sindresorhus/gulp-bom/compare/v3.0.0...v5.0.0)

---
updated-dependencies:
- dependency-name: gulp-bom
  dependency-version: 5.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 61 +++++++++++++++++++++++++++++++++++++++++------
 package.json      |  2 +-
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c40f838976a4..15e3b28b58cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -109,7 +109,7 @@
         "glob": "^9.0.1",
         "gulp": "^5.0.1",
         "gulp-azure-storage": "^0.12.1",
-        "gulp-bom": "^3.0.0",
+        "gulp-bom": "^5.0.0",
         "gulp-buffer": "0.0.2",
         "gulp-filter": "^5.1.0",
         "gulp-flatmap": "^1.0.2",
@@ -6486,6 +6486,19 @@
       "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
       "dev": true
     },
+    "node_modules/easy-transform-stream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/easy-transform-stream/-/easy-transform-stream-1.0.1.tgz",
+      "integrity": "sha512-ktkaa6XR7COAR3oj02CF3IOgz2m1hCaY3SfzvKT4Svt2MhHw9XCt+ncJNWfe2TGz31iqzNGZ8spdKQflj+Rlog==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/editorconfig": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz",
@@ -8456,16 +8469,19 @@
       }
     },
     "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==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-bom/-/gulp-bom-5.0.0.tgz",
+      "integrity": "sha512-DiFsJR8p/ENCtjNcPNyb3OxgVv189jU5qtVAX9/jRtBKBKPyktaR/WbxJZyNwupShI53vF48kqkTZ83hMsRmJA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "plugin-error": "^1.0.1",
-        "through2": "^3.0.1"
+        "gulp-plugin-extras": "^0.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       },
       "peerDependencies": {
         "gulp": ">=4"
@@ -9006,6 +9022,37 @@
         "readable-stream": "3"
       }
     },
+    "node_modules/gulp-plugin-extras": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-plugin-extras/-/gulp-plugin-extras-0.1.0.tgz",
+      "integrity": "sha512-SqJI+BiJrCydau75ZVBlWmzkg6aEaFj2Hrcyg8+dtQx2JUvME1tjOB0Qf/JSuURgDUJFbnLiiAt7L1GoGsW7ug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/vinyl": "^2.0.9",
+        "chalk": "^5.3.0",
+        "easy-transform-stream": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/gulp-plugin-extras/node_modules/chalk": {
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
+      "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
     "node_modules/gulp-plumber": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.2.1.tgz",
diff --git a/package.json b/package.json
index 1ad5459adc74..13d14446e4a6 100644
--- a/package.json
+++ b/package.json
@@ -168,7 +168,7 @@
     "glob": "^9.0.1",
     "gulp": "^5.0.1",
     "gulp-azure-storage": "^0.12.1",
-    "gulp-bom": "^3.0.0",
+    "gulp-bom": "^5.0.0",
     "gulp-buffer": "0.0.2",
     "gulp-filter": "^5.1.0",
     "gulp-flatmap": "^1.0.2",

From 929091775e15fe52fd68b02f061bcb811e49fe53 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jan 2026 12:19:45 +0000
Subject: [PATCH 1716/1815] Bump @xterm/xterm from 5.6.0-beta.99 to 6.0.0 in
 /remote/web

Bumps [@xterm/xterm](https://github.com/xtermjs/xterm.js) from 5.6.0-beta.99 to 6.0.0.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits/6.0.0)

---
updated-dependencies:
- dependency-name: "@xterm/xterm"
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 13 ++++++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index b026eaaf9530..9da67747b7be 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -21,7 +21,7 @@
 				"@xterm/addon-serialize": "^0.15.0-beta.105",
 				"@xterm/addon-unicode11": "^0.10.0-beta.105",
 				"@xterm/addon-webgl": "^0.20.0-beta.104",
-				"@xterm/xterm": "^5.6.0-beta.99",
+				"@xterm/xterm": "^6.0.0",
 				"jschardet": "3.1.4",
 				"tas-client-umd": "0.2.0",
 				"vscode-oniguruma": "2.0.1",
@@ -179,10 +179,13 @@
 			}
 		},
 		"node_modules/@xterm/xterm": {
-			"version": "5.6.0-beta.99",
-			"resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.6.0-beta.99.tgz",
-			"integrity": "sha512-TwBXSyio63Sr2+eJ24BtrPiwTA8JpRbdzhNBYzCXs32yWX30X47UAcdgkahjkyt4JHSqhu7614/w5FOzHsNc/g==",
-			"license": "MIT"
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.0.0.tgz",
+			"integrity": "sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg==",
+			"license": "MIT",
+			"workspaces": [
+				"addons/*"
+			]
 		},
 		"node_modules/js-base64": {
 			"version": "3.7.7",
diff --git a/remote/web/package.json b/remote/web/package.json
index 0311945192a6..c1f2a2c0371b 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -16,7 +16,7 @@
 		"@xterm/addon-serialize": "^0.15.0-beta.105",
 		"@xterm/addon-unicode11": "^0.10.0-beta.105",
 		"@xterm/addon-webgl": "^0.20.0-beta.104",
-		"@xterm/xterm": "^5.6.0-beta.99",
+		"@xterm/xterm": "^6.0.0",
 		"jschardet": "3.1.4",
 		"tas-client-umd": "0.2.0",
 		"vscode-oniguruma": "2.0.1",

From b973c1b56e8821f2a1e95ec9553a6f5e71a685c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jan 2026 12:19:54 +0000
Subject: [PATCH 1717/1815] Bump @microsoft/1ds-core-js from 3.2.18 to 4.3.11
 in /remote/web

Bumps [@microsoft/1ds-core-js](https://github.com/microsoft/ApplicationInsights-JS) from 3.2.18 to 4.3.11.
- [Release notes](https://github.com/microsoft/ApplicationInsights-JS/releases)
- [Changelog](https://github.com/microsoft/ApplicationInsights-JS/blob/main/RELEASES.md)
- [Commits](https://github.com/microsoft/ApplicationInsights-JS/commits)

---
updated-dependencies:
- dependency-name: "@microsoft/1ds-core-js"
  dependency-version: 4.3.11
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 95 +++++++++++++++++++++++++++++++++---
 remote/web/package.json      |  2 +-
 2 files changed, 88 insertions(+), 9 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index b026eaaf9530..2bea5ffbf308 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -8,7 +8,7 @@
 			"name": "vscode-web",
 			"version": "0.0.0",
 			"dependencies": {
-				"@microsoft/1ds-core-js": "^3.2.13",
+				"@microsoft/1ds-core-js": "^4.3.11",
 				"@microsoft/1ds-post-js": "^3.2.13",
 				"@vscode/iconv-lite-umd": "0.7.0",
 				"@vscode/tree-sitter-wasm": "^0.3.0",
@@ -29,14 +29,34 @@
 			}
 		},
 		"node_modules/@microsoft/1ds-core-js": {
-			"version": "3.2.18",
-			"resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.18.tgz",
-			"integrity": "sha512-ytlFv3dfb8OGqvbZP8tSIlNvn3QNYxdsF0k6ikRMWSr6CmBxBi1sliaxc2Q5KuYOuaeWkd8WRm25Rx/UtHcyMg==",
+			"version": "4.3.11",
+			"resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.11.tgz",
+			"integrity": "sha512-QyQE/YzFYB+31WEpX9hvDoXZOIXA7308Z5uuL1mSsyDSkNPl24hBWz9O3vZL+/p9shy756eKLI2nFLwwIAhXyw==",
 			"license": "MIT",
 			"dependencies": {
-				"@microsoft/applicationinsights-core-js": "2.8.18",
-				"@microsoft/applicationinsights-shims": "^2.0.2",
-				"@microsoft/dynamicproto-js": "^1.1.11"
+				"@microsoft/applicationinsights-core-js": "3.3.11",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.4 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+			}
+		},
+		"node_modules/@microsoft/1ds-core-js/node_modules/@microsoft/applicationinsights-shims": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+			"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+			"license": "MIT",
+			"dependencies": {
+				"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+			}
+		},
+		"node_modules/@microsoft/1ds-core-js/node_modules/@microsoft/dynamicproto-js": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+			"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+			"license": "MIT",
+			"dependencies": {
+				"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
 			}
 		},
 		"node_modules/@microsoft/1ds-post-js": {
@@ -50,7 +70,18 @@
 				"@microsoft/dynamicproto-js": "^1.1.11"
 			}
 		},
-		"node_modules/@microsoft/applicationinsights-core-js": {
+		"node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/1ds-core-js": {
+			"version": "3.2.18",
+			"resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.18.tgz",
+			"integrity": "sha512-ytlFv3dfb8OGqvbZP8tSIlNvn3QNYxdsF0k6ikRMWSr6CmBxBi1sliaxc2Q5KuYOuaeWkd8WRm25Rx/UtHcyMg==",
+			"license": "MIT",
+			"dependencies": {
+				"@microsoft/applicationinsights-core-js": "2.8.18",
+				"@microsoft/applicationinsights-shims": "^2.0.2",
+				"@microsoft/dynamicproto-js": "^1.1.11"
+			}
+		},
+		"node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-core-js": {
 			"version": "2.8.18",
 			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.18.tgz",
 			"integrity": "sha512-yPHRZFLpnEO0uSgFPM1BLMRRwjoten9YBbn4pJRbCT4PigLnj748knmWsMwXIdcehtkRTYz78kPYa/LWP7nvmA==",
@@ -63,6 +94,39 @@
 				"tslib": "*"
 			}
 		},
+		"node_modules/@microsoft/applicationinsights-core-js": {
+			"version": "3.3.11",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.11.tgz",
+			"integrity": "sha512-WlBY1sKDNL62T++NifgFCyDuOoNUNrVILfnHubOzgU/od7MFEQYWU8EZyDcBC/+Z8e3TD6jfixurYtWoUC+6Eg==",
+			"license": "MIT",
+			"dependencies": {
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.4 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+			},
+			"peerDependencies": {
+				"tslib": ">= 1.0.0"
+			}
+		},
+		"node_modules/@microsoft/applicationinsights-core-js/node_modules/@microsoft/applicationinsights-shims": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+			"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+			"license": "MIT",
+			"dependencies": {
+				"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+			}
+		},
+		"node_modules/@microsoft/applicationinsights-core-js/node_modules/@microsoft/dynamicproto-js": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+			"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+			"license": "MIT",
+			"dependencies": {
+				"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
+			}
+		},
 		"node_modules/@microsoft/applicationinsights-shims": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz",
@@ -75,6 +139,21 @@
 			"integrity": "sha512-gNw9z9LbqLV+WadZ6/MMrWwO3e0LuoUH1wve/1iPsBNbgqeVCiB0EZFNNj2lysxS2gkqoF9hmyVaG3MoM1BkxA==",
 			"license": "MIT"
 		},
+		"node_modules/@nevware21/ts-async": {
+			"version": "0.5.5",
+			"resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.5.tgz",
+			"integrity": "sha512-vwqaL05iJPjLeh5igPi8MeeAu10i+Aq7xko1fbo9F5Si6MnVN5505qaV7AhSdk5MCBJVT/UYMk3kgInNjDb4Ig==",
+			"license": "MIT",
+			"dependencies": {
+				"@nevware21/ts-utils": ">= 0.12.2 < 2.x"
+			}
+		},
+		"node_modules/@nevware21/ts-utils": {
+			"version": "0.12.5",
+			"resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
+			"integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
+			"license": "MIT"
+		},
 		"node_modules/@vscode/iconv-lite-umd": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
diff --git a/remote/web/package.json b/remote/web/package.json
index 0311945192a6..aec7c13ff55b 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -3,7 +3,7 @@
 	"version": "0.0.0",
 	"private": true,
 	"dependencies": {
-		"@microsoft/1ds-core-js": "^3.2.13",
+		"@microsoft/1ds-core-js": "^4.3.11",
 		"@microsoft/1ds-post-js": "^3.2.13",
 		"@vscode/iconv-lite-umd": "0.7.0",
 		"@vscode/tree-sitter-wasm": "^0.3.0",

From 9978f407c0cce7274be2b4723129e0a404b685ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jan 2026 16:47:29 +0000
Subject: [PATCH 1718/1815] Bump tar in /build/npm/gyp in the npm_and_yarn
 group across 1 directory

Bumps the npm_and_yarn group with 1 update in the /build/npm/gyp directory: [tar](https://github.com/isaacs/node-tar).


Updates `tar` from 7.5.3 to 7.5.6
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-tar/compare/v7.5.3...v7.5.6)

---
updated-dependencies:
- dependency-name: tar
  dependency-version: 7.5.6
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/npm/gyp/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/npm/gyp/package-lock.json b/build/npm/gyp/package-lock.json
index 655d8e58b6c6..a6b04265a2a8 100644
--- a/build/npm/gyp/package-lock.json
+++ b/build/npm/gyp/package-lock.json
@@ -1054,9 +1054,9 @@
       }
     },
     "node_modules/tar": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.3.tgz",
-      "integrity": "sha512-ENg5JUHUm2rDD7IvKNFGzyElLXNjachNLp6RaGf4+JOgxXHkqA+gq81ZAMCUmtMtqBsoU62lcp6S27g1LCYGGQ==",
+      "version": "7.5.6",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.6.tgz",
+      "integrity": "sha512-xqUeu2JAIJpXyvskvU3uvQW8PAmHrtXp2KDuMJwQqW8Sqq0CaZBAQ+dKS3RBXVhU4wC5NjAdKrmh84241gO9cA==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {

From c8312494229b25f0e2d2d289a76e5e8c8c7fae1b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jan 2026 17:16:25 +0000
Subject: [PATCH 1719/1815] Bump @microsoft/1ds-post-js from 3.2.18 to 4.3.11

Bumps [@microsoft/1ds-post-js](https://github.com/microsoft/ApplicationInsights-JS) from 3.2.18 to 4.3.11.
- [Release notes](https://github.com/microsoft/ApplicationInsights-JS/releases)
- [Changelog](https://github.com/microsoft/ApplicationInsights-JS/blob/main/RELEASES.md)
- [Commits](https://github.com/microsoft/ApplicationInsights-JS/commits)

---
updated-dependencies:
- dependency-name: "@microsoft/1ds-post-js"
  dependency-version: 4.3.11
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 77 ++++++++++++++++++++++++++++++++++++++++++-----
 package.json      |  2 +-
 2 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 126fbbf6668c..749ac0cb429c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
       "dependencies": {
         "@c4312/eventsource-umd": "^3.0.5",
         "@microsoft/1ds-core-js": "^3.2.13",
-        "@microsoft/1ds-post-js": "^3.2.13",
+        "@microsoft/1ds-post-js": "^4.3.11",
         "@parcel/watcher": "2.5.1",
         "@types/semver": "^7.5.8",
         "@vscode/deviceid": "^0.1.1",
@@ -1484,14 +1484,62 @@
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "3.2.18",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-3.2.18.tgz",
-      "integrity": "sha512-Tzjcja4SMyws3UP58kD2edFPNb7BJtx5uCgwf/PWXwDyfbUY1/crsTQdEyR98wy/vorvLDZdQlcL++VMChfYnQ==",
+      "version": "4.3.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.11.tgz",
+      "integrity": "sha512-V0ZeeALy/Pj8HWgNHDsK+yDeCYnJ9bCgTWhcrna/ZiAT+sGfWs6mDBjAVcG03uP7TDjdWLf8w79lgbXJ3+s3DA==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "3.2.18",
-        "@microsoft/applicationinsights-shims": "^2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.11"
+        "@microsoft/1ds-core-js": "4.3.11",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/1ds-core-js": {
+      "version": "4.3.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.11.tgz",
+      "integrity": "sha512-QyQE/YzFYB+31WEpX9hvDoXZOIXA7308Z5uuL1mSsyDSkNPl24hBWz9O3vZL+/p9shy756eKLI2nFLwwIAhXyw==",
+      "license": "MIT",
+      "dependencies": {
+        "@microsoft/applicationinsights-core-js": "3.3.11",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-core-js": {
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.11.tgz",
+      "integrity": "sha512-WlBY1sKDNL62T++NifgFCyDuOoNUNrVILfnHubOzgU/od7MFEQYWU8EZyDcBC/+Z8e3TD6jfixurYtWoUC+6Eg==",
+      "license": "MIT",
+      "dependencies": {
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
+      },
+      "peerDependencies": {
+        "tslib": ">= 1.0.0"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-shims": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "license": "MIT",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+      }
+    },
+    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/dynamicproto-js": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "license": "MIT",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
@@ -1518,6 +1566,21 @@
       "integrity": "sha512-gNw9z9LbqLV+WadZ6/MMrWwO3e0LuoUH1wve/1iPsBNbgqeVCiB0EZFNNj2lysxS2gkqoF9hmyVaG3MoM1BkxA==",
       "license": "MIT"
     },
+    "node_modules/@nevware21/ts-async": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.5.tgz",
+      "integrity": "sha512-vwqaL05iJPjLeh5igPi8MeeAu10i+Aq7xko1fbo9F5Si6MnVN5505qaV7AhSdk5MCBJVT/UYMk3kgInNjDb4Ig==",
+      "license": "MIT",
+      "dependencies": {
+        "@nevware21/ts-utils": ">= 0.12.2 < 2.x"
+      }
+    },
+    "node_modules/@nevware21/ts-utils": {
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.12.5.tgz",
+      "integrity": "sha512-JPQZWPKQJjj7kAftdEZL0XDFfbMgXCGiUAZe0d7EhLC3QlXTlZdSckGqqRIQ2QNl0VTEZyZUvRBw6Ednw089Fw==",
+      "license": "MIT"
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
diff --git a/package.json b/package.json
index 7e1305bbeb09..0f4024b5c512 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
   "dependencies": {
     "@c4312/eventsource-umd": "^3.0.5",
     "@microsoft/1ds-core-js": "^3.2.13",
-    "@microsoft/1ds-post-js": "^3.2.13",
+    "@microsoft/1ds-post-js": "^4.3.11",
     "@parcel/watcher": "2.5.1",
     "@types/semver": "^7.5.8",
     "@vscode/deviceid": "^0.1.1",

From a6330c3054dfaa6b934a3c787731cc41517d6bc0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jan 2026 17:18:04 +0000
Subject: [PATCH 1720/1815] Bump @xterm/addon-search in /remote

Bumps [@xterm/addon-search](https://github.com/xtermjs/xterm.js) from 0.16.0-beta.99 to 0.17.0-beta.105.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-search"
  dependency-version: 0.17.0-beta.105
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 7b314153b5c2..740e860573d9 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -24,7 +24,7 @@
         "@xterm/addon-image": "^0.10.0-beta.105",
         "@xterm/addon-ligatures": "^0.11.0-beta.105",
         "@xterm/addon-progress": "^0.2.0-beta.5",
-        "@xterm/addon-search": "^0.16.0-beta.99",
+        "@xterm/addon-search": "^0.17.0-beta.105",
         "@xterm/addon-serialize": "^0.15.0-beta.105",
         "@xterm/addon-unicode11": "^0.9.0-beta.99",
         "@xterm/addon-webgl": "^0.20.0-beta.104",
@@ -658,12 +658,12 @@
       }
     },
     "node_modules/@xterm/addon-search": {
-      "version": "0.16.0-beta.99",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.16.0-beta.99.tgz",
-      "integrity": "sha512-nyqGsZDR/l0Gp4gaS+Brrjm53dpaNAqOUtAC8BXmvuzK21sQgyLsC99MTLNR5yh3dYJAfWAAhG5ke/Re3AaamQ==",
+      "version": "0.17.0-beta.105",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.105.tgz",
+      "integrity": "sha512-HkjOQiPWKnKnyeBJm1Q4Dt/JexT1DOPlT5yBylg0r8iCmZBAf3BIt5IDXCgjLrS31WF210Ho1rAstN9kwCNttw==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.99"
+        "@xterm/xterm": "^6.1.0-beta.105"
       }
     },
     "node_modules/@xterm/addon-serialize": {
diff --git a/remote/package.json b/remote/package.json
index 752ef1f2f5c1..c46f137ce66f 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -19,7 +19,7 @@
     "@xterm/addon-image": "^0.10.0-beta.105",
     "@xterm/addon-ligatures": "^0.11.0-beta.105",
     "@xterm/addon-progress": "^0.2.0-beta.5",
-    "@xterm/addon-search": "^0.16.0-beta.99",
+    "@xterm/addon-search": "^0.17.0-beta.105",
     "@xterm/addon-serialize": "^0.15.0-beta.105",
     "@xterm/addon-unicode11": "^0.9.0-beta.99",
     "@xterm/addon-webgl": "^0.20.0-beta.104",

From 995c3d50f12dea435f0f699355b7c1f2d3b77ec9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jan 2026 17:18:06 +0000
Subject: [PATCH 1721/1815] Bump @parcel/watcher from 2.5.1 to 2.5.4 in /remote

Bumps [@parcel/watcher](https://github.com/parcel-bundler/watcher) from 2.5.1 to 2.5.4.
- [Release notes](https://github.com/parcel-bundler/watcher/releases)
- [Commits](https://github.com/parcel-bundler/watcher/compare/v2.5.1...v2.5.4)

---
updated-dependencies:
- dependency-name: "@parcel/watcher"
  dependency-version: 2.5.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 196 +++++++++++++--------------------------
 remote/package.json      |   2 +-
 2 files changed, 64 insertions(+), 134 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 7b314153b5c2..e343c74ffaa7 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -10,7 +10,7 @@
       "dependencies": {
         "@microsoft/1ds-core-js": "^4.3.11",
         "@microsoft/1ds-post-js": "^3.2.13",
-        "@parcel/watcher": "2.5.1",
+        "@parcel/watcher": "2.5.4",
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.1",
         "@vscode/proxy-agent": "^0.32.0",
@@ -173,16 +173,16 @@
       "license": "MIT"
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
-      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.4.tgz",
+      "integrity": "sha512-WYa2tUVV5HiArWPB3ydlOc4R2ivq0IDrlqhMi3l7mVsFEXNcTfxYFPIHXHXIh/ca/y/V5N4E1zecyxdIBjYnkQ==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "detect-libc": "^1.0.3",
+        "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"
@@ -192,25 +192,25 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.1",
-        "@parcel/watcher-darwin-arm64": "2.5.1",
-        "@parcel/watcher-darwin-x64": "2.5.1",
-        "@parcel/watcher-freebsd-x64": "2.5.1",
-        "@parcel/watcher-linux-arm-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm-musl": "2.5.1",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm64-musl": "2.5.1",
-        "@parcel/watcher-linux-x64-glibc": "2.5.1",
-        "@parcel/watcher-linux-x64-musl": "2.5.1",
-        "@parcel/watcher-win32-arm64": "2.5.1",
-        "@parcel/watcher-win32-ia32": "2.5.1",
-        "@parcel/watcher-win32-x64": "2.5.1"
+        "@parcel/watcher-android-arm64": "2.5.4",
+        "@parcel/watcher-darwin-arm64": "2.5.4",
+        "@parcel/watcher-darwin-x64": "2.5.4",
+        "@parcel/watcher-freebsd-x64": "2.5.4",
+        "@parcel/watcher-linux-arm-glibc": "2.5.4",
+        "@parcel/watcher-linux-arm-musl": "2.5.4",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.4",
+        "@parcel/watcher-linux-arm64-musl": "2.5.4",
+        "@parcel/watcher-linux-x64-glibc": "2.5.4",
+        "@parcel/watcher-linux-x64-musl": "2.5.4",
+        "@parcel/watcher-win32-arm64": "2.5.4",
+        "@parcel/watcher-win32-ia32": "2.5.4",
+        "@parcel/watcher-win32-x64": "2.5.4"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
-      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.4.tgz",
+      "integrity": "sha512-hoh0vx4v+b3BNI7Cjoy2/B0ARqcwVNrzN/n7DLq9ZB4I3lrsvhrkCViJyfTj/Qi5xM9YFiH4AmHGK6pgH1ss7g==",
       "cpu": [
         "arm64"
       ],
@@ -228,9 +228,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
-      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.4.tgz",
+      "integrity": "sha512-kphKy377pZiWpAOyTgQYPE5/XEKVMaj6VUjKT5VkNyUJlr2qZAn8gIc7CPzx+kbhvqHDT9d7EqdOqRXT6vk0zw==",
       "cpu": [
         "arm64"
       ],
@@ -248,9 +248,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
-      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.4.tgz",
+      "integrity": "sha512-UKaQFhCtNJW1A9YyVz3Ju7ydf6QgrpNQfRZ35wNKUhTQ3dxJ/3MULXN5JN/0Z80V/KUBDGa3RZaKq1EQT2a2gg==",
       "cpu": [
         "x64"
       ],
@@ -268,9 +268,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
-      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.4.tgz",
+      "integrity": "sha512-Dib0Wv3Ow/m2/ttvLdeI2DBXloO7t3Z0oCp4bAb2aqyqOjKPPGrg10pMJJAQ7tt8P4V2rwYwywkDhUia/FgS+Q==",
       "cpu": [
         "x64"
       ],
@@ -288,9 +288,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
-      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.4.tgz",
+      "integrity": "sha512-I5Vb769pdf7Q7Sf4KNy8Pogl/URRCKu9ImMmnVKYayhynuyGYMzuI4UOWnegQNa2sGpsPSbzDsqbHNMyeyPCgw==",
       "cpu": [
         "arm"
       ],
@@ -308,9 +308,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
-      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.4.tgz",
+      "integrity": "sha512-kGO8RPvVrcAotV4QcWh8kZuHr9bXi9a3bSZw7kFarYR0+fGliU7hd/zevhjw8fnvIKG3J9EO5G6sXNGCSNMYPQ==",
       "cpu": [
         "arm"
       ],
@@ -328,9 +328,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
-      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.4.tgz",
+      "integrity": "sha512-KU75aooXhqGFY2W5/p8DYYHt4hrjHZod8AhcGAmhzPn/etTa+lYCDB2b1sJy3sWJ8ahFVTdy+EbqSBvMx3iFlw==",
       "cpu": [
         "arm64"
       ],
@@ -348,9 +348,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
-      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.4.tgz",
+      "integrity": "sha512-Qx8uNiIekVutnzbVdrgSanM+cbpDD3boB1f8vMtnuG5Zau4/bdDbXyKwIn0ToqFhIuob73bcxV9NwRm04/hzHQ==",
       "cpu": [
         "arm64"
       ],
@@ -368,9 +368,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
-      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.4.tgz",
+      "integrity": "sha512-UYBQvhYmgAv61LNUn24qGQdjtycFBKSK3EXr72DbJqX9aaLbtCOO8+1SkKhD/GNiJ97ExgcHBrukcYhVjrnogA==",
       "cpu": [
         "x64"
       ],
@@ -388,9 +388,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
-      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.4.tgz",
+      "integrity": "sha512-YoRWCVgxv8akZrMhdyVi6/TyoeeMkQ0PGGOf2E4omODrvd1wxniXP+DBynKoHryStks7l+fDAMUBRzqNHrVOpg==",
       "cpu": [
         "x64"
       ],
@@ -408,9 +408,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
-      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.4.tgz",
+      "integrity": "sha512-iby+D/YNXWkiQNYcIhg8P5hSjzXEHaQrk2SLrWOUD7VeC4Ohu0WQvmV+HDJokZVJ2UjJ4AGXW3bx7Lls9Ln4TQ==",
       "cpu": [
         "arm64"
       ],
@@ -428,9 +428,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
-      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.4.tgz",
+      "integrity": "sha512-vQN+KIReG0a2ZDpVv8cgddlf67J8hk1WfZMMP7sMeZmJRSmEax5xNDNWKdgqSe2brOKTQQAs3aCCUal2qBHAyg==",
       "cpu": [
         "ia32"
       ],
@@ -448,9 +448,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
-      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.4.tgz",
+      "integrity": "sha512-3A6efb6BOKwyw7yk9ro2vus2YTt2nvcd56AuzxdMiVOxL9umDyN5PKkKfZ/gZ9row41SjVmTVQNWQhaRRGpOKw==",
       "cpu": [
         "x64"
       ],
@@ -467,18 +467,6 @@
         "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@parcel/watcher/node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "license": "Apache-2.0",
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/@tootallnate/once": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-3.0.0.tgz",
@@ -759,18 +747,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==",
-      "license": "MIT",
-      "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",
@@ -898,18 +874,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==",
-      "license": "MIT",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -1029,15 +993,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==",
-      "license": "MIT",
-      "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",
@@ -1103,19 +1058,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==",
-      "license": "MIT",
-      "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",
@@ -1229,12 +1171,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"
@@ -1484,18 +1426,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==",
-      "license": "MIT",
-      "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",
diff --git a/remote/package.json b/remote/package.json
index 752ef1f2f5c1..fe6d728a0b2a 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@microsoft/1ds-core-js": "^4.3.11",
     "@microsoft/1ds-post-js": "^3.2.13",
-    "@parcel/watcher": "2.5.1",
+    "@parcel/watcher": "2.5.4",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/proxy-agent": "^0.32.0",

From f406b02bf8f21ef10ea72b5d9861132d07c0ec2a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jan 2026 17:21:38 +0000
Subject: [PATCH 1722/1815] Bump @vscode/iconv-lite-umd from 0.7.0 to 0.7.1 in
 /remote/web

Bumps [@vscode/iconv-lite-umd](https://github.com/Microsoft/vscode-iconv-lite-umd) from 0.7.0 to 0.7.1.
- [Release notes](https://github.com/Microsoft/vscode-iconv-lite-umd/releases)
- [Commits](https://github.com/Microsoft/vscode-iconv-lite-umd/commits/v0.7.1)

---
updated-dependencies:
- dependency-name: "@vscode/iconv-lite-umd"
  dependency-version: 0.7.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 8 ++++----
 remote/web/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 83cdfb205801..0aef8916fb03 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -10,7 +10,7 @@
 			"dependencies": {
 				"@microsoft/1ds-core-js": "^4.3.11",
 				"@microsoft/1ds-post-js": "^3.2.13",
-				"@vscode/iconv-lite-umd": "0.7.0",
+				"@vscode/iconv-lite-umd": "0.7.1",
 				"@vscode/tree-sitter-wasm": "^0.3.0",
 				"@vscode/vscode-languagedetection": "1.0.23",
 				"@xterm/addon-clipboard": "^0.3.0-beta.105",
@@ -155,9 +155,9 @@
 			"license": "MIT"
 		},
 		"node_modules/@vscode/iconv-lite-umd": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
-			"integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==",
+			"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/tree-sitter-wasm": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 31e564d98522..ec721eff95e2 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -5,7 +5,7 @@
 	"dependencies": {
 		"@microsoft/1ds-core-js": "^4.3.11",
 		"@microsoft/1ds-post-js": "^3.2.13",
-		"@vscode/iconv-lite-umd": "0.7.0",
+		"@vscode/iconv-lite-umd": "0.7.1",
 		"@vscode/tree-sitter-wasm": "^0.3.0",
 		"@vscode/vscode-languagedetection": "1.0.23",
 		"@xterm/addon-clipboard": "^0.3.0-beta.105",

From 7f6b7b811c4c61adae3cdb626623b7ec0f0014c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jan 2026 17:24:48 +0000
Subject: [PATCH 1723/1815] Bump @xterm/addon-unicode11 in /remote

Bumps [@xterm/addon-unicode11](https://github.com/xtermjs/xterm.js) from 0.9.0-beta.99 to 0.10.0-beta.105.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-unicode11"
  dependency-version: 0.10.0-beta.105
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 80e95231df1b..da5941c8cef9 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -26,7 +26,7 @@
         "@xterm/addon-progress": "^0.2.0-beta.5",
         "@xterm/addon-search": "^0.17.0-beta.105",
         "@xterm/addon-serialize": "^0.15.0-beta.105",
-        "@xterm/addon-unicode11": "^0.9.0-beta.99",
+        "@xterm/addon-unicode11": "^0.10.0-beta.105",
         "@xterm/addon-webgl": "^0.20.0-beta.104",
         "@xterm/headless": "^6.0.0",
         "@xterm/xterm": "^6.0.0",
@@ -664,12 +664,12 @@
       }
     },
     "node_modules/@xterm/addon-unicode11": {
-      "version": "0.9.0-beta.99",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.99.tgz",
-      "integrity": "sha512-4epGzbOc7X+NyPIMPxnQxaUlZYhCRTEPRsvfuIx55+Yyzip/zGX5ahy/Z22YrGTVv7qjxhVsu1tCbCgiF9HtTA==",
+      "version": "0.10.0-beta.105",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.105.tgz",
+      "integrity": "sha512-zMepG3Wa44+n8SQbNZ8jnpASh9zDEuDlk/0+bpPaRRc4UkiR6UbhzZos+qC8glxu1QGLd/4dFMuypnNxWonkpQ==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.99"
+        "@xterm/xterm": "^6.1.0-beta.105"
       }
     },
     "node_modules/@xterm/addon-webgl": {
diff --git a/remote/package.json b/remote/package.json
index a886cdbe4bc4..87b2334f9e24 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -21,7 +21,7 @@
     "@xterm/addon-progress": "^0.2.0-beta.5",
     "@xterm/addon-search": "^0.17.0-beta.105",
     "@xterm/addon-serialize": "^0.15.0-beta.105",
-    "@xterm/addon-unicode11": "^0.9.0-beta.99",
+    "@xterm/addon-unicode11": "^0.10.0-beta.105",
     "@xterm/addon-webgl": "^0.20.0-beta.104",
     "@xterm/headless": "^6.0.0",
     "@xterm/xterm": "^6.0.0",

From 6375da3dbd2eedd51b5773878547927986337b3a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jan 2026 17:25:11 +0000
Subject: [PATCH 1724/1815] Bump @xterm/addon-progress in /remote

Bumps [@xterm/addon-progress](https://github.com/xtermjs/xterm.js) from 0.2.0-beta.5 to 0.3.0-beta.105.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-progress"
  dependency-version: 0.3.0-beta.105
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 80e95231df1b..fc66eddc4b6a 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -23,7 +23,7 @@
         "@xterm/addon-clipboard": "^0.3.0-beta.105",
         "@xterm/addon-image": "^0.10.0-beta.105",
         "@xterm/addon-ligatures": "^0.11.0-beta.105",
-        "@xterm/addon-progress": "^0.2.0-beta.5",
+        "@xterm/addon-progress": "^0.3.0-beta.105",
         "@xterm/addon-search": "^0.17.0-beta.105",
         "@xterm/addon-serialize": "^0.15.0-beta.105",
         "@xterm/addon-unicode11": "^0.9.0-beta.99",
@@ -637,12 +637,12 @@
       }
     },
     "node_modules/@xterm/addon-progress": {
-      "version": "0.2.0-beta.5",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.2.0-beta.5.tgz",
-      "integrity": "sha512-6dfUtCqK/anFiVilv1KNyVWbEql2hJwINlAXnl5YtIyEwR8F/i+zWBuzUj9152gT3rDASTmgXE5HG6mnyaUI9w==",
+      "version": "0.3.0-beta.105",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.105.tgz",
+      "integrity": "sha512-1VW3D0VA5DS7n7pa8cFA57emhijt/10mM7sK7Ll22AYNmNyNdUiXWm1ORgzI2U1ApBADm117W5QiEkkDEu+F0w==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.99"
+        "@xterm/xterm": "^6.1.0-beta.105"
       }
     },
     "node_modules/@xterm/addon-search": {
diff --git a/remote/package.json b/remote/package.json
index a886cdbe4bc4..d904ce2c0def 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -18,7 +18,7 @@
     "@xterm/addon-clipboard": "^0.3.0-beta.105",
     "@xterm/addon-image": "^0.10.0-beta.105",
     "@xterm/addon-ligatures": "^0.11.0-beta.105",
-    "@xterm/addon-progress": "^0.2.0-beta.5",
+    "@xterm/addon-progress": "^0.3.0-beta.105",
     "@xterm/addon-search": "^0.17.0-beta.105",
     "@xterm/addon-serialize": "^0.15.0-beta.105",
     "@xterm/addon-unicode11": "^0.9.0-beta.99",

From 7e7c36a948bd58d87768ce7275ae787931b4ac45 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jan 2026 18:37:50 +0000
Subject: [PATCH 1725/1815] Bump @microsoft/1ds-post-js from 3.2.18 to 4.3.11
 in /remote/web

Bumps [@microsoft/1ds-post-js](https://github.com/microsoft/ApplicationInsights-JS) from 3.2.18 to 4.3.11.
- [Release notes](https://github.com/microsoft/ApplicationInsights-JS/releases)
- [Changelog](https://github.com/microsoft/ApplicationInsights-JS/blob/main/RELEASES.md)
- [Commits](https://github.com/microsoft/ApplicationInsights-JS/commits)

---
updated-dependencies:
- dependency-name: "@microsoft/1ds-post-js"
  dependency-version: 4.3.11
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 74 ++++++------------------------------
 remote/web/package.json      |  2 +-
 2 files changed, 12 insertions(+), 64 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 0aef8916fb03..5ad6d013fbf2 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -9,7 +9,7 @@
 			"version": "0.0.0",
 			"dependencies": {
 				"@microsoft/1ds-core-js": "^4.3.11",
-				"@microsoft/1ds-post-js": "^3.2.13",
+				"@microsoft/1ds-post-js": "^4.3.11",
 				"@vscode/iconv-lite-umd": "0.7.1",
 				"@vscode/tree-sitter-wasm": "^0.3.0",
 				"@vscode/vscode-languagedetection": "1.0.23",
@@ -41,57 +41,17 @@
 				"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
 			}
 		},
-		"node_modules/@microsoft/1ds-core-js/node_modules/@microsoft/applicationinsights-shims": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
-			"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
-			"license": "MIT",
-			"dependencies": {
-				"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
-			}
-		},
-		"node_modules/@microsoft/1ds-core-js/node_modules/@microsoft/dynamicproto-js": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
-			"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
-			"license": "MIT",
-			"dependencies": {
-				"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
-			}
-		},
 		"node_modules/@microsoft/1ds-post-js": {
-			"version": "3.2.18",
-			"resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-3.2.18.tgz",
-			"integrity": "sha512-Tzjcja4SMyws3UP58kD2edFPNb7BJtx5uCgwf/PWXwDyfbUY1/crsTQdEyR98wy/vorvLDZdQlcL++VMChfYnQ==",
-			"license": "MIT",
-			"dependencies": {
-				"@microsoft/1ds-core-js": "3.2.18",
-				"@microsoft/applicationinsights-shims": "^2.0.2",
-				"@microsoft/dynamicproto-js": "^1.1.11"
-			}
-		},
-		"node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/1ds-core-js": {
-			"version": "3.2.18",
-			"resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.18.tgz",
-			"integrity": "sha512-ytlFv3dfb8OGqvbZP8tSIlNvn3QNYxdsF0k6ikRMWSr6CmBxBi1sliaxc2Q5KuYOuaeWkd8WRm25Rx/UtHcyMg==",
-			"license": "MIT",
-			"dependencies": {
-				"@microsoft/applicationinsights-core-js": "2.8.18",
-				"@microsoft/applicationinsights-shims": "^2.0.2",
-				"@microsoft/dynamicproto-js": "^1.1.11"
-			}
-		},
-		"node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-core-js": {
-			"version": "2.8.18",
-			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.18.tgz",
-			"integrity": "sha512-yPHRZFLpnEO0uSgFPM1BLMRRwjoten9YBbn4pJRbCT4PigLnj748knmWsMwXIdcehtkRTYz78kPYa/LWP7nvmA==",
+			"version": "4.3.11",
+			"resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.11.tgz",
+			"integrity": "sha512-V0ZeeALy/Pj8HWgNHDsK+yDeCYnJ9bCgTWhcrna/ZiAT+sGfWs6mDBjAVcG03uP7TDjdWLf8w79lgbXJ3+s3DA==",
 			"license": "MIT",
 			"dependencies": {
-				"@microsoft/applicationinsights-shims": "2.0.2",
-				"@microsoft/dynamicproto-js": "^1.1.11"
-			},
-			"peerDependencies": {
-				"tslib": "*"
+				"@microsoft/1ds-core-js": "4.3.11",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.4 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.8 < 2.x"
 			}
 		},
 		"node_modules/@microsoft/applicationinsights-core-js": {
@@ -109,7 +69,7 @@
 				"tslib": ">= 1.0.0"
 			}
 		},
-		"node_modules/@microsoft/applicationinsights-core-js/node_modules/@microsoft/applicationinsights-shims": {
+		"node_modules/@microsoft/applicationinsights-shims": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
 			"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
@@ -118,7 +78,7 @@
 				"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
 			}
 		},
-		"node_modules/@microsoft/applicationinsights-core-js/node_modules/@microsoft/dynamicproto-js": {
+		"node_modules/@microsoft/dynamicproto-js": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
 			"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
@@ -127,18 +87,6 @@
 				"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
 			}
 		},
-		"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==",
-			"license": "MIT"
-		},
-		"node_modules/@microsoft/dynamicproto-js": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.11.tgz",
-			"integrity": "sha512-gNw9z9LbqLV+WadZ6/MMrWwO3e0LuoUH1wve/1iPsBNbgqeVCiB0EZFNNj2lysxS2gkqoF9hmyVaG3MoM1BkxA==",
-			"license": "MIT"
-		},
 		"node_modules/@nevware21/ts-async": {
 			"version": "0.5.5",
 			"resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.5.tgz",
diff --git a/remote/web/package.json b/remote/web/package.json
index ec721eff95e2..af1d5f66559b 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"dependencies": {
 		"@microsoft/1ds-core-js": "^4.3.11",
-		"@microsoft/1ds-post-js": "^3.2.13",
+		"@microsoft/1ds-post-js": "^4.3.11",
 		"@vscode/iconv-lite-umd": "0.7.1",
 		"@vscode/tree-sitter-wasm": "^0.3.0",
 		"@vscode/vscode-languagedetection": "1.0.23",

From 37579f13ce3805d76720365b1960d9fa6b278ef3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:15:02 +0000
Subject: [PATCH 1726/1815] Bump @types/node in
 /.vscode/extensions/vscode-selfhost-test-provider

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../vscode-selfhost-test-provider/package-lock.json         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
index e73c42b1eab0..08980be9b8d5 100644
--- a/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
+++ b/.vscode/extensions/vscode-selfhost-test-provider/package-lock.json
@@ -58,9 +58,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From aca1dc2688da9e3afc7d415dfea6f793afa4858c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:15:07 +0000
Subject: [PATCH 1727/1815] Bump @types/node from 25.0.9 to 25.0.10 in
 /extensions/debug-auto-launch

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/debug-auto-launch/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/debug-auto-launch/package-lock.json b/extensions/debug-auto-launch/package-lock.json
index 77cadfe9ff56..19ebcad6e8d7 100644
--- a/extensions/debug-auto-launch/package-lock.json
+++ b/extensions/debug-auto-launch/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From cfd77bc09181ba7838899038eb54baf50ef05fc9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:15:09 +0000
Subject: [PATCH 1728/1815] Bump @types/node in
 /extensions/configuration-editing

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/configuration-editing/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/configuration-editing/package-lock.json b/extensions/configuration-editing/package-lock.json
index de424e969872..6619002d1209 100644
--- a/extensions/configuration-editing/package-lock.json
+++ b/extensions/configuration-editing/package-lock.json
@@ -175,9 +175,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From bc013d1db3cb6cdc542f32c083f85e06cbef6c42 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:15:10 +0000
Subject: [PATCH 1729/1815] Bump @types/node in
 /extensions/css-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/css-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/css-language-features/server/package-lock.json b/extensions/css-language-features/server/package-lock.json
index 15dbd7c65835..29a57f1d6361 100644
--- a/extensions/css-language-features/server/package-lock.json
+++ b/extensions/css-language-features/server/package-lock.json
@@ -30,9 +30,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 99f775a95d8206bfda33d9924aa5607d67d94578 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:15:24 +0000
Subject: [PATCH 1730/1815] Bump @types/node from 25.0.9 to 25.0.10 in /build

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 9e6b16ca3ec8..1ec204b3c27b 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -1755,9 +1755,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 3fd3bc54640834d65cdcd628202ef82fadbd7a2e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:15:45 +0000
Subject: [PATCH 1731/1815] Bump @types/node from 25.0.9 to 25.0.10 in
 /extensions/git

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index bbfef19e00f9..37be7ae3b2ce 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -214,9 +214,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 76a788bd180a542db463af6ed8bd18eb55603e33 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:15:49 +0000
Subject: [PATCH 1732/1815] Bump @types/node from 25.0.9 to 25.0.10 in
 /extensions/emmet

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/emmet/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/emmet/package-lock.json b/extensions/emmet/package-lock.json
index 6a777964d33f..abac59d730ee 100644
--- a/extensions/emmet/package-lock.json
+++ b/extensions/emmet/package-lock.json
@@ -80,9 +80,9 @@
       "integrity": "sha1-JEywLHfsLnT3ipvTGCGKvJxQCmE= sha512-ZsZ2I9Vzso3Ho/pjZFsmmZ++FWeEd/txqybHTm4OgaZzdS8V9V/YYWQwg5TC38Z7uLWUV1vavpLLbjJtKubR1A=="
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 231ce2cb5c7ba6b3cfb6ef1252cbfb418cf29e12 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:15:51 +0000
Subject: [PATCH 1733/1815] Bump @types/node in /extensions/debug-server-ready

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/debug-server-ready/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/debug-server-ready/package-lock.json b/extensions/debug-server-ready/package-lock.json
index fcdb91f25af9..c4d14ed743f2 100644
--- a/extensions/debug-server-ready/package-lock.json
+++ b/extensions/debug-server-ready/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From d78dfe56cd663e6f82def4c90921aeb809fd9616 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:15:51 +0000
Subject: [PATCH 1734/1815] Bump @types/node in
 /extensions/github-authentication

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github-authentication/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/github-authentication/package-lock.json b/extensions/github-authentication/package-lock.json
index aa581c02152c..472a81ae21c3 100644
--- a/extensions/github-authentication/package-lock.json
+++ b/extensions/github-authentication/package-lock.json
@@ -154,9 +154,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 2f947a95056ae5274c5caee7ceca3eb207a2503d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:15:53 +0000
Subject: [PATCH 1735/1815] Bump @types/node in
 /extensions/html-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/html-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/html-language-features/package-lock.json b/extensions/html-language-features/package-lock.json
index a0c8471e5529..8eb22bbe9ffc 100644
--- a/extensions/html-language-features/package-lock.json
+++ b/extensions/html-language-features/package-lock.json
@@ -166,9 +166,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 8bd1749dea02dda7ac5318005c59840f086728cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:15:54 +0000
Subject: [PATCH 1736/1815] Bump @types/node from 25.0.9 to 25.0.10 in
 /extensions/grunt

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/grunt/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/grunt/package-lock.json b/extensions/grunt/package-lock.json
index dcdd06124c3e..9762d1fc3e98 100644
--- a/extensions/grunt/package-lock.json
+++ b/extensions/grunt/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 07ca7b545a5c29a756856f2de7600b25642317d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:15:55 +0000
Subject: [PATCH 1737/1815] Bump @types/node from 25.0.9 to 25.0.10 in
 /extensions/git-base

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git-base/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/git-base/package-lock.json b/extensions/git-base/package-lock.json
index 2aff9022ffd8..05a194b412e9 100644
--- a/extensions/git-base/package-lock.json
+++ b/extensions/git-base/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 61dcb91fd44a534a1e33ed24603ae1908e4cec5b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:15:55 +0000
Subject: [PATCH 1738/1815] Bump @types/node in
 /extensions/css-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/css-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/css-language-features/package-lock.json b/extensions/css-language-features/package-lock.json
index 1725ea2a8683..7ef1b266912f 100644
--- a/extensions/css-language-features/package-lock.json
+++ b/extensions/css-language-features/package-lock.json
@@ -41,9 +41,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 091cf116acbbd4a503418811941c8d9e08a57931 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:15:56 +0000
Subject: [PATCH 1739/1815] Bump @types/node from 25.0.9 to 25.0.10 in
 /extensions/extension-editing

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/extension-editing/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/extension-editing/package-lock.json b/extensions/extension-editing/package-lock.json
index 5b96c0f69c05..c4b1f5e99162 100644
--- a/extensions/extension-editing/package-lock.json
+++ b/extensions/extension-editing/package-lock.json
@@ -47,9 +47,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 09635ab66e4f1d20392d7ccd9836af1703da2f6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:16:01 +0000
Subject: [PATCH 1740/1815] Bump @types/node in
 /extensions/html-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/html-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/html-language-features/server/package-lock.json b/extensions/html-language-features/server/package-lock.json
index f89adb52b14b..4d7c697e1f51 100644
--- a/extensions/html-language-features/server/package-lock.json
+++ b/extensions/html-language-features/server/package-lock.json
@@ -32,9 +32,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From b37cc307f7995f79d9badfa61b8595607bfbdd2b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:16:36 +0000
Subject: [PATCH 1741/1815] Bump @types/node from 25.0.9 to 25.0.10 in
 /extensions/github

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/github/package-lock.json b/extensions/github/package-lock.json
index c556d0ab5e87..6072610911ed 100644
--- a/extensions/github/package-lock.json
+++ b/extensions/github/package-lock.json
@@ -311,9 +311,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 2df4416384223a09880f7fc2745887fa75790be2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:16:42 +0000
Subject: [PATCH 1742/1815] Bump @types/node from 25.0.9 to 25.0.10 in
 /extensions/jake

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/jake/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/jake/package-lock.json b/extensions/jake/package-lock.json
index 8494d8c65bcd..65202510fc94 100644
--- a/extensions/jake/package-lock.json
+++ b/extensions/jake/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From a2953ec354f174bf4f8756d1e46838de4a506011 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:16:44 +0000
Subject: [PATCH 1743/1815] Bump @types/node in
 /extensions/json-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/json-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/json-language-features/package-lock.json b/extensions/json-language-features/package-lock.json
index 0571a745ed35..8379766d5669 100644
--- a/extensions/json-language-features/package-lock.json
+++ b/extensions/json-language-features/package-lock.json
@@ -166,9 +166,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From db9318092383d3e76718c185aa0b6bfa0046b2b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:16:44 +0000
Subject: [PATCH 1744/1815] Bump @types/node from 25.0.9 to 25.0.10 in
 /extensions/gulp

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/gulp/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/gulp/package-lock.json b/extensions/gulp/package-lock.json
index dcf99a155e7f..9703ac99541e 100644
--- a/extensions/gulp/package-lock.json
+++ b/extensions/gulp/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 5bf05c5488f08155ab946d396f2c78c1b9cab4a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:17:36 +0000
Subject: [PATCH 1745/1815] Bump @types/node in
 /extensions/json-language-features/server

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/json-language-features/server/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/json-language-features/server/package-lock.json b/extensions/json-language-features/server/package-lock.json
index beda4d2ff584..2f4201db9e41 100644
--- a/extensions/json-language-features/server/package-lock.json
+++ b/extensions/json-language-features/server/package-lock.json
@@ -35,9 +35,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 42d30b46160a3c5c0e4090fc96715410724497c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:17:59 +0000
Subject: [PATCH 1746/1815] Bump @types/node from 25.0.9 to 25.0.10 in
 /extensions/merge-conflict

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/merge-conflict/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/merge-conflict/package-lock.json b/extensions/merge-conflict/package-lock.json
index 9c3005b00e93..c4cbf3546d0b 100644
--- a/extensions/merge-conflict/package-lock.json
+++ b/extensions/merge-conflict/package-lock.json
@@ -143,9 +143,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 3add701fa1dbfb2f3acd81073bc1fafd52d45579 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:18:07 +0000
Subject: [PATCH 1747/1815] Bump @types/node from 25.0.9 to 25.0.10 in
 /extensions/npm

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/npm/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/npm/package-lock.json b/extensions/npm/package-lock.json
index 6f80b1a0fad9..bb44648b111c 100644
--- a/extensions/npm/package-lock.json
+++ b/extensions/npm/package-lock.json
@@ -60,9 +60,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From ae7bbc2c63a98f7187726cea47966dae82b364bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:18:07 +0000
Subject: [PATCH 1748/1815] Bump @types/node in
 /extensions/microsoft-authentication

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/microsoft-authentication/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 995d4dac7038..c9a60f744349 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -202,9 +202,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 454fb5565f9bc02d719552ece90e1b48c20860b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:18:21 +0000
Subject: [PATCH 1749/1815] Bump @types/node from 25.0.9 to 25.0.10 in
 /extensions/references-view

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/references-view/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/references-view/package-lock.json b/extensions/references-view/package-lock.json
index a52729864602..448fb756e80b 100644
--- a/extensions/references-view/package-lock.json
+++ b/extensions/references-view/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From a8f846b68b38d6637976fcf7a02bbafc17188f0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:18:25 +0000
Subject: [PATCH 1750/1815] Bump @types/node in
 /extensions/php-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/php-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/php-language-features/package-lock.json b/extensions/php-language-features/package-lock.json
index 1ad4d90327cd..b4db78806c17 100644
--- a/extensions/php-language-features/package-lock.json
+++ b/extensions/php-language-features/package-lock.json
@@ -20,9 +20,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 4d89a386f0d48e0635e92f8673578645743e0843 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:19:11 +0000
Subject: [PATCH 1751/1815] Bump @types/node in
 /extensions/vscode-colorize-perf-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-colorize-perf-tests/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-colorize-perf-tests/package-lock.json b/extensions/vscode-colorize-perf-tests/package-lock.json
index 18c4ef96dd37..9cac2b08f68f 100644
--- a/extensions/vscode-colorize-perf-tests/package-lock.json
+++ b/extensions/vscode-colorize-perf-tests/package-lock.json
@@ -19,9 +19,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 87a4859264e3cd8d50dc8c8b6cdf29fb32db51ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:19:30 +0000
Subject: [PATCH 1752/1815] Bump cookie from 0.7.2 to 1.1.1 in /remote

Bumps [cookie](https://github.com/jshttp/cookie) from 0.7.2 to 1.1.1.
- [Release notes](https://github.com/jshttp/cookie/releases)
- [Commits](https://github.com/jshttp/cookie/compare/v0.7.2...v1.1.1)

---
updated-dependencies:
- dependency-name: cookie
  dependency-version: 1.1.1
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 14 +++++++++-----
 remote/package.json      |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 24a1a3fd0397..8c30d4dd4734 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -30,7 +30,7 @@
         "@xterm/addon-webgl": "^0.20.0-beta.104",
         "@xterm/headless": "^6.0.0",
         "@xterm/xterm": "^6.0.0",
-        "cookie": "^0.7.0",
+        "cookie": "^1.1.1",
         "http-proxy-agent": "^7.0.0",
         "https-proxy-agent": "^7.0.2",
         "jschardet": "3.1.4",
@@ -786,12 +786,16 @@
       "license": "ISC"
     },
     "node_modules/cookie": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
-      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz",
+      "integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==",
       "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/debug": {
diff --git a/remote/package.json b/remote/package.json
index 5076c5add1c4..917fe10680cc 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -25,7 +25,7 @@
     "@xterm/addon-webgl": "^0.20.0-beta.104",
     "@xterm/headless": "^6.0.0",
     "@xterm/xterm": "^6.0.0",
-    "cookie": "^0.7.0",
+    "cookie": "^1.1.1",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
     "jschardet": "3.1.4",

From 52df243c00dcc44c91c589a3809777d6d9bc3493 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:19:39 +0000
Subject: [PATCH 1753/1815] Bump @microsoft/1ds-post-js from 3.2.18 to 4.3.11
 in /remote

Bumps [@microsoft/1ds-post-js](https://github.com/microsoft/ApplicationInsights-JS) from 3.2.18 to 4.3.11.
- [Release notes](https://github.com/microsoft/ApplicationInsights-JS/releases)
- [Changelog](https://github.com/microsoft/ApplicationInsights-JS/blob/main/RELEASES.md)
- [Commits](https://github.com/microsoft/ApplicationInsights-JS/commits)

---
updated-dependencies:
- dependency-name: "@microsoft/1ds-post-js"
  dependency-version: 4.3.11
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 74 ++++++----------------------------------
 remote/package.json      |  2 +-
 2 files changed, 12 insertions(+), 64 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 24a1a3fd0397..67beb1b75970 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.0.0",
       "dependencies": {
         "@microsoft/1ds-core-js": "^4.3.11",
-        "@microsoft/1ds-post-js": "^3.2.13",
+        "@microsoft/1ds-post-js": "^4.3.11",
         "@parcel/watcher": "2.5.4",
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.1",
@@ -59,57 +59,17 @@
         "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
-    "node_modules/@microsoft/1ds-core-js/node_modules/@microsoft/applicationinsights-shims": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
-      "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
-      }
-    },
-    "node_modules/@microsoft/1ds-core-js/node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
-      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
-      "license": "MIT",
-      "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
-      }
-    },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "3.2.18",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-3.2.18.tgz",
-      "integrity": "sha512-Tzjcja4SMyws3UP58kD2edFPNb7BJtx5uCgwf/PWXwDyfbUY1/crsTQdEyR98wy/vorvLDZdQlcL++VMChfYnQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@microsoft/1ds-core-js": "3.2.18",
-        "@microsoft/applicationinsights-shims": "^2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.11"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/1ds-core-js": {
-      "version": "3.2.18",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-3.2.18.tgz",
-      "integrity": "sha512-ytlFv3dfb8OGqvbZP8tSIlNvn3QNYxdsF0k6ikRMWSr6CmBxBi1sliaxc2Q5KuYOuaeWkd8WRm25Rx/UtHcyMg==",
-      "license": "MIT",
-      "dependencies": {
-        "@microsoft/applicationinsights-core-js": "2.8.18",
-        "@microsoft/applicationinsights-shims": "^2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.11"
-      }
-    },
-    "node_modules/@microsoft/1ds-post-js/node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "2.8.18",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.18.tgz",
-      "integrity": "sha512-yPHRZFLpnEO0uSgFPM1BLMRRwjoten9YBbn4pJRbCT4PigLnj748knmWsMwXIdcehtkRTYz78kPYa/LWP7nvmA==",
+      "version": "4.3.11",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.11.tgz",
+      "integrity": "sha512-V0ZeeALy/Pj8HWgNHDsK+yDeCYnJ9bCgTWhcrna/ZiAT+sGfWs6mDBjAVcG03uP7TDjdWLf8w79lgbXJ3+s3DA==",
       "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-shims": "2.0.2",
-        "@microsoft/dynamicproto-js": "^1.1.11"
-      },
-      "peerDependencies": {
-        "tslib": "*"
+        "@microsoft/1ds-core-js": "4.3.11",
+        "@microsoft/applicationinsights-shims": "3.0.1",
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.4 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.8 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
@@ -127,7 +87,7 @@
         "tslib": ">= 1.0.0"
       }
     },
-    "node_modules/@microsoft/applicationinsights-core-js/node_modules/@microsoft/applicationinsights-shims": {
+    "node_modules/@microsoft/applicationinsights-shims": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
       "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
@@ -136,7 +96,7 @@
         "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
       }
     },
-    "node_modules/@microsoft/applicationinsights-core-js/node_modules/@microsoft/dynamicproto-js": {
+    "node_modules/@microsoft/dynamicproto-js": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
       "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
@@ -145,18 +105,6 @@
         "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
       }
     },
-    "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==",
-      "license": "MIT"
-    },
-    "node_modules/@microsoft/dynamicproto-js": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.11.tgz",
-      "integrity": "sha512-gNw9z9LbqLV+WadZ6/MMrWwO3e0LuoUH1wve/1iPsBNbgqeVCiB0EZFNNj2lysxS2gkqoF9hmyVaG3MoM1BkxA==",
-      "license": "MIT"
-    },
     "node_modules/@nevware21/ts-async": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.5.tgz",
diff --git a/remote/package.json b/remote/package.json
index 5076c5add1c4..112549557902 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@microsoft/1ds-core-js": "^4.3.11",
-    "@microsoft/1ds-post-js": "^3.2.13",
+    "@microsoft/1ds-post-js": "^4.3.11",
     "@parcel/watcher": "2.5.4",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.1",

From 17430a9834df0a24ff6cd1333c89500f95d417d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:19:41 +0000
Subject: [PATCH 1754/1815] Bump @types/node in
 /extensions/vscode-test-resolver

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-test-resolver/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-test-resolver/package-lock.json b/extensions/vscode-test-resolver/package-lock.json
index 80ee93cd121a..45b8a4309ef9 100644
--- a/extensions/vscode-test-resolver/package-lock.json
+++ b/extensions/vscode-test-resolver/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 31b216cd9b9408ca56782c3917bf382ee3d1e92e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:19:42 +0000
Subject: [PATCH 1755/1815] Bump @types/node in
 /extensions/vscode-colorize-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-colorize-tests/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-colorize-tests/package-lock.json b/extensions/vscode-colorize-tests/package-lock.json
index 194753bd5ccc..234908d6ba88 100644
--- a/extensions/vscode-colorize-tests/package-lock.json
+++ b/extensions/vscode-colorize-tests/package-lock.json
@@ -19,9 +19,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 029e5d05c1a42906551a5ea3b9d7865e414f8072 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:19:44 +0000
Subject: [PATCH 1756/1815] Bump @vscode/proxy-agent from 0.32.0 to 0.37.0 in
 /remote

Bumps [@vscode/proxy-agent](https://github.com/microsoft/vscode-proxy-agent) from 0.32.0 to 0.37.0.
- [Release notes](https://github.com/microsoft/vscode-proxy-agent/releases)
- [Changelog](https://github.com/microsoft/vscode-proxy-agent/blob/main/CHANGELOG.md)
- [Commits](https://github.com/microsoft/vscode-proxy-agent/commits)

---
updated-dependencies:
- dependency-name: "@vscode/proxy-agent"
  dependency-version: 0.37.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 11 +++++++----
 remote/package.json      |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 24a1a3fd0397..711f3f3d79f5 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -13,7 +13,7 @@
         "@parcel/watcher": "2.5.4",
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.1",
-        "@vscode/proxy-agent": "^0.32.0",
+        "@vscode/proxy-agent": "^0.37.0",
         "@vscode/ripgrep": "^1.15.11",
         "@vscode/spdlog": "^0.15.0",
         "@vscode/tree-sitter-wasm": "^0.3.0",
@@ -493,9 +493,9 @@
       "license": "MIT"
     },
     "node_modules/@vscode/proxy-agent": {
-      "version": "0.32.0",
-      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.32.0.tgz",
-      "integrity": "sha512-n6h2+WVMJ3ByfGUakDbBNpR25J2JpLQabofiTKHIcLpXfxhT5TQSEH4OcjesZZfqw1zDpd7oBgcgqToWIiaBrQ==",
+      "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",
@@ -506,6 +506,9 @@
         "socks-proxy-agent": "^8.0.1",
         "undici": "^7.2.0"
       },
+      "engines": {
+        "node": ">=22.15.0"
+      },
       "optionalDependencies": {
         "@vscode/windows-ca-certs": "^0.3.1"
       }
diff --git a/remote/package.json b/remote/package.json
index 5076c5add1c4..a45884444232 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -8,7 +8,7 @@
     "@parcel/watcher": "2.5.4",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.1",
-    "@vscode/proxy-agent": "^0.32.0",
+    "@vscode/proxy-agent": "^0.37.0",
     "@vscode/ripgrep": "^1.15.11",
     "@vscode/spdlog": "^0.15.0",
     "@vscode/tree-sitter-wasm": "^0.3.0",

From d1286403c22ac995b0521b6f4ef225fc92eacd25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:19:47 +0000
Subject: [PATCH 1757/1815] Bump @types/node from 25.0.9 to 25.0.10 in
 /extensions/vscode-api-tests

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/vscode-api-tests/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/vscode-api-tests/package-lock.json b/extensions/vscode-api-tests/package-lock.json
index 5f890da72b4b..154cf4b768eb 100644
--- a/extensions/vscode-api-tests/package-lock.json
+++ b/extensions/vscode-api-tests/package-lock.json
@@ -27,9 +27,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 5428e9fccf70ccba10075e916d9f31e223047555 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:19:52 +0000
Subject: [PATCH 1758/1815] Bump @types/node from 25.0.9 to 25.0.10 in
 /test/integration/browser

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/integration/browser/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integration/browser/package-lock.json b/test/integration/browser/package-lock.json
index abdb2a5d293e..879347f63b82 100644
--- a/test/integration/browser/package-lock.json
+++ b/test/integration/browser/package-lock.json
@@ -65,9 +65,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From f9275e346b916afb065c26f9196651b2c568d6b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:19:53 +0000
Subject: [PATCH 1759/1815] Bump @types/node from 25.0.9 to 25.0.10 in
 /extensions/tunnel-forwarding

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/tunnel-forwarding/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/tunnel-forwarding/package-lock.json b/extensions/tunnel-forwarding/package-lock.json
index 32eeb2a098ba..81113fc22efb 100644
--- a/extensions/tunnel-forwarding/package-lock.json
+++ b/extensions/tunnel-forwarding/package-lock.json
@@ -16,9 +16,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From be9bb607344eae516be9dd630c7485c217804508 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:19:55 +0000
Subject: [PATCH 1760/1815] Bump @types/node from 25.0.9 to 25.0.10 in
 /test/smoke

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/smoke/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/smoke/package-lock.json b/test/smoke/package-lock.json
index 3b8fded1fc2f..e722f52724a1 100644
--- a/test/smoke/package-lock.json
+++ b/test/smoke/package-lock.json
@@ -61,9 +61,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From a7fc47a0c935a55a6d5a0997d7ae3f3103325363 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:20:05 +0000
Subject: [PATCH 1761/1815] Bump rimraf from 2.6.3 to 6.1.2

Bumps [rimraf](https://github.com/isaacs/rimraf) from 2.6.3 to 6.1.2.
- [Changelog](https://github.com/isaacs/rimraf/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/rimraf/compare/v2.6.3...v6.1.2)

---
updated-dependencies:
- dependency-name: rimraf
  dependency-version: 6.1.2
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 224 ++++++++++++++++++++++++++++++++++++++++++----
 package.json      |   2 +-
 2 files changed, 207 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 749ac0cb429c..86b27c2eac28 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -145,7 +145,7 @@
         "postcss-nesting": "^12.0.2",
         "pump": "^3.0.3",
         "rcedit": "^5.0.2",
-        "rimraf": "^2.2.8",
+        "rimraf": "^6.1.2",
         "sinon": "^21.0.0",
         "sinon-test": "^3.1.3",
         "source-map": "0.7.6",
@@ -1242,6 +1242,29 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
+    "node_modules/@isaacs/balanced-match": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/brace-expansion": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@isaacs/balanced-match": "^4.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -3147,6 +3170,28 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@vscode/gulp-electron/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": "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": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@vscode/gulp-electron/node_modules/got": {
       "version": "14.6.5",
       "resolved": "https://registry.npmjs.org/got/-/got-14.6.5.tgz",
@@ -3311,6 +3356,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@vscode/gulp-electron/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
     "node_modules/@vscode/iconv-lite-umd": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
@@ -7872,6 +7931,28 @@
         "node": ">=0.6"
       }
     },
+    "node_modules/fstream/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": "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": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/fstream/node_modules/mkdirp": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
@@ -7884,6 +7965,20 @@
         "mkdirp": "bin/cmd.js"
       }
     },
+    "node_modules/fstream/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -14804,34 +14899,91 @@
       }
     },
     "node_modules/rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.2.tgz",
+      "integrity": "sha512-cFCkPslJv7BAXJsYlK1dZsbP8/ZNLkCAQ0bi1hf5EKX2QHegmDFEFA6QhuYJlk7UDdc+02JjO80YSOrWPpw06g==",
       "dev": true,
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "glob": "^7.1.3"
+        "glob": "^13.0.0",
+        "package-json-from-dist": "^1.0.1"
       },
       "bin": {
-        "rimraf": "bin.js"
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/rimraf/node_modules/glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.0.tgz",
+      "integrity": "sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==",
       "dev": true,
+      "license": "BlueOak-1.0.0",
       "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"
+        "minimatch": "^10.1.1",
+        "minipass": "^7.1.2",
+        "path-scurry": "^2.0.0"
       },
       "engines": {
-        "node": "*"
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rimraf/node_modules/lru-cache": {
+      "version": "11.2.4",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz",
+      "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/rimraf/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/rimraf/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/rimraf/node_modules/path-scurry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz",
+      "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": "20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -15968,6 +16120,42 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/temp/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": "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": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/temp/node_modules/rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
     "node_modules/terser": {
       "version": "5.30.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.30.0.tgz",
diff --git a/package.json b/package.json
index 0f4024b5c512..03658b05b2e0 100644
--- a/package.json
+++ b/package.json
@@ -204,7 +204,7 @@
     "postcss-nesting": "^12.0.2",
     "pump": "^3.0.3",
     "rcedit": "^5.0.2",
-    "rimraf": "^2.2.8",
+    "rimraf": "^6.1.2",
     "sinon": "^21.0.0",
     "sinon-test": "^3.1.3",
     "source-map": "0.7.6",

From ce98df6766c95133756e3e8ffbaa767d5289215b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:20:27 +0000
Subject: [PATCH 1762/1815] Bump @types/node in
 /extensions/typescript-language-features

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/typescript-language-features/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/typescript-language-features/package-lock.json b/extensions/typescript-language-features/package-lock.json
index c855d2a11dab..d0d19680428a 100644
--- a/extensions/typescript-language-features/package-lock.json
+++ b/extensions/typescript-language-features/package-lock.json
@@ -152,9 +152,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 06af3ef613231b7c5fccd07be634ad7abf0e89d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:20:33 +0000
Subject: [PATCH 1763/1815] Bump @vscode/test-cli from 0.0.6 to 0.0.12

Bumps [@vscode/test-cli](https://github.com/Microsoft/vscode-test-cli) from 0.0.6 to 0.0.12.
- [Changelog](https://github.com/microsoft/vscode-test-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/vscode-test-cli/commits)

---
updated-dependencies:
- dependency-name: "@vscode/test-cli"
  dependency-version: 0.0.12
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 373 ++++++++++++++++------------------------------
 package.json      |   2 +-
 2 files changed, 131 insertions(+), 244 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 749ac0cb429c..d9f01e37a015 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -82,7 +82,7 @@
         "@vscode/gulp-electron": "^1.38.2",
         "@vscode/l10n-dev": "0.0.35",
         "@vscode/telemetry-extractor": "^1.18.0",
-        "@vscode/test-cli": "^0.0.6",
+        "@vscode/test-cli": "^0.0.12",
         "@vscode/test-electron": "^2.4.0",
         "@vscode/test-web": "^0.0.77",
         "@vscode/v8-heap-parser": "^0.1.0",
@@ -744,10 +744,14 @@
       }
     },
     "node_modules/@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/@c4312/eventsource-umd": {
       "version": "3.0.5",
@@ -2456,7 +2460,8 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
@@ -3511,33 +3516,27 @@
       }
     },
     "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==",
+      "version": "0.0.12",
+      "resolved": "https://registry.npmjs.org/@vscode/test-cli/-/test-cli-0.0.12.tgz",
+      "integrity": "sha512-iYN0fDg29+a2Xelle/Y56Xvv7Nc8Thzq4VwpzAF/SIE6918rDicqfsQxV6w1ttr2+SOm+10laGuY9FG2ptEKsQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/mocha": "^10.0.2",
-        "c8": "^9.1.0",
-        "chokidar": "^3.5.3",
-        "enhanced-resolve": "^5.15.0",
+        "@types/mocha": "^10.0.10",
+        "c8": "^10.1.3",
+        "chokidar": "^3.6.0",
+        "enhanced-resolve": "^5.18.3",
         "glob": "^10.3.10",
         "minimatch": "^9.0.3",
-        "mocha": "^10.2.0",
-        "supports-color": "^9.4.0",
+        "mocha": "^11.7.4",
+        "supports-color": "^10.2.2",
         "yargs": "^17.7.2"
       },
       "bin": {
         "vscode-test": "out/bin.mjs"
-      }
-    },
-    "node_modules/@vscode/test-cli/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": ">=18"
       }
     },
     "node_modules/@vscode/test-cli/node_modules/brace-expansion": {
@@ -3550,35 +3549,6 @@
         "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/@vscode/test-cli/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,
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/@vscode/test-cli/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/@vscode/test-cli/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@vscode/test-cli/node_modules/glob": {
       "version": "10.3.10",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
@@ -3601,16 +3571,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@vscode/test-cli/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/@vscode/test-cli/node_modules/minimatch": {
       "version": "9.0.3",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
@@ -3626,143 +3586,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@vscode/test-cli/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": {
-        "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": ">= 14.0.0"
-      }
-    },
-    "node_modules/@vscode/test-cli/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": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@vscode/test-cli/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": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@vscode/test-cli/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,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/@vscode/test-cli/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,
-      "license": "MIT",
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@vscode/test-cli/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@vscode/test-cli/node_modules/workerpool": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz",
-      "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/@vscode/test-cli/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": ">=10"
-      }
-    },
     "node_modules/@vscode/test-electron": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.4.0.tgz",
@@ -5105,19 +4928,20 @@
       }
     },
     "node_modules/c8": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/c8/-/c8-9.1.0.tgz",
-      "integrity": "sha512-mBWcT5iqNir1zIkzSPyI3NCR9EZCVI3WUD+AVO17MVWTSFNyUueXE82qTeampNtTr+ilN/5Ua3j24LgbCKjDVg==",
+      "version": "10.1.3",
+      "resolved": "https://registry.npmjs.org/c8/-/c8-10.1.3.tgz",
+      "integrity": "sha512-LvcyrOAaOnrrlMpW22n690PUvxiq4Uf9WMhQwNJ9vgagkL/ph1+D4uvjvDA5XCbykrc0sx+ay6pVi9YZ1GnhyA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "@bcoe/v8-coverage": "^0.2.3",
+        "@bcoe/v8-coverage": "^1.0.1",
         "@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",
+        "test-exclude": "^7.0.1",
         "v8-to-istanbul": "^9.0.0",
         "yargs": "^17.7.2",
         "yargs-parser": "^21.1.1"
@@ -5126,7 +4950,15 @@
         "c8": "bin/c8.js"
       },
       "engines": {
-        "node": ">=14.14.0"
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "monocart-coverage-reports": "^2"
+      },
+      "peerDependenciesMeta": {
+        "monocart-coverage-reports": {
+          "optional": true
+        }
       }
     },
     "node_modules/cacheable-lookup": {
@@ -5292,16 +5124,11 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
+      "license": "MIT",
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -5314,6 +5141,9 @@
       "engines": {
         "node": ">= 8.10.0"
       },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
       "optionalDependencies": {
         "fsevents": "~2.3.2"
       }
@@ -6684,10 +6514,11 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.17.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
-      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+      "version": "5.18.4",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.4.tgz",
+      "integrity": "sha512-LgQMM4WXU3QI+SYgEc2liRgznaD5ojbmY3sb8LxyguVkIg5FxdpTkvk72te2R38/TGKxH634oLxXRGY6d7AP+Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -15737,12 +15568,13 @@
       }
     },
     "node_modules/supports-color": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz",
-      "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==",
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-10.2.2.tgz",
+      "integrity": "sha512-SS+jx45GF1QjgEXQx4NJZV9ImqmO2NPz5FNsIHrsDjh2YsHnawpan7SNQ1o8NuhrbHZy9AZhIoCUiCeaW/C80g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/chalk/supports-color?sponsor=1"
@@ -16065,40 +15897,93 @@
       }
     },
     "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.1.tgz",
+      "integrity": "sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
+        "glob": "^10.4.1",
+        "minimatch": "^9.0.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
+      }
+    },
+    "node_modules/test-exclude/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/test-exclude/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
       "dev": true,
+      "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"
+        "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/test-exclude/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/test-exclude/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": "*"
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/test-exclude/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/text-decoder": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.0.tgz",
@@ -16969,10 +16854,11 @@
       }
     },
     "node_modules/v8-to-istanbul": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz",
-      "integrity": "sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==",
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+      "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -16986,7 +16872,8 @@
       "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
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/v8flags": {
       "version": "4.0.1",
diff --git a/package.json b/package.json
index 0f4024b5c512..d9178b474c1b 100644
--- a/package.json
+++ b/package.json
@@ -141,7 +141,7 @@
     "@vscode/gulp-electron": "^1.38.2",
     "@vscode/l10n-dev": "0.0.35",
     "@vscode/telemetry-extractor": "^1.18.0",
-    "@vscode/test-cli": "^0.0.6",
+    "@vscode/test-cli": "^0.0.12",
     "@vscode/test-electron": "^2.4.0",
     "@vscode/test-web": "^0.0.77",
     "@vscode/v8-heap-parser": "^0.1.0",

From 928dc9712953527aa93a9d954951c78a1e4ff9b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:20:36 +0000
Subject: [PATCH 1764/1815] Bump @types/node from 25.0.9 to 25.0.10 in
 /test/automation

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.9 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/automation/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/automation/package-lock.json b/test/automation/package-lock.json
index 05f5c47c05a1..48a7883b0778 100644
--- a/test/automation/package-lock.json
+++ b/test/automation/package-lock.json
@@ -75,9 +75,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.9.tgz",
-      "integrity": "sha512-/rpCXHlCWeqClNBwUhDcusJxXYDjZTyE8v5oTO7WbL8eij2nKhUeU89/6xgjU7N4/Vh3He0BtyhJdQbDyhiXAw==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From be13033034ba8ded193ad1acb44a7c7db45a9610 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 12:20:42 +0000
Subject: [PATCH 1765/1815] Bump tsec from 0.2.7 to 0.2.9

Bumps [tsec](https://github.com/google/tsec) from 0.2.7 to 0.2.9.
- [Commits](https://github.com/google/tsec/commits)

---
updated-dependencies:
- dependency-name: tsec
  dependency-version: 0.2.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 139 +++++++++++++++++++++++++++++++++++++++-------
 package.json      |   2 +-
 2 files changed, 119 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 749ac0cb429c..3e181fef5cb5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -153,7 +153,7 @@
         "style-loader": "^3.3.2",
         "ts-loader": "^9.5.4",
         "ts-node": "^10.9.1",
-        "tsec": "0.2.7",
+        "tsec": "0.2.9",
         "tslib": "^2.8.1",
         "typescript": "^5.9.3",
         "typescript-eslint": "^8.8.0",
@@ -1242,6 +1242,29 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
+    "node_modules/@isaacs/balanced-match": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/brace-expansion": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@isaacs/balanced-match": "^4.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -7700,12 +7723,13 @@
       }
     },
     "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==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "cross-spawn": "^7.0.0",
+        "cross-spawn": "^7.0.6",
         "signal-exit": "^4.0.1"
       },
       "engines": {
@@ -16460,13 +16484,14 @@
       }
     },
     "node_modules/tsec": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/tsec/-/tsec-0.2.7.tgz",
-      "integrity": "sha512-Pj9DuBBWLEo8p7QsbrEdXzW/u6QJBcib0ZGOTXkeSDx+PLXFY7hwyZE9Tfhp3TA3LQNpYouyT0WmzXRyUW4otQ==",
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/tsec/-/tsec-0.2.9.tgz",
+      "integrity": "sha512-6YCqU5GYg5RBYuDqld74MB4DAwkwBT09gz5hUWS/l8bKthTJwoO62ND6txkhvfGNcmIpWIYVl6h0oqHPG7zqcA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "glob": "^7.1.1",
-        "minimatch": "^3.0.3"
+        "glob": "^11.0.3",
+        "minimatch": "^10.0.3"
       },
       "bin": {
         "tsec": "bin/tsec"
@@ -16478,21 +16503,93 @@
       }
     },
     "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",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-11.1.0.tgz",
+      "integrity": "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==",
       "dev": true,
+      "license": "BlueOak-1.0.0",
       "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"
+        "foreground-child": "^3.3.1",
+        "jackspeak": "^4.1.1",
+        "minimatch": "^10.1.1",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^2.0.0"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": "*"
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/tsec/node_modules/jackspeak": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.1.tgz",
+      "integrity": "sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/tsec/node_modules/lru-cache": {
+      "version": "11.2.4",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz",
+      "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/tsec/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/tsec/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/tsec/node_modules/path-scurry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz",
+      "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": "20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
diff --git a/package.json b/package.json
index 0f4024b5c512..be388034d958 100644
--- a/package.json
+++ b/package.json
@@ -212,7 +212,7 @@
     "style-loader": "^3.3.2",
     "ts-loader": "^9.5.4",
     "ts-node": "^10.9.1",
-    "tsec": "0.2.7",
+    "tsec": "0.2.9",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.8.0",

From 65f92850c2d978b4268841af370729073adf3409 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 13:36:50 +0000
Subject: [PATCH 1766/1815] Bump lodash in /build in the npm_and_yarn group
 across 1 directory

Bumps the npm_and_yarn group with 1 update in the /build directory: [lodash](https://github.com/lodash/lodash).


Updates `lodash` from 4.17.21 to 4.17.23
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.21...4.17.23)

---
updated-dependencies:
- dependency-name: lodash
  dependency-version: 4.17.23
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build/package-lock.json | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/build/package-lock.json b/build/package-lock.json
index 9e6b16ca3ec8..d8f35049b196 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -4732,10 +4732,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.clonedeep": {
       "version": "4.5.0",
@@ -4993,20 +4994,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/node-abi/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "@types/sarif": "^2.1.7",
-        "fs-extra": "^11.1.1"
-      },
-      "engines": {
-        "node": ">=20"
-      }
-    },
     "node_modules/node-addon-api": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz",

From e8df72b8d9dea00499f5845fdcab80c9ee9d9641 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 13:37:09 +0000
Subject: [PATCH 1767/1815] Bump lodash in the npm_and_yarn group across 1
 directory

Bumps the npm_and_yarn group with 1 update in the / directory: [lodash](https://github.com/lodash/lodash).


Updates `lodash` from 4.17.21 to 4.17.23
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.21...4.17.23)

---
updated-dependencies:
- dependency-name: lodash
  dependency-version: 4.17.23
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 749ac0cb429c..a4fb9f97a947 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11498,10 +11498,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.camelcase": {
       "version": "4.3.0",

From 8a0ae0dfd19e68be3ab00df2eb1d72b947c954d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 17:43:51 +0000
Subject: [PATCH 1768/1815] Bump @types/node from 25.0.6 to 25.0.10

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 25.0.6 to 25.0.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.10
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e376519c3f08..0ee5ada8f841 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2535,9 +2535,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "25.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.6.tgz",
-      "integrity": "sha512-NNu0sjyNxpoiW3YuVFfNz7mxSQ+S4X2G28uqg2s+CzoqoQjLPsWSbsFFyztIAqt2vb8kfEAsJNepMGPTxFDx3Q==",
+      "version": "25.0.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
+      "integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

From 4f441110b84719485384e0cba328da66fd608c85 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jan 2026 17:53:57 +0000
Subject: [PATCH 1769/1815] Bump minimatch from 3.1.2 to 10.1.1

Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.1.2 to 10.1.1.
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/minimatch/compare/v3.1.2...v10.1.1)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-version: 10.1.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 183 ++++++++++++++++++++++++++++++++++++----------
 package.json      |   2 +-
 2 files changed, 144 insertions(+), 41 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b6f8962d5007..47698078777b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -132,7 +132,7 @@
         "lazy.js": "^0.5.1",
         "merge-options": "^1.0.1",
         "mime": "^1.4.1",
-        "minimatch": "^3.0.4",
+        "minimatch": "^10.1.1",
         "minimist": "^1.2.6",
         "mocha": "^11.7.5",
         "mocha-junit-reporter": "^2.2.1",
@@ -974,6 +974,19 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@eslint/config-array/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/@eslint/config-helpers": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz",
@@ -1024,6 +1037,19 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/@eslint/eslintrc/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/@eslint/js": {
       "version": "9.39.2",
       "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.2.tgz",
@@ -3297,6 +3323,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@vscode/gulp-electron/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/@vscode/gulp-electron/node_modules/mkdirp": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
@@ -4537,6 +4576,19 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/asar/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/assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -5545,8 +5597,9 @@
     "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
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/config-chain": {
       "version": "1.1.13",
@@ -7010,6 +7063,19 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/eslint/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/esniff": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz",
@@ -7785,6 +7851,19 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/fstream/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/fstream/node_modules/mkdirp": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
@@ -8002,6 +8081,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/glob-stream/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/glob-stream/node_modules/readable-stream": {
       "version": "2.3.7",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -11778,15 +11870,19 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "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": {
-        "brace-expansion": "^1.1.7"
+        "@isaacs/brace-expansion": "^5.0.0"
       },
       "engines": {
-        "node": "*"
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/minimist": {
@@ -12132,6 +12228,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/multimatch/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/mute-stdout": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-2.0.0.tgz",
@@ -12458,6 +12567,19 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/npm-run-all/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/npm-run-all/node_modules/path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
@@ -14778,22 +14900,6 @@
         "node": "20 || >=22"
       }
     },
-    "node_modules/rimraf/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/rimraf/node_modules/minipass": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
@@ -15975,6 +16081,19 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/temp/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/temp/node_modules/rimraf": {
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
@@ -16602,22 +16721,6 @@
         "node": "20 || >=22"
       }
     },
-    "node_modules/tsec/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/tsec/node_modules/minipass": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
diff --git a/package.json b/package.json
index bb2b9b0a69bc..610e78687325 100644
--- a/package.json
+++ b/package.json
@@ -191,7 +191,7 @@
     "lazy.js": "^0.5.1",
     "merge-options": "^1.0.1",
     "mime": "^1.4.1",
-    "minimatch": "^3.0.4",
+    "minimatch": "^10.1.1",
     "minimist": "^1.2.6",
     "mocha": "^11.7.5",
     "mocha-junit-reporter": "^2.2.1",

From 4f886c4f5102e4656dc86781c5fb2f1b475de73a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jan 2026 12:18:32 +0000
Subject: [PATCH 1770/1815] Bump @parcel/watcher from 2.5.4 to 2.5.6 in
 /extensions

Bumps [@parcel/watcher](https://github.com/parcel-bundler/watcher) from 2.5.4 to 2.5.6.
- [Release notes](https://github.com/parcel-bundler/watcher/releases)
- [Commits](https://github.com/parcel-bundler/watcher/compare/v2.5.4...v2.5.6)

---
updated-dependencies:
- dependency-name: "@parcel/watcher"
  dependency-version: 2.5.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/package-lock.json | 112 +++++++++++++++++------------------
 extensions/package.json      |   2 +-
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/extensions/package-lock.json b/extensions/package-lock.json
index 777be8409ab7..f2978a2e5631 100644
--- a/extensions/package-lock.json
+++ b/extensions/package-lock.json
@@ -13,7 +13,7 @@
         "typescript": "^5.9.3"
       },
       "devDependencies": {
-        "@parcel/watcher": "2.5.4",
+        "@parcel/watcher": "2.5.6",
         "esbuild": "0.27.2",
         "vscode-grammar-updater": "^1.1.0"
       }
@@ -461,9 +461,9 @@
       }
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.4.tgz",
-      "integrity": "sha512-WYa2tUVV5HiArWPB3ydlOc4R2ivq0IDrlqhMi3l7mVsFEXNcTfxYFPIHXHXIh/ca/y/V5N4E1zecyxdIBjYnkQ==",
+      "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",
@@ -481,25 +481,25 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.4",
-        "@parcel/watcher-darwin-arm64": "2.5.4",
-        "@parcel/watcher-darwin-x64": "2.5.4",
-        "@parcel/watcher-freebsd-x64": "2.5.4",
-        "@parcel/watcher-linux-arm-glibc": "2.5.4",
-        "@parcel/watcher-linux-arm-musl": "2.5.4",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.4",
-        "@parcel/watcher-linux-arm64-musl": "2.5.4",
-        "@parcel/watcher-linux-x64-glibc": "2.5.4",
-        "@parcel/watcher-linux-x64-musl": "2.5.4",
-        "@parcel/watcher-win32-arm64": "2.5.4",
-        "@parcel/watcher-win32-ia32": "2.5.4",
-        "@parcel/watcher-win32-x64": "2.5.4"
+        "@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.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.4.tgz",
-      "integrity": "sha512-hoh0vx4v+b3BNI7Cjoy2/B0ARqcwVNrzN/n7DLq9ZB4I3lrsvhrkCViJyfTj/Qi5xM9YFiH4AmHGK6pgH1ss7g==",
+      "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"
       ],
@@ -518,9 +518,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.4.tgz",
-      "integrity": "sha512-kphKy377pZiWpAOyTgQYPE5/XEKVMaj6VUjKT5VkNyUJlr2qZAn8gIc7CPzx+kbhvqHDT9d7EqdOqRXT6vk0zw==",
+      "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"
       ],
@@ -539,9 +539,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.4.tgz",
-      "integrity": "sha512-UKaQFhCtNJW1A9YyVz3Ju7ydf6QgrpNQfRZ35wNKUhTQ3dxJ/3MULXN5JN/0Z80V/KUBDGa3RZaKq1EQT2a2gg==",
+      "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"
       ],
@@ -560,9 +560,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.4.tgz",
-      "integrity": "sha512-Dib0Wv3Ow/m2/ttvLdeI2DBXloO7t3Z0oCp4bAb2aqyqOjKPPGrg10pMJJAQ7tt8P4V2rwYwywkDhUia/FgS+Q==",
+      "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"
       ],
@@ -581,9 +581,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.4.tgz",
-      "integrity": "sha512-I5Vb769pdf7Q7Sf4KNy8Pogl/URRCKu9ImMmnVKYayhynuyGYMzuI4UOWnegQNa2sGpsPSbzDsqbHNMyeyPCgw==",
+      "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"
       ],
@@ -602,9 +602,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.4.tgz",
-      "integrity": "sha512-kGO8RPvVrcAotV4QcWh8kZuHr9bXi9a3bSZw7kFarYR0+fGliU7hd/zevhjw8fnvIKG3J9EO5G6sXNGCSNMYPQ==",
+      "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"
       ],
@@ -623,9 +623,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.4.tgz",
-      "integrity": "sha512-KU75aooXhqGFY2W5/p8DYYHt4hrjHZod8AhcGAmhzPn/etTa+lYCDB2b1sJy3sWJ8ahFVTdy+EbqSBvMx3iFlw==",
+      "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"
       ],
@@ -644,9 +644,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.4.tgz",
-      "integrity": "sha512-Qx8uNiIekVutnzbVdrgSanM+cbpDD3boB1f8vMtnuG5Zau4/bdDbXyKwIn0ToqFhIuob73bcxV9NwRm04/hzHQ==",
+      "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"
       ],
@@ -665,9 +665,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.4.tgz",
-      "integrity": "sha512-UYBQvhYmgAv61LNUn24qGQdjtycFBKSK3EXr72DbJqX9aaLbtCOO8+1SkKhD/GNiJ97ExgcHBrukcYhVjrnogA==",
+      "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"
       ],
@@ -686,9 +686,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.4.tgz",
-      "integrity": "sha512-YoRWCVgxv8akZrMhdyVi6/TyoeeMkQ0PGGOf2E4omODrvd1wxniXP+DBynKoHryStks7l+fDAMUBRzqNHrVOpg==",
+      "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"
       ],
@@ -707,9 +707,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.4.tgz",
-      "integrity": "sha512-iby+D/YNXWkiQNYcIhg8P5hSjzXEHaQrk2SLrWOUD7VeC4Ohu0WQvmV+HDJokZVJ2UjJ4AGXW3bx7Lls9Ln4TQ==",
+      "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"
       ],
@@ -728,9 +728,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.4.tgz",
-      "integrity": "sha512-vQN+KIReG0a2ZDpVv8cgddlf67J8hk1WfZMMP7sMeZmJRSmEax5xNDNWKdgqSe2brOKTQQAs3aCCUal2qBHAyg==",
+      "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"
       ],
@@ -749,9 +749,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.4.tgz",
-      "integrity": "sha512-3A6efb6BOKwyw7yk9ro2vus2YTt2nvcd56AuzxdMiVOxL9umDyN5PKkKfZ/gZ9row41SjVmTVQNWQhaRRGpOKw==",
+      "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"
       ],
diff --git a/extensions/package.json b/extensions/package.json
index 44d8bd728362..1a70ed9731dc 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -10,7 +10,7 @@
     "postinstall": "node ./postinstall.mjs"
   },
   "devDependencies": {
-    "@parcel/watcher": "2.5.4",
+    "@parcel/watcher": "2.5.6",
     "esbuild": "0.27.2",
     "vscode-grammar-updater": "^1.1.0"
   },

From 3027db9e56a7df9463408cb625430c447262fc18 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jan 2026 12:19:56 +0000
Subject: [PATCH 1771/1815] Bump @xterm/addon-unicode11 in /remote/web

Bumps [@xterm/addon-unicode11](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.105 to 0.10.0-beta.107.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-unicode11"
  dependency-version: 0.10.0-beta.107
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 5ad6d013fbf2..79219c70297a 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -19,7 +19,7 @@
 				"@xterm/addon-progress": "^0.3.0-beta.105",
 				"@xterm/addon-search": "^0.17.0-beta.105",
 				"@xterm/addon-serialize": "^0.15.0-beta.105",
-				"@xterm/addon-unicode11": "^0.10.0-beta.105",
+				"@xterm/addon-unicode11": "^0.10.0-beta.107",
 				"@xterm/addon-webgl": "^0.20.0-beta.104",
 				"@xterm/xterm": "^6.0.0",
 				"jschardet": "3.1.4",
@@ -188,12 +188,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-unicode11": {
-			"version": "0.10.0-beta.105",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.105.tgz",
-			"integrity": "sha512-zMepG3Wa44+n8SQbNZ8jnpASh9zDEuDlk/0+bpPaRRc4UkiR6UbhzZos+qC8glxu1QGLd/4dFMuypnNxWonkpQ==",
+			"version": "0.10.0-beta.107",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.107.tgz",
+			"integrity": "sha512-aWnjjJGGAOUxuWRl+kF7EyD2qQ3TqRdb0u0L1aB1MlUk04qG5Ctv3uwLu8Moh/uAyJ7tAqgU7GQQP6yWDwvnJQ==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.105"
+				"@xterm/xterm": "^6.1.0-beta.107"
 			}
 		},
 		"node_modules/@xterm/addon-webgl": {
diff --git a/remote/web/package.json b/remote/web/package.json
index af1d5f66559b..460a5d4279b6 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -14,7 +14,7 @@
 		"@xterm/addon-progress": "^0.3.0-beta.105",
 		"@xterm/addon-search": "^0.17.0-beta.105",
 		"@xterm/addon-serialize": "^0.15.0-beta.105",
-		"@xterm/addon-unicode11": "^0.10.0-beta.105",
+		"@xterm/addon-unicode11": "^0.10.0-beta.107",
 		"@xterm/addon-webgl": "^0.20.0-beta.104",
 		"@xterm/xterm": "^6.0.0",
 		"jschardet": "3.1.4",

From fb82b278e305f8fd801cf89b6ecbbde8cd1fd976 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jan 2026 12:20:03 +0000
Subject: [PATCH 1772/1815] Bump @xterm/addon-image in /remote

Bumps [@xterm/addon-image](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.105 to 0.10.0-beta.107.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-image"
  dependency-version: 0.10.0-beta.107
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index b1471e6cbf3e..1668786cd331 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -21,7 +21,7 @@
         "@vscode/windows-process-tree": "^0.6.0",
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.3.0-beta.105",
-        "@xterm/addon-image": "^0.10.0-beta.105",
+        "@xterm/addon-image": "^0.10.0-beta.107",
         "@xterm/addon-ligatures": "^0.11.0-beta.105",
         "@xterm/addon-progress": "^0.3.0-beta.105",
         "@xterm/addon-search": "^0.17.0-beta.105",
@@ -563,12 +563,12 @@
       }
     },
     "node_modules/@xterm/addon-image": {
-      "version": "0.10.0-beta.105",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.105.tgz",
-      "integrity": "sha512-N/IYH+whr+4GG1J/1o4q2H6JVG56FX5hdm1ffjWjrhgyZl1qSOm8AHhozq3pssWljvtoTQRcAlHRAmEbrYT8jA==",
+      "version": "0.10.0-beta.107",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.107.tgz",
+      "integrity": "sha512-scYxbEmtZUeJHV6nz1l4DYtgYkQLUnE61mwBSZPSjy0cmYoKA8uUAaxucoJIBRtYPuA9RtotBueyatfp/HEy5Q==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.105"
+        "@xterm/xterm": "^6.1.0-beta.107"
       }
     },
     "node_modules/@xterm/addon-ligatures": {
diff --git a/remote/package.json b/remote/package.json
index dc65ef6bb69a..2a1bb36723ea 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -16,7 +16,7 @@
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.3.0-beta.105",
-    "@xterm/addon-image": "^0.10.0-beta.105",
+    "@xterm/addon-image": "^0.10.0-beta.107",
     "@xterm/addon-ligatures": "^0.11.0-beta.105",
     "@xterm/addon-progress": "^0.3.0-beta.105",
     "@xterm/addon-search": "^0.17.0-beta.105",

From eb60eff43a2c4f43922d5794d5b41181c5475a90 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jan 2026 12:20:07 +0000
Subject: [PATCH 1773/1815] Bump @xterm/addon-webgl in /remote

Bumps [@xterm/addon-webgl](https://github.com/xtermjs/xterm.js) from 0.20.0-beta.104 to 0.20.0-beta.106.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-webgl"
  dependency-version: 0.20.0-beta.106
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index b1471e6cbf3e..7849ef5c8982 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -27,7 +27,7 @@
         "@xterm/addon-search": "^0.17.0-beta.105",
         "@xterm/addon-serialize": "^0.15.0-beta.105",
         "@xterm/addon-unicode11": "^0.10.0-beta.105",
-        "@xterm/addon-webgl": "^0.20.0-beta.104",
+        "@xterm/addon-webgl": "^0.20.0-beta.106",
         "@xterm/headless": "^6.0.0",
         "@xterm/xterm": "^6.0.0",
         "cookie": "^1.1.1",
@@ -624,12 +624,12 @@
       }
     },
     "node_modules/@xterm/addon-webgl": {
-      "version": "0.20.0-beta.104",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.104.tgz",
-      "integrity": "sha512-S9zSxwnLXeF8RK1HZXLIdqZELF83ZHVyFJtqNj6b9SdjVMSFrQpa1wwWuJR1McW54hShX3aC9zLj1/1RKiwAxQ==",
+      "version": "0.20.0-beta.106",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.106.tgz",
+      "integrity": "sha512-QbVWbYmCk5w4W7k6P7Q5uaiOn4FOqxdvNFtAvFyO4zLtH9t22cEfihooIqmZzksxWafPIe9US55o9gu1DHUzLQ==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.105"
+        "@xterm/xterm": "^6.1.0-beta.107"
       }
     },
     "node_modules/@xterm/headless": {
diff --git a/remote/package.json b/remote/package.json
index dc65ef6bb69a..597affb99a98 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -22,7 +22,7 @@
     "@xterm/addon-search": "^0.17.0-beta.105",
     "@xterm/addon-serialize": "^0.15.0-beta.105",
     "@xterm/addon-unicode11": "^0.10.0-beta.105",
-    "@xterm/addon-webgl": "^0.20.0-beta.104",
+    "@xterm/addon-webgl": "^0.20.0-beta.106",
     "@xterm/headless": "^6.0.0",
     "@xterm/xterm": "^6.0.0",
     "cookie": "^1.1.1",

From 8d050e4b00994ea01a1c7bcf50e0f034ae51342a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jan 2026 12:20:09 +0000
Subject: [PATCH 1774/1815] Bump eslint-formatter-compact from 8.40.0 to 9.0.1

Bumps [eslint-formatter-compact](https://github.com/fregante/eslint-formatters) from 8.40.0 to 9.0.1.
- [Commits](https://github.com/fregante/eslint-formatters/commits)

---
updated-dependencies:
- dependency-name: eslint-formatter-compact
  dependency-version: 9.0.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 11 ++++++-----
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8f5fadee6b13..fc1f71685c2f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -99,7 +99,7 @@
         "deemon": "^1.13.6",
         "electron": "40.0.0",
         "eslint": "^9.39.2",
-        "eslint-formatter-compact": "^8.40.0",
+        "eslint-formatter-compact": "^9.0.1",
         "eslint-plugin-header": "3.1.1",
         "eslint-plugin-jsdoc": "^61.5.0",
         "eslint-plugin-local": "^6.0.0",
@@ -6936,12 +6936,13 @@
       }
     },
     "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==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-formatter-compact/-/eslint-formatter-compact-9.0.1.tgz",
+      "integrity": "sha512-mBAti2tb403dQGMyilQTYHU80stem3N7jdtKW+tmn5gj3JNF7ki0rgCZtJFw4iMayTH862FTUIqCdp70ug0S0Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/eslint-plugin-header": {
diff --git a/package.json b/package.json
index 610e78687325..404bad82411e 100644
--- a/package.json
+++ b/package.json
@@ -158,7 +158,7 @@
     "deemon": "^1.13.6",
     "electron": "40.0.0",
     "eslint": "^9.39.2",
-    "eslint-formatter-compact": "^8.40.0",
+    "eslint-formatter-compact": "^9.0.1",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-jsdoc": "^61.5.0",
     "eslint-plugin-local": "^6.0.0",

From c8399d82fac9ffa5f2201e21a4c7927e8e8e8a73 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jan 2026 12:20:12 +0000
Subject: [PATCH 1775/1815] Bump @vscode/spdlog from 0.15.6 to 0.15.7 in
 /remote

Bumps [@vscode/spdlog](https://github.com/microsoft/node-spdlog) from 0.15.6 to 0.15.7.
- [Release notes](https://github.com/microsoft/node-spdlog/releases)
- [Commits](https://github.com/microsoft/node-spdlog/compare/v0.15.6...v0.15.7)

---
updated-dependencies:
- dependency-name: "@vscode/spdlog"
  dependency-version: 0.15.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index b1471e6cbf3e..93fa74f1239c 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -15,7 +15,7 @@
         "@vscode/iconv-lite-umd": "0.7.1",
         "@vscode/proxy-agent": "^0.37.0",
         "@vscode/ripgrep": "^1.15.11",
-        "@vscode/spdlog": "^0.15.0",
+        "@vscode/spdlog": "^0.15.7",
         "@vscode/tree-sitter-wasm": "^0.3.0",
         "@vscode/vscode-languagedetection": "1.0.23",
         "@vscode/windows-process-tree": "^0.6.0",
@@ -483,9 +483,9 @@
       }
     },
     "node_modules/@vscode/spdlog": {
-      "version": "0.15.6",
-      "resolved": "https://registry.npmjs.org/@vscode/spdlog/-/spdlog-0.15.6.tgz",
-      "integrity": "sha512-s0ei7I0rLrNlsGTa8EVoAXe4qvbsfXrHebQ5dNbu7dc1Zs/DbnJNSADpHUy8vtNvTJukBWjOXFhAYUfXxGk+Bg==",
+      "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": {
diff --git a/remote/package.json b/remote/package.json
index dc65ef6bb69a..33fbb735751b 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -10,7 +10,7 @@
     "@vscode/iconv-lite-umd": "0.7.1",
     "@vscode/proxy-agent": "^0.37.0",
     "@vscode/ripgrep": "^1.15.11",
-    "@vscode/spdlog": "^0.15.0",
+    "@vscode/spdlog": "^0.15.7",
     "@vscode/tree-sitter-wasm": "^0.3.0",
     "@vscode/vscode-languagedetection": "1.0.23",
     "@vscode/windows-process-tree": "^0.6.0",

From 50b351400fbcca18f3a90325046cf1af01294751 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jan 2026 12:20:16 +0000
Subject: [PATCH 1776/1815] Bump vscode-textmate from 9.3.1 to 9.3.2 in /remote

Bumps [vscode-textmate](https://github.com/microsoft/vscode-textmate) from 9.3.1 to 9.3.2.
- [Release notes](https://github.com/microsoft/vscode-textmate/releases)
- [Commits](https://github.com/microsoft/vscode-textmate/compare/v9.3.1...v9.3.2)

---
updated-dependencies:
- dependency-name: vscode-textmate
  dependency-version: 9.3.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index b1471e6cbf3e..debe4d48aa40 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -41,7 +41,7 @@
         "tas-client-umd": "0.2.0",
         "vscode-oniguruma": "2.0.1",
         "vscode-regexpp": "^3.1.0",
-        "vscode-textmate": "9.3.1",
+        "vscode-textmate": "9.3.2",
         "yauzl": "^3.2.0",
         "yazl": "^3.3.1"
       }
@@ -1446,9 +1446,9 @@
       }
     },
     "node_modules/vscode-textmate": {
-      "version": "9.3.1",
-      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.3.1.tgz",
-      "integrity": "sha512-U19nFkCraZF9/bkQKQYsb9mRqM9NwpToQQFl40nGiioZTH9gRtdtCHwp48cubayVfreX3ivnoxgxQgNwrTVmQg==",
+      "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 dc65ef6bb69a..29761c97340f 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -36,7 +36,7 @@
     "tas-client-umd": "0.2.0",
     "vscode-oniguruma": "2.0.1",
     "vscode-regexpp": "^3.1.0",
-    "vscode-textmate": "9.3.1",
+    "vscode-textmate": "9.3.2",
     "yauzl": "^3.2.0",
     "yazl": "^3.3.1"
   },

From 3e16d94e5a79145b7e92691b713d37cf94477b92 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jan 2026 12:20:20 +0000
Subject: [PATCH 1777/1815] Bump ts-node from 10.9.1 to 10.9.2

Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 10.9.1 to 10.9.2.
- [Release notes](https://github.com/TypeStrong/ts-node/releases)
- [Changelog](https://github.com/TypeStrong/ts-node/blob/main/development-docs/release-template.md)
- [Commits](https://github.com/TypeStrong/ts-node/compare/v10.9.1...v10.9.2)

---
updated-dependencies:
- dependency-name: ts-node
  dependency-version: 10.9.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8f5fadee6b13..2df6ec481309 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -152,7 +152,7 @@
         "source-map-support": "^0.3.2",
         "style-loader": "^3.3.2",
         "ts-loader": "^9.5.4",
-        "ts-node": "^10.9.1",
+        "ts-node": "^10.9.2",
         "tsec": "0.2.9",
         "tslib": "^2.8.1",
         "typescript": "^5.9.3",
@@ -16602,10 +16602,11 @@
       }
     },
     "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==",
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+      "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
diff --git a/package.json b/package.json
index 610e78687325..35284a1737b9 100644
--- a/package.json
+++ b/package.json
@@ -211,7 +211,7 @@
     "source-map-support": "^0.3.2",
     "style-loader": "^3.3.2",
     "ts-loader": "^9.5.4",
-    "ts-node": "^10.9.1",
+    "ts-node": "^10.9.2",
     "tsec": "0.2.9",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3",

From 35f7313ffcc6850e05160e83286bfbcfcbf8ab74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jan 2026 12:20:37 +0000
Subject: [PATCH 1778/1815] Bump event-stream from 3.3.4 to 4.0.1

Bumps [event-stream](https://github.com/dominictarr/event-stream) from 3.3.4 to 4.0.1.
- [Release notes](https://github.com/dominictarr/event-stream/releases)
- [Commits](https://github.com/dominictarr/event-stream/commits/4.0.1)

---
updated-dependencies:
- dependency-name: event-stream
  dependency-version: 4.0.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 283 +++++++++++++++++++++++++++++++++++++++++-----
 package.json      |   2 +-
 2 files changed, 258 insertions(+), 27 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8f5fadee6b13..987f1291bfa9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -103,7 +103,7 @@
         "eslint-plugin-header": "3.1.1",
         "eslint-plugin-jsdoc": "^61.5.0",
         "eslint-plugin-local": "^6.0.0",
-        "event-stream": "3.3.4",
+        "event-stream": "4.0.1",
         "fancy-log": "^2.0.0",
         "file-loader": "^6.2.0",
         "glob": "^9.0.1",
@@ -3184,6 +3184,22 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@vscode/gulp-electron/node_modules/event-stream": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
+      "dev": true,
+      "license": "MIT",
+      "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/@vscode/gulp-electron/node_modules/get-stream": {
       "version": "9.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz",
@@ -3310,6 +3326,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@vscode/gulp-electron/node_modules/map-stream": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==",
+      "dev": true
+    },
     "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",
@@ -3414,6 +3436,29 @@
         "rimraf": "bin.js"
       }
     },
+    "node_modules/@vscode/gulp-electron/node_modules/split": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "through": "2"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@vscode/gulp-electron/node_modules/stream-combiner": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "duplexer": "~0.1.1"
+      }
+    },
     "node_modules/@vscode/iconv-lite-umd": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz",
@@ -6430,10 +6475,11 @@
       }
     },
     "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
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/duplexify": {
       "version": "3.7.1",
@@ -7181,18 +7227,19 @@
       }
     },
     "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==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz",
+      "integrity": "sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==",
       "dev": true,
+      "license": "MIT",
       "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"
+        "duplexer": "^0.1.1",
+        "from": "^0.1.7",
+        "map-stream": "0.0.7",
+        "pause-stream": "^0.0.11",
+        "split": "^1.0.1",
+        "stream-combiner": "^0.2.2",
+        "through": "^2.3.8"
       }
     },
     "node_modules/events": {
@@ -8394,6 +8441,22 @@
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
+    "node_modules/gulp-azure-storage/node_modules/event-stream": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
+      "dev": true,
+      "license": "MIT",
+      "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/gulp-azure-storage/node_modules/find-up": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -8419,6 +8482,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/gulp-azure-storage/node_modules/map-stream": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==",
+      "dev": true
+    },
     "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",
@@ -8455,6 +8524,29 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/gulp-azure-storage/node_modules/split": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "through": "2"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/gulp-azure-storage/node_modules/stream-combiner": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "duplexer": "~0.1.1"
+      }
+    },
     "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",
@@ -9435,6 +9527,28 @@
         "vinyl-fs": "^3.0.3"
       }
     },
+    "node_modules/gulp-symdest/node_modules/event-stream": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
+      "dev": true,
+      "license": "MIT",
+      "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/gulp-symdest/node_modules/map-stream": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==",
+      "dev": true
+    },
     "node_modules/gulp-symdest/node_modules/mkdirp": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
@@ -9447,6 +9561,29 @@
         "mkdirp": "bin/cmd.js"
       }
     },
+    "node_modules/gulp-symdest/node_modules/split": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "through": "2"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/gulp-symdest/node_modules/stream-combiner": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "duplexer": "~0.1.1"
+      }
+    },
     "node_modules/gulp-untar": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/gulp-untar/-/gulp-untar-0.0.8.tgz",
@@ -9476,6 +9613,28 @@
       "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE= sha512-dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA==",
       "dev": true
     },
+    "node_modules/gulp-untar/node_modules/event-stream": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
+      "dev": true,
+      "license": "MIT",
+      "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/gulp-untar/node_modules/map-stream": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==",
+      "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",
@@ -9500,6 +9659,29 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/gulp-untar/node_modules/split": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "through": "2"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/gulp-untar/node_modules/stream-combiner": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "duplexer": "~0.1.1"
+      }
+    },
     "node_modules/gulp-untar/node_modules/tar": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
@@ -9552,6 +9734,22 @@
         "yazl": "^2.2.1"
       }
     },
+    "node_modules/gulp-vinyl-zip/node_modules/event-stream": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
+      "dev": true,
+      "license": "MIT",
+      "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/gulp-vinyl-zip/node_modules/fd-slicer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
@@ -9561,6 +9759,12 @@
         "pend": "~1.2.0"
       }
     },
+    "node_modules/gulp-vinyl-zip/node_modules/map-stream": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==",
+      "dev": true
+    },
     "node_modules/gulp-vinyl-zip/node_modules/queue": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/queue/-/queue-4.5.0.tgz",
@@ -9594,6 +9798,29 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/gulp-vinyl-zip/node_modules/split": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "through": "2"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/gulp-vinyl-zip/node_modules/stream-combiner": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "duplexer": "~0.1.1"
+      }
+    },
     "node_modules/gulp-vinyl-zip/node_modules/through2": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
@@ -11646,10 +11873,11 @@
       }
     },
     "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
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
+      "integrity": "sha512-C0X0KQmGm3N2ftbTGBhSyuydQ+vV1LC3f3zPvT3RXHXNZrvfPZcoXp/N5DOa8vedX/rTMm2CjTtivFg2STJMRQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/markdown-it": {
       "version": "14.1.0",
@@ -15440,10 +15668,11 @@
       "dev": true
     },
     "node_modules/split": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-      "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8= sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
+      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "through": "2"
       },
@@ -15524,12 +15753,14 @@
       }
     },
     "node_modules/stream-combiner": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-      "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ= sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
+      "integrity": "sha512-6yHMqgLYDzQDcAkL+tjJDC5nSNuNIx0vZtRZeiPh7Saef7VHX9H5Ijn9l2VIol2zaNYlYEX6KyuT/237A58qEQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "duplexer": "~0.1.1"
+        "duplexer": "~0.1.1",
+        "through": "~2.3.4"
       }
     },
     "node_modules/stream-composer": {
diff --git a/package.json b/package.json
index 610e78687325..b0766b184318 100644
--- a/package.json
+++ b/package.json
@@ -162,7 +162,7 @@
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-jsdoc": "^61.5.0",
     "eslint-plugin-local": "^6.0.0",
-    "event-stream": "3.3.4",
+    "event-stream": "4.0.1",
     "fancy-log": "^2.0.0",
     "file-loader": "^6.2.0",
     "glob": "^9.0.1",

From 755b2aa704a2a7158090bde2d8eb5770524ec887 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jan 2026 12:20:49 +0000
Subject: [PATCH 1779/1815] Bump @vscode/vscode-perf from 0.0.24 to 0.0.25

Bumps [@vscode/vscode-perf](https://github.com/microsoft/vscode-perf) from 0.0.24 to 0.0.25.
- [Release notes](https://github.com/microsoft/vscode-perf/releases)
- [Commits](https://github.com/microsoft/vscode-perf/compare/v0.0.24...v0.0.25)

---
updated-dependencies:
- dependency-name: "@vscode/vscode-perf"
  dependency-version: 0.0.25
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 10 +++++-----
 package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8f5fadee6b13..8565ff5f1aaa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -86,7 +86,7 @@
         "@vscode/test-electron": "^2.4.0",
         "@vscode/test-web": "^0.0.77",
         "@vscode/v8-heap-parser": "^0.1.0",
-        "@vscode/vscode-perf": "^0.0.24",
+        "@vscode/vscode-perf": "^0.0.25",
         "@webgpu/types": "^0.1.69",
         "ansi-colors": "^3.2.3",
         "asar": "^3.0.3",
@@ -3771,9 +3771,9 @@
       }
     },
     "node_modules/@vscode/vscode-perf": {
-      "version": "0.0.24",
-      "resolved": "https://registry.npmjs.org/@vscode/vscode-perf/-/vscode-perf-0.0.24.tgz",
-      "integrity": "sha512-0VwvtHTuF3B7m+FngggeM/8mGlvJpSowICJdFOX2jjujucNC7gQpXckNFnXmxMRLEfh9/3joJdnTavupI7aA/Q==",
+      "version": "0.0.25",
+      "resolved": "https://registry.npmjs.org/@vscode/vscode-perf/-/vscode-perf-0.0.25.tgz",
+      "integrity": "sha512-h3PpwX0mJeRqVdlKnBJ9n+ngihXpWcbyy1xeI8tLDyK/g7yanawknzVm526Ojv5LRs19LCucqUzia0s4oZjhKA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3782,7 +3782,7 @@
         "cookie": "^0.7.2",
         "js-base64": "^3.7.4",
         "node-fetch": "2.6.8",
-        "playwright": "^1.29.2"
+        "playwright": "^1.56.1"
       },
       "bin": {
         "vscode-perf": "bin/vscode-perf"
diff --git a/package.json b/package.json
index 610e78687325..55d517707988 100644
--- a/package.json
+++ b/package.json
@@ -145,7 +145,7 @@
     "@vscode/test-electron": "^2.4.0",
     "@vscode/test-web": "^0.0.77",
     "@vscode/v8-heap-parser": "^0.1.0",
-    "@vscode/vscode-perf": "^0.0.24",
+    "@vscode/vscode-perf": "^0.0.25",
     "@webgpu/types": "^0.1.69",
     "ansi-colors": "^3.2.3",
     "asar": "^3.0.3",

From fff77c728198f809a3ebe6c7cddf0acac0aeb5e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jan 2026 16:39:48 +0000
Subject: [PATCH 1780/1815] Bump @xterm/addon-serialize in /remote/web

Bumps [@xterm/addon-serialize](https://github.com/xtermjs/xterm.js) from 0.15.0-beta.105 to 0.15.0-beta.107.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-serialize"
  dependency-version: 0.15.0-beta.107
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 79219c70297a..db6a36a6befa 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -18,7 +18,7 @@
 				"@xterm/addon-ligatures": "^0.11.0-beta.105",
 				"@xterm/addon-progress": "^0.3.0-beta.105",
 				"@xterm/addon-search": "^0.17.0-beta.105",
-				"@xterm/addon-serialize": "^0.15.0-beta.105",
+				"@xterm/addon-serialize": "^0.15.0-beta.107",
 				"@xterm/addon-unicode11": "^0.10.0-beta.107",
 				"@xterm/addon-webgl": "^0.20.0-beta.104",
 				"@xterm/xterm": "^6.0.0",
@@ -179,12 +179,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-serialize": {
-			"version": "0.15.0-beta.105",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.105.tgz",
-			"integrity": "sha512-VK8gvMwtJbZ5NXAmE3lsnz3lWo0s/dn52Yppq9pm03BSCPVs6zF8zqHU+gkiXuGR2e0+oNAnu1A66+cLR83RGw==",
+			"version": "0.15.0-beta.107",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.107.tgz",
+			"integrity": "sha512-ONNGwlonwK7mTriI3s8tc7VGSELAA7P42Z5rSbup7XF5z2MX2vNJCxrqnp2PjjAKxG++5r3qug+v1e/M8b6PjQ==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.105"
+				"@xterm/xterm": "^6.1.0-beta.107"
 			}
 		},
 		"node_modules/@xterm/addon-unicode11": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 460a5d4279b6..d249ea9ee82f 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -13,7 +13,7 @@
 		"@xterm/addon-ligatures": "^0.11.0-beta.105",
 		"@xterm/addon-progress": "^0.3.0-beta.105",
 		"@xterm/addon-search": "^0.17.0-beta.105",
-		"@xterm/addon-serialize": "^0.15.0-beta.105",
+		"@xterm/addon-serialize": "^0.15.0-beta.107",
 		"@xterm/addon-unicode11": "^0.10.0-beta.107",
 		"@xterm/addon-webgl": "^0.20.0-beta.104",
 		"@xterm/xterm": "^6.0.0",

From 999d361fca2c9ca1d50fd484f96337773ac5d059 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jan 2026 16:45:02 +0000
Subject: [PATCH 1781/1815] Bump @xterm/addon-unicode11 from 0.10.0-beta.105 to
 0.10.0-beta.107

Bumps [@xterm/addon-unicode11](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.105 to 0.10.0-beta.107.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-unicode11"
  dependency-version: 0.10.0-beta.107
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 10 +++++-----
 package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fc1f71685c2f..b74325455bb4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
         "@xterm/addon-progress": "^0.2.0-beta.5",
         "@xterm/addon-search": "^0.17.0-beta.105",
         "@xterm/addon-serialize": "^0.14.0-beta.99",
-        "@xterm/addon-unicode11": "^0.10.0-beta.105",
+        "@xterm/addon-unicode11": "^0.10.0-beta.107",
         "@xterm/addon-webgl": "^0.19.0-beta.99",
         "@xterm/headless": "^5.6.0-beta.99",
         "@xterm/xterm": "^6.0.0",
@@ -4114,12 +4114,12 @@
       }
     },
     "node_modules/@xterm/addon-unicode11": {
-      "version": "0.10.0-beta.105",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.105.tgz",
-      "integrity": "sha512-zMepG3Wa44+n8SQbNZ8jnpASh9zDEuDlk/0+bpPaRRc4UkiR6UbhzZos+qC8glxu1QGLd/4dFMuypnNxWonkpQ==",
+      "version": "0.10.0-beta.107",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.107.tgz",
+      "integrity": "sha512-aWnjjJGGAOUxuWRl+kF7EyD2qQ3TqRdb0u0L1aB1MlUk04qG5Ctv3uwLu8Moh/uAyJ7tAqgU7GQQP6yWDwvnJQ==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.105"
+        "@xterm/xterm": "^6.1.0-beta.107"
       }
     },
     "node_modules/@xterm/addon-webgl": {
diff --git a/package.json b/package.json
index 404bad82411e..9e6c4e0cc171 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "@xterm/addon-progress": "^0.2.0-beta.5",
     "@xterm/addon-search": "^0.17.0-beta.105",
     "@xterm/addon-serialize": "^0.14.0-beta.99",
-    "@xterm/addon-unicode11": "^0.10.0-beta.105",
+    "@xterm/addon-unicode11": "^0.10.0-beta.107",
     "@xterm/addon-webgl": "^0.19.0-beta.99",
     "@xterm/headless": "^5.6.0-beta.99",
     "@xterm/xterm": "^6.0.0",

From 42edef3fca96ab920685a304071c2cf3b4a778cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jan 2026 16:45:03 +0000
Subject: [PATCH 1782/1815] Bump @xterm/addon-webgl in /remote/web

Bumps [@xterm/addon-webgl](https://github.com/xtermjs/xterm.js) from 0.20.0-beta.104 to 0.20.0-beta.106.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-webgl"
  dependency-version: 0.20.0-beta.106
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index db6a36a6befa..9d1d7b3d02df 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -20,7 +20,7 @@
 				"@xterm/addon-search": "^0.17.0-beta.105",
 				"@xterm/addon-serialize": "^0.15.0-beta.107",
 				"@xterm/addon-unicode11": "^0.10.0-beta.107",
-				"@xterm/addon-webgl": "^0.20.0-beta.104",
+				"@xterm/addon-webgl": "^0.20.0-beta.106",
 				"@xterm/xterm": "^6.0.0",
 				"jschardet": "3.1.4",
 				"tas-client-umd": "0.2.0",
@@ -197,12 +197,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-webgl": {
-			"version": "0.20.0-beta.104",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.104.tgz",
-			"integrity": "sha512-S9zSxwnLXeF8RK1HZXLIdqZELF83ZHVyFJtqNj6b9SdjVMSFrQpa1wwWuJR1McW54hShX3aC9zLj1/1RKiwAxQ==",
+			"version": "0.20.0-beta.106",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-webgl/-/addon-webgl-0.20.0-beta.106.tgz",
+			"integrity": "sha512-QbVWbYmCk5w4W7k6P7Q5uaiOn4FOqxdvNFtAvFyO4zLtH9t22cEfihooIqmZzksxWafPIe9US55o9gu1DHUzLQ==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.105"
+				"@xterm/xterm": "^6.1.0-beta.107"
 			}
 		},
 		"node_modules/@xterm/xterm": {
diff --git a/remote/web/package.json b/remote/web/package.json
index d249ea9ee82f..9914c0951bcf 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -15,7 +15,7 @@
 		"@xterm/addon-search": "^0.17.0-beta.105",
 		"@xterm/addon-serialize": "^0.15.0-beta.107",
 		"@xterm/addon-unicode11": "^0.10.0-beta.107",
-		"@xterm/addon-webgl": "^0.20.0-beta.104",
+		"@xterm/addon-webgl": "^0.20.0-beta.106",
 		"@xterm/xterm": "^6.0.0",
 		"jschardet": "3.1.4",
 		"tas-client-umd": "0.2.0",

From aa52afbec4c5794820af42ad4f974007d48763ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jan 2026 16:45:33 +0000
Subject: [PATCH 1783/1815] Bump @xterm/addon-progress in /remote/web

Bumps [@xterm/addon-progress](https://github.com/xtermjs/xterm.js) from 0.3.0-beta.105 to 0.3.0-beta.107.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-progress"
  dependency-version: 0.3.0-beta.107
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index db6a36a6befa..5286d14fbac0 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -16,7 +16,7 @@
 				"@xterm/addon-clipboard": "^0.3.0-beta.105",
 				"@xterm/addon-image": "^0.10.0-beta.105",
 				"@xterm/addon-ligatures": "^0.11.0-beta.105",
-				"@xterm/addon-progress": "^0.3.0-beta.105",
+				"@xterm/addon-progress": "^0.3.0-beta.107",
 				"@xterm/addon-search": "^0.17.0-beta.105",
 				"@xterm/addon-serialize": "^0.15.0-beta.107",
 				"@xterm/addon-unicode11": "^0.10.0-beta.107",
@@ -161,12 +161,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-progress": {
-			"version": "0.3.0-beta.105",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.105.tgz",
-			"integrity": "sha512-1VW3D0VA5DS7n7pa8cFA57emhijt/10mM7sK7Ll22AYNmNyNdUiXWm1ORgzI2U1ApBADm117W5QiEkkDEu+F0w==",
+			"version": "0.3.0-beta.107",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.107.tgz",
+			"integrity": "sha512-8SB5U6DXrGQPIBfh8uGW+06JayU4ECsMKcUmxZj9GESy1T/7o1H5UsTZwl5+ZtczxmOCN7ydrowb1XGWXS0+Kg==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.105"
+				"@xterm/xterm": "^6.1.0-beta.107"
 			}
 		},
 		"node_modules/@xterm/addon-search": {
diff --git a/remote/web/package.json b/remote/web/package.json
index d249ea9ee82f..d4553cae9a03 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -11,7 +11,7 @@
 		"@xterm/addon-clipboard": "^0.3.0-beta.105",
 		"@xterm/addon-image": "^0.10.0-beta.105",
 		"@xterm/addon-ligatures": "^0.11.0-beta.105",
-		"@xterm/addon-progress": "^0.3.0-beta.105",
+		"@xterm/addon-progress": "^0.3.0-beta.107",
 		"@xterm/addon-search": "^0.17.0-beta.105",
 		"@xterm/addon-serialize": "^0.15.0-beta.107",
 		"@xterm/addon-unicode11": "^0.10.0-beta.107",

From 13a3a609aeb764b2767a271bcb017bc4792901e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jan 2026 16:46:05 +0000
Subject: [PATCH 1784/1815] Bump @xterm/addon-image in /remote/web

Bumps [@xterm/addon-image](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.105 to 0.10.0-beta.107.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-image"
  dependency-version: 0.10.0-beta.107
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index db6a36a6befa..628219c408b7 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -14,7 +14,7 @@
 				"@vscode/tree-sitter-wasm": "^0.3.0",
 				"@vscode/vscode-languagedetection": "1.0.23",
 				"@xterm/addon-clipboard": "^0.3.0-beta.105",
-				"@xterm/addon-image": "^0.10.0-beta.105",
+				"@xterm/addon-image": "^0.10.0-beta.107",
 				"@xterm/addon-ligatures": "^0.11.0-beta.105",
 				"@xterm/addon-progress": "^0.3.0-beta.105",
 				"@xterm/addon-search": "^0.17.0-beta.105",
@@ -136,12 +136,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-image": {
-			"version": "0.10.0-beta.105",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.105.tgz",
-			"integrity": "sha512-N/IYH+whr+4GG1J/1o4q2H6JVG56FX5hdm1ffjWjrhgyZl1qSOm8AHhozq3pssWljvtoTQRcAlHRAmEbrYT8jA==",
+			"version": "0.10.0-beta.107",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-image/-/addon-image-0.10.0-beta.107.tgz",
+			"integrity": "sha512-scYxbEmtZUeJHV6nz1l4DYtgYkQLUnE61mwBSZPSjy0cmYoKA8uUAaxucoJIBRtYPuA9RtotBueyatfp/HEy5Q==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.105"
+				"@xterm/xterm": "^6.1.0-beta.107"
 			}
 		},
 		"node_modules/@xterm/addon-ligatures": {
diff --git a/remote/web/package.json b/remote/web/package.json
index d249ea9ee82f..68b70dc2d615 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -9,7 +9,7 @@
 		"@vscode/tree-sitter-wasm": "^0.3.0",
 		"@vscode/vscode-languagedetection": "1.0.23",
 		"@xterm/addon-clipboard": "^0.3.0-beta.105",
-		"@xterm/addon-image": "^0.10.0-beta.105",
+		"@xterm/addon-image": "^0.10.0-beta.107",
 		"@xterm/addon-ligatures": "^0.11.0-beta.105",
 		"@xterm/addon-progress": "^0.3.0-beta.105",
 		"@xterm/addon-search": "^0.17.0-beta.105",

From fc4bc2de977246bc31fcf1425cf53fbd4ccceb61 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Jan 2026 16:47:51 +0000
Subject: [PATCH 1785/1815] Bump @xterm/addon-serialize in /remote

Bumps [@xterm/addon-serialize](https://github.com/xtermjs/xterm.js) from 0.15.0-beta.105 to 0.15.0-beta.107.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-serialize"
  dependency-version: 0.15.0-beta.107
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 4779beac444f..87ae6aa5801b 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -25,7 +25,7 @@
         "@xterm/addon-ligatures": "^0.11.0-beta.105",
         "@xterm/addon-progress": "^0.3.0-beta.105",
         "@xterm/addon-search": "^0.17.0-beta.105",
-        "@xterm/addon-serialize": "^0.15.0-beta.105",
+        "@xterm/addon-serialize": "^0.15.0-beta.107",
         "@xterm/addon-unicode11": "^0.10.0-beta.105",
         "@xterm/addon-webgl": "^0.20.0-beta.106",
         "@xterm/headless": "^6.0.0",
@@ -606,12 +606,12 @@
       }
     },
     "node_modules/@xterm/addon-serialize": {
-      "version": "0.15.0-beta.105",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.105.tgz",
-      "integrity": "sha512-VK8gvMwtJbZ5NXAmE3lsnz3lWo0s/dn52Yppq9pm03BSCPVs6zF8zqHU+gkiXuGR2e0+oNAnu1A66+cLR83RGw==",
+      "version": "0.15.0-beta.107",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-serialize/-/addon-serialize-0.15.0-beta.107.tgz",
+      "integrity": "sha512-ONNGwlonwK7mTriI3s8tc7VGSELAA7P42Z5rSbup7XF5z2MX2vNJCxrqnp2PjjAKxG++5r3qug+v1e/M8b6PjQ==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.105"
+        "@xterm/xterm": "^6.1.0-beta.107"
       }
     },
     "node_modules/@xterm/addon-unicode11": {
diff --git a/remote/package.json b/remote/package.json
index b662b7d4f58d..fe23dd1a6ae5 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -20,7 +20,7 @@
     "@xterm/addon-ligatures": "^0.11.0-beta.105",
     "@xterm/addon-progress": "^0.3.0-beta.105",
     "@xterm/addon-search": "^0.17.0-beta.105",
-    "@xterm/addon-serialize": "^0.15.0-beta.105",
+    "@xterm/addon-serialize": "^0.15.0-beta.107",
     "@xterm/addon-unicode11": "^0.10.0-beta.105",
     "@xterm/addon-webgl": "^0.20.0-beta.106",
     "@xterm/headless": "^6.0.0",

From 93469f57143933480137a1788533e1f052a3ddd0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:22:21 +0000
Subject: [PATCH 1786/1815] Bump actions/checkout from 6.0.1 to 6.0.2

Bumps [actions/checkout](https://github.com/actions/checkout) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/8e8c483db84b4bee98b60c0593521ed34d9990e8...de0fac2e4500dabe0009e67214ff5f5447ce83dd)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/dependency-review.yml | 2 +-
 .github/workflows/scorecards.yml        | 2 +-
 .github/workflows/telemetry.yml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index 83c9c121aafb..83386bbb6004 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -22,6 +22,6 @@ jobs:
           egress-policy: audit
 
       - name: 'Checkout Repository'
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index aba535cf52fc..4fd65193e246 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -41,7 +41,7 @@ jobs:
           egress-policy: audit
 
       - name: "Checkout code"
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 
diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml
index 64d557f4a042..3705ca082b73 100644
--- a/.github/workflows/telemetry.yml
+++ b/.github/workflows/telemetry.yml
@@ -17,7 +17,7 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: 'actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8' # v6.0.1
+      - uses: 'actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd' # v6.0.2
 
       - uses: 'actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238' # v6.2.0
         with:

From 51f82c849c8ca86a94dfb390f5d028f50762c74f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:22:26 +0000
Subject: [PATCH 1787/1815] Bump step-security/harden-runner from 2.14.0 to
 2.14.1

Bumps [step-security/harden-runner](https://github.com/step-security/harden-runner) from 2.14.0 to 2.14.1.
- [Release notes](https://github.com/step-security/harden-runner/releases)
- [Commits](https://github.com/step-security/harden-runner/compare/20cf305ff2072d973412fa9b1e3a4f227bda3c76...e3f713f2d8f53843e71c69a996d56f51aa9adfb9)

---
updated-dependencies:
- dependency-name: step-security/harden-runner
  dependency-version: 2.14.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/dependency-review.yml | 2 +-
 .github/workflows/scorecards.yml        | 2 +-
 .github/workflows/telemetry.yml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index 83c9c121aafb..18175341db05 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index aba535cf52fc..6cdcd57fcbf7 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml
index 64d557f4a042..a708e5bfd837 100644
--- a/.github/workflows/telemetry.yml
+++ b/.github/workflows/telemetry.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
         with:
           egress-policy: audit
 

From 9e7a7f1631cc2ddbf06f799e39ac266f50e3cfce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:22:36 +0000
Subject: [PATCH 1788/1815] Bump github/codeql-action from 4.31.10 to 4.31.11

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.10 to 4.31.11.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/cdefb33c0f6224e58673d9004f47f7cb3e328b89...19b2f06db2b6f5108140aeb04014ef02b648f789)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/scorecards.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index aba535cf52fc..074125b380b7 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -76,6 +76,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
+        uses: github/codeql-action/upload-sarif@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
         with:
           sarif_file: results.sarif

From 82ce69acc1f93337d67c92f018fa3510c05411eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:24:49 +0000
Subject: [PATCH 1789/1815] Bump @vscode/extension-telemetry in
 /extensions/github-authentication

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 1.2.0 to 1.4.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v1.2.0...v1.4.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github-authentication/package-lock.json | 8 ++++----
 extensions/github-authentication/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/github-authentication/package-lock.json b/extensions/github-authentication/package-lock.json
index 472a81ae21c3..d70713a24729 100644
--- a/extensions/github-authentication/package-lock.json
+++ b/extensions/github-authentication/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.0.2",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^1.2.0",
+        "@vscode/extension-telemetry": "^1.4.0",
         "node-fetch": "3.3.2",
         "vscode-tas-client": "^0.1.84"
       },
@@ -175,9 +175,9 @@
       }
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
-      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.4.0.tgz",
+      "integrity": "sha512-mqypuqIDn+vQnaQ8tMdvCRn9BprZTH2j6nlFFv9hE6hB25n32F8rOZinos8OgblRi87X1qdBpjpb0Em1LGSG9w==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/1ds-core-js": "^4.3.10",
diff --git a/extensions/github-authentication/package.json b/extensions/github-authentication/package.json
index 4928e15f51ba..0d5e22de242e 100644
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@@ -62,7 +62,7 @@
   },
   "dependencies": {
     "node-fetch": "3.3.2",
-    "@vscode/extension-telemetry": "^1.2.0",
+    "@vscode/extension-telemetry": "^1.4.0",
     "vscode-tas-client": "^0.1.84"
   },
   "devDependencies": {

From 5353a524916b58aa640aab0b1f91b7d824f741f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:24:53 +0000
Subject: [PATCH 1790/1815] Bump @vscode/extension-telemetry from 1.2.0 to
 1.4.0 in /extensions/git

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 1.2.0 to 1.4.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v1.2.0...v1.4.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/git/package-lock.json | 8 ++++----
 extensions/git/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index 37be7ae3b2ce..f12ed5a6f84f 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@joaomoreno/unique-names-generator": "^5.2.0",
-        "@vscode/extension-telemetry": "^1.2.0",
+        "@vscode/extension-telemetry": "^1.4.0",
         "@vscode/iconv-lite-umd": "0.7.1",
         "byline": "^5.0.0",
         "file-type": "21.3.0",
@@ -238,9 +238,9 @@
       "license": "MIT"
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
-      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.4.0.tgz",
+      "integrity": "sha512-mqypuqIDn+vQnaQ8tMdvCRn9BprZTH2j6nlFFv9hE6hB25n32F8rOZinos8OgblRi87X1qdBpjpb0Em1LGSG9w==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/1ds-core-js": "^4.3.10",
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 83249197c4a3..1815af8783d6 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3566,7 +3566,7 @@
   },
   "dependencies": {
     "@joaomoreno/unique-names-generator": "^5.2.0",
-    "@vscode/extension-telemetry": "^1.2.0",
+    "@vscode/extension-telemetry": "^1.4.0",
     "@vscode/iconv-lite-umd": "0.7.1",
     "byline": "^5.0.0",
     "file-type": "21.3.0",

From 197d98fda25f041e7a88d22f647548f67ddcc964 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:24:56 +0000
Subject: [PATCH 1791/1815] Bump @vscode/extension-telemetry in
 /extensions/github

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 1.2.0 to 1.4.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v1.2.0...v1.4.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/github/package-lock.json | 8 ++++----
 extensions/github/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/github/package-lock.json b/extensions/github/package-lock.json
index 6072610911ed..1ebbde734166 100644
--- a/extensions/github/package-lock.json
+++ b/extensions/github/package-lock.json
@@ -12,7 +12,7 @@
         "@octokit/graphql": "9.0.3",
         "@octokit/graphql-schema": "15.26.1",
         "@octokit/rest": "22.0.1",
-        "@vscode/extension-telemetry": "^1.2.0",
+        "@vscode/extension-telemetry": "^1.4.0",
         "tunnel": "^0.0.6"
       },
       "devDependencies": {
@@ -321,9 +321,9 @@
       }
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
-      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.4.0.tgz",
+      "integrity": "sha512-mqypuqIDn+vQnaQ8tMdvCRn9BprZTH2j6nlFFv9hE6hB25n32F8rOZinos8OgblRi87X1qdBpjpb0Em1LGSG9w==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/1ds-core-js": "^4.3.10",
diff --git a/extensions/github/package.json b/extensions/github/package.json
index 6d37c512fc6f..1ab0f01da68d 100644
--- a/extensions/github/package.json
+++ b/extensions/github/package.json
@@ -231,7 +231,7 @@
     "@octokit/graphql-schema": "15.26.1",
     "@octokit/rest": "22.0.1",
     "tunnel": "^0.0.6",
-    "@vscode/extension-telemetry": "^1.2.0"
+    "@vscode/extension-telemetry": "^1.4.0"
   },
   "devDependencies": {
     "@types/node": "25.x"

From 1a3a2ad13f34ff9a58b80201044c75db922f6c48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:24:59 +0000
Subject: [PATCH 1792/1815] Bump @vscode/extension-telemetry in
 /extensions/media-preview

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 1.2.0 to 1.4.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v1.2.0...v1.4.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/media-preview/package-lock.json | 8 ++++----
 extensions/media-preview/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/media-preview/package-lock.json b/extensions/media-preview/package-lock.json
index 329322a5a689..7255e5522992 100644
--- a/extensions/media-preview/package-lock.json
+++ b/extensions/media-preview/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^0.9.8",
+        "@vscode/extension-telemetry": "^1.4.0",
         "vscode-uri": "^3.1.0"
       },
       "engines": {
@@ -141,9 +141,9 @@
       "license": "MIT"
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
-      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.4.0.tgz",
+      "integrity": "sha512-mqypuqIDn+vQnaQ8tMdvCRn9BprZTH2j6nlFFv9hE6hB25n32F8rOZinos8OgblRi87X1qdBpjpb0Em1LGSG9w==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/1ds-core-js": "^4.3.10",
diff --git a/extensions/media-preview/package.json b/extensions/media-preview/package.json
index 6676dbcad798..1e9dbac00429 100644
--- a/extensions/media-preview/package.json
+++ b/extensions/media-preview/package.json
@@ -126,7 +126,7 @@
     "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^0.9.8",
+    "@vscode/extension-telemetry": "^1.4.0",
     "vscode-uri": "^3.1.0"
   },
   "repository": {

From 71add03b3aaeaab5352ece27fb7b597cbfb0633c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:25:04 +0000
Subject: [PATCH 1793/1815] Bump sysinfo from 0.37.2 to 0.38.0 in /cli

Bumps [sysinfo](https://github.com/GuillaumeGomez/sysinfo) from 0.37.2 to 0.38.0.
- [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/main/CHANGELOG.md)
- [Commits](https://github.com/GuillaumeGomez/sysinfo/compare/v0.37.2...v0.38.0)

---
updated-dependencies:
- dependency-name: sysinfo
  dependency-version: 0.38.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cli/Cargo.lock | 4 ++--
 cli/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index d7a84bcc2792..b32fb98540e3 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -2844,9 +2844,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.37.2"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16607d5caffd1c07ce073528f9ed972d88db15dd44023fa57142963be3feb11f"
+checksum = "fe840c5b1afe259a5657392a4dbb74473a14c8db999c3ec2f4ae812e028a94da"
 dependencies = [
  "libc",
 ]
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 16dd16ff3730..c49e453e66c2 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -22,7 +22,7 @@ flate2 = { version = "1.1.8", default-features = false, features = ["zlib"] }
 zip = { version = "2.3.0", default-features = false, features = ["time", "deflate-zlib"] }
 regex = "1.12.2"
 lazy_static = "1.5.0"
-sysinfo = { version = "0.37.2", default-features = false }
+sysinfo = { version = "0.38.0", default-features = false }
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.149"
 rmp-serde = "1.3.1"

From bcf090fb23f222f0a6e13f13500192aea3b382c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:25:26 +0000
Subject: [PATCH 1794/1815] Bump @vscode/extension-telemetry in
 /extensions/html-language-features

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 1.2.0 to 1.4.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v1.2.0...v1.4.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/html-language-features/package-lock.json | 8 ++++----
 extensions/html-language-features/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/html-language-features/package-lock.json b/extensions/html-language-features/package-lock.json
index 8eb22bbe9ffc..1823392f858f 100644
--- a/extensions/html-language-features/package-lock.json
+++ b/extensions/html-language-features/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^1.2.0",
+        "@vscode/extension-telemetry": "^1.4.0",
         "vscode-languageclient": "^10.0.0-next.19",
         "vscode-uri": "^3.1.0"
       },
@@ -176,9 +176,9 @@
       }
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
-      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.4.0.tgz",
+      "integrity": "sha512-mqypuqIDn+vQnaQ8tMdvCRn9BprZTH2j6nlFFv9hE6hB25n32F8rOZinos8OgblRi87X1qdBpjpb0Em1LGSG9w==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/1ds-core-js": "^4.3.10",
diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json
index 8fd3626c57b0..d405d4198baa 100644
--- a/extensions/html-language-features/package.json
+++ b/extensions/html-language-features/package.json
@@ -258,7 +258,7 @@
     ]
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^1.2.0",
+    "@vscode/extension-telemetry": "^1.4.0",
     "vscode-languageclient": "^10.0.0-next.19",
     "vscode-uri": "^3.1.0"
   },

From bdfdb04b3acf46fa3009f6df45ffccf11cb64366 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:25:27 +0000
Subject: [PATCH 1795/1815] Bump @vscode/extension-telemetry in
 /extensions/json-language-features

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 1.2.0 to 1.4.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v1.2.0...v1.4.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/json-language-features/package-lock.json | 8 ++++----
 extensions/json-language-features/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/json-language-features/package-lock.json b/extensions/json-language-features/package-lock.json
index 8379766d5669..9dd6002fbb6e 100644
--- a/extensions/json-language-features/package-lock.json
+++ b/extensions/json-language-features/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^1.2.0",
+        "@vscode/extension-telemetry": "^1.4.0",
         "request-light": "^0.8.0",
         "vscode-languageclient": "^10.0.0-next.19"
       },
@@ -176,9 +176,9 @@
       }
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
-      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.4.0.tgz",
+      "integrity": "sha512-mqypuqIDn+vQnaQ8tMdvCRn9BprZTH2j6nlFFv9hE6hB25n32F8rOZinos8OgblRi87X1qdBpjpb0Em1LGSG9w==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/1ds-core-js": "^4.3.10",
diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json
index 64e5a781fa30..4bcef4b8e5d0 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -167,7 +167,7 @@
     ]
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^1.2.0",
+    "@vscode/extension-telemetry": "^1.4.0",
     "request-light": "^0.8.0",
     "vscode-languageclient": "^10.0.0-next.19"
   },

From f2360a08d6f8007f8820afb7ae4aacfbec3f920c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:25:36 +0000
Subject: [PATCH 1796/1815] Bump @vscode/extension-telemetry in
 /extensions/merge-conflict

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 1.2.0 to 1.4.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v1.2.0...v1.4.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/merge-conflict/package-lock.json | 8 ++++----
 extensions/merge-conflict/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/merge-conflict/package-lock.json b/extensions/merge-conflict/package-lock.json
index c4cbf3546d0b..933227c77d11 100644
--- a/extensions/merge-conflict/package-lock.json
+++ b/extensions/merge-conflict/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^1.2.0"
+        "@vscode/extension-telemetry": "^1.4.0"
       },
       "devDependencies": {
         "@types/node": "25.x"
@@ -153,9 +153,9 @@
       }
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
-      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.4.0.tgz",
+      "integrity": "sha512-mqypuqIDn+vQnaQ8tMdvCRn9BprZTH2j6nlFFv9hE6hB25n32F8rOZinos8OgblRi87X1qdBpjpb0Em1LGSG9w==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/1ds-core-js": "^4.3.10",
diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
index c4273cd805b6..4224f851f144 100644
--- a/extensions/merge-conflict/package.json
+++ b/extensions/merge-conflict/package.json
@@ -166,7 +166,7 @@
     }
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^1.2.0"
+    "@vscode/extension-telemetry": "^1.4.0"
   },
   "devDependencies": {
     "@types/node": "25.x"

From 15acbac8fce5b656216814ab55599e19292c380a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:25:40 +0000
Subject: [PATCH 1797/1815] Bump @vscode/extension-telemetry

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 1.2.0 to 1.4.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v1.2.0...v1.4.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/markdown-language-features/package-lock.json | 8 ++++----
 extensions/markdown-language-features/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index 47b802993268..1a3a0f589b93 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^1.2.0",
+        "@vscode/extension-telemetry": "^1.4.0",
         "dompurify": "^3.2.4",
         "highlight.js": "^11.11.1",
         "markdown-it": "^14.1.0",
@@ -241,9 +241,9 @@
       "license": "MIT"
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
-      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.4.0.tgz",
+      "integrity": "sha512-mqypuqIDn+vQnaQ8tMdvCRn9BprZTH2j6nlFFv9hE6hB25n32F8rOZinos8OgblRi87X1qdBpjpb0Em1LGSG9w==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/1ds-core-js": "^4.3.10",
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 09d6ee785b77..6f5157b29ab9 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -763,7 +763,7 @@
     "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^1.2.0",
+    "@vscode/extension-telemetry": "^1.4.0",
     "dompurify": "^3.2.4",
     "highlight.js": "^11.11.1",
     "markdown-it": "^14.1.0",

From 660a8124eb5097181528a6221e28afe8aeabc1c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:26:21 +0000
Subject: [PATCH 1798/1815] Bump @vscode/extension-telemetry in
 /extensions/microsoft-authentication

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 1.2.0 to 1.4.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v1.2.0...v1.4.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/microsoft-authentication/package-lock.json | 8 ++++----
 extensions/microsoft-authentication/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index c9a60f744349..a4f02d576094 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -12,7 +12,7 @@
         "@azure/ms-rest-azure-env": "^2.0.0",
         "@azure/msal-node": "^5.0.2",
         "@azure/msal-node-extensions": "^5.0.2",
-        "@vscode/extension-telemetry": "^1.2.0",
+        "@vscode/extension-telemetry": "^1.4.0",
         "keytar": "file:./packageMocks/keytar",
         "vscode-tas-client": "^0.1.84"
       },
@@ -254,9 +254,9 @@
       }
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
-      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.4.0.tgz",
+      "integrity": "sha512-mqypuqIDn+vQnaQ8tMdvCRn9BprZTH2j6nlFFv9hE6hB25n32F8rOZinos8OgblRi87X1qdBpjpb0Em1LGSG9w==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/1ds-core-js": "^4.3.10",
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index 2e64ed511fb6..17d6ebdcc55f 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -141,7 +141,7 @@
     "@azure/ms-rest-azure-env": "^2.0.0",
     "@azure/msal-node": "^5.0.2",
     "@azure/msal-node-extensions": "^5.0.2",
-    "@vscode/extension-telemetry": "^1.2.0",
+    "@vscode/extension-telemetry": "^1.4.0",
     "keytar": "file:./packageMocks/keytar",
     "vscode-tas-client": "^0.1.84"
   },

From 6e5d0c20cf279a5b173072f8d601d55bcd021316 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:26:46 +0000
Subject: [PATCH 1799/1815] Bump @vscode/extension-telemetry in
 /extensions/simple-browser

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 1.2.0 to 1.4.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v1.2.0...v1.4.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/simple-browser/package-lock.json | 8 ++++----
 extensions/simple-browser/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/simple-browser/package-lock.json b/extensions/simple-browser/package-lock.json
index d00ca5d995ba..9376726c60c1 100644
--- a/extensions/simple-browser/package-lock.json
+++ b/extensions/simple-browser/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^1.2.0"
+        "@vscode/extension-telemetry": "^1.4.0"
       },
       "devDependencies": {
         "@types/vscode-webview": "^1.57.5",
@@ -158,9 +158,9 @@
       "license": "CC-BY-4.0"
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
-      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.4.0.tgz",
+      "integrity": "sha512-mqypuqIDn+vQnaQ8tMdvCRn9BprZTH2j6nlFFv9hE6hB25n32F8rOZinos8OgblRi87X1qdBpjpb0Em1LGSG9w==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/1ds-core-js": "^4.3.10",
diff --git a/extensions/simple-browser/package.json b/extensions/simple-browser/package.json
index e70ac07ad0ec..dca21b0aa733 100644
--- a/extensions/simple-browser/package.json
+++ b/extensions/simple-browser/package.json
@@ -66,7 +66,7 @@
     "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^1.2.0"
+    "@vscode/extension-telemetry": "^1.4.0"
   },
   "devDependencies": {
     "@types/vscode-webview": "^1.57.5",

From ffc212e912bf0debacab40bec400a444d91119d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:27:04 +0000
Subject: [PATCH 1800/1815] Bump @jupyterlab/nbformat from 4.5.2 to 4.5.3 in
 /extensions/ipynb

Bumps [@jupyterlab/nbformat](https://github.com/jupyterlab/jupyterlab) from 4.5.2 to 4.5.3.
- [Release notes](https://github.com/jupyterlab/jupyterlab/releases)
- [Changelog](https://github.com/jupyterlab/jupyterlab/blob/main/RELEASE.md)
- [Commits](https://github.com/jupyterlab/jupyterlab/compare/@jupyterlab/nbformat@4.5.2...@jupyterlab/nbformat@4.5.3)

---
updated-dependencies:
- dependency-name: "@jupyterlab/nbformat"
  dependency-version: 4.5.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/ipynb/package-lock.json | 8 ++++----
 extensions/ipynb/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/ipynb/package-lock.json b/extensions/ipynb/package-lock.json
index 3061d126538f..71770e62a187 100644
--- a/extensions/ipynb/package-lock.json
+++ b/extensions/ipynb/package-lock.json
@@ -13,7 +13,7 @@
         "detect-indent": "^7.0.2"
       },
       "devDependencies": {
-        "@jupyterlab/nbformat": "^4.5.2",
+        "@jupyterlab/nbformat": "^4.5.3",
         "@types/markdown-it": "14.1.2"
       },
       "engines": {
@@ -26,9 +26,9 @@
       "integrity": "sha512-BCN9uNWH8AmiP7BXBJqEinUY9KXalmRzo+L0cB/mQsmFfzODxwQrbvxCHXUNH2iP+qKkWYtB4vyy8N62PViMFw=="
     },
     "node_modules/@jupyterlab/nbformat": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/@jupyterlab/nbformat/-/nbformat-4.5.2.tgz",
-      "integrity": "sha512-1qNgz3T2FmV7cnRUmw8ApSPvlthI7nxQzXDRlpNQmQHTuGHnNJkyahqXaoO6pI5vt+5RK6jRCvME75xFdVwZ+w==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/@jupyterlab/nbformat/-/nbformat-4.5.3.tgz",
+      "integrity": "sha512-9LIyOpcQIVLxjQ3XIvjpIID5AtgGnCEniUFMmlvfJxo4WFtpS3AykTcwri0TRWhgPmo1ijNp+iTiMJmm1hl07g==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
diff --git a/extensions/ipynb/package.json b/extensions/ipynb/package.json
index c0ca5cfad1ba..1437cbba722f 100644
--- a/extensions/ipynb/package.json
+++ b/extensions/ipynb/package.json
@@ -165,7 +165,7 @@
     "detect-indent": "^7.0.2"
   },
   "devDependencies": {
-    "@jupyterlab/nbformat": "^4.5.2",
+    "@jupyterlab/nbformat": "^4.5.3",
     "@types/markdown-it": "14.1.2"
   },
   "repository": {

From 512c9b7dfea51c2584f8deb1ca4bd0183fa00994 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:27:32 +0000
Subject: [PATCH 1801/1815] Bump @vscode/extension-telemetry

Bumps [@vscode/extension-telemetry](https://github.com/Microsoft/vscode-extension-telemetry) from 1.2.0 to 1.4.0.
- [Release notes](https://github.com/Microsoft/vscode-extension-telemetry/releases)
- [Commits](https://github.com/Microsoft/vscode-extension-telemetry/compare/v1.2.0...v1.4.0)

---
updated-dependencies:
- dependency-name: "@vscode/extension-telemetry"
  dependency-version: 1.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 extensions/typescript-language-features/package-lock.json | 8 ++++----
 extensions/typescript-language-features/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/typescript-language-features/package-lock.json b/extensions/typescript-language-features/package-lock.json
index d0d19680428a..9e47c2463f7e 100644
--- a/extensions/typescript-language-features/package-lock.json
+++ b/extensions/typescript-language-features/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^1.2.0",
+        "@vscode/extension-telemetry": "^1.4.0",
         "@vscode/sync-api-client": "^0.8.1",
         "@vscode/sync-api-common": "^0.8.1",
         "@vscode/sync-api-service": "^0.8.1",
@@ -169,9 +169,9 @@
       "license": "MIT"
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.2.0.tgz",
-      "integrity": "sha512-En6dTwfy5NFzSMibvOpx/lKq2jtgWuR4++KJbi3SpQ2iT8gm+PHo9868/scocW122KDwTxl4ruxZ7i4rHmJJnQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.4.0.tgz",
+      "integrity": "sha512-mqypuqIDn+vQnaQ8tMdvCRn9BprZTH2j6nlFFv9hE6hB25n32F8rOZinos8OgblRi87X1qdBpjpb0Em1LGSG9w==",
       "license": "MIT",
       "dependencies": {
         "@microsoft/1ds-core-js": "^4.3.10",
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 73b00ba88bac..11ac6cd7c013 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -38,7 +38,7 @@
     "Programming Languages"
   ],
   "dependencies": {
-    "@vscode/extension-telemetry": "^1.2.0",
+    "@vscode/extension-telemetry": "^1.4.0",
     "@vscode/sync-api-client": "^0.8.1",
     "@vscode/sync-api-common": "^0.8.1",
     "@vscode/sync-api-service": "^0.8.1",

From 2f893b6ea092203939ed759c8f100c909d484092 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:28:03 +0000
Subject: [PATCH 1802/1815] Bump @types/http-proxy-agent from 2.0.1 to 4.0.1

Bumps [@types/http-proxy-agent](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/http-proxy-agent) from 2.0.1 to 4.0.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/http-proxy-agent)

---
updated-dependencies:
- dependency-name: "@types/http-proxy-agent"
  dependency-version: 4.0.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 +++++++-----
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 32d4bd708608..21d78a51e05b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -63,7 +63,7 @@
         "@types/debug": "^4.1.5",
         "@types/eslint": "^9.6.1",
         "@types/gulp-svgmin": "^1.2.5",
-        "@types/http-proxy-agent": "^2.0.1",
+        "@types/http-proxy-agent": "^4.0.1",
         "@types/kerberos": "^1.1.2",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",
@@ -2497,12 +2497,14 @@
       "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==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-2XJTByP9C14Kcq5ClvPRfOgFJxklhuru7xmuSPcNr2CPwRGdpCgIdUUNc0MDb25+bzaSolVN0u4RKH7M+CMimg==",
+      "deprecated": "This is a stub types definition. http-proxy-agent provides its own type definitions, so you do not need this installed.",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "http-proxy-agent": "*"
       }
     },
     "node_modules/@types/istanbul-lib-coverage": {
diff --git a/package.json b/package.json
index 1526f2f9e1a0..fae309b90d52 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,7 @@
     "@types/debug": "^4.1.5",
     "@types/eslint": "^9.6.1",
     "@types/gulp-svgmin": "^1.2.5",
-    "@types/http-proxy-agent": "^2.0.1",
+    "@types/http-proxy-agent": "^4.0.1",
     "@types/kerberos": "^1.1.2",
     "@types/minimist": "^1.2.5",
     "@types/mocha": "^10.0.10",

From cd3e60bad2ceda5d89359fa7e7468d9f864ebe24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:28:09 +0000
Subject: [PATCH 1803/1815] Bump @xterm/addon-ligatures in /remote/web

Bumps [@xterm/addon-ligatures](https://github.com/xtermjs/xterm.js) from 0.11.0-beta.105 to 0.11.0-beta.107.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-ligatures"
  dependency-version: 0.11.0-beta.107
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index e2d880b2393d..27479f9316d7 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -15,7 +15,7 @@
 				"@vscode/vscode-languagedetection": "1.0.23",
 				"@xterm/addon-clipboard": "^0.3.0-beta.105",
 				"@xterm/addon-image": "^0.10.0-beta.107",
-				"@xterm/addon-ligatures": "^0.11.0-beta.105",
+				"@xterm/addon-ligatures": "^0.11.0-beta.107",
 				"@xterm/addon-progress": "^0.3.0-beta.107",
 				"@xterm/addon-search": "^0.17.0-beta.105",
 				"@xterm/addon-serialize": "^0.15.0-beta.107",
@@ -145,9 +145,9 @@
 			}
 		},
 		"node_modules/@xterm/addon-ligatures": {
-			"version": "0.11.0-beta.105",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.105.tgz",
-			"integrity": "sha512-6ycj4nMyqLoBLtmQlxDOj1dxqDpwTO16/SUt87zZX/DWtj095xxH3FcRPN2ZNnda33NgUC8s4MhxROLZ7Q09SA==",
+			"version": "0.11.0-beta.107",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.107.tgz",
+			"integrity": "sha512-M+sf5/SvLFRo7LifIzF1hRCtSHr0aL/g1dQGYPpz5ceuiVgGvPJhRM/N9QHFIS9axPx4RCfEGl5wcSp+CTWEnA==",
 			"license": "MIT",
 			"dependencies": {
 				"lru-cache": "^6.0.0",
@@ -157,7 +157,7 @@
 				"node": ">8.0.0"
 			},
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.105"
+				"@xterm/xterm": "^6.1.0-beta.107"
 			}
 		},
 		"node_modules/@xterm/addon-progress": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 49c64e5b6904..2f89bab73131 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -10,7 +10,7 @@
 		"@vscode/vscode-languagedetection": "1.0.23",
 		"@xterm/addon-clipboard": "^0.3.0-beta.105",
 		"@xterm/addon-image": "^0.10.0-beta.107",
-		"@xterm/addon-ligatures": "^0.11.0-beta.105",
+		"@xterm/addon-ligatures": "^0.11.0-beta.107",
 		"@xterm/addon-progress": "^0.3.0-beta.107",
 		"@xterm/addon-search": "^0.17.0-beta.105",
 		"@xterm/addon-serialize": "^0.15.0-beta.107",

From 777aa3f555b399c13418c8b26cd486658d98f603 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:28:09 +0000
Subject: [PATCH 1804/1815] Bump @xterm/addon-progress in /remote

Bumps [@xterm/addon-progress](https://github.com/xtermjs/xterm.js) from 0.3.0-beta.105 to 0.3.0-beta.107.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-progress"
  dependency-version: 0.3.0-beta.107
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 87ae6aa5801b..d2c0bc3402fd 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -23,7 +23,7 @@
         "@xterm/addon-clipboard": "^0.3.0-beta.105",
         "@xterm/addon-image": "^0.10.0-beta.107",
         "@xterm/addon-ligatures": "^0.11.0-beta.105",
-        "@xterm/addon-progress": "^0.3.0-beta.105",
+        "@xterm/addon-progress": "^0.3.0-beta.107",
         "@xterm/addon-search": "^0.17.0-beta.105",
         "@xterm/addon-serialize": "^0.15.0-beta.107",
         "@xterm/addon-unicode11": "^0.10.0-beta.105",
@@ -588,12 +588,12 @@
       }
     },
     "node_modules/@xterm/addon-progress": {
-      "version": "0.3.0-beta.105",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.105.tgz",
-      "integrity": "sha512-1VW3D0VA5DS7n7pa8cFA57emhijt/10mM7sK7Ll22AYNmNyNdUiXWm1ORgzI2U1ApBADm117W5QiEkkDEu+F0w==",
+      "version": "0.3.0-beta.107",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-progress/-/addon-progress-0.3.0-beta.107.tgz",
+      "integrity": "sha512-8SB5U6DXrGQPIBfh8uGW+06JayU4ECsMKcUmxZj9GESy1T/7o1H5UsTZwl5+ZtczxmOCN7ydrowb1XGWXS0+Kg==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.105"
+        "@xterm/xterm": "^6.1.0-beta.107"
       }
     },
     "node_modules/@xterm/addon-search": {
diff --git a/remote/package.json b/remote/package.json
index fe23dd1a6ae5..5909895ee995 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -18,7 +18,7 @@
     "@xterm/addon-clipboard": "^0.3.0-beta.105",
     "@xterm/addon-image": "^0.10.0-beta.107",
     "@xterm/addon-ligatures": "^0.11.0-beta.105",
-    "@xterm/addon-progress": "^0.3.0-beta.105",
+    "@xterm/addon-progress": "^0.3.0-beta.107",
     "@xterm/addon-search": "^0.17.0-beta.105",
     "@xterm/addon-serialize": "^0.15.0-beta.107",
     "@xterm/addon-unicode11": "^0.10.0-beta.105",

From 933d9bf61aaced43a26f2c63240e8ce9ea431a1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:28:21 +0000
Subject: [PATCH 1805/1815] Bump @xterm/addon-ligatures from 0.10.0-beta.99 to
 0.11.0-beta.107

Bumps [@xterm/addon-ligatures](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.99 to 0.11.0-beta.107.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-ligatures"
  dependency-version: 0.11.0-beta.107
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 10 +++++-----
 package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 32d4bd708608..6b958e30fb73 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,7 +30,7 @@
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.2.0-beta.82",
         "@xterm/addon-image": "^0.9.0-beta.99",
-        "@xterm/addon-ligatures": "^0.10.0-beta.99",
+        "@xterm/addon-ligatures": "^0.11.0-beta.107",
         "@xterm/addon-progress": "^0.2.0-beta.5",
         "@xterm/addon-search": "^0.17.0-beta.105",
         "@xterm/addon-serialize": "^0.14.0-beta.99",
@@ -4116,9 +4116,9 @@
       }
     },
     "node_modules/@xterm/addon-ligatures": {
-      "version": "0.10.0-beta.99",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.10.0-beta.99.tgz",
-      "integrity": "sha512-QlhUtBlIC7ZgEykpWxFl5lc2MtIFJD41pT8bQVRD1wGShgUmceNTk4xd3CjiQdVOtTrHcgOTM75YmS5GOlobOA==",
+      "version": "0.11.0-beta.107",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.107.tgz",
+      "integrity": "sha512-M+sf5/SvLFRo7LifIzF1hRCtSHr0aL/g1dQGYPpz5ceuiVgGvPJhRM/N9QHFIS9axPx4RCfEGl5wcSp+CTWEnA==",
       "license": "MIT",
       "dependencies": {
         "lru-cache": "^6.0.0",
@@ -4128,7 +4128,7 @@
         "node": ">8.0.0"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^5.6.0-beta.99"
+        "@xterm/xterm": "^6.1.0-beta.107"
       }
     },
     "node_modules/@xterm/addon-progress": {
diff --git a/package.json b/package.json
index 1526f2f9e1a0..4f72d9160e36 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.2.0-beta.82",
     "@xterm/addon-image": "^0.9.0-beta.99",
-    "@xterm/addon-ligatures": "^0.10.0-beta.99",
+    "@xterm/addon-ligatures": "^0.11.0-beta.107",
     "@xterm/addon-progress": "^0.2.0-beta.5",
     "@xterm/addon-search": "^0.17.0-beta.105",
     "@xterm/addon-serialize": "^0.14.0-beta.99",

From 19ed3d0fbbc68e5fdd5b40db4c9c51cebeca487c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:28:22 +0000
Subject: [PATCH 1806/1815] Bump vscode-textmate from 9.3.1 to 9.3.2 in
 /remote/web

Bumps [vscode-textmate](https://github.com/microsoft/vscode-textmate) from 9.3.1 to 9.3.2.
- [Release notes](https://github.com/microsoft/vscode-textmate/releases)
- [Commits](https://github.com/microsoft/vscode-textmate/compare/v9.3.1...v9.3.2)

---
updated-dependencies:
- dependency-name: vscode-textmate
  dependency-version: 9.3.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 8 ++++----
 remote/web/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index e2d880b2393d..ce5f77eb8825 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -25,7 +25,7 @@
 				"jschardet": "3.1.4",
 				"tas-client-umd": "0.2.0",
 				"vscode-oniguruma": "2.0.1",
-				"vscode-textmate": "9.3.1"
+				"vscode-textmate": "9.3.2"
 			}
 		},
 		"node_modules/@microsoft/1ds-core-js": {
@@ -270,9 +270,9 @@
 			"license": "MIT"
 		},
 		"node_modules/vscode-textmate": {
-			"version": "9.3.1",
-			"resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.3.1.tgz",
-			"integrity": "sha512-U19nFkCraZF9/bkQKQYsb9mRqM9NwpToQQFl40nGiioZTH9gRtdtCHwp48cubayVfreX3ivnoxgxQgNwrTVmQg==",
+			"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 49c64e5b6904..8ec004686c09 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -20,6 +20,6 @@
 		"jschardet": "3.1.4",
 		"tas-client-umd": "0.2.0",
 		"vscode-oniguruma": "2.0.1",
-		"vscode-textmate": "9.3.1"
+		"vscode-textmate": "9.3.2"
 	}
 }

From 8818f25c8c8a4933a5a13b75cad71dd56aecb7e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 13:28:41 +0000
Subject: [PATCH 1807/1815] Bump @vscode/spdlog from 0.15.1 to 0.15.7

Bumps [@vscode/spdlog](https://github.com/microsoft/node-spdlog) from 0.15.1 to 0.15.7.
- [Release notes](https://github.com/microsoft/node-spdlog/releases)
- [Commits](https://github.com/microsoft/node-spdlog/compare/v0.15.1...v0.15.7)

---
updated-dependencies:
- dependency-name: "@vscode/spdlog"
  dependency-version: 0.15.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 32d4bd708608..30905b2c3233 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "@vscode/policy-watcher": "^1.3.0",
         "@vscode/proxy-agent": "^0.32.0",
         "@vscode/ripgrep": "^1.17.0",
-        "@vscode/spdlog": "^0.15.0",
+        "@vscode/spdlog": "^0.15.7",
         "@vscode/sqlite3": "5.1.8-vscode",
         "@vscode/sudo-prompt": "9.3.1",
         "@vscode/tree-sitter-wasm": "^0.1.3",
@@ -3607,9 +3607,9 @@
       }
     },
     "node_modules/@vscode/spdlog": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/@vscode/spdlog/-/spdlog-0.15.1.tgz",
-      "integrity": "sha512-tVPeXmyz3/4NKqtNfNQxqcrBSSEZVIbF4lVDuDh9Nik5xhuHVceCU6cTpwmJ6yVBs+jv51SGF622txOQv95sZA==",
+      "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": {
diff --git a/package.json b/package.json
index 1526f2f9e1a0..3dbf5d2b4124 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "@vscode/policy-watcher": "^1.3.0",
     "@vscode/proxy-agent": "^0.32.0",
     "@vscode/ripgrep": "^1.17.0",
-    "@vscode/spdlog": "^0.15.0",
+    "@vscode/spdlog": "^0.15.7",
     "@vscode/sqlite3": "5.1.8-vscode",
     "@vscode/sudo-prompt": "9.3.1",
     "@vscode/tree-sitter-wasm": "^0.1.3",

From e73ed06434cbe95f24efae11b78952296cdb3f62 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 20:04:22 +0000
Subject: [PATCH 1808/1815] Bump @xterm/addon-clipboard in /remote/web

Bumps [@xterm/addon-clipboard](https://github.com/xtermjs/xterm.js) from 0.3.0-beta.105 to 0.3.0-beta.107.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-clipboard"
  dependency-version: 0.3.0-beta.107
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index 27479f9316d7..5236f65b3333 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -13,7 +13,7 @@
 				"@vscode/iconv-lite-umd": "0.7.1",
 				"@vscode/tree-sitter-wasm": "^0.3.0",
 				"@vscode/vscode-languagedetection": "1.0.23",
-				"@xterm/addon-clipboard": "^0.3.0-beta.105",
+				"@xterm/addon-clipboard": "^0.3.0-beta.107",
 				"@xterm/addon-image": "^0.10.0-beta.107",
 				"@xterm/addon-ligatures": "^0.11.0-beta.107",
 				"@xterm/addon-progress": "^0.3.0-beta.107",
@@ -124,15 +124,15 @@
 			}
 		},
 		"node_modules/@xterm/addon-clipboard": {
-			"version": "0.3.0-beta.105",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.105.tgz",
-			"integrity": "sha512-bAnnpjz1+7S5LLvv3pEyWAfhDvdZaufSkVMNBEt/LKpUkQlJRk1qoDWLANqQGVILxCWz/FanI566an0+zjANgA==",
+			"version": "0.3.0-beta.107",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.107.tgz",
+			"integrity": "sha512-sSdnJUqaY9xFnJCwAefXEZ7rQOODtY6YtdX1LFXqClBMbw/WMLfuvUeRjnzQeWKUAgU+QUVlIPTT059H+0ETFQ==",
 			"license": "MIT",
 			"dependencies": {
 				"js-base64": "^3.7.5"
 			},
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.105"
+				"@xterm/xterm": "^6.1.0-beta.107"
 			}
 		},
 		"node_modules/@xterm/addon-image": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 2f89bab73131..6f33899b5a53 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -8,7 +8,7 @@
 		"@vscode/iconv-lite-umd": "0.7.1",
 		"@vscode/tree-sitter-wasm": "^0.3.0",
 		"@vscode/vscode-languagedetection": "1.0.23",
-		"@xterm/addon-clipboard": "^0.3.0-beta.105",
+		"@xterm/addon-clipboard": "^0.3.0-beta.107",
 		"@xterm/addon-image": "^0.10.0-beta.107",
 		"@xterm/addon-ligatures": "^0.11.0-beta.107",
 		"@xterm/addon-progress": "^0.3.0-beta.107",

From e817577cdde56e19783c26d9b462bbb80b9e49ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 20:04:50 +0000
Subject: [PATCH 1809/1815] Bump istanbul-lib-coverage from 3.2.0 to 3.2.2

Bumps [istanbul-lib-coverage](https://github.com/istanbuljs/istanbuljs/tree/HEAD/packages/istanbul-lib-coverage) from 3.2.0 to 3.2.2.
- [Release notes](https://github.com/istanbuljs/istanbuljs/releases)
- [Changelog](https://github.com/istanbuljs/istanbuljs/blob/main/packages/istanbul-lib-coverage/CHANGELOG.md)
- [Commits](https://github.com/istanbuljs/istanbuljs/commits/istanbul-lib-coverage-v3.2.2/packages/istanbul-lib-coverage)

---
updated-dependencies:
- dependency-name: istanbul-lib-coverage
  dependency-version: 3.2.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 21d78a51e05b..220167d04381 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -124,7 +124,7 @@
         "gulp-untar": "^0.0.8",
         "husky": "^9.1.7",
         "innosetup": "^6.4.1",
-        "istanbul-lib-coverage": "^3.2.0",
+        "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-instrument": "^6.0.3",
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^5.0.6",
@@ -10958,10 +10958,11 @@
       }
     },
     "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==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=8"
       }
diff --git a/package.json b/package.json
index fae309b90d52..4a1d43552087 100644
--- a/package.json
+++ b/package.json
@@ -183,7 +183,7 @@
     "gulp-untar": "^0.0.8",
     "husky": "^9.1.7",
     "innosetup": "^6.4.1",
-    "istanbul-lib-coverage": "^3.2.0",
+    "istanbul-lib-coverage": "^3.2.2",
     "istanbul-lib-instrument": "^6.0.3",
     "istanbul-lib-report": "^3.0.0",
     "istanbul-lib-source-maps": "^5.0.6",

From acde3cddf26907b776be5a0867935f90cf3f2fca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 20:05:11 +0000
Subject: [PATCH 1810/1815] Bump webpack-cli from 5.1.4 to 6.0.1

Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 5.1.4 to 6.0.1.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@5.1.4...webpack-cli@6.0.1)

---
updated-dependencies:
- dependency-name: webpack-cli
  dependency-version: 6.0.1
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 146 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 2 files changed, 75 insertions(+), 73 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 21d78a51e05b..226636c4adc6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -159,7 +159,7 @@
         "typescript-eslint": "^8.8.0",
         "util": "^0.12.4",
         "webpack": "^5.94.0",
-        "webpack-cli": "^5.1.4",
+        "webpack-cli": "^6.0.1",
         "webpack-stream": "^7.0.0",
         "xml2js": "^0.6.2",
         "yaserver": "^0.4.0"
@@ -810,12 +810,13 @@
       }
     },
     "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz",
-      "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz",
+      "integrity": "sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=14.17.0"
       }
     },
     "node_modules/@electron/get": {
@@ -4053,42 +4054,45 @@
       "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==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-3.0.1.tgz",
+      "integrity": "sha512-u8d0pJ5YFgneF/GuvEiDA61Tf1VDomHHYMjv/wc9XzYj7nopltpG96nXN5dJRstxZhcNpV1g+nT6CydO7pHbjA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=14.15.0"
+        "node": ">=18.12.0"
       },
       "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
+        "webpack": "^5.82.0",
+        "webpack-cli": "6.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==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-3.0.1.tgz",
+      "integrity": "sha512-coEmDzc2u/ffMvuW9aCjoRzNSPDl/XLuhPdlFRpT9tZHmJ/039az33CE7uH+8s0uL1j5ZNtfdv0HkfaKRBGJsQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=14.15.0"
+        "node": ">=18.12.0"
       },
       "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
+        "webpack": "^5.82.0",
+        "webpack-cli": "6.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==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-3.0.1.tgz",
+      "integrity": "sha512-sbgw03xQaCLiT6gcY/6u3qBDn01CWw/nbaXl3gTdTFuJJ75Gffv3E3DBpgvY2fkkrdS1fpjaXNOmJlnbtKauKg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=14.15.0"
+        "node": ">=18.12.0"
       },
       "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
+        "webpack": "^5.82.0",
+        "webpack-cli": "6.x.x"
       },
       "peerDependenciesMeta": {
         "webpack-dev-server": {
@@ -5459,6 +5463,7 @@
       "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
       "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-plain-object": "^2.0.4",
         "kind-of": "^6.0.2",
@@ -5473,6 +5478,7 @@
       "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": {
         "isobject": "^3.0.1"
       },
@@ -5480,15 +5486,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/clone-deep/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/clone-response": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
@@ -6709,10 +6706,11 @@
       }
     },
     "node_modules/envinfo": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
-      "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.21.0.tgz",
+      "integrity": "sha512-Lw7I8Zp5YKHFCXL7+Dz95g4CcbMEpgvqZNNq3AmlT5XAV6CgAAk6gyAMqn2zjw08K9BHfcNuKrMiCPLByGafow==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "envinfo": "dist/cli.js"
       },
@@ -11417,6 +11415,16 @@
         "json-buffer": "3.0.1"
       }
     },
+    "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/koa": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/koa/-/koa-3.1.1.tgz",
@@ -15395,6 +15403,7 @@
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
       "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "kind-of": "^6.0.2"
       },
@@ -15402,15 +15411,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/shallow-clone/node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -17818,42 +17818,40 @@
       }
     },
     "node_modules/webpack-cli": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
-      "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-6.0.1.tgz",
+      "integrity": "sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@discoveryjs/json-ext": "^0.5.0",
-        "@webpack-cli/configtest": "^2.1.1",
-        "@webpack-cli/info": "^2.0.2",
-        "@webpack-cli/serve": "^2.0.5",
+        "@discoveryjs/json-ext": "^0.6.1",
+        "@webpack-cli/configtest": "^3.0.1",
+        "@webpack-cli/info": "^3.0.1",
+        "@webpack-cli/serve": "^3.0.1",
         "colorette": "^2.0.14",
-        "commander": "^10.0.1",
+        "commander": "^12.1.0",
         "cross-spawn": "^7.0.3",
-        "envinfo": "^7.7.3",
+        "envinfo": "^7.14.0",
         "fastest-levenshtein": "^1.0.12",
         "import-local": "^3.0.2",
         "interpret": "^3.1.1",
         "rechoir": "^0.8.0",
-        "webpack-merge": "^5.7.3"
+        "webpack-merge": "^6.0.1"
       },
       "bin": {
         "webpack-cli": "bin/cli.js"
       },
       "engines": {
-        "node": ">=14.15.0"
+        "node": ">=18.12.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "webpack": "5.x.x"
+        "webpack": "^5.82.0"
       },
       "peerDependenciesMeta": {
-        "@webpack-cli/generators": {
-          "optional": true
-        },
         "webpack-bundle-analyzer": {
           "optional": true
         },
@@ -17863,25 +17861,28 @@
       }
     },
     "node_modules/webpack-cli/node_modules/commander": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
-      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "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": ">=14"
+        "node": ">=18"
       }
     },
     "node_modules/webpack-merge": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
-      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",
+      "integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "clone-deep": "^4.0.1",
-        "wildcard": "^2.0.0"
+        "flat": "^5.0.2",
+        "wildcard": "^2.0.1"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/webpack-sources": {
@@ -18072,10 +18073,11 @@
       }
     },
     "node_modules/wildcard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
-      "dev": true
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
+      "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/windows-foreground-love": {
       "version": "0.5.0",
diff --git a/package.json b/package.json
index fae309b90d52..1a03a33fff91 100644
--- a/package.json
+++ b/package.json
@@ -218,7 +218,7 @@
     "typescript-eslint": "^8.8.0",
     "util": "^0.12.4",
     "webpack": "^5.94.0",
-    "webpack-cli": "^5.1.4",
+    "webpack-cli": "^6.0.1",
     "webpack-stream": "^7.0.0",
     "xml2js": "^0.6.2",
     "yaserver": "^0.4.0"

From be3aaea308e81cfc9376ee8e5b9ab70675cbe6ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 20:06:25 +0000
Subject: [PATCH 1811/1815] Bump @xterm/addon-unicode11 in /remote

Bumps [@xterm/addon-unicode11](https://github.com/xtermjs/xterm.js) from 0.10.0-beta.105 to 0.10.0-beta.107.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-unicode11"
  dependency-version: 0.10.0-beta.107
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index d2c0bc3402fd..74b8bd9b14b7 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -26,7 +26,7 @@
         "@xterm/addon-progress": "^0.3.0-beta.107",
         "@xterm/addon-search": "^0.17.0-beta.105",
         "@xterm/addon-serialize": "^0.15.0-beta.107",
-        "@xterm/addon-unicode11": "^0.10.0-beta.105",
+        "@xterm/addon-unicode11": "^0.10.0-beta.107",
         "@xterm/addon-webgl": "^0.20.0-beta.106",
         "@xterm/headless": "^6.0.0",
         "@xterm/xterm": "^6.0.0",
@@ -615,12 +615,12 @@
       }
     },
     "node_modules/@xterm/addon-unicode11": {
-      "version": "0.10.0-beta.105",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.105.tgz",
-      "integrity": "sha512-zMepG3Wa44+n8SQbNZ8jnpASh9zDEuDlk/0+bpPaRRc4UkiR6UbhzZos+qC8glxu1QGLd/4dFMuypnNxWonkpQ==",
+      "version": "0.10.0-beta.107",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.10.0-beta.107.tgz",
+      "integrity": "sha512-aWnjjJGGAOUxuWRl+kF7EyD2qQ3TqRdb0u0L1aB1MlUk04qG5Ctv3uwLu8Moh/uAyJ7tAqgU7GQQP6yWDwvnJQ==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.105"
+        "@xterm/xterm": "^6.1.0-beta.107"
       }
     },
     "node_modules/@xterm/addon-webgl": {
diff --git a/remote/package.json b/remote/package.json
index 5909895ee995..d343af7f1a19 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -21,7 +21,7 @@
     "@xterm/addon-progress": "^0.3.0-beta.107",
     "@xterm/addon-search": "^0.17.0-beta.105",
     "@xterm/addon-serialize": "^0.15.0-beta.107",
-    "@xterm/addon-unicode11": "^0.10.0-beta.105",
+    "@xterm/addon-unicode11": "^0.10.0-beta.107",
     "@xterm/addon-webgl": "^0.20.0-beta.106",
     "@xterm/headless": "^6.0.0",
     "@xterm/xterm": "^6.0.0",

From 9454e5a76f1f1722d4666136c0dfd9c491494eeb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 20:07:07 +0000
Subject: [PATCH 1812/1815] Bump @xterm/addon-ligatures in /remote

Bumps [@xterm/addon-ligatures](https://github.com/xtermjs/xterm.js) from 0.11.0-beta.105 to 0.11.0-beta.107.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-ligatures"
  dependency-version: 0.11.0-beta.107
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index d2c0bc3402fd..13251a476821 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -22,7 +22,7 @@
         "@vscode/windows-registry": "^1.1.0",
         "@xterm/addon-clipboard": "^0.3.0-beta.105",
         "@xterm/addon-image": "^0.10.0-beta.107",
-        "@xterm/addon-ligatures": "^0.11.0-beta.105",
+        "@xterm/addon-ligatures": "^0.11.0-beta.107",
         "@xterm/addon-progress": "^0.3.0-beta.107",
         "@xterm/addon-search": "^0.17.0-beta.105",
         "@xterm/addon-serialize": "^0.15.0-beta.107",
@@ -572,9 +572,9 @@
       }
     },
     "node_modules/@xterm/addon-ligatures": {
-      "version": "0.11.0-beta.105",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.105.tgz",
-      "integrity": "sha512-6ycj4nMyqLoBLtmQlxDOj1dxqDpwTO16/SUt87zZX/DWtj095xxH3FcRPN2ZNnda33NgUC8s4MhxROLZ7Q09SA==",
+      "version": "0.11.0-beta.107",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-ligatures/-/addon-ligatures-0.11.0-beta.107.tgz",
+      "integrity": "sha512-M+sf5/SvLFRo7LifIzF1hRCtSHr0aL/g1dQGYPpz5ceuiVgGvPJhRM/N9QHFIS9axPx4RCfEGl5wcSp+CTWEnA==",
       "license": "MIT",
       "dependencies": {
         "lru-cache": "^6.0.0",
@@ -584,7 +584,7 @@
         "node": ">8.0.0"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.105"
+        "@xterm/xterm": "^6.1.0-beta.107"
       }
     },
     "node_modules/@xterm/addon-progress": {
diff --git a/remote/package.json b/remote/package.json
index 5909895ee995..f554b1e82d2d 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -17,7 +17,7 @@
     "@vscode/windows-registry": "^1.1.0",
     "@xterm/addon-clipboard": "^0.3.0-beta.105",
     "@xterm/addon-image": "^0.10.0-beta.107",
-    "@xterm/addon-ligatures": "^0.11.0-beta.105",
+    "@xterm/addon-ligatures": "^0.11.0-beta.107",
     "@xterm/addon-progress": "^0.3.0-beta.107",
     "@xterm/addon-search": "^0.17.0-beta.105",
     "@xterm/addon-serialize": "^0.15.0-beta.107",

From 8692438cfcb0021ba1a732a066858fabaf388936 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 20:11:09 +0000
Subject: [PATCH 1813/1815] Bump @xterm/addon-clipboard in /remote

Bumps [@xterm/addon-clipboard](https://github.com/xtermjs/xterm.js) from 0.3.0-beta.105 to 0.3.0-beta.107.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-clipboard"
  dependency-version: 0.3.0-beta.107
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 4ae94ffec996..4ca8f17d8a23 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -20,7 +20,7 @@
         "@vscode/vscode-languagedetection": "1.0.23",
         "@vscode/windows-process-tree": "^0.6.0",
         "@vscode/windows-registry": "^1.1.0",
-        "@xterm/addon-clipboard": "^0.3.0-beta.105",
+        "@xterm/addon-clipboard": "^0.3.0-beta.107",
         "@xterm/addon-image": "^0.10.0-beta.107",
         "@xterm/addon-ligatures": "^0.11.0-beta.107",
         "@xterm/addon-progress": "^0.3.0-beta.107",
@@ -551,15 +551,15 @@
       "license": "MIT"
     },
     "node_modules/@xterm/addon-clipboard": {
-      "version": "0.3.0-beta.105",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.105.tgz",
-      "integrity": "sha512-bAnnpjz1+7S5LLvv3pEyWAfhDvdZaufSkVMNBEt/LKpUkQlJRk1qoDWLANqQGVILxCWz/FanI566an0+zjANgA==",
+      "version": "0.3.0-beta.107",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-clipboard/-/addon-clipboard-0.3.0-beta.107.tgz",
+      "integrity": "sha512-sSdnJUqaY9xFnJCwAefXEZ7rQOODtY6YtdX1LFXqClBMbw/WMLfuvUeRjnzQeWKUAgU+QUVlIPTT059H+0ETFQ==",
       "license": "MIT",
       "dependencies": {
         "js-base64": "^3.7.5"
       },
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.105"
+        "@xterm/xterm": "^6.1.0-beta.107"
       }
     },
     "node_modules/@xterm/addon-image": {
diff --git a/remote/package.json b/remote/package.json
index 501000028479..4a683d6b810b 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -15,7 +15,7 @@
     "@vscode/vscode-languagedetection": "1.0.23",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
-    "@xterm/addon-clipboard": "^0.3.0-beta.105",
+    "@xterm/addon-clipboard": "^0.3.0-beta.107",
     "@xterm/addon-image": "^0.10.0-beta.107",
     "@xterm/addon-ligatures": "^0.11.0-beta.107",
     "@xterm/addon-progress": "^0.3.0-beta.107",

From 5d45c8dc3fa0f16937f545813e965b6999608ef6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 20:11:42 +0000
Subject: [PATCH 1814/1815] Bump @xterm/addon-search in /remote/web

Bumps [@xterm/addon-search](https://github.com/xtermjs/xterm.js) from 0.17.0-beta.105 to 0.17.0-beta.107.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-search"
  dependency-version: 0.17.0-beta.107
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/web/package-lock.json | 10 +++++-----
 remote/web/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json
index baed26dadab5..0fd0c4ed0988 100644
--- a/remote/web/package-lock.json
+++ b/remote/web/package-lock.json
@@ -17,7 +17,7 @@
 				"@xterm/addon-image": "^0.10.0-beta.107",
 				"@xterm/addon-ligatures": "^0.11.0-beta.107",
 				"@xterm/addon-progress": "^0.3.0-beta.107",
-				"@xterm/addon-search": "^0.17.0-beta.105",
+				"@xterm/addon-search": "^0.17.0-beta.107",
 				"@xterm/addon-serialize": "^0.15.0-beta.107",
 				"@xterm/addon-unicode11": "^0.10.0-beta.107",
 				"@xterm/addon-webgl": "^0.20.0-beta.106",
@@ -170,12 +170,12 @@
 			}
 		},
 		"node_modules/@xterm/addon-search": {
-			"version": "0.17.0-beta.105",
-			"resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.105.tgz",
-			"integrity": "sha512-HkjOQiPWKnKnyeBJm1Q4Dt/JexT1DOPlT5yBylg0r8iCmZBAf3BIt5IDXCgjLrS31WF210Ho1rAstN9kwCNttw==",
+			"version": "0.17.0-beta.107",
+			"resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.107.tgz",
+			"integrity": "sha512-8hbPJABGkNvzYdHFOMwIUOW09PVeJb2yQj+b6LZtc4f1XyOOViXckJAT75aVfAXBdTWcW0241y5rlWz22GK1mA==",
 			"license": "MIT",
 			"peerDependencies": {
-				"@xterm/xterm": "^6.1.0-beta.105"
+				"@xterm/xterm": "^6.1.0-beta.107"
 			}
 		},
 		"node_modules/@xterm/addon-serialize": {
diff --git a/remote/web/package.json b/remote/web/package.json
index 7f46111ad241..a34adca40bb4 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -12,7 +12,7 @@
 		"@xterm/addon-image": "^0.10.0-beta.107",
 		"@xterm/addon-ligatures": "^0.11.0-beta.107",
 		"@xterm/addon-progress": "^0.3.0-beta.107",
-		"@xterm/addon-search": "^0.17.0-beta.105",
+		"@xterm/addon-search": "^0.17.0-beta.107",
 		"@xterm/addon-serialize": "^0.15.0-beta.107",
 		"@xterm/addon-unicode11": "^0.10.0-beta.107",
 		"@xterm/addon-webgl": "^0.20.0-beta.106",

From 883805b399a261b60e742caba2f734c85ef48a8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 20:14:26 +0000
Subject: [PATCH 1815/1815] Bump @xterm/addon-search in /remote

Bumps [@xterm/addon-search](https://github.com/xtermjs/xterm.js) from 0.17.0-beta.105 to 0.17.0-beta.107.
- [Release notes](https://github.com/xtermjs/xterm.js/releases)
- [Commits](https://github.com/xtermjs/xterm.js/commits)

---
updated-dependencies:
- dependency-name: "@xterm/addon-search"
  dependency-version: 0.17.0-beta.107
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 remote/package-lock.json | 10 +++++-----
 remote/package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/remote/package-lock.json b/remote/package-lock.json
index 4ae94ffec996..b23931a94502 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -24,7 +24,7 @@
         "@xterm/addon-image": "^0.10.0-beta.107",
         "@xterm/addon-ligatures": "^0.11.0-beta.107",
         "@xterm/addon-progress": "^0.3.0-beta.107",
-        "@xterm/addon-search": "^0.17.0-beta.105",
+        "@xterm/addon-search": "^0.17.0-beta.107",
         "@xterm/addon-serialize": "^0.15.0-beta.107",
         "@xterm/addon-unicode11": "^0.10.0-beta.107",
         "@xterm/addon-webgl": "^0.20.0-beta.106",
@@ -597,12 +597,12 @@
       }
     },
     "node_modules/@xterm/addon-search": {
-      "version": "0.17.0-beta.105",
-      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.105.tgz",
-      "integrity": "sha512-HkjOQiPWKnKnyeBJm1Q4Dt/JexT1DOPlT5yBylg0r8iCmZBAf3BIt5IDXCgjLrS31WF210Ho1rAstN9kwCNttw==",
+      "version": "0.17.0-beta.107",
+      "resolved": "https://registry.npmjs.org/@xterm/addon-search/-/addon-search-0.17.0-beta.107.tgz",
+      "integrity": "sha512-8hbPJABGkNvzYdHFOMwIUOW09PVeJb2yQj+b6LZtc4f1XyOOViXckJAT75aVfAXBdTWcW0241y5rlWz22GK1mA==",
       "license": "MIT",
       "peerDependencies": {
-        "@xterm/xterm": "^6.1.0-beta.105"
+        "@xterm/xterm": "^6.1.0-beta.107"
       }
     },
     "node_modules/@xterm/addon-serialize": {
diff --git a/remote/package.json b/remote/package.json
index 501000028479..e60005b09496 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -19,7 +19,7 @@
     "@xterm/addon-image": "^0.10.0-beta.107",
     "@xterm/addon-ligatures": "^0.11.0-beta.107",
     "@xterm/addon-progress": "^0.3.0-beta.107",
-    "@xterm/addon-search": "^0.17.0-beta.105",
+    "@xterm/addon-search": "^0.17.0-beta.107",
     "@xterm/addon-serialize": "^0.15.0-beta.107",
     "@xterm/addon-unicode11": "^0.10.0-beta.107",
     "@xterm/addon-webgl": "^0.20.0-beta.106",